0.3.0 - typemaps support complete

svn path=/trunk/externals/loaders/tclpd/; revision=15738

1 files changed, 49 insertions, 49 deletions

diff --git a/tcl_widgetbehavior.c b/tcl_widgetbehavior.c
index 2a1186f..47be1e1 100644
--- a/tcl_widgetbehavior.c
+++ b/tcl_widgetbehavior.c
@@ -1,8 +1,8 @@
-#include "tcl_extras.h"
+#include "tclpd.h"
 #include <string.h>
 
-void tclpd_guiclass_motion(t_tcl* x, t_floatarg dx, t_floatarg dy) {
-    Tcl_Obj* av[6]; InitArray(av, 6, NULL);
+void tclpd_guiclass_motion(t_tcl *x, t_floatarg dx, t_floatarg dy) {
+    Tcl_Obj *av[6]; InitArray(av, 6, NULL);
     av[0] = x->dispatcher;
     Tcl_IncrRefCount(av[0]);
     av[1] = x->self;
@@ -15,7 +15,7 @@ void tclpd_guiclass_motion(t_tcl* x, t_floatarg dx, t_floatarg dy) {
     Tcl_IncrRefCount(av[4]);
     av[5] = Tcl_NewDoubleObj(dy);
     Tcl_IncrRefCount(av[5]);
-    int result = Tcl_EvalObjv(tcl_for_pd, 6, av, 0);
+    int result = Tcl_EvalObjv(tclpd_interp, 6, av, 0);
     if(result != TCL_OK) {
         tclpd_interp_error(x, result);
         goto error;
@@ -31,16 +31,16 @@ cleanup:
     Tcl_DecrRefCount(av[5]);
 }
 
-void tclpd_guiclass_grab(t_tcl* x, t_glist* glist, int xpix, int ypix) {
+void tclpd_guiclass_grab(t_tcl *x, t_glist *glist, int xpix, int ypix) {
     glist_grab(glist, &x->o.te_g, (t_glistmotionfn)tclpd_guiclass_motion, 0, \
         (t_floatarg)xpix, (t_floatarg)ypix);
 }
 
-int tclpd_guiclass_click(t_gobj* z, t_glist* glist, int xpix, int ypix, int shift, int alt, int dbl, int doit) {
-    Tcl_Obj* av[10]; InitArray(av, 10, NULL);
-    Tcl_Obj* o = NULL;
+int tclpd_guiclass_click(t_gobj *z, t_glist *glist, int xpix, int ypix, int shift, int alt, int dbl, int doit) {
+    Tcl_Obj *av[10]; InitArray(av, 10, NULL);
+    Tcl_Obj *o = NULL;
     int i = 0;
-    t_tcl* x = (t_tcl*)z;
+    t_tcl *x = (t_tcl *)z;
     av[0] = x->dispatcher;
     Tcl_IncrRefCount(av[0]);
     av[1] = x->self;
@@ -61,14 +61,14 @@ int tclpd_guiclass_click(t_gobj* z, t_glist* glist, int xpix, int ypix, int shif
     Tcl_IncrRefCount(av[8]);
     av[9] = Tcl_NewIntObj(doit);
     Tcl_IncrRefCount(av[9]);
-    int result = Tcl_EvalObjv(tcl_for_pd, 10, av, 0);
+    int result = Tcl_EvalObjv(tclpd_interp, 10, av, 0);
     if(result != TCL_OK) {
         goto error;
     }
-    o = Tcl_GetObjResult(tcl_for_pd);
+    o = Tcl_GetObjResult(tclpd_interp);
     Tcl_IncrRefCount(o);
     if(strlen(Tcl_GetStringFromObj(o, NULL)) > 0) {
-        result = Tcl_GetIntFromObj(tcl_for_pd, o, &i);
+        result = Tcl_GetIntFromObj(tclpd_interp, o, &i);
         if(result != TCL_OK) {
             goto error;
         }
@@ -95,12 +95,12 @@ cleanup:
     return i;
 }
 
-void tclpd_guiclass_getrect(t_gobj* z, t_glist* owner, int* xp1, int* yp1, int* xp2, int* yp2) {
-    Tcl_Obj* av[6]; InitArray(av, 6, NULL);
-    Tcl_Obj* o;
-    Tcl_Obj* theList = NULL;
+void tclpd_guiclass_getrect(t_gobj *z, t_glist *owner, int *xp1, int *yp1, int *xp2, int *yp2) {
+    Tcl_Obj *av[6]; InitArray(av, 6, NULL);
+    Tcl_Obj *o;
+    Tcl_Obj *theList = NULL;
     int tmp[4], i, length;
-    t_tcl* x = (t_tcl*)z;
+    t_tcl *x = (t_tcl *)z;
     av[0] = x->dispatcher;
     Tcl_IncrRefCount(av[0]);
     av[1] = x->self;
@@ -113,16 +113,16 @@ void tclpd_guiclass_getrect(t_gobj* z, t_glist* owner, int* xp1, int* yp1, int*
     Tcl_IncrRefCount(av[4]);
     av[5] = Tcl_NewIntObj(text_ypix(&x->o, owner));
     Tcl_IncrRefCount(av[5]);
-    int result = Tcl_EvalObjv(tcl_for_pd, 6, av, 0);
+    int result = Tcl_EvalObjv(tclpd_interp, 6, av, 0);
     if(result != TCL_OK) {
         tclpd_interp_error(x, result);
         goto error;
     }
-    theList = Tcl_GetObjResult(tcl_for_pd);
+    theList = Tcl_GetObjResult(tclpd_interp);
     Tcl_IncrRefCount(theList);
     length = 0;
-    //result = Tcl_ListObjGetElements(tcl_for_pd, theList, @, @);
-    result = Tcl_ListObjLength(tcl_for_pd, theList, &length);
+    //result = Tcl_ListObjGetElements(tclpd_interp, theList, @, @);
+    result = Tcl_ListObjLength(tclpd_interp, theList, &length);
     if(result != TCL_OK) {
         tclpd_interp_error(x, result);
         goto error;
@@ -133,12 +133,12 @@ void tclpd_guiclass_getrect(t_gobj* z, t_glist* owner, int* xp1, int* yp1, int*
     }
     o = NULL;
     for(i = 0; i < 4; i++) {
-        result = Tcl_ListObjIndex(tcl_for_pd, theList, i, &o);
+        result = Tcl_ListObjIndex(tclpd_interp, theList, i, &o);
         if(result != TCL_OK) {
             tclpd_interp_error(x, result);
             goto error;
         }
-        result = Tcl_GetIntFromObj(tcl_for_pd, o, &tmp[i]);
+        result = Tcl_GetIntFromObj(tclpd_interp, o, &tmp[i]);
         if(result != TCL_OK) {
             tclpd_interp_error(x, result);
             goto error;
@@ -157,12 +157,12 @@ cleanup:
     Tcl_DecrRefCount(av[5]);
 }
 
-void tclpd_guiclass_displace(t_gobj* z, t_glist* glist, int dx, int dy) {
-    Tcl_Obj* av[6]; InitArray(av, 6, NULL);
-    Tcl_Obj* theList = NULL;
-    Tcl_Obj* o;
+void tclpd_guiclass_displace(t_gobj *z, t_glist *glist, int dx, int dy) {
+    Tcl_Obj *av[6]; InitArray(av, 6, NULL);
+    Tcl_Obj *theList = NULL;
+    Tcl_Obj *o;
     int length, i, tmp[2];
-    t_tcl* x = (t_tcl*)z;
+    t_tcl *x = (t_tcl *)z;
     av[0] = x->dispatcher;
     Tcl_IncrRefCount(av[0]);
     av[1] = x->self;
@@ -175,16 +175,16 @@ void tclpd_guiclass_displace(t_gobj* z, t_glist* glist, int dx, int dy) {
     Tcl_IncrRefCount(av[4]);
     av[5] = Tcl_NewIntObj(dy);
     Tcl_IncrRefCount(av[5]);
-    int result = Tcl_EvalObjv(tcl_for_pd, 6, av, 0);
+    int result = Tcl_EvalObjv(tclpd_interp, 6, av, 0);
     if(result != TCL_OK) {
         tclpd_interp_error(x, result);
         goto error;
     }
-    theList = Tcl_GetObjResult(tcl_for_pd);
+    theList = Tcl_GetObjResult(tclpd_interp);
     Tcl_IncrRefCount(theList);
     length = 0;
-    //result = Tcl_ListObjGetElements(tcl_for_pd, theList, @, @);
-    result = Tcl_ListObjLength(tcl_for_pd, theList, &length);
+    //result = Tcl_ListObjGetElements(tclpd_interp, theList, @, @);
+    result = Tcl_ListObjLength(tclpd_interp, theList, &length);
     if(result != TCL_OK) {
         tclpd_interp_error(x, result);
         goto error;
@@ -195,12 +195,12 @@ void tclpd_guiclass_displace(t_gobj* z, t_glist* glist, int dx, int dy) {
     }
     o = NULL;
     for(i = 0; i < 2; i++) {
-        result = Tcl_ListObjIndex(tcl_for_pd, theList, i, &o);
+        result = Tcl_ListObjIndex(tclpd_interp, theList, i, &o);
         if(result != TCL_OK) {
             tclpd_interp_error(x, result);
             goto error;
         }
-        result = Tcl_GetIntFromObj(tcl_for_pd, o, &tmp[i]);
+        result = Tcl_GetIntFromObj(tclpd_interp, o, &tmp[i]);
         if(result != TCL_OK) {
             tclpd_interp_error(x, result);
             goto error;
@@ -208,7 +208,7 @@ void tclpd_guiclass_displace(t_gobj* z, t_glist* glist, int dx, int dy) {
     }
     x->o.te_xpix = tmp[0];
     x->o.te_ypix = tmp[1];
-    canvas_fixlinesfor(glist_getcanvas(glist), (t_text*)x);
+    canvas_fixlinesfor(glist_getcanvas(glist), (t_text *)x);
     goto cleanup;
 error:
 cleanup:
@@ -221,9 +221,9 @@ cleanup:
     Tcl_DecrRefCount(av[5]);
 }
 
-void tclpd_guiclass_select(t_gobj* z, t_glist* glist, int selected) {
-    Tcl_Obj* av[5]; InitArray(av, 5, NULL);
-    t_tcl* x = (t_tcl*)z;
+void tclpd_guiclass_select(t_gobj *z, t_glist *glist, int selected) {
+    Tcl_Obj *av[5]; InitArray(av, 5, NULL);
+    t_tcl *x = (t_tcl *)z;
     av[0] = x->dispatcher;
     Tcl_IncrRefCount(av[0]);
     av[1] = x->self;
@@ -234,7 +234,7 @@ void tclpd_guiclass_select(t_gobj* z, t_glist* glist, int selected) {
     Tcl_IncrRefCount(av[3]);
     av[4] = Tcl_NewIntObj(selected);
     Tcl_IncrRefCount(av[4]);
-    int result = Tcl_EvalObjv(tcl_for_pd, 5, av, 0);
+    int result = Tcl_EvalObjv(tclpd_interp, 5, av, 0);
     if(result != TCL_OK) {
         tclpd_interp_error(x, result);
         goto error;
@@ -249,9 +249,9 @@ cleanup:
     Tcl_DecrRefCount(av[4]);
 }
 
-void tclpd_guiclass_activate(t_gobj* z, t_glist* glist, int state) {
-    Tcl_Obj* av[5]; InitArray(av, 5, NULL);
-    t_tcl* x = (t_tcl*)z;
+void tclpd_guiclass_activate(t_gobj *z, t_glist *glist, int state) {
+    Tcl_Obj *av[5]; InitArray(av, 5, NULL);
+    t_tcl *x = (t_tcl *)z;
     av[0] = x->dispatcher;
     Tcl_IncrRefCount(av[0]);
     av[1] = x->self;
@@ -262,7 +262,7 @@ void tclpd_guiclass_activate(t_gobj* z, t_glist* glist, int state) {
     Tcl_IncrRefCount(av[3]);
     av[4] = Tcl_NewIntObj(state);
     Tcl_IncrRefCount(av[4]);
-    int result = Tcl_EvalObjv(tcl_for_pd, 5, av, 0);
+    int result = Tcl_EvalObjv(tclpd_interp, 5, av, 0);
     if(result != TCL_OK) {
         tclpd_interp_error(x, result);
         goto error;
@@ -277,14 +277,14 @@ cleanup:
     Tcl_DecrRefCount(av[4]);
 }
 
-void tclpd_guiclass_delete(t_gobj* z, t_glist* glist) {
+void tclpd_guiclass_delete(t_gobj *z, t_glist *glist) {
     /* will this be ever need to be accessed in Tcl land? */
-    canvas_deletelinesfor(glist_getcanvas(glist), (t_text*)z);
+    canvas_deletelinesfor(glist_getcanvas(glist), (t_text *)z);
 }
 
-void tclpd_guiclass_vis(t_gobj* z, t_glist* glist, int vis) {
-    Tcl_Obj* av[8]; InitArray(av, 8, NULL);
-    t_tcl* x = (t_tcl*)z;
+void tclpd_guiclass_vis(t_gobj *z, t_glist *glist, int vis) {
+    Tcl_Obj *av[8]; InitArray(av, 8, NULL);
+    t_tcl *x = (t_tcl *)z;
     av[0] = x->dispatcher;
     Tcl_IncrRefCount(av[0]);
     av[1] = x->self;
@@ -303,7 +303,7 @@ void tclpd_guiclass_vis(t_gobj* z, t_glist* glist, int vis) {
     Tcl_IncrRefCount(av[6]);
     av[7] = Tcl_NewIntObj(vis);
     Tcl_IncrRefCount(av[7]);
-    int result = Tcl_EvalObjv(tcl_for_pd, 8, av, 0);
+    int result = Tcl_EvalObjv(tclpd_interp, 8, av, 0);
     if(result != TCL_OK) {
         tclpd_interp_error(x, result);
         goto error;