crabapples
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tab in writeText(), create token in connect(), scaleviewport enable

This commit is contained in:
Pawel Raczyk 2019-10-02 15:26:24 +02:00
parent 9fd0050047
commit 2012a4fdf2
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/ui.js
View File

@ -151,7 +151,7 @@ const UI = {
UI.initSetting('resize', 'off'); UI.initSetting('resize', 'off');
UI.initSetting('shared', true); UI.initSetting('shared', true);
UI.initSetting('view_only', false); UI.initSetting('view_only', false);
UI.initSetting('show_dot', false); UI.initSetting('show_dot', true);
UI.initSetting('path', 'websockify'); UI.initSetting('path', 'websockify');
UI.initSetting('repeaterID', ''); UI.initSetting('repeaterID', '');
UI.initSetting('reconnect', false); UI.initSetting('reconnect', false);
@ -968,7 +968,6 @@ const UI = {
} }
}, },
writeText() { writeText() {
const text = document.getElementById('noVNC_clipboard_text').value; const text = document.getElementById('noVNC_clipboard_text').value;
Log.Debug(">> UI.clipboardSend: " + text.substr(0, 40) + "..."); Log.Debug(">> UI.clipboardSend: " + text.substr(0, 40) + "...");
@ -977,10 +976,10 @@ const UI = {
function f(t) { function f(t) {
const character = t.shift(); const character = t.shift();
if (character === undefined) return; if (character === undefined) return;
let code = character.charCodeAt(); let code = character.charCodeAt();
const needs_shift = '^[AZ]!@#$%^&*()_+{}:"<>?~|'.indexOf(character) !== -1; const needs_shift = '^[AZ]!@#$%^&*()_+{}:"<>?~|'.indexOf(character) !== -1;
const enter = '[\n]'.indexOf(character) !== -1; const enter = '[\n]'.indexOf(character) !== -1;
const tab = '[\t]'.indexOf(character) !== -1;
if (code === 91) { if (code === 91) {
UI.rfb.sendKey(KeyTable.XK_bracketleft, 'XK_bracketleft', true); UI.rfb.sendKey(KeyTable.XK_bracketleft, 'XK_bracketleft', true);
UI.rfb.sendKey(KeyTable.XK_bracketleft, 'XK_bracketleft', false); UI.rfb.sendKey(KeyTable.XK_bracketleft, 'XK_bracketleft', false);
@ -991,6 +990,9 @@ const UI = {
} else if (enter) { } else if (enter) {
UI.rfb.sendKey(KeyTable.XK_Return, 'XK_Return', true); UI.rfb.sendKey(KeyTable.XK_Return, 'XK_Return', true);
UI.rfb.sendKey(KeyTable.XK_Return, 'XK_Return', false); UI.rfb.sendKey(KeyTable.XK_Return, 'XK_Return', false);
} else if (tab) {
UI.rfb.sendKey(KeyTable.XK_Tab, 'XK_Tab', true);
UI.rfb.sendKey(KeyTable.XK_Tab, 'XK_Tab', false);
} else { } else {
if (needs_shift) { if (needs_shift) {
UI.rfb.sendKey(KeyTable.XK_Shift_L, "ShiftLeft", true); UI.rfb.sendKey(KeyTable.XK_Shift_L, "ShiftLeft", true);
@ -1031,6 +1033,7 @@ const UI = {
connect(event, password) { connect(event, password) {
// Ignore when rfb already exists // Ignore when rfb already exists
WebUtil.createToken();
if (typeof UI.rfb !== 'undefined') { if (typeof UI.rfb !== 'undefined') {
return; return;
} }
@ -1085,9 +1088,9 @@ const UI = {
UI.rfb.addEventListener("bell", UI.bell); UI.rfb.addEventListener("bell", UI.bell);
UI.rfb.addEventListener("desktopname", UI.updateDesktopName); UI.rfb.addEventListener("desktopname", UI.updateDesktopName);
UI.rfb.clipViewport = UI.getSetting('view_clip'); UI.rfb.clipViewport = UI.getSetting('view_clip');
UI.rfb.scaleViewport = UI.getSetting('resize') === 'scale'; UI.rfb.scaleViewport = true;
// UI.rfb.scaleViewport = UI.getSetting('resize') === 'scale';
UI.rfb.resizeSession = UI.getSetting('resize') === 'remote'; UI.rfb.resizeSession = UI.getSetting('resize') === 'remote';
UI.updateViewOnly(); // requires UI.rfb UI.updateViewOnly(); // requires UI.rfb
}, },
@ -1236,12 +1239,12 @@ const UI = {
if (fullscreenButton.classList.contains('noVNC_selected')) { if (fullscreenButton.classList.contains('noVNC_selected')) {
fullscreenButton fullscreenButton
.classList.remove("noVNC_selected"); .classList.remove("noVNC_selected");
UI.rfb.scaleViewport = false; // UI.rfb.scaleViewport = false;
return false; return false;
} else { } else {
fullscreenButton fullscreenButton
.classList.add("noVNC_selected"); .classList.add("noVNC_selected");
UI.rfb.scaleViewport = true; // UI.rfb.scaleViewport = true;
return true; return true;
} }
}, },

5
app/webutil.js
View File

@ -9,7 +9,7 @@
import { init_logging as main_init_logging } from '../core/util/logging.js'; import { init_logging as main_init_logging } from '../core/util/logging.js';
// create token // create token
(function createToken() { export function createToken() {
let token = getConfigVar('token', null); let token = getConfigVar('token', null);
let path = getConfigVar('path', 'websockify'); let path = getConfigVar('path', 'websockify');
if (token) { if (token) {
@ -18,7 +18,8 @@ import { init_logging as main_init_logging } from '../core/util/logging.js';
createCookie('token', token, 1); createCookie('token', token, 1);
} }
})(); }
// init log level reading the logging HTTP param // init log level reading the logging HTTP param
export function init_logging(level) { export function init_logging(level) {
"use strict"; "use strict";