layout: Remove the quirks as now we have the policy hooks in place

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

diff --git a/src/layout.c b/src/layout.c
index bcaf897..760a139 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -248,14 +248,10 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
                struct ivi_output *ivi_bg_output;
                struct ivi_policy *policy = surf->ivi->policy;
 
-               if (policy && policy->api.surface_activate_by_default)
-                       if (policy->api.surface_activate_by_default(surf, surf->ivi))
-                               goto skip_config_check;
-
-               if (!surf->ivi->quirks.activate_apps_by_default)
+               if (policy && policy->api.surface_activate_by_default &&
+                   !policy->api.surface_activate_by_default(surf, surf->ivi))
                        return;
 
-skip_config_check:
                /* we can only activate it again by using the protocol */
                if (surf->activated_by_default)
                        return;
@@ -306,7 +302,7 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface)
        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);
+       assert(surface->role == IVI_SURFACE_ROLE_FULLSCREEN);
 
        weston_desktop_surface_set_fullscreen(dsurface, true);
 
@@ -551,6 +547,24 @@ ivi_layout_panel_committed(struct ivi_surface *surface)
        surface->view->is_mapped = true;
 }
 
+static bool
+ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf)
+{
+       struct ivi_compositor *ivi = surf->ivi;
+       struct ivi_surface *is;
+
+       if (surf->role != IVI_SURFACE_ROLE_SPLIT_H &&
+           surf->role != IVI_SURFACE_ROLE_SPLIT_V &&
+           surf->role != IVI_SURFACE_ROLE_FULLSCREEN)
+               return false;
+
+       wl_list_for_each(is, &ivi->surfaces, link)
+               if (is == surf)
+                       return true;
+
+       return false;
+}
+
 void
 ivi_layout_activate(struct ivi_output *output, const char *app_id)
 {
@@ -579,9 +593,12 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id)
                return;
        }
 
-       if (surf == output->active)
+       /* do not 're'-activate surfaces that are split or active */
+       if (surf == output->active ||
+           ivi_layout_surface_is_split_or_fullscreen(surf))
                return;
 
+
        dsurf = surf->dsurface;
        view = surf->view;
        geom = weston_desktop_surface_get_geometry(dsurf);
@@ -615,7 +632,7 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id)
        }
 }
 
-static struct ivi_output *
+struct ivi_output *
 ivi_layout_get_output_from_surface(struct ivi_surface *surf)
 {
        struct ivi_output *ivi_output = NULL;
@@ -630,10 +647,21 @@ ivi_layout_get_output_from_surface(struct ivi_surface *surf)
        case IVI_SURFACE_ROLE_POPUP:
                ivi_output = surf->popup.output;
                break;
-       default:
        case IVI_SURFACE_ROLE_BACKGROUND:
+               ivi_output = surf->bg.output;
+               break;
        case IVI_SURFACE_ROLE_PANEL:
+               ivi_output = surf->panel.output;
+               break;
+       case IVI_SURFACE_ROLE_FULLSCREEN:
+               ivi_output = surf->fullscreen.output;
+               break;
+       case IVI_SURFACE_ROLE_SPLIT_H:
+       case IVI_SURFACE_ROLE_SPLIT_V:
+               ivi_output = surf->split.output;
+               break;
        case IVI_SURFACE_ROLE_NONE:
+       default:
                break;
        }