X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=0f1da18bb1c0d8f07b94301668df93f110e2b398;hb=76fa1b83638310c23bf3ca952e4479499b8ecb43;hp=0e1a989ee181b51e6c409c2be601c78a17f53beb;hpb=a89fbd6702dd82c4b53c0002095b8e721d1a7072;p=src%2Fagl-compositor.git diff --git a/src/desktop.c b/src/desktop.c index 0e1a989..0f1da18 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -91,6 +91,34 @@ get_focused_output(struct weston_compositor *compositor) 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) @@ -100,7 +128,8 @@ desktop_surface_added_configure(struct ivi_surface *surface, ivi_check_pending_surface_desktop(surface, &role); if ((role != IVI_SURFACE_ROLE_DESKTOP && - role != IVI_SURFACE_ROLE_FULLSCREEN) || + role != IVI_SURFACE_ROLE_FULLSCREEN && + role != IVI_SURFACE_ROLE_REMOTE) || role == IVI_SURFACE_ROLE_NONE) return; @@ -136,6 +165,14 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata) 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); @@ -186,7 +223,10 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata) if (output && ivi->shell_client.ready) { struct ivi_output *ivi_output = to_ivi_output(output); - desktop_surface_added_configure(surface, ivi_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 @@ -202,13 +242,14 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata) } 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); @@ -222,8 +263,20 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata) 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; - struct ivi_output *output = ivi_layout_get_output_from_surface(surface); + /* 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); + + output = ivi_layout_get_output_from_surface(surface); wl_list_remove(&surface->listener_advertise_app.link); surface->listener_advertise_app.notify = NULL; @@ -236,8 +289,9 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata) * 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); @@ -261,6 +315,13 @@ 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); @@ -268,12 +329,10 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata) /* 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 (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)) { @@ -308,9 +367,12 @@ 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) + 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); @@ -338,6 +400,11 @@ desktop_committed(struct weston_desktop_surface *dsurface, 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 &&