Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/include
Modified Files:
evas_common.h evas_private.h
Log Message:
added in loading froms from memory buffers at the engine level, and now an
api to set a font "source" (blank is normal filing system) but the source can
be a device or file etc. in this case it currently supports eet files as the
source and then the font name is used as a key in th eet file as to where to
find the font - edb support would be trivial to add. :) if the font is not
found in the "source" it falls back to the font path etc.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/evas_common.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- evas_common.h 17 Jan 2004 16:27:58 -0000 1.19
+++ evas_common.h 23 Jan 2004 02:14:41 -0000 1.20
@@ -165,6 +165,7 @@
typedef struct _RGBA_Gradient_Color RGBA_Gradient_Color;
typedef struct _RGBA_Polygon_Point RGBA_Polygon_Point;
typedef struct _RGBA_Font RGBA_Font;
+typedef struct _RGBA_Font_Source RGBA_Font_Source;
typedef struct _RGBA_Font_Glyph RGBA_Font_Glyph;
typedef struct _Cutout_Rect Cutout_Rect;
@@ -332,18 +333,35 @@
struct _RGBA_Font
{
Evas_Object_List _list_data;
+
+ RGBA_Font_Source *src;
+
+ int size;
+ int real_size;
+
+ Evas_Hash *glyphs;
+
+ int usage;
+
+ int references;
+};
+
+struct _RGBA_Font_Source
+{
+ Evas_Object_List _list_data;
+
char *name;
char *file;
- int size;
+
+ void *data;
+ int data_size;
+
+ int current_size;
struct {
FT_Face face;
} ft;
- Evas_Hash *glyphs;
-
- int usage;
-
int references;
};
@@ -805,8 +823,14 @@
/****/
void evas_common_font_init (void);
void evas_common_font_shutdown (void);
-
+RGBA_Font_Source *evas_common_font_source_memory_load(const char *name, const void
*data, int data_size);
+RGBA_Font_Source *evas_common_font_source_load (const char *name);
+RGBA_Font_Source *evas_common_font_source_find (const char *name);
+void evas_common_font_source_free (RGBA_Font_Source *fs);
+void evas_common_font_size_use (RGBA_Font *fn);
+RGBA_Font *evas_common_font_memory_load (const char *name, int size,
const void *data, int data_size);
RGBA_Font *evas_common_font_load (const char *name, int size);
+RGBA_Font *evas_common_font_load_init (RGBA_Font *fn);
void evas_common_font_free (RGBA_Font *fn);
void evas_common_font_modify_cache_by (RGBA_Font *fn, int dir);
int evas_common_font_cache_get (void);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/evas_private.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- evas_private.h 18 Oct 2003 03:34:00 -0000 1.21
+++ evas_private.h 23 Jan 2004 02:14:45 -0000 1.22
@@ -524,6 +524,7 @@
int (*image_cache_get) (void *data);
void *(*font_load) (void *data, char *name, int size);
+ void *(*font_memory_load) (void *data, char *name, int size, const
void *fdata, int fdata_size);
void (*font_free) (void *data, void *font);
int (*font_ascent_get) (void *data, void *font);
int (*font_descent_get) (void *data, void *font);
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
