mirror of
https://git.freebsd.org/ports.git
synced 2025-06-13 16:50:29 -04:00
acd1ae3a87
Update x11/libinput to 1.6.1 Changelogs: https://lists.freedesktop.org/archives/wayland-devel/2020-August/041578.html https://lists.freedesktop.org/archives/wayland-devel/2020-August/041590.html PR: 249553 Reported by: jbeich (similar patch) Obtained from: FreeBSD Graphics Team git repo https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/input
37 lines
1.3 KiB
C
37 lines
1.3 KiB
C
When a process without full /dev/input access enumerates devices via libudev-devd,
|
|
the udev_device structs do not get udev properties that mark them as inputs, keyboards, etc,
|
|
and get rejected as not being input devices.
|
|
|
|
libinput reopens devices just to check path equality.
|
|
The udev_devices from reopening do have the right properties,
|
|
so we just use them instead of the original (enumerated) ones.
|
|
|
|
--- src/evdev.c.orig 2020-07-15 01:54:15 UTC
|
|
+++ src/evdev.c
|
|
@@ -1015,7 +1015,7 @@ evdev_sync_device(struct evdev_device *device)
|
|
evdev_device_dispatch_one(device, &ev);
|
|
} while (rc == LIBEVDEV_READ_STATUS_SYNC);
|
|
|
|
- return rc == -EAGAIN ? 0 : rc;
|
|
+ return (rc == -EAGAIN || rc == -EINVAL)? 0 : rc;
|
|
}
|
|
|
|
static inline void
|
|
@@ -1083,6 +1083,17 @@ evdev_device_dispatch(void *data)
|
|
|
|
if (rc != -EAGAIN && rc != -EINTR) {
|
|
libinput_remove_source(libinput, device->source);
|
|
+ /*
|
|
+ * Dirty hack to allow cuse-based evdev backends to release
|
|
+ * character device file when device has been detached
|
|
+ * but still have it descriptor opened.
|
|
+ * Issuing evdev_device_suspend() here leads to SIGSEGV
|
|
+ */
|
|
+ int dummy_fd = open("/dev/null", O_RDONLY | O_CLOEXEC);
|
|
+ if (dummy_fd >= 0) {
|
|
+ dup2(dummy_fd, device->fd);
|
|
+ close(dummy_fd);
|
|
+ }
|
|
device->source = NULL;
|
|
}
|
|
}
|