Better ANSI Color Support Detection

MAJigsaw77 · MAJigsaw77 · commit 260c31b4c2b0 · 2026-03-19T09:05:06.000+02:00
diff --git a/tools/hxcpp/BuildTool.hx b/tools/hxcpp/BuildTool.hx
@@ -1608,8 +1608,11 @@ class BuildTool
       }
 
 
-      if (defines.exists("HXCPP_NO_COLOUR") || defines.exists("HXCPP_NO_COLOR"))
+      if (Sys.getEnv("HXCPP_COLOUR") != null || Sys.getEnv("HXCPP_COLOR") != null)
+         Log.colorSupported = !(defines.exists("HXCPP_NO_COLOUR") || defines.exists("HXCPP_NO_COLOR"));
+      else if (defines.exists("HXCPP_NO_COLOUR") || defines.exists("HXCPP_NO_COLOR"))
          Log.colorSupported = false;
+
       Log.verbose = defines.exists("HXCPP_VERBOSE");
       Log.showSetup = defines.exists("HXCPP_LOG_SETUP");
       exitOnThreadError = defines.exists("HXCPP_EXIT_ON_ERROR");
diff --git a/tools/hxcpp/Log.hx b/tools/hxcpp/Log.hx
@@ -135,22 +135,29 @@ class Log
    {
       if (colorSupported == null)
       {
-         if (!BuildTool.isWindows)
-         {
-            var result = -1;
-            try
-            {
-               var process = new Process ("tput", [ "colors" ]);
-               result = process.exitCode ();
-               process.close ();
-            }
-            catch (e:Dynamic) {};
+         var term = Sys.getEnv("TERM");
 
-            colorSupported = (result == 0);
+         if (term == "dumb")
+         {
+            colorSupported = false;
          }
          else
          {
-            colorSupported = (Sys.getEnv("TERM") == "xterm" || Sys.getEnv("ANSICON") != null);
+            if (colorSupported != true && term != null)
+            {
+               colorSupported = ~/(?i)-256(color)?$/.match(term)
+                  || ~/(?i)^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/.match(term);
+            }
+
+            if (colorSupported != true)
+            {
+               colorSupported = Sys.getEnv("TERM_PROGRAM") == "iTerm.app"
+                  || Sys.getEnv("TERM_PROGRAM") == "Apple_Terminal"
+                  || Sys.getEnv("COLORTERM") != null
+                  || Sys.getEnv("ANSICON") != null
+                  || Sys.getEnv("ConEmuANSI") != null
+                  || Sys.getEnv("WT_SESSION") != null;
+            }
          }
       }
 
@@ -160,8 +167,7 @@ class Log
       }
       else
       {
-         var colorCodes:EReg = ~/\x1b\[[^m]+m/g;
-         return colorCodes.replace(output, "");
+         return ~/\x1b\[[0-9;]*m/g.replace(output, "");
       }
    }
 

Original file line number	Diff line number	Diff line change
`@@ -135,22 +135,29 @@ class Log`
`135`	`135`	`{`
`136`	`136`	`if (colorSupported == null)`
`137`	`137`	`{`
`138`		`- if (!BuildTool.isWindows)`
`139`		`- {`
`140`		`- var result = -1;`
`141`		`- try`
`142`		`- {`
`143`		`- var process = new Process ("tput", [ "colors" ]);`
`144`		`- result = process.exitCode ();`
`145`		`- process.close ();`
`146`		`- }`
`147`		`- catch (e:Dynamic) {};`
	`138`	`+ var term = Sys.getEnv("TERM");`
`148`	`139`
`149`		`- colorSupported = (result == 0);`
	`140`	`+ if (term == "dumb")`
	`141`	`+ {`
	`142`	`+ colorSupported = false;`
`150`	`143`	`}`
`151`	`144`	`else`
`152`	`145`	`{`
`153`		`- colorSupported = (Sys.getEnv("TERM") == "xterm" \|\| Sys.getEnv("ANSICON") != null);`
	`146`	`+ if (colorSupported != true && term != null)`
	`147`	`+ {`
	`148`	`+ colorSupported = ~/(?i)-256(color)?$/.match(term)`
	`149`	`+ \|\| ~/(?i)^screen\|^xterm\|^vt100\|^vt220\|^rxvt\|color\|ansi\|cygwin\|linux/.match(term);`
	`150`	`+ }`
	`151`	`+`
	`152`	`+ if (colorSupported != true)`
	`153`	`+ {`
	`154`	`+ colorSupported = Sys.getEnv("TERM_PROGRAM") == "iTerm.app"`
	`155`	`+ \|\| Sys.getEnv("TERM_PROGRAM") == "Apple_Terminal"`
	`156`	`+ \|\| Sys.getEnv("COLORTERM") != null`
	`157`	`+ \|\| Sys.getEnv("ANSICON") != null`
	`158`	`+ \|\| Sys.getEnv("ConEmuANSI") != null`
	`159`	`+ \|\| Sys.getEnv("WT_SESSION") != null;`
	`160`	`+ }`
`154`	`161`	`}`
`155`	`162`	`}`
`156`	`163`
`@@ -160,8 +167,7 @@ class Log`
`160`	`167`	`}`
`161`	`168`	`else`
`162`	`169`	`{`
`163`		`- var colorCodes:EReg = ~/\x1b\[[^m]+m/g;`
`164`		`- return colorCodes.replace(output, "");`
	`170`	`+ return ~/\x1b\[[0-9;]*m/g.replace(output, "");`
`165`	`171`	`}`
`166`	`172`	`}`
`167`	`173`