X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=6f13c8587a27e7c9c9a211264e23f7a019d0bfc4;hb=2d6b059015286bebf17b333ef8faa2a59606fbbf;hp=40febb17d2e75fe49726187b6359e68240fe8588;hpb=7bf948531c2ee33d6dbadeca057c1dcbab500972;p=swftools.git

diff --git a/lib/devices/swf.c b/lib/devices/swf.c
index 40febb1..6f13c85 100644
--- a/lib/devices/swf.c
+++ b/lib/devices/swf.c
@@ -80,6 +80,7 @@ typedef struct _swfoutput_internal
     int config_opennewwindow;
     int config_ignoredraworder;
     int config_drawonlyshapes;
+    int config_linknameurl;
     int config_jpegquality;
     int config_storeallcharacters;
     int config_enablezlib;
@@ -254,6 +255,7 @@ static swfoutput_internal* init_internal_struct()
     i->config_internallinkfunction=0;
     i->config_externallinkfunction=0;
     i->config_reordertags=1;
+    i->config_linknameurl=1;
 
     i->config_linkcolor.r = i->config_linkcolor.g = i->config_linkcolor.b = 255;
     i->config_linkcolor.a = 0x40;
@@ -1526,7 +1528,7 @@ static void swfoutput_setlinewidth(gfxdevice_t*dev, double _linewidth)
 }
 
 
-static void drawlink(gfxdevice_t*dev, ActionTAG*,ActionTAG*, gfxline_t*points, char mouseover);
+static void drawlink(gfxdevice_t*dev, ActionTAG*,ActionTAG*, gfxline_t*points, char mouseover, const char*url);
 static void swfoutput_namedlink(gfxdevice_t*dev, char*name, gfxline_t*points);
 static void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points);
 static void swfoutput_linktourl(gfxdevice_t*dev, const char*url, gfxline_t*points);
@@ -1587,7 +1589,7 @@ void swfoutput_linktourl(gfxdevice_t*dev, const char*url, gfxline_t*points)
     }
     actions = action_End(actions);
    
-    drawlink(dev, actions, 0, points, 0);
+    drawlink(dev, actions, 0, points, 0, url);
 }
 void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points)
 {
@@ -1610,7 +1612,10 @@ void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points)
 	actions = action_End(actions);
     }
 
-    drawlink(dev, actions, 0, points, 0);
+    char name[80];
+    sprintf(name, "page%d", page);
+
+    drawlink(dev, actions, 0, points, 0, name);
 }
 
 /* Named Links (a.k.a. Acrobatmenu) are used to implement various gadgets
@@ -1660,19 +1665,22 @@ void swfoutput_namedlink(gfxdevice_t*dev, char*name, gfxline_t*points)
 	actions2 = action_End(actions2);
     }
 
-    drawlink(dev, actions1, actions2, points, mouseover);
+    drawlink(dev, actions1, actions2, points, mouseover, name);
 
     swf_ActionFree(actions1);
     swf_ActionFree(actions2);
     free(tmp);
 }
 
-static void drawgfxline(gfxdevice_t*dev, gfxline_t*line)
+static void drawgfxline(gfxdevice_t*dev, gfxline_t*line, int fill)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
     gfxcoord_t lastx=0,lasty=0,px=0,py=0;
     char lastwasmoveto;
     int lines= 0, splines=0;
+
+    i->fill = fill;
+
     while(1) {
 	if(!line)
 	    break;
@@ -1704,7 +1712,7 @@ static void drawgfxline(gfxdevice_t*dev, gfxline_t*line)
 }
 
 
-static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gfxline_t*points, char mouseover)
+static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gfxline_t*points, char mouseover, const char*url)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
     RGBA rgb;
@@ -1736,7 +1744,7 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf
     swf_SetShapeBits(i->tag,i->shape);
     swf_ShapeSetAll(i->tag,i->shape,/*x*/0,/*y*/0,0,fsid,0);
     i->swflastx = i->swflasty = 0;
-    drawgfxline(dev, points);
+    drawgfxline(dev, points, 1);
     swf_ShapeSetEnd(i->tag);
 
     /* shape2 */
@@ -1759,7 +1767,7 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf
     swf_SetShapeBits(i->tag,i->shape);
     swf_ShapeSetAll(i->tag,i->shape,/*x*/0,/*y*/0,0,fsid,0);
     i->swflastx = i->swflasty = 0;
-    drawgfxline(dev, points);
+    drawgfxline(dev, points, 1);
     swf_ShapeSetEnd(i->tag);
 
     if(!mouseover)
@@ -1797,8 +1805,10 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf
             swf_ButtonPostProcess(i->tag, 1);
 	}
     }
-    char name[80];
-    sprintf(name, "link%d", buttonid);
+    const char* name = 0;
+    if(i->config_linknameurl) {
+	name = url;
+    }
     
     msg("<trace> Placing link ID %d", buttonid);
     i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
@@ -1972,9 +1982,7 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
 	i->config_linkcolor.a = NIBBLE(value[6])<<4 | NIBBLE(value[7]);
     } else if(!strcmp(name, "help")) {
 	printf("\nSWF layer options:\n");
-	printf("jpegdpi=<dpi>               resolution adjustment for jpeg images\n");
         printf("jpegsubpixels=<pixels>      resolution adjustment for jpeg images (same as jpegdpi, but in pixels)\n");
-        printf("ppmdpi=<dpi>                resolution adjustment for lossless images\n");
         printf("ppmsubpixels=<pixels        resolution adjustment for  lossless images (same as ppmdpi, but in pixels)\n");
         printf("subpixels=<pixels>          shortcut for setting both jpegsubpixels and ppmsubpixels\n");
         printf("drawonlyshapes              convert everything to shapes (currently broken)\n");
@@ -1982,6 +1990,7 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
         printf("linksopennewwindow          make links open a new browser window\n");
         printf("linktarget                  target window name of new links\n");
         printf("linkcolor=<color)           color of links (format: RRGGBBAA)\n");
+        printf("linknameurl		    Link buttons will be named like the URL they refer to (handy for iterating through links with actionscript)\n");
         printf("storeallcharacters          don't reduce the fonts to used characters in the output file\n");
         printf("enablezlib                  switch on zlib compression (also done if flashversion>=7)\n");
         printf("bboxvars                    store the bounding box of the SWF file in actionscript variables\n");
@@ -1994,6 +2003,7 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
         printf("protect                     add a \"protect\" tag to the file, to prevent loading in the Flash editor\n");
         printf("flashversion=<version>      the SWF fileversion (6)\n");
         printf("minlinewidth=<width>        convert horizontal/vertical boxes smaller than this width to lines (0.05) \n");
+        printf("simpleviewer                Add next/previous buttons to the SWF\n");
         printf("animate                     insert a showframe tag after each placeobject (animate draw order of PDF files)\n");
         printf("jpegquality=<quality>       set compression quality of jpeg images\n");
     } else {
@@ -2180,7 +2190,7 @@ static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxm
     swf_SetShapeBits(i->tag,shape);
     swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,0,fsid,0);
     i->swflastx = i->swflasty = UNDEFINED_COORD;
-    drawgfxline(dev, line);
+    drawgfxline(dev, line, 1);
     swf_ShapeSetEnd(i->tag);
     swf_ShapeFree(shape);
 
@@ -2211,7 +2221,7 @@ static void drawoutline(gfxdevice_t*dev, gfxline_t*line)
     swf_ShapeCountBits(shape,NULL,NULL);
     swf_SetShapeBits(i->tag,shape);
     swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,lsid,0,0);
-    drawgfxline(dev, line);
+    drawgfxline(dev, line, 1);
     swf_ShapeSetEnd(i->tag);
     swf_ShapeFree(shape);
 	
@@ -2257,7 +2267,7 @@ static void swf_startclip(gfxdevice_t*dev, gfxline_t*line)
     swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,0,fsid,0);
     i->swflastx = i->swflasty = UNDEFINED_COORD;
     i->shapeisempty = 1;
-    drawgfxline(dev, line);
+    drawgfxline(dev, line, 1);
     if(i->shapeisempty) {
 	/* an empty clip shape is equivalent to a shape with no area */
 	int x = line?line->x:0;
@@ -2474,7 +2484,7 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol
     swfoutput_setlinewidth(dev, width);
     startshape(dev);
     stopFill(dev);
-    drawgfxline(dev, line);
+    drawgfxline(dev, line, 0);
 
     if(i->config_normalize_polygon_positions) {
 	free(line); //account for _move
@@ -2513,8 +2523,7 @@ static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color)
     swfoutput_setfillcolor(dev, color->r, color->g, color->b, color->a);
     startshape(dev);
     startFill(dev);
-    i->fill=1;
-    drawgfxline(dev, line);
+    drawgfxline(dev, line, 1);
     
     if(i->currentswfid==2 && r.xmin==0 && r.ymin==0 && r.xmax==i->max_x && r.ymax==i->max_y) {
 	if(i->config_watermark) {
@@ -2591,7 +2600,7 @@ static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*grad
     swf_SetShapeBits(i->tag,shape);
     swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,0,fsid,0);
     i->swflastx = i->swflasty = UNDEFINED_COORD;
-    drawgfxline(dev, line);
+    drawgfxline(dev, line, 1);
     swf_ShapeSetEnd(i->tag);
     swf_ShapeFree(shape);
 
@@ -2823,6 +2832,9 @@ static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t*
 	msg("<verbose> Moving character origin to %f %f\n", matrix->tx, matrix->ty);
 	endtext(dev);
 	setfontscale(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11, matrix->tx, matrix->ty, 1);
+        /* since we just moved the char origin to the current char's position, 
+           it now has the relative position (0,0) */
+        x = y = 0;
     }
     
     if(i->shapeid>=0)