[PD-cvs] pd/src desire.tk, 1.1.2.600.2.238, 1.1.2.600.2.239 defaults.ddrc, 1.1.2.10.2.12, 1.1.2.10.2.13
chunlee
chunlee at users.sourceforge.net
Sun Jul 15 14:40:17 CEST 2007
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15290
Modified Files:
Tag: desiredata
desire.tk defaults.ddrc
Log Message:
cursor sensitivity is now set per client, and can be set in .ddrc
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.238
retrieving revision 1.1.2.600.2.239
diff -C2 -d -r1.1.2.600.2.238 -r1.1.2.600.2.239
*** desire.tk 15 Jul 2007 00:42:00 -0000 1.1.2.600.2.238
--- desire.tk 15 Jul 2007 12:40:10 -0000 1.1.2.600.2.239
***************
*** 1599,1603 ****
set @find_string ""
set @iohilite {-1 0 0 0 0}
- set @pointer_sense 2 ;# i want this to be OFF by default so that I can use selrect and stuff. we need to talk about this.
set @keyprefix 0
# default #X coords line
--- 1599,1602 ----
***************
*** 2946,2951 ****
set cx [expr $x*$@zoom]
set cy [expr $y*$@zoom]
! set stack [$c find overlapping [expr $cx-$@pointer_sense] [expr $cy-$@pointer_sense] \
! [expr $cx+$@pointer_sense] [expr $cy+$@pointer_sense]]
set stack [lreverse $stack]
set ios {}
--- 2945,2950 ----
set cx [expr $x*$@zoom]
set cy [expr $y*$@zoom]
! set sense [$self pointer_sense]
! set stack [$c find overlapping [expr $cx-$sense] [expr $cy-$sense] [expr $cx+$sense] [expr $cy+$sense]]
set stack [lreverse $stack]
set ios {}
***************
*** 2974,2984 ****
return [lindex $ios $idx]
}
! def Canvas pointer_sense {} {return $@pointer_sense}
def Canvas pointer_sense= {sense} {
! set @pointer_sense $sense
mset {x y} $@curpos
! $@sense data= $x $y $@pointer_sense
! $@sense draw
! after 500 $@sense erase
}
--- 2973,2981 ----
return [lindex $ios $idx]
}
! def Canvas pointer_sense {} {return $::look(Client:pointer_sense)}
def Canvas pointer_sense= {sense} {
! set ::look(Client:pointer_sense) $sense
mset {x y} $@curpos
! $@sense flash $x $y $sense "red"
}
***************
*** 6284,6294 ****
super
set @canvas $canvas
! $self data= 0 0 0
}
! def Sense data= {x y range} {
set @x $x
set @y $y
set @range $range
}
--- 6281,6298 ----
super
set @canvas $canvas
! $self data= 0 0 0 red
}
! def Sense data= {x y range col} {
set @x $x
set @y $y
set @range $range
+ set @col $col
+ }
+
+ def Sense flash {x y sense col} {
+ $self data= $x $y $sense $col
+ $self draw
+ after 500 $self erase
}
***************
*** 6297,6304 ****
set x1 [expr $@x-$@range]; set y1 [expr $@y-$@range]
set x2 [expr $@x+$@range]; set y2 [expr $@y+$@range]
! $self item SENSE oval [list $x1 $y1 $x2 $y2] -fill red -outline yellow
}
-
############ tooltips (only those that are drawn as canvas items)
--- 6301,6307 ----
set x1 [expr $@x-$@range]; set y1 [expr $@y-$@range]
set x2 [expr $@x+$@range]; set y2 [expr $@y+$@range]
! $self item SENSE oval [list $x1 $y1 $x2 $y2] -fill $@col -outline yellow
}
############ tooltips (only those that are drawn as canvas items)
***************
*** 7574,7577 ****
--- 7577,7581 ----
integer Client console
choice View language
+ integer Client pointer_sense
}
***************
*** 7652,7656 ****
def ClientPrefsDialog init {} {
global ddrc_options look key
! $self read
super cancel apply ok
#super cancel reset revert apply ok
--- 7656,7661 ----
def ClientPrefsDialog init {} {
global ddrc_options look key
! #do we need to read .ddrc each time the pref editor is opened?
! #$self read
super cancel apply ok
#super cancel reset revert apply ok
***************
*** 7704,7708 ****
}
default {
! if {$name == "console"} {set @$name $look(Client:console)}
$self add $which_section [list $name $type]
}
--- 7709,7717 ----
}
default {
! switch $name {
! console {set @$name $look(Client:console)}
! pointer_sense {set @$name $look(Client:pointer_sense)}
! default {}
! }
$self add $which_section [list $name $type]
}
Index: defaults.ddrc
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/defaults.ddrc,v
retrieving revision 1.1.2.10.2.12
retrieving revision 1.1.2.10.2.13
diff -C2 -d -r1.1.2.10.2.12 -r1.1.2.10.2.13
*** defaults.ddrc 18 Jan 2007 14:39:31 -0000 1.1.2.10.2.12
--- defaults.ddrc 15 Jul 2007 12:40:14 -0000 1.1.2.10.2.13
***************
*** 8,11 ****
--- 8,12 ----
Client {
console 666
+ pointer_sense 5
}
Box {
***************
*** 146,149 ****
--- 147,151 ----
auto_test Ctrl+grave
runcommand Alt+x
+ keyprefix Ctrl+x
}
Client {
More information about the Pd-cvs
mailing list