From 2a30cadb1e8163e6228e03816d452eb4a5b98e06 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 29 Sep 2014 14:24:31 -0700 Subject: [PATCH] GUAC-870: Always interpret Right Alt as AltGr. This seems the only way to allow proper international typing across all supported platforms. There's no way to detect whether Alt is truly Alt under Mac. --- guacamole-common-js/src/main/webapp/modules/Keyboard.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/guacamole-common-js/src/main/webapp/modules/Keyboard.js b/guacamole-common-js/src/main/webapp/modules/Keyboard.js index 1ce3da1bd..69d25dd0e 100644 --- a/guacamole-common-js/src/main/webapp/modules/Keyboard.js +++ b/guacamole-common-js/src/main/webapp/modules/Keyboard.js @@ -328,7 +328,7 @@ Guacamole.Keyboard = function(element) { 13: [0xFF0D], // enter 16: [0xFFE1, 0xFFE1, 0xFFE2], // shift 17: [0xFFE3, 0xFFE3, 0xFFE4], // ctrl - 18: [0xFFE9, 0xFFE9, 0xFFEA], // alt + 18: [0xFFE9, 0xFFE9, 0xFE03], // alt 19: [0xFF13], // pause/break 20: [0xFFE5], // caps lock 27: [0xFF1B], // escape @@ -372,7 +372,7 @@ Guacamole.Keyboard = function(element) { "Again": [0xFF66], "AllCandidates": [0xFF3D], "Alphanumeric": [0xFF30], - "Alt": [0xFFE9, 0xFFE9, 0xFFEA], + "Alt": [0xFFE9, 0xFFE9, 0xFE03], "Attn": [0xFD0E], "AltGraph": [0xFE03], "ArrowDown": [0xFF54], @@ -776,7 +776,7 @@ Guacamole.Keyboard = function(element) { // Release alt if implicitly released if (guac_keyboard.modifiers.alt && state.alt === false) { release_key(0xFFE9); // Left alt - release_key(0xFFEA); // Right alt (or AltGr) + release_key(0xFFEA); // Right alt } // Release shift if implicitly released