TTY/truecolor: another some colors broken (fix #1391)

1 files changed, 14 insertions, 2 deletions

diff --git a/WinPort/src/Backend/TTY/TTYOutput.cpp b/WinPort/src/Backend/TTY/TTYOutput.cpp
index 9c6f79e0..c8b0c5d2 100644
--- a/WinPort/src/Backend/TTY/TTYOutput.cpp
+++ b/WinPort/src/Backend/TTY/TTYOutput.cpp
@@ -73,10 +73,19 @@ void TTYOutput::WriteUpdatedAttributes(DWORD64 attr, bool is_space)
 		_tmp_attrs+= (attr & FOREGROUND_INTENSITY) ? "1;" : "22;";
 	}
 
+	bool emit_tc_fore =
+		((attr & FOREGROUND_TRUECOLOR) != 0 && (GET_RGB_FORE(xa) != 0 || (xa & FOREGROUND_TRUECOLOR) != 0));
+
+	bool emit_tc_back =
+		((attr & BACKGROUND_TRUECOLOR) != 0 && (GET_RGB_BACK(xa) != 0 || (xa & BACKGROUND_TRUECOLOR) != 0));
+
 	if ( ((xa & (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY)) != 0)
 	  || ((_prev_attr & FOREGROUND_TRUECOLOR) != 0 && (attr & FOREGROUND_TRUECOLOR) == 0) ) {
 		_tmp_attrs+= (attr & FOREGROUND_INTENSITY) ? '9' : '3';
 		AppendAnsiColorSuffix<FOREGROUND_RED, FOREGROUND_GREEN, FOREGROUND_BLUE>(_tmp_attrs, attr);
+		if ((attr & FOREGROUND_TRUECOLOR) != 0) {
+			emit_tc_fore = true;
+		}
 	}
 
 	if ( ((xa & (BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_INTENSITY)) != 0)
@@ -87,14 +96,17 @@ void TTYOutput::WriteUpdatedAttributes(DWORD64 attr, bool is_space)
 			_tmp_attrs+= '4';
 		}
 		AppendAnsiColorSuffix<BACKGROUND_RED, BACKGROUND_GREEN, BACKGROUND_BLUE>(_tmp_attrs, attr);
+		if ((attr & BACKGROUND_TRUECOLOR) != 0) {
+			emit_tc_back = true;
+		}
 	}
 
-	if ((attr & FOREGROUND_TRUECOLOR) != 0 && (GET_RGB_FORE(xa) != 0 || (xa & FOREGROUND_TRUECOLOR) != 0)) {
+	if (emit_tc_fore) {
 		_tmp_attrs+= "38;";
 		_true_colors.AppendSuffix(_tmp_attrs, GET_RGB_FORE(attr));
 	}
 
-	if ((attr & BACKGROUND_TRUECOLOR) != 0 && (GET_RGB_BACK(xa) != 0 || (xa & BACKGROUND_TRUECOLOR) != 0)) {
+	if (emit_tc_back) {
 		_tmp_attrs+= "48;";
 		_true_colors.AppendSuffix(_tmp_attrs, GET_RGB_BACK(attr));
 	}