shell: Display previously pending surface once the ready request was received

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

diff --git a/src/shell.c b/src/shell.c
index 9100ad7..0f2e644 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -50,10 +50,19 @@ insert_black_surface(struct ivi_output *output);
 void
 ivi_set_desktop_surface(struct ivi_surface *surface)
 {
+       struct desktop_client *dclient;
+       struct ivi_compositor *ivi = surface->ivi;
        assert(surface->role == IVI_SURFACE_ROLE_NONE);
 
        surface->role = IVI_SURFACE_ROLE_DESKTOP;
        wl_list_insert(&surface->ivi->surfaces, &surface->link);
+
+       /* advertise to all desktop clients the new surface */
+       wl_list_for_each(dclient, &ivi->desktop_clients, link) {
+               const char *app_id =
+                       weston_desktop_surface_get_app_id(surface->dsurface);
+               agl_shell_desktop_send_application(dclient->resource, app_id);
+       }
 }
 
 void
@@ -90,6 +99,18 @@ ivi_shell_init(struct ivi_compositor *ivi)
        return 0;
 }
 
+static void
+ivi_shell_advertise_xdg_surfaces(struct ivi_compositor *ivi, struct wl_resource *resource)
+{
+       struct ivi_surface *surface;
+
+       wl_list_for_each(surface, &ivi->surfaces, link) {
+               const char *app_id =
+                       weston_desktop_surface_get_app_id(surface->dsurface);
+               agl_shell_desktop_send_application(resource, app_id);
+       }
+}
+
 static void
 client_exec(const char *command, int fd)
 {
@@ -286,7 +307,13 @@ shell_ready(struct wl_client *client, struct wl_resource *shell_res)
 
        wl_list_for_each_safe(surface, tmp, &ivi->pending_surfaces, link) {
                wl_list_remove(&surface->link);
-               ivi_set_desktop_surface(surface);
+
+               if (ivi_check_pending_desktop_surface_popup(surface)) {
+                       ivi_set_desktop_surface_popup(surface);
+               } else {
+                       ivi_set_desktop_surface(surface);
+                       ivi_layout_desktop_committed(surface);
+               }
        }
 }
 
@@ -565,6 +592,9 @@ bind_agl_shell_desktop(struct wl_client *client,
 
        dclient->resource = resource;
        wl_list_insert(&ivi->desktop_clients, &dclient->link);
+
+       /* advertise xdg surfaces */
+       ivi_shell_advertise_xdg_surfaces(ivi, resource);
 }
 
 int