aboutsummaryrefslogtreecommitdiff
path: root/cmd-bind-key.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-01-27 10:01:27 +0000
committerThomas Adam <thomas@xteddy.org>2020-01-27 10:01:27 +0000
commitf3ea318a044ed729c7fcf8c1897f0d479f88bdd4 (patch)
tree4e6568f7fde7ee476ed7a1f2074c36083260cfd0 /cmd-bind-key.c
parent0eb7b54731e35180c7569891379bf3626ed35a02 (diff)
parent2c38e01b548553aa162f9f126147b5ed64fd1700 (diff)
downloadrtmux-f3ea318a044ed729c7fcf8c1897f0d479f88bdd4.tar.gz
rtmux-f3ea318a044ed729c7fcf8c1897f0d479f88bdd4.tar.bz2
rtmux-f3ea318a044ed729c7fcf8c1897f0d479f88bdd4.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-bind-key.c')
-rw-r--r--cmd-bind-key.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/cmd-bind-key.c b/cmd-bind-key.c
index 2af15d29..27f75dd0 100644
--- a/cmd-bind-key.c
+++ b/cmd-bind-key.c
@@ -33,8 +33,8 @@ const struct cmd_entry cmd_bind_key_entry = {
.name = "bind-key",
.alias = "bind",
- .args = { "cnrT:", 2, -1 },
- .usage = "[-cnr] [-T key-table] key "
+ .args = { "cnrN:T:", 2, -1 },
+ .usage = "[-cnr] [-T key-table] [-N note] key "
"command [arguments]",
.flags = CMD_AFTERHOOK,
@@ -46,10 +46,10 @@ cmd_bind_key_exec(struct cmd *self, struct cmdq_item *item)
{
struct args *args = self->args;
key_code key;
- const char *tablename;
+ const char *tablename, *note;
struct cmd_parse_result *pr;
char **argv = args->argv;
- int argc = args->argc;
+ int argc = args->argc, repeat;
key = key_string_lookup_string(argv[0]);
if (key == KEYC_NONE || key == KEYC_UNKNOWN) {
@@ -63,6 +63,7 @@ cmd_bind_key_exec(struct cmd *self, struct cmdq_item *item)
tablename = "root";
else
tablename = "prefix";
+ repeat = args_has(args, 'r');
if (argc == 2)
pr = cmd_parse_from_string(argv[1], NULL);
@@ -79,6 +80,7 @@ cmd_bind_key_exec(struct cmd *self, struct cmdq_item *item)
case CMD_PARSE_SUCCESS:
break;
}
- key_bindings_add(tablename, key, args_has(args, 'r'), pr->cmdlist);
+ note = args_get(args, 'N');
+ key_bindings_add(tablename, key, note, repeat, pr->cmdlist);
return (CMD_RETURN_NORMAL);
}