Add German keymap.

src/protocols/rdp/Makefile.am

@@ -107,6 +107,7 @@ BUILT_SOURCES = _generated_keymaps.c
 rdp_keymaps =                   \
     keymaps/base.keymap         \
     keymaps/failsafe.keymap     \
+    keymaps/de_de_qwertz.keymap \
     keymaps/en_us_qwerty.keymap
 
 _generated_keymaps.c: $(rdp_keymaps)

src/protocols/rdp/client.c

@@ -575,7 +575,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
             guac_rdp_keymap_find(argv[IDX_SERVER_LAYOUT]);
 
     /* If no keymap requested, use default */
-    if (settings->server_layout == NULL);
+    if (settings->server_layout == NULL)
         settings->server_layout = guac_rdp_keymap_find(GUAC_DEFAULT_KEYMAP);
 
     /* Load keymap into client */

src/protocols/rdp/keymaps/de_de_qwertz.keymap

@@ -0,0 +1,67 @@
+#
+# Copyright (C) 2013 Glyptodon LLC
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+parent  "base"
+name    "de-de-qwertz"
+freerdp "KBD_GERMAN"
+
+#
+# Basic keys
+#
+
+map -altgr -shift      0x02..0x0C      ~ "1234567890ß"
+map -altgr -shift      0x10..0x1B      ~ "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 0x03 ~ "²"
+map +altgr -shift 0x04 ~ "³"
+map +altgr -shift 0x08 ~ "{"
+map +altgr -shift 0x09 ~ "["
+map +altgr -shift 0x0A ~ "]"
+map +altgr -shift 0x0B ~ "}"
+map +altgr -shift 0x0C ~ "\"
+
+map +altgr -shift 0x10 ~ "@"
+map +altgr -shift 0x12 ~ "€"
+
+map +altgr -shift 0x56 ~ "|"
+map +altgr -shift 0x32 ~ "µ"
+
+#
+# Dead keys
+#
+
+map -altgr +shift 0x0D ~ 0xFE50 # Dead grave
+map -altgr -shift 0x0D ~ 0xFE51 # Dead acute
+map -altgr -shift 0x29 ~ 0xFE52 # Dead circumflex
+map +altgr -shift 0x0C ~ 0xFE53 # Dead tilde
+