=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v retrieving revision 1.510 retrieving revision 1.511 diff -c -r1.510 -r1.511 *** src/usr.bin/tmux/tmux.h 2015/05/08 16:44:03 1.510 --- src/usr.bin/tmux/tmux.h 2015/05/08 16:48:12 1.511 *************** *** 1,4 **** ! /* $OpenBSD: tmux.h,v 1.510 2015/05/08 16:44:03 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott --- 1,4 ---- ! /* $OpenBSD: tmux.h,v 1.511 2015/05/08 16:48:12 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott *************** *** 689,695 **** } type; char *str; ! long long num; struct grid_cell style; RB_ENTRY(options_entry) entry; --- 689,695 ---- } type; char *str; ! long long num; struct grid_cell style; RB_ENTRY(options_entry) entry; *************** *** 804,810 **** struct winlink *wl; int pane_id; ! char *ft_template; struct format_tree *ft; char *command; --- 804,810 ---- struct winlink *wl; int pane_id; ! char *ft_template; struct format_tree *ft; char *command; *************** *** 882,888 **** u_int id; char *name; struct event name_timer; ! struct timeval silence_timer; struct window_pane *active; struct window_pane *last; --- 882,888 ---- u_int id; char *name; struct event name_timer; ! struct timeval silence_timer; struct window_pane *active; struct window_pane *last; *************** *** 923,929 **** struct grid_cell status_cell; char *status_text; ! int flags; #define WINLINK_BELL 0x1 #define WINLINK_ACTIVITY 0x2 #define WINLINK_SILENCE 0x4 --- 923,929 ---- struct grid_cell status_cell; char *status_text; ! int flags; #define WINLINK_BELL 0x1 #define WINLINK_ACTIVITY 0x2 #define WINLINK_SILENCE 0x4 *************** *** 1015,1021 **** #define SESSION_UNATTACHED 0x1 /* not attached to any clients */ int flags; ! u_int attached; struct termios *tio; --- 1015,1021 ---- #define SESSION_UNATTACHED 0x1 /* not attached to any clients */ int flags; ! u_int attached; struct termios *tio; *************** *** 1028,1060 **** }; RB_HEAD(sessions, session); - /* TTY information. */ - struct tty_key { - char ch; - int key; - - struct tty_key *left; - struct tty_key *right; - - struct tty_key *next; - }; - - struct tty_term { - char *name; - u_int references; - - char acs[UCHAR_MAX + 1][2]; - - struct tty_code codes[NTTYCODE]; - - #define TERM_256COLOURS 0x1 - #define TERM_EARLYWRAP 0x2 - int flags; - - LIST_ENTRY(tty_term) entry; - }; - LIST_HEAD(tty_terms, tty_term); - /* Mouse button masks. */ #define MOUSE_MASK_BUTTONS 3 #define MOUSE_MASK_SHIFT 4 --- 1028,1033 ---- *************** *** 1096,1101 **** --- 1069,1101 ---- u_int sgr_b; }; + /* TTY information. */ + struct tty_key { + char ch; + int key; + + struct tty_key *left; + struct tty_key *right; + + struct tty_key *next; + }; + + struct tty_term { + char *name; + u_int references; + + char acs[UCHAR_MAX + 1][2]; + + struct tty_code codes[NTTYCODE]; + + #define TERM_256COLOURS 0x1 + #define TERM_EARLYWRAP 0x2 + int flags; + + LIST_ENTRY(tty_term) entry; + }; + LIST_HEAD(tty_terms, tty_term); + struct tty { struct client *client; *************** *** 1143,1149 **** void (*mouse_drag_update)(struct client *, struct mouse_event *); void (*mouse_drag_release)(struct client *, ! struct mouse_event *); struct event key_timer; struct tty_key *key_tree; --- 1143,1149 ---- void (*mouse_drag_update)(struct client *, struct mouse_event *); void (*mouse_drag_release)(struct client *, ! struct mouse_event *); struct event key_timer; struct tty_key *key_tree; *************** *** 1217,1223 **** void (*stdin_callback)(struct client *, int, void *); void *stdin_callback_data; struct evbuffer *stdin_data; ! int stdin_closed; struct evbuffer *stdout_data; struct evbuffer *stderr_data; --- 1217,1223 ---- void (*stdin_callback)(struct client *, int, void *); void *stdin_callback_data; struct evbuffer *stdin_data; ! int stdin_closed; struct evbuffer *stdout_data; struct evbuffer *stderr_data; *************** *** 1263,1269 **** int (*prompt_callbackfn)(void *, const char *); void (*prompt_freefn)(void *); void *prompt_data; ! u_int prompt_hindex; #define PROMPT_SINGLE 0x1 int prompt_flags; --- 1263,1269 ---- int (*prompt_callbackfn)(void *, const char *); void (*prompt_freefn)(void *); void *prompt_data; ! u_int prompt_hindex; #define PROMPT_SINGLE 0x1 int prompt_flags; *************** *** 1292,1299 **** struct args { struct args_tree tree; ! int argc; ! char **argv; }; /* Command and list of commands. */ --- 1292,1299 ---- struct args { struct args_tree tree; ! int argc; ! char **argv; }; /* Command and list of commands. */ *************** *** 1311,1318 **** }; struct cmd_list { ! int references; ! TAILQ_HEAD(, cmd) list; }; /* Command return values. */ --- 1311,1318 ---- }; struct cmd_list { ! int references; ! TAILQ_HEAD(, cmd) list; }; /* Command return values. */ *************** *** 1351,1357 **** void (*emptyfn)(struct cmd_q *); void *data; ! TAILQ_ENTRY(cmd_q) waitentry; }; /* Command definition. */ --- 1351,1357 ---- void (*emptyfn)(struct cmd_q *); void *data; ! TAILQ_ENTRY(cmd_q) waitentry; }; /* Command definition. */ *************** *** 1413,1420 **** const char *name; enum options_table_type type; ! u_int minimum; ! u_int maximum; const char **choices; const char *default_str; --- 1413,1420 ---- const char *name; enum options_table_type type; ! u_int minimum; ! u_int maximum; const char **choices; const char *default_str; *************** *** 1801,1807 **** void printflike(2, 3) cmdq_error(struct cmd_q *, const char *, ...); void cmdq_guard(struct cmd_q *, const char *, int); void cmdq_run(struct cmd_q *, struct cmd_list *, ! struct mouse_event *); void cmdq_append(struct cmd_q *, struct cmd_list *, struct mouse_event *); int cmdq_continue(struct cmd_q *); --- 1801,1807 ---- void printflike(2, 3) cmdq_error(struct cmd_q *, const char *, ...); void cmdq_guard(struct cmd_q *, const char *, int); void cmdq_run(struct cmd_q *, struct cmd_list *, ! struct mouse_event *); void cmdq_append(struct cmd_q *, struct cmd_list *, struct mouse_event *); int cmdq_continue(struct cmd_q *); *************** *** 1823,1830 **** extern struct key_tables key_tables; int key_table_cmp(struct key_table *, struct key_table *); int key_bindings_cmp(struct key_binding *, struct key_binding *); ! struct key_table *key_bindings_get_table(const char *, int); ! void key_bindings_unref_table(struct key_table *); void key_bindings_add(const char *, int, int, struct cmd_list *); void key_bindings_remove(const char *, int); void key_bindings_remove_table(const char *); --- 1823,1830 ---- extern struct key_tables key_tables; int key_table_cmp(struct key_table *, struct key_table *); int key_bindings_cmp(struct key_binding *, struct key_binding *); ! struct key_table *key_bindings_get_table(const char *, int); ! void key_bindings_unref_table(struct key_table *); void key_bindings_add(const char *, int, int, struct cmd_list *); void key_bindings_remove(const char *, int); void key_bindings_remove_table(const char *); *************** *** 1846,1852 **** /* server-client.c */ void server_client_handle_key(struct client *, int); void server_client_create(int); ! int server_client_open(struct client *, char **); void server_client_lost(struct client *); void server_client_callback(int, short, void *); void server_client_status_timer(void); --- 1846,1852 ---- /* server-client.c */ void server_client_handle_key(struct client *, int); void server_client_create(int); ! int server_client_open(struct client *, char **); void server_client_lost(struct client *); void server_client_callback(int, short, void *); void server_client_status_timer(void); *************** *** 2097,2105 **** void window_remove_pane(struct window *, struct window_pane *); struct window_pane *window_pane_at_index(struct window *, u_int); struct window_pane *window_pane_next_by_number(struct window *, ! struct window_pane *, u_int); struct window_pane *window_pane_previous_by_number(struct window *, ! struct window_pane *, u_int); int window_pane_index(struct window_pane *, u_int *); u_int window_count_panes(struct window *); void window_destroy_panes(struct window *); --- 2097,2105 ---- void window_remove_pane(struct window *, struct window_pane *); struct window_pane *window_pane_at_index(struct window *, u_int); struct window_pane *window_pane_next_by_number(struct window *, ! struct window_pane *, u_int); struct window_pane *window_pane_previous_by_number(struct window *, ! struct window_pane *, u_int); int window_pane_index(struct window_pane *, u_int *); u_int window_count_panes(struct window *); void window_destroy_panes(struct window *);