X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=0356d013d3d5e2bb026e5370e0e2b137c0d441f0;hb=cec4cf8fe409cae5618e81e4a3b6dd11cc8b2aa9;hp=760a139f11085d4769ab188ce5ced0f0d814606b;hpb=226f4ca4f760ddbbc7566630a9e21c457d70a4eb;p=src%2Fagl-compositor.git diff --git a/src/layout.c b/src/layout.c index 760a139..0356d01 100644 --- a/src/layout.c +++ b/src/layout.c @@ -25,6 +25,7 @@ #include "ivi-compositor.h" #include "policy.h" +#include "shared/helpers.h" #include #include @@ -36,6 +37,27 @@ #define AGL_COMP_DEBUG +static const char *ivi_roles_as_string[] = { + [IVI_SURFACE_ROLE_NONE] = "NONE", + [IVI_SURFACE_ROLE_BACKGROUND] = "BACKGROUND", + [IVI_SURFACE_ROLE_PANEL] = "PANEL", + [IVI_SURFACE_ROLE_DESKTOP] = "DESKTOP", + [IVI_SURFACE_ROLE_POPUP] = "POPUP", + [IVI_SURFACE_ROLE_SPLIT_H] = "SPLIT_H", + [IVI_SURFACE_ROLE_SPLIT_V] = "SPLIT_V", + [IVI_SURFACE_ROLE_FULLSCREEN] = "FULLSCREEN", + [IVI_SURFACE_ROLE_REMOTE] = "REMOTE", +}; + +const char * +ivi_layout_get_surface_role_name(struct ivi_surface *surf) +{ + if (surf->role < 0 || surf->role >= ARRAY_LENGTH(ivi_roles_as_string)) + return " unknown surface role"; + + return ivi_roles_as_string[surf->role]; +} + static void ivi_background_init(struct ivi_compositor *ivi, struct ivi_output *output) { @@ -55,10 +77,8 @@ ivi_background_init(struct ivi_compositor *ivi, struct ivi_output *output) weston_view_set_output(view, woutput); weston_view_set_position(view, woutput->x, woutput->y); -#ifdef AGL_COMP_DEBUG - weston_log("(background) position view %p, x %d, y %d\n", view, - woutput->x, woutput->y); -#endif + weston_log("(background) position view %p, x %d, y %d, on output %s\n", view, + woutput->x, woutput->y, output->name); view->is_mapped = true; view->surface->is_mapped = true; @@ -84,10 +104,10 @@ ivi_panel_init(struct ivi_compositor *ivi, struct ivi_output *output, dsurface = panel->dsurface; view = panel->view; 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", + + weston_log("(panel) geom.width %d, geom.height %d, geom.x %d, geom.y %d\n", geom.width, geom.height, geom.x, geom.y); -#endif + switch (panel->panel.edge) { case AGL_SHELL_EDGE_TOP: output->area.y += geom.height; @@ -112,33 +132,16 @@ ivi_panel_init(struct ivi_compositor *ivi, struct ivi_output *output, weston_view_set_output(view, woutput); weston_view_set_position(view, x, y); -#ifdef AGL_COMP_DEBUG + weston_log("(panel) edge %d position view %p, x %d, y %d\n", 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_log("panel type %d inited on output %s\n", panel->panel.edge, + output->name); + weston_layer_entry_insert(&ivi->panel.view_list, &view->layer_link); } @@ -212,14 +215,45 @@ 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); + weston_view_geometry_dirty(view); + weston_surface_damage(view->surface); - /* 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; + } + + weston_log("Activation completed for app_id %s, role %s, output %s\n", + weston_desktop_surface_get_app_id(surf->dsurface), + ivi_layout_get_surface_role_name(surf), output->name); +} + +struct ivi_output * +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; + + if (!strcmp(app_id, out->app_id)) + return out; + } + + return NULL; } + static struct ivi_output * ivi_layout_find_bg_output(struct ivi_compositor *ivi) { @@ -239,14 +273,27 @@ 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; + const char *app_id = weston_desktop_surface_get_app_id(dsurf); + + assert(surf->role == IVI_SURFACE_ROLE_DESKTOP || + surf->role == IVI_SURFACE_ROLE_REMOTE); - assert(surf->role == IVI_SURFACE_ROLE_DESKTOP); + /* + * 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; - output = surf->desktop.pending_output; - if (!output) { - struct ivi_output *ivi_bg_output; - struct ivi_policy *policy = surf->ivi->policy; + if (surf->role == IVI_SURFACE_ROLE_DESKTOP && !output) { + struct ivi_output *r_output; if (policy && policy->api.surface_activate_by_default && !policy->api.surface_activate_by_default(surf, surf->ivi)) @@ -256,15 +303,55 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) if (surf->activated_by_default) return; - ivi_bg_output = ivi_layout_find_bg_output(surf->ivi); + /* check first if there aren't any outputs being set */ + r_output = ivi_layout_find_with_app_id(app_id, surf->ivi); + + if (r_output) { + struct weston_view *view = r_output->fullscreen_view.fs->view; + if (view->is_mapped || view->surface->is_mapped) + remove_black_surface(r_output); + } + + + /* try finding an output with a background and use that */ + if (!r_output) + r_output = ivi_layout_find_bg_output(surf->ivi); + + /* if we couldn't still find an output by this point, there's + * something wrong so we abort with a protocol error */ + if (!r_output) { + wl_resource_post_error(surf->ivi->shell_client.resource, + AGL_SHELL_ERROR_INVALID_ARGUMENT, + "No valid output found to activate surface by default"); + 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 && ivi_bg_output) { - const char *app_id = - weston_desktop_surface_get_app_id(dsurf); - if (app_id && ivi_bg_output) { - ivi_layout_activate(ivi_bg_output, app_id); + if (surf->view && r_output) { + if (app_id && r_output) { + weston_log("Surface with app_id %s, role %s activating by default\n", + weston_desktop_surface_get_app_id(surf->dsurface), + ivi_layout_get_surface_role_name(surf)); + ivi_layout_activate(r_output, app_id); + surf->activated_by_default = true; + } else if (!app_id) { + /* + * applications not setting an app_id, or + * setting an app_id but at a later point in + * time, might fall-back here so give them a + * chance to receive the configure event and + * act upon it + */ + weston_log("Surface no app_id, role %s activating by default\n", + ivi_layout_get_surface_role_name(surf)); + ivi_layout_activate_by_surf(r_output, surf); surf->activated_by_default = true; } } @@ -272,6 +359,29 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) return; } + if (surf->role == IVI_SURFACE_ROLE_REMOTE && output) { + 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; + + if (app_id) { + weston_log("Surface with app_id %s, role %s activating by default\n", + weston_desktop_surface_get_app_id(surf->dsurface), + ivi_layout_get_surface_role_name(surf)); + 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) @@ -284,10 +394,12 @@ void ivi_layout_fullscreen_committed(struct ivi_surface *surface) { struct ivi_compositor *ivi = surface->ivi; + struct ivi_policy *policy = ivi->policy; struct weston_desktop_surface *dsurface = surface->dsurface; struct weston_surface *wsurface = weston_desktop_surface_get_surface(dsurface); + const char *app_id = weston_desktop_surface_get_app_id(dsurface); struct ivi_output *output = surface->split.output; struct weston_output *woutput = output->output; @@ -295,6 +407,11 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface) struct weston_view *view = surface->view; struct weston_geometry geom; + if (policy && policy->api.surface_activate_by_default && + !policy->api.surface_activate_by_default(surface, surface->ivi) && + !surface->activated_by_default) + return; + if (surface->view->is_mapped) return; @@ -310,11 +427,17 @@ 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; + + shell_advertise_app_state(ivi, app_id, + NULL, AGL_SHELL_DESKTOP_APP_STATE_ACTIVATED); + + weston_log("Activation completed for app_id %s, role %s, output %s\n", + app_id, ivi_layout_get_surface_role_name(surface), output->name); } void @@ -333,18 +456,21 @@ 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 ivi_layout_split_committed(struct ivi_surface *surface) { struct ivi_compositor *ivi = surface->ivi; + struct ivi_policy *policy = ivi->policy; struct weston_desktop_surface *dsurface = surface->dsurface; struct weston_surface *wsurface = weston_desktop_surface_get_surface(dsurface); + const char *app_id = weston_desktop_surface_get_app_id(dsurface); struct ivi_output *output = surface->split.output; struct weston_output *woutput = output->output; @@ -358,6 +484,11 @@ ivi_layout_split_committed(struct ivi_surface *surface) x = woutput->x; y = woutput->y; + if (policy && policy->api.surface_activate_by_default && + !policy->api.surface_activate_by_default(surface, surface->ivi) && + !surface->activated_by_default) + return; + if (surface->view->is_mapped) return; @@ -372,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; @@ -385,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; @@ -415,49 +542,82 @@ 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; + + shell_advertise_app_state(ivi, app_id, + NULL, AGL_SHELL_DESKTOP_APP_STATE_ACTIVATED); + + weston_log("Activation completed for app_id %s, role %s, output %s\n", + 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) { struct ivi_compositor *ivi = surface->ivi; + struct ivi_policy *policy = ivi->policy; struct weston_desktop_surface *dsurface = surface->dsurface; struct weston_surface *wsurface = 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; struct weston_view *view = surface->view; - struct weston_geometry geom; - if (surface->view->is_mapped) + if (policy && policy->api.surface_activate_by_default && + !policy->api.surface_activate_by_default(surface, surface->ivi) && + !surface->activated_by_default) 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); + if (surface->view->is_mapped) + return; 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); + + 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 + * set-up so only enfore it is really passed on. */ + if (surface->popup.bb.width > 0 && surface->popup.bb.height > 0) + weston_view_set_mask(view, surface->popup.bb.x, surface->popup.bb.y, + surface->popup.bb.width, surface->popup.bb.height); + 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; + + shell_advertise_app_state(ivi, app_id, + NULL, AGL_SHELL_DESKTOP_APP_STATE_ACTIVATED); + + weston_log("Activation completed for app_id %s, role %s, output %s\n", + app_id, ivi_layout_get_surface_role_name(surface), output->name); } static void @@ -477,74 +637,12 @@ ivi_layout_popup_re_add(struct ivi_surface *surface) 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); + /* reset the activate by default in order to (still) allow the surface + * to be activaved using the request */ + if (!surface->activated_by_default) + surface->activated_by_default = true; - wsurface->is_mapped = true; - surface->view->is_mapped = true; + ivi_layout_popup_committed(surface); } static bool @@ -558,6 +656,11 @@ ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf) surf->role != IVI_SURFACE_ROLE_FULLSCREEN) return false; + /* reset the activate by default in order to (still) allow the surface + * to be activaved using the request */ + if (!surf->activated_by_default) + surf->activated_by_default = true; + wl_list_for_each(is, &ivi->surfaces, link) if (is == surf) return true; @@ -566,16 +669,19 @@ ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf) } void -ivi_layout_activate(struct ivi_output *output, const char *app_id) +ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf) { struct ivi_compositor *ivi = output->ivi; - struct ivi_surface *surf; 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); + dsurf = surf->dsurface; + view = surf->view; + + const char *app_id = weston_desktop_surface_get_app_id(dsurf); + if (!surf) return; @@ -585,7 +691,8 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id) } #ifdef AGL_COMP_DEBUG - weston_log("Found app_id %s\n", app_id); + weston_log("Activating app_id %s, type %s\n", app_id, + ivi_layout_get_surface_role_name(surf)); #endif if (surf->role == IVI_SURFACE_ROLE_POPUP) { @@ -598,12 +705,21 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id) ivi_layout_surface_is_split_or_fullscreen(surf)) return; + if (surf->role == IVI_SURFACE_ROLE_REMOTE) { + struct ivi_output *remote_output = + ivi_layout_find_with_app_id(app_id, ivi); + + /* if already active on a remote output do not + * attempt to activate it again */ + if (remote_output && remote_output->active == 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) { @@ -616,6 +732,9 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id) output->area.width, output->area.height); + weston_log("Setting app_id %s, role %s, set to maximized (%dx%d)\n", + app_id, ivi_layout_get_surface_role_name(surf), + output->area.width, output->area.height); /* * If the view isn't mapped, we put it onto the hidden layer so it will * start receiving frame events, and will be able to act on our @@ -627,11 +746,27 @@ ivi_layout_activate(struct ivi_output *output, const char *app_id) 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_output_damage(output->output); + weston_log("Placed app_id %s, type %s in hidden layer\n", + app_id, ivi_layout_get_surface_role_name(surf)); } } +void +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; + + ivi_layout_activate_by_surf(output, surf); +} + struct ivi_output * ivi_layout_get_output_from_surface(struct ivi_surface *surf) { @@ -660,6 +795,9 @@ ivi_layout_get_output_from_surface(struct ivi_surface *surf) 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; @@ -675,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; @@ -685,7 +826,8 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id) } ivi_output = ivi_layout_get_output_from_surface(surf); - weston_log("deactiving %s\n", app_id); + weston_log("Deactiving %s, role %s\n", app_id, + ivi_layout_get_surface_role_name(surf)); if (surf->role == IVI_SURFACE_ROLE_DESKTOP) { struct ivi_surface *previous_active; @@ -702,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; @@ -717,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); } }