diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2010-09-01 21:11:14 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2010-09-01 21:11:14 +0000 |
| commit | de68c2a7da02cfecd0d4238bca1d1c88eaaba0e1 (patch) | |
| tree | 4359ade2474b86a6bc11f192fd630df01c0090c5 /xterm-keys.c | |
| parent | 5309252053309339f5987726a0d9fe8827f70ecd (diff) | |
| download | rtmux-de68c2a7da02cfecd0d4238bca1d1c88eaaba0e1.tar.gz rtmux-de68c2a7da02cfecd0d4238bca1d1c88eaaba0e1.tar.bz2 rtmux-de68c2a7da02cfecd0d4238bca1d1c88eaaba0e1.zip | |
Simplify xterm modifier detection by treating as a bitmask + 1. Spotted
by and diff from Emanuele Giaquinta.
Diffstat (limited to 'xterm-keys.c')
| -rw-r--r-- | xterm-keys.c | 55 |
1 files changed, 19 insertions, 36 deletions
diff --git a/xterm-keys.c b/xterm-keys.c index e4cb25d1..3c9fd3ba 100644 --- a/xterm-keys.c +++ b/xterm-keys.c @@ -114,27 +114,21 @@ int xterm_keys_modifiers(const char *template, const char *buf, size_t len) { size_t idx; + int param, modifiers; idx = strcspn(template, "_"); if (idx >= len) return (0); - switch (buf[idx]) { - case '2': - return (KEYC_SHIFT); - case '3': - return (KEYC_ESCAPE); - case '4': - return (KEYC_SHIFT|KEYC_ESCAPE); - case '5': - return (KEYC_CTRL); - case '6': - return (KEYC_SHIFT|KEYC_CTRL); - case '7': - return (KEYC_ESCAPE|KEYC_CTRL); - case '8': - return (KEYC_SHIFT|KEYC_ESCAPE|KEYC_CTRL); - } - return (0); + param = buf[idx] - '1'; + + modifiers = 0; + if (param & 1) + modifiers |= KEYC_SHIFT; + if (param & 2) + modifiers |= KEYC_ESCAPE; + if (param & 4) + modifiers |= KEYC_CTRL; + return (modifiers); } /* @@ -171,30 +165,19 @@ xterm_keys_lookup(int key) int modifiers; char *out; -#define KEY_MODIFIERS(key, modifiers) \ - (((key) & (KEYC_SHIFT|KEYC_ESCAPE|KEYC_CTRL)) == (modifiers)) - modifiers = 0; - if (KEY_MODIFIERS(key, KEYC_SHIFT)) - modifiers = 2; - else if (KEY_MODIFIERS(key, KEYC_ESCAPE)) - modifiers = 3; - else if (KEY_MODIFIERS(key, KEYC_SHIFT|KEYC_ESCAPE)) - modifiers = 4; - else if (KEY_MODIFIERS(key, KEYC_CTRL)) - modifiers = 5; - else if (KEY_MODIFIERS(key, KEYC_SHIFT|KEYC_CTRL)) - modifiers = 6; - else if (KEY_MODIFIERS(key, KEYC_ESCAPE|KEYC_CTRL)) - modifiers = 7; - else if (KEY_MODIFIERS(key, KEYC_SHIFT|KEYC_ESCAPE|KEYC_CTRL)) - modifiers = 8; -#undef KEY_MODIFIERS + modifiers = 1; + if (key & KEYC_SHIFT) + modifiers += 1; + if (key & KEYC_ESCAPE) + modifiers += 2; + if (key & KEYC_CTRL) + modifiers += 4; /* * If the key has no modifiers, return NULL and let it fall through to * the normal lookup. */ - if (modifiers == 0) + if (modifiers == 1) return (NULL); /* Otherwise, find the key in the table. */ |