[PD-cvs] pd/src desire.tk,1.1.2.299,1.1.2.300

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
fixed multiline problem when reading from socket.
cleanup.


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.299
retrieving revision 1.1.2.300
diff -C2 -d -r1.1.2.299 -r1.1.2.300
*** desire.tk	8 Aug 2006 16:41:59 -0000	1.1.2.299
--- desire.tk	8 Aug 2006 17:45:36 -0000	1.1.2.300
***************
*** 579,586 ****
  		if {[fblocked $sock]} {break}
  		if {[string first pdtk_post $cmd]!=0} {puts "-> $cmd"}
! 		if {[catch {eval $sock_lobby$cmd}]} {
  			global errorCode errorInfo
  			switch -regexp -- $errorInfo {
! 			  "^missing close-brace" {set sock_lobby $sock_lobby$cmd; continue}
  			}
  			regsub -all "    invoked from within\n" $errorInfo "" errorInfo
--- 579,587 ----
  		if {[fblocked $sock]} {break}
  		if {[string first pdtk_post $cmd]!=0} {puts "-> $cmd"}
! 		set sock_lobby "$sock_lobby\n$cmd"
! 		if {[catch {eval $sock_lobby}]} {
  			global errorCode errorInfo
  			switch -regexp -- $errorInfo {
! 			  "^missing close-brace" {continue}
  			}
  			regsub -all "    invoked from within\n" $errorInfo "" errorInfo
***************
*** 5522,5542 ****
  		
  	}
- 	#while {$i < [llength $contents]} {
- 	#	set op [lindex $contents $i]
- 	#	puts "op=$op"
- 	#	if {[string length $op]==0} {break}
- 	#	if {![info exists ddrc_options_h($op)]} {
- 	#		error "unknown option: $op"
- 	#	}
- 	#	foreach {type name} $ddrc_options_h($op) {}
- 	#	switch $type {
- 	#		folders {incr i; lappend @$name [lindex $contents $i]}
- 	#		files   {incr i; lappend @$name [lindex $contents $i]}
- 	#		void            {set @$name 1}
- 	#		color { puts "reading colors $name" }
- 	#		default {incr i; set @$name [lindex $contents $i]}
- 	#	}
- 	#	incr i
- 	#}
  }
  
--- 5523,5526 ----
***************
*** 5547,5558 ****
  	#puts "fd ===== $fd"
  	foreach {type name} $ddrc_options {
- 		#puts "type::: $type || name:: $name"
- 		
- 		#set v $@$name
- 		#set op [lindex [split $name |] 0]
  		switch $type {
- 			#folders {foreach x $v {puts $fd "$op $x"}}
- 			#files   {foreach x $v {puts $fd "$op $x"}}
- 			#void    {if {[string length $v]} {if {$v} {puts $fd $op}}}
  			color {
  				set var ${name}path
--- 5531,5535 ----
***************
*** 5568,5587 ****
  				if {$key($item) != $new_key} {
  					if {[dict exists $accels $old_key]} {
! 					set cmd [dict get $accels $old_key]
! 					set accels [dict remove $accels $old_key]
! 					dict set accels $new_key $cmd
! 					puts "$new_key ::: $cmd"
  					}
  				}
  				if {[dict exists $check_key $new_key] && $new_key != ""} {
! 				error "$new_key already assigned" 
! 				#dict set check_key $new_key key($item)
  				} else {dict set check_key $new_key key($item)}
! 				set key($item) $new_key
! 				puts $fd "$type $item $new_key"
  				}
  			
  			}
- 			#default {if {[string length $v]} {puts $fd "$op $v"}}
  		}
  	}
--- 5545,5563 ----
  				if {$key($item) != $new_key} {
  					if {[dict exists $accels $old_key]} {
! 						set cmd [dict get $accels $old_key]
! 						set accels [dict remove $accels $old_key]
! 						dict set accels $new_key $cmd
! 						puts "$new_key ::: $cmd"
  					}
  				}
  				if {[dict exists $check_key $new_key] && $new_key != ""} {
! 					error "$new_key already assigned" 
! 					#dict set check_key $new_key key($item)
  				} else {dict set check_key $new_key key($item)}
! 					set key($item) $new_key
! 					puts $fd "$type $item $new_key"
  				}
  			
  			}
  		}
  	}