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

scene: intersect visible area with output layout in update_node_update_outputs()

Browse source 
A node can have a visible area outside the output layout bounds.
In that case, it will not pass the overlap check. For instance,
with a single output, a 100x100 px weston-simple-shm would stop
animating when moving it close to an edge and leaving less than a
~30x30 px square visible.

Fix this by intersecting the node's visible region with the output
layout region so that the 10% overlap target is always reachable.

Switch to a strict comparison in case visible_area is zero.

(cherry picked from commit d70c84b571)
This commit is contained in:
Simon Ser 2026-06-28 17:19:13 +02:00 • committed by Simon Zeni
parent 08921ddf4e
commit eb02e65df4
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
types/scene/wlr_scene.c
View file

@ -430,7 +430,21 @@ static void update_node_update_outputs(struct wlr_scene_node *node,
uint64_t active_outputs = 0; uint64_t active_outputs = 0;
if (!pixman_region32_empty(&node->visible)) { if (!pixman_region32_empty(&node->visible)) {
uint32_t visible_area = region_area(&node->visible); struct wlr_scene_output *scene_output;
// Compute the region covered by all outputs, then intersect with the
// node's visible region
pixman_region32_t visible;
pixman_region32_init(&visible);
wl_list_for_each(scene_output, outputs, link) {
int width, height;
wlr_output_effective_resolution(scene_output->output, &width, &height);
pixman_region32_union_rect(&visible, &visible,
scene_output->x, scene_output->y, width, height);
}
pixman_region32_intersect(&visible, &visible, &node->visible);
uint32_t visible_area = region_area(&visible);
pixman_region32_fini(&visible);
// let's update the outputs in two steps: // let's update the outputs in two steps:
// - the primary outputs // - the primary outputs
@ -438,7 +452,6 @@ static void update_node_update_outputs(struct wlr_scene_node *node,
// This ensures that the enter/leave signals can rely on the primary output // This ensures that the enter/leave signals can rely on the primary output
// to have a reasonable value. Otherwise, they may get a value that's in // to have a reasonable value. Otherwise, they may get a value that's in
// the middle of a calculation. // the middle of a calculation.
struct wlr_scene_output *scene_output;
wl_list_for_each(scene_output, outputs, link) { wl_list_for_each(scene_output, outputs, link) {
if (scene_output == ignore) { if (scene_output == ignore) {
continue; continue;
@ -462,9 +475,9 @@ static void update_node_update_outputs(struct wlr_scene_node *node,
uint32_t overlap = region_area(&intersection); uint32_t overlap = region_area(&intersection);
pixman_region32_fini(&intersection); pixman_region32_fini(&intersection);
// If the overlap accounts for less than 10% of the visible node area, // If the overlap accounts for 10% of the visible node area or less,
// ignore this output // ignore this output
if (overlap >= 0.1 * visible_area) { if (overlap > 0.1 * visible_area) {
if (overlap >= largest_overlap) { if (overlap >= largest_overlap) {
largest_overlap = overlap; largest_overlap = overlap;
scene_buffer->primary_output = scene_output; scene_buffer->primary_output = scene_output;