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

Modified Files: Tag: devel_0_39 desire.tk Log Message: clickedit,unclickedit,motionedit are dead (merged)

Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.352 retrieving revision 1.1.2.353 diff -C2 -d -r1.1.2.352 -r1.1.2.353 *** desire.tk 16 Aug 2006 18:08:11 -0000 1.1.2.352 --- desire.tk 16 Aug 2006 18:24:34 -0000 1.1.2.353 *************** *** 1001,1010 **** def View noutlets= {v} {set @noutlets $v} def View noutlets {} {return $@noutlets} ! def* View click {x y f target} {} ;# being clicked in run mode ! def* View clickedit {x y f target} {} ;# being clicked in edit mode ! def* View unclick {x y f target} {} ;# being unclicked in run mode ! def* View unclickedit {x y f target} {} ;# being unclicked in edit mode ! def View motionedit {x y f target} {} ;# mouse motion in edit mode ! def View motion {x y f target} {} ;# mouse motion in run mode

def View init {} { --- 1001,1007 ---- def View noutlets= {v} {set @noutlets $v} def View noutlets {} {return $@noutlets} ! def* View click {x y f target} {} ! def* View unclick {x y f target} {} ! def View motion {x y f target} {}

def View init {} { *************** *** 2285,2291 ****

#!@#$ this method is too long ! # this method receives (x,y) in descaled coords ! def* Canvas clickedit {x y f target} { ! set c .[$self canvas].c mset {type id detail} $target if {$f&8} {$self popup $id [winfo pointerx $c] [winfo pointery $c]; return} --- 2282,2296 ----

#!@#$ this method is too long ! def* Canvas click {x y f target} { ! if {[winfo exists .completion]} { ! raise .completion ! focus .completion.comp ! return ! } ! set c .$self.c ! focus $c ! set @click_at [list $x $y] ! if {!$@editmode} {if {[llength $id]} {$id click $x $y $f $target}; return} ! mset {type id detail} $target if {$f&8} {$self popup $id [winfo pointerx $c] [winfo pointery $c]; return} *************** *** 2345,2382 **** }

! def* Canvas click {x y f target} { ! if {[winfo exists .completion]} { ! raise .completion ! focus .completion.comp ! return ! } ! set c .$self.c ! focus $c ! set @click_at [list $x $y] ! #if {$@editmode && !($f&2)} {$self clickedit $x $y $f $target; return} ! if {$@editmode} {$self clickedit $x $y $f $target; return} ! mset {type id detail} $target ! if {[llength $id]} {$id click $x $y $f $target} ! } ! ! def* Canvas unclickedit {x y f target} { set c .$self.c mset {type id detail} $target - switch $@action { - edit {set @obj_in_edit $id; $id edit} - move { - foreach obj $@selection {pd .$self object_moveto !$obj [$obj xy]} - set objs $@selection - $@history add [list $self undomove $objs] - set @action none - } - none {} - default {$@action unclick $x $y $f $target} - } - } - - def* Canvas unclick {x y f target} { if {$@editmode} { ! $self unclickedit $x $y $f $target } else { if {[$self focus] != ""} {[$self focus] unclick $x $y $f $target} --- 2350,2368 ---- }

! def* Canvas unclick {x y f target} { set c .$self.c mset {type id detail} $target if {$@editmode} { ! switch $@action { ! edit {set @obj_in_edit $id; $id edit} ! move { ! foreach obj $@selection {pd .$self object_moveto !$obj [$obj xy]} ! set objs $@selection ! $@history add [list $self undomove $objs] ! set @action none ! } ! none {} ! default {$@action unclick $x $y $f $target} ! } } else { if {[$self focus] != ""} {[$self focus] unclick $x $y $f $target} *************** *** 3207,3214 **** }

- def BlueBox motionedit {x y f target} { - #puts "motions in $self in edit mode" - } - def BlueBox popup_properties {} {IEMPropertiesDialog new $self}

--- 3193,3196 ----