vndangkhoa/neko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update GUACAMOLE-1823: Merge changes addressing unreliable capslock behavior under MacOS Chrome.

Browse source
This commit is contained in:
Miroslav Šedivý 2025-09-14 17:27:08 +02:00
parent b194e91b1a
commit aeef3800f0
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
client/src/utils/guacamole-keyboard.js
View file

@ -111,12 +111,12 @@ Guacamole.Keyboard = function Keyboard(element) {
altIsTypableOnly: false, altIsTypableOnly: false,
/** /**
* Whether we can rely on receiving a keyup event for the Caps Lock * Whether we can rely on receiving a keyup or keydown event for the
* key. * Caps Lock key.
* *
* @type {!boolean} * @type {!boolean}
*/ */
capsLockKeyupUnreliable: false capsLockKeyEventUnreliable: false
}; };
@ -129,10 +129,11 @@ Guacamole.Keyboard = function Keyboard(element) {
quirks.keyupUnreliable = true; quirks.keyupUnreliable = true;
// The Alt key on Mac is never used for keyboard shortcuts, and the // The Alt key on Mac is never used for keyboard shortcuts, and the
// Caps Lock key never dispatches keyup events // Caps Lock key never dispatches keyup events in firefox, and it
// dispatches either keydown or keyup events in chrome, but never both
else if (navigator.platform.match(/^mac/i)) { else if (navigator.platform.match(/^mac/i)) {
quirks.altIsTypableOnly = true; quirks.altIsTypableOnly = true;
quirks.capsLockKeyupUnreliable = true; quirks.capsLockKeyEventUnreliable = true;
} }
} }
@ -291,7 +292,7 @@ Guacamole.Keyboard = function Keyboard(element) {
this.keyupReliable = false; this.keyupReliable = false;
// We cannot rely on receiving keyup for Caps Lock on certain platforms // We cannot rely on receiving keyup for Caps Lock on certain platforms
else if (this.keysym === 0xFFE5 && quirks.capsLockKeyupUnreliable) else if (this.keysym === 0xFFE5 && quirks.capsLockKeyEventUnreliable)
this.keyupReliable = false; this.keyupReliable = false;
// Determine whether default action for Alt+combinations must be prevented // Determine whether default action for Alt+combinations must be prevented
@ -361,6 +362,14 @@ Guacamole.Keyboard = function Keyboard(element) {
// We extend KeyEvent // We extend KeyEvent
KeyEvent.call(this, orig); KeyEvent.call(this, orig);
// If unreliable caps lock was pressed and event was not marked, then
// we need to pretend that this is a keydown event because we obviously
// did not receive it (issue on macos with chrome)
if (this.keyCode == 20 && quirks.capsLockKeyEventUnreliable) {
eventLog.push(new KeydownEvent(this));
return;
}
// If key is known from keyCode or DOM3 alone, use that (keyCode is // If key is known from keyCode or DOM3 alone, use that (keyCode is
// still more reliable for keyup when dead keys are in use) // still more reliable for keyup when dead keys are in use)
this.keysym = keysym_from_keycode(this.keyCode, this.location) this.keysym = keysym_from_keycode(this.keyCode, this.location)