hugok
/
e16
forked from e16/e16
1
0
Fork 0
Code Pull Requests Activity

Fix/align dox/src imlib2 TT font rendering stuff. 

SVN revision: 10594
This commit is contained in:
Kim Woelders 2004-06-26 20:27:31 +00:00
parent d0ec08a239
commit 190bdcc4d8
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dox/dox.h
View File

@ -283,10 +283,10 @@ void Efont_extents(Efont * f, const char *text,
int *max_ascent_return,
int *max_descent_return,
int *lbearing_return, int *rbearing_return);
Efont *Efont_load(char *file, int size);
Efont *Efont_load(const char *file, int size);
void Efont_free(Efont * f);
void EFont_draw_string(Display * disp, Drawable win, GC gc,
int x, int y, char *text,
int x, int y, const char *text,
Efont * font, Visual * vis, Colormap cm);
void TextStateLoadFont(TextState * ts);

25
dox/ttfont.c
View File

@ -44,8 +44,9 @@ ImlibSetFgColorFromGC(Display * dpy, GC gc, Colormap cm)
}
void
EFont_draw_string(Display * dpy, Drawable win, GC gc, int x, int y, char *text,
Efont * f, Visual * vis __UNUSED__, Colormap cm)
EFont_draw_string(Display * dpy, Drawable win, GC gc, int x, int y,
const char *text, Efont * f, Visual * vis __UNUSED__,
Colormap cm)
{
Imlib_Image im;
int w, h, ascent, descent;
@ -77,7 +78,7 @@ Efont_free(Efont * f)
}
Efont *
Efont_load(char *file, int size)
Efont_load(const char *file, int size)
{
char s[4096];
Efont *f;
@ -100,13 +101,15 @@ Efont_extents(Efont * f, const char *text, int *font_ascent_return,
int *max_ascent_return, int *max_descent_return,
int *lbearing_return __UNUSED__, int *rbearing_return __UNUSED__)
{
int height;
int w, h;
if (!f)
return;
imlib_context_set_font(f->face);
imlib_get_text_size(text, width_return, &height);
imlib_get_text_advance(text, &w, &h);
if (width_return)
*width_return = w;
if (font_ascent_return)
*font_ascent_return = imlib_get_font_ascent();
if (font_descent_return)
@ -370,7 +373,7 @@ destroy_font_raster(TT_Raster_Map * rmap)
}
static TT_Raster_Map *
calc_size(Efont * f, int *width, int *height, char *text)
calc_size(Efont * f, int *width, int *height, const char *text)
{
int i, upm, ascent, descent, pw, ph;
TT_Instance_Metrics imetrics;
@ -413,8 +416,8 @@ calc_size(Efont * f, int *width, int *height, char *text)
}
static void
render_text(TT_Raster_Map * rmap, TT_Raster_Map * rchr, Efont * f, char *text,
int *xor, int *yor)
render_text(TT_Raster_Map * rmap, TT_Raster_Map * rchr, Efont * f,
const char *text, int *xor, int *yor)
{
TT_Glyph_Metrics metrics;
TT_Instance_Metrics imetrics;
@ -739,8 +742,8 @@ handle_x_error(Display * d, XErrorEvent * ev)
}
void
EFont_draw_string(Display * disp, Drawable win, GC gc, int x, int y, char *text,
Efont * f, Visual * vis, Colormap cm)
EFont_draw_string(Display * disp, Drawable win, GC gc, int x, int y,
const char *text, Efont * f, Visual * vis, Colormap cm)
{
XImage *xim;
XShmSegmentInfo shminfo;
@ -1005,7 +1008,7 @@ Efont_free(Efont * f)
}
Efont *
Efont_load(char *file, int size)
Efont_load(const char *file, int size)
{
TT_Error error;
TT_Glyph_Metrics metrics;

14
src/ttfont.c
View File

@ -45,7 +45,8 @@ ImlibSetFgColorFromGC(Display * dpy, GC gc, Colormap cm)
void
EFont_draw_string(Display * dpy, Drawable win, GC gc, int x, int y,
const char *text, Efont * f, Visual * vis, Colormap cm)
const char *text, Efont * f, Visual * vis __UNUSED__,
Colormap cm)
{
Imlib_Image im;
int w, h, ascent, descent;
@ -62,8 +63,6 @@ EFont_draw_string(Display * dpy, Drawable win, GC gc, int x, int y,
imlib_text_draw(0, 0, text);
imlib_render_image_on_drawable(x, y - ascent);
imlib_free_image();
return;
vis = NULL;
}
void
@ -100,7 +99,7 @@ void
Efont_extents(Efont * f, const char *text, int *font_ascent_return,
int *font_descent_return, int *width_return,
int *max_ascent_return, int *max_descent_return,
int *lbearing_return, int *rbearing_return)
int *lbearing_return __UNUSED__, int *rbearing_return __UNUSED__)
{
int w, h;
@ -109,7 +108,8 @@ Efont_extents(Efont * f, const char *text, int *font_ascent_return,
imlib_context_set_font(f->face);
imlib_get_text_advance(text, &w, &h);
*width_return = w;
if (width_return)
*width_return = w;
if (font_ascent_return)
*font_ascent_return = imlib_get_font_ascent();
if (font_descent_return)
@ -118,10 +118,6 @@ Efont_extents(Efont * f, const char *text, int *font_ascent_return,
*max_ascent_return = imlib_get_maximum_font_ascent();
if (max_descent_return)
*max_descent_return = imlib_get_maximum_font_descent();
return;
lbearing_return = NULL;
rbearing_return = NULL;
}
#else /* USE_IMLIB1 */