X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=3dc1cebb1b9edf29fd5b526388eccbfe1c60c928;hb=b3c4f205c94e55d574483160f5d38b0bfc7c1d16;hp=a637ddd303212848c9c2499f957a00d8b9732c75;hpb=08ea4a2fec76b4bdd90b6072ff1002d0829afbed;p=src%2Fagl-compositor.git diff --git a/src/desktop.c b/src/desktop.c index a637ddd..3dc1ceb 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -23,10 +23,12 @@ * SOFTWARE. */ +#include #include "ivi-compositor.h" +#include "policy.h" -#include -#include +#include +#include #if 0 static struct weston_output * @@ -59,6 +61,7 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata) struct weston_desktop_client *dclient; struct wl_client *client; struct ivi_surface *surface; + const char *app_id = NULL; dclient = weston_desktop_surface_get_client(dsurface); client = weston_desktop_client_get_client(dclient); @@ -79,21 +82,48 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata) surface->ivi = ivi; surface->dsurface = dsurface; surface->role = IVI_SURFACE_ROLE_NONE; + surface->activated_by_default = false; + + if (ivi->policy && ivi->policy->api.surface_create && + !ivi->policy->api.surface_create(surface, ivi)) { + free(surface); + wl_client_post_no_memory(client); + return; + } weston_desktop_surface_set_user_data(dsurface, surface); + app_id = weston_desktop_surface_get_app_id(dsurface); + if (ivi->shell_client.ready) { - ivi_set_desktop_surface(surface); + ivi_check_pending_desktop_surface(surface); + weston_log("Added surface %p, app_id %s, role %s\n", surface, + app_id, ivi_layout_get_surface_role_name(surface)); } else { /* * We delay creating "normal" desktop surfaces until later, to * give the shell-client an oppurtunity to set the surface as a * background/panel. */ + weston_log("Added surface %p, app_id %s to pending list\n", + surface, app_id); wl_list_insert(&ivi->pending_surfaces, &surface->link); } } +static bool +desktop_surface_check_last_remote_surfaces(struct ivi_compositor *ivi, enum ivi_surface_role role) +{ + int count = 0; + struct ivi_surface *surf; + + wl_list_for_each(surf, &ivi->surfaces, link) + if (surf->role == role) + count++; + + return (count == 1); +} + static void desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata) { @@ -102,15 +132,73 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata) struct weston_surface *wsurface = weston_desktop_surface_get_surface(dsurface); - /* TODO */ - if (surface->role != IVI_SURFACE_ROLE_DESKTOP) - return; + struct ivi_output *output = ivi_layout_get_output_from_surface(surface); + assert(output != NULL); + + /* resize the active surface to the original size */ + if (surface->role == IVI_SURFACE_ROLE_SPLIT_H || + surface->role == IVI_SURFACE_ROLE_SPLIT_V) { + if (output && output->active) { + ivi_layout_desktop_resize(output->active, output->area_saved); + } + /* restore the area back so we can re-use it again if needed */ + output->area = output->area_saved; + } + + /* reset the active surface as well */ + if (output && output->active && output->active == surface) { + output->active->view->is_mapped = false; + output->active->view->surface->is_mapped = false; + + weston_layer_entry_remove(&output->active->view->layer_link); + output->active = NULL; + } + + /* check if there's a last 'remote' surface and insert a black + * surface view if there's no background set for that output + */ + if (desktop_surface_check_last_remote_surfaces(output->ivi, + IVI_SURFACE_ROLE_REMOTE)) + if (!output->background) + insert_black_surface(output); + + if (desktop_surface_check_last_remote_surfaces(output->ivi, + IVI_SURFACE_ROLE_DESKTOP)) + if (!output->background) + insert_black_surface(output); if (weston_surface_is_mapped(wsurface)) { weston_desktop_surface_unlink_view(surface->view); weston_view_destroy(surface->view); - wl_list_remove(&surface->link); } + + /* invalidate agl-shell surfaces so we can re-use them when + * binding again */ + if (surface->role == IVI_SURFACE_ROLE_PANEL) { + switch (surface->panel.edge) { + case AGL_SHELL_EDGE_TOP: + output->top = NULL; + break; + case AGL_SHELL_EDGE_BOTTOM: + output->bottom = NULL; + break; + case AGL_SHELL_EDGE_LEFT: + output->left = NULL; + break; + case AGL_SHELL_EDGE_RIGHT: + output->right = NULL; + break; + default: + assert(!"Invalid edge detected\n"); + } + } else if (surface->role == IVI_SURFACE_ROLE_BACKGROUND) { + output->background = NULL; + } + + weston_log("Removed surface %p, app_id %s, role %s\n", surface, + weston_desktop_surface_get_app_id(dsurface), + ivi_layout_get_surface_role_name(surface)); + wl_list_remove(&surface->link); free(surface); } @@ -120,17 +208,32 @@ desktop_committed(struct weston_desktop_surface *dsurface, { struct ivi_surface *surface = weston_desktop_surface_get_user_data(dsurface); + struct ivi_policy *policy = surface->ivi->policy; + + if (policy && policy->api.surface_commited && + !policy->api.surface_commited(surface, surface->ivi)) + return; + weston_compositor_schedule_repaint(surface->ivi->compositor); switch (surface->role) { case IVI_SURFACE_ROLE_DESKTOP: + case IVI_SURFACE_ROLE_REMOTE: ivi_layout_desktop_committed(surface); break; - case IVI_SURFACE_ROLE_PANEL: - ivi_layout_panel_committed(surface); + case IVI_SURFACE_ROLE_POPUP: + ivi_layout_popup_committed(surface); + break; + case IVI_SURFACE_ROLE_FULLSCREEN: + ivi_layout_fullscreen_committed(surface); + break; + case IVI_SURFACE_ROLE_SPLIT_H: + case IVI_SURFACE_ROLE_SPLIT_V: + ivi_layout_split_committed(surface); break; case IVI_SURFACE_ROLE_NONE: case IVI_SURFACE_ROLE_BACKGROUND: + case IVI_SURFACE_ROLE_PANEL: default: /* fall through */ break; }