From 63792b38e46ae1741a6492d3c0183cb9566e4c9f Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 11 Aug 2023 19:28:07 +0200 Subject: backend/session: take wl_event_loop instead of wl_display wl_display holds a lot more than wlr_session needs: wlr_session only needs to wait for a FD to become readable, but wl_display provides full access to the Wayland client and protocol objects. Switch to wl_event_loop to better reflect the above. --- include/backend/drm/monitor.h | 3 ++- include/wlr/backend/session.h | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/backend/drm/monitor.h b/include/backend/drm/monitor.h index 51817193..bf5bda2d 100644 --- a/include/backend/drm/monitor.h +++ b/include/backend/drm/monitor.h @@ -10,6 +10,7 @@ struct wlr_drm_backend_monitor { struct wlr_backend *multi; struct wlr_backend *primary_drm; struct wlr_session *session; + struct wl_display *display; struct wl_listener multi_destroy; struct wl_listener primary_drm_destroy; @@ -19,6 +20,6 @@ struct wlr_drm_backend_monitor { struct wlr_drm_backend_monitor *drm_backend_monitor_create( struct wlr_backend *multi, struct wlr_backend *primary_drm, - struct wlr_session *session); + struct wlr_session *session, struct wl_display *display); #endif diff --git a/include/wlr/backend/session.h b/include/wlr/backend/session.h index 3583b317..b61de852 100644 --- a/include/wlr/backend/session.h +++ b/include/wlr/backend/session.h @@ -42,8 +42,8 @@ struct wlr_session { struct wl_list devices; - struct wl_display *display; - struct wl_listener display_destroy; + struct wl_event_loop *event_loop; + struct wl_listener event_loop_destroy; struct { struct wl_signal active; @@ -80,7 +80,7 @@ struct wlr_device_change_event { * * Returns NULL on error. */ -struct wlr_session *wlr_session_create(struct wl_display *disp); +struct wlr_session *wlr_session_create(struct wl_event_loop *loop); /* * Closes a previously opened session and restores the virtual terminal. -- cgit v1.2.3