summaryrefslogtreecommitdiff
path: root/pango/pangox-private.h
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-09-18 20:05:20 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-09-18 20:05:20 +0000
commita49e070d24242c0297e6325587c4bc135e13e26c (patch)
tree0510d066cc185e9d0b1b736736da5266d259878e /pango/pangox-private.h
parent39f3626e34e0522e0bdec591f6c0334307d39625 (diff)
downloadpango-a49e070d24242c0297e6325587c4bc135e13e26c.tar.gz
Up to 0.19.
Tue Sep 18 15:47:08 2001 Owen Taylor <otaylor@redhat.com> * configure.in (PANGO_MINOR_VERSION): Up to 0.19. * pango/pango-font.h pango/pango-fontmap.[ch] pango/fonts.c pango/pangoxft-fontmap.c pango/pangoft-fontmap.c pango/pango-context.[ch] pango/pangox-fontmap.c: Add new PangoFontFace and PangoFontFamily object types, and change the font listing API to list faces and families, instead of face names and font descriptions. * pango/pango-font.h pango/fonts.c: Make PangoFontDescription an opaque heap-allocated structure, add accessors and convenience functions. * pango/pango-font.h pango/pango-private.h: Make PangoFontMetrics heap allocated, protect the structure definition with #ifdef PANGO_ENABLE_BACKEND, and add getters for the fields. * pango/pango-attributes.[ch] ( pango_attr_iterator_get_font): instead of providing a base font description and one to fill in, provide a single font description to modify based on the attributes. * pango/pango-attributes.[ch]: Fix PangoAttrFontDesc to have a PangoFontDescription by reference, not by value. * pango/pango-utils.[ch]: make pango_parse_style() and friends take pointers to individual enumerations instead of to a PangoFontDescription structure. * pango/*.c: Fix for the PangoFontDescription and PangoFontMetrics changes. * pango/pango-{break,engine,indic,ot,xft}.h pango/Makefile.am pango/opentype/Makefile.am: Protect portions with PANGO_ENABLE_ENGINE to shrink the public API. * modules/*/Makefile.am: -DPANGO_ENABLE_ENGINE. * pango/{pangox.h,pangox-private.h} modules/basic/basic-x.c: Move pango_x_font_get_unknown_glyph() into public header since it is used from modules. * pango/pango-{context,font,fontmap,modules.utils}.h pango/Makefile.am: Protect portions with PANGO_ENABLE_BACKEND to shrink the public API. * pango/*.h: Use G_BEGIN/END_DECLS * examples/viewer-qt.[cc,h]: Fix for changes to font listing API, PangoFontDescription. * pango/pango-indic.h modules/indic/*: Since we install this header fix it up to Pango conventions, namespece ZERO_WIDTH_JOINER, ZERO_WIDTH_NON_JOINER. * docs/pango-sections.txt: Updated.
Diffstat (limited to 'pango/pangox-private.h')
-rw-r--r--pango/pangox-private.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/pango/pangox-private.h b/pango/pangox-private.h
index aa36d6f9..0fb12976 100644
--- a/pango/pangox-private.h
+++ b/pango/pangox-private.h
@@ -26,8 +26,8 @@
#include "pangox.h"
#include "pangox-private.h"
-typedef struct _PangoXFont PangoXFont;
-typedef struct _PangoXFontEntry PangoXFontEntry;
+typedef struct _PangoXFace PangoXFace;
+typedef struct _PangoXFont PangoXFont;
typedef struct _PangoXSubfontInfo PangoXSubfontInfo;
struct _PangoXFont
@@ -57,7 +57,7 @@ struct _PangoXFont
*/
gboolean in_cache;
- PangoXFontEntry *entry; /* Used to remove cached fonts */
+ PangoXFace *xface; /* Used to remove cached fonts */
};
@@ -103,10 +103,10 @@ char * pango_x_make_matching_xlfd (PangoFontMap *fontmap,
char *xlfd,
const char *charset,
int size);
-PangoCoverage *pango_x_font_entry_get_coverage (PangoXFontEntry *entry,
+PangoCoverage *pango_x_face_get_coverage (PangoXFace *xface,
PangoFont *font,
PangoLanguage *language);
-void pango_x_font_entry_remove (PangoXFontEntry *entry,
+void pango_x_face_remove (PangoXFace *xface,
PangoFont *font);
Display * pango_x_fontmap_get_display (PangoFontMap *fontmap);
@@ -120,7 +120,4 @@ Atom pango_x_fontmap_atom_from_name (PangoFontMap *fontmap,
const char *pango_x_fontmap_name_from_atom (PangoFontMap *fontmap,
Atom atom);
-PangoGlyph pango_x_font_get_unknown_glyph (PangoFont *font,
- gunichar wc);
-
#endif /* __PANGOX_PRIVATE_H__ */