mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

xwayland: remove dissociate work-around

Browse source 
...to cope with pre-wlroots-0.18.0 behaviour resulting in dissociate
events being emitted without a prior associate one.
This commit is contained in:
Johan Malm 2024-08-12 22:07:53 +01:00 • committed by Consolatis
parent 8b12b50137
commit 33820c2ad1
1 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/xwayland.c
View file

@ -279,19 +279,8 @@ handle_dissociate(struct wl_listener *listener, void *data)
struct xwayland_view *xwayland_view = struct xwayland_view *xwayland_view =
wl_container_of(listener, xwayland_view, dissociate); wl_container_of(listener, xwayland_view, dissociate);
if (!xwayland_view->base.mappable.connected) { /* https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4524 */
/* assert(xwayland_view->base.mappable.connected);
* In some cases wlroots fails to emit the associate event
* due to an early return in xwayland_surface_associate().
* This is arguably a wlroots bug, but nevertheless it
* should not bring down labwc.
*
* TODO: Potentially remove when starting to track
* wlroots 0.18 and it got fixed upstream.
*/
wlr_log(WLR_ERROR, "dissociate received before associate");
return;
}
mappable_disconnect(&xwayland_view->base.mappable); mappable_disconnect(&xwayland_view->base.mappable);
} }