GUACAMOLE-1386: Define "Meta" key for on-screen keyboard instead of "Super".
The correct key for the "Windows" key (or the Mac "Command" key) is
"Meta". The "Super" key is an entirely different key not used for that
purpose, and it only currently works with Guacamole because the
Guacamole's base RDP keymap specifically maps the "Super" keys to the
"Windows" keys.
diff --git a/guacamole/src/main/frontend/src/layouts/de-de-qwertz.json b/guacamole/src/main/frontend/src/layouts/de-de-qwertz.json
index 2b746aa..052a3a7 100644
--- a/guacamole/src/main/frontend/src/layouts/de-de-qwertz.json
+++ b/guacamole/src/main/frontend/src/layouts/de-de-qwertz.json
@@ -78,7 +78,6 @@
"Menu" : [{
"title" : "Menu",
- "modifier" : "super",
"keysym" : 65383
}],
"LShift" : [{
@@ -116,10 +115,10 @@
"modifier" : "alt-gr",
"keysym" : 65027
}],
- "Super" : [{
- "title" : "Super",
- "modifier" : "super",
- "keysym" : 65515
+ "Meta" : [{
+ "title" : "Meta",
+ "modifier" : "meta",
+ "keysym" : 65511
}],
"^" : [
@@ -404,7 +403,7 @@
[ "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" ],
[ "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,
"LCtrl" : 1.6,
- "Super" : 1.6,
+ "Meta" : 1.6,
"LAlt" : 1.6,
"Space" : 6.1,
"AltGr" : 1.6,
diff --git a/guacamole/src/main/frontend/src/layouts/en-us-qwerty.json b/guacamole/src/main/frontend/src/layouts/en-us-qwerty.json
index 13b2ddb..fa9a6fe 100644
--- a/guacamole/src/main/frontend/src/layouts/en-us-qwerty.json
+++ b/guacamole/src/main/frontend/src/layouts/en-us-qwerty.json
@@ -87,10 +87,10 @@
"modifier" : "alt",
"keysym" : 65514
}],
- "Super" : [{
- "title" : "Super",
- "modifier" : "super",
- "keysym" : 65515
+ "Meta" : [{
+ "title" : "Meta",
+ "modifier" : "meta",
+ "keysym" : 65511
}],
"`" : [
@@ -353,7 +353,7 @@
[ "Tab", "q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "\\" ],
[ "Caps", "a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "'", "Enter" ],
[ "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,
"LCtrl" : 1.6,
- "Super" : 1.6,
+ "Meta" : 1.6,
"LAlt" : 1.6,
"Space" : 6.1,
"RAlt" : 1.6,
diff --git a/guacamole/src/main/frontend/src/layouts/es-es-qwerty.json b/guacamole/src/main/frontend/src/layouts/es-es-qwerty.json
index dc330e5..e88c6cd 100644
--- a/guacamole/src/main/frontend/src/layouts/es-es-qwerty.json
+++ b/guacamole/src/main/frontend/src/layouts/es-es-qwerty.json
@@ -78,7 +78,6 @@
"Menu" : [{
"title" : "Menu",
- "modifier" : "super",
"keysym" : 65383
}],
"LShift" : [{
@@ -116,10 +115,10 @@
"modifier" : "alt-gr",
"keysym" : 65027
}],
- "Super" : [{
- "title" : "Super",
- "modifier" : "super",
- "keysym" : 65515
+ "Meta" : [{
+ "title" : "Meta",
+ "modifier" : "meta",
+ "keysym" : 65511
}],
"º" : [
@@ -410,7 +409,7 @@
[ "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" ],
[ "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,
"LCtrl" : 1.6,
- "Super" : 1.6,
+ "Meta" : 1.6,
"LAlt" : 1.6,
"Space" : 6.4,
"AltGr" : 1.6,
diff --git a/guacamole/src/main/frontend/src/layouts/fr-fr-azerty.json b/guacamole/src/main/frontend/src/layouts/fr-fr-azerty.json
index f248907..bf3eaf3 100644
--- a/guacamole/src/main/frontend/src/layouts/fr-fr-azerty.json
+++ b/guacamole/src/main/frontend/src/layouts/fr-fr-azerty.json
@@ -118,10 +118,10 @@
"modifier" : "alt-gr",
"keysym" : 65027
}],
- "Super" : [{
- "title" : "Super",
- "modifier" : "super",
- "keysym" : 65515
+ "Meta" : [{
+ "title" : "Meta",
+ "modifier" : "meta",
+ "keysym" : 65511
}],
"²" : [
@@ -400,7 +400,7 @@
[ "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" ],
[ "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,
"LCtrl" : 1.6,
- "Super" : 1.6,
+ "Meta" : 1.6,
"LAlt" : 1.6,
"Space" : 6.1,
"AltGr" : 1.6,
diff --git a/guacamole/src/main/frontend/src/layouts/it-it-qwerty.json b/guacamole/src/main/frontend/src/layouts/it-it-qwerty.json
index 17ae06d..4775e6f 100644
--- a/guacamole/src/main/frontend/src/layouts/it-it-qwerty.json
+++ b/guacamole/src/main/frontend/src/layouts/it-it-qwerty.json
@@ -78,7 +78,6 @@
"Menu" : [{
"title" : "Menu",
- "modifier" : "super",
"keysym" : 65383
}],
"LShift" : [{
@@ -116,10 +115,10 @@
"modifier" : "alt-gr",
"keysym" : 65027
}],
- "Super" : [{
- "title" : "Super",
- "modifier" : "super",
- "keysym" : 65515
+ "Meta" : [{
+ "title" : "Meta",
+ "modifier" : "meta",
+ "keysym" : 65511
}],
"\\" : [
@@ -407,7 +406,7 @@
[ "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" ],
[ "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,
"LCtrl" : 1.6,
- "Super" : 1.6,
+ "Meta" : 1.6,
"LAlt" : 1.6,
"Space" : 6.4,
"AltGr" : 1.6,
diff --git a/guacamole/src/main/frontend/src/layouts/nl-nl-qwerty.json b/guacamole/src/main/frontend/src/layouts/nl-nl-qwerty.json
index 65f24cb..f1e8744 100644
--- a/guacamole/src/main/frontend/src/layouts/nl-nl-qwerty.json
+++ b/guacamole/src/main/frontend/src/layouts/nl-nl-qwerty.json
@@ -78,7 +78,6 @@
"Menu" : [{
"title" : "Menu",
- "modifier" : "super",
"keysym" : 65383
}],
"LShift" : [{
@@ -116,10 +115,10 @@
"modifier" : "alt-gr",
"keysym" : 65027
}],
- "Super" : [{
- "title" : "Super",
- "modifier" : "super",
- "keysym" : 65515
+ "Meta" : [{
+ "title" : "Meta",
+ "modifier" : "meta",
+ "keysym" : 65511
}],
"@" : [
@@ -419,7 +418,7 @@
[ "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" ],
[ "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,
"LCtrl" : 1.6,
- "Super" : 1.6,
+ "Meta" : 1.6,
"LAlt" : 1.6,
"Space" : 6.4,
"AltGr" : 1.6,
diff --git a/guacamole/src/main/frontend/src/layouts/ru-ru-qwerty.json b/guacamole/src/main/frontend/src/layouts/ru-ru-qwerty.json
index 189dc16..63fa1cf 100644
--- a/guacamole/src/main/frontend/src/layouts/ru-ru-qwerty.json
+++ b/guacamole/src/main/frontend/src/layouts/ru-ru-qwerty.json
@@ -87,10 +87,10 @@
"modifier" : "alt",
"keysym" : 65514
}],
- "Super" : [{
- "title" : "Super",
- "modifier" : "super",
- "keysym" : 65515
+ "Meta" : [{
+ "title" : "Meta",
+ "modifier" : "meta",
+ "keysym" : 65511
}],
"Latin" : [{
"title" : "Latin",
@@ -499,7 +499,7 @@
[ "Tab", "й", "ц", "у", "к", "е", "н", "г", "ш", "щ", "з", "х", "ъ", "\\" ],
[ "Caps", "ф", "ы", "в", "а", "п", "р", "о", "л", "д", "ж", "э", "Enter" ],
[ "LShift", "я", "ч", "с", "м", "и", "т", "ь", "б", "ю", "/", "RShift" ],
- [ "LCtrl", "Super", "LAlt", "Space", "RAlt", "Menu", "RCtrl" ]
+ [ "LCtrl", "Meta", "LAlt", "Space", "RAlt", "Menu", "RCtrl" ]
],
@@ -526,7 +526,7 @@
"RShift" : 3.1,
"LCtrl" : 1.6,
- "Super" : 1.6,
+ "Meta" : 1.6,
"LAlt" : 1.6,
"Space" : 6.1,
"RAlt" : 1.6,
