touchpad: always init the left/right palm edge to INT_MIN/MAX
authorPeter Hutterer <peter.hutterer@who-t.net>
Mon, 21 Jul 2014 01:27:21 +0000 (11:27 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Mon, 21 Jul 2014 01:33:10 +0000 (11:33 +1000)
A touchpad without resolution support had the values set to 0, disabling
pointer movement.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
src/evdev-mt-touchpad.c

index 1636e7a..5db204f 100644 (file)
@@ -754,6 +754,9 @@ tp_init_palmdetect(struct tp_dispatch *tp,
 {
        int width;
 
+       tp->palm.right_edge = INT_MAX;
+       tp->palm.left_edge = INT_MIN;
+
        /* We don't know how big the touchpad is */
        if (device->abs.absinfo_x->resolution == 1)
                return 0;
@@ -763,11 +766,8 @@ tp_init_palmdetect(struct tp_dispatch *tp,
 
        /* Enable palm detection on touchpads >= 80 mm. Anything smaller
           probably won't need it, until we find out it does */
-       if (width/device->abs.absinfo_x->resolution < 80) {
-               tp->palm.right_edge = INT_MAX;
-               tp->palm.left_edge = INT_MIN;
+       if (width/device->abs.absinfo_x->resolution < 80)
                return 0;
-       }
 
        /* palm edges are 5% of the width on each side */
        tp->palm.right_edge = device->abs.absinfo_x->maximum - width * 0.05;