patch 9.0.0344: MS-Windows: background color wrong in Console

Problem:    MS-Windows: background color wrong in Console.
Solution:   Figure out the default console background color. (Yasuhiro
            Matsumoto, issue #10310)

diff --git a/src/os_win32.c b/src/os_win32.c
index f06227f10ac0845ff095fc4fbb3b549dc3ba779c..e6ffcbac9212df980c291604c7e5b29b3a351a39 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -213,6 +213,7 @@ static int g_color_index_bg = 0;
 static int g_color_index_fg = 7;
 
 # ifdef FEAT_TERMGUICOLORS
+static int default_console_color_bg = 0x000000; // black
 static int default_console_color_fg = 0xc0c0c0; // white
 # endif
 
@@ -7878,6 +7879,13 @@ vtp_init(void)
     store_console_fg_rgb = save_console_fg_rgb;
 
 # ifdef FEAT_TERMGUICOLORS
+    if (!USE_WT)
+    {
+       COLORREF bg;
+       bg = (COLORREF)csbi.ColorTable[g_color_index_bg];
+       bg = (GetRValue(bg) << 16) | (GetGValue(bg) << 8) | GetBValue(bg);
+       default_console_color_bg = bg;
+    }
     fg = (COLORREF)csbi.ColorTable[g_color_index_fg];
     fg = (GetRValue(fg) << 16) | (GetGValue(fg) << 8) | GetBValue(fg);
     default_console_color_fg = fg;
@@ -8160,11 +8168,20 @@ get_default_console_color(
        ctermbg = -1;
        if (id > 0)
            syn_id2cterm_bg(id, &ctermfg, &ctermbg);
-       cterm_normal_bg_gui_color = guibg =
+       if (!USE_WT)
+       {
+           guibg = ctermbg != -1 ? ctermtoxterm(ctermbg)
+                                                   : default_console_color_bg;
+           cterm_normal_bg_gui_color = guibg;
+           ctermbg = ctermbg < 0 ? 0 : ctermbg;
+       }
+       else
+       {
+           cterm_normal_bg_gui_color = guibg =
                            ctermbg != -1 ? ctermtoxterm(ctermbg) : INVALCOLOR;
-
-       if (ctermbg < 0)
-           ctermbg = 0;
+           if (ctermbg < 0)
+               ctermbg = 0;
+       }
     }
 
     *cterm_fg = ctermfg;

diff --git a/src/version.c b/src/version.c
index f2991b872ad303d5aa7e0fad5723eb620aa753a2..dc45669b33f1fbe135c26f8e5b8c366227c74d07 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -707,6 +707,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    344,
 /**/
     343,
 /**/