hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-29 07:55:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

xwm: add loop detection for read_surface_parent

Browse source 
Implement a simple loop detection while trying to retrieve the parent
for a TRANSIENT_FOR window.

Fixes swaywm/sway#4624
This commit is contained in:
Rouven Czerwinski 2020-09-19 11:36:33 +02:00 committed by Simon Ser
parent 87836dcb55
commit 5012121d33
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
xwayland/xwm.c
View file

@ -467,20 +467,41 @@ static void read_surface_title(struct wlr_xwm *xwm,
wlr_signal_emit_safe(&xsurface->events.set_title, xsurface);
}
static bool has_parent(struct wlr_xwayland_surface *parent,
struct wlr_xwayland_surface *child) {
while (parent) {
if (child == parent) {
return true;
}
parent = parent->parent;
}
return false;
}
static void read_surface_parent(struct wlr_xwm *xwm,
struct wlr_xwayland_surface *xsurface,
xcb_get_property_reply_t *reply) {
struct wlr_xwayland_surface *found_parent = NULL;
if (reply->type != XCB_ATOM_WINDOW) {
return;
}
xcb_window_t *xid = xcb_get_property_value(reply);
if (xid != NULL) {
xsurface->parent = lookup_surface(xwm, *xid);
found_parent = lookup_surface(xwm, *xid);
if (!has_parent(found_parent, xsurface)) {
xsurface->parent = found_parent;
} else {
wlr_log(WLR_INFO, "%p with %p would create a loop", xsurface,
found_parent);
}
} else {
xsurface->parent = NULL;
}
wl_list_remove(&xsurface->parent_link);
if (xsurface->parent != NULL) {
wl_list_insert(&xsurface->parent->children, &xsurface->parent_link);