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 b11439a176)
This commit is contained in:
Peter Hutterer
2009-03-17 13:25:58 +10:00
parent 7e9809837c
commit 79d4956add

View File

@@ -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 {