Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23986
Modified Files: Tag: desiredata desire.tk Log Message: small fix to the Mackerel
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.302 retrieving revision 1.1.2.600.2.303 diff -C2 -d -r1.1.2.600.2.302 -r1.1.2.600.2.303 *** desire.tk 7 Aug 2007 07:12:15 -0000 1.1.2.600.2.302 --- desire.tk 7 Aug 2007 07:15:01 -0000 1.1.2.600.2.303 *************** *** 2281,2287 **** set @rect [Macro_Rect new] } ! def Macro state= {val} {set @state $val; if {$val} {set @list {}; puts "start recording macro..."} {puts "end..."}} def Macro state {} {return $@state} ! def Macro dump {} {set i 0; foreach step $@list {puts "step $i -> $step"; incr i}} def Macro idx= {val} {set @idx $val} def Macro idx {} {return $@idx} --- 2281,2287 ---- set @rect [Macro_Rect new] } ! def Macro state= {val} {set @state $val; if {$val} {set @list {}; post %s "start recording macro..."} {post %s "end..."}} def Macro state {} {return $@state} ! def Macro dump {} {set i 0; foreach step $@list {post %s "step $i -> $step"; incr i}} def Macro idx= {val} {set @idx $val} def Macro idx {} {return $@idx} *************** *** 2339,2342 **** --- 2339,2343 ---- mset {event widget X Y x y mode k kval} $step switch $event { + #KeyRelease {set name [modekey $k $mode]} KeyPress {set name [modekey $k $mode]} ButtonPress {set name $event-$k} *************** *** 2346,2350 **** } if {$@idx < [llength $@list]} { ! after $delay [list $self run $event $name [expr $X+$@offset_x] [expr $Y+$@offset_y] \ [expr $x+$@offset_x] [expr $y+$@offset_y]] } --- 2347,2351 ---- } if {$@idx < [llength $@list]} { ! after $delay [list $self run $event $name $k [expr $X+$@offset_x] [expr $Y+$@offset_y] \ [expr $x+$@offset_x] [expr $y+$@offset_y]] } *************** *** 2372,2379 **** }
! def Macro run {event name X Y x y} { set w [focus] incr @idx event generate $w <$name> -x $x -y $y puts "playing <$name> -x $x -y $y" $self play $@delay --- 2373,2381 ---- }
! def Macro run {event name k X Y x y} { set w [focus] incr @idx event generate $w <$name> -x $x -y $y + if {$event=="KeyPress"} {event generate $w <KeyRelease-$k> -x $x -y $y} puts "playing <$name> -x $x -y $y" $self play $@delay *************** *** 8304,8308 ****
def KeyboardDialog notice {origin add event} { ! mset {type W X Y mod K k} $event if {![info exists ::keyboard_row_of($k)]} {puts "unknown key $k"; return} set i $::keyboard_row_of($k) --- 8306,8310 ----
def KeyboardDialog notice {origin add event} { ! mset {type W X Y x y mod K k} $event if {![info exists ::keyboard_row_of($k)]} {puts "unknown key $k"; return} set i $::keyboard_row_of($k)