libinput_seat_unref(&seat->base);
if (device == EVDEV_UNHANDLED_DEVICE) {
- log_info("not using input device '%s'.\n", devnode);
+ log_info(&input->base, "not using input device '%s'.\n", devnode);
return 0;
} else if (device == NULL) {
- log_info("failed to create input device '%s'.\n", devnode);
+ log_info(&input->base, "failed to create input device '%s'.\n", devnode);
return 0;
}
&device->abs.calibration[4],
&device->abs.calibration[5]) == 6) {
device->abs.apply_calibration = 1;
- log_info("Applying calibration: %f %f %f %f %f %f\n",
+ log_info(&input->base,
+ "Applying calibration: %f %f %f %f %f %f\n",
device->abs.calibration[0],
device->abs.calibration[1],
device->abs.calibration[2],
list_for_each_safe(device, next,
&seat->base.devices_list, base.link) {
if (!strcmp(device->devnode, devnode)) {
- log_info("input device %s, %s removed\n",
+ log_info(&input->base,
+ "input device %s, %s removed\n",
device->devname, device->devnode);
evdev_device_remove(device);
break;
}
}
-
static void
udev_input_disable(struct libinput *libinput)
{
input->udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
if (!input->udev_monitor) {
- log_info("udev: failed to create the udev monitor\n");
+ log_info(libinput,
+ "udev: failed to create the udev monitor\n");
return -1;
}
"input", NULL);
if (udev_monitor_enable_receiving(input->udev_monitor)) {
- log_info("udev: failed to bind the udev monitor\n");
+ log_info(libinput, "udev: failed to bind the udev monitor\n");
udev_monitor_unref(input->udev_monitor);
input->udev_monitor = NULL;
return -1;
if (libinput_init(&input->base, interface,
&interface_backend, user_data) != 0) {
+ libinput_unref(&input->base);
free(input);
return NULL;
}
return -1;
if (libinput->interface_backend != &interface_backend) {
- log_bug_client("Mismatching backends.\n");
+ log_bug_client(libinput, "Mismatching backends.\n");
return -1;
}
return 0;
}
-
-LIBINPUT_EXPORT struct libinput *
-libinput_udev_create_for_seat(const struct libinput_interface *interface,
- void *user_data,
- struct udev *udev,
- const char *seat_id)
-{
- struct libinput *libinput;
-
- if (!interface || !udev || !seat_id)
- return NULL;
-
- libinput = libinput_udev_create_context(interface, user_data, udev);
- if (!libinput)
- return NULL;
-
- if (libinput_udev_assign_seat(libinput, seat_id) != 0) {
- libinput_destroy(libinput);
- libinput = NULL;
- }
-
- return libinput;
-}