diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-04-25 19:47:16 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2009-01-22 15:08:57 +1100 |
| commit | 61c508fa78aa08ea2666fde950fbafad95d65056 (patch) | |
| tree | 0a63921127f1ce11c6842d3497c12f3ca4a4953c /xkb/xkbUtils.c | |
| parent | 4f3078df2acf07364a17f738bc5c32f9a5962723 (diff) | |
XKB: Sanitise vmods in actions
Turn vmods from two unsigned chars into one int.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'xkb/xkbUtils.c')
| -rw-r--r-- | xkb/xkbUtils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index d03195f05..b07dceb80 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -183,13 +183,13 @@ register unsigned tmp; case XkbSA_SetMods: case XkbSA_LatchMods: case XkbSA_LockMods: if (act->mods.flags&XkbSA_UseModMapMods) act->mods.real_mods= act->mods.mask= mods; - if ((tmp= XkbModActionVMods(&act->mods))!=0) + if ((tmp= act->mods.vmods)!=0) act->mods.mask|= XkbMaskForVMask(xkb,tmp); break; case XkbSA_ISOLock: if (act->iso.flags&XkbSA_UseModMapMods) act->iso.real_mods= act->iso.mask= mods; - if ((tmp= XkbModActionVMods(&act->iso))!=0) + if ((tmp= act->iso.vmods)!=0) act->iso.mask|= XkbMaskForVMask(xkb,tmp); break; } |