xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86Xinput.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3932a848572f4eaf8b7f1d91d9b74aeafab069a2
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Nov 18 14:21:01 2008 -0500

    Xinput: use floats for ConstantDeceleration and AdaptiveDeceleration
    
    These values need not be constrained to integer values.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at redhat.com>
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index f028a25..7d90891 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -130,7 +130,7 @@ ProcessVelocityConfiguration(char* devname, pointer list, DeviceVelocityPtr s){
 	xf86Msg(X_CONFIG, "%s: (accel) filter stage %i: %.2f ms\n",
                 devname, i, 1.0f / (s->filters[i].rdecay));
 
-    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);
@@ -138,7 +138,7 @@ ProcessVelocityConfiguration(char* devname, pointer list, DeviceVelocityPtr s){
                                                   alias acceleration */
     }
 
-    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);