… | |
… | |
213 | |
213 | |
214 | if (strncmp (translation, "list", 4) == 0 && translation [4]) |
214 | if (strncmp (translation, "list", 4) == 0 && translation [4]) |
215 | { |
215 | { |
216 | char *middle = strchr (translation + 5, translation [4]); |
216 | char *middle = strchr (translation + 5, translation [4]); |
217 | char *suffix = strrchr (translation + 5, translation [4]); |
217 | char *suffix = strrchr (translation + 5, translation [4]); |
218 | |
218 | |
219 | if (suffix && middle && suffix > middle + 1) |
219 | if (suffix && middle && suffix > middle + 1) |
220 | { |
220 | { |
221 | key->type = keysym_t::LIST; |
221 | key->type = keysym_t::LIST; |
222 | key->range = suffix - middle - 1; |
222 | key->range = suffix - middle - 1; |
223 | |
223 | |
… | |
… | |
465 | keyboard_manager::find_keysym (KeySym keysym, unsigned int state) |
465 | keyboard_manager::find_keysym (KeySym keysym, unsigned int state) |
466 | { |
466 | { |
467 | int hashkey = keysym & KEYSYM_HASH_MASK; |
467 | int hashkey = keysym & KEYSYM_HASH_MASK; |
468 | unsigned int index = hash [hashkey]; |
468 | unsigned int index = hash [hashkey]; |
469 | unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1 |
469 | unsigned int end = hashkey < KEYSYM_HASH_BUDGETS - 1 |
470 | ? hash [hashkey + 1] |
470 | ? hash [hashkey + 1] |
471 | : keymap.size (); |
471 | : keymap.size (); |
472 | |
472 | |
473 | for (; index < end; ++index) |
473 | for (; index < end; ++index) |
474 | { |
474 | { |
475 | keysym_t *key = keymap [index]; |
475 | keysym_t *key = keymap [index]; |