fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-08 17:08:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

evdev: Combine evdev_handle_device() and evdev_configure_device()

Browse source 
We split the device probing and idenfication somewhat arbitrarily between
these two functions.  This commit combines them into one.  Return of -1
indicates error, 0 success, but succesful probing can return a device
with device->caps == 0, which means we don't handle the device.
This commit is contained in:
Kristian Høgsberg 2013-12-16 11:01:56 -08:00 • committed by Jonas Ådahl
parent e13d0c8248
commit a5db876938
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/evdev.c
View file

@ -466,7 +466,7 @@ evdev_device_dispatch(void *data)
} }
static int static int
evdev_handle_device(struct evdev_device *device) evdev_configure_device(struct evdev_device *device)
{ {
struct input_absinfo absinfo; struct input_absinfo absinfo;
unsigned long ev_bits[NBITS(EV_MAX)]; unsigned long ev_bits[NBITS(EV_MAX)];
@ -527,6 +527,7 @@ evdev_handle_device(struct evdev_device *device)
device->mtdev = mtdev_new_open(device->fd); device->mtdev = mtdev_new_open(device->fd);
if (!device->mtdev) { if (!device->mtdev) {
/* mtdev required but failed to open. */ /* mtdev required but failed to open. */
device->caps = 0;
return 0; return 0;
} }
device->mt.slot = device->mtdev->caps.slot.value; device->mt.slot = device->mtdev->caps.slot.value;
@ -579,15 +580,10 @@ evdev_handle_device(struct evdev_device *device)
* want to adjust the protocol later adding a proper event for dealing * want to adjust the protocol later adding a proper event for dealing
* with accelerometers and implement here accordingly */ * with accelerometers and implement here accordingly */
if (has_abs && !has_key && !device->is_mt) { if (has_abs && !has_key && !device->is_mt) {
device->caps = 0;
return 0; return 0;
} }
return 1;
}
static void
evdev_configure_device(struct evdev_device *device)
{
if ((device->caps & (EVDEV_MOTION_ABS | EVDEV_MOTION_REL)) && if ((device->caps & (EVDEV_MOTION_ABS | EVDEV_MOTION_REL)) &&
(device->caps & EVDEV_BUTTON)) (device->caps & EVDEV_BUTTON))
device->seat_caps |= EVDEV_DEVICE_POINTER; device->seat_caps |= EVDEV_DEVICE_POINTER;
@ -595,6 +591,8 @@ evdev_configure_device(struct evdev_device *device)
device->seat_caps |= EVDEV_DEVICE_KEYBOARD; device->seat_caps |= EVDEV_DEVICE_KEYBOARD;
if ((device->caps & EVDEV_TOUCH)) if ((device->caps & EVDEV_TOUCH))
device->seat_caps |= EVDEV_DEVICE_TOUCH; device->seat_caps |= EVDEV_DEVICE_TOUCH;
return 0;
} }
static void static void
@ -646,13 +644,14 @@ evdev_device_create(struct libinput_seat *seat,
devname[sizeof(devname) - 1] = '\0'; devname[sizeof(devname) - 1] = '\0';
device->devname = strdup(devname); device->devname = strdup(devname);
if (!evdev_handle_device(device)) { if (evdev_configure_device(device) == -1)
goto err;
if (device->seat_caps == 0) {
evdev_device_destroy(device); evdev_device_destroy(device);
return NULL; return NULL;
} }
evdev_configure_device(device);
/* If the dispatch was not set up use the fallback. */ /* If the dispatch was not set up use the fallback. */
if (device->dispatch == NULL) if (device->dispatch == NULL)
device->dispatch = fallback_dispatch_create(); device->dispatch = fallback_dispatch_create();