Mercurial > pidgin.yaz
changeset 17920:11988aee28f2
Add msim_color_to_purple() to convert msim markup color to a color for
libpurple, and use this on the <c> tag to display incoming colored text
as colored (tested).
| author | Jeffrey Connelly <jaconnel@calpoly.edu> |
|---|---|
| date | Mon, 02 Jul 2007 04:51:09 +0000 |
| parents | e7612bd6835b |
| children | 51f54868bbad |
| files | libpurple/protocols/myspace/CHANGES libpurple/protocols/myspace/myspace.c |
| diffstat | 2 files changed, 40 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/myspace/CHANGES Mon Jul 02 04:24:16 2007 +0000 +++ b/libpurple/protocols/myspace/CHANGES Mon Jul 02 04:51:09 2007 +0000 @@ -1,3 +1,6 @@ +2007-07-xx Jeff Connelly <jeff22homing.pidgin.im> - 0.10 +* Handle incoming text color formatting. + 2007-07-01 Jeff Connelly <jeff2@homing.pidgin.im> - 0.9 * Fix crash on Windows when logging in (bug #1990) * Fix crash on Windows when viewing tooltip text (bug #1999)
--- a/libpurple/protocols/myspace/myspace.c Mon Jul 02 04:24:16 2007 +0000 +++ b/libpurple/protocols/myspace/myspace.c Mon Jul 02 04:51:09 2007 +0000 @@ -807,6 +807,29 @@ *end = gs_end->str; } +/** Convert a msim markup color to a color suitable for libpurple. + * + * @param msim Either a color name, or an rgb(x,y,z) code. + * + * @return A new string, either a color name or #rrggbb code. Must g_free(). + */ +static char *msim_color_to_purple(const char *msim) +{ + guint red, green, blue; + + if (!msim) + return g_strdup("black"); + + if (sscanf(msim, "rgb(%d,%d,%d)", &red, &green, &blue) != 3) + { + /* Color name. */ + return g_strdup(msim); + } + /* TODO: rgba (alpha). */ + + return g_strdup_printf("#%.2x%.2x%.2x", red, green, blue); +} + /** Convert the msim markup <p> (paragraph) tag into HTML. */ static void msim_markup_p_to_html(xmlnode *root, gchar **begin, gchar **end) { @@ -821,6 +844,7 @@ static void msim_markup_c_to_html(xmlnode *root, gchar **begin, gchar **end) { const gchar *color; + gchar *purple_color; color = xmlnode_get_attrib(root, "v"); if (!color) @@ -832,10 +856,12 @@ return; } - /* TODO: parse rgb(255,0,0) into #FF0000, etc. - * And do something about rgba (alpha) and transparent. - */ - *begin = g_strdup_printf("<font color='%s'>", color); + purple_color = msim_color_to_purple(color); + + *begin = g_strdup_printf("<font color='%s'>", purple_color); + + g_free(purple_color); + /* *begin = g_strdup_printf("<span style='color: %s'>", color); */ *end = g_strdup("</font>"); } @@ -844,6 +870,7 @@ static void msim_markup_b_to_html(xmlnode *root, gchar **begin, gchar **end) { const gchar *color; + gchar *purple_color; color = xmlnode_get_attrib(root, "v"); if (!color) @@ -855,9 +882,13 @@ return; } - /* TODO: parse color same as msim_markup_c_to_html(). */ + purple_color = msim_color_to_purple(color); + /* TODO: find out how to set background color. */ - *begin = g_strdup_printf("<span style='background-color: %s'>", color); + *begin = g_strdup_printf("<span style='background-color: %s'>", + purple_color); + g_free(purple_color); + *end = g_strdup("</p>"); }