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

Merge pull request #1312 from samhed/master 

Fix so that you can use the keyboard after using the extra keys
This commit is contained in:
Samuel Mannehed 2019-10-28 10:45:08 +01:00 committed by GitHub
parent 0c4b3e802f a5aa8e1282
commit 1dd1bf0306
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/ui.js
View File

@ -1503,20 +1503,20 @@ const UI = {
}, },
sendEsc() { sendEsc() {
UI.rfb.sendKey(KeyTable.XK_Escape, "Escape"); UI.sendKey(KeyTable.XK_Escape, "Escape");
}, },
sendTab() { sendTab() {
UI.rfb.sendKey(KeyTable.XK_Tab); UI.sendKey(KeyTable.XK_Tab, "Tab");
}, },
toggleCtrl() { toggleCtrl() {
const btn = document.getElementById('noVNC_toggle_ctrl_button'); const btn = document.getElementById('noVNC_toggle_ctrl_button');
if (btn.classList.contains("noVNC_selected")) { if (btn.classList.contains("noVNC_selected")) {
UI.rfb.sendKey(KeyTable.XK_Control_L, "ControlLeft", false); UI.sendKey(KeyTable.XK_Control_L, "ControlLeft", false);
btn.classList.remove("noVNC_selected"); btn.classList.remove("noVNC_selected");
} else { } else {
UI.rfb.sendKey(KeyTable.XK_Control_L, "ControlLeft", true); UI.sendKey(KeyTable.XK_Control_L, "ControlLeft", true);
btn.classList.add("noVNC_selected"); btn.classList.add("noVNC_selected");
} }
}, },
@ -1524,10 +1524,10 @@ const UI = {
toggleWindows() { toggleWindows() {
const btn = document.getElementById('noVNC_toggle_windows_button'); const btn = document.getElementById('noVNC_toggle_windows_button');
if (btn.classList.contains("noVNC_selected")) { if (btn.classList.contains("noVNC_selected")) {
UI.rfb.sendKey(KeyTable.XK_Super_L, "MetaLeft", false); UI.sendKey(KeyTable.XK_Super_L, "MetaLeft", false);
btn.classList.remove("noVNC_selected"); btn.classList.remove("noVNC_selected");
} else { } else {
UI.rfb.sendKey(KeyTable.XK_Super_L, "MetaLeft", true); UI.sendKey(KeyTable.XK_Super_L, "MetaLeft", true);
btn.classList.add("noVNC_selected"); btn.classList.add("noVNC_selected");
} }
}, },
@ -1535,16 +1535,29 @@ const UI = {
toggleAlt() { toggleAlt() {
const btn = document.getElementById('noVNC_toggle_alt_button'); const btn = document.getElementById('noVNC_toggle_alt_button');
if (btn.classList.contains("noVNC_selected")) { if (btn.classList.contains("noVNC_selected")) {
UI.rfb.sendKey(KeyTable.XK_Alt_L, "AltLeft", false); UI.sendKey(KeyTable.XK_Alt_L, "AltLeft", false);
btn.classList.remove("noVNC_selected"); btn.classList.remove("noVNC_selected");
} else { } else {
UI.rfb.sendKey(KeyTable.XK_Alt_L, "AltLeft", true); UI.sendKey(KeyTable.XK_Alt_L, "AltLeft", true);
btn.classList.add("noVNC_selected"); btn.classList.add("noVNC_selected");
} }
}, },
sendCtrlAltDel() { sendCtrlAltDel() {
UI.rfb.sendCtrlAltDel(); UI.rfb.sendCtrlAltDel();
// See below
UI.rfb.focus();
UI.idleControlbar();
},
sendKey(keysym, code, down) {
UI.rfb.sendKey(keysym, code, down);
// move focus to the screen in order to be able to
// use the keyboard right after these extra keys
UI.rfb.focus();
// fade out the controlbar to highlight that
// the focus has been moved to the screen
UI.idleControlbar();
}, },
/* ------^------- /* ------^-------