Merge pull request #973 from emersion/split-xdg-shell-v6

xdg-shell-v6: split into separate files

2 files changed, 45 insertions, 6 deletions

diff --git a/include/types/wlr_xdg_shell_v6.h b/include/types/wlr_xdg_shell_v6.h
new file mode 100644
index 00000000..6c440529
--- /dev/null
+++ b/include/types/wlr_xdg_shell_v6.h
@@ -0,0 +1,45 @@
+#ifndef TYPES_WLR_XDG_SHELL_V6_H
+#define TYPES_WLR_XDG_SHELL_V6_H
+
+#include <wayland-server.h>
+#include <wlr/types/wlr_xdg_shell_v6.h>
+#include "xdg-shell-unstable-v6-protocol.h"
+
+struct wlr_xdg_positioner_v6_resource {
+	struct wl_resource *resource;
+	struct wlr_xdg_positioner_v6 attrs;
+};
+
+#define XDG_TOPLEVEL_ROLE "xdg_toplevel_v6"
+#define XDG_POPUP_ROLE "xdg_popup_v6"
+
+uint32_t xdg_surface_v6_schedule_configure(struct wlr_xdg_surface_v6 *surface);
+struct wlr_xdg_surface_v6 *xdg_surface_v6_create(
+	struct wlr_xdg_client_v6 *client, struct wlr_surface *surface,
+	uint32_t id);
+void xdg_surface_unmap(struct wlr_xdg_surface_v6 *surface);
+void xdg_surface_destroy(struct wlr_xdg_surface_v6 *surface);
+
+void xdg_positioner_v6_create(struct wlr_xdg_client_v6 *client, uint32_t id);
+struct wlr_xdg_positioner_v6_resource *xdg_positioner_from_resource(
+	struct wl_resource *resource);
+
+void xdg_popup_v6_create(struct wlr_xdg_surface_v6 *xdg_surface,
+	struct wlr_xdg_surface_v6 *parent,
+	struct wlr_xdg_positioner_v6_resource *positioner, int32_t id);
+void xdg_surface_v6_popup_committed(struct wlr_xdg_surface_v6 *surface);
+struct wlr_xdg_popup_grab_v6 *xdg_shell_popup_grab_from_seat(
+	struct wlr_xdg_shell_v6 *shell, struct wlr_seat *seat);
+void xdg_popup_destroy(struct wlr_xdg_surface_v6 *surface);
+
+void xdg_toplevel_v6_create(struct wlr_xdg_surface_v6 *xdg_surface,
+	uint32_t id);
+void xdg_surface_v6_toplevel_committed(struct wlr_xdg_surface_v6 *surface);
+void xdg_toplevel_v6_send_configure(struct wlr_xdg_surface_v6 *surface,
+	struct wlr_xdg_surface_v6_configure *configure);
+void xdg_toplevel_v6_ack_configure(struct wlr_xdg_surface_v6 *surface,
+	struct wlr_xdg_surface_v6_configure *configure);
+bool xdg_surface_v6_toplevel_state_compare(struct wlr_xdg_toplevel_v6 *state);
+void xdg_toplevel_destroy(struct wlr_xdg_surface_v6 *surface);
+
+#endif
diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h
index 3d35520b..bce645da 100644
--- a/include/wlr/types/wlr_xdg_shell_v6.h
+++ b/include/wlr/types/wlr_xdg_shell_v6.h
@@ -243,12 +243,6 @@ uint32_t wlr_xdg_toplevel_v6_set_resizing(struct wlr_xdg_surface_v6 *surface,
 void wlr_xdg_surface_v6_send_close(struct wlr_xdg_surface_v6 *surface);
 
 /**
- * Compute the popup position in its parent's surface-local coordinate system.
- */
-void wlr_xdg_surface_v6_popup_get_position(struct wlr_xdg_surface_v6 *surface,
-		double *popup_sx, double *popup_sy);
-
-/**
  * Find a surface within this xdg-surface tree at the given surface-local
  * coordinates. Returns the surface and coordinates in the leaf surface
  * coordinate system or NULL if no surface is found at that location.