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

xf86: don't replicate dix defaults for pointer acceleration 

the defaults from InitVelocityData() or hypothetic driver-side changes
are now respected, not overridden.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Simon Thum 2008-07-31 00:39:03 +02:00 committed by Peter Hutterer
parent 4f333d5351
commit d95136e151
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/xfree86/common/xf86Xinput.c
View File

@ -101,12 +101,9 @@ ProcessVelocityConfiguration(char* devname, pointer list, DeviceVelocityPtr s){
if(!s) if(!s)
return; return;
tempf = xf86SetRealOption(list, "FilterHalflife", 20); tempf = xf86SetRealOption(list, "FilterHalflife", -1);
xf86Msg(X_CONFIG, "%s: (accel) filter halflife %.1f ms\n", devname, tempf);
if(tempf > 0) if(tempf > 0)
tempf = 1.0 / tempf; /* set reciprocal if possible */ tempf = 1.0 / tempf; /* set reciprocal if possible */
else
tempf = 10000; /* else set fairly high */
tempf2 = xf86SetRealOption(list, "FilterChainProgression", 2.0); tempf2 = xf86SetRealOption(list, "FilterChainProgression", 2.0);
xf86Msg(X_CONFIG, "%s: (accel) filter chain progression: %.2f\n", xf86Msg(X_CONFIG, "%s: (accel) filter chain progression: %.2f\n",
@ -118,7 +115,9 @@ ProcessVelocityConfiguration(char* devname, pointer list, DeviceVelocityPtr s){
if(tempi < 1 || tempi > MAX_VELOCITY_FILTERS) if(tempi < 1 || tempi > MAX_VELOCITY_FILTERS)
tempi = 1; tempi = 1;
InitFilterChain(s, tempf, tempf2, tempi, 40); if(tempf > 0.0f && tempi >= 1 && tempf2 >= 1.0f)
InitFilterChain(s, tempf, tempf2, tempi, 40);
for(i = 0; i < tempi; i++) for(i = 0; i < tempi; i++)
xf86Msg(X_CONFIG, "%s: (accel) filter stage %i: %.2f ms\n", xf86Msg(X_CONFIG, "%s: (accel) filter stage %i: %.2f ms\n",
devname, i, 1.0f / (s->filters[i].rdecay)); devname, i, 1.0f / (s->filters[i].rdecay));
@ -138,10 +137,12 @@ ProcessVelocityConfiguration(char* devname, pointer list, DeviceVelocityPtr s){
s->min_acceleration = 1.0 / tempf; /* set minimum acceleration */ s->min_acceleration = 1.0 / tempf; /* set minimum acceleration */
} }
tempf = xf86SetRealOption(list, "VelocityCoupling", 0.25); tempf = xf86SetRealOption(list, "VelocityCoupling", -1);
xf86Msg(X_CONFIG, "%s: (accel) velocity coupling is %.1f%%\n", devname, if(tempf >= 0){
xf86Msg(X_CONFIG, "%s: (accel) velocity coupling is %.1f%%\n", devname,
tempf*100.0); tempf*100.0);
s->coupling = tempf; s->coupling = tempf;
}
/* Configure softening. If const deceleration is used, this is expected /* Configure softening. If const deceleration is used, this is expected
* to provide better subpixel information so we enable * to provide better subpixel information so we enable
@ -150,19 +151,22 @@ ProcessVelocityConfiguration(char* devname, pointer list, DeviceVelocityPtr s){
s->use_softening = xf86SetBoolOption(list, "Softening", s->use_softening = xf86SetBoolOption(list, "Softening",
s->const_acceleration == 1.0); s->const_acceleration == 1.0);
s->average_accel = xf86SetBoolOption(list, "AccelerationProfileAveraging", TRUE); s->average_accel = xf86SetBoolOption(list, "AccelerationProfileAveraging",
s->average_accel);
s->reset_time = xf86SetIntOption(list, "VelocityReset", 300); s->reset_time = xf86SetIntOption(list, "VelocityReset", s->reset_time);
tempf = xf86SetRealOption(list, "ExpectedRate", 0); tempf = xf86SetRealOption(list, "ExpectedRate", 0);
if(tempf > 0){ if(tempf > 0){
s->corr_mul = 1000.0 / tempf; s->corr_mul = 1000.0 / tempf;
}else{ }else{
s->corr_mul = xf86SetRealOption(list, "VelocityScale", 10); s->corr_mul = xf86SetRealOption(list, "VelocityScale", s->corr_mul);
} }
/* select profile by number */ /* select profile by number */
tempi= xf86SetIntOption(list, "AccelerationProfile", 0); tempi= xf86SetIntOption(list, "AccelerationProfile",
s->statistics.profile_number);
if(SetAccelerationProfile(s, tempi)){ if(SetAccelerationProfile(s, tempi)){
xf86Msg(X_CONFIG, "%s: (accel) set acceleration profile %i\n", devname, tempi); xf86Msg(X_CONFIG, "%s: (accel) set acceleration profile %i\n", devname, tempi);
}else{ }else{