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

Modified Files: Tag: desiredata desire.c desire.tk Log Message: no more iemgui-specific methods in server-side canvas class

Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.12 retrieving revision 1.1.2.600.2.13 diff -C2 -d -r1.1.2.600.2.12 -r1.1.2.600.2.13 *** desire.tk 5 Dec 2006 02:42:56 -0000 1.1.2.600.2.12 --- desire.tk 5 Dec 2006 03:15:51 -0000 1.1.2.600.2.13 *************** *** 221,230 ****

proc pd {args} { ! puts "[VTyellow]warning: proc pd is obsolete (called from [info level -1]).[VTgrey]" netsend [join $args] }

# you pass the 2nd argument if and only if the message creates an object (or pretends to). ! # this is every #X line except #X coords. # #N doesn't count and instead #X restore counts and #X pop counts. proc netsend {message {callback nonesuch}} { --- 221,236 ----

proc pd {args} { ! if {[info level] > 1} { ! set level [info level -1] ! } else { ! set level toplevel ! } ! puts "[VTyellow]warning: proc pd is obsolete (called from $level).[VTgrey]" netsend [join $args] }

# you pass the 2nd argument if and only if the message creates an object (or pretends to). ! # this happens with those methods of #X (canvases): ! # obj, msg, floatatom, symbolatom, text, pop, connect, text_setto. # #N doesn't count and instead #X restore counts and #X pop counts. proc netsend {message {callback nonesuch}} { *************** *** 526,530 **** ^-valgrind$ {set cmdline(valgrind) 1} ^-novalgrind$ {set cmdline(valgrind) 0} ! ^-h|-help|--help$ {cmdline_help; exit 1} ^- {puts "ERROR: command line argument: unknown $o"} default {lappend files_to_open [lindex $argv $i]} --- 532,536 ---- ^-valgrind$ {set cmdline(valgrind) 1} ^-novalgrind$ {set cmdline(valgrind) 0} ! ^(-h|-help|--help)$ {cmdline_help; exit 1} ^- {puts "ERROR: command line argument: unknown $o"} default {lappend files_to_open [lindex $argv $i]} *************** *** 1287,1292 **** if {$@gop} {foreach x $@children {$x outside_of_the_box}} #set @mapped 0 ! if {$@gop} {set @mapped 1; pd .$self map 1} {set @mapped 0; pd .$self map 0} ! #pd .$self map 0 pd .$self close return --- 1293,1301 ---- if {$@gop} {foreach x $@children {$x outside_of_the_box}} #set @mapped 0 ! if {$@gop} { ! set @mapped 1; netsend ".$self map 1" ! } else { ! set @mapped 0; netsend ".$self map 0" ! } pd .$self close return *************** *** 5630,5649 ****

set butt { ! {object Object {pd %W obj 0}} ! {message Message {pd %W msg 0}} ! {number Number {pd %W floatatom 0}} ! {symbol Symbol {pd %W symbolatom 0}} ! {comment Comment {pd %W text 0}} ! {bang bng {pd %W bng 0}} ! {toggle tgl {pd %W toggle 0}} ! {number2 nbx {pd %W numbox 0}} ! {vslider vsl {pd %W vslider 0}} ! {hslider hsl {pd %W hslider 0}} ! {vradio vradio {pd %W vradio 0}} ! {hradio hradio {pd %W hradio 0}} ! {vu vu {pd %W vumeter 0}} ! {canvas cnv {pd %W mycnv 0}} ! {graph graph {pd %W graph}} ! {array array {pd %W menuarray 0}} } # {dropper dropper {pd %W dropper 0}} --- 5639,5658 ----

set butt { ! {object Object {pd .%W obj 0}} ! {message Message {pd .%W msg 0}} ! {number Number {pd .%W floatatom 0}} ! {symbol Symbol {pd .%W symbolatom 0}} ! {comment Comment {pd .%W text 0}} ! {bang bng {%W new_object obj bng}} ! {toggle tgl {%W new_object obj tgl 0}} ! {number2 nbx {%W new_object obj nbx 0}} ! {vslider vsl {%W new_object obj vsl 0}} ! {hslider hsl {%W new_object obj hsl 0}} ! {vradio vradio {%W new_object obj vradio 0}} ! {hradio hradio {%W new_object obj hradio 0}} ! {vu vu {%W new_object obj vumeter 0}} ! {canvas cnv {%W new_object obj cnv 0}} ! {graph graph {pd .%W graph}} ! {array array {pd .%W menuarray 0}} } # {dropper dropper {pd %W dropper 0}} *************** *** 5679,5683 **** mset {icon name cmd} $e pack [button $bb._$name -image icon_$icon -border 1 \ ! -command "$@canvas editmode= 1; [regsub -all -- %W $cmd .$@canvas]"] -side left balloon $bb._$name [say $name] } --- 5688,5692 ---- mset {icon name cmd} $e pack [button $bb._$name -image icon_$icon -border 1 \ ! -command "$@canvas editmode= 1; [regsub -all -- %W $cmd $@canvas]"] -side left balloon $bb._$name [say $name] }

Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.21 retrieving revision 1.1.2.217.2.22 diff -C2 -d -r1.1.2.217.2.21 -r1.1.2.217.2.22 *** desire.c 5 Dec 2006 02:57:47 -0000 1.1.2.217.2.21 --- desire.c 5 Dec 2006 03:15:49 -0000 1.1.2.217.2.22 *************** *** 6016,6035 **** }

- void canvas_iemguis(t_canvas *gl, t_symbol *guiobjname) { - t_atom at; - t_binbuf *b = binbuf_new(); - SETSYMBOL(&at, guiobjname); - binbuf_restore(b, 1, &at); - canvas_objtext(gl,0,0,1,b); - } - - #define Z(a,b) \ - void canvas_##a(t_canvas *gl, t_symbol *s, int argc, t_atom *argv) {canvas_iemguis(gl,gensym(#b));} - Z(bng,bng) Z(toggle,tgl) - Z(vslider,vsl) Z(hslider,hsl) - Z(hdial,hdl) Z(vdial,vdl) Z(hradio,hradio) Z(vradio,vradio) - Z(vumeter,vu) Z(mycnv,cnv) Z(numbox,nbx) - #undef Z - void canvas_objfor(t_canvas *gl, t_text *x, int argc, t_atom *argv) { x->width = 0; --- 6016,6019 ---- *************** *** 7497,7511 **** class_addmethod3(c,canvas_canvas,"graph","*"); class_addmethod3(c,canvas_scalar,"scalar","*"); - class_addmethod3(c,canvas_bng,"bng","*"); - class_addmethod3(c,canvas_toggle,"toggle","*"); - class_addmethod3(c,canvas_vslider,"vslider","*"); - class_addmethod3(c,canvas_hslider,"hslider","*"); - class_addmethod3(c,canvas_hdial,"hdial","*"); - class_addmethod3(c,canvas_vdial,"vdial","*"); - class_addmethod3(c,canvas_hradio,"hradio","*"); - class_addmethod3(c,canvas_vradio,"vradio","*"); - class_addmethod3(c,canvas_vumeter,"vumeter","*"); - class_addmethod3(c,canvas_mycnv,"mycnv","*"); - class_addmethod3(c,canvas_numbox,"numbox","*");

class_addmethod3(c,canvas_push,"push",""); --- 7481,7484 ----