Copy xcb_icccm structs into wlroots

1 files changed, 27 insertions, 8 deletions

diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h
index 1f2d7acb..09f9fbac 100644
--- a/include/wlr/xwayland.h
+++ b/include/wlr/xwayland.h
@@ -39,6 +39,30 @@ enum wlr_xwayland_surface_decorations {
 	WLR_XWAYLAND_SURFACE_DECORATIONS_NO_TITLE = 2,
 };
 
+struct wlr_xwayland_surface_hints {
+	uint32_t flags;
+	uint32_t input;
+	int32_t initial_state;
+	xcb_pixmap_t icon_pixmap;
+	xcb_window_t icon_window;
+	int32_t icon_x, icon_y;
+	xcb_pixmap_t icon_mask;
+	xcb_window_t window_group;
+};
+
+struct wlr_xwayland_surface_size_hints {
+	uint32_t flags;
+	int32_t x, y;
+	int32_t width, height;
+	int32_t min_width, min_height;
+	int32_t max_width, max_height;
+	int32_t width_inc, height_inc;
+	int32_t base_width, base_height;
+	int32_t min_aspect_num, min_aspect_den;
+	int32_t max_aspect_num, max_aspect_den;
+	uint32_t win_gravity;
+};
+
 struct wlr_xwayland_surface {
 	xcb_window_t window_id;
 	uint32_t surface_id;
@@ -64,14 +88,9 @@ struct wlr_xwayland_surface {
 	size_t protocols_len;
 
 	uint32_t decorations;
-
-	#ifdef HAS_XCB_ICCCM
-	xcb_icccm_wm_hints_t *hints;
-	xcb_size_hints_t *size_hints;
-	#else
-	void *hints;
-	void *size_hints;
-	#endif
+	struct wlr_xwayland_surface_hints *hints;
+	uint32_t hints_urgency;
+	struct wlr_xwayland_surface_size_hints *size_hints;
 
 	struct {
 		struct wl_signal destroy;