xserver: Branch 'xorg-server-1.6-apple' - 4 commits

[Jeremy Huddleston]

 hw/xquartz/darwinEvents.c      |    4 +++-
 hw/xquartz/mach-startup/stub.c |    2 +-
 hw/xquartz/quartzKeyboard.c    |    1 +
 hw/xquartz/xpr/xprScreen.c     |    2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 23cdc2429ec16590e220d7bf0a95c1a5bb40dac7
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Jul 25 15:21:12 2009 -0700

    XQuartz: Bump the reported version to X11R7.4
    (cherry picked from commit c83f701aa75c75433b8745f5d79bca3a7516df91)

diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c
index 7eb894c..cee8116 100644
--- a/hw/xquartz/mach-startup/stub.c
+++ b/hw/xquartz/mach-startup/stub.c
@@ -222,7 +222,7 @@ int main(int argc, char **argv, char **envp) {
     sig_t handler;
 
     if(argc == 2 && !strcmp(argv[1], "-version")) {
-        fprintf(stderr, "X.org Release 7.3\n");
+        fprintf(stderr, "X.org Release 7.4\n");
         fprintf(stderr, "X.Org X Server %s\n", XSERVER_VERSION);
         fprintf(stderr, "Build Date: %s\n", BUILD_DATE);
         return EXIT_SUCCESS;
commit a6d056afacc6c57b54af77062e06ba538a8733ea
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Jul 25 10:39:26 2009 -0700

    XQuartz: xpr: Added missing include for RootlessHideAllWindows
    (cherry picked from commit 75e104730810acbb11bf8503bac24ea25243b2ac)

diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index 1fac9ec..9a2b1b4 100644
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -48,6 +48,8 @@
 #include "applewmExt.h"
 #include "micmap.h"
 
+#include "rootlessCommon.h"
+
 #ifdef DAMAGE
 # include "damage.h"
 #endif
commit 6fa62192af937aa9656f64b516050bc099231c7a
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Jul 25 15:22:01 2009 -0700

    XQuartz: Use the master device in DarwinSendDDXEvent to avoid duplicate events.

diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index 0446da7..c6fe566 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -572,6 +572,7 @@ void DarwinSendDDXEvent(int type, int argc, ...) {
     INT32 *argv;
     int i, max_args;
     va_list args;
+    DeviceIntPtr pDev;
 
     memset(&xe, 0, sizeof(xe));
     xe.u.u.type = type;
@@ -587,8 +588,9 @@ void DarwinSendDDXEvent(int type, int argc, ...) {
         va_end (args);
     }
 
+    pDev = (!darwinPointer->isMaster && darwinPointer->u.master) ? darwinPointer->u.master : darwinPointer;
     darwinEvents_lock(); {
-        mieqEnqueue(darwinPointer, &xe);
+        mieqEnqueue(pDev, &xe);
         DarwinPokeEQ();
     } darwinEvents_unlock();
 }
commit 427e1aab41dabb54354bfd30f2baae98ac8202c0
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Jul 25 14:59:42 2009 -0700

    XQuartz: Copy the keyboard map to the core keyboard
    
    This still doesn't handle the modifier map... gotta figure out what to do now that SwitchCoreKeyboard is gone

diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index a212eb5..0e662a4 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -360,6 +360,7 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
         XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOn);
     }
 
+    SetKeySymsMap(&inputInfo.keyboard->key->curKeySyms, &pDev->key->curKeySyms);
 }
 
 void DarwinKeyboardReloadHandler(int screenNum, xEventPtr xe, DeviceIntPtr pDev, int nevents) {