X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=1f34c1b8e9fa171e4bb1c829a09f8cd95e7f735e;hb=335418ff94a64e55ef693fd78075de2a285f6bbb;hp=4b3d536bc1061f17e6fa103e625e2d4044f8cf43;hpb=f446eb423e68ec1d93a431e2173741f9097059a9;p=swftools.git diff --git a/lib/devices/swf.c b/lib/devices/swf.c index 4b3d536..1f34c1b 100644 --- a/lib/devices/swf.c +++ b/lib/devices/swf.c @@ -76,6 +76,7 @@ typedef struct _swfoutput_internal double config_dumpfonts; double config_ppmsubpixels; double config_jpegsubpixels; + char hasbuttons; int config_simpleviewer; int config_opennewwindow; int config_ignoredraworder; @@ -259,7 +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_linknameurl=0; i->config_linkcolor.r = i->config_linkcolor.g = i->config_linkcolor.b = 255; i->config_linkcolor.a = 0x40; @@ -1402,9 +1403,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); @@ -1586,8 +1589,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 @@ -1614,7 +1619,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 { @@ -1738,6 +1743,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); @@ -1818,9 +1825,13 @@ 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); @@ -2657,7 +2668,7 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id) 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. @@ -2671,7 +2682,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; @@ -2696,9 +2707,10 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id) 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; } @@ -2717,11 +2729,12 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id) /* check that the advance value is reasonable, by comparing it with the bounding box */ - if(bbox.xmax>0 && (bbox.xmax*2 < swffont->glyph[t].advance || !swffont->glyph[t].advance)) { + 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: bbox=%.2f, advance=%.2f\n", bbox.xmax/20.0, swffont->glyph[t].advance/20.0); + 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; } @@ -2740,6 +2753,14 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id) 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; } @@ -2821,6 +2842,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