view: remove foreign toplevel listenesers on destroy

rpigott · Aug 3, 2020 · b586d50 · b586d50
1 parent 0c0016e
commit b586d50
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
@@ -101,6 +101,7 @@ struct sway_view {
 	struct wl_listener foreign_activate_request;
 	struct wl_listener foreign_fullscreen_request;
 	struct wl_listener foreign_close_request;
+	struct wl_listener foreign_destroy;
 
 	bool destroying;
 

diff --git a/sway/tree/view.c b/sway/tree/view.c
@@ -670,6 +670,17 @@ static void handle_foreign_close_request(
 	view_close(view);
 }
 
+static void handle_foreign_destroy(
+		struct wl_listener *listener, void *data) {
+	struct sway_view *view = wl_container_of(
+			listener, view, foreign_destroy);
+
+	wl_list_remove(&view->foreign_activate_request.link);
+	wl_list_remove(&view->foreign_fullscreen_request.link);
+	wl_list_remove(&view->foreign_close_request.link);
+	wl_list_remove(&listener->link);
+}
+
 void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
 			  bool fullscreen, struct wlr_output *fullscreen_output,
 			  bool decoration) {
@@ -709,6 +720,9 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
 	view->foreign_close_request.notify = handle_foreign_close_request;
 	wl_signal_add(&view->foreign_toplevel->events.request_close,
 			&view->foreign_close_request);
+	view->foreign_destroy.notify = handle_foreign_destroy;
+	wl_signal_add(&view->foreign_toplevel->events.destroy,
+			&view->foreign_destroy);
 
 	// If we're about to launch the view into the floating container, then
 	// launch it as a tiled view in the root of the workspace instead.
@@ -795,9 +809,6 @@ void view_unmap(struct sway_view *view) {
 	}
 
 	if (view->foreign_toplevel) {
-		wl_list_remove(&view->foreign_activate_request.link);
-		wl_list_remove(&view->foreign_fullscreen_request.link);
-		wl_list_remove(&view->foreign_close_request.link);
 		wlr_foreign_toplevel_handle_v1_destroy(view->foreign_toplevel);
 		view->foreign_toplevel = NULL;
 	}