xserver: Branch 'master' - 3 commits

[Jeremy Huddleston]

 hw/xquartz/X11Application.m  |    2 +-
 hw/xquartz/applewm.c         |   11 ++++++-----
 hw/xquartz/xpr/appledristr.h |    5 ++++-
 3 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 9180081ec32b6c655d193de4c89b59d222a72579
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Wed Apr 1 13:45:02 2009 -0700

    XQuartz: Still send mouse events while X11 is in the background if we have test extensions enabled
    (cherry picked from commit f393fb686cfbedb11a1539d4eaf5c491af8b3a64)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index e459b4c..bd4b275 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -1067,7 +1067,7 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe
                 pDev = darwinTabletCurrent;
             }
 
-            if(!quartzServerVisible) {
+            if(!quartzServerVisible && noTestExtensions) {
 #if 0
 /* Seems this has somehow triggered 100% CPU usage while X11.app is in the
  * background on some obscure HW configurations.
commit 029307e79a14cad5bde8f1f4a5d0a2f740271f06
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Wed Apr 1 13:07:15 2009 -0700

    XQuartz: Return BadRequest when SendPSN isn't implemented rather than success
    (cherry picked from commit 49871e99179d5176a1ec516c8f449e2dc219faea)

diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index ef67dd4..ebfd256 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -500,11 +500,12 @@ ProcAppleWMSendPSN(register ClientPtr client)
     
     REQUEST_SIZE_MATCH(xAppleWMSendPSNReq);
     
-    if(appleWMProcs->SendPSN) {
-        err = appleWMProcs->SendPSN(stuff->psn_hi, stuff->psn_lo);
-        if (err != Success) {
-            return err;
-        }
+    if(!appleWMProcs->SendPSN)
+        return BadRequest;
+
+    err = appleWMProcs->SendPSN(stuff->psn_hi, stuff->psn_lo);
+    if (err != Success) {
+        return err;
     }
 
     return (client->noClientException);
commit 0603fbc1d3b2db5c25faabbfb5e04914110b4d0e
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Wed Apr 1 12:46:51 2009 -0700

    XQuartz: Pad xAppleDRINotifyEvent to 32bytes to match sizeof(xEvent)
    (cherry picked from commit 276ee3bb087c772f57a987519aa4d94afeceadaa)

diff --git a/hw/xquartz/xpr/appledristr.h b/hw/xquartz/xpr/appledristr.h
index a3844f0..c569719 100644
--- a/hw/xquartz/xpr/appledristr.h
+++ b/hw/xquartz/xpr/appledristr.h
@@ -157,8 +157,11 @@ typedef struct _AppleDRINotify {
 	CARD32	pad1 B32;
 	CARD32	arg B32;
 	CARD32	pad3 B32;
+	CARD32	pad4 B32;
+	CARD32	pad5 B32;
+	CARD32	pad6 B32;
 } xAppleDRINotifyEvent;
-#define sz_xAppleDRINotifyEvent	20
+#define sz_xAppleDRINotifyEvent	32
 
 
 typedef struct {