]> git.proxmox.com Git - novnc-pve.git/commitdiff
use modified version of ui.js
authorDietmar Maurer <dietmar@proxmox.com>
Fri, 1 Aug 2014 04:43:30 +0000 (06:43 +0200)
committerDietmar Maurer <dietmar@proxmox.com>
Tue, 5 Aug 2014 04:32:13 +0000 (06:32 +0200)
This way, we get a very lightweight console, because we avoid loading
all ExtJS classes. Also it is fully functional on mobile devices now.

I removed the websockify code because we implement websockets in HTTPServer.pm.

The html code moved to pve-manager, because we need to include CSRF token and
gettext catalogs.

Makefile
debian/install
debian/patches/fix-base-css.patch [new file with mode: 0644]
debian/patches/series
pveui.js [new file with mode: 0644]
vnc_pve.html [deleted file]

index 8b96a2dd0558fe5a057c5b381e01d3ea568ce0e4..ff1de0141b533499cac8f8aa34f27e2ee422fbd9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,12 +24,12 @@ deb ${DEB}: ${TARSRC}
        tar xf ${NOVNCSRC}
        mv ${NOVNCDIR}/debian ${NOVNCDIR}/debian.org
        cp -a debian ${NOVNCDIR}/debian
-       cp vnc_pve.html ${NOVNCDIR}
+       cp pveui.js ${NOVNCDIR}
        # fix file permissions
        chmod 0644 ${NOVNCDIR}/include/jsunzip.js
        echo "git clone git://git.proxmox.com/git/novnc-pve.git\\ngit checkout ${GITVERSION}" > ${NOVNCDIR}/debian/SOURCE
        cd ${NOVNCDIR}; dpkg-buildpackage -b -uc -us
-       -lintian ${DEB}
+       lintian ${DEB}
 
 .PHONY: download
 download:
index dd5bb4d039b31bc4d9d34a41f67f2c13f542a75b..cde23e44188ba3583fc8fef6ce958c5ffda8cd55 100644 (file)
@@ -1,9 +1,4 @@
-vnc_pve.html           /usr/share/novnc-pve
-utils/launch.sh        /usr/share/novnc-pve/utils
-utils/websocket.py     /usr/share/novnc-pve/utils
-utils/wsproxy.py       /usr/share/novnc-pve/utils
-utils/websockify       /usr/share/novnc-pve/utils
-utils/rebind.so        /usr/share/novnc-pve/utils
+pveui.js               /usr/share/novnc-pve/include
 images                 /usr/share/novnc-pve
 include/base64.js      /usr/share/novnc-pve/include
 include/des.js         /usr/share/novnc-pve/include
@@ -17,9 +12,11 @@ include/blue.css     /usr/share/novnc-pve/include
 include/black.css      /usr/share/novnc-pve/include
 include/playback.js    /usr/share/novnc-pve/include
 include/rfb.js         /usr/share/novnc-pve/include
-include/ui.js          /usr/share/novnc-pve/include
 include/util.js        /usr/share/novnc-pve/include
 include/websock.js     /usr/share/novnc-pve/include
 include/webutil.js     /usr/share/novnc-pve/include
 include/jsunzip.js     /usr/share/novnc-pve/include
 include/web-socket-js/* /usr/share/novnc-pve/include/web-socket-js
+include/Orbitron700.ttf        /usr/share/novnc-pve/include
+include/Orbitron700.woff /usr/share/novnc-pve/include
+include/keysym.js      /usr/share/novnc-pve/include
\ No newline at end of file
diff --git a/debian/patches/fix-base-css.patch b/debian/patches/fix-base-css.patch
new file mode 100644 (file)
index 0000000..74d6367
--- /dev/null
@@ -0,0 +1,40 @@
+Index: new/include/base.css
+===================================================================
+--- new.orig/include/base.css  2014-08-04 11:08:19.000000000 +0200
++++ new/include/base.css       2014-08-04 11:16:30.000000000 +0200
+@@ -21,6 +21,17 @@
+   height:100%;
+ }
++#noVNC_pve_commands {
++  display:none;
++  margin-top:73px;
++  right:30px;
++  position:fixed;
++}
++
++#noVNC_pve_commands.top:after {
++  right:0px;
++}
++
+ #noVNC_controls ul {
+   list-style: none;
+   margin: 0px;
+@@ -220,7 +231,7 @@
+   position:fixed;
+ }
+ #noVNC_clipboard.top:after {
+-  right:85px;
++  right:35px;
+ }
+ #keyboardinput {
+@@ -375,7 +386,7 @@
+ }
+ #noVNC_logo {
+-  margin-top: 170px;
++  margin-top: 10px;
+   margin-left: 10px;
+   color:yellow;
+   text-align:left;
index af4d599f4578d5392383c87e9e3215b0e6057306..fdf1d7aee84b8abf754e09dd2851687654a187e3 100644 (file)
@@ -1 +1,2 @@
 fix-websocket-binary-support-test.patch
+fix-base-css.patch
diff --git a/pveui.js b/pveui.js
new file mode 100644 (file)
index 0000000..e656998
--- /dev/null
+++ b/pveui.js
@@ -0,0 +1,1388 @@
+/*
+ * 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',
+pveCommandsOpen: false,
+settingsOpen : false,
+connSettingsOpen : false,
+popupStatusOpen : false,
+clipboardOpen: false,
+keyboardVisible: false,
+hideKeyboardTimeout: null,
+lastKeyboardinput: null,
+defaultKeyboardinputLen: 100,
+extraKeysVisible: false,
+ctrlOn: false,
+altOn: false,
+isTouchDevice: false,
+
+consoletype: undefined,
+vmid: undefined,
+vmname: undefined,
+nodename: undefined,
+
+// Setup rfb object, load settings from browser storage, then call
+// UI.init to setup the UI/menus
+load: function (callback) {
+    WebUtil.initSettings(UI.pve_start, callback);
+},
+
+// Proxmox VE related code
+
+urlEncode: function(object) {
+    var i,value, params = [];
+
+    for (i in object) {
+        if (object.hasOwnProperty(i)) {
+            value = object[i];
+           if (value === undefined) value = '';
+            params.push(encodeURIComponent(i) + '=' + encodeURIComponent(String(value)));
+        }
+    }
+
+    return params.join('&');
+},
+
+API2Request: function(reqOpts) {
+
+    reqOpts.method = reqOpts.method || 'GET';
+
+    var xhr = new XMLHttpRequest();
+
+    xhr.onload = function() {
+       var scope = reqOpts.scope || this;
+       var result;
+       var errmsg;
+
+       if (xhr.readyState === 4) {
+           var ctype = xhr.getResponseHeader('Content-Type');
+           if (xhr.status === 200) {
+               if (ctype.match(/application\/json;/)) {
+                   result = JSON.parse(xhr.responseText);
+               } else {
+                   errmsg = 'got unexpected content type ' + ctype;
+               }
+           } else {
+               errmsg = 'Error ' + xhr.status + ': ' + xhr.statusText;
+           }
+       } else {
+           errmsg = 'Connection error - server offline?';
+       }
+
+       if (errmsg !== undefined) {
+           if (reqOpts.failure) {
+               reqOpts.failure.call(scope, errmsg);
+           }
+       } else {
+           if (reqOpts.success) {
+               reqOpts.success.call(scope, result);
+           }
+       }
+       if (reqOpts.callback) {
+           reqOpts.callback.call(scope, errmsg === undefined);
+       }
+    }
+
+    var data = UI.urlEncode(reqOpts.params || {});
+
+    if (reqOpts.method === 'GET') {
+       xhr.open(reqOpts.method, "/api2/json" + reqOpts.url + '?' + data);
+    } else {
+       xhr.open(reqOpts.method, "/api2/json" + reqOpts.url);
+    }
+    xhr.setRequestHeader('Cache-Control', 'no-cache');
+    if (reqOpts.method === 'POST' || reqOpts.method === 'PUT') {
+       xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+       console.dir(PVE);
+       xhr.setRequestHeader('CSRFPreventionToken', PVE.CSRFPreventionToken);
+       xhr.send(data);
+    } else if (reqOpts.method === 'GET') {
+       xhr.send();
+    } else {
+       throw "unknown method";
+    }
+
+
+},
+
+pve_vm_command: function(cmd, params, reload) {
+    var baseUrl;
+
+    if (UI.consoletype === 'kvm') {
+       baseUrl = '/nodes/' + UI.nodename + '/qemu/' + UI.vmid;
+    } else if (UI.consoletype === 'openvz') {
+       baseUrl = '/nodes/' + UI.nodename + '/openvz/' + UI.vmid;
+    } else {
+       throw "unknown VM type";
+    }
+
+    var show_msg = function(klass, msg) {
+       // show msg for 5 seconds
+       var oldklass = $D('noVNC-control-bar').getAttribute("class");
+        $D('noVNC-control-bar').setAttribute("class", klass);
+       var oldmsg = $D('noVNC_status').innerHTML;
+        $D('noVNC_status').innerHTML = msg;
+       setTimeout(function() {
+           var curmsg = $D('noVNC_status').innerHTML;
+           if (curmsg === msg) {
+               $D('noVNC_status').innerHTML = oldmsg;
+           }
+           var curklass = $D('noVNC-control-bar').getAttribute("class");
+           if (curklass === klass) {
+               $D('noVNC-control-bar').setAttribute("class", oldklass);
+           }
+       }, 5000);
+    };
+
+    UI.API2Request({
+       params: params,
+       url: baseUrl + "/status/" + cmd,
+       method: 'POST',
+       failure: function(msg) {
+            show_msg('noVNC_status_warn', msg);
+       },
+       success: function() {
+            show_msg('noVNC_status_normall', "VM command '" + cmd +"' successful");
+           if (reload) {
+               setTimeout(function() {
+                   UI.pveReload();
+               }, 1000);
+           };
+       }
+    });
+},
+
+pveCmdStart: function() {
+    if (UI.pveCommandsOpen === true) {
+       UI.togglePVECommandPanel();
+    }
+    UI.pve_vm_command('start', {}, true);
+},
+
+pveCmdShutdown: function() {
+    if (UI.pveCommandsOpen === true) {
+       UI.togglePVECommandPanel();
+    }
+    var msg = gettext("Do you really want to shutdown VM {0}?");
+    msg = msg.replace(/\{0\}/, UI.vmid);
+
+    if (confirm(msg) === true) { 
+       UI.pve_vm_command('shutdown');
+    }
+},
+
+pveCmdStop: function() {
+    if (UI.pveCommandsOpen === true) {
+       UI.togglePVECommandPanel();
+    }
+
+    var msg = gettext("Do you really want to stop VM {0}?");
+    msg = msg.replace(/\{0\}/, UI.vmid);
+
+    if (confirm(msg) === true) { 
+       UI.pve_vm_command('stop');
+    }
+},
+
+pveCmdReset: function() {
+    if (UI.pveCommandsOpen === true) {
+       UI.togglePVECommandPanel();
+    }
+    var msg = gettext("Do you really want to reset VM {0}?");
+    msg = msg.replace(/\{0\}/, UI.vmid);
+
+    if (confirm(msg) === true) { 
+       UI.pve_vm_command('reset');
+    }
+},
+
+pveCmdSuspend: function() {
+    if (UI.pveCommandsOpen === true) {
+       UI.togglePVECommandPanel();
+    }
+    var msg = gettext("Do you really want to suspend VM {0}?");
+    msg = msg.replace(/\{0\}/, UI.vmid);
+
+    if (confirm(msg) === true) { 
+       UI.pve_vm_command('suspend');
+    }
+},
+
+pveCmdResume: function() {
+    if (UI.pveCommandsOpen === true) {
+       UI.togglePVECommandPanel();
+    }
+    UI.pve_vm_command('resume');
+},
+
+pveCmdReload: function() {
+    if (UI.pveCommandsOpen === true) {
+       UI.togglePVECommandPanel();
+    }
+    UI.pveReload();
+},
+
+pveReload: function() {
+    location.reload();
+},
+
+pve_start: function(callback) {
+    UI.consoletype = WebUtil.getQueryVar('console');
+    UI.vmid = WebUtil.getQueryVar('vmid');
+    UI.vmname = WebUtil.getQueryVar('vmname');
+    UI.nodename = WebUtil.getQueryVar('node');
+    
+    var url;
+    var wsurl;
+    var params = { websocket: 1 };
+    var btn;
+
+    var vmcmd_btns = ['pveStartButton', 'pveShutdownButton', 'pveStopButton', 'pveResetButton', 'pveSuspendButton', 'pveResumeButton'];
+    vmcmd_btns.forEach(function(btn) {
+       var el = $D(btn);
+       el.style.display = "none";
+       el.value = gettext(el.value);
+    });
+
+
+    var title;
+
+    if (UI.consoletype === 'kvm') {
+       var baseUrl = '/nodes/' + UI.nodename + '/qemu/' + UI.vmid;
+       url =  baseUrl + '/vncproxy';
+       wsurl = baseUrl + '/vncwebsocket';
+       vmcmd_btns.forEach(function(btn) {
+           $D(btn).style.display = "";
+       });
+       title = "VM " + UI.vmid;
+       if (UI.vmname) {
+           title += " ('" + UI.vmname + "')";
+       }
+    } else if (UI.consoletype === 'openvz') {
+       var baseUrl = '/nodes/' + UI.nodename + '/openvz/' + UI.vmid;
+       url =  baseUrl + '/vncproxy';
+       wsurl = baseUrl + '/vncwebsocket';
+       ['pveStartButton', 'pveShutdownButton', 'pveStopButton'].forEach(function(btn) {
+           $D(btn).style.display = "";
+       });
+       title = "CT " + UI.vmid;
+       if (UI.vmname) {
+           title += " ('" + UI.vmname + "')";
+       }
+    } else if (UI.consoletype === 'shell') {
+       var baseUrl = '/nodes/' + UI.nodename;
+       url =  baseUrl + '/vncshell';
+       wsurl = baseUrl + '/vncwebsocket';
+       title = "node '" + UI.nodename + "'";
+    } else if (UI.consoletype === 'upgrade') {
+       var baseUrl = '/nodes/' + UI.nodename;
+       url =  baseUrl + '/vncshell';
+       wsurl = baseUrl + '/vncwebsocket';
+       params.upgrade = 1;
+       title = gettext('System upgrade on node {0}');
+       title = title.replace(/\{0\}/, UI.nodename);
+    } else {
+       throw "implement me";
+    }
+
+    document.title = title;
+
+    var start_vnc_viewer = function(param) {
+       console.dir(param);
+
+       var wsparams = UI.urlEncode({
+           port: param.port,
+           vncticket: param.ticket
+       });
+
+       UI.updateSetting('host', window.location.hostname);
+       UI.updateSetting('port', window.location.port);
+       UI.updateSetting('password', param.ticket);
+       UI.updateSetting('encrypt', true);
+       UI.updateSetting('true_color', true);
+       UI.updateSetting('cursor', !UI.isTouchDevice);
+       UI.updateSetting('shared', true);
+       UI.updateSetting('view_only', false);
+
+       UI.updateSetting('path', 'api2/json' + wsurl + "?" + wsparams);
+
+       UI.start(callback);
+    };
+
+    UI.API2Request({
+       url: url,
+       method: 'POST',
+       params: params,
+       success: function(result) {
+           start_vnc_viewer(result.data);
+       },
+       failure: function(msg) {
+           console.log("ERROR: " + msg);
+       }
+    });
+},
+
+lastFBWidth: undefined,
+lastFBHeight: undefined,
+sizeUpdateTimer: undefined,
+
+updateFBSize: function(rfb, width, height) {
+    try {
+       UI.lastFBWidth = width + 1;
+       UI.lastFBHeight = height + 5;
+
+       if (UI.sizeUpdateTimer !== undefined) {
+           clearInterval(UI.sizeUpdateTimer);
+       }
+       if (UI.getSetting('clip')) return;
+
+       var update_size = function() {
+           var oh;
+           var ow;
+
+           if (window.innerHeight) {
+               oh = window.innerHeight;
+               ow = window.innerWidth;
+           } else if (document.documentElement && 
+                      document.documentElement.clientHeight) {
+               oh = document.documentElement.clientHeight;
+               ow = document.documentElement.clientWidth;
+           } else if (document.body) {
+               oh = document.body.clientHeight;
+               ow = document.body.clientWidth;
+           }  else {
+               throw "can't get window size";
+           }
+       
+           // see base.css/noVNC_screen_pad
+           var toolbar_height = 36;
+
+           var offsetw = UI.lastFBWidth - ow;
+           var offseth = UI.lastFBHeight + toolbar_height - oh;
+           if (offsetw !== 0 || offseth !== 0) {
+               //console.log("try resize by " + offsetw + " " + offseth);
+               window.resizeBy(offsetw, offseth);
+           }
+       };
+
+       update_size();
+       UI.sizeUpdateTimer = setInterval(update_size, 1000);
+
+    } catch(e) {
+       console.log(e);
+    }
+},
+
+// Open/close PVE connand menu
+togglePVECommandPanel: 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();
+    }
+    if (UI.pveCommandsOpen) {
+       $D('noVNC_pve_commands').style.display = "none";
+       $D('pveCommandsButton').className = "noVNC_status_button";
+       UI.pveCommandsOpen = false;
+    } else {
+       $D('noVNC_pve_commands').style.display = "block";
+       $D('pveCommandsButton').className = "noVNC_status_button_selected";
+       UI.pveCommandsOpen = true;
+    }
+},
+
+// 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'));
+
+    UI.initSetting('repeaterID', '');
+
+    UI.rfb = RFB({'target': $D('noVNC_canvas'),
+                  'onUpdateState': UI.updateState,
+                  'onXvpInit': UI.updateXvpVisualState,
+                  'onClipboard': UI.clipReceive,
+                  //'onDesktopName': UI.updateDocumentTitle,
+                 'onFBResize': UI.updateFBSize});
+
+    autoconnect = true;
+    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("pveStartButton").onclick = UI.pveCmdStart;
+    $D("pveShutdownButton").onclick = UI.pveCmdShutdown;
+    $D("pveStopButton").onclick = UI.pveCmdStop;
+    $D("pveResetButton").onclick = UI.pveCmdReset;
+    $D("pveSuspendButton").onclick = UI.pveCmdSuspend;
+    $D("pveResumeButton").onclick = UI.pveCmdResume;
+    $D("pveReloadButton").onclick = UI.pveCmdReload;
+
+    $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("pveCommandsButton").onclick = UI.togglePVECommandPanel;
+    //$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) {
+    console.log("GET: " + 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";
+    if (UI.pveCommandsOpen === true) {
+       UI.togglePVECommandPanel();
+    }
+    // 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";
+    if (UI.pveCommandsOpen === true) {
+       UI.togglePVECommandPanel();
+    }
+    // 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";
+    if (UI.pveCommandsOpen === true) {
+       UI.togglePVECommandPanel();
+    }
+    // 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";
+    if (UI.pveCommandsOpen === true) {
+       UI.togglePVECommandPanel();
+    }
+    // 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 =  (UI.consoletype !== 'kvm') ? "inline" : "none";
+        $D('showKeyboard').style.display = "inline";
+        $D('noVNC_extra_keys').style.display = "";
+       $D('sendCtrlAltDelButton').style.display = (UI.consoletype === 'kvm') ? "inline" : "none";
+    } 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) {
+    return;
+    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/vnc_pve.html b/vnc_pve.html
deleted file mode 100644 (file)
index aa8369a..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>noVNC</title>
-
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-
-    <!-- Apple iOS Safari settings -->
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
-    <!-- App Start Icon  -->
-    <link rel="apple-touch-startup-image" href="images/screen_320x460.png" />
-    <!-- For iOS devices set the icon to use if user bookmarks app on their homescreen -->
-    <link rel="apple-touch-icon" href="images/screen_57x57.png">
-
-    <!-- Stylesheets -->
-    <link rel="stylesheet" href="include/base.css" title="plain">
-
-    <script src="include/util.js"></script>
-</head>
-
-<body style="margin: 0px;">
-    <div id="noVNC_screen">
-           <div id="noVNC_status_state" style="margin-top: 0px; visibility: hidden; position: absolute;"></div>
-           <div id="noVNC_status_msg" style="margin-top: 0px; visibility: hidden; position: absolute;"></div>
-            <canvas id="noVNC_canvas" width="640px" height="20px">
-                Canvas not supported.
-            </canvas>
-        </div>
-
-        <script>
-        /*jslint white: false */
-        /*global window, $, Util, RFB, */
-        "use strict";
-
-        // Load supporting scripts
-        Util.load_scripts(["webutil.js", "base64.js", "websock.js", "des.js",
-                           "keysymdef.js", "keyboard.js", "input.js", "display.js",
-                           "jsunzip.js", "rfb.js"]);
-
-        var rfb;
-
-        function passwordRequired(rfb) {
-            $D('noVNC_status_state').innerHTML = "pwrequest";
-            $D('noVNC_status_msg').innerHTML = "needs password";
-        }
-        function setPassword() {
-            //rfb.sendPassword($D('password_input').value);
-            return false;
-        }
-
-       function updateState(rfb, state, oldstate, msg) {
-            var sm, ss;
-           
-            sm = $D('noVNC_status_msg');
-            ss = $D('noVNC_status_state');
-            if (state !== "normal") {
-                xvpInit(0);
-            }
-
-            ss.innerHTML = state;
-
-           if (typeof(msg) !== 'undefined') {
-              sm.innerHTML = msg;
-           }
-        }
-
-        function xvpInit(ver) {
-             // do nothing
-        }
-
-        window.onscriptsload = function () {
-            var host, port, password, path, token;
-
-            WebUtil.init_logging(WebUtil.getQueryVar('logging', 'warn'));
-            document.title = unescape(WebUtil.getQueryVar('title', 'noVNC'));
-            // By default, use the host and port of server that served this file
-            host = WebUtil.getQueryVar('host', window.location.hostname);
-            port = WebUtil.getQueryVar('port', window.location.port);
-            password = WebUtil.getQueryVar('password', '');
-            path = WebUtil.getQueryVar('path', 'websockify');
-
-            if ((!host) || (!port)) {
-                updateState('failed', "Must specify host and port in URL");
-                return;
-            }
-
-            rfb = new RFB({'target':       $D('noVNC_canvas'),
-                           'encrypt':      WebUtil.getQueryVar('encrypt',
-                                    (window.location.protocol === "https:")),
-                           'repeaterID':   WebUtil.getQueryVar('repeaterID', ''),
-                           'true_color':   WebUtil.getQueryVar('true_color', true),
-                           'local_cursor': WebUtil.getQueryVar('cursor', true),
-                           'shared':       WebUtil.getQueryVar('shared', true),
-                           'view_only':    WebUtil.getQueryVar('view_only', false),
-                           'updateState':  updateState,
-                           'onXvpInit':    xvpInit,
-                           'onPasswordRequired':  passwordRequired});
-            rfb.connect(host, port, password, path);
-           
-           $D("noVNC_screen").onmouseover = function(e) {
-               window.focus();
-           };
-        };
-        </script>
-    </body>
-</html>