X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=35dc77e51461e21dcdeda290c479b65e32b281f5;hb=30b68dc4d9d219f77e73bbd1db59dd41fd27d1eb;hp=4bb5284927907704fc37913c4eca04e2c0084041;hpb=9bd6c85fbfc6ff3ac2dfaf05340a3954f2a6c15f;p=swftools.git

diff --git a/src/swfdump.c b/src/swfdump.c
index 4bb5284..35dc77e 100644
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -59,6 +59,7 @@ static int hex = 0;
 static int used = 0;
 static int bbox = 0;
 static int cumulative = 0;
+static int showfonts = 0;
 
 static struct options_t options[] = {
 {"h", "help"},
@@ -131,6 +132,10 @@ int args_callback_option(char*name,char*val)
 	xy |= 8;
 	return 0;
     }
+    else if(name[0]=='F') {
+	showfonts = 1;
+	return 0;
+    }
     else if(name[0]=='d') {
 	hex = 1;
 	return 0;
@@ -253,6 +258,58 @@ void dumpButtonActions(TAG*tag, char*prefix)
     swf_DumpActions(actions, prefix);
 }
 
+void dumpFont(TAG*tag, char*prefix)
+{
+    SWFFONT* font = malloc(sizeof(SWFFONT));
+    memset(font, 0, sizeof(SWFFONT));
+    if(tag->id == ST_DEFINEFONT2) {
+	swf_FontExtract_DefineFont2(0, font, tag);
+    } else if(tag->id == ST_DEFINEFONT) {
+	swf_FontExtract_DefineFont(0, font, tag);
+    } else {
+	printf("%sCan't parse %s yet\n", prefix,swf_TagGetName(tag));
+    }
+    printf("%sID: %d\n", prefix,font->id);
+    printf("%sVersion: %d\n", prefix,font->version);
+    printf("%sname: %s\n", prefix,font->name);
+    printf("%scharacters: %d\n", prefix,font->numchars);
+    printf("%shightest mapped unicode value: %d\n", prefix,font->maxascii);
+    if(font->layout)
+    {
+	printf("%sascent:%.2f\n", prefix,font->layout->ascent / 20.0);
+	printf("%sdescent:%.2f\n", prefix,font->layout->descent / 20.0);
+	printf("%sleading:%.2f\n", prefix,font->layout->leading / 20.0);
+	printf("%skerning records:%d\n", prefix,font->layout->kerningcount);
+    }
+    printf("%sstyle: %d\n", prefix,font->style);
+    printf("%sencoding: %02x\n", prefix,font->encoding);
+    printf("%slanguage: %02x\n", prefix,font->language);
+    int t;
+    for(t=0;t<font->numchars;t++) {
+	int u = font->glyph2ascii?font->glyph2ascii[t]:-1;
+	printf("%s== Glyph %d: advance=%d encoding=%d ==\n", prefix, t, font->glyph[t].advance, u);
+	SHAPE2* shape = swf_ShapeToShape2(font->glyph[t].shape);
+	SHAPELINE*line = shape->lines;
+
+	while(line) {
+	    if(line->type == moveTo) {
+		printf("%smoveTo %.2f %.2f\n", prefix, line->x/20.0, line->y/20.0);
+	    } else if(line->type == lineTo) {
+		printf("%slineTo %.2f %.2f\n", prefix, line->x/20.0, line->y/20.0);
+	    } else if(line->type == splineTo) {
+		printf("%ssplineTo (%.2f %.2f) %.2f %.2f\n", prefix,
+			line->sx/20.0, line->sy/20.0,
+			line->x/20.0, line->y/20.0
+			);
+	    }
+	    line = line->next;
+	}
+	swf_Shape2Free(shape);
+	free(shape);
+    }
+    swf_FontFree(font);
+}
+
 SWF swf;
 int fontnum = 0;
 SWFFONT**fonts;
@@ -473,15 +530,59 @@ void handleVideoFrame(TAG*tag, char*prefix)
     printf(" quant: %d ", quantizer);
 }
 
-void handlePlaceObject2(TAG*tag, char*prefix)
+void dumpFilter(FILTER*filter)
 {
-    U8 flags;
+    if(filter->type == FILTERTYPE_BLUR) {
+	FILTER_BLUR*f = (FILTER_BLUR*)filter;
+	printf("blurx: %f blury: %f\n", f->blurx, f->blury);
+	printf("passes: %d\n", f->passes);
+    } if(filter->type == FILTERTYPE_DROPSHADOW) {
+	FILTER_DROPSHADOW*f = (FILTER_DROPSHADOW*)filter;
+	printf("blurx: %f blury: %f\n", f->blurx, f->blury);
+	printf("passes: %d\n", f->passes);
+	printf("angle: %f distance: %f\n", f->angle, f->distance);
+	printf("strength: %f passes: %d\n", f->strength, f->passes);
+	printf("flags: %s%s%s\n", 
+		f->knockout?"knockout ":"",
+		f->composite?"composite ":"",
+		f->innershadow?"innershadow ":"");
+    } if(filter->type == FILTERTYPE_BEVEL) {
+	FILTER_BEVEL*f = (FILTER_BEVEL*)filter;
+	printf("blurx: %f blury: %f\n", f->blurx, f->blury);
+	printf("passes: %d\n", f->passes);
+	printf("angle: %f distance: %f\n", f->angle, f->distance);
+	printf("strength: %f passes: %d\n", f->strength, f->passes);
+	printf("flags: %s%s%s%s\n", 
+		f->ontop?"ontop":"",
+		f->knockout?"knockout ":"",
+		f->composite?"composite ":"",
+		f->innershadow?"innershadow ":"");
+    } if(filter->type == FILTERTYPE_GRADIENTGLOW) {
+	FILTER_GRADIENTGLOW*f = (FILTER_GRADIENTGLOW*)filter;
+	swf_DumpGradient(stdout, f->gradient);
+	printf("blurx: %f blury: %f\n", f->blurx, f->blury);
+	printf("angle: %f distance: %f\n", f->angle, f->distance);
+	printf("strength: %f passes: %d\n", f->strength, f->passes);
+	printf("flags: %s%s%s%s\n", 
+		f->knockout?"knockout ":"",
+		f->ontop?"ontop ":"",
+		f->composite?"composite ":"",
+		f->innershadow?"innershadow ":"");
+    }
+    rfx_free(filter);
+}
+
+void handlePlaceObject23(TAG*tag, char*prefix)
+{
+    U8 flags,flags2=0;
     MATRIX m;
     CXFORM cx;
-    char pstr[3][160];
+    char pstr[3][256];
     int ppos[3] = {0,0,0};
     swf_SetTagPos(tag, 0);
     flags = swf_GetU8(tag);
+    if(tag->id == ST_PLACEOBJECT3)
+	flags2 = swf_GetU8(tag);
     swf_GetU16(tag); //depth
 
     //flags&1: move
@@ -514,11 +615,48 @@ void handlePlaceObject2(TAG*tag, char*prefix)
 	U16 clip = swf_GetU16(tag); //clip
 	if(placements) {
 	    ppos[0] += sprintf(pstr[0]+ppos[0], "| Clip  ");
-	    ppos[1] += sprintf(pstr[1]+ppos[1], "| %-5d ", clip);
+	    ppos[1] += sprintf(pstr[1]+ppos[1], "| %-4d ", clip);
 	    ppos[2] += sprintf(pstr[2]+ppos[2], "|       ");
 	}
     }
     if(flags&32) { while(swf_GetU8(tag)); }
+
+    if(flags2&1) { // filter list
+	U8 num = swf_GetU8(tag);
+	if(placements)
+	    printf("\n%d filters\n", num);
+	char*filtername[] = {"dropshadow","blur","glow","bevel","gradientglow","convolution","colormatrix","gradientbevel"};
+	int t;
+	for(t=0;t<num;t++) {
+	    FILTER*filter = swf_GetFilter(tag);
+	    if(!filter) {
+		printf("\n"); 
+		return;
+	    }
+	    if(placements) {
+		printf("filter %d: %02x (%s)\n", t, filter->type, (filter->type<sizeof(filtername)/sizeof(filtername[0]))?filtername[filter->type]:"?");
+		dumpFilter(filter);
+	    }
+	}
+    }
+    if(flags2&2) { // blend mode
+	U8 blendmode = swf_GetU8(tag);
+	if(placements) {
+	    int t;
+	    char name[80];
+	    sprintf(name, "%-5d", blendmode);
+	    for(t=0;blendModeNames[t];t++) {
+		if(blendmode==t) {
+		    sprintf(name, "%-5s", blendModeNames[t]);
+		    break;
+		}
+	    }
+	    ppos[0] += sprintf(pstr[0]+ppos[0], "| Blend ");
+	    ppos[1] += sprintf(pstr[1]+ppos[1], "| %s ", name);
+	    ppos[2] += sprintf(pstr[2]+ppos[2], "|       ");
+	}
+    }
+
     if(placements && ppos[0]) {
 	printf("\n");
 	printf("%s %s\n", prefix, pstr[0]);
@@ -588,7 +726,7 @@ void handlePlaceObject(TAG*tag, char*prefix)
     swf_SetMatrix(tag2, &matrix);
     swf_SetCXForm(tag2, &cxform, 1);
 
-    handlePlaceObject2(tag2, prefix);
+    handlePlaceObject23(tag2, prefix);
 }
 char stylebuf[256];
 char* fillstyle2str(FILLSTYLE*style)
@@ -597,7 +735,7 @@ char* fillstyle2str(FILLSTYLE*style)
 	case 0x00:
 	    sprintf(stylebuf, "SOLID %02x%02x%02x%02x", style->color.r, style->color.g, style->color.b, style->color.a);
 	    break;
-	case 0x10: case 0x12:
+	case 0x10: case 0x11: case 0x12: case 0x13:
 	    sprintf(stylebuf, "GRADIENT (%d steps)", style->gradient.num);
 	    break;
 	case 0x40: case 0x42:
@@ -945,7 +1083,7 @@ int main (int argc,char ** argv)
             if(swf_GetName(tag))
                 printf(" name \"%s\"",swf_GetName(tag));
         }
-	else if(tag->id == ST_PLACEOBJECT2) {
+	else if(tag->id == ST_PLACEOBJECT2 || tag->id == ST_PLACEOBJECT3) {
 	    if(tag->data[0]&1)
 		printf(" moves");
 	    else
@@ -957,6 +1095,9 @@ int main (int argc,char ** argv)
 		printf(" object");
 
             printf(" at depth %04d", swf_GetDepth(tag));
+
+	    if(tag->id == ST_PLACEOBJECT3 && tag->data[1]&4)
+		printf(" as bitmap");
 	   
 	    swf_SetTagPos(tag, 0);
 	    if(tag->data[0]&64) {
@@ -1051,6 +1192,26 @@ int main (int argc,char ** argv)
 		printf("\n");
 	    }
 	}
+	else if(tag->id == ST_CSMTEXTSETTINGS) {
+	    U16 id = swf_GetU16(tag);
+	    U8 flags = swf_GetU8(tag);
+	    printf(" (");
+	    if(flags&0x40) {
+		printf("flashtype,");
+	    }
+	    switch(((flags>>3)&7)) {
+		case 0:printf("no grid,");break;
+		case 1:printf("pixel grid,");break;
+		case 2:printf("subpixel grid,");break;
+		case 3:printf("unknown grid,");break;
+	    }
+	    if(flags&0x87) 
+		printf("unknown[%08x],", flags);
+	    float thickness = swf_GetFixed(tag);
+	    float sharpness = swf_GetFixed(tag);
+	    printf("s=%.2f,t=%.2f)\n", thickness, sharpness);
+	    swf_GetU8(tag);
+	}
 	else if(tag->id == ST_DEFINEBITSLOSSLESS ||
 	   tag->id == ST_DEFINEBITSLOSSLESS2) {
 	    handleDefineBits(tag);
@@ -1083,7 +1244,7 @@ int main (int argc,char ** argv)
 	    else
 		printf("\n");
 	}
-	else if(tag->id == ST_PLACEOBJECT2) {
+	else if(tag->id == ST_PLACEOBJECT2 || tag->id == ST_PLACEOBJECT3) {
 	}
 	else if(tag->id == ST_NAMECHARACTER) {
 	    swf_GetU16(tag);
@@ -1120,7 +1281,7 @@ int main (int argc,char ** argv)
 	    if(tag->len)
 		dumperror("End Tag not empty");
         }
-	else if(tag->id == ST_EXPORTASSETS) {
+	else if(tag->id == ST_EXPORTASSETS || tag->id == ST_SYMBOLCLASS) {
 	    handleExportAssets(tag, myprefix);
 	}
         else if(tag->id == ST_DOACTION && action) {
@@ -1137,18 +1298,22 @@ int main (int argc,char ** argv)
 	else if(tag->id == ST_DEFINEBUTTON && action) {
 	    dumpButtonActions(tag, myprefix);
 	}
+	else if(swf_isFontTag(tag) && showfonts) {
+	    dumpFont(tag, myprefix);
+	}
 	else if(tag->id == ST_DEFINEBUTTON2 && action) {
 	    dumpButton2Actions(tag, myprefix);
 	}
 	else if(tag->id == ST_PLACEOBJECT) {
 	    handlePlaceObject(tag, myprefix);
 	}
-	else if(tag->id == ST_PLACEOBJECT2) {
-	    handlePlaceObject2(tag, myprefix);
+	else if(tag->id == ST_PLACEOBJECT2 || tag->id == ST_PLACEOBJECT3) {
+	    handlePlaceObject23(tag, myprefix);
 	}
 	else if(tag->id == ST_DEFINESHAPE ||
 		tag->id == ST_DEFINESHAPE2 ||
-		tag->id == ST_DEFINESHAPE3) {
+		tag->id == ST_DEFINESHAPE3 ||
+		tag->id == ST_DEFINESHAPE4) {
 	    if(showshapes)
 		handleShape(tag, myprefix);
 	}