From 04cdd035250b93b728678d515b69690653dced4e Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 13 Apr 2020 10:59:58 +0000
Subject: Also move cmdq_item and cmdq_list into cmd-queue.c (this is to make
 its use more clearly defined and preparation for some future work).

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

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

diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c
index 3b20689c..d5e132f9 100644
--- a/cmd-copy-mode.c
+++ b/cmd-copy-mode.c
@@ -57,10 +57,12 @@ 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 = item->shared;
-	struct client		*c = item->client;
+	struct cmdq_shared	*shared = cmdq_get_shared(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);
 	struct session		*s;
-	struct window_pane	*wp = item->target.wp, *swp;
+	struct window_pane	*wp = target->wp, *swp;
 
 	if (args_has(args, 'q')) {
 		window_pane_reset_mode_all(wp);
@@ -80,7 +82,7 @@ cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item)
 	}
 
 	if (args_has(args, 's'))
-		swp = item->source.wp;
+		swp = source->wp;
 	else
 		swp = wp;
 	if (!window_pane_set_mode(wp, swp, &window_copy_mode, NULL, args)) {
-- 
cgit