GUACAMOLE-1473: Merge removal of AltGr from RDP keyboard layouts that…

… lack the key entirely.
apache · Jun 16, 2023 · 1e9777a · 1e9777a
2 parents e94b0a9 + 1f14982
commit 1e9777a
Show file tree

Hide file tree

Showing 22 changed files with 46 additions and 21 deletions.
diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
@@ -229,6 +229,7 @@ BUILT_SOURCES =                         \
 
 rdp_keymaps =                                \
     $(srcdir)/keymaps/base.keymap            \
+    $(srcdir)/keymaps/base_altgr.keymap      \
     $(srcdir)/keymaps/failsafe.keymap        \
     $(srcdir)/keymaps/cs-cz-qwertz.keymap    \
     $(srcdir)/keymaps/de_de_qwertz.keymap    \

diff --git a/src/protocols/rdp/keymaps/base.keymap b/src/protocols/rdp/keymaps/base.keymap
@@ -84,7 +84,6 @@ 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 ~ 0xffe7 # Meta_L
 map +ext 0x5C ~ 0xffe8 # Meta_R
 map +ext 0x5B ~ 0xffeb # Super_L

diff --git a/src/protocols/rdp/keymaps/base_altgr.keymap b/src/protocols/rdp/keymaps/base_altgr.keymap
@@ -0,0 +1,25 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+parent  "base"
+name    "base_altgr"
+
+# Modifiers
+map +ext 0x38 ~ 0xfe03 # AltGr
+
diff --git a/src/protocols/rdp/keymaps/cs-cz-qwertz.keymap b/src/protocols/rdp/keymaps/cs-cz-qwertz.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "cs-cz-qwertz"
 freerdp "KBD_CZECH"
 

diff --git a/src/protocols/rdp/keymaps/da_dk_qwerty.keymap b/src/protocols/rdp/keymaps/da_dk_qwerty.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "da-dk-qwerty"
 freerdp "KBD_DANISH"
 

diff --git a/src/protocols/rdp/keymaps/de_ch_qwertz.keymap b/src/protocols/rdp/keymaps/de_ch_qwertz.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "de-ch-qwertz"
 freerdp "KBD_SWISS_GERMAN"
 

diff --git a/src/protocols/rdp/keymaps/de_de_qwertz.keymap b/src/protocols/rdp/keymaps/de_de_qwertz.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "de-de-qwertz"
 freerdp "KBD_GERMAN"
 

diff --git a/src/protocols/rdp/keymaps/en_gb_qwerty.keymap b/src/protocols/rdp/keymaps/en_gb_qwerty.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "en-gb-qwerty"
 freerdp "KBD_UNITED_KINGDOM"
 

diff --git a/src/protocols/rdp/keymaps/es_es_qwerty.keymap b/src/protocols/rdp/keymaps/es_es_qwerty.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "es-es-qwerty"
 freerdp "KBD_SPANISH"
 

diff --git a/src/protocols/rdp/keymaps/es_latam_qwerty.keymap b/src/protocols/rdp/keymaps/es_latam_qwerty.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "es-latam-qwerty"
 freerdp "KBD_LATIN_AMERICAN"
 

diff --git a/src/protocols/rdp/keymaps/fr_be_azerty.keymap b/src/protocols/rdp/keymaps/fr_be_azerty.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "fr-be-azerty"
 freerdp "KBD_BELGIAN_FRENCH"
 

diff --git a/src/protocols/rdp/keymaps/fr_ca_qwerty.keymap b/src/protocols/rdp/keymaps/fr_ca_qwerty.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "fr-ca-qwerty"
 freerdp "KBD_CANADIAN_FRENCH"
 

diff --git a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "fr-ch-qwertz"
 freerdp "KBD_SWISS_FRENCH"
 

diff --git a/src/protocols/rdp/keymaps/fr_fr_azerty.keymap b/src/protocols/rdp/keymaps/fr_fr_azerty.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "fr-fr-azerty"
 freerdp "KBD_FRENCH"
 

diff --git a/src/protocols/rdp/keymaps/hu_hu_qwertz.keymap b/src/protocols/rdp/keymaps/hu_hu_qwertz.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "hu-hu-qwertz"
 freerdp "KBD_HUNGARIAN"
 

diff --git a/src/protocols/rdp/keymaps/it_it_qwerty.keymap b/src/protocols/rdp/keymaps/it_it_qwerty.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "it-it-qwerty"
 freerdp "KBD_ITALIAN"
 

diff --git a/src/protocols/rdp/keymaps/no_no_qwerty.keymap b/src/protocols/rdp/keymaps/no_no_qwerty.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "no-no-qwerty"
 freerdp "KBD_NORWEGIAN"
 

diff --git a/src/protocols/rdp/keymaps/pt_br_qwerty.keymap b/src/protocols/rdp/keymaps/pt_br_qwerty.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "pt-br-qwerty"
 freerdp "KBD_PORTUGUESE_BRAZILIAN_ABNT2"
 
@@ -64,4 +64,4 @@ map -altgr +shift 0x07 ~ 0xFE57 # Dead diaeresis (umlaut)
 map -altgr +shift 0x1A ~ 0xFE50 # Dead grave
 map -altgr -shift 0x1A ~ 0xFE51 # Dead acute
 map -altgr +shift 0x28 ~ 0xFE52 # Dead circumflex
-map -altgr -shift 0x28 ~ 0xFE53 # Dead tilde
+map -altgr -shift 0x28 ~ 0xFE53 # Dead tilde
diff --git a/src/protocols/rdp/keymaps/pt_pt_qwerty.keymap b/src/protocols/rdp/keymaps/pt_pt_qwerty.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "pt-pt-qwerty"
 freerdp "KBD_PORTUGUESE"
 

diff --git a/src/protocols/rdp/keymaps/ro_ro_qwerty.keymap b/src/protocols/rdp/keymaps/ro_ro_qwerty.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "ro-ro-qwerty"
 freerdp "KBD_ROMANIAN"
 

diff --git a/src/protocols/rdp/keymaps/sv_se_qwerty.keymap b/src/protocols/rdp/keymaps/sv_se_qwerty.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "sv-se-qwerty"
 freerdp "KBD_SWEDISH"
 

diff --git a/src/protocols/rdp/keymaps/tr_tr_qwerty.keymap b/src/protocols/rdp/keymaps/tr_tr_qwerty.keymap
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-parent  "base"
+parent  "base_altgr"
 name    "tr-tr-qwerty"
 freerdp "KBD_TURKISH_Q"