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

Send secondary device attributes instead of primary which gives us a bit 

more useful information on some terminals.
pull/2172/head
nicm 2020-04-16 15:14:25 +00:00
parent 5ec80bd249
commit 363d950ac0
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tmux.h
View File

@ -1261,6 +1261,7 @@ struct tty {
struct event key_timer; struct event key_timer;
struct tty_key *key_tree; struct tty_key *key_tree;
}; };
#define tty_term_flags(tty) (tty->term->flags|tty->term_flags)
/* TTY command context. */ /* TTY command context. */
struct tty_ctx { struct tty_ctx {

32
tty-keys.c
View File

@ -1007,8 +1007,8 @@ tty_keys_clipboard(__unused struct tty *tty, const char *buf, size_t len,
} }
/* /*
* Handle device attributes input. Returns 0 for success, -1 for failure, 1 for * Handle secondary device attributes input. Returns 0 for success, -1 for
* partial. * failure, 1 for partial.
*/ */
static int static int
tty_keys_device_attributes(struct tty *tty, const char *buf, size_t len, tty_keys_device_attributes(struct tty *tty, const char *buf, size_t len,
@ -1032,7 +1032,7 @@ tty_keys_device_attributes(struct tty *tty, const char *buf, size_t len,
return (-1); return (-1);
if (len == 2) if (len == 2)
return (1); return (1);
if (buf[2] != '?') if (buf[2] != '>')
return (-1); return (-1);
if (len == 3) if (len == 3)
return (1); return (1);
@ -1048,7 +1048,7 @@ tty_keys_device_attributes(struct tty *tty, const char *buf, size_t len,
tmp[i] = '\0'; tmp[i] = '\0';
*size = 4 + i; *size = 4 + i;
/* Convert version numbers. */ /* Convert all arguments to numbers. */
cp = tmp; cp = tmp;
while ((next = strsep(&cp, ";")) != NULL) { while ((next = strsep(&cp, ";")) != NULL) {
p[n] = strtoul(next, &endptr, 10); p[n] = strtoul(next, &endptr, 10);
@ -1059,13 +1059,20 @@ tty_keys_device_attributes(struct tty *tty, const char *buf, size_t len,
/* Set terminal flags. */ /* Set terminal flags. */
switch (p[0]) { switch (p[0]) {
case 64: /* VT420 */ case 41: /* VT420 */
flags |= (TERM_DECFRA|TERM_DECSLRM); flags |= (TERM_DECFRA|TERM_DECSLRM);
break; break;
case 'M': /* mintty */
flags |= (TERM_256COLOURS|TERM_RGBCOLOURS);
break;
case 'T': /* tmux - if newer will have the DSR as well */
flags |= (TERM_UTF8|TERM_256COLOURS);
break;
case 'U': /* rxvt-unicode */
flags |= (TERM_UTF8);
break;
} }
for (i = 1; i < n; i++) log_debug("%s: received secondary DA %.*s", c->name, (int)*size, buf);
log_debug("%s: DA feature: %d", c->name, p[i]);
log_debug("%s: received DA %.*s", c->name, (int)*size, buf);
tty_set_flags(tty, flags); tty_set_flags(tty, flags);
tty->flags |= TTY_HAVEDA; tty->flags |= TTY_HAVEDA;
@ -1116,10 +1123,11 @@ tty_keys_device_status_report(struct tty *tty, const char *buf, size_t len,
*size = 3 + i; *size = 3 + i;
/* Set terminal flags. */ /* Set terminal flags. */
if (strncmp(tmp, "ITERM2 ", 7) == 0) if (strncmp(tmp, "ITERM2 ", 7) == 0) {
flags |= (TERM_DECSLRM|TERM_256COLOURS|TERM_RGBCOLOURS|TERM_SYNC); flags |= (TERM_UTF8|TERM_DECSLRM|TERM_SYNC|TERM_256COLOURS|
if (strncmp(tmp, "TMUX ", 5) == 0) TERM_RGBCOLOURS);
flags |= (TERM_256COLOURS|TERM_RGBCOLOURS); } else if (strncmp(tmp, "TMUX ", 5) == 0)
flags |= (TERM_UTF8|TERM_256COLOURS|TERM_RGBCOLOURS);
log_debug("%s: received DSR %.*s", c->name, (int)*size, buf); log_debug("%s: received DSR %.*s", c->name, (int)*size, buf);
tty_set_flags(tty, flags); tty_set_flags(tty, flags);

5
tty.c
View File

@ -364,7 +364,7 @@ tty_send_requests(struct tty *tty)
if (tty_term_flag(tty->term, TTYC_XT)) { if (tty_term_flag(tty->term, TTYC_XT)) {
if (~tty->flags & TTY_HAVEDA) if (~tty->flags & TTY_HAVEDA)
tty_puts(tty, "\033[c"); tty_puts(tty, "\033[>c");
if (~tty->flags & TTY_HAVEDSR) if (~tty->flags & TTY_HAVEDSR)
tty_puts(tty, "\033[1337n"); tty_puts(tty, "\033[1337n");
} else } else
@ -1175,8 +1175,7 @@ tty_clear_area(struct tty *tty, struct window_pane *wp, u_int py, u_int ny,
* background colour isn't default (because it doesn't work * background colour isn't default (because it doesn't work
* after SGR 0). * after SGR 0).
*/ */
if ((tty_get_flags(tty) & TERM_DECFRA) && if ((tty_get_flags(tty) & TERM_DECFRA) && !COLOUR_DEFAULT(bg)) {
!COLOUR_DEFAULT(bg)) {
xsnprintf(tmp, sizeof tmp, "\033[32;%u;%u;%u;%u$x", xsnprintf(tmp, sizeof tmp, "\033[32;%u;%u;%u;%u$x",
py + 1, px + 1, py + ny, px + nx); py + 1, px + 1, py + ny, px + nx);
tty_puts(tty, tmp); tty_puts(tty, tmp);