summaryrefslogtreecommitdiff
path: root/src/keymap.c
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2014-09-25 22:01:17 +0300
committerRan Benita <ran234@gmail.com>2014-09-25 22:01:17 +0300
commit725ae134d434bab6c999121d55dbc3582c4acb65 (patch)
tree19eb1afb751b507e76d28ed209d6e58021e9d8bd /src/keymap.c
parent2c259f178229ec8b71f8a62d4e23b7dbdac007c7 (diff)
downloadxorg-lib-libxkbcommon-725ae134d434bab6c999121d55dbc3582c4acb65.tar.gz
keymap: rename XkbKeyGroupWidth to XkbKeyNumLevels
The "width" terminology comes from the group*width+level layout of the keysyms in a key, as used in the old implementations. We don't keep all the keysyms of a key in one array so change it to a more accurate name. Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/keymap.c')
-rw-r--r--src/keymap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keymap.c b/src/keymap.c
index 6ed0408..a9fc9b4 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -72,7 +72,7 @@ xkb_keymap_unref(struct xkb_keymap *keymap)
if (key->groups) {
for (unsigned i = 0; i < key->num_groups; i++) {
if (key->groups[i].levels) {
- for (unsigned j = 0; j < XkbKeyGroupWidth(key, i); j++)
+ for (unsigned j = 0; j < XkbKeyNumLevels(key, i); j++)
if (key->groups[i].levels[j].num_syms > 1)
free(key->groups[i].levels[j].u.syms);
free(key->groups[i].levels);
@@ -363,7 +363,7 @@ xkb_keymap_num_levels_for_key(struct xkb_keymap *keymap, xkb_keycode_t kc,
if (layout == XKB_LAYOUT_INVALID)
return 0;
- return XkbKeyGroupWidth(key, layout);
+ return XkbKeyNumLevels(key, layout);
}
/**
@@ -429,7 +429,7 @@ xkb_keymap_key_get_syms_by_level(struct xkb_keymap *keymap,
if (layout == XKB_LAYOUT_INVALID)
goto err;
- if (level >= XkbKeyGroupWidth(key, layout))
+ if (level >= XkbKeyNumLevels(key, layout))
goto err;
num_syms = key->groups[layout].levels[level].num_syms;