From c95a108d2f68ec7a3325db418f9c2f32f6677f0b Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sat, 12 Aug 2017 13:51:47 -0400 Subject: [PATCH] Update libinput backend with new state design --- backend/libinput/backend.c | 100 +++++++++++++++++-------------------- backend/libinput/events.c | 48 +++++++++--------- backend/meson.build | 14 +++--- include/backend/libinput.h | 4 +- 4 files changed, 80 insertions(+), 86 deletions(-) diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c index 42c1eac9..0fa3aca7 100644 --- a/backend/libinput/backend.c +++ b/backend/libinput/backend.c @@ -8,14 +8,14 @@ #include "backend/libinput.h" static int wlr_libinput_open_restricted(const char *path, - int flags, void *_state) { - struct wlr_backend_state *state = _state; - return wlr_session_open_file(state->session, path); + int flags, void *_backend) { + struct wlr_libinput_backend *backend = _backend; + return wlr_session_open_file(backend->session, path); } -static void wlr_libinput_close_restricted(int fd, void *_state) { - struct wlr_backend_state *state = _state; - wlr_session_close_file(state->session, fd); +static void wlr_libinput_close_restricted(int fd, void *_backend) { + struct wlr_libinput_backend *backend = _backend; + wlr_session_close_file(backend->session, fd); } static const struct libinput_interface libinput_impl = { @@ -23,16 +23,16 @@ static const struct libinput_interface libinput_impl = { .close_restricted = wlr_libinput_close_restricted }; -static int wlr_libinput_readable(int fd, uint32_t mask, void *_state) { - struct wlr_backend_state *state = _state; - if (libinput_dispatch(state->libinput) != 0) { +static int wlr_libinput_readable(int fd, uint32_t mask, void *_backend) { + struct wlr_libinput_backend *backend = _backend; + if (libinput_dispatch(backend->libinput) != 0) { wlr_log(L_ERROR, "Failed to dispatch libinput"); // TODO: some kind of abort? return 0; } struct libinput_event *event; - while ((event = libinput_get_event(state->libinput))) { - wlr_libinput_event(state, event); + while ((event = libinput_get_event(backend->libinput))) { + wlr_libinput_event(backend, event); libinput_event_destroy(event); } return 0; @@ -43,34 +43,35 @@ static void wlr_libinput_log(struct libinput *libinput, _wlr_vlog(L_ERROR, fmt, args); } -static bool wlr_libinput_backend_init(struct wlr_backend_state *state) { +static bool wlr_libinput_backend_init(struct wlr_backend *_backend) { + struct wlr_libinput_backend *backend = (struct wlr_libinput_backend *)_backend; wlr_log(L_DEBUG, "Initializing libinput"); - state->libinput = libinput_udev_create_context(&libinput_impl, state, - state->udev->udev); - if (!state->libinput) { + backend->libinput = libinput_udev_create_context(&libinput_impl, backend, + backend->udev->udev); + if (!backend->libinput) { wlr_log(L_ERROR, "Failed to create libinput context"); return false; } // TODO: Let user customize seat used - if (libinput_udev_assign_seat(state->libinput, "seat0") != 0) { + if (libinput_udev_assign_seat(backend->libinput, "seat0") != 0) { wlr_log(L_ERROR, "Failed to assign libinput seat"); return false; } // TODO: More sophisticated logging - libinput_log_set_handler(state->libinput, wlr_libinput_log); - libinput_log_set_priority(state->libinput, LIBINPUT_LOG_PRIORITY_ERROR); + libinput_log_set_handler(backend->libinput, wlr_libinput_log); + libinput_log_set_priority(backend->libinput, LIBINPUT_LOG_PRIORITY_ERROR); struct wl_event_loop *event_loop = - wl_display_get_event_loop(state->display); - if (state->input_event) { - wl_event_source_remove(state->input_event); + wl_display_get_event_loop(backend->display); + if (backend->input_event) { + wl_event_source_remove(backend->input_event); } - state->input_event = wl_event_loop_add_fd(event_loop, - libinput_get_fd(state->libinput), WL_EVENT_READABLE, - wlr_libinput_readable, state); - if (!state->input_event) { + backend->input_event = wl_event_loop_add_fd(event_loop, + libinput_get_fd(backend->libinput), WL_EVENT_READABLE, + wlr_libinput_readable, backend); + if (!backend->input_event) { wlr_log(L_ERROR, "Failed to create input event on event loop"); return false; } @@ -78,22 +79,23 @@ static bool wlr_libinput_backend_init(struct wlr_backend_state *state) { return true; } -static void wlr_libinput_backend_destroy(struct wlr_backend_state *state) { - if (!state) { +static void wlr_libinput_backend_destroy(struct wlr_backend *_backend) { + if (!_backend) { return; } - for (size_t i = 0; i < state->devices->length; i++) { - list_t *wlr_devices = state->devices->items[i]; + struct wlr_libinput_backend *backend = (struct wlr_libinput_backend *)_backend; + for (size_t i = 0; i < backend->devices->length; i++) { + list_t *wlr_devices = backend->devices->items[i]; for (size_t j = 0; j < wlr_devices->length; j++) { struct wlr_input_device *wlr_device = wlr_devices->items[j]; - wl_signal_emit(&state->backend->events.input_remove, wlr_device); + wl_signal_emit(&backend->backend.events.input_remove, wlr_device); wlr_input_device_destroy(wlr_device); } list_free(wlr_devices); } - list_free(state->devices); - libinput_unref(state->libinput); - free(state); + list_free(backend->devices); + libinput_unref(backend->libinput); + free(backend); } static struct wlr_backend_impl backend_impl = { @@ -102,7 +104,7 @@ static struct wlr_backend_impl backend_impl = { }; static void session_signal(struct wl_listener *listener, void *data) { - struct wlr_backend_state *backend = wl_container_of(listener, backend, session_signal); + struct wlr_libinput_backend *backend = wl_container_of(listener, backend, session_signal); struct wlr_session *session = data; if (!backend->libinput) { @@ -120,35 +122,27 @@ struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display, struct wlr_session *session, struct wlr_udev *udev) { assert(display && session && udev); - struct wlr_backend_state *state = calloc(1, sizeof(struct wlr_backend_state)); - if (!state) { + struct wlr_libinput_backend *backend = calloc(1, sizeof(struct wlr_libinput_backend)); + if (!backend) { wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); return NULL; } + wlr_backend_create(&backend->backend, &backend_impl); - struct wlr_backend *backend = wlr_backend_create(&backend_impl, state); - if (!backend) { - wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); - goto error_state; - } - - if (!(state->devices = list_create())) { + if (!(backend->devices = list_create())) { wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); goto error_backend; } - state->backend = backend; - state->session = session; - state->udev = udev; - state->display = display; + backend->session = session; + backend->udev = udev; + backend->display = display; - state->session_signal.notify = session_signal; - wl_signal_add(&session->session_signal, &state->session_signal); + backend->session_signal.notify = session_signal; + wl_signal_add(&session->session_signal, &backend->session_signal); - return backend; -error_state: - free(state); + return &backend->backend; error_backend: - wlr_backend_destroy(backend); + free(backend); return NULL; } diff --git a/backend/libinput/events.c b/backend/libinput/events.c index aa5c315d..f4a8e50a 100644 --- a/backend/libinput/events.c +++ b/backend/libinput/events.c @@ -33,7 +33,7 @@ static struct wlr_input_device_impl input_device_impl = { }; static struct wlr_input_device *allocate_device( - struct wlr_backend_state *state, struct libinput_device *device, + struct wlr_libinput_backend *backend, struct libinput_device *device, list_t *devices, enum wlr_input_device_type type) { int vendor = libinput_device_get_id_vendor(device); int product = libinput_device_get_id_product(device); @@ -49,9 +49,9 @@ static struct wlr_input_device *allocate_device( return wlr_device; } -static void handle_device_added(struct wlr_backend_state *state, +static void handle_device_added(struct wlr_libinput_backend *backend, struct libinput_device *device) { - assert(state && device); + assert(backend && device); /* * Note: the wlr API exposes only devices with a single capability, because * that meshes better with how Wayland does things and is a bit simpler. @@ -65,34 +65,34 @@ static void handle_device_added(struct wlr_backend_state *state, wlr_log(L_DEBUG, "Added %s [%d:%d]", name, vendor, product); if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_KEYBOARD)) { - struct wlr_input_device *wlr_device = allocate_device(state, + struct wlr_input_device *wlr_device = allocate_device(backend, device, devices, WLR_INPUT_DEVICE_KEYBOARD); wlr_device->keyboard = wlr_libinput_keyboard_create(device); - wl_signal_emit(&state->backend->events.input_add, wlr_device); + wl_signal_emit(&backend->backend.events.input_add, wlr_device); } if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_POINTER)) { - struct wlr_input_device *wlr_device = allocate_device(state, + struct wlr_input_device *wlr_device = allocate_device(backend, device, devices, WLR_INPUT_DEVICE_POINTER); wlr_device->pointer = wlr_libinput_pointer_create(device); - wl_signal_emit(&state->backend->events.input_add, wlr_device); + wl_signal_emit(&backend->backend.events.input_add, wlr_device); } if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TOUCH)) { - struct wlr_input_device *wlr_device = allocate_device(state, + struct wlr_input_device *wlr_device = allocate_device(backend, device, devices, WLR_INPUT_DEVICE_TOUCH); wlr_device->touch = wlr_libinput_touch_create(device); - wl_signal_emit(&state->backend->events.input_add, wlr_device); + wl_signal_emit(&backend->backend.events.input_add, wlr_device); } if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TABLET_TOOL)) { - struct wlr_input_device *wlr_device = allocate_device(state, + struct wlr_input_device *wlr_device = allocate_device(backend, device, devices, WLR_INPUT_DEVICE_TABLET_TOOL); wlr_device->tablet_tool = wlr_libinput_tablet_tool_create(device); - wl_signal_emit(&state->backend->events.input_add, wlr_device); + wl_signal_emit(&backend->backend.events.input_add, wlr_device); } if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TABLET_PAD)) { - struct wlr_input_device *wlr_device = allocate_device(state, + struct wlr_input_device *wlr_device = allocate_device(backend, device, devices, WLR_INPUT_DEVICE_TABLET_PAD); wlr_device->tablet_pad = wlr_libinput_tablet_pad_create(device); - wl_signal_emit(&state->backend->events.input_add, wlr_device); + wl_signal_emit(&backend->backend.events.input_add, wlr_device); } if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_GESTURE)) { // TODO @@ -103,47 +103,47 @@ static void handle_device_added(struct wlr_backend_state *state, if (devices->length > 0) { libinput_device_set_user_data(device, devices); - list_add(state->devices, devices); + list_add(backend->devices, devices); } else { list_free(devices); } } -static void handle_device_removed(struct wlr_backend_state *state, +static void handle_device_removed(struct wlr_libinput_backend *backend, struct libinput_device *device) { list_t *devices = libinput_device_get_user_data(device); if (!devices) { return; } - for (size_t i = 0; i < devices->length; i++) { + for (size_t i = 0; i < devices->length; i++) { struct wlr_input_device *wlr_device = devices->items[i]; wlr_log(L_DEBUG, "Removing %s [%d:%d]", wlr_device->name, wlr_device->vendor, wlr_device->product); - wl_signal_emit(&state->backend->events.input_remove, wlr_device); + wl_signal_emit(&backend->backend.events.input_remove, wlr_device); wlr_input_device_destroy(wlr_device); } - for (size_t i = 0; i < state->devices->length; i++) { - if (state->devices->items[i] == devices) { - list_del(state->devices, i); + for (size_t i = 0; i < backend->devices->length; i++) { + if (backend->devices->items[i] == devices) { + list_del(backend->devices, i); break; } } list_free(devices); } -void wlr_libinput_event(struct wlr_backend_state *state, +void wlr_libinput_event(struct wlr_libinput_backend *backend, struct libinput_event *event) { - assert(state && event); + assert(backend && event); struct libinput *context = libinput_event_get_context(event); struct libinput_device *device = libinput_event_get_device(event); enum libinput_event_type event_type = libinput_event_get_type(event); (void)context; switch (event_type) { case LIBINPUT_EVENT_DEVICE_ADDED: - handle_device_added(state, device); + handle_device_added(backend, device); break; case LIBINPUT_EVENT_DEVICE_REMOVED: - handle_device_removed(state, device); + handle_device_removed(backend, device); break; case LIBINPUT_EVENT_KEYBOARD_KEY: handle_keyboard_key(event, device); diff --git a/backend/meson.build b/backend/meson.build index 44d7ba03..a8e13b99 100644 --- a/backend/meson.build +++ b/backend/meson.build @@ -10,13 +10,13 @@ backend_files = files( #'drm/drm-legacy.c', #'drm/drm-properties.c', #'drm/drm-util.c', - #'libinput/backend.c', - #'libinput/events.c', - #'libinput/keyboard.c', - #'libinput/pointer.c', - #'libinput/tablet_pad.c', - #'libinput/tablet_tool.c', - #'libinput/touch.c', + 'libinput/backend.c', + 'libinput/events.c', + 'libinput/keyboard.c', + 'libinput/pointer.c', + 'libinput/tablet_pad.c', + 'libinput/tablet_tool.c', + 'libinput/touch.c', 'multi/backend.c', 'wayland/backend.c', 'wayland/output.c', diff --git a/include/backend/libinput.h b/include/backend/libinput.h index 0a93e1f6..84914460 100644 --- a/include/backend/libinput.h +++ b/include/backend/libinput.h @@ -7,7 +7,7 @@ #include #include "backend/udev.h" -struct wlr_libinput_backend_state { +struct wlr_libinput_backend { struct wlr_backend backend; struct wlr_session *session; @@ -26,7 +26,7 @@ struct wlr_input_device_state { struct libinput_device *handle; }; -void wlr_libinput_event(struct wlr_backend_state *state, +void wlr_libinput_event(struct wlr_libinput_backend *state, struct libinput_event *event); struct wlr_input_device *get_appropriate_device(