From 907ca48a612971fd6ab43afb47554c77551fbddf Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 28 Jan 2021 16:19:15 +0100 Subject: [PATCH] Listen to the output request_state event References: https://github.com/swaywm/wlroots/pull/2693 --- include/sway/output.h | 1 + sway/desktop/output.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/include/sway/output.h b/include/sway/output.h index 7ccaa09c9..5af5b731f 100644 --- a/include/sway/output.h +++ b/include/sway/output.h @@ -48,6 +48,7 @@ struct sway_output { struct wl_listener damage; struct wl_listener frame; struct wl_listener needs_frame; + struct wl_listener request_state; struct { struct wl_signal disable; diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 81a20e255..04bddf86b 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -806,6 +806,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) { wl_list_remove(&output->damage.link); wl_list_remove(&output->frame.link); wl_list_remove(&output->needs_frame.link); + wl_list_remove(&output->request_state.link); wlr_damage_ring_finish(&output->damage_ring); @@ -893,6 +894,13 @@ static void handle_present(struct wl_listener *listener, void *data) { output->refresh_nsec = output_event->refresh; } +static void handle_request_state(struct wl_listener *listener, void *data) { + struct sway_output *output = + wl_container_of(listener, output, request_state); + const struct wlr_output_event_request_state *event = data; + wlr_output_commit_state(output->wlr_output, event->state); +} + static unsigned int last_headless_num = 0; void handle_new_output(struct wl_listener *listener, void *data) { @@ -950,6 +958,8 @@ void handle_new_output(struct wl_listener *listener, void *data) { output->frame.notify = handle_frame; wl_signal_add(&wlr_output->events.needs_frame, &output->needs_frame); output->needs_frame.notify = handle_needs_frame; + wl_signal_add(&wlr_output->events.request_state, &output->request_state); + output->request_state.notify = handle_request_state; output->repaint_timer = wl_event_loop_add_timer(server->wl_event_loop, output_repaint_timer_handler, output);