[PD-cvs] pd/src desire.tk,1.1.2.544,1.1.2.545

[chunlee]

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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
modification at Manager call


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.544
retrieving revision 1.1.2.545
diff -C2 -d -r1.1.2.544 -r1.1.2.545
*** desire.tk	2 Nov 2006 18:20:59 -0000	1.1.2.544
--- desire.tk	9 Nov 2006 01:58:36 -0000	1.1.2.545
***************
*** 184,195 ****
  	global poolset
  	#if {[llength $@q]} {post "client queue %d" [llength $@q]}
! 	foreach o $@q {
! 		#post %s "Manager: $o: $poolset($o)"
  		unset poolset($o)
- 		# $o draw
- 		#if {[catch {$o draw}]} {puts [error_dump]}
  		if {[catch {$o draw_maybe}]} {puts [error_dump]}
  	}
! 	set @q {}
  	after 50 "$self call"
  }
--- 184,202 ----
  	global poolset
  	#if {[llength $@q]} {post "client queue %d" [llength $@q]}
! 
! 	for {set i 0} {$i < [llength $@q]} {incr i} {
! 		set o [lindex $@q $i]
  		unset poolset($o)
  		if {[catch {$o draw_maybe}]} {puts [error_dump]}
+ 		if {$i == [expr [llength $@q] - 1]} {set @q {}}
  	}
! #	foreach o $@q {
! #		#post %s "Manager: $o: $poolset($o)"
! #		unset poolset($o)
! #		# $o draw
! #		#if {[catch {$o draw}]} {puts [error_dump]}
! #		if {[catch {$o draw_maybe}]} {puts [error_dump]}
! #	}
! #	set @q {}
  	after 50 "$self call"
  }
***************
*** 422,425 ****
--- 429,433 ----
  set leet 0
  
+ 
  proc say {k args} {
    global text leet
***************
*** 2045,2049 ****
  		mset {x1 y1 w h} [$c.${self}text bbox $@longline.$n]
  		set textlen [string length [$c.${self}text get $@longline.0 $@longline.end]]
! 		set textwidth [expr $textlen * $w + $padx*2 + 2]
  	}
  	set iowidth [$self look iowidth]
--- 2053,2057 ----
  		mset {x1 y1 w h} [$c.${self}text bbox $@longline.$n]
  		set textlen [string length [$c.${self}text get $@longline.0 $@longline.end]]
! 		set textwidth [expr ($textlen * $w / [$@canvas zoom]) + $padx*2 + 2]
  	}
  	set iowidth [$self look iowidth]
***************
*** 2220,2224 ****
  	set dead [lwithout $@children $children]
  	foreach x [lreverse $dead] {$x unsubscribe $self; $x erase} ;# should use delete instead?
! 	foreach x $new {$x subscribe $self; $x changed; $x canvas= $self}
  	set @children $children
  	foreach x $@children {$x outside_of_the_box}
--- 2228,2232 ----
  	set dead [lwithout $@children $children]
  	foreach x [lreverse $dead] {$x unsubscribe $self; $x erase} ;# should use delete instead?
! 	foreach x $new {$x subscribe $self; $x changed; $x canvas= $self; puts "   $x subscribed............."}
  	set @children $children
  	foreach x $@children {$x outside_of_the_box}
***************
*** 4406,4411 ****
  	if {[$self selected?]} {set frcol [$self look selectframe]} {set frcol [$self look frame3]}
  	$self item BASE  rectangle $xya -fill $color -outline $frcol
! 	$self item BASE2 line      $xyb -fill #ffffff
! 	$self item BASE3 line      $xyc -fill [darker $color]
  	$self draw_io
  }
--- 4414,4420 ----
  	if {[$self selected?]} {set frcol [$self look selectframe]} {set frcol [$self look frame3]}
  	$self item BASE  rectangle $xya -fill $color -outline $frcol
! 	#below lines draws the 3d box edge
! 	#$self item BASE2 line      $xyb -fill #ffffff
! 	#$self item BASE3 line      $xyc -fill [darker $color]
  	$self draw_io
  }
***************
*** 5188,5199 ****
  	mset {x1 y1 x2 y2} [$self bbox]
  	if {$@flash} {
! 		[$@canvas widget] itemconfigure ${self}BUT -fill [color_* [$self look bg] [parse_color $@fcol]]
! 		after 100 [list [$@canvas widget] itemconfigure ${self}BUT -fill [color_* [$self look bg] [parse_color $@bcol]]]
! 		set $@flash 0
  	} else {
  		set colour [parse_color $@bcol]
  		set rect [list [expr $x1+2] [expr $y1+2] [expr $x2-2] [expr $y2-2]]
! 		$self item BUT oval $rect -fill [color_* [$self look bg] $colour] \
! 		      -tags "${self}BUT $self"
  	}
  }
--- 5197,5211 ----
  	mset {x1 y1 x2 y2} [$self bbox]
  	if {$@flash} {
! 		set rect [list [expr $x1+2] [expr $y1+2] [expr $x2-2] [expr $y2-2]]
! 		#$self item BUT oval $rect -fill [color_* [$self look bg] [parse_color $@fcol]]
! 		set fcol [color_* [$self look bg] [parse_color $@fcol]]
! 		set bcol [color_* [$self look bg] [parse_color $@bcol]]
! 		$self item BUT oval $rect -fill $fcol
! 		after 100 [list $self item BUT oval $rect -fill $bcol]
! 		set @flash 0
  	} else {
  		set colour [parse_color $@bcol]
  		set rect [list [expr $x1+2] [expr $y1+2] [expr $x2-2] [expr $y2-2]]
! 		$self item BUT oval $rect -fill [color_* [$self look bg] $colour] -outline [$self look frame3]
  	}
  }