From: Enlightenment S. <no-...@en...> - 2010-08-16 08:36:15
|
Log: Evas textblock: Use the unicode object replacement char, not the regular replacement char. Drop the object replacement char if passed as text. Author: tasn Date: 2010-08-16 01:36:08 -0700 (Mon, 16 Aug 2010) New Revision: 51168 Modified: trunk/evas/src/lib/canvas/evas_object_textblock.c Modified: trunk/evas/src/lib/canvas/evas_object_textblock.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_textblock.c 2010-08-16 08:36:06 UTC (rev 51167) +++ trunk/evas/src/lib/canvas/evas_object_textblock.c 2010-08-16 08:36:08 UTC (rev 51168) @@ -115,8 +115,8 @@ * There are two types of format nodes, visible and invisible. They are the same * in every way, except for the representation in the text node. While invisible * format nodes have no representation in the text node, the visible ones do. - * The Uniceode replacement character (0xFFFD) is inserted to every place a - * visible format node points to. This makes it very easy to treat visible + * The Uniceode object replacement character (0xFFFC) is inserted to every place + * a visible format node points to. This makes it very easy to treat visible * formats as items in the text, both for BiDi purposes and cursor handling * purposes. * Here are a few example visible an invisible formats: @@ -137,7 +137,7 @@ static const char o_type[] = "textblock"; /* The char to be inserted instead of visible formats */ -#define EVAS_TEXTBLOCK_REPLACEMENT_CHAR 0xFFFD +#define EVAS_TEXTBLOCK_REPLACEMENT_CHAR 0xFFFC /* private struct for textblock object internal data */ /** @@ -3712,7 +3712,7 @@ /** * Sets the tetxblock's text to the markup text. * - * @note assumes text does not include the unicode replacement char (0xFFFD) + * @note assumes text does not include the unicode object replacement char (0xFFFC) * * @param obj the textblock object. * @param text the markup text to use. @@ -3753,7 +3753,7 @@ /** * Prepends markup to the cursor cur. * - * @note assumes text does not include the unicode replacement char (0xFFFD) + * @note assumes text does not include the unicode object replacement char (0xFFFC) * * @param cur the cursor to prepend to. * @param text the markup text to prepend. @@ -3883,6 +3883,16 @@ s = p + 1; } } + /* Unicode object replcament char */ + else if (!strncmp("\xEF\xBF\xBC", p, 3)) + { + /*FIXME: currently just remove them, maybe do something + * fancier in the future, atm it breaks if this char + * is inside <> */ + _prepend_text_run(o, s, p); + p += 2; /* it's also advanced later in this loop */ + s = NULL; + } p++; } } |