commit dc7179f9a4cc74d864d1f6414e691d25bac8f831
author Christopher Plewright <chris@createng.com> Mon Jan 23 12:33:23 2023 +0000
committer Bram Moolenaar <Bram@vim.org> Mon Jan 23 12:33:23 2023 +0000
tree 4ae1b75eed477cbdad0f92cb241c6c12b52f689b
parent ebfec1c531f32d424bb2aca6e7391ef3bfcbfe20

patch 9.0.1235: MS-Windows console: not flushing termguicolors

Problem:    MS-Windows console: not flushing termguicolors.
Solution:   Flush termguicolors. (Christopher Plewright, closes #11871)

src/os_win32.c

diff --git a/src/os_win32.c b/src/os_win32.c
index ba5d228..e80533b 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -6776,20 +6776,30 @@
     WORD    attrFlash = ~g_attrCurrent & 0xff;
 
     DWORD   dwDummy;
-    LPWORD  oldattrs = ALLOC_MULT(WORD, Rows * Columns);
+    LPWORD  oldattrs = NULL;
 
-    if (oldattrs == NULL)
-	return;
-    ReadConsoleOutputAttribute(g_hConOut, oldattrs, Rows * Columns,
+# ifdef FEAT_TERMGUICOLORS
+    if (!(p_tgc || t_colors >= 256))
+# endif
+    {
+	oldattrs = ALLOC_MULT(WORD, Rows * Columns);
+	if (oldattrs == NULL)
+	    return;
+	ReadConsoleOutputAttribute(g_hConOut, oldattrs, Rows * Columns,
 			       coordOrigin, &dwDummy);
+    }
+
     FillConsoleOutputAttribute(g_hConOut, attrFlash, Rows * Columns,
 			       coordOrigin, &dwDummy);
 
     Sleep(15);	    // wait for 15 msec
-    if (!vtp_working)
+
+    if (oldattrs != NULL)
+    {
 	WriteConsoleOutputAttribute(g_hConOut, oldattrs, Rows * Columns,
 				coordOrigin, &dwDummy);
-    vim_free(oldattrs);
+	vim_free(oldattrs);
+    }
 }
 
 
@@ -8665,12 +8675,6 @@
     wt_working = mch_getenv("WT_SESSION") != NULL;
 }
 
-    int
-use_wt(void)
-{
-    return USE_WT;
-}
-
 # ifdef FEAT_TERMGUICOLORS
     static int
 ctermtoxterm(

src/proto/os_win32.pro

diff --git a/src/proto/os_win32.pro b/src/proto/os_win32.pro
index 6673c78..9f8b969 100644
--- a/src/proto/os_win32.pro
+++ b/src/proto/os_win32.pro
@@ -73,7 +73,6 @@
 void fix_arg_enc(void);
 int mch_setenv(char *var, char *value, int x);
 int vtp_printf(char *format, ...);
-int use_wt(void);
 void get_default_console_color(int *cterm_fg, int *cterm_bg, guicolor_T *gui_fg, guicolor_T *gui_bg);
 void control_console_color_rgb(void);
 int use_vtp(void);

src/term.c

diff --git a/src/term.c b/src/term.c
index 54da3d7..042b6a6 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3222,7 +3222,7 @@
     vim_snprintf(buf, MAX_COLOR_STR_LEN,
 				  (char *)s, RED(rgb), GREEN(rgb), BLUE(rgb));
 #ifdef FEAT_VTP
-    if (use_wt())
+    if (use_vtp() && (p_tgc || t_colors >= 256))
     {
 	out_flush();
 	buf[1] = '[';

src/version.c

diff --git a/src/version.c b/src/version.c
index 831b643..3e853b3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1235,
+/**/
     1234,
 /**/
     1233,