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, 8 insertions, 18 deletions

diff --git a/usr.bin/tmux/cmd-lock-server.c b/usr.bin/tmux/cmd-lock-server.c
index 80d1be968e5..171342ee295 100644
--- a/usr.bin/tmux/cmd-lock-server.c
+++ b/usr.bin/tmux/cmd-lock-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-lock-server.c,v 1.18 2015/11/18 14:27:44 nicm Exp $ */
+/* $OpenBSD: cmd-lock-server.c,v 1.19 2015/12/13 14:32:38 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -38,7 +38,7 @@ const struct cmd_entry cmd_lock_session_entry = {
 	"lock-session", "locks",
 	"t:", 0, 0,
 	CMD_TARGET_SESSION_USAGE,
-	0,
+	CMD_SESSION_T,
 	cmd_lock_server_exec
 };
 
@@ -46,30 +46,20 @@ const struct cmd_entry cmd_lock_client_entry = {
 	"lock-client", "lockc",
 	"t:", 0, 0,
 	CMD_TARGET_CLIENT_USAGE,
-	0,
+	CMD_CLIENT_T,
 	cmd_lock_server_exec
 };
 
 enum cmd_retval
 cmd_lock_server_exec(struct cmd *self, __unused struct cmd_q *cmdq)
 {
-	struct args	*args = self->args;
-	struct client	*c;
-	struct session	*s;
-
 	if (self->entry == &cmd_lock_server_entry)
 		server_lock();
-	else if (self->entry == &cmd_lock_session_entry) {
-		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
-		if (s == NULL)
-			return (CMD_RETURN_ERROR);
-		server_lock_session(s);
-	} else {
-		c = cmd_find_client(cmdq, args_get(args, 't'), 0);
-		if (c == NULL)
-			return (CMD_RETURN_ERROR);
-		server_lock_client(c);
-	}
+	else if (self->entry == &cmd_lock_session_entry)
+		server_lock_session(cmdq->state.tflag.s);
+	else
+		server_lock_client(cmdq->state.c);
+
 	recalculate_sizes();
 
 	return (CMD_RETURN_NORMAL);