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: Fix terminfo extension indexes

Browse Source 
For unibilium extension indexes, use signed integer type initialized with -1 to
distinguish from the first extension string which will always have index 0.
This commit is contained in:
Thiago de Arruda 2015-02-19 20:22:16 -03:00
parent bbcddc55ee
commit 1ed7ae6260
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,9 +49,9 @@ typedef struct {
HlAttrs attrs, print_attrs; HlAttrs attrs, print_attrs;
Cell **screen; Cell **screen;
struct { struct {
size_t enable_mouse, disable_mouse; int enable_mouse, disable_mouse;
size_t enable_bracketed_paste, disable_bracketed_paste; int enable_bracketed_paste, disable_bracketed_paste;
size_t enter_insert_mode, exit_insert_mode; int enter_insert_mode, exit_insert_mode;
} unibi_ext; } unibi_ext;
} TUIData; } TUIData;
@ -88,6 +88,12 @@ void tui_start(void)
data->can_use_terminal_scroll = true; data->can_use_terminal_scroll = true;
data->bufpos = 0; data->bufpos = 0;
data->option_cache = pmap_new(cstr_t)(); data->option_cache = pmap_new(cstr_t)();
data->unibi_ext.enable_mouse = -1;
data->unibi_ext.disable_mouse = -1;
data->unibi_ext.enable_bracketed_paste = -1;
data->unibi_ext.disable_bracketed_paste = -1;
data->unibi_ext.enter_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
data->out_fd = os_isatty(1) ? 1 : (os_isatty(2) ? 2 : 1); data->out_fd = os_isatty(1) ? 1 : (os_isatty(2) ? 2 : 1);
@ -635,10 +641,12 @@ static void unibi_out(UI *ui, int unibi_index)
const char *str = NULL; const char *str = NULL;
if (unibi_index < unibi_string_begin_) { if (unibi_index >= 0) {
str = unibi_get_ext_str(data->ut, (unsigned)unibi_index); if (unibi_index < unibi_string_begin_) {
} else { str = unibi_get_ext_str(data->ut, (unsigned)unibi_index);
str = unibi_get_str(data->ut, (unsigned)unibi_index); } else {
str = unibi_get_str(data->ut, (unsigned)unibi_index);
}
} }
if (str) { if (str) {
@ -698,9 +706,9 @@ static void fix_terminfo(TUIData *data)
} }
if (STARTS_WITH(term, "xterm") || STARTS_WITH(term, "rxvt") || inside_tmux) { if (STARTS_WITH(term, "xterm") || STARTS_WITH(term, "rxvt") || inside_tmux) {
data->unibi_ext.enable_bracketed_paste = unibi_add_ext_str(ut, NULL, data->unibi_ext.enable_bracketed_paste = (int)unibi_add_ext_str(ut, NULL,
"\x1b[?2004h"); "\x1b[?2004h");
data->unibi_ext.disable_bracketed_paste = unibi_add_ext_str(ut, NULL, data->unibi_ext.disable_bracketed_paste = (int)unibi_add_ext_str(ut, NULL,
"\x1b[?2004l"); "\x1b[?2004l");
} }
@ -715,23 +723,23 @@ static void fix_terminfo(TUIData *data)
if ((term_prog && !strcmp(term_prog, "iTerm.app")) if ((term_prog && !strcmp(term_prog, "iTerm.app"))
|| os_getenv("ITERM_SESSION_ID") != NULL) { || os_getenv("ITERM_SESSION_ID") != NULL) {
// iterm // iterm
data->unibi_ext.enter_insert_mode = 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.exit_insert_mode = 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 = 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.exit_insert_mode = 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"));
} }
end: end:
// Fill some empty slots with common terminal strings // Fill some empty slots with common terminal strings
data->unibi_ext.enable_mouse = unibi_add_ext_str(ut, NULL, data->unibi_ext.enable_mouse = (int)unibi_add_ext_str(ut, NULL,
"\x1b[?1002h\x1b[?1006h"); "\x1b[?1002h\x1b[?1006h");
data->unibi_ext.disable_mouse = unibi_add_ext_str(ut, NULL, data->unibi_ext.disable_mouse = (int)unibi_add_ext_str(ut, NULL,
"\x1b[?1002l\x1b[?1006l"); "\x1b[?1002l\x1b[?1006l");
unibi_set_if_empty(ut, unibi_cursor_address, "\x1b[%i%p1%d;%p2%dH"); unibi_set_if_empty(ut, unibi_cursor_address, "\x1b[%i%p1%d;%p2%dH");
unibi_set_if_empty(ut, unibi_exit_attribute_mode, "\x1b[0;10m"); unibi_set_if_empty(ut, unibi_exit_attribute_mode, "\x1b[0;10m");