aboutsummaryrefslogtreecommitdiff
path: root/generic
diff options
context:
space:
mode:
Diffstat (limited to 'generic')
-rw-r--r--generic/Draw.h3
-rw-r--r--generic/Geo.h10
-rw-r--r--generic/Transfo.h2
3 files changed, 8 insertions, 7 deletions
diff --git a/generic/Draw.h b/generic/Draw.h
index 16dcf0f..546e1c4 100644
--- a/generic/Draw.h
+++ b/generic/Draw.h
@@ -125,5 +125,8 @@ void ZnRenderString(ZnTexFontInfo *tfi, unsigned char *str, unsigned int len);
void ZnRenderFancyString(ZnTexFontInfo *tfi, unsigned char *str, unsigned int len);
#endif
+void ZnMapImage(XImage *image, XImage *mapped_image, ZnPoint *poly);
+
+
#endif /* _Draw_h */
diff --git a/generic/Geo.h b/generic/Geo.h
index 3c6ee0c..c0ad55a 100644
--- a/generic/Geo.h
+++ b/generic/Geo.h
@@ -63,11 +63,11 @@
typedef struct {
- ZnPos x, y;
+ float x, y;
} ZnPoint;
typedef struct {
- ZnPos x, y, w, h;
+ float x, y, w, h;
} ZnRect;
/*
@@ -178,6 +178,7 @@ ZnOrigin2Anchor(ZnPoint *origin,
ZnDim height,
Tk_Anchor anchor,
ZnPoint *position);
+void ZnRectOrigin2Anchor(ZnPoint *rect, Tk_Anchor anchor, ZnPoint *position);
void
ZnBBox2XRect(ZnBBox *bbox,
XRectangle *rect);
@@ -286,10 +287,7 @@ ZnProjectionToAngle(ZnReal dx,
ZnDim
ZnRectangleToPointDist(ZnBBox *bbox,
ZnPoint *p);
-ZnDim
-ZnLineToPointDist(ZnPoint *p1,
- ZnPoint *p2,
- ZnPoint *p);
+ZnDim ZnLineToPointDist(ZnPoint *p1, ZnPoint *p2, ZnPoint *p, ZnPoint *closest);
ZnDim
ZnPolygonToPointDist(ZnPoint *points,
diff --git a/generic/Transfo.h b/generic/Transfo.h
index c116a61..6a01a32 100644
--- a/generic/Transfo.h
+++ b/generic/Transfo.h
@@ -43,7 +43,7 @@
* is lower left corner.
*/
typedef struct _ZnTransfo {
- ZnReal _[3][2];
+ float _[3][2];
} ZnTransfo;