You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2017/01/29 20:28:38 UTC
[1/7] incubator-guacamole-server git commit: GUACAMOLE-135: Add
Swiss-French keymap for RDP.
Repository: incubator-guacamole-server
Updated Branches:
refs/heads/master 6695da4b1 -> 0d0f6b9c6
GUACAMOLE-135: Add Swiss-French keymap for RDP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/941fd965
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/941fd965
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/941fd965
Branch: refs/heads/master
Commit: 941fd9659a27d801f330c2f1f9dd172b794bea73
Parents: ea6b094
Author: C�dric Marie-Marthe <ce...@mariemarthe.com>
Authored: Mon Jan 9 16:41:05 2017 +0100
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Jan 28 13:35:21 2017 -0800
----------------------------------------------------------------------
src/protocols/rdp/Makefile.am | 1 +
src/protocols/rdp/keymaps/fr_ch_qwertz.keymap | 57 ++++++++++++++++++++++
2 files changed, 58 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/941fd965/src/protocols/rdp/Makefile.am
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index 0864fae..a190003 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
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/941fd965/src/protocols/rdp/keymaps/fr_ch_qwertz.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 0000000..52cc18a
--- /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,.-"
+
+map -altgr +shift 0x29 0x02..0x0C ~ "�+"*�%&/()=?"
+map -altgr +shift 0x10..0x19 0x1A 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 0x0C 0x0D ~ "�|��~"
+map +altgr -shift 0x1A 0x1B ~ "[]"
+map +altgr -shift 0x28 0x2B ~ "{}"
+map +altgr -shift 0x56 ~ "\"
+
+map +altgr -shift 0x12 ~ "\u20ac"
+
+#
+# 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
[3/7] incubator-guacamole-server git commit: GUACAMOLE-135:
Abbreviate Swiss French mapping range where possible.
Posted by jm...@apache.org.
GUACAMOLE-135: Abbreviate Swiss French mapping range where possible.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/fb298acd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/fb298acd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/fb298acd
Branch: refs/heads/master
Commit: fb298acdcd8bf9bade4e254f243bbafe58dbf1af
Parents: 86493dd
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Jan 28 14:21:17 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Jan 28 14:21:17 2017 -0800
----------------------------------------------------------------------
src/protocols/rdp/keymaps/fr_ch_qwertz.keymap | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/fb298acd/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap
index c0281a5..459a4fa 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,.-"
map -altgr +shift 0x29 0x02..0x0C ~ "�+"*�%&/()=?"
-map -altgr +shift 0x10..0x19 0x1A 0x1B ~ "QWERTZUIOP�!"
+map -altgr +shift 0x10..0x1B ~ "QWERTZUIOP�!"
map -altgr +shift 0x1E..0x28 0x2B ~ "ASDFGHJKL��"
map -altgr +shift 0x56 0x2C..0x35 ~ ">YXCVBNM;:_"
[4/7] incubator-guacamole-server git commit: GUACAMOLE-135: Swiss
Franch dead umlaut should map from keysym 0xFE57.
Posted by jm...@apache.org.
GUACAMOLE-135: Swiss Franch dead umlaut should map from keysym 0xFE57.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/c6f6bb67
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/c6f6bb67
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/c6f6bb67
Branch: refs/heads/master
Commit: c6f6bb67f0d1ceca54496d52da3df560ceb4a213
Parents: fb298ac
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Jan 28 14:22:22 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Jan 28 14:22:22 2017 -0800
----------------------------------------------------------------------
src/protocols/rdp/keymaps/fr_ch_qwertz.keymap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/c6f6bb67/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap
index 459a4fa..8ada951 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 ~ "\u20ac"
#
# 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
[7/7] incubator-guacamole-server git commit: GUACAMOLE-135: Merge new
Swiss-French RDP keymap.
Posted by jm...@apache.org.
GUACAMOLE-135: Merge new Swiss-French RDP keymap.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/0d0f6b9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/0d0f6b9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/0d0f6b9c
Branch: refs/heads/master
Commit: 0d0f6b9c694e11a0c9575510be6879783c9ab031
Parents: 6695da4 b9faca9
Author: James Muehlner <ja...@guac-dev.org>
Authored: Sun Jan 29 12:27:49 2017 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Sun Jan 29 12:27:49 2017 -0800
----------------------------------------------------------------------
src/protocols/rdp/Makefile.am | 1 +
src/protocols/rdp/keymaps/fr_ch_qwertz.keymap | 59 ++++++++++++++++++++++
2 files changed, 60 insertions(+)
----------------------------------------------------------------------
[2/7] incubator-guacamole-server git commit: GUACAMOLE-135: Remove
duplicate scancode mappings from Swiss French keymap.
Posted by jm...@apache.org.
GUACAMOLE-135: Remove duplicate scancode mappings from Swiss French keymap.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/86493dda
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/86493dda
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/86493dda
Branch: refs/heads/master
Commit: 86493dda939aacbc2d0d876447c3ea204afaa4a6
Parents: 941fd96
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Jan 28 14:19:52 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Jan 28 14:19:52 2017 -0800
----------------------------------------------------------------------
src/protocols/rdp/keymaps/fr_ch_qwertz.keymap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/86493dda/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap
index 52cc18a..c0281a5 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 ~ "\"
[6/7] incubator-guacamole-server git commit: GUACAMOLE-135: Correct Swiss French mapping of "¬", "|", and "¢" (off by one key).
Posted by jm...@apache.org.
GUACAMOLE-135: Correct Swiss French mapping of "�", "|", and "�" (off by one key).
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/b9faca92
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/b9faca92
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/b9faca92
Branch: refs/heads/master
Commit: b9faca923bc1ad7b19246f21bf5642a85b95f347
Parents: c79b303
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Jan 28 14:55:38 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Jan 28 14:55:38 2017 -0800
----------------------------------------------------------------------
src/protocols/rdp/keymaps/fr_ch_qwertz.keymap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/b9faca92/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap
index a460504..7327661 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 ~ "\"
[5/7] incubator-guacamole-server git commit: GUACAMOLE-135: Clean up
spacing and alignment of Swiss French keymap.
Posted by jm...@apache.org.
GUACAMOLE-135: Clean up spacing and alignment of Swiss French keymap.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/c79b3032
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/c79b3032
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/c79b3032
Branch: refs/heads/master
Commit: c79b303237390981a85b9a177ca81abb2548f379
Parents: c6f6bb6
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Jan 28 14:23:33 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Jan 28 14:23:33 2017 -0800
----------------------------------------------------------------------
src/protocols/rdp/keymaps/fr_ch_qwertz.keymap | 28 ++++++++++++----------
1 file changed, 15 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/c79b3032/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap
index 8ada951..a460504 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 ~ "�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;:_"
+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 ~ "\u20ac"
#
# 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
+