Pd-cvs March 2004

pd-cvs@lists.iem.at

11 participants
225 discussions

pd/src u_object.tk,1.1.2.5,1.1.2.6 g_bang.c,1.1.1.3.2.2.2.4,1.1.1.3.2.2.2.5 g_canvas.c,1.1.1.4.2.7.2.2,1.1.1.4.2.7.2.3 g_editor.c,1.1.1.4.2.3.2.2,1.1.1.4.2.3.2.3 g_graph.c,1.1.1.3.2.3.2.1,1.1.1.3.2.3.2.2 g_hdial.c,1.1.1.4.2.2.2.4,1.1.1.4.2.2.2.5 g_hslider.c,1.1.1.3.2.2.2.4,1.1.1.3.2.2.2.5 g_numbox.c,1.1.1.4.2.2.2.2,1.1.1.4.2.2.2.3 g_text.c,1.1.1.4.2.2.2.2,1.1.1.4.2.2.2.3 g_toggle.c,1.1.1.3.2.2.2.3,1.1.1.3.2.2.2.4 g_vumeter.c,1.1.1.3.2.2.2.2,1.1.1.3.2.2.2.3
by matju＠users.sourceforge.net 08 Mar '04

08 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2600 Modified Files: Tag: impd_0_37 u_object.tk g_bang.c g_canvas.c g_editor.c g_graph.c g_hdial.c g_hslider.c g_numbox.c g_text.c g_toggle.c g_vumeter.c Log Message: now passing the x1,y1,width,height to Tcl instead of x1,y1,x2,y2 Index: u_object.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/u_object.tk,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** u_object.tk 8 Mar 2004 02:28:00 -0000 1.1.2.5 --- u_object.tk 8 Mar 2004 12:32:38 -0000 1.1.2.6 *************** *** 52,63 **** set look(iopos) 1 ! proc io_draw {canvas tag x1 y1 x2 y2 ins outs} { global look ! set width [expr $x2 - $x1] set fx $look(iopos) set fy $look(iopos) set nplus [expr $ins == 1 ? 1 : $ins-1] for {set i 0} {$i<$ins} {incr i} { ! set onset [expr $x1 + ($width - $look(iowidth)) * $i / $nplus] set points [list [expr $onset+$fx] [expr $y1-$fy] \ [expr $onset-$fx+$look(iowidth)] [expr $y1-$fy+$look(extrapix)]] --- 52,64 ---- set look(iopos) 1 ! proc io_draw {canvas tag x1 y1 xs ys ins outs} { global look ! set x2 [expr $x1+$xs] ! set y2 [expr $y1+$ys] set fx $look(iopos) set fy $look(iopos) set nplus [expr $ins == 1 ? 1 : $ins-1] for {set i 0} {$i<$ins} {incr i} { ! set onset [expr $x1 + ($xs - $look(iowidth)) * $i / $nplus] set points [list [expr $onset+$fx] [expr $y1-$fy] \ [expr $onset-$fx+$look(iowidth)] [expr $y1-$fy+$look(extrapix)]] *************** *** 70,74 **** set nplus [expr $outs == 1 ? 1 : $outs-1] for {set i 0} {$i<$outs} {incr i} { ! set onset [expr $x1 + ($width - $look(iowidth)) * $i / $nplus] set points [list [expr $onset+$fx] [expr $y2-1+$fy] \ [expr $onset-$fx+$look(iowidth)] [expr $y2+$fy]] --- 71,75 ---- set nplus [expr $outs == 1 ? 1 : $outs-1] for {set i 0} {$i<$outs} {incr i} { ! set onset [expr $x1 + ($xs - $look(iowidth)) * $i / $nplus] set points [list [expr $onset+$fx] [expr $y2-1+$fy] \ [expr $onset-$fx+$look(iowidth)] [expr $y2+$fy]] *************** *** 86,91 **** } ! proc objectbox_draw {canvas tag x1 y1 x2 y2 ins outs} { global look set xya [list $x1 $y1 $x2 $y2] set xyb [list [expr $x2-1] [expr $y1+1] [expr $x1+1] [expr $y1+1] [expr $x1+1] [expr $y2-1]] --- 87,94 ---- } ! proc objectbox_draw {canvas tag x1 y1 xs ys ins outs} { global look + set x2 [expr $x1+$xs] + set y2 [expr $y1+$ys] set xya [list $x1 $y1 $x2 $y2] set xyb [list [expr $x2-1] [expr $y1+1] [expr $x1+1] [expr $y1+1] [expr $x1+1] [expr $y2-1]] *************** *** 101,105 **** eval "$canvas create line $xyc -tag ${tag}++ -fill ${look(objectframe2)}" } ! io_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs } --- 104,108 ---- eval "$canvas create line $xyc -tag ${tag}++ -fill ${look(objectframe2)}" } ! io_draw $canvas $tag $x1 $y1 $xs $ys $ins $outs } *************** *** 115,120 **** } ! proc brokenbox_draw {canvas tag x1 y1 x2 y2 ins outs} { ! objectbox_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs $canvas itemconfigure ${tag}.l -fill #ffcccc } --- 118,123 ---- } ! proc brokenbox_draw {canvas tag x1 y1 xs ys ins outs} { ! objectbox_draw $canvas $tag $x1 $y1 $xs $ys $ins $outs $canvas itemconfigure ${tag}.l -fill #ffcccc } *************** *** 123,128 **** proc brokenbox_erase {canvas tag} {objectbox_erase $canvas $tag} ! proc message_draw {canvas tag x1 y1 x2 y2 ins outs} { global look set points [list $x1 $y1 [expr $x2+4] $y1 $x2 [expr $y1+4] $x2 [expr $y2-4] \ [expr $x2+4] $y2 $x1 $y2 $x2 $y2 $x1 $y2] --- 126,133 ---- proc brokenbox_erase {canvas tag} {objectbox_erase $canvas $tag} ! proc message_draw {canvas tag x1 y1 xs ys ins outs} { global look + set x2 [expr $x1+$xs] + set y2 [expr $y1+$ys] set points [list $x1 $y1 [expr $x2+4] $y1 $x2 [expr $y1+4] $x2 [expr $y2-4] \ [expr $x2+4] $y2 $x1 $y2 $x2 $y2 $x1 $y2] *************** *** 132,136 **** eval "$canvas create polygon $points -tag ${tag} -fill $look(objectbg) -outline $look(objectframe3)" } ! io_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs } --- 137,141 ---- eval "$canvas create polygon $points -tag ${tag} -fill $look(objectbg) -outline $look(objectframe3)" } ! io_draw $canvas $tag $x1 $y1 $xs $ys $ins $outs } *************** *** 149,154 **** #proc message_tick {canvas tag} {} ! proc atom_draw {canvas tag x1 y1 x2 y2 ins outs} { global look set points [list $x1 $y1 [expr $x2-4] $y1 $x2 [expr $y1+4] $x2 $y2 $x1 $y2] if {[llength [$canvas gettags $tag]] != 0} { --- 154,161 ---- #proc message_tick {canvas tag} {} ! proc atom_draw {canvas tag x1 y1 xs ys ins outs} { global look + set x2 [expr $x1+$xs] + set y2 [expr $y1+$ys] set points [list $x1 $y1 [expr $x2-4] $y1 $x2 [expr $y1+4] $x2 $y2 $x1 $y2] if {[llength [$canvas gettags $tag]] != 0} { *************** *** 157,161 **** eval "$canvas create polygon $points -tag ${tag} -fill $look(objectbg) -outline $look(objectframe3)" } ! io_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs } --- 164,168 ---- eval "$canvas create polygon $points -tag ${tag} -fill $look(objectbg) -outline $look(objectframe3)" } ! io_draw $canvas $tag $x1 $y1 $xs $ys $ins $outs } *************** *** 171,175 **** } ! proc comment_draw {canvas tag x1 y1 x2 y2 ins outs} { if {[llength [$canvas gettags $tag]] != 0} {} } --- 178,206 ---- } ! proc numbox_draw {canvas tag x1 y1 xs ys ins outs} { ! global look ! set x2 [expr $x1+$xs] ! set y2 [expr $y1+$ys] ! set points [list $x1 $y1 [expr $x2-4] $y1 $x2 [expr $y1+4] $x2 $y2 $x1 $y2] ! if {[llength [$canvas gettags $tag]] != 0} { ! eval "$canvas coords ${tag} $points" ! } { ! eval "$canvas create polygon $points -tag ${tag} -fill $look(objectbg) -outline $look(objectframe3)" ! } ! io_draw $canvas $tag $x1 $y1 $xs $ys $ins $outs ! } ! ! proc numbox_select {canvas tag flag} { ! global look ! if {$flag} {set colour $look(objectframe4)} {set colour $look(objectframe3)} ! $canvas itemconfigure $tag -outline $colour ! } ! ! proc numbox_erase {canvas tag} { ! $canvas delete $tag ! io_erase $canvas $tag ! } ! ! proc comment_draw {canvas tag x1 y1 xs ys ins outs} { if {[llength [$canvas gettags $tag]] != 0} {} } *************** *** 177,181 **** proc comment_erase {canvas tag} {} ! proc bluebox_draw {canvas tag x1 y1 x2 y2 ins outs colour} { set xya [list $x1 $y1 $x2 $y2] set xyb [list [expr $x2-1] [expr $y1+1] [expr $x1+1] [expr $y1+1] [expr $x1+1] [expr $y2-1]] --- 208,214 ---- proc comment_erase {canvas tag} {} ! proc bluebox_draw {canvas tag x1 y1 xs ys ins outs colour} { ! set x2 [expr $x1+$xs] ! set y2 [expr $y1+$ys] set xya [list $x1 $y1 $x2 $y2] set xyb [list [expr $x2-1] [expr $y1+1] [expr $x1+1] [expr $y1+1] [expr $x1+1] [expr $y2-1]] *************** *** 191,195 **** eval "$canvas create line $xyc -tag ${tag}++ -fill [darker $color]" } ! io_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs } --- 224,228 ---- eval "$canvas create line $xyc -tag ${tag}++ -fill [darker $color]" } ! io_draw $canvas $tag $x1 $y1 $xs $ys $ins $outs } *************** *** 211,227 **** } ! proc numbox_draw {canvas tag x1 y1 x2 y2 ins outs color1 color2} { ! atom_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs ! } ! ! proc numbox_erase {canvas tag} { ! atom_erase $canvas $tag ! io_erase $canvas $tag ! } ! ! proc radio_draw {canvas tag x1 y1 x2 y2 ins outs orient number colour} { set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! bluebox_draw $canvas ${tag}BASE $x1 $y1 $x2 $y2 $ins $outs $colour ! if {$orient} {set size [expr $y2-$y1]} {set size [expr $x2-$x1]} set size [expr $size/$number] for {set i 0} {$i<$number} {incr i} { --- 244,251 ---- } ! proc radio_draw {canvas tag x1 y1 xs ys ins outs orient number colour} { set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! bluebox_draw $canvas ${tag}BASE $x1 $y1 $xs $ys $ins $outs $colour ! if {$orient} {set size $ys} {set size $xs} set size [expr $size/$number] for {set i 0} {$i<$number} {incr i} { *************** *** 250,256 **** } ! proc slider_draw {canvas tag x1 y1 x2 y2 ins outs orient colour} { set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! bluebox_draw $canvas ${tag}BASE $x1 $y1 $x2 $y2 $ins $outs $colour if {$isnew} { set color [bluify #ffffff] --- 274,280 ---- } ! proc slider_draw {canvas tag x1 y1 xs ys ins outs orient colour} { set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! bluebox_draw $canvas ${tag}BASE $x1 $y1 $xs $ys $ins $outs $colour if {$isnew} { set color [bluify #ffffff] *************** *** 291,298 **** } ! proc bang_draw {canvas tag x1 y1 x2 y2 ins outs colour label ldx ldy lfont lcolor} { set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! bluebox_draw $canvas ${tag}BASE $x1 $y1 $x2 $y2 $ins $outs $colour ! io_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs if {$isnew} { $canvas create oval \ --- 315,324 ---- } ! proc bang_draw {canvas tag x1 y1 xs ys ins outs colour label ldx ldy lfont lcolor} { set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! set x2 [expr $x1+$xs] ! set y2 [expr $y1+$ys] ! bluebox_draw $canvas ${tag}BASE $x1 $y1 $xs $ys $ins $outs $colour ! io_draw $canvas $tag $x1 $y1 $xs $ys $ins $outs if {$isnew} { $canvas create oval \ *************** *** 320,331 **** } ! proc toggle_draw {canvas tag x1 y1 x2 y2 ins outs colour label ldx ldy lfont lcolor} { set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! bluebox_draw $canvas ${tag}BASE $x1 $y1 $x2 $y2 $ins $outs $colour ! io_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs set w 1 set on 0 ! if {$x2-$x1 >= 30} {set w 2} ! if {$x2-$x1 >= 60} {set w 3} if {$on} {set fill #ffff00} {set fill [bluify $colour]} set x3 [expr $x1+$w+2] --- 346,359 ---- } ! proc toggle_draw {canvas tag x1 y1 xs ys ins outs colour label ldx ldy lfont lcolor} { ! set x2 [expr $x1+$xs] ! set y2 [expr $y1+$ys] set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! bluebox_draw $canvas ${tag}BASE $x1 $y1 $xs $ys $ins $outs $colour ! io_draw $canvas $tag $x1 $y1 $xs $ys $ins $outs set w 1 set on 0 ! if {$xs >= 30} {set w 2} ! if {$xs >= 60} {set w 3} if {$on} {set fill #ffff00} {set fill [bluify $colour]} set x3 [expr $x1+$w+2] *************** *** 351,352 **** --- 379,385 ---- $canvas delete ${tag}BUT ${tag}LABEL } + + proc vu_draw {canvas tag x1 y1 xs ys ins outs colour label ldx ldy lfont lcolor} { + set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] + bluebox_draw $canvas ${tag}BASE $x1 $y1 $xs $ys $ins $outs $colour + } Index: g_bang.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v retrieving revision 1.1.1.3.2.2.2.4 retrieving revision 1.1.1.3.2.2.2.5 diff -C2 -d -r1.1.1.3.2.2.2.4 -r1.1.1.3.2.2.2.5 *** g_bang.c 8 Mar 2004 02:28:00 -0000 1.1.1.3.2.2.2.4 --- g_bang.c 8 Mar 2004 12:32:38 -0000 1.1.1.3.2.2.2.5 *************** *** 44,48 **** int ypos=text_ypix(&x->x_gui.x_obj, glist); sys_vgui("bang_draw .x%x.c %x %d %d %d %d %d %d #%6.6x {%s} %d %d {%s %d bold} #%6.6x\n", ! canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", --- 44,48 ---- int ypos=text_ypix(&x->x_gui.x_obj, glist); sys_vgui("bang_draw .x%x.c %x %d %d %d %d %d %d #%6.6x {%s} %d %d {%s %d bold} #%6.6x\n", ! canvas, x, xpos, ypos, x->x_gui.x_w, x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", *************** *** 274,292 **** int bflcol[]={-262144, -1, -1}; int a=IEM_GUI_DEFAULTSIZE; - int ldx=0, ldy=-6; int fs=8; int ftbreak=IEM_BNG_DEFAULTBREAKFLASHTIME, fthold= IEM_BNG_DEFAULTHOLDFLASHTIME; ! char str[144]; ! ! iem_inttosymargs(&x->x_gui.x_isa, 0); ! iem_inttofstyle(&x->x_gui.x_fsf, 0); ! if (pd_scanargs(argc,argv,"iiiF???iiFiiii",&a,&fthold,&ftbreak, ! &ldx,&ldy,&fs,&bflcol[0],&bflcol[1],&bflcol[2])) { ! iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(3, argc, argv)); iemgui_new_getnames(&x->x_gui, 4, argv); ! iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(9, argc, argv)); } else { --- 274,293 ---- int bflcol[]={-262144, -1, -1}; int a=IEM_GUI_DEFAULTSIZE; int fs=8; int ftbreak=IEM_BNG_DEFAULTBREAKFLASHTIME, fthold= IEM_BNG_DEFAULTHOLDFLASHTIME; ! int fstyle=0, isa=0; ! ! x->x_gui.x_ldx=0; ! x->x_gui.x_ldy=-6; ! if (pd_scanargs(argc,argv,"iiii???iiiiiii", ! &a,&fthold,&ftbreak,&isa, ! &x->x_gui.x_ldx,&x->x_gui.x_ldy,&fstyle, ! &fs,&bflcol[0],&bflcol[1],&bflcol[2])) { ! iem_inttosymargs(&x->x_gui.x_isa, isa); iemgui_new_getnames(&x->x_gui, 4, argv); ! iem_inttofstyle(&x->x_gui.x_fsf, fstyle); } else { *************** *** 295,299 **** x->x_gui.x_draw = (t_iemfunptr)bng_draw; - x->x_gui.x_fsf.x_snd_able = 1; x->x_gui.x_fsf.x_rcv_able = 1; --- 296,299 ---- *************** *** 309,317 **** if (x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); ! x->x_gui.x_ldx = ldx; ! x->x_gui.x_ldy = ldy; ! ! if(fs < 4) ! fs = 4; x->x_gui.x_fontsize = fs; x->x_gui.x_w = iemgui_clip_size(a); --- 309,313 ---- if (x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); ! if(fs < 4) fs = 4; x->x_gui.x_fontsize = fs; x->x_gui.x_w = iemgui_clip_size(a); Index: g_canvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.c,v retrieving revision 1.1.1.4.2.7.2.2 retrieving revision 1.1.1.4.2.7.2.3 diff -C2 -d -r1.1.1.4.2.7.2.2 -r1.1.1.4.2.7.2.3 *** g_canvas.c 6 Mar 2004 22:19:41 -0000 1.1.1.4.2.7.2.2 --- g_canvas.c 8 Mar 2004 12:32:38 -0000 1.1.1.4.2.7.2.3 *************** *** 457,469 **** { float zz; ! zz = y2; ! y2 = y1; ! y1 = zz; ! zz = py2; ! py2 = py1; ! py1 = zz; } ! if (x1 == x2 || y1 == y2) ! x1 = 0, x2 = 100, y1 = 1, y2 = -1; if (px1 >= px2 || py1 >= py2) px1 = 100, py1 = 20, px2 = 100 + GLIST_DEFGRAPHWIDTH, --- 457,464 ---- { float zz; ! zz = y2; y2 = y1; y1 = zz; ! zz = py2; py2 = py1; py1 = zz; } ! if (x1 == x2 || y1 == y2) x1=0, x2=100, y1=1, y2=-1; if (px1 >= px2 || py1 >= py2) px1 = 100, py1 = 20, px2 = 100 + GLIST_DEFGRAPHWIDTH, *************** *** 769,777 **** t_glist *gl2 = x->gl_owner; canvas_create_editor(x, 1); ! if (glist_isvisible(gl2)) ! gobj_vis(&x->gl_gobj, gl2, 0); x->gl_havewindow = 0; ! if (glist_isvisible(gl2)) ! gobj_vis(&x->gl_gobj, gl2, 1); } else x->gl_havewindow = 0; --- 764,770 ---- t_glist *gl2 = x->gl_owner; canvas_create_editor(x, 1); ! if (glist_isvisible(gl2)) gobj_vis(&x->gl_gobj, gl2, 0); x->gl_havewindow = 0; ! if (glist_isvisible(gl2)) gobj_vis(&x->gl_gobj, gl2, 1); } else x->gl_havewindow = 0; Index: g_editor.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_editor.c,v retrieving revision 1.1.1.4.2.3.2.2 retrieving revision 1.1.1.4.2.3.2.3 diff -C2 -d -r1.1.1.4.2.3.2.2 -r1.1.1.4.2.3.2.3 *** g_editor.c 6 Mar 2004 22:19:41 -0000 1.1.1.4.2.3.2.2 --- g_editor.c 8 Mar 2004 12:32:38 -0000 1.1.1.4.2.3.2.3 *************** *** 848,855 **** int graphme = (fgraphme != 0), redraw = 0; yperpix = -yperpix; ! if (xperpix == 0) ! xperpix = 1; ! if (yperpix == 0) ! yperpix = 1; canvas_setgraph(x, graphme); if (!x->gl_isgraph && (xperpix != glist_dpixtodx(x, 1))) --- 848,853 ---- int graphme = (fgraphme != 0), redraw = 0; yperpix = -yperpix; ! if (xperpix == 0) xperpix = 1; ! if (yperpix == 0) yperpix = 1; canvas_setgraph(x, graphme); if (!x->gl_isgraph && (xperpix != glist_dpixtodx(x, 1))) Index: g_graph.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_graph.c,v retrieving revision 1.1.1.3.2.3.2.1 retrieving revision 1.1.1.3.2.3.2.2 diff -C2 -d -r1.1.1.3.2.3.2.1 -r1.1.1.3.2.3.2.2 *** g_graph.c 6 Mar 2004 22:19:41 -0000 1.1.1.3.2.3.2.1 --- g_graph.c 8 Mar 2004 12:32:38 -0000 1.1.1.3.2.3.2.2 *************** *** 176,192 **** else break; put1: ! if (g9) ! g9->g_next = g1, g9 = g1; ! else g9 = g = g1; ! if (g1 = g1->g_next) ! f1 = gobj_getxforsort(g1); g9->g_next = 0; continue; put2: ! if (g9) ! g9->g_next = g2, g9 = g2; ! else g9 = g = g2; ! if (g2 = g2->g_next) ! f2 = gobj_getxforsort(g2); g9->g_next = 0; continue; --- 176,186 ---- else break; put1: ! if (g9) g9->g_next = g1, g9 = g1; else g9 = g = g1; ! if (g1 = g1->g_next) f1 = gobj_getxforsort(g1); g9->g_next = 0; continue; put2: ! if (g9) g9->g_next = g2, g9 = g2; else g9 = g = g2; ! if (g2 = g2->g_next) f2 = gobj_getxforsort(g2); g9->g_next = 0; continue; *************** *** 195,200 **** } ! static t_gobj *glist_dosort(t_glist *x, ! t_gobj *g, int nitems) { if (nitems < 2) --- 189,193 ---- } ! static t_gobj *glist_dosort(t_glist *x, t_gobj *g, int nitems) { if (nitems < 2) Index: g_hdial.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hdial.c,v retrieving revision 1.1.1.4.2.2.2.4 retrieving revision 1.1.1.4.2.2.2.5 diff -C2 -d -r1.1.1.4.2.2.2.4 -r1.1.1.4.2.2.2.5 *** g_hdial.c 7 Mar 2004 20:35:05 -0000 1.1.1.4.2.2.2.4 --- g_hdial.c 8 Mar 2004 12:32:38 -0000 1.1.1.4.2.2.2.5 *************** *** 47,51 **** int y1=text_ypix(&x->x_gui.x_obj, glist), y2=y1+x->x_gui.x_h*(isvert(x)?x->x_number:1); sys_vgui("radio_draw .x%x.c %x %d %d %d %d %d %d %d %d #%6.6x\n", ! canvas, x, x1, y1, x2, y2, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, isvert(x),x->x_number,x->x_gui.x_bcol); --- 47,51 ---- int y1=text_ypix(&x->x_gui.x_obj, glist), y2=y1+x->x_gui.x_h*(isvert(x)?x->x_number:1); sys_vgui("radio_draw .x%x.c %x %d %d %d %d %d %d %d %d #%6.6x\n", ! canvas, x, x1, y1, x2-x1, y2-y1, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, isvert(x),x->x_number,x->x_gui.x_bcol); *************** *** 64,68 **** int x1=text_xpix(&x->x_gui.x_obj, glist), x2=x1+x->x_gui.x_w*(isvert(x)?1:x->x_number); int y1=text_ypix(&x->x_gui.x_obj, glist), y2=y1+x->x_gui.x_h*(isvert(x)?x->x_number:1); ! sys_vgui("radio_draw .x%x.c %x %d %d %d %d %d %d %s %d #%6.6x\n", canvas, x, x1, y1, x2, y2, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, --- 64,68 ---- int x1=text_xpix(&x->x_gui.x_obj, glist), x2=x1+x->x_gui.x_w*(isvert(x)?1:x->x_number); int y1=text_ypix(&x->x_gui.x_obj, glist), y2=y1+x->x_gui.x_h*(isvert(x)?x->x_number:1); ! sys_vgui("radio_draw .x%x.c %x %d %d %d %d %d %d %d %d #%6.6x\n", canvas, x, x1, y1, x2, y2, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, Index: g_hslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v retrieving revision 1.1.1.3.2.2.2.4 retrieving revision 1.1.1.3.2.2.2.5 diff -C2 -d -r1.1.1.3.2.2.2.4 -r1.1.1.3.2.2.2.5 *** g_hslider.c 8 Mar 2004 00:44:38 -0000 1.1.1.3.2.2.2.4 --- g_hslider.c 8 Mar 2004 12:32:38 -0000 1.1.1.3.2.2.2.5 *************** *** 50,54 **** t_canvas *canvas=glist_getcanvas(glist); sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d %d #%6.6x\n", ! canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,isvert(x),x->x_gui.x_bcol); sys_vgui("slider_set .x%x.c %x %d %d #%6.6x\n", canvas, x, x->x_val, isvert(x),x->x_gui.x_fcol); --- 50,54 ---- t_canvas *canvas=glist_getcanvas(glist); sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d %d #%6.6x\n", ! canvas, x, xpos, ypos, x->x_gui.x_w, x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,isvert(x),x->x_gui.x_bcol); sys_vgui("slider_set .x%x.c %x %d %d #%6.6x\n", canvas, x, x->x_val, isvert(x),x->x_gui.x_fcol); Index: g_numbox.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v retrieving revision 1.1.1.4.2.2.2.2 retrieving revision 1.1.1.4.2.2.2.3 diff -C2 -d -r1.1.1.4.2.2.2.2 -r1.1.1.4.2.2.2.3 *** g_numbox.c 7 Mar 2004 19:38:13 -0000 1.1.1.4.2.2.2.2 --- g_numbox.c 8 Mar 2004 12:32:38 -0000 1.1.1.4.2.2.2.3 *************** *** 21,30 **** #endif - /*------------------ global functions -------------------------*/ - static void my_numbox_key(void *z, t_floatarg fkey); - - /* ------------ nmx gui-my number box ----------------------- */ - t_widgetbehavior my_numbox_widgetbehavior; static t_class *my_numbox_class; --- 21,25 ---- *************** *** 49,56 **** void my_numbox_clip(t_my_numbox *x) { ! if(x->x_val < x->x_min) ! x->x_val = x->x_min; ! if(x->x_val > x->x_max) ! x->x_val = x->x_max; } --- 44,49 ---- void my_numbox_clip(t_my_numbox *x) { ! if(x->x_val < x->x_min) x->x_val = x->x_min; ! if(x->x_val > x->x_max) x->x_val = x->x_max; } *************** *** 58,67 **** { int w, f=31; ! ! if(x->x_gui.x_fsf.x_font_style == 1) ! f = 27; ! else if(x->x_gui.x_fsf.x_font_style == 2) ! f = 25; ! w = x->x_gui.x_fontsize * f * x->x_gui.x_w; w /= 36; --- 51,56 ---- { int w, f=31; ! if(x->x_gui.x_fsf.x_font_style == 1) f = 27; ! else if(x->x_gui.x_fsf.x_font_style == 2) f = 25; w = x->x_gui.x_fontsize * f * x->x_gui.x_w; w /= 36; *************** *** 115,121 **** if(x->x_buf[idecimal] == '.') break; ! if(idecimal > x->x_gui.x_w) ! { ! x->x_buf[0] = (f < 0.0 ? '-' : '+'); x->x_buf[1] = 0; } --- 104,108 ---- if(x->x_buf[idecimal] == '.') break; ! if(idecimal > x->x_gui.x_w) {x->x_buf[0] = (f < 0.0 ? '-' : '+'); x->x_buf[1] = 0; } *************** *** 141,146 **** if(sl >= x->x_gui.x_w) cp += sl - x->x_gui.x_w + 1; ! sys_vgui( ! ".x%x.c itemconfigure %xNUMBER -fill #%6.6x -text {%s} \n", glist_getcanvas(glist), x, IEM_GUI_COLOR_EDITED, cp); x->x_buf[sl] = 0; --- 128,132 ---- if(sl >= x->x_gui.x_w) cp += sl - x->x_gui.x_w + 1; ! sys_vgui(".x%x.c itemconfigure %xNUMBER -fill #%6.6x -text {%s} \n", glist_getcanvas(glist), x, IEM_GUI_COLOR_EDITED, cp); x->x_buf[sl] = 0; *************** *** 149,154 **** { my_numbox_ftoa(x); ! sys_vgui( ! ".x%x.c itemconfigure %xNUMBER -fill #%6.6x -text {%s} \n", glist_getcanvas(glist), x, IEM_GUI_COLOR_EDITED, x->x_buf); x->x_buf[0] = 0; --- 135,139 ---- { my_numbox_ftoa(x); ! sys_vgui(".x%x.c itemconfigure %xNUMBER -fill #%6.6x -text {%s} \n", glist_getcanvas(glist), x, IEM_GUI_COLOR_EDITED, x->x_buf); x->x_buf[0] = 0; *************** *** 176,181 **** t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("numbox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x #%6.6x\n", ! canvas, x, xpos, ypos, xpos + x->x_numwidth, ypos + x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, IEM_GUI_COLOR_NORMAL, x->x_gui.x_bcol); --- 161,166 ---- t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("numbox_draw .x%x.c %x %d %d %d %d %d %d\n", ! canvas, x, xpos, ypos, x->x_numwidth, x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, IEM_GUI_COLOR_NORMAL, x->x_gui.x_bcol); *************** *** 715,726 **** x->x_gui.x_ldx = ldx; x->x_gui.x_ldy = ldy; ! if(fs < 4) ! fs = 4; x->x_gui.x_fontsize = fs; ! if(w < 1) ! w = 1; x->x_gui.x_w = w; ! if(h < 8) ! h = 8; x->x_gui.x_h = h; x->x_buf[0] = 0; --- 700,708 ---- x->x_gui.x_ldx = ldx; x->x_gui.x_ldy = ldy; ! if(fs < 4) fs = 4; x->x_gui.x_fontsize = fs; ! if(w < 1) w = 1; x->x_gui.x_w = w; ! if(h < 8) h = 8; x->x_gui.x_h = h; x->x_buf[0] = 0; Index: g_text.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_text.c,v retrieving revision 1.1.1.4.2.2.2.2 retrieving revision 1.1.1.4.2.2.2.3 diff -C2 -d -r1.1.1.4.2.2.2.2 -r1.1.1.4.2.2.2.3 *** g_text.c 6 Mar 2004 22:19:41 -0000 1.1.1.4.2.2.2.2 --- g_text.c 8 Mar 2004 12:32:38 -0000 1.1.1.4.2.2.2.3 *************** *** 1091,1095 **** { sys_vgui("io_draw .x%x.cBASE %s %d %d %d %d %d %d\n", ! glist_getcanvas(glist), tag, x1, y1, x2, y2, obj_ninlets(ob), obj_noutlets(ob)); } --- 1091,1095 ---- { sys_vgui("io_draw .x%x.cBASE %s %d %d %d %d %d %d\n", ! glist_getcanvas(glist), tag, x1, y1, x2-x1, y2-x1, obj_ninlets(ob), obj_noutlets(ob)); } *************** *** 1099,1109 **** { t_object *ob; ! int x1, y1, x2, y2, width, height; text_getrect(&x->te_g, glist, &x1, &y1, &x2, &y2); - width = x2 - x1; - height = y2 - y1; ob = pd_checkobject(&x->te_pd); sys_vgui("%s_draw .x%x.c %sR %d %d %d %d %d %d\n", ! text_classname(x),glist,tag,x1,y1,x2,y2, ob?obj_ninlets(ob):0, ob?obj_noutlets(ob):0); } --- 1099,1107 ---- { t_object *ob; ! int x1, y1, x2, y2; text_getrect(&x->te_g, glist, &x1, &y1, &x2, &y2); ob = pd_checkobject(&x->te_pd); sys_vgui("%s_draw .x%x.c %sR %d %d %d %d %d %d\n", ! text_classname(x),glist,tag,x1,y1,x2-x1,y2-y1, ob?obj_ninlets(ob):0, ob?obj_noutlets(ob):0); } Index: g_toggle.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v retrieving revision 1.1.1.3.2.2.2.3 retrieving revision 1.1.1.3.2.2.2.4 diff -C2 -d -r1.1.1.3.2.2.2.3 -r1.1.1.3.2.2.2.4 *** g_toggle.c 8 Mar 2004 02:28:00 -0000 1.1.1.3.2.2.2.3 --- g_toggle.c 8 Mar 2004 12:32:38 -0000 1.1.1.3.2.2.2.4 *************** *** 47,51 **** int ypos=text_ypix(&x->x_gui.x_obj, glist); sys_vgui("toggle_draw .x%x.c %x %d %d %d %d %d %d #%6.6x {%s} %d %d {%s %d bold} #%6.6x\n", ! canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", --- 47,51 ---- int ypos=text_ypix(&x->x_gui.x_obj, glist); sys_vgui("toggle_draw .x%x.c %x %d %d %d %d %d %d #%6.6x {%s} %d %d {%s %d bold} #%6.6x\n", ! canvas, x, xpos, ypos, x->x_gui.x_w, x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", *************** *** 214,226 **** static void toggle_init(t_toggle *x, t_floatarg f) ! { ! x->x_gui.x_isa.x_loadinit = (f==0.0)?0:1; ! } static void toggle_nonzero(t_toggle *x, t_floatarg f) ! { ! if(f != 0.0) ! x->x_nonzero = f; ! } static void *toggle_new(t_symbol *s, int argc, t_atom *argv) --- 214,221 ---- static void toggle_init(t_toggle *x, t_floatarg f) ! {x->x_gui.x_isa.x_loadinit = (f==0.0)?0:1;} static void toggle_nonzero(t_toggle *x, t_floatarg f) ! {if(f != 0.0) x->x_nonzero = f;} static void *toggle_new(t_symbol *s, int argc, t_atom *argv) *************** *** 233,246 **** float on=0.0, nonzero=1.0; char str[144]; ! iem_inttosymargs(&x->x_gui.x_isa, 0); ! iem_inttofstyle(&x->x_gui.x_fsf, 0); ! ! if(pd_scanargs(argc,argv,"iF???iiFiiiii;?", ! &a,&ldx,&ldy,&fs,&bflcol[0],&bflcol[1],&bflcol[2],&on)) { ! iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(1, argc, argv)); iemgui_new_getnames(&x->x_gui, 2, argv); ! iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(7, argc, argv)); } else iemgui_new_getnames(&x->x_gui, 2, 0); --- 228,239 ---- float on=0.0, nonzero=1.0; char str[144]; + int fstyle=0, isa=0; ! if(pd_scanargs(argc,argv,"ii???iiiiiiii;?", ! &a,&isa,&ldx,&ldy,&fstyle,&fs,&bflcol[0],&bflcol[1],&bflcol[2],&on)) { ! iem_inttosymargs(&x->x_gui.x_isa, isa); iemgui_new_getnames(&x->x_gui, 2, argv); ! iem_inttofstyle(&x->x_gui.x_fsf, fstyle); } else iemgui_new_getnames(&x->x_gui, 2, 0); *************** *** 268,273 **** x->x_gui.x_ldy = ldy; ! if(fs < 4) ! fs = 4; x->x_gui.x_fontsize = fs; x->x_gui.x_w = iemgui_clip_size(a); --- 261,265 ---- x->x_gui.x_ldy = ldy; ! if(fs < 4) fs = 4; x->x_gui.x_fontsize = fs; x->x_gui.x_w = iemgui_clip_size(a); Index: g_vumeter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v retrieving revision 1.1.1.3.2.2.2.2 retrieving revision 1.1.1.3.2.2.2.3 diff -C2 -d -r1.1.1.3.2.2.2.2 -r1.1.1.3.2.2.2.3 *** g_vumeter.c 7 Mar 2004 19:38:13 -0000 1.1.1.3.2.2.2.2 --- g_vumeter.c 8 Mar 2004 12:32:38 -0000 1.1.1.3.2.2.2.3 *************** *** 52,61 **** int ypos=text_ypix(&x->x_gui.x_obj, glist); ! if(x->x_peak) ! { int i=iemgui_vu_col[x->x_peak]; ! int j=ypos + (x->x_led_size+1)*(IEM_VU_STEPS+1-x->x_peak) ! - (x->x_led_size+1)/2; ! sys_vgui(".x%x.c coords %xPLED %d %d %d %d\n", canvas, x, xpos, j, --- 52,58 ---- int ypos=text_ypix(&x->x_gui.x_obj, glist); ! if(x->x_peak) { int i=iemgui_vu_col[x->x_peak]; ! int j=ypos + (x->x_led_size+1)*(IEM_VU_STEPS+1-x->x_peak) - (x->x_led_size+1)/2; sys_vgui(".x%x.c coords %xPLED %d %d %d %d\n", canvas, x, xpos, j, *************** *** 63,71 **** sys_vgui(".x%x.c itemconfigure %xPLED -fill #%6.6x\n", canvas, x, iemgui_color_hex[i]); ! } ! else ! { int mid=xpos+x->x_gui.x_w/2; - sys_vgui(".x%x.c itemconfigure %xPLED -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); --- 60,65 ---- sys_vgui(".x%x.c itemconfigure %xPLED -fill #%6.6x\n", canvas, x, iemgui_color_hex[i]); ! }else{ int mid=xpos+x->x_gui.x_w/2; sys_vgui(".x%x.c itemconfigure %xPLED -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol); *************** *** 127,131 **** x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); sys_vgui("io_draw .x%x.c %x %d %d %d %d %d %d\n", ! canvas, x, xpos-1, ypos-2, xpos+x->x_gui.x_w+1, ypos+x->x_gui.x_h+2, 2*!x->x_gui.x_fsf.x_rcv_able, 2*!x->x_gui.x_fsf.x_snd_able); } --- 121,125 ---- x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); sys_vgui("io_draw .x%x.c %x %d %d %d %d %d %d\n", ! canvas, x, xpos-1, ypos-2, x->x_gui.x_w+1, x->x_gui.x_h+2, 2*!x->x_gui.x_fsf.x_rcv_able, 2*!x->x_gui.x_fsf.x_snd_able); } *************** *** 511,524 **** { int i; ! ! if(rms <= IEM_VU_MINDB) ! x->x_rms = 0; ! else if(rms >= IEM_VU_MAXDB) ! x->x_rms = IEM_VU_STEPS; ! else ! { ! int i = (int)(2.0*(rms + IEM_VU_OFFSET)); ! x->x_rms = iemgui_vu_db2i[i]; ! } i = (int)(100.0*rms + 10000.5); rms = 0.01*(float)(i - 10000); --- 505,511 ---- { int i; ! if(rms <= IEM_VU_MINDB) x->x_rms = 0; ! else if(rms >= IEM_VU_MAXDB)x->x_rms = IEM_VU_STEPS; ! else x->x_rms = iemgui_vu_db2i[ (int)(2.0*(rms + IEM_VU_OFFSET)) ]; i = (int)(100.0*rms + 10000.5); rms = 0.01*(float)(i - 10000); *************** *** 531,544 **** { int i; ! ! if(peak <= IEM_VU_MINDB) ! x->x_peak = 0; ! else if(peak >= IEM_VU_MAXDB) ! x->x_peak = IEM_VU_STEPS; ! else ! { ! int i = (int)(2.0*(peak + IEM_VU_OFFSET)); ! x->x_peak = iemgui_vu_db2i[i]; ! } i = (int)(100.0*peak + 10000.5); peak = 0.01*(float)(i - 10000); --- 518,524 ---- { int i; ! if(peak <= IEM_VU_MINDB) x->x_peak = 0; ! else if(peak >= IEM_VU_MAXDB)x->x_peak = IEM_VU_STEPS; ! else x->x_peak = iemgui_vu_db2i[ (int)(2.0*(peak + IEM_VU_OFFSET)) ]; i = (int)(100.0*peak + 10000.5); peak = 0.01*(float)(i - 10000);

1 0

pd/src g_bang.c,1.1.1.3.2.2.2.3,1.1.1.3.2.2.2.4 g_toggle.c,1.1.1.3.2.2.2.2,1.1.1.3.2.2.2.3 u_object.tk,1.1.2.4,1.1.2.5
by matju＠users.sourceforge.net 08 Mar '04

08 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31929 Modified Files: Tag: impd_0_37 g_bang.c g_toggle.c u_object.tk Log Message: TCLified bng & tgl Index: g_bang.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v retrieving revision 1.1.1.3.2.2.2.3 retrieving revision 1.1.1.3.2.2.2.4 diff -C2 -d -r1.1.1.3.2.2.2.3 -r1.1.1.3.2.2.2.4 *** g_bang.c 7 Mar 2004 19:38:13 -0000 1.1.1.3.2.2.2.3 --- g_bang.c 8 Mar 2004 02:28:00 -0000 1.1.1.3.2.2.2.4 *************** *** 23,132 **** #endif - - /* --------------- bng gui-bang ------------------------- */ - t_widgetbehavior bng_widgetbehavior; static t_class *bng_class; ! /* widget helper functions */ ! ! ! void bng_draw_update(t_bng *x, t_glist *glist) ! { ! if(glist_isvisible(glist)) ! { sys_vgui(".x%x.c itemconfigure %xBUT -fill #%6.6x\n", glist_getcanvas(glist), x, ! pd_bluify(x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol)); ! } ! } ! ! void bng_draw_new(t_bng *x, t_glist *glist) ! { ! int xpos=text_xpix(&x->x_gui.x_obj, glist); ! int ypos=text_ypix(&x->x_gui.x_obj, glist); ! t_canvas *canvas=glist_getcanvas(glist); ! ! sys_vgui("bang_draw .x%x.c %x %d %d %d %d %d %d #%6.6x\n", ! canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol); ! sys_vgui(".x%x.c create oval %d %d %d %d -fill #%6.6x -tags %xBUT\n", ! canvas, xpos+2, ypos+2, ! xpos + x->x_gui.x_w-2, ypos + x->x_gui.x_h-2, ! pd_bluify(x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol), x); ! sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", ! canvas, xpos+x->x_gui.x_ldx, ! ypos+x->x_gui.x_ldy, ! strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", ! x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); ! } ! ! void bng_draw_move(t_bng *x, t_glist *glist) ! { ! int xpos=text_xpix(&x->x_gui.x_obj, glist); ! int ypos=text_ypix(&x->x_gui.x_obj, glist); ! t_canvas *canvas=glist_getcanvas(glist); ! ! sys_vgui("bang_draw .x%x.c %x %d %d %d %d %d %d #%6.6x\n", ! canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol); ! sys_vgui(".x%x.c coords %xBUT %d %d %d %d\n", ! canvas, x, xpos+2,ypos+2, ! xpos + x->x_gui.x_w-2, ypos + x->x_gui.x_h-2); ! sys_vgui(".x%x.c itemconfigure %xBUT -fill #%6.6x\n", canvas, x, ! pd_bluify(x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol)); ! sys_vgui(".x%x.c coords %xLABEL %d %d\n", ! canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); ! } ! ! void bng_draw_erase(t_bng* x, t_glist* glist) ! { ! t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bang_erase .x%x.c %x\n", canvas, x); ! sys_vgui(".x%x.c delete %xBUT\n", canvas, x); ! sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); ! } ! ! void bng_draw_config(t_bng* x, t_glist* glist) ! { ! t_canvas *canvas=glist_getcanvas(glist); ! ! sys_vgui(".x%x.c itemconfigure %xLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", ! canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, ! x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, ! strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); ! sys_vgui(".x%x.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, pd_bluify(x->x_gui.x_bcol)); ! sys_vgui(".x%x.c itemconfigure %xBUT -fill #%6.6x\n", canvas, x, ! pd_bluify(x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol)); ! } ! ! void bng_draw_select(t_bng* x, t_glist* glist) ! { ! t_canvas *canvas=glist_getcanvas(glist); ! ! if(x->x_gui.x_fsf.x_selected) ! { ! sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); ! sys_vgui(".x%x.c itemconfigure %xBUT -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); ! sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); ! } ! else ! { ! sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL); ! sys_vgui(".x%x.c itemconfigure %xBUT -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL); ! sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol); ! } ! } ! ! void bng_draw(t_bng *x, t_glist *glist, int mode) ! { ! if (mode == IEM_GUI_DRAW_MODE_UPDATE) bng_draw_update(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_MOVE) bng_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) bng_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) bng_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) bng_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) bng_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) bng_draw_move(x, glist); ! } /* ------------------------ bng widgetbehaviour----------------------------- */ --- 23,52 ---- #endif t_widgetbehavior bng_widgetbehavior; static t_class *bng_class; ! void bng_draw(t_bng *x, t_glist *glist, int mode) { ! t_canvas *canvas=glist_getcanvas(glist); ! switch(mode) { ! case IEM_GUI_DRAW_MODE_UPDATE: ! if(glist_isvisible(glist)) sys_vgui(".x%x.c itemconfigure %xBUT -fill #%6.6x\n", glist_getcanvas(glist), x, ! pd_bluify(x->x_flashed?x->x_gui.x_fcol:x->x_gui.x_bcol)); ! break; ! case IEM_GUI_DRAW_MODE_ERASE: ! sys_vgui("bang_erase .x%x.c %x\n", canvas, x); ! break; ! case IEM_GUI_DRAW_MODE_SELECT: ! sys_vgui("bang_select .x%x.c %x %d\n", canvas, x, x->x_gui.x_fsf.x_selected); ! break; ! default:{ ! int xpos=text_xpix(&x->x_gui.x_obj, glist); ! int ypos=text_ypix(&x->x_gui.x_obj, glist); ! sys_vgui("bang_draw .x%x.c %x %d %d %d %d %d %d #%6.6x {%s} %d %d {%s %d bold} #%6.6x\n", ! canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol, ! strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", ! x->x_gui.x_ldx, x->x_gui.x_ldy, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol); ! }}} /* ------------------------ bng widgetbehaviour----------------------------- */ Index: g_toggle.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v retrieving revision 1.1.1.3.2.2.2.2 retrieving revision 1.1.1.3.2.2.2.3 diff -C2 -d -r1.1.1.3.2.2.2.2 -r1.1.1.3.2.2.2.3 *** g_toggle.c 7 Mar 2004 19:38:13 -0000 1.1.1.3.2.2.2.2 --- g_toggle.c 8 Mar 2004 02:28:00 -0000 1.1.1.3.2.2.2.3 *************** *** 23,169 **** #endif - /* --------------- tgl gui-toggle ------------------------- */ - t_widgetbehavior toggle_widgetbehavior; static t_class *toggle_class; ! /* widget helper functions */ ! ! void toggle_draw_update(t_toggle *x, t_glist *glist) ! { ! if(glist_isvisible(glist)) ! { ! t_canvas *canvas=glist_getcanvas(glist); ! ! sys_vgui(".x%x.c itemconfigure %xX1 -fill #%6.6x\n", canvas, x, ! (x->x_on!=0.0)?x->x_gui.x_fcol:pd_bluify(x->x_gui.x_bcol)); ! sys_vgui(".x%x.c itemconfigure %xX2 -fill #%6.6x\n", canvas, x, ! (x->x_on!=0.0)?x->x_gui.x_fcol:pd_bluify(x->x_gui.x_bcol)); ! } ! } ! ! void toggle_draw_new(t_toggle *x, t_glist *glist) ! { ! t_canvas *canvas=glist_getcanvas(glist); ! int w=1, xx=text_xpix(&x->x_gui.x_obj, glist), yy=text_ypix(&x->x_gui.x_obj, glist); ! int x1=xx,y1=yy,x2=xx+x->x_gui.x_w,y2=yy+x->x_gui.x_h; ! if(x->x_gui.x_w >= 30) ! w = 2; ! if(x->x_gui.x_w >= 60) ! w = 3; ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", ! canvas,x, x1,y1,x2,y2, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); ! sys_vgui(".x%x.c create line %d %d %d %d -width %d -fill #%6.6x -tags %xX1\n", ! canvas, xx+w+3, yy+w+3, xx + x->x_gui.x_w-w-1, yy + x->x_gui.x_h-w-1, w, ! (x->x_on!=0.0)?x->x_gui.x_fcol:pd_bluify(x->x_gui.x_bcol), x); ! sys_vgui(".x%x.c create line %d %d %d %d -width %d -fill #%6.6x -tags %xX2\n", ! canvas, xx+w+3, yy + x->x_gui.x_h-w-2, xx + x->x_gui.x_w-w-1, yy+w+2, w, ! (x->x_on!=0.0)?x->x_gui.x_fcol:pd_bluify(x->x_gui.x_bcol), x); ! sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", ! canvas, xx+x->x_gui.x_ldx, ! yy+x->x_gui.x_ldy, ! strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", ! x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); ! } ! ! void toggle_draw_move(t_toggle *x, t_glist *glist) ! { ! t_canvas *canvas=glist_getcanvas(glist); ! int w=1, xx=text_xpix(&x->x_gui.x_obj, glist), yy=text_ypix(&x->x_gui.x_obj, glist); ! int x1=xx,y1=yy,x2=xx+x->x_gui.x_w,y2=yy+x->x_gui.x_h; ! ! if(x->x_gui.x_w >= 30) ! w = 2; ! ! if(x->x_gui.x_w >= 60) ! w = 3; ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", ! canvas,x, x1,y1,x2,y2, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); ! sys_vgui(".x%x.c itemconfigure %xX1 -width %d\n", canvas, x, w); ! sys_vgui(".x%x.c coords %xX1 %d %d %d %d\n", ! canvas, x, xx+w+1, yy+w+1, xx + x->x_gui.x_w-w, yy + x->x_gui.x_h-w); ! sys_vgui(".x%x.c itemconfigure %xX2 -width %d\n", canvas, x, w); ! sys_vgui(".x%x.c coords %xX2 %d %d %d %d\n", ! canvas, x, xx+w+1, yy + x->x_gui.x_h-w-1, xx + x->x_gui.x_w-w, yy+w); ! sys_vgui(".x%x.c coords %xLABEL %d %d\n", ! canvas, x, xx+x->x_gui.x_ldx, yy+x->x_gui.x_ldy); ! } ! ! void toggle_draw_erase(t_toggle* x, t_glist* glist) ! { ! t_canvas *canvas=glist_getcanvas(glist); ! ! sys_vgui("bluebox_erase .x%x.c %xBASE\n", canvas, x); ! sys_vgui(".x%x.c delete %xX1\n", canvas, x); ! sys_vgui(".x%x.c delete %xX2\n", canvas, x); ! sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); ! } ! ! void toggle_draw_config(t_toggle* x, t_glist* glist) ! { ! t_canvas *canvas=glist_getcanvas(glist); ! ! sys_vgui(".x%x.c itemconfigure %xLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", ! canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, ! x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, ! strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); ! sys_vgui(".x%x.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, ! x->x_gui.x_bcol); ! sys_vgui(".x%x.c itemconfigure %xX1 -fill #%6.6x\n", canvas, x, ! x->x_on?x->x_gui.x_fcol:x->x_gui.x_bcol); ! sys_vgui(".x%x.c itemconfigure %xX2 -fill #%6.6x\n", canvas, x, ! x->x_on?x->x_gui.x_fcol:x->x_gui.x_bcol); ! } ! ! void toggle_draw_io(t_toggle* x, t_glist* glist, int old_snd_rcv_flags) ! { ! int xpos=text_xpix(&x->x_gui.x_obj, glist); ! int ypos=text_ypix(&x->x_gui.x_obj, glist); ! t_canvas *canvas=glist_getcanvas(glist); ! ! if((old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && !x->x_gui.x_fsf.x_snd_able) ! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xOUT%d\n", ! canvas, xpos, ! ypos + x->x_gui.x_h-1, xpos + IOWIDTH, ! ypos + x->x_gui.x_h, x, 0); ! if(!(old_snd_rcv_flags & IEM_GUI_OLD_SND_FLAG) && x->x_gui.x_fsf.x_snd_able) ! sys_vgui(".x%x.c delete %xOUT%d\n", canvas, x, 0); ! if((old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && !x->x_gui.x_fsf.x_rcv_able) ! sys_vgui(".x%x.c create rectangle %d %d %d %d -tags %xIN%d\n", ! canvas, xpos, ypos, ! xpos + IOWIDTH, ypos+1, x, 0); ! if(!(old_snd_rcv_flags & IEM_GUI_OLD_RCV_FLAG) && x->x_gui.x_fsf.x_rcv_able) ! sys_vgui(".x%x.c delete %xIN%d\n", canvas, x, 0); ! } ! ! void toggle_draw_select(t_toggle* x, t_glist* glist) ! { ! t_canvas *canvas=glist_getcanvas(glist); ! ! if(x->x_gui.x_fsf.x_selected) ! { ! sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); ! sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); ! } ! else ! { ! sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL); ! sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol); ! } ! } ! ! void toggle_draw(t_toggle *x, t_glist *glist, int mode) ! { ! if (mode == IEM_GUI_DRAW_MODE_UPDATE) toggle_draw_update(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_MOVE) toggle_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) toggle_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) toggle_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) toggle_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) toggle_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) toggle_draw_io(x, glist, mode - IEM_GUI_DRAW_MODE_IO); ! } /* ------------------------ tgl widgetbehaviour----------------------------- */ --- 23,55 ---- #endif t_widgetbehavior toggle_widgetbehavior; static t_class *toggle_class; ! void toggle_draw(t_toggle *x, t_glist *glist, int mode) { ! t_canvas *canvas=glist_getcanvas(glist); ! switch(mode) { ! case IEM_GUI_DRAW_MODE_UPDATE: ! if(glist_isvisible(glist)) { ! sys_vgui(".x%x.c itemconfigure %xX1 -fill #%6.6x\n", canvas, x, ! (x->x_on!=0.0)?x->x_gui.x_fcol:pd_bluify(x->x_gui.x_bcol)); ! sys_vgui(".x%x.c itemconfigure %xX2 -fill #%6.6x\n", canvas, x, ! (x->x_on!=0.0)?x->x_gui.x_fcol:pd_bluify(x->x_gui.x_bcol)); ! } ! break; ! case IEM_GUI_DRAW_MODE_ERASE: ! sys_vgui("toggle_erase .x%x.c %x\n", canvas, x); ! break; ! case IEM_GUI_DRAW_MODE_SELECT: ! sys_vgui("toggle_select .x%x.c %x %d\n", canvas, x, x->x_gui.x_fsf.x_selected); ! break; ! default:{ ! int xpos=text_xpix(&x->x_gui.x_obj, glist); ! int ypos=text_ypix(&x->x_gui.x_obj, glist); ! sys_vgui("toggle_draw .x%x.c %x %d %d %d %d %d %d #%6.6x {%s} %d %d {%s %d bold} #%6.6x\n", ! canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol, ! strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", ! x->x_gui.x_ldx, x->x_gui.x_ldy, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol); ! }}} /* ------------------------ tgl widgetbehaviour----------------------------- */ Index: u_object.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/u_object.tk,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** u_object.tk 6 Mar 2004 22:14:39 -0000 1.1.2.4 --- u_object.tk 8 Mar 2004 02:28:00 -0000 1.1.2.5 *************** *** 25,28 **** --- 25,29 ---- global look set xys [list $x1 $y1 $x2 $y2] + if {[llength [$canvas gettags $tag]] != 0} { eval "$canvas coords $tag $xys" *************** *** 160,164 **** proc atom_select {canvas tag flag} { ! if {$flag} {set colour #0000ff} {set colour #000000} $canvas itemconfigure $tag -outline $colour } --- 161,166 ---- proc atom_select {canvas tag flag} { ! global look ! if {$flag} {set colour $look(objectframe4)} {set colour $look(objectframe3)} $canvas itemconfigure $tag -outline $colour } *************** *** 193,197 **** proc bluebox_select {canvas tag flag} { ! if {$flag} {set colour #0000ff} {set colour #000000} $canvas itemconfigure $tag -outline $colour } --- 195,200 ---- proc bluebox_select {canvas tag flag} { ! global look ! if {$flag} {set colour $look(objectframe4)} {set colour $look(objectframe3)} $canvas itemconfigure $tag -outline $colour } *************** *** 203,207 **** proc slider_select {canvas tag flag} { ! if {$flag} {set colour #0000ff} {set colour #000000} $canvas itemconfigure $tag -outline $colour } --- 206,211 ---- proc slider_select {canvas tag flag} { ! global look ! if {$flag} {set colour $look(objectframe4)} {set colour $look(objectframe3)} $canvas itemconfigure $tag -outline $colour } *************** *** 237,241 **** proc radio_set {canvas tag value} { - post_to_gui "radio_set: $value\n" $canvas itemconfigure ${tag}BUT -fill #ffffff $canvas itemconfigure ${tag}BUT$value -fill #000000 --- 241,244 ---- *************** *** 258,262 **** proc slider_set {canvas tag value orient colour} { - post_to_gui "slider_set: $value $orient\n" set pos [$canvas coords ${tag}BASE] set x1 [lindex $pos 0] --- 261,264 ---- *************** *** 280,283 **** --- 282,289 ---- } + proc slider_select {canvas tag v} { + bluebox_select $canvas ${tag}BASE $v + } + proc slider_erase {canvas tag} { bluebox_erase $canvas ${tag}BASE *************** *** 285,291 **** } ! proc bang_draw {canvas tag x1 y1 x2 y2 ins outs colour} { bluebox_draw $canvas ${tag}BASE $x1 $y1 $x2 $y2 $ins $outs $colour io_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs } --- 291,315 ---- } ! proc bang_draw {canvas tag x1 y1 x2 y2 ins outs colour label ldx ldy lfont lcolor} { ! set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] bluebox_draw $canvas ${tag}BASE $x1 $y1 $x2 $y2 $ins $outs $colour io_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs + if {$isnew} { + $canvas create oval \ + [expr $x1+2] [expr $y1+2] [expr $x2-2] [expr $y2-2] \ + -fill [bluify $colour] -tags ${tag}BUT + $canvas create text [expr $x1+$ldx] [expr $y1+$ldy] -text $label -anchor w \ + -font $lfont -fill $lcolor -tags ${tag}LABEL + } { + $canvas coords ${tag}BUT \ + [expr $x1+2] [expr $y1+2] [expr $x2-2] [expr $y2-2] + $canvas coords ${tag}LABEL [expr $x1+$ldx] [expr $y1+$ldy] + $canvas itemconfigure ${tag}LABEL -text $label -anchor w \ + -font $lfont -fill $lcolor + } + } + + proc bang_select {canvas tag v} { + bluebox_select $canvas ${tag}BASE $v } *************** *** 293,295 **** --- 317,352 ---- bluebox_erase $canvas ${tag}BASE io_erase $canvas $tag + $canvas delete ${tag}BUT ${tag}LABEL + } + + proc toggle_draw {canvas tag x1 y1 x2 y2 ins outs colour label ldx ldy lfont lcolor} { + set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] + bluebox_draw $canvas ${tag}BASE $x1 $y1 $x2 $y2 $ins $outs $colour + io_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs + set w 1 + set on 0 + if {$x2-$x1 >= 30} {set w 2} + if {$x2-$x1 >= 60} {set w 3} + if {$on} {set fill #ffff00} {set fill [bluify $colour]} + set x3 [expr $x1+$w+2] + set y3 [expr $y1+$w+2] + set x4 [expr $x2-$w-2] + set y4 [expr $y2-$w-2] + if {$isnew} { + $canvas create line $x3 $y3 [expr $x4+1] [expr $y4+1] -width $w -fill $fill -tags ${tag}X1 + $canvas create line $x3 $y4 [expr $x4+1] [expr $y3-1] -width $w -fill $fill -tags ${tag}X2 + } { + $canvas coords ${tag}X1 $x3 $y3 $x4 $y4 + $canvas coords ${tag}X2 $x3 $y4 $x4 $y3 + } + } + + proc toggle_select {canvas tag v} { + bluebox_select $canvas ${tag}BASE $v + } + + proc toggle_erase {canvas tag} { + bluebox_erase $canvas ${tag}BASE + io_erase $canvas $tag + $canvas delete ${tag}BUT ${tag}LABEL }

1 0

pd/src g_hslider.c,1.1.1.3.2.2.2.3,1.1.1.3.2.2.2.4 g_vslider.c,1.1.1.3.2.2.2.3,1.1.1.3.2.2.2.4
by matju＠users.sourceforge.net 08 Mar '04

08 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12287 Modified Files: Tag: impd_0_37 g_hslider.c g_vslider.c Log Message: merging hslider/vslider code and deleting 420 lines of code Index: g_hslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v retrieving revision 1.1.1.3.2.2.2.3 retrieving revision 1.1.1.3.2.2.2.4 diff -C2 -d -r1.1.1.3.2.2.2.3 -r1.1.1.3.2.2.2.4 *** g_hslider.c 7 Mar 2004 19:38:13 -0000 1.1.1.3.2.2.2.3 --- g_hslider.c 8 Mar 2004 00:44:38 -0000 1.1.1.3.2.2.2.4 *************** *** 25,36 **** t_widgetbehavior hslider_widgetbehavior; static t_class *hslider_class; /* widget helper functions */ static void hslider_draw_update(t_hslider *x, t_glist *glist) { t_canvas *canvas=glist_getcanvas(glist); if (glist_isvisible(glist)) ! {sys_vgui("slider_set .x%x.c %x %d 0 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol);} } --- 25,45 ---- t_widgetbehavior hslider_widgetbehavior; static t_class *hslider_class; + static t_class *vslider_class; /* widget helper functions */ + static int isvert(t_hslider *x) { + t_class *c = x->x_gui.x_obj.te_g.g_pd; + if (c==vslider_class) return 1; + if (c==hslider_class) return 0; + abort(); + } + static void hslider_draw_update(t_hslider *x, t_glist *glist) { t_canvas *canvas=glist_getcanvas(glist); if (glist_isvisible(glist)) ! {sys_vgui("slider_set .x%x.c %x %d %d #%6.6x\n", canvas, x, x->x_val, ! isvert(x),x->x_gui.x_fcol);} } *************** *** 40,47 **** int ypos=text_ypix(&x->x_gui.x_obj, glist); t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d 0 #%6.6x\n", canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); ! sys_vgui("slider_set .x%x.c %x %d 0 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", --- 49,56 ---- int ypos=text_ypix(&x->x_gui.x_obj, glist); t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d %d #%6.6x\n", canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,isvert(x),x->x_gui.x_bcol); ! sys_vgui("slider_set .x%x.c %x %d %d #%6.6x\n", canvas, x, x->x_val, isvert(x),x->x_gui.x_fcol); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", *************** *** 56,63 **** int ypos=text_ypix(&x->x_gui.x_obj, glist); t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d 0 #%6.6x\n", canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); ! sys_vgui("slider_set .x%x.c %x %d 0 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); sys_vgui(".x%x.c coords %xLABEL %d %d\n", canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); --- 65,72 ---- int ypos=text_ypix(&x->x_gui.x_obj, glist); t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d %d #%6.6x\n", canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,isvert(x),x->x_gui.x_bcol); ! sys_vgui("slider_set .x%x.c %x %d %d #%6.6x\n", canvas, x, x->x_val,isvert(x), x->x_gui.x_fcol); sys_vgui(".x%x.c coords %xLABEL %d %d\n", canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); *************** *** 80,88 **** x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); ! sys_vgui("slider_set .x%x.c %x %d 0 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); ! sys_vgui("slider_select .x%x.c %xBASE %d\n", canvas, x, x->x_gui.x_fsf.x_selected); } ! static void hslider_draw_select(t_hslider* x,t_glist* glist) { t_canvas *canvas=glist_getcanvas(glist); --- 89,97 ---- x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); ! sys_vgui("slider_set .x%x.c %x %d %d #%6.6x\n", canvas, x, x->x_val, isvert(x), x->x_gui.x_fcol); ! sys_vgui("slider_select .x%x.c %x %d\n", canvas, x, x->x_gui.x_fsf.x_selected); } ! static void hslider_draw_select(t_hslider *x, t_glist *glist) { t_canvas *canvas=glist_getcanvas(glist); *************** *** 92,96 **** } ! void hslider_draw(t_hslider *x, t_glist *glist, int mode) { if (mode == IEM_GUI_DRAW_MODE_UPDATE) hslider_draw_update(x, glist); --- 101,105 ---- } ! static void hslider_draw(t_hslider *x, t_glist *glist, int mode) { if (mode == IEM_GUI_DRAW_MODE_UPDATE) hslider_draw_update(x, glist); *************** *** 110,117 **** t_hslider* x = (t_hslider*)z; ! *xp1 = text_xpix(&x->x_gui.x_obj, glist) - 3; ! *yp1 = text_ypix(&x->x_gui.x_obj, glist); ! *xp2 = *xp1 + x->x_gui.x_w + 5; ! *yp2 = *yp1 + x->x_gui.x_h; } --- 119,126 ---- t_hslider* x = (t_hslider*)z; ! *xp1 = text_xpix(&x->x_gui.x_obj, glist) - (isvert(x)?0:3); ! *yp1 = text_ypix(&x->x_gui.x_obj, glist) - (isvert(x)?2:0); ! *xp2 = *xp1 + x->x_gui.x_w + (isvert(x)?0:5); ! *yp2 = *yp1 + x->x_gui.x_h + (isvert(x)?5:0); } *************** *** 125,129 **** binbuf_addv(b, "ssiisiiffiisssiiiiiiiii", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, ! gensym("hsl"), x->x_gui.x_w, x->x_gui.x_h, (float)x->x_min, (float)x->x_max, x->x_lin0_log1, iem_symargstoint(&x->x_gui.x_isa), --- 134,138 ---- binbuf_addv(b, "ssiisiiffiisssiiiiiiiii", gensym("#X"),gensym("obj"), (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, ! isvert(x) ? gensym("vsl") : gensym("hsl"), x->x_gui.x_w, x->x_gui.x_h, (float)x->x_min, (float)x->x_max, x->x_lin0_log1, iem_symargstoint(&x->x_gui.x_isa), *************** *** 136,143 **** } ! void hslider_check_width(t_hslider *x, int w) { ! if(w < IEM_SL_MINSIZE) ! w = IEM_SL_MINSIZE; x->x_gui.x_w = w; x->x_center = (x->x_gui.x_w-1)*50; --- 145,165 ---- } ! static void hslider_check_width(t_hslider *x, int w) { ! if (isvert(x)) { ! if(w < IEM_SL_MINSIZE) w = IEM_SL_MINSIZE; ! x->x_gui.x_h = w; ! ! if(x->x_val > (x->x_gui.x_h*100 - 100)) ! { ! x->x_pos = x->x_gui.x_h*100 - 100; ! x->x_val = x->x_pos; ! } ! if(x->x_lin0_log1) ! x->x_k = log(x->x_max/x->x_min)/(double)(x->x_gui.x_h - 1); ! else ! x->x_k = (x->x_max - x->x_min)/(double)(x->x_gui.x_h - 1); ! } else { ! if(w < IEM_SL_MINSIZE) w = IEM_SL_MINSIZE; x->x_gui.x_w = w; x->x_center = (x->x_gui.x_w-1)*50; *************** *** 151,157 **** else x->x_k = (x->x_max - x->x_min)/(double)(x->x_gui.x_w - 1); ! } ! void hslider_check_minmax(t_hslider *x, double min, double max) { if(x->x_lin0_log1) --- 173,179 ---- else x->x_k = (x->x_max - x->x_min)/(double)(x->x_gui.x_w - 1); ! }} ! static void hslider_check_minmax(t_hslider *x, double min, double max) { if(x->x_lin0_log1) *************** *** 170,173 **** --- 192,201 ---- else x->x_gui.x_isa.x_reverse = 0; + if (isvert(x)) { + if(x->x_lin0_log1) + x->x_k = log(x->x_max/x->x_min)/(double)(x->x_gui.x_h - 1); + else + x->x_k = (x->x_max - x->x_min)/(double)(x->x_gui.x_h - 1); + } else { if(x->x_lin0_log1) x->x_k = log(x->x_max/x->x_min)/(double)(x->x_gui.x_w - 1); *************** *** 175,178 **** --- 203,207 ---- x->x_k = (x->x_max - x->x_min)/(double)(x->x_gui.x_w - 1); } + } static void hslider_properties(t_gobj *z, t_glist *owner) *************** *** 257,263 **** x->x_steady = 0; sr_flags = iemgui_dialog(&x->x_gui, srl, argc, argv); ! x->x_gui.x_h = iemgui_clip_size(h); hslider_check_width(x, w); ! hslider_check_minmax(x, min, max); (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_CONFIG); (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_IO + sr_flags); --- 286,297 ---- x->x_steady = 0; sr_flags = iemgui_dialog(&x->x_gui, srl, argc, argv); ! if (isvert(x)) { ! x->x_gui.x_w = iemgui_clip_size(w); ! hslider_check_width(x, h); ! } else { ! x->x_gui.x_h = iemgui_clip_size(h); hslider_check_width(x, w); ! } ! hslider_check_minmax(x, min, max); (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_CONFIG); (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_IO + sr_flags); *************** *** 269,273 **** { int old = x->x_val; ! if(x->x_gui.x_fsf.x_finemoved) x->x_pos += (int)dx; --- 303,319 ---- { int old = x->x_val; ! if (isvert(x)) { ! if(x->x_gui.x_fsf.x_finemoved) ! x->x_pos -= (int)dy; ! else ! x->x_pos -= 100*(int)dy; ! x->x_val = x->x_pos; ! if(x->x_val > (100*x->x_gui.x_h - 100)) ! { ! x->x_val = 100*x->x_gui.x_h - 100; ! x->x_pos += 50; ! x->x_pos -= x->x_pos%100; ! } ! }else{ if(x->x_gui.x_fsf.x_finemoved) x->x_pos += (int)dx; *************** *** 281,284 **** --- 327,331 ---- x->x_pos -= x->x_pos%100; } + } if(x->x_val < 0) { *************** *** 297,304 **** t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { if(!x->x_steady) x->x_val = (int)(100.0 * (xpos - text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist))); ! if(x->x_val > (100*x->x_gui.x_w - 100)) x->x_val = 100*x->x_gui.x_w - 100; if(x->x_val < 0) x->x_val = 0; --- 344,358 ---- t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { + if (isvert(x)) { + if(!x->x_steady) + x->x_val = (int)(100.0 * (x->x_gui.x_h + text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist) - ypos)); + if(x->x_val > (100*x->x_gui.x_h - 100)) + x->x_val = 100*x->x_gui.x_h - 100; + }else{ if(!x->x_steady) x->x_val = (int)(100.0 * (xpos - text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist))); ! if(x->x_val > (100*x->x_gui.x_w - 100)) x->x_val = 100*x->x_gui.x_w - 100; + } if(x->x_val < 0) x->x_val = 0; *************** *** 319,326 **** hslider_click( x, (t_floatarg)xpix, (t_floatarg)ypix, (t_floatarg)shift, 0, (t_floatarg)alt); ! if(shift) ! x->x_gui.x_fsf.x_finemoved = 1; ! else ! x->x_gui.x_fsf.x_finemoved = 0; } return (1); --- 373,377 ---- hslider_click( x, (t_floatarg)xpix, (t_floatarg)ypix, (t_floatarg)shift, 0, (t_floatarg)alt); ! x->x_gui.x_fsf.x_finemoved = !!shift; } return (1); *************** *** 329,337 **** static void hslider_size(t_hslider *x, t_symbol *s, int ac, t_atom *av) { hslider_check_width(x, (int)atom_getintarg(0, ac, av)); if(ac > 1) x->x_gui.x_h = iemgui_clip_size((int)atom_getintarg(1, ac, av)); iemgui_size((void *)x, &x->x_gui); ! } static void hslider_delta(t_hslider *x, t_symbol *s, int ac, t_atom *av) --- 380,394 ---- static void hslider_size(t_hslider *x, t_symbol *s, int ac, t_atom *av) { + if (isvert(x)) { + x->x_gui.x_w = iemgui_clip_size((int)atom_getintarg(0, ac, av)); + if(ac > 1) + hslider_check_width(x, (int)atom_getintarg(1, ac, av)); + iemgui_size((void *)x, &x->x_gui); + }else{ hslider_check_width(x, (int)atom_getintarg(0, ac, av)); if(ac > 1) x->x_gui.x_h = iemgui_clip_size((int)atom_getintarg(1, ac, av)); iemgui_size((void *)x, &x->x_gui); ! }} static void hslider_delta(t_hslider *x, t_symbol *s, int ac, t_atom *av) *************** *** 406,409 **** --- 463,475 ---- } + /* VSlider's + static void hslider_float(t_hslider *x, t_floatarg f) + { + hslider_set(x, f); + if(x->x_gui.x_fsf.x_put_in2out) + hslider_bang(x); + } + */ + static void hslider_loadbang(t_hslider *x) { *************** *** 417,421 **** static void *hslider_new(t_symbol *s, int argc, t_atom *argv) { - t_hslider *x = (t_hslider *)pd_new(hslider_class); int bflcol[]={-262144, -1, -1}; int w=IEM_SL_DEFAULTSIZE, h=IEM_GUI_DEFAULTSIZE; --- 483,486 ---- *************** *** 423,427 **** double min=0.0, max=(double)(IEM_SL_DEFAULTSIZE-1); char str[144]; ! iem_inttosymargs(&x->x_gui.x_isa, 0); iem_inttofstyle(&x->x_gui.x_fsf, 0); --- 488,498 ---- double min=0.0, max=(double)(IEM_SL_DEFAULTSIZE-1); char str[144]; ! t_hslider *x; ! if (s==gensym("hsl") || s==gensym("hslider")) { ! x = (t_hslider *)pd_new(hslider_class); ! } else if (s==gensym("vsl") || s==gensym("vslider")) { ! x = (t_hslider *)pd_new(vslider_class); ! } else abort(); ! if (isvert(x)) w=IEM_GUI_DEFAULTSIZE, h=IEM_SL_DEFAULTSIZE; iem_inttosymargs(&x->x_gui.x_isa, 0); iem_inttofstyle(&x->x_gui.x_fsf, 0); *************** *** 462,468 **** fs = 4; x->x_gui.x_fontsize = fs; ! x->x_gui.x_h = iemgui_clip_size(h); ! hslider_check_width(x, w); ! hslider_check_minmax(x, min, max); iemgui_all_colfromload(&x->x_gui, bflcol); x->x_thick = 0; --- 533,545 ---- fs = 4; x->x_gui.x_fontsize = fs; ! if (isvert(x)) { ! x->x_gui.x_w = iemgui_clip_size(w); ! hslider_check_width(x, h); ! hslider_check_minmax(x, min, max); ! }else{ ! x->x_gui.x_h = iemgui_clip_size(h); ! hslider_check_width(x, w); ! hslider_check_minmax(x, min, max); ! } iemgui_all_colfromload(&x->x_gui, bflcol); x->x_thick = 0; *************** *** 479,512 **** } void g_hslider_setup(void) { hslider_class = class_new(gensym("hsl"), (t_newmethod)hslider_new, (t_method)hslider_free, sizeof(t_hslider), 0, A_GIMME, 0); #ifndef GGEE_HSLIDER_COMPATIBLE class_addcreator((t_newmethod)hslider_new, gensym("hslider"), A_GIMME, 0); #endif ! class_addbang(hslider_class,hslider_bang); ! class_addfloat(hslider_class,hslider_float); ! class_addmethod(hslider_class, (t_method)hslider_click, gensym("click"), ! A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(hslider_class, (t_method)hslider_motion, gensym("motion"), ! A_FLOAT, A_FLOAT, 0); ! class_addmethod(hslider_class, (t_method)hslider_dialog, gensym("dialog"), A_GIMME, 0); ! class_addmethod(hslider_class, (t_method)hslider_loadbang, gensym("loadbang"), 0); ! class_addmethod(hslider_class, (t_method)hslider_set, gensym("set"), A_FLOAT, 0); ! class_addmethod(hslider_class, (t_method)hslider_size, gensym("size"), A_GIMME, 0); ! class_addmethod(hslider_class, (t_method)hslider_delta, gensym("delta"), A_GIMME, 0); ! class_addmethod(hslider_class, (t_method)hslider_pos, gensym("pos"), A_GIMME, 0); ! class_addmethod(hslider_class, (t_method)hslider_range, gensym("range"), A_GIMME, 0); ! class_addmethod(hslider_class, (t_method)hslider_color, gensym("color"), A_GIMME, 0); ! class_addmethod(hslider_class, (t_method)hslider_send, gensym("send"), A_DEFSYM, 0); ! class_addmethod(hslider_class, (t_method)hslider_receive, gensym("receive"), A_DEFSYM, 0); ! class_addmethod(hslider_class, (t_method)hslider_label, gensym("label"), A_DEFSYM, 0); ! class_addmethod(hslider_class, (t_method)hslider_label_pos, gensym("label_pos"), A_GIMME, 0); ! class_addmethod(hslider_class, (t_method)hslider_label_font, gensym("label_font"), A_GIMME, 0); ! class_addmethod(hslider_class, (t_method)hslider_log, gensym("log"), 0); ! class_addmethod(hslider_class, (t_method)hslider_lin, gensym("lin"), 0); ! class_addmethod(hslider_class, (t_method)hslider_init, gensym("init"), A_FLOAT, 0); ! class_addmethod(hslider_class, (t_method)hslider_steady, gensym("steady"), A_FLOAT, 0); hslider_widgetbehavior.w_getrectfn = hslider_getrect; hslider_widgetbehavior.w_displacefn = iemgui_displace; --- 556,596 ---- } + static void hslider_methods(t_class *c) { + class_addbang(c,hslider_bang); + class_addfloat(c,hslider_float); + class_addmethod(c, (t_method)hslider_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); + class_addmethod(c, (t_method)hslider_motion, gensym("motion"), A_FLOAT, A_FLOAT, 0); + class_addmethod(c, (t_method)hslider_dialog, gensym("dialog"), A_GIMME, 0); + class_addmethod(c, (t_method)hslider_loadbang, gensym("loadbang"), 0); + class_addmethod(c, (t_method)hslider_set, gensym("set"), A_FLOAT, 0); + class_addmethod(c, (t_method)hslider_size, gensym("size"), A_GIMME, 0); + class_addmethod(c, (t_method)hslider_delta, gensym("delta"), A_GIMME, 0); + class_addmethod(c, (t_method)hslider_pos, gensym("pos"), A_GIMME, 0); + class_addmethod(c, (t_method)hslider_range, gensym("range"), A_GIMME, 0); + class_addmethod(c, (t_method)hslider_color, gensym("color"), A_GIMME, 0); + class_addmethod(c, (t_method)hslider_send, gensym("send"), A_DEFSYM, 0); + class_addmethod(c, (t_method)hslider_receive, gensym("receive"), A_DEFSYM, 0); + class_addmethod(c, (t_method)hslider_label, gensym("label"), A_DEFSYM, 0); + class_addmethod(c, (t_method)hslider_label_pos, gensym("label_pos"), A_GIMME, 0); + class_addmethod(c, (t_method)hslider_label_font, gensym("label_font"), A_GIMME, 0); + class_addmethod(c, (t_method)hslider_log, gensym("log"), 0); + class_addmethod(c, (t_method)hslider_lin, gensym("lin"), 0); + class_addmethod(c, (t_method)hslider_init, gensym("init"), A_FLOAT, 0); + class_addmethod(c, (t_method)hslider_steady, gensym("steady"), A_FLOAT, 0); + } + void g_hslider_setup(void) { hslider_class = class_new(gensym("hsl"), (t_newmethod)hslider_new, (t_method)hslider_free, sizeof(t_hslider), 0, A_GIMME, 0); + vslider_class = class_new(gensym("vsl"), (t_newmethod)hslider_new, + (t_method)hslider_free, sizeof(t_hslider), 0, A_GIMME, 0); #ifndef GGEE_HSLIDER_COMPATIBLE class_addcreator((t_newmethod)hslider_new, gensym("hslider"), A_GIMME, 0); #endif ! class_addcreator((t_newmethod)hslider_new, gensym("vslider"), A_GIMME, 0); ! ! hslider_methods(hslider_class); ! hslider_methods(vslider_class); hslider_widgetbehavior.w_getrectfn = hslider_getrect; hslider_widgetbehavior.w_displacefn = iemgui_displace; *************** *** 516,522 **** --- 600,613 ---- hslider_widgetbehavior.w_visfn = iemgui_vis; hslider_widgetbehavior.w_clickfn = hslider_newclick; + class_setwidget(hslider_class, &hslider_widgetbehavior); + class_setwidget(vslider_class, &hslider_widgetbehavior); class_sethelpsymbol(hslider_class, gensym("hslider")); + class_sethelpsymbol(vslider_class, gensym("vslider")); class_setsavefn(hslider_class, hslider_save); + class_setsavefn(vslider_class, hslider_save); class_setpropertiesfn(hslider_class, hslider_properties); + class_setpropertiesfn(vslider_class, hslider_properties); } + + void g_vslider_setup(void) {} Index: g_vslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vslider.c,v retrieving revision 1.1.1.3.2.2.2.3 retrieving revision 1.1.1.3.2.2.2.4 diff -C2 -d -r1.1.1.3.2.2.2.3 -r1.1.1.3.2.2.2.4 *** g_vslider.c 7 Mar 2004 19:38:13 -0000 1.1.1.3.2.2.2.3 --- g_vslider.c 8 Mar 2004 00:44:38 -0000 1.1.1.3.2.2.2.4 *************** *** 1,520 **** - /* Copyright (c) 1997-1999 Miller Puckette. - * For information on usage and redistribution, and for a DISCLAIMER OF ALL - * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ - - /* g_7_guis.c written by Thomas Musil (c) IEM KUG Graz Austria 2000-2001 */ - /* thanks to Miller Puckette, Guenther Geiger and Krzystof Czaja */ - - - #include <stdlib.h> - #include <string.h> - #include <stdio.h> - #include <ctype.h> - #include "m_pd.h" - #include "g_canvas.h" - #include "t_tk.h" - #include "g_all_guis.h" - #include <math.h> - - #ifdef MSW - #include <io.h> - #else - #include <unistd.h> - #endif - - t_widgetbehavior vslider_widgetbehavior; - static t_class *vslider_class; - - /* widget helper functions */ - - static void vslider_draw_update(t_vslider *x, t_glist *glist) - { - t_canvas *canvas=glist_getcanvas(glist); - if (glist_isvisible(glist)) - {sys_vgui("slider_set .x%x.c %x %d 1 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol);} - } - - static void vslider_draw_new(t_vslider *x, t_glist *glist) - { - int xpos=text_xpix(&x->x_gui.x_obj, glist); - int ypos=text_ypix(&x->x_gui.x_obj, glist); - t_canvas *canvas=glist_getcanvas(glist); - sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d 1 #%6.6x\n", - canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, - !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); - sys_vgui("slider_set .x%x.c %x %d 1 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); - sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ - -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", - canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, - strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", - x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); - } - - static void vslider_draw_move(t_vslider *x, t_glist *glist) - { - int xpos=text_xpix(&x->x_gui.x_obj, glist); - int ypos=text_ypix(&x->x_gui.x_obj, glist); - t_canvas *canvas=glist_getcanvas(glist); - sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d 1 #%6.6x\n", - canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, - !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); - sys_vgui("slider_set .x%x.c %x %d 1 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); - sys_vgui(".x%x.c coords %xLABEL %d %d\n", - canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); - } - - static void vslider_draw_erase(t_vslider* x,t_glist* glist) - { - t_canvas *canvas=glist_getcanvas(glist); - sys_vgui("slider_erase .x%x.c %x\n", canvas, x); - sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); - } - - static void vslider_draw_config(t_vslider* x,t_glist* glist) - { - t_canvas *canvas=glist_getcanvas(glist); - int xpos=text_xpix(&x->x_gui.x_obj, glist); - int ypos=text_ypix(&x->x_gui.x_obj, glist); - sys_vgui(".x%x.c itemconfigure %xLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", - canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, - x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, - strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); - sys_vgui("slider_set .x%x.c %x %d 1 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); - sys_vgui("slider_select .x%x.c %xBASE %d\n", canvas, x, x->x_gui.x_fsf.x_selected); - } - - static void vslider_draw_select(t_vslider *x, t_glist *glist) - { - t_canvas *canvas=glist_getcanvas(glist); - sys_vgui("slider_select .x%x.c %x %d\n", canvas, x, x->x_gui.x_fsf.x_selected); - sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, - x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol); - } - - void vslider_draw(t_vslider *x, t_glist *glist, int mode) - { - if (mode == IEM_GUI_DRAW_MODE_UPDATE) vslider_draw_update(x, glist); - else if(mode == IEM_GUI_DRAW_MODE_MOVE) vslider_draw_move(x, glist); - else if(mode == IEM_GUI_DRAW_MODE_NEW) vslider_draw_new(x, glist); - else if(mode == IEM_GUI_DRAW_MODE_SELECT) vslider_draw_select(x, glist); - else if(mode == IEM_GUI_DRAW_MODE_ERASE) vslider_draw_erase(x, glist); - else if(mode == IEM_GUI_DRAW_MODE_CONFIG) vslider_draw_config(x, glist); - else if(mode >= IEM_GUI_DRAW_MODE_IO) vslider_draw_move(x, glist); - } - - /* ------------------------ vsl widgetbehaviour----------------------------- */ - - static void vslider_getrect(t_gobj *z, t_glist *glist, - int *xp1, int *yp1, int *xp2, int *yp2) - { - t_vslider* x = (t_vslider*)z; - - *xp1 = text_xpix(&x->x_gui.x_obj, glist); - *yp1 = text_ypix(&x->x_gui.x_obj, glist) - 2; - *xp2 = *xp1 + x->x_gui.x_w; - *yp2 = *yp1 + x->x_gui.x_h + 5; - } - - static void vslider_save(t_gobj *z, t_binbuf *b) - { - t_vslider *x = (t_vslider *)z; - int bflcol[3]; - t_symbol *srl[3]; - - iemgui_save(&x->x_gui, srl, bflcol); - binbuf_addv(b, "ssiisiiffiisssiiiiiiiii", gensym("#X"),gensym("obj"), - (t_int)x->x_gui.x_obj.te_xpix, (t_int)x->x_gui.x_obj.te_ypix, - gensym("vsl"), x->x_gui.x_w, x->x_gui.x_h, - (float)x->x_min, (float)x->x_max, - x->x_lin0_log1, iem_symargstoint(&x->x_gui.x_isa), - srl[0], srl[1], srl[2], - x->x_gui.x_ldx, x->x_gui.x_ldy, - iem_fstyletoint(&x->x_gui.x_fsf), x->x_gui.x_fontsize, - bflcol[0], bflcol[1], bflcol[2], - x->x_val, x->x_steady); - binbuf_addv(b, ";"); - } - - void vslider_check_height(t_vslider *x, int h) - { - if(h < IEM_SL_MINSIZE) - h = IEM_SL_MINSIZE; - x->x_gui.x_h = h; - - if(x->x_val > (x->x_gui.x_h*100 - 100)) - { - x->x_pos = x->x_gui.x_h*100 - 100; - x->x_val = x->x_pos; - } - if(x->x_lin0_log1) - x->x_k = log(x->x_max/x->x_min)/(double)(x->x_gui.x_h - 1); - else - x->x_k = (x->x_max - x->x_min)/(double)(x->x_gui.x_h - 1); - } - - void vslider_check_minmax(t_vslider *x, double min, double max) - { - if(x->x_lin0_log1) - { - if(min == 0.0 && max == 0.0) max = 1.0; - if(max > 0.0) { - if(min <= 0.0) min = 0.01*max; - } else { - if(min > 0.0) max = 0.01*min; - } - } - x->x_min = min; - x->x_max = max; - if(x->x_min > x->x_max) /* bugfix */ - x->x_gui.x_isa.x_reverse = 1; - else - x->x_gui.x_isa.x_reverse = 0; - if(x->x_lin0_log1) - x->x_k = log(x->x_max/x->x_min)/(double)(x->x_gui.x_h - 1); - else - x->x_k = (x->x_max - x->x_min)/(double)(x->x_gui.x_h - 1); - } - - static void vslider_properties(t_gobj *z, t_glist *owner) - { - t_vslider *x = (t_vslider *)z; - char buf[800]; - t_symbol *srl[3]; - - iemgui_properties(&x->x_gui, srl); - sprintf(buf, "pdtk_iemgui_dialog %%s VSLIDER \ - --------dimensions(pix)(pix):-------- %d %d width: %d %d height: \ - -----------output-range:----------- %g bottom: %g top: %d \ - %d lin log %d %d empty %d \ - %s %s \ - %s %d %d \ - %d %d \ - %d %d %d\n", - x->x_gui.x_w, IEM_GUI_MINSIZE, x->x_gui.x_h, IEM_SL_MINSIZE, - x->x_min, x->x_max, 0,/*no_schedule*/ - x->x_lin0_log1, x->x_gui.x_isa.x_loadinit, x->x_steady, -1,/*no multi, but iem-characteristic*/ - srl[0]->s_name, srl[1]->s_name, - srl[2]->s_name, x->x_gui.x_ldx, x->x_gui.x_ldy, - x->x_gui.x_fsf.x_font_style, x->x_gui.x_fontsize, - 0xffffff & x->x_gui.x_bcol, 0xffffff & x->x_gui.x_fcol, 0xffffff & x->x_gui.x_lcol); - gfxstub_new(&x->x_gui.x_obj.ob_pd, x, buf); - } - - static void vslider_bang(t_vslider *x) - { - double out; - - if(x->x_lin0_log1) - out = x->x_min*exp(x->x_k*(double)(x->x_val)*0.01); - else - out = (double)(x->x_val)*0.01*x->x_k + x->x_min; - if((out < 1.0e-10)&&(out > -1.0e-10)) - out = 0.0; - - outlet_float(x->x_gui.x_obj.ob_outlet, out); - if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing) - pd_float(x->x_gui.x_snd->s_thing, out); - } - - static void vslider_dialog(t_vslider *x, t_symbol *s, int argc, t_atom *argv) - { - t_symbol *srl[3]; - int w = (int)atom_getintarg(0, argc, argv); - int h = (int)atom_getintarg(1, argc, argv); - double min = (double)atom_getfloatarg(2, argc, argv); - double max = (double)atom_getfloatarg(3, argc, argv); - int lilo = (int)atom_getintarg(4, argc, argv); - int steady = (int)atom_getintarg(17, argc, argv); - int sr_flags; - - if(lilo != 0) lilo = 1; - x->x_lin0_log1 = lilo; - if(steady) - x->x_steady = 1; - else - x->x_steady = 0; - sr_flags = iemgui_dialog(&x->x_gui, srl, argc, argv); - x->x_gui.x_w = iemgui_clip_size(w); - vslider_check_height(x, h); - vslider_check_minmax(x, min, max); - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_CONFIG); - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_IO + sr_flags); - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_MOVE); - canvas_fixlinesfor(glist_getcanvas(x->x_gui.x_glist), (t_text*)x); - } - - static void vslider_motion(t_vslider *x, t_floatarg dx, t_floatarg dy) - { - int old = x->x_val; - - if(x->x_gui.x_fsf.x_finemoved) - x->x_pos -= (int)dy; - else - x->x_pos -= 100*(int)dy; - x->x_val = x->x_pos; - if(x->x_val > (100*x->x_gui.x_h - 100)) - { - x->x_val = 100*x->x_gui.x_h - 100; - x->x_pos += 50; - x->x_pos -= x->x_pos%100; - } - if(x->x_val < 0) - { - x->x_val = 0; - x->x_pos -= 50; - x->x_pos -= x->x_pos%100; - } - if(old != x->x_val) - { - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); - vslider_bang(x); - } - } - - static void vslider_click(t_vslider *x, t_floatarg xpos, t_floatarg ypos, - t_floatarg shift, t_floatarg ctrl, t_floatarg alt) - { - if(!x->x_steady) - x->x_val = (int)(100.0 * (x->x_gui.x_h + text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist) - ypos)); - if(x->x_val > (100*x->x_gui.x_h - 100)) - x->x_val = 100*x->x_gui.x_h - 100; - if(x->x_val < 0) - x->x_val = 0; - x->x_pos = x->x_val; - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); - vslider_bang(x); - glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g, - (t_glistmotionfn)vslider_motion, 0, xpos, ypos); - } - - static int vslider_newclick(t_gobj *z, struct _glist *glist, - int xpix, int ypix, int shift, int alt, int dbl, int doit) - { - t_vslider* x = (t_vslider *)z; - - if(doit) - { - vslider_click( x, (t_floatarg)xpix, (t_floatarg)ypix, (t_floatarg)shift, - 0, (t_floatarg)alt); - if(shift) - x->x_gui.x_fsf.x_finemoved = 1; - else - x->x_gui.x_fsf.x_finemoved = 0; - } - return (1); - } - - static void vslider_set(t_vslider *x, t_floatarg f) - { - double g; - - if(x->x_gui.x_isa.x_reverse) /* bugfix */ - { - if(f > x->x_min) - f = x->x_min; - if(f < x->x_max) - f = x->x_max; - } - else - { - if(f > x->x_max) - f = x->x_max; - if(f < x->x_min) - f = x->x_min; - } - if(x->x_lin0_log1) - g = log(f/x->x_min)/x->x_k; - else - g = (f - x->x_min) / x->x_k; - x->x_val = (int)(100.0*g + 0.49999); - x->x_pos = x->x_val; - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); - } - - static void vslider_float(t_vslider *x, t_floatarg f) - { - vslider_set(x, f); - if(x->x_gui.x_fsf.x_put_in2out) - vslider_bang(x); - } - - static void vslider_size(t_vslider *x, t_symbol *s, int ac, t_atom *av) - { - x->x_gui.x_w = iemgui_clip_size((int)atom_getintarg(0, ac, av)); - if(ac > 1) - vslider_check_height(x, (int)atom_getintarg(1, ac, av)); - iemgui_size((void *)x, &x->x_gui); - } - - static void vslider_delta(t_vslider *x, t_symbol *s, int ac, t_atom *av) - {iemgui_delta((void *)x, &x->x_gui, s, ac, av);} - - static void vslider_pos(t_vslider *x, t_symbol *s, int ac, t_atom *av) - {iemgui_pos((void *)x, &x->x_gui, s, ac, av);} - - static void vslider_range(t_vslider *x, t_symbol *s, int ac, t_atom *av) - { - vslider_check_minmax(x, (double)atom_getfloatarg(0, ac, av), - (double)atom_getfloatarg(1, ac, av)); - } - - static void vslider_color(t_vslider *x, t_symbol *s, int ac, t_atom *av) - {iemgui_color((void *)x, &x->x_gui, s, ac, av);} - - static void vslider_send(t_vslider *x, t_symbol *s) - {iemgui_send(x, &x->x_gui, s);} - - static void vslider_receive(t_vslider *x, t_symbol *s) - {iemgui_receive(x, &x->x_gui, s);} - - static void vslider_label(t_vslider *x, t_symbol *s) - {iemgui_label((void *)x, &x->x_gui, s);} - - static void vslider_label_pos(t_vslider *x, t_symbol *s, int ac, t_atom *av) - {iemgui_label_pos((void *)x, &x->x_gui, s, ac, av);} - - static void vslider_label_font(t_vslider *x, t_symbol *s, int ac, t_atom *av) - {iemgui_label_font((void *)x, &x->x_gui, s, ac, av);} - - static void vslider_log(t_vslider *x) - { - x->x_lin0_log1 = 1; - vslider_check_minmax(x, x->x_min, x->x_max); - } - - static void vslider_lin(t_vslider *x) - { - x->x_lin0_log1 = 0; - x->x_k = (x->x_max - x->x_min)/(double)(x->x_gui.x_h - 1); - } - - static void vslider_init(t_vslider *x, t_floatarg f) - { - x->x_gui.x_isa.x_loadinit = (f==0.0)?0:1; - } - - static void vslider_steady(t_vslider *x, t_floatarg f) - { - x->x_steady = (f==0.0)?0:1; - } - - static void vslider_loadbang(t_vslider *x) - { - if(!sys_noloadbang && x->x_gui.x_isa.x_loadinit) - { - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); - vslider_bang(x); - } - } - - - - - - - - - static void *vslider_new(t_symbol *s, int argc, t_atom *argv) - { - t_vslider *x = (t_vslider *)pd_new(vslider_class); - int bflcol[]={-262144, -1, -1}; - int w=IEM_GUI_DEFAULTSIZE, h=IEM_SL_DEFAULTSIZE; - int lilo=0, ldx=0, ldy=-8, f=0, v=0, steady=1, fs=8; - double min=0.0, max=(double)(IEM_SL_DEFAULTSIZE-1); - char str[144]; - - iem_inttosymargs(&x->x_gui.x_isa, 0); - iem_inttofstyle(&x->x_gui.x_fsf, 0); - - if(pd_scanargs(argc,argv,"iiffiF???iiFiiiii?;?", - &w,&h,&min,&max,&lilo,&ldx,&ldy,&fs,&bflcol[0],&bflcol[1],&bflcol[2],&v)) - { - iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(5, argc, argv)); - iemgui_new_getnames(&x->x_gui, 6, argv); - iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(11, argc, argv)); - } - else iemgui_new_getnames(&x->x_gui, 6, 0); - if((argc == 18)&&IS_A_FLOAT(argv,17)) - steady = (int)atom_getintarg(17, argc, argv); - x->x_gui.x_draw = (t_iemfunptr)vslider_draw; - x->x_gui.x_fsf.x_snd_able = 1; - x->x_gui.x_fsf.x_rcv_able = 1; - x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); - if(x->x_gui.x_isa.x_loadinit) - x->x_val = v; - else - x->x_val = 0; - x->x_pos = x->x_val; - if(lilo != 0) lilo = 1; - x->x_lin0_log1 = lilo; - if(steady != 0) steady = 1; - x->x_steady = steady; - if(!strcmp(x->x_gui.x_snd->s_name, "empty")) x->x_gui.x_fsf.x_snd_able = 0; - if(!strcmp(x->x_gui.x_rcv->s_name, "empty")) x->x_gui.x_fsf.x_rcv_able = 0; - if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); - else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); - else { x->x_gui.x_fsf.x_font_style = 0; - strcpy(x->x_gui.x_font, "courier"); } - if(x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); - x->x_gui.x_ldx = ldx; - x->x_gui.x_ldy = ldy; - if(fs < 4) - fs = 4; - x->x_gui.x_fontsize = fs; - x->x_gui.x_w = iemgui_clip_size(w); - vslider_check_height(x, h); - vslider_check_minmax(x, min, max); - iemgui_all_colfromload(&x->x_gui, bflcol); - iemgui_verify_snd_ne_rcv(&x->x_gui); - outlet_new(&x->x_gui.x_obj, &s_float); - return (x); - } - - static void vslider_free(t_vslider *x) - { - if(x->x_gui.x_fsf.x_rcv_able) - pd_unbind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); - gfxstub_deleteforkey(x); - } - - void g_vslider_setup(void) - { - vslider_class = class_new(gensym("vsl"), (t_newmethod)vslider_new, - (t_method)vslider_free, sizeof(t_vslider), 0, A_GIMME, 0); - class_addcreator((t_newmethod)vslider_new, gensym("vslider"), A_GIMME, 0); - class_addbang(vslider_class,vslider_bang); - class_addfloat(vslider_class,vslider_float); - class_addmethod(vslider_class, (t_method)vslider_click, gensym("click"), - A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); - class_addmethod(vslider_class, (t_method)vslider_motion, gensym("motion"), - A_FLOAT, A_FLOAT, 0); - class_addmethod(vslider_class, (t_method)vslider_dialog, gensym("dialog"), - A_GIMME, 0); - class_addmethod(vslider_class, (t_method)vslider_loadbang, gensym("loadbang"), 0); - class_addmethod(vslider_class, (t_method)vslider_set, gensym("set"), A_FLOAT, 0); - class_addmethod(vslider_class, (t_method)vslider_size, gensym("size"), A_GIMME, 0); - class_addmethod(vslider_class, (t_method)vslider_delta, gensym("delta"), A_GIMME, 0); - class_addmethod(vslider_class, (t_method)vslider_pos, gensym("pos"), A_GIMME, 0); - class_addmethod(vslider_class, (t_method)vslider_range, gensym("range"), A_GIMME, 0); - class_addmethod(vslider_class, (t_method)vslider_color, gensym("color"), A_GIMME, 0); - class_addmethod(vslider_class, (t_method)vslider_send, gensym("send"), A_DEFSYM, 0); - class_addmethod(vslider_class, (t_method)vslider_receive, gensym("receive"), A_DEFSYM, 0); - class_addmethod(vslider_class, (t_method)vslider_label, gensym("label"), A_DEFSYM, 0); - class_addmethod(vslider_class, (t_method)vslider_label_pos, gensym("label_pos"), A_GIMME, 0); - class_addmethod(vslider_class, (t_method)vslider_label_font, gensym("label_font"), A_GIMME, 0); - class_addmethod(vslider_class, (t_method)vslider_log, gensym("log"), 0); - class_addmethod(vslider_class, (t_method)vslider_lin, gensym("lin"), 0); - class_addmethod(vslider_class, (t_method)vslider_init, gensym("init"), A_FLOAT, 0); - class_addmethod(vslider_class, (t_method)vslider_steady, gensym("steady"), A_FLOAT, 0); - vslider_widgetbehavior.w_getrectfn = vslider_getrect; - vslider_widgetbehavior.w_displacefn = iemgui_displace; - vslider_widgetbehavior.w_selectfn = iemgui_select; - vslider_widgetbehavior.w_activatefn = NULL; - vslider_widgetbehavior.w_deletefn = iemgui_delete; - vslider_widgetbehavior.w_visfn = iemgui_vis; - vslider_widgetbehavior.w_clickfn = vslider_newclick; - class_setwidget(vslider_class, &vslider_widgetbehavior); - class_sethelpsymbol(vslider_class, gensym("vslider")); - class_setsavefn(vslider_class, vslider_save); - class_setpropertiesfn(vslider_class, vslider_properties); - } --- 0 ----

1 0

pd/src g_hdial.c,1.1.1.4.2.2.2.3,1.1.1.4.2.2.2.4 g_vdial.c,1.1.1.4.2.2.2.3,1.1.1.4.2.2.2.4
by matju＠users.sourceforge.net 07 Mar '04

07 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28924 Modified Files: Tag: impd_0_37 g_hdial.c g_vdial.c Log Message: merging hradio/vradio (and deleting 520 lines) Index: g_hdial.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hdial.c,v retrieving revision 1.1.1.4.2.2.2.3 retrieving revision 1.1.1.4.2.2.2.4 diff -C2 -d -r1.1.1.4.2.2.2.3 -r1.1.1.4.2.2.2.4 *** g_hdial.c 7 Mar 2004 19:38:13 -0000 1.1.1.4.2.2.2.3 --- g_hdial.c 7 Mar 2004 20:35:05 -0000 1.1.1.4.2.2.2.4 *************** *** 6,10 **** /* thanks to Miller Puckette, Guenther Geiger and Krzystof Czaja */ ! /* name change to hradio by MSP and changed to put out a "float" as in sliders, toggles, etc. */ --- 6,10 ---- /* thanks to Miller Puckette, Guenther Geiger and Krzystof Czaja */ ! /* name change to hradio by MSP (it's a radio button really) and changed to put out a "float" as in sliders, toggles, etc. */ *************** *** 21,28 **** t_widgetbehavior hradio_widgetbehavior; static t_class *hradio_class, *hradio_old_class; /* widget helper functions */ ! void hradio_draw_update(t_hradio *x, t_glist *glist) { if(glist_isvisible(glist)) { --- 21,36 ---- t_widgetbehavior hradio_widgetbehavior; static t_class *hradio_class, *hradio_old_class; + static t_class *vradio_class, *vradio_old_class; /* widget helper functions */ ! static int isvert(t_hradio *x) { ! t_class *c = x->x_gui.x_obj.te_g.g_pd; ! if (c==vradio_class || c==vradio_old_class) return 1; ! if (c==hradio_class || c==hradio_old_class) return 0; ! abort(); ! } ! ! static void hradio_draw_update(t_hradio *x, t_glist *glist) { if(glist_isvisible(glist)) { *************** *** 32,45 **** } ! void hradio_draw_new(t_hradio *x, t_glist *glist) { t_canvas *canvas=glist_getcanvas(glist); int n=x->x_number; ! int x1=text_xpix(&x->x_gui.x_obj, glist), x2=x1+x->x_gui.x_w*x->x_number; ! int y1=text_ypix(&x->x_gui.x_obj, glist), y2=y1+x->x_gui.x_h; ! sys_vgui("radio_draw .x%x.c %x %d %d %d %d %d %d 0 %d #%6.6x\n", canvas, x, x1, y1, x2, y2, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, ! x->x_number,x->x_gui.x_bcol); sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ --- 40,53 ---- } ! static void hradio_draw_new(t_hradio *x, t_glist *glist) { t_canvas *canvas=glist_getcanvas(glist); int n=x->x_number; ! int x1=text_xpix(&x->x_gui.x_obj, glist), x2=x1+x->x_gui.x_w*(isvert(x)?1:x->x_number); ! int y1=text_ypix(&x->x_gui.x_obj, glist), y2=y1+x->x_gui.x_h*(isvert(x)?x->x_number:1); ! sys_vgui("radio_draw .x%x.c %x %d %d %d %d %d %d %d %d #%6.6x\n", canvas, x, x1, y1, x2, y2, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, ! isvert(x),x->x_number,x->x_gui.x_bcol); sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ *************** *** 50,63 **** } ! void hradio_draw_move(t_hradio *x, t_glist *glist) { t_canvas *canvas=glist_getcanvas(glist); int n=x->x_number; ! int x1=text_xpix(&x->x_gui.x_obj, glist), x2=x1+x->x_gui.x_w*x->x_number; ! int y1=text_ypix(&x->x_gui.x_obj, glist), y2=y1+x->x_gui.x_h; ! sys_vgui("radio_draw .x%x.c %x %d %d %d %d %d %d 0 %d #%6.6x\n", canvas, x, x1, y1, x2, y2, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, ! x->x_number,x->x_gui.x_bcol); sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); sys_vgui(".x%x.c coords %xLABEL %d %d\n", --- 58,71 ---- } ! static void hradio_draw_move(t_hradio *x, t_glist *glist) { t_canvas *canvas=glist_getcanvas(glist); int n=x->x_number; ! int x1=text_xpix(&x->x_gui.x_obj, glist), x2=x1+x->x_gui.x_w*(isvert(x)?1:x->x_number); ! int y1=text_ypix(&x->x_gui.x_obj, glist), y2=y1+x->x_gui.x_h*(isvert(x)?x->x_number:1); ! sys_vgui("radio_draw .x%x.c %x %d %d %d %d %d %d %s %d #%6.6x\n", canvas, x, x1, y1, x2, y2, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, ! isvert(x), x->x_number,x->x_gui.x_bcol); sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); sys_vgui(".x%x.c coords %xLABEL %d %d\n", *************** *** 65,69 **** } ! void hradio_draw_erase(t_hradio* x, t_glist* glist) { t_canvas *canvas=glist_getcanvas(glist); --- 73,77 ---- } ! static void hradio_draw_erase(t_hradio* x, t_glist* glist) { t_canvas *canvas=glist_getcanvas(glist); *************** *** 72,81 **** } ! void hradio_draw_config(t_hradio* x, t_glist* glist) { hradio_draw_new(x,glist); } ! void hradio_draw_select(t_hradio* x, t_glist* glist) { t_canvas *canvas=glist_getcanvas(glist); --- 80,89 ---- } ! static void hradio_draw_config(t_hradio* x, t_glist* glist) { hradio_draw_new(x,glist); } ! static void hradio_draw_select(t_hradio* x, t_glist* glist) { t_canvas *canvas=glist_getcanvas(glist); *************** *** 83,87 **** } ! void hradio_draw(t_hradio *x, t_glist *glist, int mode) { if (mode == IEM_GUI_DRAW_MODE_UPDATE) hradio_draw_update(x, glist); --- 91,95 ---- } ! static void hradio_draw(t_hradio *x, t_glist *glist, int mode) { if (mode == IEM_GUI_DRAW_MODE_UPDATE) hradio_draw_update(x, glist); *************** *** 102,107 **** *xp1 = text_xpix(&x->x_gui.x_obj, glist); *yp1 = text_ypix(&x->x_gui.x_obj, glist); ! *xp2 = *xp1 + x->x_gui.x_w*x->x_number; ! *yp2 = *yp1 + x->x_gui.x_h; } --- 110,115 ---- *xp1 = text_xpix(&x->x_gui.x_obj, glist); *yp1 = text_ypix(&x->x_gui.x_obj, glist); ! *xp2 = *xp1 + x->x_gui.x_w*(isvert(x)?1:x->x_number); ! *yp2 = *yp1 + x->x_gui.x_h*(isvert(x)?x->x_number:1); } *************** *** 116,119 **** --- 124,130 ---- (t_int)text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist), (t_int)text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist), + isvert(x) ? + (pd_class(&x->x_gui.x_obj.ob_pd) == hradio_old_class ? + gensym("vdl") : gensym("vradio")) : (pd_class(&x->x_gui.x_obj.ob_pd) == hradio_old_class ? gensym("hdl") : gensym("hradio")), *************** *** 332,338 **** t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { int xx = (int)xpos - (int)text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist); hradio_fout(x, (float)(xx / x->x_gui.x_w)); ! } static int hradio_newclick(t_gobj *z, struct _glist *glist, --- 343,353 ---- t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { + if (isvert(x)) { + int yy = (int)ypos - (int)text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist); + hradio_fout(x, (float)(yy / x->x_gui.x_h)); + } else { int xx = (int)xpos - (int)text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist); hradio_fout(x, (float)(xx / x->x_gui.x_w)); ! }} static int hradio_newclick(t_gobj *z, struct _glist *glist, *************** *** 412,418 **** {x->x_change = 0;} ! static void *hradio_donew(t_symbol *s, int argc, t_atom *argv, int old) { - t_hradio *x = (t_hradio *)pd_new(old? hradio_old_class : hradio_class); int bflcol[]={-262144, -1, -1}; int a=IEM_GUI_DEFAULTSIZE, on=0, f=0; --- 427,432 ---- {x->x_change = 0;} ! static void *hradio_donew(t_symbol *s, int argc, t_atom *argv, t_hradio *x) { int bflcol[]={-262144, -1, -1}; int a=IEM_GUI_DEFAULTSIZE, on=0, f=0; *************** *** 474,485 **** static void *hradio_new(t_symbol *s, int argc, t_atom *argv) ! { ! return (hradio_donew(s, argc, argv, 0)); ! } ! static void *hdial_new(t_symbol *s, int argc, t_atom *argv) ! { ! return (hradio_donew(s, argc, argv, 1)); ! } static void hradio_ff(t_hradio *x) --- 488,498 ---- static void *hradio_new(t_symbol *s, int argc, t_atom *argv) ! {return hradio_donew(s, argc, argv, (t_hradio *)pd_new(hradio_class));} static void *hdial_new(t_symbol *s, int argc, t_atom *argv) ! {return hradio_donew(s, argc, argv, (t_hradio *)pd_new(hradio_old_class));} ! static void *vradio_new(t_symbol *s, int argc, t_atom *argv) ! {return hradio_donew(s, argc, argv, (t_hradio *)pd_new(vradio_class));} ! static void *vdial_new(t_symbol *s, int argc, t_atom *argv) ! {return hradio_donew(s, argc, argv, (t_hradio *)pd_new(vradio_old_class));} static void hradio_ff(t_hradio *x) *************** *** 490,533 **** } void g_hradio_setup(void) { hradio_class = class_new(gensym("hradio"), (t_newmethod)hradio_new, (t_method)hradio_ff, sizeof(t_hradio), 0, A_GIMME, 0); ! class_addbang(hradio_class, hradio_bang); ! class_addfloat(hradio_class, hradio_float); ! class_addmethod(hradio_class, (t_method)hradio_click, gensym("click"), ! A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(hradio_class, (t_method)hradio_dialog, gensym("dialog"), ! A_GIMME, 0); ! class_addmethod(hradio_class, (t_method)hradio_loadbang, ! gensym("loadbang"), 0); ! class_addmethod(hradio_class, (t_method)hradio_set, ! gensym("set"), A_FLOAT, 0); ! class_addmethod(hradio_class, (t_method)hradio_size, ! gensym("size"), A_GIMME, 0); ! class_addmethod(hradio_class, (t_method)hradio_delta, ! gensym("delta"), A_GIMME, 0); ! class_addmethod(hradio_class, (t_method)hradio_pos, ! gensym("pos"), A_GIMME, 0); ! class_addmethod(hradio_class, (t_method)hradio_color, ! gensym("color"), A_GIMME, 0); ! class_addmethod(hradio_class, (t_method)hradio_send, ! gensym("send"), A_DEFSYM, 0); ! class_addmethod(hradio_class, (t_method)hradio_receive, ! gensym("receive"), A_DEFSYM, 0); ! class_addmethod(hradio_class, (t_method)hradio_label, ! gensym("label"), A_DEFSYM, 0); ! class_addmethod(hradio_class, (t_method)hradio_label_pos, ! gensym("label_pos"), A_GIMME, 0); ! class_addmethod(hradio_class, (t_method)hradio_label_font, ! gensym("label_font"), A_GIMME, 0); ! class_addmethod(hradio_class, (t_method)hradio_init, ! gensym("init"), A_FLOAT, 0); ! class_addmethod(hradio_class, (t_method)hradio_number, ! gensym("number"), A_FLOAT, 0); ! class_addmethod(hradio_class, (t_method)hradio_single_change, ! gensym("single_change"), 0); ! class_addmethod(hradio_class, (t_method)hradio_double_change, ! gensym("double_change"), 0); hradio_widgetbehavior.w_getrectfn = hradio_getrect; hradio_widgetbehavior.w_displacefn = iemgui_displace; --- 503,561 ---- } + static void hradio_methods(t_class *c, t_class *o) { + class_addbang(c, hradio_bang); + class_addfloat(c, hradio_float); + class_addmethod(c, (t_method)hradio_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); + class_addmethod(c, (t_method)hradio_dialog, gensym("dialog"), A_GIMME, 0); + class_addmethod(c, (t_method)hradio_loadbang, gensym("loadbang"), 0); + class_addmethod(c, (t_method)hradio_set, gensym("set"), A_FLOAT, 0); + class_addmethod(c, (t_method)hradio_size, gensym("size"), A_GIMME, 0); + class_addmethod(c, (t_method)hradio_delta, gensym("delta"), A_GIMME, 0); + class_addmethod(c, (t_method)hradio_pos, gensym("pos"), A_GIMME, 0); + class_addmethod(c, (t_method)hradio_color, gensym("color"), A_GIMME, 0); + class_addmethod(c, (t_method)hradio_send, gensym("send"), A_DEFSYM, 0); + class_addmethod(c, (t_method)hradio_receive, gensym("receive"), A_DEFSYM, 0); + class_addmethod(c, (t_method)hradio_label, gensym("label"), A_DEFSYM, 0); + class_addmethod(c, (t_method)hradio_label_pos, gensym("label_pos"), A_GIMME, 0); + class_addmethod(c, (t_method)hradio_label_font, gensym("label_font"), A_GIMME, 0); + class_addmethod(c, (t_method)hradio_init, gensym("init"), A_FLOAT, 0); + class_addmethod(c, (t_method)hradio_number, gensym("number"), A_FLOAT, 0); + class_addmethod(c, (t_method)hradio_single_change, gensym("single_change"), 0); + class_addmethod(c, (t_method)hradio_double_change, gensym("double_change"), 0); + class_addbang(o, hradio_bang); + class_addfloat(o, hradio_float); + class_addmethod(o, (t_method)hradio_click, gensym("click"), + A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); + class_addmethod(o, (t_method)hradio_dialog, gensym("dialog"), A_GIMME, 0); + class_addmethod(o, (t_method)hradio_loadbang, gensym("loadbang"), 0); + class_addmethod(o, (t_method)hradio_set, gensym("set"), A_FLOAT, 0); + class_addmethod(o, (t_method)hradio_size, gensym("size"), A_GIMME, 0); + class_addmethod(o, (t_method)hradio_delta, gensym("delta"), A_GIMME, 0); + class_addmethod(o, (t_method)hradio_pos, gensym("pos"), A_GIMME, 0); + class_addmethod(o, (t_method)hradio_color, gensym("color"), A_GIMME, 0); + class_addmethod(o, (t_method)hradio_send, gensym("send"), A_DEFSYM, 0); + class_addmethod(o, (t_method)hradio_receive, gensym("receive"), A_DEFSYM, 0); + class_addmethod(o, (t_method)hradio_label, gensym("label"), A_DEFSYM, 0); + class_addmethod(o, (t_method)hradio_label_pos, gensym("label_pos"), A_GIMME, 0); + class_addmethod(o, (t_method)hradio_label_font, gensym("label_font"), A_GIMME, 0); + class_addmethod(o, (t_method)hradio_init, gensym("init"), A_FLOAT, 0); + class_addmethod(o, (t_method)hradio_number, gensym("number"), A_FLOAT, 0); + class_addmethod(o, (t_method)hradio_single_change, gensym("single_change"), 0); + class_addmethod(o, (t_method)hradio_double_change, gensym("double_change"), 0); + } + void g_hradio_setup(void) { hradio_class = class_new(gensym("hradio"), (t_newmethod)hradio_new, (t_method)hradio_ff, sizeof(t_hradio), 0, A_GIMME, 0); ! vradio_class = class_new(gensym("vradio"), (t_newmethod)vradio_new, ! (t_method)hradio_ff, sizeof(t_hradio), 0, A_GIMME, 0); ! hradio_old_class = class_new(gensym("hdl"), (t_newmethod)hdial_new, ! (t_method)hradio_ff, sizeof(t_hradio), 0, A_GIMME, 0); ! vradio_old_class = class_new(gensym("vdl"), (t_newmethod)vdial_new, ! (t_method)hradio_ff, sizeof(t_hradio), 0, A_GIMME, 0); ! ! hradio_methods(hradio_class,hradio_old_class); ! hradio_methods(vradio_class,vradio_old_class); hradio_widgetbehavior.w_getrectfn = hradio_getrect; hradio_widgetbehavior.w_displacefn = iemgui_displace; *************** *** 537,573 **** hradio_widgetbehavior.w_visfn = iemgui_vis; hradio_widgetbehavior.w_clickfn = hradio_newclick; class_setwidget(hradio_class, &hradio_widgetbehavior); class_sethelpsymbol(hradio_class, gensym("hradio")); class_setsavefn(hradio_class, hradio_save); class_setpropertiesfn(hradio_class, hradio_properties); - /*obsolete version (0.34-0.35) */ - hradio_old_class = class_new(gensym("hdl"), (t_newmethod)hdial_new, - (t_method)hradio_ff, sizeof(t_hradio), 0, A_GIMME, 0); class_addcreator((t_newmethod)hradio_new, gensym("rdb"), A_GIMME, 0); class_addcreator((t_newmethod)hradio_new, gensym("radiobut"), A_GIMME, 0); ! class_addcreator((t_newmethod)hradio_new, gensym("radiobutton"), ! A_GIMME, 0); ! class_addbang(hradio_old_class, hradio_bang); ! class_addfloat(hradio_old_class, hradio_float); ! class_addmethod(hradio_old_class, (t_method)hradio_click, gensym("click"), ! A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_dialog, gensym("dialog"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_loadbang, gensym("loadbang"), 0); ! class_addmethod(hradio_old_class, (t_method)hradio_set, gensym("set"), A_FLOAT, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_size, gensym("size"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_delta, gensym("delta"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_pos, gensym("pos"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_color, gensym("color"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_send, gensym("send"), A_DEFSYM, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_receive, gensym("receive"), A_DEFSYM, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_label, gensym("label"), A_DEFSYM, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_label_pos, gensym("label_pos"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_label_font, gensym("label_font"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_init, gensym("init"), A_FLOAT, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_number, gensym("number"), A_FLOAT, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_single_change, gensym("single_change"), 0); ! class_addmethod(hradio_old_class, (t_method)hradio_double_change, gensym("double_change"), 0); class_setwidget(hradio_old_class, &hradio_widgetbehavior); class_sethelpsymbol(hradio_old_class, gensym("hradio")); } --- 565,586 ---- hradio_widgetbehavior.w_visfn = iemgui_vis; hradio_widgetbehavior.w_clickfn = hradio_newclick; + class_setwidget(hradio_class, &hradio_widgetbehavior); + class_setwidget(vradio_class, &hradio_widgetbehavior); class_sethelpsymbol(hradio_class, gensym("hradio")); + class_sethelpsymbol(vradio_class, gensym("vradio")); class_setsavefn(hradio_class, hradio_save); + class_setsavefn(vradio_class, hradio_save); class_setpropertiesfn(hradio_class, hradio_properties); + class_setpropertiesfn(vradio_class, hradio_properties); class_addcreator((t_newmethod)hradio_new, gensym("rdb"), A_GIMME, 0); class_addcreator((t_newmethod)hradio_new, gensym("radiobut"), A_GIMME, 0); ! class_addcreator((t_newmethod)hradio_new, gensym("radiobutton"), A_GIMME, 0); class_setwidget(hradio_old_class, &hradio_widgetbehavior); + class_setwidget(vradio_old_class, &hradio_widgetbehavior); class_sethelpsymbol(hradio_old_class, gensym("hradio")); + class_sethelpsymbol(vradio_old_class, gensym("vradio")); } + + void g_vradio_setup(void) {} Index: g_vdial.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vdial.c,v retrieving revision 1.1.1.4.2.2.2.3 retrieving revision 1.1.1.4.2.2.2.4 diff -C2 -d -r1.1.1.4.2.2.2.3 -r1.1.1.4.2.2.2.4 *** g_vdial.c 7 Mar 2004 19:38:13 -0000 1.1.1.4.2.2.2.3 --- g_vdial.c 7 Mar 2004 20:35:05 -0000 1.1.1.4.2.2.2.4 *************** *** 1,569 **** - /* Copyright (c) 1997-1999 Miller Puckette. - * For information on usage and redistribution, and for a DISCLAIMER OF ALL - * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ - - /* vdial.c written by Thomas Musil (c) IEM KUG Graz Austria 2000-2001 */ - /* thanks to Miller Puckette, Guenther Geiger and Krzystof Czaja */ - - /* name change to vradio by MSP (it's a radio button really) and changed to - put out a "float" as in sliders, toggles, etc. */ - - #include <stdlib.h> - #include <string.h> - #include <stdio.h> - #include <ctype.h> - #include "m_pd.h" - #include "g_canvas.h" - #include "t_tk.h" - #include "g_all_guis.h" - #include <math.h> - - t_widgetbehavior vradio_widgetbehavior; - static t_class *vradio_class, *vradio_old_class; - - /* widget helper functions */ - - void vradio_draw_update(t_vradio *x, t_glist *glist) - { - if(glist_isvisible(glist)) { - t_canvas *canvas=glist_getcanvas(glist); - sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); - } - } - - void vradio_draw_new(t_vradio *x, t_glist *glist) - { - t_canvas *canvas=glist_getcanvas(glist); - int n=x->x_number; - int x1=text_xpix(&x->x_gui.x_obj, glist), x2=x1+x->x_gui.x_w; - int y1=text_ypix(&x->x_gui.x_obj, glist), y2=y1+x->x_gui.x_h*x->x_number; - sys_vgui("radio_draw .x%x.c %x %d %d %d %d %d %d 1 %d #%6.6x\n", - canvas, x, x1, y1, x2, y2, - !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, - x->x_number,x->x_gui.x_bcol); - sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); - sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ - -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", - canvas, x1+x->x_gui.x_ldx, y1+x->x_gui.x_ldy, - strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", - x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); - } - - void vradio_draw_move(t_vradio *x, t_glist *glist) - { - t_canvas *canvas=glist_getcanvas(glist); - int n=x->x_number; - int x1=text_xpix(&x->x_gui.x_obj, glist), x2=x1+x->x_gui.x_w; - int y1=text_ypix(&x->x_gui.x_obj, glist), y2=y1+x->x_gui.x_h*x->x_number; - sys_vgui("radio_draw .x%x.c %x %d %d %d %d %d %d 1 %d #%6.6x\n", - canvas, x, x1, y1, x2, y2, - !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, - x->x_number,x->x_gui.x_bcol); - sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); - sys_vgui(".x%x.c coords %xLABEL %d %d\n", - canvas, x, x1+x->x_gui.x_ldx, y1+x->x_gui.x_ldy); - } - - void vradio_draw_erase(t_vradio* x, t_glist* glist) - { - t_canvas *canvas=glist_getcanvas(glist); - sys_vgui("radio_erase .x%x.c %x\n", canvas, x); - sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); - } - - void vradio_draw_config(t_vradio* x, t_glist* glist) - { - vradio_draw_new(x,glist); - } - - void vradio_draw_select(t_vradio* x, t_glist* glist) - { - t_canvas *canvas=glist_getcanvas(glist); - sys_vgui("bluebox_select .x%x.c %xBASE %d\n", canvas, x, x->x_gui.x_fsf.x_selected); - } - - void vradio_draw(t_vradio *x, t_glist *glist, int mode) - { - if (mode == IEM_GUI_DRAW_MODE_UPDATE) vradio_draw_update(x, glist); - else if(mode == IEM_GUI_DRAW_MODE_MOVE) vradio_draw_move(x, glist); - else if(mode == IEM_GUI_DRAW_MODE_NEW) vradio_draw_new(x, glist); - else if(mode == IEM_GUI_DRAW_MODE_SELECT) vradio_draw_select(x, glist); - else if(mode == IEM_GUI_DRAW_MODE_ERASE) vradio_draw_erase(x, glist); - else if(mode == IEM_GUI_DRAW_MODE_CONFIG) vradio_draw_config(x, glist); - else if(mode >= IEM_GUI_DRAW_MODE_IO) vradio_draw_move(x, glist); - } - - /* ------------------------ vdl widgetbehaviour----------------------------- */ - - static void vradio_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2) - { - t_vradio *x = (t_vradio *)z; - - *xp1 = text_xpix(&x->x_gui.x_obj, glist); - *yp1 = text_ypix(&x->x_gui.x_obj, glist); - *xp2 = *xp1 + x->x_gui.x_w; - *yp2 = *yp1 + x->x_gui.x_h*x->x_number; - } - - static void vradio_save(t_gobj *z, t_binbuf *b) - { - t_vradio *x = (t_vradio *)z; - int bflcol[3]; - t_symbol *srl[3]; - - iemgui_save(&x->x_gui, srl, bflcol); - binbuf_addv(b, "ssiisiiiisssiiiiiiii", gensym("#X"),gensym("obj"), - (t_int)text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist), - (t_int)text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist), - (pd_class(&x->x_gui.x_obj.ob_pd) == vradio_old_class ? - gensym("vdl") : gensym("vradio")), - x->x_gui.x_w, - x->x_change, iem_symargstoint(&x->x_gui.x_isa), x->x_number, - srl[0], srl[1], srl[2], - x->x_gui.x_ldx, x->x_gui.x_ldy, - iem_fstyletoint(&x->x_gui.x_fsf), x->x_gui.x_fontsize, - bflcol[0], bflcol[1], bflcol[2], x->x_on); - binbuf_addv(b, ";"); - } - - static void vradio_properties(t_gobj *z, t_glist *owner) - { - t_vradio *x = (t_vradio *)z; - char buf[800]; - t_symbol *srl[3]; - - iemgui_properties(&x->x_gui, srl); - sprintf(buf, "pdtk_iemgui_dialog %%s vradio \ - ----------dimensions(pix):----------- %d %d size: 0 0 empty \ - empty 0.0 empty 0.0 empty %d \ - %d new-only new&old %d %d number: %d \ - %s %s \ - %s %d %d \ - %d %d \ - %d %d %d\n", - x->x_gui.x_w, IEM_GUI_MINSIZE, - 0,/*no_schedule*/ - x->x_change, x->x_gui.x_isa.x_loadinit, -1, x->x_number, - srl[0]->s_name, srl[1]->s_name, - srl[2]->s_name, x->x_gui.x_ldx, x->x_gui.x_ldy, - x->x_gui.x_fsf.x_font_style, x->x_gui.x_fontsize, - 0xffffff & x->x_gui.x_bcol, 0xffffff & x->x_gui.x_fcol, 0xffffff & x->x_gui.x_lcol); - gfxstub_new(&x->x_gui.x_obj.ob_pd, x, buf); - } - - static void vradio_dialog(t_vradio *x, t_symbol *s, int argc, t_atom *argv) - { - t_symbol *srl[3]; - int a = (int)atom_getintarg(0, argc, argv); - int chg = (int)atom_getintarg(4, argc, argv); - int num = (int)atom_getintarg(6, argc, argv); - int sr_flags; - - if(chg != 0) chg = 1; - x->x_change = chg; - sr_flags = iemgui_dialog(&x->x_gui, srl, argc, argv); - x->x_gui.x_w = iemgui_clip_size(a); - x->x_gui.x_h = x->x_gui.x_w; - if(x->x_number != num) - { - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_ERASE); - x->x_number = num; - if(x->x_on >= x->x_number) - { - x->x_on = x->x_number - 1; - x->x_on_old = x->x_on; - } - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_NEW); - } - else - { - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_CONFIG); - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_IO + sr_flags); - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_MOVE); - canvas_fixlinesfor(glist_getcanvas(x->x_gui.x_glist), (t_text*)x); - } - } - - static void vradio_set(t_vradio *x, t_floatarg f) - { - int i=(int)f; - int old=x->x_on_old; - - if(i < 0) - i = 0; - if(i >= x->x_number) - i = x->x_number-1; - if(x->x_on != x->x_on_old) - { - old = x->x_on_old; - x->x_on_old = x->x_on; - x->x_on = i; - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); - x->x_on_old = old; - } - else - { - x->x_on = i; - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); - } - } - - static void vradio_bang(t_vradio *x) - { - /* compatibility with earlier "vdial" behavior */ - if (pd_class(&x->x_gui.x_obj.ob_pd) == vradio_old_class) - { - if((x->x_change)&&(x->x_on != x->x_on_old)) - { - SETFLOAT(x->x_at, (float)x->x_on_old); - SETFLOAT(x->x_at+1, 0.0); - outlet_list(x->x_gui.x_obj.ob_outlet, &s_list, 2, x->x_at); - if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing) - pd_list(x->x_gui.x_snd->s_thing, &s_list, 2, x->x_at); - } - x->x_on_old = x->x_on; - SETFLOAT(x->x_at, (float)x->x_on); - SETFLOAT(x->x_at+1, 1.0); - outlet_list(x->x_gui.x_obj.ob_outlet, &s_list, 2, x->x_at); - if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing) - pd_list(x->x_gui.x_snd->s_thing, &s_list, 2, x->x_at); - } - else - { - outlet_float(x->x_gui.x_obj.ob_outlet, x->x_on); - if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing) - pd_float(x->x_gui.x_snd->s_thing, x->x_on); - } - } - - static void vradio_fout(t_vradio *x, t_floatarg f) - { - int i=(int)f; - - if(i < 0) - i = 0; - if(i >= x->x_number) - i = x->x_number-1; - - if (pd_class(&x->x_gui.x_obj.ob_pd) == vradio_old_class) - { - /* compatibility with earlier "vdial" behavior */ - if((x->x_change)&&(i != x->x_on_old)) - { - SETFLOAT(x->x_at, (float)x->x_on_old); - SETFLOAT(x->x_at+1, 0.0); - outlet_list(x->x_gui.x_obj.ob_outlet, &s_list, 2, x->x_at); - if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing) - pd_list(x->x_gui.x_snd->s_thing, &s_list, 2, x->x_at); - } - if(x->x_on != x->x_on_old) - x->x_on_old = x->x_on; - x->x_on = i; - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); - x->x_on_old = x->x_on; - SETFLOAT(x->x_at, (float)x->x_on); - SETFLOAT(x->x_at+1, 1.0); - outlet_list(x->x_gui.x_obj.ob_outlet, &s_list, 2, x->x_at); - if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing) - pd_list(x->x_gui.x_snd->s_thing, &s_list, 2, x->x_at); - } - else - { - outlet_float(x->x_gui.x_obj.ob_outlet, x->x_on = i); - if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing) - pd_float(x->x_gui.x_snd->s_thing, x->x_on); - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); - x->x_on_old = x->x_on; - } - } - - static void vradio_float(t_vradio *x, t_floatarg f) - { - int i=(int)f; - - if(i < 0) - i = 0; - if(i >= x->x_number) - i = x->x_number-1; - - if (pd_class(&x->x_gui.x_obj.ob_pd) == vradio_old_class) - { - /* compatibility with earlier "vdial" behavior */ - if((x->x_change)&&(i != x->x_on_old)) - { - if(x->x_gui.x_fsf.x_put_in2out) - { - SETFLOAT(x->x_at, (float)x->x_on_old); - SETFLOAT(x->x_at+1, 0.0); - outlet_list(x->x_gui.x_obj.ob_outlet, &s_list, 2, x->x_at); - if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing) - pd_list(x->x_gui.x_snd->s_thing, &s_list, 2, x->x_at); - } - } - if(x->x_on != x->x_on_old) - x->x_on_old = x->x_on; - x->x_on = i; - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); - x->x_on_old = x->x_on; - if(x->x_gui.x_fsf.x_put_in2out) - { - SETFLOAT(x->x_at, (float)x->x_on); - SETFLOAT(x->x_at+1, 1.0); - outlet_list(x->x_gui.x_obj.ob_outlet, &s_list, 2, x->x_at); - if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing) - pd_list(x->x_gui.x_snd->s_thing, &s_list, 2, x->x_at); - } - } - else - { - x->x_on = i; - if (x->x_gui.x_fsf.x_put_in2out) - { - outlet_float(x->x_gui.x_obj.ob_outlet, x->x_on); - if(x->x_gui.x_fsf.x_snd_able && x->x_gui.x_snd->s_thing) - pd_float(x->x_gui.x_snd->s_thing, x->x_on); - } - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE); - x->x_on_old = x->x_on; - } - } - static void vradio_click(t_vradio *x, t_floatarg xpos, t_floatarg ypos, - t_floatarg shift, t_floatarg ctrl, t_floatarg alt) - { - int yy = (int)ypos - (int)text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist); - vradio_fout(x, (float)(yy / x->x_gui.x_h)); - } - static int vradio_newclick(t_gobj *z, struct _glist *glist, - int xpix, int ypix, int shift, int alt, int dbl, int doit) - { - if(doit) - vradio_click((t_vradio *)z, (t_floatarg)xpix, (t_floatarg)ypix, - (t_floatarg)shift, 0, (t_floatarg)alt); - return (1); - } - static void vradio_loadbang(t_vradio *x) - { - if(!sys_noloadbang && x->x_gui.x_isa.x_loadinit) - vradio_bang(x); - } - static void vradio_number(t_vradio *x, t_floatarg num) - { - int n=(int)num; - if(n < 1) - n = 1; - if(n > IEM_RADIO_MAX) - n = IEM_RADIO_MAX; - if(n != x->x_number) - { - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_ERASE); - x->x_number = n; - if(x->x_on >= x->x_number) - x->x_on = x->x_number - 1; - x->x_on_old = x->x_on; - (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_NEW); - } - } - static void vradio_size(t_vradio *x, t_symbol *s, int ac, t_atom *av) - { - x->x_gui.x_w = iemgui_clip_size((int)atom_getintarg(0, ac, av)); - x->x_gui.x_h = x->x_gui.x_w; - iemgui_size((void *)x, &x->x_gui); - } - static void vradio_delta(t_vradio *x, t_symbol *s, int ac, t_atom *av) - {iemgui_delta((void *)x, &x->x_gui, s, ac, av);} - static void vradio_pos(t_vradio *x, t_symbol *s, int ac, t_atom *av) - {iemgui_pos((void *)x, &x->x_gui, s, ac, av);} - static void vradio_color(t_vradio *x, t_symbol *s, int ac, t_atom *av) - {iemgui_color((void *)x, &x->x_gui, s, ac, av);} - static void vradio_send(t_vradio *x, t_symbol *s) - {iemgui_send(x, &x->x_gui, s);} - static void vradio_receive(t_vradio *x, t_symbol *s) - {iemgui_receive(x, &x->x_gui, s);} - static void vradio_label(t_vradio *x, t_symbol *s) - {iemgui_label((void *)x, &x->x_gui, s);} - static void vradio_label_pos(t_vradio *x, t_symbol *s, int ac, t_atom *av) - {iemgui_label_pos((void *)x, &x->x_gui, s, ac, av);} - static void vradio_label_font(t_vradio *x, t_symbol *s, int ac, t_atom *av) - {iemgui_label_font((void *)x, &x->x_gui, s, ac, av);} - static void vradio_init(t_vradio *x, t_floatarg f) - { - x->x_gui.x_isa.x_loadinit = (f==0.0)?0:1; - } - static void vradio_double_change(t_vradio *x) - {x->x_change = 1;} - static void vradio_single_change(t_vradio *x) - {x->x_change = 0;} - static void *vradio_donew(t_symbol *s, int argc, t_atom *argv, int old) - { - t_vradio *x = (t_vradio *)pd_new(old? vradio_old_class : vradio_class); - int bflcol[]={-262144, -1, -1}; - int a=IEM_GUI_DEFAULTSIZE, on=0, f=0; - int ldx=0, ldy=-6, chg=1, num=8; - int fs=8; - int ftbreak=IEM_BNG_DEFAULTBREAKFLASHTIME, fthold=IEM_BNG_DEFAULTHOLDFLASHTIME; - char str[144]; - iem_inttosymargs(&x->x_gui.x_isa, 0); - iem_inttofstyle(&x->x_gui.x_fsf, 0); - if(pd_scanargs(argc,argv,"iiFi???iiFiiiii", - &a,&chg,&num,&ldx,&ldy,&fs,&bflcol[0],&bflcol[1],&bflcol[2],&on)) - { - iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(2, argc, argv)); - iemgui_new_getnames(&x->x_gui, 4, argv); - iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(9, argc, argv)); - } - else iemgui_new_getnames(&x->x_gui, 4, 0); - x->x_gui.x_draw = (t_iemfunptr)vradio_draw; - x->x_gui.x_fsf.x_snd_able = 1; - x->x_gui.x_fsf.x_rcv_able = 1; - x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); - if (!strcmp(x->x_gui.x_snd->s_name, "empty")) x->x_gui.x_fsf.x_snd_able = 0; - if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) x->x_gui.x_fsf.x_rcv_able = 0; - if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); - else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); - else { x->x_gui.x_fsf.x_font_style = 0; - strcpy(x->x_gui.x_font, "courier"); } - if(num < 1) - num = 1; - if(num > IEM_RADIO_MAX) - num = IEM_RADIO_MAX; - x->x_number = num; - if(on < 0) - on = 0; - if(on >= x->x_number) - on = x->x_number - 1; - if(x->x_gui.x_isa.x_loadinit) - x->x_on = on; - else - x->x_on = 0; - x->x_on_old = x->x_on; - x->x_change = (chg==0)?0:1; - if (x->x_gui.x_fsf.x_rcv_able) - pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); - x->x_gui.x_ldx = ldx; - x->x_gui.x_ldy = ldy; - if(fs < 4) - fs = 4; - x->x_gui.x_fontsize = fs; - x->x_gui.x_w = iemgui_clip_size(a); - x->x_gui.x_h = x->x_gui.x_w; - iemgui_verify_snd_ne_rcv(&x->x_gui); - iemgui_all_colfromload(&x->x_gui, bflcol); - outlet_new(&x->x_gui.x_obj, &s_list); - return (x); - } - static void *vradio_new(t_symbol *s, int argc, t_atom *argv) - { - return (vradio_donew(s, argc, argv, 0)); - } - static void *vdial_new(t_symbol *s, int argc, t_atom *argv) - { - return (vradio_donew(s, argc, argv, 1)); - } - static void vradio_ff(t_vradio *x) - { - if(x->x_gui.x_fsf.x_rcv_able) - pd_unbind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); - gfxstub_deleteforkey(x); - } - void g_vradio_setup(void) - { - vradio_class = class_new(gensym("vradio"), (t_newmethod)vradio_new, - (t_method)vradio_ff, sizeof(t_vradio), 0, A_GIMME, 0); - class_addbang(vradio_class, vradio_bang); - class_addfloat(vradio_class, vradio_float); - class_addmethod(vradio_class, (t_method)vradio_click, gensym("click"), - A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); - class_addmethod(vradio_class, (t_method)vradio_dialog, gensym("dialog"), - A_GIMME, 0); - class_addmethod(vradio_class, (t_method)vradio_loadbang, - gensym("loadbang"), 0); - class_addmethod(vradio_class, (t_method)vradio_set, - gensym("set"), A_FLOAT, 0); - class_addmethod(vradio_class, (t_method)vradio_size, - gensym("size"), A_GIMME, 0); - class_addmethod(vradio_class, (t_method)vradio_delta, - gensym("delta"), A_GIMME, 0); - class_addmethod(vradio_class, (t_method)vradio_pos, - gensym("pos"), A_GIMME, 0); - class_addmethod(vradio_class, (t_method)vradio_color, - gensym("color"), A_GIMME, 0); - class_addmethod(vradio_class, (t_method)vradio_send, - gensym("send"), A_DEFSYM, 0); - class_addmethod(vradio_class, (t_method)vradio_receive, - gensym("receive"), A_DEFSYM, 0); - class_addmethod(vradio_class, (t_method)vradio_label, - gensym("label"), A_DEFSYM, 0); - class_addmethod(vradio_class, (t_method)vradio_label_pos, - gensym("label_pos"), A_GIMME, 0); - class_addmethod(vradio_class, (t_method)vradio_label_font, - gensym("label_font"), A_GIMME, 0); - class_addmethod(vradio_class, (t_method)vradio_init, - gensym("init"), A_FLOAT, 0); - class_addmethod(vradio_class, (t_method)vradio_number, - gensym("number"), A_FLOAT, 0); - class_addmethod(vradio_class, (t_method)vradio_single_change, - gensym("single_change"), 0); - class_addmethod(vradio_class, (t_method)vradio_double_change, - gensym("double_change"), 0); - vradio_widgetbehavior.w_getrectfn = vradio_getrect; - vradio_widgetbehavior.w_displacefn = iemgui_displace; - vradio_widgetbehavior.w_selectfn = iemgui_select; - vradio_widgetbehavior.w_activatefn = NULL; - vradio_widgetbehavior.w_deletefn = iemgui_delete; - vradio_widgetbehavior.w_visfn = iemgui_vis; - vradio_widgetbehavior.w_clickfn = vradio_newclick; - class_setwidget(vradio_class, &vradio_widgetbehavior); - class_sethelpsymbol(vradio_class, gensym("vradio")); - class_setsavefn(vradio_class, vradio_save); - class_setpropertiesfn(vradio_class, vradio_properties); - /* obsolete version (0.34-0.35) */ - vradio_old_class = class_new(gensym("vdl"), (t_newmethod)vdial_new, - (t_method)vradio_ff, sizeof(t_vradio), 0, A_GIMME, 0); - class_addbang(vradio_old_class, vradio_bang); - class_addfloat(vradio_old_class, vradio_float); - class_addmethod(vradio_old_class, (t_method)vradio_click, gensym("click"), - A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); - class_addmethod(vradio_old_class, (t_method)vradio_dialog, gensym("dialog"), A_GIMME, 0); - class_addmethod(vradio_old_class, (t_method)vradio_loadbang, gensym("loadbang"), 0); - class_addmethod(vradio_old_class, (t_method)vradio_set, gensym("set"), A_FLOAT, 0); - class_addmethod(vradio_old_class, (t_method)vradio_size, gensym("size"), A_GIMME, 0); - class_addmethod(vradio_old_class, (t_method)vradio_delta, gensym("delta"), A_GIMME, 0); - class_addmethod(vradio_old_class, (t_method)vradio_pos, gensym("pos"), A_GIMME, 0); - class_addmethod(vradio_old_class, (t_method)vradio_color, gensym("color"), A_GIMME, 0); - class_addmethod(vradio_old_class, (t_method)vradio_send, gensym("send"), A_DEFSYM, 0); - class_addmethod(vradio_old_class, (t_method)vradio_receive, gensym("receive"), A_DEFSYM, 0); - class_addmethod(vradio_old_class, (t_method)vradio_label, gensym("label"), A_DEFSYM, 0); - class_addmethod(vradio_old_class, (t_method)vradio_label_pos, gensym("label_pos"), A_GIMME, 0); - class_addmethod(vradio_old_class, (t_method)vradio_label_font, gensym("label_font"), A_GIMME, 0); - class_addmethod(vradio_old_class, (t_method)vradio_init, gensym("init"), A_FLOAT, 0); - class_addmethod(vradio_old_class, (t_method)vradio_number, gensym("number"), A_FLOAT, 0); - class_addmethod(vradio_old_class, (t_method)vradio_single_change, gensym("single_change"), 0); - class_addmethod(vradio_old_class, (t_method)vradio_double_change, gensym("double_change"), 0); - class_setwidget(vradio_old_class, &vradio_widgetbehavior); - class_sethelpsymbol(vradio_old_class, gensym("vradio")); - } --- 1,25 ----

1 0

pd/src g_all_guis.c,1.1.1.4.2.4.2.2,1.1.1.4.2.4.2.3 g_all_guis.h,1.1.1.4.2.2.2.1,1.1.1.4.2.2.2.2 g_bang.c,1.1.1.3.2.2.2.2,1.1.1.3.2.2.2.3 g_hdial.c,1.1.1.4.2.2.2.2,1.1.1.4.2.2.2.3 g_hslider.c,1.1.1.3.2.2.2.2,1.1.1.3.2.2.2.3 g_mycanvas.c,1.1.1.3.2.2,1.1.1.3.2.2.2.1 g_numbox.c,1.1.1.4.2.2.2.1,1.1.1.4.2.2.2.2 g_toggle.c,1.1.1.3.2.2.2.1,1.1.1.3.2.2.2.2 g_vdial.c,1.1.1.4.2.2.2.2,1.1.1.4.2.2.2.3 g_vslider.c,1.1.1.3.2.2.2.2,1.1.1.3.2.2.2.3 g_vumeter.c,1.1.1.3.2.2.2.1,1.1.1.3.2.2.2.2
by matju＠users.sourceforge.net 07 Mar '04

07 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17255 Modified Files: Tag: impd_0_37 g_all_guis.c g_all_guis.h 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 Log Message: adding pd_scanargs() to simplify construction of gui objects that have 11 or 14 or 17 (!) args to typecheck & convert Index: g_all_guis.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v retrieving revision 1.1.1.4.2.4.2.2 retrieving revision 1.1.1.4.2.4.2.3 diff -C2 -d -r1.1.1.4.2.4.2.2 -r1.1.1.4.2.4.2.3 *** g_all_guis.c 6 Mar 2004 22:19:41 -0000 1.1.1.4.2.4.2.2 --- g_all_guis.c 7 Mar 2004 19:38:13 -0000 1.1.1.4.2.4.2.3 *************** *** 643,644 **** --- 643,695 ---- return ((fstylep->x_font_style << 0) & 63); } + + int pd_scanargs(int argc, t_atom *argv, char *fmt, ...) { + int i=0; + va_list val; + va_start(val,fmt); + int optional=0; + for (i=0; i<argc; i++) { + switch (fmt[i]) { + case 0: goto err; /* too many args */ + case '*': goto break1; /* rest is any type */ + case 'F': case 'f': case 'i': if (!IS_A_FLOAT(argv,i)) goto err; + break; + case 'S': case 's': if (!IS_A_SYMBOL(argv,i)) goto err; + break; + case '?': break; /* skip */ + case ';': optional=1; break; + default: post("WARNING: bug using pd_scanargs()"); goto err; /* WHAT? */ + } + } + if (fmt[i]!=0 && !optional) return 0; /* not enough args */ + break1: + for (i=0; i<argc; i++) { + //fprintf(stderr,"i=%d fmt[i]=%c\n",i,fmt[i]); + switch (fmt[i]) { + case '*': case ';': goto break2; + case '?': case 'F': case 'S': break; /* skip */ + case 'f': { + float *p = va_arg(val,float*); + //fprintf(stderr," getting float*=0x%08x\n",p); + *p = atom_getfloatarg(i,argc,argv); + } break; + case 'i': { + int *p = va_arg(val, int*); + //fprintf(stderr," getting int*=0x%08x\n",p); + *p = atom_getintarg(i,argc,argv); + } break; + case 's': { + t_symbol **p = va_arg(val,t_symbol**); + //fprintf(stderr," getting t_symbol**=0x%08x\n",p); + *p = atom_getsymbolarg(i,argc,argv); + } break; + default: post("WARNING: bug using pd_scanargs()"); goto err; /* WHAT? */ + } + } + break2: + va_end(val); + return 1; + err: + post("WARNING: pd_scanargs failed; fmt=%s, i=%d",fmt,i); + return 0; + } Index: g_all_guis.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v retrieving revision 1.1.1.4.2.2.2.1 retrieving revision 1.1.1.4.2.2.2.2 diff -C2 -d -r1.1.1.4.2.2.2.1 -r1.1.1.4.2.2.2.2 *** g_all_guis.h 5 Mar 2004 19:27:51 -0000 1.1.1.4.2.2.2.1 --- g_all_guis.h 7 Mar 2004 19:38:13 -0000 1.1.1.4.2.2.2.2 *************** *** 330,331 **** --- 330,333 ---- EXTERN void iem_inttofstyle(t_iem_fstyle_flags *fstylep, int n); EXTERN int iem_fstyletoint(t_iem_fstyle_flags *fstylep); + + EXTERN int pd_scanargs(int argc, t_atom *argv, char *format, ...); Index: g_bang.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v retrieving revision 1.1.1.3.2.2.2.2 retrieving revision 1.1.1.3.2.2.2.3 diff -C2 -d -r1.1.1.3.2.2.2.2 -r1.1.1.3.2.2.2.3 *** g_bang.c 6 Mar 2004 22:19:41 -0000 1.1.1.3.2.2.2.2 --- g_bang.c 7 Mar 2004 19:38:13 -0000 1.1.1.3.2.2.2.3 *************** *** 121,125 **** void bng_draw(t_bng *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) bng_draw_update(x, glist); else if(mode == IEM_GUI_DRAW_MODE_MOVE) bng_draw_move(x, glist); else if(mode == IEM_GUI_DRAW_MODE_NEW) bng_draw_new(x, glist); --- 121,125 ---- void bng_draw(t_bng *x, t_glist *glist, int mode) { ! if (mode == IEM_GUI_DRAW_MODE_UPDATE) bng_draw_update(x, glist); else if(mode == IEM_GUI_DRAW_MODE_MOVE) bng_draw_move(x, glist); else if(mode == IEM_GUI_DRAW_MODE_NEW) bng_draw_new(x, glist); *************** *** 165,178 **** if(ftbreak > fthold) { ! int h; ! ! h = ftbreak; ftbreak = fthold; fthold = h; } ! if(ftbreak < IEM_BNG_MINBREAKFLASHTIME) ! ftbreak = IEM_BNG_MINBREAKFLASHTIME; ! if(fthold < IEM_BNG_MINHOLDFLASHTIME) ! fthold = IEM_BNG_MINHOLDFLASHTIME; x->x_flashtime_break = ftbreak; x->x_flashtime_hold = fthold; --- 165,174 ---- if(ftbreak > fthold) { ! int h = ftbreak; ftbreak = fthold; fthold = h; } ! if(ftbreak < IEM_BNG_MINBREAKFLASHTIME) ftbreak = IEM_BNG_MINBREAKFLASHTIME; ! if( fthold < IEM_BNG_MINHOLDFLASHTIME) fthold = IEM_BNG_MINHOLDFLASHTIME; x->x_flashtime_break = ftbreak; x->x_flashtime_hold = fthold; *************** *** 361,365 **** int fs=8; int ftbreak=IEM_BNG_DEFAULTBREAKFLASHTIME, ! fthold=IEM_BNG_DEFAULTHOLDFLASHTIME; char str[144]; --- 357,361 ---- int fs=8; int ftbreak=IEM_BNG_DEFAULTBREAKFLASHTIME, ! fthold= IEM_BNG_DEFAULTHOLDFLASHTIME; char str[144]; *************** *** 367,395 **** iem_inttofstyle(&x->x_gui.x_fsf, 0); ! if((argc == 14)&&IS_A_FLOAT(argv,0) ! &&IS_A_FLOAT(argv,1)&&IS_A_FLOAT(argv,2) ! &&IS_A_FLOAT(argv,3) ! &&(IS_A_SYMBOL(argv,4)||IS_A_FLOAT(argv,4)) ! &&(IS_A_SYMBOL(argv,5)||IS_A_FLOAT(argv,5)) ! &&(IS_A_SYMBOL(argv,6)||IS_A_FLOAT(argv,6)) ! &&IS_A_FLOAT(argv,7)&&IS_A_FLOAT(argv,8) ! &&IS_A_FLOAT(argv,9)&&IS_A_FLOAT(argv,10)&&IS_A_FLOAT(argv,11) ! &&IS_A_FLOAT(argv,12)&&IS_A_FLOAT(argv,13)) { - - a = (int)atom_getintarg(0, argc, argv); - fthold = (int)atom_getintarg(1, argc, argv); - ftbreak = (int)atom_getintarg(2, argc, argv); iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(3, argc, argv)); iemgui_new_getnames(&x->x_gui, 4, argv); - ldx = (int)atom_getintarg(7, argc, argv); - ldy = (int)atom_getintarg(8, argc, argv); iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(9, argc, argv)); - fs = (int)atom_getintarg(10, argc, argv); - bflcol[0] = (int)atom_getintarg(11, argc, argv); - bflcol[1] = (int)atom_getintarg(12, argc, argv); - bflcol[2] = (int)atom_getintarg(13, argc, argv); } ! else iemgui_new_getnames(&x->x_gui, 4, 0); x->x_gui.x_draw = (t_iemfunptr)bng_draw; --- 363,376 ---- iem_inttofstyle(&x->x_gui.x_fsf, 0); ! if (pd_scanargs(argc,argv,"iiiF???iiFiiii",&a,&fthold,&ftbreak, ! &ldx,&ldy,&fs,&bflcol[0],&bflcol[1],&bflcol[2])) { iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(3, argc, argv)); iemgui_new_getnames(&x->x_gui, 4, argv); iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(9, argc, argv)); } ! else { ! iemgui_new_getnames(&x->x_gui, 4, 0); ! } x->x_gui.x_draw = (t_iemfunptr)bng_draw; *************** *** 399,406 **** x->x_flashed = 0; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) ! x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) ! x->x_gui.x_fsf.x_rcv_able = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); --- 380,385 ---- x->x_flashed = 0; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) x->x_gui.x_fsf.x_rcv_able = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); Index: g_hdial.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hdial.c,v retrieving revision 1.1.1.4.2.2.2.2 retrieving revision 1.1.1.4.2.2.2.3 diff -C2 -d -r1.1.1.4.2.2.2.2 -r1.1.1.4.2.2.2.3 *** g_hdial.c 6 Mar 2004 20:56:29 -0000 1.1.1.4.2.2.2.2 --- g_hdial.c 7 Mar 2004 19:38:13 -0000 1.1.1.4.2.2.2.3 *************** *** 3,7 **** * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ ! /* g_7_guis.c written by Thomas Musil (c) IEM KUG Graz Austria 2000-2001 */ /* thanks to Miller Puckette, Guenther Geiger and Krzystof Czaja */ --- 3,7 ---- * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ ! /* hdial.c written by Thomas Musil (c) IEM KUG Graz Austria 2000-2001 */ /* thanks to Miller Puckette, Guenther Geiger and Krzystof Czaja */ *************** *** 19,30 **** #include <math.h> - #ifdef MSW - #include <io.h> - #else - #include <unistd.h> - #endif - - /* ------------- hdl gui-horicontal dial ---------------------- */ - t_widgetbehavior hradio_widgetbehavior; static t_class *hradio_class, *hradio_old_class; --- 19,22 ---- *************** *** 68,71 **** --- 60,64 ---- !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_number,x->x_gui.x_bcol); + sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); sys_vgui(".x%x.c coords %xLABEL %d %d\n", canvas, x, x1+x->x_gui.x_ldx, y1+x->x_gui.x_ldy); *************** *** 190,194 **** canvas_fixlinesfor(glist_getcanvas(x->x_gui.x_glist), (t_text*)x); } - } --- 183,186 ---- *************** *** 256,259 **** --- 248,252 ---- if (pd_class(&x->x_gui.x_obj.ob_pd) == hradio_old_class) { + /* compatibility with earlier "hdial" behavior */ if((x->x_change)&&(i != x->x_on_old)) { *************** *** 336,350 **** } ! static void hradio_click(t_hradio *x, t_floatarg xpos, t_floatarg ypos, t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { int xx = (int)xpos - (int)text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist); - hradio_fout(x, (float)(xx / x->x_gui.x_w)); } ! static int hradio_newclick(t_gobj *z, struct _glist *glist, int xpix, int ypix, int shift, int alt, int dbl, int doit) { if(doit) ! hradio_click((t_hradio *)z, (t_floatarg)xpix, (t_floatarg)ypix, (t_floatarg)shift, 0, (t_floatarg)alt); return (1); } --- 329,345 ---- } ! static void hradio_click(t_hradio *x, t_floatarg xpos, t_floatarg ypos, ! t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { int xx = (int)xpos - (int)text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist); hradio_fout(x, (float)(xx / x->x_gui.x_w)); } ! static int hradio_newclick(t_gobj *z, struct _glist *glist, ! int xpix, int ypix, int shift, int alt, int dbl, int doit) { if(doit) ! hradio_click((t_hradio *)z, (t_floatarg)xpix, (t_floatarg)ypix, ! (t_floatarg)shift, 0, (t_floatarg)alt); return (1); } *************** *** 430,455 **** iem_inttofstyle(&x->x_gui.x_fsf, 0); ! if((argc == 15)&&IS_A_FLOAT(argv,0)&&IS_A_FLOAT(argv,1)&&IS_A_FLOAT(argv,2) ! &&IS_A_FLOAT(argv,3) ! &&(IS_A_SYMBOL(argv,4)||IS_A_FLOAT(argv,4)) ! &&(IS_A_SYMBOL(argv,5)||IS_A_FLOAT(argv,5)) ! &&(IS_A_SYMBOL(argv,6)||IS_A_FLOAT(argv,6)) ! &&IS_A_FLOAT(argv,7)&&IS_A_FLOAT(argv,8) ! &&IS_A_FLOAT(argv,9)&&IS_A_FLOAT(argv,10)&&IS_A_FLOAT(argv,11) ! &&IS_A_FLOAT(argv,12)&&IS_A_FLOAT(argv,13)&&IS_A_FLOAT(argv,14)) { - a = (int)atom_getintarg(0, argc, argv); - chg = (int)atom_getintarg(1, argc, argv); iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(2, argc, argv)); - num = (int)atom_getintarg(3, argc, argv); iemgui_new_getnames(&x->x_gui, 4, argv); - ldx = (int)atom_getintarg(7, argc, argv); - ldy = (int)atom_getintarg(8, argc, argv); iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(9, argc, argv)); - fs = (int)atom_getintarg(10, argc, argv); - bflcol[0] = (int)atom_getintarg(11, argc, argv); - bflcol[1] = (int)atom_getintarg(12, argc, argv); - bflcol[2] = (int)atom_getintarg(13, argc, argv); - on = (int)atom_getintarg(14, argc, argv); } else iemgui_new_getnames(&x->x_gui, 4, 0); --- 425,434 ---- iem_inttofstyle(&x->x_gui.x_fsf, 0); ! if(pd_scanargs(argc,argv,"iiFi???iiFiiiii", ! &a,&chg,&num,&ldx,&ldy,&fs,&bflcol[0],&bflcol[1],&bflcol[2],&on)) { iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(2, argc, argv)); iemgui_new_getnames(&x->x_gui, 4, argv); iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(9, argc, argv)); } else iemgui_new_getnames(&x->x_gui, 4, 0); *************** *** 458,465 **** x->x_gui.x_fsf.x_rcv_able = 1; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) ! x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) ! x->x_gui.x_fsf.x_rcv_able = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); --- 437,442 ---- x->x_gui.x_fsf.x_rcv_able = 1; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) x->x_gui.x_fsf.x_rcv_able = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); *************** *** 576,611 **** class_addmethod(hradio_old_class, (t_method)hradio_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_dialog, gensym("dialog"), ! A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_loadbang, ! gensym("loadbang"), 0); ! class_addmethod(hradio_old_class, (t_method)hradio_set, ! gensym("set"), A_FLOAT, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_size, ! gensym("size"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_delta, ! gensym("delta"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_pos, ! gensym("pos"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_color, ! gensym("color"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_send, ! gensym("send"), A_DEFSYM, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_receive, ! gensym("receive"), A_DEFSYM, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_label, ! gensym("label"), A_DEFSYM, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_label_pos, ! gensym("label_pos"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_label_font, ! gensym("label_font"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_init, ! gensym("init"), A_FLOAT, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_number, ! gensym("number"), A_FLOAT, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_single_change, ! gensym("single_change"), 0); ! class_addmethod(hradio_old_class, (t_method)hradio_double_change, ! gensym("double_change"), 0); class_setwidget(hradio_old_class, &hradio_widgetbehavior); class_sethelpsymbol(hradio_old_class, gensym("hradio")); --- 553,572 ---- class_addmethod(hradio_old_class, (t_method)hradio_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_dialog, gensym("dialog"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_loadbang, gensym("loadbang"), 0); ! class_addmethod(hradio_old_class, (t_method)hradio_set, gensym("set"), A_FLOAT, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_size, gensym("size"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_delta, gensym("delta"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_pos, gensym("pos"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_color, gensym("color"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_send, gensym("send"), A_DEFSYM, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_receive, gensym("receive"), A_DEFSYM, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_label, gensym("label"), A_DEFSYM, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_label_pos, gensym("label_pos"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_label_font, gensym("label_font"), A_GIMME, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_init, gensym("init"), A_FLOAT, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_number, gensym("number"), A_FLOAT, 0); ! class_addmethod(hradio_old_class, (t_method)hradio_single_change, gensym("single_change"), 0); ! class_addmethod(hradio_old_class, (t_method)hradio_double_change, gensym("double_change"), 0); class_setwidget(hradio_old_class, &hradio_widgetbehavior); class_sethelpsymbol(hradio_old_class, gensym("hradio")); Index: g_hslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v retrieving revision 1.1.1.3.2.2.2.2 retrieving revision 1.1.1.3.2.2.2.3 diff -C2 -d -r1.1.1.3.2.2.2.2 -r1.1.1.3.2.2.2.3 *** g_hslider.c 6 Mar 2004 22:14:39 -0000 1.1.1.3.2.2.2.2 --- g_hslider.c 7 Mar 2004 19:38:13 -0000 1.1.1.3.2.2.2.3 *************** *** 23,29 **** #endif - - /* ------------ hsl gui-horicontal slider ----------------------- */ - t_widgetbehavior hslider_widgetbehavior; static t_class *hslider_class; --- 23,26 ---- *************** *** 35,41 **** t_canvas *canvas=glist_getcanvas(glist); if (glist_isvisible(glist)) ! { ! sys_vgui("slider_set .x%x.c %x %d 0 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); ! } } --- 32,36 ---- t_canvas *canvas=glist_getcanvas(glist); if (glist_isvisible(glist)) ! {sys_vgui("slider_set .x%x.c %x %d 0 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol);} } *************** *** 46,58 **** t_canvas *canvas=glist_getcanvas(glist); sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d 0 #%6.6x\n", ! canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); sys_vgui("slider_set .x%x.c %x %d 0 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", ! canvas, xpos+x->x_gui.x_ldx, ! ypos+x->x_gui.x_ldy, ! strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", ! x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); } --- 41,52 ---- t_canvas *canvas=glist_getcanvas(glist); sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d 0 #%6.6x\n", ! canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); sys_vgui("slider_set .x%x.c %x %d 0 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", ! canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, ! strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", ! x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); } *************** *** 63,71 **** t_canvas *canvas=glist_getcanvas(glist); sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d 0 #%6.6x\n", ! canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); sys_vgui("slider_set .x%x.c %x %d 0 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); sys_vgui(".x%x.c coords %xLABEL %d %d\n", ! canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); } --- 57,65 ---- t_canvas *canvas=glist_getcanvas(glist); sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d 0 #%6.6x\n", ! canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); sys_vgui("slider_set .x%x.c %x %d 0 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); sys_vgui(".x%x.c coords %xLABEL %d %d\n", ! canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); } *************** *** 81,84 **** --- 75,79 ---- t_canvas *canvas=glist_getcanvas(glist); int xpos=text_xpix(&x->x_gui.x_obj, glist); + int ypos=text_ypix(&x->x_gui.x_obj, glist); sys_vgui(".x%x.c itemconfigure %xLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, *************** *** 99,103 **** void hslider_draw(t_hslider *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) hslider_draw_update(x, glist); else if(mode == IEM_GUI_DRAW_MODE_MOVE) hslider_draw_move(x, glist); else if(mode == IEM_GUI_DRAW_MODE_NEW) hslider_draw_new(x, glist); --- 94,98 ---- void hslider_draw(t_hslider *x, t_glist *glist, int mode) { ! if (mode == IEM_GUI_DRAW_MODE_UPDATE) hslider_draw_update(x, glist); else if(mode == IEM_GUI_DRAW_MODE_MOVE) hslider_draw_move(x, glist); else if(mode == IEM_GUI_DRAW_MODE_NEW) hslider_draw_new(x, glist); *************** *** 425,430 **** int bflcol[]={-262144, -1, -1}; int w=IEM_SL_DEFAULTSIZE, h=IEM_GUI_DEFAULTSIZE; ! int lilo=0, ldx=-2, ldy=-6, f=0, v=0, steady=1; ! int fs=8; double min=0.0, max=(double)(IEM_SL_DEFAULTSIZE-1); char str[144]; --- 420,424 ---- int bflcol[]={-262144, -1, -1}; int w=IEM_SL_DEFAULTSIZE, h=IEM_GUI_DEFAULTSIZE; ! int lilo=0, ldx=-2, ldy=-6, f=0, v=0, steady=1, fs=8; double min=0.0, max=(double)(IEM_SL_DEFAULTSIZE-1); char str[144]; *************** *** 433,471 **** iem_inttofstyle(&x->x_gui.x_fsf, 0); ! if(((argc == 17)||(argc == 18))&&IS_A_FLOAT(argv,0)&&IS_A_FLOAT(argv,1) ! &&IS_A_FLOAT(argv,2)&&IS_A_FLOAT(argv,3) ! &&IS_A_FLOAT(argv,4)&&IS_A_FLOAT(argv,5) ! &&(IS_A_SYMBOL(argv,6)||IS_A_FLOAT(argv,6)) ! &&(IS_A_SYMBOL(argv,7)||IS_A_FLOAT(argv,7)) ! &&(IS_A_SYMBOL(argv,8)||IS_A_FLOAT(argv,8)) ! &&IS_A_FLOAT(argv,9)&&IS_A_FLOAT(argv,10) ! &&IS_A_FLOAT(argv,11)&&IS_A_FLOAT(argv,12)&&IS_A_FLOAT(argv,13) ! &&IS_A_FLOAT(argv,14)&&IS_A_FLOAT(argv,15)&&IS_A_FLOAT(argv,16)) { - w = (int)atom_getintarg(0, argc, argv); - h = (int)atom_getintarg(1, argc, argv); - min = (double)atom_getfloatarg(2, argc, argv); - max = (double)atom_getfloatarg(3, argc, argv); - lilo = (int)atom_getintarg(4, argc, argv); iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(5, argc, argv)); iemgui_new_getnames(&x->x_gui, 6, argv); - ldx = (int)atom_getintarg(9, argc, argv); - ldy = (int)atom_getintarg(10, argc, argv); iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(11, argc, argv)); - fs = (int)atom_getintarg(12, argc, argv); - bflcol[0] = (int)atom_getintarg(13, argc, argv); - bflcol[1] = (int)atom_getintarg(14, argc, argv); - bflcol[2] = (int)atom_getintarg(15, argc, argv); - v = (int)atom_getintarg(16, argc, argv); } else iemgui_new_getnames(&x->x_gui, 6, 0); if((argc == 18)&&IS_A_FLOAT(argv,17)) steady = (int)atom_getintarg(17, argc, argv); - x->x_gui.x_draw = (t_iemfunptr)hslider_draw; - x->x_gui.x_fsf.x_snd_able = 1; x->x_gui.x_fsf.x_rcv_able = 1; - x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); if(x->x_gui.x_isa.x_loadinit) --- 427,443 ---- iem_inttofstyle(&x->x_gui.x_fsf, 0); ! if(pd_scanargs(argc,argv,"iiffiF???iiFiiiii?;?", ! &w,&h,&min,&max,&lilo,&ldx,&ldy,&fs,&bflcol[0],&bflcol[1],&bflcol[2],&v)) { iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(5, argc, argv)); iemgui_new_getnames(&x->x_gui, 6, argv); iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(11, argc, argv)); } else iemgui_new_getnames(&x->x_gui, 6, 0); if((argc == 18)&&IS_A_FLOAT(argv,17)) steady = (int)atom_getintarg(17, argc, argv); x->x_gui.x_draw = (t_iemfunptr)hslider_draw; x->x_gui.x_fsf.x_snd_able = 1; x->x_gui.x_fsf.x_rcv_able = 1; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); if(x->x_gui.x_isa.x_loadinit) *************** *** 478,491 **** if(steady != 0) steady = 1; x->x_steady = steady; ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) ! x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) ! x->x_gui.x_fsf.x_rcv_able = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; strcpy(x->x_gui.x_font, "courier"); } ! if(x->x_gui.x_fsf.x_rcv_able) ! pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); x->x_gui.x_ldx = ldx; x->x_gui.x_ldy = ldy; --- 450,460 ---- if(steady != 0) steady = 1; x->x_steady = steady; ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) x->x_gui.x_fsf.x_rcv_able = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); else { x->x_gui.x_fsf.x_font_style = 0; strcpy(x->x_gui.x_font, "courier"); } ! if(x->x_gui.x_fsf.x_rcv_able) pd_bind(&x->x_gui.x_obj.ob_pd, x->x_gui.x_rcv); x->x_gui.x_ldx = ldx; x->x_gui.x_ldy = ldy; Index: g_mycanvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_mycanvas.c,v retrieving revision 1.1.1.3.2.2 retrieving revision 1.1.1.3.2.2.2.1 diff -C2 -d -r1.1.1.3.2.2 -r1.1.1.3.2.2.2.1 *** g_mycanvas.c 18 Nov 2003 10:34:10 -0000 1.1.1.3.2.2 --- g_mycanvas.c 7 Mar 2004 19:38:13 -0000 1.1.1.3.2.2.2.1 *************** *** 106,119 **** void my_canvas_draw(t_my_canvas *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_MOVE) ! my_canvas_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) ! my_canvas_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) ! my_canvas_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) ! my_canvas_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) ! my_canvas_draw_config(x, glist); } --- 106,114 ---- void my_canvas_draw(t_my_canvas *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_MOVE) my_canvas_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) my_canvas_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) my_canvas_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) my_canvas_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) my_canvas_draw_config(x, glist); } Index: g_numbox.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v retrieving revision 1.1.1.4.2.2.2.1 retrieving revision 1.1.1.4.2.2.2.2 diff -C2 -d -r1.1.1.4.2.2.2.1 -r1.1.1.4.2.2.2.2 *** g_numbox.c 5 Mar 2004 19:27:52 -0000 1.1.1.4.2.2.2.1 --- g_numbox.c 7 Mar 2004 19:38:13 -0000 1.1.1.4.2.2.2.2 *************** *** 680,708 **** char str[144]; ! if((argc >= 17)&&IS_A_FLOAT(argv,0)&&IS_A_FLOAT(argv,1) ! &&IS_A_FLOAT(argv,2)&&IS_A_FLOAT(argv,3) ! &&IS_A_FLOAT(argv,4)&&IS_A_FLOAT(argv,5) ! &&(IS_A_SYMBOL(argv,6)||IS_A_FLOAT(argv,6)) ! &&(IS_A_SYMBOL(argv,7)||IS_A_FLOAT(argv,7)) ! &&(IS_A_SYMBOL(argv,8)||IS_A_FLOAT(argv,8)) ! &&IS_A_FLOAT(argv,9)&&IS_A_FLOAT(argv,10) ! &&IS_A_FLOAT(argv,11)&&IS_A_FLOAT(argv,12)&&IS_A_FLOAT(argv,13) ! &&IS_A_FLOAT(argv,14)&&IS_A_FLOAT(argv,15)&&IS_A_FLOAT(argv,16)) { - w = (int)atom_getintarg(0, argc, argv); - h = (int)atom_getintarg(1, argc, argv); - min = (double)atom_getfloatarg(2, argc, argv); - max = (double)atom_getfloatarg(3, argc, argv); - lilo = (int)atom_getintarg(4, argc, argv); iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(5, argc, argv)); iemgui_new_getnames(&x->x_gui, 6, argv); - ldx = (int)atom_getintarg(9, argc, argv); - ldy = (int)atom_getintarg(10, argc, argv); iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(11, argc, argv)); - fs = (int)atom_getintarg(12, argc, argv); - bflcol[0] = (int)atom_getintarg(13, argc, argv); - bflcol[1] = (int)atom_getintarg(14, argc, argv); - bflcol[2] = (int)atom_getintarg(15, argc, argv); - v = atom_getfloatarg(16, argc, argv); } else iemgui_new_getnames(&x->x_gui, 6, 0); --- 680,689 ---- char str[144]; ! if(pd_scanargs(argc,argv,"iiffiF???ii?iiiif*",&w,&h,&min,&max,&lilo, ! &ldx,&ldy,&fs,&bflcol[0],&bflcol[1],&bflcol[2],&v)) { iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(5, argc, argv)); iemgui_new_getnames(&x->x_gui, 6, argv); iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(11, argc, argv)); } else iemgui_new_getnames(&x->x_gui, 6, 0); *************** *** 724,731 **** log_height = 10; x->x_log_height = log_height; ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) ! x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) ! x->x_gui.x_fsf.x_rcv_able = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); --- 705,710 ---- log_height = 10; x->x_log_height = log_height; ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) x->x_gui.x_fsf.x_rcv_able = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); Index: g_toggle.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v retrieving revision 1.1.1.3.2.2.2.1 retrieving revision 1.1.1.3.2.2.2.2 diff -C2 -d -r1.1.1.3.2.2.2.1 -r1.1.1.3.2.2.2.2 *** g_toggle.c 5 Mar 2004 19:27:52 -0000 1.1.1.3.2.2.2.1 --- g_toggle.c 7 Mar 2004 19:38:13 -0000 1.1.1.3.2.2.2.2 *************** *** 158,175 **** void toggle_draw(t_toggle *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) ! toggle_draw_update(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_MOVE) ! toggle_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) ! toggle_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) ! toggle_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) ! toggle_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) ! toggle_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) ! toggle_draw_io(x, glist, mode - IEM_GUI_DRAW_MODE_IO); } --- 158,168 ---- void toggle_draw(t_toggle *x, t_glist *glist, int mode) { ! if (mode == IEM_GUI_DRAW_MODE_UPDATE) toggle_draw_update(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_MOVE) toggle_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) toggle_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) toggle_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) toggle_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) toggle_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) toggle_draw_io(x, glist, mode - IEM_GUI_DRAW_MODE_IO); } *************** *** 358,381 **** iem_inttofstyle(&x->x_gui.x_fsf, 0); ! if(((argc == 13)||(argc == 14))&&IS_A_FLOAT(argv,0) ! &&IS_A_FLOAT(argv,1) ! &&(IS_A_SYMBOL(argv,2)||IS_A_FLOAT(argv,2)) ! &&(IS_A_SYMBOL(argv,3)||IS_A_FLOAT(argv,3)) ! &&(IS_A_SYMBOL(argv,4)||IS_A_FLOAT(argv,4)) ! &&IS_A_FLOAT(argv,5)&&IS_A_FLOAT(argv,6) ! &&IS_A_FLOAT(argv,7)&&IS_A_FLOAT(argv,8)&&IS_A_FLOAT(argv,9) ! &&IS_A_FLOAT(argv,10)&&IS_A_FLOAT(argv,11)&&IS_A_FLOAT(argv,12)) { - a = (int)atom_getintarg(0, argc, argv); iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(1, argc, argv)); iemgui_new_getnames(&x->x_gui, 2, argv); - ldx = (int)atom_getintarg(5, argc, argv); - ldy = (int)atom_getintarg(6, argc, argv); iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(7, argc, argv)); - fs = (int)atom_getintarg(8, argc, argv); - bflcol[0] = (int)atom_getintarg(9, argc, argv); - bflcol[1] = (int)atom_getintarg(10, argc, argv); - bflcol[2] = (int)atom_getintarg(11, argc, argv); - on = (float)atom_getfloatarg(12, argc, argv); } else iemgui_new_getnames(&x->x_gui, 2, 0); --- 351,360 ---- iem_inttofstyle(&x->x_gui.x_fsf, 0); ! if(pd_scanargs(argc,argv,"iF???iiFiiiii;?", ! &a,&ldx,&ldy,&fs,&bflcol[0],&bflcol[1],&bflcol[2],&on)) { iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(1, argc, argv)); iemgui_new_getnames(&x->x_gui, 2, argv); iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(7, argc, argv)); } else iemgui_new_getnames(&x->x_gui, 2, 0); *************** *** 387,394 **** x->x_gui.x_fsf.x_rcv_able = 1; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) ! x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) ! x->x_gui.x_fsf.x_rcv_able = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); --- 366,371 ---- x->x_gui.x_fsf.x_rcv_able = 1; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) x->x_gui.x_fsf.x_rcv_able = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); Index: g_vdial.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vdial.c,v retrieving revision 1.1.1.4.2.2.2.2 retrieving revision 1.1.1.4.2.2.2.3 diff -C2 -d -r1.1.1.4.2.2.2.2 -r1.1.1.4.2.2.2.3 *** g_vdial.c 6 Mar 2004 20:56:29 -0000 1.1.1.4.2.2.2.2 --- g_vdial.c 7 Mar 2004 19:38:13 -0000 1.1.1.4.2.2.2.3 *************** *** 4,7 **** --- 4,8 ---- /* vdial.c written by Thomas Musil (c) IEM KUG Graz Austria 2000-2001 */ + /* thanks to Miller Puckette, Guenther Geiger and Krzystof Czaja */ /* name change to vradio by MSP (it's a radio button really) and changed to *************** *** 18,23 **** #include <math.h> - /* ------------- vdl gui-vertical radio button ---------------------- */ - t_widgetbehavior vradio_widgetbehavior; static t_class *vradio_class, *vradio_old_class; --- 19,22 ---- *************** *** 45,53 **** sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", ! canvas, x1+x->x_gui.x_ldx, y1+x->x_gui.x_ldy, ! strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", ! x->x_gui.x_font, x->x_gui.x_fontsize, ! x->x_gui.x_lcol, x); } --- 44,51 ---- sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", ! canvas, x1+x->x_gui.x_ldx, y1+x->x_gui.x_ldy, ! strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", ! x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); } *************** *** 58,62 **** int x1=text_xpix(&x->x_gui.x_obj, glist), x2=x1+x->x_gui.x_w; int y1=text_ypix(&x->x_gui.x_obj, glist), y2=y1+x->x_gui.x_h*x->x_number; ! sys_vgui("radio_draw .x%x.c %x %d %d %d %d %d %d 0 %d #%6.6x\n", canvas, x, x1, y1, x2, y2, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, --- 56,60 ---- int x1=text_xpix(&x->x_gui.x_obj, glist), x2=x1+x->x_gui.x_w; int y1=text_ypix(&x->x_gui.x_obj, glist), y2=y1+x->x_gui.x_h*x->x_number; ! sys_vgui("radio_draw .x%x.c %x %d %d %d %d %d %d 1 %d #%6.6x\n", canvas, x, x1, y1, x2, y2, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, *************** *** 87,91 **** void vradio_draw(t_vradio *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) vradio_draw_update(x, glist); else if(mode == IEM_GUI_DRAW_MODE_MOVE) vradio_draw_move(x, glist); else if(mode == IEM_GUI_DRAW_MODE_NEW) vradio_draw_new(x, glist); --- 85,89 ---- void vradio_draw(t_vradio *x, t_glist *glist, int mode) { ! if (mode == IEM_GUI_DRAW_MODE_UPDATE) vradio_draw_update(x, glist); else if(mode == IEM_GUI_DRAW_MODE_MOVE) vradio_draw_move(x, glist); else if(mode == IEM_GUI_DRAW_MODE_NEW) vradio_draw_new(x, glist); *************** *** 116,121 **** iemgui_save(&x->x_gui, srl, bflcol); binbuf_addv(b, "ssiisiiiisssiiiiiiii", gensym("#X"),gensym("obj"), ! (t_int)x->x_gui.x_obj.te_xpix, ! (t_int)x->x_gui.x_obj.te_ypix, (pd_class(&x->x_gui.x_obj.ob_pd) == vradio_old_class ? gensym("vdl") : gensym("vradio")), --- 114,119 ---- iemgui_save(&x->x_gui, srl, bflcol); binbuf_addv(b, "ssiisiiiisssiiiiiiii", gensym("#X"),gensym("obj"), ! (t_int)text_xpix(&x->x_gui.x_obj, x->x_gui.x_glist), ! (t_int)text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist), (pd_class(&x->x_gui.x_obj.ob_pd) == vradio_old_class ? gensym("vdl") : gensym("vradio")), *************** *** 157,161 **** { t_symbol *srl[3]; ! int a = (int)atom_getintarg(0, argc, argv); int chg = (int)atom_getintarg(4, argc, argv); int num = (int)atom_getintarg(6, argc, argv); --- 155,159 ---- { t_symbol *srl[3]; ! int a = (int)atom_getintarg(0, argc, argv); int chg = (int)atom_getintarg(4, argc, argv); int num = (int)atom_getintarg(6, argc, argv); *************** *** 190,194 **** { int i=(int)f; ! int old; if(i < 0) --- 188,192 ---- { int i=(int)f; ! int old=x->x_on_old; if(i < 0) *************** *** 334,339 **** t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { ! int yy = (int)ypos - text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist); ! vradio_fout(x, (float)(yy / x->x_gui.x_h)); } --- 332,336 ---- t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { ! int yy = (int)ypos - (int)text_ypix(&x->x_gui.x_obj, x->x_gui.x_glist); vradio_fout(x, (float)(yy / x->x_gui.x_h)); } *************** *** 425,450 **** char str[144]; ! if((argc == 15)&&IS_A_FLOAT(argv,0)&&IS_A_FLOAT(argv,1)&&IS_A_FLOAT(argv,2) ! &&IS_A_FLOAT(argv,3) ! &&(IS_A_SYMBOL(argv,4)||IS_A_FLOAT(argv,4)) ! &&(IS_A_SYMBOL(argv,5)||IS_A_FLOAT(argv,5)) ! &&(IS_A_SYMBOL(argv,6)||IS_A_FLOAT(argv,6)) ! &&IS_A_FLOAT(argv,7)&&IS_A_FLOAT(argv,8) ! &&IS_A_FLOAT(argv,9)&&IS_A_FLOAT(argv,10)&&IS_A_FLOAT(argv,11) ! &&IS_A_FLOAT(argv,12)&&IS_A_FLOAT(argv,13)&&IS_A_FLOAT(argv,14)) { - a = (int)atom_getintarg(0, argc, argv); - chg = (int)atom_getintarg(1, argc, argv); iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(2, argc, argv)); - num = (int)atom_getintarg(3, argc, argv); iemgui_new_getnames(&x->x_gui, 4, argv); - ldx = (int)atom_getintarg(7, argc, argv); - ldy = (int)atom_getintarg(8, argc, argv); iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(9, argc, argv)); - fs = (int)atom_getintarg(10, argc, argv); - bflcol[0] = (int)atom_getintarg(11, argc, argv); - bflcol[1] = (int)atom_getintarg(12, argc, argv); - bflcol[2] = (int)atom_getintarg(13, argc, argv); - on = (int)atom_getintarg(14, argc, argv); } else iemgui_new_getnames(&x->x_gui, 4, 0); --- 422,434 ---- char str[144]; ! iem_inttosymargs(&x->x_gui.x_isa, 0); ! iem_inttofstyle(&x->x_gui.x_fsf, 0); ! ! if(pd_scanargs(argc,argv,"iiFi???iiFiiiii", ! &a,&chg,&num,&ldx,&ldy,&fs,&bflcol[0],&bflcol[1],&bflcol[2],&on)) { iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(2, argc, argv)); iemgui_new_getnames(&x->x_gui, 4, argv); iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(9, argc, argv)); } else iemgui_new_getnames(&x->x_gui, 4, 0); *************** *** 453,460 **** x->x_gui.x_fsf.x_rcv_able = 1; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) ! x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) ! x->x_gui.x_fsf.x_rcv_able = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); --- 437,442 ---- x->x_gui.x_fsf.x_rcv_able = 1; x->x_gui.x_glist = (t_glist *)canvas_getcurrent(); ! if (!strcmp(x->x_gui.x_snd->s_name, "empty")) x->x_gui.x_fsf.x_snd_able = 0; ! if (!strcmp(x->x_gui.x_rcv->s_name, "empty")) x->x_gui.x_fsf.x_rcv_able = 0; if(x->x_gui.x_fsf.x_font_style == 1) strcpy(x->x_gui.x_font, "helvetica"); else if(x->x_gui.x_fsf.x_font_style == 2) strcpy(x->x_gui.x_font, "times"); *************** *** 567,572 **** class_addmethod(vradio_old_class, (t_method)vradio_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(vradio_old_class, (t_method)vradio_dialog, gensym("dialog"), ! A_GIMME, 0); class_addmethod(vradio_old_class, (t_method)vradio_loadbang, gensym("loadbang"), 0); class_addmethod(vradio_old_class, (t_method)vradio_set, gensym("set"), A_FLOAT, 0); --- 549,553 ---- class_addmethod(vradio_old_class, (t_method)vradio_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(vradio_old_class, (t_method)vradio_dialog, gensym("dialog"), A_GIMME, 0); class_addmethod(vradio_old_class, (t_method)vradio_loadbang, gensym("loadbang"), 0); class_addmethod(vradio_old_class, (t_method)vradio_set, gensym("set"), A_FLOAT, 0); Index: g_vslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vslider.c,v retrieving revision 1.1.1.3.2.2.2.2 retrieving revision 1.1.1.3.2.2.2.3 diff -C2 -d -r1.1.1.3.2.2.2.2 -r1.1.1.3.2.2.2.3 *** g_vslider.c 6 Mar 2004 22:14:39 -0000 1.1.1.3.2.2.2.2 --- g_vslider.c 7 Mar 2004 19:38:13 -0000 1.1.1.3.2.2.2.3 *************** *** 23,29 **** #endif - - /* ------------ vsl gui-vertical slider ----------------------- */ - t_widgetbehavior vslider_widgetbehavior; static t_class *vslider_class; --- 23,26 ---- *************** *** 35,41 **** t_canvas *canvas=glist_getcanvas(glist); if (glist_isvisible(glist)) ! { ! sys_vgui("slider_set .x%x.c %x %d 1 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); ! } } --- 32,36 ---- t_canvas *canvas=glist_getcanvas(glist); if (glist_isvisible(glist)) ! {sys_vgui("slider_set .x%x.c %x %d 1 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol);} } *************** *** 44,60 **** int xpos=text_xpix(&x->x_gui.x_obj, glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); - int r = ypos + x->x_gui.x_h - (x->x_val + 50)/100; - int x1=xpos,y1=ypos,x2=xpos+x->x_gui.x_w, y2=ypos+x->x_gui.x_h+2; t_canvas *canvas=glist_getcanvas(glist); - sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d 1 #%6.6x\n", ! canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); sys_vgui("slider_set .x%x.c %x %d 1 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", ! canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, ! strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", ! x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); } --- 39,52 ---- int xpos=text_xpix(&x->x_gui.x_obj, glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); t_canvas *canvas=glist_getcanvas(glist); sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d 1 #%6.6x\n", ! canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); sys_vgui("slider_set .x%x.c %x %d 1 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", ! canvas, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy, ! strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", ! x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); } *************** *** 63,74 **** int xpos=text_xpix(&x->x_gui.x_obj, glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); - int r = ypos + x->x_gui.x_h - (x->x_val + 50)/100; t_canvas *canvas=glist_getcanvas(glist); sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d 1 #%6.6x\n", ! canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); sys_vgui("slider_set .x%x.c %x %d 1 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); sys_vgui(".x%x.c coords %xLABEL %d %d\n", ! canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); } --- 55,65 ---- int xpos=text_xpix(&x->x_gui.x_obj, glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); t_canvas *canvas=glist_getcanvas(glist); sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d 1 #%6.6x\n", ! canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); sys_vgui("slider_set .x%x.c %x %d 1 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); sys_vgui(".x%x.c coords %xLABEL %d %d\n", ! canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); } *************** *** 85,89 **** int xpos=text_xpix(&x->x_gui.x_obj, glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); - sys_vgui(".x%x.c itemconfigure %xLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, --- 76,79 ---- *************** *** 91,97 **** strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); sys_vgui("slider_set .x%x.c %x %d 1 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", ! canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, ! !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); } --- 81,85 ---- strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); sys_vgui("slider_set .x%x.c %x %d 1 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); ! sys_vgui("slider_select .x%x.c %xBASE %d\n", canvas, x, x->x_gui.x_fsf.x_selected); } *************** *** 106,110 **** void vslider_draw(t_vslider *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) vslider_draw_update(x, glist); else if(mode == IEM_GUI_DRAW_MODE_MOVE) vslider_draw_move(x, glist); else if(mode == IEM_GUI_DRAW_MODE_NEW) vslider_draw_new(x, glist); --- 94,98 ---- void vslider_draw(t_vslider *x, t_glist *glist, int mode) { ! if (mode == IEM_GUI_DRAW_MODE_UPDATE) vslider_draw_update(x, glist); else if(mode == IEM_GUI_DRAW_MODE_MOVE) vslider_draw_move(x, glist); else if(mode == IEM_GUI_DRAW_MODE_NEW) vslider_draw_new(x, glist); *************** *** 117,121 **** /* ------------------------ vsl widgetbehaviour----------------------------- */ - static void vslider_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2) --- 105,108 ---- *************** *** 154,157 **** --- 141,145 ---- h = IEM_SL_MINSIZE; x->x_gui.x_h = h; + if(x->x_val > (x->x_gui.x_h*100 - 100)) { *************** *** 169,183 **** if(x->x_lin0_log1) { ! if((min == 0.0)&&(max == 0.0)) ! max = 1.0; ! if(max > 0.0) ! { ! if(min <= 0.0) ! min = 0.01*max; ! } ! else ! { ! if(min > 0.0) ! max = 0.01*min; } } --- 157,165 ---- if(x->x_lin0_log1) { ! if(min == 0.0 && max == 0.0) max = 1.0; ! if(max > 0.0) { ! if(min <= 0.0) min = 0.01*max; ! } else { ! if(min > 0.0) max = 0.01*min; } } *************** *** 201,205 **** iemgui_properties(&x->x_gui, srl); - sprintf(buf, "pdtk_iemgui_dialog %%s VSLIDER \ --------dimensions(pix)(pix):-------- %d %d width: %d %d height: \ --- 183,186 ---- *************** *** 427,430 **** --- 408,418 ---- } + + + + + + + static void *vslider_new(t_symbol *s, int argc, t_atom *argv) { *************** *** 432,437 **** int bflcol[]={-262144, -1, -1}; int w=IEM_GUI_DEFAULTSIZE, h=IEM_SL_DEFAULTSIZE; ! int lilo=0, f=0, ldx=0, ldy=-8; ! int fs=8, v=0, steady=1; double min=0.0, max=(double)(IEM_SL_DEFAULTSIZE-1); char str[144]; --- 420,424 ---- int bflcol[]={-262144, -1, -1}; int w=IEM_GUI_DEFAULTSIZE, h=IEM_SL_DEFAULTSIZE; ! int lilo=0, ldx=0, ldy=-8, f=0, v=0, steady=1, fs=8; double min=0.0, max=(double)(IEM_SL_DEFAULTSIZE-1); char str[144]; *************** *** 440,468 **** iem_inttofstyle(&x->x_gui.x_fsf, 0); ! if(((argc == 17)||(argc == 18))&&IS_A_FLOAT(argv,0)&&IS_A_FLOAT(argv,1) ! &&IS_A_FLOAT(argv,2)&&IS_A_FLOAT(argv,3) ! &&IS_A_FLOAT(argv,4)&&IS_A_FLOAT(argv,5) ! &&(IS_A_SYMBOL(argv,6)||IS_A_FLOAT(argv,6)) ! &&(IS_A_SYMBOL(argv,7)||IS_A_FLOAT(argv,7)) ! &&(IS_A_SYMBOL(argv,8)||IS_A_FLOAT(argv,8)) ! &&IS_A_FLOAT(argv,9)&&IS_A_FLOAT(argv,10) ! &&IS_A_FLOAT(argv,11)&&IS_A_FLOAT(argv,12)&&IS_A_FLOAT(argv,13) ! &&IS_A_FLOAT(argv,14)&&IS_A_FLOAT(argv,15)&&IS_A_FLOAT(argv,16)) { - w = (int)atom_getintarg(0, argc, argv); - h = (int)atom_getintarg(1, argc, argv); - min = (double)atom_getfloatarg(2, argc, argv); - max = (double)atom_getfloatarg(3, argc, argv); - lilo = (int)atom_getintarg(4, argc, argv); iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(5, argc, argv)); iemgui_new_getnames(&x->x_gui, 6, argv); - ldx = (int)atom_getintarg(9, argc, argv); - ldy = (int)atom_getintarg(10, argc, argv); iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(11, argc, argv)); - fs = (int)atom_getintarg(12, argc, argv); - bflcol[0] = (int)atom_getintarg(13, argc, argv); - bflcol[1] = (int)atom_getintarg(14, argc, argv); - bflcol[2] = (int)atom_getintarg(15, argc, argv); - v = (int)atom_getintarg(16, argc, argv); } else iemgui_new_getnames(&x->x_gui, 6, 0); --- 427,436 ---- iem_inttofstyle(&x->x_gui.x_fsf, 0); ! if(pd_scanargs(argc,argv,"iiffiF???iiFiiiii?;?", ! &w,&h,&min,&max,&lilo,&ldx,&ldy,&fs,&bflcol[0],&bflcol[1],&bflcol[2],&v)) { iem_inttosymargs(&x->x_gui.x_isa, atom_getintarg(5, argc, argv)); iemgui_new_getnames(&x->x_gui, 6, argv); iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(11, argc, argv)); } else iemgui_new_getnames(&x->x_gui, 6, 0); Index: g_vumeter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v retrieving revision 1.1.1.3.2.2.2.1 retrieving revision 1.1.1.3.2.2.2.2 diff -C2 -d -r1.1.1.3.2.2.2.1 -r1.1.1.3.2.2.2.2 *** g_vumeter.c 5 Mar 2004 19:27:52 -0000 1.1.1.3.2.2.2.1 --- g_vumeter.c 7 Mar 2004 19:38:13 -0000 1.1.1.3.2.2.2.2 *************** *** 325,340 **** void vu_draw(t_vu *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_MOVE) ! vu_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) ! vu_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) ! vu_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) ! vu_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) ! vu_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) ! vu_draw_io(x, glist, mode - IEM_GUI_DRAW_MODE_IO); } --- 325,334 ---- void vu_draw(t_vu *x, t_glist *glist, int mode) { ! if (mode == IEM_GUI_DRAW_MODE_MOVE) vu_draw_move(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_NEW) vu_draw_new(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_SELECT) vu_draw_select(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_ERASE) vu_draw_erase(x, glist); ! else if(mode == IEM_GUI_DRAW_MODE_CONFIG) vu_draw_config(x, glist); ! else if(mode >= IEM_GUI_DRAW_MODE_IO) vu_draw_io(x, glist, mode - IEM_GUI_DRAW_MODE_IO); } *************** *** 574,594 **** iem_inttofstyle(&x->x_gui.x_fsf, 0); ! if((argc >= 11)&&IS_A_FLOAT(argv,0)&&IS_A_FLOAT(argv,1) ! &&(IS_A_SYMBOL(argv,2)||IS_A_FLOAT(argv,2)) ! &&(IS_A_SYMBOL(argv,3)||IS_A_FLOAT(argv,3)) ! &&IS_A_FLOAT(argv,4)&&IS_A_FLOAT(argv,5) ! &&IS_A_FLOAT(argv,6)&&IS_A_FLOAT(argv,7) ! &&IS_A_FLOAT(argv,8)&&IS_A_FLOAT(argv,9)&&IS_A_FLOAT(argv,10)) { ! w = (int)atom_getintarg(0, argc, argv); ! h = (int)atom_getintarg(1, argc, argv); ! iemgui_new_getnames(&x->x_gui, 1, argv); ! ldx = (int)atom_getintarg(4, argc, argv); ! ldy = (int)atom_getintarg(5, argc, argv); iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(6, argc, argv)); - fs = (int)atom_getintarg(7, argc, argv); - bflcol[0] = (int)atom_getintarg(8, argc, argv); - bflcol[2] = (int)atom_getintarg(9, argc, argv); - scale = (int)atom_getintarg(10, argc, argv); } else iemgui_new_getnames(&x->x_gui, 1, 0); --- 568,576 ---- iem_inttofstyle(&x->x_gui.x_fsf, 0); ! if(pd_scanargs(argc,argv,"ii??ii?iiii*", ! &w,&h,&ldx,&ldy,&fs,&bflcol[0],&bflcol[2],&scale)) { ! iemgui_new_getnames(&x->x_gui, 1, argv); /*???*/ iem_inttofstyle(&x->x_gui.x_fsf, atom_getintarg(6, argc, argv)); } else iemgui_new_getnames(&x->x_gui, 1, 0);

1 0

pd/src s_main.c,1.1.1.4.2.8.4.4,1.1.1.4.2.8.4.5
by matju＠users.sourceforge.net 07 Mar '04

07 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13335 Modified Files: Tag: impd_0_37 s_main.c Log Message: fixed bug with option parsing (-look, etc) Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.1.1.4.2.8.4.4 retrieving revision 1.1.1.4.2.8.4.5 diff -C2 -d -r1.1.1.4.2.8.4.4 -r1.1.1.4.2.8.4.5 *** s_main.c 7 Mar 2004 05:31:35 -0000 1.1.1.4.2.8.4.4 --- s_main.c 7 Mar 2004 19:18:36 -0000 1.1.1.4.2.8.4.5 *************** *** 273,278 **** return(1); ! sys_vgui("global cmdline; set cmdline(console) %d; " ! "set cmdline(look) %s; set cmdline(statusbar) %d; make_console\n", console_scrollback,option_look,option_statusbar); --- 273,278 ---- return(1); ! sys_vgui("global cmdline; set cmdline(console) {%d}; " ! "set cmdline(look) {%s}; set cmdline(statusbar) {%d}; make_console\n", console_scrollback,option_look,option_statusbar); *************** *** 364,367 **** --- 364,371 ---- "-rt or -realtime -- use real-time priority (needs root privilege)\n", #endif + "\nimpd flags:\n", + "-console <n>\n", + "-look <path>\n", + "-statusbar\n", };

1 0

pd/src u_main.tk,1.1.1.4.2.7.4.10,1.1.1.4.2.7.4.11 s_main.c,1.1.1.4.2.8.4.3,1.1.1.4.2.8.4.4
by matju＠users.sourceforge.net 07 Mar '04

07 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26859 Modified Files: Tag: impd_0_37 u_main.tk s_main.c Log Message: not using environment variables (because win32) Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.10 retrieving revision 1.1.1.4.2.7.4.11 diff -C2 -d -r1.1.1.4.2.7.4.10 -r1.1.1.4.2.7.4.11 *** u_main.tk 5 Mar 2004 19:02:10 -0000 1.1.1.4.2.7.4.10 --- u_main.tk 7 Mar 2004 05:31:35 -0000 1.1.1.4.2.7.4.11 *************** *** 702,712 **** -orient horizontal ! global env ! if {[info exists env(pd_look)]} { make_button_bar $name.bbar $name pack $name.bbar -side top -fill x -expand no } ! if {[info exists env(pd_statusbar)]} { frame $name.stat -border 2 -relief ridge # entry $name.stat.pos -width 10 -state disabled \ --- 702,712 ---- -orient horizontal ! global cmdline ! if {[string compare $cmdline(look) ""]} { make_button_bar $name.bbar $name pack $name.bbar -side top -fill x -expand no } ! if {$cmdline(statusbar)} { frame $name.stat -border 2 -relief ridge # entry $name.stat.pos -width 10 -state disabled \ *************** *** 993,997 **** # after 1 [concat raise $name] # after 1 [list canvas_animate $name] ! if {[info exists env(pd_statusbar)]} { bind $name.c <Motion> "+stat_pos_update $name %x %y" } --- 993,997 ---- # after 1 [concat raise $name] # after 1 [list canvas_animate $name] ! if {$cmdline(statusbar)} { bind $name.c <Motion> "+stat_pos_update $name %x %y" } *************** *** 3355,3381 **** ############ console ! #puts "pd_console_scrollback = $env(pd_console_scrollback)" ! set errMsg "" ! catch { ! if {$env(pd_console_scrollback) != 0} { ! frame .log ! text .log.1 -width 60 -height 10 -yscrollcommand ".log.2 set" ! scrollbar .log.2 -command ".log.1 yview" ! .log.1 insert end "This is the PureData log\n" ! pack .log.1 -side left -fill both -expand yes ! pack .log.2 -side left -fill y -expand no ! pack .log -fill both -expand yes ! .log.2 set 0.0 1.0 } ! } errMsg ! if {[string compare "" $errMsg] != 0} {puts stderr "ERROR: $errMsg"} set console_scrollback_count 0 proc post_to_gui {x} { ! global env global console_scrollback_count set oldpos [lindex [.log.2 get] 1] .log.1 insert end $x incr console_scrollback_count ! if {$console_scrollback_count >= $env(pd_console_scrollback)} { .log.1 delete 1.0 2.0 } --- 3355,3384 ---- ############ console ! proc make_console {} { ! global cmdline ! set errMsg "" ! catch { ! if {$cmdline(console) != 0} { ! frame .log ! text .log.1 -width 60 -height 10 -yscrollcommand ".log.2 set" ! scrollbar .log.2 -command ".log.1 yview" ! .log.1 insert end "This is the PureData log\n" ! pack .log.1 -side left -fill both -expand yes ! pack .log.2 -side left -fill y -expand no ! pack .log -fill both -expand yes ! .log.2 set 0.0 1.0 ! } ! } errMsg ! if {[string compare "" $errMsg] != 0} {puts stderr "ERROR: $errMsg"} } ! set console_scrollback_count 0 proc post_to_gui {x} { ! global cmdline global console_scrollback_count set oldpos [lindex [.log.2 get] 1] .log.1 insert end $x incr console_scrollback_count ! if {$console_scrollback_count >= $cmdline(console)} { .log.1 delete 1.0 2.0 } *************** *** 3435,3443 **** } ! global env ! if {$env(pd_console_scrollback) != 0} { listener_new .tcl "Tcl" bind .tcl.entry <Return> {tcl_eval} ! } ############ button bar --- 3438,3447 ---- } ! global cmdline ! after 1 { ! if {$cmdline(console) != 0} { listener_new .tcl "Tcl" bind .tcl.entry <Return> {tcl_eval} ! }} ############ button bar *************** *** 3470,3476 **** proc load_button_bar {} { global butt ! global env set icons {mode_edit mode_run} ! set dir $env(pd_look) foreach b $butt { if {[string compare [lindex $b 2] noload]!=0} { --- 3474,3480 ---- proc load_button_bar {} { global butt ! global cmdline set icons {mode_edit mode_run} ! set dir $cmdline(look) foreach b $butt { if {[string compare [lindex $b 2] noload]!=0} { *************** *** 3484,3490 **** } } - if {[info exists env(pd_look)]} {load_button_bar} proc make_button_bar {self doc} { global butt frame $self --- 3488,3496 ---- } } + set buttons_loaded 0 proc make_button_bar {self doc} { + global buttons_loaded + if {!$buttons_loaded} {load_button_bar} global butt frame $self Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.1.1.4.2.8.4.3 retrieving revision 1.1.1.4.2.8.4.4 diff -C2 -d -r1.1.1.4.2.8.4.3 -r1.1.1.4.2.8.4.4 *** s_main.c 27 Feb 2004 05:20:52 -0000 1.1.1.4.2.8.4.3 --- s_main.c 7 Mar 2004 05:31:35 -0000 1.1.1.4.2.8.4.4 *************** *** 236,239 **** --- 236,242 ---- static void sys_addreferencepath(void); + static int option_statusbar = 0; + static char *option_look = ""; + /* this is called from main() in s_entry.c */ int sys_main(int argc, char **argv) *************** *** 260,264 **** char buf[64]; sprintf(buf,"%d",console_scrollback); - setenv("pd_console_scrollback",buf,1); if (console_scrollback) { void guiprint(char *fmt, va_list ap); --- 263,266 ---- *************** *** 271,274 **** --- 273,280 ---- return(1); + sys_vgui("global cmdline; set cmdline(console) %d; " + "set cmdline(look) %s; set cmdline(statusbar) %d; make_console\n", + console_scrollback,option_look,option_statusbar); + /* open audio and MIDI */ sys_open_midi(sys_nmidiin, sys_midiindevlist, *************** *** 775,779 **** argc -= 2; argv += 2; } - /* Matju { */ else if (!strcmp(*argv,"-console")) { --- 781,784 ---- *************** *** 784,796 **** else if (!strcmp(*argv,"-look")) { ! setenv("pd_look",argv[1],1); argc-=2; argv+=2; } else if (!strcmp(*argv,"-statusbar")) { ! setenv("pd_statusbar","1",1); argc-=1; argv+=1; } - /* } */ else { --- 789,800 ---- else if (!strcmp(*argv,"-look")) { ! option_look = strdup(argv[1]); argc-=2; argv+=2; } else if (!strcmp(*argv,"-statusbar")) { ! option_statusbar = 1; argc-=1; argv+=1; } else {

1 0

pd/src g_all_guis.c,1.1.1.4.2.4.2.1,1.1.1.4.2.4.2.2 g_array.c,1.1.1.3.2.2,1.1.1.3.2.2.2.1 g_bang.c,1.1.1.3.2.2.2.1,1.1.1.3.2.2.2.2 g_canvas.c,1.1.1.4.2.7.2.1,1.1.1.4.2.7.2.2 g_editor.c,1.1.1.4.2.3.2.1,1.1.1.4.2.3.2.2 g_graph.c,1.1.1.3.2.3,1.1.1.3.2.3.2.1 g_io.c,1.1.1.1.16.2,1.1.1.1.16.2.2.1 g_text.c,1.1.1.4.2.2.2.1,1.1.1.4.2.2.2.2
by matju＠users.sourceforge.net 06 Mar '04

06 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25259 Modified Files: Tag: impd_0_37 g_all_guis.c g_array.c g_bang.c g_canvas.c g_editor.c g_graph.c g_io.c g_text.c Log Message: deleting some more code Index: g_all_guis.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v retrieving revision 1.1.1.4.2.4.2.1 retrieving revision 1.1.1.4.2.4.2.2 diff -C2 -d -r1.1.1.4.2.4.2.1 -r1.1.1.4.2.4.2.2 *** g_all_guis.c 5 Mar 2004 19:27:51 -0000 1.1.1.4.2.4.2.1 --- g_all_guis.c 6 Mar 2004 22:19:41 -0000 1.1.1.4.2.4.2.2 *************** *** 72,122 **** char *iemgui_vu_scale_str[]= { ! "", ! "<-99", ! "", ! "", ! "", ! "-50", ! "", ! "", ! "", ! "-30", ! "", ! "", ! "", ! "-20", ! "", ! "", ! "", ! "-12", ! "", ! "", ! "", ! "-6", ! "", ! "", ! "", ! "-2", ! "", ! "", ! "", ! "-0dB", ! "", ! "", ! "", ! "+2", ! "", ! "", ! "", ! "+6", ! "", ! "", ! "", ! ">+12", ! "", ! "", ! "", ! "", ! "", }; --- 72,86 ---- char *iemgui_vu_scale_str[]= { ! "", "<-99", "", "", ! "", "-50", "", "", ! "", "-30", "", "", ! "", "-20", "", "", ! "", "-12", "", "", ! "", "-6", "", "", ! "", "-2", "", "", ! "", "-0dB", "", "", ! "", "+2", "", "", ! "", "+6", "", "", ! "", ">+12", "", "", "", "", "", }; Index: g_array.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_array.c,v retrieving revision 1.1.1.3.2.2 retrieving revision 1.1.1.3.2.2.2.1 diff -C2 -d -r1.1.1.3.2.2 -r1.1.1.3.2.2.2.1 *** g_array.c 12 Sep 2003 20:55:31 -0000 1.1.1.3.2.2 --- g_array.c 6 Mar 2004 22:19:41 -0000 1.1.1.3.2.2.2.1 *************** *** 287,298 **** { float xval, yval, ypix, wpix; ! if (xonset >= 0) ! xval = *(float *)(elem + xonset); ! else xval = indx * xinc; ! if (yonset >= 0) ! yval = *(float *)(elem + yonset); ! else yval = 0; ypix = glist_ytopixels(glist, basey + yval); ! if (wonset >= 0) { /* found "w" field which controls linewidth. */ --- 287,294 ---- { float xval, yval, ypix, wpix; ! if (xonset>=0) xval = *(float *)(elem+xonset); else xval = indx*xinc; ! if (yonset>=0) yval = *(float *)(elem+yonset); else yval = 0; ypix = glist_ytopixels(glist, basey + yval); ! if (wonset>=0) { /* found "w" field which controls linewidth. */ Index: g_bang.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v retrieving revision 1.1.1.3.2.2.2.1 retrieving revision 1.1.1.3.2.2.2.2 diff -C2 -d -r1.1.1.3.2.2.2.1 -r1.1.1.3.2.2.2.2 *** g_bang.c 5 Mar 2004 19:27:51 -0000 1.1.1.3.2.2.2.1 --- g_bang.c 6 Mar 2004 22:19:41 -0000 1.1.1.3.2.2.2.2 *************** *** 47,51 **** t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol); --- 47,51 ---- t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bang_draw .x%x.c %x %d %d %d %d %d %d #%6.6x\n", canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol); *************** *** 68,72 **** t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol); --- 68,72 ---- t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bang_draw .x%x.c %x %d %d %d %d %d %d #%6.6x\n", canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_gui.x_bcol); *************** *** 83,88 **** { t_canvas *canvas=glist_getcanvas(glist); ! ! sys_vgui("bluebox_erase .x%x.c %xBASE\n", canvas, x); sys_vgui(".x%x.c delete %xBUT\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); --- 83,87 ---- { t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bang_erase .x%x.c %x\n", canvas, x); sys_vgui(".x%x.c delete %xBUT\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); *************** *** 248,265 **** static void bng_bang(t_bng *x)/*wird nur mehr gesendet, wenn snd != rcv*/ { ! if(!x->x_gui.x_isa.x_locked) ! { ! bng_set(x); ! bng_bout1(x); ! } } static void bng_bang2(t_bng *x)/*wird immer gesendet, wenn moeglich*/ { ! if(!x->x_gui.x_isa.x_locked) ! { ! bng_set(x); ! bng_bout2(x); ! } } --- 247,256 ---- static void bng_bang(t_bng *x)/*wird nur mehr gesendet, wenn snd != rcv*/ { ! if(!x->x_gui.x_isa.x_locked) {bng_set(x); bng_bout1(x);} } static void bng_bang2(t_bng *x)/*wird immer gesendet, wenn moeglich*/ { ! if(!x->x_gui.x_isa.x_locked) {bng_set(x); bng_bout2(x);} } *************** *** 283,288 **** static void bng_click(t_bng *x, t_floatarg xpos, t_floatarg ypos, t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { ! bng_set(x); ! bng_bout2(x); } --- 274,278 ---- static void bng_click(t_bng *x, t_floatarg xpos, t_floatarg ypos, t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { ! bng_set(x); bng_bout2(x); } *************** *** 294,321 **** } ! static void bng_float(t_bng *x, t_floatarg f) ! {bng_bang2(x);} ! ! static void bng_symbol(t_bng *x, t_symbol *s) ! {bng_bang2(x);} ! ! static void bng_pointer(t_bng *x, t_gpointer *gp) ! {bng_bang2(x);} ! ! static void bng_list(t_bng *x, t_symbol *s, int ac, t_atom *av) ! { ! bng_bang2(x); ! } ! ! static void bng_anything(t_bng *x, t_symbol *s, int argc, t_atom *argv) ! {bng_bang2(x);} static void bng_loadbang(t_bng *x) { ! if(!sys_noloadbang && x->x_gui.x_isa.x_loadinit) ! { ! bng_set(x); ! bng_bout2(x); ! } } --- 284,296 ---- } ! static void bng_float(t_bng *x, t_floatarg f) {bng_bang2(x);} ! static void bng_symbol(t_bng *x, t_symbol *s) {bng_bang2(x);} ! static void bng_pointer(t_bng *x, t_gpointer *gp) {bng_bang2(x);} ! static void bng_list(t_bng *x, t_symbol *s, int ac, t_atom *av) {bng_bang2(x);} ! static void bng_anything(t_bng *x, t_symbol *s, int argc, t_atom *argv) {bng_bang2(x);} static void bng_loadbang(t_bng *x) { ! if(!sys_noloadbang && x->x_gui.x_isa.x_loadinit) {bng_set(x); bng_bout2(x);} } Index: g_canvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.c,v retrieving revision 1.1.1.4.2.7.2.1 retrieving revision 1.1.1.4.2.7.2.2 diff -C2 -d -r1.1.1.4.2.7.2.1 -r1.1.1.4.2.7.2.2 *** g_canvas.c 5 Mar 2004 19:27:51 -0000 1.1.1.4.2.7.2.1 --- g_canvas.c 6 Mar 2004 22:19:41 -0000 1.1.1.4.2.7.2.2 *************** *** 154,166 **** } ! 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) --- 154,159 ---- } ! 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) *************** *** 862,874 **** t_linetraverser t; t_outconnect *oc; ! // fprintf(stderr,".x%x.c\n",glist_getcanvas(x)); ! { ! linetraverser_start(&t, x); ! while (oc = linetraverser_next(&t)) { ! int x1=t.tr_lx1, y1=t.tr_ly1; ! int x2=t.tr_lx2, y2=t.tr_ly2; ! sys_vgui("wire_draw .x%x.c l%x %d %d %d %d %d\n", ! glist_getcanvas(x), oc, (outlet_getsymbol(t.tr_outlet) == &s_signal ? 2:1), x1, y1, x2, y2); ! } } } --- 855,864 ---- t_linetraverser t; t_outconnect *oc; ! linetraverser_start(&t, x); ! while (oc = linetraverser_next(&t)) { ! int x1=t.tr_lx1, y1=t.tr_ly1; ! int x2=t.tr_lx2, y2=t.tr_ly2; ! sys_vgui("wire_draw .x%x.c l%x %d %d %d %d %d\n", ! glist_getcanvas(x), oc, (outlet_getsymbol(t.tr_outlet) == &s_signal ? 2:1), x1, y1, x2, y2); } } *************** *** 878,885 **** t_linetraverser t; t_outconnect *oc; - linetraverser_start(&t, x); ! while (oc = linetraverser_next(&t)) ! { if (t.tr_ob == text || t.tr_ob2 == text) { int x1=t.tr_lx1, y1=t.tr_ly1; --- 868,873 ---- t_linetraverser t; t_outconnect *oc; linetraverser_start(&t, x); ! while (oc = linetraverser_next(&t)) { if (t.tr_ob == text || t.tr_ob2 == text) { int x1=t.tr_lx1, y1=t.tr_ly1; *************** *** 1156,1163 **** /* return true if the "canvas" object is an abstraction (so we don't save its contents, fogr example.) */ ! int canvas_isabstraction(t_canvas *x) ! { ! return (x->gl_env != 0); ! } /* return true if the "canvas" object is a "table". */ --- 1144,1148 ---- /* return true if the "canvas" object is an abstraction (so we don't save its contents, fogr example.) */ ! int canvas_isabstraction(t_canvas *x) {return (x->gl_env != 0);} /* return true if the "canvas" object is a "table". */ Index: g_editor.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_editor.c,v retrieving revision 1.1.1.4.2.3.2.1 retrieving revision 1.1.1.4.2.3.2.2 diff -C2 -d -r1.1.1.4.2.3.2.1 -r1.1.1.4.2.3.2.2 *** g_editor.c 5 Mar 2004 19:27:51 -0000 1.1.1.4.2.3.2.1 --- g_editor.c 6 Mar 2004 22:19:41 -0000 1.1.1.4.2.3.2.2 *************** *** 460,475 **** } } ! if (mode == UCUT_TEXT) ! { ! buf->u_objectbuf = canvas_docopy(x); ! } ! else if (mode == UCUT_CUT) ! { ! buf->u_objectbuf = 0; ! } ! else if (mode == UCUT_CLEAR) ! { ! buf->u_objectbuf = canvas_docopy(x); ! } return (buf); } --- 460,466 ---- } } ! if (mode == UCUT_TEXT) {buf->u_objectbuf = canvas_docopy(x);} ! else if (mode == UCUT_CUT) {buf->u_objectbuf = 0;} ! else if (mode == UCUT_CLEAR) {buf->u_objectbuf = canvas_docopy(x);} return (buf); } *************** *** 527,536 **** else if (action == UNDO_FREE) { ! if (buf->u_objectbuf) ! binbuf_free(buf->u_objectbuf); ! if (buf->u_reconnectbuf) ! binbuf_free(buf->u_reconnectbuf); ! if (buf->u_redotextbuf) ! binbuf_free(buf->u_redotextbuf); t_freebytes(buf, sizeof(*buf)); } --- 518,524 ---- else if (action == UNDO_FREE) { ! if (buf->u_objectbuf) binbuf_free(buf->u_objectbuf); ! if (buf->u_reconnectbuf) binbuf_free(buf->u_reconnectbuf); ! if (buf->u_redotextbuf) binbuf_free(buf->u_redotextbuf); t_freebytes(buf, sizeof(*buf)); } *************** *** 1261,1268 **** else closest2 = 0, hotspot2 = x21; ! if (closest1 >= noutlet1) ! closest1 = noutlet1 - 1; ! if (closest2 >= ninlet2) ! closest2 = ninlet2 - 1; if (canvas_isconnected (x, ob1, closest1, ob2, closest2)) --- 1249,1254 ---- else closest2 = 0, hotspot2 = x21; ! if (closest1 >= noutlet1) closest1 = noutlet1-1; ! if (closest2 >= ninlet2) closest2 = ninlet2-1; if (canvas_isconnected (x, ob1, closest1, ob2, closest2)) *************** *** 1447,1458 **** } #ifdef MACOSX ! if (keynum == 30) ! keynum = 0, gotkeysym = gensym("Up"); ! else if (keynum == 31) ! keynum = 0, gotkeysym = gensym("Down"); ! else if (keynum == 28) ! keynum = 0, gotkeysym = gensym("Left"); ! else if (keynum == 29) ! keynum = 0, gotkeysym = gensym("Right"); #endif if (keynumsym->s_thing && down) --- 1433,1440 ---- } #ifdef MACOSX ! if (keynum == 30) keynum = 0, gotkeysym = gensym("Up"); ! else if (keynum == 31) keynum = 0, gotkeysym = gensym("Down"); ! else if (keynum == 28) keynum = 0, gotkeysym = gensym("Left"); ! else if (keynum == 29) keynum = 0, gotkeysym = gensym("Right"); #endif if (keynumsym->s_thing && down) *************** *** 1517,1527 **** /* post("motion %d %d", xpos, ypos); */ int mod = fmod; ! if (!x->gl_editor) ! { ! bug("editor"); ! return; ! } sys_vgui(".x%x.c delete y\n",x); ! glist_setlastxy(x, xpos, ypos); if (x->gl_editor->e_onmotion == MA_MOVE) --- 1499,1505 ---- /* post("motion %d %d", xpos, ypos); */ int mod = fmod; ! if (!x->gl_editor) {bug("editor"); return;} sys_vgui(".x%x.c delete y\n",x); ! glist_setlastxy(x, xpos, ypos); if (x->gl_editor->e_onmotion == MA_MOVE) *************** *** 1674,1679 **** { int myindex1 = 0; ! if (!canvas_findbuf || !canvas_whichfind) ! return; if (!canvas_dofind(canvas_whichfind, &myindex1)) { --- 1652,1656 ---- { int myindex1 = 0; ! if (!canvas_findbuf || !canvas_whichfind) return; if (!canvas_dofind(canvas_whichfind, &myindex1)) { *************** *** 1737,1764 **** { if (seltail) ! { ! seltail->g_next = y; ! seltail = y; ! y->g_next = 0; ! } else ! { ! selhead = seltail = y; ! seltail->g_next = 0; ! } } else { if (nontail) ! { ! nontail->g_next = y; ! nontail = y; ! y->g_next = 0; ! } else ! { ! nonhead = nontail = y; ! nontail->g_next = 0; ! } } } --- 1714,1727 ---- { if (seltail) ! {seltail->g_next = y; seltail = y; y->g_next = 0;} else ! {selhead = seltail = y; seltail->g_next = 0;} } else { if (nontail) ! {nontail->g_next = y; nontail = y; y->g_next = 0;} else ! {nonhead = nontail = y; nontail->g_next = 0;} } } Index: g_graph.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_graph.c,v retrieving revision 1.1.1.3.2.3 retrieving revision 1.1.1.3.2.3.2.1 diff -C2 -d -r1.1.1.3.2.3 -r1.1.1.3.2.3.2.1 *** g_graph.c 25 Nov 2003 19:19:57 -0000 1.1.1.3.2.3 --- g_graph.c 6 Mar 2004 22:19:41 -0000 1.1.1.3.2.3.2.1 *************** *** 168,189 **** 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: --- 168,177 ---- 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 && g2) {if (f1 <= f2) goto put1; else goto put2;} ! else if (g1) goto put1; ! else if (g2) goto put2; else break; put1: Index: g_io.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_io.c,v retrieving revision 1.1.1.1.16.2 retrieving revision 1.1.1.1.16.2.2.1 diff -C2 -d -r1.1.1.1.16.2 -r1.1.1.1.16.2.2.1 *** g_io.c 25 Nov 2003 19:19:57 -0000 1.1.1.1.16.2 --- g_io.c 6 Mar 2004 22:19:41 -0000 1.1.1.1.16.2.2.1 *************** *** 62,93 **** static void vinlet_bang(t_vinlet *x) ! { ! outlet_bang(x->x_obj.ob_outlet); ! } static void vinlet_pointer(t_vinlet *x, t_gpointer *gp) ! { ! outlet_pointer(x->x_obj.ob_outlet, gp); ! } static void vinlet_float(t_vinlet *x, t_float f) ! { ! outlet_float(x->x_obj.ob_outlet, f); ! } static void vinlet_symbol(t_vinlet *x, t_symbol *s) ! { ! outlet_symbol(x->x_obj.ob_outlet, s); ! } static void vinlet_list(t_vinlet *x, t_symbol *s, int argc, t_atom *argv) ! { ! outlet_list(x->x_obj.ob_outlet, s, argc, argv); ! } static void vinlet_anything(t_vinlet *x, t_symbol *s, int argc, t_atom *argv) ! { ! outlet_anything(x->x_obj.ob_outlet, s, argc, argv); ! } static void vinlet_free(t_vinlet *x) --- 62,81 ---- static void vinlet_bang(t_vinlet *x) ! {outlet_bang(x->x_obj.ob_outlet);} static void vinlet_pointer(t_vinlet *x, t_gpointer *gp) ! {outlet_pointer(x->x_obj.ob_outlet, gp);} static void vinlet_float(t_vinlet *x, t_float f) ! {outlet_float(x->x_obj.ob_outlet, f);} static void vinlet_symbol(t_vinlet *x, t_symbol *s) ! {outlet_symbol(x->x_obj.ob_outlet, s);} static void vinlet_list(t_vinlet *x, t_symbol *s, int argc, t_atom *argv) ! {outlet_list(x->x_obj.ob_outlet, s, argc, argv);} static void vinlet_anything(t_vinlet *x, t_symbol *s, int argc, t_atom *argv) ! {outlet_anything(x->x_obj.ob_outlet, s, argc, argv);} static void vinlet_free(t_vinlet *x) *************** *** 329,360 **** static void voutlet_bang(t_voutlet *x) ! { ! outlet_bang(x->x_parentoutlet); ! } static void voutlet_pointer(t_voutlet *x, t_gpointer *gp) ! { ! outlet_pointer(x->x_parentoutlet, gp); ! } static void voutlet_float(t_voutlet *x, t_float f) ! { ! outlet_float(x->x_parentoutlet, f); ! } static void voutlet_symbol(t_voutlet *x, t_symbol *s) ! { ! outlet_symbol(x->x_parentoutlet, s); ! } static void voutlet_list(t_voutlet *x, t_symbol *s, int argc, t_atom *argv) ! { ! outlet_list(x->x_parentoutlet, s, argc, argv); ! } static void voutlet_anything(t_voutlet *x, t_symbol *s, int argc, t_atom *argv) ! { ! outlet_anything(x->x_parentoutlet, s, argc, argv); ! } static void voutlet_free(t_voutlet *x) --- 317,336 ---- static void voutlet_bang(t_voutlet *x) ! {outlet_bang(x->x_parentoutlet);} static void voutlet_pointer(t_voutlet *x, t_gpointer *gp) ! {outlet_pointer(x->x_parentoutlet, gp);} static void voutlet_float(t_voutlet *x, t_float f) ! {outlet_float(x->x_parentoutlet, f);} static void voutlet_symbol(t_voutlet *x, t_symbol *s) ! {outlet_symbol(x->x_parentoutlet, s);} static void voutlet_list(t_voutlet *x, t_symbol *s, int argc, t_atom *argv) ! {outlet_list(x->x_parentoutlet, s, argc, argv);} static void voutlet_anything(t_voutlet *x, t_symbol *s, int argc, t_atom *argv) ! {outlet_anything(x->x_parentoutlet, s, argc, argv);} static void voutlet_free(t_voutlet *x) Index: g_text.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_text.c,v retrieving revision 1.1.1.4.2.2.2.1 retrieving revision 1.1.1.4.2.2.2.2 diff -C2 -d -r1.1.1.4.2.2.2.1 -r1.1.1.4.2.2.2.2 *** g_text.c 5 Mar 2004 19:27:52 -0000 1.1.1.4.2.2.2.1 --- g_text.c 6 Mar 2004 22:19:41 -0000 1.1.1.4.2.2.2.2 *************** *** 184,241 **** } ! void canvas_bng(t_glist *gl, t_symbol *s, int argc, t_atom *argv) ! { ! canvas_iemguis(gl, gensym("bng")); ! } ! ! void canvas_toggle(t_glist *gl, t_symbol *s, int argc, t_atom *argv) ! { ! canvas_iemguis(gl, gensym("tgl")); ! } ! ! void canvas_vslider(t_glist *gl, t_symbol *s, int argc, t_atom *argv) ! { ! canvas_iemguis(gl, gensym("vsl")); ! } ! ! void canvas_hslider(t_glist *gl, t_symbol *s, int argc, t_atom *argv) ! { ! canvas_iemguis(gl, gensym("hsl")); ! } ! ! void canvas_hdial(t_glist *gl, t_symbol *s, int argc, t_atom *argv) ! { ! canvas_iemguis(gl, gensym("hdl")); ! } ! ! void canvas_vdial(t_glist *gl, t_symbol *s, int argc, t_atom *argv) ! { ! canvas_iemguis(gl, gensym("vdl")); ! } ! ! void canvas_hradio(t_glist *gl, t_symbol *s, int argc, t_atom *argv) ! { ! canvas_iemguis(gl, gensym("hradio")); ! } ! ! void canvas_vradio(t_glist *gl, t_symbol *s, int argc, t_atom *argv) ! { ! canvas_iemguis(gl, gensym("vradio")); ! } ! ! void canvas_vumeter(t_glist *gl, t_symbol *s, int argc, t_atom *argv) ! { ! canvas_iemguis(gl, gensym("vu")); ! } ! ! void canvas_mycnv(t_glist *gl, t_symbol *s, int argc, t_atom *argv) ! { ! canvas_iemguis(gl, gensym("cnv")); ! } ! void canvas_numbox(t_glist *gl, t_symbol *s, int argc, t_atom *argv) ! { ! canvas_iemguis(gl, gensym("nbx")); ! } /* iemlib */ --- 184,202 ---- } ! #define CONSTR(name1,name2) \ ! void canvas_##name1(t_glist *gl, t_symbol *s, int argc, t_atom *argv) \ ! { canvas_iemguis(gl, gensym(name2)); } ! CONSTR(bng, "bng"); ! CONSTR(toggle, "tgl"); ! CONSTR(vslider, "vsl"); ! CONSTR(hslider, "hsl"); ! CONSTR(vdial, "vdl"); ! CONSTR(hdial, "hdl"); ! CONSTR(vradio, "vradio"); ! CONSTR(hradio, "hradio"); ! CONSTR(vumeter, "vu"); ! CONSTR(mycnv, "cnv"); ! CONSTR(numbox, "nbx"); /* iemlib */ *************** *** 523,530 **** if (x->a_draglo != 0 || x->a_draghi != 0) { ! if (f < x->a_draglo) ! f = x->a_draglo; ! if (f > x->a_draghi) ! f = x->a_draghi; } gatom_float(x, f); --- 484,489 ---- if (x->a_draglo != 0 || x->a_draghi != 0) { ! if (f < x->a_draglo) f = x->a_draglo; ! if (f > x->a_draghi) f = x->a_draghi; } gatom_float(x, f); *************** *** 1158,1162 **** { sys_vgui("%s_erase .x%x.c %sR\n", text_classname(x), glist_getcanvas(glist), tag); ! glist_eraseiofor(glist, x, tag); } --- 1117,1121 ---- { sys_vgui("%s_erase .x%x.c %sR\n", text_classname(x), glist_getcanvas(glist), tag); ! sys_vgui("io_erase .x%x.c %sBASE\n",glist_getcanvas(glist),tag); }

1 0

pd/src g_hslider.c,1.1.1.3.2.2.2.1,1.1.1.3.2.2.2.2 g_vslider.c,1.1.1.3.2.2.2.1,1.1.1.3.2.2.2.2 u_object.tk,1.1.2.3,1.1.2.4
by matju＠users.sourceforge.net 06 Mar '04

06 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24471 Modified Files: Tag: impd_0_37 g_hslider.c g_vslider.c u_object.tk Log Message: moving some slider code to Tcl Index: g_hslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v retrieving revision 1.1.1.3.2.2.2.1 retrieving revision 1.1.1.3.2.2.2.2 diff -C2 -d -r1.1.1.3.2.2.2.1 -r1.1.1.3.2.2.2.2 *** g_hslider.c 5 Mar 2004 19:27:52 -0000 1.1.1.3.2.2.2.1 --- g_hslider.c 6 Mar 2004 22:14:39 -0000 1.1.1.3.2.2.2.2 *************** *** 34,61 **** { t_canvas *canvas=glist_getcanvas(glist); - int ypos=text_ypix(&x->x_gui.x_obj, glist); - if (glist_isvisible(glist)) { ! int r = text_xpix(&x->x_gui.x_obj, glist) + (x->x_val + 50)/100; ! sys_vgui(".x%x.c coords %xKNOB %d %d %d %d\n", ! canvas, x, r, ypos+1, ! r, ypos + x->x_gui.x_h); ! if(x->x_val == x->x_center) ! { ! if(!x->x_thick) ! { ! sys_vgui(".x%x.c itemconfigure %xKNOB -width 7\n", canvas, x); ! x->x_thick = 1; ! } ! } ! else ! { ! if(x->x_thick) ! { ! sys_vgui(".x%x.c itemconfigure %xKNOB -width 3\n", canvas, x); ! x->x_thick = 0; ! } ! } } } --- 34,40 ---- { t_canvas *canvas=glist_getcanvas(glist); if (glist_isvisible(glist)) { ! sys_vgui("slider_set .x%x.c %x %d 0 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); } } *************** *** 65,77 **** int xpos=text_xpix(&x->x_gui.x_obj, glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); - int r = xpos + (x->x_val + 50)/100; t_canvas *canvas=glist_getcanvas(glist); ! ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); ! sys_vgui(".x%x.c create line %d %d %d %d -width 3 -fill #%6.6x -tags %xKNOB\n", ! canvas, r, ypos+1, r, ! ypos + x->x_gui.x_h, x->x_gui.x_fcol, x); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", --- 44,52 ---- int xpos=text_xpix(&x->x_gui.x_obj, glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d 0 #%6.6x\n", canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); ! sys_vgui("slider_set .x%x.c %x %d 0 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", *************** *** 86,98 **** int xpos=text_xpix(&x->x_gui.x_obj, glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); - int r = xpos + (x->x_val + 50)/100; t_canvas *canvas=glist_getcanvas(glist); ! ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); ! sys_vgui(".x%x.c coords %xKNOB %d %d %d %d\n", ! canvas, x, r, ypos+1, ! r, ypos + x->x_gui.x_h); sys_vgui(".x%x.c coords %xLABEL %d %d\n", canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); --- 61,69 ---- int xpos=text_xpix(&x->x_gui.x_obj, glist); int ypos=text_ypix(&x->x_gui.x_obj, glist); t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d 0 #%6.6x\n", canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); ! sys_vgui("slider_set .x%x.c %x %d 0 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); sys_vgui(".x%x.c coords %xLABEL %d %d\n", canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); *************** *** 102,108 **** { t_canvas *canvas=glist_getcanvas(glist); ! ! sys_vgui("bluebox_erase .x%x.c %xBASE\n", canvas, x); ! sys_vgui(".x%x.c delete %xKNOB\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); } --- 73,77 ---- { t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("slider_erase .x%x.c %x\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); } *************** *** 111,120 **** { t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui(".x%x.c itemconfigure %xLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); ! sys_vgui(".x%x.c itemconfigure %xKNOB -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol); sys_vgui("slider_select .x%x.c %xBASE %d\n", canvas, x, x->x_gui.x_fsf.x_selected); } --- 80,89 ---- { t_canvas *canvas=glist_getcanvas(glist); ! int xpos=text_xpix(&x->x_gui.x_obj, glist); sys_vgui(".x%x.c itemconfigure %xLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); ! sys_vgui("slider_set .x%x.c %x %d 0 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); sys_vgui("slider_select .x%x.c %xBASE %d\n", canvas, x, x->x_gui.x_fsf.x_selected); } *************** *** 123,137 **** { t_canvas *canvas=glist_getcanvas(glist); ! ! if(x->x_gui.x_fsf.x_selected) ! { ! sys_vgui("slider_select .x%x.c %xBASE %d\n", canvas, x, x->x_gui.x_fsf.x_selected); ! sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); ! } ! else ! { ! sys_vgui("slider_select .x%x.c %xBASE %d\n", canvas, x, x->x_gui.x_fsf.x_selected); ! sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol); ! } } --- 92,98 ---- { t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("slider_select .x%x.c %x %d\n", canvas, x, x->x_gui.x_fsf.x_selected); ! sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, ! x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol); } *************** *** 201,215 **** if(x->x_lin0_log1) { ! if((min == 0.0)&&(max == 0.0)) ! max = 1.0; ! if(max > 0.0) ! { ! if(min <= 0.0) ! min = 0.01*max; ! } ! else ! { ! if(min > 0.0) ! max = 0.01*min; } } --- 162,170 ---- if(x->x_lin0_log1) { ! if(min == 0.0 && max == 0.0) max = 1.0; ! if(max > 0.0) { ! if(min <= 0.0) min = 0.01*max; ! } else { ! if(min > 0.0) max = 0.01*min; } } *************** *** 257,271 **** if(x->x_gui.x_isa.x_reverse) /* bugfix */ { ! if(f > x->x_min) ! f = x->x_min; ! if(f < x->x_max) ! f = x->x_max; } else { ! if(f > x->x_max) ! f = x->x_max; ! if(f < x->x_min) ! f = x->x_min; } if(x->x_lin0_log1) --- 212,222 ---- if(x->x_gui.x_isa.x_reverse) /* bugfix */ { ! if(f > x->x_min) f = x->x_min; ! if(f < x->x_max) f = x->x_max; } else { ! if(f > x->x_max) f = x->x_max; ! if(f < x->x_min) f = x->x_min; } if(x->x_lin0_log1) Index: g_vslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vslider.c,v retrieving revision 1.1.1.3.2.2.2.1 retrieving revision 1.1.1.3.2.2.2.2 diff -C2 -d -r1.1.1.3.2.2.2.1 -r1.1.1.3.2.2.2.2 *** g_vslider.c 5 Mar 2004 19:27:52 -0000 1.1.1.3.2.2.2.1 --- g_vslider.c 6 Mar 2004 22:14:39 -0000 1.1.1.3.2.2.2.2 *************** *** 33,44 **** static void vslider_draw_update(t_vslider *x, t_glist *glist) { if (glist_isvisible(glist)) { ! int r = text_ypix(&x->x_gui.x_obj, glist) + x->x_gui.x_h - (x->x_val + 50)/100; ! int xpos=text_xpix(&x->x_gui.x_obj, glist); ! ! sys_vgui(".x%x.c coords %xKNOB %d %d %d %d\n", ! glist_getcanvas(glist), x, xpos+1, r, ! xpos + x->x_gui.x_w, r); } } --- 33,40 ---- static void vslider_draw_update(t_vslider *x, t_glist *glist) { + t_canvas *canvas=glist_getcanvas(glist); if (glist_isvisible(glist)) { ! sys_vgui("slider_set .x%x.c %x %d 1 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); } } *************** *** 52,62 **** t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); ! ! sys_vgui(".x%x.c create line %d %d %d %d -width 3 -fill #%6.6x -tags %xKNOB\n", ! canvas, xpos+1, r, ! xpos + x->x_gui.x_w, r, x->x_gui.x_fcol, x); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", --- 48,55 ---- t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d 1 #%6.6x\n", canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); ! sys_vgui("slider_set .x%x.c %x %d 1 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", *************** *** 72,81 **** int r = ypos + x->x_gui.x_h - (x->x_val + 50)/100; t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); ! sys_vgui(".x%x.c coords %xKNOB %d %d %d %d\n", ! canvas, x, xpos+1, r, ! xpos + x->x_gui.x_w, r); sys_vgui(".x%x.c coords %xLABEL %d %d\n", canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); --- 65,72 ---- int r = ypos + x->x_gui.x_h - (x->x_val + 50)/100; t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("slider_draw .x%x.c %x %d %d %d %d %d %d 1 #%6.6x\n", canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able,x->x_gui.x_bcol); ! sys_vgui("slider_set .x%x.c %x %d 1 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); sys_vgui(".x%x.c coords %xLABEL %d %d\n", canvas, x, xpos+x->x_gui.x_ldx, ypos+x->x_gui.x_ldy); *************** *** 85,91 **** { t_canvas *canvas=glist_getcanvas(glist); ! ! sys_vgui("bluebox_erase .x%x.c %xBASE\n", canvas, x); ! sys_vgui(".x%x.c delete %xKNOB\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); } --- 76,80 ---- { t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("slider_erase .x%x.c %x\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); } *************** *** 101,106 **** x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); ! sys_vgui(".x%x.c itemconfigure %xKNOB -fill #%6.6x\n", canvas, ! x, x->x_gui.x_fcol); sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, --- 90,94 ---- x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); ! sys_vgui("slider_set .x%x.c %x %d 1 #%6.6x\n", canvas, x, x->x_val, x->x_gui.x_fcol); sys_vgui("bluebox_draw .x%x.c %xBASE %d %d %d %d %d %d #%6.6x\n", canvas, x, xpos, ypos, xpos+x->x_gui.x_w, ypos+x->x_gui.x_h, *************** *** 111,125 **** { t_canvas *canvas=glist_getcanvas(glist); ! ! if(x->x_gui.x_fsf.x_selected) ! { ! sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); ! sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); ! } ! else ! { ! sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL); ! sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol); ! } } --- 99,105 ---- { t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("slider_select .x%x.c %x %d\n", canvas, x, x->x_gui.x_fsf.x_selected); ! sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, ! x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol); } Index: u_object.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/u_object.tk,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** u_object.tk 6 Mar 2004 20:56:29 -0000 1.1.2.3 --- u_object.tk 6 Mar 2004 22:14:39 -0000 1.1.2.4 *************** *** 247,250 **** --- 247,288 ---- } + proc slider_draw {canvas tag x1 y1 x2 y2 ins outs orient colour} { + set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] + bluebox_draw $canvas ${tag}BASE $x1 $y1 $x2 $y2 $ins $outs $colour + if {$isnew} { + set color [bluify #ffffff] + $canvas create rectangle $x1 $y1 $x1 $y1 -tags ${tag}KNOB \ + -outline #000000 -fill [darker $color] + } + } + + proc slider_set {canvas tag value orient colour} { + post_to_gui "slider_set: $value $orient\n" + set pos [$canvas coords ${tag}BASE] + set x1 [lindex $pos 0] + set y1 [lindex $pos 1] + if {$orient} { + set size [expr [lindex $pos 2]-$x1] + set y1 [expr [lindex $pos 3]-($value+50)/100] + set y2 [expr $y1+2] + $canvas coords ${tag}KNOB \ + [expr $x1+2] $y1 \ + [expr $x1+$size-2] $y2 + } { + set size [expr [lindex $pos 3]-$y1] + set x1 [expr $x1+($value+50)/100] + set x2 [expr $x1+2] + set y2 [expr $y1+$size] + $canvas coords ${tag}KNOB \ + $x1 [expr $y1+2] \ + $x2 [expr $y1+$size-2] + } + } + + proc slider_erase {canvas tag} { + bluebox_erase $canvas ${tag}BASE + $canvas delete ${tag}KNOB + } + proc bang_draw {canvas tag x1 y1 x2 y2 ins outs colour} { bluebox_draw $canvas ${tag}BASE $x1 $y1 $x2 $y2 $ins $outs $colour

1 0

pd/src u_object.tk,1.1.2.2,1.1.2.3 g_hdial.c,1.1.1.4.2.2.2.1,1.1.1.4.2.2.2.2 g_vdial.c,1.1.1.4.2.2.2.1,1.1.1.4.2.2.2.2
by matju＠users.sourceforge.net 06 Mar '04

06 Mar '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10662 Modified Files: Tag: impd_0_37 u_object.tk g_hdial.c g_vdial.c Log Message: fixing my bugs Index: u_object.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/u_object.tk,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** u_object.tk 5 Mar 2004 18:59:50 -0000 1.1.2.2 --- u_object.tk 6 Mar 2004 20:56:29 -0000 1.1.2.3 *************** *** 218,222 **** proc radio_draw {canvas tag x1 y1 x2 y2 ins outs orient number colour} { set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! bluebox_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs $colour if {$orient} {set size [expr $y2-$y1]} {set size [expr $x2-$x1]} set size [expr $size/$number] --- 218,222 ---- proc radio_draw {canvas tag x1 y1 x2 y2 ins outs orient number colour} { set isnew [expr [llength [$canvas gettags ${tag}BASE]] == 0] ! bluebox_draw $canvas ${tag}BASE $x1 $y1 $x2 $y2 $ins $outs $colour if {$orient} {set size [expr $y2-$y1]} {set size [expr $x2-$x1]} set size [expr $size/$number] *************** *** 241,242 **** --- 241,257 ---- $canvas itemconfigure ${tag}BUT$value -fill #000000 } + + proc radio_erase {canvas tag} { + bluebox_erase $canvas ${tag}BASE + $canvas delete ${tag}BUT + } + + proc bang_draw {canvas tag x1 y1 x2 y2 ins outs colour} { + bluebox_draw $canvas ${tag}BASE $x1 $y1 $x2 $y2 $ins $outs $colour + io_draw $canvas $tag $x1 $y1 $x2 $y2 $ins $outs + } + + proc bang_erase {canvas tag} { + bluebox_erase $canvas ${tag}BASE + io_erase $canvas $tag + } Index: g_hdial.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hdial.c,v retrieving revision 1.1.1.4.2.2.2.1 retrieving revision 1.1.1.4.2.2.2.2 diff -C2 -d -r1.1.1.4.2.2.2.1 -r1.1.1.4.2.2.2.2 *** g_hdial.c 5 Mar 2004 19:27:51 -0000 1.1.1.4.2.2.2.1 --- g_hdial.c 6 Mar 2004 20:56:29 -0000 1.1.1.4.2.2.2.2 *************** *** 34,47 **** void hradio_draw_update(t_hradio *x, t_glist *glist) { ! if(glist_isvisible(glist)) ! { t_canvas *canvas=glist_getcanvas(glist); ! ! sys_vgui(".x%x.c itemconfigure %xBUT%d -fill #%6.6x -outline #%6.6x\n", ! canvas, x, x->x_on_old, ! x->x_gui.x_bcol, x->x_gui.x_bcol); ! sys_vgui(".x%x.c itemconfigure %xBUT%d -fill #%6.6x -outline #%6.6x\n", ! canvas, x, x->x_on, ! x->x_gui.x_fcol, x->x_gui.x_fcol); } } --- 34,40 ---- void hradio_draw_update(t_hradio *x, t_glist *glist) { ! if(glist_isvisible(glist)) { t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); } } *************** *** 50,72 **** { t_canvas *canvas=glist_getcanvas(glist); ! int n=x->x_number, i, dx=x->x_gui.x_w, s4=dx/4; ! int yy11=text_ypix(&x->x_gui.x_obj, glist), yy12=yy11+dx; ! int yy21=yy11+s4, yy22=yy12-s4; ! int xx11b=text_xpix(&x->x_gui.x_obj, glist), xx11=xx11b, xx21=xx11b+s4; ! int xx22=xx11b+dx-s4; ! int xpos=text_xpix(&x->x_gui.x_obj, glist); ! int ypos=text_ypix(&x->x_gui.x_obj, glist); ! ! sys_vgui("radio_draw .x%x.c %xBASE %d %d %d %d %d %d 0 %d #%6.6x\n", ! canvas, x, xx11, yy11, xx11+dx*x->x_number, yy12, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_number,x->x_gui.x_bcol); sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); ! sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", ! canvas, xx11b+x->x_gui.x_ldx, yy11+x->x_gui.x_ldy, ! strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", ! x->x_gui.x_font, x->x_gui.x_fontsize, ! x->x_gui.x_lcol, x); } --- 43,59 ---- { t_canvas *canvas=glist_getcanvas(glist); ! int n=x->x_number; ! int x1=text_xpix(&x->x_gui.x_obj, glist), x2=x1+x->x_gui.x_w*x->x_number; ! int y1=text_ypix(&x->x_gui.x_obj, glist), y2=y1+x->x_gui.x_h; ! sys_vgui("radio_draw .x%x.c %x %d %d %d %d %d %d 0 %d #%6.6x\n", ! canvas, x, x1, y1, x2, y2, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_number,x->x_gui.x_bcol); sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); ! sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ ! -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", ! canvas, x1+x->x_gui.x_ldx, y1+x->x_gui.x_ldy, ! strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", ! x->x_gui.x_font, x->x_gui.x_fontsize, x->x_gui.x_lcol, x); } *************** *** 74,94 **** { t_canvas *canvas=glist_getcanvas(glist); ! int n=x->x_number, i, dx=x->x_gui.x_w, s4=dx/4; ! int yy11=text_ypix(&x->x_gui.x_obj, glist), yy12=yy11+dx; ! int yy21=yy11+s4, yy22=yy12-s4; ! int xx11b=text_xpix(&x->x_gui.x_obj, glist), xx11=xx11b, xx21=xx11b+s4; ! int xx22=xx11b+dx-s4; ! int xpos=text_xpix(&x->x_gui.x_obj, glist); ! int ypos=text_ypix(&x->x_gui.x_obj, glist); ! ! sys_vgui("radio_draw .x%x.c %xBASE %d %d %d %d %d %d 0 %d #%6.6x\n", ! canvas, x, xx11, yy11, xx11+dx*x->x_number, yy12, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_number,x->x_gui.x_bcol); - xx11 = xx11b; - xx21=xx11b+s4; - xx22=xx11b+dx-s4; sys_vgui(".x%x.c coords %xLABEL %d %d\n", ! canvas, x, xx11b+x->x_gui.x_ldx, yy11+x->x_gui.x_ldy); } --- 61,73 ---- { t_canvas *canvas=glist_getcanvas(glist); ! int n=x->x_number; ! int x1=text_xpix(&x->x_gui.x_obj, glist), x2=x1+x->x_gui.x_w*x->x_number; ! int y1=text_ypix(&x->x_gui.x_obj, glist), y2=y1+x->x_gui.x_h; ! sys_vgui("radio_draw .x%x.c %x %d %d %d %d %d %d 0 %d #%6.6x\n", ! canvas, x, x1, y1, x2, y2, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_number,x->x_gui.x_bcol); sys_vgui(".x%x.c coords %xLABEL %d %d\n", ! canvas, x, x1+x->x_gui.x_ldx, y1+x->x_gui.x_ldy); } *************** *** 96,106 **** { t_canvas *canvas=glist_getcanvas(glist); ! int n=x->x_number, i; ! ! for(i=0; i<n; i++) ! { ! sys_vgui("bluebox_erase .x%x.c %xBASE%d\n", canvas, x, i); ! sys_vgui(".x%x.c delete %xBUT%d\n", canvas, x, i); ! } sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); } --- 75,79 ---- { t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("radio_erase .x%x.c %x\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); } *************** *** 108,126 **** void hradio_draw_config(t_hradio* x, t_glist* glist) { ! t_canvas *canvas=glist_getcanvas(glist); ! int n=x->x_number, i; ! ! sys_vgui(".x%x.c itemconfigure %xLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", ! canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, ! x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, ! strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); ! for(i=0; i<n; i++) ! { ! sys_vgui(".x%x.c itemconfigure %xBASE%d -fill #%6.6x\n", canvas, x, i, ! x->x_gui.x_bcol); ! sys_vgui(".x%x.c itemconfigure %xBUT%d -fill #%6.6x -outline #%6.6x\n", canvas, x, i, ! (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol, ! (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol); ! } } --- 81,85 ---- void hradio_draw_config(t_hradio* x, t_glist* glist) { ! hradio_draw_new(x,glist); } *************** *** 128,157 **** { t_canvas *canvas=glist_getcanvas(glist); ! int n=x->x_number, i; ! ! if(x->x_gui.x_fsf.x_selected) ! { ! for(i=0; i<n; i++) ! { ! sys_vgui(".x%x.c itemconfigure %xBASE%d -outline #%6.6x\n", canvas, x, i, ! IEM_GUI_COLOR_SELECTED); ! } ! sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); ! } ! else ! { ! for(i=0; i<n; i++) ! { ! sys_vgui(".x%x.c itemconfigure %xBASE%d -outline #%6.6x\n", canvas, x, i, ! IEM_GUI_COLOR_NORMAL); ! } ! sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, ! x->x_gui.x_lcol); ! } } void hradio_draw(t_hradio *x, t_glist *glist, int mode) { ! if(mode == IEM_GUI_DRAW_MODE_UPDATE) hradio_draw_update(x, glist); else if(mode == IEM_GUI_DRAW_MODE_MOVE) hradio_draw_move(x, glist); else if(mode == IEM_GUI_DRAW_MODE_NEW) hradio_draw_new(x, glist); --- 87,96 ---- { t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bluebox_select .x%x.c %xBASE %d\n", canvas, x, x->x_gui.x_fsf.x_selected); } void hradio_draw(t_hradio *x, t_glist *glist, int mode) { ! if (mode == IEM_GUI_DRAW_MODE_UPDATE) hradio_draw_update(x, glist); else if(mode == IEM_GUI_DRAW_MODE_MOVE) hradio_draw_move(x, glist); else if(mode == IEM_GUI_DRAW_MODE_NEW) hradio_draw_new(x, glist); *************** *** 223,227 **** { t_symbol *srl[3]; ! int a = (int)atom_getintarg(0, argc, argv); int chg = (int)atom_getintarg(4, argc, argv); int num = (int)atom_getintarg(6, argc, argv); --- 162,166 ---- { t_symbol *srl[3]; ! int a = (int)atom_getintarg(0, argc, argv); int chg = (int)atom_getintarg(4, argc, argv); int num = (int)atom_getintarg(6, argc, argv); Index: g_vdial.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vdial.c,v retrieving revision 1.1.1.4.2.2.2.1 retrieving revision 1.1.1.4.2.2.2.2 diff -C2 -d -r1.1.1.4.2.2.2.1 -r1.1.1.4.2.2.2.2 *** g_vdial.c 5 Mar 2004 19:27:52 -0000 1.1.1.4.2.2.2.1 --- g_vdial.c 6 Mar 2004 20:56:29 -0000 1.1.1.4.2.2.2.2 *************** *** 27,40 **** void vradio_draw_update(t_vradio *x, t_glist *glist) { ! if(glist_isvisible(glist)) ! { t_canvas *canvas=glist_getcanvas(glist); ! ! sys_vgui(".x%x.c itemconfigure %xBUT%d -fill #%6.6x -outline #%6.6x\n", ! canvas, x, x->x_on_old, ! x->x_gui.x_bcol, x->x_gui.x_bcol); ! sys_vgui(".x%x.c itemconfigure %xBUT%d -fill #%6.6x -outline #%6.6x\n", ! canvas, x, x->x_on, ! x->x_gui.x_fcol, x->x_gui.x_fcol); } } --- 27,33 ---- void vradio_draw_update(t_vradio *x, t_glist *glist) { ! if(glist_isvisible(glist)) { t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); } } *************** *** 43,77 **** { t_canvas *canvas=glist_getcanvas(glist); ! int n=x->x_number, i, dy=x->x_gui.x_h, s4=dy/4; ! int yy11b=text_ypix(&x->x_gui.x_obj, glist); ! int yy11=yy11b, yy12=yy11+dy; ! int yy21=yy11+s4, yy22=yy12-s4; ! int xx11=text_xpix(&x->x_gui.x_obj, glist), xx12=xx11+dy; ! int xx21=xx11+s4, xx22=xx12-s4; ! int xpos=text_xpix(&x->x_gui.x_obj, glist); ! int ypos=text_ypix(&x->x_gui.x_obj, glist); ! ! sys_vgui("radio_draw .x%x.c %xBASE %d %d %d %d %d %d 0 %d #%6.6x\n", ! canvas, x, xx11, yy11, xx12, yy11+dy*x->x_number, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_number,x->x_gui.x_bcol); sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); - /* - for(i=0; i<n; i++) - { - sys_vgui(".x%x.c create rectangle %d %d %d %d -fill #%6.6x -outline #%6.6x -tags %xBUT%d\n", - canvas, xx21, yy21, xx22, yy22, - (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol, - (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol, x, i); - yy11 += dy; - yy12 += dy; - yy21 += dy; - yy22 += dy; - } - */ - //sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", ! canvas, xx11+x->x_gui.x_ldx, yy11b+x->x_gui.x_ldy, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", x->x_gui.x_font, x->x_gui.x_fontsize, --- 36,50 ---- { t_canvas *canvas=glist_getcanvas(glist); ! int n=x->x_number; ! int x1=text_xpix(&x->x_gui.x_obj, glist), x2=x1+x->x_gui.x_w; ! int y1=text_ypix(&x->x_gui.x_obj, glist), y2=y1+x->x_gui.x_h*x->x_number; ! sys_vgui("radio_draw .x%x.c %x %d %d %d %d %d %d 1 %d #%6.6x\n", ! canvas, x, x1, y1, x2, y2, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_number,x->x_gui.x_bcol); sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); sys_vgui(".x%x.c create text %d %d -text {%s} -anchor w \ -font {%s %d bold} -fill #%6.6x -tags %xLABEL\n", ! canvas, x1+x->x_gui.x_ldx, y1+x->x_gui.x_ldy, strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"", x->x_gui.x_font, x->x_gui.x_fontsize, *************** *** 82,101 **** { t_canvas *canvas=glist_getcanvas(glist); ! int n=x->x_number, i, dy=x->x_gui.x_h, s4=dy/4; ! int yy11b=text_ypix(&x->x_gui.x_obj, glist); ! int yy11=yy11b, yy12=yy11+dy; ! int yy21=yy11+s4, yy22=yy12-s4; ! int xx11=text_xpix(&x->x_gui.x_obj, glist), xx12=xx11+dy; ! int xx21=xx11+s4, xx22=xx12-s4; ! int xpos=text_xpix(&x->x_gui.x_obj, glist); ! int ypos=text_ypix(&x->x_gui.x_obj, glist); ! ! sys_vgui("radio_draw .x%x.c %xBASE %d %d %d %d %d %d 0 %d #%6.6x\n", ! canvas, x, xx11, yy11, xx12, yy12+dy*x->x_number, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_number,x->x_gui.x_bcol); sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); sys_vgui(".x%x.c coords %xLABEL %d %d\n", ! canvas, x, xx11+x->x_gui.x_ldx, yy11b+x->x_gui.x_ldy); } --- 55,68 ---- { t_canvas *canvas=glist_getcanvas(glist); ! int n=x->x_number; ! int x1=text_xpix(&x->x_gui.x_obj, glist), x2=x1+x->x_gui.x_w; ! int y1=text_ypix(&x->x_gui.x_obj, glist), y2=y1+x->x_gui.x_h*x->x_number; ! sys_vgui("radio_draw .x%x.c %x %d %d %d %d %d %d 0 %d #%6.6x\n", ! canvas, x, x1, y1, x2, y2, !x->x_gui.x_fsf.x_rcv_able, !x->x_gui.x_fsf.x_snd_able, x->x_number,x->x_gui.x_bcol); sys_vgui("radio_set .x%x.c %x %d\n",canvas,x,x->x_on); sys_vgui(".x%x.c coords %xLABEL %d %d\n", ! canvas, x, x1+x->x_gui.x_ldx, y1+x->x_gui.x_ldy); } *************** *** 103,113 **** { t_canvas *canvas=glist_getcanvas(glist); ! int n=x->x_number, i; ! ! for(i=0; i<n; i++) ! { ! sys_vgui("bluebox_erase .x%x.c %xBASE%d\n", canvas, x, i); ! sys_vgui(".x%x.c delete %xBUT%d\n", canvas, x, i); ! } sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); } --- 70,74 ---- { t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("radio_erase .x%x.c %x\n", canvas, x); sys_vgui(".x%x.c delete %xLABEL\n", canvas, x); } *************** *** 115,133 **** void vradio_draw_config(t_vradio* x, t_glist* glist) { ! t_canvas *canvas=glist_getcanvas(glist); ! int n=x->x_number, i; ! ! sys_vgui(".x%x.c itemconfigure %xLABEL -font {%s %d bold} -fill #%6.6x -text {%s} \n", ! canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, ! x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:x->x_gui.x_lcol, ! strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:""); ! for(i=0; i<n; i++) ! { ! sys_vgui(".x%x.c itemconfigure %xBASE%d -fill #%6.6x\n", canvas, x, i, ! x->x_gui.x_bcol); ! sys_vgui(".x%x.c itemconfigure %xBUT%d -fill #%6.6x -outline #%6.6x\n", canvas, x, i, ! (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol, ! (x->x_on==i)?x->x_gui.x_fcol:x->x_gui.x_bcol); ! } } --- 76,80 ---- void vradio_draw_config(t_vradio* x, t_glist* glist) { ! vradio_draw_new(x,glist); } *************** *** 135,159 **** { t_canvas *canvas=glist_getcanvas(glist); ! int n=x->x_number, i; ! ! if(x->x_gui.x_fsf.x_selected) ! { ! for(i=0; i<n; i++) ! { ! sys_vgui(".x%x.c itemconfigure %xBASE%d -outline #%6.6x\n", canvas, x, i, ! IEM_GUI_COLOR_SELECTED); ! } ! sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED); ! } ! else ! { ! for(i=0; i<n; i++) ! { ! sys_vgui(".x%x.c itemconfigure %xBASE%d -outline #%6.6x\n", canvas, x, i, ! IEM_GUI_COLOR_NORMAL); ! } ! sys_vgui(".x%x.c itemconfigure %xLABEL -fill #%6.6x\n", canvas, x, ! x->x_gui.x_lcol); ! } } --- 82,86 ---- { t_canvas *canvas=glist_getcanvas(glist); ! sys_vgui("bluebox_select .x%x.c %xBASE %d\n", canvas, x, x->x_gui.x_fsf.x_selected); } *************** *** 230,234 **** { t_symbol *srl[3]; ! int a = (int)atom_getintarg(0, argc, argv); int chg = (int)atom_getintarg(4, argc, argv); int num = (int)atom_getintarg(6, argc, argv); --- 157,161 ---- { t_symbol *srl[3]; ! int a = (int)atom_getintarg(0, argc, argv); int chg = (int)atom_getintarg(4, argc, argv); int num = (int)atom_getintarg(6, argc, argv);

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 March 2004