X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=38092cf64048ceaa8228a6b04a7dac14339ed137;hb=refs%2Fchanges%2F55%2F24655%2F1;hp=bcaf897fb7bdbc43ef07773da07936f73d1aa062;hpb=a9ae8d75026b1fa1ef32d143da23bc8ee9aedeaa;p=src%2Fagl-compositor.git diff --git a/src/layout.c b/src/layout.c index bcaf897..38092cf 100644 --- a/src/layout.c +++ b/src/layout.c @@ -216,8 +216,17 @@ 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; + + /* + * 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 * @@ -239,23 +248,31 @@ 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) { - struct ivi_output *ivi_bg_output; - struct ivi_policy *policy = surf->ivi->policy; + /* + * 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 (policy && policy->api.surface_activate_by_default) - if (policy->api.surface_activate_by_default(surf, surf->ivi)) - goto skip_config_check; + if (surf->role == IVI_SURFACE_ROLE_DESKTOP && !output) { + struct ivi_output *ivi_bg_output; - 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; @@ -276,6 +293,28 @@ skip_config_check: 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) @@ -306,7 +345,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); @@ -551,6 +590,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) { @@ -579,14 +636,18 @@ 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); - surf->desktop.pending_output = output; + 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) { @@ -615,7 +676,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; @@ -630,10 +691,24 @@ 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_REMOTE: + ivi_output = surf->remote.output; + break; case IVI_SURFACE_ROLE_NONE: + default: break; }