From 4a4daf13031673870341c68b990e20c314140118 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sun, 13 Dec 2015 14:32:38 +0000
Subject: 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.
---
 cmd-display-message.c | 32 +++++---------------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

(limited to 'cmd-display-message.c')

diff --git a/cmd-display-message.c b/cmd-display-message.c
index 7ca8e9c4..201f8b75 100644
--- a/cmd-display-message.c
+++ b/cmd-display-message.c
@@ -39,7 +39,7 @@ const struct cmd_entry cmd_display_message_entry = {
 	"c:pt:F:", 0, 1,
 	"[-p] [-c target-client] [-F format] " CMD_TARGET_PANE_USAGE
 	" [message]",
-	0,
+	CMD_CLIENT_C|CMD_PANE_T,
 	cmd_display_message_exec
 };
 
@@ -47,41 +47,19 @@ enum cmd_retval
 cmd_display_message_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args		*args = self->args;
-	struct client		*c;
-	struct session		*s;
-	struct winlink		*wl;
-	struct window_pane	*wp;
+	struct client		*c = cmdq->state.c;
+	struct session		*s = cmdq->state.tflag.s;
+	struct winlink		*wl = cmdq->state.tflag.wl;
+	struct window_pane	*wp = cmdq->state.tflag.wp;
 	const char		*template;
 	char			*msg;
 	struct format_tree	*ft;
 
-	if (args_has(args, 't')) {
-		wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp);
-		if (wl == NULL)
-			return (CMD_RETURN_ERROR);
-	} else {
-		wl = cmd_find_pane(cmdq, NULL, &s, &wp);
-		if (wl == NULL)
-			return (CMD_RETURN_ERROR);
-	}
-
 	if (args_has(args, 'F') && args->argc != 0) {
 		cmdq_error(cmdq, "only one of -F or argument must be given");
 		return (CMD_RETURN_ERROR);
 	}
 
-	if (args_has(args, 'c')) {
-		c = cmd_find_client(cmdq, args_get(args, 'c'), 0);
-		if (c == NULL)
-			return (CMD_RETURN_ERROR);
-	} else {
-		c = cmd_find_client(cmdq, NULL, 1);
-		if (c == NULL && !args_has(self->args, 'p')) {
-			cmdq_error(cmdq, "no client available");
-			return (CMD_RETURN_ERROR);
-		}
-	}
-
 	template = args_get(args, 'F');
 	if (args->argc != 0)
 		template = args->argv[0];
-- 
cgit