… | |
… | |
452 | { |
452 | { |
453 | int index = find_keysym (a->keysym + j, a->state); |
453 | int index = find_keysym (a->keysym + j, a->state); |
454 | |
454 | |
455 | assert (index >= 0); |
455 | assert (index >= 0); |
456 | keysym_t *b = keymap [index]; |
456 | keysym_t *b = keymap [index]; |
457 | assert (i == (signed) index || // the normally expected result |
457 | assert (i == index // the normally expected result |
458 | (a->keysym + j) >= b->keysym && (a->keysym + j) <= (b->keysym + b->range) && compare_priority (a, b) <= 0); // is effectively the same or a closer match |
458 | || IN_RANGE_INC (a->keysym + j, b->keysym, b->keysym + b->range) |
|
|
459 | && compare_priority (a, b) <= 0); // is effectively the same or a closer match |
459 | } |
460 | } |
460 | } |
461 | } |
461 | #endif |
462 | #endif |
462 | } |
463 | } |
463 | |
464 | |