diff --git a/.gitignore b/.gitignore
index e9c84876..7cf2a2a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,4 @@
*.o
tests/data_*.js
utils/rebind.so
-utils/websockify
-/node_modules
-/build
-/lib
-recordings
-*.swp
-*~
+node_modules
diff --git a/.gitmodules b/.gitmodules
index e69de29b..45574aeb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "include/web-socket-js-project"]
+ path = include/web-socket-js-project
+ url = https://github.com/gimite/web-socket-js.git
diff --git a/.npmignore b/.npmignore
deleted file mode 100644
index 725befcf..00000000
--- a/.npmignore
+++ /dev/null
@@ -1,21 +0,0 @@
-app
-core
-vendor
-.gitmodules
-node_modules
-.*
-*~
-*.swp
-*.swo
-tests
-.travis.yml
-utils
-docs/notes
-docs/links
-docs/release.txt
-docs/rfb_notes
-docs/*.pdf
-vnc.html
-vnc_lite.html
-karma.conf.js
-docs/flash_policy.txt
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index d5b4abba..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-language: node_js
-sudo: false
-cache:
- directories:
- - node_modules
-node_js:
-- '6.1'
-env:
- matrix:
- - TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='Windows 10,Linux,OS X 10.11'
- - TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='Windows 10,Linux,OS X 10.11'
- - TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 10'
- - TEST_BROWSER_NAME=safari TEST_BROWSER_OS='OS X 10.11'
-before_script: npm install -g karma-cli
-addons:
- sauce_connect:
- username:
- secure: "Y5+WRK1ThvctFQNchjW2jly9eLrxe9k8wkKZhS2OGT3SDAmFZnJADswbk/jEbhtl+ZclXybz0uy8Y5YT1PzVCySOqwvy5viIvMZ1xXlOMt1wwJIYbsb3AbOTt3lS+GBXB7RSk0Um5nVx+IMDDIjfS+kQ53NeR1+a/RrDaVNfDEE="
- jwt:
- secure: "MHYV2PhoZtNdeSNgRQjLRSn8T9BmwvwBNTgzwOfrUrwU4kVH16ETWOCnygybuRtYC/LNwQxe5W0hcb4rqOzlOO+fWr7OUdRAg8MPXVK0v3WVRu0BpgDIqMXlAbSp2IyCADjqNxG4pmGyrlfAhJ5yO7moaHpjU4QkkXX6QrvjmH4="
-
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 2d2e68cf..00000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,42 +0,0 @@
-How to contribute to noVNC
-==========================
-
-We accept code via pull requests on GitHub. There are several guidelines that
-we expect contributors submitting code requests to follow. If you have issues
-following any of these guidelines, feel free to drop us a line by leaving a
-comment in the code request or sending us an email.
-
-Contributing Guidelines
------------------------
-
-* While we don't have an official coding style guide, please try to follow
- the general coding style of the existing code.
-** Use four spaces instead of tabs
-** prefix private variables and functions with an `_`
-
-* Please try to include unit tests for your code. For instance, if you
- introduce a new encoding, add a test to `tests/test.rfb.js` under the
- "Encoding Handlers" section (basically, input a small pattern in your
- encoding and make sure the pattern gets displayed correctly). If you
- fix a bug, try to add a unit test that would have caught that bug
- (if possible -- some bugs, especially visual ones, are hard to test for).
-
-* Squash your commits down in to a clean commit history. For instance, there
- should not be "cleanup" commits where you fix issues in previous commits in
- the same pull request. Before you go to commit, use `git rebase -i` to
- squash these changes into the relevant commits. For instance, a good commit
- history might look like "Added support for FOO encoding, Added support for
- BAR message, Placed Button in UI to Trigger BAR" (where each comma denotes
- a separate commit).
-
-* Add both a title and description to your commit, if possible. Place more
- detail on what you did in the description.
-
-Running the unit tests
-----------------------
-
-We use Karma to run our tests. You can launch karma manually, or simply
-run `npm test`. The Karma debug page will display the tests in normal
-mocha form, if you need it.
-
-Thanks, and happy coding!
diff --git a/LICENSE.txt b/LICENSE.txt
index ab95798e..2d094089 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -5,9 +5,19 @@ Public License 2.0). The noVNC core library is composed of the
Javascript code necessary for full noVNC operation. This includes (but
is not limited to):
- core/**/*.js
- app/*.js
- test/playback.js
+ include/base64.js
+ include/des.js
+ include/display.js
+ include/input.js
+ include/jsunzip.js
+ include/keysym.js
+ include/logo.js
+ include/rfb.js
+ include/ui.js
+ include/util.js
+ include/vnc.js
+ include/websock.js
+ include/webutil.js
The HTML, CSS, font and images files that included with the noVNC
source distibution (or repository) are not considered part of the
@@ -19,35 +29,36 @@ The HTML, CSS, font and image files are licensed as follows:
*.html : 2-Clause BSD license
- app/styles/*.css : 2-Clause BSD license
+ include/*.css : 2-Clause BSD license
- app/styles/Orbitron* : SIL Open Font License 1.1
+ include/Orbitron* : SIL Open Font License 1.1
(Copyright 2009 Matt McInerney)
- app/images/ : Creative Commons Attribution-ShareAlike
+ images/ : Creative Commons Attribution-ShareAlike
http://creativecommons.org/licenses/by-sa/3.0/
Some portions of noVNC are copyright to their individual authors.
Please refer to the individual source files and/or to the noVNC commit
-history: https://github.com/novnc/noVNC/commits/master
+history: https://github.com/kanaka/noVNC/commits/master
The are several files and projects that have been incorporated into
the noVNC core library. Here is a list of those files and the original
licenses (all MPL 2.0 compatible):
- core/base64.js : MPL 2.0
+ include/base64.js : MPL 2.0
+
+ include/des.js : Various BSD style licenses
- core/des.js : Various BSD style licenses
+ include/jsunzip.js : zlib/libpng license
- vendor/pako/ : MIT
+ include/web-socket-js/ : New BSD license (3-clause). Source code at
+ http://github.com/gimite/web-socket-js
- vendor/browser-es-module-loader: MIT
+ include/chrome-app/tcp-stream.js
+ : Apache 2.0 license
- vendor/promise.js : MIT
-
-Any other files not mentioned above are typically marked with
-a copyright/license header at the top of the file. The default noVNC
-license is MPL-2.0.
+ utils/websockify
+ utils/websocket.py : LGPL 3
The following license texts are included:
@@ -59,7 +70,6 @@ The following license texts are included:
docs/LICENSE.BSD-2-Clause (Simplified BSD / FreeBSD)
docs/LICENSE.zlib
docs/LICENSE.Apache-2.0
- vendor/pako/LICENSE (MIT)
Or alternatively the license texts may be found here:
@@ -70,4 +80,3 @@ Or alternatively the license texts may be found here:
http://en.wikipedia.org/wiki/BSD_licenses
http://www.gzip.org/zlib/zlib_license.html
http://www.apache.org/licenses/LICENSE-2.0.html
- https://opensource.org/licenses/MIT
diff --git a/README.md b/README.md
index 70a819a9..d547267d 100644
--- a/README.md
+++ b/README.md
@@ -1,45 +1,44 @@
## noVNC: HTML5 VNC Client
-[](https://travis-ci.org/novnc/noVNC)
### Description
-noVNC is a HTML5 VNC client that runs well in any modern browser including
-mobile browsers (iOS and Android).
+noVNC is a HTML5 VNC client that runs well in any modern browser
+including mobile browsers (iPhone/iPad and Android).
-Many companies, projects and products have integrated noVNC including
-[Ganeti Web Manager](http://code.osuosl.org/projects/ganeti-webmgr),
+Many companies/projects have integrated noVNC including [Ganeti Web
+Manager](http://code.osuosl.org/projects/ganeti-webmgr),
[OpenStack](http://www.openstack.org),
-[OpenNebula](http://opennebula.org/),
-[LibVNCServer](http://libvncserver.sourceforge.net), and
-[ThinLinc](https://cendio.com/thinlinc). See
-[the Projects and Companies wiki page](https://github.com/novnc/noVNC/wiki/Projects-and-companies-using-noVNC)
+[OpenNebula](http://opennebula.org/), and
+[LibVNCServer](http://libvncserver.sourceforge.net). See [the Projects
+and Companies wiki
+page](https://github.com/kanaka/noVNC/wiki/ProjectsCompanies-using-noVNC)
for a more complete list with additional info and links.
### News/help/contact
Notable commits, announcements and news are posted to
-@noVNC.
+@noVNC
-If you are a noVNC developer/integrator/user (or want to be) please join the
-
-noVNC discussion group.
+If you are a noVNC developer/integrator/user (or want to be) please
+join the noVNC
+discussion group
-Bugs and feature requests can be submitted via
-[github issues](https://github.com/novnc/noVNC/issues).
-If you are looking for a place to start contributing to noVNC, a good place to
-start would be the issues that are marked as
-["patchwelcome"](https://github.com/novnc/noVNC/issues?labels=patchwelcome).
+Bugs and feature requests can be submitted via [github
+issues](https://github.com/kanaka/noVNC/issues). If you are looking
+for a place to start contributing to noVNC, a good place to start
+would be the issues that are marked as
+["patchwelcome"](https://github.com/kanaka/noVNC/issues?labels=patchwelcome).
-If you want to show appreciation for noVNC you could donate to a great non-
-profits such as:
-[Compassion International](http://www.compassion.com/),
-[SIL](http://www.sil.org),
-[Habitat for Humanity](http://www.habitat.org),
-[Electronic Frontier Foundation](https://www.eff.org/),
-[Against Malaria Foundation](http://www.againstmalaria.com/),
-[Nothing But Nets](http://www.nothingbutnets.net/), etc.
-Please tweet @noVNC if you do.
+If you want to show appreciation for noVNC you could donate to a great
+non-profits such as: [Compassion
+International](http://www.compassion.com/), [SIL](http://www.sil.org),
+[Habitat for Humanity](http://www.habitat.org), [Electronic Frontier
+Foundation](https://www.eff.org/), [Against Malaria
+Foundation](http://www.againstmalaria.com/), [Nothing But
+Nets](http://www.nothingbutnets.net/), etc. Please tweet @noVNC if you do.
### Features
@@ -57,74 +56,63 @@ Please tweet @noVNC if you do.
### Screenshots
-Running in Firefox before and after connecting:
+Running in Chrome before and after connecting:
-
-
+
-See more screenshots
-here.
+See more screenshots here.
### Browser Requirements
-* Chrome 8, Firefox 4, Safari 6, Opera 12, IE 11, Edge 12, etc.
+* HTML5 Canvas (with createImageData): Chrome, Firefox 3.6+, iOS
+ Safari, Opera 11+, Internet Explorer 9+, etc.
-* HTML5 Canvas, WebSockets and Typed Arrays
+* HTML5 WebSockets: For browsers that do not have builtin
+ WebSockets support, the project includes
+ web-socket-js,
+ a WebSockets emulator using Adobe Flash. iOS 4.2+ has built-in
+ WebSocket support.
-* Fast Javascript Engine: this is not strictly a requirement, but without a
- fast Javascript engine, noVNC might be painfully slow.
+* Fast Javascript Engine: this is not strictly a requirement, but
+ without a fast Javascript engine, noVNC might be painfully slow.
-* See the more detailed
-[browser compatibility wiki page](https://github.com/novnc/noVNC/wiki/Browser-support).
+* See the more detailed [browser compatibility wiki page](https://github.com/kanaka/noVNC/wiki/Browser-support).
### Server Requirements
-Unless you are using a VNC server with support for WebSockets connections (such
-as [x11vnc/libvncserver](http://libvncserver.sourceforge.net/),
+Unless you are using a VNC server with support for WebSockets
+connections (such as
+[x11vnc/libvncserver](http://libvncserver.sourceforge.net/),
[QEMU](http://www.qemu.org/), or
-[MobileVNC](http://www.smartlab.at/mobilevnc/)), you need to use a
-WebSockets to TCP socket proxy. There is a python proxy included
+[PocketVNC](http://www.pocketvnc.com/blog/?page_id=866)), you need to
+use a WebSockets to TCP socket proxy. There is a python proxy included
('websockify').
### Quick Start
-* Use the launch script to start a mini-webserver and the WebSockets proxy
- (websockify). The `--vnc` option is used to specify the location of a running
- VNC server:
+* Use the launch script to start a mini-webserver and the WebSockets
+ proxy (websockify). The `--vnc` option is used to specify the location of
+ a running VNC server:
`./utils/launch.sh --vnc localhost:5901`
-* Point your browser to the cut-and-paste URL that is output by the launch
- script. Enter a password if the VNC server has one configured. Hit the
- Connect button and enjoy!
+* Point your browser to the cut-and-paste URL that is output by the
+ launch script. Enter a password if the VNC server has one
+ configured. Hit the Connect button and enjoy!
### Other Pages
-* [Modules/API](https://github.com/novnc/noVNC/wiki/Modules-API) - The library
- modules and their Javascript API.
+* [Encrypted Connections](https://github.com/kanaka/websockify/wiki/Encrypted-Connections). How to setup websockify so that you can use encrypted connections from noVNC.
-* [Integration](https://github.com/novnc/noVNC/wiki/Integration) - Get noVNC
- to work in existing projects.
+* [Advanced Usage](https://github.com/kanaka/noVNC/wiki/Advanced-usage). Starting a VNC server, advanced websockify usage, etc.
-* [Troubleshooting](https://github.com/novnc/noVNC/wiki/Troubleshooting) - How
- to troubleshoot problems.
+* [Integrating noVNC](https://github.com/kanaka/noVNC/wiki/Integration) into existing projects.
-* [Encrypted Connections](https://github.com/novnc/websockify/wiki/Encrypted-Connections) -
- Setup websockify so that you can use encrypted connections from noVNC.
-
-* [Advanced Usage](https://github.com/novnc/noVNC/wiki/Advanced-usage) -
- Generating an SSL certificate, starting a VNC server, advanced websockify
- usage, etc.
-
-* [Testing](https://github.com/novnc/noVNC/wiki/Testing) - Run and write
- tests.
-
-* [Translations](https://github.com/novnc/noVNC/wiki/Translations) - Add and
- modify localization for JavaScript and HTML.
+* [Troubleshooting noVNC](https://github.com/kanaka/noVNC/wiki/Troubleshooting) problems.
### Authors/Contributors
@@ -134,17 +122,16 @@ WebSockets to TCP socket proxy. There is a python proxy included
* [Samuel Mannehed](https://github.com/samhed) (Cendio)
* [Peter Åstrand](https://github.com/astrand) (Cendio)
* [Solly Ross](https://github.com/DirectXMan12) (Red Hat / OpenStack)
- * [Pierre Ossman](https://github.com/CendioOssman) (Cendio)
* Notable contributions:
- * UI and Icons : Pierre Ossman, Chris Gordon
+ * UI and Icons : Chris Gordon
* Original Logo : Michael Sersen
* tight encoding : Michael Tinglof (Mercuri.ca)
* Included libraries:
+ * web-socket-js : Hiroshi Ichikawa (github.com/gimite/web-socket-js)
* as3crypto : Henri Torgemane (code.google.com/p/as3crypto)
* base64 : Martijn Pieters (Digital Creations 2), Samuel Sieb (sieb.net)
+ * jsunzip : Erik Moller (github.com/operasoftware/jsunzip),
+ * tinflate : Joergen Ibsen (ibsensoftware.com)
* DES : Dave Zimmerman (Widget Workshop), Jef Poskanzer (ACME Labs)
- * Pako : Vitaly Puzrin (https://github.com/nodeca/pako)
-
-* [Contribution guide](https://github.com/novnc/noVNC/wiki/Contributing)
diff --git a/app/error-handler.js b/app/error-handler.js
deleted file mode 100644
index e5a6adbe..00000000
--- a/app/error-handler.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// NB: this should *not* be included as a module until we have
-// native support in the browsers, so that our error handler
-// can catch script-loading errors.
-
-
-(function(){
- "use strict";
-
- // Fallback for all uncought errors
- function handleError (event, err) {
- try {
- var msg = document.getElementById('noVNC_fallback_errormsg');
-
- // Only show the initial error
- if (msg.hasChildNodes()) {
- return false;
- }
-
- var div = document.createElement("div");
- div.classList.add('noVNC_message');
- div.appendChild(document.createTextNode(event.message));
- msg.appendChild(div);
-
- if (event.filename) {
- div = document.createElement("div");
- div.className = 'noVNC_location';
- var text = event.filename;
- if (event.lineno !== undefined) {
- text += ":" + event.lineno;
- if (event.colno !== undefined) {
- text += ":" + event.colno;
- }
- }
- div.appendChild(document.createTextNode(text));
- msg.appendChild(div);
- }
-
- if (err && (err.stack !== undefined)) {
- div = document.createElement("div");
- div.className = 'noVNC_stack';
- div.appendChild(document.createTextNode(err.stack));
- msg.appendChild(div);
- }
-
- document.getElementById('noVNC_fallback_error')
- .classList.add("noVNC_open");
- } catch (exc) {
- document.write("noVNC encountered an error.");
- }
- // Don't return true since this would prevent the error
- // from being printed to the browser console.
- return false;
- }
- window.addEventListener('error', function (evt) { handleError(evt, evt.error); });
- window.addEventListener('unhandledrejection', function (evt) { handleError(evt.reason, evt.reason); });
-})();
diff --git a/app/images/alt.svg b/app/images/alt.svg
deleted file mode 100644
index e5bb4612..00000000
--- a/app/images/alt.svg
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
diff --git a/app/images/clipboard.svg b/app/images/clipboard.svg
deleted file mode 100644
index 79af2752..00000000
--- a/app/images/clipboard.svg
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
diff --git a/app/images/connect.svg b/app/images/connect.svg
deleted file mode 100644
index 56cde414..00000000
--- a/app/images/connect.svg
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
diff --git a/app/images/ctrl.svg b/app/images/ctrl.svg
deleted file mode 100644
index 856e9395..00000000
--- a/app/images/ctrl.svg
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
diff --git a/app/images/ctrlaltdel.svg b/app/images/ctrlaltdel.svg
deleted file mode 100644
index d7744ea3..00000000
--- a/app/images/ctrlaltdel.svg
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
diff --git a/app/images/disconnect.svg b/app/images/disconnect.svg
deleted file mode 100644
index 6be7d187..00000000
--- a/app/images/disconnect.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
-
diff --git a/app/images/drag.svg b/app/images/drag.svg
deleted file mode 100644
index 139caf94..00000000
--- a/app/images/drag.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
diff --git a/app/images/error.svg b/app/images/error.svg
deleted file mode 100644
index 8356d3f1..00000000
--- a/app/images/error.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
diff --git a/app/images/esc.svg b/app/images/esc.svg
deleted file mode 100644
index 830152b5..00000000
--- a/app/images/esc.svg
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
diff --git a/app/images/expander.svg b/app/images/expander.svg
deleted file mode 100644
index e1635358..00000000
--- a/app/images/expander.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
diff --git a/app/images/fullscreen.svg b/app/images/fullscreen.svg
deleted file mode 100644
index 29bd05da..00000000
--- a/app/images/fullscreen.svg
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-
diff --git a/app/images/handle.svg b/app/images/handle.svg
deleted file mode 100644
index 4a7a126f..00000000
--- a/app/images/handle.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
diff --git a/app/images/handle_bg.svg b/app/images/handle_bg.svg
deleted file mode 100644
index 7579c42c..00000000
--- a/app/images/handle_bg.svg
+++ /dev/null
@@ -1,172 +0,0 @@
-
-
-
-
diff --git a/app/images/icons/Makefile b/app/images/icons/Makefile
deleted file mode 100644
index be564b43..00000000
--- a/app/images/icons/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-ICONS := \
- novnc-16x16.png \
- novnc-24x24.png \
- novnc-32x32.png \
- novnc-48x48.png \
- novnc-64x64.png
-
-ANDROID_LAUNCHER := \
- novnc-48x48.png \
- novnc-72x72.png \
- novnc-96x96.png \
- novnc-144x144.png \
- novnc-192x192.png
-
-IPHONE_LAUNCHER := \
- novnc-60x60.png \
- novnc-120x120.png
-
-IPAD_LAUNCHER := \
- novnc-76x76.png \
- novnc-152x152.png
-
-ALL_ICONS := $(ICONS) $(ANDROID_LAUNCHER) $(IPHONE_LAUNCHER) $(IPAD_LAUNCHER)
-
-all: $(ALL_ICONS)
-
-novnc-16x16.png: novnc-icon-sm.svg
- convert -density 90 \
- -background transparent "$<" "$@"
-novnc-24x24.png: novnc-icon-sm.svg
- convert -density 135 \
- -background transparent "$<" "$@"
-novnc-32x32.png: novnc-icon-sm.svg
- convert -density 180 \
- -background transparent "$<" "$@"
-
-novnc-%.png: novnc-icon.svg
- convert -density $$[`echo $* | cut -d x -f 1` * 90 / 48] \
- -background transparent "$<" "$@"
-
-clean:
- rm -f *.png
diff --git a/app/images/icons/novnc-120x120.png b/app/images/icons/novnc-120x120.png
deleted file mode 100644
index 40823efb..00000000
Binary files a/app/images/icons/novnc-120x120.png and /dev/null differ
diff --git a/app/images/icons/novnc-144x144.png b/app/images/icons/novnc-144x144.png
deleted file mode 100644
index eee71f11..00000000
Binary files a/app/images/icons/novnc-144x144.png and /dev/null differ
diff --git a/app/images/icons/novnc-152x152.png b/app/images/icons/novnc-152x152.png
deleted file mode 100644
index 0694b2de..00000000
Binary files a/app/images/icons/novnc-152x152.png and /dev/null differ
diff --git a/app/images/icons/novnc-16x16.png b/app/images/icons/novnc-16x16.png
deleted file mode 100644
index 42108f40..00000000
Binary files a/app/images/icons/novnc-16x16.png and /dev/null differ
diff --git a/app/images/icons/novnc-192x192.png b/app/images/icons/novnc-192x192.png
deleted file mode 100644
index ef9201f4..00000000
Binary files a/app/images/icons/novnc-192x192.png and /dev/null differ
diff --git a/app/images/icons/novnc-24x24.png b/app/images/icons/novnc-24x24.png
deleted file mode 100644
index 11061359..00000000
Binary files a/app/images/icons/novnc-24x24.png and /dev/null differ
diff --git a/app/images/icons/novnc-32x32.png b/app/images/icons/novnc-32x32.png
deleted file mode 100644
index ff00dc30..00000000
Binary files a/app/images/icons/novnc-32x32.png and /dev/null differ
diff --git a/app/images/icons/novnc-48x48.png b/app/images/icons/novnc-48x48.png
deleted file mode 100644
index f24cd6cc..00000000
Binary files a/app/images/icons/novnc-48x48.png and /dev/null differ
diff --git a/app/images/icons/novnc-60x60.png b/app/images/icons/novnc-60x60.png
deleted file mode 100644
index 06b0d609..00000000
Binary files a/app/images/icons/novnc-60x60.png and /dev/null differ
diff --git a/app/images/icons/novnc-64x64.png b/app/images/icons/novnc-64x64.png
deleted file mode 100644
index 6d0fb341..00000000
Binary files a/app/images/icons/novnc-64x64.png and /dev/null differ
diff --git a/app/images/icons/novnc-72x72.png b/app/images/icons/novnc-72x72.png
deleted file mode 100644
index 23163a22..00000000
Binary files a/app/images/icons/novnc-72x72.png and /dev/null differ
diff --git a/app/images/icons/novnc-76x76.png b/app/images/icons/novnc-76x76.png
deleted file mode 100644
index aef61c48..00000000
Binary files a/app/images/icons/novnc-76x76.png and /dev/null differ
diff --git a/app/images/icons/novnc-96x96.png b/app/images/icons/novnc-96x96.png
deleted file mode 100644
index 1a77c53f..00000000
Binary files a/app/images/icons/novnc-96x96.png and /dev/null differ
diff --git a/app/images/icons/novnc-icon-sm.svg b/app/images/icons/novnc-icon-sm.svg
deleted file mode 100644
index aa1c6f18..00000000
--- a/app/images/icons/novnc-icon-sm.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
diff --git a/app/images/icons/novnc-icon.svg b/app/images/icons/novnc-icon.svg
deleted file mode 100644
index 1efff912..00000000
--- a/app/images/icons/novnc-icon.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
diff --git a/app/images/info.svg b/app/images/info.svg
deleted file mode 100644
index 557b772f..00000000
--- a/app/images/info.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
diff --git a/app/images/keyboard.svg b/app/images/keyboard.svg
deleted file mode 100644
index 137b350a..00000000
--- a/app/images/keyboard.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
diff --git a/app/images/mouse_left.svg b/app/images/mouse_left.svg
deleted file mode 100644
index ce4cca41..00000000
--- a/app/images/mouse_left.svg
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
diff --git a/app/images/mouse_middle.svg b/app/images/mouse_middle.svg
deleted file mode 100644
index 6603425c..00000000
--- a/app/images/mouse_middle.svg
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
diff --git a/app/images/mouse_none.svg b/app/images/mouse_none.svg
deleted file mode 100644
index 3e0f838a..00000000
--- a/app/images/mouse_none.svg
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
diff --git a/app/images/mouse_right.svg b/app/images/mouse_right.svg
deleted file mode 100644
index f4bad767..00000000
--- a/app/images/mouse_right.svg
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
diff --git a/app/images/power.svg b/app/images/power.svg
deleted file mode 100644
index 4925d3e8..00000000
--- a/app/images/power.svg
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
diff --git a/app/images/settings.svg b/app/images/settings.svg
deleted file mode 100644
index dbb2e80a..00000000
--- a/app/images/settings.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
diff --git a/app/images/tab.svg b/app/images/tab.svg
deleted file mode 100644
index 1ccb3229..00000000
--- a/app/images/tab.svg
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
-
diff --git a/app/images/toggleextrakeys.svg b/app/images/toggleextrakeys.svg
deleted file mode 100644
index b578c0d4..00000000
--- a/app/images/toggleextrakeys.svg
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-
-
diff --git a/app/images/warning.svg b/app/images/warning.svg
deleted file mode 100644
index 7114f9b1..00000000
--- a/app/images/warning.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
diff --git a/app/locale/de.json b/app/locale/de.json
deleted file mode 100644
index 7c3177da..00000000
--- a/app/locale/de.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
- "Connecting...": "Verbinden...",
- "Connected (encrypted) to ": "Verbunden mit (verschlüsselt) ",
- "Connected (unencrypted) to ": "Verbunden mit (unverschlüsselt) ",
- "Disconnecting...": "Verbindung trennen...",
- "Disconnected": "Verbindung zum Server getrennt",
- "Must set host and port": "Richten Sie Server und Port ein",
- "Reconnecting...": "Verbindung wiederherstellen...",
- "Password is required": "Passwort ist erforderlich",
- "Forcing clipping mode since scrollbars aren't supported by IE in fullscreen": "'Clipping-Modus' aktiviert, Scrollbalken in 'IE-Vollbildmodus' werden nicht unterstützt",
- "Disconnect timeout": "Zeitüberschreitung beim Trennen",
- "noVNC encountered an error:": "Ein Fehler ist aufgetreten:",
- "Hide/Show the control bar": "Kontrollleiste verstecken/anzeigen",
- "Move/Drag Viewport": "Ansichtsfenster verschieben/ziehen",
- "viewport drag": "Ansichtsfenster ziehen",
- "Active Mouse Button": "Aktive Maustaste",
- "No mousebutton": "Keine Maustaste",
- "Left mousebutton": "Linke Maustaste",
- "Middle mousebutton": "Mittlere Maustaste",
- "Right mousebutton": "Rechte Maustaste",
- "Keyboard": "Tastatur",
- "Show Keyboard": "Tastatur anzeigen",
- "Extra keys": "Zusatztasten",
- "Show Extra Keys": "Zusatztasten anzeigen",
- "Ctrl": "Strg",
- "Toggle Ctrl": "Strg umschalten",
- "Alt": "Alt",
- "Toggle Alt": "Alt umschalten",
- "Send Tab": "Tab senden",
- "Tab": "Tab",
- "Esc": "Esc",
- "Send Escape": "Escape senden",
- "Ctrl+Alt+Del": "Strg+Alt+Entf",
- "Send Ctrl-Alt-Del": "Strg+Alt+Entf senden",
- "Shutdown/Reboot": "Herunterfahren/Neustarten",
- "Shutdown/Reboot...": "Herunterfahren/Neustarten...",
- "Power": "Energie",
- "Shutdown": "Herunterfahren",
- "Reboot": "Neustarten",
- "Reset": "Zurücksetzen",
- "Clipboard": "Zwischenablage",
- "Clear": "Löschen",
- "Fullscreen": "Vollbild",
- "Settings": "Einstellungen",
- "Shared Mode": "Geteilter Modus",
- "View Only": "Nur betrachten",
- "Clip to Window": "Auf Fenster begrenzen",
- "Scaling Mode:": "Skalierungsmodus:",
- "None": "Keiner",
- "Local Scaling": "Lokales skalieren",
- "Local Downscaling": "Lokales herunterskalieren",
- "Remote Resizing": "Serverseitiges skalieren",
- "Advanced": "Erweitert",
- "True Color": "True Color",
- "Local Cursor": "Lokaler Mauszeiger",
- "Repeater ID:": "Repeater ID:",
- "WebSocket": "WebSocket",
- "Encrypt": "Verschlüsselt",
- "Host:": "Server:",
- "Port:": "Port:",
- "Path:": "Pfad:",
- "Automatic Reconnect": "Automatisch wiederverbinden",
- "Reconnect Delay (ms):": "Wiederverbindungsverzögerung (ms):",
- "Logging:": "Protokollierung:",
- "Disconnect": "Verbindung trennen",
- "Connect": "Verbinden",
- "Password:": "Passwort:",
- "Cancel": "Abbrechen",
- "Canvas not supported.": "Canvas nicht unterstützt."
-}
\ No newline at end of file
diff --git a/app/locale/el.json b/app/locale/el.json
deleted file mode 100644
index 1bf1f845..00000000
--- a/app/locale/el.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
- "Connecting...": "Συνδέεται...",
- "Connected (encrypted) to ": "Συνδέθηκε (κρυπτογραφημένα) με το ",
- "Connected (unencrypted) to ": "Συνδέθηκε (μη κρυπτογραφημένα) με το ",
- "Disconnecting...": "Aποσυνδέεται...",
- "Disconnected": "Αποσυνδέθηκε",
- "Must set host and port": "Πρέπει να οριστεί το όνομα και η πόρτα του διακομιστή",
- "Password is required": "Απαιτείται ο κωδικός πρόσβασης",
- "Forcing clipping mode since scrollbars aren't supported by IE in fullscreen": "Εφαρμογή λειτουργίας αποκοπής αφού δεν υποστηρίζονται οι λωρίδες κύλισης σε πλήρη οθόνη στον IE",
- "Disconnect timeout": "Παρέλευση χρονικού ορίου αποσύνδεσης",
- "noVNC encountered an error:": "το noVNC αντιμετώπισε ένα σφάλμα:",
- "Hide/Show the control bar": "Απόκρυψη/Εμφάνιση γραμμής ελέγχου",
- "Move/Drag Viewport": "Μετακίνηση/Σύρσιμο Θεατού πεδίου",
- "viewport drag": "σύρσιμο θεατού πεδίου",
- "Active Mouse Button": "Ενεργό Πλήκτρο Ποντικιού",
- "No mousebutton": "Χωρίς Πλήκτρο Ποντικιού",
- "Left mousebutton": "Αριστερό Πλήκτρο Ποντικιού",
- "Middle mousebutton": "Μεσαίο Πλήκτρο Ποντικιού",
- "Right mousebutton": "Δεξί Πλήκτρο Ποντικιού",
- "Keyboard": "Πληκτρολόγιο",
- "Show Keyboard": "Εμφάνιση Πληκτρολογίου",
- "Extra keys": "Επιπλέον πλήκτρα",
- "Show Extra Keys": "Εμφάνιση Επιπλέον Πλήκτρων",
- "Ctrl": "Ctrl",
- "Toggle Ctrl": "Εναλλαγή Ctrl",
- "Alt": "Alt",
- "Toggle Alt": "Εναλλαγή Alt",
- "Send Tab": "Αποστολή Tab",
- "Tab": "Tab",
- "Esc": "Esc",
- "Send Escape": "Αποστολή Escape",
- "Ctrl+Alt+Del": "Ctrl+Alt+Del",
- "Send Ctrl-Alt-Del": "Αποστολή Ctrl-Alt-Del",
- "Shutdown/Reboot": "Κλείσιμο/Επανεκκίνηση",
- "Shutdown/Reboot...": "Κλείσιμο/Επανεκκίνηση...",
- "Power": "Απενεργοποίηση",
- "Shutdown": "Κλείσιμο",
- "Reboot": "Επανεκκίνηση",
- "Reset": "Επαναφορά",
- "Clipboard": "Πρόχειρο",
- "Clear": "Καθάρισμα",
- "Fullscreen": "Πλήρης Οθόνη",
- "Settings": "Ρυθμίσεις",
- "Encrypt": "Κρυπτογράφηση",
- "True Color": "Πραγματικά Χρώματα",
- "Local Cursor": "Τοπικός Δρομέας",
- "Clip to Window": "Αποκοπή στο όριο του Παράθυρου",
- "Shared Mode": "Κοινόχρηστη Λειτουργία",
- "View Only": "Μόνο Θέαση",
- "Path:": "Διαδρομή:",
- "Scaling Mode:": "Λειτουργία Κλιμάκωσης:",
- "None": "Καμία",
- "Local Scaling": "Τοπική Κλιμάκωση",
- "Local Downscaling": "Τοπική Συρρίκνωση",
- "Remote Resizing": "Απομακρυσμένη Αλλαγή μεγέθους",
- "Repeater ID:": "Repeater ID:",
- "Style:": "Στυλ:",
- "default": "προεπιλεγμένο",
- "Logging:": "Καταγραφή:",
- "Apply": "Εφαρμογή",
- "Connect": "Σύνδεση",
- "Disconnect": "Αποσύνδεση",
- "Connection": "Σύνδεση",
- "Host:": "Όνομα διακομιστή:",
- "Port:": "Πόρτα διακομιστή:",
- "Password:": "Κωδικός Πρόσβασης:",
- "Token:": "Διακριτικό:",
- "Send Password": "Αποστολή Κωδικού Πρόσβασης",
- "Canvas not supported.": "Δεν υποστηρίζεται το στοιχείο Canvas"
-}
diff --git a/app/locale/nl.json b/app/locale/nl.json
deleted file mode 100644
index 74e31ec3..00000000
--- a/app/locale/nl.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "Connecting...": "Verbinden...",
- "Connected (encrypted) to ": "Verbonden (versleuteld) met ",
- "Connected (unencrypted) to ": "Verbonden (onversleuteld) met ",
- "Disconnecting...": "Verbinding verbreken...",
- "Disconnected": "Verbinding verbroken",
- "Must set host and port": "Host en poort moeten worden ingesteld",
- "Password is required": "Wachtwoord is vereist",
- "Forcing clipping mode since scrollbars aren't supported by IE in fullscreen": "''Clipping mode' ingeschakeld, omdat schuifbalken in volledige-scherm-modus in IE niet worden ondersteund",
- "Disconnect timeout": "Timeout tijdens verbreken van verbinding"
-}
diff --git a/app/locale/sv.json b/app/locale/sv.json
deleted file mode 100644
index c6469564..00000000
--- a/app/locale/sv.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
- "Connecting...": "Ansluter...",
- "Connected (encrypted) to ": "Ansluten (krypterat) till ",
- "Connected (unencrypted) to ": "Ansluten (okrypterat) till ",
- "Disconnecting...": "Kopplar ner...",
- "Disconnected": "Frånkopplad",
- "Must set host and port": "Du måste specifiera en host och port",
- "Password is required": "Lösenord krävs",
- "Forcing clipping mode since scrollbars aren't supported by IE in fullscreen": "Tvingar 'Clipping mode' eftersom skrollning inte stödjs av IE i fullskärm",
- "Disconnect timeout": "Det tog för lång tid att koppla ner",
- "noVNC encountered an error:": "noVNC stötte på ett problem:",
- "Hide/Show the control bar": "Göm/Visa kontrollbaren",
- "Move/Drag Viewport": "Flytta/Dra Vyn",
- "viewport drag": "dra vy",
- "Active Mouse Button": "Aktiv musknapp",
- "No mousebutton": "Ingen musknapp",
- "Left mousebutton": "Vänster musknapp",
- "Middle mousebutton": "Mitten-musknapp",
- "Right mousebutton": "Höger musknapp",
- "Keyboard": "Tangentbord",
- "Show Keyboard": "Visa Tangentbord",
- "Extra keys": "Extraknappar",
- "Show Extra Keys": "Visa Extraknappar",
- "Ctrl": "Ctrl",
- "Toggle Ctrl": "Växla Ctrl",
- "Alt": "Alt",
- "Toggle Alt": "Växla Alt",
- "Send Tab": "Skicka Tab",
- "Tab": "Tab",
- "Esc": "Esc",
- "Send Escape": "Skicka Escape",
- "Ctrl+Alt+Del": "Ctrl+Alt+Del",
- "Send Ctrl-Alt-Del": "Skicka Ctrl-Alt-Del",
- "Shutdown/Reboot": "Stäng av/Boota om",
- "Shutdown/Reboot...": "Stäng av/Boota om...",
- "Power": "Ström",
- "Shutdown": "Stäng av",
- "Reboot": "Boota om",
- "Reset": "Återställ",
- "Clipboard": "Urklipp",
- "Clear": "Rensa",
- "Fullscreen": "Fullskärm",
- "Settings": "Inställningar",
- "Encrypt": "Kryptera",
- "True Color": "Fullfärg",
- "Local Cursor": "Lokal Muspekare",
- "Clip to Window": "Begränsa till Fönster",
- "Shared Mode": "Delat Läge",
- "View Only": "Endast Visning",
- "Path:": "Sökväg:",
- "Scaling Mode:": "Skalningsläge:",
- "None": "Ingen",
- "Local Scaling": "Lokal Skalning",
- "Local Downscaling": "Lokal Nedskalning",
- "Remote Resizing": "Ändra Storlek",
- "Repeater ID:": "Repeater-ID:",
- "Style:": "Stil:",
- "default": "standard",
- "Logging:": "Loggning:",
- "Apply": "Verkställ",
- "Connect": "Anslut",
- "Disconnect": "Koppla från",
- "Connection": "Uppkoppling",
- "Host:": "Värd:",
- "Port:": "Port:",
- "Password:": "Lösenord:",
- "Token:": "Token:",
- "Send Password": "Skicka Lösenord",
- "Canvas not supported.": "Canvas stöds ej"
-}
diff --git a/app/sounds/CREDITS b/app/sounds/CREDITS
deleted file mode 100644
index ec1fb556..00000000
--- a/app/sounds/CREDITS
+++ /dev/null
@@ -1,4 +0,0 @@
-bell
- Copyright: Dr. Richard Boulanger et al
- URL: http://www.archive.org/details/Berklee44v12
- License: CC-BY Attribution 3.0 Unported
diff --git a/app/sounds/bell.mp3 b/app/sounds/bell.mp3
deleted file mode 100644
index fdbf149a..00000000
Binary files a/app/sounds/bell.mp3 and /dev/null differ
diff --git a/app/sounds/bell.oga b/app/sounds/bell.oga
deleted file mode 100644
index 144d2b36..00000000
Binary files a/app/sounds/bell.oga and /dev/null differ
diff --git a/app/styles/base.css b/app/styles/base.css
deleted file mode 100644
index 6e42d01b..00000000
--- a/app/styles/base.css
+++ /dev/null
@@ -1,919 +0,0 @@
-/*
- * noVNC base CSS
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2016 Samuel Mannehed for Cendio AB
- * Copyright (C) 2016 Pierre Ossman 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).
- */
-
-/*
- * Z index layers:
- *
- * 0: Main screen
- * 10: Control bar
- * 50: Transition blocker
- * 60: Connection popups
- * 100: Status bar
- * ...
- * 1000: Javascript crash
- * ...
- * 10000: Max (used for polyfills)
- */
-
-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%;
- touch-action: none;
-}
-
-html {
- height:100%;
-}
-
-.noVNC_only_touch.noVNC_hidden {
- display: none;
-}
-
-.noVNC_disabled {
- color: rgb(128, 128, 128);
-}
-
-/* ----------------------------------------
- * Spinner
- * ----------------------------------------
- */
-
-.noVNC_spinner {
- position: relative;
-}
-.noVNC_spinner, .noVNC_spinner::before, .noVNC_spinner::after {
- width: 10px;
- height: 10px;
- border-radius: 2px;
- box-shadow: -60px 10px 0 rgba(255, 255, 255, 0);
- animation: noVNC_spinner 1.0s linear infinite;
-}
-.noVNC_spinner::before {
- content: "";
- position: absolute;
- left: 0px;
- top: 0px;
- animation-delay: -0.1s;
-}
-.noVNC_spinner::after {
- content: "";
- position: absolute;
- top: 0px;
- left: 0px;
- animation-delay: 0.1s;
-}
-@keyframes noVNC_spinner {
- 0% { box-shadow: -60px 10px 0 rgba(255, 255, 255, 0); width: 20px; }
- 25% { box-shadow: 20px 10px 0 rgba(255, 255, 255, 1); width: 10px; }
- 50% { box-shadow: 60px 10px 0 rgba(255, 255, 255, 0); width: 10px; }
-}
-
-/* ----------------------------------------
- * Input Elements
- * ----------------------------------------
- */
-
-input[type=input], input[type=password], input[type=number],
-input:not([type]), textarea {
- /* Disable default rendering */
- -webkit-appearance: none;
- -moz-appearance: none;
- background: none;
-
- margin: 2px;
- padding: 2px;
- border: 1px solid rgb(192, 192, 192);
- border-radius: 5px;
- color: black;
- background: linear-gradient(to top, rgb(255, 255, 255) 80%, rgb(240, 240, 240));
-}
-
-input[type=button], input[type=submit], select {
- /* Disable default rendering */
- -webkit-appearance: none;
- -moz-appearance: none;
- background: none;
-
- margin: 2px;
- padding: 2px;
- border: 1px solid rgb(192, 192, 192);
- border-bottom-width: 2px;
- border-radius: 5px;
- color: black;
- background: linear-gradient(to top, rgb(255, 255, 255), rgb(240, 240, 240));
-
- /* This avoids it jumping around when :active */
- vertical-align: middle;
-}
-
-input[type=button], input[type=submit] {
- padding-left: 20px;
- padding-right: 20px;
-}
-
-option {
- color: black;
- background: white;
-}
-
-input[type=input]:focus, input[type=password]:focus,
-input:not([type]):focus, input[type=button]:focus,
-input[type=submit]:focus,
-textarea:focus, select:focus {
- box-shadow: 0px 0px 3px rgba(74, 144, 217, 0.5);
- border-color: rgb(74, 144, 217);
- outline: none;
-}
-
-input[type=button]::-moz-focus-inner,
-input[type=submit]::-moz-focus-inner {
- border: none;
-}
-
-input[type=input]:disabled, input[type=password]:disabled,
-input:not([type]):disabled, input[type=button]:disabled,
-input[type=submit]:disabled, input[type=number]:disabled,
-textarea:disabled, select:disabled {
- color: rgb(128, 128, 128);
- background: rgb(240, 240, 240);
-}
-
-input[type=button]:active, input[type=submit]:active,
-select:active {
- border-bottom-width: 1px;
- margin-top: 3px;
-}
-
-:root:not(.noVNC_touch) input[type=button]:hover:not(:disabled),
-:root:not(.noVNC_touch) input[type=submit]:hover:not(:disabled),
-:root:not(.noVNC_touch) select:hover:not(:disabled) {
- background: linear-gradient(to top, rgb(255, 255, 255), rgb(250, 250, 250));
-}
-
-/* ----------------------------------------
- * WebKit centering hacks
- * ----------------------------------------
- */
-
-.noVNC_center {
- /*
- * This is a workaround because webkit misrenders transforms and
- * uses non-integer coordinates, resulting in blurry content.
- * Ideally we'd use "top: 50%; transform: translateY(-50%);" on
- * the objects instead.
- */
- display: flex;
- align-items: center;
- justify-content: center;
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- pointer-events: none;
-}
-.noVNC_center > * {
- pointer-events: auto;
-}
-.noVNC_vcenter {
- display: flex;
- flex-direction: column;
- justify-content: center;
- position: fixed;
- top: 0;
- left: 0;
- height: 100%;
- pointer-events: none;
-}
-.noVNC_vcenter > * {
- pointer-events: auto;
-}
-
-/* ----------------------------------------
- * Layering
- * ----------------------------------------
- */
-
-.noVNC_connect_layer {
- z-index: 60;
-}
-
-/* ----------------------------------------
- * Fallback error
- * ----------------------------------------
- */
-
-#noVNC_fallback_error {
- z-index: 1000;
- visibility: hidden;
-}
-#noVNC_fallback_error.noVNC_open {
- visibility: visible;
-}
-
-#noVNC_fallback_error > div {
- max-width: 90%;
- padding: 15px;
-
- transition: 0.5s ease-in-out;
-
- transform: translateY(-50px);
- opacity: 0;
-
- text-align: center;
- font-weight: bold;
- color: #fff;
-
- border-radius: 10px;
- box-shadow: 6px 6px 0px rgba(0, 0, 0, 0.5);
- background: rgba(200,55,55,0.8);
-}
-#noVNC_fallback_error.noVNC_open > div {
- transform: translateY(0);
- opacity: 1;
-}
-
-#noVNC_fallback_errormsg {
- font-weight: normal;
-}
-
-#noVNC_fallback_errormsg .noVNC_message {
- display: inline-block;
- text-align: left;
- font-family: monospace;
- white-space: pre-wrap;
-}
-
-#noVNC_fallback_error .noVNC_location {
- font-style: italic;
- font-size: 0.8em;
- color: rgba(255, 255, 255, 0.8);
-}
-
-#noVNC_fallback_error .noVNC_stack {
- max-height: 50vh;
- padding: 10px;
- margin: 10px;
- font-size: 0.8em;
- text-align: left;
- font-family: monospace;
- white-space: pre;
- border: 1px solid rgba(0, 0, 0, 0.5);
- background: rgba(0, 0, 0, 0.2);
- overflow: auto;
-}
-
-/* ----------------------------------------
- * Control Bar
- * ----------------------------------------
- */
-
-#noVNC_control_bar_anchor {
- /* The anchor is needed to get z-stacking to work */
- position: fixed;
- z-index: 10;
-
- transition: 0.5s ease-in-out;
-
- /* Edge misrenders animations wihthout this */
- transform: translateX(0);
-}
-:root.noVNC_connected #noVNC_control_bar_anchor.noVNC_idle {
- opacity: 0.8;
-}
-#noVNC_control_bar_anchor.noVNC_right {
- left: auto;
- right: 0;
-}
-
-#noVNC_control_bar {
- position: relative;
- left: -100%;
-
- transition: 0.5s ease-in-out;
-
- background-color: rgb(110, 132, 163);
- border-radius: 0 10px 10px 0;
-
-}
-#noVNC_control_bar.noVNC_open {
- box-shadow: 6px 6px 0px rgba(0, 0, 0, 0.5);
- left: 0;
-}
-#noVNC_control_bar::before {
- /* This extra element is to get a proper shadow */
- content: "";
- position: absolute;
- z-index: -1;
- height: 100%;
- width: 30px;
- left: -30px;
- transition: box-shadow 0.5s ease-in-out;
-}
-#noVNC_control_bar.noVNC_open::before {
- box-shadow: 6px 6px 0px rgba(0, 0, 0, 0.5);
-}
-.noVNC_right #noVNC_control_bar {
- left: 100%;
- border-radius: 10px 0 0 10px;
-}
-.noVNC_right #noVNC_control_bar.noVNC_open {
- left: 0;
-}
-.noVNC_right #noVNC_control_bar::before {
- visibility: hidden;
-}
-
-#noVNC_control_bar_handle {
- position: absolute;
- left: -15px;
- top: 0;
- transform: translateY(35px);
- width: calc(100% + 30px);
- height: 50px;
- z-index: -1;
- cursor: pointer;
- border-radius: 5px;
- background-color: rgb(83, 99, 122);
- background-image: url("../images/handle_bg.svg");
- background-repeat: no-repeat;
- background-position: right;
- box-shadow: 3px 3px 0px rgba(0, 0, 0, 0.5);
-}
-#noVNC_control_bar_handle:after {
- content: "";
- transition: transform 0.5s ease-in-out;
- background: url("../images/handle.svg");
- position: absolute;
- top: 22px; /* (50px-6px)/2 */
- right: 5px;
- width: 5px;
- height: 6px;
-}
-#noVNC_control_bar.noVNC_open #noVNC_control_bar_handle:after {
- transform: translateX(1px) rotate(180deg);
-}
-:root:not(.noVNC_connected) #noVNC_control_bar_handle {
- display: none;
-}
-.noVNC_right #noVNC_control_bar_handle {
- background-position: left;
-}
-.noVNC_right #noVNC_control_bar_handle:after {
- left: 5px;
- right: 0;
- transform: translateX(1px) rotate(180deg);
-}
-.noVNC_right #noVNC_control_bar.noVNC_open #noVNC_control_bar_handle:after {
- transform: none;
-}
-#noVNC_control_bar_handle div {
- position: absolute;
- right: -35px;
- top: 0;
- width: 50px;
- height: 50px;
-}
-:root:not(.noVNC_touch) #noVNC_control_bar_handle div {
- display: none;
-}
-.noVNC_right #noVNC_control_bar_handle div {
- left: -35px;
- right: auto;
-}
-
-#noVNC_control_bar .noVNC_scroll {
- max-height: 100vh; /* Chrome is buggy with 100% */
- overflow-x: hidden;
- overflow-y: auto;
- padding: 0 10px 0 5px;
-}
-.noVNC_right #noVNC_control_bar .noVNC_scroll {
- padding: 0 5px 0 10px;
-}
-
-/* Control bar hint */
-#noVNC_control_bar_hint {
- position: fixed;
- left: calc(100vw - 50px);
- right: auto;
- top: 50%;
- transform: translateY(-50%) scale(0);
- width: 100px;
- height: 50%;
- max-height: 600px;
-
- visibility: hidden;
- opacity: 0;
- transition: 0.2s ease-in-out;
- background: transparent;
- box-shadow: 0 0 10px black, inset 0 0 10px 10px rgba(110, 132, 163, 0.8);
- border-radius: 10px;
- transition-delay: 0s;
-}
-#noVNC_control_bar_anchor.noVNC_right #noVNC_control_bar_hint{
- left: auto;
- right: calc(100vw - 50px);
-}
-#noVNC_control_bar_hint.noVNC_active {
- visibility: visible;
- opacity: 1;
- transition-delay: 0.2s;
- transform: translateY(-50%) scale(1);
-}
-
-/* General button style */
-.noVNC_button {
- display: block;
- padding: 4px 4px;
- margin: 10px 0;
- vertical-align: middle;
- border:1px solid rgba(255, 255, 255, 0.2);
- border-radius: 6px;
-}
-.noVNC_button.noVNC_selected {
- border-color: rgba(0, 0, 0, 0.8);
- background: rgba(0, 0, 0, 0.5);
-}
-.noVNC_button:disabled {
- opacity: 0.4;
-}
-.noVNC_button:focus {
- outline: none;
-}
-.noVNC_button:active {
- padding-top: 5px;
- padding-bottom: 3px;
-}
-:root:not(.noVNC_touch) .noVNC_button.noVNC_selected:hover {
- border-color: rgba(0, 0, 0, 0.4);
- background: rgba(0, 0, 0, 0.2);
-}
-:root:not(.noVNC_touch) .noVNC_button:hover {
- background: rgba(255, 255, 255, 0.2);
-}
-.noVNC_button.noVNC_hidden {
- display: none;
-}
-
-/* Panels */
-.noVNC_panel {
- transform: translateX(25px);
-
- transition: 0.5s ease-in-out;
-
- max-height: 100vh; /* Chrome is buggy with 100% */
- overflow-x: hidden;
- overflow-y: auto;
-
- visibility: hidden;
- opacity: 0;
-
- padding: 15px;
-
- background: #fff;
- border-radius: 10px;
- color: #000;
- border: 2px solid #E0E0E0;
- box-shadow: 6px 6px 0px rgba(0, 0, 0, 0.5);
-}
-.noVNC_panel.noVNC_open {
- visibility: visible;
- opacity: 1;
- transform: translateX(75px);
-}
-.noVNC_right .noVNC_vcenter {
- left: auto;
- right: 0;
-}
-.noVNC_right .noVNC_panel {
- transform: translateX(-25px);
-}
-.noVNC_right .noVNC_panel.noVNC_open {
- transform: translateX(-75px);
-}
-
-.noVNC_panel hr {
- border: none;
- border-top: 1px solid rgb(192, 192, 192);
-}
-
-.noVNC_panel label {
- display: block;
- white-space: nowrap;
-}
-
-.noVNC_panel .noVNC_heading {
- background-color: rgb(110, 132, 163);
- border-radius: 5px;
- padding: 5px;
- /* Compensate for padding in image */
- padding-right: 8px;
- color: white;
- font-size: 20px;
- margin-bottom: 10px;
- white-space: nowrap;
-}
-.noVNC_panel .noVNC_heading img {
- vertical-align: bottom;
-}
-
-.noVNC_submit {
- float: right;
-}
-
-/* Expanders */
-.noVNC_expander {
- cursor: pointer;
-}
-.noVNC_expander::before {
- content: url("../images/expander.svg");
- display: inline-block;
- margin-right: 5px;
- transition: 0.2s ease-in-out;
-}
-.noVNC_expander.noVNC_open::before {
- transform: rotateZ(90deg);
-}
-.noVNC_expander ~ * {
- margin: 5px;
- margin-left: 10px;
- padding: 5px;
- background: rgba(0, 0, 0, 0.05);
- border-radius: 5px;
-}
-.noVNC_expander:not(.noVNC_open) ~ * {
- display: none;
-}
-
-/* Control bar content */
-
-#noVNC_control_bar .noVNC_logo {
- font-size: 13px;
-}
-
-:root:not(.noVNC_connected) #noVNC_view_drag_button {
- display: none;
-}
-
-/* noVNC Touch Device only buttons */
-:root:not(.noVNC_connected) #noVNC_mobile_buttons {
- display: none;
-}
-:root:not(.noVNC_touch) #noVNC_mobile_buttons {
- display: none;
-}
-
-/* Extra manual keys */
-:root:not(.noVNC_connected) #noVNC_extra_keys {
- display: none;
-}
-
-#noVNC_modifiers {
- background-color: rgb(92, 92, 92);
- border: none;
- padding: 0 10px;
-}
-
-/* XVP Shutdown/Reboot */
-:root:not(.noVNC_connected) #noVNC_xvp_button {
- display: none;
-}
-#noVNC_xvp {
-}
-#noVNC_xvp_buttons {
- display: none;
-}
-
-#noVNC_xvp input[type=button] {
- width: 100%;
-}
-
-/* Clipboard */
-:root:not(.noVNC_connected) #noVNC_clipboard_button {
- display: none;
-}
-#noVNC_clipboard {
- /* Full screen, minus padding and left and right margins */
- max-width: calc(100vw - 2*15px - 75px - 25px);
-}
-#noVNC_clipboard_text {
- width: 500px;
- max-width: 100%;
-}
-
-/* Settings */
-#noVNC_settings {
-}
-#noVNC_settings ul {
- list-style: none;
- margin: 0px;
- padding: 0px;
-}
-#noVNC_setting_port {
- width: 80px;
-}
-#noVNC_setting_path {
- width: 100px;
-}
-
-/* Connection Controls */
-:root:not(.noVNC_connected) #noVNC_disconnect_button {
- display: none;
-}
-
-/* ----------------------------------------
- * Status Dialog
- * ----------------------------------------
- */
-
-#noVNC_status {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- z-index: 100;
- transform: translateY(-100%);
-
- cursor: pointer;
-
- transition: 0.5s ease-in-out;
-
- visibility: hidden;
- opacity: 0;
-
- padding: 5px;
-
- display: flex;
- flex-direction: row;
- justify-content: center;
- align-content: center;
-
- line-height: 25px;
- word-wrap: break-word;
- color: #fff;
-
- border-bottom: 1px solid rgba(0, 0, 0, 0.9);
-}
-#noVNC_status.noVNC_open {
- transform: translateY(0);
- visibility: visible;
- opacity: 1;
-}
-
-#noVNC_status::before {
- content: "";
- display: inline-block;
- width: 25px;
- height: 25px;
- margin-right: 5px;
-}
-
-#noVNC_status.noVNC_status_normal {
- background: rgba(128,128,128,0.9);
-}
-#noVNC_status.noVNC_status_normal::before {
- content: url("../images/info.svg") " ";
-}
-#noVNC_status.noVNC_status_error {
- background: rgba(200,55,55,0.9);
-}
-#noVNC_status.noVNC_status_error::before {
- content: url("../images/error.svg") " ";
-}
-#noVNC_status.noVNC_status_warn {
- background: rgba(180,180,30,0.9);
-}
-#noVNC_status.noVNC_status_warn::before {
- content: url("../images/warning.svg") " ";
-}
-
-/* ----------------------------------------
- * Connect Dialog
- * ----------------------------------------
- */
-
-#noVNC_connect_dlg {
- transition: 0.5s ease-in-out;
-
- transform: scale(0, 0);
- visibility: hidden;
- opacity: 0;
-}
-#noVNC_connect_dlg.noVNC_open {
- transform: scale(1, 1);
- visibility: visible;
- opacity: 1;
-}
-#noVNC_connect_dlg .noVNC_logo {
- transition: 0.5s ease-in-out;
- padding: 10px;
- margin-bottom: 10px;
-
- font-size: 80px;
- text-align: center;
-
- border-radius: 5px;
-}
-@media (max-width: 440px) {
- #noVNC_connect_dlg {
- max-width: calc(100vw - 100px);
- }
- #noVNC_connect_dlg .noVNC_logo {
- font-size: calc(25vw - 30px);
- }
-}
-#noVNC_connect_button {
- cursor: pointer;
-
- padding: 10px;
-
- color: white;
- background-color: rgb(110, 132, 163);
- border-radius: 12px;
-
- text-align: center;
- font-size: 20px;
-
- box-shadow: 6px 6px 0px rgba(0, 0, 0, 0.5);
-}
-#noVNC_connect_button div {
- margin: 2px;
- padding: 5px 30px;
- border: 1px solid rgb(83, 99, 122);
- border-bottom-width: 2px;
- border-radius: 5px;
- background: linear-gradient(to top, rgb(110, 132, 163), rgb(99, 119, 147));
-
- /* This avoids it jumping around when :active */
- vertical-align: middle;
-}
-#noVNC_connect_button div:active {
- border-bottom-width: 1px;
- margin-top: 3px;
-}
-:root:not(.noVNC_touch) #noVNC_connect_button div:hover {
- background: linear-gradient(to top, rgb(110, 132, 163), rgb(105, 125, 155));
-}
-
-#noVNC_connect_button img {
- vertical-align: bottom;
- height: 1.3em;
-}
-
-/* ----------------------------------------
- * Password Dialog
- * ----------------------------------------
- */
-
-#noVNC_password_dlg {
- position: relative;
-
- transform: translateY(-50px);
-}
-#noVNC_password_dlg.noVNC_open {
- transform: translateY(0);
-}
-#noVNC_password_dlg ul {
- list-style: none;
- margin: 0px;
- padding: 0px;
-}
-
-/* ----------------------------------------
- * Main Area
- * ----------------------------------------
- */
-
-/* Transition screen */
-#noVNC_transition {
- display: none;
-
- position: fixed;
- top: 0;
- left: 0;
- bottom: 0;
- right: 0;
-
- color: white;
- background: rgba(0, 0, 0, 0.5);
- z-index: 50;
-
- /*display: flex;*/
- align-items: center;
- justify-content: center;
- flex-direction: column;
-}
-:root.noVNC_loading #noVNC_transition,
-:root.noVNC_connecting #noVNC_transition,
-:root.noVNC_disconnecting #noVNC_transition,
-:root.noVNC_reconnecting #noVNC_transition {
- display: flex;
-}
-:root:not(.noVNC_reconnecting) #noVNC_cancel_reconnect_button {
- display: none;
-}
-#noVNC_transition_text {
- font-size: 1.5em;
-}
-
-/* Main container */
-#noVNC_container {
- width: 100%;
- height: 100%;
- background-color: #313131;
- border-bottom-right-radius: 800px 600px;
- /*border-top-left-radius: 800px 600px;*/
-}
-
-#noVNC_keyboardinput {
- width: 1px;
- height: 1px;
- background-color: #fff;
- color: #fff;
- border: 0;
- position: absolute;
- left: -40px;
- z-index: -1;
- ime-mode: disabled;
-}
-
-/* HTML5 Canvas */
-#noVNC_screen {
- display: flex;
- width: 100%;
- height: 100%;
- overflow: auto;
- background-color: rgb(40, 40, 40);
-}
-:root:not(.noVNC_connected) #noVNC_screen {
- display: none;
-}
-
-/* Do not set width/height for VNC_canvas or incorrect
- * scaling will occur. Canvas size depends on remote VNC
- * settings and noVNC settings. */
-#noVNC_canvas {
- margin: auto;
- /* IE miscalculates width without this :( */
- flex-shrink: 0;
-}
-
-/*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 {
- color:yellow;
- font-family: 'Orbitron', 'OrbitronTTF', sans-serif;
- line-height:90%;
- text-shadow: 0.1em 0.1em 0 black;
-}
-.noVNC_logo span{
- color:green;
-}
-
-#noVNC_bell {
- display: none;
-}
-
-/* ----------------------------------------
- * Media sizing
- * ----------------------------------------
- */
-
-@media screen and (max-width: 640px){
- #noVNC_logo {
- font-size: 150px;
- }
-}
-
-@media screen and (min-width: 321px) and (max-width: 480px) {
- #noVNC_logo {
- font-size: 110px;
- }
-}
-
-@media screen and (max-width: 320px) {
- #noVNC_logo {
- font-size: 90px;
- }
-}
diff --git a/app/styles/lite.css b/app/styles/lite.css
deleted file mode 100644
index 50f9a822..00000000
--- a/app/styles/lite.css
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * noVNC auto CSS
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2016 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_container {
- display: table;
- width:100%;
- height:100%;
- background-color:#313131;
- border-bottom-right-radius: 800px 600px;
- /*border-top-left-radius: 800px 600px;*/
-}
-
-#noVNC_status {
- font-size: 12px;
- padding-top: 4px;
- height:32px;
- text-align: center;
- font-weight: bold;
- color: #fff;
- z-index: 0;
- position: absolute;
- width: 100%;
- margin-left: 0px;
-}
-
-.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 */
-}
-
-#noVNC_buttons {
- white-space: nowrap;
-}
-
-/* Do not set width/height for VNC_canvas or incorrect
- * scaling will occur. Canvas size depends on remote VNC
- * settings and noVNC settings. */
-#noVNC_canvas {
- position: absolute;
- left: 0;
- right: 0;
- margin-left: auto;
- margin-right: auto;
-}
diff --git a/app/ui.js b/app/ui.js
deleted file mode 100644
index 11705a09..00000000
--- a/app/ui.js
+++ /dev/null
@@ -1,1743 +0,0 @@
-/*
- * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2016 Samuel Mannehed for Cendio AB
- * Copyright (C) 2016 Pierre Ossman 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, document.getElementById, Util, WebUtil, RFB, Display */
-
-import * as Log from '../core/util/logging.js';
-import _, { l10n } from '../core/util/localization.js';
-import { isTouchDevice, browserSupportsCursorURIs as cursorURIsSupported } from '../core/util/browsers.js';
-import { setCapture, getPointerEvent } from '../core/util/events.js';
-import KeyTable from "../core/input/keysym.js";
-import keysyms from "../core/input/keysymdef.js";
-import RFB from "../core/rfb.js";
-import Display from "../core/display.js";
-import * as WebUtil from "./webutil.js";
-
-var UI = {
-
- connected: false,
- desktopName: "",
-
- resizeTimeout: null,
- statusTimeout: null,
- hideKeyboardTimeout: null,
- idleControlbarTimeout: null,
- closeControlbarTimeout: null,
-
- controlbarGrabbed: false,
- controlbarDrag: false,
- controlbarMouseDownClientY: 0,
- controlbarMouseDownOffsetY: 0,
-
- isSafari: false,
- rememberedClipSetting: null,
- lastKeyboardinput: null,
- defaultKeyboardinputLen: 100,
-
- inhibit_reconnect: true,
- reconnect_callback: null,
- reconnect_password: null,
-
- prime: function(callback) {
- if (document.readyState === "interactive" || document.readyState === "complete") {
- UI.load(callback);
- } else {
- document.addEventListener('DOMContentLoaded', UI.load.bind(UI, callback));
- }
- },
-
- // 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) {
-
- // Setup global variables first
- UI.isSafari = (navigator.userAgent.indexOf('Safari') !== -1 &&
- navigator.userAgent.indexOf('Chrome') === -1);
-
- UI.initSettings();
-
- // Translate the DOM
- l10n.translateDOM();
-
- // Adapt the interface for touch screen devices
- if (isTouchDevice) {
- document.documentElement.classList.add("noVNC_touch");
- // Remove the address bar
- setTimeout(function() { window.scrollTo(0, 1); }, 100);
- }
-
- // Restore control bar position
- if (WebUtil.readSetting('controlbar_pos') === 'right') {
- UI.toggleControlbarSide();
- }
-
- UI.initFullscreen();
-
- // Setup event handlers
- UI.addResizeHandlers();
- UI.addControlbarHandlers();
- UI.addTouchSpecificHandlers();
- UI.addExtraKeysHandlers();
- UI.addXvpHandlers();
- UI.addConnectionControlHandlers();
- UI.addClipboardHandlers();
- UI.addSettingsHandlers();
- document.getElementById("noVNC_status")
- .addEventListener('click', UI.hideStatus);
-
- // Bootstrap fallback input handler
- UI.keyboardinputReset();
-
- UI.openControlbar();
-
- // Show the connect panel on first load unless autoconnecting
- if (!autoconnect) {
- UI.openConnectPanel();
- }
-
- UI.updateViewClip();
-
- UI.updateVisualState();
-
- document.getElementById('noVNC_setting_host').focus();
- document.documentElement.classList.remove("noVNC_loading");
-
- var autoconnect = WebUtil.getConfigVar('autoconnect', false);
- if (autoconnect === 'true' || autoconnect == '1') {
- autoconnect = true;
- UI.connect();
- } else {
- autoconnect = false;
- }
-
- if (typeof callback === "function") {
- callback(UI.rfb);
- }
- },
-
- initFullscreen: function() {
- // Only show the button if fullscreen is properly supported
- // * Safari doesn't support alphanumerical input while in fullscreen
- if (!UI.isSafari &&
- (document.documentElement.requestFullscreen ||
- document.documentElement.mozRequestFullScreen ||
- document.documentElement.webkitRequestFullscreen ||
- document.body.msRequestFullscreen)) {
- document.getElementById('noVNC_fullscreen_button')
- .classList.remove("noVNC_hidden");
- UI.addFullscreenHandlers();
- }
- },
-
- initSettings: function() {
- var i;
-
- // Logging selection dropdown
- var llevels = ['error', 'warn', 'info', 'debug'];
- for (i = 0; i < llevels.length; i += 1) {
- UI.addOption(document.getElementById('noVNC_setting_logging'),llevels[i], llevels[i]);
- }
-
- // Settings with immediate effects
- UI.initSetting('logging', 'warn');
- UI.updateLogging();
-
- // 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('encrypt', (window.location.protocol === "https:"));
- UI.initSetting('cursor', !isTouchDevice);
- UI.initSetting('clip', false);
- UI.initSetting('resize', 'off');
- UI.initSetting('shared', true);
- UI.initSetting('view_only', false);
- UI.initSetting('path', 'websockify');
- UI.initSetting('repeaterID', '');
- UI.initSetting('reconnect', false);
- UI.initSetting('reconnect_delay', 5000);
-
- UI.setupSettingLabels();
- },
- // Adds a link to the label elements on the corresponding input elements
- setupSettingLabels: function() {
- var labels = document.getElementsByTagName('LABEL');
- for (var i = 0; i < labels.length; i++) {
- var htmlFor = labels[i].htmlFor;
- if (htmlFor != '') {
- var elem = document.getElementById(htmlFor);
- if (elem) elem.label = labels[i];
- } else {
- // If 'for' isn't set, use the first input element child
- var children = labels[i].children;
- for (var j = 0; j < children.length; j++) {
- if (children[j].form !== undefined) {
- children[j].label = labels[i];
- break;
- }
- }
- }
- }
- },
-
- initRFB: function() {
- try {
- UI.rfb = new RFB({'target': document.getElementById('noVNC_canvas'),
- 'onNotification': UI.notification,
- 'onUpdateState': UI.updateState,
- 'onDisconnected': UI.disconnectFinished,
- 'onPasswordRequired': UI.passwordRequired,
- 'onXvpInit': UI.updateXvpButton,
- 'onClipboard': UI.clipboardReceive,
- 'onBell': UI.bell,
- 'onFBUComplete': UI.initialResize,
- 'onFBResize': UI.updateSessionSize,
- 'onDesktopName': UI.updateDesktopName});
- return true;
- } catch (exc) {
- var msg = "Unable to create RFB client -- " + exc;
- Log.Error(msg);
- UI.showStatus(msg, 'error');
- return false;
- }
- },
-
-/* ------^-------
-* /INIT
-* ==============
-* EVENT HANDLERS
-* ------v------*/
-
- addResizeHandlers: function() {
- window.addEventListener('resize', UI.applyResizeMode);
- window.addEventListener('resize', UI.updateViewClip);
- },
-
- addControlbarHandlers: function() {
- document.getElementById("noVNC_control_bar")
- .addEventListener('mousemove', UI.activateControlbar);
- document.getElementById("noVNC_control_bar")
- .addEventListener('mouseup', UI.activateControlbar);
- document.getElementById("noVNC_control_bar")
- .addEventListener('mousedown', UI.activateControlbar);
- document.getElementById("noVNC_control_bar")
- .addEventListener('keypress', UI.activateControlbar);
-
- document.getElementById("noVNC_control_bar")
- .addEventListener('mousedown', UI.keepControlbar);
- document.getElementById("noVNC_control_bar")
- .addEventListener('keypress', UI.keepControlbar);
-
- document.getElementById("noVNC_view_drag_button")
- .addEventListener('click', UI.toggleViewDrag);
-
- document.getElementById("noVNC_control_bar_handle")
- .addEventListener('mousedown', UI.controlbarHandleMouseDown);
- document.getElementById("noVNC_control_bar_handle")
- .addEventListener('mouseup', UI.controlbarHandleMouseUp);
- document.getElementById("noVNC_control_bar_handle")
- .addEventListener('mousemove', UI.dragControlbarHandle);
- // resize events aren't available for elements
- window.addEventListener('resize', UI.updateControlbarHandle);
-
- var exps = document.getElementsByClassName("noVNC_expander");
- for (var i = 0;i < exps.length;i++) {
- exps[i].addEventListener('click', UI.toggleExpander);
- }
- },
-
- addTouchSpecificHandlers: function() {
- document.getElementById("noVNC_mouse_button0")
- .addEventListener('click', function () { UI.setMouseButton(1); });
- document.getElementById("noVNC_mouse_button1")
- .addEventListener('click', function () { UI.setMouseButton(2); });
- document.getElementById("noVNC_mouse_button2")
- .addEventListener('click', function () { UI.setMouseButton(4); });
- document.getElementById("noVNC_mouse_button4")
- .addEventListener('click', function () { UI.setMouseButton(0); });
- document.getElementById("noVNC_keyboard_button")
- .addEventListener('click', UI.toggleVirtualKeyboard);
-
- document.getElementById("noVNC_keyboardinput")
- .addEventListener('input', UI.keyInput);
- document.getElementById("noVNC_keyboardinput")
- .addEventListener('focus', UI.onfocusVirtualKeyboard);
- document.getElementById("noVNC_keyboardinput")
- .addEventListener('blur', UI.onblurVirtualKeyboard);
- document.getElementById("noVNC_keyboardinput")
- .addEventListener('submit', function () { return false; });
-
- document.documentElement
- .addEventListener('mousedown', UI.keepVirtualKeyboard, true);
-
- document.getElementById("noVNC_control_bar")
- .addEventListener('touchstart', UI.activateControlbar);
- document.getElementById("noVNC_control_bar")
- .addEventListener('touchmove', UI.activateControlbar);
- document.getElementById("noVNC_control_bar")
- .addEventListener('touchend', UI.activateControlbar);
- document.getElementById("noVNC_control_bar")
- .addEventListener('input', UI.activateControlbar);
-
- document.getElementById("noVNC_control_bar")
- .addEventListener('touchstart', UI.keepControlbar);
- document.getElementById("noVNC_control_bar")
- .addEventListener('input', UI.keepControlbar);
-
- document.getElementById("noVNC_control_bar_handle")
- .addEventListener('touchstart', UI.controlbarHandleMouseDown);
- document.getElementById("noVNC_control_bar_handle")
- .addEventListener('touchend', UI.controlbarHandleMouseUp);
- document.getElementById("noVNC_control_bar_handle")
- .addEventListener('touchmove', UI.dragControlbarHandle);
- },
-
- addExtraKeysHandlers: function() {
- document.getElementById("noVNC_toggle_extra_keys_button")
- .addEventListener('click', UI.toggleExtraKeys);
- document.getElementById("noVNC_toggle_ctrl_button")
- .addEventListener('click', UI.toggleCtrl);
- document.getElementById("noVNC_toggle_alt_button")
- .addEventListener('click', UI.toggleAlt);
- document.getElementById("noVNC_send_tab_button")
- .addEventListener('click', UI.sendTab);
- document.getElementById("noVNC_send_esc_button")
- .addEventListener('click', UI.sendEsc);
- document.getElementById("noVNC_send_ctrl_alt_del_button")
- .addEventListener('click', UI.sendCtrlAltDel);
- },
-
- addXvpHandlers: function() {
- document.getElementById("noVNC_xvp_shutdown_button")
- .addEventListener('click', function() { UI.rfb.xvpShutdown(); });
- document.getElementById("noVNC_xvp_reboot_button")
- .addEventListener('click', function() { UI.rfb.xvpReboot(); });
- document.getElementById("noVNC_xvp_reset_button")
- .addEventListener('click', function() { UI.rfb.xvpReset(); });
- document.getElementById("noVNC_xvp_button")
- .addEventListener('click', UI.toggleXvpPanel);
- },
-
- addConnectionControlHandlers: function() {
- document.getElementById("noVNC_disconnect_button")
- .addEventListener('click', UI.disconnect);
- document.getElementById("noVNC_connect_button")
- .addEventListener('click', UI.connect);
- document.getElementById("noVNC_cancel_reconnect_button")
- .addEventListener('click', UI.cancelReconnect);
-
- document.getElementById("noVNC_password_button")
- .addEventListener('click', UI.setPassword);
- },
-
- addClipboardHandlers: function() {
- document.getElementById("noVNC_clipboard_button")
- .addEventListener('click', UI.toggleClipboardPanel);
- document.getElementById("noVNC_clipboard_text")
- .addEventListener('focus', UI.displayBlur);
- document.getElementById("noVNC_clipboard_text")
- .addEventListener('blur', UI.displayFocus);
- document.getElementById("noVNC_clipboard_text")
- .addEventListener('change', UI.clipboardSend);
- document.getElementById("noVNC_clipboard_clear_button")
- .addEventListener('click', UI.clipboardClear);
- },
-
- // Add a call to save settings when the element changes,
- // unless the optional parameter changeFunc is used instead.
- addSettingChangeHandler: function(name, changeFunc) {
- var settingElem = document.getElementById("noVNC_setting_" + name);
- if (changeFunc === undefined) {
- changeFunc = function () { UI.saveSetting(name); };
- }
- settingElem.addEventListener('change', changeFunc);
- },
-
- addSettingsHandlers: function() {
- document.getElementById("noVNC_settings_button")
- .addEventListener('click', UI.toggleSettingsPanel);
-
- UI.addSettingChangeHandler('encrypt');
- UI.addSettingChangeHandler('cursor');
- UI.addSettingChangeHandler('cursor', UI.updateLocalCursor);
- UI.addSettingChangeHandler('resize');
- UI.addSettingChangeHandler('resize', UI.enableDisableViewClip);
- UI.addSettingChangeHandler('resize', UI.applyResizeMode);
- UI.addSettingChangeHandler('clip');
- UI.addSettingChangeHandler('clip', UI.updateViewClip);
- UI.addSettingChangeHandler('shared');
- UI.addSettingChangeHandler('view_only');
- UI.addSettingChangeHandler('view_only', UI.updateViewOnly);
- UI.addSettingChangeHandler('host');
- UI.addSettingChangeHandler('port');
- UI.addSettingChangeHandler('path');
- UI.addSettingChangeHandler('repeaterID');
- UI.addSettingChangeHandler('logging');
- UI.addSettingChangeHandler('logging', UI.updateLogging);
- UI.addSettingChangeHandler('reconnect');
- UI.addSettingChangeHandler('reconnect_delay');
- },
-
- addFullscreenHandlers: function() {
- document.getElementById("noVNC_fullscreen_button")
- .addEventListener('click', UI.toggleFullscreen);
-
- window.addEventListener('fullscreenchange', UI.updateFullscreenButton);
- window.addEventListener('mozfullscreenchange', UI.updateFullscreenButton);
- window.addEventListener('webkitfullscreenchange', UI.updateFullscreenButton);
- window.addEventListener('msfullscreenchange', UI.updateFullscreenButton);
- },
-
-/* ------^-------
- * /EVENT HANDLERS
- * ==============
- * VISUAL
- * ------v------*/
-
- updateState: function(rfb, state, oldstate) {
- var msg;
-
- document.documentElement.classList.remove("noVNC_connecting");
- document.documentElement.classList.remove("noVNC_connected");
- document.documentElement.classList.remove("noVNC_disconnecting");
- document.documentElement.classList.remove("noVNC_reconnecting");
-
- switch (state) {
- case 'connecting':
- document.getElementById("noVNC_transition_text").textContent = _("Connecting...");
- document.documentElement.classList.add("noVNC_connecting");
- break;
- case 'connected':
- UI.connected = true;
- UI.inhibit_reconnect = false;
- document.documentElement.classList.add("noVNC_connected");
- if (rfb && rfb.get_encrypt()) {
- msg = _("Connected (encrypted) to ") + UI.desktopName;
- } else {
- msg = _("Connected (unencrypted) to ") + UI.desktopName;
- }
- UI.showStatus(msg);
- break;
- case 'disconnecting':
- UI.connected = false;
- document.getElementById("noVNC_transition_text").textContent = _("Disconnecting...");
- document.documentElement.classList.add("noVNC_disconnecting");
- break;
- case 'disconnected':
- UI.showStatus(_("Disconnected"));
- break;
- default:
- msg = "Invalid UI state";
- Log.Error(msg);
- UI.showStatus(msg, 'error');
- break;
- }
-
- UI.updateVisualState();
- },
-
- // Disable/enable controls depending on connection state
- updateVisualState: function() {
- //Log.Debug(">> updateVisualState");
-
- UI.enableDisableViewClip();
-
- if (cursorURIsSupported() && !isTouchDevice) {
- UI.enableSetting('cursor');
- } else {
- UI.disableSetting('cursor');
- }
-
- if (UI.connected) {
- UI.disableSetting('encrypt');
- UI.disableSetting('shared');
- UI.disableSetting('host');
- UI.disableSetting('port');
- UI.disableSetting('path');
- UI.disableSetting('repeaterID');
- UI.updateViewClip();
- UI.setMouseButton(1);
-
- // Hide the controlbar after 2 seconds
- UI.closeControlbarTimeout = setTimeout(UI.closeControlbar, 2000);
- } else {
- UI.enableSetting('encrypt');
- UI.enableSetting('shared');
- UI.enableSetting('host');
- UI.enableSetting('port');
- UI.enableSetting('path');
- UI.enableSetting('repeaterID');
- UI.updateXvpButton(0);
- UI.keepControlbar();
- }
-
- // Hide input related buttons in view only mode
- if (UI.rfb && UI.rfb.get_view_only()) {
- document.getElementById('noVNC_keyboard_button')
- .classList.add('noVNC_hidden');
- document.getElementById('noVNC_toggle_extra_keys_button')
- .classList.add('noVNC_hidden');
- } else {
- document.getElementById('noVNC_keyboard_button')
- .classList.remove('noVNC_hidden');
- document.getElementById('noVNC_toggle_extra_keys_button')
- .classList.remove('noVNC_hidden');
- }
-
- // State change disables viewport dragging.
- // It is enabled (toggled) by direct click on the button
- UI.setViewDrag(false);
-
- // State change also closes the password dialog
- document.getElementById('noVNC_password_dlg')
- .classList.remove('noVNC_open');
-
- //Log.Debug("<< updateVisualState");
- },
-
- showStatus: function(text, status_type, time) {
- var statusElem = document.getElementById('noVNC_status');
-
- clearTimeout(UI.statusTimeout);
-
- if (typeof status_type === 'undefined') {
- status_type = 'normal';
- }
-
- statusElem.classList.remove("noVNC_status_normal");
- statusElem.classList.remove("noVNC_status_warn");
- statusElem.classList.remove("noVNC_status_error");
-
- switch (status_type) {
- case 'warning':
- case 'warn':
- statusElem.classList.add("noVNC_status_warn");
- break;
- case 'error':
- statusElem.classList.add("noVNC_status_error");
- break;
- case 'normal':
- case 'info':
- default:
- statusElem.classList.add("noVNC_status_normal");
- break;
- }
-
- statusElem.textContent = text;
- statusElem.classList.add("noVNC_open");
-
- // If no time was specified, show the status for 1.5 seconds
- if (typeof time === 'undefined') {
- time = 1500;
- }
-
- // Error messages do not timeout
- if (status_type !== 'error') {
- UI.statusTimeout = window.setTimeout(UI.hideStatus, time);
- }
- },
-
- hideStatus: function() {
- clearTimeout(UI.statusTimeout);
- document.getElementById('noVNC_status').classList.remove("noVNC_open");
- },
-
- notification: function (rfb, msg, level, options) {
- UI.showStatus(msg, level);
- },
-
- activateControlbar: function(event) {
- clearTimeout(UI.idleControlbarTimeout);
- // We manipulate the anchor instead of the actual control
- // bar in order to avoid creating new a stacking group
- document.getElementById('noVNC_control_bar_anchor')
- .classList.remove("noVNC_idle");
- UI.idleControlbarTimeout = window.setTimeout(UI.idleControlbar, 2000);
- },
-
- idleControlbar: function() {
- document.getElementById('noVNC_control_bar_anchor')
- .classList.add("noVNC_idle");
- },
-
- keepControlbar: function() {
- clearTimeout(UI.closeControlbarTimeout);
- },
-
- openControlbar: function() {
- document.getElementById('noVNC_control_bar')
- .classList.add("noVNC_open");
- },
-
- closeControlbar: function() {
- UI.closeAllPanels();
- document.getElementById('noVNC_control_bar')
- .classList.remove("noVNC_open");
- },
-
- toggleControlbar: function() {
- if (document.getElementById('noVNC_control_bar')
- .classList.contains("noVNC_open")) {
- UI.closeControlbar();
- } else {
- UI.openControlbar();
- }
- },
-
- toggleControlbarSide: function () {
- // Temporarily disable animation to avoid weird movement
- var bar = document.getElementById('noVNC_control_bar');
- bar.style.transitionDuration = '0s';
- bar.addEventListener('transitionend', function () { this.style.transitionDuration = ""; });
-
- var anchor = document.getElementById('noVNC_control_bar_anchor');
- if (anchor.classList.contains("noVNC_right")) {
- WebUtil.writeSetting('controlbar_pos', 'left');
- anchor.classList.remove("noVNC_right");
- } else {
- WebUtil.writeSetting('controlbar_pos', 'right');
- anchor.classList.add("noVNC_right");
- }
-
- // Consider this a movement of the handle
- UI.controlbarDrag = true;
- },
-
- showControlbarHint: function (show) {
- var hint = document.getElementById('noVNC_control_bar_hint');
- if (show) {
- hint.classList.add("noVNC_active");
- } else {
- hint.classList.remove("noVNC_active");
- }
- },
-
- dragControlbarHandle: function (e) {
- if (!UI.controlbarGrabbed) return;
-
- var ptr = getPointerEvent(e);
-
- var anchor = document.getElementById('noVNC_control_bar_anchor');
- if (ptr.clientX < (window.innerWidth * 0.1)) {
- if (anchor.classList.contains("noVNC_right")) {
- UI.toggleControlbarSide();
- }
- } else if (ptr.clientX > (window.innerWidth * 0.9)) {
- if (!anchor.classList.contains("noVNC_right")) {
- UI.toggleControlbarSide();
- }
- }
-
- if (!UI.controlbarDrag) {
- // The goal is to trigger on a certain physical width, the
- // devicePixelRatio brings us a bit closer but is not optimal.
- var dragThreshold = 10 * (window.devicePixelRatio || 1);
- var dragDistance = Math.abs(ptr.clientY - UI.controlbarMouseDownClientY);
-
- if (dragDistance < dragThreshold) return;
-
- UI.controlbarDrag = true;
- }
-
- var eventY = ptr.clientY - UI.controlbarMouseDownOffsetY;
-
- UI.moveControlbarHandle(eventY);
-
- e.preventDefault();
- e.stopPropagation();
- UI.keepControlbar();
- UI.activateControlbar();
- },
-
- // Move the handle but don't allow any position outside the bounds
- moveControlbarHandle: function (viewportRelativeY) {
- var handle = document.getElementById("noVNC_control_bar_handle");
- var handleHeight = handle.getBoundingClientRect().height;
- var controlbarBounds = document.getElementById("noVNC_control_bar")
- .getBoundingClientRect();
- var margin = 10;
-
- // These heights need to be non-zero for the below logic to work
- if (handleHeight === 0 || controlbarBounds.height === 0) {
- return;
- }
-
- var newY = viewportRelativeY;
-
- // Check if the coordinates are outside the control bar
- if (newY < controlbarBounds.top + margin) {
- // Force coordinates to be below the top of the control bar
- newY = controlbarBounds.top + margin;
-
- } else if (newY > controlbarBounds.top +
- controlbarBounds.height - handleHeight - margin) {
- // Force coordinates to be above the bottom of the control bar
- newY = controlbarBounds.top +
- controlbarBounds.height - handleHeight - margin;
- }
-
- // Corner case: control bar too small for stable position
- if (controlbarBounds.height < (handleHeight + margin * 2)) {
- newY = controlbarBounds.top +
- (controlbarBounds.height - handleHeight) / 2;
- }
-
- // The transform needs coordinates that are relative to the parent
- var parentRelativeY = newY - controlbarBounds.top;
- handle.style.transform = "translateY(" + parentRelativeY + "px)";
- },
-
- updateControlbarHandle: function () {
- // Since the control bar is fixed on the viewport and not the page,
- // the move function expects coordinates relative the the viewport.
- var handle = document.getElementById("noVNC_control_bar_handle");
- var handleBounds = handle.getBoundingClientRect();
- UI.moveControlbarHandle(handleBounds.top);
- },
-
- controlbarHandleMouseUp: function(e) {
- if ((e.type == "mouseup") && (e.button != 0)) return;
-
- // mouseup and mousedown on the same place toggles the controlbar
- if (UI.controlbarGrabbed && !UI.controlbarDrag) {
- UI.toggleControlbar();
- e.preventDefault();
- e.stopPropagation();
- UI.keepControlbar();
- UI.activateControlbar();
- }
- UI.controlbarGrabbed = false;
- UI.showControlbarHint(false);
- },
-
- controlbarHandleMouseDown: function(e) {
- if ((e.type == "mousedown") && (e.button != 0)) return;
-
- var ptr = getPointerEvent(e);
-
- var handle = document.getElementById("noVNC_control_bar_handle");
- var bounds = handle.getBoundingClientRect();
-
- // Touch events have implicit capture
- if (e.type === "mousedown") {
- setCapture(handle);
- }
-
- UI.controlbarGrabbed = true;
- UI.controlbarDrag = false;
-
- UI.showControlbarHint(true);
-
- UI.controlbarMouseDownClientY = ptr.clientY;
- UI.controlbarMouseDownOffsetY = ptr.clientY - bounds.top;
- e.preventDefault();
- e.stopPropagation();
- UI.keepControlbar();
- UI.activateControlbar();
- },
-
- toggleExpander: function(e) {
- if (this.classList.contains("noVNC_open")) {
- this.classList.remove("noVNC_open");
- } else {
- this.classList.add("noVNC_open");
- }
- },
-
-/* ------^-------
- * /VISUAL
- * ==============
- * SETTINGS
- * ------v------*/
-
- // Initial page load read/initialization of settings
- initSetting: function(name, defVal) {
- // Check Query string followed by cookie
- var val = WebUtil.getConfigVar(name);
- if (val === null) {
- val = WebUtil.readSetting(name, defVal);
- }
- UI.updateSetting(name, val);
- 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 = document.getElementById('noVNC_setting_' + 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 = document.getElementById('noVNC_setting_' + 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);
- //Log.Debug("Setting saved '" + name + "=" + val + "'");
- return val;
- },
-
- // Read form control compatible setting from cookie
- getSetting: function(name) {
- var ctrl = document.getElementById('noVNC_setting_' + name);
- var val = WebUtil.readSetting(name);
- if (typeof val !== 'undefined' && val !== null && ctrl.type === 'checkbox') {
- if (val.toString().toLowerCase() in {'0':1, 'no':1, 'false':1}) {
- val = false;
- } else {
- val = true;
- }
- }
- return val;
- },
-
- // These helpers compensate for the lack of parent-selectors and
- // previous-sibling-selectors in CSS which are needed when we want to
- // disable the labels that belong to disabled input elements.
- disableSetting: function(name) {
- var ctrl = document.getElementById('noVNC_setting_' + name);
- ctrl.disabled = true;
- ctrl.label.classList.add('noVNC_disabled');
- },
-
- enableSetting: function(name) {
- var ctrl = document.getElementById('noVNC_setting_' + name);
- ctrl.disabled = false;
- ctrl.label.classList.remove('noVNC_disabled');
- },
-
-/* ------^-------
- * /SETTINGS
- * ==============
- * PANELS
- * ------v------*/
-
- closeAllPanels: function() {
- UI.closeSettingsPanel();
- UI.closeXvpPanel();
- UI.closeClipboardPanel();
- UI.closeExtraKeys();
- },
-
-/* ------^-------
- * /PANELS
- * ==============
- * SETTINGS (panel)
- * ------v------*/
-
- openSettingsPanel: function() {
- UI.closeAllPanels();
- UI.openControlbar();
-
- // Refresh UI elements from saved cookies
- UI.updateSetting('encrypt');
- if (cursorURIsSupported()) {
- UI.updateSetting('cursor');
- } else {
- UI.updateSetting('cursor', !isTouchDevice);
- UI.disableSetting('cursor');
- }
- UI.updateSetting('clip');
- UI.updateSetting('resize');
- UI.updateSetting('shared');
- UI.updateSetting('view_only');
- UI.updateSetting('path');
- UI.updateSetting('repeaterID');
- UI.updateSetting('logging');
- UI.updateSetting('reconnect');
- UI.updateSetting('reconnect_delay');
-
- document.getElementById('noVNC_settings')
- .classList.add("noVNC_open");
- document.getElementById('noVNC_settings_button')
- .classList.add("noVNC_selected");
- },
-
- closeSettingsPanel: function() {
- document.getElementById('noVNC_settings')
- .classList.remove("noVNC_open");
- document.getElementById('noVNC_settings_button')
- .classList.remove("noVNC_selected");
- },
-
- toggleSettingsPanel: function() {
- if (document.getElementById('noVNC_settings')
- .classList.contains("noVNC_open")) {
- UI.closeSettingsPanel();
- } else {
- UI.openSettingsPanel();
- }
- },
-
-/* ------^-------
- * /SETTINGS
- * ==============
- * XVP
- * ------v------*/
-
- openXvpPanel: function() {
- UI.closeAllPanels();
- UI.openControlbar();
-
- document.getElementById('noVNC_xvp')
- .classList.add("noVNC_open");
- document.getElementById('noVNC_xvp_button')
- .classList.add("noVNC_selected");
- },
-
- closeXvpPanel: function() {
- document.getElementById('noVNC_xvp')
- .classList.remove("noVNC_open");
- document.getElementById('noVNC_xvp_button')
- .classList.remove("noVNC_selected");
- },
-
- toggleXvpPanel: function() {
- if (document.getElementById('noVNC_xvp')
- .classList.contains("noVNC_open")) {
- UI.closeXvpPanel();
- } else {
- UI.openXvpPanel();
- }
- },
-
- // Disable/enable XVP button
- updateXvpButton: function(ver) {
- if (ver >= 1 && !UI.rfb.get_view_only()) {
- document.getElementById('noVNC_xvp_button')
- .classList.remove("noVNC_hidden");
- } else {
- document.getElementById('noVNC_xvp_button')
- .classList.add("noVNC_hidden");
- // Close XVP panel if open
- UI.closeXvpPanel();
- }
- },
-
-/* ------^-------
- * /XVP
- * ==============
- * CLIPBOARD
- * ------v------*/
-
- openClipboardPanel: function() {
- UI.closeAllPanels();
- UI.openControlbar();
-
- document.getElementById('noVNC_clipboard')
- .classList.add("noVNC_open");
- document.getElementById('noVNC_clipboard_button')
- .classList.add("noVNC_selected");
- },
-
- closeClipboardPanel: function() {
- document.getElementById('noVNC_clipboard')
- .classList.remove("noVNC_open");
- document.getElementById('noVNC_clipboard_button')
- .classList.remove("noVNC_selected");
- },
-
- toggleClipboardPanel: function() {
- if (document.getElementById('noVNC_clipboard')
- .classList.contains("noVNC_open")) {
- UI.closeClipboardPanel();
- } else {
- UI.openClipboardPanel();
- }
- },
-
- clipboardReceive: function(rfb, text) {
- Log.Debug(">> UI.clipboardReceive: " + text.substr(0,40) + "...");
- document.getElementById('noVNC_clipboard_text').value = text;
- Log.Debug("<< UI.clipboardReceive");
- },
-
- clipboardClear: function() {
- document.getElementById('noVNC_clipboard_text').value = "";
- UI.rfb.clipboardPasteFrom("");
- },
-
- clipboardSend: function() {
- var text = document.getElementById('noVNC_clipboard_text').value;
- Log.Debug(">> UI.clipboardSend: " + text.substr(0,40) + "...");
- UI.rfb.clipboardPasteFrom(text);
- Log.Debug("<< UI.clipboardSend");
- },
-
-/* ------^-------
- * /CLIPBOARD
- * ==============
- * CONNECTION
- * ------v------*/
-
- openConnectPanel: function() {
- document.getElementById('noVNC_connect_dlg')
- .classList.add("noVNC_open");
- },
-
- closeConnectPanel: function() {
- document.getElementById('noVNC_connect_dlg')
- .classList.remove("noVNC_open");
- },
-
- connect: function(event, password) {
- var host = UI.getSetting('host');
- var port = UI.getSetting('port');
- var path = UI.getSetting('path');
-
- if (typeof password === 'undefined') {
- password = WebUtil.getConfigVar('password');
- }
-
- if (password === null) {
- password = undefined;
- }
-
- if ((!host) || (!port)) {
- var msg = _("Must set host and port");
- Log.Error(msg);
- UI.showStatus(msg, 'error');
- return;
- }
-
- if (!UI.initRFB()) return;
-
- UI.closeAllPanels();
- UI.closeConnectPanel();
-
- UI.rfb.set_encrypt(UI.getSetting('encrypt'));
- UI.rfb.set_shared(UI.getSetting('shared'));
- UI.rfb.set_repeaterID(UI.getSetting('repeaterID'));
-
- UI.updateLocalCursor();
- UI.updateViewOnly();
-
- UI.rfb.connect(host, port, password, path);
- },
-
- disconnect: function() {
- UI.closeAllPanels();
- UI.rfb.disconnect();
-
- // Disable automatic reconnecting
- UI.inhibit_reconnect = true;
-
- // Restore the callback used for initial resize
- UI.rfb.set_onFBUComplete(UI.initialResize);
-
- // Don't display the connection settings until we're actually disconnected
- },
-
- reconnect: function() {
- UI.reconnect_callback = null;
-
- // if reconnect has been disabled in the meantime, do nothing.
- if (UI.inhibit_reconnect) {
- return;
- }
-
- UI.connect(null, UI.reconnect_password);
- },
-
- disconnectFinished: function (rfb, reason) {
- if (typeof reason !== 'undefined') {
- UI.showStatus(reason, 'error');
- } else if (UI.getSetting('reconnect', false) === true && !UI.inhibit_reconnect) {
- document.getElementById("noVNC_transition_text").textContent = _("Reconnecting...");
- document.documentElement.classList.add("noVNC_reconnecting");
-
- var delay = parseInt(UI.getSetting('reconnect_delay'));
- UI.reconnect_callback = setTimeout(UI.reconnect, delay);
- return;
- }
-
- UI.openControlbar();
- UI.openConnectPanel();
- },
-
- cancelReconnect: function() {
- if (UI.reconnect_callback !== null) {
- clearTimeout(UI.reconnect_callback);
- UI.reconnect_callback = null;
- }
-
- document.documentElement.classList.remove("noVNC_reconnecting");
- UI.openControlbar();
- UI.openConnectPanel();
- },
-
-/* ------^-------
- * /CONNECTION
- * ==============
- * PASSWORD
- * ------v------*/
-
- passwordRequired: function(rfb, msg) {
-
- document.getElementById('noVNC_password_dlg')
- .classList.add('noVNC_open');
-
- setTimeout(function () {
- document.getElementById('noVNC_password_input').focus();
- }, 100);
-
- if (typeof msg === 'undefined') {
- msg = _("Password is required");
- }
- Log.Warn(msg);
- UI.showStatus(msg, "warning");
- },
-
- setPassword: function(e) {
- var inputElem = document.getElementById('noVNC_password_input');
- var password = inputElem.value;
- // Clear the input after reading the password
- inputElem.value = "";
- UI.rfb.sendPassword(password);
- UI.reconnect_password = password;
- document.getElementById('noVNC_password_dlg')
- .classList.remove('noVNC_open');
- // Prevent actually submitting the form
- e.preventDefault();
- },
-
-/* ------^-------
- * /PASSWORD
- * ==============
- * FULLSCREEN
- * ------v------*/
-
- toggleFullscreen: function() {
- if (document.fullscreenElement || // alternative standard method
- document.mozFullScreenElement || // currently working methods
- document.webkitFullscreenElement ||
- document.msFullscreenElement) {
- if (document.exitFullscreen) {
- document.exitFullscreen();
- } else if (document.mozCancelFullScreen) {
- document.mozCancelFullScreen();
- } else if (document.webkitExitFullscreen) {
- document.webkitExitFullscreen();
- } else if (document.msExitFullscreen) {
- document.msExitFullscreen();
- }
- } else {
- if (document.documentElement.requestFullscreen) {
- document.documentElement.requestFullscreen();
- } else if (document.documentElement.mozRequestFullScreen) {
- document.documentElement.mozRequestFullScreen();
- } else if (document.documentElement.webkitRequestFullscreen) {
- document.documentElement.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT);
- } else if (document.body.msRequestFullscreen) {
- document.body.msRequestFullscreen();
- }
- }
- UI.enableDisableViewClip();
- UI.updateFullscreenButton();
- },
-
- updateFullscreenButton: function() {
- if (document.fullscreenElement || // alternative standard method
- document.mozFullScreenElement || // currently working methods
- document.webkitFullscreenElement ||
- document.msFullscreenElement ) {
- document.getElementById('noVNC_fullscreen_button')
- .classList.add("noVNC_selected");
- } else {
- document.getElementById('noVNC_fullscreen_button')
- .classList.remove("noVNC_selected");
- }
- },
-
-/* ------^-------
- * /FULLSCREEN
- * ==============
- * RESIZE
- * ------v------*/
-
- // Apply remote resizing or local scaling
- applyResizeMode: function() {
- if (!UI.rfb) return;
-
- var screen = UI.screenSize();
-
- if (screen && UI.connected && UI.rfb.get_display()) {
-
- var display = UI.rfb.get_display();
- var resizeMode = UI.getSetting('resize');
- display.set_scale(1);
-
- // Make sure the viewport is adjusted first
- UI.updateViewClip();
-
- if (resizeMode === 'remote') {
-
- // Request changing the resolution of the remote display to
- // the size of the local browser viewport.
-
- // In order to not send multiple requests before the browser-resize
- // is finished we wait 0.5 seconds before sending the request.
- clearTimeout(UI.resizeTimeout);
- UI.resizeTimeout = setTimeout(function(){
- // Request a remote size covering the viewport
- if (UI.rfb.requestDesktopSize(screen.w, screen.h)) {
- Log.Debug('Requested new desktop size: ' +
- screen.w + 'x' + screen.h);
- }
- }, 500);
-
- } else if (resizeMode === 'scale' || resizeMode === 'downscale') {
- var downscaleOnly = resizeMode === 'downscale';
- display.autoscale(screen.w, screen.h, downscaleOnly);
- UI.fixScrollbars();
- }
- }
- },
-
- // Gets the the size of the available viewport in the browser window
- screenSize: function() {
- var screen = document.getElementById('noVNC_screen');
- return {w: screen.offsetWidth, h: screen.offsetHeight};
- },
-
- // Normally we only apply the current resize mode after a window resize
- // event. This means that when a new connection is opened, there is no
- // resize mode active.
- // We have to wait until the first FBU because this is where the client
- // will find the supported encodings of the server. Some calls later in
- // the chain is dependant on knowing the server-capabilities.
- initialResize: function(rfb, fbu) {
- UI.applyResizeMode();
- // After doing this once, we remove the callback.
- UI.rfb.set_onFBUComplete(function() { });
- },
-
-/* ------^-------
- * /RESIZE
- * ==============
- * CLIPPING
- * ------v------*/
-
- // Set and configure viewport clipping
- setViewClip: function(clip) {
- UI.updateSetting('clip', clip);
- UI.updateViewClip();
- },
-
- // Update parameters that depend on the clip setting
- updateViewClip: function() {
- if (!UI.rfb) return;
-
- var display = UI.rfb.get_display();
- var cur_clip = display.get_viewport();
- var new_clip = UI.getSetting('clip');
-
- var resizeSetting = UI.getSetting('resize');
- if (resizeSetting === 'downscale' || resizeSetting === 'scale') {
- // Disable clipping if we are scaling
- new_clip = false;
- } else if (isTouchDevice) {
- // Touch devices usually have shit scrollbars
- new_clip = true;
- }
-
- if (cur_clip !== new_clip) {
- display.set_viewport(new_clip);
- }
-
- var size = UI.screenSize();
-
- if (new_clip && size) {
- // When clipping is enabled, the screen is limited to
- // the size of the browser window.
- display.viewportChangeSize(size.w, size.h);
- UI.fixScrollbars();
- }
-
- // Changing the viewport may change the state of
- // the dragging button
- UI.updateViewDrag();
- },
-
- // Handle special cases where clipping is forced on/off or locked
- enableDisableViewClip: function() {
- var resizeSetting = UI.getSetting('resize');
- // Disable clipping if we are scaling, connected or on touch
- if (resizeSetting === 'downscale' || resizeSetting === 'scale' ||
- isTouchDevice) {
- UI.disableSetting('clip');
- } else {
- UI.enableSetting('clip');
- }
- },
-
-/* ------^-------
- * /CLIPPING
- * ==============
- * VIEWDRAG
- * ------v------*/
-
- toggleViewDrag: function() {
- if (!UI.rfb) return;
-
- var drag = UI.rfb.get_viewportDrag();
- UI.setViewDrag(!drag);
- },
-
- // Set the view drag mode which moves the viewport on mouse drags
- setViewDrag: function(drag) {
- if (!UI.rfb) return;
-
- UI.rfb.set_viewportDrag(drag);
-
- UI.updateViewDrag();
- },
-
- updateViewDrag: function() {
- var clipping = false;
-
- if (!UI.connected) return;
-
- // Check if viewport drag is possible. It is only possible
- // if the remote display is clipping the client display.
- if (UI.rfb.get_display().get_viewport() &&
- UI.rfb.get_display().clippingDisplay()) {
- clipping = true;
- }
-
- var viewDragButton = document.getElementById('noVNC_view_drag_button');
-
- if (!clipping &&
- UI.rfb.get_viewportDrag()) {
- // The size of the remote display is the same or smaller
- // than the client display. Make sure viewport drag isn't
- // active when it can't be used.
- UI.rfb.set_viewportDrag(false);
- }
-
- if (UI.rfb.get_viewportDrag()) {
- viewDragButton.classList.add("noVNC_selected");
- } else {
- viewDragButton.classList.remove("noVNC_selected");
- }
-
- // Different behaviour for touch vs non-touch
- // The button is disabled instead of hidden on touch devices
- if (isTouchDevice) {
- viewDragButton.classList.remove("noVNC_hidden");
-
- if (clipping) {
- viewDragButton.disabled = false;
- } else {
- viewDragButton.disabled = true;
- }
- } else {
- viewDragButton.disabled = false;
-
- if (clipping) {
- viewDragButton.classList.remove("noVNC_hidden");
- } else {
- viewDragButton.classList.add("noVNC_hidden");
- }
- }
- },
-
-/* ------^-------
- * /VIEWDRAG
- * ==============
- * KEYBOARD
- * ------v------*/
-
- showVirtualKeyboard: function() {
- if (!isTouchDevice) return;
-
- var input = document.getElementById('noVNC_keyboardinput');
-
- if (document.activeElement == input) return;
-
- input.focus();
-
- try {
- var l = input.value.length;
- // Move the caret to the end
- input.setSelectionRange(l, l);
- } catch (err) {} // setSelectionRange is undefined in Google Chrome
- },
-
- hideVirtualKeyboard: function() {
- if (!isTouchDevice) return;
-
- var input = document.getElementById('noVNC_keyboardinput');
-
- if (document.activeElement != input) return;
-
- input.blur();
- },
-
- toggleVirtualKeyboard: function () {
- if (document.getElementById('noVNC_keyboard_button')
- .classList.contains("noVNC_selected")) {
- UI.hideVirtualKeyboard();
- } else {
- UI.showVirtualKeyboard();
- }
- },
-
- onfocusVirtualKeyboard: function(event) {
- document.getElementById('noVNC_keyboard_button')
- .classList.add("noVNC_selected");
- },
-
- onblurVirtualKeyboard: function(event) {
- document.getElementById('noVNC_keyboard_button')
- .classList.remove("noVNC_selected");
- },
-
- keepVirtualKeyboard: function(event) {
- var input = document.getElementById('noVNC_keyboardinput');
-
- // Only prevent focus change if the virtual keyboard is active
- if (document.activeElement != input) {
- return;
- }
-
- // Only allow focus to move to other elements that need
- // focus to function properly
- if (event.target.form !== undefined) {
- switch (event.target.type) {
- case 'text':
- case 'email':
- case 'search':
- case 'password':
- case 'tel':
- case 'url':
- case 'textarea':
- case 'select-one':
- case 'select-multiple':
- return;
- }
- }
-
- event.preventDefault();
- },
-
- keyboardinputReset: function() {
- var kbi = document.getElementById('noVNC_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) {
-
- if (!UI.rfb) return;
-
- var newValue = event.target.value;
-
- if (!UI.lastKeyboardinput) {
- UI.keyboardinputReset();
- }
- 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(KeyTable.XK_BackSpace, "Backspace");
- }
- for (i = newLen - inputs; i < newLen; i++) {
- UI.rfb.sendKey(keysyms.lookup(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(event.target.focus.bind(event.target), 0);
- } else {
- UI.lastKeyboardinput = newValue;
- }
- },
-
-/* ------^-------
- * /KEYBOARD
- * ==============
- * EXTRA KEYS
- * ------v------*/
-
- openExtraKeys: function() {
- UI.closeAllPanels();
- UI.openControlbar();
-
- document.getElementById('noVNC_modifiers')
- .classList.add("noVNC_open");
- document.getElementById('noVNC_toggle_extra_keys_button')
- .classList.add("noVNC_selected");
- },
-
- closeExtraKeys: function() {
- document.getElementById('noVNC_modifiers')
- .classList.remove("noVNC_open");
- document.getElementById('noVNC_toggle_extra_keys_button')
- .classList.remove("noVNC_selected");
- },
-
- toggleExtraKeys: function() {
- if(document.getElementById('noVNC_modifiers')
- .classList.contains("noVNC_open")) {
- UI.closeExtraKeys();
- } else {
- UI.openExtraKeys();
- }
- },
-
- sendEsc: function() {
- UI.rfb.sendKey(KeyTable.XK_Escape, "Escape");
- },
-
- sendTab: function() {
- UI.rfb.sendKey(KeyTable.XK_Tab);
- },
-
- toggleCtrl: function() {
- var btn = document.getElementById('noVNC_toggle_ctrl_button');
- if (btn.classList.contains("noVNC_selected")) {
- UI.rfb.sendKey(KeyTable.XK_Control_L, "ControlLeft", false);
- btn.classList.remove("noVNC_selected");
- } else {
- UI.rfb.sendKey(KeyTable.XK_Control_L, "ControlLeft", true);
- btn.classList.add("noVNC_selected");
- }
- },
-
- toggleAlt: function() {
- var btn = document.getElementById('noVNC_toggle_alt_button');
- if (btn.classList.contains("noVNC_selected")) {
- UI.rfb.sendKey(KeyTable.XK_Alt_L, "AltLeft", false);
- btn.classList.remove("noVNC_selected");
- } else {
- UI.rfb.sendKey(KeyTable.XK_Alt_L, "AltLeft", true);
- btn.classList.add("noVNC_selected");
- }
- },
-
- sendCtrlAltDel: function() {
- UI.rfb.sendCtrlAltDel();
- },
-
-/* ------^-------
- * /EXTRA KEYS
- * ==============
- * MISC
- * ------v------*/
-
- setMouseButton: function(num) {
- var view_only = UI.rfb.get_view_only();
- if (UI.rfb && !view_only) {
- UI.rfb.get_mouse().set_touchButton(num);
- }
-
- var blist = [0, 1,2,4];
- for (var b = 0; b < blist.length; b++) {
- var button = document.getElementById('noVNC_mouse_button' +
- blist[b]);
- if (blist[b] === num && !view_only) {
- button.classList.remove("noVNC_hidden");
- } else {
- button.classList.add("noVNC_hidden");
- }
- }
- },
-
- displayBlur: function() {
- if (UI.rfb && !UI.rfb.get_view_only()) {
- UI.rfb.get_keyboard().set_focused(false);
- UI.rfb.get_mouse().set_focused(false);
- }
- },
-
- displayFocus: function() {
- if (UI.rfb && !UI.rfb.get_view_only()) {
- UI.rfb.get_keyboard().set_focused(true);
- UI.rfb.get_mouse().set_focused(true);
- }
- },
-
- updateLocalCursor: function() {
- if (!UI.rfb) return;
- UI.rfb.set_local_cursor(UI.getSetting('cursor'));
- },
-
- updateViewOnly: function() {
- if (!UI.rfb) return;
- UI.rfb.set_view_only(UI.getSetting('view_only'));
- },
-
- updateLogging: function() {
- WebUtil.init_logging(UI.getSetting('logging'));
- },
-
- updateSessionSize: function(rfb, width, height) {
- UI.updateViewClip();
- UI.fixScrollbars();
- },
-
- fixScrollbars: function() {
- // This is a hack because Chrome screws up the calculation
- // for when scrollbars are needed. So to fix it we temporarily
- // toggle them off and on.
- var screen = document.getElementById('noVNC_screen');
- screen.style.overflow = 'hidden';
- // Force Chrome to recalculate the layout by asking for
- // an element's dimensions
- screen.getBoundingClientRect();
- screen.style.overflow = "";
- },
-
- updateDesktopName: function(rfb, name) {
- UI.desktopName = name;
- // Display the desktop name in the document title
- document.title = name + " - noVNC";
- },
-
- bell: function(rfb) {
- if (WebUtil.getConfigVar('bell', 'on') === 'on') {
- document.getElementById('noVNC_bell').play()
- .catch(function(e) {
- if (e.name === "NotAllowedError") {
- // Ignore when the browser doesn't let us play audio.
- // It is common that the browsers require audio to be
- // initiated from a user action.
- } else {
- Log.Error("Unable to play bell: " + e);
- }
- });
- }
- },
-
- //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);
- },
-
-/* ------^-------
- * /MISC
- * ==============
- */
-};
-
-// Set up translations
-var LINGUAS = ["de", "el", "nl", "sv"];
-l10n.setup(LINGUAS);
-if (l10n.language !== "en" && l10n.dictionary === undefined) {
- WebUtil.fetchJSON('app/locale/' + l10n.language + '.json', function (translations) {
- l10n.dictionary = translations;
-
- // wait for translations to load before loading the UI
- UI.prime();
- }, function (err) {
- throw err;
- });
-} else {
- UI.prime();
-}
-
-export default UI;
diff --git a/app/webutil.js b/app/webutil.js
deleted file mode 100644
index 1f28b211..00000000
--- a/app/webutil.js
+++ /dev/null
@@ -1,235 +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 */
-
-import { init_logging as main_init_logging } from '../core/util/logging.js';
-
-// init log level reading the logging HTTP param
-export function init_logging (level) {
- "use strict";
- if (typeof level !== "undefined") {
- main_init_logging(level);
- } else {
- var param = document.location.href.match(/logging=([A-Za-z0-9\._\-]*)/);
- main_init_logging(param || undefined);
- }
-};
-
-// Read a query string variable
-export function getQueryVar (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;
- }
-};
-
-// Read a hash fragment variable
-export function getHashVar (name, defVal) {
- "use strict";
- var re = new RegExp('.*[&#]' + name + '=([^&]*)'),
- match = document.location.hash.match(re);
- if (typeof defVal === 'undefined') { defVal = null; }
- if (match) {
- return decodeURIComponent(match[1]);
- } else {
- return defVal;
- }
-};
-
-// Read a variable from the fragment or the query string
-// Fragment takes precedence
-export function getConfigVar (name, defVal) {
- "use strict";
- var val = getHashVar(name);
- if (val === null) {
- val = getQueryVar(name, defVal);
- }
- return val;
-};
-
-/*
- * Cookie handling. Dervied from: http://www.quirksmode.org/js/cookies.html
- */
-
-// No days means only for this browser session
-export function createCookie (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;
-};
-
-export function readCookie (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;
-};
-
-export function eraseCookie (name) {
- "use strict";
- createCookie(name, "", -1);
-};
-
-/*
- * Setting handling.
- */
-
-var settings = {};
-
-export function initSettings (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) {
- settings = cfg;
- console.log(settings);
- if (callback) {
- callback.apply(this, callbackArgs);
- }
- });
- } else {
- // No-op
- if (callback) {
- callback.apply(this, callbackArgs);
- }
- }
-};
-
-// No days means only for this browser session
-export function writeSetting (name, value) {
- "use strict";
- if (window.chrome && window.chrome.storage) {
- //console.log("writeSetting:", name, value);
- if (settings[name] !== value) {
- settings[name] = value;
- window.chrome.storage.sync.set(settings);
- }
- } else {
- localStorage.setItem(name, value);
- }
-};
-
-export function readSetting (name, defaultValue) {
- "use strict";
- var value;
- if (window.chrome && window.chrome.storage) {
- value = settings[name];
- } else {
- value = localStorage.getItem(name);
- }
- if (typeof value === "undefined") {
- value = null;
- }
- if (value === null && typeof defaultValue !== undefined) {
- return defaultValue;
- } else {
- return value;
- }
-};
-
-export function eraseSetting (name) {
- "use strict";
- if (window.chrome && window.chrome.storage) {
- window.chrome.storage.sync.remove(name);
- delete settings[name];
- } else {
- localStorage.removeItem(name);
- }
-};
-
-export function injectParamIfMissing (path, param, value) {
- // force pretend that we're dealing with a relative path
- // (assume that we wanted an extra if we pass one in)
- path = "/" + path;
-
- var elem = document.createElement('a');
- elem.href = path;
-
- var param_eq = encodeURIComponent(param) + "=";
- var query;
- if (elem.search) {
- query = elem.search.slice(1).split('&');
- } else {
- query = [];
- }
-
- if (!query.some(function (v) { return v.startsWith(param_eq); })) {
- query.push(param_eq + encodeURIComponent(value));
- elem.search = "?" + query.join("&");
- }
-
- // some browsers (e.g. IE11) may occasionally omit the leading slash
- // in the elem.pathname string. Handle that case gracefully.
- if (elem.pathname.charAt(0) == "/") {
- return elem.pathname.slice(1) + elem.search + elem.hash;
- } else {
- return elem.pathname + elem.search + elem.hash;
- }
-};
-
-// sadly, we can't use the Fetch API until we decide to drop
-// IE11 support or polyfill promises and fetch in IE11.
-// resolve will receive an object on success, while reject
-// will receive either an event or an error on failure.
-export function fetchJSON(path, resolve, reject) {
- // NB: IE11 doesn't support JSON as a responseType
- var req = new XMLHttpRequest();
- req.open('GET', path);
-
- req.onload = function () {
- if (req.status === 200) {
- try {
- var resObj = JSON.parse(req.responseText);
- } catch (err) {
- reject(err);
- return;
- }
- resolve(resObj);
- } else {
- reject(new Error("XHR got non-200 status while trying to load '" + path + "': " + req.status));
- }
- };
-
- req.onerror = function (evt) {
- reject(new Error("XHR encountered an error while trying to load '" + path + "': " + evt.message));
- };
-
- req.ontimeout = function (evt) {
- reject(new Error("XHR timed out while trying to load '" + path + "'"));
- };
-
- req.send();
-}
diff --git a/core/base64.js b/core/base64.js
deleted file mode 100644
index 9d24a25f..00000000
--- a/core/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 */
-
-export default {
- /* Convert data (an array of integers) to a Base64 string. */
- toBase64Table : 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='.split(''),
- base64Pad : '=',
-
- encode: function (data) {
- "use strict";
- var result = '';
- var toBase64Table = this.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 = this.toBinaryTable;
- var base64Pad = this.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/core/des.js b/core/des.js
deleted file mode 100644
index 62684936..00000000
--- a/core/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 , 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 . 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 */
-
-export default 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<>> 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/core/display.js b/core/display.js
deleted file mode 100644
index e3f4293a..00000000
--- a/core/display.js
+++ /dev/null
@@ -1,749 +0,0 @@
-/*
- * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2015 Samuel Mannehed for Cendio AB
- * 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 */
-
-import { browserSupportsCursorURIs as cursorURIsSupported } from './util/browsers.js';
-import { set_defaults, make_properties } from './util/properties.js';
-import * as Log from './util/logging.js';
-import Base64 from "./base64.js";
-
-export default function Display(defaults) {
- this._drawCtx = null;
- this._c_forceCanvas = false;
-
- this._renderQ = []; // queue drawing actions for in-oder rendering
- this._flushing = false;
-
- // the full frame buffer (logical canvas) size
- this._fb_width = 0;
- this._fb_height = 0;
-
- this._prevDrawStyle = "";
- this._tile = null;
- this._tile16x16 = null;
- this._tile_x = 0;
- this._tile_y = 0;
-
- set_defaults(this, defaults, {
- 'scale': 1.0,
- 'viewport': false,
- 'render_mode': '',
- "onFlush": function () {},
- });
-
- Log.Debug(">> Display.constructor");
-
- // The visible canvas
- 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");
- }
-
- this._targetCtx = this._target.getContext('2d');
-
- // the visible canvas viewport (i.e. what actually gets seen)
- this._viewportLoc = { 'x': 0, 'y': 0, 'w': this._target.width, 'h': this._target.height };
-
- // The hidden canvas, where we do the actual rendering
- this._backbuffer = document.createElement('canvas');
- this._drawCtx = this._backbuffer.getContext('2d');
-
- this._damageBounds = { left:0, top:0,
- right: this._backbuffer.width,
- bottom: this._backbuffer.height };
-
- Log.Debug("User Agent: " + navigator.userAgent);
-
- 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) {
- Log.Info("Prefering javascript operations");
- this._prefer_js = true;
- }
-
- // Determine browser support for setting the cursor via data URI scheme
- if (this._cursor_uri || this._cursor_uri === null ||
- this._cursor_uri === undefined) {
- this._cursor_uri = cursorURIsSupported();
- }
-
- Log.Debug("<< Display.constructor");
-};
-
-var SUPPORTS_IMAGEDATA_CONSTRUCTOR = false;
-try {
- new ImageData(new Uint8ClampedArray(4), 1, 1);
- SUPPORTS_IMAGEDATA_CONSTRUCTOR = true;
-} catch (ex) {
- // ignore failure
-}
-
-Display.prototype = {
- // Public methods
- viewportChangePos: function (deltaX, deltaY) {
- var vp = this._viewportLoc;
- deltaX = Math.floor(deltaX);
- deltaY = Math.floor(deltaY);
-
- if (!this._viewport) {
- deltaX = -vp.w; // clamped later of out of bounds
- deltaY = -vp.h;
- }
-
- 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;
- }
- Log.Debug("viewportChange deltaX: " + deltaX + ", deltaY: " + deltaY);
-
- vp.x += deltaX;
- vp.y += deltaY;
-
- this._damage(vp.x, vp.y, vp.w, vp.h);
-
- this.flip();
- },
-
- viewportChangeSize: function(width, height) {
-
- if (!this._viewport ||
- typeof(width) === "undefined" ||
- typeof(height) === "undefined") {
-
- Log.Debug("Setting viewport to full display region");
- width = this._fb_width;
- height = this._fb_height;
- }
-
- if (width > this._fb_width) {
- width = this._fb_width;
- }
- if (height > this._fb_height) {
- height = this._fb_height;
- }
-
- var vp = this._viewportLoc;
- if (vp.w !== width || vp.h !== height) {
- vp.w = width;
- vp.h = height;
-
- var canvas = this._target;
- canvas.width = width;
- canvas.height = height;
-
- // The position might need to be updated if we've grown
- this.viewportChangePos(0, 0);
-
- this._damage(vp.x, vp.y, vp.w, vp.h);
- this.flip();
-
- // Update the visible size of the target canvas
- this._rescale(this._scale);
- }
- },
-
- absX: function (x) {
- return x / this._scale + this._viewportLoc.x;
- },
-
- absY: function (y) {
- return y / this._scale + this._viewportLoc.y;
- },
-
- resize: function (width, height) {
- this._prevDrawStyle = "";
-
- this._fb_width = width;
- this._fb_height = height;
-
- var canvas = this._backbuffer;
- if (canvas.width !== width || canvas.height !== height) {
-
- // We have to save the canvas data since changing the size will clear it
- var saveImg = null;
- if (canvas.width > 0 && canvas.height > 0) {
- saveImg = this._drawCtx.getImageData(0, 0, canvas.width, canvas.height);
- }
-
- if (canvas.width !== width) {
- canvas.width = width;
- }
- if (canvas.height !== height) {
- canvas.height = height;
- }
-
- if (saveImg) {
- this._drawCtx.putImageData(saveImg, 0, 0);
- }
- }
-
- // Readjust the viewport as it may be incorrectly sized
- // and positioned
- var vp = this._viewportLoc;
- this.viewportChangeSize(vp.w, vp.h);
- this.viewportChangePos(0, 0);
- },
-
- // Track what parts of the visible canvas that need updating
- _damage: function(x, y, w, h) {
- if (x < this._damageBounds.left) {
- this._damageBounds.left = x;
- }
- if (y < this._damageBounds.top) {
- this._damageBounds.top = y;
- }
- if ((x + w) > this._damageBounds.right) {
- this._damageBounds.right = x + w;
- }
- if ((y + h) > this._damageBounds.bottom) {
- this._damageBounds.bottom = y + h;
- }
- },
-
- // Update the visible canvas with the contents of the
- // rendering canvas
- flip: function(from_queue) {
- if (this._renderQ.length !== 0 && !from_queue) {
- this._renderQ_push({
- 'type': 'flip'
- });
- } else {
- var x, y, vx, vy, w, h;
-
- x = this._damageBounds.left;
- y = this._damageBounds.top;
- w = this._damageBounds.right - x;
- h = this._damageBounds.bottom - y;
-
- vx = x - this._viewportLoc.x;
- vy = y - this._viewportLoc.y;
-
- if (vx < 0) {
- w += vx;
- x -= vx;
- vx = 0;
- }
- if (vy < 0) {
- h += vy;
- y -= vy;
- vy = 0;
- }
-
- if ((vx + w) > this._viewportLoc.w) {
- w = this._viewportLoc.w - vx;
- }
- if ((vy + h) > this._viewportLoc.h) {
- h = this._viewportLoc.h - vy;
- }
-
- if ((w > 0) && (h > 0)) {
- // FIXME: We may need to disable image smoothing here
- // as well (see copyImage()), but we haven't
- // noticed any problem yet.
- this._targetCtx.drawImage(this._backbuffer,
- x, y, w, h,
- vx, vy, w, h);
- }
-
- this._damageBounds.left = this._damageBounds.top = 65535;
- this._damageBounds.right = this._damageBounds.bottom = 0;
- }
- },
-
- clear: function () {
- if (this._logo) {
- this.resize(this._logo.width, this._logo.height);
- this.imageRect(0, 0, this._logo.type, this._logo.data);
- } else {
- this.resize(240, 20);
- this._drawCtx.clearRect(0, 0, this._fb_width, this._fb_height);
- }
- this.flip();
- },
-
- pending: function() {
- return this._renderQ.length > 0;
- },
-
- flush: function() {
- if (this._renderQ.length === 0) {
- this._onFlush();
- } else {
- this._flushing = true;
- }
- },
-
- fillRect: function (x, y, width, height, color, from_queue) {
- if (this._renderQ.length !== 0 && !from_queue) {
- this._renderQ_push({
- 'type': 'fill',
- 'x': x,
- 'y': y,
- 'width': width,
- 'height': height,
- 'color': color
- });
- } else {
- this._setFillColor(color);
- this._drawCtx.fillRect(x, y, width, height);
- this._damage(x, y, width, height);
- }
- },
-
- copyImage: function (old_x, old_y, new_x, new_y, w, h, from_queue) {
- if (this._renderQ.length !== 0 && !from_queue) {
- this._renderQ_push({
- 'type': 'copy',
- 'old_x': old_x,
- 'old_y': old_y,
- 'x': new_x,
- 'y': new_y,
- 'width': w,
- 'height': h,
- });
- } else {
- // Due to this bug among others [1] we need to disable the image-smoothing to
- // avoid getting a blur effect when copying data.
- //
- // 1. https://bugzilla.mozilla.org/show_bug.cgi?id=1194719
- //
- // We need to set these every time since all properties are reset
- // when the the size is changed
- this._drawCtx.mozImageSmoothingEnabled = false;
- this._drawCtx.webkitImageSmoothingEnabled = false;
- this._drawCtx.msImageSmoothingEnabled = false;
- this._drawCtx.imageSmoothingEnabled = false;
-
- this._drawCtx.drawImage(this._backbuffer,
- old_x, old_y, w, h,
- new_x, new_y, w, h);
- this._damage(new_x, new_y, w, h);
- }
- },
-
- imageRect: function(x, y, mime, arr) {
- var img = new Image();
- img.src = "data: " + mime + ";base64," + Base64.encode(arr);
- this._renderQ_push({
- 'type': 'img',
- 'img': img,
- 'x': x,
- 'y': y
- });
- },
-
- // 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 red = color[2];
- var green = color[1];
- var blue = color[0];
-
- var data = this._tile.data;
- for (var i = 0; i < width * height * 4; i += 4) {
- data[i] = red;
- data[i + 1] = green;
- data[i + 2] = blue;
- data[i + 3] = 255;
- }
- } else {
- this.fillRect(x, y, width, height, color, true);
- }
- },
-
- // update sub-rectangle of the current tile
- subTile: function (x, y, w, h, color) {
- if (this._prefer_js) {
- var red = color[2];
- var green = color[1];
- var blue = color[0];
- var xend = x + w;
- var yend = y + h;
-
- var data = this._tile.data;
- var width = this._tile.width;
- for (var j = y; j < yend; j++) {
- for (var i = x; i < xend; i++) {
- var p = (i + (j * width)) * 4;
- data[p] = red;
- data[p + 1] = green;
- data[p + 2] = blue;
- data[p + 3] = 255;
- }
- }
- } else {
- this.fillRect(this._tile_x + x, this._tile_y + y, w, h, color, true);
- }
- },
-
- // draw the current tile to the screen
- finishTile: function () {
- if (this._prefer_js) {
- this._drawCtx.putImageData(this._tile, this._tile_x, this._tile_y);
- this._damage(this._tile_x, this._tile_y,
- this._tile.width, this._tile.height);
- }
- // else: No-op -- already done by setSubTile
- },
-
- blitImage: function (x, y, width, height, arr, offset, from_queue) {
- if (this._renderQ.length !== 0 && !from_queue) {
- // NB(directxman12): it's technically more performant here to use preallocated arrays,
- // but it's a lot of extra work for not a lot of payoff -- if we're using the render queue,
- // this probably isn't getting called *nearly* as much
- var new_arr = new Uint8Array(width * height * 4);
- new_arr.set(new Uint8Array(arr.buffer, 0, new_arr.length));
- this._renderQ_push({
- 'type': 'blit',
- 'data': new_arr,
- 'x': x,
- 'y': y,
- 'width': width,
- 'height': height,
- });
- } else {
- this._bgrxImageData(x, y, width, height, arr, offset);
- }
- },
-
- blitRgbImage: function (x, y , width, height, arr, offset, from_queue) {
- if (this._renderQ.length !== 0 && !from_queue) {
- // NB(directxman12): it's technically more performant here to use preallocated arrays,
- // but it's a lot of extra work for not a lot of payoff -- if we're using the render queue,
- // this probably isn't getting called *nearly* as much
- var new_arr = new Uint8Array(width * height * 3);
- new_arr.set(new Uint8Array(arr.buffer, 0, new_arr.length));
- this._renderQ_push({
- 'type': 'blitRgb',
- 'data': new_arr,
- 'x': x,
- 'y': y,
- 'width': width,
- 'height': height,
- });
- } else {
- this._rgbImageData(x, y, width, height, arr, offset);
- }
- },
-
- blitRgbxImage: function (x, y, width, height, arr, offset, from_queue) {
- if (this._renderQ.length !== 0 && !from_queue) {
- // NB(directxman12): it's technically more performant here to use preallocated arrays,
- // but it's a lot of extra work for not a lot of payoff -- if we're using the render queue,
- // this probably isn't getting called *nearly* as much
- var new_arr = new Uint8Array(width * height * 4);
- new_arr.set(new Uint8Array(arr.buffer, 0, new_arr.length));
- this._renderQ_push({
- 'type': 'blitRgbx',
- 'data': new_arr,
- 'x': x,
- 'y': y,
- 'width': width,
- 'height': height,
- });
- } else {
- this._rgbxImageData(x, y, width, height, arr, offset);
- }
- },
-
- drawImage: function (img, x, y) {
- this._drawCtx.drawImage(img, x, y);
- this._damage(x, y, img.width, img.height);
- },
-
- changeCursor: function (pixels, mask, hotx, hoty, w, h) {
- if (this._cursor_uri === false) {
- Log.Warn("changeCursor called but no cursor data URI support");
- return;
- }
-
- Display.changeCursor(this._target, pixels, mask, hotx, hoty, w, h);
- },
-
- defaultCursor: function () {
- this._target.style.cursor = "default";
- },
-
- disableLocalCursor: function () {
- this._target.style.cursor = "none";
- },
-
- clippingDisplay: function () {
- var vp = this._viewportLoc;
- return this._fb_width > vp.w || this._fb_height > vp.h;
- },
-
- // Overridden getters/setters
- set_scale: function (scale) {
- this._rescale(scale);
- },
-
- set_viewport: function (viewport) {
- this._viewport = viewport;
- // May need to readjust the viewport dimensions
- var vp = this._viewportLoc;
- this.viewportChangeSize(vp.w, vp.h);
- this.viewportChangePos(0, 0);
- },
-
- get_width: function () {
- return this._fb_width;
- },
- get_height: function () {
- return this._fb_height;
- },
-
- autoscale: function (containerWidth, containerHeight, downscaleOnly) {
- var vp = this._viewportLoc;
- var targetAspectRatio = containerWidth / containerHeight;
- var fbAspectRatio = vp.w / vp.h;
-
- var scaleRatio;
- if (fbAspectRatio >= targetAspectRatio) {
- scaleRatio = containerWidth / vp.w;
- } else {
- scaleRatio = containerHeight / vp.h;
- }
-
- if (scaleRatio > 1.0 && downscaleOnly) {
- scaleRatio = 1.0;
- }
-
- this._rescale(scaleRatio);
- },
-
- // Private Methods
- _rescale: function (factor) {
- this._scale = factor;
- var vp = this._viewportLoc;
-
- // NB(directxman12): If you set the width directly, or set the
- // style width to a number, the canvas is cleared.
- // However, if you set the style width to a string
- // ('NNNpx'), the canvas is scaled without clearing.
- var width = Math.round(factor * vp.w) + 'px';
- var height = Math.round(factor * vp.h) + 'px';
-
- if ((this._target.style.width !== width) ||
- (this._target.style.height !== height)) {
- this._target.style.width = width;
- this._target.style.height = height;
- }
- },
-
- _setFillColor: function (color) {
- var newStyle = 'rgb(' + color[2] + ',' + color[1] + ',' + color[0] + ')';
- if (newStyle !== this._prevDrawStyle) {
- this._drawCtx.fillStyle = newStyle;
- this._prevDrawStyle = newStyle;
- }
- },
-
- _rgbImageData: function (x, y, width, height, arr, offset) {
- var img = this._drawCtx.createImageData(width, height);
- var data = img.data;
- for (var i = 0, j = offset; i < width * height * 4; i += 4, j += 3) {
- data[i] = arr[j];
- data[i + 1] = arr[j + 1];
- data[i + 2] = arr[j + 2];
- data[i + 3] = 255; // Alpha
- }
- this._drawCtx.putImageData(img, x, y);
- this._damage(x, y, img.width, img.height);
- },
-
- _bgrxImageData: function (x, y, width, height, arr, offset) {
- var img = this._drawCtx.createImageData(width, height);
- var data = img.data;
- for (var i = 0, j = offset; i < width * height * 4; i += 4, j += 4) {
- data[i] = arr[j + 2];
- data[i + 1] = arr[j + 1];
- data[i + 2] = arr[j];
- data[i + 3] = 255; // Alpha
- }
- this._drawCtx.putImageData(img, x, y);
- this._damage(x, y, img.width, img.height);
- },
-
- _rgbxImageData: function (x, y, width, height, arr, offset) {
- // NB(directxman12): arr must be an Type Array view
- var img;
- if (SUPPORTS_IMAGEDATA_CONSTRUCTOR) {
- img = new ImageData(new Uint8ClampedArray(arr.buffer, arr.byteOffset, width * height * 4), width, height);
- } else {
- img = this._drawCtx.createImageData(width, height);
- img.data.set(new Uint8ClampedArray(arr.buffer, arr.byteOffset, width * height * 4));
- }
- this._drawCtx.putImageData(img, x, y);
- this._damage(x, y, img.width, img.height);
- },
-
- _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 wait for the relevant event
- this._scan_renderQ();
- }
- },
-
- _resume_renderQ: function() {
- // "this" is the object that is ready, not the
- // display object
- this.removeEventListener('load', this._noVNC_display._resume_renderQ);
- this._noVNC_display._scan_renderQ();
- },
-
- _scan_renderQ: function () {
- var ready = true;
- while (ready && this._renderQ.length > 0) {
- var a = this._renderQ[0];
- switch (a.type) {
- case 'flip':
- this.flip(true);
- break;
- case 'copy':
- this.copyImage(a.old_x, a.old_y, a.x, a.y, a.width, a.height, true);
- break;
- case 'fill':
- this.fillRect(a.x, a.y, a.width, a.height, a.color, true);
- break;
- case 'blit':
- this.blitImage(a.x, a.y, a.width, a.height, a.data, 0, true);
- break;
- case 'blitRgb':
- this.blitRgbImage(a.x, a.y, a.width, a.height, a.data, 0, true);
- break;
- case 'blitRgbx':
- this.blitRgbxImage(a.x, a.y, a.width, a.height, a.data, 0, true);
- break;
- case 'img':
- if (a.img.complete) {
- this.drawImage(a.img, a.x, a.y);
- } else {
- a.img._noVNC_display = this;
- a.img.addEventListener('load', this._resume_renderQ);
- // 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 && this._flushing) {
- this._flushing = false;
- this._onFlush();
- }
- },
-};
-
-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, "type": mime-type, "data": data}
- ['scale', 'rw', 'float'], // Display area scale factor 0.0 - 1.0
- ['viewport', 'rw', 'bool'], // Use viewport clipping
- ['width', 'ro', 'int'], // Display area width
- ['height', 'ro', '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
-
- ['onFlush', 'rw', 'func'], // onFlush(): A flush request has finished
-]);
-
-// Class Methods
-Display.changeCursor = function (target, pixels, mask, hotx, hoty, w, h) {
- if ((w === 0) || (h === 0)) {
- target.style.cursor = 'none';
- return;
- }
-
- var cur = []
- var y, x;
- for (y = 0; y < h; y++) {
- for (x = 0; x < w; x++) {
- var idx = y * Math.ceil(w / 8) + Math.floor(x / 8);
- var alpha = (mask[idx] << (x % 8)) & 0x80 ? 255 : 0;
- idx = ((w * y) + x) * 4;
- cur.push(pixels[idx + 2]); // red
- cur.push(pixels[idx + 1]); // green
- cur.push(pixels[idx]); // blue
- cur.push(alpha); // alpha
- }
- }
-
- var canvas = document.createElement('canvas');
- var ctx = canvas.getContext('2d');
-
- canvas.width = w;
- canvas.height = h;
-
- var img;
- if (SUPPORTS_IMAGEDATA_CONSTRUCTOR) {
- img = new ImageData(new Uint8ClampedArray(cur), w, h);
- } else {
- img = ctx.createImageData(w, h);
- img.data.set(new Uint8ClampedArray(cur));
- }
- ctx.clearRect(0, 0, w, h);
- ctx.putImageData(img, 0, 0);
-
- var url = canvas.toDataURL();
- target.style.cursor = 'url(' + url + ')' + hotx + ' ' + hoty + ', default';
-};
diff --git a/core/inflator.js b/core/inflator.js
deleted file mode 100644
index a4d6ff6a..00000000
--- a/core/inflator.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { inflateInit, inflate, inflateReset } from "../vendor/pako/lib/zlib/inflate.js";
-import ZStream from "../vendor/pako/lib/zlib/zstream.js";
-
-Inflate.prototype = {
- inflate: function (data, flush, expected) {
- this.strm.input = data;
- this.strm.avail_in = this.strm.input.length;
- this.strm.next_in = 0;
- this.strm.next_out = 0;
-
- // resize our output buffer if it's too small
- // (we could just use multiple chunks, but that would cause an extra
- // allocation each time to flatten the chunks)
- if (expected > this.chunkSize) {
- this.chunkSize = expected;
- this.strm.output = new Uint8Array(this.chunkSize);
- }
-
- this.strm.avail_out = this.chunkSize;
-
- inflate(this.strm, flush);
-
- return new Uint8Array(this.strm.output.buffer, 0, this.strm.next_out);
- },
-
- reset: function () {
- inflateReset(this.strm);
- }
-};
-
-export default function Inflate() {
- this.strm = new ZStream();
- this.chunkSize = 1024 * 10 * 10;
- this.strm.output = new Uint8Array(this.chunkSize);
- this.windowBits = 5;
-
- inflateInit(this.strm, this.windowBits);
-};
diff --git a/core/input/devices.js b/core/input/devices.js
deleted file mode 100644
index ae09c7f8..00000000
--- a/core/input/devices.js
+++ /dev/null
@@ -1,575 +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 */
-
-import * as Log from '../util/logging.js';
-import { isTouchDevice } from '../util/browsers.js';
-import { setCapture, stopEvent, getPointerEvent } from '../util/events.js';
-import { set_defaults, make_properties } from '../util/properties.js';
-import * as KeyboardUtil from "./util.js";
-import KeyTable from "./keysym.js";
-
-//
-// Keyboard event handler
-//
-
-function Keyboard(defaults) {
- this._keyDownList = {}; // List of depressed keys
- // (even if they are happy)
- this._pendingKey = null; // Key waiting for keypress
-
- set_defaults(this, defaults, {
- 'target': document,
- 'focused': 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)
- };
-};
-
-function isMac() {
- return navigator && !!(/mac/i).exec(navigator.platform);
-}
-function isWindows() {
- return navigator && !!(/win/i).exec(navigator.platform);
-}
-function isIOS() {
- return navigator &&
- (!!(/ipad/i).exec(navigator.platform) ||
- !!(/iphone/i).exec(navigator.platform) ||
- !!(/ipod/i).exec(navigator.platform));
-}
-function isIE() {
- return navigator && !!(/trident/i).exec(navigator.userAgent);
-}
-function isEdge() {
- return navigator && !!(/edge/i).exec(navigator.userAgent);
-}
-
-Keyboard.prototype = {
- // private methods
-
- _sendKeyEvent: function (keysym, code, down) {
- if (!this._onKeyEvent) {
- return;
- }
-
- Log.Debug("onKeyEvent " + (down ? "down" : "up") +
- ", keysym: " + keysym, ", code: " + code);
-
- // Windows sends CtrlLeft+AltRight when you press
- // AltGraph, which tends to confuse the hell out of
- // remote systems. Fake a release of these keys until
- // there is a way to detect AltGraph properly.
- var fakeAltGraph = false;
- if (down && isWindows()) {
- if ((code !== 'ControlLeft') &&
- (code !== 'AltRight') &&
- ('ControlLeft' in this._keyDownList) &&
- ('AltRight' in this._keyDownList)) {
- fakeAltGraph = true;
- this._onKeyEvent(this._keyDownList['AltRight'],
- 'AltRight', false);
- this._onKeyEvent(this._keyDownList['ControlLeft'],
- 'ControlLeft', false);
- }
- }
-
- this._onKeyEvent(keysym, code, down);
-
- if (fakeAltGraph) {
- this._onKeyEvent(this._keyDownList['ControlLeft'],
- 'ControlLeft', true);
- this._onKeyEvent(this._keyDownList['AltRight'],
- 'AltRight', true);
- }
- },
-
- _getKeyCode: function (e) {
- var code = KeyboardUtil.getKeycode(e);
- if (code !== 'Unidentified') {
- return code;
- }
-
- // Unstable, but we don't have anything else to go on
- // (don't use it for 'keypress' events thought since
- // WebKit sets it to the same as charCode)
- if (e.keyCode && (e.type !== 'keypress')) {
- // 229 is used for composition events
- if (e.keyCode !== 229) {
- return 'Platform' + e.keyCode;
- }
- }
-
- // A precursor to the final DOM3 standard. Unfortunately it
- // is not layout independent, so it is as bad as using keyCode
- if (e.keyIdentifier) {
- // Non-character key?
- if (e.keyIdentifier.substr(0, 2) !== 'U+') {
- return e.keyIdentifier;
- }
-
- var codepoint = parseInt(e.keyIdentifier.substr(2), 16);
- var char = String.fromCharCode(codepoint);
- // Some implementations fail to uppercase the symbols
- char = char.toUpperCase();
-
- return 'Platform' + char.charCodeAt();
- }
-
- return 'Unidentified';
- },
-
- _handleKeyDown: function (e) {
- if (!this._focused) { return; }
-
- var code = this._getKeyCode(e);
- var keysym = KeyboardUtil.getKeysym(e);
-
- // We cannot handle keys we cannot track, but we also need
- // to deal with virtual keyboards which omit key info
- // (iOS omits tracking info on keyup events, which forces us to
- // special treat that platform here)
- if ((code === 'Unidentified') || isIOS()) {
- if (keysym) {
- // If it's a virtual keyboard then it should be
- // sufficient to just send press and release right
- // after each other
- this._sendKeyEvent(keysym, code, true);
- this._sendKeyEvent(keysym, code, false);
- }
-
- stopEvent(e);
- return;
- }
-
- // Alt behaves more like AltGraph on macOS, so shuffle the
- // keys around a bit to make things more sane for the remote
- // server. This method is used by RealVNC and TigerVNC (and
- // possibly others).
- if (isMac()) {
- switch (keysym) {
- case KeyTable.XK_Super_L:
- keysym = KeyTable.XK_Alt_L;
- break;
- case KeyTable.XK_Super_R:
- keysym = KeyTable.XK_Super_L;
- break;
- case KeyTable.XK_Alt_L:
- keysym = KeyTable.XK_Mode_switch;
- break;
- case KeyTable.XK_Alt_R:
- keysym = KeyTable.XK_ISO_Level3_Shift;
- break;
- }
- }
-
- // Is this key already pressed? If so, then we must use the
- // same keysym or we'll confuse the server
- if (code in this._keyDownList) {
- keysym = this._keyDownList[code];
- }
-
- // macOS doesn't send proper key events for modifiers, only
- // state change events. That gets extra confusing for CapsLock
- // which toggles on each press, but not on release. So pretend
- // it was a quick press and release of the button.
- if (isMac() && (code === 'CapsLock')) {
- this._sendKeyEvent(KeyTable.XK_Caps_Lock, 'CapsLock', true);
- this._sendKeyEvent(KeyTable.XK_Caps_Lock, 'CapsLock', false);
- stopEvent(e);
- return;
- }
-
- // If this is a legacy browser then we'll need to wait for
- // a keypress event as well
- // (IE and Edge has a broken KeyboardEvent.key, so we can't
- // just check for the presence of that field)
- if (!keysym && (!e.key || isIE() || isEdge())) {
- this._pendingKey = code;
- // However we might not get a keypress event if the key
- // is non-printable, which needs some special fallback
- // handling
- setTimeout(this._handleKeyPressTimeout.bind(this), 10, e);
- return;
- }
-
- this._pendingKey = null;
- stopEvent(e);
-
- this._keyDownList[code] = keysym;
-
- this._sendKeyEvent(keysym, code, true);
- },
-
- // Legacy event for browsers without code/key
- _handleKeyPress: function (e) {
- if (!this._focused) { return; }
-
- stopEvent(e);
-
- // Are we expecting a keypress?
- if (this._pendingKey === null) {
- return;
- }
-
- var code = this._getKeyCode(e);
- var keysym = KeyboardUtil.getKeysym(e);
-
- // The key we were waiting for?
- if ((code !== 'Unidentified') && (code != this._pendingKey)) {
- return;
- }
-
- code = this._pendingKey;
- this._pendingKey = null;
-
- if (!keysym) {
- console.log('keypress with no keysym:', e);
- return;
- }
-
- this._keyDownList[code] = keysym;
-
- this._sendKeyEvent(keysym, code, true);
- },
- _handleKeyPressTimeout: function (e) {
- if (!this._focused) { return; }
-
- // Did someone manage to sort out the key already?
- if (this._pendingKey === null) {
- return;
- }
-
- var code, keysym;
-
- code = this._pendingKey;
- this._pendingKey = null;
-
- // We have no way of knowing the proper keysym with the
- // information given, but the following are true for most
- // layouts
- if ((e.keyCode >= 0x30) && (e.keyCode <= 0x39)) {
- // Digit
- keysym = e.keyCode;
- } else if ((e.keyCode >= 0x41) && (e.keyCode <= 0x5a)) {
- // Character (A-Z)
- var char = String.fromCharCode(e.keyCode);
- // A feeble attempt at the correct case
- if (e.shiftKey)
- char = char.toUpperCase();
- else
- char = char.toLowerCase();
- keysym = char.charCodeAt();
- } else {
- // Unknown, give up
- keysym = 0;
- }
-
- this._keyDownList[code] = keysym;
-
- this._sendKeyEvent(keysym, code, true);
- },
-
- _handleKeyUp: function (e) {
- if (!this._focused) { return; }
-
- stopEvent(e);
-
- var code = this._getKeyCode(e);
-
- // See comment in _handleKeyDown()
- if (isMac() && (code === 'CapsLock')) {
- this._sendKeyEvent(KeyTable.XK_Caps_Lock, 'CapsLock', true);
- this._sendKeyEvent(KeyTable.XK_Caps_Lock, 'CapsLock', false);
- return;
- }
-
- // Do we really think this key is down?
- if (!(code in this._keyDownList)) {
- return;
- }
-
- this._sendKeyEvent(this._keyDownList[code], code, false);
-
- delete this._keyDownList[code];
- },
-
- _allKeysUp: function () {
- Log.Debug(">> Keyboard.allKeysUp");
- for (var code in this._keyDownList) {
- this._sendKeyEvent(this._keyDownList[code], code, false);
- };
- this._keyDownList = {};
- Log.Debug("<< Keyboard.allKeysUp");
- },
-
- // Public methods
-
- grab: function () {
- //Log.Debug(">> Keyboard.grab");
- var c = this._target;
-
- c.addEventListener('keydown', this._eventHandlers.keydown);
- c.addEventListener('keyup', this._eventHandlers.keyup);
- c.addEventListener('keypress', this._eventHandlers.keypress);
-
- // Release (key up) if window loses focus
- window.addEventListener('blur', this._eventHandlers.blur);
-
- //Log.Debug("<< Keyboard.grab");
- },
-
- ungrab: function () {
- //Log.Debug(">> Keyboard.ungrab");
- var c = this._target;
-
- c.removeEventListener('keydown', this._eventHandlers.keydown);
- c.removeEventListener('keyup', this._eventHandlers.keyup);
- c.removeEventListener('keypress', this._eventHandlers.keypress);
- window.removeEventListener('blur', this._eventHandlers.blur);
-
- // Release (key up) all keys that are in a down state
- this._allKeysUp();
-
- //Log.Debug(">> Keyboard.ungrab");
- },
-};
-
-make_properties(Keyboard, [
- ['target', 'wo', 'dom'], // DOM element that captures keyboard input
- ['focused', 'rw', 'bool'], // Capture and send key events
-
- ['onKeyEvent', 'rw', 'func'] // Handler for key press/release
-]);
-
-function Mouse(defaults) {
-
- this._doubleClickTimer = null;
- this._lastTouchPos = null;
-
- // Configuration attributes
- set_defaults(this, defaults, {
- 'target': document,
- 'focused': true,
- '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
-
- _resetDoubleClickTimer: function () {
- this._doubleClickTimer = null;
- },
-
- _handleMouseButton: function (e, down) {
- if (!this._focused) { return; }
-
- var pos = this._getMousePosition(e);
-
- var bmask;
- if (e.touches || e.changedTouches) {
- // Touch device
-
- // When two touches occur within 500 ms of each other and are
- // close enough 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.
- var threshold = 20 * (window.devicePixelRatio || 1);
- if (d < threshold) {
- pos = this._lastTouchPos;
- }
- }
- this._doubleClickTimer = setTimeout(this._resetDoubleClickTimer.bind(this), 500);
- }
- bmask = this._touchButton;
- // If bmask is set
- } else if (e.which) {
- /* everything except IE */
- bmask = 1 << e.button;
- } else {
- /* IE including 9 */
- bmask = (e.button & 0x1) + // Left
- (e.button & 0x2) * 2 + // Right
- (e.button & 0x4) / 2; // Middle
- }
-
- if (this._onMouseButton) {
- Log.Debug("onMouseButton " + (down ? "down" : "up") +
- ", x: " + pos.x + ", y: " + pos.y + ", bmask: " + bmask);
- this._onMouseButton(pos.x, pos.y, down, bmask);
- }
- stopEvent(e);
- },
-
- _handleMouseDown: function (e) {
- // Touch events have implicit capture
- if (e.type === "mousedown") {
- setCapture(this._target);
- }
-
- this._handleMouseButton(e, 1);
- },
-
- _handleMouseUp: function (e) {
- this._handleMouseButton(e, 0);
- },
-
- _handleMouseWheel: function (e) {
- if (!this._focused) { return; }
-
- var pos = this._getMousePosition(e);
-
- if (this._onMouseButton) {
- if (e.deltaX < 0) {
- this._onMouseButton(pos.x, pos.y, 1, 1 << 5);
- this._onMouseButton(pos.x, pos.y, 0, 1 << 5);
- } else if (e.deltaX > 0) {
- this._onMouseButton(pos.x, pos.y, 1, 1 << 6);
- this._onMouseButton(pos.x, pos.y, 0, 1 << 6);
- }
-
- if (e.deltaY < 0) {
- this._onMouseButton(pos.x, pos.y, 1, 1 << 3);
- this._onMouseButton(pos.x, pos.y, 0, 1 << 3);
- } else if (e.deltaY > 0) {
- this._onMouseButton(pos.x, pos.y, 1, 1 << 4);
- this._onMouseButton(pos.x, pos.y, 0, 1 << 4);
- }
- }
-
- stopEvent(e);
- },
-
- _handleMouseMove: function (e) {
- if (! this._focused) { return; }
-
- var pos = this._getMousePosition(e);
- if (this._onMouseMove) {
- this._onMouseMove(pos.x, pos.y);
- }
- stopEvent(e);
- },
-
- _handleMouseDisable: function (e) {
- if (!this._focused) { return; }
-
- /*
- * Stop propagation if inside canvas area
- * Note: This is only needed for the 'click' event as it fails
- * to fire properly for the target element so we have
- * to listen on the document element instead.
- */
- if (e.target == this._target) {
- stopEvent(e);
- }
- },
-
- // Return coordinates relative to target
- _getMousePosition: function(e) {
- e = getPointerEvent(e);
- var bounds = this._target.getBoundingClientRect();
- var x, y;
- // Clip to target bounds
- if (e.clientX < bounds.left) {
- x = 0;
- } else if (e.clientX >= bounds.right) {
- x = bounds.width - 1;
- } else {
- x = e.clientX - bounds.left;
- }
- if (e.clientY < bounds.top) {
- y = 0;
- } else if (e.clientY >= bounds.bottom) {
- y = bounds.height - 1;
- } else {
- y = e.clientY - bounds.top;
- }
- return {x:x, y:y};
- },
-
- // Public methods
- grab: function () {
- var c = this._target;
-
- if (isTouchDevice) {
- c.addEventListener('touchstart', this._eventHandlers.mousedown);
- c.addEventListener('touchend', this._eventHandlers.mouseup);
- c.addEventListener('touchmove', this._eventHandlers.mousemove);
- }
- c.addEventListener('mousedown', this._eventHandlers.mousedown);
- c.addEventListener('mouseup', this._eventHandlers.mouseup);
- c.addEventListener('mousemove', this._eventHandlers.mousemove);
- c.addEventListener('wheel', this._eventHandlers.mousewheel);
-
- /* Prevent middle-click pasting (see above for why we bind to document) */
- document.addEventListener('click', this._eventHandlers.mousedisable);
-
- /* preventDefault() on mousedown doesn't stop this event for some
- reason so we have to explicitly block it */
- c.addEventListener('contextmenu', this._eventHandlers.mousedisable);
- },
-
- ungrab: function () {
- var c = this._target;
-
- if (isTouchDevice) {
- c.removeEventListener('touchstart', this._eventHandlers.mousedown);
- c.removeEventListener('touchend', this._eventHandlers.mouseup);
- c.removeEventListener('touchmove', this._eventHandlers.mousemove);
- }
- c.removeEventListener('mousedown', this._eventHandlers.mousedown);
- c.removeEventListener('mouseup', this._eventHandlers.mouseup);
- c.removeEventListener('mousemove', this._eventHandlers.mousemove);
- c.removeEventListener('wheel', this._eventHandlers.mousewheel);
-
- document.removeEventListener('click', this._eventHandlers.mousedisable);
-
- c.removeEventListener('contextmenu', this._eventHandlers.mousedisable);
- }
-};
-
-make_properties(Mouse, [
- ['target', 'ro', 'dom'], // DOM element that captures mouse input
- ['focused', 'rw', 'bool'], // Capture and send mouse clicks/movement
-
- ['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)
-]);
-
-export { Keyboard, Mouse };
diff --git a/core/input/domkeytable.js b/core/input/domkeytable.js
deleted file mode 100644
index 7103bba7..00000000
--- a/core/input/domkeytable.js
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * noVNC: HTML5 VNC client
- * Copyright (C) 2017 Pierre Ossman for Cendio AB
- * Licensed under MPL 2.0 or any later version (see LICENSE.txt)
- */
-
-import KeyTable from "./keysym.js";
-
-/*
- * Mapping between HTML key values and VNC/X11 keysyms for "special"
- * keys that cannot be handled via their Unicode codepoint.
- *
- * See https://www.w3.org/TR/uievents-key/ for possible values.
- */
-
-var DOMKeyTable = {};
-
-function addStandard(key, standard)
-{
- if (standard === undefined) throw "Undefined keysym for key \"" + key + "\"";
- if (key in DOMKeyTable) throw "Duplicate entry for key \"" + key + "\"";
- DOMKeyTable[key] = [standard, standard, standard, standard];
-}
-
-function addLeftRight(key, left, right)
-{
- if (left === undefined) throw "Undefined keysym for key \"" + key + "\"";
- if (right === undefined) throw "Undefined keysym for key \"" + key + "\"";
- if (key in DOMKeyTable) throw "Duplicate entry for key \"" + key + "\"";
- DOMKeyTable[key] = [left, left, right, left];
-}
-
-function addNumpad(key, standard, numpad)
-{
- if (standard === undefined) throw "Undefined keysym for key \"" + key + "\"";
- if (numpad === undefined) throw "Undefined keysym for key \"" + key + "\"";
- if (key in DOMKeyTable) throw "Duplicate entry for key \"" + key + "\"";
- DOMKeyTable[key] = [standard, standard, standard, numpad];
-}
-
-// 2.2. Modifier Keys
-
-addLeftRight("Alt", KeyTable.XK_Alt_L, KeyTable.XK_Alt_R);
-addStandard("AltGraph", KeyTable.XK_ISO_Level3_Shift);
-addStandard("CapsLock", KeyTable.XK_Caps_Lock);
-addLeftRight("Control", KeyTable.XK_Control_L, KeyTable.XK_Control_R);
-// - Fn
-// - FnLock
-addLeftRight("Hyper", KeyTable.XK_Super_L, KeyTable.XK_Super_R);
-addLeftRight("Meta", KeyTable.XK_Super_L, KeyTable.XK_Super_R);
-addStandard("NumLock", KeyTable.XK_Num_Lock);
-addStandard("ScrollLock", KeyTable.XK_Scroll_Lock);
-addLeftRight("Shift", KeyTable.XK_Shift_L, KeyTable.XK_Shift_R);
-addLeftRight("Super", KeyTable.XK_Super_L, KeyTable.XK_Super_R);
-// - Symbol
-// - SymbolLock
-
-// 2.3. Whitespace Keys
-
-addNumpad("Enter", KeyTable.XK_Return, KeyTable.XK_KP_Enter);
-addStandard("Tab", KeyTable.XK_Tab);
-addNumpad(" ", KeyTable.XK_space, KeyTable.XK_KP_Space);
-
-// 2.4. Navigation Keys
-
-addNumpad("ArrowDown", KeyTable.XK_Down, KeyTable.XK_KP_Down);
-addNumpad("ArrowUp", KeyTable.XK_Up, KeyTable.XK_KP_Up);
-addNumpad("ArrowLeft", KeyTable.XK_Left, KeyTable.XK_KP_Left);
-addNumpad("ArrowRight", KeyTable.XK_Right, KeyTable.XK_KP_Right);
-addNumpad("End", KeyTable.XK_End, KeyTable.XK_KP_End);
-addNumpad("Home", KeyTable.XK_Home, KeyTable.XK_KP_Home);
-addNumpad("PageDown", KeyTable.XK_Next, KeyTable.XK_KP_Next);
-addNumpad("PageUp", KeyTable.XK_Prior, KeyTable.XK_KP_Prior);
-
-// 2.5. Editing Keys
-
-addStandard("Backspace", KeyTable.XK_BackSpace);
-addStandard("Clear", KeyTable.XK_Clear);
-addStandard("Copy", KeyTable.XF86XK_Copy);
-// - CrSel
-addStandard("Cut", KeyTable.XF86XK_Cut);
-addNumpad("Delete", KeyTable.XK_Delete, KeyTable.XK_KP_Delete);
-// - EraseEof
-// - ExSel
-addNumpad("Insert", KeyTable.XK_Insert, KeyTable.XK_KP_Insert);
-addStandard("Paste", KeyTable.XF86XK_Paste);
-addStandard("Redo", KeyTable.XK_Redo);
-addStandard("Undo", KeyTable.XK_Undo);
-
-// 2.6. UI Keys
-
-// - Accept
-// - Again (could just be XK_Redo)
-// - Attn
-addStandard("Cancel", KeyTable.XK_Cancel);
-addStandard("ContextMenu", KeyTable.XK_Menu);
-addStandard("Escape", KeyTable.XK_Escape);
-addStandard("Execute", KeyTable.XK_Execute);
-addStandard("Find", KeyTable.XK_Find);
-addStandard("Help", KeyTable.XK_Help);
-addStandard("Pause", KeyTable.XK_Pause);
-// - Play
-// - Props
-addStandard("Select", KeyTable.XK_Select);
-addStandard("ZoomIn", KeyTable.XF86XK_ZoomIn);
-addStandard("ZoomOut", KeyTable.XF86XK_ZoomOut);
-
-// 2.7. Device Keys
-
-addStandard("BrightnessDown", KeyTable.XF86XK_MonBrightnessDown);
-addStandard("BrightnessUp", KeyTable.XF86XK_MonBrightnessUp);
-addStandard("Eject", KeyTable.XF86XK_Eject);
-addStandard("LogOff", KeyTable.XF86XK_LogOff);
-addStandard("Power", KeyTable.XF86XK_PowerOff);
-addStandard("PowerOff", KeyTable.XF86XK_PowerDown);
-addStandard("PrintScreen", KeyTable.XK_Print);
-addStandard("Hibernate", KeyTable.XF86XK_Hibernate);
-addStandard("Standby", KeyTable.XF86XK_Standby);
-addStandard("WakeUp", KeyTable.XF86XK_WakeUp);
-
-// 2.8. IME and Composition Keys
-
-addStandard("AllCandidates", KeyTable.XK_MultipleCandidate);
-addStandard("Alphanumeric", KeyTable.XK_Eisu_Shift); // could also be _Eisu_Toggle
-addStandard("CodeInput", KeyTable.XK_Codeinput);
-addStandard("Compose", KeyTable.XK_Multi_key);
-addStandard("Convert", KeyTable.XK_Henkan);
-// - Dead
-// - FinalMode
-addStandard("GroupFirst", KeyTable.XK_ISO_First_Group);
-addStandard("GroupLast", KeyTable.XK_ISO_Last_Group);
-addStandard("GroupNext", KeyTable.XK_ISO_Next_Group);
-addStandard("GroupPrevious", KeyTable.XK_ISO_Prev_Group);
-// - ModeChange (XK_Mode_switch is often used for AltGr)
-// - NextCandidate
-addStandard("NonConvert", KeyTable.XK_Muhenkan);
-addStandard("PreviousCandidate", KeyTable.XK_PreviousCandidate);
-// - Process
-addStandard("SingleCandidate", KeyTable.XK_SingleCandidate);
-addStandard("HangulMode", KeyTable.XK_Hangul);
-addStandard("HanjaMode", KeyTable.XK_Hangul_Hanja);
-addStandard("JunjuaMode", KeyTable.XK_Hangul_Jeonja);
-addStandard("Eisu", KeyTable.XK_Eisu_toggle);
-addStandard("Hankaku", KeyTable.XK_Hankaku);
-addStandard("Hiragana", KeyTable.XK_Hiragana);
-addStandard("HiraganaKatakana", KeyTable.XK_Hiragana_Katakana);
-addStandard("KanaMode", KeyTable.XK_Kana_Shift); // could also be _Kana_Lock
-addStandard("KanjiMode", KeyTable.XK_Kanji);
-addStandard("Katakana", KeyTable.XK_Katakana);
-addStandard("Romaji", KeyTable.XK_Romaji);
-addStandard("Zenkaku", KeyTable.XK_Zenkaku);
-addStandard("ZenkakuHanaku", KeyTable.XK_Zenkaku_Hankaku);
-
-// 2.9. General-Purpose Function Keys
-
-addStandard("F1", KeyTable.XK_F1);
-addStandard("F2", KeyTable.XK_F2);
-addStandard("F3", KeyTable.XK_F3);
-addStandard("F4", KeyTable.XK_F4);
-addStandard("F5", KeyTable.XK_F5);
-addStandard("F6", KeyTable.XK_F6);
-addStandard("F7", KeyTable.XK_F7);
-addStandard("F8", KeyTable.XK_F8);
-addStandard("F9", KeyTable.XK_F9);
-addStandard("F10", KeyTable.XK_F10);
-addStandard("F11", KeyTable.XK_F11);
-addStandard("F12", KeyTable.XK_F12);
-addStandard("F13", KeyTable.XK_F13);
-addStandard("F14", KeyTable.XK_F14);
-addStandard("F15", KeyTable.XK_F15);
-addStandard("F16", KeyTable.XK_F16);
-addStandard("F17", KeyTable.XK_F17);
-addStandard("F18", KeyTable.XK_F18);
-addStandard("F19", KeyTable.XK_F19);
-addStandard("F20", KeyTable.XK_F20);
-addStandard("F21", KeyTable.XK_F21);
-addStandard("F22", KeyTable.XK_F22);
-addStandard("F23", KeyTable.XK_F23);
-addStandard("F24", KeyTable.XK_F24);
-addStandard("F25", KeyTable.XK_F25);
-addStandard("F26", KeyTable.XK_F26);
-addStandard("F27", KeyTable.XK_F27);
-addStandard("F28", KeyTable.XK_F28);
-addStandard("F29", KeyTable.XK_F29);
-addStandard("F30", KeyTable.XK_F30);
-addStandard("F31", KeyTable.XK_F31);
-addStandard("F32", KeyTable.XK_F32);
-addStandard("F33", KeyTable.XK_F33);
-addStandard("F34", KeyTable.XK_F34);
-addStandard("F35", KeyTable.XK_F35);
-// - Soft1...
-
-// 2.10. Multimedia Keys
-
-// - ChannelDown
-// - ChannelUp
-addStandard("Close", KeyTable.XF86XK_Close);
-addStandard("MailForward", KeyTable.XF86XK_MailForward);
-addStandard("MailReply", KeyTable.XF86XK_Reply);
-addStandard("MainSend", KeyTable.XF86XK_Send);
-addStandard("MediaFastForward", KeyTable.XF86XK_AudioForward);
-addStandard("MediaPause", KeyTable.XF86XK_AudioPause);
-addStandard("MediaPlay", KeyTable.XF86XK_AudioPlay);
-addStandard("MediaRecord", KeyTable.XF86XK_AudioRecord);
-addStandard("MediaRewind", KeyTable.XF86XK_AudioRewind);
-addStandard("MediaStop", KeyTable.XF86XK_AudioStop);
-addStandard("MediaTrackNext", KeyTable.XF86XK_AudioNext);
-addStandard("MediaTrackPrevious", KeyTable.XF86XK_AudioPrev);
-addStandard("New", KeyTable.XF86XK_New);
-addStandard("Open", KeyTable.XF86XK_Open);
-addStandard("Print", KeyTable.XK_Print);
-addStandard("Save", KeyTable.XF86XK_Save);
-addStandard("SpellCheck", KeyTable.XF86XK_Spell);
-
-// 2.11. Multimedia Numpad Keys
-
-// - Key11
-// - Key12
-
-// 2.12. Audio Keys
-
-// - AudioBalanceLeft
-// - AudioBalanceRight
-// - AudioBassDown
-// - AudioBassBoostDown
-// - AudioBassBoostToggle
-// - AudioBassBoostUp
-// - AudioBassUp
-// - AudioFaderFront
-// - AudioFaderRear
-// - AudioSurroundModeNext
-// - AudioTrebleDown
-// - AudioTrebleUp
-addStandard("AudioVolumeDown", KeyTable.XF86XK_AudioLowerVolume);
-addStandard("AudioVolumeUp", KeyTable.XF86XK_AudioRaiseVolume);
-addStandard("AudioVolumeMute", KeyTable.XF86XK_AudioMute);
-// - MicrophoneToggle
-// - MicrophoneVolumeDown
-// - MicrophoneVolumeUp
-addStandard("MicrophoneVolumeMute", KeyTable.XF86XK_AudioMicMute);
-
-// 2.13. Speech Keys
-
-// - SpeechCorrectionList
-// - SpeechInputToggle
-
-// 2.14. Application Keys
-
-addStandard("LaunchCalculator", KeyTable.XF86XK_Calculator);
-addStandard("LaunchCalendar", KeyTable.XF86XK_Calendar);
-addStandard("LaunchMail", KeyTable.XF86XK_Mail);
-addStandard("LaunchMediaPlayer", KeyTable.XF86XK_AudioMedia);
-addStandard("LaunchMusicPlayer", KeyTable.XF86XK_Music);
-addStandard("LaunchMyComputer", KeyTable.XF86XK_MyComputer);
-addStandard("LaunchPhone", KeyTable.XF86XK_Phone);
-addStandard("LaunchScreenSaver", KeyTable.XF86XK_ScreenSaver);
-addStandard("LaunchSpreadsheet", KeyTable.XF86XK_Excel);
-addStandard("LaunchWebBrowser", KeyTable.XF86XK_WWW);
-addStandard("LaunchWebCam", KeyTable.XF86XK_WebCam);
-addStandard("LaunchWordProcessor", KeyTable.XF86XK_Word);
-
-// 2.15. Browser Keys
-
-addStandard("BrowserBack", KeyTable.XF86XK_Back);
-addStandard("BrowserFavorites", KeyTable.XF86XK_Favorites);
-addStandard("BrowserForward", KeyTable.XF86XK_Forward);
-addStandard("BrowserHome", KeyTable.XF86XK_HomePage);
-addStandard("BrowserRefresh", KeyTable.XF86XK_Refresh);
-addStandard("BrowserSearch", KeyTable.XF86XK_Search);
-addStandard("BrowserStop", KeyTable.XF86XK_Stop);
-
-// 2.16. Mobile Phone Keys
-
-// - A whole bunch...
-
-// 2.17. TV Keys
-
-// - A whole bunch...
-
-// 2.18. Media Controller Keys
-
-// - A whole bunch...
-addStandard("Dimmer", KeyTable.XF86XK_BrightnessAdjust);
-addStandard("MediaAudioTrack", KeyTable.XF86XK_AudioCycleTrack);
-addStandard("RandomToggle", KeyTable.XF86XK_AudioRandomPlay);
-addStandard("SplitScreenToggle", KeyTable.XF86XK_SplitScreen);
-addStandard("Subtitle", KeyTable.XF86XK_Subtitle);
-addStandard("VideoModeNext", KeyTable.XF86XK_Next_VMode);
-
-// Extra: Numpad
-
-addNumpad("=", KeyTable.XK_equal, KeyTable.XK_KP_Equal);
-addNumpad("+", KeyTable.XK_plus, KeyTable.XK_KP_Add);
-addNumpad("-", KeyTable.XK_minus, KeyTable.XK_KP_Subtract);
-addNumpad("*", KeyTable.XK_asterisk, KeyTable.XK_KP_Multiply);
-addNumpad("/", KeyTable.XK_slash, KeyTable.XK_KP_Divide);
-addNumpad(".", KeyTable.XK_period, KeyTable.XK_KP_Decimal);
-addNumpad(",", KeyTable.XK_comma, KeyTable.XK_KP_Separator);
-addNumpad("0", KeyTable.XK_0, KeyTable.XK_KP_0);
-addNumpad("1", KeyTable.XK_1, KeyTable.XK_KP_1);
-addNumpad("2", KeyTable.XK_2, KeyTable.XK_KP_2);
-addNumpad("3", KeyTable.XK_3, KeyTable.XK_KP_3);
-addNumpad("4", KeyTable.XK_4, KeyTable.XK_KP_4);
-addNumpad("5", KeyTable.XK_5, KeyTable.XK_KP_5);
-addNumpad("6", KeyTable.XK_6, KeyTable.XK_KP_6);
-addNumpad("7", KeyTable.XK_7, KeyTable.XK_KP_7);
-addNumpad("8", KeyTable.XK_8, KeyTable.XK_KP_8);
-addNumpad("9", KeyTable.XK_9, KeyTable.XK_KP_9);
-
-export default DOMKeyTable;
diff --git a/core/input/fixedkeys.js b/core/input/fixedkeys.js
deleted file mode 100644
index 6dd42223..00000000
--- a/core/input/fixedkeys.js
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * noVNC: HTML5 VNC client
- * Copyright (C) 2017 Pierre Ossman for Cendio AB
- * Licensed under MPL 2.0 or any later version (see LICENSE.txt)
- */
-
-/*
- * Fallback mapping between HTML key codes (physical keys) and
- * HTML key values. This only works for keys that don't vary
- * between layouts. We also omit those who manage fine by mapping the
- * Unicode representation.
- *
- * See https://www.w3.org/TR/uievents-code/ for possible codes.
- * See https://www.w3.org/TR/uievents-key/ for possible values.
- */
-
-export default {
-
-// 3.1.1.1. Writing System Keys
-
- 'Backspace': 'Backspace',
-
-// 3.1.1.2. Functional Keys
-
- 'AltLeft': 'Alt',
- 'AltRight': 'Alt', // This could also be 'AltGraph'
- 'CapsLock': 'CapsLock',
- 'ContextMenu': 'ContextMenu',
- 'ControlLeft': 'Control',
- 'ControlRight': 'Control',
- 'Enter': 'Enter',
- 'MetaLeft': 'Meta',
- 'MetaRight': 'Meta',
- 'ShiftLeft': 'Shift',
- 'ShiftRight': 'Shift',
- 'Tab': 'Tab',
- // FIXME: Japanese/Korean keys
-
-// 3.1.2. Control Pad Section
-
- 'Delete': 'Delete',
- 'End': 'End',
- 'Help': 'Help',
- 'Home': 'Home',
- 'Insert': 'Insert',
- 'PageDown': 'PageDown',
- 'PageUp': 'PageUp',
-
-// 3.1.3. Arrow Pad Section
-
- 'ArrowDown': 'ArrowDown',
- 'ArrowLeft': 'ArrowLeft',
- 'ArrowRight': 'ArrowRight',
- 'ArrowUp': 'ArrowUp',
-
-// 3.1.4. Numpad Section
-
- 'NumLock': 'NumLock',
- 'NumpadBackspace': 'Backspace',
- 'NumpadClear': 'Clear',
-
-// 3.1.5. Function Section
-
- 'Escape': 'Escape',
- 'F1': 'F1',
- 'F2': 'F2',
- 'F3': 'F3',
- 'F4': 'F4',
- 'F5': 'F5',
- 'F6': 'F6',
- 'F7': 'F7',
- 'F8': 'F8',
- 'F9': 'F9',
- 'F10': 'F10',
- 'F11': 'F11',
- 'F12': 'F12',
- 'F13': 'F13',
- 'F14': 'F14',
- 'F15': 'F15',
- 'F16': 'F16',
- 'F17': 'F17',
- 'F18': 'F18',
- 'F19': 'F19',
- 'F20': 'F20',
- 'F21': 'F21',
- 'F22': 'F22',
- 'F23': 'F23',
- 'F24': 'F24',
- 'F25': 'F25',
- 'F26': 'F26',
- 'F27': 'F27',
- 'F28': 'F28',
- 'F29': 'F29',
- 'F30': 'F30',
- 'F31': 'F31',
- 'F32': 'F32',
- 'F33': 'F33',
- 'F34': 'F34',
- 'F35': 'F35',
- 'PrintScreen': 'PrintScreen',
- 'ScrollLock': 'ScrollLock',
- 'Pause': 'Pause',
-
-// 3.1.6. Media Keys
-
- 'BrowserBack': 'BrowserBack',
- 'BrowserFavorites': 'BrowserFavorites',
- 'BrowserForward': 'BrowserForward',
- 'BrowserHome': 'BrowserHome',
- 'BrowserRefresh': 'BrowserRefresh',
- 'BrowserSearch': 'BrowserSearch',
- 'BrowserStop': 'BrowserStop',
- 'Eject': 'Eject',
- 'LaunchApp1': 'LaunchMyComputer',
- 'LaunchApp2': 'LaunchCalendar',
- 'LaunchMail': 'LaunchMail',
- 'MediaPlayPause': 'MediaPlay',
- 'MediaStop': 'MediaStop',
- 'MediaTrackNext': 'MediaTrackNext',
- 'MediaTrackPrevious': 'MediaTrackPrevious',
- 'Power': 'Power',
- 'Sleep': 'Sleep',
- 'AudioVolumeDown': 'AudioVolumeDown',
- 'AudioVolumeMute': 'AudioVolumeMute',
- 'AudioVolumeUp': 'AudioVolumeUp',
- 'WakeUp': 'WakeUp',
-};
diff --git a/core/input/keysym.js b/core/input/keysym.js
deleted file mode 100644
index ba58be68..00000000
--- a/core/input/keysym.js
+++ /dev/null
@@ -1,614 +0,0 @@
-export default {
- 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 */
-
- /* International & multi-key character composition */
-
- XK_Multi_key: 0xff20, /* Multi-key character compose */
- XK_Codeinput: 0xff37,
- XK_SingleCandidate: 0xff3c,
- XK_MultipleCandidate: 0xff3d,
- XK_PreviousCandidate: 0xff3e,
-
- /* Japanese keyboard support */
-
- XK_Kanji: 0xff21, /* Kanji, Kanji convert */
- XK_Muhenkan: 0xff22, /* Cancel Conversion */
- XK_Henkan_Mode: 0xff23, /* Start/Stop Conversion */
- XK_Henkan: 0xff23, /* Alias for Henkan_Mode */
- XK_Romaji: 0xff24, /* to Romaji */
- XK_Hiragana: 0xff25, /* to Hiragana */
- XK_Katakana: 0xff26, /* to Katakana */
- XK_Hiragana_Katakana: 0xff27, /* Hiragana/Katakana toggle */
- XK_Zenkaku: 0xff28, /* to Zenkaku */
- XK_Hankaku: 0xff29, /* to Hankaku */
- XK_Zenkaku_Hankaku: 0xff2a, /* Zenkaku/Hankaku toggle */
- XK_Touroku: 0xff2b, /* Add to Dictionary */
- XK_Massyo: 0xff2c, /* Delete from Dictionary */
- XK_Kana_Lock: 0xff2d, /* Kana Lock */
- XK_Kana_Shift: 0xff2e, /* Kana Shift */
- XK_Eisu_Shift: 0xff2f, /* Alphanumeric Shift */
- XK_Eisu_toggle: 0xff30, /* Alphanumeric toggle */
- XK_Kanji_Bangou: 0xff37, /* Codeinput */
- XK_Zen_Koho: 0xff3d, /* Multiple/All Candidate(s) */
- XK_Mae_Koho: 0xff3e, /* Previous Candidate */
-
- /* 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 */
-
- /*
- * Keyboard (XKB) Extension function and modifier keys
- * (from Appendix C of "The X Keyboard Extension: Protocol Specification")
- * Byte 3 = 0xfe
- */
-
- XK_ISO_Level3_Shift: 0xfe03, /* AltGr */
- XK_ISO_Next_Group: 0xfe08,
- XK_ISO_Prev_Group: 0xfe0a,
- XK_ISO_First_Group: 0xfe0c,
- XK_ISO_Last_Group: 0xfe0e,
-
- /*
- * 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 */
-
- /*
- * Korean
- * Byte 3 = 0x0e
- */
-
- XK_Hangul: 0xff31, /* Hangul start/stop(toggle) */
- XK_Hangul_Hanja: 0xff34, /* Start Hangul->Hanja Conversion */
- XK_Hangul_Jeonja: 0xff38, /* Jeonja mode */
-
- /*
- * XFree86 vendor specific keysyms.
- *
- * The XFree86 keysym range is 0x10080001 - 0x1008FFFF.
- */
-
- XF86XK_ModeLock: 0x1008FF01,
- XF86XK_MonBrightnessUp: 0x1008FF02,
- XF86XK_MonBrightnessDown: 0x1008FF03,
- XF86XK_KbdLightOnOff: 0x1008FF04,
- XF86XK_KbdBrightnessUp: 0x1008FF05,
- XF86XK_KbdBrightnessDown: 0x1008FF06,
- XF86XK_Standby: 0x1008FF10,
- XF86XK_AudioLowerVolume: 0x1008FF11,
- XF86XK_AudioMute: 0x1008FF12,
- XF86XK_AudioRaiseVolume: 0x1008FF13,
- XF86XK_AudioPlay: 0x1008FF14,
- XF86XK_AudioStop: 0x1008FF15,
- XF86XK_AudioPrev: 0x1008FF16,
- XF86XK_AudioNext: 0x1008FF17,
- XF86XK_HomePage: 0x1008FF18,
- XF86XK_Mail: 0x1008FF19,
- XF86XK_Start: 0x1008FF1A,
- XF86XK_Search: 0x1008FF1B,
- XF86XK_AudioRecord: 0x1008FF1C,
- XF86XK_Calculator: 0x1008FF1D,
- XF86XK_Memo: 0x1008FF1E,
- XF86XK_ToDoList: 0x1008FF1F,
- XF86XK_Calendar: 0x1008FF20,
- XF86XK_PowerDown: 0x1008FF21,
- XF86XK_ContrastAdjust: 0x1008FF22,
- XF86XK_RockerUp: 0x1008FF23,
- XF86XK_RockerDown: 0x1008FF24,
- XF86XK_RockerEnter: 0x1008FF25,
- XF86XK_Back: 0x1008FF26,
- XF86XK_Forward: 0x1008FF27,
- XF86XK_Stop: 0x1008FF28,
- XF86XK_Refresh: 0x1008FF29,
- XF86XK_PowerOff: 0x1008FF2A,
- XF86XK_WakeUp: 0x1008FF2B,
- XF86XK_Eject: 0x1008FF2C,
- XF86XK_ScreenSaver: 0x1008FF2D,
- XF86XK_WWW: 0x1008FF2E,
- XF86XK_Sleep: 0x1008FF2F,
- XF86XK_Favorites: 0x1008FF30,
- XF86XK_AudioPause: 0x1008FF31,
- XF86XK_AudioMedia: 0x1008FF32,
- XF86XK_MyComputer: 0x1008FF33,
- XF86XK_VendorHome: 0x1008FF34,
- XF86XK_LightBulb: 0x1008FF35,
- XF86XK_Shop: 0x1008FF36,
- XF86XK_History: 0x1008FF37,
- XF86XK_OpenURL: 0x1008FF38,
- XF86XK_AddFavorite: 0x1008FF39,
- XF86XK_HotLinks: 0x1008FF3A,
- XF86XK_BrightnessAdjust: 0x1008FF3B,
- XF86XK_Finance: 0x1008FF3C,
- XF86XK_Community: 0x1008FF3D,
- XF86XK_AudioRewind: 0x1008FF3E,
- XF86XK_BackForward: 0x1008FF3F,
- XF86XK_Launch0: 0x1008FF40,
- XF86XK_Launch1: 0x1008FF41,
- XF86XK_Launch2: 0x1008FF42,
- XF86XK_Launch3: 0x1008FF43,
- XF86XK_Launch4: 0x1008FF44,
- XF86XK_Launch5: 0x1008FF45,
- XF86XK_Launch6: 0x1008FF46,
- XF86XK_Launch7: 0x1008FF47,
- XF86XK_Launch8: 0x1008FF48,
- XF86XK_Launch9: 0x1008FF49,
- XF86XK_LaunchA: 0x1008FF4A,
- XF86XK_LaunchB: 0x1008FF4B,
- XF86XK_LaunchC: 0x1008FF4C,
- XF86XK_LaunchD: 0x1008FF4D,
- XF86XK_LaunchE: 0x1008FF4E,
- XF86XK_LaunchF: 0x1008FF4F,
- XF86XK_ApplicationLeft: 0x1008FF50,
- XF86XK_ApplicationRight: 0x1008FF51,
- XF86XK_Book: 0x1008FF52,
- XF86XK_CD: 0x1008FF53,
- XF86XK_Calculater: 0x1008FF54,
- XF86XK_Clear: 0x1008FF55,
- XF86XK_Close: 0x1008FF56,
- XF86XK_Copy: 0x1008FF57,
- XF86XK_Cut: 0x1008FF58,
- XF86XK_Display: 0x1008FF59,
- XF86XK_DOS: 0x1008FF5A,
- XF86XK_Documents: 0x1008FF5B,
- XF86XK_Excel: 0x1008FF5C,
- XF86XK_Explorer: 0x1008FF5D,
- XF86XK_Game: 0x1008FF5E,
- XF86XK_Go: 0x1008FF5F,
- XF86XK_iTouch: 0x1008FF60,
- XF86XK_LogOff: 0x1008FF61,
- XF86XK_Market: 0x1008FF62,
- XF86XK_Meeting: 0x1008FF63,
- XF86XK_MenuKB: 0x1008FF65,
- XF86XK_MenuPB: 0x1008FF66,
- XF86XK_MySites: 0x1008FF67,
- XF86XK_New: 0x1008FF68,
- XF86XK_News: 0x1008FF69,
- XF86XK_OfficeHome: 0x1008FF6A,
- XF86XK_Open: 0x1008FF6B,
- XF86XK_Option: 0x1008FF6C,
- XF86XK_Paste: 0x1008FF6D,
- XF86XK_Phone: 0x1008FF6E,
- XF86XK_Q: 0x1008FF70,
- XF86XK_Reply: 0x1008FF72,
- XF86XK_Reload: 0x1008FF73,
- XF86XK_RotateWindows: 0x1008FF74,
- XF86XK_RotationPB: 0x1008FF75,
- XF86XK_RotationKB: 0x1008FF76,
- XF86XK_Save: 0x1008FF77,
- XF86XK_ScrollUp: 0x1008FF78,
- XF86XK_ScrollDown: 0x1008FF79,
- XF86XK_ScrollClick: 0x1008FF7A,
- XF86XK_Send: 0x1008FF7B,
- XF86XK_Spell: 0x1008FF7C,
- XF86XK_SplitScreen: 0x1008FF7D,
- XF86XK_Support: 0x1008FF7E,
- XF86XK_TaskPane: 0x1008FF7F,
- XF86XK_Terminal: 0x1008FF80,
- XF86XK_Tools: 0x1008FF81,
- XF86XK_Travel: 0x1008FF82,
- XF86XK_UserPB: 0x1008FF84,
- XF86XK_User1KB: 0x1008FF85,
- XF86XK_User2KB: 0x1008FF86,
- XF86XK_Video: 0x1008FF87,
- XF86XK_WheelButton: 0x1008FF88,
- XF86XK_Word: 0x1008FF89,
- XF86XK_Xfer: 0x1008FF8A,
- XF86XK_ZoomIn: 0x1008FF8B,
- XF86XK_ZoomOut: 0x1008FF8C,
- XF86XK_Away: 0x1008FF8D,
- XF86XK_Messenger: 0x1008FF8E,
- XF86XK_WebCam: 0x1008FF8F,
- XF86XK_MailForward: 0x1008FF90,
- XF86XK_Pictures: 0x1008FF91,
- XF86XK_Music: 0x1008FF92,
- XF86XK_Battery: 0x1008FF93,
- XF86XK_Bluetooth: 0x1008FF94,
- XF86XK_WLAN: 0x1008FF95,
- XF86XK_UWB: 0x1008FF96,
- XF86XK_AudioForward: 0x1008FF97,
- XF86XK_AudioRepeat: 0x1008FF98,
- XF86XK_AudioRandomPlay: 0x1008FF99,
- XF86XK_Subtitle: 0x1008FF9A,
- XF86XK_AudioCycleTrack: 0x1008FF9B,
- XF86XK_CycleAngle: 0x1008FF9C,
- XF86XK_FrameBack: 0x1008FF9D,
- XF86XK_FrameForward: 0x1008FF9E,
- XF86XK_Time: 0x1008FF9F,
- XF86XK_Select: 0x1008FFA0,
- XF86XK_View: 0x1008FFA1,
- XF86XK_TopMenu: 0x1008FFA2,
- XF86XK_Red: 0x1008FFA3,
- XF86XK_Green: 0x1008FFA4,
- XF86XK_Yellow: 0x1008FFA5,
- XF86XK_Blue: 0x1008FFA6,
- XF86XK_Suspend: 0x1008FFA7,
- XF86XK_Hibernate: 0x1008FFA8,
- XF86XK_TouchpadToggle: 0x1008FFA9,
- XF86XK_TouchpadOn: 0x1008FFB0,
- XF86XK_TouchpadOff: 0x1008FFB1,
- XF86XK_AudioMicMute: 0x1008FFB2,
- XF86XK_Switch_VT_1: 0x1008FE01,
- XF86XK_Switch_VT_2: 0x1008FE02,
- XF86XK_Switch_VT_3: 0x1008FE03,
- XF86XK_Switch_VT_4: 0x1008FE04,
- XF86XK_Switch_VT_5: 0x1008FE05,
- XF86XK_Switch_VT_6: 0x1008FE06,
- XF86XK_Switch_VT_7: 0x1008FE07,
- XF86XK_Switch_VT_8: 0x1008FE08,
- XF86XK_Switch_VT_9: 0x1008FE09,
- XF86XK_Switch_VT_10: 0x1008FE0A,
- XF86XK_Switch_VT_11: 0x1008FE0B,
- XF86XK_Switch_VT_12: 0x1008FE0C,
- XF86XK_Ungrab: 0x1008FE20,
- XF86XK_ClearGrab: 0x1008FE21,
- XF86XK_Next_VMode: 0x1008FE22,
- XF86XK_Prev_VMode: 0x1008FE23,
- XF86XK_LogWindowTree: 0x1008FE24,
- XF86XK_LogGrabInfo: 0x1008FE25,
-};
diff --git a/core/input/keysymdef.js b/core/input/keysymdef.js
deleted file mode 100644
index 95922b30..00000000
--- a/core/input/keysymdef.js
+++ /dev/null
@@ -1,688 +0,0 @@
-/*
- * Mapping from Unicode codepoints to X11/RFB keysyms
- *
- * This file was automatically generated from keysymdef.h
- * DO NOT EDIT!
- */
-
-/* Functions at the bottom */
-
-var codepoints = {
- 0x0100: 0x03c0, // XK_Amacron
- 0x0101: 0x03e0, // XK_amacron
- 0x0102: 0x01c3, // XK_Abreve
- 0x0103: 0x01e3, // XK_abreve
- 0x0104: 0x01a1, // XK_Aogonek
- 0x0105: 0x01b1, // XK_aogonek
- 0x0106: 0x01c6, // XK_Cacute
- 0x0107: 0x01e6, // XK_cacute
- 0x0108: 0x02c6, // XK_Ccircumflex
- 0x0109: 0x02e6, // XK_ccircumflex
- 0x010a: 0x02c5, // XK_Cabovedot
- 0x010b: 0x02e5, // XK_cabovedot
- 0x010c: 0x01c8, // XK_Ccaron
- 0x010d: 0x01e8, // XK_ccaron
- 0x010e: 0x01cf, // XK_Dcaron
- 0x010f: 0x01ef, // XK_dcaron
- 0x0110: 0x01d0, // XK_Dstroke
- 0x0111: 0x01f0, // XK_dstroke
- 0x0112: 0x03aa, // XK_Emacron
- 0x0113: 0x03ba, // XK_emacron
- 0x0116: 0x03cc, // XK_Eabovedot
- 0x0117: 0x03ec, // XK_eabovedot
- 0x0118: 0x01ca, // XK_Eogonek
- 0x0119: 0x01ea, // XK_eogonek
- 0x011a: 0x01cc, // XK_Ecaron
- 0x011b: 0x01ec, // XK_ecaron
- 0x011c: 0x02d8, // XK_Gcircumflex
- 0x011d: 0x02f8, // XK_gcircumflex
- 0x011e: 0x02ab, // XK_Gbreve
- 0x011f: 0x02bb, // XK_gbreve
- 0x0120: 0x02d5, // XK_Gabovedot
- 0x0121: 0x02f5, // XK_gabovedot
- 0x0122: 0x03ab, // XK_Gcedilla
- 0x0123: 0x03bb, // XK_gcedilla
- 0x0124: 0x02a6, // XK_Hcircumflex
- 0x0125: 0x02b6, // XK_hcircumflex
- 0x0126: 0x02a1, // XK_Hstroke
- 0x0127: 0x02b1, // XK_hstroke
- 0x0128: 0x03a5, // XK_Itilde
- 0x0129: 0x03b5, // XK_itilde
- 0x012a: 0x03cf, // XK_Imacron
- 0x012b: 0x03ef, // XK_imacron
- 0x012e: 0x03c7, // XK_Iogonek
- 0x012f: 0x03e7, // XK_iogonek
- 0x0130: 0x02a9, // XK_Iabovedot
- 0x0131: 0x02b9, // XK_idotless
- 0x0134: 0x02ac, // XK_Jcircumflex
- 0x0135: 0x02bc, // XK_jcircumflex
- 0x0136: 0x03d3, // XK_Kcedilla
- 0x0137: 0x03f3, // XK_kcedilla
- 0x0138: 0x03a2, // XK_kra
- 0x0139: 0x01c5, // XK_Lacute
- 0x013a: 0x01e5, // XK_lacute
- 0x013b: 0x03a6, // XK_Lcedilla
- 0x013c: 0x03b6, // XK_lcedilla
- 0x013d: 0x01a5, // XK_Lcaron
- 0x013e: 0x01b5, // XK_lcaron
- 0x0141: 0x01a3, // XK_Lstroke
- 0x0142: 0x01b3, // XK_lstroke
- 0x0143: 0x01d1, // XK_Nacute
- 0x0144: 0x01f1, // XK_nacute
- 0x0145: 0x03d1, // XK_Ncedilla
- 0x0146: 0x03f1, // XK_ncedilla
- 0x0147: 0x01d2, // XK_Ncaron
- 0x0148: 0x01f2, // XK_ncaron
- 0x014a: 0x03bd, // XK_ENG
- 0x014b: 0x03bf, // XK_eng
- 0x014c: 0x03d2, // XK_Omacron
- 0x014d: 0x03f2, // XK_omacron
- 0x0150: 0x01d5, // XK_Odoubleacute
- 0x0151: 0x01f5, // XK_odoubleacute
- 0x0152: 0x13bc, // XK_OE
- 0x0153: 0x13bd, // XK_oe
- 0x0154: 0x01c0, // XK_Racute
- 0x0155: 0x01e0, // XK_racute
- 0x0156: 0x03a3, // XK_Rcedilla
- 0x0157: 0x03b3, // XK_rcedilla
- 0x0158: 0x01d8, // XK_Rcaron
- 0x0159: 0x01f8, // XK_rcaron
- 0x015a: 0x01a6, // XK_Sacute
- 0x015b: 0x01b6, // XK_sacute
- 0x015c: 0x02de, // XK_Scircumflex
- 0x015d: 0x02fe, // XK_scircumflex
- 0x015e: 0x01aa, // XK_Scedilla
- 0x015f: 0x01ba, // XK_scedilla
- 0x0160: 0x01a9, // XK_Scaron
- 0x0161: 0x01b9, // XK_scaron
- 0x0162: 0x01de, // XK_Tcedilla
- 0x0163: 0x01fe, // XK_tcedilla
- 0x0164: 0x01ab, // XK_Tcaron
- 0x0165: 0x01bb, // XK_tcaron
- 0x0166: 0x03ac, // XK_Tslash
- 0x0167: 0x03bc, // XK_tslash
- 0x0168: 0x03dd, // XK_Utilde
- 0x0169: 0x03fd, // XK_utilde
- 0x016a: 0x03de, // XK_Umacron
- 0x016b: 0x03fe, // XK_umacron
- 0x016c: 0x02dd, // XK_Ubreve
- 0x016d: 0x02fd, // XK_ubreve
- 0x016e: 0x01d9, // XK_Uring
- 0x016f: 0x01f9, // XK_uring
- 0x0170: 0x01db, // XK_Udoubleacute
- 0x0171: 0x01fb, // XK_udoubleacute
- 0x0172: 0x03d9, // XK_Uogonek
- 0x0173: 0x03f9, // XK_uogonek
- 0x0178: 0x13be, // XK_Ydiaeresis
- 0x0179: 0x01ac, // XK_Zacute
- 0x017a: 0x01bc, // XK_zacute
- 0x017b: 0x01af, // XK_Zabovedot
- 0x017c: 0x01bf, // XK_zabovedot
- 0x017d: 0x01ae, // XK_Zcaron
- 0x017e: 0x01be, // XK_zcaron
- 0x0192: 0x08f6, // XK_function
- 0x01d2: 0x10001d1, // XK_Ocaron
- 0x02c7: 0x01b7, // XK_caron
- 0x02d8: 0x01a2, // XK_breve
- 0x02d9: 0x01ff, // XK_abovedot
- 0x02db: 0x01b2, // XK_ogonek
- 0x02dd: 0x01bd, // XK_doubleacute
- 0x0385: 0x07ae, // XK_Greek_accentdieresis
- 0x0386: 0x07a1, // XK_Greek_ALPHAaccent
- 0x0388: 0x07a2, // XK_Greek_EPSILONaccent
- 0x0389: 0x07a3, // XK_Greek_ETAaccent
- 0x038a: 0x07a4, // XK_Greek_IOTAaccent
- 0x038c: 0x07a7, // XK_Greek_OMICRONaccent
- 0x038e: 0x07a8, // XK_Greek_UPSILONaccent
- 0x038f: 0x07ab, // XK_Greek_OMEGAaccent
- 0x0390: 0x07b6, // XK_Greek_iotaaccentdieresis
- 0x0391: 0x07c1, // XK_Greek_ALPHA
- 0x0392: 0x07c2, // XK_Greek_BETA
- 0x0393: 0x07c3, // XK_Greek_GAMMA
- 0x0394: 0x07c4, // XK_Greek_DELTA
- 0x0395: 0x07c5, // XK_Greek_EPSILON
- 0x0396: 0x07c6, // XK_Greek_ZETA
- 0x0397: 0x07c7, // XK_Greek_ETA
- 0x0398: 0x07c8, // XK_Greek_THETA
- 0x0399: 0x07c9, // XK_Greek_IOTA
- 0x039a: 0x07ca, // XK_Greek_KAPPA
- 0x039b: 0x07cb, // XK_Greek_LAMDA
- 0x039c: 0x07cc, // XK_Greek_MU
- 0x039d: 0x07cd, // XK_Greek_NU
- 0x039e: 0x07ce, // XK_Greek_XI
- 0x039f: 0x07cf, // XK_Greek_OMICRON
- 0x03a0: 0x07d0, // XK_Greek_PI
- 0x03a1: 0x07d1, // XK_Greek_RHO
- 0x03a3: 0x07d2, // XK_Greek_SIGMA
- 0x03a4: 0x07d4, // XK_Greek_TAU
- 0x03a5: 0x07d5, // XK_Greek_UPSILON
- 0x03a6: 0x07d6, // XK_Greek_PHI
- 0x03a7: 0x07d7, // XK_Greek_CHI
- 0x03a8: 0x07d8, // XK_Greek_PSI
- 0x03a9: 0x07d9, // XK_Greek_OMEGA
- 0x03aa: 0x07a5, // XK_Greek_IOTAdieresis
- 0x03ab: 0x07a9, // XK_Greek_UPSILONdieresis
- 0x03ac: 0x07b1, // XK_Greek_alphaaccent
- 0x03ad: 0x07b2, // XK_Greek_epsilonaccent
- 0x03ae: 0x07b3, // XK_Greek_etaaccent
- 0x03af: 0x07b4, // XK_Greek_iotaaccent
- 0x03b0: 0x07ba, // XK_Greek_upsilonaccentdieresis
- 0x03b1: 0x07e1, // XK_Greek_alpha
- 0x03b2: 0x07e2, // XK_Greek_beta
- 0x03b3: 0x07e3, // XK_Greek_gamma
- 0x03b4: 0x07e4, // XK_Greek_delta
- 0x03b5: 0x07e5, // XK_Greek_epsilon
- 0x03b6: 0x07e6, // XK_Greek_zeta
- 0x03b7: 0x07e7, // XK_Greek_eta
- 0x03b8: 0x07e8, // XK_Greek_theta
- 0x03b9: 0x07e9, // XK_Greek_iota
- 0x03ba: 0x07ea, // XK_Greek_kappa
- 0x03bb: 0x07eb, // XK_Greek_lamda
- 0x03bc: 0x07ec, // XK_Greek_mu
- 0x03bd: 0x07ed, // XK_Greek_nu
- 0x03be: 0x07ee, // XK_Greek_xi
- 0x03bf: 0x07ef, // XK_Greek_omicron
- 0x03c0: 0x07f0, // XK_Greek_pi
- 0x03c1: 0x07f1, // XK_Greek_rho
- 0x03c2: 0x07f3, // XK_Greek_finalsmallsigma
- 0x03c3: 0x07f2, // XK_Greek_sigma
- 0x03c4: 0x07f4, // XK_Greek_tau
- 0x03c5: 0x07f5, // XK_Greek_upsilon
- 0x03c6: 0x07f6, // XK_Greek_phi
- 0x03c7: 0x07f7, // XK_Greek_chi
- 0x03c8: 0x07f8, // XK_Greek_psi
- 0x03c9: 0x07f9, // XK_Greek_omega
- 0x03ca: 0x07b5, // XK_Greek_iotadieresis
- 0x03cb: 0x07b9, // XK_Greek_upsilondieresis
- 0x03cc: 0x07b7, // XK_Greek_omicronaccent
- 0x03cd: 0x07b8, // XK_Greek_upsilonaccent
- 0x03ce: 0x07bb, // XK_Greek_omegaaccent
- 0x0401: 0x06b3, // XK_Cyrillic_IO
- 0x0402: 0x06b1, // XK_Serbian_DJE
- 0x0403: 0x06b2, // XK_Macedonia_GJE
- 0x0404: 0x06b4, // XK_Ukrainian_IE
- 0x0405: 0x06b5, // XK_Macedonia_DSE
- 0x0406: 0x06b6, // XK_Ukrainian_I
- 0x0407: 0x06b7, // XK_Ukrainian_YI
- 0x0408: 0x06b8, // XK_Cyrillic_JE
- 0x0409: 0x06b9, // XK_Cyrillic_LJE
- 0x040a: 0x06ba, // XK_Cyrillic_NJE
- 0x040b: 0x06bb, // XK_Serbian_TSHE
- 0x040c: 0x06bc, // XK_Macedonia_KJE
- 0x040e: 0x06be, // XK_Byelorussian_SHORTU
- 0x040f: 0x06bf, // XK_Cyrillic_DZHE
- 0x0410: 0x06e1, // XK_Cyrillic_A
- 0x0411: 0x06e2, // XK_Cyrillic_BE
- 0x0412: 0x06f7, // XK_Cyrillic_VE
- 0x0413: 0x06e7, // XK_Cyrillic_GHE
- 0x0414: 0x06e4, // XK_Cyrillic_DE
- 0x0415: 0x06e5, // XK_Cyrillic_IE
- 0x0416: 0x06f6, // XK_Cyrillic_ZHE
- 0x0417: 0x06fa, // XK_Cyrillic_ZE
- 0x0418: 0x06e9, // XK_Cyrillic_I
- 0x0419: 0x06ea, // XK_Cyrillic_SHORTI
- 0x041a: 0x06eb, // XK_Cyrillic_KA
- 0x041b: 0x06ec, // XK_Cyrillic_EL
- 0x041c: 0x06ed, // XK_Cyrillic_EM
- 0x041d: 0x06ee, // XK_Cyrillic_EN
- 0x041e: 0x06ef, // XK_Cyrillic_O
- 0x041f: 0x06f0, // XK_Cyrillic_PE
- 0x0420: 0x06f2, // XK_Cyrillic_ER
- 0x0421: 0x06f3, // XK_Cyrillic_ES
- 0x0422: 0x06f4, // XK_Cyrillic_TE
- 0x0423: 0x06f5, // XK_Cyrillic_U
- 0x0424: 0x06e6, // XK_Cyrillic_EF
- 0x0425: 0x06e8, // XK_Cyrillic_HA
- 0x0426: 0x06e3, // XK_Cyrillic_TSE
- 0x0427: 0x06fe, // XK_Cyrillic_CHE
- 0x0428: 0x06fb, // XK_Cyrillic_SHA
- 0x0429: 0x06fd, // XK_Cyrillic_SHCHA
- 0x042a: 0x06ff, // XK_Cyrillic_HARDSIGN
- 0x042b: 0x06f9, // XK_Cyrillic_YERU
- 0x042c: 0x06f8, // XK_Cyrillic_SOFTSIGN
- 0x042d: 0x06fc, // XK_Cyrillic_E
- 0x042e: 0x06e0, // XK_Cyrillic_YU
- 0x042f: 0x06f1, // XK_Cyrillic_YA
- 0x0430: 0x06c1, // XK_Cyrillic_a
- 0x0431: 0x06c2, // XK_Cyrillic_be
- 0x0432: 0x06d7, // XK_Cyrillic_ve
- 0x0433: 0x06c7, // XK_Cyrillic_ghe
- 0x0434: 0x06c4, // XK_Cyrillic_de
- 0x0435: 0x06c5, // XK_Cyrillic_ie
- 0x0436: 0x06d6, // XK_Cyrillic_zhe
- 0x0437: 0x06da, // XK_Cyrillic_ze
- 0x0438: 0x06c9, // XK_Cyrillic_i
- 0x0439: 0x06ca, // XK_Cyrillic_shorti
- 0x043a: 0x06cb, // XK_Cyrillic_ka
- 0x043b: 0x06cc, // XK_Cyrillic_el
- 0x043c: 0x06cd, // XK_Cyrillic_em
- 0x043d: 0x06ce, // XK_Cyrillic_en
- 0x043e: 0x06cf, // XK_Cyrillic_o
- 0x043f: 0x06d0, // XK_Cyrillic_pe
- 0x0440: 0x06d2, // XK_Cyrillic_er
- 0x0441: 0x06d3, // XK_Cyrillic_es
- 0x0442: 0x06d4, // XK_Cyrillic_te
- 0x0443: 0x06d5, // XK_Cyrillic_u
- 0x0444: 0x06c6, // XK_Cyrillic_ef
- 0x0445: 0x06c8, // XK_Cyrillic_ha
- 0x0446: 0x06c3, // XK_Cyrillic_tse
- 0x0447: 0x06de, // XK_Cyrillic_che
- 0x0448: 0x06db, // XK_Cyrillic_sha
- 0x0449: 0x06dd, // XK_Cyrillic_shcha
- 0x044a: 0x06df, // XK_Cyrillic_hardsign
- 0x044b: 0x06d9, // XK_Cyrillic_yeru
- 0x044c: 0x06d8, // XK_Cyrillic_softsign
- 0x044d: 0x06dc, // XK_Cyrillic_e
- 0x044e: 0x06c0, // XK_Cyrillic_yu
- 0x044f: 0x06d1, // XK_Cyrillic_ya
- 0x0451: 0x06a3, // XK_Cyrillic_io
- 0x0452: 0x06a1, // XK_Serbian_dje
- 0x0453: 0x06a2, // XK_Macedonia_gje
- 0x0454: 0x06a4, // XK_Ukrainian_ie
- 0x0455: 0x06a5, // XK_Macedonia_dse
- 0x0456: 0x06a6, // XK_Ukrainian_i
- 0x0457: 0x06a7, // XK_Ukrainian_yi
- 0x0458: 0x06a8, // XK_Cyrillic_je
- 0x0459: 0x06a9, // XK_Cyrillic_lje
- 0x045a: 0x06aa, // XK_Cyrillic_nje
- 0x045b: 0x06ab, // XK_Serbian_tshe
- 0x045c: 0x06ac, // XK_Macedonia_kje
- 0x045e: 0x06ae, // XK_Byelorussian_shortu
- 0x045f: 0x06af, // XK_Cyrillic_dzhe
- 0x0490: 0x06bd, // XK_Ukrainian_GHE_WITH_UPTURN
- 0x0491: 0x06ad, // XK_Ukrainian_ghe_with_upturn
- 0x05d0: 0x0ce0, // XK_hebrew_aleph
- 0x05d1: 0x0ce1, // XK_hebrew_bet
- 0x05d2: 0x0ce2, // XK_hebrew_gimel
- 0x05d3: 0x0ce3, // XK_hebrew_dalet
- 0x05d4: 0x0ce4, // XK_hebrew_he
- 0x05d5: 0x0ce5, // XK_hebrew_waw
- 0x05d6: 0x0ce6, // XK_hebrew_zain
- 0x05d7: 0x0ce7, // XK_hebrew_chet
- 0x05d8: 0x0ce8, // XK_hebrew_tet
- 0x05d9: 0x0ce9, // XK_hebrew_yod
- 0x05da: 0x0cea, // XK_hebrew_finalkaph
- 0x05db: 0x0ceb, // XK_hebrew_kaph
- 0x05dc: 0x0cec, // XK_hebrew_lamed
- 0x05dd: 0x0ced, // XK_hebrew_finalmem
- 0x05de: 0x0cee, // XK_hebrew_mem
- 0x05df: 0x0cef, // XK_hebrew_finalnun
- 0x05e0: 0x0cf0, // XK_hebrew_nun
- 0x05e1: 0x0cf1, // XK_hebrew_samech
- 0x05e2: 0x0cf2, // XK_hebrew_ayin
- 0x05e3: 0x0cf3, // XK_hebrew_finalpe
- 0x05e4: 0x0cf4, // XK_hebrew_pe
- 0x05e5: 0x0cf5, // XK_hebrew_finalzade
- 0x05e6: 0x0cf6, // XK_hebrew_zade
- 0x05e7: 0x0cf7, // XK_hebrew_qoph
- 0x05e8: 0x0cf8, // XK_hebrew_resh
- 0x05e9: 0x0cf9, // XK_hebrew_shin
- 0x05ea: 0x0cfa, // XK_hebrew_taw
- 0x060c: 0x05ac, // XK_Arabic_comma
- 0x061b: 0x05bb, // XK_Arabic_semicolon
- 0x061f: 0x05bf, // XK_Arabic_question_mark
- 0x0621: 0x05c1, // XK_Arabic_hamza
- 0x0622: 0x05c2, // XK_Arabic_maddaonalef
- 0x0623: 0x05c3, // XK_Arabic_hamzaonalef
- 0x0624: 0x05c4, // XK_Arabic_hamzaonwaw
- 0x0625: 0x05c5, // XK_Arabic_hamzaunderalef
- 0x0626: 0x05c6, // XK_Arabic_hamzaonyeh
- 0x0627: 0x05c7, // XK_Arabic_alef
- 0x0628: 0x05c8, // XK_Arabic_beh
- 0x0629: 0x05c9, // XK_Arabic_tehmarbuta
- 0x062a: 0x05ca, // XK_Arabic_teh
- 0x062b: 0x05cb, // XK_Arabic_theh
- 0x062c: 0x05cc, // XK_Arabic_jeem
- 0x062d: 0x05cd, // XK_Arabic_hah
- 0x062e: 0x05ce, // XK_Arabic_khah
- 0x062f: 0x05cf, // XK_Arabic_dal
- 0x0630: 0x05d0, // XK_Arabic_thal
- 0x0631: 0x05d1, // XK_Arabic_ra
- 0x0632: 0x05d2, // XK_Arabic_zain
- 0x0633: 0x05d3, // XK_Arabic_seen
- 0x0634: 0x05d4, // XK_Arabic_sheen
- 0x0635: 0x05d5, // XK_Arabic_sad
- 0x0636: 0x05d6, // XK_Arabic_dad
- 0x0637: 0x05d7, // XK_Arabic_tah
- 0x0638: 0x05d8, // XK_Arabic_zah
- 0x0639: 0x05d9, // XK_Arabic_ain
- 0x063a: 0x05da, // XK_Arabic_ghain
- 0x0640: 0x05e0, // XK_Arabic_tatweel
- 0x0641: 0x05e1, // XK_Arabic_feh
- 0x0642: 0x05e2, // XK_Arabic_qaf
- 0x0643: 0x05e3, // XK_Arabic_kaf
- 0x0644: 0x05e4, // XK_Arabic_lam
- 0x0645: 0x05e5, // XK_Arabic_meem
- 0x0646: 0x05e6, // XK_Arabic_noon
- 0x0647: 0x05e7, // XK_Arabic_ha
- 0x0648: 0x05e8, // XK_Arabic_waw
- 0x0649: 0x05e9, // XK_Arabic_alefmaksura
- 0x064a: 0x05ea, // XK_Arabic_yeh
- 0x064b: 0x05eb, // XK_Arabic_fathatan
- 0x064c: 0x05ec, // XK_Arabic_dammatan
- 0x064d: 0x05ed, // XK_Arabic_kasratan
- 0x064e: 0x05ee, // XK_Arabic_fatha
- 0x064f: 0x05ef, // XK_Arabic_damma
- 0x0650: 0x05f0, // XK_Arabic_kasra
- 0x0651: 0x05f1, // XK_Arabic_shadda
- 0x0652: 0x05f2, // XK_Arabic_sukun
- 0x0e01: 0x0da1, // XK_Thai_kokai
- 0x0e02: 0x0da2, // XK_Thai_khokhai
- 0x0e03: 0x0da3, // XK_Thai_khokhuat
- 0x0e04: 0x0da4, // XK_Thai_khokhwai
- 0x0e05: 0x0da5, // XK_Thai_khokhon
- 0x0e06: 0x0da6, // XK_Thai_khorakhang
- 0x0e07: 0x0da7, // XK_Thai_ngongu
- 0x0e08: 0x0da8, // XK_Thai_chochan
- 0x0e09: 0x0da9, // XK_Thai_choching
- 0x0e0a: 0x0daa, // XK_Thai_chochang
- 0x0e0b: 0x0dab, // XK_Thai_soso
- 0x0e0c: 0x0dac, // XK_Thai_chochoe
- 0x0e0d: 0x0dad, // XK_Thai_yoying
- 0x0e0e: 0x0dae, // XK_Thai_dochada
- 0x0e0f: 0x0daf, // XK_Thai_topatak
- 0x0e10: 0x0db0, // XK_Thai_thothan
- 0x0e11: 0x0db1, // XK_Thai_thonangmontho
- 0x0e12: 0x0db2, // XK_Thai_thophuthao
- 0x0e13: 0x0db3, // XK_Thai_nonen
- 0x0e14: 0x0db4, // XK_Thai_dodek
- 0x0e15: 0x0db5, // XK_Thai_totao
- 0x0e16: 0x0db6, // XK_Thai_thothung
- 0x0e17: 0x0db7, // XK_Thai_thothahan
- 0x0e18: 0x0db8, // XK_Thai_thothong
- 0x0e19: 0x0db9, // XK_Thai_nonu
- 0x0e1a: 0x0dba, // XK_Thai_bobaimai
- 0x0e1b: 0x0dbb, // XK_Thai_popla
- 0x0e1c: 0x0dbc, // XK_Thai_phophung
- 0x0e1d: 0x0dbd, // XK_Thai_fofa
- 0x0e1e: 0x0dbe, // XK_Thai_phophan
- 0x0e1f: 0x0dbf, // XK_Thai_fofan
- 0x0e20: 0x0dc0, // XK_Thai_phosamphao
- 0x0e21: 0x0dc1, // XK_Thai_moma
- 0x0e22: 0x0dc2, // XK_Thai_yoyak
- 0x0e23: 0x0dc3, // XK_Thai_rorua
- 0x0e24: 0x0dc4, // XK_Thai_ru
- 0x0e25: 0x0dc5, // XK_Thai_loling
- 0x0e26: 0x0dc6, // XK_Thai_lu
- 0x0e27: 0x0dc7, // XK_Thai_wowaen
- 0x0e28: 0x0dc8, // XK_Thai_sosala
- 0x0e29: 0x0dc9, // XK_Thai_sorusi
- 0x0e2a: 0x0dca, // XK_Thai_sosua
- 0x0e2b: 0x0dcb, // XK_Thai_hohip
- 0x0e2c: 0x0dcc, // XK_Thai_lochula
- 0x0e2d: 0x0dcd, // XK_Thai_oang
- 0x0e2e: 0x0dce, // XK_Thai_honokhuk
- 0x0e2f: 0x0dcf, // XK_Thai_paiyannoi
- 0x0e30: 0x0dd0, // XK_Thai_saraa
- 0x0e31: 0x0dd1, // XK_Thai_maihanakat
- 0x0e32: 0x0dd2, // XK_Thai_saraaa
- 0x0e33: 0x0dd3, // XK_Thai_saraam
- 0x0e34: 0x0dd4, // XK_Thai_sarai
- 0x0e35: 0x0dd5, // XK_Thai_saraii
- 0x0e36: 0x0dd6, // XK_Thai_saraue
- 0x0e37: 0x0dd7, // XK_Thai_sarauee
- 0x0e38: 0x0dd8, // XK_Thai_sarau
- 0x0e39: 0x0dd9, // XK_Thai_sarauu
- 0x0e3a: 0x0dda, // XK_Thai_phinthu
- 0x0e3f: 0x0ddf, // XK_Thai_baht
- 0x0e40: 0x0de0, // XK_Thai_sarae
- 0x0e41: 0x0de1, // XK_Thai_saraae
- 0x0e42: 0x0de2, // XK_Thai_sarao
- 0x0e43: 0x0de3, // XK_Thai_saraaimaimuan
- 0x0e44: 0x0de4, // XK_Thai_saraaimaimalai
- 0x0e45: 0x0de5, // XK_Thai_lakkhangyao
- 0x0e46: 0x0de6, // XK_Thai_maiyamok
- 0x0e47: 0x0de7, // XK_Thai_maitaikhu
- 0x0e48: 0x0de8, // XK_Thai_maiek
- 0x0e49: 0x0de9, // XK_Thai_maitho
- 0x0e4a: 0x0dea, // XK_Thai_maitri
- 0x0e4b: 0x0deb, // XK_Thai_maichattawa
- 0x0e4c: 0x0dec, // XK_Thai_thanthakhat
- 0x0e4d: 0x0ded, // XK_Thai_nikhahit
- 0x0e50: 0x0df0, // XK_Thai_leksun
- 0x0e51: 0x0df1, // XK_Thai_leknung
- 0x0e52: 0x0df2, // XK_Thai_leksong
- 0x0e53: 0x0df3, // XK_Thai_leksam
- 0x0e54: 0x0df4, // XK_Thai_leksi
- 0x0e55: 0x0df5, // XK_Thai_lekha
- 0x0e56: 0x0df6, // XK_Thai_lekhok
- 0x0e57: 0x0df7, // XK_Thai_lekchet
- 0x0e58: 0x0df8, // XK_Thai_lekpaet
- 0x0e59: 0x0df9, // XK_Thai_lekkao
- 0x2002: 0x0aa2, // XK_enspace
- 0x2003: 0x0aa1, // XK_emspace
- 0x2004: 0x0aa3, // XK_em3space
- 0x2005: 0x0aa4, // XK_em4space
- 0x2007: 0x0aa5, // XK_digitspace
- 0x2008: 0x0aa6, // XK_punctspace
- 0x2009: 0x0aa7, // XK_thinspace
- 0x200a: 0x0aa8, // XK_hairspace
- 0x2012: 0x0abb, // XK_figdash
- 0x2013: 0x0aaa, // XK_endash
- 0x2014: 0x0aa9, // XK_emdash
- 0x2015: 0x07af, // XK_Greek_horizbar
- 0x2017: 0x0cdf, // XK_hebrew_doublelowline
- 0x2018: 0x0ad0, // XK_leftsinglequotemark
- 0x2019: 0x0ad1, // XK_rightsinglequotemark
- 0x201a: 0x0afd, // XK_singlelowquotemark
- 0x201c: 0x0ad2, // XK_leftdoublequotemark
- 0x201d: 0x0ad3, // XK_rightdoublequotemark
- 0x201e: 0x0afe, // XK_doublelowquotemark
- 0x2020: 0x0af1, // XK_dagger
- 0x2021: 0x0af2, // XK_doubledagger
- 0x2022: 0x0ae6, // XK_enfilledcircbullet
- 0x2025: 0x0aaf, // XK_doubbaselinedot
- 0x2026: 0x0aae, // XK_ellipsis
- 0x2030: 0x0ad5, // XK_permille
- 0x2032: 0x0ad6, // XK_minutes
- 0x2033: 0x0ad7, // XK_seconds
- 0x2038: 0x0afc, // XK_caret
- 0x203e: 0x047e, // XK_overline
- 0x20a9: 0x0eff, // XK_Korean_Won
- 0x20ac: 0x20ac, // XK_EuroSign
- 0x2105: 0x0ab8, // XK_careof
- 0x2116: 0x06b0, // XK_numerosign
- 0x2117: 0x0afb, // XK_phonographcopyright
- 0x211e: 0x0ad4, // XK_prescription
- 0x2122: 0x0ac9, // XK_trademark
- 0x2153: 0x0ab0, // XK_onethird
- 0x2154: 0x0ab1, // XK_twothirds
- 0x2155: 0x0ab2, // XK_onefifth
- 0x2156: 0x0ab3, // XK_twofifths
- 0x2157: 0x0ab4, // XK_threefifths
- 0x2158: 0x0ab5, // XK_fourfifths
- 0x2159: 0x0ab6, // XK_onesixth
- 0x215a: 0x0ab7, // XK_fivesixths
- 0x215b: 0x0ac3, // XK_oneeighth
- 0x215c: 0x0ac4, // XK_threeeighths
- 0x215d: 0x0ac5, // XK_fiveeighths
- 0x215e: 0x0ac6, // XK_seveneighths
- 0x2190: 0x08fb, // XK_leftarrow
- 0x2191: 0x08fc, // XK_uparrow
- 0x2192: 0x08fd, // XK_rightarrow
- 0x2193: 0x08fe, // XK_downarrow
- 0x21d2: 0x08ce, // XK_implies
- 0x21d4: 0x08cd, // XK_ifonlyif
- 0x2202: 0x08ef, // XK_partialderivative
- 0x2207: 0x08c5, // XK_nabla
- 0x2218: 0x0bca, // XK_jot
- 0x221a: 0x08d6, // XK_radical
- 0x221d: 0x08c1, // XK_variation
- 0x221e: 0x08c2, // XK_infinity
- 0x2227: 0x08de, // XK_logicaland
- 0x2228: 0x08df, // XK_logicalor
- 0x2229: 0x08dc, // XK_intersection
- 0x222a: 0x08dd, // XK_union
- 0x222b: 0x08bf, // XK_integral
- 0x2234: 0x08c0, // XK_therefore
- 0x223c: 0x08c8, // XK_approximate
- 0x2243: 0x08c9, // XK_similarequal
- 0x2245: 0x1002248, // XK_approxeq
- 0x2260: 0x08bd, // XK_notequal
- 0x2261: 0x08cf, // XK_identical
- 0x2264: 0x08bc, // XK_lessthanequal
- 0x2265: 0x08be, // XK_greaterthanequal
- 0x2282: 0x08da, // XK_includedin
- 0x2283: 0x08db, // XK_includes
- 0x22a2: 0x0bfc, // XK_righttack
- 0x22a3: 0x0bdc, // XK_lefttack
- 0x22a4: 0x0bc2, // XK_downtack
- 0x22a5: 0x0bce, // XK_uptack
- 0x2308: 0x0bd3, // XK_upstile
- 0x230a: 0x0bc4, // XK_downstile
- 0x2315: 0x0afa, // XK_telephonerecorder
- 0x2320: 0x08a4, // XK_topintegral
- 0x2321: 0x08a5, // XK_botintegral
- 0x2395: 0x0bcc, // XK_quad
- 0x239b: 0x08ab, // XK_topleftparens
- 0x239d: 0x08ac, // XK_botleftparens
- 0x239e: 0x08ad, // XK_toprightparens
- 0x23a0: 0x08ae, // XK_botrightparens
- 0x23a1: 0x08a7, // XK_topleftsqbracket
- 0x23a3: 0x08a8, // XK_botleftsqbracket
- 0x23a4: 0x08a9, // XK_toprightsqbracket
- 0x23a6: 0x08aa, // XK_botrightsqbracket
- 0x23a8: 0x08af, // XK_leftmiddlecurlybrace
- 0x23ac: 0x08b0, // XK_rightmiddlecurlybrace
- 0x23b7: 0x08a1, // XK_leftradical
- 0x23ba: 0x09ef, // XK_horizlinescan1
- 0x23bb: 0x09f0, // XK_horizlinescan3
- 0x23bc: 0x09f2, // XK_horizlinescan7
- 0x23bd: 0x09f3, // XK_horizlinescan9
- 0x2409: 0x09e2, // XK_ht
- 0x240a: 0x09e5, // XK_lf
- 0x240b: 0x09e9, // XK_vt
- 0x240c: 0x09e3, // XK_ff
- 0x240d: 0x09e4, // XK_cr
- 0x2423: 0x0aac, // XK_signifblank
- 0x2424: 0x09e8, // XK_nl
- 0x2500: 0x08a3, // XK_horizconnector
- 0x2502: 0x08a6, // XK_vertconnector
- 0x250c: 0x08a2, // XK_topleftradical
- 0x2510: 0x09eb, // XK_uprightcorner
- 0x2514: 0x09ed, // XK_lowleftcorner
- 0x2518: 0x09ea, // XK_lowrightcorner
- 0x251c: 0x09f4, // XK_leftt
- 0x2524: 0x09f5, // XK_rightt
- 0x252c: 0x09f7, // XK_topt
- 0x2534: 0x09f6, // XK_bott
- 0x253c: 0x09ee, // XK_crossinglines
- 0x2592: 0x09e1, // XK_checkerboard
- 0x25aa: 0x0ae7, // XK_enfilledsqbullet
- 0x25ab: 0x0ae1, // XK_enopensquarebullet
- 0x25ac: 0x0adb, // XK_filledrectbullet
- 0x25ad: 0x0ae2, // XK_openrectbullet
- 0x25ae: 0x0adf, // XK_emfilledrect
- 0x25af: 0x0acf, // XK_emopenrectangle
- 0x25b2: 0x0ae8, // XK_filledtribulletup
- 0x25b3: 0x0ae3, // XK_opentribulletup
- 0x25b6: 0x0add, // XK_filledrighttribullet
- 0x25b7: 0x0acd, // XK_rightopentriangle
- 0x25bc: 0x0ae9, // XK_filledtribulletdown
- 0x25bd: 0x0ae4, // XK_opentribulletdown
- 0x25c0: 0x0adc, // XK_filledlefttribullet
- 0x25c1: 0x0acc, // XK_leftopentriangle
- 0x25c6: 0x09e0, // XK_soliddiamond
- 0x25cb: 0x0ace, // XK_emopencircle
- 0x25cf: 0x0ade, // XK_emfilledcircle
- 0x25e6: 0x0ae0, // XK_enopencircbullet
- 0x2606: 0x0ae5, // XK_openstar
- 0x260e: 0x0af9, // XK_telephone
- 0x2613: 0x0aca, // XK_signaturemark
- 0x261c: 0x0aea, // XK_leftpointer
- 0x261e: 0x0aeb, // XK_rightpointer
- 0x2640: 0x0af8, // XK_femalesymbol
- 0x2642: 0x0af7, // XK_malesymbol
- 0x2663: 0x0aec, // XK_club
- 0x2665: 0x0aee, // XK_heart
- 0x2666: 0x0aed, // XK_diamond
- 0x266d: 0x0af6, // XK_musicalflat
- 0x266f: 0x0af5, // XK_musicalsharp
- 0x2713: 0x0af3, // XK_checkmark
- 0x2717: 0x0af4, // XK_ballotcross
- 0x271d: 0x0ad9, // XK_latincross
- 0x2720: 0x0af0, // XK_maltesecross
- 0x27e8: 0x0abc, // XK_leftanglebracket
- 0x27e9: 0x0abe, // XK_rightanglebracket
- 0x3001: 0x04a4, // XK_kana_comma
- 0x3002: 0x04a1, // XK_kana_fullstop
- 0x300c: 0x04a2, // XK_kana_openingbracket
- 0x300d: 0x04a3, // XK_kana_closingbracket
- 0x309b: 0x04de, // XK_voicedsound
- 0x309c: 0x04df, // XK_semivoicedsound
- 0x30a1: 0x04a7, // XK_kana_a
- 0x30a2: 0x04b1, // XK_kana_A
- 0x30a3: 0x04a8, // XK_kana_i
- 0x30a4: 0x04b2, // XK_kana_I
- 0x30a5: 0x04a9, // XK_kana_u
- 0x30a6: 0x04b3, // XK_kana_U
- 0x30a7: 0x04aa, // XK_kana_e
- 0x30a8: 0x04b4, // XK_kana_E
- 0x30a9: 0x04ab, // XK_kana_o
- 0x30aa: 0x04b5, // XK_kana_O
- 0x30ab: 0x04b6, // XK_kana_KA
- 0x30ad: 0x04b7, // XK_kana_KI
- 0x30af: 0x04b8, // XK_kana_KU
- 0x30b1: 0x04b9, // XK_kana_KE
- 0x30b3: 0x04ba, // XK_kana_KO
- 0x30b5: 0x04bb, // XK_kana_SA
- 0x30b7: 0x04bc, // XK_kana_SHI
- 0x30b9: 0x04bd, // XK_kana_SU
- 0x30bb: 0x04be, // XK_kana_SE
- 0x30bd: 0x04bf, // XK_kana_SO
- 0x30bf: 0x04c0, // XK_kana_TA
- 0x30c1: 0x04c1, // XK_kana_CHI
- 0x30c3: 0x04af, // XK_kana_tsu
- 0x30c4: 0x04c2, // XK_kana_TSU
- 0x30c6: 0x04c3, // XK_kana_TE
- 0x30c8: 0x04c4, // XK_kana_TO
- 0x30ca: 0x04c5, // XK_kana_NA
- 0x30cb: 0x04c6, // XK_kana_NI
- 0x30cc: 0x04c7, // XK_kana_NU
- 0x30cd: 0x04c8, // XK_kana_NE
- 0x30ce: 0x04c9, // XK_kana_NO
- 0x30cf: 0x04ca, // XK_kana_HA
- 0x30d2: 0x04cb, // XK_kana_HI
- 0x30d5: 0x04cc, // XK_kana_FU
- 0x30d8: 0x04cd, // XK_kana_HE
- 0x30db: 0x04ce, // XK_kana_HO
- 0x30de: 0x04cf, // XK_kana_MA
- 0x30df: 0x04d0, // XK_kana_MI
- 0x30e0: 0x04d1, // XK_kana_MU
- 0x30e1: 0x04d2, // XK_kana_ME
- 0x30e2: 0x04d3, // XK_kana_MO
- 0x30e3: 0x04ac, // XK_kana_ya
- 0x30e4: 0x04d4, // XK_kana_YA
- 0x30e5: 0x04ad, // XK_kana_yu
- 0x30e6: 0x04d5, // XK_kana_YU
- 0x30e7: 0x04ae, // XK_kana_yo
- 0x30e8: 0x04d6, // XK_kana_YO
- 0x30e9: 0x04d7, // XK_kana_RA
- 0x30ea: 0x04d8, // XK_kana_RI
- 0x30eb: 0x04d9, // XK_kana_RU
- 0x30ec: 0x04da, // XK_kana_RE
- 0x30ed: 0x04db, // XK_kana_RO
- 0x30ef: 0x04dc, // XK_kana_WA
- 0x30f2: 0x04a6, // XK_kana_WO
- 0x30f3: 0x04dd, // XK_kana_N
- 0x30fb: 0x04a5, // XK_kana_conjunctive
- 0x30fc: 0x04b0, // XK_prolongedsound
-};
-
-export default {
- lookup : function(u) {
- // Latin-1 is one-to-one mapping
- if ((u >= 0x20) && (u <= 0xff)) {
- return u;
- }
-
- // Lookup table (fairly random)
- var keysym = codepoints[u];
- if (keysym !== undefined) {
- return keysym;
- }
-
- // General mapping as final fallback
- return 0x01000000 | u;
- },
-};
diff --git a/core/input/util.js b/core/input/util.js
deleted file mode 100644
index 78a829c8..00000000
--- a/core/input/util.js
+++ /dev/null
@@ -1,176 +0,0 @@
-import KeyTable from "./keysym.js";
-import keysyms from "./keysymdef.js";
-import vkeys from "./vkeys.js";
-import fixedkeys from "./fixedkeys.js";
-import DOMKeyTable from "./domkeytable.js";
-
-function isMac() {
- return navigator && !!(/mac/i).exec(navigator.platform);
-}
-function isIE() {
- return navigator && !!(/trident/i).exec(navigator.userAgent);
-}
-function isEdge() {
- return navigator && !!(/edge/i).exec(navigator.userAgent);
-}
-
-// Get 'KeyboardEvent.code', handling legacy browsers
-export function getKeycode(evt){
- // Are we getting proper key identifiers?
- // (unfortunately Firefox and Chrome are crappy here and gives
- // us an empty string on some platforms, rather than leaving it
- // undefined)
- if (evt.code) {
- // Mozilla isn't fully in sync with the spec yet
- switch (evt.code) {
- case 'OSLeft': return 'MetaLeft';
- case 'OSRight': return 'MetaRight';
- }
-
- return evt.code;
- }
-
- // The de-facto standard is to use Windows Virtual-Key codes
- // in the 'keyCode' field for non-printable characters. However
- // Webkit sets it to the same as charCode in 'keypress' events.
- if ((evt.type !== 'keypress') && (evt.keyCode in vkeys)) {
- var code = vkeys[evt.keyCode];
-
- // macOS has messed up this code for some reason
- if (isMac() && (code === 'ContextMenu')) {
- code = 'MetaRight';
- }
-
- // The keyCode doesn't distinguish between left and right
- // for the standard modifiers
- if (evt.location === 2) {
- switch (code) {
- case 'ShiftLeft': return 'ShiftRight';
- case 'ControlLeft': return 'ControlRight';
- case 'AltLeft': return 'AltRight';
- }
- }
-
- // Nor a bunch of the numpad keys
- if (evt.location === 3) {
- switch (code) {
- case 'Delete': return 'NumpadDecimal';
- case 'Insert': return 'Numpad0';
- case 'End': return 'Numpad1';
- case 'ArrowDown': return 'Numpad2';
- case 'PageDown': return 'Numpad3';
- case 'ArrowLeft': return 'Numpad4';
- case 'ArrowRight': return 'Numpad6';
- case 'Home': return 'Numpad7';
- case 'ArrowUp': return 'Numpad8';
- case 'PageUp': return 'Numpad9';
- case 'Enter': return 'NumpadEnter';
- }
- }
-
- return code;
- }
-
- return 'Unidentified';
-}
-
-// Get 'KeyboardEvent.key', handling legacy browsers
-export function getKey(evt) {
- // Are we getting a proper key value?
- if (evt.key !== undefined) {
- // IE and Edge use some ancient version of the spec
- // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/8860571/
- switch (evt.key) {
- case 'Spacebar': return ' ';
- case 'Esc': return 'Escape';
- case 'Scroll': return 'ScrollLock';
- case 'Win': return 'Meta';
- case 'Apps': return 'ContextMenu';
- case 'Up': return 'ArrowUp';
- case 'Left': return 'ArrowLeft';
- case 'Right': return 'ArrowRight';
- case 'Down': return 'ArrowDown';
- case 'Del': return 'Delete';
- case 'Divide': return '/';
- case 'Multiply': return '*';
- case 'Subtract': return '-';
- case 'Add': return '+';
- case 'Decimal': return evt.char;
- }
-
- // Mozilla isn't fully in sync with the spec yet
- switch (evt.key) {
- case 'OS': return 'Meta';
- }
-
- // iOS leaks some OS names
- switch (evt.key) {
- case 'UIKeyInputUpArrow': return 'ArrowUp';
- case 'UIKeyInputDownArrow': return 'ArrowDown';
- case 'UIKeyInputLeftArrow': return 'ArrowLeft';
- case 'UIKeyInputRightArrow': return 'ArrowRight';
- case 'UIKeyInputEscape': return 'Escape';
- }
-
- // IE and Edge have broken handling of AltGraph so we cannot
- // trust them for printable characters
- if ((evt.key.length !== 1) || (!isIE() && !isEdge())) {
- return evt.key;
- }
- }
-
- // Try to deduce it based on the physical key
- var code = getKeycode(evt);
- if (code in fixedkeys) {
- return fixedkeys[code];
- }
-
- // If that failed, then see if we have a printable character
- if (evt.charCode) {
- return String.fromCharCode(evt.charCode);
- }
-
- // At this point we have nothing left to go on
- return 'Unidentified';
-}
-
-// Get the most reliable keysym value we can get from a key event
-export function getKeysym(evt){
- var key = getKey(evt);
-
- if (key === 'Unidentified') {
- return null;
- }
-
- // First look up special keys
- if (key in DOMKeyTable) {
- var location = evt.location;
-
- // Safari screws up location for the right cmd key
- if ((key === 'Meta') && (location === 0)) {
- location = 2;
- }
-
- if ((location === undefined) || (location > 3)) {
- location = 0;
- }
-
- return DOMKeyTable[key][location];
- }
-
- // Now we need to look at the Unicode symbol instead
-
- var codepoint;
-
- // Special key? (FIXME: Should have been caught earlier)
- if (key.length !== 1) {
- return null;
- }
-
- codepoint = key.charCodeAt();
- if (codepoint) {
- return keysyms.lookup(codepoint);
- }
-
- return null;
-}
diff --git a/core/input/vkeys.js b/core/input/vkeys.js
deleted file mode 100644
index dc784ffd..00000000
--- a/core/input/vkeys.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * noVNC: HTML5 VNC client
- * Copyright (C) 2017 Pierre Ossman for Cendio AB
- * Licensed under MPL 2.0 or any later version (see LICENSE.txt)
- */
-
-/*
- * Mapping between Microsoft® Windows® Virtual-Key codes and
- * HTML key codes.
- */
-
-export default {
- 0x08: 'Backspace',
- 0x09: 'Tab',
- 0x0a: 'NumpadClear',
- 0x0d: 'Enter',
- 0x10: 'ShiftLeft',
- 0x11: 'ControlLeft',
- 0x12: 'AltLeft',
- 0x13: 'Pause',
- 0x14: 'CapsLock',
- 0x15: 'Lang1',
- 0x19: 'Lang2',
- 0x1b: 'Escape',
- 0x1c: 'Convert',
- 0x1d: 'NonConvert',
- 0x20: 'Space',
- 0x21: 'PageUp',
- 0x22: 'PageDown',
- 0x23: 'End',
- 0x24: 'Home',
- 0x25: 'ArrowLeft',
- 0x26: 'ArrowUp',
- 0x27: 'ArrowRight',
- 0x28: 'ArrowDown',
- 0x29: 'Select',
- 0x2c: 'PrintScreen',
- 0x2d: 'Insert',
- 0x2e: 'Delete',
- 0x2f: 'Help',
- 0x30: 'Digit0',
- 0x31: 'Digit1',
- 0x32: 'Digit2',
- 0x33: 'Digit3',
- 0x34: 'Digit4',
- 0x35: 'Digit5',
- 0x36: 'Digit6',
- 0x37: 'Digit7',
- 0x38: 'Digit8',
- 0x39: 'Digit9',
- 0x5b: 'MetaLeft',
- 0x5c: 'MetaRight',
- 0x5d: 'ContextMenu',
- 0x5f: 'Sleep',
- 0x60: 'Numpad0',
- 0x61: 'Numpad1',
- 0x62: 'Numpad2',
- 0x63: 'Numpad3',
- 0x64: 'Numpad4',
- 0x65: 'Numpad5',
- 0x66: 'Numpad6',
- 0x67: 'Numpad7',
- 0x68: 'Numpad8',
- 0x69: 'Numpad9',
- 0x6a: 'NumpadMultiply',
- 0x6b: 'NumpadAdd',
- 0x6c: 'NumpadDecimal',
- 0x6d: 'NumpadSubtract',
- 0x6e: 'NumpadDecimal', // Duplicate, because buggy on Windows
- 0x6f: 'NumpadDivide',
- 0x70: 'F1',
- 0x71: 'F2',
- 0x72: 'F3',
- 0x73: 'F4',
- 0x74: 'F5',
- 0x75: 'F6',
- 0x76: 'F7',
- 0x77: 'F8',
- 0x78: 'F9',
- 0x79: 'F10',
- 0x7a: 'F11',
- 0x7b: 'F12',
- 0x7c: 'F13',
- 0x7d: 'F14',
- 0x7e: 'F15',
- 0x7f: 'F16',
- 0x80: 'F17',
- 0x81: 'F18',
- 0x82: 'F19',
- 0x83: 'F20',
- 0x84: 'F21',
- 0x85: 'F22',
- 0x86: 'F23',
- 0x87: 'F24',
- 0x90: 'NumLock',
- 0x91: 'ScrollLock',
- 0xa6: 'BrowserBack',
- 0xa7: 'BrowserForward',
- 0xa8: 'BrowserRefresh',
- 0xa9: 'BrowserStop',
- 0xaa: 'BrowserSearch',
- 0xab: 'BrowserFavorites',
- 0xac: 'BrowserHome',
- 0xad: 'AudioVolumeMute',
- 0xae: 'AudioVolumeDown',
- 0xaf: 'AudioVolumeUp',
- 0xb0: 'MediaTrackNext',
- 0xb1: 'MediaTrackPrevious',
- 0xb2: 'MediaStop',
- 0xb3: 'MediaPlayPause',
- 0xb4: 'LaunchMail',
- 0xb5: 'MediaSelect',
- 0xb6: 'LaunchApp1',
- 0xb7: 'LaunchApp2',
- 0xe1: 'AltRight', // Only when it is AltGraph
-};
diff --git a/core/input/xtscancodes.js b/core/input/xtscancodes.js
deleted file mode 100644
index 514809c6..00000000
--- a/core/input/xtscancodes.js
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * This file is auto-generated from keymaps.csv on 2017-05-31 16:20
- * Database checksum sha256(92fd165507f2a3b8c5b3fa56e425d45788dbcb98cf067a307527d91ce22cab94)
- * To re-generate, run:
- * keymap-gen --lang=js code-map keymaps.csv html atset1
-*/
-export default {
- "Again": 0xe005, /* html:Again (Again) -> linux:129 (KEY_AGAIN) -> atset1:57349 */
- "AltLeft": 0x38, /* html:AltLeft (AltLeft) -> linux:56 (KEY_LEFTALT) -> atset1:56 */
- "AltRight": 0xe038, /* html:AltRight (AltRight) -> linux:100 (KEY_RIGHTALT) -> atset1:57400 */
- "ArrowDown": 0xe050, /* html:ArrowDown (ArrowDown) -> linux:108 (KEY_DOWN) -> atset1:57424 */
- "ArrowLeft": 0xe04b, /* html:ArrowLeft (ArrowLeft) -> linux:105 (KEY_LEFT) -> atset1:57419 */
- "ArrowRight": 0xe04d, /* html:ArrowRight (ArrowRight) -> linux:106 (KEY_RIGHT) -> atset1:57421 */
- "ArrowUp": 0xe048, /* html:ArrowUp (ArrowUp) -> linux:103 (KEY_UP) -> atset1:57416 */
- "AudioVolumeDown": 0xe02e, /* html:AudioVolumeDown (AudioVolumeDown) -> linux:114 (KEY_VOLUMEDOWN) -> atset1:57390 */
- "AudioVolumeMute": 0xe020, /* html:AudioVolumeMute (AudioVolumeMute) -> linux:113 (KEY_MUTE) -> atset1:57376 */
- "AudioVolumeUp": 0xe030, /* html:AudioVolumeUp (AudioVolumeUp) -> linux:115 (KEY_VOLUMEUP) -> atset1:57392 */
- "Backquote": 0x29, /* html:Backquote (Backquote) -> linux:41 (KEY_GRAVE) -> atset1:41 */
- "Backslash": 0x2b, /* html:Backslash (Backslash) -> linux:43 (KEY_BACKSLASH) -> atset1:43 */
- "Backspace": 0xe, /* html:Backspace (Backspace) -> linux:14 (KEY_BACKSPACE) -> atset1:14 */
- "BracketLeft": 0x1a, /* html:BracketLeft (BracketLeft) -> linux:26 (KEY_LEFTBRACE) -> atset1:26 */
- "BracketRight": 0x1b, /* html:BracketRight (BracketRight) -> linux:27 (KEY_RIGHTBRACE) -> atset1:27 */
- "BrowserBack": 0xe06a, /* html:BrowserBack (BrowserBack) -> linux:158 (KEY_BACK) -> atset1:57450 */
- "BrowserFavorites": 0xe066, /* html:BrowserFavorites (BrowserFavorites) -> linux:156 (KEY_BOOKMARKS) -> atset1:57446 */
- "BrowserForward": 0xe069, /* html:BrowserForward (BrowserForward) -> linux:159 (KEY_FORWARD) -> atset1:57449 */
- "BrowserHome": 0xe032, /* html:BrowserHome (BrowserHome) -> linux:172 (KEY_HOMEPAGE) -> atset1:57394 */
- "BrowserRefresh": 0xe067, /* html:BrowserRefresh (BrowserRefresh) -> linux:173 (KEY_REFRESH) -> atset1:57447 */
- "BrowserSearch": 0xe065, /* html:BrowserSearch (BrowserSearch) -> linux:217 (KEY_SEARCH) -> atset1:57445 */
- "BrowserStop": 0xe068, /* html:BrowserStop (BrowserStop) -> linux:128 (KEY_STOP) -> atset1:57448 */
- "CapsLock": 0x3a, /* html:CapsLock (CapsLock) -> linux:58 (KEY_CAPSLOCK) -> atset1:58 */
- "Comma": 0x33, /* html:Comma (Comma) -> linux:51 (KEY_COMMA) -> atset1:51 */
- "ContextMenu": 0xe05d, /* html:ContextMenu (ContextMenu) -> linux:127 (KEY_COMPOSE) -> atset1:57437 */
- "ControlLeft": 0x1d, /* html:ControlLeft (ControlLeft) -> linux:29 (KEY_LEFTCTRL) -> atset1:29 */
- "ControlRight": 0xe01d, /* html:ControlRight (ControlRight) -> linux:97 (KEY_RIGHTCTRL) -> atset1:57373 */
- "Convert": 0x79, /* html:Convert (Convert) -> linux:92 (KEY_HENKAN) -> atset1:121 */
- "Copy": 0xe078, /* html:Copy (Copy) -> linux:133 (KEY_COPY) -> atset1:57464 */
- "Cut": 0xe03c, /* html:Cut (Cut) -> linux:137 (KEY_CUT) -> atset1:57404 */
- "Delete": 0xe053, /* html:Delete (Delete) -> linux:111 (KEY_DELETE) -> atset1:57427 */
- "Digit0": 0xb, /* html:Digit0 (Digit0) -> linux:11 (KEY_0) -> atset1:11 */
- "Digit1": 0x2, /* html:Digit1 (Digit1) -> linux:2 (KEY_1) -> atset1:2 */
- "Digit2": 0x3, /* html:Digit2 (Digit2) -> linux:3 (KEY_2) -> atset1:3 */
- "Digit3": 0x4, /* html:Digit3 (Digit3) -> linux:4 (KEY_3) -> atset1:4 */
- "Digit4": 0x5, /* html:Digit4 (Digit4) -> linux:5 (KEY_4) -> atset1:5 */
- "Digit5": 0x6, /* html:Digit5 (Digit5) -> linux:6 (KEY_5) -> atset1:6 */
- "Digit6": 0x7, /* html:Digit6 (Digit6) -> linux:7 (KEY_6) -> atset1:7 */
- "Digit7": 0x8, /* html:Digit7 (Digit7) -> linux:8 (KEY_7) -> atset1:8 */
- "Digit8": 0x9, /* html:Digit8 (Digit8) -> linux:9 (KEY_8) -> atset1:9 */
- "Digit9": 0xa, /* html:Digit9 (Digit9) -> linux:10 (KEY_9) -> atset1:10 */
- "Eject": 0xe07d, /* html:Eject (Eject) -> linux:162 (KEY_EJECTCLOSECD) -> atset1:57469 */
- "End": 0xe04f, /* html:End (End) -> linux:107 (KEY_END) -> atset1:57423 */
- "Enter": 0x1c, /* html:Enter (Enter) -> linux:28 (KEY_ENTER) -> atset1:28 */
- "Equal": 0xd, /* html:Equal (Equal) -> linux:13 (KEY_EQUAL) -> atset1:13 */
- "Escape": 0x1, /* html:Escape (Escape) -> linux:1 (KEY_ESC) -> atset1:1 */
- "F1": 0x3b, /* html:F1 (F1) -> linux:59 (KEY_F1) -> atset1:59 */
- "F10": 0x44, /* html:F10 (F10) -> linux:68 (KEY_F10) -> atset1:68 */
- "F11": 0x57, /* html:F11 (F11) -> linux:87 (KEY_F11) -> atset1:87 */
- "F12": 0x58, /* html:F12 (F12) -> linux:88 (KEY_F12) -> atset1:88 */
- "F13": 0x5d, /* html:F13 (F13) -> linux:183 (KEY_F13) -> atset1:93 */
- "F14": 0x5e, /* html:F14 (F14) -> linux:184 (KEY_F14) -> atset1:94 */
- "F15": 0x5f, /* html:F15 (F15) -> linux:185 (KEY_F15) -> atset1:95 */
- "F16": 0x55, /* html:F16 (F16) -> linux:186 (KEY_F16) -> atset1:85 */
- "F17": 0xe003, /* html:F17 (F17) -> linux:187 (KEY_F17) -> atset1:57347 */
- "F18": 0xe077, /* html:F18 (F18) -> linux:188 (KEY_F18) -> atset1:57463 */
- "F19": 0xe004, /* html:F19 (F19) -> linux:189 (KEY_F19) -> atset1:57348 */
- "F2": 0x3c, /* html:F2 (F2) -> linux:60 (KEY_F2) -> atset1:60 */
- "F20": 0x5a, /* html:F20 (F20) -> linux:190 (KEY_F20) -> atset1:90 */
- "F21": 0x74, /* html:F21 (F21) -> linux:191 (KEY_F21) -> atset1:116 */
- "F22": 0xe079, /* html:F22 (F22) -> linux:192 (KEY_F22) -> atset1:57465 */
- "F23": 0x6d, /* html:F23 (F23) -> linux:193 (KEY_F23) -> atset1:109 */
- "F24": 0x6f, /* html:F24 (F24) -> linux:194 (KEY_F24) -> atset1:111 */
- "F3": 0x3d, /* html:F3 (F3) -> linux:61 (KEY_F3) -> atset1:61 */
- "F4": 0x3e, /* html:F4 (F4) -> linux:62 (KEY_F4) -> atset1:62 */
- "F5": 0x3f, /* html:F5 (F5) -> linux:63 (KEY_F5) -> atset1:63 */
- "F6": 0x40, /* html:F6 (F6) -> linux:64 (KEY_F6) -> atset1:64 */
- "F7": 0x41, /* html:F7 (F7) -> linux:65 (KEY_F7) -> atset1:65 */
- "F8": 0x42, /* html:F8 (F8) -> linux:66 (KEY_F8) -> atset1:66 */
- "F9": 0x43, /* html:F9 (F9) -> linux:67 (KEY_F9) -> atset1:67 */
- "Find": 0xe041, /* html:Find (Find) -> linux:136 (KEY_FIND) -> atset1:57409 */
- "Help": 0xe075, /* html:Help (Help) -> linux:138 (KEY_HELP) -> atset1:57461 */
- "Hiragana": 0x77, /* html:Hiragana (Lang4) -> linux:91 (KEY_HIRAGANA) -> atset1:119 */
- "Home": 0xe047, /* html:Home (Home) -> linux:102 (KEY_HOME) -> atset1:57415 */
- "Insert": 0xe052, /* html:Insert (Insert) -> linux:110 (KEY_INSERT) -> atset1:57426 */
- "IntlBackslash": 0x56, /* html:IntlBackslash (IntlBackslash) -> linux:86 (KEY_102ND) -> atset1:86 */
- "IntlRo": 0x73, /* html:IntlRo (IntlRo) -> linux:89 (KEY_RO) -> atset1:115 */
- "IntlYen": 0x7d, /* html:IntlYen (IntlYen) -> linux:124 (KEY_YEN) -> atset1:125 */
- "KanaMode": 0x70, /* html:KanaMode (KanaMode) -> linux:93 (KEY_KATAKANAHIRAGANA) -> atset1:112 */
- "Katakana": 0x78, /* html:Katakana (Lang3) -> linux:90 (KEY_KATAKANA) -> atset1:120 */
- "KeyA": 0x1e, /* html:KeyA (KeyA) -> linux:30 (KEY_A) -> atset1:30 */
- "KeyB": 0x30, /* html:KeyB (KeyB) -> linux:48 (KEY_B) -> atset1:48 */
- "KeyC": 0x2e, /* html:KeyC (KeyC) -> linux:46 (KEY_C) -> atset1:46 */
- "KeyD": 0x20, /* html:KeyD (KeyD) -> linux:32 (KEY_D) -> atset1:32 */
- "KeyE": 0x12, /* html:KeyE (KeyE) -> linux:18 (KEY_E) -> atset1:18 */
- "KeyF": 0x21, /* html:KeyF (KeyF) -> linux:33 (KEY_F) -> atset1:33 */
- "KeyG": 0x22, /* html:KeyG (KeyG) -> linux:34 (KEY_G) -> atset1:34 */
- "KeyH": 0x23, /* html:KeyH (KeyH) -> linux:35 (KEY_H) -> atset1:35 */
- "KeyI": 0x17, /* html:KeyI (KeyI) -> linux:23 (KEY_I) -> atset1:23 */
- "KeyJ": 0x24, /* html:KeyJ (KeyJ) -> linux:36 (KEY_J) -> atset1:36 */
- "KeyK": 0x25, /* html:KeyK (KeyK) -> linux:37 (KEY_K) -> atset1:37 */
- "KeyL": 0x26, /* html:KeyL (KeyL) -> linux:38 (KEY_L) -> atset1:38 */
- "KeyM": 0x32, /* html:KeyM (KeyM) -> linux:50 (KEY_M) -> atset1:50 */
- "KeyN": 0x31, /* html:KeyN (KeyN) -> linux:49 (KEY_N) -> atset1:49 */
- "KeyO": 0x18, /* html:KeyO (KeyO) -> linux:24 (KEY_O) -> atset1:24 */
- "KeyP": 0x19, /* html:KeyP (KeyP) -> linux:25 (KEY_P) -> atset1:25 */
- "KeyQ": 0x10, /* html:KeyQ (KeyQ) -> linux:16 (KEY_Q) -> atset1:16 */
- "KeyR": 0x13, /* html:KeyR (KeyR) -> linux:19 (KEY_R) -> atset1:19 */
- "KeyS": 0x1f, /* html:KeyS (KeyS) -> linux:31 (KEY_S) -> atset1:31 */
- "KeyT": 0x14, /* html:KeyT (KeyT) -> linux:20 (KEY_T) -> atset1:20 */
- "KeyU": 0x16, /* html:KeyU (KeyU) -> linux:22 (KEY_U) -> atset1:22 */
- "KeyV": 0x2f, /* html:KeyV (KeyV) -> linux:47 (KEY_V) -> atset1:47 */
- "KeyW": 0x11, /* html:KeyW (KeyW) -> linux:17 (KEY_W) -> atset1:17 */
- "KeyX": 0x2d, /* html:KeyX (KeyX) -> linux:45 (KEY_X) -> atset1:45 */
- "KeyY": 0x15, /* html:KeyY (KeyY) -> linux:21 (KEY_Y) -> atset1:21 */
- "KeyZ": 0x2c, /* html:KeyZ (KeyZ) -> linux:44 (KEY_Z) -> atset1:44 */
- "Lang3": 0x78, /* html:Lang3 (Lang3) -> linux:90 (KEY_KATAKANA) -> atset1:120 */
- "Lang4": 0x77, /* html:Lang4 (Lang4) -> linux:91 (KEY_HIRAGANA) -> atset1:119 */
- "Lang5": 0x76, /* html:Lang5 (Lang5) -> linux:85 (KEY_ZENKAKUHANKAKU) -> atset1:118 */
- "LaunchApp1": 0xe06b, /* html:LaunchApp1 (LaunchApp1) -> linux:157 (KEY_COMPUTER) -> atset1:57451 */
- "LaunchApp2": 0xe021, /* html:LaunchApp2 (LaunchApp2) -> linux:140 (KEY_CALC) -> atset1:57377 */
- "LaunchMail": 0xe06c, /* html:LaunchMail (LaunchMail) -> linux:155 (KEY_MAIL) -> atset1:57452 */
- "MediaPlayPause": 0xe022, /* html:MediaPlayPause (MediaPlayPause) -> linux:164 (KEY_PLAYPAUSE) -> atset1:57378 */
- "MediaSelect": 0xe06d, /* html:MediaSelect (MediaSelect) -> linux:226 (KEY_MEDIA) -> atset1:57453 */
- "MediaStop": 0xe024, /* html:MediaStop (MediaStop) -> linux:166 (KEY_STOPCD) -> atset1:57380 */
- "MediaTrackNext": 0xe019, /* html:MediaTrackNext (MediaTrackNext) -> linux:163 (KEY_NEXTSONG) -> atset1:57369 */
- "MediaTrackPrevious": 0xe010, /* html:MediaTrackPrevious (MediaTrackPrevious) -> linux:165 (KEY_PREVIOUSSONG) -> atset1:57360 */
- "MetaLeft": 0xe05b, /* html:MetaLeft (MetaLeft) -> linux:125 (KEY_LEFTMETA) -> atset1:57435 */
- "MetaRight": 0xe05c, /* html:MetaRight (MetaRight) -> linux:126 (KEY_RIGHTMETA) -> atset1:57436 */
- "Minus": 0xc, /* html:Minus (Minus) -> linux:12 (KEY_MINUS) -> atset1:12 */
- "NonConvert": 0x7b, /* html:NonConvert (NonConvert) -> linux:94 (KEY_MUHENKAN) -> atset1:123 */
- "NumLock": 0x45, /* html:NumLock (NumLock) -> linux:69 (KEY_NUMLOCK) -> atset1:69 */
- "Numpad0": 0x52, /* html:Numpad0 (Numpad0) -> linux:82 (KEY_KP0) -> atset1:82 */
- "Numpad1": 0x4f, /* html:Numpad1 (Numpad1) -> linux:79 (KEY_KP1) -> atset1:79 */
- "Numpad2": 0x50, /* html:Numpad2 (Numpad2) -> linux:80 (KEY_KP2) -> atset1:80 */
- "Numpad3": 0x51, /* html:Numpad3 (Numpad3) -> linux:81 (KEY_KP3) -> atset1:81 */
- "Numpad4": 0x4b, /* html:Numpad4 (Numpad4) -> linux:75 (KEY_KP4) -> atset1:75 */
- "Numpad5": 0x4c, /* html:Numpad5 (Numpad5) -> linux:76 (KEY_KP5) -> atset1:76 */
- "Numpad6": 0x4d, /* html:Numpad6 (Numpad6) -> linux:77 (KEY_KP6) -> atset1:77 */
- "Numpad7": 0x47, /* html:Numpad7 (Numpad7) -> linux:71 (KEY_KP7) -> atset1:71 */
- "Numpad8": 0x48, /* html:Numpad8 (Numpad8) -> linux:72 (KEY_KP8) -> atset1:72 */
- "Numpad9": 0x49, /* html:Numpad9 (Numpad9) -> linux:73 (KEY_KP9) -> atset1:73 */
- "NumpadAdd": 0x4e, /* html:NumpadAdd (NumpadAdd) -> linux:78 (KEY_KPPLUS) -> atset1:78 */
- "NumpadComma": 0x7e, /* html:NumpadComma (NumpadComma) -> linux:121 (KEY_KPCOMMA) -> atset1:126 */
- "NumpadDecimal": 0x53, /* html:NumpadDecimal (NumpadDecimal) -> linux:83 (KEY_KPDOT) -> atset1:83 */
- "NumpadDivide": 0xe035, /* html:NumpadDivide (NumpadDivide) -> linux:98 (KEY_KPSLASH) -> atset1:57397 */
- "NumpadEnter": 0xe01c, /* html:NumpadEnter (NumpadEnter) -> linux:96 (KEY_KPENTER) -> atset1:57372 */
- "NumpadEqual": 0x59, /* html:NumpadEqual (NumpadEqual) -> linux:117 (KEY_KPEQUAL) -> atset1:89 */
- "NumpadMultiply": 0x37, /* html:NumpadMultiply (NumpadMultiply) -> linux:55 (KEY_KPASTERISK) -> atset1:55 */
- "NumpadParenLeft": 0xe076, /* html:NumpadParenLeft (NumpadParenLeft) -> linux:179 (KEY_KPLEFTPAREN) -> atset1:57462 */
- "NumpadParenRight": 0xe07b, /* html:NumpadParenRight (NumpadParenRight) -> linux:180 (KEY_KPRIGHTPAREN) -> atset1:57467 */
- "NumpadSubtract": 0x4a, /* html:NumpadSubtract (NumpadSubtract) -> linux:74 (KEY_KPMINUS) -> atset1:74 */
- "Open": 0x64, /* html:Open (Open) -> linux:134 (KEY_OPEN) -> atset1:100 */
- "PageDown": 0xe051, /* html:PageDown (PageDown) -> linux:109 (KEY_PAGEDOWN) -> atset1:57425 */
- "PageUp": 0xe049, /* html:PageUp (PageUp) -> linux:104 (KEY_PAGEUP) -> atset1:57417 */
- "Paste": 0x65, /* html:Paste (Paste) -> linux:135 (KEY_PASTE) -> atset1:101 */
- "Pause": 0xe046, /* html:Pause (Pause) -> linux:119 (KEY_PAUSE) -> atset1:57414 */
- "Period": 0x34, /* html:Period (Period) -> linux:52 (KEY_DOT) -> atset1:52 */
- "Power": 0xe05e, /* html:Power (Power) -> linux:116 (KEY_POWER) -> atset1:57438 */
- "PrintScreen": 0x54, /* html:PrintScreen (PrintScreen) -> linux:99 (KEY_SYSRQ) -> atset1:84 */
- "Props": 0xe006, /* html:Props (Props) -> linux:130 (KEY_PROPS) -> atset1:57350 */
- "Quote": 0x28, /* html:Quote (Quote) -> linux:40 (KEY_APOSTROPHE) -> atset1:40 */
- "ScrollLock": 0x46, /* html:ScrollLock (ScrollLock) -> linux:70 (KEY_SCROLLLOCK) -> atset1:70 */
- "Semicolon": 0x27, /* html:Semicolon (Semicolon) -> linux:39 (KEY_SEMICOLON) -> atset1:39 */
- "ShiftLeft": 0x2a, /* html:ShiftLeft (ShiftLeft) -> linux:42 (KEY_LEFTSHIFT) -> atset1:42 */
- "ShiftRight": 0x36, /* html:ShiftRight (ShiftRight) -> linux:54 (KEY_RIGHTSHIFT) -> atset1:54 */
- "Slash": 0x35, /* html:Slash (Slash) -> linux:53 (KEY_SLASH) -> atset1:53 */
- "Sleep": 0xe05f, /* html:Sleep (Sleep) -> linux:142 (KEY_SLEEP) -> atset1:57439 */
- "Space": 0x39, /* html:Space (Space) -> linux:57 (KEY_SPACE) -> atset1:57 */
- "Suspend": 0xe025, /* html:Suspend (Suspend) -> linux:205 (KEY_SUSPEND) -> atset1:57381 */
- "Tab": 0xf, /* html:Tab (Tab) -> linux:15 (KEY_TAB) -> atset1:15 */
- "Undo": 0xe007, /* html:Undo (Undo) -> linux:131 (KEY_UNDO) -> atset1:57351 */
- "WakeUp": 0xe063, /* html:WakeUp (WakeUp) -> linux:143 (KEY_WAKEUP) -> atset1:57443 */
-};
diff --git a/core/rfb.js b/core/rfb.js
deleted file mode 100644
index 4def7099..00000000
--- a/core/rfb.js
+++ /dev/null
@@ -1,2423 +0,0 @@
-/*
- * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2016 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)
- */
-
-import * as Log from './util/logging.js';
-import _ from './util/localization.js';
-import { decodeUTF8 } from './util/strings.js';
-import { set_defaults, make_properties } from './util/properties.js';
-import Display from "./display.js";
-import { Keyboard, Mouse } from "./input/devices.js";
-import Websock from "./websock.js";
-import Base64 from "./base64.js";
-import DES from "./des.js";
-import KeyTable from "./input/keysym.js";
-import XtScancode from "./input/xtscancodes.js";
-import Inflator from "./inflator.js";
-
-/*jslint white: false, browser: true */
-/*global window, Util, Display, Keyboard, Mouse, Websock, Websock_native, Base64, DES, KeyTable, Inflator, XtScancode */
-
-export default function RFB(defaults) {
- "use strict";
- if (!defaults) {
- defaults = {};
- }
-
- this._rfb_host = '';
- this._rfb_port = 5900;
- this._rfb_password = '';
- this._rfb_path = '';
-
- this._rfb_connection_state = '';
- this._rfb_init_state = '';
- this._rfb_version = 0;
- this._rfb_max_version = 3.8;
- this._rfb_auth_scheme = '';
- this._rfb_disconnect_reason = "";
-
- 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 ],
-
- // Psuedo-encoding settings
-
- //['JPEG_quality_lo', -32 ],
- ['JPEG_quality_med', -26 ],
- //['JPEG_quality_hi', -23 ],
- //['compress_lo', -255 ],
- ['compress_hi', -254 ],
- //['compress_max', -247 ],
-
- ['DesktopSize', -223 ],
- ['last_rect', -224 ],
- ['Cursor', -239 ],
- ['QEMUExtendedKeyEvent', -258 ],
- ['ExtendedDesktopSize', -308 ],
- ['xvp', -309 ],
- ['Fence', -312 ],
- ['ContinuousUpdates', -313 ]
- ];
-
- this._encHandlers = {};
- this._encNames = {};
- this._encStats = {};
-
- this._sock = null; // Websock object
- this._display = null; // Display object
- this._flushing = false; // Display flushing state
- this._keyboard = null; // Keyboard input handler object
- this._mouse = null; // Mouse input handler object
- this._disconnTimer = null; // disconnection timer
-
- this._supportsFence = false;
-
- this._supportsContinuousUpdates = false;
- this._enabledContinuousUpdates = false;
-
- // 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_width = 0;
- this._fb_height = 0;
- this._fb_name = "";
-
- this._destBuff = null;
- this._paletteBuff = new Uint8Array(1024); // 256 * 4 (max palette size * max bytes-per-pixel)
-
- 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
- };
-
- this._supportsSetDesktopSize = false;
- this._screen_id = 0;
- this._screen_flags = 0;
-
- // Mouse state
- this._mouse_buttonMask = 0;
- this._mouse_arr = [];
- this._viewportDragging = false;
- this._viewportDragPos = {};
- this._viewportHasMoved = false;
-
- // QEMU Extended Key Event support - default to false
- this._qemuExtKeyEventSupported = false;
-
- // set the default value on user-facing properties
- 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
- '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'], // 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): connection state change
- 'onNotification': function () { }, // onNotification(rfb, msg, level, options): notification for UI
- 'onDisconnected': function () { }, // onDisconnected(rfb, reason): disconnection finished
- 'onPasswordRequired': function () { }, // onPasswordRequired(rfb, msg): 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
- Log.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];
- }
-
- // NB: nothing that needs explicit teardown should be done
- // before this point, since this can throw an exception
- try {
- this._display = new Display({target: this._target,
- onFlush: this._onFlush.bind(this)});
- } catch (exc) {
- Log.Error("Display exception: " + exc);
- throw exc;
- }
-
- this._keyboard = new Keyboard({target: this._focusContainer,
- onKeyEvent: this._handleKeyEvent.bind(this)});
-
- this._mouse = new Mouse({target: this._target,
- onMouseButton: this._handleMouseButton.bind(this),
- onMouseMove: this._handleMouseMove.bind(this)});
-
- this._sock = new Websock();
- this._sock.on('message', this._handle_message.bind(this));
- this._sock.on('open', function () {
- if ((this._rfb_connection_state === 'connecting') &&
- (this._rfb_init_state === '')) {
- this._rfb_init_state = 'ProtocolVersion';
- Log.Debug("Starting VNC handshake");
- } else {
- this._fail("Unexpected server connection");
- }
- }.bind(this));
- this._sock.on('close', function (e) {
- Log.Warn("WebSocket on-close event");
- var msg = "";
- if (e.code) {
- msg = " (code: " + e.code;
- if (e.reason) {
- msg += ", reason: " + e.reason;
- }
- msg += ")";
- }
- switch (this._rfb_connection_state) {
- case 'disconnecting':
- this._updateConnectionState('disconnected');
- break;
- case 'connecting':
- this._fail('Failed to connect to server', msg);
- break;
- case 'connected':
- // Handle disconnects that were initiated server-side
- this._updateConnectionState('disconnecting');
- this._updateConnectionState('disconnected');
- break;
- case 'disconnected':
- this._fail("Unexpected server disconnect",
- "Already disconnected: " + msg);
- break;
- default:
- this._fail("Unexpected server disconnect",
- "Not in any state yet: " + msg);
- break;
- }
- this._sock.off('close');
- }.bind(this));
- this._sock.on('error', function (e) {
- Log.Warn("WebSocket on-error event");
- });
-
- this._init_vars();
- this._cleanup();
-
- var rmode = this._display.get_render_mode();
- Log.Info("Using native WebSockets, render mode: " + rmode);
-
- Log.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._rfb_init_state = '';
- this._updateConnectionState('connecting');
- return true;
- },
-
- disconnect: function () {
- this._updateConnectionState('disconnecting');
- this._sock.off('error');
- this._sock.off('message');
- this._sock.off('open');
- },
-
- sendPassword: function (passwd) {
- this._rfb_password = passwd;
- setTimeout(this._init_msg.bind(this), 0);
- },
-
- sendCtrlAltDel: function () {
- if (this._rfb_connection_state !== 'connected' || this._view_only) { return false; }
- Log.Info("Sending Ctrl-Alt-Del");
-
- this.sendKey(KeyTable.XK_Control_L, "ControlLeft", true);
- this.sendKey(KeyTable.XK_Alt_L, "AltLeft", true);
- this.sendKey(KeyTable.XK_Delete, "Delete", true);
- this.sendKey(KeyTable.XK_Delete, "Delete", false);
- this.sendKey(KeyTable.XK_Alt_L, "AltLeft", false);
- this.sendKey(KeyTable.XK_Control_L, "ControlLeft", false);
-
- return true;
- },
-
- xvpOp: function (ver, op) {
- if (this._rfb_xvp_ver < ver) { return false; }
- Log.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 (keysym, code, down) {
- if (this._rfb_connection_state !== 'connected' || this._view_only) { return false; }
-
- if (down === undefined) {
- this.sendKey(keysym, code, true);
- this.sendKey(keysym, code, false);
- return true;
- }
-
- var scancode = XtScancode[code];
-
- if (this._qemuExtKeyEventSupported && scancode) {
- // 0 is NoSymbol
- keysym = keysym || 0;
-
- Log.Info("Sending key (" + (down ? "down" : "up") + "): keysym " + keysym + ", scancode " + scancode);
-
- RFB.messages.QEMUExtendedKeyEvent(this._sock, keysym, down, scancode);
- } else {
- if (!keysym) {
- return false;
- }
- Log.Info("Sending keysym (" + (down ? "down" : "up") + "): " + keysym);
- RFB.messages.keyEvent(this._sock, keysym, down ? 1 : 0);
- }
-
- return true;
- },
-
- clipboardPasteFrom: function (text) {
- if (this._rfb_connection_state !== 'connected' || this._view_only) { return; }
- RFB.messages.clientCutText(this._sock, text);
- },
-
- // Requests a change of remote desktop size. This message is an extension
- // and may only be sent if we have received an ExtendedDesktopSize message
- requestDesktopSize: function (width, height) {
- if (this._rfb_connection_state !== 'connected' ||
- this._view_only) {
- return false;
- }
-
- if (this._supportsSetDesktopSize) {
- RFB.messages.setDesktopSize(this._sock, width, height,
- this._screen_id, this._screen_flags);
- this._sock.flush();
- return true;
- } else {
- return false;
- }
- },
-
-
- // Private methods
-
- _connect: function () {
- Log.Debug(">> RFB.connect");
- this._init_vars();
-
- var uri;
- if (typeof UsingSocketIO !== 'undefined') {
- uri = 'http';
- } else {
- uri = this._encrypt ? 'wss' : 'ws';
- }
-
- uri += '://' + this._rfb_host + ':' + this._rfb_port + '/' + this._rfb_path;
- Log.Info("connecting to " + uri);
-
- try {
- // WebSocket.onopen transitions to the RFB init states
- this._sock.open(uri, this._wsProtocols);
- } catch (e) {
- if (e.name === 'SyntaxError') {
- this._fail("Invalid host or port value given", e);
- } else {
- this._fail("Error while connecting", e);
- }
- }
-
- Log.Debug("<< RFB.connect");
- },
-
- _disconnect: function () {
- Log.Debug(">> RFB.disconnect");
- this._cleanup();
- this._sock.close();
- this._print_stats();
- Log.Debug("<< RFB.disconnect");
- },
-
- _init_vars: function () {
- // reset state
- 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 Inflator();
- }
- },
-
- _print_stats: function () {
- Log.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) {
- Log.Info(" " + this._encodings[i][0] + ": " + s[0] + " rects");
- }
- }
-
- Log.Info("Encoding stats since page load:");
- for (i = 0; i < this._encodings.length; i++) {
- s = this._encStats[this._encodings[i][1]];
- Log.Info(" " + this._encodings[i][0] + ": " + s[1] + " rects");
- }
- },
-
- _cleanup: function () {
- if (!this._view_only) { this._keyboard.ungrab(); }
- if (!this._view_only) { this._mouse.ungrab(); }
- this._display.defaultCursor();
- if (Log.get_logging() !== 'debug') {
- // Show noVNC logo on load and when disconnected, unless in
- // debug mode
- this._display.clear();
- }
- },
-
- /*
- * Connection states:
- * connecting
- * connected
- * disconnecting
- * disconnected - permanent state
- */
- _updateConnectionState: function (state) {
- var oldstate = this._rfb_connection_state;
-
- if (state === oldstate) {
- Log.Debug("Already in state '" + state + "', ignoring");
- return;
- }
-
- // The 'disconnected' state is permanent for each RFB object
- if (oldstate === 'disconnected') {
- Log.Error("Tried changing state of a disconnected RFB object");
- return;
- }
-
- // Ensure proper transitions before doing anything
- switch (state) {
- case 'connected':
- if (oldstate !== 'connecting') {
- Log.Error("Bad transition to connected state, " +
- "previous connection state: " + oldstate);
- return;
- }
- break;
-
- case 'disconnected':
- if (oldstate !== 'disconnecting') {
- Log.Error("Bad transition to disconnected state, " +
- "previous connection state: " + oldstate);
- return;
- }
- break;
-
- case 'connecting':
- if (oldstate !== '') {
- Log.Error("Bad transition to connecting state, " +
- "previous connection state: " + oldstate);
- return;
- }
- break;
-
- case 'disconnecting':
- if (oldstate !== 'connected' && oldstate !== 'connecting') {
- Log.Error("Bad transition to disconnecting state, " +
- "previous connection state: " + oldstate);
- return;
- }
- break;
-
- default:
- Log.Error("Unknown connection state: " + state);
- return;
- }
-
- // State change actions
-
- this._rfb_connection_state = state;
- this._onUpdateState(this, state, oldstate);
-
- var smsg = "New state '" + state + "', was '" + oldstate + "'.";
- Log.Debug(smsg);
-
- if (this._disconnTimer && state !== 'disconnecting') {
- Log.Debug("Clearing disconnect timer");
- clearTimeout(this._disconnTimer);
- this._disconnTimer = null;
-
- // make sure we don't get a double event
- this._sock.off('close');
- }
-
- switch (state) {
- case 'disconnected':
- // Call onDisconnected callback after onUpdateState since
- // we don't know if the UI only displays the latest message
- if (this._rfb_disconnect_reason !== "") {
- this._onDisconnected(this, this._rfb_disconnect_reason);
- } else {
- // No reason means clean disconnect
- this._onDisconnected(this);
- }
- break;
-
- case 'connecting':
- this._connect();
- break;
-
- case 'disconnecting':
- this._disconnect();
-
- this._disconnTimer = setTimeout(function () {
- this._rfb_disconnect_reason = _("Disconnect timeout");
- this._updateConnectionState('disconnected');
- }.bind(this), this._disconnectTimeout * 1000);
- break;
- }
- },
-
- /* Print errors and disconnect
- *
- * The optional parameter 'details' is used for information that
- * should be logged but not sent to the user interface.
- */
- _fail: function (msg, details) {
- var fullmsg = msg;
- if (typeof details !== 'undefined') {
- fullmsg = msg + " (" + details + ")";
- }
- switch (this._rfb_connection_state) {
- case 'disconnecting':
- Log.Error("Failed when disconnecting: " + fullmsg);
- break;
- case 'connected':
- Log.Error("Failed while connected: " + fullmsg);
- break;
- case 'connecting':
- Log.Error("Failed when connecting: " + fullmsg);
- break;
- default:
- Log.Error("RFB failure: " + fullmsg);
- break;
- }
- this._rfb_disconnect_reason = msg; //This is sent to the UI
-
- // Transition to disconnected without waiting for socket to close
- this._updateConnectionState('disconnecting');
- this._updateConnectionState('disconnected');
-
- return false;
- },
-
- /*
- * Send a notification to the UI. Valid levels are:
- * 'normal'|'warn'|'error'
- *
- * NOTE: Options could be added in the future.
- * NOTE: If this function is called multiple times, remember that the
- * interface could be only showing the latest notification.
- */
- _notification: function(msg, level, options) {
- switch (level) {
- case 'normal':
- case 'warn':
- case 'error':
- Log.Debug("Notification[" + level + "]:" + msg);
- break;
- default:
- Log.Error("Invalid notification level: " + level);
- return;
- }
-
- if (options) {
- this._onNotification(this, msg, level, options);
- } else {
- this._onNotification(this, msg, level);
- }
- },
-
- _handle_message: function () {
- if (this._sock.rQlen() === 0) {
- Log.Warn("handle_message called on an empty receive queue");
- return;
- }
-
- switch (this._rfb_connection_state) {
- case 'disconnected':
- Log.Error("Got data while disconnected");
- break;
- case 'connected':
- while (true) {
- if (this._flushing) {
- break;
- }
- if (!this._normal_msg()) {
- break;
- }
- if (this._sock.rQlen() === 0) {
- break;
- }
- }
- break;
- default:
- this._init_msg();
- break;
- }
- },
-
- _handleKeyEvent: function (keysym, code, down) {
- this.sendKey(keysym, code, 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 the viewport didn't actually move, then treat as a mouse click event
- // Send the button down event here, as the button up event is sent at the end of this function
- if (!this._viewportHasMoved && !this._view_only) {
- RFB.messages.pointerEvent(this._sock, this._display.absX(x), this._display.absY(y), bmask);
- }
- this._viewportHasMoved = false;
- }
- }
-
- if (this._view_only) { return; } // View only, skip mouse events
-
- if (this._rfb_connection_state !== 'connected') { return; }
- RFB.messages.pointerEvent(this._sock, this._display.absX(x), this._display.absY(y), this._mouse_buttonMask);
- },
-
- _handleMouseMove: function (x, y) {
- if (this._viewportDragging) {
- var deltaX = this._viewportDragPos.x - x;
- var deltaY = this._viewportDragPos.y - y;
-
- // The goal is to trigger on a certain physical width, the
- // devicePixelRatio brings us a bit closer but is not optimal.
- var dragThreshold = 10 * (window.devicePixelRatio || 1);
-
- if (this._viewportHasMoved || (Math.abs(deltaX) > dragThreshold ||
- Math.abs(deltaY) > dragThreshold)) {
- this._viewportHasMoved = true;
-
- this._viewportDragPos = {'x': x, 'y': y};
- this._display.viewportChangePos(deltaX, deltaY);
- }
-
- // Skip sending mouse events
- return;
- }
-
- if (this._view_only) { return; } // View only, skip mouse events
-
- if (this._rfb_connection_state !== 'connected') { return; }
- RFB.messages.pointerEvent(this._sock, this._display.absX(x), this._display.absY(y), this._mouse_buttonMask);
- },
-
- // Message Handlers
-
- _negotiate_protocol_version: function () {
- if (this._sock.rQlen() < 12) {
- return this._fail("Error while negotiating with server",
- "Incomplete protocol version");
- }
-
- var sversion = this._sock.rQshiftStr(12).substr(4, 7);
- Log.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
- case "005.000": // RealVNC 5.3
- this._rfb_version = 3.8;
- break;
- default:
- return this._fail("Unsupported server",
- "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;
- }
-
- var cversion = "00" + parseInt(this._rfb_version, 10) +
- ".00" + ((this._rfb_version * 10) % 10);
- this._sock.send_string("RFB " + cversion + "\n");
- Log.Debug('Sent ProtocolVersion: ' + cversion);
-
- this._rfb_init_state = 'Security';
- },
-
- _negotiate_security: function () {
- // Polyfill since IE and PhantomJS doesn't have
- // TypedArray.includes()
- function includes(item, array) {
- for (var i = 0; i < array.length; i++) {
- if (array[i] === item) {
- return true;
- }
- }
- return false;
- }
-
- 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("Error while negotiating with server",
- "Security failure: " + reason);
- }
-
- var types = this._sock.rQshiftBytes(num_types);
- Log.Debug("Server security types: " + types);
-
- // Look for each auth in preferred order
- this._rfb_auth_scheme = 0;
- if (includes(1, types)) {
- this._rfb_auth_scheme = 1; // None
- } else if (includes(22, types)) {
- this._rfb_auth_scheme = 22; // XVP
- } else if (includes(16, types)) {
- this._rfb_auth_scheme = 16; // Tight
- } else if (includes(2, types)) {
- this._rfb_auth_scheme = 2; // VNC Auth
- } else {
- return this._fail("Unsupported server",
- "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._rfb_init_state = 'Authentication';
- Log.Debug('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) {
- var msg = 'XVP credentials required (user' + xvp_sep +
- 'target' + xvp_sep + 'password) -- got only ' + this._rfb_password;
- this._onPasswordRequired(this, msg);
- 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) {
- this._onPasswordRequired(this);
- return false;
- }
-
- if (this._sock.rQwait("auth challenge", 16)) { return false; }
-
- // TODO(directxman12): make genDES not require an Array
- var challenge = Array.prototype.slice.call(this._sock.rQshiftBytes(16));
- var response = RFB.genDES(this._rfb_password, challenge);
- this._sock.send(response);
- this._rfb_init_state = "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("Unsupported server",
- "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("Unsupported server",
- "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 (subAuthCount === 0) { // empty sub-auth list received means 'no auth' subtype selected
- this._rfb_init_state = 'SecurityResult';
- return true;
- }
-
- 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._rfb_init_state = 'SecurityResult';
- return true;
- case 'STDVVNCAUTH_': // VNC auth
- this._rfb_auth_scheme = 2;
- return this._init_msg();
- default:
- return this._fail("Unsupported server",
- "Unsupported tiny auth scheme: " +
- authType);
- }
- }
- }
-
- return this._fail("Unsupported server",
- "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("Authentication failure", reason);
-
- case 1: // no auth
- if (this._rfb_version >= 3.8) {
- this._rfb_init_state = 'SecurityResult';
- return true;
- }
- this._rfb_init_state = 'ClientInitialisation';
- 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 server",
- "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._rfb_init_state = 'ClientInitialisation';
- Log.Debug('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("Authentication failure", reason);
- } else {
- return this._fail("Authentication failure");
- }
- return false;
- case 2:
- return this._fail("Too many authentication attempts");
- default:
- return this._fail("Unsupported server",
- "Unknown SecurityResult");
- }
- },
-
- _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();
- this._destBuff = new Uint8Array(this._fb_width * this._fb_height * 4);
-
- /* 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 = 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; }
-
- // we don't actually do anything with the capability information that TIGHT sends,
- // so we just skip the all of this.
-
- // TIGHT server message capabilities
- this._sock.rQskipBytes(16 * numServerMessages);
-
- // TIGHT client message capabilities
- this._sock.rQskipBytes(16 * numClientMessages);
-
- // TIGHT encoding capabilities
- this._sock.rQskipBytes(16 * numEncodings);
- }
-
- // NB(directxman12): these are down here so that we don't run them multiple times
- // if we backtrack
- Log.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) {
- Log.Warn("Server native endian is not little endian");
- }
-
- if (red_shift !== 16) {
- Log.Warn("Server native red-shift is not 16");
- }
-
- if (blue_shift !== 0) {
- Log.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);
-
- this._display.resize(this._fb_width, this._fb_height);
- this._onFBResize(this, this._fb_width, this._fb_height);
-
- if (!this._view_only) { this._keyboard.grab(); }
- if (!this._view_only) { this._mouse.grab(); }
-
- RFB.messages.pixelFormat(this._sock, 4, 3, true);
- RFB.messages.clientEncodings(this._sock, this._encodings, this._local_cursor);
- RFB.messages.fbUpdateRequest(this._sock, false, 0, 0, this._fb_width, this._fb_height);
-
- this._timing.fbu_rt_start = (new Date()).getTime();
- this._timing.pixels = 0;
-
- this._updateConnectionState('connected');
- return true;
- },
-
- /* RFB protocol initialization states:
- * ProtocolVersion
- * Security
- * Authentication
- * SecurityResult
- * ClientInitialization - not triggered by server message
- * ServerInitialization
- */
- _init_msg: function () {
- switch (this._rfb_init_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._rfb_init_state = 'ServerInitialisation';
- return true;
-
- case 'ServerInitialisation':
- return this._negotiate_server_init();
-
- default:
- return this._fail("Internal error", "Unknown init state: " +
- this._rfb_init_state);
- }
- },
-
- _handle_set_colour_map_msg: function () {
- Log.Debug("SetColorMapEntries");
-
- return this._fail("Protocol error", "Unexpected SetColorMapEntries message");
- },
-
- _handle_server_cut_text: function () {
- Log.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);
-
- if (this._view_only) { return true; }
-
- this._onClipboard(this, text);
-
- return true;
- },
-
- _handle_server_fence_msg: function() {
- if (this._sock.rQwait("ServerFence header", 8, 1)) { return false; }
- this._sock.rQskipBytes(3); // Padding
- var flags = this._sock.rQshift32();
- var length = this._sock.rQshift8();
-
- if (this._sock.rQwait("ServerFence payload", length, 9)) { return false; }
-
- if (length > 64) {
- Log.Warn("Bad payload length (" + length + ") in fence response");
- length = 64;
- }
-
- var payload = this._sock.rQshiftStr(length);
-
- this._supportsFence = true;
-
- /*
- * Fence flags
- *
- * (1<<0) - BlockBefore
- * (1<<1) - BlockAfter
- * (1<<2) - SyncNext
- * (1<<31) - Request
- */
-
- if (!(flags & (1<<31))) {
- return this._fail("Internal error",
- "Unexpected fence response");
- }
-
- // Filter out unsupported flags
- // FIXME: support syncNext
- flags &= (1<<0) | (1<<1);
-
- // BlockBefore and BlockAfter are automatically handled by
- // the fact that we process each incoming message
- // synchronuosly.
- RFB.messages.clientFence(this._sock, flags, payload);
-
- 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
- Log.Error("Operation Failed");
- this._notification("XVP Operation Failed", 'error');
- break;
- case 1: // XVP_INIT
- this._rfb_xvp_ver = xvp_ver;
- Log.Info("XVP extensions enabled (version " + this._rfb_xvp_ver + ")");
- this._onXvpInit(this._rfb_xvp_ver);
- break;
- default:
- this._fail("Unexpected server message",
- "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._enabledContinuousUpdates) {
- RFB.messages.fbUpdateRequest(this._sock, true, 0, 0,
- this._fb_width, this._fb_height);
- }
- return ret;
-
- case 1: // SetColorMapEntries
- return this._handle_set_colour_map_msg();
-
- case 2: // Bell
- Log.Debug("Bell");
- this._onBell(this);
- return true;
-
- case 3: // ServerCutText
- return this._handle_server_cut_text();
-
- case 150: // EndOfContinuousUpdates
- var first = !(this._supportsContinuousUpdates);
- this._supportsContinuousUpdates = true;
- this._enabledContinuousUpdates = false;
- if (first) {
- this._enabledContinuousUpdates = true;
- this._updateContinuousUpdates();
- Log.Info("Enabling continuous updates.");
- } else {
- // FIXME: We need to send a framebufferupdaterequest here
- // if we add support for turning off continuous updates
- }
- return true;
-
- case 248: // ServerFence
- return this._handle_server_fence_msg();
-
- case 250: // XVP
- return this._handle_xvp_msg();
-
- default:
- this._fail("Unexpected server message", "Type:" + msg_type);
- Log.Debug("sock.rQslice(0, 30): " + this._sock.rQslice(0, 30));
- return true;
- }
- },
-
- _onFlush: function() {
- this._flushing = false;
- // Resume processing
- if (this._sock.rQlen() > 0) {
- this._handle_message();
- }
- },
-
- _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();
- Log.Info("First FBU latency: " + (now - this._timing.fbu_rt_start));
- }
-
- // Make sure the previous frame is fully rendered first
- // to avoid building up an excessive queue
- if (this._display.pending()) {
- this._flushing = true;
- this._display.flush();
- return false;
- }
- }
-
- while (this._FBU.rects > 0) {
- if (this._rfb_connection_state !== 'connected') { 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("Unexpected server message",
- "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++;
- Log.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++;
- Log.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._display.flip();
-
- 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
- },
-
- _updateContinuousUpdates: function() {
- if (!this._enabledContinuousUpdates) { return; }
-
- RFB.messages.enableContinuousUpdates(this._sock, true, 0, 0,
- this._fb_width, this._fb_height);
- }
-};
-
-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
- ['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): connection state change
- ['onNotification', 'rw', 'func'], // onNotification(rfb, msg, level, options): notification for the UI
- ['onDisconnected', 'rw', 'func'], // onDisconnected(rfb, reason): disconnection finished
- ['onPasswordRequired', 'rw', 'func'], // onPasswordRequired(rfb, msg): 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;
- this._display.disableLocalCursor(); //Only show server-side cursor
- } else {
- if (this._display.get_cursor_uri()) {
- this._local_cursor = true;
- } else {
- Log.Warn("Browser does not support local cursor");
- this._display.disableLocalCursor();
- }
- }
-
- // Need to send an updated list of encodings if we are connected
- if (this._rfb_connection_state === "connected") {
- RFB.messages.clientEncodings(this._sock, this._encodings, cursor);
- }
-};
-
-RFB.prototype.set_view_only = function (view_only) {
- this._view_only = view_only;
-
- if (this._rfb_connection_state === "connecting" ||
- this._rfb_connection_state === "connected") {
- if (view_only) {
- this._keyboard.ungrab();
- this._mouse.ungrab();
- } else {
- this._keyboard.grab();
- this._mouse.grab();
- }
- }
-};
-
-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 (sock, keysym, down) {
- var buff = sock._sQ;
- var offset = sock._sQlen;
-
- buff[offset] = 4; // msg-type
- buff[offset + 1] = down;
-
- buff[offset + 2] = 0;
- buff[offset + 3] = 0;
-
- buff[offset + 4] = (keysym >> 24);
- buff[offset + 5] = (keysym >> 16);
- buff[offset + 6] = (keysym >> 8);
- buff[offset + 7] = keysym;
-
- sock._sQlen += 8;
- sock.flush();
- },
-
- QEMUExtendedKeyEvent: function (sock, keysym, down, keycode) {
- function getRFBkeycode(xt_scancode) {
- var upperByte = (keycode >> 8);
- var lowerByte = (keycode & 0x00ff);
- if (upperByte === 0xe0 && lowerByte < 0x7f) {
- lowerByte = lowerByte | 0x80;
- return lowerByte;
- }
- return xt_scancode;
- }
-
- var buff = sock._sQ;
- var offset = sock._sQlen;
-
- buff[offset] = 255; // msg-type
- buff[offset + 1] = 0; // sub msg-type
-
- buff[offset + 2] = (down >> 8);
- buff[offset + 3] = down;
-
- buff[offset + 4] = (keysym >> 24);
- buff[offset + 5] = (keysym >> 16);
- buff[offset + 6] = (keysym >> 8);
- buff[offset + 7] = keysym;
-
- var RFBkeycode = getRFBkeycode(keycode);
-
- buff[offset + 8] = (RFBkeycode >> 24);
- buff[offset + 9] = (RFBkeycode >> 16);
- buff[offset + 10] = (RFBkeycode >> 8);
- buff[offset + 11] = RFBkeycode;
-
- sock._sQlen += 12;
- sock.flush();
- },
-
- pointerEvent: function (sock, x, y, mask) {
- var buff = sock._sQ;
- var offset = sock._sQlen;
-
- buff[offset] = 5; // msg-type
-
- buff[offset + 1] = mask;
-
- buff[offset + 2] = x >> 8;
- buff[offset + 3] = x;
-
- buff[offset + 4] = y >> 8;
- buff[offset + 5] = y;
-
- sock._sQlen += 6;
- sock.flush();
- },
-
- // TODO(directxman12): make this unicode compatible?
- clientCutText: function (sock, text) {
- var buff = sock._sQ;
- var offset = sock._sQlen;
-
- buff[offset] = 6; // msg-type
-
- buff[offset + 1] = 0; // padding
- buff[offset + 2] = 0; // padding
- buff[offset + 3] = 0; // padding
-
- var n = text.length;
-
- buff[offset + 4] = n >> 24;
- buff[offset + 5] = n >> 16;
- buff[offset + 6] = n >> 8;
- buff[offset + 7] = n;
-
- for (var i = 0; i < n; i++) {
- buff[offset + 8 + i] = text.charCodeAt(i);
- }
-
- sock._sQlen += 8 + n;
- sock.flush();
- },
-
- setDesktopSize: function (sock, width, height, id, flags) {
- var buff = sock._sQ;
- var offset = sock._sQlen;
-
- buff[offset] = 251; // msg-type
- buff[offset + 1] = 0; // padding
- buff[offset + 2] = width >> 8; // width
- buff[offset + 3] = width;
- buff[offset + 4] = height >> 8; // height
- buff[offset + 5] = height;
-
- buff[offset + 6] = 1; // number-of-screens
- buff[offset + 7] = 0; // padding
-
- // screen array
- buff[offset + 8] = id >> 24; // id
- buff[offset + 9] = id >> 16;
- buff[offset + 10] = id >> 8;
- buff[offset + 11] = id;
- buff[offset + 12] = 0; // x-position
- buff[offset + 13] = 0;
- buff[offset + 14] = 0; // y-position
- buff[offset + 15] = 0;
- buff[offset + 16] = width >> 8; // width
- buff[offset + 17] = width;
- buff[offset + 18] = height >> 8; // height
- buff[offset + 19] = height;
- buff[offset + 20] = flags >> 24; // flags
- buff[offset + 21] = flags >> 16;
- buff[offset + 22] = flags >> 8;
- buff[offset + 23] = flags;
-
- sock._sQlen += 24;
- sock.flush();
- },
-
- clientFence: function (sock, flags, payload) {
- var buff = sock._sQ;
- var offset = sock._sQlen;
-
- buff[offset] = 248; // msg-type
-
- buff[offset + 1] = 0; // padding
- buff[offset + 2] = 0; // padding
- buff[offset + 3] = 0; // padding
-
- buff[offset + 4] = flags >> 24; // flags
- buff[offset + 5] = flags >> 16;
- buff[offset + 6] = flags >> 8;
- buff[offset + 7] = flags;
-
- var n = payload.length;
-
- buff[offset + 8] = n; // length
-
- for (var i = 0; i < n; i++) {
- buff[offset + 9 + i] = payload.charCodeAt(i);
- }
-
- sock._sQlen += 9 + n;
- sock.flush();
- },
-
- enableContinuousUpdates: function (sock, enable, x, y, width, height) {
- var buff = sock._sQ;
- var offset = sock._sQlen;
-
- buff[offset] = 150; // msg-type
- buff[offset + 1] = enable; // enable-flag
-
- buff[offset + 2] = x >> 8; // x
- buff[offset + 3] = x;
- buff[offset + 4] = y >> 8; // y
- buff[offset + 5] = y;
- buff[offset + 6] = width >> 8; // width
- buff[offset + 7] = width;
- buff[offset + 8] = height >> 8; // height
- buff[offset + 9] = height;
-
- sock._sQlen += 10;
- sock.flush();
- },
-
- pixelFormat: function (sock, bpp, depth, true_color) {
- var buff = sock._sQ;
- var offset = sock._sQlen;
-
- buff[offset] = 0; // msg-type
-
- buff[offset + 1] = 0; // padding
- buff[offset + 2] = 0; // padding
- buff[offset + 3] = 0; // padding
-
- buff[offset + 4] = bpp * 8; // bits-per-pixel
- buff[offset + 5] = depth * 8; // depth
- buff[offset + 6] = 0; // little-endian
- buff[offset + 7] = true_color ? 1 : 0; // true-color
-
- buff[offset + 8] = 0; // red-max
- buff[offset + 9] = 255; // red-max
-
- buff[offset + 10] = 0; // green-max
- buff[offset + 11] = 255; // green-max
-
- buff[offset + 12] = 0; // blue-max
- buff[offset + 13] = 255; // blue-max
-
- buff[offset + 14] = 16; // red-shift
- buff[offset + 15] = 8; // green-shift
- buff[offset + 16] = 0; // blue-shift
-
- buff[offset + 17] = 0; // padding
- buff[offset + 18] = 0; // padding
- buff[offset + 19] = 0; // padding
-
- sock._sQlen += 20;
- sock.flush();
- },
-
- clientEncodings: function (sock, encodings, local_cursor) {
- var buff = sock._sQ;
- var offset = sock._sQlen;
-
- buff[offset] = 2; // msg-type
- buff[offset + 1] = 0; // padding
-
- // offset + 2 and offset + 3 are encoding count
-
- var i, j = offset + 4, cnt = 0;
- for (i = 0; i < encodings.length; i++) {
- if (encodings[i][0] === "Cursor" && !local_cursor) {
- Log.Debug("Skipping Cursor pseudo-encoding");
- } else {
- var enc = encodings[i][1];
- buff[j] = enc >> 24;
- buff[j + 1] = enc >> 16;
- buff[j + 2] = enc >> 8;
- buff[j + 3] = enc;
-
- j += 4;
- cnt++;
- }
- }
-
- buff[offset + 2] = cnt >> 8;
- buff[offset + 3] = cnt;
-
- sock._sQlen += j - offset;
- sock.flush();
- },
-
- fbUpdateRequest: function (sock, incremental, x, y, w, h) {
- var buff = sock._sQ;
- var offset = sock._sQlen;
-
- if (typeof(x) === "undefined") { x = 0; }
- if (typeof(y) === "undefined") { y = 0; }
-
- buff[offset] = 3; // msg-type
- buff[offset + 1] = incremental ? 1 : 0;
-
- buff[offset + 2] = (x >> 8) & 0xFF;
- buff[offset + 3] = x & 0xFF;
-
- buff[offset + 4] = (y >> 8) & 0xFF;
- buff[offset + 5] = y & 0xFF;
-
- buff[offset + 6] = (w >> 8) & 0xFF;
- buff[offset + 7] = w & 0xFF;
-
- buff[offset + 8] = (h >> 8) & 0xFF;
- buff[offset + 9] = h & 0xFF;
-
- sock._sQlen += 10;
- sock.flush();
- }
-};
-
-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.encodingHandlers = {
- RAW: function () {
- if (this._FBU.lines === 0) {
- this._FBU.lines = this._FBU.height;
- }
-
- this._FBU.bytes = this._FBU.width * 4; // 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 * 4)));
- 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 * 4);
- this._FBU.lines -= curr_height;
-
- if (this._FBU.lines > 0) {
- this._FBU.bytes = this._FBU.width * 4; // 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.copyImage(this._sock.rQshift16(), this._sock.rQshift16(),
- this._FBU.x, this._FBU.y, this._FBU.width,
- 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 + 4;
- if (this._sock.rQwait("RRE", 4 + 4)) { return false; }
- this._FBU.subrects = this._sock.rQshift32();
- color = this._sock.rQshiftBytes(4); // 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() >= (4 + 8)) {
- color = this._sock.rQshiftBytes(4);
- var x = this._sock.rQshift16();
- var y = this._sock.rQshift16();
- var width = this._sock.rQshift16();
- var height = this._sock.rQshift16();
- 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 = (4 + 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("Unexpected server message",
- "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 * 4;
- } else {
- if (subencoding & 0x02) { // Background
- this._FBU.bytes += 4;
- }
- if (subencoding & 0x04) { // Foreground
- this._FBU.bytes += 4;
- }
- 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 * (4 + 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
- Log.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[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
- rQi += 4;
- }
- if (this._FBU.subencoding & 0x04) { // Foreground
- this._FBU.foreground = [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
- rQi += 4;
- }
-
- 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[rQi], rQ[rQi + 1], rQ[rQi + 2], rQ[rQi + 3]];
- rQi += 4;
- } 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) {
- this._FBU.bytes = 1; // compression-control byte
- if (this._sock.rQwait("TIGHT compression-control", this._FBU.bytes)) { return false; }
-
- var checksum = function (data) {
- var sum = 0;
- for (var i = 0; i < data.length; i++) {
- sum += data[i];
- if (sum > 65536) sum -= 65536;
- }
- return sum;
- };
-
- var resetStreams = 0;
- var streamId = -1;
- var decompress = function (data, expected) {
- for (var i = 0; i < 4; i++) {
- if ((resetStreams >> i) & 1) {
- this._FBU.zlibs[i].reset();
- Log.Info("Reset zlib stream " + i);
- }
- }
-
- //var uncompressed = this._FBU.zlibs[streamId].uncompress(data, 0);
- var uncompressed = this._FBU.zlibs[streamId].inflate(data, true, expected);
- /*if (uncompressed.status !== 0) {
- Log.Error("Invalid data in zlib stream");
- }*/
-
- //return uncompressed.data;
- return uncompressed;
- }.bind(this);
-
- var indexedToRGBX2Color = function (data, palette, width, height) {
- // Convert indexed (palette based) image data to RGB
- // TODO: reduce number of calculations inside loop
- var dest = this._destBuff;
- var w = Math.floor((width + 7) / 8);
- var w1 = Math.floor(width / 8);
-
- /*for (var y = 0; y < height; y++) {
- var b, x, dp, sp;
- var yoffset = y * width;
- var ybitoffset = y * w;
- var xoffset, targetbyte;
- for (x = 0; x < w1; x++) {
- xoffset = yoffset + x * 8;
- targetbyte = data[ybitoffset + x];
- for (b = 7; b >= 0; b--) {
- dp = (xoffset + 7 - b) * 3;
- sp = (targetbyte >> b & 1) * 3;
- dest[dp] = palette[sp];
- dest[dp + 1] = palette[sp + 1];
- dest[dp + 2] = palette[sp + 2];
- }
- }
-
- xoffset = yoffset + x * 8;
- targetbyte = data[ybitoffset + x];
- for (b = 7; b >= 8 - width % 8; b--) {
- dp = (xoffset + 7 - b) * 3;
- sp = (targetbyte >> b & 1) * 3;
- dest[dp] = palette[sp];
- dest[dp + 1] = palette[sp + 1];
- dest[dp + 2] = palette[sp + 2];
- }
- }*/
-
- for (var y = 0; y < height; y++) {
- var b, x, dp, sp;
- for (x = 0; x < w1; x++) {
- for (b = 7; b >= 0; b--) {
- dp = (y * width + x * 8 + 7 - b) * 4;
- sp = (data[y * w + x] >> b & 1) * 3;
- dest[dp] = palette[sp];
- dest[dp + 1] = palette[sp + 1];
- dest[dp + 2] = palette[sp + 2];
- dest[dp + 3] = 255;
- }
- }
-
- for (b = 7; b >= 8 - width % 8; b--) {
- dp = (y * width + x * 8 + 7 - b) * 4;
- sp = (data[y * w + x] >> b & 1) * 3;
- dest[dp] = palette[sp];
- dest[dp + 1] = palette[sp + 1];
- dest[dp + 2] = palette[sp + 2];
- dest[dp + 3] = 255;
- }
- }
-
- return dest;
- }.bind(this);
-
- var indexedToRGBX = function (data, palette, width, height) {
- // Convert indexed (palette based) image data to RGB
- var dest = this._destBuff;
- var total = width * height * 4;
- for (var i = 0, j = 0; i < total; i += 4, j++) {
- var sp = data[j] * 3;
- dest[i] = palette[sp];
- dest[i + 1] = palette[sp + 1];
- dest[i + 2] = palette[sp + 2];
- dest[i + 3] = 255;
- }
-
- return dest;
- }.bind(this);
-
- var rQi = this._sock.get_rQi();
- var rQ = this._sock.rQwhole();
- var cmode, data;
- var cl_header, cl_data;
-
- var handlePalette = function () {
- var numColors = rQ[rQi + 2] + 1;
- var paletteSize = numColors * 3;
- this._FBU.bytes += paletteSize;
- if (this._sock.rQwait("TIGHT palette " + cmode, this._FBU.bytes)) { return false; }
-
- var bpp = (numColors <= 2) ? 1 : 8;
- var rowSize = Math.floor((this._FBU.width * bpp + 7) / 8);
- var raw = false;
- if (rowSize * this._FBU.height < 12) {
- raw = true;
- cl_header = 0;
- cl_data = rowSize * this._FBU.height;
- //clength = [0, rowSize * this._FBU.height];
- } else {
- // begin inline getTightCLength (returning two-item arrays is bad for performance with GC)
- var cl_offset = rQi + 3 + paletteSize;
- cl_header = 1;
- cl_data = 0;
- cl_data += rQ[cl_offset] & 0x7f;
- if (rQ[cl_offset] & 0x80) {
- cl_header++;
- cl_data += (rQ[cl_offset + 1] & 0x7f) << 7;
- if (rQ[cl_offset + 1] & 0x80) {
- cl_header++;
- cl_data += rQ[cl_offset + 2] << 14;
- }
- }
- // end inline getTightCLength
- }
-
- this._FBU.bytes += cl_header + cl_data;
- 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.rQshiftTo(this._paletteBuff, paletteSize);
- this._sock.rQskipBytes(cl_header);
-
- if (raw) {
- data = this._sock.rQshiftBytes(cl_data);
- } else {
- data = decompress(this._sock.rQshiftBytes(cl_data), rowSize * this._FBU.height);
- }
-
- // Convert indexed (palette based) image data to RGB
- var rgbx;
- if (numColors == 2) {
- rgbx = indexedToRGBX2Color(data, this._paletteBuff, this._FBU.width, this._FBU.height);
- this._display.blitRgbxImage(this._FBU.x, this._FBU.y, this._FBU.width, this._FBU.height, rgbx, 0, false);
- } else {
- rgbx = indexedToRGBX(data, this._paletteBuff, this._FBU.width, this._FBU.height);
- this._display.blitRgbxImage(this._FBU.x, this._FBU.y, this._FBU.width, this._FBU.height, rgbx, 0, false);
- }
-
-
- return true;
- }.bind(this);
-
- var handleCopy = function () {
- var raw = false;
- var uncompressedSize = this._FBU.width * this._FBU.height * 3;
- if (uncompressedSize < 12) {
- raw = true;
- cl_header = 0;
- cl_data = uncompressedSize;
- } else {
- // begin inline getTightCLength (returning two-item arrays is for peformance with GC)
- var cl_offset = rQi + 1;
- cl_header = 1;
- cl_data = 0;
- cl_data += rQ[cl_offset] & 0x7f;
- if (rQ[cl_offset] & 0x80) {
- cl_header++;
- cl_data += (rQ[cl_offset + 1] & 0x7f) << 7;
- if (rQ[cl_offset + 1] & 0x80) {
- cl_header++;
- cl_data += rQ[cl_offset + 2] << 14;
- }
- }
- // end inline getTightCLength
- }
- this._FBU.bytes = 1 + cl_header + cl_data;
- if (this._sock.rQwait("TIGHT " + cmode, this._FBU.bytes)) { return false; }
-
- // Shift ctl, clength off
- this._sock.rQshiftBytes(1 + cl_header);
-
- if (raw) {
- data = this._sock.rQshiftBytes(cl_data);
- } else {
- data = decompress(this._sock.rQshiftBytes(cl_data), uncompressedSize);
- }
-
- this._display.blitRgbImage(this._FBU.x, this._FBU.y, this._FBU.width, this._FBU.height, data, 0, false);
-
- 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("Unexpected server message",
- "Illegal tight compression received, " +
- "ctl: " + ctl);
-
- if (isTightPNG && (cmode === "filter" || cmode === "copy")) {
- return this._fail("Unexpected server message",
- "filter/copy received in tightPNG mode");
- }
-
- switch (cmode) {
- // fill use depth because TPIXELs drop the padding byte
- case "fill": // TPIXEL
- this._FBU.bytes += 3;
- 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":
- // skip ctl byte
- this._display.fillRect(this._FBU.x, this._FBU.y, this._FBU.width, this._FBU.height, [rQ[rQi + 3], rQ[rQi + 2], rQ[rQi + 1]], false);
- this._sock.rQskipBytes(4);
- break;
- case "png":
- case "jpeg":
- // begin inline getTightCLength (returning two-item arrays is for peformance with GC)
- var cl_offset = rQi + 1;
- cl_header = 1;
- cl_data = 0;
- cl_data += rQ[cl_offset] & 0x7f;
- if (rQ[cl_offset] & 0x80) {
- cl_header++;
- cl_data += (rQ[cl_offset + 1] & 0x7f) << 7;
- if (rQ[cl_offset + 1] & 0x80) {
- cl_header++;
- cl_data += rQ[cl_offset + 2] << 14;
- }
- }
- // end inline getTightCLength
- this._FBU.bytes = 1 + cl_header + cl_data; // 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 + cl_header); // shift off clt + compact length
- data = this._sock.rQshiftBytes(cl_data);
- this._display.imageRect(this._FBU.x, this._FBU.y, "image/" + cmode, data);
- 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
- this._fail("Unexpected server message",
- "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;
- },
-
- handle_FB_resize: function () {
- this._fb_width = this._FBU.width;
- this._fb_height = this._FBU.height;
- this._destBuff = new Uint8Array(this._fb_width * this._fb_height * 4);
- this._display.resize(this._fb_width, this._fb_height);
- this._onFBResize(this, this._fb_width, this._fb_height);
- this._timing.fbu_rt_start = (new Date()).getTime();
- this._updateContinuousUpdates();
-
- this._FBU.bytes = 0;
- this._FBU.rects -= 1;
- return true;
- },
-
- ExtendedDesktopSize: function () {
- this._FBU.bytes = 1;
- if (this._sock.rQwait("ExtendedDesktopSize", this._FBU.bytes)) { return false; }
-
- this._supportsSetDesktopSize = true;
- var number_of_screens = this._sock.rQpeek8();
-
- this._FBU.bytes = 4 + (number_of_screens * 16);
- if (this._sock.rQwait("ExtendedDesktopSize", this._FBU.bytes)) { return false; }
-
- this._sock.rQskipBytes(1); // number-of-screens
- this._sock.rQskipBytes(3); // padding
-
- for (var i = 0; i < number_of_screens; i += 1) {
- // Save the id and flags of the first screen
- if (i === 0) {
- this._screen_id = this._sock.rQshiftBytes(4); // id
- this._sock.rQskipBytes(2); // x-position
- this._sock.rQskipBytes(2); // y-position
- this._sock.rQskipBytes(2); // width
- this._sock.rQskipBytes(2); // height
- this._screen_flags = this._sock.rQshiftBytes(4); // flags
- } else {
- this._sock.rQskipBytes(16);
- }
- }
-
- /*
- * The x-position indicates the reason for the change:
- *
- * 0 - server resized on its own
- * 1 - this client requested the resize
- * 2 - another client requested the resize
- */
-
- // We need to handle errors when we requested the resize.
- if (this._FBU.x === 1 && this._FBU.y !== 0) {
- var msg = "";
- // The y-position indicates the status code from the server
- switch (this._FBU.y) {
- case 1:
- msg = "Resize is administratively prohibited";
- break;
- case 2:
- msg = "Out of resources";
- break;
- case 3:
- msg = "Invalid screen layout";
- break;
- default:
- msg = "Unknown reason";
- break;
- }
- this._notification("Server did not accept the resize request: "
- + msg, 'normal');
- return true;
- }
-
- this._encHandlers.handle_FB_resize();
- return true;
- },
-
- DesktopSize: function () {
- this._encHandlers.handle_FB_resize();
- return true;
- },
-
- Cursor: function () {
- Log.Debug(">> set_cursor");
- var x = this._FBU.x; // hotspot-x
- var y = this._FBU.y; // hotspot-y
- var w = this._FBU.width;
- var h = this._FBU.height;
-
- var pixelslength = w * h * 4;
- 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--;
-
- Log.Debug("<< set_cursor");
- return true;
- },
-
- QEMUExtendedKeyEvent: function () {
- this._FBU.rects--;
-
- // Old Safari doesn't support creating keyboard events
- try {
- var keyboardEvent = document.createEvent("keyboardEvent");
- if (keyboardEvent.code !== undefined) {
- this._qemuExtKeyEventSupported = true;
- }
- } catch (err) {
- }
- },
-
- JPEG_quality_lo: function () {
- Log.Error("Server sent jpeg_quality pseudo-encoding");
- },
-
- compress_lo: function () {
- Log.Error("Server sent compress level pseudo-encoding");
- }
-};
diff --git a/core/util/browsers.js b/core/util/browsers.js
deleted file mode 100644
index 77fca12f..00000000
--- a/core/util/browsers.js
+++ /dev/null
@@ -1,53 +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.
- */
-
-import * as Log from './logging.js';
-
-// Touch detection
-export var isTouchDevice = ('ontouchstart' in document.documentElement) ||
- // requried for Chrome debugger
- (document.ontouchstart !== undefined) ||
- // required for MS Surface
- (navigator.maxTouchPoints > 0) ||
- (navigator.msMaxTouchPoints > 0);
-window.addEventListener('touchstart', function onFirstTouch() {
- isTouchDevice = true;
- window.removeEventListener('touchstart', onFirstTouch, false);
-}, false);
-
-var _cursor_uris_supported = null;
-
-export function browserSupportsCursorURIs () {
- if (_cursor_uris_supported === null) {
- try {
- var target = document.createElement('canvas');
- target.style.cursor = 'url("data:image/x-icon;base64,AAACAAEACAgAAAIAAgA4AQAAFgAAACgAAAAIAAAAEAAAAAEAIAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAA==") 2 2, default';
-
- if (target.style.cursor) {
- Log.Info("Data URI scheme cursor supported");
- _cursor_uris_supported = true;
- } else {
- Log.Warn("Data URI scheme cursor not supported");
- _cursor_uris_supported = false;
- }
- } catch (exc) {
- Log.Error("Data URI scheme cursor test exception: " + exc);
- _cursor_uris_supported = false;
- }
- }
-
- return _cursor_uris_supported;
-};
-
-export function _forceCursorURIs(enabled) {
- if (enabled === undefined || enabled) {
- _cursor_uris_supported = true;
- } else {
- _cursor_uris_supported = false;
- }
-}
diff --git a/core/util/events.js b/core/util/events.js
deleted file mode 100644
index c1afb48a..00000000
--- a/core/util/events.js
+++ /dev/null
@@ -1,140 +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.
- */
-
-/*
- * Cross-browser event and position routines
- */
-
-import * as Log from './logging.js';
-
-export function getPointerEvent (e) {
- return e.changedTouches ? e.changedTouches[0] : e.touches ? e.touches[0] : e;
-};
-
-export function stopEvent (e) {
- e.stopPropagation();
- e.preventDefault();
-};
-
-// Emulate Element.setCapture() when not supported
-var _captureRecursion = false;
-var _captureElem = null;
-function _captureProxy(e) {
- // Recursion protection as we'll see our own event
- if (_captureRecursion) return;
-
- // Clone the event as we cannot dispatch an already dispatched event
- var newEv = new e.constructor(e.type, e);
-
- _captureRecursion = true;
- _captureElem.dispatchEvent(newEv);
- _captureRecursion = false;
-
- // Avoid double events
- e.stopPropagation();
-
- // Respect the wishes of the redirected event handlers
- if (newEv.defaultPrevented) {
- e.preventDefault();
- }
-
- // Implicitly release the capture on button release
- if (e.type === "mouseup") {
- releaseCapture();
- }
-};
-
-// Follow cursor style of target element
-function _captureElemChanged() {
- var captureElem = document.getElementById("noVNC_mouse_capture_elem");
- captureElem.style.cursor = window.getComputedStyle(_captureElem).cursor;
-};
-var _captureObserver = new MutationObserver(_captureElemChanged);
-
-var _captureIndex = 0;
-
-export function setCapture (elem) {
- if (elem.setCapture) {
-
- elem.setCapture();
-
- // IE releases capture on 'click' events which might not trigger
- elem.addEventListener('mouseup', releaseCapture);
-
- } else {
- // Release any existing capture in case this method is
- // called multiple times without coordination
- releaseCapture();
-
- var captureElem = document.getElementById("noVNC_mouse_capture_elem");
-
- if (captureElem === null) {
- captureElem = document.createElement("div");
- captureElem.id = "noVNC_mouse_capture_elem";
- captureElem.style.position = "fixed";
- captureElem.style.top = "0px";
- captureElem.style.left = "0px";
- captureElem.style.width = "100%";
- captureElem.style.height = "100%";
- captureElem.style.zIndex = 10000;
- captureElem.style.display = "none";
- document.body.appendChild(captureElem);
-
- // This is to make sure callers don't get confused by having
- // our blocking element as the target
- captureElem.addEventListener('contextmenu', _captureProxy);
-
- captureElem.addEventListener('mousemove', _captureProxy);
- captureElem.addEventListener('mouseup', _captureProxy);
- }
-
- _captureElem = elem;
- _captureIndex++;
-
- // Track cursor and get initial cursor
- _captureObserver.observe(elem, {attributes:true});
- _captureElemChanged();
-
- captureElem.style.display = "";
-
- // We listen to events on window in order to keep tracking if it
- // happens to leave the viewport
- window.addEventListener('mousemove', _captureProxy);
- window.addEventListener('mouseup', _captureProxy);
- }
-};
-
-export function releaseCapture () {
- if (document.releaseCapture) {
-
- document.releaseCapture();
-
- } else {
- if (!_captureElem) {
- return;
- }
-
- // There might be events already queued, so we need to wait for
- // them to flush. E.g. contextmenu in Microsoft Edge
- window.setTimeout(function(expected) {
- // Only clear it if it's the expected grab (i.e. no one
- // else has initiated a new grab)
- if (_captureIndex === expected) {
- _captureElem = null;
- }
- }, 0, _captureIndex);
-
- _captureObserver.disconnect();
-
- var captureElem = document.getElementById("noVNC_mouse_capture_elem");
- captureElem.style.display = "none";
-
- window.removeEventListener('mousemove', _captureProxy);
- window.removeEventListener('mouseup', _captureProxy);
- }
-};
diff --git a/core/util/localization.js b/core/util/localization.js
deleted file mode 100644
index fcebf06f..00000000
--- a/core/util/localization.js
+++ /dev/null
@@ -1,170 +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.
- */
-
-/*
- * Localization Utilities
- */
-
-export function Localizer() {
- // Currently configured language
- this.language = 'en';
-
- // Current dictionary of translations
- this.dictionary = undefined;
-}
-
-Localizer.prototype = {
- // Configure suitable language based on user preferences
- setup: function (supportedLanguages) {
- var userLanguages;
-
- this.language = 'en'; // Default: US English
-
- /*
- * Navigator.languages only available in Chrome (32+) and FireFox (32+)
- * Fall back to navigator.language for other browsers
- */
- if (typeof window.navigator.languages == 'object') {
- userLanguages = window.navigator.languages;
- } else {
- userLanguages = [navigator.language || navigator.userLanguage];
- }
-
- for (var i = 0;i < userLanguages.length;i++) {
- var userLang = userLanguages[i];
- userLang = userLang.toLowerCase();
- userLang = userLang.replace("_", "-");
- userLang = userLang.split("-");
-
- // Built-in default?
- if ((userLang[0] === 'en') &&
- ((userLang[1] === undefined) || (userLang[1] === 'us'))) {
- return;
- }
-
- // First pass: perfect match
- for (var j = 0;j < supportedLanguages.length;j++) {
- var supLang = supportedLanguages[j];
- supLang = supLang.toLowerCase();
- supLang = supLang.replace("_", "-");
- supLang = supLang.split("-");
-
- if (userLang[0] !== supLang[0])
- continue;
- if (userLang[1] !== supLang[1])
- continue;
-
- this.language = supportedLanguages[j];
- return;
- }
-
- // Second pass: fallback
- for (var j = 0;j < supportedLanguages.length;j++) {
- supLang = supportedLanguages[j];
- supLang = supLang.toLowerCase();
- supLang = supLang.replace("_", "-");
- supLang = supLang.split("-");
-
- if (userLang[0] !== supLang[0])
- continue;
- if (supLang[1] !== undefined)
- continue;
-
- this.language = supportedLanguages[j];
- return;
- }
- }
- },
-
- // Retrieve localised text
- get: function (id) {
- if (typeof this.dictionary !== 'undefined' && this.dictionary[id]) {
- return this.dictionary[id];
- } else {
- return id;
- }
- },
-
- // Traverses the DOM and translates relevant fields
- // See https://html.spec.whatwg.org/multipage/dom.html#attr-translate
- translateDOM: function () {
- var self = this;
- function process(elem, enabled) {
- function isAnyOf(searchElement, items) {
- return items.indexOf(searchElement) !== -1;
- }
-
- function translateAttribute(elem, attr) {
- var str = elem.getAttribute(attr);
- str = self.get(str);
- elem.setAttribute(attr, str);
- }
-
- function translateTextNode(node) {
- var str = node.data.trim();
- str = self.get(str);
- node.data = str;
- }
-
- if (elem.hasAttribute("translate")) {
- if (isAnyOf(elem.getAttribute("translate"), ["", "yes"])) {
- enabled = true;
- } else if (isAnyOf(elem.getAttribute("translate"), ["no"])) {
- enabled = false;
- }
- }
-
- if (enabled) {
- if (elem.hasAttribute("abbr") &&
- elem.tagName === "TH") {
- translateAttribute(elem, "abbr");
- }
- if (elem.hasAttribute("alt") &&
- isAnyOf(elem.tagName, ["AREA", "IMG", "INPUT"])) {
- translateAttribute(elem, "alt");
- }
- if (elem.hasAttribute("download") &&
- isAnyOf(elem.tagName, ["A", "AREA"])) {
- translateAttribute(elem, "download");
- }
- if (elem.hasAttribute("label") &&
- isAnyOf(elem.tagName, ["MENUITEM", "MENU", "OPTGROUP",
- "OPTION", "TRACK"])) {
- translateAttribute(elem, "label");
- }
- // FIXME: Should update "lang"
- if (elem.hasAttribute("placeholder") &&
- isAnyOf(elem.tagName, ["INPUT", "TEXTAREA"])) {
- translateAttribute(elem, "placeholder");
- }
- if (elem.hasAttribute("title")) {
- translateAttribute(elem, "title");
- }
- if (elem.hasAttribute("value") &&
- elem.tagName === "INPUT" &&
- isAnyOf(elem.getAttribute("type"), ["reset", "button"])) {
- translateAttribute(elem, "value");
- }
- }
-
- for (var i = 0;i < elem.childNodes.length;i++) {
- var node = elem.childNodes[i];
- if (node.nodeType === node.ELEMENT_NODE) {
- process(node, enabled);
- } else if (node.nodeType === node.TEXT_NODE && enabled) {
- translateTextNode(node);
- }
- }
- }
-
- process(document.body, true);
- },
-}
-
-export var l10n = new Localizer();
-export default l10n.get.bind(l10n);
diff --git a/core/util/logging.js b/core/util/logging.js
deleted file mode 100644
index 342bfa7c..00000000
--- a/core/util/logging.js
+++ /dev/null
@@ -1,53 +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.
- */
-
-/*
- * Logging/debug routines
- */
-
-var _log_level = 'warn';
-
-var Debug = function (msg) {};
-var Info = function (msg) {};
-var Warn = function (msg) {};
-var Error = function (msg) {};
-
-export function init_logging (level) {
- if (typeof level === 'undefined') {
- level = _log_level;
- } else {
- _log_level = level;
- }
-
- Debug = Info = Warn = Error = function (msg) {};
- if (typeof window.console !== "undefined") {
- /* jshint -W086 */
- switch (level) {
- case 'debug':
- Debug = console.debug.bind(window.console);
- case 'info':
- Info = console.info.bind(window.console);
- case 'warn':
- Warn = console.warn.bind(window.console);
- case 'error':
- Error = console.error.bind(window.console);
- case 'none':
- break;
- default:
- throw new Error("invalid logging type '" + level + "'");
- }
- /* jshint +W086 */
- }
-};
-export function get_logging () {
- return _log_level;
-};
-export { Debug, Info, Warn, Error };
-
-// Initialize logging level
-init_logging();
diff --git a/core/util/properties.js b/core/util/properties.js
deleted file mode 100644
index e1d607e0..00000000
--- a/core/util/properties.js
+++ /dev/null
@@ -1,138 +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.
- */
-
-/*
- * Getter/Setter Creation Utilities
- */
-
-import * as Log from './logging.js';
-
-function make_property (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
- };
-};
-
-export function make_properties (constructor, arr) {
- "use strict";
- for (var i = 0; i < arr.length; i++) {
- make_property(constructor.prototype, arr[i][0], arr[i][1], arr[i][2]);
- }
-};
-
-export function set_defaults (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) {
- Log.Warn('Invalid property ' + keys[i]);
- continue;
- }
-
- if (keys[i] in conf) {
- setter.call(obj, conf[keys[i]]);
- } else {
- setter.call(obj, defaults[keys[i]]);
- }
- }
-};
-
diff --git a/core/util/strings.js b/core/util/strings.js
deleted file mode 100644
index 00a6156c..00000000
--- a/core/util/strings.js
+++ /dev/null
@@ -1,15 +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.
- */
-
-/*
- * Decode from UTF-8
- */
-export function decodeUTF8 (utf8string) {
- "use strict";
- return decodeURIComponent(escape(utf8string));
-};
diff --git a/core/websock.js b/core/websock.js
deleted file mode 100644
index 78809a1a..00000000
--- a/core/websock.js
+++ /dev/null
@@ -1,351 +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 with extra
- * buffer handling.
- *
- * 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.
- */
-
-import * as Log from './util/logging.js';
-
-/*jslint browser: true, bitwise: true */
-/*global Util*/
-
-export default function Websock() {
- "use strict";
-
- this._websocket = null; // WebSocket object
-
- this._rQi = 0; // Receive queue index
- this._rQlen = 0; // Next write position in the receive queue
- this._rQbufferSize = 1024 * 1024 * 4; // Receive queue buffer size (4 MiB)
- this._rQmax = this._rQbufferSize / 8;
- // called in init: this._rQ = new Uint8Array(this._rQbufferSize);
- this._rQ = null; // Receive queue
-
- this._sQbufferSize = 1024 * 10; // 10 KiB
- // called in init: this._sQ = new Uint8Array(this._sQbufferSize);
- this._sQlen = 0;
- this._sQ = null; // Send queue
-
- this._eventHandlers = {
- 'message': function () {},
- 'open': function () {},
- 'close': function () {},
- 'error': function () {}
- };
-};
-
-// this has performance issues in some versions Chromium, and
-// doesn't gain a tremendous amount of performance increase in Firefox
-// at the moment. It may be valuable to turn it on in the future.
-var ENABLE_COPYWITHIN = false;
-
-var MAX_RQ_GROW_SIZE = 40 * 1024 * 1024; // 40 MiB
-
-var typedArrayToString = (function () {
- // This is only for PhantomJS, which doesn't like apply-ing
- // with Typed Arrays
- try {
- var arr = new Uint8Array([1, 2, 3]);
- String.fromCharCode.apply(null, arr);
- return function (a) { return String.fromCharCode.apply(null, a); };
- } catch (ex) {
- return function (a) {
- return String.fromCharCode.apply(
- null, Array.prototype.slice.call(a));
- };
- }
-})();
-
-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._rQlen - 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;
- },
-
- // TODO(directxman12): test performance with these vs a DataView
- 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 = new Uint8Array(this._rQ.buffer, this._rQi, len);
- this._rQi += len;
- return typedArrayToString(arr);
- },
-
- rQshiftBytes: function (len) {
- if (typeof(len) === 'undefined') { len = this.rQlen(); }
- this._rQi += len;
- return new Uint8Array(this._rQ.buffer, this._rQi - len, len);
- },
-
- rQshiftTo: function (target, len) {
- if (len === undefined) { len = this.rQlen(); }
- // TODO: make this just use set with views when using a ArrayBuffer to store the rQ
- target.set(new Uint8Array(this._rQ.buffer, this._rQi, len));
- this._rQi += len;
- },
-
- rQwhole: function () {
- return new Uint8Array(this._rQ.buffer, 0, this._rQlen);
- },
-
- rQslice: function (start, end) {
- if (end) {
- return new Uint8Array(this._rQ.buffer, this._rQi + start, end - start);
- } else {
- return new Uint8Array(this._rQ.buffer, this._rQi + start, this._rQlen - 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._rQlen - 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) {
- Log.Debug("bufferedAmount: " + this._websocket.bufferedAmount);
- }
-
- if (this._sQlen > 0 && this._websocket.readyState === WebSocket.OPEN) {
- this._websocket.send(this._encode_message());
- this._sQlen = 0;
- }
- },
-
- send: function (arr) {
- this._sQ.set(arr, this._sQlen);
- this._sQlen += arr.length;
- this.flush();
- },
-
- send_string: function (str) {
- this.send(str.split('').map(function (chr) {
- return chr.charCodeAt(0);
- }));
- },
-
- // Event Handlers
- off: function (evt) {
- this._eventHandlers[evt] = function () {};
- },
-
- on: function (evt, handler) {
- this._eventHandlers[evt] = handler;
- },
-
- _allocate_buffers: function () {
- this._rQ = new Uint8Array(this._rQbufferSize);
- this._sQ = new Uint8Array(this._sQbufferSize);
- },
-
- init: function () {
- this._allocate_buffers();
- this._rQi = 0;
- this._websocket = null;
- },
-
- open: function (uri, protocols) {
- var ws_schema = uri.match(/^([a-z]+):\/\//)[1];
- this.init();
-
- this._websocket = new WebSocket(uri, protocols);
- this._websocket.binaryType = 'arraybuffer';
-
- this._websocket.onmessage = this._recv_message.bind(this);
- this._websocket.onopen = (function () {
- Log.Debug('>> WebSock.onopen');
- if (this._websocket.protocol) {
- Log.Info("Server choose sub-protocol: " + this._websocket.protocol);
- }
-
- this._eventHandlers.open();
- Log.Debug("<< WebSock.onopen");
- }).bind(this);
- this._websocket.onclose = (function (e) {
- Log.Debug(">> WebSock.onclose");
- this._eventHandlers.close(e);
- Log.Debug("<< WebSock.onclose");
- }).bind(this);
- this._websocket.onerror = (function (e) {
- Log.Debug(">> WebSock.onerror: " + e);
- this._eventHandlers.error(e);
- Log.Debug("<< WebSock.onerror: " + e);
- }).bind(this);
- },
-
- close: function () {
- if (this._websocket) {
- if ((this._websocket.readyState === WebSocket.OPEN) ||
- (this._websocket.readyState === WebSocket.CONNECTING)) {
- Log.Info("Closing WebSocket connection");
- this._websocket.close();
- }
-
- this._websocket.onmessage = function (e) { return; };
- }
- },
-
- // private methods
- _encode_message: function () {
- // Put in a binary arraybuffer
- // according to the spec, you can send ArrayBufferViews with the send method
- return new Uint8Array(this._sQ.buffer, 0, this._sQlen);
- },
-
- _expand_compact_rQ: function (min_fit) {
- var resizeNeeded = min_fit || this._rQlen - this._rQi > this._rQbufferSize / 2;
- if (resizeNeeded) {
- if (!min_fit) {
- // just double the size if we need to do compaction
- this._rQbufferSize *= 2;
- } else {
- // otherwise, make sure we satisy rQlen - rQi + min_fit < rQbufferSize / 8
- this._rQbufferSize = (this._rQlen - this._rQi + min_fit) * 8;
- }
- }
-
- // we don't want to grow unboundedly
- if (this._rQbufferSize > MAX_RQ_GROW_SIZE) {
- this._rQbufferSize = MAX_RQ_GROW_SIZE;
- if (this._rQbufferSize - this._rQlen - this._rQi < min_fit) {
- throw new Exception("Receive Queue buffer exceeded " + MAX_RQ_GROW_SIZE + " bytes, and the new message could not fit");
- }
- }
-
- if (resizeNeeded) {
- var old_rQbuffer = this._rQ.buffer;
- this._rQmax = this._rQbufferSize / 8;
- this._rQ = new Uint8Array(this._rQbufferSize);
- this._rQ.set(new Uint8Array(old_rQbuffer, this._rQi));
- } else {
- if (ENABLE_COPYWITHIN) {
- this._rQ.copyWithin(0, this._rQi);
- } else {
- this._rQ.set(new Uint8Array(this._rQ.buffer, this._rQi));
- }
- }
-
- this._rQlen = this._rQlen - this._rQi;
- this._rQi = 0;
- },
-
- _decode_message: function (data) {
- // push arraybuffer values onto the end
- var u8 = new Uint8Array(data);
- if (u8.length > this._rQbufferSize - this._rQlen) {
- this._expand_compact_rQ(u8.length);
- }
- this._rQ.set(u8, this._rQlen);
- this._rQlen += u8.length;
- },
-
- _recv_message: function (e) {
- try {
- this._decode_message(e.data);
- if (this.rQlen() > 0) {
- this._eventHandlers.message();
- // Compact the receive queue
- if (this._rQlen == this._rQi) {
- this._rQlen = 0;
- this._rQi = 0;
- } else if (this._rQlen > this._rQmax) {
- this._expand_compact_rQ();
- }
- } else {
- Log.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) {
- Log.Error("recv_message, caught exception: " + exception_str);
- } else {
- Log.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/debian/changelog b/debian/changelog
new file mode 100644
index 00000000..4d307424
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,35 @@
+novnc (0.4) maverick; urgency=low
+
+ * Clarify permissive licenses of HTML, CSS, images.
+ * Use render queue and requestAnimationFrame
+ * UltraVNC repeater support
+
+ -- Joel Martin Fri, 14 Sep 2012 05:00:00 -0600
+
+novnc (0.3) maverick; urgency=low
+
+ * add tight encoding support
+ * release pressed key when focus lost (fixes locked Alt key)
+ * Support Apple Remote Desktop
+ * Add nova/openstack proxy wrapper
+ * Better connection close handling/reporting
+
+ -- Joel Martin Fri, 11 May 2012 03:00:00 -0600
+
+novnc (0.2) maverick; urgency=low
+
+ * Mobile device support with viewport clipping
+ * Much better styling that also works on mobile devices well
+ * Update websockify to support latest WebSocket protocol HyBi 13
+ (i.e. support IETF 6455)
+ * Better support in websockify for python 2.4 through 3.2
+ * Support VMWare ESX and Intel AMT KVM
+ * View only mode
+
+ -- Joel Martin Tue, 05 Jul 2011 01:00:00 -0600
+
+novnc (0.1) maverick; urgency=low
+
+ * First upstream release
+
+ -- Joel Martin Tue, 05 Jul 2011 01:00:00 -0600
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 00000000..7f8f011e
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 00000000..f7b92d54
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,13 @@
+Source: novnc
+Section: web
+Priority: optional
+Maintainer: Joel Martin
+Build-Depends: debhelper (>= 7.0.0~)
+Standards-Version: 3.8.3
+Homepage: https://github.com/kanaka/noVNC/
+
+Package: novnc
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.4)
+Description: HTML5 VNC client
+ VNC client using HTML5 (WebSockets, Canvas) with encryption (wss://) support.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 00000000..db00fa1f
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,37 @@
+Upstream Project: https://github.com/kanaka/noVNC/
+
+--------------------- Original LICENSE.txt ---------------------------
+
+noVNC is Copyright (C) 2012 Joel Martin
+
+Some portions of noVNC are copyright to their individual authors.
+Please refer to the individual source files and/or to the noVNC commit
+history: https://github.com/kanaka/noVNC/commits/master
+
+noVNC is licensed under the MPL 2.0 (Mozilla Public License) with the
+following exceptions:
+
+ *.html, *.css : 2-Clause BSD license
+
+ include/Orbitron* : SIL Open Font License 1.1
+ (Copyright 2009 Matt McInerney)
+
+ images/ : Creative Commons Attribution-ShareAlike
+ http://creativecommons.org/licenses/by-sa/3.0/
+
+ include/base64.js : MPL 2.0
+
+ include/des.js : Various BSD style licenses
+
+ include/jsunzip.js : zlib/libpng license
+
+ include/web-socket-js/ : New BSD license (3-clause). Source code at
+ http://github.com/gimite/web-socket-js
+
+ include/chrome-app/tcp-stream.js
+ : Apache 2.0 license
+
+----------------------------------------------------------------------
+
+The MPL-2.0 license text may be found here:
+ http://www.mozilla.org/MPL/2.0/
diff --git a/debian/novnc.install b/debian/novnc.install
new file mode 100644
index 00000000..ac51e3c6
--- /dev/null
+++ b/debian/novnc.install
@@ -0,0 +1,30 @@
+vnc.html /usr/share/novnc
+vnc_auto.html /usr/share/novnc
+README.md /usr/share/doc/novnc
+LICENSE.txt /usr/share/doc/novnc
+utils/Makefile /usr/share/novnc/utils
+utils/launch.sh /usr/share/novnc/utils
+utils/websocket.py /usr/share/novnc/utils
+utils/websockify /usr/share/novnc/utils
+utils/rebind.c /usr/share/novnc/utils
+utils/rebind.so /usr/share/novnc/utils
+images /usr/share/novnc
+images/favicon.ico /usr/share/novnc
+include/base64.js /usr/share/novnc/include
+include/des.js /usr/share/novnc/include
+include/display.js /usr/share/novnc/include
+include/keysymdef.js /usr/share/novnc/include
+include/keyboard.js /usr/share/novnc/include
+include/input.js /usr/share/novnc/include
+include/logo.js /usr/share/novnc/include
+include/base.css /usr/share/novnc/include
+include/blue.css /usr/share/novnc/include
+include/black.css /usr/share/novnc/include
+include/playback.js /usr/share/novnc/include
+include/rfb.js /usr/share/novnc/include
+include/ui.js /usr/share/novnc/include
+include/util.js /usr/share/novnc/include
+include/websock.js /usr/share/novnc/include
+include/webutil.js /usr/share/novnc/include
+include/jsunzip.js /usr/share/novnc/include
+include/web-socket-js/* /usr/share/novnc/include/web-socket-js
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 00000000..25b08123
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+clean:
+ make -C utils clean
+ dh clean
+
+build:
+ make -C utils rebind.so
+
+%:
+ dh ${@}
diff --git a/docs/LICENSE.pako b/docs/LICENSE.pako
deleted file mode 100644
index e6c9e5a5..00000000
--- a/docs/LICENSE.pako
+++ /dev/null
@@ -1,21 +0,0 @@
-(The MIT License)
-
-Copyright (C) 2014 by Vitaly Puzrin
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/docs/VERSION b/docs/VERSION
index ee6cdce3..bd73f470 100644
--- a/docs/VERSION
+++ b/docs/VERSION
@@ -1 +1 @@
-0.6.1
+0.4
diff --git a/docs/notes b/docs/notes
index dfef0bd6..9bcc6af3 100644
--- a/docs/notes
+++ b/docs/notes
@@ -1,5 +1,17 @@
-Rebuilding inflator.js
+Some implementation notes:
-- Download pako from npm
-- Install browserify using npm
-- browserify core/inflator.mod.js -o core/inflator.js -s Inflator
+There is an included flash object (web-socket-js) that is used to
+emulate websocket support on browsers without websocket support
+(currently only Chrome has WebSocket support).
+
+Javascript doesn't have a bytearray type, so what you get out of
+a WebSocket object is just Javascript strings. Javascript has UTF-16
+unicode strings and anything sent through the WebSocket gets converted
+to UTF-8 and vice-versa. So, one additional (and necessary) function
+of websockify is base64 encoding/decoding what is sent to/from the
+browser.
+
+Building web-socket-js emulator:
+
+cd include/web-socket-js/flash-src
+mxmlc -static-link-runtime-shared-libraries WebSocketMain.as
diff --git a/docs/packaging.txt b/docs/packaging.txt
new file mode 100644
index 00000000..95524549
--- /dev/null
+++ b/docs/packaging.txt
@@ -0,0 +1,23 @@
+noVNC packaging steps for Debian/Ubuntu:
+
+- Update the noVNC version in docs/VERSION and add a new entry for the
+ version in debian/changelog
+
+- Rename the novnc source directory to match the form "novnc-VERSION".
+
+- In the novnc source directory, run the packaging command:
+
+ debuild -I -uc -us
+
+ - The -I option ignores the .git directory when generating the
+ source tarball.
+ - the -uc and -us may be omitted in order to create a signed
+ package.
+
+ - Alternatively, use pbuilder instead of debuild in order to build
+ for other distributions and to guarantee a sanitized package.
+
+- Verify the package and then commit the changes to docs/VERSION and
+ debian/changelog.
+
+- Upload the new package file(s).
diff --git a/docs/release.txt b/docs/release.txt
index 3e036354..596482cf 100644
--- a/docs/release.txt
+++ b/docs/release.txt
@@ -1,34 +1,9 @@
-- Decide a new version number X.Y.Z (follow SemVer)
-- Update version in package.json
-- Update version in docs/VERSION
-- Commit the change with a commit like "Release X.Y.Z"
-- Add a new release on GitHub called "vX.Y.Z", and populate it with
- release notes of the following form (where A.B.C is the last release):
-
-Major Changes Since A.B.C
-=========================
-
-*Insert warnings here about incompatibilities*
-
-*Thanks to all the contributors who filed bugs, added features, and fixed bugs
-during this release :tada:*
-
-App-visible Changes
--------------------
-
-- *feature* a feature which improves the app usage (#PRNUM)
-- *bugfix* a bug fix which fixes the app usage (#PRNUM)
-- *refactor* a refactor which changes the app usage (#PRNUM)
-
-Library-visible Changes
------------------------
-
-- *feature* a feature which improves the noVNC APIs (#PRNUM)
-- *bugfix* a bug fix which fixes the noVNC APIs (#PRNUM)
-- *refactor* a refactor which changes the noVNC APIs (#PRNUM)
-
-App-internals Changes
----------------------
-
-- *bugfix* a bug fix with affects the internals of noVNC only (#PRNUM)
-- *refactor* a refactor which affects the internals of noVNC only (#PRNUM)
+- Update and commit docs/VERSION and debian/changelog
+- Create version tag and tarball from tag
+ WVER=0.3
+ git tag v${WVER}
+ git push origin master
+ git push origin v${WVER}
+ git archive --format=tar --prefix=novnc-${WVER}/ v${WVER} > novnc-${WVER}.tar
+ gzip novnc-${WVER}.tar
+- Upload tarball to repo
diff --git a/favicon.ico b/favicon.ico
new file mode 120000
index 00000000..45399c8c
--- /dev/null
+++ b/favicon.ico
@@ -0,0 +1 @@
+images/favicon.ico
\ No newline at end of file
diff --git a/images/alt.png b/images/alt.png
new file mode 100644
index 00000000..d42af7b4
Binary files /dev/null and b/images/alt.png differ
diff --git a/images/clipboard.png b/images/clipboard.png
new file mode 100644
index 00000000..24df33c1
Binary files /dev/null and b/images/clipboard.png differ
diff --git a/images/connect.png b/images/connect.png
new file mode 100644
index 00000000..79e71adb
Binary files /dev/null and b/images/connect.png differ
diff --git a/images/ctrl.png b/images/ctrl.png
new file mode 100644
index 00000000..a63b601f
Binary files /dev/null and b/images/ctrl.png differ
diff --git a/images/ctrlaltdel.png b/images/ctrlaltdel.png
new file mode 100644
index 00000000..31922e53
Binary files /dev/null and b/images/ctrlaltdel.png differ
diff --git a/images/disconnect.png b/images/disconnect.png
new file mode 100644
index 00000000..8832f5ea
Binary files /dev/null and b/images/disconnect.png differ
diff --git a/images/drag.png b/images/drag.png
new file mode 100644
index 00000000..433f896d
Binary files /dev/null and b/images/drag.png differ
diff --git a/images/esc.png b/images/esc.png
new file mode 100644
index 00000000..ece5f7cb
Binary files /dev/null and b/images/esc.png differ
diff --git a/images/favicon.ico b/images/favicon.ico
new file mode 100644
index 00000000..c999634f
Binary files /dev/null and b/images/favicon.ico differ
diff --git a/images/favicon.png b/images/favicon.png
new file mode 100644
index 00000000..e2bdb194
Binary files /dev/null and b/images/favicon.png differ
diff --git a/images/keyboard.png b/images/keyboard.png
new file mode 100644
index 00000000..f7979525
Binary files /dev/null and b/images/keyboard.png differ
diff --git a/images/mouse_left.png b/images/mouse_left.png
new file mode 100644
index 00000000..1de7a486
Binary files /dev/null and b/images/mouse_left.png differ
diff --git a/images/mouse_middle.png b/images/mouse_middle.png
new file mode 100644
index 00000000..81fbd9bd
Binary files /dev/null and b/images/mouse_middle.png differ
diff --git a/images/mouse_none.png b/images/mouse_none.png
new file mode 100644
index 00000000..93dbf578
Binary files /dev/null and b/images/mouse_none.png differ
diff --git a/images/mouse_right.png b/images/mouse_right.png
new file mode 100644
index 00000000..355b25dc
Binary files /dev/null and b/images/mouse_right.png differ
diff --git a/images/power.png b/images/power.png
new file mode 100644
index 00000000..f68fd081
Binary files /dev/null and b/images/power.png differ
diff --git a/images/screen_320x460.png b/images/screen_320x460.png
new file mode 100644
index 00000000..172ec555
Binary files /dev/null and b/images/screen_320x460.png differ
diff --git a/images/screen_57x57.png b/images/screen_57x57.png
new file mode 100644
index 00000000..e2085f29
Binary files /dev/null and b/images/screen_57x57.png differ
diff --git a/images/screen_700x700.png b/images/screen_700x700.png
new file mode 100644
index 00000000..ae677685
Binary files /dev/null and b/images/screen_700x700.png differ
diff --git a/images/settings.png b/images/settings.png
new file mode 100644
index 00000000..a43f5e10
Binary files /dev/null and b/images/settings.png differ
diff --git a/images/showextrakeys.png b/images/showextrakeys.png
new file mode 100644
index 00000000..ad8e0a70
Binary files /dev/null and b/images/showextrakeys.png differ
diff --git a/images/tab.png b/images/tab.png
new file mode 100644
index 00000000..84134872
Binary files /dev/null and b/images/tab.png differ
diff --git a/app/styles/Orbitron700.ttf b/include/Orbitron700.ttf
similarity index 100%
rename from app/styles/Orbitron700.ttf
rename to include/Orbitron700.ttf
diff --git a/app/styles/Orbitron700.woff b/include/Orbitron700.woff
similarity index 100%
rename from app/styles/Orbitron700.woff
rename to include/Orbitron700.woff
diff --git a/include/base.css b/include/base.css
new file mode 100644
index 00000000..e2c9a96d
--- /dev/null
+++ b/include/base.css
@@ -0,0 +1,512 @@
+/*
+ * 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/include/base64.js b/include/base64.js
new file mode 100644
index 00000000..5a6890ad
--- /dev/null
+++ b/include/base64.js
@@ -0,0 +1,115 @@
+/* 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, bitwise: false, plusplus: 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);
+ var i = 0, j = 0;
+ // Convert every three bytes to 4 ascii characters.
+ /* BEGIN LOOP */
+ for (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];
+ }
+ /* END LOOP */
+
+ // Convert the remaining 1 or 2 bytes, pad out to 4 characters.
+ 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 */
+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
+],
+
+decode: function (data, offset) {
+ "use strict";
+ offset = typeof(offset) !== 'undefined' ? offset : 0;
+ var toBinaryTable = Base64.toBinaryTable;
+ var base64Pad = Base64.base64Pad;
+ var result, result_length, idx, i, c, padding;
+ 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.
+ /* BEGIN LOOP */
+ for (idx = 0, i = offset; i < data.length; i++) {
+ c = toBinaryTable[data.charCodeAt(i) & 0x7f];
+ 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;
+ }
+ }
+ /* END LOOP */
+
+ // If there are any bits left, the base64 string was corrupted
+ if (leftbits) {
+ throw {name: 'Base64-Error',
+ message: 'Corrupted base64 string'};
+ }
+
+ return result;
+}
+
+}; /* End of Base64 namespace */
diff --git a/include/black.css b/include/black.css
new file mode 100644
index 00000000..7d940c5a
--- /dev/null
+++ b/include/black.css
@@ -0,0 +1,71 @@
+/*
+ * 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/include/blue.css b/include/blue.css
new file mode 100644
index 00000000..b2a0adcc
--- /dev/null
+++ b/include/blue.css
@@ -0,0 +1,64 @@
+/*
+ * 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/include/chrome-app/tcp-client.js b/include/chrome-app/tcp-client.js
new file mode 100644
index 00000000..b8c125f5
--- /dev/null
+++ b/include/chrome-app/tcp-client.js
@@ -0,0 +1,321 @@
+/*
+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/include/des.js b/include/des.js
new file mode 100644
index 00000000..1f952851
--- /dev/null
+++ b/include/des.js
@@ -0,0 +1,273 @@
+/*
+ * 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 , 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 . 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/
+ */
+
+"use strict";
+/*jslint white: false, bitwise: false, plusplus: false */
+
+function DES(passwd) {
+
+// Tables, permutations, S-boxes, etc.
+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 = [];
+
+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];
+
+// 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<>> 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/include/display.js b/include/display.js
new file mode 100644
index 00000000..9f2d6b89
--- /dev/null
+++ b/include/display.js
@@ -0,0 +1,770 @@
+/*
+ * 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, bitwise: false */
+/*global Util, Base64, changeCursor */
+
+function Display(defaults) {
+"use strict";
+
+var that = {}, // Public API methods
+ conf = {}, // Configuration attributes
+
+ // Private Display namespace variables
+ c_ctx = null,
+ c_forceCanvas = false,
+
+ // Queued drawing actions for in-order rendering
+ renderQ = [],
+
+ // Predefine function variables (jslint)
+ imageDataGet, rgbImageData, bgrxImageData, cmapImageData,
+ setFillColor, rescale, scan_renderQ,
+
+ // The full frame buffer (logical canvas) size
+ fb_width = 0,
+ fb_height = 0,
+ // The visible "physical canvas" viewport
+ viewport = {'x': 0, 'y': 0, 'w' : 0, 'h' : 0 },
+ cleanRect = {'x1': 0, 'y1': 0, 'x2': -1, 'y2': -1},
+
+ c_prevStyle = "",
+ tile = null,
+ tile16x16 = null,
+ tile_x = 0,
+ tile_y = 0;
+
+
+// Configuration attributes
+Util.conf_defaults(conf, that, defaults, [
+ ['target', 'wo', 'dom', null, 'Canvas element for rendering'],
+ ['context', 'ro', 'raw', null, 'Canvas 2D context for rendering (read-only)'],
+ ['logo', 'rw', 'raw', null, 'Logo to display when cleared: {"width": width, "height": height, "data": data}'],
+ ['true_color', 'rw', 'bool', true, 'Use true-color pixel data'],
+ ['colourMap', 'rw', 'arr', [], 'Colour map array (when not true-color)'],
+ ['scale', 'rw', 'float', 1.0, 'Display area scale factor 0.0 - 1.0'],
+ ['viewport', 'rw', 'bool', false, 'Use a viewport set with viewportChange()'],
+ ['width', 'rw', 'int', null, 'Display area width'],
+ ['height', 'rw', 'int', null, 'Display area height'],
+
+ ['render_mode', 'ro', 'str', '', 'Canvas rendering mode (read-only)'],
+
+ ['prefer_js', 'rw', 'str', null, 'Prefer Javascript over canvas methods'],
+ ['cursor_uri', 'rw', 'raw', null, 'Can we render cursor using data URI']
+ ]);
+
+// Override some specific getters/setters
+that.get_context = function () { return c_ctx; };
+
+that.set_scale = function(scale) { rescale(scale); };
+
+that.set_width = function (val) { that.resize(val, fb_height); };
+that.get_width = function() { return fb_width; };
+
+that.set_height = function (val) { that.resize(fb_width, val); };
+that.get_height = function() { return fb_height; };
+
+
+
+//
+// Private functions
+//
+
+// Create the public API interface
+function constructor() {
+ Util.Debug(">> Display.constructor");
+
+ var c, func, i, curDat, curSave,
+ has_imageData = false, UE = Util.Engine;
+
+ if (! conf.target) { throw("target must be set"); }
+
+ if (typeof conf.target === 'string') {
+ throw("target must be a DOM element");
+ }
+
+ c = conf.target;
+
+ if (! c.getContext) { throw("no getContext method"); }
+
+ if (! c_ctx) { c_ctx = c.getContext('2d'); }
+
+ Util.Debug("User Agent: " + navigator.userAgent);
+ if (UE.gecko) { Util.Debug("Browser: gecko " + UE.gecko); }
+ if (UE.webkit) { Util.Debug("Browser: webkit " + UE.webkit); }
+ if (UE.trident) { Util.Debug("Browser: trident " + UE.trident); }
+ if (UE.presto) { Util.Debug("Browser: presto " + UE.presto); }
+
+ that.clear();
+
+ // Check canvas features
+ if ('createImageData' in c_ctx) {
+ conf.render_mode = "canvas rendering";
+ } else {
+ throw("Canvas does not support createImageData");
+ }
+ if (conf.prefer_js === null) {
+ Util.Info("Prefering javascript operations");
+ conf.prefer_js = true;
+ }
+
+ // Initialize cached tile imageData
+ tile16x16 = c_ctx.createImageData(16, 16);
+
+ /*
+ * Determine browser support for setting the cursor via data URI
+ * scheme
+ */
+ curDat = [];
+ for (i=0; i < 8 * 8 * 4; i += 1) {
+ curDat.push(255);
+ }
+ try {
+ curSave = c.style.cursor;
+ changeCursor(conf.target, curDat, curDat, 2, 2, 8, 8);
+ if (c.style.cursor) {
+ if (conf.cursor_uri === null) {
+ conf.cursor_uri = true;
+ }
+ Util.Info("Data URI scheme cursor supported");
+ } else {
+ if (conf.cursor_uri === null) {
+ conf.cursor_uri = false;
+ }
+ Util.Warn("Data URI scheme cursor not supported");
+ }
+ c.style.cursor = curSave;
+ } catch (exc2) {
+ Util.Error("Data URI scheme cursor test exception: " + exc2);
+ conf.cursor_uri = false;
+ }
+
+ Util.Debug("<< Display.constructor");
+ return that ;
+}
+
+rescale = function(factor) {
+ var c, tp, x, y,
+ properties = ['transform', 'WebkitTransform', 'MozTransform', null];
+ c = conf.target;
+ tp = properties.shift();
+ while (tp) {
+ if (typeof c.style[tp] !== 'undefined') {
+ break;
+ }
+ tp = properties.shift();
+ }
+
+ if (tp === null) {
+ Util.Debug("No scaling support");
+ return;
+ }
+
+
+ if (typeof(factor) === "undefined") {
+ factor = conf.scale;
+ } else if (factor > 1.0) {
+ factor = 1.0;
+ } else if (factor < 0.1) {
+ factor = 0.1;
+ }
+
+ if (conf.scale === factor) {
+ //Util.Debug("Display already scaled to '" + factor + "'");
+ return;
+ }
+
+ conf.scale = factor;
+ x = c.width - c.width * factor;
+ y = c.height - c.height * factor;
+ c.style[tp] = "scale(" + conf.scale + ") translate(-" + x + "px, -" + y + "px)";
+};
+
+setFillColor = function(color) {
+ var bgr, newStyle;
+ if (conf.true_color) {
+ bgr = color;
+ } else {
+ bgr = conf.colourMap[color[0]];
+ }
+ newStyle = "rgb(" + bgr[2] + "," + bgr[1] + "," + bgr[0] + ")";
+ if (newStyle !== c_prevStyle) {
+ c_ctx.fillStyle = newStyle;
+ c_prevStyle = newStyle;
+ }
+};
+
+
+//
+// Public API interface functions
+//
+
+// Shift and/or resize the visible viewport
+that.viewportChange = function(deltaX, deltaY, width, height) {
+ var c = conf.target, v = viewport, cr = cleanRect,
+ saveImg = null, saveStyle, x1, y1, vx2, vy2, w, h;
+
+ if (!conf.viewport) {
+ Util.Debug("Setting viewport to full display region");
+ deltaX = -v.w; // Clamped later if out of bounds
+ deltaY = -v.h; // Clamped later if out of bounds
+ width = fb_width;
+ height = fb_height;
+ }
+
+ if (typeof(deltaX) === "undefined") { deltaX = 0; }
+ if (typeof(deltaY) === "undefined") { deltaY = 0; }
+ if (typeof(width) === "undefined") { width = v.w; }
+ if (typeof(height) === "undefined") { height = v.h; }
+
+ // Size change
+
+ if (width > fb_width) { width = fb_width; }
+ if (height > fb_height) { height = fb_height; }
+
+ if ((v.w !== width) || (v.h !== height)) {
+ // Change width
+ if ((width < v.w) && (cr.x2 > v.x + width -1)) {
+ cr.x2 = v.x + width - 1;
+ }
+ v.w = width;
+
+ // Change height
+ if ((height < v.h) && (cr.y2 > v.y + height -1)) {
+ cr.y2 = v.y + height - 1;
+ }
+ v.h = height;
+
+
+ if (v.w > 0 && v.h > 0 && c.width > 0 && c.height > 0) {
+ saveImg = c_ctx.getImageData(0, 0,
+ (c.width < v.w) ? c.width : v.w,
+ (c.height < v.h) ? c.height : v.h);
+ }
+
+ c.width = v.w;
+ c.height = v.h;
+
+ if (saveImg) {
+ c_ctx.putImageData(saveImg, 0, 0);
+ }
+ }
+
+ vx2 = v.x + v.w - 1;
+ vy2 = v.y + v.h - 1;
+
+
+ // Position change
+
+ if ((deltaX < 0) && ((v.x + deltaX) < 0)) {
+ deltaX = - v.x;
+ }
+ if ((vx2 + deltaX) >= fb_width) {
+ deltaX -= ((vx2 + deltaX) - fb_width + 1);
+ }
+
+ if ((v.y + deltaY) < 0) {
+ deltaY = - v.y;
+ }
+ if ((vy2 + deltaY) >= fb_height) {
+ deltaY -= ((vy2 + deltaY) - fb_height + 1);
+ }
+
+ if ((deltaX === 0) && (deltaY === 0)) {
+ //Util.Debug("skipping viewport change");
+ return;
+ }
+ Util.Debug("viewportChange deltaX: " + deltaX + ", deltaY: " + deltaY);
+
+ v.x += deltaX;
+ vx2 += deltaX;
+ v.y += deltaY;
+ vy2 += deltaY;
+
+ // Update the clean rectangle
+ if (v.x > cr.x1) {
+ cr.x1 = v.x;
+ }
+ if (vx2 < cr.x2) {
+ cr.x2 = vx2;
+ }
+ if (v.y > cr.y1) {
+ cr.y1 = v.y;
+ }
+ if (vy2 < cr.y2) {
+ cr.y2 = vy2;
+ }
+
+ if (deltaX < 0) {
+ // Shift viewport left, redraw left section
+ x1 = 0;
+ w = - deltaX;
+ } else {
+ // Shift viewport right, redraw right section
+ x1 = v.w - deltaX;
+ w = deltaX;
+ }
+ if (deltaY < 0) {
+ // Shift viewport up, redraw top section
+ y1 = 0;
+ h = - deltaY;
+ } else {
+ // Shift viewport down, redraw bottom section
+ y1 = v.h - deltaY;
+ h = deltaY;
+ }
+
+ // Copy the valid part of the viewport to the shifted location
+ saveStyle = c_ctx.fillStyle;
+ c_ctx.fillStyle = "rgb(255,255,255)";
+ if (deltaX !== 0) {
+ //that.copyImage(0, 0, -deltaX, 0, v.w, v.h);
+ //that.fillRect(x1, 0, w, v.h, [255,255,255]);
+ c_ctx.drawImage(c, 0, 0, v.w, v.h, -deltaX, 0, v.w, v.h);
+ c_ctx.fillRect(x1, 0, w, v.h);
+ }
+ if (deltaY !== 0) {
+ //that.copyImage(0, 0, 0, -deltaY, v.w, v.h);
+ //that.fillRect(0, y1, v.w, h, [255,255,255]);
+ c_ctx.drawImage(c, 0, 0, v.w, v.h, 0, -deltaY, v.w, v.h);
+ c_ctx.fillRect(0, y1, v.w, h);
+ }
+ c_ctx.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}, ...]}
+that.getCleanDirtyReset = function() {
+ var v = viewport, c = cleanRect, cleanBox, dirtyBoxes = [],
+ vx2 = v.x + v.w - 1, vy2 = v.y + v.h - 1;
+
+
+ // Copy the cleanRect
+ cleanBox = {'x': c.x1, 'y': c.y1,
+ 'w': c.x2 - c.x1 + 1, 'h': c.y2 - c.y1 + 1};
+
+ if ((c.x1 >= c.x2) || (c.y1 >= c.y2)) {
+ // Whole viewport is dirty
+ dirtyBoxes.push({'x': v.x, 'y': v.y, 'w': v.w, 'h': v.h});
+ } else {
+ // Redraw dirty regions
+ if (v.x < c.x1) {
+ // left side dirty region
+ dirtyBoxes.push({'x': v.x, 'y': v.y,
+ 'w': c.x1 - v.x + 1, 'h': v.h});
+ }
+ if (vx2 > c.x2) {
+ // right side dirty region
+ dirtyBoxes.push({'x': c.x2 + 1, 'y': v.y,
+ 'w': vx2 - c.x2, 'h': v.h});
+ }
+ if (v.y < c.y1) {
+ // top/middle dirty region
+ dirtyBoxes.push({'x': c.x1, 'y': v.y,
+ 'w': c.x2 - c.x1 + 1, 'h': c.y1 - v.y});
+ }
+ if (vy2 > c.y2) {
+ // bottom/middle dirty region
+ dirtyBoxes.push({'x': c.x1, 'y': c.y2 + 1,
+ 'w': c.x2 - c.x1 + 1, 'h': vy2 - c.y2});
+ }
+ }
+
+ // Reset the cleanRect to the whole viewport
+ cleanRect = {'x1': v.x, 'y1': v.y,
+ 'x2': v.x + v.w - 1, 'y2': v.y + v.h - 1};
+
+ return {'cleanBox': cleanBox, 'dirtyBoxes': dirtyBoxes};
+};
+
+// Translate viewport coordinates to absolute coordinates
+that.absX = function(x) {
+ return x + viewport.x;
+};
+that.absY = function(y) {
+ return y + viewport.y;
+};
+
+
+that.resize = function(width, height) {
+ c_prevStyle = "";
+
+ fb_width = width;
+ fb_height = height;
+
+ rescale(conf.scale);
+ that.viewportChange();
+};
+
+that.clear = function() {
+
+ if (conf.logo) {
+ that.resize(conf.logo.width, conf.logo.height);
+ that.blitStringImage(conf.logo.data, 0, 0);
+ } else {
+ that.resize(640, 20);
+ c_ctx.clearRect(0, 0, viewport.w, viewport.h);
+ }
+
+ renderQ = [];
+
+ // No benefit over default ("source-over") in Chrome and firefox
+ //c_ctx.globalCompositeOperation = "copy";
+};
+
+that.fillRect = function(x, y, width, height, color) {
+ setFillColor(color);
+ c_ctx.fillRect(x - viewport.x, y - viewport.y, width, height);
+};
+
+that.copyImage = function(old_x, old_y, new_x, new_y, w, h) {
+ var x1 = old_x - viewport.x, y1 = old_y - viewport.y,
+ x2 = new_x - viewport.x, y2 = new_y - viewport.y;
+ c_ctx.drawImage(conf.target, x1, y1, w, h, x2, y2, w, h);
+};
+
+
+// Start updating a tile
+that.startTile = function(x, y, width, height, color) {
+ var data, bgr, red, green, blue, i;
+ tile_x = x;
+ tile_y = y;
+ if ((width === 16) && (height === 16)) {
+ tile = tile16x16;
+ } else {
+ tile = c_ctx.createImageData(width, height);
+ }
+ data = tile.data;
+ if (conf.prefer_js) {
+ if (conf.true_color) {
+ bgr = color;
+ } else {
+ bgr = conf.colourMap[color[0]];
+ }
+ red = bgr[2];
+ green = bgr[1];
+ blue = bgr[0];
+ for (i = 0; i < (width * height * 4); i+=4) {
+ data[i ] = red;
+ data[i + 1] = green;
+ data[i + 2] = blue;
+ data[i + 3] = 255;
+ }
+ } else {
+ that.fillRect(x, y, width, height, color);
+ }
+};
+
+// Update sub-rectangle of the current tile
+that.subTile = function(x, y, w, h, color) {
+ var data, p, bgr, red, green, blue, width, j, i, xend, yend;
+ if (conf.prefer_js) {
+ data = tile.data;
+ width = tile.width;
+ if (conf.true_color) {
+ bgr = color;
+ } else {
+ bgr = conf.colourMap[color[0]];
+ }
+ red = bgr[2];
+ green = bgr[1];
+ blue = bgr[0];
+ xend = x + w;
+ yend = y + h;
+ for (j = y; j < yend; j += 1) {
+ for (i = x; i < xend; i += 1) {
+ p = (i + (j * width) ) * 4;
+ data[p ] = red;
+ data[p + 1] = green;
+ data[p + 2] = blue;
+ data[p + 3] = 255;
+ }
+ }
+ } else {
+ that.fillRect(tile_x + x, tile_y + y, w, h, color);
+ }
+};
+
+// Draw the current tile to the screen
+that.finishTile = function() {
+ if (conf.prefer_js) {
+ c_ctx.putImageData(tile, tile_x - viewport.x, tile_y - viewport.y);
+ }
+ // else: No-op, if not prefer_js then already done by setSubTile
+};
+
+rgbImageData = function(x, y, vx, vy, width, height, arr, offset) {
+ var img, i, j, data;
+ /*
+ if ((x - v.x >= v.w) || (y - v.y >= v.h) ||
+ (x - v.x + width < 0) || (y - v.y + height < 0)) {
+ // Skipping because outside of viewport
+ return;
+ }
+ */
+ img = c_ctx.createImageData(width, height);
+ data = img.data;
+ for (i=0, j=offset; i < (width * height * 4); i=i+4, j=j+3) {
+ data[i ] = arr[j ];
+ data[i + 1] = arr[j + 1];
+ data[i + 2] = arr[j + 2];
+ data[i + 3] = 255; // Set Alpha
+ }
+ c_ctx.putImageData(img, x - vx, y - vy);
+};
+
+bgrxImageData = function(x, y, vx, vy, width, height, arr, offset) {
+ var img, i, j, data;
+ /*
+ if ((x - v.x >= v.w) || (y - v.y >= v.h) ||
+ (x - v.x + width < 0) || (y - v.y + height < 0)) {
+ // Skipping because outside of viewport
+ return;
+ }
+ */
+ img = c_ctx.createImageData(width, height);
+ data = img.data;
+ for (i=0, j=offset; i < (width * height * 4); i=i+4, j=j+4) {
+ data[i ] = arr[j + 2];
+ data[i + 1] = arr[j + 1];
+ data[i + 2] = arr[j ];
+ data[i + 3] = 255; // Set Alpha
+ }
+ c_ctx.putImageData(img, x - vx, y - vy);
+};
+
+cmapImageData = function(x, y, vx, vy, width, height, arr, offset) {
+ var img, i, j, data, bgr, cmap;
+ img = c_ctx.createImageData(width, height);
+ data = img.data;
+ cmap = conf.colourMap;
+ for (i=0, j=offset; i < (width * height * 4); i+=4, j+=1) {
+ bgr = cmap[arr[j]];
+ data[i ] = bgr[2];
+ data[i + 1] = bgr[1];
+ data[i + 2] = bgr[0];
+ data[i + 3] = 255; // Set Alpha
+ }
+ c_ctx.putImageData(img, x - vx, y - vy);
+};
+
+that.blitImage = function(x, y, width, height, arr, offset) {
+ if (conf.true_color) {
+ bgrxImageData(x, y, viewport.x, viewport.y, width, height, arr, offset);
+ } else {
+ cmapImageData(x, y, viewport.x, viewport.y, width, height, arr, offset);
+ }
+};
+
+that.blitRgbImage = function(x, y, width, height, arr, offset) {
+ if (conf.true_color) {
+ rgbImageData(x, y, viewport.x, viewport.y, width, height, arr, offset);
+ } else {
+ // prolly wrong...
+ cmapImageData(x, y, viewport.x, viewport.y, width, height, arr, offset);
+ }
+};
+
+that.blitStringImage = function(str, x, y) {
+ var img = new Image();
+ img.onload = function () {
+ c_ctx.drawImage(img, x - viewport.x, y - viewport.y);
+ };
+ img.src = str;
+};
+
+// Wrap ctx.drawImage but relative to viewport
+that.drawImage = function(img, x, y) {
+ c_ctx.drawImage(img, x - viewport.x, y - viewport.y);
+};
+
+that.renderQ_push = function(action) {
+ renderQ.push(action);
+ if (renderQ.length === 1) {
+ // If this can be rendered immediately it will be, otherwise
+ // the scanner will start polling the queue (every
+ // requestAnimationFrame interval)
+ scan_renderQ();
+ }
+};
+
+scan_renderQ = function() {
+ var a, ready = true;
+ while (ready && renderQ.length > 0) {
+ a = renderQ[0];
+ switch (a.type) {
+ case 'copy':
+ that.copyImage(a.old_x, a.old_y, a.x, a.y, a.width, a.height);
+ break;
+ case 'fill':
+ that.fillRect(a.x, a.y, a.width, a.height, a.color);
+ break;
+ case 'blit':
+ that.blitImage(a.x, a.y, a.width, a.height, a.data, 0);
+ break;
+ case 'blitRgb':
+ that.blitRgbImage(a.x, a.y, a.width, a.height, a.data, 0);
+ break;
+ case 'img':
+ if (a.img.complete) {
+ that.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) {
+ a = renderQ.shift();
+ }
+ }
+ if (renderQ.length > 0) {
+ requestAnimFrame(scan_renderQ);
+ }
+};
+
+
+that.changeCursor = function(pixels, mask, hotx, hoty, w, h) {
+ if (conf.cursor_uri === false) {
+ Util.Warn("changeCursor called but no cursor data URI support");
+ return;
+ }
+
+ if (conf.true_color) {
+ changeCursor(conf.target, pixels, mask, hotx, hoty, w, h);
+ } else {
+ changeCursor(conf.target, pixels, mask, hotx, hoty, w, h, conf.colourMap);
+ }
+};
+
+that.defaultCursor = function() {
+ conf.target.style.cursor = "default";
+};
+
+return constructor(); // Return the public API interface
+
+} // End of Display()
+
+
+/* Set CSS cursor property using data URI encoded cursor file */
+function changeCursor(target, pixels, mask, hotx, hoty, w0, h0, cmap) {
+ "use strict";
+ var cur = [], rgb, IHDRsz, RGBsz, ANDsz, XORsz, url, idx, alpha, x, y;
+ //Util.Debug(">> changeCursor, x: " + hotx + ", y: " + hoty + ", w0: " + w0 + ", h0: " + h0);
+
+ var w = w0;
+ var h = h0;
+ if (h < w)
+ h = w; // increase h to make it square
+ else
+ w = h; // increace w to make it square
+
+ // 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 );
+ };
+
+ IHDRsz = 40;
+ RGBsz = w * h * 4;
+ XORsz = Math.ceil( (w * h) / 8.0 );
+ ANDsz = Math.ceil( (w * h) / 8.0 );
+
+ // Main header
+ 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); // 43: Size of Image
+ // Gimp leaves this as 0
+
+ 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[])
+ for (y = h-1; y >= 0; y -= 1) {
+ for (x = 0; x < w; x += 1) {
+ if (x >= w0 || y >= h0) {
+ cur.push(0); // blue
+ cur.push(0); // green
+ cur.push(0); // red
+ cur.push(0); // alpha
+ } else {
+ idx = y * Math.ceil(w0 / 8) + Math.floor(x/8);
+ alpha = (mask[idx] << (x % 8)) & 0x80 ? 255 : 0;
+ if (cmap) {
+ idx = (w0 * y) + x;
+ 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 right size)
+ for (y = 0; y < h; y += 1) {
+ for (x = 0; x < Math.ceil(w / 8); x += 1) {
+ cur.push(0x00);
+ }
+ }
+
+ // AND/bitmask data (BYTE icAND[])
+ // (ignored, just needs to be right size)
+ for (y = 0; y < h; y += 1) {
+ for (x = 0; x < Math.ceil(w / 8); x += 1) {
+ cur.push(0x00);
+ }
+ }
+
+ url = "data:image/x-icon;base64," + Base64.encode(cur);
+ target.style.cursor = "url(" + url + ") " + hotx + " " + hoty + ", default";
+ //Util.Debug("<< changeCursor, cur.length: " + cur.length);
+}
diff --git a/include/input.js b/include/input.js
new file mode 100644
index 00000000..392b4107
--- /dev/null
+++ b/include/input.js
@@ -0,0 +1,401 @@
+/*
+ * 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, bitwise: false */
+/*global window, Util */
+
+
+//
+// Keyboard event handler
+//
+
+function Keyboard(defaults) {
+"use strict";
+
+var that = {}, // Public API methods
+ conf = {}, // Configuration attributes
+
+ keyDownList = []; // List of depressed keys
+ // (even if they are happy)
+
+// Configuration attributes
+Util.conf_defaults(conf, that, defaults, [
+ ['target', 'wo', 'dom', document, 'DOM element that captures keyboard input'],
+ ['focused', 'rw', 'bool', true, 'Capture and send key events'],
+
+ ['onKeyPress', 'rw', 'func', null, 'Handler for key press/release']
+ ]);
+
+
+//
+// Private functions
+//
+
+/////// setup
+
+function onRfbEvent(evt) {
+ if (conf.onKeyPress) {
+ Util.Debug("onKeyPress " + (evt.type == 'keydown' ? "down" : "up")
+ + ", keysym: " + evt.keysym.keysym + "(" + evt.keysym.keyname + ")");
+ conf.onKeyPress(evt.keysym.keysym, evt.type == 'keydown');
+ }
+}
+
+// create the keyboard handler
+var k = KeyEventDecoder(kbdUtil.ModifierSync(),
+ VerifyCharModifier(
+ TrackKeyState(
+ EscapeModifiers(onRfbEvent)
+ )
+ )
+);
+
+function onKeyDown(e) {
+ if (! conf.focused) {
+ return true;
+ }
+ if (k.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;
+ }
+}
+function onKeyPress(e) {
+ if (! conf.focused) {
+ return true;
+ }
+ if (k.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;
+ }
+}
+
+function onKeyUp(e) {
+ if (! conf.focused) {
+ return true;
+ }
+ if (k.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;
+ }
+}
+
+function onOther(e) {
+ k.syncModifiers(e);
+}
+
+function allKeysUp() {
+ Util.Debug(">> Keyboard.allKeysUp");
+
+ k.releaseAll();
+ Util.Debug("<< Keyboard.allKeysUp");
+}
+
+//
+// Public API interface functions
+//
+
+that.grab = function() {
+ //Util.Debug(">> Keyboard.grab");
+ var c = conf.target;
+
+ Util.addEvent(c, 'keydown', onKeyDown);
+ Util.addEvent(c, 'keyup', onKeyUp);
+ Util.addEvent(c, 'keypress', onKeyPress);
+
+ // Release (key up) if window loses focus
+ Util.addEvent(window, 'blur', allKeysUp);
+
+ //Util.Debug("<< Keyboard.grab");
+};
+
+that.ungrab = function() {
+ //Util.Debug(">> Keyboard.ungrab");
+ var c = conf.target;
+
+ Util.removeEvent(c, 'keydown', onKeyDown);
+ Util.removeEvent(c, 'keyup', onKeyUp);
+ Util.removeEvent(c, 'keypress', onKeyPress);
+ Util.removeEvent(window, 'blur', allKeysUp);
+
+ // Release (key up) all keys that are in a down state
+ allKeysUp();
+
+ //Util.Debug(">> Keyboard.ungrab");
+};
+
+that.sync = function(e) {
+ k.syncModifiers(e);
+}
+
+return that; // Return the public API interface
+
+} // End of Keyboard()
+
+
+//
+// Mouse event handler
+//
+
+function Mouse(defaults) {
+"use strict";
+
+var that = {}, // Public API methods
+ conf = {}, // Configuration attributes
+ mouseCaptured = false;
+
+var doubleClickTimer = null,
+ lastTouchPos = null;
+
+// Configuration attributes
+Util.conf_defaults(conf, that, defaults, [
+ ['target', 'ro', 'dom', document, 'DOM element that captures mouse input'],
+ ['notify', 'ro', 'func', null, 'Function to call to notify whenever a mouse event is received'],
+ ['focused', 'rw', 'bool', true, 'Capture and send mouse clicks/movement'],
+ ['scale', 'rw', 'float', 1.0, 'Viewport scale factor 0.0 - 1.0'],
+
+ ['onMouseButton', 'rw', 'func', null, 'Handler for mouse button click/release'],
+ ['onMouseMove', 'rw', 'func', null, 'Handler for mouse movement'],
+ ['touchButton', 'rw', 'int', 1, 'Button mask (1, 2, 4) for touch devices (0 means ignore clicks)']
+ ]);
+
+function captureMouse() {
+ // capturing the mouse ensures we get the mouseup event
+ if (conf.target.setCapture) {
+ conf.target.setCapture();
+ }
+
+ // some browsers give us mouseup events regardless,
+ // so if we never captured the mouse, we can disregard the event
+ mouseCaptured = true;
+}
+
+function releaseMouse() {
+ if (conf.target.releaseCapture) {
+ conf.target.releaseCapture();
+ }
+ mouseCaptured = false;
+}
+//
+// Private functions
+//
+
+function resetDoubleClickTimer() {
+ doubleClickTimer = null;
+}
+
+function onMouseButton(e, down) {
+ var evt, pos, bmask;
+ if (! conf.focused) {
+ return true;
+ }
+
+ if (conf.notify) {
+ conf.notify(e);
+ }
+
+ evt = (e ? e : window.event);
+ pos = Util.getEventPosition(e, conf.target, conf.scale);
+
+ 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 (doubleClickTimer == null) {
+ lastTouchPos = pos;
+ } else {
+ clearTimeout(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 = lastTouchPos.x - pos.x;
+ var ys = 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 = lastTouchPos;
+ }
+ }
+ doubleClickTimer = setTimeout(resetDoubleClickTimer, 500);
+ }
+ bmask = conf.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
+ }
+ //Util.Debug("mouse " + pos.x + "," + pos.y + " down: " + down +
+ // " bmask: " + bmask + "(evt.button: " + evt.button + ")");
+ if (conf.onMouseButton) {
+ Util.Debug("onMouseButton " + (down ? "down" : "up") +
+ ", x: " + pos.x + ", y: " + pos.y + ", bmask: " + bmask);
+ conf.onMouseButton(pos.x, pos.y, down, bmask);
+ }
+ Util.stopEvent(e);
+ return false;
+}
+
+function onMouseDown(e) {
+ captureMouse();
+ onMouseButton(e, 1);
+}
+
+function onMouseUp(e) {
+ if (!mouseCaptured) {
+ return;
+ }
+
+ onMouseButton(e, 0);
+ releaseMouse();
+}
+
+function onMouseWheel(e) {
+ var evt, pos, bmask, wheelData;
+ if (! conf.focused) {
+ return true;
+ }
+ if (conf.notify) {
+ conf.notify(e);
+ }
+
+ evt = (e ? e : window.event);
+ pos = Util.getEventPosition(e, conf.target, conf.scale);
+ wheelData = evt.detail ? evt.detail * -1 : evt.wheelDelta / 40;
+ if (wheelData > 0) {
+ bmask = 1 << 3;
+ } else {
+ bmask = 1 << 4;
+ }
+ //Util.Debug('mouse scroll by ' + wheelData + ':' + pos.x + "," + pos.y);
+ if (conf.onMouseButton) {
+ conf.onMouseButton(pos.x, pos.y, 1, bmask);
+ conf.onMouseButton(pos.x, pos.y, 0, bmask);
+ }
+ Util.stopEvent(e);
+ return false;
+}
+
+function onMouseMove(e) {
+ var evt, pos;
+ if (! conf.focused) {
+ return true;
+ }
+ if (conf.notify) {
+ conf.notify(e);
+ }
+
+ evt = (e ? e : window.event);
+ pos = Util.getEventPosition(e, conf.target, conf.scale);
+ //Util.Debug('mouse ' + evt.which + '/' + evt.button + ' up:' + pos.x + "," + pos.y);
+ if (conf.onMouseMove) {
+ conf.onMouseMove(pos.x, pos.y);
+ }
+ Util.stopEvent(e);
+ return false;
+}
+
+function onMouseDisable(e) {
+ var evt, pos;
+ if (! conf.focused) {
+ return true;
+ }
+ evt = (e ? e : window.event);
+ pos = Util.getEventPosition(e, conf.target, conf.scale);
+ /* Stop propagation if inside canvas area */
+ if ((pos.realx >= 0) && (pos.realy >= 0) &&
+ (pos.realx < conf.target.offsetWidth) &&
+ (pos.realy < conf.target.offsetHeight)) {
+ //Util.Debug("mouse event disabled");
+ Util.stopEvent(e);
+ return false;
+ }
+ //Util.Debug("mouse event not disabled");
+ return true;
+}
+
+//
+// Public API interface functions
+//
+
+that.grab = function() {
+ //Util.Debug(">> Mouse.grab");
+ var c = conf.target;
+
+ if ('ontouchstart' in document.documentElement) {
+ Util.addEvent(c, 'touchstart', onMouseDown);
+ Util.addEvent(window, 'touchend', onMouseUp);
+ Util.addEvent(c, 'touchend', onMouseUp);
+ Util.addEvent(c, 'touchmove', onMouseMove);
+ } else {
+ Util.addEvent(c, 'mousedown', onMouseDown);
+ Util.addEvent(window, 'mouseup', onMouseUp);
+ Util.addEvent(c, 'mouseup', onMouseUp);
+ Util.addEvent(c, 'mousemove', onMouseMove);
+ Util.addEvent(c, (Util.Engine.gecko) ? 'DOMMouseScroll' : 'mousewheel',
+ onMouseWheel);
+ }
+
+ /* Work around right and middle click browser behaviors */
+ Util.addEvent(document, 'click', onMouseDisable);
+ Util.addEvent(document.body, 'contextmenu', onMouseDisable);
+
+ //Util.Debug("<< Mouse.grab");
+};
+
+that.ungrab = function() {
+ //Util.Debug(">> Mouse.ungrab");
+ var c = conf.target;
+
+ if ('ontouchstart' in document.documentElement) {
+ Util.removeEvent(c, 'touchstart', onMouseDown);
+ Util.removeEvent(window, 'touchend', onMouseUp);
+ Util.removeEvent(c, 'touchend', onMouseUp);
+ Util.removeEvent(c, 'touchmove', onMouseMove);
+ } else {
+ Util.removeEvent(c, 'mousedown', onMouseDown);
+ Util.removeEvent(window, 'mouseup', onMouseUp);
+ Util.removeEvent(c, 'mouseup', onMouseUp);
+ Util.removeEvent(c, 'mousemove', onMouseMove);
+ Util.removeEvent(c, (Util.Engine.gecko) ? 'DOMMouseScroll' : 'mousewheel',
+ onMouseWheel);
+ }
+
+ /* Work around right and middle click browser behaviors */
+ Util.removeEvent(document, 'click', onMouseDisable);
+ Util.removeEvent(document.body, 'contextmenu', onMouseDisable);
+
+ //Util.Debug(">> Mouse.ungrab");
+};
+
+return that; // Return the public API interface
+
+} // End of Mouse()
diff --git a/include/jsunzip.js b/include/jsunzip.js
new file mode 100755
index 00000000..8968f866
--- /dev/null
+++ b/include/jsunzip.js
@@ -0,0 +1,676 @@
+/*
+ * 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/include/keyboard.js b/include/keyboard.js
new file mode 100644
index 00000000..c89411cc
--- /dev/null
+++ b/include/keyboard.js
@@ -0,0 +1,534 @@
+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) !== 0xffe1) {
+ 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) {
+ var ctrl = 0xffe3;
+ var alt = 0xffe9;
+ var altGr = 0xfe03;
+ var shift = 0xffe1;
+ var meta = 0xffe7;
+
+ if (!charModifier) {
+ if (isMac()) {
+ // on Mac, Option (AKA Alt) is used as a char modifier
+ charModifier = [alt];
+ }
+ else if (isWindows()) {
+ // on Windows, Ctrl+Alt is used as a char modifier
+ charModifier = [alt, ctrl];
+ }
+ else if (isLinux()) {
+ // on Linux, AltGr is used as a char modifier
+ charModifier = [altGr];
+ }
+ else {
+ charModifier = [];
+ }
+ }
+
+ var state = {};
+ state[ctrl] = false;
+ state[alt] = false;
+ state[altGr] = false;
+ state[shift] = false;
+ state[meta] = 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[ctrl] && keysym !== ctrl) {
+ state[ctrl] = evt.ctrlKey;
+ result.push(syncKey(ctrl));
+ }
+ if (evt.altKey !== undefined && evt.altKey !== state[alt] && keysym !== alt) {
+ state[alt] = evt.altKey;
+ result.push(syncKey(alt));
+ }
+ if (evt.altGraphKey !== undefined && evt.altGraphKey !== state[altGr] && keysym !== altGr) {
+ state[altGr] = evt.altGraphKey;
+ result.push(syncKey(altGr));
+ }
+ if (evt.shiftKey !== undefined && evt.shiftKey !== state[shift] && keysym !== shift) {
+ state[shift] = evt.shiftKey;
+ result.push(syncKey(shift));
+ }
+ if (evt.metaKey !== undefined && evt.metaKey !== state[meta] && keysym !== meta) {
+ state[meta] = evt.metaKey;
+ result.push(syncKey(meta));
+ }
+ 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 0xffb0 + (keycode - 0x60); // numpad 0-9
+ }
+
+ switch(keycode) {
+ case 0x20: return 0x20; // space
+ case 0x6a: return 0xffaa; // multiply
+ case 0x6b: return 0xffab; // add
+ case 0x6c: return 0xffac; // separator
+ case 0x6d: return 0xffad; // subtract
+ case 0x6e: return 0xffae; // decimal
+ case 0x6f: return 0xffaf; // divide
+ case 0xbb: return 0x2b; // +
+ case 0xbc: return 0x2c; // ,
+ case 0xbd: return 0x2d; // -
+ case 0xbe: return 0x2e; // .
+ }
+
+ 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 0xffbe + keycode - 0x70; // F1-F24
+ }
+ switch (keycode) {
+
+ case 8 : return 0xFF08; // BACKSPACE
+ case 13 : return 0xFF0D; // ENTER
+
+ case 9 : return 0xFF09; // TAB
+
+ case 27 : return 0xFF1B; // ESCAPE
+ case 46 : return 0xFFFF; // DELETE
+
+ case 36 : return 0xFF50; // HOME
+ case 35 : return 0xFF57; // END
+ case 33 : return 0xFF55; // PAGE_UP
+ case 34 : return 0xFF56; // PAGE_DOWN
+ case 45 : return 0xFF63; // INSERT
+
+ case 37 : return 0xFF51; // LEFT
+ case 38 : return 0xFF52; // UP
+ case 39 : return 0xFF53; // RIGHT
+ case 40 : return 0xFF54; // DOWN
+ case 16 : return 0xFFE1; // SHIFT
+ case 17 : return 0xFFE3; // CONTROL
+ case 18 : return 0xFFE9; // Left ALT (Mac Option)
+
+ case 224 : return 0xFE07; // Meta
+ case 225 : return 0xFE03; // AltGr
+ case 91 : return 0xFFEC; // Super_L (Win Key)
+ case 92 : return 0xFFED; // Super_R (Win Key)
+ case 93 : return 0xFF67; // Menu (Win Menu), Mac Command
+ 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;
+ }
+ while (queue.length !== 0) {
+ var cur = queue[0];
+ queue = queue.splice(1);
+ switch (cur.type) {
+ case 'stall':
+ // insert a delay before processing available events.
+ timer = setTimeout(function() {
+ clearTimeout(timer);
+ timer = null;
+ process();
+ }, 5);
+ 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
+ for (var key in item.keysyms) {
+ var clone = (function(){
+ function Clone(){}
+ return function (obj) { Clone.prototype=obj; return new Clone(); };
+ }());
+ var out = clone(evt);
+ out.keysym = item.keysyms[key];
+ next(out);
+ }
+ break;
+ case 'releaseall':
+ 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'});
+ }
+ }
+ 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
+ for (var i = 0; i < evt.escape.length; ++i) {
+ next({type: 'keydown', keyId: 0, keysym: keysyms.lookup(evt.escape[i])});
+ }
+ };
+}
diff --git a/include/keysym.js b/include/keysym.js
new file mode 100644
index 00000000..a00d595e
--- /dev/null
+++ b/include/keysym.js
@@ -0,0 +1,376 @@
+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 */
+
+/*
+ * 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/include/keysymdef.js b/include/keysymdef.js
new file mode 100644
index 00000000..f94445cf
--- /dev/null
+++ b/include/keysymdef.js
@@ -0,0 +1,15 @@
+// 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/include/logo.js b/include/logo.js
new file mode 100644
index 00000000..befa598c
--- /dev/null
+++ b/include/logo.js
@@ -0,0 +1 @@
+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/include/playback.js b/include/playback.js
new file mode 100644
index 00000000..7756529d
--- /dev/null
+++ b/include/playback.js
@@ -0,0 +1,102 @@
+/*
+ * 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/include/rfb.js b/include/rfb.js
new file mode 100644
index 00000000..3b748ba1
--- /dev/null
+++ b/include/rfb.js
@@ -0,0 +1,1981 @@
+/*
+ * 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, bitwise: false, plusplus: false */
+/*global window, Util, Display, Keyboard, Mouse, Websock, Websock_native, Base64, DES */
+
+
+function RFB(defaults) {
+"use strict";
+
+var that = {}, // Public API methods
+ conf = {}, // Configuration attributes
+
+ // Pre-declare private functions used before definitions (jslint)
+ init_vars, updateState, fail, handle_message,
+ init_msg, normal_msg, framebufferUpdate, print_stats,
+
+ pixelFormat, clientEncodings, fbUpdateRequest, fbUpdateRequests,
+ keyEvent, pointerEvent, clientCutText,
+
+ getTightCLength, extract_data_uri,
+ keyPress, mouseButton, mouseMove,
+
+ checkEvents, // Overridable for testing
+
+
+ //
+ // Private RFB namespace variables
+ //
+ rfb_host = '',
+ rfb_port = 5900,
+ rfb_password = '',
+ rfb_path = '',
+
+ rfb_state = 'disconnected',
+ rfb_version = 0,
+ rfb_max_version= 3.8,
+ rfb_auth_scheme= '',
+ rfb_tightvnc = false,
+
+ rfb_xvp_ver = 0,
+
+
+ // In preference order
+ 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 ]
+ ],
+
+ encHandlers = {},
+ encNames = {},
+ encStats = {}, // [rectCnt, rectCntTot]
+
+ ws = null, // Websock object
+ display = null, // Display object
+ keyboard = null, // Keyboard input handler object
+ mouse = null, // Mouse input handler object
+ sendTimer = null, // Send Queue check timer
+ disconnTimer = null, // disconnection timer
+ msgTimer = null, // queued handle_message timer
+
+ // Frame buffer update state
+ 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,
+ zlibs : [] // TIGHT zlib streams
+ },
+
+ fb_Bpp = 4,
+ fb_depth = 3,
+ fb_width = 0,
+ fb_height = 0,
+ fb_name = "",
+
+ rre_chunk_sz = 100,
+
+ 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
+ },
+
+ test_mode = false,
+
+ /* Mouse state */
+ mouse_buttonMask = 0,
+ mouse_arr = [],
+ viewportDragging = false,
+ viewportDragPos = {};
+
+// Configuration attributes
+Util.conf_defaults(conf, that, defaults, [
+ ['target', 'wo', 'dom', null, 'VNC display rendering Canvas object'],
+ ['focusContainer', 'wo', 'dom', document, 'DOM element that captures keyboard input'],
+
+ ['encrypt', 'rw', 'bool', false, 'Use TLS/SSL/wss encryption'],
+ ['true_color', 'rw', 'bool', true, 'Request true color pixel data'],
+ ['local_cursor', 'rw', 'bool', false, 'Request locally rendered cursor'],
+ ['shared', 'rw', 'bool', true, 'Request shared mode'],
+ ['view_only', 'rw', 'bool', false, 'Disable client mouse/keyboard'],
+ ['xvp_password_sep', 'rw', 'str', '@', 'Separator for XVP password fields'],
+ ['disconnectTimeout', 'rw', 'int', 3, 'Time (s) to wait for disconnection'],
+
+ ['wsProtocols', 'rw', 'arr', ['binary', 'base64'],
+ 'Protocols to use in the WebSocket connection'],
+
+ // UltraVNC repeater ID to connect to
+ ['repeaterID', 'rw', 'str', '', 'RepeaterID to connect to'],
+
+ ['viewportDrag', 'rw', 'bool', false, 'Move the viewport on mouse drags'],
+
+ // Callback functions
+ ['onUpdateState', 'rw', 'func', function() { },
+ 'onUpdateState(rfb, state, oldstate, statusMsg): RFB state update/change '],
+ ['onPasswordRequired', 'rw', 'func', function() { },
+ 'onPasswordRequired(rfb): VNC password is required '],
+ ['onClipboard', 'rw', 'func', function() { },
+ 'onClipboard(rfb, text): RFB clipboard contents received'],
+ ['onBell', 'rw', 'func', function() { },
+ 'onBell(rfb): RFB Bell message received '],
+ ['onFBUReceive', 'rw', 'func', function() { },
+ 'onFBUReceive(rfb, fbu): RFB FBU received but not yet processed '],
+ ['onFBUComplete', 'rw', 'func', function() { },
+ 'onFBUComplete(rfb, fbu): RFB FBU received and processed '],
+ ['onFBResize', 'rw', 'func', function() { },
+ 'onFBResize(rfb, width, height): frame buffer resized'],
+ ['onDesktopName', 'rw', 'func', function() { },
+ 'onDesktopName(rfb, name): desktop name received'],
+ ['onXvpInit', 'rw', 'func', function() { },
+ 'onXvpInit(version): XVP extensions active for this connection'],
+
+ // These callback names are deprecated
+ ['updateState', 'rw', 'func', function() { },
+ 'obsolete, use onUpdateState'],
+ ['clipboardReceive', 'rw', 'func', function() { },
+ 'obsolete, use onClipboard']
+ ]);
+
+
+// Override/add some specific configuration getters/setters
+that.set_local_cursor = function(cursor) {
+ if ((!cursor) || (cursor in {'0':1, 'no':1, 'false':1})) {
+ conf.local_cursor = false;
+ } else {
+ if (display.get_cursor_uri()) {
+ conf.local_cursor = true;
+ } else {
+ Util.Warn("Browser does not support local cursor");
+ }
+ }
+};
+
+// These are fake configuration getters
+that.get_display = function() { return display; };
+
+that.get_keyboard = function() { return keyboard; };
+
+that.get_mouse = function() { return mouse; };
+
+
+
+//
+// Setup routines
+//
+
+// Create the public API interface and initialize values that stay
+// constant across connect/disconnect
+function constructor() {
+ var i, rmode;
+ Util.Debug(">> RFB.constructor");
+
+ // Create lookup tables based encoding number
+ for (i=0; i < encodings.length; i+=1) {
+ encHandlers[encodings[i][1]] = encHandlers[encodings[i][0]];
+ encNames[encodings[i][1]] = encodings[i][0];
+ encStats[encodings[i][1]] = [0, 0];
+ }
+ // Initialize display, mouse, keyboard, and websock
+ try {
+ display = new Display({'target': conf.target});
+ } catch (exc) {
+ Util.Error("Display exception: " + exc);
+ updateState('fatal', "No working Display");
+ }
+ keyboard = new Keyboard({'target': conf.focusContainer,
+ 'onKeyPress': keyPress});
+ mouse = new Mouse({'target': conf.target,
+ 'onMouseButton': mouseButton,
+ 'onMouseMove': mouseMove,
+ 'notify': keyboard.sync});
+
+ rmode = display.get_render_mode();
+
+ ws = new Websock();
+ ws.on('message', handle_message);
+ ws.on('open', function() {
+ if (rfb_state === "connect") {
+ updateState('ProtocolVersion', "Starting VNC handshake");
+ } else {
+ fail("Got unexpected WebSockets connection");
+ }
+ });
+ ws.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 (rfb_state === 'disconnect') {
+ updateState('disconnected', 'VNC disconnected' + msg);
+ } else if (rfb_state === 'ProtocolVersion') {
+ fail('Failed to connect to server' + msg);
+ } else if (rfb_state in {'failed':1, 'disconnected':1}) {
+ Util.Error("Received onclose while disconnected" + msg);
+ } else {
+ fail('Server disconnected' + msg);
+ }
+ });
+ ws.on('error', function(e) {
+ Util.Warn("WebSocket on-error event");
+ //fail("WebSock reported an error");
+ });
+
+
+ init_vars();
+
+ /* Check web-socket-js if no builtin WebSocket support */
+ if (Websock_native) {
+ Util.Info("Using native WebSockets");
+ 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)) {
+ updateState('fatal', "WebSockets or Adobe Flash<\/a> is required");
+ } else if (document.location.href.substr(0, 7) === "file://") {
+ updateState('fatal',
+ "'file://' URL is incompatible with Adobe Flash");
+ } else {
+ updateState('loaded', 'noVNC ready: WebSockets emulation, ' + rmode);
+ }
+ }
+
+ Util.Debug("<< RFB.constructor");
+ return that; // Return the public API interface
+}
+
+function connect() {
+ Util.Debug(">> RFB.connect");
+ var uri;
+
+ if (typeof UsingSocketIO !== "undefined") {
+ uri = "http";
+ } else {
+ uri = conf.encrypt ? "wss" : "ws";
+ }
+ uri += "://" + rfb_host + ":" + rfb_port + "/" + rfb_path;
+ Util.Info("connecting to " + uri);
+
+ ws.open(uri, conf.wsProtocols);
+
+ Util.Debug("<< RFB.connect");
+}
+
+// Initialize variables that are reset before each connection
+init_vars = function() {
+ var i;
+
+ /* Reset state */
+ ws.init();
+
+ FBU.rects = 0;
+ FBU.subrects = 0; // RRE and HEXTILE
+ FBU.lines = 0; // RAW
+ FBU.tiles = 0; // HEXTILE
+ FBU.zlibs = []; // TIGHT zlib encoders
+ mouse_buttonMask = 0;
+ mouse_arr = [];
+
+ // Clear the per connection encoding stats
+ for (i=0; i < encodings.length; i+=1) {
+ encStats[encodings[i][1]][0] = 0;
+ }
+
+ for (i=0; i < 4; i++) {
+ //FBU.zlibs[i] = new InflateStream();
+ FBU.zlibs[i] = new TINF();
+ FBU.zlibs[i].init();
+ }
+};
+
+// Print statistics
+print_stats = function() {
+ var i, s;
+ Util.Info("Encoding stats for this connection:");
+ for (i=0; i < encodings.length; i+=1) {
+ s = encStats[encodings[i][1]];
+ if ((s[0] + s[1]) > 0) {
+ Util.Info(" " + encodings[i][0] + ": " +
+ s[0] + " rects");
+ }
+ }
+ Util.Info("Encoding stats since page load:");
+ for (i=0; i < encodings.length; i+=1) {
+ s = encStats[encodings[i][1]];
+ if ((s[0] + s[1]) > 0) {
+ Util.Info(" " + encodings[i][0] + ": " +
+ s[1] + " rects");
+ }
+ }
+};
+
+//
+// Utility routines
+//
+
+
+/*
+ * 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 func, cmsg, oldstate = rfb_state;
+
+ if (state === oldstate) {
+ /* Already here, ignore */
+ Util.Debug("Already in state '" + state + "', ignoring.");
+ return;
+ }
+
+ /*
+ * 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 (sendTimer) {
+ clearInterval(sendTimer);
+ sendTimer = null;
+ }
+
+ if (msgTimer) {
+ clearTimeout(msgTimer);
+ msgTimer = null;
+ }
+
+ if (display && display.get_context()) {
+ keyboard.ungrab();
+ mouse.ungrab();
+ display.defaultCursor();
+ if ((Util.get_logging() !== 'debug') ||
+ (state === 'loaded')) {
+ // Show noVNC logo on load and when disconnected if
+ // debug is off
+ display.clear();
+ }
+ }
+
+ ws.close();
+ }
+
+ if (oldstate === 'fatal') {
+ Util.Error("Fatal error, cannot continue");
+ }
+
+ if ((state === 'failed') || (state === 'fatal')) {
+ func = Util.Error;
+ } else {
+ func = Util.Warn;
+ }
+
+ cmsg = typeof(statusMsg) !== 'undefined' ? (" Msg: " + statusMsg) : "";
+ func("New state '" + state + "', was '" + oldstate + "'." + cmsg);
+
+ if ((oldstate === 'failed') && (state === 'disconnected')) {
+ // Do disconnect action, but stay in failed state
+ rfb_state = 'failed';
+ } else {
+ rfb_state = state;
+ }
+
+ if (disconnTimer && (rfb_state !== 'disconnect')) {
+ Util.Debug("Clearing disconnect timer");
+ clearTimeout(disconnTimer);
+ disconnTimer = null;
+ }
+
+ switch (state) {
+ case 'normal':
+ if ((oldstate === 'disconnected') || (oldstate === 'failed')) {
+ Util.Error("Invalid transition from 'disconnected' or 'failed' to 'normal'");
+ }
+
+ break;
+
+
+ case 'connect':
+
+ init_vars();
+ connect();
+
+ // WebSocket.onopen transitions to 'ProtocolVersion'
+ break;
+
+
+ case 'disconnect':
+
+ if (! test_mode) {
+ disconnTimer = setTimeout(function () {
+ fail("Disconnect timeout");
+ }, conf.disconnectTimeout * 1000);
+ }
+
+ print_stats();
+
+ // WebSocket.onclose transitions to 'disconnected'
+ break;
+
+
+ case 'failed':
+ if (oldstate === 'disconnected') {
+ Util.Error("Invalid transition from 'disconnected' to 'failed'");
+ }
+ if (oldstate === 'normal') {
+ Util.Error("Error while connected.");
+ }
+ if (oldstate === 'init') {
+ Util.Error("Error while initializing.");
+ }
+
+ // Make sure we transition to disconnected
+ setTimeout(function() { updateState('disconnected'); }, 50);
+
+ break;
+
+
+ default:
+ // No state change action to take
+
+ }
+
+ if ((oldstate === 'failed') && (state === 'disconnected')) {
+ // Leave the failed message
+ conf.updateState(that, state, oldstate); // Obsolete
+ conf.onUpdateState(that, state, oldstate);
+ } else {
+ conf.updateState(that, state, oldstate, statusMsg); // Obsolete
+ conf.onUpdateState(that, state, oldstate, statusMsg);
+ }
+};
+
+fail = function(msg) {
+ updateState('failed', msg);
+ return false;
+};
+
+handle_message = function() {
+ //Util.Debug(">> handle_message ws.rQlen(): " + ws.rQlen());
+ //Util.Debug("ws.rQslice(0,20): " + ws.rQslice(0,20) + " (" + ws.rQlen() + ")");
+ if (ws.rQlen() === 0) {
+ Util.Warn("handle_message called on empty receive queue");
+ return;
+ }
+ switch (rfb_state) {
+ case 'disconnected':
+ case 'failed':
+ Util.Error("Got data while disconnected");
+ break;
+ case 'normal':
+ if (normal_msg() && ws.rQlen() > 0) {
+ // true means we can continue processing
+ // Give other events a chance to run
+ if (msgTimer === null) {
+ Util.Debug("More data to process, creating timer");
+ msgTimer = setTimeout(function () {
+ msgTimer = null;
+ handle_message();
+ }, 10);
+ } else {
+ Util.Debug("More data to process, existing timer");
+ }
+ }
+ break;
+ default:
+ init_msg();
+ break;
+ }
+};
+
+
+function genDES(password, challenge) {
+ var i, passwd = [];
+ for (i=0; i < password.length; i += 1) {
+ passwd.push(password.charCodeAt(i));
+ }
+ return (new DES(passwd)).encrypt(challenge);
+}
+
+// overridable for testing
+checkEvents = function() {
+ if (rfb_state === 'normal' && !viewportDragging && mouse_arr.length > 0) {
+ ws.send(mouse_arr);
+ mouse_arr = [];
+ }
+};
+
+keyPress = function(keysym, down) {
+ if (conf.view_only) { return; } // View only, skip keyboard events
+
+ ws.send(keyEvent(keysym, down));
+};
+
+mouseButton = function(x, y, down, bmask) {
+ if (down) {
+ mouse_buttonMask |= bmask;
+ } else {
+ mouse_buttonMask ^= bmask;
+ }
+
+ if (conf.viewportDrag) {
+ if (down && !viewportDragging) {
+ viewportDragging = true;
+ viewportDragPos = {'x': x, 'y': y};
+
+ // Skip sending mouse events
+ return;
+ } else {
+ viewportDragging = false;
+ }
+ }
+
+ if (conf.view_only) { return; } // View only, skip mouse events
+
+ mouse_arr = mouse_arr.concat(
+ pointerEvent(display.absX(x), display.absY(y)) );
+ ws.send(mouse_arr);
+ mouse_arr = [];
+};
+
+mouseMove = function(x, y) {
+ //Util.Debug('>> mouseMove ' + x + "," + y);
+ var deltaX, deltaY;
+
+ if (viewportDragging) {
+ //deltaX = x - viewportDragPos.x; // drag viewport
+ deltaX = viewportDragPos.x - x; // drag frame buffer
+ //deltaY = y - viewportDragPos.y; // drag viewport
+ deltaY = viewportDragPos.y - y; // drag frame buffer
+ viewportDragPos = {'x': x, 'y': y};
+
+ display.viewportChange(deltaX, deltaY);
+
+ // Skip sending mouse events
+ return;
+ }
+
+ if (conf.view_only) { return; } // View only, skip mouse events
+
+ mouse_arr = mouse_arr.concat(
+ pointerEvent(display.absX(x), display.absY(y)));
+
+ checkEvents();
+};
+
+
+//
+// Server message handlers
+//
+
+// RFB/VNC initialisation message handler
+init_msg = function() {
+ //Util.Debug(">> init_msg [rfb_state '" + rfb_state + "']");
+
+ var strlen, reason, length, sversion, cversion, repeaterID,
+ i, types, num_types, challenge, response, bpp, depth,
+ big_endian, red_max, green_max, blue_max, red_shift,
+ green_shift, blue_shift, true_color, name_length, is_repeater,
+ xvp_sep, xvp_auth, xvp_auth_str;
+
+ //Util.Debug("ws.rQ (" + ws.rQlen() + ") " + ws.rQslice(0));
+ switch (rfb_state) {
+
+ case 'ProtocolVersion' :
+ if (ws.rQlen() < 12) {
+ return fail("Incomplete protocol version");
+ }
+ sversion = ws.rQshiftStr(12).substr(4,7);
+ Util.Info("Server ProtocolVersion: " + sversion);
+ is_repeater = 0;
+ switch (sversion) {
+ case "000.000": is_repeater = 1; break; // UltraVNC repeater
+ case "003.003": rfb_version = 3.3; break;
+ case "003.006": rfb_version = 3.3; break; // UltraVNC
+ case "003.889": rfb_version = 3.3; break; // Apple Remote Desktop
+ case "003.007": rfb_version = 3.7; break;
+ case "003.008": rfb_version = 3.8; break;
+ case "004.000": rfb_version = 3.8; break; // Intel AMT KVM
+ case "004.001": rfb_version = 3.8; break; // RealVNC 4.6
+ default:
+ return fail("Invalid server version " + sversion);
+ }
+ if (is_repeater) {
+ repeaterID = conf.repeaterID;
+ while (repeaterID.length < 250) {
+ repeaterID += "\0";
+ }
+ ws.send_string(repeaterID);
+ break;
+ }
+ if (rfb_version > rfb_max_version) {
+ rfb_version = rfb_max_version;
+ }
+
+ if (! test_mode) {
+ sendTimer = setInterval(function() {
+ // Send updates either at a rate of one update
+ // every 50ms, or whatever slower rate the network
+ // can handle.
+ ws.flush();
+ }, 50);
+ }
+
+ cversion = "00" + parseInt(rfb_version,10) +
+ ".00" + ((rfb_version * 10) % 10);
+ ws.send_string("RFB " + cversion + "\n");
+ updateState('Security', "Sent ProtocolVersion: " + cversion);
+ break;
+
+ case 'Security' :
+ if (rfb_version >= 3.7) {
+ // Server sends supported list, client decides
+ num_types = ws.rQshift8();
+ if (ws.rQwait("security type", num_types, 1)) { return false; }
+ if (num_types === 0) {
+ strlen = ws.rQshift32();
+ reason = ws.rQshiftStr(strlen);
+ return fail("Security failure: " + reason);
+ }
+ rfb_auth_scheme = 0;
+ types = ws.rQshiftBytes(num_types);
+ Util.Debug("Server security types: " + types);
+ for (i=0; i < types.length; i+=1) {
+ if ((types[i] > rfb_auth_scheme) && (types[i] <= 16 || types[i] == 22)) {
+ rfb_auth_scheme = types[i];
+ }
+ }
+ if (rfb_auth_scheme === 0) {
+ return fail("Unsupported security types: " + types);
+ }
+
+ ws.send([rfb_auth_scheme]);
+ } else {
+ // Server decides
+ if (ws.rQwait("security scheme", 4)) { return false; }
+ rfb_auth_scheme = ws.rQshift32();
+ }
+ updateState('Authentication',
+ "Authenticating using scheme: " + rfb_auth_scheme);
+ init_msg(); // Recursive fallthrough (workaround JSLint complaint)
+ break;
+
+ // Triggered by fallthough, not by server message
+ case 'Authentication' :
+ //Util.Debug("Security auth scheme: " + rfb_auth_scheme);
+ switch (rfb_auth_scheme) {
+ case 0: // connection failed
+ if (ws.rQwait("auth reason", 4)) { return false; }
+ strlen = ws.rQshift32();
+ reason = ws.rQshiftStr(strlen);
+ return fail("Auth failure: " + reason);
+ case 1: // no authentication
+ if (rfb_version >= 3.8) {
+ updateState('SecurityResult');
+ return;
+ }
+ // Fall through to ClientInitialisation
+ break;
+ case 22: // XVP authentication
+ xvp_sep = conf.xvp_password_sep;
+ xvp_auth = rfb_password.split(xvp_sep);
+ if (xvp_auth.length < 3) {
+ updateState('password', "XVP credentials required (user" + xvp_sep +
+ "target" + xvp_sep + "password) -- got only " + rfb_password);
+ conf.onPasswordRequired(that);
+ return;
+ }
+ xvp_auth_str = String.fromCharCode(xvp_auth[0].length) +
+ String.fromCharCode(xvp_auth[1].length) +
+ xvp_auth[0] +
+ xvp_auth[1];
+ ws.send_string(xvp_auth_str);
+ rfb_password = xvp_auth.slice(2).join(xvp_sep);
+ rfb_auth_scheme = 2;
+ // Fall through to standard VNC authentication with remaining part of password
+ case 2: // VNC authentication
+ if (rfb_password.length === 0) {
+ // Notify via both callbacks since it is kind of
+ // a RFB state change and a UI interface issue.
+ updateState('password', "Password Required");
+ conf.onPasswordRequired(that);
+ return;
+ }
+ if (ws.rQwait("auth challenge", 16)) { return false; }
+ challenge = ws.rQshiftBytes(16);
+ //Util.Debug("Password: " + rfb_password);
+ //Util.Debug("Challenge: " + challenge +
+ // " (" + challenge.length + ")");
+ response = genDES(rfb_password, challenge);
+ //Util.Debug("Response: " + response +
+ // " (" + response.length + ")");
+
+ //Util.Debug("Sending DES encrypted auth response");
+ ws.send(response);
+ updateState('SecurityResult');
+ return;
+ case 16: // TightVNC Security Type
+ if (ws.rQwait("num tunnels", 4)) { return false; }
+ var numTunnels = ws.rQshift32();
+ //console.log("Number of tunnels: "+numTunnels);
+
+ rfb_tightvnc = true;
+
+ if (numTunnels != 0)
+ {
+ fail("Protocol requested tunnels, not currently supported. numTunnels: " + numTunnels);
+ return;
+ }
+
+ var clientSupportedTypes = {
+ 'STDVNOAUTH__': 1,
+ 'STDVVNCAUTH_': 2
+ };
+
+ var serverSupportedTypes = [];
+
+ if (ws.rQwait("sub auth count", 4)) { return false; }
+ var subAuthCount = ws.rQshift32();
+ //console.log("Sub auth count: "+subAuthCount);
+ for (var i=0;i= 3.8) {
+ length = ws.rQshift32();
+ if (ws.rQwait("SecurityResult reason", length, 8)) {
+ return false;
+ }
+ reason = ws.rQshiftStr(length);
+ fail(reason);
+ } else {
+ fail("Authentication failed");
+ }
+ return;
+ case 2: // too-many
+ return fail("Too many auth attempts");
+ }
+ updateState('ClientInitialisation', "Authentication OK");
+ init_msg(); // Recursive fallthrough (workaround JSLint complaint)
+ break;
+
+ // Triggered by fallthough, not by server message
+ case 'ClientInitialisation' :
+ ws.send([conf.shared ? 1 : 0]); // ClientInitialisation
+ updateState('ServerInitialisation', "Authentication OK");
+ break;
+
+ case 'ServerInitialisation' :
+ if (ws.rQwait("server initialization", 24)) { return false; }
+
+ /* Screen size */
+ fb_width = ws.rQshift16();
+ fb_height = ws.rQshift16();
+
+ /* PIXEL_FORMAT */
+ bpp = ws.rQshift8();
+ depth = ws.rQshift8();
+ big_endian = ws.rQshift8();
+ true_color = ws.rQshift8();
+
+ red_max = ws.rQshift16();
+ green_max = ws.rQshift16();
+ blue_max = ws.rQshift16();
+ red_shift = ws.rQshift8();
+ green_shift = ws.rQshift8();
+ blue_shift = ws.rQshift8();
+ ws.rQshiftStr(3); // padding
+
+ Util.Info("Screen: " + fb_width + "x" + 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");
+ }
+
+ /* Connection name/title */
+ name_length = ws.rQshift32();
+ fb_name = Util.decodeUTF8(ws.rQshiftStr(name_length));
+ conf.onDesktopName(that, fb_name);
+
+ if (conf.true_color && fb_name === "Intel(r) AMT KVM")
+ {
+ Util.Warn("Intel AMT KVM only support 8/16 bit depths. Disabling true color");
+ conf.true_color = false;
+ }
+
+ if (rfb_tightvnc)
+ {
+ // In TightVNC mode, ServerInit message is extended
+ var numServerMessages = ws.rQshift16();
+ var numClientMessages = ws.rQshift16();
+ var numEncodings = ws.rQshift16();
+ ws.rQshift16(); // padding
+ //console.log("numServerMessages "+numServerMessages);
+ //console.log("numClientMessages "+numClientMessages);
+ //console.log("numEncodings "+numEncodings);
+
+ for (var i=0;i> normal_msg");
+
+ var ret = true, msg_type, length, text,
+ c, first_colour, num_colours, red, green, blue,
+ xvp_ver, xvp_msg;
+
+ if (FBU.rects > 0) {
+ msg_type = 0;
+ } else {
+ msg_type = ws.rQshift8();
+ }
+ switch (msg_type) {
+ case 0: // FramebufferUpdate
+ ret = framebufferUpdate(); // false means need more data
+ if (ret) {
+ // only allow one outstanding fbu-request at a time
+ ws.send(fbUpdateRequests());
+ }
+ break;
+ case 1: // SetColourMapEntries
+ Util.Debug("SetColourMapEntries");
+ ws.rQshift8(); // Padding
+ first_colour = ws.rQshift16(); // First colour
+ num_colours = ws.rQshift16();
+ if (ws.rQwait("SetColourMapEntries", num_colours*6, 6)) { return false; }
+
+ for (c=0; c < num_colours; c+=1) {
+ red = ws.rQshift16();
+ //Util.Debug("red before: " + red);
+ red = parseInt(red / 256, 10);
+ //Util.Debug("red after: " + red);
+ green = parseInt(ws.rQshift16() / 256, 10);
+ blue = parseInt(ws.rQshift16() / 256, 10);
+ display.set_colourMap([blue, green, red], first_colour + c);
+ }
+ Util.Debug("colourMap: " + display.get_colourMap());
+ Util.Info("Registered " + num_colours + " colourMap entries");
+ //Util.Debug("colourMap: " + display.get_colourMap());
+ break;
+ case 2: // Bell
+ Util.Debug("Bell");
+ conf.onBell(that);
+ break;
+ case 3: // ServerCutText
+ Util.Debug("ServerCutText");
+ if (ws.rQwait("ServerCutText header", 7, 1)) { return false; }
+ ws.rQshiftBytes(3); // Padding
+ length = ws.rQshift32();
+ if (ws.rQwait("ServerCutText", length, 8)) { return false; }
+
+ text = ws.rQshiftStr(length);
+ conf.clipboardReceive(that, text); // Obsolete
+ conf.onClipboard(that, text);
+ break;
+ case 250: // XVP
+ ws.rQshift8(); // Padding
+ xvp_ver = ws.rQshift8();
+ xvp_msg = ws.rQshift8();
+ switch (xvp_msg) {
+ case 0: // XVP_FAIL
+ updateState(rfb_state, "Operation failed");
+ break;
+ case 1: // XVP_INIT
+ rfb_xvp_ver = xvp_ver;
+ Util.Info("XVP extensions enabled (version " + rfb_xvp_ver + ")");
+ conf.onXvpInit(rfb_xvp_ver);
+ break;
+ default:
+ fail("Disconnected: illegal server XVP message " + xvp_msg);
+ break;
+ }
+ break;
+ default:
+ fail("Disconnected: illegal server message type " + msg_type);
+ Util.Debug("ws.rQslice(0,30):" + ws.rQslice(0,30));
+ break;
+ }
+ //Util.Debug("<< normal_msg");
+ return ret;
+};
+
+framebufferUpdate = function() {
+ var now, hdr, fbu_rt_diff, ret = true;
+
+ if (FBU.rects === 0) {
+ //Util.Debug("New FBU: ws.rQslice(0,20): " + ws.rQslice(0,20));
+ if (ws.rQwait("FBU header", 3)) {
+ ws.rQunshift8(0); // FBU msg_type
+ return false;
+ }
+ ws.rQshift8(); // padding
+ FBU.rects = ws.rQshift16();
+ //Util.Debug("FramebufferUpdate, rects:" + FBU.rects);
+ FBU.bytes = 0;
+ timing.cur_fbu = 0;
+ if (timing.fbu_rt_start > 0) {
+ now = (new Date()).getTime();
+ Util.Info("First FBU latency: " + (now - timing.fbu_rt_start));
+ }
+ }
+
+ while (FBU.rects > 0) {
+ if (rfb_state !== "normal") {
+ return false;
+ }
+ if (ws.rQwait("FBU", FBU.bytes)) { return false; }
+ if (FBU.bytes === 0) {
+ if (ws.rQwait("rect header", 12)) { return false; }
+ /* New FramebufferUpdate */
+
+ hdr = ws.rQshiftBytes(12);
+ FBU.x = (hdr[0] << 8) + hdr[1];
+ FBU.y = (hdr[2] << 8) + hdr[3];
+ FBU.width = (hdr[4] << 8) + hdr[5];
+ FBU.height = (hdr[6] << 8) + hdr[7];
+ FBU.encoding = parseInt((hdr[8] << 24) + (hdr[9] << 16) +
+ (hdr[10] << 8) + hdr[11], 10);
+
+ conf.onFBUReceive(that,
+ {'x': FBU.x, 'y': FBU.y,
+ 'width': FBU.width, 'height': FBU.height,
+ 'encoding': FBU.encoding,
+ 'encodingName': encNames[FBU.encoding]});
+
+ if (encNames[FBU.encoding]) {
+ // Debug:
+ /*
+ var msg = "FramebufferUpdate rects:" + FBU.rects;
+ msg += " x: " + FBU.x + " y: " + FBU.y;
+ msg += " width: " + FBU.width + " height: " + FBU.height;
+ msg += " encoding:" + FBU.encoding;
+ msg += "(" + encNames[FBU.encoding] + ")";
+ msg += ", ws.rQlen(): " + ws.rQlen();
+ Util.Debug(msg);
+ */
+ } else {
+ fail("Disconnected: unsupported encoding " +
+ FBU.encoding);
+ return false;
+ }
+ }
+
+ timing.last_fbu = (new Date()).getTime();
+
+ ret = encHandlers[FBU.encoding]();
+
+ now = (new Date()).getTime();
+ timing.cur_fbu += (now - timing.last_fbu);
+
+ if (ret) {
+ encStats[FBU.encoding][0] += 1;
+ encStats[FBU.encoding][1] += 1;
+ timing.pixels += FBU.width * FBU.height;
+ }
+
+ if (timing.pixels >= (fb_width * fb_height)) {
+ if (((FBU.width === fb_width) &&
+ (FBU.height === fb_height)) ||
+ (timing.fbu_rt_start > 0)) {
+ timing.full_fbu_total += timing.cur_fbu;
+ timing.full_fbu_cnt += 1;
+ Util.Info("Timing of full FBU, cur: " +
+ timing.cur_fbu + ", total: " +
+ timing.full_fbu_total + ", cnt: " +
+ timing.full_fbu_cnt + ", avg: " +
+ (timing.full_fbu_total /
+ timing.full_fbu_cnt));
+ }
+ if (timing.fbu_rt_start > 0) {
+ fbu_rt_diff = now - timing.fbu_rt_start;
+ timing.fbu_rt_total += fbu_rt_diff;
+ timing.fbu_rt_cnt += 1;
+ Util.Info("full FBU round-trip, cur: " +
+ fbu_rt_diff + ", total: " +
+ timing.fbu_rt_total + ", cnt: " +
+ timing.fbu_rt_cnt + ", avg: " +
+ (timing.fbu_rt_total /
+ timing.fbu_rt_cnt));
+ timing.fbu_rt_start = 0;
+ }
+ }
+ if (! ret) {
+ return ret; // false ret means need more data
+ }
+ }
+
+ conf.onFBUComplete(that,
+ {'x': FBU.x, 'y': FBU.y,
+ 'width': FBU.width, 'height': FBU.height,
+ 'encoding': FBU.encoding,
+ 'encodingName': encNames[FBU.encoding]});
+
+ return true; // We finished this FBU
+};
+
+//
+// FramebufferUpdate encodings
+//
+
+encHandlers.RAW = function display_raw() {
+ //Util.Debug(">> display_raw (" + ws.rQlen() + " bytes)");
+
+ var cur_y, cur_height;
+
+ if (FBU.lines === 0) {
+ FBU.lines = FBU.height;
+ }
+ FBU.bytes = FBU.width * fb_Bpp; // At least a line
+ if (ws.rQwait("RAW", FBU.bytes)) { return false; }
+ cur_y = FBU.y + (FBU.height - FBU.lines);
+ cur_height = Math.min(FBU.lines,
+ Math.floor(ws.rQlen()/(FBU.width * fb_Bpp)));
+ display.blitImage(FBU.x, cur_y, FBU.width, cur_height,
+ ws.get_rQ(), ws.get_rQi());
+ ws.rQshiftBytes(FBU.width * cur_height * fb_Bpp);
+ FBU.lines -= cur_height;
+
+ if (FBU.lines > 0) {
+ FBU.bytes = FBU.width * fb_Bpp; // At least another line
+ } else {
+ FBU.rects -= 1;
+ FBU.bytes = 0;
+ }
+ //Util.Debug("<< display_raw (" + ws.rQlen() + " bytes)");
+ return true;
+};
+
+encHandlers.COPYRECT = function display_copy_rect() {
+ //Util.Debug(">> display_copy_rect");
+
+ var old_x, old_y;
+
+ FBU.bytes = 4;
+ if (ws.rQwait("COPYRECT", 4)) { return false; }
+ display.renderQ_push({
+ 'type': 'copy',
+ 'old_x': ws.rQshift16(),
+ 'old_y': ws.rQshift16(),
+ 'x': FBU.x,
+ 'y': FBU.y,
+ 'width': FBU.width,
+ 'height': FBU.height});
+ FBU.rects -= 1;
+ FBU.bytes = 0;
+ return true;
+};
+
+encHandlers.RRE = function display_rre() {
+ //Util.Debug(">> display_rre (" + ws.rQlen() + " bytes)");
+ var color, x, y, width, height, chunk;
+
+ if (FBU.subrects === 0) {
+ FBU.bytes = 4+fb_Bpp;
+ if (ws.rQwait("RRE", 4+fb_Bpp)) { return false; }
+ FBU.subrects = ws.rQshift32();
+ color = ws.rQshiftBytes(fb_Bpp); // Background
+ display.fillRect(FBU.x, FBU.y, FBU.width, FBU.height, color);
+ }
+ while ((FBU.subrects > 0) && (ws.rQlen() >= (fb_Bpp + 8))) {
+ color = ws.rQshiftBytes(fb_Bpp);
+ x = ws.rQshift16();
+ y = ws.rQshift16();
+ width = ws.rQshift16();
+ height = ws.rQshift16();
+ display.fillRect(FBU.x + x, FBU.y + y, width, height, color);
+ FBU.subrects -= 1;
+ }
+ //Util.Debug(" display_rre: rects: " + FBU.rects +
+ // ", FBU.subrects: " + FBU.subrects);
+
+ if (FBU.subrects > 0) {
+ chunk = Math.min(rre_chunk_sz, FBU.subrects);
+ FBU.bytes = (fb_Bpp + 8) * chunk;
+ } else {
+ FBU.rects -= 1;
+ FBU.bytes = 0;
+ }
+ //Util.Debug("<< display_rre, FBU.bytes: " + FBU.bytes);
+ return true;
+};
+
+encHandlers.HEXTILE = function display_hextile() {
+ //Util.Debug(">> display_hextile");
+ var subencoding, subrects, color, cur_tile,
+ tile_x, x, w, tile_y, y, h, xy, s, sx, sy, wh, sw, sh,
+ rQ = ws.get_rQ(), rQi = ws.get_rQi();
+
+ if (FBU.tiles === 0) {
+ FBU.tiles_x = Math.ceil(FBU.width/16);
+ FBU.tiles_y = Math.ceil(FBU.height/16);
+ FBU.total_tiles = FBU.tiles_x * FBU.tiles_y;
+ FBU.tiles = FBU.total_tiles;
+ }
+
+ /* FBU.bytes comes in as 1, ws.rQlen() at least 1 */
+ while (FBU.tiles > 0) {
+ FBU.bytes = 1;
+ if (ws.rQwait("HEXTILE subencoding", FBU.bytes)) { return false; }
+ subencoding = rQ[rQi]; // Peek
+ if (subencoding > 30) { // Raw
+ fail("Disconnected: illegal hextile subencoding " + subencoding);
+ //Util.Debug("ws.rQslice(0,30):" + ws.rQslice(0,30));
+ return false;
+ }
+ subrects = 0;
+ cur_tile = FBU.total_tiles - FBU.tiles;
+ tile_x = cur_tile % FBU.tiles_x;
+ tile_y = Math.floor(cur_tile / FBU.tiles_x);
+ x = FBU.x + tile_x * 16;
+ y = FBU.y + tile_y * 16;
+ w = Math.min(16, (FBU.x + FBU.width) - x);
+ h = Math.min(16, (FBU.y + FBU.height) - y);
+
+ /* Figure out how much we are expecting */
+ if (subencoding & 0x01) { // Raw
+ //Util.Debug(" Raw subencoding");
+ FBU.bytes += w * h * fb_Bpp;
+ } else {
+ if (subencoding & 0x02) { // Background
+ FBU.bytes += fb_Bpp;
+ }
+ if (subencoding & 0x04) { // Foreground
+ FBU.bytes += fb_Bpp;
+ }
+ if (subencoding & 0x08) { // AnySubrects
+ FBU.bytes += 1; // Since we aren't shifting it off
+ if (ws.rQwait("hextile subrects header", FBU.bytes)) { return false; }
+ subrects = rQ[rQi + FBU.bytes-1]; // Peek
+ if (subencoding & 0x10) { // SubrectsColoured
+ FBU.bytes += subrects * (fb_Bpp + 2);
+ } else {
+ FBU.bytes += subrects * 2;
+ }
+ }
+ }
+
+ /*
+ Util.Debug(" tile:" + cur_tile + "/" + (FBU.total_tiles - 1) +
+ " (" + tile_x + "," + tile_y + ")" +
+ " [" + x + "," + y + "]@" + w + "x" + h +
+ ", subenc:" + subencoding +
+ "(last: " + FBU.lastsubencoding + "), subrects:" +
+ subrects +
+ ", ws.rQlen():" + ws.rQlen() + ", FBU.bytes:" + FBU.bytes +
+ " last:" + ws.rQslice(FBU.bytes-10, FBU.bytes) +
+ " next:" + ws.rQslice(FBU.bytes-1, FBU.bytes+10));
+ */
+ if (ws.rQwait("hextile", FBU.bytes)) { return false; }
+
+ /* We know the encoding and have a whole tile */
+ FBU.subencoding = rQ[rQi];
+ rQi += 1;
+ if (FBU.subencoding === 0) {
+ if (FBU.lastsubencoding & 0x01) {
+ /* Weird: ignore blanks after RAW */
+ Util.Debug(" Ignoring blank after RAW");
+ } else {
+ display.fillRect(x, y, w, h, FBU.background);
+ }
+ } else if (FBU.subencoding & 0x01) { // Raw
+ display.blitImage(x, y, w, h, rQ, rQi);
+ rQi += FBU.bytes - 1;
+ } else {
+ if (FBU.subencoding & 0x02) { // Background
+ FBU.background = rQ.slice(rQi, rQi + fb_Bpp);
+ rQi += fb_Bpp;
+ }
+ if (FBU.subencoding & 0x04) { // Foreground
+ FBU.foreground = rQ.slice(rQi, rQi + fb_Bpp);
+ rQi += fb_Bpp;
+ }
+
+ display.startTile(x, y, w, h, FBU.background);
+ if (FBU.subencoding & 0x08) { // AnySubrects
+ subrects = rQ[rQi];
+ rQi += 1;
+ for (s = 0; s < subrects; s += 1) {
+ if (FBU.subencoding & 0x10) { // SubrectsColoured
+ color = rQ.slice(rQi, rQi + fb_Bpp);
+ rQi += fb_Bpp;
+ } else {
+ color = FBU.foreground;
+ }
+ xy = rQ[rQi];
+ rQi += 1;
+ sx = (xy >> 4);
+ sy = (xy & 0x0f);
+
+ wh = rQ[rQi];
+ rQi += 1;
+ sw = (wh >> 4) + 1;
+ sh = (wh & 0x0f) + 1;
+
+ display.subTile(sx, sy, sw, sh, color);
+ }
+ }
+ display.finishTile();
+ }
+ ws.set_rQi(rQi);
+ FBU.lastsubencoding = FBU.subencoding;
+ FBU.bytes = 0;
+ FBU.tiles -= 1;
+ }
+
+ if (FBU.tiles === 0) {
+ FBU.rects -= 1;
+ }
+
+ //Util.Debug("<< display_hextile");
+ return true;
+};
+
+
+// Get 'compact length' header and data size
+getTightCLength = function (arr) {
+ var header = 1, data = 0;
+ data += arr[0] & 0x7f;
+ if (arr[0] & 0x80) {
+ header += 1;
+ data += (arr[1] & 0x7f) << 7;
+ if (arr[1] & 0x80) {
+ header += 1;
+ data += arr[2] << 14;
+ }
+ }
+ return [header, data];
+};
+
+function display_tight(isTightPNG) {
+ //Util.Debug(">> display_tight");
+
+ if (fb_depth === 1) {
+ fail("Tight protocol handler only implements true color mode");
+ }
+
+ var ctl, cmode, clength, color, img, data;
+ var filterId = -1, resetStreams = 0, streamId = -1;
+ var rQ = ws.get_rQ(), rQi = ws.get_rQi();
+
+ FBU.bytes = 1; // compression-control byte
+ if (ws.rQwait("TIGHT compression-control", FBU.bytes)) { return false; }
+
+ var checksum = function(data) {
+ var sum=0, i;
+ for (i=0; i 65536) sum -= 65536;
+ }
+ return sum;
+ }
+
+ var decompress = function(data) {
+ for (var i=0; i<4; i++) {
+ if ((resetStreams >> i) & 1) {
+ FBU.zlibs[i].reset();
+ Util.Info("Reset zlib stream " + i);
+ }
+ }
+ var uncompressed = FBU.zlibs[streamId].uncompress(data, 0);
+ if (uncompressed.status !== 0) {
+ Util.Error("Invalid data in zlib stream");
+ }
+ //Util.Warn("Decompressed " + data.length + " to " +
+ // uncompressed.data.length + " checksums " +
+ // checksum(data) + ":" + checksum(uncompressed.data));
+
+ return uncompressed.data;
+ }
+
+ 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, b, w, w1, dp, sp;
+ if (numColors === 2) {
+ w = Math.floor((width + 7) / 8);
+ w1 = Math.floor(width / 8);
+ for (y = 0; y < height; y++) {
+ 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;
+ };
+ var handlePalette = function() {
+ var numColors = rQ[rQi + 2] + 1;
+ var paletteSize = numColors * fb_depth;
+ FBU.bytes += paletteSize;
+ if (ws.rQwait("TIGHT palette " + cmode, FBU.bytes)) { return false; }
+
+ var bpp = (numColors <= 2) ? 1 : 8;
+ var rowSize = Math.floor((FBU.width * bpp + 7) / 8);
+ var raw = false;
+ if (rowSize * FBU.height < 12) {
+ raw = true;
+ clength = [0, rowSize * FBU.height];
+ } else {
+ clength = getTightCLength(ws.rQslice(3 + paletteSize,
+ 3 + paletteSize + 3));
+ }
+ FBU.bytes += clength[0] + clength[1];
+ if (ws.rQwait("TIGHT " + cmode, FBU.bytes)) { return false; }
+
+ // Shift ctl, filter id, num colors, palette entries, and clength off
+ ws.rQshiftBytes(3);
+ var palette = ws.rQshiftBytes(paletteSize);
+ ws.rQshiftBytes(clength[0]);
+
+ if (raw) {
+ data = ws.rQshiftBytes(clength[1]);
+ } else {
+ data = decompress(ws.rQshiftBytes(clength[1]));
+ }
+
+ // Convert indexed (palette based) image data to RGB
+ var rgb = indexedToRGB(data, numColors, palette, FBU.width, FBU.height);
+
+ // Add it to the render queue
+ display.renderQ_push({
+ 'type': 'blitRgb',
+ 'data': rgb,
+ 'x': FBU.x,
+ 'y': FBU.y,
+ 'width': FBU.width,
+ 'height': FBU.height});
+ return true;
+ }
+
+ var handleCopy = function() {
+ var raw = false;
+ var uncompressedSize = FBU.width * FBU.height * fb_depth;
+ if (uncompressedSize < 12) {
+ raw = true;
+ clength = [0, uncompressedSize];
+ } else {
+ clength = getTightCLength(ws.rQslice(1, 4));
+ }
+ FBU.bytes = 1 + clength[0] + clength[1];
+ if (ws.rQwait("TIGHT " + cmode, FBU.bytes)) { return false; }
+
+ // Shift ctl, clength off
+ ws.rQshiftBytes(1 + clength[0]);
+
+ if (raw) {
+ data = ws.rQshiftBytes(clength[1]);
+ } else {
+ data = decompress(ws.rQshiftBytes(clength[1]));
+ }
+
+ display.renderQ_push({
+ 'type': 'blitRgb',
+ 'data': data,
+ 'x': FBU.x,
+ 'y': FBU.y,
+ 'width': FBU.width,
+ 'height': FBU.height});
+ return true;
+ }
+
+ ctl = ws.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 fail("Illegal tight compression received, ctl: " + ctl);
+
+ if (isTightPNG && (cmode === "filter" || cmode === "copy")) {
+ return fail("filter/copy received in tightPNG mode");
+ }
+
+ switch (cmode) {
+ // fill uses fb_depth because TPIXELs drop the padding byte
+ case "fill": FBU.bytes += fb_depth; break; // TPIXEL
+ case "jpeg": FBU.bytes += 3; break; // max clength
+ case "png": FBU.bytes += 3; break; // max clength
+ case "filter": FBU.bytes += 2; break; // filter id + num colors if palette
+ case "copy": break;
+ }
+
+ if (ws.rQwait("TIGHT " + cmode, FBU.bytes)) { return false; }
+
+ //Util.Debug(" ws.rQslice(0,20): " + ws.rQslice(0,20) + " (" + ws.rQlen() + ")");
+ //Util.Debug(" cmode: " + cmode);
+
+ // Determine FBU.bytes
+ switch (cmode) {
+ case "fill":
+ ws.rQshift8(); // shift off ctl
+ color = ws.rQshiftBytes(fb_depth);
+ display.renderQ_push({
+ 'type': 'fill',
+ 'x': FBU.x,
+ 'y': FBU.y,
+ 'width': FBU.width,
+ 'height': FBU.height,
+ 'color': [color[2], color[1], color[0]] });
+ break;
+ case "png":
+ case "jpeg":
+ clength = getTightCLength(ws.rQslice(1, 4));
+ FBU.bytes = 1 + clength[0] + clength[1]; // ctl + clength size + jpeg-data
+ if (ws.rQwait("TIGHT " + cmode, FBU.bytes)) { return false; }
+
+ // We have everything, render it
+ //Util.Debug(" jpeg, ws.rQlen(): " + ws.rQlen() + ", clength[0]: " +
+ // clength[0] + ", clength[1]: " + clength[1]);
+ ws.rQshiftBytes(1 + clength[0]); // shift off ctl + compact length
+ img = new Image();
+ img.src = "data:image/" + cmode +
+ extract_data_uri(ws.rQshiftBytes(clength[1]));
+ display.renderQ_push({
+ 'type': 'img',
+ 'img': img,
+ 'x': FBU.x,
+ 'y': FBU.y});
+ img = null;
+ break;
+ case "filter":
+ 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 used if jpeg is enabled
+ throw("Unsupported tight subencoding received, filter: " + filterId);
+ }
+ break;
+ case "copy":
+ if (!handleCopy()) { return false; }
+ break;
+ }
+
+ FBU.bytes = 0;
+ FBU.rects -= 1;
+ //Util.Debug(" ending ws.rQslice(0,20): " + ws.rQslice(0,20) + " (" + ws.rQlen() + ")");
+ //Util.Debug("<< display_tight_png");
+ return true;
+}
+
+extract_data_uri = function(arr) {
+ //var i, stra = [];
+ //for (i=0; i< arr.length; i += 1) {
+ // stra.push(String.fromCharCode(arr[i]));
+ //}
+ //return "," + escape(stra.join(''));
+ return ";base64," + Base64.encode(arr);
+};
+
+encHandlers.TIGHT = function () { return display_tight(false); };
+encHandlers.TIGHT_PNG = function () { return display_tight(true); };
+
+encHandlers.last_rect = function last_rect() {
+ //Util.Debug(">> last_rect");
+ FBU.rects = 0;
+ //Util.Debug("<< last_rect");
+ return true;
+};
+
+encHandlers.DesktopSize = function set_desktopsize() {
+ Util.Debug(">> set_desktopsize");
+ fb_width = FBU.width;
+ fb_height = FBU.height;
+ conf.onFBResize(that, fb_width, fb_height);
+ display.resize(fb_width, fb_height);
+ timing.fbu_rt_start = (new Date()).getTime();
+
+ FBU.bytes = 0;
+ FBU.rects -= 1;
+
+ Util.Debug("<< set_desktopsize");
+ return true;
+};
+
+encHandlers.Cursor = function set_cursor() {
+ var x, y, w, h, pixelslength, masklength;
+ Util.Debug(">> set_cursor");
+ x = FBU.x; // hotspot-x
+ y = FBU.y; // hotspot-y
+ w = FBU.width;
+ h = FBU.height;
+
+ pixelslength = w * h * fb_Bpp;
+ masklength = Math.floor((w + 7) / 8) * h;
+
+ FBU.bytes = pixelslength + masklength;
+ if (ws.rQwait("cursor encoding", FBU.bytes)) { return false; }
+
+ //Util.Debug(" set_cursor, x: " + x + ", y: " + y + ", w: " + w + ", h: " + h);
+
+ display.changeCursor(ws.rQshiftBytes(pixelslength),
+ ws.rQshiftBytes(masklength),
+ x, y, w, h);
+
+ FBU.bytes = 0;
+ FBU.rects -= 1;
+
+ Util.Debug("<< set_cursor");
+ return true;
+};
+
+encHandlers.JPEG_quality_lo = function set_jpeg_quality() {
+ Util.Error("Server sent jpeg_quality pseudo-encoding");
+};
+
+encHandlers.compress_lo = function set_compress_level() {
+ Util.Error("Server sent compress level pseudo-encoding");
+};
+
+/*
+ * Client message routines
+ */
+
+pixelFormat = function() {
+ //Util.Debug(">> pixelFormat");
+ var arr;
+ arr = [0]; // msg-type
+ arr.push8(0); // padding
+ arr.push8(0); // padding
+ arr.push8(0); // padding
+
+ arr.push8(fb_Bpp * 8); // bits-per-pixel
+ arr.push8(fb_depth * 8); // depth
+ arr.push8(0); // little-endian
+ arr.push8(conf.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
+ //Util.Debug("<< pixelFormat");
+ return arr;
+};
+
+clientEncodings = function() {
+ //Util.Debug(">> clientEncodings");
+ var arr, i, encList = [];
+
+ for (i=0; i> fbUpdateRequest");
+ if (typeof(x) === "undefined") { x = 0; }
+ if (typeof(y) === "undefined") { y = 0; }
+ if (typeof(xw) === "undefined") { xw = fb_width; }
+ if (typeof(yw) === "undefined") { yw = fb_height; }
+ var arr;
+ arr = [3]; // msg-type
+ arr.push8(incremental);
+ arr.push16(x);
+ arr.push16(y);
+ arr.push16(xw);
+ arr.push16(yw);
+ //Util.Debug("<< fbUpdateRequest");
+ return arr;
+};
+
+// Based on clean/dirty areas, generate requests to send
+fbUpdateRequests = function() {
+ var cleanDirty = display.getCleanDirtyReset(),
+ arr = [], i, cb, db;
+
+ cb = cleanDirty.cleanBox;
+ if (cb.w > 0 && cb.h > 0) {
+ // Request incremental for clean box
+ arr = arr.concat(fbUpdateRequest(1, cb.x, cb.y, cb.w, cb.h));
+ }
+ for (i = 0; i < cleanDirty.dirtyBoxes.length; i++) {
+ db = cleanDirty.dirtyBoxes[i];
+ // Force all (non-incremental for dirty box
+ arr = arr.concat(fbUpdateRequest(0, db.x, db.y, db.w, db.h));
+ }
+ return arr;
+};
+
+
+
+keyEvent = function(keysym, down) {
+ //Util.Debug(">> keyEvent, keysym: " + keysym + ", down: " + down);
+ var arr;
+ arr = [4]; // msg-type
+ arr.push8(down);
+ arr.push16(0);
+ arr.push32(keysym);
+ //Util.Debug("<< keyEvent");
+ return arr;
+};
+
+pointerEvent = function(x, y) {
+ //Util.Debug(">> pointerEvent, x,y: " + x + "," + y +
+ // " , mask: " + mouse_buttonMask);
+ var arr;
+ arr = [5]; // msg-type
+ arr.push8(mouse_buttonMask);
+ arr.push16(x);
+ arr.push16(y);
+ //Util.Debug("<< pointerEvent");
+ return arr;
+};
+
+clientCutText = function(text) {
+ //Util.Debug(">> clientCutText");
+ var arr, i, n;
+ arr = [6]; // msg-type
+ arr.push8(0); // padding
+ arr.push8(0); // padding
+ arr.push8(0); // padding
+ arr.push32(text.length);
+ n = text.length;
+ for (i=0; i < n; i+=1) {
+ arr.push(text.charCodeAt(i));
+ }
+ //Util.Debug("<< clientCutText:" + arr);
+ return arr;
+};
+
+
+
+//
+// Public API interface functions
+//
+
+that.connect = function(host, port, password, path) {
+ //Util.Debug(">> connect");
+
+ rfb_host = host;
+ rfb_port = port;
+ rfb_password = (password !== undefined) ? password : "";
+ rfb_path = (path !== undefined) ? path : "";
+
+ if ((!rfb_host) || (!rfb_port)) {
+ return fail("Must set host and port");
+ }
+
+ updateState('connect');
+ //Util.Debug("<< connect");
+
+};
+
+that.disconnect = function() {
+ //Util.Debug(">> disconnect");
+ updateState('disconnect', 'Disconnecting');
+ //Util.Debug("<< disconnect");
+};
+
+that.sendPassword = function(passwd) {
+ rfb_password = passwd;
+ rfb_state = "Authentication";
+ setTimeout(init_msg, 1);
+};
+
+that.sendCtrlAltDel = function() {
+ if (rfb_state !== "normal" || conf.view_only) { return false; }
+ Util.Info("Sending Ctrl-Alt-Del");
+ var arr = [];
+ arr = arr.concat(keyEvent(0xFFE3, 1)); // Control
+ arr = arr.concat(keyEvent(0xFFE9, 1)); // Alt
+ arr = arr.concat(keyEvent(0xFFFF, 1)); // Delete
+ arr = arr.concat(keyEvent(0xFFFF, 0)); // Delete
+ arr = arr.concat(keyEvent(0xFFE9, 0)); // Alt
+ arr = arr.concat(keyEvent(0xFFE3, 0)); // Control
+ ws.send(arr);
+};
+
+that.xvpOp = function(ver, op) {
+ if (rfb_xvp_ver < ver) { return false; }
+ Util.Info("Sending XVP operation " + op + " (version " + ver + ")")
+ ws.send_string("\xFA\x00" + String.fromCharCode(ver) + String.fromCharCode(op));
+ return true;
+};
+
+that.xvpShutdown = function() {
+ return that.xvpOp(1, 2);
+};
+
+that.xvpReboot = function() {
+ return that.xvpOp(1, 3);
+};
+
+that.xvpReset = function() {
+ return that.xvpOp(1, 4);
+};
+
+// Send a key press. If 'down' is not specified then send a down key
+// followed by an up key.
+that.sendKey = function(code, down) {
+ if (rfb_state !== "normal" || conf.view_only) { return false; }
+ var arr = [];
+ if (typeof down !== 'undefined') {
+ Util.Info("Sending key code (" + (down ? "down" : "up") + "): " + code);
+ arr = arr.concat(keyEvent(code, down ? 1 : 0));
+ } else {
+ Util.Info("Sending key code (down + up): " + code);
+ arr = arr.concat(keyEvent(code, 1));
+ arr = arr.concat(keyEvent(code, 0));
+ }
+ ws.send(arr);
+};
+
+that.clipboardPasteFrom = function(text) {
+ if (rfb_state !== "normal") { return; }
+ //Util.Debug(">> clipboardPasteFrom: " + text.substr(0,40) + "...");
+ ws.send(clientCutText(text));
+ //Util.Debug("<< clipboardPasteFrom");
+};
+
+// Override internal functions for testing
+that.testMode = function(override_send, data_mode) {
+ test_mode = true;
+ that.recv_message = ws.testMode(override_send, data_mode);
+
+ checkEvents = function () { /* Stub Out */ };
+ that.connect = function(host, port, password) {
+ rfb_host = host;
+ rfb_port = port;
+ rfb_password = password;
+ init_vars();
+ updateState('ProtocolVersion', "Starting VNC handshake");
+ };
+};
+
+
+return constructor(); // Return the public API interface
+
+} // End of RFB()
diff --git a/include/ui.js b/include/ui.js
new file mode 100644
index 00000000..f6afccc9
--- /dev/null
+++ b/include/ui.js
@@ -0,0 +1,1003 @@
+/*
+ * 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.
+ */
+
+"use strict";
+/*jslint white: false, browser: true */
+/*global window, $D, Util, WebUtil, RFB, Display */
+
+// 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"]);
+
+var 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) {
+ var html = '', i, sheet, sheets, llevels, port, autoconnect;
+
+ UI.isTouchDevice = 'ontouchstart' in document.documentElement;
+
+ // Stylesheet selection dropdown
+ sheet = WebUtil.selectStylesheet();
+ sheets = WebUtil.getStylesheets();
+ for (i = 0; i < sheets.length; i += 1) {
+ UI.addOption($D('noVNC_stylesheet'),sheets[i].title, sheets[i].title);
+ }
+
+ // Logging selection dropdown
+ 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
+ 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 = RFB({'target': $D('noVNC_canvas'),
+ 'onUpdateState': UI.updateState,
+ 'onXvpInit': UI.updateXvpVisualState,
+ 'onClipboard': UI.clipReceive,
+ 'onDesktopName': UI.updateDocumentTitle});
+
+ autoconnect = WebUtil.getQueryVar('autoconnect', false);
+ if (autoconnect === 'true' || autoconnect == '1') {
+ autoconnect = true;
+ UI.connect();
+ } else {
+ autoconnect = false;
+ }
+
+ UI.updateVisualState();
+
+ // Unfocus clipboard when over the VNC area
+ //$D('VNC_screen').onmousemove = function () {
+ // var keyboard = UI.rfb.get_keyboard();
+ // if ((! keyboard) || (! keyboard.get_focused())) {
+ // $D('VNC_clipboard_text').blur();
+ // }
+ // };
+
+ // 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 val, ctrl = $D('noVNC_' + name);
+ 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) {
+
+ var i, ctrl = $D('noVNC_' + name);
+ // Save the cookie for this session
+ if (typeof value !== 'undefined') {
+ WebUtil.writeSetting(name, value);
+ }
+
+ // Update the settings control
+ value = UI.getSetting(name);
+
+ if (ctrl.type === 'checkbox') {
+ ctrl.checked = value;
+
+ } else if (typeof ctrl.options !== 'undefined') {
+ for (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) {
+ var val;
+
+ // Check Query string followed by cookie
+ val = WebUtil.getQueryVar(name);
+ if (val === null) {
+ val = WebUtil.readSetting(name, defVal);
+ }
+ UI.updateSetting(name, val);
+ //Util.Debug("Setting '" + name + "' initialized to '" + 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) {
+ var b, blist = [0, 1,2,4], button;
+
+ if (typeof num === 'undefined') {
+ // Disable mouse buttons
+ num = -1;
+ }
+ if (UI.rfb) {
+ UI.rfb.get_mouse().set_touchButton(num);
+ }
+
+ for (b = 0; b < blist.length; b++) {
+ button = $D('noVNC_mouse_button' + blist[b]);
+ if (blist[b] === num) {
+ button.style.display = "";
+ } else {
+ button.style.display = "none";
+ /*
+ button.style.backgroundColor = "black";
+ button.style.color = "lightgray";
+ button.style.backgroundColor = "";
+ button.style.color = "";
+ */
+ }
+ }
+},
+
+updateState: function(rfb, state, oldstate, msg) {
+ var s, sb, c, d, cad, vd, klass;
+ UI.rfb_state = state;
+ 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";
+ // Fall 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() {
+ var host, port, password, path;
+
+ UI.closeSettingsMenu();
+ UI.toggleConnectPanel();
+
+ host = $D('noVNC_host').value;
+ port = $D('noVNC_port').value;
+ password = $D('noVNC_password').value;
+ path = $D('noVNC_path').value;
+ if ((!host) || (!port)) {
+ throw("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, cur_clip, pos, new_w, new_h;
+
+ if (UI.rfb) {
+ display = UI.rfb.get_display();
+ } else {
+ return;
+ }
+
+ 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';
+ pos = Util.getPosition($D('noVNC_canvas'));
+ new_w = window.innerWidth - pos.x;
+ 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, skb, l;
+ kbi = $D('keyboardinput');
+ skb = $D('showKeyboard');
+ 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 = 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, oldValue, newLen, oldLen;
+ newValue = event.target.value;
+ oldValue = UI.lastKeyboardinput;
+
+ 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;
+ }
+ 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
+ for (var 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 (var i = 0; i < backspaces; i++)
+ UI.rfb.sendKey(XK_BackSpace);
+ for (var 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 doesnt 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/include/util.js b/include/util.js
new file mode 100644
index 00000000..05c1ac32
--- /dev/null
+++ b/include/util.js
@@ -0,0 +1,473 @@
+/*
+ * 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.
+ */
+
+"use strict";
+/*jslint bitwise: false, white: false */
+/*global window, console, document, navigator, ActiveXObject */
+
+// Globals defined here
+var Util = {};
+
+
+/*
+ * Make arrays quack
+ */
+
+Array.prototype.push8 = function (num) {
+ this.push(num & 0xFF);
+};
+
+Array.prototype.push16 = function (num) {
+ this.push((num >> 8) & 0xFF,
+ (num ) & 0xFF );
+};
+Array.prototype.push32 = function (num) {
+ 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
+if (!Array.prototype.map)
+{
+ Array.prototype.map = function(fun /*, thisp*/)
+ {
+ 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
+if (!Array.prototype.indexOf)
+{
+ Array.prototype.indexOf = function(elt /*, from*/)
+ {
+ 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;
+ };
+}
+
+
+//
+// requestAnimationFrame shim with setTimeout fallback
+//
+
+window.requestAnimFrame = (function(){
+ 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) {
+ 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) {};
+ 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("invalid logging type '" + level + "'");
+ }
+};
+Util.get_logging = function () {
+ return Util._log_level;
+};
+// Initialize logging level
+Util.init_logging();
+
+
+// Set configuration default for Crockford style function namespaces
+Util.conf_default = function(cfg, api, defaults, v, mode, type, defval, desc) {
+ var getter, setter;
+
+ // Default getter function
+ getter = function (idx) {
+ if ((type in {'arr':1, 'array':1}) &&
+ (typeof idx !== 'undefined')) {
+ return cfg[v][idx];
+ } else {
+ return cfg[v];
+ }
+ };
+
+ // Default setter function
+ setter = function (val, idx) {
+ if (type in {'boolean':1, 'bool':1}) {
+ if ((!val) || (val in {'0':1, 'no':1, 'false':1})) {
+ val = false;
+ } else {
+ val = true;
+ }
+ } else if (type in {'integer':1, 'int':1}) {
+ val = parseInt(val, 10);
+ } else if (type === 'str') {
+ val = String(val);
+ } else if (type === 'func') {
+ if (!val) {
+ val = function () {};
+ }
+ }
+ if (typeof idx !== 'undefined') {
+ cfg[v][idx] = val;
+ } else {
+ cfg[v] = val;
+ }
+ };
+
+ // Set the description
+ api[v + '_description'] = desc;
+
+ // Set the getter function
+ if (typeof api['get_' + v] === 'undefined') {
+ api['get_' + v] = getter;
+ }
+
+ // Set the setter function with extra sanity checks
+ if (typeof api['set_' + v] === 'undefined') {
+ api['set_' + v] = function (val, idx) {
+ if (mode in {'RO':1, 'ro':1}) {
+ throw(v + " is read-only");
+ } else if ((mode in {'WO':1, 'wo':1}) &&
+ (typeof cfg[v] !== 'undefined')) {
+ throw(v + " can only be set once");
+ }
+ setter(val, idx);
+ };
+ }
+
+ // Set the default value
+ if (typeof defaults[v] !== 'undefined') {
+ defval = defaults[v];
+ } else if ((type in {'arr':1, 'array':1}) &&
+ (! (defval instanceof Array))) {
+ defval = [];
+ }
+ // Coerce existing setting to the right type
+ //Util.Debug("v: " + v + ", defval: " + defval + ", defaults[v]: " + defaults[v]);
+ setter(defval);
+};
+
+// Set group of configuration defaults
+Util.conf_defaults = function(cfg, api, defaults, arr) {
+ var i;
+ for (i = 0; i < arr.length; i++) {
+ Util.conf_default(cfg, api, defaults, arr[i][0], arr[i][1],
+ arr[i][2], arr[i][3], arr[i][4]);
+ }
+};
+
+/*
+ * Decode from UTF-8
+ */
+Util.decodeUTF8 = function(utf8string) {
+ 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) {
+ var head = document.getElementsByTagName('head')[0], script,
+ ls = Util._loading_scripts, ps = Util._pending_scripts;
+ for (var f=0; f 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();
+ }
+ }
+ }
+ };
+ // 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() {
+ function getStyle(obj, styleProp) {
+ if (obj.currentStyle) {
+ var y = obj.currentStyle[styleProp];
+ } else if (window.getComputedStyle)
+ var 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) {
+ 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){
+ 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("Handler could not be attached");
+ }
+};
+
+Util.removeEvent = function(obj, evType, fn){
+ 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("Handler could not be removed");
+ }
+};
+
+Util.stopEvent = function(e) {
+ 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)};
+
+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': (function() { return (!window.opera) ? false : true; }()),
+
+ 'trident': (function() {
+ return (!window.ActiveXObject) ? false : ((window.XMLHttpRequest) ? ((document.querySelectorAll) ? 6 : 5) : 4); }()),
+ 'webkit': (function() {
+ try { return (navigator.taintEnabled) ? false : ((Util.Features.xpath) ? ((Util.Features.query) ? 525 : 420) : 419); } catch (e) { return false; } }()),
+ //'webkit': (function() {
+ // return ((typeof navigator.taintEnabled !== "unknown") && navigator.taintEnabled) ? false : ((Util.Features.xpath) ? ((Util.Features.query) ? 525 : 420) : 419); }()),
+ 'gecko': (function() {
+ return (!document.getBoxObjectFor && window.mozInnerScreenX == null) ? false : ((document.getElementsByClassName) ? 19 : 18); }())
+};
+if (Util.Engine.webkit) {
+ // Extract actual webkit version if available
+ Util.Engine.webkit = (function(v) {
+ var re = new RegExp('WebKit/([0-9\.]*) ');
+ v = (navigator.userAgent.match(re) || ['', v])[1];
+ return parseFloat(v, 10);
+ })(Util.Engine.webkit);
+}
+
+Util.Flash = (function(){
+ 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/include/web-socket-js-project b/include/web-socket-js-project
new file mode 160000
index 00000000..c0855c6c
--- /dev/null
+++ b/include/web-socket-js-project
@@ -0,0 +1 @@
+Subproject commit c0855c6caec589c33acc22b6ee5e562287e65f3d
diff --git a/include/web-socket-js/README.txt b/include/web-socket-js/README.txt
new file mode 100644
index 00000000..2e32ea7f
--- /dev/null
+++ b/include/web-socket-js/README.txt
@@ -0,0 +1,109 @@
+* 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/include/web-socket-js/WebSocketMain.swf b/include/web-socket-js/WebSocketMain.swf
new file mode 100644
index 00000000..f286c81a
Binary files /dev/null and b/include/web-socket-js/WebSocketMain.swf differ
diff --git a/include/web-socket-js/swfobject.js b/include/web-socket-js/swfobject.js
new file mode 100644
index 00000000..8eafe9dd
--- /dev/null
+++ b/include/web-socket-js/swfobject.js
@@ -0,0 +1,4 @@
+/* SWFObject v2.2
+ is released under the MIT License
+*/
+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;Y0){for(var af=0;af0){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'}}aa.outerHTML='";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
+// 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 DOM 2 EventTarget Interface}
+ *
+ * @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 DOM 2 EventTarget Interface}
+ *
+ * @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 DOM 2 EventTarget Interface}
+ *
+ * @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/include/websock.js b/include/websock.js
new file mode 100644
index 00000000..01a24c3f
--- /dev/null
+++ b/include/websock.js
@@ -0,0 +1,422 @@
+/*
+ * 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: false, plusplus: false */
+/*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";
+
+var api = {}, // Public API
+ websocket = null, // WebSocket object
+ mode = 'base64', // Current WebSocket mode: 'binary', 'base64'
+ rQ = [], // Receive queue
+ rQi = 0, // Receive queue index
+ rQmax = 10000, // Max receive queue size before compacting
+ sQ = [], // Send queue
+
+ eventHandlers = {
+ 'message' : function() {},
+ 'open' : function() {},
+ 'close' : function() {},
+ 'error' : function() {}
+ },
+
+ test_mode = false;
+
+
+//
+// Queue public functions
+//
+
+function get_sQ() {
+ return sQ;
+}
+
+function get_rQ() {
+ return rQ;
+}
+function get_rQi() {
+ return rQi;
+}
+function set_rQi(val) {
+ rQi = val;
+}
+
+function rQlen() {
+ return rQ.length - rQi;
+}
+
+function rQpeek8() {
+ return (rQ[rQi] );
+}
+function rQshift8() {
+ return (rQ[rQi++] );
+}
+function rQunshift8(num) {
+ if (rQi === 0) {
+ rQ.unshift(num);
+ } else {
+ rQi -= 1;
+ rQ[rQi] = num;
+ }
+
+}
+function rQshift16() {
+ return (rQ[rQi++] << 8) +
+ (rQ[rQi++] );
+}
+function rQshift32() {
+ return (rQ[rQi++] << 24) +
+ (rQ[rQi++] << 16) +
+ (rQ[rQi++] << 8) +
+ (rQ[rQi++] );
+}
+function rQshiftStr(len) {
+ if (typeof(len) === 'undefined') { len = rQlen(); }
+ var arr = rQ.slice(rQi, rQi + len);
+ rQi += len;
+ return String.fromCharCode.apply(null, arr);
+}
+function rQshiftBytes(len) {
+ if (typeof(len) === 'undefined') { len = rQlen(); }
+ rQi += len;
+ return rQ.slice(rQi-len, rQi);
+}
+
+function rQslice(start, end) {
+ if (end) {
+ return rQ.slice(rQi + start, rQi + end);
+ } else {
+ return rQ.slice(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.
+function rQwait(msg, num, goback) {
+ var rQlen = rQ.length - rQi; // Skip rQlen() function call
+ if (rQlen < num) {
+ if (goback) {
+ if (rQi < goback) {
+ throw("rQwait cannot backup " + goback + " bytes");
+ }
+ rQi -= goback;
+ }
+ //Util.Debug(" waiting for " + (num-rQlen) +
+ // " " + msg + " byte(s)");
+ return true; // true means need more data
+ }
+ return false;
+}
+
+//
+// Private utility routines
+//
+
+function encode_message() {
+ if (mode === 'binary') {
+ // Put in a binary arraybuffer
+ return (new Uint8Array(sQ)).buffer;
+ } else {
+ // base64 encode
+ return Base64.encode(sQ);
+ }
+}
+
+function decode_message(data) {
+ //Util.Debug(">> decode_message: " + data);
+ if (mode === 'binary') {
+ // push arraybuffer values onto the end
+ var u8 = new Uint8Array(data);
+ for (var i = 0; i < u8.length; i++) {
+ rQ.push(u8[i]);
+ }
+ } else {
+ // base64 decode and concat to the end
+ rQ = rQ.concat(Base64.decode(data, 0));
+ }
+ //Util.Debug(">> decode_message, rQ: " + rQ);
+}
+
+
+//
+// Public Send functions
+//
+
+function flush() {
+ if (websocket.bufferedAmount !== 0) {
+ Util.Debug("bufferedAmount: " + websocket.bufferedAmount);
+ }
+ if (websocket.bufferedAmount < api.maxBufferedAmount) {
+ //Util.Debug("arr: " + arr);
+ //Util.Debug("sQ: " + sQ);
+ if (sQ.length > 0) {
+ websocket.send(encode_message(sQ));
+ sQ = [];
+ }
+ return true;
+ } else {
+ Util.Info("Delaying send, bufferedAmount: " +
+ websocket.bufferedAmount);
+ return false;
+ }
+}
+
+// overridable for testing
+function send(arr) {
+ //Util.Debug(">> send_array: " + arr);
+ sQ = sQ.concat(arr);
+ return flush();
+}
+
+function send_string(str) {
+ //Util.Debug(">> send_string: " + str);
+ api.send(str.split('').map(
+ function (chr) { return chr.charCodeAt(0); } ) );
+}
+
+//
+// Other public functions
+
+function recv_message(e) {
+ //Util.Debug(">> recv_message: " + e.data.length);
+
+ try {
+ decode_message(e.data);
+ if (rQlen() > 0) {
+ eventHandlers.message();
+ // Compact the receive queue
+ if (rQ.length > rQmax) {
+ //Util.Debug("Compacting receive queue");
+ rQ = rQ.slice(rQi);
+ rQi = 0;
+ }
+ } else {
+ Util.Debug("Ignoring empty message");
+ }
+ } catch (exc) {
+ if (typeof exc.stack !== 'undefined') {
+ Util.Warn("recv_message, caught exception: " + exc.stack);
+ } else if (typeof exc.description !== 'undefined') {
+ Util.Warn("recv_message, caught exception: " + exc.description);
+ } else {
+ Util.Warn("recv_message, caught exception:" + exc);
+ }
+ if (typeof exc.name !== 'undefined') {
+ eventHandlers.error(exc.name + ": " + exc.message);
+ } else {
+ eventHandlers.error(exc);
+ }
+ }
+ //Util.Debug("<< recv_message");
+}
+
+
+// Set event handlers
+function on(evt, handler) {
+ eventHandlers[evt] = handler;
+}
+
+function init(protocols) {
+ rQ = [];
+ rQi = 0;
+ sQ = [];
+ websocket = null;
+
+ var bt = false,
+ wsbt = false,
+ try_binary = false;
+
+ // Check for full typed array support
+ if (('Uint8Array' in window) &&
+ ('set' in Uint8Array.prototype)) {
+ bt = true;
+ }
+
+ // Check for full binary type support in WebSockets
+ // TODO: this sucks, the property should exist on the prototype
+ // but it does not.
+ try {
+ if (bt && ('binaryType' in (new WebSocket("ws://localhost:17523")))) {
+ Util.Info("Detected binaryType support in WebSockets");
+ wsbt = true;
+ }
+ } catch (exc) {
+ // Just ignore failed test localhost connections
+ }
+
+ // Default protocols if not specified
+ if (typeof(protocols) === "undefined") {
+ if (wsbt) {
+ protocols = ['binary', 'base64'];
+ } else {
+ protocols = 'base64';
+ }
+ }
+
+ // If no binary support, make sure it was not requested
+ if (!wsbt) {
+ if (protocols === 'binary') {
+ throw("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("Only WebSocket binary sub-protocol was requested and not supported.");
+ }
+ }
+ }
+
+ return protocols;
+}
+
+function open(uri, protocols) {
+ protocols = init(protocols);
+
+ if (test_mode) {
+ websocket = {};
+ } else {
+ websocket = new WebSocket(uri, protocols);
+ if (protocols.indexOf('binary') >= 0) {
+ websocket.binaryType = 'arraybuffer';
+ }
+ }
+
+ websocket.onmessage = recv_message;
+ websocket.onopen = function() {
+ Util.Debug(">> WebSock.onopen");
+ if (websocket.protocol) {
+ mode = websocket.protocol;
+ Util.Info("Server chose sub-protocol: " + websocket.protocol);
+ } else {
+ mode = 'base64';
+ Util.Error("Server select no sub-protocol!: " + websocket.protocol);
+ }
+ eventHandlers.open();
+ Util.Debug("<< WebSock.onopen");
+ };
+ websocket.onclose = function(e) {
+ Util.Debug(">> WebSock.onclose");
+ eventHandlers.close(e);
+ Util.Debug("<< WebSock.onclose");
+ };
+ websocket.onerror = function(e) {
+ Util.Debug(">> WebSock.onerror: " + e);
+ eventHandlers.error(e);
+ Util.Debug("<< WebSock.onerror");
+ };
+}
+
+function close() {
+ if (websocket) {
+ if ((websocket.readyState === WebSocket.OPEN) ||
+ (websocket.readyState === WebSocket.CONNECTING)) {
+ Util.Info("Closing WebSocket connection");
+ websocket.close();
+ }
+ websocket.onmessage = function (e) { return; };
+ }
+}
+
+// Override internal functions for testing
+// Takes a send function, returns reference to recv function
+function testMode(override_send, data_mode) {
+ test_mode = true;
+ mode = data_mode;
+ api.send = override_send;
+ api.close = function () {};
+ return recv_message;
+}
+
+function constructor() {
+ // Configuration settings
+ api.maxBufferedAmount = 200;
+
+ // Direct access to send and receive queues
+ api.get_sQ = get_sQ;
+ api.get_rQ = get_rQ;
+ api.get_rQi = get_rQi;
+ api.set_rQi = set_rQi;
+
+ // Routines to read from the receive queue
+ api.rQlen = rQlen;
+ api.rQpeek8 = rQpeek8;
+ api.rQshift8 = rQshift8;
+ api.rQunshift8 = rQunshift8;
+ api.rQshift16 = rQshift16;
+ api.rQshift32 = rQshift32;
+ api.rQshiftStr = rQshiftStr;
+ api.rQshiftBytes = rQshiftBytes;
+ api.rQslice = rQslice;
+ api.rQwait = rQwait;
+
+ api.flush = flush;
+ api.send = send;
+ api.send_string = send_string;
+
+ api.on = on;
+ api.init = init;
+ api.open = open;
+ api.close = close;
+ api.testMode = testMode;
+
+ return api;
+}
+
+return constructor();
+
+}
diff --git a/include/webutil.js b/include/webutil.js
new file mode 100644
index 00000000..e95fc807
--- /dev/null
+++ b/include/webutil.js
@@ -0,0 +1,221 @@
+/*
+ * 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.
+ */
+
+"use strict";
+/*jslint bitwise: false, white: false */
+/*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) {
+ if (typeof level !== "undefined") {
+ Util._log_level = level;
+ } else {
+ Util._log_level = (document.location.href.match(
+ /logging=([A-Za-z0-9\._\-]*)/) ||
+ ['', Util._log_level])[1];
+ }
+ Util.init_logging();
+};
+
+
+WebUtil.dirObj = function (obj, depth, parent) {
+ var i, msg = "", val = "";
+ if (! depth) { depth=2; }
+ if (! parent) { parent= ""; }
+
+ // Print the properties of the passed-in object
+ for (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", " ");
+ 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) {
+ 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) {
+ var date, expires, secure;
+ if (days) {
+ date = new Date();
+ date.setTime(date.getTime()+(days*24*60*60*1000));
+ expires = "; expires="+date.toGMTString();
+ } else {
+ expires = "";
+ }
+ if (document.location.protocol === "https:") {
+ secure = "; secure";
+ } else {
+ secure = "";
+ }
+ document.cookie = name+"="+value+expires+"; path=/"+secure;
+};
+
+WebUtil.readCookie = function(name, defaultValue) {
+ var i, c, nameEQ = name + "=", ca = document.cookie.split(';');
+ for(i=0; i < ca.length; i += 1) {
+ 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) {
+ WebUtil.createCookie(name,"",-1);
+};
+
+/*
+ * Setting handling.
+ */
+
+WebUtil.initSettings = function(callback) {
+ 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) {
+ 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) {
+ 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) {
+ 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() { var i, links, sheets = [];
+ links = document.getElementsByTagName("link");
+ for (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) {
+ var i, link, sheets = WebUtil.getStylesheets();
+ if (typeof sheet === 'undefined') {
+ sheet = 'default';
+ }
+ for (i=0; i < sheets.length; i += 1) {
+ 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;
+};
diff --git a/karma.conf.js b/karma.conf.js
deleted file mode 100644
index 1060ee5f..00000000
--- a/karma.conf.js
+++ /dev/null
@@ -1,152 +0,0 @@
-// Karma configuration
-
-module.exports = function(config) {
- var customLaunchers = {};
- var browsers = [];
- var useSauce = false;
-
- // use Sauce when running on Travis
- if (process.env.TRAVIS_JOB_NUMBER) {
- useSauce = true;
- }
-
- if (useSauce && process.env.TEST_BROWSER_NAME && process.env.TEST_BROWSER_NAME != 'PhantomJS') {
- var names = process.env.TEST_BROWSER_NAME.split(',');
- var platforms = process.env.TEST_BROWSER_OS.split(',');
- var versions = [];
- if (process.env.TEST_BROWSER_VERSION) {
- versions = process.env.TEST_BROWSER_VERSION.split(',');
- } else {
- versions = [null];
- }
-
- for (var i = 0; i < names.length; i++) {
- for (var j = 0; j < platforms.length; j++) {
- for (var k = 0; k < versions.length; k++) {
- var launcher_name = 'sl_' + platforms[j].replace(/[^a-zA-Z0-9]/g, '') + '_' + names[i];
- if (versions[k]) {
- launcher_name += '_' + versions[k];
- }
-
- customLaunchers[launcher_name] = {
- base: 'SauceLabs',
- browserName: names[i],
- platform: platforms[j],
- };
-
- if (versions[i]) {
- customLaunchers[launcher_name].version = versions[k];
- }
- }
- }
- }
-
- browsers = Object.keys(customLaunchers);
- } else {
- useSauce = false;
- //browsers = ['PhantomJS'];
- browsers = [];
- }
-
- var my_conf = {
-
- // base path that will be used to resolve all patterns (eg. files, exclude)
- basePath: '',
-
- // frameworks to use
- // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
- frameworks: ['requirejs', 'mocha', 'chai'],
-
- // list of files / patterns to load in the browser (loaded in order)
- files: [
- { pattern: 'vendor/sinon.js', included: false },
- { pattern: 'node_modules/sinon-chai/lib/sinon-chai.js', included: false },
- { pattern: 'core/**/*.js', included: false },
- { pattern: 'vendor/pako/**/*.js', included: false },
- { pattern: 'tests/test.*.js', included: false },
- { pattern: 'tests/fake.*.js', included: false },
- { pattern: 'tests/assertions.js', included: false },
- 'tests/karma-test-main.js',
- ],
-
- client: {
- mocha: {
- // replace Karma debug page with mocha display
- 'reporter': 'html',
- 'ui': 'bdd'
- }
- },
-
- // list of files to exclude
- exclude: [
- ],
-
- customLaunchers: customLaunchers,
-
- // start these browsers
- // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
- browsers: browsers,
-
- // preprocess matching files before serving them to the browser
- // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
- preprocessors: {
- 'core/**/*.js': ['babel'],
- 'tests/test.*.js': ['babel'],
- 'tests/fake.*.js': ['babel'],
- 'tests/assertions.js': ['babel'],
- 'vendor/pako/**/*.js': ['babel'],
- },
-
- babelPreprocessor: {
- options: {
- plugins: ['transform-es2015-modules-amd', 'syntax-dynamic-import'],
- sourceMap: 'inline',
- },
- },
-
- // test results reporter to use
- // possible values: 'dots', 'progress'
- // available reporters: https://npmjs.org/browse/keyword/karma-reporter
- reporters: ['mocha'],
-
-
- // web server port
- port: 9876,
-
-
- // enable / disable colors in the output (reporters and logs)
- colors: true,
-
-
- // level of logging
- // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
- logLevel: config.LOG_INFO,
-
-
- // enable / disable watching file and executing tests whenever any file changes
- autoWatch: false,
-
- // Continuous Integration mode
- // if true, Karma captures browsers, runs the tests and exits
- singleRun: true,
-
- // Increase timeout in case connection is slow/we run more browsers than possible
- // (we currently get 3 for free, and we try to run 7, so it can take a while)
- captureTimeout: 240000,
-
- // similarly to above
- browserNoActivityTimeout: 100000,
- };
-
- if (useSauce) {
- my_conf.reporters.push('saucelabs');
- my_conf.captureTimeout = 0; // use SL timeout
- my_conf.sauceLabs = {
- testName: 'noVNC Tests (all)',
- startConnect: false,
- tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER
- };
- }
-
- config.set(my_conf);
-};
diff --git a/package.json b/package.json
deleted file mode 100644
index 41f9504c..00000000
--- a/package.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
- "name": "noVNC",
- "version": "0.6.1",
- "description": "An HTML5 VNC client",
- "main": "karma.conf.js",
- "directories": {
- "doc": "docs",
- "test": "tests"
- },
- "scripts": {
- "test": "PATH=$PATH:node_modules/karma/bin karma start karma.conf.js",
- "prepublish": "node ./utils/use_require.js --as commonjs"
- },
- "repository": {
- "type": "git",
- "url": "https://github.com/novnc/noVNC.git"
- },
- "author": "Joel Martin (https://github.com/kanaka)",
- "contributors": [
- "Solly Ross (https://github.com/directxman12)",
- "Peter Åstrand (https://github.com/astrand)",
- "Samuel Mannehed (https://github.com/samhed)",
- "Pierre Ossman (https://github.com/CendioOssman)"
- ],
- "license": "MPL-2.0",
- "bugs": {
- "url": "https://github.com/novnc/noVNC/issues"
- },
- "homepage": "https://github.com/novnc/noVNC",
- "devDependencies": {
- "babel-core": "^6.22.1",
- "babel-plugin-add-module-exports": "^0.2.1",
- "babel-plugin-import-redirect": "*",
- "babel-plugin-syntax-dynamic-import": "^6.18.0",
- "babel-plugin-transform-es2015-modules-amd": "^6.22.0",
- "babel-plugin-transform-es2015-modules-commonjs": "^6.18.0",
- "babel-plugin-transform-es2015-modules-systemjs": "^6.22.0",
- "babel-plugin-transform-es2015-modules-umd": "^6.22.0",
- "babelify": "^7.3.0",
- "browserify": "^13.1.0",
- "chai": "^3.5.0",
- "commander": "^2.9.0",
- "es-module-loader": "^2.1.0",
- "fs-extra": "^1.0.0",
- "jsdom": "*",
- "karma": "^1.3.0",
- "karma-babel-preprocessor": "^6.0.1",
- "karma-chai": "^0.1.0",
- "karma-mocha": "^1.3.0",
- "karma-mocha-reporter": "^2.2.0",
- "karma-requirejs": "^1.1.0",
- "karma-sauce-launcher": "^1.0.0",
- "mocha": "^3.1.2",
- "node-getopt": "*",
- "po2json": "*",
- "requirejs": "^2.3.2",
- "rollup": "^0.41.4",
- "rollup-plugin-node-resolve": "^2.0.0",
- "sinon-chai": "^2.8.0"
- }
-}
diff --git a/po/Makefile b/po/Makefile
deleted file mode 100644
index 83c89419..00000000
--- a/po/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-all:
-.PHONY: update-po update-js update-pot
-
-LINGUAS := de el nl sv
-
-VERSION := $(shell grep '"version"' ../package.json | cut -d '"' -f 4)
-
-POFILES := $(addsuffix .po,$(LINGUAS))
-JSONFILES := $(addprefix ../app/locale/,$(addsuffix .json,$(LINGUAS)))
-
-update-po: $(POFILES)
-update-js: $(JSONFILES)
-
-%.po: noVNC.pot
- msgmerge --update --lang=$* $@ $<
-../app/locale/%.json: %.po
- ./po2js $< $@
-
-update-pot:
- xgettext --output=noVNC.js.pot \
- --copyright-holder="Various Authors" \
- --package-name="noVNC" \
- --package-version="$(VERSION)" \
- --msgid-bugs-address="novnc@googlegroups.com" \
- --add-comments=TRANSLATORS: \
- --from-code=UTF-8 \
- --sort-by-file \
- ../app/*.js \
- ../core/*.js \
- ../core/input/*.js
- ./xgettext-html --output=noVNC.html.pot \
- ../vnc.html
- msgcat --output-file=noVNC.pot \
- --sort-by-file noVNC.js.pot noVNC.html.pot
- rm -f noVNC.js.pot noVNC.html.pot
diff --git a/po/de.po b/po/de.po
deleted file mode 100644
index eb8c9bd8..00000000
--- a/po/de.po
+++ /dev/null
@@ -1,294 +0,0 @@
-# German translations for noVNC package
-# German translation for noVNC.
-# Copyright (C) 2016 Various Authors
-# This file is distributed under the same license as the noVNC package.
-# Loek Janssen , 2016.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: noVNC 0.6.1\n"
-"Report-Msgid-Bugs-To: novnc@googlegroups.com\n"
-"POT-Creation-Date: 2017-02-08 13:43+0100\n"
-"PO-Revision-Date: 2016-11-15 07:51+0100\n"
-"Last-Translator: Loek Janssen \n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../app/ui.js:465
-msgid "Connecting..."
-msgstr "Verbinden..."
-
-#: ../app/ui.js:473
-msgid "Connected (encrypted) to "
-msgstr "Verbunden mit (verschlüsselt) "
-
-#: ../app/ui.js:475
-msgid "Connected (unencrypted) to "
-msgstr "Verbunden mit (unverschlüsselt) "
-
-#: ../app/ui.js:481
-msgid "Disconnecting..."
-msgstr "Verbindung trennen..."
-
-#: ../app/ui.js:485
-msgid "Disconnected"
-msgstr "Verbindung zum Server getrennt"
-
-#: ../app/ui.js:1061 ../core/rfb.js:278
-msgid "Must set host and port"
-msgstr "Richten Sie Server und Port ein"
-
-#: ../app/ui.js:1110
-msgid "Reconnecting..."
-msgstr "Verbindung wiederherstellen..."
-
-#: ../app/ui.js:1149
-msgid "Password is required"
-msgstr "Passwort ist erforderlich"
-
-#: ../app/ui.js:1329
-msgid ""
-"Forcing clipping mode since scrollbars aren't supported by IE in fullscreen"
-msgstr ""
-"'Clipping-Modus' aktiviert, Scrollbalken in 'IE-Vollbildmodus' werden nicht "
-"unterstützt"
-
-#: ../core/rfb.js:554
-msgid "Disconnect timeout"
-msgstr "Zeitüberschreitung beim Trennen"
-
-#: ../vnc.html:68
-msgid "noVNC encountered an error:"
-msgstr "Ein Fehler ist aufgetreten:"
-
-#: ../vnc.html:77
-msgid "Hide/Show the control bar"
-msgstr "Kontrollleiste verstecken/anzeigen"
-
-#: ../vnc.html:84
-msgid "Move/Drag Viewport"
-msgstr "Ansichtsfenster verschieben/ziehen"
-
-#: ../vnc.html:84
-msgid "viewport drag"
-msgstr "Ansichtsfenster ziehen"
-
-#: ../vnc.html:90 ../vnc.html:93 ../vnc.html:96 ../vnc.html:99
-msgid "Active Mouse Button"
-msgstr "Aktive Maustaste"
-
-#: ../vnc.html:90
-msgid "No mousebutton"
-msgstr "Keine Maustaste"
-
-#: ../vnc.html:93
-msgid "Left mousebutton"
-msgstr "Linke Maustaste"
-
-#: ../vnc.html:96
-msgid "Middle mousebutton"
-msgstr "Mittlere Maustaste"
-
-#: ../vnc.html:99
-msgid "Right mousebutton"
-msgstr "Rechte Maustaste"
-
-#: ../vnc.html:102
-msgid "Keyboard"
-msgstr "Tastatur"
-
-#: ../vnc.html:102
-msgid "Show Keyboard"
-msgstr "Tastatur anzeigen"
-
-#: ../vnc.html:109
-msgid "Extra keys"
-msgstr "Zusatztasten"
-
-#: ../vnc.html:109
-msgid "Show Extra Keys"
-msgstr "Zusatztasten anzeigen"
-
-#: ../vnc.html:114
-msgid "Ctrl"
-msgstr "Strg"
-
-#: ../vnc.html:114
-msgid "Toggle Ctrl"
-msgstr "Strg umschalten"
-
-#: ../vnc.html:117
-msgid "Alt"
-msgstr "Alt"
-
-#: ../vnc.html:117
-msgid "Toggle Alt"
-msgstr "Alt umschalten"
-
-#: ../vnc.html:120
-msgid "Send Tab"
-msgstr "Tab senden"
-
-#: ../vnc.html:120
-msgid "Tab"
-msgstr "Tab"
-
-#: ../vnc.html:123
-msgid "Esc"
-msgstr "Esc"
-
-#: ../vnc.html:123
-msgid "Send Escape"
-msgstr "Escape senden"
-
-#: ../vnc.html:126
-msgid "Ctrl+Alt+Del"
-msgstr "Strg+Alt+Entf"
-
-#: ../vnc.html:126
-msgid "Send Ctrl-Alt-Del"
-msgstr "Strg+Alt+Entf senden"
-
-#: ../vnc.html:134
-msgid "Shutdown/Reboot"
-msgstr "Herunterfahren/Neustarten"
-
-#: ../vnc.html:134
-msgid "Shutdown/Reboot..."
-msgstr "Herunterfahren/Neustarten..."
-
-#: ../vnc.html:140
-msgid "Power"
-msgstr "Energie"
-
-#: ../vnc.html:142
-msgid "Shutdown"
-msgstr "Herunterfahren"
-
-#: ../vnc.html:143
-msgid "Reboot"
-msgstr "Neustarten"
-
-#: ../vnc.html:144
-msgid "Reset"
-msgstr "Zurücksetzen"
-
-#: ../vnc.html:149 ../vnc.html:155
-msgid "Clipboard"
-msgstr "Zwischenablage"
-
-#: ../vnc.html:159
-msgid "Clear"
-msgstr "Löschen"
-
-#: ../vnc.html:165
-msgid "Fullscreen"
-msgstr "Vollbild"
-
-#: ../vnc.html:170 ../vnc.html:177
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: ../vnc.html:180
-msgid "Shared Mode"
-msgstr "Geteilter Modus"
-
-#: ../vnc.html:183
-msgid "View Only"
-msgstr "Nur betrachten"
-
-#: ../vnc.html:187
-msgid "Clip to Window"
-msgstr "Auf Fenster begrenzen"
-
-#: ../vnc.html:190
-msgid "Scaling Mode:"
-msgstr "Skalierungsmodus:"
-
-#: ../vnc.html:192
-msgid "None"
-msgstr "Keiner"
-
-#: ../vnc.html:193
-msgid "Local Scaling"
-msgstr "Lokales skalieren"
-
-#: ../vnc.html:194
-msgid "Local Downscaling"
-msgstr "Lokales herunterskalieren"
-
-#: ../vnc.html:195
-msgid "Remote Resizing"
-msgstr "Serverseitiges skalieren"
-
-#: ../vnc.html:200
-msgid "Advanced"
-msgstr "Erweitert"
-
-#: ../vnc.html:203
-msgid "True Color"
-msgstr "True Color"
-
-#: ../vnc.html:206
-msgid "Local Cursor"
-msgstr "Lokaler Mauszeiger"
-
-#: ../vnc.html:210
-msgid "Repeater ID:"
-msgstr "Repeater ID:"
-
-#: ../vnc.html:214
-msgid "WebSocket"
-msgstr "WebSocket"
-
-#: ../vnc.html:217
-msgid "Encrypt"
-msgstr "Verschlüsselt"
-
-#: ../vnc.html:220
-msgid "Host:"
-msgstr "Server:"
-
-#: ../vnc.html:224
-msgid "Port:"
-msgstr "Port:"
-
-#: ../vnc.html:228
-msgid "Path:"
-msgstr "Pfad:"
-
-#: ../vnc.html:235
-msgid "Automatic Reconnect"
-msgstr "Automatisch wiederverbinden"
-
-#: ../vnc.html:238
-msgid "Reconnect Delay (ms):"
-msgstr "Wiederverbindungsverzögerung (ms):"
-
-#: ../vnc.html:244
-msgid "Logging:"
-msgstr "Protokollierung:"
-
-#: ../vnc.html:256
-msgid "Disconnect"
-msgstr "Verbindung trennen"
-
-#: ../vnc.html:273
-msgid "Connect"
-msgstr "Verbinden"
-
-#: ../vnc.html:283
-msgid "Password:"
-msgstr "Passwort:"
-
-#: ../vnc.html:297
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: ../vnc.html:313
-msgid "Canvas not supported."
-msgstr "Canvas nicht unterstützt."
diff --git a/po/el.po b/po/el.po
deleted file mode 100644
index b6a25fd3..00000000
--- a/po/el.po
+++ /dev/null
@@ -1,293 +0,0 @@
-# Greek translations for noVNC package.
-# Copyright (C) 2016 Various Authors
-# This file is distributed under the same license as the noVNC package.
-# Giannis Kosmas , 2016.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: noVNC 0.6.1\n"
-"Report-Msgid-Bugs-To: novnc@googlegroups.com\n"
-"POT-Creation-Date: 2016-11-24 08:53+0200\n"
-"PO-Revision-Date: 2016-11-15 07:51+0100\n"
-"Last-Translator: Giannis Kosmas \n"
-"Language-Team: none\n"
-"Language: el\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../app/ui.js:405
-msgid "Connecting..."
-msgstr "Συνδέεται..."
-
-#: ../app/ui.js:412
-msgid "Connected (encrypted) to "
-msgstr "Συνδέθηκε (κρυπτογραφημένα) με το "
-
-#: ../app/ui.js:414
-msgid "Connected (unencrypted) to "
-msgstr "Συνδέθηκε (μη κρυπτογραφημένα) με το "
-
-#: ../app/ui.js:419
-msgid "Disconnecting..."
-msgstr "Aποσυνδέεται..."
-
-#: ../app/ui.js:424
-msgid "Disconnected"
-msgstr "Αποσυνδέθηκε"
-
-#: ../app/ui.js:1009 ../core/rfb.js:278
-msgid "Must set host and port"
-msgstr "Πρέπει να οριστεί το όνομα και η πόρτα του διακομιστή"
-
-#: ../app/ui.js:1062
-msgid "Password is required"
-msgstr "Απαιτείται ο κωδικός πρόσβασης"
-
-#: ../app/ui.js:1275
-msgid ""
-"Forcing clipping mode since scrollbars aren't supported by IE in fullscreen"
-msgstr ""
-"Εφαρμογή λειτουργίας αποκοπής αφού δεν υποστηρίζονται οι λωρίδες κύλισης σε "
-"πλήρη οθόνη στον IE"
-
-#: ../core/rfb.js:556
-msgid "Disconnect timeout"
-msgstr "Παρέλευση χρονικού ορίου αποσύνδεσης"
-
-#: ../vnc.html:70
-msgid "noVNC encountered an error:"
-msgstr "το noVNC αντιμετώπισε ένα σφάλμα:"
-
-#: ../vnc.html:78
-msgid "Hide/Show the control bar"
-msgstr "Απόκρυψη/Εμφάνιση γραμμής ελέγχου"
-
-#: ../vnc.html:85
-msgid "Move/Drag Viewport"
-msgstr "Μετακίνηση/Σύρσιμο Θεατού πεδίου"
-
-#: ../vnc.html:85
-msgid "viewport drag"
-msgstr "σύρσιμο θεατού πεδίου"
-
-#: ../vnc.html:91 ../vnc.html:94 ../vnc.html:97 ../vnc.html:100
-msgid "Active Mouse Button"
-msgstr "Ενεργό Πλήκτρο Ποντικιού"
-
-#: ../vnc.html:91
-msgid "No mousebutton"
-msgstr "Χωρίς Πλήκτρο Ποντικιού"
-
-#: ../vnc.html:94
-msgid "Left mousebutton"
-msgstr "Αριστερό Πλήκτρο Ποντικιού"
-
-#: ../vnc.html:97
-msgid "Middle mousebutton"
-msgstr "Μεσαίο Πλήκτρο Ποντικιού"
-
-#: ../vnc.html:100
-msgid "Right mousebutton"
-msgstr "Δεξί Πλήκτρο Ποντικιού"
-
-#: ../vnc.html:103
-msgid "Keyboard"
-msgstr "Πληκτρολόγιο"
-
-#: ../vnc.html:103
-msgid "Show Keyboard"
-msgstr "Εμφάνιση Πληκτρολογίου"
-
-#: ../vnc.html:110
-msgid "Extra keys"
-msgstr "Επιπλέον πλήκτρα"
-
-#: ../vnc.html:110
-msgid "Show Extra Keys"
-msgstr "Εμφάνιση Επιπλέον Πλήκτρων"
-
-#: ../vnc.html:115
-msgid "Ctrl"
-msgstr "Ctrl"
-
-#: ../vnc.html:115
-msgid "Toggle Ctrl"
-msgstr "Εναλλαγή Ctrl"
-
-#: ../vnc.html:118
-msgid "Alt"
-msgstr "Alt"
-
-#: ../vnc.html:118
-msgid "Toggle Alt"
-msgstr "Εναλλαγή Alt"
-
-#: ../vnc.html:121
-msgid "Send Tab"
-msgstr "Αποστολή Tab"
-
-#: ../vnc.html:121
-msgid "Tab"
-msgstr "Tab"
-
-#: ../vnc.html:124
-msgid "Esc"
-msgstr "Esc"
-
-#: ../vnc.html:124
-msgid "Send Escape"
-msgstr "Αποστολή Escape"
-
-#: ../vnc.html:127
-msgid "Ctrl+Alt+Del"
-msgstr "Ctrl+Alt+Del"
-
-#: ../vnc.html:127
-msgid "Send Ctrl-Alt-Del"
-msgstr "Αποστολή Ctrl-Alt-Del"
-
-#: ../vnc.html:135
-msgid "Shutdown/Reboot"
-msgstr "Κλείσιμο/Επανεκκίνηση"
-
-#: ../vnc.html:135
-msgid "Shutdown/Reboot..."
-msgstr "Κλείσιμο/Επανεκκίνηση..."
-
-#: ../vnc.html:141
-msgid "Power"
-msgstr "Απενεργοποίηση"
-
-#: ../vnc.html:143
-msgid "Shutdown"
-msgstr "Κλείσιμο"
-
-#: ../vnc.html:144
-msgid "Reboot"
-msgstr "Επανεκκίνηση"
-
-#: ../vnc.html:145
-msgid "Reset"
-msgstr "Επαναφορά"
-
-#: ../vnc.html:150 ../vnc.html:156
-msgid "Clipboard"
-msgstr "Πρόχειρο"
-
-#: ../vnc.html:160
-msgid "Clear"
-msgstr "Καθάρισμα"
-
-#: ../vnc.html:166
-msgid "Fullscreen"
-msgstr "Πλήρης Οθόνη"
-
-#: ../vnc.html:171 ../vnc.html:178
-msgid "Settings"
-msgstr "Ρυθμίσεις"
-
-#: ../vnc.html:181
-msgid "Encrypt"
-msgstr "Κρυπτογράφηση"
-
-#: ../vnc.html:184
-msgid "True Color"
-msgstr "Πραγματικά Χρώματα"
-
-#: ../vnc.html:187
-msgid "Local Cursor"
-msgstr "Τοπικός Δρομέας"
-
-#: ../vnc.html:190
-msgid "Clip to Window"
-msgstr "Αποκοπή στο όριο του Παράθυρου"
-
-#: ../vnc.html:193
-msgid "Shared Mode"
-msgstr "Κοινόχρηστη Λειτουργία"
-
-#: ../vnc.html:196
-msgid "View Only"
-msgstr "Μόνο Θέαση"
-
-#: ../vnc.html:200
-msgid "Path:"
-msgstr "Διαδρομή:"
-
-#: ../vnc.html:204
-msgid "Scaling Mode:"
-msgstr "Λειτουργία Κλιμάκωσης:"
-
-#: ../vnc.html:206
-msgid "None"
-msgstr "Καμία"
-
-#: ../vnc.html:207
-msgid "Local Scaling"
-msgstr "Τοπική Κλιμάκωση"
-
-#: ../vnc.html:208
-msgid "Local Downscaling"
-msgstr "Τοπική Συρρίκνωση"
-
-#: ../vnc.html:209
-msgid "Remote Resizing"
-msgstr "Απομακρυσμένη Αλλαγή μεγέθους"
-
-#: ../vnc.html:213
-msgid "Repeater ID:"
-msgstr "Repeater ID:"
-
-#: ../vnc.html:219
-msgid "Style:"
-msgstr "Στυλ:"
-
-#: ../vnc.html:221
-msgid "default"
-msgstr "προεπιλεγμένο"
-
-#: ../vnc.html:227
-msgid "Logging:"
-msgstr "Καταγραφή:"
-
-#: ../vnc.html:234
-msgid "Apply"
-msgstr "Εφαρμογή"
-
-#: ../vnc.html:241 ../vnc.html:271
-msgid "Connect"
-msgstr "Σύνδεση"
-
-#: ../vnc.html:244
-msgid "Disconnect"
-msgstr "Αποσύνδεση"
-
-#: ../vnc.html:251
-msgid "Connection"
-msgstr "Σύνδεση"
-
-#: ../vnc.html:254
-msgid "Host:"
-msgstr "Όνομα διακομιστή:"
-
-#: ../vnc.html:258
-msgid "Port:"
-msgstr "Πόρτα διακομιστή:"
-
-#: ../vnc.html:262 ../vnc.html:290
-msgid "Password:"
-msgstr "Κωδικός Πρόσβασης:"
-
-#: ../vnc.html:266
-msgid "Token:"
-msgstr "Διακριτικό:"
-
-#: ../vnc.html:294
-msgid "Send Password"
-msgstr "Αποστολή Κωδικού Πρόσβασης"
-
-#: ../vnc.html:319
-msgid "Canvas not supported."
-msgstr "Δεν υποστηρίζεται το στοιχείο Canvas"
diff --git a/po/nl.po b/po/nl.po
deleted file mode 100644
index 8a0bf74c..00000000
--- a/po/nl.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# Dutch translations for noVNC package
-# Nederlandse vertalingen voor het pakket noVNC.
-# Copyright (C) 2016 Various Authors
-# This file is distributed under the same license as the noVNC package.
-# Loek Janssen , 2016.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: noVNC 0.6.1\n"
-"Report-Msgid-Bugs-To: novnc@googlegroups.com\n"
-"POT-Creation-Date: 2016-11-15 08:11+0100\n"
-"PO-Revision-Date: 2016-11-15 07:51+0100\n"
-"Last-Translator: Loek Janssen \n"
-"Language-Team: none\n"
-"Language: nl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../app/ui.js:402
-msgid "Connecting..."
-msgstr "Verbinden..."
-
-#: ../app/ui.js:409
-msgid "Connected (encrypted) to "
-msgstr "Verbonden (versleuteld) met "
-
-#: ../app/ui.js:411
-msgid "Connected (unencrypted) to "
-msgstr "Verbonden (onversleuteld) met "
-
-#: ../app/ui.js:416
-msgid "Disconnecting..."
-msgstr "Verbinding verbreken..."
-
-#: ../app/ui.js:421
-msgid "Disconnected"
-msgstr "Verbinding verbroken"
-
-#: ../app/ui.js:1006 ../core/rfb.js:278
-msgid "Must set host and port"
-msgstr "Host en poort moeten worden ingesteld"
-
-#: ../app/ui.js:1059
-msgid "Password is required"
-msgstr "Wachtwoord is vereist"
-
-#: ../app/ui.js:1272
-msgid ""
-"Forcing clipping mode since scrollbars aren't supported by IE in fullscreen"
-msgstr ""
-"''Clipping mode' ingeschakeld, omdat schuifbalken in volledige-scherm-modus "
-"in IE niet worden ondersteund"
-
-#: ../core/rfb.js:556
-msgid "Disconnect timeout"
-msgstr "Timeout tijdens verbreken van verbinding"
diff --git a/po/noVNC.pot b/po/noVNC.pot
deleted file mode 100644
index 160a2d47..00000000
--- a/po/noVNC.pot
+++ /dev/null
@@ -1,291 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Various Authors
-# This file is distributed under the same license as the noVNC package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: noVNC 0.6.1\n"
-"Report-Msgid-Bugs-To: novnc@googlegroups.com\n"
-"POT-Creation-Date: 2016-11-15 19:32+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../app/ui.js:405
-msgid "Connecting..."
-msgstr ""
-
-#: ../app/ui.js:412
-msgid "Connected (encrypted) to "
-msgstr ""
-
-#: ../app/ui.js:414
-msgid "Connected (unencrypted) to "
-msgstr ""
-
-#: ../app/ui.js:419
-msgid "Disconnecting..."
-msgstr ""
-
-#: ../app/ui.js:424
-msgid "Disconnected"
-msgstr ""
-
-#: ../app/ui.js:1009 ../core/rfb.js:278
-msgid "Must set host and port"
-msgstr ""
-
-#: ../app/ui.js:1062
-msgid "Password is required"
-msgstr ""
-
-#: ../app/ui.js:1275
-msgid ""
-"Forcing clipping mode since scrollbars aren't supported by IE in fullscreen"
-msgstr ""
-
-#: ../core/rfb.js:556
-msgid "Disconnect timeout"
-msgstr ""
-
-#: ../vnc.html:70
-msgid "noVNC encountered an error:"
-msgstr ""
-
-#: ../vnc.html:78
-msgid "Hide/Show the control bar"
-msgstr ""
-
-#: ../vnc.html:85
-msgid "Move/Drag Viewport"
-msgstr ""
-
-#: ../vnc.html:85
-msgid "viewport drag"
-msgstr ""
-
-#: ../vnc.html:91 ../vnc.html:94 ../vnc.html:97 ../vnc.html:100
-msgid "Active Mouse Button"
-msgstr ""
-
-#: ../vnc.html:91
-msgid "No mousebutton"
-msgstr ""
-
-#: ../vnc.html:94
-msgid "Left mousebutton"
-msgstr ""
-
-#: ../vnc.html:97
-msgid "Middle mousebutton"
-msgstr ""
-
-#: ../vnc.html:100
-msgid "Right mousebutton"
-msgstr ""
-
-#: ../vnc.html:103
-msgid "Keyboard"
-msgstr ""
-
-#: ../vnc.html:103
-msgid "Show Keyboard"
-msgstr ""
-
-#: ../vnc.html:110
-msgid "Extra keys"
-msgstr ""
-
-#: ../vnc.html:110
-msgid "Show Extra Keys"
-msgstr ""
-
-#: ../vnc.html:115
-msgid "Ctrl"
-msgstr ""
-
-#: ../vnc.html:115
-msgid "Toggle Ctrl"
-msgstr ""
-
-#: ../vnc.html:118
-msgid "Alt"
-msgstr ""
-
-#: ../vnc.html:118
-msgid "Toggle Alt"
-msgstr ""
-
-#: ../vnc.html:121
-msgid "Send Tab"
-msgstr ""
-
-#: ../vnc.html:121
-msgid "Tab"
-msgstr ""
-
-#: ../vnc.html:124
-msgid "Esc"
-msgstr ""
-
-#: ../vnc.html:124
-msgid "Send Escape"
-msgstr ""
-
-#: ../vnc.html:127
-msgid "Ctrl+Alt+Del"
-msgstr ""
-
-#: ../vnc.html:127
-msgid "Send Ctrl-Alt-Del"
-msgstr ""
-
-#: ../vnc.html:135
-msgid "Shutdown/Reboot"
-msgstr ""
-
-#: ../vnc.html:135
-msgid "Shutdown/Reboot..."
-msgstr ""
-
-#: ../vnc.html:141
-msgid "Power"
-msgstr ""
-
-#: ../vnc.html:143
-msgid "Shutdown"
-msgstr ""
-
-#: ../vnc.html:144
-msgid "Reboot"
-msgstr ""
-
-#: ../vnc.html:145
-msgid "Reset"
-msgstr ""
-
-#: ../vnc.html:150 ../vnc.html:156
-msgid "Clipboard"
-msgstr ""
-
-#: ../vnc.html:160
-msgid "Clear"
-msgstr ""
-
-#: ../vnc.html:166
-msgid "Fullscreen"
-msgstr ""
-
-#: ../vnc.html:171 ../vnc.html:178
-msgid "Settings"
-msgstr ""
-
-#: ../vnc.html:181
-msgid "Encrypt"
-msgstr ""
-
-#: ../vnc.html:184
-msgid "True Color"
-msgstr ""
-
-#: ../vnc.html:187
-msgid "Local Cursor"
-msgstr ""
-
-#: ../vnc.html:190
-msgid "Clip to Window"
-msgstr ""
-
-#: ../vnc.html:193
-msgid "Shared Mode"
-msgstr ""
-
-#: ../vnc.html:196
-msgid "View Only"
-msgstr ""
-
-#: ../vnc.html:200
-msgid "Path:"
-msgstr ""
-
-#: ../vnc.html:204
-msgid "Scaling Mode:"
-msgstr ""
-
-#: ../vnc.html:206
-msgid "None"
-msgstr ""
-
-#: ../vnc.html:207
-msgid "Local Scaling"
-msgstr ""
-
-#: ../vnc.html:208
-msgid "Local Downscaling"
-msgstr ""
-
-#: ../vnc.html:209
-msgid "Remote Resizing"
-msgstr ""
-
-#: ../vnc.html:213
-msgid "Repeater ID:"
-msgstr ""
-
-#: ../vnc.html:219
-msgid "Style:"
-msgstr ""
-
-#: ../vnc.html:221
-msgid "default"
-msgstr ""
-
-#: ../vnc.html:227
-msgid "Logging:"
-msgstr ""
-
-#: ../vnc.html:234
-msgid "Apply"
-msgstr ""
-
-#: ../vnc.html:241 ../vnc.html:271
-msgid "Connect"
-msgstr ""
-
-#: ../vnc.html:244
-msgid "Disconnect"
-msgstr ""
-
-#: ../vnc.html:251
-msgid "Connection"
-msgstr ""
-
-#: ../vnc.html:254
-msgid "Host:"
-msgstr ""
-
-#: ../vnc.html:258
-msgid "Port:"
-msgstr ""
-
-#: ../vnc.html:262 ../vnc.html:290
-msgid "Password:"
-msgstr ""
-
-#: ../vnc.html:266
-msgid "Token:"
-msgstr ""
-
-#: ../vnc.html:294
-msgid "Send Password"
-msgstr ""
-
-#: ../vnc.html:319
-msgid "Canvas not supported."
-msgstr ""
diff --git a/po/po2js b/po/po2js
deleted file mode 100755
index 15304c9c..00000000
--- a/po/po2js
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env node
-/*
- * ps2js: gettext .po to noVNC .js converter
- * Copyright (C) 2016 Pierre Ossman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program 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. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-var getopt = require('node-getopt');
-var fs = require('fs');
-var po2json = require("po2json");
-
-opt = getopt.create([
- ['h' , 'help' , 'display this help'],
-]).bindHelp().parseSystem();
-
-if (opt.argv.length != 2) {
- console.error("Incorrect number of arguments given");
- process.exit(1);
-}
-
-var data = po2json.parseFileSync(opt.argv[0]);
-
-var bodyPart = Object.keys(data).filter((msgid) => msgid !== "").map((msgid) => {
- if (msgid === "") return;
- var msgstr = data[msgid][1];
- return " " + JSON.stringify(msgid) + ": " + JSON.stringify(msgstr);
-}).join(",\n");
-
-var output = "{\n" + bodyPart + "\n}";
-
-fs.writeFileSync(opt.argv[1], output);
diff --git a/po/sv.po b/po/sv.po
deleted file mode 100644
index 9df5ad5e..00000000
--- a/po/sv.po
+++ /dev/null
@@ -1,293 +0,0 @@
-# Swedish translations for noVNC package
-# Svenska översättningar för paket noVNC.
-# Copyright (C) 2016 Various Authors
-# This file is distributed under the same license as the noVNC package.
-# Samuel Mannehed , 2016.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: noVNC 0.6.1\n"
-"Report-Msgid-Bugs-To: novnc@googlegroups.com\n"
-"POT-Creation-Date: 2016-11-15 19:32+0100\n"
-"PO-Revision-Date: 2016-11-15 07:51+0100\n"
-"Last-Translator: Pierre Ossman \n"
-"Language-Team: none\n"
-"Language: sv\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ../app/ui.js:405
-msgid "Connecting..."
-msgstr "Ansluter..."
-
-#: ../app/ui.js:412
-msgid "Connected (encrypted) to "
-msgstr "Ansluten (krypterat) till "
-
-#: ../app/ui.js:414
-msgid "Connected (unencrypted) to "
-msgstr "Ansluten (okrypterat) till "
-
-#: ../app/ui.js:419
-msgid "Disconnecting..."
-msgstr "Kopplar ner..."
-
-#: ../app/ui.js:424
-msgid "Disconnected"
-msgstr "Frånkopplad"
-
-#: ../app/ui.js:1009 ../core/rfb.js:278
-msgid "Must set host and port"
-msgstr "Du måste specifiera en host och port"
-
-#: ../app/ui.js:1062
-msgid "Password is required"
-msgstr "Lösenord krävs"
-
-#: ../app/ui.js:1275
-msgid ""
-"Forcing clipping mode since scrollbars aren't supported by IE in fullscreen"
-msgstr ""
-"Tvingar 'Clipping mode' eftersom skrollning inte stödjs av IE i fullskärm"
-
-#: ../core/rfb.js:556
-msgid "Disconnect timeout"
-msgstr "Det tog för lång tid att koppla ner"
-
-#: ../vnc.html:70
-msgid "noVNC encountered an error:"
-msgstr "noVNC stötte på ett problem:"
-
-#: ../vnc.html:78
-msgid "Hide/Show the control bar"
-msgstr "Göm/Visa kontrollbaren"
-
-#: ../vnc.html:85
-msgid "Move/Drag Viewport"
-msgstr "Flytta/Dra Vyn"
-
-#: ../vnc.html:85
-msgid "viewport drag"
-msgstr "dra vy"
-
-#: ../vnc.html:91 ../vnc.html:94 ../vnc.html:97 ../vnc.html:100
-msgid "Active Mouse Button"
-msgstr "Aktiv musknapp"
-
-#: ../vnc.html:91
-msgid "No mousebutton"
-msgstr "Ingen musknapp"
-
-#: ../vnc.html:94
-msgid "Left mousebutton"
-msgstr "Vänster musknapp"
-
-#: ../vnc.html:97
-msgid "Middle mousebutton"
-msgstr "Mitten-musknapp"
-
-#: ../vnc.html:100
-msgid "Right mousebutton"
-msgstr "Höger musknapp"
-
-#: ../vnc.html:103
-msgid "Keyboard"
-msgstr "Tangentbord"
-
-#: ../vnc.html:103
-msgid "Show Keyboard"
-msgstr "Visa Tangentbord"
-
-#: ../vnc.html:110
-msgid "Extra keys"
-msgstr "Extraknappar"
-
-#: ../vnc.html:110
-msgid "Show Extra Keys"
-msgstr "Visa Extraknappar"
-
-#: ../vnc.html:115
-msgid "Ctrl"
-msgstr "Ctrl"
-
-#: ../vnc.html:115
-msgid "Toggle Ctrl"
-msgstr "Växla Ctrl"
-
-#: ../vnc.html:118
-msgid "Alt"
-msgstr "Alt"
-
-#: ../vnc.html:118
-msgid "Toggle Alt"
-msgstr "Växla Alt"
-
-#: ../vnc.html:121
-msgid "Send Tab"
-msgstr "Skicka Tab"
-
-#: ../vnc.html:121
-msgid "Tab"
-msgstr "Tab"
-
-#: ../vnc.html:124
-msgid "Esc"
-msgstr "Esc"
-
-#: ../vnc.html:124
-msgid "Send Escape"
-msgstr "Skicka Escape"
-
-#: ../vnc.html:127
-msgid "Ctrl+Alt+Del"
-msgstr "Ctrl+Alt+Del"
-
-#: ../vnc.html:127
-msgid "Send Ctrl-Alt-Del"
-msgstr "Skicka Ctrl-Alt-Del"
-
-#: ../vnc.html:135
-msgid "Shutdown/Reboot"
-msgstr "Stäng av/Boota om"
-
-#: ../vnc.html:135
-msgid "Shutdown/Reboot..."
-msgstr "Stäng av/Boota om..."
-
-#: ../vnc.html:141
-msgid "Power"
-msgstr "Ström"
-
-#: ../vnc.html:143
-msgid "Shutdown"
-msgstr "Stäng av"
-
-#: ../vnc.html:144
-msgid "Reboot"
-msgstr "Boota om"
-
-#: ../vnc.html:145
-msgid "Reset"
-msgstr "Återställ"
-
-#: ../vnc.html:150 ../vnc.html:156
-msgid "Clipboard"
-msgstr "Urklipp"
-
-#: ../vnc.html:160
-msgid "Clear"
-msgstr "Rensa"
-
-#: ../vnc.html:166
-msgid "Fullscreen"
-msgstr "Fullskärm"
-
-#: ../vnc.html:171 ../vnc.html:178
-msgid "Settings"
-msgstr "Inställningar"
-
-#: ../vnc.html:181
-msgid "Encrypt"
-msgstr "Kryptera"
-
-#: ../vnc.html:184
-msgid "True Color"
-msgstr "Fullfärg"
-
-#: ../vnc.html:187
-msgid "Local Cursor"
-msgstr "Lokal Muspekare"
-
-#: ../vnc.html:190
-msgid "Clip to Window"
-msgstr "Begränsa till Fönster"
-
-#: ../vnc.html:193
-msgid "Shared Mode"
-msgstr "Delat Läge"
-
-#: ../vnc.html:196
-msgid "View Only"
-msgstr "Endast Visning"
-
-#: ../vnc.html:200
-msgid "Path:"
-msgstr "Sökväg:"
-
-#: ../vnc.html:204
-msgid "Scaling Mode:"
-msgstr "Skalningsläge:"
-
-#: ../vnc.html:206
-msgid "None"
-msgstr "Ingen"
-
-#: ../vnc.html:207
-msgid "Local Scaling"
-msgstr "Lokal Skalning"
-
-#: ../vnc.html:208
-msgid "Local Downscaling"
-msgstr "Lokal Nedskalning"
-
-#: ../vnc.html:209
-msgid "Remote Resizing"
-msgstr "Ändra Storlek"
-
-#: ../vnc.html:213
-msgid "Repeater ID:"
-msgstr "Repeater-ID:"
-
-#: ../vnc.html:219
-msgid "Style:"
-msgstr "Stil:"
-
-#: ../vnc.html:221
-msgid "default"
-msgstr "standard"
-
-#: ../vnc.html:227
-msgid "Logging:"
-msgstr "Loggning:"
-
-#: ../vnc.html:234
-msgid "Apply"
-msgstr "Verkställ"
-
-#: ../vnc.html:241 ../vnc.html:271
-msgid "Connect"
-msgstr "Anslut"
-
-#: ../vnc.html:244
-msgid "Disconnect"
-msgstr "Koppla från"
-
-#: ../vnc.html:251
-msgid "Connection"
-msgstr "Uppkoppling"
-
-#: ../vnc.html:254
-msgid "Host:"
-msgstr "Värd:"
-
-#: ../vnc.html:258
-msgid "Port:"
-msgstr "Port:"
-
-#: ../vnc.html:262 ../vnc.html:290
-msgid "Password:"
-msgstr "Lösenord:"
-
-#: ../vnc.html:266
-msgid "Token:"
-msgstr "Token:"
-
-#: ../vnc.html:294
-msgid "Send Password"
-msgstr "Skicka Lösenord"
-
-#: ../vnc.html:319
-msgid "Canvas not supported."
-msgstr "Canvas stöds ej"
diff --git a/po/xgettext-html b/po/xgettext-html
deleted file mode 100755
index d71822c4..00000000
--- a/po/xgettext-html
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/bin/env node
-/*
- * xgettext-html: HTML gettext parser
- * Copyright (C) 2016 Pierre Ossman
- * Licensed under MPL 2.0 (see LICENSE.txt)
- */
-
-var getopt = require('node-getopt');
-
-var jsdom = require("jsdom");
-var fs = require("fs");
-
-opt = getopt.create([
- ['o' , 'output=FILE' , 'write output to specified file'],
- ['h' , 'help' , 'display this help'],
-]).bindHelp().parseSystem();
-
-var strings = {};
-
-function addString(str, location) {
- if (str.length == 0) {
- return;
- }
-
- if (strings[str] === undefined) {
- strings[str] = {}
- }
- strings[str][location] = null;
-}
-
-// See https://html.spec.whatwg.org/multipage/dom.html#attr-translate
-function process(elem, locator, enabled) {
- function isAnyOf(searchElement, items) {
- return items.indexOf(searchElement) !== -1;
- }
-
- if (elem.hasAttribute("translate")) {
- if (isAnyOf(elem.getAttribute("translate"), ["", "yes"])) {
- enabled = true;
- } else if (isAnyOf(elem.getAttribute("translate"), ["no"])) {
- enabled = false;
- }
- }
-
- if (enabled) {
- if (elem.hasAttribute("abbr") &&
- elem.tagName === "TH") {
- addString(elem.getAttribute("abbr"), locator(elem));
- }
- if (elem.hasAttribute("alt") &&
- isAnyOf(elem.tagName, ["AREA", "IMG", "INPUT"])) {
- addString(elem.getAttribute("alt"), locator(elem));
- }
- if (elem.hasAttribute("download") &&
- isAnyOf(elem.tagName, ["A", "AREA"])) {
- addString(elem.getAttribute("download"), locator(elem));
- }
- if (elem.hasAttribute("label") &&
- isAnyOf(elem.tagName, ["MENUITEM", "MENU", "OPTGROUP",
- "OPTION", "TRACK"])) {
- addString(elem.getAttribute("label"), locator(elem));
- }
- if (elem.hasAttribute("placeholder") &&
- isAnyOf(elem.tagName in ["INPUT", "TEXTAREA"])) {
- addString(elem.getAttribute("placeholder"), locator(elem));
- }
- if (elem.hasAttribute("title")) {
- addString(elem.getAttribute("title"), locator(elem));
- }
- if (elem.hasAttribute("value") &&
- elem.tagName === "INPUT" &&
- isAnyOf(elem.getAttribute("type"), ["reset", "button"])) {
- addString(elem.getAttribute("value"), locator(elem));
- }
- }
-
- for (var i = 0;i < elem.childNodes.length;i++) {
- node = elem.childNodes[i];
- if (node.nodeType === node.ELEMENT_NODE) {
- process(node, locator, enabled);
- } else if (node.nodeType === node.TEXT_NODE && enabled) {
- addString(node.data.trim(), locator(node));
- }
- }
-}
-
-for (var i = 0;i < opt.argv.length;i++) {
- var file;
-
- fn = opt.argv[i];
- file = fs.readFileSync(fn, "utf8");
- doc = jsdom.jsdom(file);
-
- locator = function (elem) {
- offset = jsdom.nodeLocation(elem).start;
- line = file.slice(0, offset).split("\n").length;
- return fn + ":" + line;
- };
-
- process(doc.body, locator, true);
-}
-
-var output = "";
-
-for (str in strings) {
- output += "#:";
- for (location in strings[str]) {
- output += " " + location;
- }
- output += "\n";
-
- output += "msgid " + JSON.stringify(str) + "\n";
- output += "msgstr \"\"\n";
- output += "\n";
-}
-
-fs.writeFileSync(opt.options.output, output);
diff --git a/tests/arrays.html b/tests/arrays.html
new file mode 100644
index 00000000..257df261
--- /dev/null
+++ b/tests/arrays.html
@@ -0,0 +1,39 @@
+
+
+
+ Javascript Arrays Performance Test
+
+
+
+
+
+
+
+
+ Javascript Arrays Performance Test
+ Iterations:
+ Array Size: *1024
+
+
+
+
+ Results:
+
+
+
+
+
+
+
+
diff --git a/tests/arrays.js b/tests/arrays.js
new file mode 100644
index 00000000..69da7fbb
--- /dev/null
+++ b/tests/arrays.js
@@ -0,0 +1,375 @@
+/*
+ * Javascript binary array performance tests
+ * Copyright (C) 2012 Joel Martin
+ * Licensed under MPL 2.0 (see LICENSE.txt)
+ */
+
+var ctx, i, j, randlist,
+ new_normal, new_imageData, new_arrayBuffer,
+ browser = Browser.browser + " " +
+ Browser.version + " on " +
+ Browser.OS,
+ do_imageData = false,
+ do_arrayBuffer = false,
+ conf = {
+ 'create_cnt' : 2000,
+ 'read_cnt' : 5000000,
+ 'write_cnt' : 5000000,
+ 'iterations' : 0,
+ 'order_l1' : [browser],
+ 'order_l2' : ['normal',
+ 'imageData',
+ 'arrayBuffer'],
+ 'order_l3' : ['create',
+ 'sequentialRead',
+ 'randomRead',
+ 'sequentialWrite']
+ },
+ stats = {},
+ testFunc = {},
+ iteration, arraySize;
+
+var newline = "\n";
+if (Util.Engine.trident) {
+ var newline = "
\n";
+}
+function message(str) {
+ //console.log(str);
+ cell = $D('messages');
+ cell.innerHTML += str + newline;
+ cell.scrollTop = cell.scrollHeight;
+}
+
+function vmessage(str) {
+ if (verbose) {
+ message(str);
+ } else {
+ console.log(str);
+ }
+}
+
+new_normal = function() {
+ var arr = [], i;
+ for (i = 0; i < arraySize; i++) {
+ arr[i] = 0;
+ }
+ return arr;
+}
+
+/* Will be overridden with real function */
+new_imageData = function() {
+ throw("imageData not supported");
+};
+
+new_imageData_createImageData = function() {
+ var imageData = ctx.createImageData(1024/4, arraySize / 1024);
+ return imageData.data;
+};
+
+new_imageData_getImageData = function() {
+ var imageData = ctx.getImageData(0, 0, 1024/4, arraySize / 1024),
+ arr = imageData.data;
+ for (i = 0; i < arraySize; i++) {
+ arr[i] = 0;
+ }
+ return arr;
+};
+
+new_arrayBuffer = function() {
+ var arr = new ArrayBuffer(arraySize);
+ return new Uint8Array(arr);
+}
+
+function init_randlist() {
+ randlist = [];
+ for (var i=0; i < arraySize; i++) {
+ randlist[i] = parseInt(Math.random() * 256, 10);
+ }
+}
+function copy_randlist(arr) {
+ for (var i=0; i < arraySize; i++) {
+ arr[i] = randlist[i];
+ }
+}
+
+function begin() {
+ var i, j;
+ conf.iterations = parseInt($D('iterations').value, 10);
+ arraySize = parseInt($D('arraySize').value, 10) * 1024;
+
+ init_randlist();
+
+ // TODO: randomize test_list
+
+ stats = {};
+ for (i = 0; i < conf.order_l2.length; i++) {
+ stats[conf.order_l2[i]] = {};
+ for (j = 0; j < conf.order_l3.length; j++) {
+ stats[conf.order_l2[i]][conf.order_l3[j]] = [];
+ }
+ }
+
+ $D('startButton').value = "Running";
+ $D('startButton').disabled = true;
+
+ message("running " + conf.iterations + " test iterations");
+ iteration = 1;
+ setTimeout(run_next_iteration, 250);
+}
+
+function finish() {
+ var totalTime, arrayType, testType, times;
+ message("tests finished");
+
+ for (j = 0; j < conf.order_l3.length; j++) {
+ testType = conf.order_l3[j];
+ message("Test '" + testType + "'");
+ for (i = 0; i < conf.order_l2.length; i++) {
+ arrayType = conf.order_l2[i];
+ message(" Array Type '" + arrayType);
+ times = stats[arrayType][testType];
+ message(" Average : " + times.mean() + "ms" +
+ " (Total: " + times.sum() + "ms)");
+ message(" Min/Max : " + times.min() + "ms/" +
+ times.max() + "ms");
+ message(" StdDev : " + times.stdDev() + "ms");
+ }
+ }
+
+ vmessage("array_chart.py JSON data:");
+ chart_data = {'conf' : conf, 'stats' : { } };
+ chart_data.stats[browser] = stats;
+ chart_data.stats['next_browser'] = {};
+ vmessage(JSON.stringify(chart_data, null, 2));
+
+ $D('startButton').disabled = false;
+ $D('startButton').value = "Run Tests";
+}
+
+function run_next_iteration() {
+ var arrayType, testType, deltaTime;
+
+ for (i = 0; i < conf.order_l2.length; i++) {
+ arrayType = conf.order_l2[i];
+ if (arrayType === 'imageData' && (!do_imageData)) {
+ continue;
+ }
+ if (arrayType === 'arrayBuffer' && (!do_arrayBuffer)) {
+ continue;
+ }
+ for (j = 0; j < conf.order_l3.length; j++) {
+ testType = conf.order_l3[j];
+
+ deltaTime = testFunc[arrayType + "_" + testType]();
+
+ stats[arrayType][testType].push(deltaTime);
+ vmessage("test " + (arrayType + "_" + testType) +
+ " time: " + (deltaTime) + "ms");
+ }
+ }
+
+ message("finished test iteration " + iteration);
+ if (iteration >= conf.iterations) {
+ setTimeout(finish, 1);
+ return;
+ }
+ iteration++;
+ setTimeout(run_next_iteration, 1);
+}
+
+/*
+ * Test functions
+ */
+
+testFunc["normal_create"] = function() {
+ var cnt, arrNormal, startTime, endTime;
+ vmessage("create normal array " + conf.create_cnt + "x, initialized to 0");
+
+ startTime = (new Date()).getTime();
+ for (cnt = 0; cnt < conf.create_cnt; cnt++) {
+ arrNormal = new_normal();
+ }
+ endTime = (new Date()).getTime();
+
+ return endTime - startTime;
+};
+
+testFunc["imageData_create"] = function() {
+ var cnt, arrImage, startTime, endTime;
+ vmessage("create imageData array " + conf.create_cnt + "x, initialized to 0");
+
+ startTime = (new Date()).getTime();
+ for (cnt = 0; cnt < conf.create_cnt; cnt++) {
+ arrImage = new_imageData();
+ }
+ endTime = (new Date()).getTime();
+
+ if (arrImage[103] !== 0) {
+ message("Initialization failed, arrImage[103] is: " + arrImage[103]);
+ throw("Initialization failed, arrImage[103] is: " + arrImage[103]);
+ }
+ return endTime - startTime;
+};
+
+testFunc["arrayBuffer_create"] = function() {
+ var cnt, arrBuffer, startTime, endTime;
+ vmessage("create arrayBuffer array " + conf.create_cnt + "x, initialized to 0");
+
+ startTime = (new Date()).getTime();
+ for (cnt = 0; cnt < conf.create_cnt; cnt++) {
+ arrBuffer = new_arrayBuffer();
+ }
+ endTime = (new Date()).getTime();
+
+ if (arrBuffer[103] !== 0) {
+ message("Initialization failed, arrBuffer[103] is: " + arrBuffer[103]);
+ throw("Initialization failed, arrBuffer[103] is: " + arrBuffer[103]);
+ }
+ return endTime - startTime;
+};
+
+function test_sequentialRead(arr) {
+ var i, j, cnt, startTime, endTime;
+ /* Initialize the array */
+ copy_randlist(arr);
+
+ startTime = (new Date()).getTime();
+ i = 0;
+ j = 0;
+ for (cnt = 0; cnt < conf.read_cnt; cnt++) {
+ j = arr[i];
+ i++;
+ if (i >= arraySize) {
+ i = 0;
+ }
+ }
+ endTime = (new Date()).getTime();
+
+ return endTime - startTime;
+}
+
+function test_randomRead(arr) {
+ var i, cnt, startTime, endTime;
+ /* Initialize the array */
+ copy_randlist(arr); // used as jumplist
+
+ startTime = (new Date()).getTime();
+ i = 0;
+ for (cnt = 0; cnt < conf.read_cnt; cnt++) {
+ i = (arr[i] + cnt) % arraySize;
+ }
+ endTime = (new Date()).getTime();
+
+ return endTime - startTime;
+}
+
+function test_sequentialWrite(arr) {
+ var i, cnt, startTime, endTime;
+ /* Initialize the array */
+ copy_randlist(arr);
+
+ startTime = (new Date()).getTime();
+ i = 0;
+ for (cnt = 0; cnt < conf.write_cnt; cnt++) {
+ arr[i] = (cnt % 256);
+ i++;
+ if (i >= arraySize) {
+ i = 0;
+ }
+ }
+ endTime = (new Date()).getTime();
+
+ return endTime - startTime;
+}
+
+/* Sequential Read Tests */
+testFunc["normal_sequentialRead"] = function() {
+ vmessage("read normal array " + conf.read_cnt + "x");
+ return test_sequentialRead(new_normal());
+};
+
+testFunc["imageData_sequentialRead"] = function() {
+ vmessage("read imageData array " + conf.read_cnt + "x");
+ return test_sequentialRead(new_imageData());
+};
+
+testFunc["arrayBuffer_sequentialRead"] = function() {
+ vmessage("read arrayBuffer array " + conf.read_cnt + "x");
+ return test_sequentialRead(new_arrayBuffer());
+};
+
+
+/* Random Read Tests */
+testFunc["normal_randomRead"] = function() {
+ vmessage("read normal array " + conf.read_cnt + "x");
+ return test_randomRead(new_normal());
+};
+
+testFunc["imageData_randomRead"] = function() {
+ vmessage("read imageData array " + conf.read_cnt + "x");
+ return test_randomRead(new_imageData());
+};
+
+testFunc["arrayBuffer_randomRead"] = function() {
+ vmessage("read arrayBuffer array " + conf.read_cnt + "x");
+ return test_randomRead(new_arrayBuffer());
+};
+
+
+/* Sequential Write Tests */
+testFunc["normal_sequentialWrite"] = function() {
+ vmessage("write normal array " + conf.write_cnt + "x");
+ return test_sequentialWrite(new_normal());
+};
+
+testFunc["imageData_sequentialWrite"] = function() {
+ vmessage("write imageData array " + conf.write_cnt + "x");
+ return test_sequentialWrite(new_imageData());
+};
+
+testFunc["arrayBuffer_sequentialWrite"] = function() {
+ vmessage("write arrayBuffer array " + conf.write_cnt + "x");
+ return test_sequentialWrite(new_arrayBuffer());
+};
+
+init = function() {
+ vmessage(">> init");
+
+ $D('iterations').value = 10;
+ $D('arraySize').value = 10;
+ arraySize = parseInt($D('arraySize').value, 10) * 1024;
+
+ message("Browser: " + browser);
+
+ /* Determine browser binary array support */
+ try {
+ ctx = $D('canvas').getContext('2d');
+ new_imageData = new_imageData_createImageData;
+ new_imageData();
+ do_imageData = true;
+ } catch (exc) {
+ vmessage("createImageData not supported: " + exc);
+ try {
+ ctx = $D('canvas').getContext('2d');
+ new_imageData = new_imageData_getImageData;
+ blah = new_imageData();
+ do_imageData = true;
+ } catch (exc) {
+ vmessage("getImageData not supported: " + exc);
+ }
+ }
+ if (! do_imageData) {
+ message("imageData arrays not supported");
+ }
+
+ try {
+ new_arrayBuffer();
+ do_arrayBuffer = true;
+ } catch (exc) {
+ vmessage("Typed Arrays not supported: " + exc);
+ }
+ if (! do_arrayBuffer) {
+ message("Typed Arrays (ArrayBuffers) not suppoted");
+ }
+ vmessage("<< init");
+}
diff --git a/tests/assertions.js b/tests/assertions.js
deleted file mode 100644
index da6f0c5c..00000000
--- a/tests/assertions.js
+++ /dev/null
@@ -1,103 +0,0 @@
-// some useful assertions for noVNC
-chai.use(function (_chai, utils) {
- _chai.Assertion.addMethod('displayed', function (target_data) {
- var obj = this._obj;
- var ctx = obj._target.getContext('2d');
- var data_cl = ctx.getImageData(0, 0, obj._target.width, obj._target.height).data;
- // NB(directxman12): PhantomJS 1.x doesn't implement Uint8ClampedArray, so work around that
- var data = new Uint8Array(data_cl);
- var same = true;
- var len = data_cl.length;
- if (len != target_data.length) {
- same = false;
- } else {
- for (var i = 0; i < len; i++) {
- if (data[i] != target_data[i]) {
- same = false;
- break;
- }
- }
- }
- if (!same) {
- console.log("expected data: %o, actual data: %o", target_data, data);
- }
- this.assert(same,
- "expected #{this} to have displayed the image #{exp}, but instead it displayed #{act}",
- "expected #{this} not to have displayed the image #{act}",
- target_data,
- data);
- });
-
- _chai.Assertion.addMethod('sent', function (target_data) {
- var obj = this._obj;
- obj.inspect = function () {
- var res = { _websocket: obj._websocket, rQi: obj._rQi, _rQ: new Uint8Array(obj._rQ.buffer, 0, obj._rQlen),
- _sQ: new Uint8Array(obj._sQ.buffer, 0, obj._sQlen) };
- res.prototype = obj;
- return res;
- };
- var data = obj._websocket._get_sent_data();
- var same = true;
- if (data.length != target_data.length) {
- same = false;
- } else {
- for (var i = 0; i < data.length; i++) {
- if (data[i] != target_data[i]) {
- same = false;
- break;
- }
- }
- }
- if (!same) {
- console.log("expected data: %o, actual data: %o", target_data, data);
- }
- this.assert(same,
- "expected #{this} to have sent the data #{exp}, but it actually sent #{act}",
- "expected #{this} not to have sent the data #{act}",
- Array.prototype.slice.call(target_data),
- Array.prototype.slice.call(data));
- });
-
- _chai.Assertion.addProperty('array', function () {
- utils.flag(this, 'array', true);
- });
-
- _chai.Assertion.overwriteMethod('equal', function (_super) {
- return function assertArrayEqual(target) {
- if (utils.flag(this, 'array')) {
- var obj = this._obj;
-
- var i;
- var same = true;
-
- if (utils.flag(this, 'deep')) {
- for (i = 0; i < obj.length; i++) {
- if (!utils.eql(obj[i], target[i])) {
- same = false;
- break;
- }
- }
-
- this.assert(same,
- "expected #{this} to have elements deeply equal to #{exp}",
- "expected #{this} not to have elements deeply equal to #{exp}",
- Array.prototype.slice.call(target));
- } else {
- for (i = 0; i < obj.length; i++) {
- if (obj[i] != target[i]) {
- same = false;
- break;
- }
- }
-
- this.assert(same,
- "expected #{this} to have elements equal to #{exp}",
- "expected #{this} not to have elements equal to #{exp}",
- Array.prototype.slice.call(target));
- }
- } else {
- _super.apply(this, arguments);
- }
- };
- });
-});
diff --git a/tests/base64.html b/tests/base64.html
new file mode 100644
index 00000000..dc45fdd5
--- /dev/null
+++ b/tests/base64.html
@@ -0,0 +1,91 @@
+
+
+
+ Native Base64 Tests
+
+
+
+
+
+ Native Base64 Tests
+
+
+ Messages:
+
+
+
+
+
+
diff --git a/tests/base64.js b/tests/base64.js
new file mode 100644
index 00000000..6ade00a3
--- /dev/null
+++ b/tests/base64.js
@@ -0,0 +1,12 @@
+// The following results in 'hello [MANGLED]'
+//
+// Filed as https://github.com/ry/node/issues/issue/402
+
+var sys = require("sys"),
+ buf = new Buffer(1024), len,
+ str1 = "aGVsbG8g", // 'hello '
+ str2 = "d29ybGQ=", // 'world'
+
+len = buf.write(str1, 0, 'base64');
+len += buf.write(str2, len, 'base64');
+sys.log("decoded result: " + buf.toString('binary', 0, len));
diff --git a/tests/browser.js b/tests/browser.js
new file mode 100644
index 00000000..7cf8279c
--- /dev/null
+++ b/tests/browser.js
@@ -0,0 +1,134 @@
+/*
+ * From:
+ * http://www.quirksmode.org/js/detect.html
+ */
+
+var Browser = {
+ init: function () {
+ this.browser = this.searchString(this.dataBrowser) || "An unknown browser";
+ this.version = this.searchVersion(navigator.userAgent)
+ || this.searchVersion(navigator.appVersion)
+ || "an unknown version";
+ this.majorVersion = this.searchMajorVersion(navigator.userAgent)
+ || this.searchMajorVersion(navigator.appVersion)
+ || "an unknown version";
+ this.fullVersion = this.searchFullVersion(navigator.userAgent)
+ || this.searchFullVersion(navigator.appVersion)
+ || "an unknown version";
+ this.OS = this.searchString(this.dataOS) || "an unknown OS";
+ },
+ searchString: function (data) {
+ for (var i=0;i
+
+
+ Canvas Performance Test
+
+
+
+
+
+
+
+
+ Iterations:
+
+ Width:
+ Height:
+
+
+
+
+
+ Canvas (should see three squares and two happy faces):
+
+
+
+ Results:
+
+
+
+
+
diff --git a/tests/cursor.html b/tests/cursor.html
new file mode 100644
index 00000000..91e621b3
--- /dev/null
+++ b/tests/cursor.html
@@ -0,0 +1,135 @@
+
+
+
+ Cursor Change test
+
+
+
+
+
+
+
+
+ Roll over the buttons to test cursors
+
+
+
+
+
+
+
+ Debug:
+
+
+
+
+
+
+
+
diff --git a/tests/face.png b/tests/face.png
new file mode 100644
index 00000000..74c30d82
Binary files /dev/null and b/tests/face.png differ
diff --git a/tests/face.png.js b/tests/face.png.js
new file mode 100644
index 00000000..e0b5d6ce
--- /dev/null
+++ b/tests/face.png.js
@@ -0,0 +1 @@
+var face64 = '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';
diff --git a/tests/fake.websocket.js b/tests/fake.websocket.js
deleted file mode 100644
index eb4f203d..00000000
--- a/tests/fake.websocket.js
+++ /dev/null
@@ -1,87 +0,0 @@
-// PhantomJS can't create Event objects directly, so we need to use this
-function make_event(name, props) {
- var evt = document.createEvent('Event');
- evt.initEvent(name, true, true);
- if (props) {
- for (var prop in props) {
- evt[prop] = props[prop];
- }
- }
- return evt;
-}
-
-export default function FakeWebSocket (uri, protocols) {
- this.url = uri;
- this.binaryType = "arraybuffer";
- this.extensions = "";
-
- if (!protocols || typeof protocols === 'string') {
- this.protocol = protocols;
- } else {
- this.protocol = protocols[0];
- }
-
- this._send_queue = new Uint8Array(20000);
-
- this.readyState = FakeWebSocket.CONNECTING;
- this.bufferedAmount = 0;
-
- this.__is_fake = true;
-};
-
-FakeWebSocket.prototype = {
- close: function (code, reason) {
- this.readyState = FakeWebSocket.CLOSED;
- if (this.onclose) {
- this.onclose(make_event("close", { 'code': code, 'reason': reason, 'wasClean': true }));
- }
- },
-
- send: function (data) {
- if (this.protocol == 'base64') {
- data = Base64.decode(data);
- } else {
- data = new Uint8Array(data);
- }
- this._send_queue.set(data, this.bufferedAmount);
- this.bufferedAmount += data.length;
- },
-
- _get_sent_data: function () {
- var res = new Uint8Array(this._send_queue.buffer, 0, this.bufferedAmount);
- this.bufferedAmount = 0;
- return res;
- },
-
- _open: function (data) {
- this.readyState = FakeWebSocket.OPEN;
- if (this.onopen) {
- this.onopen(make_event('open'));
- }
- },
-
- _receive_data: function (data) {
- this.onmessage(make_event("message", { 'data': data }));
- }
-};
-
-FakeWebSocket.OPEN = WebSocket.OPEN;
-FakeWebSocket.CONNECTING = WebSocket.CONNECTING;
-FakeWebSocket.CLOSING = WebSocket.CLOSING;
-FakeWebSocket.CLOSED = WebSocket.CLOSED;
-
-FakeWebSocket.__is_fake = true;
-
-FakeWebSocket.replace = function () {
- if (!WebSocket.__is_fake) {
- var real_version = WebSocket;
- WebSocket = FakeWebSocket;
- FakeWebSocket.__real_version = real_version;
- }
-};
-
-FakeWebSocket.restore = function () {
- if (WebSocket.__is_fake) {
- WebSocket = WebSocket.__real_version;
- }
-};
diff --git a/tests/input.html b/tests/input.html
index 4925a3a8..bc5d2e15 100644
--- a/tests/input.html
+++ b/tests/input.html
@@ -20,30 +20,30 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+