summaryrefslogtreecommitdiffstats
path: root/cmd-send-keys.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2013-03-24 09:54:10 +0000
committerNicholas Marriott <nicm@openbsd.org>2013-03-24 09:54:10 +0000
commit20636d956dd36c1f14152569a4d44a50eea9083d (patch)
treedbbbee5d7ce1e3b12c3067c305d07d2d98e39900 /cmd-send-keys.c
parent66edb3392b234ccd9a940039936edb34258c2102 (diff)
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-send-keys.c')
-rw-r--r--cmd-send-keys.c25
1 files changed, 22 insertions, 3 deletions
diff --git a/cmd-send-keys.c b/cmd-send-keys.c
index f6124d3a..3ee3dbe6 100644
--- a/cmd-send-keys.c
+++ b/cmd-send-keys.c
@@ -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",
@@ -39,8 +39,18 @@ const struct cmd_entry cmd_send_keys_entry = {
cmd_send_keys_exec
};
+const struct cmd_entry cmd_send_prefix_entry = {
+ "send-prefix", NULL,
+ "2t:", 0, 0,
+ "[-2] " CMD_TARGET_PANE_USAGE,
+ 0,
+ NULL,
+ NULL,
+ cmd_send_keys_exec
+};
+
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;
@@ -49,9 +59,18 @@ 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) {
+ if (args_has(args, '2'))
+ key = options_get_number(&s->options, "prefix2");
+ else
+ key = options_get_number(&s->options, "prefix");
+ window_pane_key(wp, s, key);
+ return (CMD_RETURN_NORMAL);
+ }
+
if (args_has(args, 'R')) {
ictx = &wp->ictx;