diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2016-10-18 20:21:13 +0100 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2016-10-18 20:21:13 +0100 |
commit | 66d637be3d5a1c6b43105b16fbb7ac56311a20a1 (patch) | |
tree | 8171e3a1ae94cd741f6acaf98c252cd135fba469 /tmux.h | |
parent | ba9f47c544264d0d268092c9471a8cac2d1ea19f (diff) | |
parent | 9b991a73012c653614027ddd132c8304c4abb858 (diff) | |
download | rtmux-66d637be3d5a1c6b43105b16fbb7ac56311a20a1.tar.gz rtmux-66d637be3d5a1c6b43105b16fbb7ac56311a20a1.tar.bz2 rtmux-66d637be3d5a1c6b43105b16fbb7ac56311a20a1.zip |
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'tmux.h')
-rw-r--r-- | tmux.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1241,6 +1241,7 @@ enum cmdq_type { /* Command queue item. */ typedef enum cmd_retval (*cmdq_cb) (struct cmdq_item *, void *); struct cmdq_item { + const char *name; struct cmdq_list *queue; struct cmdq_item *next; @@ -1781,7 +1782,8 @@ char *cmd_list_print(struct cmd_list *); /* cmd-queue.c */ struct cmdq_item *cmdq_get_command(struct cmd_list *, struct cmd_find_state *, struct mouse_event *, int); -struct cmdq_item *cmdq_get_callback(cmdq_cb, void *); +#define cmdq_get_callback(cb, data) cmdq_get_callback1(#cb, cb, data) +struct cmdq_item *cmdq_get_callback1(const char *, cmdq_cb, void *); void cmdq_insert_after(struct cmdq_item *, struct cmdq_item *); void cmdq_append(struct client *, struct cmdq_item *); void printflike(3, 4) cmdq_format(struct cmdq_item *, const char *, |