X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=c98ae762ff626547bbfa9a0e27179fb7664efe7d;hb=b13e185e7214218ca00025a480695392aa5cdee2;hp=d8d019671ab009cabbf10bee4a91254b7325a22b;hpb=bf016d20408920f3ef09894ebb9f237e270267e5;p=src%2Fagl-compositor.git diff --git a/src/layout.c b/src/layout.c index d8d0196..c98ae76 100644 --- a/src/layout.c +++ b/src/layout.c @@ -203,6 +203,7 @@ ivi_layout_activate_complete(struct ivi_output *output, woutput->y + output->area.y); view->is_mapped = true; + surf->mapped = true; view->surface->is_mapped = true; if (output->active) { @@ -215,10 +216,8 @@ ivi_layout_activate_complete(struct ivi_output *output, output->active = surf; weston_layer_entry_insert(&ivi->normal.view_list, &view->layer_link); - weston_view_update_transform(view); - - /* force repaint of the entire output */ - weston_output_damage(output->output); + weston_view_geometry_dirty(view); + weston_surface_damage(view->surface); /* * the 'remote' role now makes use of this part so make sure we don't @@ -241,6 +240,9 @@ ivi_layout_find_with_app_id(const char *app_id, struct ivi_compositor *ivi) { struct ivi_output *out; + if (!app_id) + return NULL; + wl_list_for_each(out, &ivi->outputs, link) { if (!out->app_id) continue; @@ -283,7 +285,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) * 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 + * with 'mapped' at this point to avoid tripping over * to a surface that continuously updates its content */ if (surf->role == IVI_SURFACE_ROLE_DESKTOP) @@ -299,7 +301,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) return; /* we can only activate it again by using the protocol */ - if (surf->activated_by_default) + if (surf->mapped) return; /* check first if there aren't any outputs being set */ @@ -316,6 +318,21 @@ 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; + } + + if (!surf->ivi->activate_by_default) { + weston_log("Refusing to activate surface role %d, app_id %s\n", + surf->role, app_id); + return; + } + /* use the output of the bg to activate the app on start-up by * default */ if (surf->view && r_output) { @@ -324,7 +341,17 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) 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; + } 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); } } @@ -341,7 +368,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) * 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) + if (surf->mapped && output->active == surf) return; if (app_id) { @@ -349,7 +376,6 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) 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; } @@ -366,6 +392,7 @@ 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 = @@ -378,6 +405,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->mapped) + return; + if (surface->view->is_mapped) return; @@ -393,8 +425,8 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface) 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); + weston_view_geometry_dirty(view); + weston_surface_damage(view->surface); wsurface->is_mapped = true; surface->view->is_mapped = true; @@ -422,14 +454,16 @@ ivi_layout_desktop_resize(struct ivi_surface *surface, width, height); weston_view_set_position(view, x, y); - weston_view_update_transform(view); - weston_view_damage_below(view); + + weston_view_geometry_dirty(view); + weston_surface_damage(view->surface); } 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 = @@ -448,6 +482,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->mapped) + return; + if (surface->view->is_mapped) return; @@ -462,9 +501,7 @@ ivi_layout_split_committed(struct ivi_surface *surface) switch (surface->role) { case IVI_SURFACE_ROLE_SPLIT_V: - if (geom.width == woutput->width && - geom.height == woutput->height) - geom.width = (output->area.width / 2); + geom.width = (output->area.width / 2); x += woutput->width - geom.width; output->area.width -= geom.width; @@ -475,9 +512,7 @@ ivi_layout_split_committed(struct ivi_surface *surface) break; case IVI_SURFACE_ROLE_SPLIT_H: - if (geom.width == woutput->width && - geom.height == woutput->height) - geom.height = (output->area.height / 2); + geom.height = (output->area.height / 2); y = output->area.y; output->area.y += geom.height; @@ -505,8 +540,8 @@ ivi_layout_split_committed(struct ivi_surface *surface) 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); + weston_view_geometry_dirty(view); + weston_surface_damage(view->surface); wsurface->is_mapped = true; surface->view->is_mapped = true; @@ -518,28 +553,48 @@ ivi_layout_split_committed(struct ivi_surface *surface) app_id, ivi_layout_get_surface_role_name(surface), output->name); } +static void +ivi_compute_popup_position(const struct weston_output *output, struct weston_view *view, + int initial_x, int initial_y, int *new_x, int *new_y) +{ + *new_x = output->x + initial_x; + *new_y = output->y + initial_y; +} + + 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); + int new_x, new_y; + 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->mapped) + return; + if (surface->view->is_mapped) return; assert(surface->role == IVI_SURFACE_ROLE_POPUP); weston_view_set_output(view, woutput); - weston_view_set_position(view, surface->popup.x, surface->popup.y); + + 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); /* 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 @@ -550,8 +605,8 @@ ivi_layout_popup_committed(struct ivi_surface *surface) weston_layer_entry_insert(&ivi->popup.view_list, &view->layer_link); - weston_view_update_transform(view); - weston_view_damage_below(view); + weston_view_geometry_dirty(view); + weston_surface_damage(view->surface); wsurface->is_mapped = true; surface->view->is_mapped = true; @@ -580,6 +635,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->mapped) + surface->mapped = true; + ivi_layout_popup_committed(surface); } @@ -594,6 +654,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->mapped) + surf->mapped = true; + wl_list_for_each(is, &ivi->surfaces, link) if (is == surf) return true; @@ -602,16 +667,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; @@ -646,8 +714,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) @@ -678,14 +744,27 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id) 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); } } +void +ivi_layout_activate(struct ivi_output *output, const char *app_id) +{ + struct ivi_surface *surf; + struct ivi_compositor *ivi = output->ivi; + + if (!app_id) + return; + + 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) { @@ -732,6 +811,9 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id) struct ivi_output *ivi_output; struct ivi_policy *policy = ivi->policy; + if (!app_id) + return; + surf = ivi_find_app(ivi, app_id); if (!surf) return; @@ -760,7 +842,9 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id) view->surface->is_mapped = false; weston_layer_entry_remove(&view->layer_link); - weston_output_damage(ivi_output->output); + weston_view_geometry_dirty(view); + weston_surface_damage(view->surface); + ivi_output->active = NULL; } } else { struct weston_desktop_surface *dsurface; @@ -775,6 +859,7 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id) struct weston_view *view = surf->view; weston_layer_entry_remove(&view->layer_link); - weston_view_damage_below(view); + weston_view_geometry_dirty(view); + weston_surface_damage(view->surface); } }