X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=a8f0956ec63fd17e70a977b30986b91d6d672edc;hb=refs%2Fchanges%2F74%2F27374%2F3;hp=bcc85811a906593f48e80d8e077e8766995d5173;hpb=d456a0c59a316f8fd137c57d6d3bc164e5a50399;p=src%2Fagl-compositor.git diff --git a/src/layout.c b/src/layout.c index bcc8581..a8f0956 100644 --- a/src/layout.c +++ b/src/layout.c @@ -215,10 +215,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); weston_view_geometry_dirty(view); - - weston_view_damage_below(view); + weston_surface_damage(view->surface); /* * the 'remote' role now makes use of this part so make sure we don't @@ -286,7 +284,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) @@ -302,7 +300,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 */ @@ -342,7 +340,7 @@ 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; + surf->mapped = true; } else if (!app_id) { /* * applications not setting an app_id, or @@ -354,7 +352,7 @@ 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); - surf->activated_by_default = true; + surf->mapped = true; } } @@ -371,7 +369,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) { @@ -379,7 +377,7 @@ 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; + surf->mapped = true; } return; } @@ -411,7 +409,7 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface) if (policy && policy->api.surface_activate_by_default && !policy->api.surface_activate_by_default(surface, surface->ivi) && - !surface->activated_by_default) + !surface->mapped) return; if (surface->view->is_mapped) @@ -429,8 +427,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; @@ -458,8 +456,9 @@ 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 @@ -487,7 +486,7 @@ ivi_layout_split_committed(struct ivi_surface *surface) if (policy && policy->api.surface_activate_by_default && !policy->api.surface_activate_by_default(surface, surface->ivi) && - !surface->activated_by_default) + !surface->mapped) return; if (surface->view->is_mapped) @@ -543,8 +542,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; @@ -585,7 +584,7 @@ ivi_layout_popup_committed(struct ivi_surface *surface) if (policy && policy->api.surface_activate_by_default && !policy->api.surface_activate_by_default(surface, surface->ivi) && - !surface->activated_by_default) + !surface->mapped) return; if (surface->view->is_mapped) @@ -608,8 +607,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; @@ -640,8 +639,8 @@ ivi_layout_popup_re_add(struct ivi_surface *surface) /* 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; + if (!surface->mapped) + surface->mapped = true; ivi_layout_popup_committed(surface); } @@ -659,8 +658,8 @@ ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf) /* 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; + if (!surf->mapped) + surf->mapped = true; wl_list_for_each(is, &ivi->surfaces, link) if (is == surf) @@ -747,8 +746,6 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf) 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)); } @@ -847,7 +844,8 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id) view->surface->is_mapped = false; weston_layer_entry_remove(&view->layer_link); - weston_view_damage_below(view); + weston_view_geometry_dirty(view); + weston_surface_damage(view->surface); ivi_output->active = NULL; } } else { @@ -863,6 +861,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); } }