Pd-cvs August 2006

pd-cvs@lists.iem.at

15 participants
462 discussions

pd/src desire.tk,1.1.2.346,1.1.2.347
by chunlee 16 Aug '06

16 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27574 Modified Files: Tag: devel_0_39 desire.tk Log Message: puts the quadrant method into the previous key navigation codes added the snap mode for the crosshair fixed the wire connection via keys Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.346 retrieving revision 1.1.2.347 diff -C2 -d -r1.1.2.346 -r1.1.2.347 *** desire.tk 15 Aug 2006 21:07:50 -0000 1.1.2.346 --- desire.tk 16 Aug 2006 00:37:01 -0000 1.1.2.347 *************** *** 947,951 **** set scale(canned) [list 25 33 50 75 100 125 150 200 250 300 400] ! #-----------------------------------------------------------------------------------# proc read_ddrc {} { --- 947,952 ---- set scale(canned) [list 25 33 50 75 100 125 150 200 250 300 400] ! set crosshair(state) 1 ! set crosshair(snap) 1 #-----------------------------------------------------------------------------------# proc read_ddrc {} { *************** *** 1205,1210 **** } def* Canvas editmodeswitch {args} { set @editmode [expr !$@editmode] ! if {$@crosshair && !$@editmode} {$self hide_crosshair} pd .$self editmode $@editmode } --- 1206,1212 ---- } def* Canvas editmodeswitch {args} { + global crosshair set @editmode [expr !$@editmode] ! if {$crosshair(state) && !$@editmode} {$self hide_crosshair} pd .$self editmode $@editmode } *************** *** 1274,1278 **** set @shift_wires {} set @keynav_tab_sel "wire" - set @crosshair 1 } --- 1276,1279 ---- *************** *** 1920,1929 **** } ! def* Canvas quadrant {du dv} { switch $@keynav_current { 0 {set @keynav_current [lindex $@children 0]}} set foo {} set bar {} set pos [$@keynav_current xy] ! foreach o $@children { mset {x y} [l- $pos [$o xy]] set u [expr $x+$y] --- 1921,1930 ---- } ! def* Canvas quadrant {du dv array} { switch $@keynav_current { 0 {set @keynav_current [lindex $@children 0]}} set foo {} set bar {} set pos [$@keynav_current xy] ! foreach o $array { mset {x y} [l- $pos [$o xy]] set u [expr $x+$y] *************** *** 1931,1946 **** if {$u*$du>0 && $v*$dv>0} {lappend foo $o; lappend bar [distance $pos [$o xy]]} } ! if {![llength $bar]} {return} set best [lindex $foo [lsearch_minimum $bar]] ! set @keynav_current $best ! $self selection= $best } #!@#$ this method is too long def* Canvas motion {x y f target} { ! global font canvas tooltip set canvas(current) $self set c .$self.c ! if {$@crosshair && $@editmode} {$self show_crosshair $x $y} if {$tooltip(visible)} { if {[expr [distance $tooltip(curpos) [list $x $y]] > 10]} { --- 1932,1948 ---- if {$u*$du>0 && $v*$dv>0} {lappend foo $o; lappend bar [distance $pos [$o xy]]} } ! if {![llength $bar]} {return $@keynav_current} set best [lindex $foo [lsearch_minimum $bar]] ! return $best ! #set @keynav_current $best ! #$self selection= $best } #!@#$ this method is too long def* Canvas motion {x y f target} { ! global font canvas tooltip crosshair set canvas(current) $self set c .$self.c ! if {$crosshair(state) && $@editmode} {$self show_crosshair $x $y $target} if {$tooltip(visible)} { if {[expr [distance $tooltip(curpos) [list $x $y]] > 10]} { *************** *** 1978,1983 **** outlet {set port [$id hilite_io o $x $y]; set @dehighlight [list $c delete ${id}o${port}b]} object { ! if {$@editmode} {set event motionedit} {set event motion} ! $id $event $x $y $f $target } wire {} --- 1980,1985 ---- outlet {set port [$id hilite_io o $x $y]; set @dehighlight [list $c delete ${id}o${port}b]} object { ! #if {$@editmode} {set event motionedit} {set event motion} ! #$id $event $x $y $f $target } wire {} *************** *** 2449,2460 **** } ! def Canvas key_nav_up {} {$self key_nav "up" 0} ! def Canvas key_nav_down {} {$self key_nav "down" 0} ! def Canvas key_nav_right {} {$self key_nav "right" 0} ! def Canvas key_nav_left {} {$self key_nav "left" 0} ! def Canvas key_nav_up_shift {} {$self key_nav "up" 1} ! def Canvas key_nav_down_shift {} {$self key_nav "down" 1} ! def Canvas key_nav_right_shift {} {$self key_nav "right" 1} ! def Canvas key_nav_left_shift {} {$self key_nav "left" 1} # intervals --- 2451,2462 ---- } ! def Canvas key_nav_up {} {$self key_nav +1 -1 0} ! def Canvas key_nav_down {} {$self key_nav -1 +1 0} ! def Canvas key_nav_right {} {$self key_nav -1 -1 0} ! def Canvas key_nav_left {} {$self key_nav +1 +1 0} ! def Canvas key_nav_up_shift {} {$self key_nav +1 -1 1} ! def Canvas key_nav_down_shift {} {$self key_nav -1 +1 1} ! def Canvas key_nav_right_shift {} {$self key_nav -1 -1 1} ! def Canvas key_nav_left_shift {} {$self key_nav +1 +1 1} # intervals *************** *** 2462,2507 **** proc overlap {y0 y1 x0 x1} {return [expr [inside $y0 $x0 $x1] || [inside $y1 $x0 $x1]]} ! def* Canvas key_nav {direction shift} { set group "" set distances "" switch $@keynav_tab_sel { object { ! set @keynav_next [$self find_neighbor_obj $@keynav_current $direction] } wire { ! set find [lsearch $@wires $@keynav_current] ! set all [lreplace $@wires $find $find] ! mset {x1 y1 x2 y2} [$@keynav_current bbox] ! set obj1 $_($@keynav_current:obj1) ! set inlets [$obj1 ninlets] ! set outlets [$obj1 noutlets] ! set outlet_wire {} ! set inlet_wire {} ! for {set i 0} {$i<$outlets} {incr i} {lappend outlet_wire $i} ! for {set i 0} {$i<$inlets} {incr i} {lappend inlet_wire $i} ! puts "outlet_wire::: $outlet_wire" ! puts "inlet_wire::: $inlet_wire" ! puts "wire $@keynav_current comes from $obj1" ! puts "and it has wires::: $_($obj1:wires)" ! foreach wire $_($obj1:wires) { ! set wire_info [$wire report] ! set find [lsearch $wire_info $obj1] ! if {$find == 0} { ! set new [linsert [lindex $outlet_wire [lindex $wire_info 1]] 0 $wire] ! set outlet_wire [lreplace $outlet_wire [lindex $wire_info 1] [lindex $wire_info 1] $new] ! } else { ! set new [linsert [lindex $inlet_wire [lindex $wire_info 3]] 0 $wire] ! set inlet_wire [lreplace $inlet_wire [lindex $wire_info 3] [lindex $wire_info 3] $new] ! } ! } ! puts "outlet_wire::: $outlet_wire" ! puts "inlet_wire::: $inlet_wire" ! } } if {!$shift} { ! set find [lsearch $@selection $@keynav_current] ! set @selection [lreplace $@selection $find $find] $@keynav_current selected?= 0 } --- 2464,2512 ---- proc overlap {y0 y1 x0 x1} {return [expr [inside $y0 $x0 $x1] || [inside $y1 $x0 $x1]]} ! def* Canvas key_nav {du dv shift} { set group "" set distances "" switch $@keynav_tab_sel { object { ! set @keynav_next [$self quadrant $du $dv $@children] } wire { ! set @keynav_next [$self quadrant $du $dv $@wires] ! #set find [lsearch $@wires $@keynav_current] ! #set all [lreplace $@wires $find $find] ! #mset {x1 y1 x2 y2} [$@keynav_current bbox] ! #set obj1 $_($@keynav_current:obj1) ! #set inlets [$obj1 ninlets] ! #set outlets [$obj1 noutlets] ! #set outlet_wire {} ! #set inlet_wire {} ! #for {set i 0} {$i<$outlets} {incr i} {lappend outlet_wire $i} ! #for {set i 0} {$i<$inlets} {incr i} {lappend inlet_wire $i} ! #puts "outlet_wire::: $outlet_wire" ! #puts "inlet_wire::: $inlet_wire" ! #puts "wire $@keynav_current comes from $obj1" ! ! #puts "and it has wires::: $_($obj1:wires)" ! #foreach wire $_($obj1:wires) { ! # set wire_info [$wire report] ! # set find [lsearch $wire_info $obj1] ! # if {$find == 0} { ! # set new [linsert [lindex $outlet_wire [lindex $wire_info 1]] 0 $wire] ! # set outlet_wire [lreplace $outlet_wire [lindex $wire_info 1] [lindex $wire_info 1] $new] ! # } else { ! # set new [linsert [lindex $inlet_wire [lindex $wire_info 3]] 0 $wire] ! # set inlet_wire [lreplace $inlet_wire [lindex $wire_info 3] [lindex $wire_info 3] $new] ! # } ! #} ! #puts "outlet_wire::: $outlet_wire" ! #puts "inlet_wire::: $inlet_wire" ! } } if {!$shift} { ! #set find [lsearch $@selection $@keynav_current] ! #set @selection [lreplace $@selection $find $find] ! $self selection-= $@keynav_current $@keynav_current selected?= 0 } *************** *** 2562,2566 **** --- 2567,2573 ---- set var [lindex $@keynav_iosel end end] if {[lsearch $@keynav_iosel $@selection] < 0} {lappend @keynav_iosel $@selection; set @keynav_iocount 0} + puts " iosel::: $@keynav_iosel" if {$@keynav_port != 0 && $@keynav_current == $var } {set hilitebox $(a)keynav_port;.$self.c delete ${hilitebox}b} + puts " keynav_port::: $@keynav_port" set obj $@selection #"$self$which $self$which$i $self" *************** *** 2586,2590 **** #set _($@selection:ioselect) [lindex $ports $@keynav_iocount] set _($@selection:ioselect) [list [lindex $ports3 $@keynav_iocount] [lindex $ports2 $@keynav_iocount]] ! $obj hilite_io [lindex $ports2 $@keynav_iocount] $x $y incr @keynav_iocount --- 2593,2597 ---- #set _($@selection:ioselect) [lindex $ports $@keynav_iocount] set _($@selection:ioselect) [list [lindex $ports3 $@keynav_iocount] [lindex $ports2 $@keynav_iocount]] ! $obj hilite_io [lindex $ports2 $@keynav_iocount] [expr $x/$@scale] [expr $y/$@scale] incr @keynav_iocount *************** *** 2762,2766 **** # type is i or o ! def Box hilite_io {type x y} { mset {x1 y1 x2 y2} [$self bbox] set xs [expr $x2-$x1] --- 2769,2773 ---- # type is i or o ! def* Box hilite_io {type x y} { mset {x1 y1 x2 y2} [$self bbox] set xs [expr $x2-$x1] *************** *** 2825,2828 **** --- 2832,2841 ---- } + def Wire xy {} { + set obj1 $@obj1 + mset {x1 y1 x2 y2} [$obj1 xy] + list $x1 $y1 + } + def Wire report {} { list $@obj1 $@port1 $@obj2 $@port2 *************** *** 4336,4355 **** ############ crosshair ! def Canvas show_crosshair {x y} { set width [expr [winfo width .$self.c] * (1/$@scale)] set height [expr [winfo height .$self.c] * (1/$@scale)] set off [expr 7 * (1/$@scale)] ! #puts "off ::: $off" ! set v1 [list $x 0 $x [expr $y - $off]] ! set h1 [list 0 $y [expr $x - $off] $y] ! set v2 [list $x [expr $y + $off] $x $height] ! set h2 [list [expr $x + $off] $y $width $y] ! set eye [list [expr $x - $off] [expr $y - $off] [expr $x + $off] [expr $y + $off]] ! #puts "vertical ::: $vertical" ! #puts "eye ::: $eye" ! $self item VHAIR1 line $v1 -fill [look objectfg] -width 0.5 -dash {4 4 4 4} ! $self item HHAIR1 line $h1 -fill [look objectfg] -width 0.5 -dash {4 4 4 4} ! $self item VHAIR2 line $v2 -fill [look objectfg] -width 0.5 -dash {4 4 4 4} ! $self item HHAIR2 line $h2 -fill [look objectfg] -width 0.5 -dash {4 4 4 4} $self item EYE oval $eye -dash {4 4 4 4} -outline [look selrect] } --- 4349,4393 ---- ############ crosshair ! def Canvas show_crosshair {x y target} { ! global crosshair set width [expr [winfo width .$self.c] * (1/$@scale)] set height [expr [winfo height .$self.c] * (1/$@scale)] set off [expr 7 * (1/$@scale)] ! mset {type id detail} $target ! #puts " type::: $type id:::$id" ! #puts " action::: $@action" ! ! if {$crosshair(snap)} { ! if {$type == "object" | $type == "outlet" | $type == "inlet"} { ! if {$id != $self} { ! mset {x1 y1 x2 y2} [$id bbox] ! set X $x1; set Y $y1 ! set crosshair(follow) $id ! } else { ! set X $x; set Y $y ! } ! } else { ! if {$@action == "move" | $@action == "edit"} { ! mset {x1 y1 x2 y2} [$crosshair(follow) bbox] ! set X $x1; set Y $y1 ! } else { ! set X $x; set Y $y ! } ! } ! } else { ! set X $x; set Y $y ! } ! ! set v1 [list $X 0 $X [expr $Y - $off]] ! set h1 [list 0 $Y [expr $X - $off] $Y] ! set v2 [list $X [expr $Y + $off] $X $height] ! set h2 [list [expr $X + $off] $Y $width $Y] ! set eye [list [expr $X - $off] [expr $Y - $off] [expr $X + $off] [expr $Y + $off]] ! ! ! $self item VHAIR1 line $v1 -fill [look selectframe] -width 0.5 -dash {4 4 4 4} ! $self item HHAIR1 line $h1 -fill [look selectframe] -width 0.5 -dash {4 4 4 4} ! $self item VHAIR2 line $v2 -fill [look selectframe] -width 0.5 -dash {4 4 4 4} ! $self item HHAIR2 line $h2 -fill [look selectframe] -width 0.5 -dash {4 4 4 4} $self item EYE oval $eye -dash {4 4 4 4} -outline [look selrect] }

1 0

pd/portaudio/pablio ringbuffer.c, 1.6, 1.7 ringbuffer.h, 1.7, 1.8
by Miller Puckette 15 Aug '06

15 Aug '06

Update of /cvsroot/pure-data/pd/portaudio/pablio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3779/pd/portaudio/pablio Modified Files: ringbuffer.c ringbuffer.h Log Message: Bug fix - plus, two features I couldn't bear to leave out of 0.40

1 0

pd/portaudio/pa_win_wdmks pa_win_wdmks.c,1.7,1.8
by Miller Puckette 15 Aug '06

15 Aug '06

Update of /cvsroot/pure-data/pd/portaudio/pa_win_wdmks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3779/pd/portaudio/pa_win_wdmks Modified Files: pa_win_wdmks.c Log Message: Bug fix - plus, two features I couldn't bear to leave out of 0.40

1 0

pd/src g_template.c, 1.15, 1.16 m_binbuf.c, 1.9, 1.10 s_audio_pablio.h, 1.5, 1.6 s_audio_paring.c, 1.5, 1.6 s_audio_paring.h, 1.5, 1.6
by Miller Puckette 15 Aug '06

15 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3779/pd/src Modified Files: g_template.c m_binbuf.c s_audio_pablio.h s_audio_paring.c s_audio_paring.h Log Message: Bug fix - plus, two features I couldn't bear to leave out of 0.40 Index: g_template.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_template.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** g_template.c 11 Aug 2006 20:09:07 -0000 1.15 --- g_template.c 15 Aug 2006 21:57:29 -0000 1.16 *************** *** 483,487 **** } - #if 0 /* bash the first of (argv) with a pointer to a scalar, and send on to template as a notification message */ --- 483,486 ---- *************** *** 491,500 **** t_gpointer gp; gpointer_init(&gp); ! gpointer_setglist(&gp, owner, x); SETPOINTER(argv, &gp); template_notify(template, s, argc, argv); gpointer_unset(&gp); } - #endif /* call this when reading a patch from a file to declare what templates --- 490,498 ---- t_gpointer gp; gpointer_init(&gp); ! gpointer_setglist(&gp, owner, sc); SETPOINTER(argv, &gp); template_notify(template, s, argc, argv); gpointer_unset(&gp); } /* call this when reading a patch from a file to declare what templates *************** *** 792,795 **** --- 790,794 ---- #define CLOSED 1 #define BEZ 2 + #define NOMOUSE 4 #define A_ARRAY 55 /* LATER decide whether to enshrine this in m_pd.h */ *************** *** 957,961 **** { t_object x_obj; ! int x_flags; /* CLOSED and/or BEZ */ t_fielddesc x_fillcolor; t_fielddesc x_outlinecolor; --- 956,960 ---- { t_object x_obj; ! int x_flags; /* CLOSED and/or BEZ and/or NOMOUSE */ t_fielddesc x_fillcolor; t_fielddesc x_outlinecolor; *************** *** 982,986 **** else classname += 4; if (classname[0] == 'c') flags |= BEZ; - x->x_flags = flags; fielddesc_setfloat_const(&x->x_vis, 1); while (1) --- 981,984 ---- *************** *** 992,997 **** --- 990,1001 ---- argc -= 2; argv += 2; } + else if (!strcmp(firstarg->s_name, "-x")) + { + flags |= NOMOUSE; + argc -= 1; argv += 1; + } else break; } + x->x_flags = flags; if ((flags & CLOSED) && argc) fielddesc_setfloatarg(&x->x_fillcolor, argc--, argv++); *************** *** 1039,1043 **** t_fielddesc *f = x->x_vec; int x1 = 0x7fffffff, x2 = -0x7fffffff, y1 = 0x7fffffff, y2 = -0x7fffffff; ! if (!fielddesc_getfloat(&x->x_vis, template, data, 0)) { *xp1 = *yp1 = 0x7fffffff; --- 1043,1048 ---- t_fielddesc *f = x->x_vec; int x1 = 0x7fffffff, x2 = -0x7fffffff, y1 = 0x7fffffff, y2 = -0x7fffffff; ! if (!fielddesc_getfloat(&x->x_vis, template, data, 0) || ! (x->x_flags & NOMOUSE)) { *xp1 = *yp1 = 0x7fffffff; *************** *** 1186,1189 **** --- 1191,1195 ---- static t_word *curve_motion_wp; static t_template *curve_motion_template; + static t_gpointer curve_motion_gpointer; /* LATER protect against the template changing or the scalar disappearing *************** *** 1194,1197 **** --- 1200,1209 ---- t_curve *x = (t_curve *)z; t_fielddesc *f = x->x_vec + curve_motion_field; + t_atom at; + if (!gpointer_check(&curve_motion_gpointer, 0)) + { + post("curve_motion: scalar disappeared"); + return; + } curve_motion_xcumulative += dx; curve_motion_ycumulative += dy; *************** *** 1208,1211 **** --- 1220,1227 ---- 1); } + /* LATER figure out what to do to notify for an array? */ + if (curve_motion_scalar) + template_notifyforscalar(curve_motion_template, curve_motion_glist, + curve_motion_scalar, gensym("change"), 1, &at); if (curve_motion_scalar) scalar_redraw(curve_motion_scalar, curve_motion_glist); *************** *** 1265,1268 **** --- 1281,1286 ---- curve_motion_field = 2*bestn; curve_motion_template = template; + gpointer_setglist(&curve_motion_gpointer, curve_motion_glist, + curve_motion_scalar); glist_grab(glist, z, curve_motion, 0, xpix, ypix); } *************** *** 2114,2117 **** --- 2132,2138 ---- static t_word *drawnumber_motion_wp; static t_template *drawnumber_motion_template; + static t_gpointer drawnumber_motion_gpointer; + static int drawnumber_motion_symbol; + static int drawnumber_motion_firstkey; /* LATER protect against the template changing or the scalar disappearing *************** *** 2122,2125 **** --- 2143,2157 ---- t_drawnumber *x = (t_drawnumber *)z; t_fielddesc *f = &x->x_value; + t_atom at; + if (!gpointer_check(&drawnumber_motion_gpointer, 0)) + { + post("drawnumber_motion: scalar disappeared"); + return; + } + if (drawnumber_motion_symbol) + { + post("drawnumber_motion: symbol"); + return; + } drawnumber_motion_ycumulative -= dy; template_setfloat(drawnumber_motion_template, *************** *** 2129,2132 **** --- 2161,2169 ---- 1); if (drawnumber_motion_scalar) + template_notifyforscalar(drawnumber_motion_template, + drawnumber_motion_glist, drawnumber_motion_scalar, + gensym("change"), 1, &at); + + if (drawnumber_motion_scalar) scalar_redraw(drawnumber_motion_scalar, drawnumber_motion_glist); if (drawnumber_motion_array) *************** *** 2134,2137 **** --- 2171,2242 ---- } + static void drawnumber_key(void *z, t_floatarg fkey) + { + t_drawnumber *x = (t_drawnumber *)z; + t_fielddesc *f = &x->x_value; + int key = fkey; + char sbuf[MAXPDSTRING]; + t_atom at; + if (!gpointer_check(&drawnumber_motion_gpointer, 0)) + { + post("drawnumber_motion: scalar disappeared"); + return; + } + if (key == 0) + return; + if (drawnumber_motion_symbol) + { + /* key entry for a symbol field */ + if (drawnumber_motion_firstkey) + sbuf[0] = 0; + else strncpy(sbuf, template_getsymbol(drawnumber_motion_template, + f->fd_un.fd_varsym, drawnumber_motion_wp, 1)->s_name, + MAXPDSTRING); + sbuf[MAXPDSTRING-1] = 0; + if (key == '\b') + { + if (*sbuf) + sbuf[strlen(sbuf)-1] = 0; + } + else + { + sbuf[strlen(sbuf)+1] = 0; + sbuf[strlen(sbuf)] = key; + } + } + else + { + /* key entry for a numeric field. This is just a stopgap. */ + float newf; + if (drawnumber_motion_firstkey) + sbuf[0] = 0; + else sprintf(sbuf, "%g", template_getfloat(drawnumber_motion_template, + f->fd_un.fd_varsym, drawnumber_motion_wp, 1)); + drawnumber_motion_firstkey = (key == '\n'); + if (key == '\b') + { + if (*sbuf) + sbuf[strlen(sbuf)-1] = 0; + } + else + { + sbuf[strlen(sbuf)+1] = 0; + sbuf[strlen(sbuf)] = key; + } + if (sscanf(sbuf, "%g", &newf) < 1) + newf = 0; + template_setfloat(drawnumber_motion_template, + f->fd_un.fd_varsym, drawnumber_motion_wp, newf, 1); + if (drawnumber_motion_scalar) + template_notifyforscalar(drawnumber_motion_template, + drawnumber_motion_glist, drawnumber_motion_scalar, + gensym("change"), 1, &at); + if (drawnumber_motion_scalar) + scalar_redraw(drawnumber_motion_scalar, drawnumber_motion_glist); + if (drawnumber_motion_array) + array_redraw(drawnumber_motion_array, drawnumber_motion_glist); + } + } + static int drawnumber_click(t_gobj *z, t_glist *glist, t_word *data, t_template *template, t_scalar *sc, t_array *ap, *************** *** 2155,2161 **** drawnumber_motion_scalar = sc; drawnumber_motion_array = ap; drawnumber_motion_ycumulative = fielddesc_getfloat(&x->x_value, template, data, 0); ! glist_grab(glist, z, drawnumber_motion, 0, xpix, ypix); } return (1); --- 2260,2271 ---- drawnumber_motion_scalar = sc; drawnumber_motion_array = ap; + drawnumber_motion_firstkey = 1; drawnumber_motion_ycumulative = fielddesc_getfloat(&x->x_value, template, data, 0); ! drawnumber_motion_symbol = ((x->x_flags & DRAW_SYMBOL) != 0); ! gpointer_setglist(&drawnumber_motion_gpointer, ! drawnumber_motion_glist, drawnumber_motion_scalar); ! glist_grab(glist, z, drawnumber_motion, drawnumber_key, ! xpix, ypix); } return (1); Index: m_binbuf.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_binbuf.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** m_binbuf.c 15 Aug 2006 04:54:15 -0000 1.9 --- m_binbuf.c 15 Aug 2006 21:57:29 -0000 1.10 *************** *** 491,499 **** */ substr=strchr(str, '$'); ! if(substr) ! { ! strncat(buf2, str, (substr-str)); ! str=substr+1; ! } #endif --- 491,500 ---- */ substr=strchr(str, '$'); ! if (!substr || substr-str >= MAXPDSTRING) ! return (s); ! ! strncat(buf2, str, (substr-str)); ! str=substr+1; ! #endif *************** *** 528,531 **** --- 529,533 ---- } done: + post("realize %s->%s", s->s_name, buf2); return (gensym(buf2)); }

1 0

pd/portmidi/pm_mac pmmacosxcm.c,1.7,1.8
by Miller Puckette 15 Aug '06

15 Aug '06

Update of /cvsroot/pure-data/pd/portmidi/pm_mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3779/pd/portmidi/pm_mac Modified Files: pmmacosxcm.c Log Message: Bug fix - plus, two features I couldn't bear to leave out of 0.40

1 0

pd/src desire.tk,1.1.2.345,1.1.2.346
by Mathieu Bouchard 15 Aug '06

15 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18860 Modified Files: Tag: devel_0_39 desire.tk Log Message: stuff Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.345 retrieving revision 1.1.2.346 diff -C2 -d -r1.1.2.345 -r1.1.2.346 *** desire.tk 15 Aug 2006 19:47:31 -0000 1.1.2.345 --- desire.tk 15 Aug 2006 21:07:50 -0000 1.1.2.346 *************** *** 996,1005 **** def View noutlets= {v} {set @noutlets $v} def View noutlets {} {return $@noutlets} ! def* View click {x y f} {} ;# being clicked in run mode ! def* View clickedit {x y f} {} ;# being clicked in edit mode ! def* View unclick {x y f} {} ;# being unclicked in run mode ! def* View unclickedit {x y f} {} ;# being unclicked in edit mode ! def View motionedit {x y f} {} ;# mouse motion in edit mode ! def View motion {x y f} {} ;# mouse motion in run mode def View init {} { --- 996,1005 ---- def View noutlets= {v} {set @noutlets $v} def View noutlets {} {return $@noutlets} ! def* View click {x y f target} {} ;# being clicked in run mode ! def* View clickedit {x y f target} {} ;# being clicked in edit mode ! def* View unclick {x y f target} {} ;# being unclicked in run mode ! def* View unclickedit {x y f target} {} ;# being unclicked in edit mode ! def View motionedit {x y f target} {} ;# mouse motion in edit mode ! def View motion {x y f target} {} ;# mouse motion in run mode def View init {} { *************** *** 1732,1735 **** --- 1732,1738 ---- pd .$@canvas text_setto !$self $l focus $c + } + + def ObjectBox unedit {} { $self erase ;# (why?) } *************** *** 1866,1878 **** #if {$@crosshair} {$self show_crosshair [expr [$c canvasx $x]/$@scale] [expr [$c canvasy $y]/$@scale]} #if {$@crosshair} {$self show_crosshair $x $y} ! $self motion [expr [$c canvasx $x]/$@scale] [expr [$c canvasy $y]/$@scale] $f } def Canvas click_wrap {x y b f} { set c .$self.c ! $self click [expr [$c canvasx $x]/$@scale] [expr [$c canvasy $y]/$@scale] [expr $b*256+$f] } def Canvas unclick_wrap {x y b f} { set c .$self.c ! $self unclick [expr [$c canvasx $x]/$@scale] [expr [$c canvasy $y]/$@scale] [expr $b*256+$f] } def Canvas key_wrap {x y key iso shift} { --- 1869,1892 ---- #if {$@crosshair} {$self show_crosshair [expr [$c canvasx $x]/$@scale] [expr [$c canvasy $y]/$@scale]} #if {$@crosshair} {$self show_crosshair $x $y} ! set x [expr [$c canvasx $x]/$@scale] ! set y [expr [$c canvasy $y]/$@scale] ! set target [$self identify_target $x $y $f "motion"] ! $self motion $x $y $f $target } def Canvas click_wrap {x y b f} { set c .$self.c ! set x [expr [$c canvasx $x]/$@scale] ! set y [expr [$c canvasy $y]/$@scale] ! set f [expr 1<<($b+7)|$f] ! set target [$self identify_target $x $y $f "click"] ! $self click $x $y $f $target } def Canvas unclick_wrap {x y b f} { set c .$self.c ! set x [expr [$c canvasx $x]/$@scale] ! set y [expr [$c canvasy $y]/$@scale] ! set f [expr 1<<($b+7)|$f] ! set target [$self identify_target $x $y $f "unclick"] ! $self unclick $x $y $f $target } def Canvas key_wrap {x y key iso shift} { *************** *** 1924,1928 **** #!@#$ this method is too long ! def* Canvas motion {x y f} { global font canvas tooltip set canvas(current) $self --- 1938,1942 ---- #!@#$ this method is too long ! def* Canvas motion {x y f target} { global font canvas tooltip set canvas(current) $self *************** *** 1939,1944 **** set @curpos [list $x $y] # detects if the focus is not on the canvas itself in run mode, ie. numbox ! if {!$@editmode & [$self focus] != $self & [$self focus] != ""} {[$self focus] motion $x $y $f} ! set target [$self identify_target $x $y $f "motion"] mset {type id detail} $target switch $@action { --- 1953,1957 ---- set @curpos [list $x $y] # detects if the focus is not on the canvas itself in run mode, ie. numbox ! if {!$@editmode & [$self focus] != $self & [$self focus] != ""} {[$self focus] motion $x $y $f $target} mset {type id detail} $target switch $@action { *************** *** 1966,1970 **** object { if {$@editmode} {set event motionedit} {set event motion} ! $id $event $x $y $f } wire {} --- 1979,1983 ---- object { if {$@editmode} {set event motionedit} {set event motion} ! $id $event $x $y $f $target } wire {} *************** *** 1979,1983 **** # wire $id : a wire # nothing : nothing ! def Canvas identify_target2 {x y f label} { set c .$self.c set cx [expr $x*$@scale] --- 1992,1996 ---- # wire $id : a wire # nothing : nothing ! def Canvas identify_target {x y f label} { set c .$self.c set cx [expr $x*$@scale] *************** *** 1999,2003 **** return [list "object" $id] } ! puts "skipped a $class" } } --- 2012,2016 ---- return [list "object" $id] } ! #puts "skipped a $class" } } *************** *** 2008,2017 **** } - def Canvas identify_target {x y f label} { - set r [$self identify_target2 $x $y $f $label] - puts "\[identify_target $x $y $f $label\] returns: $r" - return $r - } - #-----------------------------------------------------------------------------------# class_new StatusBar {View} ;# no, using View is wrong here. View is for tk canvas item collections. --- 2021,2024 ---- *************** *** 2056,2060 **** [expr $x-2] [expr $y-2] [expr $x+2] [expr $y+2]] end]] foreach {type id} [$@canvas identify_target $x $y -1 "status"] {} ! switch $type { object { if {[info exists _($id:pdclass)]} {set class $_($id:pdclass)} {set class unknown} --- 2063,2067 ---- [expr $x-2] [expr $y-2] [expr $x+2] [expr $y+2]] end]] foreach {type id} [$@canvas identify_target $x $y -1 "status"] {} ! switch -- $type { object { if {[info exists _($id:pdclass)]} {set class $_($id:pdclass)} {set class unknown} *************** *** 2062,2066 **** } wire {set t "$id wire"} ! default {set t "... $tags"} } if {[string length [$@canvas focus]]} {set t "focus: [$@canvas focus]"} --- 2069,2073 ---- } wire {set t "$id wire"} ! default {set t "type=$type ... $tags"} } if {[string length [$@canvas focus]]} {set t "focus: [$@canvas focus]"} *************** *** 2250,2254 **** $self draw } ! def SelRect unclick {x y bf target} { $self motion $x $y 0 $target set sel {} --- 2257,2261 ---- $self draw } ! def SelRect unclick {x y f target} { $self motion $x $y 0 $target set sel {} *************** *** 2286,2292 **** #!@#$ this method is too long # this method receives (x,y) in descaled coords ! def* Canvas clickedit {x y f} { set c .[$self canvas].c - set target [$self identify_target $x $y $f "click"] mset {type id detail} $target if {$f&8} {$self popup $id [winfo pointerx $c] [winfo pointery $c]; return} --- 2293,2298 ---- #!@#$ this method is too long # this method receives (x,y) in descaled coords ! def* Canvas clickedit {x y f target} { set c .[$self canvas].c mset {type id detail} $target if {$f&8} {$self popup $id [winfo pointerx $c] [winfo pointery $c]; return} *************** *** 2348,2352 **** # should be renamed to "click" when the other "click" becomes unneeded. ! def* Canvas click {x y f} { if {[winfo exists .completion]} { raise .completion --- 2354,2358 ---- # should be renamed to "click" when the other "click" becomes unneeded. ! def* Canvas click {x y f target} { if {[winfo exists .completion]} { raise .completion *************** *** 2357,2379 **** focus $c set @click_at [list $x $y] ! #if {$@editmode && !($f&2)} {$self clickedit $x $y $f; return} ! if {$@editmode} {$self clickedit $x $y $f; return} ! mset {type id} [$self identify_target $x $y $f "click"] if {![llength $id]} {return} switch $type { ! object {$id click $x $y $f} ! wire {$id click $x $y $f} default {error BORK} } } ! def* Canvas unclickedit {x y f} { set c .$self.c ! mset {type id detail} [$self identify_target $x $y $f "unclick"] switch $@action { ! edit { ! set @obj_in_edit $id ! $id edit ! } move { foreach obj $@selection {pd .$self object_moveto !$obj [$obj xy]} --- 2363,2382 ---- focus $c set @click_at [list $x $y] ! #if {$@editmode && !($f&2)} {$self clickedit $x $y $f $target; return} ! if {$@editmode} {$self clickedit $x $y $f $target; return} ! mset {type id} $target if {![llength $id]} {return} switch $type { ! object {$id click $x $y $f $target} ! wire {$id click $x $y $f $target} default {error BORK} } } ! def* Canvas unclickedit {x y f target} { set c .$self.c ! mset {type id detail} $target switch $@action { ! edit {set @obj_in_edit $id; $id edit} move { foreach obj $@selection {pd .$self object_moveto !$obj [$obj xy]} *************** *** 2383,2398 **** } none {} ! default { ! set target [$self identify_target $x $y $f "unclick"] ! $@action unclick $x $y $f $target ! } } } ! def* Canvas unclick {x y f} { if {$@editmode} { ! $self unclickedit $x $y $f } else { ! if {[$self focus] != ""} {[$self focus] unclick $x $y $b} } $self adjust_scrollbars --- 2386,2398 ---- } none {} ! default {$@action unclick $x $y $f $target} } } ! def* Canvas unclick {x y f target} { if {$@editmode} { ! $self unclickedit $x $y $f $target } else { ! if {[$self focus] != ""} {[$self focus] unclick $x $y $f $target} } $self adjust_scrollbars *************** *** 3036,3050 **** set unborn_child [lsearch $_($c:unborn) $self] if {$unborn_child > -1} { - puts "subscribing unborn child:: $self" - $self subscribe $c $self canvas= $c ! $self draw ;# this shouldn't be here! if {$unborn_child == [expr [llength $_($c:unborn)] - 1]} { # when it reachs the last unborn child, its time to draw the wires # the end of duplication ! puts "### at $self, [llength $_($c:unborn)] unborn children: $_($c:unborn)" set _($c:unborn) "" if {[info exists _($c:unborn_wire)]} { ! puts "time to draw wires ----- $_($c:unborn_wire)" $c wires= $_($c:unborn_wire) #set _($c:unborn_wire) "" --- 3036,3049 ---- set unborn_child [lsearch $_($c:unborn) $self] if {$unborn_child > -1} { $self canvas= $c ! $self subscribe $c ! $self changed if {$unborn_child == [expr [llength $_($c:unborn)] - 1]} { # when it reachs the last unborn child, its time to draw the wires # the end of duplication ! #puts "### at $self, [llength $_($c:unborn)] unborn children: $_($c:unborn)" set _($c:unborn) "" if {[info exists _($c:unborn_wire)]} { ! #puts "time to draw wires ----- $_($c:unborn_wire)" $c wires= $_($c:unborn_wire) #set _($c:unborn_wire) "" *************** *** 3098,3112 **** } ! def MessageBox click {x y b f} { $self bang 1 - $@canvas focus= $self pd .$self bang after 150 $self bang 0 } - def MessageBox unclick {x y mod} { - $@canvas focus= "" - } - def MessageBox bang {flag} { .$(a)canvas.c itemconfigure ${self}BASE -fill \ --- 3097,3106 ---- } ! def MessageBox click {x y f target} { $self bang 1 pd .$self bang after 150 $self bang 0 } def MessageBox bang {flag} { .$(a)canvas.c itemconfigure ${self}BASE -fill \ *************** *** 3176,3180 **** } ! def BlueBox motionedit {args} { #puts "motions in $self in edit mode" } --- 3170,3174 ---- } ! def BlueBox motionedit {x y f target} { #puts "motions in $self in edit mode" } *************** *** 3532,3536 **** } ! def AtomBox click {x y b f} { set c .$(a)canvas.c set @clickpos [list $x $y] --- 3526,3530 ---- } ! def AtomBox click {x y f target} { set c .$(a)canvas.c set @clickpos [list $x $y] *************** *** 3543,3547 **** } ! def AtomBox unclick {x y b} { set @clicking 0 if {[lindex $@clickpos 0] == $x && [lindex $@clickpos 1] == $y} { --- 3537,3541 ---- } ! def AtomBox unclick {x y f target} { set @clicking 0 if {[lindex $@clickpos 0] == $x && [lindex $@clickpos 1] == $y} { *************** *** 3557,3561 **** } ! def FloatAtom motion {x y mod} { set focused [$self == [$@canvas focus]] if {!$focused} {return} --- 3551,3555 ---- } ! def FloatAtom motion {x y f target} { set focused [$self == [$@canvas focus]] if {!$focused} {return} *************** *** 3648,3652 **** } ! def NumBox click {x y b f} { $@canvas focus= $self .$(a)canvas.c itemconfigure ${self}BASE4 -fill #00ff00 --- 3642,3646 ---- } ! def NumBox click {x y f target} { $@canvas focus= $self .$(a)canvas.c itemconfigure ${self}BASE4 -fill #00ff00 *************** *** 3658,3662 **** } ! def NumBox motion {x y mod} { set focused [$self == [$@canvas focus]] if {!$focused || !$@clicking} {return} --- 3652,3656 ---- } ! def NumBox motion {x y f target} { set focused [$self == [$@canvas focus]] if {!$focused || !$@clicking} {return} *************** *** 3672,3676 **** def NumBox unfocus {} {set @buf ""; $self changed} ! def NumBox unclick {x y b} { set @clicking 0 #if {$@oval!=$@val} { --- 3666,3670 ---- def NumBox unfocus {} {set @buf ""; $self changed} ! def NumBox unclick {x y f target} { set @clicking 0 #if {$@oval!=$@val} { *************** *** 3777,3781 **** } ! def Radio click {x y b f} { $@canvas focus= $self mset {x1 y1} [$self xy] --- 3771,3775 ---- } ! def Radio click {x y f target} { $@canvas focus= $self mset {x1 y1} [$self xy] *************** *** 3787,3791 **** } ! def Radio unclick {x y mod} {$@canvas focus= ""} class_new Slider {BlueBox} --- 3781,3785 ---- } ! def Radio unclick {x y f target} {$@canvas focus= ""} class_new Slider {BlueBox} *************** *** 3860,3864 **** } ! def Slider click {x y b f} { $@canvas focus= $self set @first [list $x $y] --- 3854,3858 ---- } ! def Slider click {x y f target} { $@canvas focus= $self set @first [list $x $y] *************** *** 3868,3872 **** } ! def Slider unclick {x y mod} { set @clicking 0 if {[lindex $@first 1] != $y} { --- 3862,3866 ---- } ! def Slider unclick {x y f target} { set @clicking 0 if {[lindex $@first 1] != $y} { *************** *** 3878,3882 **** } ! def Slider motion {x y f} { set focused [$self == [$@canvas focus]] if {!$focused} {return} --- 3872,3876 ---- } ! def Slider motion {x y f target} { set focused [$self == [$@canvas focus]] if {!$focused} {return} *************** *** 3940,3946 **** ! def Bang unclick {x y b} {$@canvas focus= ""} ! def Bang click {x y b f} { $@canvas focus= $self pd .$self bang --- 3934,3940 ---- ! def Bang unclick {x y f target} {$@canvas focus= ""} ! def Bang click {x y f target} { $@canvas focus= $self pd .$self bang *************** *** 3985,3989 **** } ! def Toggle click {x y b f} { pd .$self bang if {!$@on} {set @on 1} {set @on 0} --- 3979,3983 ---- } ! def Toggle click {x y f target} { pd .$self bang if {!$@on} {set @on 1} {set @on 0} *************** *** 3993,3997 **** } ! def Toggle unclick {x y b} { set @clicking 0 $@canvas focus= "" --- 3987,3991 ---- } ! def Toggle unclick {x y f target} { set @clicking 0 $@canvas focus= ""

1 0

pd/src desire.tk, 1.1.2.344, 1.1.2.345 objective.tcl, 1.1.2.13, 1.1.2.14
by Mathieu Bouchard 15 Aug '06

15 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22320 Modified Files: Tag: devel_0_39 desire.tk objective.tcl Log Message: fixed bug of canvas items gradually disappearing due to conflict between objective.tcl's pointers and canvas tags interpreted as octal indices. Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.344 retrieving revision 1.1.2.345 diff -C2 -d -r1.1.2.344 -r1.1.2.345 *** desire.tk 15 Aug 2006 17:47:23 -0000 1.1.2.344 --- desire.tk 15 Aug 2006 19:47:31 -0000 1.1.2.345 *************** *** 1936,1944 **** eval $@dehighlight set @dehighlight {} - # backup values set oldpos $@curpos set @curpos [list $x $y] # detects if the focus is not on the canvas itself in run mode, ie. numbox if {!$@editmode & [$self focus] != $self & [$self focus] != ""} {[$self focus] motion $x $y $f} switch $@action { move { --- 1936,1945 ---- eval $@dehighlight set @dehighlight {} set oldpos $@curpos set @curpos [list $x $y] # detects if the focus is not on the canvas itself in run mode, ie. numbox if {!$@editmode & [$self focus] != $self & [$self focus] != ""} {[$self focus] motion $x $y $f} + set target [$self identify_target $x $y $f "motion"] + mset {type id detail} $target switch $@action { move { *************** *** 1957,1966 **** #default {error "unknown action '$@action'"} default { - set target [$self identify_target $x $y $f "motion"] $@action motion $x $y $f $target } } - set target [$self identify_target $x $y -1 "move"] - mset {type id detail} $target switch $type { inlet {set port [$id hilite_io i $x $y]; set @dehighlight [list $c delete ${id}i${port}b]} --- 1958,1964 ---- *************** *** 1988,2004 **** foreach tag $stack { set tags [$c gettags $tag] ! if {[regexp {^x([a-f0-9]{6,8})} $tags id]} { ! if {[info exists _($id:pdclass)]} {set class $_($id:pdclass)} {set class unknown} ! mset {x1 y1 x2 y2} [$id bbox] ! set outs [$id noutlets] ! set ins [$id ninlets] ! if {$y>=$y2-6 && $outs} {return [list "outlet" $id [expr int(($x-$x1)*$outs/($x2-$x1))]]} ! if {$y< $y1+2 && $ins} {return [list "inlet" $id [expr int(($x-$x1)* $ins/($x2-$x1))]]} ! return [list "object" $id] } } foreach tag $stack { set tags [$c gettags $tag] - if {[regexp {^([0-9a-f]{6,8})} $tags id]} {return [list "wire" $id]} } return [list "nothing"] --- 1986,2007 ---- foreach tag $stack { set tags [$c gettags $tag] ! if {[regexp {^[xo][0-9a-f]{6,8}} $tags id]} { ! # prior to Aug 15th, Wires had lower priority as all objects together ! # now it's same priority, so just stacking order (and it's prolly wrong) ! set class [$id _class] ! if {[$class inherit? Wire]} {return [list "wire" $id]} ! if {[$class inherit? Box]} { ! mset {x1 y1 x2 y2} [$id bbox] ! set outs [$id noutlets] ! set ins [$id ninlets] ! if {$y>=$y2-6 && $outs} {return [list "outlet" $id [expr int(($x-$x1)*$outs/($x2-$x1))]]} ! if {$y< $y1+2 && $ins} {return [list "inlet" $id [expr int(($x-$x1)* $ins/($x2-$x1))]]} ! return [list "object" $id] ! } ! puts "skipped a $class" } } foreach tag $stack { set tags [$c gettags $tag] } return [list "nothing"] *************** *** 2007,2011 **** def Canvas identify_target {x y f label} { set r [$self identify_target2 $x $y $f $label] ! #puts "\[identify_target $x $y $f $label\] returns: $r" return $r } --- 2010,2014 ---- def Canvas identify_target {x y f label} { set r [$self identify_target2 $x $y $f $label] ! puts "\[identify_target $x $y $f $label\] returns: $r" return $r } *************** *** 2035,2048 **** $self addw 1 action 4 " Action: " $self addw 1 sel 4 " Sel: " ! $self addw 2 wfrom 12 " WireFrom: " ! $self addw 2 wto 12 " WireTo: " } def Canvas statusbar_draw {x y} {$@statusbar draw $x $y} def Canvas action {} {return $@action} - #def Canvas wire_from {} {return $@wire_from} - #def Canvas wire_to {} {return $@wire_to} - def Canvas wire_from {} {return somewhere.} - def Canvas wire_to {} {return someplace.} def Canvas scale {} {return $@scale} --- 2038,2047 ---- $self addw 1 action 4 " Action: " $self addw 1 sel 4 " Sel: " ! #$self addw 2 wfrom 12 " WireFrom: " ! #$self addw 2 wto 12 " WireTo: " } def Canvas statusbar_draw {x y} {$@statusbar draw $x $y} def Canvas action {} {return $@action} def Canvas scale {} {return $@scale} *************** *** 2071,2076 **** $f.1.action configure -text [$@canvas action] $f.1.sel configure -text [llength [$@canvas selection]] ! $f.2.wfrom configure -text [$@canvas wire_from] ! $f.2.wto configure -text [$@canvas wire_to] } --- 2070,2075 ---- $f.1.action configure -text [$@canvas action] $f.1.sel configure -text [llength [$@canvas selection]] ! #$f.2.wfrom configure -text [$@canvas wire_from] ! #$f.2.wto configure -text [$@canvas wire_to] } *************** *** 2332,2336 **** mset {x1 y1 x2 y2} [$c bbox ${obj1}o${outlet}] $c create line [expr ($x1+$x2)/2] [expr ($y1+$y2)/2] $x $y -dash {4 4 4 4} -tags lnew -fill [look wiredash] ! set @wire_from [list $obj1 $outlet] set @action wire } --- 2331,2335 ---- mset {x1 y1 x2 y2} [$c bbox ${obj1}o${outlet}] $c create line [expr ($x1+$x2)/2] [expr ($y1+$y2)/2] $x $y -dash {4 4 4 4} -tags lnew -fill [look wiredash] ! #set @wire_from [list $obj1 $outlet] set @action wire } Index: objective.tcl =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/objective.tcl,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -C2 -d -r1.1.2.13 -r1.1.2.14 *** objective.tcl 21 Jun 2006 06:05:59 -0000 1.1.2.13 --- objective.tcl 15 Aug 2006 19:47:31 -0000 1.1.2.14 *************** *** 58,62 **** proc ${self}_new {args} " global nextid _ ! set self \[format %08x \$nextid\] incr nextid set _(\$self:_class) $self --- 58,62 ---- proc ${self}_new {args} " global nextid _ ! set self \[format o%07x \$nextid\] incr nextid set _(\$self:_class) $self *************** *** 117,125 **** class_new Thing {} #set _(Thing:_super) {} ! def* Thing init {} {} def Thing == {other} {return [expr ![string compare $self $other]]} # virtual destructor ! def* Thing _delete {} {} def Thing _vars {} { --- 117,125 ---- class_new Thing {} #set _(Thing:_super) {} ! def Thing init {} {} def Thing == {other} {return [expr ![string compare $self $other]]} # virtual destructor ! def Thing _delete {} {} def Thing _vars {} { *************** *** 139,144 **** --- 139,157 ---- } + def Thing _class {} {return $@_class} + class_new Class def Class subclasses {} {return $@subclasses} + def Class inherit? {class} { + return [expr [lsearch [$self ancestors] $class]>=0] + } + + def Class ancestors {} { + set r [list $self] + foreach super $@_super {eval [concat [list lappend r] [$super ancestors]]} + return $r + } + + # those are static methods, and objective.tcl doesn't distinguish them yet. def Class new { args} {eval [concat [list ${self}_new ] $args]} def Class new_as {id args} {eval [concat [list ${self}_new_as $id] $args]}

1 0

pd/src desire.tk,1.1.2.343,1.1.2.344
by Mathieu Bouchard 15 Aug '06

15 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12443 Modified Files: Tag: devel_0_39 desire.tk Log Message: Alt+arrows use quadrant-based navigation Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.343 retrieving revision 1.1.2.344 diff -C2 -d -r1.1.2.343 -r1.1.2.344 *** desire.tk 15 Aug 2006 16:49:57 -0000 1.1.2.343 --- desire.tk 15 Aug 2006 17:47:23 -0000 1.1.2.344 *************** *** 1885,1888 **** --- 1885,1926 ---- } + def Canvas altkey {key iso shift} { + switch $key { + Up { $self quadrant +1 -1; return } + Down { $self quadrant -1 +1; return } + Left { $self quadrant +1 +1; return } + Right { $self quadrant -1 -1; return } + } + super $key $iso $shift + } + + proc lsearch_minimum {l} { + set i 0 + set j 0 + set min [lindex $l 0] + foreach o $l { + if {$o < $min} {set i $j; set min $o} + incr j + } + return $i + } + + def* Canvas quadrant {du dv} { + switch $@keynav_current { 0 {set @keynav_current [lindex $@children 0]}} + set foo {} + set bar {} + set pos [$@keynav_current xy] + foreach o $@children { + mset {x y} [l- $pos [$o xy]] + set u [expr $x+$y] + set v [expr $x-$y] + if {$u*$du>0 && $v*$dv>0} {lappend foo $o; lappend bar [distance $pos [$o xy]]} + } + if {![llength $bar]} {return} + set best [lindex $foo [lsearch_minimum $bar]] + set @keynav_current $best + $self selection= $best + } + #!@#$ this method is too long def* Canvas motion {x y f} {

1 0

pd/src/tests city.pd,NONE,1.1.2.1
by Mathieu Bouchard 15 Aug '06

15 Aug '06

Update of /cvsroot/pure-data/pd/src/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25717 Added Files: Tag: devel_0_39 city.pd Log Message: test: 8 rows 8 columns of [+] objects --- NEW FILE: city.pd --- #N canvas 0 0 450 300 10; #X obj 23 20 +; #X obj 23 50 +; #X obj 53 20 +; #X obj 53 50 +; #X obj 23 80 +; #X obj 23 110 +; #X obj 53 80 +; #X obj 53 110 +; #X obj 83 20 +; #X obj 83 50 +; #X obj 113 20 +; #X obj 113 50 +; #X obj 83 80 +; #X obj 83 110 +; #X obj 113 80 +; #X obj 113 110 +; #X obj 143 20 +; #X obj 143 50 +; #X obj 173 20 +; #X obj 173 50 +; #X obj 143 80 +; #X obj 143 110 +; #X obj 173 80 +; #X obj 173 110 +; #X obj 203 20 +; #X obj 203 50 +; #X obj 233 20 +; #X obj 233 50 +; #X obj 203 80 +; #X obj 203 110 +; #X obj 233 80 +; #X obj 233 110 +; #X obj 23 140 +; #X obj 23 170 +; #X obj 53 140 +; #X obj 53 170 +; #X obj 23 200 +; #X obj 23 230 +; #X obj 53 200 +; #X obj 53 230 +; #X obj 83 140 +; #X obj 83 170 +; #X obj 113 140 +; #X obj 113 170 +; #X obj 83 200 +; #X obj 83 230 +; #X obj 113 200 +; #X obj 113 230 +; #X obj 233 200 +; #X obj 203 230 +; #X obj 203 200 +; #X obj 233 170 +; #X obj 233 140 +; #X obj 203 170 +; #X obj 203 140 +; #X obj 173 230 +; #X obj 173 200 +; #X obj 143 230 +; #X obj 143 200 +; #X obj 173 170 +; #X obj 173 140 +; #X obj 143 170 +; #X obj 143 140 +; #X obj 233 230 +;

1 0

pd/src desire.tk,1.1.2.342,1.1.2.343
by Mathieu Bouchard 15 Aug '06

15 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24242 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed moving of multiple selection. Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.342 retrieving revision 1.1.2.343 diff -C2 -d -r1.1.2.342 -r1.1.2.343 *** desire.tk 15 Aug 2006 16:34:49 -0000 1.1.2.342 --- desire.tk 15 Aug 2006 16:49:57 -0000 1.1.2.343 *************** *** 2340,2344 **** } move { ! foreach obj $@selection {pd .$self object_moveto !$obj $x $y} set objs $@selection $@history add [list $self undomove $objs] --- 2340,2344 ---- } move { ! foreach obj $@selection {pd .$self object_moveto !$obj [$obj xy]} set objs $@selection $@history add [list $self undomove $objs]

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs August 2006