pd/src desire.tk,1.1.2.600.2.183,1.1.2.600.2.184 - Pd-cvs

23 May 2007


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16564
Modified Files:
      Tag: desiredata
    desire.tk 
Log Message:
fix iox bugs caused by my previous commit
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.183
retrieving revision 1.1.2.600.2.184
diff -C2 -d -r1.1.2.600.2.183 -r1.1.2.600.2.184
*** desire.tk	11 May 2007 00:51:01 -0000	1.1.2.600.2.183
--- desire.tk	23 May 2007 13:50:28 -0000	1.1.2.600.2.184
***************
*** 1538,1542 ****
      set @cmd_histi 0
      set @motion_watch 0
!     set @iohilite {}
      set @pointer_sense 50
  }
--- 1538,1542 ----
      set @cmd_histi 0
      set @motion_watch 0
!     set @iohilite {-1 0 0 0 0}
      set @pointer_sense 50
  }
***************
*** 2825,2828 ****
--- 2825,2829 ----
    set mindist 66666
    set idx 0
+ 	if {!$ports} {return}
    for {set i 0} {$i < $ports} {incr i} {
    	set point2 [lmap / [rect_centre [$c bbox ${obj}$io${i}]] $@zoom]
***************
*** 3939,3944 ****
    if {!$@editmode} {$self run_click $id $x $y $f $target; return}
    set in_selection [expr [lsearch $@selection $id]>=0]
! 	mset {obj iox ioy io idx} $@iohilite
! 	if {$obj != -1 && $type != "wire"} {
    	switch $io {
    		i {set type "inlet"}
--- 3940,3961 ----
    if {!$@editmode} {$self run_click $id $x $y $f $target; return}
    set in_selection [expr [lsearch $@selection $id]>=0]
! 	switch $type {
! 		outlet {}
! 		inlet {}
! 		object {$self click_on_object $id $f}
! 		wire {$self click_on_wire $id $f $x $y}
! 		nothing {
! 			if {[$self focus] != ""} {
! 				$self click_on_nothing $f $target $x $y
! 				return
! 			}
! 
! 		}
! 		label {$self click_on_object $id $f}
! 		default {error "BORK: $type"}
! 	}
! 	if {$@iohilite != "" && $type != "wire"} {
! 		mset {obj iox ioy io idx} $@iohilite
! 		if {$obj < 0} {return}
    	switch $io {
    		i {set type "inlet"}
***************
*** 3950,3967 ****
    	return
    }
- 	switch $type {
- 		outlet {
- 			#if {$@action == "none" && [$id canvas] == $self} {
- 			#	set @action [FutureWire new $self $x $y $f $target]
- 			#}
- 			#return
- 		}
- 		inlet {}
- 		object {$self click_on_object $id $f}
- 		wire {$self click_on_wire $id $f $x $y}
- 		nothing {$self click_on_nothing $f $target $x $y; return}
- 		label {$self click_on_object $id $f}
- 		default {error "BORK: $type"}
- 	}
}
--- 3967,3970 ----