Pd-cvs November 2006

pd-cvs@lists.iem.at

16 participants
561 discussions

abstractions/pddp print.pd,1.5,1.6 print_long.pd,1.6,1.7
by Hans-Christoph Steiner 28 Nov '06

28 Nov '06

Update of /cvsroot/pure-data/abstractions/pddp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv383 Modified Files: print.pd print_long.pd Log Message: switched prepends, since the iemlib one has been removed Index: print_long.pd =================================================================== RCS file: /cvsroot/pure-data/abstractions/pddp/print_long.pd,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** print_long.pd 21 Sep 2006 00:19:00 -0000 1.6 --- print_long.pd 28 Nov 2006 03:06:52 -0000 1.7 *************** *** 8,12 **** #X msg 23 136 label; #X text 96 130 reset to blank; ! #X obj 11 94 iemlib/prepend label; #X connect 1 0 3 0; #X connect 3 0 7 0; --- 8,12 ---- #X msg 23 136 label; #X text 96 130 reset to blank; ! #X obj 11 94 flatspace/prepend label; #X connect 1 0 3 0; #X connect 3 0 7 0; Index: print.pd =================================================================== RCS file: /cvsroot/pure-data/abstractions/pddp/print.pd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** print.pd 21 Sep 2006 00:19:00 -0000 1.5 --- print.pd 28 Nov 2006 03:06:52 -0000 1.6 *************** *** 10,14 **** #X msg 31 155 label; #X text 102 143 reset to blank; ! #X obj 9 110 iemlib/prepend label; #X connect 0 0 2 0; #X connect 2 0 8 0; --- 10,14 ---- #X msg 31 155 label; #X text 102 143 reset to blank; ! #X obj 9 110 flatspace/prepend label; #X connect 0 0 2 0; #X connect 2 0 8 0;

1 0

pd/src m_pd.h, 1.4.4.11.2.31, 1.4.4.11.2.32 desire.c, 1.1.2.209, 1.1.2.210
by Mathieu Bouchard 28 Nov '06

28 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28107 Modified Files: Tag: devel_0_39 m_pd.h desire.c Log Message: PD_PLUSPLUS_FACE: taking care of t_pd Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.31 retrieving revision 1.4.4.11.2.32 diff -C2 -d -r1.4.4.11.2.31 -r1.4.4.11.2.32 *** m_pd.h 28 Nov 2006 01:17:57 -0000 1.4.4.11.2.31 --- m_pd.h 28 Nov 2006 02:53:33 -0000 1.4.4.11.2.32 *************** *** 65,72 **** typedef float t_floatarg; /* floating-point type for function calls */ typedef struct _symbol { char *s_name; ! struct _class **s_thing; struct _symbol *s_next; } t_symbol; --- 65,96 ---- typedef float t_floatarg; /* floating-point type for function calls */ + EXTERN_STRUCT _class; + #define t_class struct _class + EXTERN_STRUCT _outlet; + #define t_outlet struct _outlet + EXTERN_STRUCT _inlet; + #define t_inlet struct _inlet + EXTERN_STRUCT _binbuf; + #define t_binbuf struct _binbuf + EXTERN_STRUCT _clock; + #define t_clock struct _clock + EXTERN_STRUCT _outconnect; + #define t_outconnect struct _outconnect + EXTERN_STRUCT _glist; + #define t_glist struct _glist + #define t_canvas struct _glist /* LATER lose this */ + + #ifdef PD_PLUSPLUS_FACE + struct t_pd { + t_class *_class; + }; + #else + typedef t_class *t_pd; /* pure datum: nothing but a class pointer */ + #endif + typedef struct _symbol { char *s_name; ! t_pd *s_thing; struct _symbol *s_next; } t_symbol; *************** *** 140,167 **** } t_atom; - EXTERN_STRUCT _class; - #define t_class struct _class - - EXTERN_STRUCT _outlet; - #define t_outlet struct _outlet - - EXTERN_STRUCT _inlet; - #define t_inlet struct _inlet - - EXTERN_STRUCT _binbuf; - #define t_binbuf struct _binbuf - - EXTERN_STRUCT _clock; - #define t_clock struct _clock - - EXTERN_STRUCT _outconnect; - #define t_outconnect struct _outconnect - - EXTERN_STRUCT _glist; - #define t_glist struct _glist - #define t_canvas struct _glist /* LATER lose this */ - - typedef t_class *t_pd; /* pure datum: nothing but a class pointer */ - #ifdef DESIRE EXTERN_STRUCT _hash; --- 164,167 ---- *************** *** 209,218 **** #endif - typedef struct _gobj /* a graphical object */ - { #ifdef PD_PLUSPLUS_FACE #define g_pd _class ! t_pd _class; /* pure datum header (class) */ #else t_pd g_pd; /* pure datum header (class) */ #endif --- 209,218 ---- #endif #ifdef PD_PLUSPLUS_FACE #define g_pd _class ! typedef struct _gobj : t_pd { #else + typedef struct _gobj /* a graphical object */ + { t_pd g_pd; /* pure datum header (class) */ #endif *************** *** 400,404 **** --- 400,409 ---- EXTERN void pd_list(t_pd *x, t_symbol *s, int argc, t_atom *argv); EXTERN void pd_anything(t_pd *x, t_symbol *s, int argc, t_atom *argv); + + #ifdef PD_PLUSPLUS_FACE + #define pd_class(x) ((x)->_class) + #else #define pd_class(x) (*(x)) + #endif #ifdef DESIRE Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.209 retrieving revision 1.1.2.210 diff -C2 -d -r1.1.2.209 -r1.1.2.210 *** desire.c 28 Nov 2006 02:19:33 -0000 1.1.2.209 --- desire.c 28 Nov 2006 02:53:33 -0000 1.1.2.210 *************** *** 541,545 **** abstraction inside another patch. A separate mechanism prevents the toplevel abstraction from showing up. */ ! if (vis && gensym("#X")->s_thing && *gensym("#X")->s_thing == canvas_class) { t_canvas *zzz = (t_canvas *)(gensym("#X")->s_thing); while (zzz && !zzz->env) zzz = zzz->owner; --- 541,545 ---- abstraction inside another patch. A separate mechanism prevents the toplevel abstraction from showing up. */ ! if (vis && gensym("#X")->s_thing && gensym("#X")->s_thing->_class == canvas_class) { t_canvas *zzz = (t_canvas *)(gensym("#X")->s_thing); while (zzz && !zzz->env) zzz = zzz->owner; *************** *** 800,804 **** t_pd *z = gensym("#X")->s_thing; if (!z) pd_error(x,"canvas_restore: out of context"); ! else if (*z != canvas_class) pd_error(x,"canvas_restore: wasn't a canvas"); else { t_canvas *x2 = (t_canvas *)z; --- 800,804 ---- t_pd *z = gensym("#X")->s_thing; if (!z) pd_error(x,"canvas_restore: out of context"); ! else if (z->_class != canvas_class) pd_error(x,"canvas_restore: wasn't a canvas"); else { t_canvas *x2 = (t_canvas *)z; *************** *** 822,830 **** t_symbol *s = gensym("loadbang"); canvas_each(y,x) if (y->_class == canvas_class) ! if (!canvas_isabstraction((t_canvas *)y)) ! canvas_loadbangsubpatches((t_canvas *)y); ! canvas_each(y,x) ! if ((y->_class != canvas_class) && zgetfn(&y->_class, s)) ! pd_vmess(&y->_class, s, ""); } --- 822,827 ---- t_symbol *s = gensym("loadbang"); canvas_each(y,x) if (y->_class == canvas_class) ! if (!canvas_isabstraction((t_canvas *)y)) canvas_loadbangsubpatches((t_canvas *)y); ! canvas_each(y,x) if ((y->_class != canvas_class) && zgetfn(y,s)) pd_vmess(y,s,""); } *************** *** 975,979 **** /* find all the "dsp" boxes and add them to the graph */ ! canvas_each(y,x) if ((ob = pd_checkobject(y)) && zgetfn(&y->_class, dspsym)) ugen_add(dc, ob); /* ... and all dsp interconnections */ --- 972,976 ---- /* find all the "dsp" boxes and add them to the graph */ ! canvas_each(y,x) if ((ob = pd_checkobject(y)) && zgetfn(y,dspsym)) ugen_add(dc, ob); /* ... and all dsp interconnections */ *************** *** 1397,1401 **** /* if object creation failed, make dummy inlets or outlets as needed */ if (is_dummy(from)) while (outlet >= obj_noutlets(from)) outlet_new(from, &s_); ! if (is_dummy(to)) while ( inlet >= obj_ninlets(to)) inlet_new(to, &to->ob_pd, &s_, &s_); gobj_changed(x,0); if (!(oc = obj_connect(from,outlet,to,inlet))) goto bad; --- 1394,1398 ---- /* if object creation failed, make dummy inlets or outlets as needed */ if (is_dummy(from)) while (outlet >= obj_noutlets(from)) outlet_new(from, &s_); ! if (is_dummy(to)) while ( inlet >= obj_ninlets(to)) inlet_new(to,to,&s_,&s_); gobj_changed(x,0); if (!(oc = obj_connect(from,outlet,to,inlet))) goto bad; *************** *** 2303,2307 **** /* delete an object from a canvas and free it */ void canvas_delete(t_canvas *x, t_gobj *y) { ! t_gotfn chkdsp = zgetfn(&y->_class, gensym("dsp")); int drawcommand = class_isdrawcommand(y->_class); --- 2300,2304 ---- /* delete an object from a canvas and free it */ void canvas_delete(t_canvas *x, t_gobj *y) { ! t_gotfn chkdsp = zgetfn(y,gensym("dsp")); int drawcommand = class_isdrawcommand(y->_class); *************** *** 2332,2336 **** while ((y = x->list)) { /* to avoid unnecessary DSP resorting, we suspend DSP only if we find a DSP object. */ ! if (!suspended && pd_checkobject(y) && zgetfn(&y->_class, dspsym)) { dspstate = canvas_suspend_dsp(); suspended = 1; --- 2329,2333 ---- while ((y = x->list)) { /* to avoid unnecessary DSP resorting, we suspend DSP only if we find a DSP object. */ ! if (!suspended && pd_checkobject(y) && zgetfn(y,dspsym)) { dspstate = canvas_suspend_dsp(); suspended = 1; *************** *** 2443,2447 **** if (!maxp) break; y = *maxp; *maxp = 0; ! ip = vinlet_getit(&y->_class); obj_moveinletfirst(x,ip); } --- 2440,2444 ---- if (!maxp) break; y = *maxp; *maxp = 0; ! ip = vinlet_getit(y); obj_moveinletfirst(x,ip); } *************** *** 2464,2468 **** if (!maxp) break; y = *maxp; *maxp = 0; ! ip = voutlet_getit(&y->_class); obj_moveoutletfirst(x,ip); } --- 2461,2465 ---- if (!maxp) break; y = *maxp; *maxp = 0; ! ip = voutlet_getit(y); obj_moveoutletfirst(x,ip); } *************** *** 3292,3296 **** t_vinlet *x = (t_vinlet *)pd_new(vinlet_class); x->canvas = canvas_getcurrent(); ! x->inlet = canvas_addinlet(x->canvas, &x->ob_pd, 0, s); x->bufsize = 0; x->buf = 0; --- 3289,3293 ---- t_vinlet *x = (t_vinlet *)pd_new(vinlet_class); x->canvas = canvas_getcurrent(); ! x->inlet = canvas_addinlet(x->canvas,x,0,s); x->bufsize = 0; x->buf = 0; *************** *** 3460,3464 **** t_vinlet *x = (t_vinlet *)pd_new(vinlet_class); x->canvas = canvas_getcurrent(); ! x->inlet = canvas_addinlet(x->canvas, &x->ob_pd, &s_signal,s); x->endbuf = x->buf = (t_float *)getalignedbytes(0); x->bufsize = 0; --- 3457,3461 ---- t_vinlet *x = (t_vinlet *)pd_new(vinlet_class); x->canvas = canvas_getcurrent(); ! x->inlet = canvas_addinlet(x->canvas,x,&s_signal,s); x->endbuf = x->buf = (t_float *)getalignedbytes(0); x->bufsize = 0; *************** *** 3523,3528 **** t_voutlet *x = (t_voutlet *)pd_new(voutlet_class); x->canvas = canvas_getcurrent(); ! x->parentoutlet = canvas_addoutlet(x->canvas, &x->ob_pd, 0); ! inlet_new(x, &x->ob_pd, 0, 0); x->bufsize = 0; x->buf = 0; --- 3520,3525 ---- t_voutlet *x = (t_voutlet *)pd_new(voutlet_class); x->canvas = canvas_getcurrent(); ! x->parentoutlet = canvas_addoutlet(x->canvas,x,0); ! inlet_new(x,x,0,0); x->bufsize = 0; x->buf = 0; *************** *** 3699,3704 **** t_voutlet *x = (t_voutlet *)pd_new(voutlet_class); x->canvas = canvas_getcurrent(); ! x->parentoutlet = canvas_addoutlet(x->canvas, &x->ob_pd, &s_signal); ! inlet_new(x, &x->ob_pd, &s_signal, &s_signal); x->endbuf = x->buf = (t_float *)getalignedbytes(0); x->bufsize = 0; --- 3696,3701 ---- t_voutlet *x = (t_voutlet *)pd_new(voutlet_class); x->canvas = canvas_getcurrent(); ! x->parentoutlet = canvas_addoutlet(x->canvas,x,&s_signal); ! inlet_new(x,x,&s_signal,&s_signal); x->endbuf = x->buf = (t_float *)getalignedbytes(0); x->bufsize = 0; *************** *** 3870,3874 **** } canvas_each(y,templatecanvas) { ! t_parentwidgetbehavior *wb = pd_getparentwidget(&y->_class); if (wb) wb->w_parentvisfn(y, owner, x->sc_vec, t, basex, basey, vis); } --- 3867,3871 ---- } canvas_each(y,templatecanvas) { ! t_parentwidgetbehavior *wb = pd_getparentwidget(y); if (wb) wb->w_parentvisfn(y, owner, x->sc_vec, t, basex, basey, vis); } *************** *** 3892,3896 **** float basey = template_getfloat(t, gensym("y"), data, 0); canvas_each(y,templatecanvas) { ! t_parentwidgetbehavior *wb = pd_getparentwidget(&y->_class); if (!wb) continue; hit = wb->w_parentclickfn(y, owner, data, t, sc, ap, basex+xloc, basey+yloc, --- 3889,3893 ---- float basey = template_getfloat(t, gensym("y"), data, 0); canvas_each(y,templatecanvas) { ! t_parentwidgetbehavior *wb = pd_getparentwidget(y); if (!wb) continue; hit = wb->w_parentclickfn(y, owner, data, t, sc, ap, basex+xloc, basey+yloc, *************** *** 4908,4912 **** canvas_each(y,elemtemplatecanvas) { int xx1, xx2, yy1, yy2; ! t_parentwidgetbehavior *wb = pd_getparentwidget(&y->_class); if (!wb) continue; wb->w_parentgetrectfn(y, canvas, (t_word *)((char *)array->vec + elemsize*i), --- 4905,4909 ---- canvas_each(y,elemtemplatecanvas) { int xx1, xx2, yy1, yy2; ! t_parentwidgetbehavior *wb = pd_getparentwidget(y); if (!wb) continue; wb->w_parentgetrectfn(y, canvas, (t_word *)((char *)array->vec + elemsize*i), *************** *** 5069,5073 **** useyloc = basey + yloc + slot_cvttocoord(yslot, yval); canvas_each(y,elemtemplatecanvas) { ! t_parentwidgetbehavior *wb = pd_getparentwidget(&y->_class); if (wb) wb->w_parentvisfn(y, canvas, (t_word *)(elem+elemsize*i), elemtemplate, usexloc, useyloc, tovis); --- 5066,5070 ---- useyloc = basey + yloc + slot_cvttocoord(yslot, yval); canvas_each(y,elemtemplatecanvas) { ! t_parentwidgetbehavior *wb = pd_getparentwidget(y); if (wb) wb->w_parentvisfn(y, canvas, (t_word *)(elem+elemsize*i), elemtemplate, usexloc, useyloc, tovis); *************** *** 5080,5084 **** for (int i=0; i<nelem; i++) { canvas_each(y,elemtemplatecanvas) { ! t_parentwidgetbehavior *wb = pd_getparentwidget(&y->_class); if (wb) wb->w_parentvisfn(y, canvas, (t_word *)(elem+elemsize*i), elemtemplate,0,0,0); } --- 5077,5081 ---- for (int i=0; i<nelem; i++) { canvas_each(y,elemtemplatecanvas) { ! t_parentwidgetbehavior *wb = pd_getparentwidget(y); if (wb) wb->w_parentvisfn(y, canvas, (t_word *)(elem+elemsize*i), elemtemplate,0,0,0); } *************** *** 5261,5265 **** template_class = class_new(gensym("template"), 0, (t_method)template_free, sizeof(t_template), CLASS_PD, 0); ! class_addmethod3(pd_canvasmaker, template_usetemplate, "struct", "*"); gtemplate_class = class_new(gensym("struct"), (t_newmethod)gtemplate_new, (t_method)gtemplate_free, sizeof(t_gtemplate), CLASS_NOINLET, A_GIMME, 0); --- 5258,5262 ---- template_class = class_new(gensym("template"), 0, (t_method)template_free, sizeof(t_template), CLASS_PD, 0); ! class_addmethod3(pd_canvasmaker._class, template_usetemplate, "struct", "*"); gtemplate_class = class_new(gensym("struct"), (t_newmethod)gtemplate_new, (t_method)gtemplate_free, sizeof(t_gtemplate), CLASS_NOINLET, A_GIMME, 0); *************** *** 6185,6189 **** void canvas_msg(t_canvas *gl, t_symbol *s, int argc, t_atom *argv) { t_message *x = (t_message *)pd_new(message_class); ! x->mresp.mr_pd = mresp_class; x->mresp.outlet = outlet_new(x,&s_float); x->te_width = 0; /* don't know it yet. */ --- 6182,6186 ---- void canvas_msg(t_canvas *gl, t_symbol *s, int argc, t_atom *argv) { t_message *x = (t_message *)pd_new(message_class); ! x->mresp.mr_pd._class = mresp_class; x->mresp.outlet = outlet_new(x,&s_float); x->te_width = 0; /* don't know it yet. */ *************** *** 6327,6333 **** t_canvas *c = (t_canvas *)z; /* in case it is */ if (x->te_type == T_OBJECT) { ! if (zgetfn(&x->te_pd, gensym("saveto")) && !(x->_class==canvas_class && (canvas_isabstraction(c) || canvas_istable(c)))) { ! mess1(&x->te_pd, gensym("saveto"), b); binbuf_addv(b, "ssii", gensym("#X"), gensym("restore"), (t_int)x->te_xpix, (t_int)x->te_ypix); } else { --- 6324,6330 ---- t_canvas *c = (t_canvas *)z; /* in case it is */ if (x->te_type == T_OBJECT) { ! if (zgetfn(x,gensym("saveto")) && !(x->_class==canvas_class && (canvas_isabstraction(c) || canvas_istable(c)))) { ! mess1(x,gensym("saveto"),b); binbuf_addv(b, "ssii", gensym("#X"), gensym("restore"), (t_int)x->te_xpix, (t_int)x->te_ypix); } else { *************** *** 7617,7621 **** /* here is the real creator function, invoked in patch files by sending the "canvas" message to #N, which is bound to pd_canvasmaker. */ ! class_addmethod3(pd_canvasmaker,canvas_new,"canvas","*"); class_addmethod3(c,canvas_restore,"restore","*"); class_addmethod3(c,canvas_coords,"coords","*"); --- 7614,7618 ---- /* here is the real creator function, invoked in patch files by sending the "canvas" message to #N, which is bound to pd_canvasmaker. */ ! class_addmethod3(pd_canvasmaker._class,canvas_new,"canvas","*"); class_addmethod3(c,canvas_restore,"restore","*"); class_addmethod3(c,canvas_coords,"coords","*");

1 0

pd/src desire.c,1.1.2.208,1.1.2.209
by Mathieu Bouchard 28 Nov '06

28 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15605 Modified Files: Tag: devel_0_39 desire.c Log Message: cleanup Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.208 retrieving revision 1.1.2.209 diff -C2 -d -r1.1.2.208 -r1.1.2.209 *** desire.c 28 Nov 2006 01:53:58 -0000 1.1.2.208 --- desire.c 28 Nov 2006 02:19:33 -0000 1.1.2.209 *************** *** 3048,3054 **** static void canvas_writelist(t_gobj *y, t_binbuf *b) { ! for (; y; y = y->g_next) ! if (y->_class == scalar_class) ! canvas_writescalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, b, 0); } --- 3048,3055 ---- static void canvas_writelist(t_gobj *y, t_binbuf *b) { ! for (; y; y = y->g_next) if (y->_class==scalar_class) { ! t_scalar *z = (t_scalar *)y; ! canvas_writescalar(z->sc_template, z->sc_vec, b, 0); ! } } *************** *** 3077,3091 **** static void canvas_addtemplatesforlist(t_gobj *y, int *p_ntemplates, t_symbol ***p_templatevec) { ! for (; y; y = y->g_next) ! if (y->_class == scalar_class) ! canvas_addtemplatesforscalar(((t_scalar *)y)->sc_template, ! ((t_scalar *)y)->sc_vec, p_ntemplates, p_templatevec); } ! static t_binbuf *canvas_writetobinbuf(t_canvas *x, int wholething) { t_symbol **templatevec = (t_symbol **)getbytes(0); int ntemplates = 0; t_binbuf *b = binbuf_new(); ! canvas_each(y,x) if (y->_class==scalar_class && wholething) { t_scalar *s = (t_scalar *)y; canvas_addtemplatesforscalar(s->sc_template, s->sc_vec, &ntemplates, &templatevec); --- 3078,3092 ---- static void canvas_addtemplatesforlist(t_gobj *y, int *p_ntemplates, t_symbol ***p_templatevec) { ! for (; y; y = y->g_next) if (y->_class == scalar_class) { ! t_scalar *z = (t_scalar *)y; ! canvas_addtemplatesforscalar(z->sc_template, z->sc_vec, p_ntemplates, p_templatevec); ! } } ! static t_binbuf *canvas_writetobinbuf(t_canvas *x) { t_symbol **templatevec = (t_symbol **)getbytes(0); int ntemplates = 0; t_binbuf *b = binbuf_new(); ! canvas_each(y,x) if (y->_class==scalar_class) { t_scalar *s = (t_scalar *)y; canvas_addtemplatesforscalar(s->sc_template, s->sc_vec, &ntemplates, &templatevec); *************** *** 3114,3120 **** binbuf_addsemi(b); /* now write out the objects themselves */ ! canvas_each(y,x) ! if (y->_class==scalar_class && wholething) ! canvas_writescalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, b, 0); return b; } --- 3115,3122 ---- binbuf_addsemi(b); /* now write out the objects themselves */ ! canvas_each(y,x) if (y->_class==scalar_class) { ! t_scalar *z = (t_scalar *)y; ! canvas_writescalar(z->sc_template, z->sc_vec, b, 0); ! } return b; } *************** *** 3127,3131 **** if (!strcmp(format->s_name, "cr")) cr = 1; else if (*format->s_name) pd_error(x,"canvas_write: unknown flag: %s", format->s_name); ! t_binbuf *b = canvas_writetobinbuf(x, 1); if (b) { if (binbuf_write(b, buf, "", cr)) pd_error(x,"%s: write failed", filename->s_name); --- 3129,3133 ---- if (!strcmp(format->s_name, "cr")) cr = 1; else if (*format->s_name) pd_error(x,"canvas_write: unknown flag: %s", format->s_name); ! t_binbuf *b = canvas_writetobinbuf(x); if (b) { if (binbuf_write(b, buf, "", cr)) pd_error(x,"%s: write failed", filename->s_name); *************** *** 3168,3173 **** canvas_each(y,x) gobj_save(y, b); canvas_wires_each(oc,t,x) { ! int from = canvas_getindex(x, (t_gobj *)t.from); ! int to = canvas_getindex(x, (t_gobj *)t.to); binbuf_addv(b, "ssiiii;", gensym("#X"), gensym("connect"), from, t.outlet, to, t.inlet); appendix_save((t_gobj *)oc,b); --- 3170,3175 ---- canvas_each(y,x) gobj_save(y, b); canvas_wires_each(oc,t,x) { ! int from = canvas_getindex(x,t.from); ! int to = canvas_getindex(x,t.to); binbuf_addv(b, "ssiiii;", gensym("#X"), gensym("connect"), from, t.outlet, to, t.inlet); appendix_save((t_gobj *)oc,b); *************** *** 3178,3196 **** /* call this recursively to collect all the template names for a canvas or for the selection. */ static void canvas_collecttemplatesfor(t_canvas *x, int *ntemplatesp, ! t_symbol ***templatevecp, int wholething) { canvas_each(y,x) { ! if (y->_class==scalar_class && wholething) ! canvas_addtemplatesforscalar(((t_scalar *)y)->sc_template, ! ((t_scalar *)y)->sc_vec, ntemplatesp, templatevecp); ! else if (y->_class==canvas_class && wholething) ! canvas_collecttemplatesfor((t_canvas *)y, ntemplatesp, templatevecp, 1); } } /* save the templates needed by a canvas to a binbuf. */ ! static void canvas_savetemplatesto(t_canvas *x, t_binbuf *b, int wholething) { t_symbol **templatevec = (t_symbol **)getbytes(0); int ntemplates = 0; ! canvas_collecttemplatesfor(x, &ntemplates, &templatevec, wholething); for (int i=0; i < ntemplates; i++) { t_template *t = template_findbyname(templatevec[i]); --- 3180,3199 ---- /* call this recursively to collect all the template names for a canvas or for the selection. */ static void canvas_collecttemplatesfor(t_canvas *x, int *ntemplatesp, ! t_symbol ***templatevecp) { canvas_each(y,x) { ! if (y->_class==scalar_class) { ! t_scalar *z = (t_scalar *)y; ! canvas_addtemplatesforscalar(z->sc_template, z->sc_vec, ntemplatesp, templatevecp); ! } else if (y->_class==canvas_class) { ! canvas_collecttemplatesfor((t_canvas *)y, ntemplatesp, templatevecp); ! } } } /* save the templates needed by a canvas to a binbuf. */ ! static void canvas_savetemplatesto(t_canvas *x, t_binbuf *b) { t_symbol **templatevec = (t_symbol **)getbytes(0); int ntemplates = 0; ! canvas_collecttemplatesfor(x, &ntemplates, &templatevec); for (int i=0; i < ntemplates; i++) { t_template *t = template_findbyname(templatevec[i]); *************** *** 3227,3231 **** t_binbuf *b = binbuf_new(); int dsp_status = canvas_suspend_dsp(); ! canvas_savetemplatesto(x, b, 1); canvas_saveto(x, b); if (binbuf_write(b, filename->s_name, dir->s_name, 0)) { --- 3230,3234 ---- t_binbuf *b = binbuf_new(); int dsp_status = canvas_suspend_dsp(); ! canvas_savetemplatesto(x, b); canvas_saveto(x, b); if (binbuf_write(b, filename->s_name, dir->s_name, 0)) { *************** *** 3235,3239 **** if (!x->owner) canvas_rename(x, filename, dir); post("saved to: %s/%s", dir->s_name, filename->s_name); ! canvas_reload(filename, dir, (t_gobj *)x); } binbuf_free(b); --- 3238,3242 ---- if (!x->owner) canvas_rename(x, filename, dir); post("saved to: %s/%s", dir->s_name, filename->s_name); ! canvas_reload(filename,dir,x); } binbuf_free(b); *************** *** 4136,4146 **** template_conformwords(tfrom, tto, conformaction, scfrom->sc_vec, x->sc_vec); /* replace the old one with the new one in the list */ ! if (canvas->list == (t_gobj *)scfrom) { ! canvas->list = (t_gobj *)x; x->g_next = scfrom->g_next; } else { ! for (t_gobj *y2, *y = canvas->list; (y2 = y->g_next); y = y2) if (y2 == (t_gobj *)scfrom) { x->g_next = y2->g_next; ! y->g_next = (t_gobj *)x; goto nobug; } --- 4139,4149 ---- template_conformwords(tfrom, tto, conformaction, scfrom->sc_vec, x->sc_vec); /* replace the old one with the new one in the list */ ! if (canvas->list == scfrom) { ! canvas->list = x; x->g_next = scfrom->g_next; } else { ! for (t_gobj *y2, *y = canvas->list; (y2 = y->g_next); y = y2) if (y2 == scfrom) { x->g_next = y2->g_next; ! y->g_next = x; goto nobug; } *************** *** 4201,4210 **** canvas_each(g,canvas) { t_class *c = g->_class; ! if (c==scalar_class) ! g = (t_gobj *)template_conformscalar(tfrom, tto, conformaction, canvas, (t_scalar *)g); ! else if (c==canvas_class) ! template_conformcanvas(tfrom, tto, conformaction, (t_canvas *)g); ! else if (c==garray_class) ! template_conformarray(tfrom, tto, conformaction, garray_getarray((t_garray *)g)); } } --- 4204,4211 ---- canvas_each(g,canvas) { t_class *c = g->_class; ! /* what's the purpose of the assignment here?... consult original code */ ! if (c==scalar_class) g = template_conformscalar(tfrom, tto, conformaction, canvas, (t_scalar *)g); ! else if (c==canvas_class) template_conformcanvas(tfrom, tto, conformaction, (t_canvas *)g); ! else if (c==garray_class) template_conformarray(tfrom, tto, conformaction, garray_getarray((t_garray *)g)); } } *************** *** 5783,5792 **** scalar to erase. When graphics updates become queueable this may fall apart... */ if (gs->gs_which == GP_GLIST) { ! if (canvas_isvisible(gs->gs_un.gs_glist)) sys_mgui((t_gobj *)(gp->gp_un.gp_scalar),"delete",""); } else { t_array *o = gs->gs_un.gs_array; while (STUB(o)->gs_which == GP_ARRAY) o = STUB(o)->gs_un.gs_array; ! if (canvas_isvisible(STUB(o)->gs_un.gs_glist)) ! sys_mgui((t_gobj *)(o->gp.gp_un.gp_scalar), "delete",""); } --- 5784,5792 ---- scalar to erase. When graphics updates become queueable this may fall apart... */ if (gs->gs_which == GP_GLIST) { ! if (canvas_isvisible(gs->gs_un.gs_glist)) sys_mgui(gp->gp_un.gp_scalar,"delete",""); } else { t_array *o = gs->gs_un.gs_array; while (STUB(o)->gs_which == GP_ARRAY) o = STUB(o)->gs_un.gs_array; ! if (canvas_isvisible(STUB(o)->gs_un.gs_glist)) sys_mgui(o->gp.gp_un.gp_scalar, "delete",""); } *************** *** 6310,6314 **** outlet_new(t, type == A_FLOAT ? &s_float: &s_symbol); if (argc >= 2) gatom_reload(x,&s_,argc-2,argv+2); ! canvas_add(gl, (t_gobj *)x); } --- 6310,6314 ---- outlet_new(t, type == A_FLOAT ? &s_float: &s_symbol); if (argc >= 2) gatom_reload(x,&s_,argc-2,argv+2); ! canvas_add(gl,x); } *************** *** 6371,6376 **** } else { int xwas = x->te_xpix, ywas = x->te_ypix; ! canvas_stowconnections(canvas_getcanvas(canvas), (t_gobj *)x); ! canvas_delete(canvas, (t_gobj *)x); canvas_objtext(canvas, xwas, ywas, 0, b); /* if it's an abstraction loadbang it here */ --- 6371,6376 ---- } else { int xwas = x->te_xpix, ywas = x->te_ypix; ! canvas_stowconnections(canvas_getcanvas(canvas),x); ! canvas_delete(canvas,x); canvas_objtext(canvas, xwas, ywas, 0, b); /* if it's an abstraction loadbang it here */ *************** *** 6402,6406 **** t_text *o; if (sscanf(name->s_name,"!x%lx",(long*)&o)<1) {pd_error(x,"gargamel was here"); return;} ! canvas_delete(x,(t_gobj *)o); gobj_changed(x,0); } --- 6402,6406 ---- t_text *o; if (sscanf(name->s_name,"!x%lx",(long*)&o)<1) {pd_error(x,"gargamel was here"); return;} ! canvas_delete(x,o); gobj_changed(x,0); } *************** *** 6709,6718 **** char *bar=foo; *foo=0; canvas_each(y,can) bar+=sprintf(bar,"x%lx ",(long)y); ! sys_mgui((t_gobj *)self,"children=","S",foo); bar=foo; *foo=0; canvas_wires_each(oc,t,can) bar+=sprintf(bar,"{%ld %ld %ld %ld} ", ! (long)canvas_getindex(can,(t_gobj *)t.from), (long)t.outlet, ! (long)canvas_getindex(can,(t_gobj *)t.to), (long)t.inlet); ! sys_mgui((t_gobj *)self,"wires=","S",foo); sys_mgui(self,"name=","s",can->name); sys_mgui(self,"folder=","s",canvas_getenv(can)->dir); --- 6709,6718 ---- char *bar=foo; *foo=0; canvas_each(y,can) bar+=sprintf(bar,"x%lx ",(long)y); ! sys_mgui(self,"children=","S",foo); bar=foo; *foo=0; canvas_wires_each(oc,t,can) bar+=sprintf(bar,"{%ld %ld %ld %ld} ", ! (long)canvas_getindex(can,t.from), (long)t.outlet, ! (long)canvas_getindex(can,t.to), (long)t.inlet); ! sys_mgui(self,"wires=","S",foo); sys_mgui(self,"name=","s",can->name); sys_mgui(self,"folder=","s",canvas_getenv(can)->dir); *************** *** 6885,6889 **** x->count = 0; bng_check_minmax(x); ! outlet_new((t_text *)x, &s_bang); bng_reload(x,0,argc,argv); return x; --- 6885,6889 ---- x->count = 0; bng_check_minmax(x); ! outlet_new(x, &s_bang); bng_reload(x,0,argc,argv); return x; *************** *** 6972,6976 **** x->on=0.0; x->nonzero=1.0; ! outlet_new((t_text *)x, &s_float); toggle_reload(x,0,argc,argv); return x; --- 6972,6976 ---- x->on=0.0; x->nonzero=1.0; ! outlet_new(x, &s_float); toggle_reload(x,0,argc,argv); return x; *************** *** 7063,7067 **** CLAMP(n,1,128); if(n != x->number) { ! sys_mgui((t_gobj *)x,"erase",""); x->number = n; CLAMP(x->on,0,x->number-1); --- 7063,7067 ---- CLAMP(n,1,128); if(n != x->number) { ! sys_mgui(x,"erase",""); x->number = n; CLAMP(x->on,0,x->number-1); *************** *** 7108,7112 **** CLAMP(x->on,0,x->number-1); x->on_old = x->on = x->isa&1 ? x->on : 0; ! outlet_new((t_text *)x, &s_list); radio_reload(x,0,argc,argv); return x; --- 7108,7112 ---- CLAMP(x->on,0,x->number-1); x->on_old = x->on = x->isa&1 ? x->on : 0; ! outlet_new(x, &s_list); radio_reload(x,0,argc,argv); return x; *************** *** 7241,7245 **** x->max=(double)(IEM_SL_DEFAULTSIZE-1); if (isvert(x)) x->h=IEM_SL_DEFAULTSIZE; else x->w=IEM_SL_DEFAULTSIZE; ! outlet_new((t_text *)x, &s_float); slider_reload(x,0,argc,argv); return x; --- 7241,7245 ---- x->max=(double)(IEM_SL_DEFAULTSIZE-1); if (isvert(x)) x->h=IEM_SL_DEFAULTSIZE; else x->w=IEM_SL_DEFAULTSIZE; ! outlet_new(x, &s_float); slider_reload(x,0,argc,argv); return x; *************** *** 7361,7365 **** x->buf[0]=0; x->change = 0; ! outlet_new((t_text *)x, &s_float); nbreload(x,0,argc,argv); return x; --- 7361,7365 ---- x->buf[0]=0; x->change = 0; ! outlet_new(x, &s_float); nbreload(x,0,argc,argv); return x; *************** *** 7461,7466 **** static void *vu_new(t_symbol *s, int argc, t_atom *argv) { t_vu *x = (t_vu *)iemgui_new(vu_class); ! x->out_rms = outlet_new((t_text *)x, &s_float); ! x->out_peak = outlet_new((t_text *)x, &s_float); x->h=IEM_VU_STEPS*3; x->scale = 1; --- 7461,7466 ---- static void *vu_new(t_symbol *s, int argc, t_atom *argv) { t_vu *x = (t_vu *)iemgui_new(vu_class); ! x->out_rms = outlet_new(x, &s_float); ! x->out_peak = outlet_new(x, &s_float); x->h=IEM_VU_STEPS*3; x->scale = 1; *************** *** 7468,7472 **** x->fp = x->fr = -101.0; vu_check_height(x, x->h); ! inlet_new((t_text *)x, (t_pd *)x, &s_float, gensym("ft1")); vu_reload(x,0,argc,argv); return x; --- 7468,7472 ---- x->fp = x->fr = -101.0; vu_check_height(x, x->h); ! inlet_new(x, (t_pd *)x, &s_float, gensym("ft1")); vu_reload(x,0,argc,argv); return x; *************** *** 7491,7496 **** static void cnv_get_pos(t_cnv *x) { if(x->snd && x->snd->s_thing) { ! x->at[0].a_w.w_float = text_xpix((t_text *)x, x->canvas); ! x->at[1].a_w.w_float = text_ypix((t_text *)x, x->canvas); pd_list(x->snd->s_thing, &s_list, 2, x->at); } --- 7491,7496 ---- static void cnv_get_pos(t_cnv *x) { if(x->snd && x->snd->s_thing) { ! x->at[0].a_w.w_float = text_xpix(x, x->canvas); ! x->at[1].a_w.w_float = text_ypix(x, x->canvas); pd_list(x->snd->s_thing, &s_list, 2, x->at); } *************** *** 7589,7593 **** static void *dropper_new(t_symbol *s, int argc, t_atom *argv) { t_dropper *x = (t_dropper *) iemgui_new(dropper_class); ! outlet_new((t_text *)x, &s_symbol); dropper_reload(x,0,argc,argv); return x; --- 7589,7593 ---- static void *dropper_new(t_symbol *s, int argc, t_atom *argv) { t_dropper *x = (t_dropper *) iemgui_new(dropper_class); ! outlet_new(x, &s_symbol); dropper_reload(x,0,argc,argv); return x;

1 0

pd/src desire.c, 1.1.2.207, 1.1.2.208 desire.h, 1.1.2.44, 1.1.2.45
by Mathieu Bouchard 28 Nov '06

28 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6069 Modified Files: Tag: devel_0_39 desire.c desire.h Log Message: more PD_PLUSPLUS_FACE Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.44 retrieving revision 1.1.2.45 diff -C2 -d -r1.1.2.44 -r1.1.2.45 *** desire.h 23 Nov 2006 20:06:52 -0000 1.1.2.44 --- desire.h 28 Nov 2006 01:54:00 -0000 1.1.2.45 *************** *** 139,144 **** --- 139,148 ---- /* the t_canvas structure, which describes a list of elements that live on an area of a window.*/ + #ifdef PD_PLUSPLUS_FACE + struct _glist : t_object { + #else struct _glist { t_object gl_obj; /* header in case we're a canvas */ + #endif t_gobj *list; /* the actual data */ struct _gstub *stub; /* safe pointer handler */ *************** *** 205,210 **** --- 209,218 ---- }; + #ifdef PD_PLUSPLUS_FACE + struct _garray : t_gobj { + #else struct _garray { t_gobj x_gobj; + #endif t_scalar *scalar; /* scalar "containing" the array */ t_canvas *canvas; /* containing canvas */ Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.207 retrieving revision 1.1.2.208 diff -C2 -d -r1.1.2.207 -r1.1.2.208 *** desire.c 28 Nov 2006 01:17:55 -0000 1.1.2.207 --- desire.c 28 Nov 2006 01:53:58 -0000 1.1.2.208 *************** *** 507,511 **** char buf[40]; canvas_init(x); ! x->gl_obj.te_type = T_OBJECT; if (!owner) canvas_addtolist(x); /* toplevel vs subwindow */ --- 507,511 ---- char buf[40]; canvas_init(x); ! x->te_type = T_OBJECT; if (!owner) canvas_addtolist(x); /* toplevel vs subwindow */ *************** *** 582,586 **** t_canvas *x = (t_canvas *)pd_new(canvas_class); canvas_init(x); ! x->gl_obj.te_type = T_OBJECT; if (!*sym->s_name) { char buf[40]; --- 582,586 ---- t_canvas *x = (t_canvas *)pd_new(canvas_class); canvas_init(x); ! x->te_type = T_OBJECT; if (!*sym->s_name) { char buf[40]; *************** *** 602,607 **** } x->name = sym; ! x->x1 = x1; x->y1 = y1; x->gl_obj.te_xpix = (short)px1; x->pixwidth = (int)(px2-px1); ! x->x2 = x2; x->y2 = y2; x->gl_obj.te_ypix = (short)py1; x->pixheight = (int)(py2-py1); x->font = (canvas_getcurrent() ? canvas_getcurrent()->font : sys_defaultfont); x->screenx1 = x->screeny1 = 0; x->screenx2 = 450; x->screeny2 = 300; --- 602,607 ---- } x->name = sym; ! x->x1 = x1; x->y1 = y1; x->te_xpix = (short)px1; x->pixwidth = (int)(px2-px1); ! x->x2 = x2; x->y2 = y2; x->te_ypix = (short)py1; x->pixheight = (int)(py2-py1); x->font = (canvas_getcurrent() ? canvas_getcurrent()->font : sys_defaultfont); x->screenx1 = x->screeny1 = 0; x->screenx2 = 450; x->screeny2 = 300; *************** *** 610,617 **** x->isgraph = 1; x->goprect = 0; ! x->gl_obj.te_binbuf = binbuf_new(); ! binbuf_addv(x->gl_obj.te_binbuf, "s", gensym("graph")); if (!menu) pd_pushsym(x); ! canvas_add(g, (t_gobj *)x); return x; } --- 610,617 ---- x->isgraph = 1; x->goprect = 0; ! x->te_binbuf = binbuf_new(); ! binbuf_addv(x->te_binbuf, "s", gensym("graph")); if (!menu) pd_pushsym(x); ! canvas_add(g,x); return x; } *************** *** 630,635 **** canvas_each(y,x) gobj_changed(y,0); if (x->owner && canvas_isvisible(x->owner)) { ! graph_vis((t_gobj *)x, 0); ! graph_vis((t_gobj *)x, 1); } } --- 630,635 ---- canvas_each(y,x) gobj_changed(y,0); if (x->owner && canvas_isvisible(x->owner)) { ! graph_vis(x,0); ! graph_vis(x,1); } } *************** *** 674,678 **** void canvas_map(t_canvas *x, t_floatarg f) { if (f!=0 && !canvas_isvisible(x)) { ! gobj_subscribe((t_gobj *)x,(t_gobj *)manager); canvas_each(y,x) gobj_changed(y,0); gobj_changed(x,0); --- 674,678 ---- void canvas_map(t_canvas *x, t_floatarg f) { if (f!=0 && !canvas_isvisible(x)) { ! gobj_subscribe(x,manager); canvas_each(y,x) gobj_changed(y,0); gobj_changed(x,0); *************** *** 804,808 **** t_canvas *x2 = (t_canvas *)z; x->owner = x2; ! canvas_objfor(x2, &x->gl_obj, argc, argv); } } --- 804,808 ---- t_canvas *x2 = (t_canvas *)z; x->owner = x2; ! canvas_objfor(x2, x, argc, argv); } } *************** *** 929,934 **** /* return true if the "canvas" object is a "table". */ int canvas_istable(t_canvas *x) { ! t_atom *argv = x->gl_obj.te_binbuf ? binbuf_getvec( x->gl_obj.te_binbuf) : 0; ! int argc = x->gl_obj.te_binbuf ? binbuf_getnatom(x->gl_obj.te_binbuf) : 0; return argc && argv[0].a_type == A_SYMBOL && argv[0].a_w.w_symbol == gensym("table"); } --- 929,934 ---- /* return true if the "canvas" object is a "table". */ int canvas_istable(t_canvas *x) { ! t_atom *argv = x->te_binbuf ? binbuf_getvec( x->te_binbuf) : 0; ! int argc = x->te_binbuf ? binbuf_getnatom(x->te_binbuf) : 0; return argc && argv[0].a_type == A_SYMBOL && argv[0].a_w.w_symbol == gensym("table"); } *************** *** 937,942 **** object. This is true for abstractions but also for "table"s... */ static int canvas_showtext(t_canvas *x) { ! t_atom *argv = x->gl_obj.te_binbuf? binbuf_getvec( x->gl_obj.te_binbuf) : 0; ! int argc = x->gl_obj.te_binbuf? binbuf_getnatom(x->gl_obj.te_binbuf) : 0; int isarray = argc && argv[0].a_type == A_SYMBOL && argv[0].a_w.w_symbol == gensym("graph"); return !isarray; --- 937,942 ---- object. This is true for abstractions but also for "table"s... */ static int canvas_showtext(t_canvas *x) { ! t_atom *argv = x->te_binbuf? binbuf_getvec( x->te_binbuf) : 0; ! int argc = x->te_binbuf? binbuf_getnatom(x->te_binbuf) : 0; int isarray = argc && argv[0].a_type == A_SYMBOL && argv[0].a_w.w_symbol == gensym("graph"); return !isarray; *************** *** 972,978 **** /* create a new "DSP graph" object to use in sorting this canvas. If we aren't toplevel, there are already other dspcontexts around. */ ! dc = ugen_start_graph(toplevel, sp, ! obj_nsiginlets(&x->gl_obj), ! obj_nsigoutlets(&x->gl_obj)); /* find all the "dsp" boxes and add them to the graph */ --- 972,976 ---- /* create a new "DSP graph" object to use in sorting this canvas. If we aren't toplevel, there are already other dspcontexts around. */ ! dc = ugen_start_graph(toplevel, sp, obj_nsiginlets(x), obj_nsigoutlets(x)); /* find all the "dsp" boxes and add them to the graph */ *************** *** 1538,1542 **** x->saveit = saveit; x->listviewing = 0; ! canvas_add(gl, &x->x_gobj); x->canvas = gl; return x; --- 1536,1540 ---- x->saveit = saveit; x->listviewing = 0; ! canvas_add(gl,x); x->canvas = gl; return x; *************** *** 1587,1591 **** t_array *array = garray_getarray(x); t_canvas *gl = x->canvas; ! if (gl->list == &x->x_gobj && !x->x_gobj.g_next) { vmess((t_pd *)gl, gensym("bounds"), "ffff", 0., gl->y1, (double)(style == PLOTSTYLE_POINTS || n == 1 ? n : n-1), gl->y2); --- 1585,1589 ---- t_array *array = garray_getarray(x); t_canvas *gl = x->canvas; ! if (gl->list == x && !x->g_next) { vmess((t_pd *)gl, gensym("bounds"), "ffff", 0., gl->y1, (double)(style == PLOTSTYLE_POINTS || n == 1 ? n : n-1), gl->y2); *************** *** 1644,1648 **** static t_canvas *canvas_findgraph(t_canvas *x) { t_gobj *y = 0; ! canvas_each(z,x) if (pd_class(&z->_class) == canvas_class && ((t_canvas *)z)->isgraph) y = z; return (t_canvas *)y; } --- 1642,1646 ---- static t_canvas *canvas_findgraph(t_canvas *x) { t_gobj *y = 0; ! canvas_each(z,x) if (z->_class==canvas_class && ((t_canvas *)z)->isgraph) y = z; return (t_canvas *)y; } *************** *** 1674,1678 **** template_findbyname(x->scalar->sc_template), gensym("style"), x->scalar->sc_vec, 1); if (deleteit != 0) { ! canvas_delete(x->canvas, &x->x_gobj); } else { int size; --- 1672,1676 ---- template_findbyname(x->scalar->sc_template), gensym("style"), x->scalar->sc_vec, 1); if (deleteit != 0) { ! canvas_delete(x->canvas,x); } else { int size; *************** *** 2351,2359 **** static float gobj_getxforsort(t_gobj *g) { ! if (pd_class(&g->_class) == scalar_class) { ! float x1, y1; ! scalar_getbasexy((t_scalar *)g, &x1, &y1); ! return x1; ! } else return 0; } --- 2349,2356 ---- static float gobj_getxforsort(t_gobj *g) { ! if (g->_class!=scalar_class) return 0; ! float x1, y1; ! scalar_getbasexy((t_scalar *)g, &x1, &y1); ! return x1; } *************** *** 2406,2415 **** static t_inlet *canvas_addinlet(t_canvas *x, t_pd *who, t_symbol *s, t_symbol* h) { ! t_inlet *ip = inlet_new(&x->gl_obj, who, s, 0); inlet_settip(ip,h); if (!x->loading) canvas_resortinlets(x); gobj_changed(x,0); return ip; } static t_outlet *canvas_addoutlet(t_canvas *x, t_pd *who, t_symbol *s) { ! t_outlet *op = outlet_new(&x->gl_obj, s); if (!x->loading) canvas_resortoutlets(x); gobj_changed(x,0); return op; --- 2403,2412 ---- static t_inlet *canvas_addinlet(t_canvas *x, t_pd *who, t_symbol *s, t_symbol* h) { ! t_inlet *ip = inlet_new(x,who,s,0); inlet_settip(ip,h); if (!x->loading) canvas_resortinlets(x); gobj_changed(x,0); return ip; } static t_outlet *canvas_addoutlet(t_canvas *x, t_pd *who, t_symbol *s) { ! t_outlet *op = outlet_new(x,s); if (!x->loading) canvas_resortoutlets(x); gobj_changed(x,0); return op; *************** *** 2417,2425 **** static void canvas_rminlet(t_canvas *x, t_inlet *ip) { ! if (x->owner) canvas_deletelinesforio(x->owner, &x->gl_obj, ip, 0); inlet_free(ip); gobj_changed(x,0); } static void canvas_rmoutlet(t_canvas *x, t_outlet *op) { ! if (x->owner) canvas_deletelinesforio(x->owner, &x->gl_obj, 0, op); outlet_free(op); gobj_changed(x,0); } --- 2414,2422 ---- static void canvas_rminlet(t_canvas *x, t_inlet *ip) { ! if (x->owner) canvas_deletelinesforio(x->owner,x,ip,0); inlet_free(ip); gobj_changed(x,0); } static void canvas_rmoutlet(t_canvas *x, t_outlet *op) { ! if (x->owner) canvas_deletelinesforio(x->owner,x,0,op); outlet_free(op); gobj_changed(x,0); } *************** *** 2433,2440 **** int n=0, j, xmax, x1; t_gobj *y, **vec, **vp, **maxp; ! canvas_each(y,x) if (pd_class(&y->_class) == vinlet_class) n++; if (n<2) return; vp = vec = (t_gobj **)getbytes(n*sizeof(*vec)); ! canvas_each(y,x) if (pd_class(&y->_class) == vinlet_class) *vp++ = y; for (int i=n; i--;) { t_inlet *ip; --- 2430,2437 ---- int n=0, j, xmax, x1; t_gobj *y, **vec, **vp, **maxp; ! canvas_each(y,x) if (y->_class==vinlet_class) n++; if (n<2) return; vp = vec = (t_gobj **)getbytes(n*sizeof(*vec)); ! canvas_each(y,x) if (y->_class==vinlet_class) *vp++ = y; for (int i=n; i--;) { t_inlet *ip; *************** *** 2447,2451 **** y = *maxp; *maxp = 0; ip = vinlet_getit(&y->_class); ! obj_moveinletfirst(&x->gl_obj, ip); } freebytes(vec, n*sizeof(*vec)); --- 2444,2448 ---- y = *maxp; *maxp = 0; ip = vinlet_getit(&y->_class); ! obj_moveinletfirst(x,ip); } freebytes(vec, n*sizeof(*vec)); *************** *** 2454,2461 **** int n=0, j, xmax, x1; t_gobj *y, **vec, **vp, **maxp; ! canvas_each(y,x) if (pd_class(&y->_class) == voutlet_class) n++; if (n<2) return; vp = vec = (t_gobj **)getbytes(n*sizeof(*vec)); ! canvas_each(y,x) if (pd_class(&y->_class) == voutlet_class) *vp++ = y; for (int i=n; i--;) { t_outlet *ip; --- 2451,2458 ---- int n=0, j, xmax, x1; t_gobj *y, **vec, **vp, **maxp; ! canvas_each(y,x) if (y->_class==voutlet_class) n++; if (n<2) return; vp = vec = (t_gobj **)getbytes(n*sizeof(*vec)); ! canvas_each(y,x) if (y->_class==voutlet_class) *vp++ = y; for (int i=n; i--;) { t_outlet *ip; *************** *** 2468,2472 **** y = *maxp; *maxp = 0; ip = voutlet_getit(&y->_class); ! obj_moveoutletfirst(&x->gl_obj, ip); } freebytes(vec, n*sizeof(*vec)); --- 2465,2469 ---- y = *maxp; *maxp = 0; ip = voutlet_getit(&y->_class); ! obj_moveoutletfirst(x,ip); } freebytes(vec, n*sizeof(*vec)); *************** *** 2516,2520 **** if (!x->isgraph) return x->x1 + width * xpix; if (x->havewindow) return x->x1 + width * xpix / (x->screenx2-x->screenx1); ! graph_graphrect((t_gobj *)x, x->owner, &x1, &y1, &x2, &y2); return x->x1 + width * (xpix-x1) / (x2-x1); } --- 2513,2517 ---- if (!x->isgraph) return x->x1 + width * xpix; if (x->havewindow) return x->x1 + width * xpix / (x->screenx2-x->screenx1); ! graph_graphrect(x, x->owner, &x1, &y1, &x2, &y2); return x->x1 + width * (xpix-x1) / (x2-x1); } *************** *** 2523,2527 **** if (!x->isgraph) return x->y1 + height * ypix; if (x->havewindow) return x->y1 + height * ypix / (x->screeny2-x->screeny1); ! graph_graphrect((t_gobj *)x, x->owner, &x1, &y1, &x2, &y2); return x->y1 + height * (ypix-y1) / (y2-y1); } --- 2520,2524 ---- if (!x->isgraph) return x->y1 + height * ypix; if (x->havewindow) return x->y1 + height * ypix / (x->screeny2-x->screeny1); ! graph_graphrect(x, x->owner, &x1, &y1, &x2, &y2); return x->y1 + height * (ypix-y1) / (y2-y1); } *************** *** 2532,2536 **** if (!x->isgraph) return (int)((xval-x->x1)/width); if (x->havewindow) return (int)((x->screenx2-x->screenx1) * (xval-x->x1) / width); ! graph_graphrect((t_gobj *)x, x->owner, &x1, &y1, &x2, &y2); return (int)(x1 + (x2-x1) * (xval-x->x1) / width); } --- 2529,2533 ---- if (!x->isgraph) return (int)((xval-x->x1)/width); if (x->havewindow) return (int)((x->screenx2-x->screenx1) * (xval-x->x1) / width); ! graph_graphrect(x, x->owner, &x1, &y1, &x2, &y2); return (int)(x1 + (x2-x1) * (xval-x->x1) / width); } *************** *** 2539,2543 **** if (!x->isgraph) return (int)((yval-x->y1)/height); if (x->havewindow) return (int)((x->screeny2-x->screeny1) * (yval-x->y1) / height); ! graph_graphrect((t_gobj *)x, x->owner, &x1, &y1, &x2, &y2); return (int)(y1 + (y2-y1) * (yval-x->y1) / height); } --- 2536,2540 ---- if (!x->isgraph) return (int)((yval-x->y1)/height); if (x->havewindow) return (int)((x->screeny2-x->screeny1) * (yval-x->y1) / height); ! graph_graphrect(x, x->owner, &x1, &y1, &x2, &y2); return (int)(y1 + (y2-y1) * (yval-x->y1) / height); } *************** *** 2552,2556 **** float width = canvas->x2-canvas->x1; if (canvas->havewindow || !canvas->isgraph) return x->te_xpix; ! if (canvas->goprect) return canvas->gl_obj.te_xpix + x->te_xpix - canvas->xmargin; return canvas_xtopixels(canvas, canvas->x1 + width * x->te_xpix / (canvas->screenx2-canvas->screenx1)); } --- 2549,2553 ---- float width = canvas->x2-canvas->x1; if (canvas->havewindow || !canvas->isgraph) return x->te_xpix; ! if (canvas->goprect) return canvas->te_xpix + x->te_xpix - canvas->xmargin; return canvas_xtopixels(canvas, canvas->x1 + width * x->te_xpix / (canvas->screenx2-canvas->screenx1)); } *************** *** 2558,2562 **** float height = canvas->y2-canvas->y1; if (canvas->havewindow || !canvas->isgraph) return x->te_ypix; ! if (canvas->goprect) return canvas->gl_obj.te_ypix + x->te_ypix - canvas->ymargin; return canvas_ytopixels(canvas, canvas->y1 + height* x->te_ypix / (canvas->screeny2-canvas->screeny1)); } --- 2555,2559 ---- float height = canvas->y2-canvas->y1; if (canvas->havewindow || !canvas->isgraph) return x->te_ypix; ! if (canvas->goprect) return canvas->te_ypix + x->te_ypix - canvas->ymargin; return canvas_ytopixels(canvas, canvas->y1 + height* x->te_ypix / (canvas->screeny2-canvas->screeny1)); } *************** *** 2666,2671 **** static void graph_graphrect(t_gobj *z, t_canvas *canvas, int *xp1, int *yp1, int *xp2, int *yp2) { t_canvas *x = (t_canvas *)z; ! *xp1 = text_xpix(&x->gl_obj, canvas); *xp2 = *xp1+x->pixwidth; ! *yp1 = text_ypix(&x->gl_obj, canvas); *yp2 = *yp1+x->pixheight; } --- 2663,2668 ---- static void graph_graphrect(t_gobj *z, t_canvas *canvas, int *xp1, int *yp1, int *xp2, int *yp2) { t_canvas *x = (t_canvas *)z; ! *xp1 = text_xpix(x,canvas); *xp2 = *xp1+x->pixwidth; ! *yp1 = text_ypix(x,canvas); *yp2 = *yp1+x->pixheight; } *************** *** 2684,2688 **** graph_lastypix = newypix; // verify that the array is OK ! if (!a || pd_class((t_pd *)a) != garray_class) return; if (!garray_getfloatarray(a, &nelem, &vec)) return; if (oldx < 0) oldx = 0; else if (oldx >= nelem) oldx = nelem - 1; --- 2681,2685 ---- graph_lastypix = newypix; // verify that the array is OK ! if (!a || a->_class != garray_class) return; if (!garray_getfloatarray(a, &nelem, &vec)) return; if (oldx < 0) oldx = 0; else if (oldx >= nelem) oldx = nelem - 1; *************** *** 3052,3056 **** static void canvas_writelist(t_gobj *y, t_binbuf *b) { for (; y; y = y->g_next) ! if (pd_class(&y->_class) == scalar_class) canvas_writescalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, b, 0); } --- 3049,3053 ---- static void canvas_writelist(t_gobj *y, t_binbuf *b) { for (; y; y = y->g_next) ! if (y->_class == scalar_class) canvas_writescalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, b, 0); } *************** *** 3081,3085 **** static void canvas_addtemplatesforlist(t_gobj *y, int *p_ntemplates, t_symbol ***p_templatevec) { for (; y; y = y->g_next) ! if (pd_class(&y->_class) == scalar_class) canvas_addtemplatesforscalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, p_ntemplates, p_templatevec); --- 3078,3082 ---- static void canvas_addtemplatesforlist(t_gobj *y, int *p_ntemplates, t_symbol ***p_templatevec) { for (; y; y = y->g_next) ! if (y->_class == scalar_class) canvas_addtemplatesforscalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, p_ntemplates, p_templatevec); *************** *** 3090,3094 **** int ntemplates = 0; t_binbuf *b = binbuf_new(); ! canvas_each(y,x) if ((pd_class(&y->_class) == scalar_class) && wholething) { t_scalar *s = (t_scalar *)y; canvas_addtemplatesforscalar(s->sc_template, s->sc_vec, &ntemplates, &templatevec); --- 3087,3091 ---- int ntemplates = 0; t_binbuf *b = binbuf_new(); ! canvas_each(y,x) if (y->_class==scalar_class && wholething) { t_scalar *s = (t_scalar *)y; canvas_addtemplatesforscalar(s->sc_template, s->sc_vec, &ntemplates, &templatevec); *************** *** 3118,3122 **** /* now write out the objects themselves */ canvas_each(y,x) ! if (pd_class(&y->_class) == scalar_class && wholething) canvas_writescalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, b, 0); return b; --- 3115,3119 ---- /* now write out the objects themselves */ canvas_each(y,x) ! if (y->_class==scalar_class && wholething) canvas_writescalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, b, 0); return b; *************** *** 3183,3190 **** t_symbol ***templatevecp, int wholething) { canvas_each(y,x) { ! if (pd_class(&y->_class) == scalar_class && wholething) canvas_addtemplatesforscalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, ntemplatesp, templatevecp); ! else if (pd_class(&y->_class) == canvas_class && wholething) canvas_collecttemplatesfor((t_canvas *)y, ntemplatesp, templatevecp, 1); } --- 3180,3187 ---- t_symbol ***templatevecp, int wholething) { canvas_each(y,x) { ! if (y->_class==scalar_class && wholething) canvas_addtemplatesforscalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, ntemplatesp, templatevecp); ! else if (y->_class==canvas_class && wholething) canvas_collecttemplatesfor((t_canvas *)y, ntemplatesp, templatevecp, 1); } *************** *** 4203,4207 **** static void template_conformcanvas(t_template *tfrom, t_template *tto, int *conformaction, t_canvas *canvas) { canvas_each(g,canvas) { ! t_class *c = pd_class(&g->_class); if (c==scalar_class) g = (t_gobj *)template_conformscalar(tfrom, tto, conformaction, canvas, (t_scalar *)g); --- 4200,4204 ---- static void template_conformcanvas(t_template *tfrom, t_template *tto, int *conformaction, t_canvas *canvas) { canvas_each(g,canvas) { ! t_class *c = g->_class; if (c==scalar_class) g = (t_gobj *)template_conformscalar(tfrom, tto, conformaction, canvas, (t_scalar *)g); *************** *** 5428,5432 **** if (!gobj) gobj = canvas->list; else gobj = gobj->g_next; ! while (gobj && (pd_class(&gobj->_class) != scalar_class || wantselected)) gobj = gobj->g_next; if (gobj) { t_typedout *to = x->typedout; --- 5425,5429 ---- if (!gobj) gobj = canvas->list; else gobj = gobj->g_next; ! while (gobj && (gobj->_class != scalar_class || wantselected)) gobj = gobj->g_next; if (gobj) { t_typedout *to = x->typedout; *************** *** 6106,6111 **** x->te_type = T_OBJECT; canvas_add(gl,x); ! if (pd_class(&x->ob_pd) == vinlet_class) canvas_resortinlets(canvas_getcanvas(gl)); ! if (pd_class(&x->ob_pd) == voutlet_class) canvas_resortoutlets(canvas_getcanvas(gl)); pd_popsym(gl); } --- 6103,6108 ---- x->te_type = T_OBJECT; canvas_add(gl,x); ! if (x->_class== vinlet_class) canvas_resortinlets(canvas_getcanvas(gl)); ! if (x->_class==voutlet_class) canvas_resortoutlets(canvas_getcanvas(gl)); pd_popsym(gl); } *************** *** 6331,6335 **** if (x->te_type == T_OBJECT) { if (zgetfn(&x->te_pd, gensym("saveto")) && ! !(pd_class(&x->te_pd)==canvas_class && (canvas_isabstraction(c) || canvas_istable(c)))) { mess1(&x->te_pd, gensym("saveto"), b); binbuf_addv(b, "ssii", gensym("#X"), gensym("restore"), (t_int)x->te_xpix, (t_int)x->te_ypix); --- 6328,6332 ---- if (x->te_type == T_OBJECT) { if (zgetfn(&x->te_pd, gensym("saveto")) && ! !(x->_class==canvas_class && (canvas_isabstraction(c) || canvas_istable(c)))) { mess1(&x->te_pd, gensym("saveto"), b); binbuf_addv(b, "ssii", gensym("#X"), gensym("restore"), (t_int)x->te_xpix, (t_int)x->te_ypix);

1 0

[PD-cvs] pd/src desire.c, 1.1.2.206, 1.1.2.207 m_pd.h, 1.4.4.11.2.30, 1.4.4.11.2.31
by Mathieu Bouchard 28 Nov '06

28 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25273 Modified Files: Tag: devel_0_39 desire.c m_pd.h Log Message: more of PD_PLUSPLUS_FACE Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.30 retrieving revision 1.4.4.11.2.31 diff -C2 -d -r1.4.4.11.2.30 -r1.4.4.11.2.31 *** m_pd.h 28 Nov 2006 00:44:54 -0000 1.4.4.11.2.30 --- m_pd.h 28 Nov 2006 01:17:57 -0000 1.4.4.11.2.31 *************** *** 226,232 **** --- 226,236 ---- } t_gobj; + #ifdef PD_PLUSPLUS_FACE + typedef struct _scalar : t_gobj { + #else typedef struct _scalar /* a graphical object holding data */ { t_gobj sc_gobj; /* header for graphical object */ + #endif t_symbol *sc_template; /* template name (LATER replace with pointer) */ t_word sc_vec[1]; /* indeterminate-length array of words */ Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.206 retrieving revision 1.1.2.207 diff -C2 -d -r1.1.2.206 -r1.1.2.207 *** desire.c 28 Nov 2006 00:55:24 -0000 1.1.2.206 --- desire.c 28 Nov 2006 01:17:55 -0000 1.1.2.207 *************** *** 87,90 **** --- 87,92 ---- #define pd_unbind(a,b) pd_unbind((t_pd *)(a),b) #define pd_checkobject(a) pd_checkobject((t_pd *)(a)) + #define pd_pushsym(a) pd_pushsym((t_pd *)(a)) + #define pd_popsym(a) pd_popsym((t_pd *)(a)) //-------------------------------------------------------------------------- *************** *** 396,402 **** if (*name == '$' && isdigit(name[1])) { t_canvasenvironment *env = canvas_getenv(x); ! pd_pushsym((t_pd *)x); ret = binbuf_realizedollsym(gensym(name+1), env->argc, env->argv, 1); ! pd_popsym((t_pd *)x); } else ret = s; return ret; --- 398,404 ---- if (*name == '$' && isdigit(name[1])) { t_canvasenvironment *env = canvas_getenv(x); ! pd_pushsym(x); ret = binbuf_realizedollsym(gensym(name+1), env->argc, env->argv, 1); ! pd_popsym(x); } else ret = s; return ret; *************** *** 546,550 **** x->willvis = vis; x->font = sys_nearestfontsize(font); ! pd_pushsym((t_pd *)x); x->next_add = -1; x->connectbuf = binbuf_new(); --- 548,552 ---- x->willvis = vis; x->font = sys_nearestfontsize(font); ! pd_pushsym(x); x->next_add = -1; x->connectbuf = binbuf_new(); *************** *** 610,614 **** x->gl_obj.te_binbuf = binbuf_new(); binbuf_addv(x->gl_obj.te_binbuf, "s", gensym("graph")); ! if (!menu) pd_pushsym((t_pd *)x); canvas_add(g, (t_gobj *)x); return x; --- 612,616 ---- x->gl_obj.te_binbuf = binbuf_new(); binbuf_addv(x->gl_obj.te_binbuf, "s", gensym("graph")); ! if (!menu) pd_pushsym(x); canvas_add(g, (t_gobj *)x); return x; *************** *** 761,769 **** static void canvas_resortoutlets(t_canvas *x); ! static void canvas_push(t_canvas *x) {pd_pushsym((t_pd *)x);} static void canvas_pop(t_canvas *x, t_floatarg fvis) { if (fvis!=0) canvas_vis(x, 1); ! pd_popsym((t_pd *)x); canvas_resortinlets(x); canvas_resortoutlets(x); --- 763,771 ---- static void canvas_resortoutlets(t_canvas *x); ! static void canvas_push(t_canvas *x) {pd_pushsym(x);} static void canvas_pop(t_canvas *x, t_floatarg fvis) { if (fvis!=0) canvas_vis(x, 1); ! pd_popsym(x); canvas_resortinlets(x); canvas_resortoutlets(x); *************** *** 857,861 **** extern "C" void canvas_popabstraction(t_canvas *x) { newest = (t_pd *)x; ! pd_popsym((t_pd *)x); x->loading = 0; canvas_resortinlets(x); --- 859,863 ---- extern "C" void canvas_popabstraction(t_canvas *x) { newest = (t_pd *)x; ! pd_popsym(x); x->loading = 0; canvas_resortinlets(x); *************** *** 883,889 **** else if (ac && av->a_type == A_DOLLSYM) { t_canvasenvironment *e = canvas_getenv(x); ! pd_pushsym((t_pd *)x); canvas_rename(x, binbuf_realizedollsym(av->a_w.w_symbol, e->argc, e->argv, 1), 0); ! pd_popsym((t_pd *)x); } else canvas_rename(x, gensym("Pd"), 0); --- 885,891 ---- else if (ac && av->a_type == A_DOLLSYM) { t_canvasenvironment *e = canvas_getenv(x); ! pd_pushsym(x); canvas_rename(x, binbuf_realizedollsym(av->a_w.w_symbol, e->argc, e->argv, 1), 0); ! pd_popsym(x); } else canvas_rename(x, gensym("Pd"), 0); *************** *** 915,919 **** x->owner = z; /* create a graph for the table */ ! t_canvas *gl = canvas_addcanvas((t_canvas*)x, &s_, 0, -1, (f > 1 ? f-1 : 1), 1, 50, 350, 550, 50); graph_array(gl, s, &s_float, f, 0); canvas_pop(x, 0); --- 917,921 ---- x->owner = z; /* create a graph for the table */ ! t_canvas *gl = canvas_addcanvas(x, &s_, 0, -1, (f > 1 ? f-1 : 1), 1, 50, 350, 550, 50); graph_array(gl, s, &s_float, f, 0); canvas_pop(x, 0); *************** *** 1144,1149 **** void canvas_disconnect(t_canvas *x, float from_, float outlet, float to_, float inlet) { canvas_wires_each(oc,t,x) { ! int from = canvas_getindex(x, (t_gobj *)t.from); ! int to = canvas_getindex(x, (t_gobj *)t.to); if (from == from_ && t.outlet == outlet && to == to_ && t.inlet == inlet) { --- 1146,1151 ---- void canvas_disconnect(t_canvas *x, float from_, float outlet, float to_, float inlet) { canvas_wires_each(oc,t,x) { ! int from = canvas_getindex(x, t.from); ! int to = canvas_getindex(x, t.to); if (from == from_ && t.outlet == outlet && to == to_ && t.inlet == inlet) { *************** *** 1162,1169 **** int i=0, nobj = canvas_getindex(gl, 0); /* number of objects */ for (t_gobj *g = gl->list; g && i < nobj; i++) { ! if (g != except && g->_class == canvas_class && ! canvas_isabstraction((t_canvas *)g) && ! ((t_canvas *)g)->name == name && ! canvas_getdir((t_canvas *)g) == dir) { /* we're going to remake the object, so "g" will go stale. Get its index here, --- 1164,1169 ---- int i=0, nobj = canvas_getindex(gl, 0); /* number of objects */ for (t_gobj *g = gl->list; g && i < nobj; i++) { ! if (g != except && g->_class == canvas_class && canvas_isabstraction((t_canvas *)g) && ! ((t_canvas *)g)->name == name && canvas_getdir((t_canvas *)g) == dir) { /* we're going to remake the object, so "g" will go stale. Get its index here, *************** *** 1367,1374 **** binbuf_clear(x->connectbuf); canvas_wires_each(oc,t,x) { ! if ((o == (t_gobj *)t.from) != (o == (t_gobj *)t.to)) binbuf_addv(x->connectbuf, "ssiiii;", gensym("#X"), gensym("connect"), ! canvas_getindex(x, (t_gobj *)t.from), t.outlet, ! canvas_getindex(x, (t_gobj *)t.to), t.inlet); } } --- 1367,1374 ---- binbuf_clear(x->connectbuf); canvas_wires_each(oc,t,x) { ! if ((o==t.from) != (o==t.to)) binbuf_addv(x->connectbuf, "ssiiii;", gensym("#X"), gensym("connect"), ! canvas_getindex(x, t.from), t.outlet, ! canvas_getindex(x, t.to), t.inlet); } } *************** *** 2705,2710 **** */ ! struct _guiconnect { ! t_object o; t_pd *who; t_symbol *sym; --- 2705,2709 ---- */ ! struct _guiconnect : t_object { t_pd *who; t_symbol *sym; *************** *** 2861,2865 **** } if (wasvis) canvas_getcanvas(x)->mapped = 0; ! canvas_add(x, &sc->sc_gobj); int message; int nline = canvas_scanbinbuf(natoms, vec, &message, p_nextmsg); --- 2860,2864 ---- } if (wasvis) canvas_getcanvas(x)->mapped = 0; ! canvas_add(x,sc); int message; int nline = canvas_scanbinbuf(natoms, vec, &message, p_nextmsg); *************** *** 2954,2958 **** t_gobj *y, *y2 = 0, *newone, *oldone = 0; canvas_each(y,x) { ! if (y == &sc->sc_gobj) {scindex = ntotal; oldone = y;} ntotal++; } --- 2953,2957 ---- t_gobj *y, *y2 = 0, *newone, *oldone = 0; canvas_each(y,x) { ! if (y==sc) {scindex = ntotal; oldone = y;} ntotal++; } *************** *** 3804,3808 **** TEMPLATE_CHECK(owner,templatesym,0) t_scalar *x = (t_scalar *)getbytes(sizeof(t_scalar) + (t->n - 1) * sizeof(*x->sc_vec)); ! x->sc_gobj._class = scalar_class; x->sc_template = templatesym; gpointer_setcanvas(&gp, owner, x); --- 3803,3807 ---- TEMPLATE_CHECK(owner,templatesym,0) t_scalar *x = (t_scalar *)getbytes(sizeof(t_scalar) + (t->n - 1) * sizeof(*x->sc_vec)); ! x->_class = scalar_class; x->sc_template = templatesym; gpointer_setcanvas(&gp, owner, x); *************** *** 4132,4136 **** gpointer_init(&gp); x = (t_scalar *)getbytes(sizeof(t_scalar) + (tto->n - 1) * sizeof(*x->sc_vec)); ! x->sc_gobj._class = scalar_class; x->sc_template = tfrom->sym; gpointer_setcanvas(&gp, canvas, x); --- 4131,4135 ---- gpointer_init(&gp); x = (t_scalar *)getbytes(sizeof(t_scalar) + (tto->n - 1) * sizeof(*x->sc_vec)); ! x->_class = scalar_class; x->sc_template = tfrom->sym; gpointer_setcanvas(&gp, canvas, x); *************** *** 4142,4149 **** if (canvas->list == (t_gobj *)scfrom) { canvas->list = (t_gobj *)x; ! x->sc_gobj.g_next = scfrom->sc_gobj.g_next; } else { for (t_gobj *y2, *y = canvas->list; (y2 = y->g_next); y = y2) if (y2 == (t_gobj *)scfrom) { ! x->sc_gobj.g_next = y2->g_next; y->g_next = (t_gobj *)x; goto nobug; --- 4141,4148 ---- if (canvas->list == (t_gobj *)scfrom) { canvas->list = (t_gobj *)x; ! x->g_next = scfrom->g_next; } else { for (t_gobj *y2, *y = canvas->list; (y2 = y->g_next); y = y2) if (y2 == (t_gobj *)scfrom) { ! x->g_next = y2->g_next; y->g_next = (t_gobj *)x; goto nobug; *************** *** 5426,5430 **** if (canvas->valid != gp->gp_valid) {pd_error(x, "next: stale pointer"); return;} if (wantselected && !canvas_isvisible(canvas)) {pd_error(x, "next: next-selected only works for a visible window"); return;} ! gobj = &gp->gp_un.gp_scalar->sc_gobj; if (!gobj) gobj = canvas->list; else gobj = gobj->g_next; --- 5425,5429 ---- if (canvas->valid != gp->gp_valid) {pd_error(x, "next: stale pointer"); return;} if (wantselected && !canvas_isvisible(canvas)) {pd_error(x, "next: next-selected only works for a visible window"); return;} ! gobj = gp->gp_un.gp_scalar; if (!gobj) gobj = canvas->list; else gobj = gobj->g_next; *************** *** 5860,5877 **** t_gstub *gs = gp->gp_stub; t_word *vec; - t_scalar *sc, *oldsc; - t_canvas *canvas; TEMPLATE_CHECK(x,x->templatesym,) if (!gs) {pd_error(x, "no current pointer"); return;} if (gs->gs_which != GP_GLIST) {pd_error(x, "lists only, not arrays"); return;} ! canvas = gs->gs_un.gs_glist; if (canvas->valid != gp->gp_valid) {pd_error(x, "stale pointer"); return;} if (!nitems) return; x->variables[0].f = f; ! sc = scalar_new(canvas,x->templatesym); if (!sc) {pd_error(x, "%s: couldn't create scalar", x->templatesym->s_name); return;} ! oldsc = gp->gp_un.gp_scalar; ! if (oldsc) {sc->sc_gobj.g_next = oldsc->sc_gobj.g_next; oldsc->sc_gobj.g_next = &sc->sc_gobj;} ! else {sc->sc_gobj.g_next = canvas->list; canvas->list = &sc->sc_gobj;} gobj_changed(sc,0); gp->gp_un.gp_scalar = sc; --- 5859,5874 ---- t_gstub *gs = gp->gp_stub; t_word *vec; TEMPLATE_CHECK(x,x->templatesym,) if (!gs) {pd_error(x, "no current pointer"); return;} if (gs->gs_which != GP_GLIST) {pd_error(x, "lists only, not arrays"); return;} ! t_canvas *canvas = gs->gs_un.gs_glist; if (canvas->valid != gp->gp_valid) {pd_error(x, "stale pointer"); return;} if (!nitems) return; x->variables[0].f = f; ! t_scalar *sc = scalar_new(canvas,x->templatesym); if (!sc) {pd_error(x, "%s: couldn't create scalar", x->templatesym->s_name); return;} ! t_scalar *oldsc = gp->gp_un.gp_scalar; ! if (oldsc) {sc->g_next = oldsc->g_next; oldsc->g_next = sc;} ! else {sc->g_next = canvas->list; canvas->list = sc;} gobj_changed(sc,0); gp->gp_un.gp_scalar = sc; *************** *** 6090,6094 **** newest = 0; binbuf_gettext(b,&s,&n); ! pd_pushsym((t_pd *)gl); canvas_getargs(&argc, &argv); binbuf_eval(b, &pd_objectmaker, argc, argv); --- 6087,6091 ---- newest = 0; binbuf_gettext(b,&s,&n); ! pd_pushsym(gl); canvas_getargs(&argc, &argv); binbuf_eval(b, &pd_objectmaker, argc, argv); *************** *** 6111,6115 **** if (pd_class(&x->ob_pd) == vinlet_class) canvas_resortinlets(canvas_getcanvas(gl)); if (pd_class(&x->ob_pd) == voutlet_class) canvas_resortoutlets(canvas_getcanvas(gl)); ! pd_popsym((t_pd *)gl); } --- 6108,6112 ---- if (pd_class(&x->ob_pd) == vinlet_class) canvas_resortinlets(canvas_getcanvas(gl)); if (pd_class(&x->ob_pd) == voutlet_class) canvas_resortoutlets(canvas_getcanvas(gl)); ! pd_popsym(gl); } *************** *** 6444,6448 **** /* canvas_reorder_last(x,i); */ gobj_changed(x,0); ! /*err: pd_popsym((t_pd *)x);*/ } --- 6441,6445 ---- /* canvas_reorder_last(x,i); */ gobj_changed(x,0); ! /*err: pd_popsym(x);*/ }

1 0

pd/src desire.c,1.1.2.205,1.1.2.206
by Mathieu Bouchard 28 Nov '06

28 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18810 Modified Files: Tag: devel_0_39 desire.c Log Message: . Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.205 retrieving revision 1.1.2.206 diff -C2 -d -r1.1.2.205 -r1.1.2.206 *** desire.c 28 Nov 2006 00:44:54 -0000 1.1.2.205 --- desire.c 28 Nov 2006 00:55:24 -0000 1.1.2.206 *************** *** 86,89 **** --- 86,90 ---- #define pd_bind(a,b) pd_bind((t_pd *)(a),b) #define pd_unbind(a,b) pd_unbind((t_pd *)(a),b) + #define pd_checkobject(a) pd_checkobject((t_pd *)(a)) //-------------------------------------------------------------------------- *************** *** 457,461 **** t_object *ob = 0; t_gobj *y = t->from ? t->from->g_next : t->canvas->list; ! for (; y; y = y->g_next) if ((ob = pd_checkobject(&y->_class))) break; if (!ob) return 0; t->from = ob; --- 458,462 ---- t_object *ob = 0; t_gobj *y = t->from ? t->from->g_next : t->canvas->list; ! for (; y; y = y->g_next) if ((ob = pd_checkobject(y))) break; if (!ob) return 0; t->from = ob; *************** *** 808,812 **** static void canvas_loadbangabstractions(t_canvas *x) { ! canvas_each(y,x) if (pd_class(&y->_class) == canvas_class) { if (canvas_isabstraction((t_canvas *)y)) canvas_loadbang((t_canvas *)y); --- 809,813 ---- static void canvas_loadbangabstractions(t_canvas *x) { ! canvas_each(y,x) if (y->_class == canvas_class) { if (canvas_isabstraction((t_canvas *)y)) canvas_loadbang((t_canvas *)y); *************** *** 818,826 **** void canvas_loadbangsubpatches(t_canvas *x) { t_symbol *s = gensym("loadbang"); ! canvas_each(y,x) if (pd_class(&y->_class) == canvas_class) if (!canvas_isabstraction((t_canvas *)y)) canvas_loadbangsubpatches((t_canvas *)y); canvas_each(y,x) ! if ((pd_class(&y->_class) != canvas_class) && zgetfn(&y->_class, s)) pd_vmess(&y->_class, s, ""); } --- 819,827 ---- void canvas_loadbangsubpatches(t_canvas *x) { t_symbol *s = gensym("loadbang"); ! canvas_each(y,x) if (y->_class == canvas_class) if (!canvas_isabstraction((t_canvas *)y)) canvas_loadbangsubpatches((t_canvas *)y); canvas_each(y,x) ! if ((y->_class != canvas_class) && zgetfn(&y->_class, s)) pd_vmess(&y->_class, s, ""); } *************** *** 974,978 **** /* find all the "dsp" boxes and add them to the graph */ ! canvas_each(y,x) if ((ob = pd_checkobject(&y->_class)) && zgetfn(&y->_class, dspsym)) ugen_add(dc, ob); /* ... and all dsp interconnections */ --- 975,979 ---- /* find all the "dsp" boxes and add them to the graph */ ! canvas_each(y,x) if ((ob = pd_checkobject(y)) && zgetfn(&y->_class, dspsym)) ugen_add(dc, ob); /* ... and all dsp interconnections */ *************** *** 1090,1094 **** t_symbol *s1 = gensym("struct"); canvas_each(g,x) { ! t_object *ob = pd_checkobject(&g->_class); t_atom *argv; if (!ob || ob->te_type != T_OBJECT || binbuf_getnatom(ob->te_binbuf) < 2) continue; --- 1091,1095 ---- t_symbol *s1 = gensym("struct"); canvas_each(g,x) { ! t_object *ob = pd_checkobject(g); t_atom *argv; if (!ob || ob->te_type != T_OBJECT || binbuf_getnatom(ob->te_binbuf) < 2) continue; *************** *** 1161,1165 **** int i=0, nobj = canvas_getindex(gl, 0); /* number of objects */ for (t_gobj *g = gl->list; g && i < nobj; i++) { ! if (g != except && pd_class(&g->_class) == canvas_class && canvas_isabstraction((t_canvas *)g) && ((t_canvas *)g)->name == name && --- 1162,1166 ---- int i=0, nobj = canvas_getindex(gl, 0); /* number of objects */ for (t_gobj *g = gl->list; g && i < nobj; i++) { ! if (g != except && g->_class == canvas_class && canvas_isabstraction((t_canvas *)g) && ((t_canvas *)g)->name == name && *************** *** 1175,1179 **** if (!hadwindow) canvas_vis(canvas_getcanvas(gl), 0); } else { ! if (g != except && pd_class(&g->_class) == canvas_class) canvas_doreload((t_canvas *)g, name, dir, except); g = g->g_next; --- 1176,1180 ---- if (!hadwindow) canvas_vis(canvas_getcanvas(gl), 0); } else { ! if (g != except && g->_class == canvas_class) canvas_doreload((t_canvas *)g, name, dir, except); g = g->g_next; *************** *** 1211,1215 **** x->isgraph = 1; if (!nogoprect && !x->goprect) { ! canvas_each(g,x) if (pd_checkobject(&g->_class)) {x->goprect = 1; break;} } if (canvas_isvisible(x) && x->goprect) canvas_redraw(x); --- 1212,1216 ---- x->isgraph = 1; if (!nogoprect && !x->goprect) { ! canvas_each(g,x) if (pd_checkobject(g)) {x->goprect = 1; break;} } if (canvas_isvisible(x) && x->goprect) canvas_redraw(x); *************** *** 1270,1274 **** if (myindex1 >= canvas_find_index1) { canvas_each(y,x) { ! t_object *ob = pd_checkobject(&y->_class); if (ob && binbuf_match(ob->ob_binbuf, canvas_findbuf)) { if (myindex1 > canvas_find_index1 || --- 1271,1275 ---- if (myindex1 >= canvas_find_index1) { canvas_each(y,x) { ! t_object *ob = pd_checkobject(y); if (ob && binbuf_match(ob->ob_binbuf, canvas_findbuf)) { if (myindex1 > canvas_find_index1 || *************** *** 1285,1289 **** myindex2=0; canvas_each(y,x) { ! if (pd_class(&y->_class) == canvas_class) { (*myindex1p)++; if (canvas_dofind((t_canvas *)y, myindex1p)) return 1; --- 1286,1290 ---- myindex2=0; canvas_each(y,x) { ! if (y->_class == canvas_class) { (*myindex1p)++; if (canvas_dofind((t_canvas *)y, myindex1p)) return 1; *************** *** 1382,1386 **** static int is_dummy (t_text *x) { ! return pd_class((t_pd *)x)==text_class && x->te_type==T_OBJECT;} void canvas_connect(t_canvas *x, t_floatarg ffrom, t_floatarg foutlet, t_floatarg fto,t_floatarg finlet) { --- 1383,1387 ---- static int is_dummy (t_text *x) { ! return x->_class==text_class && x->te_type==T_OBJECT;} void canvas_connect(t_canvas *x, t_floatarg ffrom, t_floatarg foutlet, t_floatarg fto,t_floatarg finlet) { *************** *** 1393,1398 **** for (i=ifrom, gfrom=x->list; i>0; gfrom=gfrom->g_next, i--) if (!gfrom->g_next) goto bad; for (i=ito, gto =x->list; i>0; gto =gto ->g_next, i--) if (!gto ->g_next) goto bad; ! from = pd_checkobject((t_pd *)gfrom); ! to = pd_checkobject( (t_pd *)gto); if (!from || !to) goto bad; /* if object creation failed, make dummy inlets or outlets as needed */ --- 1394,1399 ---- for (i=ifrom, gfrom=x->list; i>0; gfrom=gfrom->g_next, i--) if (!gfrom->g_next) goto bad; for (i=ito, gto =x->list; i>0; gto =gto ->g_next, i--) if (!gto ->g_next) goto bad; ! from = pd_checkobject(gfrom); ! to = pd_checkobject( gto); if (!from || !to) goto bad; /* if object creation failed, make dummy inlets or outlets as needed */ *************** *** 1405,1410 **** bad: post("%s %d %d %d %d (%s->%s) connection failed", x->name->s_name,ifrom,outlet,ito,inlet, ! from ? class_getname(pd_class((t_pd *)from)) : "???", ! to ? class_getname(pd_class((t_pd *)to )) : "???"); } --- 1406,1411 ---- bad: post("%s %d %d %d %d (%s->%s) connection failed", x->name->s_name,ifrom,outlet,ito,inlet, ! from ? class_getname(from->_class) : "???", ! to ? class_getname( to->_class) : "???"); } *************** *** 1712,1716 **** x->listviewing = 1; sprintf(cmdbuf, "pdtk_array_listview_new %%s %s %d\n", x->realname->s_name, 0); ! gfxstub_new(&x->x_gobj._class, x, cmdbuf); for (int i=0; i < ARRAYPAGESIZE && i < a->n; i++) { yval = *(float *)(a->vec + elemsize*i + yonset); --- 1713,1717 ---- x->listviewing = 1; sprintf(cmdbuf, "pdtk_array_listview_new %%s %s %d\n", x->realname->s_name, 0); ! gfxstub_new((t_pd *)x, x, cmdbuf); for (int i=0; i < ARRAYPAGESIZE && i < a->n; i++) { yval = *(float *)(a->vec + elemsize*i + yonset); *************** *** 2294,2298 **** } gobj_changed(x,0); ! if (x->isgraph && !x->goprect && pd_checkobject(&y->_class)) { x->goprect = 1; canvas_drawredrect(x, 1); --- 2295,2299 ---- } gobj_changed(x,0); ! if (x->isgraph && !x->goprect && pd_checkobject(y)) { x->goprect = 1; canvas_drawredrect(x, 1); *************** *** 2333,2337 **** while ((y = x->list)) { /* to avoid unnecessary DSP resorting, we suspend DSP only if we find a DSP object. */ ! if (!suspended && pd_checkobject(&y->_class) && zgetfn(&y->_class, dspsym)) { dspstate = canvas_suspend_dsp(); suspended = 1; --- 2334,2338 ---- while ((y = x->list)) { /* to avoid unnecessary DSP resorting, we suspend DSP only if we find a DSP object. */ ! if (!suspended && pd_checkobject(y) && zgetfn(&y->_class, dspsym)) { dspstate = canvas_suspend_dsp(); suspended = 1;

1 0

pd/src m_pd.h, 1.4.4.11.2.29, 1.4.4.11.2.30 desire.c, 1.1.2.204, 1.1.2.205
by Mathieu Bouchard 28 Nov '06

28 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14749 Modified Files: Tag: devel_0_39 m_pd.h desire.c Log Message: g_pd becomes _class Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.29 retrieving revision 1.4.4.11.2.30 diff -C2 -d -r1.4.4.11.2.29 -r1.4.4.11.2.30 *** m_pd.h 27 Nov 2006 23:44:46 -0000 1.4.4.11.2.29 --- m_pd.h 28 Nov 2006 00:44:54 -0000 1.4.4.11.2.30 *************** *** 211,215 **** --- 211,220 ---- typedef struct _gobj /* a graphical object */ { + #ifdef PD_PLUSPLUS_FACE + #define g_pd _class + t_pd _class; /* pure datum header (class) */ + #else t_pd g_pd; /* pure datum header (class) */ + #endif #ifdef DESIRE /* g_next is moved out to keep ABI compat */ Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.204 retrieving revision 1.1.2.205 diff -C2 -d -r1.1.2.204 -r1.1.2.205 *** desire.c 27 Nov 2006 23:44:46 -0000 1.1.2.204 --- desire.c 28 Nov 2006 00:44:54 -0000 1.1.2.205 *************** *** 45,49 **** #define L printf("%s:%d\n",__FILE__,__LINE__); #define LS printf("%s:%d (self=%lx\n",__FILE__,__LINE__,(long)self);\ ! printf("class=%s)\n",((t_gobj *)self)->g_pd->c_name->s_name); */ /* no sys_vgui logging for MSVC... we have no vararg macros */ --- 45,49 ---- #define L printf("%s:%d\n",__FILE__,__LINE__); #define LS printf("%s:%d (self=%lx\n",__FILE__,__LINE__,(long)self);\ ! printf("class=%s)\n",((t_gobj *)self)->_class->c_name->s_name); */ /* no sys_vgui logging for MSVC... we have no vararg macros */ *************** *** 52,56 **** #define L printf("%s:%d in %s\n",__FILE__,__LINE__,__PRETTY_FUNCTION__); #define LS printf("%s:%d in %s (self=%lx\n",__FILE__,__LINE__,__PRETTY_FUNCTION__,(long)self);\ ! printf("class=%s)\n",((t_gobj *)self)->g_pd->c_name->s_name); /* --- 52,56 ---- #define L printf("%s:%d in %s\n",__FILE__,__LINE__,__PRETTY_FUNCTION__); #define LS printf("%s:%d in %s (self=%lx\n",__FILE__,__LINE__,__PRETTY_FUNCTION__,(long)self);\ ! printf("class=%s)\n",((t_gobj *)self)->_class->c_name->s_name); /* *************** *** 161,165 **** void gobj_changed (void *self_, const char *k) { t_gobj *self = (t_gobj *)self_; ! int dirty = k ? (1<<class_getfieldindex(self->g_pd,k)) : -1; t_atom argv[1]; SETFLOAT(argv,(float)dirty); --- 161,165 ---- void gobj_changed (void *self_, const char *k) { t_gobj *self = (t_gobj *)self_; ! int dirty = k ? (1<<class_getfieldindex(self->_class,k)) : -1; t_atom argv[1]; SETFLOAT(argv,(float)dirty); *************** *** 181,187 **** for (int i=0; i<d->nobs; i++) { t_gobj *obs = d->obs[i]; ! t_notice ice = obs->g_pd->c_notice; if (ice) ice(obs,origin,argc,argv); ! else post("null func ptr for class %s",self->g_pd->c_name->s_name); } } --- 181,187 ---- for (int i=0; i<d->nobs; i++) { t_gobj *obs = d->obs[i]; ! t_notice ice = obs->_class->c_notice; if (ice) ice(obs,origin,argc,argv); ! else post("null func ptr for class %s",self->_class->c_name->s_name); } } *************** *** 275,279 **** if (!o) continue; /* cancelled notice */ if (!o->g_adix->dirtyc) continue; ! /*post("UPLOADING a %s",o->g_pd->c_name->s_name);*/ pd_upload(o); o->g_adix->dirtyc = 0; --- 275,279 ---- if (!o) continue; /* cancelled notice */ if (!o->g_adix->dirtyc) continue; ! /*post("UPLOADING a %s",o->_class->c_name->s_name);*/ pd_upload(o); o->g_adix->dirtyc = 0; *************** *** 457,461 **** t_object *ob = 0; t_gobj *y = t->from ? t->from->g_next : t->canvas->list; ! for (; y; y = y->g_next) if ((ob = pd_checkobject(&y->g_pd))) break; if (!ob) return 0; t->from = ob; --- 457,461 ---- t_object *ob = 0; t_gobj *y = t->from ? t->from->g_next : t->canvas->list; ! for (; y; y = y->g_next) if ((ob = pd_checkobject(&y->_class))) break; if (!ob) return 0; t->from = ob; *************** *** 808,812 **** static void canvas_loadbangabstractions(t_canvas *x) { ! canvas_each(y,x) if (pd_class(&y->g_pd) == canvas_class) { if (canvas_isabstraction((t_canvas *)y)) canvas_loadbang((t_canvas *)y); --- 808,812 ---- static void canvas_loadbangabstractions(t_canvas *x) { ! canvas_each(y,x) if (pd_class(&y->_class) == canvas_class) { if (canvas_isabstraction((t_canvas *)y)) canvas_loadbang((t_canvas *)y); *************** *** 818,827 **** void canvas_loadbangsubpatches(t_canvas *x) { t_symbol *s = gensym("loadbang"); ! canvas_each(y,x) if (pd_class(&y->g_pd) == canvas_class) if (!canvas_isabstraction((t_canvas *)y)) canvas_loadbangsubpatches((t_canvas *)y); canvas_each(y,x) ! if ((pd_class(&y->g_pd) != canvas_class) && zgetfn(&y->g_pd, s)) ! pd_vmess(&y->g_pd, s, ""); } --- 818,827 ---- void canvas_loadbangsubpatches(t_canvas *x) { t_symbol *s = gensym("loadbang"); ! canvas_each(y,x) if (pd_class(&y->_class) == canvas_class) if (!canvas_isabstraction((t_canvas *)y)) canvas_loadbangsubpatches((t_canvas *)y); canvas_each(y,x) ! if ((pd_class(&y->_class) != canvas_class) && zgetfn(&y->_class, s)) ! pd_vmess(&y->_class, s, ""); } *************** *** 974,978 **** /* find all the "dsp" boxes and add them to the graph */ ! canvas_each(y,x) if ((ob = pd_checkobject(&y->g_pd)) && zgetfn(&y->g_pd, dspsym)) ugen_add(dc, ob); /* ... and all dsp interconnections */ --- 974,978 ---- /* find all the "dsp" boxes and add them to the graph */ ! canvas_each(y,x) if ((ob = pd_checkobject(&y->_class)) && zgetfn(&y->_class, dspsym)) ugen_add(dc, ob); /* ... and all dsp interconnections */ *************** *** 1041,1045 **** t_canvas *canvas = *canvasp; void *ret = 0; ! canvas_each(g,canvas) if (g->g_pd == blockclass) ret = g; *canvasp = canvas->owner; return ret; --- 1041,1045 ---- t_canvas *canvas = *canvasp; void *ret = 0; ! canvas_each(g,canvas) if (g->_class == blockclass) ret = g; *canvasp = canvas->owner; return ret; *************** *** 1072,1080 **** int vis = canvas_isvisible(gl); canvas_each(g,gl) { ! if (vis && g->g_pd == scalar_class) { if (action == 1) {/*if (canvas_isvisible(gl)) gobj_vis(g, gl, 1);*/} else if (action == 2) {/*if (canvas_isvisible(gl)) gobj_vis(g, gl, 0);*/} else scalar_redraw((t_scalar *)g, gl); ! } else if (g->g_pd == canvas_class) canvas_redrawall((t_canvas *)g, action); } } --- 1072,1080 ---- int vis = canvas_isvisible(gl); canvas_each(g,gl) { ! if (vis && g->_class == scalar_class) { if (action == 1) {/*if (canvas_isvisible(gl)) gobj_vis(g, gl, 1);*/} else if (action == 2) {/*if (canvas_isvisible(gl)) gobj_vis(g, gl, 0);*/} else scalar_redraw((t_scalar *)g, gl); ! } else if (g->_class == canvas_class) canvas_redrawall((t_canvas *)g, action); } } *************** *** 1090,1094 **** t_symbol *s1 = gensym("struct"); canvas_each(g,x) { ! t_object *ob = pd_checkobject(&g->g_pd); t_atom *argv; if (!ob || ob->te_type != T_OBJECT || binbuf_getnatom(ob->te_binbuf) < 2) continue; --- 1090,1094 ---- t_symbol *s1 = gensym("struct"); canvas_each(g,x) { ! t_object *ob = pd_checkobject(&g->_class); t_atom *argv; if (!ob || ob->te_type != T_OBJECT || binbuf_getnatom(ob->te_binbuf) < 2) continue; *************** *** 1161,1165 **** int i=0, nobj = canvas_getindex(gl, 0); /* number of objects */ for (t_gobj *g = gl->list; g && i < nobj; i++) { ! if (g != except && pd_class(&g->g_pd) == canvas_class && canvas_isabstraction((t_canvas *)g) && ((t_canvas *)g)->name == name && --- 1161,1165 ---- int i=0, nobj = canvas_getindex(gl, 0); /* number of objects */ for (t_gobj *g = gl->list; g && i < nobj; i++) { ! if (g != except && pd_class(&g->_class) == canvas_class && canvas_isabstraction((t_canvas *)g) && ((t_canvas *)g)->name == name && *************** *** 1175,1179 **** if (!hadwindow) canvas_vis(canvas_getcanvas(gl), 0); } else { ! if (g != except && pd_class(&g->g_pd) == canvas_class) canvas_doreload((t_canvas *)g, name, dir, except); g = g->g_next; --- 1175,1179 ---- if (!hadwindow) canvas_vis(canvas_getcanvas(gl), 0); } else { ! if (g != except && pd_class(&g->_class) == canvas_class) canvas_doreload((t_canvas *)g, name, dir, except); g = g->g_next; *************** *** 1211,1215 **** x->isgraph = 1; if (!nogoprect && !x->goprect) { ! canvas_each(g,x) if (pd_checkobject(&g->g_pd)) {x->goprect = 1; break;} } if (canvas_isvisible(x) && x->goprect) canvas_redraw(x); --- 1211,1215 ---- x->isgraph = 1; if (!nogoprect && !x->goprect) { ! canvas_each(g,x) if (pd_checkobject(&g->_class)) {x->goprect = 1; break;} } if (canvas_isvisible(x) && x->goprect) canvas_redraw(x); *************** *** 1270,1274 **** if (myindex1 >= canvas_find_index1) { canvas_each(y,x) { ! t_object *ob = pd_checkobject(&y->g_pd); if (ob && binbuf_match(ob->ob_binbuf, canvas_findbuf)) { if (myindex1 > canvas_find_index1 || --- 1270,1274 ---- if (myindex1 >= canvas_find_index1) { canvas_each(y,x) { ! t_object *ob = pd_checkobject(&y->_class); if (ob && binbuf_match(ob->ob_binbuf, canvas_findbuf)) { if (myindex1 > canvas_find_index1 || *************** *** 1285,1289 **** myindex2=0; canvas_each(y,x) { ! if (pd_class(&y->g_pd) == canvas_class) { (*myindex1p)++; if (canvas_dofind((t_canvas *)y, myindex1p)) return 1; --- 1285,1289 ---- myindex2=0; canvas_each(y,x) { ! if (pd_class(&y->_class) == canvas_class) { (*myindex1p)++; if (canvas_dofind((t_canvas *)y, myindex1p)) return 1; *************** *** 1334,1338 **** return 1; } ! else if (g->g_pd == canvas_class) { if (canvas_dofinderror((t_canvas *)g, error_object)) return 1; } --- 1334,1338 ---- return 1; } ! else if (g->_class == canvas_class) { if (canvas_dofinderror((t_canvas *)g, error_object)) return 1; } *************** *** 1643,1647 **** static t_canvas *canvas_findgraph(t_canvas *x) { t_gobj *y = 0; ! canvas_each(z,x) if (pd_class(&z->g_pd) == canvas_class && ((t_canvas *)z)->isgraph) y = z; return (t_canvas *)y; } --- 1643,1647 ---- static t_canvas *canvas_findgraph(t_canvas *x) { t_gobj *y = 0; ! canvas_each(z,x) if (pd_class(&z->_class) == canvas_class && ((t_canvas *)z)->isgraph) y = z; return (t_canvas *)y; } *************** *** 1712,1716 **** x->listviewing = 1; sprintf(cmdbuf, "pdtk_array_listview_new %%s %s %d\n", x->realname->s_name, 0); ! gfxstub_new(&x->x_gobj.g_pd, x, cmdbuf); for (int i=0; i < ARRAYPAGESIZE && i < a->n; i++) { yval = *(float *)(a->vec + elemsize*i + yonset); --- 1712,1716 ---- x->listviewing = 1; sprintf(cmdbuf, "pdtk_array_listview_new %%s %s %d\n", x->realname->s_name, 0); ! gfxstub_new(&x->x_gobj._class, x, cmdbuf); for (int i=0; i < ARRAYPAGESIZE && i < a->n; i++) { yval = *(float *)(a->vec + elemsize*i + yonset); *************** *** 2254,2259 **** void canvas_add(t_canvas *x, t_gobj *y) { #ifdef DEBUG_CANVAS_ADD ! if (!y->g_pd->c_patchable) { ! printf("canvas_add %p %p class=%s (non-t_text)\n",x,y,y->g_pd->c_name->s_name); } else { char *buf; int bufn; --- 2254,2259 ---- void canvas_add(t_canvas *x, t_gobj *y) { #ifdef DEBUG_CANVAS_ADD ! if (!y->_class->c_patchable) { ! printf("canvas_add %p %p class=%s (non-t_text)\n",x,y,y->_class->c_name->s_name); } else { char *buf; int bufn; *************** *** 2264,2268 **** free(buf); } else { ! printf("canvas_add %p %p class=%s (binbuf without b_vec !)\n",x,y,y->g_pd->c_name->s_name); } } --- 2264,2268 ---- free(buf); } else { ! printf("canvas_add %p %p class=%s (binbuf without b_vec !)\n",x,y,y->_class->c_name->s_name); } } *************** *** 2294,2302 **** } gobj_changed(x,0); ! if (x->isgraph && !x->goprect && pd_checkobject(&y->g_pd)) { x->goprect = 1; canvas_drawredrect(x, 1); } ! if (class_isdrawcommand(y->g_pd)) canvas_redrawallfortemplate(template_findbyname(canvas_makebindsym(canvas_getcanvas(x)->name)), 0); } --- 2294,2302 ---- } gobj_changed(x,0); ! if (x->isgraph && !x->goprect && pd_checkobject(&y->_class)) { x->goprect = 1; canvas_drawredrect(x, 1); } ! if (class_isdrawcommand(y->_class)) canvas_redrawallfortemplate(template_findbyname(canvas_makebindsym(canvas_getcanvas(x)->name)), 0); } *************** *** 2304,2309 **** /* delete an object from a canvas and free it */ void canvas_delete(t_canvas *x, t_gobj *y) { ! t_gotfn chkdsp = zgetfn(&y->g_pd, gensym("dsp")); ! int drawcommand = class_isdrawcommand(y->g_pd); /* if we're a drawing command, erase all scalars now, before deleting --- 2304,2309 ---- /* delete an object from a canvas and free it */ void canvas_delete(t_canvas *x, t_gobj *y) { ! t_gotfn chkdsp = zgetfn(&y->_class, gensym("dsp")); ! int drawcommand = class_isdrawcommand(y->_class); /* if we're a drawing command, erase all scalars now, before deleting *************** *** 2333,2337 **** while ((y = x->list)) { /* to avoid unnecessary DSP resorting, we suspend DSP only if we find a DSP object. */ ! if (!suspended && pd_checkobject(&y->g_pd) && zgetfn(&y->g_pd, dspsym)) { dspstate = canvas_suspend_dsp(); suspended = 1; --- 2333,2337 ---- while ((y = x->list)) { /* to avoid unnecessary DSP resorting, we suspend DSP only if we find a DSP object. */ ! if (!suspended && pd_checkobject(&y->_class) && zgetfn(&y->_class, dspsym)) { dspstate = canvas_suspend_dsp(); suspended = 1; *************** *** 2350,2354 **** static float gobj_getxforsort(t_gobj *g) { ! if (pd_class(&g->g_pd) == scalar_class) { float x1, y1; scalar_getbasexy((t_scalar *)g, &x1, &y1); --- 2350,2354 ---- static float gobj_getxforsort(t_gobj *g) { ! if (pd_class(&g->_class) == scalar_class) { float x1, y1; scalar_getbasexy((t_scalar *)g, &x1, &y1); *************** *** 2432,2439 **** int n=0, j, xmax, x1; t_gobj *y, **vec, **vp, **maxp; ! canvas_each(y,x) if (pd_class(&y->g_pd) == vinlet_class) n++; if (n<2) return; vp = vec = (t_gobj **)getbytes(n*sizeof(*vec)); ! canvas_each(y,x) if (pd_class(&y->g_pd) == vinlet_class) *vp++ = y; for (int i=n; i--;) { t_inlet *ip; --- 2432,2439 ---- int n=0, j, xmax, x1; t_gobj *y, **vec, **vp, **maxp; ! canvas_each(y,x) if (pd_class(&y->_class) == vinlet_class) n++; if (n<2) return; vp = vec = (t_gobj **)getbytes(n*sizeof(*vec)); ! canvas_each(y,x) if (pd_class(&y->_class) == vinlet_class) *vp++ = y; for (int i=n; i--;) { t_inlet *ip; *************** *** 2445,2449 **** if (!maxp) break; y = *maxp; *maxp = 0; ! ip = vinlet_getit(&y->g_pd); obj_moveinletfirst(&x->gl_obj, ip); } --- 2445,2449 ---- if (!maxp) break; y = *maxp; *maxp = 0; ! ip = vinlet_getit(&y->_class); obj_moveinletfirst(&x->gl_obj, ip); } *************** *** 2453,2460 **** int n=0, j, xmax, x1; t_gobj *y, **vec, **vp, **maxp; ! canvas_each(y,x) if (pd_class(&y->g_pd) == voutlet_class) n++; if (n<2) return; vp = vec = (t_gobj **)getbytes(n*sizeof(*vec)); ! canvas_each(y,x) if (pd_class(&y->g_pd) == voutlet_class) *vp++ = y; for (int i=n; i--;) { t_outlet *ip; --- 2453,2460 ---- int n=0, j, xmax, x1; t_gobj *y, **vec, **vp, **maxp; ! canvas_each(y,x) if (pd_class(&y->_class) == voutlet_class) n++; if (n<2) return; vp = vec = (t_gobj **)getbytes(n*sizeof(*vec)); ! canvas_each(y,x) if (pd_class(&y->_class) == voutlet_class) *vp++ = y; for (int i=n; i--;) { t_outlet *ip; *************** *** 2466,2470 **** if (!maxp) break; y = *maxp; *maxp = 0; ! ip = voutlet_getit(&y->g_pd); obj_moveoutletfirst(&x->gl_obj, ip); } --- 2466,2470 ---- if (!maxp) break; y = *maxp; *maxp = 0; ! ip = voutlet_getit(&y->_class); obj_moveoutletfirst(&x->gl_obj, ip); } *************** *** 2598,2602 **** /* if there's just one "garray" in the graph, write its name along the top */ g = x->list; ! if (g && !g->g_next && g->g_pd == garray_class) { int ymin = y1<y2 ? y1 : y2; t_symbol *s = garray_getname((t_garray *)g); --- 2598,2602 ---- /* if there's just one "garray" in the graph, write its name along the top */ g = x->list; ! if (g && !g->g_next && g->_class == garray_class) { int ymin = y1<y2 ? y1 : y2; t_symbol *s = garray_getname((t_garray *)g); *************** *** 3052,3056 **** static void canvas_writelist(t_gobj *y, t_binbuf *b) { for (; y; y = y->g_next) ! if (pd_class(&y->g_pd) == scalar_class) canvas_writescalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, b, 0); } --- 3052,3056 ---- static void canvas_writelist(t_gobj *y, t_binbuf *b) { for (; y; y = y->g_next) ! if (pd_class(&y->_class) == scalar_class) canvas_writescalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, b, 0); } *************** *** 3081,3085 **** static void canvas_addtemplatesforlist(t_gobj *y, int *p_ntemplates, t_symbol ***p_templatevec) { for (; y; y = y->g_next) ! if (pd_class(&y->g_pd) == scalar_class) canvas_addtemplatesforscalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, p_ntemplates, p_templatevec); --- 3081,3085 ---- static void canvas_addtemplatesforlist(t_gobj *y, int *p_ntemplates, t_symbol ***p_templatevec) { for (; y; y = y->g_next) ! if (pd_class(&y->_class) == scalar_class) canvas_addtemplatesforscalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, p_ntemplates, p_templatevec); *************** *** 3090,3094 **** int ntemplates = 0; t_binbuf *b = binbuf_new(); ! canvas_each(y,x) if ((pd_class(&y->g_pd) == scalar_class) && wholething) { t_scalar *s = (t_scalar *)y; canvas_addtemplatesforscalar(s->sc_template, s->sc_vec, &ntemplates, &templatevec); --- 3090,3094 ---- int ntemplates = 0; t_binbuf *b = binbuf_new(); ! canvas_each(y,x) if ((pd_class(&y->_class) == scalar_class) && wholething) { t_scalar *s = (t_scalar *)y; canvas_addtemplatesforscalar(s->sc_template, s->sc_vec, &ntemplates, &templatevec); *************** *** 3118,3122 **** /* now write out the objects themselves */ canvas_each(y,x) ! if (pd_class(&y->g_pd) == scalar_class && wholething) canvas_writescalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, b, 0); return b; --- 3118,3122 ---- /* now write out the objects themselves */ canvas_each(y,x) ! if (pd_class(&y->_class) == scalar_class && wholething) canvas_writescalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, b, 0); return b; *************** *** 3183,3190 **** t_symbol ***templatevecp, int wholething) { canvas_each(y,x) { ! if (pd_class(&y->g_pd) == scalar_class && wholething) canvas_addtemplatesforscalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, ntemplatesp, templatevecp); ! else if (pd_class(&y->g_pd) == canvas_class && wholething) canvas_collecttemplatesfor((t_canvas *)y, ntemplatesp, templatevecp, 1); } --- 3183,3190 ---- t_symbol ***templatevecp, int wholething) { canvas_each(y,x) { ! if (pd_class(&y->_class) == scalar_class && wholething) canvas_addtemplatesforscalar(((t_scalar *)y)->sc_template, ((t_scalar *)y)->sc_vec, ntemplatesp, templatevecp); ! else if (pd_class(&y->_class) == canvas_class && wholething) canvas_collecttemplatesfor((t_canvas *)y, ntemplatesp, templatevecp, 1); } *************** *** 3803,3807 **** TEMPLATE_CHECK(owner,templatesym,0) t_scalar *x = (t_scalar *)getbytes(sizeof(t_scalar) + (t->n - 1) * sizeof(*x->sc_vec)); ! x->sc_gobj.g_pd = scalar_class; x->sc_template = templatesym; gpointer_setcanvas(&gp, owner, x); --- 3803,3807 ---- TEMPLATE_CHECK(owner,templatesym,0) t_scalar *x = (t_scalar *)getbytes(sizeof(t_scalar) + (t->n - 1) * sizeof(*x->sc_vec)); ! x->sc_gobj._class = scalar_class; x->sc_template = templatesym; gpointer_setcanvas(&gp, owner, x); *************** *** 3870,3874 **** } canvas_each(y,templatecanvas) { ! t_parentwidgetbehavior *wb = pd_getparentwidget(&y->g_pd); if (wb) wb->w_parentvisfn(y, owner, x->sc_vec, t, basex, basey, vis); } --- 3870,3874 ---- } canvas_each(y,templatecanvas) { ! t_parentwidgetbehavior *wb = pd_getparentwidget(&y->_class); if (wb) wb->w_parentvisfn(y, owner, x->sc_vec, t, basex, basey, vis); } *************** *** 3892,3896 **** float basey = template_getfloat(t, gensym("y"), data, 0); canvas_each(y,templatecanvas) { ! t_parentwidgetbehavior *wb = pd_getparentwidget(&y->g_pd); if (!wb) continue; hit = wb->w_parentclickfn(y, owner, data, t, sc, ap, basex+xloc, basey+yloc, --- 3892,3896 ---- float basey = template_getfloat(t, gensym("y"), data, 0); canvas_each(y,templatecanvas) { ! t_parentwidgetbehavior *wb = pd_getparentwidget(&y->_class); if (!wb) continue; hit = wb->w_parentclickfn(y, owner, data, t, sc, ap, basex+xloc, basey+yloc, *************** *** 4131,4135 **** gpointer_init(&gp); x = (t_scalar *)getbytes(sizeof(t_scalar) + (tto->n - 1) * sizeof(*x->sc_vec)); ! x->sc_gobj.g_pd = scalar_class; x->sc_template = tfrom->sym; gpointer_setcanvas(&gp, canvas, x); --- 4131,4135 ---- gpointer_init(&gp); x = (t_scalar *)getbytes(sizeof(t_scalar) + (tto->n - 1) * sizeof(*x->sc_vec)); ! x->sc_gobj._class = scalar_class; x->sc_template = tfrom->sym; gpointer_setcanvas(&gp, canvas, x); *************** *** 4203,4207 **** static void template_conformcanvas(t_template *tfrom, t_template *tto, int *conformaction, t_canvas *canvas) { canvas_each(g,canvas) { ! t_class *c = pd_class(&g->g_pd); if (c==scalar_class) g = (t_gobj *)template_conformscalar(tfrom, tto, conformaction, canvas, (t_scalar *)g); --- 4203,4207 ---- static void template_conformcanvas(t_template *tfrom, t_template *tto, int *conformaction, t_canvas *canvas) { canvas_each(g,canvas) { ! t_class *c = pd_class(&g->_class); if (c==scalar_class) g = (t_gobj *)template_conformscalar(tfrom, tto, conformaction, canvas, (t_scalar *)g); *************** *** 4910,4914 **** canvas_each(y,elemtemplatecanvas) { int xx1, xx2, yy1, yy2; ! t_parentwidgetbehavior *wb = pd_getparentwidget(&y->g_pd); if (!wb) continue; wb->w_parentgetrectfn(y, canvas, (t_word *)((char *)array->vec + elemsize*i), --- 4910,4914 ---- canvas_each(y,elemtemplatecanvas) { int xx1, xx2, yy1, yy2; ! t_parentwidgetbehavior *wb = pd_getparentwidget(&y->_class); if (!wb) continue; wb->w_parentgetrectfn(y, canvas, (t_word *)((char *)array->vec + elemsize*i), *************** *** 5071,5075 **** useyloc = basey + yloc + slot_cvttocoord(yslot, yval); canvas_each(y,elemtemplatecanvas) { ! t_parentwidgetbehavior *wb = pd_getparentwidget(&y->g_pd); if (wb) wb->w_parentvisfn(y, canvas, (t_word *)(elem+elemsize*i), elemtemplate, usexloc, useyloc, tovis); --- 5071,5075 ---- useyloc = basey + yloc + slot_cvttocoord(yslot, yval); canvas_each(y,elemtemplatecanvas) { ! t_parentwidgetbehavior *wb = pd_getparentwidget(&y->_class); if (wb) wb->w_parentvisfn(y, canvas, (t_word *)(elem+elemsize*i), elemtemplate, usexloc, useyloc, tovis); *************** *** 5082,5086 **** for (int i=0; i<nelem; i++) { canvas_each(y,elemtemplatecanvas) { ! t_parentwidgetbehavior *wb = pd_getparentwidget(&y->g_pd); if (wb) wb->w_parentvisfn(y, canvas, (t_word *)(elem+elemsize*i), elemtemplate,0,0,0); } --- 5082,5086 ---- for (int i=0; i<nelem; i++) { canvas_each(y,elemtemplatecanvas) { ! t_parentwidgetbehavior *wb = pd_getparentwidget(&y->_class); if (wb) wb->w_parentvisfn(y, canvas, (t_word *)(elem+elemsize*i), elemtemplate,0,0,0); } *************** *** 5428,5432 **** if (!gobj) gobj = canvas->list; else gobj = gobj->g_next; ! while (gobj && (pd_class(&gobj->g_pd) != scalar_class || wantselected)) gobj = gobj->g_next; if (gobj) { t_typedout *to = x->typedout; --- 5428,5432 ---- if (!gobj) gobj = canvas->list; else gobj = gobj->g_next; ! while (gobj && (pd_class(&gobj->_class) != scalar_class || wantselected)) gobj = gobj->g_next; if (gobj) { t_typedout *to = x->typedout; *************** *** 6680,6684 **** void pd_upload(t_gobj *self) { t_binbuf *b = binbuf_new(); ! t_class *c = self->g_pd; int n; char *s; --- 6680,6684 ---- void pd_upload(t_gobj *self) { t_binbuf *b = binbuf_new(); ! t_class *c = self->_class; int n; char *s;

1 0

pd/src TODO,1.1.2.25,1.1.2.26
by Mathieu Bouchard 28 Nov '06

28 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11702 Modified Files: Tag: devel_0_39 TODO Log Message: . Index: TODO =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/TODO,v retrieving revision 1.1.2.25 retrieving revision 1.1.2.26 diff -C2 -d -r1.1.2.25 -r1.1.2.26 *** TODO 27 Nov 2006 22:51:50 -0000 1.1.2.25 --- TODO 28 Nov 2006 00:36:51 -0000 1.1.2.26 *************** *** 104,127 **** [ ] try libentity [ ] try vtk-tcl - - [ ] symbol vs strings: Ruby is right: the Symbol vs String distinction is annoying and possibly obsolete. - according to me, symbols exist mostly because LISP had them before they had strings, and because most - Strings implementations aren't powerful enough to be as fast (or almost as fast) as Symbols. - (well, for compatibility reasons, just like in Ruby, we can't remove symbol support completely, but - at least we can reduce the difference between strings and symbols to a minimum.) - - [ ] server-side IEMGUI could be turned into Tcl-based externs OR EVEN become abstractions. - it's possible to make a DesireData GUI for any Pd class, including abstractions. - to turn IEMGUI into an abstraction, what's missing is the savefn/saveargs/scanargs business. - - [ ] I would like to know how much it is feasible to compress the t_atom - structure so that even with 64-bit pointers the t_atom still stays 8 bytes - instead of 16. I think it's possible, but not necessarily in a - backwards-compatible way, and not necessarily in a portable way. also maybe it's not that useful. - - 07:24 <matju> however we could make it different by inserting the splashscreen inside the main window - 07:25 <matju> or we could make it a separate window but no timer, just an [OK] button, so actually, this would be - exactly the same as the "About" dialog. - [ ] make sure $0 actually works (see canvas_realizedollar) [ ] test rcv_able, snd_able --- 104,107 ---- *************** *** 162,190 **** [ ] insert_object makes error with multiple selection. [ ] popup_properties on multiple selection. ! [ ] ! ! <zkink> as well as select multiple wires, or multiple objects, and color code them ! <zkink> if you do segmented patchchords, it needs some functions: ! <zkink> a hotkey to click on the chord, and add a new segment ! <zkink> a hotkey to drag the "points" (where two lines meet) ! <zkink> a modifier key to delete a segment (actually the others should be that way too) ! <zkink> and: you should be able to right click on a regular patchchord, and press "segment" ! <zkink> or do a hotkey with it ! <zkink> and it automatically turns it into an straight-elbow multisegmented chord ! <zkink> like _| instead of / ! <zkink> it makes it into three lines: _|~ ! [ ] [t a] could be a very small GUI object (called "null object") [ ] all the [t] could be GUI objects [ ] GUI objects for [inlet] and [outlet] and [pd] ([page]) - <zkink> PERHAPS, a hack for multisegmented patchchords, would be to make a null object - <zkink> a null object is an actual object that just looks like a . - <zkink> and wires can connect to it - <zkink> next: SUBPATCHERIZE SELECTION. you select a number of objects with your mouse - <zkink> and you right click and press subpatcherize - <zkink> it puts all the objects you have selected into a subpatcher, and it automatically wires up INLETS/outlets - <zkink> so that the code is exactly the same, its just in a subpatcher instead - <zkink> after the subpatcher is created, it leaves you with a new object, with the text focus waiting for you to type its name <zkink> next: move ALL functions from the command line into a Options box. <zkink> options box should save a PD config file --- 142,176 ---- [ ] insert_object makes error with multiple selection. [ ] popup_properties on multiple selection. ! [ ] segmented patchcords: ! [ ] a hotkey to click on the cord, and add a new segment ! [ ] a hotkey to drag the "points" (where two lines meet) ! [ ] a modifier key to delete a segment (actually the others should be that way too) ! [ ] you should be able to right click on a regular wire, and press "segment" or do a hotkey with it ! and it automatically turns it into an straight-elbow multisegmented wire [ ] [t a] could be a very small GUI object (called "null object") [ ] all the [t] could be GUI objects [ ] GUI objects for [inlet] and [outlet] and [pd] ([page]) + [ ] subpatcherize selection + <zkink> after it's created, it leaves you with a new object, with the text focus waiting for you to type its name + + [ ] symbol vs strings: Ruby is right: the Symbol vs String distinction is annoying and possibly obsolete. + according to me, symbols exist mostly because LISP had them before they had strings, and because most + Strings implementations aren't powerful enough to be as fast (or almost as fast) as Symbols. + (well, for compatibility reasons, just like in Ruby, we can't remove symbol support completely, but + at least we can reduce the difference between strings and symbols to a minimum.) + + [ ] server-side IEMGUI could be turned into Tcl-based externs OR EVEN become abstractions. + it's possible to make a DesireData GUI for any Pd class, including abstractions. + to turn IEMGUI into an abstraction, what's missing is the savefn/saveargs/scanargs business. + + [ ] I would like to know how much it is feasible to compress the t_atom + structure so that even with 64-bit pointers the t_atom still stays 8 bytes + instead of 16. I think it's possible, but not necessarily in a + backwards-compatible way, and not necessarily in a portable way. also maybe it's not that useful. + + 07:24 <matju> however we could make it different by inserting the splashscreen inside the main window + 07:25 <matju> or we could make it a separate window but no timer, just an [OK] button, so actually, this would be + exactly the same as the "About" dialog. <zkink> next: move ALL functions from the command line into a Options box. <zkink> options box should save a PD config file *************** *** 194,230 **** <matju> the NULL object looks like jMax's [fork] except with only one outlet <matju> or almost like [t a] ! <zkink> that would work as a makeshift plan for multisegmented chords <matju> except [t a] is more like "list $1" and converts scalars into 1-element lists (yuck) <zkink> since its compatible with the current pd fileformat <zkink> it can be tiny: 3 pixels by 3 pixels <zkink> just a little DOT ! <zkink> OK, now as I was saying ! <zkink> data inspector: ! <zkink> when this tool is enabled, it prints on the console any data coming through whatever cable you currently have selected ! <zkink> and if you select multiple chords ! <zkink> it reports whats going through multiple chords ! <matju> zkink: well, actually, segmented patchcords are compatible with the .pd format. try adding stuff in a #X connect line, before the semicolon ! <matju> zkink: (it's just that Pd doesn't save that stuff back...) ! <zkink> so: example ! <zkink> SNIFFER: list: 10 10 10 1 66 ! <zkink> SNIFFER: int: 4 ! <zkink> SNIFFER: message: boop ! <zkink> SNIFFER: bang ! <matju> data inspector looks like a jMax [display] but a bit like the console too, right? ! <zkink> well i'm not sure, i should install Jmax ! <matju> a kind of [print] but to a miniconsole? ! <zkink> well, its just a toggle, you toggle it ON/Off ! <zkink> when its ON, it reports whats going through ANY patchchord you have "highlighted" ! <matju> [display] is roughly like [prepend set] -> "" ! <matju> where "" is an empty message box ! <zkink> well, print isnt good enough, it doesnt tell you the data type ! <matju> and [prepend] is from zexy or cyclone... ! <matju> you mean the selector? ! <zkink> selector ? wozzat ! <matju> selector is the message header ! <zkink> sorry i'm not sure what you mean, i've been using max ! <matju> sorry i'm not sure what you mean, i've been using jmax ! <zkink> selector is just the datatype ? before the message? in the packet ! <zkink> yeah, it would report that. it just tells you whats goin thru lines <zkink> next: you need a way to see cpu usage on individual objects <zkink> or on patchers or on groups of selected objects --- 180,193 ---- <matju> the NULL object looks like jMax's [fork] except with only one outlet <matju> or almost like [t a] ! <zkink> that would work as a makeshift plan for multisegmented wires <matju> except [t a] is more like "list $1" and converts scalars into 1-element lists (yuck) <zkink> since its compatible with the current pd fileformat <zkink> it can be tiny: 3 pixels by 3 pixels <zkink> just a little DOT ! ! [ ] data inspector: when this tool is enabled, it prints on the console any data coming through whatever cable you ! currently have selected. if you select multiple wires, it reports whats going through multiple wires. ! [ ] put [display] directly in DesireData ! <zkink> next: you need a way to see cpu usage on individual objects <zkink> or on patchers or on groups of selected objects

1 0

pd/src m_pd.h, 1.4.4.11.2.28, 1.4.4.11.2.29 desire.c, 1.1.2.203, 1.1.2.204
by Mathieu Bouchard 28 Nov '06

28 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24939 Modified Files: Tag: devel_0_39 m_pd.h desire.c Log Message: introducing PD_PLUSPLUS_FACE, for enabling a more C++-friendly mode in <m_pd.h> Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.28 retrieving revision 1.4.4.11.2.29 diff -C2 -d -r1.4.4.11.2.28 -r1.4.4.11.2.29 *** m_pd.h 23 Nov 2006 21:02:35 -0000 1.4.4.11.2.28 --- m_pd.h 27 Nov 2006 23:44:46 -0000 1.4.4.11.2.29 *************** *** 228,234 **** --- 228,238 ---- } t_scalar; + #ifdef PD_PLUSPLUS_FACE + typedef struct t_text : t_gobj { + #else typedef struct _text /* patchable object - graphical, with text */ { t_gobj te_g; /* header for graphical object */ + #endif t_binbuf *te_binbuf; /* holder for the text */ t_outlet *te_outlet; /* linked list of outlets */ *************** *** 238,242 **** short te_width; /* requested width in chars, 0 if auto */ unsigned int te_type:2; /* from defs below */ ! } t_text; #define T_TEXT 0 /* just a textual comment */ --- 242,247 ---- short te_width; /* requested width in chars, 0 if auto */ unsigned int te_type:2; /* from defs below */ ! /* t_object is synonym for t_text (LATER unify them) */ ! } t_text, t_object; #define T_TEXT 0 /* just a textual comment */ *************** *** 245,258 **** #define T_ATOM 3 /* a cell to display a number or symbol */ - #define te_pd te_g.g_pd - - /* t_object is synonym for t_text (LATER unify them) */ - - typedef struct _text t_object; - #define ob_outlet te_outlet #define ob_inlet te_inlet #define ob_binbuf te_binbuf #define ob_pd te_g.g_pd #define ob_g te_g --- 250,263 ---- #define T_ATOM 3 /* a cell to display a number or symbol */ #define ob_outlet te_outlet #define ob_inlet te_inlet #define ob_binbuf te_binbuf + #ifdef PD_PLUSPLUS_FACE + #define te_pd g_pd + #define ob_pd g_pd + #else + #define te_pd te_g.g_pd #define ob_pd te_g.g_pd + #endif #define ob_g te_g Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.203 retrieving revision 1.1.2.204 diff -C2 -d -r1.1.2.203 -r1.1.2.204 *** desire.c 27 Nov 2006 23:23:24 -0000 1.1.2.203 --- desire.c 27 Nov 2006 23:44:46 -0000 1.1.2.204 *************** *** 12,15 **** --- 12,16 ---- */ + #define PD_PLUSPLUS_FACE #include "m_pd.h" #include "desire.h" *************** *** 455,459 **** while (outno == t->nout) { t_object *ob = 0; ! t_gobj *y = t->from ? t->from->ob_g.g_next : t->canvas->list; for (; y; y = y->g_next) if ((ob = pd_checkobject(&y->g_pd))) break; if (!ob) return 0; --- 456,460 ---- while (outno == t->nout) { t_object *ob = 0; ! t_gobj *y = t->from ? t->from->g_next : t->canvas->list; for (; y; y = y->g_next) if ((ob = pd_checkobject(&y->g_pd))) break; if (!ob) return 0; *************** *** 6063,6067 **** binbuf_restore(x->te_binbuf, 1, &at); } ! canvas_add(gl, &x->te_g); } else { int xpix, ypix; --- 6064,6068 ---- binbuf_restore(x->te_binbuf, 1, &at); } ! canvas_add(gl,x); } else { int xpix, ypix; *************** *** 6071,6075 **** x->te_ypix = (int)canvas_pixelstoy(gl, ypix-3); binbuf_restore(x->te_binbuf, 1, &at); ! canvas_add(gl, &x->te_g); } } --- 6072,6076 ---- x->te_ypix = (int)canvas_pixelstoy(gl, ypix-3); binbuf_restore(x->te_binbuf, 1, &at); ! canvas_add(gl,x); } } *************** *** 6106,6110 **** x->te_width = 0; x->te_type = T_OBJECT; ! canvas_add(gl, &x->te_g); if (pd_class(&x->ob_pd) == vinlet_class) canvas_resortinlets(canvas_getcanvas(gl)); if (pd_class(&x->ob_pd) == voutlet_class) canvas_resortoutlets(canvas_getcanvas(gl)); --- 6107,6111 ---- x->te_width = 0; x->te_type = T_OBJECT; ! canvas_add(gl,x); if (pd_class(&x->ob_pd) == vinlet_class) canvas_resortinlets(canvas_getcanvas(gl)); if (pd_class(&x->ob_pd) == voutlet_class) canvas_resortoutlets(canvas_getcanvas(gl)); *************** *** 6143,6147 **** x->te_ypix = atom_getintarg(1, argc, argv); if (argc > 2) binbuf_restore(x->te_binbuf, argc-2, argv+2); ! canvas_add(gl, &x->te_g); } --- 6144,6148 ---- x->te_ypix = atom_getintarg(1, argc, argv); if (argc > 2) binbuf_restore(x->te_binbuf, argc-2, argv+2); ! canvas_add(gl,x); } *************** *** 6199,6207 **** x->te_ypix = atom_getintarg(1, argc, argv); if (argc > 2) binbuf_restore(x->te_binbuf, argc-2, argv+2); ! canvas_add(gl, &x->te_g); } else { x->te_xpix = 0; x->te_ypix = 0; ! canvas_add(gl, &x->te_g); } } --- 6200,6208 ---- x->te_ypix = atom_getintarg(1, argc, argv); if (argc > 2) binbuf_restore(x->te_binbuf, argc-2, argv+2); ! canvas_add(gl,x); } else { x->te_xpix = 0; x->te_ypix = 0; ! canvas_add(gl,x); } }

1 0

pd/src desire.c,1.1.2.202,1.1.2.203
by Mathieu Bouchard 28 Nov '06

28 Nov '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16848 Modified Files: Tag: devel_0_39 desire.c Log Message: macros for doing casts in pd_bind pd_unbind pd_free Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.202 retrieving revision 1.1.2.203 diff -C2 -d -r1.1.2.202 -r1.1.2.203 *** desire.c 27 Nov 2006 14:06:01 -0000 1.1.2.202 --- desire.c 27 Nov 2006 23:23:24 -0000 1.1.2.203 *************** *** 82,85 **** --- 82,89 ---- t_symbol *s_empty, *s_pd, *s_Pd; + #define pd_free(a) pd_free((t_pd *)(a)) + #define pd_bind(a,b) pd_bind((t_pd *)(a),b) + #define pd_unbind(a,b) pd_unbind((t_pd *)(a),b) + //-------------------------------------------------------------------------- // t_appendix: an extension to t_gobj made by matju so that *************** *** 301,305 **** clock_free(self->clock); queue_free(self->q); ! pd_free((t_pd *)self); } --- 305,309 ---- clock_free(self->clock); queue_free(self->q); ! pd_free(self); } *************** *** 419,425 **** static void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir) { t_symbol *bs = canvas_makebindsym(x->name); ! if (x->name!=s_Pd) pd_unbind((t_pd *)x, bs); x->name = s; ! if (x->name!=s_Pd) pd_bind((t_pd *)x, bs); if (dir && dir != &s_) canvas_getenv(x)->dir = dir; gobj_changed(x,0); --- 423,429 ---- static void canvas_rename(t_canvas *x, t_symbol *s, t_symbol *dir) { t_symbol *bs = canvas_makebindsym(x->name); ! if (x->name!=s_Pd) pd_unbind(x, bs); x->name = s; ! if (x->name!=s_Pd) pd_bind(x, bs); if (dir && dir != &s_) canvas_getenv(x)->dir = dir; gobj_changed(x,0); *************** *** 527,531 **** x->owner = owner; x->name = *s->s_name ? s : canvas_newfilename ? canvas_newfilename : s_Pd; ! if (x->name != s_Pd) pd_bind((t_pd *)x, canvas_makebindsym(x->name)); x->loading = 1; x->goprect = 0; /* no GOP rectangle unless it's turned on later */ --- 531,535 ---- x->owner = owner; x->name = *s->s_name ? s : canvas_newfilename ? canvas_newfilename : s_Pd; ! if (x->name != s_Pd) pd_bind(x, canvas_makebindsym(x->name)); x->loading = 1; x->goprect = 0; /* no GOP rectangle unless it's turned on later */ *************** *** 598,602 **** x->font = (canvas_getcurrent() ? canvas_getcurrent()->font : sys_defaultfont); x->screenx1 = x->screeny1 = 0; x->screenx2 = 450; x->screeny2 = 300; ! if (x->name != s_Pd) pd_bind((t_pd *)x, canvas_makebindsym(x->name)); x->owner = g; x->isgraph = 1; --- 602,606 ---- x->font = (canvas_getcurrent() ? canvas_getcurrent()->font : sys_defaultfont); x->screenx1 = x->screeny1 = 0; x->screenx2 = 450; x->screeny2 = 300; ! if (x->name != s_Pd) pd_bind(x, canvas_makebindsym(x->name)); x->owner = g; x->isgraph = 1; *************** *** 719,723 **** canvas_vis(x, 0); sys_mgui(x,"delete",""); ! if (x->name != s_Pd) pd_unbind((t_pd *)x, canvas_makebindsym(x->name)); if (x->env) { freebytes(x->env->argv, x->env->argc * sizeof(t_atom)); --- 723,727 ---- canvas_vis(x, 0); sys_mgui(x,"delete",""); ! if (x->name != s_Pd) pd_unbind(x,canvas_makebindsym(x->name)); if (x->env) { freebytes(x->env->argv, x->env->argc * sizeof(t_atom)); *************** *** 1253,1257 **** void canvas_close(t_canvas *x) { ! if (x->owner) canvas_vis(x, 0); else pd_free((t_pd *)x); } --- 1257,1261 ---- void canvas_close(t_canvas *x) { ! if (x->owner) canvas_vis(x, 0); else pd_free(x); } *************** *** 1369,1375 **** static void canvas_restoreconnections(t_canvas *x) { ! pd_bind((t_pd *)x, gensym("#X")); binbuf_eval(x->connectbuf, 0, 0, 0); ! pd_unbind((t_pd *)x, gensym("#X")); } --- 1373,1379 ---- static void canvas_restoreconnections(t_canvas *x) { ! pd_bind(x,gensym("#X")); binbuf_eval(x->connectbuf, 0, 0, 0); ! pd_unbind(x,gensym("#X")); } *************** *** 1528,1532 **** x->realname = s; x->realname = canvas_realizedollar(gl, s); ! pd_bind(&x->x_gobj.g_pd, x->realname); x->usedindsp = 0; x->saveit = saveit; --- 1532,1536 ---- x->realname = s; x->realname = canvas_realizedollar(gl, s); ! pd_bind(x,x->realname); x->usedindsp = 0; x->saveit = saveit; *************** *** 1629,1634 **** template_setfloat(t, gensym("linewidth"), x->scalar->sc_vec, style==PLOTSTYLE_POINTS?2:1, 1); t_pd *x2 = pd_findbyclass(gensym("#A"), garray_class); ! if (x2) pd_unbind(x2, gensym("#A")); ! pd_bind(&x->x_gobj.g_pd, gensym("#A")); garray_redraw(x); return x; --- 1633,1638 ---- template_setfloat(t, gensym("linewidth"), x->scalar->sc_vec, style==PLOTSTYLE_POINTS?2:1, 1); t_pd *x2 = pd_findbyclass(gensym("#A"), garray_class); ! if (x2) pd_unbind(x2,gensym("#A")); ! pd_bind(x,gensym("#A")); garray_redraw(x); return x; *************** *** 1682,1688 **** if (x->listviewing) garray_arrayviewlist_close(x); x->realname = argname; ! pd_unbind(&x->x_gobj.g_pd, x->realname); x->realname = canvas_realizedollar(x->canvas, argname); ! pd_bind(&x->x_gobj.g_pd, x->realname); /* redraw the whole canvas, just so the name change shows up */ if (x->canvas->havewindow) canvas_redraw(x->canvas); --- 1686,1692 ---- if (x->listviewing) garray_arrayviewlist_close(x); x->realname = argname; ! pd_unbind(x,x->realname); x->realname = canvas_realizedollar(x->canvas, argname); ! pd_bind(x,x->realname); /* redraw the whole canvas, just so the name change shows up */ if (x->canvas->havewindow) canvas_redraw(x->canvas); *************** *** 1737,1744 **** if (x->listviewing) garray_arrayviewlist_close(x); gfxstub_deleteforkey(x); ! pd_unbind(&x->x_gobj.g_pd, x->realname); /* LATER find a way to get #A unbound earlier (at end of load?) */ while ((x2 = pd_findbyclass(gensym("#A"), garray_class))) pd_unbind(x2, gensym("#A")); ! pd_free(&x->scalar->sc_gobj.g_pd); } --- 1741,1748 ---- if (x->listviewing) garray_arrayviewlist_close(x); gfxstub_deleteforkey(x); ! pd_unbind(x,x->realname); /* LATER find a way to get #A unbound earlier (at end of load?) */ while ((x2 = pd_findbyclass(gensym("#A"), garray_class))) pd_unbind(x2, gensym("#A")); ! pd_free(x); } *************** *** 2141,2146 **** static void garray_rename(t_garray *x, t_symbol *s) { if (x->listviewing) garray_arrayviewlist_close(x); ! pd_unbind(&x->x_gobj.g_pd, x->realname); ! pd_bind(&x->x_gobj.g_pd, x->realname = x->realname = s); garray_redraw(x); } --- 2145,2151 ---- static void garray_rename(t_garray *x, t_symbol *s) { if (x->listviewing) garray_arrayviewlist_close(x); ! pd_unbind(x,x->realname); ! x->realname = s; ! pd_bind(x,x->realname); garray_redraw(x); } *************** *** 2314,2318 **** canvas_each(g,x) if (g->g_next == y) {g->g_next = y->g_next; break;} } ! pd_free(&y->g_pd); if (chkdsp) canvas_update_dsp(); if (drawcommand) --- 2319,2323 ---- canvas_each(g,x) if (g->g_next == y) {g->g_next = y->g_next; break;} } ! pd_free(y); if (chkdsp) canvas_update_dsp(); if (drawcommand) *************** *** 2711,2715 **** x->who = who; x->sym = sym; ! pd_bind((t_pd *)x, sym); return x; } --- 2716,2720 ---- x->who = who; x->sym = sym; ! pd_bind(x,sym); return x; } *************** *** 2717,2726 **** /* cleanup routine; delete any resources we have */ static void guiconnect_free(t_guiconnect *x) { ! if (x->sym) pd_unbind((t_pd *)x, x->sym); if (x->clock) clock_free(x->clock); } /* this is called when the clock times out to indicate the GUI should be gone by now. */ ! static void guiconnect_tick(t_guiconnect *x) {pd_free(&x->o.ob_pd);} /* the target calls this to disconnect. If the gui has "signed off" --- 2722,2731 ---- /* cleanup routine; delete any resources we have */ static void guiconnect_free(t_guiconnect *x) { ! if (x->sym) pd_unbind(x,x->sym); if (x->clock) clock_free(x->clock); } /* this is called when the clock times out to indicate the GUI should be gone by now. */ ! static void guiconnect_tick(t_guiconnect *x) {pd_free(x);} /* the target calls this to disconnect. If the gui has "signed off" *************** *** 2728,2732 **** or for a timeout. */ static void guiconnect_notarget(t_guiconnect *x, double timedelay) { ! if (!x->sym) pd_free((t_pd *)x); else { x->who = 0; --- 2733,2737 ---- or for a timeout. */ static void guiconnect_notarget(t_guiconnect *x, double timedelay) { ! if (!x->sym) pd_free(x); else { x->who = 0; *************** *** 2747,2753 **** a timeout after which the guiconnect will disappear.) */ static void guiconnect_signoff(t_guiconnect *x) { ! if (!x->who) pd_free((t_pd *)x); else { ! pd_unbind((t_pd *)x, x->sym); x->sym = 0; } --- 2752,2758 ---- a timeout after which the guiconnect will disappear.) */ static void guiconnect_signoff(t_guiconnect *x) { ! if (!x->who) pd_free(x); else { ! pd_unbind(x,x->sym); x->sym = 0; } *************** *** 4029,4033 **** if (templatesym->s_name) { x->sym = templatesym; ! pd_bind(&x->t_pdobj, x->sym); } else x->sym = templatesym; --- 4034,4038 ---- if (templatesym->s_name) { x->sym = templatesym; ! pd_bind(x,x->sym); } else x->sym = templatesym; *************** *** 4145,4149 **** nobug: ; } ! pd_free((t_pd *)scfrom); scalartemplate = tto; } else { --- 4150,4154 ---- nobug: ; } ! pd_free(scfrom); scalartemplate = tto; } else { *************** *** 4293,4301 **** } else { template_conform(x, y); ! pd_free(&x->t_pdobj); template_new(templatesym, argc, argv); } } ! pd_free(&y->t_pdobj); } else template_new(templatesym, argc, argv); return 0; --- 4298,4306 ---- } else { template_conform(x, y); ! pd_free(x); template_new(templatesym, argc, argv); } } ! pd_free(y); } else template_new(templatesym, argc, argv); return 0; *************** *** 4304,4308 **** /* here we assume someone has already cleaned up all instances of this. */ void template_free(t_template *x) { ! if (*x->sym->s_name) pd_unbind(&x->t_pdobj, x->sym); t_freebytes(x->vec, x->n * sizeof(*x->vec)); } --- 4309,4313 ---- /* here we assume someone has already cleaned up all instances of this. */ void template_free(t_template *x) { ! if (*x->sym->s_name) pd_unbind(x,x->sym); t_freebytes(x->vec, x->n * sizeof(*x->vec)); } *************** *** 4344,4351 **** /* conform everyone to the new template */ template_conform(t, y); ! pd_free(&t->t_pdobj); t = template_new(sym, argc, argv); } ! pd_free(&y->t_pdobj); t->t_list = x; canvas_redrawallfortemplate(t, 1); --- 4349,4356 ---- /* conform everyone to the new template */ template_conform(t, y); ! pd_free(t); t = template_new(sym, argc, argv); } ! pd_free(y); t->t_list = x; canvas_redrawallfortemplate(t, 1); *************** *** 4390,4395 **** t_template *z = template_new(&s_, x->argc, x->argv); template_conform(t, z); ! pd_free(&t->t_pdobj); ! pd_free(&z->t_pdobj); z = template_new(x->sym, x->argc, x->argv); z->t_list = x->x_next; --- 4395,4400 ---- t_template *z = template_new(&s_, x->argc, x->argv); template_conform(t, z); ! pd_free(t); ! pd_free(z); z = template_new(x->sym, x->argc, x->argv); z->t_list = x->x_next; *************** *** 6283,6289 **** x->te_width = width; x->wherelabel = (int)wherelabel&3; ! if (*x->rcv->s_name) pd_unbind((t_pd *)x, canvas_realizedollar(x->canvas, x->rcv)); x->rcv = rcv; ! if (*x->rcv->s_name) pd_bind( (t_pd *)x, canvas_realizedollar(x->canvas, x->rcv)); x->snd = snd; x->expanded_to = canvas_realizedollar(x->canvas, x->snd); --- 6288,6294 ---- x->te_width = width; x->wherelabel = (int)wherelabel&3; ! if (*x->rcv->s_name) pd_unbind(x, canvas_realizedollar(x->canvas, x->rcv)); x->rcv = rcv; ! if (*x->rcv->s_name) pd_bind( x, canvas_realizedollar(x->canvas, x->rcv)); x->snd = snd; x->expanded_to = canvas_realizedollar(x->canvas, x->snd); *************** *** 6318,6322 **** static void gatom_free(t_gatom *x) { ! if (*x->rcv->s_name) pd_unbind((t_pd *)x, canvas_realizedollar(x->canvas, x->rcv)); gfxstub_deleteforkey(x); } --- 6323,6327 ---- static void gatom_free(t_gatom *x) { ! if (*x->rcv->s_name) pd_unbind(x, canvas_realizedollar(x->canvas, x->rcv)); gfxstub_deleteforkey(x); } *************** *** 6507,6513 **** if (rcv==s_empty) rcv=0; if (rcv==x->rcv) return; ! if(x->rcv) pd_unbind((t_pd *)x, x->rcv); x->rcv = rcv; ! if(rcv) pd_bind((t_pd *)x, x->rcv); gobj_changed(x,"rcv"); } --- 6512,6518 ---- if (rcv==s_empty) rcv=0; if (rcv==x->rcv) return; ! if(x->rcv) pd_unbind(x,x->rcv); x->rcv = rcv; ! if(x->rcv) pd_bind(x,x->rcv); gobj_changed(x,"rcv"); } *************** *** 6785,6789 **** x->fcol = 0x000000; x->lcol = 0x000000; ! pd_bind((t_pd *)x,pd_makebindsym((t_pd *)x)); return x; } --- 6790,6794 ---- x->fcol = 0x000000; x->lcol = 0x000000; ! pd_bind(x,pd_makebindsym((t_pd *)x)); return x; } *************** *** 6874,6878 **** bng_check_minmax(x); iemgui_constrain(x); ! if (x->rcv) pd_bind((t_pd *)x, x->rcv); gobj_changed(x,0); } --- 6879,6883 ---- bng_check_minmax(x); iemgui_constrain(x); ! if (x->rcv) pd_bind(x,x->rcv); gobj_changed(x,0); } *************** *** 6890,6894 **** static void iemgui_free(t_iemgui *x) { ! if(x->rcv) pd_unbind((t_pd *)x, x->rcv); gfxstub_deleteforkey(x); } --- 6895,6899 ---- static void iemgui_free(t_iemgui *x) { ! if(x->rcv) pd_unbind(x,x->rcv); gfxstub_deleteforkey(x); } *************** *** 6963,6967 **** if (!x->nonzero) x->nonzero=1.0; iemgui_constrain(x); ! if (x->rcv) pd_bind((t_pd *)x, x->rcv); gobj_changed(x,0); } --- 6968,6972 ---- if (!x->nonzero) x->nonzero=1.0; iemgui_constrain(x); ! if (x->rcv) pd_bind(x,x->rcv); gobj_changed(x,0); } *************** *** 7094,7098 **** if (!radio_pickle(x,&foo)) return; iemgui_constrain(x); ! if (x->rcv) pd_bind((t_pd *)x, x->rcv); gobj_changed(x,0); } --- 7099,7103 ---- if (!radio_pickle(x,&foo)) return; iemgui_constrain(x); ! if (x->rcv) pd_bind(x,x->rcv); gobj_changed(x,0); } *************** *** 7228,7232 **** slider_check_minmax(x); slider_check_width(x, isvert(x) ? x->h : x->w); ! if(x->rcv) pd_bind((t_pd *)x, x->rcv); gobj_changed(x,0); } --- 7233,7237 ---- slider_check_minmax(x); slider_check_width(x, isvert(x) ? x->h : x->w); ! if(x->rcv) pd_bind(x,x->rcv); gobj_changed(x,0); } *************** *** 7346,7350 **** nbcheck_minmax(x); x->w = MAX(x->w,1); ! if (x->rcv) pd_bind((t_pd *)x, x->rcv); gobj_changed(x,0); } --- 7351,7355 ---- nbcheck_minmax(x); x->w = MAX(x->w,1); ! if (x->rcv) pd_bind(x,x->rcv); gobj_changed(x,0); } *************** *** 7452,7456 **** if (!vu_pickle(x,&foo)) return; iemgui_constrain(x); ! if(x->rcv) pd_bind((t_pd *)x, x->rcv); gobj_changed(x,0); } --- 7457,7461 ---- if (!vu_pickle(x,&foo)) return; iemgui_constrain(x); ! if(x->rcv) pd_bind(x,x->rcv); gobj_changed(x,0); } *************** *** 7524,7528 **** x->at[0].a_type = x->at[1].a_type = A_FLOAT; //??? iemgui_constrain(x); ! if (x->rcv) pd_bind((t_pd *)x, x->rcv); gobj_changed(x,0); } --- 7529,7533 ---- x->at[0].a_type = x->at[1].a_type = A_FLOAT; //??? iemgui_constrain(x); ! if (x->rcv) pd_bind(x,x->rcv); gobj_changed(x,0); } *************** *** 7581,7585 **** if (!dropper_pickle(x,&foo)) return; x->h = x->w; ! if (x->rcv) pd_bind((t_pd *)x, x->rcv); iemgui_constrain(x); gobj_changed(x,0); --- 7586,7590 ---- if (!dropper_pickle(x,&foo)) return; x->h = x->w; ! if (x->rcv) pd_bind(x,x->rcv); iemgui_constrain(x); gobj_changed(x,0);

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
57
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs November 2006