X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=e649d4c0665296ccf64cad5e1e605cbc832034eb;hb=6d2720303d8441525ba2e37c9d87daef568f8cdc;hp=ea293cadeb9d829237b8bbed00b2a9fe4ce29de0;hpb=0fef26d32431e7bea6413f886e79cd2c1d88eb7c;p=src%2Fagl-compositor.git diff --git a/src/layout.c b/src/layout.c index ea293ca..e649d4c 100644 --- a/src/layout.c +++ b/src/layout.c @@ -30,8 +30,9 @@ #include #include +#include #include -#include +#include #include "agl-shell-desktop-server-protocol.h" @@ -47,6 +48,7 @@ static const char *ivi_roles_as_string[] = { [IVI_SURFACE_ROLE_SPLIT_V] = "SPLIT_V", [IVI_SURFACE_ROLE_FULLSCREEN] = "FULLSCREEN", [IVI_SURFACE_ROLE_REMOTE] = "REMOTE", + [IVI_SURFACE_ROLE_TILE] = "SPLIT", }; bool @@ -78,10 +80,10 @@ ivi_background_init(struct ivi_compositor *ivi, struct ivi_output *output) view = bg->view; weston_view_set_output(view, woutput); - weston_view_set_position(view, woutput->x, woutput->y); + weston_view_set_position(view, woutput->pos); - weston_log("(background) position view %p, x %d, y %d, on output %s\n", view, - woutput->x, woutput->y, output->name); + weston_log("(background) position view %p, x %f, y %f, on output %s\n", view, + woutput->pos.c.x, woutput->pos.c.y, output->name); view->is_mapped = true; view->surface->is_mapped = true; @@ -97,8 +99,7 @@ ivi_panel_init(struct ivi_compositor *ivi, struct ivi_output *output, struct weston_desktop_surface *dsurface; struct weston_view *view; struct weston_geometry geom; - int x = woutput->x; - int y = woutput->y; + struct weston_coord_global pos = woutput->pos; if (!panel) return; @@ -117,7 +118,7 @@ ivi_panel_init(struct ivi_compositor *ivi, struct ivi_output *output, output->area.height -= geom.height; break; case AGL_SHELL_EDGE_BOTTOM: - y += woutput->height - geom.height; + pos.c.y += woutput->height - geom.height; output->area.height -= geom.height; break; case AGL_SHELL_EDGE_LEFT: @@ -125,19 +126,19 @@ ivi_panel_init(struct ivi_compositor *ivi, struct ivi_output *output, output->area.width -= geom.width; break; case AGL_SHELL_EDGE_RIGHT: - x += woutput->width - geom.width; + pos.c.x += woutput->width - geom.width; output->area.width -= geom.width; break; } - x -= geom.x; - y -= geom.y; + pos.c.x -= geom.x; + pos.c.y -= geom.y; weston_view_set_output(view, woutput); - weston_view_set_position(view, x, y); + weston_view_set_position(view, pos); - weston_log("(panel) edge %d position view %p, x %d, y %d\n", - panel->panel.edge, view, x, y); + weston_log("(panel) edge %d position view %p, x %f, y %f\n", + panel->panel.edge, view, pos.c.x, pos.c.y); view->is_mapped = true; view->surface->is_mapped = true; @@ -155,6 +156,29 @@ void ivi_layout_init(struct ivi_compositor *ivi, struct ivi_output *output) { bool use_default_area = true; + struct weston_config_section *section = output->config; + char *t; + + weston_config_section_get_string(section, "activation-area", &t, NULL); + if (t) { + if (output->area_activation.width == 0 && + output->area_activation.height == 0 && + output->area_activation.x == 0 && + output->area_activation.y == 0) { + weston_log("WARNING: activation-area set in " + "configuration file, but yet applied!\n"); + if (parse_activation_area(t, output) < 0) + weston_log("Invalid activation-area \"%s\" for output %s\n", + t, output->name); + } else { + weston_log("WARNING: activation-area detected in ini file, " + "but agl_shell override detected!\n"); + if (parse_activation_area(t, output) < 0) + weston_log("Invalid activation-area \"%s\" for output %s\n", + t, output->name); + } + } + free(t); ivi_background_init(ivi, output); @@ -222,6 +246,7 @@ ivi_layout_activate_complete(struct ivi_output *output, struct ivi_shell_seat *ivi_seat = get_ivi_shell_seat(wseat); const char *app_id = weston_desktop_surface_get_app_id(surf->dsurface); bool update_previous = true; + struct weston_coord_global pos; if (weston_view_is_mapped(view)) { weston_layer_entry_remove(&view->layer_link); @@ -255,11 +280,20 @@ ivi_layout_activate_complete(struct ivi_output *output, /* drop any previous masks set on this view */ weston_view_set_mask_infinite(view); - if (surf->role != IVI_SURFACE_ROLE_BACKGROUND) - weston_view_set_position(view, - woutput->x + output->area.x, - woutput->y + output->area.y); + if (surf->role != IVI_SURFACE_ROLE_BACKGROUND) { + pos.c.x = woutput->pos.c.x + output->area.x; + pos.c.y = woutput->pos.c.y + output->area.y; + weston_view_set_position(view, pos); + } + /* reset any previous orientation */ + if (surf->orientation != AGL_SHELL_TILE_ORIENTATION_NONE && + !surf->sticky) { + weston_log("%s() resetting itself to none orientation\n", __func__); + surf->orientation = AGL_SHELL_TILE_ORIENTATION_NONE; + weston_desktop_surface_set_orientation(surf->dsurface, + surf->orientation); + } view->is_mapped = true; surf->mapped = true; view->surface->is_mapped = true; @@ -285,7 +319,9 @@ ivi_layout_activate_complete(struct ivi_output *output, if (output->active) { /* keep the background surface mapped at all times */ - if (output->active->role != IVI_SURFACE_ROLE_BACKGROUND) { + if (output->active->role != IVI_SURFACE_ROLE_BACKGROUND && + !output->active->sticky) { + output->active->view->is_mapped = false; output->active->view->surface->is_mapped = false; @@ -301,7 +337,7 @@ ivi_layout_activate_complete(struct ivi_output *output, * we're trying to complete activation with means we're * operating on the same app_id so do update previous_active as * it will overwrite it with the same value */ - if (!strcmp(c_app_id, app_id)) { + if (app_id && !strcmp(c_app_id, app_id)) { update_previous = false; } } @@ -557,9 +593,12 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) return; } - if (!surf->ivi->activate_by_default) { - weston_log("Refusing to activate surface role %d, app_id %s\n", - surf->role, app_id); + if (!surf->ivi->activate_by_default && + (!surf->xwayland.is_set && !is_shell_surface_xwayland(surf))) { + weston_log("Refusing to activate surface role %d, app_id %s, type %s\n", + surf->role, app_id, + is_shell_surface_xwayland(surf) ? + "xwayland" : "regular"); if (!weston_desktop_surface_get_maximized(dsurf) || geom.width != r_output->area.width || @@ -587,7 +626,12 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) */ 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); + if (surf->xwayland.is_set || is_shell_surface_xwayland(surf)) { + ivi_layout_activate_by_surf(r_output, surf); + ivi_layout_activate_complete(r_output, surf); + } else { + ivi_layout_activate_by_surf(r_output, surf); + } } } @@ -677,7 +721,7 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface) weston_layer_entry_remove(&view->layer_link); weston_view_set_output(view, woutput); - weston_view_set_position(view, woutput->x, woutput->y); + weston_view_set_position(view, woutput->pos); weston_layer_entry_insert(&ivi->fullscreen.view_list, &view->layer_link); wsurface->is_mapped = true; @@ -698,6 +742,7 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface) ivi_layout_get_surface_role_name(surface), output->name); + weston_compositor_schedule_repaint(ivi->compositor); } } @@ -708,15 +753,17 @@ ivi_layout_desktop_resize(struct ivi_surface *surface, struct weston_desktop_surface *dsurf = surface->dsurface; struct weston_view *view = surface->view; - int x = area.x; - int y = area.y; + struct weston_coord_global pos; int width = area.width; int height = area.height; + pos.c.x = area.x; + pos.c.y = area.y; + weston_desktop_surface_set_size(dsurf, width, height); - weston_view_set_position(view, x, y); + weston_view_set_position(view, pos); weston_view_geometry_dirty(view); weston_surface_damage(view->surface); @@ -742,12 +789,9 @@ ivi_layout_split_committed(struct ivi_surface *surface) struct weston_view *view = surface->view; struct weston_geometry geom; - int x, y; + struct weston_coord_global pos = woutput->pos; int width, height; - x = woutput->x; - y = woutput->y; - if (policy && policy->api.surface_activate_by_default && !policy->api.surface_activate_by_default(surface, surface->ivi) && !surface->mapped) @@ -769,25 +813,25 @@ ivi_layout_split_committed(struct ivi_surface *surface) case IVI_SURFACE_ROLE_SPLIT_V: geom.width = (output->area.width / 2); - x += woutput->width - geom.width; + pos.c.x += woutput->width - geom.width; output->area.width -= geom.width; - width = woutput->width - x; + width = woutput->width - pos.c.x; height = output->area.height; - y = output->area.y; + pos.c.y = output->area.y; break; case IVI_SURFACE_ROLE_SPLIT_H: geom.height = (output->area.height / 2); - y = output->area.y; + pos.c.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; + pos.c.x = output->area.x; break; default: @@ -803,7 +847,7 @@ ivi_layout_split_committed(struct ivi_surface *surface) ivi_layout_desktop_resize(output->active, output->area); weston_view_set_output(view, woutput); - weston_view_set_position(view, x, y); + weston_view_set_position(view, pos); weston_layer_entry_insert(&ivi->normal.view_list, &view->layer_link); weston_view_geometry_dirty(view); @@ -824,10 +868,10 @@ ivi_layout_split_committed(struct ivi_surface *surface) 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) + int initial_x, int initial_y, double *new_x, double *new_y) { - *new_x = output->x + initial_x; - *new_y = output->y + initial_y; + *new_x = output->pos.c.x + initial_x; + *new_y = output->pos.c.y + initial_y; } @@ -860,7 +904,7 @@ ivi_layout_popup_committed(struct ivi_surface *surface) weston_desktop_surface_get_surface(dsurface); const char *app_id = weston_desktop_surface_get_app_id(dsurface); - int new_x, new_y; + struct weston_coord_global pos; struct ivi_output *output = surface->popup.output; struct weston_output *woutput = output->output; @@ -887,8 +931,8 @@ ivi_layout_popup_committed(struct ivi_surface *surface) weston_view_set_output(view, woutput); 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); + surface->popup.x, surface->popup.y, &pos.c.x, &pos.c.y); + weston_view_set_position(view, pos); weston_view_update_transform(view); /* only clip the pop-up dialog window if we have a valid @@ -942,6 +986,32 @@ ivi_layout_popup_re_add(struct ivi_surface *surface) ivi_layout_popup_committed(surface); } +static void +ivi_layout_fullscreen_re_add(struct ivi_surface *surface) +{ + assert(surface->role == IVI_SURFACE_ROLE_FULLSCREEN); + 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; + } + + /* reset the activate by default in order to (still) allow the surface + * to be activaved using the request */ + if (!surface->mapped) + surface->mapped = true; + + surface->state = NORMAL; + ivi_layout_fullscreen_committed(surface); +} + static bool ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf) { @@ -965,6 +1035,59 @@ ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf) return false; } +void +ivi_layout_reset_split_surfaces(struct ivi_compositor *ivi) +{ + struct ivi_surface *ivisurf; + struct ivi_surface *found_ivi_surf = NULL; + bool found_split_surface = false; + struct ivi_output *output = NULL; + + wl_list_for_each(ivisurf, &ivi->surfaces, link) { + if (ivisurf->orientation != AGL_SHELL_TILE_ORIENTATION_NONE) { + found_ivi_surf = ivisurf; + found_split_surface = true; + break; + } + } + + if (!found_split_surface) + return; + + output = found_ivi_surf->current_completed_output; + + if (found_ivi_surf->sticky) + return; + + if (output->previous_active && output->background != output->previous_active) { + struct weston_view *ev = output->previous_active->view; + struct weston_output *woutput = output->output; + + if (!weston_view_is_mapped(ev)) + weston_view_update_transform(ev); + else + weston_layer_entry_remove(&ev->layer_link); + + ev->is_mapped = true; + ev->surface->is_mapped = true; + output->previous_active->mapped = true; + + weston_view_set_output(ev, woutput); + + weston_layer_entry_insert(&ivi->normal.view_list, &ev->layer_link); + + _ivi_set_shell_surface_split(output->previous_active, NULL, 0, + AGL_SHELL_TILE_ORIENTATION_NONE, false, false); + + if (output->active == ivisurf) { + output->active = output->previous_active; + } + } + + _ivi_set_shell_surface_split(ivisurf, NULL, 0, + AGL_SHELL_TILE_ORIENTATION_NONE, false, false); +} + void ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf) { @@ -995,14 +1118,40 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf) return; } + if (surf->role == IVI_SURFACE_ROLE_FULLSCREEN) { + ivi_layout_fullscreen_re_add(surf); + return; + } +#if 0 + /* reset tile to desktop to allow to resize correctly */ + if (surf->role == IVI_SURFACE_ROLE_TILE && output->active == surf) { + weston_log("%s() resetting tile role!\n", __func__); + surf->role = IVI_SURFACE_ROLE_DESKTOP; + } +#endif + /* do not 're'-activate surfaces that are split or active */ - if (surf == output->active || - ivi_layout_surface_is_split_or_fullscreen(surf)) { + if (surf == output->active) { weston_log("Application %s is already active on output %s\n", app_id, output->output->name); return; } + if (surf->sticky && surf->role == IVI_SURFACE_ROLE_TILE && output->active == surf) { + weston_log("Application %s is already active on output %s (split role)\n", + app_id, output->output->name); + return; + } + + if (ivi_layout_surface_is_split_or_fullscreen(surf)) { + weston_log("Application %s is fullscreen or split on output %s\n", + app_id, output->output->name); + return; + } + + // destroy any split types to allow correct re-activation + ivi_layout_reset_split_surfaces(surf->ivi); + if (surf->role == IVI_SURFACE_ROLE_REMOTE) { struct ivi_output *remote_output = ivi_layout_find_with_app_id(app_id, ivi); @@ -1030,7 +1179,8 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf) /* the background surface is already "maximized" so we don't need to * add to the hidden layer */ - if (surf->role == IVI_SURFACE_ROLE_BACKGROUND) { + if (surf->role == IVI_SURFACE_ROLE_BACKGROUND && + output->active->role != IVI_SURFACE_ROLE_TILE) { ivi_layout_activate_complete(output, surf); return; } @@ -1085,8 +1235,13 @@ ivi_layout_get_output_from_surface(struct ivi_surface *surf) case IVI_SURFACE_ROLE_REMOTE: ivi_output = surf->remote.output; break; + case IVI_SURFACE_ROLE_TILE: + ivi_output = surf->current_completed_output; + break; case IVI_SURFACE_ROLE_NONE: default: + if (surf->view->output) + return to_ivi_output(surf->view->output); break; } @@ -1145,7 +1300,8 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *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) { + } else if (surf->role == IVI_SURFACE_ROLE_POPUP || + surf->role == IVI_SURFACE_ROLE_FULLSCREEN) { struct weston_view *view = surf->view; weston_view_unmap(view); @@ -1156,5 +1312,5 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id) weston_surface_damage(view->surface); } - shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_DEACTIVATED); + shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_DEACTIVATED); }