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, 12 insertions, 20 deletions

diff --git a/usr.bin/tmux/cmd-move-window.c b/usr.bin/tmux/cmd-move-window.c
index 1bbc79cefed..a12fa3a2b9e 100644
--- a/usr.bin/tmux/cmd-move-window.c
+++ b/usr.bin/tmux/cmd-move-window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-move-window.c,v 1.21 2015/10/27 15:58:42 nicm Exp $ */
+/* $OpenBSD: cmd-move-window.c,v 1.22 2015/12/13 14:32:38 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,7 +32,7 @@ const struct cmd_entry cmd_move_window_entry = {
 	"move-window", "movew",
 	"adkrs:t:", 0, 0,
 	"[-dkr] " CMD_SRCDST_WINDOW_USAGE,
-	0,
+	CMD_WINDOW_S|CMD_MOVEW_R|CMD_INDEX_T,
 	cmd_move_window_exec
 };
 
@@ -40,7 +40,7 @@ const struct cmd_entry cmd_link_window_entry = {
 	"link-window", "linkw",
 	"adks:t:", 0, 0,
 	"[-dk] " CMD_SRCDST_WINDOW_USAGE,
-	0,
+	CMD_WINDOW_S|CMD_INDEX_T,
 	cmd_move_window_exec
 };
 
@@ -48,36 +48,28 @@ enum cmd_retval
 cmd_move_window_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args	*args = self->args;
-	struct session	*src, *dst, *s;
-	struct winlink	*wl;
+	struct session	*src = cmdq->state.sflag.s;
+	struct session	*dst = cmdq->state.tflag.s;
+	struct winlink	*wl = cmdq->state.sflag.wl;
 	char		*cause;
-	int		 idx, kflag, dflag, sflag;
+	int		 idx = cmdq->state.tflag.idx, kflag, dflag, sflag;
 
-	if (args_has(args, 'r')) {
-		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
-		if (s == NULL)
-			return (CMD_RETURN_ERROR);
+	kflag = args_has(self->args, 'k');
+	dflag = args_has(self->args, 'd');
 
-		session_renumber_windows(s);
+	if (args_has(args, 'r')) {
+		session_renumber_windows(dst);
 		recalculate_sizes();
 
 		return (CMD_RETURN_NORMAL);
 	}
 
-	if ((wl = cmd_find_window(cmdq, args_get(args, 's'), &src)) == NULL)
-		return (CMD_RETURN_ERROR);
-	if ((idx = cmd_find_index(cmdq, args_get(args, 't'), &dst)) == -2)
-		return (CMD_RETURN_ERROR);
-
 	kflag = args_has(self->args, 'k');
 	dflag = args_has(self->args, 'd');
 	sflag = args_has(self->args, 's');
 
 	if (args_has(self->args, 'a')) {
-		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
-		if (s == NULL)
-			return (CMD_RETURN_ERROR);
-		if ((idx = winlink_shuffle_up(s, s->curw)) == -1)
+		if ((idx = winlink_shuffle_up(dst, dst->curw)) == -1)
 			return (CMD_RETURN_ERROR);
 	}