Merge branch 'obsd-master'

33 files changed, 250 insertions, 258 deletions

diff --git a/cmd-break-pane.c b/cmd-break-pane.c
index e12b09b6..880ee7f5 100644
--- a/cmd-break-pane.c
+++ b/cmd-break-pane.c
@@ -52,7 +52,7 @@ cmd_break_pane_exec(struct cmd *self, struct cmdq_item *item)
 	struct cmd_find_state	*current = cmdq_get_current(item);
 	struct cmd_find_state	*target = cmdq_get_target(item);
 	struct cmd_find_state	*source = cmdq_get_source(item);
-	struct client		*c = cmd_find_client(item, NULL, 1);
+	struct client		*tc = cmdq_get_target_client(item);
 	struct winlink		*wl = source->wl;
 	struct session		*src_s = source->s;
 	struct session		*dst_s = target->s;
@@ -83,7 +83,7 @@ cmd_break_pane_exec(struct cmd *self, struct cmdq_item *item)
 	wp->flags |= PANE_STYLECHANGED;
 	TAILQ_INSERT_HEAD(&w->panes, wp, entry);
 	w->active = wp;
-	w->latest = c;
+	w->latest = tc;
 
 	if (!args_has(args, 'n')) {
 		name = default_window_name(w);
@@ -115,7 +115,7 @@ cmd_break_pane_exec(struct cmd *self, struct cmdq_item *item)
 	if (args_has(args, 'P')) {
 		if ((template = args_get(args, 'F')) == NULL)
 			template = BREAK_PANE_TEMPLATE;
-		cp = format_single(item, template, c, dst_s, wl, wp);
+		cp = format_single(item, template, tc, dst_s, wl, wp);
 		cmdq_print(item, "%s", cp);
 		free(cp);
 	}
diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c
index 510600e3..e53c4320 100644
--- a/cmd-command-prompt.c
+++ b/cmd-command-prompt.c
@@ -44,7 +44,7 @@ const struct cmd_entry cmd_command_prompt_entry = {
 	.usage = "[-1kiN] [-I inputs] [-p prompts] " CMD_TARGET_CLIENT_USAGE " "
 		 "[template]",
 
-	.flags = 0,
+	.flags = CMD_CLIENT_TFLAG,
 	.exec = cmd_command_prompt_exec
 };
 
@@ -65,16 +65,13 @@ static enum cmd_retval
 cmd_command_prompt_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = cmd_get_args(self);
+	struct client			*tc = cmdq_get_target_client(item);
 	const char			*inputs, *prompts;
 	struct cmd_command_prompt_cdata	*cdata;
-	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)
+	if (tc->prompt_string != NULL)
 		return (CMD_RETURN_NORMAL);
 
 	cdata = xcalloc(1, sizeof *cdata);
@@ -124,7 +121,7 @@ cmd_command_prompt_exec(struct cmd *self, struct cmdq_item *item)
 		cdata->flags |= PROMPT_INCREMENTAL;
 	else if (args_has(args, 'k'))
 		cdata->flags |= PROMPT_KEY;
-	status_prompt_set(c, prompt, input, cmd_command_prompt_callback,
+	status_prompt_set(tc, prompt, input, cmd_command_prompt_callback,
 	    cmd_command_prompt_free, cdata, cdata->flags);
 	free(prompt);
 
diff --git a/cmd-confirm-before.c b/cmd-confirm-before.c
index 026d0e11..0d881178 100644
--- a/cmd-confirm-before.c
+++ b/cmd-confirm-before.c
@@ -42,7 +42,7 @@ const struct cmd_entry cmd_confirm_before_entry = {
 	.args = { "p:t:", 1, 1 },
 	.usage = "[-p prompt] " CMD_TARGET_CLIENT_USAGE " command",
 
-	.flags = 0,
+	.flags = CMD_CLIENT_TFLAG,
 	.exec = cmd_confirm_before_exec
 };
 
@@ -55,13 +55,10 @@ cmd_confirm_before_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = cmd_get_args(self);
 	struct cmd_confirm_before_data	*cdata;
-	struct client			*c;
+	struct client			*tc = cmdq_get_target_client(item);
 	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 {
@@ -74,9 +71,8 @@ cmd_confirm_before_exec(struct cmd *self, struct cmdq_item *item)
 	cdata = xmalloc(sizeof *cdata);
 	cdata->cmd = xstrdup(args->argv[0]);
 
-	status_prompt_set(c, new_prompt, NULL,
-	    cmd_confirm_before_callback, cmd_confirm_before_free, cdata,
-	    PROMPT_SINGLE);
+	status_prompt_set(tc, new_prompt, NULL, cmd_confirm_before_callback,
+	    cmd_confirm_before_free, cdata, PROMPT_SINGLE);
 
 	free(new_prompt);
 	return (CMD_RETURN_NORMAL);
diff --git a/cmd-detach-client.c b/cmd-detach-client.c
index f4e350a8..02a43f4e 100644
--- a/cmd-detach-client.c
+++ b/cmd-detach-client.c
@@ -39,7 +39,7 @@ const struct cmd_entry cmd_detach_client_entry = {
 
 	.source = { 's', CMD_FIND_SESSION, CMD_FIND_CANFAIL },
 
-	.flags = CMD_READONLY,
+	.flags = CMD_READONLY|CMD_CLIENT_TFLAG,
 	.exec = cmd_detach_client_exec
 };
 
@@ -50,7 +50,7 @@ const struct cmd_entry cmd_suspend_client_entry = {
 	.args = { "t:", 0, 0 },
 	.usage = CMD_TARGET_CLIENT_USAGE,
 
-	.flags = 0,
+	.flags = CMD_CLIENT_TFLAG,
 	.exec = cmd_detach_client_exec
 };
 
@@ -59,16 +59,13 @@ cmd_detach_client_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = cmd_get_args(self);
 	struct cmd_find_state	*source = cmdq_get_source(item);
-	struct client		*c, *cloop;
+	struct client		*tc = cmdq_get_target_client(item), *loop;
 	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 (cmd_get_entry(self) == &cmd_suspend_client_entry) {
-		server_client_suspend(c);
+		server_client_suspend(tc);
 		return (CMD_RETURN_NORMAL);
 	}
 
@@ -81,32 +78,32 @@ cmd_detach_client_exec(struct cmd *self, struct cmdq_item *item)
 		s = source->s;
 		if (s == NULL)
 			return (CMD_RETURN_NORMAL);
-		TAILQ_FOREACH(cloop, &clients, entry) {
-			if (cloop->session == s) {
+		TAILQ_FOREACH(loop, &clients, entry) {
+			if (loop->session == s) {
 				if (cmd != NULL)
-					server_client_exec(cloop, cmd);
+					server_client_exec(loop, cmd);
 				else
-					server_client_detach(cloop, msgtype);
+					server_client_detach(loop, msgtype);
 			}
 		}
 		return (CMD_RETURN_STOP);
 	}
 
 	if (args_has(args, 'a')) {
-		TAILQ_FOREACH(cloop, &clients, entry) {
-			if (cloop->session != NULL && cloop != c) {
+		TAILQ_FOREACH(loop, &clients, entry) {
+			if (loop->session != NULL && loop != tc) {
 				if (cmd != NULL)
-					server_client_exec(cloop, cmd);
+					server_client_exec(loop, cmd);
 				else
-					server_client_detach(cloop, msgtype);
+					server_client_detach(loop, msgtype);
 			}
 		}
 		return (CMD_RETURN_NORMAL);
 	}
 
 	if (cmd != NULL)
-		server_client_exec(c, cmd);
+		server_client_exec(tc, cmd);
 	else
-		server_client_detach(c, msgtype);
+		server_client_detach(tc, msgtype);
 	return (CMD_RETURN_STOP);
 }
diff --git a/cmd-display-menu.c b/cmd-display-menu.c
index 830491dc..0a5c7f78 100644
--- a/cmd-display-menu.c
+++ b/cmd-display-menu.c
@@ -42,7 +42,7 @@ const struct cmd_entry cmd_display_menu_entry = {
 
 	.target = { 't', CMD_FIND_PANE, 0 },
 
-	.flags = CMD_AFTERHOOK,
+	.flags = CMD_AFTERHOOK|CMD_CLIENT_CFLAG,
 	.exec = cmd_display_menu_exec
 };
 
@@ -57,17 +57,18 @@ const struct cmd_entry cmd_display_popup_entry = {
 
 	.target = { 't', CMD_FIND_PANE, 0 },
 
-	.flags = CMD_AFTERHOOK,
+	.flags = CMD_AFTERHOOK|CMD_CLIENT_CFLAG,
 	.exec = cmd_display_popup_exec
 };
 
 static void
-cmd_display_menu_get_position(struct client *c, struct cmdq_item *item,
+cmd_display_menu_get_position(struct client *tc, struct cmdq_item *item,
     struct args *args, u_int *px, u_int *py, u_int w, u_int h)
 {
+	struct tty		*tty = &tc->tty;
 	struct cmd_find_state	*target = cmdq_get_target(item);
 	struct key_event	*event = cmdq_get_event(item);
-	struct session		*s = c->session;
+	struct session		*s = tc->session;
 	struct winlink		*wl = target->wl;
 	struct window_pane	*wp = target->wp;
 	struct style_ranges	*ranges;
@@ -75,9 +76,9 @@ cmd_display_menu_get_position(struct client *c, struct cmdq_item *item,
 	const char		*xp, *yp;
 	u_int			 line, ox, oy, sx, sy, lines;
 
-	lines = status_line_size(c);
+	lines = status_line_size(tc);
 	for (line = 0; line < lines; line++) {
-		ranges = &c->status.entries[line].ranges;
+		ranges = &tc->status.entries[line].ranges;
 		TAILQ_FOREACH(sr, ranges, entry) {
 			if (sr->type == STYLE_RANGE_WINDOW)
 				break;
@@ -86,15 +87,15 @@ cmd_display_menu_get_position(struct client *c, struct cmdq_item *item,
 			break;
 	}
 	if (line == lines)
-		ranges = &c->status.entries[0].ranges;
+		ranges = &tc->status.entries[0].ranges;
 
 	xp = args_get(args, 'x');
 	if (xp == NULL || strcmp(xp, "C") == 0)
-		*px = (c->tty.sx - 1) / 2 - w / 2;
+		*px = (tty->sx - 1) / 2 - w / 2;
 	else if (strcmp(xp, "R") == 0)
-		*px = c->tty.sx - 1;
+		*px = tty->sx - 1;
 	else if (strcmp(xp, "P") == 0) {
-		tty_window_offset(&c->tty, &ox, &oy, &sx, &sy);
+		tty_window_offset(&tc->tty, &ox, &oy, &sx, &sy);
 		if (wp->xoff >= ox)
 			*px = wp->xoff - ox;
 		else
@@ -105,7 +106,7 @@ cmd_display_menu_get_position(struct client *c, struct cmdq_item *item,
 		else
 			*px = 0;
 	} else if (strcmp(xp, "W") == 0) {
-		if (status_at_line(c) == -1)
+		if (status_at_line(tc) == -1)
 			*px = 0;
 		else {
 			TAILQ_FOREACH(sr, ranges, entry) {
@@ -121,14 +122,14 @@ cmd_display_menu_get_position(struct client *c, struct cmdq_item *item,
 		}
 	} else
 		*px = strtoul(xp, NULL, 10);
-	if ((*px) + w >= c->tty.sx)
-		*px = c->tty.sx - w;
+	if ((*px) + w >= tty->sx)
+		*px = tty->sx - w;
 
 	yp = args_get(args, 'y');
 	if (yp == NULL || strcmp(yp, "C") == 0)
-		*py = (c->tty.sy - 1) / 2 + h / 2;
+		*py = (tty->sy - 1) / 2 + h / 2;
 	else if (strcmp(yp, "P") == 0) {
-		tty_window_offset(&c->tty, &ox, &oy, &sx, &sy);
+		tty_window_offset(&tc->tty, &ox, &oy, &sx, &sy);
 		if (wp->yoff + wp->sy >= oy)
 			*py = wp->yoff + wp->sy - oy;
 		else
@@ -146,9 +147,9 @@ cmd_display_menu_get_position(struct client *c, struct cmdq_item *item,
 				*py = 0;
 		} else {
 			if (lines != 0)
-				*py = c->tty.sy - lines;
+				*py = tty->sy - lines;
 			else
-				*py = c->tty.sy;
+				*py = tty->sy;
 		}
 	} else if (strcmp(yp, "W") == 0) {
 		if (options_get_number(s->options, "status-position") == 0) {
@@ -158,9 +159,9 @@ cmd_display_menu_get_position(struct client *c, struct cmdq_item *item,
 				*py = 0;
 		} else {
 			if (lines != 0)
-				*py = c->tty.sy - lines + line;
+				*py = tty->sy - lines + line;
 			else
-				*py = c->tty.sy;
+				*py = tty->sy;
 		}
 	} else
 		*py = strtoul(yp, NULL, 10);
@@ -168,8 +169,8 @@ cmd_display_menu_get_position(struct client *c, struct cmdq_item *item,
 		*py = 0;
 	else
 		*py -= h;
-	if ((*py) + h >= c->tty.sy)
-		*py = c->tty.sy - h;
+	if ((*py) + h >= tty->sy)
+		*py = tty->sy - h;
 }
 
 static enum cmd_retval
@@ -178,7 +179,7 @@ cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item)
 	struct args		*args = cmd_get_args(self);
 	struct cmd_find_state	*target = cmdq_get_target(item);
 	struct key_event	*event = cmdq_get_event(item);
-	struct client		*c;
+	struct client		*tc = cmdq_get_target_client(item);
 	struct menu		*menu = NULL;
 	struct menu_item	 menu_item;
 	const char		*key;
@@ -186,13 +187,11 @@ cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item)
 	int			 flags = 0, i;
 	u_int			 px, py;
 
-	if ((c = cmd_find_client(item, args_get(args, 'c'), 0)) == NULL)
-		return (CMD_RETURN_ERROR);
-	if (c->overlay_draw != NULL)
+	if (tc->overlay_draw != NULL)
 		return (CMD_RETURN_NORMAL);
 
 	if (args_has(args, 'T'))
-		title = format_single_from_target(item, args_get(args, 'T'), c);
+		title = format_single_from_target(item, args_get(args, 'T'));
 	else
 		title = xstrdup("");
 	menu = menu_create(title);
@@ -200,7 +199,7 @@ cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item)
 	for (i = 0; i != args->argc; /* nothing */) {
 		name = args->argv[i++];
 		if (*name == '\0') {
-			menu_add_item(menu, NULL, item, c, target);
+			menu_add_item(menu, NULL, item, tc, target);
 			continue;
 		}
 
@@ -216,7 +215,7 @@ cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item)
 		menu_item.key = key_string_lookup_string(key);
 		menu_item.command = args->argv[i++];
 
-		menu_add_item(menu, &menu_item, item, c, target);
+		menu_add_item(menu, &menu_item, item, tc, target);
 	}
 	free(title);
 	if (menu == NULL) {
@@ -227,12 +226,13 @@ cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item)
 		menu_free(menu);
 		return (CMD_RETURN_NORMAL);
 	}
-	cmd_display_menu_get_position(c, item, args, &px, &py, menu->width + 4,
+	cmd_display_menu_get_position(tc, item, args, &px, &py, menu->width + 4,
 	    menu->count + 2);
 
 	if (!event->m.valid)
 		flags |= MENU_NOMOUSE;
-	if (menu_display(menu, flags, item, px, py, c, target, NULL, NULL) != 0)
+	if (menu_display(menu, flags, item, px, py, tc, target, NULL,
+	    NULL) != 0)
 		return (CMD_RETURN_NORMAL);
 	return (CMD_RETURN_WAIT);
 }
@@ -242,20 +242,19 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = cmd_get_args(self);
 	struct cmd_find_state	*target = cmdq_get_target(item);
-	struct client		*c;
+	struct client		*tc = cmdq_get_target_client(item);
+	struct tty		*tty = &tc->tty;
 	const char		*value, *cmd = NULL, **lines = NULL;
 	const char		*shellcmd = NULL;
 	char			*cwd, *cause;
 	int			 flags = 0;
 	u_int			 px, py, w, h, nlines = 0;
 
-	if ((c = cmd_find_client(item, args_get(args, 'c'), 0)) == NULL)
-		return (CMD_RETURN_ERROR);
 	if (args_has(args, 'C')) {
-		server_client_clear_overlay(c);
+		server_client_clear_overlay(tc);
 		return (CMD_RETURN_NORMAL);
 	}
-	if (c->overlay_draw != NULL)
+	if (tc->overlay_draw != NULL)
 		return (CMD_RETURN_NORMAL);
 
 	if (args->argc >= 1)
@@ -268,9 +267,9 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
 	if (nlines != 0)
 		h = popup_height(nlines, lines) + 2;
 	else
-		h = c->tty.sy / 2;
+		h = tty->sy / 2;
 	if (args_has(args, 'h')) {
-		h = args_percentage(args, 'h', 1, c->tty.sy, c->tty.sy, &cause);
+		h = args_percentage(args, 'h', 1, tty->sy, tty->sy, &cause);
 		if (cause != NULL) {
 			cmdq_error(item, "height %s", cause);
 			free(cause);
@@ -279,11 +278,11 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
 	}
 
 	if (nlines != 0)
-		w = popup_width(item, nlines, lines, c, target) + 2;
+		w = popup_width(item, nlines, lines, tc, target) + 2;
 	else
-		w = c->tty.sx / 2;
+		w = tty->sx / 2;
 	if (args_has(args, 'w')) {
-		w = args_percentage(args, 'w', 1, c->tty.sx, c->tty.sx, &cause);
+		w = args_percentage(args, 'w', 1, tty->sx, tty->sx, &cause);
 		if (cause != NULL) {
 			cmdq_error(item, "width %s", cause);
 			free(cause);
@@ -291,21 +290,21 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
 		}
 	}
 
-	if (w > c->tty.sx - 1)
-		w = c->tty.sx - 1;
-	if (h > c->tty.sy - 1)
-		h = c->tty.sy - 1;
-	cmd_display_menu_get_position(c, item, args, &px, &py, w, h);
+	if (w > tty->sx - 1)
+		w = tty->sx - 1;
+	if (h > tty->sy - 1)
+		h = tty->sy - 1;
+	cmd_display_menu_get_position(tc, item, args, &px, &py, w, h);
 
 	value = args_get(args, 'd');
 	if (value != NULL)
-		cwd = format_single_from_target(item, value, c);
+		cwd = format_single_from_target(item, value);
 	else
-		cwd = xstrdup(server_client_get_cwd(c, target->s));
+		cwd = xstrdup(server_client_get_cwd(tc, target->s));
 
 	value = args_get(args, 'R');
 	if (value != NULL)
-		shellcmd = format_single_from_target(item, value, c);
+		shellcmd = format_single_from_target(item, value);
 
 	if (args_has(args, 'K'))
 		flags |= POPUP_WRITEKEYS;
@@ -314,7 +313,7 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
 	else if (args_has(args, 'E'))
 		flags |= POPUP_CLOSEEXIT;
 	if (popup_display(flags, item, px, py, w, h, nlines, lines, shellcmd,
-	    cmd, cwd, c, target) != 0)
+	    cmd, cwd, tc, target) != 0)
 		return (CMD_RETURN_NORMAL);
 	return (CMD_RETURN_WAIT);
 }
diff --git a/cmd-display-message.c b/cmd-display-message.c
index 8fb09f20..4e69f03a 100644
--- a/cmd-display-message.c
+++ b/cmd-display-message.c
@@ -45,7 +45,7 @@ const struct cmd_entry cmd_display_message_entry = {
 
 	.target = { 't', CMD_FIND_PANE, 0 },
 
-	.flags = CMD_AFTERHOOK,
+	.flags = CMD_AFTERHOOK|CMD_CLIENT_CFLAG|CMD_CLIENT_CANFAIL,
 	.exec = cmd_display_message_exec
 };
 
@@ -62,7 +62,7 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = cmd_get_args(self);
 	struct cmd_find_state	*target = cmdq_get_target(item);
-	struct client		*c, *target_c;
+	struct client		*tc = cmdq_get_target_client(item), *c;
 	struct session		*s = target->s;
 	struct winlink		*wl = target->wl;
 	struct window_pane	*wp = target->wp;
@@ -97,17 +97,16 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
 	 * formats too, assuming it matches the session. If it doesn't, use the
 	 * best client for the session.
 	 */
-	c = cmd_find_client(item, args_get(args, 'c'), 1);
-	if (c != NULL && c->session == s)
-		target_c = c;
+	if (tc != NULL && tc->session == s)
+		c = tc;
 	else
-		target_c = cmd_find_best_client(s);
+		c = cmd_find_best_client(s);
 	if (args_has(args, 'v'))
 		flags = FORMAT_VERBOSE;
 	else
 		flags = 0;
 	ft = format_create(cmdq_get_client(item), item, FORMAT_NONE, flags);
-	format_defaults(ft, target_c, s, wl, wp);
+	format_defaults(ft, c, s, wl, wp);
 
 	if (args_has(args, 'a')) {
 		format_each(ft, cmd_display_message_each, item);
@@ -117,8 +116,8 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
 	msg = format_expand_time(ft, template);
 	if (args_has(args, 'p'))
 		cmdq_print(item, "%s", msg);
-	else if (c != NULL)
-		status_message_set(c, "%s", msg);
+	else if (tc != NULL)
+		status_message_set(tc, "%s", msg);
 	free(msg);
 
 	format_free(ft);
diff --git a/cmd-display-panes.c b/cmd-display-panes.c
index 7e1a9e3d..0f12b14b 100644
--- a/cmd-display-panes.c
+++ b/cmd-display-panes.c
@@ -37,7 +37,7 @@ const struct cmd_entry cmd_display_panes_entry = {
 	.args = { "bd:t:", 0, 1 },
 	.usage = "[-b] [-d duration] " CMD_TARGET_CLIENT_USAGE " [template]",
 
-	.flags = CMD_AFTERHOOK,
+	.flags = CMD_AFTERHOOK|CMD_CLIENT_TFLAG,
 	.exec = cmd_display_panes_exec
 };
 
@@ -228,17 +228,13 @@ static enum cmd_retval
 cmd_display_panes_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = cmd_get_args(self);
-	struct client			*c;
-	struct session			*s;
+	struct client			*tc = cmdq_get_target_client(item);
+	struct session			*s = tc->session;
 	u_int		 		 delay;
 	char				*cause;
 	struct cmd_display_panes_data	*cdata;
 
-	if ((c = cmd_find_client(item, args_get(args, 't'), 0)) == NULL)
-		return (CMD_RETURN_ERROR);
-	s = c->session;
-
-	if (c->overlay_draw != NULL)
+	if (tc->overlay_draw != NULL)
 		return (CMD_RETURN_NORMAL);
 
 	if (args_has(args, 'd')) {
@@ -261,7 +257,7 @@ cmd_display_panes_exec(struct cmd *self, struct cmdq_item *item)
 	else
 		cdata->item = item;
 
-	server_client_set_overlay(c, delay, NULL, NULL, cmd_display_panes_draw,
+	server_client_set_overlay(tc, delay, NULL, NULL, cmd_display_panes_draw,
 	    cmd_display_panes_key, cmd_display_panes_free, cdata);
 
 	if (args_has(args, 'b'))
diff --git a/cmd-if-shell.c b/cmd-if-shell.c
index 75f462ad..d980472a 100644
--- a/cmd-if-shell.c
+++ b/cmd-if-shell.c
@@ -67,12 +67,12 @@ cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
 	struct cmd_if_shell_data	*cdata;
 	char				*shellcmd, *cmd, *error;
 	const char			*file;
-	struct client			*c = cmd_find_client(item, NULL, 1);
+	struct client			*tc = cmdq_get_target_client(item);
 	struct session			*s = target->s;
 	struct cmd_parse_input		 pi;
 	enum cmd_parse_status		 status;
 
-	shellcmd = format_single_from_target(item, args->argv[0], c);
+	shellcmd = format_single_from_target(item, args->argv[0]);
 	if (args_has(args, 'F')) {
 		if (*shellcmd != '0' && *shellcmd != '\0')
 			cmd = args->argv[1];
@@ -87,7 +87,7 @@ cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
 		memset(&pi, 0, sizeof pi);
 		cmd_get_source(self, &pi.file, &pi.line);
 		pi.item = item;
-		pi.c = c;
+		pi.c = tc;
 		cmd_find_copy_state(&pi.fs, target);
 
 		status = cmd_parse_and_insert(cmd, &pi, item, state, &error);
@@ -110,7 +110,7 @@ cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
 	if (!args_has(args, 'b'))
 		cdata->client = cmdq_get_client(item);
 	else
-		cdata->client = c;
+		cdata->client = tc;
 	if (cdata->client != NULL)
 		cdata->client->references++;
 
@@ -123,7 +123,7 @@ cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
 	cmd_get_source(self, &file, &cdata->input.line);
 	if (file != NULL)
 		cdata->input.file = xstrdup(file);
-	cdata->input.c = c;
+	cdata->input.c = tc;
 	if (cdata->input.c != NULL)
 		cdata->input.c->references++;
 	cmd_find_copy_state(&cdata->input.fs, target);
diff --git a/cmd-list-keys.c b/cmd-list-keys.c
index cfdceee7..1141bbb5 100644
--- a/cmd-list-keys.c
+++ b/cmd-list-keys.c
@@ -85,7 +85,7 @@ static int
 cmd_list_keys_print_notes(struct cmdq_item *item, struct args *args,
     const char *tablename, u_int keywidth, key_code only, const char *prefix)
 {
-	struct client		*c = cmd_find_client(item, NULL, 1);
+	struct client		*tc = cmdq_get_target_client(item);
 	struct key_table	*table;
 	struct key_binding	*bd;
 	const char		*key;
@@ -111,8 +111,8 @@ cmd_list_keys_print_notes(struct cmdq_item *item, struct args *args,
 		else
 			note = xstrdup(bd->note);
 		tmp = utf8_padcstr(key, keywidth + 1);
-		if (args_has(args, '1') && c != NULL)
-			status_message_set(c, "%s%s%s", prefix, tmp, note);
+		if (args_has(args, '1') && tc != NULL)
+			status_message_set(tc, "%s%s%s", prefix, tmp, note);
 		else
 			cmdq_print(item, "%s%s%s", prefix, tmp, note);
 		free(tmp);
diff --git a/cmd-load-buffer.c b/cmd-load-buffer.c
index 1fc45b0f..49e834d6 100644
--- a/cmd-load-buffer.c
+++ b/cmd-load-buffer.c
@@ -85,7 +85,6 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args			*args = cmd_get_args(self);
 	struct cmd_load_buffer_data	*cdata;
-	struct client			*c = cmd_find_client(item, NULL, 1);
 	const char			*bufname = args_get(args, 'b');
 	char				*path;
 
@@ -96,7 +95,7 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
 	else
 		cdata->name = NULL;
 
-	path = format_single_from_target(item, args->argv[0], c);
+	path = format_single_from_target(item, args->argv[0]);
 	file_read(cmdq_get_client(item), path, cmd_load_buffer_done, cdata);
 	free(path);
 
diff --git a/cmd-lock-server.c b/cmd-lock-server.c
index 086cf639..a0df95b0 100644
--- a/cmd-lock-server.c
+++ b/cmd-lock-server.c
@@ -57,26 +57,22 @@ const struct cmd_entry cmd_lock_client_entry = {
 	.args = { "t:", 0, 0 },
 	.usage = CMD_TARGET_CLIENT_USAGE,
 
-	.flags = CMD_AFTERHOOK,
+	.flags = CMD_AFTERHOOK|CMD_CLIENT_TFLAG,
 	.exec = cmd_lock_server_exec
 };
 
 static enum cmd_retval
 cmd_lock_server_exec(struct cmd *self, struct cmdq_item *item)
 {
-	struct args		*args = cmd_get_args(self);
 	struct cmd_find_state	*target = cmdq_get_target(item);
-	struct client		*c;
+	struct client		*tc = cmdq_get_target_client(item);
 
 	if (cmd_get_entry(self) == &cmd_lock_server_entry)
 		server_lock();
 	else if (cmd_get_entry(self) == &cmd_lock_session_entry)
 		server_lock_session(target->s);
-	else {
-		if ((c = cmd_find_client(item, args_get(args, 't'), 0)) == NULL)
-			return (CMD_RETURN_ERROR);
-		server_lock_client(c);
-	}
+	else
+		server_lock_client(tc);
 	recalculate_sizes();
 
 	return (CMD_RETURN_NORMAL);
diff --git a/cmd-new-session.c b/cmd-new-session.c
index 574cd5cd..353f7bed 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -269,7 +269,6 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
 	memset(&sc, 0, sizeof sc);
 	sc.item = item;
 	sc.s = s;
-	sc.c = c;
 
 	sc.name = args_get(args, 'n');
 	sc.argc = args->argc;
diff --git a/cmd-new-window.c b/cmd-new-window.c
index 87aae659..722f89b9 100644
--- a/cmd-new-window.c
+++ b/cmd-new-window.c
@@ -55,7 +55,7 @@ cmd_new_window_exec(struct cmd *self, struct cmdq_item *item)
 	struct cmd_find_state	*current = cmdq_get_current(item);
 	struct cmd_find_state	*target = cmdq_get_target(item);
 	struct spawn_context	 sc;
-	struct client		*c = cmd_find_client(item, NULL, 1);
+	struct client		*tc = cmdq_get_target_client(item);
 	struct session		*s = target->s;
 	struct winlink		*wl = target->wl;
 	int			 idx = target->idx;
@@ -73,7 +73,7 @@ cmd_new_window_exec(struct cmd *self, struct cmdq_item *item)
 	memset(&sc, 0, sizeof sc);
 	sc.item = item;
 	sc.s = s;
-	sc.c = c;
+	sc.tc = tc;
 
 	sc.name = args_get(args, 'n');
 	sc.argc = args->argc;
@@ -109,7 +109,7 @@ cmd_new_window_exec(struct cmd *self, struct cmdq_item *item)
 	if (args_has(args, 'P')) {
 		if ((template = args_get(args, 'F')) == NULL)
 			template = NEW_WINDOW_TEMPLATE;
-		cp = format_single(item, template, c, s, new_wl,
+		cp = format_single(item, template, tc, s, new_wl,
 		    new_wl->window->active);
 		cmdq_print(item, "%s", cp);
 		free(cp);
diff --git a/cmd-pipe-pane.c b/cmd-pipe-pane.c
index 93df5a07..b64229d8 100644
--- a/cmd-pipe-pane.c
+++ b/cmd-pipe-pane.c
@@ -57,7 +57,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		*args = cmd_get_args(self);
 	struct cmd_find_state	*target = cmdq_get_target(item);
-	struct client		*c = cmd_find_client(item, NULL, 1);
+	struct client		*tc = cmdq_get_target_client(item);
 	struct window_pane	*wp = target->wp;
 	struct session		*s = target->s;
 	struct winlink		*wl = target->wl;
@@ -109,7 +109,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmdq_item *item)
 
 	/* Expand the command. */
 	ft = format_create(cmdq_get_client(item), item, FORMAT_NONE, 0);
-	format_defaults(ft, c, s, wl, wp);
+	format_defaults(ft, tc, s, wl, wp);
 	cmd = format_expand_time(ft, args->argv[0]);
 	format_free(ft);
 
diff --git a/cmd-queue.c b/cmd-queue.c
index 97d19f81..16c58401 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -42,6 +42,7 @@ struct cmdq_item {
 	struct cmdq_item	*next;
 
 	struct client		*client;
+	struct client		*target_client;
 
 	enum cmdq_type		 type;
 	u_int			 group;
@@ -145,6 +146,13 @@ cmdq_get_client(struct cmdq_item *item)
 	return (item->client);
 }
 
+/* Get item target client. */
+struct client *
+cmdq_get_target_client(struct cmdq_item *item)
+{
+	return (item->target_client);
+}
+
 /* Get item state. */
 struct cmdq_state *
 cmdq_get_state(struct cmdq_item *item)
@@ -483,14 +491,15 @@ cmdq_find_flag(struct cmdq_item *item, struct cmd_find_state *fs,
 static enum cmd_retval
 cmdq_fire_command(struct cmdq_item *item)
 {
-	struct client		*c = item->client;
-	const char		*name = cmdq_name(c);
+	const char		*name = cmdq_name(item->client);
 	struct cmdq_state	*state = item->state;
 	struct cmd		*cmd = item->cmd;
+	struct args		*args = cmd_get_args(cmd);
 	const struct cmd_entry	*entry = cmd_get_entry(cmd);
+	struct client		*tc, *saved = item->client;
 	enum cmd_retval		 retval;
 	struct cmd_find_state	*fsp, fs;
-	int			 flags;
+	int			 flags, quiet = 0;
 	char			*tmp;
 
 	if (log_get_level() > 1) {</