X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=0356d013d3d5e2bb026e5370e0e2b137c0d441f0;hb=refs%2Ftags%2Flamprey%2F12.1.18;hp=dd7e75f0e3060f36c2d23ccc4a1be5b20668e38e;hpb=0056122343c782902457802bb1ef6bde7c14d3c9;p=src%2Fagl-compositor.git diff --git a/src/layout.c b/src/layout.c index dd7e75f..0356d01 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); - - /* 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 +239,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; @@ -325,6 +326,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); + return; + } + /* use the output of the bg to activate the app on start-up by * default */ if (surf->view && r_output) { @@ -420,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; @@ -449,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 @@ -495,9 +503,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; @@ -508,9 +514,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; @@ -538,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; @@ -551,6 +555,15 @@ 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) { @@ -562,6 +575,8 @@ ivi_layout_popup_committed(struct ivi_surface *surface) 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; @@ -578,7 +593,10 @@ ivi_layout_popup_committed(struct ivi_surface *surface) 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 @@ -589,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; @@ -728,11 +746,8 @@ 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)); - weston_output_damage(output->output); } } @@ -742,6 +757,9 @@ 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; @@ -795,6 +813,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; @@ -823,7 +844,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; @@ -838,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); } }