diff options
| author | nicm <nicm> | 2015-12-13 14:32:38 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2015-12-13 14:32:38 +0000 |
| commit | 4a4daf13031673870341c68b990e20c314140118 (patch) | |
| tree | 2457218fe3b49af2401cb78cde064b2a7ff62916 /cmd-kill-session.c | |
| parent | 5ed17e84faed0a7655ec1eb3de291b60839dcb12 (diff) | |
| download | rtmux-4a4daf13031673870341c68b990e20c314140118.tar.gz rtmux-4a4daf13031673870341c68b990e20c314140118.tar.bz2 rtmux-4a4daf13031673870341c68b990e20c314140118.zip | |
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.
Diffstat (limited to 'cmd-kill-session.c')
| -rw-r--r-- | cmd-kill-session.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd-kill-session.c b/cmd-kill-session.c index 3f39c241..a4b0d5d2 100644 --- a/cmd-kill-session.c +++ b/cmd-kill-session.c @@ -33,7 +33,7 @@ const struct cmd_entry cmd_kill_session_entry = { "kill-session", NULL, "aCt:", 0, 0, "[-aC] " CMD_TARGET_SESSION_USAGE, - 0, + CMD_SESSION_T, cmd_kill_session_exec }; @@ -44,8 +44,7 @@ cmd_kill_session_exec(struct cmd *self, struct cmd_q *cmdq) struct session *s, *sloop, *stmp; struct winlink *wl; - if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL) - return (CMD_RETURN_ERROR); + s = cmdq->state.tflag.s; if (args_has(args, 'C')) { RB_FOREACH(wl, winlinks, &s->windows) { |