[PD-cvs] pd/src desire.tk,1.1.2.600.2.227,1.1.2.600.2.228

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
Canvas connect now also accepts callback


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.227
retrieving revision 1.1.2.600.2.228
diff -C2 -d -r1.1.2.600.2.227 -r1.1.2.600.2.228
*** desire.tk	13 Jul 2007 01:27:52 -0000	1.1.2.600.2.227
--- desire.tk	13 Jul 2007 10:36:53 -0000	1.1.2.600.2.228
***************
*** 1598,1602 ****
      set @find_string ""
      set @iohilite {-1 0 0 0 0}
!     set @pointer_sense 0 ;# i want this to be OFF by default so that I can use selrect and stuff. we need to talk about this.
      set @keyprefix 0
      # default #X coords line
--- 1598,1602 ----
      set @find_string ""
      set @iohilite {-1 0 0 0 0}
!     set @pointer_sense 2 ;# i want this to be OFF by default so that I can use selrect and stuff. we need to talk about this.
      set @keyprefix 0
      # default #X coords line
***************
*** 2031,2035 ****
  	set obj2_idx [$self children_idx $obj2]
  	set obj3_idx [$self children_idx $obj]
! 	$self connect2 [list $obj1_idx $outlet $obj3_idx 0] [list $self keynav_current=]
  	$self connect [list $obj3_idx 0 $obj2_idx $inlet]
  	$self action= none
--- 2031,2035 ----
  	set obj2_idx [$self children_idx $obj2]
  	set obj3_idx [$self children_idx $obj]
! 	$self connect [list $obj1_idx $outlet $obj3_idx 0] [list $self keynav_current=]
  	$self connect [list $obj3_idx 0 $obj2_idx $inlet]
  	$self action= none
***************
*** 3533,3549 ****
  	$@history add [list $self    connect $wire]
  }
! def Canvas connect {wire} {
! 	mset {from outlet to inlet} $wire
! 	netsend [list .$self connect $from $outlet $to $inlet]
! 	$@history add [list $self disconnect $wire]
! }
! #temporary
! def Canvas connect2 {wire goto} {
  	mset {from outlet to inlet} $wire
! 	netsend [list .$self connect $from $outlet $to $inlet] $goto
  	$@history add [list $self disconnect $wire]
  }
  
- 
  def Canvas clear_wires {} {
  	set @auto_wire_obj2 {}; set @auto_wire_obj1 {}
--- 3533,3545 ----
  	$@history add [list $self    connect $wire]
  }
! def Canvas connect {wire {callback "none"}} {
  	mset {from outlet to inlet} $wire
! 	switch $callback {
! 		none {netsend [list .$self connect $from $outlet $to $inlet]}
! 		default {netsend [list .$self connect $from $outlet $to $inlet] $callback}
! 	}
  	$@history add [list $self disconnect $wire]
  }
  
  def Canvas clear_wires {} {
  	set @auto_wire_obj2 {}; set @auto_wire_obj1 {}