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-set-environment.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-set-environment.c')
| -rw-r--r-- | cmd-set-environment.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/cmd-set-environment.c b/cmd-set-environment.c index 2c0010af..4be967b7 100644 --- a/cmd-set-environment.c +++ b/cmd-set-environment.c @@ -33,7 +33,7 @@ const struct cmd_entry cmd_set_environment_entry = { "set-environment", "setenv", "grt:u", 1, 2, "[-gru] " CMD_TARGET_SESSION_USAGE " name [value]", - 0, + CMD_SESSION_T, cmd_set_environment_exec }; @@ -41,7 +41,6 @@ enum cmd_retval cmd_set_environment_exec(struct cmd *self, struct cmd_q *cmdq) { struct args *args = self->args; - struct session *s; struct environ *env; const char *name, *value; @@ -62,11 +61,8 @@ cmd_set_environment_exec(struct cmd *self, struct cmd_q *cmdq) if (args_has(self->args, 'g')) env = global_environ; - else { - if ((s = cmd_find_session(cmdq, args_get(args, 't'), 0)) == NULL) - return (CMD_RETURN_ERROR); - env = s->environ; - } + else + env = cmdq->state.tflag.s->environ; if (args_has(self->args, 'u')) { if (value != NULL) { |