You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2017/11/14 18:58:20 UTC
[1/4] incubator-guacamole-server git commit: GUACAMOLE-434: Add UK
English keymap for RDP.
Repository: incubator-guacamole-server
Updated Branches:
refs/heads/master 025fc0525 -> 493fa4df1
GUACAMOLE-434: Add UK English 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/625eee0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/625eee0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/625eee0c
Branch: refs/heads/master
Commit: 625eee0caa99120676cdb329c17c99f4461bacfe
Parents: 025fc05
Author: Frode Langelo <fr...@apache.org>
Authored: Mon Nov 13 22:26:29 2017 +0000
Committer: Frode Langelo <fr...@apache.org>
Committed: Mon Nov 13 22:26:29 2017 +0000
----------------------------------------------------------------------
src/protocols/rdp/Makefile.am | 1 +
src/protocols/rdp/keymaps/en_gb_qwerty.keymap | 56 ++++++++++++++++++++++
2 files changed, 57 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/625eee0c/src/protocols/rdp/Makefile.am
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index 10efb17..a1d9e13 100644
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@ -250,6 +250,7 @@ rdp_keymaps = \
$(srcdir)/keymaps/base.keymap \
$(srcdir)/keymaps/failsafe.keymap \
$(srcdir)/keymaps/de_de_qwertz.keymap \
+ $(srcdir)/keymaps/en_gb_qwerty.keymap \
$(srcdir)/keymaps/en_us_qwerty.keymap \
$(srcdir)/keymaps/fr_fr_azerty.keymap \
$(srcdir)/keymaps/fr_ch_qwertz.keymap \
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/625eee0c/src/protocols/rdp/keymaps/en_gb_qwerty.keymap
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/keymaps/en_gb_qwerty.keymap b/src/protocols/rdp/keymaps/en_gb_qwerty.keymap
new file mode 100644
index 0000000..92fe9de
--- /dev/null
+++ b/src/protocols/rdp/keymaps/en_gb_qwerty.keymap
@@ -0,0 +1,56 @@
+#
+# 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 "en-gb-qwerty"
+freerdp "KBD_UNITED_KINGDOM"
+
+#
+# Basic keys
+#
+
+map -altgr -shift 0x29 0x02..0x0D ~ "`1234567890-="
+map -altgr -shift 0x10..0x1B ~ "qwertyuiop[]"
+map -altgr -shift 0x1E..0x28 0x2B ~ "asdfghjkl;'#"
+map -altgr -shift 0x56 0x2C..0x35 ~ "\zxcvbnm,./"
+
+map -altgr +shift 0x29 0x02..0x0D ~ "¬!"£$%^&*()_+"
+map -altgr +shift 0x10..0x1B ~ "QWERTYUIOP{}"
+map -altgr +shift 0x1E..0x28 0x2B ~ "ASDFGHJKL:@~"
+map -altgr +shift 0x56 0x2C..0x35 ~ "|ZXCVBNM<>?"
+
+#
+# Keys requiring AltGr
+#
+
+map +altgr -shift 0x29 ~ "¦"
+map +altgr -shift 0x05 ~ "€"
+map +altgr -shift 0x12 ~ "é"
+map +altgr +shift 0x12 ~ "É"
+map +altgr -shift 0x16 ~ "ú"
+map +altgr +shift 0x16 ~ "Ú"
+map +altgr -shift 0x17 ~ "í"
+map +altgr +shift 0x17 ~ "Í"
+map +altgr -shift 0x18 ~ "ó"
+map +altgr +shift 0x18 ~ "Ó"
+map +altgr -shift 0x1E ~ "á"
+map +altgr +shift 0x1E ~ "Á"
+map +altgr -shift 0x2E ~ "ç"
+map +altgr +shift 0x2E ~ "Ç"
+
[3/4] incubator-guacamole-server git commit: GUACAMOLE-434: Merge RDP
support for UK English keyboards.
Posted by mj...@apache.org.
GUACAMOLE-434: Merge RDP support for UK English keyboards.
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/c4c32264
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/c4c32264
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/c4c32264
Branch: refs/heads/master
Commit: c4c32264bf8970be24e322edcf3635365c9ef3f7
Parents: 025fc05 625eee0
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Nov 14 10:55:53 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Nov 14 10:55:53 2017 -0800
----------------------------------------------------------------------
src/protocols/rdp/Makefile.am | 1 +
src/protocols/rdp/keymaps/en_gb_qwerty.keymap | 56 ++++++++++++++++++++++
2 files changed, 57 insertions(+)
----------------------------------------------------------------------
[2/4] incubator-guacamole-server git commit: GUACAMOLE-233: Add
Spanish keymap for RDP.
Posted by mj...@apache.org.
GUACAMOLE-233: Add Spanish 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/fc158502
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/fc158502
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/fc158502
Branch: refs/heads/master
Commit: fc1585028810251044f8779546442b93307fbd79
Parents: 025fc05
Author: Frode Langelo <fr...@apache.org>
Authored: Mon Nov 13 22:57:21 2017 +0000
Committer: Frode Langelo <fr...@apache.org>
Committed: Mon Nov 13 22:57:21 2017 +0000
----------------------------------------------------------------------
src/protocols/rdp/Makefile.am | 1 +
src/protocols/rdp/keymaps/es_es_qwerty.keymap | 54 ++++++++++++++++++++++
2 files changed, 55 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/fc158502/src/protocols/rdp/Makefile.am
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index 10efb17..3a9b2eb 100644
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@ -251,6 +251,7 @@ rdp_keymaps = \
$(srcdir)/keymaps/failsafe.keymap \
$(srcdir)/keymaps/de_de_qwertz.keymap \
$(srcdir)/keymaps/en_us_qwerty.keymap \
+ $(srcdir)/keymaps/es_es_qwerty.keymap \
$(srcdir)/keymaps/fr_fr_azerty.keymap \
$(srcdir)/keymaps/fr_ch_qwertz.keymap \
$(srcdir)/keymaps/it_it_qwerty.keymap \
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/fc158502/src/protocols/rdp/keymaps/es_es_qwerty.keymap
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/keymaps/es_es_qwerty.keymap b/src/protocols/rdp/keymaps/es_es_qwerty.keymap
new file mode 100644
index 0000000..bd0f281
--- /dev/null
+++ b/src/protocols/rdp/keymaps/es_es_qwerty.keymap
@@ -0,0 +1,54 @@
+#
+# 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 "es-es-qwerty"
+freerdp "KBD_SPANISH"
+
+#
+# Basic keys
+#
+
+map -altgr -shift 0x29 0x02..0x0D ~ "º1234567890'¡"
+map -altgr -shift 0x10..0x19 0x1B ~ "qwertyuiop+"
+map -altgr -shift 0x1E..0x27 0x2B ~ "asdfghjklñç"
+map -altgr -shift 0x56 0x2C..0x35 ~ "<zxcvbnm,.-"
+
+map -altgr +shift 0x29 0x02..0x0D ~ "ª!"·$%&/()=?¿"
+map -altgr +shift 0x10..0x19 0x1B ~ "QWERTYUIOP*"
+map -altgr +shift 0x1E..0x27 0x2B ~ "ASDFGHJKLÑÇ"
+map -altgr +shift 0x56 0x2C..0x35 ~ ">ZXCVBNM;:_"
+
+#
+# Keys requiring AltGr
+#
+
+map +altgr -shift 0x29 0x02..0x04 0x07 ~ "\|@#¬"
+map +altgr -shift 0x12 0x1A 0x1B ~ "€[]"
+map +altgr -shift 0x28 0x2B ~ "{}"
+
+#
+# Dead keys
+#
+
+map -altgr -shift 0x1A ~ 0xFE50 # Dead grave
+map -altgr -shift 0x28 ~ 0xFE51 # Dead acute
+map -altgr +shift 0x1A ~ 0xFE52 # Dead circumflex
+map +altgr -shift 0x05 ~ 0xFE53 # Dead tilde
+map -altgr +shift 0x28 ~ 0xFE57 # Dead diaeresis (umlaut)
[4/4] incubator-guacamole-server git commit: GUACAMOLE-233: Merge RDP
support for Spanish keyboards.
Posted by mj...@apache.org.
GUACAMOLE-233: Merge RDP support for Spanish keyboards.
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/493fa4df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/493fa4df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/493fa4df
Branch: refs/heads/master
Commit: 493fa4df165b99357184f31db735aa701b50f7e4
Parents: c4c3226 fc15850
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Nov 14 10:56:28 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Nov 14 10:56:28 2017 -0800
----------------------------------------------------------------------
src/protocols/rdp/Makefile.am | 1 +
src/protocols/rdp/keymaps/es_es_qwerty.keymap | 54 ++++++++++++++++++++++
2 files changed, 55 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/493fa4df/src/protocols/rdp/Makefile.am
----------------------------------------------------------------------
diff --cc src/protocols/rdp/Makefile.am
index a1d9e13,3a9b2eb..8e622aa
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@@ -250,8 -250,8 +250,9 @@@ rdp_keymaps =
$(srcdir)/keymaps/base.keymap \
$(srcdir)/keymaps/failsafe.keymap \
$(srcdir)/keymaps/de_de_qwertz.keymap \
+ $(srcdir)/keymaps/en_gb_qwerty.keymap \
$(srcdir)/keymaps/en_us_qwerty.keymap \
+ $(srcdir)/keymaps/es_es_qwerty.keymap \
$(srcdir)/keymaps/fr_fr_azerty.keymap \
$(srcdir)/keymaps/fr_ch_qwertz.keymap \
$(srcdir)/keymaps/it_it_qwerty.keymap \