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.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.h')
| -rw-r--r-- | pango/pangoxft.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pango/pangoxft.h b/pango/pangoxft.h index f2c07edc..a268351f 100644 --- a/pango/pangoxft.h +++ b/pango/pangoxft.h @@ -28,8 +28,14 @@ G_BEGIN_DECLS +#define _XFT_NO_COMPAT +#define _XFTCOMPAT_H_ #include <X11/Xlib.h> #include <X11/Xft/Xft.h> +#if defined(XftVersion) && XftVersion >= 20000 +#else +#error "must have Xft version 2 or newer" +#endif #define PANGO_RENDER_TYPE_XFT "PangoRenderXft" @@ -61,11 +67,12 @@ GType pango_xft_font_get_type (void); #ifdef PANGO_ENABLE_ENGINE XftFont * pango_xft_font_get_font (PangoFont *font); -FT_Face pango_xft_font_get_face (PangoFont *font); +FT_Face pango_xft_font_lock_face (PangoFont *font); +void pango_xft_font_unlock_face (PangoFont *font); +guint pango_xft_font_get_glyph (PangoFont *font, gunichar wc); Display * pango_xft_font_get_display (PangoFont *font); PangoGlyph pango_xft_font_get_unknown_glyph (PangoFont *font, gunichar wc); -PangoOTInfo * pango_xft_font_get_ot_info (PangoFont *font); #endif /* PANGO_ENABLE_ENGINE */ G_END_DECLS |