X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=0f1da18bb1c0d8f07b94301668df93f110e2b398;hb=76fa1b83638310c23bf3ca952e4479499b8ecb43;hp=504ad47238ed208a7692e9ab999a22a23780de89;hpb=3d32d6d6daf5d703a29083b08d79449fd06ed0b3;p=src%2Fagl-compositor.git diff --git a/src/desktop.c b/src/desktop.c index 504ad47..0f1da18 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -27,20 +27,11 @@ #include "ivi-compositor.h" #include "policy.h" +#include "shared/helpers.h" #include #include -#if 0 -static struct weston_output * -get_default_output(struct weston_compositor *compositor) -{ - if (wl_list_empty(&compositor->output_list)) - return NULL; - - return wl_container_of(compositor->output_list.next, - struct weston_output, link); -} -#endif +#include "agl-shell-desktop-server-protocol.h" static void desktop_advertise_app(struct wl_listener *listener, void *data) @@ -64,6 +55,102 @@ 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; +} + +void +ivi_shell_activate_surface(struct ivi_surface *ivi_surf, + struct ivi_shell_seat *ivi_seat, + uint32_t flags) +{ + struct weston_desktop_surface *dsurface = ivi_surf->dsurface; + struct weston_surface *surface = + weston_desktop_surface_get_surface(dsurface); + + weston_view_activate_input(ivi_surf->view, ivi_seat->seat, flags); + + if (ivi_seat->focused_surface) { + struct ivi_surface *current_focus = + get_ivi_shell_surface(ivi_seat->focused_surface); + struct weston_desktop_surface *dsurface_focus; + assert(current_focus); + + dsurface_focus = current_focus->dsurface; + if (--current_focus->focus_count == 0) + weston_desktop_surface_set_activated(dsurface_focus, false); + } + + ivi_seat->focused_surface = surface; + if (ivi_surf->focus_count++ == 0) + weston_desktop_surface_set_activated(dsurface, true); +} + + +static void +desktop_surface_added_configure(struct ivi_surface *surface, + struct ivi_output *ivi_output) +{ + enum ivi_surface_role role = IVI_SURFACE_ROLE_NONE; + struct weston_desktop_surface *dsurface = surface->dsurface; + + ivi_check_pending_surface_desktop(surface, &role); + if ((role != IVI_SURFACE_ROLE_DESKTOP && + role != IVI_SURFACE_ROLE_FULLSCREEN && + role != IVI_SURFACE_ROLE_REMOTE) || + role == IVI_SURFACE_ROLE_NONE) + return; + + if (role == IVI_SURFACE_ROLE_FULLSCREEN) { + struct ivi_output *bg_output = + ivi_layout_find_bg_output(surface->ivi); + assert(bg_output); + weston_desktop_surface_set_fullscreen(dsurface, true); + weston_desktop_surface_set_size(dsurface, + bg_output->output->width, + bg_output->output->height); + return; + } + + weston_desktop_surface_set_maximized(dsurface, true); + weston_desktop_surface_set_size(dsurface, + ivi_output->area.width, + ivi_output->area.height); +} + + static void desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata) { @@ -72,11 +159,20 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata) 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); + if (ivi->shell_client.resource && + ivi->shell_client.status == BOUND_FAILED) { + wl_client_post_implementation_error(client, + "agl_shell has already been bound. " + "Check out bound_fail event"); + return; + } + surface = zalloc(sizeof *surface); if (!surface) { wl_client_post_no_memory(client); @@ -93,8 +189,10 @@ 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->mapped = false; surface->advertised_on_launch = false; + surface->checked_pending = false; + wl_list_init(&surface->link); wl_signal_init(&surface->signal_advertise_app); @@ -119,30 +217,39 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata) /* reset any caps to make sure we apply the new caps */ ivi_seat_reset_caps_sent(ivi); - 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); + 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); + if (active_output) + desktop_surface_added_configure(surface, active_output); + else + desktop_surface_added_configure(surface, ivi_output); } + /* + * 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) +desktop_surface_check_last_surfaces(struct ivi_output *ivi_output, enum ivi_surface_role role) { int count = 0; struct ivi_surface *surf; - wl_list_for_each(surf, &ivi->surfaces, link) - if (surf->role == role) + wl_list_for_each(surf, &ivi_output->ivi->surfaces, link) + if (surf->role == role && + surf->current_completed_output == ivi_output) count++; return (count == 1); @@ -155,20 +262,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); + const char *app_id = NULL; + struct weston_seat *wseat = NULL; + struct ivi_shell_seat *ivi_seat = NULL; + struct ivi_output *output = NULL; + + /* we might not have a valid ivi_surface if _added failed due to + * protocol errors */ + if (!surface) + return; + + wseat = get_ivi_shell_weston_first_seat(surface->ivi); + if (wseat) + ivi_seat = get_ivi_shell_seat(wseat); - struct ivi_output *output = ivi_layout_get_output_from_surface(surface); + 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)) + if ((output == NULL && (surface->role == IVI_SURFACE_ROLE_NONE || + surface->role == IVI_SURFACE_ROLE_DESKTOP)) || + output->output == NULL) goto skip_output_asignment; assert(output != NULL); @@ -192,15 +315,24 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata) output->active = NULL; } + /* clear out focused_surface to avoid a stale focused_surface. the + * client shell is responsible for keeping track and switch back to the + * last active surface so we don't get do anything at removal, just + * reset it */ + if (ivi_seat && ivi_seat->focused_surface == wsurface) + ivi_seat->focused_surface = 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)) + if (desktop_surface_check_last_surfaces(output, IVI_SURFACE_ROLE_REMOTE) || + desktop_surface_check_last_surfaces(output, IVI_SURFACE_ROLE_DESKTOP)) if (!output->background) - insert_black_surface(output); + insert_black_curtain(output); if (weston_surface_is_mapped(wsurface)) { @@ -233,12 +365,16 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata) 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)); + app_id, ivi_layout_get_surface_role_name(surface)); - /* 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); + if (app_id && output && output->output) { + shell_advertise_app_state(output->ivi, app_id, + NULL, AGL_SHELL_DESKTOP_APP_STATE_DESTROYED); + if (output->ivi->shell_client.ready) + shell_send_app_state(output->ivi, app_id, AGL_SHELL_APP_STATE_TERMINATED); + } + + wl_list_remove(&surface->link); free(surface); } @@ -247,6 +383,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; @@ -255,9 +392,36 @@ desktop_committed(struct weston_desktop_surface *dsurface, !policy->api.surface_commited(surface, surface->ivi)) return; - if (!surface->advertised_on_launch) + 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; + + /* we'll do it now at commit time, because we might not have an + * appid by the time we've created the weston_desktop_surface + * */ + shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_STARTED); + } + + if (!surface->advertised_on_launch && + !wl_list_empty(&surface->ivi->desktop_clients)) wl_signal_emit(&surface->signal_advertise_app, surface); + /* this repaint schedule is needed to allow resizing to work with the + * help of the hidden layer: + * + * 1. add the view in the hidden layer and send out correct dimensions + * 2. clients changes its dimensions + * 3. client commits with the new dimensions + * + * For desktop and fullscreen, desktop_surface_added() sends the + * dimensions from the beginning so applications no need to resize, but + * if that weren't the case we still need this in. + */ weston_compositor_schedule_repaint(surface->ivi->compositor); switch (surface->role) { @@ -359,6 +523,19 @@ static const struct weston_desktop_api desktop_api = { .set_xwayland_position = desktop_set_xwayland_position, }; +static void +ivi_shell_destroy(struct wl_listener *listener, void *data) +{ + struct ivi_compositor *ivi = container_of(listener, + struct ivi_compositor, destroy_listener); + + ivi_shell_finalize(ivi); + ivi_compositor_destroy_pending_surfaces(ivi); + + weston_desktop_destroy(ivi->desktop); + wl_list_remove(&listener->link); +} + int ivi_desktop_init(struct ivi_compositor *ivi) { @@ -368,5 +545,10 @@ ivi_desktop_init(struct ivi_compositor *ivi) return -1; } + if (!weston_compositor_add_destroy_listener_once(ivi->compositor, + &ivi->destroy_listener, ivi_shell_destroy)) { + return -1; + } + return 0; }