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/pangoft2-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/pangoft2-private.h')
| -rw-r--r-- | pango/pangoft2-private.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pango/pangoft2-private.h b/pango/pangoft2-private.h index cbc06aac..6865a8db 100644 --- a/pango/pangoft2-private.h +++ b/pango/pangoft2-private.h @@ -25,7 +25,7 @@ #include "pango-modules.h" #include "pangoft2.h" -#include "mini-xft/MiniXft.h" +#include <fontconfig/fontconfig.h> /* Debugging... */ /*#define DEBUGGING 1*/ @@ -63,7 +63,7 @@ struct _PangoFT2Font { PangoFont font; - MiniXftPattern *font_pattern; + FcPattern *font_pattern; FT_Face face; int size; @@ -97,7 +97,7 @@ struct _PangoFT2Face }; PangoFT2Font * _pango_ft2_font_new (PangoFontMap *font, - MiniXftPattern *pattern); + FcPattern *pattern); PangoMap *_pango_ft2_get_shaper_map (PangoLanguage *language); void _pango_ft2_font_map_set_coverage (PangoFontMap *fontmap, const char *name, @@ -116,7 +116,7 @@ void _pango_ft2_font_map_add (PangoFontMap *fontmap, void _pango_ft2_font_map_remove (PangoFontMap *fontmap, PangoFT2Font *ft2font); const char *_pango_ft2_ft_strerror (FT_Error error); -PangoFontDescription *_pango_ft2_font_desc_from_pattern (MiniXftPattern *pattern, +PangoFontDescription *_pango_ft2_font_desc_from_pattern (FcPattern *pattern, gboolean include_size); void *pango_ft2_font_get_cache_glyph_data (PangoFont *font, @@ -127,6 +127,6 @@ void pango_ft2_font_set_cache_glyph_data (PangoFont *font, void pango_ft2_font_set_glyph_cache_destroy (PangoFont *font, GDestroyNotify destroy_notify); - +void pango_ft2_default_substitute (FcPattern *pattern); #endif /* __PANGOFT2_PRIVATE_H__ */ |