Pd-cvs June 2005

pd-cvs@lists.iem.at

14 participants
211 discussions

pd/src s_audio_pa.c,1.4.4.8,1.4.4.9
by Tim Blechmann 22 Jun '05

22 Jun '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5798 Modified Files: Tag: devel_0_38 s_audio_pa.c Log Message: cleanup of the scheduler handling Index: s_audio_pa.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_pa.c,v retrieving revision 1.4.4.8 retrieving revision 1.4.4.9 diff -C2 -d -r1.4.4.8 -r1.4.4.9 *** s_audio_pa.c 17 Jun 2005 15:25:19 -0000 1.4.4.8 --- s_audio_pa.c 22 Jun 2005 18:46:31 -0000 1.4.4.9 *************** *** 48,53 **** static PaStreamCallback *pa_callback = NULL; - extern int sys_keepsched; /* defined in m_sched.c */ - int process (const void *input, void *output, unsigned long frameCount, const PaStreamCallbackTimeInfo* timeInfo, --- 48,51 ---- *************** *** 65,70 **** pa_callback = NULL; ! sys_keepsched = 0; ! sys_callbackscheduler = schedmode; /* Initialize PortAudio */ --- 63,67 ---- pa_callback = NULL; ! sys_setscheduler(schedmode); /* Initialize PortAudio */

1 0

pd/src x_connective.c,1.3.4.1,1.3.4.2
by Tim Blechmann 22 Jun '05

22 Jun '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5437 Modified Files: Tag: devel_0_38 x_connective.c Log Message: avoid creating of zero / one element lists by route Index: x_connective.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_connective.c,v retrieving revision 1.3.4.1 retrieving revision 1.3.4.2 diff -C2 -d -r1.3.4.1 -r1.3.4.2 *** x_connective.c 11 Nov 2004 22:30:43 -0000 1.3.4.1 --- x_connective.c 22 Jun 2005 18:45:20 -0000 1.3.4.2 *************** *** 492,496 **** outlet_anything(e->e_outlet, argv[0].a_w.w_symbol, argc-1, argv+1); ! else outlet_list(e->e_outlet, 0, argc, argv); return; } --- 492,513 ---- outlet_anything(e->e_outlet, argv[0].a_w.w_symbol, argc-1, argv+1); ! else ! /* tb {: avoid 1 element lists */ ! { ! if (argc > 1) /* list */ ! outlet_list(e->e_outlet, 0, argc, argv); ! ! else if (argc == 0) /* bang */ ! outlet_bang(e->e_outlet); ! ! else /* argc == 1 */ ! if (argv[0].a_type == A_FLOAT) ! outlet_float(e->e_outlet, argv[0].a_w.w_float); ! else if (argv[0].a_type == A_SYMBOL) ! outlet_symbol(e->e_outlet, argv[0].a_w.w_symbol); ! else if (argv[0].a_type == A_POINTER) ! outlet_pointer(e->e_outlet, argv[0].a_w.w_gpointer); ! /* tb } */ ! } return; } *************** *** 506,510 **** { float f; ! if (!argc) return; f = atom_getfloat(argv); for (nelement = x->x_nelement, e = x->x_vec; nelement--; e++) --- 523,531 ---- { float f; ! if (!argc) { ! /* no args: treat as "bang" and thus reject */ ! outlet_bang(x->x_rejectout); ! return; ! } f = atom_getfloat(argv); for (nelement = x->x_nelement, e = x->x_vec; nelement--; e++) *************** *** 514,518 **** outlet_anything(e->e_outlet, argv[1].a_w.w_symbol, argc-2, argv+2); ! else outlet_list(e->e_outlet, 0, argc-1, argv+1); return; } --- 535,558 ---- outlet_anything(e->e_outlet, argv[1].a_w.w_symbol, argc-2, argv+2); ! else /* outlet_list(e->e_outlet, 0, argc-1, argv+1); */ ! /* tb {: avoid 1 element lists */ ! { ! argc -= 1, argv+=1; ! if (argc > 1) /* list */ ! outlet_list(e->e_outlet, 0, argc, argv); ! ! else if (argc == 0) /* bang */ ! outlet_bang(e->e_outlet); ! ! else /* argc == 1 */ ! if (argv[0].a_type == A_FLOAT) ! outlet_float(e->e_outlet, argv[0].a_w.w_float); ! else if (argv[0].a_type == A_SYMBOL) ! outlet_symbol(e->e_outlet, argv[0].a_w.w_symbol); ! else if (argv[0].a_type == A_POINTER) ! outlet_pointer(e->e_outlet, argv[0].a_w.w_gpointer); ! /* tb } */ ! } ! return; } *************** *** 591,594 **** --- 631,655 ---- x->x_type = argv[0].a_type; x->x_nelement = argc; + + /* type checking: arguments must bei either floats xor symbols */ + if (x->x_type == A_FLOAT) + { + for(n=0; n<argc; n++) + if (argv[n].a_type!=A_FLOAT) + { + pd_error(x, "route: cannot route floats and symbols at the same time"); + return 0; + } + } + else + { + for(n=0; n<argc; n++) + if(argv[n].a_type==A_FLOAT) + { + pd_error(x, "route: cannot route symbols and floats at the same time"); + return 0; + } + } + x->x_vec = (t_routeelement *)getbytes(argc * sizeof(*x->x_vec)); for (n = 0, e = x->x_vec; n < argc; n++, e++)

1 0

pd/src m_simd_sse_gcc.c,1.1.4.13,1.1.4.14
by Tim Blechmann 22 Jun '05

22 Jun '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4295 Modified Files: Tag: devel_0_38 m_simd_sse_gcc.c Log Message: allow building with -fPIC Index: m_simd_sse_gcc.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_simd_sse_gcc.c,v retrieving revision 1.1.4.13 retrieving revision 1.1.4.14 diff -C2 -d -r1.1.4.13 -r1.1.4.14 *** m_simd_sse_gcc.c 6 May 2005 09:40:07 -0000 1.1.4.13 --- m_simd_sse_gcc.c 22 Jun 2005 18:42:58 -0000 1.1.4.14 *************** *** 950,955 **** int simd_runtime_check() { ! unsigned int eax, edx; ! __asm__("cpuid" : "=a"(eax),"=d"(edx) : "a" (1): "bx", "cx"); return (0x2000000 & edx); } --- 950,958 ---- int simd_runtime_check() { ! unsigned int eax, ebx, ecx, edx; ! __asm__("push %%ebx \n" /* ebx might be used as PIC register :-( */ ! "cpuid \n" ! "pop %%ebx \n" ! : "=a"(eax),"=d"(edx) : "a" (1): "cx"); return (0x2000000 & edx); }

1 0

extensions/gui/ix mat.wid,1.11,1.12
by carmen rocco 22 Jun '05

22 Jun '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11464 Modified Files: mat.wid Log Message: ... Index: mat.wid =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/mat.wid,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mat.wid 21 Jun 2005 19:25:04 -0000 1.11 --- mat.wid 21 Jun 2005 22:27:54 -0000 1.12 *************** *** 15,23 **** proc mat_scroll {p t d axis} { variable _ - puts "Scroll0: $_($t:xa) $_($t:xb) $_($t:ya) $_($t:yb)" foreach xy $axis { set mv [expr ($_($t:${xy}b) - $_($t:${xy}a)) / 4.0] foreach ab {a b} {set _($t:${xy}$ab) [expr $_($t:${xy}$ab) $d $mv]}} - puts "Scroll1: $_($t:xa) $_($t:xb) $_($t:ya) $_($t:yb)" mat_redraw $p $t all mat_gridlines $p $t --- 15,21 ---- *************** *** 29,33 **** start { foreach xy {x y} {set _($t:c$xy) [set $xy];set _($t:f$xy) [set $xy]} - # $p.m create path [::tkpath::coords rect $_($t:cx) $_($t:cy) 0 0 -rx 12 -ry 12] -tags sel -fill cyan -stroke white -fillopacity 0.2 $p.m create path [::tkpath::coords rect $_($t:cx) $_($t:cy) 0 0 -rx 12 -ry 12] -tags sel -stroke [rc] -strokewidth 12 -strokeopacity 0.3 --- 27,30 ---- *************** *** 137,141 **** if {[$p.m find withtag sel] ne ""} { set clicked [$p.m find overlapping $x $y $_($t:fx) $_($t:fy)] - puts sel mat_sel motion $p $t $x $y } else { --- 134,137 ---- *************** *** 152,163 **** } } ! # set junk $clicked ! # foreach cfg [$p.m itemconfigure $clicked] {set junk "$junk\n$cfg"} ! # mat_info $p $t $junk } ! proc mat_click {m button action p t x y} { variable _ - # puts "$m $button $action" set clicked [$p.m find overlapping $x $y $x $y] set a [$p.m itemcget mode -text] --- 148,156 ---- } } ! mat_loc $p $t $x $y } ! proc mat_click {m button action p t x y X Y} { variable _ set clicked [$p.m find overlapping $x $y $x $y] set a [$p.m itemcget mode -text] *************** *** 181,185 **** } 2 {mat_mode $p $t resize_canvas} ! 3 {mat_mode $p $t object_trans} } } --- 174,184 ---- } 2 {mat_mode $p $t resize_canvas} ! 3 { ! if {$clicked ne "" && [lindex [$p.m itemcget [lindex $clicked 0] -tags] 0] eq "item"} { ! mat_mode $p $t object_trans ! } else { ! mat_rmenu $p $t $X $Y ! } ! } } } *************** *** 198,218 **** } proc mat_tr {p t d inv v} { variable _ array set dm {x width y height} switch $inv { t {return [expr ($v - $_($t:${d}a)) / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m]]} i {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0) + $_($t:${d}a)]} d {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0)]} ! # id {return [expr $v / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m]]} id {return [expr abs($v / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m])]}}} ! proc mat_zoomReset {p t} { variable _ ! set _($t:ya) $_($t:yao);set _($t:yb) $_($t:ybo);set _($t:xa) $_($t:xao);set _($t:xb) $_($t:xbo) ! mat_gridlines $p $t} proc mat_key {p t k b} { ! puts $k switch $b { 1 { --- 197,270 ---- } + proc mat_rmenu {p t x y} { + if {[winfo exists $p.rmenu] != 1} { + set m [menu $p.rmenu -tearoff no] + $m add command -label "zoom to fit" -command "::ix::mat_zoom $p $t fit" + $m add command -label "reset zoom" -command "::ix::mat_zoom $p $t reset" + $m add command -label "jupas" -command {} -state disabled + $m add command -label "frukas" -command {} -state disabled + } else { + # $p.rmenu entryconfigure 0 -label $x + } + tk_popup $p.rmenu $x $y + } + proc mat_tr {p t d inv v} { variable _ array set dm {x width y height} switch $inv { + #value->pixels t {return [expr ($v - $_($t:${d}a)) / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m]]} + + #pixels->value i {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0) + $_($t:${d}a)]} + + #pixels->value (distance) d {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0)]} ! ! #values->pixel (distance) ! # id {return [expr $v / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m]]} id {return [expr abs($v / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m])]}}} ! proc mat_zoom {p t a} { variable _ ! switch $a { ! fit { ! set i 0 ! dict for {s xy} $_($t) { ! dict with xy { ! if {$i == 0} { ! set xa $x ! set xb $x ! set ya $y ! set yb $y ! } ! if {$x > $xb} {set xb $x} ! if {$x < $xa} {set xa $x} ! if {$y > $yb} {set yb $y} ! if {$y < $ya} {set ya $y} ! if {$xx > $xb} {set xb $xx} ! if {$xx < $xa} {set xa $xx} ! if {$yy > $yb} {set yb $yy} ! if {$yy < $ya} {set ya $yy} ! incr i ! } ! } ! set _($t:xa) $xa ! set _($t:xb) $xb ! set _($t:ya) $ya ! set _($t:yb) $yb ! puts "new: $_($t:xa) $_($t:xb) $_($t:ya) $_($t:yb)" ! } ! reset { ! set _($t:ya) $_($t:yao);set _($t:yb) $_($t:ybo);set _($t:xa) $_($t:xao);set _($t:xb) $_($t:xbo) ! } ! } ! mat_redraw $p $t all ! mat_gridlines $p $t ! } proc mat_key {p t k b} { ! # puts $k switch $b { 1 { *************** *** 231,236 **** $p.m itemconfigure mode -text $m } ! proc mat_info {p t m} { ! $p.m itemconfigure info -text $m } --- 283,288 ---- $p.m itemconfigure mode -text $m } ! proc mat_loc {p t x y} { ! $p.m itemconfigure loc -text [list [mat_tr $p $t x i $x] [mat_tr $p $t y i $y]] } *************** *** 238,241 **** --- 290,294 ---- variable _ set i 0 + set _($t) {} foreach xy {x y} {foreach ab {a b} {set ${xy}${ab}o [set ${xy}${ab}]}} foreach a {i ln xa xb ya yb xao xbo yao ybo qx qy} {set _($t:$a) [set $a]} *************** *** 254,268 **** set b [list [concat $bn first] [concat B${bn}-Motion motion] [concat ButtonRelease-$bn release]] foreach ba {0 1 2} { ! bind $p.m <$m[lindex [lindex $b $ba] 0]> "::ix::mat_click [list [string tolower [string trimright $m -1]]] $bn [lindex [lindex $b $ba] 1] $p $t %x %y"}}} set bd [expr {[$p cget -bd] * 2}] $p configure -bg gray -width [expr [winfo width $p.m] + $bd] -height [expr [winfo height $p.m] + $bd] $p.m create text {20 20} -fill blue -justify left -anchor w -font {{bitstream vera sans} 18} -tags mode -text action ! $p.m create text "10 $h" -fill red -justify left -anchor sw -font {{bitstream vera sans} 12 bold} -fill red -tags snap -text "snap (off)" ! $p.m create text {20 32} -fill gray49 -justify left -anchor nw -font {{bitstream vera sans} 12} -tags info mat_gridlines $p $t}} proc mat_gridlines {p t} { variable _ - # puts gridlines set w $p.m $w delete gridlines --- 307,319 ---- set b [list [concat $bn first] [concat B${bn}-Motion motion] [concat ButtonRelease-$bn release]] foreach ba {0 1 2} { ! bind $p.m <$m[lindex [lindex $b $ba] 0]> "::ix::mat_click [list [string tolower [string trimright $m -1]]] $bn [lindex [lindex $b $ba] 1] $p $t %x %y %X %Y"}}} set bd [expr {[$p cget -bd] * 2}] $p configure -bg gray -width [expr [winfo width $p.m] + $bd] -height [expr [winfo height $p.m] + $bd] $p.m create text {20 20} -fill blue -justify left -anchor w -font {{bitstream vera sans} 18} -tags mode -text action ! $p.m create text "10 $h" -fill red -justify left -anchor sw -font {{bitstream vera sans} 12 bold} -fill purple -tags loc -text "" mat_gridlines $p $t}} proc mat_gridlines {p t} { variable _ set w $p.m $w delete gridlines

1 0

extensions/gui/ix mat.wid,1.10,1.11
by carmen rocco 21 Jun '05

21 Jun '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14457 Modified Files: mat.wid Log Message: perl: sucks perl: warning: Setting locale failed. perl: warning: Please check that your locale settings: LANGUAGE = (unset), LC_ALL = "en", LANG = (unset) are supported and installed on your system. perl: warning: Falling back to the standard locale ("C"). Index: mat.wid =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/mat.wid,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** mat.wid 20 Jun 2005 17:04:34 -0000 1.10 --- mat.wid 21 Jun 2005 19:25:04 -0000 1.11 *************** *** 1,5 **** package require tkpath namespace eval ::ix { ! proc rc {} {return [format "\#%06x" [expr "int(floor(rand() * 16))"]]} proc mat_note {p t item} { --- 1,5 ---- package require tkpath namespace eval ::ix { ! proc rc {} {return [format "\#%06x" [expr "int(floor(rand() * 16777216))"]]} proc mat_note {p t item} { *************** *** 13,17 **** } ! proc mat_scroll {p t a x y} { } --- 13,25 ---- } ! proc mat_scroll {p t d axis} { ! variable _ ! puts "Scroll0: $_($t:xa) $_($t:xb) $_($t:ya) $_($t:yb)" ! foreach xy $axis { ! set mv [expr ($_($t:${xy}b) - $_($t:${xy}a)) / 4.0] ! foreach ab {a b} {set _($t:${xy}$ab) [expr $_($t:${xy}$ab) $d $mv]}} ! puts "Scroll1: $_($t:xa) $_($t:xb) $_($t:ya) $_($t:yb)" ! mat_redraw $p $t all ! mat_gridlines $p $t } *************** *** 21,25 **** start { foreach xy {x y} {set _($t:c$xy) [set $xy];set _($t:f$xy) [set $xy]} ! $p.m create path [::tkpath::coords rect $_($t:cx) $_($t:cy) 0 0 -rx 16 -ry 16] -tags sel -fill cyan -fillopacity 0.2 } motion { --- 29,38 ---- start { foreach xy {x y} {set _($t:c$xy) [set $xy];set _($t:f$xy) [set $xy]} ! # $p.m create path [::tkpath::coords rect $_($t:cx) $_($t:cy) 0 0 -rx 12 -ry 12] -tags sel -fill cyan -stroke white -fillopacity 0.2 ! $p.m create path [::tkpath::coords rect $_($t:cx) $_($t:cy) 0 0 -rx 12 -ry 12] -tags sel -stroke [rc] -strokewidth 12 -strokeopacity 0.3 ! ! } ! close { ! $p.m delete sel } motion { *************** *** 28,32 **** set w [expr abs($xb - $xa)] set h [expr abs($yb - $ya)] ! $p.m coords sel [::tkpath::coords rect $xa $ya $w $h -rx 16 -ry 16] } } --- 41,45 ---- set w [expr abs($xb - $xa)] set h [expr abs($yb - $ya)] ! $p.m coords sel [::tkpath::coords rect $xa $ya $w $h -rx 12 -ry 12] } } *************** *** 63,67 **** set _($t:${xy}b) [expr $_($t:${xy}b) + $mvt] } ! foreach item [$p.m find withtag item] { set id [lindex [$p.m itemcget $item -tags] 1] set px [mat_tr $p $t x t [dict get $_($t) $id x]] --- 76,90 ---- set _($t:${xy}b) [expr $_($t:${xy}b) + $mvt] } ! mat_redraw $p $t all ! mat_gridlines $p $t ! } ! ! proc mat_redraw {p t items} { ! variable _ ! switch $items { ! all {set items [$p.m find withtag item]} ! default {} ! } ! foreach item $items { set id [lindex [$p.m itemcget $item -tags] 1] set px [mat_tr $p $t x t [dict get $_($t) $id x]] *************** *** 71,75 **** $p.m coords $item [::tkpath::coords rect $px $py $sx $sy -rx 3 -ry 3] } - mat_gridlines $p $t } --- 94,97 ---- *************** *** 125,130 **** if {[lindex [$p.m itemcget $item -tags] 0] eq "item"} { set id [lindex [$p.m itemcget $item -tags] 1] ! mat_note $p $t $item ! $p.m create text "[expr [winfo width $p.m] - 8.0 ] [expr [winfo height $p.m] - 8.0 - 16 * $n.0]" -fill "#ff0022" -justify right -anchor se -font {{bitstream vera sans} 12} -tags hover -text [dict get $_($t) $id] incr n } --- 147,152 ---- if {[lindex [$p.m itemcget $item -tags] 0] eq "item"} { set id [lindex [$p.m itemcget $item -tags] 1] ! # mat_note $p $t $item ! $p.m create text "[expr [winfo width $p.m] - 8.0 ] [expr [winfo height $p.m] - 8.0 - 11 * $n.0]" -fill "#ff0022" -justify right -anchor se -font {{bitstream vera sans} 10} -tags hover -text [dict get $_($t) $id] incr n } *************** *** 148,152 **** if {$a eq "draw"} {mat_draw $p $t $action $x $y} elseif {$m eq "double"} { mat_sel start $p $t $x $y ! } else { if {$clicked ne "" && [lindex [$p.m itemcget [lindex $clicked 0] -tags] 0] eq "item"} { mat_mode $p $t move_object --- 170,176 ---- if {$a eq "draw"} {mat_draw $p $t $action $x $y} elseif {$m eq "double"} { mat_sel start $p $t $x $y ! } elseif {[$p.m find withtag sel] ne ""} { ! mat_sel close $p $t $x $y ! } else { if {$clicked ne "" && [lindex [$p.m itemcget [lindex $clicked 0] -tags] 0] eq "item"} { mat_mode $p $t move_object *************** *** 158,163 **** 2 {mat_mode $p $t resize_canvas} 3 {mat_mode $p $t object_trans} - 4 {mat_mode $p $t scroll} - 5 {mat_mode $p $t scroll} } } --- 182,185 ---- *************** *** 213,243 **** } ! proc mat_new {path target w h bg ln xa xb ya yb qx qy} { variable _ set i 0 foreach xy {x y} {foreach ab {a b} {set ${xy}${ab}o [set ${xy}${ab}]}} ! foreach a {i ln xa xb ya yb xao xbo yao ybo qx qy} {set _($target:$a) [set $a]} ! if {[winfo exists $path.m] != 1} { ! canvas $path.m -bg $bg -width $w -height $h ! pack $path.m -side left ! bind $path.m <Key> "::ix::mat_key $path $target %k 1" ! bind $path.m <KeyRelease> "::ix::mat_key $path $target %k 0" ! bind $path.m <Motion> "::ix::mat_hover $path $target %x %y" foreach m {"Control-" "" "Shift-" "Double-"} { ! foreach bn {1 2 3 4 5} { set b [list [concat $bn first] [concat B${bn}-Motion motion] [concat ButtonRelease-$bn release]] foreach ba {0 1 2} { ! bind $path.m <$m[lindex [lindex $b $ba] 0]> "::ix::mat_click [list [string tolower [string trimright $m -1]]] $bn [lindex [lindex $b $ba] 1] $path $target %x %y"}}} ! set bd [expr {[$path cget -bd] * 2}] ! $path configure -bg gray -width [expr [winfo width $path.m] + $bd] -height [expr [winfo height $path.m] + $bd] ! $path.m create text {20 20} -fill blue -justify left -anchor w -font {{bitstream vera sans} 18} -tags mode -text action ! $path.m create text "10 $h" -fill red -justify left -anchor sw -font {{bitstream vera sans} 12 bold} -fill red -tags snap -text "snap (off)" ! $path.m create text {20 32} -fill gray49 -justify left -anchor nw -font {{bitstream vera sans} 12} -tags info ! mat_gridlines $path $target}} ! proc mat_gridlines {path target} { variable _ # puts gridlines ! set w $path.m $w delete gridlines set gh [winfo height $w] --- 235,269 ---- } ! proc mat_new {p t w h bg ln xa xb ya yb qx qy} { variable _ set i 0 foreach xy {x y} {foreach ab {a b} {set ${xy}${ab}o [set ${xy}${ab}]}} ! foreach a {i ln xa xb ya yb xao xbo yao ybo qx qy} {set _($t:$a) [set $a]} ! if {[winfo exists $p.m] != 1} { ! canvas $p.m -bg $bg -width $w -height $h ! pack $p.m -side left ! bind $p.m <Key> "::ix::mat_key $p $t %k 1" ! bind $p.m <KeyRelease> "::ix::mat_key $p $t %k 0" ! bind $p.m <Motion> "::ix::mat_hover $p $t %x %y" ! bind $p.m <4> "::ix::mat_scroll $p $t - x" ! bind $p.m <5> "::ix::mat_scroll $p $t + x" ! bind $p.m <Shift-4> "::ix::mat_scroll $p $t - y" ! bind $p.m <Shift-5> "::ix::mat_scroll $p $t + y" foreach m {"Control-" "" "Shift-" "Double-"} { ! foreach bn {1 2 3} { set b [list [concat $bn first] [concat B${bn}-Motion motion] [concat ButtonRelease-$bn release]] foreach ba {0 1 2} { ! bind $p.m <$m[lindex [lindex $b $ba] 0]> "::ix::mat_click [list [string tolower [string trimright $m -1]]] $bn [lindex [lindex $b $ba] 1] $p $t %x %y"}}} ! set bd [expr {[$p cget -bd] * 2}] ! $p configure -bg gray -width [expr [winfo width $p.m] + $bd] -height [expr [winfo height $p.m] + $bd] ! $p.m create text {20 20} -fill blue -justify left -anchor w -font {{bitstream vera sans} 18} -tags mode -text action ! $p.m create text "10 $h" -fill red -justify left -anchor sw -font {{bitstream vera sans} 12 bold} -fill red -tags snap -text "snap (off)" ! $p.m create text {20 32} -fill gray49 -justify left -anchor nw -font {{bitstream vera sans} 12} -tags info ! mat_gridlines $p $t}} ! proc mat_gridlines {p t} { variable _ # puts gridlines ! set w $p.m $w delete gridlines set gh [winfo height $w] *************** *** 248,258 **** array set tj {x center y left} array set igx {y width x height} ! if {$_($target:${xy}a) > $_($target:${xy}b)} {set oa ">=";set ob "-"} {set oa "<=";set ob "+"} ! for {set x [expr int($_($target:${xy}a) / ($_($target:q${xy}) + 0.0) + 1)*($_($target:q${xy}) + 0.0)]} {[expr $x $oa $_($target:${xy}b)]} {set x [expr $x $ob $_($target:q${xy})]} { ! set og [mat_tr $path $target $xy t $x] set invgeo [winfo $igx($xy) $w] switch $xy {y {set coords [concat M 0 $og L $invgeo $og]} x {set coords [concat M $og 0 L $og $invgeo]}} ! $w lower [$w create path $coords -stroke $_($target:ln) -strokedasharray 2 -tags gridline -strokewidth 1] $w lower [$w create text [lrange $coords 1 2] -font {{Bitstream Vera Sans} 8} \ -fill green -anchor $ta($xy) -text $x -justify $tj($xy) -tags gridline]}}}} --- 274,284 ---- array set tj {x center y left} array set igx {y width x height} ! if {$_($t:${xy}a) > $_($t:${xy}b)} {set oa ">=";set ob "-"} {set oa "<=";set ob "+"} ! for {set x [expr int($_($t:${xy}a) / ($_($t:q${xy}) + 0.0) + 1)*($_($t:q${xy}) + 0.0)]} {[expr $x $oa $_($t:${xy}b)]} {set x [expr $x $ob $_($t:q${xy})]} { ! set og [mat_tr $p $t $xy t $x] set invgeo [winfo $igx($xy) $w] switch $xy {y {set coords [concat M 0 $og L $invgeo $og]} x {set coords [concat M $og 0 L $og $invgeo]}} ! $w lower [$w create path $coords -stroke $_($t:ln) -strokedasharray 2 -tags gridline -strokewidth 1] $w lower [$w create text [lrange $coords 1 2] -font {{Bitstream Vera Sans} 8} \ -fill green -anchor $ta($xy) -text $x -justify $tj($xy) -tags gridline]}}}}

1 0

pd/src s_inter.c,1.5.4.12,1.5.4.13
by Thomas Grill 21 Jun '05

21 Jun '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19288 Modified Files: Tag: devel_0_38 s_inter.c Log Message: more usual paths for Wish.app on OSX Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.12 retrieving revision 1.5.4.13 diff -C2 -d -r1.5.4.12 -r1.5.4.13 *** s_inter.c 17 Jun 2005 15:25:20 -0000 1.5.4.12 --- s_inter.c 21 Jun 2005 14:56:35 -0000 1.5.4.13 *************** *** 1090,1093 **** --- 1090,1103 ---- nohomedir: strcpy(filename, + "/System/Library/Frameworks/Tk.Framework/Resources/Wish Shell.app/Contents/MacOS/Wish Shell"); + if (stat(filename, &statbuf) >= 0) + goto foundit; + + strcpy(filename, + "/Library/Frameworks/Tk.Framework/Resources/Wish Shell.app/Contents/MacOS/Wish Shell"); + if (stat(filename, &statbuf) >= 0) + goto foundit; + + strcpy(filename, "/Applications/Utilities/Wish Shell.app/Contents/MacOS/Wish Shell"); if (stat(filename, &statbuf) >= 0)

1 0

pd/src u_pdsend.c,1.2,1.2.4.1
by IOhannes m zmölnig 21 Jun '05

21 Jun '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7938 Modified Files: Tag: devel_0_38 u_pdsend.c Log Message: buffer-length should not be "char" if we want to transmit strings that are longer than 255 chars Index: u_pdsend.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_pdsend.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** u_pdsend.c 6 Sep 2004 20:20:36 -0000 1.2 --- u_pdsend.c 21 Jun 2005 14:33:41 -0000 1.2.4.1 *************** *** 106,110 **** while (1) { ! char buf[BUFSIZE], *bp, nsent, nsend; if (!fgets(buf, BUFSIZE, stdin)) break; --- 106,111 ---- while (1) { ! char buf[BUFSIZE], *bp; ! unsigned int nsent, nsend; if (!fgets(buf, BUFSIZE, stdin)) break;

1 0

pd/src g_rtext.c,1.4,1.4.4.1
by IOhannes m zmölnig 21 Jun '05

21 Jun '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15813 Modified Files: Tag: devel_0_38 g_rtext.c Log Message: added checks for NULL-pointers Index: g_rtext.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_rtext.c,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** g_rtext.c 6 Sep 2004 20:20:34 -0000 1.4 --- g_rtext.c 21 Jun 2005 13:38:26 -0000 1.4.4.1 *************** *** 7,10 **** --- 7,12 ---- /* all changes are labeled with iemlib */ + /* IOhannes m zmölnig (20050621): added checks for NULL-pointers */ + #include <stdlib.h> #include <string.h> *************** *** 44,60 **** t_rtext *rtext_new(t_glist *glist, t_text *who) { ! t_rtext *x = (t_rtext *)getbytes(sizeof *x); ! int w = 0, h = 0, indx; ! x->x_height = -1; ! x->x_text = who; ! x->x_glist = glist; ! x->x_next = glist->gl_editor->e_rtext; ! x->x_selstart = x->x_selend = x->x_active = x->x_drawnwidth = x->x_drawnheight = 0; ! binbuf_gettext(who->te_binbuf, &x->x_buf, &x->x_bufsize); ! glist->gl_editor->e_rtext = x; ! sprintf(x->x_tag, ".x%lx.t%lx", (t_int)glist_getcanvas(x->x_glist), ! (t_int)x); ! return (x); } --- 46,66 ---- t_rtext *rtext_new(t_glist *glist, t_text *who) { ! if(glist && glist->gl_editor && who) ! { ! t_rtext *x = (t_rtext *)getbytes(sizeof *x); ! int w = 0, h = 0, indx; ! x->x_height = -1; ! x->x_text = who; ! x->x_glist = glist; ! x->x_next = glist->gl_editor->e_rtext; ! x->x_selstart = x->x_selend = x->x_active = x->x_drawnwidth = x->x_drawnheight = 0; ! binbuf_gettext(who->te_binbuf, &x->x_buf, &x->x_bufsize); ! glist->gl_editor->e_rtext = x; ! sprintf(x->x_tag, ".x%lx.t%lx", (t_int)glist_getcanvas(x->x_glist), ! (t_int)x); ! return (x); ! } else ! return 0; } *************** *** 63,78 **** void rtext_free(t_rtext *x) { ! if (x->x_glist->gl_editor->e_textedfor == x) x->x_glist->gl_editor->e_textedfor = 0; ! if (x->x_glist->gl_editor->e_rtext == x) x->x_glist->gl_editor->e_rtext = x->x_next; ! else ! { ! t_rtext *e2; ! for (e2 = x->x_glist->gl_editor->e_rtext; e2; e2 = e2->x_next) ! if (e2->x_next == x) { ! e2->x_next = x->x_next; ! break; } } --- 69,87 ---- void rtext_free(t_rtext *x) { ! if(x){ ! if(x->x_glist && x->x_glist->gl_editor){ ! if (x->x_glist->gl_editor->e_textedfor == x) x->x_glist->gl_editor->e_textedfor = 0; ! if (x->x_glist->gl_editor->e_rtext == x) x->x_glist->gl_editor->e_rtext = x->x_next; ! else { ! t_rtext *e2; ! for (e2 = x->x_glist->gl_editor->e_rtext; e2; e2 = e2->x_next) ! if (e2->x_next == x) ! { ! e2->x_next = x->x_next; ! break; ! } } } *************** *** 80,100 **** --- 89,123 ---- freebytes(x->x_buf, x->x_bufsize); freebytes(x, sizeof *x); + } } char *rtext_gettag(t_rtext *x) { + if(x) return (x->x_tag); + else + return 0; } void rtext_gettext(t_rtext *x, char **buf, int *bufsize) { + if(x){ *buf = x->x_buf; *bufsize = x->x_bufsize; + } else { + *buf = 0; + *bufsize = 0; + } } void rtext_getseltext(t_rtext *x, char **buf, int *bufsize) { + if(x){ *buf = x->x_buf + x->x_selstart; *bufsize = x->x_selend - x->x_selstart; + } else { + *buf = 0; + *bufsize = 0; + } } *************** *** 103,106 **** --- 126,130 ---- static int firstone(char *s, int c, int n) { + if(s) { char *s2 = s + n; int i = 0; *************** *** 111,114 **** --- 135,139 ---- s++; } + } return (-1); } *************** *** 116,119 **** --- 141,145 ---- static int lastone(char *s, int c, int n) { + if(s){ char *s2 = s + n; while (s2 != s) *************** *** 123,126 **** --- 149,153 ---- if (*s2 == c) return (n); } + } return (-1); } *************** *** 151,154 **** --- 178,182 ---- int *indexp) { + if(x && heightp && indexp) { float dispx, dispy; char smallbuf[200], *tempbuf; *************** *** 270,277 **** --- 298,307 ---- if (tempbuf != smallbuf) t_freebytes(tempbuf, 2 * x->x_bufsize + 1); + } } void rtext_retext(t_rtext *x) { + if(x){ int w = 0, h = 0, indx; t_text *text = x->x_text; *************** *** 325,328 **** --- 355,359 ---- } rtext_senditup(x, SEND_UPDATE, &w, &h, &indx); + } } *************** *** 330,337 **** --- 361,371 ---- t_rtext *glist_findrtext(t_glist *gl, t_text *who) { + if(gl && gl->gl_editor){ t_rtext *x = gl->gl_editor->e_rtext; while (x && x->x_text != who) x = x->x_next; if (!x) bug("glist_findrtext"); return (x); + } else + return 0; } *************** *** 358,361 **** --- 392,396 ---- void rtext_erase(t_rtext *x) { + if(x) sys_vgui(".x%lx.c delete %s\n", glist_getcanvas(x->x_glist), x->x_tag); } *************** *** 363,366 **** --- 398,402 ---- void rtext_displace(t_rtext *x, int dx, int dy) { + if(x) sys_vgui(".x%lx.c move %s %d %d\n", glist_getcanvas(x->x_glist), x->x_tag, dx, dy); *************** *** 369,372 **** --- 405,409 ---- void rtext_select(t_rtext *x, int state) { + if(x){ t_glist *glist = x->x_glist; t_canvas *canvas = glist_getcanvas(glist); *************** *** 374,381 **** --- 411,420 ---- x->x_tag, (state? "blue" : "black")); canvas_editing = canvas; + } } void rtext_activate(t_rtext *x, int state) { + if(x){ int w = 0, h = 0, indx; t_glist *glist = x->x_glist; *************** *** 399,402 **** --- 438,442 ---- } rtext_senditup(x, SEND_UPDATE, &w, &h, &indx); + } } *************** *** 405,408 **** --- 445,451 ---- int w = 0, h = 0, indx, i, newsize, ndel; char *s1, *s2; + + if(!x)return; + if (keynum) { *************** *** 484,487 **** --- 527,533 ---- { int w = xval, h = yval, indx; + + if(!x)return; + rtext_senditup(x, SEND_CHECK, &w, &h, &indx); if (flag == RTEXT_DOWN)

1 0

externals/zexy/examples relay.pd,NONE,1.1
by IOhannes m zmölnig 21 Jun '05

21 Jun '05

Update of /cvsroot/pure-data/externals/zexy/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8344 Added Files: relay.pd Log Message: added documentation for [relay] (stolen from [route]) --- NEW FILE: relay.pd --- #N canvas 167 7 778 771 12; #X text 625 11 part of; #X obj 700 10 zexy; #X obj 183 223 print x1; #X obj 261 223 print x2; #X obj 339 223 print x3; #X obj 422 223 print x4; #X obj 183 195 relay 23 54 1; #X msg 183 165 234 345 456; #X msg 308 165 23 34 45; #X msg 414 165 54 43; #X msg 485 165 1 foo bar; #X msg 254 257 impeach ringo starr; #X obj 191 285 relay big apple; #X msg 435 258 apple pie; #X msg 191 257 1 2 3; #X msg 523 258 big apple pie; #X msg 578 165 walk the dog; #X text 45 43 Relay checks the first element of a message against each of its arguments \, which may be numbers or symbols (but not a mixture of the two.); #X text 19 195 numeric arguments:; #X text 17 285 symbolic arguments:; #X obj 157 499 print z1; #X obj 233 499 print z2; #X msg 124 434 bang; #X msg 170 434 list; #X msg 213 434 5; #X msg 251 434 float 5; #X msg 320 434 list 5; #X msg 385 434 symbol pie; #X msg 560 434 pie; #X msg 483 434 list pie; #X msg 70 434 1 2 3; #X obj 157 471 relay list float symbol bang; #X obj 310 499 print z3; #X obj 387 499 print z4; #X obj 461 499 print z5; #X obj 191 315 print y1; #X obj 269 315 print y2; #X obj 347 315 print y3; #X text 76 354 To avoid confusion between \, say \, the number 5 and the list contining only the number 5 \, both messages match "float" \, and ditto for symbols. An empty list matches "bang". In Pd these are all considered special cases of lists.; #X text 97 9 - relay messages according to their first element; #X obj 43 8 relay; #X text 44 93 If a match is found \, the complete(!) message appears on the corresponding outlet. If no match \, the message is repeated to the last "rejection" outlet. The number of outlets is the number of arguments plus one.; #X obj 624 581 route; #X text 72 616 the only difference is \, that a matching first element is NOT stripped from the message.; #X text 76 674 (btw \, this help patch has been taken from [route]) ; #X text 72 583 [relay] is very similar to pd's built-in object [route] ; #X text 612 564 see also; #X text 72 720 NOTE: "relay" as in "mail relay" \, not as in "reed relay"; #X connect 6 0 2 0; #X connect 6 1 3 0; #X connect 6 2 4 0; #X connect 6 3 5 0; #X connect 7 0 6 0; #X connect 8 0 6 0; #X connect 9 0 6 0; #X connect 10 0 6 0; #X connect 11 0 12 0; #X connect 12 0 35 0; #X connect 12 1 36 0; #X connect 12 2 37 0; #X connect 13 0 12 0; #X connect 14 0 12 0; #X connect 15 0 12 0; #X connect 16 0 6 0; #X connect 22 0 31 0; #X connect 23 0 31 0; #X connect 24 0 31 0; #X connect 25 0 31 0; #X connect 26 0 31 0; #X connect 27 0 31 0; #X connect 28 0 31 0; #X connect 29 0 31 0; #X connect 30 0 31 0; #X connect 31 0 20 0; #X connect 31 1 21 0; #X connect 31 2 32 0; #X connect 31 3 33 0; #X connect 31 4 34 0;

1 0

externals/zexy/src relay.c, NONE, 1.1 z_zexy.c, 1.1, 1.2 z_zexy.h, 1.1, 1.2
by IOhannes m zmölnig 21 Jun '05

21 Jun '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7901 Modified Files: z_zexy.c z_zexy.h Added Files: relay.c Log Message: added [relay], a stupid [route] Index: z_zexy.h =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/z_zexy.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** z_zexy.h 13 Jun 2005 18:56:17 -0000 1.1 --- z_zexy.h 21 Jun 2005 13:23:29 -0000 1.2 *************** *** 45,48 **** --- 45,49 ---- void z_prime_setup(void); /* prime.c */ void z_quantize__setup(void); /* quantize~.c */ + void z_relay_setup(void); /* relay.c */ void z_repack_setup(void); /* repack.c */ void z_repeat_setup(void); /* repeat.c */ Index: z_zexy.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/z_zexy.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** z_zexy.c 13 Jun 2005 18:56:12 -0000 1.1 --- z_zexy.c 21 Jun 2005 13:23:29 -0000 1.2 *************** *** 47,50 **** --- 47,51 ---- z_prime_setup(); /* prime.c */ z_quantize__setup(); /* quantize~.c */ + z_relay_setup(); /* relay.c */ z_repack_setup(); /* repack.c */ z_repeat_setup(); /* repeat.c */ --- NEW FILE: relay.c --- (This appears to be a binary file; contents omitted.)

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
22
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 2005