X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=9c1dfaee70dfc63f2b37fd33b0dc820a75f9d1ca;hb=ae60166cd931609a4f6467a62261bcfb63221ce5;hp=da28fc60d1829a9a54415566bb24284f3aa214ef;hpb=1ee1bff64338dede1f72981a6f3787718ce47335;p=src%2Fagl-compositor.git diff --git a/src/desktop.c b/src/desktop.c index da28fc6..9c1dfae 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -23,12 +23,16 @@ * SOFTWARE. */ +#include #include "ivi-compositor.h" #include "policy.h" +#include "shared/helpers.h" #include #include +#include "agl-shell-desktop-server-protocol.h" + #if 0 static struct weston_output * get_default_output(struct weston_compositor *compositor) @@ -41,6 +45,16 @@ get_default_output(struct weston_compositor *compositor) } #endif +static void +desktop_advertise_app(struct wl_listener *listener, void *data) +{ + struct ivi_surface *surface; + + surface = wl_container_of(listener, surface, listener_advertise_app); + + agl_shell_desktop_advertise_application_id(surface->ivi, surface); +} + static void desktop_ping_timeout(struct weston_desktop_client *dclient, void *userdata) { @@ -53,6 +67,43 @@ desktop_pong(struct weston_desktop_client *dclient, void *userdata) /* not supported */ } +struct weston_output * +get_default_output(struct weston_compositor *compositor) +{ + if (wl_list_empty(&compositor->output_list)) + return NULL; + + return container_of(compositor->output_list.next, + struct weston_output, link); +} + +struct weston_output * +get_focused_output(struct weston_compositor *compositor) +{ + struct weston_seat *seat; + struct weston_output *output = NULL; + + wl_list_for_each(seat, &compositor->seat_list, link) { + struct weston_touch *touch = weston_seat_get_touch(seat); + struct weston_pointer *pointer = weston_seat_get_pointer(seat); + struct weston_keyboard *keyboard = + weston_seat_get_keyboard(seat); + + if (touch && touch->focus) + output = touch->focus->output; + else if (pointer && pointer->focus) + output = pointer->focus->output; + else if (keyboard && keyboard->focus) + output = keyboard->focus->output; + + if (output) + break; + } + + return output; +} + + static void desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata) { @@ -60,6 +111,9 @@ 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; + struct weston_output *output = NULL; + const char *app_id = NULL; dclient = weston_desktop_surface_get_client(dsurface); client = weston_desktop_client_get_client(dclient); @@ -80,26 +134,71 @@ 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; + surface->advertised_on_launch = false; + surface->checked_pending = false; + wl_list_init(&surface->link); + + wl_signal_init(&surface->signal_advertise_app); + + surface->listener_advertise_app.notify = desktop_advertise_app; + wl_signal_add(&surface->signal_advertise_app, + &surface->listener_advertise_app); + + weston_desktop_surface_set_user_data(dsurface, surface); 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); - } else { - /* - * We delay creating "normal" desktop surfaces until later, to - * give the shell-client an oppurtunity to set the surface as a - * background/panel. - */ - wl_list_insert(&ivi->pending_surfaces, &surface->link); + 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); + + /* reset any caps to make sure we apply the new caps */ + ivi_seat_reset_caps_sent(ivi); + + output = get_focused_output(ivi->compositor); + if (!output) + output = get_default_output(ivi->compositor); + + if (output && ivi->shell_client.ready) { + struct ivi_output *ivi_output = to_ivi_output(output); + + weston_log("Setting surface to initial size of surface to %dx%d\n", + ivi_output->area.width, ivi_output->area.height); + weston_desktop_surface_set_maximized(dsurface, true); + weston_desktop_surface_set_size(dsurface, + ivi_output->area.width, ivi_output->area.height); } + /* + * We delay creating "normal" desktop surfaces until later, to + * give the shell-client an oppurtunity to set the surface as a + * background/panel. + * Also delay the creation in order to have a valid app_id + * which will be used to set the proper role. + */ + 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 @@ -109,12 +208,36 @@ 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_output *output = surface->desktop.last_output; - - /* TODO */ - if (surface->role != IVI_SURFACE_ROLE_DESKTOP) - return; + const char *app_id = NULL; + + struct ivi_output *output = ivi_layout_get_output_from_surface(surface); + + wl_list_remove(&surface->listener_advertise_app.link); + surface->listener_advertise_app.notify = NULL; + + app_id = weston_desktop_surface_get_app_id(dsurface); + + /* 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; + } /* reset the active surface as well */ if (output && output->active && output->active == surface) { @@ -124,12 +247,60 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata) weston_layer_entry_remove(&output->active->view->layer_link); output->active = NULL; } + + if (surface->role == IVI_SURFACE_ROLE_REMOTE && + output->type == OUTPUT_REMOTE) + ivi_destroy_waltham_destroy(surface); + + /* 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) || + desktop_surface_check_last_remote_surfaces(output->ivi, + IVI_SURFACE_ROLE_DESKTOP)) && output->type == OUTPUT_REMOTE) + 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); } + /* 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; + } + +skip_output_asignment: + weston_log("Removed surface %p, app_id %s, role %s\n", surface, + app_id, ivi_layout_get_surface_role_name(surface)); + + if (app_id && output) + shell_advertise_app_state(output->ivi, app_id, + NULL, AGL_SHELL_DESKTOP_APP_STATE_DESTROYED); + wl_list_remove(&surface->link); + free(surface); } @@ -137,6 +308,7 @@ static void desktop_committed(struct weston_desktop_surface *dsurface, int32_t sx, int32_t sy, void *userdata) { + struct ivi_compositor *ivi = userdata; struct ivi_surface *surface = weston_desktop_surface_get_user_data(dsurface); struct ivi_policy *policy = surface->ivi->policy; @@ -145,17 +317,40 @@ desktop_committed(struct weston_desktop_surface *dsurface, !policy->api.surface_commited(surface, surface->ivi)) return; + if (ivi->shell_client.ready && !surface->checked_pending) { + const char * app_id = weston_desktop_surface_get_app_id(dsurface); + weston_log("Checking pending surface %p, app_id %s\n", surface, + app_id); + wl_list_remove(&surface->link); + wl_list_init(&surface->link); + ivi_check_pending_desktop_surface(surface); + surface->checked_pending = true; + } + + if (!surface->advertised_on_launch && + !wl_list_empty(&surface->ivi->desktop_clients)) + wl_signal_emit(&surface->signal_advertise_app, surface); + 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; }