Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-05-01 14:01:14 +01:00
17 changed files with 82 additions and 32 deletions

6
tmux.h
View File

@ -45,6 +45,7 @@ struct client;
struct cmdq_item;
struct cmdq_list;
struct environ;
struct format_job_tree;
struct input_ctx;
struct mode_key_cmdstr;
struct mouse_event;
@ -1294,6 +1295,7 @@ struct client {
struct timeval activity_time;
struct environ *environ;
struct format_job_tree *jobs;
char *title;
const char *cwd;
@ -1505,7 +1507,8 @@ char *paste_make_sample(struct paste_buffer *);
#define FORMAT_PANE 0x80000000U
#define FORMAT_WINDOW 0x40000000U
struct format_tree;
struct format_tree *format_create(struct cmdq_item *, int, int);
struct format_tree *format_create(struct client *, struct cmdq_item *, int,
int);
void format_free(struct format_tree *);
void printflike(3, 4) format_add(struct format_tree *, const char *,
const char *, ...);
@ -1521,6 +1524,7 @@ void format_defaults_pane(struct format_tree *,
struct window_pane *);
void format_defaults_paste_buffer(struct format_tree *,
struct paste_buffer *);
void format_lost_client(struct client *);
/* hooks.c */
struct hook;