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

tui: handle Smulx extension capability (extended underline) (#9097)

Browse Source 
This was added to ncurses terminfo for vte and tmux.

Ref: https://github.com/tmux/tmux/issues/1492#issuecomment-427675180

Assumes color support is available when extended underline is supported.

Ref: https://github.com/tmux/tmux/issues/1492#issuecomment-427803984
This commit is contained in:
Daniel Hahler
2019-08-22 06:36:39 +02:00
committed by GitHub
parent 3223dedfc3
commit 42f492ac99
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,8 +123,9 @@ typedef struct {
int reset_scroll_region; int reset_scroll_region;
int set_cursor_style, reset_cursor_style; int set_cursor_style, reset_cursor_style;
int save_title, restore_title; int save_title, restore_title;
int enter_undercurl_mode, exit_undercurl_mode, set_underline_color;
int get_bg; int get_bg;
int set_underline_style;
int set_underline_color;
} unibi_ext; } unibi_ext;
char *space_buf; char *space_buf;
} TUIData; } TUIData;
@ -216,6 +217,7 @@ static void terminfo_start(UI *ui)
data->unibi_ext.set_cursor_style = -1; data->unibi_ext.set_cursor_style = -1;
data->unibi_ext.reset_cursor_style = -1; data->unibi_ext.reset_cursor_style = -1;
data->unibi_ext.get_bg = -1; data->unibi_ext.get_bg = -1;
data->unibi_ext.set_underline_color = -1;
data->out_fd = 1; data->out_fd = 1;
data->out_isatty = os_isatty(data->out_fd); data->out_isatty = os_isatty(data->out_fd);
@ -534,7 +536,7 @@ static void update_attrs(UI *ui, int attr_id)
bool underline; bool underline;
bool undercurl; bool undercurl;
if (data->unibi_ext.enter_undercurl_mode) { if (data->unibi_ext.set_underline_style != -1) {
underline = attr & HL_UNDERLINE; underline = attr & HL_UNDERLINE;
undercurl = attr & HL_UNDERCURL; undercurl = attr & HL_UNDERCURL;
} else { } else {
@ -577,10 +579,11 @@ static void update_attrs(UI *ui, int attr_id)
if (italic) { if (italic) {
unibi_out(ui, unibi_enter_italics_mode); unibi_out(ui, unibi_enter_italics_mode);
} }
if (undercurl && data->unibi_ext.enter_undercurl_mode) { if (undercurl && data->unibi_ext.set_underline_style != -1) {
unibi_out_ext(ui, data->unibi_ext.enter_undercurl_mode); UNIBI_SET_NUM_VAR(data->params[0], 3);
unibi_out_ext(ui, data->unibi_ext.set_underline_style);
} }
if ((undercurl || underline) && data->unibi_ext.set_underline_color) { if ((undercurl || underline) && data->unibi_ext.set_underline_color != -1) {
int color = attrs.rgb_sp_color; int color = attrs.rgb_sp_color;
if (color != -1) { if (color != -1) {
UNIBI_SET_NUM_VAR(data->params[0], (color >> 16) & 0xff); // red UNIBI_SET_NUM_VAR(data->params[0], (color >> 16) & 0xff); // red
@ -1911,13 +1914,19 @@ static void augment_terminfo(TUIData *data, const char *term,
data->unibi_ext.disable_mouse = (int)unibi_add_ext_str( data->unibi_ext.disable_mouse = (int)unibi_add_ext_str(
ut, "ext.disable_mouse", "\x1b[?1002l\x1b[?1006l"); ut, "ext.disable_mouse", "\x1b[?1002l\x1b[?1006l");
int ext_bool_Su = unibi_find_ext_bool(ut, "Su"); // used by kitty // Extended underline.
if (vte_version >= 5102 // terminfo will have Smulx for this (but no support for colors yet).
|| (ext_bool_Su != -1 && unibi_get_ext_bool(ut, (size_t)ext_bool_Su))) { data->unibi_ext.set_underline_style = unibi_find_ext_str(ut, "Smulx");
data->unibi_ext.enter_undercurl_mode = (int)unibi_add_ext_str( if (data->unibi_ext.set_underline_style == -1) {
ut, "ext.enter_undercurl_mode", "\x1b[4:3m"); int ext_bool_Su = unibi_find_ext_bool(ut, "Su"); // used by kitty
data->unibi_ext.exit_undercurl_mode = (int)unibi_add_ext_str( if (vte_version >= 5102
ut, "ext.exit_undercurl_mode", "\x1b[4:0m"); || (ext_bool_Su != -1
&& unibi_get_ext_bool(ut, (size_t)ext_bool_Su))) {
data->unibi_ext.set_underline_style = (int)unibi_add_ext_str(
ut, "ext.set_underline_style", "\x1b[4:%p1%dm");
}
}
if (data->unibi_ext.set_underline_style != -1) {
// Only support colon syntax. #9270 // Only support colon syntax. #9270
data->unibi_ext.set_underline_color = (int)unibi_add_ext_str( data->unibi_ext.set_underline_color = (int)unibi_add_ext_str(
ut, "ext.set_underline_color", "\x1b[58:2::%p1%d:%p2%d:%p3%dm"); ut, "ext.set_underline_color", "\x1b[58:2::%p1%d:%p2%d:%p3%dm");