From 61c508fa78aa08ea2666fde950fbafad95d65056 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Fri, 25 Apr 2008 19:47:16 +0300 Subject: XKB: Sanitise vmods in actions Turn vmods from two unsigned chars into one int. Signed-off-by: Daniel Stone Signed-off-by: Peter Hutterer --- xkb/xkbUtils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xkb/xkbUtils.c') 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; } -- cgit v1.2.3