layout: Send dimensions when setting up property as fullscreen

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

diff --git a/src/layout.c b/src/layout.c
index 322fa80..70cc837 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -195,6 +195,8 @@ ivi_layout_activate_complete(struct ivi_output *output,
 
        if (weston_view_is_mapped(view)) {
                weston_layer_entry_remove(&view->layer_link);
+       } else {
+               weston_view_update_transform(view);
        }
 
        weston_view_set_output(view, woutput);
@@ -203,6 +205,7 @@ ivi_layout_activate_complete(struct ivi_output *output,
                                 woutput->y + output->area.y);
 
        view->is_mapped = true;
+       surf->mapped = true;
        view->surface->is_mapped = true;
 
        if (output->active) {
@@ -215,9 +218,8 @@ ivi_layout_activate_complete(struct ivi_output *output,
        output->active = surf;
 
        weston_layer_entry_insert(&ivi->normal.view_list, &view->layer_link);
-
        weston_view_geometry_dirty(view);
-       weston_view_schedule_repaint(view);
+       weston_surface_damage(view->surface);
 
        /*
         * the 'remote' role now makes use of this part so make sure we don't
@@ -254,8 +256,7 @@ ivi_layout_find_with_app_id(const char *app_id, struct ivi_compositor *ivi)
        return NULL;
 }
 
-
-static struct ivi_output *
+struct ivi_output *
 ivi_layout_find_bg_output(struct ivi_compositor *ivi)
 {
        struct ivi_output *out;
@@ -285,7 +286,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
         * we can't make use here of the ivi_layout_get_output_from_surface()
         * due to the fact that we'll always land here when a surface performs
         * a commit and pending_output will not bet set. This works in tandem
-        * with 'activated_by_default' at this point to avoid tripping over
+        * with 'mapped' at this point to avoid tripping over
         * to a surface that continuously updates its content
         */
        if (surf->role == IVI_SURFACE_ROLE_DESKTOP)
@@ -301,7 +302,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
                        return;
 
                /* we can only activate it again by using the protocol */
-               if (surf->activated_by_default)
+               if (surf->mapped)
                        return;
 
                /* check first if there aren't any outputs being set */
@@ -341,7 +342,6 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
                                        weston_desktop_surface_get_app_id(surf->dsurface),
                                        ivi_layout_get_surface_role_name(surf));
                                ivi_layout_activate(r_output, app_id);
-                               surf->activated_by_default = true;
                        } else if (!app_id) {
                                /*
                                 * applications not setting an app_id, or
@@ -353,7 +353,6 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
                                weston_log("Surface no app_id, role %s activating by default\n",
                                        ivi_layout_get_surface_role_name(surf));
                                ivi_layout_activate_by_surf(r_output, surf);
-                               surf->activated_by_default = true;
                        }
                }
 
@@ -370,7 +369,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
                 * ivi_layout_activate_complete() terminates so we use the
                 * current active surface to avoid hitting this again and again
                 * */
-               if (surf->activated_by_default && output->active == surf)
+               if (surf->mapped && output->active == surf)
                        return;
 
                if (app_id) {
@@ -378,7 +377,6 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
                                        weston_desktop_surface_get_app_id(surf->dsurface),
                                        ivi_layout_get_surface_role_name(surf));
                        ivi_layout_activate(output, app_id);
-                       surf->activated_by_default = true;
                }
                return;
        }
@@ -404,32 +402,40 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface)
 
        struct ivi_output *output = surface->split.output;
        struct weston_output *woutput = output->output;
+       struct ivi_output *bg_output = ivi_layout_find_bg_output(ivi);
 
        struct weston_view *view = surface->view;
        struct weston_geometry geom;
 
        if (policy && policy->api.surface_activate_by_default &&
            !policy->api.surface_activate_by_default(surface, surface->ivi) &&
-           !surface->activated_by_default)
+           !surface->mapped)
                return;
 
        if (surface->view->is_mapped)
                return;
 
        geom = weston_desktop_surface_get_geometry(dsurface);
-       weston_log("(fs) geom x %d, y %d, width %d, height %d\n", geom.x, geom.y,
-                       geom.width, geom.height);
-
        assert(surface->role == IVI_SURFACE_ROLE_FULLSCREEN);
 
-       weston_desktop_surface_set_fullscreen(dsurface, true);
+       if (!weston_desktop_surface_get_fullscreen(dsurface) ||
+           geom.width != bg_output->output->width ||
+           geom.height != bg_output->output->height) {
+               struct weston_desktop_client *desktop_client =
+                       weston_desktop_surface_get_client(dsurface);
+               struct wl_client *client =
+                       weston_desktop_client_get_client(desktop_client);
+               wl_client_post_implementation_error(client,
+                               "Can not display surface due to invalid geometry");
+               return;
+       }
 
        weston_view_set_output(view, woutput);
        weston_view_set_position(view, woutput->x, woutput->y);
        weston_layer_entry_insert(&ivi->fullscreen.view_list, &view->layer_link);
 
-       weston_view_update_transform(view);
-       weston_view_damage_below(view);
+       weston_view_geometry_dirty(view);
+       weston_surface_damage(view->surface);
 
        wsurface->is_mapped = true;
        surface->view->is_mapped = true;
@@ -457,8 +463,9 @@ ivi_layout_desktop_resize(struct ivi_surface *surface,
                                        width, height);
 
        weston_view_set_position(view, x, y);
-       weston_view_update_transform(view);
-       weston_view_damage_below(view);
+
+       weston_view_geometry_dirty(view);
+       weston_surface_damage(view->surface);
 }
 
 void
@@ -486,7 +493,7 @@ ivi_layout_split_committed(struct ivi_surface *surface)
 
        if (policy && policy->api.surface_activate_by_default &&
            !policy->api.surface_activate_by_default(surface, surface->ivi) &&
-           !surface->activated_by_default)
+           !surface->mapped)
                return;
 
        if (surface->view->is_mapped)
@@ -542,8 +549,8 @@ ivi_layout_split_committed(struct ivi_surface *surface)
        weston_view_set_position(view, x, y);
        weston_layer_entry_insert(&ivi->normal.view_list, &view->layer_link);
 
-       weston_view_update_transform(view);
-       weston_view_damage_below(view);
+       weston_view_geometry_dirty(view);
+       weston_surface_damage(view->surface);
 
        wsurface->is_mapped = true;
        surface->view->is_mapped = true;
@@ -584,7 +591,7 @@ ivi_layout_popup_committed(struct ivi_surface *surface)
 
        if (policy && policy->api.surface_activate_by_default &&
            !policy->api.surface_activate_by_default(surface, surface->ivi) &&
-           !surface->activated_by_default)
+           !surface->mapped)
                return;
 
        if (surface->view->is_mapped)
@@ -607,8 +614,8 @@ ivi_layout_popup_committed(struct ivi_surface *surface)
 
        weston_layer_entry_insert(&ivi->popup.view_list, &view->layer_link);
 
-       weston_view_update_transform(view);
-       weston_view_damage_below(view);
+       weston_view_geometry_dirty(view);
+       weston_surface_damage(view->surface);
 
        wsurface->is_mapped = true;
        surface->view->is_mapped = true;
@@ -639,8 +646,8 @@ ivi_layout_popup_re_add(struct ivi_surface *surface)
 
        /* reset the activate by default in order to (still) allow the surface
         * to be activaved using the request */
-       if (!surface->activated_by_default)
-               surface->activated_by_default = true;
+       if (!surface->mapped)
+               surface->mapped = true;
 
        ivi_layout_popup_committed(surface);
 }
@@ -658,8 +665,8 @@ ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf)
 
        /* reset the activate by default in order to (still) allow the surface
         * to be activaved using the request */
-       if (!surf->activated_by_default)
-               surf->activated_by_default = true;
+       if (!surf->mapped)
+               surf->mapped = true;
 
        wl_list_for_each(is, &ivi->surfaces, link)
                if (is == surf)
@@ -746,8 +753,6 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf)
 
                weston_view_set_output(view, output->output);
                weston_layer_entry_insert(&ivi->hidden.view_list, &view->layer_link);
-               /* force repaint of the entire output */
-
                weston_log("Placed app_id %s, type %s in hidden layer\n",
                                app_id, ivi_layout_get_surface_role_name(surf));
        }
@@ -846,7 +851,8 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
                                view->surface->is_mapped = false;
 
                                weston_layer_entry_remove(&view->layer_link);
-                               weston_view_damage_below(view);
+                               weston_view_geometry_dirty(view);
+                               weston_surface_damage(view->surface);
                                ivi_output->active = NULL;
                        }
                } else {
@@ -862,6 +868,7 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
                struct weston_view *view  = surf->view;
 
                weston_layer_entry_remove(&view->layer_link);
-               weston_view_damage_below(view);
+               weston_view_geometry_dirty(view);
+               weston_surface_damage(view->surface);
        }
 }