diff options
author | Ran Benita <ran234@gmail.com> | 2012-09-24 14:57:30 +0200 |
---|---|---|
committer | Ran Benita <ran234@gmail.com> | 2012-09-24 14:57:30 +0200 |
commit | 5d2659267aba6bddc8fd44306262720965007846 (patch) | |
tree | ec7f6599fe7149a42025b718747b875afc2e5862 /src/keymap.h | |
parent | c955f8e2f9a915e3b7bced6f9b0c2b864f31e8ef (diff) | |
download | xorg-lib-libxkbcommon-5d2659267aba6bddc8fd44306262720965007846.tar.gz |
keymap: remove some more unneeded macros
It clearer to just access the needed data directly.
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/keymap.h')
-rw-r--r-- | src/keymap.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/keymap.h b/src/keymap.h index 0829c39..014ad72 100644 --- a/src/keymap.h +++ b/src/keymap.h @@ -413,30 +413,6 @@ XkbKeyGroupWidth(const struct xkb_key *key, xkb_layout_index_t layout) return key->groups[layout].type->num_levels; } -static inline unsigned int -XkbKeyNumSyms(const struct xkb_key *key, xkb_layout_index_t layout, - xkb_level_index_t level) -{ - return key->groups[layout].levels[level].num_syms; -} - -static inline const xkb_keysym_t * -XkbKeySymEntry(const struct xkb_key *key, xkb_layout_index_t layout, - xkb_level_index_t level) -{ - if (XkbKeyNumSyms(key, layout, level) <= 1) - return &key->groups[layout].levels[level].u.sym; - else - return key->groups[layout].levels[level].u.syms; -} - -static inline const union xkb_action * -XkbKeyActionEntry(const struct xkb_key *key, xkb_layout_index_t layout, - xkb_level_index_t level) -{ - return &key->groups[layout].levels[level].action; -} - struct xkb_keymap * xkb_keymap_new(struct xkb_context *ctx, enum xkb_keymap_format format, |