upgrade novnc and patches to 1.3.0

[novnc-pve.git] / debian / patches / 0011-add-localCursor-setting-to-rfb.patch

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak@proxmox.com>
Date: Thu, 19 Jul 2018 11:31:51 +0200
Subject: [PATCH] add localCursor setting to rfb

and use it in app.js (default true)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 app/ui.js           | 10 ++++++++++
 core/rfb.js         | 10 ++++++++++
 core/util/cursor.js | 15 ++++++++++++++-
 vnc.html            |  3 +++
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/app/ui.js b/app/ui.js
index f7b7dc4..37a0279 100644
--- a/app/ui.js
+++ b/app/ui.js
@@ -172,6 +172,7 @@ const UI = {
         UI.initSetting('quality', 6);
         UI.initSetting('compression', 2);
         UI.initSetting('autoresize', true);
+        UI.initSetting('local_cursor', true);
         UI.initSetting('shared', true);
         UI.initSetting('view_only', false);
         UI.initSetting('show_dot', false);
@@ -362,6 +363,8 @@ const UI = {
         UI.addSettingChangeHandler('view_only', UI.updateViewOnly);
         UI.addSettingChangeHandler('show_dot');
         UI.addSettingChangeHandler('show_dot', UI.updateShowDotCursor);
+        UI.addSettingChangeHandler('local_cursor');
+        UI.addSettingChangeHandler('local_cursor', UI.updateLocalCursor);
         UI.addSettingChangeHandler('host');
         UI.addSettingChangeHandler('port');
         UI.addSettingChangeHandler('path');
@@ -1057,6 +1060,7 @@ const UI = {
         UI.rfb.addEventListener("desktopname", UI.updateDesktopName);
         UI.rfb.addEventListener("fbresize", UI.updateSessionSize);
         UI.rfb.clipViewport = UI.getSetting('view_clip');
+        UI.rfb.localCursor = UI.getSetting('local_cursor');
         UI.rfb.scaleViewport = UI.getSetting('resize') === 'scale';
         UI.rfb.resizeSession = UI.getSetting('resize') === 'remote';
         UI.rfb.qualityLevel = parseInt(UI.getSetting('quality'));
@@ -1693,6 +1697,12 @@ const UI = {
  * ==============
  *     MISC
  * ------v------*/
+
+    updateLocalCursor() {
+        if (!UI.rfb) return;
+        UI.rfb.localCursor = UI.getSetting('local_cursor');
+    },
+
     updateViewOnly() {
         if (!UI.rfb) return;
         UI.rfb.viewOnly = UI.getSetting('view_only');
diff --git a/core/rfb.js b/core/rfb.js
index 90ca28b..ec75610 100644
--- a/core/rfb.js
+++ b/core/rfb.js
@@ -256,6 +256,7 @@ export default class RFB extends EventTargetMixin {
         this._clipViewport = false;
         this._scaleViewport = false;
         this._resizeSession = false;
+        this._localCursor = false;
 
         this._showDotCursor = false;
         if (options.showDotCursor !== undefined) {
@@ -316,6 +317,15 @@ export default class RFB extends EventTargetMixin {
         }
     }
 
+    get localCursor() { return this._localCursor; }
+    set localCursor(localCursor) {
+        this._localCursor = localCursor;
+
+        if (this._cursor) {
+            this._cursor.setLocalCursor(localCursor);
+        }
+    }
+
     get showDotCursor() { return this._showDotCursor; }
     set showDotCursor(show) {
         this._showDotCursor = show;
diff --git a/core/util/cursor.js b/core/util/cursor.js
index 12bcced..ce7340e 100644
--- a/core/util/cursor.js
+++ b/core/util/cursor.js
@@ -12,6 +12,8 @@ export default class Cursor {
     constructor() {
         this._target = null;
 
+        this._showLocalCursor = false;
+
         this._canvas = document.createElement('canvas');
 
         if (useFallback) {
@@ -100,7 +102,7 @@ export default class Cursor {
     }
 
     clear() {
-        this._target.style.cursor = 'none';
+        this._target.style.cursor = this._showLocalCursor ? 'default' : 'none';
         this._canvas.width = 0;
         this._canvas.height = 0;
         this._position.x = this._position.x + this._hotSpot.x;
@@ -130,6 +132,11 @@ export default class Cursor {
         this._updateVisibility(target);
     }
 
+    setLocalCursor(cursor) {
+        this._showLocalCursor = cursor;
+        this._updateLocalCursor();
+    }
+
     _handleMouseOver(event) {
         // This event could be because we're entering the target, or
         // moving around amongst its sub elements. Let the move handler
@@ -182,6 +189,11 @@ export default class Cursor {
         }
     }
 
+    _updateLocalCursor() {
+        if (this._target)
+            this._target.style.cursor = this._showLocalCursor ? 'default' : 'none';
+    }
+
     _showCursor() {
         if (this._canvas.style.visibility === 'hidden') {
             this._canvas.style.visibility = '';
@@ -240,4 +252,5 @@ export default class Cursor {
         return document.captureElement &&
             document.documentElement.contains(document.captureElement);
     }
+
 }
diff --git a/vnc.html b/vnc.html
index 21b3844..3e63087 100644
--- a/vnc.html
+++ b/vnc.html
@@ -154,6 +154,9 @@
                     <li>
                         <label><input id="noVNC_setting_view_clip" type="checkbox"> Clip to Window</label>
                     </li>
+                    <li>
+                        <label><input id="noVNC_setting_local_cursor" type="checkbox" /> Local Cursor</label>
+                    </li>
                     <li>
                         <label><input id="noVNC_setting_autoresize" type="checkbox" /> Autoresize Window</label>
                     </li>