Pd-cvs October 2005

pd-cvs@lists.iem.at

15 participants
477 discussions

pd/src desire.c,1.1.2.42,1.1.2.43
by Mathieu Bouchard 29 Oct '05

29 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11559 Modified Files: Tag: devel_0_39 desire.c Log Message: t_manager is now a true pd class Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.42 retrieving revision 1.1.2.43 diff -C2 -d -r1.1.2.42 -r1.1.2.43 *** desire.c 29 Oct 2005 11:40:32 -0000 1.1.2.42 --- desire.c 29 Oct 2005 16:01:06 -0000 1.1.2.43 *************** *** 114,121 **** void queue_put (t_queue *self, void *stuff) { if (self->len==QUEUE_SIZE) {bug("queue full"); return;} self->o[(self->start+self->len)%QUEUE_SIZE] = stuff; self->len++; ! post("queue_get: items in queue: %d",self->len); } --- 114,122 ---- void queue_put (t_queue *self, void *stuff) { + post("HEY"); if (self->len==QUEUE_SIZE) {bug("queue full"); return;} self->o[(self->start+self->len)%QUEUE_SIZE] = stuff; self->len++; ! post("queue_put: items in queue: %d",self->len); } *************** *** 128,131 **** --- 129,137 ---- } + void queue_free (t_queue *self) { + abort(); + free(self); + } + int queue_empty (t_queue *self) {return self->len==0;} int queue_full (t_queue *self) {return self->len==QUEUE_SIZE;} *************** *** 135,145 **** typedef struct _manager { t_queue *q; t_clock *clock; } t_manager; t_manager *manager; ! void manager_call (void *foo) { t_manager *self = (t_manager *)foo; while (!queue_empty(self->q)) { --- 141,153 ---- typedef struct _manager { + t_gobj super; t_queue *q; t_clock *clock; } t_manager; + static t_class *manager_class; t_manager *manager; ! void manager_call (void *foo) {L t_manager *self = (t_manager *)foo; while (!queue_empty(self->q)) { *************** *** 152,164 **** } ! void manager_notice (t_manager *self, t_gobj *origin, int argc, t_atom *argv) { t_appendix *a = (t_appendix *)origin->g_adix; ! if (!a->dirtyc) queue_put(self->q,origin); ! a->dirtyc = 1; SETFLOAT(a->dirtyv,-1); /* in the future this may contain real data instead */ } ! t_manager *manager_new (void) { ! t_manager *self = (t_manager *)malloc(sizeof(t_manager)); self->q = queue_new(); self->clock = clock_new(self,(t_method)manager_call); --- 160,176 ---- } ! void manager_notice (t_gobj *self_, t_gobj *origin, int argc, t_atom *argv) {L ! t_manager *self = (t_manager *)self; t_appendix *a = (t_appendix *)origin->g_adix; ! if (!a->dirtyc) { ! queue_put(self->q,origin); ! a->dirtyc = 1; ! } SETFLOAT(a->dirtyv,-1); /* in the future this may contain real data instead */ } ! t_manager *manager_new (t_symbol *s, int argc, t_atom *argv) {L ! t_manager *self = (t_manager *)pd_new(manager_class); ! self->super.g_adix = appendix_new((t_gobj *)self); self->q = queue_new(); self->clock = clock_new(self,(t_method)manager_call); *************** *** 167,170 **** --- 179,188 ---- } + void manager_free (t_manager *self) {L + clock_free(self->clock); + queue_free(self->q); + pd_free((t_pd *)self); + } + //-------------------------------------------------------------------------- /* the "glist" class is also known as "canvas" (the two used *************** *** 226,232 **** } } ! glist_each(g,gl) ! //for (g = gl->gl_list; g; g = g->g_next) ! { if (pd_class(&g->g_pd) == canvas_class) glist_doupdatewindowlist((t_glist *)g, sbuf); --- 244,248 ---- } } ! glist_each(g,gl) { if (pd_class(&g->g_pd) == canvas_class) glist_doupdatewindowlist((t_glist *)g, sbuf); *************** *** 253,257 **** x->gl_next = canvas_list; canvas_list = x; ! canvas_redraw(x); } --- 269,276 ---- x->gl_next = canvas_list; canvas_list = x; ! post("addtolist %lx",(long)x); ! gobj_subscribe((t_gobj *)x,(t_gobj *)manager); ! gobj_changed(x,""); ! // canvas_redraw(x); } *************** *** 12416,12420 **** } binbuf_gettext(buf,&s,&n); ! sys_vgui("update_object %x {%.*s}\n", (unsigned)self,n,s); sys_mgui(self,"ninlets=","i", obj_ninlets((t_text *)self)); sys_mgui(self,"noutlets=","i",obj_noutlets((t_text *)self)); --- 12435,12439 ---- } binbuf_gettext(buf,&s,&n); ! sys_vgui("update_object %lx {%.*s}\n", (long)self,n,s); sys_mgui(self,"ninlets=","i", obj_ninlets((t_text *)self)); sys_mgui(self,"noutlets=","i",obj_noutlets((t_text *)self)); *************** *** 13388,13396 **** t_canvas *self = (t_canvas *)x; post("canvas_notice(%p,%p,%d,...): havewindow=%d mapped=%d",x,origin,argc,self->gl_havewindow,self->gl_mapped); ! if (self->gl_havewindow /* && self->gl_mapped */) { ! manager_notice(manager,origin,argc,argv); ! } else { gobj_changed3(self,origin,argc,argv); ! } } --- 13407,13415 ---- t_canvas *self = (t_canvas *)x; post("canvas_notice(%p,%p,%d,...): havewindow=%d mapped=%d",x,origin,argc,self->gl_havewindow,self->gl_mapped); ! // if (self->gl_havewindow /* && self->gl_mapped */) { ! // manager_notice(manager,origin,argc,argv); ! // } else { gobj_changed3(self,origin,argc,argv); ! // } } *************** *** 13494,13498 **** void desire_setup(void) { ! manager = manager_new(); #define S(x) x##_setup(); S(vinlet) S(voutlet) --- 13513,13520 ---- void desire_setup(void) { ! manager_class = class_new(gensym("__manager"), (t_newmethod)manager_new, ! (t_method)manager_free, sizeof(t_manager), CLASS_NOINLET, A_GIMME, 0); ! class_setnotice(manager_class,manager_notice); ! manager = manager_new(0,0,0); #define S(x) x##_setup(); S(vinlet) S(voutlet)

1 0

pd/src desire.c, 1.1.2.41, 1.1.2.42 desire.tk, 1.1.2.85, 1.1.2.86
by Mathieu Bouchard 29 Oct '05

29 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29521 Modified Files: Tag: devel_0_39 desire.c desire.tk Log Message: server-side queue now works Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.85 retrieving revision 1.1.2.86 diff -C2 -d -r1.1.2.85 -r1.1.2.86 *** desire.tk 21 Oct 2005 13:47:09 -0000 1.1.2.85 --- desire.tk 29 Oct 2005 11:40:32 -0000 1.1.2.86 *************** *** 63,66 **** --- 63,75 ---- } + def observable child_changed {origin args} { + foreach x $@subscribers {eval [concat [list $x notice $origin] $args]} + } + + #-----------------------------------------------------------------------------------# + set poolset(foo) bar + array unset poolset foo + set poolqueue {} + #-----------------------------------------------------------------------------------# # this is the beginning of the more application-dependent part. *************** *** 627,631 **** #-----------------------------------------------------------------------------------# # check or uncheck the "edit" menu item ! def* canvas editmode {mode} { global look .x$self.m.edit entryconfigure "Edit mode" -indicatoron $mode --- 636,640 ---- #-----------------------------------------------------------------------------------# # check or uncheck the "edit" menu item ! def* canvas editmode= {mode} { global look .x$self.m.edit entryconfigure "Edit mode" -indicatoron $mode *************** *** 673,677 **** $self new_binds focus $c ! $self editmode $editable set @action none set @selection {} --- 682,686 ---- $self new_binds focus $c ! $self editmode= $editable set @action none set @selection {} *************** *** 1620,1623 **** --- 1629,1642 ---- } + def canvas notice {origin args} { + global pool + set has_window 1 + if {$has_window} { + set pool($origin) 1 + } { + eval [concat [list child_changed $origin] $args] + } + } + #-----------------------------------------------------------------------------------# set lastcanvasconfigured "" Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.41 retrieving revision 1.1.2.42 diff -C2 -d -r1.1.2.41 -r1.1.2.42 *** desire.c 29 Oct 2005 10:30:18 -0000 1.1.2.41 --- desire.c 29 Oct 2005 11:40:32 -0000 1.1.2.42 *************** *** 42,45 **** --- 42,46 ---- t_appendix *appendix_new (t_gobj *master) { t_appendix *self = (t_appendix *)malloc(sizeof(t_appendix)); + post("appendix_new: %p for %p",self,master); self->master = master; self->next = 0; *************** *** 116,119 **** --- 117,121 ---- self->o[(self->start+self->len)%QUEUE_SIZE] = stuff; self->len++; + post("queue_get: items in queue: %d",self->len); } *************** *** 122,125 **** --- 124,128 ---- self->start = (self->start+1)%QUEUE_SIZE; self->len--; + post("queue_get: items in queue: %d",self->len); return r; } *************** *** 250,253 **** --- 253,257 ---- x->gl_next = canvas_list; canvas_list = x; + canvas_redraw(x); } *************** *** 423,429 **** int glist_valid = 10000; ! void glist_init(t_glist *x) ! { ! /* zero out everyone except "pd" field */ memset(((char *)x) + sizeof(x->gl_pd), 0, sizeof(*x) - sizeof(x->gl_pd)); x->gl_stub = gstub_new(x, 0); --- 427,432 ---- int glist_valid = 10000; ! void glist_init(t_glist *x) { ! /* zero out everyone except "pd" field */ memset(((char *)x) + sizeof(x->gl_pd), 0, sizeof(*x) - sizeof(x->gl_pd)); x->gl_stub = gstub_new(x, 0); *************** *** 431,434 **** --- 434,438 ---- x->gl_xlabel = (t_symbol **)t_getbytes(0); x->gl_ylabel = (t_symbol **)t_getbytes(0); + ((t_gobj *)x)->g_adix = appendix_new((t_gobj *)x); } *************** *** 448,453 **** if (!owner) canvas_addtolist(x); - /* post("canvas %lx, owner %lx", x, owner); */ - if (argc == 5) /* toplevel */ pd_scanargs(argc,argv,"iiiii",&xloc,&yloc,&width,&height,&font); --- 452,455 ---- *************** *** 638,644 **** { char buf[MAXPDSTRING]; ! strcpy(buf, "pd-"); ! strcat(buf, s->s_name); ! return (gensym(buf)); } --- 640,645 ---- { char buf[MAXPDSTRING]; ! sprintf(buf,"pd-%s",s->s_name); ! return gensym(buf); } *************** *** 782,791 **** void canvas_vis(t_canvas *x, t_floatarg f) { ! int flag = (f != 0); ! if (flag) { - /* post("havewindow %d, isgraph %d, isvisible %d editor %d", - x->gl_havewindow, x->gl_isgraph, glist_isvisible(x), - (x->gl_editor != 0)); */ /* test if we're already visible and toplevel */ if (x->gl_editor) --- 783,788 ---- void canvas_vis(t_canvas *x, t_floatarg f) { ! if (!!f) { /* test if we're already visible and toplevel */ if (x->gl_editor) *************** *** 2358,2362 **** static void canvas_done_popup(t_canvas *x, float which, float xpos, float ypos) { ! char pathbuf[MAXPDSTRING], namebuf[MAXPDSTRING]; t_gobj *y; for (y = x->gl_list; y; y = y->g_next) --- 2355,2359 ---- static void canvas_done_popup(t_canvas *x, float which, float xpos, float ypos) { ! char namebuf[MAXPDSTRING]; t_gobj *y; for (y = x->gl_list; y; y = y->g_next) *************** *** 2408,2416 **** canvas_properties(x); else if (which == 2) ! { ! strcpy(pathbuf, sys_libdir->s_name); ! strcat(pathbuf, "/doc/5.reference/0.INTRO.txt"); ! sys_vgui("menu_opentext %s\n", pathbuf); ! } } --- 2405,2409 ---- canvas_properties(x); else if (which == 2) ! sys_vgui("menu_opentext %s%s\n", sys_libdir->s_name,"/doc/5.reference/0.INTRO.txt"); } *************** *** 3738,3742 **** canvas_setcursor(x, CURSOR_RUNMODE_NOTHING); } ! sys_vgui("%lx editval %d\n", (long)glist_getcanvas(x), x->gl_edit); } --- 3731,3735 ---- canvas_setcursor(x, CURSOR_RUNMODE_NOTHING); } ! sys_mgui(glist_getcanvas(x),"editmode=","i",x->gl_edit); } *************** *** 5286,5290 **** void glist_add(t_glist *x, t_gobj *y) { ! y->g_adix = appendix_new(y); /* mb: i found no better place for initing this */ gobj_subscribe(y,(t_gobj *)x); gobj_changed(y,""); --- 5279,5283 ---- void glist_add(t_glist *x, t_gobj *y) { ! if (!y->g_adix) y->g_adix = appendix_new(y); /* mb: i found no better place for initing this */ gobj_subscribe(y,(t_gobj *)x); gobj_changed(y,""); *************** *** 5297,5301 **** y2->g_next = y; } ! sys_mgui(x,"add","p",y); /* voodoo */ /* if (x->gl_editor && (ob = pd_checkobject(&y->g_pd))) rtext_new(x, ob); */ --- 5290,5295 ---- y2->g_next = y; } ! gobj_changed(x,""); ! // sys_mgui(x,"add","p",y); /* voodoo */ /* if (x->gl_editor && (ob = pd_checkobject(&y->g_pd))) rtext_new(x, ob); */ *************** *** 5330,5336 **** t_canvas *canvas = glist_getcanvas(x); int drawcommand = class_isdrawcommand(y->g_pd); ! int wasdeleting; ! ! wasdeleting = canvas_setdeleting(canvas, 1); if (x->gl_editor) { --- 5324,5328 ---- t_canvas *canvas = glist_getcanvas(x); int drawcommand = class_isdrawcommand(y->g_pd); ! int wasdeleting = canvas_setdeleting(canvas, 1); if (x->gl_editor) { *************** *** 12417,12434 **** int n; char *s; ! if (strcmp(c->c_name->s_name,"canvas")!=0) { ! c->c_savefn(self,buf); ! } else { /* just the "#N canvas" line, not the contents */ ! canvas_savecontainerto((t_canvas *)c,buf); } binbuf_gettext(buf,&s,&n); sys_vgui("update_object %x {%.*s}\n", (unsigned)self,n,s); ! //sys_mgui(self,"ninlets=","i", obj_ninlets((t_text *)self)); ! //sys_mgui(self,"noutlets=","i",obj_noutlets((t_text *)self)); ! sys_vgui("%lx ninlets= %d\n", (long)self, obj_ninlets((t_text *)self)); ! sys_vgui("%lx noutlets= %d\n", (long)self, obj_noutlets((t_text *)self)); binbuf_free(buf); free(s); } --- 12409,12432 ---- int n; char *s; ! if (c==canvas_class) { /* just the "#N canvas" line, not the contents */ ! canvas_savecontainerto((t_canvas *)self,buf); ! } else { ! c->c_savefn(self,buf); } binbuf_gettext(buf,&s,&n); sys_vgui("update_object %x {%.*s}\n", (unsigned)self,n,s); ! sys_mgui(self,"ninlets=","i", obj_ninlets((t_text *)self)); ! sys_mgui(self,"noutlets=","i",obj_noutlets((t_text *)self)); binbuf_free(buf); free(s); + if (c==canvas_class) { + // buffer overflow bug here + char foo[4096]; + char *bar = foo; + t_gobj *y; + glist_each(y,(t_canvas *)self) bar+=sprintf(bar,"%lx ",(long)y); + sys_mgui((t_gobj *)self,"children=","S",foo); + } } *************** *** 13389,13394 **** void canvas_notice(t_gobj *x, struct _gobj *origin, int argc, t_atom *argv) { t_canvas *self = (t_canvas *)x; ! post("canvas_notice(%p,%p,%d,...)",x,origin,argc); ! if (self->gl_havewindow && self->gl_mapped) { manager_notice(manager,origin,argc,argv); } else { --- 13387,13392 ---- void canvas_notice(t_gobj *x, struct _gobj *origin, int argc, t_atom *argv) { t_canvas *self = (t_canvas *)x; ! post("canvas_notice(%p,%p,%d,...): havewindow=%d mapped=%d",x,origin,argc,self->gl_havewindow,self->gl_mapped); ! if (self->gl_havewindow /* && self->gl_mapped */) { manager_notice(manager,origin,argc,argv); } else {

1 0

pd/src desire.c,1.1.2.40,1.1.2.41
by Mathieu Bouchard 29 Oct '05

29 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18025 Modified Files: Tag: devel_0_39 desire.c Log Message: stuff. Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.40 retrieving revision 1.1.2.41 diff -C2 -d -r1.1.2.40 -r1.1.2.41 *** desire.c 28 Oct 2005 23:34:11 -0000 1.1.2.40 --- desire.c 29 Oct 2005 10:30:18 -0000 1.1.2.41 *************** *** 33,36 **** --- 33,38 ---- #define template templaet + #define glist_each(CHILD,GLIST) for(CHILD=(GLIST)->gl_list; CHILD; CHILD=CHILD->g_next) + //-------------------------------------------------------------------------- // t_appendix: an extension to t_gobj made by matju so that *************** *** 47,51 **** } ! /* subscribing N spies takes N*N time, but I don't care in this case */ void gobj_subscribe (t_gobj *self, t_gobj *observer) { t_appendix *d = self->g_adix; --- 49,53 ---- } ! /* subscribing N spies takes N*N time, but it's not important for now */ void gobj_subscribe (t_gobj *self, t_gobj *observer) { t_appendix *d = self->g_adix; *************** *** 84,87 **** --- 86,90 ---- t_gobj *self = (t_gobj *)self_; t_appendix *d = self->g_adix; + if (!d) {post("no appendix in owner"); return;} int i; for (i=0; i<d->nobs; i++) { *************** *** 90,94 **** if (ice) ice(obs,origin,argc,argv); else post("null func ptr for class %s",self->g_pd->c_name->s_name); - } } --- 93,96 ---- *************** *** 151,155 **** if (!a->dirtyc) queue_put(self->q,origin); a->dirtyc = 1; ! SETFLOAT(a->dirtyv,-1); /* in the future this will contain real data */ } --- 153,157 ---- if (!a->dirtyc) queue_put(self->q,origin); a->dirtyc = 1; ! SETFLOAT(a->dirtyv,-1); /* in the future this may contain real data instead */ } *************** *** 221,230 **** } } ! for (g = gl->gl_list; g; g = g->g_next) { if (pd_class(&g->g_pd) == canvas_class) glist_doupdatewindowlist((t_glist *)g, sbuf); } - return; } --- 223,232 ---- } } ! glist_each(g,gl) ! //for (g = gl->gl_list; g; g = g->g_next) { if (pd_class(&g->g_pd) == canvas_class) glist_doupdatewindowlist((t_glist *)g, sbuf); } } *************** *** 688,736 **** "unmapped" (either miniaturized or just plain gone.) This should be called from the GUI after the fact to "notify" us that we're mapped. */ ! void canvas_map(t_canvas *x, t_floatarg f) ! { ! int flag = (f != 0); ! t_gobj *y; ! if (flag) ! { ! if (!glist_isvisible(x)) ! { t_selection *sel; ! if (!x->gl_havewindow) ! { ! bug("canvas_map"); ! canvas_vis(x, 1); ! } ! for (y = x->gl_list; y; y = y->g_next) ! gobj_vis(y, x, 1); for (sel = x->gl_editor->e_selection; sel; sel = sel->sel_next) gobj_select(sel->sel_what, x, 1); x->gl_mapped = 1; canvas_drawlines(x); ! if (x->gl_isgraph && x->gl_goprect) ! canvas_drawredrect(x, 1); sys_mgui(x,"canvas_getscroll",""); } ! } ! else ! { ! if (glist_isvisible(x)) ! { ! /* just clear out the whole canvas... */ ! sys_mgui(x,"erase",""); ! #if 0 ! /* alternatively, we could have erased them one by one... ! for (y = x->gl_list; y; y = y->g_next) ! gobj_vis(y, x, 0); ! ... but we should go through and erase the lines as well ! if we do it that way. */ ! #endif ! x->gl_mapped = 0; ! } } } void canvas_redraw(t_canvas *x) { ! if (glist_isvisible(x)) {canvas_map(x,0); canvas_map(x, 1);} } --- 690,718 ---- "unmapped" (either miniaturized or just plain gone.) This should be called from the GUI after the fact to "notify" us that we're mapped. */ ! void canvas_map(t_canvas *x, t_floatarg f) { ! if (f!=0) { ! if (!glist_isvisible(x)) { t_selection *sel; ! t_gobj *y; ! if (!x->gl_havewindow) {bug("canvas_map"); canvas_vis(x,1);} ! for (y = x->gl_list; y; y = y->g_next) gobj_vis(y, x, 1); for (sel = x->gl_editor->e_selection; sel; sel = sel->sel_next) gobj_select(sel->sel_what, x, 1); x->gl_mapped = 1; + canvas_redraw(x); canvas_drawlines(x); ! if (x->gl_isgraph && x->gl_goprect) canvas_drawredrect(x, 1); sys_mgui(x,"canvas_getscroll",""); } ! } else { ! if (glist_isvisible(x)) {sys_mgui(x,"erase",""); x->gl_mapped=0;} } } void canvas_redraw(t_canvas *x) { ! if (!glist_isvisible(x)) return; ! t_gobj *y; ! // glist_each(y,x) {} ! if (glist_isvisible(x)) {canvas_map(x,0); canvas_map(x, 1);} } *************** *** 1073,1077 **** you gave it to open it; perhaps there's a 1-pixel border all around it or something. Anyway, we just add the 2 pixels back here; seems we ! have to do this for linux but not MSW; not sure about MacOS. */ #ifdef MSW --- 1055,1059 ---- you gave it to open it; perhaps there's a 1-pixel border all around it or something. Anyway, we just add the 2 pixels back here; seems we ! have to do this for linux but not MSW; not sure about MacOS. */ #ifdef MSW *************** *** 13408,13415 **** t_canvas *self = (t_canvas *)x; post("canvas_notice(%p,%p,%d,...)",x,origin,argc); ! if (self->gl_havewindow) { manager_notice(manager,origin,argc,argv); } else { ! } } --- 13390,13397 ---- t_canvas *self = (t_canvas *)x; post("canvas_notice(%p,%p,%d,...)",x,origin,argc); ! if (self->gl_havewindow && self->gl_mapped) { manager_notice(manager,origin,argc,argv); } else { ! gobj_changed3(self,origin,argc,argv); } }

1 0

pd/src desire.c,1.1.2.39,1.1.2.40
by Mathieu Bouchard 29 Oct '05

29 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4793 Modified Files: Tag: devel_0_39 desire.c Log Message: added the update-queue and the update-manager and the observer-notice-forwarder (gobj_changed3) and made toplevel canvases send to the queue. Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.39 retrieving revision 1.1.2.40 diff -C2 -d -r1.1.2.39 -r1.1.2.40 *** desire.c 28 Oct 2005 12:53:07 -0000 1.1.2.39 --- desire.c 28 Oct 2005 23:34:11 -0000 1.1.2.40 *************** *** 34,38 **** //-------------------------------------------------------------------------- ! // t_appendix: an extension to t_gobj written by Mathieu Bouchard so that // all t_gobj's may have new fields without sacrificing binary compat with // externals compiled for PureMSP. --- 34,38 ---- //-------------------------------------------------------------------------- ! // t_appendix: an extension to t_gobj made by matju so that // all t_gobj's may have new fields without sacrificing binary compat with // externals compiled for PureMSP. *************** *** 71,75 **** t_atom argv[1]; SETFLOAT(argv,(float)dirty); ! gobj_changed2(self,1,argv); } --- 71,75 ---- t_atom argv[1]; SETFLOAT(argv,(float)dirty); ! gobj_changed3(self,self,1,argv); } *************** *** 78,81 **** --- 78,86 ---- void gobj_changed2 (void *self_, int argc, t_atom *argv) { t_gobj *self = (t_gobj *)self_; + gobj_changed3(self,self,argc,argv); + } + + void gobj_changed3 (void *self_, t_gobj *origin, int argc, t_atom *argv) { + t_gobj *self = (t_gobj *)self_; t_appendix *d = self->g_adix; int i; *************** *** 83,87 **** t_gobj *obs = d->obs[i]; t_notice ice = obs->g_pd->c_notice; ! if (ice) ice(obs,self,argc,argv); else post("null func ptr for class %s",self->g_pd->c_name->s_name); --- 88,92 ---- 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); *************** *** 90,95 **** --- 95,165 ---- //-------------------------------------------------------------------------- + // some simple ringbuffer-style queue + // when this becomes too small, use a bigger constant or a better impl. + + #define QUEUE_SIZE 1024 + typedef struct _queue { + int start,len; + void *o[QUEUE_SIZE]; + } t_queue; + + t_queue *queue_new (void) { + t_queue *self = (t_queue *)malloc(sizeof(t_queue)); + self->start = self->len = 0; + return self; + } + + void queue_put (t_queue *self, void *stuff) { + if (self->len==QUEUE_SIZE) {bug("queue full"); return;} + self->o[(self->start+self->len)%QUEUE_SIZE] = stuff; + self->len++; + } + + void *queue_get (t_queue *self) { + void *r = self->o[self->start]; + self->start = (self->start+1)%QUEUE_SIZE; + self->len--; + return r; + } + + int queue_empty (t_queue *self) {return self->len==0;} + int queue_full (t_queue *self) {return self->len==QUEUE_SIZE;} + + //-------------------------------------------------------------------------- // update manager: + typedef struct _manager { + t_queue *q; + t_clock *clock; + } t_manager; + + t_manager *manager; + + void manager_call (void *foo) { + t_manager *self = (t_manager *)foo; + while (!queue_empty(self->q)) { + t_gobj *o = (t_gobj *)queue_get(self->q); + if (!o->g_adix->dirtyc) continue; + pd_upload(o); + o->g_adix->dirtyc = 0; + } + clock_delay(self->clock,50); + } + + void manager_notice (t_manager *self, t_gobj *origin, int argc, t_atom *argv) { + t_appendix *a = (t_appendix *)origin->g_adix; + if (!a->dirtyc) queue_put(self->q,origin); + a->dirtyc = 1; + SETFLOAT(a->dirtyv,-1); /* in the future this will contain real data */ + } + + t_manager *manager_new (void) { + t_manager *self = (t_manager *)malloc(sizeof(t_manager)); + self->q = queue_new(); + self->clock = clock_new(self,(t_method)manager_call); + clock_delay(self->clock,0); + return self; + } + //-------------------------------------------------------------------------- /* the "glist" class is also known as "canvas" (the two used *************** *** 13336,13340 **** --- 13406,13416 ---- void canvas_notice(t_gobj *x, struct _gobj *origin, int argc, t_atom *argv) { + t_canvas *self = (t_canvas *)x; post("canvas_notice(%p,%p,%d,...)",x,origin,argc); + if (self->gl_havewindow) { + manager_notice(manager,origin,argc,argv); + } else { + + } } *************** *** 13438,13441 **** --- 13514,13518 ---- void desire_setup(void) { + manager = manager_new(); #define S(x) x##_setup(); S(vinlet) S(voutlet)

1 0

pd/src m_pd.h,1.4.4.11.2.12,1.4.4.11.2.13
by Mathieu Bouchard 29 Oct '05

29 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1701 Modified Files: Tag: devel_0_39 m_pd.h Log Message: added observer notice forwarder (gobj_changed3). added manager fields (dirtyc+dirtyv in t_appendix). Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.12 retrieving revision 1.4.4.11.2.13 diff -C2 -d -r1.4.4.11.2.12 -r1.4.4.11.2.13 *** m_pd.h 28 Oct 2005 11:10:08 -0000 1.4.4.11.2.12 --- m_pd.h 28 Oct 2005 23:13:21 -0000 1.4.4.11.2.13 *************** *** 160,167 **** typedef t_class *t_pd; /* pure datum: nothing but a class pointer */ #ifdef DESIRE ! /* _gobj_appendix is made of the things that logically ought to be in _gobj but have ! been put in a separate memory space because this allows most externals to work ! unmodified on both DesireData and non-DesireData systems. ! The equivalent in the Tcl side is really part of every view object Note: The observer func ptr has been moved to the t_class. Note: names of fields are stored in each t_class. --- 160,167 ---- typedef t_class *t_pd; /* pure datum: nothing but a class pointer */ #ifdef DESIRE ! /* _gobj_appendix (by matju) is made of the things that logically ought to be ! in _gobj but have been put in a separate memory space because this allows ! most externals to work unmodified on both DesireData and non-DesireData systems. ! The equivalent in the Tcl side is really part of every view object. Note: The observer func ptr has been moved to the t_class. Note: names of fields are stored in each t_class. *************** *** 175,180 **** struct _gobj **obs; /* I spy with my little I */ /* miscellaneous */ ! int dirty; /* now this belongs to the update-manager and not the observable */ ! void *dirty2; /* for future use */ } t_appendix; #endif --- 175,184 ---- struct _gobj **obs; /* I spy with my little I */ /* miscellaneous */ ! /* the dirty stuff should be a hashtable in t_manager. this is a hack ! until pd has hashtables other than the big global one. having the dirties ! here sort of defeats the purpose of the observer pattern *and* will cause ! trouble with multiple-clients. */ ! int dirtyc; ! t_atom dirtyv[3]; } t_appendix; #endif *************** *** 364,367 **** --- 368,372 ---- EXTERN void gobj_changed (void /*t_gobj*/ *self, const char *k); EXTERN void gobj_changed2 (void /*t_gobj*/ *self, int argc, t_atom *argv); + EXTERN void gobj_changed3 (void /*t_gobj*/ *self, t_gobj *origin, int argc, t_atom *argv); #endif

1 0

pd/src desire.c, 1.1.2.38, 1.1.2.39 g_rtext.c, 1.4.8.3, 1.4.8.4
by Mathieu Bouchard 28 Oct '05

28 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25315 Modified Files: Tag: devel_0_39 desire.c g_rtext.c Log Message: C++ support Index: g_rtext.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_rtext.c,v retrieving revision 1.4.8.3 retrieving revision 1.4.8.4 diff -C2 -d -r1.4.8.3 -r1.4.8.4 *** g_rtext.c 16 Sep 2005 19:20:04 -0000 1.4.8.3 --- g_rtext.c 28 Oct 2005 12:53:07 -0000 1.4.8.4 *************** *** 440,444 **** x->x_buf[i- ndel] = x->x_buf[i]; newsize = x->x_bufsize - ndel; ! x->x_buf = resizebytes(x->x_buf, x->x_bufsize, newsize); x->x_bufsize = newsize; --- 440,444 ---- x->x_buf[i- ndel] = x->x_buf[i]; newsize = x->x_bufsize - ndel; ! x->x_buf = (char *)resizebytes(x->x_buf, x->x_bufsize, newsize); x->x_bufsize = newsize; *************** *** 446,450 **** { newsize = x->x_bufsize+1; ! x->x_buf = resizebytes(x->x_buf, x->x_bufsize, newsize); for (i = x->x_bufsize; i > x->x_selstart; i--) x->x_buf[i] = x->x_buf[i-1]; --- 446,450 ---- { newsize = x->x_bufsize+1; ! x->x_buf = (char *)resizebytes(x->x_buf, x->x_bufsize, newsize); for (i = x->x_bufsize; i > x->x_selstart; i--) x->x_buf[i] = x->x_buf[i-1]; Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.38 retrieving revision 1.1.2.39 diff -C2 -d -r1.1.2.38 -r1.1.2.39 *** desire.c 27 Oct 2005 14:19:50 -0000 1.1.2.38 --- desire.c 28 Oct 2005 12:53:07 -0000 1.1.2.39 *************** *** 31,37 **** sys_vgui(args); } while(0) //-------------------------------------------------------------------------- t_appendix *appendix_new (t_gobj *master) { ! t_appendix *self = malloc(sizeof(t_appendix)); self->master = master; self->next = 0; --- 31,43 ---- sys_vgui(args); } while(0) + #define template templaet + //-------------------------------------------------------------------------- + // t_appendix: an extension to t_gobj written by Mathieu Bouchard so that + // all t_gobj's may have new fields without sacrificing binary compat with + // externals compiled for PureMSP. + t_appendix *appendix_new (t_gobj *master) { ! t_appendix *self = (t_appendix *)malloc(sizeof(t_appendix)); self->master = master; self->next = 0; *************** *** 46,50 **** int i; for (i=0; i<d->nobs; i++) if (d->obs[i]) return; ! d->obs=realloc(d->obs,sizeof(t_gobj *)*(1+d->nobs)); d->obs[d->nobs++] = observer; } --- 52,56 ---- int i; for (i=0; i<d->nobs; i++) if (d->obs[i]) return; ! d->obs=(t_gobj **)realloc(d->obs,sizeof(t_gobj *)*(1+d->nobs)); d->obs[d->nobs++] = observer; } *************** *** 75,80 **** int i; for (i=0; i<d->nobs; i++) { ! t_notice ice = self->g_pd->c_notice; ! if (ice) ice(d->obs[i],self,argc,argv); else post("null func ptr for class %s",self->g_pd->c_name->s_name); --- 81,87 ---- int i; for (i=0; i<d->nobs; i++) { ! t_gobj *obs = d->obs[i]; ! t_notice ice = obs->g_pd->c_notice; ! if (ice) ice(obs,self,argc,argv); else post("null func ptr for class %s",self->g_pd->c_name->s_name); *************** *** 83,86 **** --- 90,96 ---- //-------------------------------------------------------------------------- + // update manager: + + //-------------------------------------------------------------------------- /* the "glist" class is also known as "canvas" (the two used to be different but are now unified except for some fossilized names.). *************** *** 192,196 **** freebytes(canvas_newargv, canvas_newargc * sizeof(t_atom)); canvas_newargc = argc; ! canvas_newargv = copybytes(argv, argc * sizeof(t_atom)); } --- 202,206 ---- freebytes(canvas_newargv, canvas_newargc * sizeof(t_atom)); canvas_newargc = argc; ! canvas_newargv = (t_atom *)copybytes(argv, argc * sizeof(t_atom)); } *************** *** 1737,1741 **** static void canvas_undo_disconnect(t_canvas *x, void *z, int action) { ! t_undo_connect *buf = z; if (action == UNDO_UNDO) { --- 1747,1751 ---- static void canvas_undo_disconnect(t_canvas *x, void *z, int action) { ! t_undo_connect *buf = (t_undo_connect *)z; if (action == UNDO_UNDO) { *************** *** 1830,1834 **** static void canvas_undo_cut(t_canvas *x, void *z, int action) { ! t_undo_cut *buf = z; int mode = buf->u_mode; if (action == UNDO_UNDO) --- 1840,1844 ---- static void canvas_undo_cut(t_canvas *x, void *z, int action) { ! t_undo_cut *buf = (t_undo_cut *)z; int mode = buf->u_mode; if (action == UNDO_UNDO) *************** *** 1943,1947 **** static void canvas_undo_move(t_canvas *x, void *z, int action) { ! t_undo_move *buf = z; if (action == UNDO_UNDO || action == UNDO_REDO) { --- 1953,1957 ---- static void canvas_undo_move(t_canvas *x, void *z, int action) { ! t_undo_move *buf = (t_undo_move *)z; if (action == UNDO_UNDO || action == UNDO_REDO) { *************** *** 1986,1990 **** static void canvas_undo_paste(t_canvas *x, void *z, int action) { ! t_undo_paste *buf = z; if (action == UNDO_UNDO) { --- 1996,2000 ---- static void canvas_undo_paste(t_canvas *x, void *z, int action) { ! t_undo_paste *buf = (t_undo_paste *)z; if (action == UNDO_UNDO) { *************** *** 6515,6519 **** t_template *newtemplate, *existtemplate; t_symbol *templatesym; ! t_atom *templateargs = getbytes(0); int ntemplateargs = 0, newnargs; nline = canvas_scanbinbuf(natoms, vec, &message, &nextmsg); --- 6525,6529 ---- t_template *newtemplate, *existtemplate; t_symbol *templatesym; ! t_atom *templateargs = (t_atom *)getbytes(0); int ntemplateargs = 0, newnargs; nline = canvas_scanbinbuf(natoms, vec, &message, &nextmsg); *************** *** 6806,6810 **** { int i; ! t_symbol **templatevec = getbytes(0); int ntemplates = 0; t_gobj *y; --- 6816,6820 ---- { int i; ! t_symbol **templatevec = (t_symbol **)getbytes(0); int ntemplates = 0; t_gobj *y; *************** *** 6970,6974 **** static void canvas_savetemplatesto(t_canvas *x, t_binbuf *b, int wholething) { ! t_symbol **templatevec = getbytes(0); int i, ntemplates = 0; canvas_collecttemplatesfor(x, &ntemplates, &templatevec, wholething); --- 6980,6984 ---- static void canvas_savetemplatesto(t_canvas *x, t_binbuf *b, int wholething) { ! t_symbol **templatevec = (t_symbol **)getbytes(0); int i, ntemplates = 0; canvas_collecttemplatesfor(x, &ntemplates, &templatevec, wholething); *************** *** 8035,8039 **** binbuf_gettext(b, &buf, &bufsize); binbuf_free(b); ! buf = t_resizebytes(buf, bufsize, bufsize+1); buf[bufsize] = 0; sprintf(buf2, "pdtk_data_dialog %%s {"); --- 8045,8049 ---- binbuf_gettext(b, &buf, &bufsize); binbuf_free(b); ! buf = (char *)t_resizebytes(buf, bufsize, bufsize+1); buf[bufsize] = 0; sprintf(buf2, "pdtk_data_dialog %%s {"); *************** *** 8417,8421 **** int oldelemsize = sizeof(t_word) * tfrom->t_n, newelemsize = sizeof(t_word) * tto->t_n; ! char *newarray = getbytes(newelemsize * a->a_n); char *oldarray = a->a_vec; if (a->a_elemsize != oldelemsize) --- 8427,8431 ---- int oldelemsize = sizeof(t_word) * tfrom->t_n, newelemsize = sizeof(t_word) * tto->t_n; ! char *newarray = (char *)getbytes(newelemsize * a->a_n); char *oldarray = a->a_vec; if (a->a_elemsize != oldelemsize) *************** *** 10274,10278 **** t_gstub *gstub_new(t_glist *gl, t_array *a) { ! t_gstub *gs = t_getbytes(sizeof(*gs)); if (gl) { --- 10284,10288 ---- t_gstub *gstub_new(t_glist *gl, t_array *a) { ! t_gstub *gs = (t_gstub *)t_getbytes(sizeof(*gs)); if (gl) { *************** *** 11453,11458 **** float fr; int scale; ! void *out_rms; ! void *out_peak; } t_vu; --- 11463,11468 ---- float fr; int scale; ! t_outlet *out_rms; ! t_outlet *out_peak; } t_vu; *************** *** 11644,11649 **** } t_message; - static t_class *message_class, *mresp_class; - static void message_bang(t_message *x) {binbuf_eval(x->m_text.te_binbuf, &x->m_mresp.mr_pd, 0, 0);} --- 11654,11657 ---- *************** *** 11684,11688 **** { t_message *x = (t_message *)pd_new(message_class); ! x->m_mresp.mr_pd = mresp_class; x->m_mresp.mr_outlet = outlet_new(&x->m_text, &s_float); x->m_text.te_width = 0; /* don't know it yet. */ --- 11692,11696 ---- { t_message *x = (t_message *)pd_new(message_class); ! x->m_mresp.mr_pd = 0; /* was mresp_class */ x->m_mresp.mr_outlet = outlet_new(&x->m_text, &s_float); x->m_text.te_width = 0; /* don't know it yet. */ *************** *** 12905,12909 **** t_foo foo = {0,0,b}; if (!b) return; ! pd_savehead(b,x,isvert(x)?"vsl":"hsl"); slider_pickle(x,&foo); } --- 12913,12917 ---- t_foo foo = {0,0,b}; if (!b) return; ! pd_savehead(b,x,(char *)(isvert(x)?"vsl":"hsl")); slider_pickle(x,&foo); } *************** *** 12912,12916 **** { t_foo foo = { argc, argv, 0 }; ! binbuf_update((t_iemgui *)x,gensym(isvert(x)?"vsl":"hsl"),argc,argv); if (!slider_pickle(x,&foo)) return; x->pos = x->val = x->isa&1 ? x->val : 0; --- 12920,12924 ---- { t_foo foo = { argc, argv, 0 }; ! binbuf_update((t_iemgui *)x,gensym((char *)(isvert(x)?"vsl":"hsl")),argc,argv); if (!slider_pickle(x,&foo)) return; x->pos = x->val = x->isa&1 ? x->val : 0;

1 0

pd/src x_connective.c,1.3.4.1.2.4,1.3.4.1.2.5
by Mathieu Bouchard 28 Oct '05

28 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv411 Modified Files: Tag: devel_0_39 x_connective.c Log Message: C++ support Index: x_connective.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_connective.c,v retrieving revision 1.3.4.1.2.4 retrieving revision 1.3.4.1.2.5 diff -C2 -d -r1.3.4.1.2.4 -r1.3.4.1.2.5 *** x_connective.c 25 Jul 2005 18:21:30 -0000 1.3.4.1.2.4 --- x_connective.c 28 Oct 2005 12:18:42 -0000 1.3.4.1.2.5 *************** *** 745,749 **** if (x->x_nptr) post("pack_bang: warning: reentry with pointers unprotected"); ! outvec = t_getbytes(size); reentered = 1; } --- 745,749 ---- if (x->x_nptr) post("pack_bang: warning: reentry with pointers unprotected"); ! outvec = (t_atom *)t_getbytes(size); reentered = 1; }

1 0

pd/src m_binbuf.c, 1.4.4.1, 1.4.4.1.2.1 m_class.c, 1.3.4.7.2.5, 1.3.4.7.2.6 m_sched.c, 1.5.4.35.2.5, 1.5.4.35.2.6
by Mathieu Bouchard 28 Oct '05

28 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32053 Modified Files: Tag: devel_0_39 m_binbuf.c m_class.c m_sched.c Log Message: C++ support Index: m_class.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_class.c,v retrieving revision 1.3.4.7.2.5 retrieving revision 1.3.4.7.2.6 diff -C2 -d -r1.3.4.7.2.5 -r1.3.4.7.2.6 *** m_class.c 22 Oct 2005 19:51:24 -0000 1.3.4.7.2.5 --- m_class.c 28 Oct 2005 12:18:23 -0000 1.3.4.7.2.6 *************** *** 221,225 **** c->c_name = c->c_helpname = s; c->c_size = size; ! c->c_methods = t_getbytes(0); c->c_nmethod = 0; c->c_freemethod = (t_method)freemethod; --- 221,225 ---- c->c_name = c->c_helpname = s; c->c_size = size; ! c->c_methods = (t_methodentry *)t_getbytes(0); c->c_nmethod = 0; c->c_freemethod = (t_method)freemethod; *************** *** 235,239 **** c->c_firsttip = gensym("?"); #ifdef DESIRE ! c->c_fields = malloc(sizeof(t_symbol *)*31); c->c_nfields = 0; #endif --- 235,239 ---- c->c_firsttip = gensym("?"); #ifdef DESIRE ! c->c_fields = (t_symbol **)malloc(sizeof(t_symbol *)*31); c->c_nfields = 0; #endif *************** *** 351,355 **** else { ! c->c_methods = t_resizebytes(c->c_methods, c->c_nmethod * sizeof(*c->c_methods), (c->c_nmethod + 1) * sizeof(*c->c_methods)); --- 351,355 ---- else { ! c->c_methods = (t_methodentry *)t_resizebytes(c->c_methods, c->c_nmethod * sizeof(*c->c_methods), (c->c_nmethod + 1) * sizeof(*c->c_methods)); *************** *** 581,585 **** { sym2 = (t_symbol *)t_getbytes(sizeof(*sym2)); ! sym2->s_name = t_getbytes(length+1); sym2->s_next = 0; sym2->s_thing = 0; --- 581,585 ---- { sym2 = (t_symbol *)t_getbytes(sizeof(*sym2)); ! sym2->s_name = (char *)t_getbytes(length+1); sym2->s_next = 0; sym2->s_thing = 0; *************** *** 631,635 **** { tryingalready = 1; ! typedmess(dummy, s, argc, argv); tryingalready = 0; return; --- 631,635 ---- { tryingalready = 1; ! typedmess((t_pd *)dummy, s, argc, argv); tryingalready = 0; return; Index: m_binbuf.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_binbuf.c,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.1.2.1 diff -C2 -d -r1.4.4.1 -r1.4.4.1.2.1 *** m_binbuf.c 5 Nov 2004 13:57:56 -0000 1.4.4.1 --- m_binbuf.c 28 Oct 2005 12:18:23 -0000 1.4.4.1.2.1 *************** *** 35,39 **** t_binbuf *x = (t_binbuf *)t_getbytes(sizeof(*x)); x->b_n = 0; ! x->b_vec = t_getbytes(0); return (x); } --- 35,39 ---- t_binbuf *x = (t_binbuf *)t_getbytes(sizeof(*x)); x->b_n = 0; ! x->b_vec = (t_atom *)t_getbytes(0); return (x); } *************** *** 49,53 **** t_binbuf *x = (t_binbuf *)t_getbytes(sizeof(*x)); x->b_n = y->b_n; ! x->b_vec = t_getbytes(x->b_n * sizeof(*x->b_vec)); memcpy(x->b_vec, y->b_vec, x->b_n * sizeof(*x->b_vec)); return (x); --- 49,53 ---- t_binbuf *x = (t_binbuf *)t_getbytes(sizeof(*x)); x->b_n = y->b_n; ! x->b_vec = (t_atom *)t_getbytes(x->b_n * sizeof(*x->b_vec)); memcpy(x->b_vec, y->b_vec, x->b_n * sizeof(*x->b_vec)); return (x); *************** *** 56,60 **** void binbuf_clear(t_binbuf *x) { ! x->b_vec = t_resizebytes(x->b_vec, x->b_n * sizeof(*x->b_vec), 0); x->b_n = 0; } --- 56,60 ---- void binbuf_clear(t_binbuf *x) { ! x->b_vec = (t_atom *)t_resizebytes(x->b_vec, x->b_n * sizeof(*x->b_vec), 0); x->b_n = 0; } *************** *** 73,77 **** t_freebytes(x->b_vec, x->b_n * sizeof(*x->b_vec)); ! x->b_vec = t_getbytes(nalloc * sizeof(*x->b_vec)); ap = x->b_vec; x->b_n = 0; --- 73,77 ---- t_freebytes(x->b_vec, x->b_n * sizeof(*x->b_vec)); ! x->b_vec = (t_atom *)t_getbytes(nalloc * sizeof(*x->b_vec)); ap = x->b_vec; x->b_n = 0; *************** *** 198,202 **** if (natom == nalloc) { ! x->b_vec = t_resizebytes(x->b_vec, nalloc * sizeof(*x->b_vec), nalloc * (2*sizeof(*x->b_vec))); nalloc = nalloc * 2; --- 198,202 ---- if (natom == nalloc) { ! x->b_vec = (t_atom *)t_resizebytes(x->b_vec, nalloc * sizeof(*x->b_vec), nalloc * (2*sizeof(*x->b_vec))); nalloc = nalloc * 2; *************** *** 206,210 **** } /* reallocate the vector to exactly the right size */ ! x->b_vec = t_resizebytes(x->b_vec, nalloc * sizeof(*x->b_vec), natom * sizeof(*x->b_vec)); x->b_n = natom; --- 206,210 ---- } /* reallocate the vector to exactly the right size */ ! x->b_vec = (t_atom *)t_resizebytes(x->b_vec, nalloc * sizeof(*x->b_vec), natom * sizeof(*x->b_vec)); x->b_n = natom; *************** *** 214,218 **** void binbuf_gettext(t_binbuf *x, char **bufp, int *lengthp) { ! char *buf = getbytes(0), *newbuf; int length = 0; char string[MAXPDSTRING]; --- 214,218 ---- void binbuf_gettext(t_binbuf *x, char **bufp, int *lengthp) { ! char *buf = (char *)getbytes(0), *newbuf; int length = 0; char string[MAXPDSTRING]; *************** *** 227,231 **** atom_string(ap, string, MAXPDSTRING); newlength = length + strlen(string) + 1; ! if (!(newbuf = resizebytes(buf, length, newlength))) break; buf = newbuf; strcpy(buf + length, string); --- 227,231 ---- atom_string(ap, string, MAXPDSTRING); newlength = length + strlen(string) + 1; ! if (!(newbuf = (char *)resizebytes(buf, length, newlength))) break; buf = newbuf; strcpy(buf + length, string); *************** *** 236,240 **** if (length && buf[length-1] == ' ') { ! if (newbuf = t_resizebytes(buf, length, length-1)) { buf = newbuf; --- 236,240 ---- if (length && buf[length-1] == ' ') { ! if (newbuf = (char *)t_resizebytes(buf, length, length-1)) { buf = newbuf; *************** *** 253,257 **** int newsize = x->b_n + argc, i; t_atom *ap; ! if (ap = t_resizebytes(x->b_vec, x->b_n * sizeof(*x->b_vec), newsize * sizeof(*x->b_vec))) x->b_vec = ap; --- 253,257 ---- int newsize = x->b_n + argc, i; t_atom *ap; ! if (ap = (t_atom *)t_resizebytes(x->b_vec, x->b_n * sizeof(*x->b_vec), newsize * sizeof(*x->b_vec))) x->b_vec = ap; *************** *** 363,367 **** int newsize = x->b_n + argc, i; t_atom *ap; ! if (ap = t_resizebytes(x->b_vec, x->b_n * sizeof(*x->b_vec), newsize * sizeof(*x->b_vec))) x->b_vec = ap; --- 363,367 ---- int newsize = x->b_n + argc, i; t_atom *ap; ! if (ap = (t_atom *)t_resizebytes(x->b_vec, x->b_n * sizeof(*x->b_vec), newsize * sizeof(*x->b_vec))) x->b_vec = ap; *************** *** 503,506 **** --- 503,512 ---- } else s = atom_getsymbol(at); + /* IMPD: allows messages to unbound objects, via pointers */ + /* target = s->s_thing; + if (!target) { + if (!sscanf(s->s_name,".x%x",&target)) target=0; + } + */ if (!(target = s->s_thing)) { *************** *** 652,656 **** } if ((length = lseek(fd, 0, SEEK_END)) < 0 || lseek(fd, 0, SEEK_SET) < 0 ! || !(buf = t_getbytes(length))) { fprintf(stderr, "lseek: "); --- 658,662 ---- } if ((length = lseek(fd, 0, SEEK_END)) < 0 || lseek(fd, 0, SEEK_SET) < 0 ! || !(buf = (char *)t_getbytes(length))) { fprintf(stderr, "lseek: "); *************** *** 919,923 **** { SETSYMBOL(outmess, gensym("#X")); ! SETSYMBOL(outmess + 1, gensym( (strcmp(second, "message") ? "text" : "msg"))); outmess[2] = nextmess[2]; --- 925,929 ---- { SETSYMBOL(outmess, gensym("#X")); ! SETSYMBOL(outmess + 1, gensym((char *) (strcmp(second, "message") ? "text" : "msg"))); outmess[2] = nextmess[2]; *************** *** 981,985 **** atom_getfloatarg(2, natom, nextmess), atom_getfloatarg(3, natom, nextmess), ! gensym((natom > 5 ? "inlet~" : "inlet"))); nobj++; } --- 987,991 ---- atom_getfloatarg(2, natom, nextmess), atom_getfloatarg(3, natom, nextmess), ! gensym((char *)(natom > 5 ? "inlet~" : "inlet"))); nobj++; } *************** *** 990,994 **** atom_getfloatarg(2, natom, nextmess), atom_getfloatarg(3, natom, nextmess), ! gensym((natom > 5 ? "outlet~" : "outlet"))); nobj++; } --- 996,1000 ---- atom_getfloatarg(2, natom, nextmess), atom_getfloatarg(3, natom, nextmess), ! gensym((char *)(natom > 5 ? "outlet~" : "outlet"))); nobj++; } *************** *** 1124,1128 **** { SETSYMBOL(outmess, gensym("#P")); ! SETSYMBOL(outmess + 1, gensym( (strcmp(second, "msg") ? "comment" : "message"))); outmess[2] = nextmess[2]; --- 1130,1134 ---- { SETSYMBOL(outmess, gensym("#P")); ! SETSYMBOL(outmess + 1, gensym((char *) (strcmp(second, "msg") ? "comment" : "message"))); outmess[2] = nextmess[2]; Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.35.2.5 retrieving revision 1.5.4.35.2.6 diff -C2 -d -r1.5.4.35.2.5 -r1.5.4.35.2.6 *** m_sched.c 16 Jul 2005 11:02:37 -0000 1.5.4.35.2.5 --- m_sched.c 28 Oct 2005 12:18:23 -0000 1.5.4.35.2.6 *************** *** 746,761 **** void sys_callback(t_int (*callback) (t_int* argv), t_int* argv, t_int argc) { ! t_sched_callback* new = (t_sched_callback*) getbytes (sizeof(t_sched_callback)); ! new->function = callback; ! new->argv = (t_int*) copybytes (argv, argc * sizeof (t_int)); ! new->argc = argc; ! new->next = NULL; if (callback_fifo == NULL) callback_fifo = fifo_init(); ! fifo_put(callback_fifo, new); } --- 746,761 ---- void sys_callback(t_int (*callback) (t_int* argv), t_int* argv, t_int argc) { ! t_sched_callback* noo = (t_sched_callback*) getbytes (sizeof(t_sched_callback)); ! noo->function = callback; ! noo->argv = (t_int*) copybytes (argv, argc * sizeof (t_int)); ! noo->argc = argc; ! noo->next = NULL; if (callback_fifo == NULL) callback_fifo = fifo_init(); ! fifo_put(callback_fifo, noo); }

1 0

[PD-cvs] pd/src x_gui.c, 1.3.4.1.2.2, 1.3.4.1.2.3 x_list.c, 1.2.2.4, 1.2.2.5 x_qlist.c, 1.2, 1.2.8.1
by Mathieu Bouchard 28 Oct '05

28 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30051 Modified Files: Tag: devel_0_39 x_gui.c x_list.c x_qlist.c Log Message: C++ support Index: x_qlist.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_qlist.c,v retrieving revision 1.2 retrieving revision 1.2.8.1 diff -C2 -d -r1.2 -r1.2.8.1 *** x_qlist.c 6 Sep 2004 20:20:36 -0000 1.2 --- x_qlist.c 28 Oct 2005 12:17:11 -0000 1.2.8.1 *************** *** 16,20 **** t_object x_ob; t_outlet *x_bangout; ! void *x_binbuf; int x_onset; /* playback position */ t_clock *x_clock; --- 16,20 ---- t_object x_ob; t_outlet *x_bangout; ! t_binbuf *x_binbuf; int x_onset; /* playback position */ t_clock *x_clock; Index: x_gui.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_gui.c,v retrieving revision 1.3.4.1.2.2 retrieving revision 1.3.4.1.2.3 diff -C2 -d -r1.3.4.1.2.2 -r1.3.4.1.2.3 *** x_gui.c 5 Oct 2005 06:13:01 -0000 1.3.4.1.2.2 --- x_gui.c 28 Oct 2005 12:17:11 -0000 1.3.4.1.2.3 *************** *** 60,64 **** /* gcc could also dynamically reserve on the stack... keep this for later */ if(len > MAXPDSTRING) ! buf = getbytes(len); else buf = stbuf; --- 60,64 ---- /* gcc could also dynamically reserve on the stack... keep this for later */ if(len > MAXPDSTRING) ! buf = (char *)getbytes(len); else buf = stbuf; *************** *** 206,210 **** static void openpanel_bang(t_openpanel *x) { ! char*path=(x->x_path&&x->x_path->s_name)?x->x_path->s_name:"\"\""; sys_vgui("pdtk_openpanel {%s} {%s}\n", x->x_s->s_name, path); } --- 206,210 ---- static void openpanel_bang(t_openpanel *x) { ! const char*path=(x->x_path&&x->x_path->s_name)?x->x_path->s_name:"\"\""; sys_vgui("pdtk_openpanel {%s} {%s}\n", x->x_s->s_name, path); } *************** *** 259,263 **** static void savepanel_bang(t_savepanel *x) { ! char*path=(x->x_path&&x->x_path->s_name)?x->x_path->s_name:"\"\""; sys_vgui("pdtk_savepanel {%s} {%s}\n", x->x_s->s_name, path); } --- 259,263 ---- static void savepanel_bang(t_savepanel *x) { ! const char*path=(x->x_path&&x->x_path->s_name)?x->x_path->s_name:"\"\""; sys_vgui("pdtk_savepanel {%s} {%s}\n", x->x_s->s_name, path); } Index: x_list.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_list.c,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -C2 -d -r1.2.2.4 -r1.2.2.5 *** x_list.c 4 Oct 2005 16:42:33 -0000 1.2.2.4 --- x_list.c 28 Oct 2005 12:17:11 -0000 1.2.2.5 *************** *** 182,186 **** } t_list_append; ! static void *list_append_new(t_symbol *s, int argc, t_atom *argv) { t_list_append *x = (t_list_append *)pd_new(list_append_class); --- 182,186 ---- } t_list_append; ! static t_pd *list_append_new(t_symbol *s, int argc, t_atom *argv) { t_list_append *x = (t_list_append *)pd_new(list_append_class); *************** *** 189,193 **** outlet_new(&x->x_obj, &s_list); inlet_new(&x->x_obj, &x->x_alist.l_pd, 0, 0); ! return (x); } --- 189,193 ---- outlet_new(&x->x_obj, &s_list); inlet_new(&x->x_obj, &x->x_alist.l_pd, 0, 0); ! return (t_pd *)x; } *************** *** 242,246 **** } t_list_prepend; ! static void *list_prepend_new(t_symbol *s, int argc, t_atom *argv) { t_list_prepend *x = (t_list_prepend *)pd_new(list_prepend_class); --- 242,246 ---- } t_list_prepend; ! static t_pd *list_prepend_new(t_symbol *s, int argc, t_atom *argv) { t_list_prepend *x = (t_list_prepend *)pd_new(list_prepend_class); *************** *** 249,253 **** outlet_new(&x->x_obj, &s_list); inlet_new(&x->x_obj, &x->x_alist.l_pd, 0, 0); ! return (x); } --- 249,253 ---- outlet_new(&x->x_obj, &s_list); inlet_new(&x->x_obj, &x->x_alist.l_pd, 0, 0); ! return (t_pd *)x; } *************** *** 305,309 **** } t_list_split; ! static void *list_split_new(t_floatarg f) { t_list_split *x = (t_list_split *)pd_new(list_split_class); --- 305,309 ---- } t_list_split; ! static t_pd *list_split_new(t_floatarg f) { t_list_split *x = (t_list_split *)pd_new(list_split_class); *************** *** 313,317 **** floatinlet_new(&x->x_obj, &x->x_f); x->x_f = f; ! return (x); } --- 313,317 ---- floatinlet_new(&x->x_obj, &x->x_f); x->x_f = f; ! return (t_pd *)x; } *************** *** 360,368 **** } t_list_trim; ! static void *list_trim_new( void) { t_list_trim *x = (t_list_trim *)pd_new(list_trim_class); outlet_new(&x->x_obj, &s_list); ! return (x); } --- 360,368 ---- } t_list_trim; ! static t_pd *list_trim_new( void) { t_list_trim *x = (t_list_trim *)pd_new(list_trim_class); outlet_new(&x->x_obj, &s_list); ! return (t_pd *)x; }

1 0

pd/src s_file.c, 1.2.4.8.2.4, 1.2.4.8.2.5 s_inter.c, 1.5.4.10.2.9, 1.5.4.10.2.10 s_path.c, 1.3.4.6.2.1, 1.3.4.6.2.2
by Mathieu Bouchard 28 Oct '05

28 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20292 Modified Files: Tag: devel_0_39 s_file.c s_inter.c s_path.c Log Message: C++ support Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.9 retrieving revision 1.5.4.10.2.10 diff -C2 -d -r1.5.4.10.2.9 -r1.5.4.10.2.10 *** s_inter.c 8 Oct 2005 07:56:54 -0000 1.5.4.10.2.9 --- s_inter.c 28 Oct 2005 12:11:30 -0000 1.5.4.10.2.10 *************** *** 430,434 **** x->sr_socketreceivefn = socketreceivefn; x->sr_udp = udp; ! if (!(x->sr_inbuf = malloc(INBUFSIZE))) bug("t_socketreceiver");; return (x); } --- 430,434 ---- x->sr_socketreceivefn = socketreceivefn; x->sr_udp = udp; ! if (!(x->sr_inbuf = (char *)malloc(INBUFSIZE))) bug("t_socketreceiver");; return (x); } *************** *** 610,614 **** static void sys_trytogetmoreguibuf(int newsize) { ! char *newbuf = realloc(sys_guibuf, newsize); #if 0 static int sizewas; --- 610,614 ---- static void sys_trytogetmoreguibuf(int newsize) { ! char *newbuf = (char *)realloc(sys_guibuf, newsize); #if 0 static int sizewas; *************** *** 667,671 **** if (!sys_guibuf) { ! if (!(sys_guibuf = malloc(GUI_ALLOCCHUNK))) { fprintf(stderr, "Pd: couldn't allocate GUI buffer\n"); --- 667,671 ---- if (!sys_guibuf) { ! if (!(sys_guibuf = (char *)malloc(GUI_ALLOCCHUNK))) { fprintf(stderr, "Pd: couldn't allocate GUI buffer\n"); *************** *** 773,777 **** t_guiqueue *headwas = sys_guiqueuehead; sys_guiqueuehead = headwas->gq_next; ! (*headwas->gq_fn)(headwas->gq_client, headwas->gq_glist); t_freebytes(headwas, sizeof(*headwas)); if (sys_bytessincelastping >= wherestop) --- 773,777 ---- t_guiqueue *headwas = sys_guiqueuehead; sys_guiqueuehead = headwas->gq_next; ! (*headwas->gq_fn)((t_gobj *)headwas->gq_client, headwas->gq_glist); t_freebytes(headwas, sizeof(*headwas)); if (sys_bytessincelastping >= wherestop) *************** *** 823,827 **** gqnextptr = &gq->gq_next; } ! gq = t_getbytes(sizeof(*gq)); gq->gq_next = 0; gq->gq_client = client; --- 823,827 ---- gqnextptr = &gq->gq_next; } ! gq = (t_guiqueue *)t_getbytes(sizeof(*gq)); gq->gq_next = 0; gq->gq_client = client; *************** *** 952,956 **** if (sys_nogui) { ! sys_callback((void*)fake_initfromgui,0,0); } else if (sys_guisetportnumber) /* GUI exists and sent us a port number */ --- 952,956 ---- if (sys_nogui) { ! sys_callback((t_int(*)(t_int*))fake_initfromgui,0,0); } else if (sys_guisetportnumber) /* GUI exists and sent us a port number */ *************** *** 989,992 **** --- 989,998 ---- else /* default behavior: start up the GUI ourselves. */ { + #ifdef DESIRE + fprintf(stderr, + "PureData in DesireData mode does not currently support starting without\n" + "a -guiport option. Please start using the command 'wish desire.tk' instead.\n"); + exit(1); + #else #ifdef MSW char scriptbuf[MAXPDSTRING+30], wishbuf[MAXPDSTRING+30], portbuf[80]; *************** *** 1178,1181 **** --- 1184,1188 ---- ; #endif /* MSW */ + #endif /* DESIRE */ } *************** *** 1363,1367 **** pthread_attr_setschedpolicy(&w_attr, SCHED_FIFO); /* use rt scheduling */ ! status = pthread_create(&watchdog_id, &w_attr, (void*) watchdog_thread, NULL); } --- 1370,1375 ---- pthread_attr_setschedpolicy(&w_attr, SCHED_FIFO); /* use rt scheduling */ ! status = pthread_create(&watchdog_id, &w_attr, (void*(*)(void*)) watchdog_thread, NULL); ! return status; /* what is this function supposed to return anyway? it tried returning void though declared as int */ } *************** *** 1411,1415 **** timeout.tv_nsec = now.tv_usec * 1000; ! sys_callback((void*)watchdog_callback, 0, 0); status = pthread_cond_timedwait(&watchdog_cond, &watchdog_mutex, &timeout); --- 1419,1423 ---- timeout.tv_nsec = now.tv_usec * 1000; ! sys_callback((t_int(*)(t_int*))watchdog_callback, 0, 0); status = pthread_cond_timedwait(&watchdog_cond, &watchdog_mutex, &timeout); Index: s_file.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_file.c,v retrieving revision 1.2.4.8.2.4 retrieving revision 1.2.4.8.2.5 diff -C2 -d -r1.2.4.8.2.4 -r1.2.4.8.2.5 *** s_file.c 24 Sep 2005 06:11:45 -0000 1.2.4.8.2.4 --- s_file.c 28 Oct 2005 12:11:30 -0000 1.2.4.8.2.5 *************** *** 63,67 **** } lseek(fd, 0, 0); ! if (!(sys_prefbuf = malloc(length + 2))) { error("couldn't allocate memory for preferences buffer"); --- 63,67 ---- } lseek(fd, 0, 0); ! if (!(sys_prefbuf = (char *)malloc(length + 2))) { error("couldn't allocate memory for preferences buffer"); Index: s_path.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_path.c,v retrieving revision 1.3.4.6.2.1 retrieving revision 1.3.4.6.2.2 diff -C2 -d -r1.3.4.6.2.1 -r1.3.4.6.2.2 *** s_path.c 16 Oct 2005 10:46:40 -0000 1.3.4.6.2.1 --- s_path.c 28 Oct 2005 12:11:30 -0000 1.3.4.6.2.2 *************** *** 406,410 **** { buf[1000] = 0; ! if (!(rcargv[i] = malloc(strlen(buf) + 1))) goto cleanup; strcpy(rcargv[i], buf); --- 406,410 ---- { buf[1000] = 0; ! if (!(rcargv[i] = (char *)malloc(strlen(buf) + 1))) goto cleanup; strcpy(rcargv[i], buf); *************** *** 498,502 **** if (!c || isspace(c)) { ! char *foo = malloc(i - beginstring + 1); if (!foo) return; --- 498,502 ---- if (!c || isspace(c)) { ! char *foo = (char *)malloc(i - beginstring + 1); if (!foo) return;

1 0

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 October 2005