Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16428

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.109 retrieving revision 1.1.2.110 diff -C2 -d -r1.1.2.109 -r1.1.2.110 *** desire.c 20 Aug 2006 06:04:52 -0000 1.1.2.109 --- desire.c 20 Aug 2006 19:56:01 -0000 1.1.2.110 *************** *** 5000,5025 **** if (x->gl_editor->e_grab == y) x->gl_editor->e_grab = 0; if (glist_isselected(x, y)) glist_deselect(x, y); - - /* HACK -- we had phantom outlets not getting erased on the - screen because the canvas_setdeleting() mechanism is too - crude. LATER carefully set up rules for when the rtexts - should exist, so that they stay around until all the - steps of becoming invisible are done. In the meantime, just - zap the inlets and outlets here... */ - if (pd_class(&y->g_pd) == canvas_class) - { - t_glist *gl = (t_glist *)y; - if (gl->gl_isgraph) - { - char tag[80]; - sprintf(tag, "graph%lx", (t_int)gl); - glist_eraseiofor(x, &gl->gl_obj, tag); - } - else - { - text_eraseborder(&gl->gl_obj, x, - rtext_gettag(glist_findrtext(x, &gl->gl_obj))); - } - } } /* if we're a drawing command, erase all scalars now, before deleting --- 5000,5003 ---- *************** *** 5032,5036 **** if (glist_isvisible(canvas)) { /*!@#$ race condition because the queue might still contain something */ ! sys_mgui(y,"_delete"); }

--- 5010,5014 ---- if (glist_isvisible(canvas)) { /*!@#$ race condition because the queue might still contain something */ ! sys_mgui(y,"_delete",""); }

*************** *** 5542,5546 **** sys_mgui(x,"ninlets=","i",0/*obj_ninlets(x)*/); sys_mgui(x,"noutlets=","i",0/*obj_noutlets(x)*/); ! } else glist_eraseiofor(parent_glist, &x->gl_obj, tag); /* if we look like a graph but have been moved to a toplevel, just show the bounding rectangle */ --- 5520,5524 ---- sys_mgui(x,"ninlets=","i",0/*obj_ninlets(x)*/); sys_mgui(x,"noutlets=","i",0/*obj_noutlets(x)*/); ! } /* if we look like a graph but have been moved to a toplevel, just show the bounding rectangle */ *************** *** 11184,11195 **** move anything because the GUI does that for us. */ } ! static void text_select(t_gobj *z, t_glist *glist, int state) { ! // sys_mgui(z,"wb_select","i",state); ! // rtext_select(y, state); //??? ! } ! static void text_activate(t_gobj *z, t_glist *glist, int state) { ! // sys_mgui(z,"wb_activate","i",state); ! // what is this function supposed to be for anyway? ! } static void text_delete(t_gobj *z, t_glist *glist) {sys_mgui(z,"delete","");}

--- 11162,11167 ---- move anything because the GUI does that for us. */ } ! static void text_select(t_gobj *z, t_glist *glist, int state) {} ! static void text_activate(t_gobj *z, t_glist *glist, int state) {} static void text_delete(t_gobj *z, t_glist *glist) {sys_mgui(z,"delete","");}

*************** *** 11263,11268 **** void glist_drawiofor(t_glist *glist, t_object *ob, int firsttime, char *tag, int x1, int y1, int x2, int y2) {} void text_drawborder(t_text *x, t_glist *glist, char *tag, int width2, int height2, int firsttime) {} - void glist_eraseiofor(t_glist *glist, t_object *ob, char *tag) {} - void text_eraseborder(t_text *x, t_glist *glist, char *tag) {}

void text_setto(t_text *x, t_glist *glist, char *buf, int bufsize) { --- 11235,11238 ----