X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=087433b8db33516e1d45b35a7a86f9ccae585e75;hb=93c1adc4ecb8a095a5bde78cee7c640b4acf4964;hp=a47e5c4e56ddf7fc877285477eecbf9e8864a2a0;hpb=3976bb67e34fe25dd05f0e6d9e5a405e5782c400;p=swftools.git diff --git a/lib/devices/swf.c b/lib/devices/swf.c index a47e5c4..087433b 100644 --- a/lib/devices/swf.c +++ b/lib/devices/swf.c @@ -42,7 +42,7 @@ #include "../gfxtools.h" #include "../art/libart.h" #include "swf.h" -#include "artsutils.h" +#include "../gfxpoly.h" #define CHARDATAMAX 8192 #define CHARMIDX 0 @@ -83,6 +83,7 @@ typedef struct _swfoutput_internal int config_storeallcharacters; int config_enablezlib; int config_insertstoptag; + int config_watermark; int config_flashversion; int config_reordertags; int config_showclipshapes; @@ -119,6 +120,8 @@ typedef struct _swfoutput_internal SHAPE* shape; int shapeid; int textid; + + int watermarks; int fillstyleid; int linestyleid; @@ -152,6 +155,8 @@ typedef struct _swfoutput_internal int bboxrectpos; SRECT bboxrect; + SRECT pagebbox; + chardata_t chardata[CHARDATAMAX]; int chardatapos; int firstpage; @@ -700,7 +705,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); @@ -757,8 +762,8 @@ static void setfontscale(gfxdevice_t*dev,double m11,double m12, double m21,doubl double ifs = 1.0 / (i->current_font_size*GLYPH_SCALE); MATRIX m; - m.sx = (U32)((m11*ifs)*65536); m.r1 = (U32)((m21*ifs)*65536); - m.r0 = (U32)((m12*ifs)*65536); m.sy = (U32)((m22*ifs)*65536); + 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 */ @@ -767,15 +772,97 @@ static void setfontscale(gfxdevice_t*dev,double m11,double m12, double m21,doubl 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; } @@ -793,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; @@ -911,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; @@ -947,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)); @@ -972,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; } @@ -1099,7 +1186,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); @@ -1171,9 +1259,6 @@ 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; } @@ -1323,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; @@ -1429,8 +1498,8 @@ 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); } void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points) { @@ -1453,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 @@ -1503,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); @@ -1572,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); @@ -1594,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); @@ -1638,6 +1709,8 @@ 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); @@ -1651,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); } } @@ -1751,6 +1824,8 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) 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")) { @@ -1805,12 +1880,6 @@ 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"); @@ -2014,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); @@ -2024,7 +2094,7 @@ static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxm swf_ShapeSetEnd(i->tag); swf_ShapeFree(shape); - msg(" Placing bitmap ID %d", myshapeid); + 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); @@ -2045,6 +2115,7 @@ 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); @@ -2088,6 +2159,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); @@ -2104,6 +2176,12 @@ static void swf_startclip(gfxdevice_t*dev, gfxline_t*line) 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); @@ -2279,11 +2357,11 @@ 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; } @@ -2313,6 +2391,7 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol } } + static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; @@ -2346,17 +2425,92 @@ static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color) 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); 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, const char* id) @@ -2368,7 +2522,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); @@ -2436,17 +2590,21 @@ 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; - } - 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; return swffont; @@ -2538,7 +2696,7 @@ static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t* swf_switchfont(dev, font->id); // set the current font } if(!i->swffont) { - msg(" Font is NULL"); + msg(" swf_drawchar: Font is NULL"); return; } if(glyph<0 || glyph>=i->swffont->numchars) { @@ -2553,6 +2711,7 @@ static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t* 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;