wayland/surface: fixup self-owning surface roles

fixes #7133

1 files changed, 12 insertions, 3 deletions

diff --git a/src/protocols/XDGShell.hpp b/src/protocols/XDGShell.hpp
index e6812c38..81d10613 100644
--- a/src/protocols/XDGShell.hpp
+++ b/src/protocols/XDGShell.hpp
@@ -141,15 +141,24 @@ class CXDGToplevelResource {
     void             applyState();
 };
 
-class CXDGSurfaceResource : public ISurfaceRole {
+class CXDGSurfaceRole : public ISurfaceRole {
+  public:
+    CXDGSurfaceRole(SP<CXDGSurfaceResource> xdg);
+
+    virtual eSurfaceRole role() {
+        return SURFACE_ROLE_XDG_SHELL;
+    }
+
+    WP<CXDGSurfaceResource> xdgSurface;
+};
+
+class CXDGSurfaceResource {
   public:
     CXDGSurfaceResource(SP<CXdgSurface> resource_, SP<CXDGWMBase> owner_, SP<CWLSurfaceResource> surface_);
     ~CXDGSurfaceResource();
 
     static SP<CXDGSurfaceResource> fromResource(wl_resource*);
 
-    virtual eSurfaceRole           role();
-
     bool                           good();
 
     WP<CXDGWMBase>                 owner;