mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-03-31 04:42:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(tui): reset cursor to default style when guicursor is disabled #38219

Browse Source 
Problem:
Cursor style is not set to default when guicursor is disabled. See
return early when guicursor is disabled (rather than resetting the
cursor style to terminal default).

Solution:
Send the appropriate DECSCUSR sequence to reset the cursor style when
guicursor is disabled.

Note that this does not fix #23122. The CSI sequence sent out depends on
the terminal in question. Ideally, it would would send `\x1b[0 q` to
reset the cursor style; the behavior of this sequence depends on the
terminal and configuration in question. See [Ghostty
docs](https://ghostty.org/docs/vt/csi/decscusr) for more details.

In practice, it sends out `\x1b[2 q` (steady block) for Ghostty, which
seems to be coming from the Unibilium database. I'm not sure what it may
send out for other terminals, but it doesn't exactly reset to the
default style.
This commit is contained in:
Kyle
2026-03-10 06:03:02 -05:00
committed by GitHub
parent 4fb0f95330
commit 5b5b7eb8d4
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1273,6 +1273,17 @@ static CursorShape tui_cursor_decode_shape(const char *shape_str)
return shape;
}
/// Reset terminal cursor style. This may be different across terminals and
/// terminal configs. Also, it depends on what escape sequence Unibilium or
/// terminfo_builtin.h have set for kTerm_reset_cursor_style (which can also
/// depend on other runtime logic). It doesn't necessarily send out a
/// `\x1b[0 q` (terminal default) sequence.
/// See https://ghostty.org/docs/vt/csi/decscusr for more details.
static void tui_cursor_reset_style(TUIData *tui)
{
terminfo_out(tui, kTerm_reset_cursor_style);
}
static cursorentry_T decode_cursor_entry(Dict args)
{
cursorentry_T r = shape_table[0];
@@ -1298,7 +1309,8 @@ void tui_mode_info_set(TUIData *tui, bool guicursor_enabled, Array args)
{
cursor_style_enabled = guicursor_enabled;
if (!guicursor_enabled) {
return; // Do not send cursor style control codes.
tui_cursor_reset_style(tui);
return;
}
assert(args.size);
@@ -1355,6 +1367,7 @@ void tui_mouse_off(TUIData *tui)
static void tui_set_mode(TUIData *tui, ModeShape mode)
{
if (!cursor_style_enabled) {
tui_cursor_reset_style(tui);
return;
}
cursorentry_T c = tui->cursor_shapes[mode];