X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=1895a07c8dc0c840a4e765cf0fe2af862f170705;hb=1f888f2050ac50ec8c1750ff4f0e2c485936d7ed;hp=c078ac930860156ca0e392cdccd0b648eb79ad0c;hpb=51be2ca7b38cacb368a9b49423dae7e3c84a4b98;p=src%2Fagl-compositor.git diff --git a/src/layout.c b/src/layout.c index c078ac9..1895a07 100644 --- a/src/layout.c +++ b/src/layout.c @@ -316,6 +316,15 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) if (!r_output) r_output = ivi_layout_find_bg_output(surf->ivi); + /* if we couldn't still find an output by this point, there's + * something wrong so we abort with a protocol error */ + if (!r_output) { + wl_resource_post_error(surf->ivi->shell_client.resource, + AGL_SHELL_ERROR_INVALID_ARGUMENT, + "No valid output found to activate surface by default"); + return; + } + /* use the output of the bg to activate the app on start-up by * default */ if (surf->view && r_output) { @@ -325,6 +334,18 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) ivi_layout_get_surface_role_name(surf)); ivi_layout_activate(r_output, app_id); surf->activated_by_default = true; + } else if (!app_id) { + /* + * applications not setting an app_id, or + * setting an app_id but at a later point in + * time, might fall-back here so give them a + * chance to receive the configure event and + * act upon it + */ + 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); + surf->activated_by_default = true; } } @@ -366,10 +387,12 @@ void ivi_layout_fullscreen_committed(struct ivi_surface *surface) { struct ivi_compositor *ivi = surface->ivi; + struct ivi_policy *policy = ivi->policy; struct weston_desktop_surface *dsurface = surface->dsurface; struct weston_surface *wsurface = weston_desktop_surface_get_surface(dsurface); + const char *app_id = weston_desktop_surface_get_app_id(dsurface); struct ivi_output *output = surface->split.output; struct weston_output *woutput = output->output; @@ -377,6 +400,11 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface) struct weston_view *view = surface->view; struct weston_geometry geom; + if (policy && policy->api.surface_activate_by_default && + !policy->api.surface_activate_by_default(surface, surface->ivi) && + !surface->activated_by_default) + return; + if (surface->view->is_mapped) return; @@ -397,6 +425,12 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface) wsurface->is_mapped = true; surface->view->is_mapped = true; + + shell_advertise_app_state(ivi, app_id, + NULL, AGL_SHELL_DESKTOP_APP_STATE_ACTIVATED); + + weston_log("Activation completed for app_id %s, role %s, output %s\n", + app_id, ivi_layout_get_surface_role_name(surface), output->name); } void @@ -423,10 +457,12 @@ void ivi_layout_split_committed(struct ivi_surface *surface) { struct ivi_compositor *ivi = surface->ivi; + struct ivi_policy *policy = ivi->policy; struct weston_desktop_surface *dsurface = surface->dsurface; struct weston_surface *wsurface = weston_desktop_surface_get_surface(dsurface); + const char *app_id = weston_desktop_surface_get_app_id(dsurface); struct ivi_output *output = surface->split.output; struct weston_output *woutput = output->output; @@ -440,6 +476,11 @@ ivi_layout_split_committed(struct ivi_surface *surface) x = woutput->x; y = woutput->y; + if (policy && policy->api.surface_activate_by_default && + !policy->api.surface_activate_by_default(surface, surface->ivi) && + !surface->activated_by_default) + return; + if (surface->view->is_mapped) return; @@ -502,22 +543,35 @@ ivi_layout_split_committed(struct ivi_surface *surface) wsurface->is_mapped = true; surface->view->is_mapped = true; + + shell_advertise_app_state(ivi, app_id, + NULL, AGL_SHELL_DESKTOP_APP_STATE_ACTIVATED); + + weston_log("Activation completed for app_id %s, role %s, output %s\n", + app_id, ivi_layout_get_surface_role_name(surface), output->name); } void ivi_layout_popup_committed(struct ivi_surface *surface) { struct ivi_compositor *ivi = surface->ivi; + struct ivi_policy *policy = ivi->policy; struct weston_desktop_surface *dsurface = surface->dsurface; struct weston_surface *wsurface = weston_desktop_surface_get_surface(dsurface); + const char *app_id = weston_desktop_surface_get_app_id(dsurface); struct ivi_output *output = surface->popup.output; struct weston_output *woutput = output->output; struct weston_view *view = surface->view; + if (policy && policy->api.surface_activate_by_default && + !policy->api.surface_activate_by_default(surface, surface->ivi) && + !surface->activated_by_default) + return; + if (surface->view->is_mapped) return; @@ -540,6 +594,12 @@ ivi_layout_popup_committed(struct ivi_surface *surface) wsurface->is_mapped = true; surface->view->is_mapped = true; + + shell_advertise_app_state(ivi, app_id, + NULL, AGL_SHELL_DESKTOP_APP_STATE_ACTIVATED); + + weston_log("Activation completed for app_id %s, role %s, output %s\n", + app_id, ivi_layout_get_surface_role_name(surface), output->name); } static void @@ -559,6 +619,11 @@ ivi_layout_popup_re_add(struct ivi_surface *surface) view->is_mapped = false; } + /* reset the activate by default in order to (still) allow the surface + * to be activaved using the request */ + if (!surface->activated_by_default) + surface->activated_by_default = true; + ivi_layout_popup_committed(surface); } @@ -573,6 +638,11 @@ ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf) surf->role != IVI_SURFACE_ROLE_FULLSCREEN) return false; + /* reset the activate by default in order to (still) allow the surface + * to be activaved using the request */ + if (!surf->activated_by_default) + surf->activated_by_default = true; + wl_list_for_each(is, &ivi->surfaces, link) if (is == surf) return true; @@ -581,16 +651,19 @@ ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf) } void -ivi_layout_activate(struct ivi_output *output, const char *app_id) +ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf) { struct ivi_compositor *ivi = output->ivi; - struct ivi_surface *surf; struct weston_desktop_surface *dsurf; struct weston_view *view; struct weston_geometry geom; struct ivi_policy *policy = output->ivi->policy; - surf = ivi_find_app(ivi, app_id); + dsurf = surf->dsurface; + view = surf->view; + + const char *app_id = weston_desktop_surface_get_app_id(dsurf); + if (!surf) return; @@ -625,8 +698,6 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id) } - dsurf = surf->dsurface; - view = surf->view; geom = weston_desktop_surface_get_geometry(dsurf); if (surf->role == IVI_SURFACE_ROLE_DESKTOP) @@ -665,6 +736,19 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id) } } +void +ivi_layout_activate(struct ivi_output *output, const char *app_id) +{ + struct ivi_surface *surf; + struct ivi_compositor *ivi = output->ivi; + + surf = ivi_find_app(ivi, app_id); + if (!surf) + return; + + ivi_layout_activate_by_surf(output, surf); +} + struct ivi_output * ivi_layout_get_output_from_surface(struct ivi_surface *surf) { @@ -740,6 +824,7 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id) weston_layer_entry_remove(&view->layer_link); weston_output_damage(ivi_output->output); + ivi_output->active = NULL; } } else { struct weston_desktop_surface *dsurface;