GUACAMOLE-1473: Disable AltGr handling for RDP keyboard layouts that don't support it.

This commit is contained in:
James Muehlner 2023-06-14 18:14:14 +00:00
parent e94b0a9a3a
commit 1f14982add
22 changed files with 46 additions and 21 deletions

View File

@ -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 \

View File

@ -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

View File

@ -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

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "cs-cz-qwertz"
freerdp "KBD_CZECH"

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "da-dk-qwerty"
freerdp "KBD_DANISH"

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "de-ch-qwertz"
freerdp "KBD_SWISS_GERMAN"

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "de-de-qwertz"
freerdp "KBD_GERMAN"

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "en-gb-qwerty"
freerdp "KBD_UNITED_KINGDOM"

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "es-es-qwerty"
freerdp "KBD_SPANISH"

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "es-latam-qwerty"
freerdp "KBD_LATIN_AMERICAN"

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "fr-be-azerty"
freerdp "KBD_BELGIAN_FRENCH"

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "fr-ca-qwerty"
freerdp "KBD_CANADIAN_FRENCH"

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "fr-ch-qwertz"
freerdp "KBD_SWISS_FRENCH"

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "fr-fr-azerty"
freerdp "KBD_FRENCH"

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "hu-hu-qwertz"
freerdp "KBD_HUNGARIAN"

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "it-it-qwerty"
freerdp "KBD_ITALIAN"

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "no-no-qwerty"
freerdp "KBD_NORWEGIAN"

View File

@ -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

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "pt-pt-qwerty"
freerdp "KBD_PORTUGUESE"

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "ro-ro-qwerty"
freerdp "KBD_ROMANIAN"

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "sv-se-qwerty"
freerdp "KBD_SWEDISH"

View File

@ -17,7 +17,7 @@
# under the License.
#
parent "base"
parent "base_altgr"
name "tr-tr-qwerty"
freerdp "KBD_TURKISH_Q"