StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix non-useModMapMods action masks 

By ensuring their mask is only the vmods, rather than also potentially
including the key's modmap.  Also remove the unnecessary vmodmask
indirection.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
master
Daniel Stone 2012-03-16 13:59:24 +00:00
parent 7e2dd12142
commit f40e0790f2
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/xkbcomp/compat.c
View File

@ -871,8 +871,6 @@ VModsToReal(struct xkb_desc *xkb, uint32_t vmodmask)
static void
UpdateActionMods(struct xkb_desc *xkb, union xkb_action *act, uint32_t rmodmask)
{
uint32_t vmodmask; /* actually real mods, inferred from vmods */
switch (act->type) {
case XkbSA_SetMods:
case XkbSA_LatchMods:
@ -881,16 +879,20 @@ UpdateActionMods(struct xkb_desc *xkb, union xkb_action *act, uint32_t rmodmask)
act->mods.real_mods = rmodmask;
act->mods.mask = act->mods.real_mods;
}
vmodmask = VModsToReal(xkb, act->mods.vmods);
act->mods.mask |= vmodmask;
else {
act->mods.mask = 0;
}
act->mods.mask |= VModsToReal(xkb, act->mods.vmods);
break;
case XkbSA_ISOLock:
if (act->iso.flags & XkbSA_UseModMapMods) {
act->iso.real_mods = rmodmask;
act->iso.mask = act->iso.real_mods;
}
vmodmask = VModsToReal(xkb, act->iso.vmods);
act->iso.mask |= vmodmask;
else {
act->iso.mask = 0;
}
act->iso.mask |= VModsToReal(xkb, act->iso.vmods);
break;
default:
break;