diff options
| author |   nicm <nicm@openbsd.org> | 2013-03-24 09:54:10 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2013-03-24 09:54:10 +0000 |
| commit | 175d36cccd2fcc2eae91dce1d3b4e3f4079aa983 (patch) | |
| tree | 916aed045266a229704154541db1b8ab571a9aa2 /usr.bin/tmux/cmd-send-keys.c | |
| parent | Expand format variables in the run-shell and if-shell shell commands, (diff) | |
| download | wireguard-openbsd-175d36cccd2fcc2eae91dce1d3b4e3f4079aa983.tar.xz wireguard-openbsd-175d36cccd2fcc2eae91dce1d3b4e3f4079aa983.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 'usr.bin/tmux/cmd-send-keys.c')
| -rw-r--r-- | usr.bin/tmux/cmd-send-keys.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/tmux/cmd-send-keys.c b/usr.bin/tmux/cmd-send-keys.c index 208aa2268e5..c0c597ad557 100644 --- a/usr.bin/tmux/cmd-send-keys.c +++ b/usr.bin/tmux/cmd-send-keys.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-send-keys.c,v 1.14 2013/03/24 09:31:38 nicm Exp $ */ +/* $OpenBSD: cmd-send-keys.c,v 1.15 2013/03/24 09:54:10 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -27,7 +27,7 @@ * Send keys to client. */ -enum cmd_retval cmd_send_keys_exec(struct cmd *, struct cmd_ctx *); +enum cmd_retval cmd_send_keys_exec(struct cmd *, struct cmd_q *); const struct cmd_entry cmd_send_keys_entry = { "send-keys", "send", @@ -50,7 +50,7 @@ const struct cmd_entry cmd_send_prefix_entry = { }; enum cmd_retval -cmd_send_keys_exec(struct cmd *self, struct cmd_ctx *ctx) +cmd_send_keys_exec(struct cmd *self, struct cmd_q *cmdq) { struct args *args = self->args; struct window_pane *wp; @@ -59,7 +59,7 @@ cmd_send_keys_exec(struct cmd *self, struct cmd_ctx *ctx) const char *str; int i, key; - if (cmd_find_pane(ctx, args_get(args, 't'), &s, &wp) == NULL) + if (cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp) == NULL) return (CMD_RETURN_ERROR); if (self->entry == &cmd_send_prefix_entry) { |