2 files changed, 65 insertions, 0 deletions
diff --git a/include/meson.build b/include/meson.build
index a88cd653..a07c9b29 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -10,6 +10,7 @@ endif
 if conf_data.get('WLR_HAS_XDG_FOREIGN', 0) != 1
 	exclude_files += [
     'types/wlr_xdg_foreign_v1.h',
+    'types/wlr_xdg_foreign_v2.h',
     'types/wlr_xdg_foreign_registry.h',
 	]
 endif
diff --git a/include/wlr/types/wlr_xdg_foreign_v2.h b/include/wlr/types/wlr_xdg_foreign_v2.h
new file mode 100644
index 00000000..d0fb506a
--- /dev/null
+++ b/include/wlr/types/wlr_xdg_foreign_v2.h
@@ -0,0 +1,64 @@
+/*
+ * This an unstable interface of wlroots. No guarantees are made regarding the
+ * future consistency of this API.
+ */
+#ifndef WLR_USE_UNSTABLE
+#error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features"
+#endif
+
+#ifndef WLR_TYPES_WLR_XDG_FOREIGN_V2_H
+#define WLR_TYPES_WLR_XDG_FOREIGN_V2_H
+
+#include <wayland-server-core.h>
+#include <wlr/types/wlr_xdg_foreign_registry.h>
+
+struct wlr_xdg_foreign_v2 {
+	struct {
+		struct wl_global *global;
+		struct wl_list objects; // wlr_xdg_exported_v2::link or wlr_xdg_imported_v2::link
+	} exporter, importer;
+
+	struct wl_listener foreign_registry_destroy;
+	struct wl_listener display_destroy;
+
+	struct wlr_xdg_foreign_registry *registry;
+
+	struct {
+		struct wl_signal destroy;
+	} events;
+
+	void *data;
+};
+
+struct wlr_xdg_exported_v2 {
+	struct wlr_xdg_foreign_exported base;
+
+	struct wl_resource *resource;
+	struct wl_listener xdg_surface_destroy;
+
+	struct wl_list link; // wlr_xdg_foreign_v2::exporter::objects
+};
+
+struct wlr_xdg_imported_v2 {
+	struct wlr_xdg_foreign_exported *exported;
+	struct wl_listener exported_destroyed;
+
+	struct wl_resource *resource;
+	struct wl_list link; // wlr_xdg_foreign_v2::importer::objects
+	struct wl_list children;
+};
+
+struct wlr_xdg_imported_child_v2 {
+	struct wlr_xdg_imported_v2 *imported;
+	struct wlr_surface *surface;
+
+	struct wl_list link; // wlr_xdg_imported_v2::children
+
+	struct wl_listener xdg_surface_unmap;
+	struct wl_listener xdg_toplevel_set_parent;
+};
+
+struct wlr_xdg_foreign_v2 *wlr_xdg_foreign_v2_create(
+		struct wl_display *display, struct wlr_xdg_foreign_registry *registry);
+
+#endif