Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-01-11 18:01:13 +00:00
5 changed files with 36 additions and 34 deletions

7
tmux.h
View File

@ -1114,9 +1114,6 @@ struct tty {
u_int rleft;
u_int rright;
char *termname;
struct tty_term *term;
int fd;
struct bufferevent *event;
@ -1133,6 +1130,8 @@ struct tty {
#define TTY_FOCUS 0x40
int flags;
struct tty_term *term;
char *term_name;
int term_flags;
enum {
TTY_VT100,
@ -1154,6 +1153,8 @@ struct tty {
struct event key_timer;
struct tty_key *key_tree;
};
#define TTY_TYPES \
{ "VT100", "VT101", "VT102", "VT220", "VT320", "VT420", "UNKNOWN" }
/* TTY command context. */
struct tty_ctx {