X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=f3ea82b3ab55cffa1e4391fd1cd341c9aacec1cf;hb=refs%2Fheads%2Fsandbox%2Fmvlad%2Fpolicy-manager-split;hp=a637ddd303212848c9c2499f957a00d8b9732c75;hpb=08ea4a2fec76b4bdd90b6072ff1002d0829afbed;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index a637ddd..f3ea82b 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -24,9 +24,10 @@
  */
 
 #include "ivi-compositor.h"
+#include "policy.h"
 
-#include <libweston-6/compositor.h>
-#include <libweston-6/libweston-desktop.h>
+#include <libweston/libweston.h>
+#include <libweston-desktop/libweston-desktop.h>
 
 #if 0
 static struct weston_output *
@@ -80,6 +81,13 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
 	surface->dsurface = dsurface;
 	surface->role = IVI_SURFACE_ROLE_NONE;
 
+	if (ivi->policy->api.surface_create &&
+	    !ivi->policy->api.surface_create(surface, ivi)) {
+		free(surface);
+		wl_client_post_no_memory(client);
+		return;
+	}
+
 	weston_desktop_surface_set_user_data(dsurface, surface);
 
 	if (ivi->shell_client.ready) {
@@ -102,15 +110,26 @@ 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;
 
+	/* reset the active surface as well */
+	if (output && output->active) {
+		output->active->view->is_mapped = false;
+		output->active->view->surface->is_mapped = false;
+
+		weston_layer_entry_remove(&output->active->view->layer_link);
+		output->active = NULL;
+	}
 	if (weston_surface_is_mapped(wsurface)) {
 		weston_desktop_surface_unlink_view(surface->view);
 		weston_view_destroy(surface->view);
-		wl_list_remove(&surface->link);
 	}
+
+	wl_list_remove(&surface->link);
 	free(surface);
 }
 
@@ -120,6 +139,12 @@ desktop_committed(struct weston_desktop_surface *dsurface,
 {
 	struct ivi_surface *surface =
 		weston_desktop_surface_get_user_data(dsurface);
+	struct ivi_policy *policy = surface->ivi->policy;
+
+	if (policy->api.surface_commited &&
+	    !policy->api.surface_commited(surface, surface->ivi))
+		return;
+
 	weston_compositor_schedule_repaint(surface->ivi->compositor);
 
 	switch (surface->role) {