From 79d4956add44d1150e835cbb0d44d3d1c9077203 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 17 Mar 2009 13:25:58 +1000 Subject: If we have a touchpad, print so, don't claim we're configuring a tablet. Signed-off-by: Peter Hutterer (cherry picked from commit b11439a1763b5f210460b492dd4f47e973f90a3a) --- src/evdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/evdev.c b/src/evdev.c index 6aafce2..1d34827 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1505,7 +1505,10 @@ EvdevProbe(InputInfoPtr pInfo) if (has_axes && num_buttons) { pInfo->flags |= XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS | XI86_CONFIGURED; - if (TestBit(ABS_PRESSURE, pEvdev->abs_bitmask)) { + if (pEvdev->flags & EVDEV_TOUCHPAD) { + xf86Msg(X_INFO, "%s: Configuring as touchpad\n", pInfo->name); + pInfo->type_name = XI_TOUCHPAD; + } else if (TestBit(ABS_PRESSURE, pEvdev->abs_bitmask)) { xf86Msg(X_INFO, "%s: Configuring as tablet\n", pInfo->name); pInfo->type_name = XI_TABLET; } else { -- cgit v1.2.3