From c1c88bfe5d88b7f6330f5ce5be04ef6951123c3d Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Tue, 13 Mar 2018 12:31:45 +0100
Subject: [PATCH] rootston: destroy seat view on unmap

---
 include/rootston/seat.h | 1 +
 include/rootston/view.h | 1 +
 rootston/desktop.c      | 1 +
 rootston/seat.c         | 9 +++++++++
 4 files changed, 12 insertions(+)

diff --git a/include/rootston/seat.h b/include/rootston/seat.h
index cc0293b5..0b1dbe2d 100644
--- a/include/rootston/seat.h
+++ b/include/rootston/seat.h
@@ -39,6 +39,7 @@ struct roots_seat_view {
 
 	struct wl_list link; // roots_seat::views
 
+	struct wl_listener view_unmap;
 	struct wl_listener view_destroy;
 };
 
diff --git a/include/rootston/view.h b/include/rootston/view.h
index 1e5c0933..92d1feb5 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -130,6 +130,7 @@ struct roots_view {
 	struct wl_listener new_subsurface;
 
 	struct {
+		struct wl_signal unmap;
 		struct wl_signal destroy;
 	} events;
 
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 19b7768c..afe2c221 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -30,6 +30,7 @@ struct roots_view *view_create(struct roots_desktop *desktop) {
 	}
 	view->desktop = desktop;
 	view->alpha = 1.0f;
+	wl_signal_init(&view->events.unmap);
 	wl_signal_init(&view->events.destroy);
 	wl_list_init(&view->children);
 	return view;
diff --git a/rootston/seat.c b/rootston/seat.c
index 9acbb737..c4535c7c 100644
--- a/rootston/seat.c
+++ b/rootston/seat.c
@@ -645,6 +645,7 @@ static void seat_view_destroy(struct roots_seat_view *seat_view) {
 		seat->cursor->pointer_view = NULL;
 	}
 
+	wl_list_remove(&seat_view->view_unmap.link);
 	wl_list_remove(&seat_view->view_destroy.link);
 	wl_list_remove(&seat_view->link);
 	free(seat_view);
@@ -657,6 +658,12 @@ static void seat_view_destroy(struct roots_seat_view *seat_view) {
 	}
 }
 
+static void seat_view_handle_unmap(struct wl_listener *listener, void *data) {
+	struct roots_seat_view *seat_view =
+		wl_container_of(listener, seat_view, view_unmap);
+	seat_view_destroy(seat_view);
+}
+
 static void seat_view_handle_destroy(struct wl_listener *listener, void *data) {
 	struct roots_seat_view *seat_view =
 		wl_container_of(listener, seat_view, view_destroy);
@@ -675,6 +682,8 @@ static struct roots_seat_view *seat_add_view(struct roots_seat *seat,
 
 	wl_list_insert(seat->views.prev, &seat_view->link);
 
+	seat_view->view_unmap.notify = seat_view_handle_unmap;
+	wl_signal_add(&view->events.unmap, &seat_view->view_unmap);
 	seat_view->view_destroy.notify = seat_view_handle_destroy;
 	wl_signal_add(&view->events.destroy, &seat_view->view_destroy);