X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=5195ef4dc5d75cf5533add239097fec2f4bf117f;hb=ac8c6f00fbaa94b3136457caf1a24d8f4f0c12cc;hp=9a2dc70942eb76d84cbc630498d22acd10ed02f4;hpb=8386a755728a87ff16fa1d62e87b0dd5660b6aa2;p=swftools.git

diff --git a/src/swfdump.c b/src/swfdump.c
index 9a2dc70..5195ef4 100644
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -60,6 +60,7 @@ static int used = 0;
 static int bbox = 0;
 static int cumulative = 0;
 static int showfonts = 0;
+static int showbuttons = 0;
 
 static struct options_t options[] = {
 {"h", "help"},
@@ -73,6 +74,7 @@ static struct options_t options[] = {
 {"F", "fonts"},
 {"p", "placements"},
 {"b", "bbox"},
+{"B", "buttons"},
 {"X", "width"},
 {"Y", "height"},
 {"r", "rate"},
@@ -149,8 +151,12 @@ int args_callback_option(char*name,char*val)
 	bbox = 1;
 	return 0;
     }
+    else if(name[0]=='B') {
+	showbuttons = 1;
+	return 0;
+    }
     else if(name[0]=='D') {
-	action = placements = showtext = showshapes = 1;
+	showbuttons = action = placements = showtext = showshapes = 1;
 	return 0;
     }
     else {
@@ -250,6 +256,7 @@ void dumpButton2Actions(TAG*tag, char*prefix)
 void dumpButtonActions(TAG*tag, char*prefix)
 {
     ActionTAG*actions;
+    swf_SetTagPos(tag, 0);
     swf_GetU16(tag); // id
     while (swf_GetU8(tag))      // state  -> parse ButtonRecord
     { swf_GetU16(tag);          // id
@@ -260,6 +267,31 @@ void dumpButtonActions(TAG*tag, char*prefix)
     swf_DumpActions(actions, prefix);
 }
 
+void dumpButton(TAG*tag, char*prefix)
+{
+    swf_SetTagPos(tag, 0);
+    swf_GetU16(tag); // id
+    while (1) {
+        U8 flags = swf_GetU8(tag);
+        if(!flags)
+            break;
+        U16 id = swf_GetU16(tag);
+        U16 depth = swf_GetU16(tag);
+        char event[80];
+        sprintf(event, "%s%s%s%s", 
+                (flags&BS_HIT)?"[hit]":"",
+                (flags&BS_DOWN)?"[down]":"",
+                (flags&BS_OVER)?"[over]":"",
+                (flags&BS_UP)?"[up]":"");
+        if(flags&0xf0) {
+            printf("%s | Show %d at depth %d for %s flags=%02x\n", prefix, id, depth, event, flags);
+        } else {
+            printf("%s | Show %d at depth %d for %s\n", prefix, id, depth, event);
+        }
+        swf_GetMatrix(tag,NULL);  // matrix
+    }
+}
+
 void dumpFont(TAG*tag, char*prefix)
 {
     SWFFONT* font = malloc(sizeof(SWFFONT));
@@ -319,7 +351,7 @@ SWFFONT**fonts;
 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, color #%02x%02x%02x%02x> ",nr, fontid, color->r, color->g, color->b, color->a);
+    printf("                <%2d glyphs in font %2d size %d, color #%02x%02x%02x%02x> ",nr, fontid, fontsize, color->r, color->g, color->b, color->a);
     for(t=0;t<fontnum;t++)
     {
 	if(fonts[t]->id == fontid) {
@@ -753,11 +785,13 @@ char* fillstyle2str(FILLSTYLE*style)
 	    /* TODO: display information about that bitmap */
 	    sprintf(stylebuf, "BITMAPt%s %d", (style->type&2)?"n":"", style->id_bitmap);
 	    /* TODO: show matrix */
+	    //swf_DumpMatrix(stdout, &style->m);
 	    break;
 	case 0x41: case 0x43:
 	    /* TODO: display information about that bitmap */
 	    sprintf(stylebuf, "BITMAPc%s %d", (style->type&2)?"n":"", style->id_bitmap);
 	    /* TODO: show matrix */
+	    //swf_DumpMatrix(stdout, &style->m);
 	    break;
 	default:
 	    sprintf(stylebuf, "UNKNOWN[%02x]",style->type);
@@ -800,6 +834,10 @@ void handleShape(TAG*tag, char*prefix)
 	    printf("%-2d) %s", t+1, linestyle2str(&shape.linestyles[t]));
 	}
 	printf("\n");
+        //if(shape.fillstyles[t].type&0x40) {
+        //    MATRIX m = shape.fillstyles[t].m;
+        //    swf_DumpMatrix(stdout, &m);
+        //}
     }
 
     printf("%s |\n", prefix);
@@ -964,11 +1002,11 @@ int main (int argc,char ** argv)
 #endif
 
     close(f);
-    
-    if(action && swf.fileVersion>=9) {
-        fprintf(stderr, "Actionscript parsing (-a) not yet supported for SWF versions>=9\n");
-	action = 0;
-    }
+
+    //if(action && swf.fileVersion>=9) {
+    //    fprintf(stderr, "Actionscript parsing (-a) not yet supported for SWF versions>=9\n");
+    //    action = 0;
+    //}
 
     xsize = (swf.movieSize.xmax-swf.movieSize.xmin)/20;
     ysize = (swf.movieSize.ymax-swf.movieSize.ymin)/20;
@@ -1140,6 +1178,20 @@ int main (int argc,char ** argv)
         else if(tag->id == ST_FREECHARACTER) {
             printf(" frees object %04d", swf_GetPlaceID(tag));
         }
+        else if(tag->id == ST_DOABC) {
+            swf_SetTagPos(tag, 0);
+            U32 flags = swf_GetU32(tag);
+            char*s = swf_GetString(tag);
+            if(*s) {
+                printf(" \"%s\"", s);
+            }
+            if(flags&1) {
+                if(name)
+                    printf(",");
+                printf(" lazy load");
+            }
+            swf_SetTagPos(tag, 0);
+        }
 	else if(tag->id == ST_STARTSOUND) {
 	    U8 flags;
 	    U16 id;
@@ -1199,18 +1251,15 @@ int main (int argc,char ** argv)
 	    if(issprite) {spriteframe++; spriteframelabel = 0;}
 	    if(!issprite) {mainframe++; framelabel = 0;}
 	}
-
-	if(tag->id == ST_SETBACKGROUNDCOLOR) {
+        else if(tag->id == ST_SETBACKGROUNDCOLOR) {
 	    U8 r = swf_GetU8(tag);
 	    U8 g = swf_GetU8(tag);
 	    U8 b = swf_GetU8(tag);
-	    printf(" (%02x/%02x/%02x)\n",r,g,b);
+	    printf(" (%02x/%02x/%02x)",r,g,b);
 	}
 	else if(tag->id == ST_PROTECT) {
 	    if(tag->len>0) {
-		printf(" %s\n", swf_GetString(tag));
-	    } else {
-		printf("\n");
+		printf(" %s", swf_GetString(tag));
 	    }
 	}
 	else if(tag->id == ST_CSMTEXTSETTINGS) {
@@ -1230,10 +1279,11 @@ int main (int argc,char ** argv)
 		printf("unknown[%08x],", flags);
 	    float thickness = swf_GetFixed(tag);
 	    float sharpness = swf_GetFixed(tag);
-	    printf("s=%.2f,t=%.2f)\n", thickness, sharpness);
+	    printf("s=%.2f,t=%.2f)", thickness, sharpness);
 	    swf_GetU8(tag);
 	}
-	else if(tag->id == ST_DEFINEBITSLOSSLESS ||
+
+	if(tag->id == ST_DEFINEBITSLOSSLESS ||
 	   tag->id == ST_DEFINEBITSLOSSLESS2) {
 	    handleDefineBits(tag);
 	    printf("\n");
@@ -1265,6 +1315,12 @@ int main (int argc,char ** argv)
 	    else
 		printf("\n");
 	}
+	else if(tag->id == ST_DEFINESCALINGGRID) {
+	    U16 id = swf_GetU16(tag);
+	    SRECT r;
+	    swf_GetRect(tag, &r);
+	    printf(" (%.2f,%.2f)-(%.2f,%.2f)\n", r.xmin/20.0, r.ymin/20.0, r.xmax/20.0, r.ymax/20.0);
+	}
 	else if(tag->id == ST_PLACEOBJECT2 || tag->id == ST_PLACEOBJECT3) {
 	}
 	else if(tag->id == ST_NAMECHARACTER || tag->id==ST_DEFINEFONTNAME) {
@@ -1310,20 +1366,30 @@ int main (int argc,char ** argv)
             actions = swf_ActionGet(tag);
             swf_DumpActions(actions, myprefix);
         }
+        else if((tag->id == ST_DOABC || tag->id == ST_RAWABC) && action) {
+            swf_ReadABC(tag);
+        }
         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_DEFINEBUTTON) {
+            if(showbuttons) {
+                dumpButton(tag, myprefix);
+            }
+            if(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_DEFINEBUTTON2) {
+            if(action) {
+	        dumpButton2Actions(tag, myprefix);
+            }
 	}
 	else if(tag->id == ST_PLACEOBJECT) {
 	    handlePlaceObject(tag, myprefix);