diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/Geo.h | 7 | ||||
| -rw-r--r-- | generic/Item.h | 6 | ||||
| -rw-r--r-- | generic/Map.c | 1 | ||||
| -rw-r--r-- | generic/Reticle.c | 1 |
4 files changed, 12 insertions, 3 deletions
diff --git a/generic/Geo.h b/generic/Geo.h index 2b11414..bac8166 100644 --- a/generic/Geo.h +++ b/generic/Geo.h @@ -82,7 +82,12 @@ POLY_SET(ZnPoly *poly1, ZnPoly *poly2); void POLY_FREE(ZnPoly *poly); - +void +TRI_STRIP1(ZnTriStrip *tristrip, + ZnPoint *pts, + int num_pts); +void +TRI_FREE(ZnTriStrip *tristrip); void Anchor2Origin(ZnPoint *position, diff --git a/generic/Item.h b/generic/Item.h index d3d0bf0..16a624a 100644 --- a/generic/Item.h +++ b/generic/Item.h @@ -163,7 +163,8 @@ typedef void (*ItemContourMethod)(Item item, int cmd, ZnPoly *poly); typedef void (*ItemPickVertexMethod)(Item item, ZnPoint *p, int *contour, int *vertex, int *o_vertex); typedef void (*ItemGetAnchorMethod)(Item item, ZnAnchor anchor, ZnPoint *p); -typedef ZnBool (*ItemGetClipVerticesMethod)(Item item, ZnPoly *points); +typedef ZnBool (*ItemGetClipVerticesMethod)(Item item, ZnTriStrip *tristrip); +typedef ZnBool (*ItemGetContoursMethod)(Item item, ZnPoly *poly); typedef int (*ItemCoordsMethod)(Item item, int contour, int index, int cmd, ZnPoint **points, int *num_points); typedef void (*ItemInsertCharsMethod)(Item item, int index, char *chars); @@ -191,6 +192,7 @@ typedef struct _ItemClassStruct { ItemGetFieldSetMethod GetFieldSet; ItemGetAnchorMethod GetAnchor; ItemGetClipVerticesMethod GetClipVertices; + ItemGetContoursMethod GetContours; ItemCoordsMethod Coords; ItemInsertCharsMethod InsertChars; ItemDeleteCharsMethod DeleteChars; @@ -286,7 +288,7 @@ extern struct _ITEM_P { void (*InitClipStack)(struct _WidgetInfo *wi); void (*FreeClipStack)(struct _WidgetInfo *wi); void (*ResetClipStack)(struct _WidgetInfo *wi); - void (*PushClip)(struct _WidgetInfo *wi, ZnPoly *poly, ZnBool simple, + void (*PushClip)(struct _WidgetInfo *wi, ZnTriStrip *tristrip, ZnBool simple, ZnBool set_gc); void (*PopClip)(struct _WidgetInfo *wi, ZnBool set_gc); ZnBool (*CurrentClip)(struct _WidgetInfo *wi, Region *reg, ZnBBox **clip_box, diff --git a/generic/Map.c b/generic/Map.c index 12d953a..d7aee0a 100644 --- a/generic/Map.c +++ b/generic/Map.c @@ -1577,6 +1577,7 @@ static ItemClassStruct MAP_ITEM_CLASS = { NULL, /* GetFieldSet */ NULL, /* GetAnchor */ NULL, /* GetClipVertices */ + NULL, /* GetContours */ Coords, NULL, /* InsertChars */ NULL, /* DeleteChars */ diff --git a/generic/Reticle.c b/generic/Reticle.c index 31ea083..8ee24ae 100644 --- a/generic/Reticle.c +++ b/generic/Reticle.c @@ -587,6 +587,7 @@ static ItemClassStruct RETICLE_ITEM_CLASS = { NULL, /* GetFieldSet */ NULL, /* GetAnchor */ NULL, /* GetClipVertices */ + NULL, /* GetContours */ Coords, NULL, /* InsertChars */ NULL, /* DeleteChars */ |