From e76a89bcc80cb693efaa9f6165df8868add35f11 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Wed, 21 May 2025 13:32:17 +0200
Subject: [PATCH] Windows: Change cursor clipping from cursor warping to
 ClipCursor(), fixes #5498.

---
 src/qt/qt_rendererstack.cpp     | 16 +++++++++++++++-
 src/qt/qt_ui.cpp                | 23 +++++++++++++++++++++++
 src/qt/qt_winrawinputfilter.cpp |  4 ++--
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/qt/qt_rendererstack.cpp b/src/qt/qt_rendererstack.cpp
index 79fa78097..c210f4dc2 100644
--- a/src/qt/qt_rendererstack.cpp
+++ b/src/qt/qt_rendererstack.cpp
@@ -61,6 +61,11 @@ struct mouseinputdata {
 static mouseinputdata mousedata;
 
 extern MainWindow *main_window;
+
+#ifdef Q_OS_WINDOWS
+HWND   rw_hwnd;
+#endif
+
 RendererStack::RendererStack(QWidget *parent, int monitor_index)
     : QStackedWidget(parent)
     , ui(new Ui::RendererStack)
@@ -251,7 +256,9 @@ RendererStack::mouseMoveEvent(QMouseEvent *event)
         leaveEvent((QEvent *) event);
         ignoreNextMouseEvent--;
     }
+#if !defined _WIN32
     QCursor::setPos(mapToGlobal(QPoint(width() / 2, height() / 2)));
+#endif
     ignoreNextMouseEvent = 2;
     oldPos               = event->pos();
 #endif
@@ -405,8 +412,15 @@ RendererStack::createRenderer(Renderer renderer)
             }
 #endif
     }
-    if (current.get() == nullptr)
+    if (current.get() == nullptr) {
+#ifdef Q_OS_WINDOWS
+        rw_hwnd = NULL;
+#endif
         return;
+    }
+#ifdef Q_OS_WINDOWS
+    rw_hwnd        = (HWND) this->winId();                
+#endif
     current->setFocusPolicy(Qt::NoFocus);
     current->setFocusProxy(this);
     current->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
diff --git a/src/qt/qt_ui.cpp b/src/qt/qt_ui.cpp
index 5a6bda852..e54d64269 100644
--- a/src/qt/qt_ui.cpp
+++ b/src/qt/qt_ui.cpp
@@ -23,6 +23,7 @@
 #include <QMessageBox>
 
 #include <QStatusBar>
+#include <QApplication>
 
 #include "qt_mainwindow.hpp"
 #include "qt_machinestatus.hpp"
@@ -122,6 +123,8 @@ plat_resize(int w, int h, int monitor_index)
         main_window->resizeContents(w, h);
 }
 
+extern HWND rw_hwnd;
+
 void
 plat_mouse_capture(int on)
 {
@@ -129,6 +132,26 @@ plat_mouse_capture(int on)
         return;
 
     main_window->setMouseCapture(on > 0 ? true : false);
+
+#if defined _WIN32
+    if (on) {
+        QCursor cursor(Qt::BlankCursor);
+
+        QApplication::setOverrideCursor(cursor);
+        QApplication::changeOverrideCursor(cursor);
+
+        RECT rect;
+
+        GetWindowRect(rw_hwnd, &rect);
+
+        ClipCursor(&rect);
+
+    } else {
+        ClipCursor(NULL);
+
+        QApplication::restoreOverrideCursor();
+    }
+#endif
 }
 
 int
diff --git a/src/qt/qt_winrawinputfilter.cpp b/src/qt/qt_winrawinputfilter.cpp
index e94101a77..a62d71920 100644
--- a/src/qt/qt_winrawinputfilter.cpp
+++ b/src/qt/qt_winrawinputfilter.cpp
@@ -395,7 +395,7 @@ WindowsRawInputFilter::mouse_handle(PRAWINPUT raw)
 
     mouse_scale(delta_x, delta_y);
 
-    HWND wnd = (HWND)window->winId();
+    /* HWND wnd = (HWND)window->winId();
 
     RECT rect;
 
@@ -404,5 +404,5 @@ WindowsRawInputFilter::mouse_handle(PRAWINPUT raw)
     int left = rect.left + (rect.right - rect.left) / 2;
     int top = rect.top + (rect.bottom - rect.top) / 2;
 
-    SetCursorPos(left, top);
+    SetCursorPos(left, top); */
 }