X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fswfc.c;h=1c7e0d90203dad614f40058a68f6d149b52a2503;hp=e189cec6a190b17190695da592813b9de40e2460;hb=f7555c9f25b9008e1996e029f83ebeaaafd95321;hpb=33816192a785027f03daf78eddff3a3d9c3be81a diff --git a/src/swfc.c b/src/swfc.c index e189cec..1c7e0d9 100644 --- a/src/swfc.c +++ b/src/swfc.c @@ -42,12 +42,12 @@ static char * outputname = "output.swf"; static int verbose = 2; static int override_outputname = 0; -static struct options_t options[] = -{ - {"o","output"}, - {"v","verbose"}, - {"V","version"}, - {0,0} +static struct options_t options[] = { +{"h", "help"}, +{"V", "version"}, +{"v", "verbose"}, +{"o", "output"}, +{0,0} }; int args_callback_option(char*name,char*val) @@ -75,12 +75,16 @@ int args_callback_longoption(char*name,char*val) { return args_long2shortoption(options, name, val); } -void args_callback_usage(char*name) +void args_callback_usage(char *name) { - printf("Usage: %s [-o filename] file.wav\n", name); - printf("\t-v , --verbose\t\t\t Be more verbose\n"); - printf("\t-o , --output filename\t\t set output filename (default: output.swf)\n"); - printf("\t-V , --version\t\t\t Print program version and exit\n"); + printf("\n"); + printf("Usage: %s [-o file.swf] file.sc\n", name); + printf("\n"); + printf("-h , --help Print short help message and exit\n"); + printf("-V , --version Print version info and exit\n"); + printf("-v , --verbose Increase verbosity. \n"); + printf("-o , --output Set output file to .\n"); + printf("\n"); } int args_callback_command(char*name,char*val) { @@ -121,7 +125,7 @@ static void warning(char*format, ...) va_end(arglist); printf("\"%s\", line %d column %d: warning- %s\n", filename, line, column, buf); } - + static void readToken() { type = file[pos].type; @@ -811,26 +815,16 @@ void dumpSWF(SWF*swf) void s_font(char*name, char*filename) { - int f; - SWF swf; SWFFONT* font; - f = open(filename,O_RDONLY|O_BINARY); - if (f<0) { - warning("Couldn't open file \"%s\": %s", filename, strerror(errno)); + font = swf_LoadFont(filename); + + if(font == 0) { + warning("Couldn't open font file \"%s\"", filename); font = (SWFFONT*)malloc(sizeof(SWFFONT)); memset(font, 0, sizeof(SWFFONT)); dictionary_put2(&fonts, name, font); return; } - font = 0; - if (swf_ReadSWF(f,&swf)>=0) { - swf_FontExtract(&swf, 0x4e46, &font); - swf_FreeTags(&swf); - } - close(f); - if (font==0) { - syntaxerror("File \"%s\" isn't a valid rfxswf font file", filename); - } if(0) { @@ -924,13 +918,15 @@ GRADIENT parseGradient(const char*str) memset(&gradient, 0, sizeof(GRADIENT)); while(*p) { char*posstr,*colorstr; + float pos; + RGBA color; posstr = gradient_getToken(&p); if(!*posstr) break; - float pos = parsePercent(posstr); + pos = parsePercent(posstr); if(!*p) syntaxerror("Error in shape data: Color expected after %s", posstr); colorstr = gradient_getToken(&p); - RGBA color = parseColor(colorstr); + color = parseColor(colorstr); if(gradient.num == sizeof(gradient.ratios)/sizeof(gradient.ratios[0])) { warning("gradient record too big- max size is 8, rest ignored"); break; @@ -957,6 +953,21 @@ void s_gradient(char*name, const char*text, int radial) dictionary_put2(&gradients, name, gradient); } +void s_action(const char*text) +{ + ActionTAG* a = 0; + a = swf_ActionCompile(text, stack[0].swf->fileVersion); + if(!a) { + syntaxerror("Couldn't compile ActionScript"); + } + + tag = swf_InsertTag(tag, ST_DOACTION); + + swf_ActionSet(tag, a); + + swf_ActionFree(a); +} + void s_outline(char*name, char*format, char*source) { outline_t* outline; @@ -1919,7 +1930,7 @@ static int c_primitive(map_t*args) int type=0; char* font; char* text; - char* outline; + char* outline=0; RGBA fill; if(!strcmp(command, "circle")) type = 1; @@ -2038,7 +2049,16 @@ int fakechar(map_t*args) } static int c_egon(map_t*args) {return fakechar(args);} -static int c_button(map_t*args) {return fakechar(args);} +static int c_button(map_t*args) { + char*action = ""; + readToken(); + if(type == RAWDATA) + action = text; + else + pushBack(); + + return fakechar(args); +} static int c_edittext(map_t*args) {return fakechar(args);} static int c_morphshape(map_t*args) {return fakechar(args);} @@ -2047,7 +2067,18 @@ static int c_movie(map_t*args) {return fakechar(args);} static int c_buttonsounds(map_t*args) {return 0;} static int c_buttonput(map_t*args) {return 0;} static int c_texture(map_t*args) {return 0;} -static int c_action(map_t*args) {return 0;} + +static int c_action(map_t*args) +{ + readToken(); + if(type != RAWDATA) { + syntaxerror("colon (:) expected"); + } + + s_action(text); + + return 0; +} static struct { char*command; @@ -2091,15 +2122,15 @@ static struct { {"stop", c_stop, "sound"}, // object placement tags - {"put", c_put, " x=0 y=0 red=+0 green=+0 blue=+0 alpha=+0 luminance= scale= scalex= scaley= pivot= pin= shear= rotate= above= below="}, - {"startclip", c_startclip, " x=0 y=0 red=+0 green=+0 blue=+0 alpha=+0 luminance= scale= scalex= scaley= pivot= pin= shear= rotate= above= below="}, - {"change", c_change, "name x= y= red= green= blue= alpha= luminance= scale= scalex= scaley= pivot= pin= shear= rotate= above= below="}, - {"arcchange", c_arcchange, "name pivot= angle= red= green= blue= alpha= luminance= scale= scalex= scaley= pivot= pin= shear= rotate= above= below="}, - {"qchange", c_qchange, "name x= y= red= green= blue= alpha= luminance= scale= scalex= scaley= pivot= pin= shear= rotate= above= below="}, - {"jump", c_jump, "name x= y= red= green= blue= alpha= luminance= scale= scalex= scaley= pivot= pin= shear= rotate= above= below="}, + {"put", c_put, " x=0 y=0 red=+0 green=+0 blue=+0 alpha=+0 luminance= scale= scalex= scaley= pivot= pin= shear= rotate= ratio= above= below="}, + {"startclip", c_startclip, " x=0 y=0 red=+0 green=+0 blue=+0 alpha=+0 luminance= scale= scalex= scaley= pivot= pin= shear= rotate= ratio= above= below="}, + {"change", c_change, "name x= y= red= green= blue= alpha= luminance= scale= scalex= scaley= pivot= pin= shear= rotate= ratio= above= below="}, + {"arcchange", c_arcchange, "name pivot= angle= red= green= blue= alpha= luminance= scale= scalex= scaley= pivot= pin= shear= rotate= ratio= above= below="}, + {"qchange", c_qchange, "name x= y= red= green= blue= alpha= luminance= scale= scalex= scaley= pivot= pin= shear= rotate= ratio= above= below="}, + {"jump", c_jump, "name x= y= red= green= blue= alpha= luminance= scale= scalex= scaley= pivot= pin= shear= rotate= ratio= above= below="}, {"del", c_del, "name"}, // virtual object placement - {"buttonput", c_buttonput, " x=0 y=0 red=+0 green=+0 blue=+0 alpha=+0 luminance= scale= scalex=100% scaley=100% shear=0 rotate=0 above= below="}, + {"buttonput", c_buttonput, " x=0 y=0 red=+0 green=+0 blue=+0 alpha=+0 luminance= scale= scalex=100% scaley=100% shear=0 rotate=0 above= below="}, //TODO: ratio??? {"texture", c_texture, " x=0 y=0 scale= scalex=100% scaley=100% shear=0 rotate=0"}, // commands which start a block @@ -2281,6 +2312,7 @@ static void parseArgumentsForCommand(char*command) int t; map_t args; int nr = -1; + msg(" parse Command: %s (line %d)", command, line); for(t=0;t