Pd-cvs September 2006

pd-cvs@lists.iem.at

19 participants
346 discussions

packages/patches macintel-0.39.2.patch,NONE,1.1
by Hans-Christoph Steiner 16 Sep '06

16 Sep '06

Update of /cvsroot/pure-data/packages/patches In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24010 Added Files: macintel-0.39.2.patch Log Message: simple fix to configure.in to build PortAudio little-endian on Mac/Intel --- NEW FILE: macintel-0.39.2.patch --- Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.16 diff -u -w -r1.16 configure.in --- configure.in 31 Dec 2005 20:55:25 -0000 1.16 +++ configure.in 24 May 2006 16:57:41 -0000 @@ -260,12 +260,22 @@ -framework AudioUnit -framework AudioToolbox \ -framework Carbon -framework CoreMIDI" EXT=pd_darwin - MORECFLAGS="-DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include \ +if test `uname -p` = i386; +then + MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include \ + -I../portaudio/pa_common -I../portaudio/pablio \ + -I../portmidi/pm_common -I../portmidi/pm_mac \ + -I../portmidi/porttime \ + -Wno-error \ + -DUSEAPI_PORTAUDIO -DPA_LITTLE_ENDIAN -DPA19 -DPA_USE_COREAUDIO" +else + MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include \ -I../portaudio/pa_common -I../portaudio/pablio \ -I../portmidi/pm_common -I../portmidi/pm_mac \ -I../portmidi/porttime \ -Wno-error \ -DUSEAPI_PORTAUDIO -DPA_BIG_ENDIAN -DPA19 -DPA_USE_COREAUDIO" +fi SYSSRC="s_midi_pm.c s_audio_pa.c \ s_audio_pablio.c \ s_audio_paring.c \

1 0

packages/patches pd_autoscrollbars-0.40-pre.patch, NONE, 1.1 pd_controls-anchor-fix-0.40-pre.patch, NONE, 1.1
by Hans-Christoph Steiner 16 Sep '06

16 Sep '06

Update of /cvsroot/pure-data/packages/patches In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21810 Added Files: pd_autoscrollbars-0.40-pre.patch pd_controls-anchor-fix-0.40-pre.patch Log Message: added two nice, small GUI patches from oskude --- NEW FILE: pd_controls-anchor-fix-0.40-pre.patch --- --- u_main.tk 2006-08-15 18:09:57.000000000 +0200 +++ u_main.tk 2006-09-04 09:41:46.000000000 +0200 @@ -140,15 +140,14 @@ frame .controls.switches checkbutton .controls.switches.audiobutton -text {compute audio} \ -variable ctrls_audio_on \ - -anchor w \ -command {pd [concat pd dsp $ctrls_audio_on \;]} checkbutton .controls.switches.meterbutton -text {peak meters} \ -variable ctrls_meter_on \ - -anchor w \ -command {pd [concat pd meters $ctrls_meter_on \;]} -pack .controls.switches.audiobutton .controls.switches.meterbutton -side top +pack .controls.switches.audiobutton .controls.switches.meterbutton \ + -side top -anchor w frame .controls.inout frame .controls.inout.in --- NEW FILE: pd_autoscrollbars-0.40-pre.patch --- --- u_main.tk 2006-08-15 18:09:57.000000000 +0200 +++ u_main.tk 2006-09-04 10:12:10.000000000 +0200 @@ -1137,6 +1137,7 @@ # bother with modifiers there. # We don't handle multiple clicks yet. + bind $name.c <Configure> { pdtk_canvas_autoscrollbars %W %w %h } bind $name.c <Button> {pdtk_canvas_click %W %x %y %b 0} bind $name.c <Shift-Button> {pdtk_canvas_click %W %x %y %b 1} bind $name.c <Control-Shift-Button> {pdtk_canvas_click %W %x %y %b 3} @@ -1430,6 +1431,19 @@ #get the name of the toplevel window for a canvas; this is also #the name of the canvas object in Pd. +proc pdtk_canvas_autoscrollbars {name x y} { + set size [$name bbox all] + set x2 [lindex $size 2] + set y2 [lindex $size 3] + set rootname [winfo parent $name] + if {$x > $x2} {pack forget $rootname.scrollhort} + if {$y > $y2} {pack forget $rootname.scrollvert} + if {$x < $x2} {pack $rootname.scrollhort -side bottom \ + -fill x -before $rootname.c} + if {$y < $y2} {pack $rootname.scrollvert -side right \ + -fill y -before $rootname.c} +} + proc canvastosym {name} { string range $name 0 [expr [string length $name] - 3] }

1 0

externals/zexy/abs cart2sph.pd,1.1,1.2
by IOhannes m zmölnig 16 Sep '06

16 Sep '06

Update of /cvsroot/pure-data/externals/zexy/abs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10456 Modified Files: cart2sph.pd Log Message: fixed order of outputs (should be right to left, was "left, right, middle") Index: cart2sph.pd =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/abs/cart2sph.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cart2sph.pd 22 Mar 2005 20:58:15 -0000 1.1 --- cart2sph.pd 16 Sep 2006 13:38:13 -0000 1.2 *************** *** 1,10 **** ! #N canvas 437 75 639 390 10; #X obj 259 82 inlet z; #X text 63 26 convert cartesian to spherical coordinates; #X obj 99 82 inlet x; #X obj 179 82 inlet y; ! #X obj 99 351 outlet r; ! #X obj 199 351 outlet phi; ! #X obj 279 351 outlet theta; #X obj 99 125 unpack 0 0 0; #X text 263 136 r=sqrt(x^2+y^2+z^2); --- 1,10 ---- ! #N canvas 437 75 639 543 10; #X obj 259 82 inlet z; #X text 63 26 convert cartesian to spherical coordinates; #X obj 99 82 inlet x; #X obj 179 82 inlet y; ! #X obj 99 481 outlet r; ! #X obj 206 481 outlet phi; ! #X obj 279 481 outlet theta; #X obj 99 125 unpack 0 0 0; #X text 263 136 r=sqrt(x^2+y^2+z^2); *************** *** 30,33 **** --- 30,35 ---- #X obj 99 105 pack \$1 \$2 \$3; #X text 464 24 part of zexy; + #X obj 167 426 unpack 0 0 0; + #X obj 167 406 pack 0 0 0; #X connect 0 0 28 2; #X connect 2 0 28 0; *************** *** 37,43 **** #X connect 7 2 23 0; #X connect 11 0 20 0; ! #X connect 12 0 5 0; ! #X connect 13 0 6 0; ! #X connect 14 0 4 0; #X connect 15 0 24 0; #X connect 16 0 14 0; --- 39,45 ---- #X connect 7 2 23 0; #X connect 11 0 20 0; ! #X connect 12 0 31 1; ! #X connect 13 0 31 2; ! #X connect 14 0 31 0; #X connect 15 0 24 0; #X connect 16 0 14 0; *************** *** 61,62 **** --- 63,68 ---- #X connect 27 0 13 0; #X connect 28 0 7 0; + #X connect 30 0 4 0; + #X connect 30 1 5 0; + #X connect 30 2 6 0; + #X connect 31 0 30 0;

1 0

pd/src desire.c, 1.1.2.180, 1.1.2.181 m_glob.c, 1.4.4.2.2.18, 1.4.4.2.2.19
by Mathieu Bouchard 16 Sep '06

16 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1366 Modified Files: Tag: devel_0_39 desire.c m_glob.c Log Message: moved DesireData code from m_glob.c to desire.c Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.180 retrieving revision 1.1.2.181 diff -C2 -d -r1.1.2.180 -r1.1.2.181 *** desire.c 15 Sep 2006 15:21:44 -0000 1.1.2.180 --- desire.c 16 Sep 2006 04:20:28 -0000 1.1.2.181 *************** *** 666,673 **** static void guiconnect_notarget(t_guiconnect *x, double timedelay); ! /* canvas_vis(,1) makes a canvas client-existing, client-updated, visible, mapped, raised. ! canvas_vis(,0) removes the canvas from the client. contrast with canvas_map. for GOPs this is *not* the same as in Miller's */ static void canvas_vis(t_canvas *x, t_floatarg f) { if (f && x->havewindow) sys_mgui(x,"raise",""); if (f && !x->havewindow) canvas_map(x,1); --- 666,674 ---- static void guiconnect_notarget(t_guiconnect *x, double timedelay); ! /* canvas_vis(,1) makes a canvas client-existing, client-updated, visible, mapped, raised. gops get open. ! canvas_vis(,0) removes the canvas from the client if it's non-gop. contrast with canvas_map. for GOPs this is *not* the same as in Miller's */ static void canvas_vis(t_canvas *x, t_floatarg f) { + /* this is WRONG */ if (f && x->havewindow) sys_mgui(x,"raise",""); if (f && !x->havewindow) canvas_map(x,1); *************** *** 7843,7846 **** --- 7844,7874 ---- } + EXTERN void glob_update_class_info (t_pd *bogus, t_symbol *s, t_symbol *cb_recv, t_symbol *cb_sel); + EXTERN void glob_update_path (void); + EXTERN void glob_redraw (void); + char *class_gethelpdir(t_class *c); + + void glob_help(t_pd *bogus, t_symbol *s) { + char namebuf[MAXPDSTRING], *dir; + t_class *c = class_find(s); + if (!c) {post("help: no such class '%s'",s->s_name); return;} + strcpy(namebuf, class_gethelpname(c)); + dir = class_gethelpdir(c); + if (strcmp(namebuf + strlen(namebuf) - 3, ".pd")) strcat(namebuf, ".pd"); + open_via_helppath(namebuf, dir); + } + + EXTERN t_hash *class_table; + void glob_update_class_list (t_pd *self, t_symbol *cb_recv, t_symbol *cb_sel) { + int n = pd_objectmaker->c_nmethod; + hashkey k; hashvalue v; + sys_gui("global class_list; set class_list {"); + hash_foreach(k,v,class_table) sys_vgui("%s ", ((t_symbol *)k)->s_name); + sys_gui("}\n"); + sys_vgui("%s %s\n",cb_recv->s_name, cb_sel->s_name); + } + + EXTERN t_class *glob_pdobject; + void desire_setup(void) { s_empty = gensym("empty"); *************** *** 7864,7867 **** --- 7892,7908 ---- } + void desire_glob_init(void) { + class_addmethod(glob_pdobject, (t_method)glob_update_class_list, + gensym("update-class-list"), A_SYMBOL, A_SYMBOL, 0); + class_addmethod(glob_pdobject, (t_method)glob_update_class_info, + gensym("update-class-info"), A_SYMBOL, A_SYMBOL, A_SYMBOL, 0); + class_addmethod(glob_pdobject, (t_method)glob_update_path, + gensym("update-path"), 0); + class_addmethod(glob_pdobject, (t_method)glob_help, + gensym("help"), A_SYMBOL, 0); + class_addmethod(glob_pdobject, (t_method)glob_redraw, + gensym("redraw"), 0); + } + /* ---------------------------------------------------------------- */ /* formerly s_print.c */ Index: m_glob.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_glob.c,v retrieving revision 1.4.4.2.2.18 retrieving revision 1.4.4.2.2.19 diff -C2 -d -r1.4.4.2.2.18 -r1.4.4.2.2.19 *** m_glob.c 20 Aug 2006 21:11:45 -0000 1.4.4.2.2.18 --- m_glob.c 16 Sep 2006 04:20:29 -0000 1.4.4.2.2.19 *************** *** 119,150 **** #ifdef DESIRE ! char *class_gethelpdir(t_class *c); ! #include <string.h> ! /* see also canvas_done_popup */ ! void glob_help(t_pd *bogus, t_symbol *s) { ! char namebuf[MAXPDSTRING], *dir; ! t_class *c = class_find(s); ! if (!c) { post("HUH? no help because no class. (!)"); return; } ! strcpy(namebuf, class_gethelpname(c)); ! dir = class_gethelpdir(c); ! if (strcmp(namebuf + strlen(namebuf) - 3, ".pd")) strcat(namebuf, ".pd"); ! open_via_helppath(namebuf, dir); ! } ! ! EXTERN t_hash *class_table; ! void glob_update_class_list (t_pd *self, t_symbol *cb_recv, t_symbol *cb_sel) { ! int n = pd_objectmaker->c_nmethod; ! hashkey k; hashvalue v; ! sys_gui("global class_list; set class_list {"); ! hash_foreach(k,v,class_table) sys_vgui("%s ", ((t_symbol *)k)->s_name); ! sys_gui("}\n"); ! sys_vgui("%s %s\n",cb_recv->s_name, cb_sel->s_name); ! } #endif - EXTERN void glob_update_class_info (t_pd *bogus, t_symbol *s, t_symbol *cb_recv, t_symbol *cb_sel); - EXTERN void glob_update_path (void); - EXTERN void glob_redraw (void); - void glob_init(void) { --- 119,125 ---- #ifdef DESIRE ! void desire_glob_init(void); #endif void glob_init(void) { *************** *** 236,253 **** class_addmethod(glob_pdobject, (t_method)glob_midi_getcurrentoutdevs, gensym("getmidicurrentoutdev"), 0); class_addmethod(glob_pdobject, (t_method)glob_midi_getcurrentindevs, gensym("getmidicurrentindev"), 0); - /* tb } */ ! #ifdef DESIRE ! class_addmethod(glob_pdobject, (t_method)glob_update_class_list, ! gensym("update-class-list"), A_SYMBOL, A_SYMBOL, 0); ! class_addmethod(glob_pdobject, (t_method)glob_update_class_info, ! gensym("update-class-info"), A_SYMBOL, A_SYMBOL, A_SYMBOL, 0); ! class_addmethod(glob_pdobject, (t_method)glob_update_path, ! gensym("update-path"), 0); ! class_addmethod(glob_pdobject, (t_method)glob_help, ! gensym("help"), A_SYMBOL, 0); ! class_addmethod(glob_pdobject, (t_method)glob_redraw, ! gensym("redraw"), 0); ! #endif #ifdef UNIX class_addmethod(glob_pdobject, (t_method)glob_watchdog, --- 211,216 ---- class_addmethod(glob_pdobject, (t_method)glob_midi_getcurrentoutdevs, gensym("getmidicurrentoutdev"), 0); class_addmethod(glob_pdobject, (t_method)glob_midi_getcurrentindevs, gensym("getmidicurrentindev"), 0); /* tb } */ ! #ifdef UNIX class_addmethod(glob_pdobject, (t_method)glob_watchdog, *************** *** 256,258 **** --- 219,225 ---- class_addanything(glob_pdobject, max_default); pd_bind(&glob_pdobject, gensym("pd")); + + #ifdef DESIRE + desire_glob_init(); + #endif }

1 0

pd/src desire.tk,1.1.2.472,1.1.2.473
by Mathieu Bouchard 16 Sep '06

16 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32619 Modified Files: Tag: devel_0_39 desire.tk Log Message: now using modified bgerror; also, split update_object Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.472 retrieving revision 1.1.2.473 diff -C2 -d -r1.1.2.472 -r1.1.2.473 *** desire.tk 16 Sep 2006 00:18:43 -0000 1.1.2.472 --- desire.tk 16 Sep 2006 01:22:06 -0000 1.1.2.473 *************** *** 37,40 **** --- 37,41 ---- package require objective + package require bgerror #if {[catch {source profdd.tcl}]} {error_dump} *************** *** 1963,1967 **** $x canvas= $self } ! set dead [lwithout $@wires $wires]; foreach x $dead { $x delete --- 1964,1968 ---- $x canvas= $self } ! set dead [lwithout $@wires $wires] foreach x $dead { $x delete *************** *** 3358,3409 **** #A 0 0; proc update_object {self e ninlets noutlets} { global _ classinfo canvas set isnew [expr ![info exists _($self:_class)]] ! foreach mess [split $e ";"] { ! switch -- [lindex $mess 0] { ! "#N" { ! set class canvas ! if {$isnew} {Canvas new_as $self $mess} else {$self reinit $mess} ! set isnew 0 ! } ! "#X" { ! set i 1 ! if {[lindex $mess 1] == "obj"} {set i 4} ! set class [lindex $mess $i] ! if {[info exists classinfo($class)]} { ! set _class [lindex $classinfo($class) 0] ! } { ! set class obj ! set _class ObjectBox ! # this is not the same @isnew as $isnew ! ! # in the future, @isnew should go elsewhere or disappear ! set _($self:isnew) [expr [llength $mess] == 4] ! } ! #if {$isnew} {$_class new_as $self} ! if {$isnew} {$_class new_as $self $mess} else {$self reinit $mess} ! switch -- $class { ! array {} ! default {$self position= [lrange $mess 2 3]} ! } ! $self pdclass= $class ! $self ninlets= $ninlets ;# bogus in case of array ! $self noutlets= $noutlets ! #!@#$ goes with the request tracking feature to be impl in the server ! if {[info exists canvas(msg_isnew)]} { ! set _($self:isnew) 1 ! $self edit ! unset canvas(msg_isnew) ! } } ! "#A" { ! post "#A: $mess" } ! "#V" { ! post "#V: $mess" } - default {if {$mess != ""} {error "what you say? ($mess)"}} } } - $self changed } --- 3359,3411 ---- #A 0 0; proc update_object {self e ninlets noutlets} { + foreach mess [split $e ";"] {update_object_2 $self $mess} + $self ninlets= $ninlets ;# bogus in case of array + $self noutlets= $noutlets + $self changed + } + + proc update_object_2 {self mess} { global _ classinfo canvas set isnew [expr ![info exists _($self:_class)]] ! switch -- [lindex $mess 0] { ! "#N" { ! set class canvas ! if {$isnew} {Canvas new_as $self $mess} else {$self reinit $mess} ! } ! "#X" { ! set i 1 ! if {[lindex $mess 1] == "obj"} {set i 4} ! set class [lindex $mess $i] ! if {[info exists classinfo($class)]} { ! set _class [lindex $classinfo($class) 0] ! } { ! set class obj ! set _class ObjectBox ! # this is not the same @isnew as $isnew ! ! # in the future, @isnew should go elsewhere or disappear ! set _($self:isnew) [expr [llength $mess] == 4] } ! #if {$isnew} {$_class new_as $self} ! if {$isnew} {$_class new_as $self $mess} else {$self reinit $mess} ! switch -- $class { ! array {} ! default {$self position= [lrange $mess 2 3]} } ! $self pdclass= $class ! #!@#$ goes with the request tracking feature to be impl in the server ! if {[info exists canvas(msg_isnew)]} { ! set _($self:isnew) 1 ! $self edit ! unset canvas(msg_isnew) } } + "#A" { + post "#A: $mess" + } + "#V" { + post "#V: $mess" + } + default {if {$mess != ""} {error "what you say? ($mess)"}} } } *************** *** 3457,3464 **** def AtomBox draw_box {} { global font - mset {x1 y1} [$self xy] $self update_size ! set x2 [expr $x1+$@xs] ! set y2 [expr $y1+$@ys] set points [list $x1 $y1 [expr $x2-4] $y1 $x2 [expr $y1+4] $x2 $y2 $x1 $y2] [$@canvas widget] canvasx $x1 --- 3459,3464 ---- def AtomBox draw_box {} { global font $self update_size ! mset {x1 y1 x2 y2} [$self bbox] set points [list $x1 $y1 [expr $x2-4] $y1 $x2 [expr $y1+4] $x2 $y2 $x1 $y2] [$@canvas widget] canvasx $x1 *************** *** 3972,3977 **** $self item BASE polygon $points -fill [parse_color $@bcol] -outline [$self look frame3] $self item BASE4 polygon $points2 -fill $color4 -outline [$self look frame3] - #$self item NUMBER text [list $xt $yt] -anchor w -text $@text \ - # -font $font(str) -fill [parse_color $@fcol] $self item NUMBER text [list $xt $yt] -anchor w -text $@text \ -font [$self look fontstring] -fill [parse_color $@fcol] --- 3972,3975 ---- *************** *** 3986,3991 **** } - - def NumBox ftoa {} { set f $@val --- 3984,3987 ---- *************** *** 4790,4793 **** --- 4786,4795 ---- ############ class browser + + class_new ServerClassDict {Observable Thing} + def ServerClassDict init {} { + + } + # Completion/Browser init can be cleaned up a bit more, do it later... class_new ClassBrowser {Dialog} *************** *** 6354,6355 **** --- 6356,6363 ---- error "Canvas deconstruct: that's a feature request" } + + #proc bgerror {err} { + # global errorInfo + # set info [error_dump] + # tk_messageBox -message "$err: $info" -type ok + #}

1 0

pd/src pkgIndex.tcl,1.1.2.1,1.1.2.2
by Mathieu Bouchard 16 Sep '06

16 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32177 Modified Files: Tag: devel_0_39 pkgIndex.tcl Log Message: registering modified bgerror package Index: pkgIndex.tcl =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/pkgIndex.tcl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pkgIndex.tcl 13 Jun 2006 06:24:47 -0000 1.1.2.1 --- pkgIndex.tcl 16 Sep 2006 01:20:26 -0000 1.1.2.2 *************** *** 10,12 **** package ifneeded objective 0.0 [list source [file join $dir objective.tcl]] ! package ifneeded pre8.5 8.4 [list source [file join $dir pre8.5.tcl]] --- 10,13 ---- package ifneeded objective 0.0 [list source [file join $dir objective.tcl]] ! package ifneeded pre8.5 8.4 [list source [file join $dir pre8.5.tcl]] ! package ifneeded bgerror 8.4 [list source [file join $dir bgerror.tcl]]

1 0

pd/src bgerror.tcl,NONE,1.1.2.1
by Mathieu Bouchard 16 Sep '06

16 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31701 Added Files: Tag: devel_0_39 bgerror.tcl Log Message: this is a modified version of Tk's bgerror which works better with objective.tcl. --- NEW FILE: bgerror.tcl --- # bgerror.tcl -- # # Implementation of the bgerror procedure. It posts a dialog box with # the error message and gives the user a chance to see a more detailed # stack trace, and possible do something more interesting with that # trace (like save it to a log). This is adapted from work done by # Donal K. Fellows. # # Copyright (c) 1998-2000 by Ajuba Solutions. # All rights reserved. # # RCS: @(#) $Id: bgerror.tcl,v 1.1.2.1 2006/09/16 01:20:00 matju Exp $ # $Id: bgerror.tcl,v 1.1.2.1 2006/09/16 01:20:00 matju Exp $ package provide bgerror 8.4 namespace eval ::tk::dialog::error { namespace import -force ::tk::msgcat::* namespace export bgerror option add *ErrorDialog.function.text [mc "Save To Log"] \ widgetDefault option add *ErrorDialog.function.command [namespace code SaveToLog] } proc ::tk::dialog::error::Return {} { variable button .bgerrorDialog.ok configure -state active -relief sunken update idletasks after 100 set button 0 } proc ::tk::dialog::error::Details {} { set w .bgerrorDialog set caption [option get $w.function text {}] set command [option get $w.function command {}] if { ($caption eq "") || ($command eq "") } { grid forget $w.function } lappend command [.bgerrorDialog.top.info.text get 1.0 end-1c] $w.function configure -text $caption -command $command grid $w.top.info - -sticky nsew -padx 3m -pady 3m } proc ::tk::dialog::error::SaveToLog {text} { if { $::tcl_platform(platform) eq "windows" } { set allFiles *.* } else { set allFiles * } set types [list \ [list [mc "Log Files"] .log] \ [list [mc "Text Files"] .txt] \ [list [mc "All Files"] $allFiles] \ ] set filename [tk_getSaveFile -title [mc "Select Log File"] \ -filetypes $types -defaultextension .log -parent .bgerrorDialog] if {![string length $filename]} { return } set f [open $filename w] puts -nonewline $f $text close $f } proc ::tk::dialog::error::Destroy {w} { if {$w eq ".bgerrorDialog"} { variable button set button -1 } } # ::tk::dialog::error::bgerror -- # This is the default version of bgerror. # It tries to execute tkerror, if that fails it posts a dialog box containing # the error message and gives the user a chance to ask to see a stack # trace. # Arguments: # err - The error message. proc ::tk::dialog::error::bgerror err { global errorInfo tcl_platform variable button # matju: use objective.tcl's # set info $errorInfo set info [::error_text] set ret [catch {::tkerror $err} msg]; if {$ret != 1} {return -code $ret $msg} # Ok the application's tkerror either failed or was not found # we use the default dialog then : if {($tcl_platform(platform) eq "macintosh") || ([tk windowingsystem] eq "aqua")} { set ok [mc Ok] set messageFont system set textRelief flat set textHilight 0 } else { set ok [mc OK] set messageFont {Times -18} set textRelief sunken set textHilight 1 } # Truncate the message if it is too wide (longer than 30 characacters) or # too tall (more than 4 newlines). Truncation occurs at the first point at # which one of those conditions is met. set displayedErr "" set lines 0 foreach line [split $err \n] { if { [string length $line] > 30 } { append displayedErr "[string range $line 0 29]..." break } if { $lines > 4 } { append displayedErr "..." break } else { append displayedErr "${line}\n" } incr lines } set w .bgerrorDialog set title [mc "Application Error"] set text [mc {Error: %1$s} $err] set buttons [list ok $ok dismiss [mc "Skip Messages"] \ function [mc "Details >>"]] # 1. Create the top-level window and divide it into top # and bottom parts. catch {destroy .bgerrorDialog} toplevel .bgerrorDialog -class ErrorDialog wm withdraw .bgerrorDialog wm title .bgerrorDialog $title wm iconname .bgerrorDialog ErrorDialog wm protocol .bgerrorDialog WM_DELETE_WINDOW { } if {($tcl_platform(platform) eq "macintosh") || ([tk windowingsystem] eq "aqua")} { ::tk::unsupported::MacWindowStyle style .bgerrorDialog zoomDocProc } frame .bgerrorDialog.bot frame .bgerrorDialog.top if {[tk windowingsystem] eq "x11"} { .bgerrorDialog.bot configure -relief raised -bd 1 .bgerrorDialog.top configure -relief raised -bd 1 } pack .bgerrorDialog.bot -side bottom -fill both pack .bgerrorDialog.top -side top -fill both -expand 1 set W [frame $w.top.info] text $W.text \ -bd 2 \ -yscrollcommand [list $W.scroll set]\ -setgrid true \ -width 40 \ -height 10 \ -state normal \ -relief $textRelief \ -highlightthickness $textHilight \ -wrap char scrollbar $W.scroll -relief sunken -command [list $W.text yview] pack $W.scroll -side right -fill y pack $W.text -side left -expand yes -fill both # $W.text insert 0.0 "$err\n$info" $W.text insert 0.0 $info $W.text mark set insert 0.0 bind $W.text <ButtonPress-1> { focus %W } $W.text configure -state disabled # 2. Fill the top part with bitmap and message # Max-width of message is the width of the screen... set wrapwidth [winfo screenwidth .bgerrorDialog] # ...minus the width of the icon, padding and a fudge factor for # the window manager decorations and aesthetics. set wrapwidth [expr {$wrapwidth-60-[winfo pixels .bgerrorDialog 9m]}] label .bgerrorDialog.msg -justify left -text $text -font $messageFont \ -wraplength $wrapwidth if {($tcl_platform(platform) eq "macintosh") || ([tk windowingsystem] eq "aqua")} { # On the Macintosh, use the stop bitmap label .bgerrorDialog.bitmap -bitmap stop } else { # On other platforms, make the error icon canvas .bgerrorDialog.bitmap -width 32 -height 32 -highlightthickness 0 .bgerrorDialog.bitmap create oval 0 0 31 31 -fill red -outline black .bgerrorDialog.bitmap create line 9 9 23 23 -fill white -width 4 .bgerrorDialog.bitmap create line 9 23 23 9 -fill white -width 4 } grid .bgerrorDialog.bitmap .bgerrorDialog.msg \ -in .bgerrorDialog.top \ -row 0 \ -padx 3m \ -pady 3m grid configure .bgerrorDialog.msg -sticky nsw -padx {0 3m} grid rowconfigure .bgerrorDialog.top 1 -weight 1 grid columnconfigure .bgerrorDialog.top 1 -weight 1 # 3. Create a row of buttons at the bottom of the dialog. set i 0 foreach {name caption} $buttons { button .bgerrorDialog.$name \ -text $caption \ -default normal \ -command [namespace code [list set button $i]] grid .bgerrorDialog.$name \ -in .bgerrorDialog.bot \ -column $i \ -row 0 \ -sticky ew \ -padx 10 grid columnconfigure .bgerrorDialog.bot $i -weight 1 # We boost the size of some Mac buttons for l&f if {($tcl_platform(platform) eq "macintosh") || ([tk windowingsystem] eq "aqua")} { if {($name eq "ok") || ($name eq "dismiss")} { grid columnconfigure .bgerrorDialog.bot $i -minsize 79 } } incr i } # The "OK" button is the default for this dialog. .bgerrorDialog.ok configure -default active bind .bgerrorDialog <Return> [namespace code Return] bind .bgerrorDialog <Destroy> [namespace code [list Destroy %W]] .bgerrorDialog.function configure -command [namespace code Details] # 6. Update all the geometry information so we know how big it wants # to be, then center the window in the display and deiconify it. ::tk::PlaceWindow .bgerrorDialog # 7. Ensure that we are topmost. raise .bgerrorDialog if {$tcl_platform(platform) eq "windows"} { # Place it topmost if we aren't at the top of the stacking # order to ensure that it's seen if {[lindex [wm stackorder .] end] ne ".bgerrorDialog"} { wm attributes .bgerrorDialog -topmost 1 } } # 8. Set a grab and claim the focus too. ::tk::SetFocusGrab .bgerrorDialog .bgerrorDialog.ok # 9. Wait for the user to respond, then restore the focus and # return the index of the selected button. Restore the focus # before deleting the window, since otherwise the window manager # may take the focus away so we can't redirect it. Finally, # restore any grab that was in effect. vwait [namespace which -variable button] set copy $button; # Save a copy... ::tk::RestoreFocusGrab .bgerrorDialog .bgerrorDialog.ok destroy if {$copy == 1} { return -code break } } namespace eval :: { # Fool the indexer proc bgerror err {} rename bgerror {} namespace import ::tk::dialog::error::bgerror }

1 0

pd/src desire.tk,1.1.2.471,1.1.2.472
by Mathieu Bouchard 16 Sep '06

16 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7566 Modified Files: Tag: devel_0_39 desire.tk Log Message: removing old ddrc code Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.471 retrieving revision 1.1.2.472 diff -C2 -d -r1.1.2.471 -r1.1.2.472 *** desire.tk 16 Sep 2006 00:00:01 -0000 1.1.2.471 --- desire.tk 16 Sep 2006 00:18:43 -0000 1.1.2.472 *************** *** 955,977 **** } - proc read_ddrc_old {} { - global cmdline look key - set fd [open $cmdline(ddrcfilename) "RDONLY CREAT"] - set contents [read $fd] - close $fd - - foreach category_pair $contents { - set category [lindex $category_pair 0] - foreach class_pair [lindex $category_pair 1] { - set class [lindex $class_pair 0] - foreach var_pair [lindex $class_pair 1] { - set var [lindex $var_pair 0] - set val [lindex $var_pair 1] - set ${category}($class:$var) $val - } - } - } - set_fontstring - } if {[file exists "defaults.ddrc"]} { read_ddrc "defaults.ddrc" --- 955,958 ---- *************** *** 5962,6015 **** } - #this writes the ddrc - def ClientPrefsDialog write_old {} { - global ddrc_options cmdline look accels key - $self get_val - set fd [open $cmdline(ddrcfilename) w] - #set fd [open ~/.ddrc2 w] - set LOOK [list color crosshair bar font] - set categories [list $LOOK key]; set categories2 [list look key]; set cat_count 0 - set classes [list Thing Canvas View Comment Wire FutureWire SelRect Client] - set conf {} - foreach category $categories { - set class_list {} - set tmp {} - foreach sub $category { - set x [lsearch -start 0 $ddrc_options $sub] - while {$x>=0} { - lappend tmp [lindex $ddrc_options [expr $x+1]] - lappend tmp [lindex $ddrc_options [expr $x+2]] - set x [lsearch -start [expr $x+1] $ddrc_options $sub] - } - } - foreach class $classes { - set tmp2 {} - set x [lsearch -start 0 $tmp $class] - while {$x>=0} { - foreach y [lindex $tmp [expr $x+1]] { - if {$sub != "key"} {set str "look($class:$y)" - } else {set str "key($class:$y)"} - if {[info exists $str]} { - lappend tmp2 [list $y [set [set str]]] - } else {puts "not exists::: $str"} - } - set x [lsearch -start [expr $x+1] $tmp $class] - } - if {[llength $tmp2]} { - set class_pair [list $class $tmp2] - lappend class_list $class_pair - } - } - set cat_pair [list [lindex $categories2 $cat_count] $class_list] - lappend conf $cat_pair - incr cat_count - } - #set conf [list $conf] - puts $conf - puts $fd $conf - close $fd - set_fontstring - } - #this retrives the values set in the editor def ClientPrefsDialog get_val {} { --- 5943,5946 ----

1 0

pd/src desire.tk,1.1.2.470,1.1.2.471
by Mathieu Bouchard 16 Sep '06

16 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32615 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed a bug introduced by previous commit and fixed the help button Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.470 retrieving revision 1.1.2.471 diff -C2 -d -r1.1.2.470 -r1.1.2.471 *** desire.tk 15 Sep 2006 21:34:50 -0000 1.1.2.470 --- desire.tk 16 Sep 2006 00:00:01 -0000 1.1.2.471 *************** *** 4876,4883 **** def ClassBrowser info {listbox} { ! set i [$listbox curselection] ! if {$i == ""} {return} ! set class [string range [lindex [$listbox get $i] 0] 1 end-1] ! pd pd update-class-info $class $self info_callback } --- 4876,4881 ---- def ClassBrowser info {listbox} { ! set class [$self current_class] ! if {$class != ""} {pd pd update-class-info $class $self info_callback} } *************** *** 4898,4902 **** frame $f.5 ! button $f.5.help -text [say help] -command "pd pd help \[$f.1 get \[$f.1 curselection\]\]" pack $f.5.help -side top pack $f.5 -side left -fill y -expand no --- 4896,4900 ---- frame $f.5 ! button $f.5.help -text [say help] -command [list $self help] pack $f.5.help -side top pack $f.5 -side left -fill y -expand no *************** *** 4915,4926 **** $self fill_box "" #bind $f.1 <Button-1> "after 1 \"$self info $f.1 \"" - bind $f.1 <Button-1> "after 1 \"$self key Up $b.2\"" foreach w [list $f.1 $b.2] { bind $w <KeyPress> "after 1 \"$self key %K 0\"" bind $w <Shift-KeyPress> "after 1 \"$self key %K 1\"" } focus $@textbox } def Completion list_callback {} { global class_list look --- 4913,4929 ---- $self fill_box "" #bind $f.1 <Button-1> "after 1 \"$self info $f.1 \"" foreach w [list $f.1 $b.2] { bind $w <KeyPress> "after 1 \"$self key %K 0\"" bind $w <Shift-KeyPress> "after 1 \"$self key %K 1\"" + bind $w <Return> [list $self help] } focus $@textbox } + def Browser help {} { + set f .$self.cl + pd pd help [$self current_class] + } + def Completion list_callback {} { global class_list look *************** *** 4986,4989 **** --- 4989,4998 ---- } + def ClassBrowser current_class {} { + set i [$@listbox curselection] + if {$i == ""} {return {}} + return [string range [lindex [$@listbox get $i] 0] 1 end-1] + } + def ClassBrowser complete {} { if {[regexp {x([0-9a-z]{6,8})text$} $@textbox obj]} { *************** *** 4991,4996 **** set obj [string range $obj 0 [expr $cut -1]] } ! set i [$@listbox curselection] ! set class [string range [lindex [$@listbox get $i] 0] 1 end-1] puts "completion:::: $class" $@textbox delete 1.0 1.end --- 5000,5004 ---- set obj [string range $obj 0 [expr $cut -1]] } ! set class [$self current_class] puts "completion:::: $class" $@textbox delete 1.0 1.end *************** *** 5071,5076 **** global class_info set f .browser.cl ! set i [$f.1 curselection] ! set class [string range [lindex [$f.1 get $i] 0] 1 end-1] $f.3 delete 0.0 end $f.3 insert end "class $class\n" --- 5079,5083 ---- global class_info set f .browser.cl ! set class [$self current_class] $f.3 delete 0.0 end $f.3 insert end "class $class\n"

1 0

pd/src desire.tk,1.1.2.469,1.1.2.470
by Mathieu Bouchard 15 Sep '06

15 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6610 Modified Files: Tag: devel_0_39 desire.tk Log Message: classbrowser fix Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.469 retrieving revision 1.1.2.470 diff -C2 -d -r1.1.2.469 -r1.1.2.470 *** desire.tk 14 Sep 2006 07:24:38 -0000 1.1.2.469 --- desire.tk 15 Sep 2006 21:34:50 -0000 1.1.2.470 *************** *** 1246,1249 **** --- 1246,1250 ---- def Canvas editmodeswitch {args} {$self editmode= [expr !$@editmode]} def Canvas window {} { + puts "GOP = $@gop" if {$@gop} {return [$@canvas window]} return .$self *************** *** 4828,4832 **** set @width 0 set @height 0 - set @select 0 # so that in completion mode, it know which textbox to switch the focus to set @textbox $textbox --- 4829,4832 ---- *************** *** 4877,4880 **** --- 4877,4881 ---- def ClassBrowser info {listbox} { set i [$listbox curselection] + if {$i == ""} {return} set class [string range [lindex [$listbox get $i] 0] 1 end-1] pd pd update-class-info $class $self info_callback *************** *** 4919,4922 **** --- 4920,4924 ---- bind $w <Shift-KeyPress> "after 1 \"$self key %K 1\"" } + focus $@textbox } *************** *** 5005,5011 **** switch -regexp -- $key { Up|Down { ! focus $@listbox ! set @select 0 ! if {$self == "browser"} {$self info $@listbox} } Escape {after 1 "$self cancel"} ;# doesn't really work --- 5007,5016 ---- switch -regexp -- $key { Up|Down { ! if {[focus] != $@listbox} { ! focus $@listbox ! event generate $@listbox <KeyPress> -keysym $key ! } else { ! if {$self == "browser"} {$self info $@listbox} ! } } Escape {after 1 "$self cancel"} ;# doesn't really work *************** *** 5034,5038 **** if {[regexp {^[a-zA-Z0-9~/\._]{1}$} $key]} { switch $self { ! browser {.$self.butt.2 insert end $key} completion { $@textbox insert 1.end $key --- 5039,5046 ---- if {[regexp {^[a-zA-Z0-9~/\._]{1}$} $key]} { switch $self { ! browser { ! .$self.butt.2 insert end $key ! $self fill_box [$@textbox get] ! } completion { $@textbox insert 1.end $key

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs September 2006