Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-03-12 12:02:42 +00:00
15 changed files with 182 additions and 116 deletions

7
tmux.h
View File

@ -724,7 +724,10 @@ struct window_mode_entry {
const struct window_mode *mode;
void *data;
struct screen *screen;
u_int prefix;
TAILQ_ENTRY (window_mode_entry) entry;
};
/* Child window structure. */
@ -770,6 +773,7 @@ struct window_pane {
int fd;
struct bufferevent *event;
u_int disabled;
struct event resize_timer;
@ -795,7 +799,7 @@ struct window_pane {
struct grid *saved_grid;
struct grid_cell saved_cell;
struct window_mode_entry *mode;
TAILQ_HEAD (, window_mode_entry) modes;
struct event modetimer;
time_t modelast;
char *searchstr;
@ -2210,6 +2214,7 @@ int window_pane_set_mode(struct window_pane *,
const struct window_mode *, struct cmd_find_state *,
struct args *);
void window_pane_reset_mode(struct window_pane *);
void window_pane_reset_mode_all(struct window_pane *);
void window_pane_key(struct window_pane *, struct client *,
struct session *, struct winlink *, key_code,
struct mouse_event *);