Changed backend to accept wl_display.

4 files changed, 11 insertions, 20 deletions

diff --git a/include/backend/drm/backend.h b/include/backend/drm/backend.h
index d6093bc2..8689c010 100644
--- a/include/backend/drm/backend.h
+++ b/include/backend/drm/backend.h
@@ -20,12 +20,7 @@ struct wlr_drm_backend {
 	int fd;
 	bool paused;
 
-	struct wl_event_loop *event_loop;
-
-	struct {
-		struct wl_event_source *drm;
-		struct wl_event_source *udev;
-	} event_src;
+	struct wl_event_source *drm_event;
 
 	struct {
 		struct wl_signal output_add;
@@ -33,17 +28,12 @@ struct wlr_drm_backend {
 		struct wl_signal output_render;
 	} signals;
 
-	list_t *outputs;
-
 	uint32_t taken_crtcs;
+	list_t *outputs;
 
 	struct wlr_drm_renderer renderer;
 	struct wlr_session *session;
 	struct wlr_udev udev;
 };
 
-struct wlr_drm_backend *wlr_drm_backend_init(struct wlr_session *session,
-	struct wl_listener *add, struct wl_listener *rem, struct wl_listener *render);
-void wlr_drm_backend_free(struct wlr_drm_backend *backend);
-
 #endif
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h
index 6c3bb49f..3373f024 100644
--- a/include/backend/drm/drm.h
+++ b/include/backend/drm/drm.h
@@ -21,8 +21,7 @@ struct wlr_drm_renderer {
 	struct wlr_egl egl;
 };
 
-bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer,
-		struct wlr_drm_backend *backend, int fd);
+bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer, int fd);
 void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer);
 
 enum wlr_drm_output_state {
@@ -62,6 +61,6 @@ void wlr_drm_output_begin(struct wlr_drm_output *out);
 void wlr_drm_output_end(struct wlr_drm_output *out);
 
 void wlr_drm_scan_connectors(struct wlr_drm_backend *backend);
-void wlr_drm_event(int fd);
+int wlr_drm_event(int fd, uint32_t mask, void *data);
 
 #endif
diff --git a/include/backend/drm/udev.h b/include/backend/drm/udev.h
index a09ee218..99c2c403 100644
--- a/include/backend/drm/udev.h
+++ b/include/backend/drm/udev.h
@@ -4,15 +4,18 @@
 #include <libudev.h>
 
 #include <wlr/session.h>
+#include <wayland-server.h>
 
 struct wlr_udev {
 	struct udev *udev;
 	struct udev_monitor *mon;
 	char *drm_path;
+
+	struct wl_event_source *event;
 };
 
 struct wlr_drm_backend;
-bool wlr_udev_init(struct wlr_drm_backend *backend);
+bool wlr_udev_init(struct wl_display *display, struct wlr_udev *udev);
 void wlr_udev_free(struct wlr_udev *udev);
 int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session);
 
diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h
index 13679782..d56c7e77 100644
--- a/include/wlr/backend/drm.h
+++ b/include/wlr/backend/drm.h
@@ -7,12 +7,11 @@
 struct wlr_drm_backend;
 struct wlr_drm_output;
 
-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);
 void wlr_drm_backend_free(struct wlr_drm_backend *backend);
 
-struct wl_event_loop *wlr_drm_backend_get_event_loop(struct wlr_drm_backend *backend);
-
 bool wlr_drm_output_modeset(struct wlr_drm_output *out, const char *str);
 void wlr_drm_output_begin(struct wlr_drm_output *out);
 void wlr_drm_output_end(struct wlr_drm_output *out);