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 /window-choose.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 'window-choose.c')
| -rw-r--r-- | window-choose.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/window-choose.c b/window-choose.c index ae471847..b56b2022 100644 --- a/window-choose.c +++ b/window-choose.c @@ -200,9 +200,8 @@ window_choose_data_free(struct window_choose_data *wcd) void window_choose_data_run(struct window_choose_data *cdata) { - struct cmd_ctx *ctx; - struct cmd_list *cmdlist; - char *cause; + struct cmd_list *cmdlist; + char *cause; /* * The command template will have already been replaced. But if it's @@ -211,7 +210,7 @@ window_choose_data_run(struct window_choose_data *cdata) if (cdata->command == NULL) return; - if (cmd_string_parse(cdata->command, &cmdlist, &cause) != 0) { + if (cmd_string_parse(cdata->command, &cmdlist, NULL, 0, &cause) != 0) { if (cause != NULL) { *cause = toupper((u_char) *cause); status_message_set(cdata->start_client, "%s", cause); @@ -220,14 +219,8 @@ window_choose_data_run(struct window_choose_data *cdata) return; } - ctx = cmd_get_ctx(NULL, cdata->start_client); - ctx->error = key_bindings_error; - ctx->print = key_bindings_print; - ctx->info = key_bindings_info; - - cmd_list_exec(cmdlist, ctx); + cmdq_run(cdata->start_client->cmdq, cmdlist); cmd_list_free(cmdlist); - cmd_free_ctx(ctx); } void |