Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12124
Modified Files: Tag: desiredata desire.tk Log Message: connect,disconnect use new indices
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.331 retrieving revision 1.1.2.600.2.332 diff -C2 -d -r1.1.2.600.2.331 -r1.1.2.600.2.332 *** desire.tk 9 Aug 2007 07:00:50 -0000 1.1.2.600.2.331 --- desire.tk 9 Aug 2007 08:02:50 -0000 1.1.2.600.2.332 *************** *** 264,271 **** set serial 0 proc serial {n obj} { ! 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 }
--- 264,270 ---- set serial 0 proc serial {n obj} { ! if {$n >= $::serial} {error "object creation serial number is in the future"} ! eval [concat $::replyset($n) [list $obj]] ! array unset ::replyset $n }
*************** *** 274,289 **** # obj, msg, floatatom, symbolatom, text, connect, text_setto, array. # this does NOT happen with #X coords/restore/pop. ! proc netsend {message {callback noserial}} { ! global serial replyset sock if {$message == ""} {error "empty message... surely a mistake"} ! if {$sock == ""} {error "connection to server needed for doing this"} ! if {[string compare $callback noserial]} { ! set replyset($serial) $callback ! set message [concat [lrange $message 0 0] [list with_reply $serial] [lrange $message 1 end]] ! incr serial ! } else { } if {$::debug} {puts "<- [join $message];"} ! puts $sock "[join $message];" }
--- 273,286 ---- # obj, msg, floatatom, symbolatom, text, connect, text_setto, array. # this does NOT happen with #X coords/restore/pop. ! proc netsend {message {callback ""}} { if {$message == ""} {error "empty message... surely a mistake"} ! if {$::sock == ""} {error "connection to server needed for doing this"} ! if {$callback != ""} { ! set ::replyset($::serial) $callback ! set message [concat [lrange $message 0 0] [list with_reply $::serial] [lrange $message 1 end]] ! incr ::serial } if {$::debug} {puts "<- [join $message];"} ! puts $::sock "[join $message];" }
*************** *** 2813,2822 ****
def Canvas havewindow= {flag} { - global subpatcherize # race condition! ! if {$::subpatcherize(future_sub) != ""} { ! $::subpatcherize(future_sub) subpatcherize_paste ! set ::subpatcherize(future_sub) "" ! } set was [winfo exists .$self] #if {$flag && $was && [$self gop]} {$self redraw} --- 2810,2818 ----
def Canvas havewindow= {flag} { # race condition! ! # if {$::subpatcherize(future_sub) != ""} { ! # $::subpatcherize(future_sub) subpatcherize_paste ! # set ::subpatcherize(future_sub) "" ! # } set was [winfo exists .$self] #if {$flag && $was && [$self gop]} {$self redraw} *************** *** 3781,3793 **** } mset {from outlet to inlet} $wire ! netsend [list .$self disconnect [dex $@objects $from] $outlet [dex $@objects $to] $inlet] $@history add [list $self connect $wire] } ! def Canvas connect {wire {callback "none"}} { mset {from outlet to inlet} $wire ! switch $callback { ! none {netsend [list .$self connect [dex $@objects $from] $outlet [dex $@objects $to] $inlet]} ! default {netsend [list .$self connect [dex $@objects $from] $outlet [dex $@objects $to] $inlet] $callback} ! } $@history add [list $self disconnect $wire] } --- 3777,3786 ---- } mset {from outlet to inlet} $wire ! netsend [list .$self disconnect $from $outlet $@objects $inlet] $@history add [list $self connect $wire] } ! def Canvas connect {wire {callback ""}} { mset {from outlet to inlet} $wire ! netsend [list .$self connect $from $outlet $to $inlet] $callback $@history add [list $self disconnect $wire] } *************** *** 3876,3879 **** --- 3869,3873 ----
def Canvas subpatcherize {} { + error "disabled... try again next month" set ::subpatcherize(incoming) {}; set ::subpatcherize(outgoing) {} set ::subpatcherize(incoming_inlet) {}; set ::subpatcherize(incoming_outlet) {} *************** *** 5164,5168 **** $@from delete_wire $self $@to delete_wire $self ! [$@canvas objects] unset $@index super } --- 5158,5162 ---- $@from delete_wire $self $@to delete_wire $self ! [$@canvas wires] unset $@index super } *************** *** 5818,5822 **** $self changed text set @mouse [list $x $y] ! netsend [list .$self float [expr {0+$@text}]] ;# noserial }
--- 5812,5816 ---- $self changed text set @mouse [list $x $y] ! netsend [list .$self float [expr {0+$@text}]] }