pd/src desire.tk,1.1.2.532,1.1.2.533 - Pd-cvs

29 Oct 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26766
Modified Files:
      Tag: devel_0_39
    desire.tk 
Log Message:
small fixes to the commit yesterday
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.532
retrieving revision 1.1.2.533
diff -C2 -d -r1.1.2.532 -r1.1.2.533
*** desire.tk	27 Oct 2006 16:28:15 -0000	1.1.2.532
--- desire.tk	29 Oct 2006 19:52:51 -0000	1.1.2.533
***************
*** 1402,1408 ****
--- 1402,1410 ----
      set @keynav_iosel_o {} ;# list of objects that has outlet selected
      set @keynav_iosel_i {} ;# list of objects that has inlet selected
+     set @iosel_deselect 0  ;# if selected should be deselected by clicking at empty space
      set @keynav_current 0
      set @keynav_last 0
      set @keynav_tab_sel "wire"
+     set @keynav_shift 0
      set @copy_count 0
      set @visible_children {}
***************
*** 3041,3045 ****
  def Canvas click_on_nothing {f target x y} {
    $self deselect_all
! 	$self dehilite_io
    switch $@action {
    	edit {}
--- 3043,3047 ----
  def Canvas click_on_nothing {f target x y} {
    $self deselect_all
! 	$self click_deselect_io
    switch $@action {
    	edit {}
***************
*** 3206,3210 ****
    #puts "		selection_wire::: $@selection_wire"
    #puts "		selection::: $@selection"
! 	puts "	keynav::: $@keynav"
    if {!$@keynav} {$self tab_jump}
    switch $@keynav_tab_sel {
--- 3208,3221 ----
    #puts "		selection_wire::: $@selection_wire"
    #puts "		selection::: $@selection"
! 	if {$@keynav_shift && !$shift} {
! 		puts "                           SOMETHING HAPPENED..............."
! 		#$self deselect_all
! 	}
! 	set @keynav_shift $shift
! 	if {[llength $@selection] > 1} {
! 		if {[llength $@keynav_iosel_i] > 0 || [llength $@keynav_iosel_o] > 0} {
! 			#$self deselect_all
! 		}
! 	}
    if {!$@keynav} {$self tab_jump}
    switch $@keynav_tab_sel {
***************
*** 3297,3300 ****
--- 3308,3312 ----
def Canvas key_nav_ioselect {} {
+ 	if {![llength $@selection]} {return}
    set var [lindex $@selection end end]
    if {$@keynav_iosel != $var} {set @keynav_iocount 0}
***************
*** 3339,3343 ****
    # @keynav_iosel_o stores the selected outlets
    foreach object $@selection {
! 		if {$@keynav_iosel != $var} {set @keynav_iosel $object}
    	if {$@keynav_iosel == $var} {
    		switch $type {
--- 3351,3355 ----
    # @keynav_iosel_o stores the selected outlets
    foreach object $@selection {
! 		if {$@keynav_iosel != $var} {set @keynav_iosel $var}
    	if {$@keynav_iosel == $var} {
    		switch $type {
***************
*** 3371,3374 ****
--- 3383,3395 ----
  }
+ def Canvas click_deselect_io {} {
+ 	if {[llength $@keynav_iosel_i] || [llength $@keynav_iosel_o]} {
+ 		if {!$@iosel_deselect} {set @iosel_deselect 1} else {$self dehilite_io; set @iosel_deselect 0}
+ 	} else {
+ 		$self dehilite_io
+ 	}
+ 
+ }
+ 
  def Canvas dehilite_io {} {
    #if {![llength $@keynav_iosel_i] || ![llength $@keynav_iosel_o]} {return}
***************
*** 3560,3563 ****
--- 3581,3587 ----
    		#}
    	}
+ 		F1 {
+ 			$self deselect_all
+ 		}
    	default {}
    }