Pd-cvs December 2006

pd-cvs@lists.iem.at

19 participants
825 discussions

pd/src desire.c,1.1.2.217.2.76,1.1.2.217.2.77
by Mathieu Bouchard 19 Dec '06

19 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14698 Modified Files: Tag: desiredata desire.c Log Message: comment defaults to no text. [vu] defaults to black bg. Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.76 retrieving revision 1.1.2.217.2.77 diff -C2 -d -r1.1.2.217.2.76 -r1.1.2.217.2.77 *** desire.c 19 Dec 2006 00:31:54 -0000 1.1.2.217.2.76 --- desire.c 19 Dec 2006 03:29:15 -0000 1.1.2.217.2.77 *************** *** 5825,5846 **** t_atom at; x->binbuf = binbuf_new(); ! if (argc > 1) { ! x->x = atom_getintarg(0, argc, argv); ! x->y = atom_getintarg(1, argc, argv); ! if (argc > 2) binbuf_restore(x->binbuf, argc-2, argv+2); ! else { ! SETSYMBOL(&at, gensym("comment")); ! binbuf_restore(x->binbuf, 1, &at); ! } ! canvas_add(gl,x); ! } else { ! int xpix, ypix; ! SETSYMBOL(&at, gensym("comment")); ! xpix=ypix=0; ! x->x = (int)canvas_pixelstox(gl, xpix-3); ! x->y = (int)canvas_pixelstoy(gl, ypix-3); ! binbuf_restore(x->binbuf, 1, &at); ! canvas_add(gl,x); ! } pd_set_newest(x); } --- 5825,5832 ---- t_atom at; x->binbuf = binbuf_new(); ! x->x = atom_getintarg(0, argc, argv); ! x->y = atom_getintarg(1, argc, argv); ! if (argc > 2) binbuf_restore(x->binbuf, argc-2, argv+2); ! canvas_add(gl,x); pd_set_newest(x); } *************** *** 7139,7142 **** --- 7125,7129 ---- SET(out_rms ,outlet_new(x, &s_float)); SET(out_peak,outlet_new(x, &s_float)); + SET(bcol,0x000000); SET(h,IEM_VU_STEPS*3); SET(scale,1);

1 0

pd/src desire.tk,1.1.2.600.2.108,1.1.2.600.2.109
by Mathieu Bouchard 19 Dec '06

19 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7131 Modified Files: Tag: desiredata desire.tk Log Message: class_new IEMGUI {} is a mixin that fixes the missing properties_apply in [vu], [cnv], [nbx] Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.108 retrieving revision 1.1.2.600.2.109 diff -C2 -d -r1.1.2.600.2.108 -r1.1.2.600.2.109 *** desire.tk 19 Dec 2006 02:56:57 -0000 1.1.2.600.2.108 --- desire.tk 19 Dec 2006 03:08:02 -0000 1.1.2.600.2.109 *************** *** 4544,4548 **** } ! class_new BlueBox {Labeled Box} #class_new BlueBox {Box Labeledo} --- 4544,4549 ---- } ! class_new IEMGUI {} ! class_new BlueBox {Labeled IEMGUI Box} #class_new BlueBox {Box Labeledo} *************** *** 4562,4566 **** } ! def BlueBox popup_properties {} {IEMPropertiesDialog new $self} class_new PropertiesDialog {Dialog} --- 4563,4567 ---- } ! def IEMGUI popup_properties {} {IEMPropertiesDialog new $self} class_new PropertiesDialog {Dialog} *************** *** 4584,4593 **** class_new IEMPropertiesDialog {PropertiesDialog} ! def BlueBox properties_apply {args} { ! global fields set orig [list $self properties_apply] ! foreach var [lrange $fields($@class) 5 end] {lappend orig $@$var} [$@canvas history] add $orig - set tosend {} foreach v $args {switch -- $v {{} {set v "empty"}}; lappend props $v} netsend [concat [list .$self reload] $props] --- 4585,4592 ---- class_new IEMPropertiesDialog {PropertiesDialog} ! def IEMGUI properties_apply {args} { set orig [list $self properties_apply] ! foreach var [lrange $::fields($@class) 5 end] {lappend orig $@$var} [$@canvas history] add $orig foreach v $args {switch -- $v {{} {set v "empty"}}; lappend props $v} netsend [concat [list .$self reload] $props] *************** *** 4930,4935 **** } def SymbolBox motion {x y f target} {} ! class_new NumBox {Labeled AtomBox} ! def NumBox popup_properties {} {IEMPropertiesDialog new $self} def NumBox init {mess} { --- 4929,4933 ---- } def SymbolBox motion {x y f target} {} ! class_new NumBox {Labeled IEMGUI AtomBox} def NumBox init {mess} { *************** *** 5228,5232 **** } ! class_new Vu {Box} set vu_col { --- 5226,5230 ---- } ! class_new Vu {IEMGUI Box} set vu_col { *************** *** 5235,5240 **** } - def Vu popup_properties {} {IEMPropertiesDialog new $self} - def Vu init {mess} { super $mess --- 5233,5236 ---- *************** *** 5336,5342 **** def Dropper erase {} {destroy $(a)canvas.${self}DROP; super} ! class_new Cnv {Labeled Box} ! ! def Cnv popup_properties {} {IEMPropertiesDialog new $self} def Cnv draw {} { --- 5332,5336 ---- def Dropper erase {} {destroy $(a)canvas.${self}DROP; super} ! class_new Cnv {Labeled IEMGUI Box} def Cnv draw {} {

1 0

pd/src desire.tk,1.1.2.600.2.107,1.1.2.600.2.108
by Mathieu Bouchard 19 Dec '06

19 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3171 Modified Files: Tag: desiredata desire.tk Log Message: class_new Tooltip Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.107 retrieving revision 1.1.2.600.2.108 diff -C2 -d -r1.1.2.600.2.107 -r1.1.2.600.2.108 *** desire.tk 19 Dec 2006 01:55:54 -0000 1.1.2.600.2.107 --- desire.tk 19 Dec 2006 02:56:57 -0000 1.1.2.600.2.108 *************** *** 2703,2706 **** --- 2703,2707 ---- def Canvas motion_checkhairtip {target x y} { + global tooltip if {[$self look hairstate] && $@editmode} { $@crosshair data= $x $y $target *************** *** 2710,2714 **** } if {[$self look tooltip]} { ! if {!$::tooltip(stay) && [expr [distance $::tooltip(curpos) [list $x $y]] > 10]} {$self hide_tooltip} } } --- 2711,2718 ---- } if {[$self look tooltip]} { ! if {$tooltip ne "" && ![$tooltip iserror] && [expr [distance [$tooltip curpos] [list $x $y]] > 10]} { ! $tooltip delete ! set tooltip "" ! } } } *************** *** 3810,3814 **** def Canvas key {x y key iso shift} { ! $self hide_tooltip if {[$self focus] != ""} { [$self focus] key $key $shift --- 3814,3818 ---- def Canvas key {x y key iso shift} { ! global tooltip; if {$tooltip ne ""} {$tooltip delete; set tooltip ""} if {[$self focus] != ""} { [$self focus] key $key $shift *************** *** 5646,5687 **** #def Crosshair erase {} {$self item_delete VHAIR1; $self item_delete HHAIR1} ! ############ tooltips ! set tooltip(curpos) {-1000 -1000} ! set tooltip(canvas) "" ! set tooltip(visible) 0 ! set tooltip(text) "" ! set tooltip(stay) 0 ! def Canvas show_tooltip {x y text type {stay 0}} { ! global tooltip ! if {$tooltip(visible) && [string compare $text $tooltip(text)]==0} {return} ! $self hide_tooltip ! set x [expr $x+4] ! set c [$self widget] ! mset {x y} [lmap * [list $x $y] $@zoom] ! # it's wrong to hardcode "20" here ! switch $type { i {set y [expr $y - 20]} o {set y [expr $y + 20]} } ! if {$stay} { set fg "#ffffff"; set bg "#dd0000" } else { set fg "#000000"; set bg "#ffffcc" } ! $c create text $x $y -fill $fg -text $text -anchor w -tags tooltip_fg ! mset {x1 y1 x2 y2} [l+ [$c bbox tooltip_fg] [list -4 -4 +4 +4]] ! $c create rectangle $x1 $y1 $x2 $y2 -fill $bg -outline $fg -tags tooltip_bg ! $c lower tooltip_bg tooltip_fg ! set tooltip(curpos) $@curpos ! set tooltip(canvas) $self ! set tooltip(visible) 1 ! set tooltip(text) $text ! set tooltip(stay) $stay } ! def Canvas hide_tooltip {} { global tooltip ! set c [$self widget] ! $c delete tooltip_bg tooltip_fg ! set tooltip(visible) 0 } --- 5650,5703 ---- #def Crosshair erase {} {$self item_delete VHAIR1; $self item_delete HHAIR1} ! ############ tooltips (only those that are drawn as canvas items) ! class_new Tooltip {View} ! def Tooltip init {canvas pos curpos text type iserror} { ! set @canvas $canvas ! set @pos $pos ! set @curpos $curpos ! set @text $text ! set @type $type ! set @iserror $iserror ! } ! ! def Tooltip iserror {} {return $@iserror} ! def Tooltip curpos {} {return $@curpos} ! def Tooltip text {} {return $@text} ! ! def Tooltip draw {} { ! set c [$@canvas widget] ! if {$@iserror} { set fg "#ffffff"; set bg "#dd0000" } else { set fg "#000000"; set bg "#ffffcc" } ! mset {x y} $@pos ! switch -- $@type { ! o {set ny [expr {$y+24}]} ! i {set ny [expr {$y-24}]} ! } ! $self item TEXT text [list [expr $x+12] $ny] -fill $fg -text $@text -anchor w ! mset {x1 y1 x2 y2} [l+ [$c bbox ${self}TEXT] [list -4 -4 +4 +4]] ! logvar x1 y1 x2 y2 ! switch -- $@type { ! o {set coords [list $x1 $y1 [expr $x1+8] $y1 $x $y [expr $x1+16] $y1 $x2 $y1 $x2 $y2 $x1 $y2 $x1 $y1]} ! i {set coords [list $x1 $y1 $x2 $y1 $x2 $y2 [expr $x1+16] $y2 $x $y [expr $x1+8] $y2 $x1 $y2 $x1 $y1]} ! } ! $self item RECT polygon $coords -fill $bg -outline $fg ! $c lower ${self}RECT ${self}TEXT } ! # $c delete tooltip_bg tooltip_fg ! ! set tooltip "" ! ! def Canvas show_tooltip {x y text type {iserror 0}} { global tooltip ! if {$tooltip ne "" && [$tooltip text] eq $text} {return} ! if {$tooltip ne ""} {$tooltip delete} ! set tooltip [Tooltip new $self [list $x $y] $@curpos $text $type $iserror] ! $tooltip draw }

1 0

pd/src desire.tk,1.1.2.600.2.106,1.1.2.600.2.107
by chunlee 19 Dec '06

19 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12957 Modified Files: Tag: desiredata desire.tk Log Message: reintroduce focus= for TextBox, AtomBox has its own def unedit Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.106 retrieving revision 1.1.2.600.2.107 diff -C2 -d -r1.1.2.600.2.106 -r1.1.2.600.2.107 *** desire.tk 19 Dec 2006 01:49:10 -0000 1.1.2.600.2.106 --- desire.tk 19 Dec 2006 01:55:54 -0000 1.1.2.600.2.107 *************** *** 2161,2165 **** bind $t <Return> "$self unedit" bind $t <Escape> "$self unedit 0" ! bind $t <FocusOut> "$self unedit" mset {cx cy} [$self xy] $self item text window [l+ $@textoffset [$self xy]] \ --- 2161,2166 ---- bind $t <Return> "$self unedit" bind $t <Escape> "$self unedit 0" ! #bind $t <FocusOut> "$self unedit" ! $@canvas focus= $self mset {cx cy} [$self xy] $self item text window [l+ $@textoffset [$self xy]] \ *************** *** 2374,2377 **** --- 2375,2379 ---- if {[winfo exists .completion]} {$@action cancel} focus $c + $@canvas focus= "" } *************** *** 3370,3373 **** --- 3372,3376 ---- def Canvas click_on_nothing {f target x y} { + if {$@focus != ""} {if {[[$@focus class] <= TextBox]} {$@focus unedit}} if {![expr $f&255]} { $self deselect_all *************** *** 4892,4898 **** } def AtomBox unedit {{accept 1}} { if {!$@edit} {return} ! super } --- 4895,4919 ---- } + #def AtomBox unedit {{accept 1}} { + # if {!$@edit} {return} + # super + #} + def AtomBox unedit {{accept 1}} { if {!$@edit} {return} ! set @edit 0; $self changed edit ! set c [$@canvas widget] ! set t $c.${self}text ! if {$accept} { ! set val [$t get 1.0 "end - 1 chars"] ! if {![regexp {[a-zA-Z]} $val]} { ! set @val $val ! set @text $val; #quick hack so that TextBox draw picks up the changes ! } ! $self apply_value ! } ! after 1 "destroy $t" ! focus $c ! $@canvas focus= "" } *************** *** 5874,5877 **** --- 5895,5899 ---- $@textbox delete 1.0 1.end $@textbox insert 1.0 $class + $obj unedit destroy .$self

1 0

pd/src desire.tk,1.1.2.600.2.105,1.1.2.600.2.106
by Mathieu Bouchard 19 Dec '06

19 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10568 Modified Files: Tag: desiredata desire.tk Log Message: using rect_centre Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.105 retrieving revision 1.1.2.600.2.106 diff -C2 -d -r1.1.2.600.2.105 -r1.1.2.600.2.106 *** desire.tk 19 Dec 2006 01:34:51 -0000 1.1.2.600.2.105 --- desire.tk 19 Dec 2006 01:49:10 -0000 1.1.2.600.2.106 *************** *** 3176,3197 **** mset {type from port} $target switch $type { ! outlet { set @from $from set @outlet $port set @to "" set @inlet "" ! mset {x1 y1 x2 y2} [lmap / [[$@canvas widget] bbox ${from}o${port}] [$@canvas zoom]] ! } ! inlet { set @from "" set @outlet "" set @to $from set @inlet $port ! mset {x1 y1 x2 y2} [lmap / [[$@canvas widget] bbox ${from}i${port}] [$@canvas zoom]] ! } } ! #mset {x1 y1 x2 y2} [lmap / [[$@canvas widget] bbox ${from}o${outlet}] [$@canvas zoom]] ! set @x1 [expr ($x1+$x2)/2] ! set @y1 [expr ($y1+$y2)/2] $self motion $@x1 $@y1 $f $target } --- 3176,3197 ---- mset {type from port} $target switch $type { ! outlet { set @from $from set @outlet $port set @to "" set @inlet "" ! set type o ! } ! inlet { set @from "" set @outlet "" set @to $from set @inlet $port ! set type i ! } } ! mset {x y} [lmap / [rect_centre [[$@canvas widget] bbox ${from}i${port}]] [$@canvas zoom]] ! set @x1 $x ! set @y1 $y $self motion $@x1 $@y1 $f $target } *************** *** 3356,3368 **** set from [lindex $@children [lindex $wire 0]]; set outlet [lindex $wire 1] set to [lindex $@children [lindex $wire 2]]; set inlet [lindex $wire 3] ! mset {x1 y1 x2 y2} [lmap / [$c bbox ${from}o${outlet}] [$self zoom]] ! mset {x3 y3 x4 y4} [lmap / [$c bbox ${to}i${inlet}] [$self zoom]] ! set d_outlet [distance [list $x $y] [list [expr ($x1+$x2)/2] [expr ($y1+$y2)/2]]] ! set d_inlet [distance [list $x $y] [list [expr ($x3+$x4)/2] [expr ($y3+$y4)/2]]] ! if {$d_outlet > $d_inlet} { ! set x5 $x1; set y5 $y1 set target [list outlet $from $outlet] } else { - set x5 [expr ($x3+$x4)/2]; set y5 [expr ($y3+$y4)/2] set target [list inlet $to $inlet] } --- 3356,3365 ---- set from [lindex $@children [lindex $wire 0]]; set outlet [lindex $wire 1] set to [lindex $@children [lindex $wire 2]]; set inlet [lindex $wire 3] ! set opos [lmap / [rect_centre [$c bbox ${from}o${outlet}]] [$self zoom]] ! set ipos [lmap / [rect_centre [$c bbox ${to}i${inlet}]] [$self zoom]] ! set pos [list $x $y] ! if {[distance $pos $opos] > [distance $pos $ipos]} { set target [list outlet $from $outlet] } else { set target [list inlet $to $inlet] } *************** *** 4192,4205 **** def Wire bbox {} { ! set obj1 $@obj1 ! set obj2 $@obj2 ! set port1 $@port1 ! set port2 $@port2 set zoom [$@canvas zoom] set c [$@canvas widget] ! mset {x1 y1 x2 y2} [lmap / [$c bbox ${obj1}o${port1}] $zoom] ! mset {x3 y3 x4 y4} [lmap / [$c bbox ${obj2}i${port2}] $zoom] ! list [expr ($x1+$x2)/2] [expr ($y1+$y2)/2] \ ! [expr ($x3+$x4)/2] [expr ($y3+$y4)/2] } --- 4189,4199 ---- def Wire bbox {} { ! set obj1 $@obj1; set port1 $@port1 ! set obj2 $@obj2; set port2 $@port2 set zoom [$@canvas zoom] set c [$@canvas widget] ! mset {x1 y1} [lmap / [rect_centre [$c bbox ${obj1}o${port1}]] $zoom] ! mset {x2 y2} [lmap / [rect_centre [$c bbox ${obj2}i${port2}]] $zoom] ! list $x1 $y1 $x2 $y2 } *************** *** 4233,4239 **** set iowidth [$@obj1 look iowidth] mset {ox1 oy1 ox2 oy2} [$@obj1 io_bbox o $@port1] ! mset {ix1 iy1 iy2 iy2} [$@obj2 io_bbox i $@port2] ! set x1 [expr $ox1 + $iowidth/2]; set y1 $oy2 ! set x2 [expr $ix1 + $iowidth/2]; set y2 $iy1 set xys [xys $x1 $y1 $x2 $y2] set length [expr sqrt(pow($x2-$x1,2)+pow($y2-$y1,2))] --- 4227,4233 ---- set iowidth [$@obj1 look iowidth] mset {ox1 oy1 ox2 oy2} [$@obj1 io_bbox o $@port1] ! mset {ix1 iy1 ix2 iy2} [$@obj2 io_bbox i $@port2] ! set x1 [expr ($ox1+$ox2)/2]; set y1 $oy2 ! set x2 [expr ($ix1+$ix2)/2]; set y2 $iy1 set xys [xys $x1 $y1 $x2 $y2] set length [expr sqrt(pow($x2-$x1,2)+pow($y2-$y1,2))]

1 0

pd/src desire.tk,1.1.2.600.2.104,1.1.2.600.2.105
by Mathieu Bouchard 19 Dec '06

19 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4996 Modified Files: Tag: desiredata desire.tk Log Message: simplified io_bbox Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.104 retrieving revision 1.1.2.600.2.105 diff -C2 -d -r1.1.2.600.2.104 -r1.1.2.600.2.105 *** desire.tk 19 Dec 2006 01:07:53 -0000 1.1.2.600.2.104 --- desire.tk 19 Dec 2006 01:34:51 -0000 1.1.2.600.2.105 *************** *** 3994,4002 **** } ! def Box io_bbox {type port n} { ! set nplus [expr {$n==1 ? 1 : $n-1}] mset {x1 y1 x2 y2} [$self bbox] set xs [expr {$x2-$x1}] ! # method calls aren't as fast as we'd want them to. #set iowidth [$self look iowidth] #set fy [$self look iopos] --- 3994,4001 ---- } ! def Box io_bbox {type port} { mset {x1 y1 x2 y2} [$self bbox] set xs [expr {$x2-$x1}] ! # method calls aren't as fast as we'd want them to be. #set iowidth [$self look iowidth] #set fy [$self look iopos] *************** *** 4007,4010 **** --- 4006,4010 ---- i {set n $@ninlets; set y [expr {$y1-$fy-1}]} } + set nplus [expr {$n==1 ? 1 : $n-1}] set onset [expr {$x1+($xs-$iowidth)*$port/$nplus}] set points [list $onset $y [expr {$onset+$iowidth}] $y] *************** *** 4074,4081 **** } ! def Box draw_io2 {which n} { ! switch $which { i {set color [$self look inletfg]} o {set color [$self look outletfg]}} for {set i 0} {$i<$n} {incr i} { ! set points [$self io_bbox $which $i $n] $self item [list $which$i $which] rectangle $points -outline $color -fill $color -width 1 [[$self get_canvas] widget] raise $self$which$i --- 4074,4080 ---- } ! def Box draw_io2 {which n color} { for {set i 0} {$i<$n} {incr i} { ! set points [$self io_bbox $which $i] $self item [list $which$i $which] rectangle $points -outline $color -fill $color -width 1 [[$self get_canvas] widget] raise $self$which$i *************** *** 4084,4089 **** def Box draw_io {} { ! $self draw_io2 i $@ninlets ! $self draw_io2 o $@noutlets } --- 4083,4088 ---- def Box draw_io {} { ! $self draw_io2 i $@ninlets [$self look inletfg] ! $self draw_io2 o $@noutlets [$self look outletfg] } *************** *** 4123,4128 **** if {$ports==0 | $port==-1} return if {$port >= $ports} {set port [expr $ports-1]} ! switch $type {i {set ns $@ninlets} o {set ns $@noutlets}} ! $self hilite_io_2 $type $port $ns if {[$self look tooltip]} {$@canvas show_tooltip $x $y [$self tip $type $port] $type} return $port --- 4122,4126 ---- if {$ports==0 | $port==-1} return if {$port >= $ports} {set port [expr $ports-1]} ! $self hilite_io_2 $type $port if {[$self look tooltip]} {$@canvas show_tooltip $x $y [$self tip $type $port] $type} return $port *************** *** 4135,4148 **** set port [lindex $@ioselect 0] set p $type$port ! switch $type { ! i {set ns $@ninlets} ! o {set ns $@noutlets} ! } ! $self hilite_io_2 $type $port $ns } ! def Box hilite_io_2 {type port ns} { set outline [switch $type {i {concat [$self look outletfg]} o {concat [$self look inletfg]}}] ! set box [l+ [$self io_bbox $type $port $ns] [list -3 -3 +3 +3]] $self item $type${port}b rectangle $box -outline $outline -width 1 } --- 4133,4142 ---- set port [lindex $@ioselect 0] set p $type$port ! $self hilite_io_2 $type $port } ! def Box hilite_io_2 {type port} { set outline [switch $type {i {concat [$self look outletfg]} o {concat [$self look inletfg]}}] ! set box [l+ [$self io_bbox $type $port] [list -3 -3 +3 +3]] $self item $type${port}b rectangle $box -outline $outline -width 1 } *************** *** 4153,4160 **** def Box show_error {text} { regsub "\n" $text "" text - mset {x1 y1 x2 y2} [$self bbox] - [$self get_canvas] show_tooltip [expr $x2+4] [expr ($y1+$y2)/2] $text object 1 #mset {x1 y1 x2 y2} [$self bbox] ! #[$self get_canvas] show_tooltip ... [expr ($y1+$y2)/2] $text object 1 } --- 4147,4155 ---- def Box show_error {text} { regsub "\n" $text "" text #mset {x1 y1 x2 y2} [$self bbox] ! #[$self get_canvas] show_tooltip [expr $x2+4] [expr ($y1+$y2)/2] $text object 1 ! mset {x1 y1 x2 y2} [$self bbox] ! mset {x y} [rect_centre [$self io_bbox i 0]] ! [$self get_canvas] show_tooltip $x $y $text i 1 } *************** *** 4237,4242 **** set c [$@canvas widget] set iowidth [$@obj1 look iowidth] ! mset {ox1 oy1 ox2 oy2} [$@obj1 io_bbox o $@port1 [$@obj1 noutlets]] ! mset {ix1 iy1 iy2 iy2} [$@obj2 io_bbox i $@port2 [$@obj2 ninlets]] set x1 [expr $ox1 + $iowidth/2]; set y1 $oy2 set x2 [expr $ix1 + $iowidth/2]; set y2 $iy1 --- 4232,4237 ---- set c [$@canvas widget] set iowidth [$@obj1 look iowidth] ! mset {ox1 oy1 ox2 oy2} [$@obj1 io_bbox o $@port1] ! mset {ix1 iy1 iy2 iy2} [$@obj2 io_bbox i $@port2] set x1 [expr $ox1 + $iowidth/2]; set y1 $oy2 set x2 [expr $ix1 + $iowidth/2]; set y2 $iy1

1 0

pd/src desire.tk,1.1.2.600.2.103,1.1.2.600.2.104
by Mathieu Bouchard 19 Dec '06

19 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27302 Modified Files: Tag: desiredata desire.tk Log Message: find_last_error (part 2 of 2) Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.103 retrieving revision 1.1.2.600.2.104 diff -C2 -d -r1.1.2.600.2.103 -r1.1.2.600.2.104 *** desire.tk 19 Dec 2006 00:31:56 -0000 1.1.2.600.2.103 --- desire.tk 19 Dec 2006 01:07:53 -0000 1.1.2.600.2.104 *************** *** 139,142 **** --- 139,156 ---- } + # intervals + proc inside {x x0 x1} {return [expr $x>=$x0 && $x<=$x1]} + proc overlap {y0 y1 x0 x1} {return [expr [inside $y0 $x0 $x1] || [inside $y1 $x0 $x1]]} + + proc distance {point1 point2} { + set off [l- $point1 $point2] + return [expr sqrt([lsum [lzip * $off $off]])] + } + + proc rect_centre {rect} { + mset {x1 y1 x2 y2} $rect + return [list [expr {($x1+$x2)/2}] [expr {($y1+$y2)/2}]] + } + # will be a wrapper for [catch {}]. # to be continued... *************** *** 2500,2508 **** } - proc distance {point1 point2} { - set off [l- $point1 $point2] - return [expr sqrt([lsum [lzip * $off $off]])] - } - def View position= {xy1} {mset [list @x1 @y1] $xy1; $self changed x1 y1} --- 2514,2517 ---- *************** *** 2699,2703 **** } if {[$self look tooltip]} { ! if {[expr [distance $::tooltip(curpos) [list $x $y]] > 10]} {$self hide_tooltip} } } --- 2708,2712 ---- } if {[$self look tooltip]} { ! if {!$::tooltip(stay) && [expr [distance $::tooltip(curpos) [list $x $y]] > 10]} {$self hide_tooltip} } } *************** *** 3534,3541 **** def Canvas key_nav_left_shift {} {$self key_nav +1 +1 1} - # intervals - proc inside {x x0 x1} {return [expr $x>=$x0 && $x<=$x1]} - proc overlap {y0 y1 x0 x1} {return [expr [inside $y0 $x0 $x1] || [inside $y1 $x0 $x1]]} - def Canvas key_nav {du dv shift} { if {$@keynav_shift && !$shift} {puts "keynav_shift but not shift"} --- 3543,3546 ---- *************** *** 4146,4149 **** --- 4151,4162 ---- def Box popup_help {} {netsend [list .$@canvas object_help $self]} + def Box show_error {text} { + regsub "\n" $text "" text + mset {x1 y1 x2 y2} [$self bbox] + [$self get_canvas] show_tooltip [expr $x2+4] [expr ($y1+$y2)/2] $text object 1 + #mset {x1 y1 x2 y2} [$self bbox] + #[$self get_canvas] show_tooltip ... [expr ($y1+$y2)/2] $text object 1 + } + #-----------------------------------------------------------------------------------# class_new Wire {View} *************** *** 5629,5648 **** set tooltip(visible) 0 set tooltip(text) "" ! def Canvas show_tooltip {x y text type} { global tooltip if {$tooltip(visible) && [string compare $text $tooltip(text)]==0} {return} $self hide_tooltip ! set border 4 ! set x [expr $x+$border+4] ;# huh, why add border twice? set c [$self widget] mset {x y} [lmap * [list $x $y] $@zoom] switch $type { i {set y [expr $y - 20]} o {set y [expr $y + 20]} } ! $c create text $x $y -text $text -anchor w -tags tooltip_fg ! mset {x1 y1 x2 y2} [$c bbox tooltip_fg] ! $c create rectangle \ ! [expr $x1-$border] [expr $y1-$border] \ ! [expr $x2+$border] [expr $y2+$border] \ ! -fill "#ffffcc" -outline "#000000" -tags tooltip_bg $c lower tooltip_bg tooltip_fg set tooltip(curpos) $@curpos --- 5642,5664 ---- set tooltip(visible) 0 set tooltip(text) "" + set tooltip(stay) 0 ! def Canvas show_tooltip {x y text type {stay 0}} { global tooltip if {$tooltip(visible) && [string compare $text $tooltip(text)]==0} {return} $self hide_tooltip ! set x [expr $x+4] set c [$self widget] mset {x y} [lmap * [list $x $y] $@zoom] + # it's wrong to hardcode "20" here switch $type { i {set y [expr $y - 20]} o {set y [expr $y + 20]} } ! if {$stay} { ! set fg "#ffffff"; set bg "#dd0000" ! } else { ! set fg "#000000"; set bg "#ffffcc" ! } ! $c create text $x $y -fill $fg -text $text -anchor w -tags tooltip_fg ! mset {x1 y1 x2 y2} [l+ [$c bbox tooltip_fg] [list -4 -4 +4 +4]] ! $c create rectangle $x1 $y1 $x2 $y2 -fill $bg -outline $fg -tags tooltip_bg $c lower tooltip_bg tooltip_fg set tooltip(curpos) $@curpos *************** *** 5650,5653 **** --- 5666,5670 ---- set tooltip(visible) 1 set tooltip(text) $text + set tooltip(stay) $stay }

1 0

pd/src desire.c, 1.1.2.217.2.75, 1.1.2.217.2.76 desire.tk, 1.1.2.600.2.102, 1.1.2.600.2.103
by Mathieu Bouchard 19 Dec '06

19 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14198 Modified Files: Tag: desiredata desire.c desire.tk Log Message: new method "object_help" in server canvas; and part 1 of find_last_error. Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.102 retrieving revision 1.1.2.600.2.103 diff -C2 -d -r1.1.2.600.2.102 -r1.1.2.600.2.103 *** desire.tk 18 Dec 2006 23:54:39 -0000 1.1.2.600.2.102 --- desire.tk 19 Dec 2006 00:31:56 -0000 1.1.2.600.2.103 *************** *** 1964,1968 **** set m $name.m menu $m ! foreach x {file edit view put window help} {menu $m.$x -tearoff $::pd_tearoff} $self populate_menu file { new_file open_file {} --- 1964,1968 ---- set m $name.m menu $m ! foreach x {file edit find view put window help} {menu $m.$x -tearoff $::pd_tearoff} $self populate_menu file { new_file open_file {} *************** *** 1974,1977 **** --- 1974,1979 ---- cut copy paste duplicate select_all {} text_editor tidy_up {}} + $self populate_menu find { + find find_again find_last_error} $self populate_menu view { reload redraw} *************** *** 1988,1992 **** $m.window configure -postcommand "$self fix_window_menu" foreach x {file edit view find put window help} { ! if {$x=="find" || $x=="help"} { # help menu is in the wrong place in patch windows because it's taken from .mbar ??? $m add cascade -label [say $x] -menu .mbar.$x --- 1990,1994 ---- $m.window configure -postcommand "$self fix_window_menu" foreach x {file edit view find put window help} { ! if {$x=="help"} { # help menu is in the wrong place in patch windows because it's taken from .mbar ??? $m add cascade -label [say $x] -menu .mbar.$x *************** *** 4141,4145 **** } ! def Box popup_help {} {netsend [list pd help $@pdclass]} #-----------------------------------------------------------------------------------# --- 4143,4148 ---- } ! #def Box popup_help {} {netsend [list pd help $@pdclass]} ! def Box popup_help {} {netsend [list .$@canvas object_help $self]} #-----------------------------------------------------------------------------------# Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.75 retrieving revision 1.1.2.217.2.76 diff -C2 -d -r1.1.2.217.2.75 -r1.1.2.217.2.76 *** desire.c 18 Dec 2006 23:13:20 -0000 1.1.2.217.2.75 --- desire.c 19 Dec 2006 00:31:54 -0000 1.1.2.217.2.76 *************** *** 6207,6210 **** --- 6207,6222 ---- } + extern "C" char *class_gethelpdir(t_class *c); + extern "C" void open_via_helppath(const char *name, const char *dir); + static void canvas_object_help(t_canvas *x, t_symbol *name) { + t_text *o = symbol2opointer(name); if (!o) return; + char namebuf[MAXPDSTRING], *dir; + t_class *c = o->_class; + strcpy(namebuf, class_gethelpname(c)); + dir = class_gethelpdir(c); + if (strcmp(namebuf + strlen(namebuf) - 3, ".pd")) strcat(namebuf, ".pd"); + open_via_helppath(namebuf, dir); + } + static long canvas_children_count(t_canvas *x) { long n=0; *************** *** 7460,7463 **** --- 7472,7476 ---- class_addmethod3(c,canvas_object_insert,"object_insert","*"); class_addmethod3(c,canvas_object_get_tips,"object_get_tips","s"); + class_addmethod3(c,canvas_object_help,"object_help","s"); class_addmethod3(c,canvas_text_setto,"text_setto","*"); class_addmethod3(c,canvas_with_reply,"with_reply","*"); *************** *** 7507,7523 **** extern "C" void glob_update_class_info (t_pd *bogus, t_symbol *s, t_symbol *cb_recv, t_symbol *cb_sel); extern "C" void glob_update_path (void); - extern "C" char *class_gethelpdir(t_class *c); - - void post_helppath(void) { - t_namelist *t = sys_helppath; - post("<helppath>"); - while (t) { - post("%s",t->nl_string); - t=t->nl_next; - } - post("</helppath>"); - } - - extern "C" void open_via_helppath(const char *name, const char *dir); void glob_help(t_pd *bogus, t_symbol *s) { --- 7520,7523 ---- *************** *** 7537,7541 **** dir = class_gethelpdir(c); if (strcmp(namebuf + strlen(namebuf) - 3, ".pd")) strcat(namebuf, ".pd"); - //post_helppath(); open_via_helppath(namebuf, dir); } --- 7537,7540 ---- *************** *** 7692,7696 **** iemgui_subclass(c); class_setsavefn(c,(t_savefn)cnv_savefn); ! class_sethelpsymbol(c, gensym("cnv")); c = vu_class = class_new(gensym("vu"), (t_newmethod)vu_new, (t_method)iemgui_free, sizeof(t_vu), 0, A_GIMME, 0); --- 7691,7695 ---- iemgui_subclass(c); class_setsavefn(c,(t_savefn)cnv_savefn); ! class_sethelpsymbol(c, gensym("my_canvas")); c = vu_class = class_new(gensym("vu"), (t_newmethod)vu_new, (t_method)iemgui_free, sizeof(t_vu), 0, A_GIMME, 0); *************** *** 7990,7994 **** static t_pd *error_object; ! static char error_string[256]; void canvas_finderror(void *object); --- 7989,7993 ---- static t_pd *error_object; ! static char error_string[MAXPDSTRING]; void canvas_finderror(void *object); *************** *** 8003,8006 **** --- 8002,8006 ---- strcat(buf, "\n"); dopost(buf); + strcpy(error_string,buf); error_object = (t_pd *)object; if (!saidit) { *************** *** 8015,8019 **** if (!error_object) post("no findable error yet."); else { ! post("last trackable error: %s", error_string); canvas_finderror(error_object); } --- 8015,8020 ---- if (!error_object) post("no findable error yet."); else { ! post("last trackable error was for object x%lx: %s", error_object, error_string); ! sys_mgui(error_object,"show_error","S",error_string); canvas_finderror(error_object); }

1 0

pd/src desire.tk,1.1.2.600.2.101,1.1.2.600.2.102
by Mathieu Bouchard 19 Dec '06

19 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv855 Modified Files: Tag: desiredata desire.tk Log Message: removed Find menu in main window; fixed [nbx] refresh. Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.101 retrieving revision 1.1.2.600.2.102 diff -C2 -d -r1.1.2.600.2.101 -r1.1.2.600.2.102 *** desire.tk 18 Dec 2006 22:30:05 -0000 1.1.2.600.2.101 --- desire.tk 18 Dec 2006 23:54:39 -0000 1.1.2.600.2.102 *************** *** 722,726 **** menu .mbar pack [frame .controls] -side top -fill x ! foreach t {file find window help} { .mbar add cascade -label [say $t] -menu [menu .mbar.$t -tearoff $::pd_tearoff] } --- 722,726 ---- menu .mbar pack [frame .controls] -side top -fill x ! foreach t {file window help} { .mbar add cascade -label [say $t] -menu [menu .mbar.$t -tearoff $::pd_tearoff] } *************** *** 1010,1014 **** audio_on audio_off {} quit} - $self populate_menu find {find find_again find_last_error} $self populate_menu help { about documentation class_browser client_class_tree clipboard_view history_view do_what_i_mean {} --- 1010,1013 ---- *************** *** 1748,1751 **** --- 1747,1755 ---- if {[info exists @find_string]} {$@find_canvas search} } + + def Canvas find_last_error {} { + netsend [list pd finderror] + } + def Canvas bind {eventtype selector args} { set c [$self widget] *************** *** 4907,4910 **** --- 4911,4919 ---- } + def NumBox reinit {mess} { + super $mess + set @text $@val + } + def NumBox draw {} { super

1 0

pd/src desire.c,1.1.2.217.2.74,1.1.2.217.2.75
by Mathieu Bouchard 19 Dec '06

19 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17988 Modified Files: Tag: desiredata desire.c Log Message: fix for getting help if classname has no associated class (e.g. [hsl] [nbx] ...) Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.74 retrieving revision 1.1.2.217.2.75 diff -C2 -d -r1.1.2.217.2.74 -r1.1.2.217.2.75 *** desire.c 18 Dec 2006 22:44:08 -0000 1.1.2.217.2.74 --- desire.c 18 Dec 2006 23:13:20 -0000 1.1.2.217.2.75 *************** *** 7524,7528 **** char namebuf[MAXPDSTRING], *dir; t_class *c = class_find(s); ! if (!c) {post("help: no such class '%s'",s->s_name); return;} strcpy(namebuf, class_gethelpname(c)); dir = class_gethelpdir(c); --- 7524,7537 ---- char namebuf[MAXPDSTRING], *dir; t_class *c = class_find(s); ! if (!c) { ! //post("help: no such class '%s'",s->s_name); return; ! t_binbuf *b = binbuf_new(); ! binbuf_addv(b,"s",s); ! newest = 0; ! binbuf_eval(b,&pd_objectmaker,0,0); ! if (!newest) {post("help: no such class '%s'",s->s_name); return;} ! c = newest->_class; ! pd_free(newest); ! } strcpy(namebuf, class_gethelpname(c)); dir = class_gethelpdir(c);

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
83
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 December 2006