commit aa04e1b0be343ff606e25a48d59bc057edcc6e87
author Yasuhiro Matsumoto <mattn.jp@gmail.com> Sat May 07 14:09:19 2022 +0100
committer Bram Moolenaar <Bram@vim.org> Sat May 07 14:09:19 2022 +0100
tree 1a57bb0e3551d13aade2b2ed0ca413c6b9a062d3
parent 3f1cfcb86407c15a3037d5595bb192a00c661303

patch 8.2.4906: MS-Windows: cannot use transparent background

Problem:    MS-Windows: cannot use transparent background.
Solution:   Make transparent background work with 'termguicolors' and NONE
            background color. (Yasuhiro Matsumoto, closes #10310, closes #7162)

src/os_win32.c

diff --git a/src/os_win32.c b/src/os_win32.c
index 7224fad..efb0cfd 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -211,7 +211,6 @@
 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
 
@@ -7846,7 +7845,7 @@
     HMODULE hKerneldll;
     DYN_CONSOLE_SCREEN_BUFFER_INFOEX csbi;
 # ifdef FEAT_TERMGUICOLORS
-    COLORREF fg, bg;
+    COLORREF fg;
 # endif
 
     // Use functions supported from Vista
@@ -7873,11 +7872,8 @@
     store_console_fg_rgb = save_console_fg_rgb;
 
 # ifdef FEAT_TERMGUICOLORS
-    bg = (COLORREF)csbi.ColorTable[g_color_index_bg];
     fg = (COLORREF)csbi.ColorTable[g_color_index_fg];
-    bg = (GetRValue(bg) << 16) | (GetGValue(bg) << 8) | GetBValue(bg);
     fg = (GetRValue(fg) << 16) | (GetGValue(fg) << 8) | GetBValue(fg);
-    default_console_color_bg = bg;
     default_console_color_fg = fg;
 # endif
 
@@ -8158,10 +8154,11 @@
 	ctermbg = -1;
 	if (id > 0)
 	    syn_id2cterm_bg(id, &ctermfg, &ctermbg);
-	guibg = ctermbg != -1 ? ctermtoxterm(ctermbg)
-						    : default_console_color_bg;
-	cterm_normal_bg_gui_color = guibg;
-	ctermbg = ctermbg < 0 ? 0 : ctermbg;
+	cterm_normal_bg_gui_color = guibg =
+			    ctermbg != -1 ? ctermtoxterm(ctermbg) : INVALCOLOR;
+
+	if (ctermbg < 0)
+	    ctermbg = 0;
     }
 
     *cterm_fg = ctermfg;

src/term.c

diff --git a/src/term.c b/src/term.c
index 9cc480e..84d6bd5 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3084,7 +3084,8 @@
     void
 term_bg_rgb_color(guicolor_T rgb)
 {
-    term_rgb_color(T_8B, rgb);
+    if (rgb != INVALCOLOR)
+	term_rgb_color(T_8B, rgb);
 }
 
     void

src/version.c

diff --git a/src/version.c b/src/version.c
index af4c0b2..d5963d4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4906,
+/**/
     4905,
 /**/
     4904,