desktop: Insert a black surface only when the output is a remote type

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

diff --git a/src/desktop.c b/src/desktop.c
index 5b7b2e5..4caba48 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,13 @@ 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;
+
+       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,6 +116,9 @@ 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);
 
+       /* 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,
@@ -138,9 +158,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);
@@ -167,15 +195,13 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
        /* 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);
@@ -229,6 +255,9 @@ desktop_committed(struct weston_desktop_surface *dsurface,
            !policy->api.surface_commited(surface, surface->ivi))
                return;
 
+       if (!surface->advertised_on_launch)
+               wl_signal_emit(&surface->signal_advertise_app, surface);
+
        weston_compositor_schedule_repaint(surface->ivi->compositor);
 
        switch (surface->role) {