GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-18 18:21:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(tui): only reset cursor color if it was changed (#31337)

Browse Source 
We already track this information so we might as well use it. This
eliminates a bunch of unnecessary OSC sequences.
This commit is contained in:
Gregory Anders
2024-11-25 09:00:42 -06:00
committed by GitHub
parent b47b0b3f75
commit a811d4babd
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/tui/tui.c
View File

@ -107,7 +107,7 @@ struct TUIData {
bool busy, is_invisible, want_invisible; bool busy, is_invisible, want_invisible;
bool cork, overflow; bool cork, overflow;
bool set_cursor_color_as_str; bool set_cursor_color_as_str;
bool cursor_color_changed; bool cursor_has_color;
bool is_starting; bool is_starting;
bool did_set_grapheme_cluster_mode; bool did_set_grapheme_cluster_mode;
FILE *screenshot; FILE *screenshot;
@ -336,7 +336,7 @@ static void terminfo_start(TUIData *tui)
tui->cork = false; tui->cork = false;
tui->overflow = false; tui->overflow = false;
tui->set_cursor_color_as_str = false; tui->set_cursor_color_as_str = false;
tui->cursor_color_changed = false; tui->cursor_has_color = false;
tui->showing_mode = SHAPE_IDX_N; tui->showing_mode = SHAPE_IDX_N;
tui->unibi_ext.enable_mouse = -1; tui->unibi_ext.enable_mouse = -1;
tui->unibi_ext.disable_mouse = -1; tui->unibi_ext.disable_mouse = -1;
@ -521,7 +521,7 @@ static void terminfo_stop(TUIData *tui)
// Exit alternate screen. // Exit alternate screen.
unibi_out(tui, unibi_exit_ca_mode); unibi_out(tui, unibi_exit_ca_mode);
} }
if (tui->cursor_color_changed) { if (tui->cursor_has_color) {
unibi_out_ext(tui, tui->unibi_ext.reset_cursor_color); unibi_out_ext(tui, tui->unibi_ext.reset_cursor_color);
} }
// Disable bracketed paste // Disable bracketed paste
@ -1302,11 +1302,12 @@ static void tui_set_mode(TUIData *tui, ModeShape mode)
UNIBI_SET_NUM_VAR(tui->params[0], aep.rgb_bg_color); UNIBI_SET_NUM_VAR(tui->params[0], aep.rgb_bg_color);
} }
unibi_out_ext(tui, tui->unibi_ext.set_cursor_color); unibi_out_ext(tui, tui->unibi_ext.set_cursor_color);
tui->cursor_color_changed = true; tui->cursor_has_color = true;
} }
} else if (c.id == 0) { } else if (c.id == 0 && tui->cursor_has_color) {
// No cursor color for this mode; reset to default. // No cursor color for this mode; reset to default.
tui->want_invisible = false; tui->want_invisible = false;
tui->cursor_has_color = false;
unibi_out_ext(tui, tui->unibi_ext.reset_cursor_color); unibi_out_ext(tui, tui->unibi_ext.reset_cursor_color);
} }