summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2019-11-18 09:42:10 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2019-11-18 09:42:10 +0000
commitde364b59be0df497a524167e716daf9d490ff175 (patch)
tree2e29bcc19eface81d9647c741b771d878602dfbc
parent17bc4b0f419e8a88d061c2f508e1b009331a11df (diff)
Keep modifiers on backspace when translating it.
-rw-r--r--usr.bin/tmux/input-keys.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/tmux/input-keys.c b/usr.bin/tmux/input-keys.c
index 79f8246441b..8934a58756f 100644
--- a/usr.bin/tmux/input-keys.c
+++ b/usr.bin/tmux/input-keys.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: input-keys.c,v 1.65 2019/11/14 07:55:01 nicm Exp $ */
+/* $OpenBSD: input-keys.c,v 1.66 2019/11/18 09:42:09 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -157,7 +157,7 @@ input_key(struct window_pane *wp, key_code key, struct mouse_event *m)
u_int i;
size_t dlen;
char *out;
- key_code justkey;
+ key_code justkey, newkey;
struct utf8_data ud;
log_debug("writing key 0x%llx (%s) to %%%u", key,
@@ -179,9 +179,10 @@ input_key(struct window_pane *wp, key_code key, struct mouse_event *m)
/* Is this backspace? */
if ((key & KEYC_MASK_KEY) == KEYC_BSPACE) {
- key = options_get_number(global_options, "backspace");
- if (key >= 0x7f)
- key = '\177';
+ newkey = options_get_number(global_options, "backspace");
+ if (newkey >= 0x7f)
+ newkey = '\177';
+ key = newkey|(key & KEYC_MASK_MOD);
}
/*