#include "../gfxtools.h"
#include "../art/libart.h"
#include "swf.h"
-#include "artsutils.h"
+#include "../gfxpoly.h"
#define CHARDATAMAX 8192
#define CHARMIDX 0
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;
SHAPE* shape;
int shapeid;
int textid;
+
+ int watermarks;
int fillstyleid;
int linestyleid;
int bboxrectpos;
SRECT bboxrect;
+ SRECT pagebbox;
+
chardata_t chardata[CHARDATAMAX];
int chardatapos;
int firstpage;
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;
If we set it to low, however, the char positions will be inaccurate */
#define GLYPH_SCALE 1
-/* process a character. */
-static int drawchar(gfxdevice_t*dev, SWFFONT *swffont, int charid, float x, float y, gfxcolor_t*col)
-{
- swfoutput_internal*i = (swfoutput_internal*)dev->internal;
- if(!swffont) {
- msg("<warning> Font is NULL");
- return 0;
- }
-
- if(charid<0 || charid>=swffont->numchars) {
- msg("<warning> No character %d in font %s (%d chars)", charid, FIXNULL((char*)swffont->name), swffont->numchars);
- return 0;
- }
- /*if(swffont->glyph[charid].shape->bitlen <= 16) {
- msg("<warning> 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);
-
- 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 */
- return 1;
- }
- det = 20 * GLYPH_SCALE / det;
-
- SPOINT p;
- p.x = (SCOORD)(( x * i->fontmatrix.sy/65536.0 - y * i->fontmatrix.r1/65536.0)*det);
- p.y = (SCOORD)((- x * i->fontmatrix.r0/65536.0 + y * i->fontmatrix.sx/65536.0)*det);
-
- RGBA rgba = *(RGBA*)col;
- putcharacter(dev, swffont->id, charid,p.x,p.y,i->current_font_size, rgba);
- swf_FontUseGlyph(swffont, charid);
- return 1;
-}
-
static void endtext(gfxdevice_t*dev)
{
swfoutput_internal*i = (swfoutput_internal*)dev->internal;
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);
}
/* set's the matrix which is to be applied to characters drawn by swfoutput_drawchar() */
-static void setfontscale(gfxdevice_t*dev,double m11,double m12, double m21,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;
if(i->lastfontm11 == m11 &&
i->lastfontm12 == m12 &&
i->lastfontm21 == m21 &&
- i->lastfontm22 == m22)
+ i->lastfontm22 == m22 && !force)
return;
if(i->textid>=0)
endtext(dev);
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.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<watermark2_height;y++)
+ for(x=0;x<watermark2_width;x++) {
+ if(((watermark2[x]>>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;
}
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;
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;
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));
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;
}
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("<trace> Placing shape ID %d", i->shapeid);
swf_ActionFree(a);
}
- if(i->frameno == i->lastframeno) // fix: add missing pagefeed
- dev->endpage(dev);
-
if(i->mark) {
free(i->mark);i->mark = 0;
}
return -1;
}
- if(swf->compressed) {
- if FAILED(swf_WriteSWC(fi,swf))
- msg("<error> WriteSWC() failed.\n");
- } else {
- if FAILED(swf_WriteSWF(fi,swf))
- msg("<error> WriteSWF() failed.\n");
- }
+ if FAILED(swf_WriteSWF(fi,swf))
+ msg("<error> WriteSWF() failed.\n");
if(filename)
close(fi);
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;
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)
{
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
actions2 = action_End(actions2);
}
- drawlink(dev, actions1, actions2, points,mouseover);
+ drawlink(dev, actions1, actions2, points, mouseover);
swf_ActionFree(actions1);
swf_ActionFree(actions2);
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);
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_ButtonPostProcess(i->tag, 1);
}
}
+ char name[80];
+ sprintf(name, "link%d", buttonid);
msg("<trace> Placing link ID %d", buttonid);
i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2);
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);
}
}
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")) {
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->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=<dpi> resolution adjustment for jpeg images\n");
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_ShapeSetEnd(i->tag);
swf_ShapeFree(shape);
- msg("<trace> Placing bitmap ID %d", myshapeid);
+ msg("<trace> 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);
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_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);
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);
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;
}
}
}
+
static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color)
{
swfoutput_internal*i = (swfoutput_internal*)dev->internal;
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("<trace> 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("<error> 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("<trace> 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)
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);
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;
}
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;
}
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)
+ if(!font) {
+ msg("<error> 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
}
- setfontscale(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11);
+ if(!i->swffont) {
+ msg("<warning> swf_drawchar: Font is NULL");
+ return;
+ }
+ if(glyph<0 || glyph>=i->swffont->numchars) {
+ msg("<warning> 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("<verbose> 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;
+ }
-/* 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->glyph[glyph].shape->bitlen <= 16) {
+ msg("<warning> 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("<verbose> 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);
- drawchar(dev, i->swffont, glyph, matrix->tx, matrix->ty, color);
+ msg("<trace> 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);
+
+ putcharacter(dev, i->swffont->id, glyph, x, y, i->current_font_size, *(RGBA*)color);
+ swf_FontUseGlyph(i->swffont, glyph);
+ return;
}