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, 17 deletions

diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index dc2b7246..62d6bad3 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -32,7 +32,7 @@ const struct cmd_entry cmd_swap_pane_entry = {
 	"swap-pane", "swapp",
 	"dDs:t:U", 0, 0,
 	"[-dDU] " CMD_SRCDST_PANE_USAGE,
-	0,
+	CMD_PANE_MARKED_S|CMD_PANE_T,
 	cmd_swap_pane_exec
 };
 
@@ -40,16 +40,18 @@ enum cmd_retval
 cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args		*args = self->args;
-	struct winlink		*src_wl, *dst_wl;
+	struct winlink          *src_wl, *dst_wl;
 	struct window		*src_w, *dst_w;
 	struct window_pane	*tmp_wp, *src_wp, *dst_wp;
 	struct layout_cell	*src_lc, *dst_lc;
 	u_int			 sx, sy, xoff, yoff;
 
-	dst_wl = cmd_find_pane(cmdq, args_get(args, 't'), NULL, &dst_wp);
-	if (dst_wl == NULL)
-		return (CMD_RETURN_ERROR);
+	dst_wl = cmdq->state.tflag.wl;
 	dst_w = dst_wl->window;
+	dst_wp = cmdq->state.tflag.wp;
+	src_wp = cmdq->state.sflag.wp;
+	src_wl = cmdq->state.sflag.wl;
+	src_w = src_wl->window;
 	server_unzoom_window(dst_w);
 
 	if (!args_has(args, 's')) {
@@ -62,19 +64,7 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 			src_wp = TAILQ_PREV(dst_wp, window_panes, entry);
 			if (src_wp == NULL)
 				src_wp = TAILQ_LAST(&dst_w->panes, window_panes);
-		} else {
-			src_wl = cmd_find_pane_marked(cmdq, NULL, NULL,
-			    &src_wp);
-			if (src_wl == NULL)
-				return (CMD_RETURN_ERROR);
-			src_w = src_wl->window;
 		}
-	} else {
-		src_wl = cmd_find_pane_marked(cmdq, args_get(args, 's'), NULL,
-		    &src_wp);
-		if (src_wl == NULL)
-			return (CMD_RETURN_ERROR);
-		src_w = src_wl->window;
 	}
 	server_unzoom_window(src_w);