Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_main.c evas_object_text.c
Log Message:
and here are the stubs of a cairo engine
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- evas_main.c 1 Aug 2004 02:20:40 -0000 1.15
+++ evas_main.c 17 Aug 2004 06:03:38 -0000 1.16
@@ -21,6 +21,9 @@
#ifdef BUILD_ENGINE_GL_X11
#include "evas_engine_api_gl_x11.h"
#endif
+#ifdef BUILD_ENGINE_CAIRO_X11
+#include "evas_engine_api_cairo_x11.h"
+#endif
#include "Evas.h"
@@ -224,6 +227,11 @@
e->engine.func = &evas_engine_gl_x11_func;
else
#endif
+#ifdef BUILD_ENGINE_CAIRO_X11
+ if (e->output.render_method == RENDER_METHOD_CAIRO_X11)
+ e->engine.func = &evas_engine_cairo_x11_func;
+ else
+#endif
#ifdef BUILD_ENGINE_DIRECTFB
if (e->output.render_method == RENDER_METHOD_DIRECTFB)
e->engine.func = &evas_engine_directfb_func;
@@ -662,6 +670,9 @@
#ifdef BUILD_ENGINE_GL_X11
if (!strcmp(name, "gl_x11")) return RENDER_METHOD_GL_X11;
#endif
+#ifdef BUILD_ENGINE_CAIRO_X11
+ if (!strcmp(name, "cairo_x11")) return RENDER_METHOD_CAIRO_X11;
+#endif
#ifdef BUILD_ENGINE_DIRECTFB
if (!strcmp(name, "directfb")) return RENDER_METHOD_DIRECTFB;
#endif
@@ -726,6 +737,9 @@
#ifdef BUILD_ENGINE_GL_X11
methods = evas_list_append(methods, strdup("gl_x11"));
#endif
+#ifdef BUILD_ENGINE_CAIRO_X11
+ methods = evas_list_append(methods, strdup("cairo_x11"));
+#endif
#ifdef BUILD_ENGINE_DIRECTFB
methods = evas_list_append(methods, strdup("directfb"));
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_text.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- evas_object_text.c 12 Aug 2004 18:59:03 -0000 1.27
+++ evas_object_text.c 17 Aug 2004 06:03:38 -0000 1.28
@@ -124,11 +124,11 @@
{
mt = evas_file_modified_time(dir);
if (mt != fd->dir_mod_time)
- {
- object_text_font_cache_dir_del(dir, fd);
- font_dirs = evas_hash_del(font_dirs, dir, fd);
- }
- else
+ {
+ object_text_font_cache_dir_del(dir, fd);
+ font_dirs = evas_hash_del(font_dirs, dir, fd);
+ }
+ else
{
tmp = evas_file_path_join(dir, "fonts.dir");
if (tmp)
@@ -136,11 +136,11 @@
mt = evas_file_modified_time(tmp);
free(tmp);
if (mt != fd->fonts_dir_mod_time)
- {
- object_text_font_cache_dir_del(dir, fd);
- font_dirs = evas_hash_del(font_dirs, dir, fd);
- }
- else
+ {
+ object_text_font_cache_dir_del(dir, fd);
+ font_dirs = evas_hash_del(font_dirs, dir, fd);
+ }
+ else
{
tmp = evas_file_path_join(dir, "fonts.alias");
if (tmp)
@@ -149,11 +149,11 @@
free(tmp);
}
if (mt != fd->fonts_alias_mod_time)
- {
- object_text_font_cache_dir_del(dir, fd);
- font_dirs = evas_hash_del(font_dirs, dir, fd);
- }
- else
+ {
+ object_text_font_cache_dir_del(dir, fd);
+ font_dirs = evas_hash_del(font_dirs, dir, fd);
+ }
+ else
return fd;
}
}
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
