X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=0e1a989ee181b51e6c409c2be601c78a17f53beb;hb=1304d412eb2bcefd4733539213ecb9b6ca39a605;hp=9c1dfaee70dfc63f2b37fd33b0dc820a75f9d1ca;hpb=80febb3fbcebe88a274ffa5109784d5f0ad69ca5;p=src%2Fagl-compositor.git diff --git a/src/desktop.c b/src/desktop.c index 9c1dfae..0e1a989 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -33,18 +33,6 @@ #include "agl-shell-desktop-server-protocol.h" -#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 - static void desktop_advertise_app(struct wl_listener *listener, void *data) { @@ -103,6 +91,36 @@ get_focused_output(struct weston_compositor *compositor) return output; } +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_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) @@ -134,7 +152,7 @@ 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); @@ -168,12 +186,7 @@ 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); - - 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); + desktop_surface_added_configure(surface, ivi_output); } /* * We delay creating "normal" desktop surfaces until later, to @@ -331,6 +344,17 @@ desktop_committed(struct weston_desktop_surface *dsurface, !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) { @@ -432,6 +456,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) { @@ -441,5 +478,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; }