[PD-cvs] pd/src desire.tk,1.1.2.347,1.1.2.348

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
.


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.347
retrieving revision 1.1.2.348
diff -C2 -d -r1.1.2.347 -r1.1.2.348
*** desire.tk	16 Aug 2006 00:37:01 -0000	1.1.2.347
--- desire.tk	16 Aug 2006 04:21:51 -0000	1.1.2.348
***************
*** 1736,1739 ****
--- 1736,1740 ----
  
  def ObjectBox unedit {} {
+ 	super
          $self erase ;# (why?)
  }
***************
*** 1872,1876 ****
  	set x [expr [$c canvasx $x]/$@scale]
  	set y [expr [$c canvasy $y]/$@scale]
! 	set target [$self identify_target $x $y $f "motion"]
  	$self motion $x $y $f $target
  }
--- 1873,1877 ----
  	set x [expr [$c canvasx $x]/$@scale]
  	set y [expr [$c canvasy $y]/$@scale]
! 	set target [$self identify_target $x $y $f]
  	$self motion $x $y $f $target
  }
***************
*** 1880,1884 ****
  	set y [expr [$c canvasy $y]/$@scale]
  	set f [expr 1<<($b+7)|$f]
! 	set target [$self identify_target $x $y $f "click"]
  	$self click $x $y $f $target
  }
--- 1881,1885 ----
  	set y [expr [$c canvasy $y]/$@scale]
  	set f [expr 1<<($b+7)|$f]
! 	set target [$self identify_target $x $y $f]
  	$self click $x $y $f $target
  }
***************
*** 1888,1892 ****
  	set y [expr [$c canvasy $y]/$@scale]
  	set f [expr 1<<($b+7)|$f]
! 	set target [$self identify_target $x $y $f "unclick"]
  	$self unclick $x $y $f $target
  }
--- 1889,1893 ----
  	set y [expr [$c canvasy $y]/$@scale]
  	set f [expr 1<<($b+7)|$f]
! 	set target [$self identify_target $x $y $f]
  	$self unclick $x $y $f $target
  }
***************
*** 1994,1998 ****
  #     wire $id         : a wire
  #  nothing             : nothing
! def Canvas identify_target {x y f label} {
      set c .$self.c
      set cx [expr $x*$@scale]
--- 1995,1999 ----
  #     wire $id         : a wire
  #  nothing             : nothing
! def Canvas identify_target {x y f} {
      set c .$self.c
      set cx [expr $x*$@scale]
***************
*** 2045,2051 ****
  	$self addw 1 what   32 "" -padx 8 -fill x -expand yes
  	$self addw 1 mode   4  " Mode: "
! 	$self addw 1 action 4  " Action: "
  	$self addw 1 sel    4  " Sel: "
! 	#$self addw 2 wfrom  12 " WireFrom: "
  	#$self addw 2 wto    12 " WireTo: "
  }
--- 2046,2052 ----
  	$self addw 1 what   32 "" -padx 8 -fill x -expand yes
  	$self addw 1 mode   4  " Mode: "
! 	$self addw 1 action 12  " Action: "
  	$self addw 1 sel    4  " Sel: "
! 	$self addw 2 focus  12 " Focus: "
  	#$self addw 2 wto    12 " WireTo: "
  }
***************
*** 2064,2068 ****
      set tags [$c gettags [lindex [$c find overlapping \
  	[expr $x-2] [expr $y-2] [expr $x+2] [expr $y+2]] end]]
!     foreach {type id} [$@canvas identify_target $x $y -1 "status"] {}
      switch -- $type {
        object {
--- 2065,2069 ----
      set tags [$c gettags [lindex [$c find overlapping \
  	[expr $x-2] [expr $y-2] [expr $x+2] [expr $y+2]] end]]
!     mset {type id detail} [$@canvas identify_target $x $y -1]
      switch -- $type {
        object {
***************
*** 2079,2083 ****
      $f.1.action configure -text [$@canvas action]
      $f.1.sel    configure -text [llength [$@canvas selection]]
!     #$f.2.wfrom  configure -text [$@canvas wire_from]
      #$f.2.wto    configure -text [$@canvas wire_to]
  }
--- 2080,2084 ----
      $f.1.action configure -text [$@canvas action]
      $f.1.sel    configure -text [llength [$@canvas selection]]
!     $f.2.focus  configure -text [$@canvas focus]
      #$f.2.wto    configure -text [$@canvas wire_to]
  }
***************
*** 2301,2305 ****
  	if {[llength $@obj_in_edit]} {$@obj_in_edit unedit; set @obj_in_edit {}}
  	set in_selection [expr [lsearch $@selection $id]>=0]
- 	
  	switch $type {
  	  outlet {set @action [FutureWire new $self $x $y $f $target]; return}
--- 2302,2305 ----
***************
*** 2367,2371 ****
      #if {$@editmode && !($f&2)} {$self clickedit $x $y $f $target; return}
      if {$@editmode} {$self clickedit $x $y $f $target; return}
!     mset {type id} $target
      if {![llength $id]} {return}
      switch $type {
--- 2367,2371 ----
      #if {$@editmode && !($f&2)} {$self clickedit $x $y $f $target; return}
      if {$@editmode} {$self clickedit $x $y $f $target; return}
!     mset {type id detail} $target
      if {![llength $id]} {return}
      switch $type {