desktop: Reset the active surface

In case a previously active surface gets destroyed, we'll have a hard
time detecting if it already been active when switching to it, as it
will point a surface no longer present.

Resets the ivi active surface in case the desktop surface itself is
destroyed.

Bug-AGL: SPEC-3159

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I11406888ece29da4b97ec4c28c746ac397742753

diff --git a/src/desktop.c b/src/desktop.c
index a637ddd..26569d6 100644 (file)
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -102,15 +102,26 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
        struct weston_surface *wsurface =
                weston_desktop_surface_get_surface(dsurface);
 
+       struct ivi_output *output = surface->desktop.last_output;
+
        /* TODO */
        if (surface->role != IVI_SURFACE_ROLE_DESKTOP)
                return;
 
+       /* reset the active surface as well */
+       if (output && output->active) {
+               output->active->view->is_mapped = false;
+               output->active->view->surface->is_mapped = false;
+
+               weston_layer_entry_remove(&output->active->view->layer_link);
+               output->active = NULL;
+       }
        if (weston_surface_is_mapped(wsurface)) {
                weston_desktop_surface_unlink_view(surface->view);
                weston_view_destroy(surface->view);
                wl_list_remove(&surface->link);
        }
+
        free(surface);
 }
 

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 47e20a3..3d7bd25 100644 (file)
--- a/src/ivi-compositor.h
+++ b/src/ivi-compositor.h
@@ -127,6 +127,7 @@ enum ivi_surface_role {
 
 struct ivi_desktop_surface {
        struct ivi_output *pending_output;
+       struct ivi_output *last_output;
 };
 
 struct ivi_background_surface {

diff --git a/src/layout.c b/src/layout.c
index 3166e92..b5bafe3 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -212,6 +212,7 @@ ivi_layout_activate_complete(struct ivi_output *output,
 
        /* force repaint of the entire output */
        weston_output_damage(output->output);
+       surf->desktop.last_output = surf->desktop.pending_output;
        surf->desktop.pending_output = NULL;
 }