Pd-cvs June 2005

pd-cvs@lists.iem.at

14 participants
211 discussions

pd SConstruct,1.1.2.1,1.1.2.2
by Tim Blechmann 19 Jun '05

19 Jun '05

Update of /cvsroot/pure-data/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28106 Modified Files: Tag: devel_0_38 SConstruct Log Message: scons update Index: SConstruct =================================================================== RCS file: /cvsroot/pure-data/pd/Attic/SConstruct,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** SConstruct 18 Jun 2005 18:48:31 -0000 1.1.2.1 --- SConstruct 19 Jun 2005 11:10:39 -0000 1.1.2.2 *************** *** 1,5 **** env = Environment() Export("env") ! SConscript('./src/SConscript') --- 1,42 ---- env = Environment() + + + ###################################################################### + # + # general configuration + + opt = Options(['options.cache', 'custom.py']) + opt.AddOptions( + ('prefix', 'install prefix', '/usr/local') + ) + + opt.Update(env) + + opt.Save('options.cache',env) + Export("env") ! ##Help(opt.GenerateHelpText(env)) ! ! pdwatchdog, pdsend, pdreceive, pdgui, pd, pdlib = SConscript('./src/SConscript') ! ! ! ###################################################################### ! # ! # installing stuff ! ! ! prefix = env['prefix'] ! ! if env['PLATFORM'] == 'posix': ! env.Install(prefix+'/bin', pdsend) ! env.Install(prefix+'/bin', pdreceive) ! env.Install(prefix+'/bin', pd) ! env.Install(prefix+'/lib/pd/bin', pdgui) ! env.Install(prefix+'/lib/pd/bin', pdwatchdog) ! pdenv.InstallAs(prefix + '/lib/pd/bin/pd.tk','u_main.tk') ! ! env.Install(prefix+'/lib', pdlib) ! ! env.Alias('install', prefix)

1 0

extensions/gui/ix mat.wid,1.8,1.9
by carmen rocco 19 Jun '05

19 Jun '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8123 Modified Files: mat.wid Log Message: ^G Get Help ^O WriteOut ^R Read File ^Y Prev Page ^K Cut Text ^C Cur Pos Index: mat.wid =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/mat.wid,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mat.wid 19 Jun 2005 02:21:13 -0000 1.8 --- mat.wid 19 Jun 2005 08:34:31 -0000 1.9 *************** *** 8,118 **** set vel [$p.m itemcget $item -fillopacity] pd [concat $t.rp _cb note [dict get $_($t) $id y] $vel $len \;]} ! namespace eval actions { ! proc action {p t o} {puts gah} ! proc draw {p t o} {puts draw} ! proc resize_canvas {p t o} {} ! proc move_canvas {p t o} {puts cvda} ! proc move_object {p t o} { ! puts hiihect ! } ! } ! proc mat_click {m button action p t x y} { ! variable _ ! set a [$p.m itemcget mode -text] ! eval actions::$a $p $t o ! switch $m { ! control {mat_draw $action $p $t $x $y} ! "" { ! set clicked [$p.m find overlapping $x $y $x $y] ! switch $action { ! hover { ! foreach item $clicked { ! if {[lindex [$p.m itemcget $item -tags] 0] eq "item"} { ! mat_note $p $t $item ! } ! } ! if {$clicked ne "" && [lindex [$p.m itemcget $item -tags] 0] eq "item"} { ! mat_mode $p $t {move_object} ! } {mat_mode $p $t {move_canvas}} ! set junk "" ! foreach cfg [$p.m itemconfigure $clicked] {set junk "$junk\n$cfg"} ! mat_info $p $t $junk ! } ! first { ! # if {$clicked ne ""} { ! set _($t:cl) $clicked ! # } ! foreach xy {x y} {set _($t:f$xy) [set $xy]} ! switch $button {2 {mat_mode $p $t resize_canvas}} ! } ! motion { ! set mx [expr $x - $_($t:cx)] ! set my [expr $y - $_($t:cy)] ! foreach xy {x y} { ! set mvt [mat_tr $p $t $xy d [expr $$xy - $_($t:c$xy)]] ! switch $button { ! 1 { ! foreach ab {a b} { ! set _($t:${xy}$ab) [expr $_($t:${xy}$ab) - $mvt] ! } ! } ! 2 { ! set _($t:${xy}a) [expr $_($t:${xy}a) - $mvt] ! set _($t:${xy}b) [expr $_($t:${xy}b) + $mvt] ! } ! } ! } ! switch $button { ! 1 { ! if {$clicked ne ""} { ! set items $clicked ! } else { ! set items [$p.m find withtag item] ! mat_gridlines $p $t ! } ! foreach item $items { ! set m [$p.m itemcget $item -matrix] ! set m [list [lindex $m 0] [lindex $m 1] [list [expr [lindex [lindex $m 2] 0] + $mx] [expr [lindex [lindex $m 2] 1] + $my]]] ! $p.m itemconfigure $item -matrix $m ! } ! } ! 2 { ! 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]] ! set py [mat_tr $p $t y t [dict get $_($t) $id y]] ! set sx [mat_tr $p $t x id [expr [dict get $_($t) $id xx] - [dict get $_($t) $id x]]] ! set sy [mat_tr $p $t y id 1] ! $p.m coords $item [::tkpath::coords rect $px $py $sx $sy -rx 3 -ry 3] ! } ! mat_gridlines $p $t ! } ! 3 { ! set velo [expr ($x - $_($t:cx)) / 100.0] ! foreach item $_($t:cl) { ! set vel [expr $velo + [$p.m itemcget $item -fillopacity]] ! if {$vel > 1} {set vel 1} ! if {$vel < 0} {set vel 0} ! $p.m itemconfigure $item -fillopacity $vel ! } ! } ! } ! } ! release { ! switch $button { ! 2 {mat_mode $p $t move_canvas} ! } ! } ! } ! foreach xy {x y} {set _($t:c$xy) [set $xy]} ! } ! } ! } ! ! proc mat_draw {action p t x y} { variable _ ! switch $action { motion { ! if {$x >= $_($t:cx)} {set xa $_($t:cx);set xb $x} else {set xa $x;set xb $_($t:cx)} $p.m coords drawing [::tkpath::coords rect $xa $y [expr $xb - $xa] [mat_tr $p $t y id 1] -rx 3 -ry 3] set yi [mat_tr $p $t y i $y] --- 8,17 ---- set vel [$p.m itemcget $item -fillopacity] pd [concat $t.rp _cb note [dict get $_($t) $id y] $vel $len \;]} ! proc mat_action {p t a x y} {puts gah} ! proc mat_draw {p t a x y} { variable _ ! switch $a { motion { ! if {$x >= $_($t:cx)} {set xa $_($t:fx);set xb $x} else {set xa $x;set xb $_($t:fx)} $p.m coords drawing [::tkpath::coords rect $xa $y [expr $xb - $xa] [mat_tr $p $t y id 1] -rx 3 -ry 3] set yi [mat_tr $p $t y i $y] *************** *** 129,132 **** --- 28,134 ---- incr _($t:i) 2}}} + proc mat_resize_canvas {p t a x y} { + variable _ + set mx [expr $x - $_($t:cx)] + set my [expr $y - $_($t:cy)] + foreach xy {x y} { + set mvt [mat_tr $p $t $xy d [expr $$xy - $_($t:c$xy)]] + set _($t:${xy}a) [expr $_($t:${xy}a) - $mvt] + 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]] + set py [mat_tr $p $t y t [dict get $_($t) $id y]] + set sx [mat_tr $p $t x id [expr [dict get $_($t) $id xx] - [dict get $_($t) $id x]]] + set sy [mat_tr $p $t y id 1] + $p.m coords $item [::tkpath::coords rect $px $py $sx $sy -rx 3 -ry 3] + } + mat_gridlines $p $t + } + proc mat_object_trans {p t a x y} { + variable _ + set velo [expr ($x - $_($t:cx)) / 100.0] + foreach item $_($t:cl) { + set vel [expr $velo + [$p.m itemcget $item -fillopacity]] + if {$vel > 1} {set vel 1} + if {$vel < 0} {set vel 0} + $p.m itemconfigure $item -fillopacity $vel + } + } + proc mat_move_canvas {p t a x y} { + variable _ + set mx [expr $x - $_($t:cx)] + set my [expr $y - $_($t:cy)] + foreach xy {x y} { + set mvt [mat_tr $p $t $xy d [expr $$xy - $_($t:c$xy)]] + foreach ab {a b} {set _($t:${xy}$ab) [expr $_($t:${xy}$ab) - $mvt]}} + foreach item [$p.m find withtag item] { + set m [$p.m itemcget $item -matrix] + set m [list [lindex $m 0] [lindex $m 1] [list [expr [lindex [lindex $m 2] 0] + $mx] [expr [lindex [lindex $m 2] 1] + $my]]] + $p.m itemconfigure $item -matrix $m + } + mat_gridlines $p $t + } + + proc mat_move_object {p t a x y} { + variable _ + set mx [expr $x - $_($t:cx)] + set my [expr $y - $_($t:cy)] + foreach item $_($t:cl) { + set m [$p.m itemcget $item -matrix] + set m [list [lindex $m 0] [lindex $m 1] [list [expr [lindex [lindex $m 2] 0] + $mx] [expr [lindex [lindex $m 2] 1] + $my]]] + $p.m itemconfigure $item -matrix $m + } + } + + proc mat_click {m button action p t x y} { + variable _ + set clicked [$p.m find overlapping $x $y $x $y] + set a [$p.m itemcget mode -text] + switch $action { + hover { + foreach item $clicked { + if {[lindex [$p.m itemcget $item -tags] 0] eq "item"} { + mat_note $p $t $item + } + } + + set junk "" + foreach cfg [$p.m itemconfigure $clicked] {set junk "$junk\n$cfg"} + mat_info $p $t $junk + } + first { + set _($t:cl) $clicked + foreach xy {x y} {set _($t:f$xy) [set $xy]} + switch $button { + 1 { + # mat_mode $p $t move_canvas + if {$a eq "draw"} {mat_draw $p $t $action $x $y} else { + if {$clicked ne "" && [lindex [$p.m itemcget [lindex $clicked 0] -tags] 0] eq "item"} { + mat_mode $p $t move_object + } else { + mat_mode $p $t move_canvas + } + } + } + 2 {mat_mode $p $t resize_canvas} + 3 {mat_mode $p $t object_trans} + } + } + motion {eval mat_$a $p $t $action $x $y} + release { + switch $button { + 1 { + if {$a eq "draw"} {mat_draw $p $t $action $x $y} + } + 2 {mat_mode $p $t move_canvas} + 3 {mat_mode $p $t move_canvas} + } + } + } + foreach xy {x y} {set _($t:c$xy) [set $xy]} + } + proc mat_tr {p t d inv v} { variable _

1 0

pd/src u_main.tk,1.4.4.10.2.2,1.4.4.10.2.3
by carmen rocco 19 Jun '05

19 Jun '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23341/src Modified Files: Tag: devel_0_39 u_main.tk Log Message: Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.4.4.10.2.2 retrieving revision 1.4.4.10.2.3 diff -C2 -d -r1.4.4.10.2.2 -r1.4.4.10.2.3 *** u_main.tk 19 Jun 2005 03:18:59 -0000 1.4.4.10.2.2 --- u_main.tk 19 Jun 2005 05:05:03 -0000 1.4.4.10.2.3 *************** *** 96,99 **** --- 96,100 ---- # the menus are instantiated here for the main window # for the patch windows, they are created by pdtk_canvas_new + option add *font {{Bitstream Vera Sans} 10} menu .mbar canvas .dummy -height 2p -width 6c *************** *** 212,221 **** namespace eval ::pdtheme { ! set ::pdtheme::arrow last ! array set colors "border purple bg white box green line gray50 object green message orange inlet purple outlet red atom yellow graph red text black selected #ff049b lasso green" ! foreach element [array names colors] { ! eval "set ::pdtheme::$element $colors($element)" ! } ! } ################ utility functions ######################### --- 213,219 ---- namespace eval ::pdtheme { ! array set theme "border purple bg white box green line gray50 arrow last object green message orange inlet purple outlet red atom yellow graph red text black selected #ff049b lasso green fontweight normal" ! foreach element [array names theme] { ! eval "set ::pdtheme::$element $theme($element)"}} ################ utility functions ######################### *************** *** 3212,3222 **** global pd_font1 pd_font2 pd_font3 pd_font4 pd_font5 pd_font6 pd_font7 ! set pd_font1 [format -*-%s-bold--normal--8-* $fontname] ! set pd_font2 [format -*-%s-bold--normal--10-* $fontname] ! set pd_font3 [format -*-%s-bold--normal--12-* $fontname] ! set pd_font4 [format -*-%s-bold--normal--14-* $fontname] ! set pd_font5 [format -*-%s-bold--normal--16-* $fontname] ! set pd_font6 [format -*-%s-bold--normal--24-* $fontname] ! set pd_font7 [format -*-%s-bold--normal--36-* $fontname] set width1 [font measure $pd_font1 x] --- 3210,3221 ---- global pd_font1 pd_font2 pd_font3 pd_font4 pd_font5 pd_font6 pd_font7 ! ! set pd_font1 [format -*-%s-$::pdtheme::fontweight--normal--8-* $fontname] ! set pd_font2 [format -*-%s-$::pdtheme::fontweight--normal--10-* $fontname] ! set pd_font3 [format -*-%s-$::pdtheme::fontweight--normal--12-* $fontname] ! set pd_font4 [format -*-%s-$::pdtheme::fontweight--normal--14-* $fontname] ! set pd_font5 [format -*-%s-$::pdtheme::fontweight--normal--16-* $fontname] ! set pd_font6 [format -*-%s-$::pdtheme::fontweight--normal--24-* $fontname] ! set pd_font7 [format -*-%s-$::pdtheme::fontweight--normal--36-* $fontname] set width1 [font measure $pd_font1 x]

1 0

pd/src g_canvas.c, 1.4.4.1.2.1, 1.4.4.1.2.2 g_editor.c, 1.4.4.2.2.1, 1.4.4.2.2.2 g_graph.c, 1.3.4.2.2.1, 1.3.4.2.2.2 g_rtext.c, 1.4, 1.4.8.1 g_text.c, 1.5.4.2, 1.5.4.2.2.1 u_main.tk, 1.4.4.10.2.1, 1.4.4.10.2.2
by carmen rocco 19 Jun '05

19 Jun '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9745 Modified Files: Tag: devel_0_39 g_canvas.c g_editor.c g_graph.c g_rtext.c g_text.c u_main.tk Log Message: color from ix038 Index: g_graph.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_graph.c,v retrieving revision 1.3.4.2.2.1 retrieving revision 1.3.4.2.2.2 diff -C2 -d -r1.3.4.2.2.1 -r1.3.4.2.2.2 *** g_graph.c 22 May 2005 12:46:00 -0000 1.3.4.2.2.1 --- g_graph.c 19 Jun 2005 03:18:59 -0000 1.3.4.2.2.2 *************** *** 708,712 **** /* draw a rectangle around the graph */ sys_vgui(".x%lx.c create line\ ! %d %d %d %d %d %d %d %d %d %d -tags %s\n", glist_getcanvas(x->gl_owner), x1, y1, x1, y2, x2, y2, x2, y1, x1, y1, tag); --- 708,712 ---- /* draw a rectangle around the graph */ sys_vgui(".x%lx.c create line\ ! %d %d %d %d %d %d %d %d %d %d -fill $::pdtheme::graph -tags %s\n", glist_getcanvas(x->gl_owner), x1, y1, x1, y2, x2, y2, x2, y1, x1, y1, tag); *************** *** 718,722 **** int ymin = (y1 < y2 ? y1 : y2); t_symbol *s = garray_getname((t_garray *)g); ! sys_vgui(".x%lx.c create text %d %d -text {%s} -anchor sw\ -font -*-courier-bold--normal--%d-* -tags %s\n", (long)glist_getcanvas(x), x1, ymin, s->s_name, --- 718,722 ---- int ymin = (y1 < y2 ? y1 : y2); t_symbol *s = garray_getname((t_garray *)g); ! sys_vgui(".x%lx.c create text %d %d -fill $::pdtheme::text -text {%s} -anchor sw\ -font -*-courier-bold--normal--%d-* -tags %s\n", (long)glist_getcanvas(x), x1, ymin, s->s_name, *************** *** 737,745 **** { int tickpix = (i % x->gl_xtick.k_lperb ? 2 : 4); ! sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", glist_getcanvas(x->gl_owner), (int)glist_xtopixels(x, f), (int)upix, (int)glist_xtopixels(x, f), (int)upix - tickpix, tag); ! sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", glist_getcanvas(x->gl_owner), (int)glist_xtopixels(x, f), (int)lpix, --- 737,745 ---- { int tickpix = (i % x->gl_xtick.k_lperb ? 2 : 4); ! sys_vgui(".x%lx.c create line %d %d %d %d -fill $::pdtheme::graph -tags %s\n", glist_getcanvas(x->gl_owner), (int)glist_xtopixels(x, f), (int)upix, (int)glist_xtopixels(x, f), (int)upix - tickpix, tag); ! sys_vgui(".x%lx.c create line %d %d %d %d -fill $::pdtheme::graph -tags %s\n", glist_getcanvas(x->gl_owner), (int)glist_xtopixels(x, f), (int)lpix, *************** *** 751,759 **** { int tickpix = (i % x->gl_xtick.k_lperb ? 2 : 4); ! sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", glist_getcanvas(x->gl_owner), (int)glist_xtopixels(x, f), (int)upix, (int)glist_xtopixels(x, f), (int)upix - tickpix, tag); ! sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", glist_getcanvas(x->gl_owner), (int)glist_xtopixels(x, f), (int)lpix, --- 751,759 ---- { int tickpix = (i % x->gl_xtick.k_lperb ? 2 : 4); ! sys_vgui(".x%lx.c create line %d %d %d %d -fill $::pdtheme::graph -tags %s\n", glist_getcanvas(x->gl_owner), (int)glist_xtopixels(x, f), (int)upix, (int)glist_xtopixels(x, f), (int)upix - tickpix, tag); ! sys_vgui(".x%lx.c create line %d %d %d %d -fill $::pdtheme::graph -tags %s\n", glist_getcanvas(x->gl_owner), (int)glist_xtopixels(x, f), (int)lpix, *************** *** 774,782 **** { int tickpix = (i % x->gl_ytick.k_lperb ? 2 : 4); ! sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", glist_getcanvas(x->gl_owner), x1, (int)glist_ytopixels(x, f), x1 + tickpix, (int)glist_ytopixels(x, f), tag); ! sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", glist_getcanvas(x->gl_owner), x2, (int)glist_ytopixels(x, f), --- 774,782 ---- { int tickpix = (i % x->gl_ytick.k_lperb ? 2 : 4); ! sys_vgui(".x%lx.c create line %d %d %d %d -fill $::pdtheme::graph -tags %s\n", glist_getcanvas(x->gl_owner), x1, (int)glist_ytopixels(x, f), x1 + tickpix, (int)glist_ytopixels(x, f), tag); ! sys_vgui(".x%lx.c create line %d %d %d %d -fill $::pdtheme::graph -tags %s\n", glist_getcanvas(x->gl_owner), x2, (int)glist_ytopixels(x, f), *************** *** 788,796 **** { int tickpix = (i % x->gl_ytick.k_lperb ? 2 : 4); ! sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", glist_getcanvas(x->gl_owner), x1, (int)glist_ytopixels(x, f), x1 + tickpix, (int)glist_ytopixels(x, f), tag); ! sys_vgui(".x%lx.c create line %d %d %d %d -tags %s\n", glist_getcanvas(x->gl_owner), x2, (int)glist_ytopixels(x, f), --- 788,796 ---- { int tickpix = (i % x->gl_ytick.k_lperb ? 2 : 4); ! sys_vgui(".x%lx.c create line %d %d %d %d -fill $::pdtheme::graph -tags %s\n", glist_getcanvas(x->gl_owner), x1, (int)glist_ytopixels(x, f), x1 + tickpix, (int)glist_ytopixels(x, f), tag); ! sys_vgui(".x%lx.c create line %d %d %d %d -fill $::pdtheme::graph -tags %s\n", glist_getcanvas(x->gl_owner), x2, (int)glist_ytopixels(x, f), *************** *** 801,805 **** for (i = 0; i < x->gl_nxlabels; i++) sys_vgui(".x%lx.c create text\ ! %d %d -text {%s} -font -*-courier-bold--normal--%d-* -tags %s\n", glist_getcanvas(x), (int)glist_xtopixels(x, atof(x->gl_xlabel[i]->s_name)), --- 801,805 ---- for (i = 0; i < x->gl_nxlabels; i++) sys_vgui(".x%lx.c create text\ ! %d %d -fill $::pdtheme::text -text {%s} -font -*-courier-bold--normal--%d-* -tags %s\n", glist_getcanvas(x), (int)glist_xtopixels(x, atof(x->gl_xlabel[i]->s_name)), *************** *** 810,814 **** for (i = 0; i < x->gl_nylabels; i++) sys_vgui(".x%lx.c create text\ ! %d %d -text {%s} -font -*-courier-bold--normal--%d-* -tags %s\n", glist_getcanvas(x), (int)glist_xtopixels(x, x->gl_ylabelx), --- 810,814 ---- for (i = 0; i < x->gl_nylabels; i++) sys_vgui(".x%lx.c create text\ ! %d %d -fill $::pdtheme::text -text {%s} -font -*-courier-bold--normal--%d-* -tags %s\n", glist_getcanvas(x), (int)glist_xtopixels(x, x->gl_ylabelx), *************** *** 942,949 **** if (canvas_showtext(x)) rtext_select(y, state); ! sys_vgui(".x%lx.c itemconfigure %sR -fill %s\n", glist, ! rtext_gettag(y), (state? "blue" : "black")); sys_vgui(".x%lx.c itemconfigure graph%lx -fill %s\n", ! glist_getcanvas(glist), z, (state? "blue" : "black")); } } --- 942,949 ---- if (canvas_showtext(x)) rtext_select(y, state); ! sys_vgui(".x%lx.c itemconfigure %sR -fill %s\n", glist, ! rtext_gettag(y), (state? "$::pdtheme::selected" : "$::pdtheme::graph")); sys_vgui(".x%lx.c itemconfigure graph%lx -fill %s\n", ! glist_getcanvas(glist), z, (state? "$::pdtheme::selected" : "$::pdtheme::graph")); } } Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.4.4.10.2.1 retrieving revision 1.4.4.10.2.2 diff -C2 -d -r1.4.4.10.2.1 -r1.4.4.10.2.2 *** u_main.tk 22 May 2005 13:04:15 -0000 1.4.4.10.2.1 --- u_main.tk 19 Jun 2005 03:18:59 -0000 1.4.4.10.2.2 *************** *** 201,205 **** . configure -menu .mbar -width 200 -height 150 ! ############### set up global variables ################################ set untitled_number 1 --- 201,205 ---- . configure -menu .mbar -width 200 -height 150 ! ############### set up global/namespace variables ############### set untitled_number 1 *************** *** 211,214 **** --- 211,222 ---- set pd_undocanvas no + namespace eval ::pdtheme { + set ::pdtheme::arrow last + array set colors "border purple bg white box green line gray50 object green message orange inlet purple outlet red atom yellow graph red text black selected #ff049b lasso green" + foreach element [array names colors] { + eval "set ::pdtheme::$element $colors($element)" + } + } + ################ utility functions ######################### *************** *** 865,869 **** wm geometry $name $geometry ! canvas $name.c -width $width -height $height -background white \ -yscrollcommand "$name.scrollvert set" \ -xscrollcommand "$name.scrollhort set" \ --- 873,877 ---- wm geometry $name $geometry ! canvas $name.c -width $width -height $height -bg $::pdtheme::bg \ -yscrollcommand "$name.scrollvert set" \ -xscrollcommand "$name.scrollhort set" \ Index: g_editor.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_editor.c,v retrieving revision 1.4.4.2.2.1 retrieving revision 1.4.4.2.2.2 diff -C2 -d -r1.4.4.2.2.1 -r1.4.4.2.2.2 *** g_editor.c 22 May 2005 12:43:45 -0000 1.4.4.2.2.1 --- g_editor.c 19 Jun 2005 03:18:59 -0000 1.4.4.2.2.2 *************** *** 97,101 **** x->gl_editor->e_selectline_inno = inno; x->gl_editor->e_selectline_tag = oc; ! sys_vgui(".x%lx.c itemconfigure l%lx -fill blue\n", x, x->gl_editor->e_selectline_tag); } --- 97,101 ---- x->gl_editor->e_selectline_inno = inno; x->gl_editor->e_selectline_tag = oc; ! sys_vgui(".x%lx.c itemconfigure l%lx -fill $::pdtheme::selected \n", x, x->gl_editor->e_selectline_tag); } *************** *** 107,111 **** { x->gl_editor->e_selectedline = 0; ! sys_vgui(".x%lx.c itemconfigure l%lx -fill black\n", x, x->gl_editor->e_selectline_tag); } --- 107,111 ---- { x->gl_editor->e_selectedline = 0; ! sys_vgui(".x%lx.c itemconfigure l%lx -fill $::pdtheme::line\n", x, x->gl_editor->e_selectline_tag); } *************** *** 1098,1102 **** x->gl_editor->e_ywas = ypos; sys_vgui( ! ".x%lx.c create line %d %d %d %d -width %d -tags x\n", x, xpos, ypos, xpos, ypos, (issignal ? 2 : 1)); --- 1098,1102 ---- x->gl_editor->e_ywas = ypos; sys_vgui( ! ".x%lx.c create line %d %d %d %d -fill $::pdtheme::line -arrow $::pdtheme::arrow -width %d -tags x\n", x, xpos, ypos, xpos, ypos, (issignal ? 2 : 1)); *************** *** 1197,1201 **** { if (!shiftmod) glist_noselect(x); ! sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags x\n", x, xpos, ypos, xpos, ypos); x->gl_editor->e_xwas = xpos; --- 1197,1201 ---- { if (!shiftmod) glist_noselect(x); ! sys_vgui(".x%lx.c create rectangle %d %d %d %d -outline $::pdtheme::lasso -tags x\n", x, xpos, ypos, xpos, ypos); x->gl_editor->e_xwas = xpos; *************** *** 1297,1301 **** + IOMIDDLE; ly2 = y21; ! sys_vgui(".x%lx.c create line %d %d %d %d -width %d -tags l%lx\n", glist_getcanvas(x), lx1, ly1, lx2, ly2, --- 1297,1301 ---- + IOMIDDLE; ly2 = y21; ! sys_vgui(".x%lx.c create line %d %d %d %d -fill $::pdtheme::line -arrow $::pdtheme::arrow -width %d -tags l%lx\n", glist_getcanvas(x), lx1, ly1, lx2, ly2, *************** *** 2090,2094 **** if (glist_isvisible(x)) { ! sys_vgui(".x%lx.c create line %d %d %d %d -width %d -tags l%lx\n", glist_getcanvas(x), 0, 0, 0, 0, (obj_issignaloutlet(objsrc, outno) ? 2 : 1),oc); --- 2090,2094 ---- if (glist_isvisible(x)) { ! sys_vgui(".x%lx.c create line %d %d %d %d -fill $::pdtheme::line -arrow $::pdtheme::arrow -width %d -tags l%lx\n", glist_getcanvas(x), 0, 0, 0, 0, (obj_issignaloutlet(objsrc, outno) ? 2 : 1),oc); Index: g_text.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_text.c,v retrieving revision 1.5.4.2 retrieving revision 1.5.4.2.2.1 diff -C2 -d -r1.5.4.2 -r1.5.4.2.2.1 *** g_text.c 14 Jan 2005 18:34:13 -0000 1.5.4.2 --- g_text.c 19 Jun 2005 03:18:59 -0000 1.5.4.2.2.1 *************** *** 751,755 **** canvas_realizedollar(x->a_glist, x->a_label)->s_name, sys_hostfontsize(glist_getfont(glist)), ! "black"); } else sys_vgui(".x%lx.c delete %lx.l\n", glist_getcanvas(glist), x); --- 751,755 ---- canvas_realizedollar(x->a_glist, x->a_label)->s_name, sys_hostfontsize(glist_getfont(glist)), ! "$::pdtheme::text"); } else sys_vgui(".x%lx.c delete %lx.l\n", glist_getcanvas(glist), x); *************** *** 935,939 **** if (glist_isvisible(glist) && text_shouldvis(x, glist)) sys_vgui(".x%lx.c itemconfigure %sR -fill %s\n", glist, ! rtext_gettag(y), (state? "blue" : "black")); } --- 935,939 ---- if (glist_isvisible(glist) && text_shouldvis(x, glist)) sys_vgui(".x%lx.c itemconfigure %sR -fill %s\n", glist, ! rtext_gettag(y), (state? "$::pdtheme::selected" : "$::pdtheme::object")); } *************** *** 1117,1121 **** int onset = x1 + (width - IOWIDTH) * i / nplus; if (firsttime) ! sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %so%d\n", glist_getcanvas(glist), onset, y2 - 1, --- 1117,1121 ---- int onset = x1 + (width - IOWIDTH) * i / nplus; if (firsttime) ! sys_vgui(".x%lx.c create rectangle %d %d %d %d -outline $::pdtheme::outlet -tags %so%d\n", glist_getcanvas(glist), onset, y2 - 1, *************** *** 1134,1138 **** int onset = x1 + (width - IOWIDTH) * i / nplus; if (firsttime) ! sys_vgui(".x%lx.c create rectangle %d %d %d %d -tags %si%d\n", glist_getcanvas(glist), onset, y1, --- 1134,1138 ---- int onset = x1 + (width - IOWIDTH) * i / nplus; if (firsttime) ! sys_vgui(".x%lx.c create rectangle %d %d %d %d -outline $::pdtheme::inlet -tags %si%d\n", glist_getcanvas(glist), onset, y1, *************** *** 1160,1164 **** if (firsttime) sys_vgui(".x%lx.c create line\ ! %d %d %d %d %d %d %d %d %d %d -dash %s -tags %sR\n", glist_getcanvas(glist), x1, y1, x2, y1, x2, y2, x1, y2, x1, y1, pattern, tag); --- 1160,1164 ---- if (firsttime) sys_vgui(".x%lx.c create line\ ! %d %d %d %d %d %d %d %d %d %d -fill $::pdtheme::object -dash %s -tags %sR\n", glist_getcanvas(glist), x1, y1, x2, y1, x2, y2, x1, y2, x1, y1, pattern, tag); *************** *** 1177,1181 **** if (firsttime) sys_vgui(".x%lx.c create line\ ! %d %d %d %d %d %d %d %d %d %d %d %d %d %d -tags %sR\n", glist_getcanvas(glist), x1, y1, x2+4, y1, x2, y1+4, x2, y2-4, x2+4, y2, --- 1177,1181 ---- if (firsttime) sys_vgui(".x%lx.c create line\ ! %d %d %d %d %d %d %d %d %d %d %d %d %d %d -fill $::pdtheme::message -tags %sR\n", glist_getcanvas(glist), x1, y1, x2+4, y1, x2, y1+4, x2, y2-4, x2+4, y2, *************** *** 1193,1197 **** if (firsttime) sys_vgui(".x%lx.c create line\ ! %d %d %d %d %d %d %d %d %d %d %d %d -tags %sR\n", glist_getcanvas(glist), x1, y1, x2-4, y1, x2, y1+4, x2, y2, x1, y2, x1, y1, --- 1193,1197 ---- if (firsttime) sys_vgui(".x%lx.c create line\ ! %d %d %d %d %d %d %d %d %d %d %d %d -fill $::pdtheme::atom -tags %sR\n", glist_getcanvas(glist), x1, y1, x2-4, y1, x2, y1+4, x2, y2, x1, y2, x1, y1, Index: g_canvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.c,v retrieving revision 1.4.4.1.2.1 retrieving revision 1.4.4.1.2.2 diff -C2 -d -r1.4.4.1.2.1 -r1.4.4.1.2.2 *** g_canvas.c 22 May 2005 12:40:59 -0000 1.4.4.1.2.1 --- g_canvas.c 19 Jun 2005 03:18:59 -0000 1.4.4.1.2.2 *************** *** 870,874 **** linetraverser_start(&t, x); while (oc = linetraverser_next(&t)) ! sys_vgui(".x%lx.c create line %d %d %d %d -width %d -tags l%lx\n", glist_getcanvas(x), t.tr_lx1, t.tr_ly1, t.tr_lx2, t.tr_ly2, --- 870,874 ---- linetraverser_start(&t, x); while (oc = linetraverser_next(&t)) ! sys_vgui(".x%lx.c create line %d %d %d %d -fill $::pdtheme::line -arrow $::pdtheme::arrow -width %d -tags l%lx\n", glist_getcanvas(x), t.tr_lx1, t.tr_ly1, t.tr_lx2, t.tr_ly2, Index: g_rtext.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_rtext.c,v retrieving revision 1.4 retrieving revision 1.4.8.1 diff -C2 -d -r1.4 -r1.4.8.1 *** g_rtext.c 6 Sep 2004 20:20:34 -0000 1.4 --- g_rtext.c 19 Jun 2005 03:18:59 -0000 1.4.8.1 *************** *** 236,240 **** outchars, tempbuf, sys_hostfontsize(font), (glist_isselected(x->x_glist, ! &x->x_glist->gl_gobj)? "blue" : "black")); else if (action == SEND_UPDATE) { --- 236,240 ---- outchars, tempbuf, sys_hostfontsize(font), (glist_isselected(x->x_glist, ! &x->x_glist->gl_gobj)? "$::pdtheme::selected" : "$::pdtheme::text")); else if (action == SEND_UPDATE) { *************** *** 372,376 **** t_canvas *canvas = glist_getcanvas(glist); sys_vgui(".x%lx.c itemconfigure %s -fill %s\n", canvas, ! x->x_tag, (state? "blue" : "black")); canvas_editing = canvas; } --- 372,376 ---- t_canvas *canvas = glist_getcanvas(glist); sys_vgui(".x%lx.c itemconfigure %s -fill %s\n", canvas, ! x->x_tag, (state? "$::pdtheme::selected" : "$::pdtheme::text")); canvas_editing = canvas; }

1 0

externals/build/src rtin~.c,1.1,NONE sfread~.c,1.1,NONE
by carmen rocco 19 Jun '05

19 Jun '05

Update of /cvsroot/pure-data/externals/build/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19438 Removed Files: rtin~.c sfread~.c Log Message: 3 weeks ggeiger removed obsolete externals, updated for win compilation --- rtin~.c DELETED --- --- sfread~.c DELETED ---

1 0

extensions/gui/ix mat.wid,1.7,1.8 mat-demo.pd,1.6,1.7
by carmen rocco 19 Jun '05

19 Jun '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15443 Modified Files: mat.wid mat-demo.pd Log Message: ... Index: mat.wid =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/mat.wid,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** mat.wid 15 Jun 2005 13:02:15 -0000 1.7 --- mat.wid 19 Jun 2005 02:21:13 -0000 1.8 *************** *** 8,14 **** set vel [$p.m itemcget $item -fillopacity] pd [concat $t.rp _cb note [dict get $_($t) $id y] $vel $len \;]} ! proc mat_click {m button action p t x y} { variable _ switch $m { control {mat_draw $action $p $t $x $y} --- 8,24 ---- set vel [$p.m itemcget $item -fillopacity] pd [concat $t.rp _cb note [dict get $_($t) $id y] $vel $len \;]} ! namespace eval actions { ! proc action {p t o} {puts gah} ! proc draw {p t o} {puts draw} ! proc resize_canvas {p t o} {} ! proc move_canvas {p t o} {puts cvda} ! proc move_object {p t o} { ! puts hiihect ! } ! } proc mat_click {m button action p t x y} { variable _ + set a [$p.m itemcget mode -text] + eval actions::$a $p $t o switch $m { control {mat_draw $action $p $t $x $y} *************** *** 22,25 **** --- 32,41 ---- } } + if {$clicked ne "" && [lindex [$p.m itemcget $item -tags] 0] eq "item"} { + mat_mode $p $t {move_object} + } {mat_mode $p $t {move_canvas}} + set junk "" + foreach cfg [$p.m itemconfigure $clicked] {set junk "$junk\n$cfg"} + mat_info $p $t $junk } first { *************** *** 28,31 **** --- 44,48 ---- # } foreach xy {x y} {set _($t:f$xy) [set $xy]} + switch $button {2 {mat_mode $p $t resize_canvas}} } motion { *************** *** 82,85 **** --- 99,107 ---- } } + release { + switch $button { + 2 {mat_mode $p $t move_canvas} + } + } } foreach xy {x y} {set _($t:c$xy) [set $xy]} *************** *** 122,125 **** --- 144,169 ---- mat_gridlines $p $t} + proc mat_key {p t k b} { + puts $k + switch $b { + 1 { + switch $k { + 37 {mat_mode $p $t draw} + } + } + 0 { + switch $k { + 37 {mat_mode $p $t {move_canvas}} + } + } + } + } + proc mat_mode {p t m} { + $p.m itemconfigure mode -text $m + } + proc mat_info {p t m} { + $p.m itemconfigure info -text $m + } + proc mat_new {path target w h bg ln xa xb ya yb qx qy} { variable _ *************** *** 130,133 **** --- 174,179 ---- 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_click {} 0 hover $path $target %x %y" foreach m {"Control-" "" "Shift-"} { *************** *** 138,141 **** --- 184,189 ---- 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 {20 32} -fill gray49 -justify left -anchor nw -font {{bitstream vera sans} 12} -tags info mat_gridlines $path $target}} Index: mat-demo.pd =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/mat-demo.pd,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mat-demo.pd 15 Jun 2005 13:02:15 -0000 1.6 --- mat-demo.pd 19 Jun 2005 02:21:14 -0000 1.7 *************** *** 1,4 **** ! #N canvas 1036 0 914 718 12; ! #X obj 17 22 widget mat n1 #w 881 #bg gray83 #divX 8 #divY 5 #h 494 #Yb 1 #Ya 88 #qYv 2 #qYa 8 #ln white; #X msg 1080 -13 -height 26 -width 26 -bg gray95; --- 1,4 ---- ! #N canvas 80 85 910 775 12; ! #X obj 15 29 widget mat n1 #w 881 #bg gray83 #divX 8 #divY 5 #h 494 #Yb 1 #Ya 88 #qYv 2 #qYa 8 #ln white; #X msg 1080 -13 -height 26 -width 26 -bg gray95; *************** *** 8,18 **** #X obj 587 565 rr ss; #X obj 587 546 rg; ! #X obj 27 538 route note; ! #X obj 19 603 unpack f f f; #X obj 47 638 * 127; #X obj 26 668 pack f f f; #X obj 49 692 makenote 99 250; #X obj 102 728 noteout; ! #X obj 108 584 rp ss kbd; #X obj 158 583 rp ss kb2; #X obj 138 537 widget kbd k1 #bg blue #fg green #ln gray50 -height --- 8,17 ---- #X obj 587 565 rr ss; #X obj 587 546 rg; ! #X obj 20 603 unpack f f f; #X obj 47 638 * 127; #X obj 26 668 pack f f f; #X obj 49 692 makenote 99 250; #X obj 102 728 noteout; ! #X obj 77 559 rp ss kbd; #X obj 158 583 rp ss kb2; #X obj 138 537 widget kbd k1 #bg blue #fg green #ln gray50 -height *************** *** 24,50 **** #X obj 158 602 Append 2; #X msg 74 575 1; ! #X connect 0 0 7 0; #X connect 2 0 0 0; ! #X connect 3 0 12 1; ! #X connect 4 0 12 0; #X connect 6 0 5 0; ! #X connect 7 0 8 0; ! #X connect 8 0 10 0; ! #X connect 8 1 9 0; ! #X connect 8 2 10 2; ! #X connect 9 0 10 1; #X connect 10 0 11 0; ! #X connect 11 0 12 0; ! #X connect 11 1 12 1; #X connect 13 0 18 0; ! #X connect 14 0 19 0; #X connect 15 0 18 0; #X connect 15 0 13 0; ! #X connect 16 0 19 0; ! #X connect 16 0 14 0; ! #X connect 17 0 4 0; ! #X connect 17 1 3 0; ! #X connect 17 2 12 2; ! #X connect 18 0 17 0; ! #X connect 19 0 17 0; ! #X connect 20 0 10 2; --- 23,53 ---- #X obj 158 602 Append 2; #X msg 74 575 1; ! #X obj 3 533 widget dd dd1 -bg green -fg red; ! #X obj 3 493 a2l; ! #X obj 3 549 widget dd s2 #symbol 0; ! #X connect 0 0 21 0; #X connect 2 0 0 0; ! #X connect 3 0 11 1; ! #X connect 4 0 11 0; #X connect 6 0 5 0; ! #X connect 7 0 9 0; ! #X connect 7 1 8 0; ! #X connect 7 2 9 2; ! #X connect 8 0 9 1; ! #X connect 9 0 10 0; #X connect 10 0 11 0; ! #X connect 10 1 11 1; ! #X connect 12 0 17 0; #X connect 13 0 18 0; ! #X connect 14 0 17 0; ! #X connect 14 0 12 0; #X connect 15 0 18 0; #X connect 15 0 13 0; ! #X connect 16 0 4 0; ! #X connect 16 1 3 0; ! #X connect 16 2 11 2; ! #X connect 17 0 16 0; ! #X connect 18 0 16 0; ! #X connect 19 0 9 2; ! #X connect 21 0 20 0; ! #X connect 22 0 20 0;

1 0

pd/src SConscript,1.1.4.2,1.1.4.3
by carmen rocco 19 Jun '05

19 Jun '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14690/src Modified Files: Tag: devel_0_39 SConscript Log Message: need this file Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -C2 -d -r1.1.4.2 -r1.1.4.3 *** SConscript 19 Jun 2005 02:10:13 -0000 1.1.4.2 --- SConscript 19 Jun 2005 02:19:39 -0000 1.1.4.3 *************** *** 297,300 **** --- 297,301 ---- pdenv.Install(prefix+'/lib/pd/bin', pdgui) pdenv.Install(prefix+'/lib/pd/bin', pdwatchdog) + pdenv.InstallAs(prefix + '/lib/pd/bin/pd.tk','u_main.tk') if pdenv['pdlib']:

1 0

pd/src SConscript,NONE,1.1.4.2
by carmen rocco 19 Jun '05

19 Jun '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10281/src Added Files: Tag: devel_0_39 SConscript Log Message: thanks tim --- NEW FILE: SConscript --- Import("env") pdenv = env.Copy() ###################################################################### # # general configuration opt = Options(['options.cache', 'custom.py']) opt.AddOptions( BoolOption('debug', 'Build with debugging symbols', False), BoolOption('nosimd', 'Build without simd instructions', False), BoolOption('threadedsf', 'Build with threaded soundfiler', False), BoolOption('atomic', 'Build with atomic operations', True), BoolOption('newhash', 'Build with 16 bit symbol hash table', True), BoolOption('lockfree', 'Build with lock-free fifos', True), BoolOption('portaudio', 'Build with portaudio', True), BoolOption('pdlib', 'Build with pdlib', False), ('optimize', 'Optimize for specific architecture', 'i686'), ('prefix', 'install prefix', '/usr/local') ) opt.Update(pdenv) opt.Save('options.cache',pdenv) Help(opt.GenerateHelpText(pdenv)) ###################################################################### # # general configuration prefix = pdenv['prefix'] sources = Split("""d_arithmetic.c d_array.c d_ctl.c d_dac.c d_delay.c d_fft.c d_fftroutine.c d_filter.c d_global.c d_math.c d_mayer_fft.c d_misc.c d_osc.c d_resample.c d_soundfile.c d_ugen.c g_all_guis.c g_array.c g_bang.c g_canvas.c g_editor.c g_graph.c g_guiconnect.c g_hdial.c g_hslider.c g_io.c g_mycanvas.c g_numbox.c g_readwrite.c g_rtext.c g_scalar.c g_template.c g_text.c g_toggle.c g_traversal.c g_vdial.c g_vslider.c g_vumeter.c m_atom.c m_binbuf.c m_class.c m_conf.c m_fifo.c m_glob.c m_memory.c m_obj.c m_pd.c m_sched.c m_simd.c s_audio.c s_file.c s_inter.c s_loader.c s_main.c s_midi.c s_path.c s_print.c x_acoustics.c x_arithmetic.c x_connective.c x_gui.c x_interface.c x_midi.c x_misc.c x_net.c x_qlist.c x_time.c""") defs = [] ###################################################################### # # configure the build conf = pdenv.Configure() for libs in [['m','sin'],['tcl8.5','main'],['tk8.5','main'],['X11','XCreateWindow'],['pthread','pthread_create']]: if not conf.CheckLib(libs[0],libs[1]): print "error, missing lib: " + libs[0] Exit(1) if conf.CheckLib('dl', 'dlopen'): defs.append('DL_OPEN') jack = conf.CheckLib('jack','jack_activate') alsa = conf.CheckLib('asound','snd_pcm_info') portaudio = conf.CheckLib('portaudio','Pa_Initialize') env=conf.Finish() if pdenv['atomic']: defs.append('ATOMIC') if pdenv['nosimd']: defs.append('DONTUSESIMD') if pdenv['threadedsf']: defs.append('THREADED_SF') defs.append('GARRAY_THREAD_LOCK') if pdenv['newhash']: defs.append('NEWHASH') if pdenv['lockfree']: defs.append('LOCKFREE') pdenv.Append(CPPDEFINES=defs) ###################################################################### # # cross-platform configuration pa_sources = Split("""s_audio_pa.c s_audio_pablio.c s_audio_paring.c""") pm_sources = Split("s_midi_pm.c") simd_sse_vc_sources = Split("m_simd_sse_vc.c") simd_sse_gcc_sources = Split("m_simd_sse_gcc.c") simd_ve_gcc_sources = Split("m_simd_ve_gcc.c") if portaudio and pdenv['portaudio']: sources.append(pa_sources) pdenv.Append(CPPDEFINES=Split("USEAPI_PA PA19")) pdenv.Append(CPPPATH=Split("../portaudio ../portaudio/pablio")) pdenv.Append(CPPPATH=".") pdenv.Append(LIBPATH=".") ###################################################################### # # windows configuration windows_sources = Split("""s_audio_mmio.c s_audio_asio.cpp s_midi_mmio.c""") windows_defs = Split("MSW USEAPI_ASIO") if pdenv['PLATFORM'] == 'win32': sources.append(windows_sources + simd_sse_vc_sources) pdenv.Append(CPPDEFINES=windows_defs) pdenv['pdlib'] = True ## split pd to pd.exe and pd.dll ###################################################################### # # linux configuration jack_sources = Split("s_audio_jack.c") alsa_sources = Split("""s_audio_alsamm.c s_audio_alsa.c""") oss_sources = Split("s_audio_oss.c") linux_defs = Split("UNISTD UNIX USEAPI_OSS") linux_defs.append('INSTALL_PREFIX=\\\"%s\\\"' % prefix) linux_libs = [] if alsa: midi_sources = Split("s_midi_alsa.c") else: midi_sources = Split("s_midi_oss.c") linux_sources = oss_sources + midi_sources if not pdenv['nosimd']: linux_sources.append(simd_sse_gcc_sources) if alsa: linux_sources.append(alsa_sources) linux_defs.append("USEAPI_ALSA") linux_libs.append('asound') if jack: linux_sources.append(jack_sources) linux_defs.append("USEAPI_JACK") linux_libs.append('jack') if pdenv['PLATFORM'] == 'posix': sources.append(linux_sources) pdenv.Append(CPPDEFINES=linux_defs) pdenv.Append(LIBS=linux_libs) ###################################################################### # # osx configuration osx_sources = pa_sources + pm_sources + simd_ve_gcc_sources osx_defs = Split("UNIX") if pdenv['PLATFORM'] == 'osx': sources.append(osx_sources) pdenv.Append(CPPDEFINES=osx_defs) ###################################################################### # # sgi configuration sgi_sources = Split("s_audio_sgi.c s_midi_sgi.c") #todo: how to determine sgi? ###################################################################### # # compiler options flags = '' if pdenv['debug']: if ['msvc'] in pdenv['TOOLS']: pass # how to switch on debugging on msvc? else: flags += " -g" else: if ['msvc'] in pdenv['TOOLS']: pass # how to switch on optimizing on msvc? else: flags += " -O3" if pdenv['optimize']: if ['msvc'] in pdenv['TOOLS']: pass # is there any machine optmizisation on msvc? else: flags += " -march=" + pdenv['optimize'] if not pdenv['nosimd']: flags += " -mfpmath=sse -mmmx -msse -msse2" pdenv.Append(CCFLAGS=flags) pdenv.Append(CXXFLAGS=flags) ###################################################################### # # binaries pdwatchdog = pdenv.Program('pd-watchdog', "s_watchdog.c") pdsend = pdenv.Program('pdsend', "u_pdsend.c") pdreceive = pdenv.Program('pdreceive', "u_pdreceive.c") pdgui = pdenv.Program('pd-gui', Split("t_main.c t_tkcmd.c")) if pdenv['pdlib']: pdlib = pdenv.SharedLibrary('pd', sources) pdenv.Append(LIBS=pdlib) pd = pdenv.Program('pd', 's_entry.c') Default(pdwatchdog, pdsend, pdreceive, pdgui, pd, pdstarter) else: pd = pdenv.Program('pd', ['s_entry.c', sources], LINKFLAGS="-Wl,-export-dynamic") Default(pdwatchdog, pdsend, pdreceive, pdgui, pd) ###################################################################### # # installing stuff if pdenv['PLATFORM'] == 'posix': pdenv.Install(prefix+'/bin', pdsend) pdenv.Install(prefix+'/bin', pdreceive) pdenv.Install(prefix+'/bin', pd) pdenv.Install(prefix+'/lib/pd/bin', pdgui) pdenv.Install(prefix+'/lib/pd/bin', pdwatchdog) if pdenv['pdlib']: pdenv.Install(prefix+'/lib', pdlib) pdenv.Alias('install', prefix)

1 0

pd SConstruct,NONE,1.1.4.2
by carmen rocco 19 Jun '05

19 Jun '05

Update of /cvsroot/pure-data/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10281 Added Files: Tag: devel_0_39 SConstruct Log Message: thanks tim --- NEW FILE: SConstruct --- env = Environment() Export("env") SConscript('./src/SConscript')

1 0

pd SConstruct,NONE,1.1.2.1
by Tim Blechmann 18 Jun '05

18 Jun '05

Update of /cvsroot/pure-data/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13911 Added Files: Tag: devel_0_38 SConstruct Log Message: scons build system --- NEW FILE: SConstruct --- env = Environment() Export("env") SConscript('./src/SConscript')

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
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