mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-01 01:41:01 -08:00
Code Issues Projects Releases Wiki Activity

(xftfont_open): If one of font's ASCII glyph has

Browse source 
bigger ascent and descent than those of the font, use them as
font's ascent and descent.
This commit is contained in:
Kenichi Handa 2007-06-20 12:10:07 +00:00
parent a850be2ef8
commit 91c5bb27e6
1 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/xftfont.c
View file

@ -223,6 +223,7 @@ xftfont_open (f, entity, pixel_size)
int spacing;
char *name;
int len;
XGlyphInfo extents;
val = AREF (entity, FONT_EXTRA_INDEX);
if (XTYPE (val) != Lisp_Misc
@ -285,26 +286,24 @@ xftfont_open (f, entity, pixel_size)
font->file_name = (char *) file;
font->font.size = xftfont->max_advance_width;
font->font.charset = font->encoding_charset = font->repertory_charset = -1;
font->ascent = xftfont->ascent;
font->descent = xftfont->descent;
font->font.height = xftfont->ascent + xftfont->descent;
if (FcPatternGetInteger (xftfont->pattern, FC_SPACING, 0, &spacing)
!= FcResultMatch)
spacing = FC_PROPORTIONAL;
if (! ascii_printable[0])
{
int i;
for (i = 0; i < 95; i++)
ascii_printable[i] = ' ' + i;
}
if (spacing != FC_PROPORTIONAL)
font->font.average_width = font->font.space_width
= xftfont->max_advance_width;
{
font->font.average_width = font->font.space_width
= xftfont->max_advance_width;
XftTextExtents8 (display, xftfont, ascii_printable + 1, 94, &extents);
}
else
{
XGlyphInfo extents;
if (! ascii_printable[0])
{
int i;
for (i = 0; i < 95; i++)
ascii_printable[i] = ' ' + i;
}
XftTextExtents8 (display, xftfont, ascii_printable, 1, &extents);
font->font.space_width = extents.xOff;
if (font->font.space_width <= 0)
@ -315,6 +314,14 @@ xftfont_open (f, entity, pixel_size)
}
UNBLOCK_INPUT;
font->ascent = xftfont->ascent;
if (font->ascent < extents.y)
font->ascent = extents.y;
font->descent = xftfont->descent;
if (font->descent < extents.height - extents.y)
font->descent = extents.height - extents.y;
font->font.height = font->ascent + font->descent;
/* Unfortunately Xft doesn't provide a way to get minimum char
width. So, we use space_width instead. */
font->min_width = font->font.space_width;
@ -326,9 +333,9 @@ xftfont_open (f, entity, pixel_size)
/* Setup pseudo XFontStruct */
xfont->fid = xftfont_default_fid (f);
xfont->ascent = xftfont->ascent;
xfont->descent = xftfont->descent;
xfont->max_bounds.descent = xftfont->descent;
xfont->ascent = font->ascent;
xfont->descent = font->descent;
xfont->max_bounds.descent = font->descent;
xfont->max_bounds.width = xftfont->max_advance_width;
xfont->min_bounds.width = font->font.space_width;
font->font.font = xfont;