mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Chase wlroots: add output to scene_output_layout explicitly

Browse source 
Chases: f5917f0247600b65edec1735234d00de57d577a8
scene_output_layout: make output adding explicit
This commit is contained in:
John Lindgren 2023-09-21 21:33:12 -04:00 • committed by Johan Malm
parent ddc9047a67
commit 96c85051ae
3 changed files with 47 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/output.c
View file

@ -68,6 +68,10 @@ output_destroy_notify(struct wl_listener *listener, void *data)
view_on_output_destroy(view);
}
}
/*
* output->scene_output (if still around at this point) is
* destroyed automatically when the wlr_output is destroyed
*/
free(output);
}
@ -117,6 +121,30 @@ can_reuse_mode(struct wlr_output *wlr_output)
return wlr_output->current_mode && wlr_output_test(wlr_output);
}
static void
add_output_to_layout(struct server *server, struct output *output)
{
struct wlr_output *wlr_output = output->wlr_output;
struct wlr_output_layout_output *layout_output =
wlr_output_layout_add_auto(server->output_layout, wlr_output);
if (!layout_output) {
wlr_log(WLR_ERROR, "unable to add output to layout");
return;
}
if (!output->scene_output) {
output->scene_output =
wlr_scene_output_create(server->scene, wlr_output);
if (!output->scene_output) {
wlr_log(WLR_ERROR, "unable to create scene output");
return;
}
}
wlr_scene_output_layout_add_output(server->scene_layout, layout_output,
output->scene_output);
}
static void
new_output_notify(struct wl_listener *listener, void *data)
{
@ -269,9 +297,7 @@ new_output_notify(struct wl_listener *listener, void *data)
*/
server->pending_output_layout_change++;
wlr_output_layout_add_auto(server->output_layout, wlr_output);
output->scene_output = wlr_scene_get_scene_output(server->scene, wlr_output);
assert(output->scene_output);
add_output_to_layout(server, output);
/* Create regions from config */
regions_reconfigure_output(output);
@ -299,7 +325,12 @@ output_init(struct server *server)
wlr_log(WLR_ERROR, "unable to create output layout");
exit(EXIT_FAILURE);
}
wlr_scene_attach_output_layout(server->scene, server->output_layout);
server->scene_layout = wlr_scene_attach_output_layout(server->scene,
server->output_layout);
if (!server->scene_layout) {
wlr_log(WLR_ERROR, "unable to create scene layout");
exit(EXIT_FAILURE);
}
/* Enable screen recording with wf-recorder */
wlr_xdg_output_manager_v1_create(server->wl_display,
@ -362,10 +393,7 @@ output_config_apply(struct server *server,
/* Only do Layout specific actions if the commit went trough */
if (need_to_add) {
wlr_output_layout_add_auto(server->output_layout, o);
output->scene_output =
wlr_scene_get_scene_output(server->scene, o);
assert(output->scene_output);
add_output_to_layout(server, output);
}
if (output_enabled) {
@ -384,6 +412,15 @@ output_config_apply(struct server *server,
if (need_to_remove) {
regions_evacuate_output(output);
/*
* At time of writing, wlr_output_layout_remove()
* indirectly destroys the wlr_scene_output, but
* this behavior may change in future. To remove
* doubt and avoid either a leak or double-free,
* explicitly destroy the wlr_scene_output before
* calling wlr_output_layout_remove().
*/
wlr_scene_output_destroy(output->scene_output);
wlr_output_layout_remove(server->output_layout, o);
output->scene_output = NULL;
}