[PD-cvs] pd/src desire.tk, 1.1.2.600.2.157, 1.1.2.600.2.158 defaults.ddrc, 1.1.2.10.2.10, 1.1.2.10.2.11

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk defaults.ddrc 
Log Message:
moved deselect selection to Ctrl+A, small fix in View get_canvas


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.157
retrieving revision 1.1.2.600.2.158
diff -C2 -d -r1.1.2.600.2.157 -r1.1.2.600.2.158
*** desire.tk	9 Jan 2007 11:56:46 -0000	1.1.2.600.2.157
--- desire.tk	9 Jan 2007 15:21:14 -0000	1.1.2.600.2.158
***************
*** 1218,1222 ****
  	while {![winfo exists [$canvas widget]]} {set canvas [$canvas canvas]}
  	if {[regexp {x[0-9a-f]{6,8}} [focus] focus] && [$@canvas gop]} {
! 		if {$focus != $canvas} {set canvas $focus}  
  	}
  	return $canvas
--- 1218,1224 ----
  	while {![winfo exists [$canvas widget]]} {set canvas [$canvas canvas]}
  	if {[regexp {x[0-9a-f]{6,8}} [focus] focus] && [$@canvas gop]} {
! 		set topcanvas1 [$focus get_topcanvas]
! 		set topcanvas2 [$canvas get_topcanvas]
! 		if {$focus != $canvas && $topcanvas1 == $topcanvas2} {set canvas $focus}  
  	}
  	return $canvas
***************
*** 2404,2407 ****
--- 2406,2410 ----
  	if {$flag && !$was} {
  		if {!$subpatcherize(paste) && !$subpatcherize(edit)} {
+ 			netsend [list .$self map 1]
  			$self init_window
  		} else {
***************
*** 4180,4197 ****
  			}
  		}
- 		Escape {
- 			if {[llength $@selection] > 0 | [llength $@selection_wire] > 0} {
- 				$self deselect_all
- 				$self dehilite_io
- 			}
- 			if {$@keynav} {set @keynav 0}
- 			
- 			#this should be better sorted out in canvas tab_jump
- 			if {$@keynav_tab_sel == "object"} {
- 				set @keynav_tab_sel "wire"
- 			} else {
- 				set @keynav_tab_sel "object"
- 			}
- 		}
  		F1 {
  			$self deselect_all
--- 4183,4186 ----
***************
*** 4201,4204 ****
--- 4190,4209 ----
  }
  
+ def Canvas clear_selection {} {
+ 	if {[llength $@selection] > 0 | [llength $@selection_wire] > 0} {
+ 		$self deselect_all
+ 		$self dehilite_io
+ 	}
+ 	if {$@keynav} {set @keynav 0}
+ 	
+ 	#this should be better sorted out in canvas tab_jump
+ 	if {$@keynav_tab_sel == "object"} {
+ 		set @keynav_tab_sel "wire"
+ 	} else {
+ 		set @keynav_tab_sel "object"
+ 	}
+ 
+ }
+ 
  #-----------------------------------------------------------------------------------#
  def Canvas keynav_current {} {return $@keynav_current}
***************
*** 7249,7252 ****
--- 7254,7258 ----
      key Canvas {paste duplicate}
      key Canvas select_all
+     key Canvas clear_selection
      key Canvas {reload redraw}
      key Canvas editmodeswitch
***************
*** 7685,7689 ****
  	set r {}
  	lappend r #N canvas $@canvasx1 $@canvasy1 $@canvasxs $@canvasys
! 	if {$@subpatch} {lappend r $@name $@mapped} else {lappend r $@fontsize}
  	$stream << "[philtre $r];\n"
  	foreach child $@children {eval [concat [list $child deconstruct_to $stream]]}
--- 7691,7695 ----
  	set r {}
  	lappend r #N canvas $@canvasx1 $@canvasy1 $@canvasxs $@canvasys
! 	if {$@subpatch || $@abs} {lappend r $@name $@mapped} else {lappend r $@fontsize}
  	$stream << "[philtre $r];\n"
  	foreach child $@children {eval [concat [list $child deconstruct_to $stream]]}

Index: defaults.ddrc
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/defaults.ddrc,v
retrieving revision 1.1.2.10.2.10
retrieving revision 1.1.2.10.2.11
diff -C2 -d -r1.1.2.10.2.10 -r1.1.2.10.2.11
*** defaults.ddrc	18 Dec 2006 00:03:36 -0000	1.1.2.10.2.10
--- defaults.ddrc	9 Jan 2007 15:21:16 -0000	1.1.2.10.2.11
***************
*** 143,146 ****
--- 143,147 ----
      auto_wire Ctrl+j
      subpatcherize Alt+p
+     clear_selection Ctrl+A
      auto_test Ctrl+grave
    }