shell: Add the ability to dynamically move application window

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

diff --git a/src/layout.c b/src/layout.c
index 9981ebb..ea293ca 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -49,6 +49,9 @@ static const char *ivi_roles_as_string[] = {
        [IVI_SURFACE_ROLE_REMOTE]       = "REMOTE",
 };
 
+bool
+ivi_surf_in_hidden_layer(struct ivi_compositor *ivi, struct ivi_surface *surface);
+
 const char *
 ivi_layout_get_surface_role_name(struct ivi_surface *surf)
 {
@@ -427,8 +430,10 @@ ivi_layout_add_to_hidden_layer(struct ivi_surface *surf,
        if (surf->hidden_layer_output &&
            surf->hidden_layer_output != ivi_output) {
                weston_layer_entry_remove(&ev->layer_link);
+               weston_view_geometry_dirty(ev);
+               weston_surface_damage(ev->surface);
 
-               if (ivi_output->area.width != surf->hidden_layer_output->area.width &&
+               if (ivi_output->area.width != surf->hidden_layer_output->area.width ||
                    ivi_output->area.height != surf->hidden_layer_output->area.height) {
                        weston_desktop_surface_set_maximized(dsurf, true);
                        weston_desktop_surface_set_size(dsurf,
@@ -451,6 +456,53 @@ ivi_layout_add_to_hidden_layer(struct ivi_surface *surf,
        weston_compositor_schedule_repaint(ivi->compositor);
 }
 
+void
+ivi_layout_remote_committed(struct ivi_surface *surf)
+{
+       struct weston_desktop_surface *dsurf = surf->dsurface;
+       struct weston_geometry geom = weston_desktop_surface_get_geometry(dsurf);
+       struct ivi_policy *policy = surf->ivi->policy;
+       struct ivi_output *output;
+       const char *app_id = weston_desktop_surface_get_app_id(dsurf);
+
+       assert(surf->role == IVI_SURFACE_ROLE_REMOTE);
+
+       output = surf->remote.output;
+
+       if (policy && policy->api.surface_activate_by_default &&
+           !policy->api.surface_activate_by_default(surf, surf->ivi))
+               return;
+
+       /* we can only activate it again by using the protocol, but
+        * additionally the output is not reset when
+        * ivi_layout_activate_complete() terminates so we use the
+        * current active surface to avoid hitting this again and again
+        * */
+       if (surf->mapped && output->active == surf)
+               return;
+
+       if (!surf->ivi->activate_by_default &&
+           !ivi_surf_in_hidden_layer(surf->ivi, surf)) {
+               weston_log("Refusing to activate surface role %d, "
+                           "app_id %s\n", surf->role, app_id);
+
+               if (!weston_desktop_surface_get_maximized(dsurf) ||
+                   geom.width != output->area.width ||
+                   geom.height != output->area.height) {
+                       ivi_layout_add_to_hidden_layer(surf, output);
+               }
+
+               return;
+       }
+
+       if (!weston_desktop_surface_get_maximized(dsurf) ||
+           geom.width != output->area.width ||
+           geom.height != output->area.height)
+               return;
+
+       ivi_layout_activate_complete(output, surf);
+}
+
 void
 ivi_layout_desktop_committed(struct ivi_surface *surf)
 {
@@ -460,8 +512,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
        struct ivi_output *output;
        const char *app_id = weston_desktop_surface_get_app_id(dsurf);
 
-       assert(surf->role == IVI_SURFACE_ROLE_DESKTOP ||
-              surf->role == IVI_SURFACE_ROLE_REMOTE);
+       assert(surf->role == IVI_SURFACE_ROLE_DESKTOP);
 
        /*
         * we can't make use here of the ivi_layout_get_output_from_surface()
@@ -470,12 +521,9 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
         * with 'mapped' at this point to avoid tripping over
         * to a surface that continuously updates its content
         */
-       if (surf->role == IVI_SURFACE_ROLE_DESKTOP)
-               output = surf->desktop.pending_output;
-       else
-               output = surf->remote.output;
+       output = surf->desktop.pending_output;
 
-       if (surf->role == IVI_SURFACE_ROLE_DESKTOP && !output) {
+       if (!output) {
                struct ivi_output *r_output;
 
                if (policy && policy->api.surface_activate_by_default &&
@@ -546,30 +594,6 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
                return;
        }
 
-       if (surf->role == IVI_SURFACE_ROLE_REMOTE && output) {
-               if (policy && policy->api.surface_activate_by_default &&
-                   !policy->api.surface_activate_by_default(surf, surf->ivi))
-                       return;
-
-               /* we can only activate it again by using the protocol, but
-                * additionally the output is not reset when
-                * ivi_layout_activate_complete() terminates so we use the
-                * current active surface to avoid hitting this again and again
-                * */
-               if (surf->mapped && output->active == surf)
-                       return;
-
-               if (app_id) {
-                       weston_log("Surface with app_id %s, role %s activating "
-                                  "by default on output %s\n",
-                                  weston_desktop_surface_get_app_id(surf->dsurface),
-                                  ivi_layout_get_surface_role_name(surf),
-                                  output->output->name);
-                       ivi_layout_activate(output, app_id);
-               }
-               return;
-       }
-
        if (!weston_desktop_surface_get_maximized(dsurf) ||
            geom.width != output->area.width ||
            geom.height != output->area.height)
@@ -807,7 +831,7 @@ ivi_compute_popup_position(const struct weston_output *output, struct weston_vie
 }
 
 
-static bool
+bool
 ivi_surf_in_hidden_layer(struct ivi_compositor *ivi, struct ivi_surface *surface)
 {
        struct weston_view *ev;
@@ -1092,7 +1116,8 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
        weston_log("Deactiving %s, role %s\n", app_id,
                        ivi_layout_get_surface_role_name(surf));
 
-       if (surf->role == IVI_SURFACE_ROLE_DESKTOP) {
+       if (surf->role == IVI_SURFACE_ROLE_DESKTOP ||
+           surf->role == IVI_SURFACE_ROLE_REMOTE) {
                struct ivi_surface *previous_active;
 
                previous_active = ivi_output->previous_active;