diff options
| author | Thomas Adam <thomas@xteddy.org> | 2021-04-13 14:01:21 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2021-04-13 14:01:21 +0100 |
| commit | 16f1c5f0a1ffbe614aa6238303b7ec5791553fca (patch) | |
| tree | 344ac2e1838dca1c28f712db6229f25fd06b22f5 | |
| parent | c5c2871d22c354d55dca7e34c5d7ebb3757d2279 (diff) | |
| parent | bbb3509bc5c368ac480fdc6af00d5884eb5c1edc (diff) | |
| download | rtmux-16f1c5f0a1ffbe614aa6238303b7ec5791553fca.tar.gz rtmux-16f1c5f0a1ffbe614aa6238303b7ec5791553fca.tar.bz2 rtmux-16f1c5f0a1ffbe614aa6238303b7ec5791553fca.zip | |
Merge branch 'obsd-master' into master
| -rw-r--r-- | tty-keys.c | 30 |
1 files changed, 13 insertions, 17 deletions
@@ -955,23 +955,19 @@ tty_keys_extended_key(struct tty *tty, const char *buf, size_t len, */ if (nkey & KEYC_CTRL) { onlykey = (nkey & KEYC_MASK_KEY); - if (onlykey < 32) { - if (onlykey != 9) - onlykey = (nkey & ~KEYC_CTRL); - else - onlykey = (9|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 (onlykey < 32 && onlykey != 9) + /* nothing */; + 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; + else + onlykey |= KEYC_CTRL; + nkey = onlykey|((nkey & KEYC_MASK_MODIFIERS) & ~KEYC_CTRL); } if (log_get_level() != 0) { |