wayland/core: move to new impl (#6268)

* wayland/core/dmabuf: move to new impl

it's the final countdown

1 files changed, 7 insertions, 4 deletions

diff --git a/src/protocols/XDGShell.hpp b/src/protocols/XDGShell.hpp
index 1dbeb209..fe2517a2 100644
--- a/src/protocols/XDGShell.hpp
+++ b/src/protocols/XDGShell.hpp
@@ -16,6 +16,7 @@ class CXDGSurfaceResource;
 class CXDGToplevelResource;
 class CXDGPopupResource;
 class CSeatGrab;
+class CWLSurfaceResource;
 
 struct SXDGPositionerState {
     Vector2D             requestedSize;
@@ -138,7 +139,7 @@ class CXDGToplevelResource {
 
 class CXDGSurfaceResource {
   public:
-    CXDGSurfaceResource(SP<CXdgSurface> resource_, SP<CXDGWMBase> owner_, wlr_surface* surface_);
+    CXDGSurfaceResource(SP<CXdgSurface> resource_, SP<CXDGWMBase> owner_, SP<CWLSurfaceResource> surface_);
     ~CXDGSurfaceResource();
 
     static SP<CXDGSurfaceResource> fromResource(wl_resource*);
@@ -146,7 +147,7 @@ class CXDGSurfaceResource {
     bool                           good();
 
     WP<CXDGWMBase>                 owner;
-    wlr_surface*                   surface = nullptr;
+    WP<CWLSurfaceResource>         surface;
 
     WP<CXDGToplevelResource>       toplevel;
     WP<CXDGPopupResource>          popup;
@@ -184,8 +185,10 @@ class CXDGSurfaceResource {
     //
     std::vector<WP<CXDGPopupResource>> popups;
 
-    DYNLISTENER(surfaceDestroy);
-    DYNLISTENER(surfaceCommit);
+    struct {
+        CHyprSignalListener surfaceDestroy;
+        CHyprSignalListener surfaceCommit;
+    } listeners;
 
     friend class CXDGPopupResource;
     friend class CXDGToplevelResource;