summaryrefslogtreecommitdiff
path: root/pango/pango-attributes.h
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2004-11-19 22:57:11 +0000
committerOwen Taylor <otaylor@src.gnome.org>2004-11-19 22:57:11 +0000
commit25eb23b0c27d6c447240fcf8505ad35a2a5a5d93 (patch)
tree52bcfb8069fb7bdfe31b0537da68f1f4338637ee /pango/pango-attributes.h
parentcb18309673f263d54eba9c312ab5802b4a6beb70 (diff)
downloadpango-25eb23b0c27d6c447240fcf8505ad35a2a5a5d93.tar.gz
Remove color_set() virtual function ... it's not absolutely necessary for
Fri Nov 19 17:44:33 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-renderer.[ch]: Remove color_set() virtual function ... it's not absolutely necessary for chaining renderers, and it's not clear that chaining renderers is actually useful, anyways. * pango/pango-renderer.[ch] (pango_renderer_set_color): Constify color argument. * pango/pango-render.c: Fix various bugs. * pango/pango-attributes.[ch] (pango_attr_shape_new_with_data): Add the ability to create a shape attribute with user data. * pango/pango-renderer.[ch] (PangoRendererClass): Add a draw_shape virtual function, to draw content for PangoAttrShape. * pango/pangoxft-fontmap.c (pango_xft_shutdown_display): Add note to docs that XCloseDisplay() will automatically take care of releasing Pango's allocated resources for the display. * docs/Makefile.am (SCAN_OPTIONS): Add the appropriate --deprecated-guards option. * docs/tmpl/xft-fonts.sgml: Add long description. * docs/tmpl/x-fonts.sgml: Document as dead.
Diffstat (limited to 'pango/pango-attributes.h')
-rw-r--r--pango/pango-attributes.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/pango/pango-attributes.h b/pango/pango-attributes.h
index 04086c4e..643d15e8 100644
--- a/pango/pango-attributes.h
+++ b/pango/pango-attributes.h
@@ -103,6 +103,8 @@ struct _PangoAttribute
typedef gboolean (*PangoAttrFilterFunc) (PangoAttribute *attribute,
gpointer data);
+typedef gpointer (*PangoAttrDataCopyFunc) (gconstpointer data);
+
struct _PangoAttrClass
{
/*< public >*/
@@ -147,6 +149,10 @@ struct _PangoAttrShape
PangoAttribute attr;
PangoRectangle ink_rect;
PangoRectangle logical_rect;
+
+ gpointer data;
+ PangoAttrDataCopyFunc copy_func;
+ GDestroyNotify destroy_func;
};
struct _PangoAttrFontDesc
@@ -179,12 +185,18 @@ PangoAttribute *pango_attr_font_desc_new (const PangoFontDescription *desc);
PangoAttribute *pango_attr_underline_new (PangoUnderline underline);
PangoAttribute *pango_attr_strikethrough_new (gboolean strikethrough);
PangoAttribute *pango_attr_rise_new (int rise);
-PangoAttribute *pango_attr_shape_new (const PangoRectangle *ink_rect,
- const PangoRectangle *logical_rect);
PangoAttribute *pango_attr_scale_new (double scale_factor);
PangoAttribute *pango_attr_fallback_new (gboolean enable_fallback);
PangoAttribute *pango_attr_letter_spacing_new (int letter_spacing);
+PangoAttribute *pango_attr_shape_new (const PangoRectangle *ink_rect,
+ const PangoRectangle *logical_rect);
+PangoAttribute *pango_attr_shape_new_with_data (const PangoRectangle *ink_rect,
+ const PangoRectangle *logical_rect,
+ gpointer data,
+ PangoAttrDataCopyFunc copy_func,
+ GDestroyNotify destroy_func);
+
GType pango_attr_list_get_type (void) G_GNUC_CONST;
PangoAttrList * pango_attr_list_new (void);
void pango_attr_list_ref (PangoAttrList *list);