diff options
| author | Ran Benita <ran234@gmail.com> | 2014-04-19 16:15:05 +0300 |
|---|---|---|
| committer | Ran Benita <ran234@gmail.com> | 2014-04-19 16:15:05 +0300 |
| commit | 3d7aff5fcdad501856662e6b84a76ef883b35784 (patch) | |
| tree | 1cadc54f6a6fe85c3b38ab6660d8e23a8ab88fbf | |
| parent | 51a1df2f2180f11d80c476f8b240062ae2573f7b (diff) | |
| download | xorg-lib-libxkbcommon-3d7aff5fcdad501856662e6b84a76ef883b35784.tar.gz | |
keymap: rename wrap_group_into_range -> XkbWrapGroupIntoRange
It better fits with the naming convention in keymap.h.
Signed-off-by: Ran Benita <ran234@gmail.com>
| -rw-r--r-- | src/keymap.c | 4 | ||||
| -rw-r--r-- | src/keymap.h | 2 | ||||
| -rw-r--r-- | src/state.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/keymap.c b/src/keymap.c index 7ae0818..9bf669b 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -359,7 +359,7 @@ xkb_keymap_num_levels_for_key(struct xkb_keymap *keymap, xkb_keycode_t kc, if (!key) return 0; - layout = wrap_group_into_range(layout, key->num_groups, + layout = XkbWrapGroupIntoRange(layout, key->num_groups, key->out_of_range_group_action, key->out_of_range_group_number); if (layout == XKB_LAYOUT_INVALID) @@ -425,7 +425,7 @@ xkb_keymap_key_get_syms_by_level(struct xkb_keymap *keymap, if (!key) goto err; - layout = wrap_group_into_range(layout, key->num_groups, + layout = XkbWrapGroupIntoRange(layout, key->num_groups, key->out_of_range_group_action, key->out_of_range_group_number); if (layout == XKB_LAYOUT_INVALID) diff --git a/src/keymap.h b/src/keymap.h index 604f6c0..3bc8c03 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -431,7 +431,7 @@ XkbModNameToIndex(const struct xkb_keymap *keymap, xkb_atom_t name, enum mod_type type); xkb_layout_index_t -wrap_group_into_range(int32_t group, +XkbWrapGroupIntoRange(int32_t group, xkb_layout_index_t num_groups, enum xkb_range_exceed_type out_of_range_group_action, xkb_layout_index_t out_of_range_group_number); diff --git a/src/state.c b/src/state.c index 0f9ea79..4b5f3cb 100644 --- a/src/state.c +++ b/src/state.c @@ -162,7 +162,7 @@ xkb_state_key_get_level(struct xkb_state *state, xkb_keycode_t kc, } xkb_layout_index_t -wrap_group_into_range(int32_t group, +XkbWrapGroupIntoRange(int32_t group, xkb_layout_index_t num_groups, enum xkb_range_exceed_type out_of_range_group_action, xkb_layout_index_t out_of_range_group_number) @@ -210,7 +210,7 @@ xkb_state_key_get_layout(struct xkb_state *state, xkb_keycode_t kc) if (!key) return XKB_LAYOUT_INVALID; - return wrap_group_into_range(state->components.group, key->num_groups, + return XkbWrapGroupIntoRange(state->components.group, key->num_groups, key->out_of_range_group_action, key->out_of_range_group_number); } @@ -677,13 +677,13 @@ xkb_state_update_derived(struct xkb_state *state) /* TODO: Use groups_wrap control instead of always RANGE_WRAP. */ - wrapped = wrap_group_into_range(state->components.locked_group, + wrapped = XkbWrapGroupIntoRange(state->components.locked_group, state->keymap->num_groups, RANGE_WRAP, 0); state->components.locked_group = (wrapped == XKB_LAYOUT_INVALID ? 0 : wrapped); - wrapped = wrap_group_into_range(state->components.base_group + + wrapped = XkbWrapGroupIntoRange(state->components.base_group + state->components.latched_group + state->components.locked_group, state->keymap->num_groups, |