diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-01-15 06:12:19 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-01-15 06:12:19 +0000 |
| commit | 08be81c00f4fce735979e6a684eeade00c1ce328 (patch) | |
| tree | 5fc105b5c494741d01e484fbb43fb737cb777ccd /pango/pango.h | |
| parent | a26b023b2859fed3e178a92e3d93c71672644e7d (diff) | |
| download | pango-08be81c00f4fce735979e6a684eeade00c1ce328.tar.gz | |
Eliminate PangoCFont; For X, encode charset into upper 16 bits of 32 bit
Sat Jan 15 01:06:45 2000 Owen Taylor <otaylor@redhat.com>
* libpango/pangox.c libpango/pangox.h libpango/fonts.c
libpango/glyphstring.c modules/basic/basic.c:
Eliminate PangoCFont; For X, encode charset into upper
16 bits of 32 bit glyph IDs. Revise X core <=> module
interfaces to support this change.
Remove support for X_XLFD_FONT_RANGES, which has been
disavowed by its proponents, in favor of checking metrics
to figure out if the relevant characters are there.
Rework operation of basic module to be faster and simple.
* modules/Makefile.am: temporarily comment out Tamil and
Hangul modules until I finish mucking with the
X font interfaces.
Diffstat (limited to 'pango/pango.h')
| -rw-r--r-- | pango/pango.h | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/pango/pango.h b/pango/pango.h index 0b375a96..efc3669e 100644 --- a/pango/pango.h +++ b/pango/pango.h @@ -46,8 +46,6 @@ typedef struct _PangoLogAttr PangoLogAttr; typedef struct _PangoFont PangoFont; typedef struct _PangoFontClass PangoFontClass; -typedef struct _PangoCFont PangoCFont; -typedef struct _PangoCFontClass PangoCFontClass; typedef struct _PangoGlyph PangoGlyph; typedef struct _PangoGlyphGeometry PangoGlyphGeometry; @@ -128,9 +126,9 @@ struct _PangoLogAttr { * of Unicode text. */ void pango_break (gchar *text, - gint length, - PangoAnalysis *analysis, - PangoLogAttr *attrs); + gint length, + PangoAnalysis *analysis, + PangoLogAttr *attrs); /* * FONT OPERATIONS @@ -159,25 +157,6 @@ void pango_font_set_data (PangoFont *font, gpointer data, GDestroyNotify destroy_func); -/* A component of a font. The contents of this are completely - * rendering system dependent - */ -struct _PangoCFont { - PangoCFontClass *klass; - - /*< private >*/ - gint ref_count; -}; - -struct _PangoCFontClass { - void (*destroy) (PangoCFont *cfont); -}; - -void pango_cfont_init (PangoCFont *font); -void pango_cfont_ref (PangoCFont *font); -void pango_cfont_unref (PangoCFont *font); - - /* * GLYPH STORAGE */ @@ -191,7 +170,6 @@ typedef guint32 PangoGlyphIndex; struct _PangoGlyph { PangoGlyphIndex glyph; - PangoCFont *font; }; /* Positioning information about a glyph @@ -236,11 +214,11 @@ void pango_glyph_string_free (PangoGlyphString *string); /* Turn a string of characters into a string of glyphs */ -void pango_shape (PangoFont *font, - gchar *text, - gint length, - PangoAnalysis *analysis, - PangoGlyphString *glyphs); +void pango_shape (PangoFont *font, + gchar *text, + gint length, + PangoAnalysis *analysis, + PangoGlyphString *glyphs); /* [ pango_place - subsume into g_script_shape? ] */ |