circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Instead of having a default set of terminals in terminal-overrides that get XT 

added and using that as a marker for xterm(1)-like, assume that if the
terminfo(5) entry already has XT or the clear capability starts with CSI then
the terminal is VT100-like and it should be safe to send DA requests. The DA
responses trigger additional features being added.

This is all to detect extensions if terminfo(5) is wrong or inadequate. If it
fails, tmux will just fall back to using the capabilities in the terminfo(5)
entry alone.
pull/2195/head
Nicholas Marriott 2020-04-24 15:52:44 +01:00
parent e67d65064e
commit 527f66ed23
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
options-table.c
View File

@ -260,7 +260,7 @@ const struct options_table_entry options_table[] = {
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_SERVER,
.flags = OPTIONS_TABLE_IS_ARRAY,
.default_str = "tmux*:XT,rxvt*:XT,screen*:XT,xterm*:XT",
.default_str = "",
.separator = ","
},

1
tmux.h
View File

@ -1202,6 +1202,7 @@ struct tty_term {
#define TERM_DECSLRM 0x4
#define TERM_DECFRA 0x8
#define TERM_RGBCOLOURS 0x10
#define TERM_VT100LIKE 0x20
int flags;
LIST_ENTRY(tty_term) entry;

22
tty-term.c
View File

@ -561,16 +561,30 @@ tty_term_create(struct tty *tty, char *name, int *feat, int fd, char **cause)
goto error;
}
/*
* If TERM has XT or clear starts with CSI then it is safe to assume
* the terminal is derived from a VT100. This controls whether device
* attributes requests are sent to get more information.
*
* This is a bit of a hack but there aren't that many alternatives.
* Worst case tmux will just fall back to using whatever terminfo(5)
* says without trying to correct anything that is missing.
*
* Also add few features that VT100-like terminals should either
* support or safely ignore.
*/
s = tty_term_string(term, TTYC_CLEAR);
if (tty_term_flag(term, TTYC_XT) || strncmp(s, "\033[", 2) == 0) {
term->flags |= TERM_VT100LIKE;
tty_add_features(feat, "bpaste,focus,title", ",");
}
/* Add RGB feature if terminal has RGB colours. */
if ((tty_term_flag(term, TTYC_TC) || tty_term_has(term, TTYC_RGB)) &&
(!tty_term_has(term, TTYC_SETRGBF) ||
!tty_term_has(term, TTYC_SETRGBB)))
tty_add_features(feat, "RGB", ",");
/* Add some features if terminal has XT. */
if (tty_term_flag(term, TTYC_XT))
tty_add_features(feat, "bpaste,focus,title", ",");
/* Apply the features and overrides again. */
tty_apply_features(term, *feat);
tty_term_apply_overrides(term);

6
tty.c
View File

@ -334,7 +334,7 @@ tty_start_tty(struct tty *tty)
tty->flags |= TTY_FOCUS;
tty_raw(tty, tty_term_string(tty->term, TTYC_ENFCS));
}
if (tty_term_flag(tty->term, TTYC_XT))
if (tty->term->flags & TERM_VT100LIKE)
tty_puts(tty, "\033[?7727h");
evtimer_set(&tty->start_timer, tty_start_timer_callback, tty);
@ -357,7 +357,7 @@ tty_send_requests(struct tty *tty)
if (~tty->flags & TTY_STARTED)
return;
if (tty_term_flag(tty->term, TTYC_XT)) {
if (tty->term->flags & TERM_VT100LIKE) {
if (~tty->flags & TTY_HAVEDA)
tty_puts(tty, "\033[>c");
if (~tty->flags & TTY_HAVEXDA)
@ -420,7 +420,7 @@ tty_stop_tty(struct tty *tty)
tty->flags &= ~TTY_FOCUS;
tty_raw(tty, tty_term_string(tty->term, TTYC_DSFCS));
}
if (tty_term_flag(tty->term, TTYC_XT))
if (tty->term->flags & TERM_VT100LIKE)
tty_raw(tty, "\033[?7727l");
if (tty_use_margin(tty))