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 /Xi | |
| 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 'Xi')
| -rw-r--r-- | Xi/exevents.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c index 824972ca5..f06aed07d 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -199,8 +199,6 @@ CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master) dk = device->key; mk = master->key; - memcpy(mk->modifierMap, dk->modifierMap, MAP_LENGTH); - mk->curKeySyms.minKeyCode = dk->curKeySyms.minKeyCode; mk->curKeySyms.maxKeyCode = dk->curKeySyms.maxKeyCode; SetKeySymsMap(&mk->curKeySyms, &dk->curKeySyms); @@ -997,7 +995,7 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr device, int count) if (xE->u.u.type == DeviceKeyPress) { if (ret == IS_REPEAT) { /* allow ddx to generate multiple downs */ - modifiers = k->modifierMap[key]; + modifiers = k->xkbInfo->desc->map->modmap[key]; if (!modifiers) { xE->u.u.type = DeviceKeyRelease; ProcessOtherEvent(xE, device, count); |