summaryrefslogtreecommitdiffstats
path: root/cmd-paste-buffer.c
diff options
context:
space:
mode:
authornicm <nicm>2015-12-13 14:32:38 +0000
committernicm <nicm>2015-12-13 14:32:38 +0000
commit4a4daf13031673870341c68b990e20c314140118 (patch)
tree2457218fe3b49af2401cb78cde064b2a7ff62916 /cmd-paste-buffer.c
parent5ed17e84faed0a7655ec1eb3de291b60839dcb12 (diff)
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-paste-buffer.c')
-rw-r--r--cmd-paste-buffer.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/cmd-paste-buffer.c b/cmd-paste-buffer.c
index 87f09ee6..92a31c53 100644
--- a/cmd-paste-buffer.c
+++ b/cmd-paste-buffer.c
@@ -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');