diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2009-01-28 22:07:38 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2009-01-28 22:07:38 +0000 |
| commit | 4aa395acd2740de461a359cba0068baf3f9a1b1d (patch) | |
| tree | f0fed4655e64b81759a0980b35887eb1e66b3952 /pango/pangofc-private.h | |
| parent | ceb03fea0dd21294e5b7eb13d8bc6b94b512037e (diff) | |
| download | pango-4aa395acd2740de461a359cba0068baf3f9a1b1d.tar.gz | |
Change PangoFc font loading API such that PangoContext is not passed down.
2009-01-09 Behdad Esfahbod <behdad@gnome.org>
* docs/pango-sections.txt:
* docs/tmpl/pangofc-fontmap.sgml:
* docs/tmpl/text-attributes.sgml:
* pango/pangocairo-fc.h:
* pango/pangocairo-fcfont.c (get_font_size), (get_gravity_class),
(get_gravity), (_pango_cairo_fc_font_new):
* pango/pangocairo-fcfontmap.c
(pango_cairo_fc_font_map_font_key_substitute),
(pango_cairo_fc_font_map_create_font),
(pango_cairo_fc_font_map_class_init):
* pango/pangofc-font.c (_pango_fc_font_get_font_key),
(_pango_fc_font_set_font_key):
* pango/pangofc-fontmap.c (pango_fc_font_key_equal),
(pango_fc_font_key_hash), (pango_fc_font_key_free),
(pango_fc_font_key_copy), (get_context_matrix),
(pango_fc_font_key_init), (pango_fc_font_key_get_pattern),
(pango_fc_font_key_get_matrix),
(pango_fc_font_key_get_context_key), (pango_fc_font_map_init),
(pango_fc_font_map_class_init), (pango_fc_font_map_add),
(_pango_fc_font_map_remove), (pango_fc_make_pattern),
(pango_fc_font_map_new_font), (pango_fc_default_substitute),
(pango_fc_font_map_get_patterns), (pango_fc_font_map_load_fontset):
* pango/pangofc-fontmap.h:
* pango/pangofc-private.h:
Change PangoFc font loading API such that PangoContext is not passed
down. We use a new opaque struct called PangoFcFontKey. This struct
is in fact our font hash key. This avoids problems where previously
we were using context members that were not necessarily considered
by the pangofc layer when caching.
This is in preparation for lazy loading of fonts in the pangofc fontmap.
svn path=/trunk/; revision=2804
Diffstat (limited to 'pango/pangofc-private.h')
| -rw-r--r-- | pango/pangofc-private.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pango/pangofc-private.h b/pango/pangofc-private.h index a8f3c23c..bc67ffb7 100644 --- a/pango/pangofc-private.h +++ b/pango/pangofc-private.h @@ -54,9 +54,9 @@ PangoFcDecoder *_pango_fc_font_get_decoder (PangoFcFont *font); void _pango_fc_font_set_decoder (PangoFcFont *font, PangoFcDecoder *decoder); -gpointer _pango_fc_font_get_context_key (PangoFcFont *font); -void _pango_fc_font_set_context_key (PangoFcFont *font, - gpointer context_key); +PangoFcFontKey *_pango_fc_font_get_font_key (PangoFcFont *fcfont); +void _pango_fc_font_set_font_key (PangoFcFont *fcfont, + PangoFcFontKey *key); void pango_fc_font_get_raw_extents (PangoFcFont *font, FT_Int32 load_flags, |