X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=94e4c36dd030da0d24e43ca9b75fa8f7ad849d80;hb=fd812e6f288b19810fd7cd9b1460b804784b4093;hp=a544f7eade8b0433e287db084aa03c5b95e85fb5;hpb=8c4213f182478b88c8f830a16c1910d9c5a88e53;p=swftools.git

diff --git a/lib/devices/swf.c b/lib/devices/swf.c
index a544f7e..94e4c36 100644
--- a/lib/devices/swf.c
+++ b/lib/devices/swf.c
@@ -88,6 +88,7 @@ typedef struct _swfoutput_internal
     double config_caplinewidth;
     char* config_linktarget;
     char*config_internallinkfunction;
+    char*config_externallinkfunction;
 
     SWF* swf;
 
@@ -231,6 +232,7 @@ static swfoutput_internal* init_internal_struct()
     i->config_caplinewidth=1;
     i->config_linktarget=0;
     i->config_internallinkfunction=0;
+    i->config_externallinkfunction=0;
 
     i->config_linkcolor.r = i->config_linkcolor.g = i->config_linkcolor.b = 255;
     i->config_linkcolor.a = 0x40;
@@ -384,15 +386,18 @@ static void splineto(gfxdevice_t*dev, TAG*tag, plotxy_t control,plotxy_t end)
     i->swflastx += ex;
     i->swflasty += ey;
     
-    if(cx || cy || ex || ey) {
-	swf_ShapeSetCurve(tag, i->shape, cx,cy,ex,ey);
-	addPointToBBox(dev, lastlastx   ,lastlasty   );
-	addPointToBBox(dev, lastlastx+cx,lastlasty+cy);
-	addPointToBBox(dev, lastlastx+cx+ex,lastlasty+cy+ey);
-    }/* else if(!i->fill) {
-	// treat splines of length 0 as plots
-	plot(dev, lastlastx, lastlasty, tag);
-    }*/
+    if((cx || cy) && (ex || ey)) {
+        swf_ShapeSetCurve(tag, i->shape, cx,cy,ex,ey);
+        addPointToBBox(dev, lastlastx   ,lastlasty   );
+        addPointToBBox(dev, lastlastx+cx,lastlasty+cy);
+        addPointToBBox(dev, lastlastx+cx+ex,lastlasty+cy+ey);
+    } else if(cx || cy || ex || ey) {
+        swf_ShapeSetLine(tag, i->shape, cx+ex,cy+ey);
+        addPointToBBox(dev, lastlastx   ,lastlasty   );
+        addPointToBBox(dev, lastlastx+cx,lastlasty+cy);
+        addPointToBBox(dev, lastlastx+cx+ex,lastlasty+cy+ey);
+    }
+
     i->shapeisempty = 0;
 }
 
@@ -414,7 +419,7 @@ void resetdrawer(gfxdevice_t*dev)
 static void stopFill(gfxdevice_t*dev)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
-    if(i->lastwasfill)
+    if(i->lastwasfill!=0)
     {
 	swf_ShapeSetStyle(i->tag,i->shape,i->linestyleid,0x8000,0);
 	i->fillstylechanged = 1;
@@ -424,7 +429,7 @@ static void stopFill(gfxdevice_t*dev)
 static void startFill(gfxdevice_t*dev)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
-    if(!i->lastwasfill)
+    if(i->lastwasfill!=1)
     {
 	swf_ShapeSetStyle(i->tag,i->shape,0x8000,i->fillstyleid,0);
 	i->fillstylechanged = 1;
@@ -955,9 +960,10 @@ static void startshape(gfxdevice_t*dev)
     swf_SetShapeBits(i->tag,i->shape);
 
     /* TODO: do we really need this? */
-    swf_ShapeSetAll(i->tag,i->shape,/*x*/0,/*y*/0,i->linestyleid,0,0);
-    i->swflastx=i->swflasty=0;
-    i->lastwasfill = 0;
+    //swf_ShapeSetAll(i->tag,i->shape,/*x*/0,/*y*/0,i->linestyleid,0,0);
+    //swf_ShapeSetAll(i->tag,i->shape,/*x*/UNDEFINED_COORD,/*y*/UNDEFINED_COORD,i->linestyleid,0,0);
+    i->swflastx=i->swflasty=UNDEFINED_COORD;
+    i->lastwasfill = -1;
     i->shapeisempty = 1;
 }
 
@@ -1040,6 +1046,7 @@ void fixAreas(gfxdevice_t*dev)
 	if(i->linewidth==0) i->linewidth = 1;
 	
 	startshape(dev);
+	stopFill(dev);
 
 	moveto(dev, i->tag, r.xmin/20.0,r.ymin/20.0);
 	lineto(dev, i->tag, r.xmax/20.0,r.ymax/20.0);
@@ -1383,7 +1390,7 @@ void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, char*url)
 	    if(url[t]<'0' || url[t]>'9')
 		nodigit = 1;
 	if(!nodigit) {
-	    int page = atoi(&url[4]) - 1;
+	    int page = atoi(&url[4]);
 	    if(page<0) page = 0;
 	    swfoutput_linktopage(dev, page, points);
 	}
@@ -1393,20 +1400,25 @@ void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, char*url)
 }
 void swfoutput_linktourl(gfxdevice_t*dev, char*url, gfxline_t*points)
 {
-    ActionTAG* actions;
+    ActionTAG* actions = 0;
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
     if(i->shapeid>=0)
 	endshape(dev);
     if(i->textid>=0)
 	endtext(dev);
-   
-    if(!i->config_linktarget) {
+    
+    if(i->config_externallinkfunction) {
+	actions = action_PushString(actions, url); //parameter
+	actions = action_PushInt(actions, 1); //number of parameters (1)
+	actions = action_PushString(actions, i->config_externallinkfunction); //function name
+	actions = action_CallFunction(actions);
+    } else if(!i->config_linktarget) {
 	if(!i->config_opennewwindow)
-	  actions = action_GetUrl(0, url, "_parent");
+	  actions = action_GetUrl(actions, url, "_parent");
 	else
-	  actions = action_GetUrl(0, url, "_this");
+	  actions = action_GetUrl(actions, url, "_this");
     } else {
-	actions = action_GetUrl(0, url, i->config_linktarget);
+	actions = action_GetUrl(actions, url, i->config_linktarget);
     }
     actions = action_End(actions);
     
@@ -1423,13 +1435,14 @@ void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points)
 	endtext(dev);
   
     if(!i->config_internallinkfunction) {
-	actions = action_GotoFrame(actions, page);
+	actions = action_GotoFrame(actions, page-1);
 	actions = action_End(actions);
     } else {
 	actions = action_PushInt(actions, page); //parameter
 	actions = action_PushInt(actions, 1); //number of parameters (1)
 	actions = action_PushString(actions, i->config_internallinkfunction); //function name
 	actions = action_CallFunction(actions);
+	actions = action_End(actions);
     }
 
     drawlink(dev, actions, 0, points,0);
@@ -1457,12 +1470,14 @@ void swfoutput_namedlink(gfxdevice_t*dev, char*name, gfxline_t*points)
 	    actions1 = action_PushInt(0, 0); //number of parameters (0)
 	    actions1 = action_PushString(actions1, &tmp[5]); //function name
 	    actions1 = action_CallFunction(actions1);
+	    actions1 = action_End(actions1);
 	} else {
 	    *x = 0;
 	    actions1 = action_PushString(0, x+1); //parameter
 	    actions1 = action_PushInt(actions1, 1); //number of parameters (1)
 	    actions1 = action_PushString(actions1, &tmp[5]); //function name
 	    actions1 = action_CallFunction(actions1);
+	    actions1 = action_End(actions1);
 	}
 	actions2 = action_End(0);
 	mouseover = 0;
@@ -1714,6 +1729,8 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
 	i->config_bboxvars = atoi(value);
     } else if(!strcmp(name, "internallinkfunction")) {
 	i->config_internallinkfunction = strdup(value);
+    } else if(!strcmp(name, "externallinkfunction")) {
+	i->config_externallinkfunction = strdup(value);
     } else if(!strcmp(name, "disable_polygon_conversion")) {
 	i->config_disable_polygon_conversion = atoi(value);
     } else if(!strcmp(name, "insertstop")) {