@novnc/novnc 1.2.0-test → 1.3.0-g1075cd8

package/lib/decoders/zrle.js

@@ -0,0 +1,234 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _inflator = _interopRequireDefault(require("../inflator.js"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+
+var ZRLE_TILE_WIDTH = 64;
+var ZRLE_TILE_HEIGHT = 64;
+
+var ZRLEDecoder = /*#__PURE__*/function () {
+  function ZRLEDecoder() {
+    _classCallCheck(this, ZRLEDecoder);
+
+    this._length = 0;
+    this._inflator = new _inflator["default"]();
+    this._pixelBuffer = new Uint8Array(ZRLE_TILE_WIDTH * ZRLE_TILE_HEIGHT * 4);
+    this._tileBuffer = new Uint8Array(ZRLE_TILE_WIDTH * ZRLE_TILE_HEIGHT * 4);
+  }
+
+  _createClass(ZRLEDecoder, [{
+    key: "decodeRect",
+    value: function decodeRect(x, y, width, height, sock, display, depth) {
+      if (this._length === 0) {
+        if (sock.rQwait("ZLib data length", 4)) {
+          return false;
+        }
+
+        this._length = sock.rQshift32();
+      }
+
+      if (sock.rQwait("Zlib data", this._length)) {
+        return false;
+      }
+
+      var data = sock.rQshiftBytes(this._length);
+
+      this._inflator.setInput(data);
+
+      for (var ty = y; ty < y + height; ty += ZRLE_TILE_HEIGHT) {
+        var th = Math.min(ZRLE_TILE_HEIGHT, y + height - ty);
+
+        for (var tx = x; tx < x + width; tx += ZRLE_TILE_WIDTH) {
+          var tw = Math.min(ZRLE_TILE_WIDTH, x + width - tx);
+          var tileSize = tw * th;
+
+          var subencoding = this._inflator.inflate(1)[0];
+
+          if (subencoding === 0) {
+            // raw data
+            var _data = this._readPixels(tileSize);
+
+            display.blitImage(tx, ty, tw, th, _data, 0, false);
+          } else if (subencoding === 1) {
+            // solid
+            var background = this._readPixels(1);
+
+            display.fillRect(tx, ty, tw, th, [background[0], background[1], background[2]]);
+          } else if (subencoding >= 2 && subencoding <= 16) {
+            var _data2 = this._decodePaletteTile(subencoding, tileSize, tw, th);
+
+            display.blitImage(tx, ty, tw, th, _data2, 0, false);
+          } else if (subencoding === 128) {
+            var _data3 = this._decodeRLETile(tileSize);
+
+            display.blitImage(tx, ty, tw, th, _data3, 0, false);
+          } else if (subencoding >= 130 && subencoding <= 255) {
+            var _data4 = this._decodeRLEPaletteTile(subencoding - 128, tileSize);
+
+            display.blitImage(tx, ty, tw, th, _data4, 0, false);
+          } else {
+            throw new Error('Unknown subencoding: ' + subencoding);
+          }
+        }
+      }
+
+      this._length = 0;
+      return true;
+    }
+  }, {
+    key: "_getBitsPerPixelInPalette",
+    value: function _getBitsPerPixelInPalette(paletteSize) {
+      if (paletteSize <= 2) {
+        return 1;
+      } else if (paletteSize <= 4) {
+        return 2;
+      } else if (paletteSize <= 16) {
+        return 4;
+      }
+    }
+  }, {
+    key: "_readPixels",
+    value: function _readPixels(pixels) {
+      var data = this._pixelBuffer;
+
+      var buffer = this._inflator.inflate(3 * pixels);
+
+      for (var i = 0, j = 0; i < pixels * 4; i += 4, j += 3) {
+        data[i] = buffer[j];
+        data[i + 1] = buffer[j + 1];
+        data[i + 2] = buffer[j + 2];
+        data[i + 3] = 255; // Add the Alpha
+      }
+
+      return data;
+    }
+  }, {
+    key: "_decodePaletteTile",
+    value: function _decodePaletteTile(paletteSize, tileSize, tilew, tileh) {
+      var data = this._tileBuffer;
+
+      var palette = this._readPixels(paletteSize);
+
+      var bitsPerPixel = this._getBitsPerPixelInPalette(paletteSize);
+
+      var mask = (1 << bitsPerPixel) - 1;
+      var offset = 0;
+
+      var encoded = this._inflator.inflate(1)[0];
+
+      for (var y = 0; y < tileh; y++) {
+        var shift = 8 - bitsPerPixel;
+
+        for (var x = 0; x < tilew; x++) {
+          if (shift < 0) {
+            shift = 8 - bitsPerPixel;
+            encoded = this._inflator.inflate(1)[0];
+          }
+
+          var indexInPalette = encoded >> shift & mask;
+          data[offset] = palette[indexInPalette * 4];
+          data[offset + 1] = palette[indexInPalette * 4 + 1];
+          data[offset + 2] = palette[indexInPalette * 4 + 2];
+          data[offset + 3] = palette[indexInPalette * 4 + 3];
+          offset += 4;
+          shift -= bitsPerPixel;
+        }
+
+        if (shift < 8 - bitsPerPixel && y < tileh - 1) {
+          encoded = this._inflator.inflate(1)[0];
+        }
+      }
+
+      return data;
+    }
+  }, {
+    key: "_decodeRLETile",
+    value: function _decodeRLETile(tileSize) {
+      var data = this._tileBuffer;
+      var i = 0;
+
+      while (i < tileSize) {
+        var pixel = this._readPixels(1);
+
+        var length = this._readRLELength();
+
+        for (var j = 0; j < length; j++) {
+          data[i * 4] = pixel[0];
+          data[i * 4 + 1] = pixel[1];
+          data[i * 4 + 2] = pixel[2];
+          data[i * 4 + 3] = pixel[3];
+          i++;
+        }
+      }
+
+      return data;
+    }
+  }, {
+    key: "_decodeRLEPaletteTile",
+    value: function _decodeRLEPaletteTile(paletteSize, tileSize) {
+      var data = this._tileBuffer; // palette
+
+      var palette = this._readPixels(paletteSize);
+
+      var offset = 0;
+
+      while (offset < tileSize) {
+        var indexInPalette = this._inflator.inflate(1)[0];
+
+        var length = 1;
+
+        if (indexInPalette >= 128) {
+          indexInPalette -= 128;
+          length = this._readRLELength();
+        }
+
+        if (indexInPalette > paletteSize) {
+          throw new Error('Too big index in palette: ' + indexInPalette + ', palette size: ' + paletteSize);
+        }
+
+        if (offset + length > tileSize) {
+          throw new Error('Too big rle length in palette mode: ' + length + ', allowed length is: ' + (tileSize - offset));
+        }
+
+        for (var j = 0; j < length; j++) {
+          data[offset * 4] = palette[indexInPalette * 4];
+          data[offset * 4 + 1] = palette[indexInPalette * 4 + 1];
+          data[offset * 4 + 2] = palette[indexInPalette * 4 + 2];
+          data[offset * 4 + 3] = palette[indexInPalette * 4 + 3];
+          offset++;
+        }
+      }
+
+      return data;
+    }
+  }, {
+    key: "_readRLELength",
+    value: function _readRLELength() {
+      var length = 0;
+      var current = 0;
+
+      do {
+        current = this._inflator.inflate(1)[0];
+        length += current;
+      } while (current === 255);
+
+      return length + 1;
+    }
+  }]);
+
+  return ZRLEDecoder;
+}();
+
+exports["default"] = ZRLEDecoder;

package/lib/deflator.js

@@ -3,25 +3,25 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 var _deflate2 = require("../lib/vendor/pako/lib/zlib/deflate.js");
 
 var _zstream = _interopRequireDefault(require("../lib/vendor/pako/lib/zlib/zstream.js"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 var Deflator = /*#__PURE__*/function () {
   function Deflator() {
     _classCallCheck(this, Deflator);
 
-    this.strm = new _zstream.default();
+    this.strm = new _zstream["default"]();
     this.chunkSize = 1024 * 10 * 10;
     this.outputBuffer = new Uint8Array(this.chunkSize);
     this.windowBits = 5;
@@ -96,4 +96,4 @@ var Deflator = /*#__PURE__*/function () {
   return Deflator;
 }();
 
-exports.default = Deflator;
+exports["default"] = Deflator;

package/lib/des.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 /*
  * Ported from Flashlight VNC ActionScript implementation:
@@ -311,4 +311,4 @@ var DES = /*#__PURE__*/function () {
   return DES;
 }();
 
-exports.default = DES;
+exports["default"] = DES;

package/lib/display.js

@@ -1,31 +1,29 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 var Log = _interopRequireWildcard(require("./util/logging.js"));
 
 var _base = _interopRequireDefault(require("./base64.js"));
 
-var _browser = require("./util/browser.js");
-
 var _int = require("./util/int.js");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 var Display = /*#__PURE__*/function () {
   function Display(target) {
@@ -39,10 +37,6 @@ var Display = /*#__PURE__*/function () {
     this._fbWidth = 0;
     this._fbHeight = 0;
     this._prevDrawStyle = "";
-    this._tile = null;
-    this._tile16x16 = null;
-    this._tileX = 0;
-    this._tileY = 0;
     Log.Debug(">> Display.constructor"); // The visible canvas
 
     this._target = target;
@@ -76,13 +70,7 @@ var Display = /*#__PURE__*/function () {
       right: this._backbuffer.width,
       bottom: this._backbuffer.height
     };
-    Log.Debug("User Agent: " + navigator.userAgent); // Check canvas features
-
-    if (!('createImageData' in this._drawCtx)) {
-      throw new Error("Canvas does not support createImageData");
-    }
-
-    this._tile16x16 = this._drawCtx.createImageData(16, 16);
+    Log.Debug("User Agent: " + navigator.userAgent);
     Log.Debug("<< Display.constructor"); // ===== PROPERTIES =====
 
     this._scale = 1.0;
@@ -94,8 +82,38 @@ var Display = /*#__PURE__*/function () {
 
 
   _createClass(Display, [{
+    key: "scale",
+    get: function get() {
+      return this._scale;
+    },
+    set: function set(scale) {
+      this._rescale(scale);
+    }
+  }, {
+    key: "clipViewport",
+    get: function get() {
+      return this._clipViewport;
+    },
+    set: function set(viewport) {
+      this._clipViewport = viewport; // May need to readjust the viewport dimensions
+
+      var vp = this._viewportLoc;
+      this.viewportChangeSize(vp.w, vp.h);
+      this.viewportChangePos(0, 0);
+    }
+  }, {
+    key: "width",
+    get: function get() {
+      return this._fbWidth;
+    }
+  }, {
+    key: "height",
+    get: function get() {
+      return this._fbHeight;
+    } // ===== PUBLIC METHODS =====
+
+  }, {
     key: "viewportChangePos",
-    // ===== PUBLIC METHODS =====
     value: function viewportChangePos(deltaX, deltaY) {
       var vp = this._viewportLoc;
       deltaX = Math.floor(deltaX);
@@ -371,7 +389,7 @@ var Display = /*#__PURE__*/function () {
       }
 
       var img = new Image();
-      img.src = "data: " + mime + ";base64," + _base.default.encode(arr);
+      img.src = "data: " + mime + ";base64," + _base["default"].encode(arr);
 
       this._renderQPush({
         'type': 'img',
@@ -381,61 +399,6 @@ var Display = /*#__PURE__*/function () {
         'width': width,
         'height': height
       });
-    } // start updating a tile
-
-  }, {
-    key: "startTile",
-    value: function startTile(x, y, width, height, color) {
-      this._tileX = x;
-      this._tileY = y;
-
-      if (width === 16 && height === 16) {
-        this._tile = this._tile16x16;
-      } else {
-        this._tile = this._drawCtx.createImageData(width, height);
-      }
-
-      var red = color[2];
-      var green = color[1];
-      var blue = color[0];
-      var data = this._tile.data;
-
-      for (var i = 0; i < width * height * 4; i += 4) {
-        data[i] = red;
-        data[i + 1] = green;
-        data[i + 2] = blue;
-        data[i + 3] = 255;
-      }
-    } // update sub-rectangle of the current tile
-
-  }, {
-    key: "subTile",
-    value: function subTile(x, y, w, h, color) {
-      var red = color[2];
-      var green = color[1];
-      var blue = color[0];
-      var xend = x + w;
-      var yend = y + h;
-      var data = this._tile.data;
-      var width = this._tile.width;
-
-      for (var j = y; j < yend; j++) {
-        for (var i = x; i < xend; i++) {
-          var p = (i + j * width) * 4;
-          data[p] = red;
-          data[p + 1] = green;
-          data[p + 2] = blue;
-          data[p + 3] = 255;
-        }
-      }
-    } // draw the current tile to the screen
-
-  }, {
-    key: "finishTile",
-    value: function finishTile() {
-      this._drawCtx.putImageData(this._tile, this._tileX, this._tileY);
-
-      this._damage(this._tileX, this._tileY, this._tile.width, this._tile.height);
     }
   }, {
     key: "blitImage",
@@ -456,51 +419,13 @@ var Display = /*#__PURE__*/function () {
           'height': height
         });
       } else {
-        this._bgrxImageData(x, y, width, height, arr, offset);
-      }
-    }
-  }, {
-    key: "blitRgbImage",
-    value: function blitRgbImage(x, y, width, height, arr, offset, fromQueue) {
-      if (this._renderQ.length !== 0 && !fromQueue) {
-        // NB(directxman12): it's technically more performant here to use preallocated arrays,
-        // but it's a lot of extra work for not a lot of payoff -- if we're using the render queue,
-        // this probably isn't getting called *nearly* as much
-        var newArr = new Uint8Array(width * height * 3);
-        newArr.set(new Uint8Array(arr.buffer, 0, newArr.length));
+        // NB(directxman12): arr must be an Type Array view
+        var data = new Uint8ClampedArray(arr.buffer, arr.byteOffset + offset, width * height * 4);
+        var img = new ImageData(data, width, height);
 
-        this._renderQPush({
-          'type': 'blitRgb',
-          'data': newArr,
-          'x': x,
-          'y': y,
-          'width': width,
-          'height': height
-        });
-      } else {
-        this._rgbImageData(x, y, width, height, arr, offset);
-      }
-    }
-  }, {
-    key: "blitRgbxImage",
-    value: function blitRgbxImage(x, y, width, height, arr, offset, fromQueue) {
-      if (this._renderQ.length !== 0 && !fromQueue) {
-        // NB(directxman12): it's technically more performant here to use preallocated arrays,
-        // but it's a lot of extra work for not a lot of payoff -- if we're using the render queue,
-        // this probably isn't getting called *nearly* as much
-        var newArr = new Uint8Array(width * height * 4);
-        newArr.set(new Uint8Array(arr.buffer, 0, newArr.length));
+        this._drawCtx.putImageData(img, x, y);
 
-        this._renderQPush({
-          'type': 'blitRgbx',
-          'data': newArr,
-          'x': x,
-          'y': y,
-          'width': width,
-          'height': height
-        });
-      } else {
-        this._rgbxImageData(x, y, width, height, arr, offset);
+        this._damage(x, y, width, height);
       }
     }
   }, {
@@ -552,66 +477,13 @@ var Display = /*#__PURE__*/function () {
   }, {
     key: "_setFillColor",
     value: function _setFillColor(color) {
-      var newStyle = 'rgb(' + color[2] + ',' + color[1] + ',' + color[0] + ')';
+      var newStyle = 'rgb(' + color[0] + ',' + color[1] + ',' + color[2] + ')';
 
       if (newStyle !== this._prevDrawStyle) {
         this._drawCtx.fillStyle = newStyle;
         this._prevDrawStyle = newStyle;
       }
     }
-  }, {
-    key: "_rgbImageData",
-    value: function _rgbImageData(x, y, width, height, arr, offset) {
-      var img = this._drawCtx.createImageData(width, height);
-
-      var data = img.data;
-
-      for (var i = 0, j = offset; i < width * height * 4; i += 4, j += 3) {
-        data[i] = arr[j];
-        data[i + 1] = arr[j + 1];
-        data[i + 2] = arr[j + 2];
-        data[i + 3] = 255; // Alpha
-      }
-
-      this._drawCtx.putImageData(img, x, y);
-
-      this._damage(x, y, img.width, img.height);
-    }
-  }, {
-    key: "_bgrxImageData",
-    value: function _bgrxImageData(x, y, width, height, arr, offset) {
-      var img = this._drawCtx.createImageData(width, height);
-
-      var data = img.data;
-
-      for (var i = 0, j = offset; i < width * height * 4; i += 4, j += 4) {
-        data[i] = arr[j + 2];
-        data[i + 1] = arr[j + 1];
-        data[i + 2] = arr[j];
-        data[i + 3] = 255; // Alpha
-      }
-
-      this._drawCtx.putImageData(img, x, y);
-
-      this._damage(x, y, img.width, img.height);
-    }
-  }, {
-    key: "_rgbxImageData",
-    value: function _rgbxImageData(x, y, width, height, arr, offset) {
-      // NB(directxman12): arr must be an Type Array view
-      var img;
-
-      if (_browser.supportsImageMetadata) {
-        img = new ImageData(new Uint8ClampedArray(arr.buffer, arr.byteOffset, width * height * 4), width, height);
-      } else {
-        img = this._drawCtx.createImageData(width, height);
-        img.data.set(new Uint8ClampedArray(arr.buffer, arr.byteOffset, width * height * 4));
-      }
-
-      this._drawCtx.putImageData(img, x, y);
-
-      this._damage(x, y, img.width, img.height);
-    }
   }, {
     key: "_renderQPush",
     value: function _renderQPush(action) {
@@ -657,17 +529,8 @@ var Display = /*#__PURE__*/function () {
             this.blitImage(a.x, a.y, a.width, a.height, a.data, 0, true);
             break;
 
-          case 'blitRgb':
-            this.blitRgbImage(a.x, a.y, a.width, a.height, a.data, 0, true);
-            break;
-
-          case 'blitRgbx':
-            this.blitRgbxImage(a.x, a.y, a.width, a.height, a.data, 0, true);
-            break;
-
           case 'img':
-            /* IE tends to set "complete" prematurely, so check dimensions */
-            if (a.img.complete && a.img.width !== 0 && a.img.height !== 0) {
+            if (a.img.complete) {
               if (a.img.width !== a.width || a.img.height !== a.height) {
                 Log.Error("Decoded image has incorrect dimensions. Got " + a.img.width + "x" + a.img.height + ". Expected " + a.width + "x" + a.height + ".");
                 return;
@@ -695,39 +558,9 @@ var Display = /*#__PURE__*/function () {
         this.onflush();
       }
     }
-  }, {
-    key: "scale",
-    get: function get() {
-      return this._scale;
-    },
-    set: function set(scale) {
-      this._rescale(scale);
-    }
-  }, {
-    key: "clipViewport",
-    get: function get() {
-      return this._clipViewport;
-    },
-    set: function set(viewport) {
-      this._clipViewport = viewport; // May need to readjust the viewport dimensions
-
-      var vp = this._viewportLoc;
-      this.viewportChangeSize(vp.w, vp.h);
-      this.viewportChangePos(0, 0);
-    }
-  }, {
-    key: "width",
-    get: function get() {
-      return this._fbWidth;
-    }
-  }, {
-    key: "height",
-    get: function get() {
-      return this._fbHeight;
-    }
   }]);
 
   return Display;
 }();
 
-exports.default = Display;
+exports["default"] = Display;

package/lib/encodings.js

@@ -19,7 +19,9 @@ var encodings = {
   encodingRRE: 2,
   encodingHextile: 5,
   encodingTight: 7,
+  encodingZRLE: 16,
   encodingTightPNG: -260,
+  encodingJPEG: 21,
   pseudoEncodingQualityLevel9: -23,
   pseudoEncodingQualityLevel0: -32,
   pseudoEncodingDesktopSize: -223,
@@ -55,9 +57,15 @@ function encodingName(num) {
     case encodings.encodingTight:
       return "Tight";
 
+    case encodings.encodingZRLE:
+      return "ZRLE";
+
     case encodings.encodingTightPNG:
       return "TightPNG";
 
+    case encodings.encodingJPEG:
+      return "JPEG";
+
     default:
       return "[unknown encoding " + num + "]";
   }