X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=81ccf9f1abb337b5947804d823bba2469baaeeaf;hb=6eb430c1eb68ab5caab03d0e28638ad8fa9c6eb0;hp=7dbe0916153139f53c4b93133cb3fb68e4d09aca;hpb=c5dd9a60269c8a37fe217a9fcb383961339d7606;p=swftools.git

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index 7dbe091..81ccf9f 100644
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -22,6 +22,21 @@
 
 #define DEBUG_RFXSWF
 
+#ifndef TRUE
+#define TRUE (1)
+#endif
+#ifndef FALSE
+#define FALSE (0)
+#endif
+
+#ifdef WORDS_BIGENDIAN
+#define SWAP16(s) ((U16) ((U8*)&s)[0] | ((U16) ((U8*)&s)[1] << 8))
+#define SWAP32(s) ((U32) ((U8*)&s)[0] | ((U32) ((U8*)&s)[1] << 8) | ((U32) ((U8*)&s)[2] << 16) | ((U32) ((U8*)&s)[3] << 24))
+#else
+#define SWAP16(x) x
+#define SWAP32(x) x
+#endif
+
 // SWF Types
 
 typedef         unsigned long   U32;
@@ -100,6 +115,10 @@ typedef struct _ActionTAG
   U8 tmp[4]; // store small operands here.
 } ActionTAG;
 
+typedef struct _ActionMarker
+{
+  ActionTAG* atag;
+} ActionMarker;
 
 typedef struct _SWF
 { U8            fileVersion;
@@ -128,8 +147,8 @@ TAG * swf_PrevTag(TAG * t);
 
 int   swf_GetFrameNo(TAG * t);              // should be renamed to TagGetFrame
 U16   swf_GetTagID(TAG * t);                // ... TagGetID
-U32   swf_GetDataSize(TAG * t);             // ... TagGetDataSize
-U8*   swf_GetDataSizePtr(TAG * t);
+U32   swf_GetTagLen(TAG * t);             // ... TagGetTagLen
+U8*   swf_GetTagLenPtr(TAG * t);
 
 U32   swf_GetBits(TAG * t,int nbits);
 S32   swf_GetSBits(TAG * t,int nbits);
@@ -250,20 +269,17 @@ typedef struct _SHAPE           // NEVER access a Shape-Struct directly !
   { LINESTYLE * data;
     U16         n;
   } linestyle;
-                  // note: changes of shape structure
-  struct                  // lead to incompatible .efont formats
+                  
+  struct                    
   { FILLSTYLE * data;
     U16         n;
   } fillstyle;
-
-  S32           px;
-  S32           py;
-  
+ 
   struct
   { U16         fill;
     U16         line;
   } bits;
-  
+  				// used by Get/SetSimpleShape and glyph handling
   U8 *          data;
   U32           bitlen;         // length of data in bits
 } SHAPE, * LPSHAPE;
@@ -319,7 +335,6 @@ typedef struct _SWFLAYOUT
 
 typedef struct
 { S16         advance;
-  U16         gid;            // Glyph-ID after DefineFont
   SHAPE *     shape;
 } SWFGLYPH;
 
@@ -329,8 +344,10 @@ typedef struct _SWFFONT
   U8 *          name;
   SWFLAYOUT *   layout;
   U16		numchars;
+  U16		maxascii; // highest mapped ascii value
   U8            flags; // bold/italic/unicode/ansi ...
-  U16	*	codes;
+  U16	*	glyph2ascii;
+  int	*	ascii2glyph;
   SWFGLYPH *	glyph;
 } SWFFONT, * LPSWFFONT;
 
@@ -357,10 +374,14 @@ int swf_FontUse(FONTUSAGE * use,U8 * s);
 int swf_FontSetDefine(TAG * t,SWFFONT * f);
 int swf_FontSetInfo(TAG * t,SWFFONT * f);
 
+int swf_FontExtract_DefineTextCallback(int id,SWFFONT * f,TAG * t,int jobs, 
+	void(*callback)(int*chars, int nr, int id));
+
+// the following two functions are obsolete and will be removed soon
 int swf_FontExport(int handle,SWFFONT * f);
 int swf_FontImport(int handle,SWFFONT * * f);
 
-void swf_WriteFont(SWFFONT* font, char* filename, int useDefineFont2);
+void swf_WriteFont(SWFFONT* font, char* filename);
 SWFFONT* swf_ReadFont(char* filename);
 
 void swf_FontFree(SWFFONT * f);
@@ -419,6 +440,7 @@ int swf_ObjectMove(TAG * t,U16 depth,MATRIX * m,CXFORM * cx);
 #define BC_END                  0x0800
 #define BC_INSERT               0x0a00
 #define BC_DELETE               0x0c00
+#define BC_CLEAR		0x0e00
 #define BC_BACKSPACE            0x1000
 #define BC_ENTER                0x1a00
 #define BC_CURSORUP             0x1c00
@@ -426,8 +448,30 @@ int swf_ObjectMove(TAG * t,U16 depth,MATRIX * m,CXFORM * cx);
 #define BC_PAGEUP               0x2000
 #define BC_PAGEDOWN             0x2200
 #define BC_TAB                  0x2400
+#define BC_ESCAPE		0x3600
 #define BC_SPACE                0x4000
 
+/* these are probably only valid with linux:
+   Ctrl-A	 0x0200
+   Ctrl-X	 0x3000
+   Ctrl-Y	 0x3200
+   Ctrl-Z	 0x3400
+   Escape/Ctrl-[ 0x3600
+   Ctrl-\	 0x3800
+   Ctrl-]	 0x3a00
+   Ctrl-^	 0x3c00
+   Ctrl-/	 0x3e00
+   */
+
+/* everything above 0x4000 is standard ascii:
+   0x4000 ' ' 0x4200 '!' 0x4600 '#' 0x4800 '$' 0x4a00 '%' 0x4c00 '&' ...
+   0x6000 '0' ... 0x7200 '9' 
+   0x8000 '@' 
+   0x8200 'A' ...  0xb400 'Z' 
+   ...
+   0xfc00 '~'
+ */
+
 // Button Flag
 
 #define BF_TRACKMENU            0x01
@@ -469,6 +513,7 @@ int swf_SetLosslessBitsGrayscale(TAG * t,U16 width,U16 height,U8 * bitmap);
 // swftools.c
 
 U8 swf_isDefiningTag(TAG * t);
+U8 swf_isPseudoDefiningTag(TAG * t);
 U8 swf_isAllowedSpriteTag(TAG * t);
 U16 swf_GetDefineID(TAG * t);
 U16 swf_GetPlaceID(TAG * t); //PLACEOBJECT, PLACEOBJECT2 (sometimes), REMOVEOBJECT
@@ -485,8 +530,9 @@ void swf_uncgi();  // same behaviour as Steven Grimm's uncgi-library
 
 // swfaction.c
 
-ActionTAG* swf_GetActions(TAG*tag);
-void swf_SetActions(TAG*tag, ActionTAG*actions);
+ActionTAG* swf_ActionGet(TAG*tag);
+void swf_ActionFree(ActionTAG*tag);
+void swf_ActionSet(TAG*tag, ActionTAG*actions);
 void swf_DumpActions(ActionTAG*atag, char*prefix);
 void swf_ActionEnumerateURLs(ActionTAG*atag, char*(*callback)(char*));
 void swf_ActionEnumerateTargets(ActionTAG*atag, char*(*callback)(char*));
@@ -590,5 +636,7 @@ void action_If(U16 branch);
 void action_Call();
 void action_GotoFrame2(U8 method);
 void swf_ActionEnd();
+ActionMarker action_setMarker();
+void action_fixjump(ActionMarker m1, ActionMarker m2);
 
 #endif