commit 65f68e76437275a0c1c25279af646f726e213b6d
parent 96ab92cdb16dfbae724e96eea6fb72d1bec20021
Author: Leonardo Hernández Hernández <leohdz172@proton.me>
Date: Mon, 12 Jun 2023 22:46:39 -0600
use wlr_scene_output_build_state() to set gamma
Diffstat:
| M | dwl.c | | | 19 | +++++++++++++++---- |
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/dwl.c b/dwl.c
@@ -2068,15 +2068,26 @@ 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))
+ Monitor *m = event->output->data;
+ struct wlr_output_state pending = {0};
+ if (!m)
return;
- if (!wlr_output_test(event->output)) {
- wlr_output_rollback(event->output);
+ if (!wlr_scene_output_build_state(m->scene_output, &pending))
+ return;
+
+ if (!wlr_gamma_control_v1_apply(event->control, &pending))
+ goto out;
+
+ if (!wlr_output_commit_state(m->wlr_output, &pending)) {
wlr_gamma_control_v1_send_failed_and_destroy(event->control);
+ goto out;
}
- wlr_output_schedule_frame(event->output);
+ wlr_damage_ring_rotate(&m->scene_output->damage_ring);
+
+out:
+ wlr_output_state_finish(&pending);
}
void