diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-02-17 22:04:29 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-02-17 22:04:29 +0000 |
| commit | 411bd8c907fbf018a8d7529b6a858a8c11f87bd3 (patch) | |
| tree | 12408b3fbbaaca409e202dab63eecc3e5e2c8712 /pango/pangoxft-fontmap.c | |
| parent | 837fdf20fad1c7d3302f5ccf2fb9eada57a6067d (diff) | |
| download | pango-411bd8c907fbf018a8d7529b6a858a8c11f87bd3.tar.gz | |
Add an --enable-debug configure argument defaulting to 'yes' for unstable
Mon Feb 17 13:06:39 2003 Owen Taylor <otaylor@redhat.com>
* configure.in **/Makefile.am: Add an --enable-debug
configure argument defaulting to 'yes' for unstable
releases and 'minimum' for stable releases.
For minimum, -DG_DISABLE_CAST_CHECKS.
* pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c
pango/pangoxft-fontmap.c: Add caching of fontsets
(#104495, initial patch and review by Soeren Sandmann)
* pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c
pango/pangoxft-fontmap.c pango/pangoft2-private.h
pango/pangoxft-private.h: Remove cache of recently freed
fonts; not necessary now that we cache fontsets.
* pango/pangofc-fontmap.cI (pango_fc_pattern_set_free):
Rename from pango_fc_font_set_free to reflect
what it actually does.
* pango/pangofc-fontmap.cI pango/pangoft-fontmap.c
pango/pangoxft-fontmap.c: Combine clear-the-cache
functions; we didn't need separate clear-the-font-cache
and clear-the-pattern-cache functions.
Diffstat (limited to 'pango/pangoxft-fontmap.c')
| -rw-r--r-- | pango/pangoxft-fontmap.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pango/pangoxft-fontmap.c b/pango/pangoxft-fontmap.c index 8b2030de..c7b16995 100644 --- a/pango/pangoxft-fontmap.c +++ b/pango/pangoxft-fontmap.c @@ -52,7 +52,8 @@ struct _PangoXftFontMap GHashTable *coverage_hash; /* Maps font file name/id -> PangoCoverage */ GHashTable *fonts; /* Maps XftPattern -> PangoXftFont */ - GQueue *freed_fonts; /* Fonts in fonts that has been freed */ + + GQueue *fontset_cache; /* Recently used fontsets */ /* List of all families availible */ PangoXftFamily **families; @@ -84,8 +85,6 @@ struct _PangoXftFontMap #define pango_fc_font_map_get_type pango_xft_font_map_get_type #define _pango_fc_font_map_add _pango_xft_font_map_add #define _pango_fc_font_map_remove _pango_xft_font_map_remove -#define _pango_fc_font_map_cache_add _pango_xft_font_map_cache_add -#define _pango_fc_font_map_cache_remove _pango_xft_font_map_cache_remove #define _pango_fc_font_map_get_coverage _pango_xft_font_map_get_coverage #define _pango_fc_font_map_set_coverage _pango_xft_font_map_set_coverage #define _pango_fc_font_desc_from_pattern _pango_xft_font_desc_from_pattern @@ -293,7 +292,7 @@ pango_xft_set_default_substitute (Display *display, xftfontmap->substitute_data = data; xftfontmap->substitute_destroy = notify; - pango_fc_clear_fontset_hash_list (xftfontmap); + pango_fc_font_map_cache_clear (xftfontmap); } /** @@ -315,7 +314,7 @@ pango_xft_substitute_changed (Display *display, { PangoXftFontMap *xftfontmap = (PangoXftFontMap *)pango_xft_get_font_map (display, screen); - pango_fc_clear_fontset_hash_list (xftfontmap); + pango_fc_font_map_cache_clear (xftfontmap); } void |