Pd-cvs May 2004

pd-cvs@lists.iem.at

9 participants
169 discussions

pd/src u_object.tk,1.1.2.38,1.1.2.39 g_hslider.c,1.1.1.3.2.2.2.23,1.1.1.3.2.2.2.24
by Mathieu Bouchard 07 May '04

07 May '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24132 Modified Files: Tag: impd_0_37 u_object.tk g_hslider.c Log Message: fixed some slider bugs Index: g_hslider.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_hslider.c,v retrieving revision 1.1.1.3.2.2.2.23 retrieving revision 1.1.1.3.2.2.2.24 diff -C2 -d -r1.1.1.3.2.2.2.23 -r1.1.1.3.2.2.2.24 *** g_hslider.c 4 May 2004 07:15:49 -0000 1.1.1.3.2.2.2.23 --- g_hslider.c 7 May 2004 07:15:38 -0000 1.1.1.3.2.2.2.24 *************** *** 44,48 **** pd_upload((t_gobj *)x,glist); sys_mgui((t_iemgui *)x,"slider","draw",""); ! sys_mgui((t_iemgui *)x,"slider","set","i",x->x_val); } } --- 44,48 ---- pd_upload((t_gobj *)x,glist); sys_mgui((t_iemgui *)x,"slider","draw",""); ! // sys_mgui((t_iemgui *)x,"slider","set","i",x->x_val); } } *************** *** 87,92 **** } ! static void slider_check_minmax(t_slider *x, double min, double max) { double diff; if(x->x_gui.x_lin0_log1) { --- 87,93 ---- } ! static void slider_check_minmax(t_slider *x) { + double min=x->x_min, max=x->x_max; double diff; if(x->x_gui.x_lin0_log1) { *************** *** 97,104 **** x->x_min = min; x->x_max = max; ! diff = x->x_gui.x_lin0_log1 ? log(x->x_max/x->x_min) : (x->x_max - x->x_min); x->x_k = isvert(x) ? ! diff/(double)(x->x_gui.x_h - 1) : ! diff/(double)(x->x_gui.x_w - 1); } --- 98,105 ---- x->x_min = min; x->x_max = max; ! diff = x->x_gui.x_lin0_log1 ? log(x->x_max/x->x_min) : (x->x_max-x->x_min); x->x_k = isvert(x) ? ! diff/(double)(x->x_gui.x_h-1) : ! diff/(double)(x->x_gui.x_w-1); } *************** *** 127,166 **** } - static void slider_motion(t_slider *x, t_floatarg dx, t_floatarg dy) - { - int old = x->x_val; - int l = isvert(x) ? x->x_gui.x_h : x->x_gui.x_w; - int m = (l-1)*100; - x->x_pos += (x->x_gui.x_finemoved?1:100)*(int)(isvert(x) ? -dy : dx); - x->x_val = x->x_pos; - if(x->x_val>m) {x->x_val=m; 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, 0); - slider_bang(x); - } - } - static void slider_size(t_slider *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) slider_check_width(x, (int)atom_getintarg(1, ac, av)); ! }else{ ! slider_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((t_iemgui *)x); } ! static void slider_range(t_slider *x, t_symbol *s, int ac, t_atom *av) ! { ! slider_check_minmax(x, ! (double)atom_getfloatarg(0, ac, av), ! (double)atom_getfloatarg(1, ac, av)); ! } ! static void slider_lin(t_slider *x) {x->x_gui.x_lin0_log1 = 0; x->x_k = (x->x_max-x->x_min)/(double)((isvert(x)?x->x_gui.x_h:x->x_gui.x_w) - 1);} ! static void slider_log(t_slider *x) {x->x_gui.x_lin0_log1 = 1; slider_check_minmax(x, x->x_min, x->x_max);} static void slider_init(t_slider *x, t_floatarg f) {x->x_gui.x_loadinit = !!f;} --- 128,148 ---- } static void slider_size(t_slider *x, t_symbol *s, int ac, t_atom *av) { ! int a = atom_getintarg(0,ac,av); ! int b = ac>1 ? atom_getintarg(1,ac,av) : 0; ! if (isvert(x)) { ! x->x_gui.x_w = iemgui_clip_size(a); if(ac>1) slider_check_width(x,b); ! } else { ! slider_check_width(x,a); if(ac>1) x->x_gui.x_h = iemgui_clip_size(b); ! } iemgui_size((t_iemgui *)x); } ! static void slider_range(t_slider *x, t_float min, t_float max) ! {x->x_min = min; x->x_max = max; slider_check_minmax(x);} ! static void slider_lin(t_slider *x) {x->x_gui.x_lin0_log1 = 0; x->x_k = (x->x_max-x->x_min)/(double)((isvert(x)?x->x_gui.x_h:x->x_gui.x_w)-1);} ! static void slider_log(t_slider *x) {x->x_gui.x_lin0_log1 = 1; slider_check_minmax(x);} static void slider_init(t_slider *x, t_floatarg f) {x->x_gui.x_loadinit = !!f;} *************** *** 170,189 **** { slider_set(x, f); ! if(x->x_gui.x_put_in2out) { ! double out = x->x_gui.x_lin0_log1 ? ! x->x_min*exp(x->x_k*(double)(x->x_val)*0.01) : ! (double)(x->x_val)*0.01*x->x_k + x->x_min; ! if (fabs(out) < 1.0e-10) out = 0.0; ! outlet_float(x->x_gui.x_obj.ob_outlet, out); ! if(x->x_gui.x_snd_able && x->x_gui.x_snd->s_thing) ! pd_float(x->x_gui.x_snd->s_thing, out); ! } } static void slider_loadbang(t_slider *x) { ! if(!sys_noloadbang && x->x_gui.x_loadinit) ! { ! x->x_gui.x_draw(x, x->x_gui.x_glist, 0); slider_bang(x); } --- 152,163 ---- { slider_set(x, f); ! if(x->x_gui.x_put_in2out) slider_bang(x); } static void slider_loadbang(t_slider *x) { ! t_iemgui *y = (t_iemgui *)x; ! if(!sys_noloadbang && y->x_loadinit) { ! y->x_draw(x,y->x_glist,0); slider_bang(x); } *************** *** 193,207 **** { t_iemgui *y = (t_iemgui *)x; ! int isa=0, lin0_log1=0, v=0, steady=1; if(!pd_scanargs(argc,argv,"iiddbiaaaiiiiccci;b", ! &y->x_w,&y->x_h,&x->x_min,&x->x_max,&lin0_log1,&isa,&y->x_snd,&y->x_rcv,&y->x_lab, &y->x_ldx,&y->x_ldy,&y->x_font_style,&y->x_fontsize, &y->x_bcol,&y->x_fcol,&y->x_lcol,&v,&steady)) return; ! iem_inttosymargs(&x->x_gui, isa); ! y->x_lin0_log1=lin0_log1; x->x_pos = x->x_val = y->x_loadinit ? v : 0; y->x_steady = steady; iemgui_constrain(y); ! slider_check_minmax(x, x->x_min, x->x_max); if (isvert(x)) slider_check_width(x, y->x_h); else slider_check_width(x, y->x_w); --- 167,182 ---- { t_iemgui *y = (t_iemgui *)x; ! int isa,v,steady,lilo; if(!pd_scanargs(argc,argv,"iiddbiaaaiiiiccci;b", ! &y->x_w,&y->x_h,&x->x_min,&x->x_max,&lilo,&isa, ! &y->x_snd,&y->x_rcv,&y->x_lab, &y->x_ldx,&y->x_ldy,&y->x_font_style,&y->x_fontsize, &y->x_bcol,&y->x_fcol,&y->x_lcol,&v,&steady)) return; ! iem_inttosymargs(y,isa); x->x_pos = x->x_val = y->x_loadinit ? v : 0; + y->x_lin0_log1 = lilo; y->x_steady = steady; iemgui_constrain(y); ! slider_check_minmax(x); if (isvert(x)) slider_check_width(x, y->x_h); else slider_check_width(x, y->x_w); *************** *** 246,254 **** class_addbang(c,slider_bang); class_addfloat(c,slider_float); - class_addmethod(c, (t_method)slider_motion, gensym("motion"), A_FLOAT, A_FLOAT, 0); class_addmethod(c, (t_method)slider_reload, gensym("reload"), A_GIMME, 0); class_addmethod(c, (t_method)slider_loadbang, gensym("loadbang"), 0); class_addmethod(c, (t_method)slider_set, gensym("set"), A_FLOAT, 0); class_addmethod(c, (t_method)slider_size, gensym("size"), A_GIMME, 0); class_addmethod(c, (t_method)slider_log, gensym("log"), 0); class_addmethod(c, (t_method)slider_lin, gensym("lin"), 0); --- 221,229 ---- class_addbang(c,slider_bang); class_addfloat(c,slider_float); class_addmethod(c, (t_method)slider_reload, gensym("reload"), A_GIMME, 0); class_addmethod(c, (t_method)slider_loadbang, gensym("loadbang"), 0); class_addmethod(c, (t_method)slider_set, gensym("set"), A_FLOAT, 0); class_addmethod(c, (t_method)slider_size, gensym("size"), A_GIMME, 0); + class_addmethod(c, (t_method)slider_range, gensym("range"), A_FLOAT, A_FLOAT, 0); class_addmethod(c, (t_method)slider_log, gensym("log"), 0); class_addmethod(c, (t_method)slider_lin, gensym("lin"), 0); Index: u_object.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/u_object.tk,v retrieving revision 1.1.2.38 retrieving revision 1.1.2.39 diff -C2 -d -r1.1.2.38 -r1.1.2.39 *** u_object.tk 7 May 2004 05:55:50 -0000 1.1.2.38 --- u_object.tk 7 May 2004 07:15:38 -0000 1.1.2.39 *************** *** 522,525 **** --- 522,529 ---- } numbox_draw $self $canvas + } elseif {$key==27} { + # Escape + set _($self:val) $_($self:oval) + canvas_ungrab $canvas } else { puts "numbox_keyevent $key" *************** *** 674,716 **** set _($self:unclickevent) slider_unclick set _($self:ungrabevent) slider_ungrab - return - #EXPERIMENTAL: (notches) - if {$orient} { - set thick [clamp [expr $xs/3] 1 5] - set x3 [expr $x1+$xs-$thick/2-2] - set eighth [expr round($ys/8-1)] - set coords [list $x3 $y1 $x3 [expr $y1+$ys]] - } else { - set thick [clamp [expr $ys/3] 1 5] - set y3 [expr $y1+$ys-$thick/2-2] - set eighth [expr $xs/8] - set coords [list $x1 $y3 [expr $x1+$xs] $y3] - } - $canvas create line $coords -dash [list 1 $eighth 1 $eighth] -width $thick -fill [darker $look(sliderbg)] - } - proc slider_set {self canvas value} { - global _ set pos [$canvas coords ${self}BASE] - foreach {x1 y1} [object_xy $self $canvas] {} - set orient [slider_orient $self] set span [expr $_($self:max)-$_($self:min)] ! set _($self:value) [expr $value*$span/($orient?$_($self:h):$_($self:w))/100] if {$orient} { set size [expr [lindex $pos 2]-$x1] ! set y1 [expr [lindex $pos 3]-($value+50)/100-2] set y2 [expr $y1-2] $canvas coords ${self}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 ${self}KNOB \ ! $x1 [expr $y1+2] \ ! $x2 [expr $y1+$size-2] } } --- 678,717 ---- set _($self:unclickevent) slider_unclick set _($self:ungrabevent) slider_ungrab set pos [$canvas coords ${self}BASE] set span [expr $_($self:max)-$_($self:min)] ! set l [expr $orient?$_($self:h):$_($self:w)] ! set value [expr $_($self:val)*$span/($l-1)/100] ! set _($self:value) $value if {$orient} { set size [expr [lindex $pos 2]-$x1] ! set y1 [expr [lindex $pos 3]-$value*($l-1)/$span-2] set y2 [expr $y1-2] $canvas coords ${self}KNOB \ ! [expr $x1+2] $y1 [expr $x1+$size-2] $y2 } { set size [expr [lindex $pos 3]-$y1] ! set x1 [expr $x1+$value*($l-1)/$span] set x2 [expr $x1+2] set y2 [expr $y1+$size] $canvas coords ${self}KNOB \ ! $x1 [expr $y1+2] $x2 [expr $y1+$size-2] ! } ! } ! ! # not used ! proc slider_draw_notches {self canvas} { ! if {$orient} { ! set thick [clamp [expr $xs/3] 1 5] ! set x3 [expr $x1+$xs-$thick/2-2] ! set eighth [expr round($ys/8-1)] ! set coords [list $x3 $y1 $x3 [expr $y1+$ys]] ! } else { ! set thick [clamp [expr $ys/3] 1 5] ! set y3 [expr $y1+$ys-$thick/2-2] ! set eighth [expr $xs/8] ! set coords [list $x1 $y3 [expr $x1+$xs] $y3] } + $canvas create line $coords -dash [list 1 $eighth 1 $eighth] -width $thick -fill [darker $look(sliderbg)] } *************** *** 737,743 **** global _ set _($self:clicking) 0 ! if {$_($self:value)!=$_($self:ovalue)} { canvas_ungrab $canvas ! pd "x$self float $_($self:val) ;" } } --- 738,744 ---- global _ set _($self:clicking) 0 ! if {[lindex $_($self:first) 1] != $y} { canvas_ungrab $canvas ! pd "x$self float $_($self:value) ;" } }

1 0

pd/src u_main.tk,1.1.1.4.2.7.4.63,1.1.1.4.2.7.4.64 u_object.tk,1.1.2.37,1.1.2.38
by Mathieu Bouchard 07 May '04

07 May '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13049 Modified Files: Tag: impd_0_37 u_main.tk u_object.tk Log Message: bugfixes Index: u_object.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/u_object.tk,v retrieving revision 1.1.2.37 retrieving revision 1.1.2.38 diff -C2 -d -r1.1.2.37 -r1.1.2.38 *** u_object.tk 6 May 2004 07:12:27 -0000 1.1.2.37 --- u_object.tk 7 May 2004 05:55:50 -0000 1.1.2.38 *************** *** 392,395 **** --- 392,396 ---- $canvas create polygon $points2 -tag ${self}BASE4 $canvas create text $xt $yt -anchor w -tags ${self}NUMBER + set _($self:clicking) 0 } { $canvas coords ${self}BASE $points *************** *** 409,415 **** io_draw $self $canvas $x1 $y1 $xs $ys $ins $outs label_draw $self $canvas ! set _($self:clickevent) numbox_clickevent ! set _($self:keyevent) numbox_keyevent ! set _($self:ungrabevent) numbox_ungrabevent } --- 410,418 ---- io_draw $self $canvas $x1 $y1 $xs $ys $ins $outs label_draw $self $canvas ! set _($self:clickevent) numbox_click ! set _($self:keyevent) numbox_key ! set _($self:ungrabevent) numbox_ungrab ! set _($self:motionevent) numbox_motion ! set _($self:unclickevent) numbox_unclick } *************** *** 460,482 **** proc numbox_erase {self canvas} { ! $canvas delete $self ${self}NUMBER ${self}BASE4 io_erase $self $canvas label_erase $self $canvas } ! proc numbox_clickevent {self canvas x y b f} { ! #set can [trimleft [trimright $canvas .c] .] canvas_grab $canvas $self $canvas itemconfigure ${self}BASE4 -fill #00ff00 } ! proc numbox_ungrabevent {self canvas} { global _ - puts "numbox_ungrabevent $self $canvas" set _($self:buf) "" numbox_draw $self $canvas } ! proc numbox_keyevent {self canvas key shift} { global _ look set c -1 --- 463,508 ---- proc numbox_erase {self canvas} { ! $canvas delete ${self}BASE ${self}NUMBER ${self}BASE4 io_erase $self $canvas label_erase $self $canvas } ! proc numbox_click {self canvas x y b f} { ! global _ canvas_grab $canvas $self $canvas itemconfigure ${self}BASE4 -fill #00ff00 + set _($self:mouse) [list $x $y] + set _($self:oval) $_($self:val) + set _($self:clicking) 1 + set _($self:rate) [expr $f&1 ? 0.01 : 1.00] } ! proc numbox_motion {self canvas x y mod} { ! global _ ! set grabbed [expr ![string compare $self [canvas_grabber $canvas]]] ! if {!$grabbed} {return} ! foreach {ox oy} $_($self:mouse) {} ! set _($self:val) [expr $_($self:val)+$_($self:rate)*($y-$oy)] ! numbox_draw $self $canvas ! set _($self:mouse) [list $x $y] ! if {$_($self:clicking)} {pd "x$self float $_($self:val) ;"} ! } ! ! proc numbox_ungrab {self canvas} { global _ set _($self:buf) "" numbox_draw $self $canvas } ! proc numbox_unclick {self canvas x y} { ! global _ ! set _($self:clicking) 0 ! if {$_($self:oval)!=$_($self:val)} { ! canvas_ungrab $canvas ! pd "x$self float $_($self:val) ;" ! } ! } ! ! proc numbox_key {self canvas key shift} { global _ look set c -1 *************** *** 489,492 **** --- 515,519 ---- catch {set _($self:val) [expr $_($self:buf)]} canvas_ungrab $canvas + pd "x$self float $_($self:val) ;" } elseif {$key==8 || $key==127} { # Backspace *************** *** 597,600 **** --- 624,628 ---- bluebox_erase $self $canvas $canvas delete ${self}BUT + label_erase $self $canvas } *************** *** 645,648 **** --- 673,677 ---- set _($self:motionevent) slider_motion set _($self:unclickevent) slider_unclick + set _($self:ungrabevent) slider_ungrab return #EXPERIMENTAL: (notches) *************** *** 692,695 **** --- 721,725 ---- proc slider_erase {self canvas} { bluebox_erase $self $canvas + label_erase $self $canvas $canvas delete ${self}KNOB } *************** *** 697,702 **** proc slider_click {self canvas x y b f} { global _ set _($self:clicking) 1 ! set _($self:last) [list $x $y] } --- 727,735 ---- proc slider_click {self canvas x y b f} { global _ + canvas_grab $canvas $self + set _($self:first) [list $x $y] + set _($self:ovalue) $_($self:value) set _($self:clicking) 1 ! set _($self:rate) [expr $f&1 ? 0.01 : 1.00] } *************** *** 704,720 **** global _ set _($self:clicking) 0 } proc slider_motion {self canvas x y mods} { global _ ! if {!$_($self:clicking)} {return} ! set dx [expr $x-[lindex $_($self:last) 0]] ! set dy [expr $y-[lindex $_($self:last) 1]] set orient [slider_orient $self] set span [expr $_($self:max)-$_($self:min)] ! set d [expr ($orient?-$dy:$dx)*$span/($orient?$_($self:h):$_($self:w))] ! set _($self:value) [expr $_($self:value)+$d] pd "x$self float $_($self:value) ;" ! set _($self:last) [list $x $y] } --- 737,763 ---- global _ set _($self:clicking) 0 + if {$_($self:value)!=$_($self:ovalue)} { + canvas_ungrab $canvas + pd "x$self float $_($self:val) ;" + } } proc slider_motion {self canvas x y mods} { global _ ! set grabbed [expr ![string compare $self [canvas_grabber $canvas]]] ! if {!$grabbed} {return} ! set dx [expr $x-[lindex $_($self:first) 0]] ! set dy [expr $y-[lindex $_($self:first) 1]] set orient [slider_orient $self] set span [expr $_($self:max)-$_($self:min)] ! set l [expr $orient?$_($self:h):$_($self:w)] ! set d [expr ($orient?-$dy:$dx)*$span/($l+0.0)] ! set _($self:value) [expr $_($self:ovalue)+$d*$_($self:rate)] pd "x$self float $_($self:value) ;" ! } ! ! proc slider_ungrab {self canvas} { ! global _ ! slider_draw $self $canvas } *************** *** 741,745 **** proc label_select {self canvas} {} ! proc label_erase {self canvas} {} proc bang_draw {self canvas} { --- 784,790 ---- proc label_select {self canvas} {} ! proc label_erase {self canvas} { ! $canvas delete ${self}LABEL ! } proc bang_draw {self canvas} { *************** *** 950,954 **** proc vu_erase {self canvas} { bluebox_erase $self $canvas ! $canvas delete ${self}MASK } --- 995,1000 ---- proc vu_erase {self canvas} { bluebox_erase $self $canvas ! label_erase $self $canvas ! $canvas delete ${self}SCALE ${self}RMS ${self}MASK } *************** *** 1009,1012 **** --- 1055,1059 ---- proc cnv_erase {self canvas} { + label_erase $self $canvas $canvas delete ${self}BASE ${self}LABEL } Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.63 retrieving revision 1.1.1.4.2.7.4.64 diff -C2 -d -r1.1.1.4.2.7.4.63 -r1.1.1.4.2.7.4.64 *** u_main.tk 6 May 2004 07:12:26 -0000 1.1.1.4.2.7.4.63 --- u_main.tk 7 May 2004 05:55:48 -0000 1.1.1.4.2.7.4.64 *************** *** 443,447 **** } ! proc menu_close {name} {pd "$name menuclose ;"} proc menu_undo {name} { --- 443,447 ---- } ! proc menu_close {name} {pd "$name menuclose 0 ;"} proc menu_undo {name} { *************** *** 590,601 **** if {[info exists _($id:class)]} {set class $_($id:class)} {set class unknown} $self.stat.what configure -text "$id \[$class\] ($tags)" - return } wire { $self.stat.what configure -text "$id wire" ! return } } ! $self.stat.what configure -text "... $tags" $self.stat.mode configure -text $_($self:mode) $self.stat.action configure -text $_($self:action) --- 590,604 ---- if {[info exists _($id:class)]} {set class $_($id:class)} {set class unknown} $self.stat.what configure -text "$id \[$class\] ($tags)" } wire { $self.stat.what configure -text "$id wire" ! } ! default { ! $self.stat.what configure -text "... $tags" } } ! if {[string length $_($self:grab)]} { ! $self.stat.what configure -text "grab: $_($self:grab)" ! } $self.stat.mode configure -text $_($self:mode) $self.stat.action configure -text $_($self:action) *************** *** 855,858 **** --- 858,868 ---- } + proc event {self sel args} { + global _ + if {[info exists _($self:$sel)]} { + eval [linsert [concat [list $self] $args] 0 $_($self:$sel)] + } + } + proc pdtk_canvas_click {canvas x y b f} { pdtk_canvas_click2 $canvas $x $y $b $f *************** *** 871,881 **** set run [expr !$edit || ($f&2)] pd "$self click-on-object x$id $cx $cy $b $f;" if {$f&8} { puts "RIGHTCLICK OBJECT" set rightclick_object $id ! } elseif {$run && [info exists _($id:clickevent)]} { ! eval [linsert [list $id $canvas $cx $cy $b $f] 0 $_($id:clickevent)] ! } elseif {!$run && [info exists _($id:clickeditevent)]} { ! eval [linsert [list $id $canvas $cx $cy $b $f] 0 $_($id:clickeditevent)] } #!@#$ "elseif" should go here ? --- 881,892 ---- set run [expr !$edit || ($f&2)] pd "$self click-on-object x$id $cx $cy $b $f;" + if {[string length $_($self:grab)]} {set gid $_($self:grab)} if {$f&8} { puts "RIGHTCLICK OBJECT" set rightclick_object $id ! } else { ! if {$run} { ! event $id clickevent $canvas $cx $cy $b $f} { ! event $id clickeditevent $canvas $cx $cy $b $f} } #!@#$ "elseif" should go here ? *************** *** 978,990 **** } } foreach {type id} [identify_target $canvas $cx $cy -1 -1 "move "] {} switch $type { object { ! set run [expr !$edit] ! if {$run && [info exists _($id:motionevent)]} { ! eval [linsert [list $id $canvas $cx $cy $mods] 0 $_($id:motionevent)] ! } elseif {!$run && [info exists _($id:motioneditevent)]} { ! eval [linsert [list $id $canvas $cx $cy $mods] 0 $_($id:motioneditevent)] ! } if {$edit && [llength [$canvas bbox ${id}BASE]]} { # may highlight an inlet --- 989,1006 ---- } } + set run [expr !$edit] + if {[string length $_($self:grab)]} { + set id $_($self:grab) + if {$run} { + event $id motionevent $canvas $cx $cy $mods} { + event $id motioneditevent $canvas $cx $cy $mods} + return + } foreach {type id} [identify_target $canvas $cx $cy -1 -1 "move "] {} switch $type { object { ! if {$run} { ! event $id motionevent $canvas $cx $cy $mods} { ! event $id motioneditevent $canvas $cx $cy $mods} if {$edit && [llength [$canvas bbox ${id}BASE]]} { # may highlight an inlet *************** *** 1071,1085 **** pd "$self gobj-activate x$_($self:selection);" } set edit 0; switch $_($self:mode) { edit { set edit 1 } } foreach {type id} [identify_target $canvas $cx $cy -1 -1 "blah "] {} switch $type { object { ! set run [expr !$edit] ! if {$run && [info exists _($id:unclickevent)]} { ! eval [linsert [list $id $canvas $cx $cy] 0 $_($id:unclickevent)] ! } elseif {!$run && [info exists _($id:unclickeditevent)]} { ! eval [linsert [list $id $canvas $cx $cy] 0 $_($id:unclickeditevent)] ! } } } --- 1087,1107 ---- pd "$self gobj-activate x$_($self:selection);" } + set edit 0; switch $_($self:mode) { edit { set edit 1 } } + set run [expr !$edit] + if {[string length $_($self:grab)]} { + set id $_($self:grab) + if {$run} { + event $id unclickevent $canvas $cx $cy} { + event $id unclickeditevent $canvas $cx $cy} + } set edit 0; switch $_($self:mode) { edit { set edit 1 } } foreach {type id} [identify_target $canvas $cx $cy -1 -1 "blah "] {} + switch $type { object { ! if {$run} { ! event $id unclickevent $canvas $cx $cy} { ! event $id unclickeditevent $canvas $cx $cy} } } *************** *** 1760,1765 **** proc canvas_grab {canvas obj} { - puts "canvas_grab $canvas $obj" global _ set self [canvastosym $canvas] set _($self:grab) $obj --- 1782,1787 ---- proc canvas_grab {canvas obj} { global _ + canvas_ungrab $canvas set self [canvastosym $canvas] set _($self:grab) $obj *************** *** 1767,1778 **** proc canvas_ungrab {canvas} { - puts "canvas_ungrab $canvas" global _ set self [canvastosym $canvas] set obj $_($self:grab) set _($self:grab) "" ! set ung $_($obj:ungrabevent) ! puts "ungrab = $ung" ! if {[string length $ung]>0} {$ung $obj $canvas} } --- 1789,1798 ---- proc canvas_ungrab {canvas} { global _ set self [canvastosym $canvas] set obj $_($self:grab) + if {![string length $obj]} {return} set _($self:grab) "" ! event $obj ungrabevent $canvas }

1 0

pd/doc/1.manual x5.htm,1.1.1.3.2.3,1.1.1.3.2.4
by Guenter Geiger 06 May '04

06 May '04

Update of /cvsroot/pure-data/pd/doc/1.manual In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25613/1.manual Modified Files: Tag: devel_0_37 x5.htm Log Message: merged 0.37-1 Index: x5.htm =================================================================== RCS file: /cvsroot/pure-data/pd/doc/1.manual/x5.htm,v retrieving revision 1.1.1.3.2.3 retrieving revision 1.1.1.3.2.4 diff -C2 -d -r1.1.1.3.2.3 -r1.1.1.3.2.4 *** x5.htm 23 Sep 2003 01:07:20 -0000 1.1.1.3.2.3 --- x5.htm 6 May 2004 15:50:59 -0000 1.1.1.3.2.4 *************** *** 21,24 **** --- 21,45 ---- <H3> <A name="s2"> 5.1. release notes </A> </H3> + ------------------ 0.37.1 -------------------------- + + fixed the apple key on OSX so it does key accelerators + + fixed bug in -inchannels/-outchannels arg parsing + + major editions to the IEM GUIs to fix bugs in how "$" variables are handled. + The code still isn't pretty but hopefully at least works now. + + bug fix in vd~ for very small delays + + fixed MSW version not to make windows grow by 2 pixels on save/restore + + added an "nrt" flag for OSX to defeat real-time priritization + (useful when runnig Gem.) + + on some platforms, audio open failures are handled more gracefully. + + added a "changelog" file in the source directory to document source-level + changes. + ------------------ 0.37 --------------------------

1 0

pd/doc/5.reference metro.pd,1.1.1.1.16.1,1.1.1.1.16.2 x_all_guis.pd,1.1.1.1.16.1,1.1.1.1.16.2
by Guenter Geiger 06 May '04

06 May '04

Update of /cvsroot/pure-data/pd/doc/5.reference In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25613/5.reference Added Files: Tag: devel_0_37 metro.pd x_all_guis.pd Log Message: merged 0.37-1 --- NEW FILE: x_all_guis.pd --- #N canvas 209 342 290 271 10; #X obj 23 31 bng 15 250 50 532480 \$1 \$1 empty 20 8 192 8 -262144 -1 -1; #X obj 23 63 tgl 15 1.06496e+06 \$2 \$2 empty 20 8 192 8 -262144 -1 -1 0 1; #X obj 22 95 vsl 15 128 0 127 0 1.59744e+06 \$3 \$3 empty 20 8 192 8 -262144 -1 -1 0 1; #X obj 65 30 hsl 128 15 0 127 0 2.12992e+06 \$4 \$4 empty 20 8 192 8 -262144 -1 -1 0 1; #X obj 63 63 hdl 15 1 2.6624e+06 8 \$5 \$5 empty 20 8 192 8 -262144 -1 -1 0; #X obj 62 99 vu 15 120 \$6 empty 35 8 64 8 -66577 -1 1 49152; #X obj 115 99 cnv 15 100 60 \$7 \$7 \$7 20 12 917696 14 -233017 -66577 3.72736e+06; #X obj 41 308 inlet; #X obj 41 334 outlet; #X obj 227 30 vdl 15 1 4.79232e+06 8 \$9 \$9 empty 20 8 192 8 -262144 -1 -1 0; #X obj 116 176 nbx 5 14 -1e+37 1e+37 0 4.25984e+06 \$8 \$8 empty 45 7 192 10 -262144 -1 -1 0; --- NEW FILE: metro.pd --- #N canvas 39 7 634 372 12; #X text 19 36 The metro object sends a series of bangs at a constant rate. The right inlet takes the value in milliseconds between each bang. The left inlet takes a 1 or 0 \, turning the metronome on or off.; #X obj 67 285 + 1; #X obj 32 284 int; #X floatatom 32 317 4 0 0; #X obj 32 243 metro 500; #X obj 5 6 metro; #X floatatom 81 220 4 0 0; #X text 104 282 These objects work together as a counter. For each bang sent by metro \, the output adds 1; #X obj 32 103 loadbang; #X msg 32 125 1; #X text 92 135 nonzero number or "bang" to start; #X msg 49 172 0; #X msg 38 148 bang; #X msg 49 194 stop; #X text 99 181 zero or "stop" to stop.; #X text 351 332 Updated for Pd version 0.33; #X text 130 220 right inlet sets the rate in msec per tick.; #X text 127 243 creation argument initializes rate in msec; #X connect 1 0 2 1; #X connect 2 0 3 0; #X connect 2 0 1 0; #X connect 4 0 2 0; #X connect 6 0 4 1; #X connect 8 0 9 0; #X connect 9 0 4 0; #X connect 11 0 4 0; #X connect 12 0 4 0; #X connect 13 0 4 0;

1 0

pd/extra/expr~ vexp.c,1.2.12.1,1.2.12.2
by Guenter Geiger 06 May '04

06 May '04

Update of /cvsroot/pure-data/pd/extra/expr~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14009/expr~ Modified Files: Tag: devel_0_37 vexp.c Log Message: aligned to millers 0.37-1 Index: vexp.c =================================================================== RCS file: /cvsroot/pure-data/pd/extra/expr~/vexp.c,v retrieving revision 1.2.12.1 retrieving revision 1.2.12.2 diff -C2 -d -r1.2.12.1 -r1.2.12.2 *** vexp.c 8 Jul 2003 09:48:56 -0000 1.2.12.1 --- vexp.c 6 May 2004 09:37:35 -0000 1.2.12.2 *************** *** 79,99 **** char *atoif(char *s, long int *value, long int *type); ! static struct ex_ex *ex_lex(struct expr *exp, long int *n); struct ex_ex *ex_match(struct ex_ex *eptr, long int op); ! struct ex_ex *ex_parse(struct expr *exp, struct ex_ex *iptr, struct ex_ex *optr, long int *argc); ! struct ex_ex *ex_eval(struct expr *exp, struct ex_ex *eptr, struct ex_ex *optr, int i); ! int expr_donew(struct expr *expr, int ac, t_atom *av); [...1572 lines suppressed...] (eptr->ex_ptr)[i] = 0; ! exp->exp_str = p; /* * we mark this as a string and later we will change this --- 1844,1858 ---- * function or a table */ ! p = --expr->exp_str; for (i = 0; name_ok(*p); i++) p++; if (!i) { ! post("expr: syntax error: %s\n", expr->exp_str); return (1); } eptr->ex_ptr = (char *)fts_malloc(i + 1); ! strncpy(eptr->ex_ptr, expr->exp_str, (int) i); (eptr->ex_ptr)[i] = 0; ! expr->exp_str = p; /* * we mark this as a string and later we will change this

1 0

pd/extra README.txt,1.1.1.2,1.1.1.2.2.1 help-rev2~.pd,1.1.1.1,1.1.1.1.2.1 help-bonk~.pd,1.1.1.1.16.2,NONE help-choice.pd,1.1.1.1.16.2,NONE help-fiddle~.pd,1.1.1.1.16.2,NONE help-loop~.pd,1.1.1.1.16.2,NONE help-paf~.pd,1.1.1.1.16.2,NONE help-pique.pd,1.1.1.1.16.2,NONE help-rlshift~.pd,1.1.1.1.16.2,NONE
by Guenter Geiger 06 May '04

06 May '04

Update of /cvsroot/pure-data/pd/extra In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14009 Modified Files: Tag: devel_0_37 README.txt help-rev2~.pd Removed Files: Tag: devel_0_37 help-bonk~.pd help-choice.pd help-fiddle~.pd help-loop~.pd help-paf~.pd help-pique.pd help-rlshift~.pd Log Message: aligned to millers 0.37-1 Index: help-rev2~.pd =================================================================== RCS file: /cvsroot/pure-data/pd/extra/help-rev2~.pd,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** help-rev2~.pd 9 May 2003 16:03:51 -0000 1.1.1.1 --- help-rev2~.pd 6 May 2004 09:37:35 -0000 1.1.1.1.2.1 *************** *** 26,29 **** --- 26,30 ---- #X obj 41 355 outlet~; #X obj 279 126 inlet; + #X obj 40 175 *~; #X connect 0 0 17 0; #X connect 1 0 8 0; *************** *** 48,58 **** #X connect 14 0 6 1; #X connect 15 0 2 0; ! #X connect 16 0 21 0; #X connect 17 0 18 0; #X connect 17 0 19 0; #X connect 18 0 20 0; #X connect 19 0 16 0; #X connect 20 0 16 0; #X connect 22 0 15 0; #X restore 17 154 pd tests; #X msg 56 35 10; --- 49,62 ---- #X connect 14 0 6 1; #X connect 15 0 2 0; ! #X connect 16 0 23 0; #X connect 17 0 18 0; #X connect 17 0 19 0; #X connect 18 0 20 0; #X connect 19 0 16 0; + #X connect 19 0 23 1; #X connect 20 0 16 0; + #X connect 20 0 23 1; #X connect 22 0 15 0; + #X connect 23 0 21 0; #X restore 17 154 pd tests; #X msg 56 35 10; --- help-paf~.pd DELETED --- --- help-loop~.pd DELETED --- --- help-bonk~.pd DELETED --- --- help-rlshift~.pd DELETED --- --- help-fiddle~.pd DELETED --- --- help-pique.pd DELETED --- Index: README.txt =================================================================== RCS file: /cvsroot/pure-data/pd/extra/README.txt,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.2.2.1 diff -C2 -d -r1.1.1.2 -r1.1.1.2.2.1 *** README.txt 9 May 2003 16:03:51 -0000 1.1.1.2 --- README.txt 6 May 2004 09:37:35 -0000 1.1.1.2.2.1 *************** *** 1,14 **** This is the README file for the "extras" library, consisting of Pd objects which are too specialized or otherwise non-canonical for ! inclusion into Pd proper. Except as noted otherwise, all ! included materiels are Copyright 1999 Miller Puckette and others. ! Permission is granted to use this software for any purpose, commercial ! or noncommercial, as long as this notice is included with all copies. ! ! NEITHER THE AUTHORS NOR THEIR EMPLOYERS MAKE ANY WARRANTY, EXPRESS ! OR IMPLIED, IN CONNECTION WITH THIS SOFTWARE! ! ! Note that "expr" is under the GPL, which is more restrictive than Pd's own ! license agreement. This package should run in Pd under linux, MSW, or Mac OSX. --- 1,7 ---- This is the README file for the "extras" library, consisting of Pd objects which are too specialized or otherwise non-canonical for ! inclusion into Pd proper. These files are open source; see ! LICENSE.txt in this distribution for details. ! Note however that "expr" is GPL (the rest is all BSD). This package should run in Pd under linux, MSW, or Mac OSX. *************** *** 24,32 **** loop~ -- sample looper expr -- arithmetic expression evaluation (Shahrokh Yadegari) abstractions: hilbert~ - Hilbert transform for SSB modulation complex-mod~ - ring modulation for complex (real+imaginary) audio signals ! rev1~ - experimental reverberator These objects are part of the regular Pd distribution as of Pd version --- 17,27 ---- loop~ -- sample looper expr -- arithmetic expression evaluation (Shahrokh Yadegari) + pique - fft-based peak finder + lrshift~ - left or right shift an audio vector abstractions: hilbert~ - Hilbert transform for SSB modulation complex-mod~ - ring modulation for complex (real+imaginary) audio signals ! rev1~, etc. - reverberators These objects are part of the regular Pd distribution as of Pd version --- help-choice.pd DELETED ---

1 0

pd/src cvs_changes.txt,1.1.2.1,1.1.2.2
by Guenter Geiger 06 May '04

06 May '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6355 Modified Files: Tag: devel_0_37 cvs_changes.txt Log Message: Index: cvs_changes.txt =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/cvs_changes.txt,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** cvs_changes.txt 25 Apr 2004 17:56:29 -0000 1.1.2.1 --- cvs_changes.txt 6 May 2004 08:50:07 -0000 1.1.2.2 *************** *** 9,11 **** --enable-optimize=pentium3/pentium4) ! - Added Yves Degoyon's patch for the threaded gui (--enable-threadedgui) \ No newline at end of file --- 9,16 ---- --enable-optimize=pentium3/pentium4) ! - Added Yves Degoyon's patch for the threaded gui (--enable-threadedgui) ! ! - GG: inlets take tooltips (first parameters) ! ! - GG: -rt mode does not check for uid() and gui() (on linux with realtime-lsm ! -rt works without being user root).

1 0

pd/src s_inter.c,1.1.1.3.2.12,1.1.1.3.2.13
by Guenter Geiger 06 May '04

06 May '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6213 Modified Files: Tag: devel_0_37 s_inter.c Log Message: removed check for user root when doing -rt Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.1.1.3.2.12 retrieving revision 1.1.1.3.2.13 diff -C2 -d -r1.1.1.3.2.12 -r1.1.1.3.2.13 *** s_inter.c 6 May 2004 08:28:12 -0000 1.1.1.3.2.12 --- s_inter.c 6 May 2004 08:49:29 -0000 1.1.1.3.2.13 *************** *** 950,954 **** if (sys_hipriority) { ! if (!getuid() || !geteuid()) { /* To prevent lockup, we fork off a watchdog process with --- 950,957 ---- if (sys_hipriority) { ! /* GG: on linux we can get high priority without being root, so the check ! * for root priviledge is not needed (hopefully) */ ! ! if (1 /* !getuid() || !geteuid() */) { /* To prevent lockup, we fork off a watchdog process with

1 0

pd/src d_soundfile.c,1.1.1.2.2.2,1.1.1.2.2.3 g_array.c,1.1.1.3.2.2,1.1.1.3.2.3 notes.txt,1.1.1.4.2.5,1.1.1.4.2.6 s_audio_jack.c,1.1.2.7,1.1.2.8 s_audio_mmio.c,1.1.1.1.2.3,1.1.1.1.2.4 s_inter.c,1.1.1.3.2.11,1.1.1.3.2.12
by Guenter Geiger 06 May '04

06 May '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1693 Modified Files: Tag: devel_0_37 d_soundfile.c g_array.c notes.txt s_audio_jack.c s_audio_mmio.c s_inter.c Log Message: merged in version 0.37.1 Index: notes.txt =================================================================== RCS file: /cvsroot/pure-data/pd/src/notes.txt,v retrieving revision 1.1.1.4.2.5 retrieving revision 1.1.1.4.2.6 diff -C2 -d -r1.1.1.4.2.5 -r1.1.1.4.2.6 *** notes.txt 14 Jan 2004 15:45:39 -0000 1.1.1.4.2.5 --- notes.txt 6 May 2004 08:28:12 -0000 1.1.1.4.2.6 *************** *** 1,15 **** ---------------- dolist -------------------- ! fix for 0.37: ! pd exit, bad filedesc ! Make install makes an externs, and anyway, doesn't put help files in extra read xx.txt in "bad" gives warnings ! mess with RME ALSA some more; ALSA readn doesn't work yet. test MIDI I/O on all platforms, inc. sysex... ! windows quit doesn't confirm on Windows? ! check Pd in OSX 10.3 ! OSS seems not to detect FIFO out of kilter ! ! 0.38: %x to %lx in all "tags" to make 64-bit safe plug-in support --- 1,10 ---- ---------------- dolist -------------------- ! 0.38: read xx.txt in "bad" gives warnings ! mess with RME ALSA some more; ALSA readn doesn't work yet; use mmap? test MIDI I/O on all platforms, inc. sysex... ! document env~ second argument (and why is it no less than 1/10 of first???) ! make watchdog work for MACOSX %x to %lx in all "tags" to make 64-bit safe plug-in support *************** *** 20,23 **** --- 15,19 ---- signal inlets to sense signals; fix +~ etc, vcf~, biquad~, and make a vcfb~ + makefile to set SETUID bit on install? loading e-mailed patches without removing headers crashes pd *************** *** 48,51 **** --- 44,49 ---- problems: + writesf -- "open" without "0" misses closing the previous file. + Also writesf~ acts differently if DSP is off when "open" is sent? qlist - 'next 1' seems not to work arrays of non-existent templates crash 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.3 diff -C2 -d -r1.1.1.3.2.2 -r1.1.1.3.2.3 *** g_array.c 12 Sep 2003 20:55:31 -0000 1.1.1.3.2.2 --- g_array.c 6 May 2004 08:28:12 -0000 1.1.1.3.2.3 *************** *** 971,975 **** maxv = -v; } ! if (maxv >= 0) { renormer = f / maxv; --- 971,975 ---- maxv = -v; } ! if (maxv > 0) { renormer = f / maxv; Index: d_soundfile.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v retrieving revision 1.1.1.2.2.2 retrieving revision 1.1.1.2.2.3 diff -C2 -d -r1.1.1.2.2.2 -r1.1.1.2.2.3 *** d_soundfile.c 22 Feb 2004 17:36:50 -0000 1.1.1.2.2.2 --- d_soundfile.c 6 May 2004 08:28:12 -0000 1.1.1.2.2.3 *************** *** 186,191 **** /******************** soundfile access routines **********************/ - void readsf_banana( void); /* debugging */ - /* This routine opens a file, looks for either a nextstep or "wave" header, * seeks to end of it, and fills in bytes per sample and number of channels. --- 186,189 ---- *************** *** 373,376 **** --- 371,377 ---- if (sysrtn != nchannels * bytespersamp * skipframes + headersize) return (-1); + bytelimit -= nchannels * bytespersamp * skipframes; + if (bytelimit < 0) + bytelimit = 0; /* copy sample format back to caller */ *p_bigendian = bigendian; *************** *** 579,582 **** --- 580,584 ---- bigendian = garray_ambigendian(); } + else bigendian = endianness; swap = (bigendian != garray_ambigendian()); if (!argc || argv->a_type != A_SYMBOL) *************** *** 1018,1023 **** framesinfile = maxsize; } ! if (framesinfile > bytelimit / bytespersamp) ! framesinfile = bytelimit / bytespersamp; finalsize = framesinfile; for (i = 0; i < argc; i++) --- 1020,1025 ---- framesinfile = maxsize; } ! if (framesinfile > bytelimit / (channels * bytespersamp)) ! framesinfile = bytelimit / (channels * bytespersamp); finalsize = framesinfile; for (i = 0; i < argc; i++) *************** *** 1038,1043 **** } if (!finalsize) finalsize = 0x7fffffff; ! if (finalsize > bytelimit / bytespersamp) ! finalsize = bytelimit / bytespersamp; fp = fdopen(fd, "rb"); bufframes = SAMPBUFSIZE / (channels * bytespersamp); --- 1040,1045 ---- } if (!finalsize) finalsize = 0x7fffffff; ! if (finalsize > bytelimit / (channels * bytespersamp)) ! finalsize = bytelimit / (channels * bytespersamp); fp = fdopen(fd, "rb"); bufframes = SAMPBUFSIZE / (channels * bytespersamp); *************** *** 1306,1311 **** write(2, s, strlen(s)); } ! #else ! #define pute(x) #endif --- 1308,1312 ---- write(2, s, strlen(s)); } ! #define DEBUG_SOUNDFILE #endif *************** *** 1326,1340 **** } - void readsf_banana( void) - { - struct timeval timout; - timout.tv_sec = 0; - timout.tv_usec = 200000; - pute("banana1\n"); - select(0, 0, 0, 0, &timout); - pute("banana2\n"); - } - - #define sfread_cond_wait(a,b) readsf_fakewait(b) #define sfread_cond_signal(a) --- 1327,1330 ---- *************** *** 1344,1348 **** --- 1334,1340 ---- { t_readsf *x = zz; + #ifdef DEBUG_SOUNDFILE pute("1\n"); + #endif pthread_mutex_lock(&x->x_mutex); while (1) *************** *** 1350,1360 **** --- 1342,1358 ---- int fd, fifohead; char *buf; + #ifdef DEBUG_SOUNDFILE pute("0\n"); + #endif if (x->x_requestcode == REQUEST_NOTHING) { + #ifdef DEBUG_SOUNDFILE pute("wait 2\n"); + #endif sfread_cond_signal(&x->x_answercondition); sfread_cond_wait(&x->x_requestcondition, &x->x_mutex); + #ifdef DEBUG_SOUNDFILE pute("3\n"); + #endif } else if (x->x_requestcode == REQUEST_OPEN) *************** *** 1375,1379 **** --- 1373,1379 ---- /* alter the request code so that an ensuing "open" will get noticed. */ + #ifdef DEBUG_SOUNDFILE pute("4\n"); + #endif x->x_requestcode = REQUEST_BUSY; x->x_fileerror = 0; *************** *** 1397,1401 **** --- 1397,1403 ---- pthread_mutex_lock(&x->x_mutex); + #ifdef DEBUG_SOUNDFILE pute("5\n"); + #endif /* copy back into the instance structure. */ x->x_bytespersample = bytespersample; *************** *** 1408,1414 **** --- 1410,1418 ---- x->x_fileerror = errno; x->x_eof = 1; + #ifdef DEBUG_SOUNDFILE pute("open failed\n"); pute(filename); pute(dirname); + #endif goto lost; } *************** *** 1416,1420 **** --- 1420,1426 ---- if (x->x_requestcode != REQUEST_BUSY) goto lost; + #ifdef DEBUG_SOUNDFILE pute("6\n"); + #endif x->x_fifohead = 0; /* set fifosize from bufsize. fifosize must be a *************** *** 1430,1434 **** --- 1436,1442 ---- sprintf(boo, "fifosize %d\n", x->x_fifosize); + #ifdef DEBUG_SOUNDFILE pute(boo); + #endif x->x_sigcountdown = x->x_sigperiod = (x->x_fifosize / *************** *** 1440,1444 **** --- 1448,1454 ---- { int fifosize = x->x_fifosize; + #ifdef DEBUG_SOUNDFILE pute("77\n"); + #endif if (x->x_eof) break; *************** *** 1460,1473 **** --- 1470,1491 ---- sprintf(boo, "head %d, tail %d, size %d\n", x->x_fifohead, x->x_fifotail, wantbytes); + #ifdef DEBUG_SOUNDFILE pute(boo); + #endif } else { + #ifdef DEBUG_SOUNDFILE pute("wait 7a ...\n"); + #endif sfread_cond_signal(&x->x_answercondition); + #ifdef DEBUG_SOUNDFILE pute("signalled\n"); + #endif sfread_cond_wait(&x->x_requestcondition, &x->x_mutex); + #ifdef DEBUG_SOUNDFILE pute("7a done\n"); + #endif continue; } *************** *** 1480,1493 **** --- 1498,1519 ---- if (wantbytes < READSIZE) { + #ifdef DEBUG_SOUNDFILE pute("wait 7...\n"); + #endif sfread_cond_signal(&x->x_answercondition); sfread_cond_wait(&x->x_requestcondition, &x->x_mutex); + #ifdef DEBUG_SOUNDFILE pute("7 done\n"); + #endif continue; } else wantbytes = READSIZE; + if (wantbytes > x->x_bytelimit) + wantbytes = x->x_bytelimit; } + #ifdef DEBUG_SOUNDFILE pute("8\n"); + #endif fd = x->x_fd; buf = x->x_buf; *************** *** 1500,1504 **** --- 1526,1532 ---- if (sysrtn < 0) { + #ifdef DEBUG_SOUNDFILE pute("fileerror\n"); + #endif x->x_fileerror = errno; break; *************** *** 1521,1527 **** --- 1549,1557 ---- x->x_fifohead = 0; } + #ifdef DEBUG_SOUNDFILE sprintf(boo, "after: head %d, tail %d\n", x->x_fifohead, x->x_fifotail); pute(boo); + #endif /* signal parent in case it's waiting for data */ sfread_cond_signal(&x->x_answercondition); *************** *** 1574,1581 **** --- 1604,1615 ---- else { + #ifdef DEBUG_SOUNDFILE pute("13\n"); + #endif } } + #ifdef DEBUG_SOUNDFILE pute("thread exit\n"); + #endif pthread_mutex_unlock(&x->x_mutex); return (0); *************** *** 1648,1659 **** --- 1682,1698 ---- x->x_fifohead < x->x_fifotail + wantbytes-1) { + #ifdef DEBUG_SOUNDFILE pute("wait...\n"); + #endif sfread_cond_signal(&x->x_requestcondition); sfread_cond_wait(&x->x_answercondition, &x->x_mutex); + #ifdef DEBUG_SOUNDFILE pute("done\n"); + #endif } if (x->x_eof && x->x_fifohead >= x->x_fifotail && x->x_fifohead < x->x_fifotail + wantbytes-1) { + int xfersize; if (x->x_fileerror) { *************** *** 1665,1671 **** clock_delay(x->x_clock, 0); x->x_state = STATE_IDLE; sfread_cond_signal(&x->x_requestcondition); pthread_mutex_unlock(&x->x_mutex); ! goto idle; } --- 1704,1726 ---- clock_delay(x->x_clock, 0); x->x_state = STATE_IDLE; + + /* if there's a partial buffer left, copy it out. */ + xfersize = (x->x_fifohead - x->x_fifotail + 1) / + (sfchannels * bytespersample); + if (xfersize) + { + soundfile_xferin(sfchannels, noutlets, x->x_outvec, 0, + (unsigned char *)(x->x_buf + x->x_fifotail), xfersize, + bytespersample, bigendian); + vecsize -= xfersize; + } + /* then zero out the (rest of the) output */ + for (i = 0; i < noutlets; i++) + for (j = vecsize, fp = x->x_outvec[i] + xfersize; j--; ) + *fp++ = 0; + sfread_cond_signal(&x->x_requestcondition); pthread_mutex_unlock(&x->x_mutex); ! return (w+2); } *************** *** 1831,1845 **** --- 1886,1908 ---- { t_writesf *x = zz; + #ifdef DEBUG_SOUNDFILE pute("1\n"); + #endif pthread_mutex_lock(&x->x_mutex); while (1) { + #ifdef DEBUG_SOUNDFILE pute("0\n"); + #endif if (x->x_requestcode == REQUEST_NOTHING) { + #ifdef DEBUG_SOUNDFILE pute("wait 2\n"); + #endif sfread_cond_signal(&x->x_answercondition); sfread_cond_wait(&x->x_requestcondition, &x->x_mutex); + #ifdef DEBUG_SOUNDFILE pute("3\n"); + #endif } else if (x->x_requestcode == REQUEST_OPEN) *************** *** 1863,1867 **** --- 1926,1932 ---- /* alter the request code so that an ensuing "open" will get noticed. */ + #ifdef DEBUG_SOUNDFILE pute("4\n"); + #endif x->x_requestcode = REQUEST_BUSY; x->x_fileerror = 0; *************** *** 1883,1888 **** garray_ambigendian() != bigendian, samplerate); pthread_mutex_lock(&x->x_mutex); ! pute("5\n"); if (fd < 0) --- 1948,1954 ---- garray_ambigendian() != bigendian, samplerate); pthread_mutex_lock(&x->x_mutex); ! #ifdef DEBUG_SOUNDFILE pute("5\n"); + #endif if (fd < 0) *************** *** 1891,1896 **** --- 1957,1964 ---- x->x_eof = 1; x->x_fileerror = errno; + #ifdef DEBUG_SOUNDFILE pute("open failed\n"); pute(filename); + #endif x->x_requestcode = REQUEST_NOTHING; continue; *************** *** 1899,1903 **** --- 1967,1973 ---- if (x->x_requestcode != REQUEST_BUSY) continue; + #ifdef DEBUG_SOUNDFILE pute("6\n"); + #endif x->x_fd = fd; x->x_fifotail = 0; *************** *** 1912,1916 **** --- 1982,1988 ---- int fifosize = x->x_fifosize, fifotail; char *buf = x->x_buf; + #ifdef DEBUG_SOUNDFILE pute("77\n"); + #endif /* if the head is < the tail, we can immediately write *************** *** 1930,1942 **** --- 2002,2022 ---- else { + #ifdef DEBUG_SOUNDFILE pute("wait 7a ...\n"); + #endif sfread_cond_signal(&x->x_answercondition); + #ifdef DEBUG_SOUNDFILE pute("signalled\n"); + #endif sfread_cond_wait(&x->x_requestcondition, &x->x_mutex); + #ifdef DEBUG_SOUNDFILE pute("7a done\n"); + #endif continue; } + #ifdef DEBUG_SOUNDFILE pute("8\n"); + #endif fifotail = x->x_fifotail; fd = x->x_fd; *************** *** 1949,1953 **** --- 2029,2035 ---- if (sysrtn < writebytes) { + #ifdef DEBUG_SOUNDFILE pute("fileerror\n"); + #endif x->x_fileerror = errno; break; *************** *** 1963,1967 **** --- 2045,2051 ---- sprintf(boo, "after: head %d, tail %d\n", x->x_fifohead, x->x_fifotail); + #ifdef DEBUG_SOUNDFILE pute(boo); + #endif /* signal parent in case it's waiting for data */ sfread_cond_signal(&x->x_answercondition); *************** *** 1998,2005 **** --- 2082,2093 ---- else { + #ifdef DEBUG_SOUNDFILE pute("13\n"); + #endif } } + #ifdef DEBUG_SOUNDFILE pute("thread exit\n"); + #endif pthread_mutex_unlock(&x->x_mutex); return (0); *************** *** 2067,2074 **** --- 2155,2166 ---- x->x_fifotail < x->x_fifohead + wantbytes + 1) { + #ifdef DEBUG_SOUNDFILE pute("wait...\n"); + #endif sfread_cond_signal(&x->x_requestcondition); sfread_cond_wait(&x->x_answercondition, &x->x_mutex); + #ifdef DEBUG_SOUNDFILE pute("done\n"); + #endif } *************** *** 2082,2086 **** --- 2174,2180 ---- if ((--x->x_sigcountdown) <= 0) { + #ifdef DEBUG_SOUNDFILE pute("signal 1\n"); + #endif sfread_cond_signal(&x->x_requestcondition); x->x_sigcountdown = x->x_sigperiod; *************** *** 2107,2111 **** --- 2201,2207 ---- x->x_state = STATE_IDLE; x->x_requestcode = REQUEST_CLOSE; + #ifdef DEBUG_SOUNDFILE pute("signal 2\n"); + #endif sfread_cond_signal(&x->x_requestcondition); pthread_mutex_unlock(&x->x_mutex); Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.1.1.3.2.11 retrieving revision 1.1.1.3.2.12 diff -C2 -d -r1.1.1.3.2.11 -r1.1.1.3.2.12 *** s_inter.c 31 Mar 2004 13:19:10 -0000 1.1.1.3.2.11 --- s_inter.c 6 May 2004 08:28:12 -0000 1.1.1.3.2.12 *************** *** 682,686 **** --- 682,690 ---- p1 = sched_get_priority_min(SCHED_FIFO); p2 = sched_get_priority_max(SCHED_FIFO); + #ifdef USEAPI_JACK + p3 = (higher ? p1 + 7 : p1 + 5); + #else p3 = (higher ? p2 - 1 : p2 - 3); + #endif par.sched_priority = p3; if (sched_setscheduler(0,SCHED_FIFO,&par) != -1) *************** *** 746,750 **** signal(SIGBUS, sys_exithandler); signal(SIGSEGV, sys_exithandler); */ ! signal(SIGPIPE, sys_exithandler); signal(SIGALRM, SIG_IGN); signal(SIGTERM, SIG_IGN); --- 750,754 ---- signal(SIGBUS, sys_exithandler); signal(SIGSEGV, sys_exithandler); */ ! signal(SIGPIPE, SIG_IGN); signal(SIGALRM, SIG_IGN); signal(SIGTERM, SIG_IGN); Index: s_audio_mmio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_mmio.c,v retrieving revision 1.1.1.1.2.3 retrieving revision 1.1.1.1.2.4 diff -C2 -d -r1.1.1.1.2.3 -r1.1.1.1.2.4 *** s_audio_mmio.c 22 Feb 2004 17:36:51 -0000 1.1.1.1.2.3 --- s_audio_mmio.c 6 May 2004 08:28:12 -0000 1.1.1.1.2.4 *************** *** 71,75 **** } ! static void wave_prep(t_sbuf *bp) { WAVEHDR *wh; --- 71,75 ---- } ! static void wave_prep(t_sbuf *bp, int setdone) { WAVEHDR *wh; *************** *** 111,114 **** --- 111,117 ---- wh->lpNext = 0; wh->reserved = 0; + /* optionally (for writing) set DONE flag as if we had queued them */ + if (setdone) + wh->dwFlags = WHDR_DONE; } *************** *** 139,144 **** { for (i = nindevsprepped; i < nt_nwavein; i++) ! for (j = 0; j < nt_naudiobuffer; j++) ! wave_prep(&ntsnd_invec[i][j]); nindevsprepped = nt_nwavein; } --- 142,147 ---- { for (i = nindevsprepped; i < nt_nwavein; i++) ! for (j = 0; j < naudioprepped; j++) ! wave_prep(&ntsnd_invec[i][j], 0); nindevsprepped = nt_nwavein; } *************** *** 146,151 **** { for (i = noutdevsprepped; i < nt_nwaveout; i++) ! for (j = 0; j < nt_naudiobuffer; j++) ! wave_prep(&ntsnd_outvec[i][j]); noutdevsprepped = nt_nwaveout; } --- 149,154 ---- { for (i = noutdevsprepped; i < nt_nwaveout; i++) ! for (j = 0; j < naudioprepped; j++) ! wave_prep(&ntsnd_outvec[i][j], 1); noutdevsprepped = nt_nwaveout; } *************** *** 155,161 **** { for (i = 0; i < nt_nwavein; i++) ! wave_prep(&ntsnd_invec[i][j]); for (i = 0; i < nt_nwaveout; i++) ! wave_prep(&ntsnd_outvec[i][j]); } naudioprepped = nt_naudiobuffer; --- 158,164 ---- { for (i = 0; i < nt_nwavein; i++) ! wave_prep(&ntsnd_invec[i][j], 0); for (i = 0; i < nt_nwaveout; i++) ! wave_prep(&ntsnd_outvec[i][j], 1); } naudioprepped = nt_naudiobuffer; Index: s_audio_jack.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_jack.c,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** s_audio_jack.c 24 Feb 2004 10:00:56 -0000 1.1.2.7 --- s_audio_jack.c 6 May 2004 08:28:12 -0000 1.1.2.8 *************** *** 233,236 **** --- 233,237 ---- if (!jack_client) { // jack spits out enough messages already, do not warn + sys_inchannels = sys_outchannels = 0; return 1; } *************** *** 297,301 **** if (new_jack) { if (jack_activate (jack_client)) { ! fprintf (stderr, "cannot activate client"); return 1; } --- 298,303 ---- if (new_jack) { if (jack_activate (jack_client)) { ! fprintf (stderr, "cannot activate client\n"); ! sys_inchannels = sys_outchannels = 0; return 1; }

1 0

pd/src g_numbox.c,1.1.1.4.2.2.2.18,1.1.1.4.2.2.2.19 u_main.tk,1.1.1.4.2.7.4.62,1.1.1.4.2.7.4.63 u_object.tk,1.1.2.36,1.1.2.37
by Mathieu Bouchard 06 May '04

06 May '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20448 Modified Files: Tag: impd_0_37 g_numbox.c u_main.tk u_object.tk Log Message: [nbx] gets tickled Index: u_object.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/u_object.tk,v retrieving revision 1.1.2.36 retrieving revision 1.1.2.37 diff -C2 -d -r1.1.2.36 -r1.1.2.37 *** u_object.tk 4 May 2004 21:11:09 -0000 1.1.2.36 --- u_object.tk 6 May 2004 07:12:27 -0000 1.1.2.37 *************** *** 117,120 **** --- 117,128 ---- ############ rendering + proc update_item {self canvas suffix type coords args} { + if {![llength [$canvas gettags ${self}${suffix}]]} { + $canvas create $type $coords -tags ${self}$suffix $args... + } { + $canvas itemconfigure ${self}$suffix $args... + } + } + # modes: # 0: creation *************** *** 370,405 **** set x2 [expr $x1+$xs] set y2 [expr $y1+$ys] ! set ins [expr [string compare $_($self:snd) empty]==0] set outs [expr [string compare $_($self:snd) empty]==0] set points [list $x1 $y1 [expr $x2-4] $y1 $x2 [expr $y1+4] $x2 $y2 $x1 $y2] set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0] - set half [expr $ys/2] - set d [expr 1+$xs/34] set font courier ! set xt [expr $x1+$half+2] ! set yt [expr $y1+$half+$d] ! #set color [format #%6.6x [expr $_($self:fcol) & 0xffffff]] ! set color "#000000" ! #puts "numbox.color = $color" #shadow_draw $self $canvas $points ! set points2 [list $x1 $y1 [expr $x1+$half] [expr $y1+$half] $x1 $y2] puts "numbox_draw $self $canvas" if {$isnew} { ! $canvas create polygon $points -tag ${self}BASE \ ! -fill $look(objectbg) -outline $look(objectframe3) ! $canvas create polygon $points2 -tag ${self}BASE4 \ ! -fill $look(objectbg) -outline $look(objectframe3) ! $canvas create text $xt $yt \ ! -text [numbox_ftoa $self] -anchor w \ ! -font [list $font $_($self:fs) bold] \ ! -fill $color -tags ${self}NUMBER } { $canvas coords ${self}BASE $points $canvas coords ${self}BASE4 $points2 $canvas coords ${self}NUMBER $xt $yt ! $canvas itemconfigure ${self}NUMBER \ ! -text [numbox_ftoa $self] \ ! -font [list $font $_($self:fs) bold] \ ! -fill $color } io_draw $self $canvas $x1 $y1 $xs $ys $ins $outs --- 378,409 ---- set x2 [expr $x1+$xs] set y2 [expr $y1+$ys] ! set ins [expr [string compare $_($self:rcv) empty]==0] set outs [expr [string compare $_($self:snd) empty]==0] set points [list $x1 $y1 [expr $x2-4] $y1 $x2 [expr $y1+4] $x2 $y2 $x1 $y2] set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0] set font courier ! set xt [expr $x1+$ys/2+2] ! set yt [expr $y1+$ys/2+1+$xs/34] #shadow_draw $self $canvas $points ! set points2 [list $x1 $y1 [expr $x1+$ys/2] [expr $y1+$ys/2] $x1 $y2] puts "numbox_draw $self $canvas" if {$isnew} { ! $canvas create polygon $points -tag ${self}BASE ! $canvas create polygon $points2 -tag ${self}BASE4 ! $canvas create text $xt $yt -anchor w -tags ${self}NUMBER } { $canvas coords ${self}BASE $points $canvas coords ${self}BASE4 $points2 $canvas coords ${self}NUMBER $xt $yt ! } ! set grabbed [expr ![string compare $self [canvas_grabber $canvas]]] ! if {$grabbed} {set color4 #00ff00} {set color4 $look(objectbg)} ! $canvas itemconfigure ${self}BASE -fill [parse_color $_($self:bcol)] -outline $look(objectframe3) ! $canvas itemconfigure ${self}BASE4 -fill $color4 -outline $look(objectframe3) ! $canvas itemconfigure ${self}NUMBER -text [numbox_ftoa $self] -font [list $font $_($self:fs) bold] -fill [parse_color $_($self:fcol)] ! $canvas delete ${self}CURS ! if {[string length $_($self:buf)]>0} { ! foreach {blah blah x3 blah} [$canvas bbox ${self}NUMBER] {} ! $canvas create line $x3 $y1 $x3 $y2 -tags ${self}CURS -fill red } io_draw $self $canvas $x1 $y1 $xs $ys $ins $outs *************** *** 407,410 **** --- 411,415 ---- set _($self:clickevent) numbox_clickevent set _($self:keyevent) numbox_keyevent + set _($self:ungrabevent) numbox_ungrabevent } *************** *** 413,418 **** if {$flag==1} {set colour $look(objectframe4)} {set colour $look(objectframe3)} $canvas itemconfigure ${self}BASE -outline $colour - if {$flag==2} {set colour #00ff00} {set colour $look(objectbg)} - $canvas itemconfigure ${self}BASE4 -fill $colour label_select $self $canvas canvas_select_object $canvas $self $flag --- 418,421 ---- *************** *** 465,476 **** #set can [trimleft [trimright $canvas .c] .] canvas_grab $canvas $self } proc numbox_keyevent {self canvas key shift} { ! global _ ! set c [format %c $key] ! switch -regexp -- $c { ! [0-9] {set _($self:buf) "$_($self:buf)$c"; puts $_($self:buf); numbox_draw $self $canvas} ! default {puts "numbox_keyevent $key"} } } --- 468,500 ---- #set can [trimleft [trimright $canvas .c] .] canvas_grab $canvas $self + $canvas itemconfigure ${self}BASE4 -fill #00ff00 + } + + proc numbox_ungrabevent {self canvas} { + global _ + puts "numbox_ungrabevent $self $canvas" + set _($self:buf) "" + numbox_draw $self $canvas } proc numbox_keyevent {self canvas key shift} { ! global _ look ! set c -1 ! catch {set c [format %c $key]} ! if {[string first $c 0123456789.eE+-]>=0} { ! set _($self:buf) "$_($self:buf)$c" ! numbox_draw $self $canvas ! } elseif {$key==13} { ! # Return ! catch {set _($self:val) [expr $_($self:buf)]} ! canvas_ungrab $canvas ! } elseif {$key==8 || $key==127} { ! # Backspace ! if {[string length $_($self:buf)] >= 0} { ! set _($self:buf) [string range $_($self:buf) 0 end-1] ! } ! numbox_draw $self $canvas ! } else { ! puts "numbox_keyevent $key" } } *************** *** 947,951 **** canvas $canvas.${self}DROP -width $xs -height $xs -bg $colour -highlightbackground $lcolour -highlightcolor $colour $canvas create window [expr $x1 + 7] [expr $y1 - 2] -window $canvas.${self}DROP -anchor nw -tags $canvas.${self}window ! dnd bindtarget $canvas.${self}DROP text/uri-list <Drop> "pd \"x[list ${self}] symbol \[ pdtk_enquote %D \] ;\"" } { $canvas coords $canvas.${self}window [expr $x1 + 7] [expr $y1 - 2] --- 971,975 ---- canvas $canvas.${self}DROP -width $xs -height $xs -bg $colour -highlightbackground $lcolour -highlightcolor $colour $canvas create window [expr $x1 + 7] [expr $y1 - 2] -window $canvas.${self}DROP -anchor nw -tags $canvas.${self}window ! dnd bindtarget $canvas.${self}DROP text/uri-list <Drop> "pd \"d[list ${self}] symbol \[ pdtk_enquote %D \] ;\"" } { $canvas coords $canvas.${self}window [expr $x1 + 7] [expr $y1 - 2] Index: g_numbox.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v retrieving revision 1.1.1.4.2.2.2.18 retrieving revision 1.1.1.4.2.2.2.19 diff -C2 -d -r1.1.1.4.2.2.2.18 -r1.1.1.4.2.2.2.19 *** g_numbox.c 4 May 2004 07:15:49 -0000 1.1.1.4.2.2.2.18 --- g_numbox.c 6 May 2004 07:12:26 -0000 1.1.1.4.2.2.2.19 *************** *** 183,219 **** } - static void my_numbox_click(t_my_numbox *x, t_floatarg xpos, t_floatarg ypos, - t_floatarg shift, t_floatarg ctrl, t_floatarg alt) - { - glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.te_g, - (t_glistmotionfn)my_numbox_motion, my_numbox_key, xpos, ypos); - } - static int my_numbox_newclick(t_gobj *z, struct _glist *glist, int xpix, int ypix, int shift, int alt, int dbl, int doit) { t_my_numbox* x = (t_my_numbox *)z; ! if(doit) ! { ! my_numbox_click( x, (t_floatarg)xpix, (t_floatarg)ypix, ! (t_floatarg)shift, 0, (t_floatarg)alt); ! x->x_gui.x_finemoved = !! shift; ! if(!x->x_gui.x_change) ! { ! clock_delay(x->x_clock_wait, 50); ! x->x_gui.x_change = 1; CH ! clock_delay(x->x_clock_reset, 3000); ! x->x_buf[0] = 0; ! } ! else ! { ! x->x_gui.x_change = 0; CH ! clock_unset(x->x_clock_reset); ! glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0); ! x->x_buf[0] = 0; ! x->x_gui.x_draw(x, x->x_gui.x_glist, 0); ! } ! } ! return (1); } --- 183,193 ---- } static int my_numbox_newclick(t_gobj *z, struct _glist *glist, int xpix, int ypix, int shift, int alt, int dbl, int doit) { t_my_numbox* x = (t_my_numbox *)z; ! if(!doit) return 1; ! x->x_gui.x_finemoved = !! shift; ! return 1; } *************** *** 270,318 **** } - static void my_numbox_key(void *z, t_floatarg fkey) - { - t_my_numbox *x = z; - char c=fkey; - char buf[3]; - buf[1] = 0; - - if (c == 0) - { - x->x_gui.x_change = 0; CH - clock_unset(x->x_clock_reset); - x->x_gui.x_draw(x, x->x_gui.x_glist, 0); - return; - } - if(((c>='0')&&(c<='9'))||(c=='.')||(c=='-')|| - (c=='e')||(c=='+')||(c=='E')) - { - if(strlen(x->x_buf) < (IEMGUI_MAX_NUM_LEN-2)) - { - buf[0] = c; - strcat(x->x_buf, buf); - x->x_gui.x_draw(x, x->x_gui.x_glist, 0); - } - } - else if((c=='\b')||(c==127)) - { - int sl=strlen(x->x_buf)-1; - - if(sl < 0) sl = 0; - x->x_buf[sl] = 0; - x->x_gui.x_draw(x, x->x_gui.x_glist, 0); - } - else if((c=='\n')||(c==13)) - { - x->x_val = atof(x->x_buf); - x->x_buf[0] = 0; - x->x_gui.x_change = 0; CH - clock_unset(x->x_clock_reset); - my_numbox_clip(x); - my_numbox_bang(x); - x->x_gui.x_draw(x, x->x_gui.x_glist, 0); - } - clock_delay(x->x_clock_reset, 3000); - } - static void my_numbox_list(t_my_numbox *x, t_symbol *s, int ac, t_atom *av) { --- 244,247 ---- *************** *** 383,387 **** class_addfloat(c,my_numbox_float); class_addlist(c, my_numbox_list); - class_addmethod(c, (t_method)my_numbox_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); class_addmethod(c, (t_method)my_numbox_motion, gensym("motion"), A_FLOAT, A_FLOAT, 0); class_addmethod(c, (t_method)my_numbox_reload, gensym("reload"), A_GIMME, 0); --- 312,315 ---- Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.1.1.4.2.7.4.62 retrieving revision 1.1.1.4.2.7.4.63 diff -C2 -d -r1.1.1.4.2.7.4.62 -r1.1.1.4.2.7.4.63 *** u_main.tk 4 May 2004 21:11:08 -0000 1.1.1.4.2.7.4.62 --- u_main.tk 6 May 2004 07:12:26 -0000 1.1.1.4.2.7.4.63 *************** *** 1770,1774 **** --- 1770,1784 ---- global _ set self [canvastosym $canvas] + set obj $_($self:grab) set _($self:grab) "" + set ung $_($obj:ungrabevent) + puts "ungrab = $ung" + if {[string length $ung]>0} {$ung $obj $canvas} + } + + proc canvas_grabber {canvas} { + global _ + set self [canvastosym $canvas] + return $_($self:grab) }

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