pidgin.openq: 3f2e043e: Move smiley function to im.c
ccpaging at pidgin.im
ccpaging at pidgin.im
Wed Dec 3 23:21:01 EST 2008
-----------------------------------------------------------------
Revision: 3f2e043e882f00d62cb42d1c5f0100c676c9f3ca
Ancestor: a314108c3b6b9b62551f2b191ced5199ac7d6428
Author: ccpaging at pidgin.im
Date: 2008-11-11T07:02:34
Branch: im.pidgin.pidgin.openq
URL: http://d.pidgin.im/viewmtn/revision/info/3f2e043e882f00d62cb42d1c5f0100c676c9f3ca
Modified files:
libpurple/protocols/qq/char_conv.c
ChangeLog:
Move smiley function to im.c
-------------- next part --------------
============================================================
--- libpurple/protocols/qq/char_conv.c 948c570868e3df29ba56905773e1a789f10a3f10
+++ libpurple/protocols/qq/char_conv.c 7b2286efe67f3015abcbf78fbd6d109f3d0c5749
@@ -27,77 +27,16 @@
#include "char_conv.h"
#include "packet_parse.h"
-#include "qq.h"
#include "utils.h"
-#define QQ_SMILEY_AMOUNT 96
-
#define UTF8 "UTF-8"
#define QQ_CHARSET_ZH_CN "GB18030"
#define QQ_CHARSET_ENG "ISO-8859-1"
#define QQ_NULL_MSG "(NULL)" /* return this if conversion fails */
-#define QQ_NULL_SMILEY "<IMG ID=\"0\">" /* return this if smiley conversion fails */
-const gchar qq_smiley_map[QQ_SMILEY_AMOUNT] = {
- 0x41, 0x43, 0x42, 0x44, 0x45, 0x46, 0x47, 0x48,
- 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x73,
- 0x74, 0x75, 0x76, 0x77, 0x8a, 0x8b, 0x8c, 0x8d,
- 0x8e, 0x8f, 0x78, 0x79, 0x7a, 0x7b, 0x90, 0x91,
- 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
- 0x59, 0x5a, 0x5c, 0x58, 0x57, 0x55, 0x7c, 0x7d,
- 0x7e, 0x7f, 0x9a, 0x9b, 0x60, 0x67, 0x9c, 0x9d,
- 0x9e, 0x5e, 0x9f, 0x89, 0x80, 0x81, 0x82, 0x62,
- 0x63, 0x64, 0x65, 0x66, 0x83, 0x68, 0x84, 0x85,
- 0x86, 0x87, 0x6b, 0x6e, 0x6f, 0x70, 0x88, 0xa0,
- 0x50, 0x51, 0x52, 0x53, 0x54, 0x56, 0x5b, 0x5d,
- 0x5f, 0x61, 0x69, 0x6a, 0x6c, 0x6d, 0x71, 0x72
-};
-
-
-const gchar *purple_smiley_map[QQ_SMILEY_AMOUNT] = {
- "/jy", "/pz", "/se", "/fd", "/dy", "/ll", "/hx", "/bz",
- "/shui", "/dk ", "/gg", "/fn", "/tp", "/cy", "/wx", "/ng",
- "/kuk", "/feid", "/zk", "/tu", "/tx", "/ka", "/by", "/am",
- "/jie", "/kun", "/jk", "/lh", "/hanx", "/db", "/fendou",
- "/zhm",
- "/yiw", "/xu", "/yun", "/zhem", "/shuai", "/kl", "/qiao",
- "/zj",
- "/shan", "/fad", "/aiq", "/tiao", "/zhao", "/mm", "/zt",
- "/maom",
- "/xg", "/yb", "/qianc", "/dp", "/bei", "/dg", "/shd",
- "/zhd",
- "/dao", "/zq", "/yy", "/bb", "/gf", "/fan", "/yw", "/mg",
- "/dx", "/wen", "/xin", "/xs", "/hy", "/lw", "/dh", "/sj",
- "/yj", "/ds", "/ty", "/yl", "/qiang", "/ruo", "/ws",
- "/shl",
- "/dd", "/mn", "/hl", "/mamao", "/qz", "/fw", "/oh", "/bj",
- "/qsh", "/xig", "/xy", "/duoy", "/xr", "/xixing", "/nv",
- "/nan"
-};
-
-/* these functions parse font-attr */
-static gchar _get_size(gchar font_attr)
-{
- return font_attr & 0x1f;
-}
-
-static gboolean _check_bold(gchar font_attr)
-{
- return (font_attr & 0x20) ? TRUE : FALSE;
-}
-
-static gboolean _check_italic(gchar font_attr)
-{
- return (font_attr & 0x40) ? TRUE : FALSE;
-}
-
-static gboolean _check_underline(gchar font_attr)
-{
- return (font_attr & 0x80) ? TRUE : FALSE;
-}
-
/* convert a string from from_charset to to_charset, using g_convert */
+/* Warning: do not return NULL */
static gchar *do_convert(const gchar *str, gssize len, const gchar *to_charset, const gchar *from_charset)
{
GError *error = NULL;
@@ -114,11 +53,8 @@ static gchar *do_convert(const gchar *st
/* conversion error */
purple_debug_error("QQ_CONVERT", "%s\n", error->message);
+ qq_show_packet("Dump failed text", (guint8 *) str, (len == -1) ? strlen(str) : len);
- qq_hex_dump(PURPLE_DEBUG_WARNING, "QQ_CONVERT",
- (guint8 *) str, (len == -1) ? strlen(str) : len,
- "Dump failed text");
-
g_error_free(error);
return g_strdup(QQ_NULL_MSG);
}
@@ -127,6 +63,7 @@ static gchar *do_convert(const gchar *st
* take the input as a pascal string and return a converted c-string in UTF-8
* returns the number of bytes read, return -1 if fatal error
* the converted UTF-8 will be saved in ret
+ * Return: *ret != NULL
*/
gint qq_get_vstr(gchar **ret, const gchar *from_charset, guint8 *data)
{
@@ -162,156 +99,15 @@ gint qq_put_vstr(guint8 *buf, const gcha
return 1 + len;
}
-/* convert QQ formatted msg to Purple formatted msg (and UTF-8) */
-gchar *qq_encode_to_purple(guint8 *data, gint len, const gchar *msg, const gint client_version)
-{
- GString *encoded;
- guint8 font_attr, font_size, color[3], bar;
- gboolean is_bold, is_italic, is_underline;
- guint16 charset_code;
- gchar *font_name, *color_code, *msg_utf8, *tmp, *ret;
- gint bytes = 0;
-
- /* checked qq_show_packet OK */
- /* qq_show_packet("QQ_MESG recv for font style", data, len); */
-
- bytes += qq_get8(&font_attr, data + bytes);
- bytes += qq_getdata(color, 3, data + bytes); /* red,green,blue */
- color_code = g_strdup_printf("#%02x%02x%02x", color[0], color[1], color[2]);
-
- bytes += qq_get8(&bar, data + bytes); /* skip, not sure of its use */
- bytes += qq_get16(&charset_code, data + bytes);
-
- tmp = g_strndup((gchar *)(data + bytes), len - bytes);
- font_name = qq_to_utf8(tmp, QQ_CHARSET_DEFAULT);
- g_free(tmp);
-
- font_size = _get_size(font_attr);
- is_bold = _check_bold(font_attr);
- is_italic = _check_italic(font_attr);
- is_underline = _check_underline(font_attr);
-
- /* Although there is charset returned from QQ msg, it can't be used.
- * For example, if a user send a Chinese message from English Windows
- * the charset_code in QQ msg is 0x0000, not 0x8602.
- * Therefore, it is better to use uniform conversion.
- * By default, we use GBK, which includes all character of SC, TC, and EN. */
- msg_utf8 = qq_to_utf8(msg, QQ_CHARSET_DEFAULT);
- encoded = g_string_new("");
-
- /* Henry: The range QQ sends rounds from 8 to 22, where a font size
- * of 10 is equal to 3 in html font tag */
- g_string_append_printf(encoded,
- "<font color=\"%s\"><font face=\"%s\"><font size=\"%d\">",
- color_code, font_name, font_size / 3);
- purple_debug_info("QQ_MESG",
- "recv <font color=\"%s\"><font face=\"%s\"><font size=\"%d\">\n",
- color_code, font_name, font_size / 3);
- g_string_append(encoded, msg_utf8);
-
- if (is_bold) {
- g_string_prepend(encoded, "<b>");
- g_string_append(encoded, "</b>");
- }
- if (is_italic) {
- g_string_prepend(encoded, "<i>");
- g_string_append(encoded, "</i>");
- }
- if (is_underline) {
- g_string_prepend(encoded, "<u>");
- g_string_append(encoded, "</u>");
- }
-
- g_string_append(encoded, "</font></font></font>");
- ret = encoded->str;
-
- g_free(msg_utf8);
- g_free(font_name);
- g_free(color_code);
- g_string_free(encoded, FALSE);
-
- return ret;
-}
-
-/* two convenience methods, using do_convert */
+/* Warning: do not return NULL */
gchar *utf8_to_qq(const gchar *str, const gchar *to_charset)
{
return do_convert(str, -1, to_charset, UTF8);
}
+/* Warning: do not return NULL */
gchar *qq_to_utf8(const gchar *str, const gchar *from_charset)
{
return do_convert(str, -1, UTF8, from_charset);
}
-/* QQ uses binary code for smiley, while purple uses strings.
- * There is a mapping relation between these two. */
-gchar *qq_smiley_to_purple(gchar *text)
-{
- gint index;
- gchar qq_smiley, *cur_seg, **segments, *ret;
- GString *converted;
-
- converted = g_string_new("");
- segments = split_data((guint8 *) text, strlen(text), "\x14\x15", 0);
- if(segments == NULL)
- return NULL;
-
- g_string_append(converted, segments[0]);
- while ((*(++segments)) != NULL) {
- cur_seg = *segments;
- qq_smiley = cur_seg[0];
- for (index = 0; index < QQ_SMILEY_AMOUNT; index++) {
- if (qq_smiley_map[index] == qq_smiley)
- break;
- }
- if (index >= QQ_SMILEY_AMOUNT) {
- g_string_append(converted, QQ_NULL_SMILEY);
- } else {
- g_string_append(converted, purple_smiley_map[index]);
- g_string_append(converted, (cur_seg + 1));
- }
- }
-
- ret = converted->str;
- g_string_free(converted, FALSE);
- return ret;
-}
-
-/* convert smiley from purple style to qq binary code */
-gchar *purple_smiley_to_qq(gchar *text)
-{
- gchar *begin, *cursor, *ret;
- gint index;
- GString *converted;
-
- converted = g_string_new(text);
-
- for (index = 0; index < QQ_SMILEY_AMOUNT; index++) {
- begin = cursor = converted->str;
- while ((cursor = g_strstr_len(cursor, -1, purple_smiley_map[index]))) {
- g_string_erase(converted, (cursor - begin), strlen(purple_smiley_map[index]));
- g_string_insert_c(converted, (cursor - begin), 0x14);
- g_string_insert_c(converted, (cursor - begin + 1), qq_smiley_map[index]);
- cursor++;
- }
- }
- g_string_append_c(converted, 0x20); /* important for last smiiley */
-
- ret = converted->str;
- g_string_free(converted, FALSE);
- return ret;
-}
-
-void qq_filter_str(gchar *str) {
- gchar *temp;
- if (str == NULL) {
- return;
- }
-
- for (temp = str; *temp != 0; temp++) {
- /*if (*temp == '\r' || *temp == '\n') *temp = ' ';*/
- if (*temp > 0 && *temp < 0x20) *temp = ' ';
- }
- g_strstrip(str);
-}
More information about the Commits
mailing list