Pd-cvs August 2007

pd-cvs@lists.iem.at

18 participants
618 discussions

autobuild: pd-main macosx104-powerpc 2007-08-20 03.15.03
by pd＠macosx104-powerpc.idmi.poly.edu 20 Aug '07

20 Aug '07

_regcomp referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _regexec referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _regfree referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _shutdown referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _sleep referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _socket referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _strcspn referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _task_get_special_port referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _thread_terminate referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _vsnprintf referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _write referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _AudioConvertNanosToHostTime referenced from Jack expected to be defined in /System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio _pthread_create referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _thread_info referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _thread_policy_set referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib collect2: ld returned 1 exit status lipo: can't open input file: /var/tmp//ccmSlIEA.out (No such file or directory) make[2]: *** [../bin/pd] Error 1 make[1]: *** [pd_install] Error 2 make: *** [darwin_app_core] Error 2

1 0

pd/src kernel.c,1.1.2.90,1.1.2.91
by Mathieu Bouchard 20 Aug '07

20 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8753 Modified Files: Tag: desiredata kernel.c Log Message: fix for backslash parsing Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.90 retrieving revision 1.1.2.91 diff -C2 -d -r1.1.2.90 -r1.1.2.91 *** kernel.c 19 Aug 2007 07:06:27 -0000 1.1.2.90 --- kernel.c 20 Aug 2007 08:34:01 -0000 1.1.2.91 *************** *** 1592,1595 **** --- 1592,1598 ---- } if (!lastslash && c == '$' && t!=end && isdigit(*t)) dollar = 1; + #if 1 + if (slash&&lastslash) slash=0; + #endif if (!slash) buf << c; } while (t!=end && (slash || !strchr(" \n\r\t,;",*t)));

1 0

pd/src desire.tk,1.1.2.600.2.404,1.1.2.600.2.405
by Mathieu Bouchard 20 Aug '07

20 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2371 Modified Files: Tag: desiredata desire.tk Log Message: fix braces in parsing Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.404 retrieving revision 1.1.2.600.2.405 diff -C2 -d -r1.1.2.600.2.404 -r1.1.2.600.2.405 *** desire.tk 20 Aug 2007 07:56:46 -0000 1.1.2.600.2.404 --- desire.tk 20 Aug 2007 08:16:57 -0000 1.1.2.600.2.405 *************** *** 5498,5502 **** set s [regsub -all {(^|[^\\])[\s\n]+} $s "\\1\x01"] set s [regsub -all {^\n} $s "\x01"] ;# oops ! set s [regsub -all {(^|[^\\])\\([\\; ])} $s "\\1\\2"] set s [regsub -all \x03 $s \\] set r {} --- 5498,5502 ---- set s [regsub -all {(^|[^\\])[\s\n]+} $s "\\1\x01"] set s [regsub -all {^\n} $s "\x01"] ;# oops ! set s [regsub -all {\\([\\; \{\}])} $s "\\1\\2"] set s [regsub -all \x03 $s \\] set r {} *************** *** 5532,5535 **** --- 5532,5537 ---- pd_mess_split_want== {\\ \\\\ \\\\\\ \ \\\ \\\\\ one} [list [list "\\" "\\\\" "\\\\\\" "\ \\\ \\\\\ one"]] pd_mess_split_want== "\n \n \n foo" foo + pd_mess_split_want== "\\\x7b\\\x7b\\\x7b\\\x7b" [list [list "\x7b\x7b\x7b\x7b"]] + pd_mess_split_want== "\\\x7d\\\x7d\\\x7d\\\x7d" [list [list "\x7d\x7d\x7d\x7d"]] exit }

1 0

pd/src desire.tk,1.1.2.600.2.403,1.1.2.600.2.404
by Mathieu Bouchard 20 Aug '07

20 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27532 Modified Files: Tag: desiredata desire.tk Log Message: new pd format parser (rewrote proc pd_mess_split) Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.403 retrieving revision 1.1.2.600.2.404 diff -C2 -d -r1.1.2.600.2.403 -r1.1.2.600.2.404 *** desire.tk 20 Aug 2007 05:25:32 -0000 1.1.2.600.2.403 --- desire.tk 20 Aug 2007 07:56:46 -0000 1.1.2.600.2.404 *************** *** 1030,1040 **** after 1000 pd_connect ! if {$cmdline(port)} { set server_port $cmdline(port) # and then do nothing... ! } elseif {$cmdline(valgrind)} { #exec valgrind --tool=memcheck $cmdline(server) -guiport $server_port & exec valgrind --tool=memcheck --gen-suppressions=all --suppressions=valgrind3.supp $cmdline(server) -guiport $server_port & ! } else { if {$cmdline(gdb)} { if {$cmdline(console) && $cmdline(gdbconsole)} { --- 1030,1041 ---- after 1000 pd_connect ! after 0 { ! if {$cmdline(port)} { set server_port $cmdline(port) # and then do nothing... ! } elseif {$cmdline(valgrind)} { #exec valgrind --tool=memcheck $cmdline(server) -guiport $server_port & exec valgrind --tool=memcheck --gen-suppressions=all --suppressions=valgrind3.supp $cmdline(server) -guiport $server_port & ! } else { if {$cmdline(gdb)} { if {$cmdline(console) && $cmdline(gdbconsole)} { *************** *** 1054,1057 **** --- 1055,1059 ---- exec $cmdline(server) -guiport $server_port & } + } } *************** *** 5443,5451 **** proc change_2 {self mess} { - set mess [split $mess] set isnew [expr ![info exists ::_($self:_class)]] switch -- [lindex $mess 0] { "#N" {if {$isnew} {Canvas new_as $self $mess} else {$self reinit $mess}} ! "#X" { # YOU CAN'T USE LINDEX YOU DUMMY set i 1 # would it be possible to merge floatatom,symbolatom as gatom ? --- 5445,5452 ---- proc change_2 {self mess} { set isnew [expr ![info exists ::_($self:_class)]] switch -- [lindex $mess 0] { "#N" {if {$isnew} {Canvas new_as $self $mess} else {$self reinit $mess}} ! "#X" { set i 1 # would it be possible to merge floatatom,symbolatom as gatom ? *************** *** 5478,5482 **** #post "#V: $mess" } ! default {if {$mess != ""} {error "what you say? ($mess)"}} } } --- 5479,5483 ---- #post "#V: $mess" } ! default {if {$mess != ""} {error "what you say? «[lindex $mess 0]» in «$mess»"}} } } *************** *** 5487,5509 **** #} ! # split at message boundaries. ! # \n is wiped, then that character is reused temporarily to mean a quoted semicolon. ! # BUG: this is wrong because then \\; gets parsed wrong. ! proc pd_mess_split {e} { set r {} ! set m {} ! regsub -all "\n" $e " " y ! regsub -all {\\;} $y "\n" z ! foreach mess [split $z ";"] { ! regsub -all "\n" $mess "\\;" mess ! set mess [string trimleft $mess] ! if {$mess != ""} {lappend r $mess} } return $r } ! # split at atom boundaries. ! proc pd_atom_split {e} { ! # huh... } --- 5488,5536 ---- #} ! # split at message boundaries and atom boundaries, returning a list of lists of atoms. ! # spaces get temporary value \x01 ! # A_SEMI gets temporary value \x02 ! # backslash gets temporary value \x03 ! # A_COMMA is not handled yet ! proc pd_mess_split {s} { ! set s [regsub -all {\\\\} $s "\x03"] ! set s [regsub -all {(^|[^\\]);} $s "\\1\x02"] ! set s [regsub -all {(^|[^\\])[\s\n]+} $s "\\1\x01"] ! set s [regsub -all {^\n} $s "\x01"] ;# oops ! set s [regsub -all {(^|[^\\])\\([\\; ])} $s "\\1\\2"] ! set s [regsub -all \x03 $s \\] set r {} ! foreach m [split $s \x02] { ! set m [regsub -all "\x01+" $m "\x01"] ! set m [regsub -all "^\x01" $m ""] ! set t [split $m \x01] ! lappend r $t } return $r } ! proc canonical_list {list} { ! set r {} ! foreach e $list {lappend r $e} ! return $r ! } ! ! proc pd_mess_split_want== {a b} { ! set b [canonical_list $b] ! set c [pd_mess_split $a] ! if {[string compare $c $b]} { ! puts "[VTred]string «$a»\nparses to «$c»\ninstead of «$b»[VTgrey]" ! } else { ! puts "[VTgreen]string «$a» OK[VTgrey]" ! } ! } ! ! if 0 { ! pd_mess_split_want== {foo;bar;baz;a\;;b\\;c\\\;;d\\\\;e} {foo bar baz {{a;}} {b\\} {{c\;}} {{d\\}} e} ! pd_mess_split_want== {foo\ bar} {{{foo bar}}} ! pd_mess_split_want== {foo \ bar\ foo\ bar foo} {{foo { } {bar foo bar} foo}} ! pd_mess_split_want== {\\ \\\\ \\\\\\ \ \\\ \\\\\ one} [list [list "\\" "\\\\" "\\\\\\" "\ \\\ \\\\\ one"]] ! pd_mess_split_want== "\n \n \n foo" foo ! exit }

1 0

autobuild: pd-main macosx104-i386 2007-08-20 03.15.05
by pd＠macosx104-i386.idmi.poly.edu 20 Aug '07

20 Aug '07

/usr/bin/libtool: internal link edit command failed lipo: can't figure out the architecture type of: /var/tmp//cce6popK.out make[2]: *** [../bin/libPdTcl.dylib] Error 1 make[1]: [pd] Error 2 (ignored) make -C /Users/pd/auto-build/pd-main/pd/src BUILDLAYOUT_DIR=/Users/pd/auto-build/pd-main/packages cvs_root_dir=/Users/pd/auto-build/pd-main DESTDIR=/Users/pd/auto-build/pd-main/packages/darwin_app/build/Pd-0.41.0-test06.app/Contents/Resources prefix= libpddir=/Users/pd/auto-build/pd-main/packages/darwin_app/build/Pd-0.41.0-test06.app/Contents/Resources OPT_CFLAGS="-march=pentium4 -msse2 -mfpmath=sse -ftree-vectorize -ftree-vectorizer-verbose=2" UNAME=Darwin install cd ../obj && cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/include -I../portaudio/src/common -I../portaudio/src/os/mac_osx/ -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -DNEWBUFFER -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wno-error -O2 -DUSEAPI_JACK -dynamiclib -read_only_relocs warning \ -o ../bin/libPdTcl.dylib t_main.o t_tkcmd.o \ -F/Library/Frameworks \ -framework Tcl -framework Tk -framework System \ -Wl,-install_name,@executable_path/../Resources/bin/libPdTcl.dylib ld: Undefined symbols: _Tcl_CreateCommand _Tcl_CreateFileHandler _Tcl_Eval _Tcl_GetVar /usr/bin/libtool: internal link edit command failed lipo: can't figure out the architecture type of: /var/tmp//cc9JYMst.out make[2]: *** [../bin/libPdTcl.dylib] Error 1 make[1]: *** [pd_install] Error 2 make: *** [darwin_app_core] Error 2

1 0

pd/src desire.tk,1.1.2.600.2.402,1.1.2.600.2.403
by chunlee 20 Aug '07

20 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5320 Modified Files: Tag: desiredata desire.tk Log Message: small fixes Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.402 retrieving revision 1.1.2.600.2.403 diff -C2 -d -r1.1.2.600.2.402 -r1.1.2.600.2.403 *** desire.tk 20 Aug 2007 04:40:56 -0000 1.1.2.600.2.402 --- desire.tk 20 Aug 2007 05:25:32 -0000 1.1.2.600.2.403 *************** *** 329,333 **** class_new Selection {Hash} def Selection set {k v} {super $k $v; $v selected?= 1} ! def Selection unset {k} {if {[$self exists $k]} {[$self get $k] selected?= 0}; super $k} #-----------------------------------------------------------------------------------# # abstract class: subclass must def {value value= <<} --- 329,337 ---- class_new Selection {Hash} def Selection set {k v} {super $k $v; $v selected?= 1} ! def Selection unset {k} { ! #set v [$self get $k]; puts "$v ::: [$v class]" ! if {[$self exists $k]} {[$self get $k] selected?= 0} ! super $k ! } #-----------------------------------------------------------------------------------# # abstract class: subclass must def {value value= <<} *************** *** 1488,1491 **** --- 1492,1496 ---- if {$@gop} {foreach x [$@objects values] {$x outside_of_the_box}} $self save_geometry + $self copy_times= 0 netsend [list .$self vis 0] #netsend [list .$self close] *************** *** 2471,2475 **** ButtonRelease {set name $event-$k} Motion {set name $event} ! default {puts "Error: this event should not have been here.."} } if {$@idx < [llength $@list]} { --- 2476,2480 ---- ButtonRelease {set name $event-$k} Motion {set name $event} ! default {puts "Error: event $event should not have been here.."} } if {$@idx < [llength $@list]} { *************** *** 3762,3766 **** set y2 [expr [lindex $mess 3] - [lindex $ycoords $ref] + $vy1 + $yoff] return [lreplace $mess 2 3 $x2 $y2] ! } else {return [lreplace $mess 2 3 [expr $x+$offset] [expr $y+$offset]]} } --- 3767,3774 ---- set y2 [expr [lindex $mess 3] - [lindex $ycoords $ref] + $vy1 + $yoff] return [lreplace $mess 2 3 $x2 $y2] ! } else { ! puts "\t \t [expr $x+$offset] [expr $y+$offset] <<<<<" ! return [lreplace $mess 2 3 [expr $x+$offset] [expr $y+$offset]] ! } } *************** *** 5148,5152 **** incr i } ! netsend [list .$obj clipboard_set $s] } --- 5156,5160 ---- incr i } ! netsend [concat [list .$obj clipboard_set] $s] } *************** *** 5168,5172 **** return } ! default {puts "Error: this event should not have been here.."} } if {$fudge} {event generate $w <Motion> -x $x -y $y} --- 5176,5180 ---- return } ! default {puts "Error: this event $event should not have been here.."} } if {$fudge} {event generate $w <Motion> -x $x -y $y}

1 0

pd/src desire.c,1.1.2.217.2.233,1.1.2.217.2.234
by Mathieu Bouchard 20 Aug '07

20 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26254 Modified Files: Tag: desiredata desire.c Log Message: fix for FloatBox and SymbolBox Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.233 retrieving revision 1.1.2.217.2.234 diff -C2 -d -r1.1.2.217.2.233 -r1.1.2.217.2.234 *** desire.c 20 Aug 2007 04:06:28 -0000 1.1.2.217.2.233 --- desire.c 20 Aug 2007 04:55:30 -0000 1.1.2.217.2.234 *************** *** 5453,5457 **** inlet_new(x,x,0,0); outlet_new(x, type == A_FLOAT ? &s_float: &s_symbol); ! if (argc >= 2) gatom_reload(x,&s_,argc-2,argv+2); canvas_add(gl,x); pd_set_newest(x); --- 5453,5457 ---- inlet_new(x,x,0,0); outlet_new(x, type == A_FLOAT ? &s_float: &s_symbol); ! if (argc>2) gatom_reload(x,&s_,argc-2,argv+2); canvas_add(gl,x); pd_set_newest(x);

1 0

pd/src desire.tk,1.1.2.600.2.401,1.1.2.600.2.402
by Mathieu Bouchard 20 Aug '07

20 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21559 Modified Files: Tag: desiredata desire.tk Log Message: fix client-to-server spaces in symbols Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.401 retrieving revision 1.1.2.600.2.402 diff -C2 -d -r1.1.2.600.2.401 -r1.1.2.600.2.402 *** desire.tk 20 Aug 2007 03:15:52 -0000 1.1.2.600.2.401 --- desire.tk 20 Aug 2007 04:40:56 -0000 1.1.2.600.2.402 *************** *** 260,263 **** --- 260,269 ---- } + proc philtre {atoms} { + set r {} + foreach atom $atoms {lappend r [regsub -all {([;,\\ ])} $atom {\\\1}]} + return [join $r] + } + # you pass the 2nd argument if and only if the message creates an object (or pretends to). # this happens with #N canvas, and those methods of #X: *************** *** 2825,2829 **** default {set goto [list $@canvas new_object_callback]} } ! netsend [list .$@canvas text_setto $self $l] $goto } --- 2831,2835 ---- default {set goto [list $@canvas new_object_callback]} } ! netsend [concat [list .$@canvas text_setto $self] $l] $goto } *************** *** 8701,8709 **** } - proc philtre {atoms} { - regsub -all {([;,\\])} [join $atoms " "] {\\\1} atoms - return $atoms - } - def MessageBox deconstruct {} {concat [list #X msg $@x1 $@y1] $@text} def FloatBox deconstruct {} {concat [list #X floatatom $@x1 $@y1] $@w $@min $@max $@pos $@lab $@snd $@rcv} --- 8707,8710 ----

1 0

pd/src desire.c,1.1.2.217.2.232,1.1.2.217.2.233
by Mathieu Bouchard 20 Aug '07

20 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9029 Modified Files: Tag: desiredata desire.c Log Message: fix previous commit Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.232 retrieving revision 1.1.2.217.2.233 diff -C2 -d -r1.1.2.217.2.232 -r1.1.2.217.2.233 *** desire.c 20 Aug 2007 03:46:28 -0000 1.1.2.217.2.232 --- desire.c 20 Aug 2007 04:06:28 -0000 1.1.2.217.2.233 *************** *** 6127,6131 **** SET(nonzero,1.0); outlet_new(x, &s_float); ! toggle_reload(x,0,argc,argv); return x; } --- 6127,6131 ---- SET(nonzero,1.0); outlet_new(x, &s_float); ! if (argc) toggle_reload(x,0,argc,argv); return x; } *************** *** 6241,6245 **** SET(on_old,x->on); outlet_new(x, &s_list); ! radio_reload(x,0,argc,argv); return x; } --- 6241,6245 ---- SET(on_old,x->on); outlet_new(x, &s_list); ! if (argc) radio_reload(x,0,argc,argv); return x; } *************** *** 6342,6346 **** if (x->orient) SET(h,IEM_SL_DEFAULTSIZE); else SET(w,IEM_SL_DEFAULTSIZE); outlet_new(x, &s_float); ! slider_reload(x,0,argc,argv); return x; } --- 6342,6346 ---- if (x->orient) SET(h,IEM_SL_DEFAULTSIZE); else SET(w,IEM_SL_DEFAULTSIZE); outlet_new(x, &s_float); ! if (argc) slider_reload(x,0,argc,argv); return x; } *************** *** 6435,6439 **** SET(change,0); outlet_new(x, &s_float); ! nbx_reload(x,0,argc,argv); return x; } --- 6435,6439 ---- SET(change,0); outlet_new(x, &s_float); ! if (argc) nbx_reload(x,0,argc,argv); return x; } *************** *** 6523,6527 **** vu_check_height(x,x->h); inlet_new(x,x,&s_float,gensym("ft1")); ! vu_reload(x,0,argc,argv); return x; } --- 6523,6527 ---- vu_check_height(x,x->h); inlet_new(x,x,&s_float,gensym("ft1")); ! if (argc) vu_reload(x,0,argc,argv); return x; } *************** *** 6579,6583 **** SET(vis_w,100); SET(vis_h,60); ! cnv_reload(x,0,argc,argv); return x; } --- 6579,6583 ---- SET(vis_w,100); SET(vis_h,60); ! if (argc) cnv_reload(x,0,argc,argv); return x; }

1 0

pd/src desire.c,1.1.2.217.2.231,1.1.2.217.2.232
by Mathieu Bouchard 20 Aug '07

20 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1605 Modified Files: Tag: desiredata desire.c Log Message: fixed bugs in t_boxes and pd_scanargs; wrote some of t_gop_filtre Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.231 retrieving revision 1.1.2.217.2.232 diff -C2 -d -r1.1.2.217.2.231 -r1.1.2.217.2.232 *** desire.c 19 Aug 2007 05:04:01 -0000 1.1.2.217.2.231 --- desire.c 20 Aug 2007 03:46:28 -0000 1.1.2.217.2.232 *************** *** 98,102 **** while (iter->second != x) iter++; iter++; ! return iter->second; } void add(t_gobj *x) {map.insert(KV(x->dix->index,x)); invariant();} --- 98,102 ---- while (iter->second != x) iter++; iter++; ! return iter == map.end() ? 0 : iter->second; } void add(t_gobj *x) {map.insert(KV(x->dix->index,x)); invariant();} *************** *** 111,114 **** --- 111,117 ---- } + void boxes_notice(t_boxes *self, t_gobj *origin, int argc, t_atom *argv) { + } + void boxes_free(t_boxes *self) {self->~t_boxes();} *************** *** 120,131 **** struct t_gop_filtre : t_gobj { }; ! t_gobj *gop_filtre_new() { t_gop_filtre *self = (t_gop_filtre *)pd_new(gop_filtre_class); new(self) t_gop_filtre; return self; } //-------------------------------------------------------------------------- // t_appendix: an extension to t_gobj made by matju so that all t_gobj's may have new fields --- 123,157 ---- struct t_gop_filtre : t_gobj { + t_canvas *canvas; }; ! // test for half-open interval membership ! bool inside (int x, int x0, int x1) {return x0<=x && x<x1;} ! ! /* this method is always called when a canvas is in gop mode so we don't check for this */ ! /* it doesn't filtre out all that needs to be filtred out, but does not filtre out anything that has to stay */ ! void gop_filtre_notice(t_gop_filtre *self,t_gobj *origin, int argc, t_atom *argv) { ! /* here, assume that the canvas *is* a gop; else we wouldn't be in this method. */ ! t_object *o = (t_object *)origin; ! t_canvas *c = self->canvas; ! if (c->goprect) { ! if (!inside(o->x, c->xmargin, c->xmargin + c->pixwidth )) return; ! if (!inside(o->y, c->ymargin, c->ymargin + c->pixheight)) return; ! } else { ! ! } ! gobj_changed3(self,origin,argc,argv); ! } ! ! t_gobj *gop_filtre_new(t_canvas *canvas) { t_gop_filtre *self = (t_gop_filtre *)pd_new(gop_filtre_class); new(self) t_gop_filtre; + self->canvas = canvas; + gobj_subscribe(canvas->boxes,self); return self; } + void gop_filtre_free(t_boxes *self) {} + //-------------------------------------------------------------------------- // t_appendix: an extension to t_gobj made by matju so that all t_gobj's may have new fields *************** *** 2204,2224 **** } - /* get the window location in pixels of a "text" object. The object's x and y positions are in pixels - when the canvas they're in is toplevel. Otherwise, if it's a new-style graph-on-parent (so goprect - is set) we use the offset into the framing subrectangle as an offset into the parent rectangle. - Finally, it might be an old, proportional-style GOP. In this case we do a coordinate transformation. */ - static int text_xpix(t_text *x, t_canvas *canvas) { - float width = canvas->x2-canvas->x1; - if (canvas->havewindow || !canvas->gop) return x->x; - if (canvas->goprect) return canvas->x+x->x-canvas->xmargin; - return canvas_xtopixels(canvas, canvas->x1 + width * x->x / (canvas->screenx2-canvas->screenx1)); - } - static int text_ypix(t_text *x, t_canvas *canvas) { - float height = canvas->y2-canvas->y1; - if (canvas->havewindow || !canvas->gop) return x->y; - if (canvas->goprect) return canvas->y+x->y-canvas->ymargin; - return canvas_ytopixels(canvas, canvas->y1 + height* x->y / (canvas->screeny2-canvas->screeny1)); - } - /* --------------------------- widget behavior ------------------- */ /* don't remove this code yet: has to be rewritten in tcl */ --- 2230,2233 ---- *************** *** 2298,2303 **** #endif ! /* get the graph's rectangle, not counting extra swelling for controls ! to keep them inside the graph. This is the "logical" pixel size. */ static void graph_graphrect(t_gobj *z, t_canvas *canvas, int *xp1, int *yp1, int *xp2, int *yp2) { t_canvas *x = (t_canvas *)z; --- 2307,2322 ---- #endif ! static int text_xpix(t_text *x, t_canvas *canvas) { ! float width = canvas->x2-canvas->x1; ! if (canvas->havewindow || !canvas->gop) return x->x; ! if (canvas->goprect) return canvas->x+x->x-canvas->xmargin; ! return canvas_xtopixels(canvas, canvas->x1 + width * x->x / (canvas->screenx2-canvas->screenx1)); ! } ! static int text_ypix(t_text *x, t_canvas *canvas) { ! float height = canvas->y2-canvas->y1; ! if (canvas->havewindow || !canvas->gop) return x->y; ! if (canvas->goprect) return canvas->y+x->y-canvas->ymargin; ! return canvas_ytopixels(canvas, canvas->y1 + height* x->y / (canvas->screeny2-canvas->screeny1)); ! } static void graph_graphrect(t_gobj *z, t_canvas *canvas, int *xp1, int *yp1, int *xp2, int *yp2) { t_canvas *x = (t_canvas *)z; *************** *** 5721,5739 **** int pd_vscanargs(int argc, t_atom *argv, char *fmt, va_list val) { int optional=0; ! int i; ! for (i=0; i<argc; i++) { switch (fmt[i]) { ! case 0 : goto err; /* too many args */ case '*': goto break1; /* rest is any type */ case 'F': case 'f': case 'd': case 'i': case 'c': case 'b': ! if (!IS_A_FLOAT(argv,i)) goto err; break; ! case 'S': case 's': if (!IS_A_SYMBOL(argv,i)) goto err; break; case '?': break; ! case 'a': if (!IS_A_FLOAT(argv,i) && !IS_A_SYMBOL(argv,i)) goto err; break; case ';': optional=1; break; ! default: post("WARNING: bug using pd_scanargs()"); goto err; /* WHAT? */ } } ! if (fmt[i]!=0 && !optional) goto err; /* not enough args */ break1: i=0; --- 5740,5763 ---- int pd_vscanargs(int argc, t_atom *argv, char *fmt, va_list val) { int optional=0; ! int i,j=0; ! for (i=0; fmt[i]; i++) { switch (fmt[i]) { ! case 0: error("too many args"); return 0; case '*': goto break1; /* rest is any type */ case 'F': case 'f': case 'd': case 'i': case 'c': case 'b': ! if (!IS_A_FLOAT(argv,j)) {error("expected float in $%d",i+1); return 0;} ! j++; break; ! case 'S': case 's': ! if (!IS_A_SYMBOL(argv,j)) {error("expected symbol in $%d",i+1); return 0;} ! j++; break; case '?': break; ! case 'a': ! if (!IS_A_FLOAT(argv,j) && !IS_A_SYMBOL(argv,j)) {error("expected float or symbol in $%d",i+1); return 0;} ! j++; break; case ';': optional=1; break; ! default: error("bad format string"); return 0; } } ! if (j<argc && !optional) {error("not enough args"); return 0;} break1: i=0; *************** *** 5760,5764 **** } break; ! default: post("WARNING: bug using pd_scanargs()"); goto err; /* WHAT? */ } i++; --- 5784,5788 ---- } break; ! default: post("WARNING: bug using pd_scanargs()"); return 0; /* hmm? */ } i++; *************** *** 5766,5773 **** break2: return 1; - err: - /* maybe it should fill in some default values */ - //post("WARNING: pd_scanargs failed; fmt=%s, i=%d",fmt,i); - return 0; } --- 5790,5793 ---- *************** *** 6053,6057 **** bng_check_minmax(x); outlet_new(x, &s_bang); ! bng_reload(x,0,argc,argv); return x; } --- 6073,6077 ---- bng_check_minmax(x); outlet_new(x, &s_bang); ! if (argc) bng_reload(x,0,argc,argv); return x; } *************** *** 6828,6832 **** extern "C" void boxes_init() { ! boxes_class = class_new2("__boxes",boxes_new,boxes_free,sizeof(t_boxes),CLASS_GOBJ,""); } --- 6848,6856 ---- extern "C" void boxes_init() { ! t_class *c; ! c = boxes_class = class_new2("__boxes" ,0/*boxes_new*/ , boxes_free,sizeof(t_boxes),CLASS_GOBJ,""); ! class_setnotice(c,t_notice(boxes_notice)); ! c = gop_filtre_class = class_new2("__gop_filtre",0/*gop_filtre_new*/,gop_filtre_free,sizeof(t_boxes),CLASS_GOBJ,""); ! class_setnotice(c,t_notice(gop_filtre_notice)); }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
62
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 August 2007