X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=c3783d5003725c48c293883ec560c89d066d1379;hb=0e4f5172ce5736dd03f867e6e8cc8d9a56b2fa50;hp=b337eb0ffce1877b10ef8be79570810e06a7a22b;hpb=13ca807bd5e0595b985bd767e7fffb5093c50e58;p=swftools.git diff --git a/lib/rfxswf.h b/lib/rfxswf.h index b337eb0..c3783d5 100644 --- a/lib/rfxswf.h +++ b/lib/rfxswf.h @@ -70,6 +70,7 @@ extern "C" { #define REVERSESWAP16(s) ((((s)>>8)&0x00ff)|(((s)<<8)&0xff00)) #define REVERSESWAP32(s) (REVERSESWAP16(((s)>>16)&0x0000ffff)|((REVERSESWAP16(s)<<16)&0xffff0000)) #endif + // SWF Types typedef unsigned long U32; @@ -151,6 +152,9 @@ typedef struct _TAG // NEVER access a Tag-Struct directly ! } TAG, * LPTAG; +#define swf_ResetReadBits(tag) if (tag->readBit) { tag->pos++; tag->readBit = 0; } +#define swf_ResetWriteBits(tag) if (tag->writeBit) { tag->writeBit = 0; } + typedef struct _SOUNDINFO { U8 stop; @@ -236,6 +240,7 @@ int swf_SetBlock(TAG * t,U8 * b,int l); U8 swf_GetU8(TAG * t); // resets Bitcount U16 swf_GetU16(TAG * t); +#define swf_GetS16(tag) ((S16)swf_GetU16(tag)) U32 swf_GetU32(TAG * t); void swf_GetRGB(TAG * t, RGBA * col); void swf_GetRGBA(TAG * t, RGBA * col); @@ -243,7 +248,9 @@ void swf_GetGradient(TAG * t, GRADIENT * gradient, char alpha); char* swf_GetString(TAG*t); int swf_SetU8(TAG * t,U8 v); // resets Bitcount int swf_SetU16(TAG * t,U16 v); +void swf_SetS16(TAG * t,int v); int swf_SetU32(TAG * t,U32 v); +#define swf_SetString(t,s) swf_SetBlock(t,s,strlen(s)+1) //int swf_GetPoint(TAG * t,SPOINT * p); // resets Bitcount int swf_GetRect(TAG * t,SRECT * r); @@ -264,30 +271,13 @@ int swf_VerifyPassword(TAG * t, const char * password); void swf_ExpandRect(SRECT*src, SPOINT add); void swf_ExpandRect2(SRECT*src, SRECT*add); +void swf_ExpandRect3(SRECT*src, SPOINT center, int radius); SPOINT swf_TurnPoint(SPOINT p, MATRIX* m); SRECT swf_TurnRect(SRECT r, MATRIX* m); -// Function Macros - -#define swf_GetS8(tag) ((S8)swf_GetU8(tag)) -#define swf_GetS16(tag) ((S16)swf_GetU16(tag)) -#define swf_GetS32(tag) ((S32)swf_GetU32(tag)) -#define swf_GetCoord(tag) ((SCOORD)swf_GetU32(tag)) -#define swf_GetFixed(tag) ((SFIXED)swf_GetU32(tag)) - -#define swf_SetS8(tag,v) swf_SetU8(tag,(U8)v) -#define swf_SetS16(tag,v) swf_SetU16(tag,(U16)v) -#define swf_SetS32(tag,v) swf_SetU32(tag,(U32)v) -#define swf_SetCoord(tag,v) swf_SetU32(tag,(U32)v) -#define swf_SetFixed(tag,v) swf_SetU32(tag,(U32)v) -#define swf_SetString(t,s) swf_SetBlock(t,s,strlen(s)+1) - #ifndef FAILED #define FAILED(b) ((b)<0) #endif -#ifndef SUCCEEDED -#define SUCCEEDED(b) ((b)>=0) -#endif // Tag IDs (adopted from J. C. Kessels' Form2Flash) @@ -488,6 +478,11 @@ typedef struct SHAPE * shape; } SWFGLYPH; +typedef struct _FONTUSAGE +{ int* chars; + char is_reduced; +} FONTUSAGE, * LPFONTUSAGE; + #define FONT_STYLE_BOLD 1 #define FONT_STYLE_ITALIC 2 #define FONT_ENCODING_UNICODE 1 @@ -510,12 +505,11 @@ typedef struct _SWFFONT SWFGLYPH * glyph; U8 language; char ** glyphnames; + + FONTUSAGE * use; + } SWFFONT, * LPSWFFONT; -// does not support wide characters ! -typedef struct _FONTUSAGE -{ U8* code; -} FONTUSAGE, * LPFONTUSAGE; #define ET_HASTEXT 32768 #define ET_WORDWRAP 16384 @@ -554,10 +548,11 @@ int swf_FontIsItalic(SWFFONT * f); int swf_FontIsBold(SWFFONT * f); int swf_FontSetID(SWFFONT * f,U16 id); -int swf_FontReduce(SWFFONT * f,FONTUSAGE * use); +int swf_FontReduce(SWFFONT * f); -int swf_FontInitUsage(SWFFONT * f,FONTUSAGE * use); -int swf_FontUse(FONTUSAGE * use,U8 * s); +int swf_FontInitUsage(SWFFONT * f); +int swf_FontUseGlyph(SWFFONT * f, int glyph); +int swf_FontUse(SWFFONT* f,U8 * s); int swf_FontSetDefine(TAG * t,SWFFONT * f); int swf_FontSetDefine2(TAG * t,SWFFONT * f); @@ -583,13 +578,15 @@ 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_FontPrepareForEditText(SWFFONT * f); + +/* notice: if you set the fontid, make sure you call swf_FontPrepareForEditText() for the font first */ void swf_SetEditText(TAG*tag, U16 flags, SRECT r, char*text, RGBA*color, int maxlength, U16 font, U16 height, EditTextLayout*layout, char*variable); SRECT swf_SetDefineText(TAG*tag, SWFFONT*font, RGBA*rgb, char*text, int scale); -void swf_DrawText(drawer_t*draw, SWFFONT*font, char*text); +void swf_DrawText(drawer_t*draw, SWFFONT*font, int size, char*text); // swffont.c @@ -597,6 +594,8 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename); SWFFONT* swf_LoadT1Font(char*filename); SWFFONT* swf_LoadFont(char*filename); +void swf_SetLoadFontParameters(int scale, int skip_unused, int full_unicode); + // swfdump.c void swf_DumpHeader(FILE * f,SWF * swf); @@ -876,7 +875,7 @@ int swf_ObjectMove(TAG * t,U16 depth,MATRIX * m,CXFORM * cx); typedef struct _SWFPLACEOBJECT { U16 depth; U16 id; // may be 0 - bool move; //true: move/replace character, false: set character + char move; //true: move/replace character, false: set character MATRIX matrix; CXFORM cxform; U16 ratio; @@ -917,8 +916,9 @@ typedef struct _VIDEOSTREAM void swf_SetVideoStreamDefine(TAG*tag, VIDEOSTREAM*stream, U16 frames, U16 width, U16 height); void swf_SetVideoStreamIFrame(TAG*tag, VIDEOSTREAM*s, RGBA*pic, int quant/* 1-31, 1=best quality, 31=best compression*/); +void swf_SetVideoStreamBlackFrame(TAG*tag, VIDEOSTREAM*s); void swf_SetVideoStreamPFrame(TAG*tag, VIDEOSTREAM*s, RGBA*pic, int quant/* 1-31, 1=best quality, 31=best compression*/); -void swf_SetVideoStreamMover(TAG*tag, VIDEOSTREAM*s, signed char* movex, signed char* movey, int quant); +void swf_SetVideoStreamMover(TAG*tag, VIDEOSTREAM*s, signed char* movex, signed char* movey, void** image, int quant); void swf_VideoStreamClear(VIDEOSTREAM*stream); #ifdef __cplusplus