frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: CalcTracker only uses the tracker, thus only pass the tracker. 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Simon Thum <simon.thum@gmx.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2011-04-20 14:23:29 +10:00
parent 62f4bef82d
commit 9e8645cacf
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dix/ptrveloc.c
View File

@ -572,11 +572,9 @@ FeedTrackers(DeviceVelocityPtr vel, int dx, int dy, int cur_t)
* This assumes linear motion. * This assumes linear motion.
*/ */
static float static float
CalcTracker(DeviceVelocityPtr vel, int offset, int cur_t){ CalcTracker(const MotionTracker *tracker, int cur_t){
int index = TRACKER_INDEX(vel, offset); float dist = sqrt(tracker->dx * tracker->dx + tracker->dy * tracker->dy);
float dist = sqrt( vel->tracker[index].dx * vel->tracker[index].dx int dtime = cur_t - tracker->time;
+ vel->tracker[index].dy * vel->tracker[index].dy);
int dtime = cur_t - vel->tracker[index].time;
if(dtime > 0) if(dtime > 0)
return dist / dtime; return dist / dtime;
else else
@ -621,7 +619,7 @@ QueryTrackers(DeviceVelocityPtr vel, int cur_t){
break; break;
} }
tmp = CalcTracker(vel, offset, cur_t) * vfac; tmp = CalcTracker(&vel->tracker[n], cur_t) * vfac;
if ((iveloc == 0 || offset <= vel->initial_range) && tmp != 0) { if ((iveloc == 0 || offset <= vel->initial_range) && tmp != 0) {
/* set initial velocity and result */ /* set initial velocity and result */