diff options
| author | Kenichi Handa <handa@m17n.org> | 2010-10-15 16:49:11 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2010-10-15 16:49:11 +0900 |
| commit | 31daa5e17c73c0830ef5094eb38702450965a938 (patch) | |
| tree | 91455108b7f9a19719cee3f47c6fd1509a215207 | |
| parent | e6673d01cab4b7a380367749e8401e66f14b5cd7 (diff) | |
| download | emacs-31daa5e17c73c0830ef5094eb38702450965a938.tar.gz | |
Fix incorrect font metrics when the same font is opened with different pixelsizes.
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/xftfont.c | 21 |
2 files changed, 30 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 40c0cb231e4..46913c8a8b0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2010-10-15 Kenichi Handa <handa@m17n.org> + + Fix incorrect font metrics when the same font is opened with + different pixelsizes. + + * xftfont.c: Include composite.h. + (xftfont_shape): New function. + (syms_of_xftfont): Set xftfont_driver.shape. + 2010-10-13 Damyan Pepper <damyanp@gmail.com> Fix handling of font properties on Windows (bug#6303). diff --git a/src/xftfont.c b/src/xftfont.c index 197cc9c1f5b..71fd1475280 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -32,6 +32,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "blockinput.h" #include "character.h" #include "charset.h" +#include "composite.h" #include "fontset.h" #include "font.h" #include "ftfont.h" @@ -702,6 +703,23 @@ xftfont_draw (s, from, to, x, y, with_background) return len; } +Lisp_Object +xftfont_shape (Lisp_Object lgstring) +{ + struct font *font; + struct xftfont_info *xftfont_info; + FT_Face ft_face; + Lisp_Object val; + + CHECK_FONT_GET_OBJECT (LGSTRING_FONT (lgstring), font); + xftfont_info = (struct xftfont_info *) font; + ft_face = XftLockFace (xftfont_info->xftfont); + xftfont_info->ft_size = ft_face->size; + val = ftfont_driver.shape (lgstring); + XftUnlockFace (xftfont_info->xftfont); + return val; +} + static int xftfont_end_for_frame (f) FRAME_PTR f; @@ -796,6 +814,9 @@ syms_of_xftfont () xftfont_driver.draw = xftfont_draw; xftfont_driver.end_for_frame = xftfont_end_for_frame; xftfont_driver.cached_font_ok = xftfont_cached_font_ok; +#if defined (HAVE_M17N_FLT) && defined (HAVE_LIBOTF) + xftfont_driver.shape = xftfont_shape; +#endif register_font_driver (&xftfont_driver, NULL); } |