Mercurial > vim
changeset 30013:11cfe4c6d677 v9.0.0344
patch 9.0.0344: MS-Windows: background color wrong in Console
Commit: https://github.com/vim/vim/commit/e42c8dae32f3575557b83a371c4be66c09afbf7f
Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Date: Thu Sep 1 11:31:45 2022 +0100
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 01 Sep 2022 12:45:05 +0200 |
| parents | 94b5149875fa |
| children | 3fb163e2ef6c |
| files | src/os_win32.c src/version.c |
| diffstat | 2 files changed, 23 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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;