Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25583
Modified Files: Tag: desiredata desire.c Log Message: fix canvas_add
Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.67 retrieving revision 1.1.2.217.2.68 diff -C2 -d -r1.1.2.217.2.67 -r1.1.2.217.2.68 *** desire.c 13 Dec 2006 15:58:00 -0000 1.1.2.217.2.67 --- desire.c 13 Dec 2006 18:50:13 -0000 1.1.2.217.2.68 *************** *** 280,289 **** void manager_call (void *foo) { t_manager *self = (t_manager *)foo; - /*if (self->q->len) post("manager_call: %d notices",self->q->len);*/ while (!queue_empty(self->q)) { t_gobj *o = (t_gobj *)queue_get(self->q); 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; --- 280,287 ---- *************** *** 295,304 **** t_manager *self = (t_manager *)self_; t_appendix *a = (t_appendix *)origin->g_adix; - /*post("manager_notice(%p,%p,%d,...)",self,origin,argc);*/ if (!a->dirtyc) { queue_put(self->q,origin); a->dirtyc = 1; - } else { - /*post("double dirty: a->dirtyc=%d",a->dirtyc);*/ } SETFLOAT(a->dirtyv,-1); /* in the future this may contain real data instead */ --- 293,299 ---- *************** *** 2219,2224 **** static void graph_graphrect(t_gobj *z, t_canvas *canvas, int *xp1, int *yp1, int *xp2, int *yp2);
! 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); --- 2214,2218 ---- static void graph_graphrect(t_gobj *z, t_canvas *canvas, int *xp1, int *yp1, int *xp2, int *yp2);
! void canvas_add_debug(t_canvas *x, t_gobj *y) { if (!y->_class->c_patchable) { printf("canvas_add %p %p class=%s (non-t_text)\n",x,y,y->_class->c_name->s_name); *************** *** 2234,2249 **** } } ! #endif
gobj_setcanvas(y,x); - - /* delay first uploading of object (DesireData <= 2006.08.19) */ - /* gobj_changed(y,0); */ - /* don't delay first uploading of object (DesireData >= 2006.08.19) */ - /* pd_upload(y); */ - /* if (canvas_isvisible(x)) gobj_vis(y,x,1); */ - /* if (canvas_isvisible(x)) pd_upload(y);*/ - pd_upload(y); /*FIXME*/ - y->g_next = 0; if (!x->list) x->list = y; else { --- 2228,2236 ---- } } ! }
+ void canvas_add(t_canvas *x, t_gobj *y) { + //canvas_add_debug(x,y); gobj_setcanvas(y,x); y->g_next = 0; if (!x->list) x->list = y; else {