diff --git a/src/evdev.c b/src/evdev.c index 0a1f59ed..83cc3a20 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -499,14 +499,12 @@ evdev_configure_device(struct evdev_device *device) ioctl(device->fd, EVIOCGABS(ABS_X), &absinfo); device->abs.min_x = absinfo.minimum; device->abs.max_x = absinfo.maximum; - device->caps |= EVDEV_MOTION_ABS; has_abs = 1; } if (TEST_BIT(abs_bits, ABS_Y)) { ioctl(device->fd, EVIOCGABS(ABS_Y), &absinfo); device->abs.min_y = absinfo.minimum; device->abs.max_y = absinfo.maximum; - device->caps |= EVDEV_MOTION_ABS; has_abs = 1; } /* We only handle the slotted Protocol B in weston. @@ -587,8 +585,7 @@ evdev_configure_device(struct evdev_device *device) return 0; } - if ((device->caps & EVDEV_MOTION_ABS || has_rel) && - (device->caps & EVDEV_BUTTON)) + if ((has_abs || has_rel) && (device->caps & EVDEV_BUTTON)) device->seat_caps |= EVDEV_DEVICE_POINTER; if ((device->caps & EVDEV_KEYBOARD)) device->seat_caps |= EVDEV_DEVICE_KEYBOARD; diff --git a/src/evdev.h b/src/evdev.h index cc7a5e65..8cad57be 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -46,8 +46,7 @@ enum evdev_event_type { enum evdev_device_capability { EVDEV_KEYBOARD = (1 << 0), EVDEV_BUTTON = (1 << 1), - EVDEV_MOTION_ABS = (1 << 2), - EVDEV_TOUCH = (1 << 3), + EVDEV_TOUCH = (1 << 2), }; enum evdev_device_seat_capability {