layout: Resize the active surface when doing the split

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

diff --git a/src/layout.c b/src/layout.c
index 6f6c763..a09010c 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -32,6 +32,8 @@
 #include <libweston/libweston.h>
 #include <libweston-desktop/libweston-desktop.h>
 
+#include "agl-shell-desktop-server-protocol.h"
+
 #define AGL_COMP_DEBUG
 
 static void
@@ -165,7 +167,7 @@ ivi_layout_init(struct ivi_compositor *ivi, struct ivi_output *output)
                   output->area.x, output->area.y);
 }
 
-static struct ivi_surface *
+struct ivi_surface *
 ivi_find_app(struct ivi_compositor *ivi, const char *app_id)
 {
        struct ivi_surface *surf;
@@ -282,6 +284,148 @@ skip_config_check:
        ivi_layout_activate_complete(output, surf);
 }
 
+void
+ivi_layout_fs_committed(struct ivi_surface *surface)
+{
+       struct ivi_compositor *ivi = surface->ivi;
+
+       struct weston_desktop_surface *dsurface = surface->dsurface;
+       struct weston_surface *wsurface =
+               weston_desktop_surface_get_surface(dsurface);
+
+       struct ivi_output *output = surface->split.output;
+       struct weston_output *woutput = output->output;
+
+       struct weston_view *view = surface->view;
+       struct weston_geometry geom;
+
+       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_FS);
+
+       weston_desktop_surface_set_fullscreen(dsurface, true);
+
+       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);
+
+       wsurface->is_mapped = true;
+       surface->view->is_mapped = true;
+}
+
+void
+ivi_layout_desktop_resize(struct ivi_surface *surface,
+                         struct weston_geometry area)
+{
+       struct weston_desktop_surface *dsurf = surface->dsurface;
+       struct weston_view *view = surface->view;
+
+       int x = area.x;
+       int y = area.y;
+       int width = area.width;
+       int height = area.height;
+
+       weston_desktop_surface_set_size(dsurf,
+                                       width, height);
+
+       weston_view_set_position(view, x, y);
+       weston_view_update_transform(view);
+       weston_view_damage_below(view);
+}
+
+void
+ivi_layout_split_committed(struct ivi_surface *surface)
+{
+       struct ivi_compositor *ivi = surface->ivi;
+
+       struct weston_desktop_surface *dsurface = surface->dsurface;
+       struct weston_surface *wsurface =
+               weston_desktop_surface_get_surface(dsurface);
+
+       struct ivi_output *output = surface->split.output;
+       struct weston_output *woutput = output->output;
+
+       struct weston_view *view = surface->view;
+       struct weston_geometry geom;
+
+       int x, y;
+       int width, height;
+
+       x = woutput->x;
+       y = woutput->y;
+
+       if (surface->view->is_mapped)
+               return;
+
+       geom = weston_desktop_surface_get_geometry(dsurface);
+
+       assert(surface->role == IVI_SURFACE_ROLE_SPLIT_H ||
+              surface->role == IVI_SURFACE_ROLE_SPLIT_V);
+
+       /* save the previous area in order to recover it back when if this kind
+        * of surface is being destroyed/removed */
+       output->area_saved = output->area;
+
+       switch (surface->role) {
+       case IVI_SURFACE_ROLE_SPLIT_V:
+               if (geom.width == woutput->width &&
+                   geom.height == woutput->height)
+                       geom.width = (output->area.width / 2);
+
+               x += woutput->width - geom.width;
+               output->area.width -= geom.width;
+
+               width = woutput->width - x;
+               height = output->area.height;
+               y = output->area.y;
+
+               break;
+       case IVI_SURFACE_ROLE_SPLIT_H:
+               if (geom.width == woutput->width &&
+                   geom.height == woutput->height)
+                       geom.height = (output->area.height / 2);
+
+               y = output->area.y;
+               output->area.y += geom.height;
+               output->area.height -= geom.height;
+
+               width = output->area.width;
+               height = output->area.height;
+
+               x = output->area.x;
+
+               break;
+       default:
+               assert(!"Invalid split orientation\n");
+       }
+
+       weston_desktop_surface_set_size(dsurface,
+                                       width, height);
+
+       /* resize the active surface first, output->area already contains
+        * correct area to resize to */
+       if (output->active)
+               ivi_layout_desktop_resize(output->active, output->area);
+
+       weston_view_set_output(view, woutput);
+       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);
+
+       wsurface->is_mapped = true;
+       surface->view->is_mapped = true;
+}
+
 void
 ivi_layout_popup_committed(struct ivi_surface *surface)
 {
@@ -325,7 +469,6 @@ ivi_layout_popup_re_add(struct ivi_surface *surface)
 {
        assert(surface->role == IVI_SURFACE_ROLE_POPUP);
        struct weston_view *view = surface->view;
-       struct ivi_compositor *ivi = surface->ivi;
 
        if (weston_view_is_mapped(view)) {
                struct weston_desktop_surface *dsurface = surface->dsurface;
@@ -470,7 +613,6 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id)
                /* force repaint of the entire output */
                weston_output_damage(output->output);
        }
-
 }
 
 static struct ivi_output *