Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15901
Modified Files: Tag: desiredata desire.tk Log Message: some work on serial
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.9 retrieving revision 1.1.2.600.2.10 diff -C2 -d -r1.1.2.600.2.9 -r1.1.2.600.2.10 *** desire.tk 4 Dec 2006 14:20:41 -0000 1.1.2.600.2.9 --- desire.tk 4 Dec 2006 21:27:35 -0000 1.1.2.600.2.10 *************** *** 47,52 **** if {[file exists debug.tcl]} { source debug.tcl - } else { - puts "not loading debug.tcl, because it isn't there." }
--- 47,50 ---- *************** *** 218,226 **** global serial replyset if {$n > $serial} {error "object creation serial number is in the future"} ! eval [concat $replyset($serial) [list $obj]] ! array unset replyset $serial }
! proc pd {args} {netsend [join $args]}
proc netsend {message {callback nonesuch}} { --- 216,227 ---- global serial replyset if {$n > $serial} {error "object creation serial number is in the future"} ! eval [concat $replyset($n) [list $obj]] ! array unset replyset $n }
! proc pd {args} { ! puts "[VTyellow]warning: proc pd is obsolete (called from [info level -1]).[VTgrey]" ! netsend [join $args] ! }
proc netsend {message {callback nonesuch}} { *************** *** 684,688 **** -variable $y -anchor w -command $z] -side left } ! pack [button .controls.switches.dio -text [say io_errors] -command {pd pd audiostatus}] pack .controls.switches -side right frame .debug --- 685,689 ---- -variable $y -anchor w -command $z] -side left } ! pack [button .controls.switches.dio -text [say io_errors] -command {pd pd audiostatus} -padx 5] pack .controls.switches -side right frame .debug *************** *** 781,787 **** return } ! post "connected!" fconfigure $sock -blocking 0 -buffering line ! pd pd init poll_sock foreach f $::files_to_open { --- 782,788 ---- return } ! post "Connected to server" fconfigure $sock -blocking 0 -buffering line ! netsend "pd init" poll_sock foreach f $::files_to_open { *************** *** 853,860 **** set untitled_folder [pwd]
def Client new_file {} { global untitled_number untitled_folder ! pd pd filename Untitled-$untitled_number $untitled_folder ! pd {#N canvas; #X pop 1} incr untitled_number } --- 854,864 ---- set untitled_folder [pwd]
+ proc none {args} {} + def Client new_file {} { global untitled_number untitled_folder ! netsend "pd filename Untitled-$untitled_number $untitled_folder" ! netsend "#N canvas" ! netsend "#X pop 1" {none} incr untitled_number } *************** *** 1746,1750 **** set x1 [expr $x/$@zoom] set y1 [expr $y/$@zoom] ! eval [concat [list pd .$self $sel $x $y] $args] }
--- 1750,1759 ---- set x1 [expr $x/$@zoom] set y1 [expr $y/$@zoom] ! #eval [concat [list pd .$self $sel $x $y] $args] ! netsend [join [concat [list pd .$self $sel $x $y] $args]] {$self new_object_callback} ! } ! ! def Canvas new_object_callback {obj} { ! ... }
*************** *** 5548,5552 **** pack [frame $serf.1.1] -side bottom pack [button $serf.1.1.expander -image icon_plus -command "$self toggle_expand"] -side left ! pack [label $serf.1.1.label -text "$name: " -font $look(View:font)] -side left pack [entry $serf.entry -width 40 -font $look(View:font)] -side left -fill x -expand yes pack $serf -fill x -expand no --- 5557,5561 ---- pack [frame $serf.1.1] -side bottom pack [button $serf.1.1.expander -image icon_plus -command "$self toggle_expand"] -side left ! pack [label $serf.1.1.label -width 10 -text "$name: " -font $look(View:font)] -side left pack [entry $serf.entry -width 40 -font $look(View:font)] -side left -fill x -expand yes pack $serf -fill x -expand no *************** *** 7478,7479 **** --- 7487,7491 ---- #vwait foo } + + set t0 [expr [clock clicks -millis]-$t0] + puts "time to load: $t0 ms"