X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=83db4f06c4133fb66d2582814c90517f7b59221e;hb=103fd3207b8a4d7be7fa8d4e0e8ee43c31ac4911;hp=4d4eb072cf4f9e699ba645276b703623ab115890;hpb=2480ced174c11f6a8ea51c43ff584ddf06b7e803;p=swftools.git diff --git a/lib/rfxswf.h b/lib/rfxswf.h index 4d4eb07..83db4f0 100644 --- a/lib/rfxswf.h +++ b/lib/rfxswf.h @@ -151,6 +151,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; @@ -264,6 +267,7 @@ 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); @@ -451,8 +455,13 @@ void swf_SetShape2(TAG*tag, SHAPE2*shape); void swf_Shape2Free(SHAPE2 * s); void swf_DumpShape(SHAPE2*shape2); +void swf_ParseDefineShape(TAG*tag, SHAPE2*shape); +void swf_Shape2ToShape(SHAPE2*shape2, SHAPE*shape); +void swf_SetShape2(TAG*tag, SHAPE2*shape2); + // swfdraw.c +void swf_Shape10DrawerInit(drawer_t*draw, TAG*tag); void swf_Shape01DrawerInit(drawer_t*draw, TAG*tag); void swf_Shape11DrawerInit(drawer_t*draw, TAG*tag); SHAPE* swf_ShapeDrawerToShape(drawer_t*draw); @@ -483,6 +492,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 @@ -505,12 +519,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 @@ -549,10 +562,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); @@ -561,8 +575,7 @@ int swf_FontSetInfo(TAG * t,SWFFONT * f); void swf_FontCreateLayout(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)); +int swf_ParseDefineText(TAG * t, void(*callback)(void*self, int*chars, int*xpos, int nr, int fontid, int fontsize, int xstart, int ystart, RGBA* color), void*self); void swf_WriteFont(SWFFONT* font, char* filename); SWFFONT* swf_ReadFont(char* filename); @@ -579,13 +592,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 @@ -593,6 +608,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); @@ -613,6 +630,10 @@ void swf_DumpFont(SWFFONT * font); // Button Conditions +/* missing: IDLE_OUTDOWN + OUTDOWN_OVERUP + OVERUP_OUTDOWN +*/ #define BC_OVERDOWN_IDLE 0x0100 #define BC_IDLE_OVERDOWN 0x0080 #define BC_OUTDOWN_IDLE 0x0040 @@ -693,14 +714,6 @@ int swf_SetJPEGBits3(TAG * tag,U16 width,U16 height,RGBA* bitmap, int quality); #define BMF_16BIT 4 #define BMF_32BIT 5 -#define BM16_BLUE 0xf800 // Bitmasks for 16 Bit Color -#define BM16_RED 0x00f0 -#define BM16_GREEN 0x000f - -#define BM32_BLUE 0xff000000 // Bitmasks for 32 Bit Color -#define BM32_GREEN 0x00ff0000 -#define BM32_RED 0x0000ff00 - int swf_SetLosslessBits(TAG * t,U16 width,U16 height,void * bitmap,U8 bitmap_flags); 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); @@ -876,7 +889,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,7 +930,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, void** image, int quant); void swf_VideoStreamClear(VIDEOSTREAM*stream); #ifdef __cplusplus