mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 11:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

terminal: preserve support for g:terminal_color_X = "#1234ab"

Browse Source
This commit is contained in:
Björn Linse
2019-10-10 22:16:55 +02:00
parent 31137e9bc7
commit cbaba19001
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/terminal.c
View File

@@ -138,6 +138,8 @@ struct terminal {
int pressed_button; // which mouse button is pressed int pressed_button; // which mouse button is pressed
bool pending_resize; // pending width/height bool pending_resize; // pending width/height
bool color_set[16];
size_t refcount; // reference count size_t refcount; // reference count
}; };
@@ -241,6 +243,7 @@ Terminal *terminal_open(TerminalOptions opts)
(uint8_t)((color_val >> 8) & 0xFF), (uint8_t)((color_val >> 8) & 0xFF),
(uint8_t)((color_val >> 0) & 0xFF)); (uint8_t)((color_val >> 0) & 0xFF));
vterm_state_set_palette_color(state, i, &color); vterm_state_set_palette_color(state, i, &color);
rv->color_set[i] = true;
} }
} }
} }
@@ -604,13 +607,16 @@ void terminal_get_line_attributes(Terminal *term, win_T *wp, int linenr,
int vt_fg_idx = ((!fg_default && fg_indexed) ? cell.fg.indexed.idx + 1 : 0); int vt_fg_idx = ((!fg_default && fg_indexed) ? cell.fg.indexed.idx + 1 : 0);
int vt_bg_idx = ((!bg_default && bg_indexed) ? cell.bg.indexed.idx + 1 : 0); int vt_bg_idx = ((!bg_default && bg_indexed) ? cell.bg.indexed.idx + 1 : 0);
bool fg_set = vt_fg_idx && vt_fg_idx <= 16 && term->color_set[vt_fg_idx-1];
bool bg_set = vt_bg_idx && vt_bg_idx <= 16 && term->color_set[vt_bg_idx-1];
int hl_attrs = (cell.attrs.bold ? HL_BOLD : 0) int hl_attrs = (cell.attrs.bold ? HL_BOLD : 0)
| (cell.attrs.italic ? HL_ITALIC : 0) | (cell.attrs.italic ? HL_ITALIC : 0)
| (cell.attrs.reverse ? HL_INVERSE : 0) | (cell.attrs.reverse ? HL_INVERSE : 0)
| (cell.attrs.underline ? HL_UNDERLINE : 0) | (cell.attrs.underline ? HL_UNDERLINE : 0)
| (cell.attrs.strike ? HL_STRIKETHROUGH: 0); | (cell.attrs.strike ? HL_STRIKETHROUGH: 0)
| (fg_indexed ? HL_FG_INDEXED : 0) | ((fg_indexed && !fg_set) ? HL_FG_INDEXED : 0)
| (bg_indexed ? HL_BG_INDEXED : 0); | ((bg_indexed && !bg_set) ? HL_BG_INDEXED : 0);
int attr_id = 0; int attr_id = 0;