mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-28 07:58:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

xdg: add missing tracking of configure serials

Browse source 
In some cases, we would schedule a configure event but not record that
we had done so, leaving view->pending_configure_serial incorrect. This
caused incorrect handling of in-flight commits that had not yet taken
the new configure into account, such as assuming that the client had
ignored the configured size and incorrectly resetting view->pending.

Fixes: #2774
This commit is contained in:
John Lindgren 2025-06-04 14:35:00 -04:00 • committed by Hiroaki Yamamoto
parent ea294dbcf5
commit 0908bb5dd1
1 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/xdg.c
View file

@ -120,6 +120,9 @@ do_late_positioning(struct view *view)
} }
} }
/* TODO: reorder so this forward declaration isn't needed */
static void set_pending_configure_serial(struct view *view, uint32_t serial);
static void static void
handle_commit(struct wl_listener *listener, void *data) handle_commit(struct wl_listener *listener, void *data)
{ {
@ -129,8 +132,11 @@ handle_commit(struct wl_listener *listener, void *data)
assert(view->surface); assert(view->surface);
if (xdg_surface->initial_commit) { if (xdg_surface->initial_commit) {
wlr_log(WLR_DEBUG, "scheduling configure"); uint32_t serial =
wlr_xdg_surface_schedule_configure(xdg_surface); wlr_xdg_surface_schedule_configure(xdg_surface);
if (serial > 0) {
set_pending_configure_serial(view, serial);
}
/* /*
* Handle initial fullscreen/maximize requests immediately after * Handle initial fullscreen/maximize requests immediately after
* scheduling the initial configure event (before it is sent) in * scheduling the initial configure event (before it is sent) in
@ -493,8 +499,11 @@ xdg_toplevel_view_close(struct view *view)
static void static void
xdg_toplevel_view_maximize(struct view *view, enum view_axis maximized) xdg_toplevel_view_maximize(struct view *view, enum view_axis maximized)
{ {
wlr_xdg_toplevel_set_maximized(xdg_toplevel_from_view(view), uint32_t serial = wlr_xdg_toplevel_set_maximized(
maximized == VIEW_AXIS_BOTH); xdg_toplevel_from_view(view), maximized == VIEW_AXIS_BOTH);
if (serial > 0) {
set_pending_configure_serial(view, serial);
}
} }
static void static void
@ -550,14 +559,21 @@ xdg_toplevel_view_append_children(struct view *self, struct wl_array *children)
static void static void
xdg_toplevel_view_set_activated(struct view *view, bool activated) xdg_toplevel_view_set_activated(struct view *view, bool activated)
{ {
wlr_xdg_toplevel_set_activated(xdg_toplevel_from_view(view), activated); uint32_t serial = wlr_xdg_toplevel_set_activated(
xdg_toplevel_from_view(view), activated);
if (serial > 0) {
set_pending_configure_serial(view, serial);
}
} }
static void static void
xdg_toplevel_view_set_fullscreen(struct view *view, bool fullscreen) xdg_toplevel_view_set_fullscreen(struct view *view, bool fullscreen)
{ {
wlr_xdg_toplevel_set_fullscreen(xdg_toplevel_from_view(view), uint32_t serial = wlr_xdg_toplevel_set_fullscreen(
fullscreen); xdg_toplevel_from_view(view), fullscreen);
if (serial > 0) {
set_pending_configure_serial(view, serial);
}
} }
static void static void
@ -602,7 +618,11 @@ xdg_toplevel_view_notify_tiled(struct view *view)
WLR_EDGE_TOP | WLR_EDGE_BOTTOM; WLR_EDGE_TOP | WLR_EDGE_BOTTOM;
} }
wlr_xdg_toplevel_set_tiled(xdg_toplevel_from_view(view), edge); uint32_t serial =
wlr_xdg_toplevel_set_tiled(xdg_toplevel_from_view(view), edge);
if (serial > 0) {
set_pending_configure_serial(view, serial);
}
} }
static struct view * static struct view *