wayland/surface: fixup self-owning surface roles

fixes #7133

1 files changed, 15 insertions, 5 deletions

diff --git a/src/protocols/LayerShell.hpp b/src/protocols/LayerShell.hpp
index ee0b7859..801bdfd6 100644
--- a/src/protocols/LayerShell.hpp
+++ b/src/protocols/LayerShell.hpp
@@ -12,16 +12,26 @@
 
 class CMonitor;
 class CWLSurfaceResource;
+class CLayerShellResource;
 
-class CLayerShellResource : public ISurfaceRole {
+class CLayerShellRole : public ISurfaceRole {
+  public:
+    CLayerShellRole(SP<CLayerShellResource> ls);
+
+    virtual eSurfaceRole role() {
+        return SURFACE_ROLE_LAYER_SHELL;
+    }
+
+    WP<CLayerShellResource> layerSurface;
+};
+class CLayerShellResource {
   public:
     CLayerShellResource(SP<CZwlrLayerSurfaceV1> resource_, SP<CWLSurfaceResource> surf_, std::string namespace_, CMonitor* pMonitor, zwlrLayerShellV1Layer layer);
     ~CLayerShellResource();
 
-    bool                 good();
-    void                 configure(const Vector2D& size);
-    void                 sendClosed();
-    virtual eSurfaceRole role();
+    bool good();
+    void configure(const Vector2D& size);
+    void sendClosed();
 
     enum eCommittedState {
         STATE_SIZE          = (1 << 0),