X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=4bf636eb3c9e662729e4cb18dfba941ea812f21b;hp=4d75a1f8b341cdb4731184383ded0de3b71fca04;hb=e0a27e1bd83ff2d60745dd6030e0f5ef7ef97b82;hpb=ad7b3db9bccfeee0388da407558e5021a50a7d42 diff --git a/lib/devices/swf.c b/lib/devices/swf.c index 4d75a1f..4bf636e 100644 --- a/lib/devices/swf.c +++ b/lib/devices/swf.c @@ -40,9 +40,9 @@ #include "../rfxswf.h" #include "../gfxdevice.h" #include "../gfxtools.h" -#include "../art/libart.h" #include "swf.h" #include "../gfxpoly.h" +#include "../png.h" #define CHARDATAMAX 8192 #define CHARMIDX 0 @@ -76,14 +76,20 @@ typedef struct _swfoutput_internal double config_dumpfonts; double config_ppmsubpixels; double config_jpegsubpixels; + char hasbuttons; + int config_dots; + int config_simpleviewer; int config_opennewwindow; int config_ignoredraworder; int config_drawonlyshapes; + int config_frameresets; + int config_linknameurl; int config_jpegquality; int config_storeallcharacters; int config_enablezlib; int config_insertstoptag; int config_watermark; + int config_noclips; int config_flashversion; int config_reordertags; int config_showclipshapes; @@ -94,6 +100,7 @@ typedef struct _swfoutput_internal int config_bboxvars; int config_disable_polygon_conversion; int config_normalize_polygon_positions; + char config_disablelinks; RGBA config_linkcolor; float config_minlinewidth; double config_caplinewidth; @@ -113,6 +120,7 @@ typedef struct _swfoutput_internal TAG *tag; int currentswfid; + int startids; int depth; int startdepth; int linewidth; @@ -138,12 +146,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; @@ -155,6 +165,8 @@ typedef struct _swfoutput_internal int bboxrectpos; SRECT bboxrect; + SRECT pagebbox; + chardata_t chardata[CHARDATAMAX]; int chardatapos; int firstpage; @@ -227,6 +239,7 @@ static swfoutput_internal* init_internal_struct() i->firstpage = 1; i->pagefinished = 1; + i->config_disablelinks=0; i->config_dumpfonts=0; i->config_ppmsubpixels=0; i->config_jpegsubpixels=0; @@ -235,6 +248,7 @@ static swfoutput_internal* init_internal_struct() i->config_drawonlyshapes=0; i->config_jpegquality=85; i->config_storeallcharacters=0; + i->config_dots=1; i->config_enablezlib=0; i->config_insertstoptag=0; i->config_flashversion=6; @@ -251,6 +265,7 @@ static swfoutput_internal* init_internal_struct() i->config_internallinkfunction=0; i->config_externallinkfunction=0; i->config_reordertags=1; + i->config_linknameurl=0; i->config_linkcolor.r = i->config_linkcolor.g = i->config_linkcolor.b = 255; i->config_linkcolor.a = 0x40; @@ -277,7 +292,7 @@ static U16 getNewID(gfxdevice_t* dev) static U16 getNewDepth(gfxdevice_t* dev) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; - if(i->depth == 65535) { + if(i->depth == 65520) { if(!id_error) { msg(" Depth Table overflow"); msg(" This file is too complex to render- SWF only supports 65536 shapes at once"); @@ -299,12 +314,38 @@ typedef struct _plotxy double x,y; } plotxy_t; +static inline int twipsnap(double f) +{ + /* if(f < -0x40000000/20.0) { + fprintf(stderr, "Warning: Coordinate underflow (%f)\n", f); + f = -0x40000000/20.0; + } else if(f>0x3fffffff/20.0) { + fprintf(stderr, "Warning: Coordinate overflow (%f)\n", f); + f = 0x3fffffff/20.0; + }*/ + + /* clamp coordinates to a rectangle with the property that we + can represent a line from the upper left corner to the upper + right corner using no more than 64 strokes */ + const double min = -(1<<(18+4))/20.0; + const double max = ((1<<(18+4))-1)/20.0; + if(f < min) { + fprintf(stderr, "Warning: Coordinate underflow (%f)\n", f); + f = min; + } else if(f>max) { + fprintf(stderr, "Warning: Coordinate overflow (%f)\n", f); + f = max; + } + + return (int)(f*20); +} + // write a move-to command into the swf static int movetoxy(gfxdevice_t*dev, TAG*tag, plotxy_t p0) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; - int rx = (int)(p0.x*20); - int ry = (int)(p0.y*20); + int rx = twipsnap(p0.x); + int ry = twipsnap(p0.y); if(rx!=i->swflastx || ry!=i->swflasty || i->fillstylechanged) { swf_ShapeSetMove (tag, i->shape, rx,ry); i->fillstylechanged = 0; @@ -366,18 +407,24 @@ static void addPointToBBox(gfxdevice_t*dev, int px, int py) static void linetoxy(gfxdevice_t*dev, TAG*tag, plotxy_t p0) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; - int px = (int)(p0.x*20); - int py = (int)(p0.y*20); + int px = twipsnap(p0.x); + int py = twipsnap(p0.y); int rx = (px-i->swflastx); int ry = (py-i->swflasty); if(rx|ry) { swf_ShapeSetLine (tag, i->shape, rx,ry); addPointToBBox(dev, i->swflastx,i->swflasty); addPointToBBox(dev, px,py); - }/* else if(!i->fill) { + } /* this is a nice idea, but doesn't work with current flash + players (the pixel will be invisible if they're not + precisely on a pixel boundary) + Besides, we should only do this if this lineto itself + is again followed by a "move". + else if(!i->fill && i->config_dots) { // treat lines of length 0 as plots, making them // at least 1 twip wide so Flash will display them - plot(dev, i->swflastx, i->swflasty, tag); + //plot(dev, i->swflastx, i->swflasty, tag); + swf_ShapeSetLine (tag, i->shape, rx+1,ry); }*/ i->shapeisempty = 0; @@ -399,12 +446,12 @@ static void splineto(gfxdevice_t*dev, TAG*tag, plotxy_t control,plotxy_t end) int lastlastx = i->swflastx; int lastlasty = i->swflasty; - int cx = ((int)(control.x*20)-i->swflastx); - int cy = ((int)(control.y*20)-i->swflasty); + int cx = (twipsnap(control.x)-i->swflastx); + int cy = (twipsnap(control.y)-i->swflasty); i->swflastx += cx; i->swflasty += cy; - int ex = ((int)(end.x*20)-i->swflastx); - int ey = ((int)(end.y*20)-i->swflasty); + int ex = (twipsnap(end.x)-i->swflastx); + int ey = (twipsnap(end.y)-i->swflasty); i->swflastx += ex; i->swflasty += ey; @@ -703,7 +750,7 @@ static void endtext(gfxdevice_t*dev) SRECT r; r = getcharacterbbox(dev, i->swffont, &i->fontmatrix); - + r = swf_ClipRect(i->pagebbox, r); swf_SetRect(i->tag,&r); swf_SetMatrix(i->tag,&i->fontmatrix); @@ -864,11 +911,98 @@ static void endpage(gfxdevice_t*dev) i->pagefinished = 1; } +static void addViewer(gfxdevice_t* dev) +{ + swfoutput_internal*i = (swfoutput_internal*)dev->internal; + + SHAPE*s; + RGBA button_colors[3]= {{0xbf,0x00,0x00,0x80},{0xbf,0x20,0x20,0xc0}, {0xbf,0xc0,0xc0,0xff}}; + int ids[6]; + int button_sizex = 20; + int button_sizey = 20; + int t; + RGBA black = {255,0,0,0}; + for(t=0;t<6;t++) { + i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3); + swf_ShapeNew(&s); + int ls1 = swf_ShapeAddLineStyle(s,40,&black); + int fs1 = swf_ShapeAddSolidFillStyle(s,&button_colors[t/2]); + int shapeid = ids[t] = getNewID(dev); + swf_SetU16(i->tag,shapeid); + SRECT r; + r.xmin = -20*button_sizex; + r.xmax = 20*button_sizex; + r.ymin = 0; + r.ymax = 40*button_sizey; + swf_SetRect(i->tag,&r); // set shape bounds + swf_SetShapeHeader(i->tag,s); // write all styles to tag + swf_ShapeSetAll(i->tag,s,0*button_sizex,0,ls1,fs1,0); + swf_ShapeSetLine(i->tag,s,(1-(t&1)*2)*20*button_sizex,20*button_sizey); + swf_ShapeSetLine(i->tag,s,-(1-(t&1)*2)*20*button_sizex,20*button_sizey); + swf_ShapeSetLine(i->tag,s,0,-40*button_sizey); + swf_ShapeSetEnd(i->tag); // finish drawing + swf_ShapeFree(s); // clean shape structure (which isn't needed anymore after writing the tag) + } + ActionTAG*a1=0,*a2=0,*a3=0; + a1 = action_NextFrame(a1); + a1 = action_Stop(a1); + a1 = action_End(a1); + + a2 = action_PreviousFrame(a2); + a2 = action_Stop(a2); + a2 = action_End(a2); + + a3 = action_Stop(a3); + a3 = action_End(a3); + + i->tag = swf_InsertTag(i->tag, ST_DOACTION); + swf_ActionSet(i->tag,a3); + + i->tag = swf_InsertTag(i->tag,ST_DEFINEBUTTON); + int buttonid1 = getNewID(dev); + swf_SetU16(i->tag, buttonid1); + swf_ButtonSetRecord(i->tag,BS_UP|BS_HIT,ids[0],1,NULL,NULL); + swf_ButtonSetRecord(i->tag,BS_OVER,ids[2],1,NULL,NULL); + swf_ButtonSetRecord(i->tag,BS_DOWN,ids[4],1,NULL,NULL); + swf_SetU8(i->tag,0); // end of button records + swf_ActionSet(i->tag,a1); + + i->tag = swf_InsertTag(i->tag,ST_DEFINEBUTTON); + int buttonid2 = getNewID(dev); + swf_SetU16(i->tag, buttonid2); + swf_ButtonSetRecord(i->tag,BS_UP|BS_HIT,ids[1],1,NULL,NULL); + swf_ButtonSetRecord(i->tag,BS_OVER,ids[3],1,NULL,NULL); + swf_ButtonSetRecord(i->tag,BS_DOWN,ids[5],1,NULL,NULL); + swf_SetU8(i->tag,0); // end of button records + swf_ActionSet(i->tag,a2); + + i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); + MATRIX m; + swf_GetMatrix(0, &m); + m.tx = button_sizex*20+200; + swf_ObjectPlace(i->tag, buttonid2, 65534,&m,0,0); + i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); + m.tx = button_sizex*20+200+200; + swf_ObjectPlace(i->tag, buttonid1, 65535,&m,0,0); +} + + void swf_startframe(gfxdevice_t*dev, int width, int height) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; + if(i->firstpage) { + if(i->config_protect) { + i->tag = swf_InsertTag(i->tag, ST_PROTECT); + i->config_protect = 0; + } + if(i->config_simpleviewer) { + addViewer(dev); + } + } + if(!i->firstpage && !i->pagefinished) endpage(dev); + msg(" Starting new SWF page of size %dx%d", width, height); swf_GetMatrix(0, &i->page_matrix); @@ -880,17 +1014,17 @@ void swf_startframe(gfxdevice_t*dev, int width, int height) i->max_y = height; i->watermarks = 0; - /* set clipping/background rectangle */ - /* TODO: this should all be done in SWFOutputDev */ - //setBackground(dev, x1, y1, x2, y2); + /* create a bbox structure with the page size. This is used + for clipping shape and text bounding boxes. As we don't want to + generate bounding boxes which extend beyond the movie size (in + order to not confuse Flash), we clip everything against i->pagebbox */ + i->pagebbox.xmin = 0; + i->pagebbox.ymin = 0; + i->pagebbox.xmax = width*20; + i->pagebbox.ymax = height*20; /* increase SWF's bounding box */ - SRECT r; - r.xmin = 0; - r.ymin = 0; - r.xmax = width*20; - r.ymax = height*20; - swf_ExpandRect2(&i->swf->movieSize, &r); + swf_ExpandRect2(&i->swf->movieSize, &i->pagebbox); i->lastframeno = i->frameno; i->firstpage = 0; @@ -919,6 +1053,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) @@ -960,7 +1102,7 @@ void gfxdevice_swf_init(gfxdevice_t* dev) dev->name = "swf"; - dev->internal = init_internal_struct(); + dev->internal = init_internal_struct(); // set config to default values dev->startpage = swf_startframe; dev->endpage = swf_endframe; @@ -980,30 +1122,28 @@ void gfxdevice_swf_init(gfxdevice_t* dev) swfoutput_internal*i = (swfoutput_internal*)dev->internal; i->dev = dev; - RGBA rgb; - msg(" initializing swf output\n", i->max_x,i->max_y); i->swffont = 0; i->swf = (SWF*)rfx_calloc(sizeof(SWF)); - i->swf->fileVersion = i->config_flashversion; - i->swf->frameRate = i->config_framerate*0x100; + i->swf->fileVersion = 0; + i->swf->frameRate = 0x80; i->swf->movieSize.xmin = 0; i->swf->movieSize.ymin = 0; i->swf->movieSize.xmax = 0; i->swf->movieSize.ymax = 0; + i->swf->fileAttributes = 9; // as3, local-with-network i->swf->firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR); i->tag = i->swf->firstTag; + RGBA rgb; rgb.a = rgb.r = rgb.g = rgb.b = 0xff; - rgb.r = 0; + //rgb.r = 0; swf_SetRGB(i->tag,&rgb); i->startdepth = i->depth = 0; - - if(i->config_protect) - i->tag = swf_InsertTag(i->tag, ST_PROTECT); + i->startids = i->currentswfid = 0; } static void startshape(gfxdevice_t*dev) @@ -1034,11 +1174,7 @@ static void startshape(gfxdevice_t*dev) i->bboxrectpos = i->tag->len; /* changed later */ - r.xmin = 0; - r.ymin = 0; - r.xmax = 20*i->max_x; - r.ymax = 20*i->max_y; - swf_SetRect(i->tag,&r); + swf_SetRect(i->tag,&i->pagebbox); memset(&i->bboxrect, 0, sizeof(i->bboxrect)); @@ -1097,12 +1233,12 @@ void cancelshape(gfxdevice_t*dev) /* delete old shape tag */ TAG*todel = i->tag; i->tag = i->tag->prev; - swf_DeleteTag(todel); + swf_DeleteTag(0, todel); if(i->shape) {swf_ShapeFree(i->shape);i->shape=0;} i->shapeid = -1; i->bboxrectpos = -1; -// i->currentswfid--; // this was an *exceptionally* bad idea +// i->currentswfid--; // doesn't work, for some reason } void fixAreas(gfxdevice_t*dev) @@ -1188,7 +1324,8 @@ static void endshape(gfxdevice_t*dev) swf_ShapeSetEnd(i->tag); - changeRect(dev, i->tag, i->bboxrectpos, &i->bboxrect); + SRECT r = swf_ClipRect(i->pagebbox, i->bboxrect); + changeRect(dev, i->tag, i->bboxrectpos, &r); msg(" Placing shape ID %d", i->shapeid); @@ -1221,7 +1358,7 @@ void wipeSWF(SWF*swf) tag->id != ST_END && tag->id != ST_DOACTION && tag->id != ST_SHOWFRAME) { - swf_DeleteTag(tag); + swf_DeleteTag(swf, tag); } tag = next; } @@ -1234,6 +1371,9 @@ void swfoutput_finalize(gfxdevice_t*dev) if(i->tag && i->tag->id == ST_END) return; //already done + i->swf->fileVersion = i->config_flashversion; + i->swf->frameRate = i->config_framerate*0x100; + if(i->config_bboxvars) { TAG* tag = swf_InsertTag(i->swf->firstTag, ST_DOACTION); ActionTAG*a = 0; @@ -1282,6 +1422,7 @@ void swfoutput_finalize(gfxdevice_t*dev) iterator = iterator->next; } + i->tag = swf_InsertTag(i->tag,ST_END); TAG* tag = i->tag->prev; @@ -1289,7 +1430,7 @@ void swfoutput_finalize(gfxdevice_t*dev) and the ST_END- they confuse the flash player */ while(tag->id == ST_REMOVEOBJECT2) { TAG* prev = tag->prev; - swf_DeleteTag(tag); + swf_DeleteTag(i->swf, tag); tag = prev; } @@ -1300,9 +1441,11 @@ void swfoutput_finalize(gfxdevice_t*dev) i->swf->compressed = 1; } - /* Initialize AVM2 if it is a Flash9 file */ - if(i->config_flashversion>=9 && i->config_insertstoptag) { - AVM2_InsertStops(i->swf); + /* Add AVM2 actionscript */ + if(i->config_flashversion>=9 && + (i->config_insertstoptag || i->hasbuttons)) { + swf_AddButtonLinks(i->swf, i->config_insertstoptag, + i->config_internallinkfunction||i->config_externallinkfunction); } // if(i->config_reordertags) // swf_Optimize(i->swf); @@ -1335,17 +1478,17 @@ void* swfresult_get(gfxresult_t*gfx, const char*name) if(!strcmp(name, "swf")) { return (void*)swf_CopySWF(swf); } else if(!strcmp(name, "xmin")) { - return (void*)(swf->movieSize.xmin/20); + return (void*)(ptroff_t)(swf->movieSize.xmin/20); } else if(!strcmp(name, "ymin")) { - return (void*)(swf->movieSize.ymin/20); + return (void*)(ptroff_t)(swf->movieSize.ymin/20); } else if(!strcmp(name, "xmax")) { - return (void*)(swf->movieSize.xmax/20); + return (void*)(ptroff_t)(swf->movieSize.xmax/20); } else if(!strcmp(name, "ymax")) { - return (void*)(swf->movieSize.ymax/20); + return (void*)(ptroff_t)(swf->movieSize.ymax/20); } else if(!strcmp(name, "width")) { - return (void*)((swf->movieSize.xmax - swf->movieSize.xmin)/20); + return (void*)(ptroff_t)((swf->movieSize.xmax - swf->movieSize.xmin)/20); } else if(!strcmp(name, "height")) { - return (void*)((swf->movieSize.ymax - swf->movieSize.ymin)/20); + return (void*)(ptroff_t)((swf->movieSize.ymax - swf->movieSize.ymin)/20); } return 0; } @@ -1439,7 +1582,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); @@ -1454,6 +1597,9 @@ void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, const char*url) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; + if(i->config_disablelinks) + return; + if(!strncmp("http://pdf2swf:", url, 15)) { char*tmp = strdup(url); int l = strlen(tmp); @@ -1484,8 +1630,10 @@ void swfoutput_linktourl(gfxdevice_t*dev, const char*url, gfxline_t*points) endshape(dev); if(i->textid>=0) endtext(dev); + + /* TODO: escape special characters in url */ - if(i->config_externallinkfunction) { + if(i->config_externallinkfunction && i->config_flashversion<=8) { actions = action_PushString(actions, url); //parameter actions = action_PushInt(actions, 1); //number of parameters (1) actions = action_PushString(actions, i->config_externallinkfunction); //function name @@ -1499,8 +1647,10 @@ void swfoutput_linktourl(gfxdevice_t*dev, const char*url, gfxline_t*points) actions = action_GetUrl(actions, url, i->config_linktarget); } actions = action_End(actions); - - drawlink(dev, actions, 0, points,0); + + drawlink(dev, actions, 0, points, 0, url); + + swf_ActionFree(actions); } void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points) { @@ -1512,7 +1662,7 @@ void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points) if(i->textid>=0) endtext(dev); - if(!i->config_internallinkfunction) { + if(!i->config_internallinkfunction || i->config_flashversion>=9) { actions = action_GotoFrame(actions, page-1); actions = action_End(actions); } else { @@ -1523,7 +1673,12 @@ 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); + + swf_ActionFree(actions); } /* Named Links (a.k.a. Acrobatmenu) are used to implement various gadgets @@ -1573,19 +1728,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; @@ -1617,7 +1775,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; @@ -1630,6 +1788,8 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf double posy = 0; int buttonid = getNewID(dev); gfxbbox_t bbox = gfxline_getbbox(points); + + i->hasbuttons = 1; /* shape */ myshapeid = getNewID(dev); @@ -1642,14 +1802,16 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf r.ymin = (int)(bbox.ymin*20); r.xmax = (int)(bbox.xmax*20); r.ymax = (int)(bbox.ymax*20); + r = swf_ClipRect(i->pagebbox, r); swf_SetRect(i->tag,&r); swf_SetShapeStyles(i->tag,i->shape); swf_ShapeCountBits(i->shape,NULL,NULL); 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); + swf_ShapeFree(i->shape); /* shape2 */ myshapeid2 = getNewID(dev); @@ -1664,14 +1826,16 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf r.ymin = (int)(bbox.ymin*20); r.xmax = (int)(bbox.xmax*20); r.ymax = (int)(bbox.ymax*20); + r = swf_ClipRect(i->pagebbox, r); swf_SetRect(i->tag,&r); swf_SetShapeStyles(i->tag,i->shape); swf_ShapeCountBits(i->shape,NULL,NULL); 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); + swf_ShapeFree(i->shape); if(!mouseover) { @@ -1708,6 +1872,14 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf swf_ButtonPostProcess(i->tag, 1); } } + char buf[80]; + const char* name = 0; + if(i->config_linknameurl) { + name = url; + } else { + name = buf; + sprintf(buf, "button%d", buttonid); + } msg(" Placing link ID %d", buttonid); i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); @@ -1721,9 +1893,9 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf m = i->page_matrix; m.tx = p.x; m.ty = p.y; - swf_ObjectPlace(i->tag, buttonid, getNewDepth(dev),&m,0,0); + swf_ObjectPlace(i->tag, buttonid, getNewDepth(dev),&m,0,(U8*)name); } else { - swf_ObjectPlace(i->tag, buttonid, getNewDepth(dev),&i->page_matrix,0,0); + swf_ObjectPlace(i->tag, buttonid, getNewDepth(dev),&i->page_matrix,0,(U8*)name); } } @@ -1806,6 +1978,10 @@ 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, "dots")) { + i->config_dots = 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")) { @@ -1836,7 +2012,7 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) i->swf->fileVersion = i->config_flashversion; } } else if(!strcmp(name, "framerate")) { - i->config_framerate = atoi(value); + i->config_framerate = atof(value); if(i->swf) { i->swf->frameRate = i->config_framerate*0x100; } @@ -1846,10 +2022,16 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) i->config_caplinewidth = atof(value); } else if(!strcmp(name, "linktarget")) { i->config_linktarget = strdup(value); + } else if(!strcmp(name, "noclips")) { + i->config_noclips = atoi(value); } else if(!strcmp(name, "dumpfonts")) { i->config_dumpfonts = atoi(value); } else if(!strcmp(name, "animate")) { i->config_animate = atoi(value); + } else if(!strcmp(name, "disablelinks")) { + i->config_disablelinks = atoi(value); + } else if(!strcmp(name, "simpleviewer")) { + i->config_simpleviewer = atoi(value); } else if(!strcmp(name, "next_bitmap_is_jpeg")) { i->jpeg = 1; } else if(!strcmp(name, "jpegquality")) { @@ -1879,9 +2061,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= resolution adjustment for jpeg images\n"); printf("jpegsubpixels= resolution adjustment for jpeg images (same as jpegdpi, but in pixels)\n"); - printf("ppmdpi= resolution adjustment for lossless images\n"); printf("ppmsubpixels= shortcut for setting both jpegsubpixels and ppmsubpixels\n"); printf("drawonlyshapes convert everything to shapes (currently broken)\n"); @@ -1889,9 +2069,11 @@ 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==7)\n"); printf("bboxvars store the bounding box of the SWF file in actionscript variables\n"); + printf("dots Take care to handle dots correctly\n"); printf("reordertags=0/1 (default: 1) perform some tag optimizations\n"); printf("internallinkfunction= when the user clicks a internal link (to a different page) in the converted file, this actionscript function is called\n"); printf("externallinkfunction= when the user clicks an external link (e.g. http://www.foo.bar/) on the converted file, this actionscript function is called\n"); @@ -1900,9 +2082,13 @@ 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= the SWF fileversion (6)\n"); + printf("framerate= SWF framerate\n"); printf("minlinewidth= 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= set compression quality of jpeg images\n"); + printf("splinequality= Set the quality of spline convertion to value (0-100, default: 100).\n"); + printf("disablelinks Disable links.\n"); } else { return 0; } @@ -2014,6 +2200,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 { @@ -2080,13 +2267,14 @@ static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxm int fsid = swf_ShapeAddBitmapFillStyle(shape,&m,bitid,1); swf_SetU16(i->tag, myshapeid); SRECT r = gfxline_getSWFbbox(line); + r = swf_ClipRect(i->pagebbox, r); swf_SetRect(i->tag,&r); swf_SetShapeStyles(i->tag,shape); swf_ShapeCountBits(shape,NULL,NULL); 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); @@ -2111,12 +2299,13 @@ static void drawoutline(gfxdevice_t*dev, gfxline_t*line) swf_SetU16(i->tag,myshapeid); SRECT r = gfxline_getSWFbbox(line); + r = swf_ClipRect(i->pagebbox, r); swf_SetRect(i->tag,&r); swf_SetShapeStyles(i->tag,shape); 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); @@ -2127,6 +2316,8 @@ static void drawoutline(gfxdevice_t*dev, gfxline_t*line) static void swf_startclip(gfxdevice_t*dev, gfxline_t*line) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; + if(i->config_noclips) + return; endtext(dev); endshape(dev); @@ -2154,6 +2345,7 @@ static void swf_startclip(gfxdevice_t*dev, gfxline_t*line) } swf_SetU16(i->tag,myshapeid); SRECT r = gfxline_getSWFbbox(line); + r = swf_ClipRect(i->pagebbox, r); swf_SetRect(i->tag,&r); swf_SetShapeStyles(i->tag,shape); swf_ShapeCountBits(shape,NULL,NULL); @@ -2161,7 +2353,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; @@ -2192,6 +2384,8 @@ static void swf_startclip(gfxdevice_t*dev, gfxline_t*line) static void swf_endclip(gfxdevice_t*dev) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; + if(i->config_noclips) + return; if(i->textid>=0) endtext(dev); if(i->shapeid>=0) @@ -2340,22 +2534,24 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol /* TODO: * split line into segments, and perform this check for all segments */ - if(i->config_disable_polygon_conversion || type>=5 || + if(i->config_disable_polygon_conversion || /*type>=5 ||*/ (!has_dots && (width <= i->config_caplinewidth || (cap_style == gfx_capRound && joint_style == gfx_joinRound) - || (cap_style == gfx_capRound && type<=2)))) {} else + || (cap_style == gfx_capRound && type<=2)))) { + // ... + } else { /* convert line to polygon */ msg(" draw as polygon, type=%d dots=%d", type, has_dots); if(has_dots) gfxline_fix_short_edges(line); /* we need to convert the line into a polygon */ - gfxpoly_t* poly = gfxpoly_strokeToPoly(line, width, cap_style, joint_style, miterLimit); - gfxline_t*gfxline = gfxpoly_to_gfxline(poly); + gfxpoly_t* poly = gfxpoly_from_stroke(line, width, cap_style, joint_style, miterLimit, DEFAULT_GRID); + gfxline_t*gfxline = gfxline_from_gfxpoly(poly); dev->fill(dev, gfxline, color); gfxline_free(gfxline); - gfxpoly_free(poly); + gfxpoly_destroy(poly); return; } @@ -2378,7 +2574,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 @@ -2417,8 +2613,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) { @@ -2488,13 +2683,14 @@ static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*grad int fsid = swf_ShapeAddGradientFillStyle(shape,&m,swfgradient,type==gfxgradient_radial); swf_SetU16(i->tag, myshapeid); SRECT r = gfxline_getSWFbbox(line); + r = swf_ClipRect(i->pagebbox, r); swf_SetRect(i->tag,&r); swf_SetShapeStyles(i->tag,shape); swf_ShapeCountBits(shape,NULL,NULL); 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); @@ -2515,7 +2711,7 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id) swffont->version = 2; swffont->name = (U8*)strdup(id); swffont->layout = (SWFLAYOUT*)rfx_calloc(sizeof(SWFLAYOUT)); - swffont->layout->ascent = 0; /* ? */ + swffont->layout->ascent = 0; swffont->layout->descent = 0; swffont->layout->leading = 0; swffont->layout->bounds = (SRECT*)rfx_calloc(sizeof(SRECT)*font->num_glyphs); @@ -2529,10 +2725,11 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id) for(t=0;tmax_unicode;t++) { swffont->ascii2glyph[t] = font->unicode2glyph[t]; } + SRECT max = {0,0,0,0}; for(t=0;tnum_glyphs;t++) { drawer_t draw; gfxline_t*line; - int advance = 0; + double advance = 0; swffont->glyph2ascii[t] = font->glyphs[t].unicode; if(swffont->glyph2ascii[t] == 0xffff || swffont->glyph2ascii[t] == 0x0000) { /* flash 8 flashtype requires unique unicode IDs for each character. @@ -2546,7 +2743,7 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id) } else { swffont->glyphnames[t] = 0; } - advance = (int)(font->glyphs[t].advance); + advance = font->glyphs[t].advance; swf_Shape01DrawerInit(&draw, 0); line = font->glyphs[t].line; @@ -2565,17 +2762,16 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id) } draw.finish(&draw); swffont->glyph[t].shape = swf_ShapeDrawerToShape(&draw); - swffont->layout->bounds[t] = swf_ShapeDrawerGetBBox(&draw); - int xmax = swffont->layout->bounds[t].xmax / 20; - if(xmax>0 && xmax*2 < advance) { - printf("fix bad advance value: bbox=%d, advance=%d (%f)\n", xmax, advance, font->glyphs[t].advance); - advance = xmax; - } + SRECT bbox = swf_ShapeDrawerGetBBox(&draw); + swf_ExpandRect2(&max, &bbox); + + swffont->layout->bounds[t] = bbox; - if(advance<32768/20) { - swffont->glyph[t].advance = advance*20; + if(advance<32768.0/20) { + swffont->glyph[t].advance = (int)(advance*20); } else { + //msg(" Advance value overflow in glyph %d", t); swffont->glyph[t].advance = 32767; } @@ -2583,19 +2779,49 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id) swf_ExpandRect2(&bounds, &swffont->layout->bounds[t]); } - if(bounds.ymin < 0 && bounds.ymax > 0) { - swffont->layout->ascent = -bounds.ymin; - swffont->layout->descent = bounds.ymax; - swffont->layout->leading = bounds.ymax - bounds.ymin; - } else { - swffont->layout->ascent = (bounds.ymax - bounds.ymin)/2; - swffont->layout->descent = (bounds.ymax - bounds.ymin)/2; - swffont->layout->leading = bounds.ymax - bounds.ymin; + for(t=0;tnum_glyphs;t++) { + SRECT bbox = swffont->layout->bounds[t]; + + /* if the glyph doesn't have a bounding box, use the + combined bounding box (necessary e.g. for space characters) */ + if(!(bbox.xmin|bbox.ymin|bbox.xmax|bbox.ymax)) { + swffont->layout->bounds[t] = bbox = max; + } + + /* check that the advance value is reasonable, by comparing it + with the bounding box */ + if(bbox.xmax>0 && (bbox.xmax*10 < swffont->glyph[t].advance || !swffont->glyph[t].advance)) { + if(swffont->glyph[t].advance) + msg(" fix bad advance value for char %d: bbox=%.2f, advance=%.2f\n", t, bbox.xmax/20.0, swffont->glyph[t].advance/20.0); + swffont->glyph[t].advance = bbox.xmax; + } + //swffont->glyph[t].advance = bbox.xmax - bbox.xmin; } - swffont->layout->descent= (bounds.ymax - bounds.ymin); - swffont->layout->ascent = 0; + + + /* Flash player will use the advance value from the char, and the ascent/descent values + from the layout for text selection. + ascent will extend the char into negative y direction, from the baseline, while descent + will extend in positive y direction, also from the baseline. + The baseline is defined as the y-position zero + */ + + swffont->layout->ascent = -bounds.ymin; + if(swffont->layout->ascent < 0) + swffont->layout->ascent = 0; + swffont->layout->descent = bounds.ymax; + if(swffont->layout->descent < 0) + swffont->layout->descent = 0; swffont->layout->leading = bounds.ymax - bounds.ymin; + /* if the font has proper ascent/descent values (>0) and those define + greater line spacing that what we estimated from the bounding boxes, + use the font's parameters */ + if(font->ascent*20 > swffont->layout->ascent) + swffont->layout->ascent = font->ascent*20; + if(font->descent*20 > swffont->layout->descent) + swffont->layout->descent = font->descent*20; + return swffont; } @@ -2677,6 +2903,16 @@ static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t* msg(" swf_drawchar called (glyph %d) without font", glyph); return; } + + if(i->config_drawonlyshapes) { + gfxglyph_t*g = &font->glyphs[glyph]; + gfxline_t*line2 = gfxline_clone(g->line); + gfxline_transform(line2, matrix); + dev->fill(dev, line2, color); + gfxline_free(line2); + return; + } + if(!i->swffont || !i->swffont->name || strcmp((char*)i->swffont->name,font->id)) // not equal to current font { /* TODO: remove the need for this (enhance getcharacterbbox so that it can cope @@ -2722,6 +2958,9 @@ static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t* msg(" 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)