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-set-hook.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'cmd-set-hook.c')

diff --git a/cmd-set-hook.c b/cmd-set-hook.c
index ec58418e..d75b0ba1 100644
--- a/cmd-set-hook.c
+++ b/cmd-set-hook.c
@@ -33,7 +33,7 @@ const struct cmd_entry cmd_set_hook_entry = {
 	"set-hook", NULL,
 	"gt:u", 1, 2,
 	"[-gu] " CMD_TARGET_SESSION_USAGE " hook-name [command]",
-	0,
+	CMD_SESSION_T,
 	cmd_set_hook_exec
 };
 
@@ -41,7 +41,7 @@ const struct cmd_entry cmd_show_hooks_entry = {
 	"show-hooks", NULL,
 	"gt:", 0, 1,
 	"[-g] " CMD_TARGET_SESSION_USAGE,
-	0,
+	CMD_SESSION_T,
 	cmd_set_hook_exec
 };
 
@@ -49,7 +49,6 @@ enum cmd_retval
 cmd_set_hook_exec(struct cmd *self, struct cmd_q *cmdq)
 {
 	struct args	*args = self->args;
-	struct session	*s;
 	struct cmd_list	*cmdlist;
 	struct hooks	*hooks;
 	struct hook	*hook;
@@ -58,12 +57,8 @@ cmd_set_hook_exec(struct cmd *self, struct cmd_q *cmdq)
 
 	if (args_has(args, 'g'))
 		hooks = global_hooks;
-	else {
-		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
-		if (s == NULL)
-			return (CMD_RETURN_ERROR);
-		hooks = s->hooks;
-	}
+	else
+		hooks = cmdq->state.tflag.s->hooks;
 
 	if (self->entry == &cmd_show_hooks_entry) {
 		hook = hooks_first(hooks);
-- 
cgit