From 337f3bbff280844012eeedb16311649ae55565d8 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 23 Jun 2020 21:46:26 -0700 Subject: [PATCH] GUACAMOLE-518: Map both Right Alt and AltGr to Windows' Right Alt. Windows expects the Right Alt key to be sent for AltGr. --- src/protocols/rdp/keyboard.c | 1 + src/protocols/rdp/keymaps/base.keymap | 1 + 2 files changed, 2 insertions(+) diff --git a/src/protocols/rdp/keyboard.c b/src/protocols/rdp/keyboard.c index a75b7340..9a5d2a51 100644 --- a/src/protocols/rdp/keyboard.c +++ b/src/protocols/rdp/keyboard.c @@ -619,6 +619,7 @@ void guac_rdp_keyboard_update_modifiers(guac_rdp_keyboard* keyboard, guac_rdp_keyboard_update_keysym(keyboard, 0xFE03, 1, GUAC_RDP_KEY_SOURCE_SYNTHETIC); } else if (clear_flags & GUAC_RDP_KEYMAP_MODIFIER_ALTGR) { + guac_rdp_keyboard_update_keysym(keyboard, 0xFFEA, 0, GUAC_RDP_KEY_SOURCE_SYNTHETIC); guac_rdp_keyboard_update_keysym(keyboard, 0xFE03, 0, GUAC_RDP_KEY_SOURCE_SYNTHETIC); } diff --git a/src/protocols/rdp/keymaps/base.keymap b/src/protocols/rdp/keymaps/base.keymap index d02c5eab..09b664c6 100644 --- a/src/protocols/rdp/keymaps/base.keymap +++ b/src/protocols/rdp/keymaps/base.keymap @@ -84,6 +84,7 @@ map 0x1D ~ 0xffe3 # Control_L map +ext 0x1D ~ 0xffe4 # Control_R map 0x38 ~ 0xffe9 # Alt_L map +ext 0x38 ~ 0xffea # Alt_R +map +ext 0x38 ~ 0xfe03 # AltGr map +ext 0x5B ~ 0xffeb # Super_L map +ext 0x5C ~ 0xffec # Super_R map +ext 0x5D ~ 0xff67 # Menu