diff options
| author | Yasuhiro Matsumoto <mattn.jp@gmail.com> | 2022-05-07 14:09:19 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-05-07 14:09:19 +0100 |
| commit | aa04e1b0be343ff606e25a48d59bc057edcc6e87 (patch) | |
| tree | 1a57bb0e3551d13aade2b2ed0ca413c6b9a062d3 | |
| parent | 3f1cfcb86407c15a3037d5595bb192a00c661303 (diff) | |
patch 8.2.4906: MS-Windows: cannot use transparent backgroundv8.2.4906
Problem: MS-Windows: cannot use transparent background.
Solution: Make transparent background work with 'termguicolors' and NONE
background color. (Yasuhiro Matsumoto, closes #10310, closes #7162)
| -rw-r--r-- | runtime/doc/options.txt | 7 | ||||
| -rw-r--r-- | src/os_win32.c | 15 | ||||
| -rw-r--r-- | src/term.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 17 insertions, 10 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 689c9a28c1..124cfee5e0 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -8079,6 +8079,13 @@ A jump table for the options with a short description can be found at |Q_op|. < This requires Vim to be built with the |+vtp| feature. Note that the "cterm" attributes are still used, not the "gui" ones. + + When using Vim with Windows Terminal, the background of Windows + Terminal is normally filled with the Vim background color. Setting + 'termguicolors' and the guibg of the Normal highlight group to NONE + will make the background transparent: > + :hi Normal guibg=NONE +< NOTE: This option is reset when 'compatible' is set. *'termwinkey'* *'twk'* diff --git a/src/os_win32.c b/src/os_win32.c index 7224fadef5..efb0cfd612 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -211,7 +211,6 @@ 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 @@ -7846,7 +7845,7 @@ vtp_init(void) 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 @@ vtp_init(void) 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 @@ get_default_console_color( 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; diff --git a/src/term.c b/src/term.c index 9cc480e6d0..84d6bd5a19 100644 --- a/src/term.c +++ b/src/term.c @@ -3084,7 +3084,8 @@ term_fg_rgb_color(guicolor_T rgb) void term_bg_rgb_color(guicolor_T rgb) { - term_rgb_color(T_8B, rgb); + if (rgb != INVALCOLOR) + term_rgb_color(T_8B, rgb); } void diff --git a/src/version.c b/src/version.c index af4c0b2546..d5963d46d5 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4906, +/**/ 4905, /**/ 4904, |