X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=7a1e0e01f3e5275de1cc5619b28a44352e6a3cc2;hb=refs%2Fheads%2Fneedlefish;hp=dd4abb5d95b0e061e25213a169cd6baebd266424;hpb=9cccfe829aab45fd2ab8475127d62ff22c5fedee;p=src%2Fagl-compositor.git diff --git a/src/layout.c b/src/layout.c index dd4abb5..7a1e0e0 100644 --- a/src/layout.c +++ b/src/layout.c @@ -151,17 +151,40 @@ ivi_panel_init(struct ivi_compositor *ivi, struct ivi_output *output, void ivi_layout_init(struct ivi_compositor *ivi, struct ivi_output *output) { - ivi_background_init(ivi, output); + bool use_default_area = true; - output->area.x = 0; - output->area.y = 0; - output->area.width = output->output->width; - output->area.height = output->output->height; + ivi_background_init(ivi, output); - ivi_panel_init(ivi, output, output->top); - ivi_panel_init(ivi, output, output->bottom); - ivi_panel_init(ivi, output, output->left); - ivi_panel_init(ivi, output, output->right); + if (output->area_activation.width || + output->area_activation.height || + output->area_activation.x || + output->area_activation.y) { + /* Sanity check target area is within output bounds */ + if ((output->area_activation.x + output->area_activation.width) < output->output->width || + (output->area_activation.y + output->area_activation.height) < output->output->height) { + weston_log("Using specified area for output %s, ignoring panels\n", + output->name); + output->area.x = output->area_activation.x; + output->area.y = output->area_activation.y; + output->area.width = output->area_activation.width; + output->area.height = output->area_activation.height; + use_default_area = false; + } else { + weston_log("Invalid activation-area position for output %s, ignoring\n", + output->name); + } + } + if (use_default_area) { + output->area.x = 0; + output->area.y = 0; + output->area.width = output->output->width; + output->area.height = output->output->height; + + ivi_panel_init(ivi, output, output->top); + ivi_panel_init(ivi, output, output->bottom); + ivi_panel_init(ivi, output, output->left); + ivi_panel_init(ivi, output, output->right); + } weston_compositor_schedule_repaint(ivi->compositor); @@ -202,19 +225,24 @@ ivi_layout_activate_complete(struct ivi_output *output, } weston_view_set_output(view, woutput); - weston_view_set_position(view, - woutput->x + output->area.x, - woutput->y + output->area.y); + + if (surf->role != IVI_SURFACE_ROLE_BACKGROUND) + weston_view_set_position(view, + woutput->x + output->area.x, + woutput->y + output->area.y); view->is_mapped = true; surf->mapped = true; view->surface->is_mapped = true; if (output->active) { - output->active->view->is_mapped = false; - output->active->view->surface->is_mapped = false; + /* keep the background surface mapped at all times */ + if (output->active->role != IVI_SURFACE_ROLE_BACKGROUND) { + output->active->view->is_mapped = false; + output->active->view->surface->is_mapped = false; - weston_layer_entry_remove(&output->active->view->layer_link); + weston_layer_entry_remove(&output->active->view->layer_link); + } } output->previous_active = output->active; output->active = surf; @@ -275,6 +303,40 @@ ivi_layout_find_bg_output(struct ivi_compositor *ivi) return NULL; } + +static void +ivi_layout_add_to_hidden_layer(struct ivi_surface *surf, + struct ivi_output *ivi_output) +{ + struct weston_desktop_surface *dsurf = surf->dsurface; + struct weston_view *ev = surf->view; + struct ivi_compositor *ivi = surf->ivi; + const char *app_id = weston_desktop_surface_get_app_id(dsurf); + + weston_desktop_surface_set_maximized(dsurf, true); + weston_desktop_surface_set_size(dsurf, + ivi_output->area.width, + ivi_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), + ivi_output->area.width, ivi_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 + * configure event. + */ + if (!weston_view_is_mapped(ev)) { + ev->is_mapped = true; + ev->surface->is_mapped = true; + + weston_view_set_output(ev, ivi_output->output); + weston_layer_entry_insert(&ivi->hidden.view_list, &ev->layer_link); + weston_log("Placed app_id %s, type %s in hidden layer\n", + app_id, ivi_layout_get_surface_role_name(surf)); + } +} + void ivi_layout_desktop_committed(struct ivi_surface *surf) { @@ -336,6 +398,12 @@ ivi_layout_desktop_committed(struct ivi_surface *surf) if (!surf->ivi->activate_by_default) { weston_log("Refusing to activate surface role %d, app_id %s\n", surf->role, app_id); + + if (!weston_desktop_surface_get_maximized(dsurf) || + geom.width != r_output->area.width || + geom.height != r_output->area.height) + ivi_layout_add_to_hidden_layer(surf, r_output); + return; } @@ -648,7 +716,7 @@ ivi_layout_popup_committed(struct ivi_surface *surface) !surface->mapped) return; - if (surface->view->is_mapped) + if (surface->view->is_mapped || surface->state == HIDDEN) return; assert(surface->role == IVI_SURFACE_ROLE_POPUP); @@ -658,6 +726,7 @@ ivi_layout_popup_committed(struct ivi_surface *surface) 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); + weston_view_update_transform(view); /* 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 @@ -706,6 +775,7 @@ ivi_layout_popup_re_add(struct ivi_surface *surface) if (!surface->mapped) surface->mapped = true; + surface->state = NORMAL; ivi_layout_popup_committed(surface); } @@ -737,12 +807,10 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf) { struct ivi_compositor *ivi = output->ivi; struct weston_desktop_surface *dsurf; - struct weston_view *view; struct weston_geometry geom; struct ivi_policy *policy = output->ivi->policy; dsurf = surf->dsurface; - view = surf->view; const char *app_id = weston_desktop_surface_get_app_id(dsurf); @@ -791,28 +859,14 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf) return; } - weston_desktop_surface_set_maximized(dsurf, true); - weston_desktop_surface_set_size(dsurf, - 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 - * configure event. - */ - if (!weston_view_is_mapped(view)) { - view->is_mapped = true; - view->surface->is_mapped = true; - - weston_view_set_output(view, output->output); - weston_layer_entry_insert(&ivi->hidden.view_list, &view->layer_link); - weston_log("Placed app_id %s, type %s in hidden layer\n", - app_id, ivi_layout_get_surface_role_name(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) { + ivi_layout_activate_complete(output, surf); + return; } + + ivi_layout_add_to_hidden_layer(surf, output); } void @@ -924,6 +978,9 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id) } else if (surf->role == IVI_SURFACE_ROLE_POPUP) { struct weston_view *view = surf->view; + weston_view_unmap(view); + surf->state = HIDDEN; + weston_layer_entry_remove(&view->layer_link); weston_view_geometry_dirty(view); weston_surface_damage(view->surface);