diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-01-17 23:00:18 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-01-17 23:00:18 +0000 |
| commit | 620fb9ffc8ce07446ab341630e37900d7c9c102b (patch) | |
| tree | f6924b9416bfc734615e47403069b091b8bde7cf /pango/pangox.h | |
| parent | 08be81c00f4fce735979e6a684eeade00c1ce328 (diff) | |
| download | pango-620fb9ffc8ce07446ab341630e37900d7c9c102b.tar.gz | |
Switch GlyphStrings to have a single array of PangoGlyphInfo instead of
Sat Jan 15 03:17:35 2000 Owen Taylor <otaylor@redhat.com>
* pango/glyphstring.c pango/mapping.c pango/pangox.c
modules/basic.c examples/viewer.c:
Switch GlyphStrings to have a single array of
PangoGlyphInfo instead of multiple arrays. Rename
PangoGlyphIndex to PangoGlyph.
Diffstat (limited to 'pango/pangox.h')
| -rw-r--r-- | pango/pangox.h | 69 |
1 files changed, 37 insertions, 32 deletions
diff --git a/pango/pangox.h b/pango/pangox.h index c3a7d7f2..63930256 100644 --- a/pango/pangox.h +++ b/pango/pangox.h @@ -35,46 +35,51 @@ extern "C" { /* Calls for applications */ -PangoFont *pango_x_load_font (Display *display, - gchar *spec); -void pango_x_render (Display *display, - Drawable d, - GC gc, - PangoFont *font, - PangoGlyphString *glyphs, - gint x, - gint y); -void pango_x_extents (PangoFont *font, - PangoGlyphString *glyphs, - gint *lbearing, - gint *rbearing, - gint *width, - gint *ascent, - gint *descent, - gint *logical_ascent, - gint *logical_descent); -void pango_x_glyph_extents (PangoFont *font, - PangoGlyphIndex glyph, - gint *lbearing, - gint *rbearing, - gint *width, - gint *ascent, - gint *descent, - gint *logical_ascent, - gint *logical_descent); +PangoFont * pango_x_load_font (Display *display, + char *spec); +void pango_x_render (Display *display, + Drawable d, + GC gc, + PangoFont *font, + PangoGlyphString *glyphs, + int x, + int y); +void pango_x_extents (PangoFont *font, + PangoGlyphString *glyphs, + int *lbearing, + int *rbearing, + int *width, + int *ascent, + int *descent, + int *logical_ascent, + int *logical_descent); +void pango_x_glyph_extents (PangoFont *font, + PangoGlyph glyph, + int *lbearing, + int *rbearing, + int *width, + int *ascent, + int *descent, + int *logical_ascent, + int *logical_descent); /* API for rendering modules */ -typedef guint16 PangoXCharset; +typedef guint16 PangoXSubfontID; -#define PANGO_X_MAKE_GLYPH(charset,index) (charset<<16 | index) -#define PANGO_X_GLYPH_CHARSET(glyph) (glyph>>16) +#define PANGO_X_MAKE_GLYPH(subfont,index) (subfont<<16 | index) +#define PANGO_X_GLYPH_SUBFONT(glyph) (glyph>>16) #define PANGO_X_GLYPH_INDEX(glyph) (glyph & 0xffff) +void pango_x_list_charsets (PangoFont *font, + char **charsets, + int n_charsets, + int charsets); + PangoXCharset pango_x_find_charset (PangoFont *font, - gchar *charset); + char *charset); gboolean pango_x_has_glyph (PangoFont *font, - PangoGlyphIndex glyph); + PangoGlyph glyph); #ifdef __cplusplus } |