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

udev: optionally pass the seat name into device_added()

Browse source 
Prep work for changing seat names on devices. No functional changes.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Peter Hutterer 2014-11-19 14:12:16 +10:00
parent 9f225f8ea5
commit 4c5e55a962
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/udev-seat.c
View file

@ -42,11 +42,13 @@ static struct udev_seat *
udev_seat_get_named(struct udev_input *input, const char *seat_name);
static int
device_added(struct udev_device *udev_device, struct udev_input *input)
device_added(struct udev_device *udev_device,
struct udev_input *input,
const char *seat_name)
{
struct evdev_device *device;
const char *devnode;
const char *device_seat, *seat_name, *output_name;
const char *device_seat, *output_name;
const char *calibration_values;
float calibration[6];
struct udev_seat *seat;
@ -61,7 +63,8 @@ device_added(struct udev_device *udev_device, struct udev_input *input)
devnode = udev_device_get_devnode(udev_device);
/* Search for matching logical seat */
seat_name = udev_device_get_property_value(udev_device, "WL_SEAT");
if (!seat_name)
seat_name = udev_device_get_property_value(udev_device, "WL_SEAT");
if (!seat_name)
seat_name = default_seat_name;
@ -161,7 +164,7 @@ udev_input_add_devices(struct udev_input *input, struct udev *udev)
continue;
}
if (device_added(device, input) < 0) {
if (device_added(device, input, NULL) < 0) {
udev_device_unref(device);
udev_enumerate_unref(e);
return -1;
@ -193,7 +196,7 @@ evdev_udev_handler(void *data)
goto out;
if (!strcmp(action, "add"))
device_added(udev_device, input);
device_added(udev_device, input, NULL);
else if (!strcmp(action, "remove"))
device_removed(udev_device, input);