X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fshell.c;h=dc07c269f8fb4d4b2d2ad00b5d84285ac308dcc1;hb=2197dcceaa4b223602f4a7b3de664ae844786460;hp=6ec444abb734c1b9bbf3f2d9b76b550ffd42fa7e;hpb=40f5e3bbfac73375bc4f881b3a168fb0d9297c9b;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index 6ec444a..dc07c26 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -467,7 +467,7 @@ ivi_set_pending_desktop_surface_remote(struct ivi_output *ioutput,
 	if (!p_remote)
 		return;
 
-	wl_list_insert(&ivi->remote_pending_apps, &remote->link);
+	wl_list_insert(&ivi->remote_pending_apps, &p_remote->link);
 }
 
 
@@ -626,14 +626,9 @@ ivi_check_pending_surface_desktop(struct ivi_surface *surface,
 	const char *app_id =
 		weston_desktop_surface_get_app_id(surface->dsurface);
 
-	if (!app_id) {
-		*role = IVI_SURFACE_ROLE_NONE;
-		return;
-	}
-
 	role_pending_list = &ivi->popup_pending_apps;
 	wl_list_for_each(p_popup, role_pending_list, link) {
-		if (!strcmp(app_id, p_popup->app_id)) {
+		if (app_id && !strcmp(app_id, p_popup->app_id)) {
 			*role = IVI_SURFACE_ROLE_POPUP;
 			return;
 		}
@@ -641,7 +636,7 @@ ivi_check_pending_surface_desktop(struct ivi_surface *surface,
 
 	role_pending_list = &ivi->split_pending_apps;
 	wl_list_for_each(p_split, role_pending_list, link) {
-		if (!strcmp(app_id, p_split->app_id)) {
+		if (app_id && !strcmp(app_id, p_split->app_id)) {
 			*role = IVI_SURFACE_ROLE_SPLIT_V;
 			return;
 		}
@@ -649,7 +644,7 @@ ivi_check_pending_surface_desktop(struct ivi_surface *surface,
 
 	role_pending_list = &ivi->fullscreen_pending_apps;
 	wl_list_for_each(p_fullscreen, role_pending_list, link) {
-		if (!strcmp(app_id, p_fullscreen->app_id)) {
+		if (app_id && !strcmp(app_id, p_fullscreen->app_id)) {
 			*role = IVI_SURFACE_ROLE_FULLSCREEN;
 			return;
 		}
@@ -657,7 +652,7 @@ ivi_check_pending_surface_desktop(struct ivi_surface *surface,
 
 	role_pending_list = &ivi->remote_pending_apps;
 	wl_list_for_each(p_remote, role_pending_list, link) {
-		if (!strcmp(app_id, p_remote->app_id)) {
+		if (app_id && !strcmp(app_id, p_remote->app_id)) {
 			*role = IVI_SURFACE_ROLE_REMOTE;
 			return;
 		}
@@ -744,6 +739,63 @@ ivi_shell_init(struct ivi_compositor *ivi)
 	return 0;
 }
 
+
+static void
+ivi_surf_destroy(struct ivi_surface *surf)
+{
+	struct weston_surface *wsurface = surf->view->surface;
+
+	if (weston_surface_is_mapped(wsurface)) {
+		weston_desktop_surface_unlink_view(surf->view);
+		weston_view_destroy(surf->view);
+	}
+
+	wl_list_remove(&surf->link);
+	free(surf);
+}
+
+static void
+ivi_shell_destroy_views_on_layer(struct weston_layer *layer)
+{
+	struct weston_view *view, *view_next;
+
+	wl_list_for_each_safe(view, view_next, &layer->view_list.link, layer_link.link) {
+		struct ivi_surface *ivi_surf =
+			get_ivi_shell_surface(view->surface);
+		if (ivi_surf)
+			ivi_surf_destroy(ivi_surf);
+	}
+}
+
+void
+ivi_shell_finalize(struct ivi_compositor *ivi)
+{
+	struct ivi_output *output;
+
+	ivi_shell_destroy_views_on_layer(&ivi->hidden);
+	weston_layer_fini(&ivi->hidden);
+
+	ivi_shell_destroy_views_on_layer(&ivi->background);
+	weston_layer_fini(&ivi->background);
+
+	ivi_shell_destroy_views_on_layer(&ivi->normal);
+	weston_layer_fini(&ivi->normal);
+
+	ivi_shell_destroy_views_on_layer(&ivi->panel);
+	weston_layer_fini(&ivi->panel);
+
+	ivi_shell_destroy_views_on_layer(&ivi->popup);
+	weston_layer_fini(&ivi->popup);
+
+	wl_list_for_each(output, &ivi->outputs, link) {
+		if (output->fullscreen_view.fs->view) {
+			weston_surface_destroy(output->fullscreen_view.fs->view->surface);
+			output->fullscreen_view.fs->view = NULL;
+		}
+	}
+	weston_layer_fini(&ivi->fullscreen);
+}
+
 static void
 ivi_shell_advertise_xdg_surfaces(struct ivi_compositor *ivi, struct wl_resource *resource)
 {