layout: Send dimensions when setting up property as fullscreen

[src/agl-compositor.git] / src / desktop.c

diff --git a/src/desktop.c b/src/desktop.c
index 7127c2d..849e272 100644 (file)
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -27,9 +27,12 @@
 #include "ivi-compositor.h"
 #include "policy.h"
 
+#include "shared/helpers.h"
 #include <libweston/libweston.h>
 #include <libweston-desktop/libweston-desktop.h>
 
+#include "agl-shell-desktop-server-protocol.h"
+
 #if 0
 static struct weston_output *
 get_default_output(struct weston_compositor *compositor)
@@ -64,6 +67,73 @@ 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_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)
 {
@@ -72,6 +142,7 @@ 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);
@@ -121,6 +192,14 @@ 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);
 
+       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);
+               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
@@ -154,12 +233,15 @@ 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 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;
         *
@@ -236,8 +318,11 @@ 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));
+
+       if (app_id && output)
+               shell_advertise_app_state(output->ivi, app_id,
+                                         NULL, AGL_SHELL_DESKTOP_APP_STATE_DESTROYED);
 
        wl_list_remove(&surface->link);
 
@@ -372,6 +457,16 @@ 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);
+
+       weston_desktop_destroy(ivi->desktop);
+       ivi_compositor_destroy_pending_surfaces(ivi);
+}
+
 int
 ivi_desktop_init(struct ivi_compositor *ivi)
 {
@@ -381,5 +476,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;
 }