aboutsummaryrefslogtreecommitdiff
path: root/cmd-copy-mode.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-04-13 16:01:46 +0100
committerThomas Adam <thomas@xteddy.org>2020-04-13 16:01:46 +0100
commit0a11f1607b9f3623dce287d4940bb925b533a340 (patch)
tree381726321744f6e0ad4e454409dc74498965c82c /cmd-copy-mode.c
parent8f2b5d714a9f854c9583cab8bae70a2c7323fa00 (diff)
parent9a65102bfc2ed5d1e1f41e47451b8296c84f133d (diff)
downloadrtmux-0a11f1607b9f3623dce287d4940bb925b533a340.tar.gz
rtmux-0a11f1607b9f3623dce287d4940bb925b533a340.tar.bz2
rtmux-0a11f1607b9f3623dce287d4940bb925b533a340.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-copy-mode.c')
-rw-r--r--cmd-copy-mode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c
index d5e132f9..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->mouse, &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->mouse);
+ window_copy_start_drag(c, &state->event.m);
}
if (args_has(args, 'u'))
window_copy_pageup(wp, 0);