diff options
author | Ben Byer <bbyer@apple.com> | 2008-03-28 18:25:03 -0700 |
---|---|---|
committer | Ben Byer <bbyer@apple.com> | 2008-03-31 21:32:09 -0700 |
commit | 8b5737b3cf54afd01013045622c7af8d8e316507 (patch) | |
tree | 074dc0e1bfa11f47e86b5fbcca3138de331a8812 | |
parent | a28b8c23d9fa606c68dd5e5f86af52e19604b245 (diff) |
Remove calls to InitValuatorAxisStruct -- these are now handled in dix by
InitValuatorDeviceClass.
Add InitProximityClassDeviceStruct call to prepare for tablet support.
-rw-r--r-- | hw/xquartz/darwin.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index fa65a7903..ec1d5e05b 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: |