xserver: Branch 'master'

[Keith Packard]

 hw/xquartz/darwin.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ac2c307f4716ebd3e955c004ceec9f4c029401a0
Author: Pelle Johansson <pelle at morth.org>
Date:   Sun Aug 14 17:44:40 2011 -0700

    XQuartz: Initialize darwin pointer valuators
    
    This fixes a regression introduced by: 633b81e8ba09cc6a1ea8b43f323874fda2cf0bde
    
    http://xquartz.macosforge.org/trac/ticket/498
    
    Signed-off-by: Pelle Johansson <pelle at morth.org>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index f19d7bf..b483000 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -322,8 +322,8 @@ static int DarwinMouseProc(DeviceIntPtr pPointer, int what) {
                                     (PtrCtrlProcPtr)NoopDDA,
                                     GetMotionHistorySize(), NAXES,
                                     axes_labels);
-//            InitValuatorAxisStruct(pPointer, 0, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
-//            InitValuatorAxisStruct(pPointer, 1, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+            InitValuatorAxisStruct(pPointer, 0, axes_labels[0], NO_AXIS_LIMITS, NO_AXIS_LIMITS, 0, 0, 0, Absolute);
+            InitValuatorAxisStruct(pPointer, 1, axes_labels[1], NO_AXIS_LIMITS, NO_AXIS_LIMITS, 0, 0, 0, Absolute);
             break;
         case DEVICE_ON:
             pPointer->public.on = TRUE;