pd/src desire.tk,1.1.2.292,1.1.2.293 - Pd-cvs

7 Aug 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25033
Modified Files:
      Tag: devel_0_39
    desire.tk 
Log Message:
fixed subpatches
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.292
retrieving revision 1.1.2.293
diff -C2 -d -r1.1.2.292 -r1.1.2.293
*** desire.tk	7 Aug 2006 17:01:58 -0000	1.1.2.292
--- desire.tk	7 Aug 2006 17:54:14 -0000	1.1.2.293
***************
*** 850,878 ****
    set dd_config [read $file]
    close $file
! 	
! 	set lines [split $dd_config "\n"]
! 	foreach line $lines {
! 		# comments begins with "#", and is skipped 
! 		if {[regexp {^#} $line comment]} {} else {
! 		
! 		  #if {[regexp {^-[a-zA-Z]{2,10}} $line option]} {
! 		
! 		  foreach {word1 word2 word3} $line {
    	  #set word1 [string replace $word1 0 0]
    	  switch $word1 {
! 		  color {
! 		  set look($word2) $word3
! 		  puts "look($word2) $word3"
! 		  } 
! 		  font {
! 		  #puts "settings for font"
! 		  } 
! 		  default {
! 		  #puts "settings for something"
! 		  } 
! 	      }
! 		  
! 		  }
! 		#}
    	}
    }
--- 850,869 ----
    set dd_config [read $file]
    close $file
! 	foreach line [split $dd_config "\n"] {
! 		if {[regexp {^#} $line comment]} {continue} ;# skip comments
! 		foreach {word1 word2 word3} $line {
    	  #set word1 [string replace $word1 0 0]
    	  switch $word1 {
! 		    color {
! 		      set look($word2) $word3
! 		      #puts "look($word2) $word3"
! 		    }
! 		    font {
! 		      #puts "settings for font"
! 		    }
! 		    default {
! 		      #puts "settings for something"
! 		    }
! 	          }
    	}
    }
***************
*** 1110,1114 ****
      #sets the edit_toggle so the edit mode checkbox will follow if key binding is used
      catch {.$self.bbar.edit configure -image icon_mode_$mode}
!     $self draw
  }
--- 1101,1105 ----
      #sets the edit_toggle so the edit mode checkbox will follow if key binding is used
      catch {.$self.bbar.edit configure -image icon_mode_$mode}
!     $self changed ;#$self draw
  }
***************
*** 1381,1384 ****
--- 1372,1376 ----
def* Canvas draw {} {
+ 	if {$@subpatch} {super} ;# is for the [pd] box if applicable
    if {$@editmode} {set bg [look canvasbgedit]} else {set bg [look canvasbgrun]}
    .$self.c configure -background $bg
***************
*** 3001,3009 ****
    	$self subscribe $c
    	$self canvas= $c
! 		#calling the ninlets because when its called by the server, its too late...
! 		#so the $ninlets and $noutlets are added to the sys_vgui call in pd_upload...
! 		#$self ninlets= $ninlets
! 		#$self noutlets= $noutlets
! 		$self draw
    	if {$unborn_child == [expr [llength $_($c:unborn)] - 1]} {
    		# when it reachs the last unborn child, its time to draw the wires
--- 2993,2997 ----
    	$self subscribe $c
    	$self canvas= $c
! 		$self draw ;# this shouldn't be here!
    	if {$unborn_child == [expr [llength $_($c:unborn)] - 1]} {
    		# when it reachs the last unborn child, its time to draw the wires