From 2b454daa14576f12974fb00146a57de976665508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= Date: Sun, 17 Dec 2023 15:26:52 -0600 Subject: [PATCH] use the new frame scheduler (wlroots!4307) References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4307 --- dwl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dwl.c b/dwl.c index d0ac38a..bdefccb 100644 --- a/dwl.c +++ b/dwl.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -881,8 +882,10 @@ createmon(struct wl_listener *listener, void *data) * the user configure it. */ wlr_output_state_set_mode(&state, wlr_output_preferred_mode(wlr_output)); + m->scene_output = wlr_scene_output_create(scene, wlr_output); + /* Set up event listeners */ - LISTEN(&wlr_output->events.frame, &m->frame, rendermon); + LISTEN(&m->scene_output->frame_scheduler->events.frame, &m->frame, rendermon); LISTEN(&wlr_output->events.destroy, &m->destroy, cleanupmon); LISTEN(&wlr_output->events.request_state, &m->request_state, requestmonstate); @@ -911,7 +914,6 @@ createmon(struct wl_listener *listener, void *data) * display, which Wayland clients can see to find out information about the * output (such as DPI, scale factor, manufacturer, etc). */ - m->scene_output = wlr_scene_output_create(scene, wlr_output); if (m->m.x < 0 || m->m.y < 0) wlr_output_layout_add_auto(output_layout, wlr_output); else @@ -1882,7 +1884,7 @@ rendermon(struct wl_listener *listener, void *data) goto commit; } wlr_output_commit_state(m->wlr_output, &pending); - wlr_output_schedule_frame(m->wlr_output); + wlr_frame_scheduler_schedule_frame(m->scene_output->frame_scheduler); } else { commit: wlr_scene_output_commit(m->scene_output, NULL); @@ -2077,7 +2079,7 @@ setgamma(struct wl_listener *listener, void *data) struct wlr_gamma_control_manager_v1_set_gamma_event *event = data; Monitor *m = event->output->data; m->gamma_lut_changed = 1; - wlr_output_schedule_frame(m->wlr_output); + wlr_frame_scheduler_schedule_frame(m->scene_output->frame_scheduler); } void