Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27922
Modified Files: Tag: desiredata desire.c desire.tk Log Message: canvas_vis() -> def Canvas havewindow=
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.39 retrieving revision 1.1.2.600.2.40 diff -C2 -d -r1.1.2.600.2.39 -r1.1.2.600.2.40 *** desire.tk 7 Dec 2006 22:02:55 -0000 1.1.2.600.2.39 --- desire.tk 7 Dec 2006 23:31:32 -0000 1.1.2.600.2.40 *************** *** 2303,2306 **** --- 2303,2313 ---- def Canvas children {} {return $@children}
+ def Canvas havewindow= {flag} { + set was [winfo exists .$self] + if {$flag && $was} {$self raise} + if {$flag && !$was} {$self init_window} ;#??? + if {!$flag && $was} {$self delete_window} ;#??? + } + def Canvas children_idx {obj} {return [lsearch $@children $obj]}
Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.39 retrieving revision 1.1.2.217.2.40 diff -C2 -d -r1.1.2.217.2.39 -r1.1.2.217.2.40 *** desire.c 7 Dec 2006 19:16:51 -0000 1.1.2.217.2.39 --- desire.c 7 Dec 2006 23:31:31 -0000 1.1.2.217.2.40 *************** *** 706,717 **** }
- /* canvas_vis(,1) makes a canvas client-existing, client-updated, visible, mapped, raised. gops get open. - canvas_vis(,0) removes the canvas from the client if it's non-gop. contrast with canvas_map. - for GOPs this is *not* the same as in Miller's */ static void canvas_vis(t_canvas *x, t_floatarg f) { ! /* this is WRONG */ ! if (f && x->havewindow) sys_mgui(x,"raise",""); ! if (f && !x->havewindow) canvas_map(x,1); ! if (!f && x->havewindow) {sys_mgui(x,"delete",""); canvas_map(x,0);} x->havewindow = (unsigned)f; } --- 706,711 ---- }
static void canvas_vis(t_canvas *x, t_floatarg f) { ! sys_mgui(x,"havewindow=","f",f); x->havewindow = (unsigned)f; } *************** *** 7252,7259 **** SET(log_height,256); SET(is_log,0); ! x->w=5; ! x->h=14; ! x->min=-1.0e+37; ! x->max=1.0e+37; x->buf[0]=0; SET(change,0); --- 7246,7253 ---- SET(log_height,256); SET(is_log,0); ! SET(w,5); ! SET(h,14); ! SET(min,-1.0e+37); ! SET(max,1.0e+37); x->buf[0]=0; SET(change,0);