Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2019-11-14 16:01:25 +00:00
commit b67fd8f472
3 changed files with 16 additions and 3 deletions

View File

@ -37,7 +37,7 @@ const struct cmd_entry cmd_kill_pane_entry = {
.target = { 't', CMD_FIND_PANE, 0 }, .target = { 't', CMD_FIND_PANE, 0 },
.flags = 0, .flags = CMD_AFTERHOOK,
.exec = cmd_kill_pane_exec .exec = cmd_kill_pane_exec
}; };

10
tmux.h
View File

@ -1204,6 +1204,7 @@ struct tty {
TTY_VT220, TTY_VT220,
TTY_VT320, TTY_VT320,
TTY_VT420, TTY_VT420,
TTY_VT520,
TTY_UNKNOWN TTY_UNKNOWN
} term_type; } term_type;
@ -1220,7 +1221,14 @@ struct tty {
struct tty_key *key_tree; struct tty_key *key_tree;
}; };
#define TTY_TYPES \ #define TTY_TYPES \
{ "VT100", "VT101", "VT102", "VT220", "VT320", "VT420", "Unknown" } { "VT100", \
"VT101", \
"VT102", \
"VT220", \
"VT320", \
"VT420", \
"VT520", \
"Unknown" }
/* TTY command context. */ /* TTY command context. */
struct tty_ctx { struct tty_ctx {

View File

@ -1040,7 +1040,9 @@ tty_keys_device_attributes(struct tty *tty, const char *buf, size_t len,
b = strtoul(endptr + 1, &endptr, 10); b = strtoul(endptr + 1, &endptr, 10);
if (*endptr != '\0' && *endptr != ';') if (*endptr != '\0' && *endptr != ';')
b = 0; b = 0;
} else } else if (*endptr == '\0')
b = 0;
else
a = b = 0; a = b = 0;
/* Store terminal type. */ /* Store terminal type. */
@ -1064,6 +1066,9 @@ tty_keys_device_attributes(struct tty *tty, const char *buf, size_t len,
case 64: case 64:
type = TTY_VT420; type = TTY_VT420;
break; break;
case 65:
type = TTY_VT520;
break;
} }
tty_set_type(tty, type); tty_set_type(tty, type);