picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

terminal/idev: don't map XKB_KEY_NoSymbol as ASCII 0

Browse source 
XKB_KEY_NoSymbol is defined as 0 but does not correspond to a VT key with
ASCII value 0. No such key exists, so don't try to find such a key.
This commit is contained in:
David Herrmann 2014-10-03 12:48:36 +02:00
parent 61d0326a5b
commit fe741a85c1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libsystemd-terminal/idev-keyboard.c
View file

@ -575,7 +575,7 @@ static int8_t guess_ascii(struct xkb_state *state, uint32_t code, uint32_t n_sym
const xkb_keysym_t *s;
int num;
if (n_syms == 1 && syms[0] < 128)
if (n_syms == 1 && syms[0] < 128 && syms[0] > 0)
return syms[0];
keymap = xkb_state_get_keymap(state);
@ -584,7 +584,7 @@ static int8_t guess_ascii(struct xkb_state *state, uint32_t code, uint32_t n_sym
for (lo = 0; lo < n_lo; ++lo) {
lv = xkb_state_key_get_level(state, code + KBDXKB_SHIFT, lo);
num = xkb_keymap_key_get_syms_by_level(keymap, code + KBDXKB_SHIFT, lo, lv, &s);
if (num == 1 && s[0] < 128)
if (num == 1 && s[0] < 128 && s[0] > 0)
return s[0];
}