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

xdg-surface: don't disconnect clients for bad effective geom yet

Browse source 
Preferably, the geometry computation would've been done at the client
commit time, but this requires correct subsurface state management which
we don't have at the moment. The next best solution, which is computing
the geometry on server commit time, doesn't currently have a way to
prevent user commit handlers from firing, meaning that compositors might
get an invalid surface state. Additionally, Chromium and gtk-layer-shell
turned out to violate the protocol in this regard, so client
disconnection leads to really bad UX.

As such, complain via a log message instead, and ignore invalid
geometry, falling back to the bounding rectangle.
This commit is contained in:
Kirill Primak 2025-04-15 12:01:16 +03:00
parent f8c639f19a
commit ed2406621a
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
types/xdg_shell/wlr_xdg_surface.c
View file

@ -257,17 +257,22 @@ static const struct xdg_surface_interface xdg_surface_implementation = {
// the surface, in which case it's updated on map, so that subsurfaces are
// mapped and surface extents are computed correctly.
static void update_geometry(struct wlr_xdg_surface *surface) {
if (!wlr_box_empty(&surface->current.geometry)) {
if ((surface->current.committed & WLR_XDG_SURFACE_STATE_WINDOW_GEOMETRY) != 0) {
wlr_surface_get_extents(surface->surface, &surface->geometry);
wlr_box_intersection(&surface->geometry,
&surface->current.geometry, &surface->geometry);
if (wlr_box_empty(&surface->geometry)) {
wl_resource_post_error(surface->resource, XDG_SURFACE_ERROR_INVALID_SIZE,
"the effective window geometry is empty");
}
if ((surface->current.committed & WLR_XDG_SURFACE_STATE_WINDOW_GEOMETRY) != 0) {
wlr_surface_get_extents(surface->surface, &surface->geometry);
struct wlr_box effective;
wlr_box_intersection(&effective, &surface->geometry, &surface->current.geometry);
if (wlr_box_empty(&effective)) {
wlr_log(WLR_INFO,
"A client has committed an invalid effective window geometry (%d,%d %dx%d); "
"this will result in client disconnection in the future",
effective.x, effective.y, effective.width, effective.height);
// The extents are used instead
} else {
surface->geometry = effective;
}
} else {
} else if (wlr_box_empty(&surface->geometry)) {
wlr_surface_get_extents(surface->surface, &surface->geometry);
}
}