diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-03-12 12:02:42 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-03-12 12:02:42 +0000 |
| commit | 3ec05e940505f1d0b4e55413f949fdfaceddedde (patch) | |
| tree | 843d754e76bb7386f39cb5743ab8de859e880ddd /cmd-copy-mode.c | |
| parent | f8a30e158821876e8c30d46ab2728bce739e35de (diff) | |
| parent | 3f6bfbaf2babcc7f08f628a82ff31b0b52014e58 (diff) | |
| download | rtmux-3ec05e940505f1d0b4e55413f949fdfaceddedde.tar.gz rtmux-3ec05e940505f1d0b4e55413f949fdfaceddedde.tar.bz2 rtmux-3ec05e940505f1d0b4e55413f949fdfaceddedde.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-copy-mode.c')
| -rw-r--r-- | cmd-copy-mode.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c index d9471aab..bd05f8a2 100644 --- a/cmd-copy-mode.c +++ b/cmd-copy-mode.c @@ -60,7 +60,6 @@ cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item) struct client *c = item->client; struct session *s; struct window_pane *wp = item->target.wp; - int flag; if (args_has(args, 'M')) { if ((wp = cmd_mouse_pane(&shared->mouse, &s, NULL)) == NULL) @@ -74,16 +73,10 @@ cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item) return (CMD_RETURN_NORMAL); } - if (wp->mode == NULL || wp->mode->mode != &window_copy_mode) { - flag = window_pane_set_mode(wp, &window_copy_mode, NULL, args); - if (flag != 0) - return (CMD_RETURN_NORMAL); - } - if (args_has(args, 'M')) { - if (wp->mode != NULL && wp->mode->mode != &window_copy_mode) - return (CMD_RETURN_NORMAL); + if (window_pane_set_mode(wp, &window_copy_mode, NULL, args) != 0) + return (CMD_RETURN_NORMAL); + if (args_has(args, 'M')) window_copy_start_drag(c, &shared->mouse); - } if (args_has(self->args, 'u')) window_copy_pageup(wp, 0); |