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/08/24 16:17:42 UTC
[1/3] guacamole-server git commit: GUACAMOLE-470: Support named
colors in color-scheme configuration.
Repository: guacamole-server
Updated Branches:
refs/heads/master 911e60cf5 -> 332e18781
GUACAMOLE-470: Support named colors in color-scheme configuration.
When parsing named colors, treat semi-colons as string terminators, so
we can properly parse named colors within the color-scheme
configuration.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/eb5aa14a
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/eb5aa14a
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/eb5aa14a
Branch: refs/heads/master
Commit: eb5aa14a6fac9b10201a48960bacdac274c251be
Parents: 427c4c8
Author: Jim Chen <nc...@mozilla.com>
Authored: Thu Aug 23 23:36:26 2018 -0400
Committer: Jim Chen <nc...@mozilla.com>
Committed: Fri Aug 24 10:42:24 2018 -0400
----------------------------------------------------------------------
src/terminal/named-colors.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/eb5aa14a/src/terminal/named-colors.c
----------------------------------------------------------------------
diff --git a/src/terminal/named-colors.c b/src/terminal/named-colors.c
index b0e579b..ab94153 100644
--- a/src/terminal/named-colors.c
+++ b/src/terminal/named-colors.c
@@ -761,8 +761,13 @@ static int guac_terminal_named_color_search(const void* a, const void* b) {
/* Skip any spaces in key (name will never have spaces) */
while (*key && isspace(*key)) key++;
+ /* Treat semi-colon as string terminator, to support parsing color
+ names within a larger string (e.g. within the terminal color-scheme
+ configuration string). */
+ const int keyChar = (*key == ';') ? '\0' : tolower(*key);
+
/* Compare, ignoring case (name is already known to be lowercase) */
- int difference = tolower(*key) - *name;
+ int difference = keyChar - *name;
if (difference)
return difference;
[3/3] guacamole-server git commit: Merge 1.0.0 changes back to master.
Posted by vn...@apache.org.
Merge 1.0.0 changes back to master.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/332e1878
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/332e1878
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/332e1878
Branch: refs/heads/master
Commit: 332e187813595fc2e769f3e29c0582b7ec726ea1
Parents: 911e60c a1ba91b
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Aug 24 12:17:20 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Fri Aug 24 12:17:20 2018 -0400
----------------------------------------------------------------------
src/terminal/named-colors.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] guacamole-server git commit: GUACAMOLE-470: Merge support named
colors in color-scheme configuration.
Posted by vn...@apache.org.
GUACAMOLE-470: Merge support named colors in color-scheme configuration.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/a1ba91b0
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/a1ba91b0
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/a1ba91b0
Branch: refs/heads/master
Commit: a1ba91b01d09c387c3ab3c94ea785b81ea3ddf99
Parents: 427c4c8 eb5aa14
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Aug 24 12:15:58 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Fri Aug 24 12:15:58 2018 -0400
----------------------------------------------------------------------
src/terminal/named-colors.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------