Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13555
Modified Files: Tag: desiredata desire.tk Log Message: remove extraneous spaces
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.190 retrieving revision 1.1.2.600.2.191 diff -C2 -d -r1.1.2.600.2.190 -r1.1.2.600.2.191 *** desire.tk 28 Jun 2007 02:15:50 -0000 1.1.2.600.2.190 --- desire.tk 28 Jun 2007 17:33:20 -0000 1.1.2.600.2.191 *************** *** 28,32 **** # #-----------------------------------------------------------------------------------# ! # this command rebuilds the package index: echo pkg_mkIndex . | tclsh
--- 28,32 ---- # #-----------------------------------------------------------------------------------# ! # this command rebuilds the package index: echo pkg_mkIndex . | tclsh
*************** *** 55,59 **** return "" } ! #-----------------------------------------------------------------------------------# # some list processing functions and some math too --- 55,59 ---- return "" } ! #-----------------------------------------------------------------------------------# # some list processing functions and some math too *************** *** 182,186 **** } } - if {!$i} {return 0} else {return 1} } --- 182,185 ---- *************** *** 320,324 **** #-----------------------------------------------------------------------------------# #used during subpatcherize ! set subpatcherize(edit) 0 set subpatcherize(paste) 0 set subpatcherize(incoming) {} --- 319,323 ---- #-----------------------------------------------------------------------------------# #used during subpatcherize ! set subpatcherize(edit) 0 set subpatcherize(paste) 0 set subpatcherize(incoming) {} *************** *** 646,650 **** source [localedir $langfile] } ! #-----------------------------------------------------------------------------------#
--- 645,649 ---- source [localedir $langfile] } ! #-----------------------------------------------------------------------------------#
*************** *** 1266,1270 **** set topcanvas1 [$focus get_topcanvas] set topcanvas2 [$canvas get_topcanvas] ! if {$focus != $canvas && $topcanvas1 == $topcanvas2} {set canvas $focus} } return $canvas --- 1265,1269 ---- set topcanvas1 [$focus get_topcanvas] set topcanvas2 [$canvas get_topcanvas] ! if {$focus != $canvas && $topcanvas1 == $topcanvas2} {set canvas $focus} } return $canvas *************** *** 1313,1317 **** } } ! def View draw_maybe {} { if {$@canvas == "" && [winfo exists .$self.c]} {$self draw; return} --- 1312,1316 ---- } } ! def View draw_maybe {} { if {$@canvas == "" && [winfo exists .$self.c]} {$self draw; return} *************** *** 1345,1349 ****
class_new Canvas {Menuable ObjectBox} ! def Canvas close {} { if {$@subpatch} { --- 1344,1348 ----
class_new Canvas {Menuable ObjectBox} ! def Canvas close {} { if {$@subpatch} { *************** *** 1550,1554 **** set @keynav_port 0 ;# which in/outlet is selected set @keynav 0 ;# the list of objects that has io selected ! set @keynav_iosel 0 ;# last object that is io selected set @keynav_iosel_o {} ;# list of objects that has outlet selected set @keynav_iosel_i {} ;# list of objects that has inlet selected --- 1549,1553 ---- set @keynav_port 0 ;# which in/outlet is selected set @keynav 0 ;# the list of objects that has io selected ! set @keynav_iosel 0 ;# last object that is io selected set @keynav_iosel_o {} ;# list of objects that has outlet selected set @keynav_iosel_i {} ;# list of objects that has inlet selected *************** *** 2139,2143 ****
#-----------------------------------------------------------------------------------# ! #this just tells whether an object is part of the selection, that is, what usually #make objects turn blue. def Canvas selection_include? {member} { --- 2138,2142 ----
#-----------------------------------------------------------------------------------# ! #this just tells whether an object is part of the selection, that is, what usually #make objects turn blue. def Canvas selection_include? {member} { *************** *** 2345,2349 **** } catch { - set text [$c.${self}text get $@longline.0 $@longline.end] set textwidth [expr {[font measure [$self look font] $text]+20}];#+20 hack --- 2344,2347 ---- *************** *** 2500,2504 **** # if {$subpatcherize(edit)} {set subpatherize(edit) 0; $self draw_wires} #} - } ;#??? if {!$flag && $was} {$self delete_window} ;#??? --- 2498,2501 ---- *************** *** 2585,2589 **** set idx [lsearch $@wires $wire] set @wires [lreplace $@wires $idx $idx] ! } def Canvas delete_selection {} { if {![llength $@selection] && ![llength $@selection_wire]} {return} --- 2582,2586 ---- set idx [lsearch $@wires $wire] set @wires [lreplace $@wires $idx $idx] ! } def Canvas delete_selection {} { if {![llength $@selection] && ![llength $@selection_wire]} {return} *************** *** 2799,2803 **** } set @action move - } foreach obj $@selection {$obj move [expr $x-$ox] [expr $y-$oy]} --- 2796,2799 ---- *************** *** 2877,2882 **** #set @dehighlight [list $c delete ${obj}$io${idx}b] #puts "dehilite is :: $@dehighlight" ! #puts "obj:: $obj :: [$obj text] :: hilite $io :: $idx" ! }
--- 2873,2877 ---- #set @dehighlight [list $c delete ${obj}$io${idx}b] #puts "dehilite is :: $@dehighlight" ! #puts "obj:: $obj :: [$obj text] :: hilite $io :: $idx" }
*************** *** 2956,2960 **** return [list "inlet" $id $val] } ! # deals with GOP if {$@editmode} { return [list "object" $id] --- 2951,2955 ---- return [list "inlet" $id $val] } ! # deals with GOP if {$@editmode} { return [list "object" $id] *************** *** 3002,3006 **** set dist [distance $point2 $point1] if {$dist < $mindist} {set mindist $dist; set idx $i} ! incr i; } return [lindex $objs $idx] --- 2997,3001 ---- set dist [distance $point2 $point1] if {$dist < $mindist} {set mindist $dist; set idx $i} ! incr i; } return [lindex $objs $idx] *************** *** 3116,3120 **** } def FindModel result {} {return $@result} ! def FindModel views+ {view} {lappend @views $view} def FindModel views {} {return $@views} def FindModel end? {} {return $@end} --- 3111,3115 ---- } def FindModel result {} {return $@result} ! def FindModel views+ {view} {lappend @views $view} def FindModel views {} {return $@views} def FindModel end? {} {return $@end} *************** *** 3166,3170 **** } if {[llength $@results]} {return 1} else {return 0} - }
--- 3161,3164 ---- *************** *** 3206,3210 **** if {$name == "close"} {bind $f.$name <Return> "findmodel delete"} } ! label {label $f.$name -textvariable _(findmodel:info) -font {helvetica -10} -pady 0} } pack $f.$name -side left --- 3200,3204 ---- if {$name == "close"} {bind $f.$name <Return> "findmodel delete"} } ! label {label $f.$name -textvariable _(findmodel:info) -font {helvetica -10} -pady 0} } pack $f.$name -side left *************** *** 3396,3401 **** if {$type == "restore"} {set in 0} mset {x y} [lmap + [lrange $mess 2 3] $offset] ! if {!$in} {lappend xcoords $x; lappend ycoords $y} ! } } } --- 3390,3395 ---- if {$type == "restore"} {set in 0} mset {x y} [lmap + [lrange $mess 2 3] $offset] ! if {!$in} {lappend xcoords $x; lappend ycoords $y} ! } } } *************** *** 3415,3420 **** if {$x > $x2 || $x < $x1} {return 0;break} if {$y > $y2 || $y < $y1} {return 0;break} ! } ! } } } --- 3409,3414 ---- if {$x > $x2 || $x < $x1} {return 0;break} if {$y > $y2 || $y < $y1} {return 0;break} ! } ! } } } *************** *** 3472,3476 **** set goto [list $self new_object_select] } ! } } switch $goto { --- 3466,3470 ---- set goto [list $self new_object_select] } ! } } switch $goto { *************** *** 3481,3485 **** netsend [list #X pop 1] } ! def Canvas paste_coords {mess offset} { set x [lindex $mess 2]; set y [lindex $mess 3] --- 3475,3479 ---- netsend [list #X pop 1] } ! def Canvas paste_coords {mess offset} { set x [lindex $mess 2]; set y [lindex $mess 3] *************** *** 3559,3563 **** $id populate_menu $p {popup_insert} } else { ! $id populate_menu $p {popup_properties popup_open popup_help popup_clear_wires popup_auto_wire popup_copy_id} } --- 3553,3557 ---- $id populate_menu $p {popup_insert} } else { ! $id populate_menu $p {popup_properties popup_open popup_help popup_clear_wires popup_auto_wire popup_copy_id} } *************** *** 3784,3788 **** } } ! def Canvas subpatcherize_paste {} { set subpatcherize(paste) 1 --- 3778,3782 ---- } } ! def Canvas subpatcherize_paste {} { set subpatcherize(paste) 1 *************** *** 4156,4160 **** def Canvas notice {origin args} {eval [concat [list $self child_changed $origin] $args]} } ! def Canvas tab_jump {} { if {![llength $@children]} {return} --- 4150,4154 ---- def Canvas notice {origin args} {eval [concat [list $self child_changed $origin] $args]} } ! def Canvas tab_jump {} { if {![llength $@children]} {return} *************** *** 4168,4172 **** } switch $@keynav_tab_sel { ! object {$self tab_jump_object} wire {$self tab_jump_wire} } --- 4162,4166 ---- } switch $@keynav_tab_sel { ! object {$self tab_jump_object} wire {$self tab_jump_wire} } *************** *** 4228,4232 **** } } - } else { #if there is selection done by mouse --- 4222,4225 ---- *************** *** 4280,4284 **** set @keynav_last_wire $@keynav_next } ! if {[lsearch $@selection_wire $@keynav_next] < 0} {lappend @selection_wire $@keynav_next} } } --- 4273,4277 ---- set @keynav_last_wire $@keynav_next } ! if {[lsearch $@selection_wire $@keynav_next] < 0} {lappend @selection_wire $@keynav_next} } } *************** *** 4307,4311 **** set off 0 set max 100 - while {![llength $group]} { set left [expr $x1 - $xs*$off]; set right [expr $x1 + $xs + $xs*$off] --- 4300,4303 ---- *************** *** 4615,4619 **** } if {$@keynav} {set @keynav 0} - #this should be better sorted out in canvas tab_jump if {$@keynav_tab_sel == "object"} { --- 4607,4610 ---- *************** *** 4674,4678 **** set line [list $cx2 $cy2 $bx2 $by2] $self item LINE$angle line $line -fill $col -width 1 - } set i [expr $i+2] --- 4665,4668 ---- *************** *** 4687,4691 ****
} - } else { #if {![llength [[$@canvas widget] gettags ${self}ACTIVE1]]} {return} else {$self hide} --- 4677,4680 ---- *************** *** 4800,4804 **** $self changed ;# until we find a way to avoid rounding errors on [$@canvas widget] move. $self changed_wires ! #update/move the content of gop #if {[$self class] == "Canvas"} { # if {[$self gop] && ![winfo exists .$self.c]} { --- 4789,4793 ---- $self changed ;# until we find a way to avoid rounding errors on [$@canvas widget] move. $self changed_wires ! #update/move the content of gop #if {[$self class] == "Canvas"} { # if {[$self gop] && ![winfo exists .$self.c]} { *************** *** 5581,5585 **** $self add .$self {name entry} {n entry} pack [checkbutton .$self.saveme -text "save contents" -variable @saveit -anchor w] -side top - if {$newone != 0} { pack [frame .$self.radio] -side top --- 5570,5573 ---- *************** *** 5621,5626 **** $self changed } ! ! def AtomBox setto {text} { if { [string is double $text]} { set @text $text; #so that the text gets updated immediately --- 5609,5614 ---- $self changed } ! ! def AtomBox setto {text} { if { [string is double $text]} { set @text $text; #so that the text gets updated immediately *************** *** 5678,5682 **** def AtomBox key_incr {val1 val2} { set @text [expr $@text - $val2] ! netsend [list .$self float [expr {0+$@text}]] }
--- 5666,5670 ---- def AtomBox key_incr {val1 val2} { set @text [expr $@text - $val2] ! netsend [list .$self float [expr {0+$@text}]] }
*************** *** 5762,5766 **** $self item [list BUT$i BUT] rectangle \ [list [expr $x1+3] [expr $y1+3] [expr $x1+$@w-3] [expr $y1+$@w-3]] \ ! -fill #ffffff -outline #000000 if {$@orient} {set y1 [expr $y1+$@w]} {set x1 [expr $x1+$@w]} } --- 5750,5754 ---- $self item [list BUT$i BUT] rectangle \ [list [expr $x1+3] [expr $y1+3] [expr $x1+$@w-3] [expr $y1+$@w-3]] \ ! -fill #ffffff -outline #000000 if {$@orient} {set y1 [expr $y1+$@w]} {set x1 [expr $x1+$@w]} } *************** *** 5999,6003 ****
set vu_col { ! 0 17 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 15 15 15 15 15 15 15 15 15 15 14 14 13 13 13 13 13 13 13 13 13 13 13 19 19 19 } --- 5987,5991 ----
set vu_col { ! 0 17 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 15 15 15 15 15 15 15 15 15 15 14 14 13 13 13 13 13 13 13 13 13 13 13 19 19 19 } *************** *** 6240,6245 **** } else { puts "error....." ! } ! }
--- 6228,6232 ---- } else { puts "error....." ! } }
*************** *** 6593,6597 **** $self search_for_externs set class_list [luniq [lsort $class_list]] ! toplevel .$self set f .$self.cl --- 6580,6584 ---- $self search_for_externs set class_list [luniq [lsort $class_list]] ! toplevel .$self set f .$self.cl *************** *** 6603,6607 **** scrollbar $f.4 -command "$f.3 yview" set @listbox $f.1 ! frame $f.5 button $f.5.help -text [say help] -command [list $self help] --- 6590,6594 ---- scrollbar $f.4 -command "$f.3 yview" set @listbox $f.1 ! frame $f.5 button $f.5.help -text [say help] -command [list $self help] *************** *** 6612,6616 **** pack $f.3 -side left -fill both -expand yes pack $f.4 -side left -fill y -expand no ! set b .$self.butt frame $b --- 6599,6603 ---- pack $f.3 -side left -fill both -expand yes pack $f.4 -side left -fill y -expand no ! set b .$self.butt frame $b *************** *** 6639,6643 **** $self search_for_externs set class_list [luniq [lsort $class_list]] ! toplevel .$self wm protocol .$self WM_DELETE_WINDOW "$self cancel" --- 6626,6630 ---- $self search_for_externs set class_list [luniq [lsort $class_list]] ! toplevel .$self wm protocol .$self WM_DELETE_WINDOW "$self cancel" *************** *** 6662,6666 **** -font $look(View:font) $self adjust_box ! bind $f <Button-1> "after 1 "$self complete"" bind $f <Return> "after 1 "$self complete"" --- 6649,6653 ---- -font $look(View:font) $self adjust_box ! bind $f <Button-1> "after 1 "$self complete"" bind $f <Return> "after 1 "$self complete"" *************** *** 6682,6689 **** set box_height [winfo reqheight $f] pack $f -side left -expand yes ! .$self configure -width $box_width .$self configure -height $box_height ! #test the right edge of the screen, assuming the left edge has enough space if {[expr $x1+$@rootx+$box_width] < [lindex $@max 0]} { --- 6669,6676 ---- set box_height [winfo reqheight $f] pack $f -side left -expand yes ! .$self configure -width $box_width .$self configure -height $box_height ! #test the right edge of the screen, assuming the left edge has enough space if {[expr $x1+$@rootx+$box_width] < [lindex $@max 0]} { *************** *** 6698,6705 **** set box_y [expr $y1 - $box_height - 2 + $@rooty] } ! wm geometry .$self [winfo reqwidth .$self]x[winfo reqheight .$self]+$box_x+$box_y
! }
def ClassBrowser current_class {} { --- 6685,6692 ---- set box_y [expr $y1 - $box_height - 2 + $@rooty] } ! wm geometry .$self [winfo reqwidth .$self]x[winfo reqheight .$self]+$box_x+$box_y
! }
def ClassBrowser current_class {} { *************** *** 7142,7146 **** $f.font.list.box see $find bind $f.font.list.box <ButtonRelease-1> "$self font_update $f" ! frame $f.font.size pack [label $f.font.size.label -text [say font_size]] -side left --- 7129,7133 ---- $f.font.list.box see $find bind $f.font.list.box <ButtonRelease-1> "$self font_update $f" ! frame $f.font.size pack [label $f.font.size.label -text [say font_size]] -side left *************** *** 7151,7155 **** $f.font.size.entry delete 0 end $f.font.size.entry insert 0 $@size ! frame $f.font.style pack [label $f.font.style.label -text [say font_style]] -side left -fill y --- 7138,7142 ---- $f.font.size.entry delete 0 end $f.font.size.entry insert 0 $@size ! frame $f.font.style pack [label $f.font.style.label -text [say font_style]] -side left -fill y *************** *** 7157,7161 **** pack [checkbutton $f.font.style.bold -text [say font_bold] -variable @bold -command $cmd] -side top pack [checkbutton $f.font.style.italic -text [say font_italic] -variable @italic -command $cmd] -side top ! frame $f.font2 frame $f.font2.preview --- 7144,7148 ---- pack [checkbutton $f.font.style.bold -text [say font_bold] -variable @bold -command $cmd] -side top pack [checkbutton $f.font.style.italic -text [say font_italic] -variable @italic -command $cmd] -side top ! frame $f.font2 frame $f.font2.preview *************** *** 7163,7167 **** pack [canvas $f.font2.preview.canvas -width 250 -height 50 -relief sunken -borderwidth 1] -side left -fill x $f.font2.preview.canvas create text 4 4 -tags ${self}TEXT -anchor nw -text [say font_preview_2] -font $look(View:font) ! set parent [string range $f 1 [expr [string first "." $f 1]-1]] if {$parent == "ddrc"} { --- 7150,7154 ---- pack [canvas $f.font2.preview.canvas -width 250 -height 50 -relief sunken -borderwidth 1] -side left -fill x $f.font2.preview.canvas create text 4 4 -tags ${self}TEXT -anchor nw -text [say font_preview_2] -font $look(View:font) ! set parent [string range $f 1 [expr [string first "." $f 1]-1]] if {$parent == "ddrc"} { *************** *** 7170,7174 **** set padx 0; set pady 0; set padx2 0; set pady2 0 } ! pack $f.font.list -side left -fill y pack $f.font.size -side top -fill x --- 7157,7161 ---- set padx 0; set pady 0; set padx2 0; set pady2 0 } ! pack $f.font.list -side left -fill y pack $f.font.size -side top -fill x *************** *** 7214,7218 **** def Dialog font_update_size {f} { set size [$f.font.size.entry get] ! if [regexp {^[0-9]+$} $size] {set @size $size} $self font_update $f } --- 7201,7205 ---- def Dialog font_update_size {f} { set size [$f.font.size.entry get] ! if [regexp {^[0-9]+$} $size] {set @size $size} $self font_update $f } *************** *** 7300,7304 **** } pack [button $f.buttonframe.$a -text [say $a] -command "$self $a"] -side left ! bind $f.buttonframe.$a <Return> "$self $a" incr i } --- 7287,7291 ---- } pack [button $f.buttonframe.$a -text [say $a] -command "$self $a"] -side left ! bind $f.buttonframe.$a <Return> "$self $a" incr i } *************** *** 7413,7417 **** choice {audio_api_choice} void -32bit ! section {section_midi 50} void -nomidiin --- 7400,7404 ---- choice {audio_api_choice} void -32bit ! section {section_midi 50} void -nomidiin *************** *** 7419,7430 **** devlist -midiindev devlist -midioutdev ! section {section_externals 20} libraries -lib ! section {section_paths 20} folders -path folders -helppath ! section {section_other 50} files -open --- 7406,7417 ---- devlist -midiindev devlist -midioutdev ! section {section_externals 20} libraries -lib ! section {section_paths 20} folders -path folders -helppath ! section {section_other 50} files -open *************** *** 7794,7798 **** close $fd } ! #this retrives the values set in the editor def ClientPrefsDialog get_val {} { --- 7781,7785 ---- close $fd } ! #this retrives the values set in the editor def ClientPrefsDialog get_val {} { *************** *** 7821,7825 **** set key($class:$item) $new_key } - } toggle {set look($class:$name) $@$name} --- 7808,7811 ---- *************** *** 7830,7834 **** } } ! def ClientPrefsDialog reset {} { # this should reload defaults.ddrc ? --- 7816,7820 ---- } } ! def ClientPrefsDialog reset {} { # this should reload defaults.ddrc ? *************** *** 7847,7853 **** set section 0 set subsection 0 - set @label_width 200 ;# 24 ! foreach {type class names} $ddrc_options { set name [lindex [split $names |] 0] --- 7833,7838 ---- set section 0 set subsection 0 set @label_width 200 ;# 24 ! foreach {type class names} $ddrc_options { set name [lindex [split $names |] 0] *************** *** 7990,7994 **** } scroll { - } } --- 7975,7978 ---- *************** *** 8262,8266 **** #toplevel .graph -height 600 -width 800 #set c [canvas .graph.c -height 600 -width 800] ! #pack $c set g [dotnew digraph] $g setnodeattribute style filled color white --- 8246,8250 ---- #toplevel .graph -height 600 -width 800 #set c [canvas .graph.c -height 600 -width 800] ! #pack $c set g [dotnew digraph] $g setnodeattribute style filled color white *************** *** 8273,8277 **** foreach wire $@wires { mset {obj1 port1 obj2 port2} [$wire report] ! set n1 [lindex $nodes [expr [lsearch $nodes $obj1]-1]] set n2 [lindex $nodes [expr [lsearch $nodes $obj2]-1]] $n1 addedge $n2 --- 8257,8261 ---- foreach wire $@wires { mset {obj1 port1 obj2 port2} [$wire report] ! set n1 [lindex $nodes [expr [lsearch $nodes $obj1]-1]] set n2 [lindex $nodes [expr [lsearch $nodes $obj2]-1]] $n1 addedge $n2 *************** *** 8303,8307 **** set x [lindex $line 2]; set y [lindex $line 3] $id moveto [expr $x*$w] [expr ($gh-$y)*$h] - } edge {break} --- 8287,8290 ----