From 7ce8fee4f3ea4a480ffa18cd5d66ba9a7f3626db Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sun, 27 Mar 2011 20:31:25 +0000 Subject: [PATCH] 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. --- tmux.h | 2 +- xterm-keys.c | 2 -- 2 files changed, 1 insertion(+), 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