diff options
author | Hans Nieser <hnsr@xs4all.nl> | 2009-10-28 06:59:40 +0100 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-11-03 13:19:55 +1000 |
commit | 9db4c77956d3d1598955e777ce6607fe7901a395 (patch) | |
tree | 9a1ac7e4441c73aec33b2531aec1e7373e32947b | |
parent | 6e2f5912b6ab54a5d78c7dfddc558e0bed08e270 (diff) |
Xinput: allow non-integer values again for Constant- and AdaptiveDeceleration
This was initially fixed by commit 3932a848572f4eaf8b7f1d91d9b74aeafab069a2
but then (presumably not intentionally) undone by commit
1d54479cb3c8b4f75b7564f8b5e1c5da940b20f4 .
Signed-off-by: Hans Nieser <hnsr@xs4all.nl>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 55f4c80a4c891b355a99e6a05978ca945397c5cc)
-rw-r--r-- | hw/xfree86/common/xf86Xinput.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 6887f55eb..f637cfe19 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -113,7 +113,7 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, char* devname, pointer list, return; /* common settings (available via device properties) */ - tempf = xf86SetIntOption(list, "ConstantDeceleration", 1); + tempf = xf86SetRealOption(list, "ConstantDeceleration", 1.0); if(tempf > 1.0){ xf86Msg(X_CONFIG, "%s: (accel) constant deceleration by %.1f\n", devname, tempf); @@ -122,7 +122,7 @@ ProcessVelocityConfiguration(DeviceIntPtr pDev, char* devname, pointer list, PropModeReplace, 1, &tempf, FALSE); } - tempf = xf86SetIntOption(list, "AdaptiveDeceleration", 1); + tempf = xf86SetRealOption(list, "AdaptiveDeceleration", 1.0); if(tempf > 1.0){ xf86Msg(X_CONFIG, "%s: (accel) adaptive deceleration by %.1f\n", devname, tempf); |