[PD-cvs] pd/src desire.tk,1.1.2.600.2.40,1.1.2.600.2.41

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
more fix on crosshair, draw_io and tab_jump


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.40
retrieving revision 1.1.2.600.2.41
diff -C2 -d -r1.1.2.600.2.40 -r1.1.2.600.2.41
*** desire.tk	7 Dec 2006 23:31:32 -0000	1.1.2.600.2.40
--- desire.tk	7 Dec 2006 23:40:24 -0000	1.1.2.600.2.41
***************
*** 1245,1249 ****
  	}
  }
! 
  def View draw_maybe {} {
  	if {$@canvas == "" && [winfo exists .$self.c]} {$self draw; return}
--- 1245,1249 ----
  	}
  }
!  
  def View draw_maybe {} {
  	if {$@canvas == "" && [winfo exists .$self.c]} {$self draw; return}
***************
*** 3395,3398 ****
--- 3395,3400 ----
  }
  
+ def Canvas get_bbox {} {return $@bbox}
+ 
  if {$tcl_version>=8.5} {
  	def Canvas notice {origin args} {$self child_changed $origin {expand}$args}
***************
*** 3431,3435 ****
  				if {[llength [$@keynav_current wires2]]} {
  					$self deselect_all
! 					set @keynav_current [lindex [$@keynav_current wires] 0]
  					set @keynav_last_wire $@keynav_current
  				} else {
--- 3433,3437 ----
  				if {[llength [$@keynav_current wires2]]} {
  					$self deselect_all
! 					set @keynav_current [lindex [$@keynav_current wires2] 0]
  					set @keynav_last_wire $@keynav_current
  				} else {
***************
*** 4039,4042 ****
--- 4041,4045 ----
  		set points [$self io_bbox $which $i $n]
  		$self item [list $which$i $which] rectangle $points -outline $color -fill $color -width 1
+ 		[$@canvas widget] raise $self$which$i
  	}
  }
***************
*** 4401,4409 ****
  }
  
- # shouldn't call super twice!
  def MessageBox draw {} {
  	super
  	$self draw_io
- 	super
  }
  
--- 4404,4410 ----
***************
*** 5680,5683 ****
--- 5681,5685 ----
  	set z [$@canvas zoom]
  	mset {type id detail} $@target
+ 	mset {cx1 cy1 cx2 cy2} [$@canvas get_bbox]
  	set x $@x
  	set y $@y
***************
*** 5697,5705 ****
  	set w [expr (1 / ($r - $l)) * [winfo width $c]]
  	set h [expr (1 / ($b - $t)) * [winfo height $c]]
! 	set x1 [expr ($w*$l)/$z]
! 	set y1 [expr ($h*$t)/$z]
  	set h1 [list $x1 $y [expr $x1+[winfo width $c]] $y]
         	set v1 [list $x $y1 $x [expr [winfo height $c]+$y1]] 
- 
  	$self item VHAIR1 line $v1 -fill [$@canvas look crosshair] -width 0.5 -dash {4 4 4 4}
  	$self item HHAIR1 line $h1 -fill [$@canvas look crosshair] -width 0.5 -dash {4 4 4 4}
--- 5699,5706 ----
  	set w [expr (1 / ($r - $l)) * [winfo width $c]]
  	set h [expr (1 / ($b - $t)) * [winfo height $c]]
! 	set x1 [expr ($w*$l+$cx1)/$z]
! 	set y1 [expr ($h*$t+$cy1)/$z]
  	set h1 [list $x1 $y [expr $x1+[winfo width $c]] $y]
         	set v1 [list $x $y1 $x [expr [winfo height $c]+$y1]] 
  	$self item VHAIR1 line $v1 -fill [$@canvas look crosshair] -width 0.5 -dash {4 4 4 4}
  	$self item HHAIR1 line $h1 -fill [$@canvas look crosshair] -width 0.5 -dash {4 4 4 4}