From fb459253fe1ca9219a0d26f3488e2d8aa9875600 Mon Sep 17 00:00:00 2001
From: ttimo <ttimo@ttimo.net>
Date: Tue, 15 Nov 2022 11:09:19 -0600
Subject: [PATCH 1/2] Enable support for ANSI color codes on Windows 10 and
 newer, without needing to enable system wide. Good for CreateProcess
 CREATE_NEW_CONSOLE situations.

---
 light/main.cc | 10 ++++++++++
 qbsp/main.cc  | 10 ++++++++++
 vis/main.cc   | 10 ++++++++++
 3 files changed, 30 insertions(+)

diff --git a/light/main.cc b/light/main.cc
index 54f8b4c0..8d4695c1 100644
--- a/light/main.cc
+++ b/light/main.cc
@@ -20,8 +20,18 @@
 #include <light/light.hh>
 #include <common/settings.hh>
 
+#ifdef _WIN32
+#  include <windows.h>
+#endif
+
 int main(int argc, const char **argv)
 {
+#if defined(_WIN32)
+    HANDLE hInput = GetStdHandle(STD_INPUT_HANDLE);
+    SetConsoleMode(hInput, ENABLE_VIRTUAL_TERMINAL_INPUT);
+    HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+    SetConsoleMode(hOutput, ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
+#endif
     try {
         return light_main(argc, argv);
     } catch (const settings::quit_after_help_exception &) {
diff --git a/qbsp/main.cc b/qbsp/main.cc
index 0cfd4643..aa3f10d8 100644
--- a/qbsp/main.cc
+++ b/qbsp/main.cc
@@ -20,8 +20,18 @@
 #include <qbsp/qbsp.hh>
 #include <common/settings.hh>
 
+#ifdef _WIN32
+#  include <windows.h>
+#endif
+
 int main(int argc, const char **argv)
 {
+#if defined(_WIN32)
+    HANDLE hInput = GetStdHandle(STD_INPUT_HANDLE);
+    SetConsoleMode(hInput, ENABLE_VIRTUAL_TERMINAL_INPUT);
+    HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+    SetConsoleMode(hOutput, ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
+#endif
     try {
         return qbsp_main(argc, argv);
     } catch (const settings::quit_after_help_exception &) {
diff --git a/vis/main.cc b/vis/main.cc
index 91fc5f0f..c3dd099b 100644
--- a/vis/main.cc
+++ b/vis/main.cc
@@ -20,8 +20,18 @@
 #include <vis/vis.hh>
 #include <common/settings.hh>
 
+#ifdef _WIN32
+#  include <windows.h>
+#endif
+
 int main(int argc, const char **argv)
 {
+#if defined(_WIN32)
+    HANDLE hInput = GetStdHandle(STD_INPUT_HANDLE);
+    SetConsoleMode(hInput, ENABLE_VIRTUAL_TERMINAL_INPUT);
+    HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+    SetConsoleMode(hOutput, ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
+#endif
     try {
         return vis_main(argc, argv);
     } catch (const settings::quit_after_help_exception &) {

From 9ab4ea81766a9d44142e5b67fdfc19886cff231d Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Sat, 19 Nov 2022 10:05:14 -0700
Subject: [PATCH 2/2] Move SetConsoleMode() call to logging::preinitialize();
 helper

Don't do ENABLE_VIRTUAL_TERMINAL_INPUT as it breaks arrow key history
navigation in Windows Terminal after running one of the ericw-tools exe's.
---
 bspinfo/main.cc       |  3 +++
 bsputil/bsputil.cc    |  2 ++
 common/log.cc         |  9 +++++++++
 include/common/log.hh |  3 +++
 light/main.cc         | 13 +++----------
 qbsp/main.cc          | 13 +++----------
 tests/test_main.cc    |  5 ++++-
 vis/main.cc           | 13 +++----------
 8 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/bspinfo/main.cc b/bspinfo/main.cc
index e0627b90..46b4f035 100644
--- a/bspinfo/main.cc
+++ b/bspinfo/main.cc
@@ -20,6 +20,7 @@
 #include <common/bspinfo.hh>
 #include <common/cmdlib.hh>
 #include <common/bspfile.hh>
+#include <common/log.hh>
 
 #include <fstream>
 #include <fmt/ostream.h>
@@ -84,6 +85,8 @@ settings::common_settings bspinfo_options;
 
 int main(int argc, char **argv)
 {
+    logging::preinitialize();
+
     fmt::print("---- bspinfo / ericw-tools {} ----\n", ERICWTOOLS_VERSION);
     if (argc == 1) {
         printf("usage: bspinfo bspfile [bspfiles]\n");
diff --git a/bsputil/bsputil.cc b/bsputil/bsputil.cc
index 169afd9c..ce79c955 100644
--- a/bsputil/bsputil.cc
+++ b/bsputil/bsputil.cc
@@ -471,6 +471,8 @@ settings::common_settings bsputil_options;
 
 int main(int argc, char **argv)
 {
+    logging::preinitialize();
+
     bspdata_t bspdata;
     // FIXME: doesn't this get overwritten by ConvertBSPFormat below?
     mbsp_t &bsp = bspdata.bsp.emplace<mbsp_t>();
diff --git a/common/log.cc b/common/log.cc
index 00369fb8..a79201d3 100644
--- a/common/log.cc
+++ b/common/log.cc
@@ -54,6 +54,15 @@ namespace logging
 bitflags<flag> mask = bitflags<flag>(flag::ALL) & ~bitflags<flag>(flag::VERBOSE);
 bool enable_color_codes = true;
 
+void preinitialize()
+{
+#ifdef _WIN32
+    // enable processing of ANSI escape sequences on Windows
+    HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+    SetConsoleMode(hOutput, ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
+#endif
+}
+
 void init(const fs::path &filename, const settings::common_settings &settings)
 {
     if (settings.log.value()) {
diff --git a/include/common/log.hh b/include/common/log.hh
index 295e221b..ef08d273 100644
--- a/include/common/log.hh
+++ b/include/common/log.hh
@@ -57,6 +57,9 @@ enum class flag : uint8_t
 extern bitflags<flag> mask;
 extern bool enable_color_codes;
 
+// Windows: calls SetConsoleMode for ANSI escape sequence processing (so colors work)
+void preinitialize();
+
 // initialize logging subsystem
 void init(const fs::path &filename, const settings::common_settings &settings);
 
diff --git a/light/main.cc b/light/main.cc
index 8d4695c1..330cb7a1 100644
--- a/light/main.cc
+++ b/light/main.cc
@@ -19,19 +19,12 @@
 
 #include <light/light.hh>
 #include <common/settings.hh>
-
-#ifdef _WIN32
-#  include <windows.h>
-#endif
+#include <common/log.hh>
 
 int main(int argc, const char **argv)
 {
-#if defined(_WIN32)
-    HANDLE hInput = GetStdHandle(STD_INPUT_HANDLE);
-    SetConsoleMode(hInput, ENABLE_VIRTUAL_TERMINAL_INPUT);
-    HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
-    SetConsoleMode(hOutput, ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
-#endif
+    logging::preinitialize();
+
     try {
         return light_main(argc, argv);
     } catch (const settings::quit_after_help_exception &) {
diff --git a/qbsp/main.cc b/qbsp/main.cc
index aa3f10d8..bccd048f 100644
--- a/qbsp/main.cc
+++ b/qbsp/main.cc
@@ -19,19 +19,12 @@
 
 #include <qbsp/qbsp.hh>
 #include <common/settings.hh>
-
-#ifdef _WIN32
-#  include <windows.h>
-#endif
+#include <common/log.hh>
 
 int main(int argc, const char **argv)
 {
-#if defined(_WIN32)
-    HANDLE hInput = GetStdHandle(STD_INPUT_HANDLE);
-    SetConsoleMode(hInput, ENABLE_VIRTUAL_TERMINAL_INPUT);
-    HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
-    SetConsoleMode(hOutput, ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
-#endif
+    logging::preinitialize();
+
     try {
         return qbsp_main(argc, argv);
     } catch (const settings::quit_after_help_exception &) {
diff --git a/tests/test_main.cc b/tests/test_main.cc
index 450ffaf8..31d39d23 100644
--- a/tests/test_main.cc
+++ b/tests/test_main.cc
@@ -3,7 +3,10 @@
 
 #include <common/log.hh>
 
-int main(int argc, char** argv) {
+int main(int argc, char** argv)
+{
+    logging::preinitialize();
+
     // writing console colors within test case output breaks doctest/CLion integration
     logging::enable_color_codes = false;
 
diff --git a/vis/main.cc b/vis/main.cc
index c3dd099b..de10a70e 100644
--- a/vis/main.cc
+++ b/vis/main.cc
@@ -19,19 +19,12 @@
 
 #include <vis/vis.hh>
 #include <common/settings.hh>
-
-#ifdef _WIN32
-#  include <windows.h>
-#endif
+#include <common/log.hh>
 
 int main(int argc, const char **argv)
 {
-#if defined(_WIN32)
-    HANDLE hInput = GetStdHandle(STD_INPUT_HANDLE);
-    SetConsoleMode(hInput, ENABLE_VIRTUAL_TERMINAL_INPUT);
-    HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
-    SetConsoleMode(hOutput, ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
-#endif
+    logging::preinitialize();
+
     try {
         return vis_main(argc, argv);
     } catch (const settings::quit_after_help_exception &) {