aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-03-17 13:25:58 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-03-23 16:36:13 +1000
commit79d4956add44d1150e835cbb0d44d3d1c9077203 (patch)
treeef493398facba7440bc5df9179eb407652237f6b
parentmake sure to clear all axis_map entries (diff)
downloadxf86-input-evdev-79d4956add44d1150e835cbb0d44d3d1c9077203.tar.gz
xf86-input-evdev-79d4956add44d1150e835cbb0d44d3d1c9077203.tar.bz2
xf86-input-evdev-79d4956add44d1150e835cbb0d44d3d1c9077203.zip
If we have a touchpad, print so, don't claim we're configuring a tablet.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit b11439a1763b5f210460b492dd4f47e973f90a3a)
-rw-r--r--src/evdev.c5
1 files changed, 4 insertions, 1 deletions
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 {