Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14849
Modified Files: Tag: devel_0_39 desire.tk Log Message: moving some bugs around...
Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.443 retrieving revision 1.1.2.444 diff -C2 -d -r1.1.2.443 -r1.1.2.444 *** desire.tk 1 Sep 2006 02:04:20 -0000 1.1.2.443 --- desire.tk 1 Sep 2006 02:30:58 -0000 1.1.2.444 *************** *** 444,448 **** }
! set cmdline(gdb) 1 set cmdline(gdbconsole) 1 set cmdline(valgrind) 0 --- 444,448 ---- }
! set cmdline(gdb) 0 set cmdline(gdbconsole) 1 set cmdline(valgrind) 0 *************** *** 646,655 **** if {[catch {eval $sock_lobby}]} { global errorCode errorInfo ! switch -regexp -- $errorInfo { ! "^missing close-brace" {continue} ! } ! regsub -all " invoked from within\n" $errorInfo "" errorInfo ! regsub -all "\n \(" $errorInfo " (" errorInfo ! puts "[VTred]Exception:[VTgrey] errorCode=$errorCode; errorInfo=$errorInfo" } set sock_lobby {} --- 646,651 ---- if {[catch {eval $sock_lobby}]} { global errorCode errorInfo ! switch -regexp -- $errorInfo {"^missing close-brace" {continue}} ! error_dump } set sock_lobby {} *************** *** 1033,1039 **** super set @selected? 0 ! set @ninlets 1 ! set @noutlets 0 ! set @duplicate 0 set @ioselect {} } --- 1029,1035 ---- super set @selected? 0 ! set @ninlets 1 ;# should be in Box init ! set @noutlets 0 ;# should be in Box init ! set @canvas "" set @ioselect {} } *************** *** 1183,1187 **** def Client audio_off {} {pd pd dsp 0} def Client clipboard_view {} {ClipboardDialog new} ! def Client history_view {} { HistoryDialog new} def Client do_what_i_mean {} {wonder}
--- 1179,1183 ---- def Client audio_off {} {pd pd dsp 0} def Client clipboard_view {} {ClipboardDialog new} ! def Client history_view {} {global history; HistoryDialog new $history} def Client do_what_i_mean {} {wonder}
*************** *** 1259,1262 **** --- 1255,1259 ---- global pd_opendir pd_tearoff OS cmdline canvas history manager window_list lappend window_list $self + set @mapped 0 super {#X obj 666 666 pd} ;# bogus $self reinit $mess *************** *** 1316,1330 **** set args [lrange $mess 6 end] switch [llength $args] { ! 1 {set @subpatch 0; mset {@fontsize} $args; set @name ""; set @mapped 1} 2 {set @subpatch 1; mset {@name @mapped} $args; set @fontsize "what?"} default {error "wrong number of arguments (expecting 5 or 6, got [expr 4+[llength $args]])"} } } ! "#X" { # this is restore ! set @x1 [lindex $mess 2] ! set @y1 [lindex $mess 3] ! $self text= [lrange $mess 4 end] } } }
--- 1313,1344 ---- set args [lrange $mess 6 end] switch [llength $args] { ! 1 { ! set @subpatch 0 ! mset {@fontsize} $args ! set @name "" ! set @mapped 1 ! puts "mapped = $@mapped" ! } 2 {set @subpatch 1; mset {@name @mapped} $args; set @fontsize "what?"} default {error "wrong number of arguments (expecting 5 or 6, got [expr 4+[llength $args]])"} } } ! "#X" { ! switch -- [lindex $mess 1] { ! obj {} ! restore { ! set @x1 [lindex $mess 2] ! set @y1 [lindex $mess 3] ! $self text= [lrange $mess 4 end] ! } ! coords { ! error what do i do with this? ! } ! } } + "" {return} + default {error "huh? mess=$mess"} } + puts "mapped = $@mapped" }
*************** *** 1589,1593 ****
def TextBox init {mess} { ! super set @edit 0 set @x1 [lindex $mess 2] --- 1603,1607 ----
def TextBox init {mess} { ! super $mess set @edit 0 set @x1 [lindex $mess 2] *************** *** 1670,1673 **** --- 1684,1688 ---- def TextBox update_size {} { global font + if {$@canvas == ""} {puts "update_size: this textbox has no canvas, try again later"; return} set n [string length $@text] set c [$@canvas widget] *************** *** 6160,6164 **** def HistoryDialog delete {} { super ! $@clipboard unsubscribe $self }
--- 6175,6179 ---- def HistoryDialog delete {} { super ! $@history unsubscribe $self }