diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-05-28 02:11:42 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-05-28 02:11:42 +0000 |
| commit | 987301d5df4f16a1df132e2b4c4dd8a94b708ce2 (patch) | |
| tree | 855b25d0004f50ae02b25ba604eeb3a1160fff71 /pango/pangox.c | |
| parent | 2c10e7197f33eb1bf6d8771de13b241263dc041b (diff) | |
| download | pango-987301d5df4f16a1df132e2b4c4dd8a94b708ce2.tar.gz | |
Install pango-fontmap.h.
Sat May 27 22:05:53 2000 Owen Taylor <otaylor@redhat.com>
* pango/Makefile.am (pangoinclude_HEADERS): Install
pango-fontmap.h.
* pango/pangox-fontcache.c pango/pangox.h: Add a simple
cache from XLFD => font struct.
* pango/pango-fontmap.c: Use this when loading and unloading
fonts.
Diffstat (limited to 'pango/pangox.c')
| -rw-r--r-- | pango/pangox.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pango/pangox.c b/pango/pangox.c index c08d26aa..26b5a31b 100644 --- a/pango/pangox.c +++ b/pango/pangox.c @@ -125,8 +125,13 @@ static void pango_x_make_font_struct (PangoFont *font, PangoXSubfontInfo *info) { PangoXFont *xfont = (PangoXFont *)font; + PangoFontMap *fontmap; + PangoXFontCache *cache; + + fontmap = pango_x_font_map_for_display (xfont->display); + cache = pango_x_font_map_get_font_cache (fontmap); - info->font_struct = XLoadQueryFont (xfont->display, info->xlfd); + info->font_struct = pango_x_font_cache_load (cache, info->xlfd); if (!info->font_struct) g_warning ("Cannot load font for XLFD '%s\n", info->xlfd); @@ -1290,5 +1295,3 @@ pango_x_get_item_properties (PangoItem *item, } } - - |