kbproto unentanglement: XkbExplicit*Mask

[platform/upstream/libxkbcommon.git] / src / xkbcomp / keymap.c

diff --git a/src/xkbcomp/keymap.c b/src/xkbcomp/keymap.c
index b917d79..51234ee 100644 (file)
--- a/src/xkbcomp/keymap.c
+++ b/src/xkbcomp/keymap.c
@@ -141,7 +141,7 @@ ApplyInterpsToKey(struct xkb_keymap *keymap, struct xkb_key *key)
     xkb_level_index_t width, level;
 
     /* If we've been told not to bind interps to this key, then don't. */
-    if (key->explicit & XkbExplicitInterpretMask)
+    if (key->explicit & EXPLICIT_INTERP)
         return true;
 
     for (group = 0; group < key->num_groups; group++) {
@@ -153,7 +153,7 @@ ApplyInterpsToKey(struct xkb_keymap *keymap, struct xkb_key *key)
 
             /* Infer default key behaviours from the base level. */
             if (group == 0 && level == 0) {
-                if (!(key->explicit & XkbExplicitAutoRepeatMask) &&
+                if (!(key->explicit & EXPLICIT_REPEAT) &&
                     (!interp || interp->repeat))
                     key->repeats = true;
             }
@@ -180,7 +180,7 @@ ApplyInterpsToKey(struct xkb_keymap *keymap, struct xkb_key *key)
         }
     }
 
-    if (!(key->explicit & XkbExplicitVModMapMask))
+    if (!(key->explicit & EXPLICIT_VMODMAP))
         key->vmodmap = vmodmask;
 
     return true;