Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-04-13 16:01:46 +01:00
24 changed files with 103 additions and 99 deletions

18
tmux.h
View File

@ -1380,25 +1380,21 @@ struct cmd_parse_input {
struct cmd_find_state fs;
};
/* Command queue item shared state. */
struct cmdq_shared {
/* Command queue item state. */
struct cmdq_state {
int references;
int flags;
#define CMDQ_SHARED_REPEAT 0x1
#define CMDQ_SHARED_CONTROL 0x2
#define CMDQ_STATE_REPEAT 0x1
#define CMDQ_STATE_CONTROL 0x2
#define CMDQ_STATE_NOHOOKS 0x4
struct format_tree *formats;
struct mouse_event mouse;
struct key_event event;
struct cmd_find_state current;
};
/* Command queue flags. */
#define CMDQ_FIRED 0x1
#define CMDQ_WAITING 0x2
#define CMDQ_NOHOOKS 0x4
/* Command queue callback. */
typedef enum cmd_retval (*cmdq_cb) (struct cmdq_item *, void *);
@ -2114,7 +2110,7 @@ const char *cmdq_get_name(struct cmdq_item *);
struct client *cmdq_get_client(struct cmdq_item *);
struct cmd_find_state *cmdq_get_target(struct cmdq_item *);
struct cmd_find_state *cmdq_get_source(struct cmdq_item *);
struct cmdq_shared *cmdq_get_shared(struct cmdq_item *);
struct cmdq_state *cmdq_get_state(struct cmdq_item *);
void cmdq_merge_formats(struct cmdq_item *, struct format_tree *);
struct cmdq_item *cmdq_get_command(struct cmd_list *, struct cmd_find_state *,
struct mouse_event *, int);