fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-20 04:40:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

compositor: Fix output reflowing when mirroring is in use

Browse source 
When we have a mirror, it will be at the same x,y position as the output
it's mirroring. On hot unplug, the current logic results in the mirroring
output being moved to the left by the width of its target output. The
mirror will then be destroyed, and the views can be left dangling outside
of usable space when a hot plug restores the outputs.

Subtly change the reflow logic to only reflow outputs to the right of the
removed output by testing co-ordinates, instead of assuming that every
output in the list is to the right of the previous.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2025-09-16 10:16:19 -05:00 • committed by Marius Vlad
parent a38cc9982b
commit 1a9cf3bfb6
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libweston/compositor.c
View file

@ -6840,7 +6840,6 @@ weston_compositor_reflow_outputs(struct weston_compositor *compositor,
struct weston_output *resized_output, int delta_width)
{
struct weston_output *output;
bool start_resizing = false;
if (compositor->output_flow_dirty)
return;
@ -6849,17 +6848,21 @@ weston_compositor_reflow_outputs(struct weston_compositor *compositor,
return;
wl_list_for_each(output, &compositor->output_list, link) {
if (output == resized_output) {
start_resizing = true;
struct weston_coord_global pos = output->pos;
/* Since outputs are in a horizontal line, reflow any to the
* right of the removed output.
*
* There's an easter egg here - with mirrored outputs, there
* may still be an output at the same place as the removed
* output, and we don't want to move its contents, so we use
* <= here.
*/
if (pos.c.x <= resized_output->pos.c.x)
continue;
}
if (start_resizing) {
struct weston_coord_global pos = output->pos;
pos.c.x += delta_width;
weston_output_set_position(output, pos);
}
pos.c.x += delta_width;
weston_output_set_position(output, pos);
}
}