You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/01/31 00:06:33 UTC
[1/3] guacamole-server git commit: GUACAMOLE-313: Clarify logic
testing for Unicode keysyms.
Repository: guacamole-server
Updated Branches:
refs/heads/master b1d050285 -> 3f6acb637
GUACAMOLE-313: Clarify logic testing for Unicode keysyms.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/cfd69cd1
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/cfd69cd1
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/cfd69cd1
Branch: refs/heads/master
Commit: cfd69cd12288d9f41ecb29b20f746fa31a6b74c4
Parents: 5f5b4ea
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Jan 30 15:26:05 2018 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Jan 30 15:26:05 2018 -0800
----------------------------------------------------------------------
src/guaclog/keydef.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/cfd69cd1/src/guaclog/keydef.c
----------------------------------------------------------------------
diff --git a/src/guaclog/keydef.c b/src/guaclog/keydef.c
index 6b979fa..802bdd8 100644
--- a/src/guaclog/keydef.c
+++ b/src/guaclog/keydef.c
@@ -222,7 +222,7 @@ static guaclog_keydef* guaclog_get_unicode_key(int keysym) {
int mask, bytes;
/* Translate only if keysym maps to Unicode */
- if (keysym < 0x00 || (keysym > 0xFF && (keysym & 0xFFFF0000) != 0x01000000))
+ if (keysym < 0x00 || (keysym > 0xFF && (keysym | 0xFFFF) != 0x0100FFFF))
return NULL;
int codepoint = keysym & 0xFFFF;
[3/3] guacamole-server git commit: GUACAMOLE-313: Merge remove
handling of Unicode codepoints which cannot actually be represented by an X11
keysym.
Posted by vn...@apache.org.
GUACAMOLE-313: Merge remove handling of Unicode codepoints which cannot actually be represented by an X11 keysym.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/3f6acb63
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/3f6acb63
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/3f6acb63
Branch: refs/heads/master
Commit: 3f6acb6378d15321deb4a9cf0b09d1cc736a6c0b
Parents: b1d0502 5551264
Author: Nick Couchman <vn...@apache.org>
Authored: Tue Jan 30 19:06:01 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Tue Jan 30 19:06:01 2018 -0500
----------------------------------------------------------------------
src/guaclog/keydef.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/3f6acb63/src/guaclog/keydef.c
----------------------------------------------------------------------
[2/3] guacamole-server git commit: GUACAMOLE-313: Remove code
handling Unicode codepoints which cannot be represented by X11 keysyms.
Posted by vn...@apache.org.
GUACAMOLE-313: Remove code handling Unicode codepoints which cannot be represented by X11 keysyms.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/55512644
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/55512644
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/55512644
Branch: refs/heads/master
Commit: 555126441e3e3aec225227517d03fa4981900ece
Parents: cfd69cd
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Jan 30 15:24:42 2018 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Jan 30 15:26:25 2018 -0800
----------------------------------------------------------------------
src/guaclog/keydef.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/55512644/src/guaclog/keydef.c
----------------------------------------------------------------------
diff --git a/src/guaclog/keydef.c b/src/guaclog/keydef.c
index 802bdd8..ee9275e 100644
--- a/src/guaclog/keydef.c
+++ b/src/guaclog/keydef.c
@@ -236,18 +236,11 @@ static guaclog_keydef* guaclog_get_unicode_key(int keysym) {
mask = 0xC0;
bytes = 2;
}
- else if (codepoint <= 0xFFFF) {
+ else {
+ assert(codepoint <= 0xFFFF);
mask = 0xE0;
bytes = 3;
}
- else if (codepoint <= 0x1FFFFF) {
- mask = 0xF0;
- bytes = 4;
- }
-
- /* Otherwise, invalid codepoint */
- else
- return NULL;
/* Offset buffer by size */
char* key_name = unicode_keydef_name + bytes;