circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-06 00:37:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2014-09-25 11:29:54 +01:00
parent 5e7f1b9f0a 21062d74d5
commit 2874a431c0
20 changed files with 140 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tmux.h
View File

@ -791,6 +791,7 @@ LIST_HEAD(joblist, job);
struct screen_sel {
int flag;
int rectflag;
int modekeys;
u_int sx;
u_int sy;
@ -953,6 +954,7 @@ struct window_pane {
#define PANE_FOCUSED 0x4
#define PANE_RESIZE 0x8
#define PANE_FOCUSPUSH 0x10
#define PANE_INPUTOFF 0x20
int argc;
char **argv;
@ -1919,6 +1921,9 @@ void cmdq_flush(struct cmd_q *);
int cmd_string_parse(const char *, struct cmd_list **, const char *,
u_int, char **);
/* cmd-wait-for.c */
void cmd_wait_for_flush(void);
/* client.c */
int client_main(int, char **, int);
@ -2320,7 +2325,7 @@ void set_signals(void(*)(int, short, void *));
void clear_signals(int);
/* control.c */
void control_callback(struct client *, int, void*);
void control_callback(struct client *, int, void *);
void printflike2 control_write(struct client *, const char *, ...);
void control_write_buffer(struct client *, struct evbuffer *);