forked from old/legacy-imlib2
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. SVN revision: 31021
This commit is contained in:
parent
275d89b1d9
commit
1d74ab1d33
|
@ -327,10 +327,12 @@ extern "C"
|
|||
/* 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,
|
||||
|
|
|
@ -3118,6 +3118,8 @@ imlib_free_font(void)
|
|||
* 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 @@ imlib_insert_font_into_fallback_chain(Imlib_Font font, Imlib_Font fallback_font)
|
|||
"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 @@ imlib_insert_font_into_fallback_chain(Imlib_Font font, Imlib_Font fallback_font)
|
|||
* 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 @@ imlib_get_prev_font_in_fallback_chain(Imlib_Font fn)
|
|||
return ((ImlibFont *) fn)->fallback_prev;
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated This function may be removed.
|
||||
**/
|
||||
EAPI Imlib_Font
|
||||
imlib_get_next_font_in_fallback_chain(Imlib_Font fn)
|
||||
{
|
||||
|
|
|
@ -79,8 +79,9 @@ char **imlib_font_list_fonts(int *num_ret);
|
|||
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_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);
|
||||
|
|
|
@ -253,7 +253,7 @@ imlib_render_str(ImlibImage * im, ImlibFont * fn, int drx, int dry,
|
|||
* 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 @@ imlib_font_draw(ImlibImage * dst, DATA32 col, ImlibFont * fn, int x, int y,
|
|||
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;
|
||||
|
|
|
@ -204,14 +204,14 @@ imlib_font_free(ImlibFont * fn)
|
|||
}
|
||||
|
||||
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 @@ imlib_insert_font_into_fallback_chain_imp(ImlibFont * fn, ImlibFont * fallback)
|
|||
}
|
||||
|
||||
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)
|
||||
|
|
|
@ -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 @@ imlib_font_query_size(ImlibFont * fn, const char *text, int *w, int *h)
|
|||
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 @@ imlib_font_query_inset(ImlibFont * fn, const char *text)
|
|||
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 @@ imlib_font_query_advance(ImlibFont * fn, const char *text, int *h_adv,
|
|||
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 @@ imlib_font_query_char_coords(ImlibFont * fn, const char *text, int pos,
|
|||
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 @@ imlib_font_query_text_at_pos(ImlibFont * fn, const char *text, int x, int y,
|
|||
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))
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue