#include "ivi-compositor.h"
#include "policy.h"
+#include "shared/helpers.h"
#include <assert.h>
#include <string.h>
#define AGL_COMP_DEBUG
+static const char *ivi_roles_as_string[] = {
+ [IVI_SURFACE_ROLE_NONE] = "NONE",
+ [IVI_SURFACE_ROLE_BACKGROUND] = "BACKGROUND",
+ [IVI_SURFACE_ROLE_PANEL] = "PANEL",
+ [IVI_SURFACE_ROLE_DESKTOP] = "DESKTOP",
+ [IVI_SURFACE_ROLE_POPUP] = "POPUP",
+ [IVI_SURFACE_ROLE_SPLIT_H] = "SPLIT_H",
+ [IVI_SURFACE_ROLE_SPLIT_V] = "SPLIT_V",
+ [IVI_SURFACE_ROLE_FULLSCREEN] = "FULLSCREEN",
+ [IVI_SURFACE_ROLE_REMOTE] = "REMOTE",
+};
+
+const char *
+ivi_layout_get_surface_role_name(struct ivi_surface *surf)
+{
+ if (surf->role < 0 || surf->role >= ARRAY_LENGTH(ivi_roles_as_string))
+ return " unknown surface role";
+
+ return ivi_roles_as_string[surf->role];
+}
+
static void
ivi_background_init(struct ivi_compositor *ivi, struct ivi_output *output)
{
view = panel->view;
geom = weston_desktop_surface_get_geometry(dsurface);
#ifdef AGL_COMP_DEBUG
- weston_log("geom.width %d, geom.height %d, geom.x %d, geom.y %d\n",
+ weston_log("(panel) geom.width %d, geom.height %d, geom.x %d, geom.y %d\n",
geom.width, geom.height, geom.x, geom.y);
#endif
switch (panel->panel.edge) {
/* 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;
+ }
+
+ weston_log("Activated completed for app_id %s, role %s\n",
+ weston_desktop_surface_get_app_id(surf->dsurface),
+ ivi_layout_get_surface_role_name(surf));
+}
+
+static struct ivi_output *
+ivi_layout_find_app_id(const char *app_id, struct ivi_compositor *ivi)
+{
+ struct ivi_output *out;
+
+ wl_list_for_each(out, &ivi->outputs, link) {
+ if (!out->app_id)
+ continue;
+
+ if (!strcmp(app_id, out->app_id))
+ return out;
+ }
+
+ return NULL;
}
+
static struct ivi_output *
ivi_layout_find_bg_output(struct ivi_compositor *ivi)
{
{
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_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 (surf->role == IVI_SURFACE_ROLE_DESKTOP && !output) {
+ struct ivi_output *r_output;
if (policy && policy->api.surface_activate_by_default &&
!policy->api.surface_activate_by_default(surf, surf->ivi))
if (surf->activated_by_default)
return;
- ivi_bg_output = ivi_layout_find_bg_output(surf->ivi);
+ /* check first if there aren't any outputs being set */
+ r_output = ivi_layout_find_app_id(app_id, surf->ivi);
+
+ /* try finding an output with a background and use that */
+ if (!r_output)
+ r_output = ivi_layout_find_bg_output(surf->ivi);
/* use the output of the bg to activate the app on start-up by
* default */
- if (surf->view && ivi_bg_output) {
- const char *app_id =
- weston_desktop_surface_get_app_id(dsurf);
- if (app_id && ivi_bg_output) {
- ivi_layout_activate(ivi_bg_output, app_id);
+ if (surf->view && r_output) {
+ if (app_id && r_output) {
+ weston_log("Surface with app_id %s, role %s activating by default\n",
+ weston_desktop_surface_get_app_id(surf->dsurface),
+ ivi_layout_get_surface_role_name(surf));
+ ivi_layout_activate(r_output, app_id);
surf->activated_by_default = true;
}
}
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->activated_by_default && output->active == surf)
+ return;
+
+ if (app_id) {
+ weston_log("Surface with app_id %s, role %s activating by default\n",
+ weston_desktop_surface_get_app_id(surf->dsurface),
+ ivi_layout_get_surface_role_name(surf));
+ 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)
return;
geom = weston_desktop_surface_get_geometry(dsurface);
- weston_log("geom x %d, y %d, width %d, height %d\n", geom.x, geom.y,
+ weston_log("(popup) geom x %d, y %d, width %d, height %d\n", geom.x, geom.y,
geom.width, geom.height);
assert(surface->role == IVI_SURFACE_ROLE_POPUP);
}
#ifdef AGL_COMP_DEBUG
- weston_log("Found app_id %s\n", app_id);
+ weston_log("Activating app_id %s, type %s\n", app_id,
+ ivi_layout_get_surface_role_name(surf));
#endif
if (surf->role == IVI_SURFACE_ROLE_POPUP) {
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) {
output->area.width,
output->area.height);
+ weston_log("Setting app_id %s, role %s, set to maximized (%dx%d)\n",
+ app_id, ivi_layout_get_surface_role_name(surf),
+ output->area.width, output->area.height);
/*
* If the view isn't mapped, we put it onto the hidden layer so it will
* start receiving frame events, and will be able to act on our
weston_view_set_output(view, output->output);
weston_layer_entry_insert(&ivi->hidden.view_list, &view->layer_link);
/* force repaint of the entire output */
+
+ weston_log("Placed app_id %s, type %s in hidden layer\n",
+ app_id, ivi_layout_get_surface_role_name(surf));
weston_output_damage(output->output);
}
}
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;
}
ivi_output = ivi_layout_get_output_from_surface(surf);
- weston_log("deactiving %s\n", 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) {
struct ivi_surface *previous_active;
Code Review / src / agl-compositor.git / blobdiff