aboutsummaryrefslogtreecommitdiff
path: root/cmd-copy-mode.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-04-13 14:01:45 +0100
committerThomas Adam <thomas@xteddy.org>2020-04-13 14:01:45 +0100
commit8f2b5d714a9f854c9583cab8bae70a2c7323fa00 (patch)
tree4e887ff4a1fcb3703fb0a1fcaa751183cff24c12 /cmd-copy-mode.c
parentb117c3b81217a11946ac784cfbe2ef1f3725b207 (diff)
parent04cdd035250b93b728678d515b69690653dced4e (diff)
downloadrtmux-8f2b5d714a9f854c9583cab8bae70a2c7323fa00.tar.gz
rtmux-8f2b5d714a9f854c9583cab8bae70a2c7323fa00.tar.bz2
rtmux-8f2b5d714a9f854c9583cab8bae70a2c7323fa00.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-copy-mode.c')
-rw-r--r--cmd-copy-mode.c10
1 files changed, 6 insertions, 4 deletions
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)) {