[PATCH] dix: improve pointer acceleration API

[Simon Thum]

This makes the ptr accel api actually sensible from a driver
perspective, since the device is now a parameter of the
device-specific accel callback.
---
 dix/ptrveloc.c     |   40 +++++++++++++++++++++++++++-------------
 include/ptrveloc.h |   14 ++++++++++++--
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c
index dd26477..8b9b065 100644
--- a/dix/ptrveloc.c
+++ b/dix/ptrveloc.c
@@ -63,7 +63,7 @@
 int
 SetAccelerationProfile(DeviceVelocityPtr s, int profile_num);
 static float
-SimpleSmoothProfile(DeviceVelocityPtr pVel, float velocity,
+SimpleSmoothProfile(DeviceIntPtr pDev, DeviceVelocityPtr pVel, float velocity,
                     float threshold, float acc);
 static PointerAccelerationProfileFunc
 GetAccelerationProfile(DeviceVelocityPtr s, int profile_num);
@@ -108,7 +108,7 @@ InitVelocityData(DeviceVelocityPtr s)
 /**
  * Clean up
  */
-static void
+void
 FreeVelocityData(DeviceVelocityPtr s){
     xfree(s->tracker);
     SetAccelerationProfile(s, PROFILE_UNINITIALIZE);
@@ -555,7 +555,7 @@ QueryTrackers(DeviceVelocityPtr s, int cur_t){
  * Perform velocity approximation based on 2D 'mickeys' (mouse motion delta).
  * return true if non-visible state reset is suggested
  */
-static short
+short
 ProcessVelocityData2D(
     DeviceVelocityPtr s,
     int dx,
@@ -616,15 +616,16 @@ ApplySofteningAndConstantDeceleration(
 /*
  * compute the acceleration for given velocity and enforce min_acceleartion
  */
-static float
+float
 BasicComputeAcceleration(
+    DeviceIntPtr pDev,
     DeviceVelocityPtr pVel,
     float velocity,
     float threshold,
     float acc){
 
     float result;
-    result = pVel->Profile(pVel, velocity, threshold, acc);
+    result = pVel->Profile(pDev, pVel, velocity, threshold, acc);
 
     /* enforce min_acceleration */
     if (result < pVel->min_acceleration)
@@ -637,6 +638,7 @@ BasicComputeAcceleration(
  */
 static float
 ComputeAcceleration(
+    DeviceIntPtr pDev,
     DeviceVelocityPtr vel,
     float threshold,
     float acc){
@@ -655,9 +657,11 @@ ComputeAcceleration(
 	 * current and previous velocity.
 	 * Though being the more natural choice, it causes a minor delay
 	 * in comparison, so it can be disabled. */
-	res = BasicComputeAcceleration(vel, vel->velocity, threshold, acc);
-	res += BasicComputeAcceleration(vel, vel->last_velocity, threshold, acc);
-	res += 4.0f * BasicComputeAcceleration(vel,
+	res = BasicComputeAcceleration(
+	          pDev, vel, vel->velocity, threshold, acc);
+	res += BasicComputeAcceleration(
+	          pDev, vel, vel->last_velocity, threshold, acc);
+	res += 4.0f * BasicComputeAcceleration(pDev, vel,
 	                   (vel->last_velocity + vel->velocity) / 2,
 	                   threshold, acc);
 	res /= 6.0f;
@@ -665,7 +669,8 @@ ComputeAcceleration(
 	            vel->velocity, vel->last_velocity, res);
         return res;
     }else{
-	res = BasicComputeAcceleration(vel, vel->velocity, threshold, acc);
+	res = BasicComputeAcceleration(pDev, vel,
+	                               vel->velocity, threshold, acc);
 	DebugAccelF("(dix ptracc) profile sample [%.2f] is %.3f\n",
                vel->velocity, res);
 	return res;
@@ -682,6 +687,7 @@ ComputeAcceleration(
  */
 static float
 PolynomialAccelerationProfile(
+    DeviceIntPtr pDev,
     DeviceVelocityPtr pVel,
     float velocity,
     float ignored,
@@ -697,18 +703,21 @@ PolynomialAccelerationProfile(
  */
 static float
 ClassicProfile(
+    DeviceIntPtr pDev,
     DeviceVelocityPtr pVel,
     float velocity,
     float threshold,
     float acc)
 {
-    if (threshold) {
-	return SimpleSmoothProfile (pVel,
+    if (threshold > 0) {
+	return SimpleSmoothProfile (pDev,
+	                            pVel,
 	                            velocity,
                                     threshold,
                                     acc);
     } else {
-	return PolynomialAccelerationProfile (pVel,
+	return PolynomialAccelerationProfile (pDev,
+	                                      pVel,
 	                                      velocity,
                                               0,
                                               acc);
@@ -726,6 +735,7 @@ ClassicProfile(
  */
 static float
 PowerProfile(
+    DeviceIntPtr pDev,
     DeviceVelocityPtr pVel,
     float velocity,
     float threshold,
@@ -763,6 +773,7 @@ CalcPenumbralGradient(float x){
  */
 static float
 SimpleSmoothProfile(
+    DeviceIntPtr pDev,
     DeviceVelocityPtr pVel,
     float velocity,
     float threshold,
@@ -788,6 +799,7 @@ SimpleSmoothProfile(
  */
 static float
 SmoothLinearProfile(
+    DeviceIntPtr pDev,
     DeviceVelocityPtr pVel,
     float velocity,
     float threshold,
@@ -818,6 +830,7 @@ SmoothLinearProfile(
 
 static float
 LinearProfile(
+    DeviceIntPtr pDev,
     DeviceVelocityPtr pVel,
     float velocity,
     float threshold,
@@ -829,6 +842,7 @@ LinearProfile(
 
 static float
 NoProfile(
+    DeviceIntPtr pDev,
     DeviceVelocityPtr pVel,
     float velocity,
     float threshold,
@@ -992,7 +1006,7 @@ acceleratePointerPredictable(
 
         if (pDev->ptrfeed && pDev->ptrfeed->ctrl.num) {
             /* invoke acceleration profile to determine acceleration */
-            mult = ComputeAcceleration (velocitydata,
+            mult = ComputeAcceleration (pDev, velocitydata,
 					pDev->ptrfeed->ctrl.threshold,
 					(float)pDev->ptrfeed->ctrl.num /
 					(float)pDev->ptrfeed->ctrl.den);
diff --git a/include/ptrveloc.h b/include/ptrveloc.h
index 83d188c..97badd9 100644
--- a/include/ptrveloc.h
+++ b/include/ptrveloc.h
@@ -47,8 +47,8 @@ struct _DeviceVelocityRec;
  * returns actual acceleration depending on velocity, acceleration control,...
  */
 typedef float (*PointerAccelerationProfileFunc)
-              (struct _DeviceVelocityRec* /*pVel*/,
-               float /*velocity*/, float /*threshold*/, float /*acc*/);
+              (DeviceIntPtr pDev, struct _DeviceVelocityRec* pVel,
+               float velocity, float threshold, float accelCoeff);
 
 /**
  * a motion history, with just enough information to
@@ -96,6 +96,16 @@ InitVelocityData(DeviceVelocityPtr s);
 extern _X_EXPORT void
 InitTrackers(DeviceVelocityPtr s, int ntracker);
 
+extern _X_EXPORT short
+ProcessVelocityData2D(DeviceVelocityPtr s, int dx, int dy, int time);
+
+extern _X_EXPORT float
+BasicComputeAcceleration(DeviceIntPtr pDev, DeviceVelocityPtr pVel,
+    float velocity, float threshold, float acc);
+
+extern _X_EXPORT void
+FreeVelocityData(DeviceVelocityPtr s);
+
 extern _X_EXPORT BOOL
 InitializePredictableAccelerationProperties(DeviceIntPtr pDev);
 
-- 
1.6.0.6


--------------090901070307050205000102
Content-Type: text/plain;
 name="0002-dix-make-part-of-ptrveloc.h-internal.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="0002-dix-make-part-of-ptrveloc.h-internal.patch"