[PD-cvs] pd/src desire.tk,1.1.2.115,1.1.2.116

[chunlee]

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

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.115
retrieving revision 1.1.2.116
diff -C2 -d -r1.1.2.115 -r1.1.2.116
*** desire.tk	8 Nov 2005 16:28:12 -0000	1.1.2.115
--- desire.tk	9 Nov 2005 00:40:56 -0000	1.1.2.116
***************
*** 1658,1665 ****
  
  def* canvas unclickedit {x y b} {
      set c .$self.c
      switch $@action {
        rect {
-         puts "sel rect handling code here"
  	mset {x1 y1 x2 y2} [$c bbox selrect]
  	#if selrect is always at the last stack order, then we don't need to do this
--- 1658,1665 ----
  
  def* canvas unclickedit {x y b} {
+     global look 
      set c .$self.c
      switch $@action {
        rect {
  	mset {x1 y1 x2 y2} [$c bbox selrect]
  	#if selrect is always at the last stack order, then we don't need to do this
***************
*** 1668,1686 ****
  	set selrect_index [lsearch $selected_elements $selrect_order]
  	set selected_elements [lreplace $selected_elements $selrect_index $selrect_index]
- 	puts "items:$selected_elements"
  	if {[llength $selected_elements]} {
! 	set element_tags {}
! 	foreach item $selected_elements {
! 	  eval lappend element_tags [$c gettags $item]
! 	}
! 	puts "tags:$element_tags"
  	set ids {}
! 	foreach tag $element_tags {
! 	if {[regexp {^x([a-f0-9]{6,8})} $tag id]} {lappend ids $id}
  	}
- 	#puts "id:$ids"
  	set selected_objs [lsort -unique $ids]
! 	#puts "selected_objs:$selected_objs"
! 	#foreach obj $@selection {$c itemconfigure ${obj}BASE -outline $look(objectframe4)}
  	}
  	$c delete selrect
--- 1668,1684 ----
  	set selrect_index [lsearch $selected_elements $selrect_order]
  	set selected_elements [lreplace $selected_elements $selrect_index $selrect_index]
  	if {[llength $selected_elements]} {
! 	set element_tags {}	
  	set ids {}
! 	foreach tag $selected_elements {
! 	if {[regexp {^x([a-f0-9]{6,8})} [$c gettags $tag] id]} {lappend ids $id}
  	}
  	set selected_objs [lsort -unique $ids]
! 	foreach obj $selected_objs {
! 	  set i [lsearch $@selection $obj]
! 	  if {$i<0} {lappend @selection $obj} 
! 	}
! 	puts "selected_objs:$selected_objs selection:$@selection"
! 	foreach obj $@selection {$c itemconfigure ${obj}BASE -outline $look(objectframe4)}
  	}
  	$c delete selrect
***************
*** 1705,1708 ****
--- 1703,1710 ----
        
        }
+       move {
+ 	set @selection {}
+ 	puts "selection:$@selection"
+       }
      }
  
***************
*** 1715,1722 ****
  def* canvas unclick {x y b} {
      if {$@editmode} {$self unclickedit $x $y %b} {$self unclickrun $x $y %b}
!     global font look offset_wire
!     set c .$self.c
!     set cx [$c canvasx $x]
!     set cy [$c canvasy $y]
  # don't remove these codes just yet, thx -chun
  #    if {[llength $@wire_from]} {
--- 1717,1724 ----
  def* canvas unclick {x y b} {
      if {$@editmode} {$self unclickedit $x $y %b} {$self unclickrun $x $y %b}
! #    global font look offset_wire
! #    set c .$self.c
! #    set cx [$c canvasx $x]
! #    set cy [$c canvasy $y]
  # don't remove these codes just yet, thx -chun
  #    if {[llength $@wire_from]} {