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.

---
 cmd-copy-mode.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cmd-copy-mode.c')

diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c
index d5e132f9..2fa6ae2e 100644
--- a/cmd-copy-mode.c
+++ b/cmd-copy-mode.c
@@ -70,7 +70,7 @@ cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item)
 	}
 
 	if (args_has(args, 'M')) {
-		if ((wp = cmd_mouse_pane(&shared->mouse, &s, NULL)) == NULL)
+		if ((wp = cmd_mouse_pane(&shared->event.m, &s, NULL)) == NULL)
 			return (CMD_RETURN_NORMAL);
 		if (c == NULL || c->session != s)
 			return (CMD_RETURN_NORMAL);
@@ -87,7 +87,7 @@ cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item)
 		swp = wp;
 	if (!window_pane_set_mode(wp, swp, &window_copy_mode, NULL, args)) {
 		if (args_has(args, 'M'))
-			window_copy_start_drag(c, &shared->mouse);
+			window_copy_start_drag(c, &shared->event.m);
 	}
 	if (args_has(args, 'u'))
 		window_copy_pageup(wp, 0);
-- 
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.

---
 cmd-copy-mode.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cmd-copy-mode.c')

diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c
index 2fa6ae2e..01006e5b 100644
--- a/cmd-copy-mode.c
+++ b/cmd-copy-mode.c
@@ -57,7 +57,7 @@ static enum cmd_retval
 cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = cmd_get_args(self);
-	struct cmdq_shared	*shared = cmdq_get_shared(item);
+	struct cmdq_state	*state = cmdq_get_state(item);
 	struct cmd_find_state	*source = cmdq_get_source(item);
 	struct cmd_find_state	*target = cmdq_get_target(item);
 	struct client		*c = cmdq_get_client(item);
@@ -70,7 +70,7 @@ cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item)
 	}
 
 	if (args_has(args, 'M')) {
-		if ((wp = cmd_mouse_pane(&shared->event.m, &s, NULL)) == NULL)
+		if ((wp = cmd_mouse_pane(&state->event.m, &s, NULL)) == NULL)
 			return (CMD_RETURN_NORMAL);
 		if (c == NULL || c->session != s)
 			return (CMD_RETURN_NORMAL);
@@ -87,7 +87,7 @@ cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item)
 		swp = wp;
 	if (!window_pane_set_mode(wp, swp, &window_copy_mode, NULL, args)) {
 		if (args_has(args, 'M'))
-			window_copy_start_drag(c, &shared->event.m);
+			window_copy_start_drag(c, &state->event.m);
 	}
 	if (args_has(args, 'u'))
 		window_copy_pageup(wp, 0);
-- 
cgit