aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2010-08-09 13:01:11 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2010-08-16 10:04:08 +1000
commit899218e18120918138f6d7420465763422d5b3b7 (patch)
treec80f4d69309d9dbd6f602e8c0743b8c6e173eaf2
parentFix out-of-bounds access if more than MAX_VALUATORS are present. (#28809) (diff)
downloadxf86-input-evdev-899218e18120918138f6d7420465763422d5b3b7.tar.gz
xf86-input-evdev-899218e18120918138f6d7420465763422d5b3b7.tar.bz2
xf86-input-evdev-899218e18120918138f6d7420465763422d5b3b7.zip
Don't count BTN_TOUCH as tool. (#29428)
Devices that don't have a tool but BTN_TOUCH simply have the tool always on. Devices that have a tool other than BTN_TOUCH set this tool before BTN_TOUCH is emitted anyway. X.Org Bug 29428 <http://bugs.freedesktop.org/show_bug.cgi?id=29428> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/evdev.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/evdev.c b/src/evdev.c
index cd0fb6c..5ea230c 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -577,7 +577,6 @@ EvdevProcessKeyEvent(InputInfoPtr pInfo, struct input_event *ev)
break;
case BTN_TOUCH:
- pEvdev->tool = value ? ev->code : 0;
if (!(pEvdev->flags & (EVDEV_TOUCHSCREEN | EVDEV_TABLET)))
break;
/* Treat BTN_TOUCH from devices that only have BTN_TOUCH as