X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=b9e45da94eb2566ae6ee58a91cfe31aacbf58d41;hb=refs%2Fchanges%2F55%2F24655%2F2;hp=fbeefecc4e70454c23480ed656232e08eb4ba2b2;hpb=aa4ba5d283d641da25722af7a966c31d61a9686b;p=src%2Fagl-compositor.git diff --git a/src/desktop.c b/src/desktop.c index fbeefec..b9e45da 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 * @@ -69,18 +71,29 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata) return; } + surface->view = weston_desktop_surface_create_view(dsurface); + if (!surface->view) { + free(surface); + wl_client_post_no_memory(client); + return; + } + surface->ivi = ivi; surface->dsurface = dsurface; surface->role = IVI_SURFACE_ROLE_NONE; - surface->old_geom.width = -1; - surface->old_geom.height = -1; + 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); if (ivi->shell_client.ready) { - ivi_set_desktop_surface(surface); - - ivi_reflow_outputs(ivi); + ivi_check_pending_desktop_surface(surface); } else { /* * We delay creating "normal" desktop surfaces until later, to @@ -98,112 +111,58 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata) weston_desktop_surface_get_user_data(dsurface); struct weston_surface *wsurface = weston_desktop_surface_get_surface(dsurface); - struct ivi_compositor *ivi = surface->ivi; - - /* TODO */ - if (surface->role != IVI_SURFACE_ROLE_DESKTOP) - return; - if (weston_surface_is_mapped(wsurface)) { - weston_desktop_surface_unlink_view(surface->desktop.view); - weston_view_destroy(surface->desktop.view); - wl_list_remove(&surface->link); + 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; } - free(surface); - ivi_reflow_outputs(ivi); -} + /* 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; -static void -surface_committed(struct ivi_surface *surface) -{ - struct ivi_compositor *ivi = surface->ivi; - struct weston_desktop_surface *dsurface = surface->dsurface; - struct weston_geometry geom, old_geom; - - old_geom = surface->old_geom; - geom = weston_desktop_surface_get_geometry(dsurface); - - surface->old_geom = geom; - - if (geom.width != old_geom.width || geom.height != old_geom.height) { - ivi_reflow_outputs(ivi); + weston_layer_entry_remove(&output->active->view->layer_link); + output->active = NULL; } - - //wl_list_insert(&ivi->surfaces, &surface->link); -} - -static void -background_committed(struct ivi_surface *surface) -{ - struct ivi_compositor *ivi = surface->ivi; - struct ivi_output *output = surface->bg.output; - struct weston_output *woutput = output->output; - struct weston_desktop_surface *dsurface = surface->dsurface; - struct weston_surface *wsurface = - weston_desktop_surface_get_surface(dsurface); - - if (wsurface->is_mapped) - return; - - surface->bg.view = weston_desktop_surface_create_view(dsurface); - - weston_view_set_output(surface->bg.view, woutput); - weston_view_set_position(surface->bg.view, - woutput->x, - woutput->y); - weston_layer_entry_insert(&ivi->background.view_list, - &surface->bg.view->layer_link); - - weston_view_update_transform(surface->bg.view); - weston_view_schedule_repaint(surface->bg.view); - - wsurface->is_mapped = true; -} - -static void -panel_committed(struct ivi_surface *surface) -{ - struct ivi_compositor *ivi = surface->ivi; - struct ivi_output *output = surface->bg.output; - struct weston_output *woutput = output->output; - struct weston_desktop_surface *dsurface = surface->dsurface; - struct weston_surface *wsurface = - weston_desktop_surface_get_surface(dsurface); - struct weston_geometry geom; - int32_t x = woutput->x; - int32_t y = woutput->y; - - if (wsurface->is_mapped) - return; - - surface->panel.view = weston_desktop_surface_create_view(dsurface); - - geom = weston_desktop_surface_get_geometry(dsurface); - switch (surface->panel.edge) { - case AGL_SHELL_EDGE_TOP: - /* Do nothing */ - break; - case AGL_SHELL_EDGE_BOTTOM: - y += woutput->height - geom.height; - break; - case AGL_SHELL_EDGE_LEFT: - /* Do nothing */ - break; - case AGL_SHELL_EDGE_RIGHT: - x += woutput->width - geom.width; - break; + if (weston_surface_is_mapped(wsurface)) { + weston_desktop_surface_unlink_view(surface->view); + weston_view_destroy(surface->view); } - weston_view_set_output(surface->panel.view, woutput); - weston_view_set_position(surface->panel.view, x, y); - weston_layer_entry_insert(&ivi->normal.view_list, - &surface->panel.view->layer_link); - - weston_view_update_transform(surface->panel.view); - weston_view_schedule_repaint(surface->panel.view); + /* 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; + } - wsurface->is_mapped = true; + wl_list_remove(&surface->link); + free(surface); } static void @@ -212,20 +171,35 @@ 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_NONE: - break; case IVI_SURFACE_ROLE_DESKTOP: - surface_committed(surface); - break; - case IVI_SURFACE_ROLE_BACKGROUND: - background_committed(surface); + case IVI_SURFACE_ROLE_REMOTE: + ivi_layout_desktop_committed(surface); break; case IVI_SURFACE_ROLE_PANEL: - panel_committed(surface); + ivi_layout_panel_committed(surface); + break; + 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: + default: /* fall through */ break; } }