diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-09-11 12:35:24 +0100 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2012-09-11 14:05:42 +0100 |
| commit | e60e9523c62d7b9463b5aff691fa18f9a8b7a6ca (patch) | |
| tree | ae58c58e3a30fb9f7b7a89dafebc6c628dba23c4 /src/xkbcomp/keymap.c | |
| parent | 2eab7efc13c5d089c9761f7a807970cfb7ad3779 (diff) | |
| download | libxkbcommon-e60e9523c62d7b9463b5aff691fa18f9a8b7a6ca.tar.gz libxkbcommon-e60e9523c62d7b9463b5aff691fa18f9a8b7a6ca.tar.bz2 libxkbcommon-e60e9523c62d7b9463b5aff691fa18f9a8b7a6ca.zip | |
kbproto unentanglement: XkbExplicit*Mask
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'src/xkbcomp/keymap.c')
| -rw-r--r-- | src/xkbcomp/keymap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xkbcomp/keymap.c b/src/xkbcomp/keymap.c index b917d79..51234ee 100644 --- 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; |