[PD-cvs] pd/src desire.tk,1.1.2.272,1.1.2.273

[chunlee]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
file loading and ctrl+S bug fixed


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.272
retrieving revision 1.1.2.273
diff -C2 -d -r1.1.2.272 -r1.1.2.273
*** desire.tk	3 Jul 2006 15:43:35 -0000	1.1.2.272
--- desire.tk	3 Jul 2006 17:30:08 -0000	1.1.2.273
***************
*** 570,574 ****
  
  proc accept_pd {s addr port} {
! 	global sock
  	if {[llength $sock]==0} {
  		set sock $s
--- 570,574 ----
  
  proc accept_pd {s addr port} {
! 	global sock canvas
  	if {[llength $sock]==0} {
  		set sock $s
***************
*** 585,588 ****
--- 585,590 ----
  			post "f='$f' ff='$ff' ffl='$ffl'"
  			pd pd open $file $dir
+ 			set canvas(file) $file
+ 			set canvas(directory) $dir
  		}
  	} {
***************
*** 699,703 ****
  
  def Client open_file_really {filename} {
!     global pd_opendir font
      set i [string last / $filename]
      set directory [string range $filename 0 [expr $i-1]]
--- 701,705 ----
  
  def Client open_file_really {filename} {
!     global pd_opendir font canvas
      set i [string last / $filename]
      set directory [string range $filename 0 [expr $i-1]]
***************
*** 706,709 ****
--- 708,713 ----
      if {[string last .pd $filename] >= 0} {
          pd pd open [enquote $basename] [enquote $directory]
+ 	set canvas(file) [enquote $basename]
+ 	set canvas(directory) [enquote $directory]
      }
  }
***************
*** 957,961 ****
  
  #def Canvas close  {} {pd $self menuclose 0}
! def Canvas save   {} {
  	$self checkgeometry 
  	if {[string length $@file]} {
--- 961,965 ----
  
  #def Canvas close  {} {pd $self menuclose 0}
! def* Canvas save   {} {
  	$self checkgeometry 
  	if {[string length $@file]} {
***************
*** 1131,1135 ****
      wm geometry $name +$@x+$@y
      #wtf?????
-     set @editmode 1
      $self editmode= $@editable
      $self new_menubar $@editable
--- 1135,1138 ----
***************
*** 1155,1160 ****
      #set @wire_hilite {}
      set @history $history
!     set @file ""
!     set @directory ""
      post %s "canvas init: subscribing to $manager"
      $self subscribe $manager
--- 1158,1163 ----
      #set @wire_hilite {}
      set @history $history
!     if {[info exists canvas(file)]} {set @file $canvas(file)} else {set @file ""}
!     if {[info exists canvas(directory)]} {set @directory $canvas(directory)} else {set @directory ""}
      post %s "canvas init: subscribing to $manager"
      $self subscribe $manager
***************
*** 2702,2713 ****
  		if {[info exists classinfo($class)]} {
  			set _($x:_class) [lindex $classinfo($class) 0]
- 			if {$_($x:_class) == "Canvas" && [llength $d] > 7} {
- 			puts "------------- sub-patch -------------"
- 			#set obj ${x}_obj
- 			#puts "calling it $obj"
- 			#ObjectBox new_as $obj
- 			#set _($obj:text) [lindex $d 5] 
- 			#$obj draw
- 			}
  		} {
  			post BLEH
--- 2705,2708 ----
***************
*** 2742,2745 ****
--- 2737,2741 ----
  
  		$x init
+ 		
  		if {$_($canvas(current):duplicating)} {
  		#puts "duplicating stuff............ $x"