xserver: Branch 'master' - 3 commits

[Jeremy Huddleston]

 hw/xquartz/applewm.c         |    6 +++++-
 hw/xquartz/bundle/Info.plist |    4 +---
 hw/xquartz/darwin.c          |    7 +++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 33edd32702d963802e64d382124eabb9d0352fa8
Author: George Staplin <gstaplin at apple.com>
Date:   Sun Nov 9 18:35:10 2008 -0700

    XQuartz: Disable 2 calls to miSetVisualTypesAndMasks that seem to be unnecessary, and possibly wrong (with regard to masks and bits per RGB).
    
    Use the settings queried from the system in xprScreen.c, rather than those 2 calls.
    
    The 2 calls increased the total number of visuals a great deal (when using GLXEXT),
    and not all of the visuals were usable with GLX.  Some of the visuals aren't usable
    with GLX still, such as DirectColor, but that seems to be acceptable based on my
    understanding of the manual that states "a subset of visuals are made available
    for OpenGL rendering."
    (cherry picked from commit 373b8a5f32509722e06d8776109e6c3f06645ee0)

diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 0dd1279..2959a44 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -221,10 +221,17 @@ static Bool DarwinAddScreen(int index, ScreenPtr pScreen, int argc, char **argv)
 // TODO: Make PseudoColor visuals not suck in TrueColor mode  
 //    if(dfb->depth > 8)
 //        miSetVisualTypesAndMasks(8, PseudoColorMask, 8, PseudoColor, 0, 0, 0);
+
+#if 0
+    /*
+     * These aren't used anymore.  xpr/xprScreen.c initializes the dfb struct
+     * above based on the display properties.
+     */
     if(dfb->depth > 15)
         miSetVisualTypesAndMasks(15, LARGE_VISUALS, 5, TrueColor, 0x7c00, 0x03e0, 0x001f);
     if(dfb->depth > 24)
         miSetVisualTypesAndMasks(24, LARGE_VISUALS, 8, TrueColor, 0x00ff0000, 0x0000ff00, 0x000000ff);
+#endif
 
     miSetPixmapDepths();
 
commit 1523476afa6657c20eba112e3ee051d45e721164
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Nov 8 23:32:40 2008 -0800

    XQuartz: CFBundleShortVersionString needs to conform to X.Y.Z as well... sigh
    (cherry picked from commit 54d20f6d33c347bcb37a0a8287c2d92fed2b9092)

diff --git a/hw/xquartz/bundle/Info.plist b/hw/xquartz/bundle/Info.plist
index ae3687e..f4a9287 100644
--- a/hw/xquartz/bundle/Info.plist
+++ b/hw/xquartz/bundle/Info.plist
@@ -19,11 +19,9 @@
 	<key>CFBundlePackageType</key>
 		<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>2.3.2_beta3</string>
+		<string>2.3.2</string>
 	<key>CFBundleVersion</key>
 		<string>2.3.2</string>
-	<key>CFBundleVersionString</key>
-		<string>2.3.2_beta3</string>
 	<key>CFBundleSignature</key>
 		<string>x11a</string>
 	<key>CSResourcesFileMapped</key>
commit 1f301a0051d65296189248b2529616d9b33276b3
Author: George Staplin <gstaplin at apple.com>
Date:   Thu Nov 13 01:27:33 2008 -0700

    XQuartz: Restore the logic of AppleWMDoReorderWindow to the same as the 1.4 branch.
    
    It was returning inverted values in comparison to the 1.4 branch.  This resulted in
    the windows not drawing due to a deep path of: RootlessReorderWindow ->
    SCREENREC(pScreen)->imp->DoReorderWindow(winRec) - > xprDoReorderWindow ->
    AppleWMDoReorderWindow.
    (cherry picked from commit d1d398db762fe7d5720f9b5fafa2bbe8372fceac)

diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index c5ca8e2..c72540a 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -165,7 +165,11 @@ AppleWMDoReorderWindow(
 
     atom = xa_apple_no_order_in();
     rc = dixLookupProperty(&prop, pWin, atom, serverClient, DixReadAccess);
-    return (rc == Success) && (prop->type == atom);
+    
+    if(Success == rc && prop->type == atom)
+	return 0;
+    
+    return 1;
 }