X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=6256e49fcbd48daa54746a8f25c368d3e427c94b;hb=460cc8cdc3265a2fef3deec215b0ae9dabdda761;hp=05b28656a549ca0234595bb9c9b8306d96b9b7ea;hpb=6f3e9add89a0157ef6552bc154475b43b371e615;p=swftools.git

diff --git a/src/swfdump.c b/src/swfdump.c
index 05b2865..6256e49 100644
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -53,6 +53,7 @@ static int action = 0;
 static int html = 0;
 static int xy = 0;
 static int showtext = 0;
+static int showshapes = 0;
 static int hex = 0;
 static int used = 0;
 
@@ -70,6 +71,7 @@ static struct options_t options[] = {
 {"f", "frames"},
 {"d", "hex"},
 {"u", "used"},
+{"s", "shapes"},
 {0,0}
 };
 
@@ -91,6 +93,10 @@ int args_callback_option(char*name,char*val)
         showtext = 1;
         return 0;
     }
+    else if(name[0]=='s') {
+        showshapes = 1;
+        return 0;
+    }
     else if(name[0]=='e') {
         html = 1;
         return 0;
@@ -120,7 +126,7 @@ int args_callback_option(char*name,char*val)
 	return 0;
     }
     else if(name[0]=='D') {
-	action = placements = showtext = 1;
+	action = placements = showtext = showshapes = 1;
 	return 0;
     }
     else {
@@ -247,10 +253,10 @@ SWF swf;
 int fontnum = 0;
 SWFFONT**fonts;
 
-void textcallback(int*glyphs, int nr, int fontid) 
+void textcallback(void*self, int*glyphs, int*ypos, int nr, int fontid, int fontsize, int startx, int starty, RGBA*color) 
 {
     int font=-1,t;
-    printf("                <%2d glyphs in font %2d> ",nr, fontid);
+    printf("                <%2d glyphs in font %2d, color #%02x%02x%02x%02x> ",nr, fontid, color->r, color->g, color->b, color->a);
     for(t=0;t<fontnum;t++)
     {
 	if(fonts[t]->id == fontid) {
@@ -265,9 +271,9 @@ void textcallback(int*glyphs, int nr, int fontid)
 	if(font>=0) {
 	    if(glyphs[t] >= fonts[font]->numchars  /*glyph is in range*/
 		    || !fonts[font]->glyph2ascii /* font has ascii<->glyph mapping */
-	      )
-		continue;
-	    a = fonts[font]->glyph2ascii[glyphs[t]];
+	      ) a = glyphs[t];
+	    else
+		a = fonts[font]->glyph2ascii[glyphs[t]];
 	} else {
 	    a = glyphs[t];
 	}
@@ -282,7 +288,7 @@ void textcallback(int*glyphs, int nr, int fontid)
 void handleText(TAG*tag) 
 {
   printf("\n");
-  swf_FontExtract_DefineTextCallback(-1,0,tag,4, textcallback);
+  swf_ParseDefineText(tag,textcallback, 0);
 }
 	    
 void handleDefineSound(TAG*tag)
@@ -371,7 +377,7 @@ void handleEditText(TAG*tag)
     
     while(tag->data[tag->pos++]);
     if(flags & ET_HASTEXT)
-   //  printf(" text \"%s\"\n", &tag->data[tag->pos])
+   //  printf(" text \"%s\"\n", &tag->data[tag->pos]) //TODO
 	;
 }
 void printhandlerflags(U32 handlerflags) 
@@ -463,6 +469,7 @@ void handlePlaceObject2(TAG*tag, char*prefix)
     char pstr[3][160];
     int ppos[3] = {0,0,0};
     swf_GetU16(tag); //depth
+
     //flags&1: move
     if(flags&2) swf_GetU16(tag); //id
     if(flags&4) {
@@ -550,7 +557,98 @@ void handlePlaceObject2(TAG*tag, char*prefix)
 
 void handlePlaceObject(TAG*tag, char*prefix)
 {
-    /*TODO*/
+    TAG*tag2 = swf_InsertTag(0, ST_PLACEOBJECT2);
+
+    U16 id = swf_GetU16(tag);
+    U16 depth = swf_GetU16(tag);
+    MATRIX matrix; swf_GetMatrix(tag, &matrix);
+    CXFORM cxform; swf_GetCXForm(tag, &cxform, 0);
+
+    swf_SetU8(tag2, 14);
+    swf_SetU16(tag2, depth);
+    swf_SetMatrix(tag2, &matrix);
+    swf_SetCXForm(tag2, &cxform, 1);
+
+    handlePlaceObject2(tag2, prefix);
+}
+char stylebuf[256];
+char* fillstyle2str(FILLSTYLE*style)
+{
+    switch(style->type) {
+	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:
+	    sprintf(stylebuf, "GRADIENT (%d steps)", style->gradient.num);
+	    break;
+	case 0x40: case 0x41:
+	    /* TODO: display information about that bitmap */
+	    sprintf(stylebuf, "BITMAP %d", style->id_bitmap);
+	    break;
+	default:
+	    sprintf(stylebuf, "UNKNOWN[%02x]",style->type);
+    }
+    return stylebuf;
+}
+char* linestyle2str(LINESTYLE*style)
+{
+    sprintf(stylebuf, "%.2f %02x%02x%02x%02x", style->width/20.0, style->color.r, style->color.g, style->color.b, style->color.a);
+    return stylebuf;
+}
+
+void handleShape(TAG*tag, char*prefix)
+{
+    SHAPE2 shape;
+    tag->pos = 0;
+    tag->readBit = 0;
+    swf_ParseDefineShape(tag, &shape);
+    SHAPELINE*line;
+
+    int t;
+    int max = shape.numlinestyles > shape.numfillstyles?shape.numlinestyles:shape.numfillstyles;
+
+    if(max) printf("%s | fillstyles(%02d)        linestyles(%02d)\n", 
+	    prefix,
+	    shape.numfillstyles,
+	    shape.numlinestyles
+	    );
+    else    printf("%s | (Neither line nor fill styles)\n", prefix);
+
+    for(t=0;t<max;t++) {
+	printf("%s", prefix);
+	if(t < shape.numfillstyles) {
+	    printf(" | %-2d) %-18.18s", t+1, fillstyle2str(&shape.fillstyles[t]));
+	} else {
+	    printf("                    ");
+	}
+	if(t < shape.numlinestyles) {
+	    printf("%-2d) %s", t+1, linestyle2str(&shape.linestyles[t]));
+	}
+	printf("\n");
+    }
+
+    printf("%s |\n", prefix);
+
+    line = shape.lines;
+    while(line) {
+	printf("%s | fill: %02d/%02d line:%02d - ",
+		prefix, 
+		line->fillstyle0,
+		line->fillstyle1,
+		line->linestyle);
+	if(line->type == moveTo) {
+	    printf("moveTo %.2f %.2f\n", line->x/20.0, line->y/20.0);
+	} else if(line->type == lineTo) {
+	    printf("lineTo %.2f %.2f\n", line->x/20.0, line->y/20.0);
+	} else if(line->type == splineTo) {
+	    printf("splineTo (%.2f %.2f) %.2f %.2f\n", 
+		    line->sx/20.0, line->sy/20.0,
+		    line->x/20.0, line->y/20.0
+		    );
+	}
+	line = line->next;
+    }
+    printf("%s |\n", prefix);
 }
     
 void fontcallback1(U16 id,U8 * name)
@@ -578,9 +676,9 @@ void hexdumpTag(TAG*tag, char* prefix)
 	ascii[t&15] = printable(tag->data[t]);
 	if((t && ((t&15)==15)) || (t==tag->len-1))
 	{
-	    int s,p=((t-1)&15)+1;
+	    int s,p=((t)&15)+1;
 	    ascii[p] = 0;
-	    for(s=p;s<16;s++) {
+	    for(s=p-1;s<16;s++) {
 		printf("   ");
 	    }
 	    if(t==tag->len-1)
@@ -703,7 +801,7 @@ int main (int argc,char ** argv)
 	printf(" ");
 
 	if(xy&4)
-	printf("-r %d", swf.frameRate*100/256);
+	printf("-r %.2f", swf.frameRate/256.0);
 	
 	if((xy&7) && (xy&8))
 	printf(" ");
@@ -717,9 +815,9 @@ int main (int argc,char ** argv)
     if(html)
     {
 	char*fileversions[] = {"","1,0,0,0", "2,0,0,0","3,0,0,0","4,0,0,0",
-			       "5,0,0,0","6,0,23,0","7,0,0,0","8,0,0,0"};
-	if(swf.fileVersion>8) {
-	    fprintf(stderr, "Fileversion>8\n");
+			       "5,0,0,0","6,0,23,0","7,0,0,0","8,0,0,0","9,0,0,0"};
+	if(swf.fileVersion>9) {
+	    fprintf(stderr, "Fileversion>9\n");
 	    exit(1);
 	}
  	printf("<OBJECT CLASSID=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\"\n"
@@ -809,7 +907,6 @@ int main (int argc,char ** argv)
             printf(" places id %04d at depth %04x", swf_GetPlaceID(tag), swf_GetDepth(tag));
             if(swf_GetName(tag))
                 printf(" name \"%s\"",swf_GetName(tag));
-	    handlePlaceObject(tag, myprefix);
         }
 	else if(tag->id == ST_PLACEOBJECT2) {
 	    if(tag->data[0]&1)
@@ -904,6 +1001,8 @@ int main (int argc,char ** argv)
 	else if(tag->id == ST_PROTECT) {
 	    if(tag->len>0) {
 		printf(" %s\n", swf_GetString(tag));
+	    } else {
+		printf("\n");
 	    }
 	}
 	else if(tag->id == ST_DEFINEBITSLOSSLESS ||
@@ -974,15 +1073,30 @@ int main (int argc,char ** argv)
             actions = swf_ActionGet(tag);
             swf_DumpActions(actions, myprefix);
         }
+        else if(tag->id == ST_DOINITACTION && action) {
+            ActionTAG*actions;
+            swf_GetU16(tag); // id
+            actions = swf_ActionGet(tag);
+            swf_DumpActions(actions, myprefix);
+        }
 	else if(tag->id == ST_DEFINEBUTTON && action) {
 	    dumpButtonActions(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_DEFINESHAPE ||
+		tag->id == ST_DEFINESHAPE2 ||
+		tag->id == ST_DEFINESHAPE3) {
+	    if(showshapes)
+		handleShape(tag, myprefix);
+	}
 
 	if(tag->len && used) {
 	    int num = swf_GetNumUsedIDs(tag);
@@ -993,8 +1107,13 @@ int main (int argc,char ** argv)
 		swf_GetUsedIDs(tag, used);
 		printf("%s%suses IDs: ", indent, prefix);
 		for(t=0;t<num;t++) {
+		    int id;
 		    swf_SetTagPos(tag, used[t]);
-		    printf("%d%s", swf_GetU16(tag), t<num-1?", ":"");
+		    id = swf_GetU16(tag);
+		    printf("%d%s", id, t<num-1?", ":"");
+		    if(!idtab[id]) {
+			dumperror("Id %04d is not yet defined.\n", id);
+		    }
 		}
 		printf("\n");
 	    }