diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-10-16 22:01:14 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-10-16 22:01:14 +0100 |
| commit | 1a6e696b08113ca17ee8e881844167cf94276846 (patch) | |
| tree | 60ecdd8c9e51bff46624e48d9373686b858d2fb1 /cmd-copy-mode.c | |
| parent | d401340c516131ae8e07bfb978b670347486d077 (diff) | |
| parent | d15d54c2c8e6b95695169442eb2a27d814efc078 (diff) | |
| download | rtmux-1a6e696b08113ca17ee8e881844167cf94276846.tar.gz rtmux-1a6e696b08113ca17ee8e881844167cf94276846.tar.bz2 rtmux-1a6e696b08113ca17ee8e881844167cf94276846.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-copy-mode.c')
| -rw-r--r-- | cmd-copy-mode.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c index dc880d56..448e7b9c 100644 --- a/cmd-copy-mode.c +++ b/cmd-copy-mode.c @@ -24,7 +24,7 @@ * Enter copy or clock mode. */ -static enum cmd_retval cmd_copy_mode_exec(struct cmd *, struct cmd_q *); +static enum cmd_retval cmd_copy_mode_exec(struct cmd *, struct cmdq_item *); const struct cmd_entry cmd_copy_mode_entry = { .name = "copy-mode", @@ -53,15 +53,15 @@ const struct cmd_entry cmd_clock_mode_entry = { }; static enum cmd_retval -cmd_copy_mode_exec(struct cmd *self, struct cmd_q *cmdq) +cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item) { struct args *args = self->args; - struct client *c = cmdq->client; + struct client *c = item->client; struct session *s; - struct window_pane *wp = cmdq->state.tflag.wp; + struct window_pane *wp = item->state.tflag.wp; if (args_has(args, 'M')) { - if ((wp = cmd_mouse_pane(&cmdq->mouse, &s, NULL)) == NULL) + if ((wp = cmd_mouse_pane(&item->mouse, &s, NULL)) == NULL) return (CMD_RETURN_NORMAL); if (c == NULL || c->session != s) return (CMD_RETURN_NORMAL); @@ -80,7 +80,7 @@ cmd_copy_mode_exec(struct cmd *self, struct cmd_q *cmdq) if (args_has(args, 'M')) { if (wp->mode != NULL && wp->mode != &window_copy_mode) return (CMD_RETURN_NORMAL); - window_copy_start_drag(c, &cmdq->mouse); + window_copy_start_drag(c, &item->mouse); } if (wp->mode == &window_copy_mode && args_has(self->args, 'u')) window_copy_pageup(wp, 0); |