StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

state: don't use xkb_keymap_num_layouts internally 

Clearer and more greppable this way.

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2012-10-26 16:24:11 +02:00
parent b935d3610f
commit a51ee70419
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/state.c
View File

@ -646,8 +646,6 @@ xkb_state_led_update_all(struct xkb_state *state)
static void static void
xkb_state_update_derived(struct xkb_state *state) xkb_state_update_derived(struct xkb_state *state)
{ {
xkb_layout_index_t num_groups = xkb_keymap_num_layouts(state->keymap);
state->cur.mods = (state->cur.base_mods | state->cur.mods = (state->cur.base_mods |
state->cur.latched_mods | state->cur.latched_mods |
state->cur.locked_mods); state->cur.locked_mods);
@ -655,13 +653,13 @@ xkb_state_update_derived(struct xkb_state *state)
/* TODO: Use groups_wrap control instead of always RANGE_WRAP. */ /* TODO: Use groups_wrap control instead of always RANGE_WRAP. */
state->cur.locked_group = wrap_group_into_range(state->cur.locked_group, state->cur.locked_group = wrap_group_into_range(state->cur.locked_group,
num_groups, state->keymap->num_groups,
RANGE_WRAP, 0); RANGE_WRAP, 0);
state->cur.group = wrap_group_into_range(state->cur.base_group + state->cur.group = wrap_group_into_range(state->cur.base_group +
state->cur.latched_group + state->cur.latched_group +
state->cur.locked_group, state->cur.locked_group,
num_groups, state->keymap->num_groups,
RANGE_WRAP, 0); RANGE_WRAP, 0);
xkb_state_led_update_all(state); xkb_state_led_update_all(state);
@ -1011,7 +1009,7 @@ xkb_state_layout_index_is_active(struct xkb_state *state,
{ {
int ret = 0; int ret = 0;
if (idx >= xkb_keymap_num_layouts(state->keymap)) if (idx >= state->keymap->num_groups)
return -1; return -1;
if (type & XKB_STATE_LAYOUT_EFFECTIVE) if (type & XKB_STATE_LAYOUT_EFFECTIVE)