input: Add fully configurable trackpad gestures (#11490)

Adds configurable trackpad gestures

1 files changed, 12 insertions, 10 deletions

diff --git a/src/managers/PointerManager.cpp b/src/managers/PointerManager.cpp
index f5635810..093c751d 100644
--- a/src/managers/PointerManager.cpp
+++ b/src/managers/PointerManager.cpp
@@ -902,7 +902,7 @@ void CPointerManager::attachPointer(SP<IPointer> pointer) {
         PROTO::idle->onActivity();
 
         if (!g_pCompositor->m_dpmsStateOn && *PMOUSEDPMS)
-            g_pKeybindManager->dpms("on");
+            CKeybindManager::dpms("on");
     });
 
     listener->motionAbsolute = pointer->m_pointerEvents.motionAbsolute.listen([](const IPointer::SMotionAbsoluteEvent& event) {
@@ -911,7 +911,7 @@ void CPointerManager::attachPointer(SP<IPointer> pointer) {
         PROTO::idle->onActivity();
 
         if (!g_pCompositor->m_dpmsStateOn && *PMOUSEDPMS)
-            g_pKeybindManager->dpms("on");
+            CKeybindManager::dpms("on");
     });
 
     listener->button = pointer->m_pointerEvents.button.listen([](const IPointer::SButtonEvent& event) {
@@ -941,7 +941,7 @@ void CPointerManager::attachPointer(SP<IPointer> pointer) {
         PROTO::idle->onActivity();
 
         if (!g_pCompositor->m_dpmsStateOn && *PMOUSEDPMS)
-            g_pKeybindManager->dpms("on");
+            CKeybindManager::dpms("on");
     });
 
     listener->swipeEnd = pointer->m_pointerEvents.swipeEnd.listen([](const IPointer::SSwipeEndEvent& event) {
@@ -955,21 +955,23 @@ void CPointerManager::attachPointer(SP<IPointer> pointer) {
     });
 
     listener->pinchBegin = pointer->m_pointerEvents.pinchBegin.listen([](const IPointer::SPinchBeginEvent& event) {
-        PROTO::pointerGestures->pinchBegin(event.timeMs, event.fingers);
+        g_pInputManager->onPinchBegin(event);
 
         PROTO::idle->onActivity();
 
         if (!g_pCompositor->m_dpmsStateOn && *PMOUSEDPMS)
-            g_pKeybindManager->dpms("on");
+            CKeybindManager::dpms("on");
     });
 
     listener->pinchEnd = pointer->m_pointerEvents.pinchEnd.listen([](const IPointer::SPinchEndEvent& event) {
-        PROTO::pointerGestures->pinchEnd(event.timeMs, event.cancelled);
+        g_pInputManager->onPinchEnd(event);
+
         PROTO::idle->onActivity();
     });
 
     listener->pinchUpdate = pointer->m_pointerEvents.pinchUpdate.listen([](const IPointer::SPinchUpdateEvent& event) {
-        PROTO::pointerGestures->pinchUpdate(event.timeMs, event.delta, event.scale, event.rotation);
+        g_pInputManager->onPinchUpdate(event);
+
         PROTO::idle->onActivity();
     });
 
@@ -1005,7 +1007,7 @@ void CPointerManager::attachTouch(SP<ITouch> touch) {
         PROTO::idle->onActivity();
 
         if (!g_pCompositor->m_dpmsStateOn && *PMOUSEDPMS)
-            g_pKeybindManager->dpms("on");
+            CKeybindManager::dpms("on");
     });
 
     listener->up = touch->m_touchEvents.up.listen([](const ITouch::SUpEvent& event) {
@@ -1046,7 +1048,7 @@ void CPointerManager::attachTablet(SP<CTablet> tablet) {
         PROTO::idle->onActivity();
 
         if (!g_pCompositor->m_dpmsStateOn && *PMOUSEDPMS)
-            g_pKeybindManager->dpms("on");
+            CKeybindManager::dpms("on");
     });
 
     listener->proximity = tablet->m_tabletEvents.proximity.listen([](const CTablet::SProximityEvent& event) {
@@ -1060,7 +1062,7 @@ void CPointerManager::attachTablet(SP<CTablet> tablet) {
         PROTO::idle->onActivity();
 
         if (!g_pCompositor->m_dpmsStateOn && *PMOUSEDPMS)
-            g_pKeybindManager->dpms("on");
+            CKeybindManager::dpms("on");
     });
 
     listener->button = tablet->m_tabletEvents.button.listen([](const CTablet::SButtonEvent& event) {