layout, shell: Use implicit layer move to add views to layers

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

diff --git a/src/desktop.c b/src/desktop.c
index 340f14f..1d60bf1 100644 (file)
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -29,7 +29,10 @@
 
 #include "shared/helpers.h"
 #include <libweston/libweston.h>
-#include <libweston-desktop/libweston-desktop.h>
+#include <libweston/desktop.h>
+#ifdef BUILD_XWAYLAND
+#include <libweston/xwayland-api.h>
+#endif
 
 #include "agl-shell-desktop-server-protocol.h"
 
@@ -309,12 +312,13 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
                output->area = output->area_saved;
        }
 
+
        /* reset the active surface as well */
        if (output && output->active && output->active == surface) {
                output->active->view->is_mapped = false;
                output->active->view->surface->is_mapped = false;
 
-               weston_layer_entry_remove(&output->active->view->layer_link);
+               weston_view_move_to_layer(output->active->view, NULL);
                output->active = NULL;
        }
 
@@ -325,10 +329,6 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
        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
         */
@@ -343,6 +343,14 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
                weston_view_destroy(surface->view);
        }
 
+       if (surface->role == IVI_SURFACE_ROLE_TILE) {
+               ivi_layout_reset_split_surfaces(surface->ivi);
+               // activate previous when resizing back to give input set
+               // output active for allowing to resizing again if needed
+               if (output->previous_active)
+                       ivi_layout_activate_by_surf(output, output->previous_active);
+       }
+
        /* invalidate agl-shell surfaces so we can re-use them when
         * binding again */
        if (surface->role == IVI_SURFACE_ROLE_PANEL) {
@@ -384,7 +392,7 @@ skip_output_asignment:
 
 static void
 desktop_committed(struct weston_desktop_surface *dsurface, 
-                 int32_t sx, int32_t sy, void *userdata)
+                 struct weston_coord_surface buf_offset, void *userdata)
 {
        struct ivi_compositor *ivi = userdata;
        struct ivi_surface *surface =
@@ -462,7 +470,7 @@ desktop_committed(struct weston_desktop_surface *dsurface,
 
 static void
 desktop_show_window_menu(struct weston_desktop_surface *dsurface,
-                        struct weston_seat *seat, int32_t x, int32_t y,
+                        struct weston_seat *seat, struct weston_coord_surface offset,
                         void *userdata)
 {
        /* not supported */
@@ -514,9 +522,14 @@ desktop_minimized_requested(struct weston_desktop_surface *dsurface,
 
 static void
 desktop_set_xwayland_position(struct weston_desktop_surface *dsurface,
-                             int32_t x, int32_t y, void *userdata)
+                             struct weston_coord_global pos, void *userdata)
 {
-       /* not supported */
+       struct ivi_surface *ivisurf =
+               weston_desktop_surface_get_user_data(dsurface);
+
+       ivisurf->xwayland.x = pos.c.x;
+       ivisurf->xwayland.y = pos.c.y;
+       ivisurf->xwayland.is_set = true;
 }
 
 static const struct weston_desktop_api desktop_api = {
@@ -547,9 +560,61 @@ ivi_shell_destroy(struct wl_listener *listener, void *data)
        ivi_layout_destroy_saved_outputs(ivi);
 
        weston_desktop_destroy(ivi->desktop);
+       wl_list_remove(&ivi->transform_listener.link);
        wl_list_remove(&listener->link);
 }
 
+static void
+transform_handler(struct wl_listener *listener, void *data)
+{
+#ifdef BUILD_XWAYLAND
+       struct weston_surface *surface = data;
+       struct ivi_surface *ivisurf = get_ivi_shell_surface(surface);
+       const struct weston_xwayland_surface_api *api;
+       int x, y;
+
+       if (!ivisurf)
+               return;
+
+       api = ivisurf->ivi->xwayland_surface_api;
+       if (!api) {
+               api = weston_xwayland_surface_get_api(ivisurf->ivi->compositor);
+               ivisurf->ivi->xwayland_surface_api = api;
+       }
+
+       if (!api || !api->is_xwayland_surface(surface))
+               return;
+
+       if (!weston_view_is_mapped(ivisurf->view))
+               return;
+
+       x = ivisurf->view->geometry.x;
+       y = ivisurf->view->geometry.y;
+
+       api->send_position(surface, x, y);
+#endif
+}
+
+bool
+is_shell_surface_xwayland(struct ivi_surface *surf)
+{
+#ifdef BUILD_XWAYLAND
+       const struct weston_xwayland_surface_api *api;
+       struct ivi_compositor *ivi = surf->ivi;
+       struct weston_surface *surface;
+
+       api = ivi->xwayland_surface_api;
+
+       if (!api)
+               return false;
+
+       surface = weston_desktop_surface_get_surface(surf->dsurface);
+       return api->is_xwayland_surface(surface);
+#else
+       return false;
+#endif
+}
+
 int
 ivi_desktop_init(struct ivi_compositor *ivi)
 {
@@ -564,5 +629,10 @@ ivi_desktop_init(struct ivi_compositor *ivi)
                return -1;
        }
 
+       ivi->transform_listener.notify = transform_handler;
+       wl_signal_add(&ivi->compositor->transform_signal,
+                     &ivi->transform_listener);
+
+
        return 0;
 }