Enlightenment CVS committal
Author : kwo
Project : e17
Module : libs/imlib2
Dir : e17/libs/imlib2/src/lib
Modified Files:
Imlib2.h api.c font.h font_draw.c font_load.c font_query.c
Log Message:
Mark some (new) functions deprecated as they are likely to be removed (see bug
118).
Change some names to match coding style a bit more.
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/lib/Imlib2.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Imlib2.h 23 Jul 2007 14:27:44 -0000 1.6
+++ Imlib2.h 27 Jul 2007 18:46:11 -0000 1.7
@@ -327,10 +327,12 @@
/* fonts and text */
EAPI Imlib_Font imlib_load_font(const char *font_name);
EAPI void imlib_free_font(void);
+ /* NB! The four functions below are deprecated. */
EAPI int imlib_insert_font_into_fallback_chain(Imlib_Font font, Imlib_Font
fallback_font);
EAPI void imlib_remove_font_from_fallback_chain(Imlib_Font fallback_font);
EAPI Imlib_Font imlib_get_prev_font_in_fallback_chain(Imlib_Font fn);
EAPI Imlib_Font imlib_get_next_font_in_fallback_chain(Imlib_Font fn);
+ /* NB! The four functions above are deprecated. */
EAPI void imlib_text_draw(int x, int y, const char *text);
EAPI void imlib_text_draw_with_return_metrics(int x, int y, const char
*text,
int *width_return,
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/lib/api.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- api.c 27 Jul 2007 17:26:58 -0000 1.17
+++ api.c 27 Jul 2007 18:46:11 -0000 1.18
@@ -3118,6 +3118,8 @@
* removed from any chain it's already in.
* A fallback font may be a member of only one chain. Adding it as the
* fallback font to another font will remove it from it's first fallback chain.
+ *
+ * @deprecated This function may be removed.
**/
EAPI int
imlib_insert_font_into_fallback_chain(Imlib_Font font, Imlib_Font
fallback_font)
@@ -3126,7 +3128,7 @@
"font", font, 1);
CHECK_PARAM_POINTER_RETURN("imlib_insert_font_into_fallback_chain",
"fallback_font", fallback_font, 1);
- return imlib_insert_font_into_fallback_chain_imp(font, fallback_font);
+ return imlib_font_insert_into_fallback_chain_imp(font, fallback_font);
}
/**
@@ -3136,15 +3138,20 @@
* This removes the given font from any fallback chain it may be in.
* Removing this font joins its previous and next font together in the fallback
* chain.
+ *
+ * @deprecated This function may be removed.
**/
EAPI void
imlib_remove_font_from_fallback_chain(Imlib_Font fallback_font)
{
CHECK_PARAM_POINTER("imlib_remove_font_from_fallback_chain",
"fallback_font", fallback_font);
- imlib_remove_font_from_fallback_chain_imp(fallback_font);
+ imlib_font_remove_from_fallback_chain_imp(fallback_font);
}
+/**
+ * @deprecated This function may be removed.
+ **/
EAPI Imlib_Font
imlib_get_prev_font_in_fallback_chain(Imlib_Font fn)
{
@@ -3153,6 +3160,9 @@
return ((ImlibFont *) fn)->fallback_prev;
}
+/**
+ * @deprecated This function may be removed.
+ **/
EAPI Imlib_Font
imlib_get_next_font_in_fallback_chain(Imlib_Font fn)
{
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/lib/font.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- font.h 23 Jul 2007 14:27:44 -0000 1.4
+++ font.h 27 Jul 2007 18:46:11 -0000 1.5
@@ -79,8 +79,9 @@
ImlibFont *imlib_font_load_joined(const char *name);
ImlibFont *imlib_font_load(const char *name, int size);
void imlib_font_free(ImlibFont * fn);
-int imlib_insert_font_into_fallback_chain_imp(ImlibFont * fn,
ImlibFont *fallback);
-void imlib_remove_font_from_fallback_chain_imp(ImlibFont * fn);
+int imlib_font_insert_into_fallback_chain_imp(ImlibFont * fn,
+ ImlibFont *
fallback);
+void imlib_font_remove_from_fallback_chain_imp(ImlibFont * fn);
int imlib_font_cache_get(void);
void imlib_font_cache_set(int size);
void imlib_font_flush(void);
@@ -88,6 +89,7 @@
void imlib_font_modify_cache_by(ImlibFont * fn, int dir);
void imlib_font_flush_last(void);
ImlibFont *imlib_font_find(const char *name, int size);
+ImlibFont *imlib_font_find_glyph(ImlibFont * fn, int gl, int
*ret_index);
void imlib_font_query_size(ImlibFont * fn, const char *text,
int *w, int *h);
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/lib/font_draw.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- font_draw.c 27 Jul 2007 17:26:58 -0000 1.11
+++ font_draw.c 27 Jul 2007 18:46:11 -0000 1.12
@@ -253,7 +253,7 @@
* ret_index will be set to 0
*/
ImlibFont *
-imlib_find_glyph_in_font_chain(ImlibFont * first_fn, int gl, int *ret_index)
+imlib_font_find_glyph(ImlibFont * first_fn, int gl, int *ret_index)
{
ImlibFont *fn = first_fn;
@@ -347,7 +347,7 @@
gl = imlib_font_utf8_get_next((unsigned char *)text, &chr);
if (gl == 0)
break;
- fn_in_chain = imlib_find_glyph_in_font_chain(fn, gl, &index);
+ fn_in_chain = imlib_font_find_glyph(fn, gl, &index);
if ((use_kerning) && (prev_index) && (index))
{
FT_Vector delta;
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/lib/font_load.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- font_load.c 27 Jul 2007 17:26:58 -0000 1.5
+++ font_load.c 27 Jul 2007 18:46:11 -0000 1.6
@@ -204,14 +204,14 @@
}
int
-imlib_insert_font_into_fallback_chain_imp(ImlibFont * fn, ImlibFont * fallback)
+imlib_font_insert_into_fallback_chain_imp(ImlibFont * fn, ImlibFont * fallback)
{
/* avoid infinite recursion */
if (fn == fallback)
return 1;
/* now remove the given fallback font from any chain it's already in */
- imlib_remove_font_from_fallback_chain_imp(fallback);
+ imlib_font_remove_from_fallback_chain_imp(fallback);
/* insert fallback into fn's font chain */
ImlibFont *tmp = fn->fallback_next;
@@ -225,7 +225,7 @@
}
void
-imlib_remove_font_from_fallback_chain_imp(ImlibFont * fn)
+imlib_font_remove_from_fallback_chain_imp(ImlibFont * fn)
{
/* if fn has a previous font in its font chain, then make its fallback_next
fn's fallback_next since fn is going away */
if (fn->fallback_prev)
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/lib/font_query.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- font_query.c 27 Jul 2007 17:26:58 -0000 1.5
+++ font_query.c 27 Jul 2007 18:46:11 -0000 1.6
@@ -15,8 +15,6 @@
#include "rgbadraw.h"
#include "rotate.h"
-extern ImlibFont *imlib_find_glyph_in_font_chain(ImlibFont * first_fn, int
gl, int *ret_index); /* defined in font_draw.c */
-
extern FT_Library ft_lib;
/* string extents */
@@ -46,7 +44,7 @@
gl = imlib_font_utf8_get_next((unsigned char *)text, &chr);
if (gl == 0)
break;
- fn_in_chain = imlib_find_glyph_in_font_chain(fn, gl, &index);
+ fn_in_chain = imlib_font_find_glyph(fn, gl, &index);
if ((use_kerning) && (prev_index) && (index))
{
FT_Vector delta;
@@ -93,7 +91,7 @@
gl = imlib_font_utf8_get_next((unsigned char *)text, &chr);
if (gl == 0)
return 0;
- fn_in_chain = imlib_find_glyph_in_font_chain(fn, gl, &index);
+ fn_in_chain = imlib_font_find_glyph(fn, gl, &index);
fg = imlib_font_cache_glyph_get(fn_in_chain, index);
if (!fg)
return 0;
@@ -127,7 +125,7 @@
gl = imlib_font_utf8_get_next((unsigned char *)text, &chr);
if (gl == 0)
break;
- fn_in_chain = imlib_find_glyph_in_font_chain(fn, gl, &index);
+ fn_in_chain = imlib_font_find_glyph(fn, gl, &index);
if ((use_kerning) && (prev_index) && (index))
{
FT_Vector delta;
@@ -186,7 +184,7 @@
gl = imlib_font_utf8_get_next((unsigned char *)text, &chr);
if (gl == 0)
break;
- fn_in_chain = imlib_find_glyph_in_font_chain(fn, gl, &index);
+ fn_in_chain = imlib_font_find_glyph(fn, gl, &index);
kern = 0;
if ((use_kerning) && (prev_index) && (index))
{
@@ -269,7 +267,7 @@
gl = imlib_font_utf8_get_next((unsigned char *)text, &chr);
if (gl == 0)
break;
- fn_in_chain = imlib_find_glyph_in_font_chain(fn, gl, &index);
+ fn_in_chain = imlib_font_find_glyph(fn, gl, &index);
kern = 0;
if ((use_kerning) && (prev_index) && (index))
{
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
