xserver: Branch 'xorg-server-1.4-apple'

[Jeremy Huddleston]

 hw/xquartz/quartzKeyboard.c |   32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

New commits:
commit 2a72309c061f7060480d150791019ce232481462
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sun May 18 23:51:06 2008 -0700

    XQuartz: Fixed dropped code in the !XKB blocks, disable XKB support until we figure out a solution for xkeyboard-config

diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index c75cd1d..5b8d32d 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -43,7 +43,7 @@
 // Define this to get a diagnostic output to stderr which is helpful
 // in determining how the X server is interpreting the Darwin keymap.
 #define DUMP_DARWIN_KEYMAP
-#define XQUARTZ_USE_XKB 
+//#define XQUARTZ_USE_XKB 
 #define HACK_MISSING 1
 #define HACK_KEYPAD 1
 
@@ -910,24 +910,26 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
 
 
 void DarwinKeyboardReloadHandler(int screenNum, xEventPtr xe, DeviceIntPtr pDev, int nevents) {
-	if (pDev == NULL) pDev = darwinKeyboard;
-	
-	DEBUG_LOG("DarwinKeyboardReloadHandler(%p)\n", pDev);
+    if (pDev == NULL) pDev = darwinKeyboard;
+    
+    DEBUG_LOG("DarwinKeyboardReloadHandler(%p)\n", pDev);
 
 #ifdef XQUARTZ_USE_XKB
-	QuartzXkbUpdate(pDev);
+    QuartzXkbUpdate(pDev);
 #else
-	if (pDev->key) {
-		if (pDev->key->curKeySyms.map) xfree(pDev->key->curKeySyms.map);
-		if (pDev->key->modifierKeyMap) xfree(pDev->key->modifierKeyMap);
-		xfree(pDev->key);
-	}
-	
     KeySymsRec keySyms;
-	if (!InitKeyClassDeviceStruct(pDev, &keySyms, keyInfo.modMap)) {
-		DEBUG_LOG("InitKeyClassDeviceStruct failed\n");
-		return;
-	}
+    DarwinLoadKeyboardMapping(&keySyms);
+
+    if (pDev->key) {
+        if (pDev->key->curKeySyms.map) xfree(pDev->key->curKeySyms.map);
+        if (pDev->key->modifierKeyMap) xfree(pDev->key->modifierKeyMap);
+        xfree(pDev->key);
+    }
+    
+    if (!InitKeyClassDeviceStruct(pDev, &keySyms, keyInfo.modMap)) {
+        DEBUG_LOG("InitKeyClassDeviceStruct failed\n");
+        return;
+    }
 
     SendMappingNotify(MappingKeyboard, MIN_KEYCODE, NUM_KEYCODES, 0);
     SendMappingNotify(MappingModifier, 0, 0, 0);