Pd-cvs September 2005

pd-cvs@lists.iem.at

10 participants
189 discussions

pd/src g_canvas.h,1.3.4.3.2.5,1.3.4.3.2.6
by Mathieu Bouchard 08 Sep '05

08 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11801 Modified Files: Tag: devel_0_39 g_canvas.h Log Message: protect g_canvas.h against multiple inclusion. Index: g_canvas.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.h,v retrieving revision 1.3.4.3.2.5 retrieving revision 1.3.4.3.2.6 diff -C2 -d -r1.3.4.3.2.5 -r1.3.4.3.2.6 *** g_canvas.h 23 Aug 2005 09:44:55 -0000 1.3.4.3.2.5 --- g_canvas.h 8 Sep 2005 07:45:07 -0000 1.3.4.3.2.6 *************** *** 38,41 **** --- 38,42 ---- #ifndef __G_CANVAS_H + #define __G_CANVAS_H #if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) *************** *** 634,640 **** #endif - #else - #define __G_CANVAS_H - #endif --- 635,638 ----

1 0

pd/src SConscript,1.1.4.20,1.1.4.21
by Mathieu Bouchard 08 Sep '05

08 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11321 Modified Files: Tag: devel_0_39 SConscript Log Message: added scons option desire. you would run "scons desire=yes" to witness the wreck, but desire.c is still not there, sorry. Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.4.20 retrieving revision 1.1.4.21 diff -C2 -d -r1.1.4.20 -r1.1.4.21 *** SConscript 23 Aug 2005 21:28:35 -0000 1.1.4.20 --- SConscript 8 Sep 2005 07:42:30 -0000 1.1.4.21 *************** *** 19,24 **** BoolOption('pdlib', 'Build with pdlib', False), ('optimize', 'Optimize for specific architecture', None), ! ('prefix', 'install prefix', '/usr/local') ! ) opt.Update(pdenv) --- 19,24 ---- BoolOption('pdlib', 'Build with pdlib', False), ('optimize', 'Optimize for specific architecture', None), ! ('prefix', 'install prefix', '/usr/local'), ! BoolOption('desire', 'Build with desire', False)) opt.Update(pdenv) *************** *** 49,72 **** g_all_guis.c g_array.c - g_bang.c g_canvas.c g_editor.c g_graph.c g_guiconnect.c - g_hdial.c - g_hslider.c g_io.c - g_mycanvas.c - g_numbox.c g_readwrite.c g_rtext.c g_scalar.c g_template.c - g_text.c - g_toggle.c g_traversal.c - g_vdial.c - g_vslider.c - g_vumeter.c m_atom.c m_binbuf.c --- 49,62 ---- *************** *** 98,102 **** x_net.c x_qlist.c ! x_time.c""") defs = [] --- 88,106 ---- x_net.c x_qlist.c ! x_time.c ! """) ! ! if pdenv['desire']: ! sources += Split(""" ! desire.c ! """) ! else: ! sources += Split(""" ! g_bang.c g_hdial.c g_hslider.c g_mycanvas.c ! g_numbox.c g_vdial.c g_vslider.c g_vumeter.c ! g_text.c g_toggle.c ! """) ! ! defs = []

1 0

[PD-cvs] pd/src pd_base.tk, 1.1.2.1, 1.1.2.2 pd_objects.tk, 1.1.2.6, 1.1.2.7
by carmen rocco 07 Sep '05

07 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4595 Modified Files: Tag: devel_0_39 pd_base.tk pd_objects.tk Log Message: adding 'destroy' and initial cable support Index: pd_objects.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/pd_objects.tk,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** pd_objects.tk 18 Aug 2005 22:20:18 -0000 1.1.2.6 --- pd_objects.tk 6 Sep 2005 22:58:52 -0000 1.1.2.7 *************** *** 7,12 **** } defaults { ! ins 0 ! outs 0 zero_x 0 zero_y 1 --- 7,12 ---- } defaults { ! ins 1 ! outs 3 zero_x 0 zero_y 1 *************** *** 15,19 **** img "" } ! draw { $p create rect 0 0 0 0 -tags [concat $tags box] if {$img ne ""} { --- 15,19 ---- img "" } ! init { $p create rect 0 0 0 0 -tags [concat $tags box] if {$img ne ""} { *************** *** 37,41 **** } ! subwin { tags { box subwin --- 37,41 ---- } ! subwin { tags { box subwin *************** *** 45,49 **** outs 0 } ! draw { $p create rect 0 0 0 0 -tags [concat $tags box] new $p.$id ${t}$id {bg gray86 ln white sc orange samplerate 44100 xa 0 xb 100 ya 0 yb 100 qx 10 qy 10 mx 15 my 15} --- 45,49 ---- outs 0 } ! init { $p create rect 0 0 0 0 -tags [concat $tags box] new $p.$id ${t}$id {bg gray86 ln white sc orange samplerate 44100 xa 0 xb 100 ya 0 yb 100 qx 10 qy 10 mx 15 my 15} *************** *** 64,77 **** ! xy { tags { box loc } ! size {x 10 y 10} ! defaults { ins 0 outs 0 } ! draw { $p create rect 0 0 0 0 -tags [concat $tags box] -fill gray90 $p create rect 0 0 0 0 -tags [concat $tags loc] -fill red --- 64,77 ---- ! xy { tags { box loc } ! defaults { ! x 10 y 10 ins 0 outs 0 } ! init { $p create rect 0 0 0 0 -tags [concat $tags box] -fill gray90 $p create rect 0 0 0 0 -tags [concat $tags loc] -fill red *************** *** 84,97 **** } ! label_cable { ! size {x 10 y 10} ! draw { $p create line 0 0 0 0 -tags $tags -fill green -arrow last -width 8 } redraw { $p coords $item $x $y $xx $yy } control { ! puts "mouseie" } } --- 84,125 ---- } ! cable { ! defaults { ! x 10 y 10 ! from "" ! to "" ! } ! init { $p create line 0 0 0 0 -tags $tags -fill green -arrow last -width 8 } + destroy { + puts byebye_cable + } redraw { + if {$from ne "" && [llength $from] == 2 } { + set loc [ioloc $p $t [lindex $from 0] [lindex $from 1] out] + set $x [lindex $loc 0]; set y [lindex $loc 1] + } + if {$to ne "" && [llength $to] == 2 } { + set loc [ioloc $p $t [lindex $to 0] [lindex $to 1] in] + set $xx [lindex $loc 0]; set yy [lindex $loc 1] + } $p coords $item $x $y $xx $yy } control { ! ! } ! proc { ! proc ioloc {p t id n side} { ! variable "" ! array set ax {x x xx x y y yy y} ! foreach c {x y xx yy} { ! set $c [tr $p $t $ax($c) t [dict get $($t) $id $c]]} ! # puts "obj $x $y $xx $yy" ! array set nio "out [dict get $($t) $id outs] in [dict get $($t) $id ins]" ! set pos [expr $n / $nio($side).0 * ($xx - $x + 0.0) + $x] ! # puts "io $pos $y" ! return [list $pos $y] ! } } } *************** *** 101,113 **** box txt } - size { - x 6.4 y 1.2 - } defaults { ins 1 outs 1 msg msg } ! draw { $p create polygon 0 0 0 0 -tags [concat $tags box] $p create text 0 0 -tags [concat $tags txt] -fill white -anchor nw -justify left --- 129,139 ---- box txt } defaults { + x 6.4 y 1.2 ins 1 outs 1 msg msg } ! init { $p create polygon 0 0 0 0 -tags [concat $tags box] $p create text 0 0 -tags [concat $tags txt] -fill white -anchor nw -justify left *************** *** 127,132 **** pos box } - size {x 2 y 10} defaults { min 1 v 48 --- 153,158 ---- pos box } defaults { + x 2 y 10 min 1 v 48 *************** *** 135,139 **** outs 0 } ! draw { $p create rect 0 0 0 0 -tags [concat $tags box] -fill $color $p create rect 0 0 0 0 -tags [concat $tags pos] -fill green -width 0 --- 161,165 ---- outs 0 } ! init { $p create rect 0 0 0 0 -tags [concat $tags box] -fill $color $p create rect 0 0 0 0 -tags [concat $tags pos] -fill green -width 0 *************** *** 170,174 **** outs 0 } ! draw { snack:::sound s$id set filename [dict get $($t) $id filename] --- 196,200 ---- outs 0 } ! init { snack:::sound s$id set filename [dict get $($t) $id filename] Index: pd_base.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/pd_base.tk,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pd_base.tk 23 Aug 2005 23:04:59 -0000 1.1.2.1 --- pd_base.tk 6 Sep 2005 22:58:52 -0000 1.1.2.2 *************** *** 1,3 **** ! #pd tk gui v2 ix foreach _ {snack tkdnd tkpath} { --- 1,9 ---- ! # Pure-Deleuzian ! # 2005 cdr ! # This software has no license (write one if you feel like it) ! ! # see also: desire.tk. this is an experimental PD GUI focusing on customizable 2d-object visualizations and editing ! # docs: http://whats-your.name/pd ! foreach _ {snack tkdnd tkpath} { *************** *** 7,10 **** --- 13,23 ---- namespace eval ::pd { source pd_objects.tk + + # load object procs + foreach type [dict keys $obj] { + if {[dict exists $obj $type proc]} { + eval [dict get $obj $type proc]}} + + # omg the colours!! 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))"]]} *************** *** 12,15 **** --- 25,30 ---- 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])]]} + + # if you can shorten this you kick ass proc random_txt {n} { set i 0 *************** *** 36,63 **** 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 } --- 51,79 ---- proc item_new {p t id d} { variable "" + #object definition dictionary (in pd_objects.tk or ~/.pd/*.tk) variable obj + + #generate an ID if one wasn't provided 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] ! #figure out size/position ! set x [tr $p $t x i $($t:hx)]; set y [tr $p $t y i $($t:hy)] ! set sx 0; set sy 0 ! if {[dict exists $obj $type defaults x]} {set sx [dict get $obj $type defaults x]} ! if {[dict exists $obj $type defaults y]} {set sy [dict get $obj $type defaults y]} ! # 1 global defaults 2 object defaults 3 instance defaults ! set defaults [dict create x $x xx [expr $x + $sx] y $y yy [expr $y + $sy] color {128 128 128}] ! if {[dict exists $obj $type defaults]} {set defaults [dict merge $defaults [dict get $obj $type defaults]]} ! if {$d ne ""} {set defaults [dict merge $defaults $d]} ! update $p $t $id abs $defaults 0 ! ! #draw the item item_draw $p $t $id } *************** *** 74,88 **** 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) {} --- 90,109 ---- foreach local [dict keys [dict get $obj $type defaults]] { set $local [dict get $obj $type defaults $local]}} ! eval [dict get $obj $type init] redraw $p $t $id } } ! proc item_delete {p t {items ""}} { variable "" ! variable obj ! if {$items eq ""} {set items $($t:sel)} ! foreach item $items { foreach i [$p find withtag i$item] { $p delete $i } + set type [dict get $($t) $item type] + if {[dict exists $obj $type destroy]} { + eval [dict get $obj $type destroy]} dict unset ($t) $item set ($t:sel) {} *************** *** 150,161 **** 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 "" --- 171,178 ---- set $tag [$p find withtag "$tags && $tag"]}} eval [dict get $obj $type redraw] ! # redraw_io $p $t $id } } proc item_v {p t a x y} { variable "" *************** *** 257,261 **** proc item_info {p t clicked} { variable "" ! return set n 0;$p delete hover foreach item $clicked { --- 274,278 ---- proc item_info {p t clicked} { variable "" ! # return set n 0;$p delete hover foreach item $clicked { *************** *** 301,307 **** 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 --- 318,324 ---- variable "" set keys [dict keys [dict get $($t) $id]] ! if {![info exists ($t:inspect)] || ($($t:inspect:type) ne [dict get $($t) $id type])} { foreach c [winfo children .ic] {destroy $c} ! foreach k [concat id $keys] { text .i$t.$k -wrap none -width 8 -height 1 -bd 0 .i$t.$k insert 1.0 $k *************** *** 314,319 **** 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 --- 331,340 ---- 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:type) [dict get $($t) $id type] ! } set ($t:inspect) $id + .i$t.idv delete 1.0 end + .i$t.idv insert 1.0 $id foreach k $keys { .i$t.${k}v delete 1.0 end *************** *** 385,389 **** $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" --- 406,410 ---- $mv add command -label "reset" -command "::pd::viewpoint $p $t {action reset}" ! $m add command -label reload -command {source pd_base.tk} $m add command -label "console" -command {tkcon show} $m add command -label "inspector" -command "::pd::inspector $p $t" *************** *** 459,463 **** selecta { updatesel $p $t [dict keys $($t)] ! } cut { set ($t:c) [dict create] --- 480,484 ---- selecta { updatesel $p $t [dict keys $($t)] ! } cut { set ($t:c) [dict create] *************** *** 564,567 **** --- 585,589 ---- variable "" variable obj + set opts [dict merge {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} $opts] 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]} *************** *** 573,581 **** 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}" --- 595,598 ---- *************** *** 594,597 **** --- 611,615 ---- 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"}}} + if {$::has_tkdnd == 1} {dnd bindtarget $p text/plain <Drop> "::pd::drop $p $t %D %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}] *************** *** 631,636 **** }}} ! . 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 --- 649,654 ---- }}} ! . configure -width 512 -height 512 ! new .c c {} variable pd_send

1 0

externals/grill/dynext readme.txt,1.9,1.10
by Thomas Grill 06 Sep '05

06 Sep '05

Update of /cvsroot/pure-data/externals/grill/dynext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19645 Modified Files: readme.txt Log Message: some more documentation (proxy objects) last fixes for release fixed send method so that any messages work now Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/dynext/readme.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** readme.txt 3 Sep 2005 14:04:41 -0000 1.9 --- readme.txt 6 Sep 2005 13:22:03 -0000 1.10 *************** *** 8,11 **** --- 8,16 ---- ---------------------------------------------------------------------------- + Attention: dyn~ is bound to the PD version it is compiled for. + This means that you cannot use a version compiled for PD 0.38 with PD 0.39. + + ---------------------------------------------------------------------------- + You will need the flext C++ layer for PD and Max/MSP externals to compile this. see http://grrrr.org/ext *************** *** 18,22 **** ----- ! - deletion of subcanvases and objects therein is crashy --- 23,27 ---- ----- ! - deletion of subcanvases and objects therein may be crashy *************** *** 61,64 **** TODO: -------- - - Hash table for object tags - add mute attribute --- 66,68 ----

1 0

externals/grill/dynext/src main.cpp,1.10,1.11
by Thomas Grill 06 Sep '05

06 Sep '05

Update of /cvsroot/pure-data/externals/grill/dynext/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19645/src Modified Files: main.cpp Log Message: some more documentation (proxy objects) last fixes for release fixed send method so that any messages work now Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/dynext/src/main.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** main.cpp 3 Sep 2005 14:04:41 -0000 1.10 --- main.cpp 6 Sep 2005 13:22:03 -0000 1.11 *************** *** 20,24 **** #endif ! #define DYN_VERSION "0.1.1pre" --- 20,24 ---- #endif ! #define DYN_VERSION "0.1.1" *************** *** 213,217 **** FLEXT_CALLBACK_V(m_send) FLEXT_CALLVAR_B(mg_vis,ms_vis) - // FLEXT_CALLBACK(m_refresh) FLEXT_ATTRVAR_B(stripext) --- 213,216 ---- *************** *** 830,840 **** else if(!canvasmsg && o->AsGlist()) post("%s - send: object \"%s\" is an abstraction, please create proxy",thisName(),GetString(argv[0])); ! else if(IsSymbol(argv[1])) { ! const t_symbol *s = GetSymbol(argv[1]); ! if(s == sym_list) ! pd_forwardmess((t_pd *)o->object,argc-2,(t_atom *)argv+2); ! else ! pd_typedmess((t_pd *)o->object,(t_symbol *)s,argc-2,(t_atom *)argv+2); ! } else // assume it's a list --- 829,835 ---- else if(!canvasmsg && o->AsGlist()) post("%s - send: object \"%s\" is an abstraction, please create proxy",thisName(),GetString(argv[0])); ! else if(IsSymbol(argv[1])) ! // has a tag symbol ! pd_typedmess((t_pd *)o->object,(t_symbol *)GetSymbol(argv[1]),argc-2,(t_atom *)argv+2); else // assume it's a list

1 0

externals/grill/pool pool.help,1.12,1.13
by Thomas Grill 06 Sep '05

06 Sep '05

Update of /cvsroot/pure-data/externals/grill/pool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19293 Modified Files: pool.help Log Message: more fixes for gcc 3.4 cleanups for release updated the help file Index: pool.help =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/pool.help,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 Binary files /tmp/cvs2fztAH and /tmp/cvsmZEMB2 differ

1 0

externals/grill/pool/source main.cpp,1.11,1.12
by Thomas Grill 06 Sep '05

06 Sep '05

Update of /cvsroot/pure-data/externals/grill/pool/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19293/source Modified Files: main.cpp Log Message: more fixes for gcc 3.4 cleanups for release updated the help file Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/source/main.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** main.cpp 9 Jun 2005 14:48:46 -0000 1.11 --- main.cpp 6 Sep 2005 13:20:25 -0000 1.12 *************** *** 12,16 **** #include <string> ! #define POOL_VERSION "0.2.1pre" #define VCNT 64 --- 12,16 ---- #include <string> ! #define POOL_VERSION "0.2.1" #define VCNT 64

1 0

pd/src desire.tk,1.1.2.34,1.1.2.35
by Mathieu Bouchard 06 Sep '05

06 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32260 Modified Files: Tag: devel_0_39 desire.tk Log Message: option -gdb (currently default) starts gdb between desire.tk and pd. option -nogdb turns it off. added gdbbox. Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.34 retrieving revision 1.1.2.35 diff -C2 -d -r1.1.2.34 -r1.1.2.35 *** desire.tk 6 Sep 2005 08:14:54 -0000 1.1.2.34 --- desire.tk 6 Sep 2005 11:37:52 -0000 1.1.2.35 *************** *** 158,171 **** set cmdline(console) 1000 set cmdline(icons) icons for {set i 0} {$i < $argc} {incr i} { global cmdline set o [lindex $argv $i] ! switch -- $o { -console { incr i set cmdline(console) [lindex $argv $i] } ! default {puts "ERROR: command line argument: unknown $o"} } } --- 158,179 ---- set cmdline(console) 1000 set cmdline(icons) icons + set cmdline(gdb) 1 + set files_to_open {} for {set i 0} {$i < $argc} {incr i} { global cmdline set o [lindex $argv $i] ! switch -regexp -- $o { -console { incr i set cmdline(console) [lindex $argv $i] } ! -gdb {set cmdline(gdb) 1} ! -nogdb {set cmdline(gdb) 0} ! -* {puts "ERROR: command line argument: unknown $o"} ! default { ! incr i ! lappend files_to_open [lindex $argv $i] ! } } } *************** *** 276,284 **** proc poll_sock {} { global sock sock_lobby while {1} { set cmd [gets $sock] if {[eof $sock]} { ! tk_messageBox -message "my sock puppet disappeared (ah, the great mysteries of the washingmachine). Well, that's all, folks!" -type ok ! exit 42 } if {[fblocked $sock]} {break} --- 284,295 ---- proc poll_sock {} { global sock sock_lobby + if {[llength $sock]==0} {return} while {1} { set cmd [gets $sock] if {[eof $sock]} { ! #tk_messageBox -message "my sock puppet disappeared (ah, the great mysteries of the washingmachine). Well, that's all, folks!" -type ok ! #exit 42 ! tk_messageBox -message "server gone boom" -type ok ! set sock {} } if {[fblocked $sock]} {break} *************** *** 303,306 **** --- 314,323 ---- fconfigure $sock -blocking 0 -buffering line poll_sock + global files_to_open + foreach f $files_to_open { + set ff [file split $f] + set ffl [llength $ff] + pd "pd open [lindex $ff [expr $ffl-1]] [file join [lrange $ff 0 [expr $ffl-2]]] ;" + } } { puts "WTF, two pd kernels for one gui?" *************** *** 308,313 **** } set server_sock [socket -server accept_pd 13666] ! exec pd -guiport 13666 & ################ utility functions ######################### --- 325,352 ---- } + proc poll_gdb {} { + global gdb + while {1} { + set line [gets $gdb] + if {[eof $gdb]} {tk_messageBox -message "eurggggh." -type ok; exit 69} + if {[fblocked $gdb]} {break} + post "\[gdb\] %s" $line + } + after 250 poll_gdb + } + set server_sock [socket -server accept_pd 13666] ! ! if {$cmdline(gdb)} { ! set gdb [open "| gdb" w+] ! fconfigure $gdb -blocking 0 -buffering line ! puts $gdb "file pd" ! puts $gdb "run -guiport 13666" ! flush $gdb ! after 0 poll_gdb ! } { ! exec pd -guiport 13666 & ! } ! ################ utility functions ######################### *************** *** 571,575 **** proc menu_pop_pd {} { ! puts"menu_pop_pd:::" raise . } --- 610,614 ---- proc menu_pop_pd {} { ! puts "menu_pop_pd:::" raise . } *************** *** 634,638 **** {"Path..." {foo "pd start-path-dialog ;"} ""} {} ! {"Quit" {foo menu_quit} "Ctrl+q"} } --- 673,677 ---- {"Path..." {foo "pd start-path-dialog ;"} ""} {} ! {"Quit" {menu_quit} "Ctrl+q"} } *************** *** 652,655 **** --- 691,697 ---- #set pd_nt 0 + #-----------------------------------------------------------------------------------# + set look(iowidth) 7 + set look(iopos) 1 set look(objectfg) #000000 set look(objectbg) #ffffff *************** *** 687,694 **** set pd_apilist "{ALSA 1}" ! proc pd {arg} { global sock ! puts $sock $arg ! #puts "calling pd for $arg" } #-----------------------------------------------------------------------------------# --- 729,736 ---- set pd_apilist "{ALSA 1}" ! proc pd {args} { global sock ! puts $sock [join $args " "] ! puts "<- [join $args " "]" } #-----------------------------------------------------------------------------------# *************** *** 796,815 **** proc pdtk_canvas_editval {name value} { puts "pdtk_canvas_editval::: $name $value" - global look _ set self [canvastosym $name.c] ! ! ! if {$value} { ! $name.m.edit entryconfigure "Edit mode" -indicatoron true ! catch {$name.bbar.edit configure -image icon_mode_edit} ! $name.c configure -background $look(canvasbgedit) ! set _($self:mode) edit ! } else { ! $name.m.edit entryconfigure "Edit mode" -indicatoron false ! catch {$name.bbar.edit configure -image icon_mode_run} ! $name.c configure -background $look(canvasbgrun) ! set _($self:mode) run ! } } --- 838,848 ---- proc pdtk_canvas_editval {name value} { puts "pdtk_canvas_editval::: $name $value" global look _ set self [canvastosym $name.c] ! $name.m.edit entryconfigure "Edit mode" -indicatoron $value ! set mode [if {$value} {list edit} {list run}] ! catch {$name.bbar.edit configure -image icon_mode_$mode} ! $name.c configure -background $look(canvasbg$mode) ! set _($self:mode) $mode } *************** *** 818,825 **** # invisible (arg is ""). Invisibility means the Window Manager has minimized # us. We don't get a final "unmap" event when we destroy the window. ! #proc pdtk_canvas_map {name} {pd [canvastosym $name] map 1 \;} ! #proc pdtk_canvas_unmap {name} {pd [canvastosym $name] map 0 \;} ! proc pdtk_canvas_map {name} {pd map} ! proc pdtk_canvas_unmap {name} {pd unmap} #-----------------------------------------------------------------------------------# --- 851,856 ---- # invisible (arg is ""). Invisibility means the Window Manager has minimized # us. We don't get a final "unmap" event when we destroy the window. ! proc pdtk_canvas_map {name} {pd [canvastosym $name] map 1 \;} ! proc pdtk_canvas_unmap {name} {pd [canvastosym $name] map 0 \;} #-----------------------------------------------------------------------------------# *************** *** 1199,1206 **** #-----------------------------------------------------------------------------------# - set look(iowidth) 7 - set look(iopos) 1 - - #-----------------------------------------------------------------------------------# def io draw {canvas x1 y1 xs ys ins outs} { puts "io_draw:: $self $canvas $x1 $y1 $xs $ys $ins $outs" --- 1230,1233 ---- *************** *** 1240,1245 **** def io erase {canvas} { puts "io_erase:: $self $canvas" ! $canvas delete ${self}i ! $canvas delete ${self}o } --- 1267,1271 ---- def io erase {canvas} { puts "io_erase:: $self $canvas" ! $canvas delete ${self}i ${self}o } *************** *** 1276,1288 **** global look font set name_len [string length $text] ! if {[expr $@isnew == 1]} { ! brokenbox_draw $self $canvas \ ! [expr ($font(width) * ($name_len+1) + $font(padx))] \ ! [expr $font(height) + $font(pady)] 0 0 } { ! objectbox_draw $self $canvas \ ! [expr ($font(width) * ($name_len+1) + $font(padx))] \ ! [expr $font(height) + $font(pady)] 1 3 } --- 1302,1311 ---- global look font set name_len [string length $text] ! set sx [expr ($font(width) * ($name_len+1) + $font(padx))] ! set sy [expr $font(height) + $font(pady)] if {[expr $@isnew == 1]} { ! brokenbox_draw $self $canvas $sx $sy 0 0 } { ! objectbox_draw $self $canvas $sx $sy 1 3 } *************** *** 1325,1337 **** #puts "name_len: $name_len" #puts "$self:state -> $@state" ! if {[expr $_($self:isnew) == 1]} { ! brokenbox_draw $self $canvas \ ! [expr ($font(width) * ($name_len+1) + $font(padx))] \ ! [expr $font(height) + $font(pady)] 0 0 } { ! objectbox_draw $self $canvas \ ! [expr ($font(width) * ($name_len+1) + $font(padx))] \ ! [expr $font(height) + $font(pady)] 1 3 } } --- 1348,1358 ---- #puts "name_len: $name_len" #puts "$self:state -> $@state" ! ! set sx [expr ($font(width) * ($name_len+1) + $font(padx))] ! set sy [expr $font(height) + $font(pady)] if {[expr $_($self:isnew) == 1]} { ! brokenbox_draw $self $canvas $sx $sy 0 0 } { ! objectbox_draw $self $canvas $sx $sy 1 3 } } *************** *** 3345,3354 **** } ! proc tcl_eval {self l} {post %s "tcl: $l\nreturns: [eval $l]"} ! proc pd_eval {self l} {post %s "pd: $l\n"; pd "$l;\n"} after 0 { listener_new .tcl "Tcl" {tcl_eval} listener_new .pd "Pd" {pd_eval} } --- 3366,3377 ---- } ! proc tcl_eval {self l} {post %s "tcl: $l"; post %s "returns: [eval $l]"} ! proc pd_eval {self l} {post %s "pd: $l"; pd "$l;\n"} ! proc gdb_eval {self l} {post %s "gdb: $l"; global gdb; puts $gdb "$l"} after 0 { listener_new .tcl "Tcl" {tcl_eval} listener_new .pd "Pd" {pd_eval} + if {$cmdline(gdb)} {listener_new .gdb "Gdb" {gdb_eval}} }

1 0

pd/src desire.tk,1.1.2.33,1.1.2.34
by chunlee 06 Sep '05

06 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24691 Modified Files: Tag: devel_0_39 desire.tk Log Message: added edit/run mode support for textobj and bang also can move bang now Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.33 retrieving revision 1.1.2.34 diff -C2 -d -r1.1.2.33 -r1.1.2.34 *** desire.tk 6 Sep 2005 04:48:31 -0000 1.1.2.33 --- desire.tk 6 Sep 2005 08:14:54 -0000 1.1.2.34 *************** *** 437,440 **** --- 437,441 ---- set offset_canvas_file [expr $offset_canvas_file + 1] set _($canvas_id:obj_list) {} + set _($canvas_id:class) canvas puts "new canvas id -> $canvas_id" *************** *** 798,801 **** --- 799,804 ---- global look _ set self [canvastosym $name.c] + + if {$value} { $name.m.edit entryconfigure "Edit mode" -indicatoron true *************** *** 991,994 **** --- 994,998 ---- set _($self:current_x) 30 set _($self:current_y) 30 + set _($self:editable) $editable puts "pdtk_canvas_new::: $name $width $height $geometry $editable" } *************** *** 1337,1346 **** class_new textobj { global offset _ - set offset [expr $offset + 1] set canvas $_(focus) set object_id [format %x [expr 0x81168b0 - $offset]] set _($object_id:class) textobj puts "new object id -> $object_id" object_add $object_id $canvas } --- 1341,1354 ---- class_new textobj { global offset _ set canvas $_(focus) + set self [canvastosym $canvas] + + if {$_($self:mode) == "edit"} { + set offset [expr $offset + 1] set object_id [format %x [expr 0x81168b0 - $offset]] set _($object_id:class) textobj puts "new object id -> $object_id" object_add $object_id $canvas + } } *************** *** 1525,1529 **** set _($obj:cy) [expr $_($obj:cy) + $cy-$old_y] ! objectbox_draw $obj $canvas \ [expr ($_($obj:name_len)*$font(width)) + $font(padx)] \ [expr $font(height) + $font(pady)] 1 3 --- 1533,1546 ---- set _($obj:cy) [expr $_($obj:cy) + $cy-$old_y] ! puts "**** class==> $_($obj:class) *****" ! ! switch $_($obj:class) { ! ! ! textobj { ! ! puts "move textobj" ! ! objectbox_draw $obj $canvas \ [expr ($_($obj:name_len)*$font(width)) + $font(padx)] \ [expr $font(height) + $font(pady)] 1 3 *************** *** 1534,1537 **** --- 1551,1569 ---- if {$_($self:obj_in_edit)} {$canvas coords ${obj}text $text_pos} $canvas coords ${obj}TEXT $text_pos2 + + + } + + bang { + + puts "move bang" + bang_draw $obj $canvas + + } + + + } + + #----handles the wire update---- *************** *** 1733,1736 **** --- 1765,1770 ---- # this proc is too long, should be cut in several parts --matju + # agree, but could i do this a bit later? --chun + proc pdtk_canvas_click2 {canvas x y b f} { puts "pdtk_canvas_click2::: $canvas $x $y $b $f" *************** *** 1752,1756 **** object { set run [expr !$edit || ($f&2)] ! pd "$self click-on-object x$id $cx $cy $b $f;" if {[string length $_($self:grab)]} {set gid $_($self:grab)} if {$f&8} { --- 1786,1790 ---- object { set run [expr !$edit || ($f&2)] ! #pd "$self click-on-object x$id $cx $cy $b $f;" if {[string length $_($self:grab)]} {set gid $_($self:grab)} if {$f&8} { *************** *** 1759,1764 **** } else { if {$run} { event $id clickevent $canvas $cx $cy $b $f} { ! event $id clickeditevent $canvas $cx $cy $b $f} } if {!($f&8) && $edit && [llength [$canvas bbox ${id}BASE]]} { --- 1793,1801 ---- } else { if {$run} { + puts "click click click" + if {$_($id:class) == "bang"} {bang_bang $id $canvas} event $id clickevent $canvas $cx $cy $b $f} { ! event $id clickeditevent $canvas $cx $cy $b $f ! } } if {!($f&8) && $edit && [llength [$canvas bbox ${id}BASE]]} { *************** *** 1793,1803 **** #pd "$self deselect-all ; $self select-object x$id ;" puts "___select this object --> $id" ! # my click select object code begins --chun ! switch $_($id:class) { ! bang { ! puts "clicked on bang" ! bang_bang $id $canvas ! } ! textobj { # may need to call canvas_select_object here to work out # the shift+click selection --- 1830,1842 ---- #pd "$self deselect-all ; $self select-object x$id ;" puts "___select this object --> $id" ! # my click select object code begins --chun ! #switch $_($id:class) { ! #bang { ! #puts "clicked on bang :: editable = $edit" ! ! #bang_bang $id $canvas ! ! #} ! #textobj { # may need to call canvas_select_object here to work out # the shift+click selection *************** *** 1826,1831 **** } set _($self:select_by) "click" ! } ! } # my click select object code ends --- 1865,1870 ---- } set _($self:select_by) "click" ! #} ! #} # my click select object code ends *************** *** 1879,1890 **** switch $pd_nt { 2 {} default { $canvas itemconfigure selrect -dash {3 3 3 3}}} } } } ! #pd "[canvastosym $canvas] mouse $cx $cy $b $f ;" ! #if {[llength $_($self:selection)]} { ! # puts "something has been hilighted" ! #} { ! # puts "nothing hilighted" ! #} } --- 1918,1927 ---- switch $pd_nt { 2 {} default { $canvas itemconfigure selrect -dash {3 3 3 3}}} } + + + } } ! } *************** *** 2080,2087 **** --- 2117,2131 ---- if {$_($self:select_by) == "click"} { + + switch $_($_($self:selection):class) { + + textobj { if {$_($self:obj_in_edit) == 0} { set _($self:obj_in_edit) 1 object_edit [lindex $_($self:selection) 0] $canvas } + } + + } } #object_edit $_($self:edit_object) $canvas

1 0

pd/src desire.tk,1.1.2.32,1.1.2.33
by chunlee 06 Sep '05

06 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23217 Modified Files: Tag: devel_0_39 desire.tk Log Message: open_file fixed Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.32 retrieving revision 1.1.2.33 diff -C2 -d -r1.1.2.32 -r1.1.2.33 *** desire.tk 6 Sep 2005 03:54:53 -0000 1.1.2.32 --- desire.tk 6 Sep 2005 04:48:31 -0000 1.1.2.33 *************** *** 460,463 **** --- 460,464 ---- set _($object_id:name_len) [string length $obj_name] set _($canvas_id:obj_in_edit) 0 + set _($object_id:class) textobj puts "obj x: [lindex $line 2] y: [lindex $line 3]"

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs September 2005