From 6fc1699d861aa076dc3886c6d0932c9afaf44c01 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 28 Nov 2014 18:46:33 -0800 Subject: [PATCH 1/2] GUAC-930: Log keysyms which are sent via Unicode. --- src/protocols/rdp/guac_handlers.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/protocols/rdp/guac_handlers.c b/src/protocols/rdp/guac_handlers.c index 621b0a00..216aa0f8 100644 --- a/src/protocols/rdp/guac_handlers.c +++ b/src/protocols/rdp/guac_handlers.c @@ -411,6 +411,9 @@ int __guac_rdp_send_keysym(guac_client* client, int keysym, int pressed) { * DOWN/RELEASE flags */ if (pressed) { + guac_client_log(client, GUAC_LOG_DEBUG, + "Sending keysym 0x%x as Unicode", keysym); + /* Translate keysym into codepoint */ int codepoint; if (keysym <= 0xFF) @@ -418,7 +421,7 @@ int __guac_rdp_send_keysym(guac_client* client, int keysym, int pressed) { else if (keysym >= 0x1000000) codepoint = keysym & 0xFFFFFF; else { - guac_client_log(client, GUAC_LOG_INFO, + guac_client_log(client, GUAC_LOG_DEBUG, "Unmapped keysym has no equivalent unicode " "value: 0x%x", keysym); return 0; From 05d1b8864ce41861b80ad341216a6ba0dcc36090 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 28 Nov 2014 19:35:30 -0800 Subject: [PATCH 2/2] GUAC-930: Add Swedish keymap. --- src/protocols/rdp/Makefile.am | 3 +- src/protocols/rdp/keymaps/sv_se_qwerty.keymap | 68 +++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 src/protocols/rdp/keymaps/sv_se_qwerty.keymap diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am index 88bda718..2a20ade8 100644 --- a/src/protocols/rdp/Makefile.am +++ b/src/protocols/rdp/Makefile.am @@ -131,7 +131,8 @@ rdp_keymaps = \ keymaps/failsafe.keymap \ keymaps/de_de_qwertz.keymap \ keymaps/en_us_qwerty.keymap \ - keymaps/fr_fr_azerty.keymap + keymaps/fr_fr_azerty.keymap \ + keymaps/sv_se_qwerty.keymap _generated_keymaps.c: $(rdp_keymaps) keymaps/generate.pl $(rdp_keymaps) diff --git a/src/protocols/rdp/keymaps/sv_se_qwerty.keymap b/src/protocols/rdp/keymaps/sv_se_qwerty.keymap new file mode 100644 index 00000000..a4ac8750 --- /dev/null +++ b/src/protocols/rdp/keymaps/sv_se_qwerty.keymap @@ -0,0 +1,68 @@ +# +# Copyright (C) 2014 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 "sv-se-qwerty" +freerdp "KBD_SWEDISH" + +# +# Basic keys +# + +map -altgr -shift 0x29 0x02..0x0C ~ "§1234567890+" +map -altgr -shift 0x10..0x1A ~ "qwertyuiopå" +map -altgr -shift 0x1E..0x28 0x2B ~ "asdfghjklöä'" +map -altgr -shift 0x56 0x2C..0x35 ~ "ZXCVBNM;:_" + +# +# Keys requiring AltGr +# + +map +altgr -shift 0x03 ~ "@" +map +altgr -shift 0x04 ~ "£" +map +altgr -shift 0x05 ~ "$" +map +altgr -shift 0x08 ~ "{" +map +altgr -shift 0x09 ~ "[" +map +altgr -shift 0x0A ~ "]" +map +altgr -shift 0x0B ~ "}" +map +altgr -shift 0x0C ~ "\" + +map +altgr -shift 0x12 ~ "€" + +map +altgr -shift 0x56 ~ "|" +map +altgr -shift 0x32 ~ "µ" + +# +# Dead keys +# + +map -altgr -shift 0x0D ~ 0xFE51 # Dead acute +map -altgr +shift 0x0D ~ 0xFE50 # Dead grave +map -altgr -shift 0x1B ~ 0xFE57 # Dead umlaut +map -altgr +shift 0x1B ~ 0xFE52 # Dead circumflex +map +altgr -shift 0x1B ~ 0xFE53 # Dead tilde +