X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=f8c614f9db0c85cb4cad98d643891b64a0c72e7e;hb=99c3a72570b96a36d5bf6bd0f252a3c9c725eb90;hp=b8b88db186a912f9d4a026cf385ea39fcf8ef6b9;hpb=c6aa9f35144e80332e2ad3c723124b7711a0bf58;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index b8b88db..f8c614f 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -61,6 +61,7 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
 	struct weston_desktop_client *dclient;
 	struct wl_client *client;
 	struct ivi_surface *surface;
+	const char *app_id = NULL;
 
 	dclient = weston_desktop_surface_get_client(dsurface);
 	client = weston_desktop_client_get_client(dclient);
@@ -92,26 +93,32 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
 
 	weston_desktop_surface_set_user_data(dsurface, surface);
 
+	app_id = weston_desktop_surface_get_app_id(dsurface);
+
 	if (ivi->shell_client.ready) {
 		ivi_check_pending_desktop_surface(surface);
+		weston_log("Added surface %p, app_id %s, role %s\n", surface,
+				app_id, ivi_layout_get_surface_role_name(surface));
 	} else {
 		/*
 		 * We delay creating "normal" desktop surfaces until later, to
 		 * give the shell-client an oppurtunity to set the surface as a
 		 * background/panel.
 		 */
+		weston_log("Added surface %p, app_id %s to pending list\n",
+				surface, app_id);
 		wl_list_insert(&ivi->pending_surfaces, &surface->link);
 	}
 }
 
 static bool
-desktop_surface_check_last_remote_surfaces(struct ivi_compositor *ivi)
+desktop_surface_check_last_remote_surfaces(struct ivi_compositor *ivi, enum ivi_surface_role role)
 {
 	int count = 0;
 	struct ivi_surface *surf;
 
 	wl_list_for_each(surf, &ivi->surfaces, link)
-		if (surf->role == IVI_SURFACE_ROLE_REMOTE)
+		if (surf->role == role)
 			count++;
 
 	return (count == 1);
@@ -150,7 +157,13 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
 	/* check if there's a last 'remote' surface and insert a black
 	 * surface view if there's no background set for that output
 	 */
-	if (desktop_surface_check_last_remote_surfaces(output->ivi))
+	if (desktop_surface_check_last_remote_surfaces(output->ivi,
+	    IVI_SURFACE_ROLE_REMOTE))
+		if (!output->background)
+			insert_black_surface(output);
+
+	if (desktop_surface_check_last_remote_surfaces(output->ivi,
+	    IVI_SURFACE_ROLE_DESKTOP))
 		if (!output->background)
 			insert_black_surface(output);
 
@@ -182,6 +195,9 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
 		output->background = NULL;
 	}
 
+	weston_log("Removed surface %p, app_id %s, role %s\n", surface,
+			weston_desktop_surface_get_app_id(dsurface),
+			ivi_layout_get_surface_role_name(surface));
 	wl_list_remove(&surface->link);
 	free(surface);
 }