From d07692a4af507504b2d3c5a2172b8b23a4d7e2f4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 17 Mar 2009 08:02:00 +1000 Subject: Assume touchscreen/touchpad if we have _either_ ABS_PRESSURE or BTN_TOUCH Touchpads have pressure or touch and also BTN_TOOL_FINGER. Touchscreens have either pressure or touch, but no finger. Signed-off-by: Peter Hutterer (cherry picked from commit 7ac0c4456dc0846f7e09f334a26f9536e20065df) --- src/evdev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index fd4ad2d..6ec7374 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1472,9 +1472,9 @@ EvdevProbe(InputInfoPtr pInfo) TestBit(ABS_Y, pEvdev->abs_bitmask)) { xf86Msg(X_INFO, "%s: Found x and y absolute axes\n", pInfo->name); pEvdev->flags |= EVDEV_ABSOLUTE_EVENTS; - if (!TestBit(ABS_PRESSURE, pEvdev->abs_bitmask) && - TestBit(BTN_TOUCH, pEvdev->key_bitmask)) { - if (num_buttons) { + if (TestBit(ABS_PRESSURE, pEvdev->abs_bitmask) || + TestBit(BTN_TOUCH, pEvdev->key_bitmask)) { + if (num_buttons || TestBit(BTN_TOOL_FINGER, pEvdev->key_bitmask)) { xf86Msg(X_INFO, "%s: Found absolute touchpad\n", pInfo->name); pEvdev->flags |= EVDEV_TOUCHPAD; memset(pEvdev->old_vals, -1, sizeof(int) * pEvdev->num_vals); -- cgit v1.2.3