#include <assert.h>
#include <string.h>
+#include <libweston/config-parser.h>
#include <libweston/libweston.h>
#include <libweston-desktop/libweston-desktop.h>
[IVI_SURFACE_ROLE_REMOTE] = "REMOTE",
};
+bool
+ivi_surf_in_hidden_layer(struct ivi_compositor *ivi, struct ivi_surface *surface);
+
const char *
ivi_layout_get_surface_role_name(struct ivi_surface *surf)
{
void
ivi_layout_init(struct ivi_compositor *ivi, struct ivi_output *output)
{
- ivi_background_init(ivi, output);
+ bool use_default_area = true;
+ struct weston_config_section *section = output->config;
+ char *t;
+
+ weston_config_section_get_string(section, "activation-area", &t, NULL);
+ if (t) {
+ if (output->area_activation.width == 0 &&
+ output->area_activation.height == 0 &&
+ output->area_activation.x == 0 &&
+ output->area_activation.y == 0) {
+ weston_log("WARNING: activation-area set in "
+ "configuration file, but yet applied!\n");
+ if (parse_activation_area(t, output) < 0)
+ weston_log("Invalid activation-area \"%s\" for output %s\n",
+ t, output->name);
+ } else {
+ weston_log("WARNING: activation-area detected in ini file, "
+ "but agl_shell override detected!\n");
+ if (parse_activation_area(t, output) < 0)
+ weston_log("Invalid activation-area \"%s\" for output %s\n",
+ t, output->name);
+ }
+ }
+ free(t);
- output->area.x = 0;
- output->area.y = 0;
- output->area.width = output->output->width;
- output->area.height = output->output->height;
+ ivi_background_init(ivi, output);
- ivi_panel_init(ivi, output, output->top);
- ivi_panel_init(ivi, output, output->bottom);
- ivi_panel_init(ivi, output, output->left);
- ivi_panel_init(ivi, output, output->right);
+ if (output->area_activation.width ||
+ output->area_activation.height ||
+ output->area_activation.x ||
+ output->area_activation.y) {
+ /* Sanity check target area is within output bounds */
+ if ((output->area_activation.x + output->area_activation.width) < output->output->width ||
+ (output->area_activation.y + output->area_activation.height) < output->output->height) {
+ weston_log("Using specified area for output %s, ignoring panels\n",
+ output->name);
+ output->area.x = output->area_activation.x;
+ output->area.y = output->area_activation.y;
+ output->area.width = output->area_activation.width;
+ output->area.height = output->area_activation.height;
+ use_default_area = false;
+ } else {
+ weston_log("Invalid activation-area position for output %s, ignoring\n",
+ output->name);
+ }
+ }
+ if (use_default_area) {
+ output->area.x = 0;
+ output->area.y = 0;
+ output->area.width = output->output->width;
+ output->area.height = output->output->height;
+
+ ivi_panel_init(ivi, output, output->top);
+ ivi_panel_init(ivi, output, output->bottom);
+ ivi_panel_init(ivi, output, output->left);
+ ivi_panel_init(ivi, output, output->right);
+ }
weston_compositor_schedule_repaint(ivi->compositor);
struct weston_view *view = surf->view;
struct weston_seat *wseat = get_ivi_shell_weston_first_seat(ivi);
struct ivi_shell_seat *ivi_seat = get_ivi_shell_seat(wseat);
+ const char *app_id = weston_desktop_surface_get_app_id(surf->dsurface);
+ bool update_previous = true;
if (weston_view_is_mapped(view)) {
weston_layer_entry_remove(&view->layer_link);
weston_view_update_transform(view);
}
+ if (output_has_black_curtain(output)) {
+ if (!output->background) {
+ weston_log("Found that we have no background surface "
+ "for output %s. Using black curtain as background\n",
+ output->output->name);
+
+ struct weston_view *ev =
+ output->fullscreen_view.fs->view;
+
+ /* use the black curtain as background when we have
+ * none added by the shell client. */
+ weston_layer_entry_remove(&ev->layer_link);
+ weston_layer_entry_insert(&ivi->normal.view_list,
+ &ev->layer_link);
+ weston_view_geometry_dirty(ev);
+ weston_surface_damage(ev->surface);
+ } else {
+ remove_black_curtain(output);
+ }
+ }
+
+
weston_view_set_output(view, woutput);
- weston_view_set_position(view,
- woutput->x + output->area.x,
- woutput->y + output->area.y);
+ /* drop any previous masks set on this view */
+ weston_view_set_mask_infinite(view);
+
+ if (surf->role != IVI_SURFACE_ROLE_BACKGROUND)
+ weston_view_set_position(view,
+ woutput->x + output->area.x,
+ woutput->y + output->area.y);
view->is_mapped = true;
surf->mapped = true;
view->surface->is_mapped = true;
+ /* handle a movement from one output to another */
+ if (surf->current_completed_output &&
+ surf->current_completed_output != output) {
+
+ /* we're migrating the same surface but to another output */
+ if (surf->current_completed_output->active == surf) {
+ struct weston_view *ev =
+ surf->current_completed_output->active->view;
+
+ weston_layer_entry_remove(&ev->layer_link);
+ surf->current_completed_output->previous_active =
+ surf->current_completed_output->active;
+ surf->current_completed_output->active = NULL;
+
+ /* damage all possible outputs to avoid stale views */
+ weston_compositor_damage_all(ivi->compositor);
+ }
+ }
+
if (output->active) {
- output->active->view->is_mapped = false;
- output->active->view->surface->is_mapped = false;
+ /* keep the background surface mapped at all times */
+ if (output->active->role != IVI_SURFACE_ROLE_BACKGROUND) {
+ output->active->view->is_mapped = false;
+ output->active->view->surface->is_mapped = false;
- weston_layer_entry_remove(&output->active->view->layer_link);
+ weston_layer_entry_remove(&output->active->view->layer_link);
+ }
+ }
+
+ if (output->previous_active && output->active) {
+ const char *c_app_id =
+ weston_desktop_surface_get_app_id(output->active->dsurface);
+
+ /* if the currently activated app_id is the same as the one
+ * we're trying to complete activation with means we're
+ * operating on the same app_id so do update previous_active as
+ * it will overwrite it with the same value */
+ if (app_id && !strcmp(c_app_id, app_id)) {
+ update_previous = false;
+ }
}
- output->previous_active = output->active;
+
+ if (update_previous)
+ output->previous_active = output->active;
output->active = surf;
+ surf->current_completed_output = output;
weston_layer_entry_insert(&ivi->normal.view_list, &view->layer_link);
weston_view_geometry_dirty(view);
}
weston_log("Activation completed for app_id %s, role %s, output %s\n",
- weston_desktop_surface_get_app_id(surf->dsurface),
+ app_id,
ivi_layout_get_surface_role_name(surf), output->name);
+
+ shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_ACTIVATED);
+}
+
+static bool
+ivi_layout_find_output_with_app_id(const char *app_id, struct ivi_output *output)
+{
+ char *cur;
+ size_t app_id_len;
+
+ cur = output->app_ids;
+ app_id_len = strlen(app_id);
+
+ while ((cur = strstr(cur, app_id))) {
+ if ((cur[app_id_len] == ',' || cur[app_id_len] == '\0') &&
+ (cur == output->app_ids || cur[-1] == ','))
+ return true;
+ cur++;
+ }
+
+ return false;
}
struct ivi_output *
return NULL;
wl_list_for_each(out, &ivi->outputs, link) {
- if (!out->app_id)
+ if (!out->app_ids)
continue;
- if (!strcmp(app_id, out->app_id))
+ if (ivi_layout_find_output_with_app_id(app_id, out))
return out;
}
-
return NULL;
}
return NULL;
}
+
+static void
+ivi_layout_add_to_hidden_layer(struct ivi_surface *surf,
+ struct ivi_output *ivi_output)
+{
+ struct weston_desktop_surface *dsurf = surf->dsurface;
+ struct weston_view *ev = surf->view;
+ struct ivi_compositor *ivi = surf->ivi;
+ const char *app_id = weston_desktop_surface_get_app_id(dsurf);
+
+ /*
+ * 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
+ * configure event.
+ */
+ if (!weston_view_is_mapped(ev)) {
+ ev->is_mapped = true;
+ ev->surface->is_mapped = true;
+
+ weston_desktop_surface_set_maximized(dsurf, true);
+ weston_desktop_surface_set_size(dsurf,
+ ivi_output->area.width,
+ ivi_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),
+ ivi_output->area.width, ivi_output->area.height);
+
+ surf->hidden_layer_output = ivi_output;
+ weston_view_set_output(ev, ivi_output->output);
+ weston_layer_entry_insert(&ivi->hidden.view_list, &ev->layer_link);
+ weston_log("Placed app_id %s, type %s in hidden layer on output %s\n",
+ app_id, ivi_layout_get_surface_role_name(surf),
+ ivi_output->output->name);
+
+ weston_compositor_schedule_repaint(ivi->compositor);
+ return;
+ }
+
+ /* we might have another output to activate */
+ if (surf->hidden_layer_output &&
+ surf->hidden_layer_output != ivi_output) {
+ weston_layer_entry_remove(&ev->layer_link);
+ weston_view_geometry_dirty(ev);
+ weston_surface_damage(ev->surface);
+
+ if (ivi_output->area.width != surf->hidden_layer_output->area.width ||
+ ivi_output->area.height != surf->hidden_layer_output->area.height) {
+ weston_desktop_surface_set_maximized(dsurf, true);
+ weston_desktop_surface_set_size(dsurf,
+ ivi_output->area.width,
+ ivi_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),
+ ivi_output->area.width, ivi_output->area.height);
+
+ surf->hidden_layer_output = ivi_output;
+ weston_view_set_output(ev, ivi_output->output);
+ weston_layer_entry_insert(&ivi->hidden.view_list, &ev->layer_link);
+ weston_log("Placed app_id %s, type %s in hidden layer on output %s\n",
+ app_id, ivi_layout_get_surface_role_name(surf),
+ ivi_output->output->name);
+ }
+
+ weston_compositor_schedule_repaint(ivi->compositor);
+}
+
+void
+ivi_layout_remote_committed(struct ivi_surface *surf)
+{
+ 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_REMOTE);
+
+ output = surf->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->mapped && output->active == surf)
+ return;
+
+ if (!surf->ivi->activate_by_default &&
+ !ivi_surf_in_hidden_layer(surf->ivi, surf)) {
+ weston_log("Refusing to activate surface role %d, "
+ "app_id %s\n", surf->role, app_id);
+
+ if (!weston_desktop_surface_get_maximized(dsurf) ||
+ geom.width != output->area.width ||
+ geom.height != output->area.height) {
+ ivi_layout_add_to_hidden_layer(surf, output);
+ }
+
+ return;
+ }
+
+ if (!weston_desktop_surface_get_maximized(dsurf) ||
+ geom.width != output->area.width ||
+ geom.height != output->area.height)
+ return;
+
+ ivi_layout_activate_complete(output, surf);
+}
+
void
ivi_layout_desktop_committed(struct ivi_surface *surf)
{
struct ivi_output *output;
const char *app_id = weston_desktop_surface_get_app_id(dsurf);
- assert(surf->role == IVI_SURFACE_ROLE_DESKTOP ||
- surf->role == IVI_SURFACE_ROLE_REMOTE);
+ assert(surf->role == IVI_SURFACE_ROLE_DESKTOP);
/*
* we can't make use here of the ivi_layout_get_output_from_surface()
* with 'mapped' 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;
+ output = surf->desktop.pending_output;
- if (surf->role == IVI_SURFACE_ROLE_DESKTOP && !output) {
+ if (!output) {
struct ivi_output *r_output;
if (policy && policy->api.surface_activate_by_default &&
if (r_output) {
struct weston_view *view = r_output->fullscreen_view.fs->view;
if (view->is_mapped || view->surface->is_mapped)
- remove_black_surface(r_output);
+ remove_black_curtain(r_output);
}
return;
}
- if (!surf->ivi->activate_by_default) {
- weston_log("Refusing to activate surface role %d, app_id %s\n",
- surf->role, app_id);
+ if (!surf->ivi->activate_by_default &&
+ (!surf->xwayland.is_set && !is_shell_surface_xwayland(surf))) {
+ weston_log("Refusing to activate surface role %d, app_id %s, type %s\n",
+ surf->role, app_id,
+ is_shell_surface_xwayland(surf) ?
+ "xwayland" : "regular");
+
+ if (!weston_desktop_surface_get_maximized(dsurf) ||
+ geom.width != r_output->area.width ||
+ geom.height != r_output->area.height)
+ ivi_layout_add_to_hidden_layer(surf, r_output);
+
return;
}
*/
weston_log("Surface no app_id, role %s activating by default\n",
ivi_layout_get_surface_role_name(surf));
- ivi_layout_activate_by_surf(r_output, surf);
+ if (surf->xwayland.is_set || is_shell_surface_xwayland(surf)) {
+ ivi_layout_activate_by_surf(r_output, surf);
+ ivi_layout_activate_complete(r_output, surf);
+ } else {
+ ivi_layout_activate_by_surf(r_output, surf);
+ }
}
}
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->mapped && 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);
- }
- return;
- }
-
if (!weston_desktop_surface_get_maximized(dsurf) ||
geom.width != output->area.width ||
geom.height != output->area.height)
assert(surface->role == IVI_SURFACE_ROLE_FULLSCREEN);
- if (weston_view_is_mapped(view))
+
+ if (surface->state == FULLSCREEN && weston_view_is_mapped(view))
return;
/* if we still get here but we haven't resized so far, send configure
}
/* this implies we resized correctly */
- if (!weston_view_is_mapped(view)) {
+ if (!weston_view_is_mapped(view) || surface->state != FULLSCREEN) {
weston_layer_entry_remove(&view->layer_link);
weston_view_set_output(view, woutput);
}
+bool
+ivi_surf_in_hidden_layer(struct ivi_compositor *ivi, struct ivi_surface *surface)
+{
+ struct weston_view *ev;
+
+ wl_list_for_each(ev, &ivi->hidden.view_list.link, layer_link.link) {
+ if (ev == surface->view)
+ return true;
+ }
+
+ wl_list_for_each(ev, &ivi->fullscreen.view_list.link, layer_link.link) {
+ if (ev == surface->view)
+ return true;
+ }
+
+ return false;
+}
+
void
ivi_layout_popup_committed(struct ivi_surface *surface)
{
!surface->mapped)
return;
- if (surface->view->is_mapped)
+ if (surface->view->is_mapped || surface->state == HIDDEN)
return;
assert(surface->role == IVI_SURFACE_ROLE_POPUP);
+ /* remove it from hidden layer if present */
+ if (ivi_surf_in_hidden_layer(ivi, surface))
+ weston_layer_entry_remove(&view->layer_link);
+
weston_view_set_output(view, woutput);
ivi_compute_popup_position(woutput, view,
surface->popup.x, surface->popup.y, &new_x, &new_y);
weston_view_set_position(view, new_x, new_y);
+ weston_view_update_transform(view);
/* only clip the pop-up dialog window if we have a valid
* width and height being passed on. Users might not want to have one
if (!surface->mapped)
surface->mapped = true;
+ surface->state = NORMAL;
ivi_layout_popup_committed(surface);
}
{
struct ivi_compositor *ivi = output->ivi;
struct weston_desktop_surface *dsurf;
- struct weston_view *view;
struct weston_geometry geom;
struct ivi_policy *policy = output->ivi->policy;
dsurf = surf->dsurface;
- view = surf->view;
const char *app_id = weston_desktop_surface_get_app_id(dsurf);
}
#ifdef AGL_COMP_DEBUG
- weston_log("Activating app_id %s, type %s\n", app_id,
- ivi_layout_get_surface_role_name(surf));
+ weston_log("Activating app_id %s, type %s, on output %s\n", app_id,
+ ivi_layout_get_surface_role_name(surf), output->output->name);
#endif
if (surf->role == IVI_SURFACE_ROLE_POPUP) {
/* do not 're'-activate surfaces that are split or active */
if (surf == output->active ||
- ivi_layout_surface_is_split_or_fullscreen(surf))
+ ivi_layout_surface_is_split_or_fullscreen(surf)) {
+ weston_log("Application %s is already active on output %s\n",
+ app_id, output->output->name);
return;
+ }
if (surf->role == IVI_SURFACE_ROLE_REMOTE) {
struct ivi_output *remote_output =
ivi_layout_find_with_app_id(app_id, ivi);
+ weston_log("Changed activation for app_id %s, type %s, on output %s\n", app_id,
+ ivi_layout_get_surface_role_name(surf), output->output->name);
+
/* if already active on a remote output do not
* attempt to activate it again */
if (remote_output && remote_output->active == surf)
return;
}
- weston_desktop_surface_set_maximized(dsurf, true);
- weston_desktop_surface_set_size(dsurf,
- 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
- * configure event.
- */
- if (!weston_view_is_mapped(view)) {
- view->is_mapped = true;
- view->surface->is_mapped = true;
-
- weston_view_set_output(view, output->output);
- weston_layer_entry_insert(&ivi->hidden.view_list, &view->layer_link);
- weston_log("Placed app_id %s, type %s in hidden layer\n",
- app_id, ivi_layout_get_surface_role_name(surf));
+ /* the background surface is already "maximized" so we don't need to
+ * add to the hidden layer */
+ if (surf->role == IVI_SURFACE_ROLE_BACKGROUND) {
+ ivi_layout_activate_complete(output, surf);
+ return;
}
+
+ ivi_layout_add_to_hidden_layer(surf, output);
}
void
weston_log("Deactiving %s, role %s\n", app_id,
ivi_layout_get_surface_role_name(surf));
- if (surf->role == IVI_SURFACE_ROLE_DESKTOP) {
+ if (surf->role == IVI_SURFACE_ROLE_DESKTOP ||
+ surf->role == IVI_SURFACE_ROLE_REMOTE) {
struct ivi_surface *previous_active;
previous_active = ivi_output->previous_active;
} else if (surf->role == IVI_SURFACE_ROLE_POPUP) {
struct weston_view *view = surf->view;
+ weston_view_unmap(view);
+ surf->state = HIDDEN;
+
weston_layer_entry_remove(&view->layer_link);
weston_view_geometry_dirty(view);
weston_surface_damage(view->surface);
}
+
+ shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_DEACTIVATED);
}