Pd-cvs July 2006

pd-cvs@lists.iem.at

14 participants
147 discussions

pd/src desire.tk,1.1.2.271,1.1.2.272
by Mathieu Bouchard 03 Jul '06

03 Jul '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4403 Modified Files: Tag: devel_0_39 desire.tk Log Message: redid all of populate_menu Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.271 retrieving revision 1.1.2.272 diff -C2 -d -r1.1.2.271 -r1.1.2.272 *** desire.tk 2 Jul 2006 17:07:28 -0000 1.1.2.271 --- desire.tk 3 Jul 2006 15:43:35 -0000 1.1.2.272 *************** *** 440,443 **** --- 440,451 ---- set accels {} + + foreach k [array names key] { + set v $key($k) + dict set accels $v $k + } + + puts $accels + ################## set up main window ######################### *************** *** 450,454 **** def Client init_binds {} { global OS - #set @accels {} bind . <Control-Key> {$main ctrlkey %K 0} bind . <Control-Shift-Key> {$main ctrlkey %K 1} --- 458,461 ---- *************** *** 523,527 **** ############### set up global variables ################################ - set saveas_client doggy set pd_opendir [pwd] set pd_undoaction no --- 530,533 ---- *************** *** 589,594 **** while {1} { set line [gets $gdb] if {[eof $gdb]} {tk_messageBox -message "eurggggh." -type ok; exit 69} - if {[fblocked $gdb]} {break} post "\[gdb\] %s" $line } --- 595,600 ---- while {1} { set line [gets $gdb] + if {$line=="" || [fblocked $gdb]} {break} ;# which way should i check for no input? if {[eof $gdb]} {tk_messageBox -message "eurggggh." -type ok; exit 69} post "\[gdb\] %s" $line } *************** *** 611,615 **** after 0 poll_gdb } { ! exec gdb --tui --args $cmdline(server) -guiport $server_port & } } { --- 617,622 ---- after 0 poll_gdb } { ! exec gdb --args $cmdline(server) -guiport $server_port & ! #exec gdb --tui --args $cmdline(server) -guiport $server_port & } } { *************** *** 727,761 **** def Menuable populate_menu {menu list} { if {[string index $menu 0]!="."} {set menu .$self.m.$menu} ! foreach e $list {$self populate_menu_1 $menu $e} ! } ! def Menuable populate_menu_1 {menu e} { ! global key accels ! if {[llength $e]==0} {$menu add separator; return} ! mset {text cmd accel} $e ! ! if {$accel != ""} { ! set key($text) $accel ! } else {set accel [accel_munge $key($text)]} ! ! if {![llength $cmd]} { ! set cmd "%W $text" ! set text [say $text] ! } ! #set accel [accel_munge $accel] ! if {$accel != ""} { ! if {![dict exists $accels $accel]} { ! dict set accels $accel $cmd} else { ! #puts "***** warning:: $accel already assigned *****" ! #dict set accels $accel $cmd ! } ! } ! regsub -all %W $cmd $self cmd ! if {[llength $e]==3} { ! $menu add command -label $text -command $cmd \ ! -accelerator $accel ! } { # 4 ! $menu add checkbutton -label $text -command $cmd \ ! -accelerator $accel -indicatoron 1 } } --- 734,743 ---- def Menuable populate_menu {menu list} { + global key if {[string index $menu 0]!="."} {set menu .$self.m.$menu} ! foreach name $list { ! if {$name == ""} {$menu add separator; return} ! $menu add command -label [say $name] -command "$self $name" \ ! -accelerator [accel_munge $key($name)] } } *************** *** 767,802 **** def Client init_menus {} { $self populate_menu .mbar.file { ! {new_file {} ""} ! {open_file {} ""} ! {} ! {pdrc_editor {} ""} ! {ddrc_editor {} ""} ! {send_message {} ""} ! {paths {} ""} ! {} ! {quit {} ""}} ! $self populate_menu .mbar.find { ! {find {} ""} ! {find_again {} ""} ! {find_last_error {} {}}} ! ! ! # switch -- $key { # slash {$self audio 1} # period {$self audio 0} - # } - # switch -- $key { # Q {$main really_quit} # s {$self save} S {$self save_as} # z {$self undo} Z {$self redo} - # } - - # for audio switch on/off - #switch -- $key { - # slash {menu_audio 1} - # period {menu_audio 0} - # e {$self editmodeswitch} - #} } --- 749,762 ---- def Client init_menus {} { $self populate_menu .mbar.file { ! new_file open_file {} ! pdrc_editor ddrc_editor send_message paths {} ! quit} $self populate_menu .mbar.find { ! find find_again find_last_error} # slash {$self audio 1} # period {$self audio 0} # Q {$main really_quit} # s {$self save} S {$self save_as} # z {$self undo} Z {$self redo} } *************** *** 816,820 **** if {[dict exists $accels $key]} { puts "key ==== $key | cmd === [dict get $accels $key]" ! $self eval% [dict get $accels $key] return } {puts "ctrlkey: unknown $key"} --- 776,780 ---- if {[dict exists $accels $key]} { puts "key ==== $key | cmd === [dict get $accels $key]" ! $self eval% "%W [dict get $accels $key]" return } {puts "ctrlkey: unknown $key"} *************** *** 827,831 **** set key "Alt+$key" if {[dict exists $accels $key]} { ! $self eval% [dict get $accels $key] return } {puts "altkey: unknown $key"} --- 787,791 ---- set key "Alt+$key" if {[dict exists $accels $key]} { ! $self eval% "%W [dict get $accels $key]" return } {puts "altkey: unknown $key"} *************** *** 931,935 **** set @noutlets 0 set @duplicate 0 - #set @accels {} super } --- 891,894 ---- *************** *** 1058,1076 **** set m .mbar.media $main populate_menu $m { ! {audio_on {} ""} ! {audio_off {} ""} ! {}} switch $OS { osx {} default { $main populate_menu $m { ! {audio_settings {} {}} ! { midi_settings {} {}}} } } $main populate_menu $m {{} ! {test_audio_and_midi {} ""} ! {load_meter {} ""} ! {latency_meter {} ""} {}} foreach a $pd_apilist { $m add radiobutton -label [lindex $a 0] -variable pd_whichapi -value [lindex $a 1] \ --- 1017,1030 ---- set m .mbar.media $main populate_menu $m { ! audio_on audio_off {}} switch $OS { osx {} default { $main populate_menu $m { ! audio_settings midi_settings} } } $main populate_menu $m {{} ! test_audio_and_midi load_meter latency_meter} foreach a $pd_apilist { $m add radiobutton -label [lindex $a 0] -variable pd_whichapi -value [lindex $a 1] \ *************** *** 1083,1090 **** } $main populate_menu .mbar.help { ! {about {} ""} ! {class_browser {} ""} ! {client_class_tree {} ""} ! } } --- 1037,1041 ---- } $main populate_menu .mbar.help { ! about class_browser client_class_tree} } *************** *** 1162,1173 **** def* Canvas init {args} { super ! global pd_opendir pd_tearoff OS cmdline look canvas ! set 5 $self set name .$self set c .$self.c toplevel $name -menu $name.m - #wm geometry $name $geometry - #puts "geometry -----> +$@x+$@y" - #wm geometry $name +$@x+$@y # turn buttonbar on/off if {$look(buttonbar)} {pack [[ButtonBar new $self] widget] -side top -fill x -expand no} --- 1113,1120 ---- def* Canvas init {args} { super ! global pd_opendir pd_tearoff OS cmdline look canvas history manager set name .$self set c .$self.c toplevel $name -menu $name.m # turn buttonbar on/off if {$look(buttonbar)} {pack [[ButtonBar new $self] widget] -side top -fill x -expand no} *************** *** 1176,1180 **** if {$look(statusbar)} {pack [$@statusbar widget] -side bottom -fill x} pack [scrollbar $name.xscroll -command "$c xview" -orient horizontal] -side bottom -fill x ! pack [scrollbar $name.yscroll -command "$c yview"] -side right -fill y pack [canvas $c -width $@w -height $@h -background white \ -yscrollcommand "$name.yscroll set" \ --- 1123,1127 ---- if {$look(statusbar)} {pack [$@statusbar widget] -side bottom -fill x} pack [scrollbar $name.xscroll -command "$c xview" -orient horizontal] -side bottom -fill x ! pack [scrollbar $name.yscroll -command "$c yview" ] -side right -fill y pack [canvas $c -width $@w -height $@h -background white \ -yscrollcommand "$name.yscroll set" \ *************** *** 1182,1186 **** -scrollregion [list 0 0 $@w $@h]] -side left -expand 1 -fill both wm minsize $name 1 1 - #wm geometry $name $geometry wm geometry $name +$@x+$@y #wtf????? --- 1129,1132 ---- *************** *** 1205,1217 **** set @dehighlight {} set @wires {} ! # stores wires in the format of {0 1 1 0} id {1 1 2 0} id ! set @wires_pair {} set @duplicating 0 #set @wire_hilite {} - global history set @history $history set @file "" set @directory "" - global manager post %s "canvas init: subscribing to $manager" $self subscribe $manager --- 1151,1160 ---- set @dehighlight {} set @wires {} ! set @wires_pair {} ;# stores wires in the format of {0 1 1 0} id {1 1 2 0} id set @duplicating 0 #set @wire_hilite {} set @history $history set @file "" set @directory "" post %s "canvas init: subscribing to $manager" $self subscribe $manager *************** *** 1300,1303 **** --- 1243,1270 ---- } + def Canvas new_object {sel} { + $self editmode= 1 + mset {x y} $@curpos + pd .$self $sel $x $y + } + + def Canvas Object {} {$self new_object obj} + def Canvas Message {} {$self new_object msg; global canvas; set canvas(msg_isnew) 1} ;# ??? + def Canvas Number {} {$self new_object floatatom} + def Canvas Symbol {} {$self new_object symbolatom} + def Canvas Comment {} {$self new_object text} + def Canvas Bang {} {$self new_object bng} + def Canvas Toggle {} {$self new_object toggle} + def Canvas Number2 {} {$self new_object numbox} + def Canvas Vslider {} {$self new_object vslider} + def Canvas Hslider {} {$self new_object hslider} + def Canvas Vradio {} {$self new_object vradio} + def Canvas Hradio {} {$self new_object hradio} + def Canvas VU {} {$self new_object vumeter} + def Canvas dropper {} {$self new_object dropper} + def Canvas Canvas {} {$self new_object mycnv} + def Canvas Graph {} {$self editmode= 1; pd .x$self graph } + def Canvas Array {} {$self editmode= 1; pd .x$self menuarray} + def Canvas new_menubar {editable} { set name .$self *************** *** 1307,1365 **** foreach x {file edit view put window help} {menu $m.$x -tearoff $pd_tearoff} $self populate_menu file { ! {new_file {} ""} ! {open_file {} ""} ! {} ! {send_message {} ""} ! {paths {} ""} ! {} ! {close {} ""} ! {save {} ""} ! {save_as {} ""} ! {print {} ""} ! {} ! {quit {} ""}} $self populate_menu edit { ! {undo {} ""} ! {redo {} ""} ! {} ! {cut {} ""} ! {copy {} ""} ! {paste {} ""} ! {duplicate {} ""} ! {select_all {} ""} ! {} ! {text_editor {} ""} ! {font_bomb {} {}} ! {tidy_up {} {}} ! {}} $self populate_menu view { ! {reload {} {}} ! {redraw {} {}}} # {crosshair {global crosshair; set crosshair [expr !!$crosshair]} "" toggle} $self populate_menu put { ! {Object {[%W canvas] editmode= 1;pd .%W obj %X %Y} ""} ! {Message {[%W canvas] editmode= 1;pd .%W msg %X %Y;global canvas;set canvas(msg_isnew) 1} ""} ! {Number {[%W canvas] editmode= 1;pd .%W floatatom %X %Y} ""} ! {Symbol {[%W canvas] editmode= 1;pd .%W symbolatom %X %Y} ""} ! {Comment {[%W canvas] editmode= 1;pd .%W text %X %Y} ""} ! {} ! {Bang {[%W canvas] editmode= 1;pd .%W bng %X %Y} ""} ! {Toggle {[%W canvas] editmode= 1;pd .%W toggle %X %Y} ""} ! {Number2 {[%W canvas] editmode= 1;pd .%W numbox %X %Y} ""} ! {Vslider {[%W canvas] editmode= 1;pd .%W vslider %X %Y} ""} ! {Hslider {[%W canvas] editmode= 1;pd .%W hslider %X %Y} ""} ! {Vradio {[%W canvas] editmode= 1;pd .%W vradio %X %Y} ""} ! {Hradio {[%W canvas] editmode= 1;pd .%W hradio %X %Y} ""} ! {VU {[%W canvas] editmode= 1;pd .%W vumeter %X %Y} ""} ! {dropper {[%W canvas] editmode= 1;pd .%W dropper %X %Y} ""} ! {Canvas {[%W canvas] editmode= 1;pd .%W mycnv %X %Y} ""} ! {} ! {Graph {[%W canvas] editmode= 1;pd .%W graph } {}} ! {Array {[%W canvas] editmode= 1;pd .%W menuarray} {}}} ! $self populate_menu window { ! {"parentwindow" {menu_windowparent} {}} ! {"Pdwindow" {menu_pop_pd} {}} ! {} ! } $m.edit add checkbutton -label [say edit_mode] \ --- 1274,1295 ---- foreach x {file edit view put window help} {menu $m.$x -tearoff $pd_tearoff} $self populate_menu file { ! new_file open_file {} ! send_message paths {} ! close save save_as print {} ! quit} $self populate_menu edit { ! undo redo {} ! cut copy paste duplicate select_all {} ! text_editor font_bomb tidy_up {}} $self populate_menu view { ! reload redraw} # {crosshair {global crosshair; set crosshair [expr !!$crosshair]} "" toggle} $self populate_menu put { ! Object Message Number Symbol Comment {} ! Bang Toggle Number2 Vslider Hslider Vradio Hradio VU dropper Canvas {} ! Graph Array} ! $self populate_menu window {{}} ! # {"parentwindow" {menu_windowparent} ""} ! # {"Pdwindow" {menu_pop_pd} ""} $m.edit add checkbutton -label [say edit_mode] \ *************** *** 1369,1373 **** #binds the state of the checkbox to global variable editmod if {![dict exists $accels "Ctrl+e"]} { ! dict append accels $key(editmodeswitch) {[%W canvas] editmodeswitch} } $m.edit configure -postcommand "$self fix_edit_menu" --- 1299,1303 ---- #binds the state of the checkbox to global variable editmod if {![dict exists $accels "Ctrl+e"]} { ! dict append accels $key(editmodeswitch) {[%W canvas] editmodeswitch} } $m.edit configure -postcommand "$self fix_edit_menu" *************** *** 2190,2200 **** if {$id == ""} { $self populate_menu $p { ! {popup_properties {} ""} ! {popup_help {} ""}} } { $id populate_menu $p { ! {popup_properties {} ""} ! {popup_open {} ""} ! {popup_help {} ""}} } tk_popup $p $x $y --- 2120,2130 ---- if {$id == ""} { $self populate_menu $p { ! popup_properties ! popup_help} } { $id populate_menu $p { ! popup_properties ! popup_open ! popup_help} } tk_popup $p $x $y *************** *** 5448,5452 **** DesireData client: Mathieu Bouchard & Chun Lee PureData: Miller Puckette feat. Thomas Musil, ! Günther Geiger, Iohannes Zmölnig & others. Translations: --- 5378,5382 ---- DesireData client: Mathieu Bouchard & Chun Lee PureData: Miller Puckette feat. Thomas Musil, ! Günther Geiger, Krzysztof Czaja, Iohannes Zmölnig & others. Translations:

1 0

pd/src desire.c,1.1.2.89,1.1.2.90
by Mathieu Bouchard 03 Jul '06

03 Jul '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28037 Modified Files: Tag: devel_0_39 desire.c Log Message: #V supports any list (not just one symbol) and the comma. Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.89 retrieving revision 1.1.2.90 diff -C2 -d -r1.1.2.89 -r1.1.2.90 *** desire.c 2 Jul 2006 02:21:24 -0000 1.1.2.89 --- desire.c 3 Jul 2006 03:26:03 -0000 1.1.2.90 *************** *** 57,60 **** --- 57,66 ---- // externals compiled for PureMSP. + typedef struct _arglist { + long c; + long dummy; + t_atom v[0]; + } t_arglist; + t_appendix *appendix_new (t_gobj *master) { t_appendix *self = (t_appendix *)malloc(sizeof(t_appendix)); *************** *** 77,82 **** binbuf_addv(b, "s", gensym("#V")); hash_foreach(k,v,h) { ! binbuf_addv(b, "ss", k, v); // :-( ! if (i+1==hash_size(h)) binbuf_addv(b, ";"); else binbuf_addv(b, "s", gensym(",")); } } --- 83,92 ---- binbuf_addv(b, "s", gensym("#V")); hash_foreach(k,v,h) { ! t_arglist *al = (t_arglist *)v; ! binbuf_addv(b,"s",k); ! binbuf_add(b,al->c,al->v); ! if (i+1==hash_size(h)) binbuf_addv(b, ";"); ! else binbuf_addv(b, "s", gensym(",")); ! i++; } } *************** *** 85,88 **** --- 95,101 ---- void appendix_free (t_gobj *master) { t_appendix *self = master->g_adix; + hashkey k; + hashvalue v; + hash_foreach(k,v,self->visual) {free(v);} hash_free(self->visual); free(self); *************** *** 12762,12773 **** static void visualloader_free(t_pd *self) {free(self);} static void visualloader_anything(t_gobj *self, t_symbol *s, int argc, t_atom *argv) { ! t_symbol *v; ! if (argc!=1) {post("#V's messages take exactly one arg"); return;} ! if (argv[0].a_type != A_SYMBOL) {post("#V's messages must take a symbol arg"); return;} ! v = atom_getsymbolarg(0, argc, argv); ! post("#V got message '%s' with $1='%s' and newest=%p",s->s_name,v->s_name,newest); ! if (!newest) {post("#V: there is no newest object"); return;} ! hash_set(((t_gobj *)newest)->g_adix->visual,s,v); } --- 12775,12806 ---- static void visualloader_free(t_pd *self) {free(self);} + static void copy_atoms(int argc, t_atom *argvdest, t_atom *argvsrc) { + memcpy(argvdest,argvsrc,argc*sizeof(t_atom)); + } + static void visualloader_anything(t_gobj *self, t_symbol *s, int argc, t_atom *argv) { ! printf("visualloader_anything start newest=%p\n",newest); ! //t_hash *h = self->g_adix->visual; ! t_hash *h = ((t_gobj *)newest)->g_adix->visual; ! int i=0,j=0; ! while (j<argc) { ! t_arglist *al; ! i=j; ! while (j<argc && atom_getsymbolarg(j,argc,argv)!=gensym(",")) j++; ! if (i==j) {j++; continue;} ! al = (t_arglist *) malloc(sizeof(t_arglist) + (j-i)*sizeof(t_atom)); ! al->c=j-i; ! copy_atoms(al->c,al->v,&argv[i]); ! printf("#V reading '%s':\n",s->s_name); ! if (!newest) {printf("#V: there is no newest object\n"); return;} ! if (hash_exists(h,s)) { ! printf("'%s' exists, deleting\n",s->s_name); ! free(hash_get(h,s)); ! } ! hash_set(h,s,al); ! j++; ! if (j<argc) {s=atom_getsymbolarg(j,argc,argv);j++;} ! } ! printf("visualloader_anything end\n"); }

1 0

pd/src desire.tk,1.1.2.270,1.1.2.271
by chunlee 02 Jul '06

02 Jul '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27377 Modified Files: Tag: devel_0_39 desire.tk Log Message: update_object now supports the #V line Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.270 retrieving revision 1.1.2.271 diff -C2 -d -r1.1.2.270 -r1.1.2.271 *** desire.tk 1 Jul 2006 06:29:11 -0000 1.1.2.270 --- desire.tk 2 Jul 2006 17:07:28 -0000 1.1.2.271 *************** *** 2747,2754 **** set canvas(current) "" ! proc update_object {x d ninlets noutlets} { global _ fields classinfo canvas clipboard ! set d [string trimright $d "\n"] ! set d [string trimright $d ";"] set i 1 set class [lindex $d $i] --- 2747,2763 ---- set canvas(current) "" ! proc update_object {x e ninlets noutlets} { global _ fields classinfo canvas clipboard ! set findV [string first "#V" $e] ! set v "" ! set d "" ! if {$findV >= 0} { ! set d [string range $e 0 [expr $findV - 2]] ! set v [string range $e $findV end-1] ! set _($x:V) $v ! } else { ! set d [string trimright $e "\n"] ! set d [string trimright $e ";"] ! } set i 1 set class [lindex $d $i]

1 0

pd/src TODO,1.1.2.11,1.1.2.12
by Mathieu Bouchard 02 Jul '06

02 Jul '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3275 Modified Files: Tag: devel_0_39 TODO Log Message: . Index: TODO =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/TODO,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -C2 -d -r1.1.2.11 -r1.1.2.12 *** TODO 25 Jun 2006 10:46:24 -0000 1.1.2.11 --- TODO 2 Jul 2006 02:26:35 -0000 1.1.2.12 *************** *** 19,22 **** --- 19,50 ---- [h] About... + server: + + [m] dirty_list (so that the draw methods at the client knows which part of the object to draw) + [m] messagebox ($1 = (struct _class *) 0x0) + [m] pd_upload optimisation + [m] differential upload engine + [m] file save + [m] bang counter + + client: + + [m] history undo/redo + [h] font stuff + [h] different wire types + [h] canvas properties + [] GOP + [] rest of iem_gui (canvas/panel, vu, array, comment, symbol, floatatom) + [h] Path... dialog + + + 0.39.B: + [ ] fix 64-bit arrays so that carmen gets a use for DD. + + 0.39.???: + [ ] carmen also needs strings (no symbol leakage) + + bugs: + chun when creating a object, it goes like this: chun <- .x8241d70 text_setto !x8241f40 116; *************** *** 49,71 **** ======= - server: - - [m] dirty_list (so that the draw methods at the client knows which part of the object to draw) - [m] messagebox ($1 = (struct _class *) 0x0) - [m] pd_upload optimisation - [m] differential upload engine - [m] file save - [m] bang counter - - client: - - [m] history undo/redo - [h] font stuff - [h] different wire types - [h] canvas properties - [] GOP - [] rest of iem_gui (canvas/panel, vu, array, comment, symbol, floatatom) - [h] Path... dialog - LATER: --- 77,80 ---- *************** *** 291,295 **** (useful for making variants) - ------------------8<--------cut-here--------8<------------------ Dec 26 2005 --- 300,303 ----

1 0

pd/src desire.c,1.1.2.88,1.1.2.89
by Mathieu Bouchard 02 Jul '06

02 Jul '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1281 Modified Files: Tag: devel_0_39 desire.c Log Message: #V on wires (t_outconnect) works Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.88 retrieving revision 1.1.2.89 diff -C2 -d -r1.1.2.88 -r1.1.2.89 *** desire.c 2 Jul 2006 02:07:09 -0000 1.1.2.88 --- desire.c 2 Jul 2006 02:21:24 -0000 1.1.2.89 *************** *** 3383,3388 **** canvas_fixlinesfor(x, objsrc); } return; - bad: post("%s %d %d %d %d (%s->%s) connection failed", --- 3383,3388 ---- canvas_fixlinesfor(x, objsrc); } + newest = (t_pd *)oc; return; bad: post("%s %d %d %d %d (%s->%s) connection failed", *************** *** 6619,6622 **** --- 6619,6623 ---- binbuf_addv(b, "ssiiii;", gensym("#X"), gensym("connect"), srcno, t.tr_outno, sinkno, t.tr_inno); + appendix_save((t_gobj *)oc,b); } /* unless everything is the default (as in ordinary subpatches)

1 0

pd/src desire.c,1.1.2.87,1.1.2.88
by Mathieu Bouchard 02 Jul '06

02 Jul '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27792 Modified Files: Tag: devel_0_39 desire.c Log Message: #V now works with objects. Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.87 retrieving revision 1.1.2.88 diff -C2 -d -r1.1.2.87 -r1.1.2.88 *** desire.c 2 Jul 2006 01:36:14 -0000 1.1.2.87 --- desire.c 2 Jul 2006 02:07:09 -0000 1.1.2.88 *************** *** 70,73 **** --- 70,74 ---- void appendix_save (t_gobj *master, t_binbuf *b) { t_hash *h = master->g_adix->visual; + fprintf(stderr,"appendix_save %p size=%d\n",master,hash_size(h)); if (hash_size(h)) { hashkey k; *************** *** 11267,11270 **** --- 11268,11272 ---- void text_save(t_gobj *z, t_binbuf *b) { + fprintf(stderr,"text_save %p\n",z); t_text *x = (t_text *)z; if (x->te_type == T_OBJECT) { *************** *** 12764,12769 **** if (argv[0].a_type != A_SYMBOL) {post("#V's messages must take a symbol arg"); return;} v = atom_getsymbolarg(0, argc, argv); ! post("#V got message '%s' with $1='%s' and g_adix=%p",s->s_name,v->s_name,self->g_adix); ! hash_set(self->g_adix->visual,s,v); } --- 12766,12772 ---- if (argv[0].a_type != A_SYMBOL) {post("#V's messages must take a symbol arg"); return;} v = atom_getsymbolarg(0, argc, argv); ! post("#V got message '%s' with $1='%s' and newest=%p",s->s_name,v->s_name,newest); ! if (!newest) {post("#V: there is no newest object"); return;} ! hash_set(((t_gobj *)newest)->g_adix->visual,s,v); }

1 0

pd/src desire.c,1.1.2.86,1.1.2.87
by Mathieu Bouchard 02 Jul '06

02 Jul '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15212 Modified Files: Tag: devel_0_39 desire.c Log Message: fixing swollen appendix again Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.86 retrieving revision 1.1.2.87 diff -C2 -d -r1.1.2.86 -r1.1.2.87 *** desire.c 2 Jul 2006 00:59:47 -0000 1.1.2.86 --- desire.c 2 Jul 2006 01:36:14 -0000 1.1.2.87 *************** *** 223,227 **** t_manager *manager_new (t_symbol *s, int argc, t_atom *argv) { t_manager *self = (t_manager *)pd_new(manager_class); - self->super.g_adix = appendix_new((t_gobj *)self); self->q = queue_new(); self->clock = clock_new(self,(t_method)manager_call); --- 223,226 ---- *************** *** 500,512 **** void glist_init(t_glist *x) { ! /* zero out everyone except "pd" field */ ! memset(((char *)x) + sizeof(x->gl_pd), 0, sizeof(*x) - sizeof(x->gl_pd)); x->gl_stub = gstub_new(x, 0); x->gl_valid = ++glist_valid; x->gl_xlabel = (t_symbol **)t_getbytes(0); x->gl_ylabel = (t_symbol **)t_getbytes(0); ! ((t_gobj *)x)->g_adix = appendix_new((t_gobj *)x); ! /* the following is a hack */ ! if (hack) { gobj_subscribe((t_gobj *)x,(t_gobj *)manager); gobj_changed((t_gobj *)x,0); --- 499,509 ---- void glist_init(t_glist *x) { ! /* zero out everyone except "pd" and "g_adix" fields */ ! memset(((char *)x) + sizeof(t_gobj), 0, sizeof(*x) - sizeof(t_gobj)); x->gl_stub = gstub_new(x, 0); x->gl_valid = ++glist_valid; x->gl_xlabel = (t_symbol **)t_getbytes(0); x->gl_ylabel = (t_symbol **)t_getbytes(0); ! if (hack) { /* only manage this canvas if it's not one of the 3 invisible builtin canvases */ gobj_subscribe((t_gobj *)x,(t_gobj *)manager); gobj_changed((t_gobj *)x,0); *************** *** 3727,3731 **** { t_binbuf *b; ! hack = 0; if (garray_arraytemplatecanvas) return; --- 3724,3728 ---- { t_binbuf *b; ! hack = 0; /* invisible canvases must be, uh, invisible */ if (garray_arraytemplatecanvas) return; *************** *** 3745,3749 **** glob_setfilename(0, &s_, &s_); binbuf_free(b); ! hack = 1; } --- 3742,3746 ---- glob_setfilename(0, &s_, &s_); binbuf_free(b); ! hack = 1; /* enable canvas visibility for upcoming canvases */ } *************** *** 5053,5057 **** printf("glist_add %p %p [%.*s]\n",x,y,bufn,buf); free(buf); - if (!y->g_adix) y->g_adix = appendix_new(y); /* mb: i found no better place for initing this */ gobj_subscribe(y,(t_gobj *)x); gobj_changed(y,0); --- 5050,5053 ----

1 0

pd/src desire.c,1.1.2.85,1.1.2.86
by Mathieu Bouchard 02 Jul '06

02 Jul '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv655 Modified Files: Tag: devel_0_39 desire.c Log Message: #V support, read/write (with symbol arguments only) Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.85 retrieving revision 1.1.2.86 diff -C2 -d -r1.1.2.85 -r1.1.2.86 *** desire.c 1 Jul 2006 06:30:48 -0000 1.1.2.85 --- desire.c 2 Jul 2006 00:59:47 -0000 1.1.2.86 *************** *** 76,79 **** --- 76,80 ---- binbuf_addv(b, "s", gensym("#V")); hash_foreach(k,v,h) { + binbuf_addv(b, "ss", k, v); // :-( if (i+1==hash_size(h)) binbuf_addv(b, ";"); else binbuf_addv(b, "s", gensym(",")); } *************** *** 12754,12758 **** --- 12755,12774 ---- } + t_class *visualloader_class; + + static t_pd *visualloader_new(t_symbol *s, int argc, t_atom *argv) { + return pd_new(visualloader_class); + } + static void visualloader_free(t_pd *self) {free(self);} + + static void visualloader_anything(t_gobj *self, t_symbol *s, int argc, t_atom *argv) { + t_symbol *v; + if (argc!=1) {post("#V's messages take exactly one arg"); return;} + if (argv[0].a_type != A_SYMBOL) {post("#V's messages must take a symbol arg"); return;} + v = atom_getsymbolarg(0, argc, argv); + post("#V got message '%s' with $1='%s' and g_adix=%p",s->s_name,v->s_name,self->g_adix); + hash_set(self->g_adix->visual,s,v); + } void desire_setup(void) { *************** *** 12767,12772 **** S(g_slider) S(g_numbox) S(g_mycanvas) S(g_vumeter) S(g_dropper) #undef S - } /* ---------------------------------------------------------------- */ --- 12783,12792 ---- S(g_slider) S(g_numbox) S(g_mycanvas) S(g_vumeter) S(g_dropper) #undef S + visualloader_class = class_new(gensym("#V"), (t_newmethod)visualloader_new, + (t_method)visualloader_free, sizeof(t_object), CLASS_GOBJ, A_GIMME, 0); + class_addanything(visualloader_class,visualloader_anything); + pd_bind(pd_new(visualloader_class),gensym("#V")); + } /* ---------------------------------------------------------------- */

1 0

pd/src m_pd.c,1.3.8.6,1.3.8.7
by Mathieu Bouchard 02 Jul '06

02 Jul '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31716 Modified Files: Tag: devel_0_39 m_pd.c Log Message: fix because appendix requires DESIRE Index: m_pd.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.c,v retrieving revision 1.3.8.6 retrieving revision 1.3.8.7 diff -C2 -d -r1.3.8.6 -r1.3.8.7 *** m_pd.c 2 Jul 2006 00:34:53 -0000 1.3.8.6 --- m_pd.c 2 Jul 2006 00:52:57 -0000 1.3.8.7 *************** *** 16,20 **** --- 16,22 ---- x = (t_pd *)t_getbytes(c->c_size); *x = c; + #ifdef DESIRE if (c->c_gobj) ((t_gobj *)x)->g_adix = appendix_new((t_gobj *)x); + #endif if (c->c_patchable) {

1 0

pd/src m_conf.c,1.1.1.3.12.5,1.1.1.3.12.6
by Mathieu Bouchard 02 Jul '06

02 Jul '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31278 Modified Files: Tag: devel_0_39 m_conf.c Log Message: need to init m_hash.c too Index: m_conf.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_conf.c,v retrieving revision 1.1.1.3.12.5 retrieving revision 1.1.1.3.12.6 diff -C2 -d -r1.1.1.3.12.5 -r1.1.1.3.12.6 *** m_conf.c 23 Apr 2006 06:48:31 -0000 1.1.1.3.12.5 --- m_conf.c 2 Jul 2006 00:51:10 -0000 1.1.1.3.12.6 *************** *** 16,19 **** --- 16,20 ---- S(desire) S(m_obj) + S(hash) #else S(g_bang) S(g_hradio) S(g_hslider) S(g_mycanvas) S(g_numbox) *************** *** 32,35 **** --- 33,37 ---- void conf_init(void) { #ifdef DESIRE + S(hash) S(m_obj) #endif

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 July 2006