Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12551
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.321 retrieving revision 1.1.2.322 diff -C2 -d -r1.1.2.321 -r1.1.2.322 *** desire.tk 13 Aug 2006 05:00:35 -0000 1.1.2.321 --- desire.tk 13 Aug 2006 05:50:47 -0000 1.1.2.322 *************** *** 547,554 **** set key(decr_zoom) "Ctrl+minus" set accels {} ! foreach k [array names key] { ! set v $key($k) ! dict set accels $v $k ! }
################## set up main window ######################### --- 547,551 ---- set key(decr_zoom) "Ctrl+minus" set accels {} ! foreach k [array names key] {dict set accels $key($k) $k}
################## set up main window ######################### *************** *** 637,643 ****
set pd_opendir [pwd] - set pd_undoaction no - set pd_redoaction no - set pd_undocanvas no
############### set up socket & start server socket #################### --- 634,637 ---- *************** *** 829,837 ****
proc menu_pop_pd {} {raise .} - proc menu_audio {flag} {pd pd dsp $flag}
def Menuable populate_menu {menu list} { global key ! if {[string index $menu 0]!="."} {set menu .$self.m.$menu} foreach name $list { if {$name == ""} {$menu add separator; continue} --- 823,830 ----
proc menu_pop_pd {} {raise .}
def Menuable populate_menu {menu list} { global key ! set menu $@menubar.$menu foreach name $list { if {$name == ""} {$menu add separator; continue} *************** *** 845,859 ****
def Client init_menus {} { ! $self populate_menu .mbar.file { new_file open_file {} pdrc_editor ddrc_editor send_message paths {} quit} ! $self populate_menu .mbar.find { ! find find_again find_last_error} ! # slash {$self audio 1} ! # period {$self audio 0} ! # Q {$main really_quit} ! # s {$self save} S {$self save_as} ! # z {$self undo} Z {$self redo} }
--- 838,864 ----
def Client init_menus {} { ! $self populate_menu file { new_file open_file {} pdrc_editor ddrc_editor send_message paths {} quit} ! $self populate_menu media { ! audio_on audio_off {} ! audio_settings midi_settings {} ! test_audio_and_midi load_meter latency_meter} ! $self populate_menu find {find find_again find_last_error} ! $self populate_menu help { ! about class_browser client_class_tree clipboard_view history_view do_what_i_mean} ! } ! def Client menu_addstd {} { ! global pd_apilist pd_midiapilist ! foreach {api id} $pd_apilist { ! .mbar.media add radiobutton -label $api -variable pd_whichapi -value $id \ ! -command {pd pd audio-setapi $pd_whichapi} ! } ! $self populate_menu media {{}} ! foreach {api id} $pd_midiapilist { ! .mbar.media add radiobutton -label $api -variable pd_whichmidiapi -value $id \ ! -command {pd pd midi-setapi $pd_whichmidiapi} ! } }
*************** *** 1064,1067 **** --- 1069,1074 ---- }
+ # give topleft point of an object in the canvas it's rendered in. + # this includes GOP and excludes zoom. def View xy {} { # todo: should compute GOP stuff here *************** *** 1069,1075 **** set cy $@y1 return [list $cx $cy] - puts "cx --> $cx || cy --> $cy" - #puts "[expr $cx * $_($@canvas:scale)] ||| [expr $cy * $_($@canvas:scale)]" - #return [list [expr $cx * $_($@canvas:scale)] [expr $cy * $_($@canvas:scale)]] }
--- 1076,1079 ---- *************** *** 1129,1138 **** proc wonder {} {tk_messageBox -message "this would be a cool feature, eh?" -type yesno -icon question}
! def Canvas new_file {} {global main; $main new_file} ! def Canvas open_file {} {global main; $main open_file} ! def Canvas send_message {} {global main; $main send_message} ! def Canvas paths {} {global main; $main paths} ! ! def* Canvas eval% {code} { mset {x y} $@curpos regsub -all %X $code $x code --- 1133,1137 ---- proc wonder {} {tk_messageBox -message "this would be a cool feature, eh?" -type yesno -icon question}
! def Canvas eval% {code} { mset {x y} $@curpos regsub -all %X $code $x code *************** *** 1141,1144 **** --- 1140,1147 ---- }
+ def Canvas new_file {} {global main; $main new_file} + def Canvas open_file {} {global main; $main open_file} + def Canvas send_message {} {global main; $main send_message} + def Canvas paths {} {global main; $main paths} def Client paths {} {pd pd start-path-dialog} def Client audio_settings {} {pd pd audio-properties} *************** *** 1152,1186 **** def Client audio_on {} {pd pd dsp 1} def Client audio_off {} {pd pd dsp 0} - - def Client menu_addstd {} { - global pd_apilist pd_midiapilist OS - set m .mbar.media - $self populate_menu $m {audio_on audio_off {}} - switch $OS { - osx {} - default {$self populate_menu $m {audio_settings midi_settings}} - } - $self populate_menu $m {{} test_audio_and_midi load_meter latency_meter} - foreach a $pd_apilist { - $m add radiobutton -label [lindex $a 0] -variable pd_whichapi -value [lindex $a 1] \ - -command {pd pd audio-setapi $pd_whichapi} - } - $self populate_menu $m {{}} - foreach a $pd_midiapilist { - $m add radiobutton -label [lindex $a 0] -variable pd_whichmidiapi -value [lindex $a 1] \ - -command {pd pd midi-setapi $pd_whichmidiapi} - } - $self populate_menu .mbar.help { - about class_browser client_class_tree clipboard_view history_view do_what_i_mean - } - } - def Client clipboard_view {} {ClipboardDialog new} def Client history_view {} { HistoryDialog new} def Client do_what_i_mean {} {wonder}
- proc menu_audio {flag} {pd pd dsp $flag} - - #set pd_prefix [file dirname [file dirname [exec which pd]]] set pd_prefix [file dirname [file dirname [which pd]]] set pd_guidir ${pd_prefix}/lib/pd --- 1155,1162 ---- *************** *** 1227,1230 **** --- 1203,1207 ---- # check or uncheck the "edit" menu item def Canvas editmode {} {return $@editmode} + # to be called only from Pd side. def Canvas editmode= {mode} { set @editmode $mode *************** *** 1247,1251 **** def Canvas redo {} {$@history redo}
! def* Canvas init {x1 y1 xs ys args} { global pd_opendir pd_tearoff OS cmdline canvas history manager window_list lappend window_list $self --- 1224,1229 ---- def Canvas redo {} {$@history redo}
! #!@#$ this method is too long. ! def Canvas init {x1 y1 xs ys args} { global pd_opendir pd_tearoff OS cmdline canvas history manager window_list lappend window_list $self *************** *** 1636,1654 **** bind $t <Any-Leave> "puts "destroy the compltion box please.........." " mset {cx cy} [$self xy] ! #--------------------------------------- label completion ! ## for display tab completion ! ## need to look into this font(height) for setting the -height..... no idea why ! #.$@canvas.c create window [expr $cx+2] [expr $cy+2] \ ! # -window $propose -anchor nw -tags "${self}propose $self" -height $font(height) ! #--------------------------------------- ! #.$@canvas.c create window [expr $cx+2] [expr $cy+2] \ ! # -window $t -anchor nw -tags "${self}text $self" ! ! $self item text window [list [expr $cx+2] [expr $cy+2]] -window $t -anchor nw -tags "${self}text $self" ! ! #$self draw $t configure -pady 0 -padx 1 $t insert 1.0 $@text - #set @entered [$t get 1.0 1.end] focus $t } --- 1614,1621 ---- bind $t <Any-Leave> "puts "destroy the compltion box please.........." " mset {cx cy} [$self xy] ! $self item text window [list [expr $cx+2] [expr $cy+2]] \ ! -window $t -anchor nw -tags "${self}text $self" $t configure -pady 0 -padx 1 $t insert 1.0 $@text focus $t } *************** *** 1671,1681 **** #$widget delete 1.0 1.end #set text {} ! #foreach char $l { ! #append text [format %c $char] ! #} ! #puts "l == $l ||| $tab ||| $text" #$widget insert 1.0 $text #set @text $text - $self update_size $self draw --- 1638,1644 ---- #$widget delete 1.0 1.end #set text {} ! #foreach char $l {append text [format %c $char]} #$widget insert 1.0 $text #set @text $text $self update_size $self draw *************** *** 1705,1709 **** def Canvas selection {} {return $@selection} def Canvas selection= {objs} { - post "SELECTION=: %s " [uplevel 2 {info locals}] foreach o $@selection {$o selected?= 0} set @selection $objs --- 1668,1671 ---- *************** *** 1791,1794 **** --- 1753,1757 ---- def Canvas del {i} {pd .$self object_delete ![lindex $@children $i]}
+ # should be only called from the server def Canvas wires= {wires2} { global canvas clipboard *************** *** 1819,1823 **** set i 0 foreach x $born { ! $x subscribe $self;$x changed;$x canvas= $self if {$@duplicating} { lappend @selection_wire $x --- 1782,1788 ---- set i 0 foreach x $born { ! $x subscribe $self ! $x changed ! $x canvas= $self if {$@duplicating} { lappend @selection_wire $x *************** *** 1827,1845 **** } if {[info exists clipboard(copying)]} { ! if {$clipboard(copying)} { lappend @selection_wire $x; $x selected?= 1 if {$i == $born_num} { ! set clipboard(copying) 0 ! set clipboard(orig_cpcanvas) $self ! } } } ! incr i } - set dead [lwithout $@wires $wires]; foreach x $dead {$x unsubscribe $self; $x erase} set @wires $wires $self changed - }
--- 1792,1808 ---- } if {[info exists clipboard(copying)]} { ! if {$clipboard(copying)} { lappend @selection_wire $x; $x selected?= 1 if {$i == $born_num} { ! set clipboard(copying) 0 ! set clipboard(orig_cpcanvas) $self } + } } ! incr i } set dead [lwithout $@wires $wires]; foreach x $dead {$x unsubscribe $self; $x erase} set @wires $wires $self changed }
*************** *** 1896,1900 **** set @orig_y $y } ! def Canvas motion {x y mods state} { global font canvas tooltip --- 1859,1864 ---- set @orig_y $y } ! ! #!@#$ this method is too long def Canvas motion {x y mods state} { global font canvas tooltip *************** *** 1925,1933 **** $c coords lnew $l } - # detects if the focus is not on the canvas itself in run mode, ie. numbox if {!$@editmode & [$self focus] != $self & [$self focus] != ""} {[$self focus] motion $x $y $mods} - - #puts "action:$@action ........" switch $@action { move { --- 1889,1894 ---- *************** *** 1949,1956 **** } } - mset {type id} [$self identify_target $x $y -1 -1 "move "] - #puts "id :::: $id" - #puts "type :: $type" switch $type { object { --- 1910,1914 ---- *************** *** 2069,2097 **** }
- def* Canvas duplicate_wire {} { - global _ canvas - set i 0 - set wires {} - set canvas(dup_wire_num) [llength $@selection_wire] - # _($obj:duplicate) sotres the duplicated object so that we know how to duplicate the wires - foreach obj $canvas(dup_orig) {set _($obj:duplicate) [lindex $@selection $i]; incr i} - foreach wire $@selection_wire { - set obj1 $_($wire:obj1) - set obj2 $_($wire:obj2) - set obj1_dup $_($obj1:duplicate) - set obj2_dup $_($obj2:duplicate) - #puts "$obj1 :: $obj1_dup | $obj2 :: $obj2_dup" - pd .$self connect [lsearch $@children $obj1_dup] $_($wire:port1) [lsearch $@children $obj2_dup] $_($wire:port2) - lappend wires [list [lsearch $@children $obj1_dup] $_($wire:port1) [lsearch $@children $obj2_dup] $_($wire:port2)] - $wire selected?= 0 - } - set @selection_wire "" - #clean up - foreach obj $canvas(dup_orig) {set _($obj:duplicate) 0} - set $canvas(dup_orig) "" - #set @duplicating 0 - #set @selection_wire "" - } - def Canvas index {child} { # this could be O(1) if the proper database were maintained. --- 2027,2030 ---- *************** *** 2147,2177 **** def Canvas paste2 {n} {$self selection= [lrange [$self children] $n end]}
- def* Canvas paste_wires {} { - global canvas clipboard - - set i 0 - # _($obj:duplicate) sotres the duplicated object so that we know how to duplicate the wires - foreach obj $clipboard(objs) {set _($obj:duplicate) [lindex $clipboard(copied_obj) $i]; incr i} - foreach wire $clipboard(wires) { - set obj1 $_($wire:obj1) - set obj2 $_($wire:obj2) - set obj1_copy $_($obj1:duplicate) - set obj2_copy $_($obj2:duplicate) - #puts "::::: $obj1 :: $obj1_copy | $obj2 :: $obj2_copy :::::" - - #puts "connect [lsearch $@children $obj1_copy] $_($wire:port1) [lsearch $@children $obj2_copy] $_($wire:port2)" - pd .$self connect [lsearch $@children $obj1_copy] $_($wire:port1) [lsearch $@children $obj2_copy] $_($wire:port2) - #$wire selected?= 0 - } - #puts "selection:::::::: $_($canvas(current):selection)" - #set canvas(copy_obj) $_($canvas(current):selection) - #clean up - foreach obj $clipboard(objs) {set _($obj:duplicate) 0} - set $clipboard(copied_obj) "" - set $clipboard(objs) "" - set $clipboard(wires) "" - - } - def Canvas cut {} { $@history atomically { --- 2080,2083 ---- *************** *** 2216,2231 **** menu $p -tearoff false if {$id == ""} { ! $self populate_menu $p { ! popup_properties ! popup_help} } { ! $id populate_menu $p { ! popup_properties ! popup_open ! popup_help} } tk_popup $p $x $y }
def* Canvas clickedit {x y b f} { set c .[$self canvas].c --- 2122,2133 ---- menu $p -tearoff false if {$id == ""} { ! $self populate_menu $p {popup_properties popup_help} } { ! $id populate_menu $p {popup_properties popup_open popup_help} } tk_popup $p $x $y }
+ # this method is too long def* Canvas clickedit {x y b f} { set c .[$self canvas].c *************** *** 2357,2361 **** def* Canvas click {x y b f} { if {[winfo exists .completion]} { - puts "WARN!!!!! completion box exists................." raise .completion focus .completion.comp --- 2259,2262 ---- *************** *** 2369,2373 **** #if {$@editmode && !($f&2)} {$self clickedit $x $y $b $f; return} if {$@editmode} {$self clickedit $x $y $b $f; return} - #if {$@editmode} {$self clickedit $x $y $b $f; return} mset {type id} [$self identify_target $x $y $b $f "click"] if {![llength $id]} {return} --- 2270,2273 ---- *************** *** 2379,2386 **** }
def* Canvas unclickedit {x y b f} { global look set c .$self.c - puts "_____ unclickedit action:$@action " switch $@action { rect { --- 2279,2286 ---- }
+ #!@#$ this method is too long def* Canvas unclickedit {x y b f} { global look set c .$self.c switch $@action { rect { *************** *** 2397,2404 **** set wids {} foreach tag $selected_elements { ! # to get objects ! if {[regexp {^x([a-f0-9]{6,8})} [$c gettags $tag] id]} {lappend ids $id} ! # to get wires ! if {[regexp {^([0-9a-f]{6,8})} [$c gettags $tag] id]} {lappend wids $id} } set selected_objs [lsort -unique $ids] --- 2297,2304 ---- set wids {} foreach tag $selected_elements { ! # to get objects ! if {[regexp {^x([a-f0-9]{6,8})} [$c gettags $tag] id]} {lappend ids $id} ! # to get wires ! if {[regexp {^([0-9a-f]{6,8})} [$c gettags $tag] id]} {lappend wids $id} } set selected_objs [lsort -unique $ids] *************** *** 2407,2411 **** foreach obj $selected_objs { set i [lsearch $@selection $obj] ! if {$i<0} {lappend @selection $obj} } --- 2307,2311 ---- foreach obj $selected_objs { set i [lsearch $@selection $obj] ! if {$i<0} {lappend @selection $obj} } *************** *** 2419,2429 **** #foreach obj $@selection {$c itemconfigure ${obj}BASE -outline [look selectframe]} foreach obj $@selection {$obj selected?= 1} ! if {[llength $@selection] == 1} { ! set @keynav_current $@selection ! } else { ! set @keynav_current [lindex $@selection 0] ! } ! # hilite wire ! foreach wire $@selection_wire {$wire select 1} } set @select_by "selrect" --- 2319,2329 ---- #foreach obj $@selection {$c itemconfigure ${obj}BASE -outline [look selectframe]} foreach obj $@selection {$obj selected?= 1} ! if {[llength $@selection] == 1} { ! set @keynav_current $@selection ! } else { ! set @keynav_current [lindex $@selection 0] ! } ! # hilite wire ! foreach wire $@selection_wire {$wire select 1} } set @select_by "selrect" *************** *** 2433,2439 **** #mset {type id} [$@canvas identify_target $x $y [expr $x-1] [expr $y-1] "unclick"] # if making wire without shift key (delete the dash line) - puts " f::: $f" if {!$f} {$c delete lnew} else { - puts " delete dash wire" $c delete lnew mset {from outlet} $@wire_from --- 2333,2337 ---- *************** *** 2537,2548 **** }
! def Canvas key_nav_up {} {$self key_nav "up" 0} ! def Canvas key_nav_down {} {$self key_nav "down" 0} ! def Canvas key_nav_right {} {$self key_nav "right" 0} ! def Canvas key_nav_left {} {$self key_nav "left" 0} ! def Canvas key_nav_up_shift {} {$self key_nav "up" 1} ! def Canvas key_nav_down_shift {} {$self key_nav "down" 1} def Canvas key_nav_right_shift {} {$self key_nav "right" 1} ! def Canvas key_nav_left_shift {} {$self key_nav "left" 1}
def* Canvas key_nav {direction shift} { --- 2435,2446 ---- }
! def Canvas key_nav_up {} {$self key_nav "up" 0} ! def Canvas key_nav_down {} {$self key_nav "down" 0} ! def Canvas key_nav_right {} {$self key_nav "right" 0} ! def Canvas key_nav_left {} {$self key_nav "left" 0} ! def Canvas key_nav_up_shift {} {$self key_nav "up" 1} ! def Canvas key_nav_down_shift {} {$self key_nav "down" 1} def Canvas key_nav_right_shift {} {$self key_nav "right" 1} ! def Canvas key_nav_left_shift {} {$self key_nav "left" 1}
def* Canvas key_nav {direction shift} { *************** *** 2689,2698 **** #incr @keynav_iocount if {$@keynav_iocount >= [llength $ports]} {set @keynav_iocount 0} - #puts " ports:::: $ports" - #puts " count ::: $@keynav_iocount" mset {x y x1 y1} [.$self.c bbox [lindex $ports $@keynav_iocount]] set @keynav_port [lindex $ports $@keynav_iocount] - #puts " port:::: $@keynav_port" - #puts " ports:::: $@keynav_iosel" #set _($@selection:ioselect) [lindex $ports $@keynav_iocount] set _($@selection:ioselect) [list [lindex $ports3 $@keynav_iocount] [lindex $ports2 $@keynav_iocount]] --- 2587,2592 ---- *************** *** 2700,2704 **** incr @keynav_iocount - #puts " select a io for $@selection|$ins|$outs" #mset {x y x1 y1} [.$self.c bbox ${obj}i0] #set port [$obj hilite_io i $x $y] --- 2594,2597 ---- *************** *** 2707,2715 ****
def* Canvas dehilite_io {} { ! if {[llength $@keynav_iosel]} { ! foreach io $@keynav_iosel { ! puts "delete ::::: $_($io:ioselect)" set box $_($io:ioselect) - #.$self.c delete ${box}b set type [lindex $_($io:ioselect) 1] set port [lindex $_($io:ioselect) 0] --- 2600,2606 ----
def* Canvas dehilite_io {} { ! if {![llength $@keynav_iosel]} {return} ! foreach io $@keynav_iosel { set box $_($io:ioselect) set type [lindex $_($io:ioselect) 1] set port [lindex $_($io:ioselect) 0] *************** *** 2717,2726 **** .$self.c delete ${tag}b set _($io:ioselect) {} ! } ! set @keynav_iosel {} ! set @keynav_port 0 ! set @keynav_iocount 0 ! } ! }
--- 2608,2615 ---- .$self.c delete ${tag}b set _($io:ioselect) {} ! } ! set @keynav_iosel {} ! set @keynav_port 0 ! set @keynav_iocount 0 }
*************** *** 2827,2835 **** } } ! Escape {if {[llength $@selection] > 0} { $self deselect_all $self dehilite_io ! } ! } default {} --- 2716,2724 ---- } } ! Escape { ! if {[llength $@selection] > 0} { $self deselect_all $self dehilite_io ! } } default {} *************** *** 2842,2847 **** set canvas .$self.c if {$shift} { ! if {[llength $@shift_wires]} {set @shift_wires {}; $canvas delete lnew} ! #$canvas delete lnew } if {$iso != ""} {scan $iso %c key} --- 2731,2735 ---- set canvas .$self.c if {$shift} { ! if {[llength $@shift_wires]} {set @shift_wires {}; $canvas delete lnew} } if {$iso != ""} {scan $iso %c key} *************** *** 2876,2896 **** mset {x y} [$self xy] list $x $y [expr $x+$@xs] [expr $y+$@ys] - - #mset {x y} [$self xy] - #set xs [expr $@xs * $_($@canvas:scale)] - #set ys [expr $@ys * $_($@canvas:scale)] - #set x1 [expr $x * $_($@canvas:scale)] - #set y1 [expr $y * $_($@canvas:scale)] - #set x2 [expr $x1 + $xs] - #set y2 [expr $y1 + $ys] - #puts " x1==$x1 y1==$y1 x2==$x2 y2==$y2" - #list $x1 $y1 $x2 $y2 }
- #def Box draw_wires {} { - # #puts "wires:$@wires" - # foreach wire $@wires {$wire draw} - #} - def* Box delete_wire {wire} { set find [lsearch $@wires $wire] --- 2764,2769 ---- *************** *** 5769,5792 **** #12345678901234567890123456789012345678901234567890123456789012345678901 <- 72 chars .$self.text insert 0.0 "\ ! A real-time graphical programming environment for live interactive ! computer music and video. PureData works on Linux, MacOSX/PPC, ! MacOSX/Intel, Windows, Irix/SiliconGraphics, etc. DesireData is a ! branch of PureData that has additional magic powers.
PureData is copyrighted, but is free for you to use for any reasonable purpose, according to the SIBSD license. DesireData's client section also is free, according to the GPL license. - (insert here: links to both licenses)
- (insert here: link to "reference documentation for Pd", that is, - chapter 1) - - Much more documentation and other resources live on: - http://puredata.org - - The Pd mailing list archive lives in: - http://iem.kug.ac.at/mailinglists/pd-list/ - Credits: DesireData server: Mathieu Bouchard --- 5642,5655 ---- #12345678901234567890123456789012345678901234567890123456789012345678901 <- 72 chars .$self.text insert 0.0 "\ ! PureData is a real-time graphical programming environment for live ! interactive computer music and video. PureData works on Linux, ! MacOSX/PPC, MacOSX/Intel, Windows, Irix/SiliconGraphics, etc. DesireData ! is a branch of PureData that has additional magic powers.
PureData is copyrighted, but is free for you to use for any reasonable purpose, according to the SIBSD license. DesireData's client section also is free, according to the GPL license. (insert here: links to both licenses)
Credits: DesireData server: Mathieu Bouchard *************** *** 5802,5806 **** Norsk Bokmål (Norwegian): Gisle Frøysland Português (Portuguese): Nuno Godinho ! Italiano (Italian): Davide Morelli"
# this looks bad on OSX, iirc --- 5665,5676 ---- Norsk Bokmål (Norwegian): Gisle Frøysland Português (Portuguese): Nuno Godinho ! Italiano (Italian): Davide Morelli ! ! Much more documentation and other resources at http://puredata.info/ ! The Pd mailing list archive at http://lists.puredata.info/pipermail/pd-list/ ! ! (insert here: link to "reference documentation for Pd", that is, ! chapter 1)" !
# this looks bad on OSX, iirc *************** *** 5908,5913 **** set r {} foreach field $fields($@pdclass) {lappend r $_($self:$field)} - puts "Box deconstruct: fields=$fields($@pdclass)" - puts "Box deconstruct: r=$r" return $r } --- 5778,5781 ----
-
Mathieu Bouchard