xserver: Branch 'server-1.7-nominations' - 3 commits

[Peter Hutterer]

 dix/colormap.c                 |    3 +++
 hw/xfree86/common/xf86Xinput.c |   12 +++++++++---
 hw/xfree86/common/xf86cmap.c   |    2 ++
 hw/xfree86/dri2/dri2ext.c      |    2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit da6c66dbc5d7b4760b5c3901b32fc5100ede4e0c
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Oct 23 10:04:57 2009 +0900

    DRI2: Report the correct extension minor version
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit 9a2f6135bfb0f12ec28f304c97917d2f7c64db05)

diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index 6c14578..dc07b47 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -81,7 +81,7 @@ ProcDRI2QueryVersion(ClientPtr client)
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
     rep.majorVersion = SERVER_DRI2_MAJOR_VERSION;
-    rep.minorVersion = SERVER_DRI2_MAJOR_VERSION;
+    rep.minorVersion = SERVER_DRI2_MINOR_VERSION;
 
     if (client->swapped) {
     	swaps(&rep.sequenceNumber, n);
commit fb5db61be2cecbd364b2a4566899573af099c50c
Author: Marcin Baczyński <marbacz at gmail.com>
Date:   Thu Oct 22 14:43:25 2009 +0200

    Kill compilation warnings.
    
    Signed-off-by: Marcin Baczyński <marbacz at gmail.com>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit d886008c96cd16f735f54dace070cb00b23c6f44)

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index fd07c2a..6887f55 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -726,12 +726,15 @@ xf86PostMotionEventP(DeviceIntPtr	device,
                     int			*valuators)
 {
     int i = 0, nevents = 0;
-    int dx = 0, dy = 0;
     Bool drag = xf86SendDragEvents(device);
     DeviceEvent *event;
-    int index;
     int flags = 0;
 
+#if XFreeXDGA
+    int index;
+    int dx = 0, dy = 0;
+#endif
+
     XI_VERIFY_VALUATORS(num_valuators);
 
     if (is_absolute)
@@ -856,9 +859,12 @@ xf86PostButtonEventP(DeviceIntPtr	device,
                      int		*valuators)
 {
     int i = 0, nevents = 0;
-    int index;
     int flags = 0;
 
+#if XFreeXDGA
+    int index;
+#endif
+
     XI_VERIFY_VALUATORS(num_valuators);
 
     if (is_absolute)
diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index 36e6f96..08f557c 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -115,7 +115,9 @@ static void CMapDestroyColormap (ColormapPtr);
 
 static Bool CMapEnterVT(int, int);
 static Bool CMapSwitchMode(int, DisplayModePtr, int);
+#ifdef XFreeXDGA
 static int  CMapSetDGAMode(int, int, DGADevicePtr);
+#endif
 static int  CMapChangeGamma(int, Gamma);
 
 static void ComputeGamma(CMapScreenPtr);
commit 5085340be6e9ed1cbd80fc9d4bf8920161e70f64
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Oct 22 17:29:01 2009 -0400

    dix: Fix up colormap fixup.
    
    FindClientResourcesByType() will walk all colormaps on all screens; we
    only want to fix up the current screen.  Otherwise, screens > 0 will
    have the visual pointers for their colormaps pointing off into space.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    (cherry picked from commit 15b30fde179cba3877182cd51b0f870ef29ffaee)

diff --git a/dix/colormap.c b/dix/colormap.c
index d702b02..bf97941 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -2705,6 +2705,9 @@ static void _colormap_find_resource(pointer value, XID id,
     ColormapPtr cmap = value;
     int j;
 
+    if (pScreen != cmap->pScreen)
+	return;
+
     j = cmap->pVisual - pScreen->visuals;
     cmap->pVisual = &visuals[j];
 }