diff options
| author |   nicm <nicm@openbsd.org> | 2015-12-13 14:32:38 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2015-12-13 14:32:38 +0000 |
| commit | 3447b427c1ffcf379e7fc14b9e25cce4fa75a963 (patch) | |
| tree | 4470a122c84b0cc4457651c553dc0f60b4b9a3b0 /usr.bin/tmux/cmd-paste-buffer.c | |
| parent | less macro; (diff) | |
| download | wireguard-openbsd-3447b427c1ffcf379e7fc14b9e25cce4fa75a963.tar.xz wireguard-openbsd-3447b427c1ffcf379e7fc14b9e25cce4fa75a963.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 'usr.bin/tmux/cmd-paste-buffer.c')
| -rw-r--r-- | usr.bin/tmux/cmd-paste-buffer.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.bin/tmux/cmd-paste-buffer.c b/usr.bin/tmux/cmd-paste-buffer.c index f18ece5daa2..c7b5fc33342 100644 --- a/usr.bin/tmux/cmd-paste-buffer.c +++ b/usr.bin/tmux/cmd-paste-buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-paste-buffer.c,v 1.30 2015/09/11 14:41:50 nicm Exp $ */ +/* $OpenBSD: cmd-paste-buffer.c,v 1.31 2015/12/13 14:32:38 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -37,7 +37,7 @@ const struct cmd_entry cmd_paste_buffer_entry = { "paste-buffer", "pasteb", "db:prs:t:", 0, 0, "[-dpr] [-s separator] " CMD_BUFFER_USAGE " " CMD_TARGET_PANE_USAGE, - 0, + CMD_PANE_T, cmd_paste_buffer_exec }; @@ -45,16 +45,12 @@ enum cmd_retval cmd_paste_buffer_exec(struct cmd *self, struct cmd_q *cmdq) { struct args *args = self->args; - struct window_pane *wp; - struct session *s; + struct window_pane *wp = cmdq->state.tflag.wp; struct paste_buffer *pb; const char *sepstr, *bufname, *bufdata, *bufend, *line; size_t seplen, bufsize; int bracket = args_has(args, 'p'); - if (cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp) == NULL) - return (CMD_RETURN_ERROR); - bufname = NULL; if (args_has(args, 'b')) bufname = args_get(args, 'b'); |