From: Kristian Høgsberg <krh@bitplanet.net>
Date: Mon, 14 Oct 2013 22:32:08 +0000 (-0700)
Subject: evdev: Only init a pointer if the evdev device has a button
X-Git-Tag: 0.1.0~163^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3fc0ec1bc3694dabb70713d7c133659e0d0f7992;p=platform%2Fupstream%2Flibinput.git

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.
---

diff --git a/src/evdev.c b/src/evdev.c
index e9235d9..0bfe94d 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,