X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=b8aedcb041a594b306464fec8e235a82ceb3f1ae;hb=a9e315788f366e44b1e14dad849e24329859d62b;hp=9f1c224b056e5703ad549e178516b41fa70a9e7f;hpb=9b4b8074e77d175ec0e723ff3c69ca400c8dfc21;p=swftools.git

diff --git a/lib/devices/swf.c b/lib/devices/swf.c
index 9f1c224..b8aedcb 100644
--- a/lib/devices/swf.c
+++ b/lib/devices/swf.c
@@ -43,6 +43,7 @@
 #include "../art/libart.h"
 #include "swf.h"
 #include "../gfxpoly.h"
+#include "../png.h"
 
 #define CHARDATAMAX 8192
 #define CHARMIDX 0
@@ -80,6 +81,8 @@ typedef struct _swfoutput_internal
     int config_opennewwindow;
     int config_ignoredraworder;
     int config_drawonlyshapes;
+    int config_frameresets;
+    int config_linknameurl;
     int config_jpegquality;
     int config_storeallcharacters;
     int config_enablezlib;
@@ -114,6 +117,7 @@ typedef struct _swfoutput_internal
 
     TAG *tag;
     int currentswfid;
+    int startids;
     int depth;
     int startdepth;
     int linewidth;
@@ -139,12 +143,14 @@ typedef struct _swfoutput_internal
     int clippos;
 
     /* image cache */
+    /*
     int pic_xids[1024];
     int pic_yids[1024];
     int pic_ids[1024];
     int pic_width[1024];
     int pic_height[1024];
     int picpos;
+    */
 
     int frameno;
     int lastframeno;
@@ -254,6 +260,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;
@@ -1009,6 +1016,14 @@ void swf_endframe(gfxdevice_t*dev)
         swf_SetU16(i->tag,i->depth);
     }
     i->depth = i->startdepth;
+
+    if(i->config_frameresets) {
+	for(i->currentswfid;i->currentswfid>i->startids;i->currentswfid--) {
+	    i->tag = swf_InsertTag(i->tag,ST_FREECHARACTER);
+	    swf_SetU16(i->tag,i->currentswfid);
+	}
+	i->currentswfid = i->startids;
+    }
 }
 
 static void setBackground(gfxdevice_t*dev, int x1, int y1, int x2, int y2)
@@ -1090,6 +1105,7 @@ void gfxdevice_swf_init(gfxdevice_t* dev)
     swf_SetRGB(i->tag,&rgb);
 
     i->startdepth = i->depth = 0;
+    i->startids = i->currentswfid = 0;
 }
 
 static void startshape(gfxdevice_t*dev)
@@ -1526,7 +1542,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 +1603,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 +1626,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,7 +1679,7 @@ 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);
@@ -1707,7 +1726,7 @@ static void drawgfxline(gfxdevice_t*dev, gfxline_t*line, int fill)
 }
 
 
-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;
@@ -1800,8 +1819,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);
@@ -1900,6 +1921,8 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
 	i->config_enablezlib = atoi(value);
     } else if(!strcmp(name, "bboxvars")) {
 	i->config_bboxvars = atoi(value);
+    } else if(!strcmp(name, "frameresets")) {
+	i->config_frameresets = atoi(value);
     } else if(!strcmp(name, "showclipshapes")) {
 	i->config_showclipshapes = atoi(value);
     } else if(!strcmp(name, "reordertags")) {
@@ -1975,9 +1998,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");
@@ -1985,6 +2006,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");
@@ -1996,9 +2018,12 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
         printf("insertstop                  put an ActionScript \"STOP\" tag in every frame\n");
         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("framerate=<fps>		    SWF framerate\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");
+	printf("splinequality=<value>       Set the quality of spline convertion to value (0-100, default: 100).\n");
     } else {
 	return 0;
     }
@@ -2110,6 +2135,7 @@ static int add_image(swfoutput_internal*i, gfximage_t*img, int targetwidth, int
 
     if(cacheid<=0) {
 	bitid = getNewID(dev);
+
 	i->tag = swf_AddImage(i->tag, bitid, mem, sizex, sizey, i->config_jpegquality);
 	addImageToCache(dev, mem, sizex, sizey);
     } else {