Changed backend to accept wl_display.

1 files changed, 27 insertions, 26 deletions

diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index 03e34d97..5d72d9dc 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <wayland-server.h>
 
 #include <wlr/session.h>
 #include <wlr/common/list.h>
@@ -12,9 +13,10 @@
 #include "backend/drm/udev.h"
 #include "common/log.h"
 
-struct wlr_drm_backend *wlr_drm_backend_init(struct wlr_session *session,
-	struct wl_listener *add, struct wl_listener *rem, struct wl_listener *render)
-{
+struct wlr_drm_backend *wlr_drm_backend_init(struct wl_display *display,
+	struct wlr_session *session, struct wl_listener *add, struct wl_listener *rem,
+	struct wl_listener *render) {
+
 	struct wlr_drm_backend *backend = calloc(1, sizeof *backend);
 	if (!backend) {
 		wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
@@ -29,15 +31,9 @@ struct wlr_drm_backend *wlr_drm_backend_init(struct wlr_session *session,
 		goto error_backend;
 	}
 
-	backend->event_loop = wl_event_loop_create();
-	if (!backend->event_loop) {
-		wlr_log(L_ERROR, "Failed to create event loop");
-		goto error_list;
-	}
-
-	if (!wlr_udev_init(backend)) {
+	if (!wlr_udev_init(display, &backend->udev)) {
 		wlr_log(L_ERROR, "Failed to start udev");
-		goto error_loop;
+		goto error_list;
 	}
 
 	backend->fd = wlr_udev_find_gpu(&backend->udev, backend->session);
@@ -46,32 +42,44 @@ struct wlr_drm_backend *wlr_drm_backend_init(struct wlr_session *session,
 		goto error_udev;
 	}
 
-	if (!wlr_drm_renderer_init(&backend->renderer, backend, backend->fd)) {
-		wlr_log(L_ERROR, "Failed to initialize renderer");
+	struct wl_event_loop *event_loop = wl_display_get_event_loop(display);
+
+	backend->drm_event = wl_event_loop_add_fd(event_loop, backend->fd,
+		WL_EVENT_READABLE, wlr_drm_event, NULL);
+	if (!backend->drm_event) {
+		wlr_log(L_ERROR, "Failed to create DRM event source");
 		goto error_fd;
 	}
 
+	if (!wlr_drm_renderer_init(&backend->renderer, backend->fd)) {
+		wlr_log(L_ERROR, "Failed to initialize renderer");
+		goto error_event;
+	}
+
 	wl_signal_init(&backend->signals.output_add);
 	wl_signal_init(&backend->signals.output_rem);
 	wl_signal_init(&backend->signals.output_render);
 
-	if (add)
+	if (add) {
 		wl_signal_add(&backend->signals.output_add, add);
-	if (rem)
+	}
+	if (rem) {
 		wl_signal_add(&backend->signals.output_rem, rem);
-	if (render)
+	}
+	if (render) {
 		wl_signal_add(&backend->signals.output_render, render);
+	}
 
 	wlr_drm_scan_connectors(backend);
 
 	return backend;
 
+error_event:
+	wl_event_source_remove(backend->drm_event);
 error_fd:
 	wlr_session_close_file(backend->session, backend->fd);
 error_udev:
 	wlr_udev_free(&backend->udev);
-error_loop:
-	wl_event_loop_destroy(backend->event_loop);
 error_list:
 	list_free(backend->outputs);
 error_backend:
@@ -98,15 +106,8 @@ void wlr_drm_backend_free(struct wlr_drm_backend *backend)
 	wlr_session_close_file(backend->session, backend->fd);
 	wlr_session_finish(backend->session);
 
-	wl_event_source_remove(backend->event_src.drm);
-	wl_event_source_remove(backend->event_src.udev);
-	wl_event_loop_destroy(backend->event_loop);
+	wl_event_source_remove(backend->drm_event);
 
 	list_free(backend->outputs);
 	free(backend);
 }
-
-struct wl_event_loop *wlr_drm_backend_get_event_loop(struct wlr_drm_backend *backend)
-{
-	return backend->event_loop;
-}