X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpython%2Ftags.c;h=ca49a25d837dce9ac1c5a6dfe0760044dc221754;hp=e642125b8a83b9a9db5372d956180c936c1f44ef;hb=6f78b0ef3998e959ce09c5ef11d46149756b682b;hpb=8adbe9a5797deaff48d42b34bc3405bb7c0633cb

diff --git a/lib/python/tags.c b/lib/python/tags.c
index e642125..ca49a25 100644
--- a/lib/python/tags.c
+++ b/lib/python/tags.c
@@ -1,9 +1,11 @@
 #include "pyutils.h"
 #include "primitives.h"
 #include "action.h"
+#include "taglist.h"
 #include "tag.h"
 #include "tags.h"
 #include "image.h"
+#include "../png.h"
 
 //----------------------------------------------------------------------------
 
@@ -47,7 +49,7 @@ static PyObject* f_DefineFont(PyObject* self, PyObject* args, PyObject* kwargs)
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|s", kwlist, &filename))
 	return NULL;
 
-    font = swf_LoadFont(filename);
+    font = swf_LoadFont(filename, 0);
     if(!font) {
 	PyErr_SetString(PyExc_Exception, setError("Could not load %s", filename));
 	return NULL;
@@ -72,6 +74,8 @@ static tag_internals_t font_tag =
     parse: font_parse,
     fillTAG: font_fillTAG,
     dealloc: font_dealloc,
+    getattr: 0, 
+    setattr: 0,
     tagfunctions: 0,
     datasize: sizeof(font_internal_t),
 };
@@ -80,6 +84,7 @@ static tag_internals_t font_tag =
 typedef struct _placeobject_internal
 {
     SWFPLACEOBJECT* po;
+    PyObject*character;
 } placeobject_internal_t;
 staticforward tag_internals_t placeobject_tag;
 
@@ -93,10 +98,25 @@ static void po_dealloc(tag_internals_t*self)
 }
 static int po_parse(tag_internals_t*self)
 {
-    placeobject_internal_t*pi = (placeobject_internal_t*)self->data;
-    /* TODO */
-    PyErr_SetString(PyExc_Exception, setError("Font parsing not implemented yet"));
-    return 0;
+    placeobject_internal_t*i = (placeobject_internal_t*)self->data;
+    if(i->po)
+	return 1;
+    if(!self->tag)
+	return 0;
+    SWFPLACEOBJECT* swfpo = malloc(sizeof(SWFPLACEOBJECT));
+    swf_GetPlaceObject(self->tag, swfpo);
+    i->po = swfpo;
+    swf_DeleteTag(0, self->tag);self->tag = 0;
+	
+    if(i->po->id) {
+	i->character = tagmap_id2obj(self->tagmap, i->po->id);
+	if(i->character) {
+	    Py_INCREF(i->character);
+	} else {
+	    //PyErr_Clear(); //?
+	}
+    }
+    return 1;
 }
 static int po_fillTAG(tag_internals_t*self)
 {
@@ -105,7 +125,34 @@ static int po_fillTAG(tag_internals_t*self)
     swf_SetPlaceObject(self->tag, pi->po);
     return 1;
 }
-static PyObject* f_PlaceObject(PyObject* self, PyObject* args, PyObject* kwargs)
+static PyObject* po_getattr(tag_internals_t*self,char*a)
+{
+    placeobject_internal_t*i = (placeobject_internal_t*)self->data;
+    if(!po_parse(self))
+	return PY_ERROR("Couldn't parse placeobject");
+    if(!strcmp(a, "character")) {
+	if(!i->character)
+	    return PY_NONE;
+	Py_INCREF(i->character); //TODO: ??
+	return i->character;
+    } else if(!strcmp(a, "matrix")) {
+	return f_Matrix2(&i->po->matrix);
+    } else if(!strcmp(a, "cxform")) {
+	/* TODO */
+	return 0;
+    }
+    return 0;
+}
+static int po_setattr(tag_internals_t*self,char*a, PyObject*obj)
+{
+    placeobject_internal_t*si = (placeobject_internal_t*)self->data;
+    if(!strcmp(a, "cxform")) {
+	/* TODO */
+	return 0;
+    }
+    return -1;
+}
+static PyObject* po_create(PyObject* self, PyObject* args, PyObject* kwargs,char move)
 {
     static char *kwlist[] = {"character", "depth", "matrix", "colortransform", "ratio", "name", "clipdepth", "action", NULL};
     
@@ -120,9 +167,10 @@ static PyObject* f_PlaceObject(PyObject* self, PyObject* args, PyObject* kwargs)
     SWFPLACEOBJECT* po;
     po = malloc(sizeof(SWFPLACEOBJECT));
     memset(po, 0, sizeof(SWFPLACEOBJECT));
-
+    
     swf_GetPlaceObject(0, po);
-
+   
+    PyErr_Clear();
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi|O!O!isiO!", kwlist, 
 		&character, 
 		&depth, 
@@ -134,11 +182,12 @@ static PyObject* f_PlaceObject(PyObject* self, PyObject* args, PyObject* kwargs)
 		&ActionClass, &action
 		))
 	return NULL;
+
     po->depth = depth;
-    po->id = /*ID*/ 0;
     po->clipdepth = clipdepth;
     po->ratio = ratio;
     po->name = name;
+    po->move = move;
     if(clipdepth) po->clipdepth = clipdepth;
     if(matrix) po->matrix = matrix_getMatrix(matrix);
     if(cxform) po->cxform = colortransform_getCXForm(cxform);
@@ -149,17 +198,31 @@ static PyObject* f_PlaceObject(PyObject* self, PyObject* args, PyObject* kwargs)
     tag_internals_t*itag = tag_getinternals(tag);
     placeobject_internal_t*pi = (placeobject_internal_t*)itag->data;
     pi->po = po;
-    pi->po->id = tagmap_add(itag->tagmap,(PyObject*)character);
+    if(!move) {
+	pi->po->id = tagmap_add(itag->tagmap,(PyObject*)character);
+    } else {
+	pi->po->id = 0;
+    }
     
     mylog("+%08x(%d) PlaceObject %08x(%d)\n", (int)tag, tag->ob_refcnt, character, character->ob_refcnt);
 
     return (PyObject*)tag;
 }
+static PyObject* f_PlaceObject(PyObject* self, PyObject* args, PyObject* kwargs)
+{
+    return po_create(self, args, kwargs, 0);
+}
+static PyObject* f_MoveObject(PyObject* self, PyObject* args, PyObject* kwargs)
+{
+    return po_create(self, args, kwargs, 1);
+}
 static tag_internals_t placeobject_tag =
 {
     parse: po_parse,
     fillTAG: po_fillTAG,
     dealloc: po_dealloc,
+    getattr: po_getattr, 
+    setattr: po_setattr,
     tagfunctions: 0,
     datasize: sizeof(placeobject_internal_t),
 };
@@ -211,6 +274,8 @@ static tag_internals_t bgcolor_tag =
     parse: 0,
     fillTAG: 0,
     dealloc: 0,
+    getattr: 0, 
+    setattr: 0,
     tagfunctions: setbgcolor_methods,
     datasize: 0,
 };
@@ -238,16 +303,154 @@ static tag_internals_t protect_tag =
     parse: 0,
     fillTAG: 0,
     dealloc: 0,
+    getattr: 0, 
+    setattr: 0,
     tagfunctions: 0,
     datasize: 0,
 };
 //----------------------------------------------------------------------------
+staticforward tag_internals_t showframe_tag;
+static PyObject* f_ShowFrame(PyObject* self, PyObject* args, PyObject* kwargs)
+{
+    static char *kwlist[] = {"name", NULL};
+    char*name= 0;
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|s", kwlist, &name))
+	return NULL;
+
+    PyObject*tag = tag_new(&showframe_tag);
+    tag_internals_t*itag = tag_getinternals(tag);
+    itag->tag = swf_InsertTag(0, ST_SHOWFRAME);
+    mylog("+%08x(%d) f_ShowFrame", (int)tag, tag->ob_refcnt);
+    return (PyObject*)tag;
+}
+static tag_internals_t showframe_tag =
+{
+    parse: 0,
+    fillTAG: 0,
+    dealloc: 0,
+    getattr: 0, 
+    setattr: 0,
+    tagfunctions: 0,
+    datasize: 0,
+};
+//----------------------------------------------------------------------------
+staticforward tag_internals_t removeobject_tag;
+static PyObject* f_RemoveObject(PyObject* self, PyObject* args, PyObject* kwargs)
+{
+    static char *kwlist[] = {"depth", NULL};
+    int depth;
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &depth))
+	return NULL;
+
+    PyObject*tag = tag_new(&removeobject_tag);
+    tag_internals_t*itag = tag_getinternals(tag);
+    itag->tag = swf_InsertTag(0, ST_REMOVEOBJECT);
+    swf_SetU16(itag->tag, depth);
+    mylog("+%08x(%d) f_RemoveObject", (int)tag, tag->ob_refcnt);
+    return (PyObject*)tag;
+}
+static tag_internals_t removeobject_tag =
+{
+    parse: 0,
+    fillTAG: 0,
+    dealloc: 0,
+    getattr: 0, 
+    setattr: 0,
+    tagfunctions: 0,
+    datasize: 0,
+};
+//----------------------------------------------------------------------------
+staticforward tag_internals_t sprite_tag;
+typedef struct _sprite_internal
+{
+    PyObject* taglist;
+} sprite_internal_t;
+    
+static int sprite_fillTAG(tag_internals_t*self)
+{
+    mylog("+%08x(?) sprite_fillTAG", (int)self);
+
+    sprite_internal_t*si = (sprite_internal_t*)self->data;
+
+    TAG*sprite = swf_InsertTag(0, ST_DEFINESPRITE);
+    swf_SetU16(sprite, 0); //id
+    swf_SetU16(sprite, 0); //frames
+
+    TAG*tag = taglist_getTAGs2(si->taglist, self->tagmap, 0);
+    if(!tag) {
+	/* pass through exception */
+	return 0;
+    }
+    TAG*tag2 = tag;
+    while(tag2->next) tag2 = tag2->next;
+    swf_InsertTag(tag2, ST_END);
+
+    sprite->next = tag;
+    tag->prev = sprite;
+
+    swf_FoldSprite(sprite);
+    self->tag = sprite;
+    return 1;
+}
+
+static PyObject* f_Sprite(PyObject* self, PyObject* args, PyObject* kwargs)
+{
+    static char *kwlist[] = {"name", NULL};
+    char*name= 0;
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|s", kwlist, &name))
+	return NULL;
+
+    PyObject*tag = tag_new(&sprite_tag);
+    tag_internals_t*itag = tag_getinternals(tag);
+    sprite_internal_t*si = (sprite_internal_t*)itag->data;
+    si->taglist = taglist_new();
+    mylog("+%08x(%d) f_DefineSprite", (int)tag, tag->ob_refcnt);
+    return (PyObject*)tag;
+}
+static PyObject* sprite_getattr(tag_internals_t*self,char*a)
+{
+    sprite_internal_t*si = (sprite_internal_t*)self->data;
+    if(!strcmp(a, "tags")) {
+	Py_INCREF(si->taglist);
+	return si->taglist;
+    }
+    return 0;
+}
+static int sprite_setattr(tag_internals_t*self,char*a, PyObject*obj)
+{
+    sprite_internal_t*si = (sprite_internal_t*)self->data;
+    if(self->tag) {
+	swf_DeleteTag(0, self->tag);
+	self->tag = 0;
+    }
+    if(!strcmp(a, "tags")) {
+	PY_ASSERT_TYPE(obj,&TagListClass);
+	Py_DECREF(si->taglist);
+	si->taglist = obj;
+	Py_INCREF(si->taglist);
+	return 0;
+    }
+    return 1;
+}
+static tag_internals_t sprite_tag =
+{
+    parse: 0,
+    fillTAG: sprite_fillTAG,
+    dealloc: 0,
+    getattr: sprite_getattr, 
+    setattr: sprite_setattr,
+    tagfunctions: 0,
+    datasize: sizeof(sprite_internal_t),
+};
+//----------------------------------------------------------------------------
 staticforward tag_internals_t end_tag;
 static tag_internals_t end_tag =
 {
     parse: 0,
     fillTAG: 0,
     dealloc: 0,
+    getattr: 0, 
+    setattr: 0,
     tagfunctions: 0,
     datasize: 0,
 };
@@ -260,6 +463,7 @@ typedef struct _text_internal
     SWFFONT* swffont;
     RGBA rgba;
     int size;
+    SRECT bbox;
 } text_internal_t;
 staticforward tag_internals_t placeobject_tag;
 
@@ -268,28 +472,35 @@ static int text_fillTAG(tag_internals_t*self)
     text_internal_t*ti = (text_internal_t*)self->data;
     self->tag= swf_InsertTag(0, ST_DEFINETEXT2);
     swf_SetU16(self->tag, /*ID*/0);
-    SRECT r = swf_SetDefineText(self->tag, ti->swffont, &ti->rgba, ti->text, ti->size);
+    ti->bbox = swf_SetDefineText(self->tag, ti->swffont, &ti->rgba, ti->text, ti->size);
     return 1;
 }
+static PyObject* text_getattr(tag_internals_t*self,char*a)
+{
+    text_internal_t*si = (text_internal_t*)self->data;
+    if(!strcmp(a, "bbox")) {
+	return f_BBox2(si->bbox);
+    }
+    return 0;
+}
 static PyObject* f_DefineText(PyObject* self, PyObject* args, PyObject* kwargs)
 {
     static char *kwlist[] = {"font", "text", "size", "color", NULL};
     PyObject*tag = 0;
+    PyObject*otext;
     char*text = 0;
-    int textlen = 0;
-    PyObject*unicode16;
-    PyObject*unicode8;
     int size = 0;
     RGBA rgba = {255,0,0,0};
     PyObject*color = 0;
     PyObject*font = 0;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!u#i|O!", kwlist, &TagClass, &font, &text, &textlen, &size, &ColorClass, &color))
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!Oi|O!", kwlist, &TagClass, &font, &otext, &size, &ColorClass, &color))
 	return NULL;
-    
-    unicode16 = PyUnicode_DecodeUTF16(text, textlen*2, NULL, NULL);
-    unicode8 = PyUnicode_AsUTF8String(unicode16);
-    text = PyString_AS_STRING(unicode8);
+    if(PyUnicode_Check(otext)) {
+	text = PyString_AS_STRING(PyUnicode_AsUTF8String(otext));
+    } else if(PyString_Check(otext)) {
+	text = PyString_AS_STRING(otext);
+    }
 
     if(color)
 	rgba = color_getRGBA(color);
@@ -314,6 +525,8 @@ static tag_internals_t text_tag =
     parse: 0,
     fillTAG: text_fillTAG,
     dealloc: 0,
+    getattr: text_getattr, 
+    setattr: 0,
     tagfunctions: 0,
     datasize: sizeof(text_internal_t),
 };
@@ -347,9 +560,37 @@ static void image_dealloc(tag_internals_t*self)
 	free(pi->rgba);pi->rgba = 0;
     }
 }
+static int image_parse(tag_internals_t*self)
+{
+    image_internal_t*i= (image_internal_t*)self->data;
+    if(i->rgba)
+	return 1;
+    if(!self->tag)
+	return 0;
+   
+    i->rgba = swf_ExtractImage(self->tag, &i->width, &i->height);
+    i->bpp = 32;
+    i->isindexed = 0;
+    i->islossless = 1;
+
+    swf_DeleteTag(0, self->tag);self->tag = 0;
+    return 1;
+}
+static int imagetag_getWidth(PyObject* self)
+{
+    tag_internals_t*itag = tag_getinternals(self);
+    image_internal_t*pi = (image_internal_t*)itag->data;
+    return pi->width;
+}
+static int imagetag_getHeight(PyObject* self)
+{
+    tag_internals_t*itag = tag_getinternals(self);
+    image_internal_t*pi = (image_internal_t*)itag->data;
+    return pi->height;
+}
 static PyObject* f_DefineImage(PyObject* self, PyObject* args, PyObject* kwargs)
 {
-    static char *kwlist[] = {"image"};
+    static char *kwlist[] = {"image", NULL};
     PyObject*image = 0;
     PyObject*tag = tag_new(&image_tag);
 
@@ -372,12 +613,48 @@ static PyObject* f_DefineImage(PyObject* self, PyObject* args, PyObject* kwargs)
 
     return (PyObject*)tag;
 }
+static PyObject* image_getattr(tag_internals_t*self,char*a)
+{
+    image_internal_t*i = (image_internal_t*)self->data;
+    if(!strcmp(a, "image")) {
+	if(!i->rgba) {
+	    image_parse(self);
+	}
+	PyObject* image = rgba_to_image(i->rgba, i->width, i->height);
+	return image;
+    }
+    return 0;
+}
+
+static PyObject* image_save(PyObject*self, PyObject*args)
+{
+    tag_internals_t*itag = tag_getinternals(self);
+    if(!image_parse(itag))
+	return PY_ERROR("Couldn't parse image");
+    image_internal_t*fi = (image_internal_t*)itag->data;
+   
+    char*filename = 0;
+    if(!PyArg_ParseTuple(args, "s", &filename))
+	return NULL;
+
+    png_write(filename, (unsigned char*)fi->rgba ,fi->width, fi->height);
+    
+    return PY_NONE;
+}
+
+static PyMethodDef image_methods[] = 
+{{"save", image_save, METH_VARARGS, "saves an image as PNG"},
+ {NULL, NULL, 0, NULL}
+};
+
 static tag_internals_t image_tag =
 {
-    parse: 0,
+    parse: image_parse,
     fillTAG: image_fillTAG,
     dealloc: image_dealloc,
-    tagfunctions: 0,
+    getattr: image_getattr, 
+    setattr: 0,
+    tagfunctions: image_methods,
     datasize: sizeof(image_internal_t),
 };
 //----------------------------------------------------------------------------
@@ -385,7 +662,7 @@ staticforward tag_internals_t shape_tag;
 
 typedef struct _shape_internal
 {
-    SHAPE2*shape;
+    SHAPE2*shape2;
 } shape_internal_t;
 staticforward tag_internals_t shape_tag;
 
@@ -394,46 +671,224 @@ static int shape_fillTAG(tag_internals_t*self)
     shape_internal_t*ti = (shape_internal_t*)self->data;
     self->tag= swf_InsertTag(0, ST_DEFINESHAPE3);
     swf_SetU16(self->tag, /*ID*/0);
-    swf_SetShape2(self->tag, ti->shape);
+    swf_SetShape2(self->tag, ti->shape2);
+    return 1;
+}
+static int shape_parse(tag_internals_t*self)
+{
+    shape_internal_t*i= (shape_internal_t*)self->data;
+    if(i->shape2)
+	return 1;
+    if(!self->tag)
+	return 0;
+    SHAPE2* shape2 = malloc(sizeof(SHAPE2));
+    swf_ParseDefineShape(self->tag, shape2);
+    i->shape2 = shape2;
+    swf_DeleteTag(0, self->tag);self->tag = 0;
     return 1;
 }
 static void shape_dealloc(tag_internals_t*self)
 {
     shape_internal_t*pi = (shape_internal_t*)self->data;
-    if(pi->shape) {
-	swf_Shape2Free(pi->shape);
-	pi->shape = 0;
+    if(pi->shape2) {
+	swf_Shape2Free(pi->shape2);
+	pi->shape2 = 0;
     }
 }
 static PyObject* f_DefineImageShape(PyObject* self, PyObject* args, PyObject* kwargs)
 {
-    static char *kwlist[] = {"image"};
-    PyObject*shape = 0;
-    PyObject*tag = tag_new(&shape_tag);
+    static char *kwlist[] = {"image", NULL};
     PyObject*image = 0;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!", kwlist, &TagClass, &image))
 	return NULL;
     
-    tag = tag_new(&shape_tag);
+    PyObject*tag = tag_new(&shape_tag);
     tag_internals_t* itag = tag_getinternals(tag);
     shape_internal_t*ti = (shape_internal_t*)itag->data;
-    ti->shape = 0; /*HACK*/
+    ti->shape2 = 0; /*HACK*/
 
-    int width = image_getWidth(image);
-    int height = image_getHeight(image);
+    int width = imagetag_getWidth(image);
+    int height = imagetag_getHeight(image);
     int id = tagmap_add(itag->tagmap, image);
     itag->tag= swf_InsertTag(0, ST_DEFINESHAPE3);
     swf_SetU16(itag->tag, 0);
     swf_ShapeSetBitmapRect(itag->tag, id, width, height);
     return (PyObject*)tag;
 }
+
+/* TODO: move to lib/ */
+SHAPE2*swf_StringToShape2(char*s,FILLSTYLE*f, LINESTYLE*l)
+{
+    drawer_t draw;
+    swf_Shape11DrawerInit(&draw, 0);
+    draw_string(&draw, s);
+    draw.finish(&draw);
+    SHAPE*s1 =  swf_ShapeDrawerToShape(&draw);
+    SRECT r = swf_ShapeDrawerGetBBox(&draw);
+    RGBA col;col.r=col.g=col.b=128;col.a=255;
+    if(l) 
+	swf_ShapeAddLineStyle(s1, 1, &col);
+    if(f)
+	swf_ShapeAddSolidFillStyle(s1, &col);
+    draw.dealloc(&draw);
+    SHAPE2*shape2 = swf_ShapeToShape2(s1);
+    swf_ShapeFree(s1);
+    shape2->bbox = malloc(sizeof(SRECT));
+    *(shape2->bbox) = r;
+    if(f && shape2->numfillstyles)
+	shape2->fillstyles[0] = *f;
+    if(l && shape2->numlinestyles)
+	shape2->linestyles[0] = *l;
+    return shape2;
+}
+
+static PyObject* f_DefineShape(PyObject* self, PyObject* args, PyObject* kwargs)
+{
+    static char *kwlist[] = {"s", "fill", "line", NULL};
+    char*s = 0;
+    PyObject*fillstyle=0,*linestyle=0;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|OO", kwlist, &s,&fillstyle,&linestyle))
+	return NULL;
+
+    PyObject*tag = tag_new(&shape_tag);
+    tag_internals_t* itag = tag_getinternals(tag);
+    shape_internal_t*ti = (shape_internal_t*)itag->data;
+    
+    FILLSTYLE _f,*f=0;
+    LINESTYLE _l,*l=0;
+
+    if(fillstyle) {
+	f = &_f;
+	if(PY_CHECK_TYPE(fillstyle, &ColorClass)) {
+	    f->type = /*FILL_SOLID*/ 0;
+	    f->color = color_getRGBA(fillstyle);
+	} else {
+	    return PY_ERROR("Invalid Fillstyle");
+	}
+    }
+
+    if(linestyle) {
+	l = &_l;
+	if(PyTuple_Check(linestyle) && PyTuple_GET_SIZE(linestyle)==2) {
+	    float f = 0.0;
+	    PyObject*color = 0;
+	    if(!PyArg_ParseTuple(linestyle, "fO!", &f, &ColorClass, &color))
+		return 0;
+
+	    l->width = (int)(f*20);
+	    l->color = color_getRGBA(color);
+	} else {
+	    return PY_ERROR("Invalid Linestyle");
+	}
+    }
+    ti->shape2 = swf_StringToShape2(s,f,l);
+
+    itag->tag = 0;
+    
+    return (PyObject*)tag;
+}
+static PyObject* shape_getfillstyles(PyObject*self, PyObject*args)
+{
+    tag_internals_t*itag = tag_getinternals(self);
+    if(!shape_parse(itag))
+	return PY_ERROR("Couldn't parse shape");
+    shape_internal_t*fi = (shape_internal_t*)itag->data;
+    int num = fi->shape2->numfillstyles;
+    return Py_BuildValue("i", num);
+}
+static PyObject* shape_getlinestyles(PyObject*self, PyObject*args)
+{
+    tag_internals_t*itag = tag_getinternals(self);
+    if(!shape_parse(itag))
+	return PY_ERROR("Couldn't parse shape");
+    shape_internal_t*fi = (shape_internal_t*)itag->data;
+    int num = fi->shape2->numlinestyles;
+    return Py_BuildValue("i", num);
+}
+static PyObject* shape_getfillstyle(PyObject*self, PyObject*args)
+{
+    tag_internals_t*itag = tag_getinternals(self);
+    if(!shape_parse(itag))
+	return PY_ERROR("Couldn't parse shape");
+    shape_internal_t*fi = (shape_internal_t*)itag->data;
+    int nr = 0;
+    if(!PyArg_ParseTuple(args, "i", &nr))
+	return NULL;
+    
+    int num = fi->shape2->numfillstyles;
+    if(nr < 0 || nr >=num)
+	return PY_ERROR("fillstyle index out of range");
+    return f_FillStyle2(fi->shape2->fillstyles[nr]);
+}
+static PyObject* shape_getlinestyle(PyObject*self, PyObject*args)
+{
+    tag_internals_t*itag = tag_getinternals(self);
+    if(!shape_parse(itag))
+	return PY_ERROR("Couldn't parse shape");
+    shape_internal_t*fi = (shape_internal_t*)itag->data;
+    int nr = 0;
+    if(!PyArg_ParseTuple(args, "i", &nr))
+	return NULL;
+    
+    int num = fi->shape2->numfillstyles;
+    if(nr < 0 || nr >=num)
+	return PY_ERROR("fillstyle index out of range");
+    return f_LineStyle3(fi->shape2->linestyles[nr]);
+}
+static PyObject* shape_setfillstyle(PyObject*self, PyObject*args)
+{
+    tag_internals_t*itag = tag_getinternals(self);
+    if(!shape_parse(itag))
+	return PY_ERROR("Couldn't parse shape");
+    shape_internal_t*fi = (shape_internal_t*)itag->data;
+    int nr = 0;
+    PyObject*fs = 0;
+    if(!PyArg_ParseTuple(args, "iO!", &nr, &FillStyleClass, &fs))
+	return NULL;
+    
+    int num = fi->shape2->numfillstyles;
+    if(nr < 0 || nr >=num)
+	return PY_ERROR("fillstyle index out of range");
+    fi->shape2->fillstyles[nr] = fillstyle_getFillStyle(fs);
+    return PY_NONE;
+}
+static PyObject* shape_setlinestyle(PyObject*self, PyObject*args)
+{
+    tag_internals_t*itag = tag_getinternals(self);
+    if(!shape_parse(itag))
+	return PY_ERROR("Couldn't parse shape");
+    shape_internal_t*fi = (shape_internal_t*)itag->data;
+    int nr = 0;
+    PyObject*ls = 0;
+    if(!PyArg_ParseTuple(args, "iO!", &nr, &LineStyleClass, &ls))
+	return NULL;
+    
+    int num = fi->shape2->numlinestyles;
+    if(nr < 0 || nr >=num)
+	return PY_ERROR("linestyle index out of range");
+    fi->shape2->linestyles[nr] = linestyle_getLineStyle(ls);
+    return PY_NONE;
+}
+static PyMethodDef shape_methods[] = 
+{{"numfillstyles", shape_getfillstyles, METH_VARARGS, "get's the number of fillstyles"},
+ {"numlinestyles", shape_getlinestyles, METH_VARARGS, "get's the number of linestyles"},
+ {"getfillstyle", shape_getfillstyle, METH_VARARGS, "get's one fillstyle"},
+ {"getlinestyle", shape_getlinestyle, METH_VARARGS, "get's one linestyle"},
+ {"setfillstyle", shape_setfillstyle, METH_VARARGS, "set's one fillstyle"},
+ {"setlinestyle", shape_setlinestyle, METH_VARARGS, "set's one linestyle"},
+ {NULL, NULL, 0, NULL}
+};
+
 static tag_internals_t shape_tag =
 {
-    parse: 0,
+    parse: shape_parse,
     fillTAG: shape_fillTAG,
     dealloc: shape_dealloc,
-    tagfunctions: 0,
+    getattr: 0, 
+    setattr: 0,
+    tagfunctions: shape_methods,
     datasize: sizeof(shape_internal_t),
 };
 //----------------------------------------------------------------------------
@@ -467,9 +922,8 @@ static int videostream_fillTAG(tag_internals_t*self)
     videostream_internal_t*fi = (videostream_internal_t*)self->data;
     if(self->tag)
 	return 1;
-    /* TODO */
-    PyErr_SetString(PyExc_Exception, setError("videostream filling not implemented yet"));return 0;
-    return 1;
+    PyErr_SetString(PyExc_Exception, setError("videostream filling not implemented"));
+    return 0;
 }
 static PyObject* f_DefineVideoStream(PyObject* self, PyObject* args, PyObject* kwargs)
 {
@@ -477,16 +931,18 @@ static PyObject* f_DefineVideoStream(PyObject* self, PyObject* args, PyObject* k
    
     int width=0,height=0,frames=65535;
     static char *kwlist[] = {"width", "height", "frames", NULL};
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii|i", kwlist, &TagClass, &width, &height, &frames))
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii|i", kwlist, &width, &height, &frames))
 	return NULL;
-    
+
     tag_internals_t*itag = tag_getinternals(tag);
     videostream_internal_t*fi = (videostream_internal_t*)itag->data;
     fi->stream = malloc(sizeof(VIDEOSTREAM));
     memset(fi->stream, 0, sizeof(VIDEOSTREAM));
 
     TAG*t = swf_InsertTag(0, ST_DEFINEVIDEOSTREAM);
+    swf_SetU16(t, 0); /* id */
     swf_SetVideoStreamDefine(t, fi->stream, frames, width, height);
+    itag->tag = t;
     fi->lastiframe = -65536;
     return (PyObject*)tag;
 }
@@ -511,6 +967,24 @@ static PyObject* videostream_getbheight(PyObject*self, PyObject*args)
     int height = fi->stream->bby;
     return Py_BuildValue("i", height);
 }
+static PyObject* videostream_addBlackFrame(PyObject*self, PyObject*args, PyObject*kwargs)
+{
+    tag_internals_t*_itag = tag_getinternals(self);
+    videostream_internal_t*fi = (videostream_internal_t*)_itag->data;
+    
+    TAG* t = swf_InsertTag(0, ST_VIDEOFRAME);
+    
+    PyObject*tag = tag_new(&videoframe_tag);
+    tag_internals_t*itag = tag_getinternals(tag);
+    
+    swf_SetU16(t,0); /* id */
+    swf_SetVideoStreamBlackFrame(t, fi->stream);
+    fi->lastiframe = fi->stream->frame;
+    
+    itag->tag = t;
+    tagmap_addMapping(itag->tagmap, 0, self);
+    return tag;
+}
 static PyObject* videostream_addFrame(PyObject*self, PyObject*args, PyObject*kwargs)
 {
     tag_internals_t*_itag = tag_getinternals(self);
@@ -522,19 +996,41 @@ static PyObject* videostream_addFrame(PyObject*self, PyObject*args, PyObject*kwa
     static char *kwlist[] = {"image", "quant", "type", NULL};
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|is", kwlist, &image, &quant, &type))
 	return NULL;
-    if(fi->stream->width != image_getWidth(image)) {
+    if(fi->stream->owidth != image_getWidth(image)) {
 	PyErr_SetString(PyExc_Exception, setError("bad image width %d!=%d", image_getWidth(image), fi->stream->width));return 0;
     }
-    if(fi->stream->height != image_getHeight(image)) {
+    if(fi->stream->oheight != image_getHeight(image)) {
 	PyErr_SetString(PyExc_Exception, setError("bad image width %d!=%d", image_getHeight(image), fi->stream->height));return 0;
     }
     PyObject*tag = tag_new(&videoframe_tag);
     tag_internals_t*itag = tag_getinternals(tag);
 
     RGBA*pic = image_toRGBA(image);
+    if(!pic)
+	return 0;
+
+/*{  int f,j=0,i=0,rr,gg,bb;
+   FILE *o;
+   RGBA*it = pic;
+   char*filename="test.ppm";
+   printf("Creating %s %dx%d\n",filename, 512,512);
+   o=fopen(filename, "wb");
+   fprintf(o,"P6\n%d %d\n255\n",512, 512);
+   
+   while(j<512*512) {
+    rr=it->r;
+    gg=it->g;
+    bb=it->b;
+    fprintf(o,"%c%c%c",rr,gg,bb);
+    it++;
+    j++;
+   }
+   fclose(o);
+}*/
+
     TAG* t = swf_InsertTag(0, ST_VIDEOFRAME);
     if((type && (type[0]=='I' || type[0]=='i')) || (type==0 && fi->lastiframe+64 < fi->stream->frame)) {
-	swf_SetU16(t,0);
+	swf_SetU16(t,0); /* id */
 	swf_SetVideoStreamIFrame(t, fi->stream, pic, quant);
 	fi->lastiframe = fi->stream->frame;
     } else {
@@ -544,20 +1040,117 @@ static PyObject* videostream_addFrame(PyObject*self, PyObject*args, PyObject*kwa
     itag->tag = t;
     tagmap_addMapping(itag->tagmap, 0, self);
     free(pic);
-    return Py_BuildValue("s", 0);
+    return tag;
 }
-static PyObject* videostream_addDistortionFrame(PyObject*self, PyObject*args)
+static PyObject* videostream_addDistortionFrame(PyObject*self, PyObject*args, PyObject*kwargs)
 {
-    tag_internals_t*itag = tag_getinternals(self);
-    videostream_internal_t*fi = (videostream_internal_t*)itag->data;
+    tag_internals_t*_itag = tag_getinternals(self);
+    videostream_internal_t*fi = (videostream_internal_t*)_itag->data;
     
-    /* TODO */
-    return Py_BuildValue("s", 0);
+    static char *kwlist[] = {"image", "quant", NULL};
+    int quant=7;
+    PyObject* array = 0;
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|i", kwlist, &array, &quant))
+	return NULL;
+
+    signed char* movex = malloc(fi->stream->bbx * fi->stream->bby * 1);
+    signed char* movey = malloc(fi->stream->bbx * fi->stream->bby * 1);
+    RGBA** pics = (RGBA**)malloc(fi->stream->bbx * fi->stream->bby * sizeof(void*));
+    signed char* itx=movex;
+    signed char* ity=movey;
+    RGBA**pic=pics;
+    int x,y;
+    if(!array || !PySequence_Check(array))
+	return PY_ERROR("Not an array");
+    if(PySequence_Length(array) < fi->stream->bby)
+	return PY_ERROR("Array (y) has to have at least %d elements, but has only %d ", fi->stream->bby, PySequence_Length(array));
+    for(y=0;y<fi->stream->bby;y++) {
+	PyObject*line = PySequence_GetItem(array, y);
+	if(!line || !PySequence_Check(line))
+	    return PY_ERROR("Not an array of arrays");
+	if(PySequence_Length(line) < fi->stream->bbx)
+	    return PY_ERROR("Inner arrays (x) have to be at least %d long- %dth is only %d", fi->stream->bbx, y, PySequence_Length(line));
+
+	for(x=0;x<fi->stream->bbx;x++) {
+	    PyObject*pixel = PySequence_GetItem(line, x);
+	    PyObject*xy = 0;
+	    PyObject*image = 0;
+
+	    if(!pixel) {
+		xy = image = 0;
+	    } else {
+		if(PyComplex_Check(pixel)) {
+		    xy = pixel; image = 0;
+		} else if(PyString_Check(pixel)) {
+		    xy = 0; image = pixel;
+		} else if(PyTuple_Check(pixel)) {
+		    int size = PyTuple_GET_SIZE(pixel);
+		    if(size!=2) return PY_ERROR("Tuples have to have size 2 (xy,img)");
+		    xy = PyTuple_GetItem(pixel, 0);
+		    if(!xy) return 0;
+		    if(!PyComplex_Check(xy)) return PY_ERROR("Tuples must be (COMPLEX,string)");
+		    image = PyTuple_GetItem(pixel, 1);
+		    if(!image) return 0;
+		    if(!PyString_Check(image)) return PY_ERROR("Tuples must be (complex,STRING)");
+		}
+	    }
+
+	    *itx = *ity = 0;
+	    *pic= 0;
+
+	    if(xy) {
+		*itx = (signed char)PyComplex_RealAsDouble(pixel);
+		*ity = (signed char)PyComplex_ImagAsDouble(pixel);
+	    }
+	    if(image) {
+		char*string;
+		int size;
+		PyString_AsStringAndSize(image,&string,&size);
+		if(size<256*3) {
+		    return PY_ERROR("image strings must be >= 256*3");
+		}
+		*pic = malloc(sizeof(RGBA)*16*16);
+		int t;
+		for(t=0;t<16*16;t++) {
+		    (*pic)[t].r = string[t*3];
+		    (*pic)[t].g = string[t*3+1];
+		    (*pic)[t].b = string[t*3+2];
+		    (*pic)[t].a = 255;
+		}
+	    }
+	    itx++;
+	    ity++;
+	    pic++;
+	}
+    }
+    
+    PyObject*tag = tag_new(&videoframe_tag);
+    tag_internals_t*itag = tag_getinternals(tag);
+    
+    TAG* t = swf_InsertTag(0, ST_VIDEOFRAME);
+    swf_SetU16(t,0); /* id */
+    swf_SetVideoStreamMover(t, fi->stream, movex, movey,(void**)pics, quant);
+
+    itag->tag = t;
+    tagmap_addMapping(itag->tagmap, 0, self);
+
+    for(x=0;x<fi->stream->bbx*fi->stream->bby;x++) {
+	if(pics[x]) {
+	    free(pics[x]);pics[x] = 0;
+	}
+    }
+
+    free(movex);
+    free(movey);
+    free(pics);
+
+    return tag;
 }
 static PyMethodDef videostream_methods[] = 
 {{"xblocks", videostream_getbwidth, METH_VARARGS, "get's the number of horizontal blocks"},
  {"yblocks", videostream_getbheight, METH_VARARGS, "get's the number of vertical blocks"},
  {"addFrame", (PyCFunction)videostream_addFrame, METH_KEYWORDS, "add a Video Frame"},
+ {"addBlackFrame", (PyCFunction)videostream_addBlackFrame, METH_KEYWORDS, "add a black Video Frame"},
  {"addDistortionFrame", (PyCFunction)videostream_addDistortionFrame, METH_KEYWORDS, "add a MVD frame"},
  {NULL, NULL, 0, NULL}
 };
@@ -567,6 +1160,8 @@ static tag_internals_t videostream_tag =
     parse: videostream_parse,
     fillTAG: videostream_fillTAG,
     dealloc: videostream_dealloc,
+    getattr: 0, 
+    setattr: 0,
     tagfunctions: videostream_methods,
     datasize: sizeof(videostream_internal_t),
 };
@@ -578,12 +1173,13 @@ static tag_internals_t videoframe_tag =
     parse: 0,
     fillTAG: 0,
     dealloc: 0,
+    getattr: 0, 
+    setattr: 0,
     tagfunctions: 0,
     datasize: 0
 };
 
 //============================================================================
-
 static PyMethodDef TagMethods[] = 
 {
     /* TAGS */
@@ -592,9 +1188,15 @@ static PyMethodDef TagMethods[] =
     {"Font", (PyCFunction)f_DefineFont, METH_KEYWORDS, "Create a DefineFont Tag."},
     {"Text", (PyCFunction)f_DefineText, METH_KEYWORDS, "Create a DefineText Tag."},
     {"PlaceObject", (PyCFunction)f_PlaceObject, METH_KEYWORDS, "Create a PlaceObject Tag."},
+    {"RemoveObject", (PyCFunction)f_RemoveObject, METH_KEYWORDS, "Create a RemoveObject Tag."},
+    {"MoveObject", (PyCFunction)f_MoveObject, METH_KEYWORDS, "Create a PlaceObject Move Tag."},
     {"VideoStream", (PyCFunction)f_DefineVideoStream, METH_KEYWORDS, "Create a Videostream."},
     {"Image", (PyCFunction)f_DefineImage, METH_KEYWORDS, "Create an SWF Image Tag."},
     {"ImageShape", (PyCFunction)f_DefineImageShape, METH_KEYWORDS, "Create an SWF Image Shape Tag."},
+    {"Shape", (PyCFunction)f_DefineShape, METH_KEYWORDS, "Create an SWF Shape Tag."},
+    {"ShowFrame", (PyCFunction)f_ShowFrame, METH_KEYWORDS, "Create an SWF Show Frame Tag."},
+    {"Sprite", (PyCFunction)f_Sprite, METH_KEYWORDS, "Create an SWF Sprite Tag."},
+    
     {NULL, NULL, 0, NULL}
 };
 PyMethodDef* tags_getMethods()
@@ -603,6 +1205,8 @@ PyMethodDef* tags_getMethods()
     
     register_tag(ST_PLACEOBJECT,&placeobject_tag);
     register_tag(ST_PLACEOBJECT2,&placeobject_tag);
+    register_tag(ST_REMOVEOBJECT,&removeobject_tag);
+    register_tag(ST_REMOVEOBJECT2,&removeobject_tag);
     register_tag(ST_SETBACKGROUNDCOLOR,&bgcolor_tag);
     register_tag(ST_DEFINEFONT,&font_tag);
     register_tag(ST_PROTECT,&protect_tag);
@@ -612,8 +1216,14 @@ PyMethodDef* tags_getMethods()
     register_tag(ST_DEFINEBITSJPEG3,&image_tag);
     register_tag(ST_DEFINEBITSLOSSLESS,&image_tag);
     register_tag(ST_DEFINEBITSLOSSLESS2,&image_tag);
+    register_tag(ST_DEFINESHAPE,&shape_tag);
+    register_tag(ST_DEFINESHAPE2,&shape_tag);
+    register_tag(ST_DEFINESHAPE3,&shape_tag);
+    register_tag(ST_SHOWFRAME,&showframe_tag);
+    register_tag(ST_DEFINEVIDEOSTREAM,&videostream_tag);
+    register_tag(ST_VIDEOFRAME,&videoframe_tag);
+    register_tag(ST_DEFINESPRITE,&sprite_tag);
     register_tag(ST_END,&end_tag);
 
     return TagMethods;
 }
-