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

* wayland/core/dmabuf: move to new impl

it's the final countdown

1 files changed, 22 insertions, 22 deletions

diff --git a/src/managers/input/TextInput.hpp b/src/managers/input/TextInput.hpp
index ff21da95..30fbb4cc 100644
--- a/src/managers/input/TextInput.hpp
+++ b/src/managers/input/TextInput.hpp
@@ -6,12 +6,12 @@
 #include "../../helpers/signal/Listener.hpp"
 #include <memory>
 
-struct wlr_surface;
 struct wl_client;
 
 struct STextInputV1;
 class CTextInputV3;
 class CInputMethodV2;
+class CWLSurfaceResource;
 
 class CTextInput {
   public:
@@ -19,43 +19,43 @@ class CTextInput {
     CTextInput(STextInputV1* ti);
     ~CTextInput();
 
-    bool         isV3();
-    void         enter(wlr_surface* pSurface);
-    void         leave();
-    void         tiV1Destroyed();
-    wl_client*   client();
-    void         commitStateToIME(SP<CInputMethodV2> ime);
-    void         updateIMEState(SP<CInputMethodV2> ime);
+    bool                   isV3();
+    void                   enter(SP<CWLSurfaceResource> pSurface);
+    void                   leave();
+    void                   tiV1Destroyed();
+    wl_client*             client();
+    void                   commitStateToIME(SP<CInputMethodV2> ime);
+    void                   updateIMEState(SP<CInputMethodV2> ime);
 
-    void         onEnabled(wlr_surface* surfV1 = nullptr);
-    void         onDisabled();
-    void         onCommit();
+    void                   onEnabled(SP<CWLSurfaceResource> surfV1 = nullptr);
+    void                   onDisabled();
+    void                   onCommit();
 
-    bool         hasCursorRectangle();
-    CBox         cursorBox();
+    bool                   hasCursorRectangle();
+    CBox                   cursorBox();
 
-    wlr_surface* focusedSurface();
+    SP<CWLSurfaceResource> focusedSurface();
 
   private:
-    void             setFocusedSurface(wlr_surface* pSurface);
-    void             initCallbacks();
+    void                   setFocusedSurface(SP<CWLSurfaceResource> pSurface);
+    void                   initCallbacks();
 
-    wlr_surface*     pFocusedSurface = nullptr;
-    int              enterLocks      = 0;
-    WP<CTextInputV3> pV3Input;
-    STextInputV1*    pV1Input = nullptr;
+    WP<CWLSurfaceResource> pFocusedSurface;
+    int                    enterLocks = 0;
+    WP<CTextInputV3>       pV3Input;
+    STextInputV1*          pV1Input = nullptr;
 
     DYNLISTENER(textInputEnable);
     DYNLISTENER(textInputDisable);
     DYNLISTENER(textInputCommit);
     DYNLISTENER(textInputDestroy);
-    DYNLISTENER(surfaceUnmapped);
-    DYNLISTENER(surfaceDestroyed);
 
     struct {
         CHyprSignalListener enable;
         CHyprSignalListener disable;
         CHyprSignalListener commit;
         CHyprSignalListener destroy;
+        CHyprSignalListener surfaceUnmap;
+        CHyprSignalListener surfaceDestroy;
     } listeners;
 };
\ No newline at end of file