patch 8.0.1362: terminal window colors wrong when using Terminal highlighting
Problem: Terminal window colors wrong when using Terminal highlighting.
Solution: Set ansi_index when setting the default color. Also cache the
color index for Terminal. (Ozaki Kiichi, closes #2393)
diff --git a/src/libvterm/src/pen.c b/src/libvterm/src/pen.c
index e9a6de9..38c7a6e 100644
--- a/src/libvterm/src/pen.c
+++ b/src/libvterm/src/pen.c
@@ -213,9 +213,7 @@
void vterm_state_set_default_colors(VTermState *state, const VTermColor *default_fg, const VTermColor *default_bg)
{
state->default_fg = *default_fg;
- state->default_fg.ansi_index = VTERM_ANSI_INDEX_DEFAULT;
state->default_bg = *default_bg;
- state->default_bg.ansi_index = VTERM_ANSI_INDEX_DEFAULT;
}
void vterm_state_set_palette_color(VTermState *state, int index, const VTermColor *col)
diff --git a/src/proto/terminal.pro b/src/proto/terminal.pro
index 7f64b90..4b39daa 100644
--- a/src/proto/terminal.pro
+++ b/src/proto/terminal.pro
@@ -20,6 +20,7 @@
int term_get_attr(buf_T *buf, linenr_T lnum, int col);
char_u *term_get_status_text(term_T *term);
int set_ref_in_term(int copyID);
+void set_terminal_default_colors(int cterm_fg, int cterm_bg);
void f_term_getaltscreen(typval_T *argvars, typval_T *rettv);
void f_term_getattr(typval_T *argvars, typval_T *rettv);
void f_term_getcursor(typval_T *argvars, typval_T *rettv);
diff --git a/src/syntax.c b/src/syntax.c
index d733f5b..d247e0d 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -7391,6 +7391,9 @@
int error = FALSE;
int color;
int is_normal_group = FALSE; /* "Normal" group */
+#ifdef FEAT_TERMINAL
+ int is_terminal_group = FALSE; /* "Terminal" group */
+#endif
#ifdef FEAT_GUI_X11
int is_menu_group = FALSE; /* "Menu" group */
int is_scrollbar_group = FALSE; /* "Scrollbar" group */
@@ -7616,6 +7619,10 @@
if (STRCMP(HL_TABLE()[idx].sg_name_u, "NORMAL") == 0)
is_normal_group = TRUE;
+#ifdef FEAT_TERMINAL
+ else if (STRCMP(HL_TABLE()[idx].sg_name_u, "TERMINAL") == 0)
+ is_terminal_group = TRUE;
+#endif
#ifdef FEAT_GUI_X11
else if (STRCMP(HL_TABLE()[idx].sg_name_u, "MENU") == 0)
is_menu_group = TRUE;
@@ -8239,6 +8246,11 @@
}
#endif
}
+#ifdef FEAT_TERMINAL
+ else if (is_terminal_group)
+ set_terminal_default_colors(
+ HL_TABLE()[idx].sg_cterm_fg, HL_TABLE()[idx].sg_cterm_bg);
+#endif
#ifdef FEAT_GUI_X11
# ifdef FEAT_MENU
else if (is_menu_group)
diff --git a/src/terminal.c b/src/terminal.c
index a2858a2..61630d5 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -188,6 +188,9 @@
* backspace key. */
static int term_backspace_char = BS;
+/* "Terminal" highlight group colors. */
+static int term_default_cterm_fg = -1;
+static int term_default_cterm_bg = -1;
/**************************************
* 1. Generic code for all systems.
@@ -1834,20 +1837,12 @@
int bg = color2index(&cellbg, FALSE, &bold);
/* Use the "Terminal" highlighting for the default colors. */
- if (fg == 0 || bg == 0)
+ if ((fg == 0 || bg == 0) && t_colors >= 16)
{
- int id = syn_name2id((char_u *)"Terminal");
-
- if (id != 0 && t_colors >= 16)
- {
- int cterm_fg, cterm_bg;
-
- syn_id2cterm_bg(id, &cterm_fg, &cterm_bg);
- if (cterm_fg >= 0)
- fg = cterm_fg + 1;
- if (cterm_bg >= 0)
- bg = cterm_bg + 1;
- }
+ if (fg == 0 && term_default_cterm_fg >= 0)
+ fg = term_default_cterm_fg + 1;
+ if (bg == 0 && term_default_cterm_bg >= 0)
+ bg = term_default_cterm_bg + 1;
}
/* with 8 colors set the bold attribute to get a bright foreground */
@@ -2470,6 +2465,7 @@
rgb->blue = cube_value[idx % 6];
rgb->green = cube_value[idx / 6 % 6];
rgb->red = cube_value[idx / 36 % 6];
+ rgb->ansi_index = VTERM_ANSI_INDEX_NONE;
}
else if (nr < 256)
{
@@ -2478,6 +2474,7 @@
rgb->blue = grey_ramp[idx];
rgb->green = grey_ramp[idx];
rgb->red = grey_ramp[idx];
+ rgb->ansi_index = VTERM_ANSI_INDEX_NONE;
}
}
@@ -2520,6 +2517,7 @@
}
fg->red = fg->green = fg->blue = fgval;
bg->red = bg->green = bg->blue = bgval;
+ fg->ansi_index = bg->ansi_index = VTERM_ANSI_INDEX_DEFAULT;
/* The "Terminal" highlight group overrules the defaults. */
id = syn_name2id((char_u *)"Terminal");
@@ -2582,13 +2580,10 @@
#endif
if (id != 0 && t_colors >= 16)
{
- int cterm_fg, cterm_bg;
-
- syn_id2cterm_bg(id, &cterm_fg, &cterm_bg);
- if (cterm_fg >= 0)
- cterm_color2rgb(cterm_fg, fg);
- if (cterm_bg >= 0)
- cterm_color2rgb(cterm_bg, bg);
+ if (term_default_cterm_fg >= 0)
+ cterm_color2rgb(term_default_cterm_fg, fg);
+ if (term_default_cterm_bg >= 0)
+ cterm_color2rgb(term_default_cterm_bg, bg);
}
else
{
@@ -2705,6 +2700,16 @@
}
/*
+ * Cache "Terminal" highlight group colors.
+ */
+ void
+set_terminal_default_colors(int cterm_fg, int cterm_bg)
+{
+ term_default_cterm_fg = cterm_fg - 1;
+ term_default_cterm_bg = cterm_bg - 1;
+}
+
+/*
* Get the buffer from the first argument in "argvars".
* Returns NULL when the buffer is not for a terminal window.
*/
diff --git a/src/version.c b/src/version.c
index 604fa41..974ca2c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1362,
+/**/
1361,
/**/
1360,