Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-04-19 10:01:12 +01:00
5 changed files with 76 additions and 6 deletions

7
tmux.h
View File

@ -1047,7 +1047,8 @@ struct tty {
struct evbuffer *in;
struct event event_out;
struct evbuffer *out;
size_t written;
struct event timer;
size_t discarded;
struct termios tio;
@ -1063,6 +1064,7 @@ struct tty {
#define TTY_STARTED 0x10
#define TTY_OPENED 0x20
#define TTY_FOCUS 0x40
#define TTY_BLOCK 0x80
int flags;
struct tty_term *term;
@ -1310,6 +1312,9 @@ struct client {
char *ttyname;
struct tty tty;
size_t written;
size_t discarded;
void (*stdin_callback)(struct client *, int, void *);
void *stdin_callback_data;
struct evbuffer *stdin_data;