[PD-cvs] pd/src desire.tk,1.1.2.275,1.1.2.276

Mathieu Bouchard matju at users.sourceforge.net
Mon Jul 3 21:46:30 CEST 2006


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

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
changed $look(foo) to [look foo]


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.275
retrieving revision 1.1.2.276
diff -C2 -d -r1.1.2.275 -r1.1.2.276
*** desire.tk	3 Jul 2006 19:36:38 -0000	1.1.2.275
--- desire.tk	3 Jul 2006 19:46:23 -0000	1.1.2.276
***************
*** 100,103 ****
--- 100,104 ----
  }
  
+ # will be a wrapper for [catch {}].
  # to be continued...
  proc begin {code args} {
***************
*** 208,213 ****
  	set backup $@redo
  	set @redo {}
! 	perform backup.pop
! 	set @redo $backup
  }
  
--- 209,214 ----
  	set backup $@redo
  	set @redo {}
! 	perform [lindex $backup end]
! 	set @redo [lrange $backup 0 end-1]
  }
  
***************
*** 338,341 ****
--- 339,344 ----
  proc say_category  {text} {}
  
+ proc look {k} {global look; return $look($k)}
+ 
  set cmdline(server) [list [file join [file dirname $argh0] ../bin/pd]]
  set cmdline(rcfilename) ~/.pdrc
***************
*** 443,447 ****
  
  set accels {}
- 
  foreach k [array names key] {
  	set v $key($k)
--- 446,449 ----
***************
*** 821,824 ****
--- 823,827 ----
          default {concat 1}}]
  set look(minobjwidth) 21
+ 
  #-----------------------------------------------------------------------------------#
  proc read_ddrc {} {
***************
*** 1083,1091 ****
  def Canvas editmode {} {return $@editmode}
  def Canvas editmode= {mode} {
-     global look
      set @editmode $mode
      #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.c configure -background [if $@editmode {concat $look(canvasbgedit)} {concat $look(canvasbgrun)}]
  }
  
--- 1086,1093 ----
  def Canvas editmode {} {return $@editmode}
  def Canvas editmode= {mode} {
      set @editmode $mode
      #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.c configure -background [if $@editmode {list [look canvasbgedit]} {list [look canvasbgrun]}]
  }
  
***************
*** 1106,1118 ****
  def* Canvas init {args} {
      super
!     global pd_opendir pd_tearoff OS cmdline look canvas history manager
      set name .$self
      set c .$self.c
      toplevel $name -menu $name.m
      # turn buttonbar on/off
!     if {$look(buttonbar)} {pack [[ButtonBar new $self] widget] -side top -fill x -expand no}
      set @statusbar [StatusBar new $self]
      # turn statusbar on/off
!     if {$look(statusbar)} {pack [$@statusbar widget] -side bottom -fill x}
      pack [scrollbar $name.xscroll -command "$c xview" -orient horizontal] -side bottom -fill x
      pack [scrollbar $name.yscroll -command "$c yview"                   ] -side  right -fill y
--- 1108,1120 ----
  def* Canvas init {args} {
      super
!     global pd_opendir pd_tearoff OS cmdline canvas history manager
      set name .$self
      set c .$self.c
      toplevel $name -menu $name.m
      # turn buttonbar on/off
!     if {[look buttonbar]} {pack [[ButtonBar new $self] widget] -side top -fill x -expand no}
      set @statusbar [StatusBar new $self]
      # turn statusbar on/off
!     if {[look statusbar]} {pack [$@statusbar widget] -side bottom -fill x}
      pack [scrollbar $name.xscroll -command "$c xview" -orient horizontal] -side bottom -fill x
      pack [scrollbar $name.yscroll -command "$c yview"                   ] -side  right -fill y
***************
*** 1340,1345 ****
  	global look
  	if {$@editmode} {
! 	.$self.c configure -background $look(canvasbgedit)} else {
! 	.$self.c configure -background $look(canvasbgrun)
  	}
  	
--- 1342,1347 ----
  	global look
  	if {$@editmode} {
! 	.$self.c configure -background [look canvasbgedit]} else {
! 	.$self.c configure -background [look canvasbgrun]
  	}
  	
***************
*** 1361,1366 ****
      set c .$@canvas.c
      for {set i 0} {$i<$n} {incr i} {
!         set onset [expr $x1 + ($xs-$look(iowidth)) * $i / $nplus]
!         set points [list [expr $onset] $y [expr $onset+$look(iowidth)] [expr $y+1]]
  	# will update this code when proc item deals with mult.tags
  	if {[llength [$c gettags $self$which$i]] != 0} {
--- 1363,1368 ----
      set c .$@canvas.c
      for {set i 0} {$i<$n} {incr i} {
!         set onset [expr $x1 + ($xs-[look iowidth]) * $i / $nplus]
!         set points [list [expr $onset] $y [expr $onset+[look iowidth]] [expr $y+1]]
  	# will update this code when proc item deals with mult.tags
  	if {[llength [$c gettags $self$which$i]] != 0} {
***************
*** 1368,1372 ****
          } {
              $c create rectangle $points -tags "$self$which $self$which$i $self" \
! 		-outline [switch $which { i {concat $look(inletfg)} o {concat $look(outletfg)}}]
          }
      }
--- 1370,1374 ----
          } {
              $c create rectangle $points -tags "$self$which $self$which$i $self" \
! 		-outline [switch $which { i {concat [look inletfg]} o {concat [look outletfg]}}]
          }
      }
***************
*** 1375,1379 ****
  def io draw {} {
      global look
!     set fy $look(iopos)
      mset {x1 y1 x2 y2} [$self bbox]
      io_draw/2 $self i  $@ninlets [expr $y1-$fy-1]
--- 1377,1381 ----
  def io draw {} {
      global look
!     set fy [look iopos]
      mset {x1 y1 x2 y2} [$self bbox]
      io_draw/2 $self i  $@ninlets [expr $y1-$fy-1]
***************
*** 1400,1404 ****
      } {
  	$self item TEXT text [l+ {2 2} [list $x1 $y1]] \
! 		-font $font(str) -text $@text -fill $look(objectfg) -anchor nw
  
      }
--- 1402,1406 ----
      } {
  	$self item TEXT text [l+ {2 2} [list $x1 $y1]] \
! 		-font $font(str) -text $@text -fill [look objectfg] -anchor nw
  
      }
***************
*** 1432,1436 ****
  	text $t -height 1 -width [expr [string length $@text]+1] -relief flat \
  		-bg ${look(objectbg)} -borderwidth 0 -highlightthickness 0\
! 		-font $font(str) -fg $look(objectfg)
  	#${look(objectbg)}
  	bind $t <Key>            "$self key %W %x %y %K %A 0"
--- 1434,1438 ----
  	text $t -height 1 -width [expr [string length $@text]+1] -relief flat \
  		-bg ${look(objectbg)} -borderwidth 0 -highlightthickness 0\
! 		-font $font(str) -fg [look objectfg]
  	#${look(objectbg)}
  	bind $t <Key>            "$self key %W %x %y %K %A 0"
***************
*** 1497,1503 ****
  	global font look
  	set @textwidth [expr $font(padx)+$font(width)*([string length $@text]+$@edit)]
! 	set @topwidth    [expr (2* $@ninlets-1) * $look(iowidth)]
! 	set @bottomwidth [expr (2*$@noutlets-1) * $look(iowidth)]
! 	set @xs [max $look(minobjwidth) [max $@bottomwidth [max $@topwidth $@textwidth]]]
  	set @ys [expr $font(pady)+$font(height)]
  }
--- 1499,1505 ----
  	global font look
  	set @textwidth [expr $font(padx)+$font(width)*([string length $@text]+$@edit)]
! 	set @topwidth    [expr (2* $@ninlets-1) * [look iowidth]]
! 	set @bottomwidth [expr (2*$@noutlets-1) * [look iowidth]]
! 	set @xs [max [look minobjwidth] [max $@bottomwidth [max $@topwidth $@textwidth]]]
  	set @ys [expr $font(pady)+$font(height)]
  }
***************
*** 1535,1541 ****
  	set xyb [l+ [list $x2 $y1 $x1 $y1 $x1 $y2] [list -1 +1 +1 +1 +1 -1]]
  	set xyc [l+ [list $x2 $y1 $x2 $y2 $x1 $y2] [list -1 +1 -1 -1 +1 -1]]
! 	$self item BASE  rectangle $xya -fill $look(objectbg)
! 	$self item BASE2 line      $xyb -fill $look(objectframe2)
! 	$self item BASE3 line      $xyc -fill $look(objectframe3)
  }
  
--- 1537,1543 ----
  	set xyb [l+ [list $x2 $y1 $x1 $y1 $x1 $y2] [list -1 +1 +1 +1 +1 -1]]
  	set xyc [l+ [list $x2 $y1 $x2 $y2 $x1 $y2] [list -1 +1 -1 -1 +1 -1]]
! 	$self item BASE  rectangle $xya -fill [look objectbg]
! 	$self item BASE2 line      $xyb -fill [look objectframe2]
! 	$self item BASE3 line      $xyc -fill [look objectframe3]
  }
  
***************
*** 1546,1550 ****
          mset {x1 y1} [$self xy]
          io_draw $self
!         if {[$self selected?]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)}
  	set c .$@canvas.c
  	$c itemconfigure ${self}BASE -outline $frcol -dash \
--- 1548,1552 ----
          mset {x1 y1} [$self xy]
          io_draw $self
!         if {[$self selected?]} {set frcol [look objectframe4]} {set frcol [look objectframe3]}
  	set c .$@canvas.c
  	$c itemconfigure ${self}BASE -outline $frcol -dash \
***************
*** 2086,2090 ****
  	set @selection $@children
  	set @selection_wire $@wires
! 	#foreach obj $@selection {.$self.c itemconfigure ${obj}BASE -outline $look(objectframe4)}
  }
  
--- 2088,2092 ----
  	set @selection $@children
  	set @selection_wire $@wires
! 	#foreach obj $@selection {.$self.c itemconfigure ${obj}BASE -outline [look objectframe4]}
  }
  
***************
*** 2130,2134 ****
  		set @action rect
  		$c create line $x $y $x $y $x $y $x $y $x $y \
! 			-tags {selrect1 selrect} -fill black -dash {3 3 3 3} -dashoffset 3 -fill $look(selrect)
  		return
  	}
--- 2132,2136 ----
  		set @action rect
  		$c create line $x $y $x $y $x $y $x $y $x $y \
! 			-tags {selrect1 selrect} -fill black -dash {3 3 3 3} -dashoffset 3 -fill [look selrect]
  		return
  	}
***************
*** 2153,2157 ****
  		set out [expr int(($x-$x1)*$outs/($x2-$x1))]
  		mset {x1 y1 x2 y2} [$c bbox ${id}o${out}]
! 		$c create line  [expr ($x1+$x2)/2] [expr ($y1+$y2)/2] $x $y -dash {4 4 4 4} -tags lnew -fill $look(wiredash)
  		set @wire_from [list $id $out]
  		set @action wire
--- 2155,2159 ----
  		set out [expr int(($x-$x1)*$outs/($x2-$x1))]
  		mset {x1 y1 x2 y2} [$c bbox ${id}o${out}]
! 		$c create line  [expr ($x1+$x2)/2] [expr ($y1+$y2)/2] $x $y -dash {4 4 4 4} -tags lnew -fill [look wiredash]
  		set @wire_from [list $id $out]
  		set @action wire
***************
*** 2233,2237 ****
  	puts "selected_objs:$selected_objs selection:$@selection selection_wire:$@selection_wire"
  	# hilite objects
! 	#foreach obj $@selection {$c itemconfigure ${obj}BASE -outline $look(objectframe4)}
  	foreach obj $@selection {$obj selected?= 1}
  	# hilite wire
--- 2235,2239 ----
  	puts "selected_objs:$selected_objs selection:$@selection selection_wire:$@selection_wire"
  	# hilite objects
! 	#foreach obj $@selection {$c itemconfigure ${obj}BASE -outline [look objectframe4]}
  	foreach obj $@selection {$obj selected?= 1}
  	# hilite wire
***************
*** 2471,2475 ****
  	set center [expr ([lindex $area 2] + [lindex $area 0]) / 2 ]
  	set dist [expr abs($x - $center)]
! 	if {$dist < [expr ($look(iowidth)/2)+5] && $dist > 0} {set port $n}
  	}
  	
--- 2473,2477 ----
  	set center [expr ([lindex $area 2] + [lindex $area 0]) / 2 ]
  	set dist [expr abs($x - $center)]
! 	if {$dist < [expr ([look iowidth]/2)+5] && $dist > 0} {set port $n}
  	}
  	
***************
*** 2479,2486 ****
  	if {$port >= $ports} {set port [expr $ports-1]}
  	set p $self$type$port
! 	set outline [switch $type {i {concat $look(outletfg)} o {concat $look(inletfg)}}]
  	$c create rectangle [l+ [$c coords $p] {-4 -4 +4 +4}] -outline $outline -width 1 -tags ${p}b
  	switch $type {i {set tip "inlet $port"} o {set tip "outlet $port"}}
! 	if {$look(tooltip)} {$@canvas show_tooltip $x $y $tip}
  	return $port
  }
--- 2481,2488 ----
  	if {$port >= $ports} {set port [expr $ports-1]}
  	set p $self$type$port
! 	set outline [switch $type {i {concat [look outletfg]} o {concat [look inletfg]}}]
  	$c create rectangle [l+ [$c coords $p] {-4 -4 +4 +4}] -outline $outline -width 1 -tags ${p}b
  	switch $type {i {set tip "inlet $port"} o {set tip "outlet $port"}}
! 	if {[look tooltip]} {$@canvas show_tooltip $x $y $tip}
  	return $port
  }
***************
*** 2528,2535 ****
  	set arrowshape [list $arrowsize [expr $arrowsize*4/5] [expr $arrowsize/3]]
  	# need this, maybe...
! 	#if {$@select_by == "selrect"} {set wire_color $look(wirefg2)} {set wire_color $look(wirefg)}
! 	if {[$self selected?]} {set wire_color $look(wirefg2)} {set wire_color $look(wirefg)}
! 	#set wire_color $look(wirefg)
! 	$self item WIRE line $xys -width $look(wirethick) -smooth yes \
  		-arrow $arrow -arrowshape $arrowshape -fill $wire_color
  	
--- 2530,2537 ----
  	set arrowshape [list $arrowsize [expr $arrowsize*4/5] [expr $arrowsize/3]]
  	# need this, maybe...
! 	#if {$@select_by == "selrect"} {set wire_color [look wirefg2]} {set wire_color [look wirefg]}
! 	if {[$self selected?]} {set wire_color [look wirefg2]} {set wire_color [look wirefg]}
! 	#set wire_color [look wirefg]
! 	$self item WIRE line $xys -width [look wirethick] -smooth yes \
  		-arrow $arrow -arrowshape $arrowshape -fill $wire_color
  	
***************
*** 2540,2546 ****
  	#} {
  		#$canvas create line $xys -tags $self -width $thick \
! 		#	-arrow $arrow -arrowshape $arrowshape -fill $look(wirefg)
  	#	$self item WIRE line $xys -width $thick -smooth yes \
! 	#	-arrow $arrow -arrowshape $arrowshape -fill $look(wirefg)
  	#}
  }
--- 2542,2548 ----
  	#} {
  		#$canvas create line $xys -tags $self -width $thick \
! 		#	-arrow $arrow -arrowshape $arrowshape -fill [look wirefg]
  	#	$self item WIRE line $xys -width $thick -smooth yes \
! 	#	-arrow $arrow -arrowshape $arrowshape -fill [look wirefg]
  	#}
  }
***************
*** 2548,2552 ****
  #def* Wire select {flag} {
  #	global look
! #	if {$flag} {set colour $look(wirefg2)} {set colour $look(wirefg)}
  #	.$@canvas.c itemconfigure ${self}WIRE -fill $colour
  #}
--- 2550,2554 ----
  #def* Wire select {flag} {
  #	global look
! #	if {$flag} {set colour [look wirefg2]} {set colour [look wirefg]}
  #	.$@canvas.c itemconfigure ${self}WIRE -fill $colour
  #}
***************
*** 2579,2583 ****
  	global look
  	scan $colour         #%02x%02x%02x r g b
! 	scan $look(sliderbg) #%02x%02x%02x R G B
  	return [format #%02x%02x%02x [expr ($r*$R)>>8] [expr ($g*$G)>>8] [expr ($b*$B)>>8]]
  }
--- 2581,2585 ----
  	global look
  	scan $colour         #%02x%02x%02x r g b
! 	scan [look sliderbg] #%02x%02x%02x R G B
  	return [format #%02x%02x%02x [expr ($r*$R)>>8] [expr ($g*$G)>>8] [expr ($b*$B)>>8]]
  }
***************
*** 2855,2861 ****
  	set points [list $x1 $y1 [expr $x2+4] $y1 $x2 [expr $y1+4] $x2 [expr $y2-4] \
  		[expr $x2+4] $y2 $x1 $y2 $x2 $y2 $x1 $y2]
! 	$self item BASE polygon $points -fill $look(objectbg) -outline $look(objectframe3)
  	io_draw $self
! 	if {[$self selected?]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)}
  	.$@canvas.c itemconfigure ${self}BASE -outline $frcol
  	super
--- 2857,2863 ----
  	set points [list $x1 $y1 [expr $x2+4] $y1 $x2 [expr $y1+4] $x2 [expr $y2-4] \
  		[expr $x2+4] $y2 $x1 $y2 $x2 $y2 $x1 $y2]
! 	$self item BASE polygon $points -fill [look objectbg] -outline [look objectframe3]
  	io_draw $self
! 	if {[$self selected?]} {set frcol [look objectframe4]} {set frcol [look objectframe3]}
  	.$@canvas.c itemconfigure ${self}BASE -outline $frcol
  	super
***************
*** 2897,2901 ****
  	global look
  	.$@canvas.c itemconfigure ${self}BASE -fill \
! 		[if {$flag} {list #ffff00} {list $look(objectbg)}]
  }
  
--- 2899,2903 ----
  	global look
  	.$@canvas.c itemconfigure ${self}BASE -fill \
! 		[if {$flag} {list #ffff00} {list [look objectbg]}]
  }
  
***************
*** 2910,2916 ****
  	set points [list $x1 $y1 [expr $x2-4] $y1 $x2 [expr $y1+4] $x2 $y2 $x1 $y2]
  	.$@canvas.c canvasx $x1
! 	$self item BASE polygon $points -fill $look(objectbg) -outline $look(objectframe3)
  	io_draw $self
! 	if {[$self selected?]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)}
  	.$@canvas.c itemconfigure ${self}BASE -outline $frcol
  }
--- 2912,2918 ----
  	set points [list $x1 $y1 [expr $x2-4] $y1 $x2 [expr $y1+4] $x2 $y2 $x1 $y2]
  	.$@canvas.c canvasx $x1
! 	$self item BASE polygon $points -fill [look objectbg] -outline [look objectframe3]
  	io_draw $self
! 	if {[$self selected?]} {set frcol [look objectframe4]} {set frcol [look objectframe3]}
  	.$@canvas.c itemconfigure ${self}BASE -outline $frcol
  }
***************
*** 2926,2930 ****
  	set @xt [expr $x1+$ys/2-2]
  	set @yt [expr $y1+$ys/2+3+$xs/34]
! 	if {[$self selected?]} {set fcol red} else {set fcol $look(objectfg)}
  	if {[string length $@val] <= $@w} { 
  		set string $@text
--- 2928,2932 ----
  	set @xt [expr $x1+$ys/2-2]
  	set @yt [expr $y1+$ys/2+3+$xs/34]
! 	if {[$self selected?]} {set fcol red} else {set fcol [look objectfg]}
  	if {[string length $@val] <= $@w} { 
  		set string $@text
***************
*** 2958,2962 ****
  	$self item BASE3 line      $xyc -fill [darker $color]
  	io_draw $self
! 	if {[$self selected?]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)}
  	.$@canvas.c itemconfigure ${self}BASE -outline $frcol
  	$self draw_wires
--- 2960,2964 ----
  	$self item BASE3 line      $xyc -fill [darker $color]
  	io_draw $self
! 	if {[$self selected?]} {set frcol [look objectframe4]} {set frcol [look objectframe3]}
  	.$@canvas.c itemconfigure ${self}BASE -outline $frcol
  	$self draw_wires
***************
*** 3353,3359 ****
  	if {!$@w} [set @w 5]
  	set @textwidth [expr $font(padx)+$font(width)*$@w]
! 	set @topwidth [expr ($@ninlets + ($@ninlets - 1)) * $look(iowidth)]
! 	set @bottomwidth [expr ($@noutlets + ($@noutlets - 1)) * $look(iowidth)]
! 	set @xs [max $look(minobjwidth) [max $@bottomwidth [max $@topwidth $@textwidth]]]
  	
  	set @ys  [expr $font(pady)+$font(height)]
--- 3355,3361 ----
  	if {!$@w} [set @w 5]
  	set @textwidth [expr $font(padx)+$font(width)*$@w]
! 	set @topwidth [expr ($@ninlets + ($@ninlets - 1)) * [look iowidth]]
! 	set @bottomwidth [expr ($@noutlets + ($@noutlets - 1)) * [look iowidth]]
! 	set @xs [max [look minobjwidth] [max $@bottomwidth [max $@topwidth $@textwidth]]]
  	
  	set @ys  [expr $font(pady)+$font(height)]
***************
*** 3419,3425 ****
  	global font look
  	set @textwidth [expr $font(padx)+$font(width)*[string length $@buf]]
! 	set @topwidth [expr ($@ninlets + ($@ninlets - 1)) * $look(iowidth)]
! 	set @bottomwidth [expr ($@noutlets + ($@noutlets - 1)) * $look(iowidth)]
! 	set @xs [max $look(minobjwidth) [max $@bottomwidth [max $@topwidth $@textwidth]]]
  	set @ys  [expr $font(pady)+$font(height)]
  }
--- 3421,3427 ----
  	global font look
  	set @textwidth [expr $font(padx)+$font(width)*[string length $@buf]]
! 	set @topwidth [expr ($@ninlets + ($@ninlets - 1)) * [look iowidth]]
! 	set @bottomwidth [expr ($@noutlets + ($@noutlets - 1)) * [look iowidth]]
! 	set @xs [max [look minobjwidth] [max $@bottomwidth [max $@topwidth $@textwidth]]]
  	set @ys  [expr $font(pady)+$font(height)]
  }
***************
*** 3441,3447 ****
  	set points2 [list $x1 $y1 [expr $x1+$ys/2] [expr $y1+$ys/2] $x1 $y2]
  	set focused [$self == [$@canvas focus]]
! 	if {$focused} {set color4 #00ff00} {set color4 $look(objectbg)}
! 	$self item BASE   polygon $points  -fill [parse_color $@bcol] -outline $look(objectframe3)
! 	$self item BASE4  polygon $points2 -fill $color4 -outline $look(objectframe3)
  	#$self item NUMBER text [list $xt $yt] -anchor w -text [$self ftoa] \
  	#	-font $font(str) -fill [parse_color $@fcol]
--- 3443,3449 ----
  	set points2 [list $x1 $y1 [expr $x1+$ys/2] [expr $y1+$ys/2] $x1 $y2]
  	set focused [$self == [$@canvas focus]]
! 	if {$focused} {set color4 #00ff00} {set color4 [look objectbg]}
! 	$self item BASE   polygon $points  -fill [parse_color $@bcol] -outline [look objectframe3]
! 	$self item BASE4  polygon $points2 -fill $color4 -outline [look objectframe3]
  	#$self item NUMBER text [list $xt $yt] -anchor w -text [$self ftoa] \
  	#	-font $font(str) -fill [parse_color $@fcol]
***************
*** 3455,3459 ****
  	io_draw $self
  	Labeled_draw $self
! 	if {[$self selected?]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)}
  	$c itemconfigure ${self}BASE -outline $frcol
  }
--- 3457,3461 ----
  	io_draw $self
  	Labeled_draw $self
! 	if {[$self selected?]} {set frcol [look objectframe4]} {set frcol [look objectframe3]}
  	$c itemconfigure ${self}BASE -outline $frcol
  }
***************
*** 3511,3515 ****
  	#if {$@oval!=$@val} {
  	#	$@canvas focus= ""
! 	#	.$@canvas.c itemconfigure ${self}BASE4 -fill $look(objectbg)
  	#	pd .$self float $@val
  	#}
--- 3513,3517 ----
  	#if {$@oval!=$@val} {
  	#	$@canvas focus= ""
! 	#	.$@canvas.c itemconfigure ${self}BASE4 -fill [look objectbg]
  	#	pd .$self float $@val
  	#}
***************
*** 3522,3526 ****
  	} { 
  		$@canvas focus= ""
! 		.$@canvas.c itemconfigure ${self}BASE4 -fill $look(objectbg)
  		$self selected?= 0
  		if {$@key_input} {set @val $@old_val; set @key_input 0; set @text $@val}
--- 3524,3528 ----
  	} { 
  		$@canvas focus= ""
! 		.$@canvas.c itemconfigure ${self}BASE4 -fill [look objectbg]
  		$self selected?= 0
  		if {$@key_input} {set @val $@old_val; set @key_input 0; set @text $@val}
***************
*** 3694,3698 ****
  		set coords [list $x1 $y3 [expr $x1+$xs] $y3]
  	}
! 	$@canvas create line $coords -dash [list 1 $eighth 1 $eighth] -width $thick -fill [darker $look(sliderbg)]
  }
  
--- 3696,3700 ----
  		set coords [list $x1 $y3 [expr $x1+$xs] $y3]
  	}
! 	$@canvas create line $coords -dash [list 1 $eighth 1 $eighth] -width $thick -fill [darker [look sliderbg]]
  }
  
***************
*** 4347,4355 ****
  	}
  	mset {x1 y1 x2 y2} [$textself bbox]
! 	if {$look(showcomp) <= 20} {
! 		set @height $look(showcomp)} else {set @height 20}
  	listbox $f -width $@width -height $@height -relief flat \
! 		-bg $look(canvasbgedit) -selectbackground [complement $look(objectfg)] \
! 		-activestyle dotbox -selectforeground $look(objectfg)
  	$self fill_box [$@textbox get 1.0 1.end]
  	$f configure -width $@width
--- 4349,4357 ----
  	}
  	mset {x1 y1 x2 y2} [$textself bbox]
! 	if {[look showcomp] <= 20} {
! 		set @height [look showcomp]} else {set @height 20}
  	listbox $f -width $@width -height $@height -relief flat \
! 		-bg [look canvasbgedit] -selectbackground [complement [look objectfg]] \
! 		-activestyle dotbox -selectforeground [look objectfg]
  	$self fill_box [$@textbox get 1.0 1.end]
  	$f configure -width $@width





More information about the Pd-cvs mailing list