Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24046
Modified Files: Tag: desiredata desire.tk Log Message: fix a bug on inserting object with tab key
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.222 retrieving revision 1.1.2.600.2.223 diff -C2 -d -r1.1.2.600.2.222 -r1.1.2.600.2.223 *** desire.tk 12 Jul 2007 01:10:02 -0000 1.1.2.600.2.222 --- desire.tk 12 Jul 2007 01:19:38 -0000 1.1.2.600.2.223 *************** *** 2028,2036 **** mset {obj1 outlet obj2 inlet} [$wire report] $self disconnect [$wire connects] ! #$wire delete set obj1_idx [$self children_idx $obj1] set obj2_idx [$self children_idx $obj2] set obj3_idx [$self children_idx $obj] ! $self connect [list $obj1_idx $outlet $obj3_idx 0] $self connect [list $obj3_idx 0 $obj2_idx $inlet] $self action= none --- 2028,2036 ---- mset {obj1 outlet obj2 inlet} [$wire report] $self disconnect [$wire connects] ! set @keynav 0; $@active hide set obj1_idx [$self children_idx $obj1] set obj2_idx [$self children_idx $obj2] set obj3_idx [$self children_idx $obj] ! $self connect2 [list $obj1_idx $outlet $obj3_idx 0] [list $self keynav_current=] $self connect [list $obj3_idx 0 $obj2_idx $inlet] $self action= none *************** *** 3233,3237 **** bind $f.entry <Control-n> "$self down" bind $f.entry <Tab> "$self completion +" ! bind $f.entry <Control-Tab> "$self completion -" pack $f.entry -side left -fill x -expand yes bind $f.entry <Control-Tab> "$self traversal %K %W forward" --- 3233,3237 ---- bind $f.entry <Control-n> "$self down" bind $f.entry <Tab> "$self completion +" ! bind $f.entry <Shift-Tab> "$self completion -" pack $f.entry -side left -fill x -expand yes bind $f.entry <Control-Tab> "$self traversal %K %W forward" *************** *** 3318,3322 **** }
- def Canvas foo {x y z} {puts " $z -- $y -- $x"} def Canvas visible_rect {} { set c [$self widget] --- 3318,3321 ---- *************** *** 3530,3533 **** --- 3529,3539 ---- $@history add [list $self disconnect $wire] } + #temporary + def Canvas connect2 {wire goto} { + mset {from outlet to inlet} $wire + netsend [list .$self connect $from $outlet $to $inlet] $goto + $@history add [list $self disconnect $wire] + } +
def Canvas clear_wires {} { *************** *** 4109,4112 **** --- 4115,4119 ---- set olength [llength $@selection] set wlength [llength $@selection_wire] + puts "$@keynav_current ::: $@keynav_tab_sel" if {$@keynav_tab_sel == "object"} { if {[llength $@wires]} {set @keynav_tab_sel "wire"} *************** *** 4513,4516 **** --- 4520,4530 ---- #-----------------------------------------------------------------------------------# def Canvas keynav_current {} {return $@keynav_current} + def Canvas keynav_current= {current} { + set @keynav_current $current + switch [$current class] { + Wire {set @keynav_last_wire $current} + default {set @keynav_last_obj $current} + } + } def Canvas keynav {} {return $@keynav} def Canvas keyup {x y key iso shift} {