X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=7875eb913a85a99860b0fac2bf89d88c52b46bba;hb=refs%2Fchanges%2F13%2F29613%2F6;hp=ed648c24e16347b6abbcf929249ac62688b3cc49;hpb=0ed8064b0de235fa21fb961f0a8789e11ad7f1a4;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index ed648c2..7875eb9 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -30,6 +30,9 @@
 #include "shared/helpers.h"
 #include <libweston/libweston.h>
 #include <libweston-desktop/libweston-desktop.h>
+#ifdef BUILD_XWAYLAND
+#include <libweston/xwayland-api.h>
+#endif
 
 #include "agl-shell-desktop-server-protocol.h"
 
@@ -309,6 +312,7 @@ 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;
@@ -339,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) {
@@ -512,7 +524,12 @@ static void
 desktop_set_xwayland_position(struct weston_desktop_surface *dsurface,
 			      int32_t x, int32_t y, void *userdata)
 {
-	/* not supported */
+	struct ivi_surface *ivisurf =
+		weston_desktop_surface_get_user_data(dsurface);
+
+	ivisurf->xwayland.x = x;
+	ivisurf->xwayland.y = y;
+	ivisurf->xwayland.is_set = true;
 }
 
 static const struct weston_desktop_api desktop_api = {
@@ -543,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)
 {
@@ -560,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;
 }