X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=core%2Frfb.js;h=a94542f6fe6951f3357f5d0efd2f2112247ceb6a;hb=67fefcf184c1f291292027a785b333ba1a16f0c9;hp=aa58c00f616c30c6a357489e8117d05152ee7150;hpb=d472f3f19ef8cb9000ccfdf854d9f40e587fac0a;p=mirror_novnc.git diff --git a/core/rfb.js b/core/rfb.js index aa58c00..a94542f 100644 --- a/core/rfb.js +++ b/core/rfb.js @@ -1,7 +1,7 @@ /* * noVNC: HTML5 VNC client * Copyright (C) 2012 Joel Martin - * Copyright (C) 2017 Samuel Mannehed for Cendio AB + * Copyright (C) 2018 Samuel Mannehed for Cendio AB * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. @@ -12,13 +12,12 @@ import * as Log from './util/logging.js'; import { decodeUTF8 } from './util/strings.js'; -import { browserSupportsCursorURIs, isTouchDevice } from './util/browsers.js'; import EventTargetMixin from './util/eventtarget.js'; import Display from "./display.js"; import Keyboard from "./input/keyboard.js"; import Mouse from "./input/mouse.js"; +import Cursor from "./util/cursor.js"; import Websock from "./websock.js"; -import Base64 from "./base64.js"; import DES from "./des.js"; import KeyTable from "./input/keysym.js"; import XtScancode from "./input/xtscancodes.js"; @@ -26,11 +25,8 @@ import Inflator from "./inflator.js"; import { encodings, encodingName } from "./encodings.js"; import "./util/polyfill.js"; -/*jslint white: false, browser: true */ -/*global window, Util, Display, Keyboard, Mouse, Websock, Websock_native, Base64, DES, KeyTable, Inflator, XtScancode */ - // How many seconds to wait for a disconnect to finish -var DISCONNECT_TIMEOUT = 3; +const DISCONNECT_TIMEOUT = 3; export default function RFB(target, url, options) { if (!target) { @@ -66,7 +62,7 @@ export default function RFB(target, url, options) { this._fb_name = ""; - this._capabilities = { power: false, resize: false }; + this._capabilities = { power: false }; this._supportsFence = false; @@ -88,6 +84,7 @@ export default function RFB(target, url, options) { // Timers this._disconnTimer = null; // disconnection timer + this._resizeTimeout = null; // resize rate limiting // Decoder states and stats this._encHandlers = {}; @@ -108,7 +105,7 @@ export default function RFB(target, url, options) { background: null, zlibs: [] // TIGHT zlib streams }; - for (var i = 0; i < 4; i++) { + for (let i = 0; i < 4; i++) { this._FBU.zlibs[i] = new Inflator(); } @@ -140,22 +137,39 @@ export default function RFB(target, url, options) { // Bound event handlers this._eventHandlers = { focusCanvas: this._focusCanvas.bind(this), + windowResize: this._windowResize.bind(this), }; // main setup Log.Debug(">> RFB.constructor"); - // Target canvas must be able to have focus - if (!this._target.hasAttribute('tabindex')) { - this._target.tabIndex = -1; - } + // Create DOM elements + this._screen = document.createElement('div'); + this._screen.style.display = 'flex'; + this._screen.style.width = '100%'; + this._screen.style.height = '100%'; + this._screen.style.overflow = 'auto'; + this._screen.style.backgroundColor = 'rgb(40, 40, 40)'; + this._canvas = document.createElement('canvas'); + this._canvas.style.margin = 'auto'; + // Some browsers add an outline on focus + this._canvas.style.outline = 'none'; + // IE miscalculates width without this :( + this._canvas.style.flexShrink = '0'; + this._canvas.width = 0; + this._canvas.height = 0; + this._canvas.tabIndex = -1; + this._screen.appendChild(this._canvas); + + this._cursor = new Cursor(); // populate encHandlers with bound versions this._encHandlers[encodings.encodingRaw] = RFB.encodingHandlers.RAW.bind(this); this._encHandlers[encodings.encodingCopyRect] = RFB.encodingHandlers.COPYRECT.bind(this); this._encHandlers[encodings.encodingRRE] = RFB.encodingHandlers.RRE.bind(this); this._encHandlers[encodings.encodingHextile] = RFB.encodingHandlers.HEXTILE.bind(this); - this._encHandlers[encodings.encodingTight] = RFB.encodingHandlers.TIGHT.bind(this); + this._encHandlers[encodings.encodingTight] = RFB.encodingHandlers.TIGHT.bind(this, false); + this._encHandlers[encodings.encodingTightPNG] = RFB.encodingHandlers.TIGHT.bind(this, true); this._encHandlers[encodings.pseudoEncodingDesktopSize] = RFB.encodingHandlers.DesktopSize.bind(this); this._encHandlers[encodings.pseudoEncodingLastRect] = RFB.encodingHandlers.last_rect.bind(this); @@ -166,7 +180,7 @@ export default function RFB(target, url, options) { // NB: nothing that needs explicit teardown should be done // before this point, since this can throw an exception try { - this._display = new Display(this._target); + this._display = new Display(this._canvas); } catch (exc) { Log.Error("Display exception: " + exc); throw exc; @@ -174,10 +188,10 @@ export default function RFB(target, url, options) { this._display.onflush = this._onFlush.bind(this); this._display.clear(); - this._keyboard = new Keyboard(this._target); + this._keyboard = new Keyboard(this._canvas); this._keyboard.onkeyevent = this._handleKeyEvent.bind(this); - this._mouse = new Mouse(this._target); + this._mouse = new Mouse(this._canvas); this._mouse.onmousebutton = this._handleMouseButton.bind(this); this._mouse.onmousemove = this._handleMouseMove.bind(this); @@ -194,8 +208,8 @@ export default function RFB(target, url, options) { } }.bind(this)); this._sock.on('close', function (e) { - Log.Warn("WebSocket on-close event"); - var msg = ""; + Log.Debug("WebSocket on-close event"); + let msg = ""; if (e.code) { msg = "(code: " + e.code; if (e.reason) { @@ -236,7 +250,7 @@ export default function RFB(target, url, options) { setTimeout(this._updateConnectionState.bind(this, 'connecting')); Log.Debug("<< RFB.constructor"); -}; +} RFB.prototype = { // ===== PROPERTIES ===== @@ -266,13 +280,36 @@ RFB.prototype = { get touchButton() { return this._mouse.touchButton; }, set touchButton(button) { this._mouse.touchButton = button; }, - get viewportScale() { return this._display.scale; }, - set viewportScale(scale) { this._display.scale = scale; }, + _clipViewport: false, + get clipViewport() { return this._clipViewport; }, + set clipViewport(viewport) { + this._clipViewport = viewport; + this._updateClip(); + }, - get clipViewport() { return this._display.clipViewport; }, - set clipViewport(viewport) { this._display.clipViewport = viewport; }, + _scaleViewport: false, + get scaleViewport() { return this._scaleViewport; }, + set scaleViewport(scale) { + this._scaleViewport = scale; + // Scaling trumps clipping, so we may need to adjust + // clipping when enabling or disabling scaling + if (scale && this._clipViewport) { + this._updateClip(); + } + this._updateScale(); + if (!scale && this._clipViewport) { + this._updateClip(); + } + }, - get isClipped() { return this._display.isClipped; }, + _resizeSession: false, + get resizeSession() { return this._resizeSession; }, + set resizeSession(resize) { + this._resizeSession = resize; + if (resize) { + this._requestRemoteResize(); + } + }, // ===== PUBLIC METHODS ===== @@ -323,7 +360,7 @@ RFB.prototype = { return; } - var scancode = XtScancode[code]; + const scancode = XtScancode[code]; if (this._qemuExtKeyEventSupported && scancode) { // 0 is NoSymbol @@ -341,38 +378,19 @@ RFB.prototype = { } }, - clipboardPasteFrom: function (text) { - if (this._rfb_connection_state !== 'connected' || this._viewOnly) { return; } - RFB.messages.clientCutText(this._sock, text); - }, - - autoscale: function (width, height) { - if (this._rfb_connection_state !== 'connected') { return; } - this._display.autoscale(width, height); + focus: function () { + this._canvas.focus(); }, - viewportChangeSize: function(width, height) { - if (this._rfb_connection_state !== 'connected') { return; } - this._display.viewportChangeSize(width, height); + blur: function () { + this._canvas.blur(); }, - // Requests a change of remote desktop size. This message is an extension - // and may only be sent if we have received an ExtendedDesktopSize message - requestDesktopSize: function (width, height) { - if (this._rfb_connection_state !== 'connected' || - this._viewOnly) { - return; - } - - if (!this._supportsSetDesktopSize) { - return; - } - - RFB.messages.setDesktopSize(this._sock, width, height, - this._screen_id, this._screen_flags); + clipboardPasteFrom: function (text) { + if (this._rfb_connection_state !== 'connected' || this._viewOnly) { return; } + RFB.messages.clientCutText(this._sock, text); }, - // ===== PRIVATE METHODS ===== _connect: function () { @@ -391,29 +409,52 @@ RFB.prototype = { } } + // Make our elements part of the page + this._target.appendChild(this._screen); + + this._cursor.attach(this._canvas); + + // Monitor size changes of the screen + // FIXME: Use ResizeObserver, or hidden overflow + window.addEventListener('resize', this._eventHandlers.windowResize); + // Always grab focus on some kind of click event - this._target.addEventListener("mousedown", this._eventHandlers.focusCanvas); - this._target.addEventListener("touchstart", this._eventHandlers.focusCanvas); + this._canvas.addEventListener("mousedown", this._eventHandlers.focusCanvas); + this._canvas.addEventListener("touchstart", this._eventHandlers.focusCanvas); Log.Debug("<< RFB.connect"); }, _disconnect: function () { Log.Debug(">> RFB.disconnect"); - this._target.removeEventListener("mousedown", this._eventHandlers.focusCanvas); - this._target.removeEventListener("touchstart", this._eventHandlers.focusCanvas); - this._cleanup(); + this._cursor.detach(); + this._canvas.removeEventListener("mousedown", this._eventHandlers.focusCanvas); + this._canvas.removeEventListener("touchstart", this._eventHandlers.focusCanvas); + window.removeEventListener('resize', this._eventHandlers.windowResize); + this._keyboard.ungrab(); + this._mouse.ungrab(); this._sock.close(); this._print_stats(); + try { + this._target.removeChild(this._screen); + } catch (e) { + if (e.name === 'NotFoundError') { + // Some cases where the initial connection fails + // can disconnect before the _screen is created + } else { + throw e; + } + } + clearTimeout(this._resizeTimeout); Log.Debug("<< RFB.disconnect"); }, _print_stats: function () { - var stats = this._encStats; + const stats = this._encStats; Log.Info("Encoding stats for this connection:"); Object.keys(stats).forEach(function (key) { - var s = stats[key]; + const s = stats[key]; if (s[0] + s[1] > 0) { Log.Info(" " + encodingName(key) + ": " + s[0] + " rects"); } @@ -421,33 +462,112 @@ RFB.prototype = { Log.Info("Encoding stats since page load:"); Object.keys(stats).forEach(function (key) { - var s = stats[key]; + const s = stats[key]; Log.Info(" " + encodingName(key) + ": " + s[1] + " rects"); }); }, - _cleanup: function () { - if (!this._viewOnly) { this._keyboard.ungrab(); } - if (!this._viewOnly) { this._mouse.ungrab(); } - this._display.defaultCursor(); - if (Log.get_logging() !== 'debug') { - // Show noVNC logo when disconnected, unless in - // debug mode - this._display.clear(); - } - }, - _focusCanvas: function(event) { // Respect earlier handlers' request to not do side-effects if (event.defaultPrevented) { return; } - if (!this._focus_on_click) { + if (!this.focusOnClick) { return; } - this._target.focus(); + this.focus(); + }, + + _windowResize: function (event) { + // If the window resized then our screen element might have + // as well. Update the viewport dimensions. + window.requestAnimationFrame(function () { + this._updateClip(); + this._updateScale(); + }.bind(this)); + + if (this._resizeSession) { + // Request changing the resolution of the remote display to + // the size of the local browser viewport. + + // In order to not send multiple requests before the browser-resize + // is finished we wait 0.5 seconds before sending the request. + clearTimeout(this._resizeTimeout); + this._resizeTimeout = setTimeout(this._requestRemoteResize.bind(this), 500); + } + }, + + // Update state of clipping in Display object, and make sure the + // configured viewport matches the current screen size + _updateClip: function () { + const cur_clip = this._display.clipViewport; + let new_clip = this._clipViewport; + + if (this._scaleViewport) { + // Disable viewport clipping if we are scaling + new_clip = false; + } + + if (cur_clip !== new_clip) { + this._display.clipViewport = new_clip; + } + + if (new_clip) { + // When clipping is enabled, the screen is limited to + // the size of the container. + const size = this._screenSize(); + this._display.viewportChangeSize(size.w, size.h); + this._fixScrollbars(); + } + }, + + _updateScale: function () { + if (!this._scaleViewport) { + this._display.scale = 1.0; + } else { + const size = this._screenSize(); + this._display.autoscale(size.w, size.h); + } + this._fixScrollbars(); + }, + + // Requests a change of remote desktop size. This message is an extension + // and may only be sent if we have received an ExtendedDesktopSize message + _requestRemoteResize: function () { + clearTimeout(this._resizeTimeout); + this._resizeTimeout = null; + + if (!this._resizeSession || this._viewOnly || + !this._supportsSetDesktopSize) { + return; + } + + const size = this._screenSize(); + RFB.messages.setDesktopSize(this._sock, size.w, size.h, + this._screen_id, this._screen_flags); + + Log.Debug('Requested new desktop size: ' + + size.w + 'x' + size.h); + }, + + // Gets the the size of the available screen + _screenSize: function () { + return { w: this._screen.offsetWidth, + h: this._screen.offsetHeight }; + }, + + _fixScrollbars: function () { + // This is a hack because Chrome screws up the calculation + // for when scrollbars are needed. So to fix it we temporarily + // toggle them off and on. + const orig = this._screen.style.overflow; + this._screen.style.overflow = 'hidden'; + // Force Chrome to recalculate the layout by asking for + // an element's dimensions + this._screen.getBoundingClientRect(); + this._screen.style.overflow = orig; }, /* @@ -458,7 +578,7 @@ RFB.prototype = { * disconnected - permanent state */ _updateConnectionState: function (state) { - var oldstate = this._rfb_connection_state; + const oldstate = this._rfb_connection_state; if (state === oldstate) { Log.Debug("Already in state '" + state + "', ignoring"); @@ -514,7 +634,7 @@ RFB.prototype = { this._rfb_connection_state = state; - var smsg = "New state '" + state + "', was '" + oldstate + "'."; + const smsg = "New state '" + state + "', was '" + oldstate + "'."; Log.Debug(smsg); if (this._disconnTimer && state !== 'disconnecting') { @@ -532,8 +652,7 @@ RFB.prototype = { break; case 'connected': - var event = new CustomEvent("connect", { detail: {} }); - this.dispatchEvent(event); + this.dispatchEvent(new CustomEvent("connect", { detail: {} })); break; case 'disconnecting': @@ -546,10 +665,9 @@ RFB.prototype = { break; case 'disconnected': - event = new CustomEvent( + this.dispatchEvent(new CustomEvent( "disconnect", { detail: - { clean: this._rfb_clean_disconnect } }); - this.dispatchEvent(event); + { clean: this._rfb_clean_disconnect } })); break; } }, @@ -585,9 +703,8 @@ RFB.prototype = { _setCapability: function (cap, val) { this._capabilities[cap] = val; - var event = new CustomEvent("capabilities", - { detail: { capabilities: this._capabilities } }); - this.dispatchEvent(event); + this.dispatchEvent(new CustomEvent("capabilities", + { detail: { capabilities: this._capabilities } })); }, _handle_message: function () { @@ -634,18 +751,26 @@ RFB.prototype = { if (down && !this._viewportDragging) { this._viewportDragging = true; this._viewportDragPos = {'x': x, 'y': y}; + this._viewportHasMoved = false; // Skip sending mouse events return; } else { this._viewportDragging = false; - // If the viewport didn't actually move, then treat as a mouse click event - // Send the button down event here, as the button up event is sent at the end of this function - if (!this._viewportHasMoved && !this._viewOnly) { - RFB.messages.pointerEvent(this._sock, this._display.absX(x), this._display.absY(y), bmask); + // If we actually performed a drag then we are done + // here and should not send any mouse events + if (this._viewportHasMoved) { + return; } - this._viewportHasMoved = false; + + // Otherwise we treat this as a mouse click event. + // Send the button down event here, as the button up + // event is sent at the end of this function. + RFB.messages.pointerEvent(this._sock, + this._display.absX(x), + this._display.absY(y), + bmask); } } @@ -657,12 +782,12 @@ RFB.prototype = { _handleMouseMove: function (x, y) { if (this._viewportDragging) { - var deltaX = this._viewportDragPos.x - x; - var deltaY = this._viewportDragPos.y - y; + const deltaX = this._viewportDragPos.x - x; + const deltaY = this._viewportDragPos.y - y; // The goal is to trigger on a certain physical width, the // devicePixelRatio brings us a bit closer but is not optimal. - var dragThreshold = 10 * (window.devicePixelRatio || 1); + const dragThreshold = 10 * (window.devicePixelRatio || 1); if (this._viewportHasMoved || (Math.abs(deltaX) > dragThreshold || Math.abs(deltaY) > dragThreshold)) { @@ -689,9 +814,9 @@ RFB.prototype = { return this._fail("Received incomplete protocol version."); } - var sversion = this._sock.rQshiftStr(12).substr(4, 7); + const sversion = this._sock.rQshiftStr(12).substr(4, 7); Log.Info("Server ProtocolVersion: " + sversion); - var is_repeater = 0; + let is_repeater = 0; switch (sversion) { case "000.000": // UltraVNC repeater is_repeater = 1; @@ -715,7 +840,7 @@ RFB.prototype = { } if (is_repeater) { - var repeaterID = "ID:" + this._repeaterID; + let repeaterID = "ID:" + this._repeaterID; while (repeaterID.length < 250) { repeaterID += "\0"; } @@ -727,7 +852,7 @@ RFB.prototype = { this._rfb_version = this._rfb_max_version; } - var cversion = "00" + parseInt(this._rfb_version, 10) + + const cversion = "00" + parseInt(this._rfb_version, 10) + ".00" + ((this._rfb_version * 10) % 10); this._sock.send_string("RFB " + cversion + "\n"); Log.Debug('Sent ProtocolVersion: ' + cversion); @@ -739,7 +864,7 @@ RFB.prototype = { // Polyfill since IE and PhantomJS doesn't have // TypedArray.includes() function includes(item, array) { - for (var i = 0; i < array.length; i++) { + for (let i = 0; i < array.length; i++) { if (array[i] === item) { return true; } @@ -749,14 +874,14 @@ RFB.prototype = { if (this._rfb_version >= 3.7) { // Server sends supported list, client decides - var num_types = this._sock.rQshift8(); + const num_types = this._sock.rQshift8(); if (this._sock.rQwait("security type", num_types, 1)) { return false; } if (num_types === 0) { return this._handle_security_failure("no security types"); } - var types = this._sock.rQshiftBytes(num_types); + const types = this._sock.rQshiftBytes(num_types); Log.Debug("Server security types: " + types); // Look for each auth in preferred order @@ -811,7 +936,7 @@ RFB.prototype = { if (this._sock.rQwait("reason length", 4)) { return false; } - let strlen = this._sock.rQshift32(); + const strlen = this._sock.rQshift32(); let reason = ""; if (strlen > 0) { @@ -820,20 +945,16 @@ RFB.prototype = { } if (reason !== "") { - - let event = new CustomEvent( + this.dispatchEvent(new CustomEvent( "securityfailure", - { detail: { status: security_result_status, reason: reason } }); - this.dispatchEvent(event); + { detail: { status: security_result_status, reason: reason } })); return this._fail("Security negotiation failed" + context + " (reason: " + reason + ")"); } else { - - let event = new CustomEvent( + this.dispatchEvent(new CustomEvent( "securityfailure", - { detail: { status: security_result_status } }); - this.dispatchEvent(event); + { detail: { status: security_result_status } })); return this._fail("Security negotiation failed" + context); } @@ -844,13 +965,13 @@ RFB.prototype = { if (!this._rfb_credentials.username || !this._rfb_credentials.password || !this._rfb_credentials.target) { - var event = new CustomEvent("credentialsrequired", - { detail: { types: ["username", "password", "target"] } }); - this.dispatchEvent(event); + this.dispatchEvent(new CustomEvent( + "credentialsrequired", + { detail: { types: ["username", "password", "target"] } })); return false; } - var xvp_auth_str = String.fromCharCode(this._rfb_credentials.username.length) + + const xvp_auth_str = String.fromCharCode(this._rfb_credentials.username.length) + String.fromCharCode(this._rfb_credentials.target.length) + this._rfb_credentials.username + this._rfb_credentials.target; @@ -863,33 +984,45 @@ RFB.prototype = { if (this._sock.rQwait("auth challenge", 16)) { return false; } if (!this._rfb_credentials.password) { - var event = new CustomEvent("credentialsrequired", - { detail: { types: ["password"] } }); - this.dispatchEvent(event); + this.dispatchEvent(new CustomEvent( + "credentialsrequired", + { detail: { types: ["password"] } })); return false; } // TODO(directxman12): make genDES not require an Array - var challenge = Array.prototype.slice.call(this._sock.rQshiftBytes(16)); - var response = RFB.genDES(this._rfb_credentials.password, challenge); + const challenge = Array.prototype.slice.call(this._sock.rQshiftBytes(16)); + const response = RFB.genDES(this._rfb_credentials.password, challenge); this._sock.send(response); this._rfb_init_state = "SecurityResult"; return true; }, _negotiate_tight_tunnels: function (numTunnels) { - var clientSupportedTunnelTypes = { + const clientSupportedTunnelTypes = { 0: { vendor: 'TGHT', signature: 'NOTUNNEL' } }; - var serverSupportedTunnelTypes = {}; + const serverSupportedTunnelTypes = {}; // receive tunnel capabilities - for (var i = 0; i < numTunnels; i++) { - var cap_code = this._sock.rQshift32(); - var cap_vendor = this._sock.rQshiftStr(4); - var cap_signature = this._sock.rQshiftStr(8); + for (let i = 0; i < numTunnels; i++) { + const cap_code = this._sock.rQshift32(); + const cap_vendor = this._sock.rQshiftStr(4); + const cap_signature = this._sock.rQshiftStr(8); serverSupportedTunnelTypes[cap_code] = { vendor: cap_vendor, signature: cap_signature }; } + Log.Debug("Server Tight tunnel types: " + serverSupportedTunnelTypes); + + // Siemens touch panels have a VNC server that supports NOTUNNEL, + // but forgets to advertise it. Try to detect such servers by + // looking for their custom tunnel type. + if (serverSupportedTunnelTypes[1] && + (serverSupportedTunnelTypes[1].vendor === "SICR") && + (serverSupportedTunnelTypes[1].signature === "SCHANNEL")) { + Log.Debug("Detected Siemens server. Assuming NOTUNNEL support."); + serverSupportedTunnelTypes[0] = { vendor: 'TGHT', signature: 'NOTUNNEL' }; + } + // choose the notunnel type if (serverSupportedTunnelTypes[0]) { if (serverSupportedTunnelTypes[0].vendor != clientSupportedTunnelTypes[0].vendor || @@ -897,6 +1030,7 @@ RFB.prototype = { return this._fail("Client's tunnel type had the incorrect " + "vendor or signature"); } + Log.Debug("Selected tunnel type: " + clientSupportedTunnelTypes[0]); this._sock.send([0, 0, 0, 0]); // use NOTUNNEL return false; // wait until we receive the sub auth count to continue } else { @@ -908,7 +1042,7 @@ RFB.prototype = { _negotiate_tight_auth: function () { if (!this._rfb_tightvnc) { // first pass, do the tunnel negotiation if (this._sock.rQwait("num tunnels", 4)) { return false; } - var numTunnels = this._sock.rQshift32(); + const numTunnels = this._sock.rQshift32(); if (numTunnels > 0 && this._sock.rQwait("tunnel capabilities", 16 * numTunnels, 4)) { return false; } this._rfb_tightvnc = true; @@ -921,7 +1055,7 @@ RFB.prototype = { // second pass, do the sub-auth negotiation if (this._sock.rQwait("sub auth count", 4)) { return false; } - var subAuthCount = this._sock.rQshift32(); + const subAuthCount = this._sock.rQshift32(); if (subAuthCount === 0) { // empty sub-auth list received means 'no auth' subtype selected this._rfb_init_state = 'SecurityResult'; return true; @@ -929,22 +1063,25 @@ RFB.prototype = { if (this._sock.rQwait("sub auth capabilities", 16 * subAuthCount, 4)) { return false; } - var clientSupportedTypes = { + const clientSupportedTypes = { 'STDVNOAUTH__': 1, 'STDVVNCAUTH_': 2 }; - var serverSupportedTypes = []; + const serverSupportedTypes = []; - for (var i = 0; i < subAuthCount; i++) { - var capNum = this._sock.rQshift32(); - var capabilities = this._sock.rQshiftStr(12); + for (let i = 0; i < subAuthCount; i++) { + this._sock.rQshift32(); // capNum + const capabilities = this._sock.rQshiftStr(12); serverSupportedTypes.push(capabilities); } - for (var authType in clientSupportedTypes) { + Log.Debug("Server Tight authentication types: " + serverSupportedTypes); + + for (let authType in clientSupportedTypes) { if (serverSupportedTypes.indexOf(authType) != -1) { this._sock.send([0, 0, 0, clientSupportedTypes[authType]]); + Log.Debug("Selected authentication type: " + authType); switch (authType) { case 'STDVNOAUTH__': // no auth @@ -994,7 +1131,7 @@ RFB.prototype = { _handle_security_result: function () { if (this._sock.rQwait('VNC auth response ', 4)) { return false; } - let status = this._sock.rQshift32(); + const status = this._sock.rQshift32(); if (status === 0) { // OK this._rfb_init_state = 'ClientInitialisation'; @@ -1004,9 +1141,9 @@ RFB.prototype = { if (this._rfb_version >= 3.8) { return this._handle_security_failure("security result", status); } else { - let event = new CustomEvent("securityfailure", - { detail: { status: status } }); - this.dispatchEvent(event); + this.dispatchEvent(new CustomEvent( + "securityfailure", + { detail: { status: status } })); return this._fail("Security handshake failed"); } @@ -1017,40 +1154,40 @@ RFB.prototype = { if (this._sock.rQwait("server initialization", 24)) { return false; } /* Screen size */ - var width = this._sock.rQshift16(); - var height = this._sock.rQshift16(); + const width = this._sock.rQshift16(); + const height = this._sock.rQshift16(); /* PIXEL_FORMAT */ - var bpp = this._sock.rQshift8(); - var depth = this._sock.rQshift8(); - var big_endian = this._sock.rQshift8(); - var true_color = this._sock.rQshift8(); - - var red_max = this._sock.rQshift16(); - var green_max = this._sock.rQshift16(); - var blue_max = this._sock.rQshift16(); - var red_shift = this._sock.rQshift8(); - var green_shift = this._sock.rQshift8(); - var blue_shift = this._sock.rQshift8(); + const bpp = this._sock.rQshift8(); + const depth = this._sock.rQshift8(); + const big_endian = this._sock.rQshift8(); + const true_color = this._sock.rQshift8(); + + const red_max = this._sock.rQshift16(); + const green_max = this._sock.rQshift16(); + const blue_max = this._sock.rQshift16(); + const red_shift = this._sock.rQshift8(); + const green_shift = this._sock.rQshift8(); + const blue_shift = this._sock.rQshift8(); this._sock.rQskipBytes(3); // padding // NB(directxman12): we don't want to call any callbacks or print messages until // *after* we're past the point where we could backtrack /* Connection name/title */ - var name_length = this._sock.rQshift32(); + const name_length = this._sock.rQshift32(); if (this._sock.rQwait('server init name', name_length, 24)) { return false; } this._fb_name = decodeUTF8(this._sock.rQshiftStr(name_length)); if (this._rfb_tightvnc) { if (this._sock.rQwait('TightVNC extended server init header', 8, 24 + name_length)) { return false; } // In TightVNC mode, ServerInit message is extended - var numServerMessages = this._sock.rQshift16(); - var numClientMessages = this._sock.rQshift16(); - var numEncodings = this._sock.rQshift16(); + const numServerMessages = this._sock.rQshift16(); + const numClientMessages = this._sock.rQshift16(); + const numEncodings = this._sock.rQshift16(); this._sock.rQskipBytes(2); // padding - var totalMessagesLength = (numServerMessages + numClientMessages + numEncodings) * 16; + const totalMessagesLength = (numServerMessages + numClientMessages + numEncodings) * 16; if (this._sock.rQwait('TightVNC extended server init header', totalMessagesLength, 32 + name_length)) { return false; } // we don't actually do anything with the capability information that TIGHT sends, @@ -1092,9 +1229,9 @@ RFB.prototype = { } // we're past the point where we could backtrack, so it's safe to call this - var event = new CustomEvent("desktopname", - { detail: { name: this._fb_name } }); - this.dispatchEvent(event); + this.dispatchEvent(new CustomEvent( + "desktopname", + { detail: { name: this._fb_name } })); this._resize(width, height); @@ -1115,29 +1252,25 @@ RFB.prototype = { this._timing.fbu_rt_start = (new Date()).getTime(); this._timing.pixels = 0; - // Cursor will be server side until the server decides to honor - // our request and send over the cursor image - this._display.disableLocalCursor(); - this._updateConnectionState('connected'); return true; }, _sendEncodings: function () { - var encs = []; + const encs = []; // In preference order encs.push(encodings.encodingCopyRect); // Only supported with full depth support if (this._fb_depth == 24) { encs.push(encodings.encodingTight); + encs.push(encodings.encodingTightPNG); encs.push(encodings.encodingHextile); encs.push(encodings.encodingRRE); } encs.push(encodings.encodingRaw); // Psuedo-encoding settings - encs.push(encodings.pseudoEncodingTightPNG); encs.push(encodings.pseudoEncodingQualityLevel0 + 6); encs.push(encodings.pseudoEncodingCompressLevel0 + 2); @@ -1149,8 +1282,7 @@ RFB.prototype = { encs.push(encodings.pseudoEncodingFence); encs.push(encodings.pseudoEncodingContinuousUpdates); - if (browserSupportsCursorURIs() && - !isTouchDevice && this._fb_depth == 24) { + if (this._fb_depth == 24) { encs.push(encodings.pseudoEncodingCursor); } @@ -1204,16 +1336,16 @@ RFB.prototype = { if (this._sock.rQwait("ServerCutText header", 7, 1)) { return false; } this._sock.rQskipBytes(3); // Padding - var length = this._sock.rQshift32(); + const length = this._sock.rQshift32(); if (this._sock.rQwait("ServerCutText", length, 8)) { return false; } - var text = this._sock.rQshiftStr(length); + const text = this._sock.rQshiftStr(length); if (this._viewOnly) { return true; } - var event = new CustomEvent("clipboard", - { detail: { text: text } }); - this.dispatchEvent(event); + this.dispatchEvent(new CustomEvent( + "clipboard", + { detail: { text: text } })); return true; }, @@ -1221,8 +1353,8 @@ RFB.prototype = { _handle_server_fence_msg: function() { if (this._sock.rQwait("ServerFence header", 8, 1)) { return false; } this._sock.rQskipBytes(3); // Padding - var flags = this._sock.rQshift32(); - var length = this._sock.rQshift8(); + let flags = this._sock.rQshift32(); + let length = this._sock.rQshift8(); if (this._sock.rQwait("ServerFence payload", length, 9)) { return false; } @@ -1231,7 +1363,7 @@ RFB.prototype = { length = 64; } - var payload = this._sock.rQshiftStr(length); + const payload = this._sock.rQshiftStr(length); this._supportsFence = true; @@ -1263,8 +1395,8 @@ RFB.prototype = { _handle_xvp_msg: function () { if (this._sock.rQwait("XVP version and message", 3, 1)) { return false; } this._sock.rQskip8(); // Padding - var xvp_ver = this._sock.rQshift8(); - var xvp_msg = this._sock.rQshift8(); + const xvp_ver = this._sock.rQshift8(); + const xvp_msg = this._sock.rQshift8(); switch (xvp_msg) { case 0: // XVP_FAIL @@ -1284,17 +1416,17 @@ RFB.prototype = { }, _normal_msg: function () { - var msg_type; - + let msg_type; if (this._FBU.rects > 0) { msg_type = 0; } else { msg_type = this._sock.rQshift8(); } + let first, ret; switch (msg_type) { case 0: // FramebufferUpdate - var ret = this._framebufferUpdate(); + ret = this._framebufferUpdate(); if (ret && !this._enabledContinuousUpdates) { RFB.messages.fbUpdateRequest(this._sock, true, 0, 0, this._fb_width, this._fb_height); @@ -1306,15 +1438,16 @@ RFB.prototype = { case 2: // Bell Log.Debug("Bell"); - var event = new CustomEvent("bell", { detail: {} }); - this.dispatchEvent(event); + this.dispatchEvent(new CustomEvent( + "bell", + { detail: {} })); return true; case 3: // ServerCutText return this._handle_server_cut_text(); case 150: // EndOfContinuousUpdates - var first = !(this._supportsContinuousUpdates); + first = !this._supportsContinuousUpdates; this._supportsContinuousUpdates = true; this._enabledContinuousUpdates = false; if (first) { @@ -1349,9 +1482,6 @@ RFB.prototype = { }, _framebufferUpdate: function () { - var ret = true; - var now; - if (this._FBU.rects === 0) { if (this._sock.rQwait("FBU header", 3, 1)) { return false; } this._sock.rQskip8(); // Padding @@ -1359,7 +1489,7 @@ RFB.prototype = { this._FBU.bytes = 0; this._timing.cur_fbu = 0; if (this._timing.fbu_rt_start > 0) { - now = (new Date()).getTime(); + const now = (new Date()).getTime(); Log.Info("First FBU latency: " + (now - this._timing.fbu_rt_start)); } @@ -1380,7 +1510,7 @@ RFB.prototype = { if (this._sock.rQwait("rect header", 12)) { return false; } /* New FramebufferUpdate */ - var hdr = this._sock.rQshiftBytes(12); + const hdr = this._sock.rQshiftBytes(12); this._FBU.x = (hdr[0] << 8) + hdr[1]; this._FBU.y = (hdr[2] << 8) + hdr[3]; this._FBU.width = (hdr[4] << 8) + hdr[5]; @@ -1397,9 +1527,9 @@ RFB.prototype = { this._timing.last_fbu = (new Date()).getTime(); - ret = this._encHandlers[this._FBU.encoding](); + const ret = this._encHandlers[this._FBU.encoding](); - now = (new Date()).getTime(); + const now = (new Date()).getTime(); this._timing.cur_fbu += (now - this._timing.last_fbu); if (ret) { @@ -1424,7 +1554,7 @@ RFB.prototype = { } if (this._timing.fbu_rt_start > 0) { - var fbu_rt_diff = now - this._timing.fbu_rt_start; + const fbu_rt_diff = now - this._timing.fbu_rt_start; this._timing.fbu_rt_total += fbu_rt_diff; this._timing.fbu_rt_cnt++; Log.Info("full FBU round-trip, cur: " + @@ -1459,10 +1589,9 @@ RFB.prototype = { this._display.resize(this._fb_width, this._fb_height); - var event = new CustomEvent("fbresize", - { detail: { width: this._fb_width, - height: this._fb_height } }); - this.dispatchEvent(event); + // Adjust the visible viewport based on the new dimensions + this._updateClip(); + this._updateScale(); this._timing.fbu_rt_start = (new Date()).getTime(); this._updateContinuousUpdates(); @@ -1480,8 +1609,8 @@ Object.assign(RFB.prototype, EventTargetMixin); // Class Methods RFB.messages = { keyEvent: function (sock, keysym, down) { - var buff = sock._sQ; - var offset = sock._sQlen; + const buff = sock._sQ; + const offset = sock._sQlen; buff[offset] = 4; // msg-type buff[offset + 1] = down; @@ -1500,17 +1629,16 @@ RFB.messages = { QEMUExtendedKeyEvent: function (sock, keysym, down, keycode) { function getRFBkeycode(xt_scancode) { - var upperByte = (keycode >> 8); - var lowerByte = (keycode & 0x00ff); + const upperByte = (keycode >> 8); + const lowerByte = (keycode & 0x00ff); if (upperByte === 0xe0 && lowerByte < 0x7f) { - lowerByte = lowerByte | 0x80; - return lowerByte; + return lowerByte | 0x80; } return xt_scancode; } - var buff = sock._sQ; - var offset = sock._sQlen; + const buff = sock._sQ; + const offset = sock._sQlen; buff[offset] = 255; // msg-type buff[offset + 1] = 0; // sub msg-type @@ -1523,7 +1651,7 @@ RFB.messages = { buff[offset + 6] = (keysym >> 8); buff[offset + 7] = keysym; - var RFBkeycode = getRFBkeycode(keycode); + const RFBkeycode = getRFBkeycode(keycode); buff[offset + 8] = (RFBkeycode >> 24); buff[offset + 9] = (RFBkeycode >> 16); @@ -1535,8 +1663,8 @@ RFB.messages = { }, pointerEvent: function (sock, x, y, mask) { - var buff = sock._sQ; - var offset = sock._sQlen; + const buff = sock._sQ; + const offset = sock._sQlen; buff[offset] = 5; // msg-type @@ -1554,8 +1682,8 @@ RFB.messages = { // TODO(directxman12): make this unicode compatible? clientCutText: function (sock, text) { - var buff = sock._sQ; - var offset = sock._sQlen; + const buff = sock._sQ; + const offset = sock._sQlen; buff[offset] = 6; // msg-type @@ -1563,24 +1691,43 @@ RFB.messages = { buff[offset + 2] = 0; // padding buff[offset + 3] = 0; // padding - var n = text.length; + const length = text.length; - buff[offset + 4] = n >> 24; - buff[offset + 5] = n >> 16; - buff[offset + 6] = n >> 8; - buff[offset + 7] = n; + buff[offset + 4] = length >> 24; + buff[offset + 5] = length >> 16; + buff[offset + 6] = length >> 8; + buff[offset + 7] = length; - for (var i = 0; i < n; i++) { - buff[offset + 8 + i] = text.charCodeAt(i); - } + sock._sQlen += 8; - sock._sQlen += 8 + n; - sock.flush(); + // We have to keep track of from where in the text we begin creating the + // buffer for the flush in the next iteration. + let textOffset = 0; + + let remaining = length; + while (remaining > 0) { + + const flushSize = Math.min(remaining, (sock._sQbufferSize - sock._sQlen)); + if (flushSize <= 0) { + this._fail("Clipboard contents could not be sent"); + break; + } + + for (let i = 0; i < flushSize; i++) { + buff[sock._sQlen + i] = text.charCodeAt(textOffset + i); + } + + sock._sQlen += flushSize; + sock.flush(); + + remaining -= flushSize; + textOffset += flushSize; + } }, setDesktopSize: function (sock, width, height, id, flags) { - var buff = sock._sQ; - var offset = sock._sQlen; + const buff = sock._sQ; + const offset = sock._sQlen; buff[offset] = 251; // msg-type buff[offset + 1] = 0; // padding @@ -1615,8 +1762,8 @@ RFB.messages = { }, clientFence: function (sock, flags, payload) { - var buff = sock._sQ; - var offset = sock._sQlen; + const buff = sock._sQ; + const offset = sock._sQlen; buff[offset] = 248; // msg-type @@ -1629,11 +1776,11 @@ RFB.messages = { buff[offset + 6] = flags >> 8; buff[offset + 7] = flags; - var n = payload.length; + const n = payload.length; buff[offset + 8] = n; // length - for (var i = 0; i < n; i++) { + for (let i = 0; i < n; i++) { buff[offset + 9 + i] = payload.charCodeAt(i); } @@ -1642,8 +1789,8 @@ RFB.messages = { }, enableContinuousUpdates: function (sock, enable, x, y, width, height) { - var buff = sock._sQ; - var offset = sock._sQlen; + const buff = sock._sQ; + const offset = sock._sQlen; buff[offset] = 150; // msg-type buff[offset + 1] = enable; // enable-flag @@ -1662,10 +1809,10 @@ RFB.messages = { }, pixelFormat: function (sock, depth, true_color) { - var buff = sock._sQ; - var offset = sock._sQlen; + const buff = sock._sQ; + const offset = sock._sQlen; - var bpp, bits; + let bpp; if (depth > 16) { bpp = 32; @@ -1675,7 +1822,7 @@ RFB.messages = { bpp = 8; } - bits = Math.floor(depth/3); + const bits = Math.floor(depth/3); buff[offset] = 0; // msg-type @@ -1710,8 +1857,8 @@ RFB.messages = { }, clientEncodings: function (sock, encodings) { - var buff = sock._sQ; - var offset = sock._sQlen; + const buff = sock._sQ; + const offset = sock._sQlen; buff[offset] = 2; // msg-type buff[offset + 1] = 0; // padding @@ -1719,9 +1866,9 @@ RFB.messages = { buff[offset + 2] = encodings.length >> 8; buff[offset + 3] = encodings.length; - var i, j = offset + 4; - for (i = 0; i < encodings.length; i++) { - var enc = encodings[i]; + let j = offset + 4; + for (let i = 0; i < encodings.length; i++) { + const enc = encodings[i]; buff[j] = enc >> 24; buff[j + 1] = enc >> 16; buff[j + 2] = enc >> 8; @@ -1735,8 +1882,8 @@ RFB.messages = { }, fbUpdateRequest: function (sock, incremental, x, y, w, h) { - var buff = sock._sQ; - var offset = sock._sQlen; + const buff = sock._sQ; + const offset = sock._sQlen; if (typeof(x) === "undefined") { x = 0; } if (typeof(y) === "undefined") { y = 0; } @@ -1761,8 +1908,8 @@ RFB.messages = { }, xvpOp: function (sock, ver, op) { - var buff = sock._sQ; - var offset = sock._sQlen; + const buff = sock._sQ; + const offset = sock._sQlen; buff[offset] = 250; // msg-type buff[offset + 1] = 0; // padding @@ -1776,8 +1923,8 @@ RFB.messages = { }; RFB.genDES = function (password, challenge) { - var passwd = []; - for (var i = 0; i < password.length; i++) { + const passwd = []; + for (let i = 0; i < password.length; i++) { passwd.push(password.charCodeAt(i)); } return (new DES(passwd)).encrypt(challenge); @@ -1789,19 +1936,18 @@ RFB.encodingHandlers = { this._FBU.lines = this._FBU.height; } - var pixelSize = this._fb_depth == 8 ? 1 : 4; + const pixelSize = this._fb_depth == 8 ? 1 : 4; this._FBU.bytes = this._FBU.width * pixelSize; // at least a line if (this._sock.rQwait("RAW", this._FBU.bytes)) { return false; } - var cur_y = this._FBU.y + (this._FBU.height - this._FBU.lines); - var curr_height = Math.min(this._FBU.lines, + const cur_y = this._FBU.y + (this._FBU.height - this._FBU.lines); + const curr_height = Math.min(this._FBU.lines, Math.floor(this._sock.rQlen() / (this._FBU.width * pixelSize))); - var data = this._sock.get_rQ(); - var index = this._sock.get_rQi(); + let data = this._sock.get_rQ(); + let index = this._sock.get_rQi(); if (this._fb_depth == 8) { - var pixels = this._FBU.width * curr_height - var newdata = new Uint8Array(pixels * 4); - var i; - for (i = 0;i < pixels;i++) { + const pixels = this._FBU.width * curr_height + const newdata = new Uint8Array(pixels * 4); + for (let i = 0; i < pixels; i++) { newdata[i * 4 + 0] = ((data[index + i] >> 0) & 0x3) * 255 / 3; newdata[i * 4 + 1] = ((data[index + i] >> 2) & 0x3) * 255 / 3; newdata[i * 4 + 2] = ((data[index + i] >> 4) & 0x3) * 255 / 3; @@ -1838,7 +1984,7 @@ RFB.encodingHandlers = { }, RRE: function () { - var color; + let color; if (this._FBU.subrects === 0) { this._FBU.bytes = 4 + 4; if (this._sock.rQwait("RRE", 4 + 4)) { return false; } @@ -1849,16 +1995,16 @@ RFB.encodingHandlers = { while (this._FBU.subrects > 0 && this._sock.rQlen() >= (4 + 8)) { color = this._sock.rQshiftBytes(4); - var x = this._sock.rQshift16(); - var y = this._sock.rQshift16(); - var width = this._sock.rQshift16(); - var height = this._sock.rQshift16(); + const x = this._sock.rQshift16(); + const y = this._sock.rQshift16(); + const width = this._sock.rQshift16(); + const height = this._sock.rQshift16(); this._display.fillRect(this._FBU.x + x, this._FBU.y + y, width, height, color); this._FBU.subrects--; } if (this._FBU.subrects > 0) { - var chunk = Math.min(this._rre_chunk_sz, this._FBU.subrects); + const chunk = Math.min(this._rre_chunk_sz, this._FBU.subrects); this._FBU.bytes = (4 + 8) * chunk; } else { this._FBU.rects--; @@ -1869,8 +2015,8 @@ RFB.encodingHandlers = { }, HEXTILE: function () { - var rQ = this._sock.get_rQ(); - var rQi = this._sock.get_rQi(); + const rQ = this._sock.get_rQ(); + let rQi = this._sock.get_rQi(); if (this._FBU.tiles === 0) { this._FBU.tiles_x = Math.ceil(this._FBU.width / 16); @@ -1882,21 +2028,21 @@ RFB.encodingHandlers = { while (this._FBU.tiles > 0) { this._FBU.bytes = 1; if (this._sock.rQwait("HEXTILE subencoding", this._FBU.bytes)) { return false; } - var subencoding = rQ[rQi]; // Peek + const subencoding = rQ[rQi]; // Peek if (subencoding > 30) { // Raw this._fail("Illegal hextile subencoding (subencoding: " + subencoding + ")"); return false; } - var subrects = 0; - var curr_tile = this._FBU.total_tiles - this._FBU.tiles; - var tile_x = curr_tile % this._FBU.tiles_x; - var tile_y = Math.floor(curr_tile / this._FBU.tiles_x); - var x = this._FBU.x + tile_x * 16; - var y = this._FBU.y + tile_y * 16; - var w = Math.min(16, (this._FBU.x + this._FBU.width) - x); - var h = Math.min(16, (this._FBU.y + this._FBU.height) - y); + let subrects = 0; + const curr_tile = this._FBU.total_tiles - this._FBU.tiles; + const tile_x = curr_tile % this._FBU.tiles_x; + const tile_y = Math.floor(curr_tile / this._FBU.tiles_x); + const x = this._FBU.x + tile_x * 16; + const y = this._FBU.y + tile_y * 16; + const w = Math.min(16, (this._FBU.x + this._FBU.width) - x); + const h = Math.min(16, (this._FBU.y + this._FBU.height) - y); // Figure out how much we are expecting if (subencoding & 0x01) { // Raw @@ -1950,23 +2096,23 @@ RFB.encodingHandlers = { subrects = rQ[rQi]; rQi++; - for (var s = 0; s < subrects; s++) { - var color; + for (let s = 0; s < subrects; s++) { + let color; if (this._FBU.subencoding & 0x10) { // SubrectsColoured color = [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]]; rQi += 4; } else { color = this._FBU.foreground; } - var xy = rQ[rQi]; + const xy = rQ[rQi]; rQi++; - var sx = (xy >> 4); - var sy = (xy & 0x0f); + const sx = (xy >> 4); + const sy = (xy & 0x0f); - var wh = rQ[rQi]; + const wh = rQ[rQi]; rQi++; - var sw = (wh >> 4) + 1; - var sh = (wh & 0x0f) + 1; + const sw = (wh >> 4) + 1; + const sh = (wh & 0x0f) + 1; this._display.subTile(sx, sy, sw, sh, color); } @@ -1986,31 +2132,22 @@ RFB.encodingHandlers = { return true; }, - TIGHT: function () { + TIGHT: function (isTightPNG) { this._FBU.bytes = 1; // compression-control byte if (this._sock.rQwait("TIGHT compression-control", this._FBU.bytes)) { return false; } - var checksum = function (data) { - var sum = 0; - for (var i = 0; i < data.length; i++) { - sum += data[i]; - if (sum > 65536) sum -= 65536; - } - return sum; - }; - - var resetStreams = 0; - var streamId = -1; - var decompress = function (data, expected) { - for (var i = 0; i < 4; i++) { + let resetStreams = 0; + let streamId = -1; + const decompress = function (data, expected) { + for (let i = 0; i < 4; i++) { if ((resetStreams >> i) & 1) { this._FBU.zlibs[i].reset(); Log.Info("Reset zlib stream " + i); } } - //var uncompressed = this._FBU.zlibs[streamId].uncompress(data, 0); - var uncompressed = this._FBU.zlibs[streamId].inflate(data, true, expected); + //const uncompressed = this._FBU.zlibs[streamId].uncompress(data, 0); + const uncompressed = this._FBU.zlibs[streamId].inflate(data, true, expected); /*if (uncompressed.status !== 0) { Log.Error("Invalid data in zlib stream"); }*/ @@ -2019,18 +2156,18 @@ RFB.encodingHandlers = { return uncompressed; }.bind(this); - var indexedToRGBX2Color = function (data, palette, width, height) { + const indexedToRGBX2Color = function (data, palette, width, height) { // Convert indexed (palette based) image data to RGB // TODO: reduce number of calculations inside loop - var dest = this._destBuff; - var w = Math.floor((width + 7) / 8); - var w1 = Math.floor(width / 8); - - /*for (var y = 0; y < height; y++) { - var b, x, dp, sp; - var yoffset = y * width; - var ybitoffset = y * w; - var xoffset, targetbyte; + const dest = this._destBuff; + const w = Math.floor((width + 7) / 8); + const w1 = Math.floor(width / 8); + + /*for (let y = 0; y < height; y++) { + let b, x, dp, sp; + const yoffset = y * width; + const ybitoffset = y * w; + let xoffset, targetbyte; for (x = 0; x < w1; x++) { xoffset = yoffset + x * 8; targetbyte = data[ybitoffset + x]; @@ -2054,10 +2191,10 @@ RFB.encodingHandlers = { } }*/ - for (var y = 0; y < height; y++) { - var b, x, dp, sp; + for (let y = 0; y < height; y++) { + let dp, sp, x; for (x = 0; x < w1; x++) { - for (b = 7; b >= 0; b--) { + for (let b = 7; b >= 0; b--) { dp = (y * width + x * 8 + 7 - b) * 4; sp = (data[y * w + x] >> b & 1) * 3; dest[dp] = palette[sp]; @@ -2067,7 +2204,7 @@ RFB.encodingHandlers = { } } - for (b = 7; b >= 8 - width % 8; b--) { + for (let b = 7; b >= 8 - width % 8; b--) { dp = (y * width + x * 8 + 7 - b) * 4; sp = (data[y * w + x] >> b & 1) * 3; dest[dp] = palette[sp]; @@ -2080,12 +2217,12 @@ RFB.encodingHandlers = { return dest; }.bind(this); - var indexedToRGBX = function (data, palette, width, height) { + const indexedToRGBX = function (data, palette, width, height) { // Convert indexed (palette based) image data to RGB - var dest = this._destBuff; - var total = width * height * 4; - for (var i = 0, j = 0; i < total; i += 4, j++) { - var sp = data[j] * 3; + const dest = this._destBuff; + const total = width * height * 4; + for (let i = 0, j = 0; i < total; i += 4, j++) { + const sp = data[j] * 3; dest[i] = palette[sp]; dest[i + 1] = palette[sp + 1]; dest[i + 2] = palette[sp + 2]; @@ -2095,20 +2232,20 @@ RFB.encodingHandlers = { return dest; }.bind(this); - var rQi = this._sock.get_rQi(); - var rQ = this._sock.rQwhole(); - var cmode, data; - var cl_header, cl_data; + const rQi = this._sock.get_rQi(); + const rQ = this._sock.rQwhole(); + let cmode, data; + let cl_header, cl_data; - var handlePalette = function () { - var numColors = rQ[rQi + 2] + 1; - var paletteSize = numColors * 3; + const handlePalette = function () { + const numColors = rQ[rQi + 2] + 1; + const paletteSize = numColors * 3; this._FBU.bytes += paletteSize; if (this._sock.rQwait("TIGHT palette " + cmode, this._FBU.bytes)) { return false; } - var bpp = (numColors <= 2) ? 1 : 8; - var rowSize = Math.floor((this._FBU.width * bpp + 7) / 8); - var raw = false; + const bpp = (numColors <= 2) ? 1 : 8; + const rowSize = Math.floor((this._FBU.width * bpp + 7) / 8); + let raw = false; if (rowSize * this._FBU.height < 12) { raw = true; cl_header = 0; @@ -2116,7 +2253,7 @@ RFB.encodingHandlers = { //clength = [0, rowSize * this._FBU.height]; } else { // begin inline getTightCLength (returning two-item arrays is bad for performance with GC) - var cl_offset = rQi + 3 + paletteSize; + const cl_offset = rQi + 3 + paletteSize; cl_header = 1; cl_data = 0; cl_data += rQ[cl_offset] & 0x7f; @@ -2136,7 +2273,7 @@ RFB.encodingHandlers = { // Shift ctl, filter id, num colors, palette entries, and clength off this._sock.rQskipBytes(3); - //var palette = this._sock.rQshiftBytes(paletteSize); + //const palette = this._sock.rQshiftBytes(paletteSize); this._sock.rQshiftTo(this._paletteBuff, paletteSize); this._sock.rQskipBytes(cl_header); @@ -2147,29 +2284,29 @@ RFB.encodingHandlers = { } // Convert indexed (palette based) image data to RGB - var rgbx; + let rgbx; if (numColors == 2) { rgbx = indexedToRGBX2Color(data, this._paletteBuff, this._FBU.width, this._FBU.height); - this._display.blitRgbxImage(this._FBU.x, this._FBU.y, this._FBU.width, this._FBU.height, rgbx, 0, false); } else { rgbx = indexedToRGBX(data, this._paletteBuff, this._FBU.width, this._FBU.height); - this._display.blitRgbxImage(this._FBU.x, this._FBU.y, this._FBU.width, this._FBU.height, rgbx, 0, false); } + this._display.blitRgbxImage(this._FBU.x, this._FBU.y, this._FBU.width, this._FBU.height, rgbx, 0, false); + return true; }.bind(this); - var handleCopy = function () { - var raw = false; - var uncompressedSize = this._FBU.width * this._FBU.height * 3; + const handleCopy = function () { + let raw = false; + const uncompressedSize = this._FBU.width * this._FBU.height * 3; if (uncompressedSize < 12) { raw = true; cl_header = 0; cl_data = uncompressedSize; } else { // begin inline getTightCLength (returning two-item arrays is for peformance with GC) - var cl_offset = rQi + 1; + const cl_offset = rQi + 1; cl_header = 1; cl_data = 0; cl_data += rQ[cl_offset] & 0x7f; @@ -2200,7 +2337,7 @@ RFB.encodingHandlers = { return true; }.bind(this); - var ctl = this._sock.rQpeek8(); + let ctl = this._sock.rQpeek8(); // Keep tight reset bits resetStreams = ctl & 0xF; @@ -2217,6 +2354,13 @@ RFB.encodingHandlers = { else return this._fail("Illegal tight compression received (ctl: " + ctl + ")"); + if (isTightPNG && (ctl < 0x08)) { + return this._fail("BasicCompression received in TightPNG rect"); + } + if (!isTightPNG && (ctl === 0x0A)) { + return this._fail("PNG received in standard Tight rect"); + } + switch (cmode) { // fill use depth because TPIXELs drop the padding byte case "fill": // TPIXEL @@ -2238,6 +2382,7 @@ RFB.encodingHandlers = { if (this._sock.rQwait("TIGHT " + cmode, this._FBU.bytes)) { return false; } // Determine FBU.bytes + let cl_offset, filterId; switch (cmode) { case "fill": // skip ctl byte @@ -2247,7 +2392,7 @@ RFB.encodingHandlers = { case "png": case "jpeg": // begin inline getTightCLength (returning two-item arrays is for peformance with GC) - var cl_offset = rQi + 1; + cl_offset = rQi + 1; cl_header = 1; cl_data = 0; cl_data += rQ[cl_offset] & 0x7f; @@ -2269,7 +2414,7 @@ RFB.encodingHandlers = { this._display.imageRect(this._FBU.x, this._FBU.y, "image/" + cmode, data); break; case "filter": - var filterId = rQ[rQi + 1]; + filterId = rQ[rQi + 1]; if (filterId === 1) { if (!handlePalette()) { return false; } } else { @@ -2300,10 +2445,18 @@ RFB.encodingHandlers = { this._FBU.bytes = 1; if (this._sock.rQwait("ExtendedDesktopSize", this._FBU.bytes)) { return false; } + const firstUpdate = !this._supportsSetDesktopSize; this._supportsSetDesktopSize = true; - this._setCapability("resize", true); - var number_of_screens = this._sock.rQpeek8(); + // Normally we only apply the current resize mode after a + // window resize event. However there is no such trigger on the + // initial connect. And we don't know if the server supports + // resizing until we've gotten here. + if (firstUpdate) { + this._requestRemoteResize(); + } + + const number_of_screens = this._sock.rQpeek8(); this._FBU.bytes = 4 + (number_of_screens * 16); if (this._sock.rQwait("ExtendedDesktopSize", this._FBU.bytes)) { return false; } @@ -2311,7 +2464,7 @@ RFB.encodingHandlers = { this._sock.rQskipBytes(1); // number-of-screens this._sock.rQskipBytes(3); // padding - for (var i = 0; i < number_of_screens; i += 1) { + for (let i = 0; i < number_of_screens; i += 1) { // Save the id and flags of the first screen if (i === 0) { this._screen_id = this._sock.rQshiftBytes(4); // id @@ -2335,7 +2488,7 @@ RFB.encodingHandlers = { // We need to handle errors when we requested the resize. if (this._FBU.x === 1 && this._FBU.y !== 0) { - var msg = ""; + let msg = ""; // The y-position indicates the status code from the server switch (this._FBU.y) { case 1: @@ -2371,20 +2524,20 @@ RFB.encodingHandlers = { Cursor: function () { Log.Debug(">> set_cursor"); - var x = this._FBU.x; // hotspot-x - var y = this._FBU.y; // hotspot-y - var w = this._FBU.width; - var h = this._FBU.height; + const x = this._FBU.x; // hotspot-x + const y = this._FBU.y; // hotspot-y + const w = this._FBU.width; + const h = this._FBU.height; - var pixelslength = w * h * 4; - var masklength = Math.floor((w + 7) / 8) * h; + const pixelslength = w * h * 4; + const masklength = Math.floor((w + 7) / 8) * h; this._FBU.bytes = pixelslength + masklength; if (this._sock.rQwait("cursor encoding", this._FBU.bytes)) { return false; } - this._display.changeCursor(this._sock.rQshiftBytes(pixelslength), - this._sock.rQshiftBytes(masklength), - x, y, w, h); + this._cursor.change(this._sock.rQshiftBytes(pixelslength), + this._sock.rQshiftBytes(masklength), + x, y, w, h); this._FBU.bytes = 0; this._FBU.rects--; @@ -2398,11 +2551,12 @@ RFB.encodingHandlers = { // Old Safari doesn't support creating keyboard events try { - var keyboardEvent = document.createEvent("keyboardEvent"); + const keyboardEvent = document.createEvent("keyboardEvent"); if (keyboardEvent.code !== undefined) { this._qemuExtKeyEventSupported = true; } } catch (err) { + // Do nothing } }, -}; +}