X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=087433b8db33516e1d45b35a7a86f9ccae585e75;hb=93c1adc4ecb8a095a5bde78cee7c640b4acf4964;hp=87e9f0255c864ff465ca936c41f5ef920e76c5c5;hpb=23da1a9feaa8378d29ebbceb9e72c981ee23f5f2;p=swftools.git diff --git a/lib/devices/swf.c b/lib/devices/swf.c index 87e9f02..087433b 100644 --- a/lib/devices/swf.c +++ b/lib/devices/swf.c @@ -23,19 +23,26 @@ #include #include "../../config.h" #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_IO_H +#include +#endif #ifdef HAVE_ASSERT_H #include #else #define assert(a) #endif #include +#include "../mem.h" #include "../log.h" #include "../rfxswf.h" #include "../gfxdevice.h" #include "../gfxtools.h" #include "../art/libart.h" -#include "artsutils.c" +#include "swf.h" +#include "../gfxpoly.h" #define CHARDATAMAX 8192 #define CHARMIDX 0 @@ -74,22 +81,27 @@ typedef struct _swfoutput_internal int config_drawonlyshapes; int config_jpegquality; int config_storeallcharacters; - int config_generate_fake_tags; int config_enablezlib; int config_insertstoptag; + int config_watermark; int config_flashversion; + int config_reordertags; + int config_showclipshapes; int config_splinemaxerror; int config_fontsplinemaxerror; int config_filloverlap; int config_protect; int config_bboxvars; int config_disable_polygon_conversion; + int config_normalize_polygon_positions; RGBA config_linkcolor; float config_minlinewidth; double config_caplinewidth; char* config_linktarget; char*config_internallinkfunction; char*config_externallinkfunction; + char config_animate; + double config_framerate; SWF* swf; @@ -108,6 +120,8 @@ typedef struct _swfoutput_internal SHAPE* shape; int shapeid; int textid; + + int watermarks; int fillstyleid; int linestyleid; @@ -141,6 +155,8 @@ typedef struct _swfoutput_internal int bboxrectpos; SRECT bboxrect; + SRECT pagebbox; + chardata_t chardata[CHARDATAMAX]; int chardatapos; int firstpage; @@ -148,8 +164,9 @@ typedef struct _swfoutput_internal char overflow; + int current_font_size; MATRIX fontmatrix; - double fontm11,fontm12,fontm21,fontm22; + double lastfontm11,lastfontm12,lastfontm21,lastfontm22; SWFFONT *swffont; RGBA strokergb; RGBA fillrgb; @@ -173,7 +190,7 @@ static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxm static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix); static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix); static void swf_addfont(gfxdevice_t*dev, gfxfont_t*font); -static void swf_drawlink(gfxdevice_t*dev, gfxline_t*line, char*action); +static void swf_drawlink(gfxdevice_t*dev, gfxline_t*line, const char*action); static void swf_startframe(gfxdevice_t*dev, int width, int height); static void swf_endframe(gfxdevice_t*dev); static gfxresult_t* swf_finish(gfxdevice_t*driver); @@ -221,19 +238,21 @@ static swfoutput_internal* init_internal_struct() i->config_jpegquality=85; i->config_storeallcharacters=0; i->config_enablezlib=0; - i->config_generate_fake_tags=0; i->config_insertstoptag=0; i->config_flashversion=6; + i->config_framerate=0.25; i->config_splinemaxerror=1; i->config_fontsplinemaxerror=1; i->config_filloverlap=0; i->config_protect=0; i->config_bboxvars=0; + i->config_showclipshapes=0; i->config_minlinewidth=0.05; i->config_caplinewidth=1; i->config_linktarget=0; i->config_internallinkfunction=0; i->config_externallinkfunction=0; + i->config_reordertags=1; i->config_linkcolor.r = i->config_linkcolor.g = i->config_linkcolor.b = 255; i->config_linkcolor.a = 0x40; @@ -673,50 +692,7 @@ static void putcharacter(gfxdevice_t*dev, int fontid, int charid, int x,int y, i /* Notice: we can only put chars in the range -1639,1638 (-32768/20,32768/20). So if we set this value to high, the char coordinates will overflow. If we set it to low, however, the char positions will be inaccurate */ -#define FONT_INTERNAL_SIZE 4 - -/* process a character. */ -static int drawchar(gfxdevice_t*dev, SWFFONT *swffont, int charid, swfmatrix_t*m, gfxcolor_t*col) -{ - swfoutput_internal*i = (swfoutput_internal*)dev->internal; - if(!swffont) { - msg(" Font is NULL"); - return 0; - } - - if(charid<0 || charid>=swffont->numchars) { - msg(" No character %d in font %s ", charid, FIXNULL((char*)swffont->name)); - return 0; - } - /*if(swffont->glyph[charid].shape->bitlen <= 16) { - msg(" Glyph %d in current charset (%s, %d characters) is empty", - charid, FIXNULL((char*)swffont->name), swffont->numchars); - return 1; - }*/ - - if(i->shapeid>=0) - endshape(dev); - if(i->textid<0) - starttext(dev); - - float x = m->m31; - float y = m->m32; - float det = ((m->m11*m->m22)-(m->m21*m->m12)); - if(fabs(det) < 0.0005) { - /* x direction equals y direction- the text is invisible */ - return 1; - } - det = 20*FONT_INTERNAL_SIZE / det; - - SPOINT p; - p.x = (SCOORD)(( x * m->m22 - y * m->m12)*det); - p.y = (SCOORD)((- x * m->m21 + y * m->m11)*det); - - RGBA rgba = *(RGBA*)col; - putcharacter(dev, swffont->id, charid,p.x,p.y,FONT_INTERNAL_SIZE, rgba); - swf_FontUseGlyph(swffont, charid); - return 1; -} +#define GLYPH_SCALE 1 static void endtext(gfxdevice_t*dev) { @@ -724,12 +700,12 @@ static void endtext(gfxdevice_t*dev) if(i->textid<0) return; - i->tag = swf_InsertTag(i->tag,ST_DEFINETEXT); + i->tag = swf_InsertTag(i->tag,ST_DEFINETEXT2); swf_SetU16(i->tag, i->textid); 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); @@ -738,50 +714,155 @@ static void endtext(gfxdevice_t*dev) putcharacters(dev, i->tag); swf_SetU8(i->tag,0); - i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); + if(i->swf->fileVersion >= 8) { + i->tag = swf_InsertTag(i->tag, ST_CSMTEXTSETTINGS); + swf_SetU16(i->tag, i->textid); + + //swf_SetU8(i->tag, /*subpixel grid*/(2<<3)|/*flashtype*/0x40); + swf_SetU8(i->tag, /*grid*/(1<<3)|/*flashtype*/0x40); + //swf_SetU8(i->tag, /*no grid*/(0<<3)|/*flashtype*/0x40); + + swf_SetU32(i->tag, 0);//thickness + swf_SetU32(i->tag, 0);//sharpness + swf_SetU8(i->tag, 0);//reserved + } + i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); + swf_ObjectPlace(i->tag,i->textid,getNewDepth(dev),&i->page_matrix,NULL,NULL); i->textid = -1; } /* set's the matrix which is to be applied to characters drawn by swfoutput_drawchar() */ -static void swfoutput_setfontmatrix(gfxdevice_t*dev,double m11,double m21, - double m12,double m22) +static void setfontscale(gfxdevice_t*dev,double m11,double m12, double m21,double m22,double x, double y, char force) { m11 *= 1024; m12 *= 1024; m21 *= 1024; m22 *= 1024; swfoutput_internal*i = (swfoutput_internal*)dev->internal; - if(i->fontm11 == m11 && - i->fontm12 == m12 && - i->fontm21 == m21 && - i->fontm22 == m22) + if(i->lastfontm11 == m11 && + i->lastfontm12 == m12 && + i->lastfontm21 == m21 && + i->lastfontm22 == m22 && !force) return; if(i->textid>=0) endtext(dev); - i->fontm11 = m11; - i->fontm12 = m12; - i->fontm21 = m21; - i->fontm22 = m22; + i->lastfontm11 = m11; + i->lastfontm12 = m12; + i->lastfontm21 = m21; + i->lastfontm22 = m22; + + double xsize = sqrt(m11*m11 + m12*m12); + double ysize = sqrt(m21*m21 + m22*m22); + i->current_font_size = (xsize>ysize?xsize:ysize)*1; + if(i->current_font_size < 1) + i->current_font_size = 1; + double ifs = 1.0 / (i->current_font_size*GLYPH_SCALE); + MATRIX m; - m.sx = (U32)(((i->fontm11)*65536)/FONT_INTERNAL_SIZE); m.r1 = (U32)(((i->fontm12)*65536)/FONT_INTERNAL_SIZE); - m.r0 = (U32)(((i->fontm21)*65536)/FONT_INTERNAL_SIZE); m.sy = (U32)(((i->fontm22)*65536)/FONT_INTERNAL_SIZE); - m.tx = 0; - m.ty = 0; + m.sx = (S32)((m11*ifs)*65536); m.r1 = (S32)((m21*ifs)*65536); + m.r0 = (S32)((m12*ifs)*65536); m.sy = (S32)((m22*ifs)*65536); + /* this is the position of the first char to set a new fontmatrix- + we hope that it's close enough to all other characters using the + font, so we use its position as origin for the matrix */ + m.tx = x*20; + m.ty = y*20; i->fontmatrix = m; } +static int watermark2_width=47; +static int watermark2_height=11; +static int watermark2[47] = {95,1989,71,0,2015,337,1678,0,2015,5,1921,320,1938,25,2006,1024, + 1042,21,13,960,1039,976,8,2000,1359,1088,31,1989,321,1728,0,1152, + 1344,832,0,1984,0,896,1088,1088,896,0,1984,128,256,512,1984}; + +static void draw_watermark(gfxdevice_t*dev, gfxbbox_t r, char drawall) +{ + swfoutput_internal*i = (swfoutput_internal*)dev->internal; + double wx = r.xmax / 5.0; + double tx = r.xmax*4.0 / 5.0; + double ty = r.ymax-wx*watermark2_height/watermark2_width; + double sx = (r.xmax - tx) / watermark2_width; + double sy = (r.ymax - ty) / watermark2_height; + double px = sx-0.5; + double py = sy-0.5; + if(ty > 0 && px > 1.0 && py > 1.0) { + int x,y; + for(y=0;y>y)&1)) { + if(!drawall && rand()%5) + continue; + unsigned int b = rand(); + moveto(dev, i->tag, x*sx+tx+((b>>1)&1)/20.0, y*sy+ty+((b>>3)&1)/20.0); + lineto(dev, i->tag, x*sx+px+tx+((b>>2)&1)/20.0, y*sy+ty+((b>>3)&1)/20.0); + lineto(dev, i->tag, x*sx+px+tx+((b>>2)&1)/20.0, y*sy+py+ty+((b>>4)&1)/20.0); + lineto(dev, i->tag, x*sx+tx+((b>>1)&1)/20.0, y*sy+py+ty+((b>>4)&1)/20.0); + lineto(dev, i->tag, x*sx+tx+((b>>1)&1)/20.0, y*sy+ty+((b>>3)&1)/20.0); + } + } + } +} + +static void swfoutput_setfillcolor(gfxdevice_t* dev, U8 r, U8 g, U8 b, U8 a) +{ + swfoutput_internal*i = (swfoutput_internal*)dev->internal; + if(i->fillrgb.r == r && + i->fillrgb.g == g && + i->fillrgb.b == b && + i->fillrgb.a == a) return; + if(i->shapeid>=0) + endshape(dev); + + i->fillrgb.r = r; + i->fillrgb.g = g; + i->fillrgb.b = b; + i->fillrgb.a = a; +} +static void insert_watermark(gfxdevice_t*dev, char drawall) +{ + swfoutput_internal*i = (swfoutput_internal*)dev->internal; + if(!drawall && i->watermarks>20) + return; + endshape(dev); + endtext(dev); + + if(drawall) { + swfoutput_setfillcolor(dev, 0,0,255,192); + } else { + swfoutput_setfillcolor(dev, rand(),rand(),rand(),(rand()&127)+128); + } + startshape(dev); + startFill(dev); + + gfxbbox_t r; r.xmin = r.ymin = 0; + r.xmax = i->max_x; + r.ymax = i->max_y; + draw_watermark(dev, r, drawall); + endshape(dev); + i->watermarks++; +} + + static void endpage(gfxdevice_t*dev) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; + if(i->pagefinished) + return; if(i->shapeid>=0) endshape(dev); if(i->textid>=0) endtext(dev); + while(i->clippos) dev->endclip(dev); + + if(i->config_watermark) { + insert_watermark(dev, 1); + } + i->pagefinished = 1; } @@ -799,18 +880,19 @@ void swf_startframe(gfxdevice_t*dev, int width, int height) i->min_y = 0; i->max_x = width; 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; @@ -824,7 +906,7 @@ void swf_endframe(gfxdevice_t*dev) if(!i->pagefinished) endpage(dev); - if(i->config_insertstoptag) { + if( (i->swf->fileVersion <= 8) && (i->config_insertstoptag) ) { ActionTAG*atag=0; atag = action_Stop(atag); atag = action_End(atag); @@ -900,7 +982,6 @@ void gfxdevice_swf_init(gfxdevice_t* dev) swfoutput_internal*i = (swfoutput_internal*)dev->internal; i->dev = dev; - SRECT r; RGBA rgb; msg(" initializing swf output\n", i->max_x,i->max_y); @@ -909,7 +990,7 @@ void gfxdevice_swf_init(gfxdevice_t* dev) i->swf = (SWF*)rfx_calloc(sizeof(SWF)); i->swf->fileVersion = i->config_flashversion; - i->swf->frameRate = 0x0040; // 1 frame per 4 seconds + i->swf->frameRate = i->config_framerate*0x100; i->swf->movieSize.xmin = 0; i->swf->movieSize.ymin = 0; i->swf->movieSize.xmax = 0; @@ -918,6 +999,7 @@ void gfxdevice_swf_init(gfxdevice_t* dev) i->swf->firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR); i->tag = i->swf->firstTag; rgb.a = rgb.r = rgb.g = rgb.b = 0xff; + rgb.r = 0; swf_SetRGB(i->tag,&rgb); i->startdepth = i->depth = 0; @@ -933,9 +1015,8 @@ static void startshape(gfxdevice_t*dev) if(i->shapeid>=0) return; - - if(i->textid>=0) - endtext(dev); + //if(i->chardatapos && i->chardata[i->chardatapos-1].color.a) + endtext(dev); i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3); @@ -955,11 +1036,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)); @@ -980,9 +1057,11 @@ static void starttext(gfxdevice_t*dev) swfoutput_internal*i = (swfoutput_internal*)dev->internal; if(i->shapeid>=0) endshape(dev); - - i->textid = getNewID(dev); + if(i->config_watermark) { + insert_watermark(dev, 0); + } + i->textid = getNewID(dev); i->swflastx=i->swflasty=0; } @@ -1107,9 +1186,10 @@ 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); + msg(" Placing shape ID %d", i->shapeid); i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); MATRIX m = i->page_matrix; @@ -1117,6 +1197,10 @@ static void endshape(gfxdevice_t*dev) m.ty += i->shapeposy; swf_ObjectPlace(i->tag,i->shapeid,getNewDepth(dev),&m,NULL,NULL); + if(i->config_animate) { + i->tag = swf_InsertTag(i->tag,ST_SHOWFRAME); + } + swf_ShapeFree(i->shape); i->shape = 0; i->shapeid = -1; @@ -1142,7 +1226,6 @@ void wipeSWF(SWF*swf) } } - void swfoutput_finalize(gfxdevice_t*dev) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; @@ -1176,15 +1259,12 @@ void swfoutput_finalize(gfxdevice_t*dev) swf_ActionFree(a); } - if(i->frameno == i->lastframeno) // fix: add missing pagefeed - dev->endpage(dev); - if(i->mark) { free(i->mark);i->mark = 0; } endpage(dev); - fontlist_t *tmp,*iterator = i->fontlist; + fontlist_t *iterator = i->fontlist; while(iterator) { TAG*mtag = i->swf->firstTag; if(iterator->swffont) { @@ -1193,7 +1273,7 @@ void swfoutput_finalize(gfxdevice_t*dev) swf_FontReduce(iterator->swffont); } int used = iterator->swffont->use && iterator->swffont->use->used_glyphs; - if(i->config_storeallcharacters || used) { + if(used) { mtag = swf_InsertTag(mtag, ST_DEFINEFONT2); swf_FontSetDefine2(mtag, iterator->swffont); } @@ -1219,10 +1299,15 @@ void swfoutput_finalize(gfxdevice_t*dev) i->swf->compressed = 1; } - swf_Optimize(i->swf); + /* Initialize AVM2 if it is a Flash9 file */ + if(i->config_flashversion>=9 && i->config_insertstoptag) { + AVM2_InsertStops(i->swf); + } +// if(i->config_reordertags) +// swf_Optimize(i->swf); } -int swfresult_save(gfxresult_t*gfx, char*filename) +int swfresult_save(gfxresult_t*gfx, const char*filename) { SWF*swf = (SWF*)gfx->internal; int fi; @@ -1236,19 +1321,14 @@ int swfresult_save(gfxresult_t*gfx, char*filename) return -1; } - if(swf->compressed) { - if FAILED(swf_WriteSWC(fi,swf)) - msg(" WriteSWC() failed.\n"); - } else { - if FAILED(swf_WriteSWF(fi,swf)) - msg(" WriteSWF() failed.\n"); - } + if FAILED(swf_WriteSWF(fi,swf)) + msg(" WriteSWF() failed.\n"); if(filename) close(fi); return 0; } -void* swfresult_get(gfxresult_t*gfx, char*name) +void* swfresult_get(gfxresult_t*gfx, const char*name) { SWF*swf = (SWF*)gfx->internal; if(!strcmp(name, "swf")) { @@ -1328,22 +1408,6 @@ static void swfoutput_destroy(gfxdevice_t* dev) memset(dev, 0, sizeof(gfxdevice_t)); } -static void swfoutput_setfillcolor(gfxdevice_t* dev, U8 r, U8 g, U8 b, U8 a) -{ - swfoutput_internal*i = (swfoutput_internal*)dev->internal; - if(i->fillrgb.r == r && - i->fillrgb.g == g && - i->fillrgb.b == b && - i->fillrgb.a == a) return; - if(i->shapeid>=0) - endshape(dev); - - i->fillrgb.r = r; - i->fillrgb.g = g; - i->fillrgb.b = b; - i->fillrgb.a = a; -} - static void swfoutput_setstrokecolor(gfxdevice_t* dev, U8 r, U8 g, U8 b, U8 a) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; @@ -1377,15 +1441,15 @@ static void swfoutput_setlinewidth(gfxdevice_t*dev, double _linewidth) static void drawlink(gfxdevice_t*dev, ActionTAG*,ActionTAG*, gfxline_t*points, char mouseover); 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, char*url, gfxline_t*points); +static void swfoutput_linktourl(gfxdevice_t*dev, const char*url, gfxline_t*points); -void swfoutput_drawlink(gfxdevice_t*dev, char*url, gfxline_t*points) +/*void swfoutput_drawlink(gfxdevice_t*dev, char*url, gfxline_t*points) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; dev->drawlink(dev, points, url); -} +}*/ -void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, char*url) +void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, const char*url) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; @@ -1411,7 +1475,7 @@ void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, char*url) swfoutput_linktourl(dev, url, points); } } -void swfoutput_linktourl(gfxdevice_t*dev, char*url, gfxline_t*points) +void swfoutput_linktourl(gfxdevice_t*dev, const char*url, gfxline_t*points) { ActionTAG* actions = 0; swfoutput_internal*i = (swfoutput_internal*)dev->internal; @@ -1434,8 +1498,8 @@ void swfoutput_linktourl(gfxdevice_t*dev, 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); } void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points) { @@ -1458,7 +1522,7 @@ void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points) actions = action_End(actions); } - drawlink(dev, actions, 0, points,0); + drawlink(dev, actions, 0, points, 0); } /* Named Links (a.k.a. Acrobatmenu) are used to implement various gadgets @@ -1508,7 +1572,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); swf_ActionFree(actions1); swf_ActionFree(actions2); @@ -1559,12 +1623,10 @@ static void drawlink(gfxdevice_t*dev, ActionTAG*actions1, ActionTAG*actions2, gf SRECT r; int lsid=0; int fsid; - plotxy_t p1,p2,p3,p4; int myshapeid; int myshapeid2; double posx = 0; double posy = 0; - int t; int buttonid = getNewID(dev); gfxbbox_t bbox = gfxline_getbbox(points); @@ -1579,6 +1641,7 @@ 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); @@ -1601,6 +1664,7 @@ 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); @@ -1645,7 +1709,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); + msg(" Placing link ID %d", buttonid); i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); if(posx!=0 || posy!=0) { @@ -1657,9 +1724,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,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,name); } } @@ -1742,12 +1809,23 @@ 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, "showclipshapes")) { + i->config_showclipshapes = atoi(value); + } else if(!strcmp(name, "reordertags")) { + i->config_reordertags = 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, "linkfunction")) { //sets both internallinkfunction and externallinkfunction + i->config_internallinkfunction = strdup(value); + i->config_externallinkfunction = strdup(value); } else if(!strcmp(name, "disable_polygon_conversion")) { i->config_disable_polygon_conversion = atoi(value); + } else if(!strcmp(name, "normalize_polygon_positions")) { + i->config_normalize_polygon_positions = atoi(value); + } else if(!strcmp(name, "wxwindowparams")) { + i->config_watermark = atoi(value); } else if(!strcmp(name, "insertstop")) { i->config_insertstoptag = atoi(value); } else if(!strcmp(name, "protect")) { @@ -1755,13 +1833,16 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) if(i->config_protect && i->tag) { i->tag = swf_InsertTag(i->tag, ST_PROTECT); } - } else if(!strcmp(name, "faketags")) { - i->config_generate_fake_tags = atoi(value); } else if(!strcmp(name, "flashversion")) { i->config_flashversion = atoi(value); if(i->swf) { i->swf->fileVersion = i->config_flashversion; } + } else if(!strcmp(name, "framerate")) { + i->config_framerate = atoi(value); + if(i->swf) { + i->swf->frameRate = i->config_framerate*0x100; + } } else if(!strcmp(name, "minlinewidth")) { i->config_minlinewidth = atof(value); } else if(!strcmp(name, "caplinewidth")) { @@ -1770,12 +1851,14 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) i->config_linktarget = strdup(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, "next_bitmap_is_jpeg")) { i->jpeg = 1; } else if(!strcmp(name, "jpegquality")) { int val = atoi(value); if(val<0) val=0; - if(val>100) val=100; + if(val>101) val=101; i->config_jpegquality = val; } else if(!strcmp(name, "splinequality")) { int v = atoi(value); @@ -1797,14 +1880,33 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) i->config_linkcolor.g = NIBBLE(value[2])<<4 | NIBBLE(value[3]); i->config_linkcolor.b = NIBBLE(value[4])<<4 | NIBBLE(value[5]); i->config_linkcolor.a = NIBBLE(value[6])<<4 | NIBBLE(value[7]); - printf("%02x%02x%02x%02x\n", - i->config_linkcolor.r, - i->config_linkcolor.g, - i->config_linkcolor.b, - i->config_linkcolor.a); - + } 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"); + printf("ignoredraworder allow to perform a few optimizations for creating smaller SWFs\n"); + 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("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"); + printf("disable_polygon_conversion never convert strokes to polygons (will remove capstyles and joint styles)\n"); + printf("caplinewidth= the minimum thichness a line needs to have so that capstyles become visible (and are converted)\n"); + 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("minlinewidth= convert horizontal/vertical boxes smaller than this width to lines (0.05) \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"); } else { - fprintf(stderr, "unknown parameter: %s (=%s)\n", name, value); return 0; } return 1; @@ -1828,10 +1930,10 @@ static CXFORM gfxcxform_to_cxform(gfxcxform_t* c) cx.r0 = (S16)(c->rr*256); cx.g0 = (S16)(c->gg*256); cx.b0 = (S16)(c->bb*256); - cx.a1 = c->t.a; - cx.r1 = c->t.r; - cx.g1 = c->t.g; - cx.b1 = c->t.b; + cx.a1 = c->ta; + cx.r1 = c->tr; + cx.g1 = c->tg; + cx.b1 = c->tb; return cx; } @@ -1859,16 +1961,20 @@ static int add_image(swfoutput_internal*i, gfximage_t*img, int targetwidth, int /// { if(is_jpeg && i->config_jpegsubpixels) { - newsizex = (int)(targetwidth*i->config_jpegsubpixels+0.5); - newsizey = (int)(targetheight*i->config_jpegsubpixels+0.5); + newsizex = (int)(targetwidth*i->config_jpegsubpixels + 0.5); + newsizey = (int)(targetheight*i->config_jpegsubpixels + 0.5); } else if(!is_jpeg && i->config_ppmsubpixels) { - newsizex = (int)(targetwidth*i->config_ppmsubpixels+0.5); - newsizey = (int)(targetheight*i->config_ppmsubpixels+0.5); + newsizex = (int)(targetwidth*i->config_ppmsubpixels + 0.5); + newsizey = (int)(targetheight*i->config_ppmsubpixels + 0.5); } /// } - if(sizex<=0 || sizey<=0 || newsizex<=0 || newsizey<=0) + if(sizex<=0 || sizey<=0) return -1; + if(newsizex<=0) + newsizex = 1; + if(newsizey<=0) + newsizey = 1; /* TODO: cache images */ @@ -1886,10 +1992,10 @@ static int add_image(swfoutput_internal*i, gfximage_t*img, int targetwidth, int int num_colors = swf_ImageGetNumberOfPaletteEntries(mem,sizex,sizey,0); int has_alpha = swf_ImageHasAlpha(mem,sizex,sizey); - msg(" Drawing %dx%d %s%simage at size %dx%d (%dx%d), %s%d colors", + msg(" Drawing %dx%d %s%simage (id %d) at size %dx%d (%dx%d), %s%d colors", sizex, sizey, has_alpha?(has_alpha==2?"semi-transparent ":"transparent "):"", - is_jpeg?"jpeg-":"", + is_jpeg?"jpeg-":"", i->currentswfid+1, newsizex, newsizey, targetwidth, targetheight, /*newsizex, newsizey,*/ @@ -1964,8 +2070,6 @@ static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxm double fy = (double)img->height / (double)newheight; MATRIX m; - float m00,m10,tx; - float m01,m11,ty; m.sx = (int)(65536*20*matrix->m00*fx); m.r1 = (int)(65536*20*matrix->m10*fy); m.r0 = (int)(65536*20*matrix->m01*fx); m.sy = (int)(65536*20*matrix->m11*fy); m.tx = (int)(matrix->tx*20); @@ -1979,6 +2083,7 @@ 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); @@ -1989,11 +2094,41 @@ static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxm swf_ShapeSetEnd(i->tag); swf_ShapeFree(shape); + msg(" Placing image, shape ID %d, bitmap ID %d", myshapeid, bitid); i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); CXFORM cxform2 = gfxcxform_to_cxform(cxform); swf_ObjectPlace(i->tag,myshapeid,getNewDepth(dev),&i->page_matrix,&cxform2,NULL); } +static RGBA col_black = {255,0,0,0}; + +static void drawoutline(gfxdevice_t*dev, gfxline_t*line) +{ + swfoutput_internal*i = (swfoutput_internal*)dev->internal; + + int myshapeid = getNewID(dev); + i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3); + + SHAPE*shape; + swf_ShapeNew(&shape); + int lsid = swf_ShapeAddLineStyle(shape,1,&col_black); + + 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); + swf_ShapeSetEnd(i->tag); + swf_ShapeFree(shape); + + i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); + swf_ObjectPlace(i->tag, myshapeid, getNewDepth(dev), 0,0,0); +} + static void swf_startclip(gfxdevice_t*dev, gfxline_t*line) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; @@ -2007,6 +2142,9 @@ static void swf_startclip(gfxdevice_t*dev, gfxline_t*line) i->clippos --; } + if(i->config_showclipshapes) + drawoutline(dev, line); + int myshapeid = getNewID(dev); i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3); RGBA col; @@ -2021,18 +2159,35 @@ 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); swf_SetShapeBits(i->tag,shape); swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,0,fsid,0); i->swflastx = i->swflasty = UNDEFINED_COORD; + i->shapeisempty = 1; drawgfxline(dev, line); + if(i->shapeisempty) { + /* an empty clip shape is equivalent to a shape with no area */ + int x = line?line->x:0; + int y = line?line->y:0; + moveto(dev, i->tag, x,y); + lineto(dev, i->tag, x,y); + lineto(dev, i->tag, x,y); + } + if(!i->shapeisempty && i->currentswfid==1 && r.xmin==0 && r.ymin==0 && r.xmax==(int)(i->max_x*20) && r.ymax==(int)(i->max_y*20)) { + if(i->config_watermark) { + gfxbbox_t r; r.xmin = r.ymin = 0;r.xmax = i->max_x;r.ymax = i->max_y; + draw_watermark(dev, r, 1); + } + } swf_ShapeSetEnd(i->tag); swf_ShapeFree(shape); /* TODO: remember the bbox, and check all shapes against it */ + msg(" Placing clip ID %d", myshapeid); i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); i->cliptags[i->clippos] = i->tag; i->clipshapes[i->clippos] = myshapeid; @@ -2202,28 +2357,28 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol if(has_dots) gfxline_fix_short_edges(line); /* we need to convert the line into a polygon */ - ArtSVP* svp = gfxstrokeToSVP(line, width, cap_style, joint_style, miterLimit); - gfxline_t*gfxline = SVPtogfxline(svp); + gfxpoly_t* poly = gfxpoly_strokeToPoly(line, width, cap_style, joint_style, miterLimit); + gfxline_t*gfxline = gfxpoly_to_gfxline(poly); dev->fill(dev, gfxline, color); - free(gfxline); - art_svp_free(svp); + gfxline_free(gfxline); + gfxpoly_free(poly); return; } msg(" draw as stroke, type=%d dots=%d", type, has_dots); endtext(dev); -#ifdef NORMALIZE_POLYGON_POSITIONS - endshape(dev); - double startx = 0, starty = 0; - if(line && line->type == gfx_moveTo) { - startx = line->x; - starty = line->y; - } - line = gfxline_move(line, -startx, -starty); - i->shapeposx = (int)(startx*20); - i->shapeposy = (int)(starty*20); -#endif + if(i->config_normalize_polygon_positions) { + endshape(dev); + double startx = 0, starty = 0; + if(line && line->type == gfx_moveTo) { + startx = line->x; + starty = line->y; + } + line = gfxline_move(line, -startx, -starty); + i->shapeposx = (int)(startx*20); + i->shapeposy = (int)(starty*20); + } swfoutput_setstrokecolor(dev, color->r, color->g, color->b, color->a); swfoutput_setlinewidth(dev, width); @@ -2231,11 +2386,12 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol stopFill(dev); drawgfxline(dev, line); -#ifdef NORMALIZE_POLYGON_POSITIONS - free(line); //account for _move -#endif + if(i->config_normalize_polygon_positions) { + free(line); //account for _move + } } + static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; @@ -2246,41 +2402,118 @@ static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color) gfxbbox_t r = gfxline_getbbox(line); int is_outside_page = !is_inside_page(dev, r.xmin, r.ymin) || !is_inside_page(dev, r.xmax, r.ymax); + //if(i->chardatapos && i->chardata[i->chardatapos-1].color.a) { endtext(dev); + if(!i->config_ignoredraworder) endshape(dev); -#ifdef NORMALIZE_POLYGON_POSITIONS - endshape(dev); - double startx = 0, starty = 0; - if(line && line->type == gfx_moveTo) { - startx = line->x; - starty = line->y; - } - line = gfxline_move(line, -startx, -starty); - i->shapeposx = (int)(startx*20); - i->shapeposy = (int)(starty*20); -#endif + if(i->config_normalize_polygon_positions) { + endshape(dev); + double startx = 0, starty = 0; + if(line && line->type == gfx_moveTo) { + startx = line->x; + starty = line->y; + } + line = gfxline_move(line, -startx, -starty); + i->shapeposx = (int)(startx*20); + i->shapeposy = (int)(starty*20); + } swfoutput_setfillcolor(dev, color->r, color->g, color->b, color->a); startshape(dev); startFill(dev); i->fill=1; drawgfxline(dev, line); + + if(i->currentswfid==2 && r.xmin==0 && r.ymin==0 && r.xmax==i->max_x && r.ymax==i->max_y) { + if(i->config_watermark) { + draw_watermark(dev, r, 1); + } + } + msg(" end of swf_fill (shapeid=%d)", i->shapeid); -#ifdef NORMALIZE_POLYGON_POSITIONS - free(line); //account for _move -#endif + if(i->config_normalize_polygon_positions) { + free(line); //account for _move + } +} + +static GRADIENT* gfxgradient_to_GRADIENT(gfxgradient_t*gradient) +{ + int num = 0; + gfxgradient_t*g = gradient; + while(g) { + num++; + g = g->next; + } + GRADIENT* swfgradient = malloc(sizeof(GRADIENT)); + swfgradient->num = num; + swfgradient->rgba = malloc(sizeof(swfgradient->rgba[0])*num); + swfgradient->ratios = malloc(sizeof(swfgradient->ratios[0])*num); + + g = gradient; + num = 0; + while(g) { + swfgradient->ratios[num] = g->pos*255; + swfgradient->rgba[num] = *(RGBA*)&g->color; + num++; + g = g->next; + } + return swfgradient; } + static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix) { if(line_is_empty(line)) return; - msg(" Gradient filling not implemented yet"); + swfoutput_internal*i = (swfoutput_internal*)dev->internal; + + if(line_is_empty(line)) + return; + + GRADIENT* swfgradient = gfxgradient_to_GRADIENT(gradient); + if(!swfgradient) + return; + + endshape(dev); + endtext(dev); + + double f = type==gfxgradient_radial?4:4; + MATRIX m; + m.sx = (int)(matrix->m00*20*f); m.r1 = (int)(matrix->m10*20*f); + m.r0 = (int)(matrix->m01*20*f); m.sy = (int)(matrix->m11*20*f); + m.tx = (int)(matrix->tx*20); + m.ty = (int)(matrix->ty*20); + + /* shape */ + int myshapeid = getNewID(dev); + i->tag = swf_InsertTag(i->tag, ST_DEFINESHAPE2); + SHAPE*shape; + swf_ShapeNew(&shape); + 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); + swf_ShapeSetEnd(i->tag); + swf_ShapeFree(shape); + + int depth = getNewDepth(dev); + msg(" Placing gradient, shape ID %d, depth %d", myshapeid, depth); + i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); + swf_ObjectPlace(i->tag,myshapeid,depth,&i->page_matrix,NULL,NULL); + + swf_FreeGradient(swfgradient);free(swfgradient); } -static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id) +static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, const char* id) { SWFFONT*swffont = (SWFFONT*)rfx_calloc(sizeof(SWFFONT)); int t; @@ -2289,7 +2522,7 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, 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); @@ -2308,6 +2541,13 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id) gfxline_t*line; int 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. + We use the Unicode private user area to assign characters, hoping that + the font doesn't contain more than 2048 glyphs */ + swffont->glyph2ascii[t] = 0xe000 + (t&0x1fff); + } + if(font->glyphs[t].name) { swffont->glyphnames[t] = strdup(font->glyphs[t].name); } else { @@ -2319,8 +2559,8 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id) line = font->glyphs[t].line; while(line) { FPOINT c,to; - c.x = line->sx; c.y = line->sy; - to.x = line->x; to.y = line->y; + c.x = line->sx * GLYPH_SCALE; c.y = line->sy * GLYPH_SCALE; + to.x = line->x * GLYPH_SCALE; to.y = line->y * GLYPH_SCALE; if(line->type == gfx_moveTo) { draw.moveTo(&draw, &to); } else if(line->type == gfx_lineTo) { @@ -2334,13 +2574,14 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id) swffont->glyph[t].shape = swf_ShapeDrawerToShape(&draw); swffont->layout->bounds[t] = swf_ShapeDrawerGetBBox(&draw); - if(swffont->layout->bounds[t].xmax && swffont->layout->bounds[t].xmax*2 < advance) { - printf("fix bad advance value: bbox=%d, advance=%d (%f)\n", swffont->layout->bounds[t].xmax, advance, font->glyphs[t].advance); - advance = swffont->layout->bounds[t].xmax; + 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; } - if(advance<32768) { - swffont->glyph[t].advance = advance; + if(advance<32768/20) { + swffont->glyph[t].advance = advance*20; } else { swffont->glyph[t].advance = 32767; } @@ -2349,15 +2590,22 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, 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; - } + + + /* 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; return swffont; } @@ -2414,7 +2662,7 @@ static void swf_addfont(gfxdevice_t*dev, gfxfont_t*font) } } -static void swf_switchfont(gfxdevice_t*dev, char*fontid) +static void swf_switchfont(gfxdevice_t*dev, const char*fontid) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; @@ -2436,34 +2684,66 @@ static void swf_switchfont(gfxdevice_t*dev, char*fontid) static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; - + if(!font) { + msg(" swf_drawchar called (glyph %d) without font", glyph); + 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 with multiple fonts */ endtext(dev); - swf_switchfont(dev, font->id); // set the current font } - swfoutput_setfontmatrix(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11); - - swfmatrix_t m; - m.m11 = i->fontm11; - m.m12 = i->fontm12; - m.m21 = i->fontm21; - m.m22 = i->fontm22; - m.m31 = matrix->tx; - m.m32 = matrix->ty; - -/* printf("%f %f\n", m.m31, m.m32); - { - static int xpos = 40; - static int ypos = 200; - m.m31 = xpos; - m.m32 = ypos; - xpos += 10; + if(!i->swffont) { + msg(" swf_drawchar: Font is NULL"); + return; + } + if(glyph<0 || glyph>=i->swffont->numchars) { + msg(" No character %d in font %s (%d chars)", glyph, FIXNULL((char*)i->swffont->name), i->swffont->numchars); + return; + } + + setfontscale(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11, matrix->tx, matrix->ty, 0); + + double det = i->fontmatrix.sx/65536.0 * i->fontmatrix.sy/65536.0 - + i->fontmatrix.r0/65536.0 * i->fontmatrix.r1/65536.0; + if(fabs(det) < 0.0005) { + /* x direction equals y direction- the text is invisible */ + msg(" Not drawing invisible character character %d (det=%f, m=[%f %f;%f %f]\n", glyph, + det, + i->fontmatrix.sx/65536.0, i->fontmatrix.r1/65536.0, + i->fontmatrix.r0/65536.0, i->fontmatrix.sy/65536.0); + return; + } + + /*if(i->swffont->glyph[glyph].shape->bitlen <= 16) { + msg(" Glyph %d in current charset (%s, %d characters) is empty", + glyph, FIXNULL((char*)i->swffont->name), i->swffont->numchars); + return 1; }*/ + /* calculate character position with respect to the current font matrix */ + double s = 20 * GLYPH_SCALE / det; + double px = matrix->tx - i->fontmatrix.tx/20.0; + double py = matrix->ty - i->fontmatrix.ty/20.0; + int x = (SCOORD)(( px * i->fontmatrix.sy/65536.0 - py * i->fontmatrix.r1/65536.0)*s); + int y = (SCOORD)((- px * i->fontmatrix.r0/65536.0 + py * i->fontmatrix.sx/65536.0)*s); + if(x>32767 || x<-32768 || y>32767 || y<-32768) { + 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); + } + + if(i->shapeid>=0) + endshape(dev); + if(i->textid<0) + starttext(dev); + + msg(" Drawing char %d in font %d at %d,%d in color %02x%02x%02x%02x", + glyph, i->swffont->id, x, y, color->r, color->g, color->b, color->a); - drawchar(dev, i->swffont, glyph, &m, color); + putcharacter(dev, i->swffont->id, glyph, x, y, i->current_font_size, *(RGBA*)color); + swf_FontUseGlyph(i->swffont, glyph); + return; }