X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=90131c270734311cc67bf1b214a51d179ba58cbd;hb=d95b25c6a9dfa6ef7b8d6dfa05c8a2594c045e52;hp=3e36415b294274f55c284448bde25cb3f0108795;hpb=fcd71e034d378921e0408a69dedcd8d0f4836401;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index 3e36415..90131c2 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -23,6 +23,7 @@
  * SOFTWARE.
  */
 
+#include <assert.h>
 #include "ivi-compositor.h"
 #include "policy.h"
 
@@ -92,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
@@ -111,11 +112,18 @@ 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;
-
-	/* TODO */
-	if (surface->role != IVI_SURFACE_ROLE_DESKTOP)
-		return;
+	struct ivi_output *output = ivi_layout_get_output_from_surface(surface);
+	assert(output != NULL);
+
+	/* resize the active surface to the original size */
+	if (surface->role == IVI_SURFACE_ROLE_SPLIT_H ||
+	    surface->role == IVI_SURFACE_ROLE_SPLIT_V) {
+		if (output && output->active) {
+			ivi_layout_desktop_resize(output->active, output->area_saved);
+		}
+		/* restore the area back so we can re-use it again if needed */
+		output->area = output->area_saved;
+	}
 
 	/* reset the active surface as well */
 	if (output && output->active && output->active == surface) {
@@ -130,6 +138,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);
 }
@@ -155,6 +186,16 @@ 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_FULLSCREEN:
+		ivi_layout_fullscreen_committed(surface);
+		break;
+	case IVI_SURFACE_ROLE_SPLIT_H:
+	case IVI_SURFACE_ROLE_SPLIT_V:
+		ivi_layout_split_committed(surface);
+		break;
 	case IVI_SURFACE_ROLE_NONE:
 	case IVI_SURFACE_ROLE_BACKGROUND:
 	default: /* fall through */