diff options
author | Chong Yidong <cyd@gnu.org> | 2012-08-16 14:35:13 +0800 |
---|---|---|
committer | Chong Yidong <cyd@gnu.org> | 2012-08-16 14:35:13 +0800 |
commit | 032a42c88d421ee434e783e29bf2cde3d6a81e7b (patch) | |
tree | 24fa7910668c8e4c92da4cd50d753a9a0358c64d /src/font.h | |
parent | 1c308380b6f29e389dc10d418b9203a74d64dce2 (diff) | |
download | emacs-032a42c88d421ee434e783e29bf2cde3d6a81e7b.tar.gz |
For Xft and X font backends, set omitted max_width font fields.
* src/xfont.c (xfont_open):
* src/xftfont.c (xftfont_open): Set the font's max_width field.
* src/font.h (struct font): Update comments.
Diffstat (limited to 'src/font.h')
-rw-r--r-- | src/font.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/font.h b/src/font.h index 3e9af6df235..6e9387f7632 100644 --- a/src/font.h +++ b/src/font.h @@ -284,8 +284,11 @@ struct font /* Beyond here, there should be no more Lisp_Object components. */ - /* Maximum bound width over all existing characters of the font. On - X window, this is same as (font->max_bounds.width). */ + /* Minimum and maximum glyph widths, in pixels. Some font backends, + such as xft, lack the information to easily compute minimum and + maximum widths over all characters; in that case, these values + are approximate. */ + int min_width; int max_width; /* By which pixel size the font is opened. */ @@ -301,13 +304,10 @@ struct font /* Average width of glyphs in the font. If the font itself doesn't have that information but has glyphs of ASCII characters, the - value is the average with of those glyphs. Otherwise, the value + value is the average width of those glyphs. Otherwise, the value is 0. */ int average_width; - /* Minimum glyph width (in pixels). */ - int min_width; - /* Ascent and descent of the font (in pixels). */ int ascent, descent; |