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-select-pane.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'cmd-select-pane.c')

diff --git a/cmd-select-pane.c b/cmd-select-pane.c
index 7986e98c..e83dc609 100644
--- a/cmd-select-pane.c
+++ b/cmd-select-pane.c
@@ -30,7 +30,7 @@ const struct cmd_entry cmd_select_pane_entry = {
 	"select-pane", "selectp",
 	"DdegLlMmP:Rt:U", 0, 0,
 	"[-DdegLlMmRU] [-P style] " CMD_TARGET_PANE_USAGE,
-	0,
+	CMD_PANE_T,
 	cmd_select_pane_exec
 };
 
@@ -38,7 +38,7 @@ const struct cmd_entry cmd_last_pane_entry = {
 	"last-pane", "lastp",
 	"det:", 0, 0,
 	"[-de] " CMD_TARGET_WINDOW_USAGE,
-	0,
+	CMD_WINDOW_T,
 	cmd_select_pane_exec
 };
 
@@ -46,19 +46,15 @@ enum cmd_retval
 cmd_select_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args		*args = self->args;
-	struct winlink		*wl;
-	struct window		*w;
-	struct session		*s;
-	struct window_pane	*wp, *lastwp, *markedwp;
+	struct winlink		*wl = cmdq->state.tflag.wl;
+	struct window		*w = wl->window;
+	struct session		*s = cmdq->state.tflag.s;
+	struct window_pane	*wp = cmdq->state.tflag.wp, *lastwp, *markedwp;
 	const char		*style;
 
 	if (self->entry == &cmd_last_pane_entry || args_has(args, 'l')) {
-		wl = cmd_find_window(cmdq, args_get(args, 't'), NULL);
-		if (wl == NULL)
-			return (CMD_RETURN_ERROR);
-		w = wl->window;
 
-		if (w->last == NULL) {
+		if (wl->window->last == NULL) {
 			cmdq_error(cmdq, "no last pane");
 			return (CMD_RETURN_ERROR);
 		}
@@ -79,9 +75,11 @@ cmd_select_pane_exec(struct cmd *self, struct cmd_q *cmdq)
 		return (CMD_RETURN_NORMAL);
 	}
 
-	if ((wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp)) == NULL)
+	server_unzoom_window(wp->window);
+	if (!window_pane_visible(wp)) {
+		cmdq_error(cmdq, "pane not visible");
 		return (CMD_RETURN_ERROR);
-	w = wl->window;
+	}
 
 	if (args_has(args, 'm') || args_has(args, 'M')) {
 		if (args_has(args, 'm') && !window_pane_visible(wp))
-- 
cgit