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.

53 files changed, 323 insertions, 438 deletions

diff --git a/cmd-attach-session.c b/cmd-attach-session.c
index 22d9320d..81ed4a87 100644
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -40,21 +40,23 @@ const struct cmd_entry cmd_attach_session_entry = {
 	.args = { "c:dErt:", 0, 0 },
 	.usage = "[-dEr] [-c working-directory] " CMD_TARGET_SESSION_USAGE,
 
-	.tflag = CMD_SESSION_WITHPANE,
+	/* -t is special */
 
 	.flags = CMD_STARTSERVER,
 	.exec = cmd_attach_session_exec
 };
 
 enum cmd_retval
-cmd_attach_session(struct cmdq_item *item, int dflag, int rflag,
-    const char *cflag, int Eflag)
+cmd_attach_session(struct cmdq_item *item, const char *tflag, int dflag,
+    int rflag, const char *cflag, int Eflag)
 {
 	struct cmd_find_state	*current = &item->shared->current;
-	struct session		*s = item->state.tflag.s;
+	enum cmd_find_type	 type;
+	int			 flags;
 	struct client		*c = item->client, *c_loop;
-	struct winlink		*wl = item->state.tflag.wl;
-	struct window_pane	*wp = item->state.tflag.wp;
+	struct session		*s;
+	struct winlink		*wl;
+	struct window_pane	*wp;
 	char			*cause;
 
 	if (RB_EMPTY(&sessions)) {
@@ -70,6 +72,19 @@ cmd_attach_session(struct cmdq_item *item, int dflag, int rflag,
 		return (CMD_RETURN_ERROR);
 	}
 
+	if (tflag != NULL && tflag[strcspn(tflag, ":.")] != '\0') {
+		type = CMD_FIND_PANE;
+		flags = 0;
+	} else {
+		type = CMD_FIND_SESSION;
+		flags = CMD_FIND_PREFER_UNATTACHED;
+	}
+	if (cmd_find_target(&item->target, item, tflag, type, flags) != 0)
+		return (CMD_RETURN_ERROR);
+	s = item->target.s;
+	wl = item->target.wl;
+	wp = item->target.wp;
+
 	if (wl != NULL) {
 		if (wp != NULL)
 			window_set_active_pane(wp->window, wp);
@@ -150,6 +165,7 @@ cmd_attach_session_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args	*args = self->args;
 
-	return (cmd_attach_session(item, args_has(args, 'd'),
-	    args_has(args, 'r'), args_get(args, 'c'), args_has(args, 'E')));
+	return (cmd_attach_session(item, args_get(args, 't'),
+	    args_has(args, 'd'), args_has(args, 'r'), args_get(args, 'c'),
+	    args_has(args, 'E')));
 }
diff --git a/cmd-break-pane.c b/cmd-break-pane.c
index a2648418..b92c5077 100644
--- a/cmd-break-pane.c
+++ b/cmd-break-pane.c
@@ -35,10 +35,11 @@ const struct cmd_entry cmd_break_pane_entry = {
 	.alias = "breakp",
 
 	.args = { "dPF:n:s:t:", 0, 0 },
-	.usage = "[-dP] [-F format] [-n window-name] [-s src-pane] [-t dst-window]",
+	.usage = "[-dP] [-F format] [-n window-name] [-s src-pane] "
+		 "[-t dst-window]",
 
-	.sflag = CMD_PANE,
-	.tflag = CMD_WINDOW_INDEX,
+	.source = { 's', CMD_FIND_PANE, 0 },
+	.target = { 't', CMD_FIND_WINDOW, CMD_FIND_WINDOW_INDEX },
 
 	.flags = 0,
 	.exec = cmd_break_pane_exec
@@ -49,14 +50,14 @@ cmd_break_pane_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
 	struct cmd_find_state	*current = &item->shared->current;
-	struct client		*c = item->state.c;
-	struct winlink		*wl = item->state.sflag.wl;
-	struct session		*src_s = item->state.sflag.s;
-	struct session		*dst_s = item->state.tflag.s;
-	struct window_pane	*wp = item->state.sflag.wp;
+	struct client		*c = cmd_find_client(item, NULL, 1);
+	struct winlink		*wl = item->source.wl;
+	struct session		*src_s = item->source.s;
+	struct session		*dst_s = item->target.s;
+	struct window_pane	*wp = item->source.wp;
 	struct window		*w = wl->window;
 	char			*name, *cause;
-	int			 idx = item->state.tflag.idx;
+	int			 idx = item->target.idx;
 	const char		*template;
 	char			*cp;
 
diff --git a/cmd-capture-pane.c b/cmd-capture-pane.c
index 87db6e99..d3d7e8f8 100644
--- a/cmd-capture-pane.c
+++ b/cmd-capture-pane.c
@@ -43,7 +43,7 @@ const struct cmd_entry cmd_capture_pane_entry = {
 	.usage = "[-aCeJpPq] " CMD_BUFFER_USAGE " [-E end-line] "
 		 "[-S start-line]" CMD_TARGET_PANE_USAGE,
 
-	.tflag = CMD_PANE,
+	.target = { 't', CMD_FIND_PANE, 0 },
 
 	.flags = CMD_AFTERHOOK,
 	.exec = cmd_capture_pane_exec
@@ -56,7 +56,7 @@ const struct cmd_entry cmd_clear_history_entry = {
 	.args = { "t:", 0, 0 },
 	.usage = CMD_TARGET_PANE_USAGE,
 
-	.tflag = CMD_PANE,
+	.target = { 't', CMD_FIND_PANE, 0 },
 
 	.flags = CMD_AFTERHOOK,
 	.exec = cmd_capture_pane_exec
@@ -193,7 +193,7 @@ cmd_capture_pane_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
 	struct client		*c;
-	struct window_pane	*wp = item->state.tflag.wp;
+	struct window_pane	*wp = item->target.wp;
 	char			*buf, *cause;
 	const char		*bufname;
 	size_t			 len;
diff --git a/cmd-choose-buffer.c b/cmd-choose-buffer.c
index ae619b6c..52ad0ac1 100644
--- a/cmd-choose-buffer.c
+++ b/cmd-choose-buffer.c
@@ -40,7 +40,7 @@ const struct cmd_entry cmd_choose_buffer_entry = {
 	.args = { "F:t:", 0, 1 },
 	.usage = CMD_TARGET_WINDOW_USAGE " [-F format] [template]",
 
-	.tflag = CMD_WINDOW,
+	.target = { 't', CMD_FIND_WINDOW, 0 },
 
 	.flags = 0,
 	.exec = cmd_choose_buffer_exec
@@ -50,8 +50,8 @@ static enum cmd_retval
 cmd_choose_buffer_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = self->args;
-	struct client			*c = item->state.c;
-	struct winlink			*wl = item->state.tflag.wl;
+	struct client			*c = cmd_find_client(item, NULL, 1);
+	struct winlink			*wl = item->target.wl;
 	struct window_choose_data	*cdata;
 	struct paste_buffer		*pb;
 	char				*action, *action_data;
diff --git a/cmd-choose-client.c b/cmd-choose-client.c
index 96a79534..88118209 100644
--- a/cmd-choose-client.c
+++ b/cmd-choose-client.c
@@ -45,7 +45,7 @@ const struct cmd_entry cmd_choose_client_entry = {
 	.args = { "F:t:", 0, 1 },
 	.usage = CMD_TARGET_WINDOW_USAGE " [-F format] [template]",
 
-	.tflag = CMD_WINDOW,
+	.target = { 't', CMD_FIND_WINDOW, 0 },
 
 	.flags = 0,
 	.exec = cmd_choose_client_exec
@@ -59,10 +59,10 @@ static enum cmd_retval
 cmd_choose_client_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = self->args;
-	struct client			*c = item->state.c;
+	struct client			*c = cmd_find_client(item, NULL, 1);
 	struct client			*c1;
 	struct window_choose_data	*cdata;
-	struct winlink			*wl = item->state.tflag.wl;
+	struct winlink			*wl = item->target.wl;
 	const char			*template;
 	char				*action;
 	u_int			 	 idx, cur;
diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c
index 65d55407..28b5013a 100644
--- a/cmd-choose-tree.c
+++ b/cmd-choose-tree.c
@@ -51,7 +51,7 @@ const struct cmd_entry cmd_choose_tree_entry = {
 	.usage = "[-suw] [-b session-template] [-c window template] "
 		 "[-S format] [-W format] " CMD_TARGET_WINDOW_USAGE,
 
-	.tflag = CMD_WINDOW,
+	.target = { 't', CMD_FIND_WINDOW, 0 },
 
 	.flags = 0,
 	.exec = cmd_choose_tree_exec
@@ -64,7 +64,7 @@ const struct cmd_entry cmd_choose_session_entry = {
 	.args = { "F:t:", 0, 1 },
 	.usage = CMD_TARGET_WINDOW_USAGE " [-F format] [template]",
 
-	.tflag = CMD_WINDOW,
+	.target = { 't', CMD_FIND_WINDOW, 0 },
 
 	.flags = 0,
 	.exec = cmd_choose_tree_exec
@@ -77,7 +77,7 @@ const struct cmd_entry cmd_choose_window_entry = {
 	.args = { "F:t:", 0, 1 },
 	.usage = CMD_TARGET_WINDOW_USAGE "[-F format] [template]",
 
-	.tflag = CMD_WINDOW,
+	.target = { 't', CMD_FIND_WINDOW, 0 },
 
 	.flags = 0,
 	.exec = cmd_choose_tree_exec
@@ -87,9 +87,9 @@ static enum cmd_retval
 cmd_choose_tree_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = self->args;
-	struct client			*c = item->state.c;
-	struct winlink			*wl = item->state.tflag.wl, *wm;
-	struct session			*s = item->state.tflag.s, *s2;
+	struct client			*c = cmd_find_client(item, NULL, 1);
+	struct winlink			*wl = item->target.wl, *wm;
+	struct session			*s = item->target.s, *s2;
 	struct window_choose_data	*wcd = NULL;
 	const char			*ses_template, *win_template;
 	char				*final_win_action, *cur_win_template;
diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c
index 41bbe01d..45a71525 100644
--- a/cmd-command-prompt.c
+++ b/cmd-command-prompt.c
@@ -43,8 +43,6 @@ const struct cmd_entry cmd_command_prompt_entry = {
 	.usage = "[-1Ni] [-I inputs] [-p prompts] " CMD_TARGET_CLIENT_USAGE " "
 		 "[template]",
 
-	.tflag = CMD_CLIENT,
-
 	.flags = 0,
 	.exec = cmd_command_prompt_exec
 };
@@ -69,10 +67,13 @@ cmd_command_prompt_exec(struct cmd *self, struct cmdq_item *item)
 	struct args			*args = self->args;
 	const char			*inputs, *prompts;
 	struct cmd_command_prompt_cdata	*cdata;
-	struct client			*c = item->state.c;
+	struct client			*c;
 	char				*prompt, *ptr, *input = NULL;
 	size_t				 n;
 
+	if ((c = cmd_find_client(item, args_get(args, 't'), 0)) == NULL)
+		return (CMD_RETURN_ERROR);
+
 	if (c->prompt_string != NULL)
 		return (CMD_RETURN_NORMAL);
 
diff --git a/cmd-confirm-before.c b/cmd-confirm-before.c
index e7366ec2..3042d066 100644
--- a/cmd-confirm-before.c
+++ b/cmd-confirm-before.c
@@ -41,8 +41,6 @@ const struct cmd_entry cmd_confirm_before_entry = {
 	.args = { "p:t:", 1, 1 },
 	.usage = "[-p prompt] " CMD_TARGET_CLIENT_USAGE " command",
 
-	.tflag = CMD_CLIENT,
-
 	.flags = 0,
 	.exec = cmd_confirm_before_exec
 };
@@ -57,10 +55,13 @@ cmd_confirm_before_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = self->args;
 	struct cmd_confirm_before_data	*cdata;
-	struct client			*c = item->state.c;
+	struct client			*c;
 	char				*cmd, *copy, *new_prompt, *ptr;
 	const char			*prompt;
 
+	if ((c = cmd_find_client(item, args_get(args, 't'), 0)) == NULL)
+		return (CMD_RETURN_ERROR);
+
 	if ((prompt = args_get(args, 'p')) != NULL)
 		xasprintf(&new_prompt, "%s ", prompt);
 	else {
diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c
index 35c41a3a..5599bb96 100644
--- a/cmd-copy-mode.c
+++ b/cmd-copy-mode.c
@@ -33,7 +33,7 @@ const struct cmd_entry cmd_copy_mode_entry = {
 	.args = { "Met:u", 0, 0 },
 	.usage = "[-Mu] " CMD_TARGET_PANE_USAGE,
 
-	.tflag = CMD_PANE,
+	.target = { 't', CMD_FIND_PANE, 0 },
 
 	.flags = CMD_AFTERHOOK,
 	.exec = cmd_copy_mode_exec
@@ -46,7 +46,7 @@ const struct cmd_entry cmd_clock_mode_entry = {
 	.args = { "t:", 0, 0 },
 	.usage = CMD_TARGET_PANE_USAGE,
 
-	.tflag = CMD_PANE,
+	.target = { 't', CMD_FIND_PANE, 0 },
 
 	.flags = CMD_AFTERHOOK,
 	.exec = cmd_copy_mode_exec
@@ -59,7 +59,7 @@ cmd_copy_mode_exec(struct cmd *self, struct cmdq_item *item)
 	struct cmdq_shared	*shared = item->shared;
 	struct client		*c = item->client;
 	struct session		*s;
-	struct window_pane	*wp = item->state.tflag.wp;
+	struct window_pane	*wp = item->target.wp;
 
 	if (args_has(args, 'M')) {
 		if ((wp = cmd_mouse_pane(&shared->mouse, &s, NULL)) == NULL)
diff --git a/cmd-detach-client.c b/cmd-detach-client.c
index 2e21f795..85b9a4ed 100644
--- a/cmd-detach-client.c
+++ b/cmd-detach-client.c
@@ -37,8 +37,7 @@ const struct cmd_entry cmd_detach_client_entry = {
 	.usage = "[-aP] [-E shell-command] "
 	         "[-s target-session] " CMD_TARGET_CLIENT_USAGE,
 
-	.sflag = CMD_SESSION,
-	.tflag = CMD_CLIENT,
+	.source = { 's', CMD_FIND_SESSION, CMD_FIND_CANFAIL },
 
 	.flags = CMD_READONLY,
 	.exec = cmd_detach_client_exec
@@ -51,8 +50,6 @@ const struct cmd_entry cmd_suspend_client_entry = {
 	.args = { "t:", 0, 0 },
 	.usage = CMD_TARGET_CLIENT_USAGE,
 
-	.tflag = CMD_CLIENT,
-
 	.flags = 0,
 	.exec = cmd_detach_client_exec
 };
@@ -61,11 +58,14 @@ static enum cmd_retval
 cmd_detach_client_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args	*args = self->args;
-	struct client	*c = item->state.c, *cloop;
+	struct client	*c, *cloop;
 	struct session	*s;
 	enum msgtype	 msgtype;
 	const char	*cmd = args_get(args, 'E');
 
+	if ((c = cmd_find_client(item, args_get(args, 't'), 0)) == NULL)
+		return (CMD_RETURN_ERROR);
+
 	if (self->entry == &cmd_suspend_client_entry) {
 		server_client_suspend(c);
 		return (CMD_RETURN_NORMAL);
@@ -77,7 +77,9 @@ cmd_detach_client_exec(struct cmd *self, struct cmdq_item *item)
 		msgtype = MSG_DETACH;
 
 	if (args_has(args, 's')) {
-		s = item->state.sflag.s;
+		s = item->source.s;
+		if (s == NULL)
+			return (CMD_RETURN_NORMAL);
 		TAILQ_FOREACH(cloop, &clients, entry) {
 			if (cloop->session == s) {
 				if (cmd != NULL)
diff --git a/cmd-display-message.c b/cmd-display-message.c
index 3bb5f9ac..41be8362 100644
--- a/cmd-display-message.c
+++ b/cmd-display-message.c
@@ -43,8 +43,7 @@ const struct cmd_entry cmd_display_message_entry = {
 	.usage = "[-p] [-c target-client] [-F format] "
 		 CMD_TARGET_PANE_USAGE " [message]",
 
-	.cflag = CMD_CLIENT_CANFAIL,
-	.tflag = CMD_PANE,
+	.target = { 't', CMD_FIND_PANE, 0 },
 
 	.flags = CMD_AFTERHOOK,
 	.exec = cmd_display_message_exec
@@ -54,10 +53,10 @@ static enum cmd_retval
 cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
-	struct client		*c = item->state.c;
-	struct session		*s = item->state.tflag.s;
-	struct winlink		*wl = item->state.tflag.wl;
-	struct window_pane	*wp = item->state.tflag.wp;
+	struct client		*c;
+	struct session		*s = item->target.s;
+	struct winlink		*wl = item->target.wl;
+	struct window_pane	*wp = item->target.wp;
 	const char		*template;
 	char			*msg;
 	struct format_tree	*ft;
@@ -66,6 +65,7 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
 		cmdq_error(item, "only one of -F or argument must be given");
 		return (CMD_RETURN_ERROR);
 	}
+	c = cmd_find_client(item, args_get(args, 'c'), 1);
 
 	template = args_get(args, 'F');
 	if (args->argc != 0)
diff --git a/cmd-display-panes.c b/cmd-display-panes.c
index 6a2fbfd8..5593b268 100644
--- a/cmd-display-panes.c
+++ b/cmd-display-panes.c
@@ -40,8 +40,6 @@ const struct cmd_entry cmd_display_panes_entry = {
 	.args = { "t:", 0, 1 },
 	.usage = CMD_TARGET_CLIENT_USAGE,
 
-	.tflag = CMD_CLIENT,
-
 	.flags = CMD_AFTERHOOK,
 	.exec = cmd_display_panes_exec
 };
@@ -50,7 +48,10 @@ static enum cmd_retval
 cmd_display_panes_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args	*args = self->args;
-	struct client	*c = item->state.c;
+	struct client	*c;
+
+	if ((c = cmd_find_client(item, args_get(args, 't'), 0)) == NULL)
+		return (CMD_RETURN_ERROR);
 
 	if (c->identify_callback != NULL)
 		return (CMD_RETURN_NORMAL);
diff --git a/cmd-find-window.c b/cmd-find-window.c
index 0392688a..06cdd946 100644
--- a/cmd-find-window.c
+++ b/cmd-find-window.c
@@ -54,7 +54,7 @@ const struct cmd_entry cmd_find_window_entry = {
 	.args = { "F:CNt:T", 1, 4 },
 	.usage = "[-CNT] [-F format] " CMD_TARGET_WINDOW_USAGE " match-string",
 
-	.tflag = CMD_WINDOW,
+	.target = { 't', CMD_FIND_WINDOW, 0 },
 
 	.flags = 0,
 	.exec = cmd_find_window_exec
@@ -143,10 +143,10 @@ cmd_find_window_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = self->args;
 	struct cmd_find_state		*current = &item->shared->current;
-	struct client			*c = item->state.c;
+	struct client			*c = cmd_find_client(item, NULL, 1);
 	struct window_choose_data	*cdata;
-	struct session			*s = item->state.tflag.s;
-	struct winlink			*wl = item->state.tflag.wl, *wm;
+	struct session			*s = item->target.s;
+	struct winlink			*wl = item->target.wl, *wm;
 	struct cmd_find_window_list	 find_list;
 	struct cmd_find_window_data	*find_data;
 	struct cmd_find_window_data	*find_data1;
diff --git a/cmd-find.c b/cmd-find.c
index 44f50bf7..630a6340 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -953,6 +953,10 @@ cmd_find_target(struct cmd_find_state *fs, struct cmdq_item *item,
 	const char		*session, *window, *pane;
 	int			 window_only = 0, pane_only = 0;
 
+	/* Can fail flag implies quiet. */
+	if (flags & CMD_FIND_CANFAIL)
+		flags |= CMD_FIND_QUIET;
+
 	/* Log the arguments. */
 	if (target == NULL)
 		log_debug("%s: target none, type %d", __func__, type);
@@ -1190,6 +1194,8 @@ error:
 	log_debug("%s: error", __func__);
 
 	free(copy);
+	if (flags & CMD_FIND_CANFAIL)
+		return (0);
 	return (-1);
 
 found:
diff --git a/cmd-if-shell.c b/cmd-if-shell.c
index 4a93885b..580526f8 100644
--- a/cmd-if-shell.c
+++ b/cmd-if-shell.c
@@ -43,7 +43,7 @@ const struct cmd_entry cmd_if_shell_entry = {
 	.usage = "[-bF] " CMD_TARGET_PANE_USAGE " shell-command command "
 		 "[command]",
 
-	.tflag = CMD_PANE_CANFAIL,
+	.target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL },
 
 	.flags = 0,
 	.exec = cmd_if_shell_exec
@@ -70,10 +70,10 @@ cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
 	char				*shellcmd, *cmd, *cause;
 	struct cmd_list			*cmdlist;
 	struct cmdq_item		*new_item;
-	struct client			*c = item->state.c;
-	struct session			*s = item->state.tflag.s;
-	struct winlink			*wl = item->state.tflag.wl;
-	struct window_pane		*wp = item->state.tflag.wp;
+	struct client			*c = cmd_find_client(item, NULL, 1);
+	struct session			*s = item->target.s;
+	struct winlink			*wl = item->target.wl;
+	struct window_pane		*wp = item->target.wp;
 	const char			*cwd;
 
 	if (item->client != NULL && item->client->session == NULL)
diff --git a/cmd-join-pane.c b/cmd-join-pane.c
index eb2f6022..a4ab81f7 100644
--- a/cmd-join-pane.c
+++ b/cmd-join-pane.c
@@ -38,8 +38,8 @@ const struct cmd_entry cmd_join_pane_entry = {
 	.args = { "bdhvp:l:s:t:", 0, 0 },
 	.usage = "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,
 
-	.sflag = CMD_PANE_MARKED,
-	.tflag = CMD_PANE,
+	.source = { 's', CMD_FIND_PANE, CMD_FIND_DEFAULT_MARKED },
+	.target = { 't', CMD_FIND_PANE, 0 },
 
 	.flags = 0,
 	.exec = cmd_join_pane_exec
@@ -52,8 +52,8 @@ const struct cmd_entry cmd_move_pane_entry = {
 	.args = { "bdhvp:l:s:t:", 0, 0 },
 	.usage = "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,
 
-	.sflag = CMD_PANE,
-	.tflag = CMD_PANE,
+	.source = { 's', CMD_FIND_PANE, 0 },
+	.target = { 't', CMD_FIND_PANE, 0 },
 
 	.flags = 0,
 	.exec = cmd_join_pane_exec
@@ -79,15 +79,15 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item)
 	else
 		not_same_window = 0;
 
-	dst_s = item->state.tflag.s;
-	dst_wl = item->state.tflag.wl;
-	dst_wp = item->state.tflag.wp;
+	dst_s = item->target.s;
+	dst_wl = item->target.wl;
+	dst_wp = item->target.wp;
 	dst_w = dst_wl->window;
 	dst_idx = dst_wl->idx;
 	server_unzoom_window(dst_w);
 
-	src_wl = item->state.sflag.wl;
-	src_wp = item->state.sflag.wp;
+	src_wl = item->source.wl;
+	src_wp = item->source.wp;
 	src_w = src_wl->window;
 	server_unzoom_window(src_w);
 
diff --git a/cmd-kill-pane.c b/cmd-kill-pane.c
index 19dcf96f..a8a423d0 100644
--- a/cmd-kill-pane.c
+++ b/cmd-kill-pane.c
@@ -35,7 +35,7 @@ const struct cmd_entry cmd_kill_pane_entry = {
 	.args = { "at:", 0, 0 },
 	.usage = "[-a] " CMD_TARGET_PANE_USAGE,
 
-	.tflag = CMD_PANE,
+	.target = { 't', CMD_FIND_PANE, 0 },
 
 	.flags = 0,
 	.exec = cmd_kill_pane_exec
@@ -44,8 +44,8 @@ const struct cmd_entry cmd_kill_pane_entry = {
 static enum cmd_retval
 cmd_kill_pane_exec(struct cmd *self, struct cmdq_item *item)
 {
-	struct winlink		*wl = item->state.tflag.wl;
-	struct window_pane	*loopwp, *tmpwp, *wp = item->state.tflag.wp;
+	struct winlink		*wl = item->target.wl;
+	struct window_pane	*loopwp, *tmpwp, *wp = item->target.wp;
 
 	server_unzoom_window(wl->window);
 
diff --git a/cmd-kill-session.c b/cmd-kill-session.c
index 200fe4f9..87ab8a0a 100644
--- a/cmd-kill-session.c
+++ b/cmd-kill-session.c
@@ -36,7 +36,7 @@ const struct cmd_entry cmd_kill_session_entry = {
 	.args = { "aCt:", 0, 0 },
 	.usage = "[-aC] " CMD_TARGET_SESSION_USAGE,
 
-	.tflag = CMD_SESSION,
+	.target = { 't', CMD_FIND_SESSION, 0 },
 
 	.flags = 0,
 	.exec = cmd_kill_session_exec
@@ -49,7 +49,7 @@ cmd_kill_session_exec(struct cmd *self, struct cmdq_item *item)
 	struct session	*s, *sloop, *stmp;
 	struct winlink	*wl;
 
-	s = item->state.tflag.s;
+	s = item->target.s;
 
 	if (args_has(args, 'C')) {
 		RB_FOREACH(wl, winlinks, &s->windows) {
diff --git a/cmd-kill-window.c b/cmd-kill-window.c
index 6365aecb..50df83ee 100644
--- a/cmd-kill-window.c
+++ b/cmd-kill-window.c
@@ -33,7 +33,7 @@ const struct cmd_entry cmd_kill_window_entry = {
 	.args = { "at:", 0, 0 },
 	.usage = "[-a] " CMD_TARGET_WINDOW_USAGE,
 
-	.tflag = CMD_WINDOW,
+	.target = { 't', CMD_FIND_WINDOW, 0 },
 
 	.flags = 0,
 	.exec = cmd_kill_window_exec
@@ -46,7 +46,7 @@ const struct cmd_entry cmd_unlink_window_entry = {
 	.args = { "kt:", 0, 0 },
 	.usage = "[-k] " CMD_TARGET_WINDOW_USAGE,
 
-	.tflag = CMD_WINDOW,
+	.target = { 't', CMD_FIND_WINDOW, 0 },
 
 	.flags = 0,
 	.exec = cmd_kill_window_exec
@@ -56,9 +56,9 @@ static enum cmd_retval
 cmd_kill_window_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = self->args;
-	struct winlink		*wl = item->state.tflag.wl, *wl2, *wl3;
+	struct winlink		*wl = item->target.wl, *wl2, *wl3;
 	struct window		*w = wl->window;
-	struct session		*s = item->state.tflag.s;
+	struct session		*s = item->target.s;
 
 	if (self->entry == &cmd_unlink_window_entry) {
 		if (!args_has(self->args, 'k') && !session_is_linked(s, w)) {
diff --git a/cmd-list-clients.c b/cmd-list-clients.c
index ca34bf25..df9538e6 100644
--- a/cmd-list-clients.c
+++ b/cmd-list-clients.c
@@ -42,7 +42,7 @@ const struct cmd_entry cmd_list_clients_entry = {
 	.args = { "F:t:", 0, 0 },
 	.usage = "[-F format] " CMD_TARGET_SESSION_USAGE,
 
-	.tflag = CMD_SESSION,
+	.target = { 't', CMD_FIND_SESSION, 0 },
 
 	.flags = CMD_READONLY|CMD_AFTERHOOK,
 	.exec = cmd_list_clients_exec
@@ -60,7 +60,7 @@ cmd_list_clients_exec(struct cmd *self, struct cmdq_item *item)
 	char			*line;
 
 	if (args_has(args, 't'))
-		s = item->state.tflag.s;
+		s = item->target.s;
 	else
 		s = NULL;
 
diff --git a/cmd-list-panes.c b/cmd-list-panes.c
index d8ca2a93..47a77ade 100644
--- a/cmd-list-panes.c
+++ b/cmd-list-panes.c
@@ -41,7 +41,7 @@ const struct cmd_entry cmd_list_panes_entry = {
 	.args = { "asF:t:", 0, 0 },
 	.usage = "[-as] [-F format] " CMD_TARGET_WINDOW_USAGE,
 
-	.tflag = CMD_WINDOW,
+	.target = { 't', CMD_FIND_WINDOW, 0 },
 
 	.flags = CMD_AFTERHOOK,