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-private.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-private.h')
| -rw-r--r-- | pango/pangoxft-private.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pango/pangoxft-private.h b/pango/pangoxft-private.h index cfd0b3fb..6a8a08af 100644 --- a/pango/pangoxft-private.h +++ b/pango/pangoxft-private.h @@ -22,13 +22,12 @@ #ifndef __PANGOXFT_PRIVATE_H__ #define __PANGOXFT_PRIVATE_H__ -#include <pangoxft.h> -#include <pango-ot.h> +#include "pangoxft.h" +#include "pango-renderer.h" G_BEGIN_DECLS -typedef struct _PangoXftFont PangoXftFont; -typedef struct _PangoXftFontMap PangoXftFontMap; +#define PANGO_XFT_UNKNOWN_FLAG 0x10000000 struct _PangoXftFont { @@ -49,10 +48,15 @@ struct _PangoXftFont PangoXftFont *_pango_xft_font_new (PangoXftFontMap *xftfontmap, FcPattern *pattern); + void _pango_xft_font_map_get_info (PangoFontMap *fontmap, Display **display, int *screen); +PangoRenderer *_pango_xft_font_map_get_renderer (PangoXftFontMap *xftfontmap); + +PangoFont *_pango_xft_font_get_mini_font (PangoXftFont *xfont); + G_END_DECLS #endif /* __PANGOXFT_PRIVATE_H__ */ |