X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=6c1df79fbe1d2d1be66d3dc02a89da70557d2c3c;hb=aecb2e266d3a28772a1d5f81fa09ae4c93149947;hp=62e422cd8d079d556e20e79ba054464da86c21a2;hpb=26e72fa379d1b1c0c131cbc85e46d371c3d926ef;p=src%2Fagl-compositor.git diff --git a/src/layout.c b/src/layout.c index 62e422c..6c1df79 100644 --- a/src/layout.c +++ b/src/layout.c @@ -203,6 +203,7 @@ ivi_layout_activate_complete(struct ivi_output *output, woutput->y + output->area.y); view->is_mapped = true; + surf->mapped = true; view->surface->is_mapped = true; if (output->active) { @@ -283,7 +284,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) * 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 + * with 'mapped' at this point to avoid tripping over * to a surface that continuously updates its content */ if (surf->role == IVI_SURFACE_ROLE_DESKTOP) @@ -299,7 +300,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) return; /* we can only activate it again by using the protocol */ - if (surf->activated_by_default) + if (surf->mapped) return; /* check first if there aren't any outputs being set */ @@ -339,7 +340,6 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) 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 @@ -351,7 +351,6 @@ 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); - surf->activated_by_default = true; } } @@ -368,7 +367,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) * 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) + if (surf->mapped && output->active == surf) return; if (app_id) { @@ -376,7 +375,6 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) 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; } @@ -405,46 +403,80 @@ ivi_layout_fullscreen_committed(struct ivi_surface *surface) struct ivi_output *bg_output = ivi_layout_find_bg_output(ivi); struct weston_view *view = surface->view; - struct weston_geometry geom; + struct weston_geometry geom = + weston_desktop_surface_get_geometry(dsurface); + + bool is_fullscreen = weston_desktop_surface_get_fullscreen(dsurface); + bool is_dim_same = + geom.width == bg_output->output->width && + geom.height == bg_output->output->height; if (policy && policy->api.surface_activate_by_default && !policy->api.surface_activate_by_default(surface, surface->ivi) && - !surface->activated_by_default) + !surface->mapped) return; - if (surface->view->is_mapped) + assert(surface->role == IVI_SURFACE_ROLE_FULLSCREEN); + + if (weston_view_is_mapped(view)) return; - geom = weston_desktop_surface_get_geometry(dsurface); - assert(surface->role == IVI_SURFACE_ROLE_FULLSCREEN); + /* if we still get here but we haven't resized so far, send configure + * events to do so */ + if (surface->state != RESIZING && (!is_fullscreen || !is_dim_same)) { + struct ivi_output *bg_output = + ivi_layout_find_bg_output(surface->ivi); + + weston_log("Placing fullscreen app_id %s, type %s in hidden layer\n", + app_id, ivi_layout_get_surface_role_name(surface)); + weston_desktop_surface_set_fullscreen(dsurface, true); + weston_desktop_surface_set_size(dsurface, + bg_output->output->width, + bg_output->output->height); - if (!weston_desktop_surface_get_fullscreen(dsurface) || - geom.width != bg_output->output->width || - geom.height != bg_output->output->height) { + surface->state = RESIZING; + weston_view_set_output(view, output->output); + weston_layer_entry_insert(&ivi->hidden.view_list, &view->layer_link); + return; + } + + /* eventually, we would set the surface fullscreen, but the client + * hasn't resized correctly by this point, so terminate connection */ + if (surface->state == RESIZING && is_fullscreen && !is_dim_same) { struct weston_desktop_client *desktop_client = weston_desktop_surface_get_client(dsurface); struct wl_client *client = weston_desktop_client_get_client(desktop_client); wl_client_post_implementation_error(client, - "Can not display surface due to invalid geometry"); + "can not display surface due to invalid geometry." + " Client should perform a geometry resize!"); return; } - 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); + /* this implies we resized correctly */ + if (!weston_view_is_mapped(view)) { + weston_layer_entry_remove(&view->layer_link); - weston_view_geometry_dirty(view); - weston_surface_damage(view->surface); + 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); - wsurface->is_mapped = true; - surface->view->is_mapped = true; + wsurface->is_mapped = true; + surface->view->is_mapped = true; + surface->state = FULLSCREEN; - shell_advertise_app_state(ivi, app_id, - NULL, AGL_SHELL_DESKTOP_APP_STATE_ACTIVATED); + weston_view_geometry_dirty(view); + weston_surface_damage(view->surface); - weston_log("Activation completed for app_id %s, role %s, output %s\n", - app_id, ivi_layout_get_surface_role_name(surface), output->name); + 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 @@ -493,7 +525,7 @@ ivi_layout_split_committed(struct ivi_surface *surface) if (policy && policy->api.surface_activate_by_default && !policy->api.surface_activate_by_default(surface, surface->ivi) && - !surface->activated_by_default) + !surface->mapped) return; if (surface->view->is_mapped) @@ -591,7 +623,7 @@ ivi_layout_popup_committed(struct ivi_surface *surface) if (policy && policy->api.surface_activate_by_default && !policy->api.surface_activate_by_default(surface, surface->ivi) && - !surface->activated_by_default) + !surface->mapped) return; if (surface->view->is_mapped) @@ -646,8 +678,8 @@ ivi_layout_popup_re_add(struct ivi_surface *surface) /* 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; + if (!surface->mapped) + surface->mapped = true; ivi_layout_popup_committed(surface); } @@ -665,8 +697,8 @@ ivi_layout_surface_is_split_or_fullscreen(struct ivi_surface *surf) /* 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; + if (!surf->mapped) + surf->mapped = true; wl_list_for_each(is, &ivi->surfaces, link) if (is == surf)