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

diff --git a/usr.bin/tmux/cmd-select-window.c b/usr.bin/tmux/cmd-select-window.c
index c959bb37b66..7c2f27e600d 100644
--- a/usr.bin/tmux/cmd-select-window.c
+++ b/usr.bin/tmux/cmd-select-window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-select-window.c,v 1.12 2014/10/20 22:29:25 nicm Exp $ */
+/* $OpenBSD: cmd-select-window.c,v 1.13 2015/12/13 14:32:38 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,7 +32,7 @@ const struct cmd_entry cmd_select_window_entry = {
 	"select-window", "selectw",
 	"lnpTt:", 0, 0,
 	"[-lnpT] " CMD_TARGET_WINDOW_USAGE,
-	0,
+	CMD_WINDOW_T,
 	cmd_select_window_exec
 };
 
@@ -40,7 +40,7 @@ const struct cmd_entry cmd_next_window_entry = {
 	"next-window", "next",
 	"at:", 0, 0,
 	"[-a] " CMD_TARGET_SESSION_USAGE,
-	0,
+	CMD_SESSION_T,
 	cmd_select_window_exec
 };
 
@@ -48,7 +48,7 @@ const struct cmd_entry cmd_previous_window_entry = {
 	"previous-window", "prev",
 	"at:", 0, 0,
 	"[-a] " CMD_TARGET_SESSION_USAGE,
-	0,
+	CMD_SESSION_T,
 	cmd_select_window_exec
 };
 
@@ -56,16 +56,15 @@ const struct cmd_entry cmd_last_window_entry = {
 	"last-window", "last",
 	"t:", 0, 0,
 	CMD_TARGET_SESSION_USAGE,
-	0,
+	CMD_SESSION_T,
 	cmd_select_window_exec
 };
 
 enum cmd_retval
 cmd_select_window_exec(struct cmd *self, struct cmd_q *cmdq)
 {
-	struct args	*args = self->args;
-	struct winlink	*wl;
-	struct session	*s;
+	struct winlink	*wl = cmdq->state.tflag.wl;
+	struct session	*s = cmdq->state.tflag.s;
 	int		 next, previous, last, activity;
 
 	next = self->entry == &cmd_next_window_entry;
@@ -79,10 +78,6 @@ cmd_select_window_exec(struct cmd *self, struct cmd_q *cmdq)
 		last = 1;
 
 	if (next || previous || last) {
-		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
-		if (s == NULL)
-			return (CMD_RETURN_ERROR);
-
 		activity = args_has(self->args, 'a');
 		if (next) {
 			if (session_next(s, activity) != 0) {
@@ -103,10 +98,6 @@ cmd_select_window_exec(struct cmd *self, struct cmd_q *cmdq)
 
 		server_redraw_session(s);
 	} else {
-		wl = cmd_find_window(cmdq, args_get(args, 't'), &s);
-		if (wl == NULL)
-			return (CMD_RETURN_ERROR);
-
 		/*
 		 * If -T and select-window is invoked on same window as
 		 * current, switch to previous window.