Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13944
Modified Files: Tag: devel_0_39 desire.tk Log Message: cleanup
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.380 retrieving revision 1.1.2.381 diff -C2 -d -r1.1.2.380 -r1.1.2.381 *** desire.tk 20 Aug 2006 02:39:34 -0000 1.1.2.380 --- desire.tk 20 Aug 2006 02:59:55 -0000 1.1.2.381 *************** *** 681,685 **** } if {[fblocked $sock]} {break} ! if {[string first pdtk_post $cmd]!=0} {puts "-> $cmd"} append sock_lobby "\n$cmd" if {[catch {eval $sock_lobby}]} { --- 681,685 ---- } if {[fblocked $sock]} {break} ! #if {[string first pdtk_post $cmd]!=0} {puts "-> $cmd"} append sock_lobby "\n$cmd" if {[catch {eval $sock_lobby}]} { *************** *** 1250,1255 **** #X restore 123 271 graph;
! #!@#$ this method is too long. ! def* Canvas init {mess} { global pd_opendir pd_tearoff OS cmdline canvas history manager window_list lappend window_list $self --- 1250,1254 ---- #X restore 123 271 graph;
! def Canvas init {mess} { global pd_opendir pd_tearoff OS cmdline canvas history manager window_list lappend window_list $self *************** *** 1293,1297 **** }
! def* Canvas reinit {mess} { switch -- [lindex $mess 0] { "#N" { --- 1292,1296 ---- }
! def Canvas reinit {mess} { switch -- [lindex $mess 0] { "#N" { *************** *** 1425,1430 **** }
! def* Canvas map {} {} ! def* Canvas unmap {} {}
def Canvas scroll {axis diff} { --- 1424,1429 ---- }
! def Canvas map {} {} ! def Canvas unmap {} {}
def Canvas scroll {axis diff} { *************** *** 2770,2784 **** #-----------------------------------------------------------------------------------#
! def* Canvas keyup {x y key iso shift} { set canvas .$self.c if {$iso != ""} {scan $iso %c key} - # if {[string length $@focus] > 0} { - # if {$@editmode} {set action keyreleaseedit} {set action keyrelease} - # $@focus $event $key $shift - # } $self draw_active }
! def* Canvas draw_active {} { #if {![string compare $@keynav_current 0]} {return} if {$@keynav} { --- 2769,2779 ---- #-----------------------------------------------------------------------------------#
! def Canvas keyup {x y key iso shift} { set canvas .$self.c if {$iso != ""} {scan $iso %c key} $self draw_active }
! def Canvas draw_active {} { #if {![string compare $@keynav_current 0]} {return} if {$@keynav} { *************** *** 2954,2959 **** set bbox1 [lmap / [.$@canvas.c bbox [join [list "$@obj1" o "$@port1"] ""]] $scale] set bbox2 [lmap / [.$@canvas.c bbox [join [list "$@obj2" i "$@port2"] ""]] $scale] ! if {[llength $bbox1] < 4} {puts stderr "wire_draw: crap ($@obj1 outlet)"; return} ! if {[llength $bbox2] < 4} {puts stderr "wire_draw: crap ($@obj2 inlet)"; return} mset {x1 y1} [l/2 [l+ [lrange $bbox1 0 1] [lrange $bbox1 2 3]]] mset {x2 y2} [l/2 [l+ [lrange $bbox2 0 1] [lrange $bbox2 2 3]]] --- 2949,2954 ---- set bbox1 [lmap / [.$@canvas.c bbox [join [list "$@obj1" o "$@port1"] ""]] $scale] set bbox2 [lmap / [.$@canvas.c bbox [join [list "$@obj2" i "$@port2"] ""]] $scale] ! if {[llength $bbox1] < 4} {puts stderr "wire_draw: crap outlet $@obj1 [$@obj1 deconstruct]"; return} ! if {[llength $bbox2] < 4} {puts stderr "wire_draw: crap inlet $@obj2 [$@obj2 deconstruct]"; return} mset {x1 y1} [l/2 [l+ [lrange $bbox1 0 1] [lrange $bbox1 2 3]]] mset {x2 y2} [l/2 [l+ [lrange $bbox2 0 1] [lrange $bbox2 2 3]]] *************** *** 3083,3087 **** #A 0 0; proc update_object {self e ninlets noutlets} { ! global _ fields classinfo canvas set isnew [expr ![info exists _($self:_class)]] foreach mess [split $e ";"] { --- 3078,3082 ---- #A 0 0; proc update_object {self e ninlets noutlets} { ! global _ classinfo canvas set isnew [expr ![info exists _($self:_class)]] foreach mess [split $e ";"] { *************** *** 3107,3121 **** } #if {$isnew} {$_class new_as $self} - #puts "CLASS IS $class" if {$isnew} {$_class new_as $self $mess} else {$self reinit $mess} - #switch -- $class { - # obj {$self text= [join [lrange $mess 4 end]]} - # msg {$self text= [join [lrange $mess 4 end]]} - # text {$self text= [join [lrange $mess 4 end]]} - # restore {$self text= [join [lrange $mess 4 end]]} - # array {puts "\033[0;1;32mGOT ARRAY!"} - # default { - # set i 0; foreach f $fields($class) {set _($self:$f) [lindex $mess $i]; incr i}} - #} switch -- $class { array {} --- 3102,3106 ---- *************** *** 3484,3488 **** class_new SymbolAtom {AtomBox}
! def* AtomBox init {mess} { global font super $mess --- 3469,3473 ---- class_new SymbolAtom {AtomBox}
! def AtomBox init {mess} { global font super $mess *************** *** 3494,3503 **** }
! def* FloatAtom init {mess} {super $mess; set @text 0} def SymbolAtom init {mess} {super $mess; set @text "symbol"} ! def* AtomBox canonize {x} {return x} ! def* FloatAtom canonize {x} {return [expr $x]}
! def* AtomBox key {key shift} { set @clicking 0 switch $key { --- 3479,3488 ---- }
! def FloatAtom init {mess} {super $mess; set @text 0} def SymbolAtom init {mess} {super $mess; set @text "symbol"} ! def AtomBox canonize {x} {return x} ! def FloatAtom canonize {x} {return [expr $x]}
! def AtomBox key {key shift} { set @clicking 0 switch $key { *************** *** 4202,4208 **** proc post_to_gui {x} { global cmdline console_lines ! # if {[catch { ! set oldpos [lindex [.log.2 get] 1] ! .log.1 insert end $x regsub -all "\n" $x "" y set n [expr [string length $x]-[string length $y]] --- 4187,4193 ---- proc post_to_gui {x} { global cmdline console_lines ! if {!$cmdline(console)} {puts -nonewline stderr $x; return} ! set oldpos [lindex [.log.2 get] 1] ! .log.1 insert end $x regsub -all "\n" $x "" y set n [expr [string length $x]-[string length $y]] *************** *** 4213,4219 **** } if {$oldpos > 0.9999} {.log.1 see end} - # }]} { - # puts -nonewline stderr $x - # } }
--- 4198,4201 ----