xserver: Branch 'master' - 2 commits

[Jeremy Huddleston]

 configure.ac               |    2 +-
 hw/xquartz/darwin.c        |   31 ++++++++++++++-----------------
 hw/xquartz/xpr/Makefile.am |    1 -
 3 files changed, 15 insertions(+), 19 deletions(-)

New commits:
commit 14396fdebac1868df17559220ed7aaa34c34251e
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Apr 19 23:31:05 2008 -0700

    XQuartz: Cleanup turning off COMPOSITE
    (cherry picked from commit 8f920fca6f9149185649d52569d33bf81b6c6857)

diff --git a/configure.ac b/configure.ac
index 0b9b907..ca16c5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -782,7 +782,7 @@ dnl XQuartz DDX Detection... Yes, it's ugly to have it here... but we need to di
 if test "x$COMPOSITE" = xauto; then
 	case $host_os in
 		darwin*)
-			[ "x$XQUARTZ" = xyes -o "x$XQUARTZ" = xauto ] && COMPOSITE=no
+			test "x$XQUARTZ" = xyes -o "x$XQUARTZ" = xauto && COMPOSITE=no
 			;;
 		*)
 			COMPOSITE=yes
diff --git a/hw/xquartz/xpr/Makefile.am b/hw/xquartz/xpr/Makefile.am
index 3e2e605..6007423 100644
--- a/hw/xquartz/xpr/Makefile.am
+++ b/hw/xquartz/xpr/Makefile.am
@@ -31,7 +31,6 @@ Xquartz_LDADD = \
 	$(top_builddir)/damageext/libdamageext.la \
 	$(top_builddir)/miext/damage/libdamage.la \
 	$(top_builddir)/xfixes/libxfixes.la \
-	$(top_builddir)/miext/cw/libcw.la \
 	$(top_builddir)/Xext/libXext.la \
 	$(top_builddir)/xkb/libxkb.la \
 	$(top_builddir)/xkb/libxkbstubs.la \
commit d13828797fe22856b07e08a55d2b9375902194bf
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Apr 18 20:38:31 2008 -0700

    XQuartz: Cleaned up some casting to get rid of compiler warnings
    (cherry picked from commit 6f1c85b96550adf0bc34efb6ca649b87bcc1b18c)

diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 990b08e..aad55fc 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -335,37 +335,34 @@ static void DarwinChangePointerControl(
  * DarwinMouseProc
  *  Handle the initialization, etc. of a mouse
  */
-static int DarwinMouseProc(
-    DeviceIntPtr    pPointer,
-    int             what )
-{
-  CARD8 map[8] = {0, 1, 2, 3, 4, 5, 6, 7};
-
+static int DarwinMouseProc(DeviceIntPtr pPointer, int what) {
+    CARD8 map[8] = {0, 1, 2, 3, 4, 5, 6, 7};
+    
     switch (what) {
-
+            
         case DEVICE_INIT:
             pPointer->public.on = FALSE;
-
+            
             // Set button map.
-              InitPointerDeviceStruct( (DevicePtr)pPointer, map, 7,
-				     GetMotionHistory,
-				     (PtrCtrlProcPtr)NoopDDA,
-				     GetMotionHistorySize(), 7);
-	    InitProximityClassDeviceStruct( (DevicePtr)pPointer);
+            InitPointerDeviceStruct((DevicePtr)pPointer, map, 7,
+                                    GetMotionHistory,
+                                    (PtrCtrlProcPtr)NoopDDA,
+                                    GetMotionHistorySize(), 7);
+            InitProximityClassDeviceStruct(pPointer);
             break;
-
+            
         case DEVICE_ON:
             pPointer->public.on = TRUE;
             AddEnabledDevice( darwinEventReadFD );
             return Success;
-
+            
         case DEVICE_CLOSE:
         case DEVICE_OFF:
             pPointer->public.on = FALSE;
-            RemoveEnabledDevice( darwinEventReadFD );
+            RemoveEnabledDevice(darwinEventReadFD);
             return Success;
     }
-
+    
     return Success;
 }