summaryrefslogtreecommitdiffstats
path: root/webclients/novnc/include
diff options
context:
space:
mode:
Diffstat (limited to 'webclients/novnc/include')
-rw-r--r--webclients/novnc/include/Orbitron700.ttfbin38580 -> 0 bytes
-rw-r--r--webclients/novnc/include/Orbitron700.woffbin17472 -> 0 bytes
-rw-r--r--webclients/novnc/include/base.css512
-rw-r--r--webclients/novnc/include/base64.js113
-rw-r--r--webclients/novnc/include/black.css71
-rw-r--r--webclients/novnc/include/blue.css64
-rw-r--r--webclients/novnc/include/chrome-app/tcp-client.js321
-rw-r--r--webclients/novnc/include/des.js276
-rw-r--r--webclients/novnc/include/display.js746
-rw-r--r--webclients/novnc/include/input.js388
-rw-r--r--webclients/novnc/include/jsunzip.js676
-rw-r--r--webclients/novnc/include/keyboard.js543
-rw-r--r--webclients/novnc/include/keysym.js378
-rw-r--r--webclients/novnc/include/keysymdef.js15
-rw-r--r--webclients/novnc/include/logo.js1
-rw-r--r--webclients/novnc/include/playback.js102
-rw-r--r--webclients/novnc/include/rfb.js1882
-rw-r--r--webclients/novnc/include/ui.js979
-rw-r--r--webclients/novnc/include/util.js656
-rw-r--r--webclients/novnc/include/web-socket-js/README.txt109
-rw-r--r--webclients/novnc/include/web-socket-js/WebSocketMain.swfbin177139 -> 0 bytes
-rw-r--r--webclients/novnc/include/web-socket-js/swfobject.js4
-rw-r--r--webclients/novnc/include/web-socket-js/web_socket.js391
-rw-r--r--webclients/novnc/include/websock.js384
-rw-r--r--webclients/novnc/include/webutil.js239
25 files changed, 0 insertions, 8850 deletions
diff --git a/webclients/novnc/include/Orbitron700.ttf b/webclients/novnc/include/Orbitron700.ttf
deleted file mode 100644
index e28729d..0000000
--- a/webclients/novnc/include/Orbitron700.ttf
+++ /dev/null
Binary files differ
diff --git a/webclients/novnc/include/Orbitron700.woff b/webclients/novnc/include/Orbitron700.woff
deleted file mode 100644
index 61db630..0000000
--- a/webclients/novnc/include/Orbitron700.woff
+++ /dev/null
Binary files differ
diff --git a/webclients/novnc/include/base.css b/webclients/novnc/include/base.css
deleted file mode 100644
index e2c9a96..0000000
--- a/webclients/novnc/include/base.css
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
- * noVNC base CSS
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2013 Samuel Mannehed for Cendio AB
- * noVNC is licensed under the MPL 2.0 (see LICENSE.txt)
- * This file is licensed under the 2-Clause BSD license (see LICENSE.txt).
- */
-
-body {
- margin:0;
- padding:0;
- font-family: Helvetica;
- /*Background image with light grey curve.*/
- background-color:#494949;
- background-repeat:no-repeat;
- background-position:right bottom;
- height:100%;
-}
-
-html {
- height:100%;
-}
-
-#noVNC_controls ul {
- list-style: none;
- margin: 0px;
- padding: 0px;
-}
-#noVNC_controls li {
- padding-bottom:8px;
-}
-
-#noVNC_host {
- width:150px;
-}
-#noVNC_port {
- width: 80px;
-}
-#noVNC_password {
- width: 150px;
-}
-#noVNC_encrypt {
-}
-#noVNC_path {
- width: 100px;
-}
-#noVNC_connect_button {
- width: 110px;
- float:right;
-}
-
-#noVNC_buttons {
- white-space: nowrap;
-}
-
-#noVNC_view_drag_button {
- display: none;
-}
-#sendCtrlAltDelButton {
- display: none;
-}
-#noVNC_xvp_buttons {
- display: none;
-}
-#noVNC_mobile_buttons {
- display: none;
-}
-
-#noVNC_extra_keys {
- display: inline;
- list-style-type: none;
- padding: 0px;
- margin: 0px;
- position: relative;
-}
-
-.noVNC-buttons-left {
- float: left;
- z-index: 1;
- position: relative;
-}
-
-.noVNC-buttons-right {
- float:right;
- right: 0px;
- z-index: 2;
- position: absolute;
-}
-
-#noVNC_status {
- font-size: 12px;
- padding-top: 4px;
- height:32px;
- text-align: center;
- font-weight: bold;
- color: #fff;
-}
-
-#noVNC_settings_menu {
- margin: 3px;
- text-align: left;
-}
-#noVNC_settings_menu ul {
- list-style: none;
- margin: 0px;
- padding: 0px;
-}
-
-#noVNC_apply {
- float:right;
-}
-
-/* Do not set width/height for VNC_screen or VNC_canvas or incorrect
- * scaling will occur. Canvas resizes to remote VNC settings */
-#noVNC_screen_pad {
- margin: 0px;
- padding: 0px;
- height: 36px;
-}
-#noVNC_screen {
- text-align: center;
- display: table;
- width:100%;
- height:100%;
- background-color:#313131;
- border-bottom-right-radius: 800px 600px;
- /*border-top-left-radius: 800px 600px;*/
-}
-
-#noVNC_container, #noVNC_canvas {
- margin: 0px;
- padding: 0px;
-}
-
-#noVNC_canvas {
- left: 0px;
-}
-
-#VNC_clipboard_clear_button {
- float:right;
-}
-#VNC_clipboard_text {
- font-size: 11px;
-}
-
-#noVNC_clipboard_clear_button {
- float:right;
-}
-
-/*Bubble contents divs*/
-#noVNC_settings {
- display:none;
- margin-top:73px;
- right:20px;
- position:fixed;
-}
-
-#noVNC_controls {
- display:none;
- margin-top:73px;
- right:12px;
- position:fixed;
-}
-#noVNC_controls.top:after {
- right:15px;
-}
-
-#noVNC_description {
- display:none;
- position:fixed;
-
- margin-top:73px;
- right:20px;
- left:20px;
- padding:15px;
- color:#000;
- background:#eee; /* default background for browsers without gradient support */
-
- border:2px solid #E0E0E0;
- -webkit-border-radius:10px;
- -moz-border-radius:10px;
- border-radius:10px;
-}
-
-#noVNC_popup_status_panel {
- display:none;
- position: fixed;
- z-index: 1;
-
- margin:15px;
- margin-top:60px;
- padding:15px;
- width:auto;
-
- text-align:center;
- font-weight:bold;
- word-wrap:break-word;
- color:#fff;
- background:rgba(0,0,0,0.65);
-
- -webkit-border-radius:10px;
- -moz-border-radius:10px;
- border-radius:10px;
-}
-
-#noVNC_xvp {
- display:none;
- margin-top:73px;
- right:30px;
- position:fixed;
-}
-#noVNC_xvp.top:after {
- right:125px;
-}
-
-#noVNC_clipboard {
- display:none;
- margin-top:73px;
- right:30px;
- position:fixed;
-}
-#noVNC_clipboard.top:after {
- right:85px;
-}
-
-#keyboardinput {
- width:1px;
- height:1px;
- background-color:#fff;
- color:#fff;
- border:0;
- position: relative;
- left: -40px;
- z-index: -1;
-}
-
-/*
- * Advanced Styling
- */
-
-.noVNC_status_normal {
- background: #b2bdcd; /* Old browsers */
- background: -moz-linear-gradient(top, #b2bdcd 0%, #899cb3 49%, #7e93af 51%, #6e84a3 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#b2bdcd), color-stop(49%,#899cb3), color-stop(51%,#7e93af), color-stop(100%,#6e84a3)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* IE10+ */
- background: linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* W3C */
-}
-.noVNC_status_error {
- background: #f04040; /* Old browsers */
- background: -moz-linear-gradient(top, #f04040 0%, #899cb3 49%, #7e93af 51%, #6e84a3 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f04040), color-stop(49%,#899cb3), color-stop(51%,#7e93af), color-stop(100%,#6e84a3)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #f04040 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #f04040 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #f04040 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* IE10+ */
- background: linear-gradient(top, #f04040 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* W3C */
-}
-.noVNC_status_warn {
- background: #f0f040; /* Old browsers */
- background: -moz-linear-gradient(top, #f0f040 0%, #899cb3 49%, #7e93af 51%, #6e84a3 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f0f040), color-stop(49%,#899cb3), color-stop(51%,#7e93af), color-stop(100%,#6e84a3)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #f0f040 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #f0f040 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #f0f040 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* IE10+ */
- background: linear-gradient(top, #f0f040 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* W3C */
-}
-
-/* Control bar */
-#noVNC-control-bar {
- position:fixed;
-
- display:block;
- height:36px;
- left:0;
- top:0;
- width:100%;
- z-index:200;
-}
-
-.noVNC_status_button {
- padding: 4px 4px;
- vertical-align: middle;
- border:1px solid #869dbc;
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- border-radius: 6px;
- background: #b2bdcd; /* Old browsers */
- background: -moz-linear-gradient(top, #b2bdcd 0%, #899cb3 49%, #7e93af 51%, #6e84a3 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#b2bdcd), color-stop(49%,#899cb3), color-stop(51%,#7e93af), color-stop(100%,#6e84a3)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* IE10+ */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#b2bdcd', endColorstr='#6e84a3',GradientType=0 ); /* IE6-9 */
- background: linear-gradient(top, #b2bdcd 0%,#899cb3 49%,#7e93af 51%,#6e84a3 100%); /* W3C */
- /*box-shadow:inset 0.4px 0.4px 0.4px #000000;*/
-}
-
-.noVNC_status_button_selected {
- padding: 4px 4px;
- vertical-align: middle;
- border:1px solid #4366a9;
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- background: #779ced; /* Old browsers */
- background: -moz-linear-gradient(top, #779ced 0%, #3970e0 49%, #2160dd 51%, #2463df 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#779ced), color-stop(49%,#3970e0), color-stop(51%,#2160dd), color-stop(100%,#2463df)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #779ced 0%,#3970e0 49%,#2160dd 51%,#2463df 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #779ced 0%,#3970e0 49%,#2160dd 51%,#2463df 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #779ced 0%,#3970e0 49%,#2160dd 51%,#2463df 100%); /* IE10+ */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#779ced', endColorstr='#2463df',GradientType=0 ); /* IE6-9 */
- background: linear-gradient(top, #779ced 0%,#3970e0 49%,#2160dd 51%,#2463df 100%); /* W3C */
- /*box-shadow:inset 0.4px 0.4px 0.4px #000000;*/
-}
-
-
-/*Settings Bubble*/
-.triangle-right {
- position:relative;
- padding:15px;
- margin:1em 0 3em;
- color:#fff;
- background:#fff; /* default background for browsers without gradient support */
- /* css3 */
- /*background:-webkit-gradient(linear, 0 0, 0 100%, from(#2e88c4), to(#075698));
- background:-moz-linear-gradient(#2e88c4, #075698);
- background:-o-linear-gradient(#2e88c4, #075698);
- background:linear-gradient(#2e88c4, #075698);*/
- -webkit-border-radius:10px;
- -moz-border-radius:10px;
- border-radius:10px;
- color:#000;
- border:2px solid #E0E0E0;
-}
-
-.triangle-right.top:after {
- border-color: transparent #E0E0E0;
- border-width: 20px 20px 0 0;
- bottom: auto;
- left: auto;
- right: 50px;
- top: -20px;
-}
-
-.triangle-right:after {
- content:"";
- position:absolute;
- bottom:-20px; /* value = - border-top-width - border-bottom-width */
- left:50px; /* controls horizontal position */
- border-width:20px 0 0 20px; /* vary these values to change the angle of the vertex */
- border-style:solid;
- border-color:#E0E0E0 transparent;
- /* reduce the damage in FF3.0 */
- display:block;
- width:0;
-}
-
-.triangle-right.top:after {
- top:-40px; /* value = - border-top-width - border-bottom-width */
- right:50px; /* controls horizontal position */
- bottom:auto;
- left:auto;
- border-width:40px 40px 0 0; /* vary these values to change the angle of the vertex */
- border-color:transparent #E0E0E0;
-}
-
-/*Default noVNC logo.*/
-/* From: http://fonts.googleapis.com/css?family=Orbitron:700 */
-@font-face {
- font-family: 'Orbitron';
- font-style: normal;
- font-weight: 700;
- src: local('?'), url('Orbitron700.woff') format('woff'),
- url('Orbitron700.ttf') format('truetype');
-}
-
-#noVNC_logo {
- margin-top: 170px;
- margin-left: 10px;
- color:yellow;
- text-align:left;
- font-family: 'Orbitron', 'OrbitronTTF', sans-serif;
- line-height:90%;
- text-shadow:
- 5px 5px 0 #000,
- -1px -1px 0 #000,
- 1px -1px 0 #000,
- -1px 1px 0 #000,
- 1px 1px 0 #000;
-}
-
-
-#noVNC_logo span{
- color:green;
-}
-
-/* ----------------------------------------
- * Media sizing
- * ----------------------------------------
- */
-
-
-.noVNC_status_button {
- font-size: 12px;
-}
-
-#noVNC_clipboard_text {
- width: 500px;
-}
-
-#noVNC_logo {
- font-size: 180px;
-}
-
-.noVNC-buttons-left {
- padding-left: 10px;
-}
-
-.noVNC-buttons-right {
- padding-right: 10px;
-}
-
-#noVNC_status {
- z-index: 0;
- position: absolute;
- width: 100%;
- margin-left: 0px;
-}
-
-#showExtraKeysButton { display: none; }
-#toggleCtrlButton { display: inline; }
-#toggleAltButton { display: inline; }
-#sendTabButton { display: inline; }
-#sendEscButton { display: inline; }
-
-/* left-align the status text on lower resolutions */
-@media screen and (max-width: 800px){
- #noVNC_status {
- z-index: 1;
- position: relative;
- width: auto;
- float: left;
- margin-left: 4px;
- }
-}
-
-@media screen and (max-width: 640px){
- #noVNC_clipboard_text {
- width: 410px;
- }
- #noVNC_logo {
- font-size: 150px;
- }
- .noVNC_status_button {
- font-size: 10px;
- }
- .noVNC-buttons-left {
- padding-left: 0px;
- }
- .noVNC-buttons-right {
- padding-right: 0px;
- }
- /* collapse the extra keys on lower resolutions */
- #showExtraKeysButton {
- display: inline;
- }
- #toggleCtrlButton {
- display: none;
- position: absolute;
- top: 30px;
- left: 0px;
- }
- #toggleAltButton {
- display: none;
- position: absolute;
- top: 65px;
- left: 0px;
- }
- #sendTabButton {
- display: none;
- position: absolute;
- top: 100px;
- left: 0px;
- }
- #sendEscButton {
- display: none;
- position: absolute;
- top: 135px;
- left: 0px;
- }
-}
-
-@media screen and (min-width: 321px) and (max-width: 480px) {
- #noVNC_clipboard_text {
- width: 250px;
- }
- #noVNC_logo {
- font-size: 110px;
- }
-}
-
-@media screen and (max-width: 320px) {
- .noVNC_status_button {
- font-size: 9px;
- }
- #noVNC_clipboard_text {
- width: 220px;
- }
- #noVNC_logo {
- font-size: 90px;
- }
-}
diff --git a/webclients/novnc/include/base64.js b/webclients/novnc/include/base64.js
deleted file mode 100644
index 651fbad..0000000
--- a/webclients/novnc/include/base64.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// From: http://hg.mozilla.org/mozilla-central/raw-file/ec10630b1a54/js/src/devtools/jint/sunspider/string-base64.js
-
-/*jslint white: false */
-/*global console */
-
-var Base64 = {
- /* Convert data (an array of integers) to a Base64 string. */
- toBase64Table : 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='.split(''),
- base64Pad : '=',
-
- encode: function (data) {
- "use strict";
- var result = '';
- var toBase64Table = Base64.toBase64Table;
- var length = data.length;
- var lengthpad = (length % 3);
- // Convert every three bytes to 4 ascii characters.
-
- for (var i = 0; i < (length - 2); i += 3) {
- result += toBase64Table[data[i] >> 2];
- result += toBase64Table[((data[i] & 0x03) << 4) + (data[i + 1] >> 4)];
- result += toBase64Table[((data[i + 1] & 0x0f) << 2) + (data[i + 2] >> 6)];
- result += toBase64Table[data[i + 2] & 0x3f];
- }
-
- // Convert the remaining 1 or 2 bytes, pad out to 4 characters.
- var j = 0;
- if (lengthpad === 2) {
- j = length - lengthpad;
- result += toBase64Table[data[j] >> 2];
- result += toBase64Table[((data[j] & 0x03) << 4) + (data[j + 1] >> 4)];
- result += toBase64Table[(data[j + 1] & 0x0f) << 2];
- result += toBase64Table[64];
- } else if (lengthpad === 1) {
- j = length - lengthpad;
- result += toBase64Table[data[j] >> 2];
- result += toBase64Table[(data[j] & 0x03) << 4];
- result += toBase64Table[64];
- result += toBase64Table[64];
- }
-
- return result;
- },
-
- /* Convert Base64 data to a string */
- /* jshint -W013 */
- 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
- ],
- /* jshint +W013 */
-
- decode: function (data, offset) {
- "use strict";
- offset = typeof(offset) !== 'undefined' ? offset : 0;
- var toBinaryTable = Base64.toBinaryTable;
- var base64Pad = Base64.base64Pad;
- var result, result_length;
- var leftbits = 0; // number of bits decoded, but yet to be appended
- var leftdata = 0; // bits decoded, but yet to be appended
- var data_length = data.indexOf('=') - offset;
-
- if (data_length < 0) { data_length = data.length - offset; }
-
- /* Every four characters is 3 resulting numbers */
- result_length = (data_length >> 2) * 3 + Math.floor((data_length % 4) / 1.5);
- result = new Array(result_length);
-
- // Convert one by one.
- for (var idx = 0, i = offset; i < data.length; i++) {
- var c = toBinaryTable[data.charCodeAt(i) & 0x7f];
- var padding = (data.charAt(i) === base64Pad);
- // Skip illegal characters and whitespace
- if (c === -1) {
- console.error("Illegal character code " + data.charCodeAt(i) + " at position " + i);
- continue;
- }
-
- // Collect data into leftdata, update bitcount
- leftdata = (leftdata << 6) | c;
- leftbits += 6;
-
- // If we have 8 or more bits, append 8 bits to the result
- if (leftbits >= 8) {
- leftbits -= 8;
- // Append if not padding.
- if (!padding) {
- result[idx++] = (leftdata >> leftbits) & 0xff;
- }
- leftdata &= (1 << leftbits) - 1;
- }
- }
-
- // If there are any bits left, the base64 string was corrupted
- if (leftbits) {
- err = new Error('Corrupted base64 string');
- err.name = 'Base64-Error';
- throw err;
- }
-
- return result;
- }
-}; /* End of Base64 namespace */
diff --git a/webclients/novnc/include/black.css b/webclients/novnc/include/black.css
deleted file mode 100644
index 7d940c5..0000000
--- a/webclients/novnc/include/black.css
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * noVNC black CSS
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2013 Samuel Mannehed for Cendio AB
- * noVNC is licensed under the MPL 2.0 (see LICENSE.txt)
- * This file is licensed under the 2-Clause BSD license (see LICENSE.txt).
- */
-
-#keyboardinput {
- background-color:#000;
-}
-
-.noVNC_status_normal {
- background: #4c4c4c; /* Old browsers */
- background: -moz-linear-gradient(top, #4c4c4c 0%, #2c2c2c 50%, #000000 51%, #131313 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4c4c4c), color-stop(50%,#2c2c2c), color-stop(51%,#000000), color-stop(100%,#131313)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* IE10+ */
- background: linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* W3C */
-}
-.noVNC_status_error {
- background: #f04040; /* Old browsers */
- background: -moz-linear-gradient(top, #f04040 0%, #2c2c2c 50%, #000000 51%, #131313 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f04040), color-stop(50%,#2c2c2c), color-stop(51%,#000000), color-stop(100%,#131313)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #f04040 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #f04040 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #f04040 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* IE10+ */
- background: linear-gradient(top, #f04040 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* W3C */
-}
-.noVNC_status_warn {
- background: #f0f040; /* Old browsers */
- background: -moz-linear-gradient(top, #f0f040 0%, #2c2c2c 50%, #000000 51%, #131313 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f0f040), color-stop(50%,#2c2c2c), color-stop(51%,#000000), color-stop(100%,#131313)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #f0f040 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #f0f040 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #f0f040 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* IE10+ */
- background: linear-gradient(top, #f0f040 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* W3C */
-}
-
-.triangle-right {
- border:2px solid #fff;
- background:#000;
- color:#fff;
-}
-
-.noVNC_status_button {
- font-size: 12px;
- vertical-align: middle;
- border:1px solid #4c4c4c;
-
- background: #4c4c4c; /* Old browsers */
- background: -moz-linear-gradient(top, #4c4c4c 0%, #2c2c2c 50%, #000000 51%, #131313 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4c4c4c), color-stop(50%,#2c2c2c), color-stop(51%,#000000), color-stop(100%,#131313)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* IE10+ */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4c4c4c', endColorstr='#131313',GradientType=0 ); /* IE6-9 */
- background: linear-gradient(top, #4c4c4c 0%,#2c2c2c 50%,#000000 51%,#131313 100%); /* W3C */
-}
-
-.noVNC_status_button_selected {
- background: #9dd53a; /* Old browsers */
- background: -moz-linear-gradient(top, #9dd53a 0%, #a1d54f 50%, #80c217 51%, #7cbc0a 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#9dd53a), color-stop(50%,#a1d54f), color-stop(51%,#80c217), color-stop(100%,#7cbc0a)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* Opera11.10+ */
- background: -ms-linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* IE10+ */
- filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9dd53a', endColorstr='#7cbc0a',GradientType=0 ); /* IE6-9 */
- background: linear-gradient(top, #9dd53a 0%,#a1d54f 50%,#80c217 51%,#7cbc0a 100%); /* W3C */
-}
diff --git a/webclients/novnc/include/blue.css b/webclients/novnc/include/blue.css
deleted file mode 100644
index b2a0adc..0000000
--- a/webclients/novnc/include/blue.css
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * noVNC blue CSS
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2013 Samuel Mannehed for Cendio AB
- * noVNC is licensed under the MPL 2.0 (see LICENSE.txt)
- * This file is licensed under the 2-Clause BSD license (see LICENSE.txt).
- */
-
-.noVNC_status_normal {
- background-color:#04073d;
- background-image: -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0.54, rgb(10,15,79)),
- color-stop(0.5, rgb(4,7,61))
- );
- background-image: -moz-linear-gradient(
- center bottom,
- rgb(10,15,79) 54%,
- rgb(4,7,61) 50%
- );
-}
-.noVNC_status_error {
- background-color:#f04040;
- background-image: -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0.54, rgb(240,64,64)),
- color-stop(0.5, rgb(4,7,61))
- );
- background-image: -moz-linear-gradient(
- center bottom,
- rgb(4,7,61) 54%,
- rgb(249,64,64) 50%
- );
-}
-.noVNC_status_warn {
- background-color:#f0f040;
- background-image: -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0.54, rgb(240,240,64)),
- color-stop(0.5, rgb(4,7,61))
- );
- background-image: -moz-linear-gradient(
- center bottom,
- rgb(4,7,61) 54%,
- rgb(240,240,64) 50%
- );
-}
-
-.triangle-right {
- border:2px solid #fff;
- background:#04073d;
- color:#fff;
-}
-
-#keyboardinput {
- background-color:#04073d;
-}
-
diff --git a/webclients/novnc/include/chrome-app/tcp-client.js b/webclients/novnc/include/chrome-app/tcp-client.js
deleted file mode 100644
index b8c125f..0000000
--- a/webclients/novnc/include/chrome-app/tcp-client.js
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
-Copyright 2012 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Author: Boris Smus (smus@chromium.org)
-*/
-
-(function(exports) {
-
- // Define some local variables here.
- var socket = chrome.socket || chrome.experimental.socket;
- var dns = chrome.experimental.dns;
-
- /**
- * Creates an instance of the client
- *
- * @param {String} host The remote host to connect to
- * @param {Number} port The port to connect to at the remote host
- */
- function TcpClient(host, port, pollInterval) {
- this.host = host;
- this.port = port;
- this.pollInterval = pollInterval || 15;
-
- // Callback functions.
- this.callbacks = {
- connect: null, // Called when socket is connected.
- disconnect: null, // Called when socket is disconnected.
- recvBuffer: null, // Called (as ArrayBuffer) when client receives data from server.
- recvString: null, // Called (as string) when client receives data from server.
- sent: null // Called when client sends data to server.
- };
-
- // Socket.
- this.socketId = null;
- this.isConnected = false;
-
- log('initialized tcp client');
- }
-
- /**
- * Connects to the TCP socket, and creates an open socket.
- *
- * @see http://developer.chrome.com/trunk/apps/socket.html#method-create
- * @param {Function} callback The function to call on connection
- */
- TcpClient.prototype.connect = function(callback) {
- // First resolve the hostname to an IP.
- dns.resolve(this.host, function(result) {
- this.addr = result.address;
- socket.create('tcp', {}, this._onCreate.bind(this));
-
- // Register connect callback.
- this.callbacks.connect = callback;
- }.bind(this));
- };
-
- /**
- * Sends an arraybuffer/view down the wire to the remote side
- *
- * @see http://developer.chrome.com/trunk/apps/socket.html#method-write
- * @param {String} msg The arraybuffer/view to send
- * @param {Function} callback The function to call when the message has sent
- */
- TcpClient.prototype.sendBuffer = function(buf, callback) {
- if (buf.buffer) {
- buf = buf.buffer;
- }
-
- /*
- // Debug
- var bytes = [], u8 = new Uint8Array(buf);
- for (var i = 0; i < u8.length; i++) {
- bytes.push(u8[i]);
- }
- log("sending bytes: " + (bytes.join(',')));
- */
-
- socket.write(this.socketId, buf, this._onWriteComplete.bind(this));
-
- // Register sent callback.
- this.callbacks.sent = callback;
- };
-
- /**
- * Sends a string down the wire to the remote side
- *
- * @see http://developer.chrome.com/trunk/apps/socket.html#method-write
- * @param {String} msg The string to send
- * @param {Function} callback The function to call when the message has sent
- */
- TcpClient.prototype.sendString = function(msg, callback) {
- /*
- // Debug
- log("sending string: " + msg);
- */
-
- this._stringToArrayBuffer(msg, function(arrayBuffer) {
- socket.write(this.socketId, arrayBuffer, this._onWriteComplete.bind(this));
- }.bind(this));
-
- // Register sent callback.
- this.callbacks.sent = callback;
- };
-
- /**
- * Sets the callback for when a message is received
- *
- * @param {Function} callback The function to call when a message has arrived
- * @param {String} type The callback argument type: "arraybuffer" or "string"
- */
- TcpClient.prototype.addResponseListener = function(callback, type) {
- if (typeof type === "undefined") {
- type = "arraybuffer";
- }
- // Register received callback.
- if (type === "string") {
- this.callbacks.recvString = callback;
- } else {
- this.callbacks.recvBuffer = callback;
- }
- };
-
- /**
- * Sets the callback for when the socket disconnects
- *
- * @param {Function} callback The function to call when the socket disconnects
- * @param {String} type The callback argument type: "arraybuffer" or "string"
- */
- TcpClient.prototype.addDisconnectListener = function(callback) {
- // Register disconnect callback.
- this.callbacks.disconnect = callback;
- };
-
- /**
- * Disconnects from the remote side
- *
- * @see http://developer.chrome.com/trunk/apps/socket.html#method-disconnect
- */
- TcpClient.prototype.disconnect = function() {
- if (this.isConnected) {
- this.isConnected = false;
- socket.disconnect(this.socketId);
- if (this.callbacks.disconnect) {
- this.callbacks.disconnect();
- }
- log('socket disconnected');
- }
- };
-
- /**
- * The callback function used for when we attempt to have Chrome
- * create a socket. If the socket is successfully created
- * we go ahead and connect to the remote side.
- *
- * @private
- * @see http://developer.chrome.com/trunk/apps/socket.html#method-connect
- * @param {Object} createInfo The socket details
- */
- TcpClient.prototype._onCreate = function(createInfo) {
- this.socketId = createInfo.socketId;
- if (this.socketId > 0) {
- socket.connect(this.socketId, this.addr, this.port, this._onConnectComplete.bind(this));
- } else {
- error('Unable to create socket');
- }
- };
-
- /**
- * The callback function used for when we attempt to have Chrome
- * connect to the remote side. If a successful connection is
- * made then polling starts to check for data to read
- *
- * @private
- * @param {Number} resultCode Indicates whether the connection was successful
- */
- TcpClient.prototype._onConnectComplete = function(resultCode) {
- // Start polling for reads.
- this.isConnected = true;
- setTimeout(this._periodicallyRead.bind(this), this.pollInterval);
-
- if (this.callbacks.connect) {
- log('connect complete');
- this.callbacks.connect();
- }
- log('onConnectComplete');
- };
-
- /**
- * Checks for new data to read from the socket
- *
- * @see http://developer.chrome.com/trunk/apps/socket.html#method-read
- */
- TcpClient.prototype._periodicallyRead = function() {
- var that = this;
- socket.getInfo(this.socketId, function (info) {
- if (info.connected) {
- setTimeout(that._periodicallyRead.bind(that), that.pollInterval);
- socket.read(that.socketId, null, that._onDataRead.bind(that));
- } else if (that.isConnected) {
- log('socket disconnect detected');
- that.disconnect();
- }
- });
- };
-
- /**
- * Callback function for when data has been read from the socket.
- * Converts the array buffer that is read in to a string
- * and sends it on for further processing by passing it to
- * the previously assigned callback function.
- *
- * @private
- * @see TcpClient.prototype.addResponseListener
- * @param {Object} readInfo The incoming message
- */
- TcpClient.prototype._onDataRead = function(readInfo) {
- // Call received callback if there's data in the response.
- if (readInfo.resultCode > 0) {
- log('onDataRead');
-
- /*
- // Debug
- var bytes = [], u8 = new Uint8Array(readInfo.data);
- for (var i = 0; i < u8.length; i++) {
- bytes.push(u8[i]);
- }
- log("received bytes: " + (bytes.join(',')));
- */
-
- if (this.callbacks.recvBuffer) {
- // Return raw ArrayBuffer directly.
- this.callbacks.recvBuffer(readInfo.data);
- }
- if (this.callbacks.recvString) {
- // Convert ArrayBuffer to string.
- this._arrayBufferToString(readInfo.data, function(str) {
- this.callbacks.recvString(str);
- }.bind(this));
- }
-
- // Trigger another read right away
- setTimeout(this._periodicallyRead.bind(this), 0);
- }
- };
-
- /**
- * Callback for when data has been successfully
- * written to the socket.
- *
- * @private
- * @param {Object} writeInfo The outgoing message
- */
- TcpClient.prototype._onWriteComplete = function(writeInfo) {
- log('onWriteComplete');
- // Call sent callback.
- if (this.callbacks.sent) {
- this.callbacks.sent(writeInfo);
- }
- };
-
- /**
- * Converts an array buffer to a string
- *
- * @private
- * @param {ArrayBuffer} buf The buffer to convert
- * @param {Function} callback The function to call when conversion is complete
- */
- TcpClient.prototype._arrayBufferToString = function(buf, callback) {
- var bb = new Blob([new Uint8Array(buf)]);
- var f = new FileReader();
- f.onload = function(e) {
- callback(e.target.result);
- };
- f.readAsText(bb);
- };
-
- /**
- * Converts a string to an array buffer
- *
- * @private
- * @param {String} str The string to convert
- * @param {Function} callback The function to call when conversion is complete
- */
- TcpClient.prototype._stringToArrayBuffer = function(str, callback) {
- var bb = new Blob([str]);
- var f = new FileReader();
- f.onload = function(e) {
- callback(e.target.result);
- };
- f.readAsArrayBuffer(bb);
- };
-
- /**
- * Wrapper function for logging
- */
- function log(msg) {
- console.log(msg);
- }
-
- /**
- * Wrapper function for error logging
- */
- function error(msg) {
- console.error(msg);
- }
-
- exports.TcpClient = TcpClient;
-
-})(window);
diff --git a/webclients/novnc/include/des.js b/webclients/novnc/include/des.js
deleted file mode 100644
index ecbc819..0000000
--- a/webclients/novnc/include/des.js
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Ported from Flashlight VNC ActionScript implementation:
- * http://www.wizhelp.com/flashlight-vnc/
- *
- * Full attribution follows:
- *
- * -------------------------------------------------------------------------
- *
- * This DES class has been extracted from package Acme.Crypto for use in VNC.
- * The unnecessary odd parity code has been removed.
- *
- * These changes are:
- * Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
-
- * DesCipher - the DES encryption method
- *
- * The meat of this code is by Dave Zimmerman <dzimm@widget.com>, and is:
- *
- * Copyright (c) 1996 Widget Workshop, Inc. All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software
- * and its documentation for NON-COMMERCIAL or COMMERCIAL purposes and
- * without fee is hereby granted, provided that this copyright notice is kept
- * intact.
- *
- * WIDGET WORKSHOP MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY
- * OF THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
- * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE, OR NON-INFRINGEMENT. WIDGET WORKSHOP SHALL NOT BE LIABLE
- * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
- * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.
- *
- * THIS SOFTWARE IS NOT DESIGNED OR INTENDED FOR USE OR RESALE AS ON-LINE
- * CONTROL EQUIPMENT IN HAZARDOUS ENVIRONMENTS REQUIRING FAIL-SAFE
- * PERFORMANCE, SUCH AS IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT
- * NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL, DIRECT LIFE
- * SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH THE FAILURE OF THE
- * SOFTWARE COULD LEAD DIRECTLY TO DEATH, PERSONAL INJURY, OR SEVERE
- * PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH RISK ACTIVITIES"). WIDGET WORKSHOP
- * SPECIFICALLY DISCLAIMS ANY EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR
- * HIGH RISK ACTIVITIES.
- *
- *
- * The rest is:
- *
- * Copyright (C) 1996 by Jef Poskanzer <jef@acme.com>. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Visit the ACME Labs Java page for up-to-date versions of this and other
- * fine Java utilities: http://www.acme.com/java/
- */
-
-/* jslint white: false */
-
-function DES(passwd) {
- "use strict";
-
- // Tables, permutations, S-boxes, etc.
- // jshint -W013
- var PC2 = [13,16,10,23, 0, 4, 2,27,14, 5,20, 9,22,18,11, 3,
- 25, 7,15, 6,26,19,12, 1,40,51,30,36,46,54,29,39,
- 50,44,32,47,43,48,38,55,33,52,45,41,49,35,28,31 ],
- totrot = [ 1, 2, 4, 6, 8,10,12,14,15,17,19,21,23,25,27,28],
- z = 0x0, a,b,c,d,e,f, SP1,SP2,SP3,SP4,SP5,SP6,SP7,SP8,
- keys = [];
-
- // jshint -W015
- a=1<<16; b=1<<24; c=a|b; d=1<<2; e=1<<10; f=d|e;
- SP1 = [c|e,z|z,a|z,c|f,c|d,a|f,z|d,a|z,z|e,c|e,c|f,z|e,b|f,c|d,b|z,z|d,
- z|f,b|e,b|e,a|e,a|e,c|z,c|z,b|f,a|d,b|d,b|d,a|d,z|z,z|f,a|f,b|z,
- a|z,c|f,z|d,c|z,c|e,b|z,b|z,z|e,c|d,a|z,a|e,b|d,z|e,z|d,b|f,a|f,
- c|f,a|d,c|z,b|f,b|d,z|f,a|f,c|e,z|f,b|e,b|e,z|z,a|d,a|e,z|z,c|d];
- a=1<<20; b=1<<31; c=a|b; d=1<<5; e=1<<15; f=d|e;
- SP2 = [c|f,b|e,z|e,a|f,a|z,z|d,c|d,b|f,b|d,c|f,c|e,b|z,b|e,a|z,z|d,c|d,
- a|e,a|d,b|f,z|z,b|z,z|e,a|f,c|z,a|d,b|d,z|z,a|e,z|f,c|e,c|z,z|f,
- z|z,a|f,c|d,a|z,b|f,c|z,c|e,z|e,c|z,b|e,z|d,c|f,a|f,z|d,z|e,b|z,
- z|f,c|e,a|z,b|d,a|d,b|f,b|d,a|d,a|e,z|z,b|e,z|f,b|z,c|d,c|f,a|e];
- a=1<<17; b=1<<27; c=a|b; d=1<<3; e=1<<9; f=d|e;
- SP3 = [z|f,c|e,z|z,c|d,b|e,z|z,a|f,b|e,a|d,b|d,b|d,a|z,c|f,a|d,c|z,z|f,
- b|z,z|d,c|e,z|e,a|e,c|z,c|d,a|f,b|f,a|e,a|z,b|f,z|d,c|f,z|e,b|z,
- c|e,b|z,a|d,z|f,a|z,c|e,b|e,z|z,z|e,a|d,c|f,b|e,b|d,z|e,z|z,c|d,
- b|f,a|z,b|z,c|f,z|d,a|f,a|e,b|d,c|z,b|f,z|f,c|z,a|f,z|d,c|d,a|e];
- a=1<<13; b=1<<23; c=a|b; d=1<<0; e=1<<7; f=d|e;
- SP4 = [c|d,a|f,a|f,z|e,c|e,b|f,b|d,a|d,z|z,c|z,c|z,c|f,z|f,z|z,b|e,b|d,
- z|d,a|z,b|z,c|d,z|e,b|z,a|d,a|e,b|f,z|d,a|e,b|e,a|z,c|e,c|f,z|f,
- b|e,b|d,c|z,c|f,z|f,z|z,z|z,c|z,a|e,b|e,b|f,z|d,c|d,a|f,a|f,z|e,
- c|f,z|f,z|d,a|z,b|d,a|d,c|e,b|f,a|d,a|e,b|z,c|d,z|e,b|z,a|z,c|e];
- a=1<<25; b=1<<30; c=a|b; d=1<<8; e=1<<19; f=d|e;
- SP5 = [z|d,a|f,a|e,c|d,z|e,z|d,b|z,a|e,b|f,z|e,a|d,b|f,c|d,c|e,z|f,b|z,
- a|z,b|e,b|e,z|z,b|d,c|f,c|f,a|d,c|e,b|d,z|z,c|z,a|f,a|z,c|z,z|f,
- z|e,c|d,z|d,a|z,b|z,a|e,c|d,b|f,a|d,b|z,c|e,a|f,b|f,z|d,a|z,c|e,
- c|f,z|f,c|z,c|f,a|e,z|z,b|e,c|z,z|f,a|d,b|d,z|e,z|z,b|e,a|f,b|d];
- a=1<<22; b=1<<29; c=a|b; d=1<<4; e=1<<14; f=d|e;
- SP6 = [b|d,c|z,z|e,c|f,c|z,z|d,c|f,a|z,b|e,a|f,a|z,b|d,a|d,b|e,b|z,z|f,
- z|z,a|d,b|f,z|e,a|e,b|f,z|d,c|d,c|d,z|z,a|f,c|e,z|f,a|e,c|e,b|z,
- b|e,z|d,c|d,a|e,c|f,a|z,z|f,b|d,a|z,b|e,b|z,z|f,b|d,c|f,a|e,c|z,
- a|f,c|e,z|z,c|d,z|d,z|e,c|z,a|f,z|e,a|d,b|f,z|z,c|e,b|z,a|d,b|f];
- a=1<<21; b=1<<26; c=a|b; d=1<<1; e=1<<11; f=d|e;
- SP7 = [a|z,c|d,b|f,z|z,z|e,b|f,a|f,c|e,c|f,a|z,z|z,b|d,z|d,b|z,c|d,z|f,
- b|e,a|f,a|d,b|e,b|d,c|z,c|e,a|d,c|z,z|e,z|f,c|f,a|e,z|d,b|z,a|e,
- b|z,a|e,a|z,b|f,b|f,c|d,c|d,z|d,a|d,b|z,b|e,a|z,c|e,z|f,a|f,c|e,
- z|f,b|d,c|f,c|z,a|e,z|z,z|d,c|f,z|z,a|f,c|z,z|e,b|d,b|e,z|e,a|d];
- a=1<<18; b=1<<28; c=a|b; d=1<<6; e=1<<12; f=d|e;
- SP8 = [b|f,z|e,a|z,c|f,b|z,b|f,z|d,b|z,a|d,c|z,c|f,a|e,c|e,a|f,z|e,z|d,
- c|z,b|d,b|e,z|f,a|e,a|d,c|d,c|e,z|f,z|z,z|z,c|d,b|d,b|e,a|f,a|z,
- a|f,a|z,c|e,z|e,z|d,c|d,z|e,a|f,b|e,z|d,b|d,c|z,c|d,b|z,a|z,b|f,
- z|z,c|f,a|d,b|d,c|z,b|e,b|f,z|z,c|f,a|e,a|e,z|f,z|f,a|d,b|z,c|e];
- // jshint +W013,+W015
-
- // Set the key.
- function setKeys(keyBlock) {
- var i, j, l, m, n, o, pc1m = [], pcr = [], kn = [],
- raw0, raw1, rawi, KnLi;
-
- for (j = 0, l = 56; j < 56; ++j, l -= 8) {
- l += l < -5 ? 65 : l < -3 ? 31 : l < -1 ? 63 : l === 27 ? 35 : 0; // PC1
- m = l & 0x7;
- pc1m[j] = ((keyBlock[l >>> 3] & (1<<m)) !== 0) ? 1: 0;
- }
-
- for (i = 0; i < 16; ++i) {
- m = i << 1;
- n = m + 1;
- kn[m] = kn[n] = 0;
- for (o = 28; o < 59; o += 28) {
- for (j = o - 28; j < o; ++j) {
- l = j + totrot[i];
- if (l < o) {
- pcr[j] = pc1m[l];
- } else {
- pcr[j] = pc1m[l - 28];
- }
- }
- }
- for (j = 0; j < 24; ++j) {
- if (pcr[PC2[j]] !== 0) {
- kn[m] |= 1 << (23 - j);
- }
- if (pcr[PC2[j + 24]] !== 0) {
- kn[n] |= 1 << (23 - j);
- }
- }
- }
-
- // cookey
- for (i = 0, rawi = 0, KnLi = 0; i < 16; ++i) {
- raw0 = kn[rawi++];
- raw1 = kn[rawi++];
- keys[KnLi] = (raw0 & 0x00fc0000) << 6;
- keys[KnLi] |= (raw0 & 0x00000fc0) << 10;
- keys[KnLi] |= (raw1 & 0x00fc0000) >>> 10;
- keys[KnLi] |= (raw1 & 0x00000fc0) >>> 6;
- ++KnLi;
- keys[KnLi] = (raw0 & 0x0003f000) << 12;
- keys[KnLi] |= (raw0 & 0x0000003f) << 16;
- keys[KnLi] |= (raw1 & 0x0003f000) >>> 4;
- keys[KnLi] |= (raw1 & 0x0000003f);
- ++KnLi;
- }
- }
-
- // Encrypt 8 bytes of text
- function enc8(text) {
- var i = 0, b = text.slice(), fval, keysi = 0,
- l, r, x; // left, right, accumulator
-
- // Squash 8 bytes to 2 ints
- l = b[i++]<<24 | b[i++]<<16 | b[i++]<<8 | b[i++];
- r = b[i++]<<24 | b[i++]<<16 | b[i++]<<8 | b[i++];
-
- x = ((l >>> 4) ^ r) & 0x0f0f0f0f;
- r ^= x;
- l ^= (x << 4);
- x = ((l >>> 16) ^ r) & 0x0000ffff;
- r ^= x;
- l ^= (x << 16);
- x = ((r >>> 2) ^ l) & 0x33333333;
- l ^= x;
- r ^= (x << 2);
- x = ((r >>> 8) ^ l) & 0x00ff00ff;
- l ^= x;
- r ^= (x << 8);
- r = (r << 1) | ((r >>> 31) & 1);
- x = (l ^ r) & 0xaaaaaaaa;
- l ^= x;
- r ^= x;
- l = (l << 1) | ((l >>> 31) & 1);
-
- for (i = 0; i < 8; ++i) {
- x = (r << 28) | (r >>> 4);
- x ^= keys[keysi++];
- fval = SP7[x & 0x3f];
- fval |= SP5[(x >>> 8) & 0x3f];
- fval |= SP3[(x >>> 16) & 0x3f];
- fval |= SP1[(x >>> 24) & 0x3f];
- x = r ^ keys[keysi++];
- fval |= SP8[x & 0x3f];
- fval |= SP6[(x >>> 8) & 0x3f];
- fval |= SP4[(x >>> 16) & 0x3f];
- fval |= SP2[(x >>> 24) & 0x3f];
- l ^= fval;
- x = (l << 28) | (l >>> 4);
- x ^= keys[keysi++];
- fval = SP7[x & 0x3f];
- fval |= SP5[(x >>> 8) & 0x3f];
- fval |= SP3[(x >>> 16) & 0x3f];
- fval |= SP1[(x >>> 24) & 0x3f];
- x = l ^ keys[keysi++];
- fval |= SP8[x & 0x0000003f];
- fval |= SP6[(x >>> 8) & 0x3f];
- fval |= SP4[(x >>> 16) & 0x3f];
- fval |= SP2[(x >>> 24) & 0x3f];
- r ^= fval;
- }
-
- r = (r << 31) | (r >>> 1);
- x = (l ^ r) & 0xaaaaaaaa;
- l ^= x;
- r ^= x;
- l = (l << 31) | (l >>> 1);
- x = ((l >>> 8) ^ r) & 0x00ff00ff;
- r ^= x;
- l ^= (x << 8);
- x = ((l >>> 2) ^ r) & 0x33333333;
- r ^= x;
- l ^= (x << 2);
- x = ((r >>> 16) ^ l) & 0x0000ffff;
- l ^= x;
- r ^= (x << 16);
- x = ((r >>> 4) ^ l) & 0x0f0f0f0f;
- l ^= x;
- r ^= (x << 4);
-
- // Spread ints to bytes
- x = [r, l];
- for (i = 0; i < 8; i++) {
- b[i] = (x[i>>>2] >>> (8 * (3 - (i % 4)))) % 256;
- if (b[i] < 0) { b[i] += 256; } // unsigned
- }
- return b;
- }
-
- // Encrypt 16 bytes of text using passwd as key
- function encrypt(t) {
- return enc8(t.slice(0, 8)).concat(enc8(t.slice(8, 16)));
- }
-
- setKeys(passwd); // Setup keys
- return {'encrypt': encrypt}; // Public interface
-
-} // function DES
diff --git a/webclients/novnc/include/display.js b/webclients/novnc/include/display.js
deleted file mode 100644
index e255683..0000000
--- a/webclients/novnc/include/display.js
+++ /dev/null
@@ -1,746 +0,0 @@
-/*
- * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Licensed under MPL 2.0 (see LICENSE.txt)
- *
- * See README.md for usage and integration instructions.
- */
-
-/*jslint browser: true, white: false */
-/*global Util, Base64, changeCursor */
-
-var Display;
-
-(function () {
- "use strict";
-
- Display = function (defaults) {
- this._drawCtx = null;
- this._c_forceCanvas = false;
-
- this._renderQ = []; // queue drawing actions for in-oder rendering
-
- // the full frame buffer (logical canvas) size
- this._fb_width = 0;
- this._fb_height = 0;
-
- // the visible "physical canvas" viewport
- this._viewportLoc = { 'x': 0, 'y': 0, 'w': 0, 'h': 0 };
- this._cleanRect = { 'x1': 0, 'y1': 0, 'x2': -1, 'y2': -1 };
-
- this._prevDrawStyle = "";
- this._tile = null;
- this._tile16x16 = null;
- this._tile_x = 0;
- this._tile_y = 0;
-
- Util.set_defaults(this, defaults, {
- 'true_color': true,
- 'colourMap': [],
- 'scale': 1.0,
- 'viewport': false,
- 'render_mode': ''
- });
-
- Util.Debug(">> Display.constructor");
-
- if (!this._target) {
- throw new Error("Target must be set");
- }
-
- if (typeof this._target === 'string') {
- throw new Error('target must be a DOM element');
- }
-
- if (!this._target.getContext) {
- throw new Error("no getContext method");
- }
-
- if (!this._drawCtx) {
- this._drawCtx = this._target.getContext('2d');
- }
-
- Util.Debug("User Agent: " + navigator.userAgent);
- if (Util.Engine.gecko) { Util.Debug("Browser: gecko " + Util.Engine.gecko); }
- if (Util.Engine.webkit) { Util.Debug("Browser: webkit " + Util.Engine.webkit); }
- if (Util.Engine.trident) { Util.Debug("Browser: trident " + Util.Engine.trident); }
- if (Util.Engine.presto) { Util.Debug("Browser: presto " + Util.Engine.presto); }
-
- this.clear();
-
- // Check canvas features
- if ('createImageData' in this._drawCtx) {
- this._render_mode = 'canvas rendering';
- } else {
- throw new Error("Canvas does not support createImageData");
- }
-
- if (this._prefer_js === null) {
- Util.Info("Preferring javascript operations");
- this._prefer_js = true;
- }
-
- // Determine browser support for setting the cursor via data URI scheme
- var curDat = [];
- for (var i = 0; i < 8 * 8 * 4; i++) {
- curDat.push(255);
- }
- try {
- var curSave = this._target.style.cursor;
- Display.changeCursor(this._target, curDat, curDat, 2, 2, 8, 8);
- if (this._target.style.cursor) {
- if (this._cursor_uri === null || this._cursor_uri === undefined) {
- this._cursor_uri = true;
- }
- Util.Info("Data URI scheme cursor supported");
- } else {
- if (this._cursor_uri === null || this._cursor_uri === undefined) {
- this._cursor_uri = false;
- }
- Util.Warn("Data URI scheme cursor not supported");
- }
- this._target.style.cursor = curSave;
- } catch (exc) {
- Util.Error("Data URI scheme cursor test exception: " + exc);
- this._cursor_uri = false;
- }
-
- Util.Debug("<< Display.constructor");
- };
-
- Display.prototype = {
- // Public methods
- viewportChange: function (deltaX, deltaY, width, height) {
- var vp = this._viewportLoc;
- var cr = this._cleanRect;
- var canvas = this._target;
-
- if (!this._viewport) {
- Util.Debug("Setting viewport to full display region");
- deltaX = -vp.w; // clamped later of out of bounds
- deltaY = -vp.h;
- width = this._fb_width;
- height = this._fb_height;
- }
-
- if (typeof(deltaX) === "undefined") { deltaX = 0; }
- if (typeof(deltaY) === "undefined") { deltaY = 0; }
- if (typeof(width) === "undefined") { width = vp.w; }
- if (typeof(height) === "undefined") { height = vp.h; }
-
- // Size change
- if (width > this._fb_width) { width = this._fb_width; }
- if (height > this._fb_height) { height = this._fb_height; }
-
- if (vp.w !== width || vp.h !== height) {
- // Change width
- if (width < vp.w && cr.x2 > vp.x + width - 1) {
- cr.x2 = vp.x + width - 1;
- }
- vp.w = width;
-
- // Change height
- if (height < vp.h && cr.y2 > vp.y + height - 1) {
- cr.y2 = vp.y + height - 1;
- }
- vp.h = height;
-
- var saveImg = null;
- if (vp.w > 0 && vp.h > 0 && canvas.width > 0 && canvas.height > 0) {
- var img_width = canvas.width < vp.w ? canvas.width : vp.w;
- var img_height = canvas.height < vp.h ? canvas.height : vp.h;
- saveImg = this._drawCtx.getImageData(0, 0, img_width, img_height);
- }
-
- canvas.width = vp.w;
- canvas.height = vp.h;
-
- if (saveImg) {
- this._drawCtx.putImageData(saveImg, 0, 0);
- }
- }
-
- var vx2 = vp.x + vp.w - 1;
- var vy2 = vp.y + vp.h - 1;
-
- // Position change
-
- if (deltaX < 0 && vp.x + deltaX < 0) {
- deltaX = -vp.x;
- }
- if (vx2 + deltaX >= this._fb_width) {
- deltaX -= vx2 + deltaX - this._fb_width + 1;
- }
-
- if (vp.y + deltaY < 0) {
- deltaY = -vp.y;
- }
- if (vy2 + deltaY >= this._fb_height) {
- deltaY -= (vy2 + deltaY - this._fb_height + 1);
- }
-
- if (deltaX === 0 && deltaY === 0) {
- return;
- }
- Util.Debug("viewportChange deltaX: " + deltaX + ", deltaY: " + deltaY);
-
- vp.x += deltaX;
- vx2 += deltaX;
- vp.y += deltaY;
- vy2 += deltaY;
-
- // Update the clean rectangle
- if (vp.x > cr.x1) {
- cr.x1 = vp.x;
- }
- if (vx2 < cr.x2) {
- cr.x2 = vx2;
- }
- if (vp.y > cr.y1) {
- cr.y1 = vp.y;
- }
- if (vy2 < cr.y2) {
- cr.y2 = vy2;
- }
-
- var x1, w;
- if (deltaX < 0) {
- // Shift viewport left, redraw left section
- x1 = 0;
- w = -deltaX;
- } else {
- // Shift viewport right, redraw right section
- x1 = vp.w - deltaX;
- w = deltaX;
- }
-
- var y1, h;
- if (deltaY < 0) {
- // Shift viewport up, redraw top section
- y1 = 0;
- h = -deltaY;
- } else {
- // Shift viewport down, redraw bottom section
- y1 = vp.h - deltaY;
- h = deltaY;
- }
-
- // Copy the valid part of the viewport to the shifted location
- var saveStyle = this._drawCtx.fillStyle;
- this._drawCtx.fillStyle = "rgb(255,255,255)";
- if (deltaX !== 0) {
- this._drawCtx.drawImage(canvas, 0, 0, vp.w, vp.h, -deltaX, 0, vp.w, vp.h);
- this._drawCtx.fillRect(x1, 0, w, vp.h);
- }
- if (deltaY !== 0) {
- this._drawCtx.drawImage(canvas, 0, 0, vp.w, vp.h, 0, -deltaY, vp.w, vp.h);
- this._drawCtx.fillRect(0, y1, vp.w, h);
- }
- this._drawCtx.fillStyle = saveStyle;
- },
-
- // Return a map of clean and dirty areas of the viewport and reset the
- // tracking of clean and dirty areas
- //
- // Returns: { 'cleanBox': { 'x': x, 'y': y, 'w': w, 'h': h},
- // 'dirtyBoxes': [{ 'x': x, 'y': y, 'w': w, 'h': h }, ...] }
- getCleanDirtyReset: function () {
- var vp = this._viewportLoc;
- var cr = this._cleanRect;
-
- var cleanBox = { 'x': cr.x1, 'y': cr.y1,
- 'w': cr.x2 - cr.x1 + 1, 'h': cr.y2 - cr.y1 + 1 };
-
- var dirtyBoxes = [];
- if (cr.x1 >= cr.x2 || cr.y1 >= cr.y2) {
- // Whole viewport is dirty
- dirtyBoxes.push({ 'x': vp.x, 'y': vp.y, 'w': vp.w, 'h': vp.h });
- } else {
- // Redraw dirty regions
- var vx2 = vp.x + vp.w - 1;
- var vy2 = vp.y + vp.h - 1;
-
- if (vp.x < cr.x1) {
- // left side dirty region
- dirtyBoxes.push({'x': vp.x, 'y': vp.y,
- 'w': cr.x1 - vp.x + 1, 'h': vp.h});
- }
- if (vx2 > cr.x2) {
- // right side dirty region
- dirtyBoxes.push({'x': cr.x2 + 1, 'y': vp.y,
- 'w': vx2 - cr.x2, 'h': vp.h});
- }
- if(vp.y < cr.y1) {
- // top/middle dirty region
- dirtyBoxes.push({'x': cr.x1, 'y': vp.y,
- 'w': cr.x2 - cr.x1 + 1, 'h': cr.y1 - vp.y});
- }
- if (vy2 > cr.y2) {
- // bottom/middle dirty region
- dirtyBoxes.push({'x': cr.x1, 'y': cr.y2 + 1,
- 'w': cr.x2 - cr.x1 + 1, 'h': vy2 - cr.y2});
- }
- }
-
- this._cleanRect = {'x1': vp.x, 'y1': vp.y,
- 'x2': vp.x + vp.w - 1, 'y2': vp.y + vp.h - 1};
-
- return {'cleanBox': cleanBox, 'dirtyBoxes': dirtyBoxes};
- },
-
- absX: function (x) {
- return x + this._viewportLoc.x;
- },
-
- absY: function (y) {
- return y + this._viewportLoc.y;
- },
-
- resize: function (width, height) {
- this._prevDrawStyle = "";
-
- this._fb_width = width;
- this._fb_height = height;
-
- this._rescale(this._scale);
-
- this.viewportChange();
- },
-
- clear: function () {
- if (this._logo) {
- this.resize(this._logo.width, this._logo.height);
- this.blitStringImage(this._logo.data, 0, 0);
- } else {
- if (Util.Engine.trident === 6) {
- // NB(directxman12): there's a bug in IE10 where we can fail to actually
- // clear the canvas here because of the resize.
- // Clearing the current viewport first fixes the issue
- this._drawCtx.clearRect(0, 0, this._viewportLoc.w, this._viewportLoc.h);
- }
- this.resize(240, 20);
- this._drawCtx.clearRect(0, 0, this._viewportLoc.w, this._viewportLoc.h);
- }
-
- this._renderQ = [];
- },
-
- fillRect: function (x, y, width, height, color) {
- this._setFillColor(color);
- this._drawCtx.fillRect(x - this._viewportLoc.x, y - this._viewportLoc.y, width, height);
- },
-
- copyImage: function (old_x, old_y, new_x, new_y, w, h) {
- var x1 = old_x - this._viewportLoc.x;
- var y1 = old_y - this._viewportLoc.y;
- var x2 = new_x - this._viewportLoc.x;
- var y2 = new_y - this._viewportLoc.y;
-
- this._drawCtx.drawImage(this._target, x1, y1, w, h, x2, y2, w, h);
- },
-
- // start updating a tile
- startTile: function (x, y, width, height, color) {
- this._tile_x = x;
- this._tile_y = y;
- if (width === 16 && height === 16) {
- this._tile = this._tile16x16;
- } else {
- this._tile = this._drawCtx.createImageData(width, height);
- }
-
- if (this._prefer_js) {
- var bgr;
- if (this._true_color) {
- bgr = color;
- } else {
- bgr = this._colourMap[color[0]];
- }
- var red = bgr[2];
- var green = bgr[1];
- var blue = bgr[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;
- }
- } else {
- this.fillRect(x, y, width, height, color);
- }
- },
-
- // update sub-rectangle of the current tile
- subTile: function (x, y, w, h, color) {
- if (this._prefer_js) {
- var bgr;
- if (this._true_color) {
- bgr = color;
- } else {
- bgr = this._colourMap[color[0]];
- }
- var red = bgr[2];
- var green = bgr[1];
- var blue = bgr[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;
- }
- }
- } else {
- this.fillRect(this._tile_x + x, this._tile_y + y, w, h, color);
- }
- },
-
- // draw the current tile to the screen
- finishTile: function () {
- if (this._prefer_js) {
- this._drawCtx.putImageData(this._tile, this._tile_x - this._viewportLoc.x,
- this._tile_y - this._viewportLoc.y);
- }
- // else: No-op -- already done by setSubTile
- },
-
- blitImage: function (x, y, width, height, arr, offset) {
- if (this._true_color) {
- this._bgrxImageData(x, y, this._viewportLoc.x, this._viewportLoc.y, width, height, arr, offset);
- } else {
- this._cmapImageData(x, y, this._viewportLoc.x, this._viewportLoc.y, width, height, arr, offset);
- }
- },
-
- blitRgbImage: function (x, y , width, height, arr, offset) {
- if (this._true_color) {
- this._rgbImageData(x, y, this._viewportLoc.x, this._viewportLoc.y, width, height, arr, offset);
- } else {
- // probably wrong?
- this._cmapImageData(x, y, this._viewportLoc.x, this._viewportLoc.y, width, height, arr, offset);
- }
- },
-
- blitStringImage: function (str, x, y) {
- var img = new Image();
- img.onload = function () {
- this._drawCtx.drawImage(img, x - this._viewportLoc.x, y - this._viewportLoc.y);
- }.bind(this);
- img.src = str;
- return img; // for debugging purposes
- },
-
- // wrap ctx.drawImage but relative to viewport
- drawImage: function (img, x, y) {
- this._drawCtx.drawImage(img, x - this._viewportLoc.x, y - this._viewportLoc.y);
- },
-
- renderQ_push: function (action) {
- this._renderQ.push(action);
- if (this._renderQ.length === 1) {
- // If this can be rendered immediately it will be, otherwise
- // the scanner will start polling the queue (every
- // requestAnimationFrame interval)
- this._scan_renderQ();
- }
- },
-
- changeCursor: function (pixels, mask, hotx, hoty, w, h) {
- if (this._cursor_uri === false) {
- Util.Warn("changeCursor called but no cursor data URI support");
- return;
- }
-
- if (this._true_color) {
- Display.changeCursor(this._target, pixels, mask, hotx, hoty, w, h);
- } else {
- Display.changeCursor(this._target, pixels, mask, hotx, hoty, w, h, this._colourMap);
- }
- },
-
- defaultCursor: function () {
- this._target.style.cursor = "default";
- },
-
- // Overridden getters/setters
- get_context: function () {
- return this._drawCtx;
- },
-
- set_scale: function (scale) {
- this._rescale(scale);
- },
-
- set_width: function (w) {
- this.resize(w, this._fb_height);
- },
- get_width: function () {
- return this._fb_width;
- },
-
- set_height: function (h) {
- this.resize(this._fb_width, h);
- },
- get_height: function () {
- return this._fb_height;
- },
-
- // Private Methods
- _rescale: function (factor) {
- var canvas = this._target;
- var properties = ['transform', 'WebkitTransform', 'MozTransform'];
- var transform_prop;
- while ((transform_prop = properties.shift())) {
- if (typeof canvas.style[transform_prop] !== 'undefined') {
- break;
- }
- }
-
- if (transform_prop === null) {
- Util.Debug("No scaling support");
- return;
- }
-
- if (typeof(factor) === "undefined") {
- factor = this._scale;
- } else if (factor > 1.0) {
- factor = 1.0;
- } else if (factor < 0.1) {
- factor = 0.1;
- }
-
- if (this._scale === factor) {
- return;
- }
-
- this._scale = factor;
- var x = canvas.width - (canvas.width * factor);
- var y = canvas.height - (canvas.height * factor);
- canvas.style[transform_prop] = 'scale(' + this._scale + ') translate(-' + x + 'px, -' + y + 'px)';
- },
-
- _setFillColor: function (color) {
- var bgr;
- if (this._true_color) {
- bgr = color;
- } else {
- bgr = this._colourMap[color[0]];
- }
-
- var newStyle = 'rgb(' + bgr[2] + ',' + bgr[1] + ',' + bgr[0] + ')';
- if (newStyle !== this._prevDrawStyle) {
- this._drawCtx.fillStyle = newStyle;
- this._prevDrawStyle = newStyle;
- }
- },
-
- _rgbImageData: function (x, y, vx, vy, 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 - vx, y - vy);
- },
-
- _bgrxImageData: function (x, y, vx, vy, 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 - vx, y - vy);
- },
-
- _cmapImageData: function (x, y, vx, vy, width, height, arr, offset) {
- var img = this._drawCtx.createImageData(width, height);
- var data = img.data;
- var cmap = this._colourMap;
- for (var i = 0, j = offset; i < width * height * 4; i += 4, j++) {
- var bgr = cmap[arr[j]];
- data[i] = bgr[2];
- data[i + 1] = bgr[1];
- data[i + 2] = bgr[0];
- data[i + 3] = 255; // Alpha
- }
- this._drawCtx.putImageData(img, x - vx, y - vy);
- },
-
- _scan_renderQ: function () {
- var ready = true;
- while (ready && this._renderQ.length > 0) {
- var a = this._renderQ[0];
- switch (a.type) {
- case 'copy':
- this.copyImage(a.old_x, a.old_y, a.x, a.y, a.width, a.height);
- break;
- case 'fill':
- this.fillRect(a.x, a.y, a.width, a.height, a.color);
- break;
- case 'blit':
- this.blitImage(a.x, a.y, a.width, a.height, a.data, 0);
- break;
- case 'blitRgb':
- this.blitRgbImage(a.x, a.y, a.width, a.height, a.data, 0);
- break;
- case 'img':
- if (a.img.complete) {
- this.drawImage(a.img, a.x, a.y);
- } else {
- // We need to wait for this image to 'load'
- // to keep things in-order
- ready = false;
- }
- break;
- }
-
- if (ready) {
- this._renderQ.shift();
- }
- }
-
- if (this._renderQ.length > 0) {
- requestAnimFrame(this._scan_renderQ.bind(this));
- }
- },
- };
-
- Util.make_properties(Display, [
- ['target', 'wo', 'dom'], // Canvas element for rendering
- ['context', 'ro', 'raw'], // Canvas 2D context for rendering (read-only)
- ['logo', 'rw', 'raw'], // Logo to display when cleared: {"width": w, "height": h, "data": data}
- ['true_color', 'rw', 'bool'], // Use true-color pixel data
- ['colourMap', 'rw', 'arr'], // Colour map array (when not true-color)
- ['scale', 'rw', 'float'], // Display area scale factor 0.0 - 1.0
- ['viewport', 'rw', 'bool'], // Use a viewport set with viewportChange()
- ['width', 'rw', 'int'], // Display area width
- ['height', 'rw', 'int'], // Display area height
-
- ['render_mode', 'ro', 'str'], // Canvas rendering mode (read-only)
-
- ['prefer_js', 'rw', 'str'], // Prefer Javascript over canvas methods
- ['cursor_uri', 'rw', 'raw'] // Can we render cursor using data URI
- ]);
-
- // Class Methods
- Display.changeCursor = function (target, pixels, mask, hotx, hoty, w0, h0, cmap) {
- var w = w0;
- var h = h0;
- if (h < w) {
- h = w; // increase h to make it square
- } else {
- w = h; // increase w to make it square
- }
-
- var cur = [];
-
- // Push multi-byte little-endian values
- cur.push16le = function (num) {
- this.push(num & 0xFF, (num >> 8) & 0xFF);
- };
- cur.push32le = function (num) {
- this.push(num & 0xFF,
- (num >> 8) & 0xFF,
- (num >> 16) & 0xFF,
- (num >> 24) & 0xFF);
- };
-
- var IHDRsz = 40;
- var RGBsz = w * h * 4;
- var XORsz = Math.ceil((w * h) / 8.0);
- var ANDsz = Math.ceil((w * h) / 8.0);
-
- cur.push16le(0); // 0: Reserved
- cur.push16le(2); // 2: .CUR type
- cur.push16le(1); // 4: Number of images, 1 for non-animated ico
-
- // Cursor #1 header (ICONDIRENTRY)
- cur.push(w); // 6: width
- cur.push(h); // 7: height
- cur.push(0); // 8: colors, 0 -> true-color
- cur.push(0); // 9: reserved
- cur.push16le(hotx); // 10: hotspot x coordinate
- cur.push16le(hoty); // 12: hotspot y coordinate
- cur.push32le(IHDRsz + RGBsz + XORsz + ANDsz);
- // 14: cursor data byte size
- cur.push32le(22); // 18: offset of cursor data in the file
-
- // Cursor #1 InfoHeader (ICONIMAGE/BITMAPINFO)
- cur.push32le(IHDRsz); // 22: InfoHeader size
- cur.push32le(w); // 26: Cursor width
- cur.push32le(h * 2); // 30: XOR+AND height
- cur.push16le(1); // 34: number of planes
- cur.push16le(32); // 36: bits per pixel
- cur.push32le(0); // 38: Type of compression
-
- cur.push32le(XORsz + ANDsz);
- // 42: Size of Image
- cur.push32le(0); // 46: reserved
- cur.push32le(0); // 50: reserved
- cur.push32le(0); // 54: reserved
- cur.push32le(0); // 58: reserved
-
- // 62: color data (RGBQUAD icColors[])
- var y, x;
- for (y = h - 1; y >= 0; y--) {
- for (x = 0; x < w; x++) {
- if (x >= w0 || y >= h0) {
- cur.push(0); // blue
- cur.push(0); // green
- cur.push(0); // red
- cur.push(0); // alpha
- } else {
- var idx = y * Math.ceil(w0 / 8) + Math.floor(x / 8);
- var alpha = (mask[idx] << (x % 8)) & 0x80 ? 255 : 0;
- if (cmap) {
- idx = (w0 * y) + x;
- var rgb = cmap[pixels[idx]];
- cur.push(rgb[2]); // blue
- cur.push(rgb[1]); // green
- cur.push(rgb[0]); // red
- cur.push(alpha); // alpha
- } else {
- idx = ((w0 * y) + x) * 4;
- cur.push(pixels[idx + 2]); // blue
- cur.push(pixels[idx + 1]); // green
- cur.push(pixels[idx]); // red
- cur.push(alpha); // alpha
- }
- }
- }
- }
-
- // XOR/bitmask data (BYTE icXOR[])
- // (ignored, just needs to be the right size)
- for (y = 0; y < h; y++) {
- for (x = 0; x < Math.ceil(w / 8); x++) {
- cur.push(0);
- }
- }
-
- // AND/bitmask data (BYTE icAND[])
- // (ignored, just needs to be the right size)
- for (y = 0; y < h; y++) {
- for (x = 0; x < Math.ceil(w / 8); x++) {
- cur.push(0);
- }
- }
-
- var url = 'data:image/x-icon;base64,' + Base64.encode(cur);
- target.style.cursor = 'url(' + url + ')' + hotx + ' ' + hoty + ', default';
- };
-})();
diff --git a/webclients/novnc/include/input.js b/webclients/novnc/include/input.js
deleted file mode 100644
index 5d9e209..0000000
--- a/webclients/novnc/include/input.js
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2013 Samuel Mannehed for Cendio AB
- * Licensed under MPL 2.0 or any later version (see LICENSE.txt)
- */
-
-/*jslint browser: true, white: false */
-/*global window, Util */
-
-var Keyboard, Mouse;
-
-(function () {
- "use strict";
-
- //
- // Keyboard event handler
- //
-
- Keyboard = function (defaults) {
- this._keyDownList = []; // List of depressed keys
- // (even if they are happy)
-
- Util.set_defaults(this, defaults, {
- 'target': document,
- 'focused': true
- });
-
- // create the keyboard handler
- this._handler = new KeyEventDecoder(kbdUtil.ModifierSync(),
- VerifyCharModifier( /* jshint newcap: false */
- TrackKeyState(
- EscapeModifiers(this._handleRfbEvent.bind(this))
- )
- )
- ); /* jshint newcap: true */
-
- // keep these here so we can refer to them later
- this._eventHandlers = {
- 'keyup': this._handleKeyUp.bind(this),
- 'keydown': this._handleKeyDown.bind(this),
- 'keypress': this._handleKeyPress.bind(this),
- 'blur': this._allKeysUp.bind(this)
- };
- };
-
- Keyboard.prototype = {
- // private methods
-
- _handleRfbEvent: function (e) {
- if (this._onKeyPress) {
- Util.Debug("onKeyPress " + (e.type == 'keydown' ? "down" : "up") +
- ", keysym: " + e.keysym.keysym + "(" + e.keysym.keyname + ")");
- this._onKeyPress(e.keysym.keysym, e.type == 'keydown');
- }
- },
-
- _handleKeyDown: function (e) {
- if (!this._focused) { return true; }
-
- if (this._handler.keydown(e)) {
- // Suppress bubbling/default actions
- Util.stopEvent(e);
- return false;
- } else {
- // Allow the event to bubble and become a keyPress event which
- // will have the character code translated
- return true;
- }
- },
-
- _handleKeyPress: function (e) {
- if (!this._focused) { return true; }
-
- if (this._handler.keypress(e)) {
- // Suppress bubbling/default actions
- Util.stopEvent(e);
- return false;
- } else {
- // Allow the event to bubble and become a keyPress event which
- // will have the character code translated
- return true;
- }
- },
-
- _handleKeyUp: function (e) {
- if (!this._focused) { return true; }
-
- if (this._handler.keyup(e)) {
- // Suppress bubbling/default actions
- Util.stopEvent(e);
- return false;
- } else {
- // Allow the event to bubble and become a keyPress event which
- // will have the character code translated
- return true;
- }
- },
-
- _allKeysUp: function () {
- Util.Debug(">> Keyboard.allKeysUp");
- this._handler.releaseAll();
- Util.Debug("<< Keyboard.allKeysUp");
- },
-
- // Public methods
-
- grab: function () {
- //Util.Debug(">> Keyboard.grab");
- var c = this._target;
-
- Util.addEvent(c, 'keydown', this._eventHandlers.keydown);
- Util.addEvent(c, 'keyup', this._eventHandlers.keyup);
- Util.addEvent(c, 'keypress', this._eventHandlers.keypress);
-
- // Release (key up) if window loses focus
- Util.addEvent(window, 'blur', this._eventHandlers.blur);
-
- //Util.Debug("<< Keyboard.grab");
- },
-
- ungrab: function () {
- //Util.Debug(">> Keyboard.ungrab");
- var c = this._target;
-
- Util.removeEvent(c, 'keydown', this._eventHandlers.keydown);
- Util.removeEvent(c, 'keyup', this._eventHandlers.keyup);
- Util.removeEvent(c, 'keypress', this._eventHandlers.keypress);
- Util.removeEvent(window, 'blur', this._eventHandlers.blur);
-
- // Release (key up) all keys that are in a down state
- this._allKeysUp();
-
- //Util.Debug(">> Keyboard.ungrab");
- },
-
- sync: function (e) {
- this._handler.syncModifiers(e);
- }
- };
-
- Util.make_properties(Keyboard, [
- ['target', 'wo', 'dom'], // DOM element that captures keyboard input
- ['focused', 'rw', 'bool'], // Capture and send key events
-
- ['onKeyPress', 'rw', 'func'] // Handler for key press/release
- ]);
-
- //
- // Mouse event handler
- //
-
- Mouse = function (defaults) {
- this._mouseCaptured = false;
-
- this._doubleClickTimer = null;
- this._lastTouchPos = null;
-
- // Configuration attributes
- Util.set_defaults(this, defaults, {
- 'target': document,
- 'focused': true,
- 'scale': 1.0,
- 'touchButton': 1
- });
-
- this._eventHandlers = {
- 'mousedown': this._handleMouseDown.bind(this),
- 'mouseup': this._handleMouseUp.bind(this),
- 'mousemove': this._handleMouseMove.bind(this),
- 'mousewheel': this._handleMouseWheel.bind(this),
- 'mousedisable': this._handleMouseDisable.bind(this)
- };
- };
-
- Mouse.prototype = {
- // private methods
- _captureMouse: function () {
- // capturing the mouse ensures we get the mouseup event
- if (this._target.setCapture) {
- this._target.setCapture();
- }
-
- // some browsers give us mouseup events regardless,
- // so if we never captured the mouse, we can disregard the event
- this._mouseCaptured = true;
- },
-
- _releaseMouse: function () {
- if (this._target.releaseCapture) {
- this._target.releaseCapture();
- }
- this._mouseCaptured = false;
- },
-
- _resetDoubleClickTimer: function () {
- this._doubleClickTimer = null;
- },
-
- _handleMouseButton: function (e, down) {
- if (!this._focused) { return true; }
-
- if (this._notify) {
- this._notify(e);
- }
-
- var evt = (e ? e : window.event);
- var pos = Util.getEventPosition(e, this._target, this._scale);
-
- var bmask;
- if (e.touches || e.changedTouches) {
- // Touch device
-
- // When two touches occur within 500 ms of each other and are
- // closer than 20 pixels together a double click is triggered.
- if (down == 1) {
- if (this._doubleClickTimer === null) {
- this._lastTouchPos = pos;
- } else {
- clearTimeout(this._doubleClickTimer);
-
- // When the distance between the two touches is small enough
- // force the position of the latter touch to the position of
- // the first.
-
- var xs = this._lastTouchPos.x - pos.x;
- var ys = this._lastTouchPos.y - pos.y;
- var d = Math.sqrt((xs * xs) + (ys * ys));
-
- // The goal is to trigger on a certain physical width, the
- // devicePixelRatio brings us a bit closer but is not optimal.
- if (d < 20 * window.devicePixelRatio) {
- pos = this._lastTouchPos;
- }
- }
- this._doubleClickTimer = setTimeout(this._resetDoubleClickTimer.bind(this), 500);
- }
- bmask = this._touchButton;
- // If bmask is set
- } else if (evt.which) {
- /* everything except IE */
- bmask = 1 << evt.button;
- } else {
- /* IE including 9 */
- bmask = (evt.button & 0x1) + // Left
- (evt.button & 0x2) * 2 + // Right
- (evt.button & 0x4) / 2; // Middle
- }
-
- if (this._onMouseButton) {
- Util.Debug("onMouseButton " + (down ? "down" : "up") +
- ", x: " + pos.x + ", y: " + pos.y + ", bmask: " + bmask);
- this._onMouseButton(pos.x, pos.y, down, bmask);
- }
- Util.stopEvent(e);
- return false;
- },
-
- _handleMouseDown: function (e) {
- this._captureMouse();
- this._handleMouseButton(e, 1);
- },
-
- _handleMouseUp: function (e) {
- if (!this._mouseCaptured) { return; }
-
- this._handleMouseButton(e, 0);
- this._releaseMouse();
- },
-
- _handleMouseWheel: function (e) {
- if (!this._focused) { return true; }
-
- if (this._notify) {
- this._notify(e);
- }
-
- var evt = (e ? e : window.event);
- var pos = Util.getEventPosition(e, this._target, this._scale);
- var wheelData = evt.detail ? evt.detail * -1 : evt.wheelDelta / 40;
- var bmask;
- if (wheelData > 0) {
- bmask = 1 << 3;
- } else {
- bmask = 1 << 4;
- }
-
- if (this._onMouseButton) {
- this._onMouseButton(pos.x, pos.y, 1, bmask);
- this._onMouseButton(pos.x, pos.y, 0, bmask);
- }
- Util.stopEvent(e);
- return false;
- },
-
- _handleMouseMove: function (e) {
- if (! this._focused) { return true; }
-
- if (this._notify) {
- this._notify(e);
- }
-
- var evt = (e ? e : window.event);
- var pos = Util.getEventPosition(e, this._target, this._scale);
- if (this._onMouseMove) {
- this._onMouseMove(pos.x, pos.y);
- }
- Util.stopEvent(e);
- return false;
- },
-
- _handleMouseDisable: function (e) {
- if (!this._focused) { return true; }
-
- var evt = (e ? e : window.event);
- var pos = Util.getEventPosition(e, this._target, this._scale);
-
- /* Stop propagation if inside canvas area */
- if ((pos.realx >= 0) && (pos.realy >= 0) &&
- (pos.realx < this._target.offsetWidth) &&
- (pos.realy < this._target.offsetHeight)) {
- //Util.Debug("mouse event disabled");
- Util.stopEvent(e);
- return false;
- }
-
- return true;
- },
-
-
- // Public methods
- grab: function () {
- var c = this._target;
-
- if ('ontouchstart' in document.documentElement) {
- Util.addEvent(c, 'touchstart', this._eventHandlers.mousedown);
- Util.addEvent(window, 'touchend', this._eventHandlers.mouseup);
- Util.addEvent(c, 'touchend', this._eventHandlers.mouseup);
- Util.addEvent(c, 'touchmove', this._eventHandlers.mousemove);
- } else {
- Util.addEvent(c, 'mousedown', this._eventHandlers.mousedown);
- Util.addEvent(window, 'mouseup', this._eventHandlers.mouseup);
- Util.addEvent(c, 'mouseup', this._eventHandlers.mouseup);
- Util.addEvent(c, 'mousemove', this._eventHandlers.mousemove);
- Util.addEvent(c, (Util.Engine.gecko) ? 'DOMMouseScroll' : 'mousewheel',
- this._eventHandlers.mousewheel);
- }
-
- /* Work around right and middle click browser behaviors */
- Util.addEvent(document, 'click', this._eventHandlers.mousedisable);
- Util.addEvent(document.body, 'contextmenu', this._eventHandlers.mousedisable);
- },
-
- ungrab: function () {
- var c = this._target;
-
- if ('ontouchstart' in document.documentElement) {
- Util.removeEvent(c, 'touchstart', this._eventHandlers.mousedown);
- Util.removeEvent(window, 'touchend', this._eventHandlers.mouseup);
- Util.removeEvent(c, 'touchend', this._eventHandlers.mouseup);
- Util.removeEvent(c, 'touchmove', this._eventHandlers.mousemove);
- } else {
- Util.removeEvent(c, 'mousedown', this._eventHandlers.mousedown);
- Util.removeEvent(window, 'mouseup', this._eventHandlers.mouseup);
- Util.removeEvent(c, 'mouseup', this._eventHandlers.mouseup);
- Util.removeEvent(c, 'mousemove', this._eventHandlers.mousemove);
- Util.removeEvent(c, (Util.Engine.gecko) ? 'DOMMouseScroll' : 'mousewheel',
- this._eventHandlers.mousewheel);
- }
-
- /* Work around right and middle click browser behaviors */
- Util.removeEvent(document, 'click', this._eventHandlers.mousedisable);
- Util.removeEvent(document.body, 'contextmenu', this._eventHandlers.mousedisable);
-
- }
- };
-
- Util.make_properties(Mouse, [
- ['target', 'ro', 'dom'], // DOM element that captures mouse input
- ['notify', 'ro', 'func'], // Function to call to notify whenever a mouse event is received
- ['focused', 'rw', 'bool'], // Capture and send mouse clicks/movement
- ['scale', 'rw', 'float'], // Viewport scale factor 0.0 - 1.0
-
- ['onMouseButton', 'rw', 'func'], // Handler for mouse button click/release
- ['onMouseMove', 'rw', 'func'], // Handler for mouse movement
- ['touchButton', 'rw', 'int'] // Button mask (1, 2, 4) for touch devices (0 means ignore clicks)
- ]);
-})();
diff --git a/webclients/novnc/include/jsunzip.js b/webclients/novnc/include/jsunzip.js
deleted file mode 100644
index 8968f86..0000000
--- a/webclients/novnc/include/jsunzip.js
+++ /dev/null
@@ -1,676 +0,0 @@
-/*
- * JSUnzip
- *
- * Copyright (c) 2011 by Erik Moller
- * All Rights Reserved
- *
- * This software is provided 'as-is', without any express
- * or implied warranty. In no event will the authors be
- * held liable for any damages arising from the use of
- * this software.
- *
- * Permission is granted to anyone to use this software
- * for any purpose, including commercial applications,
- * and to alter it and redistribute it freely, subject to
- * the following restrictions:
- *
- * 1. The origin of this software must not be
- * misrepresented; you must not claim that you
- * wrote the original software. If you use this
- * software in a product, an acknowledgment in
- * the product documentation would be appreciated
- * but is not required.
- *
- * 2. Altered source versions must be plainly marked
- * as such, and must not be misrepresented as
- * being the original software.
- *
- * 3. This notice may not be removed or altered from
- * any source distribution.
- */
-
-var tinf;
-
-function JSUnzip() {
-
- this.getInt = function(offset, size) {
- switch (size) {
- case 4:
- return (this.data.charCodeAt(offset + 3) & 0xff) << 24 |
- (this.data.charCodeAt(offset + 2) & 0xff) << 16 |
- (this.data.charCodeAt(offset + 1) & 0xff) << 8 |
- (this.data.charCodeAt(offset + 0) & 0xff);
- break;
- case 2:
- return (this.data.charCodeAt(offset + 1) & 0xff) << 8 |
- (this.data.charCodeAt(offset + 0) & 0xff);
- break;
- default:
- return this.data.charCodeAt(offset) & 0xff;
- break;
- }
- };
-
- this.getDOSDate = function(dosdate, dostime) {
- var day = dosdate & 0x1f;
- var month = ((dosdate >> 5) & 0xf) - 1;
- var year = 1980 + ((dosdate >> 9) & 0x7f)
- var second = (dostime & 0x1f) * 2;
- var minute = (dostime >> 5) & 0x3f;
- hour = (dostime >> 11) & 0x1f;
- return new Date(year, month, day, hour, minute, second);
- }
-
- this.open = function(data) {
- this.data = data;
- this.files = [];
-
- if (this.data.length < 22)
- return { 'status' : false, 'error' : 'Invalid data' };
- var endOfCentralDirectory = this.data.length - 22;
- while (endOfCentralDirectory >= 0 && this.getInt(endOfCentralDirectory, 4) != 0x06054b50)
- --endOfCentralDirectory;
- if (endOfCentralDirectory < 0)
- return { 'status' : false, 'error' : 'Invalid data' };
- if (this.getInt(endOfCentralDirectory + 4, 2) != 0 || this.getInt(endOfCentralDirectory + 6, 2) != 0)
- return { 'status' : false, 'error' : 'No multidisk support' };
-
- var entriesInThisDisk = this.getInt(endOfCentralDirectory + 8, 2);
- var centralDirectoryOffset = this.getInt(endOfCentralDirectory + 16, 4);
- var globalCommentLength = this.getInt(endOfCentralDirectory + 20, 2);
- this.comment = this.data.slice(endOfCentralDirectory + 22, endOfCentralDirectory + 22 + globalCommentLength);
-
- var fileOffset = centralDirectoryOffset;
-
- for (var i = 0; i < entriesInThisDisk; ++i) {
- if (this.getInt(fileOffset + 0, 4) != 0x02014b50)
- return { 'status' : false, 'error' : 'Invalid data' };
- if (this.getInt(fileOffset + 6, 2) > 20)
- return { 'status' : false, 'error' : 'Unsupported version' };
- if (this.getInt(fileOffset + 8, 2) & 1)
- return { 'status' : false, 'error' : 'Encryption not implemented' };
-
- var compressionMethod = this.getInt(fileOffset + 10, 2);
- if (compressionMethod != 0 && compressionMethod != 8)
- return { 'status' : false, 'error' : 'Unsupported compression method' };
-
- var lastModFileTime = this.getInt(fileOffset + 12, 2);
- var lastModFileDate = this.getInt(fileOffset + 14, 2);
- var lastModifiedDate = this.getDOSDate(lastModFileDate, lastModFileTime);
-
- var crc = this.getInt(fileOffset + 16, 4);
- // TODO: crc
-
- var compressedSize = this.getInt(fileOffset + 20, 4);
- var uncompressedSize = this.getInt(fileOffset + 24, 4);
-
- var fileNameLength = this.getInt(fileOffset + 28, 2);
- var extraFieldLength = this.getInt(fileOffset + 30, 2);
- var fileCommentLength = this.getInt(fileOffset + 32, 2);
-
- var relativeOffsetOfLocalHeader = this.getInt(fileOffset + 42, 4);
-
- var fileName = this.data.slice(fileOffset + 46, fileOffset + 46 + fileNameLength);
- var fileComment = this.data.slice(fileOffset + 46 + fileNameLength + extraFieldLength, fileOffset + 46 + fileNameLength + extraFieldLength + fileCommentLength);
-
- if (this.getInt(relativeOffsetOfLocalHeader + 0, 4) != 0x04034b50)
- return { 'status' : false, 'error' : 'Invalid data' };
- var localFileNameLength = this.getInt(relativeOffsetOfLocalHeader + 26, 2);
- var localExtraFieldLength = this.getInt(relativeOffsetOfLocalHeader + 28, 2);
- var localFileContent = relativeOffsetOfLocalHeader + 30 + localFileNameLength + localExtraFieldLength;
-
- this.files[fileName] =
- {
- 'fileComment' : fileComment,
- 'compressionMethod' : compressionMethod,
- 'compressedSize' : compressedSize,
- 'uncompressedSize' : uncompressedSize,
- 'localFileContent' : localFileContent,
- 'lastModifiedDate' : lastModifiedDate
- };
-
- fileOffset += 46 + fileNameLength + extraFieldLength + fileCommentLength;
- }
- return { 'status' : true }
- };
-
-
- this.read = function(fileName) {
- var fileInfo = this.files[fileName];
- if (fileInfo) {
- if (fileInfo.compressionMethod == 8) {
- if (!tinf) {
- tinf = new TINF();
- tinf.init();
- }
- var result = tinf.uncompress(this.data, fileInfo.localFileContent);
- if (result.status == tinf.OK)
- return { 'status' : true, 'data' : result.data };
- else
- return { 'status' : false, 'error' : result.error };
- } else {
- return { 'status' : true, 'data' : this.data.slice(fileInfo.localFileContent, fileInfo.localFileContent + fileInfo.uncompressedSize) };
- }
- }
- return { 'status' : false, 'error' : "File '" + fileName + "' doesn't exist in zip" };
- };
-
-};
-
-
-
-/*
- * tinflate - tiny inflate
- *
- * Copyright (c) 2003 by Joergen Ibsen / Jibz
- * All Rights Reserved
- *
- * http://www.ibsensoftware.com/
- *
- * This software is provided 'as-is', without any express
- * or implied warranty. In no event will the authors be
- * held liable for any damages arising from the use of
- * this software.
- *
- * Permission is granted to anyone to use this software
- * for any purpose, including commercial applications,
- * and to alter it and redistribute it freely, subject to
- * the following restrictions:
- *
- * 1. The origin of this software must not be
- * misrepresented; you must not claim that you
- * wrote the original software. If you use this
- * software in a product, an acknowledgment in
- * the product documentation would be appreciated
- * but is not required.
- *
- * 2. Altered source versions must be plainly marked
- * as such, and must not be misrepresented as
- * being the original software.
- *
- * 3. This notice may not be removed or altered from
- * any source distribution.
- */
-
-/*
- * tinflate javascript port by Erik Moller in May 2011.
- * emoller@opera.com
- *
- * read_bits() patched by mike@imidio.com to allow
- * reading more then 8 bits (needed in some zlib streams)
- */
-
-"use strict";
-
-function TINF() {
-
-this.OK = 0;
-this.DATA_ERROR = (-3);
-this.WINDOW_SIZE = 32768;
-
-/* ------------------------------ *
- * -- internal data structures -- *
- * ------------------------------ */
-
-this.TREE = function() {
- this.table = new Array(16); /* table of code length counts */
- this.trans = new Array(288); /* code -> symbol translation table */
-};
-
-this.DATA = function(that) {
- this.source = '';
- this.sourceIndex = 0;
- this.tag = 0;
- this.bitcount = 0;
-
- this.dest = [];
-
- this.history = [];
-
- this.ltree = new that.TREE(); /* dynamic length/symbol tree */
- this.dtree = new that.TREE(); /* dynamic distance tree */
-};
-
-/* --------------------------------------------------- *
- * -- uninitialized global data (static structures) -- *
- * --------------------------------------------------- */
-
-this.sltree = new this.TREE(); /* fixed length/symbol tree */
-this.sdtree = new this.TREE(); /* fixed distance tree */
-
-/* extra bits and base tables for length codes */
-this.length_bits = new Array(30);
-this.length_base = new Array(30);
-
-/* extra bits and base tables for distance codes */
-this.dist_bits = new Array(30);
-this.dist_base = new Array(30);
-
-/* special ordering of code length codes */
-this.clcidx = [
- 16, 17, 18, 0, 8, 7, 9, 6,
- 10, 5, 11, 4, 12, 3, 13, 2,
- 14, 1, 15
-];
-
-/* ----------------------- *
- * -- utility functions -- *
- * ----------------------- */
-
-/* build extra bits and base tables */
-this.build_bits_base = function(bits, base, delta, first)
-{
- var i, sum;
-
- /* build bits table */
- for (i = 0; i < delta; ++i) bits[i] = 0;
- for (i = 0; i < 30 - delta; ++i) bits[i + delta] = Math.floor(i / delta);
-
- /* build base table */
- for (sum = first, i = 0; i < 30; ++i)
- {
- base[i] = sum;
- sum += 1 << bits[i];
- }
-}
-
-/* build the fixed huffman trees */
-this.build_fixed_trees = function(lt, dt)
-{
- var i;
-
- /* build fixed length tree */
- for (i = 0; i < 7; ++i) lt.table[i] = 0;
-
- lt.table[7] = 24;
- lt.table[8] = 152;
- lt.table[9] = 112;
-
- for (i = 0; i < 24; ++i) lt.trans[i] = 256 + i;
- for (i = 0; i < 144; ++i) lt.trans[24 + i] = i;
- for (i = 0; i < 8; ++i) lt.trans[24 + 144 + i] = 280 + i;
- for (i = 0; i < 112; ++i) lt.trans[24 + 144 + 8 + i] = 144 + i;
-
- /* build fixed distance tree */
- for (i = 0; i < 5; ++i) dt.table[i] = 0;
-
- dt.table[5] = 32;
-
- for (i = 0; i < 32; ++i) dt.trans[i] = i;
-}
-
-/* given an array of code lengths, build a tree */
-this.build_tree = function(t, lengths, loffset, num)
-{
- var offs = new Array(16);
- var i, sum;
-
- /* clear code length count table */
- for (i = 0; i < 16; ++i) t.table[i] = 0;
-
- /* scan symbol lengths, and sum code length counts */
- for (i = 0; i < num; ++i) t.table[lengths[loffset + i]]++;
-
- t.table[0] = 0;
-
- /* compute offset table for distribution sort */
- for (sum = 0, i = 0; i < 16; ++i)
- {
- offs[i] = sum;
- sum += t.table[i];
- }
-
- /* create code->symbol translation table (symbols sorted by code) */
- for (i = 0; i < num; ++i)
- {
- if (lengths[loffset + i]) t.trans[offs[lengths[loffset + i]]++] = i;
- }
-}
-
-/* ---------------------- *
- * -- decode functions -- *
- * ---------------------- */
-
-/* get one bit from source stream */
-this.getbit = function(d)
-{
- var bit;
-
- /* check if tag is empty */
- if (!d.bitcount--)
- {
- /* load next tag */
- d.tag = d.source[d.sourceIndex++] & 0xff;
- d.bitcount = 7;
- }
-
- /* shift bit out of tag */
- bit = d.tag & 0x01;
- d.tag >>= 1;
-
- return bit;
-}
-
-/* read a num bit value from a stream and add base */
-function read_bits_direct(source, bitcount, tag, idx, num)
-{
- var val = 0;
- while (bitcount < 24) {
- tag = tag | (source[idx++] & 0xff) << bitcount;
- bitcount += 8;
- }
- val = tag & (0xffff >> (16 - num));
- tag >>= num;
- bitcount -= num;
- return [bitcount, tag, idx, val];
-}
-this.read_bits = function(d, num, base)
-{
- if (!num)
- return base;
-
- var ret = read_bits_direct(d.source, d.bitcount, d.tag, d.sourceIndex, num);
- d.bitcount = ret[0];
- d.tag = ret[1];
- d.sourceIndex = ret[2];
- return ret[3] + base;
-}
-
-/* given a data stream and a tree, decode a symbol */
-this.decode_symbol = function(d, t)
-{
- while (d.bitcount < 16) {
- d.tag = d.tag | (d.source[d.sourceIndex++] & 0xff) << d.bitcount;
- d.bitcount += 8;
- }
-
- var sum = 0, cur = 0, len = 0;
- do {
- cur = 2 * cur + ((d.tag & (1 << len)) >> len);
-
- ++len;
-
- sum += t.table[len];
- cur -= t.table[len];
-
- } while (cur >= 0);
-
- d.tag >>= len;
- d.bitcount -= len;
-
- return t.trans[sum + cur];
-}
-
-/* given a data stream, decode dynamic trees from it */
-this.decode_trees = function(d, lt, dt)
-{
- var code_tree = new this.TREE();
- var lengths = new Array(288+32);
- var hlit, hdist, hclen;
- var i, num, length;
-
- /* get 5 bits HLIT (257-286) */
- hlit = this.read_bits(d, 5, 257);
-
- /* get 5 bits HDIST (1-32) */
- hdist = this.read_bits(d, 5, 1);
-
- /* get 4 bits HCLEN (4-19) */
- hclen = this.read_bits(d, 4, 4);
-
- for (i = 0; i < 19; ++i) lengths[i] = 0;
-
- /* read code lengths for code length alphabet */
- for (i = 0; i < hclen; ++i)
- {
- /* get 3 bits code length (0-7) */
- var clen = this.read_bits(d, 3, 0);
-
- lengths[this.clcidx[i]] = clen;
- }
-
- /* build code length tree */
- this.build_tree(code_tree, lengths, 0, 19);
-
- /* decode code lengths for the dynamic trees */
- for (num = 0; num < hlit + hdist; )
- {
- var sym = this.decode_symbol(d, code_tree);
-
- switch (sym)
- {
- case 16:
- /* copy previous code length 3-6 times (read 2 bits) */
- {
- var prev = lengths[num - 1];
- for (length = this.read_bits(d, 2, 3); length; --length)
- {
- lengths[num++] = prev;
- }
- }
- break;
- case 17:
- /* repeat code length 0 for 3-10 times (read 3 bits) */
- for (length = this.read_bits(d, 3, 3); length; --length)
- {
- lengths[num++] = 0;
- }
- break;
- case 18:
- /* repeat code length 0 for 11-138 times (read 7 bits) */
- for (length = this.read_bits(d, 7, 11); length; --length)
- {
- lengths[num++] = 0;
- }
- break;
- default:
- /* values 0-15 represent the actual code lengths */
- lengths[num++] = sym;
- break;
- }
- }
-
- /* build dynamic trees */
- this.build_tree(lt, lengths, 0, hlit);
- this.build_tree(dt, lengths, hlit, hdist);
-}
-
-/* ----------------------------- *
- * -- block inflate functions -- *
- * ----------------------------- */
-
-/* given a stream and two trees, inflate a block of data */
-this.inflate_block_data = function(d, lt, dt)
-{
- // js optimization.
- var ddest = d.dest;
- var ddestlength = ddest.length;
-
- while (1)
- {
- var sym = this.decode_symbol(d, lt);
-
- /* check for end of block */
- if (sym == 256)
- {
- return this.OK;
- }
-
- if (sym < 256)
- {
- ddest[ddestlength++] = sym; // ? String.fromCharCode(sym);
- d.history.push(sym);
- } else {
-
- var length, dist, offs;
- var i;
-
- sym -= 257;
-
- /* possibly get more bits from length code */
- length = this.read_bits(d, this.length_bits[sym], this.length_base[sym]);
-
- dist = this.decode_symbol(d, dt);
-
- /* possibly get more bits from distance code */
- offs = d.history.length - this.read_bits(d, this.dist_bits[dist], this.dist_base[dist]);
-
- if (offs < 0)
- throw ("Invalid zlib offset " + offs);
-
- /* copy match */
- for (i = offs; i < offs + length; ++i) {
- //ddest[ddestlength++] = ddest[i];
- ddest[ddestlength++] = d.history[i];
- d.history.push(d.history[i]);
- }
- }
- }
-}
-
-/* inflate an uncompressed block of data */
-this.inflate_uncompressed_block = function(d)
-{
- var length, invlength;
- var i;
-
- if (d.bitcount > 7) {
- var overflow = Math.floor(d.bitcount / 8);
- d.sourceIndex -= overflow;
- d.bitcount = 0;
- d.tag = 0;
- }
-
- /* get length */
- length = d.source[d.sourceIndex+1];
- length = 256*length + d.source[d.sourceIndex];
-
- /* get one's complement of length */
- invlength = d.source[d.sourceIndex+3];
- invlength = 256*invlength + d.source[d.sourceIndex+2];
-
- /* check length */
- if (length != (~invlength & 0x0000ffff)) return this.DATA_ERROR;
-
- d.sourceIndex += 4;
-
- /* copy block */
- for (i = length; i; --i) {
- d.history.push(d.source[d.sourceIndex]);
- d.dest[d.dest.length] = d.source[d.sourceIndex++];
- }
-
- /* make sure we start next block on a byte boundary */
- d.bitcount = 0;
-
- return this.OK;
-}
-
-/* inflate a block of data compressed with fixed huffman trees */
-this.inflate_fixed_block = function(d)
-{
- /* decode block using fixed trees */
- return this.inflate_block_data(d, this.sltree, this.sdtree);
-}
-
-/* inflate a block of data compressed with dynamic huffman trees */
-this.inflate_dynamic_block = function(d)
-{
- /* decode trees from stream */
- this.decode_trees(d, d.ltree, d.dtree);
-
- /* decode block using decoded trees */
- return this.inflate_block_data(d, d.ltree, d.dtree);
-}
-
-/* ---------------------- *
- * -- public functions -- *
- * ---------------------- */
-
-/* initialize global (static) data */
-this.init = function()
-{
- /* build fixed huffman trees */
- this.build_fixed_trees(this.sltree, this.sdtree);
-
- /* build extra bits and base tables */
- this.build_bits_base(this.length_bits, this.length_base, 4, 3);
- this.build_bits_base(this.dist_bits, this.dist_base, 2, 1);
-
- /* fix a special case */
- this.length_bits[28] = 0;
- this.length_base[28] = 258;
-
- this.reset();
-}
-
-this.reset = function()
-{
- this.d = new this.DATA(this);
- delete this.header;
-}
-
-/* inflate stream from source to dest */
-this.uncompress = function(source, offset)
-{
-
- var d = this.d;
- var bfinal;
-
- /* initialise data */
- d.source = source;
- d.sourceIndex = offset;
- d.bitcount = 0;
-
- d.dest = [];
-
- // Skip zlib header at start of stream
- if (typeof this.header == 'undefined') {
- this.header = this.read_bits(d, 16, 0);
- /* byte 0: 0x78, 7 = 32k window size, 8 = deflate */
- /* byte 1: check bits for header and other flags */
- }
-
- var blocks = 0;
-
- do {
-
- var btype;
- var res;
-
- /* read final block flag */
- bfinal = this.getbit(d);
-
- /* read block type (2 bits) */
- btype = this.read_bits(d, 2, 0);
-
- /* decompress block */
- switch (btype)
- {
- case 0:
- /* decompress uncompressed block */
- res = this.inflate_uncompressed_block(d);
- break;
- case 1:
- /* decompress block with fixed huffman trees */
- res = this.inflate_fixed_block(d);
- break;
- case 2:
- /* decompress block with dynamic huffman trees */
- res = this.inflate_dynamic_block(d);
- break;
- default:
- return { 'status' : this.DATA_ERROR };
- }
-
- if (res != this.OK) return { 'status' : this.DATA_ERROR };
- blocks++;
-
- } while (!bfinal && d.sourceIndex < d.source.length);
-
- d.history = d.history.slice(-this.WINDOW_SIZE);
-
- return { 'status' : this.OK, 'data' : d.dest };
-}
-
-};
diff --git a/webclients/novnc/include/keyboard.js b/webclients/novnc/include/keyboard.js
deleted file mode 100644
index 8667031..0000000
--- a/webclients/novnc/include/keyboard.js
+++ /dev/null
@@ -1,543 +0,0 @@
-var kbdUtil = (function() {
- "use strict";
-
- function substituteCodepoint(cp) {
- // Any Unicode code points which do not have corresponding keysym entries
- // can be swapped out for another code point by adding them to this table
- var substitutions = {
- // {S,s} with comma below -> {S,s} with cedilla
- 0x218 : 0x15e,
- 0x219 : 0x15f,
- // {T,t} with comma below -> {T,t} with cedilla
- 0x21a : 0x162,
- 0x21b : 0x163
- };
-
- var sub = substitutions[cp];
- return sub ? sub : cp;
- }
-
- function isMac() {
- return navigator && !!(/mac/i).exec(navigator.platform);
- }
- function isWindows() {
- return navigator && !!(/win/i).exec(navigator.platform);
- }
- function isLinux() {
- return navigator && !!(/linux/i).exec(navigator.platform);
- }
-
- // Return true if a modifier which is not the specified char modifier (and is not shift) is down
- function hasShortcutModifier(charModifier, currentModifiers) {
- var mods = {};
- for (var key in currentModifiers) {
- if (parseInt(key) !== XK_Shift_L) {
- mods[key] = currentModifiers[key];
- }
- }
-
- var sum = 0;
- for (var k in currentModifiers) {
- if (mods[k]) {
- ++sum;
- }
- }
- if (hasCharModifier(charModifier, mods)) {
- return sum > charModifier.length;
- }
- else {
- return sum > 0;
- }
- }
-
- // Return true if the specified char modifier is currently down
- function hasCharModifier(charModifier, currentModifiers) {
- if (charModifier.length === 0) { return false; }
-
- for (var i = 0; i < charModifier.length; ++i) {
- if (!currentModifiers[charModifier[i]]) {
- return false;
- }
- }
- return true;
- }
-
- // Helper object tracking modifier key state
- // and generates fake key events to compensate if it gets out of sync
- function ModifierSync(charModifier) {
- if (!charModifier) {
- if (isMac()) {
- // on Mac, Option (AKA Alt) is used as a char modifier
- charModifier = [XK_Alt_L];
- }
- else if (isWindows()) {
- // on Windows, Ctrl+Alt is used as a char modifier
- charModifier = [XK_Alt_L, XK_Control_L];
- }
- else if (isLinux()) {
- // on Linux, ISO Level 3 Shift (AltGr) is used as a char modifier
- charModifier = [XK_ISO_Level3_Shift];
- }
- else {
- charModifier = [];
- }
- }
-
- var state = {};
- state[XK_Control_L] = false;
- state[XK_Alt_L] = false;
- state[XK_ISO_Level3_Shift] = false;
- state[XK_Shift_L] = false;
- state[XK_Meta_L] = false;
-
- function sync(evt, keysym) {
- var result = [];
- function syncKey(keysym) {
- return {keysym: keysyms.lookup(keysym), type: state[keysym] ? 'keydown' : 'keyup'};
- }
-
- if (evt.ctrlKey !== undefined &&
- evt.ctrlKey !== state[XK_Control_L] && keysym !== XK_Control_L) {
- state[XK_Control_L] = evt.ctrlKey;
- result.push(syncKey(XK_Control_L));
- }
- if (evt.altKey !== undefined &&
- evt.altKey !== state[XK_Alt_L] && keysym !== XK_Alt_L) {
- state[XK_Alt_L] = evt.altKey;
- result.push(syncKey(XK_Alt_L));
- }
- if (evt.altGraphKey !== undefined &&
- evt.altGraphKey !== state[XK_ISO_Level3_Shift] && keysym !== XK_ISO_Level3_Shift) {
- state[XK_ISO_Level3_Shift] = evt.altGraphKey;
- result.push(syncKey(XK_ISO_Level3_Shift));
- }
- if (evt.shiftKey !== undefined &&
- evt.shiftKey !== state[XK_Shift_L] && keysym !== XK_Shift_L) {
- state[XK_Shift_L] = evt.shiftKey;
- result.push(syncKey(XK_Shift_L));
- }
- if (evt.metaKey !== undefined &&
- evt.metaKey !== state[XK_Meta_L] && keysym !== XK_Meta_L) {
- state[XK_Meta_L] = evt.metaKey;
- result.push(syncKey(XK_Meta_L));
- }
- return result;
- }
- function syncKeyEvent(evt, down) {
- var obj = getKeysym(evt);
- var keysym = obj ? obj.keysym : null;
-
- // first, apply the event itself, if relevant
- if (keysym !== null && state[keysym] !== undefined) {
- state[keysym] = down;
- }
- return sync(evt, keysym);
- }
-
- return {
- // sync on the appropriate keyboard event
- keydown: function(evt) { return syncKeyEvent(evt, true);},
- keyup: function(evt) { return syncKeyEvent(evt, false);},
- // Call this with a non-keyboard event (such as mouse events) to use its modifier state to synchronize anyway
- syncAny: function(evt) { return sync(evt);},
-
- // is a shortcut modifier down?
- hasShortcutModifier: function() { return hasShortcutModifier(charModifier, state); },
- // if a char modifier is down, return the keys it consists of, otherwise return null
- activeCharModifier: function() { return hasCharModifier(charModifier, state) ? charModifier : null; }
- };
- }
-
- // Get a key ID from a keyboard event
- // May be a string or an integer depending on the available properties
- function getKey(evt){
- if ('keyCode' in evt && 'key' in evt) {
- return evt.key + ':' + evt.keyCode;
- }
- else if ('keyCode' in evt) {
- return evt.keyCode;
- }
- else {
- return evt.key;
- }
- }
-
- // Get the most reliable keysym value we can get from a key event
- // if char/charCode is available, prefer those, otherwise fall back to key/keyCode/which
- function getKeysym(evt){
- var codepoint;
- if (evt.char && evt.char.length === 1) {
- codepoint = evt.char.charCodeAt();
- }
- else if (evt.charCode) {
- codepoint = evt.charCode;
- }
- else if (evt.keyCode && evt.type === 'keypress') {
- // IE10 stores the char code as keyCode, and has no other useful properties
- codepoint = evt.keyCode;
- }
- if (codepoint) {
- var res = keysyms.fromUnicode(substituteCodepoint(codepoint));
- if (res) {
- return res;
- }
- }
- // we could check evt.key here.
- // Legal values are defined in http://www.w3.org/TR/DOM-Level-3-Events/#key-values-list,
- // so we "just" need to map them to keysym, but AFAIK this is only available in IE10, which also provides evt.key
- // so we don't *need* it yet
- if (evt.keyCode) {
- return keysyms.lookup(keysymFromKeyCode(evt.keyCode, evt.shiftKey));
- }
- if (evt.which) {
- return keysyms.lookup(keysymFromKeyCode(evt.which, evt.shiftKey));
- }
- return null;
- }
-
- // Given a keycode, try to predict which keysym it might be.
- // If the keycode is unknown, null is returned.
- function keysymFromKeyCode(keycode, shiftPressed) {
- if (typeof(keycode) !== 'number') {
- return null;
- }
- // won't be accurate for azerty
- if (keycode >= 0x30 && keycode <= 0x39) {
- return keycode; // digit
- }
- if (keycode >= 0x41 && keycode <= 0x5a) {
- // remap to lowercase unless shift is down
- return shiftPressed ? keycode : keycode + 32; // A-Z
- }
- if (keycode >= 0x60 && keycode <= 0x69) {
- return XK_KP_0 + (keycode - 0x60); // numpad 0-9
- }
-
- switch(keycode) {
- case 0x20: return XK_space;
- case 0x6a: return XK_KP_Multiply;
- case 0x6b: return XK_KP_Add;
- case 0x6c: return XK_KP_Separator;
- case 0x6d: return XK_KP_Subtract;
- case 0x6e: return XK_KP_Decimal;
- case 0x6f: return XK_KP_Divide;
- case 0xbb: return XK_plus;
- case 0xbc: return XK_comma;
- case 0xbd: return XK_minus;
- case 0xbe: return XK_period;
- }
-
- return nonCharacterKey({keyCode: keycode});
- }
-
- // if the key is a known non-character key (any key which doesn't generate character data)
- // return its keysym value. Otherwise return null
- function nonCharacterKey(evt) {
- // evt.key not implemented yet
- if (!evt.keyCode) { return null; }
- var keycode = evt.keyCode;
-
- if (keycode >= 0x70 && keycode <= 0x87) {
- return XK_F1 + keycode - 0x70; // F1-F24
- }
- switch (keycode) {
-
- case 8 : return XK_BackSpace;
- case 13 : return XK_Return;
-
- case 9 : return XK_Tab;
-
- case 27 : return XK_Escape;
- case 46 : return XK_Delete;
-
- case 36 : return XK_Home;
- case 35 : return XK_End;
- case 33 : return XK_Page_Up;
- case 34 : return XK_Page_Down;
- case 45 : return XK_Insert;
-
- case 37 : return XK_Left;
- case 38 : return XK_Up;
- case 39 : return XK_Right;
- case 40 : return XK_Down;
-
- case 16 : return XK_Shift_L;
- case 17 : return XK_Control_L;
- case 18 : return XK_Alt_L; // also: Option-key on Mac
-
- case 224 : return XK_Meta_L;
- case 225 : return XK_ISO_Level3_Shift; // AltGr
- case 91 : return XK_Super_L; // also: Windows-key
- case 92 : return XK_Super_R; // also: Windows-key
- case 93 : return XK_Menu; // also: Windows-Menu, Command on Mac
- default: return null;
- }
- }
- return {
- hasShortcutModifier : hasShortcutModifier,
- hasCharModifier : hasCharModifier,
- ModifierSync : ModifierSync,
- getKey : getKey,
- getKeysym : getKeysym,
- keysymFromKeyCode : keysymFromKeyCode,
- nonCharacterKey : nonCharacterKey,
- substituteCodepoint : substituteCodepoint
- };
-})();
-
-// Takes a DOM keyboard event and:
-// - determines which keysym it represents
-// - determines a keyId identifying the key that was pressed (corresponding to the key/keyCode properties on the DOM event)
-// - synthesizes events to synchronize modifier key state between which modifiers are actually down, and which we thought were down
-// - marks each event with an 'escape' property if a modifier was down which should be "escaped"
-// - generates a "stall" event in cases where it might be necessary to wait and see if a keypress event follows a keydown
-// This information is collected into an object which is passed to the next() function. (one call per event)
-function KeyEventDecoder(modifierState, next) {
- "use strict";
- function sendAll(evts) {
- for (var i = 0; i < evts.length; ++i) {
- next(evts[i]);
- }
- }
- function process(evt, type) {
- var result = {type: type};
- var keyId = kbdUtil.getKey(evt);
- if (keyId) {
- result.keyId = keyId;
- }
-
- var keysym = kbdUtil.getKeysym(evt);
-
- var hasModifier = modifierState.hasShortcutModifier() || !!modifierState.activeCharModifier();
- // Is this a case where we have to decide on the keysym right away, rather than waiting for the keypress?
- // "special" keys like enter, tab or backspace don't send keypress events,
- // and some browsers don't send keypresses at all if a modifier is down
- if (keysym && (type !== 'keydown' || kbdUtil.nonCharacterKey(evt) || hasModifier)) {
- result.keysym = keysym;
- }
-
- var isShift = evt.keyCode === 0x10 || evt.key === 'Shift';
-
- // Should we prevent the browser from handling the event?
- // Doing so on a keydown (in most browsers) prevents keypress from being generated
- // so only do that if we have to.
- var suppress = !isShift && (type !== 'keydown' || modifierState.hasShortcutModifier() || !!kbdUtil.nonCharacterKey(evt));
-
- // If a char modifier is down on a keydown, we need to insert a stall,
- // so VerifyCharModifier knows to wait and see if a keypress is comnig
- var stall = type === 'keydown' && modifierState.activeCharModifier() && !kbdUtil.nonCharacterKey(evt);
-
- // if a char modifier is pressed, get the keys it consists of (on Windows, AltGr is equivalent to Ctrl+Alt)
- var active = modifierState.activeCharModifier();
-
- // If we have a char modifier down, and we're able to determine a keysym reliably
- // then (a) we know to treat the modifier as a char modifier,
- // and (b) we'll have to "escape" the modifier to undo the modifier when sending the char.
- if (active && keysym) {
- var isCharModifier = false;
- for (var i = 0; i < active.length; ++i) {
- if (active[i] === keysym.keysym) {
- isCharModifier = true;
- }
- }
- if (type === 'keypress' && !isCharModifier) {
- result.escape = modifierState.activeCharModifier();
- }
- }
-
- if (stall) {
- // insert a fake "stall" event
- next({type: 'stall'});
- }
- next(result);
-
- return suppress;
- }
-
- return {
- keydown: function(evt) {
- sendAll(modifierState.keydown(evt));
- return process(evt, 'keydown');
- },
- keypress: function(evt) {
- return process(evt, 'keypress');
- },
- keyup: function(evt) {
- sendAll(modifierState.keyup(evt));
- return process(evt, 'keyup');
- },
- syncModifiers: function(evt) {
- sendAll(modifierState.syncAny(evt));
- },
- releaseAll: function() { next({type: 'releaseall'}); }
- };
-}
-
-// Combines keydown and keypress events where necessary to handle char modifiers.
-// On some OS'es, a char modifier is sometimes used as a shortcut modifier.
-// For example, on Windows, AltGr is synonymous with Ctrl-Alt. On a Danish keyboard layout, AltGr-2 yields a @, but Ctrl-Alt-D does nothing
-// so when used with the '2' key, Ctrl-Alt counts as a char modifier (and should be escaped), but when used with 'D', it does not.
-// The only way we can distinguish these cases is to wait and see if a keypress event arrives
-// When we receive a "stall" event, wait a few ms before processing the next keydown. If a keypress has also arrived, merge the two
-function VerifyCharModifier(next) {
- "use strict";
- var queue = [];
- var timer = null;
- function process() {
- if (timer) {
- return;
- }
-
- var delayProcess = function () {
- clearTimeout(timer);
- timer = null;
- process();
- };
-
- while (queue.length !== 0) {
- var cur = queue[0];
- queue = queue.splice(1);
- switch (cur.type) {
- case 'stall':
- // insert a delay before processing available events.
- /* jshint loopfunc: true */
- timer = setTimeout(delayProcess, 5);
- /* jshint loopfunc: false */
- return;
- case 'keydown':
- // is the next element a keypress? Then we should merge the two
- if (queue.length !== 0 && queue[0].type === 'keypress') {
- // Firefox sends keypress even when no char is generated.
- // so, if keypress keysym is the same as we'd have guessed from keydown,
- // the modifier didn't have any effect, and should not be escaped
- if (queue[0].escape && (!cur.keysym || cur.keysym.keysym !== queue[0].keysym.keysym)) {
- cur.escape = queue[0].escape;
- }
- cur.keysym = queue[0].keysym;
- queue = queue.splice(1);
- }
- break;
- }
-
- // swallow stall events, and pass all others to the next stage
- if (cur.type !== 'stall') {
- next(cur);
- }
- }
- }
- return function(evt) {
- queue.push(evt);
- process();
- };
-}
-
-// Keeps track of which keys we (and the server) believe are down
-// When a keyup is received, match it against this list, to determine the corresponding keysym(s)
-// in some cases, a single key may produce multiple keysyms, so the corresponding keyup event must release all of these chars
-// key repeat events should be merged into a single entry.
-// Because we can't always identify which entry a keydown or keyup event corresponds to, we sometimes have to guess
-function TrackKeyState(next) {
- "use strict";
- var state = [];
-
- return function (evt) {
- var last = state.length !== 0 ? state[state.length-1] : null;
-
- switch (evt.type) {
- case 'keydown':
- // insert a new entry if last seen key was different.
- if (!last || !evt.keyId || last.keyId !== evt.keyId) {
- last = {keyId: evt.keyId, keysyms: {}};
- state.push(last);
- }
- if (evt.keysym) {
- // make sure last event contains this keysym (a single "logical" keyevent
- // can cause multiple key events to be sent to the VNC server)
- last.keysyms[evt.keysym.keysym] = evt.keysym;
- last.ignoreKeyPress = true;
- next(evt);
- }
- break;
- case 'keypress':
- if (!last) {
- last = {keyId: evt.keyId, keysyms: {}};
- state.push(last);
- }
- if (!evt.keysym) {
- console.log('keypress with no keysym:', evt);
- }
-
- // If we didn't expect a keypress, and already sent a keydown to the VNC server
- // based on the keydown, make sure to skip this event.
- if (evt.keysym && !last.ignoreKeyPress) {
- last.keysyms[evt.keysym.keysym] = evt.keysym;
- evt.type = 'keydown';
- next(evt);
- }
- break;
- case 'keyup':
- if (state.length === 0) {
- return;
- }
- var idx = null;
- // do we have a matching key tracked as being down?
- for (var i = 0; i !== state.length; ++i) {
- if (state[i].keyId === evt.keyId) {
- idx = i;
- break;
- }
- }
- // if we couldn't find a match (it happens), assume it was the last key pressed
- if (idx === null) {
- idx = state.length - 1;
- }
-
- var item = state.splice(idx, 1)[0];
- // for each keysym tracked by this key entry, clone the current event and override the keysym
- var clone = (function(){
- function Clone(){}
- return function (obj) { Clone.prototype=obj; return new Clone(); };
- }());
- for (var key in item.keysyms) {
- var out = clone(evt);
- out.keysym = item.keysyms[key];
- next(out);
- }
- break;
- case 'releaseall':
- /* jshint shadow: true */
- for (var i = 0; i < state.length; ++i) {
- for (var key in state[i].keysyms) {
- var keysym = state[i].keysyms[key];
- next({keyId: 0, keysym: keysym, type: 'keyup'});
- }
- }
- /* jshint shadow: false */
- state = [];
- }
- };
-}
-
-// Handles "escaping" of modifiers: if a char modifier is used to produce a keysym (such as AltGr-2 to generate an @),
-// then the modifier must be "undone" before sending the @, and "redone" afterwards.
-function EscapeModifiers(next) {
- "use strict";
- return function(evt) {
- if (evt.type !== 'keydown' || evt.escape === undefined) {
- next(evt);
- return;
- }
- // undo modifiers
- for (var i = 0; i < evt.escape.length; ++i) {
- next({type: 'keyup', keyId: 0, keysym: keysyms.lookup(evt.escape[i])});
- }
- // send the character event
- next(evt);
- // redo modifiers
- /* jshint shadow: true */
- for (var i = 0; i < evt.escape.length; ++i) {
- next({type: 'keydown', keyId: 0, keysym: keysyms.lookup(evt.escape[i])});
- }
- /* jshint shadow: false */
- };
-}
diff --git a/webclients/novnc/include/keysym.js b/webclients/novnc/include/keysym.js
deleted file mode 100644
index 2b97198..0000000
--- a/webclients/novnc/include/keysym.js
+++ /dev/null
@@ -1,378 +0,0 @@
-var XK_VoidSymbol = 0xffffff, /* Void symbol */
-
-XK_BackSpace = 0xff08, /* Back space, back char */
-XK_Tab = 0xff09,
-XK_Linefeed = 0xff0a, /* Linefeed, LF */
-XK_Clear = 0xff0b,
-XK_Return = 0xff0d, /* Return, enter */
-XK_Pause = 0xff13, /* Pause, hold */
-XK_Scroll_Lock = 0xff14,
-XK_Sys_Req = 0xff15,
-XK_Escape = 0xff1b,
-XK_Delete = 0xffff, /* Delete, rubout */
-
-/* Cursor control & motion */
-
-XK_Home = 0xff50,
-XK_Left = 0xff51, /* Move left, left arrow */
-XK_Up = 0xff52, /* Move up, up arrow */
-XK_Right = 0xff53, /* Move right, right arrow */
-XK_Down = 0xff54, /* Move down, down arrow */
-XK_Prior = 0xff55, /* Prior, previous */
-XK_Page_Up = 0xff55,
-XK_Next = 0xff56, /* Next */
-XK_Page_Down = 0xff56,
-XK_End = 0xff57, /* EOL */
-XK_Begin = 0xff58, /* BOL */
-
-
-/* Misc functions */
-
-XK_Select = 0xff60, /* Select, mark */
-XK_Print = 0xff61,
-XK_Execute = 0xff62, /* Execute, run, do */
-XK_Insert = 0xff63, /* Insert, insert here */
-XK_Undo = 0xff65,
-XK_Redo = 0xff66, /* Redo, again */
-XK_Menu = 0xff67,
-XK_Find = 0xff68, /* Find, search */
-XK_Cancel = 0xff69, /* Cancel, stop, abort, exit */
-XK_Help = 0xff6a, /* Help */
-XK_Break = 0xff6b,
-XK_Mode_switch = 0xff7e, /* Character set switch */
-XK_script_switch = 0xff7e, /* Alias for mode_switch */
-XK_Num_Lock = 0xff7f,
-
-/* Keypad functions, keypad numbers cleverly chosen to map to ASCII */
-
-XK_KP_Space = 0xff80, /* Space */
-XK_KP_Tab = 0xff89,
-XK_KP_Enter = 0xff8d, /* Enter */
-XK_KP_F1 = 0xff91, /* PF1, KP_A, ... */
-XK_KP_F2 = 0xff92,
-XK_KP_F3 = 0xff93,
-XK_KP_F4 = 0xff94,
-XK_KP_Home = 0xff95,
-XK_KP_Left = 0xff96,
-XK_KP_Up = 0xff97,
-XK_KP_Right = 0xff98,
-XK_KP_Down = 0xff99,
-XK_KP_Prior = 0xff9a,
-XK_KP_Page_Up = 0xff9a
-XK_KP_Next = 0xff9b,
-XK_KP_Page_Down = 0xff9b,
-XK_KP_End = 0xff9c,
-XK_KP_Begin = 0xff9d,
-XK_KP_Insert = 0xff9e,
-XK_KP_Delete = 0xff9f,
-XK_KP_Equal = 0xffbd, /* Equals */
-XK_KP_Multiply = 0xffaa,
-XK_KP_Add = 0xffab,
-XK_KP_Separator = 0xffac, /* Separator, often comma */
-XK_KP_Subtract = 0xffad,
-XK_KP_Decimal = 0xffae,
-XK_KP_Divide = 0xffaf,
-
-XK_KP_0 = 0xffb0,
-XK_KP_1 = 0xffb1,
-XK_KP_2 = 0xffb2,
-XK_KP_3 = 0xffb3,
-XK_KP_4 = 0xffb4,
-XK_KP_5 = 0xffb5,
-XK_KP_6 = 0xffb6,
-XK_KP_7 = 0xffb7,
-XK_KP_8 = 0xffb8,
-XK_KP_9 = 0xffb9,
-
-/*
- * Auxiliary functions; note the duplicate definitions for left and right
- * function keys; Sun keyboards and a few other manufacturers have such
- * function key groups on the left and/or right sides of the keyboard.
- * We've not found a keyboard with more than 35 function keys total.
- */
-
-XK_F1 = 0xffbe,
-XK_F2 = 0xffbf,
-XK_F3 = 0xffc0,
-XK_F4 = 0xffc1,
-XK_F5 = 0xffc2,
-XK_F6 = 0xffc3,
-XK_F7 = 0xffc4,
-XK_F8 = 0xffc5,
-XK_F9 = 0xffc6,
-XK_F10 = 0xffc7,
-XK_F11 = 0xffc8,
-XK_L1 = 0xffc8,
-XK_F12 = 0xffc9,
-XK_L2 = 0xffc9,
-XK_F13 = 0xffca,
-XK_L3 = 0xffca,
-XK_F14 = 0xffcb,
-XK_L4 = 0xffcb,
-XK_F15 = 0xffcc,
-XK_L5 = 0xffcc,
-XK_F16 = 0xffcd,
-XK_L6 = 0xffcd,
-XK_F17 = 0xffce,
-XK_L7 = 0xffce,
-XK_F18 = 0xffcf,
-XK_L8 = 0xffcf,
-XK_F19 = 0xffd0,
-XK_L9 = 0xffd0,
-XK_F20 = 0xffd1,
-XK_L10 = 0xffd1,
-XK_F21 = 0xffd2,
-XK_R1 = 0xffd2,
-XK_F22 = 0xffd3,
-XK_R2 = 0xffd3,
-XK_F23 = 0xffd4,
-XK_R3 = 0xffd4,
-XK_F24 = 0xffd5,
-XK_R4 = 0xffd5,
-XK_F25 = 0xffd6,
-XK_R5 = 0xffd6,
-XK_F26 = 0xffd7,
-XK_R6 = 0xffd7,
-XK_F27 = 0xffd8,
-XK_R7 = 0xffd8,
-XK_F28 = 0xffd9,
-XK_R8 = 0xffd9,
-XK_F29 = 0xffda,
-XK_R9 = 0xffda,
-XK_F30 = 0xffdb,
-XK_R10 = 0xffdb,
-XK_F31 = 0xffdc,
-XK_R11 = 0xffdc,
-XK_F32 = 0xffdd,
-XK_R12 = 0xffdd,
-XK_F33 = 0xffde,
-XK_R13 = 0xffde,
-XK_F34 = 0xffdf,
-XK_R14 = 0xffdf,
-XK_F35 = 0xffe0,
-XK_R15 = 0xffe0,
-
-/* Modifiers */
-
-XK_Shift_L = 0xffe1, /* Left shift */
-XK_Shift_R = 0xffe2, /* Right shift */
-XK_Control_L = 0xffe3, /* Left control */
-XK_Control_R = 0xffe4, /* Right control */
-XK_Caps_Lock = 0xffe5, /* Caps lock */
-XK_Shift_Lock = 0xffe6, /* Shift lock */
-
-XK_Meta_L = 0xffe7, /* Left meta */
-XK_Meta_R = 0xffe8, /* Right meta */
-XK_Alt_L = 0xffe9, /* Left alt */
-XK_Alt_R = 0xffea, /* Right alt */
-XK_Super_L = 0xffeb, /* Left super */
-XK_Super_R = 0xffec, /* Right super */
-XK_Hyper_L = 0xffed, /* Left hyper */
-XK_Hyper_R = 0xffee, /* Right hyper */
-
-XK_ISO_Level3_Shift = 0xfe03, /* AltGr */
-
-/*
- * Latin 1
- * (ISO/IEC 8859-1 = Unicode U+0020..U+00FF)
- * Byte 3 = 0
- */
-
-XK_space = 0x0020, /* U+0020 SPACE */
-XK_exclam = 0x0021, /* U+0021 EXCLAMATION MARK */
-XK_quotedbl = 0x0022, /* U+0022 QUOTATION MARK */
-XK_numbersign = 0x0023, /* U+0023 NUMBER SIGN */
-XK_dollar = 0x0024, /* U+0024 DOLLAR SIGN */
-XK_percent = 0x0025, /* U+0025 PERCENT SIGN */
-XK_ampersand = 0x0026, /* U+0026 AMPERSAND */
-XK_apostrophe = 0x0027, /* U+0027 APOSTROPHE */
-XK_quoteright = 0x0027, /* deprecated */
-XK_parenleft = 0x0028, /* U+0028 LEFT PARENTHESIS */
-XK_parenright = 0x0029, /* U+0029 RIGHT PARENTHESIS */
-XK_asterisk = 0x002a, /* U+002A ASTERISK */
-XK_plus = 0x002b, /* U+002B PLUS SIGN */
-XK_comma = 0x002c, /* U+002C COMMA */
-XK_minus = 0x002d, /* U+002D HYPHEN-MINUS */
-XK_period = 0x002e, /* U+002E FULL STOP */
-XK_slash = 0x002f, /* U+002F SOLIDUS */
-XK_0 = 0x0030, /* U+0030 DIGIT ZERO */
-XK_1 = 0x0031, /* U+0031 DIGIT ONE */
-XK_2 = 0x0032, /* U+0032 DIGIT TWO */
-XK_3 = 0x0033, /* U+0033 DIGIT THREE */
-XK_4 = 0x0034, /* U+0034 DIGIT FOUR */
-XK_5 = 0x0035, /* U+0035 DIGIT FIVE */
-XK_6 = 0x0036, /* U+0036 DIGIT SIX */
-XK_7 = 0x0037, /* U+0037 DIGIT SEVEN */
-XK_8 = 0x0038, /* U+0038 DIGIT EIGHT */
-XK_9 = 0x0039, /* U+0039 DIGIT NINE */
-XK_colon = 0x003a, /* U+003A COLON */
-XK_semicolon = 0x003b, /* U+003B SEMICOLON */
-XK_less = 0x003c, /* U+003C LESS-THAN SIGN */
-XK_equal = 0x003d, /* U+003D EQUALS SIGN */
-XK_greater = 0x003e, /* U+003E GREATER-THAN SIGN */
-XK_question = 0x003f, /* U+003F QUESTION MARK */
-XK_at = 0x0040, /* U+0040 COMMERCIAL AT */
-XK_A = 0x0041, /* U+0041 LATIN CAPITAL LETTER A */
-XK_B = 0x0042, /* U+0042 LATIN CAPITAL LETTER B */
-XK_C = 0x0043, /* U+0043 LATIN CAPITAL LETTER C */
-XK_D = 0x0044, /* U+0044 LATIN CAPITAL LETTER D */
-XK_E = 0x0045, /* U+0045 LATIN CAPITAL LETTER E */
-XK_F = 0x0046, /* U+0046 LATIN CAPITAL LETTER F */
-XK_G = 0x0047, /* U+0047 LATIN CAPITAL LETTER G */
-XK_H = 0x0048, /* U+0048 LATIN CAPITAL LETTER H */
-XK_I = 0x0049, /* U+0049 LATIN CAPITAL LETTER I */
-XK_J = 0x004a, /* U+004A LATIN CAPITAL LETTER J */
-XK_K = 0x004b, /* U+004B LATIN CAPITAL LETTER K */
-XK_L = 0x004c, /* U+004C LATIN CAPITAL LETTER L */
-XK_M = 0x004d, /* U+004D LATIN CAPITAL LETTER M */
-XK_N = 0x004e, /* U+004E LATIN CAPITAL LETTER N */
-XK_O = 0x004f, /* U+004F LATIN CAPITAL LETTER O */
-XK_P = 0x0050, /* U+0050 LATIN CAPITAL LETTER P */
-XK_Q = 0x0051, /* U+0051 LATIN CAPITAL LETTER Q */
-XK_R = 0x0052, /* U+0052 LATIN CAPITAL LETTER R */
-XK_S = 0x0053, /* U+0053 LATIN CAPITAL LETTER S */
-XK_T = 0x0054, /* U+0054 LATIN CAPITAL LETTER T */
-XK_U = 0x0055, /* U+0055 LATIN CAPITAL LETTER U */
-XK_V = 0x0056, /* U+0056 LATIN CAPITAL LETTER V */
-XK_W = 0x0057, /* U+0057 LATIN CAPITAL LETTER W */
-XK_X = 0x0058, /* U+0058 LATIN CAPITAL LETTER X */
-XK_Y = 0x0059, /* U+0059 LATIN CAPITAL LETTER Y */
-XK_Z = 0x005a, /* U+005A LATIN CAPITAL LETTER Z */
-XK_bracketleft = 0x005b, /* U+005B LEFT SQUARE BRACKET */
-XK_backslash = 0x005c, /* U+005C REVERSE SOLIDUS */
-XK_bracketright = 0x005d, /* U+005D RIGHT SQUARE BRACKET */
-XK_asciicircum = 0x005e, /* U+005E CIRCUMFLEX ACCENT */
-XK_underscore = 0x005f, /* U+005F LOW LINE */
-XK_grave = 0x0060, /* U+0060 GRAVE ACCENT */
-XK_quoteleft = 0x0060, /* deprecated */
-XK_a = 0x0061, /* U+0061 LATIN SMALL LETTER A */
-XK_b = 0x0062, /* U+0062 LATIN SMALL LETTER B */
-XK_c = 0x0063, /* U+0063 LATIN SMALL LETTER C */
-XK_d = 0x0064, /* U+0064 LATIN SMALL LETTER D */
-XK_e = 0x0065, /* U+0065 LATIN SMALL LETTER E */
-XK_f = 0x0066, /* U+0066 LATIN SMALL LETTER F */
-XK_g = 0x0067, /* U+0067 LATIN SMALL LETTER G */
-XK_h = 0x0068, /* U+0068 LATIN SMALL LETTER H */
-XK_i = 0x0069, /* U+0069 LATIN SMALL LETTER I */
-XK_j = 0x006a, /* U+006A LATIN SMALL LETTER J */
-XK_k = 0x006b, /* U+006B LATIN SMALL LETTER K */
-XK_l = 0x006c, /* U+006C LATIN SMALL LETTER L */
-XK_m = 0x006d, /* U+006D LATIN SMALL LETTER M */
-XK_n = 0x006e, /* U+006E LATIN SMALL LETTER N */
-XK_o = 0x006f, /* U+006F LATIN SMALL LETTER O */
-XK_p = 0x0070, /* U+0070 LATIN SMALL LETTER P */
-XK_q = 0x0071, /* U+0071 LATIN SMALL LETTER Q */
-XK_r = 0x0072, /* U+0072 LATIN SMALL LETTER R */
-XK_s = 0x0073, /* U+0073 LATIN SMALL LETTER S */
-XK_t = 0x0074, /* U+0074 LATIN SMALL LETTER T */
-XK_u = 0x0075, /* U+0075 LATIN SMALL LETTER U */
-XK_v = 0x0076, /* U+0076 LATIN SMALL LETTER V */
-XK_w = 0x0077, /* U+0077 LATIN SMALL LETTER W */
-XK_x = 0x0078, /* U+0078 LATIN SMALL LETTER X */
-XK_y = 0x0079, /* U+0079 LATIN SMALL LETTER Y */
-XK_z = 0x007a, /* U+007A LATIN SMALL LETTER Z */
-XK_braceleft = 0x007b, /* U+007B LEFT CURLY BRACKET */
-XK_bar = 0x007c, /* U+007C VERTICAL LINE */
-XK_braceright = 0x007d, /* U+007D RIGHT CURLY BRACKET */
-XK_asciitilde = 0x007e, /* U+007E TILDE */
-
-XK_nobreakspace = 0x00a0, /* U+00A0 NO-BREAK SPACE */
-XK_exclamdown = 0x00a1, /* U+00A1 INVERTED EXCLAMATION MARK */
-XK_cent = 0x00a2, /* U+00A2 CENT SIGN */
-XK_sterling = 0x00a3, /* U+00A3 POUND SIGN */
-XK_currency = 0x00a4, /* U+00A4 CURRENCY SIGN */
-XK_yen = 0x00a5, /* U+00A5 YEN SIGN */
-XK_brokenbar = 0x00a6, /* U+00A6 BROKEN BAR */
-XK_section = 0x00a7, /* U+00A7 SECTION SIGN */
-XK_diaeresis = 0x00a8, /* U+00A8 DIAERESIS */
-XK_copyright = 0x00a9, /* U+00A9 COPYRIGHT SIGN */
-XK_ordfeminine = 0x00aa, /* U+00AA FEMININE ORDINAL INDICATOR */
-XK_guillemotleft = 0x00ab, /* U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */
-XK_notsign = 0x00ac, /* U+00AC NOT SIGN */
-XK_hyphen = 0x00ad, /* U+00AD SOFT HYPHEN */
-XK_registered = 0x00ae, /* U+00AE REGISTERED SIGN */
-XK_macron = 0x00af, /* U+00AF MACRON */
-XK_degree = 0x00b0, /* U+00B0 DEGREE SIGN */
-XK_plusminus = 0x00b1, /* U+00B1 PLUS-MINUS SIGN */
-XK_twosuperior = 0x00b2, /* U+00B2 SUPERSCRIPT TWO */
-XK_threesuperior = 0x00b3, /* U+00B3 SUPERSCRIPT THREE */
-XK_acute = 0x00b4, /* U+00B4 ACUTE ACCENT */
-XK_mu = 0x00b5, /* U+00B5 MICRO SIGN */
-XK_paragraph = 0x00b6, /* U+00B6 PILCROW SIGN */
-XK_periodcentered = 0x00b7, /* U+00B7 MIDDLE DOT */
-XK_cedilla = 0x00b8, /* U+00B8 CEDILLA */
-XK_onesuperior = 0x00b9, /* U+00B9 SUPERSCRIPT ONE */
-XK_masculine = 0x00ba, /* U+00BA MASCULINE ORDINAL INDICATOR */
-XK_guillemotright = 0x00bb, /* U+00BB RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */
-XK_onequarter = 0x00bc, /* U+00BC VULGAR FRACTION ONE QUARTER */
-XK_onehalf = 0x00bd, /* U+00BD VULGAR FRACTION ONE HALF */
-XK_threequarters = 0x00be, /* U+00BE VULGAR FRACTION THREE QUARTERS */
-XK_questiondown = 0x00bf, /* U+00BF INVERTED QUESTION MARK */
-XK_Agrave = 0x00c0, /* U+00C0 LATIN CAPITAL LETTER A WITH GRAVE */
-XK_Aacute = 0x00c1, /* U+00C1 LATIN CAPITAL LETTER A WITH ACUTE */
-XK_Acircumflex = 0x00c2, /* U+00C2 LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
-XK_Atilde = 0x00c3, /* U+00C3 LATIN CAPITAL LETTER A WITH TILDE */
-XK_Adiaeresis = 0x00c4, /* U+00C4 LATIN CAPITAL LETTER A WITH DIAERESIS */
-XK_Aring = 0x00c5, /* U+00C5 LATIN CAPITAL LETTER A WITH RING ABOVE */
-XK_AE = 0x00c6, /* U+00C6 LATIN CAPITAL LETTER AE */
-XK_Ccedilla = 0x00c7, /* U+00C7 LATIN CAPITAL LETTER C WITH CEDILLA */
-XK_Egrave = 0x00c8, /* U+00C8 LATIN CAPITAL LETTER E WITH GRAVE */
-XK_Eacute = 0x00c9, /* U+00C9 LATIN CAPITAL LETTER E WITH ACUTE */
-XK_Ecircumflex = 0x00ca, /* U+00CA LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
-XK_Ediaeresis = 0x00cb, /* U+00CB LATIN CAPITAL LETTER E WITH DIAERESIS */
-XK_Igrave = 0x00cc, /* U+00CC LATIN CAPITAL LETTER I WITH GRAVE */
-XK_Iacute = 0x00cd, /* U+00CD LATIN CAPITAL LETTER I WITH ACUTE */
-XK_Icircumflex = 0x00ce, /* U+00CE LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
-XK_Idiaeresis = 0x00cf, /* U+00CF LATIN CAPITAL LETTER I WITH DIAERESIS */
-XK_ETH = 0x00d0, /* U+00D0 LATIN CAPITAL LETTER ETH */
-XK_Eth = 0x00d0, /* deprecated */
-XK_Ntilde = 0x00d1, /* U+00D1 LATIN CAPITAL LETTER N WITH TILDE */
-XK_Ograve = 0x00d2, /* U+00D2 LATIN CAPITAL LETTER O WITH GRAVE */
-XK_Oacute = 0x00d3, /* U+00D3 LATIN CAPITAL LETTER O WITH ACUTE */
-XK_Ocircumflex = 0x00d4, /* U+00D4 LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
-XK_Otilde = 0x00d5, /* U+00D5 LATIN CAPITAL LETTER O WITH TILDE */
-XK_Odiaeresis = 0x00d6, /* U+00D6 LATIN CAPITAL LETTER O WITH DIAERESIS */
-XK_multiply = 0x00d7, /* U+00D7 MULTIPLICATION SIGN */
-XK_Oslash = 0x00d8, /* U+00D8 LATIN CAPITAL LETTER O WITH STROKE */
-XK_Ooblique = 0x00d8, /* U+00D8 LATIN CAPITAL LETTER O WITH STROKE */
-XK_Ugrave = 0x00d9, /* U+00D9 LATIN CAPITAL LETTER U WITH GRAVE */
-XK_Uacute = 0x00da, /* U+00DA LATIN CAPITAL LETTER U WITH ACUTE */
-XK_Ucircumflex = 0x00db, /* U+00DB LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
-XK_Udiaeresis = 0x00dc, /* U+00DC LATIN CAPITAL LETTER U WITH DIAERESIS */
-XK_Yacute = 0x00dd, /* U+00DD LATIN CAPITAL LETTER Y WITH ACUTE */
-XK_THORN = 0x00de, /* U+00DE LATIN CAPITAL LETTER THORN */
-XK_Thorn = 0x00de, /* deprecated */
-XK_ssharp = 0x00df, /* U+00DF LATIN SMALL LETTER SHARP S */
-XK_agrave = 0x00e0, /* U+00E0 LATIN SMALL LETTER A WITH GRAVE */
-XK_aacute = 0x00e1, /* U+00E1 LATIN SMALL LETTER A WITH ACUTE */
-XK_acircumflex = 0x00e2, /* U+00E2 LATIN SMALL LETTER A WITH CIRCUMFLEX */
-XK_atilde = 0x00e3, /* U+00E3 LATIN SMALL LETTER A WITH TILDE */
-XK_adiaeresis = 0x00e4, /* U+00E4 LATIN SMALL LETTER A WITH DIAERESIS */
-XK_aring = 0x00e5, /* U+00E5 LATIN SMALL LETTER A WITH RING ABOVE */
-XK_ae = 0x00e6, /* U+00E6 LATIN SMALL LETTER AE */
-XK_ccedilla = 0x00e7, /* U+00E7 LATIN SMALL LETTER C WITH CEDILLA */
-XK_egrave = 0x00e8, /* U+00E8 LATIN SMALL LETTER E WITH GRAVE */
-XK_eacute = 0x00e9, /* U+00E9 LATIN SMALL LETTER E WITH ACUTE */
-XK_ecircumflex = 0x00ea, /* U+00EA LATIN SMALL LETTER E WITH CIRCUMFLEX */
-XK_ediaeresis = 0x00eb, /* U+00EB LATIN SMALL LETTER E WITH DIAERESIS */
-XK_igrave = 0x00ec, /* U+00EC LATIN SMALL LETTER I WITH GRAVE */
-XK_iacute = 0x00ed, /* U+00ED LATIN SMALL LETTER I WITH ACUTE */
-XK_icircumflex = 0x00ee, /* U+00EE LATIN SMALL LETTER I WITH CIRCUMFLEX */
-XK_idiaeresis = 0x00ef, /* U+00EF LATIN SMALL LETTER I WITH DIAERESIS */
-XK_eth = 0x00f0, /* U+00F0 LATIN SMALL LETTER ETH */
-XK_ntilde = 0x00f1, /* U+00F1 LATIN SMALL LETTER N WITH TILDE */
-XK_ograve = 0x00f2, /* U+00F2 LATIN SMALL LETTER O WITH GRAVE */
-XK_oacute = 0x00f3, /* U+00F3 LATIN SMALL LETTER O WITH ACUTE */
-XK_ocircumflex = 0x00f4, /* U+00F4 LATIN SMALL LETTER O WITH CIRCUMFLEX */
-XK_otilde = 0x00f5, /* U+00F5 LATIN SMALL LETTER O WITH TILDE */
-XK_odiaeresis = 0x00f6, /* U+00F6 LATIN SMALL LETTER O WITH DIAERESIS */
-XK_division = 0x00f7, /* U+00F7 DIVISION SIGN */
-XK_oslash = 0x00f8, /* U+00F8 LATIN SMALL LETTER O WITH STROKE */
-XK_ooblique = 0x00f8, /* U+00F8 LATIN SMALL LETTER O WITH STROKE */
-XK_ugrave = 0x00f9, /* U+00F9 LATIN SMALL LETTER U WITH GRAVE */
-XK_uacute = 0x00fa, /* U+00FA LATIN SMALL LETTER U WITH ACUTE */
-XK_ucircumflex = 0x00fb, /* U+00FB LATIN SMALL LETTER U WITH CIRCUMFLEX */
-XK_udiaeresis = 0x00fc, /* U+00FC LATIN SMALL LETTER U WITH DIAERESIS */
-XK_yacute = 0x00fd, /* U+00FD LATIN SMALL LETTER Y WITH ACUTE */
-XK_thorn = 0x00fe, /* U+00FE LATIN SMALL LETTER THORN */
-XK_ydiaeresis = 0x00ff; /* U+00FF LATIN SMALL LETTER Y WITH DIAERESIS */
diff --git a/webclients/novnc/include/keysymdef.js b/webclients/novnc/include/keysymdef.js
deleted file mode 100644
index f94445c..0000000
--- a/webclients/novnc/include/keysymdef.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// This file describes mappings from Unicode codepoints to the keysym values
-// (and optionally, key names) expected by the RFB protocol
-// How this file was generated:
-// node /Users/jalf/dev/mi/novnc/utils/parse.js /opt/X11/include/X11/keysymdef.h
-var keysyms = (function(){
- "use strict";
- var keynames = null;
- var codepoints = {"32":32,"33":33,"34":34,"35":35,"36":36,"37":37,"38":38,"39":39,"40":40,"41":41,"42":42,"43":43,"44":44,"45":45,"46":46,"47":47,"48":48,"49":49,"50":50,"51":51,"52":52,"53":53,"54":54,"55":55,"56":56,"57":57,"58":58,"59":59,"60":60,"61":61,"62":62,"63":63,"64":64,"65":65,"66":66,"67":67,"68":68,"69":69,"70":70,"71":71,"72":72,"73":73,"74":74,"75":75,"76":76,"77":77,"78":78,"79":79,"80":80,"81":81,"82":82,"83":83,"84":84,"85":85,"86":86,"87":87,"88":88,"89":89,"90":90,"91":91,"92":92,"93":93,"94":94,"95":95,"96":96,"97":97,"98":98,"99":99,"100":100,"101":101,"102":102,"103":103,"104":104,"105":105,"106":106,"107":107,"108":108,"109":109,"110":110,"111":111,"112":112,"113":113,"114":114,"115":115,"116":116,"117":117,"118":118,"119":119,"120":120,"121":121,"122":122,"123":123,"124":124,"125":125,"126":126,"160":160,"161":161,"162":162,"163":163,"164":164,"165":165,"166":166,"167":167,"168":168,"169":169,"170":170,"171":171,"172":172,"173":173,"174":174,"175":175,"176":176,"177":177,"178":178,"179":179,"180":180,"181":181,"182":182,"183":183,"184":184,"185":185,"186":186,"187":187,"188":188,"189":189,"190":190,"191":191,"192":192,"193":193,"194":194,"195":195,"196":196,"197":197,"198":198,"199":199,"200":200,"201":201,"202":202,"203":203,"204":204,"205":205,"206":206,"207":207,"208":208,"209":209,"210":210,"211":211,"212":212,"213":213,"214":214,"215":215,"216":216,"217":217,"218":218,"219":219,"220":220,"221":221,"222":222,"223":223,"224":224,"225":225,"226":226,"227":227,"228":228,"229":229,"230":230,"231":231,"232":232,"233":233,"234":234,"235":235,"236":236,"237":237,"238":238,"239":239,"240":240,"241":241,"242":242,"243":243,"244":244,"245":245,"246":246,"247":247,"248":248,"249":249,"250":250,"251":251,"252":252,"253":253,"254":254,"255":255,"256":960,"257":992,"258":451,"259":483,"260":417,"261":433,"262":454,"263":486,"264":710,"265":742,"266":709,"267":741,"268":456,"269":488,"270":463,"271":495,"272":464,"273":496,"274":938,"275":954,"278":972,"279":1004,"280":458,"281":490,"282":460,"283":492,"284":728,"285":760,"286":683,"287":699,"288":725,"289":757,"290":939,"291":955,"292":678,"293":694,"294":673,"295":689,"296":933,"297":949,"298":975,"299":1007,"300":16777516,"301":16777517,"302":967,"303":999,"304":681,"305":697,"308":684,"309":700,"310":979,"311":1011,"312":930,"313":453,"314":485,"315":934,"316":950,"317":421,"318":437,"321":419,"322":435,"323":465,"324":497,"325":977,"326":1009,"327":466,"328":498,"330":957,"331":959,"332":978,"333":1010,"336":469,"337":501,"338":5052,"339":5053,"340":448,"341":480,"342":931,"343":947,"344":472,"345":504,"346":422,"347":438,"348":734,"349":766,"350":426,"351":442,"352":425,"353":441,"354":478,"355":510,"356":427,"357":443,"358":940,"359":956,"360":989,"361":1021,"362":990,"363":1022,"364":733,"365":765,"366":473,"367":505,"368":475,"369":507,"370":985,"371":1017,"372":16777588,"373":16777589,"374":16777590,"375":16777591,"376":5054,"377":428,"378":444,"379":431,"380":447,"381":430,"382":446,"399":16777615,"402":2294,"415":16777631,"416":16777632,"417":16777633,"431":16777647,"432":16777648,"437":16777653,"438":16777654,"439":16777655,"466":16777681,"486":16777702,"487":16777703,"601":16777817,"629":16777845,"658":16777874,"711":439,"728":418,"729":511,"731":434,"733":445,"901":1966,"902":1953,"904":1954,"905":1955,"906":1956,"908":1959,"910":1960,"911":1963,"912":1974,"913":1985,"914":1986,"915":1987,"916":1988,"917":1989,"918":1990,"919":1991,"920":1992,"921":1993,"922":1994,"923":1995,"924":1996,"925":1997,"926":1998,"927":1999,"928":2000,"929":2001,"931":2002,"932":2004,"933":2005,"934":2006,"935":2007,"936":2008,"937":2009,"938":1957,"939":1961,"940":1969,"941":1970,"942":1971,"943":1972,"944":1978,"945":2017,"946":2018,"947":2019,"948":2020,"949":2021,"950":2022,"951":2023,"952":2024,"953":2025,"954":2026,"955":2027,"956":2028,"957":2029,"958":2030,"959":2031,"960":2032,"961":2033,"962":2035,"963":2034,"964":2036,"965":2037,"966":2038,"967":2039,"968":2040,"969":2041,"970":1973,"971":1977,"972":1975,"973":1976,"974":1979,"1025":1715,"1026":1713,"1027":1714,"1028":1716,"1029":1717,"1030":1718,"1031":1719,"1032":1720,"1033":1721,"1034":1722,"1035":1723,"1036":1724,"1038":1726,"1039":1727,"1040":1761,"1041":1762,"1042":1783,"1043":1767,"1044":1764,"1045":1765,"1046":1782,"1047":1786,"1048":1769,"1049":1770,"1050":1771,"1051":1772,"1052":1773,"1053":1774,"1054":1775,"1055":1776,"1056":1778,"1057":1779,"1058":1780,"1059":1781,"1060":1766,"1061":1768,"1062":1763,"1063":1790,"1064":1787,"1065":1789,"1066":1791,"1067":1785,"1068":1784,"1069":1788,"1070":1760,"1071":1777,"1072":1729,"1073":1730,"1074":1751,"1075":1735,"1076":1732,"1077":1733,"1078":1750,"1079":1754,"1080":1737,"1081":1738,"1082":1739,"1083":1740,"1084":1741,"1085":1742,"1086":1743,"1087":1744,"1088":1746,"1089":1747,"1090":1748,"1091":1749,"1092":1734,"1093":1736,"1094":1731,"1095":1758,"1096":1755,"1097":1757,"1098":1759,"1099":1753,"1100":1752,"1101":1756,"1102":1728,"1103":1745,"1105":1699,"1106":1697,"1107":1698,"1108":1700,"1109":1701,"1110":1702,"1111":1703,"1112":1704,"1113":1705,"1114":1706,"1115":1707,"1116":1708,"1118":1710,"1119":1711,"1168":1725,"1169":1709,"1170":16778386,"1171":16778387,"1174":16778390,"1175":16778391,"1178":16778394,"1179":16778395,"1180":16778396,"1181":16778397,"1186":16778402,"1187":16778403,"1198":16778414,"1199":16778415,"1200":16778416,"1201":16778417,"1202":16778418,"1203":16778419,"1206":16778422,"1207":16778423,"1208":16778424,"1209":16778425,"1210":16778426,"1211":16778427,"1240":16778456,"1241":16778457,"1250":16778466,"1251":16778467,"1256":16778472,"1257":16778473,"1262":16778478,"1263":16778479,"1329":16778545,"1330":16778546,"1331":16778547,"1332":16778548,"1333":16778549,"1334":16778550,"1335":16778551,"1336":16778552,"1337":16778553,"1338":16778554,"1339":16778555,"1340":16778556,"1341":16778557,"1342":16778558,"1343":16778559,"1344":16778560,"1345":16778561,"1346":16778562,"1347":16778563,"1348":16778564,"1349":16778565,"1350":16778566,"1351":16778567,"1352":16778568,"1353":16778569,"1354":16778570,"1355":16778571,"1356":16778572,"1357":16778573,"1358":16778574,"1359":16778575,"1360":16778576,"1361":16778577,"1362":16778578,"1363":16778579,"1364":16778580,"1365":16778581,"1366":16778582,"1370":16778586,"1371":16778587,"1372":16778588,"1373":16778589,"1374":16778590,"1377":16778593,"1378":16778594,"1379":16778595,"1380":16778596,"1381":16778597,"1382":16778598,"1383":16778599,"1384":16778600,"1385":16778601,"1386":16778602,"1387":16778603,"1388":16778604,"1389":16778605,"1390":16778606,"1391":16778607,"1392":16778608,"1393":16778609,"1394":16778610,"1395":16778611,"1396":16778612,"1397":16778613,"1398":16778614,"1399":16778615,"1400":16778616,"1401":16778617,"1402":16778618,"1403":16778619,"1404":16778620,"1405":16778621,"1406":16778622,"1407":16778623,"1408":16778624,"1409":16778625,"1410":16778626,"1411":16778627,"1412":16778628,"1413":16778629,"1414":16778630,"1415":16778631,"1417":16778633,"1418":16778634,"1488":3296,"1489":3297,"1490":3298,"1491":3299,"1492":3300,"1493":3301,"1494":3302,"1495":3303,"1496":3304,"1497":3305,"1498":3306,"1499":3307,"1500":3308,"1501":3309,"1502":3310,"1503":3311,"1504":3312,"1505":3313,"1506":3314,"1507":3315,"1508":3316,"1509":3317,"1510":3318,"1511":3319,"1512":3320,"1513":3321,"1514":3322,"1548":1452,"1563":1467,"1567":1471,"1569":1473,"1570":1474,"1571":1475,"1572":1476,"1573":1477,"1574":1478,"1575":1479,"1576":1480,"1577":1481,"1578":1482,"1579":1483,"1580":1484,"1581":1485,"1582":1486,"1583":1487,"1584":1488,"1585":1489,"1586":1490,"1587":1491,"1588":1492,"1589":1493,"1590":1494,"1591":1495,"1592":1496,"1593":1497,"1594":1498,"1600":1504,"1601":1505,"1602":1506,"1603":1507,"1604":1508,"1605":1509,"1606":1510,"1607":1511,"1608":1512,"1609":1513,"1610":1514,"1611":1515,"1612":1516,"1613":1517,"1614":1518,"1615":1519,"1616":1520,"1617":1521,"1618":1522,"1619":16778835,"1620":16778836,"1621":16778837,"1632":16778848,"1633":16778849,"1634":16778850,"1635":16778851,"1636":16778852,"1637":16778853,"1638":16778854,"1639":16778855,"1640":16778856,"1641":16778857,"1642":16778858,"1648":16778864,"1657":16778873,"1662":16778878,"1670":16778886,"1672":16778888,"1681":16778897,"1688":16778904,"1700":16778916,"1705":16778921,"1711":16778927,"1722":16778938,"1726":16778942,"1729":16778945,"1740":16778956,"1746":16778962,"1748":16778964,"1776":16778992,"1777":16778993,"1778":16778994,"1779":16778995,"1780":16778996,"1781":16778997,"1782":16778998,"1783":16778999,"1784":16779000,"1785":16779001,"3458":16780674,"3459":16780675,"3461":16780677,"3462":16780678,"3463":16780679,"3464":16780680,"3465":16780681,"3466":16780682,"3467":16780683,"3468":16780684,"3469":16780685,"3470":16780686,"3471":16780687,"3472":16780688,"3473":16780689,"3474":16780690,"3475":16780691,"3476":16780692,"3477":16780693,"3478":16780694,"3482":16780698,"3483":16780699,"3484":16780700,"3485":16780701,"3486":16780702,"3487":16780703,"3488":16780704,"3489":16780705,"3490":16780706,"3491":16780707,"3492":16780708,"3493":16780709,"3494":16780710,"3495":16780711,"3496":16780712,"3497":16780713,"3498":16780714,"3499":16780715,"3500":16780716,"3501":16780717,"3502":16780718,"3503":16780719,"3504":16780720,"3505":16780721,"3507":16780723,"3508":16780724,"3509":16780725,"3510":16780726,"3511":16780727,"3512":16780728,"3513":16780729,"3514":16780730,"3515":16780731,"3517":16780733,"3520":16780736,"3521":16780737,"3522":16780738,"3523":16780739,"3524":16780740,"3525":16780741,"3526":16780742,"3530":16780746,"3535":16780751,"3536":16780752,"3537":16780753,"3538":16780754,"3539":16780755,"3540":16780756,"3542":16780758,"3544":16780760,"3545":16780761,"3546":16780762,"3547":16780763,"3548":16780764,"3549":16780765,"3550":16780766,"3551":16780767,"3570":16780786,"3571":16780787,"3572":16780788,"3585":3489,"3586":3490,"3587":3491,"3588":3492,"3589":3493,"3590":3494,"3591":3495,"3592":3496,"3593":3497,"3594":3498,"3595":3499,"3596":3500,"3597":3501,"3598":3502,"3599":3503,"3600":3504,"3601":3505,"3602":3506,"3603":3507,"3604":3508,"3605":3509,"3606":3510,"3607":3511,"3608":3512,"3609":3513,"3610":3514,"3611":3515,"3612":3516,"3613":3517,"3614":3518,"3615":3519,"3616":3520,"3617":3521,"3618":3522,"3619":3523,"3620":3524,"3621":3525,"3622":3526,"3623":3527,"3624":3528,"3625":3529,"3626":3530,"3627":3531,"3628":3532,"3629":3533,"3630":3534,"3631":3535,"3632":3536,"3633":3537,"3634":3538,"3635":3539,"3636":3540,"3637":3541,"3638":3542,"3639":3543,"3640":3544,"3641":3545,"3642":3546,"3647":3551,"3648":3552,"3649":3553,"3650":3554,"3651":3555,"3652":3556,"3653":3557,"3654":3558,"3655":3559,"3656":3560,"3657":3561,"3658":3562,"3659":3563,"3660":3564,"3661":3565,"3664":3568,"3665":3569,"3666":3570,"3667":3571,"3668":3572,"3669":3573,"3670":3574,"3671":3575,"3672":3576,"3673":3577,"4304":16781520,"4305":16781521,"4306":16781522,"4307":16781523,"4308":16781524,"4309":16781525,"4310":16781526,"4311":16781527,"4312":16781528,"4313":16781529,"4314":16781530,"4315":16781531,"4316":16781532,"4317":16781533,"4318":16781534,"4319":16781535,"4320":16781536,"4321":16781537,"4322":16781538,"4323":16781539,"4324":16781540,"4325":16781541,"4326":16781542,"4327":16781543,"4328":16781544,"4329":16781545,"4330":16781546,"4331":16781547,"4332":16781548,"4333":16781549,"4334":16781550,"4335":16781551,"4336":16781552,"4337":16781553,"4338":16781554,"4339":16781555,"4340":16781556,"4341":16781557,"4342":16781558,"7682":16784898,"7683":16784899,"7690":16784906,"7691":16784907,"7710":16784926,"7711":16784927,"7734":16784950,"7735":16784951,"7744":16784960,"7745":16784961,"7766":16784982,"7767":16784983,"7776":16784992,"7777":16784993,"7786":16785002,"7787":16785003,"7808":16785024,"7809":16785025,"7810":16785026,"7811":16785027,"7812":16785028,"7813":16785029,"7818":16785034,"7819":16785035,"7840":16785056,"7841":16785057,"7842":16785058,"7843":16785059,"7844":16785060,"7845":16785061,"7846":16785062,"7847":16785063,"7848":16785064,"7849":16785065,"7850":16785066,"7851":16785067,"7852":16785068,"7853":16785069,"7854":16785070,"7855":16785071,"7856":16785072,"7857":16785073,"7858":16785074,"7859":16785075,"7860":16785076,"7861":16785077,"7862":16785078,"7863":16785079,"7864":16785080,"7865":16785081,"7866":16785082,"7867":16785083,"7868":16785084,"7869":16785085,"7870":16785086,"7871":16785087,"7872":16785088,"7873":16785089,"7874":16785090,"7875":16785091,"7876":16785092,"7877":16785093,"7878":16785094,"7879":16785095,"7880":16785096,"7881":16785097,"7882":16785098,"7883":16785099,"7884":16785100,"7885":16785101,"7886":16785102,"7887":16785103,"7888":16785104,"7889":16785105,"7890":16785106,"7891":16785107,"7892":16785108,"7893":16785109,"7894":16785110,"7895":16785111,"7896":16785112,"7897":16785113,"7898":16785114,"7899":16785115,"7900":16785116,"7901":16785117,"7902":16785118,"7903":16785119,"7904":16785120,"7905":16785121,"7906":16785122,"7907":16785123,"7908":16785124,"7909":16785125,"7910":16785126,"7911":16785127,"7912":16785128,"7913":16785129,"7914":16785130,"7915":16785131,"7916":16785132,"7917":16785133,"7918":16785134,"7919":16785135,"7920":16785136,"7921":16785137,"7922":16785138,"7923":16785139,"7924":16785140,"7925":16785141,"7926":16785142,"7927":16785143,"7928":16785144,"7929":16785145,"8194":2722,"8195":2721,"8196":2723,"8197":2724,"8199":2725,"8200":2726,"8201":2727,"8202":2728,"8210":2747,"8211":2730,"8212":2729,"8213":1967,"8215":3295,"8216":2768,"8217":2769,"8218":2813,"8220":2770,"8221":2771,"8222":2814,"8224":2801,"8225":2802,"8226":2790,"8229":2735,"8230":2734,"8240":2773,"8242":2774,"8243":2775,"8248":2812,"8254":1150,"8304":16785520,"8308":16785524,"8309":16785525,"8310":16785526,"8311":16785527,"8312":16785528,"8313":16785529,"8320":16785536,"8321":16785537,"8322":16785538,"8323":16785539,"8324":16785540,"8325":16785541,"8326":16785542,"8327":16785543,"8328":16785544,"8329":16785545,"8352":16785568,"8353":16785569,"8354":16785570,"8355":16785571,"8356":16785572,"8357":16785573,"8358":16785574,"8359":16785575,"8360":16785576,"8361":3839,"8362":16785578,"8363":16785579,"8364":8364,"8453":2744,"8470":1712,"8471":2811,"8478":2772,"8482":2761,"8531":2736,"8532":2737,"8533":2738,"8534":2739,"8535":2740,"8536":2741,"8537":2742,"8538":2743,"8539":2755,"8540":2756,"8541":2757,"8542":2758,"8592":2299,"8593":2300,"8594":2301,"8595":2302,"8658":2254,"8660":2253,"8706":2287,"8709":16785925,"8711":2245,"8712":16785928,"8713":16785929,"8715":16785931,"8728":3018,"8730":2262,"8731":16785947,"8732":16785948,"8733":2241,"8734":2242,"8743":2270,"8744":2271,"8745":2268,"8746":2269,"8747":2239,"8748":16785964,"8749":16785965,"8756":2240,"8757":16785973,"8764":2248,"8771":2249,"8773":16785992,"8775":16785991,"8800":2237,"8801":2255,"8802":16786018,"8803":16786019,"8804":2236,"8805":2238,"8834":2266,"8835":2267,"8866":3068,"8867":3036,"8868":3010,"8869":3022,"8968":3027,"8970":3012,"8981":2810,"8992":2212,"8993":2213,"9109":3020,"9115":2219,"9117":2220,"9118":2221,"9120":2222,"9121":2215,"9123":2216,"9124":2217,"9126":2218,"9128":2223,"9132":2224,"9143":2209,"9146":2543,"9147":2544,"9148":2546,"9149":2547,"9225":2530,"9226":2533,"9227":2537,"9228":2531,"9229":2532,"9251":2732,"9252":2536,"9472":2211,"9474":2214,"9484":2210,"9488":2539,"9492":2541,"9496":2538,"9500":2548,"9508":2549,"9516":2551,"9524":2550,"9532":2542,"9618":2529,"9642":2791,"9643":2785,"9644":2779,"9645":2786,"9646":2783,"9647":2767,"9650":2792,"9651":2787,"9654":2781,"9655":2765,"9660":2793,"9661":2788,"9664":2780,"9665":2764,"9670":2528,"9675":2766,"9679":2782,"9702":2784,"9734":2789,"9742":2809,"9747":2762,"9756":2794,"9758":2795,"9792":2808,"9794":2807,"9827":2796,"9829":2798,"9830":2797,"9837":2806,"9839":2805,"10003":2803,"10007":2804,"10013":2777,"10016":2800,"10216":2748,"10217":2750,"10240":16787456,"10241":16787457,"10242":16787458,"10243":16787459,"10244":16787460,"10245":16787461,"10246":16787462,"10247":16787463,"10248":16787464,"10249":16787465,"10250":16787466,"10251":16787467,"10252":16787468,"10253":16787469,"10254":16787470,"10255":16787471,"10256":16787472,"10257":16787473,"10258":16787474,"10259":16787475,"10260":16787476,"10261":16787477,"10262":16787478,"10263":16787479,"10264":16787480,"10265":16787481,"10266":16787482,"10267":16787483,"10268":16787484,"10269":16787485,"10270":16787486,"10271":16787487,"10272":16787488,"10273":16787489,"10274":16787490,"10275":16787491,"10276":16787492,"10277":16787493,"10278":16787494,"10279":16787495,"10280":16787496,"10281":16787497,"10282":16787498,"10283":16787499,"10284":16787500,"10285":16787501,"10286":16787502,"10287":16787503,"10288":16787504,"10289":16787505,"10290":16787506,"10291":16787507,"10292":16787508,"10293":16787509,"10294":16787510,"10295":16787511,"10296":16787512,"10297":16787513,"10298":16787514,"10299":16787515,"10300":16787516,"10301":16787517,"10302":16787518,"10303":16787519,"10304":16787520,"10305":16787521,"10306":16787522,"10307":16787523,"10308":16787524,"10309":16787525,"10310":16787526,"10311":16787527,"10312":16787528,"10313":16787529,"10314":16787530,"10315":16787531,"10316":16787532,"10317":16787533,"10318":16787534,"10319":16787535,"10320":16787536,"10321":16787537,"10322":16787538,"10323":16787539,"10324":16787540,"10325":16787541,"10326":16787542,"10327":16787543,"10328":16787544,"10329":16787545,"10330":16787546,"10331":16787547,"10332":16787548,"10333":16787549,"10334":16787550,"10335":16787551,"10336":16787552,"10337":16787553,"10338":16787554,"10339":16787555,"10340":16787556,"10341":16787557,"10342":16787558,"10343":16787559,"10344":16787560,"10345":16787561,"10346":16787562,"10347":16787563,"10348":16787564,"10349":16787565,"10350":16787566,"10351":16787567,"10352":16787568,"10353":16787569,"10354":16787570,"10355":16787571,"10356":16787572,"10357":16787573,"10358":16787574,"10359":16787575,"10360":16787576,"10361":16787577,"10362":16787578,"10363":16787579,"10364":16787580,"10365":16787581,"10366":16787582,"10367":16787583,"10368":16787584,"10369":16787585,"10370":16787586,"10371":16787587,"10372":16787588,"10373":16787589,"10374":16787590,"10375":16787591,"10376":16787592,"10377":16787593,"10378":16787594,"10379":16787595,"10380":16787596,"10381":16787597,"10382":16787598,"10383":16787599,"10384":16787600,"10385":16787601,"10386":16787602,"10387":16787603,"10388":16787604,"10389":16787605,"10390":16787606,"10391":16787607,"10392":16787608,"10393":16787609,"10394":16787610,"10395":16787611,"10396":16787612,"10397":16787613,"10398":16787614,"10399":16787615,"10400":16787616,"10401":16787617,"10402":16787618,"10403":16787619,"10404":16787620,"10405":16787621,"10406":16787622,"10407":16787623,"10408":16787624,"10409":16787625,"10410":16787626,"10411":16787627,"10412":16787628,"10413":16787629,"10414":16787630,"10415":16787631,"10416":16787632,"10417":16787633,"10418":16787634,"10419":16787635,"10420":16787636,"10421":16787637,"10422":16787638,"10423":16787639,"10424":16787640,"10425":16787641,"10426":16787642,"10427":16787643,"10428":16787644,"10429":16787645,"10430":16787646,"10431":16787647,"10432":16787648,"10433":16787649,"10434":16787650,"10435":16787651,"10436":16787652,"10437":16787653,"10438":16787654,"10439":16787655,"10440":16787656,"10441":16787657,"10442":16787658,"10443":16787659,"10444":16787660,"10445":16787661,"10446":16787662,"10447":16787663,"10448":16787664,"10449":16787665,"10450":16787666,"10451":16787667,"10452":16787668,"10453":16787669,"10454":16787670,"10455":16787671,"10456":16787672,"10457":16787673,"10458":16787674,"10459":16787675,"10460":16787676,"10461":16787677,"10462":16787678,"10463":16787679,"10464":16787680,"10465":16787681,"10466":16787682,"10467":16787683,"10468":16787684,"10469":16787685,"10470":16787686,"10471":16787687,"10472":16787688,"10473":16787689,"10474":16787690,"10475":16787691,"10476":16787692,"10477":16787693,"10478":16787694,"10479":16787695,"10480":16787696,"10481":16787697,"10482":16787698,"10483":16787699,"10484":16787700,"10485":16787701,"10486":16787702,"10487":16787703,"10488":16787704,"10489":16787705,"10490":16787706,"10491":16787707,"10492":16787708,"10493":16787709,"10494":16787710,"10495":16787711,"12289":1188,"12290":1185,"12300":1186,"12301":1187,"12443":1246,"12444":1247,"12449":1191,"12450":1201,"12451":1192,"12452":1202,"12453":1193,"12454":1203,"12455":1194,"12456":1204,"12457":1195,"12458":1205,"12459":1206,"12461":1207,"12463":1208,"12465":1209,"12467":1210,"12469":1211,"12471":1212,"12473":1213,"12475":1214,"12477":1215,"12479":1216,"12481":1217,"12483":1199,"12484":1218,"12486":1219,"12488":1220,"12490":1221,"12491":1222,"12492":1223,"12493":1224,"12494":1225,"12495":1226,"12498":1227,"12501":1228,"12504":1229,"12507":1230,"12510":1231,"12511":1232,"12512":1233,"12513":1234,"12514":1235,"12515":1196,"12516":1236,"12517":1197,"12518":1237,"12519":1198,"12520":1238,"12521":1239,"12522":1240,"12523":1241,"12524":1242,"12525":1243,"12527":1244,"12530":1190,"12531":1245,"12539":1189,"12540":1200};
-
- function lookup(k) { return k ? {keysym: k, keyname: keynames ? keynames[k] : k} : undefined; }
- return {
- fromUnicode : function(u) { return lookup(codepoints[u]); },
- lookup : lookup
- };
-})();
diff --git a/webclients/novnc/include/logo.js b/webclients/novnc/include/logo.js
deleted file mode 100644
index befa598..0000000
--- a/webclients/novnc/include/logo.js
+++ /dev/null
@@ -1 +0,0 @@
-noVNC_logo = {"width": 640, "height": 435, "data": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAoAAAAGzCAYAAAC/y6a9AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAStAAAErQBBHTWggAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAACAASURBVHic7N13fBvlwQfw3522ZMm2vPdIGCFkA4GyoYyGsCmjk+7dQksHL2/H2/dtC4W2tLTlfelu2VA2lEILFCgQIHEGJCQkdjzkLdmWZGvfvX8oOkmJEy/pNO73/Xz44DtLzz2RT7qfnnXC8uXLZUxDlqfdnUYQhIP+bjbPn+5xhypzrmUf6rGzOc5cjzVduXN9/nTPyfRrMt/jzOcY05U5n3L2f95s/34LPW4m/p6FbLp/73xe+5nKnWuZs/07ZOOcnusx5nucbJU727LneuxslDmdTBxn/2NmusyEuZS7kHMxG/XP5Gf3TOVmQzY+u/PhPMnkMcSsH5WIiIiI8goDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHGMAASERERaQwDIBEREZHG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"};
diff --git a/webclients/novnc/include/playback.js b/webclients/novnc/include/playback.js
deleted file mode 100644
index 7756529..0000000
--- a/webclients/novnc/include/playback.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Licensed under MPL 2.0 (see LICENSE.txt)
- */
-
-"use strict";
-/*jslint browser: true, white: false */
-/*global Util, VNC_frame_data, finish */
-
-var rfb, mode, test_state, frame_idx, frame_length,
- iteration, iterations, istart_time,
-
- // Pre-declarations for jslint
- send_array, next_iteration, queue_next_packet, do_packet;
-
-// Override send_array
-send_array = function (arr) {
- // Stub out send_array
-};
-
-next_iteration = function () {
- if (iteration === 0) {
- frame_length = VNC_frame_data.length;
- test_state = 'running';
- } else {
- rfb.disconnect();
- }
-
- if (test_state !== 'running') { return; }
-
- iteration += 1;
- if (iteration > iterations) {
- finish();
- return;
- }
-
- frame_idx = 0;
- istart_time = (new Date()).getTime();
- rfb.connect('test', 0, "bogus");
-
- queue_next_packet();
-
-};
-
-queue_next_packet = function () {
- var frame, foffset, toffset, delay;
- if (test_state !== 'running') { return; }
-
- frame = VNC_frame_data[frame_idx];
- while ((frame_idx < frame_length) && (frame.charAt(0) === "}")) {
- //Util.Debug("Send frame " + frame_idx);
- frame_idx += 1;
- frame = VNC_frame_data[frame_idx];
- }
-
- if (frame === 'EOF') {
- Util.Debug("Finished, found EOF");
- next_iteration();
- return;
- }
- if (frame_idx >= frame_length) {
- Util.Debug("Finished, no more frames");
- next_iteration();
- return;
- }
-
- if (mode === 'realtime') {
- foffset = frame.slice(1, frame.indexOf('{', 1));
- toffset = (new Date()).getTime() - istart_time;
- delay = foffset - toffset;
- if (delay < 1) {
- delay = 1;
- }
-
- setTimeout(do_packet, delay);
- } else {
- setTimeout(do_packet, 1);
- }
-};
-
-var bytes_processed = 0;
-
-do_packet = function () {
- //Util.Debug("Processing frame: " + frame_idx);
- var frame = VNC_frame_data[frame_idx],
- start = frame.indexOf('{', 1) + 1;
- bytes_processed += frame.length - start;
- if (VNC_frame_encoding === 'binary') {
- var u8 = new Uint8Array(frame.length - start);
- for (var i = 0; i < frame.length - start; i++) {
- u8[i] = frame.charCodeAt(start + i);
- }
- rfb.recv_message({'data' : u8});
- } else {
- rfb.recv_message({'data' : frame.slice(start)});
- }
- frame_idx += 1;
-
- queue_next_packet();
-};
-
diff --git a/webclients/novnc/include/rfb.js b/webclients/novnc/include/rfb.js
deleted file mode 100644
index 59fd785..0000000
--- a/webclients/novnc/include/rfb.js
+++ /dev/null
@@ -1,1882 +0,0 @@
-/*
- * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2013 Samuel Mannehed for Cendio AB
- * Licensed under MPL 2.0 (see LICENSE.txt)
- *
- * See README.md for usage and integration instructions.
- *
- * TIGHT decoder portion:
- * (c) 2012 Michael Tinglof, Joe Balaz, Les Piech (Mercuri.ca)
- */
-
-/*jslint white: false, browser: true */
-/*global window, Util, Display, Keyboard, Mouse, Websock, Websock_native, Base64, DES */
-
-var RFB;
-
-(function () {
- "use strict";
- RFB = function (defaults) {
- if (!defaults) {
- defaults = {};
- }
-
- this._rfb_host = '';
- this._rfb_port = 5900;
- this._rfb_password = '';
- this._rfb_path = '';
-
- this._rfb_state = 'disconnected';
- this._rfb_version = 0;
- this._rfb_max_version = 3.8;
- this._rfb_auth_scheme = '';
-
- this._rfb_tightvnc = false;
- this._rfb_xvp_ver = 0;
-
- // In preference order
- this._encodings = [
- ['COPYRECT', 0x01 ],
- ['TIGHT', 0x07 ],
- ['TIGHT_PNG', -260 ],
- ['HEXTILE', 0x05 ],
- ['RRE', 0x02 ],
- ['RAW', 0x00 ],
- ['DesktopSize', -223 ],
- ['Cursor', -239 ],
-
- // Psuedo-encoding settings
- //['JPEG_quality_lo', -32 ],
- ['JPEG_quality_med', -26 ],
- //['JPEG_quality_hi', -23 ],
- //['compress_lo', -255 ],
- ['compress_hi', -247 ],
- ['last_rect', -224 ],
- ['xvp', -309 ]
- ];
-
- this._encHandlers = {};
- this._encNames = {};
- this._encStats = {};
-
- this._sock = null; // Websock object
- this._display = null; // Display object
- this._keyboard = null; // Keyboard input handler object
- this._mouse = null; // Mouse input handler object
- this._sendTimer = null; // Send Queue check timer
- this._disconnTimer = null; // disconnection timer
- this._msgTimer = null; // queued handle_msg timer
-
- // Frame buffer update state
- this._FBU = {
- rects: 0,
- subrects: 0, // RRE
- lines: 0, // RAW
- tiles: 0, // HEXTILE
- bytes: 0,
- x: 0,
- y: 0,
- width: 0,
- height: 0,
- encoding: 0,
- subencoding: -1,
- background: null,
- zlib: [] // TIGHT zlib streams
- };
-
- this._fb_Bpp = 4;
- this._fb_depth = 3;
- this._fb_width = 0;
- this._fb_height = 0;
- this._fb_name = "";
-
- this._rre_chunk_sz = 100;
-
- this._timing = {
- last_fbu: 0,
- fbu_total: 0,
- fbu_total_cnt: 0,
- full_fbu_total: 0,
- full_fbu_cnt: 0,
-
- fbu_rt_start: 0,
- fbu_rt_total: 0,
- fbu_rt_cnt: 0,
- pixels: 0
- };
-
- // Mouse state
- this._mouse_buttonMask = 0;
- this._mouse_arr = [];
- this._viewportDragging = false;
- this._viewportDragPos = {};
-
- // set the default value on user-facing properties
- Util.set_defaults(this, defaults, {
- 'target': 'null', // VNC display rendering Canvas object
- 'focusContainer': document, // DOM element that captures keyboard input
- 'encrypt': false, // Use TLS/SSL/wss encryption
- 'true_color': true, // Request true color pixel data
- 'local_cursor': false, // Request locally rendered cursor
- 'shared': true, // Request shared mode
- 'view_only': false, // Disable client mouse/keyboard
- 'xvp_password_sep': '@', // Separator for XVP password fields
- 'disconnectTimeout': 3, // Time (s) to wait for disconnection
- 'wsProtocols': ['binary', 'base64'], // Protocols to use in the WebSocket connection
- 'repeaterID': '', // [UltraVNC] RepeaterID to connect to
- 'viewportDrag': false, // Move the viewport on mouse drags
-
- // Callback functions
- 'onUpdateState': function () { }, // onUpdateState(rfb, state, oldstate, statusMsg): state update/change
- 'onPasswordRequired': function () { }, // onPasswordRequired(rfb): VNC password is required
- 'onClipboard': function () { }, // onClipboard(rfb, text): RFB clipboard contents received
- 'onBell': function () { }, // onBell(rfb): RFB Bell message received
- 'onFBUReceive': function () { }, // onFBUReceive(rfb, fbu): RFB FBU received but not yet processed
- 'onFBUComplete': function () { }, // onFBUComplete(rfb, fbu): RFB FBU received and processed
- 'onFBResize': function () { }, // onFBResize(rfb, width, height): frame buffer resized
- 'onDesktopName': function () { }, // onDesktopName(rfb, name): desktop name received
- 'onXvpInit': function () { }, // onXvpInit(version): XVP extensions active for this connection
- });
-
- // main setup
- Util.Debug(">> RFB.constructor");
-
- // populate encHandlers with bound versions
- Object.keys(RFB.encodingHandlers).forEach(function (encName) {
- this._encHandlers[encName] = RFB.encodingHandlers[encName].bind(this);
- }.bind(this));
-
- // Create lookup tables based on encoding number
- for (var i = 0; i < this._encodings.length; i++) {
- this._encHandlers[this._encodings[i][1]] = this._encHandlers[this._encodings[i][0]];
- this._encNames[this._encodings[i][1]] = this._encodings[i][0];
- this._encStats[this._encodings[i][1]] = [0, 0];
- }
-
- try {
- this._display = new Display({target: this._target});
- } catch (exc) {
- Util.Error("Display exception: " + exc);
- this._updateState('fatal', "No working Display");
- }
-
- this._keyboard = new Keyboard({target: this._focusContainer,
- onKeyPress: this._handleKeyPress.bind(this)});
-
- this._mouse = new Mouse({target: this._target,
- onMouseButton: this._handleMouseButton.bind(this),
- onMouseMove: this._handleMouseMove.bind(this),
- notify: this._keyboard.sync.bind(this._keyboard)});
-
- this._sock = new Websock();
- this._sock.on('message', this._handle_message.bind(this));
- this._sock.on('open', function () {
- if (this._rfb_state === 'connect') {
- this._updateState('ProtocolVersion', "Starting VNC handshake");
- } else {
- this._fail("Got unexpected WebSocket connection");
- }
- }.bind(this));
- this._sock.on('close', function (e) {
- Util.Warn("WebSocket on-close event");
- var msg = "";
- if (e.code) {
- msg = " (code: " + e.code;
- if (e.reason) {
- msg += ", reason: " + e.reason;
- }
- msg += ")";
- }
- if (this._rfb_state === 'disconnect') {
- this._updateState('disconnected', 'VNC disconnected' + msg);
- } else if (this._rfb_state === 'ProtocolVersion') {
- this._fail('Failed to connect to server' + msg);
- } else if (this._rfb_state in {'failed': 1, 'disconnected': 1}) {
- Util.Error("Received onclose while disconnected" + msg);
- } else {
- this._fail("Server disconnected" + msg);
- }
- }.bind(this));
- this._sock.on('error', function (e) {
- Util.Warn("WebSocket on-error event");
- });
-
- this._init_vars();
-
- var rmode = this._display.get_render_mode();
- if (Websock_native) {
- Util.Info("Using native WebSockets");
- this._updateState('loaded', 'noVNC ready: native WebSockets, ' + rmode);
- } else {
- Util.Warn("Using web-socket-js bridge. Flash version: " + Util.Flash.version);
- if (!Util.Flash || Util.Flash.version < 9) {
- this._updateState('fatal', "WebSockets or <a href='http://get.adobe.com/flashplayer'>Adobe Flash</a> is required");
- } else if (document.location.href.substr(0, 7) === 'file://') {
- this._updateState('fatal', "'file://' URL is incompatible with Adobe Flash");
- } else {
- this._updateState('loaded', 'noVNC ready: WebSockets emulation, ' + rmode);
- }
- }
-
- Util.Debug("<< RFB.constructor");
- };
-
- RFB.prototype = {
- // Public methods
- connect: function (host, port, password, path) {
- this._rfb_host = host;
- this._rfb_port = port;
- this._rfb_password = (password !== undefined) ? password : "";
- this._rfb_path = (path !== undefined) ? path : "";
-
- if (!this._rfb_host || !this._rfb_port) {
- return this._fail("Must set host and port");
- }
-
- this._updateState('connect');
- },
-
- disconnect: function () {
- this._updateState('disconnect', 'Disconnecting');
- },
-
- sendPassword: function (passwd) {
- this._rfb_password = passwd;
- this._rfb_state = 'Authentication';
- setTimeout(this._init_msg.bind(this), 1);
- },
-
- sendCtrlAltDel: function () {
- if (this._rfb_state !== 'normal' || this._view_only) { return false; }
- Util.Info("Sending Ctrl-Alt-Del");
-
- var arr = [];
- arr = arr.concat(RFB.messages.keyEvent(XK_Control_L, 1));
- arr = arr.concat(RFB.messages.keyEvent(XK_Alt_L, 1));
- arr = arr.concat(RFB.messages.keyEvent(XK_Delete, 1));
- arr = arr.concat(RFB.messages.keyEvent(XK_Delete, 0));
- arr = arr.concat(RFB.messages.keyEvent(XK_Alt_L, 0));
- arr = arr.concat(RFB.messages.keyEvent(XK_Control_L, 0));
- this._sock.send(arr);
- },
-
- xvpOp: function (ver, op) {
- if (this._rfb_xvp_ver < ver) { return false; }
- Util.Info("Sending XVP operation " + op + " (version " + ver + ")");
- this._sock.send_string("\xFA\x00" + String.fromCharCode(ver) + String.fromCharCode(op));
- return true;
- },
-
- xvpShutdown: function () {
- return this.xvpOp(1, 2);
- },
-
- xvpReboot: function () {
- return this.xvpOp(1, 3);
- },
-
- xvpReset: function () {
- return this.xvpOp(1, 4);
- },
-
- // Send a key press. If 'down' is not specified then send a down key
- // followed by an up key.
- sendKey: function (code, down) {
- if (this._rfb_state !== "normal" || this._view_only) { return false; }
- var arr = [];
- if (typeof down !== 'undefined') {
- Util.Info("Sending key code (" + (down ? "down" : "up") + "): " + code);
- arr = arr.concat(RFB.messages.keyEvent(code, down ? 1 : 0));
- } else {
- Util.Info("Sending key code (down + up): " + code);
- arr = arr.concat(RFB.messages.keyEvent(code, 1));
- arr = arr.concat(RFB.messages.keyEvent(code, 0));
- }
- this._sock.send(arr);
- },
-
- clipboardPasteFrom: function (text) {
- if (this._rfb_state !== 'normal') { return; }
- this._sock.send(RFB.messages.clientCutText(text));
- },
-
- // Private methods
-
- _connect: function () {
- Util.Debug(">> RFB.connect");
-
- var uri;
- if (typeof UsingSocketIO !== 'undefined') {
- uri = 'http';
- } else {
- uri = this._encrypt ? 'wss' : 'ws';
- }
-
- uri += '://' + this._rfb_host + ':' + this._rfb_port + '/' + this._rfb_path;
- Util.Info("connecting to " + uri);
-
- this._sock.open(uri, this._wsProtocols);
-
- Util.Debug("<< RFB.connect");
- },
-
- _init_vars: function () {
- // reset state
- this._sock.init();
-
- this._FBU.rects = 0;
- this._FBU.subrects = 0; // RRE and HEXTILE
- this._FBU.lines = 0; // RAW
- this._FBU.tiles = 0; // HEXTILE
- this._FBU.zlibs = []; // TIGHT zlib encoders
- this._mouse_buttonMask = 0;
- this._mouse_arr = [];
- this._rfb_tightvnc = false;
-
- // Clear the per connection encoding stats
- var i;
- for (i = 0; i < this._encodings.length; i++) {
- this._encStats[this._encodings[i][1]][0] = 0;
- }
-
- for (i = 0; i < 4; i++) {
- this._FBU.zlibs[i] = new TINF();
- this._FBU.zlibs[i].init();
- }
- },
-
- _print_stats: function () {
- Util.Info("Encoding stats for this connection:");
- var i, s;
- for (i = 0; i < this._encodings.length; i++) {
- s = this._encStats[this._encodings[i][1]];
- if (s[0] + s[1] > 0) {
- Util.Info(" " + this._encodings[i][0] + ": " + s[0] + " rects");
- }
- }
-
- Util.Info("Encoding stats since page load:");
- for (i = 0; i < this._encodings.length; i++) {
- s = this._encStats[this._encodings[i][1]];
- Util.Info(" " + this._encodings[i][0] + ": " + s[1] + " rects");
- }
- },
-
-
- /*
- * Page states:
- * loaded - page load, equivalent to disconnected
- * disconnected - idle state
- * connect - starting to connect (to ProtocolVersion)
- * normal - connected
- * disconnect - starting to disconnect
- * failed - abnormal disconnect
- * fatal - failed to load page, or fatal error
- *
- * RFB protocol initialization states:
- * ProtocolVersion
- * Security
- * Authentication
- * password - waiting for password, not part of RFB
- * SecurityResult
- * ClientInitialization - not triggered by server message
- * ServerInitialization (to normal)
- */
- _updateState: function (state, statusMsg) {
- var oldstate = this._rfb_state;
-
- if (state === oldstate) {
- // Already here, ignore
- Util.Debug("Already in state '" + state + "', ignoring");
- }
-
- /*
- * These are disconnected states. A previous connect may
- * asynchronously cause a connection so make sure we are closed.
- */
- if (state in {'disconnected': 1, 'loaded': 1, 'connect': 1,
- 'disconnect': 1, 'failed': 1, 'fatal': 1}) {
-
- if (this._sendTimer) {
- clearInterval(this._sendTimer);
- this._sendTimer = null;
- }
-
- if (this._msgTimer) {
- clearInterval(this._msgTimer);
- this._msgTimer = null;
- }
-
- if (this._display && this._display.get_context()) {
- this._keyboard.ungrab();
- this._mouse.ungrab();
- this._display.defaultCursor();
- if (Util.get_logging() !== 'debug' || state === 'loaded') {
- // Show noVNC logo on load and when disconnected, unless in
- // debug mode
- this._display.clear();
- }
- }
-
- this._sock.close();
- }
-
- if (oldstate === 'fatal') {
- Util.Error('Fatal error, cannot continue');
- }
-
- var cmsg = typeof(statusMsg) !== 'undefined' ? (" Msg: " + statusMsg) : "";
- var fullmsg = "New state '" + state + "', was '" + oldstate + "'." + cmsg;
- if (state === 'failed' || state === 'fatal') {
- Util.Error(cmsg);
- } else {
- Util.Warn(cmsg);
- }
-
- if (oldstate === 'failed' && state === 'disconnected') {
- // do disconnect action, but stay in failed state
- this._rfb_state = 'failed';
- } else {
- this._rfb_state = state;
- }
-
- if (this._disconnTimer && this._rfb_state !== 'disconnect') {
- Util.Debug("Clearing disconnect timer");
- clearTimeout(this._disconnTimer);
- this._disconnTimer = null;
- }
-
- switch (state) {
- case 'normal':
- if (oldstate === 'disconnected' || oldstate === 'failed') {
- Util.Error("Invalid transition from 'disconnected' or 'failed' to 'normal'");
- }
- break;
-
- case 'connect':
- this._init_vars();
- this._connect();
- // WebSocket.onopen transitions to 'ProtocolVersion'
- break;
-
- case 'disconnect':
- this._disconnTimer = setTimeout(function () {
- this._fail("Disconnect timeout");
- }.bind(this), this._disconnectTimeout * 1000);
-
- this._print_stats();
-
- // WebSocket.onclose transitions to 'disconnected'
- break;
-
- case 'failed':
- if (oldstate === 'disconnected') {
- Util.Error("Invalid transition from 'disconnected' to 'failed'");
- } else if (oldstate === 'normal') {
- Util.Error("Error while connected.");
- } else if (oldstate === 'init') {
- Util.Error("Error while initializing.");
- }
-
- // Make sure we transition to disconnected
- setTimeout(function () {
- this._updateState('disconnected');
- }.bind(this), 50);
-
- break;
-
- default:
- // No state change action to take
- }
-
- if (oldstate === 'failed' && state === 'disconnected') {
- this._onUpdateState(this, state, oldstate);
- } else {
- this._onUpdateState(this, state, oldstate, statusMsg);
- }
- },
-
- _fail: function (msg) {
- this._updateState('failed', msg);
- return false;
- },
-
- _handle_message: function () {
- if (this._sock.rQlen() === 0) {
- Util.Warn("handle_message called on an empty receive queue");
- return;
- }
-
- switch (this._rfb_state) {
- case 'disconnected':
- case 'failed':
- Util.Error("Got data while disconnected");
- break;
- case 'normal':
- if (this._normal_msg() && this._sock.rQlen() > 0) {
- // true means we can continue processing
- // Give other events a chance to run
- if (this._msgTimer === null) {
- Util.Debug("More data to process, creating timer");
- this._msgTimer = setTimeout(function () {
- this._msgTimer = null;
- this._handle_message();
- }.bind(this), 10);
- } else {
- Util.Debug("More data to process, existing timer");
- }
- }
- break;
- default:
- this._init_msg();
- break;
- }
- },
-
- _checkEvents: function () {
- if (this._rfb_state === 'normal' && !this._viewportDragging && this._mouse_arr.length > 0) {
- this._sock.send(this._mouse_arr);
- this._mouse_arr = [];
- }
- },
-
- _handleKeyPress: function (keysym, down) {
- if (this._view_only) { return; } // View only, skip keyboard, events
- this._sock.send(RFB.messages.keyEvent(keysym, down));
- },
-
- _handleMouseButton: function (x, y, down, bmask) {
- if (down) {
- this._mouse_buttonMask |= bmask;
- } else {
- this._mouse_buttonMask ^= bmask;
- }
-
- if (this._viewportDrag) {
- if (down && !this._viewportDragging) {
- this._viewportDragging = true;
- this._viewportDragPos = {'x': x, 'y': y};
-
- // Skip sending mouse events
- return;
- } else {
- this._viewportDragging = false;
- }
- }
-
- if (this._view_only) { return; } // View only, skip mouse events
-
- this._mouse_arr = this._mouse_arr.concat(
- RFB.messages.pointerEvent(this._display.absX(x), this._display.absY(y), this._mouse_buttonMask));
- this._sock.send(this._mouse_arr);
- this._mouse_arr = [];
- },
-
- _handleMouseMove: function (x, y) {
- if (this._viewportDragging) {
- var deltaX = this._viewportDragPos.x - x;
- var deltaY = this._viewportDragPos.y - y;
- this._viewportDragPos = {'x': x, 'y': y};
-
- this._display.viewportChange(deltaX, deltaY);
-
- // Skip sending mouse events
- return;
- }
-
- if (this._view_only) { return; } // View only, skip mouse events
-
- this._mouse_arr = this._mouse_arr.concat(
- RFB.messages.pointerEvent(this._display.absX(x), this._display.absY(y), this._mouse_buttonMask));
-
- this._checkEvents();
- },
-
- // Message Handlers
-
- _negotiate_protocol_version: function () {
- if (this._sock.rQlen() < 12) {
- return this._fail("Incomplete protocol version");
- }
-
- var sversion = this._sock.rQshiftStr(12).substr(4, 7);
- Util.Info("Server ProtocolVersion: " + sversion);
- var is_repeater = 0;
- switch (sversion) {
- case "000.000": // UltraVNC repeater
- is_repeater = 1;
- break;
- case "003.003":
- case "003.006": // UltraVNC
- case "003.889": // Apple Remote Desktop
- this._rfb_version = 3.3;
- break;
- case "003.007":
- this._rfb_version = 3.7;
- break;
- case "003.008":
- case "004.000": // Intel AMT KVM
- case "004.001": // RealVNC 4.6
- this._rfb_version = 3.8;
- break;
- default:
- return this._fail("Invalid server version " + sversion);
- }
-
- if (is_repeater) {
- var repeaterID = this._repeaterID;
- while (repeaterID.length < 250) {
- repeaterID += "\0";
- }
- this._sock.send_string(repeaterID);
- return true;
- }
-
- if (this._rfb_version > this._rfb_max_version) {
- this._rfb_version = this._rfb_max_version;
- }
-
- // Send updates either at a rate of 1 update per 50ms, or
- // whatever slower rate the network can handle
- this._sendTimer = setInterval(this._sock.flush.bind(this._sock), 50);
-
- var cversion = "00" + parseInt(this._rfb_version, 10) +
- ".00" + ((this._rfb_version * 10) % 10);
- this._sock.send_string("RFB " + cversion + "\n");
- this._updateState('Security', 'Sent ProtocolVersion: ' + cversion);
- },
-
- _negotiate_security: function () {
- if (this._rfb_version >= 3.7) {
- // Server sends supported list, client decides
- var num_types = this._sock.rQshift8();
- if (this._sock.rQwait("security type", num_types, 1)) { return false; }
-
- if (num_types === 0) {
- var strlen = this._sock.rQshift32();
- var reason = this._sock.rQshiftStr(strlen);
- return this._fail("Security failure: " + reason);
- }
-
- this._rfb_auth_scheme = 0;
- var types = this._sock.rQshiftBytes(num_types);
- Util.Debug("Server security types: " + types);
- for (var i = 0; i < types.length; i++) {
- if (types[i] > this._rfb_auth_scheme && (types[i] <= 16 || types[i] == 22)) {
- this._rfb_auth_scheme = types[i];
- }
- }
-
- if (this._rfb_auth_scheme === 0) {
- return this._fail("Unsupported security types: " + types);
- }
-
- this._sock.send([this._rfb_auth_scheme]);
- } else {
- // Server decides
- if (this._sock.rQwait("security scheme", 4)) { return false; }
- this._rfb_auth_scheme = this._sock.rQshift32();
- }
-
- this._updateState('Authentication', 'Authenticating using scheme: ' + this._rfb_auth_scheme);
- return this._init_msg(); // jump to authentication
- },
-
- // authentication
- _negotiate_xvp_auth: function () {
- var xvp_sep = this._xvp_password_sep;
- var xvp_auth = this._rfb_password.split(xvp_sep);
- if (xvp_auth.length < 3) {
- this._updateState('password', 'XVP credentials required (user' + xvp_sep +
- 'target' + xvp_sep + 'password) -- got only ' + this._rfb_password);
- this._onPasswordRequired(this);
- return false;
- }
-
- var xvp_auth_str = String.fromCharCode(xvp_auth[0].length) +
- String.fromCharCode(xvp_auth[1].length) +
- xvp_auth[0] +
- xvp_auth[1];
- this._sock.send_string(xvp_auth_str);
- this._rfb_password = xvp_auth.slice(2).join(xvp_sep);
- this._rfb_auth_scheme = 2;
- return this._negotiate_authentication();
- },
-
- _negotiate_std_vnc_auth: function () {
- if (this._rfb_password.length === 0) {
- // Notify via both callbacks since it's kind of
- // an RFB state change and a UI interface issue
- this._updateState('password', "Password Required");
- this._onPasswordRequired(this);
- }
-
- if (this._sock.rQwait("auth challenge", 16)) { return false; }
-
- var challenge = this._sock.rQshiftBytes(16);
- var response = RFB.genDES(this._rfb_password, challenge);
- this._sock.send(response);
- this._updateState("SecurityResult");
- return true;
- },
-
- _negotiate_tight_tunnels: function (numTunnels) {
- var clientSupportedTunnelTypes = {
- 0: { vendor: 'TGHT', signature: 'NOTUNNEL' }
- };
- var 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);
- serverSupportedTunnelTypes[cap_code] = { vendor: cap_vendor, signature: cap_signature };
- }
-
- // choose the notunnel type
- if (serverSupportedTunnelTypes[0]) {
- if (serverSupportedTunnelTypes[0].vendor != clientSupportedTunnelTypes[0].vendor ||
- serverSupportedTunnelTypes[0].signature != clientSupportedTunnelTypes[0].signature) {
- return this._fail("Client's tunnel type had the incorrect vendor or signature");
- }
- this._sock.send([0, 0, 0, 0]); // use NOTUNNEL
- return false; // wait until we receive the sub auth count to continue
- } else {
- return this._fail("Server wanted tunnels, but doesn't support the notunnel type");
- }
- },
-
- _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();
- if (numTunnels > 0 && this._sock.rQwait("tunnel capabilities", 16 * numTunnels, 4)) { return false; }
-
- this._rfb_tightvnc = true;
-
- if (numTunnels > 0) {
- this._negotiate_tight_tunnels(numTunnels);
- return false; // wait until we receive the sub auth to continue
- }
- }
-
- // second pass, do the sub-auth negotiation
- if (this._sock.rQwait("sub auth count", 4)) { return false; }
- var subAuthCount = this._sock.rQshift32();
- if (this._sock.rQwait("sub auth capabilities", 16 * subAuthCount, 4)) { return false; }
-
- var clientSupportedTypes = {
- 'STDVNOAUTH__': 1,
- 'STDVVNCAUTH_': 2
- };
-
- var serverSupportedTypes = [];
-
- for (var i = 0; i < subAuthCount; i++) {
- var capNum = this._sock.rQshift32();
- var capabilities = this._sock.rQshiftStr(12);
- serverSupportedTypes.push(capabilities);
- }
-
- for (var authType in clientSupportedTypes) {
- if (serverSupportedTypes.indexOf(authType) != -1) {
- this._sock.send([0, 0, 0, clientSupportedTypes[authType]]);
-
- switch (authType) {
- case 'STDVNOAUTH__': // no auth
- this._updateState('SecurityResult');
- return true;
- case 'STDVVNCAUTH_': // VNC auth
- this._rfb_auth_scheme = 2;
- return this._init_msg();
- default:
- return this._fail("Unsupported tiny auth scheme: " + authType);
- }
- }
- }
-
- this._fail("No supported sub-auth types!");
- },
-
- _negotiate_authentication: function () {
- switch (this._rfb_auth_scheme) {
- case 0: // connection failed
- if (this._sock.rQwait("auth reason", 4)) { return false; }
- var strlen = this._sock.rQshift32();
- var reason = this._sock.rQshiftStr(strlen);
- return this._fail("Auth failure: " + reason);
-
- case 1: // no auth
- if (this._rfb_version >= 3.8) {
- this._updateState('SecurityResult');
- return true;
- }
- this._updateState('ClientInitialisation', "No auth required");
- return this._init_msg();
-
- case 22: // XVP auth
- return this._negotiate_xvp_auth();
-
- case 2: // VNC authentication
- return this._negotiate_std_vnc_auth();
-
- case 16: // TightVNC Security Type
- return this._negotiate_tight_auth();
-
- default:
- return this._fail("Unsupported auth scheme: " + this._rfb_auth_scheme);
- }
- },
-
- _handle_security_result: function () {
- if (this._sock.rQwait('VNC auth response ', 4)) { return false; }
- switch (this._sock.rQshift32()) {
- case 0: // OK
- this._updateState('ClientInitialisation', 'Authentication OK');
- return this._init_msg();
- case 1: // failed
- if (this._rfb_version >= 3.8) {
- var length = this._sock.rQshift32();
- if (this._sock.rQwait("SecurityResult reason", length, 8)) { return false; }
- var reason = this._sock.rQshiftStr(length);
- return this._fail(reason);
- } else {
- return this._fail("Authentication failure");
- }
- return false;
- case 2:
- return this._fail("Too many auth attempts");
- }
- },
-
- _negotiate_server_init: function () {
- if (this._sock.rQwait("server initialization", 24)) { return false; }
-
- /* Screen size */
- this._fb_width = this._sock.rQshift16();
- this._fb_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();
- 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();
- if (this._sock.rQwait('server init name', name_length, 24)) { return false; }
- this._fb_name = Util.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();
- this._sock.rQskipBytes(2); // padding
-
- var totalMessagesLength = (numServerMessages + numClientMessages + numEncodings) * 16;
- if (this._sock.rQwait('TightVNC extended server init header', totalMessagesLength, 32 + name_length)) { return false; }
-
- var i;
- for (i = 0; i < numServerMessages; i++) {
- var srvMsg = this._sock.rQshiftStr(16);
- }
-
- for (i = 0; i < numClientMessages; i++) {
- var clientMsg = this._sock.rQshiftStr(16);
- }
-
- for (i = 0; i < numEncodings; i++) {
- var encoding = this._sock.rQshiftStr(16);
- }
- }
-
- // NB(directxman12): these are down here so that we don't run them multiple times
- // if we backtrack
- Util.Info("Screen: " + this._fb_width + "x" + this._fb_height +
- ", bpp: " + bpp + ", depth: " + depth +
- ", big_endian: " + big_endian +
- ", true_color: " + true_color +
- ", red_max: " + red_max +
- ", green_max: " + green_max +
- ", blue_max: " + blue_max +
- ", red_shift: " + red_shift +
- ", green_shift: " + green_shift +
- ", blue_shift: " + blue_shift);
-
- if (big_endian !== 0) {
- Util.Warn("Server native endian is not little endian");
- }
-
- if (red_shift !== 16) {
- Util.Warn("Server native red-shift is not 16");
- }
-
- if (blue_shift !== 0) {
- Util.Warn("Server native blue-shift is not 0");
- }
-
- // we're past the point where we could backtrack, so it's safe to call this
- this._onDesktopName(this, this._fb_name);
-
- if (this._true_color && this._fb_name === "Intel(r) AMT KVM") {
- Util.Warn("Intel AMT KVM only supports 8/16 bit depths. Disabling true color");
- this._true_color = false;
- }
-
- this._display.set_true_color(this._true_color);
- this._onFBResize(this, this._fb_width, this._fb_height);
- this._display.resize(this._fb_width, this._fb_height);
- this._keyboard.grab();
- this._mouse.grab();
-
- if (this._true_color) {
- this._fb_Bpp = 4;
- this._fb_depth = 3;
- } else {
- this._fb_Bpp = 1;
- this._fb_depth = 1;
- }
-
- var response = RFB.messages.pixelFormat(this._fb_Bpp, this._fb_depth, this._true_color);
- response = response.concat(
- RFB.messages.clientEncodings(this._encodings, this._local_cursor, this._true_color));
- response = response.concat(
- RFB.messages.fbUpdateRequests(this._display.getCleanDirtyReset(),
- this._fb_width, this._fb_height));
-
- this._timing.fbu_rt_start = (new Date()).getTime();
- this._timing.pixels = 0;
- this._sock.send(response);
-
- this._checkEvents();
-
- if (this._encrypt) {
- this._updateState('normal', 'Connected (encrypted) to: ' + this._fb_name);
- } else {
- this._updateState('normal', 'Connected (unencrypted) to: ' + this._fb_name);
- }
- },
-
- _init_msg: function () {
- switch (this._rfb_state) {
- case 'ProtocolVersion':
- return this._negotiate_protocol_version();
-
- case 'Security':
- return this._negotiate_security();
-
- case 'Authentication':
- return this._negotiate_authentication();
-
- case 'SecurityResult':
- return this._handle_security_result();
-
- case 'ClientInitialisation':
- this._sock.send([this._shared ? 1 : 0]); // ClientInitialisation
- this._updateState('ServerInitialisation', "Authentication OK");
- return true;
-
- case 'ServerInitialisation':
- return this._negotiate_server_init();
- }
- },
-
- _handle_set_colour_map_msg: function () {
- Util.Debug("SetColorMapEntries");
- this._sock.rQskip8(); // Padding
-
- var first_colour = this._sock.rQshift16();
- var num_colours = this._sock.rQshift16();
- if (this._sock.rQwait('SetColorMapEntries', num_colours * 6, 6)) { return false; }
-
- for (var c = 0; c < num_colours; c++) {
- var red = parseInt(this._sock.rQshift16() / 256, 10);
- var green = parseInt(this._sock.rQshift16() / 256, 10);
- var blue = parseInt(this._sock.rQshift16() / 256, 10);
- this._display.set_colourMap([blue, green, red], first_colour + c);
- }
- Util.Debug("colourMap: " + this._display.get_colourMap());
- Util.Info("Registered " + num_colours + " colourMap entries");
-
- return true;
- },
-
- _handle_server_cut_text: function () {
- Util.Debug("ServerCutText");
- if (this._sock.rQwait("ServerCutText header", 7, 1)) { return false; }
- this._sock.rQskipBytes(3); // Padding
- var length = this._sock.rQshift32();
- if (this._sock.rQwait("ServerCutText", length, 8)) { return false; }
-
- var text = this._sock.rQshiftStr(length);
- this._onClipboard(this, text);
-
- return true;
- },
-
- _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();
-
- switch (xvp_msg) {
- case 0: // XVP_FAIL
- this._updateState(this._rfb_state, "Operation Failed");
- break;
- case 1: // XVP_INIT
- this._rfb_xvp_ver = xvp_ver;
- Util.Info("XVP extensions enabled (version " + this._rfb_xvp_ver + ")");
- this._onXvpInit(this._rfb_xvp_ver);
- break;
- default:
- this._fail("Disconnected: illegal server XVP message " + xvp_msg);
- break;
- }
-
- return true;
- },
-
- _normal_msg: function () {
- var msg_type;
-
- if (this._FBU.rects > 0) {
- msg_type = 0;
- } else {
- msg_type = this._sock.rQshift8();
- }
-
- switch (msg_type) {
- case 0: // FramebufferUpdate
- var ret = this._framebufferUpdate();
- if (ret) {
- this._sock.send(RFB.messages.fbUpdateRequests(this._display.getCleanDirtyReset(),
- this._fb_width, this._fb_height));
- }
- return ret;
-
- case 1: // SetColorMapEntries
- return this._handle_set_colour_map_msg();
-
- case 2: // Bell
- Util.Debug("Bell");
- this._onBell(this);
- return true;
-
- case 3: // ServerCutText
- return this._handle_server_cut_text();
-
- case 250: // XVP
- return this._handle_xvp_msg();
-
- default:
- this._fail("Disconnected: illegal server message type " + msg_type);
- Util.Debug("sock.rQslice(0, 30): " + this._sock.rQslice(0, 30));
- return true;
- }
- },
-
- _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
- this._FBU.rects = this._sock.rQshift16();
- this._FBU.bytes = 0;
- this._timing.cur_fbu = 0;
- if (this._timing.fbu_rt_start > 0) {
- now = (new Date()).getTime();
- Util.Info("First FBU latency: " + (now - this._timing.fbu_rt_start));
- }
- }
-
- while (this._FBU.rects > 0) {
- if (this._rfb_state !== "normal") { return false; }
-
- if (this._sock.rQwait("FBU", this._FBU.bytes)) { return false; }
- if (this._FBU.bytes === 0) {
- if (this._sock.rQwait("rect header", 12)) { return false; }
- /* New FramebufferUpdate */
-
- var 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];
- this._FBU.height = (hdr[6] << 8) + hdr[7];
- this._FBU.encoding = parseInt((hdr[8] << 24) + (hdr[9] << 16) +
- (hdr[10] << 8) + hdr[11], 10);
-
- this._onFBUReceive(this,
- {'x': this._FBU.x, 'y': this._FBU.y,
- 'width': this._FBU.width, 'height': this._FBU.height,
- 'encoding': this._FBU.encoding,
- 'encodingName': this._encNames[this._FBU.encoding]});
-
- if (!this._encNames[this._FBU.encoding]) {
- this._fail("Disconnected: unsupported encoding " +
- this._FBU.encoding);
- return false;
- }
- }
-
- this._timing.last_fbu = (new Date()).getTime();
-
- ret = this._encHandlers[this._FBU.encoding]();
-
- now = (new Date()).getTime();
- this._timing.cur_fbu += (now - this._timing.last_fbu);
-
- if (ret) {
- this._encStats[this._FBU.encoding][0]++;
- this._encStats[this._FBU.encoding][1]++;
- this._timing.pixels += this._FBU.width * this._FBU.height;
- }
-
- if (this._timing.pixels >= (this._fb_width * this._fb_height)) {
- if ((this._FBU.width === this._fb_width && this._FBU.height === this._fb_height) ||
- this._timing.fbu_rt_start > 0) {
- this._timing.full_fbu_total += this._timing.cur_fbu;
- this._timing.full_fbu_cnt++;
- Util.Info("Timing of full FBU, curr: " +
- this._timing.cur_fbu + ", total: " +
- this._timing.full_fbu_total + ", cnt: " +
- this._timing.full_fbu_cnt + ", avg: " +
- (this._timing.full_fbu_total / this._timing.full_fbu_cnt));
- }
-
- if (this._timing.fbu_rt_start > 0) {
- var fbu_rt_diff = now - this._timing.fbu_rt_start;
- this._timing.fbu_rt_total += fbu_rt_diff;
- this._timing.fbu_rt_cnt++;
- Util.Info("full FBU round-trip, cur: " +
- fbu_rt_diff + ", total: " +
- this._timing.fbu_rt_total + ", cnt: " +
- this._timing.fbu_rt_cnt + ", avg: " +
- (this._timing.fbu_rt_total / this._timing.fbu_rt_cnt));
- this._timing.fbu_rt_start = 0;
- }
- }
-
- if (!ret) { return ret; } // need more data
- }
-
- this._onFBUComplete(this,
- {'x': this._FBU.x, 'y': this._FBU.y,
- 'width': this._FBU.width, 'height': this._FBU.height,
- 'encoding': this._FBU.encoding,
- 'encodingName': this._encNames[this._FBU.encoding]});
-
- return true; // We finished this FBU
- },
- };
-
- Util.make_properties(RFB, [
- ['target', 'wo', 'dom'], // VNC display rendering Canvas object
- ['focusContainer', 'wo', 'dom'], // DOM element that captures keyboard input
- ['encrypt', 'rw', 'bool'], // Use TLS/SSL/wss encryption
- ['true_color', 'rw', 'bool'], // Request true color pixel data
- ['local_cursor', 'rw', 'bool'], // Request locally rendered cursor
- ['shared', 'rw', 'bool'], // Request shared mode
- ['view_only', 'rw', 'bool'], // Disable client mouse/keyboard
- ['xvp_password_sep', 'rw', 'str'], // Separator for XVP password fields
- ['disconnectTimeout', 'rw', 'int'], // Time (s) to wait for disconnection
- ['wsProtocols', 'rw', 'arr'], // Protocols to use in the WebSocket connection
- ['repeaterID', 'rw', 'str'], // [UltraVNC] RepeaterID to connect to
- ['viewportDrag', 'rw', 'bool'], // Move the viewport on mouse drags
-
- // Callback functions
- ['onUpdateState', 'rw', 'func'], // onUpdateState(rfb, state, oldstate, statusMsg): RFB state update/change
- ['onPasswordRequired', 'rw', 'func'], // onPasswordRequired(rfb): VNC password is required
- ['onClipboard', 'rw', 'func'], // onClipboard(rfb, text): RFB clipboard contents received
- ['onBell', 'rw', 'func'], // onBell(rfb): RFB Bell message received
- ['onFBUReceive', 'rw', 'func'], // onFBUReceive(rfb, fbu): RFB FBU received but not yet processed
- ['onFBUComplete', 'rw', 'func'], // onFBUComplete(rfb, fbu): RFB FBU received and processed
- ['onFBResize', 'rw', 'func'], // onFBResize(rfb, width, height): frame buffer resized
- ['onDesktopName', 'rw', 'func'], // onDesktopName(rfb, name): desktop name received
- ['onXvpInit', 'rw', 'func'], // onXvpInit(version): XVP extensions active for this connection
- ]);
-
- RFB.prototype.set_local_cursor = function (cursor) {
- if (!cursor || (cursor in {'0': 1, 'no': 1, 'false': 1})) {
- this._local_cursor = false;
- } else {
- if (this._display.get_cursor_uri()) {
- this._local_cursor = true;
- } else {
- Util.Warn("Browser does not support local cursor");
- }
- }
- };
-
- RFB.prototype.get_display = function () { return this._display; };
- RFB.prototype.get_keyboard = function () { return this._keyboard; };
- RFB.prototype.get_mouse = function () { return this._mouse; };
-
- // Class Methods
- RFB.messages = {
- keyEvent: function (keysym, down) {
- var arr = [4];
- arr.push8(down);
- arr.push16(0);
- arr.push32(keysym);
- return arr;
- },
-
- pointerEvent: function (x, y, mask) {
- var arr = [5]; // msg-type
- arr.push8(mask);
- arr.push16(x);
- arr.push16(y);
- return arr;
- },
-
- // TODO(directxman12): make this unicode compatible?
- clientCutText: function (text) {
- var arr = [6]; // msg-type
- arr.push8(0); // padding
- arr.push8(0); // padding
- arr.push8(0); // padding
- arr.push32(text.length);
- var n = text.length;
- for (var i = 0; i < n; i++) {
- arr.push(text.charCodeAt(i));
- }
-
- return arr;
- },
-
- pixelFormat: function (bpp, depth, true_color) {
- var arr = [0]; // msg-type
- arr.push8(0); // padding
- arr.push8(0); // padding
- arr.push8(0); // padding
-
- arr.push8(bpp * 8); // bits-per-pixel
- arr.push8(depth * 8); // depth
- arr.push8(0); // little-endian
- arr.push8(true_color ? 1 : 0); // true-color
-
- arr.push16(255); // red-max
- arr.push16(255); // green-max
- arr.push16(255); // blue-max
- arr.push8(16); // red-shift
- arr.push8(8); // green-shift
- arr.push8(0); // blue-shift
-
- arr.push8(0); // padding
- arr.push8(0); // padding
- arr.push8(0); // padding
- return arr;
- },
-
- clientEncodings: function (encodings, local_cursor, true_color) {
- var i, encList = [];
-
- for (i = 0; i < encodings.length; i++) {
- if (encodings[i][0] === "Cursor" && !local_cursor) {
- Util.Debug("Skipping Cursor pseudo-encoding");
- } else if (encodings[i][0] === "TIGHT" && !true_color) {
- // TODO: remove this when we have tight+non-true-color
- Util.Warn("Skipping tight as it is only supported with true color");
- } else {
- encList.push(encodings[i][1]);
- }
- }
-
- var arr = [2]; // msg-type
- arr.push8(0); // padding
-
- arr.push16(encList.length); // encoding count
- for (i = 0; i < encList.length; i++) {
- arr.push32(encList[i]);
- }
-
- return arr;
- },
-
- fbUpdateRequests: function (cleanDirty, fb_width, fb_height) {
- var arr = [];
-
- var cb = cleanDirty.cleanBox;
- var w, h;
- if (cb.w > 0 && cb.h > 0) {
- w = typeof cb.w === "undefined" ? fb_width : cb.w;
- h = typeof cb.h === "undefined" ? fb_height : cb.h;
- // Request incremental for clean box
- arr = arr.concat(RFB.messages.fbUpdateRequest(1, cb.x, cb.y, w, h));
- }
-
- for (var i = 0; i < cleanDirty.dirtyBoxes.length; i++) {
- var db = cleanDirty.dirtyBoxes[i];
- // Force all (non-incremental) for dirty box
- w = typeof db.w === "undefined" ? fb_width : db.w;
- h = typeof db.h === "undefined" ? fb_height : db.h;
- arr = arr.concat(RFB.messages.fbUpdateRequest(0, db.x, db.y, w, h));
- }
-
- return arr;
- },
-
- fbUpdateRequest: function (incremental, x, y, w, h) {
- if (typeof(x) === "undefined") { x = 0; }
- if (typeof(y) === "undefined") { y = 0; }
-
- var arr = [3]; // msg-type
- arr.push8(incremental);
- arr.push16(x);
- arr.push16(y);
- arr.push16(w);
- arr.push16(h);
-
- return arr;
- }
- };
-
- RFB.genDES = function (password, challenge) {
- var passwd = [];
- for (var i = 0; i < password.length; i++) {
- passwd.push(password.charCodeAt(i));
- }
- return (new DES(passwd)).encrypt(challenge);
- };
-
- RFB.extract_data_uri = function (arr) {
- return ";base64," + Base64.encode(arr);
- };
-
- RFB.encodingHandlers = {
- RAW: function () {
- if (this._FBU.lines === 0) {
- this._FBU.lines = this._FBU.height;
- }
-
- this._FBU.bytes = this._FBU.width * this._fb_Bpp; // 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,
- Math.floor(this._sock.rQlen() / (this._FBU.width * this._fb_Bpp)));
- this._display.blitImage(this._FBU.x, cur_y, this._FBU.width,
- curr_height, this._sock.get_rQ(),
- this._sock.get_rQi());
- this._sock.rQskipBytes(this._FBU.width * curr_height * this._fb_Bpp);
- this._FBU.lines -= curr_height;
-
- if (this._FBU.lines > 0) {
- this._FBU.bytes = this._FBU.width * this._fb_Bpp; // At least another line
- } else {
- this._FBU.rects--;
- this._FBU.bytes = 0;
- }
-
- return true;
- },
-
- COPYRECT: function () {
- this._FBU.bytes = 4;
- if (this._sock.rQwait("COPYRECT", 4)) { return false; }
- this._display.renderQ_push({
- 'type': 'copy',
- 'old_x': this._sock.rQshift16(),
- 'old_y': this._sock.rQshift16(),
- 'x': this._FBU.x,
- 'y': this._FBU.y,
- 'width': this._FBU.width,
- 'height': this._FBU.height
- });
- this._FBU.rects--;
- this._FBU.bytes = 0;
- return true;
- },
-
- RRE: function () {
- var color;
- if (this._FBU.subrects === 0) {
- this._FBU.bytes = 4 + this._fb_Bpp;
- if (this._sock.rQwait("RRE", 4 + this._fb_Bpp)) { return false; }
- this._FBU.subrects = this._sock.rQshift32();
- color = this._sock.rQshiftBytes(this._fb_Bpp); // Background
- this._display.fillRect(this._FBU.x, this._FBU.y, this._FBU.width, this._FBU.height, color);
- }
-
- while (this._FBU.subrects > 0 && this._sock.rQlen() >= (this._fb_Bpp + 8)) {
- color = this._sock.rQshiftBytes(this._fb_Bpp);
- var x = this._sock.rQshift16();
- var y = this._sock.rQshift16();
- var width = this._sock.rQshift16();
- var 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);
- this._FBU.bytes = (this._fb_Bpp + 8) * chunk;
- } else {
- this._FBU.rects--;
- this._FBU.bytes = 0;
- }
-
- return true;
- },
-
- HEXTILE: function () {
- var rQ = this._sock.get_rQ();
- var rQi = this._sock.get_rQi();
-
- if (this._FBU.tiles === 0) {
- this._FBU.tiles_x = Math.ceil(this._FBU.width / 16);
- this._FBU.tiles_y = Math.ceil(this._FBU.height / 16);
- this._FBU.total_tiles = this._FBU.tiles_x * this._FBU.tiles_y;
- this._FBU.tiles = this._FBU.total_tiles;
- }
-
- 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
- if (subencoding > 30) { // Raw
- this._fail("Disconnected: illegal hextile 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);
-
- // Figure out how much we are expecting
- if (subencoding & 0x01) { // Raw
- this._FBU.bytes += w * h * this._fb_Bpp;
- } else {
- if (subencoding & 0x02) { // Background
- this._FBU.bytes += this._fb_Bpp;
- }
- if (subencoding & 0x04) { // Foreground
- this._FBU.bytes += this._fb_Bpp;
- }
- if (subencoding & 0x08) { // AnySubrects
- this._FBU.bytes++; // Since we aren't shifting it off
- if (this._sock.rQwait("hextile subrects header", this._FBU.bytes)) { return false; }
- subrects = rQ[rQi + this._FBU.bytes - 1]; // Peek
- if (subencoding & 0x10) { // SubrectsColoured
- this._FBU.bytes += subrects * (this._fb_Bpp + 2);
- } else {
- this._FBU.bytes += subrects * 2;
- }
- }
- }
-
- if (this._sock.rQwait("hextile", this._FBU.bytes)) { return false; }
-
- // We know the encoding and have a whole tile
- this._FBU.subencoding = rQ[rQi];
- rQi++;
- if (this._FBU.subencoding === 0) {
- if (this._FBU.lastsubencoding & 0x01) {
- // Weird: ignore blanks are RAW
- Util.Debug(" Ignoring blank after RAW");
- } else {
- this._display.fillRect(x, y, w, h, this._FBU.background);
- }
- } else if (this._FBU.subencoding & 0x01) { // Raw
- this._display.blitImage(x, y, w, h, rQ, rQi);
- rQi += this._FBU.bytes - 1;
- } else {
- if (this._FBU.subencoding & 0x02) { // Background
- this._FBU.background = rQ.slice(rQi, rQi + this._fb_Bpp);
- rQi += this._fb_Bpp;
- }
- if (this._FBU.subencoding & 0x04) { // Foreground
- this._FBU.foreground = rQ.slice(rQi, rQi + this._fb_Bpp);
- rQi += this._fb_Bpp;
- }
-
- this._display.startTile(x, y, w, h, this._FBU.background);
- if (this._FBU.subencoding & 0x08) { // AnySubrects
- subrects = rQ[rQi];
- rQi++;
-
- for (var s = 0; s < subrects; s++) {
- var color;
- if (this._FBU.subencoding & 0x10) { // SubrectsColoured
- color = rQ.slice(rQi, rQi + this._fb_Bpp);
- rQi += this._fb_Bpp;
- } else {
- color = this._FBU.foreground;
- }
- var xy = rQ[rQi];
- rQi++;
- var sx = (xy >> 4);
- var sy = (xy & 0x0f);
-
- var wh = rQ[rQi];
- rQi++;
- var sw = (wh >> 4) + 1;
- var sh = (wh & 0x0f) + 1;
-
- this._display.subTile(sx, sy, sw, sh, color);
- }
- }
- this._display.finishTile();
- }
- this._sock.set_rQi(rQi);
- this._FBU.lastsubencoding = this._FBU.subencoding;
- this._FBU.bytes = 0;
- this._FBU.tiles--;
- }
-
- if (this._FBU.tiles === 0) {
- this._FBU.rects--;
- }
-
- return true;
- },
-
- getTightCLength: function (arr) {
- var header = 1, data = 0;
- data += arr[0] & 0x7f;
- if (arr[0] & 0x80) {
- header++;
- data += (arr[1] & 0x7f) << 7;
- if (arr[1] & 0x80) {
- header++;
- data += arr[2] << 14;
- }
- }
- return [header, data];
- },
-
- display_tight: function (isTightPNG) {
- if (this._fb_depth === 1) {
- this._fail("Tight protocol handler only implements true color mode");
- }
-
- 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) {
- for (var i = 0; i < 4; i++) {
- if ((resetStreams >> i) & 1) {
- this._FBU.zlibs[i].reset();
- Util.Info("Reset zlib stream " + i);
- }
- }
-
- var uncompressed = this._FBU.zlibs[streamId].uncompress(data, 0);
- if (uncompressed.status !== 0) {
- Util.Error("Invalid data in zlib stream");
- }
-
- return uncompressed.data;
- }.bind(this);
-
- var indexedToRGB = function (data, numColors, palette, width, height) {
- // Convert indexed (palette based) image data to RGB
- // TODO: reduce number of calculations inside loop
- var dest = [];
- var x, y, dp, sp;
- if (numColors === 2) {
- var w = Math.floor((width + 7) / 8);
- var w1 = Math.floor(width / 8);
-
- for (y = 0; y < height; y++) {
- var b;
- for (x = 0; x < w1; x++) {
- for (b = 7; b >= 0; b--) {
- dp = (y * width + x * 8 + 7 - b) * 3;
- sp = (data[y * w + x] >> b & 1) * 3;
- dest[dp] = palette[sp];
- dest[dp + 1] = palette[sp + 1];
- dest[dp + 2] = palette[sp + 2];
- }
- }
-
- for (b = 7; b >= 8 - width % 8; b--) {
- dp = (y * width + x * 8 + 7 - b) * 3;
- sp = (data[y * w + x] >> b & 1) * 3;
- dest[dp] = palette[sp];
- dest[dp + 1] = palette[sp + 1];
- dest[dp + 2] = palette[sp + 2];
- }
- }
- } else {
- for (y = 0; y < height; y++) {
- for (x = 0; x < width; x++) {
- dp = (y * width + x) * 3;
- sp = data[y * width + x] * 3;
- dest[dp] = palette[sp];
- dest[dp + 1] = palette[sp + 1];
- dest[dp + 2] = palette[sp + 2];
- }
- }
- }
-
- return dest;
- }.bind(this);
-
- var rQ = this._sock.get_rQ();
- var rQi = this._sock.get_rQi();
- var cmode, clength, data;
-
- var handlePalette = function () {
- var numColors = rQ[rQi + 2] + 1;
- var paletteSize = numColors * this._fb_depth;
- 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;
- if (rowSize * this._FBU.height < 12) {
- raw = true;
- clength = [0, rowSize * this._FBU.height];
- } else {
- clength = RFB.encodingHandlers.getTightCLength(this._sock.rQslice(3 + paletteSize,
- 3 + paletteSize + 3));
- }
-
- this._FBU.bytes += clength[0] + clength[1];
- if (this._sock.rQwait("TIGHT " + cmode, this._FBU.bytes)) { return false; }
-
- // Shift ctl, filter id, num colors, palette entries, and clength off
- this._sock.rQskipBytes(3);
- var palette = this._sock.rQshiftBytes(paletteSize);
- this._sock.rQskipBytes(clength[0]);
-
- if (raw) {
- data = this._sock.rQshiftBytes(clength[1]);
- } else {
- data = decompress(this._sock.rQshiftBytes(clength[1]));
- }
-
- // Convert indexed (palette based) image data to RGB
- var rgb = indexedToRGB(data, numColors, palette, this._FBU.width, this._FBU.height);
-
- this._display.renderQ_push({
- 'type': 'blitRgb',
- 'data': rgb,
- 'x': this._FBU.x,
- 'y': this._FBU.y,
- 'width': this._FBU.width,
- 'height': this._FBU.height
- });
-
- return true;
- }.bind(this);
-
- var handleCopy = function () {
- var raw = false;
- var uncompressedSize = this._FBU.width * this._FBU.height * this._fb_depth;
- if (uncompressedSize < 12) {
- raw = true;
- clength = [0, uncompressedSize];
- } else {
- clength = RFB.encodingHandlers.getTightCLength(this._sock.rQslice(1, 4));
- }
- this._FBU.bytes = 1 + clength[0] + clength[1];
- if (this._sock.rQwait("TIGHT " + cmode, this._FBU.bytes)) { return false; }
-
- // Shift ctl, clength off
- this._sock.rQshiftBytes(1 + clength[0]);
-
- if (raw) {
- data = this._sock.rQshiftBytes(clength[1]);
- } else {
- data = decompress(this._sock.rQshiftBytes(clength[1]));
- }
-
- this._display.renderQ_push({
- 'type': 'blitRgb',
- 'data': data,
- 'x': this._FBU.x,
- 'y': this._FBU.y,
- 'width': this._FBU.width,
- 'height': this._FBU.height
- });
-
- return true;
- }.bind(this);
-
- var ctl = this._sock.rQpeek8();
-
- // Keep tight reset bits
- resetStreams = ctl & 0xF;
-
- // Figure out filter
- ctl = ctl >> 4;
- streamId = ctl & 0x3;
-
- if (ctl === 0x08) cmode = "fill";
- else if (ctl === 0x09) cmode = "jpeg";
- else if (ctl === 0x0A) cmode = "png";
- else if (ctl & 0x04) cmode = "filter";
- else if (ctl < 0x04) cmode = "copy";
- else return this._fail("Illegal tight compression received, ctl: " + ctl);
-
- if (isTightPNG && (cmode === "filter" || cmode === "copy")) {
- return this._fail("filter/copy received in tightPNG mode");
- }
-
- switch (cmode) {
- // fill use fb_depth because TPIXELs drop the padding byte
- case "fill": // TPIXEL
- this._FBU.bytes += this._fb_depth;
- break;
- case "jpeg": // max clength
- this._FBU.bytes += 3;
- break;
- case "png": // max clength
- this._FBU.bytes += 3;
- break;
- case "filter": // filter id + num colors if palette
- this._FBU.bytes += 2;
- break;
- case "copy":
- break;
- }
-
- if (this._sock.rQwait("TIGHT " + cmode, this._FBU.bytes)) { return false; }
-
- // Determine FBU.bytes
- switch (cmode) {
- case "fill":
- this._sock.rQskip8(); // shift off ctl
- var color = this._sock.rQshiftBytes(this._fb_depth);
- this._display.renderQ_push({
- 'type': 'fill',
- 'x': this._FBU.x,
- 'y': this._FBU.y,
- 'width': this._FBU.width,
- 'height': this._FBU.height,
- 'color': [color[2], color[1], color[0]]
- });
- break;
- case "png":
- case "jpeg":
- clength = RFB.encodingHandlers.getTightCLength(this._sock.rQslice(1, 4));
- this._FBU.bytes = 1 + clength[0] + clength[1]; // ctl + clength size + jpeg-data
- if (this._sock.rQwait("TIGHT " + cmode, this._FBU.bytes)) { return false; }
-
- // We have everything, render it
- this._sock.rQskipBytes(1 + clength[0]); // shift off clt + compact length
- var img = new Image();
- img.src = "data: image/" + cmode +
- RFB.extract_data_uri(this._sock.rQshiftBytes(clength[1]));
- this._display.renderQ_push({
- 'type': 'img',
- 'img': img,
- 'x': this._FBU.x,
- 'y': this._FBU.y
- });
- img = null;
- break;
- case "filter":
- var filterId = rQ[rQi + 1];
- if (filterId === 1) {
- if (!handlePalette()) { return false; }
- } else {
- // Filter 0, Copy could be valid here, but servers don't send it as an explicit filter
- // Filter 2, Gradient is valid but not use if jpeg is enabled
- // TODO(directxman12): why aren't we just calling '_fail' here
- throw new Error("Unsupported tight subencoding received, filter: " + filterId);
- }
- break;
- case "copy":
- if (!handleCopy()) { return false; }
- break;
- }
-
-
- this._FBU.bytes = 0;
- this._FBU.rects--;
-
- return true;
- },
-
- TIGHT: function () { return this._encHandlers.display_tight(false); },
- TIGHT_PNG: function () { return this._encHandlers.display_tight(true); },
-
- last_rect: function () {
- this._FBU.rects = 0;
- return true;
- },
-
- DesktopSize: function () {
- Util.Debug(">> set_desktopsize");
- this._fb_width = this._FBU.width;
- this._fb_height = this._FBU.height;
- this._onFBResize(this, this._fb_width, this._fb_height);
- this._display.resize(this._fb_width, this._fb_height);
- this._timing.fbu_rt_start = (new Date()).getTime();
-
- this._FBU.bytes = 0;
- this._FBU.rects--;
-
- Util.Debug("<< set_desktopsize");
- return true;
- },
-
- Cursor: function () {
- Util.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;
-
- var pixelslength = w * h * this._fb_Bpp;
- var 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._FBU.bytes = 0;
- this._FBU.rects--;
-
- Util.Debug("<< set_cursor");
- return true;
- },
-
- JPEG_quality_lo: function () {
- Util.Error("Server sent jpeg_quality pseudo-encoding");
- },
-
- compress_lo: function () {
- Util.Error("Server sent compress level pseudo-encoding");
- }
- };
-})();
diff --git a/webclients/novnc/include/ui.js b/webclients/novnc/include/ui.js
deleted file mode 100644
index 50bbfcb..0000000
--- a/webclients/novnc/include/ui.js
+++ /dev/null
@@ -1,979 +0,0 @@
-/*
- * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2013 Samuel Mannehed for Cendio AB
- * Licensed under MPL 2.0 (see LICENSE.txt)
- *
- * See README.md for usage and integration instructions.
- */
-
-/* jslint white: false, browser: true */
-/* global window, $D, Util, WebUtil, RFB, Display */
-
-var UI;
-
-(function () {
- "use strict";
-
- // Load supporting scripts
- window.onscriptsload = function () { UI.load(); };
- window.onload = function () { UI.keyboardinputReset(); };
- Util.load_scripts(["webutil.js", "base64.js", "websock.js", "des.js",
- "keysymdef.js", "keyboard.js", "input.js", "display.js",
- "jsunzip.js", "rfb.js", "keysym.js"]);
-
- UI = {
-
- rfb_state : 'loaded',
- settingsOpen : false,
- connSettingsOpen : false,
- popupStatusOpen : false,
- clipboardOpen: false,
- keyboardVisible: false,
- hideKeyboardTimeout: null,
- lastKeyboardinput: null,
- defaultKeyboardinputLen: 100,
- extraKeysVisible: false,
- ctrlOn: false,
- altOn: false,
- isTouchDevice: false,
-
- // Setup rfb object, load settings from browser storage, then call
- // UI.init to setup the UI/menus
- load: function (callback) {
- WebUtil.initSettings(UI.start, callback);
- },
-
- // Render default UI and initialize settings menu
- start: function(callback) {
- UI.isTouchDevice = 'ontouchstart' in document.documentElement;
-
- // Stylesheet selection dropdown
- var sheet = WebUtil.selectStylesheet();
- var sheets = WebUtil.getStylesheets();
- var i;
- for (i = 0; i < sheets.length; i += 1) {
- UI.addOption($D('noVNC_stylesheet'),sheets[i].title, sheets[i].title);
- }
-
- // Logging selection dropdown
- var llevels = ['error', 'warn', 'info', 'debug'];
- for (i = 0; i < llevels.length; i += 1) {
- UI.addOption($D('noVNC_logging'),llevels[i], llevels[i]);
- }
-
- // Settings with immediate effects
- UI.initSetting('logging', 'warn');
- WebUtil.init_logging(UI.getSetting('logging'));
-
- UI.initSetting('stylesheet', 'default');
- WebUtil.selectStylesheet(null);
- // call twice to get around webkit bug
- WebUtil.selectStylesheet(UI.getSetting('stylesheet'));
-
- // if port == 80 (or 443) then it won't be present and should be
- // set manually
- var port = window.location.port;
- if (!port) {
- if (window.location.protocol.substring(0,5) == 'https') {
- port = 443;
- }
- else if (window.location.protocol.substring(0,4) == 'http') {
- port = 80;
- }
- }
-
- /* Populate the controls if defaults are provided in the URL */
- UI.initSetting('host', window.location.hostname);
- UI.initSetting('port', port);
- UI.initSetting('password', '');
- UI.initSetting('encrypt', (window.location.protocol === "https:"));
- UI.initSetting('true_color', true);
- UI.initSetting('cursor', !UI.isTouchDevice);
- UI.initSetting('shared', true);
- UI.initSetting('view_only', false);
- UI.initSetting('path', 'websockify');
- UI.initSetting('repeaterID', '');
-
- UI.rfb = new RFB({'target': $D('noVNC_canvas'),
- 'onUpdateState': UI.updateState,
- 'onXvpInit': UI.updateXvpVisualState,
- 'onClipboard': UI.clipReceive,
- 'onDesktopName': UI.updateDocumentTitle});
-
- var autoconnect = WebUtil.getQueryVar('autoconnect', false);
- if (autoconnect === 'true' || autoconnect == '1') {
- autoconnect = true;
- UI.connect();
- } else {
- autoconnect = false;
- }
-
- UI.updateVisualState();
-
- // Show mouse selector buttons on touch screen devices
- if (UI.isTouchDevice) {
- // Show mobile buttons
- $D('noVNC_mobile_buttons').style.display = "inline";
- UI.setMouseButton();
- // Remove the address bar
- setTimeout(function() { window.scrollTo(0, 1); }, 100);
- UI.forceSetting('clip', true);
- $D('noVNC_clip').disabled = true;
- } else {
- UI.initSetting('clip', false);
- }
-
- //iOS Safari does not support CSS position:fixed.
- //This detects iOS devices and enables javascript workaround.
- if ((navigator.userAgent.match(/iPhone/i)) ||
- (navigator.userAgent.match(/iPod/i)) ||
- (navigator.userAgent.match(/iPad/i))) {
- //UI.setOnscroll();
- //UI.setResize();
- }
- UI.setBarPosition();
-
- $D('noVNC_host').focus();
-
- UI.setViewClip();
- Util.addEvent(window, 'resize', UI.setViewClip);
-
- Util.addEvent(window, 'beforeunload', function () {
- if (UI.rfb_state === 'normal') {
- return "You are currently connected.";
- }
- } );
-
- // Show description by default when hosted at for kanaka.github.com
- if (location.host === "kanaka.github.io") {
- // Open the description dialog
- $D('noVNC_description').style.display = "block";
- } else {
- // Show the connect panel on first load unless autoconnecting
- if (autoconnect === UI.connSettingsOpen) {
- UI.toggleConnectPanel();
- }
- }
-
- // Add mouse event click/focus/blur event handlers to the UI
- UI.addMouseHandlers();
-
- if (typeof callback === "function") {
- callback(UI.rfb);
- }
- },
-
- addMouseHandlers: function() {
- // Setup interface handlers that can't be inline
- $D("noVNC_view_drag_button").onclick = UI.setViewDrag;
- $D("noVNC_mouse_button0").onclick = function () { UI.setMouseButton(1); };
- $D("noVNC_mouse_button1").onclick = function () { UI.setMouseButton(2); };
- $D("noVNC_mouse_button2").onclick = function () { UI.setMouseButton(4); };
- $D("noVNC_mouse_button4").onclick = function () { UI.setMouseButton(0); };
- $D("showKeyboard").onclick = UI.showKeyboard;
-
- $D("keyboardinput").oninput = UI.keyInput;
- $D("keyboardinput").onblur = UI.keyInputBlur;
-
- $D("showExtraKeysButton").onclick = UI.showExtraKeys;
- $D("toggleCtrlButton").onclick = UI.toggleCtrl;
- $D("toggleAltButton").onclick = UI.toggleAlt;
- $D("sendTabButton").onclick = UI.sendTab;
- $D("sendEscButton").onclick = UI.sendEsc;
-
- $D("sendCtrlAltDelButton").onclick = UI.sendCtrlAltDel;
- $D("xvpShutdownButton").onclick = UI.xvpShutdown;
- $D("xvpRebootButton").onclick = UI.xvpReboot;
- $D("xvpResetButton").onclick = UI.xvpReset;
- $D("noVNC_status").onclick = UI.togglePopupStatusPanel;
- $D("noVNC_popup_status_panel").onclick = UI.togglePopupStatusPanel;
- $D("xvpButton").onclick = UI.toggleXvpPanel;
- $D("clipboardButton").onclick = UI.toggleClipboardPanel;
- $D("settingsButton").onclick = UI.toggleSettingsPanel;
- $D("connectButton").onclick = UI.toggleConnectPanel;
- $D("disconnectButton").onclick = UI.disconnect;
- $D("descriptionButton").onclick = UI.toggleConnectPanel;
-
- $D("noVNC_clipboard_text").onfocus = UI.displayBlur;
- $D("noVNC_clipboard_text").onblur = UI.displayFocus;
- $D("noVNC_clipboard_text").onchange = UI.clipSend;
- $D("noVNC_clipboard_clear_button").onclick = UI.clipClear;
-
- $D("noVNC_settings_menu").onmouseover = UI.displayBlur;
- $D("noVNC_settings_menu").onmouseover = UI.displayFocus;
- $D("noVNC_apply").onclick = UI.settingsApply;
-
- $D("noVNC_connect_button").onclick = UI.connect;
- },
-
- // Read form control compatible setting from cookie
- getSetting: function(name) {
- var ctrl = $D('noVNC_' + name);
- var val = WebUtil.readSetting(name);
- if (val !== null && ctrl.type === 'checkbox') {
- if (val.toString().toLowerCase() in {'0':1, 'no':1, 'false':1}) {
- val = false;
- } else {
- val = true;
- }
- }
- return val;
- },
-
- // Update cookie and form control setting. If value is not set, then
- // updates from control to current cookie setting.
- updateSetting: function(name, value) {
-
- // Save the cookie for this session
- if (typeof value !== 'undefined') {
- WebUtil.writeSetting(name, value);
- }
-
- // Update the settings control
- value = UI.getSetting(name);
-
- var ctrl = $D('noVNC_' + name);
- if (ctrl.type === 'checkbox') {
- ctrl.checked = value;
-
- } else if (typeof ctrl.options !== 'undefined') {
- for (var i = 0; i < ctrl.options.length; i += 1) {
- if (ctrl.options[i].value === value) {
- ctrl.selectedIndex = i;
- break;
- }
- }
- } else {
- /*Weird IE9 error leads to 'null' appearring
- in textboxes instead of ''.*/
- if (value === null) {
- value = "";
- }
- ctrl.value = value;
- }
- },
-
- // Save control setting to cookie
- saveSetting: function(name) {
- var val, ctrl = $D('noVNC_' + name);
- if (ctrl.type === 'checkbox') {
- val = ctrl.checked;
- } else if (typeof ctrl.options !== 'undefined') {
- val = ctrl.options[ctrl.selectedIndex].value;
- } else {
- val = ctrl.value;
- }
- WebUtil.writeSetting(name, val);
- //Util.Debug("Setting saved '" + name + "=" + val + "'");
- return val;
- },
-
- // Initial page load read/initialization of settings
- initSetting: function(name, defVal) {
- // Check Query string followed by cookie
- var val = WebUtil.getQueryVar(name);
- if (val === null) {
- val = WebUtil.readSetting(name, defVal);
- }
- UI.updateSetting(name, val);
- return val;
- },
-
- // Force a setting to be a certain value
- forceSetting: function(name, val) {
- UI.updateSetting(name, val);
- return val;
- },
-
-
- // Show the popup status panel
- togglePopupStatusPanel: function() {
- var psp = $D('noVNC_popup_status_panel');
- if (UI.popupStatusOpen === true) {
- psp.style.display = "none";
- UI.popupStatusOpen = false;
- } else {
- psp.innerHTML = $D('noVNC_status').innerHTML;
- psp.style.display = "block";
- psp.style.left = window.innerWidth/2 -
- parseInt(window.getComputedStyle(psp, false).width)/2 -30 + "px";
- UI.popupStatusOpen = true;
- }
- },
-
- // Show the XVP panel
- toggleXvpPanel: function() {
- // Close the description panel
- $D('noVNC_description').style.display = "none";
- // Close settings if open
- if (UI.settingsOpen === true) {
- UI.settingsApply();
- UI.closeSettingsMenu();
- }
- // Close connection settings if open
- if (UI.connSettingsOpen === true) {
- UI.toggleConnectPanel();
- }
- // Close popup status panel if open
- if (UI.popupStatusOpen === true) {
- UI.togglePopupStatusPanel();
- }
- // Close clipboard panel if open
- if (UI.clipboardOpen === true) {
- UI.toggleClipboardPanel();
- }
- // Toggle XVP panel
- if (UI.xvpOpen === true) {
- $D('noVNC_xvp').style.display = "none";
- $D('xvpButton').className = "noVNC_status_button";
- UI.xvpOpen = false;
- } else {
- $D('noVNC_xvp').style.display = "block";
- $D('xvpButton').className = "noVNC_status_button_selected";
- UI.xvpOpen = true;
- }
- },
-
- // Show the clipboard panel
- toggleClipboardPanel: function() {
- // Close the description panel
- $D('noVNC_description').style.display = "none";
- // Close settings if open
- if (UI.settingsOpen === true) {
- UI.settingsApply();
- UI.closeSettingsMenu();
- }
- // Close connection settings if open
- if (UI.connSettingsOpen === true) {
- UI.toggleConnectPanel();
- }
- // Close popup status panel if open
- if (UI.popupStatusOpen === true) {
- UI.togglePopupStatusPanel();
- }
- // Close XVP panel if open
- if (UI.xvpOpen === true) {
- UI.toggleXvpPanel();
- }
- // Toggle Clipboard Panel
- if (UI.clipboardOpen === true) {
- $D('noVNC_clipboard').style.display = "none";
- $D('clipboardButton').className = "noVNC_status_button";
- UI.clipboardOpen = false;
- } else {
- $D('noVNC_clipboard').style.display = "block";
- $D('clipboardButton').className = "noVNC_status_button_selected";
- UI.clipboardOpen = true;
- }
- },
-
- // Show the connection settings panel/menu
- toggleConnectPanel: function() {
- // Close the description panel
- $D('noVNC_description').style.display = "none";
- // Close connection settings if open
- if (UI.settingsOpen === true) {
- UI.settingsApply();
- UI.closeSettingsMenu();
- $D('connectButton').className = "noVNC_status_button";
- }
- // Close clipboard panel if open
- if (UI.clipboardOpen === true) {
- UI.toggleClipboardPanel();
- }
- // Close popup status panel if open
- if (UI.popupStatusOpen === true) {
- UI.togglePopupStatusPanel();
- }
- // Close XVP panel if open
- if (UI.xvpOpen === true) {
- UI.toggleXvpPanel();
- }
-
- // Toggle Connection Panel
- if (UI.connSettingsOpen === true) {
- $D('noVNC_controls').style.display = "none";
- $D('connectButton').className = "noVNC_status_button";
- UI.connSettingsOpen = false;
- UI.saveSetting('host');
- UI.saveSetting('port');
- //UI.saveSetting('password');
- } else {
- $D('noVNC_controls').style.display = "block";
- $D('connectButton').className = "noVNC_status_button_selected";
- UI.connSettingsOpen = true;
- $D('noVNC_host').focus();
- }
- },
-
- // Toggle the settings menu:
- // On open, settings are refreshed from saved cookies.
- // On close, settings are applied
- toggleSettingsPanel: function() {
- // Close the description panel
- $D('noVNC_description').style.display = "none";
- if (UI.settingsOpen) {
- UI.settingsApply();
- UI.closeSettingsMenu();
- } else {
- UI.updateSetting('encrypt');
- UI.updateSetting('true_color');
- if (UI.rfb.get_display().get_cursor_uri()) {
- UI.updateSetting('cursor');
- } else {
- UI.updateSetting('cursor', !UI.isTouchDevice);
- $D('noVNC_cursor').disabled = true;
- }
- UI.updateSetting('clip');
- UI.updateSetting('shared');
- UI.updateSetting('view_only');
- UI.updateSetting('path');
- UI.updateSetting('repeaterID');
- UI.updateSetting('stylesheet');
- UI.updateSetting('logging');
-
- UI.openSettingsMenu();
- }
- },
-
- // Open menu
- openSettingsMenu: function() {
- // Close the description panel
- $D('noVNC_description').style.display = "none";
- // Close clipboard panel if open
- if (UI.clipboardOpen === true) {
- UI.toggleClipboardPanel();
- }
- // Close connection settings if open
- if (UI.connSettingsOpen === true) {
- UI.toggleConnectPanel();
- }
- // Close popup status panel if open
- if (UI.popupStatusOpen === true) {
- UI.togglePopupStatusPanel();
- }
- // Close XVP panel if open
- if (UI.xvpOpen === true) {
- UI.toggleXvpPanel();
- }
- $D('noVNC_settings').style.display = "block";
- $D('settingsButton').className = "noVNC_status_button_selected";
- UI.settingsOpen = true;
- },
-
- // Close menu (without applying settings)
- closeSettingsMenu: function() {
- $D('noVNC_settings').style.display = "none";
- $D('settingsButton').className = "noVNC_status_button";
- UI.settingsOpen = false;
- },
-
- // Save/apply settings when 'Apply' button is pressed
- settingsApply: function() {
- //Util.Debug(">> settingsApply");
- UI.saveSetting('encrypt');
- UI.saveSetting('true_color');
- if (UI.rfb.get_display().get_cursor_uri()) {
- UI.saveSetting('cursor');
- }
- UI.saveSetting('clip');
- UI.saveSetting('shared');
- UI.saveSetting('view_only');
- UI.saveSetting('path');
- UI.saveSetting('repeaterID');
- UI.saveSetting('stylesheet');
- UI.saveSetting('logging');
-
- // Settings with immediate (non-connected related) effect
- WebUtil.selectStylesheet(UI.getSetting('stylesheet'));
- WebUtil.init_logging(UI.getSetting('logging'));
- UI.setViewClip();
- UI.setViewDrag(UI.rfb.get_viewportDrag());
- //Util.Debug("<< settingsApply");
- },
-
-
-
- setPassword: function() {
- UI.rfb.sendPassword($D('noVNC_password').value);
- //Reset connect button.
- $D('noVNC_connect_button').value = "Connect";
- $D('noVNC_connect_button').onclick = UI.Connect;
- //Hide connection panel.
- UI.toggleConnectPanel();
- return false;
- },
-
- sendCtrlAltDel: function() {
- UI.rfb.sendCtrlAltDel();
- },
-
- xvpShutdown: function() {
- UI.rfb.xvpShutdown();
- },
-
- xvpReboot: function() {
- UI.rfb.xvpReboot();
- },
-
- xvpReset: function() {
- UI.rfb.xvpReset();
- },
-
- setMouseButton: function(num) {
- if (typeof num === 'undefined') {
- // Disable mouse buttons
- num = -1;
- }
- if (UI.rfb) {
- UI.rfb.get_mouse().set_touchButton(num);
- }
-
- var blist = [0, 1,2,4];
- for (var b = 0; b < blist.length; b++) {
- var button = $D('noVNC_mouse_button' + blist[b]);
- if (blist[b] === num) {
- button.style.display = "";
- } else {
- button.style.display = "none";
- }
- }
- },
-
- updateState: function(rfb, state, oldstate, msg) {
- UI.rfb_state = state;
- var klass;
- switch (state) {
- case 'failed':
- case 'fatal':
- klass = "noVNC_status_error";
- break;
- case 'normal':
- klass = "noVNC_status_normal";
- break;
- case 'disconnected':
- $D('noVNC_logo').style.display = "block";
- /* falls through */
- case 'loaded':
- klass = "noVNC_status_normal";
- break;
- case 'password':
- UI.toggleConnectPanel();
-
- $D('noVNC_connect_button').value = "Send Password";
- $D('noVNC_connect_button').onclick = UI.setPassword;
- $D('noVNC_password').focus();
-
- klass = "noVNC_status_warn";
- break;
- default:
- klass = "noVNC_status_warn";
- break;
- }
-
- if (typeof(msg) !== 'undefined') {
- $D('noVNC-control-bar').setAttribute("class", klass);
- $D('noVNC_status').innerHTML = msg;
- }
-
- UI.updateVisualState();
- },
-
- // Disable/enable controls depending on connection state
- updateVisualState: function() {
- var connected = UI.rfb_state === 'normal' ? true : false;
-
- //Util.Debug(">> updateVisualState");
- $D('noVNC_encrypt').disabled = connected;
- $D('noVNC_true_color').disabled = connected;
- if (UI.rfb && UI.rfb.get_display() &&
- UI.rfb.get_display().get_cursor_uri()) {
- $D('noVNC_cursor').disabled = connected;
- } else {
- UI.updateSetting('cursor', !UI.isTouchDevice);
- $D('noVNC_cursor').disabled = true;
- }
- $D('noVNC_shared').disabled = connected;
- $D('noVNC_view_only').disabled = connected;
- $D('noVNC_path').disabled = connected;
- $D('noVNC_repeaterID').disabled = connected;
-
- if (connected) {
- UI.setViewClip();
- UI.setMouseButton(1);
- $D('clipboardButton').style.display = "inline";
- $D('showKeyboard').style.display = "inline";
- $D('noVNC_extra_keys').style.display = "";
- $D('sendCtrlAltDelButton').style.display = "inline";
- } else {
- UI.setMouseButton();
- $D('clipboardButton').style.display = "none";
- $D('showKeyboard').style.display = "none";
- $D('noVNC_extra_keys').style.display = "none";
- $D('sendCtrlAltDelButton').style.display = "none";
- UI.updateXvpVisualState(0);
- }
-
- // State change disables viewport dragging.
- // It is enabled (toggled) by direct click on the button
- UI.setViewDrag(false);
-
- switch (UI.rfb_state) {
- case 'fatal':
- case 'failed':
- case 'loaded':
- case 'disconnected':
- $D('connectButton').style.display = "";
- $D('disconnectButton').style.display = "none";
- break;
- default:
- $D('connectButton').style.display = "none";
- $D('disconnectButton').style.display = "";
- break;
- }
-
- //Util.Debug("<< updateVisualState");
- },
-
- // Disable/enable XVP button
- updateXvpVisualState: function(ver) {
- if (ver >= 1) {
- $D('xvpButton').style.display = 'inline';
- } else {
- $D('xvpButton').style.display = 'none';
- // Close XVP panel if open
- if (UI.xvpOpen === true) {
- UI.toggleXvpPanel();
- }
- }
- },
-
- // Display the desktop name in the document title
- updateDocumentTitle: function(rfb, name) {
- document.title = name + " - noVNC";
- },
-
- clipReceive: function(rfb, text) {
- Util.Debug(">> UI.clipReceive: " + text.substr(0,40) + "...");
- $D('noVNC_clipboard_text').value = text;
- Util.Debug("<< UI.clipReceive");
- },
-
- connect: function() {
- UI.closeSettingsMenu();
- UI.toggleConnectPanel();
-
- var host = $D('noVNC_host').value;
- var port = $D('noVNC_port').value;
- var password = $D('noVNC_password').value;
- var path = $D('noVNC_path').value;
- if ((!host) || (!port)) {
- throw new Error("Must set host and port");
- }
-
- UI.rfb.set_encrypt(UI.getSetting('encrypt'));
- UI.rfb.set_true_color(UI.getSetting('true_color'));
- UI.rfb.set_local_cursor(UI.getSetting('cursor'));
- UI.rfb.set_shared(UI.getSetting('shared'));
- UI.rfb.set_view_only(UI.getSetting('view_only'));
- UI.rfb.set_repeaterID(UI.getSetting('repeaterID'));
-
- UI.rfb.connect(host, port, password, path);
-
- //Close dialog.
- setTimeout(UI.setBarPosition, 100);
- $D('noVNC_logo').style.display = "none";
- },
-
- disconnect: function() {
- UI.closeSettingsMenu();
- UI.rfb.disconnect();
-
- $D('noVNC_logo').style.display = "block";
- UI.connSettingsOpen = false;
- UI.toggleConnectPanel();
- },
-
- displayBlur: function() {
- UI.rfb.get_keyboard().set_focused(false);
- UI.rfb.get_mouse().set_focused(false);
- },
-
- displayFocus: function() {
- UI.rfb.get_keyboard().set_focused(true);
- UI.rfb.get_mouse().set_focused(true);
- },
-
- clipClear: function() {
- $D('noVNC_clipboard_text').value = "";
- UI.rfb.clipboardPasteFrom("");
- },
-
- clipSend: function() {
- var text = $D('noVNC_clipboard_text').value;
- Util.Debug(">> UI.clipSend: " + text.substr(0,40) + "...");
- UI.rfb.clipboardPasteFrom(text);
- Util.Debug("<< UI.clipSend");
- },
-
- // Enable/disable and configure viewport clipping
- setViewClip: function(clip) {
- var display;
- if (UI.rfb) {
- display = UI.rfb.get_display();
- } else {
- return;
- }
-
- var cur_clip = display.get_viewport();
-
- if (typeof(clip) !== 'boolean') {
- // Use current setting
- clip = UI.getSetting('clip');
- }
-
- if (clip && !cur_clip) {
- // Turn clipping on
- UI.updateSetting('clip', true);
- } else if (!clip && cur_clip) {
- // Turn clipping off
- UI.updateSetting('clip', false);
- display.set_viewport(false);
- $D('noVNC_canvas').style.position = 'static';
- display.viewportChange();
- }
- if (UI.getSetting('clip')) {
- // If clipping, update clipping settings
- $D('noVNC_canvas').style.position = 'absolute';
- var pos = Util.getPosition($D('noVNC_canvas'));
- var new_w = window.innerWidth - pos.x;
- var new_h = window.innerHeight - pos.y;
- display.set_viewport(true);
- display.viewportChange(0, 0, new_w, new_h);
- }
- },
-
- // Toggle/set/unset the viewport drag/move button
- setViewDrag: function(drag) {
- var vmb = $D('noVNC_view_drag_button');
- if (!UI.rfb) { return; }
-
- if (UI.rfb_state === 'normal' &&
- UI.rfb.get_display().get_viewport()) {
- vmb.style.display = "inline";
- } else {
- vmb.style.display = "none";
- }
-
- if (typeof(drag) === "undefined" ||
- typeof(drag) === "object") {
- // If not specified, then toggle
- drag = !UI.rfb.get_viewportDrag();
- }
- if (drag) {
- vmb.className = "noVNC_status_button_selected";
- UI.rfb.set_viewportDrag(true);
- } else {
- vmb.className = "noVNC_status_button";
- UI.rfb.set_viewportDrag(false);
- }
- },
-
- // On touch devices, show the OS keyboard
- showKeyboard: function() {
- var kbi = $D('keyboardinput');
- var skb = $D('showKeyboard');
- var l = kbi.value.length;
- if(UI.keyboardVisible === false) {
- kbi.focus();
- try { kbi.setSelectionRange(l, l); } // Move the caret to the end
- catch (err) {} // setSelectionRange is undefined in Google Chrome
- UI.keyboardVisible = true;
- skb.className = "noVNC_status_button_selected";
- } else if(UI.keyboardVisible === true) {
- kbi.blur();
- skb.className = "noVNC_status_button";
- UI.keyboardVisible = false;
- }
- },
-
- keepKeyboard: function() {
- clearTimeout(UI.hideKeyboardTimeout);
- if(UI.keyboardVisible === true) {
- $D('keyboardinput').focus();
- $D('showKeyboard').className = "noVNC_status_button_selected";
- } else if(UI.keyboardVisible === false) {
- $D('keyboardinput').blur();
- $D('showKeyboard').className = "noVNC_status_button";
- }
- },
-
- keyboardinputReset: function() {
- var kbi = $D('keyboardinput');
- kbi.value = new Array(UI.defaultKeyboardinputLen).join("_");
- UI.lastKeyboardinput = kbi.value;
- },
-
- // When normal keyboard events are left uncought, use the input events from
- // the keyboardinput element instead and generate the corresponding key events.
- // This code is required since some browsers on Android are inconsistent in
- // sending keyCodes in the normal keyboard events when using on screen keyboards.
- keyInput: function(event) {
- var newValue = event.target.value;
- var oldValue = UI.lastKeyboardinput;
-
- var newLen;
- try {
- // Try to check caret position since whitespace at the end
- // will not be considered by value.length in some browsers
- newLen = Math.max(event.target.selectionStart, newValue.length);
- } catch (err) {
- // selectionStart is undefined in Google Chrome
- newLen = newValue.length;
- }
- var oldLen = oldValue.length;
-
- var backspaces;
- var inputs = newLen - oldLen;
- if (inputs < 0) {
- backspaces = -inputs;
- } else {
- backspaces = 0;
- }
-
- // Compare the old string with the new to account for
- // text-corrections or other input that modify existing text
- var i;
- for (i = 0; i < Math.min(oldLen, newLen); i++) {
- if (newValue.charAt(i) != oldValue.charAt(i)) {
- inputs = newLen - i;
- backspaces = oldLen - i;
- break;
- }
- }
-
- // Send the key events
- for (i = 0; i < backspaces; i++) {
- UI.rfb.sendKey(XK_BackSpace);
- }
- for (i = newLen - inputs; i < newLen; i++) {
- UI.rfb.sendKey(newValue.charCodeAt(i));
- }
-
- // Control the text content length in the keyboardinput element
- if (newLen > 2 * UI.defaultKeyboardinputLen) {
- UI.keyboardinputReset();
- } else if (newLen < 1) {
- // There always have to be some text in the keyboardinput
- // element with which backspace can interact.
- UI.keyboardinputReset();
- // This sometimes causes the keyboard to disappear for a second
- // but it is required for the android keyboard to recognize that
- // text has been added to the field
- event.target.blur();
- // This has to be ran outside of the input handler in order to work
- setTimeout(function() { UI.keepKeyboard(); }, 0);
- } else {
- UI.lastKeyboardinput = newValue;
- }
- },
-
- keyInputBlur: function() {
- $D('showKeyboard').className = "noVNC_status_button";
- //Weird bug in iOS if you change keyboardVisible
- //here it does not actually occur so next time
- //you click keyboard icon it doesn't work.
- UI.hideKeyboardTimeout = setTimeout(function() { UI.setKeyboard(); },100);
- },
-
- showExtraKeys: function() {
- UI.keepKeyboard();
- if(UI.extraKeysVisible === false) {
- $D('toggleCtrlButton').style.display = "inline";
- $D('toggleAltButton').style.display = "inline";
- $D('sendTabButton').style.display = "inline";
- $D('sendEscButton').style.display = "inline";
- $D('showExtraKeysButton').className = "noVNC_status_button_selected";
- UI.extraKeysVisible = true;
- } else if(UI.extraKeysVisible === true) {
- $D('toggleCtrlButton').style.display = "";
- $D('toggleAltButton').style.display = "";
- $D('sendTabButton').style.display = "";
- $D('sendEscButton').style.display = "";
- $D('showExtraKeysButton').className = "noVNC_status_button";
- UI.extraKeysVisible = false;
- }
- },
-
- toggleCtrl: function() {
- UI.keepKeyboard();
- if(UI.ctrlOn === false) {
- UI.rfb.sendKey(XK_Control_L, true);
- $D('toggleCtrlButton').className = "noVNC_status_button_selected";
- UI.ctrlOn = true;
- } else if(UI.ctrlOn === true) {
- UI.rfb.sendKey(XK_Control_L, false);
- $D('toggleCtrlButton').className = "noVNC_status_button";
- UI.ctrlOn = false;
- }
- },
-
- toggleAlt: function() {
- UI.keepKeyboard();
- if(UI.altOn === false) {
- UI.rfb.sendKey(XK_Alt_L, true);
- $D('toggleAltButton').className = "noVNC_status_button_selected";
- UI.altOn = true;
- } else if(UI.altOn === true) {
- UI.rfb.sendKey(XK_Alt_L, false);
- $D('toggleAltButton').className = "noVNC_status_button";
- UI.altOn = false;
- }
- },
-
- sendTab: function() {
- UI.keepKeyboard();
- UI.rfb.sendKey(XK_Tab);
- },
-
- sendEsc: function() {
- UI.keepKeyboard();
- UI.rfb.sendKey(XK_Escape);
- },
-
- setKeyboard: function() {
- UI.keyboardVisible = false;
- },
-
- // iOS < Version 5 does not support position fixed. Javascript workaround:
- setOnscroll: function() {
- window.onscroll = function() {
- UI.setBarPosition();
- };
- },
-
- setResize: function () {
- window.onResize = function() {
- UI.setBarPosition();
- };
- },
-
- //Helper to add options to dropdown.
- addOption: function(selectbox, text, value) {
- var optn = document.createElement("OPTION");
- optn.text = text;
- optn.value = value;
- selectbox.options.add(optn);
- },
-
- setBarPosition: function() {
- $D('noVNC-control-bar').style.top = (window.pageYOffset) + 'px';
- $D('noVNC_mobile_buttons').style.left = (window.pageXOffset) + 'px';
-
- var vncwidth = $D('noVNC_screen').style.offsetWidth;
- $D('noVNC-control-bar').style.width = vncwidth + 'px';
- }
-
- };
-})();
diff --git a/webclients/novnc/include/util.js b/webclients/novnc/include/util.js
deleted file mode 100644
index 909d04b..0000000
--- a/webclients/novnc/include/util.js
+++ /dev/null
@@ -1,656 +0,0 @@
-/*
- * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Licensed under MPL 2.0 (see LICENSE.txt)
- *
- * See README.md for usage and integration instructions.
- */
-
-/* jshint white: false, nonstandard: true */
-/*global window, console, document, navigator, ActiveXObject, INCLUDE_URI */
-
-// Globals defined here
-var Util = {};
-
-
-/*
- * Make arrays quack
- */
-
-var addFunc = function (cl, name, func) {
- if (!cl.prototype[name]) {
- Object.defineProperty(cl.prototype, name, { enumerable: false, value: func });
- }
-};
-
-addFunc(Array, 'push8', function (num) {
- "use strict";
- this.push(num & 0xFF);
-});
-
-addFunc(Array, 'push16', function (num) {
- "use strict";
- this.push((num >> 8) & 0xFF,
- num & 0xFF);
-});
-
-addFunc(Array, 'push32', function (num) {
- "use strict";
- this.push((num >> 24) & 0xFF,
- (num >> 16) & 0xFF,
- (num >> 8) & 0xFF,
- num & 0xFF);
-});
-
-// IE does not support map (even in IE9)
-//This prototype is provided by the Mozilla foundation and
-//is distributed under the MIT license.
-//http://www.ibiblio.org/pub/Linux/LICENSES/mit.license
-addFunc(Array, 'map', function (fun /*, thisp*/) {
- "use strict";
- var len = this.length;
- if (typeof fun != "function") {
- throw new TypeError();
- }
-
- var res = new Array(len);
- var thisp = arguments[1];
- for (var i = 0; i < len; i++) {
- if (i in this) {
- res[i] = fun.call(thisp, this[i], i, this);
- }
- }
-
- return res;
-});
-
-// IE <9 does not support indexOf
-//This prototype is provided by the Mozilla foundation and
-//is distributed under the MIT license.
-//http://www.ibiblio.org/pub/Linux/LICENSES/mit.license
-addFunc(Array, 'indexOf', function (elt /*, from*/) {
- "use strict";
- var len = this.length >>> 0;
-
- var from = Number(arguments[1]) || 0;
- from = (from < 0) ? Math.ceil(from) : Math.floor(from);
- if (from < 0) {
- from += len;
- }
-
- for (; from < len; from++) {
- if (from in this &&
- this[from] === elt) {
- return from;
- }
- }
- return -1;
-});
-
-// From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/keys
-if (!Object.keys) {
- Object.keys = (function () {
- 'use strict';
- var hasOwnProperty = Object.prototype.hasOwnProperty,
- hasDontEnumBug = !({toString: null}).propertyIsEnumerable('toString'),
- dontEnums = [
- 'toString',
- 'toLocaleString',
- 'valueOf',
- 'hasOwnProperty',
- 'isPrototypeOf',
- 'propertyIsEnumerable',
- 'constructor'
- ],
- dontEnumsLength = dontEnums.length;
-
- return function (obj) {
- if (typeof obj !== 'object' && (typeof obj !== 'function' || obj === null)) {
- throw new TypeError('Object.keys called on non-object');
- }
-
- var result = [], prop, i;
-
- for (prop in obj) {
- if (hasOwnProperty.call(obj, prop)) {
- result.push(prop);
- }
- }
-
- if (hasDontEnumBug) {
- for (i = 0; i < dontEnumsLength; i++) {
- if (hasOwnProperty.call(obj, dontEnums[i])) {
- result.push(dontEnums[i]);
- }
- }
- }
- return result;
- };
- })();
-}
-
-// PhantomJS 1.x doesn't support bind,
-// so leave this in until PhantomJS 2.0 is released
-//This prototype is provided by the Mozilla foundation and
-//is distributed under the MIT license.
-//http://www.ibiblio.org/pub/Linux/LICENSES/mit.license
-addFunc(Function, 'bind', function (oThis) {
- if (typeof this !== "function") {
- // closest thing possible to the ECMAScript 5
- // internal IsCallable function
- throw new TypeError("Function.prototype.bind - " +
- "what is trying to be bound is not callable");
- }
-
- var aArgs = Array.prototype.slice.call(arguments, 1),
- fToBind = this,
- fNOP = function () {},
- fBound = function () {
- return fToBind.apply(this instanceof fNOP && oThis ? this
- : oThis,
- aArgs.concat(Array.prototype.slice.call(arguments)));
- };
-
- fNOP.prototype = this.prototype;
- fBound.prototype = new fNOP();
-
- return fBound;
-});
-
-//
-// requestAnimationFrame shim with setTimeout fallback
-//
-
-window.requestAnimFrame = (function () {
- "use strict";
- return window.requestAnimationFrame ||
- window.webkitRequestAnimationFrame ||
- window.mozRequestAnimationFrame ||
- window.oRequestAnimationFrame ||
- window.msRequestAnimationFrame ||
- function (callback) {
- window.setTimeout(callback, 1000 / 60);
- };
-})();
-
-/*
- * ------------------------------------------------------
- * Namespaced in Util
- * ------------------------------------------------------
- */
-
-/*
- * Logging/debug routines
- */
-
-Util._log_level = 'warn';
-Util.init_logging = function (level) {
- "use strict";
- if (typeof level === 'undefined') {
- level = Util._log_level;
- } else {
- Util._log_level = level;
- }
- if (typeof window.console === "undefined") {
- if (typeof window.opera !== "undefined") {
- window.console = {
- 'log' : window.opera.postError,
- 'warn' : window.opera.postError,
- 'error': window.opera.postError
- };
- } else {
- window.console = {
- 'log' : function (m) {},
- 'warn' : function (m) {},
- 'error': function (m) {}
- };
- }
- }
-
- Util.Debug = Util.Info = Util.Warn = Util.Error = function (msg) {};
- /* jshint -W086 */
- switch (level) {
- case 'debug':
- Util.Debug = function (msg) { console.log(msg); };
- case 'info':
- Util.Info = function (msg) { console.log(msg); };
- case 'warn':
- Util.Warn = function (msg) { console.warn(msg); };
- case 'error':
- Util.Error = function (msg) { console.error(msg); };
- case 'none':
- break;
- default:
- throw new Error("invalid logging type '" + level + "'");
- }
- /* jshint +W086 */
-};
-Util.get_logging = function () {
- return Util._log_level;
-};
-// Initialize logging level
-Util.init_logging();
-
-Util.make_property = function (proto, name, mode, type) {
- "use strict";
-
- var getter;
- if (type === 'arr') {
- getter = function (idx) {
- if (typeof idx !== 'undefined') {
- return this['_' + name][idx];
- } else {
- return this['_' + name];
- }
- };
- } else {
- getter = function () {
- return this['_' + name];
- };
- }
-
- var make_setter = function (process_val) {
- if (process_val) {
- return function (val, idx) {
- if (typeof idx !== 'undefined') {
- this['_' + name][idx] = process_val(val);
- } else {
- this['_' + name] = process_val(val);
- }
- };
- } else {
- return function (val, idx) {
- if (typeof idx !== 'undefined') {
- this['_' + name][idx] = val;
- } else {
- this['_' + name] = val;
- }
- };
- }
- };
-
- var setter;
- if (type === 'bool') {
- setter = make_setter(function (val) {
- if (!val || (val in {'0': 1, 'no': 1, 'false': 1})) {
- return false;
- } else {
- return true;
- }
- });
- } else if (type === 'int') {
- setter = make_setter(function (val) { return parseInt(val, 10); });
- } else if (type === 'float') {
- setter = make_setter(parseFloat);
- } else if (type === 'str') {
- setter = make_setter(String);
- } else if (type === 'func') {
- setter = make_setter(function (val) {
- if (!val) {
- return function () {};
- } else {
- return val;
- }
- });
- } else if (type === 'arr' || type === 'dom' || type == 'raw') {
- setter = make_setter();
- } else {
- throw new Error('Unknown property type ' + type); // some sanity checking
- }
-
- // set the getter
- if (typeof proto['get_' + name] === 'undefined') {
- proto['get_' + name] = getter;
- }
-
- // set the setter if needed
- if (typeof proto['set_' + name] === 'undefined') {
- if (mode === 'rw') {
- proto['set_' + name] = setter;
- } else if (mode === 'wo') {
- proto['set_' + name] = function (val, idx) {
- if (typeof this['_' + name] !== 'undefined') {
- throw new Error(name + " can only be set once");
- }
- setter.call(this, val, idx);
- };
- }
- }
-
- // make a special setter that we can use in set defaults
- proto['_raw_set_' + name] = function (val, idx) {
- setter.call(this, val, idx);
- //delete this['_init_set_' + name]; // remove it after use
- };
-};
-
-Util.make_properties = function (constructor, arr) {
- "use strict";
- for (var i = 0; i < arr.length; i++) {
- Util.make_property(constructor.prototype, arr[i][0], arr[i][1], arr[i][2]);
- }
-};
-
-Util.set_defaults = function (obj, conf, defaults) {
- var defaults_keys = Object.keys(defaults);
- var conf_keys = Object.keys(conf);
- var keys_obj = {};
- var i;
- for (i = 0; i < defaults_keys.length; i++) { keys_obj[defaults_keys[i]] = 1; }
- for (i = 0; i < conf_keys.length; i++) { keys_obj[conf_keys[i]] = 1; }
- var keys = Object.keys(keys_obj);
-
- for (i = 0; i < keys.length; i++) {
- var setter = obj['_raw_set_' + keys[i]];
- if (!setter) {
- Util.Warn('Invalid property ' + keys[i]);
- continue;
- }
-
- if (keys[i] in conf) {
- setter.call(obj, conf[keys[i]]);
- } else {
- setter.call(obj, defaults[keys[i]]);
- }
- }
-};
-
-/*
- * Decode from UTF-8
- */
-Util.decodeUTF8 = function (utf8string) {
- "use strict";
- return decodeURIComponent(escape(utf8string));
-};
-
-
-
-/*
- * Cross-browser routines
- */
-
-
-// Dynamically load scripts without using document.write()
-// Reference: http://unixpapa.com/js/dyna.html
-//
-// Handles the case where load_scripts is invoked from a script that
-// itself is loaded via load_scripts. Once all scripts are loaded the
-// window.onscriptsloaded handler is called (if set).
-Util.get_include_uri = function () {
- return (typeof INCLUDE_URI !== "undefined") ? INCLUDE_URI : "include/";
-};
-Util._loading_scripts = [];
-Util._pending_scripts = [];
-Util.load_scripts = function (files) {
- "use strict";
- var head = document.getElementsByTagName('head')[0], script,
- ls = Util._loading_scripts, ps = Util._pending_scripts;
-
- var loadFunc = function (e) {
- while (ls.length > 0 && (ls[0].readyState === 'loaded' ||
- ls[0].readyState === 'complete')) {
- // For IE, append the script to trigger execution
- var s = ls.shift();
- //console.log("loaded script: " + s.src);
- head.appendChild(s);
- }
- if (!this.readyState ||
- (Util.Engine.presto && this.readyState === 'loaded') ||
- this.readyState === 'complete') {
- if (ps.indexOf(this) >= 0) {
- this.onload = this.onreadystatechange = null;
- //console.log("completed script: " + this.src);
- ps.splice(ps.indexOf(this), 1);
-
- // Call window.onscriptsload after last script loads
- if (ps.length === 0 && window.onscriptsload) {
- window.onscriptsload();
- }
- }
- }
- };
-
- for (var f = 0; f < files.length; f++) {
- script = document.createElement('script');
- script.type = 'text/javascript';
- script.src = Util.get_include_uri() + files[f];
- //console.log("loading script: " + script.src);
- script.onload = script.onreadystatechange = loadFunc;
- // In-order script execution tricks
- if (Util.Engine.trident) {
- // For IE wait until readyState is 'loaded' before
- // appending it which will trigger execution
- // http://wiki.whatwg.org/wiki/Dynamic_Script_Execution_Order
- ls.push(script);
- } else {
- // For webkit and firefox set async=false and append now
- // https://developer.mozilla.org/en-US/docs/HTML/Element/script
- script.async = false;
- head.appendChild(script);
- }
- ps.push(script);
- }
-};
-
-
-// Get DOM element position on page
-// This solution is based based on http://www.greywyvern.com/?post=331
-// Thanks to Brian Huisman AKA GreyWyvern!
-Util.getPosition = (function () {
- "use strict";
- function getStyle(obj, styleProp) {
- var y;
- if (obj.currentStyle) {
- y = obj.currentStyle[styleProp];
- } else if (window.getComputedStyle)
- y = window.getComputedStyle(obj, null)[styleProp];
- return y;
- }
-
- function scrollDist() {
- var myScrollTop = 0, myScrollLeft = 0;
- var html = document.getElementsByTagName('html')[0];
-
- // get the scrollTop part
- if (html.scrollTop && document.documentElement.scrollTop) {
- myScrollTop = html.scrollTop;
- } else if (html.scrollTop || document.documentElement.scrollTop) {
- myScrollTop = html.scrollTop + document.documentElement.scrollTop;
- } else if (document.body.scrollTop) {
- myScrollTop = document.body.scrollTop;
- } else {
- myScrollTop = 0;
- }
-
- // get the scrollLeft part
- if (html.scrollLeft && document.documentElement.scrollLeft) {
- myScrollLeft = html.scrollLeft;
- } else if (html.scrollLeft || document.documentElement.scrollLeft) {
- myScrollLeft = html.scrollLeft + document.documentElement.scrollLeft;
- } else if (document.body.scrollLeft) {
- myScrollLeft = document.body.scrollLeft;
- } else {
- myScrollLeft = 0;
- }
-
- return [myScrollLeft, myScrollTop];
- }
-
- return function (obj) {
- var curleft = 0, curtop = 0, scr = obj, fixed = false;
- while ((scr = scr.parentNode) && scr != document.body) {
- curleft -= scr.scrollLeft || 0;
- curtop -= scr.scrollTop || 0;
- if (getStyle(scr, "position") == "fixed") {
- fixed = true;
- }
- }
- if (fixed && !window.opera) {
- var scrDist = scrollDist();
- curleft += scrDist[0];
- curtop += scrDist[1];
- }
-
- do {
- curleft += obj.offsetLeft;
- curtop += obj.offsetTop;
- } while ((obj = obj.offsetParent));
-
- return {'x': curleft, 'y': curtop};
- };
-})();
-
-
-// Get mouse event position in DOM element
-Util.getEventPosition = function (e, obj, scale) {
- "use strict";
- var evt, docX, docY, pos;
- //if (!e) evt = window.event;
- evt = (e ? e : window.event);
- evt = (evt.changedTouches ? evt.changedTouches[0] : evt.touches ? evt.touches[0] : evt);
- if (evt.pageX || evt.pageY) {
- docX = evt.pageX;
- docY = evt.pageY;
- } else if (evt.clientX || evt.clientY) {
- docX = evt.clientX + document.body.scrollLeft +
- document.documentElement.scrollLeft;
- docY = evt.clientY + document.body.scrollTop +
- document.documentElement.scrollTop;
- }
- pos = Util.getPosition(obj);
- if (typeof scale === "undefined") {
- scale = 1;
- }
- var realx = docX - pos.x;
- var realy = docY - pos.y;
- var x = Math.max(Math.min(realx, obj.width - 1), 0);
- var y = Math.max(Math.min(realy, obj.height - 1), 0);
- return {'x': x / scale, 'y': y / scale, 'realx': realx / scale, 'realy': realy / scale};
-};
-
-
-// Event registration. Based on: http://www.scottandrew.com/weblog/articles/cbs-events
-Util.addEvent = function (obj, evType, fn) {
- "use strict";
- if (obj.attachEvent) {
- var r = obj.attachEvent("on" + evType, fn);
- return r;
- } else if (obj.addEventListener) {
- obj.addEventListener(evType, fn, false);
- return true;
- } else {
- throw new Error("Handler could not be attached");
- }
-};
-
-Util.removeEvent = function (obj, evType, fn) {
- "use strict";
- if (obj.detachEvent) {
- var r = obj.detachEvent("on" + evType, fn);
- return r;
- } else if (obj.removeEventListener) {
- obj.removeEventListener(evType, fn, false);
- return true;
- } else {
- throw new Error("Handler could not be removed");
- }
-};
-
-Util.stopEvent = function (e) {
- "use strict";
- if (e.stopPropagation) { e.stopPropagation(); }
- else { e.cancelBubble = true; }
-
- if (e.preventDefault) { e.preventDefault(); }
- else { e.returnValue = false; }
-};
-
-
-// Set browser engine versions. Based on mootools.
-Util.Features = {xpath: !!(document.evaluate), air: !!(window.runtime), query: !!(document.querySelector)};
-
-(function () {
- "use strict";
- // 'presto': (function () { return (!window.opera) ? false : true; }()),
- var detectPresto = function () {
- return !!window.opera;
- };
-
- // 'trident': (function () { return (!window.ActiveXObject) ? false : ((window.XMLHttpRequest) ? ((document.querySelectorAll) ? 6 : 5) : 4);
- var detectTrident = function () {
- if (!window.ActiveXObject) {
- return false;
- } else {
- if (window.XMLHttpRequest) {
- return (document.querySelectorAll) ? 6 : 5;
- } else {
- return 4;
- }
- }
- };
-
- // 'webkit': (function () { try { return (navigator.taintEnabled) ? false : ((Util.Features.xpath) ? ((Util.Features.query) ? 525 : 420) : 419); } catch (e) { return false; } }()),
- var detectInitialWebkit = function () {
- try {
- if (navigator.taintEnabled) {
- return false;
- } else {
- if (Util.Features.xpath) {
- return (Util.Features.query) ? 525 : 420;
- } else {
- return 419;
- }
- }
- } catch (e) {
- return false;
- }
- };
-
- var detectActualWebkit = function (initial_ver) {
- var re = /WebKit\/([0-9\.]*) /;
- var str_ver = (navigator.userAgent.match(re) || ['', initial_ver])[1];
- return parseFloat(str_ver, 10);
- };
-
- // 'gecko': (function () { return (!document.getBoxObjectFor && window.mozInnerScreenX == null) ? false : ((document.getElementsByClassName) ? 19ssName) ? 19 : 18 : 18); }())
- var detectGecko = function () {
- /* jshint -W041 */
- if (!document.getBoxObjectFor && window.mozInnerScreenX == null) {
- return false;
- } else {
- return (document.getElementsByClassName) ? 19 : 18;
- }
- /* jshint +W041 */
- };
-
- Util.Engine = {
- // Version detection break in Opera 11.60 (errors on arguments.callee.caller reference)
- //'presto': (function() {
- // return (!window.opera) ? false : ((arguments.callee.caller) ? 960 : ((document.getElementsByClassName) ? 950 : 925)); }()),
- 'presto': detectPresto(),
- 'trident': detectTrident(),
- 'webkit': detectInitialWebkit(),
- 'gecko': detectGecko(),
- };
-
- if (Util.Engine.webkit) {
- // Extract actual webkit version if available
- Util.Engine.webkit = detectActualWebkit(Util.Engine.webkit);
- }
-})();
-
-Util.Flash = (function () {
- "use strict";
- var v, version;
- try {
- v = navigator.plugins['Shockwave Flash'].description;
- } catch (err1) {
- try {
- v = new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version');
- } catch (err2) {
- v = '0 r0';
- }
- }
- version = v.match(/\d+/g);
- return {version: parseInt(version[0] || 0 + '.' + version[1], 10) || 0, build: parseInt(version[2], 10) || 0};
-}());
diff --git a/webclients/novnc/include/web-socket-js/README.txt b/webclients/novnc/include/web-socket-js/README.txt
deleted file mode 100644
index 2e32ea7..0000000
--- a/webclients/novnc/include/web-socket-js/README.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-* How to try
-
-Assuming you have Web server (e.g. Apache) running at http://example.com/ .
-
-- Download web_socket.rb from:
- http://github.com/gimite/web-socket-ruby/tree/master
-- Run sample Web Socket server (echo server) in example.com with: (#1)
- $ ruby web-socket-ruby/samples/echo_server.rb example.com 10081
-- If your server already provides socket policy file at port 843, modify the file to allow access to port 10081. Otherwise you can skip this step. See below for details.
-- Publish the web-socket-js directory with your Web server (e.g. put it in ~/public_html).
-- Change ws://localhost:10081 to ws://example.com:10081 in sample.html.
-- Open sample.html in your browser.
-- After "onopen" is shown, input something, click [Send] and confirm echo back.
-
-#1: First argument of echo_server.rb means that it accepts Web Socket connection from HTML pages in example.com.
-
-
-* Troubleshooting
-
-If it doesn't work, try these:
-
-1. Try Chrome and Firefox 3.x.
-- It doesn't work on Chrome:
--- It's likely an issue of your code or the server. Debug your code as usual e.g. using console.log.
-- It works on Chrome but it doesn't work on Firefox:
--- It's likely an issue of web-socket-js specific configuration (e.g. 3 and 4 below).
-- It works on both Chrome and Firefox, but it doesn't work on your browser:
--- Check "Supported environment" section below. Your browser may not be supported by web-socket-js.
-
-2. Add this line before your code:
- WEB_SOCKET_DEBUG = true;
-and use Developer Tools (Chrome/Safari) or Firebug (Firefox) to see if console.log outputs any errors.
-
-3. Make sure you do NOT open your HTML page as local file e.g. file:///.../sample.html. web-socket-js doesn't work on local file. Open it via Web server e.g. http:///.../sample.html.
-
-4. If you are NOT using web-socket-ruby as your WebSocket server, you need to place Flash socket policy file on your server. See "Flash socket policy file" section below for details.
-
-5. Check if sample.html bundled with web-socket-js works.
-
-6. Make sure the port used for WebSocket (10081 in example above) is not blocked by your server/client's firewall.
-
-7. Install debugger version of Flash Player available here to see Flash errors:
-http://www.adobe.com/support/flashplayer/downloads.html
-
-
-* Supported environments
-
-It should work on:
-- Google Chrome 4 or later (just uses native implementation)
-- Firefox 3.x, Internet Explorer 8 + Flash Player 9 or later
-
-It may or may not work on other browsers such as Safari, Opera or IE 6. Patch for these browsers are appreciated, but I will not work on fixing issues specific to these browsers by myself.
-
-
-* Flash socket policy file
-
-This implementation uses Flash's socket, which means that your server must provide Flash socket policy file to declare the server accepts connections from Flash.
-
-If you use web-socket-ruby available at
-http://github.com/gimite/web-socket-ruby/tree/master
-, you don't need anything special, because web-socket-ruby handles Flash socket policy file request. But if you already provide socket policy file at port 843, you need to modify the file to allow access to Web Socket port, because it precedes what web-socket-ruby provides.
-
-If you use other Web Socket server implementation, you need to provide socket policy file yourself. See
-http://www.lightsphere.com/dev/articles/flash_socket_policy.html
-for details and sample script to run socket policy file server. node.js implementation is available here:
-http://github.com/LearnBoost/Socket.IO-node/blob/master/lib/socket.io/transports/flashsocket.js
-
-Actually, it's still better to provide socket policy file at port 843 even if you use web-socket-ruby. Flash always try to connect to port 843 first, so providing the file at port 843 makes startup faster.
-
-
-* Cookie considerations
-
-Cookie is sent if Web Socket host is the same as the origin of JavaScript. Otherwise it is not sent, because I don't know way to send right Cookie (which is Cookie of the host of Web Socket, I heard).
-
-Note that it's technically possible that client sends arbitrary string as Cookie and any other headers (by modifying this library for example) once you place Flash socket policy file in your server. So don't trust Cookie and other headers if you allow connection from untrusted origin.
-
-
-* Proxy considerations
-
-The WebSocket spec (http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol) specifies instructions for User Agents to support proxied connections by implementing the HTTP CONNECT method.
-
-The AS3 Socket class doesn't implement this mechanism, which renders it useless for the scenarios where the user trying to open a socket is behind a proxy.
-
-The class RFC2817Socket (by Christian Cantrell) effectively lets us implement this, as long as the proxy settings are known and provided by the interface that instantiates the WebSocket. As such, if you want to support proxied conncetions, you'll have to supply this information to the WebSocket constructor when Flash is being used. One way to go about it would be to ask the user for proxy settings information if the initial connection fails.
-
-
-* How to host HTML file and SWF file in different domains
-
-By default, HTML file and SWF file must be in the same domain. You can follow steps below to allow hosting them in different domain.
-
-WARNING: If you use the method below, HTML files in ANY domains can send arbitrary TCP data to your WebSocket server, regardless of configuration in Flash socket policy file. Arbitrary TCP data means that they can even fake request headers including Origin and Cookie.
-
-- Unzip WebSocketMainInsecure.zip to extract WebSocketMainInsecure.swf.
-- Put WebSocketMainInsecure.swf on your server, instead of WebSocketMain.swf.
-- In JavaScript, set WEB_SOCKET_SWF_LOCATION to URL of your WebSocketMainInsecure.swf.
-
-
-* How to build WebSocketMain.swf
-
-Install Flex 4 SDK:
-http://opensource.adobe.com/wiki/display/flexsdk/Download+Flex+4
-
-$ cd flash-src
-$ ./build.sh
-
-
-* License
-
-New BSD License.
diff --git a/webclients/novnc/include/web-socket-js/WebSocketMain.swf b/webclients/novnc/include/web-socket-js/WebSocketMain.swf
deleted file mode 100644
index f286c81..0000000
--- a/webclients/novnc/include/web-socket-js/WebSocketMain.swf
+++ /dev/null
Binary files differ
diff --git a/webclients/novnc/include/web-socket-js/swfobject.js b/webclients/novnc/include/web-socket-js/swfobject.js
deleted file mode 100644
index 8eafe9d..0000000
--- a/webclients/novnc/include/web-socket-js/swfobject.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* SWFObject v2.2 <http://code.google.com/p/swfobject/>
- is released under the MIT License <http://www.opensource.org/licenses/mit-license.php>
-*/
-var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y<X;Y++){U[Y]()}}function K(X){if(J){X()}else{U[U.length]=X}}function s(Y){if(typeof O.addEventListener!=D){O.addEventListener("load",Y,false)}else{if(typeof j.addEventListener!=D){j.addEventListener("load",Y,false)}else{if(typeof O.attachEvent!=D){i(O,"onload",Y)}else{if(typeof O.onload=="function"){var X=O.onload;O.onload=function(){X();Y()}}else{O.onload=Y}}}}}function h(){if(T){V()}else{H()}}function V(){var X=j.getElementsByTagName("body")[0];var aa=C(r);aa.setAttribute("type",q);var Z=X.appendChild(aa);if(Z){var Y=0;(function(){if(typeof Z.GetVariable!=D){var ab=Z.GetVariable("$version");if(ab){ab=ab.split(" ")[1].split(",");M.pv=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}else{if(Y<10){Y++;setTimeout(arguments.callee,10);return}}X.removeChild(aa);Z=null;H()})()}else{H()}}function H(){var ag=o.length;if(ag>0){for(var af=0;af<ag;af++){var Y=o[af].id;var ab=o[af].callbackFn;var aa={success:false,id:Y};if(M.pv[0]>0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad<ac;ad++){if(X[ad].getAttribute("name").toLowerCase()!="movie"){ah[X[ad].getAttribute("name")]=X[ad].getAttribute("value")}}P(ai,ah,Y,ab)}else{p(ae);if(ab){ab(aa)}}}}}else{w(Y,true);if(ab){var Z=z(Y);if(Z&&typeof Z.SetVariable!=D){aa.success=true;aa.ref=Z}ab(aa)}}}}}function z(aa){var X=null;var Y=c(aa);if(Y&&Y.nodeName=="OBJECT"){if(typeof Y.SetVariable!=D){X=Y}else{var Z=Y.getElementsByTagName(r)[0];if(Z){X=Z}}}return X}function A(){return !a&&F("6.0.65")&&(M.win||M.mac)&&!(M.wk&&M.wk<312)}function P(aa,ab,X,Z){a=true;E=Z||null;B={success:false,id:X};var ae=c(X);if(ae){if(ae.nodeName=="OBJECT"){l=g(ae);Q=null}else{l=ae;Q=X}aa.id=R;if(typeof aa.width==D||(!/%$/.test(aa.width)&&parseInt(aa.width,10)<310)){aa.width="310"}if(typeof aa.height==D||(!/%$/.test(aa.height)&&parseInt(aa.height,10)<137)){aa.height="137"}j.title=j.title.slice(0,47)+" - Flash Player Installation";var ad=M.ie&&M.win?"ActiveX":"PlugIn",ac="MMredirectURL="+O.location.toString().replace(/&/g,"%26")+"&MMplayerType="+ad+"&MMdoctitle="+j.title;if(typeof ab.flashvars!=D){ab.flashvars+="&"+ac}else{ab.flashvars=ac}if(M.ie&&M.win&&ae.readyState!=4){var Y=C("div");X+="SWFObjectNew";Y.setAttribute("id",X);ae.parentNode.insertBefore(Y,ae);ae.style.display="none";(function(){if(ae.readyState==4){ae.parentNode.removeChild(ae)}else{setTimeout(arguments.callee,10)}})()}u(aa,ab,X)}}function p(Y){if(M.ie&&M.win&&Y.readyState!=4){var X=C("div");Y.parentNode.insertBefore(X,Y);X.parentNode.replaceChild(g(Y),X);Y.style.display="none";(function(){if(Y.readyState==4){Y.parentNode.removeChild(Y)}else{setTimeout(arguments.callee,10)}})()}else{Y.parentNode.replaceChild(g(Y),Y)}}function g(ab){var aa=C("div");if(M.win&&M.ie){aa.innerHTML=ab.innerHTML}else{var Y=ab.getElementsByTagName(r)[0];if(Y){var ad=Y.childNodes;if(ad){var X=ad.length;for(var Z=0;Z<X;Z++){if(!(ad[Z].nodeType==1&&ad[Z].nodeName=="PARAM")&&!(ad[Z].nodeType==8)){aa.appendChild(ad[Z].cloneNode(true))}}}}}return aa}function u(ai,ag,Y){var X,aa=c(Y);if(M.wk&&M.wk<312){return X}if(aa){if(typeof ai.id==D){ai.id=Y}if(M.ie&&M.win){var ah="";for(var ae in ai){if(ai[ae]!=Object.prototype[ae]){if(ae.toLowerCase()=="data"){ag.movie=ai[ae]}else{if(ae.toLowerCase()=="styleclass"){ah+=' class="'+ai[ae]+'"'}else{if(ae.toLowerCase()!="classid"){ah+=" "+ae+'="'+ai[ae]+'"'}}}}}var af="";for(var ad in ag){if(ag[ad]!=Object.prototype[ad]){af+='<param name="'+ad+'" value="'+ag[ad]+'" />'}}aa.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+ah+">"+af+"</object>";N[N.length]=ai.id;X=c(ai.id)}else{var Z=C(r);Z.setAttribute("type",q);for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac])}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac])}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab])}}aa.parentNode.replaceChild(Z,aa);X=Z}}return X}function e(Z,X,Y){var aa=C("param");aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa)}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";(function(){if(X.readyState==4){b(Y)}else{setTimeout(arguments.callee,10)}})()}else{X.parentNode.removeChild(X)}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null}}Y.parentNode.removeChild(Y)}}function c(Z){var X=null;try{X=j.getElementById(Z)}catch(Y){}return X}function C(X){return j.createElement(X)}function i(Z,X,Y){Z.attachEvent(X,Y);I[I.length]=[Z,X,Y]}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return}var aa=j.getElementsByTagName("head")[0];if(!aa){return}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;G=null}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1]}G=X}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y)}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"))}}}function w(Z,X){if(!m){return}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y}else{v("#"+Z,"visibility:"+Y)}}function L(Y){var Z=/[\\\"<>\.;]/;var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;for(var ab=0;ab<ac;ab++){I[ab][0].detachEvent(I[ab][1],I[ab][2])}var Z=N.length;for(var aa=0;aa<Z;aa++){y(N[aa])}for(var Y in M){M[Y]=null}M=null;for(var X in swfobject){swfobject[X]=null}swfobject=null})}}();return{registerObject:function(ab,X,aa,Z){if(M.w3&&ab&&X){var Y={};Y.id=ab;Y.swfVersion=X;Y.expressInstall=aa;Y.callbackFn=Z;o[o.length]=Y;w(ab,false)}else{if(Z){Z({success:false,id:ab})}}},getObjectById:function(X){if(M.w3){return z(X)}},embedSWF:function(ab,ah,ae,ag,Y,aa,Z,ad,af,ac){var X={success:false,id:ah};if(M.w3&&!(M.wk&&M.wk<312)&&ab&&ah&&ae&&ag&&Y){w(ah,false);K(function(){ae+="";ag+="";var aj={};if(af&&typeof af===r){for(var al in af){aj[al]=af[al]}}aj.data=ab;aj.width=ae;aj.height=ag;var am={};if(ad&&typeof ad===r){for(var ak in ad){am[ak]=ad[ak]}}if(Z&&typeof Z===r){for(var ai in Z){if(typeof am.flashvars!=D){am.flashvars+="&"+ai+"="+Z[ai]}else{am.flashvars=ai+"="+Z[ai]}}}if(F(Y)){var an=u(aj,am,ah);if(aj.id==ah){w(ah,true)}X.success=true;X.ref=an}else{if(aa&&A()){aj.data=aa;P(aj,am,ah,ac);return}else{w(ah,true)}}if(ac){ac(X)}})}else{if(ac){ac(X)}}},switchOffAutoHideShow:function(){m=false},ua:M,getFlashPlayerVersion:function(){return{major:M.pv[0],minor:M.pv[1],release:M.pv[2]}},hasFlashPlayerVersion:F,createSWF:function(Z,Y,X){if(M.w3){return u(Z,Y,X)}else{return undefined}},showExpressInstall:function(Z,aa,X,Y){if(M.w3&&A()){P(Z,aa,X,Y)}},removeSWF:function(X){if(M.w3){y(X)}},createCSS:function(aa,Z,Y,X){if(M.w3){v(aa,Z,Y,X)}},addDomLoadEvent:K,addLoadEvent:s,getQueryParamValue:function(aa){var Z=j.location.search||j.location.hash;if(Z){if(/\?/.test(Z)){Z=Z.split("?")[1]}if(aa==null){return L(Z)}var Y=Z.split("&");for(var X=0;X<Y.length;X++){if(Y[X].substring(0,Y[X].indexOf("="))==aa){return L(Y[X].substring((Y[X].indexOf("=")+1)))}}}return""},expressInstallCallback:function(){if(a){var X=c(R);if(X&&l){X.parentNode.replaceChild(l,X);if(Q){w(Q,true);if(M.ie&&M.win){l.style.display="block"}}if(E){E(B)}}a=false}}}}(); \ No newline at end of file
diff --git a/webclients/novnc/include/web-socket-js/web_socket.js b/webclients/novnc/include/web-socket-js/web_socket.js
deleted file mode 100644
index 06cc5d0..0000000
--- a/webclients/novnc/include/web-socket-js/web_socket.js
+++ /dev/null
@@ -1,391 +0,0 @@
-// Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
-// License: New BSD License
-// Reference: http://dev.w3.org/html5/websockets/
-// Reference: http://tools.ietf.org/html/rfc6455
-
-(function() {
-
- if (window.WEB_SOCKET_FORCE_FLASH) {
- // Keeps going.
- } else if (window.WebSocket) {
- return;
- } else if (window.MozWebSocket) {
- // Firefox.
- window.WebSocket = MozWebSocket;
- return;
- }
-
- var logger;
- if (window.WEB_SOCKET_LOGGER) {
- logger = WEB_SOCKET_LOGGER;
- } else if (window.console && window.console.log && window.console.error) {
- // In some environment, console is defined but console.log or console.error is missing.
- logger = window.console;
- } else {
- logger = {log: function(){ }, error: function(){ }};
- }
-
- // swfobject.hasFlashPlayerVersion("10.0.0") doesn't work with Gnash.
- if (swfobject.getFlashPlayerVersion().major < 10) {
- logger.error("Flash Player >= 10.0.0 is required.");
- return;
- }
- if (location.protocol == "file:") {
- logger.error(
- "WARNING: web-socket-js doesn't work in file:///... URL " +
- "unless you set Flash Security Settings properly. " +
- "Open the page via Web server i.e. http://...");
- }
-
- /**
- * Our own implementation of WebSocket class using Flash.
- * @param {string} url
- * @param {array or string} protocols
- * @param {string} proxyHost
- * @param {int} proxyPort
- * @param {string} headers
- */
- window.WebSocket = function(url, protocols, proxyHost, proxyPort, headers) {
- var self = this;
- self.__id = WebSocket.__nextId++;
- WebSocket.__instances[self.__id] = self;
- self.readyState = WebSocket.CONNECTING;
- self.bufferedAmount = 0;
- self.__events = {};
- if (!protocols) {
- protocols = [];
- } else if (typeof protocols == "string") {
- protocols = [protocols];
- }
- // Uses setTimeout() to make sure __createFlash() runs after the caller sets ws.onopen etc.
- // Otherwise, when onopen fires immediately, onopen is called before it is set.
- self.__createTask = setTimeout(function() {
- WebSocket.__addTask(function() {
- self.__createTask = null;
- WebSocket.__flash.create(
- self.__id, url, protocols, proxyHost || null, proxyPort || 0, headers || null);
- });
- }, 0);
- };
-
- /**
- * Send data to the web socket.
- * @param {string} data The data to send to the socket.
- * @return {boolean} True for success, false for failure.
- */
- WebSocket.prototype.send = function(data) {
- if (this.readyState == WebSocket.CONNECTING) {
- throw "INVALID_STATE_ERR: Web Socket connection has not been established";
- }
- // We use encodeURIComponent() here, because FABridge doesn't work if
- // the argument includes some characters. We don't use escape() here
- // because of this:
- // https://developer.mozilla.org/en/Core_JavaScript_1.5_Guide/Functions#escape_and_unescape_Functions
- // But it looks decodeURIComponent(encodeURIComponent(s)) doesn't
- // preserve all Unicode characters either e.g. "\uffff" in Firefox.
- // Note by wtritch: Hopefully this will not be necessary using ExternalInterface. Will require
- // additional testing.
- var result = WebSocket.__flash.send(this.__id, encodeURIComponent(data));
- if (result < 0) { // success
- return true;
- } else {
- this.bufferedAmount += result;
- return false;
- }
- };
-
- /**
- * Close this web socket gracefully.
- */
- WebSocket.prototype.close = function() {
- if (this.__createTask) {
- clearTimeout(this.__createTask);
- this.__createTask = null;
- this.readyState = WebSocket.CLOSED;
- return;
- }
- if (this.readyState == WebSocket.CLOSED || this.readyState == WebSocket.CLOSING) {
- return;
- }
- this.readyState = WebSocket.CLOSING;
- WebSocket.__flash.close(this.__id);
- };
-
- /**
- * Implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
- *
- * @param {string} type
- * @param {function} listener
- * @param {boolean} useCapture
- * @return void
- */
- WebSocket.prototype.addEventListener = function(type, listener, useCapture) {
- if (!(type in this.__events)) {
- this.__events[type] = [];
- }
- this.__events[type].push(listener);
- };
-
- /**
- * Implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
- *
- * @param {string} type
- * @param {function} listener
- * @param {boolean} useCapture
- * @return void
- */
- WebSocket.prototype.removeEventListener = function(type, listener, useCapture) {
- if (!(type in this.__events)) return;
- var events = this.__events[type];
- for (var i = events.length - 1; i >= 0; --i) {
- if (events[i] === listener) {
- events.splice(i, 1);
- break;
- }
- }
- };
-
- /**
- * Implementation of {@link <a href="http://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-registration">DOM 2 EventTarget Interface</a>}
- *
- * @param {Event} event
- * @return void
- */
- WebSocket.prototype.dispatchEvent = function(event) {
- var events = this.__events[event.type] || [];
- for (var i = 0; i < events.length; ++i) {
- events[i](event);
- }
- var handler = this["on" + event.type];
- if (handler) handler.apply(this, [event]);
- };
-
- /**
- * Handles an event from Flash.
- * @param {Object} flashEvent
- */
- WebSocket.prototype.__handleEvent = function(flashEvent) {
-
- if ("readyState" in flashEvent) {
- this.readyState = flashEvent.readyState;
- }
- if ("protocol" in flashEvent) {
- this.protocol = flashEvent.protocol;
- }
-
- var jsEvent;
- if (flashEvent.type == "open" || flashEvent.type == "error") {
- jsEvent = this.__createSimpleEvent(flashEvent.type);
- } else if (flashEvent.type == "close") {
- jsEvent = this.__createSimpleEvent("close");
- jsEvent.wasClean = flashEvent.wasClean ? true : false;
- jsEvent.code = flashEvent.code;
- jsEvent.reason = flashEvent.reason;
- } else if (flashEvent.type == "message") {
- var data = decodeURIComponent(flashEvent.message);
- jsEvent = this.__createMessageEvent("message", data);
- } else {
- throw "unknown event type: " + flashEvent.type;
- }
-
- this.dispatchEvent(jsEvent);
-
- };
-
- WebSocket.prototype.__createSimpleEvent = function(type) {
- if (document.createEvent && window.Event) {
- var event = document.createEvent("Event");
- event.initEvent(type, false, false);
- return event;
- } else {
- return {type: type, bubbles: false, cancelable: false};
- }
- };
-
- WebSocket.prototype.__createMessageEvent = function(type, data) {
- if (document.createEvent && window.MessageEvent && !window.opera) {
- var event = document.createEvent("MessageEvent");
- event.initMessageEvent("message", false, false, data, null, null, window, null);
- return event;
- } else {
- // IE and Opera, the latter one truncates the data parameter after any 0x00 bytes.
- return {type: type, data: data, bubbles: false, cancelable: false};
- }
- };
-
- /**
- * Define the WebSocket readyState enumeration.
- */
- WebSocket.CONNECTING = 0;
- WebSocket.OPEN = 1;
- WebSocket.CLOSING = 2;
- WebSocket.CLOSED = 3;
-
- // Field to check implementation of WebSocket.
- WebSocket.__isFlashImplementation = true;
- WebSocket.__initialized = false;
- WebSocket.__flash = null;
- WebSocket.__instances = {};
- WebSocket.__tasks = [];
- WebSocket.__nextId = 0;
-
- /**
- * Load a new flash security policy file.
- * @param {string} url
- */
- WebSocket.loadFlashPolicyFile = function(url){
- WebSocket.__addTask(function() {
- WebSocket.__flash.loadManualPolicyFile(url);
- });
- };
-
- /**
- * Loads WebSocketMain.swf and creates WebSocketMain object in Flash.
- */
- WebSocket.__initialize = function() {
-
- if (WebSocket.__initialized) return;
- WebSocket.__initialized = true;
-
- if (WebSocket.__swfLocation) {
- // For backword compatibility.
- window.WEB_SOCKET_SWF_LOCATION = WebSocket.__swfLocation;
- }
- if (!window.WEB_SOCKET_SWF_LOCATION) {
- logger.error("[WebSocket] set WEB_SOCKET_SWF_LOCATION to location of WebSocketMain.swf");
- return;
- }
- if (!window.WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR &&
- !WEB_SOCKET_SWF_LOCATION.match(/(^|\/)WebSocketMainInsecure\.swf(\?.*)?$/) &&
- WEB_SOCKET_SWF_LOCATION.match(/^\w+:\/\/([^\/]+)/)) {
- var swfHost = RegExp.$1;
- if (location.host != swfHost) {
- logger.error(
- "[WebSocket] You must host HTML and WebSocketMain.swf in the same host " +
- "('" + location.host + "' != '" + swfHost + "'). " +
- "See also 'How to host HTML file and SWF file in different domains' section " +
- "in README.md. If you use WebSocketMainInsecure.swf, you can suppress this message " +
- "by WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR = true;");
- }
- }
- var container = document.createElement("div");
- container.id = "webSocketContainer";
- // Hides Flash box. We cannot use display: none or visibility: hidden because it prevents
- // Flash from loading at least in IE. So we move it out of the screen at (-100, -100).
- // But this even doesn't work with Flash Lite (e.g. in Droid Incredible). So with Flash
- // Lite, we put it at (0, 0). This shows 1x1 box visible at left-top corner but this is
- // the best we can do as far as we know now.
- container.style.position = "absolute";
- if (WebSocket.__isFlashLite()) {
- container.style.left = "0px";
- container.style.top = "0px";
- } else {
- container.style.left = "-100px";
- container.style.top = "-100px";
- }
- var holder = document.createElement("div");
- holder.id = "webSocketFlash";
- container.appendChild(holder);
- document.body.appendChild(container);
- // See this article for hasPriority:
- // http://help.adobe.com/en_US/as3/mobile/WS4bebcd66a74275c36cfb8137124318eebc6-7ffd.html
- swfobject.embedSWF(
- WEB_SOCKET_SWF_LOCATION,
- "webSocketFlash",
- "1" /* width */,
- "1" /* height */,
- "10.0.0" /* SWF version */,
- null,
- null,
- {hasPriority: true, swliveconnect : true, allowScriptAccess: "always"},
- null,
- function(e) {
- if (!e.success) {
- logger.error("[WebSocket] swfobject.embedSWF failed");
- }
- }
- );
-
- };
-
- /**
- * Called by Flash to notify JS that it's fully loaded and ready
- * for communication.
- */
- WebSocket.__onFlashInitialized = function() {
- // We need to set a timeout here to avoid round-trip calls
- // to flash during the initialization process.
- setTimeout(function() {
- WebSocket.__flash = document.getElementById("webSocketFlash");
- WebSocket.__flash.setCallerUrl(location.href);
- WebSocket.__flash.setDebug(!!window.WEB_SOCKET_DEBUG);
- for (var i = 0; i < WebSocket.__tasks.length; ++i) {
- WebSocket.__tasks[i]();
- }
- WebSocket.__tasks = [];
- }, 0);
- };
-
- /**
- * Called by Flash to notify WebSockets events are fired.
- */
- WebSocket.__onFlashEvent = function() {
- setTimeout(function() {
- try {
- // Gets events using receiveEvents() instead of getting it from event object
- // of Flash event. This is to make sure to keep message order.
- // It seems sometimes Flash events don't arrive in the same order as they are sent.
- var events = WebSocket.__flash.receiveEvents();
- for (var i = 0; i < events.length; ++i) {
- WebSocket.__instances[events[i].webSocketId].__handleEvent(events[i]);
- }
- } catch (e) {
- logger.error(e);
- }
- }, 0);
- return true;
- };
-
- // Called by Flash.
- WebSocket.__log = function(message) {
- logger.log(decodeURIComponent(message));
- };
-
- // Called by Flash.
- WebSocket.__error = function(message) {
- logger.error(decodeURIComponent(message));
- };
-
- WebSocket.__addTask = function(task) {
- if (WebSocket.__flash) {
- task();
- } else {
- WebSocket.__tasks.push(task);
- }
- };
-
- /**
- * Test if the browser is running flash lite.
- * @return {boolean} True if flash lite is running, false otherwise.
- */
- WebSocket.__isFlashLite = function() {
- if (!window.navigator || !window.navigator.mimeTypes) {
- return false;
- }
- var mimeType = window.navigator.mimeTypes["application/x-shockwave-flash"];
- if (!mimeType || !mimeType.enabledPlugin || !mimeType.enabledPlugin.filename) {
- return false;
- }
- return mimeType.enabledPlugin.filename.match(/flashlite/i) ? true : false;
- };
-
- if (!window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION) {
- // NOTE:
- // This fires immediately if web_socket.js is dynamically loaded after
- // the document is loaded.
- swfobject.addDomLoadEvent(function() {
- WebSocket.__initialize();
- });
- }
-
-})();
diff --git a/webclients/novnc/include/websock.js b/webclients/novnc/include/websock.js
deleted file mode 100644
index 1b89a91..0000000
--- a/webclients/novnc/include/websock.js
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * Websock: high-performance binary WebSockets
- * Copyright (C) 2012 Joel Martin
- * Licensed under MPL 2.0 (see LICENSE.txt)
- *
- * Websock is similar to the standard WebSocket object but Websock
- * enables communication with raw TCP sockets (i.e. the binary stream)
- * via websockify. This is accomplished by base64 encoding the data
- * stream between Websock and websockify.
- *
- * Websock has built-in receive queue buffering; the message event
- * does not contain actual data but is simply a notification that
- * there is new data available. Several rQ* methods are available to
- * read binary data off of the receive queue.
- */
-
-/*jslint browser: true, bitwise: true */
-/*global Util, Base64 */
-
-
-// Load Flash WebSocket emulator if needed
-
-// To force WebSocket emulator even when native WebSocket available
-//window.WEB_SOCKET_FORCE_FLASH = true;
-// To enable WebSocket emulator debug:
-//window.WEB_SOCKET_DEBUG=1;
-
-if (window.WebSocket && !window.WEB_SOCKET_FORCE_FLASH) {
- Websock_native = true;
-} else if (window.MozWebSocket && !window.WEB_SOCKET_FORCE_FLASH) {
- Websock_native = true;
- window.WebSocket = window.MozWebSocket;
-} else {
- /* no builtin WebSocket so load web_socket.js */
-
- Websock_native = false;
- (function () {
- window.WEB_SOCKET_SWF_LOCATION = Util.get_include_uri() +
- "web-socket-js/WebSocketMain.swf";
- if (Util.Engine.trident) {
- Util.Debug("Forcing uncached load of WebSocketMain.swf");
- window.WEB_SOCKET_SWF_LOCATION += "?" + Math.random();
- }
- Util.load_scripts(["web-socket-js/swfobject.js",
- "web-socket-js/web_socket.js"]);
- })();
-}
-
-
-function Websock() {
- "use strict";
-
- this._websocket = null; // WebSocket object
- this._rQ = []; // Receive queue
- this._rQi = 0; // Receive queue index
- this._rQmax = 10000; // Max receive queue size before compacting
- this._sQ = []; // Send queue
-
- this._mode = 'base64'; // Current WebSocket mode: 'binary', 'base64'
- this.maxBufferedAmount = 200;
-
- this._eventHandlers = {
- 'message': function () {},
- 'open': function () {},
- 'close': function () {},
- 'error': function () {}
- };
-}
-
-(function () {
- "use strict";
- Websock.prototype = {
- // Getters and Setters
- get_sQ: function () {
- return this._sQ;
- },
-
- get_rQ: function () {
- return this._rQ;
- },
-
- get_rQi: function () {
- return this._rQi;
- },
-
- set_rQi: function (val) {
- this._rQi = val;
- },
-
- // Receive Queue
- rQlen: function () {
- return this._rQ.length - this._rQi;
- },
-
- rQpeek8: function () {
- return this._rQ[this._rQi];
- },
-
- rQshift8: function () {
- return this._rQ[this._rQi++];
- },
-
- rQskip8: function () {
- this._rQi++;
- },
-
- rQskipBytes: function (num) {
- this._rQi += num;
- },
-
- rQunshift8: function (num) {
- if (this._rQi === 0) {
- this._rQ.unshift(num);
- } else {
- this._rQi--;
- this._rQ[this._rQi] = num;
- }
- },
-
- rQshift16: function () {
- return (this._rQ[this._rQi++] << 8) +
- this._rQ[this._rQi++];
- },
-
- rQshift32: function () {
- return (this._rQ[this._rQi++] << 24) +
- (this._rQ[this._rQi++] << 16) +
- (this._rQ[this._rQi++] << 8) +
- this._rQ[this._rQi++];
- },
-
- rQshiftStr: function (len) {
- if (typeof(len) === 'undefined') { len = this.rQlen(); }
- var arr = this._rQ.slice(this._rQi, this._rQi + len);
- this._rQi += len;
- return String.fromCharCode.apply(null, arr);
- },
-
- rQshiftBytes: function (len) {
- if (typeof(len) === 'undefined') { len = this.rQlen(); }
- this._rQi += len;
- return this._rQ.slice(this._rQi - len, this._rQi);
- },
-
- rQslice: function (start, end) {
- if (end) {
- return this._rQ.slice(this._rQi + start, this._rQi + end);
- } else {
- return this._rQ.slice(this._rQi + start);
- }
- },
-
- // Check to see if we must wait for 'num' bytes (default to FBU.bytes)
- // to be available in the receive queue. Return true if we need to
- // wait (and possibly print a debug message), otherwise false.
- rQwait: function (msg, num, goback) {
- var rQlen = this._rQ.length - this._rQi; // Skip rQlen() function call
- if (rQlen < num) {
- if (goback) {
- if (this._rQi < goback) {
- throw new Error("rQwait cannot backup " + goback + " bytes");
- }
- this._rQi -= goback;
- }
- return true; // true means need more data
- }
- return false;
- },
-
- // Send Queue
-
- flush: function () {
- if (this._websocket.bufferedAmount !== 0) {
- Util.Debug("bufferedAmount: " + this._websocket.bufferedAmount);
- }
-
- if (this._websocket.bufferedAmount < this.maxBufferedAmount) {
- if (this._sQ.length > 0) {
- this._websocket.send(this._encode_message());
- this._sQ = [];
- }
-
- return true;
- } else {
- Util.Info("Delaying send, bufferedAmount: " +
- this._websocket.bufferedAmount);
- return false;
- }
- },
-
- send: function (arr) {
- this._sQ = this._sQ.concat(arr);
- return this.flush();
- },
-
- send_string: function (str) {
- this.send(str.split('').map(function (chr) {
- return chr.charCodeAt(0);
- }));
- },
-
- // Event Handlers
- on: function (evt, handler) {
- this._eventHandlers[evt] = handler;
- },
-
- init: function (protocols, ws_schema) {
- this._rQ = [];
- this._rQi = 0;
- this._sQ = [];
- this._websocket = null;
-
- // Check for full typed array support
- var bt = false;
- if (('Uint8Array' in window) &&
- ('set' in Uint8Array.prototype)) {
- bt = true;
- }
-
- // Check for full binary type support in WebSockets
- // Inspired by:
- // https://github.com/Modernizr/Modernizr/issues/370
- // https://github.com/Modernizr/Modernizr/blob/master/feature-detects/websockets/binary.js
- var wsbt = false;
- try {
- if (bt && ('binaryType' in WebSocket.prototype ||
- !!(new WebSocket(ws_schema + '://.').binaryType))) {
- Util.Info("Detected binaryType support in WebSockets");
- wsbt = true;
- }
- } catch (exc) {
- // Just ignore failed test localhost connection
- }
-
- // Default protocols if not specified
- if (typeof(protocols) === "undefined") {
- if (wsbt) {
- protocols = ['binary', 'base64'];
- } else {
- protocols = 'base64';
- }
- }
-
- if (!wsbt) {
- if (protocols === 'binary') {
- throw new Error('WebSocket binary sub-protocol requested but not supported');
- }
-
- if (typeof(protocols) === 'object') {
- var new_protocols = [];
-
- for (var i = 0; i < protocols.length; i++) {
- if (protocols[i] === 'binary') {
- Util.Error('Skipping unsupported WebSocket binary sub-protocol');
- } else {
- new_protocols.push(protocols[i]);
- }
- }
-
- if (new_protocols.length > 0) {
- protocols = new_protocols;
- } else {
- throw new Error("Only WebSocket binary sub-protocol was requested and is not supported.");
- }
- }
- }
-
- return protocols;
- },
-
- open: function (uri, protocols) {
- var ws_schema = uri.match(/^([a-z]+):\/\//)[1];
- protocols = this.init(protocols, ws_schema);
-
- this._websocket = new WebSocket(uri, protocols);
-
- if (protocols.indexOf('binary') >= 0) {
- this._websocket.binaryType = 'arraybuffer';
- }
-
- this._websocket.onmessage = this._recv_message.bind(this);
- this._websocket.onopen = (function () {
- Util.Debug('>> WebSock.onopen');
- if (this._websocket.protocol) {
- this._mode = this._websocket.protocol;
- Util.Info("Server choose sub-protocol: " + this._websocket.protocol);
- } else {
- this._mode = 'base64';
- Util.Error('Server select no sub-protocol!: ' + this._websocket.protocol);
- }
- this._eventHandlers.open();
- Util.Debug("<< WebSock.onopen");
- }).bind(this);
- this._websocket.onclose = (function (e) {
- Util.Debug(">> WebSock.onclose");
- this._eventHandlers.close(e);
- Util.Debug("<< WebSock.onclose");
- }).bind(this);
- this._websocket.onerror = (function (e) {
- Util.Debug(">> WebSock.onerror: " + e);
- this._eventHandlers.error(e);
- Util.Debug("<< WebSock.onerror: " + e);
- }).bind(this);
- },
-
- close: function () {
- if (this._websocket) {
- if ((this._websocket.readyState === WebSocket.OPEN) ||
- (this._websocket.readyState === WebSocket.CONNECTING)) {
- Util.Info("Closing WebSocket connection");
- this._websocket.close();
- }
-
- this._websocket.onmessage = function (e) { return; };
- }
- },
-
- // private methods
- _encode_message: function () {
- if (this._mode === 'binary') {
- // Put in a binary arraybuffer
- return (new Uint8Array(this._sQ)).buffer;
- } else {
- // base64 encode
- return Base64.encode(this._sQ);
- }
- },
-
- _decode_message: function (data) {
- if (this._mode === 'binary') {
- // push arraybuffer values onto the end
- var u8 = new Uint8Array(data);
- for (var i = 0; i < u8.length; i++) {
- this._rQ.push(u8[i]);
- }
- } else {
- // base64 decode and concat to end
- this._rQ = this._rQ.concat(Base64.decode(data, 0));
- }
- },
-
- _recv_message: function (e) {
- try {
- this._decode_message(e.data);
- if (this.rQlen() > 0) {
- this._eventHandlers.message();
- // Compact the receive queue
- if (this._rQ.length > this._rQmax) {
- this._rQ = this._rQ.slice(this._rQi);
- this._rQi = 0;
- }
- } else {
- Util.Debug("Ignoring empty message");
- }
- } catch (exc) {
- var exception_str = "";
- if (exc.name) {
- exception_str += "\n name: " + exc.name + "\n";
- exception_str += " message: " + exc.message + "\n";
- }
-
- if (typeof exc.description !== 'undefined') {
- exception_str += " description: " + exc.description + "\n";
- }
-
- if (typeof exc.stack !== 'undefined') {
- exception_str += exc.stack;
- }
-
- if (exception_str.length > 0) {
- Util.Error("recv_message, caught exception: " + exception_str);
- } else {
- Util.Error("recv_message, caught exception: " + exc);
- }
-
- if (typeof exc.name !== 'undefined') {
- this._eventHandlers.error(exc.name + ": " + exc.message);
- } else {
- this._eventHandlers.error(exc);
- }
- }
- }
- };
-})();
diff --git a/webclients/novnc/include/webutil.js b/webclients/novnc/include/webutil.js
deleted file mode 100644
index e674bf9..0000000
--- a/webclients/novnc/include/webutil.js
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2013 NTT corp.
- * Licensed under MPL 2.0 (see LICENSE.txt)
- *
- * See README.md for usage and integration instructions.
- */
-
-/*jslint bitwise: false, white: false, browser: true, devel: true */
-/*global Util, window, document */
-
-// Globals defined here
-var WebUtil = {}, $D;
-
-/*
- * Simple DOM selector by ID
- */
-if (!window.$D) {
- window.$D = function (id) {
- if (document.getElementById) {
- return document.getElementById(id);
- } else if (document.all) {
- return document.all[id];
- } else if (document.layers) {
- return document.layers[id];
- }
- return undefined;
- };
-}
-
-
-/*
- * ------------------------------------------------------
- * Namespaced in WebUtil
- * ------------------------------------------------------
- */
-
-// init log level reading the logging HTTP param
-WebUtil.init_logging = function (level) {
- "use strict";
- if (typeof level !== "undefined") {
- Util._log_level = level;
- } else {
- var param = document.location.href.match(/logging=([A-Za-z0-9\._\-]*)/);
- Util._log_level = (param || ['', Util._log_level])[1];
- }
- Util.init_logging();
-};
-
-
-WebUtil.dirObj = function (obj, depth, parent) {
- "use strict";
- if (! depth) { depth = 2; }
- if (! parent) { parent = ""; }
-
- // Print the properties of the passed-in object
- var msg = "";
- for (var i in obj) {
- if ((depth > 1) && (typeof obj[i] === "object")) {
- // Recurse attributes that are objects
- msg += WebUtil.dirObj(obj[i], depth - 1, parent + "." + i);
- } else {
- //val = new String(obj[i]).replace("\n", " ");
- var val = "";
- if (typeof(obj[i]) === "undefined") {
- val = "undefined";
- } else {
- val = obj[i].toString().replace("\n", " ");
- }
- if (val.length > 30) {
- val = val.substr(0, 30) + "...";
- }
- msg += parent + "." + i + ": " + val + "\n";
- }
- }
- return msg;
-};
-
-// Read a query string variable
-WebUtil.getQueryVar = function (name, defVal) {
- "use strict";
- var re = new RegExp('.*[?&]' + name + '=([^&#]*)'),
- match = document.location.href.match(re);
- if (typeof defVal === 'undefined') { defVal = null; }
- if (match) {
- return decodeURIComponent(match[1]);
- } else {
- return defVal;
- }
-};
-
-
-/*
- * Cookie handling. Dervied from: http://www.quirksmode.org/js/cookies.html
- */
-
-// No days means only for this browser session
-WebUtil.createCookie = function (name, value, days) {
- "use strict";
- var date, expires;
- if (days) {
- date = new Date();
- date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
- expires = "; expires=" + date.toGMTString();
- } else {
- expires = "";
- }
-
- var secure;
- if (document.location.protocol === "https:") {
- secure = "; secure";
- } else {
- secure = "";
- }
- document.cookie = name + "=" + value + expires + "; path=/" + secure;
-};
-
-WebUtil.readCookie = function (name, defaultValue) {
- "use strict";
- var nameEQ = name + "=",
- ca = document.cookie.split(';');
-
- for (var i = 0; i < ca.length; i += 1) {
- var c = ca[i];
- while (c.charAt(0) === ' ') { c = c.substring(1, c.length); }
- if (c.indexOf(nameEQ) === 0) { return c.substring(nameEQ.length, c.length); }
- }
- return (typeof defaultValue !== 'undefined') ? defaultValue : null;
-};
-
-WebUtil.eraseCookie = function (name) {
- "use strict";
- WebUtil.createCookie(name, "", -1);
-};
-
-/*
- * Setting handling.
- */
-
-WebUtil.initSettings = function (callback /*, ...callbackArgs */) {
- "use strict";
- var callbackArgs = Array.prototype.slice.call(arguments, 1);
- if (window.chrome && window.chrome.storage) {
- window.chrome.storage.sync.get(function (cfg) {
- WebUtil.settings = cfg;
- console.log(WebUtil.settings);
- if (callback) {
- callback.apply(this, callbackArgs);
- }
- });
- } else {
- // No-op
- if (callback) {
- callback.apply(this, callbackArgs);
- }
- }
-};
-
-// No days means only for this browser session
-WebUtil.writeSetting = function (name, value) {
- "use strict";
- if (window.chrome && window.chrome.storage) {
- //console.log("writeSetting:", name, value);
- if (WebUtil.settings[name] !== value) {
- WebUtil.settings[name] = value;
- window.chrome.storage.sync.set(WebUtil.settings);
- }
- } else {
- localStorage.setItem(name, value);
- }
-};
-
-WebUtil.readSetting = function (name, defaultValue) {
- "use strict";
- var value;
- if (window.chrome && window.chrome.storage) {
- value = WebUtil.settings[name];
- } else {
- value = localStorage.getItem(name);
- }
- if (typeof value === "undefined") {
- value = null;
- }
- if (value === null && typeof defaultValue !== undefined) {
- return defaultValue;
- } else {
- return value;
- }
-};
-
-WebUtil.eraseSetting = function (name) {
- "use strict";
- if (window.chrome && window.chrome.storage) {
- window.chrome.storage.sync.remove(name);
- delete WebUtil.settings[name];
- } else {
- localStorage.removeItem(name);
- }
-};
-
-/*
- * Alternate stylesheet selection
- */
-WebUtil.getStylesheets = function () {
- "use strict";
- var links = document.getElementsByTagName("link");
- var sheets = [];
-
- for (var i = 0; i < links.length; i += 1) {
- if (links[i].title &&
- links[i].rel.toUpperCase().indexOf("STYLESHEET") > -1) {
- sheets.push(links[i]);
- }
- }
- return sheets;
-};
-
-// No sheet means try and use value from cookie, null sheet used to
-// clear all alternates.
-WebUtil.selectStylesheet = function (sheet) {
- "use strict";
- if (typeof sheet === 'undefined') {
- sheet = 'default';
- }
-
- var sheets = WebUtil.getStylesheets();
- for (var i = 0; i < sheets.length; i += 1) {
- var link = sheets[i];
- if (link.title === sheet) {
- Util.Debug("Using stylesheet " + sheet);
- link.disabled = false;
- } else {
- //Util.Debug("Skipping stylesheet " + link.title);
- link.disabled = true;
- }
- }
- return sheet;
-};