diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2013-09-15 19:58:46 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2013-09-15 19:58:46 +0200 |
| commit | 3fa2054efdfa3c22456072254e6c67682a595233 (patch) | |
| tree | f882ecc281d2ac5d5aefd27e2c22ece5a0bb0ca4 /src/font.h | |
| parent | c089653d568d5c696f2d35e1bcf9bba64af85b97 (diff) | |
| download | emacs-3fa2054efdfa3c22456072254e6c67682a595233.tar.gz | |
Port the font backend from the Mac port.
* configure.ac: Add check for OSX 10.5, required for macfont.o.
* etc/NEWS: Mention the macfont backend.
* src/Makefile.in (NS_OBJ, SOME_MACHINE_OBJECTS): Add macfont.o.
* src/font.c (syms_of_font): Call syms_of_macfont.
* src/font.h: Declare syms_of_macfont.
* src/nsfns.m: Include macfont.h.
(Fx_create_frame): Register macfont driver, make a better default font.
(Fns_popup_font_panel): Get font from macfont driver, if used.
* src/nsfont.m (ns_tmp_flags, ns_tmp_font): Remove.
(nsfont_open): Set font driver type.
Set font->ascent and font->descent. Figure out font instead of
ns_tmp_font, and flags instead of ns_tmp_flags.
Fix indentation. Remove call to ns_draw_text_decoration,
moved to nsterm.
* src/nsterm.m: Include macfont.h.
(ns_tmp_flags, ns_tmp_font): Remove.
(ns_compute_glyph_string_overhangs): Check for driver Qns.
(ns_draw_glyph_string): Use local variables instead of ns_tmp_flags,
ns_tmp_font. Call ns_draw_text_decoration here instead of nsfont.m.
(changeFont:): Fix code style. Check for font driver type when
getiing font.
* src/nsterm.h (FONT_DESCENT, FONT_ASCENT): Define to (f)->ascent and
(f)->descent.
Diffstat (limited to 'src/font.h')
| -rw-r--r-- | src/font.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/font.h b/src/font.h index 3e0d97baaac..0ec56590916 100644 --- a/src/font.h +++ b/src/font.h @@ -825,6 +825,7 @@ extern void syms_of_w32font (void); extern Lisp_Object Qfontsize; extern struct font_driver nsfont_driver; extern void syms_of_nsfont (void); +extern void syms_of_macfont (void); #endif /* HAVE_NS */ #ifndef FONT_DEBUG |