mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evdev: Replace EVDEV_MOTION_ABS with local has_abs flag

Browse Source
This commit is contained in:
Kristian Høgsberg
2013-12-16 13:55:48 -08:00
parent 8d31a3ae56
commit b7c58de8f6
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/evdev.c
+2 -5
View File
@@ -471,14 +471,12 @@ evdev_configure_device(struct evdev_device *device)
ioctl(device->fd, EVIOCGABS(ABS_X), &absinfo); ioctl(device->fd, EVIOCGABS(ABS_X), &absinfo);
device->abs.min_x = absinfo.minimum; device->abs.min_x = absinfo.minimum;
device->abs.max_x = absinfo.maximum; device->abs.max_x = absinfo.maximum;
device->caps |= EVDEV_MOTION_ABS;
has_abs = 1; has_abs = 1;
} }
if (TEST_BIT(abs_bits, ABS_Y)) { if (TEST_BIT(abs_bits, ABS_Y)) {
ioctl(device->fd, EVIOCGABS(ABS_Y), &absinfo); ioctl(device->fd, EVIOCGABS(ABS_Y), &absinfo);
device->abs.min_y = absinfo.minimum; device->abs.min_y = absinfo.minimum;
device->abs.max_y = absinfo.maximum; device->abs.max_y = absinfo.maximum;
device->caps |= EVDEV_MOTION_ABS;
has_abs = 1; has_abs = 1;
} }
/* We only handle the slotted Protocol B in weston. /* We only handle the slotted Protocol B in weston.
@@ -565,13 +563,12 @@ evdev_configure_device(struct evdev_device *device)
return 0; return 0;
} }
if (((device->caps & EVDEV_MOTION_ABS) || has_rel) && if ((has_abs || has_rel) && (device->caps & EVDEV_BUTTON)) {
(device->caps & EVDEV_BUTTON)) {
weston_seat_init_pointer(device->seat); weston_seat_init_pointer(device->seat);
device->seat_caps |= EVDEV_SEAT_POINTER; device->seat_caps |= EVDEV_SEAT_POINTER;
weston_log("input device %s, %s is a pointer caps =%s%s%s\n", weston_log("input device %s, %s is a pointer caps =%s%s%s\n",
device->devname, device->devnode, device->devname, device->devnode,
device->caps & EVDEV_MOTION_ABS ? " absolute-motion" : "", has_abs ? " absolute-motion" : "",
has_rel ? " relative-motion": "", has_rel ? " relative-motion": "",
device->caps & EVDEV_BUTTON ? " button" : ""); device->caps & EVDEV_BUTTON ? " button" : "");
} }
src/evdev.h
+1 -2
View File
@@ -44,8 +44,7 @@ enum evdev_event_type {
enum evdev_device_capability { enum evdev_device_capability {
EVDEV_KEYBOARD = (1 << 0), EVDEV_KEYBOARD = (1 << 0),
EVDEV_BUTTON = (1 << 1), EVDEV_BUTTON = (1 << 1),
EVDEV_MOTION_ABS = (1 << 2), EVDEV_TOUCH = (1 << 2),
EVDEV_TOUCH = (1 << 3),
}; };
enum evdev_device_seat_capability { enum evdev_device_seat_capability {