[PD-cvs] pd/src desire.tk,1.1.2.600.2.211,1.1.2.600.2.212

Mathieu Bouchard matju at users.sourceforge.net
Tue Jul 10 18:55:44 CEST 2007


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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
cleanup; and redisabling pointer_sense, with a comment about it


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.211
retrieving revision 1.1.2.600.2.212
diff -C2 -d -r1.1.2.600.2.211 -r1.1.2.600.2.212
*** desire.tk	9 Jul 2007 20:17:39 -0000	1.1.2.600.2.211
--- desire.tk	10 Jul 2007 16:55:40 -0000	1.1.2.600.2.212
***************
*** 1561,1565 ****
      set @cmd_histi 0
      set @iohilite {-1 0 0 0 0}
!     set @pointer_sense 30
      set @keyprefix 0
      # default #X coords line
--- 1561,1565 ----
      set @cmd_histi 0
      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
***************
*** 2719,2723 ****
  	if {$id == ""} {return}
  	#$self motion_iohilite $target $x $y
- 
  }
  
--- 2719,2722 ----
***************
*** 2746,2750 ****
  		} else {
  			set obj [lindex $@keynav_iosel_i 0]
! 			set in_objs $@keynav_iosel_i
  			set out_objs $@keynav_iosel_o
  		}
--- 2745,2749 ----
  		} else {
  			set obj [lindex $@keynav_iosel_i 0]
! 			set  in_objs $@keynav_iosel_i
  			set out_objs $@keynav_iosel_o
  		}
***************
*** 2764,2772 ****
  			foreach obj $in_objs {
  				set obj3_idx [$self children_idx $obj]
! 				if {![llength [$obj ioselect]]} {
! 					set port 0
! 				} else {
! 					set port [lindex [$obj ioselect] 0]
! 				}
  				set w1 [list $obj1_idx $outlet $obj3_idx $port]
  				if {[lsearch $@wires $w1] == -1} {$self connect $w1}
--- 2763,2767 ----
  			foreach obj $in_objs {
  				set obj3_idx [$self children_idx $obj]
! 				if {![llength [$obj ioselect]]} {set port 0} else {set port [lindex [$obj ioselect] 0]}
  				set w1 [list $obj1_idx $outlet $obj3_idx $port]
  				if {[lsearch $@wires $w1] == -1} {$self connect $w1}
***************
*** 2774,2782 ****
  			foreach obj $out_objs {
  				set obj3_idx [$self children_idx $obj]
! 				if {![llength [$obj ioselect]]} {
! 					set port 0
! 				} else {
! 					set port [lindex [$obj ioselect] 0]
! 				}
  				set w2 [list $obj3_idx $port $obj2_idx $inlet]
  				if {[lsearch $@wires $w2] == -1} {$self connect $w2}
--- 2769,2773 ----
  			foreach obj $out_objs {
  				set obj3_idx [$self children_idx $obj]
! 				if {![llength [$obj ioselect]]} {set port 0} else {set port [lindex [$obj ioselect] 0]}
  				set w2 [list $obj3_idx $port $obj2_idx $inlet]
  				if {[lsearch $@wires $w2] == -1} {$self connect $w2}
***************
*** 2958,2962 ****
  		set dist [distance $point2 $point1]
  		if {$dist < $mindist} {set mindist $dist; set idx $i}
! 		incr i;
  	}
  	return [lindex $ios $idx]
--- 2949,2953 ----
  		set dist [distance $point2 $point1]
  		if {$dist < $mindist} {set mindist $dist; set idx $i}
! 		incr i
  	}
  	return [lindex $ios $idx]
***************
*** 3313,3317 ****
  	set ancestors [$class ancestors]
  	set name ${class}_$def
! 	set n 0;
  	foreach class $ancestors {
  		set name ${class}_$def
--- 3304,3308 ----
  	set ancestors [$class ancestors]
  	set name ${class}_$def
! 	set n 0
  	foreach class $ancestors {
  		set name ${class}_$def
***************
*** 4260,4278 ****
  		set obj [lindex $@selection 0]
  	}
! 	set ins [$obj ninlets]
  	set outs [$obj noutlets]
  	set ports {}
  	set ports2 {}
  	set ports3 {}
! 	for {set i 0} {$i < $ins} {incr i} {
! 		lappend ports ${obj}i${i}
! 		lappend ports2 "i"
! 		lappend ports3 $i
! 	}
! 	for {set i 0} {$i < $outs} {incr i} {
! 		lappend ports ${obj}o${i}
! 		lappend ports2 "o"
! 		lappend ports3 $i
! 	}
  	#incr @keynav_iocount
  	if {$@keynav_iocount >= [llength $ports]} {set @keynav_iocount 0}
--- 4251,4261 ----
  		set obj [lindex $@selection 0]
  	}
! 	set ins  [$obj ninlets]
  	set outs [$obj noutlets]
  	set ports {}
  	set ports2 {}
  	set ports3 {}
! 	for {set i 0} {$i < $ins}  {incr i} {lappend ports ${obj}i${i}; lappend ports2 "i"; lappend ports3 $i}
! 	for {set i 0} {$i < $outs} {incr i} {lappend ports ${obj}o${i}; lappend ports2 "o"; lappend ports3 $i}
  	#incr @keynav_iocount
  	if {$@keynav_iocount >= [llength $ports]} {set @keynav_iocount 0}
***************
*** 4286,4308 ****
  	# @keynav_iosel_o stores the selected outlets
  	foreach object $@selection {
! 		if {$@keynav_iosel != $var} {set @keynav_iosel $var}
! 		if {$@keynav_iosel == $var} {
  			switch $type {
  				i {
  					if {[lsearch $@keynav_iosel_i $object] == -1} {
! 					lappend @keynav_iosel_i $object
  						set find [lsearch $@keynav_iosel_o $object]
! 						if {$find >= 0} {
! 							set @keynav_iosel_o [lreplace $@keynav_iosel_o $find $find]
! 						}
  					}
  				}
  				o {
  					if {[lsearch $@keynav_iosel_o $object] == -1} {
! 					lappend @keynav_iosel_o $object
  						set find [lsearch $@keynav_iosel_i $object]
! 						if {$find >= 0} {
! 							set @keynav_iosel_i [lreplace $@keynav_iosel_i $find $find]
! 						}
  					}
  				}
--- 4269,4286 ----
  	# @keynav_iosel_o stores the selected outlets
  	foreach object $@selection {
! 		if {$@keynav_iosel != $var} {set @keynav_iosel $var} else {
  			switch $type {
  				i {
  					if {[lsearch $@keynav_iosel_i $object] == -1} {
! 						lappend @keynav_iosel_i $object
  						set find [lsearch $@keynav_iosel_o $object]
! 						if {$find >= 0} {set @keynav_iosel_o [lreplace $@keynav_iosel_o $find $find]}
  					}
  				}
  				o {
  					if {[lsearch $@keynav_iosel_o $object] == -1} {
! 						lappend @keynav_iosel_o $object
  						set find [lsearch $@keynav_iosel_i $object]
! 						if {$find >= 0} {set @keynav_iosel_i [lreplace $@keynav_iosel_i $find $find]}
  					}
  				}
***************
*** 4319,4323 ****
  
  def Canvas keyboard_mode {} {
! 	puts "loading keyboard-mode...."
  	if {[file exists kb-mode.tcl]} {
  		package require kb-mode
--- 4297,4301 ----
  
  def Canvas keyboard_mode {} {
! 	post "loading keyboard-mode...."
  	if {[file exists kb-mode.tcl]} {
  		package require kb-mode
***************
*** 4329,4333 ****
  
  def Canvas keyboard_mode_exit {} {
! 	puts "exiting keyboard-mode...."
  	package forget kb-mode
  	remove_callback kb-mode
--- 4307,4311 ----
  
  def Canvas keyboard_mode_exit {} {
! 	post "exiting keyboard-mode...."
  	package forget kb-mode
  	remove_callback kb-mode
***************
*** 4336,4340 ****
  	read_ddrc
  	remove_callback "kb-mode"
- 
  	unset @kbcursor
  }
--- 4314,4317 ----
***************
*** 4354,4357 ****
--- 4331,4335 ----
  def Canvas dehilite_io {} {
  	foreach io [concat $@keynav_iosel_i $@keynav_iosel_o] {
+ 		puts "$io is a [$io class]"
  		set box $_($io:ioselect)
  		set type [lindex $_($io:ioselect) 1]
***************
*** 4506,4510 ****
  				$@selection key_incr $val1 $val2
  			}
! 															   }
  	} else {
  		$self selection_move $val1 $val2
--- 4484,4488 ----
  				$@selection key_incr $val1 $val2
  			}
! 		}
  	} else {
  		$self selection_move $val1 $val2
***************
*** 8097,8101 ****
  def Canvas graphviz_sort {} {
  	set nodes {}
! 	set gwidth 0; set gh 0;
  	#toplevel .graph -height 600 -width 800
  	#set c [canvas .graph.c -height 600 -width 800]
--- 8075,8079 ----
  def Canvas graphviz_sort {} {
  	set nodes {}
! 	set gwidth 0; set gh 0
  	#toplevel .graph -height 600 -width 800
  	#set c [canvas .graph.c -height 600 -width 800]





More information about the Pd-cvs mailing list