kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-01-01 17:23:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21468 from neovim/backport-21407-to-release-0.8

Browse Source 
[Backport release-0.8] fix(tui): set cursor color parameter as string when required
This commit is contained in:
zeertzjq 2022-12-19 07:23:33 +08:00 committed by GitHub
commit bd3634d7a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -490,6 +490,7 @@ if(FEAT_TUI)
int int
main(void) main(void)
{ {
unibi_str_from_var(unibi_var_from_str(\"\"));
return unibi_num_from_var(unibi_var_from_num(0)); return unibi_num_from_var(unibi_var_from_num(0));
} }
" UNIBI_HAS_VAR_FROM) " UNIBI_HAS_VAR_FROM)

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

@ -63,8 +63,21 @@
do { \ do { \
(var) = unibi_var_from_num((num)); \ (var) = unibi_var_from_num((num)); \
} while (0) } while (0)
# define UNIBI_SET_STR_VAR(var, str) \
do { \
(var) = unibi_var_from_str((str)); \
} while (0)
#else #else
# define UNIBI_SET_NUM_VAR(var, num) (var).i = (num); # define UNIBI_SET_NUM_VAR(var, num) \
do { \
(var).p = NULL; \
(var).i = (num); \
} while (0)
# define UNIBI_SET_STR_VAR(var, str) \
do { \
(var).i = INT_MIN; \
(var).p = str; \
} while (0)
#endif #endif
typedef struct { typedef struct {
@ -106,6 +119,7 @@ struct TUIData {
bool mouse_move_enabled; bool mouse_move_enabled;
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 cursor_color_changed; bool cursor_color_changed;
bool is_starting; bool is_starting;
FILE *screenshot; FILE *screenshot;
@ -234,6 +248,7 @@ static void terminfo_start(UI *ui)
data->busy = false; data->busy = false;
data->cork = false; data->cork = false;
data->overflow = false; data->overflow = false;
data->set_cursor_color_as_str = false;
data->cursor_color_changed = false; data->cursor_color_changed = false;
data->showing_mode = SHAPE_IDX_N; data->showing_mode = SHAPE_IDX_N;
data->unibi_ext.enable_mouse = -1; data->unibi_ext.enable_mouse = -1;
@ -1177,8 +1192,14 @@ static void tui_set_mode(UI *ui, ModeShape mode)
// We interpret "inverse" as "default" (no termcode for "inverse"...). // We interpret "inverse" as "default" (no termcode for "inverse"...).
// Hopefully the user's default cursor color is inverse. // Hopefully the user's default cursor color is inverse.
unibi_out_ext(ui, data->unibi_ext.reset_cursor_color); unibi_out_ext(ui, data->unibi_ext.reset_cursor_color);
} else {
if (data->set_cursor_color_as_str) {
char hexbuf[8];
snprintf(hexbuf, 7 + 1, "#%06x", aep.rgb_bg_color);
UNIBI_SET_STR_VAR(data->params[0], hexbuf);
} else { } else {
UNIBI_SET_NUM_VAR(data->params[0], aep.rgb_bg_color); UNIBI_SET_NUM_VAR(data->params[0], aep.rgb_bg_color);
}
unibi_out_ext(ui, data->unibi_ext.set_cursor_color); unibi_out_ext(ui, data->unibi_ext.set_cursor_color);
data->cursor_color_changed = true; data->cursor_color_changed = true;
} }
@ -2147,10 +2168,20 @@ static void augment_terminfo(TUIData *data, const char *term, long vte_version,
&& (vte_version == 0 || vte_version >= 3900)) { && (vte_version == 0 || vte_version >= 3900)) {
// Supported in urxvt, newer VTE. // Supported in urxvt, newer VTE.
data->unibi_ext.set_cursor_color = (int)unibi_add_ext_str(ut, "ext.set_cursor_color", data->unibi_ext.set_cursor_color = (int)unibi_add_ext_str(ut, "ext.set_cursor_color",
"\033]12;#%p1%06x\007"); "\033]12;%p1%s\007");
} }
} }
if (-1 != data->unibi_ext.set_cursor_color) { if (-1 != data->unibi_ext.set_cursor_color) {
// Some terminals supporting cursor color changing specify their Cs
// capability to take a string parameter. Others take a numeric parameter.
// If and only if the format string contains `%s` we assume a string
// parameter. #20628
const char *set_cursor_color =
unibi_get_ext_str(ut, (unsigned)data->unibi_ext.set_cursor_color);
if (set_cursor_color) {
data->set_cursor_color_as_str = strstr(set_cursor_color, "%s") != NULL;
}
data->unibi_ext.reset_cursor_color = unibi_find_ext_str(ut, "Cr"); data->unibi_ext.reset_cursor_color = unibi_find_ext_str(ut, "Cr");
if (-1 == data->unibi_ext.reset_cursor_color) { if (-1 == data->unibi_ext.reset_cursor_color) {
data->unibi_ext.reset_cursor_color = (int)unibi_add_ext_str(ut, "ext.reset_cursor_color", data->unibi_ext.reset_cursor_color = (int)unibi_add_ext_str(ut, "ext.reset_cursor_color",