X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=0fca2fd3241a36b3cffe271b3c597f4f07a764c9;hb=39ea644837dd29cd47a579a9703b43458187f82b;hp=fbeefecc4e70454c23480ed656232e08eb4ba2b2;hpb=aa4ba5d283d641da25722af7a966c31d61a9686b;p=src%2Fagl-compositor.git diff --git a/src/desktop.c b/src/desktop.c index fbeefec..0fca2fd 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,8 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata) struct weston_desktop_client *dclient; struct wl_client *client; struct ivi_surface *surface; + struct ivi_output *active_output = NULL; + const char *app_id = NULL; dclient = weston_desktop_surface_get_client(dsurface); client = weston_desktop_client_get_client(dclient); @@ -69,141 +73,153 @@ 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; weston_desktop_surface_set_user_data(dsurface, surface); - if (ivi->shell_client.ready) { - ivi_set_desktop_surface(surface); + if (ivi->policy && ivi->policy->api.surface_create && + !ivi->policy->api.surface_create(surface, ivi)) { + wl_client_post_no_memory(client); + return; + } - ivi_reflow_outputs(ivi); + + app_id = weston_desktop_surface_get_app_id(dsurface); + + if ((active_output = ivi_layout_find_with_app_id(app_id, ivi))) + ivi_set_pending_desktop_surface_remote(active_output, app_id); + + if (ivi->shell_client.ready) { + 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 void -desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata) -{ - struct ivi_surface *surface = - 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); - } - free(surface); - - ivi_reflow_outputs(ivi); -} - -static void -surface_committed(struct ivi_surface *surface) +static bool +desktop_surface_check_last_remote_surfaces(struct ivi_compositor *ivi, enum ivi_surface_role role) { - 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; + int count = 0; + struct ivi_surface *surf; - if (geom.width != old_geom.width || geom.height != old_geom.height) { - ivi_reflow_outputs(ivi); - } + wl_list_for_each(surf, &ivi->surfaces, link) + if (surf->role == role) + count++; - //wl_list_insert(&ivi->surfaces, &surface->link); + return (count == 1); } static void -background_committed(struct ivi_surface *surface) +desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata) { - 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 ivi_surface *surface = + weston_desktop_surface_get_user_data(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); + struct ivi_output *output = ivi_layout_get_output_from_surface(surface); + + /* special corner-case, pending_surfaces which are never activated or + * being assigned an output might land here so just remove the surface; + * + * the DESKTOP role can happen here as well, because we can fall-back + * to that when we try to determine the role type. Application that + * do not set the app_id will be land here, when destroyed */ + if (output == NULL && (surface->role == IVI_SURFACE_ROLE_NONE || + surface->role == IVI_SURFACE_ROLE_DESKTOP)) + goto skip_output_asignment; + + 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; + } - weston_view_update_transform(surface->bg.view); - weston_view_schedule_repaint(surface->bg.view); + /* 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; - wsurface->is_mapped = true; -} + weston_layer_entry_remove(&output->active->view->layer_link); + output->active = NULL; + } -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; + /* 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 (wsurface->is_mapped) - return; + if (desktop_surface_check_last_remote_surfaces(output->ivi, + IVI_SURFACE_ROLE_DESKTOP)) + if (!output->background) + insert_black_surface(output); - surface->panel.view = weston_desktop_surface_create_view(dsurface); + if (weston_surface_is_mapped(wsurface)) { + weston_desktop_surface_unlink_view(surface->view); + weston_view_destroy(surface->view); + } - 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; + /* 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_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); +skip_output_asignment: + 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)); - weston_view_update_transform(surface->panel.view); - weston_view_schedule_repaint(surface->panel.view); + /* we weren't added to any list if we are still with 'none' as role */ + if (surface->role != IVI_SURFACE_ROLE_NONE) + wl_list_remove(&surface->link); - wsurface->is_mapped = true; + free(surface); } static void @@ -212,20 +228,33 @@ 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); + case IVI_SURFACE_ROLE_REMOTE: + ivi_layout_desktop_committed(surface); break; - case IVI_SURFACE_ROLE_BACKGROUND: - background_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: - panel_committed(surface); + default: /* fall through */ break; } }