Update of /cvsroot/pure-data/externals/miXed/test/toxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11000

Modified Files: button-test.pd listbox-test.pd popcustom-test.pd setup.wid testmess.wid tow-test.pd Log Message: toxy alpha17 and pddp alpha1 (see notes.txt for toxy, pddp and shared)

Index: button-test.pd =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/test/toxy/button-test.pd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** button-test.pd 9 Mar 2004 12:41:21 -0000 1.4 --- button-test.pd 10 May 2005 18:01:24 -0000 1.5 *************** *** 22,26 **** $c "-text" $c.>.); #X obj 294 268 loadbang; ! #X msg 294 295 ini .- config -textvariable ""; #X obj 250 21 widget button bb -bg green -activebackground yellow -command .<.> ; --- 22,26 ---- $c "-text" $c.>.); #X obj 294 268 loadbang; ! #X msg 294 295 set @vis .- config -textvariable ""; #X obj 250 21 widget button bb -bg green -activebackground yellow -command .<.> ;

Index: setup.wid =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/test/toxy/setup.wid,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** setup.wid 12 Mar 2005 00:19:12 -0000 1.7 --- setup.wid 10 May 2005 18:01:24 -0000 1.8 *************** *** 1,3 **** ! package provide toxywidgets 0.1.0.16

# LATER keep standard widget setup in a .tcl file (transfered into a .wiq), and --- 1,3 ---- ! package provide toxywidgets 0.1.0.17

# LATER keep standard widget setup in a .tcl file (transfered into a .wiq), and *************** *** 11,17 **** bind Canvas <1> {+focus %W}

! # In order to keep the state after our canvas has been destroyed ! # (i.e. our subpatch closed) -- use 'store' and 'restore' handlers, ! # if defined, otherwise try setting -variable and -textvariable traces.

proc ::toxy::item_dotrace {target varname ndxname op} { --- 11,26 ---- bind Canvas <1> {+focus %W}

! # FIXME args ! proc ::toxy::package_require {pkg dll} { ! if {[catch {package require $pkg} res] == 0} { ! puts stderr "using package $pkg $res" ! } elseif {[catch {load $dll $pkg}] != 0} { ! puts stderr "ERROR: missing package $pkg ($res)" ! } ! } ! ! # FIXME this should be explicitly requested ! # In order to keep the state after tk canvas has been destroyed ! # try setting -variable and -textvariable traces

proc ::toxy::item_dotrace {target varname ndxname op} { *************** *** 19,23 **** if {$v != [set $varname.last]} { # FIXME activate this on demand (for explicit traces) ! # pd $target.rp _value $v ; set $varname.last $v } --- 28,32 ---- if {$v != [set $varname.last]} { # FIXME activate this on demand (for explicit traces) ! # pd $target.rp _data $v ; set $varname.last $v } *************** *** 101,108 **** }

$cvpath create window $px $py \ -anchor nw -window $path -tags [concat toxy$name $target]

! # FIXME if {[info exists ::toxy::storethispath]} { # FIXME explicit traces --- 110,123 ---- }

+ if {[info exists ::toxy::longnewhook]} { + set failed [catch {eval $::toxy::longnewhook} res] + unset ::toxy::longnewhook + if {$failed} { error [concat in ::toxy::longnewhook: $res] } + } + $cvpath create window $px $py \ -anchor nw -window $path -tags [concat toxy$name $target]

! # FIXME use ${name}::explicittrace if {[info exists ::toxy::storethispath]} { # FIXME explicit traces *************** *** 130,142 **** if {$failed} { error [concat in ::toxy::master: $res] }

! if {[info exists ::toxy::typeinit]} { ! set failed [catch {eval $::toxy::typeinit} res] ! unset ::toxy::typeinit ! if {$failed} { error [concat in ::toxy::typeinit: $res] } } ! if {[info exists ::toxy::iteminit]} { ! set failed [catch {eval $::toxy::iteminit} res] ! unset ::toxy::iteminit ! if {$failed} { error [concat in ::toxy::iteminit: $res] } }

--- 145,157 ---- if {$failed} { error [concat in ::toxy::master: $res] }

! if {[info exists ::toxy::longvishook]} { ! set failed [catch {eval $::toxy::longvishook} res] ! unset ::toxy::longvishook ! if {$failed} { error [concat in ::toxy::longvishook: $res] } } ! if {[info exists ::toxy::shortvishook]} { ! set failed [catch {eval $::toxy::shortvishook} res] ! unset ::toxy::shortvishook ! if {$failed} { error [concat in ::toxy::shortvishook: $res] } }

*************** *** 221,225 **** }

! # to be called explicitly from type initializer, LATER rethink proc ::toxy::subwidget {path parent cvpath target} { bind $path <ButtonRelease> "::toxy::master_release $target $cvpath %X %Y %b" --- 236,240 ---- }

! # to be called explicitly from vis proc, LATER rethink proc ::toxy::subwidget {path parent cvpath target} { bind $path <ButtonRelease> "::toxy::master_release $target $cvpath %X %Y %b" *************** *** 306,309 **** --- 321,325 ---- #. @symbol .- delete 0 end .: .- insert 0 .#1

+ #@ vis bind .- <Return> {eval .<[.- get].>; focus .^.c}

*************** *** 316,318 **** --- 332,335 ---- #. #iprops "-bg" purple "-fg" white "-activebackground" magenta "-borderwidth" 3

+ #@ vis ::toxy::popup .- .| . [concat .#items] .#iprops

Index: listbox-test.pd =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/test/toxy/listbox-test.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** listbox-test.pd 9 Mar 2004 12:41:21 -0000 1.2 --- listbox-test.pd 10 May 2005 18:01:24 -0000 1.3 *************** *** 13,17 **** #X msg 20 57 tot proc ::toxy::lbcommand .(path target.) .(if .([$path curselection] != "".) .(pd [concat $target _cb set [$path get [$path ! curselection]] .`.:].).) , ini if .([.- size] == 0.) .(foreach fn [lsort [glob *]] .(.- insert end $fn.) .: bind .- <Double-Button-1> .(::toxy::lbcommand .- .|.).) , @bang ::toxy::lbcommand .- .|; --- 13,17 ---- #X msg 20 57 tot proc ::toxy::lbcommand .(path target.) .(if .([$path curselection] != "".) .(pd [concat $target _cb set [$path get [$path ! curselection]] .`.:].).) , @vis if .([.- size] == 0.) .(foreach fn [lsort [glob *]] .(.- insert end $fn.) .: bind .- <Double-Button-1> .(::toxy::lbcommand .- .|.).) , @bang ::toxy::lbcommand .- .|;

Index: popcustom-test.pd =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/test/toxy/popcustom-test.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** popcustom-test.pd 9 Mar 2004 12:41:21 -0000 1.1 --- popcustom-test.pd 10 May 2005 18:01:24 -0000 1.2 *************** *** 13,17 **** #X obj 96 110 widget pop1 p1; #X obj 188 110 widget pop2 p2; ! #X msg 23 41 ini ::toxy::popup .- .| rpop [list one two three four five] -bg green -activebackground yellow .: destroy .^.m .: .^.scrollvert configure -width 0 .: .^.scrollhort configure -width 0 .: .^.c configure --- 13,17 ---- #X obj 96 110 widget pop1 p1; #X obj 188 110 widget pop2 p2; ! #X msg 23 41 set @vis ::toxy::popup .- .| rpop [list one two three four five] -bg green -activebackground yellow .: destroy .^.m .: .^.scrollvert configure -width 0 .: .^.scrollhort configure -width 0 .: .^.c configure

Index: testmess.wid =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/test/toxy/testmess.wid,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** testmess.wid 10 Dec 2004 20:47:05 -0000 1.2 --- testmess.wid 10 May 2005 18:01:24 -0000 1.3 *************** *** 43,47 **** puts "\ndestructor: evaluated once, after Pd object destruction" puts "(Tk widget should be already gone)" - - #@ ini - puts "yet another initializer part added from "#@ ini" block" --- 43,44 ----

Index: tow-test.pd =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/test/toxy/tow-test.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tow-test.pd 24 Sep 2003 10:46:19 -0000 1.1 --- tow-test.pd 10 May 2005 18:01:24 -0000 1.2 *************** *** 43,47 **** #X msg 50 153 -bg brown; #X obj 136 21 loadbang; ! #X msg 136 56 ini .^.c configure -bg darkgreen; #X connect 0 0 5 0; #X connect 2 0 4 0; --- 43,47 ---- #X msg 50 153 -bg brown; #X obj 136 21 loadbang; ! #X msg 136 56 set @vis .^.c configure -bg darkgreen; #X connect 0 0 5 0; #X connect 2 0 4 0;