Add helper for encoding enumeration and names

diff --git a/core/encodings.js b/core/encodings.js
new file mode 100644 (file)
index 0000000..3184ace
--- /dev/null
+++ b/core/encodings.js
@@ -0,0 +1,40 @@
+/*
+ * noVNC: HTML5 VNC client
+ * Copyright (C) 2017 Pierre Ossman for Cendio AB
+ * Licensed under MPL 2.0 (see LICENSE.txt)
+ *
+ * See README.md for usage and integration instructions.
+ */
+
+export var encodings = {
+    encodingRaw: 0,
+    encodingCopyRect: 1,
+    encodingRRE: 2,
+    encodingHextile: 5,
+    encodingTight: 7,
+
+    pseudoEncodingQualityLevel9: -23,
+    pseudoEncodingQualityLevel0: -32,
+    pseudoEncodingDesktopSize: -223,
+    pseudoEncodingLastRect: -224,
+    pseudoEncodingCursor: -239,
+    pseudoEncodingQEMUExtendedKeyEvent: -258,
+    pseudoEncodingTightPNG: -260,
+    pseudoEncodingExtendedDesktopSize: -308,
+    pseudoEncodingXvp: -309,
+    pseudoEncodingFence: -312,
+    pseudoEncodingContinuousUpdates: -313,
+    pseudoEncodingCompressLevel9: -247,
+    pseudoEncodingCompressLevel0: -256,
+}
+
+export function encodingName(num) {
+    switch (num) {
+        case encodings.encodingRaw:      return "Raw";
+        case encodings.encodingCopyRect: return "CopyRect";
+        case encodings.encodingRRE:      return "RRE";
+        case encodings.encodingHextile:  return "Hextile";
+        case encodings.encodingTight:    return "Tight";
+        default:                         return "[unknown encoding " + num + "]";
+    }
+}

diff --git a/core/rfb.js b/core/rfb.js
index 66910c38859622d9579561089c51c9c21c769b13..9a0e11aeda440090441d3ff26bab787f901147db 100644 (file)
--- a/core/rfb.js
+++ b/core/rfb.js
@@ -22,6 +22,7 @@ import DES from "./des.js";
 import KeyTable from "./input/keysym.js";
 import XtScancode from "./input/xtscancodes.js";
 import Inflator from "./inflator.js";
+import { encodings, encodingName } from "./encodings.js";
 
 /*jslint white: false, browser: true */
 /*global window, Util, Display, Keyboard, Mouse, Websock, Websock_native, Base64, DES, KeyTable, Inflator, XtScancode */
@@ -76,7 +77,6 @@ export default function RFB(defaults) {
     ];
 
     this._encHandlers = {};
-    this._encNames = {};
     this._encStats = {};
 
     this._sock = null;              // Websock object
@@ -183,7 +183,6 @@ export default function RFB(defaults) {
     // Create lookup tables based on encoding number
     for (var i = 0; i < this._encodings.length; i++) {
         this._encHandlers[this._encodings[i][1]] = this._encHandlers[this._encodings[i][0]];
-        this._encNames[this._encodings[i][1]] = this._encodings[i][0];
         this._encStats[this._encodings[i][1]] = [0, 0];
     }
 
@@ -445,14 +444,14 @@ RFB.prototype = {
         for (i = 0; i < this._encodings.length; i++) {
             s = this._encStats[this._encodings[i][1]];
             if (s[0] + s[1] > 0) {
-                Log.Info("    " + this._encodings[i][0] + ": " + s[0] + " rects");
+                Log.Info("    " + encodingName(this._encodings[i][1]) + ": " + s[0] + " rects");
             }
         }
 
         Log.Info("Encoding stats since page load:");
         for (i = 0; i < this._encodings.length; i++) {
             s = this._encStats[this._encodings[i][1]];
-            Log.Info("    " + this._encodings[i][0] + ": " + s[1] + " rects");
+            Log.Info("    " + encodingName(this._encodings[i][1]) + ": " + s[1] + " rects");
         }
     },
 
@@ -1348,7 +1347,8 @@ RFB.prototype = {
                     {'x': this._FBU.x, 'y': this._FBU.y,
                      'width': this._FBU.width, 'height': this._FBU.height,
                      'encoding': this._FBU.encoding,
-                     'encodingName': this._encNames[this._FBU.encoding]});
+                     'encodingName': encodingName(this._FBU.encoding)});
+            }
 
                 if (!this._encNames[this._FBU.encoding]) {
                     this._fail("Unexpected server message",
@@ -1405,7 +1405,7 @@ RFB.prototype = {
                 {'x': this._FBU.x, 'y': this._FBU.y,
                  'width': this._FBU.width, 'height': this._FBU.height,
                  'encoding': this._FBU.encoding,
-                 'encodingName': this._encNames[this._FBU.encoding]});
+                 'encodingName': encodingName(this._FBU.encoding)});
 
         return true;  // We finished this FBU
     },