[PD-cvs] pd/src desire.tk,1.1.2.600.2.314,1.1.2.600.2.315

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
fixes to keynav


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.314
retrieving revision 1.1.2.600.2.315
diff -C2 -d -r1.1.2.600.2.314 -r1.1.2.600.2.315
*** desire.tk	7 Aug 2007 19:49:28 -0000	1.1.2.600.2.314
--- desire.tk	7 Aug 2007 20:24:29 -0000	1.1.2.600.2.315
***************
*** 2894,2898 ****
  
  def Canvas quadrant {du dv array} {
! 	if {!$@keynav_current} {set @keynav_current [lindex [$@objects keys] 0]}
  	set foo {}
  	set bar {}
--- 2894,2898 ----
  
  def Canvas quadrant {du dv array} {
! 	if {$@keynav_current == 0} {set @keynav_current [$@objects get [lindex [$@objects keys] 0]]}
  	set foo {}
  	set bar {}
***************
*** 2907,2912 ****
  	set best [lindex $foo [lsearch_minimum $bar]]
  	return $best
- 	#set @keynav_current $best
- 	#$self selection= $best
  }
  
--- 2907,2910 ----
***************
*** 3673,3677 ****
  
  def Canvas   select_all {} {$@objectsel reinit [$objects list]}
! def Canvas deselect_all {} {$@objectsel clear}
  
  def Canvas popup_help {} {$::main class_browser}
--- 3671,3675 ----
  
  def Canvas   select_all {} {$@objectsel reinit [$objects list]}
! def Canvas deselect_all {} {$@objectsel clear; $@wiresel clear}
  
  def Canvas popup_help {} {$::main class_browser}
***************
*** 4297,4301 ****
  	set olength [$@objectsel size]
  	set wlength [  $@wiresel size]
- 	puts "$@keynav_current ::: $@keynav_tab_sel"
  	if {$@keynav_tab_sel == "object"} {
  		if {[$@wires size]} {set @keynav_tab_sel "wire"}
--- 4295,4298 ----
***************
*** 4363,4367 ****
  			}
  		}
! 	} else if {$olength == 1}  {
  		set @keynav_current [lindex [$@objectsel values] 0]
  		$self deselect_all
--- 4360,4364 ----
  			}
  		}
! 	} elseif {$olength == 1}  {
  		set @keynav_current [lindex [$@objectsel values] 0]
  		$self deselect_all
***************
*** 4414,4418 ****
  	}
  	#if {[lsearch $@objectsel $@keynav_next] < 0} {lappend @selection $@keynav_next}
! 	$@keynav_next selected?= 1
  	set @keynav_current $@keynav_next
  }
--- 4411,4416 ----
  	}
  	#if {[lsearch $@objectsel $@keynav_next] < 0} {lappend @selection $@keynav_next}
! 	#$@keynav_next selected?= 1
! 	$self selection+= $@keynav_next
  	set @keynav_current $@keynav_next
  }
***************
*** 4636,4640 ****
  	if {![llength $@keynav_iosel_i] && ![llength $@keynav_iosel_o]} {
  		if {[$@objectsel size] == 1} {
! 			mset {bx1 by1 bx2 by2} [$@selection bbox]
  			set x1 [expr ($bx1+$bx2)/2]; set y1 [expr ($by1+$by2)/2]
  			$self click_wrap $x1 $y1 1 $f
--- 4634,4638 ----
  	if {![llength $@keynav_iosel_i] && ![llength $@keynav_iosel_o]} {
  		if {[$@objectsel size] == 1} {
! 			mset {bx1 by1 bx2 by2} [[$self selection] bbox]
  			set x1 [expr ($bx1+$bx2)/2]; set y1 [expr ($by1+$by2)/2]
  			$self click_wrap $x1 $y1 1 $f