Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2018-12-18 14:02:40 +00:00
9 changed files with 37 additions and 25 deletions

9
tmux.h
View File

@ -54,6 +54,7 @@ struct options_entry;
struct session;
struct tmuxpeer;
struct tmuxproc;
struct winlink;
/* Client-server protocol version. */
#define PROTOCOL_VERSION 8
@ -701,11 +702,12 @@ struct window_mode {
void (*free)(struct window_pane *);
void (*resize)(struct window_pane *, u_int, u_int);
void (*key)(struct window_pane *, struct client *,
struct session *, key_code, struct mouse_event *);
struct session *, struct winlink *, key_code,
struct mouse_event *);
const char *(*key_table)(struct window_pane *);
void (*command)(struct window_pane *, struct client *,
struct session *, struct args *,
struct session *, struct winlink *, struct args *,
struct mouse_event *);
};
#define WINDOW_MODE_TIMEOUT 180
@ -2195,7 +2197,8 @@ int window_pane_set_mode(struct window_pane *,
struct args *);
void window_pane_reset_mode(struct window_pane *);
void window_pane_key(struct window_pane *, struct client *,
struct session *, key_code, struct mouse_event *);
struct session *, struct winlink *, key_code,
struct mouse_event *);
int window_pane_visible(struct window_pane *);
u_int window_pane_search(struct window_pane *, const char *);
const char *window_printable_flags(struct winlink *);