X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=0c67c970393d7b006d6a1bff081305ad8cf1f155;hb=2b25c0cafdddc108712f89d1a4e4ade858fbe854;hp=0cafe47c0c5c9fab34f1c734387bd8a152d98b54;hpb=79df4eebf0dd2cd03f4dc877d18520436a1f480c;p=swftools.git

diff --git a/lib/devices/swf.c b/lib/devices/swf.c
index 0cafe47..0c67c97 100644
--- a/lib/devices/swf.c
+++ b/lib/devices/swf.c
@@ -86,6 +86,7 @@ typedef struct _swfoutput_internal
     float config_minlinewidth;
     double config_caplinewidth;
     char* config_linktarget;
+    char*config_internallinkfunction;
 
     SWF* swf;
 
@@ -154,6 +155,8 @@ typedef struct _swfoutput_internal
     int shapeposx;
     int shapeposy;
 
+    char* mark;
+
 } swfoutput_internal;
     
 static void swf_fillbitmap(gfxdevice_t*driver, gfxline_t*line, gfximage_t*img, gfxmatrix_t*move, gfxcxform_t*cxform);
@@ -188,6 +191,8 @@ static swfoutput_internal* init_internal_struct()
     i->frameno = 0;
     i->lastframeno = 0;
 
+    i->mark = 0;
+
     i->fillstyleid;
     i->linestyleid;
     i->swflastx=0;
@@ -224,6 +229,7 @@ static swfoutput_internal* init_internal_struct()
     i->config_minlinewidth=0.05;
     i->config_caplinewidth=1;
     i->config_linktarget=0;
+    i->config_internallinkfunction=0;
 
     i->config_linkcolor.r = i->config_linkcolor.g = i->config_linkcolor.b = 255;
     i->config_linkcolor.a = 0x40;
@@ -241,6 +247,7 @@ static U16 getNewID(gfxdevice_t* dev)
 	    msg("<error> ID Table overflow");
 	id_error=1;
 	i->overflow = 1;
+	exit(1);
     }
     return ++i->currentswfid;
 }
@@ -252,6 +259,7 @@ static U16 getNewDepth(gfxdevice_t* dev)
 	    msg("<error> Depth Table overflow");
 	id_error=1;
 	i->overflow = 1;
+	exit(1);
     }
     return ++i->depth;
 }
@@ -915,11 +923,15 @@ static void startshape(gfxdevice_t*dev)
     if(i->textid>=0)
         endtext(dev);
 
-    i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE);
+    i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3);
 
     swf_ShapeNew(&i->shape);
     i->linestyleid = swf_ShapeAddLineStyle(i->shape,i->linewidth,&i->strokergb);
     i->fillstyleid = swf_ShapeAddSolidFillStyle(i->shape,&i->fillrgb);
+    if(i->mark) {
+	RGBA markcol = {0,i->mark[0],i->mark[1],i->mark[2]};
+	swf_ShapeAddSolidFillStyle(i->shape,&markcol);
+    }
 
     i->shapeid = getNewID(dev);
     
@@ -1149,6 +1161,10 @@ void swfoutput_finalize(gfxdevice_t*dev)
     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;
     while(iterator) {
@@ -1396,15 +1412,22 @@ void swfoutput_linktourl(gfxdevice_t*dev, char*url, gfxline_t*points)
 void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points)
 {
     swfoutput_internal*i = (swfoutput_internal*)dev->internal;
-    ActionTAG* actions;
+    ActionTAG* actions = 0;
 
     if(i->shapeid>=0)
 	endshape(dev);
     if(i->textid>=0)
 	endtext(dev);
-   
-      actions = action_GotoFrame(0, page);
-      actions = action_End(actions);
+  
+    if(!i->config_internallinkfunction) {
+	actions = action_GotoFrame(actions, page);
+	actions = action_End(actions);
+    } else {
+	actions = action_PushInt(actions, page); //parameter
+	actions = action_PushInt(actions, 1); //number of parameters (1)
+	actions = action_PushString(actions, i->config_internallinkfunction); //function name
+	actions = action_CallFunction(actions);
+    }
 
     drawlink(dev, actions, 0, points,0);
 }
@@ -1665,6 +1688,15 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value)
 	i->config_drawonlyshapes = atoi(value);
     } else if(!strcmp(name, "ignoredraworder")) {
 	i->config_ignoredraworder = atoi(value);
+    } else if(!strcmp(name, "mark")) {
+	if(!value || !value[0]) {
+	    if(i->mark) free(i->mark);
+	    i->mark = 0;
+	} else {
+	    int t;
+	    i->mark = strdup("...");
+	    for(t=0;t<3;t++) if(value[t]) i->mark[t] = value[t];
+	}
     } else if(!strcmp(name, "filloverlap")) {
 	i->config_filloverlap = atoi(value);
     } else if(!strcmp(name, "linksopennewwindow")) {
@@ -1677,6 +1709,8 @@ 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, "internallinkfunction")) {
+	i->config_internallinkfunction = strdup(value);
     } else if(!strcmp(name, "insertstop")) {
 	i->config_insertstoptag = atoi(value);
     } else if(!strcmp(name, "protect")) {
@@ -2047,12 +2081,16 @@ static void swf_startclip(gfxdevice_t*dev, gfxline_t*line)
     } 
 
     int myshapeid = getNewID(dev);
-    i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE);
+    i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3);
     RGBA col;
     memset(&col, 0, sizeof(RGBA));
     SHAPE*shape;
     swf_ShapeNew(&shape);
     int fsid = swf_ShapeAddSolidFillStyle(shape,&col);
+    if(i->mark) {
+	RGBA markcol = {0,i->mark[0],i->mark[1],i->mark[2]};
+	swf_ShapeAddSolidFillStyle(shape,&markcol);
+    }
     swf_SetU16(i->tag,myshapeid);
     SRECT r = gfxline_getSWFbbox(line);
     swf_SetRect(i->tag,&r);
@@ -2311,6 +2349,7 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id)
 {
     SWFFONT*swffont = (SWFFONT*)rfx_calloc(sizeof(SWFFONT));
     int t;
+    SRECT bounds = {0,0,0,0};
     swffont->id = -1;
     swffont->version = 2;
     swffont->name = (U8*)strdup(id);
@@ -2332,13 +2371,14 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id)
     for(t=0;t<font->num_glyphs;t++) {
 	drawer_t draw;
 	gfxline_t*line;
+	int advance = 0;
 	swffont->glyph2ascii[t] = font->glyphs[t].unicode;
 	if(font->glyphs[t].name) {
 	    swffont->glyphnames[t] = strdup(font->glyphs[t].name);
 	} else {
 	    swffont->glyphnames[t] = 0;
 	}
-	swffont->glyph[t].advance = (int)(font->glyphs[t].advance * 20);
+	advance = (int)(font->glyphs[t].advance);
 
 	swf_Shape01DrawerInit(&draw, 0);
 	line = font->glyphs[t].line;
@@ -2358,8 +2398,32 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id)
 	draw.finish(&draw);
 	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;
+	}
+	    
+	if(advance<32768) {
+	    swffont->glyph[t].advance = advance;
+	} else {
+	    swffont->glyph[t].advance = 32767;
+	}
+
 	draw.dealloc(&draw);
+
+	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;
+    }
+
     return swffont;
 }