[pve-devel] [PATCH] bump to 0.5.1 master branch
Alexandre Derumier
aderumier at odiso.com
Thu Jun 25 03:25:18 CEST 2015
generate pveui.js from include/ui.js with a patch
Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
Makefile | 3 +-
debian/patches/pveui.patch | 836 +++++++++++++++++++++++
debian/patches/series | 2 +-
debian/rules | 7 -
pveui.js | 1620 --------------------------------------------
5 files changed, 838 insertions(+), 1630 deletions(-)
create mode 100644 debian/patches/pveui.patch
delete mode 100644 pveui.js
diff --git a/Makefile b/Makefile
index 1a80ab4..d68ec26 100644
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,8 @@ dinstall: deb
deb ${DEB}: ${TARSRC}
rm -rf ${NOVNCDIR}
tar xf ${NOVNCSRC}
- mv ${NOVNCDIR}/debian ${NOVNCDIR}/debian.org
cp -a debian ${NOVNCDIR}/debian
- cp pveui.js ${NOVNCDIR}
+ cp ${NOVNCDIR}/include/ui.js ${NOVNCDIR}/pveui.js
# 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
diff --git a/debian/patches/pveui.patch b/debian/patches/pveui.patch
new file mode 100644
index 0000000..804027b
--- /dev/null
+++ b/debian/patches/pveui.patch
@@ -0,0 +1,836 @@
+From 5eb689462a961931ec8590d77ab4d1b862cc5c99 Mon Sep 17 00:00:00 2001
+From: Alexandre Derumier <aderumier at odiso.com>
+Date: Thu, 25 Jun 2015 02:50:03 +0200
+Subject: [PATCH] pveui : add promox code
+
+Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
+---
+ pveui.js | 663 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 614 insertions(+), 49 deletions(-)
+
+diff --git a/pveui.js b/pveui.js
+index fafafdc..f6b9a44 100644
+--- a/pveui.js
++++ b/pveui.js
+@@ -38,11 +38,17 @@ var UI;
+ ctrlOn: false,
+ altOn: false,
+ isTouchDevice: false,
+-
++ pveAllowMigratedVMTest: false, // set to true after a succesful conection
++ pveCommandsOpen: 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.start, callback);
++ WebUtil.initSettings(UI.pve_start, callback);
+ },
+
+ // Render default UI and initialize settings menu
+@@ -54,13 +60,13 @@ var UI;
+ var sheets = WebUtil.getStylesheets();
+ var i;
+ for (i = 0; i < sheets.length; i += 1) {
+- UI.addOption($D('noVNC_stylesheet'),sheets[i].title, sheets[i].title);
++ //UI.addOption($D('noVNC_stylesheet'),sheets[i].title, sheets[i].title);
+ }
+
+ // Logging selection dropdown
+ var llevels = ['error', 'warn', 'info', 'debug'];
+ for (i = 0; i < llevels.length; i += 1) {
+- UI.addOption($D('noVNC_logging'),llevels[i], llevels[i]);
++ //UI.addOption($D('noVNC_logging'),llevels[i], llevels[i]);
+ }
+
+ // Settings with immediate effects
+@@ -84,20 +90,10 @@ var UI;
+ }
+ }
+
+- /* 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('resize', 'off');
+- UI.initSetting('shared', true);
+- UI.initSetting('view_only', false);
+- UI.initSetting('path', 'websockify');
++
+ UI.initSetting('repeaterID', '');
+
+- var autoconnect = WebUtil.getQueryVar('autoconnect', false);
++ var autoconnect = true;
+ if (autoconnect === 'true' || autoconnect == '1') {
+ autoconnect = true;
+ UI.connect();
+@@ -165,8 +161,9 @@ var UI;
+ 'onXvpInit': UI.updateXvpVisualState,
+ 'onClipboard': UI.clipReceive,
+ 'onFBUComplete': UI.FBUComplete,
+- 'onFBResize': UI.updateViewDrag,
+- 'onDesktopName': UI.updateDocumentTitle});
++ 'onFBResize': UI.updateViewDrag
++ // 'onDesktopName': UI.updateDocumentTitle
++ });
+ return true;
+ } catch (exc) {
+ UI.updateState(null, 'fatal', null, 'Unable to create RFB client -- ' + exc);
+@@ -194,28 +191,29 @@ var UI;
+ $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("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("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("settingsButton").onclick = UI.toggleSettingsPanel;
++ //$D("connectButton").onclick = UI.toggleConnectPanel;
++ //$D("disconnectButton").onclick = UI.disconnect;
++ //$D("descriptionButton").onclick = UI.toggleConnectPanel;
++ $D("pveCommandsButton").onclick = UI.togglePVECommandPanel;
+
+ $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_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;
++ //$D("noVNC_connect_button").onclick = UI.connect;
+
+ $D("noVNC_resize").onchange = function () {
+ var connected = UI.rfb && UI.rfb_state === 'normal';
+@@ -374,6 +372,9 @@ var UI;
+ 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();
+@@ -393,12 +394,12 @@ var UI;
+ }
+ // Toggle XVP panel
+ if (UI.xvpOpen === true) {
+- $D('noVNC_xvp').style.display = "none";
+- $D('xvpButton').className = "noVNC_status_button";
++ //$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";
++ //$D('noVNC_xvp').style.display = "block";
++ //$D('xvpButton').className = "noVNC_status_button_selected";
+ UI.xvpOpen = true;
+ }
+ },
+@@ -407,6 +408,12 @@ var UI;
+ toggleClipboardPanel: function() {
+ // Close the description panel
+ $D('noVNC_description').style.display = "none";
++ if (UI.pveCommandsOpen === true) {
++ UI.togglePVECommandPanel();
++ }
++ if (UI.sendKeysVisible === true) {
++ UI.togglePVESendKeysPanel();
++ }
+ // Close settings if open
+ if (UI.settingsOpen === true) {
+ UI.settingsApply();
+@@ -440,6 +447,9 @@ var UI;
+ 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();
+@@ -462,14 +472,14 @@ var UI;
+ // Toggle Connection Panel
+ if (UI.connSettingsOpen === true) {
+ $D('noVNC_controls').style.display = "none";
+- $D('connectButton').className = "noVNC_status_button";
++ //$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";
++ //$D('connectButton').className = "noVNC_status_button_selected";
+ UI.connSettingsOpen = true;
+ $D('noVNC_host').focus();
+ }
+@@ -527,14 +537,14 @@ var UI;
+ UI.toggleXvpPanel();
+ }
+ $D('noVNC_settings').style.display = "block";
+- $D('settingsButton').className = "noVNC_status_button_selected";
++ //$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";
++ //$D('settingsButton').className = "noVNC_status_button";
+ UI.settingsOpen = false;
+ },
+
+@@ -627,10 +637,15 @@ var UI;
+ break;
+ case 'normal':
+ klass = "noVNC_status_normal";
++ UI.pveAllowMigratedVMTest = true;
+ break;
+ case 'disconnected':
+ $D('noVNC_logo').style.display = "block";
+ $D('noVNC_container').style.display = "none";
++ if (UI.pveAllowMigratedVMTest) {
++ UI.pveAllowMigratedVMTest = false;
++ UI.pve_detect_migrated_vm();
++ }
+ /* falls through */
+ case 'loaded':
+ klass = "noVNC_status_normal";
+@@ -681,7 +696,7 @@ var UI;
+ if (connected) {
+ UI.setViewClip();
+ UI.setMouseButton(1);
+- $D('clipboardButton').style.display = "inline";
++ $D('clipboardButton').style.display = (UI.consoletype !== 'kvm') ? "inline" : "none";
+ $D('showKeyboard').style.display = "inline";
+ $D('noVNC_extra_keys').style.display = "";
+ $D('sendCtrlAltDelButton').style.display = "inline";
+@@ -702,18 +717,18 @@ var UI;
+ case 'fatal':
+ case 'failed':
+ case 'disconnected':
+- $D('connectButton').style.display = "";
+- $D('disconnectButton').style.display = "none";
++ //$D('connectButton').style.display = "";
++ //$D('disconnectButton').style.display = "none";
+ UI.connSettingsOpen = false;
+ UI.toggleConnectPanel();
+ break;
+ case 'loaded':
+- $D('connectButton').style.display = "";
+- $D('disconnectButton').style.display = "none";
++ //$D('connectButton').style.display = "";
++ //$D('disconnectButton').style.display = "none";
+ break;
+ default:
+- $D('connectButton').style.display = "none";
+- $D('disconnectButton').style.display = "";
++ //$D('connectButton').style.display = "none";
++ //$D('disconnectButton').style.display = "";
+ break;
+ }
+
+@@ -723,9 +738,9 @@ var UI;
+ // Disable/enable XVP button
+ updateXvpVisualState: function(ver) {
+ if (ver >= 1) {
+- $D('xvpButton').style.display = 'inline';
++ //$D('xvpButton').style.display = 'inline';
+ } else {
+- $D('xvpButton').style.display = 'none';
++ //$D('xvpButton').style.display = 'none';
+ // Close XVP panel if open
+ if (UI.xvpOpen === true) {
+ UI.toggleXvpPanel();
+@@ -1134,7 +1149,557 @@ var UI;
+
+ var vncwidth = $D('noVNC_screen').style.offsetWidth;
+ $D('noVNC-control-bar').style.width = vncwidth + 'px';
+- }
++ },
++ // 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');
++ xhr.setRequestHeader('CSRFPreventionToken', PVE.CSRFPreventionToken);
++ xhr.send(data);
++ } else if (reqOpts.method === 'GET') {
++ xhr.send();
++ } else {
++ throw "unknown method";
++ }
++
++
++ },
++
++ // show msg for 5 seconds
++ pve_show_msg: function(klass, msg, permanant) {
++ 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;
++ if (typeof permanent !== 'undefined' && permanent) return;
++
++ 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);
++ },
++
++ pve_detect_migrated_vm: function() {
++ if (!(UI.consoletype === 'kvm' || UI.consoletype === 'lxc')) {
++ return;
++ }
++
++ // try to detect migrated VM
++ UI.API2Request({
++ url: '/cluster/resources',
++ method: 'GET',
++ success: function(result) {
++ var list = result.data;
++ list.every(function(item) {
++ if ((item.type === 'qemu' || item.type === 'lxc') &&
++ (item.vmid == UI.vmid)) {
++ var url = "?" + UI.urlEncode({
++ console: UI.consoletype,
++ novnc: 1,
++ vmid: UI.vmid,
++ vmname: UI.vmname,
++ node: item.node
++ });
++ location.href = url;
++ return false; // break
++ }
++ return true;
++ });
++ }
++ });
++ },
++
++ pve_vm_command: function(cmd, params, reload) {
++ var baseUrl;
++
++ if (UI.consoletype === 'kvm') {
++ baseUrl = '/nodes/' + UI.nodename + '/qemu/' + UI.vmid;
++ } else if (UI.consoletype === 'lxc') {
++ baseUrl = '/nodes/' + UI.nodename + '/lxc/' + UI.vmid;
++ } else {
++ throw "unknown VM type";
++ }
++
++ UI.API2Request({
++ params: params,
++ url: baseUrl + "/status/" + cmd,
++ method: 'POST',
++ failure: function(msg) {
++ UI.pve_show_msg('noVNC_status_warn', msg);
++ },
++ success: function() {
++ UI.pve_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_send_key: function(keyname) {
++ var baseUrl;
++
++ if (UI.consoletype === 'kvm') {
++ baseUrl = '/nodes/' + UI.nodename + '/qemu/' + UI.vmid;
++ } else {
++ throw "send key not implemented";
++ }
++
++ UI.API2Request({
++ params: { key: keyname },
++ url: baseUrl + '/sendkey',
++ method: 'PUT',
++ failure: function(msg) {
++ UI.pve_show_msg('noVNC_status_warn', msg);
++ }
++ });
++ },
++
++ 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;
++
++ // add pve command buttons
++ var cmdpanel = $D('noVNC_pve_command_menu');
++ var buttonlist = [
++ {
++ text: gettext('Start'),
++ handler: UI.pveCmdStart,
++ enable: { kvm: 1, lxc: 1 }
++ },
++ {
++ text: gettext('Shutdown'),
++ handler: UI.pveCmdShutdown,
++ enable: { kvm: 1, lxc: 1 }
++ },
++ {
++ text: gettext('Stop'),
++ handler: UI.pveCmdStop,
++ enable: { kvm: 1, lxc: 1 }
++ },
++ {
++ text: gettext('Reset'),
++ handler: UI.pveCmdReset,
++ enable: { kvm: 1 }
++ },
++ {
++ text: gettext('Suspend'),
++ handler: UI.pveCmdSuspend,
++ enable: { kvm: 1 }
++ },
++ {
++ text: gettext('Resume'),
++ handler: UI.pveCmdResume,
++ enable: { kvm: 1 }
++ },
++ {
++ text: gettext('Reload'),
++ handler: UI.pveCmdReload,
++ enable: { any: 1 }
++ }
++ ];
++ buttonlist.forEach(function(btn) {
++ if (btn.enable.any || btn.enable[UI.consoletype]) {
++ var el = document.createElement('input');
++ el.setAttribute('type', 'button');
++ el.setAttribute('value', btn.text);
++ el.onclick = btn.handler;
++ el.style.display = "block";
++ el.style.width = "100%";
++ el.style.minWidth = "150px";
++ cmdpanel.appendChild(el);
++ }
++ });
++
++ // add sendKeys buttons
++ var skpanel = $D('noVNC_send_keys_panel');
++
++ buttonlist = [
++ {
++ text: 'Tab', handler: function() {
++ UI.pve_send_key('tab');
++ }
++ },
++ {
++ text: 'Ctrl-Alt-Delete', handler: function() {
++ UI.pve_send_key('ctrl-alt-delete');
++ }
++ },
++ {
++ text: 'Ctrl-Alt-Backspace', handler: function() {
++ UI.pve_send_key('ctrl-alt-backspace');
++ }
++ },
++ {
++ text: 'Ctrl-Alt-F1', handler: function() {
++ UI.pve_send_key('ctrl-alt-f1');
++ }
++ },
++ {
++ text: 'Ctrl-Alt-F2', handler: function() {
++ UI.pve_send_key('ctrl-alt-f2');
++ }
++ },
++ {
++ text: 'Ctrl-Alt-F3', handler: function() {
++ UI.pve_send_key('ctrl-alt-f3');
++ }
++ },
++ {
++ text: 'Ctrl-Alt-F4', handler: function() {
++ UI.pve_send_key('ctrl-alt-f4');
++ }
++ },
++ {
++ text: 'Ctrl-Alt-F5', handler: function() {
++ UI.pve_send_key('ctrl-alt-f5');
++ }
++ },
++ {
++ text: 'Ctrl-Alt-F6', handler: function() {
++ UI.pve_send_key('ctrl-alt-f6');
++ }
++ },
++ {
++ text: 'Ctrl-Alt-F7', handler: function() {
++ UI.pve_send_key('ctrl-alt-f7');
++ }
++ },
++ {
++ text: 'Ctrl-Alt-F8', handler: function() {
++ UI.pve_send_key('ctrl-alt-f8');
++ }
++ },
++ {
++ text: 'Ctrl-Alt-F9', handler: function() {
++ UI.pve_send_key('ctrl-alt-f9');
++ }
++ },
++ {
++ text: 'Ctrl-Alt-F10', handler: function() {
++ UI.pve_send_key('ctrl-alt-f10');
++ }
++ },
++ {
++ text: 'Ctrl-Alt-F11', handler: function() {
++ UI.pve_send_key('ctrl-alt-f11');
++ }
++ },
++ {
++ text: 'Ctrl-Alt-F12', handler: function() {
++ UI.pve_send_key('ctrl-alt-f12');
++ }
++ }
++ ];
++
++ buttonlist.forEach(function(btn) {
++ var el = document.createElement('input');
++ el.setAttribute('type', 'button');
++ el.setAttribute('value', btn.text);
++ el.onclick = function(handler) {
++ return function() {
++ if (UI.sendKeysVisible === true) {
++ UI.togglePVESendKeysPanel();
++ }
++
++ handler.call(this);
++ };
++ }(btn.handler);
++ el.style.display = "block";
++ el.style.width = "100%";
++ el.style.minWidth = "150px";
++ skpanel.appendChild(el);
++ });
++
++ var title;
++
++ if (UI.consoletype === 'kvm') {
++ var baseUrl = '/nodes/' + UI.nodename + '/qemu/' + UI.vmid;
++ url = baseUrl + '/vncproxy';
++ wsurl = baseUrl + '/vncwebsocket';
++ title = "VM " + UI.vmid;
++ if (UI.vmname) {
++ title += " ('" + UI.vmname + "')";
++ }
++ } else if (UI.consoletype === 'lxc') {
++ var baseUrl = '/nodes/' + UI.nodename + '/lxc/' + UI.vmid;
++ url = baseUrl + '/vncproxy';
++ wsurl = baseUrl + '/vncwebsocket';
++ 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) {
++ var wsparams = UI.urlEncode({
++ port: param.port,
++ vncticket: param.ticket
++ });
++
++ UI.updateSetting('host', window.location.hostname);
++ UI.updateSetting('port', window.location.port || 443);
++ 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('resize', 'scale');
++
++ 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) {
++ UI.pve_show_msg('noVNC_status_error', msg, 1);
++ }
++ });
++ },
++
++ // Open/close PVE commandand menu
++ togglePVECommandPanel: function() {
++ // Close the description panel
++ $D('noVNC_description').style.display = "none";
++ if (UI.sendKeysVisible === true) {
++ UI.togglePVESendKeysPanel();
++ }
++ // 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;
++ }
++ },
++
++ // Open/close PVE SendKeys menu
++ togglePVESendKeysPanel: 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();
++ }
++ if (UI.sendKeysVisible) {
++ $D('noVNC_send_keys').style.display = "none";
++ $D('showSendKeysButton').className = "noVNC_status_button";
++ UI.sendKeysVisible = false;
++ } else {
++ $D('noVNC_send_keys').style.display = "block";
++ $D('showSendKeysButton').className = "noVNC_status_button_selected";
++ UI.sendKeysVisible = true;
++ }
++ }
++
+
+ };
+ })();
+--
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index fdf1d7a..11d048d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-fix-websocket-binary-support-test.patch
+pveui.patch
fix-base-css.patch
diff --git a/debian/rules b/debian/rules
index 4929ed9..d01686c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,5 @@
export DEB_BUILD_HARDENING=1
-clean:
- make -C utils clean
- dh clean
-
-build:
- make -C utils rebind.so
-
%:
dh ${@} --with quilt
diff --git a/pveui.js b/pveui.js
deleted file mode 100644
index b4bae62..0000000
--- a/pveui.js
+++ /dev/null
@@ -1,1620 +0,0 @@
-/*
- * noVNC: HTML5 VNC client
- * Copyright (C) 2012 Joel Martin
- * Copyright (C) 2013 Samuel Mannehed for Cendio AB
- * Licensed under MPL 2.0 (see LICENSE.txt)
- *
- * This is a modified version of the original 'ui.js' file, used
- * for the proxmox console.
- */
-
-"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',
-pveAllowMigratedVMTest: false, // set to true after a succesful conection
-pveCommandsOpen: false,
-settingsOpen : false,
-connSettingsOpen : false,
-popupStatusOpen : false,
-clipboardOpen: false,
-sendKeysVisible: 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');
- xhr.setRequestHeader('CSRFPreventionToken', PVE.CSRFPreventionToken);
- xhr.send(data);
- } else if (reqOpts.method === 'GET') {
- xhr.send();
- } else {
- throw "unknown method";
- }
-
-
-},
-
-// show msg for 5 seconds
-pve_show_msg: function(klass, msg, permanant) {
- 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;
- if (typeof permanent !== 'undefined' && permanent) return;
-
- 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);
-},
-
-pve_detect_migrated_vm: function() {
- if (!(UI.consoletype === 'kvm' || UI.consoletype === 'lxc')) {
- return;
- }
-
- // try to detect migrated VM
- UI.API2Request({
- url: '/cluster/resources',
- method: 'GET',
- success: function(result) {
- var list = result.data;
- list.every(function(item) {
- if ((item.type === 'qemu' || item.type === 'lxc') &&
- (item.vmid == UI.vmid)) {
- var url = "?" + UI.urlEncode({
- console: UI.consoletype,
- novnc: 1,
- vmid: UI.vmid,
- vmname: UI.vmname,
- node: item.node
- });
- location.href = url;
- return false; // break
- }
- return true;
- });
- }
- });
-},
-
-pve_vm_command: function(cmd, params, reload) {
- var baseUrl;
-
- if (UI.consoletype === 'kvm') {
- baseUrl = '/nodes/' + UI.nodename + '/qemu/' + UI.vmid;
- } else if (UI.consoletype === 'lxc') {
- baseUrl = '/nodes/' + UI.nodename + '/lxc/' + UI.vmid;
- } else {
- throw "unknown VM type";
- }
-
- UI.API2Request({
- params: params,
- url: baseUrl + "/status/" + cmd,
- method: 'POST',
- failure: function(msg) {
- UI.pve_show_msg('noVNC_status_warn', msg);
- },
- success: function() {
- UI.pve_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_send_key: function(keyname) {
- var baseUrl;
-
- if (UI.consoletype === 'kvm') {
- baseUrl = '/nodes/' + UI.nodename + '/qemu/' + UI.vmid;
- } else {
- throw "send key not implemented";
- }
-
- UI.API2Request({
- params: { key: keyname },
- url: baseUrl + '/sendkey',
- method: 'PUT',
- failure: function(msg) {
- UI.pve_show_msg('noVNC_status_warn', msg);
- }
- });
-},
-
-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;
-
- // add pve command buttons
- var cmdpanel = $D('noVNC_pve_command_menu');
- var buttonlist = [
- {
- text: gettext('Start'),
- handler: UI.pveCmdStart,
- enable: { kvm: 1, lxc: 1 }
- },
- {
- text: gettext('Shutdown'),
- handler: UI.pveCmdShutdown,
- enable: { kvm: 1, lxc: 1 }
- },
- {
- text: gettext('Stop'),
- handler: UI.pveCmdStop,
- enable: { kvm: 1, lxc: 1 }
- },
- {
- text: gettext('Reset'),
- handler: UI.pveCmdReset,
- enable: { kvm: 1 }
- },
- {
- text: gettext('Suspend'),
- handler: UI.pveCmdSuspend,
- enable: { kvm: 1 }
- },
- {
- text: gettext('Resume'),
- handler: UI.pveCmdResume,
- enable: { kvm: 1 }
- },
- {
- text: gettext('Reload'),
- handler: UI.pveCmdReload,
- enable: { any: 1 }
- }
- ];
- buttonlist.forEach(function(btn) {
- if (btn.enable.any || btn.enable[UI.consoletype]) {
- var el = document.createElement('input');
- el.setAttribute('type', 'button');
- el.setAttribute('value', btn.text);
- el.onclick = btn.handler;
- el.style.display = "block";
- el.style.width = "100%";
- el.style.minWidth = "150px";
- cmdpanel.appendChild(el);
- }
- });
-
- // add sendKeys buttons
- var skpanel = $D('noVNC_send_keys_panel');
-
- buttonlist = [
- {
- text: 'Tab', handler: function() {
- UI.pve_send_key('tab');
- }
- },
- {
- text: 'Ctrl-Alt-Delete', handler: function() {
- UI.pve_send_key('ctrl-alt-delete');
- }
- },
- {
- text: 'Ctrl-Alt-Backspace', handler: function() {
- UI.pve_send_key('ctrl-alt-backspace');
- }
- },
- {
- text: 'Ctrl-Alt-F1', handler: function() {
- UI.pve_send_key('ctrl-alt-f1');
- }
- },
- {
- text: 'Ctrl-Alt-F2', handler: function() {
- UI.pve_send_key('ctrl-alt-f2');
- }
- },
- {
- text: 'Ctrl-Alt-F3', handler: function() {
- UI.pve_send_key('ctrl-alt-f3');
- }
- },
- {
- text: 'Ctrl-Alt-F4', handler: function() {
- UI.pve_send_key('ctrl-alt-f4');
- }
- },
- {
- text: 'Ctrl-Alt-F5', handler: function() {
- UI.pve_send_key('ctrl-alt-f5');
- }
- },
- {
- text: 'Ctrl-Alt-F6', handler: function() {
- UI.pve_send_key('ctrl-alt-f6');
- }
- },
- {
- text: 'Ctrl-Alt-F7', handler: function() {
- UI.pve_send_key('ctrl-alt-f7');
- }
- },
- {
- text: 'Ctrl-Alt-F8', handler: function() {
- UI.pve_send_key('ctrl-alt-f8');
- }
- },
- {
- text: 'Ctrl-Alt-F9', handler: function() {
- UI.pve_send_key('ctrl-alt-f9');
- }
- },
- {
- text: 'Ctrl-Alt-F10', handler: function() {
- UI.pve_send_key('ctrl-alt-f10');
- }
- },
- {
- text: 'Ctrl-Alt-F11', handler: function() {
- UI.pve_send_key('ctrl-alt-f11');
- }
- },
- {
- text: 'Ctrl-Alt-F12', handler: function() {
- UI.pve_send_key('ctrl-alt-f12');
- }
- }
- ];
-
- buttonlist.forEach(function(btn) {
- var el = document.createElement('input');
- el.setAttribute('type', 'button');
- el.setAttribute('value', btn.text);
- el.onclick = function(handler) {
- return function() {
- if (UI.sendKeysVisible === true) {
- UI.togglePVESendKeysPanel();
- }
-
- handler.call(this);
- };
- }(btn.handler);
- el.style.display = "block";
- el.style.width = "100%";
- el.style.minWidth = "150px";
- skpanel.appendChild(el);
- });
-
- var title;
-
- if (UI.consoletype === 'kvm') {
- var baseUrl = '/nodes/' + UI.nodename + '/qemu/' + UI.vmid;
- url = baseUrl + '/vncproxy';
- wsurl = baseUrl + '/vncwebsocket';
- title = "VM " + UI.vmid;
- if (UI.vmname) {
- title += " ('" + UI.vmname + "')";
- }
- } else if (UI.consoletype === 'lxc') {
- var baseUrl = '/nodes/' + UI.nodename + '/lxc/' + UI.vmid;
- url = baseUrl + '/vncproxy';
- wsurl = baseUrl + '/vncwebsocket';
- 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) {
- var wsparams = UI.urlEncode({
- port: param.port,
- vncticket: param.ticket
- });
-
- UI.updateSetting('host', window.location.hostname);
- UI.updateSetting('port', window.location.port || 443);
- 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) {
- UI.pve_show_msg('noVNC_status_error', msg, 1);
- }
- });
-},
-
-lastFBWidth: undefined,
-lastFBHeight: undefined,
-sizeUpdateTimer: undefined,
-
-updateFBSize: function(rfb, width, height) {
- try {
- // Note1: CSS Canvas size is wrong by a few pixels in Chrome
- // Note2: window size must be even number for firefox
- UI.lastFBWidth = Math.floor((width + 1)/2)*2;;
- UI.lastFBHeight = Math.floor((height + 6)/2)*2;
-
- 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 commandand menu
-togglePVECommandPanel: function() {
- // Close the description panel
- $D('noVNC_description').style.display = "none";
- if (UI.sendKeysVisible === true) {
- UI.togglePVESendKeysPanel();
- }
- // 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;
- }
-},
-
-// Open/close PVE SendKeys menu
-togglePVESendKeysPanel: 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();
- }
- if (UI.sendKeysVisible) {
- $D('noVNC_send_keys').style.display = "none";
- $D('showSendKeysButton').className = "noVNC_status_button";
- UI.sendKeysVisible = false;
- } else {
- $D('noVNC_send_keys').style.display = "block";
- $D('showSendKeysButton').className = "noVNC_status_button_selected";
- UI.sendKeysVisible = 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";
- $D('showSendKeysButton').style.display = "none";
- UI.setMouseButton();
- // Remove the address bar
- setTimeout(function() { window.scrollTo(0, 1); }, 100);
- UI.forceSetting('clip', true);
- $D('noVNC_clip').disabled = true;
- } else {
- $D('showSendKeysButton').style.display = (UI.consoletype === 'kvm') ? "inline" : "none";
- 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("showSendKeysButton").onclick = UI.togglePVESendKeysPanel;
-
- $D("sendCtrlAltDelButton").onclick = UI.sendCtrlAltDel;
- //$D("xvpShutdownButton").onclick = UI.xvpShutdown;
- //$D("xvpRebootButton").onclick = UI.xvpReboot;
- //$D("xvpResetButton").onclick = UI.xvpReset;
- // disable popup, because it does not provide more info?
- //$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) {
- 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();
- }
- if (UI.sendKeysVisible === true) {
- UI.togglePVESendKeysPanel();
- }
- // 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";
- UI.pveAllowMigratedVMTest = true;
- break;
- case 'disconnected':
- $D('noVNC_logo').style.display = "block";
- if (UI.pveAllowMigratedVMTest) {
- UI.pveAllowMigratedVMTest = false;
- UI.pve_detect_migrated_vm();
- }
- // 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 = "";
- } else {
- UI.setMouseButton();
- $D('clipboardButton').style.display = "none";
- $D('showKeyboard').style.display = "none";
- $D('noVNC_extra_keys').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('sendCtrlAltDelButton').style.display = (UI.consoletype === 'kvm') ? "inline" : "none";
- $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('sendCtrlAltDelButton').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';
-}
-
-};
-
-
-
-
--
2.1.4
More information about the pve-devel
mailing list