1 files changed, 4 insertions, 59 deletions

diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h
index 72d1850e..04c7e450 100644
--- a/include/wlr/types/wlr_xdg_shell_v6.h
+++ b/include/wlr/types/wlr_xdg_shell_v6.h
@@ -4,6 +4,7 @@
 #include <wayland-server.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_seat.h>
+#include "xdg-shell-unstable-v6-protocol.h"
 
 struct wlr_xdg_shell_v6 {
 	struct wl_global *wl_global;
@@ -32,67 +33,11 @@ struct wlr_xdg_client_v6 {
 	struct wl_event_source *ping_timer;
 };
 
-enum wlr_positioner_v6_anchor {
-	/**
-	 * the center of the anchor rectangle
-	 */
-	WLR_POSITIONER_V6_ANCHOR_NONE = 0,
-	/**
-	 * the top edge of the anchor rectangle
-	 */
-	WLR_POSITIONER_V6_ANCHOR_TOP = 1,
-	/**
-	 * the bottom edge of the anchor rectangle
-	 */
-	WLR_POSITIONER_V6_ANCHOR_BOTTOM = 2,
-	/**
-	 * the left edge of the anchor rectangle
-	 */
-	WLR_POSITIONER_V6_ANCHOR_LEFT = 4,
-	/**
-	 * the right edge of the anchor rectangle
-	 */
-	WLR_POSITIONER_V6_ANCHOR_RIGHT = 8,
-};
-
-enum wlr_positioner_v6_gravity {
-	/**
-	 * center over the anchor edge
-	 */
-	WLR_POSITIONER_V6_GRAVITY_NONE = 0,
-	/**
-	 * position above the anchor edge
-	 */
-	WLR_POSITIONER_V6_GRAVITY_TOP = 1,
-	/**
-	 * position below the anchor edge
-	 */
-	WLR_POSITIONER_V6_GRAVITY_BOTTOM = 2,
-	/**
-	 * position to the left of the anchor edge
-	 */
-	WLR_POSITIONER_V6_GRAVITY_LEFT = 4,
-	/**
-	 * position to the right of the anchor edge
-	 */
-	WLR_POSITIONER_V6_GRAVITY_RIGHT = 8,
-};
-
-enum wlr_positioner_v6_constraint_adjustment {
-	WLR_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_NONE = 0,
-	WLR_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_SLIDE_X = 1,
-	WLR_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_SLIDE_Y = 2,
-	WLR_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_FLIP_X = 4,
-	WLR_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_FLIP_Y = 8,
-	WLR_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_RESIZE_X = 16,
-	WLR_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_RESIZE_Y = 32,
-};
-
 struct wlr_xdg_positioner_v6 {
 	struct wlr_box anchor_rect;
-	enum wlr_positioner_v6_anchor anchor;
-	enum wlr_positioner_v6_gravity gravity;
-	enum wlr_positioner_v6_constraint_adjustment constraint_adjustment;
+	enum zxdg_positioner_v6_anchor anchor;
+	enum zxdg_positioner_v6_gravity gravity;
+	enum zxdg_positioner_v6_constraint_adjustment constraint_adjustment;
 
 	struct {
 		int32_t width, height;