aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2011-03-27 20:31:25 +0000
committerNicholas Marriott <nicm@openbsd.org>2011-03-27 20:31:25 +0000
commit7ce8fee4f3ea4a480ffa18cd5d66ba9a7f3626db (patch)
tree6b79165c213065c828857cbdb78b567e57a61563
parent808502ac3d86193d9a371728b2ea2055100c76c3 (diff)
downloadrtmux-7ce8fee4f3ea4a480ffa18cd5d66ba9a7f3626db.tar.gz
rtmux-7ce8fee4f3ea4a480ffa18cd5d66ba9a7f3626db.tar.bz2
rtmux-7ce8fee4f3ea4a480ffa18cd5d66ba9a7f3626db.zip
Don't include meta twice when working out the flags to output for
xterm-style keys - bit 3 is accepted on input but not on output. Also a style nit in the header.
-rw-r--r--tmux.h2
-rw-r--r--xterm-keys.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/tmux.h b/tmux.h
index 2d9e992a..1333bdf0 100644
--- a/tmux.h
+++ b/tmux.h
@@ -110,7 +110,7 @@ extern char **environ;
#define KEYC_SHIFT 0x8000
#define KEYC_PREFIX 0x10000
-/* Mask to obtain key w/o modifiers */
+/* Mask to obtain key w/o modifiers. */
#define KEYC_MASK_MOD (KEYC_ESCAPE|KEYC_CTRL|KEYC_SHIFT|KEYC_PREFIX)
#define KEYC_MASK_KEY (~KEYC_MASK_MOD)
diff --git a/xterm-keys.c b/xterm-keys.c
index 1e5583f7..fd9fee8a 100644
--- a/xterm-keys.c
+++ b/xterm-keys.c
@@ -174,8 +174,6 @@ xterm_keys_lookup(int key)
modifiers += 2;
if (key & KEYC_CTRL)
modifiers += 4;
- if (key & KEYC_ESCAPE)
- modifiers += 8;
/*
* If the key has no modifiers, return NULL and let it fall through to