Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-12-12 20:01:15 +00:00
16 changed files with 122 additions and 55 deletions

3
tmux.h
View File

@ -87,6 +87,7 @@ struct tmuxproc;
/* Special key codes. */
#define KEYC_NONE 0xffff00000000ULL
#define KEYC_UNKNOWN 0xfffe00000000ULL
#define KEYC_BASE 0x100000000000ULL
/* Key modifier bits. */
@ -1801,6 +1802,8 @@ void server_update_socket(void);
void server_add_accept(int);
/* server-client.c */
void server_client_set_key_table(struct client *, const char *);
const char *server_client_get_key_table(struct client *);
int server_client_check_nested(struct client *);
void server_client_handle_key(struct client *, key_code);
void server_client_create(int);