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 4caba48..7127c2d 100644 (file)
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -95,6 +95,8 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
        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);
 
@@ -119,20 +121,17 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
        /* reset any caps to make sure we apply the new caps */
        ivi_seat_reset_caps_sent(ivi);
 
-       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);
-       }
+       /*
+        * 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
@@ -192,6 +191,10 @@ 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
         */
@@ -236,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);
 }
@@ -247,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;
@@ -255,7 +257,18 @@ desktop_committed(struct weston_desktop_surface *dsurface,
            !policy->api.surface_commited(surface, surface->ivi))
                return;
 
-       if (!surface->advertised_on_launch)
+       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);