Pd-cvs February 2004

pd-cvs@lists.iem.at

11 participants
161 discussions

externals/miXed/toxy widget.c,1.4,1.5
by krzyszcz＠users.sourceforge.net 27 Feb '04

27 Feb '04

Update of /cvsroot/pure-data/externals/miXed/toxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16220/toxy Modified Files: widget.c Log Message: safer widget-to-text transform Index: widget.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/widget.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** widget.c 25 Feb 2004 10:54:43 -0000 1.4 --- widget.c 27 Feb 2004 13:38:26 -0000 1.5 *************** *** 3,8 **** * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ - /* FIXME crash if closing window with a failed widget (e.g. .wid missing) */ - /* LATER think about reloading method for .wid files */ --- 3,6 ---- *************** *** 160,171 **** } static void widget_transtick(t_widget *x) { - glist_delete(x->x_glist, (t_gobj *)x); - } - - /* called from widget__failure(), LATER also bind this to F4 or something */ - static void widget_transedit(t_widget *x) - { t_text *newt, *oldt = (t_text *)x; t_binbuf *bb = binbuf_new(); --- 158,171 ---- } + /* If Tk widget creation fails, gui will send the '_failure' message + to the Pd widget object, asking the receiving object to transform + itself into a regular text object. Due to the 'bindlist' corruption + danger, this cannot be done directly from the '_failure' call, but + has to be scheduled through a 'transclock', instead. When the clock + fires, the widget object creates, and glist_adds a 'makeshift' text + object, then glist_deletes itself. */ + /* LATER also bind this to F4 or something */ static void widget_transtick(t_widget *x) { t_text *newt, *oldt = (t_text *)x; t_binbuf *bb = binbuf_new(); *************** *** 186,196 **** newt->te_ypix = oldt->te_ypix; glist_add(x->x_glist, &newt->te_g); ! glist_noselect(x->x_glist); ! glist_select(x->x_glist, &newt->te_g); ! gobj_activate(&newt->te_g, x->x_glist, 1); ! x->x_glist->gl_editor->e_textdirty = 1; /* force evaluation */ canvas_unsetcurrent(x->x_glist); canvas_dirty(x->x_glist, 1); ! clock_delay(x->x_transclock, 0); /* LATER rethink */ } --- 186,199 ---- newt->te_ypix = oldt->te_ypix; glist_add(x->x_glist, &newt->te_g); ! if (glist_isvisible(x->x_glist)) ! { ! glist_noselect(x->x_glist); ! glist_select(x->x_glist, &newt->te_g); ! gobj_activate(&newt->te_g, x->x_glist, 1); ! x->x_glist->gl_editor->e_textdirty = 1; /* force evaluation */ ! } canvas_unsetcurrent(x->x_glist); canvas_dirty(x->x_glist, 1); ! glist_delete(x->x_glist, (t_gobj *)x); } *************** *** 675,679 **** loud_error((t_pd *)x, "creation failure"); x->x_vised = 0; ! widget_transedit(x); } --- 678,682 ---- loud_error((t_pd *)x, "creation failure"); x->x_vised = 0; ! clock_delay(x->x_transclock, 0); }

1 0

pd/src s_main.c,1.1.1.4.2.8.4.2,1.1.1.4.2.8.4.3 u_main.tk,1.1.1.4.2.7.4.7,1.1.1.4.2.7.4.8
by matju＠users.sourceforge.net 27 Feb '04

27 Feb '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30984 Modified Files: Tag: impd_0_37 s_main.c u_main.tk Log Message: Tcl listener entrybox below console (code copied from GridFlow) -statusbar adds a status bar (contains mouse cursor position) Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.1.1.4.2.8.4.2 retrieving revision 1.1.1.4.2.8.4.3 diff -C2 -d -r1.1.1.4.2.8.4.2 -r1.1.1.4.2.8.4.3 *** s_main.c 22 Feb 2004 22:37:38 -0000 1.1.1.4.2.8.4.2 --- s_main.c 27 Feb 2004 05:20:52 -0000 1.1.1.4.2.8.4.3 *************** *** 787,790 **** --- 787,795 ---- argc-=2; argv+=2; } + else if (!strcmp(*argv,"-statusbar")) + { + setenv("pd_statusbar","1",1); + argc-=1; argv+=1; + } /* } */ else Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.7 retrieving revision 1.1.1.4.2.7.4.8 diff -C2 -d -r1.1.1.4.2.7.4.7 -r1.1.1.4.2.7.4.8 *** u_main.tk 23 Feb 2004 05:14:55 -0000 1.1.1.4.2.7.4.7 --- u_main.tk 27 Feb 2004 05:20:52 -0000 1.1.1.4.2.7.4.8 *************** *** 675,678 **** --- 675,685 ---- } + proc stat_pos_update {name x y} { + $name.stat.pos configure -state normal + $name.stat.pos delete 0 end + $name.stat.pos insert 0 "($x,$y)" + $name.stat.pos configure -state disabled + } + ############# pdtk_canvas_new -- create a new canvas ############### proc pdtk_canvas_new {name width height geometry editable} { *************** *** 699,702 **** --- 706,716 ---- } + if {[info exists env(pd_statusbar)]} { + frame $name.stat + entry $name.stat.pos -width 10 -state disabled + pack $name.stat.pos -side left + pack $name.stat -side bottom -fill x -expand no + } + pack $name.scrollhort -side bottom -fill x pack $name.scrollvert -side right -fill y *************** *** 974,977 **** --- 988,994 ---- # after 1 [concat raise $name] # after 1 [list canvas_animate $name] + if {[info exists env(pd_statusbar)]} { + bind $name.c <Motion> "+stat_pos_update $name %x %y" + } } *************** *** 3360,3363 **** --- 3377,3438 ---- } + ############ evaluator + + proc listener_new {self name} { + global _ + set _($self:hist) {} + set _($self:histi) 0 + frame $self + label $self.label -text "$name: " + entry $self.entry -width 40 + # entry $self.count -width 5 + pack $self.label -side left + pack $self.entry -side left -fill x -expand yes + # pack $self.count -side left + pack $self -fill x -expand no + bind $self.entry <Up> "listener_up $self" + bind $self.entry <Down> "listener_down $self" + } + + proc listener_up {self} { + global _ + if {$_($self:histi) > 0} {set _($self:histi) [expr -1+$_($self:histi)]} + $self.entry delete 0 end + $self.entry insert 0 [lindex $_($self:hist) $_($self:histi)] + $self.entry icursor end + # $self.count delete 0 end + # $self.count insert 0 "$_($self:histi)/[llength $_($self:hist)]" + } + + proc listener_down {self} { + global _ + if {$_($self:histi) < [llength $_($self:hist)]} {incr _($self:histi)} + $self.entry delete 0 end + $self.entry insert 0 [lindex $_($self:hist) $_($self:histi)] + $self.entry icursor end + # $self.count delete 0 end + # $self.count insert 0 "$_($self:histi)/[llength $_($self:hist)]" + } + + proc listener_append {self v} { + global _ + lappend _($self:hist) $v + set _($self:histi) [llength $_($self:hist)] + } + + proc tcl_eval {} { + set l [.tcl.entry get] + post_to_gui "tcl: $l\nreturns: [eval $l]\n" + listener_append .tcl [.tcl.entry get] + .tcl.entry delete 0 end + + } + + global env + if {$env(pd_console_scrollback) != 0} { + listener_new .tcl "Tcl" + bind .tcl.entry <Return> {tcl_eval} + } + ############ button bar

1 0

externals/grill/py/source bound.cpp,1.7,1.8
by xovo＠users.sourceforge.net 26 Feb '04

26 Feb '04

Update of /cvsroot/pure-data/externals/grill/py/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17442/source Modified Files: bound.cpp Log Message: "" Index: bound.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/bound.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** bound.cpp 12 Dec 2003 03:38:44 -0000 1.7 --- bound.cpp 26 Feb 2004 03:32:48 -0000 1.8 *************** *** 3,7 **** py/pyext - python external object for PD and MaxMSP ! Copyright (c) 2002-2003 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- py/pyext - python external object for PD and MaxMSP ! Copyright (c) 2002-2004 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 12,15 **** --- 12,17 ---- #include "flinternal.h" + #include <set> + struct bounddata {

1 0

externals/miXed/test/toxy tot-bulk.pd,1.1,NONE
by krzyszcz＠users.sourceforge.net 25 Feb '04

25 Feb '04

Update of /cvsroot/pure-data/externals/miXed/test/toxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24024 Removed Files: tot-bulk.pd Log Message: --- tot-bulk.pd DELETED ---

1 0

externals/miXed/toxy build_counter,1.2,1.3 widget.c,1.3,1.4
by krzyszcz＠users.sourceforge.net 25 Feb '04

25 Feb '04

Update of /cvsroot/pure-data/externals/miXed/toxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21748/toxy Modified Files: build_counter widget.c Log Message: widget tracing backward compatible to tcl8.3 Index: build_counter =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/build_counter,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build_counter 19 Feb 2004 22:23:18 -0000 1.2 --- build_counter 25 Feb 2004 10:54:43 -0000 1.3 *************** *** 1,3 **** #define TOXY_VERSION "0.1" #define TOXY_RELEASE "alpha" ! #define TOXY_BUILD 2 --- 1,3 ---- #define TOXY_VERSION "0.1" #define TOXY_RELEASE "alpha" ! #define TOXY_BUILD 3 Index: widget.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/widget.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** widget.c 19 Feb 2004 22:23:18 -0000 1.3 --- widget.c 25 Feb 2004 10:54:43 -0000 1.4 *************** *** 3,6 **** --- 3,8 ---- * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ + /* FIXME crash if closing window with a failed widget (e.g. .wid missing) */ + /* LATER think about reloading method for .wid files */

1 0

externals/miXed/shared/toxy scriptlet.c,1.3,1.4
by krzyszcz＠users.sourceforge.net 25 Feb '04

25 Feb '04

Update of /cvsroot/pure-data/externals/miXed/shared/toxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21748/shared/toxy Modified Files: scriptlet.c Log Message: widget tracing backward compatible to tcl8.3 Index: scriptlet.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/shared/toxy/scriptlet.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** scriptlet.c 19 Feb 2004 22:23:17 -0000 1.3 --- scriptlet.c 25 Feb 2004 10:54:42 -0000 1.4 *************** *** 198,202 **** { t_canvas *cv; ! if (cv = scriptlet_canvasvalidate(sp, visedonly)) { if (!strncmp(&ibuf[1], "tag", 3)) --- 198,202 ---- { t_canvas *cv; ! if (cv = scriptlet_canvasvalidate(sp, 0)) { if (!strncmp(&ibuf[1], "tag", 3))

1 0

externals/miXed/test/toxy tclversion.pd,NONE,1.1 default.wid,1.3,1.4
by krzyszcz＠users.sourceforge.net 25 Feb '04

25 Feb '04

Update of /cvsroot/pure-data/externals/miXed/test/toxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21748/test/toxy Modified Files: default.wid Added Files: tclversion.pd Log Message: widget tracing backward compatible to tcl8.3 --- NEW FILE: tclversion.pd --- #N canvas 68 131 532 301 24; #X obj 38 191 tot .; #X obj 38 29 loadbang; #X msg 38 138 query concat set [info tclversion]; #X msg 38 243; #X obj 38 86 t b b; #X msg 147 191 set; #X connect 0 0 3 0; #X connect 1 0 4 0; #X connect 2 0 0 0; #X connect 4 0 2 0; #X connect 4 1 5 0; #X connect 5 0 3 0; Index: default.wid =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/test/toxy/default.wid,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** default.wid 19 Feb 2004 22:23:18 -0000 1.3 --- default.wid 25 Feb 2004 10:54:43 -0000 1.4 *************** *** 30,37 **** } } else { ! trace add variable $res write "::toxy::itembindtrace $varname" } if {![info exists $varname.last]} { set $varname.last "" } ! trace add variable $varname write "::toxy::itemdotrace $target" return } else { return 0 } --- 30,45 ---- } } else { ! if {[info tclversion] < 8.4} { ! trace variable $res w "::toxy::itembindtrace $varname" ! } else { ! trace add variable $res write "::toxy::itembindtrace $varname" ! } } if {![info exists $varname.last]} { set $varname.last "" } ! if {[info tclversion] < 8.4} { ! trace variable $varname w "::toxy::itemdotrace $target" ! } else { ! trace add variable $varname write "::toxy::itemdotrace $target" ! } return } else { return 0 } *************** *** 46,51 **** } } elseif {$res != ""} { ! catch { trace remove variable \ ! $res write "::toxy::itembindtrace $varname" } } } --- 54,63 ---- } } elseif {$res != ""} { ! if {[info tclversion] < 8.4} { ! catch { trace vdelete $res w "::toxy::itembindtrace $varname" } ! } else { ! catch { trace remove variable \ ! $res write "::toxy::itembindtrace $varname" } ! } } } *************** *** 55,59 **** ::toxy::itemremovetrace -variable $path $varname.var ::toxy::itemremovetrace -textvariable $path $varname.txt ! unset -nocomplain $varname.last $varname.var $varname.txt $varname catch {destroy $path} } --- 67,75 ---- ::toxy::itemremovetrace -variable $path $varname.var ::toxy::itemremovetrace -textvariable $path $varname.txt ! if {[info tclversion] < 8.4} { ! catch { unset $varname.last $varname.var $varname.txt $varname } ! } else { ! unset -nocomplain $varname.last $varname.var $varname.txt $varname ! } catch {destroy $path} }

1 0

externals/miXed/test/toxy/stress bulk.pd,NONE,1.1 catchme.pd,NONE,1.1
by krzyszcz＠users.sourceforge.net 25 Feb '04

25 Feb '04

Update of /cvsroot/pure-data/externals/miXed/test/toxy/stress In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21748/test/toxy/stress Added Files: bulk.pd catchme.pd Log Message: widget tracing backward compatible to tcl8.3 --- NEW FILE: bulk.pd --- #N canvas 75 60 628 612 12; #X obj 62 449 pack; #X obj 62 387 t b b; #X obj 62 356 until; #X obj 33 250 makefilename #%x; #X obj 33 219 + 256; #X obj 33 188 random 3840; #X obj 62 418 random 500; #X obj 175 418 random 500; #X obj 33 126 + 3; #X obj 83 6 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1; #X obj 157 95 random 10; #X obj 157 126 sel 7; #X obj 175 449 + 20; #X obj 33 6 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1 ; #X msg 130 33 tot .^.c delete bulk; #X msg 62 480 add [expr \$1 + .#1] [expr \$2 + .#2]; #X msg 62 511 debug; #X obj 33 285 pack s 0 0; #X msg 33 320 add -tags bulk -fill \$1 -smooth true \, push \$2 \$3 ; #X msg 157 188 reset \, add .^.c create polygon; #X obj 261 250 random 150; #X obj 201 219 random 100; #X obj 201 250 + 10; #X obj 33 95 random 700; #X obj 33 544 tot .; #X obj 328 414 makefilename #%x; #X obj 328 383 + 256; #X obj 328 352 random 3840; #X msg 328 449 tot .^.c configure -bg \$1; #X obj 33 157 t b b b 0 b; #X obj 33 64 t b b b; #X obj 277 95 random 5; #X obj 277 126 sel 3; #X obj 33 33 metro 300; #X connect 0 0 15 0; #X connect 1 0 6 0; #X connect 1 1 7 0; #X connect 2 0 1 0; #X connect 3 0 17 0; #X connect 4 0 3 0; #X connect 5 0 4 0; #X connect 6 0 0 0; #X connect 7 0 12 0; #X connect 8 0 29 0; #X connect 9 0 33 0; #X connect 10 0 11 0; #X connect 11 0 14 0; #X connect 12 0 0 1; #X connect 13 0 30 0; #X connect 14 0 24 0; #X connect 15 0 24 0; #X connect 16 0 24 0; #X connect 17 0 18 0; #X connect 18 0 24 0; #X connect 19 0 24 0; #X connect 20 0 17 2; #X connect 21 0 22 0; #X connect 22 0 17 1; #X connect 23 0 8 0; #X connect 24 3 27 0; #X connect 25 0 28 0; #X connect 26 0 25 0; #X connect 27 0 26 0; #X connect 28 0 24 0; #X connect 29 0 5 0; #X connect 29 1 21 0; #X connect 29 2 20 0; #X connect 29 3 2 0; #X connect 29 4 19 0; #X connect 30 0 23 0; #X connect 30 1 10 0; #X connect 30 2 31 0; #X connect 31 0 32 0; #X connect 32 0 27 0; #X connect 33 0 30 0; --- NEW FILE: catchme.pd --- #N canvas 68 66 301 201 12; #N canvas 106 79 583 484 catchme 0; #X obj 150 96 t b b; #X obj 150 207 + 100; #X obj 251 207 + 100; #X obj 150 133 random 10; #X obj 251 133 random 10; #X obj 22 22 inlet; #X msg 22 290 tot wm geometry .^ \$1; #X obj 150 60 metro 30; #X obj 349 60 metro 3000; #X obj 349 96 random 300; #X obj 452 96 random 300; #X obj 190 170 line; #X obj 291 170 line; #X obj 22 60 metro 1000; #X obj 22 253 sprintf symbol %dx%d+%d+%d; #X obj 22 170 line; #X obj 89 207 + 200; #X msg 22 133 \$1 900; #X msg 452 133 \$1 2900; #X msg 349 133 \$1 2900; #X obj 22 96 random 75; #X obj 22 207 + 300; #X obj 490 60 metro 300; #X obj 22 325 tot catchme.pd; #X obj 143 363 delay 500; #X obj 143 443 s catchme-start; #X obj 260 325 key; #X obj 260 363 sel 32; #X msg 191 401 0; #X msg 143 401 1; #N canvas 90 49 662 516 selfornamentation 0; #X obj 38 85 random 256; #X obj 135 85 random 256; #X obj 233 85 random 256; #X obj 113 407 symbol; #X obj 113 290 random 3; #X obj 113 322 sel 0 1 2; #X obj 38 120 sprintf symbol #%02x%02x%02x; #X msg 193 363 scraTchme; #X msg 113 363 caTchme; #X msg 297 363 deTachme; #X obj 38 14 inlet; #X msg 38 159 tot .~root.c itemconfig .~tagR -fill \$1; #X msg 66 206 tot .~root.c itemconfig .~tagR -width 11; #X msg 86 244 tot .~root.c itemconfig .~tag -font .(helvetica 48 bold italic.); #X obj 38 48 t b b b b; #X obj 169 14 inlet; #X obj 38 476 tot catchme; #X msg 113 443 tot .~owner.c itemconfig .~tag -text \$1; #X connect 0 0 6 0; #X connect 1 0 6 1; #X connect 2 0 6 2; #X connect 3 0 17 0; #X connect 4 0 5 0; #X connect 5 0 8 0; #X connect 5 1 7 0; #X connect 5 2 9 0; #X connect 6 0 11 0; #X connect 7 0 3 0; #X connect 8 0 3 0; #X connect 9 0 3 0; #X connect 10 0 14 0; #X connect 11 0 16 0; #X connect 12 0 16 0; #X connect 13 0 16 0; #X connect 14 0 0 0; #X connect 14 1 1 0; #X connect 14 2 2 0; #X connect 14 3 4 0; #X connect 15 0 12 0; #X connect 15 0 13 0; #X connect 17 0 16 0; #X restore 319 253 pd selfornamentation; #X connect 0 0 3 0; #X connect 0 1 4 0; #X connect 1 0 14 2; #X connect 2 0 14 3; #X connect 3 0 1 0; #X connect 4 0 2 0; #X connect 5 0 7 0; #X connect 5 0 8 0; #X connect 5 0 13 0; #X connect 5 0 22 0; #X connect 6 0 23 0; #X connect 7 0 0 0; #X connect 8 0 9 0; #X connect 8 0 10 0; #X connect 9 0 19 0; #X connect 10 0 18 0; #X connect 11 0 1 1; #X connect 12 0 2 1; #X connect 13 0 20 0; #X connect 14 0 6 0; #X connect 15 0 16 0; #X connect 15 0 21 0; #X connect 16 0 14 1; #X connect 17 0 15 0; #X connect 18 0 12 0; #X connect 19 0 11 0; #X connect 20 0 17 0; #X connect 21 0 14 0; #X connect 22 0 30 0; #X connect 23 3 24 0; #X connect 23 3 30 1; #X connect 24 0 29 0; #X connect 26 0 27 0; #X connect 27 0 28 0; #X connect 28 0 25 0; #X connect 29 0 25 0; #X coords 0 0 0.00362319 0.00319489 200 140 0; #X restore 15 80 pd catchme; #X obj 15 29 tgl 10 0 empty catchme-start empty 0 -6 0 8 -262144 -1 -1 0 1; #X connect 1 0 0 0;

1 0

externals/miXed/shared/common port.c,1.5,1.6
by krzyszcz＠users.sourceforge.net 25 Feb '04

25 Feb '04

Update of /cvsroot/pure-data/externals/miXed/shared/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21748/shared/common Modified Files: port.c Log Message: widget tracing backward compatible to tcl8.3 Index: port.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/shared/common/port.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** port.c 19 Sep 2003 12:19:32 -0000 1.5 --- port.c 25 Feb 2004 10:54:42 -0000 1.6 *************** *** 163,170 **** { int ndx = (x->x_inmess[1].a_w.w_symbol == gensym("user") ? 3 : 2); ! if (x->x_inatoms > 6) { ! t_atom *in = x->x_inmess + 7; ! t_atom *out = x->x_outmess; SETSYMBOL(out, gensym("#X")); out++; SETSYMBOL(out, gensym("obj")); out++; --- 163,171 ---- { int ndx = (x->x_inmess[1].a_w.w_symbol == gensym("user") ? 3 : 2); ! if (x->x_inatoms > 6 ! || (ndx == 3 && x->x_inatoms > 4)) { ! int nextra; ! t_atom *in, *out = x->x_outmess; SETSYMBOL(out, gensym("#X")); out++; SETSYMBOL(out, gensym("obj")); out++; *************** *** 173,180 **** import_addclassname(x, name, &x->x_inmess[ndx == 2 ? 6 : 2]); out = x->x_outmess; ! for (ndx = 7; ndx < x->x_inatoms; ndx++) *out++ = *in++; SETSEMI(out); ! binbuf_add(x->x_newbb, x->x_inatoms - 6, x->x_outmess); x->x_nobj++; return (PORT_NEXT); --- 174,182 ---- import_addclassname(x, name, &x->x_inmess[ndx == 2 ? 6 : 2]); out = x->x_outmess; ! for (ndx = 7, nextra = 1, in = x->x_inmess + 7; ! ndx < x->x_inatoms; ndx++, nextra++) *out++ = *in++; SETSEMI(out); ! binbuf_add(x->x_newbb, nextra, x->x_outmess); x->x_nobj++; return (PORT_NEXT);

1 0

externals/miXed Makefile.common,1.14,1.15 quoteinitializer,1.1,1.2
by krzyszcz＠users.sourceforge.net 25 Feb '04

25 Feb '04

Update of /cvsroot/pure-data/externals/miXed In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21748 Modified Files: Makefile.common quoteinitializer Log Message: widget tracing backward compatible to tcl8.3 Index: Makefile.common =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/Makefile.common,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile.common 19 Feb 2004 22:23:16 -0000 1.14 --- Makefile.common 25 Feb 2004 10:54:41 -0000 1.15 *************** *** 43,46 **** --- 43,48 ---- OUT_DIR = $(ROOT_DIR)/bin + # for current versions, $(BASE_DIR) equals $(BASE_NAME), for prior versions, + # $(BASE_DIR) equals $(BASE_NAME)-$(VERSION) BASE_DIR = $(shell basename `pwd`) BASE_NAME = $(shell basename `pwd` | awk -F - '{print $$1}') *************** *** 56,61 **** ifdef LX_SOURCES ! LX_NAMES = $(notdir $(LX_SOURCES)) ! LX_CLASSES = $(subst _,.,$(LX_NAMES)) endif --- 58,63 ---- ifdef LX_SOURCES ! LX_NAMES = $(subst _,.,$(notdir $(LX_SOURCES))) ! LX_CLASSES = $(LX_NAMES:.c=) endif *************** *** 80,86 **** EXTERNS = $(foreach fn,$(CX_NAMES:.c=.$(X_SUFFIX)),$(OUT_DIR)/$(fn)) \ $(foreach fn,$(AX_NAMES:.c=~.$(X_SUFFIX)),$(OUT_DIR)/$(fn)) \ - $(foreach fn,$(LX_CLASSES:.c=.$(X_SUFFIX)),$(OUT_DIR)/$(fn)) \ $(foreach fn,$(CX_CLASSES:=.$(X_SUFFIX)),$(OUT_DIR)/$(fn)) \ $(foreach fn,$(AX_CLASSES:=~.$(X_SUFFIX)),$(OUT_DIR)/$(fn)) \ $(foreach type,$(TYPES),\ $(foreach fn,$(call TYPES_EXTERNS,$(type)),$(OUT_DIR)/$(fn))) --- 82,89 ---- EXTERNS = $(foreach fn,$(CX_NAMES:.c=.$(X_SUFFIX)),$(OUT_DIR)/$(fn)) \ $(foreach fn,$(AX_NAMES:.c=~.$(X_SUFFIX)),$(OUT_DIR)/$(fn)) \ $(foreach fn,$(CX_CLASSES:=.$(X_SUFFIX)),$(OUT_DIR)/$(fn)) \ $(foreach fn,$(AX_CLASSES:=~.$(X_SUFFIX)),$(OUT_DIR)/$(fn)) \ + $(foreach fn,$(LX_CLASSES:=.$(X_SUFFIX)),$(OUT_DIR)/$(fn)) \ + $(if $(LX_STUBCLASS),$(OUT_DIR)/$(LX_STUBCLASS:=.$(X_SUFFIX))) \ $(foreach type,$(TYPES),\ $(foreach fn,$(call TYPES_EXTERNS,$(type)),$(OUT_DIR)/$(fn))) *************** *** 119,122 **** --- 122,126 ---- SHOBJECTS = $(foreach fn,$(SHARED_OBJECTS),$(SHARED_DIR)/$(fn)) + LXSHOBJECTS = $(foreach fn,$(LXSHARED_OBJECTS),$(SHARED_DIR)/$(fn)) OBJECTS = $(foreach fn,$(OTHER_SOURCES:.c=.o),$(OBJ_DIR)/$(fn)) \ *************** *** 127,163 **** .PRECIOUS: %.o # rules for aliases must precede generic extern rules ! # FIXME ! $(OUT_DIR)/$(BASE_NAME).%~.$(X_SUFFIX): $(BASE_NAME)_loader.c $(SHOBJECTS) $(CC) -o $@ -Xlinker -defsym \ ! -Xlinker $(BASE_NAME).$(*F)_tilde_setup=$(BASE_NAME)_loader_setup \ ! $(CFLAGS) $(LFLAGS) $(SHOBJECTS) $< ! $(OUT_DIR)/$(BASE_NAME).%.$(X_SUFFIX): $(BASE_NAME)_loader.c $(SHOBJECTS) $(CC) -o $@ -Xlinker -defsym \ ! -Xlinker $(BASE_NAME).$(*F)_setup=$(BASE_NAME)_loader_setup \ ! $(CFLAGS) $(LFLAGS) $(SHOBJECTS) $< ! ! #$(OUT_DIR)/$(BASE_NAME).%.$(X_SUFFIX): $(BASE_NAME)_%.c $(SHOBJECTS) ! # $(CC) -c $(CFLAGS) $< ! # -ld -o $@ -defsym $(BASE_NAME).$(*F)_setup=$(BASE_NAME)_$(*F)_setup \ ! # -L $(OUT_DIR) $(LFLAGS) $(SHOBJECTS) \ ! # $(BASE_NAME).$(X_SUFFIX) $(BASE_NAME)_$(*F).o ! ! # $(CC) -o $@ -Xlinker -defsym \ ! # -Xlinker $(BASE_NAME).$(*F)_setup=$(BASE_NAME)_$(*F)_setup \ ! # -Xlinker -rpath -Xlinker $(OUT_DIR) \ ! # $(CFLAGS) $(LFLAGS) $(SHOBJECTS) $(BASE_NAME).$(X_SUFFIX) $< ! ! # library stub ! # if not equal BASE_NAME, it has to be declared explicitly in BASE_DIR/Makefile ! # FIXME ! $(OUT_DIR)/$(LX_STUB)_%~.$(X_SUFFIX): $(OUT_DIR)/$(BASE_NAME).$(X_SUFFIX) ! -ln -sf $(BASE_NAME).$(X_SUFFIX) $@ ! $(OUT_DIR)/$(LX_STUB)_%.$(X_SUFFIX): $(OUT_DIR)/$(BASE_NAME).$(X_SUFFIX) ! -ln -sf $(BASE_NAME).$(X_SUFFIX) $@ ! $(OUT_DIR)/$(LX_STUB).$(X_SUFFIX): $(OUT_DIR)/$(BASE_NAME).$(X_SUFFIX) ! -ln -sf $(BASE_NAME).$(X_SUFFIX) $@ # generic rule for audio externals --- 131,161 ---- .PRECIOUS: %.o + # library stub equals $(BASE_NAME) by default, otherwise + # it has to be declared explicitly in $(BASE_DIR)/Makefile.sources + ifdef LX_STUBCLASS + $(OUT_DIR)/$(LX_STUBCLASS).$(X_SUFFIX): $(BASE_NAME)_loader.c $(LXSHOBJECTS) + $(CC) -o $@ -Xlinker -defsym \ + -Xlinker $(LX_STUBCLASS)_setup=$(BASE_NAME)_loader_setup \ + $(CFLAGS) $(LFLAGS) $(LXSHOBJECTS) $< + ifndef LX_STUB + LX_STUB = $(LX_STUBCLASS) + endif + else + ifndef LX_STUB + LX_STUB = $(BASE_NAME) + endif + endif + # rules for aliases must precede generic extern rules ! $(OUT_DIR)/$(LX_STUB).%~.$(X_SUFFIX): $(BASE_NAME)_loader.c $(LXSHOBJECTS) $(CC) -o $@ -Xlinker -defsym \ ! -Xlinker $(LX_STUB).$(*F)_tilde_setup=$(BASE_NAME)_loader_setup \ ! $(CFLAGS) $(LFLAGS) $(LXSHOBJECTS) $< ! $(OUT_DIR)/$(LX_STUB).%.$(X_SUFFIX): $(BASE_NAME)_loader.c $(LXSHOBJECTS) $(CC) -o $@ -Xlinker -defsym \ ! -Xlinker $(LX_STUB).$(*F)_setup=$(BASE_NAME)_loader_setup \ ! $(CFLAGS) $(LFLAGS) $(LXSHOBJECTS) $< # generic rule for audio externals *************** *** 242,250 **** REL_EXTERNS = $(foreach fn,$(CX_NAMES:.c=.$(X_SUFFIX)),$(REL_BINDIR)/$(fn)) \ $(foreach fn,$(AX_NAMES:.c=~.$(X_SUFFIX)),$(REL_BINDIR)/$(fn)) \ $(REL_LIBNAMES) $(foreach fn,$(RELEASE_APPS),$(REL_BINDIR)/$(fn)) \ $(foreach type,$(TYPES),\ $(foreach fn,$(call TYPES_EXTERNS,$(type)),$(REL_BINDIR)/$(fn))) ! REL_ROOTSRC = LICENSE.txt Makefile.common dumpsetups srelease: emptydeps define_build --- 240,252 ---- REL_EXTERNS = $(foreach fn,$(CX_NAMES:.c=.$(X_SUFFIX)),$(REL_BINDIR)/$(fn)) \ $(foreach fn,$(AX_NAMES:.c=~.$(X_SUFFIX)),$(REL_BINDIR)/$(fn)) \ + $(foreach fn,$(CX_CLASSES:=.$(X_SUFFIX)),$(REL_BINDIR)/$(fn)) \ + $(foreach fn,$(AX_CLASSES:=~.$(X_SUFFIX)),$(REL_BINDIR)/$(fn)) \ + $(foreach fn,$(LX_CLASSES:=.$(X_SUFFIX)),$(REL_BINDIR)/$(fn)) \ + $(if $(LX_STUBCLASS),$(REL_BINDIR)/$(LX_STUBCLASS:=.$(X_SUFFIX))) \ $(REL_LIBNAMES) $(foreach fn,$(RELEASE_APPS),$(REL_BINDIR)/$(fn)) \ $(foreach type,$(TYPES),\ $(foreach fn,$(call TYPES_EXTERNS,$(type)),$(REL_BINDIR)/$(fn))) ! REL_ROOTSRC = LICENSE.txt Makefile.common dumpsetups quoteinitializer srelease: emptydeps define_build Index: quoteinitializer =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/quoteinitializer,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** quoteinitializer 19 Feb 2004 22:23:16 -0000 1.1 --- quoteinitializer 25 Feb 2004 10:54:41 -0000 1.2 *************** *** 1,3 **** ! #!/usr/bin/awk -f BEGIN\ --- 1,3 ---- ! #!/usr/bin/gawk -f BEGIN\

1 0

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 February 2004