X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=028ff4a58737243028784d296d7e7d8fd20445bb;hb=refs%2Fchanges%2F05%2F28505%2F1;hp=15858ff1edd53aa55245b6a6eae355fbb548bc11;hpb=bb730ca304a5f62889038cb1bc6509afb869ee95;p=src%2Fagl-compositor.git diff --git a/src/layout.c b/src/layout.c index 15858ff..028ff4a 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); @@ -194,6 +217,7 @@ ivi_layout_activate_complete(struct ivi_output *output, struct weston_view *view = surf->view; struct weston_seat *wseat = get_ivi_shell_weston_first_seat(ivi); struct ivi_shell_seat *ivi_seat = get_ivi_shell_seat(wseat); + const char *app_id = weston_desktop_surface_get_app_id(surf->dsurface); if (weston_view_is_mapped(view)) { weston_layer_entry_remove(&view->layer_link); @@ -224,9 +248,11 @@ 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; @@ -251,12 +277,14 @@ ivi_layout_activate_complete(struct ivi_output *output, } } - 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; @@ -281,8 +309,29 @@ ivi_layout_activate_complete(struct ivi_output *output, } weston_log("Activation completed for app_id %s, role %s, output %s\n", - weston_desktop_surface_get_app_id(surf->dsurface), + app_id, ivi_layout_get_surface_role_name(surf), output->name); + + shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_ACTIVATED); +} + +static bool +ivi_layout_find_output_with_app_id(const char *app_id, struct ivi_output *output) +{ + char *cur; + size_t app_id_len; + + cur = output->app_ids; + app_id_len = strlen(app_id); + + while ((cur = strstr(cur, app_id))) { + if ((cur[app_id_len] == ',' || cur[app_id_len] == '\0') && + (cur == output->app_ids || cur[-1] == ',')) + return true; + cur++; + } + + return false; } struct ivi_output * @@ -294,13 +343,12 @@ ivi_layout_find_with_app_id(const char *app_id, struct ivi_compositor *ivi) return NULL; wl_list_for_each(out, &ivi->outputs, link) { - if (!out->app_id) + if (!out->app_ids) continue; - if (!strcmp(app_id, out->app_id)) + if (ivi_layout_find_output_with_app_id(app_id, out)) return out; } - return NULL; } @@ -343,8 +391,8 @@ ivi_layout_add_to_hidden_layer(struct ivi_surface *surf, 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); + app_id, ivi_layout_get_surface_role_name(surf), + ivi_output->area.width, ivi_output->area.height); surf->hidden_layer_output = ivi_output; weston_view_set_output(ev, ivi_output->output); @@ -894,6 +942,9 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf) struct ivi_output *remote_output = ivi_layout_find_with_app_id(app_id, ivi); + weston_log("Changed activation for app_id %s, type %s, on output %s\n", app_id, + ivi_layout_get_surface_role_name(surf), output->output->name); + /* if already active on a remote output do not * attempt to activate it again */ if (remote_output && remote_output->active == surf) @@ -912,6 +963,13 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf) return; } + /* 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); } @@ -1031,4 +1089,6 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id) weston_view_geometry_dirty(view); weston_surface_damage(view->surface); } + + shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_DEACTIVATED); }