diff options
| author | Thomas Adam <thomas@xteddy.org> | 2021-04-07 18:01:20 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2021-04-07 18:01:20 +0100 |
| commit | a57c2bf97e865c2f91488e5bb769adfeda958b6c (patch) | |
| tree | bb23b48cd14fb8f003550b738c11a90513e3ca9f | |
| parent | 3cd63cc9e0f8f1a4fb4e9da7f39de77ed58d61fb (diff) | |
| parent | efb5e58c381a5faf7751d916a60f256ede19c0e8 (diff) | |
| download | rtmux-a57c2bf97e865c2f91488e5bb769adfeda958b6c.tar.gz rtmux-a57c2bf97e865c2f91488e5bb769adfeda958b6c.tar.bz2 rtmux-a57c2bf97e865c2f91488e5bb769adfeda958b6c.zip | |
Merge branch 'obsd-master' into master
| -rw-r--r-- | key-string.c | 5 | ||||
| -rw-r--r-- | tty-keys.c | 34 |
2 files changed, 24 insertions, 15 deletions
diff --git a/key-string.c b/key-string.c index 0633ed22..8d60f132 100644 --- a/key-string.c +++ b/key-string.c @@ -239,10 +239,11 @@ key_string_lookup_string(const char *string) /* Convert the standard control keys. */ if (key < KEYC_BASE && (modifiers & KEYC_CTRL) && - strchr(other, key) == NULL && - (key < 64 || key > 95)) { + strchr(other, key) == NULL) { if (key >= 97 && key <= 122) key -= 96; + else if (key >= 64 && key <= 95) + key -= 64; else if (key == 32) key = 0; else if (key == 63) @@ -871,6 +871,7 @@ tty_keys_extended_key(struct tty *tty, const char *buf, size_t len, char tmp[64]; cc_t bspace; key_code nkey; + key_code onlykey; *size = 0; @@ -948,19 +949,26 @@ tty_keys_extended_key(struct tty *tty, const char *buf, size_t len, break; } - /* Don't allow both KEYC_CTRL and implied. */ - if ((nkey & KEYC_CTRL) && (nkey & KEYC_MASK_KEY) < 32) - nkey &= ~KEYC_CTRL; - if ((nkey & KEYC_MASK_MODIFIERS) == KEYC_CTRL) { - nkey &= KEYC_MASK_KEY; - if (nkey >= 97 && nkey <= 122) - nkey -= 96; - else if (nkey == 32) - nkey = 0; - else if (nkey == 63) - nkey = 127; - else - nkey |= KEYC_CTRL; + /* + * Don't allow both KEYC_CTRL and as an implied modifier. Also convert + * C-X into C-x and so on. + */ + if (nkey & KEYC_CTRL){ + onlykey = (nkey & KEYC_MASK_KEY); + if (onlykey < 32) + onlykey = (nkey & ~KEYC_CTRL); + else { + if (onlykey >= 97 && onlykey <= 122) + onlykey -= 96; + else if (onlykey >= 64 && onlykey <= 95) + onlykey -= 64; + else if (onlykey == 32) + onlykey = 0; + else if (onlykey == 63) + onlykey = 127; + onlykey |= ((nkey & KEYC_MASK_MODIFIERS) & ~KEYC_CTRL); + } + nkey = onlykey; } if (log_get_level() != 0) { |