[PD-cvs] pd/src desire.tk,1.1.2.600.2.370,1.1.2.600.2.371

[chunlee]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3912

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
fix multiple wire delete with keynav


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.370
retrieving revision 1.1.2.600.2.371
diff -C2 -d -r1.1.2.600.2.370 -r1.1.2.600.2.371
*** desire.tk	14 Aug 2007 22:08:43 -0000	1.1.2.600.2.370
--- desire.tk	14 Aug 2007 23:36:46 -0000	1.1.2.600.2.371
***************
*** 2067,2072 ****
  
  def Canvas c {from outlet to inlet} {
! 	set out_objs [$self c_parse $from]
! 	set in_objs [$self c_parse $to]
  	foreach out $out_objs {
  		foreach in $in_objs {
--- 2067,2072 ----
  
  def Canvas c {from outlet to inlet} {
! 	set out_objs [$self parse_idx $from]
! 	set in_objs [$self parse_idx $to]
  	foreach out $out_objs {
  		foreach in $in_objs {
***************
*** 2077,2082 ****
  
  def Canvas pc {from outlet to inlet} {
! 	set out_objs [$self c_parse $from]
! 	set in_objs [$self c_parse $to]
  	if {[llength $out_objs] != [llength $in_objs]} {return "No can do :("}
  	for {set i 0} {$i < [llength $out_objs]} {incr i} {
--- 2077,2082 ----
  
  def Canvas pc {from outlet to inlet} {
! 	set out_objs [$self parse_idx $from]
! 	set in_objs [$self parse_idx $to]
  	if {[llength $out_objs] != [llength $in_objs]} {return "No can do :("}
  	for {set i 0} {$i < [llength $out_objs]} {incr i} {
***************
*** 2086,2090 ****
  
  
! def Canvas c_parse {val} {
  	set objs {}
  	foreach obj [split $val ","] {
--- 2086,2090 ----
  
  
! def Canvas parse_idx {val} {
  	set objs {}
  	foreach obj [split $val ","] {
***************
*** 2924,2928 ****
  	set del_wire {}
  	foreach obj [$@objectsel values] {
! 		foreach wire $_($obj:wires2) {
  			if {[$@wires search $wire] != -1 && [lsearch $del_wire $wire] < 0} {
  				$self disconnect [$wire connects]
--- 2924,2928 ----
  	set del_wire {}
  	foreach obj [$@objectsel values] {
! 		foreach wire [$obj wires2] {
  			if {[$@wires search $wire] != -1 && [lsearch $del_wire $wire] < 0} {
  				$self disconnect [$wire connects]
***************
*** 4476,4480 ****
  			set @keynav_last_obj $@keynav_next
  		}
! 		if {[$@objectsel search $@keynav_next] < 0} {lappend @selection $@keynav_next}
  	    }
  	    wire {
--- 4476,4480 ----
  			set @keynav_last_obj $@keynav_next
  		}
! 		if {[$@objectsel search $@keynav_next] < 0} {$self selection+= $@keynav_next}
  	    }
  	    wire {
***************
*** 4486,4495 ****
  			set @keynav_last_wire $@keynav_next
  		}
! 		if {[$@wiresel search $@keynav_next] < 0} {lappend @selection_wire $@keynav_next}
  	    }
  	}
! 	#if {[lsearch $@objectsel $@keynav_next] < 0} {lappend @selection $@keynav_next}
! 	#$@keynav_next selected?= 1
! 	$self selection+= $@keynav_next
  	set @keynav_current $@keynav_next
  }
--- 4486,4493 ----
  			set @keynav_last_wire $@keynav_next
  		}
! 		if {[$@wiresel search $@keynav_next] < 0} {$self selection_wire+= $@keynav_next}
  	    }
  	}
! 	#$self selection+= $@keynav_next
  	set @keynav_current $@keynav_next
  }
***************
*** 4712,4716 ****
  def Canvas return_key {x y key iso f} {
  	mset {type id detail} [$self identify_target $x $y $f]
- 	puts "i:: $@keynav_iosel_i   o:: $@keynav_iosel_o"
  	if {![llength $@keynav_iosel_i] && ![llength $@keynav_iosel_o]} {
  		if {[$@objectsel size] == 1} {
--- 4710,4713 ----