X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=4b8a6914d31fcff7c5ad173578856b60fa01efb3;hb=8f691282844d390a0987c342aea7eb9c68d4139f;hp=a5e3b36208b90996ceb3778497f5aea0c2db5c28;hpb=456f3fed4ff45bbaf7f60c78ffb0ae0289002dfe;p=src%2Fagl-compositor.git diff --git a/src/layout.c b/src/layout.c index a5e3b36..4b8a691 100644 --- a/src/layout.c +++ b/src/layout.c @@ -30,6 +30,7 @@ #include #include +#include #include #include @@ -155,6 +156,29 @@ void ivi_layout_init(struct ivi_compositor *ivi, struct ivi_output *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); ivi_background_init(ivi, output); @@ -301,7 +325,7 @@ ivi_layout_activate_complete(struct ivi_output *output, * 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 (!strcmp(c_app_id, app_id)) { + if (app_id && !strcmp(c_app_id, app_id)) { update_previous = false; } } @@ -430,8 +454,10 @@ ivi_layout_add_to_hidden_layer(struct ivi_surface *surf, 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 && + 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, @@ -555,9 +581,12 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) 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 || @@ -585,7 +614,12 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) */ 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); + } } } @@ -696,6 +730,7 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface) ivi_layout_get_surface_role_name(surface), output->name); + weston_compositor_schedule_repaint(ivi->compositor); } } @@ -940,6 +975,32 @@ ivi_layout_popup_re_add(struct ivi_surface *surface) ivi_layout_popup_committed(surface); } +static void +ivi_layout_fullscreen_re_add(struct ivi_surface *surface) +{ + assert(surface->role == IVI_SURFACE_ROLE_FULLSCREEN); + struct weston_view *view = surface->view; + + if (weston_view_is_mapped(view)) { + struct weston_desktop_surface *dsurface = surface->dsurface; + struct weston_surface *wsurface = + weston_desktop_surface_get_surface(dsurface); + + weston_layer_entry_remove(&view->layer_link); + + wsurface->is_mapped = false; + view->is_mapped = false; + } + + /* reset the activate by default in order to (still) allow the surface + * to be activaved using the request */ + if (!surface->mapped) + surface->mapped = true; + + surface->state = NORMAL; + ivi_layout_fullscreen_committed(surface); +} + static bool ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf) { @@ -993,6 +1054,11 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf) return; } + if (surf->role == IVI_SURFACE_ROLE_FULLSCREEN) { + ivi_layout_fullscreen_re_add(surf); + return; + } + /* do not 're'-activate surfaces that are split or active */ if (surf == output->active || ivi_layout_surface_is_split_or_fullscreen(surf)) { @@ -1114,7 +1180,8 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *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) { + if (surf->role == IVI_SURFACE_ROLE_DESKTOP || + surf->role == IVI_SURFACE_ROLE_REMOTE) { struct ivi_surface *previous_active; previous_active = ivi_output->previous_active; @@ -1142,7 +1209,8 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id) weston_desktop_surface_get_app_id(dsurface); ivi_layout_activate(ivi_output, previous_active_app_id); } - } else if (surf->role == IVI_SURFACE_ROLE_POPUP) { + } else if (surf->role == IVI_SURFACE_ROLE_POPUP || + surf->role == IVI_SURFACE_ROLE_FULLSCREEN) { struct weston_view *view = surf->view; weston_view_unmap(view); @@ -1153,5 +1221,5 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id) weston_surface_damage(view->surface); } - shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_DEACTIVATED); + shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_DEACTIVATED); }