From 32db27a7f867b503c2840ca7b815e96d10be9210 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 17 Apr 2008 12:42:01 -0700 Subject: Input: Remove modifierMap from core We already have modmap (in the exact same format!) in XKB, so just use that all the time, instead of duplicating the information. Signed-off-by: Daniel Stone Signed-off-by: Peter Hutterer --- xkb/xkbUtils.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'xkb/xkbUtils.c') diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index 8960bca12..f84e89206 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -363,17 +363,14 @@ int maxSymsPerKey,maxKeysPerMod, maxGroup1Width; int first,last,firstCommon,lastCommon; XkbDescPtr xkb; KeyClassPtr keyc; -CARD8 keysPerMod[XkbNumModifiers]; int maxNumberOfGroups; if (!keybd || !keybd->key || !keybd->key->xkbInfo) return; xkb= keybd->key->xkbInfo->desc; keyc= keybd->key; - maxSymsPerKey= maxKeysPerMod= maxGroup1Width= 0; + maxSymsPerKey= maxGroup1Width= 0; maxNumberOfGroups = 0; - bzero(keysPerMod,sizeof(keysPerMod)); - memcpy(keyc->modifierMap,xkb->map->modmap,xkb->max_key_code+1); if ((xkb->min_key_code==keyc->curKeySyms.minKeyCode)&& (xkb->max_key_code==keyc->curKeySyms.maxKeyCode)) { first= firstCommon= xkb->min_key_code; @@ -590,10 +587,7 @@ unsigned check; XkbDescPtr xkb= kbd->key->xkbInfo->desc; XkbSetCauseCoreReq(&cause,X_SetModifierMapping,client); - num = xkb->max_key_code-xkb->min_key_code+1; - memcpy(xkb->map->modmap,kbd->key->modifierMap,xkb->max_key_code+1); - changes.map.changed|= XkbModifierMapMask; changes.map.first_modmap_key= xkb->min_key_code; changes.map.num_modmap_keys= num; -- cgit v1.2.3