mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-03 07:15:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

chase wlroots: wlr_scene_set_gamma_control_manager_v1

Browse source 
Ref: 515275ee7214bf91f8a758b660093eb4b932195a
(wlr_scene: Introduce wlr_scene_set_gamma_control_manager_v1)

This wlroots change eliminates the need for separate event tracking for gamma
control application.

v2: Fix code style
v3: Rebase now that 0.20 is merged
This commit is contained in:
Christopher Snowhill 2026-03-30 00:02:47 -07:00 • committed by Consolatis
parent 647e9b7658
commit cee5712877
3 changed files with 6 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/labwc.h
View file

@ -274,7 +274,6 @@ struct server {
struct wl_listener renderer_lost; struct wl_listener renderer_lost;
struct wlr_gamma_control_manager_v1 *gamma_control_manager_v1; struct wlr_gamma_control_manager_v1 *gamma_control_manager_v1;
struct wl_listener gamma_control_set_gamma;
struct session_lock_manager *session_lock_manager; struct session_lock_manager *session_lock_manager;

2
include/output.h
View file

@ -38,8 +38,6 @@ struct output {
* disconnected and connected again. * disconnected and connected again.
*/ */
uint64_t id_bit; uint64_t id_bit;
bool gamma_lut_changed;
}; };
#undef LAB_NR_LAYERS #undef LAB_NR_LAYERS

68
src/output.c
View file

@ -81,35 +81,6 @@ output_get_tearing_allowance(struct output *output)
return view->force_tearing == LAB_STATE_ENABLED; return view->force_tearing == LAB_STATE_ENABLED;
} }
static void
output_apply_gamma(struct output *output)
{
assert(output);
assert(output->gamma_lut_changed);
struct wlr_scene_output *scene_output = output->scene_output;
struct wlr_output_state pending;
wlr_output_state_init(&pending);
output->gamma_lut_changed = false;
struct wlr_gamma_control_v1 *gamma_control =
wlr_gamma_control_manager_v1_get_control(
server.gamma_control_manager_v1,
output->wlr_output);
if (!wlr_gamma_control_v1_apply(gamma_control, &pending)) {
wlr_output_state_finish(&pending);
return;
}
if (!lab_wlr_scene_output_commit(scene_output, &pending)) {
wlr_gamma_control_v1_send_failed_and_destroy(gamma_control);
}
wlr_output_state_finish(&pending);
}
static void static void
handle_output_frame(struct wl_listener *listener, void *data) handle_output_frame(struct wl_listener *listener, void *data)
{ {
@ -129,23 +100,12 @@ handle_output_frame(struct wl_listener *listener, void *data)
return; return;
} }
if (output->gamma_lut_changed) { struct wlr_scene_output *scene_output = output->scene_output;
/* struct wlr_output_state *pending = &output->pending;
* We are not mixing the gamma state with
* other pending output changes to make it
* easier to handle a failed output commit
* due to gamma without impacting other
* unrelated output changes.
*/
output_apply_gamma(output);
} else {
struct wlr_scene_output *scene_output = output->scene_output;
struct wlr_output_state *pending = &output->pending;
pending->tearing_page_flip = output_get_tearing_allowance(output); pending->tearing_page_flip = output_get_tearing_allowance(output);
lab_wlr_scene_output_commit(scene_output, pending); lab_wlr_scene_output_commit(scene_output, pending);
}
struct timespec now = { 0 }; struct timespec now = { 0 };
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
@ -598,6 +558,8 @@ output_init(void)
{ {
server.gamma_control_manager_v1 = server.gamma_control_manager_v1 =
wlr_gamma_control_manager_v1_create(server.wl_display); wlr_gamma_control_manager_v1_create(server.wl_display);
wlr_scene_set_gamma_control_manager_v1(server.scene,
server.gamma_control_manager_v1);
server.new_output.notify = handle_new_output; server.new_output.notify = handle_new_output;
wl_signal_add(&server.backend->events.new_output, &server.new_output); wl_signal_add(&server.backend->events.new_output, &server.new_output);
@ -907,19 +869,6 @@ handle_output_layout_change(struct wl_listener *listener, void *data)
do_output_layout_change(); do_output_layout_change();
} }
static void
handle_gamma_control_set_gamma(struct wl_listener *listener, void *data)
{
const struct wlr_gamma_control_manager_v1_set_gamma_event *event = data;
struct output *output = event->output->data;
if (!output_is_usable(output)) {
return;
}
output->gamma_lut_changed = true;
wlr_output_schedule_frame(output->wlr_output);
}
static void static void
output_manager_init(void) output_manager_init(void)
{ {
@ -936,10 +885,6 @@ output_manager_init(void)
server.output_manager_test.notify = handle_output_manager_test; server.output_manager_test.notify = handle_output_manager_test;
wl_signal_add(&server.output_manager->events.test, wl_signal_add(&server.output_manager->events.test,
&server.output_manager_test); &server.output_manager_test);
server.gamma_control_set_gamma.notify = handle_gamma_control_set_gamma;
wl_signal_add(&server.gamma_control_manager_v1->events.set_gamma,
&server.gamma_control_set_gamma);
} }
static void static void
@ -948,7 +893,6 @@ output_manager_finish(void)
wl_list_remove(&server.output_layout_change.link); wl_list_remove(&server.output_layout_change.link);
wl_list_remove(&server.output_manager_apply.link); wl_list_remove(&server.output_manager_apply.link);
wl_list_remove(&server.output_manager_test.link); wl_list_remove(&server.output_manager_test.link);
wl_list_remove(&server.gamma_control_set_gamma.link);
} }
struct output * struct output *