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-1386: Merge correct definitions of "Meta" and "Super" keys.

Browse Source
This commit is contained in:
Virtually Nick
2021-07-27 16:13:16 -04:00
committed by GitHub
parent 925621a707 5c9483a810
commit 055471f80f
8 changed files with 50 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -437,9 +437,9 @@ Guacamole.Keyboard = function Keyboard(element) {
40: [0xFF54, 0xFF54, 0xFF54, 0xFFB2], // down arrow / KP 2 40: [0xFF54, 0xFF54, 0xFF54, 0xFFB2], // down arrow / KP 2
45: [0xFF63, 0xFF63, 0xFF63, 0xFFB0], // insert / KP 0 45: [0xFF63, 0xFF63, 0xFF63, 0xFFB0], // insert / KP 0
46: [0xFFFF, 0xFFFF, 0xFFFF, 0xFFAE], // delete / KP decimal 46: [0xFFFF, 0xFFFF, 0xFFFF, 0xFFAE], // delete / KP decimal
91: [0xFFEB], // left window key (hyper_l) 91: [0xFFE7], // left windows/command key (meta_l)
92: [0xFF67], // right window key (menu key?) 92: [0xFFE8], // right window/command key (meta_r)
93: null, // select key 93: [0xFF67], // menu key
96: [0xFFB0], // KP 0 96: [0xFFB0], // KP 0
97: [0xFFB1], // KP 1 97: [0xFFB1], // KP 1
98: [0xFFB2], // KP 2 98: [0xFFB2], // KP 2
@@ -583,7 +583,7 @@ Guacamole.Keyboard = function Keyboard(element) {
"UIKeyInputUpArrow": [0xFF52], "UIKeyInputUpArrow": [0xFF52],
"Up": [0xFF52], "Up": [0xFF52],
"Undo": [0xFF65], "Undo": [0xFF65],
"Win": [0xFFEB], "Win": [0xFFE7, 0xFFE7, 0xFFE8],
"Zenkaku": [0xFF28], "Zenkaku": [0xFF28],
"ZenkakuHankaku": [0xFF2A] "ZenkakuHankaku": [0xFF2A]
}; };
@@ -603,8 +603,8 @@ Guacamole.Keyboard = function Keyboard(element) {
0xFFE8: true, // Right meta 0xFFE8: true, // Right meta
0xFFE9: true, // Left alt 0xFFE9: true, // Left alt
0xFFEA: true, // Right alt 0xFFEA: true, // Right alt
0xFFEB: true, // Left hyper 0xFFEB: true, // Left super/hyper
0xFFEC: true // Right hyper 0xFFEC: true // Right super/hyper
}; };
/** /**
@@ -1031,8 +1031,8 @@ Guacamole.Keyboard = function Keyboard(element) {
// Resync state of hyper // Resync state of hyper
updateModifierState(guac_keyboard.modifiers.hyper, state.hyper, [ updateModifierState(guac_keyboard.modifiers.hyper, state.hyper, [
0xFFEB, // Left hyper 0xFFEB, // Left super/hyper
0xFFEC // Right hyper 0xFFEC // Right super/hyper
], keyEvent); ], keyEvent);
// Update state // Update state

13
guacamole/src/main/frontend/src/layouts/de-de-qwertz.json
View File

@@ -78,7 +78,6 @@
"Menu" : [{ "Menu" : [{
"title" : "Menu", "title" : "Menu",
"modifier" : "super",
"keysym" : 65383 "keysym" : 65383
}], }],
"LShift" : [{ "LShift" : [{
@@ -116,10 +115,10 @@
"modifier" : "alt-gr", "modifier" : "alt-gr",
"keysym" : 65027 "keysym" : 65027
}], }],
"Super" : [{ "Meta" : [{
"title" : "Super", "title" : "Meta",
"modifier" : "super", "modifier" : "meta",
"keysym" : 65515 "keysym" : 65511
}], }],
"^" : [ "^" : [
@@ -404,7 +403,7 @@
[ "Tab", "q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "ü", "+", 1, 0.6 ], [ "Tab", "q", "w", "e", "r", "t", "z", "u", "i", "o", "p", "ü", "+", 1, 0.6 ],
[ "Caps", "a", "s", "d", "f", "g", "h", "j", "k", "l", "ö", "ä", "#", "Enter" ], [ "Caps", "a", "s", "d", "f", "g", "h", "j", "k", "l", "ö", "ä", "#", "Enter" ],
[ "LShift", "<", "y", "x", "c", "v", "b", "n", "m", ",", ".", "-", "RShift" ], [ "LShift", "<", "y", "x", "c", "v", "b", "n", "m", ",", ".", "-", "RShift" ],
[ "LCtrl", "Super", "LAlt", "Space", "AltGr", "Menu", "RCtrl" ] [ "LCtrl", "Meta", "LAlt", "Space", "AltGr", "Menu", "RCtrl" ]
], ],
@@ -431,7 +430,7 @@
"RShift" : 2.1, "RShift" : 2.1,
"LCtrl" : 1.6, "LCtrl" : 1.6,
"Super" : 1.6, "Meta" : 1.6,
"LAlt" : 1.6, "LAlt" : 1.6,
"Space" : 6.1, "Space" : 6.1,
"AltGr" : 1.6, "AltGr" : 1.6,

12
guacamole/src/main/frontend/src/layouts/en-us-qwerty.json
View File

@@ -87,10 +87,10 @@
"modifier" : "alt", "modifier" : "alt",
"keysym" : 65514 "keysym" : 65514
}], }],
"Super" : [{ "Meta" : [{
"title" : "Super", "title" : "Meta",
"modifier" : "super", "modifier" : "meta",
"keysym" : 65515 "keysym" : 65511
}], }],
"`" : [ "`" : [
@@ -353,7 +353,7 @@
[ "Tab", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "\\" ], [ "Tab", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "\\" ],
[ "Caps", "a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "'", "Enter" ], [ "Caps", "a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "'", "Enter" ],
[ "LShift", "z", "x", "c", "v", "b", "n", "m", ",", ".", "/", "RShift" ], [ "LShift", "z", "x", "c", "v", "b", "n", "m", ",", ".", "/", "RShift" ],
[ "LCtrl", "Super", "LAlt", "Space", "RAlt", "Menu", "RCtrl" ] [ "LCtrl", "Meta", "LAlt", "Space", "RAlt", "Menu", "RCtrl" ]
], ],
@@ -380,7 +380,7 @@
"RShift" : 3.1, "RShift" : 3.1,
"LCtrl" : 1.6, "LCtrl" : 1.6,
"Super" : 1.6, "Meta" : 1.6,
"LAlt" : 1.6, "LAlt" : 1.6,
"Space" : 6.1, "Space" : 6.1,
"RAlt" : 1.6, "RAlt" : 1.6,

13
guacamole/src/main/frontend/src/layouts/es-es-qwerty.json
View File

@@ -78,7 +78,6 @@
"Menu" : [{ "Menu" : [{
"title" : "Menu", "title" : "Menu",
"modifier" : "super",
"keysym" : 65383 "keysym" : 65383
}], }],
"LShift" : [{ "LShift" : [{
@@ -116,10 +115,10 @@
"modifier" : "alt-gr", "modifier" : "alt-gr",
"keysym" : 65027 "keysym" : 65027
}], }],
"Super" : [{ "Meta" : [{
"title" : "Super", "title" : "Meta",
"modifier" : "super", "modifier" : "meta",
"keysym" : 65515 "keysym" : 65511
}], }],
"º" : [ "º" : [
@@ -410,7 +409,7 @@
[ "Tab", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "`", "+", 1, 0.6 ], [ "Tab", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "`", "+", 1, 0.6 ],
[ "Caps", "a", "s", "d", "f", "g", "h", "j", "k", "l", "ñ", "´", "ç", "Enter" ], [ "Caps", "a", "s", "d", "f", "g", "h", "j", "k", "l", "ñ", "´", "ç", "Enter" ],
[ "LShift", "<", "z", "x", "c", "v", "b", "n", "m", ",", ".", "-", "RShift" ], [ "LShift", "<", "z", "x", "c", "v", "b", "n", "m", ",", ".", "-", "RShift" ],
[ "LCtrl", "Super", "LAlt", "Space", "AltGr", "Menu", "RCtrl" ] [ "LCtrl", "Meta", "LAlt", "Space", "AltGr", "Menu", "RCtrl" ]
], ],
@@ -437,7 +436,7 @@
"RShift" : 2.2, "RShift" : 2.2,
"LCtrl" : 1.6, "LCtrl" : 1.6,
"Super" : 1.6, "Meta" : 1.6,
"LAlt" : 1.6, "LAlt" : 1.6,
"Space" : 6.4, "Space" : 6.4,
"AltGr" : 1.6, "AltGr" : 1.6,

12
guacamole/src/main/frontend/src/layouts/fr-fr-azerty.json
View File

@@ -118,10 +118,10 @@
"modifier" : "alt-gr", "modifier" : "alt-gr",
"keysym" : 65027 "keysym" : 65027
}], }],
"Super" : [{ "Meta" : [{
"title" : "Super", "title" : "Meta",
"modifier" : "super", "modifier" : "meta",
"keysym" : 65515 "keysym" : 65511
}], }],
"²" : [ "²" : [
@@ -400,7 +400,7 @@
[ "Tab", "a", "z", "e", "r", "t", "y", "u", "i", "o", "p", "^", "$", 1, 0.8 ], [ "Tab", "a", "z", "e", "r", "t", "y", "u", "i", "o", "p", "^", "$", 1, 0.8 ],
[ "Caps", "q", "s", "d", "f", "g", "h", "j", "k", "l", "m", "ù", "*", "Enter" ], [ "Caps", "q", "s", "d", "f", "g", "h", "j", "k", "l", "m", "ù", "*", "Enter" ],
[ "LShift", "<", "w", "x", "c", "v", "b", "n", ",", ";", ":", "!", "RShift" ], [ "LShift", "<", "w", "x", "c", "v", "b", "n", ",", ";", ":", "!", "RShift" ],
[ "LCtrl", "Super", "LAlt", "Space", "AltGr", "Menu", "RCtrl" ] [ "LCtrl", "Meta", "LAlt", "Space", "AltGr", "Menu", "RCtrl" ]
], ],
@@ -427,7 +427,7 @@
"RShift" : 2.1, "RShift" : 2.1,
"LCtrl" : 1.6, "LCtrl" : 1.6,
"Super" : 1.6, "Meta" : 1.6,
"LAlt" : 1.6, "LAlt" : 1.6,
"Space" : 6.1, "Space" : 6.1,
"AltGr" : 1.6, "AltGr" : 1.6,

13
guacamole/src/main/frontend/src/layouts/it-it-qwerty.json
View File

@@ -78,7 +78,6 @@
"Menu" : [{ "Menu" : [{
"title" : "Menu", "title" : "Menu",
"modifier" : "super",
"keysym" : 65383 "keysym" : 65383
}], }],
"LShift" : [{ "LShift" : [{
@@ -116,10 +115,10 @@
"modifier" : "alt-gr", "modifier" : "alt-gr",
"keysym" : 65027 "keysym" : 65027
}], }],
"Super" : [{ "Meta" : [{
"title" : "Super", "title" : "Meta",
"modifier" : "super", "modifier" : "meta",
"keysym" : 65515 "keysym" : 65511
}], }],
"\\" : [ "\\" : [
@@ -407,7 +406,7 @@
[ "Tab", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "è", "+", 1, 0.6 ], [ "Tab", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "è", "+", 1, 0.6 ],
[ "Caps", "a", "s", "d", "f", "g", "h", "j", "k", "l", "ò", "à", "ù", "Enter" ], [ "Caps", "a", "s", "d", "f", "g", "h", "j", "k", "l", "ò", "à", "ù", "Enter" ],
[ "LShift", "<", "z", "x", "c", "v", "b", "n", "m", ",", ".", "-", "RShift" ], [ "LShift", "<", "z", "x", "c", "v", "b", "n", "m", ",", ".", "-", "RShift" ],
[ "LCtrl", "Super", "LAlt", "Space", "AltGr", "Menu", "RCtrl" ] [ "LCtrl", "Meta", "LAlt", "Space", "AltGr", "Menu", "RCtrl" ]
], ],
@@ -434,7 +433,7 @@
"RShift" : 2.2, "RShift" : 2.2,
"LCtrl" : 1.6, "LCtrl" : 1.6,
"Super" : 1.6, "Meta" : 1.6,
"LAlt" : 1.6, "LAlt" : 1.6,
"Space" : 6.4, "Space" : 6.4,
"AltGr" : 1.6, "AltGr" : 1.6,

13
guacamole/src/main/frontend/src/layouts/nl-nl-qwerty.json
View File

@@ -78,7 +78,6 @@
"Menu" : [{ "Menu" : [{
"title" : "Menu", "title" : "Menu",
"modifier" : "super",
"keysym" : 65383 "keysym" : 65383
}], }],
"LShift" : [{ "LShift" : [{
@@ -116,10 +115,10 @@
"modifier" : "alt-gr", "modifier" : "alt-gr",
"keysym" : 65027 "keysym" : 65027
}], }],
"Super" : [{ "Meta" : [{
"title" : "Super", "title" : "Meta",
"modifier" : "super", "modifier" : "meta",
"keysym" : 65515 "keysym" : 65511
}], }],
"@" : [ "@" : [
@@ -419,7 +418,7 @@
[ "Tab", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "¨", "*", 1, 0.6 ], [ "Tab", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "¨", "*", 1, 0.6 ],
[ "Caps", "a", "s", "d", "f", "g", "h", "j", "k", "l", "+", "´", "<", "Enter" ], [ "Caps", "a", "s", "d", "f", "g", "h", "j", "k", "l", "+", "´", "<", "Enter" ],
[ "LShift", "]", "z", "x", "c", "v", "b", "n", "m", ",", ".", "-", "RShift" ], [ "LShift", "]", "z", "x", "c", "v", "b", "n", "m", ",", ".", "-", "RShift" ],
[ "LCtrl", "Super", "LAlt", "Space", "AltGr", "Menu", "RCtrl" ] [ "LCtrl", "Meta", "LAlt", "Space", "AltGr", "Menu", "RCtrl" ]
], ],
@@ -446,7 +445,7 @@
"RShift" : 2.2, "RShift" : 2.2,
"LCtrl" : 1.6, "LCtrl" : 1.6,
"Super" : 1.6, "Meta" : 1.6,
"LAlt" : 1.6, "LAlt" : 1.6,
"Space" : 6.4, "Space" : 6.4,
"AltGr" : 1.6, "AltGr" : 1.6,

12
guacamole/src/main/frontend/src/layouts/ru-ru-qwerty.json
View File

@@ -87,10 +87,10 @@
"modifier" : "alt", "modifier" : "alt",
"keysym" : 65514 "keysym" : 65514
}], }],
"Super" : [{ "Meta" : [{
"title" : "Super", "title" : "Meta",
"modifier" : "super", "modifier" : "meta",
"keysym" : 65515 "keysym" : 65511
}], }],
"Latin" : [{ "Latin" : [{
"title" : "Latin", "title" : "Latin",
@@ -499,7 +499,7 @@
[ "Tab", "й", "ц", "у", "к", "е", "н", "г", "ш", "щ", "з", "х", "ъ", "\\" ], [ "Tab", "й", "ц", "у", "к", "е", "н", "г", "ш", "щ", "з", "х", "ъ", "\\" ],
[ "Caps", "ф", "ы", "в", "а", "п", "р", "о", "л", "д", "ж", "э", "Enter" ], [ "Caps", "ф", "ы", "в", "а", "п", "р", "о", "л", "д", "ж", "э", "Enter" ],
[ "LShift", "я", "ч", "с", "м", "и", "т", "ь", "б", "ю", "/", "RShift" ], [ "LShift", "я", "ч", "с", "м", "и", "т", "ь", "б", "ю", "/", "RShift" ],
[ "LCtrl", "Super", "LAlt", "Space", "RAlt", "Menu", "RCtrl" ] [ "LCtrl", "Meta", "LAlt", "Space", "RAlt", "Menu", "RCtrl" ]
], ],
@@ -526,7 +526,7 @@
"RShift" : 3.1, "RShift" : 3.1,
"LCtrl" : 1.6, "LCtrl" : 1.6,
"Super" : 1.6, "Meta" : 1.6,
"LAlt" : 1.6, "LAlt" : 1.6,
"Space" : 6.1, "Space" : 6.1,
"RAlt" : 1.6, "RAlt" : 1.6,