Pd-cvs August 2005

pd-cvs@lists.iem.at

8 participants
108 discussions

pd/src desire.tk,1.1.2.13,1.1.2.14
by chunlee 26 Aug '05

26 Aug '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1084 Modified Files: Tag: devel_0_39 desire.tk Log Message: can delete/close canvas, also some stupid bug fix Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -C2 -d -r1.1.2.13 -r1.1.2.14 *** desire.tk 25 Aug 2005 18:40:20 -0000 1.1.2.13 --- desire.tk 26 Aug 2005 04:46:41 -0000 1.1.2.14 *************** *** 277,281 **** # Odd little function to make better Mac accelerators proc accel_munge {acc} { ! puts "accel_munge::: $acc" global pd_nt --- 277,281 ---- # Odd little function to make better Mac accelerators proc accel_munge {acc} { ! #puts "accel_munge::: $acc" global pd_nt *************** *** 310,314 **** set canvas_id [format %x [expr 0x80f2b50 + $offset_canvas]] ! set canvas_id .$canvas_id set offset_canvas [expr $offset_canvas + 1] --- 310,314 ---- set canvas_id [format %x [expr 0x80f2b50 + $offset_canvas]] ! set canvas_id .x$canvas_id set offset_canvas [expr $offset_canvas + 1] *************** *** 386,392 **** } #-----------------------------------------------------------------------------------# proc populate_menu {menu context list} { ! puts "__populate_menu::: $menu $context $list" global accels --- 386,411 ---- } + proc menu_close {name} { + puts "menu_close::: $name" + + + + foreach to_kill [winfo children $name] { + destroy $to_kill + } + + #destroy $name.c + + destroy $name + + + #pd "$name menuclose 0 ;" + + #pdtk_fixwindowmenu + } + #-----------------------------------------------------------------------------------# proc populate_menu {menu context list} { ! #puts "__populate_menu::: $menu $context $list" global accels *************** *** 554,573 **** #-----------------------------------------------------------------------------------# # Odd little function to make better Mac accelerators ! proc accel_munge {acc} { ! puts "accel_munge::: $acc" ! ! global pd_nt ! if {$pd_nt == 2} { ! set tmp [string toupper [string map {Ctrl Meta} $acc] end] ! if [string is upper [string index $acc end]] { ! return Shift+$tmp ! } else { ! return $tmp ! } ! } else { ! return $acc ! } ! } ! # --- 573,592 ---- #-----------------------------------------------------------------------------------# # Odd little function to make better Mac accelerators ! #proc accel_munge {acc} { ! #puts "accel_munge::: $acc" ! # ! # global pd_nt ! # if {$pd_nt == 2} { ! # set tmp [string toupper [string map {Ctrl Meta} $acc] end] ! # if [string is upper [string index $acc end]] { ! # return Shift+$tmp ! # } else { ! # return $tmp ! # } ! # } else { ! # return $acc ! # } ! #} ! # # *************** *** 738,741 **** --- 757,761 ---- proc pdtk_canvas_new {name width height geometry editable} { puts "pdtk_canvas_new::: $name $width $height $geometry $editable" + global pd_opendir pd_tearoff pd_nt cmdline canvasmenu _ *************** *** 757,760 **** --- 777,784 ---- scrollbar $name.scrollvert -command "$name.c yview" scrollbar $name.scrollhort -command "$name.c xview" -orient horizontal + + + #puts "$name.c" + #if {[string compare $cmdline(look) ""]} { #make_button_bar $name.bbar $name *************** *** 926,929 **** --- 950,955 ---- set _($self:current_y) 30 + puts "pdtk_canvas_new::: $name $width $height $geometry $editable" + } *************** *** 943,947 **** # LATER also cut/copy/paste proc menu_fixeditmenu {name} { ! puts "menu_fixeeditmenu::: $name" #global pd_undoaction pd_redoaction pd_undocanvas --- 969,973 ---- # LATER also cut/copy/paste proc menu_fixeditmenu {name} { ! #puts "menu_fixeeditmenu::: $name" #global pd_undoaction pd_redoaction pd_undocanvas *************** *** 962,966 **** # message from Pd to update the currently available undo/redo action proc pdtk_undomenu {name undoaction redoaction} { ! puts "pdtk_undomenu::: $name $undoaction $redoaction" #global pd_undoaction pd_redoaction pd_undocanvas --- 988,992 ---- # message from Pd to update the currently available undo/redo action proc pdtk_undomenu {name undoaction redoaction} { ! #puts "pdtk_undomenu::: $name $undoaction $redoaction" #global pd_undoaction pd_redoaction pd_undocanvas *************** *** 1228,1232 **** -font [format -*-courier-medium--normal--%d-* $font_size] ! bind ${canvas}.${self}text <KeyRelease> {pdtk_text_key %W %x %y %K %A 0} #$canvas create window 41 41 -window ${canvas}.${self}text -anchor nw\ --- 1254,1265 ---- -font [format -*-courier-medium--normal--%d-* $font_size] ! set _(self) $self ! bind ${canvas}.${self}text <KeyRelease> { ! ! global _ ! ! pdtk_text_key $canvas.c $_(self) %W %x %y %K %A 0 ! ! } #$canvas create window 41 41 -window ${canvas}.${self}text -anchor nw\ *************** *** 1256,1260 **** #-----------------------------------------------------------------------------------# ! proc pdtk_text_key {widget x y key iso shift} { global _ font --- 1289,1293 ---- #-----------------------------------------------------------------------------------# ! proc pdtk_text_key {canvas self widget x y key iso shift} { global _ font *************** *** 1265,1269 **** $widget configure -width [expr $name_len + 1] ! #puts "$widget | $canvas | $self" #puts "name_len: $name_len" #puts "$self:state -> $_($self:state)" --- 1298,1302 ---- $widget configure -width [expr $name_len + 1] ! puts "*** $widget | $canvas | $self ***" #puts "name_len: $name_len" #puts "$self:state -> $_($self:state)"

1 0

pd/src desire.tk,1.1.2.12,1.1.2.13
by chunlee 25 Aug '05

25 Aug '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31399 Modified Files: Tag: devel_0_39 desire.tk Log Message: have main pd window and ctrl+n creates new canvas next: handles multiple canvas Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.12 retrieving revision 1.1.2.13 diff -C2 -d -r1.1.2.12 -r1.1.2.13 *** desire.tk 23 Aug 2005 09:54:08 -0000 1.1.2.12 --- desire.tk 25 Aug 2005 18:40:20 -0000 1.1.2.13 *************** *** 27,30 **** --- 27,438 ---- #-----------------------------------------------------------------------------------# + set pd_nt 0 + + #option add *background pink widgetDefault + #option add *backgroundPixmap /usr/share/themes/BrushedMetalBlue/gtk/brushed-dark.xpm widgetDefault + #option add *backgroundPixmap /home/matju/brushed-dark.gif widgetDefault + option add *font {Helvetica -12} + #option add *font {Helvetica -12 bold} + option add *borderWidth 1 + #option add *Menu*borderWidth 1 + #option add *Button*borderWidth 1 + #option add *Checkbutton*borderWidth 1 + #option add *Radiobutton*borderWidth 1 + option add *Checkbutton*selectColor #dd3000 + option add *Radiobutton*selectColor #dd3000 + + #option add *Entry*background #d8c0c0 # motif-style + # option add *Entry*background #b0d8d8 # hospital-green (call it "lichen) + # option add *Entry*selectBackground #60b0b0 + + option add *Entry*background #b0c4d8 + option add *Entry*selectBackground #6088b0 + option add *background #ffffff + option add *foreground #000000 + option add *activeBackground #000000 + option add *activeForeground #00ff00 + + proc l+ {al bl} {set r {}; foreach a $al b $bl {lappend r [expr $a+$b]}; return $r} + proc l- {al bl} {set r {}; foreach a $al b $bl {lappend r [expr $a-$b]}; return $r} + proc l/2 {al } {set r {}; foreach a $al {lappend r [expr $a/2 ]}; return $r} + #proc lmap ... + + proc lreverse {list} { + #puts "lreverse::: $list" + + set r {} + for {set i [expr [llength $list]-1]} {$i>=0} {incr i -1} { + lappend r [lindex $list $i] + } + return $r + } + + # there are two palettes of 30 colours used in Pd + # when placed in a 3*10 grid, the difference is that + # the left corner of 3*3 (the greys) are transposed (matrixwise) + # here is the one used in the swatch color selector: + set preset_colors { + fcfcfc e0e0e0 bcbcbc fce0e0 fce0c0 fcfcc8 d8fcd8 d8fcfc dce4fc f8d8fc + a0a0a0 7c7c7c 606060 fc2828 fcac44 e8e828 14e814 28f4f4 3c50fc f430f0 + 404040 202020 000000 8c0808 583000 782814 285014 004450 001488 580050 + } + + set preset_colors2 { + fcfcfc a0a0a0 404040 fce0e0 fce0c0 fcfcc8 d8fcd8 d8fcfc dce4fc f8d8fc + e0e0e0 7c7c7c 202020 fc2828 fcac44 e8e828 14e814 28f4f4 3c50fc f430f0 + bcbcbc 606060 000000 8c0808 583000 782814 285014 004450 001488 580050 + } + + # very small icons: + image create bitmap icon_plus -data "#define z_width 7\n#define z_height 7 + static unsigned char z_bits[] = { 8,8,8,127,8,8,8 };" + image create bitmap icon_minus -data "#define z_width 7\n#define z_height 7 + static unsigned char z_bits[] = { 0,0,0,127,0,0,0 };" + image create bitmap icon_uparrow -data "#define z_width 7\n#define z_height 5 + static unsigned char z_bits[] = { 8,28,62,127,0 };" + image create bitmap icon_downarrow -data "#define z_width 7\n#define z_height 5 + static unsigned char z_bits[] = { 0,127,62,28,8 };" + + + # Tearoff is set to true by default: + set pd_tearoff 1 + + if {$pd_nt == 1} { + global pd_guidir pd_tearoff + set pd_gui2 [string range $argv0 0 [expr [string last \\ $argv0] - 1]] + regsub -all \\\\ $pd_gui2 / pd_gui3 + set pd_guidir $pd_gui3/.. + load $pd_guidir/bin/pdtcl + set pd_tearoff 1 + } + + if {$pd_nt == 2} { + global pd_guidir pd_tearoff + set pd_gui2 [string range $argv0 0 [expr [string last / $argv0] - 1]] + set pd_guidir $pd_gui2/.. + load $pd_guidir/bin/pdtcl + set pd_tearoff 0 + } + + # hack so you can easily test-run this script in linux... define pd_guidir + # (which is normally defined at startup in pd under linux...) + + if {$pd_nt == 0} { + if {! [info exists pd_guidir]} { + global pd_guidir + puts stderr {setting pd_guidir to '.'} + set pd_guidir . + } + } + + # it's unfortunate but we seem to have to turn off global bindings + # for Text objects to get control-s and control-t to do what we want for + # "text" dialogs below. Also we have to get rid of tab's changing the focus. + + bind all <Key-Tab> "" + bind all <<PrevWindow>> "" + bind Text <Control-t> {} + bind Text <Control-s> {} + # puts stderr [bind all] + + ################## set up main window ######################### + menu .mbar + + frame .controls + pack .controls -side top -fill x + menu .mbar.file -tearoff $pd_tearoff; .mbar add cascade -label "File" -menu .mbar.file + menu .mbar.find -tearoff $pd_tearoff; .mbar add cascade -label "Find" -menu .mbar.find + menu .mbar.windows -postcommand pdtk_fixwindowmenu -tearoff $pd_tearoff + menu .mbar.audio -tearoff $pd_tearoff + if {$pd_nt != 2} { + .mbar add cascade -label "Windows" -menu .mbar.windows + .mbar add cascade -label "Media" -menu .mbar.audio + } else { + # Perhaps this is silly, but Mac HIG want "Window Help" as the last menus + .mbar add cascade -label "Media" -menu .mbar.audio + .mbar add cascade -label "Windows" -menu .mbar.windows + } + menu .mbar.help -tearoff $pd_tearoff + .mbar add cascade -label "Help" -menu .mbar.help + + set ctrls_audio_on 0 + set ctrls_meter_on 0 + + proc pdtk_pd_meters {indb outdb inclip outclip} { + puts "pdtk_pd_meters::: $indb $outdb $inclip $outclip" + + .controls.in.1.mtr coords m 0 0 $indb 0 + .controls.out.1.mtr coords m 0 0 $outdb 0 + foreach {z clip} [list in $inclip out $outclip] { + .controls.$z.1.clip configure -background [if {$clip==1} {list red} {list black}] + } + } + + foreach z {in out} { + set f .controls.$z + frame $f + frame $f.1 -borderwidth 2 -relief groove + canvas $f.1.mtr -width 100 -height 10 -bg #222222 + $f.1.mtr create line 0 0 0 0 -width 24 -fill [switch $z {in {set 0 blue} out {set 0 green}}] -tags m + canvas $f.1.clip -width 5 -height 10 -bg #222222 + pack $f.1.mtr $f.1.clip -side left -pady 2 -padx 0 + pack $f.1 -padx 6 -pady 9 + label $f.2 -text [string tolower $z] + place $f.2 -x 11 -y -4 + pack $f -side left -pady 0 -padx 0 + } + + proc pdtk_pd_dsp {value} { + puts "pdtk_pd_dsp::: $value" + + global ctrls_audio_on + if {$value == "ON"} {set ctrls_audio_on 1} else {set ctrls_audio_on 0} + } + + proc pdtk_pd_dio {red} { + puts "pdtk_pd_dio::: $red" + + .controls.switches.dio configure -background red \ + -activebackground [if {$red==1} {list red} {list lightgrey}] + } + + frame .controls.switches + foreach {w x y z} { + audiobutton "audio" ctrls_audio_on {pd "pd dsp $ctrls_audio_on ;"} + meterbutton "meters" ctrls_meter_on {pd "pd meters $ctrls_meter_on ;"} + } { + checkbutton .controls.switches.$w -text $x -variable $y -anchor w -command $z + pack .controls.switches.$w -side left + } + + button .controls.switches.dio -text "io errors" -command {pd "pd audiostatus ;"} + pack .controls.switches.dio + pack .controls.switches -side right + + bind . <Control-Key> {pdtk_pd_ctrlkey %W %K 0} + bind . <Control-Shift-Key> {pdtk_pd_ctrlkey %W %K 1} + if {$pd_nt == 2} { + bind . <Mod1-Key> {pdtk_canvas_ctrlkey %W %K 0} + bind . <Mod1-Shift-Key> {pdtk_canvas_ctrlkey %W %K 1} + } + + wm title . "Pd" + . configure -menu .mbar + + ############### set up global variables ################################ + + set untitled_number 1 + set untitled_directory [pwd] + set saveas_client doggy + set pd_opendir $untitled_directory + set pd_undoaction no + set pd_redoaction no + set pd_undocanvas no + + ################ utility functions ######################### + + proc pdtk_enquote {x} { + puts "pdtk_enquote::: $x" + + set foo [string map {"," "" ";" "" "\"" ""} $x] + return [string map {" " "\\ " "{" "" "}" ""} $foo] + } + + proc pdtk_debug {x} { + puts "pdtk_debug::: $x" + + tk_messageBox -message $x -type ok + } + + proc pdtk_watchdog {} { + puts"pdtk_watchdog::: + " + pd "pd ping ;"; after 2000 {pdtk_watchdog} + } + + proc pdtk_check {x message} { + puts "pdtk_check::: $x $message" + + set answer [tk_messageBox -message $x -type yesno -icon question] + switch -- $answer { + yes {pd $message} } + # no {tk_messageBox -message "cancelled" -type ok} + } + + set menu_windowlist {} + + proc pdtk_fixwindowmenu {} { + puts "pdtk_fixwindowmenu:::" + + global menu_windowlist + .mbar.windows delete 0 end + foreach i $menu_windowlist { + .mbar.windows add command -label [lindex $i 0] \ + -command "menu_domenuwindow [lindex $i 1]]" + menu_fixwindowmenu [lindex $i 1] + } + } + + + # Odd little function to make better Mac accelerators + proc accel_munge {acc} { + puts "accel_munge::: $acc" + + global pd_nt + if {$pd_nt == 2} { + set tmp [string toupper [string map {Ctrl Meta} $acc] end] + if [string is upper [string index $acc end]] { + return Shift+$tmp + } else { + return $tmp + } + } else { + return $acc + } + } + + set offset_canvas 0 + + proc menu_new {} { + puts "menu_new:::" + + global untitled_number untitled_directory + #pd "pd filename Untitled-$untitled_number $untitled_directory ;" + #pd { + # #N canvas; + # #X pop 1; + #} + + global offset_canvas _ + + + #set canvas $_(focus) + + set canvas_id [format %x [expr 0x80f2b50 + $offset_canvas]] + set canvas_id .$canvas_id + set offset_canvas [expr $offset_canvas + 1] + + puts "new canvas id -> $canvas_id" + + #object_add $object_id $canvas + + #set canvas .x80f2b50 + + #set canvas + + pdtk_canvas_new $canvas_id 300 300 +[expr $offset_canvas*50]+[expr $offset_canvas*50] 1 + + set untitled_number [expr $untitled_number + 1] + } + + proc menu_open {} { + puts "menu_open:::" + + global pd_opendir + set filename [tk_getOpenFile -defaultextension .pd \ + -filetypes { {{pd files} {.pd}} {{max files} {.pat}}} \ + -initialdir $pd_opendir] + if {$filename != ""} {open_file $filename} + } + + proc open_file {filename} { + puts "open_file $filename"" + + global pd_opendir + set directory [string range $filename 0 [expr [string last / $filename] - 1]] + set pd_opendir $directory + set basename [string range $filename [expr [string last / $filename] + 1] end] + if {[string last .pd $filename] >= 0} { + pd "pd open [pdtk_enquote $basename] [pdtk_enquote $directory] ;" + } + } + + proc menu_send {} { + puts "menu_send:::" + + toplevel .sendpanel + entry .sendpanel.entry -textvariable send_textvariable + pack .sendpanel.entry -side bottom -fill both -ipadx 100 + .sendpanel.entry select from 0 + .sendpanel.entry select adjust end + bind .sendpanel.entry <KeyPress-Return> { + pd "$send_textvariable ;" + after 50 {destroy .sendpanel} + } + focus .sendpanel.entry + } + + proc menu_really_quit {} { + puts "menu_really_quit:::" + pd "pd quit ;" + } + + proc menu_quit {} { + puts "menu_quit:::" + + pdtk_check "Do you really wish to quit?" "pd quit ;" + } + + proc menu_pop_pd {} { + puts"menu_pop_pd:::" + + raise . + } + + proc menu_audio {flag} { + puts "menu_audio::: $flag" + + pd "pd dsp $flag ;" + } + + #-----------------------------------------------------------------------------------# + proc populate_menu {menu context list} { + puts "__populate_menu::: $menu $context $list" + + global accels + foreach e $list { + switch -- [llength $e] { + 0 { + $menu add separator + } + 3 { + set cmd [lindex $e 1] + set accel [accel_munge [lindex $e 2]] + if {$accel != ""} {set accels([string tolower $accel]) $cmd} + regsub -all %W $cmd $context cmd + $menu add command -label [lindex $e 0] -command $cmd \ + -accelerator $accel + } + 4 { + set cmd [lindex $e 1] + set accel [accel_munge [lindex $e 2]] + if {$accel != ""} {set accels([string tolower $accel]) $cmd} + regsub -all %W $cmd $context cmd + $menu add checkbutton -label [lindex $e 0] -command $cmd \ + -accelerator $accel -indicatoron ??? + } + } + } + } + + #-----------------------------------------------------------------------------------# + + #################### the "File" menu for the Pd window ############## + + populate_menu .mbar.file {} { + {"New" {foo menu_new} "Ctrl+n"} + {"Open" {foo menu_open} "Ctrl+o"} + {} + {"Class List" {foo show_class_list} ""} + {".pdrc Editor" {foo pdrc_editor_new} ""} + {"Message" {foo menu_send} "Ctrl+m"} + {"Path..." {foo "pd start-path-dialog ;"} ""} + {} + {"Quit" {foo menu_quit} "Ctrl+q"} + } + + #-----------------------------------------------------------------------------------# + + set canvas .x80f2b50 set offset 0 *************** *** 42,46 **** set mouse(b1down) 0 ! set pd_nt 0 set look(objectfg) #000000 --- 450,454 ---- set mouse(b1down) 0 ! #set pd_nt 0 set look(objectfg) #000000 *************** *** 82,86 **** #button .buttons.button1 -text put -command {object_new} #button .buttons.button2 -text delete -command {object_delete $canvas.c} ! button .buttons.button3 -text foo -command {object_test $canvas.c} #button .buttons.button4 -text "edit obj" -command {object_edit $self $canvas.c} --- 490,494 ---- #button .buttons.button1 -text put -command {object_new} #button .buttons.button2 -text delete -command {object_delete $canvas.c} ! #button .buttons.button3 -text foo -command {object_test $canvas.c} #button .buttons.button4 -text "edit obj" -command {object_edit $self $canvas.c} *************** *** 90,96 **** #pack .buttons.button1 .buttons.button3 .buttons.button2 .buttons.button4 -side left #pack .buttons.button1 .buttons.button2 .buttons.button3 -side left ! pack .buttons.button3 -side left #pack .buttons $canvas ! pack .buttons #-----------------------------------------------------------------------------------# --- 498,504 ---- #pack .buttons.button1 .buttons.button3 .buttons.button2 .buttons.button4 -side left #pack .buttons.button1 .buttons.button2 .buttons.button3 -side left ! #pack .buttons.button3 -side left #pack .buttons $canvas ! #pack .buttons #-----------------------------------------------------------------------------------# *************** *** 162,194 **** } ! #-----------------------------------------------------------------------------------# ! proc populate_menu {menu context list} { ! puts "__populate_menu::: $menu $context $list" ! ! global accels ! foreach e $list { ! switch -- [llength $e] { ! 0 { ! $menu add separator ! } ! 3 { ! set cmd [lindex $e 1] ! set accel [accel_munge [lindex $e 2]] ! if {$accel != ""} {set accels([string tolower $accel]) $cmd} ! regsub -all %W $cmd $context cmd ! $menu add command -label [lindex $e 0] -command $cmd \ ! -accelerator $accel ! } ! 4 { ! set cmd [lindex $e 1] ! set accel [accel_munge [lindex $e 2]] ! if {$accel != ""} {set accels([string tolower $accel]) $cmd} ! regsub -all %W $cmd $context cmd ! $menu add checkbutton -label [lindex $e 0] -command $cmd \ ! -accelerator $accel -indicatoron ??? ! } ! } ! } ! } #-----------------------------------------------------------------------------------# --- 570,574 ---- } ! # #-----------------------------------------------------------------------------------# *************** *** 551,555 **** # 1 canvas ! pdtk_canvas_new $canvas 300 300 +700+0 1 #-----------------------------------------------------------------------------------# --- 931,935 ---- # 1 canvas ! #pdtk_canvas_new $canvas 300 300 +700+0 1 #-----------------------------------------------------------------------------------# *************** *** 2189,2192 **** --- 2569,2590 ---- #-----------------------------------------------------------------------------------# + ############### event binding procedures for Pd window ################ + + proc pdtk_pd_ctrlkey {name key shift} { + puts "pdtk_pd_ctrlkey::: $name $key $shift" + + set key [string tolower $key] + switch -- $key { + n {menu_new} + o {menu_open} + m {menu_send} + q {if {$shift == 1} {menu_really_quit} {menu_quit}} + slash {menu_audio 1} + period {menu_audio 0} + } + } + + #-----------------------------------------------------------------------------------# + # modes: # 0: creation

1 0

pd/src m_pd.h,1.4.4.11.2.4,1.4.4.11.2.5
by Thomas Grill 24 Aug '05

24 Aug '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23714/src Modified Files: Tag: devel_0_39 m_pd.h Log Message: we need the garray_updatetime prototype.... Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.4 retrieving revision 1.4.4.11.2.5 diff -C2 -d -r1.4.4.11.2.4 -r1.4.4.11.2.5 *** m_pd.h 21 Aug 2005 11:28:24 -0000 1.4.4.11.2.4 --- m_pd.h 24 Aug 2005 17:14:52 -0000 1.4.4.11.2.5 *************** *** 718,721 **** --- 718,723 ---- EXTERN void garray_setsaveit(t_garray *x, int saveit); + EXTERN double garray_updatetime(t_garray *x); + EXTERN t_class *scalar_class;

1 0

pd/src pd_base.tk,NONE,1.1.2.1 pd.tk,1.1.2.6,NONE
by carmen rocco 24 Aug '05

24 Aug '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23988 Added Files: Tag: devel_0_39 pd_base.tk Removed Files: Tag: devel_0_39 pd.tk Log Message: all your base, belong to tim --- pd.tk DELETED --- --- NEW FILE: pd_base.tk --- #pd tk gui v2 ix foreach _ {snack tkdnd tkpath} { if {[catch {package require $_}]} {set has_$_ 0} {set has_$_ 1} } namespace eval ::pd { source pd_objects.tk proc rc {} {return [format "\#%06x" [expr "int(floor(rand() * 16777216))"]]} proc rgb {} {return [list [expr "int(floor(rand() * 256))"] [expr "int(floor(rand() * 256))"] [expr "int(floor(rand() * 256))"]]} proc lighten {rgb r} {set l {}; foreach c $rgb {lappend l [expr {(256 - $c) * $r + $c}]}; return $l} proc darken {rgb r} {set l {}; foreach c $rgb {lappend l [expr {$c - ($c * $r)}]}; return $l} proc color {rgb} {return [format "\#%02x%02x%02x" [expr int([lindex $rgb 0])] [expr int([lindex $rgb 1])] [expr int([lindex $rgb 2])]]} proc random_txt {n} { set i 0 set text "" while {$i < $n} { set int [expr "int(floor(rand()*62))"] if {$int < 10} {incr int 48} elseif {$int < 36} {incr int 55} else {incr int 61} set text "$text[format %c $int]" incr i} return $text} proc sel {p t a x y} { variable "" switch $a { first { foreach xy {x y} {set ($t:c$xy) [set $xy];set ($t:f$xy) [set $xy]} $p create rect $($t:cx) $($t:cy) $($t:cx) $($t:cy) \ -tags sel -fill "" -outline $($t:sc) -width 12} release {$p delete sel} motion { updatesel $p $t [cleansel $p $t [$p find overlapping $($t:fx) $($t:fy) $x $y]] $p coords sel $($t:fx) $($t:fy) $x $y}}} proc item_new {p t id d} { variable "" variable obj if {$id eq "-"} { if {[dict keys $($t)] eq ""} {set id 0} else { set id -1 while true {if {[lsearch -integer [dict keys $($t)] [incr id]] == -1} {break}} } } set ($t:ci) $id set type [dict get $d type] set x [tr $p $t x i $($t:hx)] set y [tr $p $t y i $($t:hy)] if {[dict exists $obj $type size]} { set sx [dict get $obj $type size x] set sy [dict get $obj $type size y] } {set sx 0; set sy 0} update $p $t $id abs [dict create x $x xx [expr $x + $sx] y $y yy [expr $y + $sy] color {128 128 128} v 1] 0 if {[dict exists $obj $type defaults]} { update $p $t $id abs [dict get $obj $type defaults] 0 } update $p $t $id abs $d 0 item_draw $p $t $id } proc item_draw {p t is} { variable "" variable obj if {$is eq "all"} {set is [dict keys $($t)]} foreach id $is { set type [dict get $($t) $id type] set tags [list item i$id $id] set color [color [dict get $($t:g) $($t:cg) color]] if {[dict exists $obj $type defaults]} { foreach local [dict keys [dict get $obj $type defaults]] { set $local [dict get $obj $type defaults $local]}} eval [dict get $obj $type draw] redraw $p $t $id } } proc item_delete {p t} { variable "" foreach item $($t:sel) { foreach i [$p find withtag i$item] { $p delete $i } dict unset ($t) $item set ($t:sel) {} item_info $p $t "" send "delete $item" } } proc item_pos {p t item r x y xx yy} { update $p $t $item $r [dict create x $x y $y xx $xx yy $yy] 1} proc update {p t item r u redraw} { variable "" foreach a [dict keys $u] { switch $r { abs {dict set ($t) $item $a [dict get $u $a]} rel {dict set ($t) $item $a [expr {[dict get $($t) $item $a] + [dict get $u $a]}]} } send [concat update $item $a [dict get $($t) $item $a]] } if {$redraw == 1} {redraw $p $t $item} } proc update_one {p t item r k v redraw} { update $p $t $item $r [dict create $k $v] $redraw } proc pencil {p t a x y} { variable "" switch $a { motion { item_pos $p $t $($t:ci) abs [tr $p $t x i $x] [tr $p $t y i $y] [tr $p $t x i $($t:fx)] [tr $p $t y i $y] } first {item_new $p $t - [dict create type rect g $($t:cg) x 0 y 0 xx 0 yy 0 v 1]}}} proc resize_canvas {p t a x y} {viewpoint $p $t [dict create action resize x $x y $y]} proc redraw {p t items} { variable "" variable obj switch $items { all {set items [dict keys $($t)]} default {}} foreach id $items { foreach local [dict keys [dict get $($t) $id]] { set $local [dict get $($t) $id $local]} set x [tr $p $t x t $x];set y [tr $p $t y t $y];set xx [tr $p $t x t $xx];set yy [tr $p $t y t $yy] if {[expr $x > $xx]} {lassign "$x $xx" xx x} if {[expr $y > $yy]} {lassign "$y $yy" yy y} set sx [expr $xx - $x]; set sy [expr $yy - $y] if {[lsearch -integer $($t:sel) $id] >= 0} { set color $($t:sc) set selected 1 } else { set color [color [dict get $($t) $id color]] set selected 0} if {[dict exists $($t) $id g]} { set gcolor [color [dict get $($t:g) [dict get $($t) $id g] color]]} set tags [concat item && i$id && $id] set item [$p find withtag $tags] if {[dict exists $obj $type tags]} { foreach tag [dict get $obj $type tags] { set $tag [$p find withtag "$tags && $tag"]}} eval [dict get $obj $type redraw] redraw_io $p $t $id } } proc redraw_io {p d id} { } proc item_v {p t a x y} { variable "" variable obj foreach id $($t:sel) { set type [dict get $($t) $id type] if {[dict exists $obj $type defaults]} { foreach local [dict keys [dict get $obj $type defaults]] { set $local [dict get $obj $type defaults $local]}} if {[dict exists $obj $type control Button-1]} {eval [dict get $obj $type control Button-1]} } } proc move_canvas {p t a x y} {viewpoint $p $t [dict create action move x $x y $y]} proc move_object {p t a x y} { variable "" set mx [tr $p $t x d [expr {$x - $($t:cx)}]] set my [tr $p $t y d [expr {$y - $($t:cy)}]] foreach item $($t:sel) {item_pos $p $t $item rel $mx $my $mx $my} } proc resize_left {p t a x y} {item_resize $p $t x $x $y} proc resize_right {p t a x y} {item_resize $p $t xx $x $y} proc resize_top {p t a x y} {item_resize $p $t y $x $y} proc resize_bottom {p t a x y} {item_resize $p $t yy $x $y} proc resize_tl {p t a x y} {item_resize $p $t x $x $y; item_resize $p $t y $x $y} proc resize_tr {p t a x y} {item_resize $p $t x $x $y; item_resize $p $t yy $x $y} proc resize_bl {p t a x y} {item_resize $p $t xx $x $y; item_resize $p $t y $x $y} proc resize_br {p t a x y} {item_resize $p $t xx $x $y; item_resize $p $t yy $x $y} proc item_resize {p t e x y} { variable "" array set ax {x x xx x y y yy y} set m [tr $p $t $ax($e) d [expr $$ax($e) - $($t:c$ax($e))]] item_mua $p $t rel [dict create $e $m] 1 } proc item_scale {p t a x y} { } proc cleansel {p t sel} { set clean {} foreach item $sel {if {[lindex [$p itemcget $item -tags] 0] eq "item"} {lappend clean [lindex [$p itemcget $item -tags] 2]}} set clean [lsort -integer -unique $clean] return $clean } proc hover {p t x y} { variable "" foreach xy {x y} {set ($t:h$xy) [set $xy]} if {[$p find withtag sel] ne ""} { sel $p $t motion $x $y } else { set clicked [cleansel $p $t [$p find overlapping [expr $x - 2] [expr $y - 2] [expr $x + 2] [expr $y + 2]]] if {$clicked ne ""} { set c [lindex $clicked end] resize_modes $p $t $x $y $c if {[llength $($t:sel)] <= 1} {updatesel $p $t $c} inspect $p $t $c } else { mode $p $t move_canvas } } } proc resize_modes {p t x y id} { variable "" set d 3 set bbox [$p bbox [$p find withtag "i$id && box"]] if {$bbox eq ""} {set bbox {0 0 0 0}} lassign $bbox bx by bxx byy set dx [expr {abs($bx - $x)}] set dxx [expr {abs($bxx - $x)}] set dy [expr {abs($by - $y)}] set dyy [expr {abs($byy - $y)}] if {$dx < $d && $dy < $d} { mode $p $t resize_tl } elseif {$dxx < $d && $dy < $d} { mode $p $t resize_tr } elseif {$dx < $d && $dyy < $d} { mode $p $t resize_bl } elseif {$dxx < $d && $dyy < $d} { mode $p $t resize_br } elseif {$dx < 5} { mode $p $t resize_left } elseif {$dxx < 5} { mode $p $t resize_right } elseif {$dy < 1} { mode $p $t resize_top } elseif {$dyy < 1} { mode $p $t resize_bottom } else { mode $p $t move_object } } proc item_info {p t clicked} { variable "" return set n 0;$p delete hover foreach item $clicked { set info "" set data [dict get $($t) $item] foreach d $data {lappend info [string range $d 0 7]} $p create text [list [expr [winfo width $p] - 8.0] [expr [winfo height $p] - 8.0 - 11 * $n.0]] -fill $($t:sc) -justify right -anchor se -font {{bitstream vera sans mono} 10} -tags hover -text $info incr n } } proc togglesel {p t d} { variable "" if {[lsearch -integer $($t:sel) $d] < 0} { set ($t:sel) [concat $($t:sel) $d] } else { set ($t:sel) [lsearch -inline -not -all -integer $($t:sel) $d] } redraw $p $t $d } proc updatesel {p t ns} { variable "" set os $($t:sel) set ($t:sel) $ns redraw $p $t [lsort -unique -integer [concat $os $ns]] item_info $p $t $ns } proc msg {} { if {![winfo exists .msg]} { toplevel .msg grid [entry .msg.text] bind .msg.text <KeyPress-Return> {::pd::send [.msg.text get]}}} proc inspector {p t} { variable "" if {![winfo exists .i$t]} {toplevel .i$t if {[info exists ($t:inspect)]} {unset ($t:inspect)}}} proc inspect {p t id} { if {![winfo exists .i$t]} {return} variable "" set keys [dict keys [dict get $($t) $id]] if {![info exists ($t:inspect)] || ([info exists ($t:inspect)] && [dict get $($t) $($t:inspect) type] ne [dict get $($t) $id type])} { foreach c [winfo children .ic] {destroy $c} foreach k $keys { text .i$t.$k -wrap none -width 8 -height 1 -bd 0 .i$t.$k insert 1.0 $k .i$t.$k tag add justify 1.0 end .i$t.$k tag configure justify -justify right .i$t.$k configure -state disabled text .i$t.${k}v -wrap none -width 16 -height 1 -bd 0 -bg gray94 bind .i$t.${k}v <Any-KeyRelease> "::pd::item_mua $p $t abs \[dict create $k \[.i$t.${k}v get 1.0 end\] \] 1" grid .i$t.$k .i$t.${k}v -sticky nsew grid rowconfigure .i$t .i$t.${k}v -weight 1 grid columnconfigure .i$t .i$t.${k}v -weight 3 grid columnconfigure .i$t .i$t.$k -weight 1}} set ($t:inspect) $id foreach k $keys { .i$t.${k}v delete 1.0 end .i$t.${k}v insert 1.0 [dict get $($t) $id $k]}} proc click {m button action p t x y X Y} { variable "" set clicked [cleansel $p $t [$p find overlapping $x $y $x $y]] set a $($t:submode) switch $action { first { foreach xy {x y} {set ($t:f$xy) [set $xy]} switch $button { 1 {if {$m eq "control"} { mode $p $t pencil; pencil $p $t $action $x $y } elseif {$m eq "double" || $m eq "shift"} { if {[llength $clicked] > 0} { togglesel $p $t $clicked } else { sel $p $t first $x $y mode $p $t sel } } elseif {[$p find withtag sel] ne ""} { sel $p $t release $x $y } elseif {[llength $($t:sel)] > 1 && [llength $clicked] > 0 && [lsearch $($t:sel) $clicked] == -1} { updatesel $p $t $clicked}} 2 {if {$clicked ne ""} {mode $p $t item_scale} {mode $p $t resize_canvas}} 3 {if {$clicked ne ""} {mode $p $t item_v} {rmenu $p $t $X $Y}}}} motion {eval $a $p $t $action $x $y} release { switch $button { 1 {if {$a eq "draw" || ($a eq "sel" && [expr {abs($($t:fx) - $x)}] >13)} {eval $a $p $t $action $x $y}} 2 {mode $p $t move_canvas} 3 {mode $p $t move_canvas} } } } if {$clicked ne ""} {inspect $p $t [lindex $clicked end]} foreach xy {x y} {set ($t:c$xy) [set $xy]} } proc rmenu {p t x y} { variable "" variable obj destroy $p.rmenu if {[winfo exists $p.rmenu] != 1} { set m [menu $p.rmenu -tearoff yes] $m add cascade -label "edit" -menu [set me [menu $m.edit -tearoff no]] foreach a {copy cut paste selecta} { $me add command -label $a -command "::pd::clip $p $t $a"} $m add cascade -label "group" -menu [set mg [menu $m.group -tearoff no]] $mg add command -label "add" -command "::pd::group_new $p $t -" $mg add cascade -label "sel" -menu [set mgs [menu $mg.selto -tearoff yes]] foreach group [dict keys $($t:g)] {$mgs add command -label [dict get $($t:g) $group name] -command "::pd::group_assign $p $t $group"} $m add cascade -label "object" -menu [set mo [menu $m.object -tearoff no]] foreach type [dict keys $obj] { $mo add command -label $type -command "::pd::item_new $p $t - \{type $type\}"} $m add cascade -label "view" -menu [set mv [menu $m.view -tearoff no]] $mv add command -label "zoom to fit" -command "::pd::viewpoint $p $t {action fit}" $mv add command -label "flip x" -command "::pd::viewpoint $p $t {action mirror_x}" $mv add command -label "flip y" -command "::pd::viewpoint $p $t {action mirror_y}" $mv add command -label "reset" -command "::pd::viewpoint $p $t {action reset}" $m add command -label reload -command {source pd.tk} $m add command -label "console" -command {tkcon show} $m add command -label "inspector" -command "::pd::inspector $p $t" $m add command -label "msg" -command "::pd::msg" } else { # $p.rmenu entryconfigure 0 -label $x } tk_popup $p.rmenu $x $y } proc tr {p t d inv v} { variable "" array set dm {x width y height} switch $inv { t {return [expr {($v - $($t:${d}a)) / ($($t:${d}b) - $($t:${d}a) + 0.0) * [winfo $dm($d) $p]}]} i {return [expr {($($t:${d}b) - $($t:${d}a)) * $v /([winfo $dm($d) $p] + 0.0) + $($t:${d}a)}]} d {return [expr {($($t:${d}b) - $($t:${d}a)) * $v /([winfo $dm($d) $p] + 0.0)}]} id {return [expr {$v / ($($t:${d}b) - $($t:${d}a) + 0.0) * [winfo $dm($d) $p]}]}}} proc viewpoint {p t opts} { variable "" switch [dict get $opts action] { fit { lassign [$p bbox item] xa ya xb yb set ($t:xa) [tr $p $t x i $xa] set ($t:xb) [tr $p $t x i $xb] set ($t:ya) [tr $p $t y i $ya] set ($t:yb) [tr $p $t y i $yb] } mirror_x { lassign "$($t:xb) $($t:xa)" ($t:xa) ($t:xb) } mirror_y { lassign "$($t:yb) $($t:ya)" ($t:ya) ($t:yb) } reset { set ($t:ya) $($t:yao);set ($t:yb) $($t:ybo);set ($t:xa) $($t:xao);set ($t:xb) $($t:xbo) } move { foreach xy {x y} { set mvt [tr $p $t $xy d [expr {[dict get $opts $xy] - $($t:c$xy)}]] foreach ab {a b} {set ($t:${xy}$ab) [expr {$($t:${xy}$ab) - $mvt}]}} } zoom { array set dir {in 0.5 out 1.5} foreach xy [dict get $opts axe] { set radius [expr {($($t:${xy}b) - $($t:${xy}a)) / 2. * $dir([dict get $opts dir])}] set center [tr $p $t $xy i [dict get $opts $xy]] set ($t:${xy}a) [expr {$center - $radius}] set ($t:${xy}b) [expr {$center + $radius}] } } resize { foreach xy {x y} { set mvt [tr $p $t $xy d [expr {[dict get $opts $xy] - $($t:c$xy)}]] set ($t:${xy}a) [expr {$($t:${xy}a) - $mvt}] set ($t:${xy}b) [expr {$($t:${xy}b) + $mvt}]} } scroll { set xy [dict get $opts axis] set mv [expr {($($t:${xy}b) - $($t:${xy}a)) / 4.0}] foreach ab {a b} {set ($t:${xy}$ab) [expr {[dict get $opts units] > 0 ? $($t:${xy}$ab) + $mv : $($t:${xy}$ab) - $mv }]} } } redraw $p $t all gridlines $p $t } proc clip {p t action} { variable "" switch $action { selecta { updatesel $p $t [dict keys $($t)] } cut { set ($t:c) [dict create] set i 0 foreach item $($t:sel) { dict set ($t:c) $i [dict get $($t) $item] incr i } item_delete $p $t } copy { set ($t:c) [dict create] set i 0 foreach item $($t:sel) { dict set ($t:c) $i [dict get $($t) $item] incr i } } paste { set pasted {} foreach item [dict keys $($t:c)] { item_new $p $t - [dict get $($t:c) $item] } } } } proc mode {p t m} { variable "" array set cursor {pencil pencil move_canvas fleur move_object dotbox item_v box_spiral resize_canvas bogosity sel cross_reverse item_scale sizing resize_left left_side resize_right right_side resize_top top_side resize_bottom bottom_side resize_tl top_left_corner resize_tr top_right_corner resize_bl bottom_left_corner resize_br bottom_right_corner} set ($t:submode) $m $p configure -cursor $cursor($m) } proc group_new {p t grp} { variable "" set exists 0 dict for {key val} $($t:g) {if {[dict get $val name] eq $grp} {set exists 1}} if {$exists == 0} { if {$grp eq "-"} {set grp [random_txt [expr "int(floor(rand() * 10 + 2))"]]} set n -1 while true { if {[lsearch -integer [dict keys $($t:g)] [incr n]] == -1} {break}} dict set ($t:g) $n name $grp dict set ($t:g) $n color [rgb] set ($t:cg) $n } } proc group_assign {p t group} { variable "" item_mua $p $t abs [dict create g $group] 1 } proc item_mua {p t r u redraw} { variable "" foreach item $($t:sel) {update $p $t $item $r $u $redraw} } proc mode_flip {p t} { variable "" if {$($t:mode) eq "edit"} { array set m {bg white ln gray86 mode forward} } else { array set m {bg gray86 ln white mode edit} } set ($t:mode) $m(mode) $p configure -bg $m(bg) set ($t:ln) $m(ln) gridlines $p $t } proc key {p t k b} { # puts $k switch $b { 1 { switch $k { 9 {mode_flip $p $t} 22 {item_delete $p $t} 38 {clip $p $t selecta} 53 {clip $p $t cut} 54 {clip $p $t copy} 55 {clip $p $t paste} 97 {viewpoint $p $t {action reset}} 98 {viewpoint $p $t {action scroll units -1 axis y}} 100 {viewpoint $p $t {action scroll units -1 axis x}} 102 {viewpoint $p $t {action scroll units 1 axis x}} 104 {viewpoint $p $t {action scroll units 1 axis y}} 107 {item_delete $p $t} } } } } proc drop {p t dropped x y} { foreach d [split $dropped "\n"] { set x [tr $p $t x i $x] set y [tr $p $t y i $y] item_new $p $t - [dict create type sound g 1 v 1 x $x y $y xx $x yy $y filename [regsub -- {^file:[/]+} $d "/"]] } } proc new {p t opts} { variable "" variable obj foreach xy {x y} {foreach ab {a b} {set ($t:${xy}${ab}o) [dict get $opts ${xy}${ab}]}} foreach a {sc ln mode xa xb ya yb qx qy mx my samplerate} {set ($t:$a) [dict get $opts $a]} if {[winfo exists $p] != 1} { canvas $p -bg [dict get $opts bg] place $p -relwidth 1 -relheight 1 bind $p <Configure> "::pd::gridlines $p $t; ::pd::redraw $p $t all" bind $p <Enter> "focus $p" bind $p <Key> "::pd::key $p $t %k 1" bind $p <KeyRelease> "::pd::key $p $t %k 0" if {$::has_tkdnd == 1} { dnd bindtarget $p text/plain <Drop> "::pd::drop $p $t %D %x %y" } else { dict unset obj sound } bind $p <Motion> "::pd::hover $p $t %x %y" bind $p <4> "::pd::viewpoint $p $t {action scroll units 1 axis x}" bind $p <5> "::pd::viewpoint $p $t {action scroll units -1 axis x}" bind $p <Control-4> "::pd::viewpoint $p $t {action zoom dir in axe x x %x y %y}" bind $p <Control-5> "::pd::viewpoint $p $t {action zoom dir out axe x x %x y %y}" bind $p <Alt-4> "::pd::viewpoint $p $t {action zoom dir in axe {x y} x %x y %y}" bind $p <Alt-5> "::pd::viewpoint $p $t {action zoom dir out axe {x y} x %x y %y}" bind $p <Control-Shift-4> "::pd::viewpoint $p $t {action zoom dir in axe y x %x y %y}" bind $p <Control-Shift-5> "::pd::viewpoint $p $t {action zoom dir out axe y x %x y %y}" bind $p <Shift-4> "::pd::viewpoint $p $t {action scroll units -1 axis y}" bind $p <Shift-5> "::pd::viewpoint $p $t {action scroll units 1 axis y}" foreach m {"Control-" "" "Shift-" "Double-"} { foreach bn {1 2 3} { set b [list [concat $bn first] [concat B${bn}-Motion motion] [concat ButtonRelease-$bn release]] foreach ba {0 1 2} { bind $p <$m[lindex [lindex $b $ba] 0]> "::pd::click [list [string tolower [string trimright $m -1]]] $bn [lindex [lindex $b $ba] 1] $p $t %x %y %X %Y"}}} set bd [expr {[$p cget -bd] * 2}] $p configure -bg gray -width [expr {[winfo width $p] + $bd}] -height [expr {[winfo height $p] + $bd}] if {[info exists ($t)] != 1} { set ($t) {} set ($t:g) {} set i -1; set sel {} foreach a {i sel} {set ($t:$a) [set $a]} group_new $p $t default } } gridlines $p $t item_draw $p $t all } proc gridlines {p t} { variable "" foreach item [$p find withtag gridline] {$p delete $item} foreach xy {x y} { array set ta {x n y w} array set tj {x center y left} array set igx {y width x height} set range [expr {abs($($t:${xy}b) - $($t:${xy}a))}] set nSlices [expr {$range / $($t:q$xy)}] if {$nSlices > $($t:m${xy})} {set factor [expr {int($nSlices / ($($t:m${xy}) + 0.0) + 1)}]} else { set factor [expr {1. / (int(1./($nSlices / ($($t:m${xy}) + 0.0) + 0.0)) + 0.0)}] } set increment [expr {$($t:q${xy}) * $factor}] for {set x [expr {int($($t:${xy}a) / ($increment + 0.0) + 1)*($increment + 0.0)}]} {[expr {$($t:${xy}a) > $($t:${xy}b) ? $x >= $($t:${xy}b) : $x <= $($t:${xy}b)}]} {set x [expr {$($t:${xy}a) > $($t:${xy}b) ? $x - $increment : $x + $increment}]} { set og [tr $p $t $xy t $x] set invgeo [winfo $igx($xy) $p] switch $xy { y {set coords [concat 0 $og $invgeo $og]} x {set coords [concat $og 0 $og $invgeo]}} $p lower [$p create text [lrange $coords 0 1] -font {{Bitstream Vera Sans} 8} -fill [rc] -anchor $ta($xy) -text [string range $x 0 7] -justify $tj($xy) -tags gridline] $p lower [$p create line $coords -fill $($t:ln) -stipple gray50 -tags gridline] }}} . configure -width 800 -height 800 new .c c {bg gray86 ln white mode edit sc orange samplerate 44100 xa 0 xb 100 ya 0 yb 100 qx 10 qy 10 mx 15 my 15} variable pd_send if {[catch {set pd_send [socket localhost 4400]}]} {set pd_send -1} {puts "connected $pd_send"} catch { set pd_receive [socket -server ::pd::receive_conn 4401] } proc receive_conn {s addr port} { fileevent $s readable [list ::pd::receive $s] fconfigure $s -buffering line -blocking 0 puts "connection from $addr" } proc receive {s} { set l [gets $s] if {[eof $s]} { close $s } else { if {[catch {eval $l}]} {puts "error in: $l"} } } proc send {msg} { variable pd_send if {$pd_send ne -1} { # puts "sending: $msg" puts $pd_send [concat $msg \;] flush $pd_send } } } catch { source /usr/local/bin/tkcon.tcl tk_setPalette white }

1 0

pd/src SConscript,1.1.4.19,1.1.4.20
by Tim Blechmann 23 Aug '05

23 Aug '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26899 Modified Files: Tag: devel_0_39 SConscript Log Message: reverting binary location to ./bin fixing -sse2 switch Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.4.19 retrieving revision 1.1.4.20 diff -C2 -d -r1.1.4.19 -r1.1.4.20 *** SConscript 23 Aug 2005 02:21:17 -0000 1.1.4.19 --- SConscript 23 Aug 2005 21:28:35 -0000 1.1.4.20 *************** *** 417,421 **** if not pdenv['noDAZ']: pdenv.Append(CPPDEFINES='DAZ') ! flags += "-msse2" if conf.TryCompile("""#include \"stdlib.h\" --- 417,421 ---- if not pdenv['noDAZ']: pdenv.Append(CPPDEFINES='DAZ') ! flags += " -msse2" if conf.TryCompile("""#include \"stdlib.h\" *************** *** 439,457 **** # binaries ! pdwatchdog = pdenv.Program('../obj/pd-watchdog', "s_watchdog.c") ! pdsend = pdenv.Program('../obj/pdsend', "u_pdsend.c") ! pdreceive = pdenv.Program('../obj/pdreceive', "u_pdreceive.c") ! pdtk = pdenv.InstallAs('../obj/pd.tk', 'u_main.tk') ###################################################################### # build pd's gui if pdenv['PLATFORM']=='posix': ! pdgui = pdenv.Program('../obj/pd-gui', Split("t_main.c t_tkcmd.c")) if pdenv['PLATFORM']=='darwin': ! pdgui = pdenv.SharedLibrary('../obj/pdtcl', Split("t_main.c t_tkcmd.c"), LINKFLAGS='-framework Tcl -framework Tk') if pdenv['PLATFORM']=='win32': ! pdgui = pdenv.SharedLibrary('../obj/pdtcl', Split("t_main.c t_tkcmd.c")) --- 439,457 ---- # binaries ! pdwatchdog = pdenv.Program('../bin/pd-watchdog', "s_watchdog.c") ! pdsend = pdenv.Program('../bin/pdsend', "u_pdsend.c") ! pdreceive = pdenv.Program('../bin/pdreceive', "u_pdreceive.c") ! pdtk = pdenv.InstallAs('../bin/pd.tk', 'u_main.tk') ###################################################################### # build pd's gui if pdenv['PLATFORM']=='posix': ! pdgui = pdenv.Program('../bin/pd-gui', Split("t_main.c t_tkcmd.c")) if pdenv['PLATFORM']=='darwin': ! pdgui = pdenv.SharedLibrary('../bin/pdtcl', Split("t_main.c t_tkcmd.c"), LINKFLAGS='-framework Tcl -framework Tk') if pdenv['PLATFORM']=='win32': ! pdgui = pdenv.SharedLibrary('../bin/pdtcl', Split("t_main.c t_tkcmd.c")) *************** *** 460,469 **** if pdenv['pdlib']: ! pdlib = pdenv.SharedLibrary('../obj/pd', sources) pdenv.Append(LIBPATH=['.']) ! pd = pdenv.Program('../obj/pd', 's_entry.c', LIBS=['pd']) Default(pdsend, pdreceive, pdgui, pd, pdlib, pdtk) else: ! pd = pdenv.Program('../obj/pd', ['s_entry.c'] + sources) pdlib = None Default(pdsend, pdreceive, pdgui, pd, pdtk) --- 460,469 ---- if pdenv['pdlib']: ! pdlib = pdenv.SharedLibrary('../bin/pd', sources) pdenv.Append(LIBPATH=['.']) ! pd = pdenv.Program('../bin/pd', 's_entry.c', LIBS=['pd']) Default(pdsend, pdreceive, pdgui, pd, pdlib, pdtk) else: ! pd = pdenv.Program('../bin/pd', ['s_entry.c'] + sources) pdlib = None Default(pdsend, pdreceive, pdgui, pd, pdtk)

1 0

externals/zexy/src list2symbol.c,1.3,1.4
by IOhannes m zmölnig 23 Aug '05

23 Aug '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15394 Modified Files: list2symbol.c Log Message: do not use atom_getstring() for symbols, rather take the s_name this reduces the amount of quoting significantly Index: list2symbol.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/list2symbol.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** list2symbol.c 13 Jul 2005 08:26:44 -0000 1.3 --- list2symbol.c 23 Aug 2005 12:25:37 -0000 1.4 *************** *** 59,64 **** while(i--){ char buffer[MAXPDSTRING]; ! atom_string(argv++, buffer, MAXPDSTRING); ! length+=strlen(buffer); } --- 59,68 ---- while(i--){ char buffer[MAXPDSTRING]; ! if(A_SYMBOL==argv->a_type){ ! length+=strlen(argv->a_w.w_symbol->s_name); ! } else { ! atom_string(argv++, buffer, MAXPDSTRING); ! length+=strlen(buffer); ! } } *************** *** 83,90 **** argv=x->ap; while(i--){ ! char buffer[MAXPDSTRING]; ! atom_string(argv++, buffer, MAXPDSTRING); ! strcpy(result+len, buffer); ! len += strlen(buffer); if(i && connector){ strcpy(result+len, connector); --- 87,100 ---- argv=x->ap; while(i--){ ! if(A_SYMBOL==argv->a_type){ ! strcpy(result+len, argv->a_w.w_symbol->s_name); ! len+= strlen(argv->a_w.w_symbol->s_name); ! } else { ! char buffer[MAXPDSTRING]; ! atom_string(argv, buffer, MAXPDSTRING); ! strcpy(result+len, buffer); ! len += strlen(buffer); ! } ! argv++; if(i && connector){ strcpy(result+len, connector);

1 0

externals/bbogart/entry entry.c,1.3,1.4
by IOhannes m zmölnig 23 Aug '05

23 Aug '05

Update of /cvsroot/pure-data/externals/bbogart/entry In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15200 Modified Files: entry.c Log Message: escape "," and ";" before sending it to pd (so they won't be expanded to separate lists) Index: entry.c =================================================================== RCS file: /cvsroot/pure-data/externals/bbogart/entry/entry.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** entry.c 7 Nov 2004 17:53:35 -0000 1.3 --- entry.c 23 Aug 2005 12:24:16 -0000 1.4 *************** *** 321,325 **** static void entry_bang_output(t_entry* x) { ! sys_vgui("pd [concat entry%p output [.x%x.c.s%x get 0.0 end] \\;]\n", x, x->x_glist, x); sys_vgui("bind .x%x.c.s%x <Leave> {focus [winfo parent .x%x.c.s%x]} \n", x->x_glist, x, x->x_glist, x); } --- 321,326 ---- static void entry_bang_output(t_entry* x) { ! sys_vgui("pd [concat entry%p output [string map {\",\" \"\\\\,\" \";\" \"\\\\;} [.x%x.c.s%x get 0.0 end]]\" \\;]\n", x, x->x_glist, x); ! sys_vgui("bind .x%x.c.s%x <Leave> {focus [winfo parent .x%x.c.s%x]} \n", x->x_glist, x, x->x_glist, x); }

1 0

externals/bbogart/entry makefile,1.1,1.2
by IOhannes m zmölnig 23 Aug '05

23 Aug '05

Update of /cvsroot/pure-data/externals/bbogart/entry In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15094 Modified Files: makefile Log Message: added ../../../pd/src to the includes (so you can compile out of the CVS-tree) Index: makefile =================================================================== RCS file: /cvsroot/pure-data/externals/bbogart/entry/makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile 20 Mar 2004 23:52:47 -0000 1.1 --- makefile 23 Aug 2005 12:23:32 -0000 1.2 *************** *** 56,60 **** -Wno-unused -Wno-parentheses -Wno-switch ! LINUXINCLUDE = -I../../src .c.pd_linux: --- 56,60 ---- -Wno-unused -Wno-parentheses -Wno-switch ! LINUXINCLUDE = -I../../src -I../../../pd/src .c.pd_linux:

1 0

pd/src desire.tk,1.1.2.11,1.1.2.12
by chunlee 23 Aug '05

23 Aug '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15284 Modified Files: Tag: devel_0_39 desire.tk Log Message: resize obj will update wires Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -C2 -d -r1.1.2.11 -r1.1.2.12 *** desire.tk 23 Aug 2005 03:49:29 -0000 1.1.2.11 --- desire.tk 23 Aug 2005 09:54:08 -0000 1.1.2.12 *************** *** 992,995 **** --- 992,1051 ---- [expr ($_($self:name_len)*$font(width)) + $font(padx)] \ [expr $font(height) + $font(pady)] 1 3 + + #wire_update $wire_id $_($wire_id) + #wire_draw2 $wire_id $canvas + + + for {set x 0} {$x<$_($self:inlets)} {incr x} { + + #if {[info exists]} + puts "check -> $self" + if {[info exists _($self:0:$x)]} { + + puts "wires at inlet $x to select --> $_($self:0:$x)" + #wire_update $_() + #wire_update:: l80f8ea8 81168ae 1 81168af 0 0 + + + + foreach wire_id $_($self:0:$x) { + + wire_update $wire_id $_($wire_id) + wire_draw2 $wire_id $canvas + + + #set i [lsearch $_($self:selection_wire) $wire_id] + #if {$i<0} {lappend _($self:selection_wire) $wire_id} + + } + + + } + + } + + + for {set x 0} {$x<$_($self:outlets)} {incr x} { + + if {[info exists _($self:1:$x)]} { + + puts "wires at outlet $x to update --> $_($self:1:$x)" + + foreach wire_id $_($self:1:$x) { + + wire_update $wire_id $_($wire_id) + wire_draw2 $wire_id $canvas + + + #set i [lsearch $_($self:selection_wire) $wire_id] + #if {$i<0} {lappend _($self:selection_wire) $wire_id} + + + } + + } + + } + #pdtk_text_new \ *************** *** 1002,1005 **** --- 1058,1063 ---- #puts "destroy check = [winfo exists ${canvas}.${self}text]" + + } #-----------------------------------------------------------------------------------#

1 0

pd/src g_canvas.h,1.3.4.3.2.4,1.3.4.3.2.5
by Tim Blechmann 23 Aug '05

23 Aug '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13911 Modified Files: Tag: devel_0_39 g_canvas.h Log Message: c++ fix for template keyword Index: g_canvas.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.h,v retrieving revision 1.3.4.3.2.4 retrieving revision 1.3.4.3.2.5 diff -C2 -d -r1.3.4.3.2.4 -r1.3.4.3.2.5 *** g_canvas.h 21 Aug 2005 11:28:24 -0000 1.3.4.3.2.4 --- g_canvas.h 23 Aug 2005 09:44:55 -0000 1.3.4.3.2.5 *************** *** 603,607 **** EXTERN t_template *template_findbyname(t_symbol *s); EXTERN t_canvas *template_findcanvas(t_template *tmpl); ! EXTERN void template_notify(t_template *template, t_symbol *s, int argc, t_atom *argv); --- 603,607 ---- EXTERN t_template *template_findbyname(t_symbol *s); EXTERN t_canvas *template_findcanvas(t_template *tmpl); ! EXTERN void template_notify(t_template *, t_symbol *s, int argc, t_atom *argv); *************** *** 614,620 **** EXTERN void template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp, t_symbol *s, int loud); ! EXTERN t_float fielddesc_getcoord(t_fielddesc *f, t_template *template, t_word *wp, int loud); ! EXTERN void fielddesc_setcoord(t_fielddesc *f, t_template *template, t_word *wp, float pix, int loud); EXTERN t_float fielddesc_cvttocoord(t_fielddesc *f, float val); --- 614,620 ---- EXTERN void template_setsymbol(t_template *x, t_symbol *fieldname, t_word *wp, t_symbol *s, int loud); ! EXTERN t_float fielddesc_getcoord(t_fielddesc *f, t_template *, t_word *wp, int loud); ! EXTERN void fielddesc_setcoord(t_fielddesc *f, t_template *, t_word *wp, float pix, int loud); EXTERN t_float fielddesc_cvttocoord(t_fielddesc *f, float val);

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs August 2005