From a7b0b30bdd73f3a8d513fc69daf593174ee03145 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sat, 21 Jan 2012 19:36:40 +0000 Subject: Sync OpenBSD patchset 1007: Drop the ability to have a list of keys in the prefix in favour of two separate options, prefix and prefix2. This simplifies the code and gets rid the data options type which was only used for this one option. Also add a -2 flag to send-prefix to send the secondary prefix key, fixing a cause of minor irritation. People who want three prefix keys are out of luck :-). --- cmd-send-prefix.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'cmd-send-prefix.c') diff --git a/cmd-send-prefix.c b/cmd-send-prefix.c index bd713a49..99aa1bac 100644 --- a/cmd-send-prefix.c +++ b/cmd-send-prefix.c @@ -28,8 +28,8 @@ int cmd_send_prefix_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_send_prefix_entry = { "send-prefix", NULL, - "t:", 0, 0, - CMD_TARGET_PANE_USAGE, + "2t:", 0, 0, + "[-2] " CMD_TARGET_PANE_USAGE, 0, NULL, NULL, @@ -42,13 +42,16 @@ cmd_send_prefix_exec(struct cmd *self, struct cmd_ctx *ctx) struct args *args = self->args; struct session *s; struct window_pane *wp; - struct keylist *keylist; + int key; if (cmd_find_pane(ctx, args_get(args, 't'), &s, &wp) == NULL) return (-1); - keylist = options_get_data(&s->options, "prefix"); - window_pane_key(wp, s, ARRAY_FIRST(keylist)); + 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 (0); } -- cgit