summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-12-21 10:45:11 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2010-12-22 09:18:52 +1000
commit0c987a929dd4c98d4a80d8b7f75286902eb572f2 (patch)
tree2add4520ad6a37935d24344293cc39cac2a261b9
parent242a01eb0f2f9b56fb6d6f0b41fc6a899cadb857 (diff)
Revert "Don't count BTN_TOUCH as tool. (#29428)"
Synaptics devices send garbage between BTN_TOUCH and BTN_TOOL_FINGER. By switching to use this as proximity data now, the pointer is reset to the garbage data position (usually around 1/5855). This reverts commit 899218e18120918138f6d7420465763422d5b3b7. Reported-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
-rw-r--r--src/evdev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/evdev.c b/src/evdev.c
index dbe167a..b6591ce 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -679,6 +679,7 @@ EvdevProcessKeyEvent(InputInfoPtr pInfo, struct input_event *ev)
switch (ev->code) {
case BTN_TOUCH:
+ pEvdev->in_proximity = value ? ev->code : 0;
if (!(pEvdev->flags & (EVDEV_TOUCHSCREEN | EVDEV_TABLET)))
break;
/* Treat BTN_TOUCH from devices that only have BTN_TOUCH as