X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=00cc4db9ac1a31815a3bd45fd7cfaf8e17b836b6;hb=refs%2Fchanges%2F56%2F24756%2F4;hp=a3552e2141f3e6b34598e4de268570047ab464d7;hpb=f235042e4cd88197ade414795382ba227f924332;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index a3552e2..00cc4db 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;
+	struct ivi_output *active_output = NULL;
 	const char *app_id = NULL;
 
 	dclient = weston_desktop_surface_get_client(dsurface);
@@ -95,6 +96,9 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
 
 	app_id = weston_desktop_surface_get_app_id(dsurface);
 
+	if ((active_output = ivi_layout_find_with_app_id(app_id, ivi)))
+		ivi_set_pending_desktop_surface_remote(active_output, app_id);
+
 	if (ivi->shell_client.ready) {
 		ivi_check_pending_desktop_surface(surface);
 		weston_log("Added surface %p, app_id %s, role %s\n", surface,
@@ -112,13 +116,13 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
 }
 
 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);
@@ -157,7 +161,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);
 
@@ -215,9 +225,6 @@ desktop_committed(struct weston_desktop_surface *dsurface,
 	case IVI_SURFACE_ROLE_REMOTE:
 		ivi_layout_desktop_committed(surface);
 		break;
-	case IVI_SURFACE_ROLE_PANEL:
-		ivi_layout_panel_committed(surface);
-		break;
 	case IVI_SURFACE_ROLE_POPUP:
 		ivi_layout_popup_committed(surface);
 		break;
@@ -230,6 +237,7 @@ desktop_committed(struct weston_desktop_surface *dsurface,
 		break;
 	case IVI_SURFACE_ROLE_NONE:
 	case IVI_SURFACE_ROLE_BACKGROUND:
+	case IVI_SURFACE_ROLE_PANEL:
 	default: /* fall through */
 		break;
 	}