Pd-cvs August 2007

pd-cvs@lists.iem.at

18 participants
618 discussions

pd/src desire.tk,1.1.2.600.2.304,1.1.2.600.2.305
by chunlee 07 Aug '07

07 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2798 Modified Files: Tag: desiredata desire.tk Log Message: small fix on Selection set and unset Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.304 retrieving revision 1.1.2.600.2.305 diff -C2 -d -r1.1.2.600.2.304 -r1.1.2.600.2.305 *** desire.tk 7 Aug 2007 07:27:27 -0000 1.1.2.600.2.304 --- desire.tk 7 Aug 2007 07:45:52 -0000 1.1.2.600.2.305 *************** *** 322,327 **** class_new Selection {Hash} ! def Selection set {k v} {super; $k selected?= 1} ! def Selection unset {k} {super; $k selected?= 0} #-----------------------------------------------------------------------------------# --- 322,327 ---- class_new Selection {Hash} ! def Selection set {k v} {super $k $v; $v selected?= 1} ! def Selection unset {k} {super $k; [$self get $k] selected?= 0} #-----------------------------------------------------------------------------------#

1 0

pd/src desire.c,1.1.2.217.2.191,1.1.2.217.2.192
by Mathieu Bouchard 07 Aug '07

07 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31253 Modified Files: Tag: desiredata desire.c Log Message: fix typo about indices in objects_reinit,wires_reinit Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.191 retrieving revision 1.1.2.217.2.192 diff -C2 -d -r1.1.2.217.2.191 -r1.1.2.217.2.192 *** desire.c 7 Aug 2007 07:05:42 -0000 1.1.2.217.2.191 --- desire.c 7 Aug 2007 07:34:56 -0000 1.1.2.217.2.192 *************** *** 6014,6021 **** t_canvas *can = (t_canvas *)self; char *bar=foo; *foo=0; ! canvas_each(y,can) bar+=sprintf(bar,"x%lx x%lx ",y->dix->index,(long)y); sys_mgui(self,"objects_reinit","S",foo); bar=foo; *foo=0; ! canvas_wires_each(oc,t,can) bar+=sprintf(bar,"x%lx x%lx ",oc->dix->index,(long)oc); sys_mgui(self,"wires_reinit","S",foo); sys_mgui(self,"name=","s",can->name); --- 6014,6021 ---- t_canvas *can = (t_canvas *)self; char *bar=foo; *foo=0; ! canvas_each(y,can) bar+=sprintf(bar,"%lx x%lx ",y->dix->index,(long)y); sys_mgui(self,"objects_reinit","S",foo); bar=foo; *foo=0; ! canvas_wires_each(oc,t,can) bar+=sprintf(bar,"%lx x%lx ",oc->dix->index,(long)oc); sys_mgui(self,"wires_reinit","S",foo); sys_mgui(self,"name=","s",can->name);

1 0

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

07 Aug '07

lipo: can't figure out the architecture type of: /var/tmp//cciM83sK.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-test05.app/Contents/Resources prefix= libpddir=/Users/pd/auto-build/pd-main/packages/darwin_app/build/Pd-0.41.0-test05.app/Contents/Resources OPT_CFLAGS="-march=pentium4 -msse2 -mfpmath=sse -ftree-vectorize -ftree-vectorizer-verbose=2" UNAME=Darwin install cd ../obj; cc -Wl -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI -arch i386 -arch ppc -weak_framework Jack -o ../bin/pd g_canvas.o g_graph.o g_text.o g_rtext.o g_array.o g_template.o g_io.o g_scalar.o g_traversal.o g_guiconnect.o g_readwrite.o g_editor.o g_all_guis.o g_bang.o g_hdial.o g_hslider.o g_mycanvas.o g_numbox.o g_toggle.o g_vdial.o g_vslider.o g_vumeter.o m_pd.o m_class.o m_obj.o m_atom.o m_memory.o m_binbuf.o m_conf.o m_glob.o m_sched.o s_main.o s_inter.o s_file.o s_print.o s_loader.o s_path.o s_entry.o s_audio.o s_midi.o d_ugen.o d_ctl.o d_arithmetic.o d_osc.o d_filter.o d_dac.o d_misc.o d_math.o d_fft.o d_array.o d_global.o d_delay.o d_resample.o x_arithmetic.o x_connective.o x_interface.o x_midi.o x_misc.o x_time.o x_acoustics.o x_net.o x_qlist.o x_gui.o x_list.o d_soundfile.o s_midi_pm.o s_audio_pa.o s_audio_pablio.o s_audio_paring.o ../portaudio/pa_common/pa_allocation.o ../portaudio/pa_common/pa_converters.o ../portaudio/pa_common/pa_cpuload.o ../portaudio/pa_common/pa_dither.o ../portaudio/pa_common/pa_front.o ../portaudio/pa_common/pa_process.o ../portaudio/pa_common/pa_skeleton.o ../portaudio/pa_common/pa_stream.o ../portaudio/pa_common/pa_trace.o ../portaudio/pa_unix/pa_unix_util.o ../portaudio/pa_mac_core/pa_mac_core.o ../portaudio/pa_mac/pa_mac_hostapis.o ../portmidi/pm_mac/pmmac.o ../portmidi/pm_mac/pmmacosxcm.o ../portmidi/pm_common/pmutil.o ../portmidi/pm_common/portmidi.o ../portmidi/porttime/ptmacosx_cf.o s_audio_jack.o d_fft_mayer.o d_fftroutine.o -ldl -lm -lpthread 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/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -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//ccwzgVNH.out make[2]: *** [../bin/libPdTcl.dylib] Error 1 make[1]: *** [pd_install] Error 2 make: *** [darwin_app_core] Error 2

1 0

pd/src s_main.c,1.7.4.17.2.22.2.33,1.7.4.17.2.22.2.34
by Mathieu Bouchard 07 Aug '07

07 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29452 Modified Files: Tag: desiredata s_main.c Log Message: change version number Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.17.2.22.2.33 retrieving revision 1.7.4.17.2.22.2.34 diff -C2 -d -r1.7.4.17.2.22.2.33 -r1.7.4.17.2.22.2.34 *** s_main.c 4 Aug 2007 03:50:49 -0000 1.7.4.17.2.22.2.33 --- s_main.c 7 Aug 2007 07:29:39 -0000 1.7.4.17.2.22.2.34 *************** *** 48,52 **** #endif /* THREDED_SF */ ! char pd_version[] = "DesireData 2007.07.31"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; --- 48,52 ---- #endif /* THREDED_SF */ ! char pd_version[] = "DesireData 2007.08.05"; char pd_compiletime[] = __TIME__; char pd_compiledate[] = __DATE__; *************** *** 117,121 **** /* this is called from main() in s_entry.c */ extern "C" int sys_main(int argc, char **argv) { ! int noprefs = 0, i; class_table = new t_hash<t_symbol*,t_class*>(127); /* jsarlo { */ --- 117,121 ---- /* this is called from main() in s_entry.c */ extern "C" int sys_main(int argc, char **argv) { ! int noprefs = 0; class_table = new t_hash<t_symbol*,t_class*>(127); /* jsarlo { */ *************** *** 126,133 **** fprintf(stderr, "Pd: COMPILED FOR DEBUGGING\n"); #endif ! pd_init(); /* start the message system */ ! sys_findprogdir(argv[0]); /* set sys_progname, guipath */ /* tb: command line flag to defeat preset loading */ ! for (i = 0; i != argc; ++i) if (!strcmp(argv[i],"-noprefs") || !strcmp(argv[i],"-rcfile")) noprefs = 1; if (!noprefs) sys_rcfile(); /* parse the startup file */ /* initalize idle callbacks before starting the gui */ --- 126,133 ---- fprintf(stderr, "Pd: COMPILED FOR DEBUGGING\n"); #endif ! pd_init(); /* start the message system */ ! sys_findprogdir(argv[0]); /* set sys_progname, guipath */ /* tb: command line flag to defeat preset loading */ ! for (int i=0; i<argc; i++) if (!strcmp(argv[i],"-noprefs") || !strcmp(argv[i],"-rcfile")) noprefs = 1; if (!noprefs) sys_rcfile(); /* parse the startup file */ /* initalize idle callbacks before starting the gui */

1 0

pd/src desire.tk,1.1.2.600.2.303,1.1.2.600.2.304
by Mathieu Bouchard 07 Aug '07

07 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28737 Modified Files: Tag: desiredata desire.tk Log Message: added the selection_wire methods back Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.303 retrieving revision 1.1.2.600.2.304 diff -C2 -d -r1.1.2.600.2.303 -r1.1.2.600.2.304 *** desire.tk 7 Aug 2007 07:15:01 -0000 1.1.2.600.2.303 --- desire.tk 7 Aug 2007 07:27:27 -0000 1.1.2.600.2.304 *************** *** 2144,2147 **** --- 2144,2151 ---- def Canvas selection+= {objs} {foreach obj $objs {$@objectsel set [$obj index] $obj}} def Canvas selection-= {objs} {foreach obj $objs {$@objectsel unset [$obj index]}} + def Canvas selection_wire {} {$@wiresel values} + def Canvas selection_wire= {objs} {$@wiresel clear; $self selection_wire+= $objs} + def Canvas selection_wire+= {objs} {foreach obj $objs {$@wiresel set [$obj index] $obj}} + def Canvas selection_wire-= {objs} {foreach obj $objs {$@wiresel unset [$obj index]}} def Canvas Object {} {$self new_object obj}

1 0

pd/src desire.tk,1.1.2.600.2.302,1.1.2.600.2.303
by chunlee 07 Aug '07

07 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23986 Modified Files: Tag: desiredata desire.tk Log Message: small fix to the Mackerel Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.302 retrieving revision 1.1.2.600.2.303 diff -C2 -d -r1.1.2.600.2.302 -r1.1.2.600.2.303 *** desire.tk 7 Aug 2007 07:12:15 -0000 1.1.2.600.2.302 --- desire.tk 7 Aug 2007 07:15:01 -0000 1.1.2.600.2.303 *************** *** 2281,2287 **** set @rect [Macro_Rect new] } ! def Macro state= {val} {set @state $val; if {$val} {set @list {}; puts "start recording macro..."} {puts "end..."}} def Macro state {} {return $@state} ! def Macro dump {} {set i 0; foreach step $@list {puts "step $i -> $step"; incr i}} def Macro idx= {val} {set @idx $val} def Macro idx {} {return $@idx} --- 2281,2287 ---- set @rect [Macro_Rect new] } ! def Macro state= {val} {set @state $val; if {$val} {set @list {}; post %s "start recording macro..."} {post %s "end..."}} def Macro state {} {return $@state} ! def Macro dump {} {set i 0; foreach step $@list {post %s "step $i -> $step"; incr i}} def Macro idx= {val} {set @idx $val} def Macro idx {} {return $@idx} *************** *** 2339,2342 **** --- 2339,2343 ---- mset {event widget X Y x y mode k kval} $step switch $event { + #KeyRelease {set name [modekey $k $mode]} KeyPress {set name [modekey $k $mode]} ButtonPress {set name $event-$k} *************** *** 2346,2350 **** } if {$@idx < [llength $@list]} { ! after $delay [list $self run $event $name [expr $X+$@offset_x] [expr $Y+$@offset_y] \ [expr $x+$@offset_x] [expr $y+$@offset_y]] } --- 2347,2351 ---- } if {$@idx < [llength $@list]} { ! after $delay [list $self run $event $name $k [expr $X+$@offset_x] [expr $Y+$@offset_y] \ [expr $x+$@offset_x] [expr $y+$@offset_y]] } *************** *** 2372,2379 **** } ! def Macro run {event name X Y x y} { set w [focus] incr @idx event generate $w <$name> -x $x -y $y puts "playing <$name> -x $x -y $y" $self play $@delay --- 2373,2381 ---- } ! def Macro run {event name k X Y x y} { set w [focus] incr @idx event generate $w <$name> -x $x -y $y + if {$event=="KeyPress"} {event generate $w <KeyRelease-$k> -x $x -y $y} puts "playing <$name> -x $x -y $y" $self play $@delay *************** *** 8304,8308 **** def KeyboardDialog notice {origin add event} { ! mset {type W X Y mod K k} $event if {![info exists ::keyboard_row_of($k)]} {puts "unknown key $k"; return} set i $::keyboard_row_of($k) --- 8306,8310 ---- def KeyboardDialog notice {origin add event} { ! mset {type W X Y x y mod K k} $event if {![info exists ::keyboard_row_of($k)]} {puts "unknown key $k"; return} set i $::keyboard_row_of($k)

1 0

pd/src desire.tk,1.1.2.600.2.301,1.1.2.600.2.302
by Mathieu Bouchard 07 Aug '07

07 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22903 Modified Files: Tag: desiredata desire.tk Log Message: readded selection=,selection+=,selection-= Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.301 retrieving revision 1.1.2.600.2.302 diff -C2 -d -r1.1.2.600.2.301 -r1.1.2.600.2.302 *** desire.tk 7 Aug 2007 05:58:13 -0000 1.1.2.600.2.301 --- desire.tk 7 Aug 2007 07:12:15 -0000 1.1.2.600.2.302 *************** *** 313,320 **** def Hash delete {} {$self clear; super} ! # set h [Hash new foo bar 1 2 3 4] ! # $h set hello world ! # puts keys=[$h keys] ! # puts list=[$h list] class_new Selection {Hash} --- 313,323 ---- def Hash delete {} {$self clear; super} ! if 0 { ! set h [Hash new foo bar 1 2 3 4] ! $h set hello world ! puts keys=[$h keys] ! puts values=[$h values] ! puts list=[$h list] ! } class_new Selection {Hash} *************** *** 1346,1350 **** def View erase {} {$self item_delete} def View selected? {} {return $@selected?} ! def View selected?= {x} {set @selected? $x; $self changed} ;# only call this from selection= and such def View edit? {} {if {[info exists @edit]} {return $@edit} else {return 0}} def View select {state} { --- 1349,1353 ---- def View erase {} {$self item_delete} def View selected? {} {return $@selected?} ! def View selected?= {x} {set @selected? $x; $self changed} ;# this is for use by the Selection class only def View edit? {} {if {[info exists @edit]} {return $@edit} else {return 0}} def View select {state} { *************** *** 2137,2140 **** --- 2140,2148 ---- } + def Canvas selection {} {$@objectsel values} + def Canvas selection= {objs} {$@objectsel clear; $self selection+= $objs} + def Canvas selection+= {objs} {foreach obj $objs {$@objectsel set [$obj index] $obj}} + def Canvas selection-= {objs} {foreach obj $objs {$@objectsel unset [$obj index]}} + def Canvas Object {} {$self new_object obj} def Canvas Message {} {$self new_object msg} *************** *** 2714,2718 **** def Canvas objects_reinit {children} { ! $@objects reinit $children $self changed children } --- 2722,2726 ---- def Canvas objects_reinit {children} { ! eval [concat [list $@objects reinit] $children] $self changed children } *************** *** 2767,2771 **** # should be only called from the server def Canvas wires_reinit {wires} { ! $@wires reinit $wires $self changed wires } --- 2775,2779 ---- # should be only called from the server def Canvas wires_reinit {wires} { ! eval [concat [list $@wires reinit] $wires] $self changed wires }

1 0

pd/src desire.c,1.1.2.217.2.190,1.1.2.217.2.191
by Mathieu Bouchard 07 Aug '07

07 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20383 Modified Files: Tag: desiredata desire.c Log Message: switch to objects_reinit,wires_reinit instead of children=,wires=. Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.190 retrieving revision 1.1.2.217.2.191 diff -C2 -d -r1.1.2.217.2.190 -r1.1.2.217.2.191 *** desire.c 4 Aug 2007 22:30:16 -0000 1.1.2.217.2.190 --- desire.c 7 Aug 2007 07:05:42 -0000 1.1.2.217.2.191 *************** *** 6011,6022 **** if (c==canvas_class) { // buffer overflow bug here ! char foo[4096]; t_canvas *can = (t_canvas *)self; char *bar=foo; *foo=0; ! canvas_each(y,can) bar+=sprintf(bar,"x%lx ",(long)y); ! sys_mgui(self,"children=","S",foo); bar=foo; *foo=0; ! canvas_wires_each(oc,t,can) bar+=sprintf(bar,"x%lx ", (long)oc); ! sys_mgui(self,"wires=","S",foo); sys_mgui(self,"name=","s",can->name); sys_mgui(self,"folder=","s",canvas_getenv(can)->dir); --- 6011,6022 ---- if (c==canvas_class) { // buffer overflow bug here ! char foo[8192]; t_canvas *can = (t_canvas *)self; char *bar=foo; *foo=0; ! canvas_each(y,can) bar+=sprintf(bar,"x%lx x%lx ",y->dix->index,(long)y); ! sys_mgui(self,"objects_reinit","S",foo); bar=foo; *foo=0; ! canvas_wires_each(oc,t,can) bar+=sprintf(bar,"x%lx x%lx ",oc->dix->index,(long)oc); ! sys_mgui(self,"wires_reinit","S",foo); sys_mgui(self,"name=","s",can->name); sys_mgui(self,"folder=","s",canvas_getenv(can)->dir);

1 0

pd/src desire.tk,1.1.2.600.2.300,1.1.2.600.2.301
by Mathieu Bouchard 07 Aug '07

07 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28236 Modified Files: Tag: desiredata desire.tk Log Message: breaking everything: lists @children,@selection,@wires,@selection_wire become Hashes, respectively @objects,@objectsel,@wires,@wiresel Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.300 retrieving revision 1.1.2.600.2.301 diff -C2 -d -r1.1.2.600.2.300 -r1.1.2.600.2.301 *** desire.tk 7 Aug 2007 05:51:22 -0000 1.1.2.600.2.300 --- desire.tk 7 Aug 2007 05:58:13 -0000 1.1.2.600.2.301 *************** *** 292,296 **** class_new Hash {Thing} ! def Hash init {args} {foreach {k v} $args {$self set $k $v}} def Hash set {k v} {set ::hash($self:$k) $v} def Hash get {k} {set ::hash($self:$k)} --- 292,297 ---- class_new Hash {Thing} ! def Hash init {args} { super; foreach {k v} $args {$self set $k $v}} ! def Hash reinit {args} {$self clear; foreach {k v} $args {$self set $k $v}} [...1239 lines suppressed...] $stream << "[philtre $r];\n" ! foreach child $@children {eval [concat [list $child deconstruct_to $stream]]} ! foreach wire $@wires {eval [concat [list $wire deconstruct_to $stream]]} $stream << [philtre [eval [concat [list $self deconstruct] $args]]] $stream << ";\n" --- 8379,8384 ---- if {$@subpatch || $@abs} {lappend r $@name $@mapped} else {lappend r $@fontsize} $stream << "[philtre $r];\n" ! foreach i [lsort [$@objects keys]] {eval [concat [list [$@objects get $i] deconstruct_to $stream]]} ! foreach i [lsort [ $@wires keys]] {eval [concat [list [ $@wires get $i] deconstruct_to $stream]]} $stream << [philtre [eval [concat [list $self deconstruct] $args]]] $stream << ";\n" *************** *** 8571,8574 **** --- 8472,8476 ---- catch {package require Tcldot} def Canvas graphviz_sort {} { + error "this code has to be rewritten to use the new containers" set nodes {} set gwidth 0; set gh 0

1 0

pd/src desire.tk,1.1.2.600.2.299,1.1.2.600.2.300
by chunlee 07 Aug '07

07 Aug '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26078 Modified Files: Tag: desiredata desire.tk Log Message: Keyboard Macro part VI Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.299 retrieving revision 1.1.2.600.2.300 diff -C2 -d -r1.1.2.600.2.299 -r1.1.2.600.2.300 *** desire.tk 7 Aug 2007 02:55:06 -0000 1.1.2.600.2.299 --- desire.tk 7 Aug 2007 05:51:22 -0000 1.1.2.600.2.300 *************** *** 2241,2244 **** --- 2241,2265 ---- def Canvas popup_properties {} {CanvasPropertiesDialog new $self} #-----------------------------------------------------------------------------------# + class_new Macro_Rect {View} + + def Macro_Rect init {} {super; $self data= 0 0 0 0 blue} + + def Macro_Rect data= {x1 y1 x2 y2 col} { + set @x1 $x1; set @y1 $y1 + set @x2 $x2; set @y2 $y2 + set @col $col + } + + def Macro_Rect flash {x1 y1 x2 y2 col} { + $self data= $x1 $y1 $x2 $y2 $col + $self draw + after 500 $self erase + } + + def Macro_Rect draw {} { + set @canvas [string range [focus] 1 [string first . [focus] 1]-1] + $self item MACRO rect [list $@x1 $@y1 $@x2 $@y2] -outline $@col + } + class_new Macro {EventHistory} def Macro init {} { *************** *** 2248,2251 **** --- 2269,2275 ---- set @list {} set @delay 200 + set @offset_x 0 + set @offset_y 0 + set @rect [Macro_Rect new] } def Macro state= {val} {set @state $val; if {$val} {set @list {}; puts "start recording macro..."} {puts "end..."}} *************** *** 2278,2283 **** --- 2302,2329 ---- } + def Macro test_playable {x y} { + mset {macro_width macro_height} [$self calc_size] + set c [string range [focus] 0 [string first . [focus] 1]+1] + set cwidth [winfo width $c]; set cheight [winfo height $c] + set cx1 [$c canvasx 0]; set cy1 [$c canvasy 0] + set cx2 [$c canvasx $cwidth]; set cy2 [$c canvasy $cheight] + set new_x [expr $x+$macro_width]; set new_y [expr $y+$macro_height] + $@rect flash $x $y $new_x $new_y blue + if {$new_x > $cx2 || $new_x < $cx1 || $new_y > $cy2 || $new_y < $cy1} { + puts "Can't playback Macro:: outside of canvas area" + return + } else {$self idx= 0; $self offset $x $y; $self play [$self delay]} + + } + + def Macro offset {new_x new_y} { + mset {event widget X Y x y mode k kval} [lindex $@list 0] + set @offset_x [expr $new_x-$x] + set @offset_y [expr $new_y-$y] + } + def Macro play {delay} { if {$@idx == [llength $@list]} {return} + $self test_canvas_size set i 0 set focus [string range [focus] 1 [string first . [focus] 2]-1] *************** *** 2292,2297 **** } if {$@idx < [llength $@list]} { ! after $delay [list $self run $event $name $X $Y $x $y] } } --- 2338,2365 ---- } if {$@idx < [llength $@list]} { ! after $delay [list $self run $event $name [expr $X+$@offset_x] [expr $Y+$@offset_y] \ ! [expr $x+$@offset_x] [expr $y+$@offset_y]] ! } ! } ! ! def Macro calc_size {} { ! set x1 66666; set x2 0 ! set y1 66666; set y2 0 ! foreach step $@list { ! mset {event widget X Y x y mode k kval} $step ! set x1 [min $X $x1]; set x2 [max $x2 $X] ! set y1 [min $Y $y1]; set y2 [max $y2 $Y] ! } + return [list [expr $x2-$x1] [expr $y2-$y1]] + } + + def Macro test_canvas_size {} { + set c [string range [focus] 0 [string first . [focus] 1]+1] + set cwidth [winfo width $c]; set cheight [winfo height $c] + set cx1 [$c canvasx 0]; set cy1 [$c canvasy 0] + set cx2 [$c canvasx $cwidth]; set cy2 [$c canvasy $cheight] + mset {x1 y1 x2 y2} [$self calc_size] + puts "[winfo pointerxy $c]" } *************** *** 2309,2313 **** def Canvas macro_toggle {} {if {![$::macro state]} {set ::macro_state 1} {$::macro state= 0; $::macro dump}} ! def Canvas macro_play {} {$::macro idx= 0; $::macro play [$::macro delay]} def Canvas keyevent {} { focus [$self widget] --- 2377,2382 ---- def Canvas macro_toggle {} {if {![$::macro state]} {set ::macro_state 1} {$::macro state= 0; $::macro dump}} ! #def Canvas macro_play {} {puts ">> $@click_at <<"; $::macro idx= 0; $::macro play [$::macro delay]} ! def Canvas macro_play {} {mset {x y} $@click_at; $::macro test_playable $x $y} def Canvas keyevent {} { focus [$self widget]

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
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