X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=e7a11d19a5a3fb4018dbf8748609ea18f0643591;hb=ddc8276393f0d58cbb9a5b82c296ca4d063188ba;hp=9b775f9d6e2be5c54a2bfbe0f409740dd865536b;hpb=fcb4a9475268e19036bca32bec316d3d5402dc9a;p=swftools.git

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index 9b775f9..e7a11d1 100644
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -18,6 +18,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <ctype.h>
 #include "../config.h"
 #include "bladeenc/codec.h"
 
@@ -36,8 +37,8 @@
 //#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))
 
-#define PUT16(ptr,x) ((U8*)(ptr))[0]=(U8)(x);((U8*)(ptr))[1]=(U8)(x>>8);
-#define PUT32(ptr,x) ((U8*)(ptr))[0]=(U8)(x);((U8*)(ptr))[1]=(U8)(x>>8);((U8*)(ptr))[2]=(U8)(x>>16);((U8*)(ptr))[3]=(U8)(x>>24);
+#define PUT16(ptr,x) ((U8*)(ptr))[0]=(U8)(x);((U8*)(ptr))[1]=(U8)((x)>>8);
+#define PUT32(ptr,x) ((U8*)(ptr))[0]=(U8)(x);((U8*)(ptr))[1]=(U8)((x)>>8);((U8*)(ptr))[2]=(U8)((x)>>16);((U8*)(ptr))[3]=(U8)((x)>>24);
 #define GET16(ptr) (((U16)(((U8*)(ptr))[0]))+(((U16)(((U8*)(ptr))[1]))<<8))
 #define GET32(ptr) (((U16)(((U8*)(ptr))[0]))+(((U16)(((U8*)(ptr))[1]))<<8)+(((U16)(((U8*)(ptr))[2]))<<16)+(((U16)(((U8*)(ptr))[3]))<<24))
 
@@ -100,6 +101,13 @@ typedef struct _CXFORM
   S16           b0, b1;
 } CXFORM, * LPCXFORM;
 
+typedef struct _GRADIENT
+{
+    int num;
+    U8 ratios[8];
+    RGBA rgba[8];
+} GRADIENT;
+
 typedef struct _TAG             // NEVER access a Tag-Struct directly !
 { U16           id;
   U8 *          data;
@@ -137,6 +145,7 @@ typedef struct _ActionMarker
 
 typedef struct _SWF
 { U8            fileVersion;
+  U8		compressed;     // SWF or SWC?
   U32           fileSize;       // valid after load and save
   SRECT         movieSize;
   U16           frameRate;
@@ -184,6 +193,9 @@ int   swf_SetBlock(TAG * t,U8 * b,int l);
 U8    swf_GetU8(TAG * t);                   // resets Bitcount
 U16   swf_GetU16(TAG * t);
 U32   swf_GetU32(TAG * t);
+void  swf_GetRGB(TAG * t, RGBA * col);
+void  swf_GetRGBA(TAG * t, RGBA * col);
+void  swf_GetGradient(TAG * t, GRADIENT * gradient, char alpha);
 
 int   swf_SetU8(TAG * t,U8 v);              // resets Bitcount
 int   swf_SetU16(TAG * t,U16 v);
@@ -363,6 +375,12 @@ typedef struct
   SHAPE *     shape;
 } SWFGLYPH;
 
+#define FONT_STYLE_BOLD 1
+#define FONT_STYLE_ITALIC 2
+#define FONT_ENCODING_UNICODE 1
+#define FONT_ENCODING_ANSI 2 
+#define FONT_ENCODING_SHIFTJIS 4
+
 typedef struct _SWFFONT
 { int		id; // -1 = not set
   U8		version; // 0 = not set, 1 = definefont, 2 = definefont2
@@ -370,7 +388,10 @@ typedef struct _SWFFONT
   SWFLAYOUT *   layout;
   U16		numchars;
   U16		maxascii; // highest mapped ascii value
-  U8            flags; // bold/italic/unicode/ansi ...
+  
+  U8		style;
+  U8		encoding;
+
   U16	*	glyph2ascii;
   int	*	ascii2glyph;
   SWFGLYPH *	glyph;
@@ -423,8 +444,11 @@ int swf_FontInitUsage(FONTUSAGE * use);
 int swf_FontUse(FONTUSAGE * use,U8 * s);
 
 int swf_FontSetDefine(TAG * t,SWFFONT * f);
+int swf_FontSetDefine2(TAG * t,SWFFONT * f);
 int swf_FontSetInfo(TAG * t,SWFFONT * f);
 
+void swf_FontAddLayout(SWFFONT * f, int ascent, int descent, int leading);
+
 int swf_FontExtract_DefineTextCallback(int id,SWFFONT * f,TAG * t,int jobs, 
 	void(*callback)(int*chars, int nr, int id));
 
@@ -446,6 +470,7 @@ int swf_TextSetCharRecord(TAG * t,SWFFONT * font,U8 * s,int scale,U8 gbits,U8 ab
 int swf_TextPrintDefineText(TAG * t,SWFFONT * f);
 // Prints text defined in tag t with font f to stdout
 
+/* notice: if you set the fontid, make sure the corresponding font has layout information */
 void swf_SetEditText(TAG*tag, U16 flags, SRECT r, char*text, RGBA*color, 
 	int maxlength, U16 font, U16 height, EditTextLayout*layout, char*variable);
 
@@ -564,10 +589,14 @@ int swf_SetLosslessBits(TAG * t,U16 width,U16 height,void * bitmap,U8 bitmap_fla
 int swf_SetLosslessBitsIndexed(TAG * t,U16 width,U16 height,U8 * bitmap,RGBA * palette,U16 ncolors);
 int swf_SetLosslessBitsGrayscale(TAG * t,U16 width,U16 height,U8 * bitmap);
 
+#ifndef RFXSWF_DISABLESOUND
+
 // swfsound.c
 void swf_SetSoundStreamHead(TAG*tag, U16 avgnumsamples);
 void swf_SetSoundStreamBlock(TAG*tag, S16*samples, int numsamples, char first);
 
+#endif // RFXSWF_DISABLESOUND
+
 // swftools.c
 
 U8 swf_isDefiningTag(TAG * t);
@@ -580,7 +609,8 @@ char* swf_GetName(TAG * t); //PLACEOBJECT2, FRAMELABEL
 MATRIX * swf_MatrixJoin(MATRIX * d,MATRIX * s1,MATRIX * s2);
 MATRIX * swf_MatrixMapTriangle(MATRIX * m,int dx,int dy,
                     int x0,int y0,int x1,int y1,int x2,int y2);
-
+int swf_GetNumUsedIDs(TAG * t);
+void swf_GetUsedIDs(TAG * t, int * positions);
 
 // swfcgi.c