@novnc/novnc 1.3.0-g2f1e11b → 1.3.0-g30f230b

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (53) hide show
  1. package/core/display.js +12 -0
  2. package/core/input/keyboard.js +10 -0
  3. package/core/rfb.js +33 -4
  4. package/core/util/cursor.js +4 -0
  5. package/docs/API.md +61 -0
  6. package/lib/base64.js +19 -33
  7. package/lib/decoders/copyrect.js +4 -11
  8. package/lib/decoders/hextile.js +16 -46
  9. package/lib/decoders/jpeg.js +4 -43
  10. package/lib/decoders/raw.js +8 -21
  11. package/lib/decoders/rre.js +4 -15
  12. package/lib/decoders/tight.js +12 -78
  13. package/lib/decoders/tightpng.js +3 -23
  14. package/lib/decoders/zrle.js +6 -52
  15. package/lib/deflator.js +8 -22
  16. package/lib/des.js +23 -36
  17. package/lib/display.js +61 -107
  18. package/lib/encodings.js +1 -10
  19. package/lib/inflator.js +5 -18
  20. package/lib/input/domkeytable.js +77 -48
  21. package/lib/input/fixedkeys.js +8 -3
  22. package/lib/input/gesturehandler.js +85 -152
  23. package/lib/input/keyboard.js +61 -90
  24. package/lib/input/keysym.js +14 -270
  25. package/lib/input/keysymdef.js +5 -7
  26. package/lib/input/util.js +42 -84
  27. package/lib/input/vkeys.js +0 -3
  28. package/lib/input/xtscancodes.js +1 -168
  29. package/lib/ra2.js +501 -755
  30. package/lib/rfb.js +387 -1006
  31. package/lib/util/browser.js +16 -25
  32. package/lib/util/cursor.js +28 -65
  33. package/lib/util/element.js +3 -5
  34. package/lib/util/events.js +23 -30
  35. package/lib/util/eventtarget.js +4 -13
  36. package/lib/util/int.js +1 -2
  37. package/lib/util/logging.js +1 -19
  38. package/lib/util/md5.js +10 -36
  39. package/lib/util/strings.js +3 -5
  40. package/lib/vendor/pako/lib/utils/common.js +8 -17
  41. package/lib/vendor/pako/lib/zlib/adler32.js +3 -7
  42. package/lib/vendor/pako/lib/zlib/constants.js +2 -5
  43. package/lib/vendor/pako/lib/zlib/crc32.js +5 -12
  44. package/lib/vendor/pako/lib/zlib/deflate.js +212 -617
  45. package/lib/vendor/pako/lib/zlib/gzheader.js +1 -13
  46. package/lib/vendor/pako/lib/zlib/inffast.js +60 -176
  47. package/lib/vendor/pako/lib/zlib/inflate.js +397 -887
  48. package/lib/vendor/pako/lib/zlib/inftrees.js +62 -168
  49. package/lib/vendor/pako/lib/zlib/messages.js +1 -11
  50. package/lib/vendor/pako/lib/zlib/trees.js +245 -587
  51. package/lib/vendor/pako/lib/zlib/zstream.js +2 -18
  52. package/lib/websock.js +36 -87
  53. package/package.json +31 -31
package/core/display.js CHANGED
@@ -224,6 +224,18 @@ export default class Display {
224
224
  this.viewportChangePos(0, 0);
225
225
  }
226
226
 
227
+ getImageData() {
228
+ return this._drawCtx.getImageData(0, 0, this.width, this.height);
229
+ }
230
+
231
+ toDataURL(type, encoderOptions) {
232
+ return this._backbuffer.toDataURL(type, encoderOptions);
233
+ }
234
+
235
+ toBlob(callback, type, quality) {
236
+ return this._backbuffer.toBlob(callback, type, quality);
237
+ }
238
+
227
239
  // Track what parts of the visible canvas that need updating
228
240
  _damage(x, y, w, h) {
229
241
  if (x < this._damageBounds.left) {
@@ -153,6 +153,16 @@ export default class Keyboard {
153
153
  keysym = this._keyDownList[code];
154
154
  }
155
155
 
156
+ // macOS doesn't send proper key releases if a key is pressed
157
+ // while meta is held down
158
+ if ((browser.isMac() || browser.isIOS()) &&
159
+ (e.metaKey && code !== 'MetaLeft' && code !== 'MetaRight')) {
160
+ this._sendKeyEvent(keysym, code, true);
161
+ this._sendKeyEvent(keysym, code, false);
162
+ stopEvent(e);
163
+ return;
164
+ }
165
+
156
166
  // macOS doesn't send proper key events for modifiers, only
157
167
  // state change events. That gets extra confusing for CapsLock
158
168
  // which toggles on each press, but not on release. So pretend
package/core/rfb.js CHANGED
@@ -490,16 +490,45 @@ export default class RFB extends EventTargetMixin {
490
490
  this._clipboardText = text;
491
491
  RFB.messages.extendedClipboardNotify(this._sock, [extendedClipboardFormatText]);
492
492
  } else {
493
- let data = new Uint8Array(text.length);
494
- for (let i = 0; i < text.length; i++) {
495
- // FIXME: text can have values outside of Latin1/Uint8
496
- data[i] = text.charCodeAt(i);
493
+ let length, i;
494
+ let data;
495
+
496
+ length = 0;
497
+ // eslint-disable-next-line no-unused-vars
498
+ for (let codePoint of text) {
499
+ length++;
500
+ }
501
+
502
+ data = new Uint8Array(length);
503
+
504
+ i = 0;
505
+ for (let codePoint of text) {
506
+ let code = codePoint.codePointAt(0);
507
+
508
+ /* Only ISO 8859-1 is supported */
509
+ if (code > 0xff) {
510
+ code = 0x3f; // '?'
511
+ }
512
+
513
+ data[i++] = code;
497
514
  }
498
515
 
499
516
  RFB.messages.clientCutText(this._sock, data);
500
517
  }
501
518
  }
502
519
 
520
+ getImageData() {
521
+ return this._display.getImageData();
522
+ }
523
+
524
+ toDataURL(type, encoderOptions) {
525
+ return this._display.toDataURL(type, encoderOptions);
526
+ }
527
+
528
+ toBlob(callback, type, quality) {
529
+ return this._display.toBlob(callback, type, quality);
530
+ }
531
+
503
532
  // ===== PRIVATE METHODS =====
504
533
 
505
534
  _connect() {
@@ -18,6 +18,10 @@ export default class Cursor {
18
18
  this._canvas.style.position = 'fixed';
19
19
  this._canvas.style.zIndex = '65535';
20
20
  this._canvas.style.pointerEvents = 'none';
21
+ // Safari on iOS can select the cursor image
22
+ // https://bugs.webkit.org/show_bug.cgi?id=249223
23
+ this._canvas.style.userSelect = 'none';
24
+ this._canvas.style.WebkitUserSelect = 'none';
21
25
  // Can't use "display" because of Firefox bug #1445997
22
26
  this._canvas.style.visibility = 'hidden';
23
27
  }
package/docs/API.md CHANGED
@@ -155,6 +155,15 @@ protocol stream.
155
155
  [`RFB.clipboardPasteFrom()`](#rfbclipboardpastefrom)
156
156
  - Send clipboard contents to server.
157
157
 
158
+ [`RFB.getImageData()`](#rfbgetimagedata)
159
+ - Return the current content of the screen as an ImageData array.
160
+
161
+ [`RFB.toDataURL()`](#rfbtodataurl)
162
+ - Return the current content of the screen as data-url encoded image file.
163
+
164
+ [`RFB.toBlob()`](#rfbtoblob)
165
+ - Return the current content of the screen as Blob encoded image file.
166
+
158
167
  ### Details
159
168
 
160
169
  #### RFB()
@@ -423,3 +432,55 @@ to the remote server.
423
432
 
424
433
  **`text`**
425
434
  - A `DOMString` specifying the clipboard data to send.
435
+
436
+ #### RFB.getImageData()
437
+
438
+ The `RFB.getImageData()` method is used to return the current content of the
439
+ screen encoded as [`ImageData`](https://developer.mozilla.org/en-US/docs/Web/API/ImageData).
440
+
441
+ ##### Syntax
442
+
443
+ RFB.getImageData();
444
+
445
+ #### RFB.toDataURL()
446
+
447
+ The `RFB.toDataURL()` method is used to return the current content of the
448
+ screen encoded as a data URL that could for example be put in the `src` attribute
449
+ of an `img` tag.
450
+
451
+ ##### Syntax
452
+
453
+ RFB.toDataURL();
454
+ RFB.toDataURL(type);
455
+ RFB.toDataURL(type, encoderOptions);
456
+
457
+ ###### Parameters
458
+
459
+ **`type`** *Optional*
460
+ - A string indicating the requested MIME type of the image
461
+
462
+ **`encoderOptions`** *Optional*
463
+ - A number between 0 and 1 indicating the image quality.
464
+
465
+ #### RFB.toBlob()
466
+
467
+ The `RFB.toBlob()` method is used to return the current content of the
468
+ screen encoded as [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob).
469
+
470
+ ##### Syntax
471
+
472
+ RFB.toDataURL(callback);
473
+ RFB.toDataURL(callback, type);
474
+ RFB.toDataURL(callback, type, quality);
475
+
476
+ ###### Parameters
477
+
478
+ **`callback`**
479
+ - A callback function which will receive the resulting [`Blob`](https://developer.mozilla.org/en-US/docs/Web/API/Blob)
480
+ as the single argument
481
+
482
+ **`type`** *Optional*
483
+ - A string indicating the requested MIME type of the image
484
+
485
+ **`encoderOptions`** *Optional*
486
+ - A number between 0 and 1 indicating the image quality.
package/lib/base64.js CHANGED
@@ -1,18 +1,13 @@
1
1
  "use strict";
2
2
 
3
3
  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); }
4
-
5
4
  Object.defineProperty(exports, "__esModule", {
6
5
  value: true
7
6
  });
8
7
  exports["default"] = void 0;
9
-
10
8
  var Log = _interopRequireWildcard(require("./util/logging.js"));
11
-
12
9
  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); }
13
-
14
10
  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; }
15
-
16
11
  /* This Source Code Form is subject to the terms of the Mozilla Public
17
12
  * License, v. 2.0. If a copy of the MPL was not distributed with this
18
13
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -26,18 +21,18 @@ var _default = {
26
21
 
27
22
  var result = '';
28
23
  var length = data.length;
29
- var lengthpad = length % 3; // Convert every three bytes to 4 ascii characters.
24
+ var lengthpad = length % 3;
25
+ // Convert every three bytes to 4 ascii characters.
30
26
 
31
27
  for (var i = 0; i < length - 2; i += 3) {
32
28
  result += this.toBase64Table[data[i] >> 2];
33
29
  result += this.toBase64Table[((data[i] & 0x03) << 4) + (data[i + 1] >> 4)];
34
30
  result += this.toBase64Table[((data[i + 1] & 0x0f) << 2) + (data[i + 2] >> 6)];
35
31
  result += this.toBase64Table[data[i + 2] & 0x3f];
36
- } // Convert the remaining 1 or 2 bytes, pad out to 4 characters.
37
-
32
+ }
38
33
 
34
+ // Convert the remaining 1 or 2 bytes, pad out to 4 characters.
39
35
  var j = length - lengthpad;
40
-
41
36
  if (lengthpad === 2) {
42
37
  result += this.toBase64Table[data[j] >> 2];
43
38
  result += this.toBase64Table[((data[j] & 0x03) << 4) + (data[j + 1] >> 4)];
@@ -49,67 +44,58 @@ var _default = {
49
44
  result += this.toBase64Table[64];
50
45
  result += this.toBase64Table[64];
51
46
  }
52
-
53
47
  return result;
54
48
  },
55
-
56
49
  /* Convert Base64 data to a string */
57
-
58
50
  /* eslint-disable comma-spacing */
59
51
  toBinaryTable: [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, 0, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1],
60
-
61
- /* eslint-enable comma-spacing */
62
- decode: function decode(data) {
52
+ /* eslint-enable comma-spacing */decode: function decode(data) {
63
53
  var offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
64
54
  var dataLength = data.indexOf('=') - offset;
65
-
66
55
  if (dataLength < 0) {
67
56
  dataLength = data.length - offset;
68
57
  }
69
- /* Every four characters is 3 resulting numbers */
70
-
71
58
 
59
+ /* Every four characters is 3 resulting numbers */
72
60
  var resultLength = (dataLength >> 2) * 3 + Math.floor(dataLength % 4 / 1.5);
73
- var result = new Array(resultLength); // Convert one by one.
61
+ var result = new Array(resultLength);
74
62
 
75
- var leftbits = 0; // number of bits decoded, but yet to be appended
63
+ // Convert one by one.
76
64
 
65
+ var leftbits = 0; // number of bits decoded, but yet to be appended
77
66
  var leftdata = 0; // bits decoded, but yet to be appended
78
-
79
67
  for (var idx = 0, i = offset; i < data.length; i++) {
80
68
  var c = this.toBinaryTable[data.charCodeAt(i) & 0x7f];
81
- var padding = data.charAt(i) === this.base64Pad; // Skip illegal characters and whitespace
82
-
69
+ var padding = data.charAt(i) === this.base64Pad;
70
+ // Skip illegal characters and whitespace
83
71
  if (c === -1) {
84
72
  Log.Error("Illegal character code " + data.charCodeAt(i) + " at position " + i);
85
73
  continue;
86
- } // Collect data into leftdata, update bitcount
87
-
74
+ }
88
75
 
76
+ // Collect data into leftdata, update bitcount
89
77
  leftdata = leftdata << 6 | c;
90
- leftbits += 6; // If we have 8 or more bits, append 8 bits to the result
78
+ leftbits += 6;
91
79
 
80
+ // If we have 8 or more bits, append 8 bits to the result
92
81
  if (leftbits >= 8) {
93
- leftbits -= 8; // Append if not padding.
94
-
82
+ leftbits -= 8;
83
+ // Append if not padding.
95
84
  if (!padding) {
96
85
  result[idx++] = leftdata >> leftbits & 0xff;
97
86
  }
98
-
99
87
  leftdata &= (1 << leftbits) - 1;
100
88
  }
101
- } // If there are any bits left, the base64 string was corrupted
102
-
89
+ }
103
90
 
91
+ // If there are any bits left, the base64 string was corrupted
104
92
  if (leftbits) {
105
93
  var err = new Error('Corrupted base64 string');
106
94
  err.name = 'Base64-Error';
107
95
  throw err;
108
96
  }
109
-
110
97
  return result;
111
98
  }
112
99
  };
113
100
  /* End of Base64 namespace */
114
-
115
101
  exports["default"] = _default;
@@ -4,13 +4,12 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports["default"] = void 0;
7
-
7
+ 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); }
8
8
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
9
-
10
- 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); } }
11
-
9
+ 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, _toPropertyKey(descriptor.key), descriptor); } }
12
10
  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
13
-
11
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
12
+ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
14
13
  /*
15
14
  * noVNC: HTML5 VNC client
16
15
  * Copyright (C) 2019 The noVNC Authors
@@ -23,27 +22,21 @@ var CopyRectDecoder = /*#__PURE__*/function () {
23
22
  function CopyRectDecoder() {
24
23
  _classCallCheck(this, CopyRectDecoder);
25
24
  }
26
-
27
25
  _createClass(CopyRectDecoder, [{
28
26
  key: "decodeRect",
29
27
  value: function decodeRect(x, y, width, height, sock, display, depth) {
30
28
  if (sock.rQwait("COPYRECT", 4)) {
31
29
  return false;
32
30
  }
33
-
34
31
  var deltaX = sock.rQshift16();
35
32
  var deltaY = sock.rQshift16();
36
-
37
33
  if (width === 0 || height === 0) {
38
34
  return true;
39
35
  }
40
-
41
36
  display.copyImage(deltaX, deltaY, x, y, width, height);
42
37
  return true;
43
38
  }
44
39
  }]);
45
-
46
40
  return CopyRectDecoder;
47
41
  }();
48
-
49
42
  exports["default"] = CopyRectDecoder;
@@ -1,33 +1,25 @@
1
1
  "use strict";
2
2
 
3
- 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); }
4
-
5
3
  Object.defineProperty(exports, "__esModule", {
6
4
  value: true
7
5
  });
8
6
  exports["default"] = void 0;
9
-
10
7
  var Log = _interopRequireWildcard(require("../util/logging.js"));
11
-
12
8
  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); }
13
-
14
9
  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; }
15
-
10
+ 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); }
16
11
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
17
-
18
- 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); } }
19
-
12
+ 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, _toPropertyKey(descriptor.key), descriptor); } }
20
13
  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
21
-
14
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
15
+ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
22
16
  var HextileDecoder = /*#__PURE__*/function () {
23
17
  function HextileDecoder() {
24
18
  _classCallCheck(this, HextileDecoder);
25
-
26
19
  this._tiles = 0;
27
20
  this._lastsubencoding = 0;
28
21
  this._tileBuffer = new Uint8Array(16 * 16 * 4);
29
22
  }
30
-
31
23
  _createClass(HextileDecoder, [{
32
24
  key: "decodeRect",
33
25
  value: function decodeRect(x, y, width, height, sock, display, depth) {
@@ -37,31 +29,27 @@ var HextileDecoder = /*#__PURE__*/function () {
37
29
  this._totalTiles = this._tilesX * this._tilesY;
38
30
  this._tiles = this._totalTiles;
39
31
  }
40
-
41
32
  while (this._tiles > 0) {
42
33
  var bytes = 1;
43
-
44
34
  if (sock.rQwait("HEXTILE", bytes)) {
45
35
  return false;
46
36
  }
47
-
48
37
  var rQ = sock.rQ;
49
38
  var rQi = sock.rQi;
50
39
  var subencoding = rQ[rQi]; // Peek
51
-
52
40
  if (subencoding > 30) {
53
41
  // Raw
54
42
  throw new Error("Illegal hextile subencoding (subencoding: " + subencoding + ")");
55
43
  }
56
-
57
44
  var currTile = this._totalTiles - this._tiles;
58
45
  var tileX = currTile % this._tilesX;
59
46
  var tileY = Math.floor(currTile / this._tilesX);
60
47
  var tx = x + tileX * 16;
61
48
  var ty = y + tileY * 16;
62
49
  var tw = Math.min(16, x + width - tx);
63
- var th = Math.min(16, y + height - ty); // Figure out how much we are expecting
50
+ var th = Math.min(16, y + height - ty);
64
51
 
52
+ // Figure out how much we are expecting
65
53
  if (subencoding & 0x01) {
66
54
  // Raw
67
55
  bytes += tw * th * 4;
@@ -70,12 +58,10 @@ var HextileDecoder = /*#__PURE__*/function () {
70
58
  // Background
71
59
  bytes += 4;
72
60
  }
73
-
74
61
  if (subencoding & 0x04) {
75
62
  // Foreground
76
63
  bytes += 4;
77
64
  }
78
-
79
65
  if (subencoding & 0x08) {
80
66
  // AnySubrects
81
67
  bytes++; // Since we aren't shifting it off
@@ -83,9 +69,7 @@ var HextileDecoder = /*#__PURE__*/function () {
83
69
  if (sock.rQwait("HEXTILE", bytes)) {
84
70
  return false;
85
71
  }
86
-
87
72
  var subrects = rQ[rQi + bytes - 1]; // Peek
88
-
89
73
  if (subencoding & 0x10) {
90
74
  // SubrectsColoured
91
75
  bytes += subrects * (4 + 2);
@@ -94,14 +78,12 @@ var HextileDecoder = /*#__PURE__*/function () {
94
78
  }
95
79
  }
96
80
  }
97
-
98
81
  if (sock.rQwait("HEXTILE", bytes)) {
99
82
  return false;
100
- } // We know the encoding and have a whole tile
101
-
83
+ }
102
84
 
85
+ // We know the encoding and have a whole tile
103
86
  rQi++;
104
-
105
87
  if (subencoding === 0) {
106
88
  if (this._lastsubencoding & 0x01) {
107
89
  // Weird: ignore blanks are RAW
@@ -111,12 +93,11 @@ var HextileDecoder = /*#__PURE__*/function () {
111
93
  }
112
94
  } else if (subencoding & 0x01) {
113
95
  // Raw
114
- var pixels = tw * th; // Max sure the image is fully opaque
115
-
96
+ var pixels = tw * th;
97
+ // Max sure the image is fully opaque
116
98
  for (var i = 0; i < pixels; i++) {
117
99
  rQ[rQi + i * 4 + 3] = 255;
118
100
  }
119
-
120
101
  display.blitImage(tx, ty, tw, th, rQ, rQi);
121
102
  rQi += bytes - 1;
122
103
  } else {
@@ -125,23 +106,18 @@ var HextileDecoder = /*#__PURE__*/function () {
125
106
  this._background = [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
126
107
  rQi += 4;
127
108
  }
128
-
129
109
  if (subencoding & 0x04) {
130
110
  // Foreground
131
111
  this._foreground = [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
132
112
  rQi += 4;
133
113
  }
134
-
135
114
  this._startTile(tx, ty, tw, th, this._background);
136
-
137
115
  if (subencoding & 0x08) {
138
116
  // AnySubrects
139
117
  var _subrects = rQ[rQi];
140
118
  rQi++;
141
-
142
119
  for (var s = 0; s < _subrects; s++) {
143
120
  var color = void 0;
144
-
145
121
  if (subencoding & 0x10) {
146
122
  // SubrectsColoured
147
123
  color = [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
@@ -149,7 +125,6 @@ var HextileDecoder = /*#__PURE__*/function () {
149
125
  } else {
150
126
  color = this._foreground;
151
127
  }
152
-
153
128
  var xy = rQ[rQi];
154
129
  rQi++;
155
130
  var sx = xy >> 4;
@@ -158,22 +133,19 @@ var HextileDecoder = /*#__PURE__*/function () {
158
133
  rQi++;
159
134
  var sw = (wh >> 4) + 1;
160
135
  var sh = (wh & 0x0f) + 1;
161
-
162
136
  this._subTile(sx, sy, sw, sh, color);
163
137
  }
164
138
  }
165
-
166
139
  this._finishTile(display);
167
140
  }
168
-
169
141
  sock.rQi = rQi;
170
142
  this._lastsubencoding = subencoding;
171
143
  this._tiles--;
172
144
  }
173
-
174
145
  return true;
175
- } // start updating a tile
146
+ }
176
147
 
148
+ // start updating a tile
177
149
  }, {
178
150
  key: "_startTile",
179
151
  value: function _startTile(x, y, width, height, color) {
@@ -185,15 +157,15 @@ var HextileDecoder = /*#__PURE__*/function () {
185
157
  var green = color[1];
186
158
  var blue = color[2];
187
159
  var data = this._tileBuffer;
188
-
189
160
  for (var i = 0; i < width * height * 4; i += 4) {
190
161
  data[i] = red;
191
162
  data[i + 1] = green;
192
163
  data[i + 2] = blue;
193
164
  data[i + 3] = 255;
194
165
  }
195
- } // update sub-rectangle of the current tile
166
+ }
196
167
 
168
+ // update sub-rectangle of the current tile
197
169
  }, {
198
170
  key: "_subTile",
199
171
  value: function _subTile(x, y, w, h, color) {
@@ -204,7 +176,6 @@ var HextileDecoder = /*#__PURE__*/function () {
204
176
  var yend = y + h;
205
177
  var data = this._tileBuffer;
206
178
  var width = this._tileW;
207
-
208
179
  for (var j = y; j < yend; j++) {
209
180
  for (var i = x; i < xend; i++) {
210
181
  var p = (i + j * width) * 4;
@@ -214,16 +185,15 @@ var HextileDecoder = /*#__PURE__*/function () {
214
185
  data[p + 3] = 255;
215
186
  }
216
187
  }
217
- } // draw the current tile to the screen
188
+ }
218
189
 
190
+ // draw the current tile to the screen
219
191
  }, {
220
192
  key: "_finishTile",
221
193
  value: function _finishTile(display) {
222
194
  display.blitImage(this._tileX, this._tileY, this._tileW, this._tileH, this._tileBuffer, 0);
223
195
  }
224
196
  }]);
225
-
226
197
  return HextileDecoder;
227
198
  }();
228
-
229
199
  exports["default"] = HextileDecoder;