diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2013-03-24 09:54:10 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2013-03-24 09:54:10 +0000 |
commit | 20636d956dd36c1f14152569a4d44a50eea9083d (patch) | |
tree | dbbbee5d7ce1e3b12c3067c305d07d2d98e39900 /cmd-list-commands.c | |
parent | 66edb3392b234ccd9a940039936edb34258c2102 (diff) | |
download | rtmux-20636d956dd36c1f14152569a4d44a50eea9083d.tar.gz rtmux-20636d956dd36c1f14152569a4d44a50eea9083d.tar.bz2 rtmux-20636d956dd36c1f14152569a4d44a50eea9083d.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-commands.c')
-rw-r--r-- | cmd-list-commands.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd-list-commands.c b/cmd-list-commands.c index 05a31ec5..7073d5f8 100644 --- a/cmd-list-commands.c +++ b/cmd-list-commands.c @@ -24,7 +24,7 @@ * List all commands with usages. */ -enum cmd_retval cmd_list_commands_exec(struct cmd *, struct cmd_ctx *); +enum cmd_retval cmd_list_commands_exec(struct cmd *, struct cmd_q *); const struct cmd_entry cmd_list_commands_entry = { "list-commands", "lscm", @@ -37,16 +37,16 @@ const struct cmd_entry cmd_list_commands_entry = { }; enum cmd_retval -cmd_list_commands_exec(unused struct cmd *self, struct cmd_ctx *ctx) +cmd_list_commands_exec(unused struct cmd *self, struct cmd_q *cmdq) { const struct cmd_entry **entryp; for (entryp = cmd_table; *entryp != NULL; entryp++) { if ((*entryp)->alias != NULL) { - ctx->print(ctx, "%s (%s) %s", (*entryp)->name, + cmdq_print(cmdq, "%s (%s) %s", (*entryp)->name, (*entryp)->alias, (*entryp)->usage); } else { - ctx->print(ctx, "%s %s", (*entryp)->name, + cmdq_print(cmdq, "%s %s", (*entryp)->name, (*entryp)->usage); } } |