diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-08-03 02:35:20 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-08-03 02:35:20 +0000 |
| commit | 94f39b93e929db7881070f4b5e1f5dc3c106e3fb (patch) | |
| tree | 1fa92651d4e9d2c7c41d413468f37bdb8095cd52 /pango/pangoxft-private.h | |
| parent | e2ea77ce2f99c122a0087c28fcd9316be4d6e205 (diff) | |
| download | pango-94f39b93e929db7881070f4b5e1f5dc3c106e3fb.tar.gz | |
Make pangoxft depend on pangoft2.
Sat Aug 2 14:33:28 2003 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (libpangoxft_1_0_la_LIBADD): Make
pangoxft depend on pangoft2.
* pango/pangofc-fontmap.[ch]: Make pangofc-fontmap.cI
into a real base class.
* pango/pangofc-font.[ch]: Move some of the pangoxft/
pangoft2 implementation here.
* pango/pangoft2.c pango/pangoft2-fontmap.c
pango/pangoft2-private.h pango/pangoxft-font.c
pango/pangoxft2-fontmap.c pango/pangoxft-private.h: Adapt
to the new scheme
* modules/*/Makefile.am Modules/*/*/*-fc.c: Don't build
separate FT2 and Xft shapers, just build one Fc shaper.
* docs/pango-sections.txt docs/pango-docs.sgml
docs/tmpl/pangofc-font{,map}.sgml: Basic docs for
the new stuff.
* configure.in: Up pango_module_version to 1.4.0.
Diffstat (limited to 'pango/pangoxft-private.h')
| -rw-r--r-- | pango/pangoxft-private.h | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/pango/pangoxft-private.h b/pango/pangoxft-private.h index 0d42ae16..0ffdf6e5 100644 --- a/pango/pangoxft-private.h +++ b/pango/pangoxft-private.h @@ -27,39 +27,26 @@ G_BEGIN_DECLS -typedef struct _PangoXftFont PangoXftFont; +typedef struct _PangoXftFont PangoXftFont; +typedef struct _PangoXftFontMap PangoXftFontMap; struct _PangoXftFont { PangoFcFont parent_instance; - FcPattern *font_pattern; /* fully resolved pattern */ XftFont *xft_font; /* created on demand */ PangoFont *mini_font; /* font used to display missing glyphs */ - PangoFontMap *fontmap; /* associated map */ - PangoFontDescription *description; - - GSList *metrics_by_lang; guint16 mini_width; /* metrics for missing glyph drawing */ guint16 mini_height; guint16 mini_pad; }; -PangoXftFont * _pango_xft_font_new (PangoFontMap *font, - FcPattern *pattern); -void _pango_xft_font_map_add (PangoFontMap *fontmap, - PangoXftFont *xfont); -void _pango_xft_font_map_remove (PangoFontMap *fontmap, - PangoXftFont *xfont); -PangoCoverage *_pango_xft_font_map_get_coverage (PangoFontMap *fontmap, - FcPattern *pattern); -void _pango_xft_font_map_get_info (PangoFontMap *fontmap, - Display **display, - int *screen); - -PangoFontDescription * _pango_xft_font_desc_from_pattern (FcPattern *pattern, - gboolean include_size); +PangoXftFont *_pango_xft_font_new (PangoXftFontMap *xftfontmap, + FcPattern *pattern); +void _pango_xft_font_map_get_info (PangoFontMap *fontmap, + Display **display, + int *screen); G_END_DECLS |