diff options
| author | Ran Benita <ran234@gmail.com> | 2013-03-04 18:41:13 +0200 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2013-03-18 22:20:06 +0000 |
| commit | 57bfde3aff9b3a98f764a3bd3eeb924e299ae9b7 (patch) | |
| tree | a9b29383fc9796bab92ba8e082c9eb5d1f29ee58 /src/state.c | |
| parent | 6a39a0657d868e62fe99b912c0201cf5986a12cc (diff) | |
| download | xorg-lib-libxkbcommon-57bfde3aff9b3a98f764a3bd3eeb924e299ae9b7.tar.gz | |
keymap: rename xkb_kt_map_entry to xkb_key_type_entry
That's a better name and fits more nicely.
Also change type->map to type->entries.
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/state.c')
| -rw-r--r-- | src/state.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/state.c b/src/state.c index 79a6794..d61bed7 100644 --- a/src/state.c +++ b/src/state.c @@ -114,7 +114,7 @@ struct xkb_state { struct xkb_keymap *keymap; }; -static const struct xkb_kt_map_entry * +static const struct xkb_key_type_entry * get_entry_for_key_state(struct xkb_state *state, const struct xkb_key *key, xkb_layout_index_t group) { @@ -128,11 +128,11 @@ get_entry_for_key_state(struct xkb_state *state, const struct xkb_key *key, * supposed to skip the entry (xserver does this with cached * entry->active field). */ - if (!type->map[i].mods.mask) + if (!type->entries[i].mods.mask) continue; - if (type->map[i].mods.mask == active_mods) - return &type->map[i]; + if (type->entries[i].mods.mask == active_mods) + return &type->entries[i]; } return NULL; @@ -147,7 +147,7 @@ xkb_state_key_get_level(struct xkb_state *state, xkb_keycode_t kc, xkb_layout_index_t layout) { const struct xkb_key *key = XkbKey(state->keymap, kc); - const struct xkb_kt_map_entry *entry; + const struct xkb_key_type_entry *entry; if (!key || layout >= key->num_groups) return XKB_LEVEL_INVALID; @@ -1085,7 +1085,7 @@ xkb_state_led_name_is_active(struct xkb_state *state, const char *name) static xkb_mod_mask_t key_get_consumed(struct xkb_state *state, const struct xkb_key *key) { - const struct xkb_kt_map_entry *entry; + const struct xkb_key_type_entry *entry; xkb_layout_index_t group; group = xkb_state_key_get_layout(state, key->keycode); |