diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-06-23 18:01:11 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-06-23 18:01:11 +0100 |
| commit | 6995497e5b66e090f25e85fbb207f033f7790199 (patch) | |
| tree | 612589ffe3561d03b04f34940dccfc2778c4c15f /tty-keys.c | |
| parent | a61200776de8218306730e2325cd29d013861e4c (diff) | |
| parent | 95ed7d48c84198da0ec4b1b9b5de9358a47da753 (diff) | |
| download | rtmux-6995497e5b66e090f25e85fbb207f033f7790199.tar.gz rtmux-6995497e5b66e090f25e85fbb207f033f7790199.tar.bz2 rtmux-6995497e5b66e090f25e85fbb207f033f7790199.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'tty-keys.c')
| -rw-r--r-- | tty-keys.c | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -389,8 +389,9 @@ tty_keys_build(struct tty *tty) { const struct tty_default_key_raw *tdkr; const struct tty_default_key_code *tdkc; - u_int i; - const char *s; + u_int i, size; + const char *s, *value; + struct options_entry *o; if (tty->key_tree != NULL) tty_keys_free(tty); @@ -411,6 +412,15 @@ tty_keys_build(struct tty *tty) tty_keys_add(tty, s, tdkc->key); } + + o = options_get(global_options, "user-keys"); + if (o != NULL && options_array_size(o, &size) != -1) { + for (i = 0; i < size; i++) { + value = options_array_get(o, i); + if (value != NULL) + tty_keys_add(tty, value, KEYC_USER + i); + } + } } /* Free the entire key tree. */ |