desktop: Fix destruction of applications that fallback to the desktop role

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

diff --git a/src/shell.c b/src/shell.c
index f969503..4886a0a 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -137,7 +137,8 @@ ivi_set_desktop_surface_split(struct ivi_surface *surface)
 
 static void
 ivi_set_pending_desktop_surface_popup(struct ivi_output *ioutput,
-                                     int x, int y, const char *app_id)
+                                     int x, int y, int bx, int by, int width, int height,
+                                     const char *app_id)
 {
        struct ivi_compositor *ivi = ioutput->ivi;
        size_t len_app_id = strlen(app_id);
@@ -150,6 +151,11 @@ ivi_set_pending_desktop_surface_popup(struct ivi_output *ioutput,
        p_popup->x = x;
        p_popup->y = y;
 
+       p_popup->bb.x = bx;
+       p_popup->bb.y = by;
+       p_popup->bb.width = width;
+       p_popup->bb.height = height;
+
        wl_list_insert(&ivi->popup_pending_apps, &p_popup->link);
 }
 
@@ -258,7 +264,7 @@ ivi_check_pending_desktop_surface_popup(struct ivi_surface *surface)
        const char *_app_id =
                        weston_desktop_surface_get_app_id(surface->dsurface);
 
-       if (wl_list_empty(&ivi->popup_pending_apps))
+       if (wl_list_empty(&ivi->popup_pending_apps) || !_app_id)
                return false;
 
        wl_list_for_each_safe(p_popup, next_p_popup,
@@ -267,6 +273,12 @@ ivi_check_pending_desktop_surface_popup(struct ivi_surface *surface)
                        surface->popup.output = p_popup->ioutput;
                        surface->popup.x = p_popup->x;
                        surface->popup.y = p_popup->y;
+
+                       surface->popup.bb.x = p_popup->bb.x;
+                       surface->popup.bb.y = p_popup->bb.y;
+                       surface->popup.bb.width = p_popup->bb.width;
+                       surface->popup.bb.height = p_popup->bb.height;
+
                        ivi_remove_pending_desktop_surface_popup(p_popup);
                        return true;
                }
@@ -283,7 +295,7 @@ ivi_check_pending_desktop_surface_split(struct ivi_surface *surface)
        const char *_app_id =
                        weston_desktop_surface_get_app_id(surface->dsurface);
 
-       if (wl_list_empty(&ivi->split_pending_apps))
+       if (wl_list_empty(&ivi->split_pending_apps) || !_app_id)
                return false;
 
        wl_list_for_each_safe(split_surf, next_split_surf,
@@ -307,7 +319,7 @@ ivi_check_pending_desktop_surface_fullscreen(struct ivi_surface *surface)
        const char *_app_id =
                        weston_desktop_surface_get_app_id(surface->dsurface);
 
-       if (wl_list_empty(&ivi->fullscreen_pending_apps))
+       if (wl_list_empty(&ivi->fullscreen_pending_apps) || !_app_id)
                return false;
 
        wl_list_for_each_safe(fs_surf, next_fs_surf,
@@ -330,7 +342,7 @@ ivi_check_pending_desktop_surface_remote(struct ivi_surface *surface)
        const char *_app_id =
                weston_desktop_surface_get_app_id(surface->dsurface);
 
-       if (wl_list_empty(&ivi->remote_pending_apps))
+       if (wl_list_empty(&ivi->remote_pending_apps) || !_app_id)
                return false;
 
        wl_list_for_each_safe(remote_surf, next_remote_surf,
@@ -858,7 +870,9 @@ static void
 shell_desktop_set_app_property(struct wl_client *client,
                               struct wl_resource *shell_res,
                               const char *app_id, uint32_t role,
-                              int x, int y, struct wl_resource *output_res)
+                              int x, int y, int bx, int by,
+                              int width, int height,
+                              struct wl_resource *output_res)
 {
        struct weston_head *head = weston_head_from_resource(output_res);
        struct weston_output *woutput = weston_head_get_output(head);
@@ -866,7 +880,8 @@ shell_desktop_set_app_property(struct wl_client *client,
 
        switch (role) {
        case AGL_SHELL_DESKTOP_APP_ROLE_POPUP:
-               ivi_set_pending_desktop_surface_popup(output, x, y, app_id);
+               ivi_set_pending_desktop_surface_popup(output, x, y, bx, by,
+                                                     width, height, app_id);
                break;
        case AGL_SHELL_DESKTOP_APP_ROLE_FULLSCREEN:
                ivi_set_pending_desktop_surface_fullscreen(output, app_id);
@@ -934,6 +949,17 @@ bind_agl_shell(struct wl_client *client,
 {
        struct ivi_compositor *ivi = data;
        struct wl_resource *resource;
+       struct ivi_policy *policy;
+       void *interface;
+
+       policy = ivi->policy;
+       interface = (void *) &agl_shell_interface;
+       if (policy && policy->api.shell_bind_interface &&
+           !policy->api.shell_bind_interface(client, interface)) {
+               wl_client_post_implementation_error(client,
+                                      "client not authorized to use agl_shell");
+               return;
+       }
 
        resource = wl_resource_create(client, &agl_shell_interface,
                                      1, id);
@@ -976,8 +1002,20 @@ bind_agl_shell_desktop(struct wl_client *client,
 {
        struct ivi_compositor *ivi = data;
        struct wl_resource *resource;
-       struct desktop_client *dclient = zalloc(sizeof(*dclient));
+       struct ivi_policy *policy;
+       struct desktop_client *dclient;
+       void *interface;
+
+       policy = ivi->policy;
+       interface  = (void *) &agl_shell_desktop_interface;
+       if (policy && policy->api.shell_bind_interface &&
+           !policy->api.shell_bind_interface(client, interface)) {
+               wl_client_post_implementation_error(client,
+                               "client not authorized to use agl_shell_desktop");
+               return;
+       }
 
+       dclient = zalloc(sizeof(*dclient));
        if (!dclient) {
                wl_client_post_no_memory(client);
                return;