From ee45a8a149e1a3c8fe7c232a9e32f3a007e21bee Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sat, 22 Apr 2017 10:22:39 +0000
Subject: Get rid of the extra layer of flags and cmd_prepare() and just store
 the CMD_FIND_* flags in the cmd_entry and call it for the command. Commands
 with special requirements call it themselves and update the target for hooks
 to use.

---
 cmd-select-window.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/cmd-select-window.c b/cmd-select-window.c
index 4cc4b536..6cfaf535 100644
--- a/cmd-select-window.c
+++ b/cmd-select-window.c
@@ -36,7 +36,7 @@ const struct cmd_entry cmd_select_window_entry = {
 	.args = { "lnpTt:", 0, 0 },
 	.usage = "[-lnpT] " CMD_TARGET_WINDOW_USAGE,
 
-	.tflag = CMD_WINDOW,
+	.target = { 't', CMD_FIND_WINDOW, 0 },
 
 	.flags = 0,
 	.exec = cmd_select_window_exec
@@ -49,7 +49,7 @@ const struct cmd_entry cmd_next_window_entry = {
 	.args = { "at:", 0, 0 },
 	.usage = "[-a] " CMD_TARGET_SESSION_USAGE,
 
-	.tflag = CMD_SESSION,
+	.target = { 't', CMD_FIND_SESSION, 0 },
 
 	.flags = 0,
 	.exec = cmd_select_window_exec
@@ -62,7 +62,7 @@ const struct cmd_entry cmd_previous_window_entry = {
 	.args = { "at:", 0, 0 },
 	.usage = "[-a] " CMD_TARGET_SESSION_USAGE,
 
-	.tflag = CMD_SESSION,
+	.target = { 't', CMD_FIND_SESSION, 0 },
 
 	.flags = 0,
 	.exec = cmd_select_window_exec
@@ -75,7 +75,7 @@ const struct cmd_entry cmd_last_window_entry = {
 	.args = { "t:", 0, 0 },
 	.usage = CMD_TARGET_SESSION_USAGE,
 
-	.tflag = CMD_SESSION,
+	.target = { 't', CMD_FIND_SESSION, 0 },
 
 	.flags = 0,
 	.exec = cmd_select_window_exec
@@ -85,8 +85,8 @@ static enum cmd_retval
 cmd_select_window_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct cmd_find_state	*current = &item->shared->current;
-	struct winlink		*wl = item->state.tflag.wl;
-	struct session		*s = item->state.tflag.s;
+	struct winlink		*wl = item->target.wl;
+	struct session		*s = item->target.s;
 	int			 next, previous, last, activity;
 
 	next = self->entry == &cmd_next_window_entry;
-- 
cgit