[pve-devel] [RFC PATCH novnc] add patch to readd local cursor
Dominik Csapak
d.csapak at proxmox.com
Mon Jul 16 17:07:48 CEST 2018
novnc shows the local cursor if it gets one from the vnc server,
but this can never happen with qemu, but we want to show the
local cursor
Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
sending as rfc, since i do not know if we want to show it or not
but there were more than a few reports on the forum for this
if the renumbering makes too much noise, i can of course send
a v2 with only the new patch added
debian/patches/0001-add-pve-specific-js-code.patch | 2 +-
.../0002-add-custom-fbresize-event-on-rfb.patch | 2 +-
...3-change-scaling-when-toggling-fullscreen.patch | 2 +-
debian/patches/0004-add-pve-style.patch | 2 +-
debian/patches/0005-remove-vnc-logos.patch | 2 +-
...-change-src-directory-for-images-js-files.patch | 2 +-
debian/patches/0007-add-pve-vnc-commands.patch | 2 +-
...0008-add-replaceable-snippets-in-vnc.html.patch | 2 +-
debian/patches/0009-decrease-animation-time.patch | 2 +-
debian/patches/0010-use-only-app.js.patch | 2 +-
debian/patches/0011-show-local-cursor.patch | 28 ++++++++++++++++++++++
debian/patches/series | 1 +
12 files changed, 39 insertions(+), 10 deletions(-)
create mode 100644 debian/patches/0011-show-local-cursor.patch
diff --git a/debian/patches/0001-add-pve-specific-js-code.patch b/debian/patches/0001-add-pve-specific-js-code.patch
index bae6bf6..01b03e4 100644
--- a/debian/patches/0001-add-pve-specific-js-code.patch
+++ b/debian/patches/0001-add-pve-specific-js-code.patch
@@ -1,7 +1,7 @@
From e9e4fe2eab135507fd6574b2f12ddc5c9d0a532b Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Tue, 13 Dec 2016 16:11:35 +0100
-Subject: [PATCH 01/10] add pve specific js code
+Subject: [PATCH 01/11] add pve specific js code
this adds a es6 module 'PVEUI' which we use for defining the pve related
methods (API2Request, etc.)
diff --git a/debian/patches/0002-add-custom-fbresize-event-on-rfb.patch b/debian/patches/0002-add-custom-fbresize-event-on-rfb.patch
index 86ef08e..78b6c25 100644
--- a/debian/patches/0002-add-custom-fbresize-event-on-rfb.patch
+++ b/debian/patches/0002-add-custom-fbresize-event-on-rfb.patch
@@ -1,7 +1,7 @@
From 5a456e52e6a1c9cb283187505bc09289a9fb3334 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Wed, 9 May 2018 10:47:53 +0200
-Subject: [PATCH 02/10] add custom fbresize event on rfb
+Subject: [PATCH 02/11] add custom fbresize event on rfb
this can be use to react to changes of the resolution, like resizing the
window
diff --git a/debian/patches/0003-change-scaling-when-toggling-fullscreen.patch b/debian/patches/0003-change-scaling-when-toggling-fullscreen.patch
index dec2248..eba1f5f 100644
--- a/debian/patches/0003-change-scaling-when-toggling-fullscreen.patch
+++ b/debian/patches/0003-change-scaling-when-toggling-fullscreen.patch
@@ -1,7 +1,7 @@
From 6abc6b0b278717584ff2452cbe8d1f448398a406 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Thu, 11 May 2017 10:34:10 +0200
-Subject: [PATCH 03/10] change scaling when toggling fullscreen
+Subject: [PATCH 03/11] change scaling when toggling fullscreen
when activating fullscreen, we change the scaling to 'scale',
and changing it back when leaving fullscreen
diff --git a/debian/patches/0004-add-pve-style.patch b/debian/patches/0004-add-pve-style.patch
index a5f2050..d41cb5c 100644
--- a/debian/patches/0004-add-pve-style.patch
+++ b/debian/patches/0004-add-pve-style.patch
@@ -1,7 +1,7 @@
From 5d8fb2485e4863d561481ea7d51e36f8e0be1d2b Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Tue, 13 Dec 2016 16:03:41 +0100
-Subject: [PATCH 04/10] add pve style
+Subject: [PATCH 04/11] add pve style
this adds the custom pve style (based on black.css)
diff --git a/debian/patches/0005-remove-vnc-logos.patch b/debian/patches/0005-remove-vnc-logos.patch
index 9a0cc43..acb8cb2 100644
--- a/debian/patches/0005-remove-vnc-logos.patch
+++ b/debian/patches/0005-remove-vnc-logos.patch
@@ -1,7 +1,7 @@
From 761e67e803bfcf196cc2229ec451adaee0beb61a Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Fri, 20 Jan 2017 10:35:05 +0100
-Subject: [PATCH 05/10] remove vnc logos
+Subject: [PATCH 05/11] remove vnc logos
to show the pve icon instead
diff --git a/debian/patches/0006-change-src-directory-for-images-js-files.patch b/debian/patches/0006-change-src-directory-for-images-js-files.patch
index 60f6ab6..141d5e3 100644
--- a/debian/patches/0006-change-src-directory-for-images-js-files.patch
+++ b/debian/patches/0006-change-src-directory-for-images-js-files.patch
@@ -1,7 +1,7 @@
From 87486c038db7ddb212f995c70edf13dc1e8783cd Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Tue, 17 Jan 2017 17:24:03 +0100
-Subject: [PATCH 06/10] change src directory for images/js files
+Subject: [PATCH 06/11] change src directory for images/js files
since they will be in /novnc/
also change the directory in the build script
diff --git a/debian/patches/0007-add-pve-vnc-commands.patch b/debian/patches/0007-add-pve-vnc-commands.patch
index b81852a..5ed3a4c 100644
--- a/debian/patches/0007-add-pve-vnc-commands.patch
+++ b/debian/patches/0007-add-pve-vnc-commands.patch
@@ -1,7 +1,7 @@
From d83521eab33ef32d35f4ea8ada73585bad4265a4 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Fri, 20 Jan 2017 10:35:43 +0100
-Subject: [PATCH 07/10] add pve vnc commands
+Subject: [PATCH 07/11] add pve vnc commands
Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
diff --git a/debian/patches/0008-add-replaceable-snippets-in-vnc.html.patch b/debian/patches/0008-add-replaceable-snippets-in-vnc.html.patch
index 41b3ee2..9b9423c 100644
--- a/debian/patches/0008-add-replaceable-snippets-in-vnc.html.patch
+++ b/debian/patches/0008-add-replaceable-snippets-in-vnc.html.patch
@@ -1,7 +1,7 @@
From f56b6fe825b776c30e445d2319488bec63551b8f Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Fri, 20 Jan 2017 10:16:09 +0100
-Subject: [PATCH 08/10] add replaceable snippets in vnc.html
+Subject: [PATCH 08/11] add replaceable snippets in vnc.html
so that we can insert the username/csrftoken via search/replace
diff --git a/debian/patches/0009-decrease-animation-time.patch b/debian/patches/0009-decrease-animation-time.patch
index 95d94a3..3703b39 100644
--- a/debian/patches/0009-decrease-animation-time.patch
+++ b/debian/patches/0009-decrease-animation-time.patch
@@ -1,7 +1,7 @@
From d98b4392c64493316f3b7b899772e4411b346ee0 Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Fri, 20 Jan 2017 10:55:49 +0100
-Subject: [PATCH 09/10] decrease animation time
+Subject: [PATCH 09/11] decrease animation time
because 0.5s is too long
diff --git a/debian/patches/0010-use-only-app.js.patch b/debian/patches/0010-use-only-app.js.patch
index bbba831..1a818d0 100644
--- a/debian/patches/0010-use-only-app.js.patch
+++ b/debian/patches/0010-use-only-app.js.patch
@@ -1,7 +1,7 @@
From 821a87411fd75bc1137e99250689f21d820e49ed Mon Sep 17 00:00:00 2001
From: Dominik Csapak <d.csapak at proxmox.com>
Date: Tue, 16 May 2017 10:36:15 +0200
-Subject: [PATCH 10/10] use only app.js
+Subject: [PATCH 10/11] use only app.js
because we will use the commonjs version,
we only need to use the generated app.js
diff --git a/debian/patches/0011-show-local-cursor.patch b/debian/patches/0011-show-local-cursor.patch
new file mode 100644
index 0000000..2a2b43e
--- /dev/null
+++ b/debian/patches/0011-show-local-cursor.patch
@@ -0,0 +1,28 @@
+From a35e6724c5a600e5aa4deaadd1fe57d9a9896f70 Mon Sep 17 00:00:00 2001
+From: Dominik Csapak <d.csapak at proxmox.com>
+Date: Mon, 16 Jul 2018 17:02:15 +0200
+Subject: [PATCH 11/11] show local cursor
+
+Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
+---
+ core/rfb.js | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/core/rfb.js b/core/rfb.js
+index 6a1ff85..9eaacca 100644
+--- a/core/rfb.js
++++ b/core/rfb.js
+@@ -1242,7 +1242,9 @@ RFB.prototype = {
+
+ // Cursor will be server side until the server decides to honor
+ // our request and send over the cursor image
+- this._display.disableLocalCursor();
++
++ // we want to show the local cursor
++ //this._display.disableLocalCursor();
+
+ this._updateConnectionState('connected');
+ return true;
+--
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
index de6890a..3b7bd2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
0008-add-replaceable-snippets-in-vnc.html.patch
0009-decrease-animation-time.patch
0010-use-only-app.js.patch
+0011-show-local-cursor.patch
--
2.11.0
More information about the pve-devel
mailing list