diff options
| author |   nicm <nicm@openbsd.org> | 2020-04-16 15:14:25 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2020-04-16 15:14:25 +0000 |
| commit | 25e90a40b474210a11f711498a4ceca61561fadb (patch) | |
| tree | 7c566d0d1098419ad6706d6c1182f1c3b2e0fb1e /usr.bin/tmux/tty-keys.c | |
| parent | It is unclear why data is memcpy-ed into a char buf[2] that is used as (diff) | |
| download | wireguard-openbsd-25e90a40b474210a11f711498a4ceca61561fadb.tar.xz wireguard-openbsd-25e90a40b474210a11f711498a4ceca61561fadb.zip | |
Send secondary device attributes instead of primary which gives us a bit
more useful information on some terminals.
Diffstat (limited to 'usr.bin/tmux/tty-keys.c')
| -rw-r--r-- | usr.bin/tmux/tty-keys.c | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/usr.bin/tmux/tty-keys.c b/usr.bin/tmux/tty-keys.c index ff4d8fd93df..a66f2154292 100644 --- a/usr.bin/tmux/tty-keys.c +++ b/usr.bin/tmux/tty-keys.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty-keys.c,v 1.123 2020/04/16 13:35:24 nicm Exp $ */ +/* $OpenBSD: tty-keys.c,v 1.124 2020/04/16 15:14:25 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -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 - * partial. + * Handle secondary device attributes input. Returns 0 for success, -1 for + * failure, 1 for partial. */ static int 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); if (len == 2) return (1); - if (buf[2] != '?') + if (buf[2] != '>') return (-1); if (len == 3) return (1); @@ -1048,7 +1048,7 @@ tty_keys_device_attributes(struct tty *tty, const char *buf, size_t len, tmp[i] = '\0'; *size = 4 + i; - /* Convert version numbers. */ + /* Convert all arguments to numbers. */ cp = tmp; while ((next = strsep(&cp, ";")) != NULL) { 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. */ switch (p[0]) { - case 64: /* VT420 */ + case 41: /* VT420 */ flags |= (TERM_DECFRA|TERM_DECSLRM); 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: DA feature: %d", c->name, p[i]); - log_debug("%s: received DA %.*s", c->name, (int)*size, buf); + log_debug("%s: received secondary DA %.*s", c->name, (int)*size, buf); tty_set_flags(tty, flags); 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; /* Set terminal flags. */ - if (strncmp(tmp, "ITERM2 ", 7) == 0) - flags |= (TERM_DECSLRM|TERM_256COLOURS|TERM_RGBCOLOURS|TERM_SYNC); - if (strncmp(tmp, "TMUX ", 5) == 0) - flags |= (TERM_256COLOURS|TERM_RGBCOLOURS); + if (strncmp(tmp, "ITERM2 ", 7) == 0) { + flags |= (TERM_UTF8|TERM_DECSLRM|TERM_SYNC|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); tty_set_flags(tty, flags); |