' +
- '
' +
- '
Session
' +
- '' +
- '' +
- '
' +
- '' +
- '' +
- '' +
- '
' +
+ '
' +
+ '
Session
' +
+ '' +
+ '' +
+ '' +
'' +
'
' +
'
Shared clipboard. Paste text below and click Send, or copy text received from the remote session.
' +
@@ -718,14 +712,6 @@
document.body.appendChild(clipboardPanel);
clipboardTextarea = document.getElementById('cp-text');
clipboardStatusEl = document.getElementById('cp-status');
- lockKeyboardCheckbox = document.getElementById('cp-lock-keyboard');
- if (!navigator.keyboard || !navigator.keyboard.lock) {
- lockKeyboardCheckbox.disabled = true;
- lockKeyboardCheckbox.title = 'Keyboard Lock is not supported by this browser.';
- }
- lockKeyboardCheckbox.addEventListener('change', function() {
- rgRequestKeyboardLock(lockKeyboardCheckbox.checked);
- });
document.getElementById('cp-close').addEventListener('click', function() {
toggleClipboardPanel();
@@ -959,6 +945,11 @@
'
SEND KEYS
' +
'
' +
'
' +
+ '
' +
+ '
KEYBOARD
' +
+ '
' +
+ '
In fullscreen, Win, Alt+Tab and other shortcuts go to the remote desktop instead of this computer. Hold Esc to leave fullscreen.
' +
+ '
' +
'
' +
'
VIEW
' +
'
' +
@@ -979,6 +970,14 @@
b.addEventListener('click', function() { sendKeyCombo(k.keys); });
keysEl.appendChild(b);
});
+ var lockKeys = document.getElementById('ctrl-lock-keys');
+ lockKeys.checked = lockAllKeys;
+ if (!rgKeyboardLockSupported()) {
+ lockKeys.checked = false;
+ lockKeys.disabled = true;
+ document.getElementById('ctrl-lock-keys-hint').textContent = 'This browser can\'t capture system shortcuts. Chrome and Edge can.';
+ }
+ lockKeys.addEventListener('change', function() { rgSetLockAllKeys(lockKeys.checked); });
document.getElementById('ctrl-view-' + viewMode).checked = true;
['fit', 'actual'].forEach(function(m) {
document.getElementById('ctrl-view-' + m).addEventListener('change', function(e) {
@@ -1626,47 +1625,40 @@
// (e.g. no user activation on load): the caller decides whether to
// wait for a gesture or give up and show the windowed session.
var fsKeyboardLocked = false;
- function rgRequestKeyboardLock(lockAll) {
- if (!navigator.keyboard || !navigator.keyboard.lock) {
- if (lockKeyboardCheckbox) lockKeyboardCheckbox.checked = false;
- setClipboardStatus('Keyboard Lock is not supported by this browser.');
- return;
- }
- if (!rgFullscreenEl()) {
- setClipboardStatus(lockAll
- ? 'Keyboard lock will apply when fullscreen is entered.'
- : 'Keyboard lock applies only in fullscreen.');
- return;
- }
+ // Lock all keys (#319): in fullscreen, send Win, Alt+Tab and the
+ // like to the remote desktop instead of this computer. Off, only
+ // Escape is locked, so a single press doesn't leave fullscreen.
+ // Remembered per browser; set from the Controls panel.
+ var lockAllKeys = false;
+ try { lockAllKeys = localStorage.getItem('rustguac_lock_all_keys') === '1'; } catch (e) {}
+ function rgKeyboardLockSupported() {
+ return !!(navigator.keyboard && navigator.keyboard.lock);
+ }
+ function rgSetLockAllKeys(on) {
+ lockAllKeys = !!on;
+ try {
+ if (lockAllKeys) localStorage.setItem('rustguac_lock_all_keys', '1');
+ else localStorage.removeItem('rustguac_lock_all_keys');
+ } catch (e) {}
+ if (rgFullscreenEl()) rgRequestKeyboardLock();
+ }
+ function rgRequestKeyboardLock() {
+ if (!rgKeyboardLockSupported()) { rgShowEscNoticeOnce(); return; }
+ var lockAll = lockAllKeys;
var request;
try {
- request = lockAll
- ? navigator.keyboard.lock()
- : navigator.keyboard.lock(['Escape']);
+ request = lockAll ? navigator.keyboard.lock() : navigator.keyboard.lock(['Escape']);
} catch (e) {
- if (lockAll && lockKeyboardCheckbox) lockKeyboardCheckbox.checked = false;
- setClipboardStatus('Could not lock the keyboard.');
- if (!lockAll) rgShowEscNoticeOnce();
- return;
+ request = Promise.reject(e);
}
- request.then(function() {
- if (lockKeyboardCheckbox) {
- setClipboardStatus(lockAll ? 'Keyboard locked.' : 'Additional keyboard lock disabled.');
- }
- }).catch(function() {
- if (lockAll && lockKeyboardCheckbox) lockKeyboardCheckbox.checked = false;
- setClipboardStatus('Could not lock the keyboard.');
+ request.catch(function() {
if (!lockAll) rgShowEscNoticeOnce();
});
}
function rgOnFullscreenEntered() {
if (fsKeyboardLocked) return;
fsKeyboardLocked = true;
- if (navigator.keyboard && navigator.keyboard.lock) {
- rgRequestKeyboardLock(!!(lockKeyboardCheckbox && lockKeyboardCheckbox.checked));
- } else {
- rgShowEscNoticeOnce();
- }
+ rgRequestKeyboardLock();
}
function rgEnterFullscreen(onReject) {
var el = document.documentElement;