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 italics when $TERM is screen in tmux #12199

Browse Source 
Tmux uses smso to display italics when the default-terminal is screen,
screen-*. That's not the display the user wants, so change it to do the
same display as before f3ffe0b32.
fixes #12193.
This commit is contained in:
erw7 2020-04-28 23:14:28 +09:00 committed by GitHub
parent c7d3630e21
commit 9d0222ee3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1543,10 +1543,7 @@ static void patch_terminfo_bugs(TUIData *data, const char *term,
bool rxvt = terminfo_is_term_family(term, "rxvt"); bool rxvt = terminfo_is_term_family(term, "rxvt");
bool teraterm = terminfo_is_term_family(term, "teraterm"); bool teraterm = terminfo_is_term_family(term, "teraterm");
bool putty = terminfo_is_term_family(term, "putty"); bool putty = terminfo_is_term_family(term, "putty");
bool screen = terminfo_is_term_family(term, "screen") && !os_getenv("TMUX"); bool screen = terminfo_is_term_family(term, "screen");
bool screen_host_linuxvt =
terminfo_is_term_family(screen && term[6] == '.'
? term + 7 : NULL, "linux");
bool tmux = terminfo_is_term_family(term, "tmux") || !!os_getenv("TMUX"); bool tmux = terminfo_is_term_family(term, "tmux") || !!os_getenv("TMUX");
bool st = terminfo_is_term_family(term, "st"); bool st = terminfo_is_term_family(term, "st");
bool gnome = terminfo_is_term_family(term, "gnome") bool gnome = terminfo_is_term_family(term, "gnome")
@ -1563,6 +1560,10 @@ static void patch_terminfo_bugs(TUIData *data, const char *term,
bool mate_pretending_xterm = xterm && colorterm bool mate_pretending_xterm = xterm && colorterm
&& strstr(colorterm, "mate-terminal"); && strstr(colorterm, "mate-terminal");
bool true_xterm = xterm && !!xterm_version && !bsdvt; bool true_xterm = xterm && !!xterm_version && !bsdvt;
bool true_screen = screen && !os_getenv("TMUX");
bool screen_host_linuxvt =
terminfo_is_term_family(true_screen && term[6] == '.'
? term + 7 : NULL, "linux");
bool cygwin = terminfo_is_term_family(term, "cygwin"); bool cygwin = terminfo_is_term_family(term, "cygwin");
char *fix_normal = (char *)unibi_get_str(ut, unibi_cursor_normal); char *fix_normal = (char *)unibi_get_str(ut, unibi_cursor_normal);
@ -1707,7 +1708,8 @@ static void patch_terminfo_bugs(TUIData *data, const char *term,
data->unibi_ext.get_bg = data->unibi_ext.get_bg =
(int)unibi_add_ext_str(ut, "ext.get_bg", (int)unibi_add_ext_str(ut, "ext.get_bg",
SCREEN_TMUX_WRAP(screen, tmux, "\x1b]11;?\x07")); SCREEN_TMUX_WRAP(true_screen,
tmux, "\x1b]11;?\x07"));
// Terminals with 256-colour SGR support despite what terminfo says. // Terminals with 256-colour SGR support despite what terminfo says.
if (unibi_get_num(ut, unibi_max_colors) < 256) { if (unibi_get_num(ut, unibi_max_colors) < 256) {
@ -1744,7 +1746,7 @@ static void patch_terminfo_bugs(TUIData *data, const char *term,
// GNU Screen does not have Ss/Se. When terminfo has Ss/Se, it is wrapped with // GNU Screen does not have Ss/Se. When terminfo has Ss/Se, it is wrapped with
// DCS because it is inherited from the host terminal. // DCS because it is inherited from the host terminal.
if (screen) { if (true_screen) {
size_t len; size_t len;
size_t dcs_st_len = strlen(DCS_STR) + strlen(STERM_STR); size_t dcs_st_len = strlen(DCS_STR) + strlen(STERM_STR);
if (-1 != data->unibi_ext.set_cursor_style) { if (-1 != data->unibi_ext.set_cursor_style) {
@ -1783,7 +1785,7 @@ static void patch_terminfo_bugs(TUIData *data, const char *term,
|| (konsolev >= 180770) // #9364 || (konsolev >= 180770) // #9364
|| tmux // per tmux manual page || tmux // per tmux manual page
// https://lists.gnu.org/archive/html/screen-devel/2013-03/msg00000.html // https://lists.gnu.org/archive/html/screen-devel/2013-03/msg00000.html
|| (screen || (true_screen
&& (!screen_host_linuxvt && (!screen_host_linuxvt
|| (screen_host_linuxvt || (screen_host_linuxvt
&& (xterm_version || (vte_version > 0) || colorterm)))) && (xterm_version || (vte_version > 0) || colorterm))))
@ -1801,13 +1803,14 @@ static void patch_terminfo_bugs(TUIData *data, const char *term,
|| (linuxvt || (linuxvt
&& (xterm_version || (vte_version > 0) || colorterm)))) { && (xterm_version || (vte_version > 0) || colorterm)))) {
data->unibi_ext.set_cursor_style = data->unibi_ext.set_cursor_style =
(int)unibi_add_ext_str(ut, "Ss", SCREEN_WRAP(screen, "\x1b[%p1%d q")); (int)unibi_add_ext_str(ut, "Ss",
SCREEN_WRAP(true_screen, "\x1b[%p1%d q"));
if (-1 == data->unibi_ext.reset_cursor_style) { if (-1 == data->unibi_ext.reset_cursor_style) {
data->unibi_ext.reset_cursor_style = (int)unibi_add_ext_str(ut, "Se", data->unibi_ext.reset_cursor_style = (int)unibi_add_ext_str(ut, "Se",
""); "");
} }
unibi_set_ext_str(ut, (size_t)data->unibi_ext.reset_cursor_style, unibi_set_ext_str(ut, (size_t)data->unibi_ext.reset_cursor_style,
SCREEN_WRAP(screen, "\x1b[ q")); SCREEN_WRAP(true_screen, "\x1b[ q"));
} else if (linuxvt || screen_host_linuxvt) { } else if (linuxvt || screen_host_linuxvt) {
// Linux uses an idiosyncratic escape code to set the cursor shape and // Linux uses an idiosyncratic escape code to set the cursor shape and
// does not support DECSCUSR. // does not support DECSCUSR.
@ -1818,7 +1821,7 @@ static void patch_terminfo_bugs(TUIData *data, const char *term,
// linux-specific sequence in DCS and outputs it. // linux-specific sequence in DCS and outputs it.
data->unibi_ext.set_cursor_style = (int)unibi_add_ext_str( data->unibi_ext.set_cursor_style = (int)unibi_add_ext_str(
ut, "Ss", ut, "Ss",
SCREEN_WRAP(screen, SCREEN_WRAP(true_screen,
"\x1b[?" "\x1b[?"
"%?" "%?"
// The parameter passed to Ss is the DECSCUSR parameter, // The parameter passed to Ss is the DECSCUSR parameter,
@ -1843,13 +1846,13 @@ static void patch_terminfo_bugs(TUIData *data, const char *term,
""); "");
} }
unibi_set_ext_str(ut, (size_t)data->unibi_ext.reset_cursor_style, unibi_set_ext_str(ut, (size_t)data->unibi_ext.reset_cursor_style,
"\x1b[?c"); SCREEN_WRAP(true_screen, "\x1b[?c"));
} else if (konsolev > 0 && konsolev < 180770) { } else if (konsolev > 0 && konsolev < 180770) {
// Konsole before version 18.07.70: set up a nonce profile. This has // Konsole before version 18.07.70: set up a nonce profile. This has
// side-effects on temporary font resizing. #6798 // side-effects on temporary font resizing. #6798
data->unibi_ext.set_cursor_style = (int)unibi_add_ext_str( data->unibi_ext.set_cursor_style = (int)unibi_add_ext_str(
ut, "Ss", ut, "Ss",
SCREEN_TMUX_WRAP(screen, tmux, SCREEN_TMUX_WRAP(true_screen, tmux,
"\x1b]50;CursorShape=%?" "\x1b]50;CursorShape=%?"
"%p1%{3}%<" "%t%{0}" // block "%p1%{3}%<" "%t%{0}" // block
"%e%p1%{5}%<" "%t%{2}" // underline "%e%p1%{5}%<" "%t%{2}" // underline
@ -1865,7 +1868,7 @@ static void patch_terminfo_bugs(TUIData *data, const char *term,
""); "");
} }
unibi_set_ext_str(ut, (size_t)data->unibi_ext.reset_cursor_style, unibi_set_ext_str(ut, (size_t)data->unibi_ext.reset_cursor_style,
SCREEN_TMUX_WRAP(screen, tmux, "\x1b]50;\x07")); SCREEN_TMUX_WRAP(true_screen, tmux, "\x1b]50;\x07"));
} }
} }
} }
@ -1894,11 +1897,13 @@ static void augment_terminfo(TUIData *data, const char *term,
bool alacritty = terminfo_is_term_family(term, "alacritty"); bool alacritty = terminfo_is_term_family(term, "alacritty");
// None of the following work over SSH; see :help TERM . // None of the following work over SSH; see :help TERM .
bool iterm_pretending_xterm = xterm && iterm_env; bool iterm_pretending_xterm = xterm && iterm_env;
bool screen_host_rxvt =
terminfo_is_term_family(screen && term[6] == '.' ? term + 7 : NULL, "rxvt");
const char *xterm_version = os_getenv("XTERM_VERSION"); const char *xterm_version = os_getenv("XTERM_VERSION");
bool true_xterm = xterm && !!xterm_version && !bsdvt; bool true_xterm = xterm && !!xterm_version && !bsdvt;
bool true_screen = screen && !os_getenv("TMUX");
bool screen_host_rxvt =
terminfo_is_term_family(true_screen
&& term[6] == '.' ? term + 7 : NULL, "rxvt");
// Only define this capability for terminal types that we know understand it. // Only define this capability for terminal types that we know understand it.
if (dtterm // originated this extension if (dtterm // originated this extension
@ -1965,7 +1970,7 @@ static void augment_terminfo(TUIData *data, const char *term,
// all panes, which is not particularly desirable. A better approach // all panes, which is not particularly desirable. A better approach
// would use a tmux control sequence and an extra if(screen) test. // would use a tmux control sequence and an extra if(screen) test.
data->unibi_ext.set_cursor_color = (int)unibi_add_ext_str( data->unibi_ext.set_cursor_color = (int)unibi_add_ext_str(
ut, NULL, SCREEN_TMUX_WRAP(screen, tmux, "\033]Pl%p1%06x\033\\")); ut, NULL, SCREEN_TMUX_WRAP(true_screen, tmux, "\033]Pl%p1%06x\033\\"));
} else if ((xterm || rxvt || tmux || alacritty) } else if ((xterm || rxvt || tmux || alacritty)
&& (vte_version == 0 || vte_version >= 3900)) { && (vte_version == 0 || vte_version >= 3900)) {
// Supported in urxvt, newer VTE. // Supported in urxvt, newer VTE.
@ -1992,20 +1997,20 @@ static void augment_terminfo(TUIData *data, const char *term,
data->unibi_ext.disable_lr_margin = (int)unibi_add_ext_str( data->unibi_ext.disable_lr_margin = (int)unibi_add_ext_str(
ut, "ext.disable_lr_margin", "\x1b[?69l"); ut, "ext.disable_lr_margin", "\x1b[?69l");
data->unibi_ext.enable_bracketed_paste = (int)unibi_add_ext_str( data->unibi_ext.enable_bracketed_paste = (int)unibi_add_ext_str(
ut, "ext.enable_bpaste", SCREEN_WRAP(screen, "\x1b[?2004h")); ut, "ext.enable_bpaste", SCREEN_WRAP(true_screen, "\x1b[?2004h"));
data->unibi_ext.disable_bracketed_paste = (int)unibi_add_ext_str( data->unibi_ext.disable_bracketed_paste = (int)unibi_add_ext_str(
ut, "ext.disable_bpaste", SCREEN_WRAP(screen, "\x1b[?2004l")); ut, "ext.disable_bpaste", SCREEN_WRAP(true_screen, "\x1b[?2004l"));
// For urxvt send BOTH xterm and old urxvt sequences. #8695 // For urxvt send BOTH xterm and old urxvt sequences. #8695
data->unibi_ext.enable_focus_reporting = (int)unibi_add_ext_str( data->unibi_ext.enable_focus_reporting = (int)unibi_add_ext_str(
ut, "ext.enable_focus", ut, "ext.enable_focus",
(rxvt || screen_host_rxvt) (rxvt || screen_host_rxvt)
? SCREEN_WRAP(screen, "\x1b[?1004h\x1b]777;focus;on\x7") ? SCREEN_WRAP(true_screen, "\x1b[?1004h\x1b]777;focus;on\x7")
: SCREEN_WRAP(screen, "\x1b[?1004h")); : SCREEN_WRAP(true_screen, "\x1b[?1004h"));
data->unibi_ext.disable_focus_reporting = (int)unibi_add_ext_str( data->unibi_ext.disable_focus_reporting = (int)unibi_add_ext_str(
ut, "ext.disable_focus", ut, "ext.disable_focus",
(rxvt || screen_host_rxvt) (rxvt || screen_host_rxvt)
? SCREEN_WRAP(screen, "\x1b[?1004l\x1b]777;focus;off\x7") ? SCREEN_WRAP(true_screen, "\x1b[?1004l\x1b]777;focus;off\x7")
: SCREEN_WRAP(screen, "\x1b[?1004l")); : SCREEN_WRAP(true_screen, "\x1b[?1004l"));
data->unibi_ext.enable_mouse = (int)unibi_add_ext_str( data->unibi_ext.enable_mouse = (int)unibi_add_ext_str(
ut, "ext.enable_mouse", "\x1b[?1002h\x1b[?1006h"); ut, "ext.enable_mouse", "\x1b[?1002h\x1b[?1006h");
data->unibi_ext.disable_mouse = (int)unibi_add_ext_str( data->unibi_ext.disable_mouse = (int)unibi_add_ext_str(