IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

tui: Use underline cursor in Replace mode

Browse Source 
This is a port of my original contribution to Vim, added in 7.4.687
(https://github.com/vim/vim/commit/v7-4-687). The TUI code has been
heavily refactored (see esp. 25ceadab37),
so this required some translation, but the logic is the same.
This commit is contained in:
Omar Sandoval 2015-05-17 01:39:22 -07:00 committed by Justin M. Keyes
parent fa48fc667a
commit f79025b9de
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/msgpack_rpc/remote_ui.c
View File

@ -218,6 +218,8 @@ static void remote_ui_mode_change(UI *ui, int mode)
Array args = ARRAY_DICT_INIT; Array args = ARRAY_DICT_INIT;
if (mode == INSERT) { if (mode == INSERT) {
ADD(args, STRING_OBJ(cstr_to_string("insert"))); ADD(args, STRING_OBJ(cstr_to_string("insert")));
} else if (mode == REPLACE) {
ADD(args, STRING_OBJ(cstr_to_string("replace")));
} else { } else {
assert(mode == NORMAL); assert(mode == NORMAL);
ADD(args, STRING_OBJ(cstr_to_string("normal"))); ADD(args, STRING_OBJ(cstr_to_string("normal")));

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

@ -61,7 +61,7 @@ typedef struct {
struct { struct {
int enable_mouse, disable_mouse; int enable_mouse, disable_mouse;
int enable_bracketed_paste, disable_bracketed_paste; int enable_bracketed_paste, disable_bracketed_paste;
int enter_insert_mode, exit_insert_mode; int enter_insert_mode, enter_replace_mode, exit_insert_mode;
int set_rgb_foreground, set_rgb_background; int set_rgb_foreground, set_rgb_background;
} unibi_ext; } unibi_ext;
} TUIData; } TUIData;
@ -105,6 +105,7 @@ UI *tui_start(void)
data->unibi_ext.enable_bracketed_paste = -1; data->unibi_ext.enable_bracketed_paste = -1;
data->unibi_ext.disable_bracketed_paste = -1; data->unibi_ext.disable_bracketed_paste = -1;
data->unibi_ext.enter_insert_mode = -1; data->unibi_ext.enter_insert_mode = -1;
data->unibi_ext.enter_replace_mode = -1;
data->unibi_ext.exit_insert_mode = -1; data->unibi_ext.exit_insert_mode = -1;
// write output to stderr if stdout is not a tty // write output to stderr if stdout is not a tty
@ -413,6 +414,10 @@ static void tui_mode_change(UI *ui, int mode)
if (data->showing_mode != INSERT) { if (data->showing_mode != INSERT) {
unibi_out(ui, data->unibi_ext.enter_insert_mode); unibi_out(ui, data->unibi_ext.enter_insert_mode);
} }
} else if (mode == REPLACE) {
if (data->showing_mode != REPLACE) {
unibi_out(ui, data->unibi_ext.enter_replace_mode);
}
} else { } else {
assert(mode == NORMAL); assert(mode == NORMAL);
if (data->showing_mode != NORMAL) { if (data->showing_mode != NORMAL) {
@ -810,12 +815,16 @@ static void fix_terminfo(TUIData *data)
// iterm // iterm
data->unibi_ext.enter_insert_mode = (int)unibi_add_ext_str(ut, NULL, data->unibi_ext.enter_insert_mode = (int)unibi_add_ext_str(ut, NULL,
TMUX_WRAP("\x1b]50;CursorShape=1;BlinkingCursorEnabled=1\x07")); TMUX_WRAP("\x1b]50;CursorShape=1;BlinkingCursorEnabled=1\x07"));
data->unibi_ext.enter_replace_mode = (int)unibi_add_ext_str(ut, NULL,
TMUX_WRAP("\x1b]50;CursorShape=2;BlinkingCursorEnabled=1\x07"));
data->unibi_ext.exit_insert_mode = (int)unibi_add_ext_str(ut, NULL, data->unibi_ext.exit_insert_mode = (int)unibi_add_ext_str(ut, NULL,
TMUX_WRAP("\x1b]50;CursorShape=0;BlinkingCursorEnabled=0\x07")); TMUX_WRAP("\x1b]50;CursorShape=0;BlinkingCursorEnabled=0\x07"));
} else { } else {
// xterm-like sequences for blinking bar and solid block // xterm-like sequences for blinking bar and solid block
data->unibi_ext.enter_insert_mode = (int)unibi_add_ext_str(ut, NULL, data->unibi_ext.enter_insert_mode = (int)unibi_add_ext_str(ut, NULL,
TMUX_WRAP("\x1b[5 q")); TMUX_WRAP("\x1b[5 q"));
data->unibi_ext.enter_replace_mode = (int)unibi_add_ext_str(ut, NULL,
TMUX_WRAP("\x1b[3 q"));
data->unibi_ext.exit_insert_mode = (int)unibi_add_ext_str(ut, NULL, data->unibi_ext.exit_insert_mode = (int)unibi_add_ext_str(ut, NULL,
TMUX_WRAP("\x1b[2 q")); TMUX_WRAP("\x1b[2 q"));
} }

4
src/nvim/ui.c
View File

@ -476,7 +476,9 @@ static void ui_mode_change(void)
return; return;
} }
/* Get a simple UI mode out of State. */ /* Get a simple UI mode out of State. */
if (State & INSERT) if ((State & REPLACE) == REPLACE)
mode = REPLACE;
else if (State & INSERT)
mode = INSERT; mode = INSERT;
else else
mode = NORMAL; mode = NORMAL;

2
test/functional/ui/screen.lua
View File

@ -341,7 +341,7 @@ function Screen:_handle_mouse_off()
end end
function Screen:_handle_mode_change(mode) function Screen:_handle_mode_change(mode)
assert(mode == 'insert' or mode == 'normal') assert(mode == 'insert' or mode == 'replace' or mode == 'normal')
self._mode = mode self._mode = mode
end end