[pve-devel] [PATCH novnc 0/2] novnc upgrade

[Thomas Lamprecht]

On 08/08/2017 12:50 PM, Dominik Csapak wrote:
> upgrade novnc to the latest commit
> (there were some changes related to qemu and keyboard input)
> 
> Dominik Csapak (2):
>    upgrade to latest commit
>    rebase patches on new commit
> 
>   debian/patches/0001-add-pve-specific-js-code.patch | 34 +++++++++++-----------
>   ...2-change-scaling-when-toggling-fullscreen.patch | 10 +++----
>   debian/patches/0003-add-pve-style.patch            |  6 ++--
>   debian/patches/0004-remove-vnc-logos.patch         |  6 ++--
>   ...-change-src-directory-for-images-js-files.patch | 14 ++++-----
>   debian/patches/0006-add-pve-vnc-commands.patch     |  6 ++--
>   ...0007-add-replaceable-snippets-in-vnc.html.patch |  6 ++--
>   debian/patches/0008-focus-canvas-after-load.patch  | 12 ++++----
>   debian/patches/0009-decrease-animation-time.patch  | 18 ++++++------
>   debian/patches/0010-use-only-app.js.patch          |  6 ++--
>   ...nd-height-to-vncproxy-call-in-console-tab.patch |  6 ++--
>   ...change-higlight-color-for-pressed-buttons.patch |  2 +-
>   novnc                                              |  2 +-
>   13 files changed, 64 insertions(+), 64 deletions(-)
> 

Tested, looks good.
Since you sent this a few things where applied upstream, nothing to big,
but if we update then maybe directly to latest master.

With the following patch on top of your series the current master
seems to work OK:

----8<----
diff --git a/debian/patches/0001-add-pve-specific-js-code.patch b/debian/patches/0001-add-pve-specific-js-code.patch
index b911a41..4db5b8f 100644
--- a/debian/patches/0001-add-pve-specific-js-code.patch
+++ b/debian/patches/0001-add-pve-specific-js-code.patch
@@ -512,7 +512,7 @@ index 11705a0..1a2d2b2 100644
 -        UI.initSetting('encrypt', (window.location.protocol === "https:"));
 +        UI.initSetting('encrypt', true);
          UI.initSetting('cursor', !isTouchDevice);
-         UI.initSetting('clip', false);
+         UI.initSetting('view_clip', false);
 -        UI.initSetting('resize', 'off');
 +      // we need updateSetting because
 +      // otherwise we load from browser storage
@@ -606,21 +606,23 @@ index 11705a0..1a2d2b2 100644
      setMouseButton: function(num) {
          var view_only = UI.rfb.get_view_only();
          if (UI.rfb && !view_only) {
-@@ -1673,8 +1712,16 @@ var UI = {
+@@ -1673,9 +1712,17 @@ var UI = {
      },

      updateSessionSize: function(rfb, width, height) {
 -        UI.updateViewClip();
+-        UI.updateScaling();
 -        UI.fixScrollbars();
 +      var resize = UI.getSetting('resize');
 +
 +      if (resize == 'null') {
-+          var clip = UI.getSetting('clip');
++          var clip = UI.getSetting('view_clip');
 +          UI.PVE.updateFBSize(rfb, width, height, clip);
 +      }
 +
 +      UI.applyResizeMode();
 +      UI.updateViewClip();
++      UI.updateScaling();
 +      UI.updateViewDrag();
      },

diff --git a/novnc b/novnc
index b5c982e..0242c03 160000
--- a/novnc
+++ b/novnc
@@ -1 +1 @@
-Subproject commit b5c982ea4207a711a6d335019eb890ac9c3a538c
+Subproject commit 0242c032807096a0e823418e39dec646ec025414
---->8----