diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-09-24 17:40:46 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-09-24 17:40:46 +0000 |
| commit | 0b140650f239bd8fec38c9e5a2d09e95dd8440c0 (patch) | |
| tree | f5e9cda843855b2f5fbd2be472269660ead9aac3 /pango/pangoxft.h | |
| parent | 763ab93cb59c0f3ff1b540afbbe1b5a689d2a4fb (diff) | |
| download | pango-0b140650f239bd8fec38c9e5a2d09e95dd8440c0.tar.gz | |
Up version to 1.7.0.
Fri Sep 24 12:59:22 2004 Owen Taylor <otaylor@redhat.com>
* configure.in: Up version to 1.7.0.
* pango/pango-renderer.[ch] pango/pango.h pango/Makefile.am:
Add PangoRenderer, a base class that is subclassed to produce
rendering drivers for different backends and purposes.
* pango/pangoft2-private.h pango/pangoft2-render.c
pango/pangoft2.c: Move rendering into pangoft2-render.c,
use PangoRenderer.
* pango/pangoft2-fontmap.c pango/pangoft2-private.h: Add
_pango_ft2_font_map_get_renderer() to retrieve a singleton
fontmap for the fontmap.
* pango/pangoxft-render.[ch] pango/pangoxft.c pango/Makefile.am:
Make Xft rendering use PangoRenderer, add publically
visible, subclassable PangoXftRenderer.
* pango/pangoxft-fontmap.c pango/pangoxft-private.h: Add
_pango_xft_font_map_get_renderer() to retrieve a singleton
fontmap for the fontmap.
* examples/xftview.c examples/Makefile.am: Add a test program
using the Xft backend.
* docs/*: Update minimally for PangoRenderer.
Diffstat (limited to 'pango/pangoxft.h')
| -rw-r--r-- | pango/pangoxft.h | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/pango/pangoxft.h b/pango/pangoxft.h index 3f6ecfd5..52c1d496 100644 --- a/pango/pangoxft.h +++ b/pango/pangoxft.h @@ -26,22 +26,23 @@ #include <pango/pango-context.h> #include <pango/pango-ot.h> #include <pango/pangofc-font.h> +#include <pango/pango-layout.h> +#include <pango/pangoxft-render.h> 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 - #ifndef PANGO_DISABLE_DEPRECATED #define PANGO_RENDER_TYPE_XFT "PangoRenderXft" #endif +#define PANGO_TYPE_XFT_FONT_MAP (pango_xft_font_map_get_type ()) +#define PANGO_XFT_FONT_MAP(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT_MAP, PangoXftFontMap)) +#define PANGO_XFT_IS_FONT_MAP(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT_MAP)) + +typedef struct _PangoXftFontMap PangoXftFontMap; + +typedef struct _PangoXftFont PangoXftFont; + typedef void (*PangoXftSubstituteFunc) (FcPattern *pattern, gpointer data); @@ -54,20 +55,6 @@ PangoContext *pango_xft_get_context (Display *display, void pango_xft_shutdown_display (Display *display, int screen); -void pango_xft_render (XftDraw *draw, - XftColor *color, - PangoFont *font, - PangoGlyphString *glyphs, - gint x, - gint y); -void pango_xft_picture_render (Display *display, - Picture src_picture, - Picture dest_picture, - PangoFont *font, - PangoGlyphString *glyphs, - gint x, - gint y); - void pango_xft_set_default_substitute (Display *display, int screen, PangoXftSubstituteFunc func, @@ -76,6 +63,9 @@ void pango_xft_set_default_substitute (Display *display, void pango_xft_substitute_changed (Display *display, int screen); +GType pango_xft_font_map_get_type (void); + +#define PANGO_XFT_FONT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_XFT_FONT, PangoXftFont)) #define PANGO_TYPE_XFT_FONT (pango_xft_font_get_type ()) #define PANGO_XFT_IS_FONT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_XFT_FONT)) |