diff --git a/src/managers/PointerManager.cpp b/src/managers/PointerManager.cpp index 5669ce0a3..4823e2428 100644 --- a/src/managers/PointerManager.cpp +++ b/src/managers/PointerManager.cpp @@ -1100,8 +1100,3 @@ void CPointerManager::damageCursor(PHLMONITOR pMonitor) { Vector2D CPointerManager::cursorSizeLogical() { return m_currentCursorImage.size / m_currentCursorImage.scale; } - -void CPointerManager::sendMovement(uint64_t time, const Vector2D& delta, const Vector2D& deltaUnaccel) { - PROTO::relativePointer->sendRelativeMotion(time * 1000, delta, deltaUnaccel); - g_pSeatManager->sendPointerFrame(); -} diff --git a/src/managers/PointerManager.hpp b/src/managers/PointerManager.hpp index 2bc645107..e80e1eaaa 100644 --- a/src/managers/PointerManager.hpp +++ b/src/managers/PointerManager.hpp @@ -60,7 +60,6 @@ class CPointerManager { // Vector2D position(); Vector2D cursorSizeLogical(); - void sendMovement(uint64_t time, const Vector2D& delta, const Vector2D& deltaUnaccel); void recheckEnteredOutputs(); diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp index 175f09d9e..0d6a944bb 100644 --- a/src/managers/input/InputManager.cpp +++ b/src/managers/input/InputManager.cpp @@ -131,11 +131,10 @@ void CInputManager::onMouseMoved(IPointer::SMotionEvent e) { const auto DELTA = *PNOACCEL == 1 ? unaccel : delta; - g_pPointerManager->sendMovement(e.timeMs, DELTA, unaccel); - if (e.mouse) recheckMouseWarpOnMouseInput(); + PROTO::relativePointer->sendRelativeMotion(sc(e.timeMs) * 1000, delta, unaccel); g_pPointerManager->move(DELTA); mouseMoveUnified(e.timeMs, false, e.mouse); @@ -146,6 +145,8 @@ void CInputManager::onMouseMoved(IPointer::SMotionEvent e) { if (e.mouse) m_lastMousePos = getMouseCoordsInternal(); + + g_pSeatManager->sendPointerFrame(); } void CInputManager::onMouseWarp(IPointer::SMotionAbsoluteEvent e) {