diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-07-21 19:19:50 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-07-21 19:19:50 +0000 |
| commit | ebbd946ac65ac1a20a46652b234288280e7ee5fd (patch) | |
| tree | 93e204b1cc463b5b3d371406b35dc59dc0c1dda4 /pango/pango-attributes.h | |
| parent | a084f42c0e920e2ac91383b8d98ff54f339d17ac (diff) | |
| download | pango-ebbd946ac65ac1a20a46652b234288280e7ee5fd.tar.gz | |
A bit of code cleanup.
Fri Jul 21 15:17:26 2000 Owen Taylor <otaylor@redhat.com>
* pango/pango-context.c (pango_itemize): A bit of code
cleanup.
* pango/pango-attributes.[ch]: Add a new attribute type
PangoAttrShape, for imposing specific shapes on glyphs.
This is used for handling embedded pixmaps and similar
objects.
* pango/pango-layout.c: Hnadle PangoAttrShape.
* pango/pango-context.[ch]:
Diffstat (limited to 'pango/pango-attributes.h')
| -rw-r--r-- | pango/pango-attributes.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pango/pango-attributes.h b/pango/pango-attributes.h index 3670163e..abd901f5 100644 --- a/pango/pango-attributes.h +++ b/pango/pango-attributes.h @@ -35,6 +35,7 @@ typedef struct _PangoAttrString PangoAttrString; typedef struct _PangoAttrInt PangoAttrInt; typedef struct _PangoAttrColor PangoAttrColor; typedef struct _PangoAttrFontDesc PangoAttrFontDesc; +typedef struct _PangoAttrShape PangoAttrShape; typedef struct _PangoAttrList PangoAttrList; typedef struct _PangoAttrIterator PangoAttrIterator; @@ -52,7 +53,8 @@ typedef enum { PANGO_ATTR_BACKGROUND, /* PangoAttrColor */ PANGO_ATTR_UNDERLINE, /* PangoAttrInt */ PANGO_ATTR_STRIKETHROUGH, /* PangoAttrInt */ - PANGO_ATTR_RISE /* PangoAttrInt */ + PANGO_ATTR_RISE, /* PangoAttrInt */ + PANGO_ATTR_SHAPE /* PangoAttrShape */ } PangoAttrType; typedef enum { @@ -97,6 +99,13 @@ struct _PangoAttrColor guint16 blue; }; +struct _PangoAttrShape +{ + PangoAttribute attr; + PangoRectangle ink_rect; + PangoRectangle logical_rect; +}; + struct _PangoAttrFontDesc { PangoAttribute attr; @@ -127,6 +136,8 @@ 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); PangoAttrList * pango_attr_list_new (void); void pango_attr_list_ref (PangoAttrList *list); |