Pd-cvs August 2006

pd-cvs@lists.iem.at

15 participants
462 discussions

doc/tutorials/intro 38.EXERCISE-help_americans.pd,1.1,1.2
by Hans-Christoph Steiner 09 Aug '06

09 Aug '06

Update of /cvsroot/pure-data/doc/tutorials/intro In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32590 Modified Files: 38.EXERCISE-help_americans.pd Log Message: added formulas to convert both ways Index: 38.EXERCISE-help_americans.pd =================================================================== RCS file: /cvsroot/pure-data/doc/tutorials/intro/38.EXERCISE-help_americans.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 38.EXERCISE-help_americans.pd 7 May 2006 22:50:38 -0000 1.1 --- 38.EXERCISE-help_americans.pd 9 Aug 2006 00:31:09 -0000 1.2 *************** *** 1,6 **** ! #N canvas 354 158 694 490 12; #X obj 11 10 cnv 15 600 40 empty empty EXERCISE-help_americans 20 12 0 24 -262131 -66577 0; ! #X text 33 64 Help the poor Americans to understand Celsius. The formula ! is C = (5/9)*(F-32). Try not to use [expr] \, but instead use individual ! Pd objects for each math operation.; --- 1,6 ---- ! #N canvas 354 158 698 494 12; #X obj 11 10 cnv 15 600 40 empty empty EXERCISE-help_americans 20 12 0 24 -262131 -66577 0; ! #X text 19 64 Help the poor Americans to understand Celsius. The formulas ! are C = (5/9) * (F-32) and F = (9/5 * C) + 32 Try not to use [expr] ! \, but instead use individual Pd objects for each math operation.;

1 0

doc/tutorials/networking 08.wildcard_messages.pd,1.1,1.2
by Hans-Christoph Steiner 09 Aug '06

09 Aug '06

Update of /cvsroot/pure-data/doc/tutorials/networking In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30649 Modified Files: 08.wildcard_messages.pd Log Message: added more examples Index: 08.wildcard_messages.pd =================================================================== RCS file: /cvsroot/pure-data/doc/tutorials/networking/08.wildcard_messages.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** 08.wildcard_messages.pd 7 May 2006 22:50:38 -0000 1.1 --- 08.wildcard_messages.pd 9 Aug 2006 00:26:59 -0000 1.2 *************** *** 1,43 **** ! #N canvas 129 112 644 464 10; ! #X obj 8 10 cnv 15 400 40 empty empty matching_with_wildcards 20 12 ! 0 24 -228992 -66577 0; ! #X text 10 69 OSC gives you a very useful feature which regular [route] ! does not: wildcards. Wildcards are characters that match any pattern. ! The * is the most common \, it means match any amount of any character: ! ; ! #X obj 38 236 bng 15 250 50 0 empty empty match 18 8 0 12 -262144 -1 ! -1; ! #X obj 130 236 bng 15 250 50 0 empty empty unmatched 18 8 0 12 -262144 ! -1 -1; ! #X msg 30 134 /test/message data; ! #X obj 37 216 OSCroute /*; ! #X msg 56 185 /1/2/3 data; ! #X msg 56 159 /some/other/message 1 2 3; ! #X text 142 214 <-- notice the * in the pattern; ! #X text 320 347 <-- notice the * in the pattern; ! #X msg 212 278 /inst2/note B; ! #X msg 110 279 /inst1/note C; ! #X msg 229 319 /inst3/note F; ! #X obj 202 346 OSCroute /*; ! #X msg 219 298 /player3/note D; ! #X obj 274 366 bng 15 250 50 0 empty empty unmatched 18 8 0 12 -262144 ! -1 -1; ! #X obj 294 409 bng 15 250 50 0 empty empty unmatched 18 8 0 12 -262144 -1 -1; ! #X obj 202 388 OSCroute /note; ! #X obj 202 410 symbol; ! #X symbolatom 202 432 10 0 0 0 - - -; ! #X connect 4 0 5 0; ! #X connect 5 0 2 0; ! #X connect 5 1 3 0; ! #X connect 6 0 5 0; ! #X connect 7 0 5 0; ! #X connect 10 0 13 0; ! #X connect 11 0 13 0; ! #X connect 12 0 13 0; ! #X connect 13 0 17 0; ! #X connect 13 1 15 0; ! #X connect 14 0 13 0; ! #X connect 17 0 18 0; ! #X connect 17 1 16 0; ! #X connect 18 0 19 0; --- 1,49 ---- ! #N canvas 235 112 656 476 10; ! #X obj 8 10 cnv 15 400 40 empty empty wildcard_messages 20 12 0 24 ! -228992 -66577 0; ! #X text 300 212 <-- notice the * in the pattern; ! #X msg 162 154 /inst2/note B; ! #X msg 151 135 /inst1/note C; ! #X msg 172 175 /inst3/note F; ! #X obj 355 309 bng 15 250 50 0 empty empty unmatched 18 8 0 12 -262144 -1 -1; ! #X obj 64 378 symbol; ! #X symbolatom 64 400 10 0 0 0 - - -; ! #X obj 157 288 OSCroute /inst1 /inst2 /inst3; ! #X msg 199 213 /inst*/note F; ! #X obj 64 355 OSCroute /note; ! #X obj 172 379 symbol; ! #X symbolatom 172 401 10 0 0 0 - - -; ! #X obj 172 356 OSCroute /note; ! #X obj 282 379 symbol; ! #X symbolatom 282 401 10 0 0 0 - - -; ! #X obj 282 356 OSCroute /note; ! #X obj 64 418 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 ! -1; ! #X obj 172 418 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 ! -1; ! #X obj 282 418 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 ! -1; ! #X text 11 70 With OSC \, its much more useful to put the wildcards ! in the messages that you are sending. In this example \, the wildcard ! allows one message to reach three instruments:; ! #X msg 220 250 /inst4/note F; ! #X text 322 249 <-- there is no /inst4 in [OSCroute]; ! #X connect 2 0 8 0; ! #X connect 3 0 8 0; ! #X connect 4 0 8 0; ! #X connect 6 0 7 0; ! #X connect 7 0 17 0; ! #X connect 8 0 10 0; ! #X connect 8 1 13 0; ! #X connect 8 2 16 0; ! #X connect 8 3 5 0; ! #X connect 9 0 8 0; ! #X connect 10 0 6 0; ! #X connect 11 0 12 0; ! #X connect 12 0 18 0; ! #X connect 13 0 11 0; ! #X connect 14 0 15 0; ! #X connect 15 0 19 0; ! #X connect 16 0 14 0; ! #X connect 21 0 8 0;

1 0

pd/src m_glob.c,1.4.4.2.2.15,1.4.4.2.2.16
by Mathieu Bouchard 09 Aug '06

09 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10996 Modified Files: Tag: devel_0_39 m_glob.c Log Message: forgot to commit this. Index: m_glob.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_glob.c,v retrieving revision 1.4.4.2.2.15 retrieving revision 1.4.4.2.2.16 diff -C2 -d -r1.4.4.2.2.15 -r1.4.4.2.2.16 *** m_glob.c 5 Aug 2006 20:42:16 -0000 1.4.4.2.2.15 --- m_glob.c 8 Aug 2006 23:37:27 -0000 1.4.4.2.2.16 *************** *** 161,166 **** --- 161,168 ---- A_SYMBOL, A_SYMBOL, 0); class_addmethod(glob_pdobject, (t_method)glob_quit, gensym("quit"), 0); + #ifndef DESIRE class_addmethod(glob_pdobject, (t_method)glob_verifyquit, gensym("verifyquit"), A_DEFFLOAT, 0); + #endif class_addmethod(glob_pdobject, (t_method)glob_foo, gensym("foo"), A_GIMME, 0); class_addmethod(glob_pdobject, (t_method)glob_dsp, gensym("dsp"), A_GIMME, 0);

1 0

pd/src desire.tk,1.1.2.303,1.1.2.304
by Mathieu Bouchard 09 Aug '06

09 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31582 Modified Files: Tag: devel_0_39 desire.tk Log Message: introducing comment boxes (#X text) Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.303 retrieving revision 1.1.2.304 diff -C2 -d -r1.1.2.303 -r1.1.2.304 *** desire.tk 8 Aug 2006 21:15:16 -0000 1.1.2.303 --- desire.tk 8 Aug 2006 23:02:33 -0000 1.1.2.304 *************** *** 161,165 **** def Manager call {} { global poolset ! if {[llength $@q]} {post "client queue %d" [llength $@q]} foreach o $@q { post %s "$o: $poolset($o)" --- 161,165 ---- def Manager call {} { global poolset ! #if {[llength $@q]} {post "client queue %d" [llength $@q]} foreach o $@q { post %s "$o: $poolset($o)" *************** *** 832,835 **** --- 832,842 ---- set look(objectframe3) #000000 set look(objectframe4) #0080ff + set look(commentfg) #000000 + set look(commentbg) #cccccc + set look(commentframe1) #ffffff + set look(commentframe2) #888888 + set look(commentframe3) #000000 + set look(commentframe4) #0080ff + set look(canvasbgrun) #ffffff set look(canvasbgedit) #dddddd *************** *** 1358,1376 **** } ! # correct edit menu, enabling or disabling undo/redo # LATER also cut/copy/paste def Canvas fix_edit_menu {} { set e .$self.m.edit set t [say undo] if {[$@history can_undo?]} { ! $e entryconfigure $t -state normal -label "$t [$@history next_undo_name]" } else { ! $e entryconfigure $t -state disabled -label "[say cannot] $t" } set t [say redo] if {[$@history can_redo?]} { ! $e entryconfigure $t -state normal -label "$t [$@history next_redo_name]" } else { ! $e entryconfigure $t -state disabled -label "[say cannot] $t" } } --- 1365,1386 ---- } ! # corrects edit menu, enabling or disabling undo/redo # LATER also cut/copy/paste def Canvas fix_edit_menu {} { + global OS set e .$self.m.edit + switch $OS {osx {set i 0} default {set i 1}} set t [say undo] if {[$@history can_undo?]} { ! $e entryconfigure $i -state normal -label "$t [$@history next_undo_name]" } else { ! $e entryconfigure $i -state disabled -label "[say cannot] $t" } + incr i set t [say redo] if {[$@history can_redo?]} { ! $e entryconfigure $i -state normal -label "$t [$@history next_redo_name]" } else { ! $e entryconfigure $i -state disabled -label "[say cannot] $t" } } *************** *** 1438,1445 **** --- 1448,1462 ---- class_new TextBox {Box} + def TextBox init {} { + super + set @edit 0 + set @valid 0 + } + def TextBox text= {text} {set @text $text; $self update_size} def TextBox text {} {return $text} def* TextBox draw {} { + $self update_size # TEXT = the text label # text = the input text field *************** *** 1468,1474 **** set t .$(a)canvas.c.${self}text if {[info exists @isnew]} {set @isnew 0} ! #--------------------------------------- label completion ! #set propose .$(a)canvas.c.${self}propose ! #--------------------------------------- set @edit 1 set @tab_repeats 0 --- 1485,1489 ---- set t .$(a)canvas.c.${self}text if {[info exists @isnew]} {set @isnew 0} ! # set propose .$(a)canvas.c.${self}propose ;# label completion set @edit 1 set @tab_repeats 0 *************** *** 1476,1490 **** set @selected? 1 .$(a)canvas.c delete ${self}TEXT ! #set @oldtext $@text $self update_size ! #$self changed ! #--------------------------------------- label completion ! #text $propose -height 1 -width [expr [string length $@text]+1] -relief flat \ # -bg $look(objectbg) -borderwidth 0 -highlightthickness 0\ ! # -font $font(str) -fg red ! #--------------------------------------- bind Text <Tab> "$self tab; continue" text $t -height 1 -width [expr [string length $@text]+1] -relief flat \ ! -bg [look objectbg] -borderwidth 0 -highlightthickness 0\ -font $font(str) -fg [look objectfg] bind $t <Key> "$self key %W %x %y %K %A 0" --- 1491,1503 ---- set @selected? 1 .$(a)canvas.c delete ${self}TEXT ! # set @oldtext $@text $self update_size ! # $self changed ! # text $propose -height 1 -width [expr [string length $@text]+1] -relief flat \ # -bg $look(objectbg) -borderwidth 0 -highlightthickness 0\ ! # -font $font(str) -fg red ;# label completion bind Text <Tab> "$self tab; continue" text $t -height 1 -width [expr [string length $@text]+1] -relief flat \ ! -bg [.$(a)canvas.c itemcget ${self}BASE -fill] -borderwidth 0 -highlightthickness 0\ -font $font(str) -fg [look objectfg] bind $t <Key> "$self key %W %x %y %K %A 0" *************** *** 1504,1508 **** #$self draw $t configure -pady 0 -padx 1 ! $t insert 1.0 $@text #set @entered [$t get 1.0 1.end] focus $t --- 1517,1521 ---- #$self draw $t configure -pady 0 -padx 1 ! $t insert 1.0 $@text #set @entered [$t get 1.0 1.end] focus $t *************** *** 1567,1571 **** set @noutlets 0 set @pdclass "" - set @edit 0 } --- 1580,1583 ---- *************** *** 1579,1617 **** global font super - set xs $@xs - set ys $@ys - set ins $@ninlets - set outs $@noutlets mset {x1 y1} [$self xy] ! set x2 [expr $x1+$xs] ! set y2 [expr $y1+$ys] set xya [list $x1 $y1 $x2 $y2] set xyb [l+ [list $x2 $y1 $x1 $y1 $x1 $y2] [list -1 +1 +1 +1 +1 -1]] set xyc [l+ [list $x2 $y1 $x2 $y2 $x1 $y2] [list -1 +1 -1 -1 +1 -1]] $self item BASE rectangle $xya -fill [look objectbg] ! $self item BASE2 line $xyb -fill [look objectframe2] ! $self item BASE3 line $xyc -fill [look objectframe3] } def* ObjectBox draw {} { - $self update_size super - global font - mset {x1 y1} [$self xy] io_draw $self if {[$self selected?]} {set frcol [look objectframe4]} {set frcol [look objectframe3]} set c .$(a)canvas.c ! $c itemconfigure ${self}BASE -outline $frcol -dash \ ! [if {$@valid} {list 8 8 8 8} {list}] ! $c itemconfigure ${self}BASE2 -fill $frcol ! $c itemconfigure ${self}BASE3 -fill $frcol ! #super ! if {$@isnew} {$self edit} ! catch {$c raise ${self}TEXT $self} ! ! $self draw_wires } ! def ObjectBox unedit {} { if {!$@edit} {return} set @edit 0 --- 1591,1617 ---- global font super mset {x1 y1} [$self xy] ! set x2 [expr $x1+$@xs] ! set y2 [expr $y1+$@ys] set xya [list $x1 $y1 $x2 $y2] set xyb [l+ [list $x2 $y1 $x1 $y1 $x1 $y2] [list -1 +1 +1 +1 +1 -1]] set xyc [l+ [list $x2 $y1 $x2 $y2 $x1 $y2] [list -1 +1 -1 -1 +1 -1]] $self item BASE rectangle $xya -fill [look objectbg] ! $self item BASE1 line $xyb -fill [look objectframe1] ! $self item BASE2 line $xyc -fill [look objectframe2] } def* ObjectBox draw {} { super io_draw $self if {[$self selected?]} {set frcol [look objectframe4]} {set frcol [look objectframe3]} set c .$(a)canvas.c ! $c itemconfigure ${self}BASE -outline $frcol -dash [if {$@valid} {list 8 8 8 8} {list}] ! if {$@isnew} {$self edit} ;# why this here ? ! catch {$c raise ${self}TEXT $self} ;# shouldn't this be in $self edit ? ! $self draw_wires ;# why this here ? } ! def TextBox unedit {} { if {!$@edit} {return} set @edit 0 *************** *** 1622,1628 **** $self erase after 1 "destroy $t" - #--------------------------------------- label completion #after 1 "destroy $propose" - #--------------------------------------- set l {} foreach char [split $@text ""] {lappend l [scan $char %c]} --- 1622,1626 ---- *************** *** 1661,1671 **** foreach x $born { ! if {[info exists _($x:valid)]} { ! $x subscribe $self; $x changed; $x canvas= $self } else { ! puts "$x not been borned yet............." ! set @unborn [lappend @unborn $x]} } - set dead [lwithout $@children $children] foreach x $dead {$x unsubscribe $self; $x erase} --- 1659,1668 ---- foreach x $born { ! if {[info exists _($x:_class)]} { ! $x subscribe $self; $x changed; $x canvas= $self } else { ! puts "$x not born yet" ! set @unborn [lappend @unborn $x]} } set dead [lwithout $@children $children] foreach x $dead {$x unsubscribe $self; $x erase} *************** *** 1795,1799 **** } ! def* View position= {xy1} {mset [list @x1 @y1] $xy1} def View move {dx dy} { --- 1792,1796 ---- } ! def View position= {xy1} {mset [list @x1 @y1] $xy1} def View move {dx dy} { *************** *** 2976,2980 **** set classinfo(canvas) Canvas set classinfo(cnv) Cnv ! set classinfo(comment) Comment set classinfo(floatatom) FloatAtom set classinfo(symbolatom) SymbolAtom --- 2973,2978 ---- set classinfo(canvas) Canvas set classinfo(cnv) Cnv ! #set classinfo(comment) Comment ! set classinfo(text) Comment set classinfo(floatatom) FloatAtom set classinfo(symbolatom) SymbolAtom *************** *** 3022,3029 **** $self noutlets= $noutlets switch -- $class { obj {$self text= [join [lrange $mess 4 end]]} msg {$self text= [join [lrange $mess 4 end]]} - floatatom {$self text= [lindex $d 4]} - symbolatom {$self text= [lindex $d 4]} text {$self text= [join [lrange $mess 4 end]]} restore {$self text= [join [lrange $mess 4 end]]} --- 3020,3027 ---- $self noutlets= $noutlets switch -- $class { + floatatom {} + symbolatom {} obj {$self text= [join [lrange $mess 4 end]]} msg {$self text= [join [lrange $mess 4 end]]} text {$self text= [join [lrange $mess 4 end]]} restore {$self text= [join [lrange $mess 4 end]]} *************** *** 3133,3142 **** set @xs $@w set @ys $@w - set @edit 0 set @text "" } ! def* MessageBox draw {} { ! $self update_size mset {x1 y1} [$self xy] set x2 [expr $x1+$@xs] --- 3131,3138 ---- set @xs $@w set @ys $@w set @text "" } ! def* MessageBox draw_box {} { mset {x1 y1} [$self xy] set x2 [expr $x1+$@xs] *************** *** 3145,3148 **** --- 3141,3148 ---- [expr $x2+4] $y2 $x1 $y2 $x2 $y2 $x1 $y2] $self item BASE polygon $points -fill [look objectbg] -outline [look objectframe3] + } + + def* MessageBox draw {} { + super io_draw $self if {[$self selected?]} {set frcol [look objectframe4]} {set frcol [look objectframe3]} *************** *** 3156,3175 **** } - def* MessageBox unedit {} { - if {!$@edit} {return} - set @edit 0 - set c .$(a)canvas.c - set t $c.${self}text - set @text [$t get 1.0 1.end] - #$self delete - $self selected?= 0 - after 1 "destroy $t" - set l {} - foreach char [split $@text ""] {lappend l [scan $char %c]} - pd .$@canvas text_setto !$self $l - $self draw - focus $c - } - def* MessageBox click {x y b f} { $self bang 1 --- 3156,3159 ---- *************** *** 3206,3211 **** def* AtomBox draw {} { global font ! $self update_size ! $self draw_box mset {x1 y1} [$self xy] --- 3190,3194 ---- def* AtomBox draw {} { global font ! super mset {x1 y1} [$self xy] *************** *** 3224,3232 **** } - #class_new Comment {View} class_new Comment {TextBox} ! def* Comment draw {} { super ! # should draw uh... } --- 3207,3227 ---- } class_new Comment {TextBox} ! ! def* Comment init {} { super ! } ! ! def Comment draw_box {} { ! super ! mset {x1 y1} [$self xy] ! set x2 [expr $x1+$@xs] ! set y2 [expr $y1+$@ys] ! set xya [list $x1 $y1 $x2 $y2] ! set xyb [l+ [list $x2 $y1 $x1 $y1 $x1 $y2] [list -1 +1 +1 +1 +1 -1]] ! set xyc [l+ [list $x2 $y1 $x2 $y2 $x1 $y2] [list -1 +1 -1 -1 +1 -1]] ! $self item BASE rectangle $xya -fill [look commentbg] ! $self item BASE1 line $xyb -fill [look commentframe1] ! $self item BASE2 line $xyc -fill [look commentframe2] } *************** *** 3543,3547 **** set @clickpos {} set @key_input 0 - set @edit 0 #set @isnew 1 } --- 3538,3541 ---- *************** *** 3549,3559 **** def* FloatAtom init {args} { eval [concat [list super] $args] ! #set @text 0 ! pd .$self set $@text } def SymbolAtom init {args} { eval [concat [list super] $args] ! set @text "" } --- 3543,3552 ---- def* FloatAtom init {args} { eval [concat [list super] $args] ! set @text 0 } def SymbolAtom init {args} { eval [concat [list super] $args] ! set @text "symbol" } *************** *** 5454,5463 **** color canvasbgrun subsection object_color color objectframe1 color objectframe2 color objectframe3 color objectframe4 ! color objectbg ! color objectfg subsection wire_color color wirefg --- 5447,5462 ---- color canvasbgrun subsection object_color + color objectbg + color objectfg color objectframe1 color objectframe2 color objectframe3 color objectframe4 ! color commentbg ! color commentfg ! color commentframe1 ! color commentframe2 ! color commentframe3 ! color commentframe4 subsection wire_color color wirefg

1 0

pd/src desire.tk, 1.1.2.302, 1.1.2.303 desire.c, 1.1.2.98, 1.1.2.99
by Mathieu Bouchard 08 Aug '06

08 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23628 Modified Files: Tag: devel_0_39 desire.tk desire.c Log Message: reimplemented window close Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.302 retrieving revision 1.1.2.303 diff -C2 -d -r1.1.2.302 -r1.1.2.303 *** desire.tk 8 Aug 2006 19:52:47 -0000 1.1.2.302 --- desire.tk 8 Aug 2006 21:15:16 -0000 1.1.2.303 *************** *** 174,178 **** global poolset if {[info exists poolset($origin)]} { ! post %s "def Manager notice: double dirty" # nothing for now } { --- 174,178 ---- global poolset if {[info exists poolset($origin)]} { ! # post %s "def Manager notice: double dirty" # nothing for now } { *************** *** 193,196 **** --- 193,201 ---- } + def History can_undo? {} {return [expr [llength @undo] > 0]} + def History can_redo? {} {return [expr [llength @redo] > 0]} + def History next_undo_name {} {return stuff} + def History next_redo_name {} {return stuff} + # overload this if you want to control how many levels # of undo may be kept. *************** *** 477,480 **** --- 482,487 ---- set ctrls_meter_on 0 + def Client window {} {return .} + def Client init_binds {} { global OS *************** *** 699,707 **** } def Client open_file {} { ! global pd_opendir set filename [tk_getOpenFile -defaultextension .pd \ ! -filetypes { {{pd files} {.pd}} {{max files} {.pat}}} \ ! -initialdir $pd_opendir] if {$filename != ""} {$self open_file_really $filename} } --- 706,719 ---- } + set patch_filetypes { + {"pd files" ".pd"} + {"max files" ".pat"} + {"all files" "*"} + } + def Client open_file {} { ! global pd_opendir patch_filetypes set filename [tk_getOpenFile -defaultextension .pd \ ! -filetypes $patch_filetypes -initialdir $pd_opendir] if {$filename != ""} {$self open_file_really $filename} } *************** *** 957,963 **** class_new Canvas {Menuable ObjectBox} ! #def Canvas close {} {pd $self menuclose 0} ! def* Canvas save {} { ! $self checkgeometry if {[string length $@file]} { pd .$self savetofile $@file $@directory --- 969,982 ---- class_new Canvas {Menuable ObjectBox} ! def Canvas close {} { ! switch [tk_messageBox -message [say savechanges?] -icon question -type yesnocancel -default cancel] { ! yes {$self save; pd .$self close} ! no { pd .$self close} ! cancel {} ! } ! } ! ! def Canvas save {} { ! $self checkgeometry if {[string length $@file]} { pd .$self savetofile $@file $@directory *************** *** 967,978 **** } - def Canvas save_as {} { $self checkgeometry ! set types { ! {{Pd Files} {.pd} } ! {{All Files} * } ! } ! set filename [tk_getSaveFile -filetypes $types] if {$filename != ""} { set @file [string range $filename [expr [string last / $filename]+1] end] --- 986,993 ---- } def Canvas save_as {} { + global patch_filetypes $self checkgeometry ! set filename [tk_getSaveFile -filetypes $patch_filetypes] if {$filename != ""} { set @file [string range $filename [expr [string last / $filename]+1] end] *************** *** 983,988 **** } - - def Canvas print {} { set filename [tk_getSaveFile -initialfile pd.ps -defaultextension .ps \ --- 998,1001 ---- *************** *** 1099,1108 **** } ! def* Canvas getscroll {args} {} ! def Canvas close {} { ! pd .$self menuclose 0 ! $self fix_window_menu ! } #-----------------------------------------------------------------------------------# --- 1112,1118 ---- } ! def Canvas getscroll {args} {} ! def Canvas window {} {return .$self} #-----------------------------------------------------------------------------------# *************** *** 1351,1365 **** # LATER also cut/copy/paste def Canvas fix_edit_menu {} { - return ;# hehe set e .$self.m.edit set t [say undo] ! if {[llength $@undo]} { ! $e entryconfigure $t -state normal -label "$t [$@history undoaction]" } else { $e entryconfigure $t -state disabled -label "[say cannot] $t" } set t [say redo] ! if {[llength $@redo]} { ! $e entryconfigure $t -state normal -label "$t [$@history redoaction]" } else { $e entryconfigure $t -state disabled -label "[say cannot] $t" --- 1361,1374 ---- # LATER also cut/copy/paste def Canvas fix_edit_menu {} { set e .$self.m.edit set t [say undo] ! if {[$@history can_undo?]} { ! $e entryconfigure $t -state normal -label "$t [$@history next_undo_name]" } else { $e entryconfigure $t -state disabled -label "[say cannot] $t" } set t [say redo] ! if {[$@history can_redo?]} { ! $e entryconfigure $t -state normal -label "$t [$@history next_redo_name]" } else { $e entryconfigure $t -state disabled -label "[say cannot] $t" *************** *** 1373,1378 **** set menu $(a)menubar.window $menu delete 0 end ! # {"parentwindow" {menu_windowparent} ""} ! foreach w $window_list {$menu add command -label $w -command "$w raise"} } --- 1382,1387 ---- set menu $(a)menubar.window $menu delete 0 end ! foreach w $window_list {$menu add command -label [wm title [$w window]] -command "$w raise"} ! # {"parentwindow" {menu_windowparent} ""} } *************** *** 3526,3532 **** def* AtomBox init {args} { - super global font ! eval [concat [list super] $args] set @clicking 0 set @val 0 --- 3535,3540 ---- def* AtomBox init {args} { global font ! super set @clicking 0 set @val 0 Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.98 retrieving revision 1.1.2.99 diff -C2 -d -r1.1.2.98 -r1.1.2.99 *** desire.c 8 Aug 2006 19:52:47 -0000 1.1.2.98 --- desire.c 8 Aug 2006 21:15:16 -0000 1.1.2.99 *************** *** 2817,2894 **** } ! /* quit, after calling glist_finddirty() on all toplevels and verifying ! the user really wants to discard changes */ ! void glob_verifyquit(void *dummy, t_floatarg f) ! { ! t_glist *g, *g2; ! /* find all root canvases */ ! for (g = canvas_list; g; g = g->gl_next) ! if ((g2 = glist_finddirty(g))) ! { ! canvas_vis(g2, 1); ! sys_vgui( ! "pdtk_check {Discard changes to this window??} {.x%lx menuclose 3;\n} no\n", ! (long) g2); ! return; ! } ! if (f == 0) ! sys_vgui("pdtk_check {really quit?} {pd quit;\n} yes\n"); ! else glob_quit(0); ! } ! ! /* close a window (or possibly quit Pd), checking for dirty flags. ! The "force" parameter is interpreted as follows: ! 0 - request from GUI to close, verifying whether clean or dirty ! 1 - request from GUI to close, no verification ! 2 - verified - mark this one clean, then continue as in 1 ! 3 - verified - mark this one clean, then verify-and-quit ! */ ! void canvas_menuclose(t_canvas *x, t_floatarg fforce) ! { ! int force = fforce; ! t_glist *g; ! if (x->gl_owner && (force == 0 || force == 1)) ! canvas_vis(x, 0); /* if subpatch, just invis it */ ! else if (force == 0) ! { ! g = glist_finddirty(x); ! if (g) ! { ! canvas_vis(g, 1); ! sys_vgui( ! "pdtk_check {Discard changes to this window??} {.x%lx menuclose 2;\n} no\n", ! (long)g); ! return; ! } ! else ! { ! sys_vgui( ! "pdtk_check {Close this window??} {.x%lx menuclose 1;\n} yes\n", ! (long)x); ! } ! } ! else if (force == 1) ! pd_free(&x->gl_pd); ! else if (force == 2) ! { ! canvas_dirty(x, 0); ! while (x->gl_owner) ! x = x->gl_owner; ! g = glist_finddirty(x); ! if (g) ! { ! canvas_vis(g, 1); ! sys_vgui( ! "pdtk_check {Discard changes to this window??} {.x%lx menuclose 2;\n} no\n", ! (long)g); ! return; ! } ! else pd_free(&x->gl_pd); ! } ! else if (force == 3) ! { ! canvas_dirty(x, 0); ! glob_verifyquit(0, 1); ! } } --- 2817,2822 ---- } ! void canvas_close(t_canvas *x) { ! if (x->gl_owner) canvas_vis(x, 0); else pd_free(&x->gl_pd); } *************** *** 12701,12705 **** class_addmethod3(c,canvas_key,"key","*"); ! class_addmethod3(c,canvas_menuclose,"menuclose","F"); /* should die: */ --- 12629,12633 ---- class_addmethod3(c,canvas_key,"key","*"); ! class_addmethod3(c,canvas_close,"close","F"); /* should die: */ *************** *** 12958,12962 **** for (x = canvas_list; x; ) { y = x->gl_next; ! canvas_menuclose(x, fforce); /* forced closing of this root canvas */ x = y; } --- 12886,12890 ---- for (x = canvas_list; x; ) { y = x->gl_next; ! canvas_close(x); /* forced closing of this root canvas */ x = y; }

1 0

pd/src desire.c, 1.1.2.97, 1.1.2.98 desire.tk, 1.1.2.301, 1.1.2.302
by Mathieu Bouchard 08 Aug '06

08 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24707 Modified Files: Tag: devel_0_39 desire.c desire.tk Log Message: Window menu Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.301 retrieving revision 1.1.2.302 diff -C2 -d -r1.1.2.301 -r1.1.2.302 *** desire.tk 8 Aug 2006 18:15:38 -0000 1.1.2.301 --- desire.tk 8 Aug 2006 19:52:47 -0000 1.1.2.302 *************** *** 511,515 **** .mbar add cascade -label [say $t] -menu [menu .mbar.$t -tearoff $pd_tearoff] } ! .mbar.window configure -postcommand fixwindowmenu foreach z {in out} { set f .controls.$z --- 511,515 ---- .mbar add cascade -label [say $t] -menu [menu .mbar.$t -tearoff $pd_tearoff] } ! .mbar.window configure -postcommand "$self fix_window_menu" foreach z {in out} { set f .controls.$z *************** *** 666,681 **** proc pdtk_watchdog {} {pd pd ping; after 2000 {pdtk_watchdog}} - set menu_windowlist {} - - proc pdtk_fixwindowmenu {} {fixwindowmenu} - proc fixwindowmenu {} { - global menu_windowlist - .mbar.window delete 0 end - foreach {i j} $menu_windowlist { - .mbar.window add command -label $i -command "menu_domenuwindow [lindex $i 1]]" - menu_fixwindowmenu $j - } - } - proc accel_munge {acc} { global OS --- 666,669 ---- *************** *** 698,701 **** --- 686,690 ---- eval [concat [list super] $args] set @accel {} + set @menubar .$self.m } *************** *** 710,717 **** } - set main [Client new] - $main init_controls - $main init_binds - def Client open_file {} { global pd_opendir --- 699,702 ---- *************** *** 782,786 **** } ! $main init_menus def* Menuable eval% {code} { --- 767,779 ---- } ! def Client init {} { ! super ! set @menubar .mbar ! $self init_controls ! $self init_binds ! $self init_menus ! } ! ! set main [Client new] def* Menuable eval% {code} { *************** *** 1120,1124 **** def* Canvas init {x1 y1 xs ys args} { ! global pd_opendir pd_tearoff OS cmdline canvas history manager super # those four are not to be confused with other @variables of the same name. --- 1113,1118 ---- def* Canvas init {x1 y1 xs ys args} { ! global pd_opendir pd_tearoff OS cmdline canvas history manager window_list ! lappend window_list $self super # those four are not to be confused with other @variables of the same name. *************** *** 1194,1197 **** --- 1188,1198 ---- } + def Canvas _delete {} { + global window_list + set wl {} + foreach w $window_list {if {$w != $self} {lappend wl $w}} + set window_list $wl + } + def Canvas focus {} {return $@focus} def Canvas focus= {o} {set @focus $o} *************** *** 1321,1326 **** Graph Array} $self populate_menu window {{}} - # {"parentwindow" {menu_windowparent} ""} - # {"Pdwindow" {menu_pop_pd} ""} $m.edit add checkbutton -label [say edit_mode] \ --- 1322,1325 ---- *************** *** 1333,1337 **** } $m.edit configure -postcommand "$self fix_edit_menu" ! $m.window configure -postcommand "menu_fixwindowmenu" foreach x {file edit view find put media window help} { --- 1332,1336 ---- } $m.edit configure -postcommand "$self fix_edit_menu" ! $m.window configure -postcommand "$self fix_window_menu" foreach x {file edit view find put media window help} { *************** *** 1368,1371 **** --- 1367,1380 ---- } + set window_list [list $main] + + def Menuable fix_window_menu {} { + global window_list + set menu $(a)menubar.window + $menu delete 0 end + # {"parentwindow" {menu_windowparent} ""} + foreach w $window_list {$menu add command -label $w -command "$w raise"} + } + #-----------------------------------------------------------------------------------# #this just tells whether an object is part of the selection, that is, what usually *************** *** 2693,2697 **** #-----------------------------------------------------------------------------------# ! def* Canvas keyup {x y key iso shift} { set canvas .$self.c if {$shift} { --- 2702,2706 ---- #-----------------------------------------------------------------------------------# ! def Canvas keyup {x y key iso shift} { set canvas .$self.c if {$shift} { *************** *** 5705,5709 **** pack [label .$self.title -text "DesireData 0.39.A.0" -font {helvetica 24}] -side top pack [label .$self.date -text "released on 2006.07.??"] -side top ! pack [text .$self.text -yscrollcommand ".$self.scroll set"] -side left pack [scrollbar .$self.scroll -command ".$self.text yview"] -side right -fill y #12345678901234567890123456789012345678901234567890123456789012345678901 <- 72 chars --- 5714,5719 ---- pack [label .$self.title -text "DesireData 0.39.A.0" -font {helvetica 24}] -side top pack [label .$self.date -text "released on 2006.07.??"] -side top ! pack [text .$self.text -yscrollcommand ".$self.scroll set" -width 72 ! ] -side left -fill both -expand yes pack [scrollbar .$self.scroll -command ".$self.text yview"] -side right -fill y #12345678901234567890123456789012345678901234567890123456789012345678901 <- 72 chars Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.97 retrieving revision 1.1.2.98 diff -C2 -d -r1.1.2.97 -r1.1.2.98 *** desire.c 7 Aug 2006 16:41:49 -0000 1.1.2.97 --- desire.c 8 Aug 2006 19:52:47 -0000 1.1.2.98 *************** *** 293,334 **** static t_atom *canvas_newargv; - static void glist_doupdatewindowlist(t_glist *gl, char *sbuf) - { - t_gobj *g; - if (!gl->gl_owner) - { - /* this is a canvas; if we have a window, put on "windows" list */ - t_canvas *canvas = (t_canvas *)gl; - if (canvas->gl_havewindow) - { - if (strlen(sbuf) + strlen(gl->gl_name->s_name) + 100 <= 1024) - { - char tbuf[1024]; - sprintf(tbuf, "{%s .x%lx} ", gl->gl_name->s_name, - (t_int)canvas); - strcat(sbuf, tbuf); - } - } - } - glist_each(g,gl) { - if (pd_class(&g->g_pd) == canvas_class) - glist_doupdatewindowlist((t_glist *)g, sbuf); - } - } - - /* maintain the list of visible toplevels for the GUI's "windows" menu */ - void canvas_updatewindowlist( void) - { - t_canvas *x; - char sbuf[1024]; - strcpy(sbuf, "set menu_windowlist {"); - /* find all root canvases */ - for (x = canvas_list; x; x = x->gl_next) - glist_doupdatewindowlist(x, sbuf); - /* next line updates the window menu state before -postcommand tries it */ - strcat(sbuf, "}\npdtk_fixwindowmenu\n"); - sys_gui(sbuf); - } - /* add a glist the list of "root" canvases (toplevels without parents.) */ static void canvas_addtolist(t_canvas *x) { --- 293,296 ---- *************** *** 893,897 **** canvas_reflecttitle(x); x->gl_havewindow = 1; - canvas_updatewindowlist(); post("******subscribe %lx",(long)x); gobj_subscribe((t_gobj *)x,(t_gobj *)manager); --- 855,858 ---- *************** *** 928,932 **** if (glist_isvisible(gl2)) gobj_vis(&x->gl_gobj, gl2, 1); } else x->gl_havewindow = 0; - canvas_updatewindowlist(); } } --- 889,892 ---- *************** *** 11374,11380 **** canvas_restoreconnections(glist_getcanvas(glist)); } - if (natom2 >= 1 && vec2[0].a_type == A_SYMBOL - && !strcmp(vec2[0].a_w.w_symbol->s_name, "pd")) - canvas_updatewindowlist(); } else binbuf_text(x->te_binbuf, buf, bufsize); --- 11334,11337 ---- *************** *** 12691,12695 **** void canvas_notice(t_gobj *x, struct _gobj *origin, int argc, t_atom *argv) { t_canvas *self = (t_canvas *)x; ! post("canvas_notice(%p,%p,%d,...): havewindow=%d mapped=%d",x,origin,argc,self->gl_havewindow,self->gl_mapped); gobj_changed3(self,origin,argc,argv); } --- 12648,12653 ---- void canvas_notice(t_gobj *x, struct _gobj *origin, int argc, t_atom *argv) { t_canvas *self = (t_canvas *)x; ! /*post("canvas_notice(%p,%p,%d,...): havewindow=%d mapped=%d", ! x,origin,argc,self->gl_havewindow,self->gl_mapped);*/ gobj_changed3(self,origin,argc,argv); }

1 0

pd/src desire.tk,1.1.2.300,1.1.2.301
by Mathieu Bouchard 08 Aug '06

08 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20124 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed console posting so that Zexy's splash doesn't splash over a few pages Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.300 retrieving revision 1.1.2.301 diff -C2 -d -r1.1.2.300 -r1.1.2.301 *** desire.tk 8 Aug 2006 17:45:36 -0000 1.1.2.300 --- desire.tk 8 Aug 2006 18:15:38 -0000 1.1.2.301 *************** *** 579,583 **** if {[fblocked $sock]} {break} if {[string first pdtk_post $cmd]!=0} {puts "-> $cmd"} ! set sock_lobby "$sock_lobby\n$cmd" if {[catch {eval $sock_lobby}]} { global errorCode errorInfo --- 579,583 ---- if {[fblocked $sock]} {break} if {[string first pdtk_post $cmd]!=0} {puts "-> $cmd"} ! append sock_lobby "\n$cmd" if {[catch {eval $sock_lobby}]} { global errorCode errorInfo *************** *** 655,659 **** ################ utility functions ######################### ! proc pdtk_post {s} {regsub -- "\n$" $s "" s; post %s $s} proc enquote {x} { --- 655,659 ---- ################ utility functions ######################### ! proc pdtk_post {s} {post_to_gui $s} proc enquote {x} { *************** *** 5679,5683 **** } ! def* ClientClassTreeDialog scroll {args} { set w .$self.1.1 set zy [winfo height $w] --- 5679,5683 ---- } ! def ClientClassTreeDialog scroll {args} { set w .$self.1.1 set zy [winfo height $w] *************** *** 5768,5771 **** } ! Thing post_hierarchy --- 5768,5771 ---- } ! # Thing post_hierarchy

1 0

pd/src desire.tk,1.1.2.299,1.1.2.300
by Mathieu Bouchard 08 Aug '06

08 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8164 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed multiline problem when reading from socket. cleanup. Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.299 retrieving revision 1.1.2.300 diff -C2 -d -r1.1.2.299 -r1.1.2.300 *** desire.tk 8 Aug 2006 16:41:59 -0000 1.1.2.299 --- desire.tk 8 Aug 2006 17:45:36 -0000 1.1.2.300 *************** *** 579,586 **** if {[fblocked $sock]} {break} if {[string first pdtk_post $cmd]!=0} {puts "-> $cmd"} ! if {[catch {eval $sock_lobby$cmd}]} { global errorCode errorInfo switch -regexp -- $errorInfo { ! "^missing close-brace" {set sock_lobby $sock_lobby$cmd; continue} } regsub -all " invoked from within\n" $errorInfo "" errorInfo --- 579,587 ---- if {[fblocked $sock]} {break} if {[string first pdtk_post $cmd]!=0} {puts "-> $cmd"} ! set sock_lobby "$sock_lobby\n$cmd" ! if {[catch {eval $sock_lobby}]} { global errorCode errorInfo switch -regexp -- $errorInfo { ! "^missing close-brace" {continue} } regsub -all " invoked from within\n" $errorInfo "" errorInfo *************** *** 5522,5542 **** } - #while {$i < [llength $contents]} { - # set op [lindex $contents $i] - # puts "op=$op" - # if {[string length $op]==0} {break} - # if {![info exists ddrc_options_h($op)]} { - # error "unknown option: $op" - # } - # foreach {type name} $ddrc_options_h($op) {} - # switch $type { - # folders {incr i; lappend @$name [lindex $contents $i]} - # files {incr i; lappend @$name [lindex $contents $i]} - # void {set @$name 1} - # color { puts "reading colors $name" } - # default {incr i; set @$name [lindex $contents $i]} - # } - # incr i - #} } --- 5523,5526 ---- *************** *** 5547,5558 **** #puts "fd ===== $fd" foreach {type name} $ddrc_options { - #puts "type::: $type || name:: $name" - - #set v $@$name - #set op [lindex [split $name |] 0] switch $type { - #folders {foreach x $v {puts $fd "$op $x"}} - #files {foreach x $v {puts $fd "$op $x"}} - #void {if {[string length $v]} {if {$v} {puts $fd $op}}} color { set var ${name}path --- 5531,5535 ---- *************** *** 5568,5587 **** if {$key($item) != $new_key} { if {[dict exists $accels $old_key]} { ! set cmd [dict get $accels $old_key] ! set accels [dict remove $accels $old_key] ! dict set accels $new_key $cmd ! puts "$new_key ::: $cmd" } } if {[dict exists $check_key $new_key] && $new_key != ""} { ! error "$new_key already assigned" ! #dict set check_key $new_key key($item) } else {dict set check_key $new_key key($item)} ! set key($item) $new_key ! puts $fd "$type $item $new_key" } } - #default {if {[string length $v]} {puts $fd "$op $v"}} } } --- 5545,5563 ---- if {$key($item) != $new_key} { if {[dict exists $accels $old_key]} { ! set cmd [dict get $accels $old_key] ! set accels [dict remove $accels $old_key] ! dict set accels $new_key $cmd ! puts "$new_key ::: $cmd" } } if {[dict exists $check_key $new_key] && $new_key != ""} { ! error "$new_key already assigned" ! #dict set check_key $new_key key($item) } else {dict set check_key $new_key key($item)} ! set key($item) $new_key ! puts $fd "$type $item $new_key" } } } }

1 0

pd/src desire.tk,1.1.2.298,1.1.2.299
by Mathieu Bouchard 08 Aug '06

08 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16436 Modified Files: Tag: devel_0_39 desire.tk Log Message: removed "ok" arg in properties_dialog and more bug fixing of pdrc read/write Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.298 retrieving revision 1.1.2.299 diff -C2 -d -r1.1.2.298 -r1.1.2.299 *** desire.tk 8 Aug 2006 16:22:47 -0000 1.1.2.298 --- desire.tk 8 Aug 2006 16:41:59 -0000 1.1.2.299 *************** *** 3317,3321 **** foreach prop [lrange $fields($class) 5 end] { - #puts "prop ::: $prop" switch $prop { w {set d [list $prop [say $prop] integer {-width 7}]} --- 3317,3320 ---- *************** *** 3353,3357 **** default {set d [list $prop "huh, [say $prop]" integer {}]} } ! properties_dialog $self .$self iemgui_ok $d } --- 3352,3356 ---- default {set d [list $prop "huh, [say $prop]" integer {}]} } ! properties_dialog $self .$self $d } *************** *** 3372,3376 **** yscale "Y units/px: " entry {-width 10} } ! properties_dialog $self .$self canvas_ok $props pack [checkbutton .$self.graphme -text "graph on parent" \ -variable @graphme -anchor w] -side top --- 3371,3375 ---- yscale "Y units/px: " entry {-width 10} } ! properties_dialog $self .$self $props pack [checkbutton .$self.graphme -text "graph on parent" \ -variable @graphme -anchor w] -side top *************** *** 3433,3437 **** wm title .$self "Atom" global properties ! properties_dialog $self .$self dogatom_ok $properties(gatom) foreach name {hi lo width} { bind .$self.$name.entry <KeyPress-Return> "$self ok" --- 3432,3436 ---- wm title .$self "Atom" global properties ! properties_dialog $self .$self $properties(gatom) foreach name {hi lo width} { bind .$self.$name.entry <KeyPress-Return> "$self ok" *************** *** 3465,3469 **** pack [label .$self.label -text "GRAPH BOUNDS"] -side top global properties ! properties_dialog $self .$self graph_ok $properties(graph) #.$self.xrangef.x2 select from 0 #.$self.xrangef.x2 select adjust end --- 3464,3468 ---- pack [label .$self.label -text "GRAPH BOUNDS"] -side top global properties ! properties_dialog $self .$self $properties(graph) #.$self.xrangef.x2 select from 0 #.$self.xrangef.x2 select adjust end *************** *** 3491,3495 **** n "size: " entry {} } ! properties_dialog $self .$self array_ok $props pack [checkbutton .$self.saveme -text "save contents" -variable @saveit -anchor w] -side top --- 3490,3494 ---- n "size: " entry {} } ! properties_dialog $self .$self $props pack [checkbutton .$self.saveme -text "save contents" -variable @saveit -anchor w] -side top *************** *** 4807,4811 **** } ! proc properties_dialog {self w ok struct} { #puts "self::: $self" #puts "w::: $w" --- 4806,4810 ---- } ! proc properties_dialog {self w struct} { #puts "self::: $self" #puts "w::: $w" *************** *** 4936,4943 **** pack $f.b -side top ! } libraries { ! set no_max_label 1 ! frame $f frame $f.a pack [label $f.label -text $label -width 20 -anchor e] -side left --- 4935,4942 ---- pack $f.b -side top ! } libraries { ! set no_max_label 1 ! frame $f frame $f.a pack [label $f.label -text $label -width 20 -anchor e] -side left *************** *** 4991,4995 **** eval "entry $f.entry -textvariable _($self:$name) $options" pack $f.entry -side left ! bind $f.entry <Return> "$ok $self" switch -regexp -- $type { integer|float|fontsize { --- 4990,4994 ---- eval "entry $f.entry -textvariable _($self:$name) $options" pack $f.entry -side left ! bind $f.entry <Return> "$self ok" switch -regexp -- $type { integer|float|fontsize { *************** *** 5321,5334 **** def ServerPrefsDialog apply {} {$self write} ! def* ServerPrefsDialog read {} { ! global pdrc_options pdrc_options_h cmdline ! set fd [open $cmdline(rcfilename) "RDONLY CREAT"] ! #set contents [split [string map {"\n" " "} [read $fd]] " "] ! set contents {} ! foreach line [split [read $fd] "\n"] { ! if {[string index $line 0] != "#"} {lappend contents $line} ! } ! close $fd ! set contents [concat [join $contents " "]] ;# concat casts to list type (faster) foreach {type names} $pdrc_options { switch $type { --- 5320,5325 ---- def ServerPrefsDialog apply {} {$self write} ! def* ServerPrefsDialog init_reverse_hash {} { ! global pdrc_options pdrc_options_h foreach {type names} $pdrc_options { switch $type { *************** *** 5341,5349 **** } } set i 0 while {$i < [llength $contents]} { set op [lindex $contents $i] - puts "op ::: $op" if {[string length $op]==0} {break} if {![info exists pdrc_options_h($op)]} { --- 5332,5350 ---- } } + } + + def* ServerPrefsDialog read {} { + global pdrc_options pdrc_options_h cmdline + set fd [open $cmdline(rcfilename) "RDONLY CREAT"] + set contents {} + foreach line [split [read $fd] "\n"] { + if {[string index $line 0] != "#"} {lappend contents $line} + } + close $fd + set contents [concat [join $contents " "]] ;# concat casts to list type (faster) set i 0 while {$i < [llength $contents]} { set op [lindex $contents $i] if {[string length $op]==0} {break} if {![info exists pdrc_options_h($op)]} { *************** *** 5379,5384 **** #files {foreach item $v {puts $fd "$name $item"}} void {if {$v != ""} {if {$v} {puts $fd $name}}} ! #radio {if {$v} {set t [lindex $names $v]; puts [split $t |]}} ! radio {puts $fd "$v"} default {if {[string length $v]} {puts $fd "$name $v"}} } --- 5380,5384 ---- #files {foreach item $v {puts $fd "$name $item"}} void {if {$v != ""} {if {$v} {puts $fd $name}}} ! radio {if {$v != "" && $v != "default"} {puts $fd "$v"}} default {if {[string length $v]} {puts $fd "$name $v"}} } *************** *** 5391,5394 **** --- 5391,5395 ---- def* ServerPrefsDialog init {} { global pdrc_options + $self init_reverse_hash $self read super *************** *** 5397,5409 **** foreach {type names} $pdrc_options { ! set label "" ! if {[llength $names] > 1} { ! set label [say [lindex $names 0]] ! puts "label::::: $label" ! } else { ! set name [lindex [split $names |] 0] ! set label [say $name] ! } ! if {[string length $label] > $@max_label} {set @max_label [string length $label]} } puts "max_label:::: $@max_label" --- 5398,5409 ---- foreach {type names} $pdrc_options { ! set label "" ! if {[llength $names] > 1} { ! set label [say [lindex $names 0]] ! } else { ! set name [lindex [split $names |] 0] ! set label [say $name] ! } ! if {[string length $label] > $@max_label} {set @max_label [string length $label]} } puts "max_label:::: $@max_label" *************** *** 5418,5437 **** foreach subname $names {lappend babble [lindex [split $subname |] 0]} puts "babble :::: $babble" ! properties_dialog $self $f.main.$section ServerPrefsDialog_ok \ ! [list $name $names choice {}] ! } ! folders { ! properties_dialog $self $f.main.$section ServerPrefsDialog_ok \ ! [list $name [say $name] $type {}] ! } ! libraries { ! properties_dialog $self $f.main.$section ServerPrefsDialog_ok \ ! [list $name [say $name] $type {}] ! } ! default { ! properties_dialog $self $f.main.$section ServerPrefsDialog_ok \ ! [list $name [say $name] $type {}] } ! } } --- 5418,5424 ---- foreach subname $names {lappend babble [lindex [split $subname |] 0]} puts "babble :::: $babble" ! properties_dialog $self $f.main.$section [list $name $names choice {}] } ! default {properties_dialog $self $f.main.$section [list $name [say $name] $type {}]} } } *************** *** 5445,5449 **** set ddrc_options { section section_color ! subsection canvas_color color canvasbgedit color canvasbgrun --- 5432,5436 ---- set ddrc_options { section section_color ! subsection canvas_color color canvasbgedit color canvasbgrun *************** *** 5643,5648 **** alias {} radio { ! properties_dialog $self $which_section ClientPrefsDialog_ok \ ! [list [lindex $name 0] "$desc" choice {}] } color { --- 5630,5634 ---- alias {} radio { ! properties_dialog $self $which_section [list [lindex $name 0] "$desc" choice {}] } color { *************** *** 5651,5656 **** set @$var $which_section.$name.color set @$name $look($name) ! properties_dialog $self $which_section ClientPrefsDialog_ok \ ! [list [lindex $name 0] [say $name] color {}] } key { --- 5637,5641 ---- set @$var $which_section.$name.color set @$name $look($name) ! properties_dialog $self $which_section [list [lindex $name 0] [say $name] color {}] } key { *************** *** 5660,5669 **** set @$var $which_section.[string tolower [lindex $name 0]].[string tolower $item] } ! properties_dialog $self $which_section ClientPrefsDialog_ok \ ! [list $name $name $type {}] } default { ! properties_dialog $self $which_section ClientPrefsDialog_ok \ ! [list $name [say $name] $type {}] } } --- 5645,5652 ---- set @$var $which_section.[string tolower [lindex $name 0]].[string tolower $item] } ! properties_dialog $self $which_section [list $name $name $type {}] } default { ! properties_dialog $self $which_section [list $name [say $name] $type {}] } }

1 0

pd/src desire.tk,1.1.2.297,1.1.2.298
by Mathieu Bouchard 08 Aug '06

08 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9272 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed bugs in reading and writing of .pdrc Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.297 retrieving revision 1.1.2.298 diff -C2 -d -r1.1.2.297 -r1.1.2.298 *** desire.tk 8 Aug 2006 10:26:39 -0000 1.1.2.297 --- desire.tk 8 Aug 2006 16:22:47 -0000 1.1.2.298 *************** *** 4944,4954 **** listbox $f.a.list -width 33 -height 10 -yscrollcommand "$f.a.yscroll set" \ -activestyle none -xscrollcommand "$f.a.xscroll set" ! foreach line $_($self:$name) {$f.a.list insert end $line} ! # save the listbox path at _($self:$name) instead ! set _($self:$name) $f.a.list scrollbar $f.a.yscroll -command "$f.a.list yview" scrollbar $f.a.xscroll -command "$f.a.list xview" -orient horizontal ! pack $f.a.xscroll -side bottom -fill x pack $f.a.list -side left -fill both -expand 1 pack $f.a.yscroll -side left -fill y --- 4944,4955 ---- listbox $f.a.list -width 33 -height 10 -yscrollcommand "$f.a.yscroll set" \ -activestyle none -xscrollcommand "$f.a.xscroll set" ! #foreach line $@$name {$f.a.list insert end $line} ! foreach line $_($self:$name) {$f.a.list insert end $line} ;# bug in objective.tcl ! # save the listbox path at @$name instead ! set @$name $f.a.list scrollbar $f.a.yscroll -command "$f.a.list yview" scrollbar $f.a.xscroll -command "$f.a.list xview" -orient horizontal ! pack $f.a.xscroll -side bottom -fill x pack $f.a.list -side left -fill both -expand 1 pack $f.a.yscroll -side left -fill y *************** *** 4960,4966 **** entry $f.b.entry.add -width 15 -borderwidth 5 -relief ridge ! bind $f.b.entry.add <Return> "$self entry_set2listbox $f.a.list $f.b.entry.add" pack $f.b.entry.add -side left ! button $f.b.entry.3 -command "$self entry_set2listbox $f.a.list $f.b.entry.add" -text "add" -width 6 balloon $f.b.entry.3 "add the name you typed to the list" pack $f.b.entry.3 -side left --- 4961,4967 ---- entry $f.b.entry.add -width 15 -borderwidth 5 -relief ridge ! bind $f.b.entry.add <Return> "$self lib_add $f" pack $f.b.entry.add -side left ! button $f.b.entry.3 -command "$self lib_add $f" -text "add" -width 6 balloon $f.b.entry.3 "add the name you typed to the list" pack $f.b.entry.3 -side left *************** *** 5019,5023 **** #catch {$f.label configure -width 45 -anchor e} if {!$no_max_label} { ! catch {$f.label configure -width $_($self:max_label) -anchor e} } } --- 5020,5024 ---- #catch {$f.label configure -width 45 -anchor e} if {!$no_max_label} { ! catch {$f.label configure -width $_($self:max_label) -anchor e} } } *************** *** 5186,5189 **** --- 5187,5191 ---- def PagedDialog dir_select {listbox} { set dir [tk_chooseDirectory -initialdir ~ -title "Choose a directory" -parent .$self] + if {$dir == ""} {return} $listbox insert end $dir $listbox yview end *************** *** 5191,5199 **** } ! def PagedDialog entry_set2listbox {listbox entry} { set var [$entry get] if {$var != ""} {$listbox insert end $var} $listbox yview end ! focus .$self } --- 5193,5204 ---- } ! def PagedDialog lib_add {f} { ! set listbox $f.a.list ! set entry $f.b.entry.add set var [$entry get] if {$var != ""} {$listbox insert end $var} $listbox yview end ! $entry delete 0 end ! focus $entry } *************** *** 5320,5325 **** set fd [open $cmdline(rcfilename) "RDONLY CREAT"] #set contents [split [string map {"\n" " "} [read $fd]] " "] ! set contents [split [read $fd] "\n"] close $fd foreach {type names} $pdrc_options { switch $type { --- 5325,5334 ---- set fd [open $cmdline(rcfilename) "RDONLY CREAT"] #set contents [split [string map {"\n" " "} [read $fd]] " "] ! set contents {} ! foreach line [split [read $fd] "\n"] { ! if {[string index $line 0] != "#"} {lappend contents $line} ! } close $fd + set contents [concat [join $contents " "]] ;# concat casts to list type (faster) foreach {type names} $pdrc_options { switch $type { *************** *** 5334,5339 **** set i 0 ! foreach line $contents { ! foreach {op setting} $line { if {![info exists pdrc_options_h($op)]} { error "unknown option: $op" --- 5343,5350 ---- set i 0 ! while {$i < [llength $contents]} { ! set op [lindex $contents $i] ! puts "op ::: $op" ! if {[string length $op]==0} {break} if {![info exists pdrc_options_h($op)]} { error "unknown option: $op" *************** *** 5341,5371 **** mset {type name} $pdrc_options_h($op) switch $type { ! folders {lappend @$name [lindex $line 1]} ! libraries {lappend @$name [lindex $line 1]} ! files {incr i; lappend @$name [lindex $contents $i]} ! radio {set @$name $line} ! #void {set @$name 1} ! default {set @$name [lindex $contents 1]} ! } } ! } - - #while {$i < [llength $contents]} { - # set op [lindex $contents $i] - # puts "op ::: $op" - # if {[string length $op]==0} {break} - # if {![info exists pdrc_options_h($op)]} { - # error "unknown option: $op" - # } - # mset {type name} $pdrc_options_h($op) - # switch $type { - # folders {incr i; lappend @$name [lindex $contents $i]} - # files {incr i; lappend @$name [lindex $contents $i]} - # void {set @$name 1} - # default {incr i; set @$name [lindex $contents $i]} - # } - # incr i - #} } --- 5352,5364 ---- mset {type name} $pdrc_options_h($op) switch $type { ! folders {incr i; lappend @$name [lindex $contents $i]} ! libraries {incr i; lappend @$name [lindex $contents $i]} ! files {incr i; lappend @$name [lindex $contents $i]} ! radio { set @$name [lindex $contents $i]} ! void { set @$name 1} ! default {incr i; set @$name [lindex $contents $i]} } ! incr i } } *************** *** 5373,5376 **** --- 5366,5370 ---- global pdrc_options pdrc_options_h cmdline set fd [open $cmdline(rcfilename) w] + #set fd stdout; puts "WOULD SAVE:" foreach {type names} $pdrc_options { switch $type { *************** *** 5378,5397 **** default {set name [lindex [split $names |] 0]} } ! set v $@$name switch $type { ! folders {foreach item [$v get 0 [$v size]] {puts $fd "$name $item"}} ! libraries {foreach item [$v get 0 [$v size]] {puts $fd "$name $item"}} ! #files {foreach x $v {puts $fd "$name $x"}} ! #void {if {[string length $v]} {if {$v} {puts $fd $name}}} #radio {if {$v} {set t [lindex $names $v]; puts [split $t |]}} ! radio {puts $fd "$v"} default {if {[string length $v]} {puts $fd "$name $v"}} } } close $fd } def* ServerPrefsDialog default {} { } ! def ServerPrefsDialog init {} { global pdrc_options $self read --- 5372,5393 ---- default {set name [lindex [split $names |] 0]} } ! #set v $@$name ! set v $_($self:$name) ;# bug in objective.tcl ? switch $type { ! folders {foreach item $v {puts $fd "$name $item"}} ! libraries {foreach item $v {puts $fd "$name $item"}} ! #files {foreach item $v {puts $fd "$name $item"}} ! void {if {$v != ""} {if {$v} {puts $fd $name}}} #radio {if {$v} {set t [lindex $names $v]; puts [split $t |]}} ! radio {puts $fd "$v"} default {if {[string length $v]} {puts $fd "$name $v"}} } } close $fd + # puts "THE END" } def* ServerPrefsDialog default {} { } ! def* ServerPrefsDialog init {} { global pdrc_options $self read

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
47
Older →

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