diff options
author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-02-23 22:25:58 +0000 |
---|---|---|
committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-02-23 22:25:58 +0000 |
commit | 3964309c67a683e5132662e38b5ff932af5cbeea (patch) | |
tree | f8566b756787ef7ceeed61e63f61b2a0ece4c751 /cmd-suspend-client.c | |
parent | 357da035b9d052b4cba8db806c6237272ade6673 (diff) | |
download | rtmux-3964309c67a683e5132662e38b5ff932af5cbeea.tar.gz rtmux-3964309c67a683e5132662e38b5ff932af5cbeea.tar.bz2 rtmux-3964309c67a683e5132662e38b5ff932af5cbeea.zip |
Add a command queue to standardize and simplify commands that call other
commands and allow a command to block execution of subsequent commands. This
allows run-shell and if-shell to be synchronous which has been much requested.
Each client has a default command queue and commands are consumed one at a time
from it. A command may suspend execution from the queue by returning
CMD_RETURN_WAIT and then resume it by calling cmd_continue() - for example
run-shell does this from the callback that is fired after the job is freed.
When the command queue becomes empty, command clients are automatically exited
(unless attaching). A callback is also fired - this is used for nested commands
in, for example, if-shell which can block execution of the client's cmdq until
a new cmdq becomes empty.
Also merge all the old error/info/print functions together and lose the old
curclient/cmdclient distinction - a cmdq is bound to one client (or none if in
the configuration file), this is a command client if c->session is NULL
otherwise an attached client.
Diffstat (limited to 'cmd-suspend-client.c')
-rw-r--r-- | cmd-suspend-client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd-suspend-client.c b/cmd-suspend-client.c index 68affac4..101658b1 100644 --- a/cmd-suspend-client.c +++ b/cmd-suspend-client.c @@ -27,7 +27,7 @@ * Suspend client with SIGTSTP. */ -enum cmd_retval cmd_suspend_client_exec(struct cmd *, struct cmd_ctx *); +enum cmd_retval cmd_suspend_client_exec(struct cmd *, struct cmd_q *); const struct cmd_entry cmd_suspend_client_entry = { "suspend-client", "suspendc", @@ -40,12 +40,12 @@ const struct cmd_entry cmd_suspend_client_entry = { }; enum cmd_retval -cmd_suspend_client_exec(struct cmd *self, struct cmd_ctx *ctx) +cmd_suspend_client_exec(struct cmd *self, struct cmd_q *cmdq) { struct args *args = self->args; struct client *c; - if ((c = cmd_find_client(ctx, args_get(args, 't'), 0)) == NULL) + if ((c = cmd_find_client(cmdq, args_get(args, 't'), 0)) == NULL) return (CMD_RETURN_ERROR); tty_stop_tty(&c->tty); |