[PD-cvs] pd/src desire.tk,1.1.2.600.2.248,1.1.2.600.2.249

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
various fixes


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.248
retrieving revision 1.1.2.600.2.249
diff -C2 -d -r1.1.2.600.2.248 -r1.1.2.600.2.249
*** desire.tk	28 Jul 2007 14:52:39 -0000	1.1.2.600.2.248
--- desire.tk	30 Jul 2007 03:15:48 -0000	1.1.2.600.2.249
***************
*** 1526,1534 ****
  
  #-----------------------------------------------------------------------------------#
- # check or uncheck the "edit" menu item
  def Canvas editmode {} {return $@editmode}
- # to be called only from Pd side.
  def Canvas editmode= {mode} {
!     if {!$mode} {$self deselect_all}
      set @editmode $mode; $self changed editmode
  #    catch {.$self.bbar.edit configure -image icon_mode_$mode}
--- 1526,1533 ----
  
  #-----------------------------------------------------------------------------------#
  def Canvas editmode {} {return $@editmode}
  def Canvas editmode= {mode} {
!     #maybe it not necessary to deselect..
!     #if {!$mode} {$self deselect_all}
      set @editmode $mode; $self changed editmode
  #    catch {.$self.bbar.edit configure -image icon_mode_$mode}
***************
*** 2271,2276 ****
  		if {[string length $line] > $width} {set width [string length $line]}
  	}
  	text $t -height $nl -width $width -relief flat -bg [$self look bgedit] -borderwidth 0 \
! 		-highlightthickness 0 -font $font_str -fg [$self look fg] -insertbackground [$self look fg]
  	bind $t <Key> "$self resize %K; $self key_input %W %x %y %K %A 0"
  	bind $t <Control-Return>       "$self key_input %W %x %y 10 %A 0"
--- 2270,2281 ----
  		if {[string length $line] > $width} {set width [string length $line]}
  	}
+ 	switch [$self class] {
+ 		NumBox {set insertbg [$self look bg]}
+ 		FloatBox {set insertbg [$self look bg]}
+ 		SymbolBox {set insertbg [$self look bg]}
+ 		default {set insertbg [$self look fg]}
+ 	}
  	text $t -height $nl -width $width -relief flat -bg [$self look bgedit] -borderwidth 0 \
! 		-highlightthickness 0 -font $font_str -fg [$self look fg] -insertbackground $insertbg
  	bind $t <Key> "$self resize %K; $self key_input %W %x %y %K %A 0"
  	bind $t <Control-Return>       "$self key_input %W %x %y 10 %A 0"
***************
*** 4054,4057 ****
--- 4059,4063 ----
  
  def Canvas click_on_nothing {f target x y} {
+ 	[$self widget] configure -cursor {}
  	if {$@focus != ""} {if {[[$@focus class] <= TextBox]} {$@focus unedit}}
  	if {$@action == "insert"} {return}
***************
*** 5523,5526 ****
--- 5529,5533 ----
  
  def AtomBox setto {text} {
+ 	[$@canvas widget] configure -cursor {}
  	if { [string is double $text]} {
  		set @text $text; #so that the text gets updated immediately
***************
*** 5529,5533 ****
  	}
  }
! def SymbolBox setto {text} {if {![string is double $text]} {netsend [list .$self symbol $text]}}
  
  def FloatBox ftoa {} {
--- 5536,5543 ----
  	}
  }
! def SymbolBox setto {text} {
! 	[$@canvas widget] configure -cursor {}
! 	if {![string is double $text]} {netsend [list .$self symbol $text]}
! }
  
  def FloatBox ftoa {} {
***************
*** 5861,5864 ****
--- 5871,5875 ----
  def Bang click   {x y f target} {netsend [list .$self bang]}
  def Bang bang {count} {set @count $count; set @flash 1}
+ def Bang key_incr {val1 val2} {netsend [list .$self bang]}
  
  class_new Toggle {BlueBox}