diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-04-17 12:42:01 -0700 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2009-01-22 15:08:55 +1100 |
| commit | 32db27a7f867b503c2840ca7b815e96d10be9210 (patch) | |
| tree | e92648cdf253abecbd8dd5491fc1678c5464d8c9 /xkb | |
| parent | f062e90a95f9b7ae5458ef2100615e8ace9b66a7 (diff) | |
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 <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'xkb')
| -rw-r--r-- | xkb/xkb.c | 3 | ||||
| -rw-r--r-- | xkb/xkbInit.c | 3 | ||||
| -rw-r--r-- | xkb/xkbUtils.c | 8 |
3 files changed, 1 insertions, 13 deletions
@@ -5836,9 +5836,6 @@ ProcXkbGetKbdByName(ClientPtr client) if (tmpd == dev || (dev->id == inputInfo.keyboard->id && tmpd->key && tmpd->coreEvents)) { - - memcpy(tmpd->key->modifierMap, xkb->map->modmap, - xkb->max_key_code + 1); if (tmpd != dev) XkbCopyKeymap(dev->key->xkbInfo->desc, tmpd->key->xkbInfo->desc, True); diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index d85fbd4e4..bcee26c37 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -506,9 +506,6 @@ InitKeyboardDeviceStruct(DeviceIntPtr dev, XkbRMLVOSet *rmlvo, XkbInitControls(dev, xkbi); - /* XXX: Doesn't XUCD make this redundant? */ - memcpy(dev->key->modifierMap, xkb->map->modmap, xkb->max_key_code + 1); - XkbInitIndicatorMap(xkbi); XkbDDXInitDevice(dev); 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; |