From d21ea13a22b1cab8c9cb604aa3fcd2ca8073befd Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 4 Jul 2019 20:36:00 +0000 Subject: Header cleanup Abolish the PANGO_ENABLE_BACKEND and PANGO_ENABLE_ENGINE defines. All backend-only apis are moved into private headers, all apis that were engine-only are marked as deprecated, since engines are. --- pango/pangofc-font.h | 108 +-------------------------------------------------- 1 file changed, 1 insertion(+), 107 deletions(-) (limited to 'pango/pangofc-font.h') diff --git a/pango/pangofc-font.h b/pango/pangofc-font.h index 954abdcb..38d86fa9 100644 --- a/pango/pangofc-font.h +++ b/pango/pangofc-font.h @@ -22,7 +22,7 @@ #ifndef __PANGO_FC_FONT_H__ #define __PANGO_FC_FONT_H__ -#include +#include /* Freetype has undefined macros in its header */ #ifdef PANGO_COMPILATION @@ -47,112 +47,6 @@ G_BEGIN_DECLS typedef struct _PangoFcFont PangoFcFont; typedef struct _PangoFcFontClass PangoFcFontClass; -#if defined(PANGO_ENABLE_ENGINE) || defined(PANGO_ENABLE_BACKEND) - -/** - * PANGO_RENDER_TYPE_FC: - * - * A string constant used to identify shape engines that work - * with the fontconfig based backends. See the @engine_type field - * of #PangoEngineInfo. - **/ -#define PANGO_RENDER_TYPE_FC "PangoRenderFc" - -#ifdef PANGO_ENABLE_BACKEND - -#define PANGO_FC_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FC_FONT, PangoFcFontClass)) -#define PANGO_IS_FC_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FC_FONT)) -#define PANGO_FC_FONT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FC_FONT, PangoFcFontClass)) - -/** - * PangoFcFont: - * - * #PangoFcFont is a base class for font implementations - * using the Fontconfig and FreeType libraries and is used in - * conjunction with #PangoFcFontMap. When deriving from this - * class, you need to implement all of its virtual functions - * other than shutdown() along with the get_glyph_extents() - * virtual function from #PangoFont. - **/ -struct _PangoFcFont -{ - PangoFont parent_instance; - - FcPattern *font_pattern; /* fully resolved pattern */ - PangoFontMap *fontmap; /* associated map */ - gpointer priv; /* used internally */ - PangoMatrix matrix; /* used internally */ - PangoFontDescription *description; - - GSList *metrics_by_lang; - - guint is_hinted : 1; - guint is_transformed : 1; -}; - -/** - * PangoFcFontClass: - * @lock_face: Returns the FT_Face of the font and increases - * the reference count for the face by one. - * @unlock_face: Decreases the reference count for the - * FT_Face of the font by one. When the count is zero, - * the #PangoFcFont subclass is allowed to free the - * FT_Face. - * @has_char: Return %TRUE if the the font contains a glyph - * corresponding to the specified character. - * @get_glyph: Gets the glyph that corresponds to the given - * Unicode character. - * @get_unknown_glyph: (nullable): Gets the glyph that - * should be used to display an unknown-glyph indication - * for the specified Unicode character. May be %NULL. - * @shutdown: (nullable): Performs any font-specific - * shutdown code that needs to be done when - * pango_fc_font_map_shutdown is called. May be %NULL. - * - * Class structure for #PangoFcFont. - **/ -struct _PangoFcFontClass -{ - /*< private >*/ - PangoFontClass parent_class; - - /*< public >*/ - FT_Face (*lock_face) (PangoFcFont *font); - void (*unlock_face) (PangoFcFont *font); - gboolean (*has_char) (PangoFcFont *font, - gunichar wc); - guint (*get_glyph) (PangoFcFont *font, - gunichar wc); - PangoGlyph (*get_unknown_glyph) (PangoFcFont *font, - gunichar wc); - void (*shutdown) (PangoFcFont *font); - /*< private >*/ - - /* Padding for future expansion */ - void (*_pango_reserved1) (void); - void (*_pango_reserved2) (void); - void (*_pango_reserved3) (void); - void (*_pango_reserved4) (void); -}; - -#endif /* PANGO_ENABLE_BACKEND */ - -PANGO_AVAILABLE_IN_1_4 -gboolean pango_fc_font_has_char (PangoFcFont *font, - gunichar wc); -PANGO_AVAILABLE_IN_1_4 -guint pango_fc_font_get_glyph (PangoFcFont *font, - gunichar wc); -#ifndef PANGO_DISABLE_DEPRECATED -PANGO_DEPRECATED_FOR(PANGO_GET_UNKNOWN_GLYPH) -PangoGlyph pango_fc_font_get_unknown_glyph (PangoFcFont *font, - gunichar wc); -PANGO_DEPRECATED_IN_1_32 -void pango_fc_font_kern_glyphs (PangoFcFont *font, - PangoGlyphString *glyphs); -#endif /* PANGO_DISABLE_DEPRECATED */ - -#endif /* PANGO_ENABLE_ENGINE || PANGO_ENABLE_BACKEND */ PANGO_AVAILABLE_IN_ALL GType pango_fc_font_get_type (void) G_GNUC_CONST; -- cgit v1.2.1