[PD-cvs] pd/src desire.tk,1.1.2.600.2.414,1.1.2.600.2.415

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
atombox runmode fixes


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.414
retrieving revision 1.1.2.600.2.415
diff -C2 -d -r1.1.2.600.2.414 -r1.1.2.600.2.415
*** desire.tk	18 Oct 2007 12:22:42 -0000	1.1.2.600.2.414
--- desire.tk	18 Oct 2007 21:50:36 -0000	1.1.2.600.2.415
***************
*** 3835,3839 ****
  }
  def Canvas deselect_all {} {
! 	$self editmode= 1
  	$@objectsel clear
  	$@wiresel clear
--- 3835,3839 ----
  }
  def Canvas deselect_all {} {
! 	#$self editmode= 1
  	$@objectsel clear
  	$@wiresel clear
***************
*** 4319,4323 ****
  
  def Canvas click_runmode {id x y f target} {
! 	if {$@focus != ""} {if {[[$@focus class] <= TextBox]} {$@focus unedit}}
  	if {[llength $id]} {
  		if {[$id class] != "Canvas"} {
--- 4319,4324 ----
  
  def Canvas click_runmode {id x y f target} {
! 	$self deselect_all
! 	#if {$@focus != ""} {if {[[$@focus class] <= TextBox]} {$self selection-= $@focus;$@focus unedit}}
  	if {[llength $id]} {
  		if {[$id class] != "Canvas"} {
***************
*** 4806,4814 ****
  def Canvas key {x y key iso shift} {
  	global tooltip; if {$tooltip ne ""} {$tooltip delete; set tooltip ""}
! 	if {[modes_callback $self "key" $x $y $key $iso $shift]} {return}
! 	if {[$self focus] != ""} {
! 		[$self focus] key $key $shift
! 	}
  	#if {$iso != ""} {scan $iso %c key}
  	if {$shift} {
  		if {[$self look snap_grid]} {set motion [expr [$self look grid_size]*2]} {set motion 10}
--- 4807,4823 ----
  def Canvas key {x y key iso shift} {
  	global tooltip; if {$tooltip ne ""} {$tooltip delete; set tooltip ""}
! 	#if {[modes_callback $self "key" $x $y $key $iso $shift]} {return}
! 	#if {[$self focus] != ""} {[$self focus] key $key $shift}
  	#if {$iso != ""} {scan $iso %c key}
+ 	#set focus [$self focus]
+ 	if {!$@editmode && [llength [$self selection]] == 1} {
+ 		set obj [$self selection]
+ 		if {[[$obj class] <= AtomBox]} {
+ 			if {[regexp {[[:digit:]]} $key]} {$obj text= $key} {return}
+ 			$obj edit
+ 			$obj clear 0
+ 			return
+ 		}
+ 	}
  	if {$shift} {
  		if {[$self look snap_grid]} {set motion [expr [$self look grid_size]*2]} {set motion 10}
***************
*** 5630,5633 ****
--- 5639,5645 ----
  }
  
+ def AtomBox clear {var} {set @clear $var}
+ def AtomBox clear= {} {return $@clear}
+ 
  def AtomBox filter_text {{for_edit 0}} {
  	if {$for_edit} {return ""}