X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=872a5487da6b4adcada02d4cecd2031b1ad3b78c;hb=353064abff83403f8a6e46f0469c4dc07b648534;hp=b531ed18125605165d2f419f6d0cea4b50deca28;hpb=98457c49f5d777e4023082363b814826c21092df;p=src%2Fagl-compositor.git diff --git a/src/layout.c b/src/layout.c index b531ed1..872a548 100644 --- a/src/layout.c +++ b/src/layout.c @@ -32,6 +32,8 @@ #include #include +#include "agl-shell-desktop-server-protocol.h" + #define AGL_COMP_DEBUG static void @@ -165,7 +167,7 @@ ivi_layout_init(struct ivi_compositor *ivi, struct ivi_output *output) output->area.x, output->area.y); } -static struct ivi_surface * +struct ivi_surface * ivi_find_app(struct ivi_compositor *ivi, const char *app_id) { struct ivi_surface *surf; @@ -206,6 +208,7 @@ ivi_layout_activate_complete(struct ivi_output *output, weston_layer_entry_remove(&output->active->view->layer_link); } + output->previous_active = output->active; output->active = surf; weston_layer_entry_insert(&ivi->normal.view_list, &view->layer_link); @@ -213,6 +216,7 @@ ivi_layout_activate_complete(struct ivi_output *output, /* force repaint of the entire output */ weston_output_damage(output->output); + surf->desktop.last_output = surf->desktop.pending_output; surf->desktop.pending_output = NULL; } @@ -231,24 +235,61 @@ ivi_layout_find_bg_output(struct ivi_compositor *ivi) return NULL; } +static struct ivi_output * +ivi_layout_get_output_from_surface(struct ivi_surface *surf) +{ + struct ivi_output *ivi_output = NULL; + + switch (surf->role) { + case IVI_SURFACE_ROLE_DESKTOP: + if (surf->desktop.pending_output) + ivi_output = surf->desktop.pending_output; + else + ivi_output = surf->desktop.last_output; + break; + case IVI_SURFACE_ROLE_POPUP: + ivi_output = surf->popup.output; + break; + case IVI_SURFACE_ROLE_REMOTE: + ivi_output = surf->remote.output; + break; + default: + case IVI_SURFACE_ROLE_BACKGROUND: + case IVI_SURFACE_ROLE_PANEL: + case IVI_SURFACE_ROLE_NONE: + break; + } + + return ivi_output; +} + void ivi_layout_desktop_committed(struct ivi_surface *surf) { struct weston_desktop_surface *dsurf = surf->dsurface; struct weston_geometry geom = weston_desktop_surface_get_geometry(dsurf); struct ivi_output *output; + struct ivi_policy *policy = surf->ivi->policy; - assert(surf->role == IVI_SURFACE_ROLE_DESKTOP); + assert(surf->role == IVI_SURFACE_ROLE_DESKTOP || + surf->role == IVI_SURFACE_ROLE_REMOTE); - output = surf->desktop.pending_output; + output = ivi_layout_get_output_from_surface(surf); if (!output) { struct ivi_output *ivi_bg_output; - /* FIXME: This should be changed to determine if the policy - * database allows that to happen */ + 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) return; +skip_config_check: + /* we can only activate it again by using the protocol */ + if (surf->activated_by_default) + return; + ivi_bg_output = ivi_layout_find_bg_output(surf->ivi); /* use the output of the bg to activate the app on start-up by @@ -256,13 +297,39 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) if (surf->view && ivi_bg_output) { const char *app_id = weston_desktop_surface_get_app_id(dsurf); - if (app_id && ivi_bg_output) + if (app_id && ivi_bg_output) { ivi_layout_activate(ivi_bg_output, app_id); + surf->activated_by_default = true; + } } return; } + if (surf->role == IVI_SURFACE_ROLE_REMOTE && output) { + const char *app_id; + + if (policy && policy->api.surface_activate_by_default && + !policy->api.surface_activate_by_default(surf, surf->ivi)) + return; + + app_id = weston_desktop_surface_get_app_id(dsurf); + if (app_id) { + ivi_layout_activate(output, app_id); + + /* we transition to the desktop role from remote one, + * as they're basically one and the same, but in order + * to keep the same functionality (that is to display + * it by default when starting), we need to know the + * output before hand, fact that that is not true for, + * regular desktop ones. + */ + surf->role = IVI_SURFACE_ROLE_DESKTOP; + surf->activated_by_default = true; + } + return; + } + if (!weston_desktop_surface_get_maximized(dsurf) || geom.width != output->area.width || geom.height != output->area.height) @@ -271,6 +338,207 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) ivi_layout_activate_complete(output, surf); } +void +ivi_layout_fs_committed(struct ivi_surface *surface) +{ + struct ivi_compositor *ivi = surface->ivi; + + struct weston_desktop_surface *dsurface = surface->dsurface; + struct weston_surface *wsurface = + weston_desktop_surface_get_surface(dsurface); + + struct ivi_output *output = surface->split.output; + struct weston_output *woutput = output->output; + + struct weston_view *view = surface->view; + struct weston_geometry geom; + + if (surface->view->is_mapped) + return; + + geom = weston_desktop_surface_get_geometry(dsurface); + 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); + + weston_desktop_surface_set_fullscreen(dsurface, true); + + weston_view_set_output(view, woutput); + 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); + + wsurface->is_mapped = true; + 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) +{ + struct ivi_compositor *ivi = surface->ivi; + + struct weston_desktop_surface *dsurface = surface->dsurface; + struct weston_surface *wsurface = + weston_desktop_surface_get_surface(dsurface); + + struct ivi_output *output = surface->split.output; + struct weston_output *woutput = output->output; + + struct weston_view *view = surface->view; + struct weston_geometry geom; + + int x, y; + int width, height; + + x = woutput->x; + y = woutput->y; + + if (surface->view->is_mapped) + return; + + geom = weston_desktop_surface_get_geometry(dsurface); + + assert(surface->role == IVI_SURFACE_ROLE_SPLIT_H || + surface->role == IVI_SURFACE_ROLE_SPLIT_V); + + /* 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: + 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); + + weston_view_update_transform(view); + weston_view_damage_below(view); + + wsurface->is_mapped = true; + surface->view->is_mapped = true; +} + +void +ivi_layout_popup_committed(struct ivi_surface *surface) +{ + struct ivi_compositor *ivi = surface->ivi; + + struct weston_desktop_surface *dsurface = surface->dsurface; + struct weston_surface *wsurface = + weston_desktop_surface_get_surface(dsurface); + + struct ivi_output *output = surface->popup.output; + struct weston_output *woutput = output->output; + + struct weston_view *view = surface->view; + struct weston_geometry geom; + + if (surface->view->is_mapped) + return; + + geom = weston_desktop_surface_get_geometry(dsurface); + weston_log("geom x %d, y %d, width %d, height %d\n", geom.x, geom.y, + geom.width, geom.height); + + assert(surface->role == IVI_SURFACE_ROLE_POPUP); + + weston_view_set_output(view, woutput); + if (surface->popup.x || surface->popup.y) + weston_view_set_position(view, surface->popup.x, surface->popup.y); + else + weston_view_set_position(view, geom.x, geom.y); + weston_layer_entry_insert(&ivi->popup.view_list, &view->layer_link); + + weston_view_update_transform(view); + weston_view_damage_below(view); + + wsurface->is_mapped = true; + surface->view->is_mapped = true; +} + +static void +ivi_layout_popup_re_add(struct ivi_surface *surface) +{ + assert(surface->role == IVI_SURFACE_ROLE_POPUP); + struct weston_view *view = surface->view; + + if (weston_view_is_mapped(view)) { + struct weston_desktop_surface *dsurface = surface->dsurface; + struct weston_surface *wsurface = + weston_desktop_surface_get_surface(dsurface); + + weston_layer_entry_remove(&view->layer_link); + + wsurface->is_mapped = false; + view->is_mapped = false; + } + + ivi_layout_popup_committed(surface); +} + void ivi_layout_panel_committed(struct ivi_surface *surface) { @@ -338,6 +606,24 @@ ivi_layout_panel_committed(struct ivi_surface *surface) surface->view->is_mapped = true; } +static bool +ivi_layout_surface_is_split_or_fs(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_FS) + 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) { @@ -360,13 +646,23 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id) #ifdef AGL_COMP_DEBUG weston_log("Found app_id %s\n", app_id); #endif - if (surf == output->active) + + if (surf->role == IVI_SURFACE_ROLE_POPUP) { + ivi_layout_popup_re_add(surf); return; + } + + /* do not 're'-activate surfaces that are split or active */ + if (surf == output->active || + ivi_layout_surface_is_split_or_fs(surf)) + return; + dsurf = surf->dsurface; view = surf->view; geom = weston_desktop_surface_get_geometry(dsurf); + surf->desktop.pending_output = output; if (weston_desktop_surface_get_maximized(dsurf) && geom.width == output->area.width && geom.height == output->area.height) { @@ -393,6 +689,57 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id) /* force repaint of the entire output */ weston_output_damage(output->output); } +} - surf->desktop.pending_output = output; +void +ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id) +{ + struct ivi_surface *surf; + struct ivi_output *ivi_output; + struct ivi_policy *policy = ivi->policy; + + surf = ivi_find_app(ivi, app_id); + if (!surf) + return; + + if (policy && policy->api.surface_deactivate && + !policy->api.surface_deactivate(surf, surf->ivi)) { + return; + } + + ivi_output = ivi_layout_get_output_from_surface(surf); + weston_log("deactiving %s\n", app_id); + + if (surf->role == IVI_SURFACE_ROLE_DESKTOP) { + struct ivi_surface *previous_active; + + previous_active = ivi_output->previous_active; + if (!previous_active) { + /* we don't have a previous active it means we should + * display the bg */ + if (ivi_output->active) { + struct weston_view *view; + + view = ivi_output->active->view; + view->is_mapped = false; + view->surface->is_mapped = false; + + weston_layer_entry_remove(&view->layer_link); + weston_output_damage(ivi_output->output); + } + } else { + struct weston_desktop_surface *dsurface; + const char *previous_active_app_id; + + dsurface = previous_active->dsurface; + previous_active_app_id = + weston_desktop_surface_get_app_id(dsurface); + ivi_layout_activate(ivi_output, previous_active_app_id); + } + } else if (surf->role == IVI_SURFACE_ROLE_POPUP) { + struct weston_view *view = surf->view; + + weston_layer_entry_remove(&view->layer_link); + weston_view_damage_below(view); + } }