From fdb66ccfa3a035202369bb366a401d49bcce22a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
<leohdz172@proton.me>
Date: Fri, 23 Jun 2023 13:42:44 -0600
Subject: [PATCH] use detached output states to set gamma
---
dwl.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/dwl.c b/dwl.c
index 2a16ef7..4ebceab 100644
--- a/dwl.c
+++ b/dwl.c
@@ -2061,15 +2061,20 @@ void
setgamma(struct wl_listener *listener, void *data)
{
struct wlr_gamma_control_manager_v1_set_gamma_event *event = data;
- if (!wlr_gamma_control_v1_apply(event->control, &event->output->pending))
+ struct wlr_output_state state;
+ wlr_output_state_init(&state);
+ if (!wlr_gamma_control_v1_apply(event->control, &state)) {
+ wlr_output_state_finish(&state);
return;
-
- if (!wlr_output_test(event->output)) {
- wlr_output_rollback(event->output);
- wlr_gamma_control_v1_send_failed_and_destroy(event->control);
}
- wlr_output_schedule_frame(event->output);
+ if (!wlr_output_test_state(event->output, &state)) {
+ wlr_gamma_control_v1_send_failed_and_destroy(event->control);
+ wlr_output_state_finish(&state);
+ return;
+ }
+
+ wlr_output_commit_state(event->output, &state);
}
void