diff options
| author | Owen Taylor <otaylor@src.gnome.org> | 2002-06-04 00:20:51 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-06-04 00:20:51 +0000 |
| commit | ffcea1aa2e1c0f8a46b26bf90444942c421418ba (patch) | |
| tree | dc6fb251146c49ea7422e05660e4568a8e724e46 /pango/pangoxft-private.h | |
| parent | 8de41bc064a69ead1e38ca8c8b6483bb34b98d64 (diff) | |
| download | pango-ffcea1aa2e1c0f8a46b26bf90444942c421418ba.tar.gz | |
on Jun 3 18:56:09 2002 Owen Taylor <otaylor@redhat.com>
Xft2 and fontconfig conversion, based largely on a patch
from Keith Packard.
* configure.in acconfig.h: Add checks for fontconfig, switch
Xft checks to switch for Xft2 using pkg-config.
* pangoxft.pc.in pangoxft.pc.in
modules/{arabic,basic,hebrew,indic,tamil}/Makefile.am
pango/Makefile.am: Reflect new Xft/fontconfig dependencies.
* pango/pangoxft-private.h pango/pangoxft-fontmap.c
modules/arabic/arabic-xft.c modules/indic/indic-xft.c:
Switch over to using Xft2 and fontconfig.
* pango/pangoft2.c pango/pangoft2-fontmap.c pango/pangoft2-private.h
pango/pango/Makefile.am: Remove usage of mini-xft in
favor of fontconfig.
* pango/pango-ot.h pango/opentype/pango-ot-info.c pango/pangoxft.h
modules/arabic/arabic-{xft,ft2}.c modules/indic/indic-xft.c:
Attach OpenType information directly to the FT_Face
structure using FT_Generic.
* modules/tamil/Makefile.am modules/tamil/tamil-xft.c
configure.in: Remove this module, no longer needed.
* pango/pangoxft-font.c (pango_xft_real_render): Coalesce
calls to Xft rendering functions.
Diffstat (limited to 'pango/pangoxft-private.h')
| -rw-r--r-- | pango/pangoxft-private.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pango/pangoxft-private.h b/pango/pangoxft-private.h index ac0bb44a..ffc5a3c5 100644 --- a/pango/pangoxft-private.h +++ b/pango/pangoxft-private.h @@ -33,12 +33,11 @@ struct _PangoXftFont { PangoFont parent_instance; - XftPattern *font_pattern; + FcPattern *font_pattern; XftFont *xft_font; PangoFont *mini_font; PangoFontMap *fontmap; PangoFontDescription *description; - PangoOTInfo *ot_info; GSList *metrics_by_lang; @@ -50,7 +49,7 @@ struct _PangoXftFont }; PangoXftFont * _pango_xft_font_new (PangoFontMap *font, - XftPattern *pattern); + FcPattern *pattern); void _pango_xft_font_map_cache_add (PangoFontMap *fontmap, PangoXftFont *xfont); void _pango_xft_font_map_add (PangoFontMap *fontmap, @@ -66,7 +65,7 @@ void _pango_xft_font_map_get_info (PangoFontMap *fo Display **display, int *screen); -PangoFontDescription * _pango_xft_font_desc_from_pattern (XftPattern *pattern, +PangoFontDescription * _pango_xft_font_desc_from_pattern (FcPattern *pattern, gboolean include_size); G_END_DECLS |