2 files changed, 163 insertions, 4 deletions

diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h
index f0765160..d76fff16 100644
--- a/include/wlr/types/wlr_surface.h
+++ b/include/wlr/types/wlr_surface.h
@@ -42,6 +42,7 @@ struct wlr_surface {
 
 	struct {
 		struct wl_signal commit;
+		struct wl_signal destroy;
 	} signals;
 
 	struct wl_list frame_callback_list; // wl_surface.frame
@@ -69,4 +70,12 @@ void wlr_surface_get_matrix(struct wlr_surface *surface,
 		const float (*projection)[16],
 		const float (*transform)[16]);
 
+
+/**
+ * Set the lifetime role for this surface. Returns 0 on success or -1 if the
+ * role cannot be set.
+ */
+int wlr_surface_set_role(struct wlr_surface *surface, const char *role,
+		struct wl_resource *error_resource, uint32_t error_code);
+
 #endif
diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h
index 41cf483a..786bf4e6 100644
--- a/include/wlr/types/wlr_xdg_shell_v6.h
+++ b/include/wlr/types/wlr_xdg_shell_v6.h
@@ -1,24 +1,174 @@
 #ifndef _WLR_XDG_SHELL_V6_H
 #define _WLR_XDG_SHELL_V6_H
+#include <wlr/types/wlr_box.h>
 #include <wayland-server.h>
 
 struct wlr_xdg_shell_v6 {
 	struct wl_global *wl_global;
-	struct wl_list wl_resources;
-	struct wl_list surfaces;
+	struct wl_list clients;
+	uint32_t ping_timeout;
+
+	struct {
+		struct wl_signal new_surface;
+	} events;
 
 	void *data;
 };
 
+struct wlr_xdg_client_v6 {
+	struct wlr_xdg_shell_v6 *shell;
+	struct wl_resource *resource;
+	struct wl_client *client;
+	struct wl_list surfaces;
+
+	struct wl_list link; // wlr_xdg_shell_v6::clients
+
+	uint32_t ping_serial;
+	struct wl_event_source *ping_timer;
+};
+
+
+enum wlr_xdg_surface_v6_role {
+	WLR_XDG_SURFACE_V6_ROLE_NONE,
+	WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL,
+	WLR_XDG_SURFACE_V6_ROLE_POPUP,
+};
+
+struct wlr_xdg_toplevel_v6_state {
+	bool maximized;
+	bool fullscreen;
+	bool resizing;
+	bool activated;
+
+	uint32_t width;
+	uint32_t height;
+
+	uint32_t max_width;
+	uint32_t max_height;
+
+	uint32_t min_width;
+	uint32_t min_height;
+};
+
+struct wlr_xdg_toplevel_v6 {
+	struct wl_resource *resource;
+	struct wlr_xdg_surface_v6 *base;
+	struct wlr_xdg_surface_v6 *parent;
+	bool added;
+	struct wlr_xdg_toplevel_v6_state next; // client protocol requests
+	struct wlr_xdg_toplevel_v6_state pending; // user configure requests
+	struct wlr_xdg_toplevel_v6_state current;
+};
+
+// TODO split up into toplevel and popup configure
+struct wlr_xdg_surface_v6_configure {
+	struct wl_list link; // wlr_xdg_surface_v6::configure_list
+	uint32_t serial;
+	struct wlr_xdg_toplevel_v6_state state;
+};
+
 struct wlr_xdg_surface_v6 {
+	struct wlr_xdg_client_v6 *client;
 	struct wl_resource *resource;
-	struct wl_resource *surface;
-	struct wl_list link;
+	struct wlr_surface *surface;
+	struct wl_list link; // wlr_xdg_client_v6::surfaces
+	enum wlr_xdg_surface_v6_role role;
+	struct wlr_xdg_toplevel_v6 *toplevel_state;
+
+	bool configured;
+	struct wl_event_source *configure_idle;
+	struct wl_list configure_list;
+
+	char *title;
+	char *app_id;
+
+	bool has_next_geometry;
+	struct wlr_box *next_geometry;
+	struct wlr_box *geometry;
+
+	struct wl_listener surface_destroy_listener;
+	struct wl_listener surface_commit_listener;
+
+	struct {
+		struct wl_signal commit;
+		struct wl_signal destroy;
+		struct wl_signal ack_configure;
+		struct wl_signal ping_timeout;
+
+		struct wl_signal request_minimize;
+		struct wl_signal request_move;
+		struct wl_signal request_resize;
+		struct wl_signal request_show_window_menu;
+	} events;
 
 	void *data;
 };
 
+struct wlr_xdg_toplevel_v6_move_event {
+	struct wl_client *client;
+	struct wlr_xdg_surface_v6 *surface;
+	struct wlr_seat_handle *seat_handle;
+	uint32_t serial;
+};
+
+struct wlr_xdg_toplevel_v6_resize_event {
+	struct wl_client *client;
+	struct wlr_xdg_surface_v6 *surface;
+	struct wlr_seat_handle *seat_handle;
+	uint32_t serial;
+	uint32_t edges;
+};
+
+struct wlr_xdg_toplevel_v6_show_window_menu_event {
+	struct wl_client *client;
+	struct wlr_xdg_surface_v6 *surface;
+	struct wlr_seat_handle *seat_handle;
+	uint32_t serial;
+	uint32_t x;
+	uint32_t y;
+};
+
 struct wlr_xdg_shell_v6 *wlr_xdg_shell_v6_create(struct wl_display *display);
 void wlr_xdg_shell_v6_destroy(struct wlr_xdg_shell_v6 *xdg_shell);
 
+/**
+ * Send a ping to the surface. If the surface does not respond in a reasonable
+ * amount of time, the ping_timeout event will be emitted.
+ */
+void wlr_xdg_surface_v6_ping(struct wlr_xdg_surface_v6 *surface);
+
+/**
+ * Request that this toplevel surface be the given size.
+ */
+void wlr_xdg_toplevel_v6_set_size(struct wlr_xdg_surface_v6 *surface,
+		uint32_t width, uint32_t height);
+
+/**
+ * Request that this toplevel surface show itself in an activated or deactivated
+ * state.
+ */
+void wlr_xdg_toplevel_v6_set_activated(struct wlr_xdg_surface_v6 *surface,
+		bool activated);
+
+/**
+ * Request that this toplevel surface consider itself maximized or not
+ * maximized.
+ */
+void wlr_xdg_toplevel_v6_set_maximized(struct wlr_xdg_surface_v6 *surface,
+		bool maximized);
+
+/**
+ * Request that this toplevel surface consider itself fullscreen or not
+ * fullscreen.
+ */
+void wlr_xdg_toplevel_v6_set_fullscreen(struct wlr_xdg_surface_v6 *surface,
+		bool fullscreen);
+
+/**
+ * Request that this toplevel surface consider itself to be resizing or not
+ * resizing.
+ */
+void wlr_xdg_toplevel_v6_set_resizing(struct wlr_xdg_surface_v6 *surface,
+		bool resizing);
+
 #endif