[PD-cvs] pd/src desire.tk,1.1.2.600.2.412,1.1.2.600.2.413

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
adding {} in expr


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.412
retrieving revision 1.1.2.600.2.413
diff -C2 -d -r1.1.2.600.2.412 -r1.1.2.600.2.413
*** desire.tk	16 Oct 2007 14:54:21 -0000	1.1.2.600.2.412
--- desire.tk	17 Oct 2007 00:13:11 -0000	1.1.2.600.2.413
***************
*** 108,112 ****
  proc lreverse {list} {
  	set r {}
! 	for {set i [expr [llength $list]-1]} {$i>=0} {incr i -1} {lappend r [lindex $list $i]}
  	return $r
  }
--- 108,112 ----
  proc lreverse {list} {
  	set r {}
! 	for {set i [expr {[llength $list]-1}]} {$i>=0} {incr i -1} {lappend r [lindex $list $i]}
  	return $r
  }
***************
*** 146,150 ****
  proc distance {point1 point2} {
  	set off [l- $point1 $point2]
! 	return [expr sqrt([lsum [lzip * $off $off]])]
  }
  
--- 146,150 ----
  proc distance {point1 point2} {
  	set off [l- $point1 $point2]
! 	return [expr {sqrt([lsum [lzip * $off $off]])}]
  }
  
***************
*** 1321,1325 ****
  
  set item {
! 	set canvas [$self get_canvas]
  	if {$canvas == ""} {return}
  	set c [$self cwidget]
--- 1321,1325 ----
  
  set item {
! 	set canvas [$self get_canvas] 
  	if {$canvas == ""} {return}
  	set c [$self cwidget]
***************
*** 3092,3096 ****
  
  proc remainder {val val2} {
! 	if {[expr abs($val)]} {return [expr (abs($val)%$val2)*($val/abs($val))]} else {return 0}
  }
  
--- 3092,3096 ----
  
  proc remainder {val val2} {
! 	if {[expr {abs($val)}]} {return [expr {(abs($val)%$val2)*($val/abs($val))}]} else {return 0}
  }
  
***************
*** 3099,3123 ****
  	if {$@keynav} {$@active draw}
  	foreach obj [$@objectsel values] {
! 		if {[[$obj class] <= Box]} {
  			if {[$self look snap_grid]} {
  				set grid [$self look grid_size]
! 				set ax  [expr (int($x)/$grid)*$grid]
! 				set ay  [expr (int($y)/$grid)*$grid]
! 				set oax [expr (int($ox)/$grid)*$grid]
! 				set oay [expr (int($oy)/$grid)*$grid]
  				mset {x1 y1} [$obj xy]
! 				if {![expr ($ax-$oax)%$grid]} {
! 					set xoff [remainder [expr int($x1-$ax)] $grid]
  				} else {set xoff 0}
! 				if {![expr ($ay-$oay)%$grid]} {
! 					set yoff [remainder [expr int($y1-$ay)] $grid]
  				} else {set yoff 0}
  				$obj move [expr ($ax-$oax)-$xoff] [expr ($ay-$oay)-$yoff]
  			} else {
! 				$obj move [expr $x-$ox] [expr $y-$oy]
  			}
! 		} else {
! 			puts "Canvas motion warning: trying to move non-Box explicitly"
! 		}
  	}
  }
--- 3099,3123 ----
  	if {$@keynav} {$@active draw}
  	foreach obj [$@objectsel values] {
! 		#if {[[$obj class] <= Box]} {
  			if {[$self look snap_grid]} {
  				set grid [$self look grid_size]
! 				set ax  [expr {(int($x)/$grid)*$grid}]
! 				set ay  [expr {(int($y)/$grid)*$grid}]
! 				set oax [expr {(int($ox)/$grid)*$grid}]
! 				set oay [expr {(int($oy)/$grid)*$grid}]
  				mset {x1 y1} [$obj xy]
! 				if {![expr {($ax-$oax)%$grid}]} {
! 					set xoff [remainder [expr {int($x1-$ax)}] $grid]
  				} else {set xoff 0}
! 				if {![expr {($ay-$oay)%$grid}]} {
! 					set yoff [remainder [expr {int($y1-$ay)}] $grid]
  				} else {set yoff 0}
  				$obj move [expr ($ax-$oax)-$xoff] [expr ($ay-$oay)-$yoff]
  			} else {
! 				$obj move [expr {$x-$ox}] [expr {$y-$oy}]
  			}
! 		#} else {
! 		#	puts "Canvas motion warning: trying to move non-Box explicitly"
! 		#}
  	}
  }
***************
*** 3307,3314 ****
  def Canvas identify_closestio {x y f} {
  	set c [$self widget]
! 	set cx [expr $x*$@zoom]
! 	set cy [expr $y*$@zoom]
  	set sense [$self pointer_sense]
! 	set stack [$c find overlapping [expr $cx-$sense] [expr $cy-$sense] [expr $cx+$sense] [expr $cy+$sense]]
  	set stack [lreverse $stack]
  	set ios {}
--- 3307,3315 ----
  def Canvas identify_closestio {x y f} {
  	set c [$self widget]
! 	set cx [expr {$x*$@zoom}]
! 	set cy [expr {$y*$@zoom}]
  	set sense [$self pointer_sense]
! 	set stack [$c find overlapping [expr {$cx-$sense}] [expr {$cy-$sense}]\
! 		                       [expr {$cx+$sense}] [expr {$cy+$sense}]]
  	set stack [lreverse $stack]
  	set ios {}
***************
*** 5057,5061 ****
  
  def Box move {dx dy} {
! 	set @x1 [expr $@x1+$dx]; set @y1 [expr $@y1+$dy]
  	set zoom [$@canvas zoom]
  	$self changed ;# until we find a way to avoid rounding errors on [$@canvas widget] move.
--- 5058,5062 ----
  
  def Box move {dx dy} {
! 	set @x1 [expr {$@x1+$dx}]; set @y1 [expr {$@y1+$dy}]
  	set zoom [$@canvas zoom]
  	$self changed ;# until we find a way to avoid rounding errors on [$@canvas widget] move.
***************
*** 6814,6823 ****
--- 6815,6827 ----
  
  def Crosshair draw {} {
+ 	
  	mset {type id detail} $@target
  	set x $@x; set y $@y
+ 	
  	if {[$@canvas look hairsnap]} {
  		switch -regexp -- $type {^object|outlet|inlet$ {mset {x y x3 y3} [$id bbox]}}
  	}
  	mset {x1 y1 x2 y2} [$self display_area]
+ 
  	set h1 [list $x1 $y $x2 $y]
  	set v1 [list $x $y1 $x $y2]
***************
*** 6857,6866 ****
  def View display_area {} {
  	set c [$@canvas widget]; set z [$@canvas zoom]
- 	set win_w [winfo width $c]; set win_h [winfo height $c]
  	set edge 10
! 	set x1 [expr int([$c canvasx $edge]/$z)]
! 	set y1 [expr int([$c canvasy $edge]/$z)]
! 	set x2 [expr int(([$c canvasx $win_w]-$edge)/$z)]
! 	set y2 [expr int(([$c canvasy $win_h]-$edge)/$z)]
  	return [list $x1 $y1 $x2 $y2]
  }
--- 6861,6869 ----
  def View display_area {} {
  	set c [$@canvas widget]; set z [$@canvas zoom]
  	set edge 10
! 	set x1 [expr {int([$c canvasx $edge]/$z)}]
! 	set y1 [expr {int([$c canvasy $edge]/$z)}]
! 	set x2 [expr {int(([$c canvasx [winfo width $c]]-$edge)/$z)}]
! 	set y2 [expr {int(([$c canvasy [winfo height $c]]-$edge)/$z)}]
  	return [list $x1 $y1 $x2 $y2]
  }