Pd-cvs June 2006

pd-cvs@lists.iem.at

13 participants
225 discussions

pd/src desire.tk,1.1.2.227,1.1.2.228
by Mathieu Bouchard 12 Jun '06

12 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11397 Modified Files: Tag: devel_0_39 desire.tk Log Message: class History: translated remaining bits of Ruby to Tcl Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.227 retrieving revision 1.1.2.228 diff -C2 -d -r1.1.2.227 -r1.1.2.228 *** desire.tk 11 Jun 2006 18:12:48 -0000 1.1.2.227 --- desire.tk 11 Jun 2006 22:08:39 -0000 1.1.2.228 *************** *** 5,9 **** # DesireData # Copyright (c) 2004 by Mathieu Bouchard ! # Copyright (c) 2005 by Mathieu Bouchard and Chun Lee # This software has no license yet # And is not covered by the license on the rest of PureData. --- 5,9 ---- # DesireData # Copyright (c) 2004 by Mathieu Bouchard ! # Copyright (c) 2005,2006 by Mathieu Bouchard and Chun Lee # This software has no license yet # And is not covered by the license on the rest of PureData. *************** *** 179,191 **** # runs the restore procedure for the last item in the root undo_queue. def History undo {} { ! begin { ! set backup $@undo ! set @undo $@redo ! set @redo {} ! perform backup.pop ! } ensure { ! set @redo $@undo ! set @undo $backup ! } } --- 179,189 ---- # runs the restore procedure for the last item in the root undo_queue. def History undo {} { ! set backup $@undo ! set @undo $@redo ! set @redo {} ! set err [catch {perform backup.pop}] ! set @redo $@undo ! set @undo $backup ! if {$err} [error "error during undo"] } *************** *** 201,209 **** def History perform {mess} { $self atomically { ! if Array===$mess { ! foreach x [lreverse $mess] {perform $x} ! } { ! $mess call ! } } } --- 199,203 ---- def History perform {mess} { $self atomically { ! foreach x [lreverse $mess] {$mess call} } } *************** *** 212,222 **** set ubackup @undo; set @undo {} set rbackup @redo; set @redo {} ! begin { ! uplevel 1 $code ! } ensure { ! lappend backup_undo $@undo_queue ! set @undo_queue $ubackup ! set @redo_queue $rbackup ! } } --- 206,214 ---- set ubackup @undo; set @undo {} set rbackup @redo; set @redo {} ! set err [catch {uplevel 1 $code}] ! lappend backup_undo $@undo_queue ! set @undo_queue $ubackup ! set @redo_queue $rbackup ! if {$err} [error "error during undo"] }

1 0

pd/src desire.tk, 1.1.2.226, 1.1.2.227 desire.c, 1.1.2.79, 1.1.2.80
by chunlee 11 Jun '06

11 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6124 Modified Files: Tag: devel_0_39 desire.tk desire.c Log Message: small fix for accels command and reload Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.226 retrieving revision 1.1.2.227 diff -C2 -d -r1.1.2.226 -r1.1.2.227 *** desire.tk 11 Jun 2006 16:56:58 -0000 1.1.2.226 --- desire.tk 11 Jun 2006 18:12:48 -0000 1.1.2.227 *************** *** 725,729 **** } #set accel [accel_munge $accel] - #regsub -all %W $cmd $self cmd if {$accel != ""} { if {![dict exists $accels $accel]} { --- 725,728 ---- *************** *** 733,736 **** --- 732,736 ---- } } + regsub -all %W $cmd $self cmd if {[llength $e]==3} { $menu add command -label $text -command $cmd \ Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.79 retrieving revision 1.1.2.80 diff -C2 -d -r1.1.2.79 -r1.1.2.80 *** desire.c 21 May 2006 16:29:21 -0000 1.1.2.79 --- desire.c 11 Jun 2006 18:12:48 -0000 1.1.2.80 *************** *** 763,767 **** canvas_drawlines(x); if (x->gl_isgraph && x->gl_goprect) canvas_drawredrect(x, 1); ! sys_mgui(x,"canvas_getscroll",""); } } else { --- 763,767 ---- canvas_drawlines(x); if (x->gl_isgraph && x->gl_goprect) canvas_drawredrect(x, 1); ! sys_mgui(x,"getscroll",""); } } else {

1 0

pd/src desire.tk,1.1.2.225,1.1.2.226
by chunlee 11 Jun '06

11 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29460 Modified Files: Tag: devel_0_39 desire.tk Log Message: changed all copy/paste related variables to global clipboard Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.225 retrieving revision 1.1.2.226 diff -C2 -d -r1.1.2.225 -r1.1.2.226 *** desire.tk 11 Jun 2006 16:09:30 -0000 1.1.2.225 --- desire.tk 11 Jun 2006 16:56:58 -0000 1.1.2.226 *************** *** 209,213 **** } ! def History atomically {code} { set ubackup @undo; set @undo {} set rbackup @redo; set @redo {} --- 209,213 ---- } ! def* History atomically {code} { set ubackup @undo; set @undo {} set rbackup @redo; set @redo {} *************** *** 1670,1674 **** def Canvas wires= {wires2} { ! global _ canvas set wires {} # look up for wire id --- 1670,1674 ---- def Canvas wires= {wires2} { ! global _ canvas clipboard set wires {} # look up for wire id *************** *** 1705,1714 **** if {[llength $@selection_wire] == $canvas(dup_wire_num)} {set @duplicating 0} } ! if {[info exists canvas(copy)]} { ! if {$canvas(copy)} { lappend @selection_wire $x; $x selected?= 1 if {$i == $born_num} { ! set canvas(copy) 0 ! set canvas(orig_cpcanvas) $self } } --- 1705,1714 ---- if {[llength $@selection_wire] == $canvas(dup_wire_num)} {set @duplicating 0} } ! if {[info exists clipboard(copying)]} { ! if {$clipboard(copying)} { lappend @selection_wire $x; $x selected?= 1 if {$i == $born_num} { ! set clipboard(copying) 0 ! set clipboard(orig_cpcanvas) $self } } *************** *** 2000,2011 **** def* Canvas copy {} { ! global canvas if {$@selection != ""} { ! set canvas(orig_cpcanvas) $self ! set canvas(copy_obj) $@selection ! set canvas(copy_wire) $@selection_wire ! set canvas(copy_times) 0 ! puts "objects to copy::: $canvas(copy_obj)" ! puts "wires to copy::: $canvas(copy_wire)" } --- 2000,2011 ---- def* Canvas copy {} { ! global clipboard if {$@selection != ""} { ! set clipboard(orig_cpcanvas) $self ! set clipboard(objs) $@selection ! set clipboard(wires) $@selection_wire ! set clipboard(copy_times) 0 ! puts "objects to copy::: $clipboard(objs)" ! puts "wires to copy::: $clipboard(wires)" } *************** *** 2013,2017 **** def* Canvas paste {} { ! global canvas puts "***************************************" set windowx [winfo width .$self.c] --- 2013,2017 ---- def* Canvas paste {} { ! global clipboard puts "***************************************" set windowx [winfo width .$self.c] *************** *** 2022,2032 **** set offy [expr ($windowy * $y1off) / [expr $y2off - $y1off]] $self deselect_all ! set canvas(copied_obj) "" ! if {$canvas(orig_cpcanvas) != $self} { set canvas(copy_times) 0 } else {incr canvas(copy_times)} set notvisiblex 0 set notvisibley 0 set n 0 ! foreach item $canvas(copy_obj) { mset {x1 y1} [$item xy] if {$x1 < $offx | $x1 > [expr $offx+$windowx]} {set notvisiblex 1} --- 2022,2032 ---- set offy [expr ($windowy * $y1off) / [expr $y2off - $y1off]] $self deselect_all ! set clipboard(copied_obj) "" ! if {$clipboard(orig_cpcanvas) != $self} { set clipboard(copy_times) 0 } else {incr clipboard(copy_times)} set notvisiblex 0 set notvisibley 0 set n 0 ! foreach item $clipboard(objs) { mset {x1 y1} [$item xy] if {$x1 < $offx | $x1 > [expr $offx+$windowx]} {set notvisiblex 1} *************** *** 2035,2053 **** } ! foreach item $canvas(copy_obj) { mset {x1 y1} [$item xy] ! if {$canvas(orig_cpcanvas) != $self} { ! if {$n == [llength $canvas(copy_obj)]} { ! set x1 [expr $x1 + $offx +($canvas(copy_times)*15)] ! set y1 [expr $y1 + $offy +($canvas(copy_times)*15)] } } else { ! if {$n == [llength $canvas(copy_obj)]} { ! set x1 [expr $x1 + $offx +($canvas(copy_times)*15)] ! set y1 [expr $y1 + $offy +($canvas(copy_times)*15)] } else { ! set x1 [expr $x1+($canvas(copy_times)*15)] ! set y1 [expr $y1+($canvas(copy_times)*15)] } } --- 2035,2053 ---- } ! foreach item $clipboard(objs) { mset {x1 y1} [$item xy] ! if {$clipboard(orig_cpcanvas) != $self} { ! if {$n == [llength $clipboard(objs)]} { ! set x1 [expr $x1 + $offx +($clipboard(copy_times)*15)] ! set y1 [expr $y1 + $offy +($clipboard(copy_times)*15)] } } else { ! if {$n == [llength $clipboard(objs)]} { ! set x1 [expr $x1 + $offx +($clipboard(copy_times)*15)] ! set y1 [expr $y1 + $offy +($clipboard(copy_times)*15)] } else { ! set x1 [expr $x1+($clipboard(copy_times)*15)] ! set y1 [expr $y1+($clipboard(copy_times)*15)] } } *************** *** 2056,2060 **** set name $_($item:class) } ! set canvas(copy) 1 pd .$self obj $x1 $y1 $name } --- 2056,2060 ---- set name $_($item:class) } ! set clipboard(copying) 1 pd .$self obj $x1 $y1 $name } *************** *** 2062,2071 **** def* Canvas paste_wires {} { ! global canvas _ set i 0 # _($obj:duplicate) sotres the duplicated object so that we know how to duplicate the wires ! foreach obj $canvas(copy_obj) {set _($obj:duplicate) [lindex $canvas(copied_obj) $i]; incr i} ! foreach wire $canvas(copy_wire) { set obj1 $_($wire:obj1) set obj2 $_($wire:obj2) --- 2062,2071 ---- def* Canvas paste_wires {} { ! global canvas _ clipboard set i 0 # _($obj:duplicate) sotres the duplicated object so that we know how to duplicate the wires ! foreach obj $clipboard(objs) {set _($obj:duplicate) [lindex $clipboard(copied_obj) $i]; incr i} ! foreach wire $clipboard(wires) { set obj1 $_($wire:obj1) set obj2 $_($wire:obj2) *************** *** 2081,2092 **** #set canvas(copy_obj) $_($canvas(current):selection) #clean up ! foreach obj $canvas(copy_obj) {set _($obj:duplicate) 0} ! set $canvas(copied_obj) "" ! set $canvas(copy_obj) "" ! set $canvas(copy_wire) "" } def* Canvas cut {} { $@history atomically { $self copy --- 2081,2093 ---- #set canvas(copy_obj) $_($canvas(current):selection) #clean up ! foreach obj $clipboard(objs) {set _($obj:duplicate) 0} ! set $clipboard(copied_obj) "" ! set $clipboard(objs) "" ! set $clipboard(wires) "" } def* Canvas cut {} { + puts "history::: $@history" $@history atomically { $self copy *************** *** 2698,2702 **** proc update_object {x d ninlets noutlets} { ! global _ fields classinfo canvas set d [string trimright $d "\n"] set d [string trimright $d ";"] --- 2699,2703 ---- proc update_object {x d ninlets noutlets} { ! global _ fields classinfo canvas clipboard set d [string trimright $d "\n"] set d [string trimright $d ";"] *************** *** 2759,2769 **** } ! if {[info exists canvas(copy)]} { ! if {$canvas(copy)} { puts "copying stuff................ $x" $x selected?= 1 lappend _($canvas(current):selection) $x ! lappend canvas(copied_obj) $x ! if {[llength $canvas(copy_obj)] == [llength $canvas(copied_obj)]} { $canvas(current) paste_wires } --- 2760,2770 ---- } ! if {[info exists clipboard(copying)]} { ! if {$clipboard(copying)} { puts "copying stuff................ $x" $x selected?= 1 lappend _($canvas(current):selection) $x ! lappend clipboard(copied_obj) $x ! if {[llength $clipboard(objs)] == [llength $clipboard(copied_obj)]} { $canvas(current) paste_wires }

1 0

pd/src desire.tk,1.1.2.224,1.1.2.225
by Mathieu Bouchard 11 Jun '06

11 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1941 Modified Files: Tag: devel_0_39 desire.tk Log Message: oops (fixing previous commit) Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.224 retrieving revision 1.1.2.225 diff -C2 -d -r1.1.2.224 -r1.1.2.225 *** desire.tk 11 Jun 2006 15:23:14 -0000 1.1.2.224 --- desire.tk 11 Jun 2006 16:09:30 -0000 1.1.2.225 *************** *** 14,22 **** #-----------------------------------------------------------------------------------# ! source objective.tcl ! #set argh0 [file normalize [file join [pwd] $argv0]] ! #set our_tcl_dir [file join [file dirname [file dirname $argh0]] lib/pd/bin] ! #puts $our_tcl_dir ! #source $our_tcl_dir/objective.tcl #-----------------------------------------------------------------------------------# --- 14,24 ---- #-----------------------------------------------------------------------------------# ! set argh0 [file normalize [file join [pwd] $argv0]] ! set our_tcl_dir [file join [file dirname [file dirname $argh0]] lib/pd/bin] ! ! if {[catch {source objective.tcl}]} { ! puts "looking for objective.tcl in $our_tcl_dir" ! source $our_tcl_dir/objective.tcl ! } #-----------------------------------------------------------------------------------# *************** *** 2011,2015 **** def* Canvas paste {} { ! global canvas _ puts "***************************************" set windowx [winfo width .$self.c] --- 2013,2017 ---- def* Canvas paste {} { ! global canvas puts "***************************************" set windowx [winfo width .$self.c] *************** *** 2086,2089 **** --- 2088,2098 ---- } + def* Canvas cut {} { + $@history atomically { + $self copy + $self delete_selection + } + } + def* Canvas select_all {} { global look

1 0

pd/src desire.tk,1.1.2.223,1.1.2.224
by Mathieu Bouchard 11 Jun '06

11 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10512 Modified Files: Tag: devel_0_39 desire.tk Log Message: small fixes to class browser. popup menu entries now start with "popup_". Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.223 retrieving revision 1.1.2.224 diff -C2 -d -r1.1.2.223 -r1.1.2.224 *** desire.tk 11 Jun 2006 09:23:14 -0000 1.1.2.223 --- desire.tk 11 Jun 2006 15:23:14 -0000 1.1.2.224 *************** *** 15,18 **** --- 15,22 ---- source objective.tcl + #set argh0 [file normalize [file join [pwd] $argv0]] + #set our_tcl_dir [file join [file dirname [file dirname $argh0]] lib/pd/bin] + #puts $our_tcl_dir + #source $our_tcl_dir/objective.tcl #-----------------------------------------------------------------------------------# *************** *** 247,251 **** #option add *$tkclass*selectBackground #60b0b0 } ! # there are two palettes of 30 colours used in Pd --- 251,258 ---- #option add *$tkclass*selectBackground #60b0b0 } ! foreach tkclass {Listbox} { ! option add *$tkclass*background #c4d8b0 ! option add *$tkclass*selectBackground #88b060 ! } # there are two palettes of 30 colours used in Pd *************** *** 306,313 **** } proc say_namespace {k code} {uplevel 1 $code} proc say_category {text} {} - set argh0 [file normalize [file join [pwd] $argv0]] set cmdline(server) [list [file join [file dirname $argh0] pd]] set cmdline(rcfilename) ~/.pdrc --- 313,324 ---- } + proc can_say {k args} { + global text + return [info exist text($k)] + } + proc say_namespace {k code} {uplevel 1 $code} proc say_category {text} {} set cmdline(server) [list [file join [file dirname $argh0] pd]] set cmdline(rcfilename) ~/.pdrc *************** *** 2096,2100 **** } ! def Canvas help {} {global main; $main class_browser} def Canvas popup {id x y} { --- 2107,2111 ---- } ! def Canvas popup_help {} {global main; $main class_browser} def Canvas popup {id x y} { *************** *** 2104,2114 **** if {$id == ""} { $self populate_menu $p { ! {properties {} ""} ! {help {} ""}} } { $id populate_menu $p { ! {properties {} ""} ! {open {} ""} ! {help {} ""}} } tk_popup $p $x $y --- 2115,2125 ---- if {$id == ""} { $self populate_menu $p { ! {popup_properties {} ""} ! {popup_help {} ""}} } { $id populate_menu $p { ! {popup_properties {} ""} ! {popup_open {} ""} ! {popup_help {} ""}} } tk_popup $p $x $y *************** *** 3728,3747 **** def* ClassBrowser fill_box {s listbox} { - set f .$self.cl global class_list set n 0 - #$f.1 delete 0 end $listbox delete 0 end foreach class $class_list { if {[string length $s]==0 || [string first $s $class]>=0} { ! #$f.1 insert end "$class : [say $class]" ! set string "$class : [say $class]" ! $listbox insert end $string ! if {[string length $string] > [string length $@width]} {set @width [string length $string]} incr n } } if {$@name == "browser"} { - .$self.title configure -text [format [say "%d of %d object classes"] $n [llength $class_list]] } $listbox selection set 0 0 --- 3739,3761 ---- def* ClassBrowser fill_box {s listbox} { global class_list set n 0 $listbox delete 0 end foreach class $class_list { if {[string length $s]==0 || [string first $s $class]>=0} { ! if {[can_say $class]} { ! set t "\[$class\] [say $class]" ! } { ! set t "\[$class\]" ! } ! $listbox insert end $t ! set t "$class : [say $class]" ! $listbox insert end $t ! if {[string length $t] > [string length $@width]} {set @width [string length $t]} incr n } } + .$self.title configure -text [format [say how_many_object_classes] $n [llength $class_list]] if {$@name == "browser"} { } $listbox selection set 0 0 *************** *** 3768,3772 **** def* ClassBrowser info {listbox} { set i [$listbox curselection] ! set class [lindex [$listbox get $i] 0] pd pd update-class-info $class $self info_callback } --- 3782,3786 ---- def* ClassBrowser info {listbox} { set i [$listbox curselection] ! set class [string range [lindex [$listbox get $i] 0] 1 end-1] pd pd update-class-info $class $self info_callback } *************** *** 3799,3803 **** set b .$self.butt frame $b ! pack [label $b.1 -text "[say filter]: "] -side left pack [entry $b.2 -width 15] -side left pack [button $b.close -text [say close] -command "destroy .$self"] -side right --- 3813,3817 ---- set b .$self.butt frame $b ! pack [label $b.1 -text [say filter]] -side left pack [entry $b.2 -width 15] -side left pack [button $b.close -text [say close] -command "destroy .$self"] -side right *************** *** 3963,3967 **** set f .browser.cl set i [$f.1 curselection] ! set class [lindex [$f.1 get $i] 0] $f.3 delete 0.0 end $f.3 insert end "class $class\n" --- 3977,3981 ---- set f .browser.cl set i [$f.1 curselection] ! set class [string range [lindex [$f.1 get $i] 0] 1 end-1] $f.3 delete 0.0 end $f.3 insert end "class $class\n"

1 0

pd/src desire.tk,1.1.2.222,1.1.2.223
by chunlee 11 Jun '06

11 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23596 Modified Files: Tag: devel_0_39 desire.tk Log Message: copy/paste mostly working, need more test. Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.222 retrieving revision 1.1.2.223 diff -C2 -d -r1.1.2.222 -r1.1.2.223 *** desire.tk 10 Jun 2006 19:13:50 -0000 1.1.2.222 --- desire.tk 11 Jun 2006 09:23:14 -0000 1.1.2.223 *************** *** 1418,1422 **** class_new TextBox {Box} ! def TextBox draw {} { # TEXT = the text label # text = the input text field --- 1418,1422 ---- class_new TextBox {Box} ! def* TextBox draw {} { # TEXT = the text label # text = the input text field *************** *** 1556,1560 **** } ! def ObjectBox draw {} { $self update_size set xs $@xs --- 1556,1560 ---- } ! def* ObjectBox draw {} { $self update_size set xs $@xs *************** *** 1695,1699 **** if {$canvas(copy)} { lappend @selection_wire $x; $x selected?= 1 ! if {$i == $born_num} {set canvas(copy) 0} } } --- 1695,1702 ---- if {$canvas(copy)} { lappend @selection_wire $x; $x selected?= 1 ! if {$i == $born_num} { ! set canvas(copy) 0 ! set canvas(orig_cpcanvas) $self ! } } } *************** *** 1986,1991 **** --- 1989,1996 ---- global canvas if {$@selection != ""} { + set canvas(orig_cpcanvas) $self set canvas(copy_obj) $@selection set canvas(copy_wire) $@selection_wire + set canvas(copy_times) 0 puts "objects to copy::: $canvas(copy_obj)" puts "wires to copy::: $canvas(copy_wire)" *************** *** 1995,2016 **** def* Canvas paste {} { set windowx [winfo width .$self.c] set windowy [winfo height .$self.c] ! mset {x1off x2off } [lindex [.$self.c xview]] ! mset {y1off y2off } [lindex [.$self.c yview]] set offx [expr ($windowx * $x1off) / [expr $x2off - $x1off]] set offy [expr ($windowy * $y1off) / [expr $y2off - $y1off]] ! puts "window size:: $windowx $windowy" ! puts "canvas size:: [.$self.c cget -width] [.$self.c cget -height]" ! puts "canvas view:: [.$self.c xview] [.$self.c yview]" ! puts "canvas 0ff:: $offx $offy" ! global canvas _ ! set @selection "" set canvas(copied_obj) "" foreach item $canvas(copy_obj) { mset {x1 y1} [$item xy] ! puts "$item ::: $x1 $y1" ! if {$x1 < $offx | $x1 > [expr $offx+$windowx]} {set x1 [expr $x1 + $offx]} ! if {$y1 < $offx | $y1 > [expr $offx+$windowy]} {set y1 [expr $y1 + $offy]} if {$_($item:_class) == "Objectbox"} { set name $_($item:text) } else { --- 2000,2042 ---- def* Canvas paste {} { + global canvas _ + puts "***************************************" set windowx [winfo width .$self.c] set windowy [winfo height .$self.c] ! mset {x1off x2off } [.$self.c xview] ! mset {y1off y2off } [.$self.c yview] set offx [expr ($windowx * $x1off) / [expr $x2off - $x1off]] set offy [expr ($windowy * $y1off) / [expr $y2off - $y1off]] ! $self deselect_all set canvas(copied_obj) "" + if {$canvas(orig_cpcanvas) != $self} { set canvas(copy_times) 0 } else {incr canvas(copy_times)} + set notvisiblex 0 + set notvisibley 0 + set n 0 + foreach item $canvas(copy_obj) { mset {x1 y1} [$item xy] ! if {$x1 < $offx | $x1 > [expr $offx+$windowx]} {set notvisiblex 1} ! if {$y1 < $offx | $y1 > [expr $offx+$windowy]} {set notvisibley 1} ! if {$notvisiblex && $notvisibley} {incr n} ! } ! ! foreach item $canvas(copy_obj) { ! mset {x1 y1} [$item xy] ! if {$canvas(orig_cpcanvas) != $self} { ! if {$n == [llength $canvas(copy_obj)]} { ! set x1 [expr $x1 + $offx +($canvas(copy_times)*15)] ! set y1 [expr $y1 + $offy +($canvas(copy_times)*15)] ! } ! ! } else { ! if {$n == [llength $canvas(copy_obj)]} { ! set x1 [expr $x1 + $offx +($canvas(copy_times)*15)] ! set y1 [expr $y1 + $offy +($canvas(copy_times)*15)] ! } else { ! set x1 [expr $x1+($canvas(copy_times)*15)] ! set y1 [expr $y1+($canvas(copy_times)*15)] ! } ! } if {$_($item:_class) == "Objectbox"} { set name $_($item:text) } else { *************** *** 2039,2042 **** --- 2065,2070 ---- #$wire selected?= 0 } + #puts "selection:::::::: $_($canvas(current):selection)" + #set canvas(copy_obj) $_($canvas(current):selection) #clean up foreach obj $canvas(copy_obj) {set _($obj:duplicate) 0} *************** *** 2656,2661 **** set class [lindex $d $i] switch -- $class { ! #canvas {set class $class; set canvas(current) $x} ! canvas {set class $class} obj {set i 4; set class [lindex $d 4]} } --- 2684,2689 ---- set class [lindex $d $i] switch -- $class { ! canvas {set class $class; set canvas(current) $x} ! #canvas {set class $class} obj {set i 4; set class [lindex $d 4]} } *************** *** 2663,2669 **** if {![info exists _($x:_class)]} { # new object - if {[info exists classinfo($class)]} { set _($x:_class) [lindex $classinfo($class) 0] } { post BLEH --- 2691,2704 ---- if {![info exists _($x:_class)]} { # new object if {[info exists classinfo($class)]} { set _($x:_class) [lindex $classinfo($class) 0] + if {$_($x:_class) == "Canvas" && [llength $d] > 7} { + puts "------------- sub-patch -------------" + #set obj ${x}_obj + #puts "calling it $obj" + #ObjectBox new_as $obj + #set _($obj:text) [lindex $d 5] + #$obj draw + } } { post BLEH *************** *** 2710,2714 **** lappend _($canvas(current):selection) $x lappend canvas(copied_obj) $x ! if {[llength $canvas(copy_obj)] == [llength $canvas(copied_obj)]} {$canvas(current) paste_wires} } } --- 2745,2751 ---- lappend _($canvas(current):selection) $x lappend canvas(copied_obj) $x ! if {[llength $canvas(copy_obj)] == [llength $canvas(copied_obj)]} { ! $canvas(current) paste_wires ! } } } *************** *** 2873,2877 **** #class_new BlueBox {Box Labeled} ! def BlueBox draw {} { global look super --- 2910,2914 ---- #class_new BlueBox {Box Labeled} ! def* BlueBox draw {} { global look super

1 0

pd/src desire.tk,1.1.2.221,1.1.2.222
by chunlee 10 Jun '06

10 Jun '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12517 Modified Files: Tag: devel_0_39 desire.tk Log Message: moving $@selection with arrow keys worx, and start to fix some bugs for copy/paste Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.221 retrieving revision 1.1.2.222 diff -C2 -d -r1.1.2.221 -r1.1.2.222 *** desire.tk 4 Jun 2006 23:45:45 -0000 1.1.2.221 --- desire.tk 10 Jun 2006 19:13:50 -0000 1.1.2.222 *************** *** 405,409 **** set key(font_bomb) "" set key(tidy_up) "" ! set key(reload) "" set key(redraw) "" set key(crosshair) "" --- 405,409 ---- set key(font_bomb) "" set key(tidy_up) "" ! set key(reload) "Ctrl+r" set key(redraw) "" set key(crosshair) "" *************** *** 1125,1129 **** super global pd_opendir pd_tearoff OS cmdline look canvas ! set canvas(current) $self set name .$self set c .$self.c --- 1125,1129 ---- super global pd_opendir pd_tearoff OS cmdline look canvas ! set 5 $self set name .$self set c .$self.c *************** *** 1508,1512 **** $widget configure -state normal set @text [$widget get 1.0 1.end] - puts "text received after_key ----------------- $@text" #set l {} #foreach char [split $@text ""] {lappend l [scan $char %c]} --- 1508,1511 ---- *************** *** 1766,1770 **** .$(a)canvas.c move $self [expr $u-$x] [expr $v-$y] } ! def Canvas motion {x y mods state} { global font canvas --- 1765,1769 ---- .$(a)canvas.c move $self [expr $u-$x] [expr $v-$y] } ! def Canvas motion {x y mods state} { global font canvas *************** *** 1996,1999 **** --- 1995,2008 ---- def* Canvas paste {} { + set windowx [winfo width .$self.c] + set windowy [winfo height .$self.c] + mset {x1off x2off } [lindex [.$self.c xview]] + mset {y1off y2off } [lindex [.$self.c yview]] + set offx [expr ($windowx * $x1off) / [expr $x2off - $x1off]] + set offy [expr ($windowy * $y1off) / [expr $y2off - $y1off]] + puts "window size:: $windowx $windowy" + puts "canvas size:: [.$self.c cget -width] [.$self.c cget -height]" + puts "canvas view:: [.$self.c xview] [.$self.c yview]" + puts "canvas 0ff:: $offx $offy" global canvas _ set @selection "" *************** *** 2001,2004 **** --- 2010,2016 ---- foreach item $canvas(copy_obj) { mset {x1 y1} [$item xy] + puts "$item ::: $x1 $y1" + if {$x1 < $offx | $x1 > [expr $offx+$windowx]} {set x1 [expr $x1 + $offx]} + if {$y1 < $offx | $y1 > [expr $offx+$windowy]} {set y1 [expr $y1 + $offy]} if {$_($item:_class) == "Objectbox"} { set name $_($item:text) } else { *************** *** 2285,2289 **** #-----------------------------------------------------------------------------------# ! def Canvas key {x y key iso shift} { global OS _ set c .$self.c --- 2297,2301 ---- #-----------------------------------------------------------------------------------# ! def* Canvas key {x y key iso shift} { global OS _ set c .$self.c *************** *** 2325,2332 **** } ! #if {[string length $@focus] > 0} { ! # if {$@editmode} {set event keyedit} {set event key} ! # $@focus $event $self $key $shift ! #} } --- 2337,2381 ---- } ! switch $key { ! Up { ! if {$@selection != ""} { ! foreach item $@selection { ! mset {x1 y1 x2 y2} [$item bbox] ! pd .$self object_moveto !$item $x1 [expr $y1 - 1] ! $item draw_wires ! } ! } ! } ! Down { ! if {$@selection != ""} { ! foreach item $@selection { ! mset {x1 y1 x2 y2} [$item bbox] ! pd .$self object_moveto !$item $x1 [expr $y1 + 1] ! $item draw_wires ! } ! } ! } ! Left { ! if {$@selection != ""} { ! foreach item $@selection { ! mset {x1 y1 x2 y2} [$item bbox] ! pd .$self object_moveto !$item [expr $x1-1] $y1 ! $item draw_wires ! } ! } ! } ! Right { ! if {$@selection != ""} { ! foreach item $@selection { ! mset {x1 y1 x2 y2} [$item bbox] ! pd .$self object_moveto !$item [expr $x1+1] $y1 ! $item draw_wires ! } ! } ! } ! default {} ! } ! ! } *************** *** 2361,2365 **** } ! def* Box draw_wires {} { puts "wires:$@wires" foreach wire $@wires {$wire draw} --- 2410,2414 ---- } ! def Box draw_wires {} { puts "wires:$@wires" foreach wire $@wires {$wire draw} *************** *** 4543,4550 **** set accels [dict remove $accels $old_key] dict set accels $new_key $cmd } } ! if {[dict exists $check_key $new_key]} { ! error "$new_key already assigned" } else {dict set check_key $new_key key($item)} set key($item) $new_key puts $fd "$type $item $new_key" --- 4592,4602 ---- 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

externals/zexy/examples msgfile.pd,1.2,1.3
by IOhannes m zmölnig 08 Jun '06

08 Jun '06

Update of /cvsroot/pure-data/externals/zexy/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23716/examples Modified Files: msgfile.pd Log Message: cleaned up help-patch (split into several sub-patches) Index: msgfile.pd =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/examples/msgfile.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** msgfile.pd 22 Mar 2005 20:58:19 -0000 1.2 --- msgfile.pd 8 Jun 2006 10:45:33 -0000 1.3 *************** *** 1,117 **** ! #N canvas 127 0 1027 898 10; ! #X msg 463 10 rewind; ! #X obj 392 853 print done; ! #X text 575 665 read a file; ! #X text 609 686 write one; ! #X text 23 356 see also:; ! #X text 512 9 go to beginning; ! #X msg 466 223 bang; ! #X text 474 724 write a file \, terminating lines only with carriage ! return (omitting semicolons.) You can read files this way too \, in ! which case carriage returns are mapped to semicolons.; ! #X obj 355 871 print list; ! #X msg 466 281 clear; ! #X text 73 872 this outlet gets the lines in sequence.; ! #X msg 470 571 set 2 4 6 8; ! #X text 576 570 clear and then add one message; ! #X msg 466 388 add cis boom bah; ! #X msg 465 407 add2 bang; ! #X msg 465 782 print; ! #X text 507 784 debugging printout; #X obj 73 9 msgfile; #X text 127 9 read and write messages into text files; ! #X obj 355 815 msgfile; ! #X obj 84 357 textfile; #X text 18 57 The msgfile object is derived from the textfile object and expands its features.; #X text 15 97 new features are :; #X text 127 110 insert \, append \, delete \, replace; ! #X msg 464 33 end; ! #X text 511 33 go the the end; ! #X msg 462 84 skip -1; ! #X msg 463 181 next; ! #X msg 462 139 prev; ! #X msg 462 108 where; ! #X text 515 107 where are we now ?; ! #X msg 463 160 this; ! #X text 516 84 go to the <n>th line from here; ! #X text 512 58 go to line number <n>; ! #X text 515 220 output one line as a list and move to the next; ! #X text 520 282 empty the object; ! #X msg 467 321 delete 2; ! #X text 9 183 changed behaviour :; ! #X text 130 183 add2 : read "add too" \; append to an existing line ; ! #X text 602 433 insert a message before the current line; ! #X text 605 455 add to the previous line (CHANGED BEHAVIOUR !!!); ! #X text 567 405 add to the last line (CHANGED BEHAVIOUR !!!); ! #X text 568 385 add a message at the end of the object; ! #X msg 467 489 append after the break of dawn; ! #X text 661 486 add a message at the current position; ! #X text 660 506 add to the current line (CHANGED BEHAVIOUR !!!); ! #X msg 468 537 replace the new day; ! #X text 660 537 replace the current line; ! #X msg 466 437 insert before sunrise; ! #X msg 466 455 insert2 inserted; ! #X msg 467 508 append2 appendix; ! #X msg 467 250 flush; ! #X text 516 249 output all lines; ! #X text 467 836 This outlet gets a bang when you hit the end of the sequence \; it will also get the current position when using "when" ; - #X msg 467 666 read msgfile.txt; - #X msg 467 708 write /tmp/msgfile2.txt cr; - #X msg 466 761 read msgfile2.txt cr; - #X text 511 139 output the previous line; - #X text 513 179 output the next line; - #X text 511 159 output the current line; - #X msg 462 59 goto 8; - #X msg 467 301 delete; - #X text 521 302 delete the current line; - #X text 524 321 delete the specified line; - #X msg 467 340 delete 4 7; - #X text 535 341 delete the specified region; - #X msg 467 360 delete 7 4; - #X msg 467 687 write /tmp/msgfile.txt; - #X text 538 360 delete all but the specified region; - #X msg 472 600 find test 6; - #X msg 472 619 find test * 7 *; - #X text 576 606 find a matching list ("*" is the only wildcard supported) - ; #X text 127 97 end \, goto \, skip; #X text 131 127 flush \, where \, this \, prev \, next; #X text 128 145 find; #X text 73 163 read/write can handle csv files too; ! #X text 890 17 part of zexy; ! #X connect 0 0 19 0; ! #X connect 6 0 19 0; ! #X connect 9 0 19 0; ! #X connect 11 0 19 0; ! #X connect 13 0 19 0; ! #X connect 14 0 19 0; ! #X connect 15 0 19 0; ! #X connect 19 0 8 0; ! #X connect 19 1 1 0; ! #X connect 24 0 19 0; ! #X connect 26 0 19 0; ! #X connect 27 0 19 0; ! #X connect 28 0 19 0; ! #X connect 29 0 19 0; ! #X connect 31 0 19 0; ! #X connect 36 0 19 0; ! #X connect 43 0 19 0; ! #X connect 46 0 19 0; ! #X connect 48 0 19 0; ! #X connect 49 0 19 0; ! #X connect 50 0 19 0; ! #X connect 51 0 19 0; ! #X connect 54 0 19 0; ! #X connect 55 0 19 0; ! #X connect 56 0 19 0; ! #X connect 60 0 19 0; ! #X connect 61 0 19 0; ! #X connect 64 0 19 0; ! #X connect 66 0 19 0; ! #X connect 67 0 19 0; ! #X connect 69 0 19 0; ! #X connect 70 0 19 0; --- 1,168 ---- ! #N canvas 94 78 859 363 10; ! #X obj 443 239 print done; ! #X text 72 260 see also:; ! #X msg 443 39 bang; ! #X text 334 293 this outlet gets the lines in sequence.; #X obj 73 9 msgfile; #X text 127 9 read and write messages into text files; ! #X obj 406 201 msgfile; ! #X obj 133 261 textfile; #X text 18 57 The msgfile object is derived from the textfile object and expands its features.; #X text 15 97 new features are :; #X text 127 110 insert \, append \, delete \, replace; ! #X text 492 36 output one line as a list and move to the next; ! #X text 90 201 add2 : read "add too" \; append to an existing line ; ! #X text 508 222 This outlet gets a bang when you hit the end of the sequence \; it will also get the current position when using "when" ; #X text 127 97 end \, goto \, skip; #X text 131 127 flush \, where \, this \, prev \, next; #X text 128 145 find; #X text 73 163 read/write can handle csv files too; ! #X text 618 7 part of zexy; ! #N canvas 347 164 646 300 navigation 0; ! #X obj 54 272 outlet; ! #X msg 91 140 rewind; ! #X text 140 139 go to beginning; ! #X msg 92 163 end; ! #X text 139 163 go the the end; ! #X msg 92 214 skip -1; ! #X msg 92 238 where; ! #X text 145 237 where are we now ?; ! #X text 146 214 go to the <n>th line from here; ! #X text 142 188 go to line number <n>; ! #X msg 92 189 goto 8; ! #X text 44 38 navigating through the lines of a [msgfile]; ! #X text 42 62 these messages will not output any data; ! #X text 41 80 'where' will output the position of the "cursor" at the ! 2nd outlet of [msgfile]; ! #X connect 1 0 0 0; ! #X connect 3 0 0 0; ! #X connect 5 0 0 0; ! #X connect 6 0 0 0; ! #X connect 10 0 0 0; ! #X restore 443 84 pd navigation; ! #N canvas 0 0 458 426 data 0; ! #X obj 54 332 outlet; ! #X msg 105 143 bang; ! #X msg 103 231 next; ! #X msg 102 189 prev; ! #X msg 103 210 this; ! #X text 154 140 output one line as a list and move to the next; ! #X text 151 189 output the previous line; ! #X text 153 229 output the next line; ! #X text 151 209 output the current line; ! #X msg 104 264 flush; ! #X text 153 263 output all lines; ! #X text 39 37 get the contents of the [msgfile] line-by-line; ! #X text 37 63 'prev' \, 'this' \, 'next' and 'flush' will not alter ! the current "cursor" position.; ! #X connect 1 0 0 0; ! #X connect 2 0 0 0; ! #X connect 3 0 0 0; ! #X connect 4 0 0 0; ! #X connect 9 0 0 0; ! #X restore 443 64 pd data retrieval; ! #N canvas 0 0 669 573 editing 0; ! #X obj 54 512 outlet; ! #X msg 137 101 clear; ! #X msg 140 481 set 2 4 6 8; ! #X text 246 480 clear and then add one message; ! #X msg 136 258 add cis boom bah; ! #X msg 136 277 add2 bang; ! #X text 190 102 empty the object; ! #X msg 137 161 delete 2; ! #X text 272 303 insert a message before the current line; ! #X text 238 255 add a message at the end of the object; ! #X msg 137 359 append after the break of dawn; ! #X text 331 356 add a message at the current position; ! #X msg 138 437 replace the new day; ! #X text 330 437 replace the current line; ! #X msg 136 306 insert before sunrise; ! #X msg 136 325 insert2 inserted; ! #X msg 137 378 append2 appendix; ! #X msg 137 141 delete; ! #X text 191 142 delete the current line; ! #X text 194 161 delete the specified line; ! #X msg 137 180 delete 4 7; ! #X text 205 181 delete the specified region; ! #X msg 137 200 delete 7 4; ! #X text 208 200 delete all but the specified region; ! #X text 56 39 editing (adding \, modifying \, deleting) the content ! if the [msgfile]; ! #X text 237 275 add to the last line (INCOMPATIBLE with [textfile]) ! ; ! #X text 275 325 add to the previous line (INCOMPATIBLE with [textfile]) ! ; ! #X text 330 379 add to the current line (INCOMPATIBLE with [textfile]) ! ; ! #X connect 1 0 0 0; ! #X connect 2 0 0 0; ! #X connect 4 0 0 0; ! #X connect 5 0 0 0; ! #X connect 7 0 0 0; ! #X connect 10 0 0 0; ! #X connect 12 0 0 0; ! #X connect 14 0 0 0; ! #X connect 15 0 0 0; ! #X connect 16 0 0 0; ! #X connect 17 0 0 0; ! #X connect 20 0 0 0; ! #X connect 22 0 0 0; ! #X restore 443 104 pd editing; ! #N canvas -25 21 576 302 searching 0; ! #X obj 54 272 outlet; ! #X msg 70 180 find test 6; ! #X msg 70 239 find test * 7 *; ! #X text 73 61 searching (and finding) lines within the [msgfile]; ! #X text 177 241 you can use '*' as a wildchard for a single atom. '*' ! is the only wildcard supported; ! #X text 174 178 find a matching list \, starting at the current position ! ; ! #X msg 72 208 find the new day; ! #X text 76 130 if the search fails \, a 'bang' is emitted at the 2nd ! outlet; ! #X text 77 99 if the searched list is found \, then the linenumber ! and the list is output (via the 2nd and 1st outlet).; ! #X connect 1 0 0 0; ! #X connect 2 0 0 0; ! #X connect 6 0 0 0; ! #X restore 443 124 pd searching; ! #N canvas 0 0 626 356 file-i/o 0; ! #X obj 54 272 outlet; ! #X text 195 75 read a file; ! #X text 229 96 write one; ! #X text 254 164 write a file \, terminating lines only with carriage ! return (omitting semicolons.) You can read files this way too \, in ! which case carriage returns are mapped to semicolons.; ! #X msg 87 76 read msgfile.txt; ! #X msg 87 168 write /tmp/msgfile2.txt cr; ! #X msg 87 191 read msgfile2.txt cr; ! #X msg 87 97 write /tmp/msgfile.txt; ! #X text 51 26 reading from and writing the contents of [msgfile] to ! files; ! #X connect 4 0 0 0; ! #X connect 5 0 0 0; ! #X connect 6 0 0 0; ! #X connect 7 0 0 0; ! #X restore 443 144 pd file-i/o; ! #N canvas 0 0 450 199 misc 0; ! #X obj 84 142 outlet; ! #X msg 84 112 print; ! #X text 40 72 miscellaneous functionality of [msgfile]; ! #X text 126 114 debugging printout of the contents to the console; ! #X connect 1 0 0 0; ! #X restore 443 164 pd misc; ! #X obj 406 267 print data; ! #X text 9 183 incompatible with [textfile] :; ! #X connect 2 0 6 0; ! #X connect 6 0 25 0; ! #X connect 6 1 0 0; ! #X connect 19 0 6 0; ! #X connect 20 0 6 0; ! #X connect 21 0 6 0; ! #X connect 22 0 6 0; ! #X connect 23 0 6 0; ! #X connect 24 0 6 0;

1 0

externals/zexy/src msgfile.c,1.11,1.12
by IOhannes m zmölnig 08 Jun '06

08 Jun '06

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23371/src Modified Files: msgfile.c Log Message: fixed search Index: msgfile.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/msgfile.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** msgfile.c 7 Jun 2006 15:24:37 -0000 1.11 --- msgfile.c 8 Jun 2006 10:45:04 -0000 1.12 *************** *** 436,440 **** t_msglist *found = 0; t_msglist *cur=x->current; - ZEXY_USEVAR(s); while (cur) { --- 436,439 ---- *************** *** 444,452 **** t_atom *this = cur->thislist; ! if(0==this)continue; if (ac < n) n = ac; ! while (n--) { if ( (strcmp("*", atom_getsymbol(that)->s_name) && atomcmp(that, this)) ) { equal = 0; --- 443,454 ---- t_atom *this = cur->thislist; ! if(0==this){ ! cur=cur->next; ! continue; ! } if (ac < n) n = ac; ! while (n-->0) { if ( (strcmp("*", atom_getsymbol(that)->s_name) && atomcmp(that, this)) ) { equal = 0;

1 0

externals/zexy/src msgfile.c,1.10,1.11
by IOhannes m zmölnig 07 Jun '06

07 Jun '06

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14408/src Modified Files: msgfile.c Log Message: hopefully fixed a bug discovered by p8r: 1st line was not read (or rather "output"); i guess this has more to do withpd>0=0.39 but you never no...; more testing needs to be done! Index: msgfile.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/msgfile.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** msgfile.c 5 Apr 2006 11:27:26 -0000 1.10 --- msgfile.c 7 Jun 2006 15:24:37 -0000 1.11 *************** *** 96,100 **** t_msglist *cur=x->current; ! if (cur) { t_atom *ap; --- 96,103 ---- t_msglist *cur=x->current; ! if(ac&&av&&A_SYMBOL==av->a_type&&gensym("")==atom_getsymbol(av)){ ! /* ignoring empty symbols! */ ! return; ! } if (cur) { t_atom *ap; *************** *** 235,239 **** msgfile_goto(x, i); - } --- 238,241 ---- *************** *** 521,527 **** int fd; ! long readlength, length; char filnam[MAXPDSTRING], namebuf[MAXPDSTRING]; char buf[MAXPDSTRING], *bufptr, *readbuf; char*dirname=canvas_getdir(x->x_canvas)->s_name; --- 523,530 ---- int fd; ! long readlength, length, pos; char filnam[MAXPDSTRING], namebuf[MAXPDSTRING]; char buf[MAXPDSTRING], *bufptr, *readbuf; + char *charbinbuf=NULL, *cbb; char*dirname=canvas_getdir(x->x_canvas)->s_name; *************** *** 543,561 **** return; } - } else { - close (fd); - - namebuf[0] = 0; - if (*buf) - strcat(namebuf, buf), strcat(namebuf, "/"); - strcat(namebuf, bufptr); - - /* open and get length */ - sys_bashfilename(namebuf, filnam); - - if ((fd = open(filnam, rmode)) < 0) { - error("msgfile_read: unable to open %s", filnam); - return; - } } --- 546,549 ---- *************** *** 572,576 **** case CR_MODE: separator = ' '; ! eol = ' '; break; case CSV_MODE: --- 560,564 ---- case CR_MODE: separator = ' '; ! eol = '\n'; break; case CSV_MODE: *************** *** 579,583 **** break; default: ! separator = ' '; eol = ';'; break; --- 567,571 ---- break; default: ! separator = '\n'; eol = ';'; break; *************** *** 602,623 **** close(fd); ! /* undo separators and eols */ bufptr=readbuf; while (readlength--) { if (*bufptr == separator) { ! *bufptr = ' '; } ! else if ((*bufptr == eol) && (bufptr[1] == '\n')) *bufptr = ';'; bufptr++; } ! /* convert to binbuf */ ! binbuf_text(bbuf, readbuf, length); msgfile_binbuf2listbuf(x, bbuf); ! binbuf_free(bbuf); t_freebytes(readbuf, length); } --- 590,640 ---- close(fd); ! /* convert separators and eols to what pd expects in a binbuf*/ bufptr=readbuf; + # define MSGFILE_HEADROOM 1024 + + charbinbuf=(char*)getbytes(length+MSGFILE_HEADROOM); + cbb=charbinbuf; + for(pos=0; pos<length+MSGFILE_HEADROOM; pos++)charbinbuf[pos]=0; + + *cbb++=';'; + pos=1; while (readlength--) { + if(pos>=length+MSGFILE_HEADROOM){ + error("msgfile: read error (headroom %d too small!)", MSGFILE_HEADROOM); + goto read_error; + break; + } if (*bufptr == separator) { ! *cbb = ' '; ! } else if (*bufptr==eol) { ! *cbb++=';';pos++; ! *cbb='\n'; } ! else { ! *cbb=*bufptr; ! } ! bufptr++; + cbb++; + pos++; } ! #if 0 ! // if(';'==cbb[-1])cbb[-1]=0; ! pos--; ! while(pos>0&&('\n'==charbinbuf[pos]||';'==charbinbuf[pos]||' '==charbinbuf[pos])){ ! charbinbuf[pos]=0; ! pos--; ! } ! #endif /* convert to binbuf */ ! binbuf_text(bbuf, charbinbuf, length+MSGFILE_HEADROOM); msgfile_binbuf2listbuf(x, bbuf); ! read_error: binbuf_free(bbuf); t_freebytes(readbuf, length); + t_freebytes(charbinbuf, length+MSGFILE_HEADROOM); }

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
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