summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/key-string.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2021-04-07 15:46:13 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2021-04-07 15:46:13 +0000
commit269eaba4adbdde467be15aa2b636c3ebadc62408 (patch)
tree4e845097730e0b71fcf851016345882cb44271ce /usr.bin/tmux/key-string.c
parentb2c1cbced91182493581960cd5440cc10b651c4a (diff)
Restore previous behaviour so that C-X remains the same as C-x. Instead,
translate incoming extended keys so that they are consistent.
Diffstat (limited to 'usr.bin/tmux/key-string.c')
-rw-r--r--usr.bin/tmux/key-string.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/tmux/key-string.c b/usr.bin/tmux/key-string.c
index eb72dc04665..6404504b096 100644
--- a/usr.bin/tmux/key-string.c
+++ b/usr.bin/tmux/key-string.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key-string.c,v 1.64 2021/04/07 07:30:02 nicm Exp $ */
+/* $OpenBSD: key-string.c,v 1.65 2021/04/07 15:46:12 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -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)