diff options
| author | Ran Benita <ran234@gmail.com> | 2012-09-24 14:41:09 +0200 |
|---|---|---|
| committer | Ran Benita <ran234@gmail.com> | 2012-09-24 14:41:09 +0200 |
| commit | c955f8e2f9a915e3b7bced6f9b0c2b864f31e8ef (patch) | |
| tree | 1a024893d91b4d9a167deb8cb6e455f69f883441 /src/keymap.c | |
| parent | 01b00d75400fefc6f63e249b89b94d3a47368c96 (diff) | |
| download | xorg-lib-libxkbcommon-c955f8e2f9a915e3b7bced6f9b0c2b864f31e8ef.tar.gz | |
keymap: store a pointer to the type in xkb_group instead of index
Gets rid of some more unneeded indirection, including the XkbKeyType
macro.
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keymap.c b/src/keymap.c index daf3ab2..77afda7 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -91,7 +91,7 @@ xkb_keymap_unref(struct xkb_keymap *keymap) darray_foreach(key, keymap->keys) { for (i = 0; i < key->num_groups; i++) { - for (j = 0; j < XkbKeyGroupWidth(keymap, key, i); j++) + for (j = 0; j < XkbKeyGroupWidth(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); @@ -248,7 +248,7 @@ xkb_keymap_num_levels_for_key(struct xkb_keymap *keymap, xkb_keycode_t kc, if (!key) return 0; - return XkbKeyGroupWidth(keymap, key, layout); + return XkbKeyGroupWidth(key, layout); } /** @@ -318,7 +318,7 @@ xkb_keymap_key_get_syms_by_level(struct xkb_keymap *keymap, goto err; if (layout >= key->num_groups) goto err; - if (level >= XkbKeyGroupWidth(keymap, key, layout)) + if (level >= XkbKeyGroupWidth(key, layout)) goto err; num_syms = XkbKeyNumSyms(key, layout, level); |