andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dix: correctly utilize tracker buffer and protect from timer overruns

Browse Source 
two small related fixes hard to split up

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Simon Thum 2009-04-01 10:53:10 +02:00 committed by Peter Hutterer
parent 06aebecb19
commit ff7f019bbc
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dix/ptrveloc.c
View File

@ -98,7 +98,7 @@ InitVelocityData(DeviceVelocityPtr s)
s->min_acceleration = 1.0; /* don't decelerate */ s->min_acceleration = 1.0; /* don't decelerate */
s->max_rel_diff = 0.2; s->max_rel_diff = 0.2;
s->max_diff = 1.0; s->max_diff = 1.0;
s->initial_range = 1; s->initial_range = 2;
s->average_accel = TRUE; s->average_accel = TRUE;
SetAccelerationProfile(s, AccelProfileClassic); SetAccelerationProfile(s, AccelProfileClassic);
InitTrackers(s, 16); InitTrackers(s, 16);
@ -445,8 +445,8 @@ FeedTrackers(DeviceVelocityPtr s, int dx, int dy, int cur_t)
s->tracker[n].dy += dy; s->tracker[n].dy += dy;
} }
n = (s->cur_tracker + 1) % s->num_tracker; n = (s->cur_tracker + 1) % s->num_tracker;
s->tracker[n].dx = dx; s->tracker[n].dx = 0;
s->tracker[n].dy = dy; s->tracker[n].dy = 0;
s->tracker[n].time = cur_t; s->tracker[n].time = cur_t;
s->tracker[n].dir = GetDirection(dx, dy); s->tracker[n].dir = GetDirection(dx, dy);
DebugAccelF("(dix prtacc) motion [dx: %i dy: %i dir:%i diff: %i]\n", DebugAccelF("(dix prtacc) motion [dx: %i dy: %i dir:%i diff: %i]\n",
@ -465,7 +465,7 @@ CalcTracker(DeviceVelocityPtr s, int offset, int cur_t){
int index = TRACKER_INDEX(s, offset); int index = TRACKER_INDEX(s, offset);
float dist = sqrt( s->tracker[index].dx * s->tracker[index].dx float dist = sqrt( s->tracker[index].dx * s->tracker[index].dx
+ s->tracker[index].dy * s->tracker[index].dy); + s->tracker[index].dy * s->tracker[index].dy);
int dtime = cur_t - s->tracker[TRACKER_INDEX(s, offset+1)].time; int dtime = cur_t - s->tracker[index].time;
if(dtime > 0) if(dtime > 0)
return (dist / dtime); return (dist / dtime);
else else
@ -476,20 +476,22 @@ CalcTracker(DeviceVelocityPtr s, int offset, int cur_t){
* (in time) tracker which isn't too old, beyond a linear partition, * (in time) tracker which isn't too old, beyond a linear partition,
* or simply too much off initial velocity. * or simply too much off initial velocity.
* *
* min_t should be (now - ~100-600 ms). May return 0. * May return 0.
*/ */
static float static float
QueryTrackers(DeviceVelocityPtr s, int min_t, int cur_t){ QueryTrackers(DeviceVelocityPtr s, int cur_t){
int n, offset, dir = 255, i = -1; int n, offset, dir = 255, i = -1, age_ms;
/* initial velocity: a low-offset, valid velocity */ /* initial velocity: a low-offset, valid velocity */
float iveloc = 0, res = 0, tmp, vdiff; float iveloc = 0, res = 0, tmp, vdiff;
float vfac = s->corr_mul * s->const_acceleration; /* premultiply */ float vfac = s->corr_mul * s->const_acceleration; /* premultiply */
/* loop from current to older data */ /* loop from current to older data */
for(offset = 0; offset < s->num_tracker-1; offset++){ for(offset = 1; offset < s->num_tracker; offset++){
n = TRACKER_INDEX(s, offset); n = TRACKER_INDEX(s, offset);
/* bail out if data is too old */ age_ms = cur_t - s->tracker[n].time;
if(s->tracker[TRACKER_INDEX(s, offset+1)].time < min_t){
/* bail out if data is too old and protect from overrun */
if (age_ms >= s->reset_time || age_ms < 0) {
DebugAccelF("(dix prtacc) query: tracker too old\n"); DebugAccelF("(dix prtacc) query: tracker too old\n");
break; break;
} }
@ -566,7 +568,7 @@ ProcessVelocityData2D(
FeedTrackers(s, dx, dy, time); FeedTrackers(s, dx, dy, time);
velocity = QueryTrackers(s, time - s->reset_time, time); velocity = QueryTrackers(s, time);
s->velocity = velocity; s->velocity = velocity;
return velocity == 0; return velocity == 0;