[PD-cvs] pd/src desire.tk,1.1.2.451,1.1.2.452

Mathieu Bouchard matju at users.sourceforge.net
Sat Sep 2 06:10:03 CEST 2006


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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
fixed SelRect and paste


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.451
retrieving revision 1.1.2.452
diff -C2 -d -r1.1.2.451 -r1.1.2.452
*** desire.tk	1 Sep 2006 21:15:14 -0000	1.1.2.451
--- desire.tk	2 Sep 2006 04:10:00 -0000	1.1.2.452
***************
*** 38,42 ****
  package require objective
  
! if {[catch {source profdd.tcl}]} {error_dump}
  if {[file exists debug.tcl]} {
  	source debug.tcl
--- 38,42 ----
  package require objective
  
! #if {[catch {source profdd.tcl}]} {error_dump}
  if {[file exists debug.tcl]} {
  	source debug.tcl
***************
*** 1259,1262 ****
--- 1259,1264 ----
      set @zoom 1.0 ;# must be a float, not int
      set @action none
+     #trace add variable @selection      write yell
+     #trace add variable @selection_wire write yell
      set @selection {}
      set @selection_wire {}
***************
*** 1652,1657 ****
  	bind $t <Control-Return> "$self key %W %x %y 10 %A 0"
  	bind $t <Return>         "$self unedit"
! 	bind $t <Any-Enter> "puts \"keep compltion box please..........\" "
! 	bind $t <Any-Leave> "puts \"destroy the compltion box please..........\" "
  	mset {cx cy} [$self xy]
  	$self item text window [list [expr $cx+2] [expr $cy+2]] \
--- 1654,1659 ----
  	bind $t <Control-Return> "$self key %W %x %y 10 %A 0"
  	bind $t <Return>         "$self unedit"
! 	#bind $t <Any-Enter> "puts \"keep compltion box please..........\" "
! 	#bind $t <Any-Leave> "puts \"destroy the compltion box please..........\" "
  	mset {cx cy} [$self xy]
  	$self item text window [list [expr $cx+2] [expr $cy+2]] \
***************
*** 2009,2013 ****
  def Canvas motion {x y f target} {
      global font canvas tooltip crosshair
-     set canvas(current) $self
      set c [$self widget]
      if {[$self look hairstate] && $@editmode} {
--- 2011,2014 ----
***************
*** 2220,2224 ****
  			connect {
  				mset {foo bar from outlet to inlet} $line
! 				pd .$@canvas connect [expr $n+$from] $outlet [expr $n+$to] $inlet
  			}
  			default {
--- 2221,2225 ----
  			connect {
  				mset {foo bar from outlet to inlet} $line
! 				pd .$self connect [expr $n+$from] $outlet [expr $n+$to] $inlet
  			}
  			default {
***************
*** 2239,2244 ****
  # part two
  def Canvas do_paste2 {n m} {
! 	$self selection= [lrange [$self children] $n end]
! 	$self selection_wire= [lrange [$self wires] $m end]
  }
  
--- 2240,2245 ----
  # part two
  def Canvas do_paste2 {n m} {
! 	$self selection=      [lrange [$self children] $n end]
! 	$self selection_wire= [lrange [$self wires]    $m end]
  }
  
***************
*** 2416,2424 ****
  			if {[regexp {^[xo]?[0-9a-f]{6,8}} [$c gettags $tag] id]} {
  				if {[$@canvas == $id]} {continue}
! 				switch $_($id:_class) {
! 					SelRect {}
! 					Wire    {lappend wires   $id}
! 					default {lappend objects $id}
! 				}
  			}
  		}
--- 2417,2422 ----
  			if {[regexp {^[xo]?[0-9a-f]{6,8}} [$c gettags $tag] id]} {
  				if {[$@canvas == $id]} {continue}
! 				if       {[[$id _class] inherit?  Box]} {lappend objects $id
! 				} elseif {[[$id _class] inherit? Wire]} {lappend wires   $id}
  			}
  		}
***************
*** 3219,3227 ****
  classinfo cnv      Cnv
  
- #
- # a hack to get around the file loading process
- # now also used for duplicting object and have them selected...
- set canvas(current) ""
- 
  # remember, _($foo:$bar) notation should die
  # because objects ought to be autonomous.
--- 3217,3220 ----
***************
*** 3238,3242 ****
  				set class canvas
  				if {$isnew} {Canvas new_as $self $mess} else {$self reinit $mess}
- 				set canvas(current) $self
  				set isnew 0
  			}
--- 3231,3234 ----





More information about the Pd-cvs mailing list