aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Vlad <marius.vlad@collabora.com>2020-05-02 18:20:20 +0300
committerMarius Vlad <marius.vlad@collabora.com>2020-05-18 13:01:48 +0300
commit056e977e85cc40774a82659819ccb455056fbb39 (patch)
tree37167d41638b54740b76d83c3ed226da37594af5
parent52769b82974afda0b4bba8b0c98a996cb96cac06 (diff)
layout: Do not attempt to activate a split or a fs surface
As long as there is (an already created) surface in a split/fs type of role there's no point in trying to activate it. Users can mistakenly try to do that so have some logic in place to avoid it. Bug-AGL: SPEC-3334 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: Id9b8e039b6d53fbfb4e310166a91c2cb6a45cb4e
-rw-r--r--src/layout.c23
1 files changed, 22 insertions, 1 deletions
diff --git a/src/layout.c b/src/layout.c
index a09010c..fd01c5b 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -551,6 +551,24 @@ ivi_layout_panel_committed(struct ivi_surface *surface)
surface->view->is_mapped = true;
}
+static bool
+ivi_layout_surface_is_split_or_fs(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_FS)
+ 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 +597,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_fs(surf))
return;
+
dsurf = surf->dsurface;
view = surf->view;
geom = weston_desktop_surface_get_geometry(dsurf);