meson.build: Remove any prefix assumptions

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

diff --git a/src/layout.c b/src/layout.c
index 028ff4a..9981ebb 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -218,6 +218,7 @@ ivi_layout_activate_complete(struct ivi_output *output,
        struct weston_seat *wseat = get_ivi_shell_weston_first_seat(ivi);
        struct ivi_shell_seat *ivi_seat = get_ivi_shell_seat(wseat);
        const char *app_id = weston_desktop_surface_get_app_id(surf->dsurface);
+       bool update_previous = true;
 
        if (weston_view_is_mapped(view)) {
                weston_layer_entry_remove(&view->layer_link);
@@ -248,6 +249,8 @@ ivi_layout_activate_complete(struct ivi_output *output,
 
 
        weston_view_set_output(view, woutput);
+       /* drop any previous masks set on this view */
+       weston_view_set_mask_infinite(view);
 
        if (surf->role != IVI_SURFACE_ROLE_BACKGROUND)
                weston_view_set_position(view,
@@ -286,7 +289,22 @@ ivi_layout_activate_complete(struct ivi_output *output,
                        weston_layer_entry_remove(&output->active->view->layer_link);
                }
        }
-       output->previous_active = output->active;
+
+       if (output->previous_active && output->active) {
+               const char *c_app_id =
+                       weston_desktop_surface_get_app_id(output->active->dsurface);
+
+               /* if the currently activated app_id is the same as the one
+                * we're trying to complete activation with means we're
+                * operating on the same app_id so do update previous_active as
+                * it will overwrite it with the same value */
+               if (!strcmp(c_app_id, app_id)) {
+                       update_previous = false;
+               }
+       }
+
+       if (update_previous)
+               output->previous_active = output->active;
        output->active = surf;
        surf->current_completed_output = output;
 
@@ -594,7 +612,8 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface)
 
        assert(surface->role == IVI_SURFACE_ROLE_FULLSCREEN);
 
-       if (weston_view_is_mapped(view))
+
+       if (surface->state == FULLSCREEN && weston_view_is_mapped(view))
                return;
 
        /* if we still get here but we haven't resized so far, send configure
@@ -630,7 +649,7 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface)
        }
 
        /* this implies we resized correctly */
-       if (!weston_view_is_mapped(view)) {
+       if (!weston_view_is_mapped(view) || surface->state != FULLSCREEN) {
                weston_layer_entry_remove(&view->layer_link);
 
                weston_view_set_output(view, woutput);
@@ -788,6 +807,24 @@ ivi_compute_popup_position(const struct weston_output *output, struct weston_vie
 }
 
 
+static bool
+ivi_surf_in_hidden_layer(struct ivi_compositor *ivi, struct ivi_surface *surface)
+{
+       struct weston_view *ev;
+
+       wl_list_for_each(ev, &ivi->hidden.view_list.link, layer_link.link) {
+               if (ev == surface->view)
+                       return true;
+       }
+
+       wl_list_for_each(ev, &ivi->fullscreen.view_list.link, layer_link.link) {
+               if (ev == surface->view)
+                       return true;
+       }
+
+       return false;
+}
+
 void
 ivi_layout_popup_committed(struct ivi_surface *surface)
 {
@@ -819,6 +856,10 @@ ivi_layout_popup_committed(struct ivi_surface *surface)
 
        assert(surface->role == IVI_SURFACE_ROLE_POPUP);
 
+       /* remove it from hidden layer if present */
+       if (ivi_surf_in_hidden_layer(ivi, surface))
+               weston_layer_entry_remove(&view->layer_link);
+
        weston_view_set_output(view, woutput);
 
        ivi_compute_popup_position(woutput, view,