Pd-cvs March 2004

pd-cvs@lists.iem.at

11 participants
225 discussions

pd/src g_rtext.c,1.1.1.2.2.6.2.2,1.1.1.2.2.6.2.3
by Mathieu Bouchard 16 Mar '04

16 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18478 Modified Files: Tag: impd_0_37 g_rtext.c Log Message: oops. Index: g_rtext.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_rtext.c,v retrieving revision 1.1.1.2.2.6.2.2 retrieving revision 1.1.1.2.2.6.2.3 diff -C2 -d -r1.1.1.2.2.6.2.2 -r1.1.1.2.2.6.2.3 *** g_rtext.c 16 Mar 2004 21:54:02 -0000 1.1.1.2.2.6.2.2 --- g_rtext.c 16 Mar 2004 21:55:55 -0000 1.1.1.2.2.6.2.3 *************** *** 392,397 **** if (n == '\r') n = '\n'; if (n == '\t') { ! post("TAB: «%s»",x->x_buf); ! sys_vgui("propose_completions %x .x%x.c %d %d {%*s}\n", x, canvas, text_xpix(x->x_text, x->x_glist) + x->x_drawnwidth, text_ypix(x->x_text, x->x_glist) + x->x_drawnheight/2, --- 392,396 ---- if (n == '\r') n = '\n'; if (n == '\t') { ! sys_vgui("propose_completions %x .x%x.c %d %d {%.*s}\n", x, canvas, text_xpix(x->x_text, x->x_glist) + x->x_drawnwidth, text_ypix(x->x_text, x->x_glist) + x->x_drawnheight/2,

1 0

pd/src u_main.tk,1.1.1.4.2.7.4.15,1.1.1.4.2.7.4.16 g_canvas.c,1.1.1.4.2.7.2.4,1.1.1.4.2.7.2.5 g_rtext.c,1.1.1.2.2.6.2.1,1.1.1.2.2.6.2.2 m_glob.c,1.1.1.2.2.3.2.2,1.1.1.2.2.3.2.3
by Mathieu Bouchard 16 Mar '04

16 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17784 Modified Files: Tag: impd_0_37 u_main.tk g_canvas.c g_rtext.c m_glob.c Log Message: object class name completion Index: g_canvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.c,v retrieving revision 1.1.1.4.2.7.2.4 retrieving revision 1.1.1.4.2.7.2.5 diff -C2 -d -r1.1.1.4.2.7.2.4 -r1.1.1.4.2.7.2.5 *** g_canvas.c 14 Mar 2004 22:33:54 -0000 1.1.1.4.2.7.2.4 --- g_canvas.c 16 Mar 2004 21:54:02 -0000 1.1.1.4.2.7.2.5 *************** *** 131,144 **** } - void glob_redraw (void) { - t_canvas *x = canvas_list; - while (x) { - fprintf(stderr,"canvas=%08x\n",x); - canvas_redraw(x); - x->gl_mapped=0; canvas_map(x,1); - x=x->gl_next; - } - } - void canvas_setargs(int argc, t_atom *argv) { --- 131,134 ---- *************** *** 641,644 **** --- 631,644 ---- } + void glob_redraw (void) { + t_canvas *x = canvas_list; + while (x) { + fprintf(stderr,"canvas=%08x\n",x); + canvas_redraw(x); + x->gl_mapped=0; canvas_map(x,1); + x=x->gl_next; + } + } + void canvas_redraw(t_canvas *x) { *************** *** 982,986 **** { t_gobj *y; - t_symbol *s = gensym("loadbang"); for (y = x->gl_list; y; y = y->g_next) if (pd_class(&y->g_pd) == canvas_class) --- 982,985 ---- *************** *** 1011,1015 **** void canvas_loadbang(t_canvas *x) { - t_gobj *y; canvas_loadbangabstractions(x); canvas_loadbangsubpatches(x); --- 1010,1013 ---- *************** *** 1019,1023 **** you gave it to open it; perhaps there's a 1-pixel border all around it or something. Anyway, we just add the 2 pixels back here; seems we ! have to do this for linux but not MSW; not sure about MacOS. */ #ifdef MSW --- 1017,1021 ---- you gave it to open it; perhaps there's a 1-pixel border all around it or something. Anyway, we just add the 2 pixels back here; seems we ! have to do this for linux but not MSW; not sure about MacOS. */ #ifdef MSW *************** *** 1093,1097 **** int *xp1, int *yp1, int *xp2, int *yp2) { - t_gobj *y; *xp2 += 50; /* fake for now */ *yp2 += 50; --- 1091,1094 ---- *************** *** 1320,1324 **** for (g = gl->gl_list; g; g = g->g_next) { - t_class *cl; if (vis && g->g_pd == scalar_class) glist_redrawitem(gl, g); --- 1317,1320 ---- Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.15 retrieving revision 1.1.1.4.2.7.4.16 diff -C2 -d -r1.1.1.4.2.7.4.15 -r1.1.1.4.2.7.4.16 *** u_main.tk 16 Mar 2004 08:13:52 -0000 1.1.1.4.2.7.4.15 --- u_main.tk 16 Mar 2004 21:54:02 -0000 1.1.1.4.2.7.4.16 *************** *** 20,23 **** --- 20,27 ---- option add *Button*borderWidth 1 + # there are two palettes of 30 colours used in Pd + # when placed in a 3*10 grid, the difference is that + # the left corner of 3*3 (the greys) are transposed (matrixwise) + # here is the one used in the swatch color selector: set preset_colors { fcfcfc e0e0e0 bcbcbc fce0e0 fce0c0 fcfcc8 d8fcd8 d8fcfc dce4fc f8d8fc *************** *** 324,332 **** set cmd [lindex $e 1] set accel [accel_munge [lindex $e 2]] ! regsub %W $cmd $context cmd $menu add command -label [lindex $e 0] -command $cmd \ -accelerator $accel set accels([string tolower $accel]) $cmd } } } --- 328,344 ---- set cmd [lindex $e 1] set accel [accel_munge [lindex $e 2]] ! regsub -all %W $cmd $context cmd $menu add command -label [lindex $e 0] -command $cmd \ -accelerator $accel set accels([string tolower $accel]) $cmd } + 4 { + set cmd [lindex $e 1] + set accel [accel_munge [lindex $e 2]] + regsub -all %W $cmd $context cmd + $menu add checkbutton -label [lindex $e 0] -command $cmd \ + -accelerator $accel -indicatoron ??? + set accels([string tolower $accel]) $cmd + } } } *************** *** 575,580 **** $name.m add cascade -label View -menu $name.m.view populate_menu $name.m.view $name { ! {hello {} {}} } menu $name.m.put -tearoff $pd_tearoff --- 587,593 ---- $name.m add cascade -label View -menu $name.m.view populate_menu $name.m.view $name { ! {hello {} ""} } + # {Crosshair {global crosshair; set crosshair [expr !!$crosshair]} "" toggle} menu $name.m.put -tearoff $pd_tearoff *************** *** 766,769 **** --- 779,783 ---- # investigate this LATER... global pd_nt + hide_canvas_tooltip $name if {$pd_nt == 2} { if {$key=="BackSpace"} {set key 8; set keynum 8} *************** *** 2065,2069 **** proc show_class_list {} { ! pd "pd update-path ; pd update-class-list ;" } --- 2079,2083 ---- proc show_class_list {} { ! pd "pd update-path ; pd update-class-list class_list_callback ;" } *************** *** 2145,2152 **** } ! # rendering: source $pd_guidir/bin/u_object.tk ! # theme: set look(objectfg) #000000 set look(objectbg) #ffffff --- 2159,2221 ---- } ! ############ tooltips ! ! proc show_canvas_tooltip {self canvas x y text} { ! set border 4 ! set x [expr $x+$border+4] ! hide_canvas_tooltip $canvas ! $canvas create text $x $y -text $text -anchor w -tags tooltip_fg ! foreach {x1 y1 x2 y2} [$canvas bbox tooltip_fg] {} ! set w 0 ! set h 0 ! $canvas create rectangle \ ! [expr $x1-$border] [expr $y1-$border] \ ! [expr $x2+$border] [expr $y2+$border] \ ! -fill "#ffffcc" -outline "#000000" -tags tooltip_bg ! $canvas lower tooltip_bg tooltip_fg ! } ! ! proc hide_canvas_tooltip {canvas} { ! $canvas delete tooltip_bg tooltip_fg ! } ! ! ############ completions ! ! set completion_closure {} ! ! proc propose_completions {self canvas x y text} { ! global class_list completion_closure ! set completion_closure [list $self $canvas $x $y $text] ! pd "pd update-class-list propose_completions2 ;" ! if {![info exists class_list]} { ! post_to_gui "loading class list..." ! ! } else { ! propose_completions2 ! } ! } ! ! proc propose_completions2 {} { ! global class_list completion_closure ! foreach {self canvas x y text} $completion_closure {} ! set r {} ! set n 0 ! foreach class [lsort $class_list] { ! if {[string length $text]==0 || [string first $text $class]>=0} { ! lappend r $class ! incr n ! } ! if {$n > 20} {lappend r ...; break} ! } ! #post_to_gui "$r\n" ! show_canvas_tooltip $self $canvas $x $y [string map {" " "\n"} $r] ! } ! ! ############ rendering ! source $pd_guidir/bin/u_object.tk ! ############ theming ! set look(objectfg) #000000 set look(objectbg) #ffffff Index: g_rtext.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_rtext.c,v retrieving revision 1.1.1.2.2.6.2.1 retrieving revision 1.1.1.2.2.6.2.2 diff -C2 -d -r1.1.1.2.2.6.2.1 -r1.1.1.2.2.6.2.2 *** g_rtext.c 5 Mar 2004 19:27:52 -0000 1.1.1.2.2.6.2.1 --- g_rtext.c 16 Mar 2004 21:54:02 -0000 1.1.1.2.2.6.2.2 *************** *** 45,49 **** { t_rtext *x = (t_rtext *)getbytes(sizeof *x); - int w = 0, h = 0, indx; x->x_height = -1; x->x_text = who; --- 45,48 ---- *************** *** 274,278 **** char *decimal = 0, *nextchar, *ebuf = x->x_buf + bufsize, *s1, *s2; - int ndecimals; for (decimal = x->x_buf; decimal < ebuf; decimal++) if (*decimal == '.') --- 273,276 ---- *************** *** 320,324 **** int rtext_width(t_rtext *x) { ! int w = 0, h = 0, indx; rtext_senditup(x, SEND_CHECK, &w, &h, &indx); return (w); --- 318,322 ---- int rtext_width(t_rtext *x) { ! int w=0, h=0, indx; rtext_senditup(x, SEND_CHECK, &w, &h, &indx); return (w); *************** *** 387,394 **** --- 385,401 ---- int w = 0, h = 0, indx, i, newsize, ndel; char *s1, *s2; + t_glist *glist = x->x_glist; + t_canvas *canvas = glist_getcanvas(glist); if (keynum) { int n = keynum; if (n == '\r') n = '\n'; + if (n == '\t') { + post("TAB: «%s»",x->x_buf); + sys_vgui("propose_completions %x .x%x.c %d %d {%*s}\n", x, canvas, + text_xpix(x->x_text, x->x_glist) + x->x_drawnwidth, + text_ypix(x->x_text, x->x_glist) + x->x_drawnheight/2, + x->x_bufsize, x->x_buf); + } if (n == '\b') /* backspace */ { Index: m_glob.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_glob.c,v retrieving revision 1.1.1.2.2.3.2.2 retrieving revision 1.1.1.2.2.3.2.3 diff -C2 -d -r1.1.1.2.2.3.2.2 -r1.1.1.2.2.3.2.3 *** m_glob.c 22 Feb 2004 18:00:47 -0000 1.1.1.2.2.3.2.2 --- m_glob.c 16 Mar 2004 21:54:02 -0000 1.1.1.2.2.3.2.3 *************** *** 63,66 **** --- 63,69 ---- } + EXTERN char *class_gethelpdir(t_class *c); + EXTERN void open_via_helppath(const char *name, const char *dir); + /* see also canvas_done_popup */ void glob_help(t_pd *bogus, t_symbol *s) { *************** *** 74,78 **** } ! void glob_update_class_list (void) { int i; int n = pd_objectmaker->c_nmethod; --- 77,81 ---- } ! void glob_update_class_list (t_pd *self, t_symbol *callback) { int i; int n = pd_objectmaker->c_nmethod; *************** *** 82,90 **** } sys_gui("}\n"); ! sys_vgui("class_list_callback\n"); } EXTERN void glob_update_class_info (t_pd *bogus, t_symbol *s); EXTERN void glob_update_path (void); void glob_init(void) --- 85,94 ---- } sys_gui("}\n"); ! sys_vgui("%s\n",callback->s_name); } EXTERN void glob_update_class_info (t_pd *bogus, t_symbol *s); EXTERN void glob_update_path (void); + EXTERN void glob_redraw (void); void glob_init(void) *************** *** 130,134 **** gensym("tooltips"), A_DEFFLOAT, 0); class_addmethod(glob_pdobject, (t_method)glob_update_class_list, ! gensym("update-class-list"), 0); class_addmethod(glob_pdobject, (t_method)glob_update_class_info, gensym("update-class-info"), A_SYMBOL, 0); --- 134,138 ---- gensym("tooltips"), A_DEFFLOAT, 0); class_addmethod(glob_pdobject, (t_method)glob_update_class_list, ! gensym("update-class-list"), A_SYMBOL, 0); class_addmethod(glob_pdobject, (t_method)glob_update_class_info, gensym("update-class-info"), A_SYMBOL, 0); *************** *** 137,140 **** --- 141,146 ---- class_addmethod(glob_pdobject, (t_method)glob_help, gensym("help"), A_SYMBOL, 0); + class_addmethod(glob_pdobject, (t_method)glob_redraw, + gensym("redraw"), 0); #ifdef UNIX class_addmethod(glob_pdobject, (t_method)glob_ping, gensym("ping"), 0);

1 0

pd/src u_object.tk,1.1.2.8,1.1.2.9
by Mathieu Bouchard 16 Mar '04

16 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17413 Modified Files: Tag: impd_0_37 u_object.tk Log Message: i'll "standardize" on using the global array $_ to do OO Tcl... Index: u_object.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/u_object.tk,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** u_object.tk 14 Mar 2004 22:33:55 -0000 1.1.2.8 --- u_object.tk 16 Mar 2004 21:53:16 -0000 1.1.2.9 *************** *** 16,28 **** } - set palette { - #fcfcfc #a0a0a0 #404040 #fce0e0 #fce0c0 - #fcfcc8 #d8fcd8 #d8fcfc #dce4fc #f8d8fc - #e0e0e0 #7c7c7c #202020 #fc2828 #fcac44 - #e8e828 #14e814 #28f4f4 #3c50fc #f430f0 - #bcbcbc #606060 #000000 #8c0808 #583000 - #782814 #285014 #004450 #001488 #580050 - } - proc parse_color {c} { #puts "parse_color: $c" --- 16,19 ---- *************** *** 57,61 **** proc update_object {x d} { ! global data global fields set class [lindex $d 4] --- 48,52 ---- proc update_object {x d} { ! global _ global fields set class [lindex $d 4] *************** *** 64,68 **** set i 0 foreach f $fields($class) { ! set data($x:$f) [lindex $d $i] incr i } --- 55,59 ---- set i 0 foreach f $fields($class) { ! set _($x:$f) [lindex $d $i] incr i } *************** *** 244,256 **** proc numbox_draw {tag canvas} { global look ! global data ! set x1 $data($tag:x1) ! set y1 $data($tag:y1) ! set xs [expr 10*$data($tag:w)] ! set ys $data($tag:h) set x2 [expr $x1+$xs] set y2 [expr $y1+$ys] ! set ins [expr [string compare $data($tag:snd) empty]==0] ! set outs [expr [string compare $data($tag:snd) empty]==0] set points [list $x1 $y1 [expr $x2-4] $y1 $x2 [expr $y1+4] $x2 $y2 $x1 $y2] if {[llength [$canvas gettags ${tag}BASE]] != 0} { --- 235,247 ---- proc numbox_draw {tag canvas} { global look ! global _ ! set x1 $_($tag:x1) ! set y1 $_($tag:y1) ! set xs [expr 10*$_($tag:w)] ! set ys $_($tag:h) set x2 [expr $x1+$xs] set y2 [expr $y1+$ys] ! set ins [expr [string compare $_($tag:snd) empty]==0] ! set outs [expr [string compare $_($tag:snd) empty]==0] set points [list $x1 $y1 [expr $x2-4] $y1 $x2 [expr $y1+4] $x2 $y2 $x1 $y2] if {[llength [$canvas gettags ${tag}BASE]] != 0} { *************** *** 283,287 **** proc bluebox_draw {canvas tag x1 y1 xs ys ins outs colour} { ! global data set x2 [expr $x1+$xs] set y2 [expr $y1+$ys] --- 274,278 ---- proc bluebox_draw {canvas tag x1 y1 xs ys ins outs colour} { ! global _ set x2 [expr $x1+$xs] set y2 [expr $y1+$ys] *************** *** 290,295 **** set xyc [list [expr $x2-1] [expr $y1+1] [expr $x2-1] [expr $y2-1] [expr $x1+1] [expr $y2-1]] set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! #puts "bluebox: [parse_color $data($tag:col0)] [parse_color $data($tag:col1)] [parse_color $data($tag:col2)]" ! set color [bluify [parse_color $data($tag:col0)]] if {$isnew} { $canvas create rectangle $xya -tag ${tag}BASE -fill $color --- 281,286 ---- set xyc [list [expr $x2-1] [expr $y1+1] [expr $x2-1] [expr $y2-1] [expr $x1+1] [expr $y2-1]] set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! #puts "bluebox: [parse_color $_($tag:col0)] [parse_color $_($tag:col1)] [parse_color $_($tag:col2)]" ! set color [bluify [parse_color $_($tag:col0)]] if {$isnew} { $canvas create rectangle $xya -tag ${tag}BASE -fill $color *************** *** 322,341 **** proc radio_draw {tag canvas} { ! global data set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! switch $data($tag:class) { hradio {set orient 0} hdl {set orient 0} vradio {set orient 1} vdl {set orient 1} } ! set x1 $data($tag:x1) ! set y1 $data($tag:y1) ! set n $data($tag:n) ! set xs [expr $data($tag:w)*($orient?1:$n)] ! set ys [expr $data($tag:w)*($orient?$n:1)] set x2 [expr $x1+$xs] set y2 [expr $y1+$ys] ! set ins [expr [string compare $data($tag:snd) empty]==0] ! set outs [expr [string compare $data($tag:snd) empty]==0] ! set colour [parse_color $data($tag:col0)] bluebox_draw $canvas ${tag} $x1 $y1 $xs $ys $ins $outs $colour if {$orient} {set size $ys} {set size $xs} --- 313,332 ---- proc radio_draw {tag canvas} { ! global _ set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! switch $_($tag:class) { hradio {set orient 0} hdl {set orient 0} vradio {set orient 1} vdl {set orient 1} } ! set x1 $_($tag:x1) ! set y1 $_($tag:y1) ! set n $_($tag:n) ! set xs [expr $_($tag:w)*($orient?1:$n)] ! set ys [expr $_($tag:w)*($orient?$n:1)] set x2 [expr $x1+$xs] set y2 [expr $y1+$ys] ! set ins [expr [string compare $_($tag:snd) empty]==0] ! set outs [expr [string compare $_($tag:snd) empty]==0] ! set colour [parse_color $_($tag:col0)] bluebox_draw $canvas ${tag} $x1 $y1 $xs $ys $ins $outs $colour if {$orient} {set size $ys} {set size $xs} *************** *** 369,381 **** proc slider_draw {tag canvas} { set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! global data ! set x1 $data($tag:x1) ! set y1 $data($tag:y1) ! set xs $data($tag:w) ! set ys $data($tag:h) ! set ins [expr [string compare $data($tag:snd) empty]==0] ! set outs [expr [string compare $data($tag:snd) empty]==0] ! switch $data($tag:class) {hsl {set orient 0} vsl {set orient 1}} ! set colour [parse_color $data($tag:col0)] bluebox_draw $canvas $tag $x1 $y1 $xs $ys $ins $outs $colour if {$isnew} { --- 360,372 ---- proc slider_draw {tag canvas} { set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! global _ ! set x1 $_($tag:x1) ! set y1 $_($tag:y1) ! set xs $_($tag:w) ! set ys $_($tag:h) ! set ins [expr [string compare $_($tag:snd) empty]==0] ! set outs [expr [string compare $_($tag:snd) empty]==0] ! switch $_($tag:class) {hsl {set orient 0} vsl {set orient 1}} ! set colour [parse_color $_($tag:col0)] bluebox_draw $canvas $tag $x1 $y1 $xs $ys $ins $outs $colour if {$isnew} { *************** *** 419,433 **** proc label_draw {tag canvas} { ! global data set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! set x1 $data($tag:x1) ! set y1 $data($tag:y1) ! set lx [expr $x1+$data($tag:ldx)] ! set ly [expr $y1+$data($tag:ldy)] ! set label $data($tag:lab); switch $label { empty { set label "" }} set lfont [list \ ! [lindex {courier helvetica times} $data($tag:fstyle)] \ ! $data($tag:fs) bold] ! set lcolor [parse_color $data($tag:col2)] if {$isnew} { $canvas create text $lx $ly -text $label -anchor w \ --- 410,424 ---- proc label_draw {tag canvas} { ! global _ set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! set x1 $_($tag:x1) ! set y1 $_($tag:y1) ! set lx [expr $x1+$_($tag:ldx)] ! set ly [expr $y1+$_($tag:ldy)] ! set label $_($tag:lab); switch $label { empty { set label "" }} set lfont [list \ ! [lindex {courier helvetica times} $_($tag:fstyle)] \ ! $_($tag:fs) bold] ! set lcolor [parse_color $_($tag:col2)] if {$isnew} { $canvas create text $lx $ly -text $label -anchor w \ *************** *** 444,458 **** proc bang_draw {tag canvas} { ! global data set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! set x1 $data($tag:x1) ! set y1 $data($tag:y1) ! set xs $data($tag:w) ! set ys $data($tag:w) set x2 [expr $x1+$xs] set y2 [expr $y1+$ys] ! set ins [expr [string compare $data($tag:snd) empty]==0] ! set outs [expr [string compare $data($tag:snd) empty]==0] ! set colour [parse_color $data($tag:col0)] bluebox_draw $canvas $tag $x1 $y1 $xs $ys $ins $outs $colour io_draw $canvas $tag $x1 $y1 $xs $ys $ins $outs --- 435,449 ---- proc bang_draw {tag canvas} { ! global _ set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! set x1 $_($tag:x1) ! set y1 $_($tag:y1) ! set xs $_($tag:w) ! set ys $_($tag:w) set x2 [expr $x1+$xs] set y2 [expr $y1+$ys] ! set ins [expr [string compare $_($tag:snd) empty]==0] ! set outs [expr [string compare $_($tag:snd) empty]==0] ! set colour [parse_color $_($tag:col0)] bluebox_draw $canvas $tag $x1 $y1 $xs $ys $ins $outs $colour io_draw $canvas $tag $x1 $y1 $xs $ys $ins $outs *************** *** 479,493 **** proc toggle_draw {tag canvas} { ! global data ! set x1 $data($tag:x1) ! set y1 $data($tag:y1) ! set xs $data($tag:w) ! set ys $data($tag:w) set x2 [expr $x1+$xs] set y2 [expr $y1+$ys] ! set ins [expr [string compare $data($tag:snd) empty]==0] ! set outs [expr [string compare $data($tag:snd) empty]==0] set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! set colour [parse_color $data($tag:col0)] bluebox_draw $canvas ${tag} $x1 $y1 $xs $ys $ins $outs $colour io_draw $canvas $tag $x1 $y1 $xs $ys $ins $outs --- 470,484 ---- proc toggle_draw {tag canvas} { ! global _ ! set x1 $_($tag:x1) ! set y1 $_($tag:y1) ! set xs $_($tag:w) ! set ys $_($tag:w) set x2 [expr $x1+$xs] set y2 [expr $y1+$ys] ! set ins [expr [string compare $_($tag:snd) empty]==0] ! set outs [expr [string compare $_($tag:snd) empty]==0] set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! set colour [parse_color $_($tag:col0)] bluebox_draw $canvas ${tag} $x1 $y1 $xs $ys $ins $outs $colour io_draw $canvas $tag $x1 $y1 $xs $ys $ins $outs *************** *** 508,512 **** } label_draw $tag $canvas ! toggle_set $tag $canvas $data($tag:on) } --- 499,503 ---- } label_draw $tag $canvas ! toggle_set $tag $canvas $_($tag:on) } *************** *** 529,542 **** proc vu_draw {tag canvas} { set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! set x1 $data($tag:x1) ! set y1 $data($tag:y1) ! set xs $data($tag:w) ! set ys $data($tag:w) set x2 [expr $x1+$xs] set y2 [expr $y1+$ys] ! set ins [expr [string compare $data($tag:snd) empty]==0] ! set outs [expr [string compare $data($tag:snd) empty]==0] set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! set colour [parse_color $data($tag:col0)] bluebox_draw $tag $canvas ${tag} $x1 $y1 $xs $ys $ins $outs $colour } --- 520,533 ---- proc vu_draw {tag canvas} { set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! set x1 $_($tag:x1) ! set y1 $_($tag:y1) ! set xs $_($tag:w) ! set ys $_($tag:w) set x2 [expr $x1+$xs] set y2 [expr $y1+$ys] ! set ins [expr [string compare $_($tag:snd) empty]==0] ! set outs [expr [string compare $_($tag:snd) empty]==0] set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! set colour [parse_color $_($tag:col0)] bluebox_draw $tag $canvas ${tag} $x1 $y1 $xs $ys $ins $outs $colour }

1 0

pd/src ChangeLog,1.1.2.3,1.1.2.4
by Mathieu Bouchard 16 Mar '04

16 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2386 Modified Files: Tag: impd_0_37 ChangeLog Log Message: . Index: ChangeLog =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/ChangeLog,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** ChangeLog 5 Mar 2004 18:33:47 -0000 1.1.2.3 --- ChangeLog 16 Mar 2004 20:46:15 -0000 1.1.2.4 *************** *** 21,24 **** * moving rendering to the TCL side ! * new file u_object.tk --- 21,34 ---- * moving rendering to the TCL side ! * new file u_object.tk ! * added pd_scanargs() ! * added color schemes (modifiable in u_main.tk) ! * switched to a jmaxish look ! * merged g_vdial.c into g_hdial.c ! * merged g_vslider.c into g_hslider.c ! * added pd_upload() ! * added Patcher->Edit->Redraw ! * added proc populate_menu ! * added ~/.pd.tk loading ! * rewrote all of the property dialogs

1 0

pd/src g_vslider.c,1.1.1.3.2.2.2.4,NONE g_vdial.c,1.1.1.4.2.2.2.4,NONE
by Mathieu Bouchard 16 Mar '04

16 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4501 Removed Files: Tag: impd_0_37 g_vslider.c g_vdial.c Log Message: vsliders,vdials only exist in your imagination. --- g_vslider.c DELETED --- --- g_vdial.c DELETED ---

1 0

pd/src makefile.in,1.1.1.3.2.12.2.2,1.1.1.3.2.12.2.3
by Mathieu Bouchard 16 Mar '04

16 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4065 Modified Files: Tag: impd_0_37 makefile.in Log Message: adding -g and replacing -Wunused by -Wunused-parameter so we can actually find them useless variables. Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.1.1.3.2.12.2.2 retrieving revision 1.1.1.3.2.12.2.3 diff -C2 -d -r1.1.1.3.2.12.2.2 -r1.1.1.3.2.12.2.3 *** makefile.in 23 Feb 2004 00:44:25 -0000 1.1.1.3.2.12.2.2 --- makefile.in 16 Mar 2004 18:25:17 -0000 1.1.1.3.2.12.2.3 *************** *** 11,15 **** MANDIR = @mandir@ ! MORECFLAGS = @MORECFLAGS@ INCLUDE = -I. --- 11,15 ---- MANDIR = @mandir@ ! MORECFLAGS = @MORECFLAGS@ -g INCLUDE = -I. *************** *** 22,26 **** OPT_CFLAGS = @OPT_CFLAGS@ WARN_CFLAGS = -Wall -W -Wstrict-prototypes \ ! -Wno-unused -Wno-parentheses -Wno-switch ARCH_CFLAGS = -DPD -DUNIX --- 22,26 ---- OPT_CFLAGS = @OPT_CFLAGS@ WARN_CFLAGS = -Wall -W -Wstrict-prototypes \ ! -Wno-unused-parameter -Wno-parentheses -Wno-switch ARCH_CFLAGS = -DPD -DUNIX *************** *** 34,38 **** g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \ g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c \ ! g_toggle.c g_vdial.c g_vslider.c g_vumeter.c \ m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \ m_conf.c m_glob.c m_sched.c \ --- 34,38 ---- g_scalar.c g_traversal.c g_guiconnect.c g_readwrite.c g_editor.c \ g_all_guis.c g_bang.c g_hdial.c g_hslider.c g_mycanvas.c g_numbox.c \ ! g_toggle.c g_vumeter.c \ m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \ m_conf.c m_glob.c m_sched.c \

1 0

externals/miXed/shared/toxy scriptlet.c,1.7,1.8
by Krzysztof Czaja 16 Mar '04

16 Mar '04

Update of /cvsroot/pure-data/externals/miXed/shared/toxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11709/shared/toxy Modified Files: scriptlet.c Log Message: toxy alpha8 Index: scriptlet.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/shared/toxy/scriptlet.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** scriptlet.c 10 Mar 2004 10:55:53 -0000 1.7 --- scriptlet.c 16 Mar 2004 12:13:53 -0000 1.8 *************** *** 349,353 **** int result = 1; char *bp = ibuf, *ep = ibuf, *ep1; ! char dotbuf[64]; /* LATER reestimation */ if (!sp->s_separator) sp->s_separator = ' '; --- 349,353 ---- int result = 1; char *bp = ibuf, *ep = ibuf, *ep1; ! char dotbuf[256]; /* FIXME requires a growable per-scriptlet buffer. */ if (!sp->s_separator) sp->s_separator = ' ';

1 0

externals/miXed/cyclone/hammer zl.c,1.2,1.3
by Krzysztof Czaja 16 Mar '04

16 Mar '04

Update of /cvsroot/pure-data/externals/miXed/cyclone/hammer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11709/cyclone/hammer Modified Files: zl.c Log Message: toxy alpha8 Index: zl.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/zl.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** zl.c 11 Sep 2003 09:04:32 -0000 1.2 --- zl.c 16 Mar 2004 12:13:53 -0000 1.3 *************** *** 3,6 **** --- 3,8 ---- * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ + /* FIXME zl sub */ + #include <string.h> #include "m_pd.h"

1 0

externals/miXed/test/toxy kb.wid,1.2,1.3 multiscale-test.pd,1.2,1.3 multiscale.wid,1.2,1.3 setup.wid,1.1,1.2
by Krzysztof Czaja 16 Mar '04

16 Mar '04

Update of /cvsroot/pure-data/externals/miXed/test/toxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11709/test/toxy Modified Files: kb.wid multiscale-test.pd multiscale.wid setup.wid Log Message: toxy alpha8 Index: multiscale-test.pd =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/test/toxy/multiscale-test.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** multiscale-test.pd 10 Mar 2004 10:55:56 -0000 1.2 --- multiscale-test.pd 16 Mar 2004 12:13:54 -0000 1.3 *************** *** 1,17 **** #N canvas 39 49 800 548 12; #X obj 25 84 widget multiscale m1 #n 50 #dx 15 #dy 90; ! #X obj 25 260 widget multiscale m2 #bg red #dy 120; #X msg 25 52 #n \$1; #X floatatom 25 23 5 0 0 0 - - -; #N canvas 0 0 450 300 graph1 0; #X array t 50 float 0; ! #X coords 0 1 49 0 400 140 1; #X restore 296 206 graph; ! #X obj 265 509 tabwrite t; ! #X obj 27 408 unpack; ! #X floatatom 27 445 5 0 0 0 - - -; ! #X floatatom 100 445 5 0 0 0 - - -; ! #X floatatom 109 196 5 0 0 0 - - -; ! #X obj 589 509 tabread t; #X obj 589 477 t 0 0; #X obj 589 413 until; --- 1,17 ---- #N canvas 39 49 800 548 12; #X obj 25 84 widget multiscale m1 #n 50 #dx 15 #dy 90; ! #X obj 25 326 widget multiscale m2 #bg red #dy 120; #X msg 25 52 #n \$1; #X floatatom 25 23 5 0 0 0 - - -; #N canvas 0 0 450 300 graph1 0; #X array t 50 float 0; ! #X coords 0 100 49 0 400 140 1; #X restore 296 206 graph; ! #X obj 265 511 tabwrite t; ! #X obj 25 474 unpack; ! #X floatatom 25 511 5 0 0 0 - - -; ! #X floatatom 98 511 5 0 0 0 - - -; ! #X floatatom 94 199 5 0 0 0 - - -; ! #X obj 589 511 tabread t; #X obj 589 477 t 0 0; #X obj 589 413 until; *************** *** 20,27 **** #X obj 589 445 int; #X obj 629 445 + 1; ! #X obj 527 510 pack; #X msg 265 445 tot pd [concat rcount .#n .`.:]; #X obj 265 408 t b b; ! #X msg 653 414 0; #X obj 127 23 widget button b -command .<.> -bg yellow -width 3 -height 2; --- 20,27 ---- #X obj 589 445 int; #X obj 629 445 + 1; ! #X obj 527 511 pack; #X msg 265 445 tot pd [concat rcount .#n .`.:]; #X obj 265 408 t b b; ! #X msg 653 413 0; #X obj 127 23 widget button b -command .<.> -bg yellow -width 3 -height 2; *************** *** 29,32 **** --- 29,34 ---- #X obj 25 228 pack; #X floatatom 25 199 5 0 0 0 - - -; + #X msg 95 282 #hi \$1; + #X floatatom 95 246 5 0 0 0 - - -; #X connect 1 0 6 0; #X connect 2 0 0 0; *************** *** 53,54 **** --- 55,58 ---- #X connect 23 0 1 0; #X connect 24 0 23 0; + #X connect 25 0 1 0; + #X connect 26 0 25 0; Index: kb.wid =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/test/toxy/kb.wid,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kb.wid 9 Mar 2004 12:41:21 -0000 1.2 --- kb.wid 16 Mar 2004 12:13:54 -0000 1.3 *************** *** 60,63 **** ::toxy::kb .- .| . .#oct .#size ! # undo the "bind Canvas <1> {+focus %W}" in the setup part above bind .- <FocusIn> {focus .^.c} --- 60,63 ---- ::toxy::kb .- .| . .#oct .#size ! # undo the "bind Canvas <1> {+focus %W}" from the setup.wid bind .- <FocusIn> {focus .^.c} Index: setup.wid =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/test/toxy/setup.wid,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** setup.wid 9 Mar 2004 12:41:21 -0000 1.1 --- setup.wid 16 Mar 2004 12:13:54 -0000 1.2 *************** *** 12,16 **** # if defined, otherwise try setting -variable and -textvariable traces. ! proc ::toxy::itemdotrace {target varname ndxname op} { if {[catch {set v [set $varname]} res] == 0} { if {$v != [set $varname.last]} { --- 12,16 ---- # if defined, otherwise try setting -variable and -textvariable traces. ! proc ::toxy::item_dotrace {target varname ndxname op} { if {[catch {set v [set $varname]} res] == 0} { if {$v != [set $varname.last]} { *************** *** 19,30 **** set $varname.last $v } ! } else { puts stderr [concat failed ::toxy::itemdotrace: $res] } } ! proc ::toxy::itembindtrace {varname mastername ndxname op} { set $varname [set $mastername] } ! proc ::toxy::itemsettrace {op path target varname} { if {[catch {$path cget $op} res] == 0} { if {$res == ""} { --- 19,30 ---- set $varname.last $v } ! } else { puts stderr [concat failed ::toxy::item_dotrace: $res] } } ! proc ::toxy::item_bindtrace {varname mastername ndxname op} { set $varname [set $mastername] } ! proc ::toxy::item_settrace {op path target varname} { if {[catch {$path cget $op} res] == 0} { if {$res == ""} { *************** *** 34,47 **** } else { if {[info tclversion] < 8.4} { ! trace variable $res w "::toxy::itembindtrace $varname" } else { ! trace add variable $res write "::toxy::itembindtrace $varname" } } if {![info exists $varname.last]} { set $varname.last "" } if {[info tclversion] < 8.4} { ! trace variable $varname w "::toxy::itemdotrace $target" } else { ! trace add variable $varname write "::toxy::itemdotrace $target" } return --- 34,47 ---- } else { if {[info tclversion] < 8.4} { ! trace variable $res w "::toxy::item_bindtrace $varname" } else { ! trace add variable $res write "::toxy::item_bindtrace $varname" } } if {![info exists $varname.last]} { set $varname.last "" } if {[info tclversion] < 8.4} { ! trace variable $varname w "::toxy::item_dotrace $target" } else { ! trace add variable $varname write "::toxy::item_dotrace $target" } return *************** *** 50,54 **** # LATER revisit -- seems clumsy and fragile ! proc ::toxy::itemremovetrace {op path varname} { if {[catch {$path cget $op} res] == 0} { if {$res == $varname} { --- 50,54 ---- # LATER revisit -- seems clumsy and fragile ! proc ::toxy::item_removetrace {op path varname} { if {[catch {$path cget $op} res] == 0} { if {$res == $varname} { *************** *** 58,65 **** } elseif {$res != ""} { if {[info tclversion] < 8.4} { ! catch { trace vdelete $res w "::toxy::itembindtrace $varname" } } else { catch { trace remove variable \ ! $res write "::toxy::itembindtrace $varname" } } } --- 58,65 ---- } elseif {$res != ""} { if {[info tclversion] < 8.4} { ! catch { trace vdelete $res w "::toxy::item_bindtrace $varname" } } else { catch { trace remove variable \ ! $res write "::toxy::item_bindtrace $varname" } } } *************** *** 67,73 **** } ! proc ::toxy::itemdestroy {path varname} { ! ::toxy::itemremovetrace -variable $path $varname.var ! ::toxy::itemremovetrace -textvariable $path $varname.txt if {[info tclversion] < 8.4} { catch { unset $varname.last $varname.var $varname.txt $varname } --- 67,73 ---- } ! proc ::toxy::item_destroy {path varname} { ! ::toxy::item_removetrace -variable $path $varname.var ! ::toxy::item_removetrace -textvariable $path $varname.txt if {[info tclversion] < 8.4} { catch { unset $varname.last $varname.var $varname.txt $varname } *************** *** 78,82 **** } ! proc ::toxy::itemgetconfig {path target} { pd $target.rp _config $target.rp [$path cget -bg] \ [winfo reqwidth $path] [winfo reqheight $path] \ --- 78,82 ---- } ! proc ::toxy::item_getconfig {path target} { pd $target.rp _config $target.rp [$path cget -bg] \ [winfo reqwidth $path] [winfo reqheight $path] \ *************** *** 84,88 **** } ! proc ::toxy::itemvisconfig {path target name varname cvpath px py} { if {[info exists ::toxy::itemoptions]} { set failed [catch {eval $path config $::toxy::itemoptions} res] --- 84,88 ---- } ! proc ::toxy::item_visconfig {path target name varname cvpath px py} { if {[info exists ::toxy::itemoptions]} { set failed [catch {eval $path config $::toxy::itemoptions} res] *************** *** 99,113 **** set needtraces 0 } else { ! set needtraces 1 } if {$needtraces != 0} { ! if {[catch {::toxy::itemsettrace -variable \ $path $target $varname.var} res1]} { ! error [concat in ::toxy::itemsettrace: $res1] } ! if {[catch {::toxy::itemsettrace -textvariable \ $path $target $varname.txt} res2]} { ! error [concat in ::toxy::itemsettrace: $res2] } # puts stderr [concat traces: ($res1) ($res2)] --- 99,114 ---- set needtraces 0 } else { ! # set needtraces 1 ! set needtraces 0 } if {$needtraces != 0} { ! if {[catch {::toxy::item_settrace -variable \ $path $target $varname.var} res1]} { ! error [concat in ::toxy::item_settrace: $res1] } ! if {[catch {::toxy::item_settrace -textvariable \ $path $target $varname.txt} res2]} { ! error [concat in ::toxy::item_settrace: $res2] } # puts stderr [concat traces: ($res1) ($res2)] *************** *** 133,142 **** } ! ::toxy::itemgetconfig $path $target return } ! proc ::toxy::itemvis {tkclass path target name varname cvpath px py} { if {[winfo exists $path]} { # puts stderr [concat $path exists] --- 134,143 ---- } ! ::toxy::item_getconfig $path $target return } ! proc ::toxy::item_vis {tkclass path target name varname cvpath px py} { if {[winfo exists $path]} { # puts stderr [concat $path exists] *************** *** 146,150 **** } if {$::toxy::itemfailure == 0} { ! set ::toxy::itemfailure [catch {::toxy::itemvisconfig \ $path $target $name $varname $cvpath $px $py} \ ::toxy::itemerrmess] --- 147,151 ---- } if {$::toxy::itemfailure == 0} { ! set ::toxy::itemfailure [catch {::toxy::item_visconfig \ $path $target $name $varname $cvpath $px $py} \ ::toxy::itemerrmess] *************** *** 157,166 **** } # FIXME ! proc ::toxy::scalecommand {target sel v} { pd [concat $target $sel $v \;] } ! proc ::toxy::popupcommand {path target remote i text} { set [$path cget -textvariable] $text pd [concat $target _cb $i \;] --- 158,213 ---- } + # empirically, binding event coords as %X - [winfo rootx $cvpath] works + # better, than %x + [winfo x %W], or %x + t->te_xpix, LATER investigate + + proc ::toxy::item_click {target cvpath x y b f} { + pd $target.rp _click \ + [$cvpath canvasx [expr {$x - [winfo rootx $cvpath]}]] \ + [$cvpath canvasy [expr {$y - [winfo rooty $cvpath]}]] $b $f\; + } + + proc ::toxy::item_inout {target v} { + pd [concat $target.rp _inout $v \;] + } + + proc ::toxy::master_release {target cvpath x y b} { + ::toxy::item_inout $target 3 + # pdtk_canvas_mouseup is a hack, which we must call anyway + pdtk_canvas_mouseup $cvpath \ + [expr {$x - [winfo rootx $cvpath]}] \ + [expr {$y - [winfo rooty $cvpath]}] $b + } + + proc ::toxy::master_motion {target cvpath x y} { + pd $target.rp _motion \ + [$cvpath canvasx [expr {$x - [winfo rootx $cvpath]}]] \ + [$cvpath canvasy [expr {$y - [winfo rooty $cvpath]}]] 0 \; + } + + proc ::toxy::master {path toppath cvpath target} { + # FIXME subitem handling in megawidgets + bind $path <ButtonRelease> "::toxy::master_release $target $cvpath %X %Y %b" + bind $path <1> "::toxy::item_click $target $cvpath %X %Y %b 0" + bind $path <Shift-1> "::toxy::item_click $target $cvpath %X %Y %b 1" + bind $path <Control-1> "::toxy::item_click $target $cvpath %X %Y %b 2" + bind $path <Control-Shift-1> "::toxy::item_click $target $cvpath %X %Y %b 3" + bind $path <Alt-1> "::toxy::item_click $target $cvpath %X %Y %b 4" + bind $path <Alt-Shift-1> "::toxy::item_click $target $cvpath %X %Y %b 5" + bind $path <Alt-Control-1> "::toxy::item_click $target $cvpath %X %Y %b 6" + bind $path <Alt-Control-Shift-1> \ + "::toxy::item_click $target $cvpath %X %Y %b 7" + bind $path <3> "::toxy::item_click $target $cvpath %X %Y %b 8" + + bind $path <Motion> "::toxy::master_motion $target $cvpath %X %Y" + bind $path <Enter> "::toxy::item_inout $target 1" + bind $path <Leave> "::toxy::item_inout $target 0" + } + # FIXME ! proc ::toxy::scale_command {target sel v} { pd [concat $target $sel $v \;] } ! proc ::toxy::popup_command {path target remote i text} { set [$path cget -textvariable] $text pd [concat $target _cb $i \;] *************** *** 181,185 **** incr i $path.pop add command -label [lindex $e 0] \ ! -command [concat ::toxy::popupcommand \ $path $target $remote $i \ [lindex $e [expr {[llength $e] > 1}]]] --- 228,232 ---- incr i $path.pop add command -label [lindex $e 0] \ ! -command [concat ::toxy::popup_command \ $path $target $remote $i \ [lindex $e [expr {[llength $e] > 1}]]] *************** *** 189,246 **** } - # empirically, binding event coords as %X - [winfo rootx $cvpath] works - # better, than %x + [winfo x %W], or %x + t->te_xpix, LATER investigate - - proc ::toxy::itemclick {target cvpath x y b f} { - pd $target.rp _click \ - [$cvpath canvasx [expr {$x - [winfo rootx $cvpath]}]] \ - [$cvpath canvasy [expr {$y - [winfo rooty $cvpath]}]] $b $f\; - } - - proc ::toxy::iteminout {target v} { - pd [concat $target.rp _inout $v \;] - } - - proc ::toxy::masterrelease {target cvpath x y b} { - ::toxy::iteminout $target 3 - # pdtk_canvas_mouseup is a hack, which we must call anyway - pdtk_canvas_mouseup $cvpath \ - [expr {$x - [winfo rootx $cvpath]}] \ - [expr {$y - [winfo rooty $cvpath]}] $b - } - - proc ::toxy::mastermotion {target cvpath x y} { - pd $target.rp _motion \ - [$cvpath canvasx [expr {$x - [winfo rootx $cvpath]}]] \ - [$cvpath canvasy [expr {$y - [winfo rooty $cvpath]}]] 0 \; - } - - proc ::toxy::masterinit {path target cvpath} { - set topitem [expr {[string index $cvpath end-1] == "."}] - # FIXME subitem handling - if {$topitem} { - bind $path <ButtonRelease> \ - "::toxy::masterrelease $target $cvpath %X %Y %b" - } - bind $path <1> "::toxy::itemclick $target $cvpath %X %Y %b 0" - bind $path <Shift-1> "::toxy::itemclick $target $cvpath %X %Y %b 1" - bind $path <Control-1> "::toxy::itemclick $target $cvpath %X %Y %b 2" - bind $path <Control-Shift-1> "::toxy::itemclick $target $cvpath %X %Y %b 3" - bind $path <Alt-1> "::toxy::itemclick $target $cvpath %X %Y %b 4" - bind $path <Alt-Shift-1> "::toxy::itemclick $target $cvpath %X %Y %b 5" - bind $path <Alt-Control-1> "::toxy::itemclick $target $cvpath %X %Y %b 6" - bind $path <Alt-Control-Shift-1> \ - "::toxy::itemclick $target $cvpath %X %Y %b 7" - bind $path <3> "::toxy::itemclick $target $cvpath %X %Y %b 8" - - bind $path <Motion> "::toxy::mastermotion $target $cvpath %X %Y" - bind $path <Enter> "::toxy::iteminout $target 1" - bind $path <Leave> "::toxy::iteminout $target 0" - } - # master initializer #> master ! ::toxy::masterinit .- .| .^.c # standard widget types --- 236,243 ---- } # master initializer #> master ! ::toxy::master .- .- .^.c .| # standard widget types *************** *** 252,256 **** #> float scale ! #. -command [concat ::toxy::scalecommand .| _cb] #. -bg pink -activebackground red -length 200 #. @float .- set .#1 --- 249,253 ---- #> float scale ! #. -command [concat ::toxy::scale_command .| _cb] #. -bg pink -activebackground red -length 200 #. @float .- set .#1 Index: multiscale.wid =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/test/toxy/multiscale.wid,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** multiscale.wid 10 Mar 2004 10:55:56 -0000 1.2 --- multiscale.wid 16 Mar 2004 12:13:54 -0000 1.3 *************** *** 1,3 **** ! proc ::toxy::multiscalecommand {target sel ndx v} { pd [concat $target $sel $v $ndx \;] } --- 1,3 ---- ! proc ::toxy::multiscale_command {target sel ndx v} { pd [concat $target $sel $v $ndx \;] } *************** *** 15,19 **** } ! proc ::toxy::multiscale {path target remote count dx dy bg} { if {[winfo exists $path.s0]} { # puts stderr [concat $path.s0 exists] --- 15,19 ---- } ! proc ::toxy::multiscale {path cvpath target remote count lo hi res dx dy bg} { if {[winfo exists $path.s0]} { # puts stderr [concat $path.s0 exists] *************** *** 26,32 **** for {set ndx 0} {$ndx < $count} {incr ndx} { scale $path.s$ndx -width $dx -length $dy \ ! -from 1 -to 0 -resolution 0.01 \ -bg $bg -highlightthickness 0 \ ! -command [concat ::toxy::multiscalecommand $target _cb $ndx] if {$dx < 50} { $path.s$ndx config -showvalue 0 -relief flat --- 26,32 ---- for {set ndx 0} {$ndx < $count} {incr ndx} { scale $path.s$ndx -width $dx -length $dy \ ! -from $hi -to $lo -resolution $res \ -bg $bg -highlightthickness 0 \ ! -command [concat ::toxy::multiscale_command $target _cb $ndx] if {$dx < 50} { $path.s$ndx config -showvalue 0 -relief flat *************** *** 36,40 **** set id [$path create window $px $py -width $dx -height $dy \ -anchor nw -window $path.s$ndx -tags $path.s$ndx] ! ::toxy::masterinit $path.s$ndx $target $path incr px $dx } --- 36,40 ---- set id [$path create window $px $py -width $dx -height $dy \ -anchor nw -window $path.s$ndx -tags $path.s$ndx] ! ::toxy::master $path.s$ndx $path $cvpath $target incr px $dx } *************** *** 43,53 **** #> multiscale canvas ! #. #n 3 #dx 60 #dy 90 #. #bg yellow #. @float ::toxy::multiscale_float .- .| .#n .#1 #. @list ::toxy::multiscale_list .- .#n .#2 .#1 ! ::toxy::multiscale .- .| . .#n .#dx .#dy .#bg ! # undo the "bind Canvas <1> {+focus %W}" in the setup part above bind .- <FocusIn> {focus .^.c} --- 43,55 ---- #> multiscale canvas ! # FIXME fractional resolution: scalePtr->value == value fails in TkScaleSetValue ! #. #n 3 #lo 0 #hi 100 #res 1 ! #. #dx 60 #dy 90 #. #bg yellow #. @float ::toxy::multiscale_float .- .| .#n .#1 #. @list ::toxy::multiscale_list .- .#n .#2 .#1 ! ::toxy::multiscale .- .^.c .| . .#n .#lo .#hi .#res .#dx .#dy .#bg ! # undo the "bind Canvas <1> {+focus %W}" from the setup.wid bind .- <FocusIn> {focus .^.c}

1 0

externals/miXed/toxy Makefile,1.4,1.5 build_counter,1.6,1.7 widget.c,1.7,1.8 widgettype.c,1.5,1.6
by Krzysztof Czaja 16 Mar '04

16 Mar '04

Update of /cvsroot/pure-data/externals/miXed/toxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11709/toxy Modified Files: Makefile build_counter widget.c widgettype.c Log Message: toxy alpha8 Index: widgettype.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/widgettype.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** widgettype.c 10 Mar 2004 10:55:57 -0000 1.5 --- widgettype.c 16 Mar 2004 12:13:54 -0000 1.6 *************** *** 3,8 **** * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ - /* FIXME .#iprops crash */ - #include <stdio.h> #include <string.h> --- 3,6 ---- Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 10 Mar 2004 10:55:56 -0000 1.4 --- Makefile 16 Mar 2004 12:13:54 -0000 1.5 *************** *** 1,4 **** ROOT_DIR = .. ! WIQFILE = setup.wiq redefault: checkwiq $(WIQFILE) default checkwiq: --- 1,5 ---- ROOT_DIR = .. ! WIDPATH = $(ROOT_DIR)/test/toxy/setup.wid ! WIQFILE = $(notdir $(WIDPATH:.wid=.wiq)) redefault: checkwiq $(WIQFILE) default checkwiq: *************** *** 6,12 **** echo ERROR: empty file $(WIQFILE)... removed ; \ rm -f $(WIQFILE) ; fi ! $(WIQFILE): $(ROOT_DIR)/test/toxy/$(WIQFILE:.wiq=.wid) ! $(ROOT_DIR)/quoteinitializer $< \ ! '"puts stderr [concat loading built-in widget definitions]\n"' > $@ @if [ -f $(WIQFILE) ] && ! [ -s $(WIQFILE) ] ; then \ echo ERROR: quoteinitializer failed... $(WIQFILE) removed ; \ --- 7,18 ---- echo ERROR: empty file $(WIQFILE)... removed ; \ rm -f $(WIQFILE) ; fi ! $(WIQFILE): $(WIDPATH) ! @echo transferring widget definitions from \"$<\" to \"$@\" ! @cat $< | sed \ ! -e '1i// Do not edit this file (edit \"$<\", and run \"make\").' \ ! -e '1i//' \ ! -e '1i\"puts stderr [concat loading built-in widget definitions]\\n\"' \ ! -e 's/$[\\\"]$/\\\1/g' \ ! -e 's/^.*$$/\"&\\n\"/' > $@ @if [ -f $(WIQFILE) ] && ! [ -s $(WIQFILE) ] ; then \ echo ERROR: quoteinitializer failed... $(WIQFILE) removed ; \ Index: build_counter =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/build_counter,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** build_counter 10 Mar 2004 10:55:57 -0000 1.6 --- build_counter 16 Mar 2004 12:13:54 -0000 1.7 *************** *** 1,3 **** #define TOXY_VERSION "0.1" #define TOXY_RELEASE "alpha" ! #define TOXY_BUILD 7 --- 1,3 ---- #define TOXY_VERSION "0.1" #define TOXY_RELEASE "alpha" ! #define TOXY_BUILD 8 Index: widget.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/widget.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** widget.c 10 Mar 2004 10:55:57 -0000 1.7 --- widget.c 16 Mar 2004 12:13:54 -0000 1.8 *************** *** 240,243 **** --- 240,244 ---- } + /* LATER handle subitems */ static void widget_select(t_gobj *z, t_glist *glist, int flag) { *************** *** 314,318 **** static void widget_getconfig(t_widget *x) { ! sys_vgui("::toxy::itemgetconfig %s %s\n", widget_getmypathname(x, x->x_glist)->s_name, x->x_cbtarget->s_name); --- 315,319 ---- static void widget_getconfig(t_widget *x) { ! sys_vgui("::toxy::item_getconfig %s %s\n", widget_getmypathname(x, x->x_glist)->s_name, x->x_cbtarget->s_name); *************** *** 335,339 **** widget_pushoptions(x, 0); widget_pushinits(x); ! sys_vgui("::toxy::itemvis %s %s %s %s %s %s %g %g\n", x->x_tkclass->s_name, mypathname, x->x_cbtarget->s_name, x->x_name->s_name, --- 336,340 ---- widget_pushoptions(x, 0); widget_pushinits(x); ! sys_vgui("::toxy::item_vis %s %s %s %s %s %s %g %g\n", x->x_tkclass->s_name, mypathname, x->x_cbtarget->s_name, x->x_name->s_name, *************** *** 432,436 **** static void widget_novis(t_widget *x) { ! sys_vgui("::toxy::itemdestroy %s %s\n", widget_getmypathname(x, x->x_glist)->s_name, x->x_varname->s_name); } --- 433,437 ---- static void widget_novis(t_widget *x) { ! sys_vgui("::toxy::item_destroy %s %s\n", widget_getmypathname(x, x->x_glist)->s_name, x->x_varname->s_name); } *************** *** 707,710 **** --- 708,712 ---- } + /* LATER handle subitems */ static void widget__config(t_widget *x, t_symbol *target, t_symbol *bg, t_floatarg fw, t_floatarg fh, t_floatarg fst) *************** *** 752,755 **** --- 754,758 ---- /* see also widget_select() */ + /* LATER handle subitems */ static void widget__inout(t_widget *x, t_floatarg f) {

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
23
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 March 2004