layout: Do not attempt to activate surfaces that doesn't have a valid app_id

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

diff --git a/src/desktop.c b/src/desktop.c
index 5b7b2e5..7127c2d 100644 (file)
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -42,6 +42,16 @@ get_default_output(struct weston_compositor *compositor)
 }
 #endif
 
+static void
+desktop_advertise_app(struct wl_listener *listener, void *data)
+{
+       struct ivi_surface *surface;
+
+       surface = wl_container_of(listener, surface, listener_advertise_app);
+
+       agl_shell_desktop_advertise_application_id(surface->ivi, surface);
+}
+
 static void
 desktop_ping_timeout(struct weston_desktop_client *dclient, void *userdata)
 {
@@ -84,6 +94,15 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
        surface->dsurface = dsurface;
        surface->role = IVI_SURFACE_ROLE_NONE;
        surface->activated_by_default = false;
+       surface->advertised_on_launch = false;
+       surface->checked_pending = false;
+       wl_list_init(&surface->link);
+
+       wl_signal_init(&surface->signal_advertise_app);
+
+       surface->listener_advertise_app.notify = desktop_advertise_app;
+       wl_signal_add(&surface->signal_advertise_app,
+                     &surface->listener_advertise_app);
 
        weston_desktop_surface_set_user_data(dsurface, surface);
 
@@ -99,20 +118,20 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
        if ((active_output = ivi_layout_find_with_app_id(app_id, ivi)))
                ivi_set_pending_desktop_surface_remote(active_output, app_id);
 
-       if (ivi->shell_client.ready) {
-               ivi_check_pending_desktop_surface(surface);
-               weston_log("Added surface %p, app_id %s, role %s\n", surface,
-                               app_id, ivi_layout_get_surface_role_name(surface));
-       } else {
-               /*
-                * We delay creating "normal" desktop surfaces until later, to
-                * give the shell-client an oppurtunity to set the surface as a
-                * background/panel.
-                */
-               weston_log("Added surface %p, app_id %s to pending list\n",
-                               surface, app_id);
-               wl_list_insert(&ivi->pending_surfaces, &surface->link);
-       }
+       /* reset any caps to make sure we apply the new caps */
+       ivi_seat_reset_caps_sent(ivi);
+
+       /*
+        * We delay creating "normal" desktop surfaces until later, to
+        * give the shell-client an oppurtunity to set the surface as a
+        * background/panel.
+        * Also delay the creation in order to have a valid app_id
+        * which will be used to set the proper role.
+        */
+       weston_log("Added surface %p, app_id %s to pending list\n",
+                       surface, app_id);
+       wl_list_insert(&ivi->pending_surfaces, &surface->link);
+
 }
 
 static bool
@@ -138,9 +157,17 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
 
        struct ivi_output *output = ivi_layout_get_output_from_surface(surface);
 
+       wl_list_remove(&surface->listener_advertise_app.link);
+       surface->listener_advertise_app.notify = NULL;
+
        /* special corner-case, pending_surfaces which are never activated or
-        * being assigned an output might land here so just remove the surface */
-       if (output == NULL && surface->role == IVI_SURFACE_ROLE_NONE)
+        * being assigned an output might land here so just remove the surface;
+        *
+        * the DESKTOP role can happen here as well, because we can fall-back 
+        * to that when we try to determine the role type. Application that
+        * do not set the app_id will be land here, when destroyed */
+       if (output == NULL && (surface->role == IVI_SURFACE_ROLE_NONE ||
+                              surface->role == IVI_SURFACE_ROLE_DESKTOP))
                goto skip_output_asignment;
 
        assert(output != NULL);
@@ -164,18 +191,20 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
                output->active = NULL;
        }
 
+       if (surface->role == IVI_SURFACE_ROLE_REMOTE &&
+           output->type == OUTPUT_REMOTE)
+               ivi_destroy_waltham_destroy(surface);
+
        /* check if there's a last 'remote' surface and insert a black
         * surface view if there's no background set for that output
         */
-       if (desktop_surface_check_last_remote_surfaces(output->ivi,
-           IVI_SURFACE_ROLE_REMOTE))
+       if ((desktop_surface_check_last_remote_surfaces(output->ivi,
+               IVI_SURFACE_ROLE_REMOTE) ||
+           desktop_surface_check_last_remote_surfaces(output->ivi,
+               IVI_SURFACE_ROLE_DESKTOP)) && output->type == OUTPUT_REMOTE)
                if (!output->background)
                        insert_black_surface(output);
 
-       if (desktop_surface_check_last_remote_surfaces(output->ivi,
-           IVI_SURFACE_ROLE_DESKTOP))
-               if (!output->background)
-                       insert_black_surface(output);
 
        if (weston_surface_is_mapped(wsurface)) {
                weston_desktop_surface_unlink_view(surface->view);
@@ -210,9 +239,7 @@ skip_output_asignment:
                        weston_desktop_surface_get_app_id(dsurface),
                        ivi_layout_get_surface_role_name(surface));
 
-       /* we weren't added to any list if we are still with 'none' as role */
-       if (surface->role != IVI_SURFACE_ROLE_NONE)
-               wl_list_remove(&surface->link);
+       wl_list_remove(&surface->link);
 
        free(surface);
 }
@@ -221,6 +248,7 @@ static void
 desktop_committed(struct weston_desktop_surface *dsurface, 
                  int32_t sx, int32_t sy, void *userdata)
 {
+       struct ivi_compositor *ivi = userdata;
        struct ivi_surface *surface =
                weston_desktop_surface_get_user_data(dsurface);
        struct ivi_policy *policy = surface->ivi->policy;
@@ -229,6 +257,20 @@ desktop_committed(struct weston_desktop_surface *dsurface,
            !policy->api.surface_commited(surface, surface->ivi))
                return;
 
+       if (ivi->shell_client.ready && !surface->checked_pending) {
+               const char * app_id =   weston_desktop_surface_get_app_id(dsurface);
+               weston_log("Checking pending surface %p, app_id %s\n", surface,
+                       app_id);
+               wl_list_remove(&surface->link);
+               wl_list_init(&surface->link);
+               ivi_check_pending_desktop_surface(surface);
+               surface->checked_pending = true;
+       }
+
+       if (!surface->advertised_on_launch &&
+           !wl_list_empty(&surface->ivi->desktop_clients))
+               wl_signal_emit(&surface->signal_advertise_app, surface);
+
        weston_compositor_schedule_repaint(surface->ivi->compositor);
 
        switch (surface->role) {