X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=38092cf64048ceaa8228a6b04a7dac14339ed137;hb=9cf6c3f183f56f47f9a32b747dd70dfde235cc49;hp=106f6fb1389af5eee67d76d70f30c3381abfc404;hpb=3950b7e787c19bd1917533081c8fb8d4331e4ef3;p=src%2Fagl-compositor.git diff --git a/src/layout.c b/src/layout.c index 106f6fb..38092cf 100644 --- a/src/layout.c +++ b/src/layout.c @@ -24,12 +24,15 @@ */ #include "ivi-compositor.h" +#include "policy.h" #include #include -#include -#include +#include +#include + +#include "agl-shell-desktop-server-protocol.h" #define AGL_COMP_DEBUG @@ -114,9 +117,28 @@ ivi_panel_init(struct ivi_compositor *ivi, struct ivi_output *output, panel->panel.edge, view, x, y); #endif + /* this is necessary for cases we already mapped it desktop_committed() + * but we not running the older qtwayland, so we still have a chance + * for this to run at the next test */ + if (view->surface->is_mapped) { + weston_layer_entry_remove(&view->layer_link); + + view->is_mapped = false; + view->surface->is_mapped = false; + } + + /* give ivi_layout_panel_committed() a chance to map the view/surface + * instead */ + if ((geom.width == geom.height && geom.width == 0) && + (geom.x == geom.y && geom.x == 0) && + panel->panel.edge != AGL_SHELL_EDGE_TOP) + return; + view->is_mapped = true; view->surface->is_mapped = true; - +#ifdef AGL_COMP_DEBUG + weston_log("panel type %d inited\n", panel->panel.edge); +#endif weston_layer_entry_insert(&ivi->panel.view_list, &view->layer_link); } @@ -145,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; @@ -186,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); @@ -193,7 +216,17 @@ ivi_layout_activate_complete(struct ivi_output *output, /* force repaint of the entire output */ weston_output_damage(output->output); - surf->desktop.pending_output = NULL; + + /* + * the 'remote' role now makes use of this part so make sure we don't + * trip the enum such that we might end up with a modified output for + * 'remote' role + */ + if (surf->role == IVI_SURFACE_ROLE_DESKTOP) { + if (surf->desktop.pending_output) + surf->desktop.last_output = surf->desktop.pending_output; + surf->desktop.pending_output = NULL; + } } static struct ivi_output * @@ -215,17 +248,33 @@ 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_policy *policy = surf->ivi->policy; struct ivi_output *output; - 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; - if (!output) { + /* + * 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 + * to a surface that continuously updates its content + */ + if (surf->role == IVI_SURFACE_ROLE_DESKTOP) + output = surf->desktop.pending_output; + else + output = surf->remote.output; + + if (surf->role == IVI_SURFACE_ROLE_DESKTOP && !output) { struct ivi_output *ivi_bg_output; - /* FIXME: This should be changed to determine if the policy - * database allows that to happen */ - 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; + + /* 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); @@ -235,13 +284,37 @@ 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; + + /* we can only activate it again by using the protocol, but + * additionally the output is not reset when + * 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) + return; + + app_id = weston_desktop_surface_get_app_id(dsurf); + if (app_id) { + ivi_layout_activate(output, app_id); + surf->activated_by_default = true; + } + return; + } + if (!weston_desktop_surface_get_maximized(dsurf) || geom.width != output->area.width || geom.height != output->area.height) @@ -250,6 +323,291 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) ivi_layout_activate_complete(output, surf); } +void +ivi_layout_fullscreen_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_FULLSCREEN); + + 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) +{ + struct ivi_compositor *ivi = surface->ivi; + struct ivi_output *output = surface->bg.output; + struct weston_output *woutput = output->output; + struct weston_desktop_surface *dsurface = surface->dsurface; + struct weston_surface *wsurface = + weston_desktop_surface_get_surface(dsurface); + struct weston_geometry geom; + int x = woutput->x; + int y = woutput->y; + + assert(surface->role == IVI_SURFACE_ROLE_PANEL); + + /* + * If the desktop_surface geometry is not set and the panel is not a + * top one, we'll give this a chance to run, as some qtwayland version + * seem to have a 'problem', where the panel initilization part will + * have a desktop surface with 0 as geometry for *all* its members + * (width/height). Doing that will result in the panel not being + * displayed at all. + * + * Later versions of qtwayland do have the correct window geometry for + * the desktop surface so the weston_surface is already mapped in + * ivi_panel_init(). + */ + if (wsurface->is_mapped) + return; + + geom = weston_desktop_surface_get_geometry(dsurface); + +#ifdef AGL_COMP_DEBUG + weston_log("geom.width %d, geom.height %d, geom.x %d, geom.y %d\n", + geom.width, geom.height, geom.x, geom.y); +#endif + + switch (surface->panel.edge) { + case AGL_SHELL_EDGE_TOP: + /* Do nothing */ + break; + case AGL_SHELL_EDGE_BOTTOM: + y += woutput->height - geom.height; + break; + case AGL_SHELL_EDGE_LEFT: + /* Do nothing */ + break; + case AGL_SHELL_EDGE_RIGHT: + x += woutput->width - geom.width; + break; + } +#ifndef AGL_COMP_DEBUG + weston_log("panel type %d commited\n", surface->panel.edge); +#endif + + weston_view_set_output(surface->view, woutput); + weston_view_set_position(surface->view, x, y); + weston_layer_entry_insert(&ivi->panel.view_list, + &surface->view->layer_link); + + weston_view_update_transform(surface->view); + weston_view_schedule_repaint(surface->view); + + wsurface->is_mapped = true; + 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) { @@ -258,20 +616,38 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id) 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); if (!surf) return; + + if (policy && policy->api.surface_activate && + !policy->api.surface_activate(surf, surf->ivi)) { + return; + } + #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_fullscreen(surf)) + return; + dsurf = surf->dsurface; view = surf->view; geom = weston_desktop_surface_get_geometry(dsurf); + if (surf->role == IVI_SURFACE_ROLE_DESKTOP) + surf->desktop.pending_output = output; if (weston_desktop_surface_get_maximized(dsurf) && geom.width == output->area.width && geom.height == output->area.height) { @@ -298,6 +674,96 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id) /* force repaint of the entire output */ weston_output_damage(output->output); } +} + +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_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_REMOTE: + ivi_output = surf->remote.output; + break; + case IVI_SURFACE_ROLE_NONE: + default: + break; + } + + return ivi_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; - surf->desktop.pending_output = output; + weston_layer_entry_remove(&view->layer_link); + weston_view_damage_below(view); + } }