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

GUACAMOLE-1113: Merge restoration of support for right Alt (not just AltGr) in JS keyboard.

Browse Source
This commit is contained in:
Mike Jumper
2023-06-21 09:42:01 -07:00
committed by GitHub
parent 5bea1b16a1 1f8183357c
commit 7bad200eac
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,6 +295,10 @@ Guacamole.Keyboard = function Keyboard(element) {
// Determine whether default action for Alt+combinations must be prevented // Determine whether default action for Alt+combinations must be prevented
var prevent_alt = !this.modifiers.ctrl && !quirks.altIsTypableOnly; var prevent_alt = !this.modifiers.ctrl && !quirks.altIsTypableOnly;
// If alt is typeable only, and this is actually an alt key event, treat as AltGr instead
if (quirks.altIsTypableOnly && (this.keysym === 0xFFE9 || this.keysym === 0xFFEA))
this.keysym = 0xFE03;
// Determine whether default action for Ctrl+combinations must be prevented // Determine whether default action for Ctrl+combinations must be prevented
var prevent_ctrl = !this.modifiers.alt; var prevent_ctrl = !this.modifiers.alt;
@@ -395,7 +399,7 @@ Guacamole.Keyboard = function Keyboard(element) {
13: [0xFF0D], // enter 13: [0xFF0D], // enter
16: [0xFFE1, 0xFFE1, 0xFFE2], // shift 16: [0xFFE1, 0xFFE1, 0xFFE2], // shift
17: [0xFFE3, 0xFFE3, 0xFFE4], // ctrl 17: [0xFFE3, 0xFFE3, 0xFFE4], // ctrl
18: [0xFFE9, 0xFFE9, 0xFE03], // alt 18: [0xFFE9, 0xFFE9, 0xFFEA], // alt
19: [0xFF13], // pause/break 19: [0xFF13], // pause/break
20: [0xFFE5], // caps lock 20: [0xFFE5], // caps lock
27: [0xFF1B], // escape 27: [0xFF1B], // escape
@@ -456,7 +460,7 @@ Guacamole.Keyboard = function Keyboard(element) {
"Again": [0xFF66], "Again": [0xFF66],
"AllCandidates": [0xFF3D], "AllCandidates": [0xFF3D],
"Alphanumeric": [0xFF30], "Alphanumeric": [0xFF30],
"Alt": [0xFFE9, 0xFFE9, 0xFE03], "Alt": [0xFFE9, 0xFFE9, 0xFFEA],
"Attn": [0xFD0E], "Attn": [0xFD0E],
"AltGraph": [0xFE03], "AltGraph": [0xFE03],
"ArrowDown": [0xFF54], "ArrowDown": [0xFF54],