From 9486ec7cc491514ba2acd59ccf286edd32d32ec2 Mon Sep 17 00:00:00 2001
From: Andrin <andrin.jost@infoguard.ch>
Date: Tue, 20 Nov 2018 14:10:36 +0100
Subject: [PATCH 1/2] GUACAMOLE-354: Add Swiss-German keymap for RDP

---
 src/protocols/rdp/Makefile.am                 |  1 +
 src/protocols/rdp/keymaps/de_ch_qwertz.keymap | 58 +++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 src/protocols/rdp/keymaps/de_ch_qwertz.keymap

diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index 670359fc..05a7a3ab 100644
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@ -258,6 +258,7 @@ rdp_keymaps =                   \
     $(srcdir)/keymaps/base.keymap         \
     $(srcdir)/keymaps/failsafe.keymap     \
     $(srcdir)/keymaps/de_de_qwertz.keymap \
+    $(srcdir)/keymaps/de_ch_qwertz.keymap \
     $(srcdir)/keymaps/en_gb_qwerty.keymap \
     $(srcdir)/keymaps/en_us_qwerty.keymap \
     $(srcdir)/keymaps/es_es_qwerty.keymap \
diff --git a/src/protocols/rdp/keymaps/de_ch_qwertz.keymap b/src/protocols/rdp/keymaps/de_ch_qwertz.keymap
new file mode 100644
index 00000000..e8ae0d15
--- /dev/null
+++ b/src/protocols/rdp/keymaps/de_ch_qwertz.keymap
@@ -0,0 +1,58 @@
+#
+# 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    "ch-de-qwertz"
+freerdp "KBD_SWISS_GERMAN"
+
+#
+# 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 0x07..0x09 ~ "¬|¢"
+map +altgr -shift 0x1A..0x1B ~ "[]"
+map +altgr -shift 0x28 ~ "{"
+map +altgr -shift 0x2B ~ "}"
+map +altgr -shift 0x56 ~ "\"
+map +altgr -shift 0x12 ~ "€"
+
+#
+# Dead keys
+#
+
+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
+map -altgr -shift 0x1B ~ 0xFE57 # Dead umlaut
\ No newline at end of file

From 01142e6dd8fcb266a584f7ecd2d5a7d0f00de328 Mon Sep 17 00:00:00 2001
From: Andrin <andrin.jost@infoguard.ch>
Date: Tue, 4 Dec 2018 08:30:36 +0100
Subject: [PATCH 2/2] GUACAMOLE-354: Fixed keyboard name.

---
 src/protocols/rdp/keymaps/de_ch_qwertz.keymap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/protocols/rdp/keymaps/de_ch_qwertz.keymap b/src/protocols/rdp/keymaps/de_ch_qwertz.keymap
index e8ae0d15..59b9eba2 100644
--- a/src/protocols/rdp/keymaps/de_ch_qwertz.keymap
+++ b/src/protocols/rdp/keymaps/de_ch_qwertz.keymap
@@ -18,7 +18,7 @@
 #
 
 parent  "base"
-name    "ch-de-qwertz"
+name    "de-ch-qwertz"
 freerdp "KBD_SWISS_GERMAN"
 
 #