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/15 01:19:35 UTC

[1/4] incubator-guacamole-server git commit: GUACAMOLE-273: Add Brazillian ABNT2 keymap for RDP.

Repository: incubator-guacamole-server
Updated Branches:
  refs/heads/master 493fa4df1 -> a75bca1e9


GUACAMOLE-273: Add Brazillian ABNT2 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/ed8a32f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/ed8a32f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/ed8a32f9

Branch: refs/heads/master
Commit: ed8a32f98b42fc3260eb229e18ec388f4f0500e6
Parents: 025fc05
Author: Frode Langelo <fr...@apache.org>
Authored: Mon Nov 13 22:43:42 2017 +0000
Committer: Frode Langelo <fr...@apache.org>
Committed: Mon Nov 13 22:43:42 2017 +0000

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


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/ed8a32f9/src/protocols/rdp/Makefile.am
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index 10efb17..0785448 100644
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@ -255,6 +255,7 @@ rdp_keymaps =                   \
     $(srcdir)/keymaps/fr_ch_qwertz.keymap \
     $(srcdir)/keymaps/it_it_qwerty.keymap \
     $(srcdir)/keymaps/ja_jp_qwerty.keymap \
+    $(srcdir)/keymaps/pt_br_qwerty.keymap \
     $(srcdir)/keymaps/sv_se_qwerty.keymap
 
 _generated_keymaps.c: $(rdp_keymaps)

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/ed8a32f9/src/protocols/rdp/keymaps/pt_br_qwerty.keymap
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/keymaps/pt_br_qwerty.keymap b/src/protocols/rdp/keymaps/pt_br_qwerty.keymap
new file mode 100644
index 0000000..c27bc2b
--- /dev/null
+++ b/src/protocols/rdp/keymaps/pt_br_qwerty.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    "pt-br-qwerty"
+freerdp "KBD_PORTUGUESE_BRAZILIAN_ABNT2"
+
+#
+# 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..0x36      ~ "\zxcvbnm,.;/"
+
+map -altgr +shift 0x29 0x02..0x06 0x08..0x0D ~ ""!@#$%&*()_+"
+map -altgr +shift      0x10..0x19 0x1B       ~ "QWERTYUIOP{"
+map -altgr +shift      0x1E..0x27 0x2B       ~ "ASDFGHJKLÇ}"
+map -altgr +shift 0x56 0x2C..0x36            ~ "|ZXCVBNM<>:?"
+
+#
+# Keys requiring AltGr
+#
+
+map +altgr -shift 0x02..0x07 0x0D ~ "¹²³£¢¬§"
+map +altgr -shift 0x10..0x11 ~ "/?"
+map +altgr -shift 0x12 ~ "°"
+map +altgr -shift 0x12 ~ "€" # catch € because Mac produces
+map +altgr -shift 0x1B ~ "ª"
+map +altgr -shift 0x2B ~ "º"
+map +altgr -shift 0x2E ~ "₢"
+
+#
+# Dead keys
+#
+
+map -altgr +shift 0x07 ~ 0xFE57 # Dead diaeresis (umlaut)
+map -altgr +shift 0x1A ~ 0xFE50 # Dead grave
+map -altgr -shift 0x1A ~ 0xFE51 # Dead acute
+map -altgr +shift 0x28 ~ 0xFE52 # Dead circumflex
+map -altgr -shift 0x28 ~ 0xFE53 # Dead tilde


[4/4] incubator-guacamole-server git commit: GUACAMOLE-273: Merge RDP support for Portuguese Brazilian keyboard.

Posted by mj...@apache.org.
GUACAMOLE-273: Merge RDP support for Portuguese Brazilian keyboard.


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/a75bca1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/a75bca1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/a75bca1e

Branch: refs/heads/master
Commit: a75bca1e959c6bf244198119e4841a8a1d9c87c9
Parents: 493fa4d fc599d2
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Nov 14 17:17:34 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Nov 14 17:17:34 2017 -0800

----------------------------------------------------------------------
 src/protocols/rdp/Makefile.am                 |  1 +
 src/protocols/rdp/keymaps/pt_br_qwerty.keymap | 57 ++++++++++++++++++++++
 2 files changed, 58 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/a75bca1e/src/protocols/rdp/Makefile.am
----------------------------------------------------------------------


[3/4] incubator-guacamole-server git commit: GUACAMOLE-273: Remove Mac remapping of €.

Posted by mj...@apache.org.
GUACAMOLE-273: Remove Mac remapping of  €.


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/fc599d2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/fc599d2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/fc599d2a

Branch: refs/heads/master
Commit: fc599d2aec5c1507c7de1a6e417d9351ceb82210
Parents: a8174ee
Author: Frode Langelo <fr...@apache.org>
Authored: Tue Nov 14 20:04:49 2017 +0000
Committer: Frode Langelo <fr...@apache.org>
Committed: Tue Nov 14 20:04:49 2017 +0000

----------------------------------------------------------------------
 src/protocols/rdp/keymaps/pt_br_qwerty.keymap | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/fc599d2a/src/protocols/rdp/keymaps/pt_br_qwerty.keymap
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/keymaps/pt_br_qwerty.keymap b/src/protocols/rdp/keymaps/pt_br_qwerty.keymap
index 8a6483f..54df313 100644
--- a/src/protocols/rdp/keymaps/pt_br_qwerty.keymap
+++ b/src/protocols/rdp/keymaps/pt_br_qwerty.keymap
@@ -42,7 +42,6 @@ map -altgr +shift 0x56 0x2C..0x36            ~ "|ZXCVBNM<>:?"
 map +altgr -shift 0x02..0x07 0x0D ~ "¹²³£¢¬§"
 map +altgr -shift 0x10..0x11 ~ "/?"
 map +altgr -shift 0x12 ~ "°"
-map +altgr -shift 0x12 ~ "€" # map € to ° so Mac behaves the same as PC
 map +altgr -shift 0x1B ~ "ª"
 map +altgr -shift 0x2B ~ "º"
 map +altgr -shift 0x2E ~ "₢"


[2/4] incubator-guacamole-server git commit: GUACAMOLE-273: Fix comment for remapping of €.

Posted by mj...@apache.org.
GUACAMOLE-273: Fix comment for remapping of €.


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/a8174eea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/a8174eea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/a8174eea

Branch: refs/heads/master
Commit: a8174eeac9d788ba8ad19b5ea64b82ebebaa3e17
Parents: ed8a32f
Author: Frode Langelo <fr...@apache.org>
Authored: Mon Nov 13 22:52:39 2017 +0000
Committer: Frode Langelo <fr...@apache.org>
Committed: Mon Nov 13 22:52:39 2017 +0000

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


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/a8174eea/src/protocols/rdp/keymaps/pt_br_qwerty.keymap
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/keymaps/pt_br_qwerty.keymap b/src/protocols/rdp/keymaps/pt_br_qwerty.keymap
index c27bc2b..8a6483f 100644
--- a/src/protocols/rdp/keymaps/pt_br_qwerty.keymap
+++ b/src/protocols/rdp/keymaps/pt_br_qwerty.keymap
@@ -42,7 +42,7 @@ map -altgr +shift 0x56 0x2C..0x36            ~ "|ZXCVBNM<>:?"
 map +altgr -shift 0x02..0x07 0x0D ~ "¹²³£¢¬§"
 map +altgr -shift 0x10..0x11 ~ "/?"
 map +altgr -shift 0x12 ~ "°"
-map +altgr -shift 0x12 ~ "€" # catch € because Mac produces
+map +altgr -shift 0x12 ~ "€" # map € to ° so Mac behaves the same as PC
 map +altgr -shift 0x1B ~ "ª"
 map +altgr -shift 0x2B ~ "º"
 map +altgr -shift 0x2E ~ "₢"