diff options
| author | Alex Larsson <alexl@redhat.com> | 2001-11-18 23:23:14 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2001-11-18 23:23:14 +0000 |
| commit | a409a746f1fdec933cd1be897cc6078e6050690f (patch) | |
| tree | efc5c88209034a84c3ce8900c7b26f089eb6840e /pango/pangoft2-fontmap.c | |
| parent | ba6b12ca588709d4d408e691fbe9698a5a97339d (diff) | |
| download | pango-a409a746f1fdec933cd1be897cc6078e6050690f.tar.gz | |
Add new function pango_context_load_fontset() to wrap
2001-11-18 Alex Larsson <alexl@redhat.com>
* pango/pango-context.[ch]:
Add new function pango_context_load_fontset() to wrap
pango_font_map_load_fontset().
Add PangoContext arguments to load_font and load_fontset.
* pango/pango-fontmap.[ch]:
* pango/pangoft2-fontmap.c:
* pango/pangowin32-fontmap.c:
* pango/pangox-fontmap.c:
* pango/pangoxft-font.c:
* pango/pangoxft-fontmap.c
Add PangoContext arguments to load_font and load_fontset.
Diffstat (limited to 'pango/pangoft2-fontmap.c')
| -rw-r--r-- | pango/pangoft2-fontmap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c index 51039df5..bb4f076a 100644 --- a/pango/pangoft2-fontmap.c +++ b/pango/pangoft2-fontmap.c @@ -105,8 +105,10 @@ static void pango_ft2_font_map_init (PangoFT2FontMap static void pango_ft2_font_map_class_init (PangoFontMapClass *class); static void pango_ft2_font_map_finalize (GObject *object); static PangoFont * pango_ft2_font_map_load_font (PangoFontMap *fontmap, + PangoContext *context, const PangoFontDescription *description); static PangoFontset *pango_ft2_font_map_load_fontset (PangoFontMap *fontmap, + PangoContext *context, const PangoFontDescription *desc, PangoLanguage *language); static void pango_ft2_font_set_free (PangoFT2PatternSet *font_set); @@ -500,6 +502,7 @@ pango_ft2_font_map_new_font (PangoFontMap *fontmap, static PangoFont * pango_ft2_font_map_load_font (PangoFontMap *fontmap, + PangoContext *context, const PangoFontDescription *description) { MiniXftPattern *pattern, *match; @@ -519,6 +522,7 @@ pango_ft2_font_map_load_font (PangoFontMap *fontmap, static PangoFontset * pango_ft2_font_map_load_fontset (PangoFontMap *fontmap, + PangoContext *context, const PangoFontDescription *desc, PangoLanguage *language) { @@ -563,7 +567,7 @@ pango_ft2_font_map_load_fontset (PangoFontMap *fontmap, MiniXftPatternGetString (match, XFT_FAMILY, 0, &family_res) == MiniXftResultMatch && g_ascii_strcasecmp (family, family_res) == 0) { - patterns->patterns[patterns->n_patterns++] = match; + g_ptr_array_add (array, match); match = NULL; } if (match) @@ -573,7 +577,7 @@ pango_ft2_font_map_load_fontset (PangoFontMap *fontmap, if (array->len == 0) { match = MiniXftFontSetMatch (&_MiniXftFontSet, 1, pattern, &res); - patterns->patterns[patterns->n_patterns++] = match; + g_ptr_array_add (array, match); } MiniXftPatternDestroy (pattern); |