layout: Address all other callsites w/ dirty+surface damage

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

diff --git a/src/desktop.c b/src/desktop.c
index f32097e..74ce916 100644 (file)
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -27,6 +27,7 @@
 #include "ivi-compositor.h"
 #include "policy.h"
 
+#include "shared/helpers.h"
 #include <libweston/libweston.h>
 #include <libweston-desktop/libweston-desktop.h>
 
@@ -66,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)
 {
@@ -74,6 +112,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);
@@ -123,6 +162,23 @@ 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);
+
+               /* verify if by any chance this surfaces hasn't been assigned a
+                * different role before sending the maximized state */
+               if (!ivi_check_pending_surface(surface)) {
+                       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
@@ -243,8 +299,9 @@ skip_output_asignment:
        weston_log("Removed surface %p, app_id %s, role %s\n", surface,
                        app_id, ivi_layout_get_surface_role_name(surface));
 
-       shell_advertise_app_state(output->ivi, app_id,
-                                 NULL, AGL_SHELL_DESKTOP_APP_STATE_DESTROYED);
+       if (app_id && output)
+               shell_advertise_app_state(output->ivi, app_id,
+                                         NULL, AGL_SHELL_DESKTOP_APP_STATE_DESTROYED);
 
        wl_list_remove(&surface->link);
 
@@ -379,6 +436,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)
 {
@@ -388,5 +455,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;
 }