mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-02 03:45:58 +01:00
Merge pull request #1396 from emersion/fix-destroyed-subsurface
surface: fix destroyed subsurfaces handling
This commit is contained in:
commit
ed1ffddba8
2 changed files with 11 additions and 5 deletions
|
@ -43,6 +43,10 @@ struct wlr_compositor *wlr_compositor_create(struct wl_display *display,
|
|||
|
||||
bool wlr_surface_is_subsurface(struct wlr_surface *surface);
|
||||
|
||||
/**
|
||||
* Get a subsurface from a surface. Can return NULL if the subsurface has been
|
||||
* destroyed.
|
||||
*/
|
||||
struct wlr_subsurface *wlr_subsurface_from_wlr_surface(
|
||||
struct wlr_surface *surface);
|
||||
|
||||
|
|
|
@ -376,7 +376,7 @@ static void surface_commit_pending(struct wlr_surface *surface) {
|
|||
}
|
||||
|
||||
static bool subsurface_is_synchronized(struct wlr_subsurface *subsurface) {
|
||||
while (1) {
|
||||
while (subsurface != NULL) {
|
||||
if (subsurface->synchronized) {
|
||||
return true;
|
||||
}
|
||||
|
@ -436,15 +436,14 @@ static void surface_commit(struct wl_client *client,
|
|||
struct wl_resource *resource) {
|
||||
struct wlr_surface *surface = wlr_surface_from_resource(resource);
|
||||
|
||||
if (wlr_surface_is_subsurface(surface)) {
|
||||
struct wlr_subsurface *subsurface =
|
||||
wlr_subsurface_from_wlr_surface(surface);
|
||||
struct wlr_subsurface *subsurface = wlr_surface_is_subsurface(surface) ?
|
||||
wlr_subsurface_from_wlr_surface(surface) : NULL;
|
||||
if (subsurface != NULL) {
|
||||
subsurface_commit(subsurface);
|
||||
} else {
|
||||
surface_commit_pending(surface);
|
||||
}
|
||||
|
||||
struct wlr_subsurface *subsurface;
|
||||
wl_list_for_each(subsurface, &surface->subsurfaces, parent_link) {
|
||||
subsurface_parent_commit(subsurface, false);
|
||||
}
|
||||
|
@ -904,6 +903,9 @@ struct wlr_surface *wlr_surface_get_root_surface(struct wlr_surface *surface) {
|
|||
while (wlr_surface_is_subsurface(surface)) {
|
||||
struct wlr_subsurface *subsurface =
|
||||
wlr_subsurface_from_wlr_surface(surface);
|
||||
if (subsurface == NULL) {
|
||||
break;
|
||||
}
|
||||
surface = subsurface->parent;
|
||||
}
|
||||
return surface;
|
||||
|
|
Loading…
Reference in a new issue