Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 72 additions & 0 deletions systemvm/agent/noVNC/app/ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ const UI = {
connected: false,
desktopName: "",

// Modifier key configuration
_modifierKeys: {
shift: { keysym: KeyTable.XK_Shift_L, code: "ShiftLeft", buttonId: 'noVNC_toggle_shift_button' },
ctrl: { keysym: KeyTable.XK_Control_L, code: "ControlLeft", buttonId: 'noVNC_toggle_ctrl_button' },
alt: { keysym: KeyTable.XK_Alt_L, code: "AltLeft", buttonId: 'noVNC_toggle_alt_button' },
windows: { keysym: KeyTable.XK_Super_L, code: "MetaLeft", buttonId: 'noVNC_toggle_windows_button' }
},

statusTimeout: null,
hideKeyboardTimeout: null,
idleControlbarTimeout: null,
Expand Down Expand Up @@ -125,6 +133,11 @@ const UI = {
document.getElementById("noVNC_status")
.addEventListener('click', UI.hideStatus);

// Handle tab/window close to release modifier keys
// This is critical for VMware VMs using websocket reverse proxy
window.addEventListener('beforeunload', UI.handleBeforeUnload);
window.addEventListener('pagehide', UI.handlePageHide);

// Bootstrap fallback input handler
UI.keyboardinputReset();

Expand Down Expand Up @@ -1740,6 +1753,51 @@ const UI = {
UI.idleControlbar();
},

_sendKeyUp(keysym, code) {
Comment thread
DaanHoogland marked this conversation as resolved.
UI.rfb.sendKey(keysym, code, false);
},

// Release a single modifier key if it's pressed
_releaseModifierKey(keyName) {
const keyConfig = UI._modifierKeys[keyName];
if (!keyConfig) return false;

const btn = document.getElementById(keyConfig.buttonId);
if (!btn || !btn.classList.contains("noVNC_selected")) {
return false;
}

UI._sendKeyUp(keyConfig.keysym, keyConfig.code);
btn.classList.remove("noVNC_selected");
return true;
},
Comment thread
DaanHoogland marked this conversation as resolved.

// Release all currently pressed modifier keys
_releaseAllModifierKeys() {
if (!UI.rfb || UI.rfb._rfbConnectionState !== 'connected') {
Comment thread
DaanHoogland marked this conversation as resolved.
Outdated
return false;
}

let keysReleased = false;

// Release all modifier keys
for (const keyName in UI._modifierKeys) {
if (UI._releaseModifierKey(keyName)) {
keysReleased = true;
}
}

// Also check RFB's internal shift state (it tracks this separately)
if (UI.rfb._shiftPressed) {
const shiftConfig = UI._modifierKeys.shift;
UI._sendKeyUp(shiftConfig.keysym, shiftConfig.code);
keysReleased = true;
}
Comment thread
DaanHoogland marked this conversation as resolved.
Outdated

return keysReleased;
},


Comment thread
DaanHoogland marked this conversation as resolved.
Outdated
// Move focus to the screen in order to be able to use the
// keyboard right after these extra keys.
// The exception is when a virtual keyboard is used, because
Expand Down Expand Up @@ -1836,6 +1894,20 @@ const UI = {
selectbox.options.add(optn);
},

// Handle tab/window close events
// These fire when the user closes the tab, which doesn't call disconnect()
handleBeforeUnload(event) {
// Release modifier keys before tab closes
// This is critical for VMware VMs using websocket reverse proxy
UI._releaseAllModifierKeys();
},

handlePageHide(event) {
// Also handle pagehide as a fallback (fires in more browsers)
// Release modifier keys before page is hidden
UI._releaseAllModifierKeys();
},

/* ------^-------
* /MISC
* ==============
Expand Down
Loading