summaryrefslogtreecommitdiffstats
path: root/cmd-send-prefix.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2012-01-21 08:40:09 +0000
committerNicholas Marriott <nicm@openbsd.org>2012-01-21 08:40:09 +0000
commit535286c05aee55c0127cdabada8e54582905ef8e (patch)
tree425407a0ae29629bd1f5ffacd18b5034be43602f /cmd-send-prefix.c
parent7f24020cbe477548795754f2f7f01aafc2cd3cb8 (diff)
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 :-).
Diffstat (limited to 'cmd-send-prefix.c')
-rw-r--r--cmd-send-prefix.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/cmd-send-prefix.c b/cmd-send-prefix.c
index 398f440e..b541fddf 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);
}