aboutsummaryrefslogtreecommitdiff
path: root/cmd-copy-mode.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-04-21 16:01:18 +0100
committerThomas Adam <thomas@xteddy.org>2017-04-21 16:01:18 +0100
commit4612419c143c3f748bc5f6ccd467c7c0014e8d48 (patch)
tree42929aeeb8b1d89abf639124412199fac7092f04 /cmd-copy-mode.c
parent93062ad09952f411d48818b05dc9898bc14dcfde (diff)
parentc799425069d02675474cda312fac1457829052fb (diff)
downloadrtmux-4612419c143c3f748bc5f6ccd467c7c0014e8d48.tar.gz
rtmux-4612419c143c3f748bc5f6ccd467c7c0014e8d48.tar.bz2
rtmux-4612419c143c3f748bc5f6ccd467c7c0014e8d48.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-copy-mode.c')
-rw-r--r--cmd-copy-mode.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c
index 448e7b9c..35c41a3a 100644
--- a/cmd-copy-mode.c
+++ b/cmd-copy-mode.c
@@ -56,12 +56,13 @@ static enum cmd_retval
cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item)
{
struct args *args = self->args;
+ struct cmdq_shared *shared = item->shared;
struct client *c = item->client;
struct session *s;
struct window_pane *wp = item->state.tflag.wp;
if (args_has(args, 'M')) {
- if ((wp = cmd_mouse_pane(&item->mouse, &s, NULL)) == NULL)
+ if ((wp = cmd_mouse_pane(&shared->mouse, &s, NULL)) == NULL)
return (CMD_RETURN_NORMAL);
if (c == NULL || c->session != s)
return (CMD_RETURN_NORMAL);
@@ -80,7 +81,7 @@ cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item)
if (args_has(args, 'M')) {
if (wp->mode != NULL && wp->mode != &window_copy_mode)
return (CMD_RETURN_NORMAL);
- window_copy_start_drag(c, &item->mouse);
+ window_copy_start_drag(c, &shared->mouse);
}
if (wp->mode == &window_copy_mode && args_has(self->args, 'u'))
window_copy_pageup(wp, 0);