[geany/geany] 3522e8: Merge branch 'wip/color-parsing-improvements'
Colomban Wendling
git-noreply at xxxxx
Tue Dec 3 02:09:41 UTC 2013
Branch: refs/heads/master
Author: Colomban Wendling <ban at herbesfolles.org>
Committer: Colomban Wendling <ban at herbesfolles.org>
Date: Tue, 03 Dec 2013 02:09:41 UTC
Commit: 3522e81d7344c584a78c2f52cf8bcd32f14dd38d
https://github.com/geany/geany/commit/3522e81d7344c584a78c2f52cf8bcd32f14dd38d
Log Message:
-----------
Merge branch 'wip/color-parsing-improvements'
Modified Paths:
--------------
src/highlighting.c
src/sciwrappers.c
src/utils.c
src/utils.h
src/win32.c
Modified: src/highlighting.c
32 files changed, 4 insertions(+), 28 deletions(-)
===================================================================
@@ -219,9 +219,7 @@ static gboolean read_named_style(const gchar *named_style, GeanyLexerStyle *styl
static void parse_color(GKeyFile *kf, const gchar *str, gint *clr)
{
gint c;
- gchar hex_clr[9] = { 0 };
gchar *named_color = NULL;
- const gchar *start;
g_return_if_fail(clr != NULL);
@@ -229,38 +227,16 @@ static void parse_color(GKeyFile *kf, const gchar *str, gint *clr)
return;
named_color = g_key_file_get_string(kf, "named_colors", str, NULL);
- if (named_color)
+ if (named_color)
str = named_color;
- if (str[0] == '#')
- start = str + 1;
- else if (strlen(str) > 1 && str[0] == '0' && (str[1] == 'x' || str[1] == 'X'))
- start = str + 2;
- else
- {
+ c = utils_parse_color(str);
+ if (c == -1)
geany_debug("Bad color '%s'", str);
- g_free(named_color);
- return;
- }
-
- if (strlen(start) == 3)
- {
- g_snprintf(hex_clr, 9, "0x%c%c%c%c%c%c", start[0], start[0],
- start[1], start[1], start[2], start[2]);
- }
else
- g_snprintf(hex_clr, 9, "0x%s", start);
+ *clr = c;
g_free(named_color);
-
- c = utils_strtod(hex_clr, NULL, FALSE);
-
- if (c > -1)
- {
- *clr = c;
- return;
- }
- geany_debug("Bad color '%s'", str);
}
Modified: src/sciwrappers.c
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -69,7 +69,7 @@ void sci_set_line_numbers(ScintillaObject *sci, gboolean set, gint extra_width)
void sci_set_mark_long_lines(ScintillaObject *sci, gint type, gint column, const gchar *colour)
{
- glong colour_val = utils_strtod(colour, NULL, TRUE); /* Scintilla uses a "long" value */
+ glong colour_val = utils_parse_color(colour); /* Scintilla uses a "long" value */
if (column == 0)
type = 2;
Modified: src/utils.c
69 files changed, 37 insertions(+), 32 deletions(-)
===================================================================
@@ -964,50 +964,55 @@ gchar *utils_make_human_readable_str(guint64 size, gulong block_size,
}
- static guint utils_get_value_of_hex(const gchar ch)
-{
- if (ch >= '0' && ch <= '9')
- return ch - '0';
- else if (ch >= 'A' && ch <= 'F')
- return ch - 'A' + 10;
- else if (ch >= 'a' && ch <= 'f')
- return ch - 'a' + 10;
- else
- return 0;
+static gboolean read_hex(const gchar *s, guint len, gint *h)
+{
+ guint i;
+ *h = 0;
+ for (i = 0; i < len; i++)
+ {
+ if (! g_ascii_isxdigit(s[i]))
+ return FALSE;
+ *h = (*h << 4) | g_ascii_xdigit_value(s[i]);
+ }
+ return TRUE;
}
-/* utils_strtod() converts a string containing a hex colour ("0x00ff00") into an integer.
- * Basically, it is the same as strtod() would do, but it does not understand hex colour values,
- * before ANSI-C99. With with_route set, it takes strings of the format "#00ff00".
- * Returns -1 on failure. */
-gint utils_strtod(const gchar *source, gchar **end, gboolean with_route)
+/* Converts a string containing an hex or HTML RGB color with 1 or 2 digits per
+ * channel (0x00ff11, 0x0f1, #00ff11, #0f1) to an integer.
+ * Returns an integer color in the format BBGGRR or -1 on failure. */
+gint utils_parse_color(const gchar *source)
{
- guint red, green, blue, offset = 0;
+ gint r, g, b;
+ guint len;
g_return_val_if_fail(source != NULL, -1);
- if (with_route && (strlen(source) != 7 || source[0] != '#'))
+ if (source[0] == '#')
+ source++;
+ else if (source[0] == '0' && (source[1] == 'x' || source[1] == 'X'))
+ source += 2;
+ else
return -1;
- else if (! with_route && (strlen(source) != 8 || source[0] != '0' ||
- (source[1] != 'x' && source[1] != 'X')))
- {
+
+ len = strlen(source);
+ if (len % 3 || len < 3 || len > 6)
return -1;
- }
+ len /= 3;
- /* offset is set to 1 when the string starts with 0x, otherwise it starts with #
- * and we don't need to increase the index */
- if (! with_route)
- offset = 1;
+ if (! read_hex(source, len, &r) ||
+ ! read_hex(source + len, len, &g) ||
+ ! read_hex(source + len * 2, len, &b))
+ return -1;
- red = utils_get_value_of_hex(
- source[1 + offset]) * 16 + utils_get_value_of_hex(source[2 + offset]);
- green = utils_get_value_of_hex(
- source[3 + offset]) * 16 + utils_get_value_of_hex(source[4 + offset]);
- blue = utils_get_value_of_hex(
- source[5 + offset]) * 16 + utils_get_value_of_hex(source[6 + offset]);
+ if (len < 2)
+ {
+ r |= r << 4;
+ g |= g << 4;
+ b |= b << 4;
+ }
- return (red | (green << 8) | (blue << 16));
+ return (r | (g << 8) | (b << 16));
}
Modified: src/utils.h
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -220,7 +220,7 @@ guint utils_string_regex_replace_all(GString *haystack, GRegex *regex,
gchar *utils_make_human_readable_str(guint64 size, gulong block_size,
gulong display_unit);
-gint utils_strtod(const gchar *source, gchar **end, gboolean with_route);
+gint utils_parse_color(const gchar *source);
gchar *utils_get_current_time_string(void);
Modified: src/win32.c
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -565,7 +565,7 @@ void win32_show_color_dialog(const gchar *colour)
cc.lStructSize = sizeof(cc);
cc.hwndOwner = GDK_WINDOW_HWND(gtk_widget_get_window(main_widgets.window));
cc.lpCustColors = (LPDWORD) acr_cust_clr;
- cc.rgbResult = (colour != NULL) ? utils_strtod(colour, NULL, colour[0] == '#') : 0;
+ cc.rgbResult = (colour != NULL) ? utils_parse_color(colour) : 0;
cc.Flags = CC_FULLOPEN | CC_RGBINIT;
if (ChooseColor(&cc))
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Commits
mailing list