Pd-cvs August 2006

pd-cvs@lists.iem.at

15 participants
462 discussions

pd/src objective.tcl,1.1.2.18,1.1.2.19
by Mathieu Bouchard 01 Sep '06

01 Sep '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5732 Modified Files: Tag: devel_0_39 objective.tcl Log Message: tracedef now makes its stuff print in green Index: objective.tcl =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/objective.tcl,v retrieving revision 1.1.2.18 retrieving revision 1.1.2.19 diff -C2 -d -r1.1.2.18 -r1.1.2.19 *** objective.tcl 29 Aug 2006 00:07:17 -0000 1.1.2.18 --- objective.tcl 31 Aug 2006 22:21:18 -0000 1.1.2.19 *************** *** 23,39 **** set argl {} foreach arg $args {set arg [lindex $arg 0]; lappend argl "$arg=\$$arg"} ! proc $name $args "puts \"CALL TO PROC $name [join $argl " "]\"; $body" } ! #proc class_def {self selector args body} { # global _; if {![info exists _($self:_class)]} {error "unknown class '$self'"} # proc ${self}_$selector "self $args" "global _; [regsub -all @(\[\\w\\?\]+) $body _(\$self:\\1)]" #} - #proc class_def* {self selector args body} { - # global _; if {![info exists _($self:_class)]} {error "unknown class '$self'"} - # proc* ${self}_$selector "self $args" "global _; [regsub -all @(\[\\w\\?\]+) $body _(\$self:\\1)]" - #} #proc def {class selector args body} {$class def $selector $args $body} - #proc def* {class selector args body} {$class def* $selector $args $body} proc expand_macros {body} { --- 23,34 ---- set argl {} foreach arg $args {set arg [lindex $arg 0]; lappend argl "$arg=\$$arg"} ! proc $name $args "puts \"\[VTgreen\]CALL TO PROC $name [join $argl " "]\[VTgrey\]\"; $body" } ! #proc Class_def {self selector args body} { # global _; if {![info exists _($self:_class)]} {error "unknown class '$self'"} # proc ${self}_$selector "self $args" "global _; [regsub -all @(\[\\w\\?\]+) $body _(\$self:\\1)]" #} #proc def {class selector args body} {$class def $selector $args $body} proc expand_macros {body} { *************** *** 51,58 **** #trace add execution ${self}_$selector enter dedebug } - proc def* {self selector args body} { - global _; if {![info exists _($self:_class)]} {error "unknown class '$self'"} - proc* ${self}_$selector "self $args" "global _; [expand_macros $body]" - } proc class_new {self {super {Thing}}} { --- 46,49 ---- *************** *** 142,146 **** def Thing _inspect {} { set t [list "#<$self: "] ! foreach k [$self _vars] {lappend t "$k=[list $@$k] "} lappend t ">" return [join $t ""] --- 133,137 ---- def Thing _inspect {} { set t [list "#<$self: "] ! foreach k [lsort [$self _vars]] {lappend t "$k=[list $@$k] "} lappend t ">" return [join $t ""] *************** *** 168,173 **** #-----------------------------------------------------------------------------------# ! proc VTred {} {return "\x1b\[0;1;31m"} ! proc VTgrey {} {return "\x1b\[0m"} proc error_dump {} { global errorCode errorInfo --- 159,166 ---- #-----------------------------------------------------------------------------------# ! proc VTgreen {} {return "\x1b\[0;1;32m"} ! proc VTred {} {return "\x1b\[0;1;31m"} ! proc VTgrey {} {return "\x1b\[0m"} ! proc error_dump {} { global errorCode errorInfo

1 0

pd/src desire.tk,1.1.2.441,1.1.2.442
by Mathieu Bouchard 31 Aug '06

31 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3668 Modified Files: Tag: devel_0_39 desire.tk Log Message: gobjs can cancel their notices. Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.441 retrieving revision 1.1.2.442 diff -C2 -d -r1.1.2.441 -r1.1.2.442 *** desire.tk 31 Aug 2006 20:38:54 -0000 1.1.2.441 --- desire.tk 31 Aug 2006 21:17:09 -0000 1.1.2.442 *************** *** 5573,5577 **** foreach {type names} $pdrc_options { set name [lindex $names 0] - #set v $@$name set v $_($self:$name) ;# bug in objective.tcl ? switch $type { --- 5573,5576 ----

1 0

pd/src desire.tk,1.1.2.440,1.1.2.441
by Mathieu Bouchard 31 Aug '06

31 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2233 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed writing of pdrc Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.440 retrieving revision 1.1.2.441 diff -C2 -d -r1.1.2.440 -r1.1.2.441 *** desire.tk 31 Aug 2006 20:26:04 -0000 1.1.2.440 --- desire.tk 31 Aug 2006 20:38:54 -0000 1.1.2.441 *************** *** 5031,5035 **** -activestyle none -xscrollcommand "$f.a.xscroll set" #foreach line $@$name {$f.a.list insert end $line} ! foreach line $v {$f.a.list insert end $line} ;# bug in objective.tcl # save the listbox path at @$name instead set @$name $f.a.list --- 5031,5035 ---- -activestyle none -xscrollcommand "$f.a.xscroll set" #foreach line $@$name {$f.a.list insert end $line} ! foreach line $v {$f.a.list insert end $line} # save the listbox path at @$name instead set @$name $f.a.list *************** *** 5526,5530 **** class_new ServerPrefsDialog {PagedDialog} ! def ServerPrefsDialog apply {} {$self write} def ServerPrefsDialog init_reverse_hash {} { --- 5526,5530 ---- class_new ServerPrefsDialog {PagedDialog} ! def ServerPrefsDialog apply {} {$self write} def ServerPrefsDialog init_reverse_hash {} { *************** *** 5569,5590 **** def ServerPrefsDialog write {} { global pdrc_options pdrc_options_h cmdline ! #set fd [open $cmdline(rcfilename) w] ! set fd stdout; puts "WOULD SAVE:" foreach {type names} $pdrc_options { set name [lindex $names 0] #set v $@$name set v $_($self:$name) ;# bug in objective.tcl ? - puts "_($self:$name) = $v" switch $type { ! folders {foreach item $v {puts $fd "$name $item"}} ! libraries {foreach item $v {puts $fd "$name $item"}} #files {foreach item $v {puts $fd "$name $item"}} void {if {$v != ""} {if {$v} {puts $fd $name}}} ! choice {if {$v != "" && $v != "default"} {puts $fd "$v"}} default {if {[string length $v]} {puts $fd "$name $v"}} } } ! #close $fd ! puts "THE END" } def ServerPrefsDialog reset {} { --- 5569,5592 ---- def ServerPrefsDialog write {} { global pdrc_options pdrc_options_h cmdline ! set fd [open $cmdline(rcfilename) w] ! #set fd stdout; puts "WOULD SAVE:" foreach {type names} $pdrc_options { set name [lindex $names 0] #set v $@$name set v $_($self:$name) ;# bug in objective.tcl ? switch $type { ! folders {foreach item [$v get 0 end] {puts $fd "$name $item"}} ! libraries {foreach item [$v get 0 end] {puts $fd "$name $item"}} #files {foreach item $v {puts $fd "$name $item"}} void {if {$v != ""} {if {$v} {puts $fd $name}}} ! choice { ! set vv [lindex $names [expr 1+$v]] ! if {$vv != "default"} {puts $fd $vv} ! } default {if {[string length $v]} {puts $fd "$name $v"}} } } ! close $fd ! #puts "THE END" } def ServerPrefsDialog reset {} {

1 0

pd/src/locale english.tcl,1.1.2.22,1.1.2.23
by Mathieu Bouchard 31 Aug '06

31 Aug '06

Update of /cvsroot/pure-data/pd/src/locale In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1764/locale Modified Files: Tag: devel_0_39 english.tcl Log Message: removed ClientPrefsDialog write2 localized library list editor and path editor Index: english.tcl =================================================================== RCS file: /cvsroot/pure-data/pd/src/locale/Attic/english.tcl,v retrieving revision 1.1.2.22 retrieving revision 1.1.2.23 diff -C2 -d -r1.1.2.22 -r1.1.2.23 *** english.tcl 25 Aug 2006 13:47:07 -0000 1.1.2.22 --- english.tcl 31 Aug 2006 20:26:05 -0000 1.1.2.23 *************** *** 510,512 **** say Helvetica "Helvetica (sansserif)" say Times "Times (serif)" ! --- 510,523 ---- say Helvetica "Helvetica (sansserif)" say Times "Times (serif)" ! say add "Add" ! say up "Up" ! say down "Down" ! say remove "Remove" ! say lib_add "add the name you typed to the list" ! say lib_up "swap order with previous library" ! say lib_down "swap order with next library" ! say lib_remove "remove library selected in the list" ! say dir_add "add a folder using a file dialog" ! say dir_up "swap order with previous folder" ! say dir_down "swap order with next folder" ! say dir_remove "remove folder selected in the list"

1 0

pd/src desire.tk,1.1.2.439,1.1.2.440
by Mathieu Bouchard 31 Aug '06

31 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1764 Modified Files: Tag: devel_0_39 desire.tk Log Message: removed ClientPrefsDialog write2 localized library list editor and path editor Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.439 retrieving revision 1.1.2.440 diff -C2 -d -r1.1.2.439 -r1.1.2.440 *** desire.tk 31 Aug 2006 19:47:25 -0000 1.1.2.439 --- desire.tk 31 Aug 2006 20:26:04 -0000 1.1.2.440 *************** *** 5010,5021 **** frame $f.b -borderwidth 0 ! button $f.b.3 -command "$self dir_select $f.a.list" -text "add" -width 6 ! button $f.b.4 -command "$self dir_remove $f.a.list" -text "remove" -width 6 ! button $f.b.5 -command "$self dir_up $f.a.list" -text "up" -width 6 ! button $f.b.6 -command "$self dir_down $f.a.list" -text "down" -width 6 ! balloon $f.b.3 "add a directory using a file dialog" ! balloon $f.b.4 "remove directory selected in the list" ! balloon $f.b.5 "swap order with previous directory" ! balloon $f.b.6 "swap order with next directory" pack $f.b.3 $f.b.4 $f.b.5 $f.b.6 -side top --- 5010,5021 ---- frame $f.b -borderwidth 0 ! button $f.b.3 -command "$self dir_select $f.a.list" -text [say add] -width 6 ! button $f.b.4 -command "$self dir_remove $f.a.list" -text [say remove] -width 6 ! button $f.b.5 -command "$self dir_up $f.a.list" -text [say up] -width 6 ! button $f.b.6 -command "$self dir_down $f.a.list" -text [say down] -width 6 ! balloon $f.b.3 [say dir_add] ! balloon $f.b.4 [say dir_remove] ! balloon $f.b.5 [say dir_up] ! balloon $f.b.6 [say dir_down] pack $f.b.3 $f.b.4 $f.b.5 $f.b.6 -side top *************** *** 5050,5061 **** pack $f.b.entry.add -side left ! button $f.b.entry.3 -command "$self lib_add $f" -text "add" -width 6 ! button $f.b.butts.5 -command "$self dir_up $f.a.list" -text "up" -width 4 ! button $f.b.butts.6 -command "$self dir_down $f.a.list" -text "down" -width 4 ! button $f.b.butts.4 -command "$self dir_remove $f.a.list" -text "remove" -width 6 ! balloon $f.b.entry.3 "add the name you typed to the list" ! balloon $f.b.butts.5 "swap order with previous library" ! balloon $f.b.butts.6 "swap order with next library" ! balloon $f.b.butts.4 "remove library selected in the list" pack $f.b.entry.3 -side left pack $f.b.butts.5 -side left -padx 3 --- 5050,5061 ---- pack $f.b.entry.add -side left ! button $f.b.entry.3 -command "$self lib_add $f" -text [say add] -width 6 ! button $f.b.butts.5 -command "$self dir_up $f.a.list" -text [say up] -width 4 ! button $f.b.butts.6 -command "$self dir_down $f.a.list" -text [say down] -width 4 ! button $f.b.butts.4 -command "$self dir_remove $f.a.list" -text [say remove] -width 6 ! balloon $f.b.entry.3 [say lib_add] ! balloon $f.b.butts.5 [say lib_up] ! balloon $f.b.butts.6 [say lib_down] ! balloon $f.b.butts.4 [say lib_remove] pack $f.b.entry.3 -side left pack $f.b.butts.5 -side left -padx 3 *************** *** 5545,5549 **** } close $fd ! set contents [concat [join $contents " "]] ;# concat casts to list type (faster) set i 0 --- 5545,5549 ---- } close $fd ! set contents [concat [join $contents " "]] ;# concat casts to list type (faster) (?) set i 0 *************** *** 5569,5578 **** def ServerPrefsDialog write {} { global pdrc_options pdrc_options_h cmdline ! set fd [open $cmdline(rcfilename) w] ! #set fd stdout; puts "WOULD SAVE:" foreach {type names} $pdrc_options { set name [lindex $names 0] #set v $@$name set v $_($self:$name) ;# bug in objective.tcl ? switch $type { folders {foreach item $v {puts $fd "$name $item"}} --- 5569,5579 ---- def ServerPrefsDialog write {} { global pdrc_options pdrc_options_h cmdline ! #set fd [open $cmdline(rcfilename) w] ! set fd stdout; puts "WOULD SAVE:" foreach {type names} $pdrc_options { set name [lindex $names 0] #set v $@$name set v $_($self:$name) ;# bug in objective.tcl ? + puts "_($self:$name) = $v" switch $type { folders {foreach item $v {puts $fd "$name $item"}} *************** *** 5584,5589 **** } } ! close $fd ! # puts "THE END" } def ServerPrefsDialog reset {} { --- 5585,5590 ---- } } ! #close $fd ! puts "THE END" } def ServerPrefsDialog reset {} { *************** *** 5831,5888 **** } ! def ClientPrefsDialog write2 {} { ! global ddrc_options ddrc_options_h cmdline look accels key crosshair ! set fd [open $cmdline(ddrcfilename) w] ! set check_key {} ! #puts "fd ===== $fd" ! foreach {type class name} $ddrc_options { ! switch $type { ! color { ! set var ${name}path ! set new_color [$@$var cget -background] ! set look($name) $new_color ! puts $fd "$type $name $new_color" ! } ! key { ! foreach item $name { ! set var ${item}path ! set new_key [$@$var get] ! set old_key $key($item) ! if {$key($item) != $new_key} { ! if {[dict exists $accels $old_key]} { ! set cmd [dict get $accels $old_key] ! set accels [dict remove $accels $old_key] ! dict set accels $new_key $cmd ! puts "$new_key ::: $cmd" ! } ! } ! if {[dict exists $check_key $new_key] && $new_key != ""} { ! error "$new_key already assigned" ! #dict set check_key $new_key key($item) ! } else {dict set check_key $new_key key($item)} ! set key($item) $new_key ! puts $fd "$type $item $new_key" ! } ! ! } ! crosshair { ! set crosshair($name) $_($self:$name) ! puts $fd "$type $name $crosshair($name)" ! } ! bar { ! set bar($name) $_($self:$name) ! puts $fd "$type $name $bar($name)" ! } ! } ! } ! close $fd } ! def ClientPrefsDialog reset {} { } def ClientPrefsDialog init {} { global ddrc_options look key crosshair bar $self read ! super reset cancel apply ok set f .$self.1 set section 0 --- 5832,5848 ---- } ! def ClientPrefsDialog reset {} { ! # this should reload defaults.ddrc ? } ! def ClientPrefsDialog revert {} { ! # this should reload currently used settings ? } + def ClientPrefsDialog init {} { global ddrc_options look key crosshair bar $self read ! super cancel apply ok ! #super cancel reset revert apply ok set f .$self.1 set section 0

1 0

pd/src desire.tk,1.1.2.438,1.1.2.439
by Mathieu Bouchard 31 Aug '06

31 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30681 Modified Files: Tag: devel_0_39 desire.tk Log Message: canvas: removed texteditor, menusave, menusaveas Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.438 retrieving revision 1.1.2.439 diff -C2 -d -r1.1.2.438 -r1.1.2.439 *** desire.tk 31 Aug 2006 19:20:25 -0000 1.1.2.438 --- desire.tk 31 Aug 2006 19:47:25 -0000 1.1.2.439 *************** *** 1223,1227 **** return [menu_opentext $dirname/$basename] } else { ! pd "pd open [pdtk_enquote $basename] [pdtk_enquote $dirname] ;" } } --- 1223,1227 ---- return [menu_opentext $dirname/$basename] } else { ! pd pd open [pdtk_enquote $basename] [pdtk_enquote $dirname] } } *************** *** 1456,1460 **** } } ! def Canvas reload {} {pd ".$self map 0; .$self map 1"} def Canvas redraw {} { --- 1456,1460 ---- } } ! def Canvas reload {} {pd .$self map 0; pd .$self map 1} def Canvas redraw {} { *************** *** 3463,3467 **** def CanvasPropertiesDialog apply {} { ! pd ".$self donecanvasdialog $@xscale $@yscale $@graphme ;" } --- 3463,3467 ---- def CanvasPropertiesDialog apply {} { ! pd .$@of donecanvasdialog $@xscale $@yscale $@graphme } *************** *** 3486,3489 **** --- 3486,3498 ---- } + class_new BoxPropertiesDialog {PropertiesDialog} + def Box popup_properties {} {BoxPropertiesDialog new $self} + def BoxPropertiesDialog init {of} { + super $of + wm title .$self "Box Properties" + pack [label .$self.huh -text "huh..."] + pack [label .$self.huh2 -text "this is where some #V properties should go"] + } + class_new GAtomPropertiesDialog {PropertiesDialog} *************** *** 3491,3496 **** def GAtomPropertiesDialog apply {} { ! pd ".$@of param $@w $@min $@max [gatom_escape $@lab] $@pos \ ! [gatom_escape $@rcv] [gatom_escape $@snd] ;" } --- 3500,3504 ---- def GAtomPropertiesDialog apply {} { ! pd .$@of param $@w $@min $@max [gatom_escape $@lab] $@pos [gatom_escape $@rcv] [gatom_escape $@snd] } *************** *** 3518,3522 **** def GraphPropertiesDialog apply {} { ! pd ".$self dialog $@x1 $@y1 $@x2 $@y2 $@xpix $@ypix ;" } --- 3526,3530 ---- def GraphPropertiesDialog apply {} { ! pd .$@of dialog $@x1 $@y1 $@x2 $@y2 $@xpix $@ypix } *************** *** 3546,3553 **** if {[string index $mofo 0] == "$"} { set mofo [string replace $mofo 0 0 #] } ! pd ".$self arraydialog $mofo $@n $@saveit $@otherflag ;" } def ArrayPropertiesDialog init {of} { super $of foreach var {name n saveit} {set @$var $_($of:$var)} --- 3554,3568 ---- if {[string index $mofo 0] == "$"} { set mofo [string replace $mofo 0 0 #] } ! pd .$@apply arraydialog $mofo $@n $@saveit $@otherflag } def ArrayPropertiesDialog init {of} { + # sprintf(cmdbuf, ((x->x_name->s_name[0] == '$') ? + # "pdtk_array_dialog %%s \\%s %d %d 0\n" : + # "pdtk_array_dialog %%s %s %d %d 0\n"), + # x->x_name->s_name, a->a_n, x->x_saveit + + # 2 * (int)(template_getfloat(template_findbyname(sc->sc_template), + # gensym("style"), x->x_scalar->sc_vec, 1))); + super $of foreach var {name n saveit} {set @$var $_($of:$var)}

1 0

[PD-cvs] pd/src desire.c, 1.1.2.125, 1.1.2.126 m_pd.h, 1.4.4.11.2.25, 1.4.4.11.2.26 m_imp.h, 1.3.4.1.2.3, 1.3.4.1.2.4 m_class.c, 1.3.4.7.2.18, 1.3.4.7.2.19
by Mathieu Bouchard 31 Aug '06

31 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30177 Modified Files: Tag: devel_0_39 desire.c m_pd.h m_imp.h m_class.c Log Message: t_propertiesfn removed from DesireData. Index: m_class.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_class.c,v retrieving revision 1.3.4.7.2.18 retrieving revision 1.3.4.7.2.19 diff -C2 -d -r1.3.4.7.2.18 -r1.3.4.7.2.19 *** m_class.c 13 Jun 2006 12:48:01 -0000 1.3.4.7.2.18 --- m_class.c 31 Aug 2006 19:36:06 -0000 1.3.4.7.2.19 *************** *** 519,522 **** --- 519,523 ---- } + #ifndef DESIRE void class_setpropertiesfn(t_class *c, t_propertiesfn f) { *************** *** 528,531 **** --- 529,533 ---- return (c->c_propertiesfn); } + #endif /* ---------------- the symbol table ------------------------ */ *************** *** 1040,1044 **** struct _parentwidgetbehavior *c_pwb; t_savefn c_savefn; - t_propertiesfn c_propertiesfn; int c_floatsignalin; */ --- 1042,1045 ---- Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.25 retrieving revision 1.4.4.11.2.26 diff -C2 -d -r1.4.4.11.2.25 -r1.4.4.11.2.26 *** m_pd.h 1 Jul 2006 04:20:02 -0000 1.4.4.11.2.25 --- m_pd.h 31 Aug 2006 19:36:06 -0000 1.4.4.11.2.26 *************** *** 501,508 **** EXTERN void class_setsavefn(t_class *c, t_savefn f); EXTERN t_savefn class_getsavefn(t_class *c); ! /* prototype for functions to open properties dialogs */ typedef void (*t_propertiesfn)(t_gobj *x, struct _glist *glist); EXTERN void class_setpropertiesfn(t_class *c, t_propertiesfn f); EXTERN t_propertiesfn class_getpropertiesfn(t_class *c); #ifndef PD_CLASS_DEF --- 501,511 ---- EXTERN void class_setsavefn(t_class *c, t_savefn f); EXTERN t_savefn class_getsavefn(t_class *c); ! ! #ifndef DESIRE ! /* prototype for functions to open properties dialogs */ typedef void (*t_propertiesfn)(t_gobj *x, struct _glist *glist); EXTERN void class_setpropertiesfn(t_class *c, t_propertiesfn f); EXTERN t_propertiesfn class_getpropertiesfn(t_class *c); + #endif #ifndef PD_CLASS_DEF Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.125 retrieving revision 1.1.2.126 diff -C2 -d -r1.1.2.125 -r1.1.2.126 *** desire.c 31 Aug 2006 19:02:28 -0000 1.1.2.125 --- desire.c 31 Aug 2006 19:36:05 -0000 1.1.2.126 *************** *** 1507,1540 **** } - void garray_properties(t_garray *x); - - /* tell GUI to create a properties dialog on the canvas. We tell - the user the negative of the "pixel" y scale to make it appear to grow - naturally upward, whereas pixels grow downward. */ - void canvas_properties(t_glist *x) { - t_gobj *y; - char graphbuf[200]; - if (glist_isgraph(x) != 0) - sprintf(graphbuf, - "pdtk_canvas_dialog %%s %g %g %d %g %g %g %g %d %d %d %d\n", - 0., 0., - 1, - x->gl_x1, x->gl_y1, x->gl_x2, x->gl_y2, - (int)x->gl_pixwidth, (int)x->gl_pixheight, - (int)x->gl_xmargin, (int)x->gl_ymargin); - else sprintf(graphbuf, - "pdtk_canvas_dialog %%s %g %g %d %g %g %g %g %d %d %d %d\n", - glist_dpixtodx(x, 1), -glist_dpixtody(x, 1), - 0, - 0., -1., 1., 1., - (int)x->gl_pixwidth, (int)x->gl_pixheight, - (int)x->gl_xmargin, (int)x->gl_ymargin); - gfxstub_new(&x->gl_pd, x, graphbuf); - /* if any arrays are in the graph, put out their dialogs too */ - for (y = x->gl_list; y; y = y->g_next) - if (pd_class(&y->g_pd) == garray_class) - garray_properties((t_garray *)y); - } - /* called from the gui when "OK" is selected on the canvas properties dialog. Again we negate "y" scale. */ --- 1507,1510 ---- *************** *** 2204,2229 **** } - /* called from graph_dialog to set properties */ - void garray_properties(t_garray *x) - { - char cmdbuf[200]; - t_array *a = garray_getarray(x); - t_scalar *sc = x->x_scalar; - - if (!a) - return; - gfxstub_deleteforkey(x); - /* create dialog window. LATER fix this to escape '$' - properly; right now we just detect a leading '$' and escape - it. There should be a systematic way of doing this. */ - sprintf(cmdbuf, ((x->x_name->s_name[0] == '$') ? - "pdtk_array_dialog %%s \\%s %d %d 0\n" : - "pdtk_array_dialog %%s %s %d %d 0\n"), - x->x_name->s_name, a->a_n, x->x_saveit + - 2 * (int)(template_getfloat(template_findbyname(sc->sc_template), - gensym("style"), x->x_scalar->sc_vec, 1))); - gfxstub_new(&x->x_gobj.g_pd, x, cmdbuf); - } - /* this is called back from the dialog window to create a garray. The otherflag requests that we find an existing graph to put it in. */ --- 2174,2177 ---- *************** *** 2234,2240 **** t_garray *a; int flags = fflags; ! if (size < 1) ! size = 1; ! if (otherflag == 0 || (!(gl = glist_findgraph(parent)))) gl = glist_addglist(parent, &s_, 0, 1, (size > 1 ? size-1 : size), -1, 0, 0, 0, 0); --- 2182,2187 ---- t_garray *a; int flags = fflags; ! if (size < 1) size = 1; ! if (otherflag == 0 || !(gl = glist_findgraph(parent))) gl = glist_addglist(parent, &s_, 0, 1, (size > 1 ? size-1 : size), -1, 0, 0, 0, 0); *************** *** 5641,5645 **** class_setwidget(scalar_class, &scalar_widgetbehavior); class_setsavefn(scalar_class, scalar_save); ! class_setpropertiesfn(scalar_class, scalar_properties); } --- 5588,5592 ---- class_setwidget(scalar_class, &scalar_widgetbehavior); class_setsavefn(scalar_class, scalar_save); ! /*class_setpropertiesfn(scalar_class, scalar_properties);*/ } *************** *** 8940,8944 **** } - static void gatom_properties(t_gobj *z,t_glist *o) {sys_mgui(z,"properties","");} static void text_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2) { *xp1 = *yp1 = *xp2 = *yp2 = 42; /* desire */ --- 8887,8890 ---- *************** *** 9153,9157 **** class_addmethod3(c, gatom_set, "set","*"); class_addmethod3(c, gatom_param, "param","*"); - class_setpropertiesfn(c, gatom_properties); } --- 9099,9102 ---- *************** *** 9473,9477 **** class_addmethod3(c, iemgui_label_pos, "label_pos","ff"); class_addmethod3(c, iemgui_label_font, "label_font","*"); - class_setpropertiesfn(c, iemgui_propertiesfn); } --- 9418,9421 ---- *************** *** 9501,9511 **** } - void iemgui_propertiesfn(t_gobj *x, t_glist *owner) - { - // t_symbol *stub = gfxstub_new((t_pd *)x,x,0); - pd_upload(x); - // sys_vgui("pdtk_iemgui_dialog %s %x\n", stub->s_name, x); - } - static void iemgui_constrain(t_iemgui *x) { x->fontsize = MAX(x->fontsize,4); --- 9445,9448 ---- *************** *** 10447,10451 **** class_addmethod3(c,glist_menu_open,"menu-open",""); class_addmethod3(c,canvas_map,"map","f"); - class_setpropertiesfn(c, (t_propertiesfn)canvas_properties); class_addmethod3(c,glist_clear,"clear",""); --- 10384,10387 ---- Index: m_imp.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_imp.h,v retrieving revision 1.3.4.1.2.3 retrieving revision 1.3.4.1.2.4 diff -C2 -d -r1.3.4.1.2.3 -r1.3.4.1.2.4 *** m_imp.h 21 Oct 2005 13:17:01 -0000 1.3.4.1.2.3 --- m_imp.h 31 Aug 2006 19:36:06 -0000 1.3.4.1.2.4 *************** *** 47,51 **** --- 47,53 ---- struct _parentwidgetbehavior *c_pwb;/* widget behavior in parent */ t_savefn c_savefn; /* function to call when saving */ + #ifndef DESIRE t_propertiesfn c_propertiesfn; /* function to start prop dialog */ + #endif int c_floatsignalin; /* onset to float for signal input */ char c_gobj; /* true if is a gobj */

1 0

pd/src desire.tk,1.1.2.437,1.1.2.438
by Mathieu Bouchard 31 Aug '06

31 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29573 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed problem with right-click on object. rehabilitated floatatom,symbolatom properties dialogs. Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.437 retrieving revision 1.1.2.438 diff -C2 -d -r1.1.2.437 -r1.1.2.438 *** desire.tk 31 Aug 2006 19:14:24 -0000 1.1.2.437 --- desire.tk 31 Aug 2006 19:20:25 -0000 1.1.2.438 *************** *** 38,42 **** package require objective ! if {[catch {source profdd.tcl}]} {error_dump} if {[file exists debug.tcl]} { source debug.tcl --- 38,42 ---- package require objective ! #if {[catch {source profdd.tcl}]} {error_dump} if {[file exists debug.tcl]} { source debug.tcl *************** *** 813,819 **** foreach name $list { if {$name == ""} {$menu add separator; continue} ! #if {[llength [array names key $name]]} {set k $key($@_class:$name); puts "here"} {set k ""} if {[info exists key($@_class:$name)]} { ! if {[string length $key($@_class:$name)]} {set k $key($@_class:$name)} {set k ""} } $menu add command -label [say $name] -command "$self $name" \ --- 813,819 ---- foreach name $list { if {$name == ""} {$menu add separator; continue} ! set k "" if {[info exists key($@_class:$name)]} { ! if {[string length $key($@_class:$name)]} {set k $key($@_class:$name)} } $menu add command -label [say $name] -command "$self $name" \ *************** *** 1244,1248 **** } - def Canvas getscroll {args} {} ;# what's this for, again? def Canvas window {} {return .$self} def Canvas widget {} {return .$self.c} --- 1244,1247 ---- *************** *** 3392,3396 **** global classinfo fields super $of ! set class $_($of:class) wm title .$self "\[$class\] [say popup_properties]" --- 3391,3395 ---- global classinfo fields super $of ! set class $_($of:class) wm title .$self "\[$class\] [say popup_properties]" *************** *** 3467,3472 **** } - def CanvasPropertiesDialog cancel {id} {pd ".$self cancel ;"} - proc gatom_escape {sym} { if {[string length $sym] == 0} { --- 3466,3469 ---- *************** *** 3489,3521 **** } ! class_new GAtomPropertiesDialog {Dialog} def GAtomPropertiesDialog apply {} { ! pd ".$self param $@width $@lo $@hi [gatom_escape $@label] $@wherelabel \ ! [gatom_escape $@symfrom] [gatom_escape $@symto] ;" } - def GAtomPropertiesDialog cancel {} {pd ".$self cancel ;"} - def GAtomPropertiesDialog init {of} { super $of ! foreach var {width lo hi wherelabel} {set @$var $_($of:$var)} ! foreach var {label symfrom symto} {set @$var [gatom_unescape $_($of:$var)]} wm title .$self "Atom" global properties $self add .$self \ ! {width entry -width 4} \ ! {lo entry -width 8} \ ! {hi entry -width 8} \ ! {label entry -width 20} \ ! {wherelabel side} \ ! {symto entry -width 20} \ ! {symfrom entry -width 20} ! foreach name {hi lo width} { ! bind .$self.$name.entry <KeyPress-Return> "$self ok" ! } ! .$self.width.entry select from 0 ! .$self.width.entry select adjust end ! focus .$self.width.entry } --- 3486,3516 ---- } ! class_new GAtomPropertiesDialog {PropertiesDialog} ! ! def AtomBox popup_properties {} {GAtomPropertiesDialog new $self} def GAtomPropertiesDialog apply {} { ! pd ".$@of param $@w $@min $@max [gatom_escape $@lab] $@pos \ ! [gatom_escape $@rcv] [gatom_escape $@snd] ;" } def GAtomPropertiesDialog init {of} { super $of ! foreach var {w min max pos} {set @$var $_($of:$var)} ! foreach var {lab snd rcv} {set @$var [gatom_unescape $_($of:$var)]} wm title .$self "Atom" global properties $self add .$self \ ! {w entry -width 4} \ ! {min entry -width 8} \ ! {max entry -width 8} \ ! {lab entry -width 20} \ ! {pos side} \ ! {snd entry -width 20} \ ! {rcv entry -width 20} ! foreach name {w min max} {bind .$self.$name.entry <KeyPress-Return> "$self ok"} ! .$self.w.entry select from 0 ! .$self.w.entry select adjust end ! focus .$self.w.entry } *************** *** 3526,3531 **** } - def GraphPropertiesDialog cancel {} {pd ".$self cancel ;"} - def GraphPropertiesDialog init {of} { super $of --- 3521,3524 ---- *************** *** 3556,3561 **** } - def ArrayPropertiesDialog cancel {} {pd ".$self cancel ;"} - def ArrayPropertiesDialog init {of} { super $of --- 3549,3552 ----

1 0

pd/src desire.tk,1.1.2.436,1.1.2.437
by chunlee 31 Aug '06

31 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29303 Modified Files: Tag: devel_0_39 desire.tk Log Message: fixed some wire bugs Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.436 retrieving revision 1.1.2.437 diff -C2 -d -r1.1.2.436 -r1.1.2.437 *** desire.tk 31 Aug 2006 18:20:47 -0000 1.1.2.436 --- desire.tk 31 Aug 2006 19:14:24 -0000 1.1.2.437 *************** *** 952,955 **** --- 952,956 ---- set_fontstring } + proc read_ddrc_old {} { global cmdline look key *************** *** 976,979 **** --- 977,981 ---- read_ddrc [file join [file dirname $argh0] "../lib/pd/bin/defaults.ddrc"] } + read_ddrc #-----------------------------------------------------------------------------------# set pd_apilist "{ALSA 1}" *************** *** 1855,1859 **** } } - puts "wires_pair = $@wires_pair" set born [lwithout $wires $@wires] set born_num [expr [llength $born] - 1] --- 1857,1860 ---- *************** *** 1864,1868 **** $x canvas= $self } ! set dead [lwithout $@wires $wires]; foreach x $dead { $x delete set find [lsearch $@wires_pair $x] --- 1865,1871 ---- $x canvas= $self } ! set dead [lwithout $@wires $wires]; ! puts "dead = $dead" ! foreach x $dead { $x delete set find [lsearch $@wires_pair $x] *************** *** 1883,1887 **** if {$find != -1} { $self disconnect [lindex $@wires_pair [expr $find - 1]] - set @wires_pair [lreplace $@wires_pair [expr $find - 1] $find] } $wire delete --- 1886,1889 ---- *************** *** 1893,1897 **** if {$find != -1} { $self disconnect [lindex $@wires_pair [expr $find - 1]] - set @wires_pair [lreplace $@wires_pair [expr $find - 1] [expr $find - 1]] } $x delete --- 1895,1898 ---- *************** *** 2064,2069 **** set outs [$id noutlets] set ins [$id ninlets] ! if {$y>=$y2-6 && $outs} {return [list "outlet" $id [expr int(($x-$x1)*$outs/($x2-$x1))]]} ! if {$y< $y1+2 && $ins} {return [list "inlet" $id [expr int(($x-$x1)* $ins/($x2-$x1))]]} return [list "object" $id] } --- 2065,2078 ---- set outs [$id noutlets] set ins [$id ninlets] ! if {$y>=$y2-6 && $outs} { ! set val [expr int(($x-$x1)*$outs/($x2-$x1))] ! if {$val == $outs} {set val [expr $val-1]} ! return [list "outlet" $id $val] ! } ! if {$y< $y1+2 && $ins} { ! set val [expr int(($x-$x1)* $ins/($x2-$x1))] ! if {$val == $ins} {set val [expr $val-1]} ! return [list "inlet" $id $val] ! } return [list "object" $id] } *************** *** 2260,2264 **** mset {from outlet to inlet} $wire; pd .$self disconnect $from $outlet $to $inlet $@history add [list $self connect $wire] ! set @wires_pair [lreplace $@wires_pair [lsearch $@wires_pair $wire] [lsearch $@wires_pair $wire]] } def Canvas connect {wire} { --- 2269,2273 ---- mset {from outlet to inlet} $wire; pd .$self disconnect $from $outlet $to $inlet $@history add [list $self connect $wire] ! #set @wires_pair [lreplace $@wires_pair [lsearch $@wires_pair $wire] [lsearch $@wires_pair $wire]] } def Canvas connect {wire} { *************** *** 2319,2330 **** #mset [list type @to @inlet] $target mset [list type foo bar] $target switch $type { outlet {mset [list type @from @outlet] $target} inlet {mset [list type @to @inlet] $target} } - $self draw - } - def FutureWire unclick {x y f target} { - $self motion $x $y $f $target if {$@to != ""} { set children [$@canvas children] --- 2328,2345 ---- #mset [list type @to @inlet] $target mset [list type foo bar] $target + #switch $type { + #outlet {mset [list type @from @outlet] $target} + #inlet {mset [list type @to @inlet] $target} + #} + #puts "outlet::: $@outlet ||inlet::: $@inlet" + $self draw + } + def FutureWire unclick {x y f target} { + #$self motion $x $y $f $target + mset [list type foo bar] $target switch $type { outlet {mset [list type @from @outlet] $target} inlet {mset [list type @to @inlet] $target} } if {$@to != ""} { set children [$@canvas children] *************** *** 2433,2437 **** set d_outlet [distance [list $x $y] [list [expr ($x1+$x2)/2] [expr ($y1+$y2)/2]]] set d_inlet [distance [list $x $y] [list [expr ($x3+$x4)/2] [expr ($y3+$y4)/2]]] - puts " to outlet:: $d_outlet || to inlet:: $d_inlet" if {$d_outlet > $d_inlet} { set x5 $x1; set y5 $y1 --- 2448,2451 ---- *************** *** 2441,2448 **** set target [list inlet $obj2 $inlet] } - #set target [$self identify_target $x1 $y1 $f] - #target::: outlet x82d7568 0 - #set target [$self identify_target $x5 $y5 $f] - #puts " target::: $target" set @action [FutureWire new $self $x1 $y1 $f $target] } --- 2455,2458 ---- *************** *** 2515,2523 **** def Canvas tab_jump {} { set @keynav 1 - #puts " selection:::: [$self selection]" - #puts " selection_wire:::: [$self selection_wire]" - #puts " keynav_current:::: $@keynav_current" - #puts " keynav_tab_sel:::: $@keynav_tab_sel" - #$self deselect_all set olength [llength $@selection] set wlength [llength $@selection_wire] --- 2525,2528 ----

1 0

pd/src desire.c,1.1.2.124,1.1.2.125
by Mathieu Bouchard 31 Aug '06

31 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28863 Modified Files: Tag: devel_0_39 desire.c Log Message: removed canvas_reflecttitle, gobj_vis and stuff. Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.124 retrieving revision 1.1.2.125 diff -C2 -d -r1.1.2.124 -r1.1.2.125 *** desire.c 30 Aug 2006 17:26:24 -0000 1.1.2.124 --- desire.c 31 Aug 2006 19:02:28 -0000 1.1.2.125 *************** *** 284,288 **** t_canvas *canvas_whichfind; /* last canvas we did a find in */ t_canvas *canvas_list; /* list of all root canvases */ - static void canvas_reflecttitle(t_canvas *x); static void canvas_setbounds(t_canvas *x, int x1, int y1, int x2, int y2); static void canvas_drawlines(t_canvas *x); --- 284,287 ---- *************** *** 391,396 **** x->gl_name = s; if (strcmp(x->gl_name->s_name, "Pd")) pd_bind(&x->gl_pd, canvas_makebindsym(x->gl_name)); - if (glist_isvisible(x)) canvas_reflecttitle(x); if (dir && dir != &s_) canvas_getenv(x)->ce_dir = dir; } --- 390,395 ---- x->gl_name = s; if (strcmp(x->gl_name->s_name, "Pd")) pd_bind(&x->gl_pd, canvas_makebindsym(x->gl_name)); if (dir && dir != &s_) canvas_getenv(x)->ce_dir = dir; + gobj_changed(x,0); } *************** *** 646,681 **** } - void canvas_reflecttitle(t_canvas *x) { - /* - char namebuf[MAXPDSTRING]; - char foo[MAXPDSTRING]; - t_canvasenvironment *env = canvas_getenv(x); - if (env->ce_argc) - { - int i; - strcpy(namebuf, " ("); - for (i = 0; i < env->ce_argc; i++) - { - if (strlen(namebuf) > MAXPDSTRING/2 - 5) - break; - if (i != 0) - strcat(namebuf, " "); - atom_string(&env->ce_argv[i], namebuf + strlen(namebuf), - MAXPDSTRING/2); - } - strcat(namebuf, ")"); - } - else namebuf[0] = 0; - sprintf(foo,"%s%c%s - %s",x->gl_name->s_name, (x->gl_dirty? '*' : ' '), namebuf, - canvas_getdir(x)->s_name); - sys_mgui(x,"window_title","s",gensym(foo)); - */ - } - void canvas_dirty(t_canvas *x, t_int n) { t_canvas *x2 = canvas_getrootfor(x); if ((unsigned)n != x2->gl_dirty) { x2->gl_dirty = n; ! canvas_reflecttitle(x2); } } --- 645,653 ---- } void canvas_dirty(t_canvas *x, t_int n) { t_canvas *x2 = canvas_getrootfor(x); if ((unsigned)n != x2->gl_dirty) { x2->gl_dirty = n; ! sys_mgui(x,"modified?=","i",n); } } *************** *** 776,790 **** if (!!f) { if (x->gl_editor) { /* already visible, so just raise window */ ! #ifdef MSW ! canvas_vis(x, 0); ! canvas_vis(x, 1); ! #else ! sys_mgui(x,"window_raise",""); ! sys_mgui(x,"window_focus",""); ! sys_mgui(x,"window_deiconify",""); ! #endif } else { canvas_create_editor(x, 1); - canvas_reflecttitle(x); x->gl_havewindow = 1; gobj_subscribe((t_gobj *)x,(t_gobj *)manager); --- 748,754 ---- if (!!f) { if (x->gl_editor) { /* already visible, so just raise window */ ! sys_mgui(x,"raise",""); } else { canvas_create_editor(x, 1); x->gl_havewindow = 1; gobj_subscribe((t_gobj *)x,(t_gobj *)manager); *************** *** 792,798 **** } } else { /* make invisible */ - int i; - t_canvas *x2; - gobj_subscribe((t_gobj *)x,(t_gobj *)manager); /* why this, if it's supposed to be invisible? */ if (!x->gl_havewindow) { /* bug workaround -- a graph in a visible patch gets "invised" --- 756,759 ---- *************** *** 804,811 **** return; } - sys_mgui(x,"getscroll",""); if (glist_isvisible(x)) canvas_map(x, 0); canvas_create_editor(x, 0); - i=1; for (x2=x; x2; x2=x2->gl_next) i++; /* if we're a graph on our parent, and if the parent exists and is visible, show ourselves on parent. */ --- 765,770 ---- *************** *** 815,821 **** if (glist_isvisible(gl2)) gobj_vis(&x->gl_gobj, gl2, 0); x->gl_havewindow = 0; if (glist_isvisible(gl2)) gobj_vis(&x->gl_gobj, gl2, 1); ! } else x->gl_havewindow = 0; } } --- 774,784 ---- if (glist_isvisible(gl2)) gobj_vis(&x->gl_gobj, gl2, 0); x->gl_havewindow = 0; + gobj_unsubscribe((t_gobj *)x,(t_gobj *)manager); if (glist_isvisible(gl2)) gobj_vis(&x->gl_gobj, gl2, 1); ! } else { ! x->gl_havewindow = 0; ! } } + gobj_changed(x,0); } *************** *** 1280,1315 **** LATER we'll use the "template" information to select which ones we redraw. Action = 0 for redraw, 1 for draw only, 2 for erase. */ ! static void glist_redrawall(t_glist *gl, int action) ! { t_gobj *g; int vis = glist_isvisible(gl); ! for (g = gl->gl_list; g; g = g->g_next) ! { ! if (vis && g->g_pd == scalar_class) ! { ! if (action == 1) ! { ! if (glist_isvisible(gl)) ! gobj_vis(g, gl, 1); ! } ! else if (action == 2) ! { ! if (glist_isvisible(gl)) ! gobj_vis(g, gl, 0); ! } else scalar_redraw((t_scalar *)g, gl); ! } ! else if (g->g_pd == canvas_class) ! glist_redrawall((t_glist *)g, action); } } ! /* public interface for above. */ ! void canvas_redrawallfortemplate(t_template *template, int action) ! { t_canvas *x; /* find all root canvases */ ! for (x = canvas_list; x; x = x->gl_next) ! glist_redrawall(x, action); } --- 1243,1263 ---- LATER we'll use the "template" information to select which ones we redraw. Action = 0 for redraw, 1 for draw only, 2 for erase. */ ! static void glist_redrawall(t_glist *gl, int action) { t_gobj *g; int vis = glist_isvisible(gl); ! for (g = gl->gl_list; g; g = g->g_next) { ! if (vis && g->g_pd == scalar_class) { ! if (action == 1) {if (glist_isvisible(gl)) gobj_vis(g, gl, 1);} ! else if (action == 2) {if (glist_isvisible(gl)) gobj_vis(g, gl, 0);} else scalar_redraw((t_scalar *)g, gl); ! } else if (g->g_pd == canvas_class) glist_redrawall((t_glist *)g, action); } } ! /* public interface for above. */ ! void canvas_redrawallfortemplate(t_template *template, int action) { t_canvas *x; /* find all root canvases */ ! for (x = canvas_list; x; x = x->gl_next) glist_redrawall(x, action); } *************** *** 1373,1397 **** void gobj_vis(t_gobj *x, struct _glist *glist, int flag) { post("warning: t_visfn shouldn't do anything anymore"); - /* - t_widgetbehavior *w = x->g_pd->c_wb; - if (w && w->w_visfn) - { - if (!glist->gl_havewindow && glist->gl_isgraph && glist->gl_goprect && - glist->gl_owner && (pd_class(&glist->gl_pd) != garray_class)) - { - // if we're graphing-on-parent and the object falls outside the - // graph rectangle, don't draw it. - int x1, y1, x2, y2, gx1, gy1, gx2, gy2, m; - gobj_getrect(&glist->gl_gobj, glist->gl_owner, &x1, &y1, &x2, &y2); - if (x1>x2) m=x1, x1=x2, x2=m; - if (y1>y2) m=y1, y1=y2, x2=m; - gobj_getrect(x, glist, &gx1, &gy1, &gx2, &gy2); - if (gx1<x1 || gx1>x2 || gx2<x1 || gx2>WWWWx2 || - gy1<y1 || gy1>y2 || gy2<y1 || gy2>y2) - return; - } - w->w_visfn(x, glist, flag); - } - */ } --- 1321,1324 ---- *************** *** 1560,1602 **** void canvas_setgraph(t_glist *x, int flag, int nogoprect) { ! if (!flag && glist_isgraph(x)) ! { ! if (x->gl_owner && !x->gl_loading && glist_isvisible(x->gl_owner)) ! gobj_vis(&x->gl_gobj, x->gl_owner, 0); x->gl_isgraph = 0; ! if (x->gl_owner && !x->gl_loading && glist_isvisible(x->gl_owner)) ! { ! gobj_vis(&x->gl_gobj, x->gl_owner, 1); ! } ! } ! else if (flag && !glist_isgraph(x)) ! { ! if (x->gl_pixwidth <= 0) ! x->gl_pixwidth = GLIST_DEFGRAPHWIDTH; ! ! if (x->gl_pixheight <= 0) ! x->gl_pixheight = GLIST_DEFGRAPHHEIGHT; ! if (x->gl_owner && !x->gl_loading && glist_isvisible(x->gl_owner)) gobj_vis(&x->gl_gobj, x->gl_owner, 0); x->gl_isgraph = 1; ! if (!nogoprect && !x->gl_goprect) ! { t_gobj *g; ! for (g = x->gl_list; g; g = g->g_next) ! if (pd_checkobject(&g->g_pd)) ! { x->gl_goprect = 1; break; } } ! if (glist_isvisible(x) && x->gl_goprect) ! glist_redraw(x); ! if (x->gl_loading && x->gl_owner && glist_isvisible(x->gl_owner)) ! canvas_create_editor(x, 1); ! if (x->gl_owner && !x->gl_loading && glist_isvisible(x->gl_owner)) ! { ! gobj_vis(&x->gl_gobj, x->gl_owner, 1); ! } } } --- 1487,1507 ---- void canvas_setgraph(t_glist *x, int flag, int nogoprect) { ! if (!flag && glist_isgraph(x)) { x->gl_isgraph = 0; ! } else if (flag && !glist_isgraph(x)) { ! if (x->gl_pixwidth <= 0) x->gl_pixwidth = GLIST_DEFGRAPHWIDTH; ! if (x->gl_pixheight <= 0) x->gl_pixheight = GLIST_DEFGRAPHHEIGHT; if (x->gl_owner && !x->gl_loading && glist_isvisible(x->gl_owner)) gobj_vis(&x->gl_gobj, x->gl_owner, 0); x->gl_isgraph = 1; ! if (!nogoprect && !x->gl_goprect) { t_gobj *g; ! for (g = x->gl_list; g; g = g->g_next) if (pd_checkobject(&g->g_pd)) { x->gl_goprect = 1; break; } } ! if (glist_isvisible(x) && x->gl_goprect) glist_redraw(x); ! if (x->gl_loading && x->gl_owner && glist_isvisible(x->gl_owner)) canvas_create_editor(x, 1); } }

1 0

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 August 2006