X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=2ef6feecef9476d37cb58e5cf1fa1912eb3d92d7;hb=edbfbad7344c4de62cbf5a4a5c8935afa50d8b4a;hp=7c6c19adfe935bff9fb4031079a750d046a6aed6;hpb=98457c49f5d777e4023082363b814826c21092df;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index 7c6c19a..2ef6fee 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -23,6 +23,7 @@
  * SOFTWARE.
  */
 
+#include <assert.h>
 #include "ivi-compositor.h"
 #include "policy.h"
 
@@ -80,6 +81,7 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
 	surface->ivi = ivi;
 	surface->dsurface = dsurface;
 	surface->role = IVI_SURFACE_ROLE_NONE;
+	surface->activated_by_default = false;
 
 	if (ivi->policy && ivi->policy->api.surface_create &&
 	    !ivi->policy->api.surface_create(surface, ivi)) {
@@ -91,7 +93,7 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
 	weston_desktop_surface_set_user_data(dsurface, surface);
 
 	if (ivi->shell_client.ready) {
-		ivi_set_desktop_surface(surface);
+		ivi_check_pending_desktop_surface(surface);
 	} else {
 		/*
 		 * We delay creating "normal" desktop surfaces until later, to
@@ -110,14 +112,17 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
 	struct weston_surface *wsurface =
 		weston_desktop_surface_get_surface(dsurface);
 
-	struct ivi_output *output = surface->desktop.last_output;
+	struct ivi_output *output;
 
-	/* TODO */
-	if (surface->role != IVI_SURFACE_ROLE_DESKTOP)
+	if (surface->role == IVI_SURFACE_ROLE_DESKTOP)
+		output = surface->desktop.last_output;
+	else if (surface->role == IVI_SURFACE_ROLE_POPUP)
+		output = surface->popup.output;
+	else
 		return;
 
 	/* reset the active surface as well */
-	if (output && output->active) {
+	if (output && output->active && output->active == surface) {
 		output->active->view->is_mapped = false;
 		output->active->view->surface->is_mapped = false;
 
@@ -129,6 +134,29 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
 		weston_view_destroy(surface->view);
 	}
 
+	/* invalidate agl-shell surfaces so we can re-use them when
+	 * binding again */
+	if (surface->role == IVI_SURFACE_ROLE_PANEL) {
+		switch (surface->panel.edge) {
+		case AGL_SHELL_EDGE_TOP:
+			output->top = NULL;
+			break;
+		case AGL_SHELL_EDGE_BOTTOM:
+			output->bottom = NULL;
+			break;
+		case AGL_SHELL_EDGE_LEFT:
+			output->left = NULL;
+			break;
+		case AGL_SHELL_EDGE_RIGHT:
+			output->right = NULL;
+			break;
+		default:
+			assert(!"Invalid edge detected\n");
+		}
+	} else if (surface->role == IVI_SURFACE_ROLE_BACKGROUND) {
+		output->background = NULL;
+	}
+
 	wl_list_remove(&surface->link);
 	free(surface);
 }
@@ -154,6 +182,9 @@ desktop_committed(struct weston_desktop_surface *dsurface,
 	case IVI_SURFACE_ROLE_PANEL:
 		ivi_layout_panel_committed(surface);
 		break;
+	case IVI_SURFACE_ROLE_POPUP:
+		ivi_layout_popup_committed(surface);
+		break;
 	case IVI_SURFACE_ROLE_NONE:
 	case IVI_SURFACE_ROLE_BACKGROUND:
 	default: /* fall through */