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

xfree86: init pointer feedback controls from options

Browse Source 
With InputClass support, it makes more sense to cover all
aspects of acceleration in options. Previously, one could only set the
default on the command line.

Signed-off-by: Simon Thum <simon.thum@gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Simon Thum 2010-01-06 17:32:24 +01:00 committed by Peter Hutterer
parent 0722c287a4
commit 032f97808c
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,12 +196,12 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, char* devname, pointer list,
static void static void
ApplyAccelerationSettings(DeviceIntPtr dev){ ApplyAccelerationSettings(DeviceIntPtr dev){
int scheme; int scheme, i;
DeviceVelocityPtr pVel; DeviceVelocityPtr pVel;
LocalDevicePtr local = (LocalDevicePtr)dev->public.devicePrivate; LocalDevicePtr local = (LocalDevicePtr)dev->public.devicePrivate;
char* schemeStr; char* schemeStr;
if(dev->valuator){ if (dev->valuator && dev->ptrfeed) {
schemeStr = xf86SetStrOption(local->options, "AccelerationScheme", ""); schemeStr = xf86SetStrOption(local->options, "AccelerationScheme", "");
scheme = dev->valuator->accelScheme.number; scheme = dev->valuator->accelScheme.number;
@ -244,6 +244,30 @@ ApplyAccelerationSettings(DeviceIntPtr dev){
pVel); pVel);
break; break;
} }
i = xf86SetIntOption(local->options, "AccelerationNumerator",
dev->ptrfeed->ctrl.num);
if (i >= 0)
dev->ptrfeed->ctrl.num = i;
i = xf86SetIntOption(local->options, "AccelerationDenominator",
dev->ptrfeed->ctrl.den);
if (i > 0)
dev->ptrfeed->ctrl.den = i;
i = xf86SetIntOption(local->options, "AccelerationThreshold",
dev->ptrfeed->ctrl.threshold);
if (i >= 0)
dev->ptrfeed->ctrl.threshold = i;
/* mostly a no-op anyway */
(*dev->ptrfeed->CtrlProc)(dev, &dev->ptrfeed->ctrl);
xf86Msg(X_CONFIG, "%s: (accel) acceleration factor: %.3f\n",
local->name, ((float)dev->ptrfeed->ctrl.num)/
((float)dev->ptrfeed->ctrl.den));
xf86Msg(X_CONFIG, "%s: (accel) acceleration threshold: %i\n",
local->name, dev->ptrfeed->ctrl.threshold);
} }
} }

20
hw/xfree86/doc/man/xorg.conf.man.pre
View File

@ -959,6 +959,26 @@ Selects the scheme, which is the underlying algorithm.
.B "predictable default algorithm (behaving more predictable)" .B "predictable default algorithm (behaving more predictable)"
.B "lightweight old acceleration code (as specified in the X protocol spec)" .B "lightweight old acceleration code (as specified in the X protocol spec)"
.B "none no acceleration or deceleration" .B "none no acceleration or deceleration"
.fi
.RE
.TP 7
.BI "Option \*qAccelerationNumerator\*q \*q" integer \*q
.TP 7
.BI "Option \*qAccelerationDenominator\*q \*q" integer \*q
Set numerator and denominator of the acceleration factor. The acceleration
factor is a rational which, together with threshold, can be used to tweak
profiles to suit the users needs. The
.B simple
and
.B limited
profiles use it directly (i.e. they accelerate by the factor), for other
profiles it should hold that a higher acceleration factor leads to a faster
pointer. Typically, 1 is unaccelerated and values up to 5 are sensible.
.TP 7
.BI "Option \*qAccelerationThreshold\*q \*q" integer \*q
Set the threshold, which is roughly the velocity (usually device units per 10
ms) required for acceleration to become effective. The precise effect varies
with the profile however.
.SH "INPUTCLASS SECTION" .SH "INPUTCLASS SECTION"
The config file may have multiple The config file may have multiple