Fixes #428 - hides the local cursor when using the server-side cursor.

diff --git a/include/display.js b/include/display.js
index a42b854a01a8e8d078b5d1bde846b5c324bb3f02..db45d7b1ddbd17ac8978401703efc9b101845473 100644 (file)
--- a/include/display.js
+++ b/include/display.js
@@ -93,13 +93,14 @@ var Display;
                     this._cursor_uri = true;
                 }
                 Util.Info("Data URI scheme cursor supported");
+                this._target.style.cursor = curSave;
             } else {
                 if (this._cursor_uri === null || this._cursor_uri === undefined) {
                     this._cursor_uri = false;
                 }
                 Util.Warn("Data URI scheme cursor not supported");
+                this._target.style.cursor = "none";
             }
-            this._target.style.cursor = curSave;
         } catch (exc) {
             Util.Error("Data URI scheme cursor test exception: " + exc);
             this._cursor_uri = false;
@@ -470,6 +471,10 @@ var Display;
             this._target.style.cursor = "default";
         },
 
+        disableLocalCursor: function () {
+            this._target.style.cursor = "none";
+        },
+
         // Overridden getters/setters
         get_context: function () {
             return this._drawCtx;

diff --git a/include/rfb.js b/include/rfb.js
index 59fd785d4f79a1fbae3681cfe9f71be414ce45ca..980e61c99ae042183ce00a94fe605827ead80267 100644 (file)
--- a/include/rfb.js
+++ b/include/rfb.js
@@ -411,7 +411,9 @@ var RFB;
                 if (this._display && this._display.get_context()) {
                     this._keyboard.ungrab();
                     this._mouse.ungrab();
-                    this._display.defaultCursor();
+                    if (state !== 'connect' && state !== 'loaded') {
+                        this._display.defaultCursor();
+                    }
                     if (Util.get_logging() !== 'debug' || state === 'loaded') {
                         // Show noVNC logo on load and when disconnected, unless in
                         // debug mode
@@ -1215,6 +1217,7 @@ var RFB;
     RFB.prototype.set_local_cursor = function (cursor) {
         if (!cursor || (cursor in {'0': 1, 'no': 1, 'false': 1})) {
             this._local_cursor = false;
+            this._display.disableLocalCursor(); //Only show server-side cursor
         } else {
             if (this._display.get_cursor_uri()) {
                 this._local_cursor = true;