Pd-cvs April 2006

pd-cvs@lists.iem.at

15 participants
271 discussions

pd/src m_pd.h,1.4.4.11.2.23,1.4.4.11.2.24
by Mathieu Bouchard 23 Apr '06

23 Apr '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13399 Modified Files: Tag: devel_0_39 m_pd.h Log Message: adding hash_free Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.23 retrieving revision 1.4.4.11.2.24 diff -C2 -d -r1.4.4.11.2.23 -r1.4.4.11.2.24 *** m_pd.h 23 Apr 2006 06:24:38 -0000 1.4.4.11.2.23 --- m_pd.h 23 Apr 2006 06:34:44 -0000 1.4.4.11.2.24 *************** *** 167,170 **** --- 167,171 ---- typedef void (*hash_iter)(void *data, hashkey k, hashvalue v); t_hash * hash_new(long capa); + void hash_free(t_hash *self); long hash_size(t_hash *self); void hash_start(t_hash *self);

1 0

pd/src m_pd.h,1.4.4.11.2.22,1.4.4.11.2.23
by Mathieu Bouchard 23 Apr '06

23 Apr '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7501 Modified Files: Tag: devel_0_39 m_pd.h Log Message: errata previous commit Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.22 retrieving revision 1.4.4.11.2.23 diff -C2 -d -r1.4.4.11.2.22 -r1.4.4.11.2.23 *** m_pd.h 23 Apr 2006 06:22:28 -0000 1.4.4.11.2.22 --- m_pd.h 23 Apr 2006 06:24:38 -0000 1.4.4.11.2.23 *************** *** 199,204 **** t_atom dirtyv[3]; } t_appendix; ! t_appendix *appendix_new (t_gobj *master); ! void appendix_free(t_gobj *self); #endif --- 199,204 ---- t_atom dirtyv[3]; } t_appendix; ! t_appendix *appendix_new (struct _gobj *master); ! void appendix_free(struct _gobj *self); #endif

1 0

pd/src desire.c, 1.1.2.72, 1.1.2.73 m_pd.h, 1.4.4.11.2.21, 1.4.4.11.2.22
by Mathieu Bouchard 23 Apr '06

23 Apr '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5883 Modified Files: Tag: devel_0_39 desire.c m_pd.h Log Message: public appendix allocators. you shouldn't use them yourself, but... Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.21 retrieving revision 1.4.4.11.2.22 diff -C2 -d -r1.4.4.11.2.21 -r1.4.4.11.2.22 *** m_pd.h 22 Apr 2006 00:43:40 -0000 1.4.4.11.2.21 --- m_pd.h 23 Apr 2006 06:22:28 -0000 1.4.4.11.2.22 *************** *** 199,202 **** --- 199,204 ---- t_atom dirtyv[3]; } t_appendix; + t_appendix *appendix_new (t_gobj *master); + void appendix_free(t_gobj *self); #endif Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.72 retrieving revision 1.1.2.73 diff -C2 -d -r1.1.2.72 -r1.1.2.73 *** desire.c 23 Apr 2006 05:48:03 -0000 1.1.2.72 --- desire.c 23 Apr 2006 06:22:28 -0000 1.1.2.73 *************** *** 67,70 **** --- 67,74 ---- } + void appendix_free (t_gobj *self) { + free(self); + } + /* subscribing N spies takes N*N time, but it's not important for now */ void gobj_subscribe (t_gobj *self, t_gobj *observer) {

1 0

pd/src TODO,1.1.2.5,1.1.2.6 ChangeLog,1.1.4.2,1.1.4.3
by Mathieu Bouchard 23 Apr '06

23 Apr '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18846 Modified Files: Tag: devel_0_39 TODO ChangeLog Log Message: . Index: TODO =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/TODO,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** TODO 5 Nov 2005 18:34:32 -0000 1.1.2.5 --- TODO 23 Apr 2006 05:49:45 -0000 1.1.2.6 *************** *** 1,4 **** DesireData's TODO list, $Id$ ! ---------------------------- [h] means for Chun [m] means for Matju --- 1,4 ---- DesireData's TODO list, $Id$ ! [h] means for Chun [m] means for Matju *************** *** 14,27 **** - dash rect - done [h] wires 0.39.A: - [h] remove Chun's hack so that the objectboxes are created server-side first. [m] sort thru old TODO list (0.37.B and 0.37.C) ! ! ! ------------------8<--------cut-here--------8<------------------ --- 14,38 ---- - dash rect - done [h] wires + [h] rename box to Box and so on + [h] replace [Whatever_new] by [Whatever new] 0.39.A: [m] sort thru old TODO list (0.37.B and 0.37.C) + [m] fix GDB connection problem + [m] fix test.pd [bng] segfault problem + ------------------8<--------cut-here--------8<------------------ + matju's devel_0_39 TODO list ! [ ] scons doing weird things with ~/.kde/ and stuff ! [ ] portaudio : src/s_audio_pablio.h:49:24: ringbuffer.h: No such file or directory ! [ ] without portaudio : ! src/s_audio_jack.c: In function `jack_open_audio': ! src/s_audio_jack.c:368: error: `copyvec_simd' undeclared (first use in this function) ! [ ] audio stuck, closing audio ! [ ] simd ! [ ] fftw ! [ ] test suite ------------------8<--------cut-here--------8<------------------ *************** *** 31,35 **** * <numberat> is there a way to make non-gui objects appear on a GOP? - * printf's unused chars: "!\"&(),/:;<=>?@BDHJKMNOPQRTUVWYZ[\\]^_`bkmrvwy{|}~" * receive-symbols are fucked ? * send-symbols are fucked ? --- 42,45 ---- *************** *** 229,230 **** --- 239,307 ---- [ ] command for unpatcherizing a subpatch or abstraction (useful for making variants) + + + ------------------8<--------cut-here--------8<------------------ + Dec 26 2005 + + 1.1. a OutByteStream object is one that accepts those messages on inlet 0: + * float: seen as a byte (0..255) + * list of floats: seen as a sequence of float messages. + * symbol: seen as a \0-terminated string. + * bang: forces buffer-flushing if there's a buffer. + + 1.2. a OutByteStream object may also optionally respond to string + messages, in my dreams. However, in the meanwhile, it may be more + appropriate to use a new special C function that accepts a pair of + int and const char * (\0 is not honored: the int specifies the size). + This is so that there is no speed disincentive to switch to decoupled + I/O objects. + + 2.1. an InByteStream object is one that accepts those messages on inlet 0: + * bang: polls for more input (unlimited size). + * float: treated as int. polls for at most N bytes. + * auto 0: requires bang for getting more input. + * auto 1: uses a t_clock (hidden [metro]) for auto-polling. + + 2.2. an InByteStream may produce those messages: + * float: seen as a byte (0..255) + * list of floats: seen as a sequence of float messages. + + and when in "auto 0" mode, it will only send it when receiving a bang or + float. + + 2.2. an InByteStream object may also optionally produce string + messages, in my dreams, etc. What would the C function(s) look like + in this case? + + 3. an IOByteStream object is just an InByteStream object and an + OutByteStream object at the same time. There is no conflict between the + two. + + 4. there would be object classes called [tcp] and [udp] which would be + InputOutputStream objects (supporting in, out and bidi connections). + They would also respond to "connect" and "disconnect" (or maybe "open" + and "close" instead) and also "listen" for enabling server mode. + + 5. there would be an object class called [fudiin] which would be an + OutByteStream and [fudiout] which would be an InByteStream. Thus, to get a + bidirectional [netsend] [netreceive], use this triad: + + | + [fudiout] + | + [tcp] + | + [fudiin] + | + + Leaving out the first or the last object gives you [netsend] and + [netreceive] respectively. + + 6. a [tcp]<->[fudiin] pair can replace the server-side of the GUI + connection as long as the [tcp] object supports char* input as + suggested in part 1.2. (if the rest of this proposal is not + implemented, then use a slightly modified [netreceive] instead) + + + + ------------------8<--------cut-here--------8<------------------ Index: ChangeLog =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/ChangeLog,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -C2 -d -r1.1.4.2 -r1.1.4.3 *** ChangeLog 11 Sep 2005 23:37:33 -0000 1.1.4.2 --- ChangeLog 23 Apr 2006 05:49:45 -0000 1.1.4.3 *************** *** 4,8 **** * merged into the devel branch; enable with scons desire=1, which disables lots of g_*.c files and enables desire.c; use the std devel gui using desire=0. ! * added proc def, which hides the self arg and turns @foo into _($self:foo) * run the client to start the server and not the other way around: do wish desire.tk * the client can make the server start via GDB --- 4,10 ---- * merged into the devel branch; enable with scons desire=1, which disables lots of g_*.c files and enables desire.c; use the std devel gui using desire=0. ! * added an object-oriented programming system in desire.tk (do not confuse ! with a dataflow system). ! * added proc unknown, which allows subject-verb-complement method-calling in tcl * run the client to start the server and not the other way around: do wish desire.tk * the client can make the server start via GDB

1 0

pd/src desire.c, 1.1.2.71, 1.1.2.72 desire.tk, 1.1.2.186, 1.1.2.187
by Mathieu Bouchard 23 Apr '06

23 Apr '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17779 Modified Files: Tag: devel_0_39 desire.c desire.tk Log Message: . Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.186 retrieving revision 1.1.2.187 diff -C2 -d -r1.1.2.186 -r1.1.2.187 *** desire.tk 23 Apr 2006 02:13:29 -0000 1.1.2.186 --- desire.tk 23 Apr 2006 05:48:04 -0000 1.1.2.187 *************** *** 530,534 **** # a menuable must be a View class_new Menuable {} ! def* Menuable init {args} { eval [concat [list super] $args] set @accel {} --- 530,534 ---- # a menuable must be a View class_new Menuable {} ! def Menuable init {args} { eval [concat [list super] $args] set @accel {} *************** *** 882,886 **** def* Canvas eval% {code} { ! mset x y $@curpos regsub -all %X $code $x code regsub -all %Y $code $y code --- 882,886 ---- def* Canvas eval% {code} { ! mset {x y} $@curpos regsub -all %X $code $x code regsub -all %Y $code $y code *************** *** 1294,1298 **** class_new TextBox {Box} ! def* TextBox draw {} { # TEXT = the text label # text = the input text field --- 1294,1298 ---- class_new TextBox {Box} ! def TextBox draw {} { # TEXT = the text label # text = the input text field *************** *** 1302,1306 **** mset {x1 y1} [$self xy] puts "x1=$x1 y1=$y1" ! puts "!!!!edit = $@edit!!!!" if {$@edit} { set t .$(a)canvas.c.${self}text --- 1302,1306 ---- mset {x1 y1} [$self xy] puts "x1=$x1 y1=$y1" ! # puts "!!!!edit = $@edit!!!!" if {$@edit} { set t .$(a)canvas.c.${self}text *************** *** 1359,1363 **** } ! def* TextBox update_size {} { global font look set @textwidth [expr $font(padx)+$font(width)*([string length $@text]+$@edit)] --- 1359,1363 ---- } ! def TextBox update_size {} { global font look set @textwidth [expr $font(padx)+$font(width)*([string length $@text]+$@edit)] *************** *** 1390,1394 **** } ! def* ObjectBox draw {} { $self update_size set xs $@xs --- 1390,1394 ---- } ! def ObjectBox draw {} { $self update_size set xs $@xs *************** *** 2383,2387 **** def* MessageBox init {args} { ! puts "!!!!!! args:$args" super set @w 15 --- 2383,2387 ---- def* MessageBox init {args} { ! # puts "!!!!!! args:$args" super set @w 15 *************** *** 2765,2769 **** class_new Bang {BlueBox} def Bang init {args} { - puts "!!!!!! args:$args" super set @w 15 --- 2765,2768 ---- Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.71 retrieving revision 1.1.2.72 diff -C2 -d -r1.1.2.71 -r1.1.2.72 *** desire.c 22 Apr 2006 03:41:13 -0000 1.1.2.71 --- desire.c 23 Apr 2006 05:48:03 -0000 1.1.2.72 *************** *** 26,39 **** #ifdef _MSC_VER /* ! #define L fprintf(stderr,"%s:%d\n",__FILE__,__LINE__); ! #define LS fprintf(stderr,"%s:%d (self=%lx\n",__FILE__,__LINE__,(long)self);\ ! fprintf(stderr,"class=%s)\n",((t_gobj *)self)->g_pd->c_name->s_name); */ /* no sys_vgui logging for MSVC... we have no vararg macros */ #else ! #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); /* --- 26,39 ---- #ifdef _MSC_VER /* ! #define L printf("%s:%d\n",__FILE__,__LINE__); ! #define LS printf("%s:%d (self=%lx\n",__FILE__,__LINE__,(long)self);\ ! printf("class=%s)\n",((t_gobj *)self)->g_pd->c_name->s_name); */ /* no sys_vgui logging for MSVC... we have no vararg macros */ #else ! #define L printf("%s:%d in %s\n",__FILE__,__LINE__,__PRETTY_FUNCTION__); ! #define LS printf("%s:%d in %s (self=%lx\n",__FILE__,__LINE__,__PRETTY_FUNCTION__,(long)self);\ ! printf("class=%s)\n",((t_gobj *)self)->g_pd->c_name->s_name); /* *************** *** 109,113 **** t_gobj *obs = d->obs[i]; t_notice ice = obs->g_pd->c_notice; ! //fprintf(stderr,"obs=%lx\n",(long)obs); if (ice) ice(obs,origin,argc,argv); else post("null func ptr for class %s",self->g_pd->c_name->s_name); --- 109,113 ---- t_gobj *obs = d->obs[i]; t_notice ice = obs->g_pd->c_notice; ! //printf("obs=%lx\n",(long)obs); if (ice) ice(obs,origin,argc,argv); else post("null func ptr for class %s",self->g_pd->c_name->s_name); *************** *** 132,135 **** --- 132,139 ---- void queue_put (t_queue *self, void *stuff) { + char *buf; int bufn; + t_binbuf *b = ((t_text *)stuff)->te_binbuf; + if (b) {char *buf; int bufn; binbuf_gettext(b,&buf,&bufn); printf("queue_put [%.*s]\n",bufn,buf);} + else {printf("queue_put (%s)\n",(*(t_pd*)stuff)->c_name->s_name);} if (self->len==QUEUE_SIZE) {bug("queue full"); return;} self->o[(self->start+self->len)%QUEUE_SIZE] = stuff; *************** *** 139,147 **** void *queue_get (t_queue *self) { ! void *r = self->o[self->start]; self->start = (self->start+1)%QUEUE_SIZE; self->len--; //post("queue_get: items in queue: %d",self->len); ! return r; } --- 143,155 ---- void *queue_get (t_queue *self) { ! void *stuff = self->o[self->start]; ! t_binbuf *b; self->start = (self->start+1)%QUEUE_SIZE; self->len--; //post("queue_get: items in queue: %d",self->len); ! b = ((t_text *)stuff)->te_binbuf; ! if (b) {char *buf; int bufn; binbuf_gettext(b,&buf,&bufn); printf("queue_get [%.*s]\n",bufn,buf);} ! else {printf("queue_get (%s)\n",(*(t_pd*)stuff)->c_name->s_name);} ! return stuff; } *************** *** 293,297 **** post("subscribe %lx",(long)x); gobj_subscribe((t_gobj *)x,(t_gobj *)manager); ! gobj_changed(x,""); } } --- 301,305 ---- post("subscribe %lx",(long)x); gobj_subscribe((t_gobj *)x,(t_gobj *)manager); ! gobj_changed(x,0); } } *************** *** 479,483 **** ((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); } --- 487,494 ---- ((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); ! } } *************** *** 849,853 **** post("******subscribe %lx",(long)x); gobj_subscribe((t_gobj *)x,(t_gobj *)manager); ! gobj_changed(x,""); } } else { /* make invisible */ --- 860,864 ---- post("******subscribe %lx",(long)x); gobj_subscribe((t_gobj *)x,(t_gobj *)manager); ! gobj_changed(x,0); } } else { /* make invisible */ *************** *** 3585,3590 **** post ("%d %d %d %d", whoout2, outno, whoin2, inno); post("canvas_connect: objsrc=%d outno=%d objsink=%d inno=%d",objsrc,outno,objsink,inno); ! sys_mgui((t_canvas *)x,"wires_new","iiii", whoout2, outno, whoin2, inno); ! gobj_changed(x,""); if (!(oc = obj_connect(objsrc, outno, objsink, inno))) goto bad; if (glist_isvisible(x)) --- 3596,3602 ---- post ("%d %d %d %d", whoout2, outno, whoin2, inno); post("canvas_connect: objsrc=%d outno=%d objsink=%d inno=%d",objsrc,outno,objsink,inno); ! // shouldn't use sys_mgui because it interferes with the queue ! // sys_mgui((t_canvas *)x,"wires_new","iiii", whoout2, outno, whoin2, inno); ! gobj_changed(x,0); if (!(oc = obj_connect(objsrc, outno, objsink, inno))) goto bad; if (glist_isvisible(x)) *************** *** 5261,5269 **** char *buf; int bufn; binbuf_gettext(((t_text *)y)->te_binbuf,&buf,&bufn); ! fprintf(stderr,"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,""); y->g_next = 0; if (!x->gl_list) x->gl_list = y; --- 5273,5281 ---- char *buf; int bufn; binbuf_gettext(((t_text *)y)->te_binbuf,&buf,&bufn); ! 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); y->g_next = 0; if (!x->gl_list) x->gl_list = y; *************** *** 5274,5278 **** y2->g_next = y; } ! gobj_changed(x,""); /* voodoo */ /* if (x->gl_editor && (ob = pd_checkobject(&y->g_pd))) rtext_new(x, ob); */ --- 5286,5290 ---- y2->g_next = y; } ! gobj_changed(x,0); /* voodoo */ /* if (x->gl_editor && (ob = pd_checkobject(&y->g_pd))) rtext_new(x, ob); */ *************** *** 11003,11006 **** --- 11015,11019 ---- } if (!x) x = (t_text *)pd_new(text_class); + sys_vgui("global _; set _(%x:canvas) %lx\n",(long)x,(long)gl); x->te_binbuf = b; x->te_xpix = xpix; *************** *** 11675,11679 **** } ! #define NEXT p=va_arg(val,void*); /*fprintf(stderr,"p=%p\n",p);*/ int pd_vscanargs(int argc, t_atom *argv, char *fmt, va_list val) { int i=0; --- 11688,11692 ---- } ! #define NEXT p=va_arg(val,void*); /*printf("p=%p\n",p);*/ int pd_vscanargs(int argc, t_atom *argv, char *fmt, va_list val) { int i=0; *************** *** 11805,11808 **** --- 11818,11822 ---- } binbuf_gettext(buf,&s,&n); + if (s[n-1]=='\n') n--; sys_vgui("update_object x%lx {%.*s}\n", (long)self,n,s); sys_mgui(self,"ninlets=" ,"i", obj_ninlets((t_text *)self));

1 0

pd/src desire.tk,1.1.2.185,1.1.2.186
by chunlee 23 Apr '06

23 Apr '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16623 Modified Files: Tag: devel_0_39 desire.tk Log Message: added nested tabs for ddrc config gui, see class SubPagedDialog Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.185 retrieving revision 1.1.2.186 diff -C2 -d -r1.1.2.185 -r1.1.2.186 *** desire.tk 22 Apr 2006 17:30:48 -0000 1.1.2.185 --- desire.tk 23 Apr 2006 02:13:29 -0000 1.1.2.186 *************** *** 737,741 **** foreach {word1 word2 word3} $line { - puts "word:: $word1 | $word2 | $word3" set word1 [string replace $word1 0 0] --- 737,740 ---- *************** *** 743,753 **** look { set look($word2) $word3 ! puts "look($word2) $word3" } font { ! puts "settings for font" } default { ! puts "settings for something" } } --- 742,752 ---- look { set look($word2) $word3 ! #puts "look($word2) $word3" } font { ! #puts "settings for font" } default { ! #puts "settings for something" } } *************** *** 3422,3427 **** frame $f pack [label $f.label -text $label] -side left - - #button .$f.color_chooser -bg [tk_chooseColor -initialcolor gray -title "Choose color"] button $f.color_chooser -bg $look($name) -activebackground $look($name) -command "color_popup $f $look($name)" \ -width 17 --- 3421,3424 ---- *************** *** 3429,3432 **** --- 3426,3435 ---- } + subsection { + #frame $f + puts "path ===== $f" + label $f -text $label -bg "#0000aa" -fg "#ffff55" -font {helvetica -10 bold} + #$self add_subsection $f $name + } toggle { frame $f *************** *** 3561,3564 **** --- 3564,3608 ---- } + #def PagedDialog add_subsection {subsection text} { + # set f .$self.1 + # puts "sub :: $subsection" + # frame $subsection + # pack [button $subsection.butt -text $text \ + # -command bell] -side left -pady {4 4} + #} + + class_new SubPagedDialog {Dialog} + + def SubPagedDialog init {} { + #super + set f .$self + frame $f + pack [frame $f.bar] -fill x + pack [frame $f.main -borderwidth 1 -relief raised \ + -width 590 -height 300] -fill both -expand yes + pack $f + } + + def SubPagedDialog page_select {i} { + set f .$self + catch { + $f.bar.$@section configure -relief raised + place forget $f.main.$@section + pack $f.bar.$@section -pady {4 4} + } + set @section $i + place $f.main.$@section -x 0 -y 0 + $f.bar.$@section configure -relief sunken + pack $f.bar.$@section -pady {8 0} + } + + def SubPagedDialog add_section {section text} { + set f .$self + frame $f.main.$section + pack [button $f.bar.$section -text $text \ + -command [list $self page_select $section]] -side left -pady {4 4} + } + + set pdrc_options { section audio "Audio DSP" *************** *** 3700,3705 **** --- 3744,3751 ---- set ddrc_options { section "" "look" + subsection "canvas" "canvas" color canvasbgedit "canvas background (edit mode)" color canvasbgrun "canvas background (run mode)" + subsection "object" "object" color objectframe1 "objectbox color" color objectframe2 "objectbox color" *************** *** 3708,3719 **** color objectbg "object background" color objectfg "object foreground" ! color inletfg "inlet color" ! color outletfg "outlet color" color wirefg "wire color" color wirefg2 "wire highlight" color wiredash "wire dash" ! color selrect "selection box" ! ! } --- 3754,3776 ---- color objectbg "object background" color objectfg "object foreground" ! subsection "wire" "wire" color wirefg "wire color" color wirefg2 "wire highlight" color wiredash "wire dash" ! subsection "others" "others" ! color inletfg "inlet color" ! color outletfg "outlet color" ! color selrect "selection box" ! section "" "poo" ! subsection "poo" "poo" ! color canvasbgedit "canvas background (edit mode)" ! color canvasbgrun "canvas background (run mode)" ! subsection "boo" "boo" ! color objectframe1 "objectbox color" ! color objectframe2 "objectbox color" ! color objectframe3 "objectbox color" ! color objectframe4 "objectbox highlight color" ! color objectbg "object background" ! color objectfg "object foreground" } *************** *** 3775,3782 **** set f .$self.1 set section 0 foreach {type name desc} $ddrc_options { switch $type { void { set type toggle }} switch $type { ! section {$self add_section [incr section] $desc} alias {} radio { --- 3832,3854 ---- set f .$self.1 set section 0 + set subsection 0 foreach {type name desc} $ddrc_options { switch $type { void { set type toggle }} switch $type { ! section { ! set which_section $f.main.$section ! $self add_section [incr section] $desc ! set subsection 0 ! } ! subsection { ! #puts "|| $f.main.$section.$name ||" ! set subself $self.1.main.$section.subsections ! if {!$subsection} {SubPagedDialog new_as $subself} ! $subself add_section [incr subsection] $name ! $subself page_select 1 ! set which_section .$subself.main.$subsection ! #properties_dialog $subself .$subself ClientPrefsDialog_ok client \ ! # [list [lindex $name 0] "$desc" subsection {}] ! } alias {} radio { *************** *** 3785,3789 **** } color { ! properties_dialog $self $f.main.$section ClientPrefsDialog_ok client \ [list [lindex $name 0] "$desc" choice_color {}] } --- 3857,3863 ---- } color { ! #properties_dialog $self $f.main.$section ClientPrefsDialog_ok client \ ! # [list [lindex $name 0] "$desc" choice_color {}] ! properties_dialog $subself $which_section ClientPrefsDialog_ok client \ [list [lindex $name 0] "$desc" choice_color {}] }

1 0

pd/src desire.tk,1.1.2.184,1.1.2.185
by chunlee 22 Apr '06

22 Apr '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15319 Modified Files: Tag: devel_0_39 desire.tk Log Message: fix for $f.popup Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.184 retrieving revision 1.1.2.185 diff -C2 -d -r1.1.2.184 -r1.1.2.185 *** desire.tk 22 Apr 2006 17:25:30 -0000 1.1.2.184 --- desire.tk 22 Apr 2006 17:30:48 -0000 1.1.2.185 *************** *** 3407,3416 **** pack [label $f.label -text [lindex $label 0]] $f -side left # this which is not good, need to sort it out... ! set m [menu .$which -tearoff 0] foreach part [lrange $label 1 end] { $m add command -label $part -command [list dropmenu_set $f $part] ! #radiobutton $f.$i -text $part -value $i -variable _($self:$name) -anchor w ! #pack $f.$i -side top -fill x ! #incr i } label $f.label_set -text "default" -relief raised --- 3407,3414 ---- pack [label $f.label -text [lindex $label 0]] $f -side left # this which is not good, need to sort it out... ! set m [menu $f.$name -tearoff 0] foreach part [lrange $label 1 end] { $m add command -label $part -command [list dropmenu_set $f $part] ! } label $f.label_set -text "default" -relief raised *************** *** 3418,3422 **** pack $f.label_set -side top -fill x # need to sort this out....... ! bind $f.label_set <1> "tk_popup .$which \[expr %X - 100\] %Y" } --- 3416,3420 ---- pack $f.label_set -side top -fill x # need to sort this out....... ! bind $f.label_set <1> "tk_popup $f.$name \[expr %X - 100\] %Y" } *************** *** 3578,3582 **** void -noadc "suppress audio input" alias -noaudio|-nosound {list -nodac -noadc} ! radio {"" -alsa -jack -mmio -portaudio|-pa|-asio -oss} { "Sound API: " "default" --- 3576,3580 ---- void -noadc "suppress audio input" alias -noaudio|-nosound {list -nodac -noadc} ! radio {"audio_popup" -alsa -jack -mmio -portaudio|-pa|-asio -oss} { "Sound API: " "default" *************** *** 3696,3700 **** } ! def ServerPrefsDialog _delete {} {super; catch {destroy .server}} #################### ClientPrefsDialog --- 3694,3698 ---- } ! def ServerPrefsDialog _delete {} {super} #################### ClientPrefsDialog *************** *** 3801,3805 **** } ! def ClientPrefsDialog _delete {} {super; catch {destroy .client}} --- 3799,3803 ---- } ! def ClientPrefsDialog _delete {} {super}

1 0

pd/src desire.tk,1.1.2.183,1.1.2.184
by Mathieu Bouchard 22 Apr '06

22 Apr '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11411 Modified Files: Tag: devel_0_39 desire.tk Log Message: just fixed a problem with current_x -> @curpos Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.183 retrieving revision 1.1.2.184 diff -C2 -d -r1.1.2.183 -r1.1.2.184 *** desire.tk 22 Apr 2006 17:08:42 -0000 1.1.2.183 --- desire.tk 22 Apr 2006 17:25:30 -0000 1.1.2.184 *************** *** 845,850 **** # butt {mset {@x1 @y1} {40 40}} # ctrl { ! # set @x1 $_($canvas:current_x) ! # set @y1 $_($canvas:current_y) # set focus(oldpos) [list $@x1 $@y1]}}} # todo: should compute GOP stuff here --- 845,849 ---- # butt {mset {@x1 @y1} {40 40}} # ctrl { ! # mset {@x1 @y1} $_($canvas:curpos) # set focus(oldpos) [list $@x1 $@y1]}}} # todo: should compute GOP stuff here *************** *** 884,889 **** def* Canvas eval% {code} { ! regsub -all %X $code $@current_x code ! regsub -all %Y $code $@current_y code super $code } --- 883,889 ---- def* Canvas eval% {code} { ! mset x y $@curpos ! regsub -all %X $code $x code ! regsub -all %Y $code $y code super $code }

1 0

pd/src desire.tk,1.1.2.182,1.1.2.183
by Mathieu Bouchard 22 Apr '06

22 Apr '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2389 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed? Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.182 retrieving revision 1.1.2.183 diff -C2 -d -r1.1.2.182 -r1.1.2.183 *** desire.tk 22 Apr 2006 17:01:03 -0000 1.1.2.182 --- desire.tk 22 Apr 2006 17:08:42 -0000 1.1.2.183 *************** *** 3418,3422 **** pack $f.label_set -side top -fill x # need to sort this out....... ! bind $f.label_set <1> {tk_popup .server [expr %X - 100] %Y} } --- 3418,3422 ---- pack $f.label_set -side top -fill x # need to sort this out....... ! bind $f.label_set <1> "tk_popup .$which \[expr %X - 100\] %Y" }

1 0

pd/src desire.tk,1.1.2.181,1.1.2.182
by Mathieu Bouchard 22 Apr '06

22 Apr '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30506 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.181 retrieving revision 1.1.2.182 diff -C2 -d -r1.1.2.181 -r1.1.2.182 *** desire.tk 22 Apr 2006 16:39:11 -0000 1.1.2.181 --- desire.tk 22 Apr 2006 17:01:03 -0000 1.1.2.182 *************** *** 1037,1042 **** set @selection_wire {} set @focus "" ! set @current_x 30 ! set @current_y 30 set @editmode $editable set @select_by "" --- 1037,1041 ---- set @selection_wire {} set @focus "" ! set @curpos {30 30} set @editmode $editable set @select_by "" *************** *** 1586,1590 **** set y [$c canvasy $y] if {$tooltip(visible)} { ! if {[expr [distance [list $tooltip(mx) $tooltip(my)] [list $x $y]] > 10]} { $tooltip(canvas) hide_tooltip } --- 1585,1589 ---- set y [$c canvasy $y] if {$tooltip(visible)} { ! if {[expr [distance $tooltip(curpos) [list $x $y]] > 10]} { $tooltip(canvas) hide_tooltip } *************** *** 1593,1598 **** set @dehighlight {} # backup values ! set ox $@current_x; set @current_x $x ! set oy $@current_y; set @current_y $y if {[llength [$c gettags lnew]]} { mset {ox1 oy1 ox2 oy2} [lrange [$c coords lnew] end-3 end] --- 1592,1597 ---- set @dehighlight {} # backup values ! set oldpos $@curpos ! set @curpos [list $x $y] if {[llength [$c gettags lnew]]} { mset {ox1 oy1 ox2 oy2} [lrange [$c coords lnew] end-3 end] *************** *** 3165,3170 **** ############ tooltips ! set tooltip(mx) -1000 ! set tooltip(my) -1000 set tooltip(canvas) "" set tooltip(visible) 0 --- 3164,3168 ---- ############ tooltips ! set tooltip(curpos) {-1000 -1000} set tooltip(canvas) "" set tooltip(visible) 0 *************** *** 3188,3193 **** -fill "#ffffcc" -outline "#000000" -tags tooltip_bg $c lower tooltip_bg tooltip_fg ! set tooltip(mx) $@current_x ! set tooltip(my) $@current_y set tooltip(canvas) $self set tooltip(visible) 1 --- 3186,3190 ---- -fill "#ffffcc" -outline "#000000" -tags tooltip_bg $c lower tooltip_bg tooltip_fg ! set tooltip(curpos) $@curpos set tooltip(canvas) $self set tooltip(visible) 1 *************** *** 3209,3213 **** def ClassBrowser init {name} { set @name $name ! pd "pd update-path ; pd update-class-list $self list_callback" } --- 3206,3211 ---- def ClassBrowser init {name} { set @name $name ! pd pd update-path ! pd pd update-class-list $self list_callback } *************** *** 3243,3246 **** --- 3241,3251 ---- } + def ClassBrowser info {} { + set f .$self.cl + set i [$f.1 curselection] + set class [$f.1 get $i] + pd pd update-class-info $class $self info_callback + } + def ClassBrowser list_callback {} { global class_list *************** *** 3251,3257 **** pack [frame $f] -side top -fill both -expand yes pack [label .browser.title -text ""] -side top ! listbox $f.1 -width 30 -height 10 -yscrollcommand "$f.2 set" scrollbar $f.2 -command "$f.1 yview" ! text $f.3 -width 30 -height 10 -yscrollcommand "$f.4 set" scrollbar $f.4 -command "$f.3 yview" --- 3256,3262 ---- pack [frame $f] -side top -fill both -expand yes pack [label .browser.title -text ""] -side top ! listbox $f.1 -width 40 -height 20 -yscrollcommand "$f.2 set" scrollbar $f.2 -command "$f.1 yview" ! text $f.3 -width 40 -height 20 -yscrollcommand "$f.4 set" scrollbar $f.4 -command "$f.3 yview" *************** *** 3272,3284 **** pack $b -side bottom -fill x -expand no $self fill_box "" ! bind $f.1 <Button-1> { ! after 1 { ! set self browser ! set f .$self.cl ! set i [$f.1 curselection] ! set class [$f.1 get $i] ! pd pd update-class-info $class $self info_callback ! } ! } #bind $b.2 <KeyPress> {after 1 " $self fill_box [.browser.butt.2 get]"} bind $b.2 <KeyPress> {after 1 "browser fill_box \[.browser.butt.2 get\]"} --- 3277,3281 ---- pack $b -side bottom -fill x -expand no $self fill_box "" ! bind $f.1 <Button-1> "after 1 \"$self info\"" #bind $b.2 <KeyPress> {after 1 " $self fill_box [.browser.butt.2 get]"} bind $b.2 <KeyPress> {after 1 "browser fill_box \[.browser.butt.2 get\]"}

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
28
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 April 2006