From 68a2db4da53a7997fbc64389d311746fe93509ec Mon Sep 17 00:00:00 2001
From: Daniel Hammerschmidt <daniel.hammerschmidt@bitctrl.de>
Date: Wed, 17 Sep 2025 04:17:01 +0200
Subject: [PATCH] Refresh, attach, detach cursor on API-calls and mouse events

---
 core/rfb.js | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/core/rfb.js b/core/rfb.js
index 7c05d68d..a5b64d98 100644
--- a/core/rfb.js
+++ b/core/rfb.js
@@ -323,8 +323,10 @@ export default class RFB extends EventTargetMixin {
             this._rfbConnectionState === "connected") {
             if (viewOnly) {
                 this._keyboard.ungrab();
+                this._refreshCursor();
             } else {
                 this._keyboard.grab();
+                this._refreshCursor();
             }
         }
     }
@@ -353,6 +355,7 @@ export default class RFB extends EventTargetMixin {
     get dragViewport() { return this._dragViewport; }
     set dragViewport(dragViewport) {
         this._dragViewport = dragViewport;
+        this._refreshCursor();
     }
 
     get scaleViewport() { return this._scaleViewport; }
@@ -399,6 +402,11 @@ export default class RFB extends EventTargetMixin {
         dragCursor && (this._localCursors.drag = dragCursor);
         draggingCursor && (this._localCursors.dragging = draggingCursor);
         emptyCursor && (this._localCursors.empty = emptyCursor);
+        this._cursor.detach();
+        this._cursor.attach(this._canvas, {
+            showLocalCursor: this._showLocalCursor,
+        });
+        this._refreshCursor();
     }
 
     get background() { return this._screen.style.background; }
@@ -605,7 +613,9 @@ export default class RFB extends EventTargetMixin {
 
         this._gestures.attach(this._canvas);
 
-        this._cursor.attach(this._canvas);
+        this._cursor.attach(this._canvas, {
+            showLocalCursor: this._showLocalCursor
+        });
         this._refreshCursor();
 
         // Monitor size changes of the screen element
@@ -1154,6 +1164,11 @@ export default class RFB extends EventTargetMixin {
                         this._viewportDragPos = {'x': pos.x, 'y': pos.y};
                         this._viewportHasMoved = false;
 
+                        if (this._showLocalCursor) {
+                            this._refreshCursor();
+                            this._cursor.detach();
+                        }
+
                         this._flushMouseMoveTimer(pos.x, pos.y);
 
                         // Skip sending mouse events, instead save the current
@@ -1163,6 +1178,13 @@ export default class RFB extends EventTargetMixin {
                     } else {
                         this._viewportDragging = false;
 
+                        if (this._showLocalCursor) {
+                            this._cursor.attach(this._canvas, {
+                                showLocalCursor: this._showLocalCursor,
+                            });
+                            this._refreshCursor();
+                        }
+
                         // If we actually performed a drag then we are done
                         // here and should not send any mouse events
                         if (this._viewportHasMoved) {