brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Ensure pointer constraint region consistency

Browse Source 
Changes in games between fullscreen and windowed modes may trigger
chaotic situations where the buffer and the frame size temporarily
disagree, producing rectangles with negative width/height. This is
usually followed by other updates that bring the pointer constraint
up to date.

This makes cairo panic and return an "error" empty region, which breaks
deeper down when using the region rectangles to apply the pointer
constraint.

If we hit this situation, ignore the frame rectangle, and just go with
the buffer rectangle.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1655>
This commit is contained in:
Carlos Garnacho 2020-12-23 18:58:48 +01:00
parent d439501faf
commit 98ef6d0d05
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/wayland/meta-wayland-pointer-constraints.c
View File

@ -624,12 +624,15 @@ meta_wayland_pointer_constraint_calculate_effective_region (MetaWaylandPointerCo
frame->right_width); frame->right_width);
actual_height = window->buffer_rect.height - (frame->child_y + actual_height = window->buffer_rect.height - (frame->child_y +
frame->bottom_height); frame->bottom_height);
cairo_region_intersect_rectangle (region, &(cairo_rectangle_int_t) { if (actual_width > 0 && actual_height > 0)
.x = frame->child_x, {
.y = frame->child_y, cairo_region_intersect_rectangle (region, &(cairo_rectangle_int_t) {
.width = actual_width, .x = frame->child_x,
.height = actual_height .y = frame->child_y,
}); .width = actual_width,
.height = actual_height
});
}
} }
return region; return region;