X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=1d60bf15bd0e7cb20e2baac13e2202c38ffa54f1;hb=refs%2Fchanges%2F91%2F29791%2F1;hp=7875eb913a85a99860b0fac2bf89d88c52b46bba;hpb=09fa5536e759792c80341305a536cd59aa801c6d;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index 7875eb9..1d60bf1 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -29,7 +29,7 @@
 
 #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
@@ -318,7 +318,7 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
 		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;
 	}
 
@@ -392,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 =
@@ -470,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 */
@@ -522,13 +522,13 @@ 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)
 {
 	struct ivi_surface *ivisurf =
 		weston_desktop_surface_get_user_data(dsurface);
 
-	ivisurf->xwayland.x = x;
-	ivisurf->xwayland.y = y;
+	ivisurf->xwayland.x = pos.c.x;
+	ivisurf->xwayland.y = pos.c.y;
 	ivisurf->xwayland.is_set = true;
 }