[PD-cvs] pd/src desire.tk,1.1.2.600.2.365,1.1.2.600.2.366

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
keynav fix


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.365
retrieving revision 1.1.2.600.2.366
diff -C2 -d -r1.1.2.600.2.365 -r1.1.2.600.2.366
*** desire.tk	14 Aug 2007 04:39:37 -0000	1.1.2.600.2.365
--- desire.tk	14 Aug 2007 05:12:33 -0000	1.1.2.600.2.366
***************
*** 4410,4417 ****
  		# if keynav_current is 0, aka the start of key navigation
  		if {$@keynav_current == 0} {
! 			if {[$@objects size]} {
! 				# use any element of @objects as selection, else return
! 				set @keynav_current [lindex [$@objects values] 0]
! 			} else {return}
  		} else {
  			# if the keynav_current is a wire, set keynav_current to a object
--- 4410,4414 ----
  		# if keynav_current is 0, aka the start of key navigation
  		if {$@keynav_current == 0} {
! 			if {[$@objects size]} {set @keynav_current [lindex [$@objects values] 0]} else {return}
  		} else {
  			# if the keynav_current is a wire, set keynav_current to a object
***************
*** 4475,4479 ****
  			set @keynav_last_wire $@keynav_next
  		}
! 		if {[lsearch $@wiresel search $@keynav_next] < 0} {lappend @selection_wire $@keynav_next}
  	    }
  	}
--- 4472,4476 ----
  			set @keynav_last_wire $@keynav_next
  		}
! 		if {[$@wiresel search $@keynav_next] < 0} {lappend @selection_wire $@keynav_next}
  	    }
  	}
***************
*** 4741,4750 ****
  		$self dehilite_io
  	}
! 	if {$@keynav} {set @keynav 0}
! 	#this should be better sorted out in canvas tab_jump
! 	if {$@keynav_tab_sel == "object"} {
! 		set @keynav_tab_sel "wire"
! 	} else {
! 		set @keynav_tab_sel "object"
  	}
  }
--- 4738,4745 ----
  		$self dehilite_io
  	}
! 	if {$@keynav} {
! 		set @keynav 0
! 		#bogus switch so that keynav remains the same next time..
! 		if {$@keynav_tab_sel == "object"} {set @keynav_tab_sel "wire"} {set @keynav_tab_sel "object"}
  	}
  }
***************
*** 4777,4782 ****
  	if {$current == ""} {return}
  	if {![string compare $current 0]} {return}
! 	#set col "#ffcc00"
! 	set col [$self look fg]
  	if {[$@canvas keynav]} {
  		if {[$current class] == "Wire"} {
--- 4772,4776 ----
  	if {$current == ""} {return}
  	if {![string compare $current 0]} {return}
! 	set col [$self look selectframe]
  	if {[$@canvas keynav]} {
  		if {[$current class] == "Wire"} {
***************
*** 4800,4804 ****
  					set by2 [expr ($@length2 * sin($t+$angle)) + $by1]
  					set line [list $cx2 $cy2 $bx2 $by2]
! 					$self item LINE$angle line $line -fill $col -width 1
  				}
   				set i [expr $i+2]
--- 4794,4798 ----
  					set by2 [expr ($@length2 * sin($t+$angle)) + $by1]
  					set line [list $cx2 $cy2 $bx2 $by2]
! 					$self item LINE$angle line $line -fill $col -width 2
  				}
   				set i [expr $i+2]
***************
*** 4809,4814 ****
  			set line1 [list $x $y $x [expr $y + $@length2]]
  			set line2 [list $x $y [expr $x + $@length2] $y]
! 			$self item LINE1 line $line1 -fill $col -width 1
! 			$self item LINE2 line $line2 -fill $col -width 1
  
  		}
--- 4803,4808 ----
  			set line1 [list $x $y $x [expr $y + $@length2]]
  			set line2 [list $x $y [expr $x + $@length2] $y]
! 			$self item LINE1 line $line1 -fill $col -width 2
! 			$self item LINE2 line $line2 -fill $col -width 2
  
  		}