mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix segfault when destroying unmapped child view

This commit is contained in:
emersion 2018-11-28 14:08:20 +01:00
parent f737854e30
commit b98563d2d7
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sway/tree/view.h
View File

@ -195,6 +195,7 @@ struct sway_view_child {
struct sway_view *view; struct sway_view *view;
struct wlr_surface *surface; struct wlr_surface *surface;
bool mapped;
struct wl_listener surface_commit; struct wl_listener surface_commit;
struct wl_listener surface_new_subsurface; struct wl_listener surface_new_subsurface;

12
sway/tree/view.c
View File

@ -711,8 +711,6 @@ static const struct sway_view_child_impl subsurface_impl = {
.destroy = subsurface_destroy, .destroy = subsurface_destroy,
}; };
static void view_child_damage(struct sway_view_child *child, bool whole);
static void subsurface_handle_destroy(struct wl_listener *listener, static void subsurface_handle_destroy(struct wl_listener *listener,
void *data) { void *data) {
struct sway_subsurface *subsurface = struct sway_subsurface *subsurface =
@ -721,6 +719,8 @@ static void subsurface_handle_destroy(struct wl_listener *listener,
view_child_destroy(child); view_child_destroy(child);
} }
static void view_child_damage(struct sway_view_child *child, bool whole);
static void view_subsurface_create(struct sway_view *view, static void view_subsurface_create(struct sway_view *view,
struct wlr_subsurface *wlr_subsurface) { struct wlr_subsurface *wlr_subsurface) {
struct sway_subsurface *subsurface = struct sway_subsurface *subsurface =
@ -734,6 +734,9 @@ static void view_subsurface_create(struct sway_view *view,
wl_signal_add(&wlr_subsurface->events.destroy, &subsurface->destroy); wl_signal_add(&wlr_subsurface->events.destroy, &subsurface->destroy);
subsurface->destroy.notify = subsurface_handle_destroy; subsurface->destroy.notify = subsurface_handle_destroy;
subsurface->child.mapped = true;
view_child_damage(&subsurface->child, true);
} }
static void view_child_damage(struct sway_view_child *child, bool whole) { static void view_child_damage(struct sway_view_child *child, bool whole) {
@ -778,6 +781,7 @@ static void view_child_handle_surface_map(struct wl_listener *listener,
void *data) { void *data) {
struct sway_view_child *child = struct sway_view_child *child =
wl_container_of(listener, child, surface_map); wl_container_of(listener, child, surface_map);
child->mapped = true;
view_child_damage(child, true); view_child_damage(child, true);
} }
@ -786,6 +790,7 @@ static void view_child_handle_surface_unmap(struct wl_listener *listener,
struct sway_view_child *child = struct sway_view_child *child =
wl_container_of(listener, child, surface_unmap); wl_container_of(listener, child, surface_unmap);
view_child_damage(child, true); view_child_damage(child, true);
child->mapped = false;
} }
void view_child_init(struct sway_view_child *child, void view_child_init(struct sway_view_child *child,
@ -804,6 +809,7 @@ void view_child_init(struct sway_view_child *child,
wl_signal_add(&surface->events.destroy, &child->surface_destroy); wl_signal_add(&surface->events.destroy, &child->surface_destroy);
child->surface_destroy.notify = view_child_handle_surface_destroy; child->surface_destroy.notify = view_child_handle_surface_destroy;
// Not all child views have a map/unmap event
child->surface_map.notify = view_child_handle_surface_map; child->surface_map.notify = view_child_handle_surface_map;
child->surface_unmap.notify = view_child_handle_surface_unmap; child->surface_unmap.notify = view_child_handle_surface_unmap;
@ -814,7 +820,7 @@ void view_child_init(struct sway_view_child *child,
} }
void view_child_destroy(struct sway_view_child *child) { void view_child_destroy(struct sway_view_child *child) {
if (child->view->container != NULL) { if (child->mapped && child->view->container != NULL) {
view_child_damage(child, true); view_child_damage(child, true);
} }