diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-07-21 13:55:19 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-07-21 13:55:19 +0000 |
| commit | 6f1def024e5c0c0f75c992c26dded3c192aa455c (patch) | |
| tree | 2ef6a8974d23d58dff51473c9691ab5785bdc4c6 /pango/pangofc-font.h | |
| parent | 07085142899378e7b5c0ad8e3fdd35ea2a941b1a (diff) | |
| download | pango-6f1def024e5c0c0f75c992c26dded3c192aa455c.tar.gz | |
Rework handling of context-specific options: drop get_render_key() and add
2005-07-19 Owen Taylor <otaylor@redhat.com>
* pango/pango-fcfontmap.[ch]: Rework handling of context-specific
options: drop get_render_key() and add a opaque "context
key" (get_context_key() and friends). Also add a function to get
the resolution.
* pango/pango-fcfontmap.c pango/pangofc-font.h:
- Move the 'lang' into the fontset key lookup and get rid of the
funky list-of-hash-tables
- Make lookups of fontsets and fonts dependent on the context key
for the context.
- Simplify the pattern/fontset caching to have one finite-size
cache rather than an infinite first-level and a finite-size
second level.
* pango/pangocairo.h pango/pangocairo-private.h
pango/pangocairo-fontmap.c: Add
pango_cairo_context_get/set_resolution(),
pango_cairo_context_set/get_font_options to allow controlling the
resolution and font rendering options for a specific PangoContext.
* pango/pangocairo-fcfont.c pango/pangocairo-fcfontmap
pango/pangocairo-win32font.c: Implement resolution and font
options handling adapt to related Cairo changes.
* docs/pango-sections.txt docs/Makefile.am pango/pangowin32.c:
Doc updates and build fixes.
* pango/pangofc-fontmap.c (pango_fc_make_pattern): Create
patterns with FC_SIZE as well as FC_PIXEL_SIZE to work around
a libgnomeprint bug. (#309477)
Diffstat (limited to 'pango/pangofc-font.h')
| -rw-r--r-- | pango/pangofc-font.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pango/pangofc-font.h b/pango/pangofc-font.h index f3db9a86..42282c53 100644 --- a/pango/pangofc-font.h +++ b/pango/pangofc-font.h @@ -71,6 +71,8 @@ struct _PangoFcFont FcPattern *font_pattern; /* fully resolved pattern */ PangoFontMap *fontmap; /* associated map */ + gpointer context_key; /* used internally */ + PangoMatrix matrix; /* used internally */ PangoFontDescription *description; GSList *metrics_by_lang; |