Replace inside_t struct with union to better split the way it is used;

simplify arrow clipping interface;
make update function, used only in ns.c, static.

diff --git a/lib/common/arrows.c b/lib/common/arrows.c
index 3268bd91455f73d8c418cafe8e859ba78f268311..e8a539543ee421afff5605c65e94a50a568a809b 100644 (file)
--- a/lib/common/arrows.c
+++ b/lib/common/arrows.c
@@ -233,16 +233,17 @@ double arrow_length(edge_t * e, int flag)
 /* inside function for calls to bezier_clip */
 static boolean inside(inside_t * inside_context, pointf p)
 {
-    return dstsq(p, inside_context->p[0]) <= inside_context->r[0];
+    return dstsq(p, inside_context->a.p[0]) <= inside_context->a.r[0];
 }
 
-int arrowEndClip(inside_t * inside_context, point * ps, int startp,
+int arrowEndClip(edge_t* e, point * ps, int startp,
                 int endp, bezier * spl, int eflag)
 {
+    inside_t inside_context;
     pointf sp[4];
     double elen, elen2;
 
-    elen = arrow_length(inside_context->e, eflag);
+    elen = arrow_length(e, eflag);
     elen2 = elen * elen;
     spl->eflag = eflag, spl->ep = ps[endp + 3];
     if (endp > startp && dstsq(ps[endp], ps[endp + 3]) < elen2) {
@@ -253,9 +254,9 @@ int arrowEndClip(inside_t * inside_context, point * ps, int startp,
     P2PF(ps[endp + 2], sp[1]);
     P2PF(spl->ep, sp[0]);      /* ensure endpoint starts inside */
 
-    inside_context->p = &sp[0];
-    inside_context->r = &elen2;
-    bezier_clip(inside_context, inside, sp, TRUE);
+    inside_context.a.p = &sp[0];
+    inside_context.a.r = &elen2;
+    bezier_clip(&inside_context, inside, sp, TRUE);
 
     PF2P(sp[3], ps[endp]);
     PF2P(sp[2], ps[endp + 1]);
@@ -264,13 +265,14 @@ int arrowEndClip(inside_t * inside_context, point * ps, int startp,
     return endp;
 }
 
-int arrowStartClip(inside_t * inside_context, point * ps, int startp,
+int arrowStartClip(edge_t* e, point * ps, int startp,
                   int endp, bezier * spl, int sflag)
 {
+    inside_t inside_context;
     pointf sp[4];
     double slen, slen2;
 
-    slen = arrow_length(inside_context->e, sflag);
+    slen = arrow_length(e, sflag);
     slen2 = slen * slen;
     spl->sflag = sflag, spl->sp = ps[startp];
     if (endp > startp && dstsq(ps[startp], ps[startp + 3]) < slen2) {
@@ -281,9 +283,9 @@ int arrowStartClip(inside_t * inside_context, point * ps, int startp,
     P2PF(ps[startp + 1], sp[2]);
     P2PF(spl->sp, sp[3]);      /* ensure endpoint starts inside */
 
-    inside_context->p = &sp[3];
-    inside_context->r = &slen2;
-    bezier_clip(inside_context, inside, sp, FALSE);
+    inside_context.a.p = &sp[3];
+    inside_context.a.r = &slen2;
+    bezier_clip(&inside_context, inside, sp, FALSE);
 
     PF2P(sp[3], ps[startp]);
     PF2P(sp[2], ps[startp + 1]);

diff --git a/lib/common/ns.c b/lib/common/ns.c
index af3ca8a873694977b09492d177941d946fb5a3bf..87760132740e2ad8f0d0be5b470bf7287579be90 100644 (file)
--- a/lib/common/ns.c
+++ b/lib/common/ns.c
@@ -384,7 +384,8 @@ static void rerank(node_t * v, int delta)
 /* e is the tree edge that is leaving and f is the nontree edge that
  * is entering.  compute new cut values, ranks, and exchange e and f.
  */
-void update(edge_t * e, edge_t * f)
+static void 
+update(edge_t * e, edge_t * f)
 {
     int cutvalue, delta;
     node_t *lca;

diff --git a/lib/common/renderprocs.h b/lib/common/renderprocs.h
index bf8d0c0dbff656f05cb2847b857d01a135707a4c..868ce396a830925dbdba67573f951fb6519f2cba 100644 (file)
--- a/lib/common/renderprocs.h
+++ b/lib/common/renderprocs.h
@@ -30,11 +30,8 @@ extern "C" {
     extern void arrow_gen(GVC_t * gvc, point p, point u, double scale,
                          int flag);
     extern double arrow_length(edge_t * e, int flag);
-    extern int arrowEndClip(inside_t * inside_context, point * ps,
-                           int startp, int endp, bezier * spl, int eflag);
-    extern int arrowStartClip(inside_t * inside_context, point * ps,
-                             int startp, int endp, bezier * spl,
-                             int sflag);
+    extern int arrowEndClip(edge_t*, point*, int, int , bezier*, int eflag);
+    extern int arrowStartClip(edge_t*, point* ps, int, int, bezier*, int sflag);
     extern void attach_attrs(Agraph_t *);
     extern void beginpath(path *, Agedge_t *, int, pathend_t *, boolean);
     extern pointf Bezier(pointf *, int, double, pointf *, pointf *);
@@ -152,9 +149,10 @@ extern "C" {
     extern point *routesplines(path *, int *);
     extern void routesplinesterm(void);
     extern char *safefile(char *shapefilename);
+    extern int selfRightSpace (edge_t* e);
     extern void setup_graph(GVC_t * gvc, graph_t * g);
     extern shape_kind shapeOf(node_t *);
-    extern void shape_clip(node_t * n, point curve[4], edge_t * e);
+    extern void shape_clip(node_t * n, point curve[4]);
     extern point spline_at_y(splines * spl, int y);
     extern void start_timer(void);
     extern double textwidth(textline_t * textline, char *fontname,
@@ -166,7 +164,6 @@ extern "C" {
     extern void UF_singleton(Agnode_t *);
     extern Agnode_t *UF_union(Agnode_t *, Agnode_t *);
     extern void undoClusterEdges(graph_t * g);
-    extern void update(edge_t * e, edge_t * f);
     extern void updateBB(graph_t * g, textlabel_t * lp);
     extern void use_library(char *);
     extern char *username(void);

diff --git a/lib/common/types.h b/lib/common/types.h
index 208001c69e27cc0b610b16745218decc6e6d2f12..48b50897dbf4f836e45b9b832e7143459e639e5a 100644 (file)
--- a/lib/common/types.h
+++ b/lib/common/types.h
@@ -55,11 +55,15 @@ extern "C" {
        pointf LL, UR;
     } boxf;
 
-    typedef struct inside_t {
-       pointf *p;
-       double *r;
-       node_t *n;
-       edge_t *e;
+    typedef union inside_t {
+       struct {
+           pointf* p;
+           double* r;
+       } a;
+       struct {
+           node_t* n;
+           box*    bp;
+       } s;
     } inside_t;
 
     typedef struct port {      /* internal edge endpoint specification */