From f5e8fa48f3cf6dc8522191bb56670503de41fa4c Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Thu, 23 Nov 2023 13:50:32 +0100
Subject: [PATCH] backend/libinput: drop wl_display argument

We can grab the event loop from the wlr_session instead.
---
 backend/backend.c              |  9 ++++-----
 backend/libinput/backend.c     | 18 ++----------------
 include/backend/libinput.h     |  2 --
 include/wlr/backend/libinput.h |  3 +--
 4 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/backend/backend.c b/backend/backend.c
index 0843d180..fbd7bd16 100644
--- a/backend/backend.c
+++ b/backend/backend.c
@@ -291,10 +291,9 @@ static struct wlr_backend *attempt_drm_backend(struct wl_display *display,
 #endif
 }
 
-static struct wlr_backend *attempt_libinput_backend(struct wl_display *display,
-		struct wlr_session *session) {
+static struct wlr_backend *attempt_libinput_backend(struct wlr_session *session) {
 #if WLR_HAS_LIBINPUT_BACKEND
-	return wlr_libinput_backend_create(display, session);
+	return wlr_libinput_backend_create(session);
 #else
 	wlr_log(WLR_ERROR, "Cannot create libinput backend: disabled at compile-time");
 	return NULL;
@@ -322,7 +321,7 @@ static bool attempt_backend_by_name(struct wl_display *display,
 		}
 
 		if (strcmp(name, "libinput") == 0) {
-			backend = attempt_libinput_backend(display, *session_ptr);
+			backend = attempt_libinput_backend(*session_ptr);
 		} else {
 			// attempt_drm_backend() adds the multi drm backends itself
 			return attempt_drm_backend(display, multi, *session_ptr) != NULL;
@@ -415,7 +414,7 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display,
 		goto error;
 	}
 
-	struct wlr_backend *libinput = attempt_libinput_backend(display, session);
+	struct wlr_backend *libinput = attempt_libinput_backend(session);
 	if (libinput) {
 		wlr_multi_backend_add(multi, libinput);
 		if (!auto_backend_monitor_create(multi, libinput)) {
diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c
index 35a86583..97f17244 100644
--- a/backend/libinput/backend.c
+++ b/backend/libinput/backend.c
@@ -115,12 +115,10 @@ static bool backend_start(struct wlr_backend *wlr_backend) {
 		}
 	}
 
-	struct wl_event_loop *event_loop =
-		wl_display_get_event_loop(backend->display);
 	if (backend->input_event) {
 		wl_event_source_remove(backend->input_event);
 	}
-	backend->input_event = wl_event_loop_add_fd(event_loop, libinput_fd,
+	backend->input_event = wl_event_loop_add_fd(backend->session->event_loop, libinput_fd,
 			WL_EVENT_READABLE, handle_libinput_readable, backend);
 	if (!backend->input_event) {
 		wlr_log(WLR_ERROR, "Failed to create input event on event loop");
@@ -144,7 +142,6 @@ static void backend_destroy(struct wlr_backend *wlr_backend) {
 
 	wlr_backend_finish(wlr_backend);
 
-	wl_list_remove(&backend->display_destroy.link);
 	wl_list_remove(&backend->session_destroy.link);
 	wl_list_remove(&backend->session_signal.link);
 
@@ -186,14 +183,7 @@ static void handle_session_destroy(struct wl_listener *listener, void *data) {
 	backend_destroy(&backend->backend);
 }
 
-static void handle_display_destroy(struct wl_listener *listener, void *data) {
-	struct wlr_libinput_backend *backend =
-		wl_container_of(listener, backend, display_destroy);
-	backend_destroy(&backend->backend);
-}
-
-struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display,
-		struct wlr_session *session) {
+struct wlr_backend *wlr_libinput_backend_create(struct wlr_session *session) {
 	struct wlr_libinput_backend *backend = calloc(1, sizeof(*backend));
 	if (!backend) {
 		wlr_log(WLR_ERROR, "Allocation failed: %s", strerror(errno));
@@ -204,7 +194,6 @@ struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display,
 	wl_list_init(&backend->devices);
 
 	backend->session = session;
-	backend->display = display;
 
 	backend->session_signal.notify = session_signal;
 	wl_signal_add(&session->events.active, &backend->session_signal);
@@ -212,9 +201,6 @@ struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display,
 	backend->session_destroy.notify = handle_session_destroy;
 	wl_signal_add(&session->events.destroy, &backend->session_destroy);
 
-	backend->display_destroy.notify = handle_display_destroy;
-	wl_display_add_destroy_listener(display, &backend->display_destroy);
-
 	return &backend->backend;
 }
 
diff --git a/include/backend/libinput.h b/include/backend/libinput.h
index 73a52754..2b8babb4 100644
--- a/include/backend/libinput.h
+++ b/include/backend/libinput.h
@@ -18,12 +18,10 @@ struct wlr_libinput_backend {
 	struct wlr_backend backend;
 
 	struct wlr_session *session;
-	struct wl_display *display;
 
 	struct libinput *libinput_context;
 	struct wl_event_source *input_event;
 
-	struct wl_listener display_destroy;
 	struct wl_listener session_destroy;
 	struct wl_listener session_signal;
 
diff --git a/include/wlr/backend/libinput.h b/include/wlr/backend/libinput.h
index 83d281f9..663f71ac 100644
--- a/include/wlr/backend/libinput.h
+++ b/include/wlr/backend/libinput.h
@@ -16,8 +16,7 @@
 
 struct wlr_input_device;
 
-struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display,
-		struct wlr_session *session);
+struct wlr_backend *wlr_libinput_backend_create(struct wlr_session *session);
 /**
  * Gets the underlying struct libinput_device handle for the given input device.
  */