summaryrefslogtreecommitdiff
path: root/legacy/evas/src/modules/engines/gl_sdl/evas_engine.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2010-07-28 12:00:41 +0000
committerTom Hacohen <tom@stosb.com>2010-07-28 12:00:41 +0000
commita6d428334f7b1f50b7d49a1b57579138c90f5bab (patch)
tree5c1f798fbf4bdf529e1f91d03b2c4373b9c7a4ec /legacy/evas/src/modules/engines/gl_sdl/evas_engine.c
parent1a0f8b1c51b9f1fdcd9c6ecc94f03bc701bdf4a1 (diff)
Evas: Changing the font engine to work with Eina_Unicode instead of utf8.
Changing textblock and text objects to work with Eina_Unicode instead of utf8 (internally, API remains intact). Started relying on new fribidi 0.19.2 instead of the old fribidi. A lot of fixes to the font engine. Renaming of evas_common_font_utf8_* to evas_common_encoding_utf8_* This relies on new Eina changes and types: Eina_Unicode, Eina_UStrbuf and Eina_UStringshare. SVN revision: 50595
Diffstat (limited to '')
-rw-r--r--legacy/evas/src/modules/engines/gl_sdl/evas_engine.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/legacy/evas/src/modules/engines/gl_sdl/evas_engine.c b/legacy/evas/src/modules/engines/gl_sdl/evas_engine.c
index bfbb12086e..fc0b1fff49 100644
--- a/legacy/evas/src/modules/engines/gl_sdl/evas_engine.c
+++ b/legacy/evas/src/modules/engines/gl_sdl/evas_engine.c
@@ -1,4 +1,4 @@
1#include "evas_common.h" 1#include "evas_common.h" /* Also includes international specific stuff */
2#include "evas_engine.h" 2#include "evas_engine.h"
3 3
4#include <dlfcn.h> /* dlopen,dlclose,etc */ 4#include <dlfcn.h> /* dlopen,dlclose,etc */
@@ -1172,7 +1172,7 @@ eng_image_scale_hint_get(void *data __UNUSED__, void *image)
1172} 1172}
1173 1173
1174static void 1174static void
1175eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const char *text) 1175eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y, int w __UNUSED__, int h __UNUSED__, int ow __UNUSED__, int oh __UNUSED__, const Eina_Unicode *text, const Evas_BiDi_Props *intl_props)
1176{ 1176{
1177 Render_Engine *re; 1177 Render_Engine *re;
1178 1178
@@ -1192,7 +1192,7 @@ eng_font_draw(void *data, void *context, void *surface, void *font, int x, int y
1192 evas_gl_font_texture_new, 1192 evas_gl_font_texture_new,
1193 evas_gl_font_texture_free, 1193 evas_gl_font_texture_free,
1194 evas_gl_font_texture_draw); 1194 evas_gl_font_texture_draw);
1195 evas_common_font_draw(im, context, font, x, y, text); 1195 evas_common_font_draw(im, context, font, x, y, text, intl_props);
1196 evas_common_draw_context_font_ext_set(context, 1196 evas_common_draw_context_font_ext_set(context,
1197 NULL, 1197 NULL,
1198 NULL, 1198 NULL,