1 files changed, 32 insertions, 46 deletions

diff --git a/src/devices/TouchDevice.cpp b/src/devices/TouchDevice.cpp
index 64c521a2..25b7b503 100644
--- a/src/devices/TouchDevice.cpp
+++ b/src/devices/TouchDevice.cpp
@@ -1,7 +1,8 @@
 #include "TouchDevice.hpp"
 #include "../defines.hpp"
+#include <aquamarine/input/Input.hpp>
 
-SP<CTouchDevice> CTouchDevice::create(wlr_touch* touch) {
+SP<CTouchDevice> CTouchDevice::create(SP<Aquamarine::ITouch> touch) {
     SP<CTouchDevice> pTouch = SP<CTouchDevice>(new CTouchDevice(touch));
 
     pTouch->self = pTouch;
@@ -9,78 +10,63 @@ SP<CTouchDevice> CTouchDevice::create(wlr_touch* touch) {
     return pTouch;
 }
 
-CTouchDevice::CTouchDevice(wlr_touch* touch_) : touch(touch_) {
+CTouchDevice::CTouchDevice(SP<Aquamarine::ITouch> touch_) : touch(touch_) {
     if (!touch)
         return;
 
-    // clang-format off
-    hyprListener_destroy.initCallback(&touch->base.events.destroy, [this] (void* owner, void* data) {
+    listeners.destroy = touch->events.destroy.registerListener([this](std::any d) {
         events.destroy.emit();
-        disconnectCallbacks();
-        touch = nullptr;
-    }, this, "CTouchDevice");
+        touch.reset();
+    });
 
-    hyprListener_down.initCallback(&touch->events.down, [this] (void* owner, void* data) {
-        auto E = (wlr_touch_down_event*)data;
+    listeners.down = touch->events.down.registerListener([this](std::any d) {
+        auto E = std::any_cast<Aquamarine::ITouch::SDownEvent>(d);
 
         touchEvents.down.emit(SDownEvent{
-            .timeMs  = E->time_msec,
-            .touchID = E->touch_id,
-            .pos     = {E->x, E->y},
+            .timeMs  = E.timeMs,
+            .touchID = E.touchID,
+            .pos     = E.pos,
             .device  = self.lock(),
         });
-    }, this, "CTouchDevice");
+    });
 
-    hyprListener_up.initCallback(&touch->events.up, [this] (void* owner, void* data) {
-        auto E = (wlr_touch_up_event*)data;
+    listeners.up = touch->events.up.registerListener([this](std::any d) {
+        auto E = std::any_cast<Aquamarine::ITouch::SUpEvent>(d);
 
         touchEvents.up.emit(SUpEvent{
-            .timeMs  = E->time_msec,
-            .touchID = E->touch_id
+            .timeMs  = E.timeMs,
+            .touchID = E.touchID,
         });
-    }, this, "CTouchDevice");
+    });
 
-    hyprListener_motion.initCallback(&touch->events.motion, [this] (void* owner, void* data) {
-        auto E = (wlr_touch_motion_event*)data;
+    listeners.motion = touch->events.move.registerListener([this](std::any d) {
+        auto E = std::any_cast<Aquamarine::ITouch::SMotionEvent>(d);
 
         touchEvents.motion.emit(SMotionEvent{
-            .timeMs  = E->time_msec,
-            .touchID = E->touch_id,
-            .pos     = {E->x, E->y},
+            .timeMs  = E.timeMs,
+            .touchID = E.touchID,
+            .pos     = E.pos,
         });
-    }, this, "CTouchDevice");
+    });
 
-    hyprListener_cancel.initCallback(&touch->events.cancel, [this] (void* owner, void* data) {
-        auto E = (wlr_touch_cancel_event*)data;
+    listeners.cancel = touch->events.cancel.registerListener([this](std::any d) {
+        auto E = std::any_cast<Aquamarine::ITouch::SCancelEvent>(d);
 
         touchEvents.cancel.emit(SCancelEvent{
-            .timeMs  = E->time_msec,
-            .touchID = E->touch_id
+            .timeMs  = E.timeMs,
+            .touchID = E.touchID,
         });
-    }, this, "CTouchDevice");
+    });
 
-    hyprListener_frame.initCallback(&touch->events.frame, [this] (void* owner, void* data) {
-        touchEvents.frame.emit();
-    }, this, "CTouchDevice");
+    listeners.frame = touch->events.frame.registerListener([this](std::any d) { touchEvents.frame.emit(); });
 
-    // clang-format on
-
-    deviceName = touch->base.name ? touch->base.name : "UNKNOWN";
+    deviceName = touch->getName();
 }
 
 bool CTouchDevice::isVirtual() {
     return false;
 }
 
-wlr_touch* CTouchDevice::wlr() {
-    return touch;
-}
-
-void CTouchDevice::disconnectCallbacks() {
-    hyprListener_destroy.removeCallback();
-    hyprListener_down.removeCallback();
-    hyprListener_up.removeCallback();
-    hyprListener_motion.removeCallback();
-    hyprListener_cancel.removeCallback();
-    hyprListener_frame.removeCallback();
+SP<Aquamarine::ITouch> CTouchDevice::aq() {
+    return touch.lock();
 }