blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xdg-popup: fix wlr_xdg_popup_get_toplevel_coords() 

The previous code resulted in a crash when we try to unconstrain a popup
which is part of a layer-shell surface popup tree.

Fixes #1425
This commit is contained in:
Ilia Bozhinov 2018-12-12 08:51:13 +01:00
parent 16175751d6
commit 07865104e1
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
types/xdg_shell/wlr_xdg_popup.c
View File

@ -325,17 +325,25 @@ void wlr_xdg_popup_get_anchor_point(struct wlr_xdg_popup *popup,
void wlr_xdg_popup_get_toplevel_coords(struct wlr_xdg_popup *popup, void wlr_xdg_popup_get_toplevel_coords(struct wlr_xdg_popup *popup,
int popup_sx, int popup_sy, int *toplevel_sx, int *toplevel_sy) { int popup_sx, int popup_sy, int *toplevel_sx, int *toplevel_sy) {
struct wlr_xdg_surface *parent = struct wlr_surface *parent = popup->parent;
wlr_xdg_surface_from_wlr_surface(popup->parent); while (wlr_surface_is_xdg_surface(parent)) {
while (parent != NULL && parent->role == WLR_XDG_SURFACE_ROLE_POPUP) { struct wlr_xdg_surface *xdg_surface =
popup_sx += parent->popup->geometry.x; wlr_xdg_surface_from_wlr_surface(parent);
popup_sy += parent->popup->geometry.y;
parent = wlr_xdg_surface_from_wlr_surface(parent->popup->parent); if (xdg_surface->role == WLR_XDG_SURFACE_ROLE_POPUP) {
popup_sx += xdg_surface->popup->geometry.x;
popup_sy += xdg_surface->popup->geometry.y;
parent = xdg_surface->popup->parent;
} else {
popup_sx += xdg_surface->geometry.x;
popup_sy += xdg_surface->geometry.y;
break;
}
} }
assert(parent); assert(parent);
*toplevel_sx = popup_sx + parent->geometry.x; *toplevel_sx = popup_sx;
*toplevel_sy = popup_sy + parent->geometry.y; *toplevel_sy = popup_sy;
} }
static void xdg_popup_box_constraints(struct wlr_xdg_popup *popup, static void xdg_popup_box_constraints(struct wlr_xdg_popup *popup,