diff options
| author | Simon Ser <contact@emersion.fr> | 2023-08-12 08:37:08 +0200 |
|---|---|---|
| committer | Isaac Freund <mail@isaacfreund.com> | 2023-11-23 11:39:25 +0000 |
| commit | d61ec694b352c0f21c06958c5ef0417f3e424e3c (patch) | |
| tree | ac9c486568c87c79a076ec2abdc69e8c6f4b4893 /backend | |
| parent | d23d8ed3ba4d56d3dc33a4ccc77c16b68f716f2d (diff) | |
output: take wl_event_loop in wlr_output_init()
We don't need the whole wl_display here anymore. The wl_event_loop
is enough.
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/drm/drm.c | 2 | ||||
| -rw-r--r-- | backend/headless/output.c | 3 | ||||
| -rw-r--r-- | backend/wayland/output.c | 2 | ||||
| -rw-r--r-- | backend/x11/output.c | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 5fbcf32f..5d901352 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -1467,7 +1467,7 @@ static bool connect_drm_connector(struct wlr_drm_connector *wlr_conn, free(current_modeinfo); - wlr_output_init(output, &drm->backend, &output_impl, drm->display, &state); + wlr_output_init(output, &drm->backend, &output_impl, wl_display_get_event_loop(drm->display), &state); wlr_output_state_finish(&state); // fill out the modes diff --git a/backend/headless/output.c b/backend/headless/output.c index 406959b4..b3ac279e 100644 --- a/backend/headless/output.c +++ b/backend/headless/output.c @@ -119,7 +119,8 @@ struct wlr_output *wlr_headless_add_output(struct wlr_backend *wlr_backend, wlr_output_state_init(&state); wlr_output_state_set_custom_mode(&state, width, height, 0); - wlr_output_init(wlr_output, &backend->backend, &output_impl, backend->display, &state); + wlr_output_init(wlr_output, &backend->backend, &output_impl, + wl_display_get_event_loop(backend->display), &state); wlr_output_state_finish(&state); output_update_refresh(output, 0); diff --git a/backend/wayland/output.c b/backend/wayland/output.c index bc150845..c7c6d2d0 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -775,7 +775,7 @@ static struct wlr_wl_output *output_create(struct wlr_wl_backend *backend, wlr_output_state_set_custom_mode(&state, 1280, 720, 0); wlr_output_init(wlr_output, &backend->backend, &output_impl, - backend->local_display, &state); + wl_display_get_event_loop(backend->local_display), &state); wlr_output_state_finish(&state); wlr_output->adaptive_sync_status = WLR_OUTPUT_ADAPTIVE_SYNC_ENABLED; diff --git a/backend/x11/output.c b/backend/x11/output.c index f5dc527c..634424e5 100644 --- a/backend/x11/output.c +++ b/backend/x11/output.c @@ -549,7 +549,8 @@ struct wlr_output *wlr_x11_output_create(struct wlr_backend *backend) { wlr_output_state_init(&state); wlr_output_state_set_custom_mode(&state, 1024, 768, 0); - wlr_output_init(wlr_output, &x11->backend, &output_impl, x11->wl_display, &state); + wlr_output_init(wlr_output, &x11->backend, &output_impl, + wl_display_get_event_loop(x11->wl_display), &state); wlr_output_state_finish(&state); size_t output_num = ++last_output_num; |