From 19ff23ab0e72a27d05ed4470f75a0934d6f6c1d1 Mon Sep 17 00:00:00 2001
From: Ben Byer <bbyer@bushing.apple.com>
Date: Fri, 28 Mar 2008 18:25:03 -0700
Subject: [PATCH] Remove calls to InitValuatorAxisStruct -- these are now
 handled in dix by InitValuatorDeviceClass. Add InitProximityClassDeviceStruct
 call to prepare for tablet support. (cherry picked from commit
 1bd980a5b114f5320360943214f8f9f23b29c1e3)

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

diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 0dbfafefa..8f2511dbb 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -353,24 +353,8 @@ static int DarwinMouseProc(
             InitPointerDeviceStruct( (DevicePtr)pPointer, map, 5,
 				     GetMotionHistory,
 				     (PtrCtrlProcPtr)NoopDDA,
-				     GetMotionHistorySize(), 2);
-
-#ifdef XINPUT
-            InitValuatorAxisStruct( pPointer,
-                                    0,     // X axis
-                                    0,     // min value
-                                    16000, // max value (fixme screen size?)
-                                    1,     // resolution (fixme ?)
-                                    1,     // min resolution
-                                    1 );   // max resolution
-            InitValuatorAxisStruct( pPointer,
-                                    1,     // X axis
-                                    0,     // min value
-                                    16000, // max value (fixme screen size?)
-                                    1,     // resolution (fixme ?)
-                                    1,     // min resolution
-                                    1 );   // max resolution
-#endif
+				     GetMotionHistorySize(), 5);
+	    InitProximityClassDeviceStruct( (DevicePtr)pPointer);
             break;
 
         case DEVICE_ON: