input: unify constraint hint logic

Unifies the constraint hint logic. Previously, ignoring the stupid conditions, unscaled hints were mistaken with scaled coordinates.

1 files changed, 2 insertions, 13 deletions

diff --git a/src/events/Devices.cpp b/src/events/Devices.cpp
index 4b8eeea8..7a836edd 100644
--- a/src/events/Devices.cpp
+++ b/src/events/Devices.cpp
@@ -122,19 +122,8 @@ void Events::listener_destroyConstraint(void* owner, void* data) {
 
         const auto PWINDOW = g_pCompositor->getConstraintWindow(g_pCompositor->m_sSeat.mouse);
 
-        if (PWINDOW && PCONSTRAINT->positionHint != Vector2D{-1, -1}) {
-            if (PWINDOW->m_bIsX11) {
-                wlr_cursor_warp(g_pCompositor->m_sWLRCursor, nullptr, PCONSTRAINT->positionHint.x + PWINDOW->m_uSurface.xwayland->x,
-                                PWINDOW->m_uSurface.xwayland->y + PCONSTRAINT->positionHint.y);
-
-                wlr_seat_pointer_warp(PCONSTRAINT->constraint->seat, PCONSTRAINT->positionHint.x, PCONSTRAINT->positionHint.y);
-            } else {
-                wlr_cursor_warp(g_pCompositor->m_sWLRCursor, nullptr, PCONSTRAINT->positionHint.x + PWINDOW->m_vRealPosition.vec().x,
-                                PCONSTRAINT->positionHint.y + PWINDOW->m_vRealPosition.vec().y);
-
-                wlr_seat_pointer_warp(PCONSTRAINT->constraint->seat, PCONSTRAINT->positionHint.x, PCONSTRAINT->positionHint.y);
-            }
-        }
+        if (PWINDOW && PCONSTRAINT->positionHint != Vector2D{-1, -1})
+            g_pInputManager->warpMouseToConstraintMiddle(PCONSTRAINT);
 
         PCONSTRAINT->pMouse->currentConstraint = nullptr;
     }