From: ellson <devnull@localhost>
Date: Wed, 28 Jun 2006 18:24:57 +0000 (+0000)
Subject: retain parallel edges after visit/select/etc in -Txlib
X-Git-Tag: LAST_LIBGRAPH~32^2~6210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38024ae433bbb12fde1c80bb4c328f1734fa3b87;p=graphviz

retain parallel edges after visit/select/etc in -Txlib
---

diff --git a/lib/common/emit.c b/lib/common/emit.c
index 72cfa66f3..899784f10 100644
--- a/lib/common/emit.c
+++ b/lib/common/emit.c
@@ -760,6 +760,33 @@ static bool edge_in_view(GVJ_t *job, edge_t * e)
 }
 #endif
 
+/* edges colors can be mutiple colors separated by ":"
+ * so we commpute a default pencolor with the same number of colors. */
+static char* default_pencolor(char *pencolor, char *deflt)
+{
+    static char *buf;
+    static int bufsz;
+    char *p;
+    int len, ncol;
+
+    ncol = 1;
+    for (p = pencolor; *p; p++) {
+	if (*p == ':')
+	    ncol++;
+    }
+    len = ncol * (strlen(deflt) + 1);
+    if (bufsz < len) {
+	bufsz = len + 10;
+	buf = realloc(buf, bufsz);
+    }
+    strcpy(buf, deflt);
+    while(--ncol) {
+	strcat(buf, ":");
+	strcat(buf, deflt);
+    }
+    return buf;
+}
+
 void emit_edge_graphics(GVJ_t * job, edge_t * e)
 {
     int i, j, cnum, numc = 0;
@@ -812,19 +839,23 @@ void emit_edge_graphics(GVJ_t * job, edge_t * e)
 
 	fillcolor = pencolor = color;
 	if (ED_gui_state(e) & GUI_STATE_ACTIVE) {
-	    pencolor = late_nnstring(e, E_activepencolor, DEFAULT_ACTIVEPENCOLOR);
+	    pencolor = late_nnstring(e, E_activepencolor,
+			default_pencolor(pencolor, DEFAULT_ACTIVEPENCOLOR));
 	    fillcolor = late_nnstring(e, E_activefillcolor, DEFAULT_ACTIVEFILLCOLOR);
 	}
 	else if (ED_gui_state(e) & GUI_STATE_SELECTED) {
-	    pencolor = late_nnstring(e, E_selectedpencolor, DEFAULT_SELECTEDPENCOLOR);
+	    pencolor = late_nnstring(e, E_selectedpencolor,
+			default_pencolor(pencolor, DEFAULT_SELECTEDPENCOLOR));
 	    fillcolor = late_nnstring(e, E_selectedfillcolor, DEFAULT_SELECTEDFILLCOLOR);
 	}
 	else if (ED_gui_state(e) & GUI_STATE_DELETED) {
-	    pencolor = late_nnstring(e, E_deletedpencolor, DEFAULT_DELETEDPENCOLOR);
+	    pencolor = late_nnstring(e, E_deletedpencolor,
+			default_pencolor(pencolor, DEFAULT_DELETEDPENCOLOR));
 	    fillcolor = late_nnstring(e, E_deletedfillcolor, DEFAULT_DELETEDFILLCOLOR);
 	}
 	else if (ED_gui_state(e) & GUI_STATE_VISITED) {
-	    pencolor = late_nnstring(e, E_visitedpencolor, DEFAULT_VISITEDPENCOLOR);
+	    pencolor = late_nnstring(e, E_visitedpencolor,
+			default_pencolor(pencolor, DEFAULT_VISITEDPENCOLOR));
 	    fillcolor = late_nnstring(e, E_visitedfillcolor, DEFAULT_VISITEDFILLCOLOR);
 	}
 	if (pencolor != color)