From 53d6b94e8aef09c0494ed8a53191063b605b3127 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 13 Apr 2020 13:32:09 +0000
Subject: Move the NOHOOKS flag into the shared flags.

---
 tmux.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 68e111cb..88cf16d8 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1385,6 +1385,7 @@ struct cmdq_shared {
 	int			 flags;
 #define CMDQ_SHARED_REPEAT 0x1
 #define CMDQ_SHARED_CONTROL 0x2
+#define CMDQ_SHARED_NOHOOKS 0x4
 
 	struct format_tree	*formats;
 
@@ -1392,11 +1393,6 @@ struct cmdq_shared {
 	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 *);
 
-- 
cgit 


From 77d5b0cc538138fd036dca0f9b2ba198a94c009d Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 13 Apr 2020 13:42:35 +0000
Subject: Store a key event not a mouse event in the shared data.

---
 tmux.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 88cf16d8..fc10d880 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1389,7 +1389,7 @@ struct cmdq_shared {
 
 	struct format_tree	*formats;
 
-	struct mouse_event	 mouse;
+	struct key_event	 event;
 	struct cmd_find_state	 current;
 };
 
-- 
cgit 


From 9a65102bfc2ed5d1e1f41e47451b8296c84f133d Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 13 Apr 2020 14:04:25 +0000
Subject: Rename cmdq_shared to cmdq_state which will better reflect what it is
 (going to be) used for.

---
 tmux.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index fc10d880..dbd046c4 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1378,14 +1378,14 @@ 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_SHARED_NOHOOKS 0x4
+#define CMDQ_STATE_REPEAT 0x1
+#define CMDQ_STATE_CONTROL 0x2
+#define CMDQ_STATE_NOHOOKS 0x4
 
 	struct format_tree	*formats;
 
@@ -2108,7 +2108,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);
-- 
cgit