diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-02-16 22:05:43 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-02-16 22:05:43 +0000 |
| commit | 7f846326d416e9ab3eadca9f02b9a0129095f30b (patch) | |
| tree | 4b2812b858cd830ca1282e3697d029ca347df24a /pango/pango-font.h | |
| parent | 4f335d6e4a3f5b4e6ddd1cd78f919aa80c990262 (diff) | |
| download | pango-7f846326d416e9ab3eadca9f02b9a0129095f30b.tar.gz | |
Make refcounted.
Wed Feb 16 16:39:46 2000 Owen Taylor <otaylor@redhat.com>
* libpango/pango-coverage.c (pango_coverage_get): Make refcounted.
* libpango/modules.c (struct _PangoEnginePair): Since we don't
currently unload engines, cache loaded engines. (Not really
quite satisfactory, but should work OK)
* libpango/pango-context.c (pango_context_get_font_description):
Added a global font description.
* libpango/modules.c (_pango_find_map): Allow NULL
language tags.
* libpango/pango-context.c (pango_itemize) examples/viewer.c:
Switch itemize over to take a PangoAttrList.
* examples/viewer.c: Conform to changes in itemization interface
* libpango/font.[ch]: Add a compare function for FontDescription
* libpango/pango-attributes.[ch]: Change the iteration iterface
to be more convenient.
* libpango/pango-context.[ch]: Add the ability to set a default font.
* libpango/pango-context.[ch]: Take the font for itemization from
the attributes on the text.
* libpango/pangox.c: Cache currently loaded fonts, and cache
coverages.
Diffstat (limited to 'pango/pango-font.h')
| -rw-r--r-- | pango/pango-font.h | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/pango/pango-font.h b/pango/pango-font.h index 161236e6..1c262609 100644 --- a/pango/pango-font.h +++ b/pango/pango-font.h @@ -30,7 +30,6 @@ extern "C" { #include <pango-types.h> typedef struct _PangoFontDescription PangoFontDescription; -typedef struct _PangoFont PangoFont; typedef struct _PangoFontClass PangoFontClass; typedef struct _PangoFontMap PangoFontMap; typedef struct _PangoFontMapClass PangoFontMapClass; @@ -72,10 +71,12 @@ struct _PangoFontDescription { PangoStretch stretch; }; -PangoFontDescription *pango_font_description_copy (PangoFontDescription *desc); -void pango_font_description_free (PangoFontDescription *desc); -void pango_font_descriptions_free (PangoFontDescription **descs, - int n_descs); +PangoFontDescription *pango_font_description_copy (const PangoFontDescription *desc); +gboolean pango_font_description_compare (const PangoFontDescription *desc1, + const PangoFontDescription *desc2); +void pango_font_description_free (PangoFontDescription *desc); +void pango_font_descriptions_free (PangoFontDescription **descs, + int n_descs); /* Logical fonts */ @@ -130,25 +131,25 @@ struct _PangoFontMap struct _PangoFontMapClass { - void (*destroy) (PangoFontMap *fontmap); - PangoFont *(*load_font) (PangoFontMap *fontmap, - PangoFontDescription *desc, - double size); - void (*list_fonts) (PangoFontMap *fontmap, - const gchar *family, - PangoFontDescription ***descs, - int *n_descs); - void (*list_families) (PangoFontMap *fontmap, - gchar ***families, - int *n_families); + void (*destroy) (PangoFontMap *fontmap); + PangoFont *(*load_font) (PangoFontMap *fontmap, + const PangoFontDescription *desc, + double size); + void (*list_fonts) (PangoFontMap *fontmap, + const gchar *family, + PangoFontDescription ***descs, + int *n_descs); + void (*list_families) (PangoFontMap *fontmap, + gchar ***families, + int *n_families); }; -void pango_font_map_init (PangoFontMap *fontmap); -void pango_font_map_ref (PangoFontMap *fontmap); -void pango_font_map_unref (PangoFontMap *fontmap); -PangoFont *pango_font_map_load_font (PangoFontMap *fontmap, - PangoFontDescription *desc, - double size); +void pango_font_map_init (PangoFontMap *fontmap); +void pango_font_map_ref (PangoFontMap *fontmap); +void pango_font_map_unref (PangoFontMap *fontmap); +PangoFont *pango_font_map_load_font (PangoFontMap *fontmap, + const PangoFontDescription *desc, + double size); void pango_font_map_list_fonts (PangoFontMap *fontmap, const gchar *family, |