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, 4 insertions, 7 deletions

diff --git a/cmd-select-layout.c b/cmd-select-layout.c
index 14737dc8..aac60083 100644
--- a/cmd-select-layout.c
+++ b/cmd-select-layout.c
@@ -32,7 +32,7 @@ const struct cmd_entry cmd_select_layout_entry = {
 	"select-layout", "selectl",
 	"nopt:", 0, 1,
 	"[-nop] " CMD_TARGET_WINDOW_USAGE " [layout-name]",
-	0,
+	CMD_WINDOW_T,
 	cmd_select_layout_exec
 };
 
@@ -40,7 +40,7 @@ const struct cmd_entry cmd_next_layout_entry = {
 	"next-layout", "nextl",
 	"t:", 0, 0,
 	CMD_TARGET_WINDOW_USAGE,
-	0,
+	CMD_WINDOW_T,
 	cmd_select_layout_exec
 };
 
@@ -48,7 +48,7 @@ const struct cmd_entry cmd_previous_layout_entry = {
 	"previous-layout", "prevl",
 	"t:", 0, 0,
 	CMD_TARGET_WINDOW_USAGE,
-	0,
+	CMD_WINDOW_T,
 	cmd_select_layout_exec
 };
 
@@ -56,16 +56,13 @@ enum cmd_retval
 cmd_select_layout_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args	*args = self->args;
-	struct winlink	*wl;
+	struct winlink	*wl = cmdq->state.tflag.wl;
 	struct window	*w;
 	const char	*layoutname;
 	char		*oldlayout;
 	int		 next, previous, layout;
 
-	if ((wl = cmd_find_window(cmdq, args_get(args, 't'), NULL)) == NULL)
-		return (CMD_RETURN_ERROR);
 	w = wl->window;
-
 	server_unzoom_window(w);
 
 	next = self->entry == &cmd_next_layout_entry;