From 941fd9659a27d801f330c2f1f9dd172b794bea73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Marie-Marthe?= Date: Mon, 9 Jan 2017 16:41:05 +0100 Subject: [PATCH 1/6] GUACAMOLE-135: Add Swiss-French keymap for RDP. --- src/protocols/rdp/Makefile.am | 1 + src/protocols/rdp/keymaps/fr_ch_qwertz.keymap | 57 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 src/protocols/rdp/keymaps/fr_ch_qwertz.keymap diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am index 0864faec..a190003b 100644 --- a/src/protocols/rdp/Makefile.am +++ b/src/protocols/rdp/Makefile.am @@ -247,6 +247,7 @@ rdp_keymaps = \ keymaps/de_de_qwertz.keymap \ keymaps/en_us_qwerty.keymap \ keymaps/fr_fr_azerty.keymap \ + keymaps/fr_ch_qwertz.keymap \ keymaps/it_it_qwerty.keymap \ keymaps/ja_jp_qwerty.keymap \ keymaps/sv_se_qwerty.keymap diff --git a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap new file mode 100644 index 00000000..52cc18ae --- /dev/null +++ b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap @@ -0,0 +1,57 @@ +# +# 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 "fr-ch-qwertz" +freerdp "KBD_SWISS_FRENCH" + +# +# Basic keys +# + +map -altgr -shift 0x29 0x02..0x0C ~ "§1234567890'" +map -altgr -shift 0x10..0x19 0x1A ~ "qwertzuiopè" +map -altgr -shift 0x1E..0x28 0x2B ~ "asdfghjkléà$" +map -altgr -shift 0x56 0x2C..0x35 ~ "YXCVBNM;:_" + +# +# Keys requiring AltGr +# + +map +altgr -shift 0x02..0x04 ~ "¦@#" +map +altgr -shift 0x06..0x08 0x0C 0x0D ~ "¬|¢´~" +map +altgr -shift 0x1A 0x1B ~ "[]" +map +altgr -shift 0x28 0x2B ~ "{}" +map +altgr -shift 0x56 ~ "\" + +map +altgr -shift 0x12 ~ "€" + +# +# Dead keys +# +map -altgr -shift 0x1B ~ 0x00A8 # Dead key +map +altgr -shift 0x0C ~ 0xFE51 # Dead acute +map -altgr -shift 0x0D ~ 0xFE52 # Dead circumflex +map -altgr +shift 0x0D ~ 0xFE50 # Dead grave +map +altgr -shift 0x0D ~ 0xFE53 # Dead tilde From 86493dda939aacbc2d0d876447c3ea204afaa4a6 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 28 Jan 2017 14:19:52 -0800 Subject: [PATCH 2/6] GUACAMOLE-135: Remove duplicate scancode mappings from Swiss French keymap. --- src/protocols/rdp/keymaps/fr_ch_qwertz.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap index 52cc18ae..c0281a51 100644 --- a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap +++ b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap @@ -40,7 +40,7 @@ map -altgr +shift 0x56 0x2C..0x35 ~ ">YXCVBNM;:_" # map +altgr -shift 0x02..0x04 ~ "¦@#" -map +altgr -shift 0x06..0x08 0x0C 0x0D ~ "¬|¢´~" +map +altgr -shift 0x06..0x08 ~ "¬|¢" map +altgr -shift 0x1A 0x1B ~ "[]" map +altgr -shift 0x28 0x2B ~ "{}" map +altgr -shift 0x56 ~ "\" From fb298acdcd8bf9bade4e254f243bbafe58dbf1af Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 28 Jan 2017 14:21:17 -0800 Subject: [PATCH 3/6] GUACAMOLE-135: Abbreviate Swiss French mapping range where possible. --- src/protocols/rdp/keymaps/fr_ch_qwertz.keymap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap index c0281a51..459a4fad 100644 --- a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap +++ b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap @@ -26,12 +26,12 @@ freerdp "KBD_SWISS_FRENCH" # map -altgr -shift 0x29 0x02..0x0C ~ "§1234567890'" -map -altgr -shift 0x10..0x19 0x1A ~ "qwertzuiopè" +map -altgr -shift 0x10..0x1A ~ "qwertzuiopè" map -altgr -shift 0x1E..0x28 0x2B ~ "asdfghjkléà$" map -altgr -shift 0x56 0x2C..0x35 ~ "YXCVBNM;:_" From c6f6bb67f0d1ceca54496d52da3df560ceb4a213 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 28 Jan 2017 14:22:22 -0800 Subject: [PATCH 4/6] GUACAMOLE-135: Swiss Franch dead umlaut should map from keysym 0xFE57. --- src/protocols/rdp/keymaps/fr_ch_qwertz.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap index 459a4fad..8ada9510 100644 --- a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap +++ b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap @@ -50,7 +50,7 @@ map +altgr -shift 0x12 ~ "€" # # Dead keys # -map -altgr -shift 0x1B ~ 0x00A8 # Dead key +map -altgr -shift 0x1B ~ 0xFE57 # Dead umlaut map +altgr -shift 0x0C ~ 0xFE51 # Dead acute map -altgr -shift 0x0D ~ 0xFE52 # Dead circumflex map -altgr +shift 0x0D ~ 0xFE50 # Dead grave From c79b303237390981a85b9a177ca81abb2548f379 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 28 Jan 2017 14:23:33 -0800 Subject: [PATCH 5/6] GUACAMOLE-135: Clean up spacing and alignment of Swiss French keymap. --- src/protocols/rdp/keymaps/fr_ch_qwertz.keymap | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap index 8ada9510..a4605048 100644 --- a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap +++ b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap @@ -25,33 +25,35 @@ freerdp "KBD_SWISS_FRENCH" # Basic keys # -map -altgr -shift 0x29 0x02..0x0C ~ "§1234567890'" -map -altgr -shift 0x10..0x1A ~ "qwertzuiopè" -map -altgr -shift 0x1E..0x28 0x2B ~ "asdfghjkléà$" -map -altgr -shift 0x56 0x2C..0x35 ~ "YXCVBNM;:_" +map -altgr +shift 0x29 0x02..0x0C ~ "°+"*ç%&/()=?" +map -altgr +shift 0x10..0x1B ~ "QWERTZUIOPü!" +map -altgr +shift 0x1E..0x28 0x2B ~ "ASDFGHJKLöä£" +map -altgr +shift 0x56 0x2C..0x35 ~ ">YXCVBNM;:_" # # Keys requiring AltGr # -map +altgr -shift 0x02..0x04 ~ "¦@#" -map +altgr -shift 0x06..0x08 ~ "¬|¢" -map +altgr -shift 0x1A 0x1B ~ "[]" -map +altgr -shift 0x28 0x2B ~ "{}" -map +altgr -shift 0x56 ~ "\" +map +altgr -shift 0x02..0x04 ~ "¦@#" +map +altgr -shift 0x06..0x08 ~ "¬|¢" +map +altgr -shift 0x1A 0x1B ~ "[]" +map +altgr -shift 0x28 0x2B ~ "{}" +map +altgr -shift 0x56 ~ "\" map +altgr -shift 0x12 ~ "€" # # Dead keys # + map -altgr -shift 0x1B ~ 0xFE57 # Dead umlaut map +altgr -shift 0x0C ~ 0xFE51 # Dead acute map -altgr -shift 0x0D ~ 0xFE52 # Dead circumflex map -altgr +shift 0x0D ~ 0xFE50 # Dead grave map +altgr -shift 0x0D ~ 0xFE53 # Dead tilde + From b9faca923bc1ad7b19246f21bf5642a85b95f347 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 28 Jan 2017 14:55:38 -0800 Subject: [PATCH 6/6] =?UTF-8?q?GUACAMOLE-135:=20Correct=20Swiss=20French?= =?UTF-8?q?=20mapping=20of=20"=C2=AC",=20"|",=20and=20"=C2=A2"=20(off=20by?= =?UTF-8?q?=20one=20key).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/protocols/rdp/keymaps/fr_ch_qwertz.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap index a4605048..73276614 100644 --- a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap +++ b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap @@ -40,7 +40,7 @@ map -altgr +shift 0x56 0x2C..0x35 ~ ">YXCVBNM;:_" # map +altgr -shift 0x02..0x04 ~ "¦@#" -map +altgr -shift 0x06..0x08 ~ "¬|¢" +map +altgr -shift 0x07..0x09 ~ "¬|¢" map +altgr -shift 0x1A 0x1B ~ "[]" map +altgr -shift 0x28 0x2B ~ "{}" map +altgr -shift 0x56 ~ "\"