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

GUAC-871: Lift up AltGr if alt flag cleared on key event. Do not transform Shift+Alt into Meta.

Browse Source
This commit is contained in:
Michael Jumper
2014-09-29 17:13:54 -07:00
parent 2a30cadb1e
commit 8d1bee18aa
1 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
guacamole-common-js/src/main/webapp/modules/Keyboard.js
View File

@@ -319,10 +319,10 @@ Guacamole.Keyboard = function(element) {
/** /**
* Map of known JavaScript keycodes which do not map to typable characters * Map of known JavaScript keycodes which do not map to typable characters
* to their unshifted X11 keysym equivalents. * to their X11 keysym equivalents.
* @private * @private
*/ */
var unshiftedKeysym = { var keycodeKeysyms = {
8: [0xFF08], // backspace 8: [0xFF08], // backspace
9: [0xFF09], // tab 9: [0xFF09], // tab
13: [0xFF0D], // enter 13: [0xFF0D], // enter
@@ -490,17 +490,6 @@ Guacamole.Keyboard = function(element) {
"ZenkakuHankaku": [0xFF2A] "ZenkakuHankaku": [0xFF2A]
}; };
/**
* Map of known JavaScript keycodes which do not map to typable characters
* to their shifted X11 keysym equivalents. Keycodes must only be listed
* here if their shifted X11 keysym equivalents differ from their unshifted
* equivalents.
* @private
*/
var shiftedKeysym = {
18: [0xFFE7, 0xFFE7, 0xFFEA] // alt
};
/** /**
* All keysyms which should not repeat when held down. * All keysyms which should not repeat when held down.
* @private * @private
@@ -636,19 +625,7 @@ Guacamole.Keyboard = function(element) {
} }
function keysym_from_keycode(keyCode, location) { function keysym_from_keycode(keyCode, location) {
return get_keysym(keycodeKeysyms[keyCode], location);
var keysyms;
// If not shifted, just return unshifted keysym
if (!guac_keyboard.modifiers.shift)
keysyms = unshiftedKeysym[keyCode];
// Otherwise, return shifted keysym, if defined
else
keysyms = shiftedKeysym[keyCode] || unshiftedKeysym[keyCode];
return get_keysym(keysyms, location);
} }
/** /**
@@ -777,6 +754,7 @@ Guacamole.Keyboard = function(element) {
if (guac_keyboard.modifiers.alt && state.alt === false) { if (guac_keyboard.modifiers.alt && state.alt === false) {
release_key(0xFFE9); // Left alt release_key(0xFFE9); // Left alt
release_key(0xFFEA); // Right alt release_key(0xFFEA); // Right alt
release_key(0xFE03); // AltGr
} }
// Release shift if implicitly released // Release shift if implicitly released