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>

1 files changed, 10 insertions, 0 deletions

diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 21736d190..9e8da8be9 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -342,6 +342,16 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
     pthread_mutex_lock(&keyInfo_mutex);
     assert(XkbInitKeyboardDeviceStruct(pDev, &names, &keySyms, keyInfo.modMap,
                                        QuartzBell, DarwinChangeKeyboardControl));
+    assert(pDev->key->xkbInfo->desc->map->modmap!=NULL);
+    memcpy(pDev->key->xkbInfo->desc->map->modmap, keyInfo.modMap, sizeof(keyInfo.modMap));
+    pthread_mutex_unlock(&keyInfo_mutex);
+
+	QuartzXkbUpdate(pDev);
+#else
+    pthread_mutex_lock(&keyInfo_mutex);
+    assert( InitKeyboardDeviceStruct( (DevicePtr)pDev, &keySyms,
+                                      QuartzBell,
+                                      DarwinChangeKeyboardControl ));
     pthread_mutex_unlock(&keyInfo_mutex);
 
     /* Get our key repeat settings from GlobalPreferences */