Pd-cvs August 2006

pd-cvs@lists.iem.at

15 participants
462 discussions

pd/src desire.tk,1.1.2.435,1.1.2.436
by Mathieu Bouchard 31 Aug '06

31 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26462 Modified Files: Tag: devel_0_39 desire.tk Log Message: new methods in Canvas: title= update_title raise now displays something in the canvas' window title Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.435 retrieving revision 1.1.2.436 diff -C2 -d -r1.1.2.435 -r1.1.2.436 *** desire.tk 31 Aug 2006 17:22:56 -0000 1.1.2.435 --- desire.tk 31 Aug 2006 18:20:47 -0000 1.1.2.436 *************** *** 213,218 **** class_new Clipboard {Observable Thing} def Clipboard init {{value ""}} {super; $self value= $value; set @copy_count 0} - def Clipboard copy_times= {c} {set @copy_count $c} - def Clipboard copy_times {} {return $@copy_count} # uses system clipboard --- 213,216 ---- *************** *** 1122,1125 **** --- 1120,1124 ---- def Canvas close {} { + if {$@subpatch} {pd .$self close; return} switch [tk_messageBox -message [say save_changes?] -icon question -type yesnocancel -default cancel] { yes {$self save; pd .$self close} *************** *** 1280,1285 **** #set @wire_hilite {} set @history $history ! if {[info exists canvas(file)]} {set @file $canvas(file);set canvas(file) ""} else {set @file ""} ! if {[info exists canvas(directory)]} {set @directory $canvas(directory); set canvas(directory) ""} else {set @directory ""} $self subscribe $manager $self changed --- 1279,1291 ---- #set @wire_hilite {} set @history $history ! if {[info exists canvas(file)]} { ! set @file $canvas(file) ! unset canvas(file) ! } else {set @file ""} ! if {[info exists canvas(directory)]} { ! set @directory $canvas(directory) ! unset canvas(directory) ! } else {set @directory ""} ! $self update_title $self subscribe $manager $self changed *************** *** 1788,1792 **** #-----------------------------------------------------------------------------------# ! def Canvas window_title {title} {wm title .$self $title} def Canvas children {} {return $@children} --- 1794,1813 ---- #-----------------------------------------------------------------------------------# ! def Canvas title= {title} {wm title .$self $title} ! def Canvas update_title {} { ! set t "$@directory/$@file" ! if {[$self modified?]} {append t "(*)"} ! $self title= $t ! } ! ! # UNIMPLEMENTED: this should indicate whether the patch in pd is different from the last saved patch ! def Canvas modified? {} {return 0} ! ! def Canvas raise {} { ! set w [$self window] ! $w raise ! $w focus ! $w deiconify ! } def Canvas children {} {return $@children}

1 0

pd/src/tests city.pd,1.1.2.1,1.1.2.2
by Mathieu Bouchard 31 Aug '06

31 Aug '06

Update of /cvsroot/pure-data/pd/src/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25150 Modified Files: Tag: devel_0_39 city.pd Log Message: new test case includes a bunch of wires Index: city.pd =================================================================== RCS file: /cvsroot/pure-data/pd/src/tests/Attic/city.pd,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** city.pd 15 Aug 2006 16:53:25 -0000 1.1.2.1 --- city.pd 31 Aug 2006 17:42:48 -0000 1.1.2.2 *************** *** 1,65 **** #N canvas 0 0 450 300 10; #X obj 23 20 +; - #X obj 23 50 +; #X obj 53 20 +; #X obj 53 50 +; - #X obj 23 80 +; - #X obj 23 110 +; - #X obj 53 80 +; - #X obj 53 110 +; #X obj 83 20 +; - #X obj 83 50 +; #X obj 113 20 +; #X obj 113 50 +; #X obj 83 80 +; - #X obj 83 110 +; #X obj 113 80 +; #X obj 113 110 +; #X obj 143 20 +; - #X obj 143 50 +; #X obj 173 20 +; #X obj 173 50 +; - #X obj 143 80 +; - #X obj 143 110 +; - #X obj 173 80 +; - #X obj 173 110 +; #X obj 203 20 +; - #X obj 203 50 +; #X obj 233 20 +; #X obj 233 50 +; #X obj 203 80 +; - #X obj 203 110 +; #X obj 233 80 +; #X obj 233 110 +; #X obj 23 140 +; - #X obj 23 170 +; #X obj 53 140 +; #X obj 53 170 +; - #X obj 23 200 +; - #X obj 23 230 +; - #X obj 53 200 +; - #X obj 53 230 +; #X obj 83 140 +; - #X obj 83 170 +; #X obj 113 140 +; #X obj 113 170 +; #X obj 83 200 +; - #X obj 83 230 +; #X obj 113 200 +; #X obj 113 230 +; ! #X obj 233 200 +; ! #X obj 203 230 +; ! #X obj 203 200 +; ! #X obj 233 170 +; #X obj 233 140 +; #X obj 203 170 +; ! #X obj 203 140 +; ! #X obj 173 230 +; #X obj 173 200 +; #X obj 143 230 +; ! #X obj 143 200 +; ! #X obj 173 170 +; ! #X obj 173 140 +; ! #X obj 143 170 +; ! #X obj 143 140 +; #X obj 233 230 +; --- 1,128 ---- #N canvas 0 0 450 300 10; #X obj 23 20 +; #X obj 53 20 +; + #X obj 23 50 +; #X obj 53 50 +; #X obj 83 20 +; #X obj 113 20 +; + #X obj 83 50 +; #X obj 113 50 +; + #X obj 23 80 +; + #X obj 53 80 +; + #X obj 23 110 +; + #X obj 53 110 +; #X obj 83 80 +; #X obj 113 80 +; + #X obj 83 110 +; #X obj 113 110 +; #X obj 143 20 +; #X obj 173 20 +; + #X obj 143 50 +; #X obj 173 50 +; #X obj 203 20 +; #X obj 233 20 +; + #X obj 203 50 +; #X obj 233 50 +; + #X obj 143 80 +; + #X obj 173 80 +; + #X obj 143 110 +; + #X obj 173 110 +; #X obj 203 80 +; #X obj 233 80 +; + #X obj 203 110 +; #X obj 233 110 +; #X obj 23 140 +; #X obj 53 140 +; + #X obj 23 170 +; #X obj 53 170 +; #X obj 83 140 +; #X obj 113 140 +; + #X obj 83 170 +; #X obj 113 170 +; + #X obj 23 200 +; + #X obj 53 200 +; + #X obj 23 230 +; + #X obj 53 230 +; #X obj 83 200 +; #X obj 113 200 +; + #X obj 83 230 +; #X obj 113 230 +; ! #X obj 143 140 +; ! #X obj 173 140 +; ! #X obj 143 170 +; ! #X obj 173 170 +; ! #X obj 203 140 +; #X obj 233 140 +; #X obj 203 170 +; ! #X obj 233 170 +; ! #X obj 143 200 +; #X obj 173 200 +; #X obj 143 230 +; ! #X obj 173 230 +; ! #X obj 203 200 +; ! #X obj 233 200 +; ! #X obj 203 230 +; #X obj 233 230 +; + #X connect 0 0 1 0; + #X connect 0 0 2 0; + #X connect 1 0 4 0; + #X connect 2 0 3 0; + #X connect 2 0 8 0; + #X connect 4 0 5 0; + #X connect 4 0 6 0; + #X connect 5 0 16 0; + #X connect 6 0 7 0; + #X connect 8 0 9 0; + #X connect 8 0 10 0; + #X connect 9 0 12 0; + #X connect 10 0 11 0; + #X connect 10 0 32 0; + #X connect 12 0 13 0; + #X connect 12 0 14 0; + #X connect 14 0 15 0; + #X connect 16 0 17 0; + #X connect 16 0 18 0; + #X connect 17 0 20 0; + #X connect 18 0 19 0; + #X connect 18 0 24 0; + #X connect 20 0 21 0; + #X connect 20 0 22 0; + #X connect 22 0 23 0; + #X connect 24 0 25 0; + #X connect 24 0 26 0; + #X connect 25 0 28 0; + #X connect 26 0 27 0; + #X connect 28 0 29 0; + #X connect 28 0 30 0; + #X connect 30 0 31 0; + #X connect 32 0 33 0; + #X connect 32 0 34 0; + #X connect 33 0 36 0; + #X connect 34 0 35 0; + #X connect 34 0 40 0; + #X connect 36 0 37 0; + #X connect 36 0 38 0; + #X connect 37 0 48 0; + #X connect 38 0 39 0; + #X connect 40 0 41 0; + #X connect 40 0 42 0; + #X connect 41 0 44 0; + #X connect 42 0 43 0; + #X connect 44 0 45 0; + #X connect 44 0 46 0; + #X connect 46 0 47 0; + #X connect 48 0 49 0; + #X connect 48 0 50 0; + #X connect 49 0 52 0; + #X connect 50 0 51 0; + #X connect 50 0 56 0; + #X connect 52 0 53 0; + #X connect 52 0 54 0; + #X connect 54 0 55 0; + #X connect 56 0 57 0; + #X connect 56 0 58 0; + #X connect 57 0 60 0; + #X connect 58 0 59 0; + #X connect 60 0 61 0; + #X connect 60 0 62 0; + #X connect 62 0 63 0;

1 0

pd/src desire.tk,1.1.2.434,1.1.2.435
by Mathieu Bouchard 31 Aug '06

31 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24319 Modified Files: Tag: devel_0_39 desire.tk Log Message: introducing def Canvas widget, for GOP Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.434 retrieving revision 1.1.2.435 diff -C2 -d -r1.1.2.434 -r1.1.2.435 *** desire.tk 31 Aug 2006 17:00:03 -0000 1.1.2.434 --- desire.tk 31 Aug 2006 17:22:56 -0000 1.1.2.435 *************** *** 38,42 **** package require objective ! #if {[catch {source profdd.tcl}]} {error_dump} if {[file exists debug.tcl]} { source debug.tcl --- 38,42 ---- package require objective ! if {[catch {source profdd.tcl}]} {error_dump} if {[file exists debug.tcl]} { [...996 lines suppressed...] global tooltip ! set c [$self widget] $c delete tooltip_bg tooltip_fg set tooltip(visible) 0 *************** *** 4819,4824 **** def TextBox propose_completions {} { global class_list ! set widget .$(a)canvas.c.${self}text ! set propose .$(a)canvas.c.${self}propose #$propose configure -state normal if {![info exists class_list]} { --- 4821,4827 ---- def TextBox propose_completions {} { global class_list ! set c [$@canvas widget] ! set widget $c.${self}text ! set propose $c.${self}propose #$propose configure -state normal if {![info exists class_list]} {

1 0

pd/src desire.tk,1.1.2.433,1.1.2.434
by chunlee 31 Aug '06

31 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18770 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixs in copy/paste and the Menuable getkey Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.433 retrieving revision 1.1.2.434 diff -C2 -d -r1.1.2.433 -r1.1.2.434 *** desire.tk 31 Aug 2006 12:19:03 -0000 1.1.2.433 --- desire.tk 31 Aug 2006 17:00:03 -0000 1.1.2.434 *************** *** 868,873 **** global accels if {[dict exists $accels $k]} { ! mset {class key} [split [dict get $accels $k] ":"] ! if {$class != $@_class} {return ""} else {return $key} } } --- 868,878 ---- global accels if {[dict exists $accels $k]} { ! set vars [dict get $accels $k] ! foreach var $vars { ! #mset {class key} [split [dict get $accels $k] ":"] ! mset {class key} [split $var ":"] ! #if {$class != $@_class} {return ""} else {return $key} ! if {$class == $@_class} {return $key} ! } } } *************** *** 878,881 **** --- 883,887 ---- #set key "Ctrl+$key" set key [$self getkey "Ctrl+$key"] + puts "*** key::: $key" if {[string length $key]} { $self eval% "%W $key" *************** *** 937,941 **** } } ! foreach k [array names key] {dict set accels $key($k) $k} set_fontstring } --- 943,955 ---- } } ! foreach k [array names key] { ! if {[llength $key($k)]} { ! if {![dict exists $accels $key($k)]} { ! dict set accels $key($k) $k ! } else { ! dict lappend accels $key($k) $k ! } ! } ! } set_fontstring } *************** *** 964,968 **** read_ddrc [file join [file dirname $argh0] "../lib/pd/bin/defaults.ddrc"] } - read_ddrc #-----------------------------------------------------------------------------------# set pd_apilist "{ALSA 1}" --- 978,981 ---- *************** *** 1061,1064 **** --- 1074,1078 ---- } + def View item_delete {{suffix all}} { switch -- $suffix { *************** *** 1280,1283 **** --- 1294,1298 ---- set @keynav_last 0 set @keynav_tab_sel "wire" + set @copy_count 0 } *************** *** 2104,2107 **** --- 2119,2125 ---- } + def Canvas copy_times= {c} {set @copy_count $c} + def Canvas copy_times {} {return $@copy_count} + def Canvas copy {} { global clipboard obj_index_sel *************** *** 2109,2113 **** #$clipboard value= [$self deconstruct] $clipboard value= "" ! $clipboard copy_times= 0 array unset obj_index_sel $self:* foreach child $@selection { --- 2127,2131 ---- #$clipboard value= [$self deconstruct] $clipboard value= "" ! $self copy_times= 1 array unset obj_index_sel $self:* foreach child $@selection { *************** *** 2124,2131 **** } - # todo: reimplement copy-count with 15px offset def Canvas paste {} { global clipboard set n [llength $@children] ;# is a racecondition foreach line [split [$clipboard value] ";"] { if {[llength $line] == 0} {continue} --- 2142,2156 ---- } def Canvas paste {} { global clipboard + #$self copy_times= [expr [$self copy_times] + 1] + $self do_paste [expr [$self copy_times] * 15] + $self copy_times= [expr [$self copy_times] + 1] + } + + def Canvas do_paste {offset} { + global clipboard set n [llength $@children] ;# is a racecondition + set m [llength $@wires] ;#let's race!! foreach line [split [$clipboard value] ";"] { if {[llength $line] == 0} {continue} *************** *** 2139,2143 **** pd .$@canvas connect [expr $n+$from] $outlet [expr $n+$to] $inlet } ! default {eval [concat [list pd .$self] [lrange $line 1 end]]} } --- 2164,2173 ---- pd .$@canvas connect [expr $n+$from] $outlet [expr $n+$to] $inlet } ! default { ! set line2 [lrange $line 1 end] ! mset {x y} [lrange $line2 1 2] ! set line2 [lreplace $line2 1 2 [expr $x+$offset] [expr $y+$offset]] ! eval [concat [list pd .$self] $line2] ! } } *************** *** 2147,2154 **** } #after 1 "$self paste2 $n" ! after 300 "$self paste2 $n" ;# racecondition } # part two ! def Canvas paste2 {n} {$self selection= [lrange [$self children] $n end]} def Canvas cut {} { --- 2177,2187 ---- } #after 1 "$self paste2 $n" ! after 300 "$self do_paste2 $n $m" ;# racecondition } # part two ! def Canvas do_paste2 {n m} { ! $self selection= [lrange [$self children] $n end] ! $self selection_wire= [lrange [$self wires] $m end] ! } def Canvas cut {} { *************** *** 2164,2168 **** set clipboard [Clipboard2 new] $self copy ! $self paste $clipboard delete set clipboard $backup --- 2197,2201 ---- set clipboard [Clipboard2 new] $self copy ! $self do_paste 15 $clipboard delete set clipboard $backup *************** *** 2999,3003 **** if {$arrowsize < 5} {set arrow none} {set arrow last} set arrowshape [list $arrowsize [expr $arrowsize*4/5] [expr $arrowsize/3]] ! if {[$self selected?]} {set wire_color [$self look fg2]} else { if {[info exists _($@obj1:text)] && [info exists _($@obj2:text)]} { if {[regexp -nocase {~$} [lindex $_($@obj1:text) 0]] && \ --- 3032,3036 ---- if {$arrowsize < 5} {set arrow none} {set arrow last} set arrowshape [list $arrowsize [expr $arrowsize*4/5] [expr $arrowsize/3]] ! if {[$self selected?]} {set wire_color [$self look fg2];set wire_width [$self look thick]} else { if {[info exists _($@obj1:text)] && [info exists _($@obj2:text)]} { if {[regexp -nocase {~$} [lindex $_($@obj1:text) 0]] && \

1 0

pd/src desire.tk,1.1.2.432,1.1.2.433
by Mathieu Bouchard 31 Aug '06

31 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26740 Modified Files: Tag: devel_0_39 desire.tk Log Message: faster def View look Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.432 retrieving revision 1.1.2.433 diff -C2 -d -r1.1.2.432 -r1.1.2.433 *** desire.tk 31 Aug 2006 11:07:55 -0000 1.1.2.432 --- desire.tk 31 Aug 2006 12:19:03 -0000 1.1.2.433 *************** *** 436,442 **** proc say_category {text} {} - proc look2 {k} {global look; return $look($k)} - proc look {class k} {global look; return $look($class:$k)} - set cmdline(server) [file join [file dirname $argh0] ../bin/pd] set cmdline(rcfilename) ~/.pdrc --- 436,439 ---- *************** *** 999,1011 **** def View look {k} { ! global look ! if {[info exists look($@_class:$k)]} { ! return $look($@_class:$k) ! } else { ! foreach super [$@_class ancestors] { ! if {[info exists look($super:$k)]} {return $look($super:$k)} } } } --- 996,1018 ---- def View look {k} { ! global look look_cache ! if {![info exists look_cache($@_class:$k)]} { foreach super [$@_class ancestors] { ! if {[info exists look($super:$k)]} { ! set look_cache($@_class:$k) $super ! break ! } } } + set class $look_cache($@_class:$k) + return $look($class:$k) + } + + def View look_old {k} { + global look + if {[info exists look($@_class:$k)]} {return $look($@_class:$k)} + foreach super [$@_class ancestors] { + if {[info exists look($super:$k)]} {return $look($super:$k)} + } } *************** *** 1658,1663 **** #} #set textwidth [expr $font(padx)+$font(width)*($n+$@edit)] ! set topwidth [expr (2* $@ninlets-1) * [$self look iowidth]] ! set bottomwidth [expr (2*$@noutlets-1) * [$self look iowidth]] set @xs [max [$self look minobjwidth] [max $bottomwidth [max $topwidth $textwidth]]] set @ys [expr $pady+$height] --- 1665,1671 ---- #} #set textwidth [expr $font(padx)+$font(width)*($n+$@edit)] ! set iowidth [$self look iowidth] ! set topwidth [expr (2* $@ninlets-1) * $iowidth] ! set bottomwidth [expr (2*$@noutlets-1) * $iowidth] set @xs [max [$self look minobjwidth] [max $bottomwidth [max $topwidth $textwidth]]] set @ys [expr $pady+$height] *************** *** 2886,2894 **** mset {x1 y1 x2 y2} [$self bbox] set xs [expr $x2-$x1] ! set ys [expr $y2-$y1] for {set i 0} {$i<$n} {incr i} { ! set onset [expr $x1 + ($xs-([$self look iowidth])) * $i / $nplus] ! set points [list [expr $onset] [expr $y-0] [expr $onset+[$self look iowidth]] [expr $y+0]] ! switch $which { i {set color [$self look inletfg]} o {set color [$self look outletfg]}} $self item [list $which$i $which] rectangle $points -outline $color -fill $color -width 1 } --- 2894,2902 ---- mset {x1 y1 x2 y2} [$self bbox] set xs [expr $x2-$x1] ! set iowidth [$self look iowidth] ! switch $which { i {set color [$self look inletfg]} o {set color [$self look outletfg]}} for {set i 0} {$i<$n} {incr i} { ! set onset [expr $x1 + ($xs-$iowidth) * $i / $nplus] ! set points [list [expr $onset] [expr $y-0] [expr $onset+$iowidth] [expr $y+0]] $self item [list $which$i $which] rectangle $points -outline $color -fill $color -width 1 } *************** *** 2909,2913 **** switch $type {i {set ports $@ninlets} o {set ports $@noutlets}} set port -1 ! for {set n 0} {$n<$ports} {incr n} { set tag $self$type$n --- 2917,2922 ---- switch $type {i {set ports $@ninlets} o {set ports $@noutlets}} set port -1 ! set iowidth [$self look iowidth] ! for {set n 0} {$n<$ports} {incr n} { set tag $self$type$n *************** *** 2915,2919 **** set center [expr ([lindex $area 2] + [lindex $area 0]) / 2 ] set dist [expr abs($x - $center)] ! if {$dist < [expr ([$self look iowidth]/2)+5] && $dist > 0} {set port $n} } --- 2924,2928 ---- set center [expr ([lindex $area 2] + [lindex $area 0]) / 2 ] set dist [expr abs($x - $center)] ! if {$dist < [expr ($iowidth/2)+5] && $dist > 0} {set port $n} } *************** *** 3609,3614 **** #set width [$self look fontwidth];set height [$self look fontheight] set textwidth [expr $padx+$width*$@w] ! set topwidth [expr (2* $@ninlets-1) * [$self look iowidth]] ! set bottomwidth [expr (2*$@noutlets-1) * [$self look iowidth]] set @xs [max [$self look minobjwidth] [max $bottomwidth [max $topwidth $textwidth]]] set @ys [expr $pady+$height] --- 3618,3624 ---- #set width [$self look fontwidth];set height [$self look fontheight] set textwidth [expr $padx+$width*$@w] ! set iowidth [$self look iowidth] ! set topwidth [expr (2* $@ninlets-1) * $iowidth] ! set bottomwidth [expr (2*$@noutlets-1) * $iowidth] set @xs [max [$self look minobjwidth] [max $bottomwidth [max $topwidth $textwidth]]] set @ys [expr $pady+$height] *************** *** 3669,3674 **** #set width [$self look fontwidth];set height [$self look fontheight] set textwidth [expr $padx+$width*[string length $@buf]] ! set topwidth [expr (2* $@ninlets-1) * [$self look iowidth]] ! set bottomwidth [expr (2*$@noutlets-1) * [$self look iowidth]] set @xs [max [$self look minobjwidth] [max $bottomwidth [max $topwidth $textwidth]]] set @ys [expr $pady+$height] --- 3679,3685 ---- #set width [$self look fontwidth];set height [$self look fontheight] set textwidth [expr $padx+$width*[string length $@buf]] ! set iowidth [$self look iowidth] ! set topwidth [expr (2* $@ninlets-1) * $iowidth] ! set bottomwidth [expr (2*$@noutlets-1) * $iowidth] set @xs [max [$self look minobjwidth] [max $bottomwidth [max $topwidth $textwidth]]] set @ys [expr $pady+$height] *************** *** 4003,4007 **** mset {x1 y1 x2 y2} [$self bbox] if {$@flash} { ! .$(a)canvas.c itemconfigure ${self}BUT -fill [color_* [look bg] [parse_color $@fcol]] after 100 [list .$(a)canvas.c itemconfigure ${self}BUT -fill [color_* [$self look bg] [parse_color $@bcol]]] set $@flash 0 --- 4014,4018 ---- mset {x1 y1 x2 y2} [$self bbox] if {$@flash} { ! .$(a)canvas.c itemconfigure ${self}BUT -fill [color_* [$self look bg] [parse_color $@fcol]] after 100 [list .$(a)canvas.c itemconfigure ${self}BUT -fill [color_* [$self look bg] [parse_color $@bcol]]] set $@flash 0

1 0

pd/src desire.tk,1.1.2.431,1.1.2.432
by Mathieu Bouchard 31 Aug '06

31 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv423 Modified Files: Tag: devel_0_39 desire.tk Log Message: [bluify $c] replaced by [color_* [$self look bg]] Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.431 retrieving revision 1.1.2.432 diff -C2 -d -r1.1.2.431 -r1.1.2.432 *** desire.tk 31 Aug 2006 00:24:48 -0000 1.1.2.431 --- desire.tk 31 Aug 2006 11:07:55 -0000 1.1.2.432 *************** *** 541,545 **** set accels {} - #foreach k [array names key] {dict set accels $key($k) $k} ################## set up main window ######################### --- 541,544 ---- *************** *** 3019,3032 **** ############ colouring ! proc bluify {colour} { ! global look ! scan $colour #%02x%02x%02x r g b ! #scan [$self look sliderbg] #%02x%02x%02x R G B ! scan $look(Slider:bg) #%02x%02x%02x R G B return [format #%02x%02x%02x [expr ($r*$R)>>8] [expr ($g*$G)>>8] [expr ($b*$B)>>8]] } ! proc darker {colour} { ! scan $colour #%02x%02x%02x r g b set r [expr $r*3/4] set g [expr $g*3/4] --- 3018,3030 ---- ############ colouring ! proc color_* {c1 c2} { ! scan $c1 #%02x%02x%02x r g b ! scan $c2 #%02x%02x%02x R G B return [format #%02x%02x%02x [expr ($r*$R)>>8] [expr ($g*$G)>>8] [expr ($b*$B)>>8]] } ! # equivalent to color* #c0c0c0 $c ! proc darker {c} { ! scan $c #%02x%02x%02x r g b set r [expr $r*3/4] set g [expr $g*3/4] *************** *** 3280,3284 **** set xyb [list [expr $x2-1] [expr $y1+1] [expr $x1+1] [expr $y1+1] [expr $x1+1] [expr $y2-1]] set xyc [list [expr $x2-1] [expr $y1+1] [expr $x2-1] [expr $y2-1] [expr $x1+1] [expr $y2-1]] ! set color [bluify [parse_color $@bcol]] if {[$self selected?]} {set frcol [$self look selectframe]} {set frcol [$self look frame3]} $self item BASE rectangle $xya -fill $color -outline $frcol --- 3278,3282 ---- set xyb [list [expr $x2-1] [expr $y1+1] [expr $x1+1] [expr $y1+1] [expr $x1+1] [expr $y2-1]] set xyc [list [expr $x2-1] [expr $y1+1] [expr $x2-1] [expr $y2-1] [expr $x1+1] [expr $y2-1]] ! set color [color_* [$self look bg] [parse_color $@bcol]] if {[$self selected?]} {set frcol [$self look selectframe]} {set frcol [$self look frame3]} $self item BASE rectangle $xya -fill $color -outline $frcol *************** *** 3891,3895 **** set l [expr [$self orient]?$@h:$@w] set span [expr $@max-$@min] ! set color [bluify #ffffff] if {[$self orient]} { set size $@w --- 3889,3893 ---- set l [expr [$self orient]?$@h:$@w] set span [expr $@max-$@min] ! set color [$self look bg] if {[$self orient]} { set size $@w *************** *** 4005,4015 **** mset {x1 y1 x2 y2} [$self bbox] if {$@flash} { ! .$(a)canvas.c itemconfigure ${self}BUT -fill [bluify [parse_color $@fcol]] ! after 100 [list .$(a)canvas.c itemconfigure ${self}BUT -fill [bluify [parse_color $@bcol]]] set $@flash 0 } else { set colour [parse_color $@bcol] set rect [list [expr $x1+2] [expr $y1+2] [expr $x2-2] [expr $y2-2]] ! $self item BUT oval $rect -fill [bluify $colour] -tags "${self}BUT $self" } } --- 4003,4013 ---- mset {x1 y1 x2 y2} [$self bbox] if {$@flash} { ! .$(a)canvas.c itemconfigure ${self}BUT -fill [color_* [look bg] [parse_color $@fcol]] ! after 100 [list .$(a)canvas.c itemconfigure ${self}BUT -fill [color_* [$self look bg] [parse_color $@bcol]]] set $@flash 0 } else { set colour [parse_color $@bcol] set rect [list [expr $x1+2] [expr $y1+2] [expr $x2-2] [expr $y2-2]] ! $self item BUT oval $rect -fill [color_* [$self look bg] $colour] -tags "${self}BUT $self" } } *************** *** 4026,4031 **** set @count $count set @flash 1 ! #.$(a)canvas.c itemconfigure ${self}BUT -fill [bluify [parse_color $@fcol]] ! #after 100 [list .$(a)canvas.c itemconfigure ${self}BUT -fill [bluify [parse_color $@bcol]]] } --- 4024,4029 ---- set @count $count set @flash 1 ! #.$(a)canvas.c itemconfigure ${self}BUT -fill [color_* [$self look bg] [parse_color $@fcol]] ! #after 100 [list .$(a)canvas.c itemconfigure ${self}BUT -fill [color_* [$self look bg] [parse_color $@bcol]]] } *************** *** 4042,4046 **** set colour [parse_color $@bcol] set t [expr int(($@w+29)/30)] ! set fill [bluify $colour] set x3 [expr $x1+$t+2]; set y3 [expr $y1+$t+2] set x4 [expr $x2-$t-2]; set y4 [expr $y2-$t-2] --- 4040,4044 ---- set colour [parse_color $@bcol] set t [expr int(($@w+29)/30)] ! set fill [color_* [$self look bg] $colour] set x3 [expr $x1+$t+2]; set y3 [expr $y1+$t+2] set x4 [expr $x2-$t-2]; set y4 [expr $y2-$t-2] *************** *** 4048,4052 **** set fill [parse_color $@fcol] } { ! set fill [bluify [parse_color $@bcol]] } $self item X1 line [list $x3 $y3 [expr $x4+1] [expr $y4+1]] -width $t -fill $fill --- 4046,4050 ---- set fill [parse_color $@fcol] } { ! set fill [color_* [$self look bg] [parse_color $@bcol]] } $self item X1 line [list $x3 $y3 [expr $x4+1] [expr $y4+1]] -width $t -fill $fill *************** *** 4100,4104 **** set x3 [expr $x1+$@w/4] set x4 [expr $x2-$@w/4] ! $self item BASE rectangle [list $x1 $y1 $x2 $y2] -width 0 -fill [bluify $colour] for {set i 1} {$i<=40} {incr i} { set y [expr $y1 + ($led_size+1)*(41-$i) - ($led_size+1)/2] --- 4098,4102 ---- set x3 [expr $x1+$@w/4] set x4 [expr $x2-$@w/4] ! $self item BASE rectangle [list $x1 $y1 $x2 $y2] -width 0 -fill [color_* [$self look bg] $colour] for {set i 1} {$i<=40} {incr i} { set y [expr $y1 + ($led_size+1)*(41-$i) - ($led_size+1)/2] *************** *** 4121,4125 **** } set y [expr $y1 + ($led_size+1)*(41-$@value) - ($led_size+1)/2] ! $self item MASK rectangle [list $x3 $y1 $x4 $y] -width 0 -fill [bluify $colour] set c [lindex $vu_col $@peak] set y [expr $y1 + ($led_size+1)*(41-$@peak) - ($led_size+1)/2] --- 4119,4123 ---- } set y [expr $y1 + ($led_size+1)*(41-$@value) - ($led_size+1)/2] ! $self item MASK rectangle [list $x3 $y1 $x4 $y] -width 0 -fill [color_* [$self look bg] $colour] set c [lindex $vu_col $@peak] set y [expr $y1 + ($led_size+1)*(41-$@peak) - ($led_size+1)/2]

1 0

pd/src desire.tk,1.1.2.430,1.1.2.431
by chunlee 31 Aug '06

31 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16091 Modified Files: Tag: devel_0_39 desire.tk Log Message: experiments with dd main window and prompts using the font from .ddrc Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.430 retrieving revision 1.1.2.431 diff -C2 -d -r1.1.2.430 -r1.1.2.431 *** desire.tk 30 Aug 2006 20:35:39 -0000 1.1.2.430 --- desire.tk 31 Aug 2006 00:24:48 -0000 1.1.2.431 *************** *** 4206,4215 **** proc make_console {} { ! global cmdline set errMsg "" catch { if {$cmdline(console) != 0} { frame .log ! text .log.1 -width 60 -height 30 -yscrollcommand ".log.2 set" scrollbar .log.2 -command ".log.1 yview" global tcl_version tk_version pd_myversion tcl_platform OS --- 4206,4215 ---- proc make_console {} { ! global cmdline look set errMsg "" catch { if {$cmdline(console) != 0} { frame .log ! text .log.1 -width 60 -height 30 -yscrollcommand ".log.2 set" -font $look(View:fontstring) scrollbar .log.2 -command ".log.1 yview" global tcl_version tk_version pd_myversion tcl_platform OS *************** *** 4267,4270 **** --- 4267,4271 ---- def Listener init {serf name command} { + global look set @hist {} set @histi 0 *************** *** 4276,4281 **** pack [frame $serf.1.1] -side bottom pack [button $serf.1.1.expander -image icon_plus -command "$self toggle_expand"] -side left ! pack [label $serf.1.1.label -text "$name: "] -side left ! pack [entry $serf.entry -width 40] -side left -fill x -expand yes pack $serf -fill x -expand no bind $serf.entry <Up> "$self up" --- 4277,4282 ---- pack [frame $serf.1.1] -side bottom pack [button $serf.1.1.expander -image icon_plus -command "$self toggle_expand"] -side left ! pack [label $serf.1.1.label -text "$name: " -font $look(View:fontstring)] -side left ! pack [entry $serf.entry -width 40 -font $look(View:fontstring)] -side left -fill x -expand yes pack $serf -fill x -expand no bind $serf.entry <Up> "$self up"

1 0

pd/src desire.tk,1.1.2.429,1.1.2.430
by Mathieu Bouchard 30 Aug '06

30 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29786 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed default path for icons Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.429 retrieving revision 1.1.2.430 diff -C2 -d -r1.1.2.429 -r1.1.2.430 *** desire.tk 30 Aug 2006 18:35:35 -0000 1.1.2.429 --- desire.tk 30 Aug 2006 20:35:39 -0000 1.1.2.430 *************** *** 443,447 **** set cmdline(ddrcfilename) ~/.ddrc set cmdline(console) 1000 ! set cmdline(icons) icons set cmdline(gdb) 1 set cmdline(gdbconsole) 1 --- 443,452 ---- set cmdline(ddrcfilename) ~/.ddrc set cmdline(console) 1000 ! if {[file exists icons/mode_edit.gif]} { ! set cmdline(icons) icons ! } else { ! set cmdline(icons) [file join [file dirname $argh0] ../lib/pd/bin/icons] ! } ! set cmdline(gdb) 1 set cmdline(gdbconsole) 1

1 0

pd SConstruct,1.1.4.13,1.1.4.14
by Mathieu Bouchard 30 Aug '06

30 Aug '06

Update of /cvsroot/pure-data/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28692 Modified Files: Tag: devel_0_39 SConstruct Log Message: installing icons for desiredata Index: SConstruct =================================================================== RCS file: /cvsroot/pure-data/pd/Attic/SConstruct,v retrieving revision 1.1.4.13 retrieving revision 1.1.4.14 diff -C2 -d -r1.1.4.13 -r1.1.4.14 *** SConstruct 30 Aug 2006 19:46:32 -0000 1.1.4.13 --- SConstruct 30 Aug 2006 20:32:22 -0000 1.1.4.14 *************** *** 74,77 **** --- 74,95 ---- locale/italiano.tcl locale/portugues.tcl + icons/array.gif + icons/bang.gif + icons/canvas.gif + icons/comment.gif + icons/graph.gif + icons/hradio.gif + icons/hslider.gif + icons/message.gif + icons/mode_edit.gif + icons/mode_run.gif + icons/number.gif + icons/number2.gif + icons/object.gif + icons/symbol.gif + icons/toggle.gif + icons/vradio.gif + icons/vslider.gif + icons/vu.gif """)

1 0

pd SConstruct,1.1.4.12,1.1.4.13
by Mathieu Bouchard 30 Aug '06

30 Aug '06

Update of /cvsroot/pure-data/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11822 Modified Files: Tag: devel_0_39 SConstruct Log Message: fixed previous commit (app_pkg use was backwards) Index: SConstruct =================================================================== RCS file: /cvsroot/pure-data/pd/Attic/SConstruct,v retrieving revision 1.1.4.12 retrieving revision 1.1.4.13 diff -C2 -d -r1.1.4.12 -r1.1.4.13 *** SConstruct 30 Aug 2006 18:43:21 -0000 1.1.4.12 --- SConstruct 30 Aug 2006 19:46:32 -0000 1.1.4.13 *************** *** 95,102 **** if app_pkg: for ddfile in ddfiles: ! installs.append(env.InstallAs(prefix + '/lib/pd/bin/'+ddfile, 'src/'+ddfile)) else: for ddfile in ddfiles: ! installs.append(env.InstallAs(prefix + '/Scripts/'+ddfile, 'src/'+ddfile)) else: if not app_pkg: --- 95,102 ---- if app_pkg: for ddfile in ddfiles: ! installs.append(env.InstallAs(prefix + '/Scripts/'+ddfile, 'src/'+ddfile)) else: for ddfile in ddfiles: ! installs.append(env.InstallAs(prefix + '/lib/pd/bin/'+ddfile, 'src/'+ddfile)) else: if not app_pkg:

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 August 2006