From 0caa6582765492cff5a6470626137adaebaa575e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
<leohdz172@proton.me>
Date: Wed, 14 Aug 2024 11:47:29 -0600
Subject: [PATCH] use wlr_scene_set_gamma_control_manager_v1() (wlroots!4192)
References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4192
---
dwl.c | 44 ++------------------------------------------
1 file changed, 2 insertions(+), 42 deletions(-)
diff --git a/dwl.c b/dwl.c
index b88d7b1..8a587d1 100644
--- a/dwl.c
+++ b/dwl.c
@@ -327,7 +327,6 @@ static void setcursor(struct wl_listener *listener, void *data);
static void setcursorshape(struct wl_listener *listener, void *data);
static void setfloating(Client *c, int floating);
static void setfullscreen(Client *c, int fullscreen);
-static void setgamma(struct wl_listener *listener, void *data);
static void setlayout(const Arg *arg);
static void setmfact(const Arg *arg);
static void setmon(Client *c, Monitor *m, uint32_t newtags);
@@ -383,7 +382,6 @@ static struct wlr_idle_notifier_v1 *idle_notifier;
static struct wlr_idle_inhibit_manager_v1 *idle_inhibit_mgr;
static struct wlr_layer_shell_v1 *layer_shell;
static struct wlr_output_manager_v1 *output_mgr;
-static struct wlr_gamma_control_manager_v1 *gamma_control_mgr;
static struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard_mgr;
static struct wlr_virtual_pointer_manager_v1 *virtual_pointer_mgr;
static struct wlr_cursor_shape_manager_v1 *cursor_shape_mgr;
@@ -2100,7 +2098,6 @@ rendermon(struct wl_listener *listener, void *data)
Monitor *m = wl_container_of(listener, m, frame);
Client *c;
struct wlr_output_state pending = {0};
- struct wlr_gamma_control_v1 *gamma_control;
struct timespec now;
/* Render if no XDG clients have an outstanding resize and are visible on
@@ -2110,32 +2107,7 @@ rendermon(struct wl_listener *listener, void *data)
goto skip;
}
- /*
- * HACK: The "correct" way to set the gamma is to commit it together with
- * the rest of the state in one go, but to do that we would need to rewrite
- * wlr_scene_output_commit() in order to add the gamma to the pending
- * state before committing, instead try to commit the gamma in one frame,
- * and commit the rest of the state in the next one (or in the same frame if
- * the gamma can not be committed).
- */
- if (m->gamma_lut_changed) {
- gamma_control
- = wlr_gamma_control_manager_v1_get_control(gamma_control_mgr, m->wlr_output);
- m->gamma_lut_changed = 0;
-
- if (!wlr_gamma_control_v1_apply(gamma_control, &pending))
- goto commit;
-
- if (!wlr_output_test_state(m->wlr_output, &pending)) {
- wlr_gamma_control_v1_send_failed_and_destroy(gamma_control);
- goto commit;
- }
- wlr_output_commit_state(m->wlr_output, &pending);
- wlr_output_schedule_frame(m->wlr_output);
- } else {
-commit:
- wlr_scene_output_commit(m->scene_output, NULL);
- }
+ wlr_scene_output_commit(m->scene_output, NULL);
skip:
/* Let clients know a frame has been rendered */
@@ -2337,17 +2309,6 @@ setfullscreen(Client *c, int fullscreen)
printstatus();
}
-void
-setgamma(struct wl_listener *listener, void *data)
-{
- struct wlr_gamma_control_manager_v1_set_gamma_event *event = data;
- Monitor *m = event->output->data;
- if (!m)
- return;
- m->gamma_lut_changed = 1;
- wlr_output_schedule_frame(m->wlr_output);
-}
-
void
setlayout(const Arg *arg)
{
@@ -2508,8 +2469,7 @@ setup(void)
activation = wlr_xdg_activation_v1_create(dpy);
LISTEN_STATIC(&activation->events.request_activate, urgent);
- gamma_control_mgr = wlr_gamma_control_manager_v1_create(dpy);
- LISTEN_STATIC(&gamma_control_mgr->events.set_gamma, setgamma);
+ wlr_scene_set_gamma_control_manager_v1(scene, wlr_gamma_control_manager_v1_create(dpy));
power_mgr = wlr_output_power_manager_v1_create(dpy);
LISTEN_STATIC(&power_mgr->events.set_mode, powermgrsetmode);