mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-14 08:22:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'simplify-output-layers' into 'master'

Browse source 
backend/wayland: Linearly allocate output layers

See merge request wlroots/wlroots!4285
This commit is contained in:
Alexander Orzechowski 2026-01-08 07:21:43 -05:00
commit d1961ecd08
2 changed files with 33 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

81
backend/wayland/output.c
View file

@ -528,10 +528,8 @@ static bool output_test(struct wlr_output *wlr_output,
return true; return true;
} }
static void output_layer_handle_addon_destroy(struct wlr_addon *addon) { static void output_layer_destroy(struct wlr_wl_output_layer *layer) {
struct wlr_wl_output_layer *layer = wl_container_of(addon, layer, addon); wl_list_remove(&layer->link);
wlr_addon_finish(&layer->addon);
if (layer->viewport != NULL) { if (layer->viewport != NULL) {
wp_viewport_destroy(layer->viewport); wp_viewport_destroy(layer->viewport);
} }
@ -540,30 +538,15 @@ static void output_layer_handle_addon_destroy(struct wlr_addon *addon) {
free(layer); free(layer);
} }
static const struct wlr_addon_interface output_layer_addon_impl = { static struct wlr_wl_output_layer *output_layer_create(struct wlr_wl_output *output) {
.name = "wlr_wl_output_layer",
.destroy = output_layer_handle_addon_destroy,
};
static struct wlr_wl_output_layer *get_or_create_output_layer(
struct wlr_wl_output *output, struct wlr_output_layer *wlr_layer) {
assert(output->backend->subcompositor != NULL); assert(output->backend->subcompositor != NULL);
struct wlr_wl_output_layer *layer; struct wlr_wl_output_layer *layer = calloc(1, sizeof(*layer));
struct wlr_addon *addon = wlr_addon_find(&wlr_layer->addons, output,
&output_layer_addon_impl);
if (addon != NULL) {
layer = wl_container_of(addon, layer, addon);
return layer;
}
layer = calloc(1, sizeof(*layer));
if (layer == NULL) { if (layer == NULL) {
return NULL; return NULL;
} }
wlr_addon_init(&layer->addon, &wlr_layer->addons, output, wl_list_insert(&output->layers, &layer->link);
&output_layer_addon_impl);
layer->surface = wl_compositor_create_surface(output->backend->compositor); layer->surface = wl_compositor_create_surface(output->backend->compositor);
layer->subsurface = wl_subcompositor_get_subsurface( layer->subsurface = wl_subcompositor_get_subsurface(
@ -582,24 +565,6 @@ static struct wlr_wl_output_layer *get_or_create_output_layer(
return layer; return layer;
} }
static bool has_layers_order_changed(struct wlr_wl_output *output,
struct wlr_output_layer_state *layers, size_t layers_len) {
// output_basic_check() ensures that layers_len equals the number of
// registered output layers
size_t i = 0;
struct wlr_output_layer *layer;
wl_list_for_each(layer, &output->wlr_output.layers, link) {
assert(i < layers_len);
const struct wlr_output_layer_state *layer_state = &layers[i];
if (layer_state->layer != layer) {
return true;
}
i++;
}
assert(i == layers_len);
return false;
}
static void output_layer_unmap(struct wlr_wl_output_layer *layer) { static void output_layer_unmap(struct wlr_wl_output_layer *layer) {
if (!layer->mapped) { if (!layer->mapped) {
return; return;
@ -682,14 +647,19 @@ static bool commit_layers(struct wlr_wl_output *output,
return true; return true;
} }
bool reordered = has_layers_order_changed(output, layers, layers_len); struct wl_list *current_layer = output->layers.next;
struct wlr_wl_output_layer *prev_layer = NULL;
for (size_t i = 0; i < layers_len; i++) { for (size_t i = 0; i < layers_len; i++) {
struct wlr_wl_output_layer *layer = struct wlr_wl_output_layer *layer;
get_or_create_output_layer(output, layers[i].layer);
if (layer == NULL) { if (current_layer == &output->layers) {
return false; layer = output_layer_create(output);
if (layer == NULL) {
return false;
}
} else {
current_layer = current_layer->next;
layer = wl_container_of(current_layer, layer, link);
} }
if (!layers[i].accepted) { if (!layers[i].accepted) {
@ -697,11 +667,6 @@ static bool commit_layers(struct wlr_wl_output *output,
continue; continue;
} }
if (prev_layer != NULL && reordered) {
wl_subsurface_place_above(layer->subsurface,
prev_layer->surface);
}
if (!output_layer_commit(output, layer, &layers[i])) { if (!output_layer_commit(output, layer, &layers[i])) {
return false; return false;
} }
@ -709,6 +674,14 @@ static bool commit_layers(struct wlr_wl_output *output,
prev_layer = layer; prev_layer = layer;
} }
// destroy unused subsurface
while (current_layer != &output->layers) {
struct wlr_wl_output_layer *layer =
wl_container_of(current_layer, layer, link);
current_layer = current_layer->next;
output_layer_destroy(layer);
}
return true; return true;
} }
@ -958,6 +931,11 @@ static void output_destroy(struct wlr_output *wlr_output) {
wl_list_remove(&output->link); wl_list_remove(&output->link);
struct wlr_wl_output_layer *layer, *tmp_layer;
wl_list_for_each_safe(layer, tmp_layer, &output->layers, link) {
output_layer_destroy(layer);
}
if (output->cursor.surface) { if (output->cursor.surface) {
wl_surface_destroy(output->cursor.surface); wl_surface_destroy(output->cursor.surface);
} }
@ -1131,6 +1109,7 @@ static struct wlr_wl_output *output_create(struct wlr_wl_backend *backend,
output->surface = surface; output->surface = surface;
output->backend = backend; output->backend = backend;
wl_list_init(&output->presentation_feedbacks); wl_list_init(&output->presentation_feedbacks);
wl_list_init(&output->layers);
wl_proxy_set_tag((struct wl_proxy *)output->surface, &surface_tag); wl_proxy_set_tag((struct wl_proxy *)output->surface, &surface_tag);
wl_surface_set_user_data(output->surface, output); wl_surface_set_user_data(output->surface, output);

4
include/backend/wayland.h
View file

@ -85,7 +85,7 @@ struct wlr_wl_presentation_feedback {
}; };
struct wlr_wl_output_layer { struct wlr_wl_output_layer {
struct wlr_addon addon; struct wl_list link; // struct wlr_wl_output.layers
struct wl_surface *surface; struct wl_surface *surface;
struct wl_subsurface *subsurface; struct wl_subsurface *subsurface;
@ -131,6 +131,8 @@ struct wlr_wl_output {
struct wl_surface *surface; struct wl_surface *surface;
int32_t hotspot_x, hotspot_y; int32_t hotspot_x, hotspot_y;
} cursor; } cursor;
struct wl_list layers; // struct wlr_wl_output_layer.link
}; };
struct wlr_wl_pointer { struct wlr_wl_pointer {