pd/src desire.tk,1.1.2.600.2.252,1.1.2.600.2.253 - Pd-cvs

30 Jul 2007


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4136
Modified Files:
      Tag: desiredata
    desire.tk 
Log Message:
just noodling around...
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.252
retrieving revision 1.1.2.600.2.253
diff -C2 -d -r1.1.2.600.2.252 -r1.1.2.600.2.253
*** desire.tk	30 Jul 2007 05:00:08 -0000	1.1.2.600.2.252
--- desire.tk	30 Jul 2007 05:16:08 -0000	1.1.2.600.2.253
***************
*** 5078,5087 ****
proc change_2 {self mess} {
- 	global _ classinfo
    set mess [split $mess]
! 	set isnew [expr ![info exists _($self:_class)]]
    switch -- [lindex $mess 0] {
    	"#N" {if {$isnew} {Canvas new_as $self $mess} else {$self reinit $mess}}
! 		"#X" {
    		set i 1
    		# would it be possible to merge floatatom,symbolatom as gatom ?
--- 5078,5086 ----
proc change_2 {self mess} {
    set mess [split $mess]
! 	set isnew [expr ![info exists ::_($self:_class)]]
    switch -- [lindex $mess 0] {
    	"#N" {if {$isnew} {Canvas new_as $self $mess} else {$self reinit $mess}}
! 		"#X" { # YOU CAN'T USE LINDEX YOU DUMMY
    		set i 1
    		# would it be possible to merge floatatom,symbolatom as gatom ?
***************
*** 5090,5095 ****
    			msg        {set class message}
    			default    {set class [lindex $mess 1]}}
! 			if {[info exists classinfo($class)]} {
! 				set _class [lindex $classinfo($class) 0]
    		} else {
    			if {[lindex $mess 1] == "connect"} {
--- 5089,5094 ----
    			msg        {set class message}
    			default    {set class [lindex $mess 1]}}
! 			if {[info exists ::classinfo($class)]} {
! 				set _class [lindex $::classinfo($class) 0]
    		} else {
    			if {[lindex $mess 1] == "connect"} {
***************
*** 5125,5130 ****
--- 5124,5131 ----
  # split at message boundaries.
  # \n is wiped, then that character is reused temporarily to mean a quoted semicolon.
+ # BUG: this is wrong because then \; gets parsed wrong.
  proc pd_mess_split {e} {
    set r {}
+ 	set m {}
    regsub -all "\n" $e " " y
    regsub -all {\;} $y "\n" z
***************
*** 5137,5140 ****
--- 5138,5146 ----
  }
+ # split at atom boundaries.
+ proc pd_atom_split {e} {
+ 
+ }
+ 
  ############ rendering
***************
*** 5277,5284 ****
def IEMPropertiesDialog apply {} {
- 	global fields classinfo
    set class $_($@of:class)
    set props {}
! 	foreach var [lrange $fields($class) 5 end] {
    	set v $@$var
    	if {[regexp -nocase {^[bfl]col$} $var]} {set v [unparse_color $v]}
--- 5283,5289 ----
def IEMPropertiesDialog apply {} {
    set class $_($@of:class)
    set props {}
! 	foreach var [lrange $::fields($class) 5 end] {
    	set v $@$var
    	if {[regexp -nocase {^[bfl]col$} $var]} {set v [unparse_color $v]}
***************
*** 5293,5303 ****
def IEMPropertiesDialog init {of} {
- 	global classinfo fields
    super $of
- 
    set @class $_($of:class)
    wm title .$self "[$@class] [say popup_properties]"
! 	if {![info exists fields($@class)]} {set class obj}
! 	foreach var $fields($@class) {
    	set val $_($of:$var)
    	switch -- $val { empty {set val ""}}
--- 5298,5306 ----
def IEMPropertiesDialog init {of} {
    super $of
    set @class $_($of:class)
    wm title .$self "[$@class] [say popup_properties]"
! 	if {![info exists ::fields($@class)]} {set class obj}
! 	foreach var $::fields($@class) {
    	set val $_($of:$var)
    	switch -- $val { empty {set val ""}}
***************
*** 5309,5313 ****
    	$self add .$self [list orient choice -choices {horizontal vertical}]
    }
! 	foreach prop [lrange $fields($@class) 5 end] {
    	set d [concat [list $prop] [switch $prop {
    		w      {list integer -width 7}
--- 5312,5316 ----
    	$self add .$self [list orient choice -choices {horizontal vertical}]
    }
! 	foreach prop [lrange $::fields($@class) 5 end] {
    	set d [concat [list $prop] [switch $prop {
    		w      {list integer -width 7}
***************
*** 5356,5360 ****
def CanvasPropertiesDialog init {of} {
- 	global fields classinfo
    super $of
    set @canvas $of
--- 5359,5362 ----
***************
*** 8110,8119 ****
def Box deconstruct {} {
! 	global fields
! 	if {[array names fields -exact $@pdclass] == ""} {
    	return [concat [list #X obj  $@x1 $@y1] $@text]
    } {
    	set r {}
! 		foreach field $fields($@pdclass) {lappend r $_($self:$field)}
    	return $r
    }
--- 8112,8120 ----
def Box deconstruct {} {
! 	if {[array names ::fields -exact $@pdclass] == ""} {
    	return [concat [list #X obj  $@x1 $@y1] $@text]
    } {
    	set r {}
! 		foreach field $::fields($@pdclass) {lappend r $_($self:$field)}
    	return $r
    }