mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-23 01:40:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

view: Move xdg_surface + xwayland_surface to derived structs

Browse source 
Add xdg_surface_from_view() + xwayland_surface_from_view() accessors
that assert() the view is of the expected type before returning.

Fix a real bug in xdg.c parent_of() that dereferenced
`view->xdg_surface->toplevel` without first checking `view->type`.

The goal of the new accessors is to catch similar bugs in future.
This commit is contained in:
John Lindgren 2022-11-25 13:41:12 -05:00 • committed by Johan Malm
parent df7276345f
commit 4da37c6532
7 changed files with 147 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/desktop.c
View file

@ -22,7 +22,7 @@ move_to_front(struct view *view)
static struct wlr_xwayland_surface *
top_parent_of(struct view *view)
{
struct wlr_xwayland_surface *s = view->xwayland_surface;
struct wlr_xwayland_surface *s = xwayland_surface_from_view(view);
while (s->parent) {
s = s->parent;
}
@ -35,6 +35,8 @@ move_xwayland_sub_views_to_front(struct view *parent)
if (!parent || parent->type != LAB_XWAYLAND_VIEW) {
return;
}
struct wlr_xwayland_surface *parent_xwayland_surface =
xwayland_surface_from_view(parent);
struct view *view, *next;
wl_list_for_each_reverse_safe(view, next, &parent->server->views, link)
{
@ -48,7 +50,7 @@ move_xwayland_sub_views_to_front(struct view *parent)
if (!view->mapped && !view->minimized) {
continue;
}
if (top_parent_of(view) != parent->xwayland_surface) {
if (top_parent_of(view) != parent_xwayland_surface) {
continue;
}
move_to_front(view);