hyprwm
/
wlroots-hyprland
mirror of https://github.com/hyprwm/wlroots-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

backend/libinput: stop using wlr_list internally

This commit is contained in:
Simon Ser 2021-07-01 10:08:56 +02:00 committed by Simon Zeni
parent a6ed4ae308
commit e6cb11d882
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backend/libinput/backend.c
View File

@ -110,9 +110,9 @@ static bool backend_start(struct wlr_backend *wlr_backend) {
no_devs = NULL; no_devs = NULL;
} }
} }
if (!no_devs && backend->wlr_device_lists.length == 0) { if (!no_devs && backend->wlr_device_lists.size == 0) {
handle_libinput_readable(libinput_fd, WL_EVENT_READABLE, backend); handle_libinput_readable(libinput_fd, WL_EVENT_READABLE, backend);
if (backend->wlr_device_lists.length == 0) { if (backend->wlr_device_lists.size == 0) {
wlr_log(WLR_ERROR, "libinput initialization failed, no input devices"); wlr_log(WLR_ERROR, "libinput initialization failed, no input devices");
wlr_log(WLR_ERROR, "Set WLR_LIBINPUT_NO_DEVICES=1 to suppress this check"); wlr_log(WLR_ERROR, "Set WLR_LIBINPUT_NO_DEVICES=1 to suppress this check");
return false; return false;
@ -141,8 +141,8 @@ static void backend_destroy(struct wlr_backend *wlr_backend) {
struct wlr_libinput_backend *backend = struct wlr_libinput_backend *backend =
get_libinput_backend_from_backend(wlr_backend); get_libinput_backend_from_backend(wlr_backend);
for (size_t i = 0; i < backend->wlr_device_lists.length; i++) { struct wl_list *wlr_devices;
struct wl_list *wlr_devices = backend->wlr_device_lists.items[i]; wl_array_for_each(wlr_devices, &backend->wlr_device_lists) {
struct wlr_input_device *wlr_dev, *next; struct wlr_input_device *wlr_dev, *next;
wl_list_for_each_safe(wlr_dev, next, wlr_devices, link) { wl_list_for_each_safe(wlr_dev, next, wlr_devices, link) {
wlr_input_device_destroy(wlr_dev); wlr_input_device_destroy(wlr_dev);
@ -156,7 +156,7 @@ static void backend_destroy(struct wlr_backend *wlr_backend) {
wl_list_remove(&backend->session_destroy.link); wl_list_remove(&backend->session_destroy.link);
wl_list_remove(&backend->session_signal.link); wl_list_remove(&backend->session_signal.link);
wlr_list_finish(&backend->wlr_device_lists); wl_array_release(&backend->wlr_device_lists);
if (backend->input_event) { if (backend->input_event) {
wl_event_source_remove(backend->input_event); wl_event_source_remove(backend->input_event);
} }
@ -211,10 +211,7 @@ struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display,
} }
wlr_backend_init(&backend->backend, &backend_impl); wlr_backend_init(&backend->backend, &backend_impl);
if (!wlr_list_init(&backend->wlr_device_lists)) { wl_array_init(&backend->wlr_device_lists);
wlr_log(WLR_ERROR, "Allocation failed: %s", strerror(errno));
goto error_backend;
}
backend->session = session; backend->session = session;
backend->display = display; backend->display = display;
@ -229,9 +226,6 @@ struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display,
wl_display_add_destroy_listener(display, &backend->display_destroy); wl_display_add_destroy_listener(display, &backend->display_destroy);
return &backend->backend; return &backend->backend;
error_backend:
free(backend);
return NULL;
} }
struct libinput_device *wlr_libinput_get_device_handle( struct libinput_device *wlr_libinput_get_device_handle(

18
backend/libinput/events.c
View File

@ -7,6 +7,7 @@
#include <wlr/interfaces/wlr_input_device.h> #include <wlr/interfaces/wlr_input_device.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "backend/libinput.h" #include "backend/libinput.h"
#include "util/array.h"
#include "util/signal.h" #include "util/signal.h"
static struct wlr_libinput_input_device *get_libinput_device_from_device( static struct wlr_libinput_input_device *get_libinput_device_from_device(
@ -183,8 +184,13 @@ static void handle_device_added(struct wlr_libinput_backend *backend,
} }
if (!wl_list_empty(wlr_devices)) { if (!wl_list_empty(wlr_devices)) {
struct wl_list **dst = wl_array_add(&backend->wlr_device_lists, sizeof(wlr_devices));
if (!dst) {
goto fail;
}
*dst = wlr_devices;
libinput_device_set_user_data(libinput_dev, wlr_devices); libinput_device_set_user_data(libinput_dev, wlr_devices);
wlr_list_push(&backend->wlr_device_lists, wlr_devices);
} else { } else {
free(wlr_devices); free(wlr_devices);
} }
@ -213,11 +219,15 @@ static void handle_device_removed(struct wlr_libinput_backend *backend,
wl_list_for_each_safe(dev, tmp_dev, wlr_devices, link) { wl_list_for_each_safe(dev, tmp_dev, wlr_devices, link) {
wlr_input_device_destroy(dev); wlr_input_device_destroy(dev);
} }
for (size_t i = 0; i < backend->wlr_device_lists.length; i++) { size_t i = 0;
if (backend->wlr_device_lists.items[i] == wlr_devices) { struct wl_list *iter;
wlr_list_del(&backend->wlr_device_lists, i); wl_array_for_each(iter, &backend->wlr_device_lists) {
if (iter == wlr_devices) {
array_remove_at(&backend->wlr_device_lists,
i * sizeof(struct wl_list *), sizeof(struct wl_list *));
break; break;
} }
i++;
} }
free(wlr_devices); free(wlr_devices);
} }

3
include/backend/libinput.h
View File

@ -7,7 +7,6 @@
#include <wlr/backend/libinput.h> #include <wlr/backend/libinput.h>
#include <wlr/interfaces/wlr_input_device.h> #include <wlr/interfaces/wlr_input_device.h>
#include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_input_device.h>
#include <wlr/types/wlr_list.h>
struct wlr_libinput_backend { struct wlr_libinput_backend {
struct wlr_backend backend; struct wlr_backend backend;
@ -22,7 +21,7 @@ struct wlr_libinput_backend {
struct wl_listener session_destroy; struct wl_listener session_destroy;
struct wl_listener session_signal; struct wl_listener session_signal;
struct wlr_list wlr_device_lists; // list of struct wl_list struct wl_array wlr_device_lists; // struct wl_list *
}; };
struct wlr_libinput_input_device { struct wlr_libinput_input_device {