diff options
| author | nicm <nicm> | 2015-12-13 14:32:38 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2015-12-13 14:32:38 +0000 |
| commit | 4a4daf13031673870341c68b990e20c314140118 (patch) | |
| tree | 2457218fe3b49af2401cb78cde064b2a7ff62916 /cmd-copy-mode.c | |
| parent | 5ed17e84faed0a7655ec1eb3de291b60839dcb12 (diff) | |
| download | rtmux-4a4daf13031673870341c68b990e20c314140118.tar.gz rtmux-4a4daf13031673870341c68b990e20c314140118.tar.bz2 rtmux-4a4daf13031673870341c68b990e20c314140118.zip | |
Instead of every command resolving the target (-t or -s) itself, prepare
the state (client, session, winlink, pane) for it it before entering the
command. Each command provides some flags that tell the prepare step
what it is expecting.
This is a requirement for having hooks on commands (for example, if you
hook "select-window -t1:2", the hook command should to operate on window
1:2 not whatever it thinks is the current window), and should allow some
other target improvements.
The old cmd_find_* functions remain for the moment but that layer will
be dropped later.
Joint work with Thomas Adam.
Diffstat (limited to 'cmd-copy-mode.c')
| -rw-r--r-- | cmd-copy-mode.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c index e04b561b..79d06cee 100644 --- a/cmd-copy-mode.c +++ b/cmd-copy-mode.c @@ -29,8 +29,8 @@ enum cmd_retval cmd_copy_mode_exec(struct cmd *, struct cmd_q *); const struct cmd_entry cmd_copy_mode_entry = { "copy-mode", NULL, "Met:u", 0, 0, - "[-Meu] " CMD_TARGET_PANE_USAGE, - 0, + "[-Mu] " CMD_TARGET_PANE_USAGE, + CMD_PANE_T, cmd_copy_mode_exec }; @@ -48,15 +48,14 @@ cmd_copy_mode_exec(struct cmd *self, struct cmd_q *cmdq) struct args *args = self->args; struct client *c = cmdq->client; struct session *s; - struct window_pane *wp; + struct window_pane *wp = cmdq->state.tflag.wp; if (args_has(args, 'M')) { if ((wp = cmd_mouse_pane(&cmdq->item->mouse, &s, NULL)) == NULL) return (CMD_RETURN_NORMAL); if (c == NULL || c->session != s) return (CMD_RETURN_NORMAL); - } else if (cmd_find_pane(cmdq, args_get(args, 't'), NULL, &wp) == NULL) - return (CMD_RETURN_ERROR); + } if (self->entry == &cmd_clock_mode_entry) { window_pane_set_mode(wp, &window_clock_mode); |