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-list-clients.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-list-clients.c')
| -rw-r--r-- | cmd-list-clients.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd-list-clients.c b/cmd-list-clients.c index a74fe69d..59f63099 100644 --- a/cmd-list-clients.c +++ b/cmd-list-clients.c @@ -28,7 +28,7 @@ * List all clients. */ -enum cmd_retval cmd_list_clients_exec(struct cmd *, struct cmd_ctx *); +enum cmd_retval cmd_list_clients_exec(struct cmd *, struct cmd_q *); const struct cmd_entry cmd_list_clients_entry = { "list-clients", "lsc", @@ -41,7 +41,7 @@ const struct cmd_entry cmd_list_clients_entry = { }; enum cmd_retval -cmd_list_clients_exec(struct cmd *self, struct cmd_ctx *ctx) +cmd_list_clients_exec(struct cmd *self, struct cmd_q *cmdq) { struct args *args = self->args; struct client *c; @@ -52,7 +52,7 @@ cmd_list_clients_exec(struct cmd *self, struct cmd_ctx *ctx) char *line; if (args_has(args, 't')) { - s = cmd_find_session(ctx, args_get(args, 't'), 0); + s = cmd_find_session(cmdq, args_get(args, 't'), 0); if (s == NULL) return (CMD_RETURN_ERROR); } else @@ -75,7 +75,7 @@ cmd_list_clients_exec(struct cmd *self, struct cmd_ctx *ctx) format_client(ft, c); line = format_expand(ft, template); - ctx->print(ctx, "%s", line); + cmdq_print(cmdq, "%s", line); free(line); format_free(ft); |