Pd-cvs September 2005

pd-cvs@lists.iem.at

10 participants
189 discussions

pd/src desire.c,1.1.2.27,1.1.2.28
by Mathieu Bouchard 24 Sep '05

24 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22960 Modified Files: Tag: devel_0_39 desire.c Log Message: . Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.27 retrieving revision 1.1.2.28 diff -C2 -d -r1.1.2.27 -r1.1.2.28 *** desire.c 24 Sep 2005 03:54:20 -0000 1.1.2.27 --- desire.c 24 Sep 2005 08:29:38 -0000 1.1.2.28 *************** *** 5278,5282 **** y->g_next = 0; pd_upload(y); ! sys_mgui(y,"draw",""); if (!x->gl_list) x->gl_list = y; else --- 5278,5282 ---- y->g_next = 0; pd_upload(y); ! /* sys_mgui(y,"draw","");*/ if (!x->gl_list) x->gl_list = y; else *************** *** 5443,5464 **** t_gobj *g = 0, *g9 = 0; float f1 = 0, f2 = 0; ! if (g1) ! f1 = gobj_getxforsort(g1); ! if (g2) ! f2 = gobj_getxforsort(g2); while (1) { ! if (g1) ! { ! if (g2) ! { ! if (f1 <= f2) ! goto put1; ! else goto put2; ! } ! else goto put1; ! } ! else if (g2) ! goto put2; else break; put1: --- 5443,5453 ---- t_gobj *g = 0, *g9 = 0; float f1 = 0, f2 = 0; ! if (g1) f1 = gobj_getxforsort(g1); ! if (g2) f2 = gobj_getxforsort(g2); while (1) { ! if (g1) { ! if (g2 && f1>f2) goto put2; else goto put1; ! } else if (g2) goto put2; else break; put1: *************** *** 5480,5489 **** } ! static t_gobj *glist_dosort(t_glist *x, ! t_gobj *g, int nitems) { ! if (nitems < 2) ! return (g); ! else { int n1 = nitems/2, n2 = nitems - n1, i; --- 5469,5475 ---- } ! static t_gobj *glist_dosort(t_glist *x, t_gobj *g, int nitems) { ! if (nitems < 2) return g; { int n1 = nitems/2, n2 = nitems - n1, i; *************** *** 12350,12359 **** case 'i': NEXT; *(int*)p = atom_getintarg(i,argc,argv); break; case 'b': NEXT; *(int*)p = !!atom_getintarg(i,argc,argv); break; /* 0 or 1 */ ! case 'c': { /* colour, from IEM format to RGB 8:8:8 format */ ! NEXT; *(int*)p = convert_color(atom_getintarg(i,argc,argv)); ! } break; case 's': NEXT; *(t_symbol**)p=atom_getsymbolarg(i,argc,argv); break; ! case 'a': { ! NEXT; if (IS_A_SYMBOL(argv,i)) *(t_symbol**)p = atom_getsymbolarg(i,argc,argv); --- 12336,12342 ---- case 'i': NEXT; *(int*)p = atom_getintarg(i,argc,argv); break; case 'b': NEXT; *(int*)p = !!atom_getintarg(i,argc,argv); break; /* 0 or 1 */ ! case 'c': NEXT; *(int*)p = convert_color(atom_getintarg(i,argc,argv)); break; /* IEM-style 8:8:8 colour */ case 's': NEXT; *(t_symbol**)p=atom_getsymbolarg(i,argc,argv); break; ! case 'a': NEXT; if (IS_A_SYMBOL(argv,i)) *(t_symbol**)p = atom_getsymbolarg(i,argc,argv); *************** *** 12363,12367 **** *(t_symbol**)p = gensym(str); } else *(t_symbol**)p = gensym("empty"); ! } break; default: post("WARNING: bug using pd_scanargs()"); goto err; /* WHAT? */ } --- 12346,12350 ---- *(t_symbol**)p = gensym(str); } else *(t_symbol**)p = gensym("empty"); ! break; default: post("WARNING: bug using pd_scanargs()"); goto err; /* WHAT? */ } *************** *** 12430,12436 **** va_start(val,fmt); if (foo->b) { ! return pd_saveargs(foo->b,fmt,val); } else { ! return pd_scanargs(foo->argc,foo->argv,fmt,val); } va_end(val); --- 12413,12419 ---- va_start(val,fmt); if (foo->b) { ! return pd_vsaveargs(foo->b,fmt,val); } else { ! return pd_vscanargs(foo->argc,foo->argv,fmt,val); } va_end(val);

1 0

pd/src s_file.c,1.2.4.8.2.3,1.2.4.8.2.4
by Mathieu Bouchard 24 Sep '05

24 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32041 Modified Files: Tag: devel_0_39 s_file.c Log Message: fixed a few bugs with &&, ||, uninitialized values Index: s_file.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_file.c,v retrieving revision 1.2.4.8.2.3 retrieving revision 1.2.4.8.2.4 diff -C2 -d -r1.2.4.8.2.3 -r1.2.4.8.2.4 *** s_file.c 2 Aug 2005 21:25:05 -0000 1.2.4.8.2.3 --- s_file.c 24 Sep 2005 06:11:45 -0000 1.2.4.8.2.4 *************** *** 272,276 **** sys_set_audio_api(api); if (sys_getpreference("noaudioin", prefbuf, MAXPDSTRING) && ! !strcmp(prefbuf, ".") || !strcmp(prefbuf, "True")) naudioindev = 0; else --- 272,276 ---- sys_set_audio_api(api); if (sys_getpreference("noaudioin", prefbuf, MAXPDSTRING) && ! (!strcmp(prefbuf, ".") || !strcmp(prefbuf, "True"))) naudioindev = 0; else *************** *** 290,294 **** } if (sys_getpreference("noaudioout", prefbuf, MAXPDSTRING) && ! !strcmp(prefbuf, ".") || !strcmp(prefbuf, "True")) naudiooutdev = 0; else --- 290,294 ---- } if (sys_getpreference("noaudioout", prefbuf, MAXPDSTRING) && ! (!strcmp(prefbuf, ".") || !strcmp(prefbuf, "True"))) naudiooutdev = 0; else *************** *** 321,325 **** /* load MIDI preferences */ if (sys_getpreference("nomidiin", prefbuf, MAXPDSTRING) && ! !strcmp(prefbuf, ".") || !strcmp(prefbuf, "True")) nmidiindev = 0; else for (i = 0, nmidiindev = 0; i < MAXMIDIINDEV; i++) --- 321,325 ---- /* load MIDI preferences */ if (sys_getpreference("nomidiin", prefbuf, MAXPDSTRING) && ! (!strcmp(prefbuf, ".") || !strcmp(prefbuf, "True"))) nmidiindev = 0; else for (i = 0, nmidiindev = 0; i < MAXMIDIINDEV; i++) *************** *** 333,337 **** } if (sys_getpreference("nomidiout", prefbuf, MAXPDSTRING) && ! !strcmp(prefbuf, ".") || !strcmp(prefbuf, "True")) nmidioutdev = 0; else for (i = 0, nmidioutdev = 0; i < MAXMIDIOUTDEV; i++) --- 333,337 ---- } if (sys_getpreference("nomidiout", prefbuf, MAXPDSTRING) && ! (!strcmp(prefbuf, ".") || !strcmp(prefbuf, "True"))) nmidioutdev = 0; else for (i = 0, nmidioutdev = 0; i < MAXMIDIOUTDEV; i++)

1 0

pd/src desire.c, 1.1.2.26, 1.1.2.27 desire.h, 1.1.2.3, 1.1.2.4
by Mathieu Bouchard 24 Sep '05

24 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11786 Modified Files: Tag: devel_0_39 desire.c desire.h Log Message: all warnings gone Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** desire.h 24 Sep 2005 03:11:05 -0000 1.1.2.3 --- desire.h 24 Sep 2005 03:54:21 -0000 1.1.2.4 *************** *** 645,649 **** //EXTERN int pd_scanargs(int argc, t_atom *argv, char *format, ...); EXTERN void pd_upload(t_gobj *self); ! EXTERN void sys_mgui(t_gobj *self, const char *sel, const char *fmt, ...); EXTERN void iemgui_propertiesfn(t_gobj *x, t_glist *owner); EXTERN t_symbol *s_empty; --- 645,649 ---- //EXTERN int pd_scanargs(int argc, t_atom *argv, char *format, ...); EXTERN void pd_upload(t_gobj *self); ! EXTERN void sys_mgui(void *self, const char *sel, const char *fmt, ...); EXTERN void iemgui_propertiesfn(t_gobj *x, t_glist *owner); EXTERN t_symbol *s_empty; Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.26 retrieving revision 1.1.2.27 diff -C2 -d -r1.1.2.26 -r1.1.2.27 *** desire.c 24 Sep 2005 03:11:05 -0000 1.1.2.26 --- desire.c 24 Sep 2005 03:54:20 -0000 1.1.2.27 *************** *** 80,92 **** /* ------------------ forward function declarations --------------- */ static void canvas_start_dsp(void); static void canvas_stop_dsp(void); - static void canvas_drawlines(t_canvas *x); - static void canvas_setbounds(t_canvas *x, int x1, int y1, int x2, int y2); - static void canvas_reflecttitle(t_canvas *x); static void canvas_addtolist(t_canvas *x); static void canvas_takeofflist(t_canvas *x); static void canvas_pop(t_canvas *x, t_floatarg fvis); [...1287 lines suppressed...] --- 11587,11591 ---- t_text *x = (t_text *)pd_new(text_class); t_atom at; ! sys_vgui("global _; set _(%lx:canvas) %lx\n",(long)x,(long)gl); x->te_width = 0; x->te_type = T_TEXT; *************** *** 12491,12495 **** } ! void sys_mgui(t_gobj *self, const char *sel, const char *fmt, ...) { char buf[4096]; int i=0, n=sizeof(buf); --- 12465,12470 ---- } ! void sys_mgui(void *self_, const char *sel, const char *fmt, ...) { ! t_gobj *self = (t_gobj *)self_; char buf[4096]; int i=0, n=sizeof(buf);

1 0

pd/src desire.c, 1.1.2.25, 1.1.2.26 desire.h, 1.1.2.2, 1.1.2.3
by Mathieu Bouchard 24 Sep '05

24 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5297 Modified Files: Tag: devel_0_39 desire.c desire.h Log Message: removed coords from t_linetraverser and fixed crash in reflecttitle (oops) Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** desire.h 16 Sep 2005 19:13:09 -0000 1.1.2.2 --- desire.h 24 Sep 2005 03:11:05 -0000 1.1.2.3 *************** *** 265,271 **** int tr_nin; int tr_inno; ! int tr_x11, tr_y11, tr_x12, tr_y12; int tr_x21, tr_y21, tr_x22, tr_y22; ! int tr_lx1, tr_ly1, tr_lx2, tr_ly2; t_outconnect *tr_nextoc; int tr_nextoutno; --- 265,271 ---- int tr_nin; int tr_inno; ! /* int tr_x11, tr_y11, tr_x12, tr_y12; int tr_x21, tr_y21, tr_x22, tr_y22; ! int tr_lx1, tr_ly1, tr_lx2, tr_ly2;*/ t_outconnect *tr_nextoc; int tr_nextoutno; Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.25 retrieving revision 1.1.2.26 diff -C2 -d -r1.1.2.25 -r1.1.2.26 *** desire.c 24 Sep 2005 02:03:11 -0000 1.1.2.25 --- desire.c 24 Sep 2005 03:11:05 -0000 1.1.2.26 *************** *** 180,192 **** } ! void canvas_setcurrent(t_canvas *x) ! { ! pd_pushsym(&x->gl_pd); ! } ! ! void canvas_unsetcurrent(t_canvas *x) ! { ! pd_popsym(&x->gl_pd); ! } t_canvasenvironment *canvas_getenv(t_canvas *x) --- 180,185 ---- } ! void canvas_setcurrent (t_canvas *x) {pd_pushsym(&x->gl_pd);} ! void canvas_unsetcurrent(t_canvas *x) { pd_popsym(&x->gl_pd);} t_canvasenvironment *canvas_getenv(t_canvas *x) *************** *** 317,324 **** t->tr_nout = obj_noutlets(ob); outno = 0; - if (glist_isvisible(t->tr_x)) - gobj_getrect(y, t->tr_x, - &t->tr_x11, &t->tr_y11, &t->tr_x12, &t->tr_y12); - else t->tr_x11 = t->tr_y11 = t->tr_x12 = t->tr_y12 = 0; } t->tr_nextoutno = outno + 1; --- 310,313 ---- *************** *** 330,354 **** t->tr_nin = obj_ninlets(t->tr_ob2); if (!t->tr_nin) bug("drawline"); - if (glist_isvisible(t->tr_x)) - { - int inplus = (t->tr_nin == 1 ? 1 : t->tr_nin - 1); - int outplus = (t->tr_nout == 1 ? 1 : t->tr_nout - 1); - gobj_getrect(&t->tr_ob2->ob_g, t->tr_x, - &t->tr_x21, &t->tr_y21, &t->tr_x22, &t->tr_y22); - t->tr_lx1 = t->tr_x11 + - ((t->tr_x12 - t->tr_x11 - IOWIDTH) * t->tr_outno) / - outplus + IOMIDDLE; - t->tr_ly1 = t->tr_y12; - t->tr_lx2 = t->tr_x21 + - ((t->tr_x22 - t->tr_x21 - IOWIDTH) * t->tr_inno)/inplus + - IOMIDDLE; - t->tr_ly2 = t->tr_y21; - } - else - { - t->tr_x21 = t->tr_y21 = t->tr_x22 = t->tr_y22 = 0; - t->tr_lx1 = t->tr_ly1 = t->tr_lx2 = t->tr_ly2 = 0; - } - return (rval); } --- 319,322 ---- *************** *** 627,633 **** else namebuf[0] = 0; char foo[666]; ! sprintf("%s%c%s - %s",x->gl_name->s_name, (x->gl_dirty? '*' : ' '), namebuf, canvas_getdir(x)->s_name); ! sys_mgui(x,"window_title",foo); } --- 595,601 ---- else namebuf[0] = 0; char foo[666]; ! sprintf(foo,"%s%c%s - %s",x->gl_name->s_name, (x->gl_dirty? '*' : ' '), namebuf, canvas_getdir(x)->s_name); ! sys_mgui(x,"window_title","s",gensym(foo)); } *************** *** 2636,2665 **** /* having failed to find a box, we try lines now. */ if (!runmode && !altmod && !shiftmod) ! { ! t_linetraverser t; ! t_outconnect *oc; ! float fx = xpos, fy = ypos; ! t_glist *glist2 = glist_getcanvas(x); ! linetraverser_start(&t, glist2); ! while (oc = linetraverser_next(&t)) ! { ! float lx1 = t.tr_lx1, ly1 = t.tr_ly1, ! lx2 = t.tr_lx2, ly2 = t.tr_ly2; ! float area = (lx2 - lx1) * (fy - ly1) - ! (ly2 - ly1) * (fx - lx1); ! float dsquare = (lx2-lx1) * (lx2-lx1) + (ly2-ly1) * (ly2-ly1); ! if (area * area >= 50 * dsquare) continue; ! if ((lx2-lx1) * (fx-lx1) + (ly2-ly1) * (fy-ly1) < 0) continue; ! if ((lx2-lx1) * (lx2-fx) + (ly2-ly1) * (ly2-fy) < 0) continue; ! if (doit) ! { ! glist_selectline(glist2, oc, ! canvas_getindex(glist2, &t.tr_ob->ob_g), t.tr_outno, ! canvas_getindex(glist2, &t.tr_ob2->ob_g), t.tr_inno); ! } ! canvas_setcursor(x, CURSOR_EDITMODE_DISCONNECT); ! return; ! } ! } canvas_setcursor(x, CURSOR_EDITMODE_NOTHING); if (doit) --- 2604,2608 ---- /* having failed to find a box, we try lines now. */ if (!runmode && !altmod && !shiftmod) ! {/* was trying to select wire here*/} canvas_setcursor(x, CURSOR_EDITMODE_NOTHING); if (doit) *************** *** 5962,5982 **** t_linetraverser t; t_outconnect *oc; ! for (g = x->gl_list; g; g = g->g_next) ! { gobj_vis(g, x, 0); gobj_vis(g, x, 1); } ! /* redraw all the lines */ ! linetraverser_start(&t, x); ! while (oc = linetraverser_next(&t)) ! sys_vgui(".x%lx.c coords l%lx %d %d %d %d\n", ! glist_getcanvas(x), oc, ! t.tr_lx1, t.tr_ly1, t.tr_lx2, t.tr_ly2); canvas_drawredrect(x, 0); ! if (x->gl_goprect) ! { ! post("draw it"); ! canvas_drawredrect(x, 1); ! } } if (x->gl_owner && glist_isvisible(x->gl_owner)) --- 5905,5915 ---- t_linetraverser t; t_outconnect *oc; ! for (g = x->gl_list; g; g = g->g_next) { gobj_vis(g, x, 0); gobj_vis(g, x, 1); } ! sys_mgui(x,"draw_canvas_wires",""); canvas_drawredrect(x, 0); ! if (x->gl_goprect) canvas_drawredrect(x, 1); } if (x->gl_owner && glist_isvisible(x->gl_owner)) *************** *** 12436,12442 **** for (i=0; i<argc; i++) { void *p; - char bof[666]; - atom_string(argv+i,bof,666); - /*fprintf(stderr,"%d: %s\n",i,bof);*/ switch (fmt[i]) { case '*': case ';': goto break2; --- 12369,12372 ----

1 0

pd/src m_conf.c,1.1.1.3.12.3,1.1.1.3.12.4
by Mathieu Bouchard 24 Sep '05

24 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28616 Modified Files: Tag: devel_0_39 m_conf.c Log Message: new desire.c requires this change. Index: m_conf.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_conf.c,v retrieving revision 1.1.1.3.12.3 retrieving revision 1.1.1.3.12.4 diff -C2 -d -r1.1.1.3.12.3 -r1.1.1.3.12.4 *** m_conf.c 8 Sep 2005 20:46:29 -0000 1.1.1.3.12.3 --- m_conf.c 24 Sep 2005 02:19:56 -0000 1.1.1.3.12.4 *************** *** 18,24 **** S(g_bang) S(g_hradio) S(g_hslider) S(g_mycanvas) S(g_numbox) S(g_toggle) S(g_vradio) S(g_vslider) S(g_vumeter) S(g_text) - #endif S(g_array) S(g_canvas) S(g_guiconnect) S(g_io) S(g_scalar) S(g_template) ! S(g_traversal) S(m_pd) S(x_acoustics) S(x_interface) S(x_connective) S(x_time) S(x_arithmetic) S(x_midi) S(x_misc) S(x_net) S(x_qlist) S(x_gui) S(x_list) S(d_arithmetic) S(d_array) S(d_ctl) S(d_dac) --- 18,25 ---- S(g_bang) S(g_hradio) S(g_hslider) S(g_mycanvas) S(g_numbox) S(g_toggle) S(g_vradio) S(g_vslider) S(g_vumeter) S(g_text) S(g_array) S(g_canvas) S(g_guiconnect) S(g_io) S(g_scalar) S(g_template) ! S(g_traversal) ! #endif ! S(m_pd) S(x_acoustics) S(x_interface) S(x_connective) S(x_time) S(x_arithmetic) S(x_midi) S(x_misc) S(x_net) S(x_qlist) S(x_gui) S(x_list) S(d_arithmetic) S(d_array) S(d_ctl) S(d_dac) *************** *** 34,40 **** S(g_bang) S(g_hradio) S(g_hslider) S(g_mycanvas) S(g_numbox) S(g_toggle) S(g_vradio) S(g_vslider) S(g_vumeter) S(g_text) - #endif S(g_array) S(g_canvas) S(g_guiconnect) S(g_io) S(g_scalar) S(g_template) ! S(g_traversal) S(m_pd) S(x_acoustics) S(x_interface) S(x_connective) S(x_time) S(x_arithmetic) S(x_midi) S(x_misc) S(x_net) S(x_qlist) S(x_gui) S(x_list) S(d_arithmetic) S(d_array) S(d_ctl) S(d_dac) --- 35,42 ---- S(g_bang) S(g_hradio) S(g_hslider) S(g_mycanvas) S(g_numbox) S(g_toggle) S(g_vradio) S(g_vslider) S(g_vumeter) S(g_text) S(g_array) S(g_canvas) S(g_guiconnect) S(g_io) S(g_scalar) S(g_template) ! S(g_traversal) ! #endif ! S(m_pd) S(x_acoustics) S(x_interface) S(x_connective) S(x_time) S(x_arithmetic) S(x_midi) S(x_misc) S(x_net) S(x_qlist) S(x_gui) S(x_list) S(d_arithmetic) S(d_array) S(d_ctl) S(d_dac)

1 0

pd/src desire.tk,1.1.2.78,1.1.2.79
by Mathieu Bouchard 24 Sep '05

24 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25848 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.78 retrieving revision 1.1.2.79 diff -C2 -d -r1.1.2.78 -r1.1.2.79 *** desire.tk 23 Sep 2005 14:32:09 -0000 1.1.2.78 --- desire.tk 24 Sep 2005 02:04:16 -0000 1.1.2.79 *************** *** 72,79 **** rename unknown _original_unknown proc unknown {args} { - #puts "!!! unknown $args" global _ set self [lindex $args 0] ! if {[regexp match $self {^$}]} {error "null pointer you black emperor"} set selector [lindex $args 1] if {[llength [array names _ $self:_class]] == 0} { --- 72,78 ---- rename unknown _original_unknown proc unknown {args} { 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} { *************** *** 83,88 **** set ancestors {} lookup_method $_($self:_class) $selector methods ancestors - #puts "!!! methods: $methods" - # for use by uplevel: set i 0 if {![llength $methods]} { --- 82,85 ---- *************** *** 90,111 **** } set name [lindex $methods $i] - #puts "proc name of $self $selector is $name" set r [eval [concat [list $name $self] [lrange $args 2 end]]] - #puts "!!! /unknown $args" return $r } - # this one is broken (n'ajustez pas votre appareil) proc super {args} { ! uplevel 0 {catch {puts "0: [info locals]"}} ! uplevel 1 {catch {puts "1: [info locals]"}} ! uplevel 2 {catch {puts "2: [info locals]"}} ! uplevel 3 {catch {puts "3: [info locals]"}} ! upvar 2 methods methods self self selector selector i oi set i [expr 1+$oi] - puts "!!! super #$i" if {[llength $methods] < $i} {error "no more supermethods"} set name [lindex $methods $i] - puts "proc name of $self $selector is $name" set r [eval [concat [list $name $self] $args]] } --- 87,99 ---- } set name [lindex $methods $i] set r [eval [concat [list $name $self] [lrange $args 2 end]]] return $r } proc super {args} { ! upvar 2 methods methods self self i oi set i [expr 1+$oi] if {[llength $methods] < $i} {error "no more supermethods"} set name [lindex $methods $i] set r [eval [concat [list $name $self] $args]] } *************** *** 120,124 **** set OS $tcl_platform(platform) - #option add *background #ffffff option add *foreground #000000 #option add *backgroundPixmap /usr/share/themes/BrushedMetalBlue/gtk/brushed-dark.xpm widgetDefault --- 108,111 ---- *************** *** 129,135 **** option add *$tkclass*borderWidth 1 } ! option add *Checkbutton*selectColor #dd3000 ! option add *Radiobutton*selectColor #dd3000 ! foreach tkclass {Entry Text} { option add *$tkclass*background #b0c4d8 --- 116,122 ---- option add *$tkclass*borderWidth 1 } ! foreach tkclass {CheckButton RadioButton} { ! option add *$tkclass*selectColor #dd3000 ! } foreach tkclass {Entry Text} { option add *$tkclass*background #b0c4d8 *************** *** 186,219 **** switch $OS { ! win32 { ! set pd_gui2 [file dirname $argv0] ! regsub -all \\\\ $pd_gui2 / pd_gui3 ! set pd_guidir $pd_gui3/.. ! set pd_tearoff 1 ! } ! Darwin { ! set pd_gui2 [file dirname $argv0] ! set pd_guidir $pd_gui2/.. ! set pd_tearoff 0 ! } default {set pd_tearoff 1} } - # hack so you can easily test-run this script in linux... define pd_guidir - # (which is normally defined at startup in pd under linux...) - - switch $OS { - unix { - if {! [info exists pd_guidir]} { - global pd_guidir - puts stderr {setting pd_guidir to '.'} - set pd_guidir . - } - } - } - # it's unfortunate but we seem to have to turn off global bindings # for Text objects to get control-s and control-t to do what we want for ! # "text" dialogs below. Also we have to get rid of tab's changing the focus. bind all <Key-Tab> "" --- 173,183 ---- switch $OS { ! Darwin {set pd_tearoff 0} default {set pd_tearoff 1} } # it's unfortunate but we seem to have to turn off global bindings # for Text objects to get control-s and control-t to do what we want for ! # "text" dialogs below. Also we have to get rid of tab's changing the focus. bind all <Key-Tab> ""

1 0

pd/src desire.c,1.1.2.24,1.1.2.25
by Mathieu Bouchard 24 Sep '05

24 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25671 Modified Files: Tag: devel_0_39 desire.c Log Message: . Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.24 retrieving revision 1.1.2.25 diff -C2 -d -r1.1.2.24 -r1.1.2.25 *** desire.c 22 Sep 2005 07:35:16 -0000 1.1.2.24 --- desire.c 24 Sep 2005 02:03:11 -0000 1.1.2.25 *************** *** 312,317 **** if (!t->tr_ob) y = t->tr_x->gl_list; else y = t->tr_ob->ob_g.g_next; ! for (; y; y = y->g_next) ! if (ob = pd_checkobject(&y->g_pd)) break; if (!ob) return (0); t->tr_ob = ob; --- 312,316 ---- if (!t->tr_ob) y = t->tr_x->gl_list; else y = t->tr_ob->ob_g.g_next; ! for (; y; y = y->g_next) if ((ob = pd_checkobject(&y->g_pd))) break; if (!ob) return (0); t->tr_ob = ob; *************** *** 507,519 **** would be confusing. The "correct" way is to have "py1" be the value that is higher on the screen. */ ! if (py2 < py1) ! { ! float zz; ! zz = y2; ! y2 = y1; ! y1 = zz; ! zz = py2; ! py2 = py1; ! py1 = zz; } if (x1 == x2 || y1 == y2) --- 506,512 ---- would be confusing. The "correct" way is to have "py1" be the value that is higher on the screen. */ ! if (py2 < py1) { ! float zz = y2; y2 = y1; y1 = zz; ! zz = py2; py2 = py1; py1 = zz; } if (x1 == x2 || y1 == y2) *************** *** 633,639 **** } else namebuf[0] = 0; ! sys_vgui("%lx window_title {%s%c%s - %s}\n", ! x, x->gl_name->s_name, (x->gl_dirty? '*' : ' '), namebuf, canvas_getdir(x)->s_name); } --- 626,633 ---- } else namebuf[0] = 0; ! char foo[666]; ! sprintf("%s%c%s - %s",x->gl_name->s_name, (x->gl_dirty? '*' : ' '), namebuf, canvas_getdir(x)->s_name); + sys_mgui(x,"window_title",foo); } *************** *** 789,795 **** canvas_vis(x, 1); #else ! sys_vgui(x,"window_raise",""); ! sys_vgui(x,"window_focus",""); ! sys_vgui(x,"window_deiconify",""); #endif } --- 783,789 ---- canvas_vis(x, 1); #else ! sys_mgui(x,"window_raise",""); ! sys_mgui(x,"window_focus",""); ! sys_mgui(x,"window_deiconify",""); #endif } *************** *** 1048,1052 **** void canvas_loadbang(t_canvas *x) { - t_gobj *y; canvas_loadbangabstractions(x); canvas_loadbangsubpatches(x); --- 1042,1045 ---- *************** *** 1124,1128 **** void canvas_fattensub(t_canvas *x, int *xp1, int *yp1, int *xp2, int *yp2) { - t_gobj *y; *xp2 += 50; /* fake for now */ *yp2 += 50; --- 1117,1120 ---- *************** *** 1367,1371 **** for (g = gl->gl_list; g; g = g->g_next) { - t_class *cl; if (vis && g->g_pd == scalar_class) { --- 1359,1362 ---- *************** *** 7825,7837 **** } - - /* ---------------------------- overall setup ----------------------------- */ - - void g_io_setup(void) - { - vinlet_setup(); - voutlet_setup(); - } - //-------------------------------------------------------------------------- // from g_scalar.c --- 7816,7819 ---- *************** *** 10262,10289 **** t_drawnumber *x = (t_drawnumber *)z; t_atom at; ! int xloc, yloc, font, fontwidth, fontheight; char buf[DRAWNUMBER_BUFSIZE]; ! ! if (!fielddesc_getfloat(&x->x_vis, template, data, 0)) ! { *xp1 = *yp1 = 0x7fffffff; *xp2 = *yp2 = -0x7fffffff; return; } ! xloc = glist_xtopixels(glist, ! basex + fielddesc_getcoord(&x->x_xloc, template, data, 0)); ! yloc = glist_ytopixels(glist, ! basey + fielddesc_getcoord(&x->x_yloc, template, data, 0)); ! font = glist_getfont(glist); ! fontwidth = sys_fontwidth(font); ! fontheight = sys_fontheight(font); if (x->x_flags & DRAW_SYMBOL) SETSYMBOL(&at, fielddesc_getsymbol(&x->x_value, template, data, 0)); ! else SETFLOAT(&at, fielddesc_getfloat(&x->x_value, template, data, 0)); drawnumber_sprintf(x, buf, &at); *xp1 = xloc; *yp1 = yloc; ! *xp2 = xloc + fontwidth * strlen(buf); ! *yp2 = yloc + fontheight; } --- 10244,10264 ---- t_drawnumber *x = (t_drawnumber *)z; t_atom at; ! int xloc, yloc; char buf[DRAWNUMBER_BUFSIZE]; ! if (!fielddesc_getfloat(&x->x_vis, template, data, 0)) { *xp1 = *yp1 = 0x7fffffff; *xp2 = *yp2 = -0x7fffffff; return; } ! xloc = glist_xtopixels(glist, basex + fielddesc_getcoord(&x->x_xloc, template, data, 0)); ! yloc = glist_ytopixels(glist, basey + fielddesc_getcoord(&x->x_yloc, template, data, 0)); if (x->x_flags & DRAW_SYMBOL) SETSYMBOL(&at, fielddesc_getsymbol(&x->x_value, template, data, 0)); ! else SETFLOAT(&at, fielddesc_getfloat(&x->x_value, template, data, 0)); drawnumber_sprintf(x, buf, &at); *xp1 = xloc; *yp1 = yloc; ! *xp2 = xloc + 42; ! *yp2 = yloc + 42; } *************** *** 11644,11648 **** double k; char buf[32]; - int numwidth; int log_height; int finemoved; --- 11619,11622 ---- *************** *** 13205,13219 **** static t_class *nbclass; ! void nbclip(t_nbx *x) {CLAMP(x->val,x->min,x->max);} ! ! void nbcalc_fontwidth(t_nbx *x) ! { ! int f = x->font_style==1 ? 27 : x->font_style==2 ? 25 : 31; ! int w = x->fontsize * f * x->w / 36; ! x->numwidth = w + 4 + x->h/2; ! post("nbx calc_fontwidth: f=%d w=%d numwidth=%d",f,w,x->numwidth); ! } ! int nbcheck_minmax(t_nbx *x) { double min=x->min, max=x->max; --- 13179,13185 ---- static t_class *nbclass; ! static void nbclip(t_nbx *x) {CLAMP(x->val,x->min,x->max);} ! static int nbcheck_minmax(t_nbx *x) { double min=x->min, max=x->max; *************** *** 13253,13257 **** x->w = MAX(1,(int)atom_getintarg(0, ac, av)); if(ac > 1) x->h = MAX(8,(int)atom_getintarg(1, ac, av)); - nbcalc_fontwidth(x); iemgui_size((t_iemgui *)x); } --- 13219,13222 ---- *************** *** 13300,13304 **** iemgui_constrain((t_iemgui *)x); x->w=MAX(w,1); - nbcalc_fontwidth(x); nbcheck_minmax(x); x->w = MAX(x->w,1); --- 13265,13268 ---- *************** *** 13321,13329 **** outlet_new((t_text *)x, &s_float); nbreload(x,0,argc,argv); - nbcalc_fontwidth(x); return x; } ! static void g_numbosetup(void) { t_class *c = nbclass = class_new(gensym("nbx"), (t_newmethod)nbnew, --- 13285,13292 ---- outlet_new((t_text *)x, &s_float); nbreload(x,0,argc,argv); return x; } ! static void g_numbox_setup(void) { t_class *c = nbclass = class_new(gensym("nbx"), (t_newmethod)nbnew, *************** *** 13340,13344 **** class_addmethod(c, (t_method)nbsize, gensym("size"), A_GIMME, 0); class_addmethod(c, (t_method)nbrange, gensym("range"), A_GIMME, 0); - /* !@#$ actually overrode label_font to do stuff related to width */ class_addmethod(c, (t_method)nblog, gensym("log"), 0); class_addmethod(c, (t_method)nblin, gensym("lin"), 0); --- 13303,13306 ---- *************** *** 13601,13615 **** } - void desire_setup(void) { - g_text_setup(); - g_bang_setup(); - g_toggle_setup(); - g_radio_setup(); - g_slider_setup(); - g_numbosetup(); - g_mycanvas_setup(); - g_vumeter_setup(); - g_dropper_setup(); - } //----------- --- 13563,13566 ---- *************** *** 13624,13628 **** /* here is the real creator function, invoked in patch files by sending the "canvas" message to #N, which is bound ! to pd_camvasmaker. */ class_addmethod(pd_canvasmaker, (t_method)canvas_new, gensym("canvas"), A_GIMME, 0); class_addmethod(c, (t_method)canvas_restore, gensym("restore"), A_GIMME, 0); --- 13575,13579 ---- /* here is the real creator function, invoked in patch files by sending the "canvas" message to #N, which is bound ! to pd_canvasmaker. */ class_addmethod(pd_canvasmaker, (t_method)canvas_new, gensym("canvas"), A_GIMME, 0); class_addmethod(c, (t_method)canvas_restore, gensym("restore"), A_GIMME, 0); *************** *** 13713,13714 **** --- 13664,13673 ---- } + void desire_setup(void) { + #define S(x) x##_setup(); + S(vinlet) S(voutlet) + S(g_array) S(g_canvas) S(g_guiconnect) S(g_scalar) S(g_template) + S(g_traversal) S(g_text) S(g_bang) S(g_toggle) S(g_radio) + S(g_slider) S(g_numbox) S(g_mycanvas) S(g_vumeter) S(g_dropper) + #undef S + }

1 0

pd/src desire.tk,1.1.2.77,1.1.2.78
by Mathieu Bouchard 23 Sep '05

23 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31661 Modified Files: Tag: devel_0_39 desire.tk Log Message: added new_as, super, view move, objectbox move, etc Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.77 retrieving revision 1.1.2.78 diff -C2 -d -r1.1.2.77 -r1.1.2.78 *** desire.tk 23 Sep 2005 12:36:59 -0000 1.1.2.77 --- desire.tk 23 Sep 2005 14:32:09 -0000 1.1.2.78 *************** *** 37,40 **** --- 37,45 ---- eval [concat [list \$self init] \$args] " + proc ${self}_new_as {self args} " + global _ + set _(\$self:_class) $self + eval [concat [list \$self init] \$args] + " } *************** *** 86,90 **** set name [lindex $methods $i] #puts "proc name of $self $selector is $name" ! set r [uplevel 1 [concat [list $name $self] [lrange $args 2 end]]] #puts "!!! /unknown $args" return $r --- 91,95 ---- set name [lindex $methods $i] #puts "proc name of $self $selector is $name" ! set r [eval [concat [list $name $self] [lrange $args 2 end]]] #puts "!!! /unknown $args" return $r *************** *** 93,97 **** # this one is broken (n'ajustez pas votre appareil) proc super {args} { ! upvar 2 methods methods self self i oi set i [expr 1+$oi] puts "!!! super #$i" --- 98,106 ---- # this one is broken (n'ajustez pas votre appareil) proc super {args} { ! uplevel 0 {catch {puts "0: [info locals]"}} ! uplevel 1 {catch {puts "1: [info locals]"}} ! uplevel 2 {catch {puts "2: [info locals]"}} ! uplevel 3 {catch {puts "3: [info locals]"}} ! upvar 2 methods methods self self selector selector i oi set i [expr 1+$oi] puts "!!! super #$i" *************** *** 99,103 **** set name [lindex $methods $i] puts "proc name of $self $selector is $name" ! set r [uplevel 1 [concat [list $name $self] $args]] } --- 108,112 ---- set name [lindex $methods $i] puts "proc name of $self $selector is $name" ! set r [eval [concat [list $name $self] $args]] } *************** *** 726,731 **** global _ set self [c2self $name] ! set _($self:_class) canvas ! $self init $width $height $geometry $editable } --- 735,739 ---- global _ set self [c2self $name] ! canvas_new_as $self $width $height $geometry $editable } *************** *** 734,737 **** --- 742,746 ---- global pd_opendir pd_tearoff OS cmdline canvasmenu focus set name .x$self + set c .x$self.c set focus(canvas) $self set _(focus) $self *************** *** 740,746 **** pack [make_button_bar $name.bbar $name] -side top -fill x -expand no pack [statusbar_new $self] -side bottom -fill x ! pack [scrollbar $name.xscroll -command "$name.c xview" -orient horizontal] -side bottom -fill x ! pack [scrollbar $name.yscroll -command "$name.c yview"] -side right -fill y ! pack [canvas $name.c -width $width -height $height -background white \ -yscrollcommand "$name.yscroll set" \ -xscrollcommand "$name.xscroll set" \ --- 749,755 ---- pack [make_button_bar $name.bbar $name] -side top -fill x -expand no pack [statusbar_new $self] -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 $width -height $height -background white \ -yscrollcommand "$name.yscroll set" \ -xscrollcommand "$name.xscroll set" \ *************** *** 751,761 **** menu $name.popup -tearoff false populate_menu $name.popup $name { ! {"Properties" {popup_properties [canvastosym %W]} ""} ! {"Open" {popup_open [canvastosym %W]} ""} ! {"Help" {popup_help [canvastosym %W]} ""} } wm protocol $name WM_DELETE_WINDOW "menu_close $name" $self new_binds ! focus $name.c $self editmode $editable set @action none --- 760,770 ---- menu $name.popup -tearoff false populate_menu $name.popup $name { ! {"Properties" {popup_properties [c2self %W]} ""} ! {"Open" {popup_open [c2self %W]} ""} ! {"Help" {popup_help [c2self %W]} ""} } wm protocol $name WM_DELETE_WINDOW "menu_close $name" $self new_binds ! focus $c $self editmode $editable set @action none *************** *** 770,773 **** --- 779,783 ---- set @wire_from {} set @wire_to {} + set @children {} } *************** *** 1173,1178 **** after 1 "destroy $t" set l {} ! foreach c [split $@text ""] {lappend l [scan $c %c]} pd ".x$canvas text_setto !$self $l ;" } --- 1183,1189 ---- after 1 "destroy $t" set l {} ! foreach char [split $@text ""] {lappend l [scan $char %c]} pd ".x$canvas text_setto !$self $l ;" + eval "focus $c" } *************** *** 1185,1203 **** for {set x 0} {$x<$@ninlets} {incr x} { if {[info exists _($self:i:$x)]} { ! foreach wire_id $_($self:i:$x) { ! wire_update $wire_id $_($wire_id) ! #set i [lsearch $@selection_wire $wire_id] ! #if {$i<0} {lappend @selection_wire $wire_id} ! } } } for {set x 0} {$x<$@noutlets} {incr x} { if {[info exists _($self:o:$x)]} { ! foreach wire_id $_($self:o:$x) { ! wire_update $wire_id $_($wire_id) ! #set i [lsearch $@selection_wire $wire_id] ! #if {$i<0} {lappend @selection_wire $wire_id} ! } ! } } text_new $canvas $self [expr $@cx+2] [expr $@cy+2] \ --- 1196,1206 ---- for {set x 0} {$x<$@ninlets} {incr x} { if {[info exists _($self:i:$x)]} { ! foreach wire_id $_($self:i:$x) {wire_update $wire_id $_($wire_id)} } } for {set x 0} {$x<$@noutlets} {incr x} { if {[info exists _($self:o:$x)]} { ! foreach wire_id $_($self:o:$x) {wire_update $wire_id $_($wire_id)} ! } } text_new $canvas $self [expr $@cx+2] [expr $@cy+2] \ *************** *** 1231,1240 **** #} ! #def objectbox move {args} { ! # set @cx [expr $@cx+[lindex $args 0]] ! # set @cy [expr $@cy+[lindex $args 1]] ! # $self draw $self $_($self:canvas) ! # $self draw $_($self:canvas) ! #} #-----------------------------------------------------------------------------------# --- 1234,1252 ---- #} ! def objectbox draw_wires {canvas} { ! for {set x 0} {$x<$@ninlets} {incr x} { ! set v $self:i:$x ! if {[info exists _($v)]} {foreach wire $_($v) {$wire draw $self}} ! } ! for {set x 0} {$x<$@noutlets} {incr x} { ! set v $self:o:$x ! if {[info exists _($v)]} {foreach wire $_($v) {$wire draw $self}} ! } ! } ! ! def objectbox move {canvas dx dy} { ! super $canvas $dx $dy ! $self draw_wires $canvas ! } #-----------------------------------------------------------------------------------# *************** *** 1260,1272 **** set @cy [expr $@cy+$dy] .x$(a)canvas.c move $self $dx $dy - #$self draw - for {set x 0} {$x<$@ninlets} {incr x} { - set v $self:i:$x - if {[info exists _($v)]} {foreach wire $_($v) {$wire draw $self}} - } - for {set x 0} {$x<$@noutlets} {incr x} { - set v $self:o:$x - if {[info exists _($v)]} {foreach wire $_($v) {$wire draw $self}} - } } --- 1272,1275 ---- *************** *** 1421,1433 **** } #-----------------------------------------------------------------------------------# # this proc is too long, should be cut in several parts --matju # agree, but could i do this a bit later? --chun - def objectbox bbox {} { - list $@cx $@cy [expr $@cx+$@xs] [expr $@cy+$@ys] - - } - def* canvas click_on_object {x y b f id} { global look --- 1424,1433 ---- } + def objectbox bbox {} {list $@cx $@cy [expr $@cx+$@xs] [expr $@cy+$@ys]} + #-----------------------------------------------------------------------------------# # this proc is too long, should be cut in several parts --matju # agree, but could i do this a bit later? --chun def* canvas click_on_object {x y b f id} { global look *************** *** 1544,1549 **** focus $c set @action rect ! $c create line $x $y $x $y $x $y $x $y $x $y -tags selrect ! $c itemconfigure selrect -dash {3 3 3 3} } } --- 1544,1548 ---- focus $c set @action rect ! $c create line $x $y $x $y $x $y $x $y $x $y -tags {selrect1 selrect} -fill black -dash {3 3 3 3} -dashoffset 3 } } *************** *** 1557,1570 **** set cy [$c canvasy $y] if {[llength $@wire_from]} { ! if {[llength $wire_to]} { ! #puts "wire reachs inlet, draw proper wire!!" set d $@wire_from foreach item $wire_to {lappend d $item} #add a last 0 for wire_update, not sure what's for.... lappend d 0 - #my wire code --chun - #$_($id:noutlets) -> number of outlets an object has - #propose: _(obj_id:flag:port_number) -> list of connections an particular in/outlet has - #tmp only, generates id for wires set wire_id l[format %x [expr 0x80f8ea8 - $offset_wire]] --- 1556,1564 ---- set cy [$c canvasy $y] if {[llength $@wire_from]} { ! if {[llength $@wire_to]} { set d $@wire_from foreach item $wire_to {lappend d $item} #add a last 0 for wire_update, not sure what's for.... lappend d 0 #tmp only, generates id for wires set wire_id l[format %x [expr 0x80f8ea8 - $offset_wire]] *************** *** 1639,1644 **** foreach obj $@selection { for {set x 0} {$x<$_($obj:ninlets)} {incr x} { - #if {[info exists]} - #puts "check -> $obj" if {[info exists _($obj:i:$x)]} { foreach wire_id $_($obj:i:$x) { --- 1633,1636 ----

1 0

pd/src desire.tk,1.1.2.76,1.1.2.77
by Mathieu Bouchard 23 Sep '05

23 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3647 Modified Files: Tag: devel_0_39 desire.tk Log Message: re-fixed hilite_io. also added inlet/outlet tooltip (without actual content) Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.76 retrieving revision 1.1.2.77 diff -C2 -d -r1.1.2.76 -r1.1.2.77 *** desire.tk 23 Sep 2005 12:12:27 -0000 1.1.2.76 --- desire.tk 23 Sep 2005 12:36:59 -0000 1.1.2.77 *************** *** 1256,1290 **** } ! def view move {dx dy} { set @cx [expr $@cx+$dx] set @cy [expr $@cy+$dy] ! #.x$(a)canvas.c move $self $dx $dy; return ! $self draw $_($self:canvas) for {set x 0} {$x<$@ninlets} {incr x} { ! if {[info exists _($self:i:$x)]} { ! foreach wire $_($self:i:$x) {$wire draw $self} ! } } for {set x 0} {$x<$@noutlets} {incr x} { ! if {[info exists _($self:o:$x)]} { ! foreach wire $_($self:o:$x) {$wire draw $self} ! } } } # type is i or o ! def objectbox hilite_io {type x y} { global look ! set c .x$_($self:canvas).c set ports 0; catch {set ports $@ninlets} if {$ports==0} return set port [expr int(($x-$@cx)*$ports/$@xs)] - set port [expr int(($x-$@cx)*$ports/$@xs)] set p ${self}${type}${port} #if {![llength $@wire_from]} {} set outline [switch $type {i {list $look(outletfg)} o {list $look(inletfg)}}] $c create rectangle [l+ [$c coords $p] {-4 -4 +4 +4}] -outline $outline -width 1 -tags ${p}b return $port - } --- 1256,1288 ---- } ! def view move {canvas dx dy} { set @cx [expr $@cx+$dx] set @cy [expr $@cy+$dy] ! .x$(a)canvas.c move $self $dx $dy ! #$self draw for {set x 0} {$x<$@ninlets} {incr x} { ! set v $self:i:$x ! if {[info exists _($v)]} {foreach wire $_($v) {$wire draw $self}} } for {set x 0} {$x<$@noutlets} {incr x} { ! set v $self:o:$x ! if {[info exists _($v)]} {foreach wire $_($v) {$wire draw $self}} } } # type is i or o ! def objectbox hilite_io {canvas type x y} { global look ! set c .x$canvas.c set ports 0; catch {set ports $@ninlets} if {$ports==0} return set port [expr int(($x-$@cx)*$ports/$@xs)] set p ${self}${type}${port} #if {![llength $@wire_from]} {} set outline [switch $type {i {list $look(outletfg)} o {list $look(inletfg)}}] $c create rectangle [l+ [$c coords $p] {-4 -4 +4 +4}] -outline $outline -width 1 -tags ${p}b + switch $type {i {set tip "inlet $port"} o {set tip "outlet $port"}} + $canvas show_tooltip $x $y $tip return $port } *************** *** 1317,1321 **** switch $@action { move { ! foreach obj $@selection {$obj move [expr $x-$ox] [expr $y-$oy]} return } --- 1315,1319 ---- switch $@action { move { ! foreach obj $@selection {$obj move $self [expr $x-$ox] [expr $y-$oy]} return } *************** *** 1340,1344 **** mset {x1 y1 x2 y2} [$id bbox] if {abs($y1+3-$y)<=3} { ! set port [$id hilite i $x $y] set dehighlight "$c delete ${id}i${port}b; set wire_to {}" set wire_to [list $id $port] --- 1338,1342 ---- mset {x1 y1 x2 y2} [$id bbox] if {abs($y1+3-$y)<=3} { ! set port [$id hilite_io $self i $x $y] set dehighlight "$c delete ${id}i${port}b; set wire_to {}" set wire_to [list $id $port] *************** *** 1346,1350 **** } if {abs($y2-3-$y)<=3} { ! set port [$id hilite o $x $y] set dehighlight "$c delete ${id}o${port}b" return --- 1344,1348 ---- } if {abs($y2-3-$y)<=3} { ! set port [$id hilite_io $self o $x $y] set dehighlight "$c delete ${id}o${port}b" return *************** *** 2777,2781 **** set c .x$self.c $c create text $x $y -text $text -anchor w -tags tooltip_fg ! mset {x1 y1 x2 y2} [$canvas bbox tooltip_fg] set w 0 set h 0 --- 2775,2779 ---- set c .x$self.c $c create text $x $y -text $text -anchor w -tags tooltip_fg ! mset {x1 y1 x2 y2} [$c bbox tooltip_fg] set w 0 set h 0 *************** *** 2793,2799 **** def canvas hide_tooltip {} { set c .x$self.c $c delete tooltip_bg tooltip_fg - global tooltip set tooltip(visible) 0 } --- 2791,2797 ---- def canvas hide_tooltip {} { + global tooltip set c .x$self.c $c delete tooltip_bg tooltip_fg set tooltip(visible) 0 }

1 0

pd/src desire.tk,1.1.2.75,1.1.2.76
by Mathieu Bouchard 23 Sep '05

23 Sep '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30865 Modified Files: Tag: devel_0_39 desire.tk Log Message: oops Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.75 retrieving revision 1.1.2.76 diff -C2 -d -r1.1.2.75 -r1.1.2.76 *** desire.tk 23 Sep 2005 12:05:33 -0000 1.1.2.75 --- desire.tk 23 Sep 2005 12:12:27 -0000 1.1.2.76 *************** *** 1259,1263 **** set @cx [expr $@cx+$dx] set @cy [expr $@cy+$dy] ! #.x$(a)canvas.c move $self $dx $dy $self draw $_($self:canvas) for {set x 0} {$x<$@ninlets} {incr x} { --- 1259,1263 ---- set @cx [expr $@cx+$dx] set @cy [expr $@cy+$dy] ! #.x$(a)canvas.c move $self $dx $dy; return $self draw $_($self:canvas) for {set x 0} {$x<$@ninlets} {incr x} { *************** *** 1281,1288 **** set port [expr int(($x-$@cx)*$ports/$@xs)] set port [expr int(($x-$@cx)*$ports/$@xs)] ! set p ${self}${type}${port}b #if {![llength $@wire_from]} {} ! set outline [switch $type {i {list $look(outletfg)} o {list $look(inletfg)}] ! $c create rectangle [l+ [$c coords ${self}i${port}] {-4 -4 +4 +4}] -outline $outline -width 1 -tags $p return $port --- 1281,1288 ---- set port [expr int(($x-$@cx)*$ports/$@xs)] set port [expr int(($x-$@cx)*$ports/$@xs)] ! set p ${self}${type}${port} #if {![llength $@wire_from]} {} ! set outline [switch $type {i {list $look(outletfg)} o {list $look(inletfg)}}] ! $c create rectangle [l+ [$c coords $p] {-4 -4 +4 +4}] -outline $outline -width 1 -tags ${p}b return $port

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