Pd-cvs October 2005

pd-cvs@lists.iem.at

15 participants
477 discussions

pd/src desire.tk,1.1.2.89,1.1.2.90
by Mathieu Bouchard 31 Oct '05

31 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14682 Modified Files: Tag: devel_0_39 desire.tk Log Message: more bugfixes. it's really close to be rendering again now. Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,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.tk 31 Oct 2005 12:47:12 -0000 1.1.2.89 --- desire.tk 31 Oct 2005 13:20:08 -0000 1.1.2.90 *************** *** 74,78 **** def* manager init {} { - post %s "MANAGER INIT!!! self=$self" set @q [list] $self call --- 74,77 ---- *************** *** 81,89 **** def manager call {} { global poolset ! if {![llength $@q]} return ! post "client queue %d" [llength $@q] foreach o $@q { ! puts "$o: $poolset($o)" ! unset poolset($origin) } set @q [list] --- 80,88 ---- def manager call {} { global poolset ! if {[llength $@q]} {post "client queue %d" [llength $@q]} foreach o $@q { ! post %s "$o: $poolset($o)" ! unset poolset($o) ! $o draw [$o canvas] } set @q [list] *************** *** 94,102 **** global poolset if {[info exists poolset($origin)]} { # nothing for now } { set poolset($origin) {-1} ! lappend poolset $origin } } --- 93,103 ---- global poolset if {[info exists poolset($origin)]} { + post %s "def manager notice: double dirty" # nothing for now } { set poolset($origin) {-1} ! lappend @q $origin } + post "manager notice: queue length is now %d" [llength $@q] } *************** *** 731,734 **** --- 732,736 ---- $self subscribe $manager $self changed + $self canvas= $self } *************** *** 961,967 **** #} ! # in the future, one view may have several canvases. ! # this means that the following proc will have to die. ! def view canvas {} {return $@canvas} def* objectbox draw {canvas} { --- 963,970 ---- #} ! # in the future, one view may have several canvases. (??) ! # this would mean that the following proc will have to die. ! def view canvas {} {return $@canvas} ! def view canvas= {c} {set @canvas $c} def* objectbox draw {canvas} { *************** *** 999,1002 **** --- 1002,1009 ---- } + def canvas draw {canvas} { + + } + #-----------------------------------------------------------------------------------# def io draw/2 {canvas which n y} { *************** *** 1215,1219 **** set born [lwithout $children $@children]; post %s "BORN: $born" set dead [lwithout $@children $children]; post %s "DEAD: $dead" ! foreach x $born {$x subscribe $self; $x changed} foreach x $dead {$x unsubscribe $self} set @children $children --- 1222,1226 ---- set born [lwithout $children $@children]; post %s "BORN: $born" set dead [lwithout $@children $children]; post %s "DEAD: $dead" ! foreach x $born {$x subscribe $self; $x changed; $x canvas= $self} foreach x $dead {$x unsubscribe $self} set @children $children *************** *** 1224,1227 **** --- 1231,1236 ---- set i [lsearch $@children $obj] if {!$i} {lappend @children $obj} + $obj subscribe $self; $x changed + $obj canvas= $self } *************** *** 1229,1232 **** --- 1238,1242 ---- set i [lsearch $@children $obj] if {$i} {set @children [lreplace $@children $i $i]} + $obj unsubscribe $self } *************** *** 1680,1684 **** def* canvas notice {origin args} { ! eval [concat [list child_changed $origin] $args] } --- 1690,1694 ---- def* canvas notice {origin args} { ! eval [concat [list $self child_changed $origin] $args] } *************** *** 2537,2554 **** } ! set console_scrollback_count 0 proc post_to_gui {x} { ! global cmdline console_scrollback_count ! if {[catch { set oldpos [lindex [.log.2 get] 1] .log.1 insert end $x ! incr console_scrollback_count ! if {$console_scrollback_count >= $cmdline(console)} { .log.1 delete 1.0 2.0 ! } if {$oldpos > 0.9999} {.log.1 see end} ! }]} { ! puts -nonewline stderr $x ! } } --- 2547,2567 ---- } ! set console_lines 0 proc post_to_gui {x} { ! global cmdline console_lines ! # if {[catch { set oldpos [lindex [.log.2 get] 1] .log.1 insert end $x ! regsub "\n$" $x "" y ! set n [expr [string length $x]-[string length $y]] ! set console_lines [expr $console_lines+$n] ! while {$console_lines >= $cmdline(console)} { .log.1 delete 1.0 2.0 ! set console_lines [expr $console_lines-1] ! } if {$oldpos > 0.9999} {.log.1 see end} ! # }]} { ! # puts -nonewline stderr $x ! # } }

1 0

[PD-cvs] pd/src objective.tcl, 1.1.2.2, 1.1.2.3 desire.tk, 1.1.2.88, 1.1.2.89
by Mathieu Bouchard 31 Oct '05

31 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4509 Modified Files: Tag: devel_0_39 objective.tcl desire.tk Log Message: fixed bugs in client-side observer and manager and such Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,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.tk 31 Oct 2005 11:13:58 -0000 1.1.2.88 --- desire.tk 31 Oct 2005 12:47:12 -0000 1.1.2.89 *************** *** 51,60 **** def* observable subscribe {observer} { set i [lsearch $@subscribers $observer] ! if {!$i} {lappend @subscribers $observer} } def* observable unsubscribe {observer} { set i [lsearch $@subscribers $observer] ! if {$i} {set @subscribers [lreplace $@subscribers $i $i]} } --- 51,60 ---- def* observable subscribe {observer} { set i [lsearch $@subscribers $observer] ! if {$i<0} {lappend @subscribers $observer} } def* observable unsubscribe {observer} { set i [lsearch $@subscribers $observer] ! if {$i>=0} {set @subscribers [lreplace $@subscribers $i $i]} } *************** *** 73,77 **** class_new manager {thing} ! def manager init {} { set @q [list] $self call --- 73,78 ---- class_new manager {thing} ! def* manager init {} { ! post %s "MANAGER INIT!!! self=$self" set @q [list] $self call *************** *** 90,94 **** } ! def manager notice {origin args} { global poolset if {[info exists poolset($origin)]} { --- 91,95 ---- } ! def* manager notice {origin args} { global poolset if {[info exists poolset($origin)]} { *************** *** 683,692 **** #-----------------------------------------------------------------------------------# - proc* pdtk_canvas_new {name width height geometry editable} { - global _ - set self [c2self $name] - canvas_new_as $self $width $height $geometry $editable - } - class_new canvas {view} def* canvas init {{width 300} {height 400} {geometry 400x300+0+0} {editable 0}} { --- 684,687 ---- *************** *** 732,735 **** --- 727,734 ---- set @children {} set @obj_in_edit {} + global manager + post %s "canvas init: subscribing to $manager" + $self subscribe $manager + $self changed } *************** *** 1086,1094 **** #----------------------------------------------------------------------------------- - #proc objectbox_by_ctrl {} { - # - # pd "%W obj 0 ;" - # - #} class_new objectbox {textbox} --- 1085,1088 ---- *************** *** 1220,1227 **** # think of the children!!! set born [lwithout $children $@children]; post %s "BORN: $born" ! set dead [lwithout $@children $children]; post %s "BORN: $dead" ! foreach x $born {} ! foreach x $dead {} set @children $children } --- 1214,1222 ---- # think of the children!!! set born [lwithout $children $@children]; post %s "BORN: $born" ! set dead [lwithout $@children $children]; post %s "DEAD: $dead" ! foreach x $born {$x subscribe $self; $x changed} ! foreach x $dead {$x unsubscribe $self} set @children $children + $self changed } *************** *** 1684,1695 **** } ! def canvas notice {origin args} { ! global pool ! set has_window 1 ! if {$has_window} { ! set pool($origin) 1 ! } { ! eval [concat [list child_changed $origin] $args] ! } } --- 1679,1684 ---- } ! def* canvas notice {origin args} { ! eval [concat [list child_changed $origin] $args] } *************** *** 1875,1879 **** set fields(hdl) $fields(hradio) set fields(vdl) $fields(hradio) ! #set fields(msg) # @class {@_class} --- 1864,1869 ---- set fields(hdl) $fields(hradio) set fields(vdl) $fields(hradio) ! set fields(canvas) {name width height geometry editable} ! # @class {@_class} *************** *** 3027,3029 **** --- 3017,3021 ---- + post %s hello set manager [manager_new] + post %s hello Index: objective.tcl =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/objective.tcl,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** objective.tcl 31 Oct 2005 11:13:58 -0000 1.1.2.2 --- objective.tcl 31 Oct 2005 12:47:11 -0000 1.1.2.3 *************** *** 26,29 **** --- 26,30 ---- set _(\$self:_class) $self eval [concat [list \$self init] \$args] + return \$self " proc ${self}_new_as {self args} " *************** *** 31,34 **** --- 32,36 ---- set _(\$self:_class) $self eval [concat [list \$self init] \$args] + return \$self " }

1 0

pd/src desire.c,1.1.2.46,1.1.2.47
by Mathieu Bouchard 31 Oct '05

31 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22408 Modified Files: Tag: devel_0_39 desire.c Log Message: big bugfix. sorta works now. Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.46 retrieving revision 1.1.2.47 diff -C2 -d -r1.1.2.46 -r1.1.2.47 *** desire.c 31 Oct 2005 11:13:58 -0000 1.1.2.46 --- desire.c 31 Oct 2005 11:36:49 -0000 1.1.2.47 *************** *** 48,51 **** --- 48,52 ---- self->nobs = 0; self->obs = 0; + self->dirtyc = 0; return self; } *************** *** 152,155 **** --- 153,157 ---- void manager_call (void *foo) { t_manager *self = (t_manager *)foo; + if (self->q->len) post("manager_call: %d notices",self->q->len); while (!queue_empty(self->q)) { t_gobj *o = (t_gobj *)queue_get(self->q); *************** *** 170,174 **** a->dirtyc = 1; } else { ! post("double dirty"); } SETFLOAT(a->dirtyv,-1); /* in the future this may contain real data instead */ --- 172,176 ---- a->dirtyc = 1; } else { ! post("double dirty: a->dirtyc=%d",a->dirtyc); } SETFLOAT(a->dirtyv,-1); /* in the future this may contain real data instead */ *************** *** 736,742 **** void canvas_redraw(t_canvas *x) { - if (!glist_isvisible(x)) return; - t_gobj *y; - // glist_each(y,x) {} if (glist_isvisible(x)) {canvas_map(x,0); canvas_map(x, 1);} } --- 738,741 ---- *************** *** 805,815 **** in front of all windows; or with "f" zero, when we want to get rid of the window. */ ! void canvas_vis(t_canvas *x, t_floatarg f) ! { ! if (!!f) ! { ! /* test if we're already visible and toplevel */ ! if (x->gl_editor) ! { /* just put us in front */ #ifdef MSW canvas_vis(x, 0); --- 804,810 ---- in front of all windows; or with "f" zero, when we want to get rid of the window. */ ! void canvas_vis(t_canvas *x, t_floatarg f) { ! if (!!f) { ! if (x->gl_editor) { /* already visible, so just raise window */ #ifdef MSW canvas_vis(x, 0); *************** *** 820,843 **** sys_mgui(x,"window_deiconify",""); #endif ! } ! else ! { canvas_create_editor(x, 1); - sys_vgui("pdtk_canvas_new .x%lx %d %d +%d+%d %d\n", (long)x, - (int)(x->gl_screenx2 - x->gl_screenx1), - (int)(x->gl_screeny2 - x->gl_screeny1), - (int)(x->gl_screenx1), (int)(x->gl_screeny1), - x->gl_edit); canvas_reflecttitle(x); x->gl_havewindow = 1; canvas_updatewindowlist(); } ! } ! else /* make invisible */ ! { int i; t_canvas *x2; ! if (!x->gl_havewindow) ! { /* bug workaround -- a graph in a visible patch gets "invised" when the patch is closed, and must lose the editor here. It's --- 815,833 ---- sys_mgui(x,"window_deiconify",""); #endif ! } else { canvas_create_editor(x, 1); canvas_reflecttitle(x); x->gl_havewindow = 1; canvas_updatewindowlist(); + post("subscribe %lx",(long)x); + gobj_subscribe((t_gobj *)x,(t_gobj *)manager); + gobj_changed(x,""); } ! } else { /* make invisible */ int i; t_canvas *x2; ! post("subscribe %lx",(long)x); ! gobj_subscribe((t_gobj *)x,(t_gobj *)manager); ! if (!x->gl_havewindow) { /* bug workaround -- a graph in a visible patch gets "invised" when the patch is closed, and must lose the editor here. It's *************** *** 845,874 **** subpatches fall here too but don'd need the editor freed, so we check if it exists. */ ! if (x->gl_editor) ! canvas_create_editor(x, 0); return; } sys_mgui(x,"getscroll",""); glist_noselect(x); ! if (glist_isvisible(x)) ! canvas_map(x, 0); canvas_create_editor(x, 0); sys_vgui("destroy .x%lx\n", (long)x); // huh? ! for (i = 1, x2 = x; x2; x2 = x2->gl_next, i++) ! ; ! sys_vgui(".mbar.find delete %d\n", i); ! /* if we're a graph on our parent, and if the parent exists ! and is visible, show ourselves on parent. */ ! if (glist_isgraph(x) && x->gl_owner) ! { t_glist *gl2 = x->gl_owner; canvas_create_editor(x, 1); ! if (glist_isvisible(gl2)) ! gobj_vis(&x->gl_gobj, gl2, 0); x->gl_havewindow = 0; ! if (glist_isvisible(gl2)) ! gobj_vis(&x->gl_gobj, gl2, 1); ! } ! else x->gl_havewindow = 0; canvas_updatewindowlist(); } --- 835,857 ---- subpatches fall here too but don'd need the editor freed, so we check if it exists. */ ! if (x->gl_editor) canvas_create_editor(x, 0); return; } sys_mgui(x,"getscroll",""); glist_noselect(x); ! if (glist_isvisible(x)) canvas_map(x, 0); canvas_create_editor(x, 0); sys_vgui("destroy .x%lx\n", (long)x); // huh? ! i=1; for (x2=x; x2; x2=x2->gl_next) i++; ! sys_vgui(".mbar.find delete %d\n", i); // huh??? ! /* if we're a graph on our parent, and if the parent exists ! and is visible, show ourselves on parent. */ ! if (glist_isgraph(x) && x->gl_owner) { t_glist *gl2 = x->gl_owner; canvas_create_editor(x, 1); ! if (glist_isvisible(gl2)) gobj_vis(&x->gl_gobj, gl2, 0); x->gl_havewindow = 0; ! if (glist_isvisible(gl2)) gobj_vis(&x->gl_gobj, gl2, 1); ! } else x->gl_havewindow = 0; canvas_updatewindowlist(); } *************** *** 877,881 **** /* we call this on a non-toplevel glist to "open" it into its own window. */ ! void glist_menu_open(t_glist *x) { if (glist_isvisible(x) && !glist_istoplevel(x)) --- 860,864 ---- /* we call this on a non-toplevel glist to "open" it into its own window. */ ! static void glist_menu_open(t_glist *x) { if (glist_isvisible(x) && !glist_istoplevel(x))

1 0

pd/src objective.tcl, 1.1.2.1, 1.1.2.2 desire.c, 1.1.2.45, 1.1.2.46 desire.tk, 1.1.2.87, 1.1.2.88
by Mathieu Bouchard 31 Oct '05

31 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17649 Modified Files: Tag: devel_0_39 objective.tcl desire.c desire.tk Log Message: added client-side manager. bugfixes. Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,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.tk 29 Oct 2005 18:00:50 -0000 1.1.2.87 --- desire.tk 31 Oct 2005 11:13:58 -0000 1.1.2.88 *************** *** 70,74 **** set poolset(foo) bar array unset poolset foo ! set poolqueue {} #-----------------------------------------------------------------------------------# --- 70,102 ---- set poolset(foo) bar array unset poolset foo ! ! class_new manager {thing} ! ! def manager init {} { ! set @q [list] ! $self call ! } ! ! def manager call {} { ! global poolset ! if {![llength $@q]} return ! post "client queue %d" [llength $@q] ! foreach o $@q { ! puts "$o: $poolset($o)" ! unset poolset($origin) ! } ! set @q [list] ! after 500 "$self call" ! } ! ! def manager notice {origin args} { ! global poolset ! if {[info exists poolset($origin)]} { ! # nothing for now ! } { ! set poolset($origin) {-1} ! lappend poolset $origin ! } ! } #-----------------------------------------------------------------------------------# *************** *** 662,666 **** class_new canvas {view} ! def* canvas init {width height geometry editable} { super global pd_opendir pd_tearoff OS cmdline canvasmenu focus --- 690,694 ---- class_new canvas {view} ! def* canvas init {{width 300} {height 400} {geometry 400x300+0+0} {editable 0}} { super global pd_opendir pd_tearoff OS cmdline canvasmenu focus *************** *** 706,709 **** --- 734,740 ---- } + def* canvas ninlets= {n} {} + def* canvas noutlets= {n} {} + #-----------------------------------------------------------------------------------# *************** *** 1179,1184 **** --- 1210,1226 ---- #def* canvas del {i} {lset @children $i ""} + proc lwithout {a b} { + set r {} + foreach x $b {set c($x) {}} + foreach x $a {if {![info exists c($x)]} {lappend r $x}} + return $r + } + def* canvas children= {children} { # think of the children!!! + set born [lwithout $children $@children]; post %s "BORN: $born" + set dead [lwithout $@children $children]; post %s "BORN: $dead" + foreach x $born {} + foreach x $dead {} set @children $children } *************** *** 1194,1198 **** } - def canvas delete_selection {} { foreach obj $@selection {$obj erase} --- 1236,1239 ---- *************** *** 2984,2985 **** --- 3025,3029 ---- #c that thing..redraws anythign that is currently selected or was currently selected #c lsort proably does what u want (has an integer flag too) + + + set manager [manager_new] Index: objective.tcl =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/objective.tcl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** objective.tcl 13 Oct 2005 07:03:25 -0000 1.1.2.1 --- objective.tcl 31 Oct 2005 11:13:58 -0000 1.1.2.2 *************** *** 36,40 **** proc proc* {name args body} { set argl {} ! foreach arg $args {lappend argl "$arg=\$$arg"} proc $name $args "puts \"CALL TO PROC $name [join $argl " "]\"; $body" } --- 36,40 ---- proc proc* {name args body} { set argl {} ! foreach arg $args {set arg [lindex $arg 0]; lappend argl "$arg=\$$arg"} proc $name $args "puts \"CALL TO PROC $name [join $argl " "]\"; $body" } *************** *** 66,70 **** global _ set self [lindex $args 0] ! if {"$self" == ""} {error "null pointer you black emperor"} set selector [lindex $args 1] if {[llength [array names _ $self:_class]] == 0} { --- 66,70 ---- global _ set self [lindex $args 0] ! if {"$self" == ""} {error "null pointer error"} set selector [lindex $args 1] if {[llength [array names _ $self:_class]] == 0} { *************** *** 75,78 **** --- 75,79 ---- lookup_method $_($self:_class) $selector methods ancestors set i 0 + # puts "FOUND METHODS: $methods" if {![llength $methods]} { error "no such method '$selector' for object '$self'\nwith ancestors {$ancestors}" *************** *** 93,96 **** --- 94,99 ---- class_new thing set _(thing:_super) {} + def* thing init {} {} + # virtual destructor def* thing _delete {} {} Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.45 retrieving revision 1.1.2.46 diff -C2 -d -r1.1.2.45 -r1.1.2.46 *** desire.c 29 Oct 2005 17:28:11 -0000 1.1.2.45 --- desire.c 31 Oct 2005 11:13:58 -0000 1.1.2.46 *************** *** 44,48 **** t_appendix *appendix_new (t_gobj *master) { t_appendix *self = (t_appendix *)malloc(sizeof(t_appendix)); - post("appendix_new: %p for %p",self,master); self->master = master; self->next = 0; --- 44,47 ---- *************** *** 117,121 **** void queue_put (t_queue *self, void *stuff) { - post("HEY"); if (self->len==QUEUE_SIZE) {bug("queue full"); return;} self->o[(self->start+self->len)%QUEUE_SIZE] = stuff; --- 116,119 ---- *************** *** 154,161 **** void manager_call (void *foo) { t_manager *self = (t_manager *)foo; - LS while (!queue_empty(self->q)) { t_gobj *o = (t_gobj *)queue_get(self->q); if (!o->g_adix->dirtyc) continue; pd_upload(o); o->g_adix->dirtyc = 0; --- 152,159 ---- void manager_call (void *foo) { t_manager *self = (t_manager *)foo; while (!queue_empty(self->q)) { t_gobj *o = (t_gobj *)queue_get(self->q); if (!o->g_adix->dirtyc) continue; + post("UPLOADING a %s",o->g_pd->c_name->s_name); pd_upload(o); o->g_adix->dirtyc = 0; *************** *** 166,174 **** void manager_notice (t_gobj *self_, t_gobj *origin, int argc, t_atom *argv) { t_manager *self = (t_manager *)self_; ! LS t_appendix *a = (t_appendix *)origin->g_adix; if (!a->dirtyc) { queue_put(self->q,origin); a->dirtyc = 1; } SETFLOAT(a->dirtyv,-1); /* in the future this may contain real data instead */ --- 164,174 ---- void manager_notice (t_gobj *self_, t_gobj *origin, int argc, t_atom *argv) { t_manager *self = (t_manager *)self_; ! post("manager_notice(%p,%p,%d,...)",self,origin,argc); t_appendix *a = (t_appendix *)origin->g_adix; if (!a->dirtyc) { queue_put(self->q,origin); a->dirtyc = 1; + } else { + post("double dirty"); } SETFLOAT(a->dirtyv,-1); /* in the future this may contain real data instead */ *************** *** 177,181 **** t_manager *manager_new (t_symbol *s, int argc, t_atom *argv) { t_manager *self = (t_manager *)pd_new(manager_class); - LS self->super.g_adix = appendix_new((t_gobj *)self); self->q = queue_new(); --- 177,180 ---- *************** *** 186,190 **** void manager_free (t_manager *self) { - LS clock_free(self->clock); queue_free(self->q); --- 185,188 ---- *************** *** 272,283 **** /* add a glist the list of "root" canvases (toplevels without parents.) */ ! static void canvas_addtolist(t_canvas *x) ! { x->gl_next = canvas_list; canvas_list = x; ! post("addtolist %lx",(long)x); ! gobj_subscribe((t_gobj *)x,(t_gobj *)manager); ! gobj_changed(x,""); ! // canvas_redraw(x); } --- 270,281 ---- /* add a glist the list of "root" canvases (toplevels without parents.) */ ! static void canvas_addtolist(t_canvas *x) { x->gl_next = canvas_list; canvas_list = x; ! if (x->gl_havewindow || x->gl_willvis) { ! post("subscribe %lx",(long)x); ! gobj_subscribe((t_gobj *)x,(t_gobj *)manager); ! gobj_changed(x,""); ! } } *************** *** 1672,1683 **** /* get the index of a gobj in a glist. If y is zero, return the total number of objects. */ ! int glist_getindex(t_glist *x, t_gobj *y) ! { t_gobj *y2; ! int indx; ! ! for (y2 = x->gl_list, indx = 0; y2 && y2 != y; y2 = y2->g_next) ! indx++; ! return (indx); } --- 1670,1678 ---- /* get the index of a gobj in a glist. If y is zero, return the total number of objects. */ ! int glist_getindex(t_glist *x, t_gobj *y) { t_gobj *y2; ! int i=0; ! glist_each(y2,x) {if (y2==y) break; else i++;} ! return i; } *************** *** 5317,5321 **** } gobj_changed(x,""); - // sys_mgui(x,"add","p",y); /* voodoo */ /* if (x->gl_editor && (ob = pd_checkobject(&y->g_pd))) rtext_new(x, ob); */ --- 5312,5315 ---- *************** *** 12083,12092 **** } static void text_select(t_gobj *z, t_glist *glist, int state) { ! sys_mgui(z,"wb_select","i",state); // rtext_select(y, state); //??? } static void text_activate(t_gobj *z, t_glist *glist, int state) { ! sys_mgui(z,"wb_activate","i",state); ! // what is this function supposed to be for anyway? } static void text_delete(t_gobj *z, t_glist *glist) {sys_mgui(z,"wb_delete","");} --- 12077,12086 ---- } static void text_select(t_gobj *z, t_glist *glist, int state) { ! // sys_mgui(z,"wb_select","i",state); // rtext_select(y, state); //??? } static void text_activate(t_gobj *z, t_glist *glist, int state) { ! // sys_mgui(z,"wb_activate","i",state); ! // what is this function supposed to be for anyway? } static void text_delete(t_gobj *z, t_glist *glist) {sys_mgui(z,"wb_delete","");}

1 0

externals/iem/aconnect Makefile,1.5,1.6 configure,1.4,1.5
by IOhannes m zmölnig 30 Oct '05

30 Oct '05

Update of /cvsroot/pure-data/externals/iem/aconnect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6446 Modified Files: Makefile configure Log Message: updated to version 0.4: changed [devices( from input/output to src/dst Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/iem/aconnect/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 25 Jul 2005 10:14:38 -0000 1.5 --- Makefile 30 Oct 2005 11:55:54 -0000 1.6 *************** *** 7,11 **** EXT = pd_linux ! DEFS = -DHAVE_ALSA -DACONNECT_VERSION=\"0.3\" IFLAGS = -I. $(INCLUDES) --- 7,11 ---- EXT = pd_linux ! DEFS = -DHAVE_ALSA -DACONNECT_VERSION=\"0.4\" IFLAGS = -I. $(INCLUDES) *************** *** 20,29 **** MAKEDEP_FLAGS = -MM ! TARNAME = $(LIBNAME)-0.3.tgz ! BINTARNAME = $(LIBNAME)-0.3-bin.tgz .SUFFIXES: .$(EXT) ! CFLAGS = $(DEFS) $(IFLAGS) $(WFLAGS) -fPIC -g -O2 LIBS = -lasound -lm -lc --- 20,29 ---- MAKEDEP_FLAGS = -MM ! TARNAME = $(LIBNAME)-0.4.tgz ! BINTARNAME = $(LIBNAME)-0.4-bin.tgz .SUFFIXES: .$(EXT) ! CFLAGS = $(DEFS) $(IFLAGS) $(WFLAGS) -fPIC -g -O2 -mms-bitfields LIBS = -lasound -lm -lc Index: configure =================================================================== RCS file: /cvsroot/pure-data/externals/iem/aconnect/configure,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configure 25 Jul 2005 10:14:38 -0000 1.4 --- configure 30 Oct 2005 11:55:54 -0000 1.5 *************** *** 1292,1296 **** ! VERSION=0.3 ac_ext=c --- 1292,1296 ---- ! VERSION=0.4 ac_ext=c

1 0

externals/iem/aconnect aconnectgui.pd,1.2,1.3
by IOhannes m zmölnig 30 Oct '05

30 Oct '05

Update of /cvsroot/pure-data/externals/iem/aconnect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6259 Modified Files: aconnectgui.pd Log Message: use "src"/"dst" instead of "input"/"output" Index: aconnectgui.pd =================================================================== RCS file: /cvsroot/pure-data/externals/iem/aconnect/aconnectgui.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** aconnectgui.pd 25 Jul 2005 16:04:41 -0000 1.2 --- aconnectgui.pd 30 Oct 2005 11:54:41 -0000 1.3 *************** *** 1,3 **** ! #N canvas 106 279 785 487 10; #X obj 717 423 zexy; #X floatatom 90 306 5 0 200 2 spacing - -; --- 1,3 ---- ! #N canvas 445 322 785 487 10; #X obj 717 423 zexy; #X floatatom 90 306 5 0 200 2 spacing - -; *************** *** 23,27 **** #X obj 110 182 t s s; #X obj 242 266 pack s 0 s; ! #X obj 140 203 select input output; #X obj 242 243 symbol; #X msg 140 223 I; --- 23,27 ---- #X obj 110 182 t s s; #X obj 242 266 pack s 0 s; ! #X obj 140 203 select src dst; #X obj 242 243 symbol; #X msg 140 223 I; *************** *** 79,83 **** #X connect 28 1 22 1; #X restore 88 171 pd cook; ! #X obj 88 201 route input output; #N canvas 508 218 483 431 createinlets 0; #X obj 117 20 inlet; --- 79,83 ---- #X connect 28 1 22 1; #X restore 88 171 pd cook; ! #X obj 88 201 route src dst; #N canvas 508 218 483 431 createinlets 0; #X obj 117 20 inlet; *************** *** 235,243 **** #N canvas 0 0 946 694 connecteur 0; #X obj 107 12 inlet; ! #X obj 107 92 s \$0-aconnect-bang; ! #X msg 107 68 bang; ! #X obj 107 127 r \$0-aconnect-connection; ! #X msg 107 150 connect \$1 \$2 \$3 \$4; ! #X obj 107 171 aconnect; #X msg 327 119 bang; #X text 369 118 disconnect all; --- 235,243 ---- #N canvas 0 0 946 694 connecteur 0; #X obj 107 12 inlet; ! #X obj 107 122 s \$0-aconnect-bang; ! #X msg 107 98 bang; ! #X obj 107 157 r \$0-aconnect-connection; ! #X msg 107 180 connect \$1 \$2 \$3 \$4; ! #X obj 107 201 aconnect; #X msg 327 119 bang; #X text 369 118 disconnect all; *************** *** 263,266 **** --- 263,267 ---- #X connect 4 3 3 3; #X restore 327 167 pd pipe; + #X obj 107 68 del 10; #X connect 0 0 9 0; #X connect 2 0 1 0; *************** *** 269,277 **** #X connect 6 0 10 0; #X connect 8 0 6 0; ! #X connect 9 0 2 0; #X connect 9 1 6 0; #X connect 10 0 12 0; #X connect 11 0 10 0; #X connect 12 0 11 0; #X restore 86 211 pd connecteur; #X obj 86 181 bng 30 250 50 0 empty empty connect 0 -8 0 14 -24198 --- 270,279 ---- #X connect 6 0 10 0; #X connect 8 0 6 0; ! #X connect 9 0 13 0; #X connect 9 1 6 0; #X connect 10 0 12 0; #X connect 11 0 10 0; #X connect 12 0 11 0; + #X connect 13 0 2 0; #X restore 86 211 pd connecteur; #X obj 86 181 bng 30 250 50 0 empty empty connect 0 -8 0 14 -24198

1 0

externals/iem/aconnect configure.ac,1.4,1.5
by IOhannes m zmölnig 30 Oct '05

30 Oct '05

Update of /cvsroot/pure-data/externals/iem/aconnect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6138 Modified Files: configure.ac Log Message: Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/iem/aconnect/configure.ac,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configure.ac 25 Jul 2005 10:14:38 -0000 1.4 --- configure.ac 30 Oct 2005 11:53:57 -0000 1.5 *************** *** 2,6 **** AC_INIT(aconnect.c) ! VERSION=0.3 dnl Checks for programs. --- 2,6 ---- AC_INIT(aconnect.c) ! VERSION=0.4 dnl Checks for programs.

1 0

pd/src desire.tk,1.1.2.86,1.1.2.87
by Mathieu Bouchard 29 Oct '05

29 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6415 Modified Files: Tag: devel_0_39 desire.tk Log Message: . Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,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.tk 29 Oct 2005 11:40:32 -0000 1.1.2.86 --- desire.tk 29 Oct 2005 18:00:50 -0000 1.1.2.87 *************** *** 45,67 **** class_new observable {} ! def observable init {observer} { set @subscribers {} } ! def observable subscribe {observer} { set i [lsearch $@subscribers $observer] if {!$i} {lappend @subscribers $observer} } ! def observable unsubscribe {observer} { set i [lsearch $@subscribers $observer] if {$i} {set @subscribers [lreplace $@subscribers $i $i]} } ! def observable changed {args} { foreach x $@subscribers {eval [concat [list $x notice $self] $args]} } ! def observable child_changed {origin args} { foreach x $@subscribers {eval [concat [list $x notice $origin] $args]} } --- 45,67 ---- class_new observable {} ! def* observable init {} { set @subscribers {} } ! def* observable subscribe {observer} { set i [lsearch $@subscribers $observer] if {!$i} {lappend @subscribers $observer} } ! def* observable unsubscribe {observer} { set i [lsearch $@subscribers $observer] if {$i} {set @subscribers [lreplace $@subscribers $i $i]} } ! def* observable changed {args} { foreach x $@subscribers {eval [concat [list $x notice $self] $args]} } ! def* observable child_changed {origin args} { foreach x $@subscribers {eval [concat [list $x notice $origin] $args]} } *************** *** 142,145 **** --- 142,146 ---- set cmdline(icons) icons set cmdline(gdb) 1 + set cmdline(gdbconsole) 1 set cmdline(valgrind) 0 set files_to_open {} *************** *** 150,156 **** switch -regexp -- $o { ^-console\$ {incr i; set cmdline(console) [lindex $argv $i]} ! ^-gdb\$ {set cmdline(gdb) 1} ^-nogdb\$ {set cmdline(gdb) 0} ! ^-valgrind\$ {set cmdline(valgrind) 1} ^-novalgrind\$ {set cmdline(valgrind) 0} ^- {puts "ERROR: command line argument: unknown $o"} --- 151,159 ---- switch -regexp -- $o { ^-console\$ {incr i; set cmdline(console) [lindex $argv $i]} ! ^-gdb\$ {set cmdline(gdb) 1} ^-nogdb\$ {set cmdline(gdb) 0} ! ^-gdbconsole\$ {set cmdline(gdbconsole) 1} ! ^-nogdbconsole\$ {set cmdline(gdbconsole) 0} ! ^-valgrind\$ {set cmdline(valgrind) 1} ^-novalgrind\$ {set cmdline(valgrind) 0} ^- {puts "ERROR: command line argument: unknown $o"} *************** *** 326,335 **** } { if {$cmdline(gdb)} { ! set gdb [open "| gdb" w+] ! fconfigure $gdb -blocking 0 -buffering none ! puts $gdb "file pd" ! puts $gdb "run -guiport 13666" ! flush $gdb ! after 0 poll_gdb } { exec pd -guiport 13666 & --- 329,342 ---- } { if {$cmdline(gdb)} { ! if {$cmdline(console) && $cmdline(gdbconsole)} { ! set gdb [open "| gdb 2&>1" w+] ! fconfigure $gdb -blocking 0 -buffering none ! puts $gdb "file pd" ! puts $gdb "run -guiport 13666" ! flush $gdb ! after 0 poll_gdb ! } { ! exec gdb --tui --args pd -guiport 13666 & ! } } { exec pd -guiport 13666 & *************** *** 654,659 **** } ! class_new canvas def* canvas init {width height geometry editable} { global pd_opendir pd_tearoff OS cmdline canvasmenu focus set name .x$self --- 661,667 ---- } ! class_new canvas {view} def* canvas init {width height geometry editable} { + super global pd_opendir pd_tearoff OS cmdline canvasmenu focus set name .x$self *************** *** 1055,1058 **** --- 1063,1067 ---- class_new objectbox {textbox} def objectbox init {args} { + super global font look set @valid 0 *************** *** 1170,1173 **** --- 1179,1187 ---- #def* canvas del {i} {lset @children $i ""} + def* canvas children= {children} { + # think of the children!!! + set @children $children + } + def* canvas add {obj} { set i [lsearch $@children $obj] *************** *** 1822,1853 **** #set fields(msg) ! # @class ? @_class ! set classinfo(obj) {Object objectbox} ! set classinfo(tgl) {Toggle toggle} ! set classinfo(bng) {Bang bang} ! set classinfo(nbx) {Numberbox numbox} ! set classinfo(hsl) {Slider slider} ! set classinfo(hradio) {Radiobutton radio} ! set classinfo(vu) {Vumeter vu} ! set classinfo(cnv) {Canvas cnv} ! set classinfo(dropper) {Dropper dropper} set classinfo(vsl) $classinfo(hsl) set classinfo(vradio) $classinfo(hradio) set classinfo(hdl) $classinfo(hradio) set classinfo(vdl) $classinfo(hradio) proc update_object {x d} { ! global _ fields set d [string trimright $d "\n"] set d [string trimright $d ";"] set i 1 set class [lindex $d $i] ! switch -- $class {obj {set i 4; set class [lindex $d 4]}} if {![info exists _($x:_class)]} { if {[info exists classinfo($class)]} { ! set _($x:_class) $classinfo($class) } { set _($x:_class) objectbox } puts "_($x:_class)=$_($x:_class)" if {[info exists _($x:canvas)]} { --- 1836,1875 ---- #set fields(msg) ! # @class {@_class} ! set classinfo(obj) {objectbox} ! set classinfo(tgl) {toggle} ! set classinfo(bng) {bang} ! set classinfo(nbx) {numbox} ! set classinfo(hsl) {slider} ! set classinfo(hradio) {radio} ! set classinfo(vu) {vu} ! set classinfo(dropper) {dropper} set classinfo(vsl) $classinfo(hsl) set classinfo(vradio) $classinfo(hradio) set classinfo(hdl) $classinfo(hradio) set classinfo(vdl) $classinfo(hradio) + set classinfo(canvas) {canvas} + set classinfo(cnv) {cnv} proc update_object {x d} { ! global _ fields classinfo set d [string trimright $d "\n"] set d [string trimright $d ";"] set i 1 set class [lindex $d $i] ! switch -- $class { ! canvas {set class canvas} ! obj {set i 4; set class [lindex $d 4]} ! } if {![info exists _($x:_class)]} { + post "class=%s" $class if {[info exists classinfo($class)]} { ! post BLAH ! set _($x:_class) [lindex $classinfo($class) 0] } { + post BLEH set _($x:_class) objectbox } + $x init puts "_($x:_class)=$_($x:_class)" if {[info exists _($x:canvas)]} { *************** *** 1879,1882 **** --- 1901,1905 ---- incr i } + $x changed } *************** *** 2268,2272 **** class_new bang {view} ! #def bang init {} {} def bang draw {canvas} { --- 2291,2295 ---- class_new bang {view} ! #def bang init {} {super} def bang draw {canvas} { *************** *** 2588,2592 **** listener_new .tcl "Tcl" {tcl_eval} listener_new .pd "Pd" {pd_eval} ! if {$cmdline(gdb)} {listener_new .gdb "Gdb" {gdb_eval}} } --- 2611,2615 ---- listener_new .tcl "Tcl" {tcl_eval} listener_new .pd "Pd" {pd_eval} ! if {$cmdline(gdb) && $cmdline(gdbconsole)} {listener_new .gdb "Gdb" {gdb_eval}} }

1 0

pd/src desire.c,1.1.2.44,1.1.2.45
by Mathieu Bouchard 29 Oct '05

29 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31709 Modified Files: Tag: devel_0_39 desire.c Log Message: DUH Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.44 retrieving revision 1.1.2.45 diff -C2 -d -r1.1.2.44 -r1.1.2.45 *** desire.c 29 Oct 2005 17:16:10 -0000 1.1.2.44 --- desire.c 29 Oct 2005 17:28:11 -0000 1.1.2.45 *************** *** 165,169 **** void manager_notice (t_gobj *self_, t_gobj *origin, int argc, t_atom *argv) { ! t_manager *self = (t_manager *)self; LS t_appendix *a = (t_appendix *)origin->g_adix; --- 165,169 ---- void manager_notice (t_gobj *self_, t_gobj *origin, int argc, t_atom *argv) { ! t_manager *self = (t_manager *)self_; LS t_appendix *a = (t_appendix *)origin->g_adix;

1 0

pd/src desire.c,1.1.2.43,1.1.2.44
by Mathieu Bouchard 29 Oct '05

29 Oct '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29602 Modified Files: Tag: devel_0_39 desire.c Log Message: please help me! cosmic bug in the following code Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.43 retrieving revision 1.1.2.44 diff -C2 -d -r1.1.2.43 -r1.1.2.44 *** desire.c 29 Oct 2005 16:01:06 -0000 1.1.2.43 --- desire.c 29 Oct 2005 17:16:10 -0000 1.1.2.44 *************** *** 25,28 **** --- 25,30 ---- #define L fprintf(stderr,"%s:%d in %s\n",__FILE__,__LINE__,__PRETTY_FUNCTION__); + #define LS fprintf(stderr,"%s:%d in %s (self=%lx\n",__FILE__,__LINE__,__PRETTY_FUNCTION__,(long)self);\ + fprintf(stderr,"class=%s)\n",((t_gobj *)self)->g_pd->c_name->s_name); #define sys_vgui(args...) do { \ fprintf(stderr,"\e[0;1;31m"); \ *************** *** 91,94 **** --- 93,97 ---- for (i=0; i<d->nobs; i++) { t_gobj *obs = d->obs[i]; + fprintf(stderr,"obs=%lx\n",(long)obs); t_notice ice = obs->g_pd->c_notice; if (ice) ice(obs,origin,argc,argv); *************** *** 108,112 **** t_queue *queue_new (void) { ! t_queue *self = (t_queue *)malloc(sizeof(t_queue)); self->start = self->len = 0; return self; --- 111,115 ---- t_queue *queue_new (void) { ! t_queue *self = (t_queue *)getbytes(sizeof(t_queue)); self->start = self->len = 0; return self; *************** *** 147,154 **** static t_class *manager_class; ! t_manager *manager; ! void manager_call (void *foo) {L t_manager *self = (t_manager *)foo; while (!queue_empty(self->q)) { t_gobj *o = (t_gobj *)queue_get(self->q); --- 150,158 ---- static t_class *manager_class; ! static t_manager *manager; ! void manager_call (void *foo) { t_manager *self = (t_manager *)foo; + LS while (!queue_empty(self->q)) { t_gobj *o = (t_gobj *)queue_get(self->q); *************** *** 160,165 **** } ! void manager_notice (t_gobj *self_, t_gobj *origin, int argc, t_atom *argv) {L t_manager *self = (t_manager *)self; t_appendix *a = (t_appendix *)origin->g_adix; if (!a->dirtyc) { --- 164,170 ---- } ! void manager_notice (t_gobj *self_, t_gobj *origin, int argc, t_atom *argv) { t_manager *self = (t_manager *)self; + LS t_appendix *a = (t_appendix *)origin->g_adix; if (!a->dirtyc) { *************** *** 170,175 **** } ! t_manager *manager_new (t_symbol *s, int argc, t_atom *argv) {L t_manager *self = (t_manager *)pd_new(manager_class); self->super.g_adix = appendix_new((t_gobj *)self); self->q = queue_new(); --- 175,181 ---- } ! t_manager *manager_new (t_symbol *s, int argc, t_atom *argv) { t_manager *self = (t_manager *)pd_new(manager_class); + LS self->super.g_adix = appendix_new((t_gobj *)self); self->q = queue_new(); *************** *** 179,183 **** } ! void manager_free (t_manager *self) {L clock_free(self->clock); queue_free(self->q); --- 185,190 ---- } ! void manager_free (t_manager *self) { ! LS clock_free(self->clock); queue_free(self->q); *************** *** 13407,13415 **** t_canvas *self = (t_canvas *)x; post("canvas_notice(%p,%p,%d,...): havewindow=%d mapped=%d",x,origin,argc,self->gl_havewindow,self->gl_mapped); ! // if (self->gl_havewindow /* && self->gl_mapped */) { ! // manager_notice(manager,origin,argc,argv); ! // } else { ! gobj_changed3(self,origin,argc,argv); ! // } } --- 13414,13418 ---- t_canvas *self = (t_canvas *)x; post("canvas_notice(%p,%p,%d,...): havewindow=%d mapped=%d",x,origin,argc,self->gl_havewindow,self->gl_mapped); ! gobj_changed3(self,origin,argc,argv); } *************** *** 13514,13518 **** void desire_setup(void) { manager_class = class_new(gensym("__manager"), (t_newmethod)manager_new, ! (t_method)manager_free, sizeof(t_manager), CLASS_NOINLET, A_GIMME, 0); class_setnotice(manager_class,manager_notice); manager = manager_new(0,0,0); --- 13517,13521 ---- void desire_setup(void) { manager_class = class_new(gensym("__manager"), (t_newmethod)manager_new, ! (t_method)manager_free, sizeof(t_manager), CLASS_GOBJ, A_GIMME, 0); class_setnotice(manager_class,manager_notice); manager = manager_new(0,0,0);

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 October 2005