diff options
| author | Ran Benita <ran234@gmail.com> | 2012-11-24 13:29:54 +0200 |
|---|---|---|
| committer | Ran Benita <ran234@gmail.com> | 2014-08-18 20:26:19 +0300 |
| commit | 99184f1614548722e3531e55bb19ac74327c98cb (patch) | |
| tree | f7e3fb372a2fbcb9823eb7b8e6c82a1544463a54 /src/xkbcomp/keymap.c | |
| parent | 80ae8e61ffe0677369e9f5f865ffe3ae76541816 (diff) | |
| download | libxkbcommon-99184f1614548722e3531e55bb19ac74327c98cb.tar.gz libxkbcommon-99184f1614548722e3531e55bb19ac74327c98cb.tar.bz2 libxkbcommon-99184f1614548722e3531e55bb19ac74327c98cb.zip | |
Make the effective mod mask calculation available to other files
We will want to use that function in state.c as well.
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src/xkbcomp/keymap.c')
| -rw-r--r-- | src/xkbcomp/keymap.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/xkbcomp/keymap.c b/src/xkbcomp/keymap.c index cc5bc83..ec93ee4 100644 --- a/src/xkbcomp/keymap.c +++ b/src/xkbcomp/keymap.c @@ -32,15 +32,7 @@ static void ComputeEffectiveMask(struct xkb_keymap *keymap, struct xkb_mods *mods) { - const struct xkb_mod *mod; - xkb_mod_index_t i; - - /* The effective mask is only real mods for now. */ - mods->mask = mods->mods & MOD_REAL_MASK_ALL; - - xkb_mods_enumerate(i, mod, &keymap->mods) - if (mods->mods & (1u << i)) - mods->mask |= mod->mapping; + mods->mask = mod_mask_get_effective(keymap, mods->mods); } static void |