more horizontal refactoring

[swftools.git] / lib / modules / swfbutton.c

diff --git a/lib/modules/swfbutton.c b/lib/modules/swfbutton.c
index 4f2b90f..40684aa 100644 (file)
--- a/lib/modules/swfbutton.c
+++ b/lib/modules/swfbutton.c
@@ -21,13 +21,15 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include "../rfxswf.h"
+
 int swf_ButtonSetRecord(TAG * t,U8 state,U16 id,U16 layer,MATRIX * m,CXFORM * cx)
 
 { swf_SetU8(t,state);
   swf_SetU16(t,id);
   swf_SetU16(t,layer);
   swf_SetMatrix(t,m);
-  if (swf_GetTagID(t)==ST_DEFINEBUTTON2) swf_SetCXForm(t,cx,0);
+  if (swf_GetTagID(t)==ST_DEFINEBUTTON2) swf_SetCXForm(t,cx,1);
   return 0;
 }
 
@@ -73,7 +75,7 @@ int swf_ButtonPostProcess(TAG * t,int anz_action)
     { swf_GetU16(t);          // id
       swf_GetU16(t);          // layer
       swf_GetMatrix(t,NULL);  // matrix
-      swf_GetCXForm(t,NULL,0);// CXForm
+      swf_GetCXForm(t,NULL,1);// CXForm
     }
 
     swf_SetButtonOffset(t,offsetpos);
@@ -100,3 +102,47 @@ int swf_ButtonPostProcess(TAG * t,int anz_action)
   }
   return 0;
 }
+
+ActionTAG* swf_Button1GetAction(TAG*tag)
+{
+    swf_GetU16(tag); //button id
+    while(1)
+    {
+        U8 flags = swf_GetU8(tag);
+        if(!flags)
+            break; 
+        swf_GetU16(tag); //char
+        swf_GetU16(tag); //layer
+        swf_ResetReadBits(tag);
+        swf_GetMatrix(tag, NULL);
+    }
+    return swf_ActionGet(tag);
+}
+
+ActionTAG* swf_Button2GetAction(TAG*tag)
+{
+    swf_GetU16(tag); //button id
+    swf_GetU8(tag); //flag
+    U16 offset = swf_GetU16(tag); //offset
+    swf_SetTagPos(tag, offset);
+    swf_GetU16(tag); // next offset
+    swf_GetU16(tag); // condition
+
+    /* notice: this only returns the *first* action block.
+       For the current appliances, this is enough.
+     */
+    return swf_ActionGet(tag);
+}
+
+ActionTAG* swf_ButtonGetAction(TAG*t)
+{
+    if(t->id == ST_DEFINEBUTTON) {
+        return swf_Button1GetAction(t);
+    } else if(t->id == ST_DEFINEBUTTON2) { 
+        return swf_Button2GetAction(t);
+    } else {
+        fprintf(stderr, "error in buttongetaction: not a button tag\n");
+        return 0;
+    }
+}
+