diff options
| author | nicm <nicm> | 2016-05-26 14:49:48 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2016-05-26 14:49:48 +0000 |
| commit | ec7f5305b1a6e5548f0769f988e76b01ec293dcc (patch) | |
| tree | cb9bc798195e1a643227d354bcaf9265fe584ff1 | |
| parent | cd14ac0486906d607b5ef6ade70460c64aec00cf (diff) | |
| download | rtmux-ec7f5305b1a6e5548f0769f988e76b01ec293dcc.tar.gz rtmux-ec7f5305b1a6e5548f0769f988e76b01ec293dcc.tar.bz2 rtmux-ec7f5305b1a6e5548f0769f988e76b01ec293dcc.zip | |
Extend 0x1234 keys form to more bits so that Unicode keys work.
| -rw-r--r-- | key-string.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/key-string.c b/key-string.c index bbbe346c..ef5cf17c 100644 --- a/key-string.c +++ b/key-string.c @@ -146,8 +146,7 @@ key_string_lookup_string(const char *string) { static const char *other = "!#()+,-.0123456789:;<=>?'\r\t"; key_code key; - u_short u; - int size; + u_int u; key_code modifiers; struct utf8_data ud; u_int i; @@ -160,7 +159,9 @@ key_string_lookup_string(const char *string) /* Is this a hexadecimal value? */ if (string[0] == '0' && string[1] == 'x') { - if (sscanf(string + 2, "%hx%n", &u, &size) != 1 || size > 4) + if (sscanf(string + 2, "%x", &u) != 1) + return (KEYC_UNKNOWN); + if (u > 0x1fffff) return (KEYC_UNKNOWN); return (u); } |