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.

1 files changed, 5 insertions, 8 deletions

diff --git a/cmd-send-keys.c b/cmd-send-keys.c
index 1461baa9..8f9b4ddf 100644
--- a/cmd-send-keys.c
+++ b/cmd-send-keys.c
@@ -33,7 +33,7 @@ const struct cmd_entry cmd_send_keys_entry = {
 	"send-keys", "send",
 	"lRMt:", 0, -1,
 	"[-lRM] " CMD_TARGET_PANE_USAGE " key ...",
-	0,
+	CMD_PANE_T,
 	cmd_send_keys_exec
 };
 
@@ -41,7 +41,7 @@ const struct cmd_entry cmd_send_prefix_entry = {
 	"send-prefix", NULL,
 	"2t:", 0, 0,
 	"[-2] " CMD_TARGET_PANE_USAGE,
-	0,
+	CMD_PANE_T,
 	cmd_send_keys_exec
 };
 
@@ -49,11 +49,11 @@ enum cmd_retval
 cmd_send_keys_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args		*args = self->args;
+	struct window_pane	*wp = cmdq->state.tflag.wp;
+	struct session		*s = cmdq->state.tflag.s;
 	struct mouse_event	*m = &cmdq->item->mouse;
-	struct window_pane	*wp;
-	struct session		*s;
-	int			 i, literal;
 	const u_char		*keystr;
+	int			 i, literal;
 	key_code		 key;
 
 	if (args_has(args, 'M')) {
@@ -66,9 +66,6 @@ cmd_send_keys_exec(struct cmd *self, struct cmd_q *cmdq)
 		return (CMD_RETURN_NORMAL);
 	}
 
-	if (cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp) == NULL)
-		return (CMD_RETURN_ERROR);
-
 	if (self->entry == &cmd_send_prefix_entry) {
 		if (args_has(args, '2'))
 			key = options_get_number(s->options, "prefix2");