X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Flayout.c;h=760a139f11085d4769ab188ce5ced0f0d814606b;hb=refs%2Fchanges%2F54%2F24654%2F1;hp=f5beb9fb16062f35d787b0b82da25df9ae1958c8;hpb=831d1b21b5e786d2e5e804ca5a6a2a2b1dfacd1e;p=src%2Fagl-compositor.git diff --git a/src/layout.c b/src/layout.c index f5beb9f..760a139 100644 --- a/src/layout.c +++ b/src/layout.c @@ -248,14 +248,10 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) struct ivi_output *ivi_bg_output; struct ivi_policy *policy = surf->ivi->policy; - if (policy && policy->api.surface_activate_by_default) - if (policy->api.surface_activate_by_default(surf, surf->ivi)) - goto skip_config_check; - - if (!surf->ivi->quirks.activate_apps_by_default) + if (policy && policy->api.surface_activate_by_default && + !policy->api.surface_activate_by_default(surf, surf->ivi)) return; -skip_config_check: /* we can only activate it again by using the protocol */ if (surf->activated_by_default) return; @@ -306,7 +302,7 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface) weston_log("(fs) geom x %d, y %d, width %d, height %d\n", geom.x, geom.y, geom.width, geom.height); - assert(surface->role == IVI_SURFACE_ROLE_FS); + assert(surface->role == IVI_SURFACE_ROLE_FULLSCREEN); weston_desktop_surface_set_fullscreen(dsurface, true); @@ -321,6 +317,26 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface) surface->view->is_mapped = true; } +void +ivi_layout_desktop_resize(struct ivi_surface *surface, + struct weston_geometry area) +{ + struct weston_desktop_surface *dsurf = surface->dsurface; + struct weston_view *view = surface->view; + + int x = area.x; + int y = area.y; + int width = area.width; + int height = area.height; + + weston_desktop_surface_set_size(dsurf, + width, height); + + weston_view_set_position(view, x, y); + weston_view_update_transform(view); + weston_view_damage_below(view); +} + void ivi_layout_split_committed(struct ivi_surface *surface) { @@ -335,8 +351,9 @@ ivi_layout_split_committed(struct ivi_surface *surface) struct weston_view *view = surface->view; struct weston_geometry geom; - int x; - int y; + + int x, y; + int width, height; x = woutput->x; y = woutput->y; @@ -345,27 +362,56 @@ ivi_layout_split_committed(struct ivi_surface *surface) return; geom = weston_desktop_surface_get_geometry(dsurface); - weston_log("(split) geom x %d, y %d, width %d, height %d\n", geom.x, geom.y, - geom.width, geom.height); assert(surface->role == IVI_SURFACE_ROLE_SPLIT_H || surface->role == IVI_SURFACE_ROLE_SPLIT_V); - weston_view_set_output(view, woutput); + /* save the previous area in order to recover it back when if this kind + * of surface is being destroyed/removed */ + output->area_saved = output->area; switch (surface->role) { case IVI_SURFACE_ROLE_SPLIT_V: + if (geom.width == woutput->width && + geom.height == woutput->height) + geom.width = (output->area.width / 2); + x += woutput->width - geom.width; output->area.width -= geom.width; + + width = woutput->width - x; + height = output->area.height; + y = output->area.y; + break; case IVI_SURFACE_ROLE_SPLIT_H: + if (geom.width == woutput->width && + geom.height == woutput->height) + geom.height = (output->area.height / 2); + + y = output->area.y; output->area.y += geom.height; output->area.height -= geom.height; + + width = output->area.width; + height = output->area.height; + + x = output->area.x; + break; default: - abort(); + assert(!"Invalid split orientation\n"); } + weston_desktop_surface_set_size(dsurface, + width, height); + + /* resize the active surface first, output->area already contains + * correct area to resize to */ + if (output->active) + ivi_layout_desktop_resize(output->active, output->area); + + weston_view_set_output(view, woutput); weston_view_set_position(view, x, y); weston_layer_entry_insert(&ivi->normal.view_list, &view->layer_link); @@ -501,6 +547,24 @@ ivi_layout_panel_committed(struct ivi_surface *surface) surface->view->is_mapped = true; } +static bool +ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf) +{ + struct ivi_compositor *ivi = surf->ivi; + struct ivi_surface *is; + + if (surf->role != IVI_SURFACE_ROLE_SPLIT_H && + surf->role != IVI_SURFACE_ROLE_SPLIT_V && + surf->role != IVI_SURFACE_ROLE_FULLSCREEN) + return false; + + wl_list_for_each(is, &ivi->surfaces, link) + if (is == surf) + return true; + + return false; +} + void ivi_layout_activate(struct ivi_output *output, const char *app_id) { @@ -529,9 +593,12 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id) return; } - if (surf == output->active) + /* do not 're'-activate surfaces that are split or active */ + if (surf == output->active || + ivi_layout_surface_is_split_or_fullscreen(surf)) return; + dsurf = surf->dsurface; view = surf->view; geom = weston_desktop_surface_get_geometry(dsurf); @@ -565,7 +632,7 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id) } } -static struct ivi_output * +struct ivi_output * ivi_layout_get_output_from_surface(struct ivi_surface *surf) { struct ivi_output *ivi_output = NULL; @@ -580,10 +647,21 @@ ivi_layout_get_output_from_surface(struct ivi_surface *surf) case IVI_SURFACE_ROLE_POPUP: ivi_output = surf->popup.output; break; - default: case IVI_SURFACE_ROLE_BACKGROUND: + ivi_output = surf->bg.output; + break; case IVI_SURFACE_ROLE_PANEL: + ivi_output = surf->panel.output; + break; + case IVI_SURFACE_ROLE_FULLSCREEN: + ivi_output = surf->fullscreen.output; + break; + case IVI_SURFACE_ROLE_SPLIT_H: + case IVI_SURFACE_ROLE_SPLIT_V: + ivi_output = surf->split.output; + break; case IVI_SURFACE_ROLE_NONE: + default: break; }