Pd-cvs June 2006

pd-cvs@lists.iem.at

13 participants
225 discussions

pd/src desire.tk,1.1.2.261,1.1.2.262
by chunlee 23 Jun '06

23 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31991 Modified Files: Tag: devel_0_39 desire.tk Log Message: more fixes for floatatom and numbox... Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.261 retrieving revision 1.1.2.262 diff -C2 -d -r1.1.2.261 -r1.1.2.262 *** desire.tk 23 Jun 2006 06:33:27 -0000 1.1.2.261 --- desire.tk 23 Jun 2006 10:04:22 -0000 1.1.2.262 *************** *** 3248,3252 **** eval [concat [list super] $args] set @clicking 0 ! set @buf 0 set @valid 0 set @clickpos {} --- 3248,3253 ---- eval [concat [list super] $args] set @clicking 0 ! set @val 0 ! set @old_val 0 set @valid 0 set @clickpos {} *************** *** 3269,3273 **** set @yt [expr $y1+$ys/2+3+$xs/34] if {[$self selected?]} {set fcol red} else {set fcol $look(objectfg)} ! if {[string length $@buf] <= $@w} { set string $@text } else { --- 3270,3274 ---- set @yt [expr $y1+$ys/2+3+$xs/34] if {[$self selected?]} {set fcol red} else {set fcol $look(objectfg)} ! if {[string length $@val] <= $@w} { set string $@text } else { *************** *** 3285,3307 **** Return { $@canvas focus= "" ! pd .$self set [expr $@buf] pd .$self bang ! set @text $@buf $self selected?= 0 set @clicking 0 } BackSpace { ! set @buf [string range $@buf 0 end-1] ! set @text $@buf $self changed } ! period {append @buf ".";set @text $@buf; $self changed} default { if {[regexp {^[0-9]{1}$} $key]} { ! append @buf $key ! set @text $@buf $self changed } ! if {$key == "minus"} {set @buf "-"; set @text $@buf; $self changed} } --- 3286,3312 ---- Return { $@canvas focus= "" ! pd .$self set [expr $@val] pd .$self bang ! set @text $@val $self selected?= 0 set @clicking 0 + set @old_val $@val + set @key_input 0 } BackSpace { ! set @val [string range $@val 0 end-1] ! set @text $@val $self changed } ! period {if {[string length $@val] < $@w} {append @val ".";set @text $@val; $self changed}} default { if {[regexp {^[0-9]{1}$} $key]} { ! if {[string length $@val] < $@w} { ! append @val $key ! set @text $@val $self changed + } } ! if {$key == "minus"} {set @val "-"; set @text $@val; $self changed} } *************** *** 3333,3337 **** def FloatAtom update_size {} { global font look ! #set @textwidth [expr $font(padx)+$font(width)*[string length $@buf]] if {!$@w} [set @w 5] set @textwidth [expr $font(padx)+$font(width)*$@w] --- 3338,3342 ---- def FloatAtom update_size {} { global font look ! #set @textwidth [expr $font(padx)+$font(width)*[string length $@val]] if {!$@w} [set @w 5] set @textwidth [expr $font(padx)+$font(width)*$@w] *************** *** 3360,3372 **** if {[lindex $@clickpos 0] == $x && [lindex $@clickpos 1] == $y} { $@canvas focus= $self ! #puts "-----> no mouse movement <------" ! set @buf "" set @clicking 0 } { $@canvas focus= "" $self selected?= 0 ! set @text $@buf ! pd .$self set $@buf ! pd .$self bang } } --- 3365,3375 ---- if {[lindex $@clickpos 0] == $x && [lindex $@clickpos 1] == $y} { $@canvas focus= $self ! set @val "" set @clicking 0 + set @key_input 1 } { $@canvas focus= "" $self selected?= 0 ! if {$@key_input} {set @val $@old_val; set @key_input 0; set @text $@val} } } *************** *** 3377,3384 **** if {$@clicking} { mset {ox oy} $@mouse ! set @buf [expr $@buf-$@rate*($y-$oy)] ! set @text $@buf set @mouse [list $x $y] ! pd .$self set $@buf pd .$self bang } --- 3380,3388 ---- if {$@clicking} { mset {ox oy} $@mouse ! set @val [expr $@val-$@rate*($y-$oy)] ! set @text $@val ! set @old_val $@val set @mouse [list $x $y] ! pd .$self set $@val pd .$self bang } *************** *** 3392,3397 **** --- 3396,3404 ---- eval [concat [list super] $args] set @clicking 0 + set @old_val 0 set @buf "" + set @text 0 set @valid 0 + set @key_input 0 } *************** *** 3424,3428 **** $self item BASE polygon $points -fill [parse_color $@bcol] -outline $look(objectframe3) $self item BASE4 polygon $points2 -fill $color4 -outline $look(objectframe3) ! $self item NUMBER text [list $xt $yt] -anchor w -text [$self ftoa] \ -font $font(str) -fill [parse_color $@fcol] $c delete ${self}CURS --- 3431,3437 ---- $self item BASE polygon $points -fill [parse_color $@bcol] -outline $look(objectframe3) $self item BASE4 polygon $points2 -fill $color4 -outline $look(objectframe3) ! #$self item NUMBER text [list $xt $yt] -anchor w -text [$self ftoa] \ ! # -font $font(str) -fill [parse_color $@fcol] ! $self item NUMBER text [list $xt $yt] -anchor w -text $@text \ -font $font(str) -fill [parse_color $@fcol] $c delete ${self}CURS *************** *** 3476,3481 **** --- 3485,3493 ---- mset {ox oy} $@mouse set @val [expr $@val-$@rate*($y-$oy)] + set @old_val $@val + set @text $@val set @mouse [list $x $y] pd .$self float $@val; + pd .$self bang; } } *************** *** 3495,3503 **** $@canvas focus= $self set @clicking 0 } { $@canvas focus= "" .$(a)canvas.c itemconfigure ${self}BASE4 -fill $look(objectbg) ! pd .$self float $@val ! pd .$self bang } --- 3507,3517 ---- $@canvas focus= $self set @clicking 0 + set @val "" + set @key_input 1 } { $@canvas focus= "" .$(a)canvas.c itemconfigure ${self}BASE4 -fill $look(objectbg) ! $self selected?= 0 ! if {$@key_input} {set @val $@old_val; set @key_input 0; set @text $@val} } *************** *** 3507,3529 **** switch -regexp -- $key { ^\[\\d]\$ { ! if {[string length $@buf] < $@w} { #set @buf "$@buf$key" set @val "$@val$key" $self changed } } ^Return\$ { ! catch {set @val [expr $@buf]} $@canvas focus= "" pd .$self float $@val pd .$self bang set @buf "" $self changed } ! ^period\$ {if {[string length $@buf] < $@w} {append @val ".";set @text $@val; $self changed} } ^minus\$ {append @val "-";set @text $@val; $self changed} ^BackSpace|Delete\$ { if {[string length $@buf] >= 0} { set @val [string range $@val 0 end-1] } $self changed --- 3521,3548 ---- switch -regexp -- $key { ^\[\\d]\$ { ! if {[string length $@val] < $@w} { #set @buf "$@buf$key" set @val "$@val$key" + set @text $@val $self changed } } ^Return\$ { ! #catch {set @val [expr $@buf]} $@canvas focus= "" + set @old_val $val pd .$self float $@val pd .$self bang set @buf "" + set @text $@val + set @key_input 0 $self changed } ! ^period\$ {if {[string length $@val] < $@w} {append @val ".";set @text $@val; $self changed} } ^minus\$ {append @val "-";set @text $@val; $self changed} ^BackSpace|Delete\$ { if {[string length $@buf] >= 0} { set @val [string range $@val 0 end-1] + set @text $@val } $self changed

1 0

pd/src desire.tk,1.1.2.260,1.1.2.261
by Mathieu Bouchard 23 Jun '06

23 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25389 Modified Files: Tag: devel_0_39 desire.tk Log Message: added ClientClassTreeDialog Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.260 retrieving revision 1.1.2.261 diff -C2 -d -r1.1.2.260 -r1.1.2.261 *** desire.tk 21 Jun 2006 11:46:45 -0000 1.1.2.260 --- desire.tk 23 Jun 2006 06:33:27 -0000 1.1.2.261 *************** *** 421,424 **** --- 421,426 ---- set key(popup_help) "" set key(popup_open) "" + set key(client_class_tree) "Ctrl+grave" + set accels {} ################## set up main window ######################### *************** *** 1040,1043 **** --- 1042,1046 ---- {about {} ""} {class_browser {} ""} + {client_class_tree {} ""} } } *************** *** 5227,5233 **** def ClientPrefsDialog _delete {} {super} - ############ other stuff ######### #c proc updatesel {_ sel} { #c variable "" --- 5230,5298 ---- def ClientPrefsDialog _delete {} {super} ############ other stuff ######### + def Client client_class_tree {} {ClientClassTreeDialog new} + class_new ClientClassTreeDialog {Dialog} + def ClientClassTreeDialog cancel {} {destroy .$self} + + proc* place_stuff {args} {} + + def ClientClassTreeDialog make_row {w tree} { + pack [frame $w] -fill x + pack [frame $w.row] -side top -fill x + pack [button $w.row.butt -image icon_minus] -side left + pack [label $w.row.label -text [lindex $tree 0]] -side left -fill x + pack [frame $w.dent -width 32] -side left + set i 1 + foreach node [lrange $tree 1 end] { + $self make_row $w.$i $node + incr i + } + } + + def ClientClassTreeDialog init {} { + super + pack [frame .$self.1 -width 600 -height 400] -fill y -expand y + pack [frame .$self.1.1 -width 600 -height 400 -bg "#6688aa"] -side left -fill y -expand y + # "$w.1.scroll set" + # i'd like a scrollable frame + pack [scrollbar .$self.1.scroll \ + -command "ClientClassTreeDialog_scroll $self"] -side left -fill y -expand y + place [frame .$self.1.1.tree] -x 0 -y 0 + set w .$self.1.1.tree.1 + $self make_row $w [Thing get_hierarchy] + after 100 "$self update_scrollbar" + } + + def ClientClassTreeDialog update_scrollbar {} { + set w .$self.1.1 + set zy [winfo height $w] + set sy [winfo height $w.tree] + set y1 [expr 0.0-[winfo y $w.tree]] + set y2 [expr $y1+$zy] + puts "sy=$sy y1=$y1 y2=$y2" + .$self.1.scroll set [expr $y1/$sy] [expr $y2/$sy] + puts ".$self.1.scroll set [expr $y1/$sy] [expr $y2/$sy]" + } + + def* ClientClassTreeDialog scroll {args} { + set w .$self.1.1 + set zy [winfo height $w] + set sy [winfo height $w.tree] + set y1 [expr 0.0-[winfo y $w.tree]] + set y2 [expr $y1+$zy] + switch [lindex $args 0] { + moveto { + set f [lindex $args 1] + set y [expr (0.0-$f)*$sy] + place .$self.1.1.tree -x 0 -y $y + puts $y + } + scroll { + + } + } + } + #c proc updatesel {_ sel} { #c variable "" *************** *** 5245,5248 **** --- 5310,5319 ---- foreach sub $@subclasses {$sub post_hierarchy [expr $i+1]} } + def Class get_hierarchy {} { + set l [list $self] + foreach sub $@subclasses {lappend l [$sub get_hierarchy]} + return $l + } + Thing post_hierarchy

1 0

externals/iem/comport/comport comport-help.pd,1.2,1.3
by Martin Peach 22 Jun '06

22 Jun '06

Update of /cvsroot/pure-data/externals/iem/comport/comport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7849 Modified Files: comport-help.pd Log Message: Index: comport-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/iem/comport/comport/comport-help.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** comport-help.pd 21 May 2006 13:35:20 -0000 1.2 --- comport-help.pd 21 Jun 2006 23:56:12 -0000 1.3 *************** *** 1,76 **** ! #N canvas 199 244 697 479 10; ! #X obj 97 231 comport 1 9600; ! #X msg 13 213 66; ! #X obj 88 361 print; ! #X msg 12 171 64; ! #X text 12 191 point; ! #X text 11 150 stream; ! #X msg 13 263 86; ! #X text 13 238 position; ! #X msg 16 307 70; ! #X msg 14 347 71; ! #X text 15 290 run; ! #X text 14 325 sleep; ! #X floatatom 121 269 4 0 0 0 - - -; ! #X obj 90 325 spigot; ! #X msg 109 298 1; ! #X msg 143 299 0; ! #X msg 313 60 bits 8; ! #X msg 312 84 stopbit 0; ! #X msg 311 112 parity 0; ! #X msg 312 141 xonxoff 1; ! #X msg 312 167 rtscts 0; ! #X text 391 115 parity 1=even \, -1=odd \, 0=off; ! #X text 391 86 extra stopbit 1=on \, 0=off; ! #X text 393 61 databits 5 \, 6 \, 7 \, 8; ! #X text 392 32 use exact or higher baudrate; ! #X obj 115 196 r comctl; ! #X obj 219 389 s comctl; ! #X text 393 140 use handshake xon/off 1=on 0=off; ! #X text 391 166 cts/rts hardwarehandshake 1=on 0=off; ! #X msg 317 213 pollintervall 1; ! #X text 429 203 set pollintervall for read in ms; ! #X text 429 217 (default is 1 tick 1ms); ! #X msg 316 245 close; ! #X msg 316 271 open 1; ! #X msg 313 35 baud 10000; ! #X text 382 242 Close Serial port; ! #X msg 310 311 devicename /dev/ttyS1; ! #X text 256 411 Danger !!! you can open every file in your system and ! maybe if suid is root damage the system.; ! #X msg 308 12 baud 300; ! #X text 3 -10 (C) 1998-2005 IEM Winfried Ritsch GPL (see LICENSE.txt) ! ; ! #X text 14 388 comment; ! #X obj 84 135 clip 0 255; ! #X obj 87 89 hsl 128 15 0 255 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 11300 1; ! #X floatatom 111 116 5 0 0 0 - - -; ! #X text 14 69 you can send bytes directly (0-255):; ! #X text 379 271 Open serial port by number; ! #X text 466 307 open the serial port by name; ! #X connect 0 0 12 0; ! #X connect 0 0 13 0; ! #X connect 1 0 0 0; ! #X connect 3 0 0 0; ! #X connect 6 0 0 0; ! #X connect 8 0 0 0; ! #X connect 9 0 0 0; ! #X connect 13 0 2 0; ! #X connect 14 0 13 1; ! #X connect 15 0 13 1; ! #X connect 16 0 26 0; ! #X connect 17 0 26 0; ! #X connect 18 0 26 0; ! #X connect 19 0 26 0; ! #X connect 20 0 26 0; ! #X connect 25 0 0 0; ! #X connect 29 0 26 0; ! #X connect 32 0 26 0; ! #X connect 33 0 26 0; ! #X connect 34 0 26 0; ! #X connect 36 0 26 0; ! #X connect 38 0 26 0; ! #X connect 41 0 0 0; ! #X connect 42 0 43 0; ! #X connect 42 0 41 0; --- 1,100 ---- ! #N canvas 479 290 701 483 10; ! #X obj 97 231 comport 1 9600; ! #X msg 13 213 66; ! #X obj 88 361 print; ! #X msg 12 171 64; ! #X text 12 191 point; ! #X text 11 150 stream; ! #X msg 13 263 86; ! #X text 13 238 position; ! #X msg 16 307 70; ! #X msg 14 347 71; ! #X text 15 290 run; ! #X text 14 325 sleep; ! #X floatatom 101 260 4 0 0 0 - - -; ! #X obj 90 325 spigot; ! #X msg 109 298 1; ! #X msg 143 299 0; ! #X msg 313 60 bits 8; ! #X msg 312 84 stopbit 0; ! #X msg 311 112 parity 0; ! #X msg 312 141 xonxoff 1; ! #X msg 312 167 rtscts 0; ! #X text 391 115 parity 1=even \, -1=odd \, 0=off; ! #X text 391 86 extra stopbit 1=on \, 0=off; ! #X text 393 61 databits 5 \, 6 \, 7 \, 8; ! #X text 392 32 use exact or higher baudrate; ! #X obj 115 196 r comctl; ! #X obj 198 416 s comctl; ! #X text 393 140 use handshake xon/off 1=on 0=off; ! #X text 391 166 cts/rts hardwarehandshake 1=on 0=off; ! #X msg 317 213 pollintervall 1; ! #X text 429 217 (default is 1 tick 1ms); ! #X msg 316 245 close; ! #X msg 316 271 open 1; ! #X msg 313 35 baud 10000; ! #X text 382 242 Close Serial port; ! #X msg 310 311 devicename /dev/ttyS1; ! #X text 256 411 Danger !!! you can open every file in your system and ! maybe if suid is root damage the system.; ! #X msg 308 12 baud 300; ! #X text 3 -10 (C) 1998-2005 IEM Winfried Ritsch GPL (see LICENSE.txt) ! ; ! #X obj 84 135 clip 0 255; ! #X obj 87 89 hsl 128 15 0 255 0 0 empty empty empty -2 -6 0 8 -262144 ! -1 -1 0 1; ! #X floatatom 111 116 5 0 0 0 - - -; ! #X text 14 69 you can send bytes directly (0-255):; ! #X text 379 271 Open serial port by number; ! #X text 466 307 open the serial port by name; ! #X msg 312 352 dtr \$1; ! #X obj 292 352 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 ! 1; ! #X obj 291 387 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 ! 1; ! #X msg 311 387 rts \$1; ! #X text 361 351 dtr output; ! #X text 360 387 rts output; ! #X msg 180 350 help; ! #X floatatom 129 260 5 0 0 3 device - -; ! #X floatatom 167 260 5 0 0 3 dsr - -; ! #X floatatom 201 260 5 0 0 3 cts - -; ! #X msg 460 386 verbose \$1; ! #X obj 460 367 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 ! 1; ! #X text 429 203 set poll interval for read in ms; ! #X connect 0 0 12 0; ! #X connect 0 0 13 0; ! #X connect 0 1 52 0; ! #X connect 0 2 53 0; ! #X connect 0 3 54 0; ! #X connect 1 0 0 0; ! #X connect 3 0 0 0; ! #X connect 6 0 0 0; ! #X connect 8 0 0 0; ! #X connect 9 0 0 0; ! #X connect 13 0 2 0; ! #X connect 14 0 13 1; ! #X connect 15 0 13 1; ! #X connect 16 0 26 0; ! #X connect 17 0 26 0; ! #X connect 18 0 26 0; ! #X connect 19 0 26 0; ! #X connect 20 0 26 0; ! #X connect 25 0 0 0; ! #X connect 29 0 26 0; ! #X connect 31 0 26 0; ! #X connect 32 0 26 0; ! #X connect 33 0 26 0; ! #X connect 35 0 26 0; ! #X connect 37 0 26 0; ! #X connect 39 0 0 0; ! #X connect 40 0 41 0; ! #X connect 40 0 39 0; ! #X connect 45 0 26 0; ! #X connect 46 0 45 0; ! #X connect 47 0 48 0; ! #X connect 48 0 26 0; ! #X connect 51 0 26 0; ! #X connect 55 0 26 0; ! #X connect 56 0 55 0;

1 0

externals/iem/comport/comport comport.c,1.15,1.16
by Martin Peach 22 Jun '06

22 Jun '06

Update of /cvsroot/pure-data/externals/iem/comport/comport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1706 Modified Files: comport.c Log Message: Index: comport.c =================================================================== RCS file: /cvsroot/pure-data/externals/iem/comport/comport/comport.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** comport.c 18 Jun 2006 19:20:48 -0000 1.15 --- comport.c 21 Jun 2006 23:42:00 -0000 1.16 *************** *** 4,11 **** Institute for Electronic Music - Graz ! V 1.0 MP 20060603 memset and memcpy arguments were backwards for Windows version. close_serial doesn't crash now. ! MP 20060618 make sure name is set up in comport_new (x->serial_device = test.serial_device) so help message works. ! */ --- 4,13 ---- Institute for Electronic Music - Graz [...1009 lines suppressed...] ! class_addmethod(comport_class, (t_method)comport_baud, gensym("baud"),A_FLOAT, 0); ! class_addmethod(comport_class, (t_method)comport_bits, gensym("bits"), A_FLOAT, 0); class_addmethod(comport_class, (t_method)comport_stopbit, gensym("stopbit"), A_FLOAT, 0); class_addmethod(comport_class, (t_method)comport_rtscts, gensym("rtscts"), A_FLOAT, 0); class_addmethod(comport_class, (t_method)comport_parity, gensym("parity"), A_FLOAT, 0); class_addmethod(comport_class, (t_method)comport_xonxoff, gensym("xonxoff"), A_FLOAT, 0); --- 1176,1187 ---- /* class_addbang(comport_class, comport_bang ! */ ! class_addmethod(comport_class, (t_method)comport_baud, gensym("baud"),A_FLOAT, 0); ! class_addmethod(comport_class, (t_method)comport_bits, gensym("bits"), A_FLOAT, 0); class_addmethod(comport_class, (t_method)comport_stopbit, gensym("stopbit"), A_FLOAT, 0); class_addmethod(comport_class, (t_method)comport_rtscts, gensym("rtscts"), A_FLOAT, 0); + class_addmethod(comport_class, (t_method)comport_dtr, gensym("dtr"), A_FLOAT, 0); + class_addmethod(comport_class, (t_method)comport_rts, gensym("rts"), A_FLOAT, 0); class_addmethod(comport_class, (t_method)comport_parity, gensym("parity"), A_FLOAT, 0); class_addmethod(comport_class, (t_method)comport_xonxoff, gensym("xonxoff"), A_FLOAT, 0);

1 0

pd/src desire.tk,1.1.2.259,1.1.2.260
by chunlee 21 Jun '06

21 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32002 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixes for numbox (not quite finished yet...) Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.259 retrieving revision 1.1.2.260 diff -C2 -d -r1.1.2.259 -r1.1.2.260 *** desire.tk 21 Jun 2006 09:30:47 -0000 1.1.2.259 --- desire.tk 21 Jun 2006 11:46:45 -0000 1.1.2.260 *************** *** 2379,2383 **** set c .$self.c $self hide_tooltip - puts "focus ::::::::::: [$self focus]" if {[$self focus] != ""} { [$self focus] key $key $shift --- 2379,2382 ---- *************** *** 3267,3274 **** set @yt [expr $y1+$ys/2+3+$xs/34] if {[$self selected?]} {set fcol red} else {set fcol $look(objectfg)} ! if {[string length $@buf] <= $@w} { ! $self item TEXT text [list $@xt $@yt] -anchor w -text $@text \ ! -font $font(str) -fill $fcol } } --- 3266,3277 ---- set @yt [expr $y1+$ys/2+3+$xs/34] if {[$self selected?]} {set fcol red} else {set fcol $look(objectfg)} ! if {[string length $@buf] <= $@w} { ! set string $@text ! } else { ! set string [string range $@text 0 [expr $@w-1]] } + $self item TEXT text [list $@xt $@yt] -anchor w -text $string \ + -font $font(str) -fill $fcol + } *************** *** 3290,3294 **** $self changed } ! period {append @buf ".";set @text $@buf} default { if {[regexp {^[0-9]{1}$} $key]} { --- 3293,3297 ---- $self changed } ! period {append @buf ".";set @text $@buf; $self changed} default { if {[regexp {^[0-9]{1}$} $key]} { *************** *** 3399,3403 **** } ! def* NumBox draw {} { $self update_size global look font --- 3402,3406 ---- } ! def NumBox draw {} { $self update_size global look font *************** *** 3411,3415 **** set outs [expr [string compare $@snd empty]==0] set points [list $x1 $y1 [expr $x2-4] $y1 $x2 [expr $y1+4] $x2 $y2 $x1 $y2] - #set font $font(str) set xt [expr $x1+$ys/2+2] set yt [expr $y1+$ys/2+1+$xs/34] --- 3414,3417 ---- *************** *** 3419,3424 **** $self item BASE polygon $points -fill [parse_color $@bcol] -outline $look(objectframe3) $self item BASE4 polygon $points2 -fill $color4 -outline $look(objectframe3) - #$self item NUMBER text [list $xt $yt] -anchor w -text [$self ftoa] \ - # -font [list $font $@fs bold] -fill [parse_color $@fcol] $self item NUMBER text [list $xt $yt] -anchor w -text [$self ftoa] \ -font $font(str) -fill [parse_color $@fcol] --- 3421,3424 ---- *************** *** 3460,3463 **** --- 3460,3464 ---- $@canvas focus= $self .$(a)canvas.c itemconfigure ${self}BASE4 -fill #00ff00 + set @clickpos [list $x $y] set @mouse [list $x $y] set @oval $@val *************** *** 3469,3477 **** set focused [$self == [$@canvas focus]] if {!$focused} {return} mset {ox oy} $@mouse set @val [expr $@val-$@rate*($y-$oy)] set @mouse [list $x $y] ! if {$@clicking} {pd .$self float $@val;} ! #$self changed } --- 3470,3479 ---- set focused [$self == [$@canvas focus]] if {!$focused} {return} + if {$@clicking} { mset {ox oy} $@mouse set @val [expr $@val-$@rate*($y-$oy)] set @mouse [list $x $y] ! pd .$self float $@val; ! } } *************** *** 3481,3496 **** global look set @clicking 0 ! if {$@oval!=$@val} { $@canvas focus= "" .$(a)canvas.c itemconfigure ${self}BASE4 -fill $look(objectbg) pd .$self float $@val } } def* NumBox key {key shift} { switch -regexp -- $key { ! ^\[\\d\\.eE+-\]\$ { ! set @buf "$@buf$key" $self changed } ^Return\$ { --- 3483,3512 ---- global look set @clicking 0 ! #if {$@oval!=$@val} { ! # $@canvas focus= "" ! # .$(a)canvas.c itemconfigure ${self}BASE4 -fill $look(objectbg) ! # pd .$self float $@val ! #} ! ! if {[lindex $@clickpos 0] == $x && [lindex $@clickpos 1] == $y} { ! $@canvas focus= $self ! set @clicking 0 ! } { $@canvas focus= "" .$(a)canvas.c itemconfigure ${self}BASE4 -fill $look(objectbg) pd .$self float $@val + pd .$self bang } + } def* NumBox key {key shift} { switch -regexp -- $key { ! ^\[\\d]\$ { ! if {[string length $@buf] < $@w} { ! #set @buf "$@buf$key" ! set @val "$@val$key" $self changed + } } ^Return\$ { *************** *** 3498,3507 **** $@canvas focus= "" pd .$self float $@val set @buf "" $self changed } ^BackSpace|Delete\$ { if {[string length $@buf] >= 0} { ! set @buf [string range $@buf 0 end-1] } $self changed --- 3514,3526 ---- $@canvas focus= "" pd .$self float $@val + pd .$self bang set @buf "" $self changed } + ^period\$ {if {[string length $@buf] < $@w} {append @val ".";set @text $@val; $self changed} } + ^minus\$ {append @val "-";set @text $@val; $self changed} ^BackSpace|Delete\$ { if {[string length $@buf] >= 0} { ! set @val [string range $@val 0 end-1] } $self changed

1 0

[PD-cvs] externals/zexy/src blockmirror~.c, 1.3, 1.4 blockshuffle~.c, 1.1, 1.2 blockswap~.c, 1.3, 1.4
by IOhannes m zmölnig 21 Jun '06

21 Jun '06

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15441 Modified Files: blockmirror~.c blockshuffle~.c blockswap~.c Log Message: proper freeing of allocated buffers Index: blockswap~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/blockswap~.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** blockswap~.c 25 Jan 2006 16:27:08 -0000 1.3 --- blockswap~.c 21 Jun 2006 11:04:51 -0000 1.4 *************** *** 68,72 **** } ! static void blockswap_helper(void) { post("\n%c blockswap~-object for blockwise-swapping of a signal ", HEARTSYMBOL); --- 68,72 ---- } ! static void blockswap_helper(t_blockswap *x) { post("\n%c blockswap~-object for blockwise-swapping of a signal ", HEARTSYMBOL); *************** *** 76,79 **** --- 76,87 ---- } + static void blockswap_free(t_blockswap *x) + { + if(x->blockbuffer){ + freebytes(x->blockbuffer, sizeof(t_float)*x->blocksize); + } + x->blockbuffer=0; + } + static void *blockswap_new(void) { Index: blockshuffle~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/blockshuffle~.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** blockshuffle~.c 20 Jun 2006 18:07:24 -0000 1.1 --- blockshuffle~.c 21 Jun 2006 11:04:51 -0000 1.2 *************** *** 30,35 **** typedef struct _blockshuffle ! { ! t_object x_obj; t_sample*blockbuf; --- 30,34 ---- typedef struct _blockshuffle ! { t_object x_obj; t_sample*blockbuf; *************** *** 116,122 **** } static void blockshuffle_free(t_blockshuffle *x){ ! if(x->indices)freebytes(x->indices, x->size); ! if(x->blockbuf)freebytes(x->blockbuf, x->size); ! if(x->shuffle)freebytes(x->shuffle, x->shufflesize); } --- 115,121 ---- } static void blockshuffle_free(t_blockshuffle *x){ ! if(x->indices) freebytes(x->indices, sizeof(t_int) *x->size); ! if(x->blockbuf)freebytes(x->blockbuf, sizeof(t_sample)*x->size); ! if(x->shuffle) freebytes(x->shuffle, sizeof(t_float) *x->shufflesize); } Index: blockmirror~.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/blockmirror~.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** blockmirror~.c 25 Jan 2006 16:27:08 -0000 1.3 --- blockmirror~.c 21 Jun 2006 11:04:51 -0000 1.4 *************** *** 73,77 **** } ! static void blockmirror_helper(void) { post("\n%c blockmirror~-object for reverting a signal", HEARTSYMBOL); --- 73,77 ---- } ! static void blockmirror_helper(t_blockmirror*x) { post("\n%c blockmirror~-object for reverting a signal", HEARTSYMBOL); *************** *** 80,84 **** post("outlet : signal~"); } ! static void *blockmirror_new(void) { --- 80,89 ---- post("outlet : signal~"); } ! static void blockmirror_free(t_blockmirror*x) ! { ! if(x->blockbuffer) ! freebytes(x->blockbuffer, sizeof(t_float)*x->blocksize); ! x->blockbuffer=0; ! } static void *blockmirror_new(void) { *************** *** 92,97 **** void blockmirror_tilde_setup(void) { ! blockmirror_class = class_new(gensym("blockmirror~"), (t_newmethod)blockmirror_new, 0, ! sizeof(t_blockmirror), 0, A_NULL); class_addmethod(blockmirror_class, nullfn, gensym("signal"), 0); class_addmethod(blockmirror_class, (t_method)blockmirror_dsp, gensym("dsp"), 0); --- 97,103 ---- void blockmirror_tilde_setup(void) { ! blockmirror_class = class_new(gensym("blockmirror~"), (t_newmethod)blockmirror_new, ! (t_method)blockmirror_free, ! sizeof(t_blockmirror), 0, A_NULL); class_addmethod(blockmirror_class, nullfn, gensym("signal"), 0); class_addmethod(blockmirror_class, (t_method)blockmirror_dsp, gensym("dsp"), 0);

1 0

externals/zexy/tests runtests.pd, 1.1, 1.2 runtests_nogui.pd, 1.1, 1.2 testunit.pd, 1.1, 1.2
by IOhannes m zmölnig 21 Jun '06

21 Jun '06

Update of /cvsroot/pure-data/externals/zexy/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14566 Modified Files: runtests.pd runtests_nogui.pd testunit.pd Log Message: tests now MUST return a value in order to stop (destroy) the specific test; this allows for tests that execute in non-zero logical time (e.g. signal-objects or timed objects) Index: testunit.pd =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/tests/testunit.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** testunit.pd 21 Dec 2005 10:02:17 -0000 1.1 --- testunit.pd 21 Jun 2006 11:03:57 -0000 1.2 *************** *** 1,20 **** ! #N canvas 695 274 312 252 10; ! #N canvas 0 0 564 876 run-test 0; ! #X obj 87 512 r \$0-receive; ! #X obj 71 532 f; ! #X msg 96 533 0; #X obj 71 76 symbol; #X obj 71 44 inlet test-to-run; ! #X obj 71 639 outlet result; ! #X obj 71 615 pack 0 s; ! #X obj 181 205 makefilename pd-%d-regressiontest; ! #X obj 109 226 pack s \$0 s; ! #X obj 181 186 f \$0; ! #X obj 109 160 t s b; ! #X obj 143 489 t b s s; ! #X obj 71 104 t b b s s; ! #X msg 140 72 bang; ! #X obj 90 135 s \$0-send; ! #X msg 109 246 \; \$3 clear \; \$3 obj 100 100 r \$2-send \; \$3 obj 100 150 \$1 \; \$3 obj 100 200 s \$2-receive \; \$3 connect 0 0 1 0 \; \$3 connect 1 0 2 0; --- 1,16 ---- ! #N canvas 302 200 312 252 10; ! #N canvas 47 151 894 418 run-test 0; #X obj 71 76 symbol; #X obj 71 44 inlet test-to-run; ! #X obj 506 344 outlet result; ! #X obj 506 320 pack 0 s; ! #X obj 150 155 makefilename pd-%d-regressiontest; ! #X obj 89 195 pack s \$0 s; ! #X obj 150 136 f \$0; ! #X obj 89 130 t s b; ! #X obj 506 140 t b s s; ! #X msg 113 76 bang; ! #X obj 71 314 s \$0-send; ! #X msg 89 215 \; \$3 clear \; \$3 obj 100 100 r \$2-send \; \$3 obj 100 150 \$1 \; \$3 obj 100 200 s \$2-receive \; \$3 connect 0 0 1 0 \; \$3 connect 1 0 2 0; *************** *** 40,77 **** #X connect 8 0 1 1; #X connect 9 0 2 0; ! #X restore 101 584 pd print result; ! #X obj 71 565 t f f; ! #X msg 101 406 \; \$1 clear; ! #X obj 101 386 symbol; ! #X obj 71 364 t b b; ! #X connect 0 0 1 1; ! #X connect 1 0 17 0; ! #X connect 2 0 1 1; ! #X connect 3 0 12 0; ! #X connect 4 0 3 0; ! #X connect 6 0 5 0; ! #X connect 7 0 8 2; ! #X connect 7 0 19 1; ! #X connect 8 0 15 0; ! #X connect 9 0 7 0; ! #X connect 10 0 8 0; ! #X connect 10 1 9 0; ! #X connect 11 0 2 0; ! #X connect 11 1 6 1; ! #X connect 11 2 16 1; ! #X connect 12 0 20 0; ! #X connect 12 1 14 0; ! #X connect 12 2 10 0; ! #X connect 12 3 11 0; #X connect 13 0 3 0; ! #X connect 17 0 6 0; ! #X connect 17 1 16 0; ! #X connect 19 0 18 0; ! #X connect 20 0 1 0; ! #X connect 20 1 19 0; #X restore 94 138 pd run-test; #X obj 94 163 outlet; #X obj 94 111 inlet; ! #N canvas 487 407 450 300 1005-regressiontest 0; #X restore 92 186 pd \$0-regressiontest; #X connect 0 0 1 0; --- 36,116 ---- #X connect 8 0 1 1; #X connect 9 0 2 0; ! #X restore 531 291 pd print result; ! #X obj 506 270 t f f; ! #X msg 531 235 \; \$1 clear; ! #X obj 531 215 symbol; ! #X obj 506 182 t f b; ! #X obj 71 104 t b s s; ! #X text 63 387 start regression test; ! #X text 501 391 regression test finished; ! #N canvas 0 0 450 475 get 0; ! #X obj 106 36 r \$0-receive; ! #X msg 137 280 0; ! #X obj 106 159 del 0; ! #X obj 106 310 f; ! #X text 193 34 get the result; ! #X text 145 155 we need a delay \, since the object's output triggers ! the destruction of the object \; this would lead to stack corruption ! if we do it immediately; ! #X obj 131 358 outlet; ! #X obj 137 236 inlet reset; ! #X obj 106 336 t b f; ! #X obj 106 95 spigot; ! #X obj 137 258 t b b; ! #X msg 161 74 1; ! #X obj 106 117 t b f b; ! #X msg 189 74 0; ! #X obj 137 74 t f; ! #X text 182 98 we only accept the 1st result of the test; ! #X connect 0 0 9 0; ! #X connect 1 0 3 1; ! #X connect 2 0 3 0; ! #X connect 3 0 8 0; ! #X connect 7 0 10 0; ! #X connect 8 0 11 0; ! #X connect 8 1 6 0; ! #X connect 9 0 12 0; ! #X connect 10 0 1 0; ! #X connect 10 1 11 0; ! #X connect 11 0 14 0; ! #X connect 12 0 2 0; ! #X connect 12 1 3 1; ! #X connect 12 2 13 0; ! #X connect 13 0 14 0; ! #X connect 14 0 9 1; ! #X restore 506 162 pd get result; ! #X obj 150 175 t s s; ! #X text 401 23 the test MUST return a result!; ! #X text 414 70 cons: the regression test suite will block until the ! test returns a result (potentially infinitely long)!; ! #X text 414 39 pros: the test need not be finished in zero-time (good ! for testing signal-objects or timed objects); ! #X connect 0 0 17 0; ! #X connect 1 0 0 0; ! #X connect 3 0 2 0; ! #X connect 4 0 21 0; ! #X connect 5 0 11 0; ! #X connect 6 0 4 0; ! #X connect 7 0 5 0; ! #X connect 7 1 6 0; ! #X connect 8 0 20 0; ! #X connect 8 1 3 1; ! #X connect 8 2 12 1; ! #X connect 9 0 0 0; #X connect 13 0 3 0; ! #X connect 13 1 12 0; ! #X connect 15 0 14 0; ! #X connect 16 0 13 0; ! #X connect 16 1 15 0; ! #X connect 17 0 10 0; ! #X connect 17 1 7 0; ! #X connect 17 2 8 0; ! #X connect 20 0 16 0; ! #X connect 21 0 5 2; ! #X connect 21 1 15 1; #X restore 94 138 pd run-test; #X obj 94 163 outlet; #X obj 94 111 inlet; ! #N canvas 487 407 450 300 1002-regressiontest 0; #X restore 92 186 pd \$0-regressiontest; #X connect 0 0 1 0; Index: runtests_nogui.pd =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/tests/runtests_nogui.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** runtests_nogui.pd 21 Dec 2005 10:02:17 -0000 1.1 --- runtests_nogui.pd 21 Jun 2006 11:03:57 -0000 1.2 *************** *** 1,44 **** ! #N canvas 209 168 427 557 10; ! #X obj 86 209 testunit; ! #X obj 86 130 textfile; ! #X obj 86 56 t b b; ! #X msg 116 84 read runtests.txt \, rewind; #X obj 86 34 loadbang; ! #X msg 137 171 \; pd quit; ! #X obj 86 110 until; ! #X obj 86 233 select 0 1; ! #X obj 111 259 + 1; ! #X obj 171 259 + 1; ! #X obj 87 312 i; ! #X obj 130 312 i; ! #X obj 130 381 print regression-test; ! #X msg 130 356 \$1 tests passed; ! #X msg 87 335 \$1 tests failed; ! #X obj 87 291 t b b; ! #X obj 137 150 t b b; ! #X obj 86 259 i 1; ! #X obj 146 259 i 1; ! #X connect 0 0 7 0; #X connect 1 0 0 0; ! #X connect 1 1 16 0; ! #X connect 2 0 6 0; ! #X connect 2 1 3 0; ! #X connect 3 0 1 0; ! #X connect 4 0 2 0; ! #X connect 6 0 1 0; ! #X connect 7 0 17 0; ! #X connect 7 1 18 0; ! #X connect 8 0 17 1; ! #X connect 9 0 18 1; ! #X connect 10 0 14 0; ! #X connect 11 0 13 0; ! #X connect 13 0 12 0; ! #X connect 14 0 12 0; ! #X connect 15 0 10 0; ! #X connect 15 1 11 0; ! #X connect 16 0 5 0; ! #X connect 16 1 15 0; ! #X connect 17 0 8 0; ! #X connect 17 0 10 1; ! #X connect 18 0 9 0; ! #X connect 18 0 11 1; --- 1,49 ---- ! #N canvas 338 0 512 588 10; ! #X obj 86 269 testunit; ! #X obj 86 190 textfile; ! #X msg 104 144 read runtests.txt \, rewind; #X obj 86 34 loadbang; ! #X msg 137 231 \; pd quit; ! #X obj 86 317 select 0 1; ! #X obj 111 343 + 1; ! #X obj 171 343 + 1; ! #X obj 87 396 i; ! #X obj 130 396 i; ! #X obj 130 465 print regression-test; ! #X msg 130 440 \$1 tests passed; ! #X msg 87 419 \$1 tests failed; ! #X obj 87 375 t b b; ! #X obj 137 210 t b b; ! #X obj 86 343 i 1; ! #X obj 146 343 i 1; ! #X obj 86 56 t b b b; ! #X msg 123 98 \; pd dsp 1; ! #X text 182 106 turn on dsp \, just in case an object crashes with ! dsp enabled...; ! #X obj 61 295 t b a; ! #X connect 0 0 20 0; #X connect 1 0 0 0; ! #X connect 1 1 14 0; ! #X connect 2 0 1 0; ! #X connect 3 0 17 0; ! #X connect 5 0 15 0; ! #X connect 5 1 16 0; ! #X connect 6 0 15 1; ! #X connect 7 0 16 1; ! #X connect 8 0 12 0; ! #X connect 9 0 11 0; ! #X connect 11 0 10 0; ! #X connect 12 0 10 0; ! #X connect 13 0 8 0; ! #X connect 13 1 9 0; ! #X connect 14 0 4 0; ! #X connect 14 1 13 0; ! #X connect 15 0 6 0; ! #X connect 15 0 8 1; ! #X connect 16 0 7 0; ! #X connect 16 0 9 1; ! #X connect 17 0 1 0; ! #X connect 17 1 2 0; ! #X connect 17 2 18 0; ! #X connect 20 0 1 0; ! #X connect 20 1 5 0; Index: runtests.pd =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/tests/runtests.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** runtests.pd 21 Dec 2005 10:02:17 -0000 1.1 --- runtests.pd 21 Jun 2006 11:03:56 -0000 1.2 *************** *** 1,22 **** ! #N canvas 367 200 813 499 10; #X obj 177 433 testunit; #X obj 177 377 textfile; #X obj 177 183 t b b; #X msg 207 261 read runtests.txt \, rewind; - #X obj 177 287 metro 10; - #X msg 243 289 0; #X obj 177 126 bng 40 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X msg 177 351 bang; #X symbolatom 195 408 10 0 0 0 - - -; ! #X obj 485 341 mtx_col/exist; #X connect 1 0 0 0; ! #X connect 1 1 5 0; ! #X connect 2 0 4 0; #X connect 2 1 3 0; #X connect 3 0 1 0; ! #X connect 4 0 7 0; ! #X connect 5 0 4 0; ! #X connect 6 0 2 0; ! #X connect 7 0 1 0; ! #X connect 8 0 0 0; --- 1,21 ---- ! #N canvas 211 200 452 500 10; #X obj 177 433 testunit; #X obj 177 377 textfile; #X obj 177 183 t b b; #X msg 207 261 read runtests.txt \, rewind; #X obj 177 126 bng 40 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X msg 177 351 bang; #X symbolatom 195 408 10 0 0 0 - - -; ! #X obj 102 314 t b; ! #X obj 102 342 del 10; ! #X connect 0 0 7 0; #X connect 1 0 0 0; ! #X connect 2 0 5 0; #X connect 2 1 3 0; #X connect 3 0 1 0; ! #X connect 4 0 2 0; ! #X connect 5 0 1 0; ! #X connect 6 0 0 0; ! #X connect 7 0 8 0; ! #X connect 8 0 1 0;

1 0

pd/src desire.tk,1.1.2.258,1.1.2.259
by chunlee 21 Jun '06

21 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5181 Modified Files: Tag: devel_0_39 desire.tk Log Message: floatatom worx/fixed at the client side Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.258 retrieving revision 1.1.2.259 diff -C2 -d -r1.1.2.258 -r1.1.2.259 *** desire.tk 21 Jun 2006 06:41:22 -0000 1.1.2.258 --- desire.tk 21 Jun 2006 09:30:47 -0000 1.1.2.259 *************** *** 609,612 **** --- 609,614 ---- } + proc pdtk_text_set {x y z} {} + proc pdtk_watchdog {} {pd pd ping; after 2000 {pdtk_watchdog}} *************** *** 1443,1447 **** def Canvas obj_in_edit= {v} {set @obj_in_edit $v} ! def TextBox edit {} { global look font if {$@edit} {return} --- 1445,1449 ---- def Canvas obj_in_edit= {v} {set @obj_in_edit $v} ! def* TextBox edit {} { global look font if {$@edit} {return} *************** *** 1773,1776 **** --- 1775,1783 ---- mset {u v} [$self xy] .$(a)canvas.c move $self [expr $u-$x] [expr $v-$y] + $self draw_wires + } + + def View draw_wires {} { + foreach wire $@wires {$wire draw} } *************** *** 2365,2368 **** --- 2372,2376 ---- def* Canvas key {x y key iso shift} { + set c .$self.c set x [$c canvasx $x] *************** *** 2371,2374 **** --- 2379,2383 ---- set c .$self.c $self hide_tooltip + puts "focus ::::::::::: [$self focus]" if {[$self focus] != ""} { [$self focus] key $key $shift *************** *** 2439,2446 **** } ! def Box draw_wires {} { ! #puts "wires:$@wires" ! foreach wire $@wires {$wire draw} ! } def* Box delete_wire {wire} { --- 2448,2455 ---- } ! #def Box draw_wires {} { ! # #puts "wires:$@wires" ! # foreach wire $@wires {$wire draw} ! #} def* Box delete_wire {wire} { *************** *** 2451,2455 **** def Box move {dx dy} { super $dx $dy ! $self draw_wires #foreach wire $@wires { # set _($wire:select_by) $_($@canvas:select_by) --- 2460,2464 ---- def Box move {dx dy} { super $dx $dy ! #$self draw_wires #foreach wire $@wires { # set _($wire:select_by) $_($@canvas:select_by) *************** *** 3239,3245 **** set @buf 0 set @valid 0 set @text 0 set @edit 0 ! set @isnew 1 } --- 3248,3256 ---- set @buf 0 set @valid 0 + set @clickpos {} + set @key_input 0 set @text 0 set @edit 0 ! #set @isnew 1 } *************** *** 3247,3250 **** --- 3258,3262 ---- def* FloatAtom draw {} { + $self update_size global font look super *************** *** 3252,3272 **** set xs [expr 4+10*$@w] set ys $font(height) ! set xt [expr $x1+$ys/2+2] ! set yt [expr $y1+$ys/2+1+$xs/34] ! $self item TEXT text [list $xt $yt] -anchor w -text $@buf \ ! -font $font(str) -fill #000000 ! set t .$(a)canvas.c.${self}TEXT ! if {$@isnew} { ! bind $t <Key> "$self key %W %x %y %K %A 0" ! set @isnew 0 ! #focus .$(a)canvas.c.${self}TEXT } - } ! def* FloatAtom key {x y key iso shift} { ! } def* FloatAtom ftoa {} { set f $@val --- 3264,3307 ---- set xs [expr 4+10*$@w] set ys $font(height) ! set @xt [expr $x1+$ys/2-2] ! set @yt [expr $y1+$ys/2+3+$xs/34] ! if {[$self selected?]} {set fcol red} else {set fcol $look(objectfg)} ! if {[string length $@buf] <= $@w} { ! $self item TEXT text [list $@xt $@yt] -anchor w -text $@text \ ! -font $font(str) -fill $fcol } } ! def* FloatAtom key {key shift} { ! global font look ! set @clicking 0 ! switch $key { ! Return { ! $@canvas focus= "" ! pd .$self set [expr $@buf] ! pd .$self bang ! set @text $@buf ! $self selected?= 0 ! set @clicking 0 ! } ! BackSpace { ! set @buf [string range $@buf 0 end-1] ! set @text $@buf ! $self changed ! } ! period {append @buf ".";set @text $@buf} ! default { ! if {[regexp {^[0-9]{1}$} $key]} { ! append @buf $key ! set @text $@buf ! $self changed ! } ! if {$key == "minus"} {set @buf "-"; set @text $@buf; $self changed} ! ! } ! } } + def* FloatAtom ftoa {} { set f $@val *************** *** 3292,3296 **** def FloatAtom update_size {} { global font look ! set @textwidth [expr $font(padx)+$font(width)*[string length $@buf]] set @topwidth [expr ($@ninlets + ($@ninlets - 1)) * $look(iowidth)] set @bottomwidth [expr ($@noutlets + ($@noutlets - 1)) * $look(iowidth)] --- 3327,3333 ---- def FloatAtom update_size {} { global font look ! #set @textwidth [expr $font(padx)+$font(width)*[string length $@buf]] ! if {!$@w} [set @w 5] ! set @textwidth [expr $font(padx)+$font(width)*$@w] set @topwidth [expr ($@ninlets + ($@ninlets - 1)) * $look(iowidth)] set @bottomwidth [expr ($@noutlets + ($@noutlets - 1)) * $look(iowidth)] *************** *** 3300,3324 **** } ! def* FloatAtom click {args} { ! #$self edit set t .$(a)canvas.c.${self}text ! puts ".$(a)canvas.c itemconfigure $t -state disabled" ! .$(a)canvas.c itemconfigure $t -state disabled $@canvas focus= $self ! .$(a)canvas.c itemconfigure ${self}BASE4 -fill #00ff00 ! #set @mouse [list $x $y] ! #set @oval $@val ! #set @clicking 1 ! #set @rate [expr $f&1 ? 0.01 : 1.00] } ! def* FloatAtom unclick {args} { global look set @clicking 0 ! $@canvas focus= $@canvas ! .$(a)canvas.c itemconfigure ${self}BASE4 -fill $look(objectbg) } ! def* FloatAtom motion {args} {} class_new NumBox {Labeled Box} --- 3337,3384 ---- } ! def* FloatAtom click {x y b f} { ! set c .$(a)canvas.c ! set @clickpos [list $x $y] ! set @mouse [list $x $y] set t .$(a)canvas.c.${self}text ! #.$(a)canvas.c itemconfigure $t -state disabled $@canvas focus= $self ! set @rate [expr $f&1 ? 0.01 : 1.00] ! set @clicking 1 ! $self selected?= 1 } ! def* FloatAtom unclick {x y b} { global look set @clicking 0 ! if {[lindex $@clickpos 0] == $x && [lindex $@clickpos 1] == $y} { ! $@canvas focus= $self ! #puts "-----> no mouse movement <------" ! set @buf "" ! set @clicking 0 ! } { ! $@canvas focus= "" ! $self selected?= 0 ! set @text $@buf ! pd .$self set $@buf ! pd .$self bang ! } } ! def* FloatAtom motion {x y mod} { ! set focused [$self == [$@canvas focus]] ! if {!$focused} {return} ! if {$@clicking} { ! mset {ox oy} $@mouse ! set @buf [expr $@buf-$@rate*($y-$oy)] ! set @text $@buf ! set @mouse [list $x $y] ! pd .$self set $@buf ! pd .$self bang ! } ! ! $self changed ! ! } class_new NumBox {Labeled Box} *************** *** 3671,3675 **** --- 3731,3737 ---- } + def Bang unclick {x y b} {$@canvas focus= ""} + def Bang click {x y b f} { $@canvas focus= $self

1 0

pd/src desire.tk,1.1.2.257,1.1.2.258
by Mathieu Bouchard 21 Jun '06

21 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27238 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed backspace/delete stuff Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.257 retrieving revision 1.1.2.258 diff -C2 -d -r1.1.2.257 -r1.1.2.258 *** desire.tk 21 Jun 2006 06:14:10 -0000 1.1.2.257 --- desire.tk 21 Jun 2006 06:41:22 -0000 1.1.2.258 *************** *** 2374,2390 **** [$self focus] key $key $shift } ! switch $OS { ! osx { ! switch -- $key { ! BackSpace {set key 8; set keynum 8} ! Delete {set key 8; set keynum 8} ! } ! } ! } ! if {$key == "KP_Delete"} {set key 127; set keynum 127} ! if {$iso != ""} {scan $iso %c key} #puts "focus = $@focus" ! ! if {$key == 8} { if {[llength $@selection] > 0} { puts "delete objects!!!" --- 2374,2380 ---- [$self focus] key $key $shift } ! #if {$iso != ""} {scan $iso %c key} #puts "focus = $@focus" ! if {$key == "BackSpace" || $key == "Delete" || $key == "KP_Delete"} { if {[llength $@selection] > 0} { puts "delete objects!!!" *************** *** 2395,2399 **** #puts "wires: $@wires_pair" ! foreach x $@selection_wire { set find [lsearch $@wires_pair $x] if { $find != -1} { --- 2385,2389 ---- #puts "wires: $@wires_pair" ! foreach x $@selection_wire { set find [lsearch $@wires_pair $x] if { $find != -1} {

1 0

pd/src desire.tk,1.1.2.256,1.1.2.257
by Mathieu Bouchard 21 Jun '06

21 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15933 Modified Files: Tag: devel_0_39 desire.tk Log Message: keys work with NumBox Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.256 retrieving revision 1.1.2.257 diff -C2 -d -r1.1.2.256 -r1.1.2.257 *** desire.tk 21 Jun 2006 05:49:45 -0000 1.1.2.256 --- desire.tk 21 Jun 2006 06:14:10 -0000 1.1.2.257 *************** *** 2305,2309 **** def* Canvas unclickrun {x y b} { ! if {[$self focus] != $self} {[$self focus] unclick $x $y $b} } --- 2305,2309 ---- def* Canvas unclickrun {x y b} { ! if {[$self focus] != ""} {[$self focus] unclick $x $y $b} } *************** *** 3357,3360 **** --- 3357,3361 ---- set x2 [expr $x1+$xs] set y2 [expr $y1+$ys] + set c .$(a)canvas.c set ins [expr [string compare $@rcv empty]==0] set outs [expr [string compare $@snd empty]==0] *************** *** 3372,3384 **** $self item NUMBER text [list $xt $yt] -anchor w -text [$self ftoa] \ -font $font(str) -fill [parse_color $@fcol] ! .$(a)canvas.c delete ${self}CURS if {[string length $@buf]>0} { ! mset {blah blah x3 blah} [$@canvas bbox ${self}NUMBER] ! $@canvas create line $x3 $y1 $x3 $y2 -tags ${self}CURS -fill red } io_draw $self Labeled_draw $self if {[$self selected?]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)} ! .$(a)canvas.c itemconfigure ${self}BASE -outline $frcol } --- 3373,3385 ---- $self item NUMBER text [list $xt $yt] -anchor w -text [$self ftoa] \ -font $font(str) -fill [parse_color $@fcol] ! $c delete ${self}CURS if {[string length $@buf]>0} { ! mset {blah blah x3 blah} [$c bbox ${self}NUMBER] ! $c create line $x3 $y1 $x3 $y2 -tags ${self}CURS -fill red } io_draw $self Labeled_draw $self if {[$self selected?]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)} ! $c itemconfigure ${self}BASE -outline $frcol } *************** *** 3438,3463 **** def* NumBox key {key shift} { ! set c -1 ! catch {set c [format %c $key]} ! if {[string first $c 0123456789.eE+-]>=0} { ! set @buf "$@buf$c" $self changed ! } elseif {$key==13} { ! # Return catch {set @val [expr $@buf]} ! $@canvas unfocus ! pd x$self float $@val ! } elseif {$key==8 || $key==127} { ! # Backspace if {[string length $@buf] >= 0} { set @buf [string range $@buf 0 end-1] } $self changed ! } elseif {$key==27} { ! # Escape set @val $@oval $@canvas unfocus ! } else { puts "NumBox_key $key" } } --- 3439,3467 ---- def* NumBox key {key shift} { ! switch -regexp -- $key { ! ^\[\\d\\.eE+-\]\$ { ! set @buf "$@buf$key" $self changed ! } ! ^Return\$ { catch {set @val [expr $@buf]} ! $@canvas focus= "" ! pd .$self float $@val ! set @buf "" ! $self changed ! } ! ^BackSpace|Delete\$ { if {[string length $@buf] >= 0} { set @buf [string range $@buf 0 end-1] } $self changed ! } ! ^Escape\$ { set @val $@oval $@canvas unfocus ! } ! default { puts "NumBox_key $key" + } } }

1 0

← Newer
1
2
3
4
5
6
7
8
...
23
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 June 2006