From: Enlightenment S. <no-...@en...> - 2011-01-30 10:35:44
|
Log: Evas font-engine: Moved bidi utils (and added script utils) to a subdir language that collects all the language specific adjustments to font handling. Author: tasn Date: 2011-01-30 02:35:37 -0800 (Sun, 30 Jan 2011) New Revision: 56446 Trac: http://trac.enlightenment.org/e/changeset/56446 Added: trunk/evas/src/lib/engines/common/language/ trunk/evas/src/lib/engines/common/language/evas_bidi_utils.c trunk/evas/src/lib/engines/common/language/evas_bidi_utils.h trunk/evas/src/lib/engines/common/language/evas_script_utils.c trunk/evas/src/lib/engines/common/language/evas_script_utils.h Removed: trunk/evas/src/lib/engines/common/evas_bidi_utils.c trunk/evas/src/lib/engines/common/evas_bidi_utils.h Modified: trunk/evas/src/lib/canvas/evas_object_textblock.c trunk/evas/src/lib/engines/common/Makefile.am trunk/evas/src/lib/engines/common/evas_font.h trunk/evas/src/lib/engines/common/evas_font_draw.c trunk/evas/src/lib/engines/common/evas_font_query.c trunk/evas/src/lib/engines/common/evas_pipe.h trunk/evas/src/lib/include/evas_common.h trunk/evas/src/lib/include/evas_private.h Modified: trunk/evas/src/lib/canvas/evas_object_textblock.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_textblock.c 2011-01-30 10:35:30 UTC (rev 56445) +++ trunk/evas/src/lib/canvas/evas_object_textblock.c 2011-01-30 10:35:37 UTC (rev 56446) @@ -2477,9 +2477,13 @@ do { Evas_Object_Textblock_Text_Item *new_ti; + /* FIXME: We assume here that it's ok to have an empty item with + * no text nodes, make sure it's the case. */ if (ti->parent.text_node) { - cutoff = evas_bidi_end_of_run_get(ti->parent.text_node->bidi_props, + cutoff = evas_common_script_end_of_run_get( + eina_ustrbuf_string_get(ti->parent.text_node->unicode), + ti->parent.text_node->bidi_props, ti->parent.text_pos, len); if (cutoff > 0) { Modified: trunk/evas/src/lib/engines/common/Makefile.am =================================================================== --- trunk/evas/src/lib/engines/common/Makefile.am 2011-01-30 10:35:30 UTC (rev 56445) +++ trunk/evas/src/lib/engines/common/Makefile.am 2011-01-30 10:35:37 UTC (rev 56446) @@ -59,7 +59,8 @@ evas_tiler.c \ evas_regionbuf.c \ evas_pipe.c \ -evas_bidi_utils.c \ +language/evas_bidi_utils.c \ +language/evas_script_utils.c \ evas_map_image.c \ evas_map_image.h @@ -98,7 +99,8 @@ evas_scale_smooth_scaler_up.c \ evas_scale_span.h \ evas_pipe.h \ -evas_bidi_utils.h \ +language/evas_bidi_utils.h \ +language/evas_script_utils.h \ evas_map_image_internal.c \ evas_map_image_core.c \ evas_map_image_loop.c Modified: trunk/evas/src/lib/engines/common/evas_font.h =================================================================== --- trunk/evas/src/lib/engines/common/evas_font.h 2011-01-30 10:35:30 UTC (rev 56445) +++ trunk/evas/src/lib/engines/common/evas_font.h 2011-01-30 10:35:37 UTC (rev 56446) @@ -1,6 +1,6 @@ #ifndef _EVAS_FONT_H #define _EVAS_FONT_H -#include "evas_bidi_utils.h" +#include "language/evas_bidi_utils.h" /* main */ Modified: trunk/evas/src/lib/engines/common/evas_font_draw.c =================================================================== --- trunk/evas/src/lib/engines/common/evas_font_draw.c 2011-01-30 10:35:30 UTC (rev 56445) +++ trunk/evas/src/lib/engines/common/evas_font_draw.c 2011-01-30 10:35:37 UTC (rev 56446) @@ -2,7 +2,7 @@ #include "evas_private.h" #include "evas_blend_private.h" -#include "evas_bidi_utils.h" /*defines BIDI_SUPPORT if possible */ +#include "language/evas_bidi_utils.h" /*defines BIDI_SUPPORT if possible */ #include "evas_font_private.h" /* for Frame-Queuing support */ #define WORD_CACHE_MAXLEN 50 Modified: trunk/evas/src/lib/engines/common/evas_font_query.c =================================================================== --- trunk/evas/src/lib/engines/common/evas_font_query.c 2011-01-30 10:35:30 UTC (rev 56445) +++ trunk/evas/src/lib/engines/common/evas_font_query.c 2011-01-30 10:35:37 UTC (rev 56446) @@ -1,5 +1,5 @@ #include "evas_common.h" -#include "evas_bidi_utils.h" /*defines BIDI_SUPPORT if possible */ +#include "language/evas_bidi_utils.h" /*defines BIDI_SUPPORT if possible */ #include "evas_font_private.h" /* for Frame-Queuing support */ EAPI int Modified: trunk/evas/src/lib/engines/common/evas_pipe.h =================================================================== --- trunk/evas/src/lib/engines/common/evas_pipe.h 2011-01-30 10:35:30 UTC (rev 56445) +++ trunk/evas/src/lib/engines/common/evas_pipe.h 2011-01-30 10:35:37 UTC (rev 56446) @@ -1,6 +1,6 @@ #ifndef _EVAS_PIPE_H #define _EVAS_PIPE_H -#include "evas_bidi_utils.h" +#include "language/evas_bidi_utils.h" #ifdef BUILD_PTHREAD typedef struct _Thinfo Modified: trunk/evas/src/lib/include/evas_common.h =================================================================== --- trunk/evas/src/lib/include/evas_common.h 2011-01-30 10:35:30 UTC (rev 56445) +++ trunk/evas/src/lib/include/evas_common.h 2011-01-30 10:35:37 UTC (rev 56446) @@ -688,7 +688,7 @@ #ifdef BUILD_PIPE_RENDER #include "../engines/common/evas_map_image.h" -#include "../engines/common/evas_bidi_utils.h" +#include "../engines/common/language/evas_bidi_utils.h" struct _RGBA_Pipe_Op { Modified: trunk/evas/src/lib/include/evas_private.h =================================================================== --- trunk/evas/src/lib/include/evas_private.h 2011-01-30 10:35:30 UTC (rev 56445) +++ trunk/evas/src/lib/include/evas_private.h 2011-01-30 10:35:37 UTC (rev 56446) @@ -11,7 +11,8 @@ #include "../file/evas_module.h" #include "../file/evas_path.h" -#include "../engines/common/evas_bidi_utils.h" +#include "../engines/common/language/evas_bidi_utils.h" +#include "../engines/common/language/evas_script_utils.h" #ifdef EVAS_MAGIC_DEBUG /* complain when peole pass in wrong object types etc. */ |
From: Enlightenment S. <no-...@en...> - 2011-02-16 16:00:25
|
Log: Evas encoding: Removed Evas_Encoding and moved to eina_unicode_utf8* instead. Author: tasn Date: 2011-02-16 08:00:17 -0800 (Wed, 16 Feb 2011) New Revision: 57096 Trac: http://trac.enlightenment.org/e/changeset/57096 Removed: trunk/evas/src/lib/engines/common/evas_encoding.c trunk/evas/src/lib/engines/common/evas_encoding.h Modified: trunk/evas/src/lib/canvas/evas_object_text.c trunk/evas/src/lib/canvas/evas_object_textblock.c trunk/evas/src/lib/engines/common/Makefile.am trunk/evas/src/lib/engines/common/evas_font_main.c trunk/evas/src/lib/engines/common/language/evas_bidi_utils.c trunk/evas/src/lib/include/evas_common.h Modified: trunk/evas/src/lib/canvas/evas_object_text.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_text.c 2011-02-16 15:49:33 UTC (rev 57095) +++ trunk/evas/src/lib/canvas/evas_object_text.c 2011-02-16 16:00:17 UTC (rev 57096) @@ -678,7 +678,7 @@ { return; } - text = evas_common_encoding_utf8_to_unicode(_text, &len); + text = eina_unicode_utf8_to_unicode(_text, &len); if (!text) text = eina_unicode_strdup(EINA_UNICODE_EMPTY_STRING); was = evas_object_is_in_output_rect(obj, @@ -1668,7 +1668,7 @@ if (decoded) *decoded = 0; if ((!str) || (pos < 0)) return 0; p = pos; - d = evas_common_encoding_utf8_get_next(str, &p); + d = eina_unicode_utf8_get_next(str, &p); if (decoded) *decoded = d; return p; } @@ -1700,7 +1700,7 @@ if (decoded) *decoded = 0; if ((!str) || (pos < 1)) return 0; p = pos; - d = evas_common_encoding_utf8_get_prev(str, &p); + d = eina_unicode_utf8_get_prev(str, &p); if (decoded) *decoded = d; return p; } @@ -1715,7 +1715,7 @@ evas_string_char_len_get(const char *str) { if (!str) return 0; - return evas_common_encoding_utf8_get_len(str); + return eina_unicode_utf8_get_len(str); } /** @@ -2298,7 +2298,7 @@ if (o->items) _evas_object_text_items_clear(o); if (o->cur.utf8_text) - text = evas_common_encoding_utf8_to_unicode(o->cur.utf8_text, + text = eina_unicode_utf8_to_unicode(o->cur.utf8_text, NULL); if (!text) text = eina_unicode_strdup(EINA_UNICODE_EMPTY_STRING); Modified: trunk/evas/src/lib/canvas/evas_object_textblock.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_textblock.c 2011-02-16 15:49:33 UTC (rev 57095) +++ trunk/evas/src/lib/canvas/evas_object_textblock.c 2011-02-16 16:00:17 UTC (rev 57096) @@ -2744,7 +2744,7 @@ str = alloca((off + 1) * sizeof(Eina_Unicode)); tbase = str; ind = 0; - urepch = evas_common_encoding_utf8_get_next(repch, &ind); + urepch = eina_unicode_utf8_get_next(repch, &ind); for (i = 0, ptr = (Eina_Unicode *)tbase; i < off; ptr++, i++) *ptr = urepch; *ptr = 0; @@ -4563,7 +4563,7 @@ static void _markup_get_text_append(Eina_Strbuf *txt, const Eina_Unicode *text) { - char *p = evas_common_encoding_unicode_to_utf8(text, NULL); + char *p = eina_unicode_unicode_to_utf8(text, NULL); char *base = p; while (*p) { @@ -6391,7 +6391,7 @@ int len = 0; if (!cur) return 0; - text = evas_common_encoding_utf8_to_unicode(_text, &len); + text = eina_unicode_utf8_to_unicode(_text, &len); o = (Evas_Object_Textblock *)(cur->obj->object_data); /* Update all the cursors after our position. */ _evas_textblock_cursors_update_offset(cur, cur->node, cur->pos, len); @@ -6885,7 +6885,7 @@ ustr = eina_ustrbuf_string_get(cur->node->unicode); buf[0] = ustr[cur->pos]; buf[1] = 0; - s = evas_common_encoding_unicode_to_utf8(buf, NULL); + s = eina_unicode_unicode_to_utf8(buf, NULL); return s; } Modified: trunk/evas/src/lib/engines/common/Makefile.am =================================================================== --- trunk/evas/src/lib/engines/common/Makefile.am 2011-02-16 15:49:33 UTC (rev 57095) +++ trunk/evas/src/lib/engines/common/Makefile.am 2011-02-16 16:00:17 UTC (rev 57096) @@ -39,7 +39,6 @@ evas_convert_yuv.c \ evas_cpu.c \ evas_draw_main.c \ -evas_encoding.c \ evas_font_draw.c \ evas_font_load.c \ evas_font_main.c \ @@ -82,7 +81,6 @@ evas_convert_rgb_8.h \ evas_convert_yuv.h \ evas_draw.h \ -evas_encoding.h \ evas_font.h \ evas_font_private.h \ evas_image.h \ Modified: trunk/evas/src/lib/engines/common/evas_font_main.c =================================================================== --- trunk/evas/src/lib/engines/common/evas_font_main.c 2011-02-16 15:49:33 UTC (rev 57095) +++ trunk/evas/src/lib/engines/common/evas_font_main.c 2011-02-16 16:00:17 UTC (rev 57096) @@ -1,6 +1,5 @@ #include "evas_common.h" #include "evas_private.h" -#include "evas_encoding.h" #include "evas_font_private.h" Modified: trunk/evas/src/lib/engines/common/language/evas_bidi_utils.c =================================================================== --- trunk/evas/src/lib/engines/common/language/evas_bidi_utils.c 2011-02-16 15:49:33 UTC (rev 57095) +++ trunk/evas/src/lib/engines/common/language/evas_bidi_utils.c 2011-02-16 16:00:17 UTC (rev 57096) @@ -3,7 +3,6 @@ #include "evas_common.h" #include "evas_bidi_utils.h" -#include "evas_encoding.h" #include "evas_font_private.h" Modified: trunk/evas/src/lib/include/evas_common.h =================================================================== --- trunk/evas/src/lib/include/evas_common.h 2011-02-16 15:49:33 UTC (rev 57095) +++ trunk/evas/src/lib/include/evas_common.h 2011-02-16 16:00:17 UTC (rev 57096) @@ -49,10 +49,6 @@ #endif #define CRIT(...) EINA_LOG_DOM_CRIT(_EVAS_DEFAULT_LOG_DOM, __VA_ARGS__) -/************************ Unicode stuff **************************/ -#include "../engines/common/evas_encoding.h" -/*****************************************************************/ - #include "evas_options.h" #if defined(__ARM_ARCH_3M__) |