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

launcher: add weston_launcher_close() dummy

Browse source 
If you request a device via weston_launcher_open(), you should now release
it via weston_launcher_close() instead of close(). This is currently not
needed but will be required for logind devices.
This commit is contained in:
David Herrmann 2013-10-22 00:28:08 +02:00 • committed by Jonas Ådahl
parent d26428475a
commit facf1dd264
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/udev-seat.c
View file

@ -83,11 +83,11 @@ device_added(struct udev_device *udev_device, struct udev_input *input)
device = evdev_device_create(&seat->base, devnode, fd);
if (device == EVDEV_UNHANDLED_DEVICE) {
close(fd);
weston_launcher_close(c->launcher, fd);
weston_log("not using input device '%s'.\n", devnode);
return 0;
} else if (device == NULL) {
close(fd);
weston_launcher_close(c->launcher, fd);
weston_log("failed to create input device '%s'.\n", devnode);
return 0;
}
@ -219,9 +219,11 @@ evdev_udev_handler(int fd, uint32_t mask, void *data)
if (!strcmp(device->devnode, devnode)) {
weston_log("input device %s, %s removed\n",
device->devname, device->devnode);
weston_launcher_close(input->compositor->launcher,
device->fd);
evdev_device_destroy(device);
break;
}
break;
}
}
}
@ -278,8 +280,11 @@ udev_input_remove_devices(struct udev_input *input)
struct udev_seat *seat;
wl_list_for_each(seat, &input->compositor->seat_list, base.link) {
wl_list_for_each_safe(device, next, &seat->devices_list, link)
wl_list_for_each_safe(device, next, &seat->devices_list, link) {
weston_launcher_close(input->compositor->launcher,
device->fd);
evdev_device_destroy(device);
}
if (seat->base.keyboard)
notify_keyboard_focus_out(&seat->base);