[PD-cvs] pd/src desire.tk,1.1.2.21,1.1.2.22
Mathieu Bouchard
matju at users.sourceforge.net
Sun Sep 4 08:59:11 CEST 2005
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3604
Modified Files:
Tag: devel_0_39
desire.tk
Log Message:
removed explicit "global _" in def context
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -C2 -d -r1.1.2.21 -r1.1.2.22
*** desire.tk 4 Sep 2005 06:44:27 -0000 1.1.2.21
--- desire.tk 4 Sep 2005 06:59:08 -0000 1.1.2.22
***************
*** 1,3 ****
--- 1,4 ----
#!/usr/bin/env wish
+ # $Id$
#-----------------------------------------------------------------------------------#
#
***************
*** 1238,1244 ****
#-----------------------------------------------------------------------------------#
def object xy {canvas} {
! puts "object_xy"
! global _
!
set canvas_id [canvastosym $canvas]
--- 1239,1243 ----
#-----------------------------------------------------------------------------------#
def object xy {canvas} {
! puts "object_xy"
set canvas_id [canvastosym $canvas]
***************
*** 1272,1276 ****
puts "objectbox_draw ::: $self $canvas $xs $ys $ins $outs"
! global _ look
foreach {x1 y1} [object_xy $self $canvas] {}
#set x1 50; set y1 50
--- 1271,1275 ----
puts "objectbox_draw ::: $self $canvas $xs $ys $ins $outs"
! global look
foreach {x1 y1} [object_xy $self $canvas] {}
#set x1 50; set y1 50
***************
*** 1415,1419 ****
puts "text_create:: $self $canvas $font_size"
! global _ look font
set name_len [string length $text]
--- 1414,1418 ----
puts "text_create:: $self $canvas $font_size"
! global look font
set name_len [string length $text]
***************
*** 1435,1444 ****
set _(self) $self
bind ${canvas}.${self}text <KeyRelease> {
-
- global _
-
pdtk_text_key $canvas.c $_(self) %W %x %y %K %A 0
!
! }
#$canvas create window 41 41 -window ${canvas}.${self}text -anchor nw\
--- 1434,1439 ----
set _(self) $self
bind ${canvas}.${self}text <KeyRelease> {
pdtk_text_key $canvas.c $_(self) %W %x %y %K %A 0
! }
#$canvas create window 41 41 -window ${canvas}.${self}text -anchor nw\
***************
*** 1511,1515 ****
def object add {canvas} {
puts "object_add:: $self $canvas"
! global _ font look
set canvas_id [canvastosym $canvas]
--- 1506,1510 ----
def object add {canvas} {
puts "object_add:: $self $canvas"
! global font look
set canvas_id [canvastosym $canvas]
***************
*** 1561,1565 ****
puts "object_complete::: $self $canvas"
! global _ font
set _($self:isselected) 0
--- 1556,1560 ----
puts "object_complete::: $self $canvas"
! global font
set _($self:isselected) 0
***************
*** 1670,1674 ****
def object edit {canvas} {
! global _ font
set canvas_id [canvastosym $canvas]
--- 1665,1669 ----
def object edit {canvas} {
! global font
set canvas_id [canvastosym $canvas]
***************
*** 2838,2843 ****
def wire draw2 {canvas} {
puts "wire_draw2:: $self $canvas"
-
- global _
set bbox1 [$canvas bbox $_($self:obj1)o$_($self:port1)]
set bbox2 [$canvas bbox $_($self:obj2)i$_($self:port2)]
--- 2833,2836 ----
***************
*** 2851,2856 ****
def wire select {canvas flag} {
puts "wire_select:: $self $canvas $flag"
!
! global _ look
if {$flag} {set colour #ff8000} {set colour $look(wirefg)}
$canvas itemconfigure $self -fill $colour
--- 2844,2848 ----
def wire select {canvas flag} {
puts "wire_select:: $self $canvas $flag"
! global look
if {$flag} {set colour #ff8000} {set colour $look(wirefg)}
$canvas itemconfigure $self -fill $colour
***************
*** 2865,2870 ****
def wire update {d} {
puts "wire_update:: $self $d"
-
- global _
foreach [list _($self:obj1) _($self:port1) _($self:obj2) _($self:port2)] \
[lrange $d 0 3] {}
--- 2857,2860 ----
***************
*** 2873,2878 ****
#def wire status {d} {
# puts "wire_update:: $self $d"
- #
- # global _
# foreach [list _($self:obj1) _($self:port1) _($self:obj2) _($self:port2)] \
# [lrange $d 0 3] {}
--- 2863,2866 ----
***************
*** 3037,3041 ****
def message bang {canvas flag} {
! global _ look
if {$flag} {
$canvas itemconfigure ${self}BASE -fill #ffff00
--- 3025,3029 ----
def message bang {canvas flag} {
! global look
if {$flag} {
$canvas itemconfigure ${self}BASE -fill #ffff00
***************
*** 3082,3086 ****
def numbox draw {canvas} {
global look
- global _
if {![info exists _($self:buf)]} {set _($self:buf) ""}
foreach {x1 y1} [object_xy $self $canvas] {}
--- 3070,3073 ----
***************
*** 3132,3136 ****
def numbox ftoa {} {
- global _
set f $_($self:val)
set is_exp 0
--- 3119,3122 ----
***************
*** 3174,3178 ****
def numbox click {canvas x y b f} {
- global _
canvas_grab $canvas $self
$canvas itemconfigure ${self}BASE4 -fill #00ff00
--- 3160,3163 ----
***************
*** 3184,3188 ****
def numbox motion {canvas x y mod} {
- global _
set grabbed [expr ![string compare $self [canvas_grabber $canvas]]]
if {!$grabbed} {return}
--- 3169,3172 ----
***************
*** 3195,3199 ****
def numbox ungrab {canvas} {
- global _
set _($self:buf) ""
numbox_draw $self $canvas
--- 3179,3182 ----
***************
*** 3201,3205 ****
def numbox unclick {canvas x y} {
- global _
set _($self:clicking) 0
if {$_($self:oval)!=$_($self:val)} {
--- 3184,3187 ----
***************
*** 3210,3214 ****
def numbox key {canvas key shift} {
! global _ look
set c -1
catch {set c [format %c $key]}
--- 3192,3196 ----
def numbox key {canvas key shift} {
! global look
set c -1
catch {set c [format %c $key]}
***************
*** 3244,3248 ****
def bluebox draw {canvas x1 y1 xs ys ins outs} {
! global _ look
set x2 [expr $x1+$xs]
set y2 [expr $y1+$ys]
--- 3226,3230 ----
def bluebox draw {canvas x1 y1 xs ys ins outs} {
! global look
set x2 [expr $x1+$xs]
set y2 [expr $y1+$ys]
***************
*** 3273,3277 ****
def radio orient {} {
- global _
switch $_($self:class) {
hradio {set orient 0} hdl {set orient 0}
--- 3255,3258 ----
***************
*** 3283,3287 ****
def radio draw {canvas} {
- global _
set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0]
set orient [radio_orient $self]
--- 3264,3267 ----
***************
*** 3327,3331 ****
def radio click {canvas x y b f} {
- global _
set x [expr $x-$_($self:x1)]
set y [expr $y-$_($self:y1)]
--- 3307,3310 ----
***************
*** 3342,3346 ****
def slider orient {} {
- global _
switch $_($self:class) {
vsl {set orient 1} default {set orient 0}
--- 3321,3324 ----
***************
*** 3351,3355 ****
def slider draw {canvas} {
set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0]
! global _ look
foreach {x1 y1} [object_xy $self $canvas] {}
set xs $_($self:w)
--- 3329,3333 ----
def slider draw {canvas} {
set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0]
! global look
foreach {x1 y1} [object_xy $self $canvas] {}
set xs $_($self:w)
***************
*** 3418,3422 ****
def slider click {canvas x y b f} {
- global _
canvas_grab $canvas $self
set _($self:first) [list $x $y]
--- 3396,3399 ----
***************
*** 3427,3431 ****
def slider unclick {canvas x y} {
- global _
set _($self:clicking) 0
if {[lindex $_($self:first) 1] != $y} {
--- 3404,3407 ----
***************
*** 3436,3440 ****
def slider motion {canvas x y mods} {
- global _
set grabbed [expr ![string compare $self [canvas_grabber $canvas]]]
if {!$grabbed} {return}
--- 3412,3415 ----
***************
*** 3450,3459 ****
def slider ungrab {canvas} {
- global _
slider_draw $self $canvas
}
def label draw {canvas} {
- global _
set isnew [expr [llength [$canvas gettags ${self}LABEL]] == 0]
foreach {x1 y1} [object_xy $self $canvas] {}
--- 3425,3432 ----
***************
*** 3480,3484 ****
def bang draw {canvas} {
- global _
set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0]
foreach {x1 y1} [object_xy $self $canvas] {}
--- 3453,3456 ----
***************
*** 3515,3519 ****
def bang bang {canvas} {
- global _
$canvas itemconfigure ${self}BUT -fill [bluify [parse_color $_($self:fcol)]]
after 300 [list $canvas itemconfigure ${self}BUT -fill [bluify [parse_color $_($self:bcol)]]]
--- 3487,3490 ----
***************
*** 3521,3525 ****
def toggle draw {canvas} {
- global _
foreach {x1 y1} [object_xy $self $canvas] {}
set xs $_($self:w)
--- 3492,3495 ----
***************
*** 3577,3581 ****
def vu led_size {} {
- global _
set n [expr $_($self:h)/40]
if {$n < 2} {set n 2}
--- 3547,3550 ----
***************
*** 3584,3588 ****
def vu draw {canvas} {
- global _
set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0]
foreach {x1 y1} [object_xy $self $canvas] {}
--- 3553,3556 ----
***************
*** 3642,3646 ****
def vu set {canvas i j} {
! global _ vu_col
foreach {x1 y1} [object_xy $self $canvas] {}
set xs $_($self:w)
--- 3610,3614 ----
def vu set {canvas i j} {
! global vu_col
foreach {x1 y1} [object_xy $self $canvas] {}
set xs $_($self:w)
***************
*** 3673,3677 ****
def dropper draw {canvas} {
- global _
set isnew [expr [llength [$canvas gettags ${self}BASE]] == 0]
foreach {x1 y1} [object_xy $self $canvas] {}
--- 3641,3644 ----
***************
*** 3700,3704 ****
def cnv draw {canvas} {
- global _
foreach {x1 y1} [object_xy $self $canvas] {}
set xs $_($self:w)
--- 3667,3670 ----
More information about the Pd-cvs
mailing list