hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-23 05:15:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

libinput: fail if no input found on init

Browse source 
This runs through events pending at init on initialization so we can
tell if some devices are available.

Note that with the way wlr_device_lists is managed, this checks that
there is at least one device we handle - it doesn't have to be a
keyboard, but there is at least a mouse or tablet_pad or something
that we care about.

Instead of failing inconditionally it might be better to leave the
decision to the user, e.g. add a "backend_has_devices" function to
call later.

(Tested by moving /dev/input off)

Fixes #24.
This commit is contained in:
Dominique Martinet 2017-08-16 08:48:03 +02:00
parent 19d6442f52
commit 880c239657
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
backend/libinput/backend.c
View file

@ -63,14 +63,22 @@ static bool wlr_libinput_backend_start(struct wlr_backend *_backend) {
libinput_log_set_handler(backend->libinput_context, wlr_libinput_log); libinput_log_set_handler(backend->libinput_context, wlr_libinput_log);
libinput_log_set_priority(backend->libinput_context, LIBINPUT_LOG_PRIORITY_ERROR); libinput_log_set_priority(backend->libinput_context, LIBINPUT_LOG_PRIORITY_ERROR);
int libinput_fd = libinput_get_fd(backend->libinput_context);
if (backend->wlr_device_lists->length == 0) {
wlr_libinput_readable(libinput_fd, WL_EVENT_READABLE, backend);
if (backend->wlr_device_lists->length == 0) {
wlr_log(L_ERROR, "No input device found, failing initialization");
return false;
}
}
struct wl_event_loop *event_loop = struct wl_event_loop *event_loop =
wl_display_get_event_loop(backend->display); wl_display_get_event_loop(backend->display);
if (backend->input_event) { if (backend->input_event) {
wl_event_source_remove(backend->input_event); wl_event_source_remove(backend->input_event);
} }
backend->input_event = wl_event_loop_add_fd(event_loop, backend->input_event = wl_event_loop_add_fd(event_loop, libinput_fd,
libinput_get_fd(backend->libinput_context), WL_EVENT_READABLE, WL_EVENT_READABLE, wlr_libinput_readable, backend);
wlr_libinput_readable, backend);
if (!backend->input_event) { if (!backend->input_event) {
wlr_log(L_ERROR, "Failed to create input event on event loop"); wlr_log(L_ERROR, "Failed to create input event on event loop");
return false; return false;