diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2013-10-14 15:32:08 -0700 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2013-11-10 17:51:33 +0100 |
| commit | 3fc0ec1bc3694dabb70713d7c133659e0d0f7992 (patch) | |
| tree | e6a743d48268f2c9e1b194ca2d549326ad1743ea | |
| parent | 5d493ad6f452bcfd46270cdfe3b906cf4ffe9aca (diff) | |
evdev: Only init a pointer if the evdev device has a button
We used to test for abs | rel | button, which inits a pointer device for
a device with just rel or abs capabilities. We now make sure we have either
rel or abs as well as button.
| -rw-r--r-- | src/evdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/evdev.c b/src/evdev.c index e9235d9b..0bfe94d6 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -555,8 +555,8 @@ evdev_handle_device(struct evdev_device *device) static int evdev_configure_device(struct evdev_device *device) { - if ((device->caps & - (EVDEV_MOTION_ABS | EVDEV_MOTION_REL | EVDEV_BUTTON))) { + if ((device->caps & (EVDEV_MOTION_ABS | EVDEV_MOTION_REL)) && + (device->caps & EVDEV_BUTTON)) { weston_seat_init_pointer(device->seat); weston_log("input device %s, %s is a pointer caps =%s%s%s\n", device->devname, device->devnode, |