/* force repaint of the entire output */
weston_output_damage(output->output);
+
surf->desktop.last_output = surf->desktop.pending_output;
surf->desktop.pending_output = NULL;
}
return NULL;
}
+static struct ivi_output *
+ivi_layout_get_output_from_surface(struct ivi_surface *surf)
+{
+ struct ivi_output *ivi_output = NULL;
+
+ switch (surf->role) {
+ case IVI_SURFACE_ROLE_DESKTOP:
+ if (surf->desktop.pending_output)
+ ivi_output = surf->desktop.pending_output;
+ else
+ ivi_output = surf->desktop.last_output;
+ break;
+ case IVI_SURFACE_ROLE_POPUP:
+ ivi_output = surf->popup.output;
+ break;
+ case IVI_SURFACE_ROLE_REMOTE:
+ ivi_output = surf->remote.output;
+ break;
+ default:
+ case IVI_SURFACE_ROLE_BACKGROUND:
+ case IVI_SURFACE_ROLE_PANEL:
+ case IVI_SURFACE_ROLE_NONE:
+ break;
+ }
+
+ return ivi_output;
+}
+
void
ivi_layout_desktop_committed(struct ivi_surface *surf)
{
struct weston_desktop_surface *dsurf = surf->dsurface;
struct weston_geometry geom = weston_desktop_surface_get_geometry(dsurf);
struct ivi_output *output;
+ struct ivi_policy *policy = surf->ivi->policy;
- assert(surf->role == IVI_SURFACE_ROLE_DESKTOP);
+ assert(surf->role == IVI_SURFACE_ROLE_DESKTOP ||
+ surf->role == IVI_SURFACE_ROLE_REMOTE);
- output = surf->desktop.pending_output;
+ output = ivi_layout_get_output_from_surface(surf);
if (!output) {
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))
return;
}
+ if (surf->role == IVI_SURFACE_ROLE_REMOTE && output) {
+ const char *app_id;
+
+ if (policy && policy->api.surface_activate_by_default &&
+ !policy->api.surface_activate_by_default(surf, surf->ivi))
+ return;
+
+ app_id = weston_desktop_surface_get_app_id(dsurf);
+ if (app_id) {
+ ivi_layout_activate(output, app_id);
+
+ /* we transition to the desktop role from remote one,
+ * as they're basically one and the same, but in order
+ * to keep the same functionality (that is to display
+ * it by default when starting), we need to know the
+ * output before hand, fact that that is not true for,
+ * regular desktop ones.
+ */
+ surf->role = IVI_SURFACE_ROLE_DESKTOP;
+ surf->activated_by_default = true;
+ }
+ return;
+ }
+
if (!weston_desktop_surface_get_maximized(dsurf) ||
geom.width != output->area.width ||
geom.height != output->area.height)
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 weston_view *view = surface->view;
struct weston_geometry geom;
- int x;
- int y;
+
+ int x, y;
+ int width, height;
x = woutput->x;
y = woutput->y;
return;
geom = weston_desktop_surface_get_geometry(dsurface);
- weston_log("(split) geom x %d, y %d, width %d, height %d\n", geom.x, geom.y,
- geom.width, geom.height);
assert(surface->role == IVI_SURFACE_ROLE_SPLIT_H ||
surface->role == IVI_SURFACE_ROLE_SPLIT_V);
- weston_view_set_output(view, woutput);
+ /* 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:
- abort();
+ 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);
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)
{
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);
}
}
-static struct ivi_output *
-ivi_layout_get_output_from_surface(struct ivi_surface *surf)
-{
- struct ivi_output *ivi_output = NULL;
-
- switch (surf->role) {
- case IVI_SURFACE_ROLE_DESKTOP:
- if (surf->desktop.pending_output)
- ivi_output = surf->desktop.pending_output;
- else
- ivi_output = surf->desktop.last_output;
- break;
- case IVI_SURFACE_ROLE_POPUP:
- ivi_output = surf->popup.output;
- break;
- default:
- case IVI_SURFACE_ROLE_BACKGROUND:
- case IVI_SURFACE_ROLE_PANEL:
- case IVI_SURFACE_ROLE_NONE:
- break;
- }
-
- return ivi_output;
-}
-
void
ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
{
Code Review / src / agl-compositor.git / blobdiff