meson.build: Increase the build version of agl-compositor

[src/agl-compositor.git] / src / desktop.c

diff --git a/src/desktop.c b/src/desktop.c
index 26569d6..f3ea82b 100644 (file)
--- 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) {
@@ -119,9 +127,9 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
        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);
 }
 
@@ -131,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) {