safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simply keydown handling, fix regression in key recognition.

Browse Source
This commit is contained in:
Michael Jumper
2013-12-20 02:34:10 -08:00
parent 8e3a73a9a2
commit 6afc994f8e
1 changed files with 10 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
guacamole-common-js/src/main/resources/keyboard.js
View File

@@ -554,49 +554,24 @@ Guacamole.Keyboard = function(element) {
// Try to get keysym from keycode // Try to get keysym from keycode
var keysym = keysym_from_keycode(keynum, location); var keysym = keysym_from_keycode(keynum, location);
// By default, we expect a corresponding keypress event
var expect_keypress = true;
// If key is known from keycode, or this browser supports DOM3 key
// events, prevent default
if (keysym || e.key)
expect_keypress = false;
// Also try to get get keysym from keyIdentifier // Also try to get get keysym from keyIdentifier
if (identifier) { if (identifier)
keysym = keysym || keysym = keysym ||
keysym_from_key_identifier(guac_keyboard.modifiers.shift, keysym_from_key_identifier(guac_keyboard.modifiers.shift,
identifier, location); identifier, location);
// Prevent default if non-typable character or if modifier combination // Press key if known
// likely to be eaten by browser otherwise (NOTE: We must not prevent if (keysym !== null) {
// default for Ctrl+Alt, as that combination is commonly used for
// AltGr. If we receive AltGr, we need to handle keypress, which
// means we cannot cancel keydown).
if (!isTypable(identifier)
|| ( guac_keyboard.modifiers.ctrl && !guac_keyboard.modifiers.alt)
|| (!guac_keyboard.modifiers.ctrl && guac_keyboard.modifiers.alt)
|| (guac_keyboard.modifiers.meta))
expect_keypress = false;
}
// If we do not expect to handle via keypress, handle now
if (!expect_keypress) {
e.preventDefault(); e.preventDefault();
keydownChar[keynum] = keysym;
// Press key if known press_key(keysym);
if (keysym !== null) {
keydownChar[keynum] = keysym;
press_key(keysym);
// If a key is pressed while meta is held down, the keyup will never be sent in Chrome, so send it now. (bug #108404)
if(guac_keyboard.modifiers.meta) {
release_key(keysym);
}
}
// If a key is pressed while meta is held down, the keyup will
// never be sent in Chrome, so send it now. (bug #108404)
if(guac_keyboard.modifiers.meta)
release_key(keysym);
} }
}, true); }, true);