/* force repaint of the entire output */
weston_output_damage(output->output);
- surf->desktop.last_output = surf->desktop.pending_output;
- surf->desktop.pending_output = NULL;
+
+ /*
+ * the 'remote' role now makes use of this part so make sure we don't
+ * trip the enum such that we might end up with a modified output for
+ * 'remote' role
+ */
+ if (surf->role == IVI_SURFACE_ROLE_DESKTOP) {
+ if (surf->desktop.pending_output)
+ surf->desktop.last_output = surf->desktop.pending_output;
+ surf->desktop.pending_output = NULL;
+ }
}
static struct ivi_output *
{
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;
- 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;
- if (!output) {
- struct ivi_output *ivi_bg_output;
- struct ivi_policy *policy = surf->ivi->policy;
+ /*
+ * we can't make use here of the ivi_layout_get_output_from_surface()
+ * due to the fact that we'll always land here when a surface performs
+ * a commit and pending_output will not bet set. This works in tandem
+ * with 'activated_by_default' 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;
- if (policy && policy->api.surface_activate_by_default)
- if (policy->api.surface_activate_by_default(surf, surf->ivi))
- goto skip_config_check;
+ if (surf->role == IVI_SURFACE_ROLE_DESKTOP && !output) {
+ struct ivi_output *ivi_bg_output;
- 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;
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;
+
+ /* 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->activated_by_default && output->active == surf)
+ return;
+
+ app_id = weston_desktop_surface_get_app_id(dsurf);
+ if (app_id) {
+ ivi_layout_activate(output, app_id);
+ surf->activated_by_default = true;
+ }
+ return;
+ }
+
if (!weston_desktop_surface_get_maximized(dsurf) ||
geom.width != output->area.width ||
geom.height != output->area.height)
ivi_layout_activate_complete(output, surf);
}
+void
+ivi_layout_fullscreen_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_FULLSCREEN);
+
+ 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)
{
{
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;
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)
{
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);
- surf->desktop.pending_output = output;
+ if (surf->role == IVI_SURFACE_ROLE_DESKTOP)
+ surf->desktop.pending_output = output;
if (weston_desktop_surface_get_maximized(dsurf) &&
geom.width == output->area.width &&
geom.height == output->area.height) {
}
}
-static struct ivi_output *
+struct ivi_output *
ivi_layout_get_output_from_surface(struct ivi_surface *surf)
{
struct ivi_output *ivi_output = NULL;
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_REMOTE:
+ ivi_output = surf->remote.output;
+ break;
case IVI_SURFACE_ROLE_NONE:
+ default:
break;
}
Code Review / src / agl-compositor.git / blobdiff