Changeset 986 for trunk/tkcon

Timestamp:

Apr 21, 2010 2:42:21 PM (14 years ago)

Author:

toby

Message:

tkcon fixes; implement gnome-terminal if xterm is not found

Location:

trunk/tkcon

Files:

• pkgIndex.tcl (added)
• tkcon.tcl (modified) (126 diffs)

trunk/tkcon/tkcon.tcl

@@ -11 +11 @@
 ##
 ## Thanks to the following (among many) for early bug reports & code ideas:
-## Steven Wahl <steven@indra.com>, Jan Nijtmans <nijtmans@nici.kun.nl>
-## Crimmins <markcrim@umich.edu>, Wart <wart@ugcs.caltech.edu>
+## Steven Wahl, Jan Nijtmans, Mark Crimmins, Wart
 ##
-## Copyright 1995-2001 Jeffrey Hobbs
+## Copyright (c) 1995-2004 Jeffrey Hobbs, jeff(a)hobbs(.)org
 ## Initiated: Thu Aug 17 15:36:47 PDT 1995
-##
-## jeff.hobbs@acm.org, jeff@hobbs.org
 ##
 ## source standard_disclaimer.tcl
@@ -25 +22 @@
 # Proxy support for retrieving the current version of Tkcon.
 #
-# Mon Jun 25 12:19:56 2001 - Pat Thoyts <Pat.Thoyts@bigfoot.com>
+# Mon Jun 25 12:19:56 2001 - Pat Thoyts
 #
 # In your tkcon.cfg or .tkconrc file put your proxy details into the
@@ -45 +42 @@
     return -code error "tkcon requires at least Tcl/Tk8"
 } else {
-    package require -exact Tk $tcl_version
-}
-
-catch {package require bogus-package-name}
+#    package require -exact Tk $tcl_version; # exact causes a problem with Tk 8.5+
+    package require Tk $tcl_version
+}
+
+# We need to load some package to get what's available, and we
+# choose ctext because we'll use it if its available in the editor
+catch {package require ctext}
 foreach pkg [info loaded {}] {
     set file [lindex $pkg 0]
@@ -75 +75 @@
 #
 namespace eval ::tkcon {
+    # when modifying this line, make sure that the auto-upgrade check
+    # for version still works.
+    variable VERSION "2.4"
     # The OPT variable is an array containing most of the optional
     # info to configure.  COLOR has the color data.
@@ -83 +86 @@
     variable PRIV
     set PRIV(WWW) [info exists embed_args]
+
+    variable EXPECT 0
 }
 
@@ -90 +95 @@
 # Outputs:      errors found in tkcon's resource file
 ##
-proc ::tkcon::Init {} {
+proc ::tkcon::Init {args} {
+    variable VERSION
     variable OPT
     variable COLOR
     variable PRIV
-    global tcl_platform env argc argv tcl_interactive errorInfo
-
-    if {![info exists argv]} {
-        set argv {}
-        set argc 0
-    }
+    global tcl_platform env tcl_interactive errorInfo
 
     set tcl_interactive 1
-
-    if {[info exists PRIV(name)]} {
-        set title $PRIV(name)
-    } else {
-        MainInit
-        # some main initialization occurs later in this proc,
-        # to go after the UI init
-        set MainInit 1
-        set title Main
-    }
+    set argc [llength $args]
 
     ##
@@ -135 +127 @@
     }
 
+    # expandorder could also include 'Xotcl' (before Procname)
     foreach {key default} {
         autoload        {}
@@ -140 +133 @@
         blinkrange      1
         buffer          512
+        maxlinelen      0
         calcmode        0
         cols            80
         debugPrompt     {(level \#$level) debug [history nextid] > }
         dead            {}
+        edit            edit
         expandorder     {Pathname Variable Procname}
         font            {}
@@ -152 +147 @@
         lightcmd        1
         maineval        {}
-        maxmenu         15
+        maxmenu         18
         nontcl          0
         prompt1         {ignore this, it's set below}
@@ -159 +154 @@
         showmenu        1
         showmultiple    1
-        showstatusbar   0
+        showstatusbar   1
         slaveeval       {}
         slaveexit       close
@@ -165 +160 @@
         gc-delay        60000
         gets            {congets}
+        overrideexit    1
         usehistory      1
 
@@ -190 +186 @@
         find,reg        0
         errorInfo       {}
+        protocol        exit
         showOnStartup   1
-        slavealias      { edit more less tkcon }
         slaveprocs      {
             alias clear dir dump echo idebug lremove
             tkcon_puts tkcon_gets observe observe_var unalias which what
         }
-        version         2.3
-        RCS             {RCS: @(#) $Id: tkcon.tcl,v 1.52 2002/01/24 19:50:36 hobbs Exp $}
-        HEADURL         {http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tkcon/tkcon/tkcon.tcl?rev=HEAD}
+        RCS             {RCS: @(#) $Id: tkcon.tcl,v 1.89 2005/09/12 19:07:17 hobbs Exp $}
+        HEADURL         {http://cvs.sourceforge.net/viewcvs.py/*checkout*/tkcon/tkcon/tkcon.tcl?rev=HEAD}
+
         docs            "http://tkcon.sourceforge.net/"
-        email           {jeff@hobbs.org}
+        email           {jeff(a)hobbs(.)org}
         root            .
+        uid             0
+        tabs            {}
     } {
         if {![info exists PRIV($key)]} { set PRIV($key) $default }
+    }
+    foreach {key default} {
+        slavealias      { $OPT(edit) more less tkcon }
+    } {
+        if {![info exists PRIV($key)]} { set PRIV($key) [subst $default] }
+    }
+    set PRIV(version) $VERSION
+
+    option add *Menu.tearOff 0
+    option add *takeFocus 0
+
+    if {[info exists PRIV(name)]} {
+        set title $PRIV(name)
+    } else {
+        MainInit
+        # some main initialization occurs later in this proc,
+        # to go after the UI init
+        set MainInit 1
+        set title Main
     }
 
@@ -254 +271 @@
     }
     if {[info exists env($envHome)]} {
+        set home $env($envHome)
+        if {[file pathtype $home] == "volumerelative"} {
+            # Convert 'C:' to 'C:/' if necessary, innocuous otherwise
+            append home /
+        }
         if {![info exists PRIV(rcfile)]} {
-            set PRIV(rcfile)    [file join $env($envHome) $rcfile]
+            set PRIV(rcfile)    [file join $home $rcfile]
         }
         if {![info exists PRIV(histfile)]} {
-            set PRIV(histfile)  [file join $env($envHome) $histfile]
+            set PRIV(histfile)  [file join $home $histfile]
         }
     }
@@ -264 +286 @@
     ## Handle command line arguments before sourcing resource file to
     ## find if resource file is being specified (let other args pass).
-    if {[set i [lsearch -exact $argv -rcfile]] != -1} {
-        set PRIV(rcfile) [lindex $argv [incr i]]
+    if {[set i [lsearch -exact $args -rcfile]] != -1} {
+        set PRIV(rcfile) [lindex $args [incr i]]
     }
 
@@ -274 +296 @@
     if {[info exists env(TK_CON_LIBRARY)]} {
         lappend ::auto_path $env(TK_CON_LIBRARY)
-    } else {
+    } elseif {$OPT(library) != ""} {
         lappend ::auto_path $OPT(library)
     }
@@ -293 +315 @@
     set truth {^(1|yes|true|on)$}
     for {set i 0} {$i < $argc} {incr i} {
-        set arg [lindex $argv $i]
+        set arg [lindex $args $i]
         if {[string match {-*} $arg]} {
-            set val [lindex $argv [incr i]]
+            set val [lindex $args [incr i]]
             ## Handle arg based options
             switch -glob -- $arg {
-                -- - -argv      {
+                -- - -argv - -args {
                     set argv [concat -- [lrange $argv $i end]]
                     set argc [llength $argv]
@@ -322 +344 @@
 
     ## Create slave executable
-    if {[string compare {} $OPT(exec)]} {
+    if {"" != $OPT(exec)} {
         uplevel \#0 ::tkcon::InitSlave $OPT(exec) $slaveargs
     } else {
         set argc [llength $slaveargs]
-        set argv $slaveargs
+        set args $slaveargs
         uplevel \#0 $slaveargs
     }
@@ -333 +355 @@
     Attach $PRIV(appname) $PRIV(apptype)
     InitUI $title
+    if {"" != $OPT(exec)} {
+        # override exit to DeleteTab now that tab has been created
+        $OPT(exec) alias exit ::tkcon::DeleteTab $PRIV(curtab) $OPT(exec)
+    }
 
     ## swap puts and gets with the tkcon versions to make sure all
@@ -407 +433 @@
     StateCheckpoint $PRIV(name) slave
 
+    puts "buffer line limit:\
+        [expr {$OPT(buffer)?$OPT(buffer):{unlimited}}]  \
+        max line length:\
+        [expr {$OPT(maxlinelen)?$OPT(maxlinelen):{unlimited}}]"
+
     Prompt "$title console display active (Tcl$::tcl_patchLevel / Tk$::tk_patchLevel)\n"
 }
@@ -420 +451 @@
     variable COLOR
     variable PRIV
-    global argv0 tcl_interactive tcl_library env auto_path
+    global argv0 tcl_interactive tcl_library env auto_path tk_library
 
     if {[string match {} $slave]} {
@@ -431 +462 @@
         $slave alias open SafeOpen $slave
         $slave alias file file
-        interp eval $slave [dump var -nocomplain tcl_library auto_path env]
+        interp eval $slave \
+            [list set auto_path [lremove $auto_path $tk_library]]
+        interp eval $slave [dump var -nocomplain tcl_library env]
         interp eval $slave { catch {source [file join $tcl_library init.tcl]} }
         interp eval $slave { catch unknown }
     }
+    # This will likely be overridden to call DeleteTab where possible
     $slave alias exit exit
     interp eval $slave {
@@ -451 +485 @@
     if {[info exists argv0]} {interp eval $slave [list set argv0 $argv0]}
     interp eval $slave set tcl_interactive $tcl_interactive \; \
-            set auto_path [list $auto_path] \; \
+            set auto_path [list [lremove $auto_path $tk_library]] \; \
             set argc [llength $args] \; \
             set argv  [list $args] \; {
@@ -499 +533 @@
             }
             interp {
-                set thistkcon [tk appname]
+                set thistkcon [::send::appname]
                 foreach cmd $PRIV(slavealias) {
-                    EvalAttached "proc $cmd args { send [list $thistkcon] $cmd \$args }"
+                    EvalAttached "proc $cmd args { ::send::send [list $thistkcon] $cmd \$args }"
                 }
             }
@@ -542 +576 @@
     if {!$PRIV(WWW)} {
         wm withdraw $root
-        wm protocol $root WM_DELETE_WINDOW exit
+        wm protocol $root WM_DELETE_WINDOW $PRIV(protocol)
     }
     set PRIV(base) $w
 
-    ## Text Console
-    set PRIV(console) [set con $w.text]
-    text $con -wrap char -yscrollcommand [list $w.sy set] \
-            -foreground $COLOR(stdin) \
-            -insertbackground $COLOR(cursor)
+    catch {font create tkconfixed -family Courier -size -12}
+    catch {font create tkconfixedbold -family Courier -size -12 -weight bold}
+
+    set PRIV(statusbar) [set sbar [frame $w.fstatus]]
+    set PRIV(tabframe)  [frame $sbar.tabs]
+    set PRIV(X) [button $sbar.deltab -text "X" -command ::tkcon::DeleteTab \
+                     -activeforeground red -fg red -font tkconfixedbold \
+                     -highlightthickness 0 -padx 2 -pady 0 -bd 1 \
+                     -state disabled -relief flat]
+    catch {$PRIV(X) configure -overrelief raised}
+    label $sbar.cursor -relief sunken -bd 1 -anchor e -width 6 \
+            -textvariable ::tkcon::PRIV(StatusCursor)
+    set padx [expr {![info exists ::tcl_platform(os)]
+                    || ![string match "Windows CE" $::tcl_platform(os)]}]
+    grid $PRIV(X) $PRIV(tabframe) $sbar.cursor -sticky news -padx $padx
+    grid configure $PRIV(tabframe) -sticky nsw
+    grid configure $PRIV(X) -pady 0 -padx 0
+    grid columnconfigure $sbar 1 -weight 1
+    grid rowconfigure $sbar 0 -weight 1
+    grid rowconfigure $PRIV(tabframe) 0 -weight 1
+    if {$::tcl_version >= 8.4 && [tk windowingsystem] == "aqua"} {
+        # resize control space
+        grid columnconfigure $sbar [lindex [grid size $sbar] 0] -minsize 16
+    }
+
+    ## Create console tab
+    set con [InitTab $w]
+    set PRIV(curtab) $con
+
+    # Only apply this for the first console
+    $con configure -setgrid 1 -width $OPT(cols) -height $OPT(rows)
+    bind $PRIV(root) <Configure> {
+        if {"%W" == $::tkcon::PRIV(root)} {
+            scan [wm geometry [winfo toplevel %W]] "%%dx%%d" \
+                ::tkcon::OPT(cols) ::tkcon::OPT(rows)
+            if {[info exists ::tkcon::EXP(spawn_id)]} {
+                catch {stty rows $::tkcon::OPT(rows) columns \
+                           $::tkcon::OPT(cols) < $::tkcon::EXP(slave,name)}
+            }
+        }
+    }
+
+    # scrollbar
+    set sy [scrollbar $w.sy -takefocus 0 -bd 1 -command [list $con yview]]
+    if {!$PRIV(WWW) && [string match "Windows CE" $::tcl_platform(os)]} {
+        $w.sy configure -width 10
+    }
+
+    $con configure -yscrollcommand [list $sy set]
+    set PRIV(console) $con
+    set PRIV(scrolly) $sy
+
+    ## Menus
+    ## catch against use in plugin
+    if {[catch {menu $w.mbar} PRIV(menubar)]} {
+        set PRIV(menubar) [frame $w.mbar -relief raised -bd 1]
+    }
+
+    InitMenus $PRIV(menubar) $title
+    Bindings
+
+    if {$OPT(showmenu)} {
+        $root configure -menu $PRIV(menubar)
+    }
+
+    grid $con  -row 1 -column 1 -sticky news
+    grid $sy   -row 1 -column [expr {$OPT(scrollypos)=="left"?0:2}] -sticky ns
+    grid $sbar -row 2 -column 0 -columnspan 3 -sticky ew
+
+    grid columnconfigure $root 1 -weight 1
+    grid rowconfigure    $root 1 -weight 1
+
+    if {!$OPT(showstatusbar)} {
+        grid remove $sbar
+    }
+
+    if {!$PRIV(WWW)} {
+        wm title $root "tkcon $PRIV(version) $title"
+        if {$PRIV(showOnStartup)} { wm deiconify $root }
+    }
+    if {$PRIV(showOnStartup)} { focus -force $PRIV(console) }
+    if {$OPT(gc-delay)} {
+        after $OPT(gc-delay) ::tkcon::GarbageCollect
+    }
+}
+
+proc ::tkcon::InitTab {w} {
+    variable OPT
+    variable PRIV
+    variable COLOR
+    variable ATTACH
+
+    # text console
+    set con $w.tab[incr PRIV(uid)]
+    text $con -wrap char -foreground $COLOR(stdin) \
+        -insertbackground $COLOR(cursor)
     $con mark set output 1.0
     $con mark set limit 1.0
@@ -560 +685 @@
         ## Set user-requested font, if any
         $con configure -font $OPT(font)
-    } else {
+    } elseif {[string compare unix $::tcl_platform(platform)]} {
         ## otherwise make sure the font is monospace
         set font [$con cget -font]
         if {![font metrics $font -fixed]} {
-            font create tkconfixed -family Courier -size 12
             $con configure -font tkconfixed
         }
+    } else {
+        $con configure -font tkconfixed
     }
     set OPT(font) [$con cget -font]
+    bindtags $con [list $con TkConsole TkConsolePost $PRIV(root) all]
+
+    # scrollbar
     if {!$PRIV(WWW)} {
-        $con configure -setgrid 1 -width $OPT(cols) -height $OPT(rows)
-    }
-    bindtags $con [list $con TkConsole TkConsolePost $root all]
-    ## Menus
-    ## catch against use in plugin
-    if {[catch {menu $w.mbar} PRIV(menubar)]} {
-        set PRIV(menubar) [frame $w.mbar -relief raised -bd 1]
-    }
-    ## Scrollbar
-    set PRIV(scrolly) [scrollbar $w.sy -takefocus 0 -bd 1 \
-            -command [list $con yview]]
-
-    InitMenus $PRIV(menubar) $title
-    Bindings
-
-    if {$OPT(showmenu)} {
-        $root configure -menu $PRIV(menubar)
-    }
-    pack $w.sy -side $OPT(scrollypos) -fill y
-    pack $con -fill both -expand 1
-
-    set PRIV(statusbar) [set sbar [frame $w.sbar]]
-    label $sbar.attach -relief sunken -bd 1 -anchor w \
-            -textvariable ::tkcon::PRIV(StatusAttach)
-    label $sbar.mode -relief sunken -bd 1 -anchor w  \
-            -textvariable ::tkcon::PRIV(StatusMode)
-    label $sbar.cursor -relief sunken -bd 1 -anchor w -width 6 \
-            -textvariable ::tkcon::PRIV(StatusCursor)
-    grid $sbar.attach $sbar.mode $sbar.cursor -sticky news -padx 1
-    grid columnconfigure $sbar 0 -weight 1
-    grid columnconfigure $sbar 1 -weight 1
-    grid columnconfigure $sbar 2 -weight 0
-
-    if {$OPT(showstatusbar)} {
-        pack $sbar -side bottom -fill x -before $::tkcon::PRIV(scrolly)
-    }
+        if {[string match "Windows CE" $::tcl_platform(os)]} {
+            font configure tkconfixed -family Tahoma -size 8
+            $con configure -font tkconfixed -bd 0 -padx 0 -pady 0
+            set cw [font measure tkconfixed "0"]
+            set ch [font metrics tkconfixed -linespace]
+            set sw [winfo screenwidth $con]
+            set sh [winfo screenheight $con]
+            # We need the magic hard offsets until I find a way to
+            # correctly assume size
+            if {$cw*($OPT(cols)+2) > $sw} {
+                set OPT(cols) [expr {($sw / $cw) - 2}]
+            }
+            if {$ch*($OPT(rows)+3) > $sh} {
+                set OPT(rows) [expr {($sh / $ch) - 3}]
+            }
+            # Place it so that the titlebar underlaps the CE titlebar
+            wm geometry $PRIV(root) +0+0
+        }
+    }
+    $con configure -height $OPT(rows) -width $OPT(cols)
 
     foreach col {prompt stdout stderr stdin proc} {
@@ -615 +728 @@
     $con tag configure find -background $COLOR(blink)
 
-    if {!$PRIV(WWW)} {
-        wm title $root "tkcon $PRIV(version) $title"
-        bind $con <Configure> {
-            scan [wm geometry [winfo toplevel %W]] "%%dx%%d" \
-                    ::tkcon::OPT(cols) ::tkcon::OPT(rows)
-        }
-        if {$PRIV(showOnStartup)} { wm deiconify $root }
-    }
-    if {$PRIV(showOnStartup)} { focus -force $PRIV(console) }
-    if {$OPT(gc-delay)} {
-        after $OPT(gc-delay) ::tkcon::GarbageCollect
-    }
+    set ATTACH($con) [Attach]
+    set rb [radiobutton $PRIV(tabframe).cb[winfo name $con] \
+                -textvariable ::tkcon::ATTACH($con) \
+                -selectcolor white -relief sunken \
+                -indicatoron 0 -padx 0 -pady 0 -bd 1 \
+                -variable ::tkcon::PRIV(curtab) -value $con \
+                -command [list ::tkcon::GotoTab $con]]
+    if {$::tcl_version >= 8.4} {
+        $rb configure -offrelief flat -overrelief raised
+    }
+    grid $rb -row 0 -column [lindex [grid size $PRIV(tabframe)] 0] -sticky ns
+    grid $con -row 1 -column 1 -sticky news
+
+    lappend PRIV(tabs) $con
+    return $con
+}
+
+proc ::tkcon::GotoTab {con} {
+    variable PRIV
+    variable ATTACH
+
+    set numtabs [llength $PRIV(tabs)]
+    #if {$numtabs == 1} { return }
+
+    if {[regexp {^[0-9]+$} $con]} {
+        set curtab [lsearch -exact $PRIV(tabs) $PRIV(console)]
+        set nexttab [expr {$curtab + $con}]
+        if {$nexttab >= $numtabs} {
+            set nexttab 0
+        } elseif {$nexttab < 0} {
+            set nexttab "end"
+        }
+        set con [lindex $PRIV(tabs) $nexttab]
+    } elseif {$con == $PRIV(console)} {
+        return
+    }
+
+    # adjust console
+    if {[winfo exists $PRIV(console)]} {
+        lower $PRIV(console)
+        $PRIV(console) configure -yscrollcommand {}
+        set ATTACH($PRIV(console)) [Attach]
+    }
+    set PRIV(console) $con
+    $con configure -yscrollcommand [list $PRIV(scrolly) set]
+    $PRIV(scrolly) configure -command [list $con yview]
+
+    # adjust attach
+    eval [linsert $ATTACH($con) 0 Attach]
+
+    set PRIV(curtab) $con
+
+    raise $con
+
+    if {[$con compare 1.0 == end-1c]} {
+        Prompt
+    }
+
+    # set StatusCursor
+    set PRIV(StatusCursor) [$con index insert]
+
+    focus -force $con
+}
+
+proc ::tkcon::NewTab {{con {}}} {
+    variable PRIV
+    variable ATTACH
+
+    set con   [InitTab $PRIV(base)]
+    set slave [interp create Slave[GetSlaveNum]]
+    InitSlave $slave
+    $slave alias exit ::tkcon::DeleteTab $con $slave
+    set ATTACH($con) [list $slave slave]
+    $PRIV(X) configure -state normal
+    MenuConfigure Console "Delete Tab" -state normal
+    GotoTab $con
+}
+
+# The extra code arg is for the alias of exit to this function
+proc ::tkcon::DeleteTab {{con {}} {slave {}} {code 0}} {
+    variable PRIV
+
+    set numtabs [llength $PRIV(tabs)]
+    if {$numtabs <= 2} {
+        $PRIV(X) configure -state disabled
+        MenuConfigure Console "Delete Tab" -state disabled
+    }
+    if {$numtabs == 1} {
+        # in the master, it should do the right thing
+        # currently the first master still exists - need rearch to fix
+        exit
+        # we might end up here, depending on how exit is rerouted
+        return
+    }
+
+    if {$con == ""} {
+        set con $PRIV(console)
+    }
+    catch {unset ATTACH($con)}
+    set curtab  [lsearch -exact $PRIV(tabs) $con]
+    set PRIV(tabs) [lreplace $PRIV(tabs) $curtab $curtab]
+
+    set numtabs [llength $PRIV(tabs)]
+    set nexttab $curtab
+    if {$nexttab >= $numtabs} {
+        set nexttab end
+    }
+    set nexttab [lindex $PRIV(tabs) $nexttab]
+
+    GotoTab $nexttab
+
+    if {$slave != "" && $slave != $::tkcon::OPT(exec)} {
+        interp delete $slave
+    }
+    destroy $PRIV(tabframe).cb[winfo name $con]
+    destroy $con
 }
 
@@ -635 +852 @@
     variable PRIV
 
-    set w $PRIV(console)
-    ## Remove error tags that no longer span anything
-    ## Make sure the tag pattern matches the unique tag prefix
-    foreach tag [$w tag names] {
-        if {[string match _tag* $tag] && ![llength [$w tag ranges $tag]]} {
-            $w tag delete $tag
+    foreach w $PRIV(tabs) {
+        if {[winfo exists $w]} {
+            ## Remove error tags that no longer span anything
+            ## Make sure the tag pattern matches the unique tag prefix
+            foreach tag [$w tag names] {
+                if {[string match _tag* $tag]
+                    && ![llength [$w tag ranges $tag]]} {
+                    $w tag delete $tag
+                }
+            }
         }
     }
@@ -666 +887 @@
         EvalCmd $w $last
     }
-    $w see insert
+    if {[winfo exists $w]} {
+        $w see insert
+    }
 }
 
@@ -686 +909 @@
             set ev [EvalSlave history nextid]
             incr ev -1
+            ## FIX: calcmode doesn't work with requesting history events
             if {[string match !! $cmd]} {
                 set code [catch {EvalSlave history event $ev} cmd]
@@ -703 +927 @@
                 }
             } elseif {$OPT(calcmode) && ![catch {expr $cmd} err]} {
-                EvalSlave history add $cmd
+                AddSlaveHistory $cmd
                 set cmd $err
                 set code -1
@@ -736 +960 @@
                 }
             }
-            EvalSlave history add $cmd
+            if {![winfo exists $w]} {
+                # early abort - must be a deleted tab
+                return
+            }
+            AddSlaveHistory $cmd
+            catch {EvalAttached [list set _ $res]}
+            set maxlen $OPT(maxlinelen)
+            set trailer ""
+            if {($maxlen > 0) && ([string length $res] > $maxlen)} {
+                # If we exceed maximum desired output line length, truncate
+                # the result and add "...+${num}b" in error coloring
+                set trailer ...+[expr {[string length $res]-$maxlen}]b
+                set res [string range $res 0 $maxlen]
+            }
             if {$code} {
                 if {$OPT(hoterrors)} {
                     set tag [UniqueTag $w]
-                    $w insert output $res [list stderr $tag] \n stderr
+                    $w insert output $res [list stderr $tag] \n$trailer stderr
                     $w tag bind $tag <Enter> \
                             [list $w tag configure $tag -under 1]
@@ -747 +984 @@
                     $w tag bind $tag <ButtonRelease-1> \
                             "if {!\[info exists tkPriv(mouseMoved)\] || !\$tkPriv(mouseMoved)} \
-                            {[list edit -attach [Attach] -type error -- $PRIV(errorInfo)]}"
+                            {[list $OPT(edit) -attach [Attach] -type error -- $PRIV(errorInfo)]}"
                 } else {
-                    $w insert output $res\n stderr
+                    $w insert output $res\n$trailer stderr
                 }
             } elseif {[string compare {} $res]} {
-                $w insert output $res\n stdout
+                $w insert output $res stdout $trailer stderr \n stdout
             }
         }
@@ -778 +1015 @@
         return [Slave $app $args]
     } else {
-        return [uplevel 1 send [list $app] $args]
+        return [uplevel 1 ::send::send [list $app] $args]
+    }
+}
+
+## ::tkcon::AddSlaveHistory - 
+## Command is added to history only if different from previous command.
+## This also doesn't cause the history id to be incremented, although the
+## command will be evaluated.
+# ARGS: cmd     - command to add
+##
+proc ::tkcon::AddSlaveHistory cmd {
+    set ev [EvalSlave history nextid]
+    incr ev -1
+    set code [catch {EvalSlave history event $ev} lastCmd]
+    if {$code || [string compare $cmd $lastCmd]} {
+        EvalSlave history add $cmd
     }
 }
@@ -793 +1045 @@
 
     if {$PRIV(deadapp)} {
-        if {[lsearch -exact [winfo interps] $PRIV(app)]<0} {
+        if {[lsearch -exact [::send::interps] $PRIV(app)]<0} {
             return
         } else {
@@ -801 +1053 @@
         }
     }
-    set code [catch {send -displayof $PRIV(displayWin) $PRIV(app) $cmd} result]
-    if {$code && [lsearch -exact [winfo interps] $PRIV(app)]<0} {
+    set code [catch {::send::send -displayof $PRIV(displayWin) $PRIV(app) $cmd} result]
+    if {$code && [lsearch -exact [::send::interps] $PRIV(app)]<0} {
         ## Interpreter disappeared
         if {[string compare leave $OPT(dead)] && \
                 ([string match ignore $OPT(dead)] || \
-                [tk_dialog $PRIV(base).dead "Dead Attachment" \
-                "\"$PRIV(app)\" appears to have died.\
-                \nReturn to primary slave interpreter?" questhead 0 OK No])} {
+                     [tk_messageBox -title "Dead Attachment" -type yesno \
+                          -icon info -message \
+                          "\"$PRIV(app)\" appears to have died.\
+                \nReturn to primary slave interpreter?"]=="no")} {
             set PRIV(appname) "DEAD:$PRIV(appname)"
             set PRIV(deadapp) 1
@@ -854 +1107 @@
         ## Interpreter died or disappeared
         puts "$code eof [eof $PRIV(app)]"
-        EvalSocketClosed
+        EvalSocketClosed $PRIV(app)
     }
     return -code $code $result
@@ -865 +1118 @@
 # Returns:      the result of the command
 ##
-proc ::tkcon::EvalSocketEvent {} {
+proc ::tkcon::EvalSocketEvent {sock} {
     variable PRIV
 
-    if {[gets $PRIV(app) line] == -1} {
-        if {[eof $PRIV(app)]} {
-            EvalSocketClosed
+    if {[gets $sock line] == -1} {
+        if {[eof $sock]} {
+            EvalSocketClosed $sock
         }
         return
@@ -882 +1135 @@
 # Returns:      the result of the command
 ##
-proc ::tkcon::EvalSocketClosed {} {
+proc ::tkcon::EvalSocketClosed {sock} {
     variable OPT
     variable PRIV
 
-    catch {close $PRIV(app)}
+    catch {close $sock}
+    if {![string match $sock $PRIV(app)]} {
+        # If we are not still attached to that socket, just return.
+        # Might be nice to tell the user the socket closed ...
+        return
+    }
     if {[string compare leave $OPT(dead)] && \
             ([string match ignore $OPT(dead)] || \
-            [tk_dialog $PRIV(base).dead "Dead Attachment" \
-            "\"$PRIV(app)\" appears to have died.\
-            \nReturn to primary slave interpreter?" questhead 0 OK No])} {
+                 [tk_messageBox -title "Dead Attachment" -type yesno \
+                      -icon question \
+                      -message "\"$PRIV(app)\" appears to have died.\
+            \nReturn to primary slave interpreter?"] == "no")} {
         set PRIV(appname) "DEAD:$PRIV(appname)"
         set PRIV(deadapp) 1
@@ -1014 +1273 @@
 ## 
 proc ::tkcon::ConstrainBuffer {w size} {
-    if {[$w index end] > $size} {
+    if {$size && ([$w index end] > $size)} {
         $w delete 1.0 [expr {int([$w index end])-$size}].0
     }
@@ -1028 +1287 @@
 
     set w $PRIV(console)
+    if {![winfo exists $w]} { return }
     if {[string compare {} $pre]} { $w insert end $pre stdout }
     set i [$w index end-1c]
@@ -1052 +1312 @@
     $w see end
 }
+proc ::tkcon::RePrompt {{pre {}} {post {}} {prompt {}}} {
+    # same as prompt, but does nothing for those actions where we
+    # only wanted to refresh the prompt on attach change when the
+    # statusbar is showing (which carries that info instead)
+    variable OPT
+    if {!$OPT(showstatusbar)} {
+        Prompt $pre $post $prompt
+    }
+}
 
 ## ::tkcon::About - gives about info for tkcon
@@ -1061 +1330 @@
 
     set w $PRIV(base).about
-    if {[winfo exists $w]} {
-        wm deiconify $w
-    } else {
+    if {![winfo exists $w]} {
         global tk_patchLevel tcl_patchLevel tcl_version
         toplevel $w
+        wm withdraw $w
+        wm transient $w $PRIV(root)
+        wm group $w $PRIV(root)
         wm title $w "About tkcon v$PRIV(version)"
         button $w.b -text Dismiss -command [list wm withdraw $w]
@@ -1079 +1349 @@
         regexp {,v ([0-9\./: ]*)} $PRIV(RCS) -> RCS
         $w.text insert 1.0 "About tkcon v$PRIV(version)" title \
-                "\n\nCopyright 1995-2001 Jeffrey Hobbs, $PRIV(email)\
+                "\n\nCopyright 1995-2002 Jeffrey Hobbs, $PRIV(email)\
                 \nRelease Info: v$PRIV(version), CVS v$RCS\
                 \nDocumentation available at:\n$PRIV(docs)\
                 \nUsing: Tcl v$tcl_patchLevel / Tk v$tk_patchLevel" center
         $w.text config -state disabled
-    }
+        bind $w <Escape> [list destroy $w]
+    }
+    wm deiconify $w
 }
 
@@ -1096 +1368 @@
     global tcl_platform
 
-    if {[catch {menu $w.pop -tearoff 0}]} {
+    if {[catch {menu $w.pop}]} {
         label $w.label -text "Menus not available in plugin mode"
-        pack $w.label
+        grid $w.label -sticky ew
         return
     }
-    menu $w.context -tearoff 0 -disabledforeground $COLOR(disabled)
+    menu $w.context -disabledforeground $COLOR(disabled)
     set PRIV(context) $w.context
     set PRIV(popup) $w.pop
@@ -1108 +1380 @@
         $w add cascade -label $m -underline 0 -menu $w.$l
         return $w.$l
+    }
+    proc MenuConfigure {m l args} {
+        variable PRIV
+        eval [list $PRIV(menubar).[string tolower $m] entryconfigure $l] $args
+        eval [list $PRIV(popup).[string tolower $m] entryconfigure $l] $args
     }
 
@@ -1128 +1405 @@
         ##
         set s $m.save
-        menu $s -disabledforeground $COLOR(disabled) -tearoff 0
+        menu $s -disabledforeground $COLOR(disabled)
         $s add command -label "All"     -underline 0 \
                 -command {::tkcon::Save {} all}
@@ -1148 +1425 @@
         $m add command -label "New Console"     -underline 0 -accel Ctrl-N \
                 -command ::tkcon::New
+        $m add command -label "New Tab"         -underline 4 -accel Ctrl-T \
+                -command ::tkcon::NewTab
+        $m add command -label "Delete Tab"      -underline 0 \
+                -command ::tkcon::DeleteTab -state disabled
         $m add command -label "Close Console"   -underline 0 -accel Ctrl-w \
                 -command ::tkcon::Destroy
@@ -1158 +1439 @@
         }
         $m add separator
-        $m add cascade -label "Attach To ..."   -underline 0 -menu $m.attach
+        $m add cascade -label "Attach To ..." -underline 0 -menu $m.attach
 
         ## Attach Console Menu
         ##
         set sub [menu $m.attach -disabledforeground $COLOR(disabled)]
-        $sub add cascade -label "Interpreter"   -underline 0 -menu $sub.apps
-        $sub add cascade -label "Namespace" -underline 1 -menu $sub.name
-        $sub add cascade -label "Socket" -underline 1 -menu $sub.sock \
-                -state [expr {([info tclversion] < 8.3)?"disabled":"normal"}]
+        $sub add cascade -label "Interpreter" -underline 0 -menu $sub.apps
+        $sub add cascade -label "Namespace"   -underline 0 -menu $sub.name
 
         ## Attach Console Menu
@@ -1175 +1454 @@
         ## Attach Namespace Menu
         ##
-        menu $sub.name -disabledforeground $COLOR(disabled) -tearoff 0 \
+        menu $sub.name -disabledforeground $COLOR(disabled) \
                 -postcommand [list ::tkcon::NamespaceMenu $sub.name]
 
         if {$::tcl_version >= 8.3} {
+            ## Attach Socket Menu
+            ##
             # This uses [file channels] to create the menu, so we only
             # want it for newer versions of Tcl.
-
-            ## Attach Socket Menu
+            $sub add cascade -label "Socket" -underline 0 -menu $sub.sock
+            menu $sub.sock -disabledforeground $COLOR(disabled) \
+                    -postcommand [list ::tkcon::SocketMenu $sub.sock]
+        }
+
+        if {![string compare "unix" $tcl_platform(platform)]} {
+            ## Attach Display Menu
             ##
-            menu $sub.sock -disabledforeground $COLOR(disabled) -tearoff 0 \
-                    -postcommand [list ::tkcon::SocketMenu $sub.sock]
-        }
-
-        ## Attach Display Menu
-        ##
-        if {![string compare "unix" $tcl_platform(platform)]} {
-            $sub add cascade -label "Display" -und 1 -menu $sub.disp
+            $sub add cascade -label "Display" -underline 0 -menu $sub.disp
             menu $sub.disp -disabledforeground $COLOR(disabled) \
-                    -tearoff 0 \
                     -postcommand [list ::tkcon::DisplayMenu $sub.disp]
         }
@@ -1230 +1508 @@
                 -underline 0 -variable ::tkcon::OPT(subhistory)
         $m add check -label "Hot Errors" \
-                -underline 0 -variable ::tkcon::OPT(hoterrors)
+                -underline 4 -variable ::tkcon::OPT(hoterrors)
         $m add check -label "Non-Tcl Attachments" \
                 -underline 0 -variable ::tkcon::OPT(nontcl)
@@ -1242 +1520 @@
                 {$::tkcon::OPT(showmenu) ? $::tkcon::PRIV(menubar) : {}}]}
         $m add check -label "Show Statusbar" \
-                -underline 5 -variable ::tkcon::OPT(showstatusbar) \
-                -command {
-            if {$::tkcon::OPT(showstatusbar)} {
-                pack $::tkcon::PRIV(statusbar) -side bottom -fill x \
-                        -before $::tkcon::PRIV(scrolly)
-            } else { pack forget $::tkcon::PRIV(statusbar) }
-        }
+            -underline 5 -variable ::tkcon::OPT(showstatusbar) \
+            -command {
+                if {$::tkcon::OPT(showstatusbar)} {
+                    grid $::tkcon::PRIV(statusbar)
+                } else { grid remove $::tkcon::PRIV(statusbar) }
+            }
         $m add cascade -label "Scrollbar" -underline 2 -menu $m.scroll
 
         ## Scrollbar Menu
         ##
-        set m [menu $m.scroll -tearoff 0]
+        set m [menu $m.scroll]
         $m add radio -label "Left" -value left \
                 -variable ::tkcon::OPT(scrollypos) \
-                -command { pack config $::tkcon::PRIV(scrolly) -side left }
+                -command { grid configure $::tkcon::PRIV(scrolly) -column 0 }
         $m add radio -label "Right" -value right \
                 -variable ::tkcon::OPT(scrollypos) \
-                -command { pack config $::tkcon::PRIV(scrolly) -side right }
+                -command { grid configure $::tkcon::PRIV(scrolly) -column 2 }
     }
 
@@ -1276 +1553 @@
         $m add command -label "Retrieve Latest Version" -underline 0 \
                 -command ::tkcon::Retrieve
+        if {![catch {package require ActiveTcl} ver]} {
+            set cmd ""
+            if {$tcl_platform(platform) == "windows"} {
+                package require registry
+                set ver [join [lrange [split $ver .] 0 3] .]
+                set key {HKEY_LOCAL_MACHINE\SOFTWARE\ActiveState\ActiveTcl}
+                if {![catch {registry get "$key\\$ver\\Help" ""} help]
+                    && [file exists $help]} {
+                    set cmd [list exec $::env(COMSPEC) /c start $help]
+                }
+            } elseif {$tcl_platform(os) == "Darwin"} {
+                set ver ActiveTcl-[join [lrange [split $ver .] 0 1] .]
+                set rsc "/Library/Frameworks/Tcl.framework/Resources"
+                set help "$rsc/English.lproj/$ver/index.html"
+                if {[file exists $help]} {
+                    set cmd [list exec open $help]
+                }
+            } elseif {$tcl_platform(platform) == "unix"} {
+                set help [file dirname [info nameofexe]]
+                append help /../html/index.html
+                if {[file exists $help]} {
+                    set cmd [list puts "Start $help"]
+                }
+            }
+            if {$cmd != ""} {
+                $m add separator
+                $m add command -label "ActiveTcl Help" -underline 10 \
+                    -command $cmd
+            }
+        }
     }
 }
@@ -1332 +1639 @@
     ##
     $w add separator
-    $w add cascade -label Packages -underline 0 -menu $w.pkg
-    set m $w.pkg
-    if {![winfo exists $m]} {
-        menu $m -tearoff no -disabledforeground $COLOR(disabled) \
-                -postcommand [list ::tkcon::PkgMenu $m $app $type]
-    }
+    $w add command -label "Manage Packages" -underline 0 \
+        -command [list ::tkcon::InterpPkgs $app $type]
 
     ## State Checkpoint/Revert
@@ -1359 +1662 @@
 ## with a list of all the applications that currently exist.
 ##
-proc ::tkcon::PkgMenu {m app type} {
+proc ::tkcon::InterpPkgs {app type} {
+    variable PRIV
+
+    set t $PRIV(base).interppkgs
+    if {![winfo exists $t]} {
+        toplevel $t
+        wm withdraw $t
+        wm title $t "$app Packages"
+        wm transient $t $PRIV(root)
+        wm group $t $PRIV(root)
+        bind $t <Escape> [list destroy $t]
+
+        label $t.ll -text "Loadable:" -anchor w
+        label $t.lr -text "Loaded:" -anchor w
+        listbox $t.loadable -bg white -bd 1 -font tkconfixed \
+            -yscrollcommand [list $t.llsy set] -selectmode extended
+        listbox $t.loaded -bg white -bd 1 -font tkconfixed \
+            -yscrollcommand [list $t.lrsy set]
+        scrollbar $t.llsy -bd 1 -command [list $t.loadable yview]
+        scrollbar $t.lrsy -bd 1 -command [list $t.loaded yview]
+        button $t.load -bd 1 -text ">>" \
+            -command [list ::tkcon::InterpPkgLoad $app $type $t.loadable]
+        if {$::tcl_version >= 8.4} {
+            $t.load configure -relief flat -overrelief raised
+        }
+
+        set f [frame $t.btns]
+        button $f.refresh -width 8 -text "Refresh" -command [info level 0]
+        button $f.dismiss -width 8 -text "Dismiss" -command [list destroy $t]
+        grid $f.refresh $f.dismiss -padx 4 -pady 3 -sticky ew
+
+        grid $t.ll x x $t.lr x -sticky ew
+        grid $t.loadable $t.llsy $t.load $t.loaded $t.lrsy -sticky news
+        grid $t.btns -sticky e -columnspan 5
+        grid columnconfigure $t {0 3} -weight 1
+        grid rowconfigure $t 1 -weight 1
+        grid configure $t.load -sticky ""
+
+        bind $t.loadable <Double-1> "[list $t.load invoke]; break"
+    }
+    $t.loaded delete 0 end
+    $t.loadable delete 0 end
+
     # just in case stuff has been added to the auto_path
     # we have to make sure that the errorInfo doesn't get screwed up
@@ -1368 +1713 @@
         unset __tkcon_error
     }
-    $m delete 0 end
+    # get all packages loaded into current interp
     foreach pkg [EvalAttached [list info loaded {}]] {
-        set loaded([lindex $pkg 1]) [package provide $pkg]
-    }
+        set pkg [lindex $pkg 1]
+        set loaded($pkg) [package provide $pkg]
+    }
+    # get all package names currently visible
     foreach pkg [lremove [EvalAttached {package names}] Tcl] {
         set version [EvalAttached [list package provide $pkg]]
@@ -1377 +1724 @@
             set loaded($pkg) $version
         } elseif {![info exists loaded($pkg)]} {
-            set loadable($pkg) [list package require $pkg]
-        }
-    }
+            set loadable($pkg) package
+        }
+    }
+    # get packages that are loaded in any interp
     foreach pkg [EvalAttached {info loaded}] {
         set pkg [lindex $pkg 1]
         if {![info exists loaded($pkg)] && ![info exists loadable($pkg)]} {
-            set loadable($pkg) [list load {} $pkg]
-        }
-    }
-    set npkg 0
+            set loadable($pkg) load
+        }
+    }
     foreach pkg [lsort -dictionary [array names loadable]] {
         foreach v [EvalAttached [list package version $pkg]] {
-            set brkcol [expr {([incr npkg]%16)==0}]
-            $m add command -label "Load $pkg ($v)" -command \
-                    "::tkcon::EvalOther [list $app] $type $loadable($pkg) $v" \
-                    -columnbreak $brkcol
-        }
-    }
-    if {[info exists loaded] && [info exists loadable]} {
-        $m add separator
+            $t.loadable insert end [list $pkg $v "($loadable($pkg))"]
+        }
     }
     foreach pkg [lsort -dictionary [array names loaded]] {
-        $m add command -label "${pkg}$loaded($pkg) Loaded" -state disabled
-    }
+        $t.loaded insert end [list $pkg $loaded($pkg)]
+    }
+
+    wm deiconify $t
+    raise $t
+}
+
+proc ::tkcon::InterpPkgLoad {app type lb} {
+    # load the lb entry items into the interp
+    foreach sel [$lb curselection] {
+        foreach {pkg ver method} [$lb get $sel] { break }
+        if {$method == "(package)"} {
+            set code [catch {::tkcon::EvalOther $app $type \
+                                 package require $pkg $ver} msg]
+        } elseif {$method == "(load)"} {
+            set code [catch {::tkcon::EvalOther $app $type load {} $pkg} msg]
+        } else {
+            set code 1
+            set msg "Incorrect entry in Loadable selection"
+        }
+        if {$code} {
+            tk_messageBox -icon error -title "Error requiring $pkg" -type ok \
+                -message "Error requiring $pkg $ver:\n$msg\n$::errorInfo"
+        }
+    }
+    # refresh package list
+    InterpPkgs $app $type
 }
 
@@ -1414 +1780 @@
 
     $m delete 0 end
-    set cmd {::tkcon::Prompt \n [::tkcon::CmdGet $::tkcon::PRIV(console)]}
+    set cmd {::tkcon::RePrompt \n [::tkcon::CmdGet $::tkcon::PRIV(console)]}
     $m add radio -label {None (use local slave) } -accel Ctrl-1 \
             -variable ::tkcon::PRIV(app) \
@@ -1421 +1787 @@
     $m add separator
     $m add command -label "Foreign Tk Interpreters" -state disabled
-    foreach i [lsort [lremove [winfo interps] [array names tknames]]] {
+    foreach i [lsort [lremove [::send::interps] [array names tknames]]] {
         $m add radio -label $i -variable ::tkcon::PRIV(app) -value $i \
                 -command "::tkcon::Attach [list $i] interp; $cmd"
@@ -1457 +1823 @@
 proc ::tkcon::DisplayMenu m {
     $m delete 0 end
-    set cmd {::tkcon::Prompt \n [::tkcon::CmdGet $::tkcon::PRIV(console)]}
+    set cmd {::tkcon::RePrompt \n [::tkcon::CmdGet $::tkcon::PRIV(console)]}
 
     $m add command -label "New Display" -command ::tkcon::NewDisplay
@@ -1476 +1842 @@
 proc ::tkcon::SocketMenu m {
     $m delete 0 end
-    set cmd {::tkcon::Prompt \n [::tkcon::CmdGet $::tkcon::PRIV(console)]}
+    set cmd {::tkcon::RePrompt \n [::tkcon::CmdGet $::tkcon::PRIV(console)]}
 
     $m add command -label "Create Connection" \
@@ -1500 +1866 @@
 
     ## Same command as for ::tkcon::AttachMenu items
-    set cmd {::tkcon::Prompt \n [::tkcon::CmdGet $::tkcon::PRIV(console)]}
+    set cmd {::tkcon::RePrompt \n [::tkcon::CmdGet $::tkcon::PRIV(console)]}
 
     set names [lsort [Namespaces ::]]
@@ -1557 +1923 @@
         ## Catch in case the namespace disappeared on us
         catch { ::tkcon::AttachNamespace [%W get [%W nearest %y]] }
-        ::tkcon::Prompt "\n" [::tkcon::CmdGet $::tkcon::PRIV(console)]
+        ::tkcon::RePrompt "\n" [::tkcon::CmdGet $::tkcon::PRIV(console)]
         destroy [winfo toplevel %W]
     }
@@ -1685 +2051 @@
 #               appropriate interpreter
 ##
-proc ::tkcon::Attach {{name <NONE>} {type slave}} {
+proc ::tkcon::Attach {{name <NONE>} {type slave} {ns {}}} {
     variable PRIV
     variable OPT
+    variable ATTACH
 
     if {[llength [info level 0]] == 1} {
         # no args were specified, return the attach info instead
-        if {[string match {} $PRIV(appname)]} {
-            return [list [concat $PRIV(name) $OPT(exec)] $PRIV(apptype)]
-        } else {
-            return [list $PRIV(appname) $PRIV(apptype)]
-        }
+        return [AttachId]
     }
     set path [concat $PRIV(name) $OPT(exec)]
@@ -1732 +2095 @@
             set name [concat $path $name]
             set type slave
-        } elseif {[lsearch -exact [winfo interps] $name] > -1} {
+        } elseif {[lsearch -exact [::send::interps] $name] > -1} {
             if {[EvalSlave info exists tk_library] \
                     && [string match $name [EvalSlave tk appname]]} {
@@ -1761 +2124 @@
     # ARGS:     args    - the command and args to evaluate
     ##
+    set PRIV(namesp) ::
+    set namespOK 0
     switch -glob -- $type {
         slave {
@@ -1774 +2139 @@
                         ::tkcon::Slave $::tkcon::PRIV(app)
             }
+            set namespOK 1
         }
         sock* {
@@ -1781 +2147 @@
             # into the interpreter
             fconfigure $name -buffering line -blocking 0
-            fileevent $name readable ::tkcon::EvalSocketEvent
+            fileevent $name readable [list ::tkcon::EvalSocketEvent $name]
         }
         dpy:* -
@@ -1787 +2153 @@
             if {$OPT(nontcl)} {
                 interp alias {} ::tkcon::EvalAttached {} ::tkcon::EvalSlave
-                set PRIV(namesp) ::
             } else {
                 interp alias {} ::tkcon::EvalAttached {} ::tkcon::EvalSend
+                set namespOK 1
             }
         }
@@ -1797 +2163 @@
         }
     }
-    if {[string match slave $type] || \
-            (!$OPT(nontcl) && [regexp {^(interp|dpy)} $type])} {
-        set PRIV(namesp) ::
-    }
-    set PRIV(StatusAttach) "$PRIV(app) ($PRIV(apptype))"
-    return
+    if {![string match {} $ns] && $namespOK} {
+        AttachNamespace $ns
+    }
+    return [AttachId]
+}
+
+proc ::tkcon::AttachId {} {
+    # return Attach info in a form that Attach accepts again
+    variable PRIV
+
+    if {[string match {} $PRIV(appname)]} {
+        variable OPT
+        set appname [concat $PRIV(name) $OPT(exec)]
+    } else {
+        set appname $PRIV(appname)
+    }
+    set id [list $appname $PRIV(apptype)]
+    # only display ns info if it isn't "::" as that is what is also
+    # used to indicate no eval in namespace
+    if {![string match :: $PRIV(namesp)]} { lappend id $PRIV(namesp) }
+    if {[info exists PRIV(console)]} {
+        variable ATTACH
+        set ATTACH($PRIV(console)) $id
+    }
+    return $id
 }
 
@@ -1836 +2221 @@
     }
     set PRIV(namesp) $name
-    set PRIV(StatusAttach) "$PRIV(app) $PRIV(namesp) ($PRIV(apptype))"
+    return [AttachId]
 }
 
@@ -1852 +2237 @@
         wm title $t "tkcon Create Socket"
         label $t.lhost -text "Host: "
-        entry $t.host -width 20
+        entry $t.host -width 16 -takefocus 1
         label $t.lport -text "Port: "
-        entry $t.port -width 4
-        button $t.ok -text "OK" -command {set ::tkcon::PRIV(grab) 1}
+        entry $t.port -width 4 -takefocus 1
+        button $t.ok -text "OK" -command {set ::tkcon::PRIV(grab) 1} -width 4 \
+            -takefocus 1
         bind $t.host <Return> [list focus $t.port]
         bind $t.port <Return> [list focus $t.ok]
         bind $t.ok   <Return> [list $t.ok invoke]
-        grid $t.lhost $t.host $t.lport $t.port -sticky ew
-        grid $t.ok      -       -       -        -sticky ew
+        grid $t.lhost $t.host $t.lport $t.port $t.ok -sticky ew
+        grid configure $t.ok -padx 4 -pady 2
         grid columnconfig $t 1 -weight 1
         grid rowconfigure $t 1 -weight 1
         wm transient $t $PRIV(root)
+        wm group $t $PRIV(root)
         wm geometry $t +[expr {([winfo screenwidth $t]-[winfo \
                 reqwidth $t]) / 2}]+[expr {([winfo \
                 screenheight $t]-[winfo reqheight $t]) / 2}]
+        bind $t <Escape> [list destroy $t]
     }
     #$t.host delete 0 end
@@ -1964 +2352 @@
 proc ::tkcon::MainInit {} {
     variable PRIV
+    variable OPT
 
     if {![info exists PRIV(slaves)]} {
@@ -1992 +2381 @@
         lappend PRIV(slaves) $tmp
         load {} Tk $tmp
+        # If we have tbcload, then that should be autoloaded into slaves.
+        set idx [lsearch [info loaded] "* Tbcload"]
+        if {$idx != -1} { catch {load {} Tbcload $tmp} }
         lappend PRIV(interps) [$tmp eval [list tk appname \
                 "[tk appname] $tmp"]]
-        if {[info exist argv0]} {$tmp eval [list set argv0 $argv0]}
-        $tmp eval set argc $argc
-        $tmp eval [list set argv $argv]
+        if {[info exists argv0]} {$tmp eval [list set argv0 $argv0]}
+        if {[info exists argc]}  {$tmp eval [list set argc $argc]}
+        if {[info exists argv]}  {$tmp eval [list set argv $argv]}
         $tmp eval [list namespace eval ::tkcon {}]
         $tmp eval [list set ::tkcon::PRIV(name) $tmp]
@@ -2003 +2395 @@
         $tmp alias ::tkcon::Destroy             ::tkcon::Destroy $tmp
         $tmp alias ::tkcon::New                 ::tkcon::New
+        $tmp alias ::tkcon::GetSlaveNum         ::tkcon::GetSlaveNum
         $tmp alias ::tkcon::Main                ::tkcon::InterpEval Main
         $tmp alias ::tkcon::Slave               ::tkcon::InterpEval
@@ -2027 +2420 @@
 
         ## Slave interpreter exit request
-        if {[string match exit $OPT(slaveexit)]} {
-            ## Only exit if it specifically is stated to do so
+        if {[string match exit $OPT(slaveexit)]
+            || [llength $PRIV(interps)] == 1} {
+            ## Only exit if it specifically is stated to do so, or this
+            ## is the last interp
             uplevel 1 exit $args
-        }
-        ## Otherwise we will delete the slave interp and associated data
-        set name [InterpEval $slave]
-        set PRIV(interps) [lremove $PRIV(interps) [list $name]]
-        set PRIV(slaves)  [lremove $PRIV(slaves) [list $slave]]
-        interp delete $slave
-        StateCleanup $slave
-        return
+        } else {
+            ## Otherwise we will delete the slave interp and associated data
+            Destroy $slave
+        }
     }
 
@@ -2048 +2439 @@
         variable PRIV
 
-        if {[string match {} $slave]} {
+        # Just close on the last one
+        if {[llength $PRIV(interps)] == 1} { exit }
+        if {"" == $slave} {
             ## Main interpreter close request
-            if {[tk_dialog $PRIV(base).destroyme {Quit tkcon?} \
-                    {Closing the Main console will quit tkcon} \
-                    warning 0 "Don't Quit" "Quit tkcon"]} exit
+            if {[tk_messageBox -parent $PRIV(root) -title "Quit tkcon?" \
+                     -message "Close all windows and exit tkcon?" \
+                     -icon question -type yesno] == "yes"} { exit }
+            return
+        } elseif {$slave == $::tkcon::OPT(exec)} {
+            set name  [tk appname]
+            set slave "Main"
         } else {
             ## Slave interpreter close request
             set name [InterpEval $slave]
-            set PRIV(interps) [lremove $PRIV(interps) [list $name]]
-            set PRIV(slaves)  [lremove $PRIV(slaves) [list $slave]]
             interp delete $slave
         }
+        set PRIV(interps) [lremove $PRIV(interps) [list $name]]
+        set PRIV(slaves)  [lremove $PRIV(slaves) [list $slave]]
         StateCleanup $slave
-        return
-    }
-
-    ## We want to do a couple things before exiting...
-    if {[catch {rename ::exit ::tkcon::FinalExit} err]} {
-        puts stderr "tkcon might panic:\n$err"
-    }
-    proc ::exit args {
-        if {$::tkcon::OPT(usehistory)} {
-            if {[catch {open $::tkcon::PRIV(histfile) w} fid]} {
-                puts stderr "unable to save history file:\n$fid"
-                # pause a moment, because we are about to die finally...
-                after 1000
-            } else {
-                set max [::tkcon::EvalSlave history nextid]
-                set id [expr {$max - $::tkcon::OPT(history)}]
-                if {$id < 1} { set id 1 }
-                ## FIX: This puts history in backwards!!
-                while {($id < $max) && \
-                        ![catch {::tkcon::EvalSlave history event $id} cmd]} {
-                    if {[string compare {} $cmd]} {
-                        puts $fid "::tkcon::EvalSlave history add [list $cmd]"
+    }
+
+    if {$OPT(overrideexit)} {
+        ## We want to do a couple things before exiting...
+        if {[catch {rename ::exit ::tkcon::FinalExit} err]} {
+            puts stderr "tkcon might panic:\n$err"
+        }
+        proc ::exit args {
+            if {$::tkcon::OPT(usehistory)} {
+                if {[catch {open $::tkcon::PRIV(histfile) w} fid]} {
+                    puts stderr "unable to save history file:\n$fid"
+                    # pause a moment, because we are about to die finally...
+                    after 1000
+                } else {
+                    set max [::tkcon::EvalSlave history nextid]
+                    set id [expr {$max - $::tkcon::OPT(history)}]
+                    if {$id < 1} { set id 1 }
+                    ## FIX: This puts history in backwards!!
+                    while {($id < $max) && ![catch \
+                            {::tkcon::EvalSlave history event $id} cmd]} {
+                        if {[string compare {} $cmd]} {
+                            puts $fid "::tkcon::EvalSlave\
+                                    history add [list $cmd]"
+                        }
+                        incr id
                     }
-                    incr id
+                    close $fid
                 }
-                close $fid
-            }
-        }
-        uplevel 1 ::tkcon::FinalExit $args
+            }
+            uplevel 1 ::tkcon::FinalExit $args
+        }
     }
 
@@ -2099 +2498 @@
         variable PRIV
 
-        if {[string match {} $slave]} {
+        if {[llength [info level 0]] == 1} {
+            # no args given
             return $PRIV(slaves)
         } elseif {[string match {[Mm]ain} $slave]} {
@@ -2107 +2507 @@
             return [interp eval $slave uplevel \#0 $args]
         } else {
-            return [interp eval $slave tk appname]
+            # beware safe interps with Tk
+            if {[interp eval $slave {llength [info commands tk]}]} {
+                if {[catch {interp eval $slave tk appname} name]} {
+                    return "safetk"
+                }
+                return $name
+            }
         }
     }
 
     proc ::tkcon::Interps {{ls {}} {interp {}}} {
-        if {[string match {} $interp]} { lappend ls {} [tk appname] }
+        if {[string match {} $interp]} {
+            lappend ls {} [tk appname]
+        }
         foreach i [interp slaves $interp] {
             if {[string compare {} $interp]} { set i "$interp $i" }
             if {[string compare {} [interp eval $i package provide Tk]]} {
-                lappend ls $i [interp eval $i tk appname]
+                # beware safe interps with Tk
+                if {[catch {interp eval $i tk appname} name]} {
+                    set name {}
+                }
+                lappend ls $i $name
             } else {
                 lappend ls $i {}
@@ -2178 +2590 @@
                 error "No other Tk interpreters on $disp"
             }
-            send -displayof $dt [lindex $interps 0] [list info tclversion]
+            ::send::send -displayof $dt [lindex $interps 0] [list info tclversion]
         } err]} {
             global env
@@ -2439 +2851 @@
 }
 
-## ::tkcon::ErrorHighlight - magic error highlighting
+## ::tkcon::Highlight - magic highlighting
 ## beware: voodoo included
 # ARGS:
 ##
-proc ::tkcon::ErrorHighlight w {
+proc ::tkcon::Highlight {w type} {
     variable COLOR
+    variable OPT
+
+    switch -exact $type {
+        "error" { HighlightError $w }
+        "tcl" - "test" {
+            if {[winfo class $w] != "Ctext"} { return }
+
+            foreach {app type} [tkcon attach] {break}
+            set cmds [::tkcon::EvalOther $app $type info commands]
+
+            set classes [list \
+                 [list comment ClassForRegexp "^\\s*#\[^\n\]*" $COLOR(stderr)] \
+                 [list var     ClassWithOnlyCharStart "\$" $COLOR(stdout)] \
+                 [list syntax  ClassForSpecialChars "\[\]{}\"" $COLOR(prompt)] \
+                 [list command Class $cmds $COLOR(proc)] \
+                ]
+
+            # Remove all highlight classes from a widget
+            ctext::clearHighlightClasses $w
+            foreach class $classes {
+                foreach {cname ctype cptn ccol} $class break
+                ctext::addHighlight$ctype $w $cname $ccol $cptn
+            }
+            $w highlight 1.0 end
+        }
+    }
+}
+
+## ::tkcon::HighlightError - magic error highlighting
+## beware: voodoo included
+# ARGS:
+##
+proc ::tkcon::HighlightError w {
+    variable COLOR
+    variable OPT
 
     ## do voodoo here
@@ -2476 +2923 @@
             $w tag bind $tag <Leave> [list $w tag configure $tag -under 0]
             $w tag bind $tag <ButtonRelease-1> "if {!\$tkPriv(mouseMoved)} \
-                    {[list edit -attach $app -type proc -find $what -- $cmd]}"
+                    {[list $OPT(edit) -attach $app -type proc -find $what -- $cmd]}"
         }
         set info [string range $info $c1 end]
@@ -2505 +2952 @@
             $w tag bind $tag <Leave> [list $w tag configure $tag -under 0]
             $w tag bind $tag <ButtonRelease-1> "if {!\$tkPriv(mouseMoved)} \
-                    {[list edit -attach $app -type proc -- $cmd]}"
-        }
+                    {[list $OPT(edit) -attach $app -type proc -- $cmd]}"
+        }
+    }
+}
+
+proc ::tkcon::ExpectInit {{termcap 1} {terminfo 1}} {
+    global env
+
+    if {$termcap} {
+        set env(TERM) "tt"
+        set env(TERMCAP) {tt:
+ :ks=\E[KS:
+ :ke=\E[KE:
+ :cm=\E[%d;%dH:
+ :up=\E[A:
+ :nd=\E[C:
+ :cl=\E[H\E[J:
+ :do=^J:
+ :so=\E[7m:
+ :se=\E[m:
+ :k1=\EOP:
+ :k2=\EOQ:
+ :k3=\EOR:
+ :k4=\EOS:
+ :k5=\EOT:
+ :k6=\EOU:
+ :k7=\EOV:
+ :k8=\EOW:
+ :k9=\EOX:
+    }
+    }
+
+    if {$terminfo} {
+        set env(TERM) "tkterm"
+        if {![info exists env(TEMP)]} { set env(TEMP) /tmp }
+        set env(TERMINFO) $env(TEMP)
+
+        set ttsrc [file join $env(TEMP) tt.src]
+        set file [open $ttsrc w]
+        puts $file {tkterm|Don Libes' tk text widget terminal emulator,
+ smkx=\E[KS,
+ rmkx=\E[KE,
+ cup=\E[%p1%d;%p2%dH,
+ cuu1=\E[A,
+ cuf1=\E[C,
+ clear=\E[H\E[J,
+ ind=\n,
+ cr=\r,
+ smso=\E[7m,
+ rmso=\E[m,
+ kf1=\EOP,
+ kf2=\EOQ,
+ kf3=\EOR,
+ kf4=\EOS,
+ kf5=\EOT,
+ kf6=\EOU,
+ kf7=\EOV,
+ kf8=\EOW,
+ kf9=\EOX,
+    }
+        close $file
+
+        if {[catch {exec tic $ttsrc} msg]} {
+            return -code error \
+                "tic failed, you may not have terminfo support:\n$msg"
+        }
+
+        file delete $ttsrc
+    }
+}
+
+# term_exit is called if the spawned process exits
+proc ::tkcon::term_exit {w} {
+    variable EXP
+    catch {exp_close -i $EXP(spawn_id)}
+    set EXP(forever) 1
+    unset EXP
+}
+
+# term_chars_changed is called after every change to the displayed chars
+# You can use if you want matches to occur in the background (a la bind)
+# If you want to test synchronously, then just do so - you don't need to
+# redefine this procedure.
+proc ::tkcon::term_chars_changed {w args} {
+}
+
+# term_cursor_changed is called after the cursor is moved
+proc ::tkcon::term_cursor_changed {w args} {
+}
+
+proc ::tkcon::term_update_cursor {w args} {
+    variable OPT
+    variable EXP
+
+    $w mark set insert $EXP(row).$EXP(col)
+    $w see insert
+    term_cursor_changed $w
+}
+
+proc ::tkcon::term_clear {w args} {
+    $w delete 1.0 end
+    term_init $w
+}
+
+proc ::tkcon::term_init {w args} {
+    variable OPT
+    variable EXP
+
+    # initialize it with blanks to make insertions later more easily
+    set blankline [string repeat " " $OPT(cols)]\n
+    for {set i 1} {$i <= $OPT(rows)} {incr i} {
+        $w insert $i.0 $blankline
+    }
+
+    set EXP(row) 1
+    set EXP(col) 0
+
+    $w mark set insert $EXP(row).$EXP(col)
+}
+
+proc ::tkcon::term_down {w args} {
+    variable OPT
+    variable EXP
+
+    if {$EXP(row) < $OPT(rows)} {
+        incr EXP(row)
+    } else {
+        # already at last line of term, so scroll screen up
+        $w delete 1.0 2.0
+
+        # recreate line at end
+        $w insert end [string repeat " " $OPT(cols)]\n
+    }
+}
+
+proc ::tkcon::term_insert {w s} {
+    variable OPT
+    variable EXP
+
+    set chars_rem_to_write [string length $s]
+    set space_rem_on_line  [expr {$OPT(cols) - $EXP(col)}]
+
+    set tag_action [expr {$EXP(standout) ? "add" : "remove"}]
+
+    ##################
+    # write first line
+    ##################
+
+    if {$chars_rem_to_write > $space_rem_on_line} {
+        set chars_to_write $space_rem_on_line
+        set newline 1
+    } else {
+        set chars_to_write $chars_rem_to_write
+        set newline 0
+    }
+
+    $w delete $EXP(row).$EXP(col) \
+        $EXP(row).[expr {$EXP(col) + $chars_to_write}]
+    $w insert $EXP(row).$EXP(col) \
+        [string range $s 0 [expr {$space_rem_on_line-1}]]
+
+    $w tag $tag_action standout $EXP(row).$EXP(col) \
+        $EXP(row).[expr {$EXP(col) + $chars_to_write}]
+
+    # discard first line already written
+    incr chars_rem_to_write -$chars_to_write
+    set s [string range $s $chars_to_write end]
+
+    # update EXP(col)
+    incr EXP(col) $chars_to_write
+    # update EXP(row)
+    if {$newline} { term_down $w }
+
+    ##################
+    # write full lines
+    ##################
+    while {$chars_rem_to_write >= $OPT(cols)} {
+        $w delete $EXP(row).0 $EXP(row).end
+        $w insert $EXP(row).0 [string range $s 0 [expr {$OPT(cols)-1}]]
+        $w tag $tag_action standout $EXP(row).0 $EXP(row).end
+
+        # discard line from buffer
+        set s [string range $s $OPT(cols) end]
+        incr chars_rem_to_write -$OPT(cols)
+
+        set EXP(col) 0
+        term_down $w
+    }
+
+    #################
+    # write last line
+    #################
+
+    if {$chars_rem_to_write} {
+        $w delete $EXP(row).0 $EXP(row).$chars_rem_to_write
+        $w insert $EXP(row).0 $s
+        $w tag $tag_action standout $EXP(row).0 $EXP(row).$chars_rem_to_write
+        set EXP(col) $chars_rem_to_write
+    }
+
+    term_chars_changed $w
+}
+
+proc ::tkcon::Expect {cmd} {
+    variable OPT
+    variable PRIV
+    variable EXP
+
+    set EXP(standout) 0
+    set EXP(row) 0
+    set EXP(col) 0
+
+    set env(LINES)   $OPT(rows)
+    set env(COLUMNS) $OPT(cols)
+
+    ExpectInit
+    log_user 0
+    set ::stty_init "-tabs"
+    uplevel \#0 [linsert $cmd 0 spawn]
+    set EXP(spawn_id) $::spawn_id
+    if {[info exists ::spawn_out(slave,name)]} {
+        set EXP(slave,name) $::spawn_out(slave,name)
+        catch {stty rows $OPT(rows) columns $OPT(cols) < $::spawn_out(slave,name)}
+    }
+    if {[string index $cmd end] == "&"} {
+        set cmd expect_background
+    } else {
+        set cmd expect
+    }
+    bind $PRIV(console) <Meta-KeyPress> {
+        if {"%A" != ""} {
+            exp_send -i $::tkcon::EXP(spawn_id) "\033%A"
+            break
+        }
+    }
+    bind $PRIV(console) <KeyPress> {
+        exp_send -i $::tkcon::EXP(spawn_id) -- %A
+        break
+    }
+    bind $PRIV(console) <Control-space> {exp_send -null}
+    set code [catch {
+        term_init $PRIV(console)
+        while {[info exists EXP(spawn_id)]} {
+        $cmd {
+            -i $::tkcon::EXP(spawn_id)
+            -re "^\[^\x01-\x1f\]+" {
+                # Text
+                ::tkcon::term_insert $::tkcon::PRIV(console) \
+                    $expect_out(0,string)
+                ::tkcon::term_update_cursor $::tkcon::PRIV(console)
+            } "^\r" {
+                # (cr,) Go to beginning of line
+                update idle
+                set ::tkcon::EXP(col) 0
+                ::tkcon::term_update_cursor $::tkcon::PRIV(console)
+            } "^\n" {
+                # (ind,do) Move cursor down one line
+                if {$::tcl_platform(platform) eq "windows"} {
+                    # Windows seems to get the LF without the CR
+                    update idle
+                    set ::tkcon::EXP(col) 0
+                }
+                ::tkcon::term_down $::tkcon::PRIV(console)
+                ::tkcon::term_update_cursor $::tkcon::PRIV(console)
+            } "^\b" {
+                # Backspace nondestructively
+                incr ::tkcon::EXP(col) -1
+                ::tkcon::term_update_cursor $::tkcon::PRIV(console)
+            } "^\a" {
+                bell
+            } "^\t" {
+                # Tab, shouldn't happen
+                send_error "got a tab!?"
+            } eof {
+                ::tkcon::term_exit $::tkcon::PRIV(console)
+            } "^\x1b\\\[A" {
+                # Cursor Up (cuu1,up)
+                incr ::tkcon::EXP(row) -1
+                ::tkcon::term_update_cursor $::tkcon::PRIV(console)
+            } "^\x1b\\\[B" {
+                # Cursor Down
+                incr ::tkcon::EXP(row)
+                ::tkcon::term_update_cursor $::tkcon::PRIV(console)
+            } "^\x1b\\\[C" {
+                # Cursor Right (cuf1,nd)
+                incr ::tkcon::EXP(col)
+                ::tkcon::term_update_cursor $::tkcon::PRIV(console)
+            } "^\x1b\\\[D" {
+                # Cursor Left
+                incr ::tkcon::EXP(col)
+                ::tkcon::term_update_cursor $::tkcon::PRIV(console)
+            } "^\x1b\\\[H" {
+                # Cursor Home
+            } -re "^\x1b\\\[(\[0-9\]*);(\[0-9\]*)H" {
+                # (cup,cm) Move to row y col x
+                set ::tkcon::EXP(row) [expr {$expect_out(1,string)+1}]
+                set ::tkcon::EXP(col) $expect_out(2,string)
+                ::tkcon::term_update_cursor $::tkcon::PRIV(console)
+            } "^\x1b\\\[H\x1b\\\[J" {
+                # (clear,cl) Clear screen
+                ::tkcon::term_clear $::tkcon::PRIV(console)
+                ::tkcon::term_update_cursor $::tkcon::PRIV(console)
+            } "^\x1b\\\[7m" {
+                # (smso,so) Begin standout mode
+                set ::tkcon::EXP(standout) 1
+            } "^\x1b\\\[m" {
+                # (rmso,se) End standout mode
+                set ::tkcon::EXP(standout) 0
+            } "^\x1b\\\[KS" {
+                # (smkx,ks) start keyboard-transmit mode
+                # terminfo invokes these when going in/out of graphics mode
+                # In graphics mode, we should have no scrollbars
+                #graphicsSet 1
+            } "^\x1b\\\[KE" {
+                # (rmkx,ke) end keyboard-transmit mode
+                # Out of graphics mode, we should have scrollbars
+                #graphicsSet 0
+            }
+        }
+        }
+        #vwait ::tkcon::EXP(forever)
+    } err]
+    bind $PRIV(console) <Meta-KeyPress> {}
+    bind $PRIV(console) <KeyPress>      {}
+    bind $PRIV(console) <Control-space> {}
+    catch {unset EXP}
+    if {$code} {
+        return -code $code -errorinfo $::errorInfo $err
     }
 }
@@ -2516 +3289 @@
 ## 
 proc tkcon {cmd args} {
+    variable ::tkcon::PRIV
+    variable ::tkcon::OPT
     global errorInfo
 
@@ -2523 +3298 @@
             if {[llength $args]} {
                 if {[regexp {^[1-9][0-9]*$} $args]} {
-                    set ::tkcon::OPT(buffer) $args
+                    set OPT(buffer) $args
                     # catch in case the console doesn't exist yet
-                    catch {::tkcon::ConstrainBuffer $::tkcon::PRIV(console) \
-                            $::tkcon::OPT(buffer)}
+                    catch {::tkcon::ConstrainBuffer $PRIV(console) \
+                            $OPT(buffer)}
                 } else {
                     return -code error "buffer must be a valid integer"
                 }
             }
-            return $::tkcon::OPT(buffer)
+            return $OPT(buffer)
+        }
+        linelen* {
+            ## 'linelength' Sets/Query the maximum line length
+            if {[llength $args]} {
+                if {[regexp {^-?[0-9]+$} $args]} {
+                    set OPT(maxlinelen) $args
+                } else {
+                    return -code error "buffer must be a valid integer"
+                }
+            }
+            return $OPT(maxlinelen)
         }
         bg* {
@@ -2544 +3330 @@
         cons* {
             ## 'console' - passes the args to the text widget of the console.
-            set result [uplevel 1 $::tkcon::PRIV(console) $args]
-            ::tkcon::ConstrainBuffer $::tkcon::PRIV(console) \
-                    $::tkcon::OPT(buffer)
+            set result [uplevel 1 $PRIV(console) $args]
+            ::tkcon::ConstrainBuffer $PRIV(console) \
+                    $OPT(buffer)
             return $result
         }
@@ -2559 +3345 @@
             set old [bind TkConsole <<TkCon_Eval>>]
             bind TkConsole <<TkCon_Eval>> { set ::tkcon::PRIV(wait) 0 }
-            set w $::tkcon::PRIV(console)
+            set w $PRIV(console)
             # Make sure to move the limit to get the right data
             $w mark set insert end
@@ -2570 +3356 @@
             return $line
         }
+        exp* {
+            ::tkcon::Expect [lindex $args 0]
+        }
         getc* {
             ## 'getcommand' a replacement for [gets stdin]
@@ -2579 +3368 @@
             set old [bind TkConsole <<TkCon_Eval>>]
             bind TkConsole <<TkCon_Eval>> { set ::tkcon::PRIV(wait) 0 }
-            set w $::tkcon::PRIV(console)
+            set w $PRIV(console)
             # Make sure to move the limit to get the right data
             $w mark set insert end
@@ -2602 +3391 @@
                 return -code error "wrong # args: should be \"tkcon gets\""
             }
-            set t $::tkcon::PRIV(base).gets
+            set t $PRIV(base).gets
             if {![winfo exists $t]} {
                 toplevel $t
@@ -2623 +3412 @@
                 grid columnconfig $t 0 -weight 1
                 grid rowconfig    $t 1 -weight 1
-                wm transient $t $::tkcon::PRIV(root)
+                wm transient $t $PRIV(root)
                 wm geometry $t +[expr {([winfo screenwidth $t]-[winfo \
                         reqwidth $t]) / 2}]+[expr {([winfo \
@@ -2648 +3437 @@
                 }
             } else {
-                set info $::tkcon::PRIV(errorInfo)
+                set info $PRIV(errorInfo)
             }
             if {[string match {} $info]} { set info "errorInfo empty" }
             ## If args is empty, the -attach switch just ignores it
-            edit -attach $args -type error -- $info
+            $OPT(edit) -attach $args -type error -- $info
         }
         fi* {
             ## 'find' string
-            ::tkcon::Find $::tkcon::PRIV(console) $args
+            ::tkcon::Find $PRIV(console) $args
         }
         fo* {
             ## 'font' ?fontname? - gets/sets the font of the console
             if {[llength $args]} {
-                if {[info exists ::tkcon::PRIV(console)] && \
-                        [winfo exists $::tkcon::PRIV(console)]} {
-                    $::tkcon::PRIV(console) config -font $args
-                    set ::tkcon::OPT(font) [$::tkcon::PRIV(console) cget -font]
+                if {[info exists PRIV(console)] && \
+                        [winfo exists $PRIV(console)]} {
+                    $PRIV(console) config -font $args
+                    set OPT(font) [$PRIV(console) cget -font]
                 } else {
-                    set ::tkcon::OPT(font) $args
+                    set OPT(font) $args
                 }
             }
-            return $::tkcon::OPT(font)
+            return $OPT(font)
         }
         hid* - with* {
             ## 'hide' 'withdraw' - hides the console.
-            wm withdraw $::tkcon::PRIV(root)
+            if {[info exists PRIV(root)] && [winfo exists $PRIV(root)]} {
+                wm withdraw $PRIV(root)
+            }
         }
         his* {
@@ -2685 +3476 @@
         ico* {
             ## 'iconify' - iconifies the console with 'iconify'.
-            wm iconify $::tkcon::PRIV(root)
+            if {[info exists PRIV(root)] && [winfo exists $PRIV(root)]} {
+                wm iconify $PRIV(root)
+            }
         }
         mas* - eval {
@@ -2735 +3528 @@
         sh* - dei* {
             ## 'show|deiconify' - deiconifies the console.
-            wm deiconify $::tkcon::PRIV(root)
-            raise $::tkcon::PRIV(root)
-            focus -force $::tkcon::PRIV(console)
+            if {![info exists PRIV(root)]} {
+                set PRIV(showOnStartup) 0
+                set PRIV(root) .tkcon
+                set OPT(exec) ""
+            }
+            if {![winfo exists $PRIV(root)]} {
+                ::tkcon::Init
+            }
+            wm deiconify $PRIV(root)
+            raise $PRIV(root)
+            focus -force $PRIV(console)
         }
         ti* {
             ## 'title' ?title? - gets/sets the console's title
             if {[llength $args]} {
-                return [wm title $::tkcon::PRIV(root) [join $args]]
+                return [wm title $PRIV(root) [join $args]]
             } else {
-                return [wm title $::tkcon::PRIV(root)]
+                return [wm title $PRIV(root)]
             }
         }
@@ -2754 +3555 @@
             set slaveVar  [lindex $args 1]
             if {[info exists $masterVar]} {
-                interp eval $::tkcon::OPT(exec) \
+                interp eval $OPT(exec) \
                         [list set $slaveVar [set $masterVar]]
             } else {
-                catch {interp eval $::tkcon::OPT(exec) [list unset $slaveVar]}
-            }
-            interp eval $::tkcon::OPT(exec) \
+                catch {interp eval $OPT(exec) [list unset $slaveVar]}
+            }
+            interp eval $OPT(exec) \
                     [list trace variable $slaveVar rwu \
-                    [list tkcon set $masterVar $::tkcon::OPT(exec)]]
+                    [list tkcon set $masterVar $OPT(exec)]]
             return
         }
         v* {
-            return $::tkcon::PRIV(version)
+            return $PRIV(version)
         }
         default {
@@ -2917 +3718 @@
         toplevel $w
         wm withdraw $w
-        if {[string length $word] > 12} {
-            wm title $w "tkcon Edit: [string range $word 0 9]..."
+        if {[string length $word] > 20} {
+            wm title $w "[string range $word 0 16]... - tkcon Edit"
         } else {
-            wm title $w "tkcon Edit: $word"
-        }
-
-        text $w.text -wrap none \
+            wm title $w "$word - tkcon Edit"
+        }
+
+        if {[package provide ctext] != ""} {
+            set txt [ctext $w.text]
+        } else {
+            set txt [text $w.text]
+        }
+        $w.text configure -wrap none \
                 -xscrollcommand [list $w.sx set] \
                 -yscrollcommand [list $w.sy set] \
@@ -2930 +3736 @@
                 -insertbackground $::tkcon::COLOR(cursor) \
                 -font $::tkcon::OPT(font)
+        catch {$w.text configure -undo 1}
         scrollbar $w.sx -orient h -takefocus 0 -bd 1 \
                 -command [list $w.text xview]
@@ -2990 +3797 @@
             $w.text insert 1.0 \
                     [::tkcon::EvalOther $app $type dump proc [list $word]]
+            after idle [::tkcon::Highlight $w.text tcl]
         }
         var*    {
             $w.text insert 1.0 \
                     [::tkcon::EvalOther $app $type dump var [list $word]]
+            after idle [::tkcon::Highlight $w.text tcl]
         }
         file    {
@@ -3005 +3814 @@
             }
             ]]
+            after idle [::tkcon::Highlight $w.text \
+                            [string trimleft [file extension $word] .]]
         }
         error*  {
             $w.text insert 1.0 [join $args \n]
-            ::tkcon::ErrorHighlight $w.text
+            after idle [::tkcon::Highlight $w.text error]
         }
         default {
@@ -3027 +3838 @@
 # ARGS: any number of strings to output to stdout
 ##
-proc echo args { puts [concat $args] }
+proc echo args { puts stdout [concat $args] }
 
 ## clear - clears the buffer of the console (not the history though)
@@ -3156 +3967 @@
                 foreach var [lsort $vars] {
                     if {[uplevel 1 [list info locals $var]] == ""} {
-                        # use the proper scope of the var, but
-                        # namespace which won't id locals correctly
-                        set var [uplevel 1 \
+                        # use the proper scope of the var, but namespace which
+                        # won't id locals or some upvar'ed vars correctly
+                        set new [uplevel 1 \
                                 [list namespace which -variable $var]]
+                        if {$new != ""} {
+                            set var $new
+                        }
                     }
                     upvar 1 $var v
@@ -3166 +3980 @@
                         append res "array set [list $var] \{\n"
                         if {[array size v]} {
-                            foreach i [lsort [array names v $fltr]] {
+                            foreach i \
+                                    [lsort -dictionary [array names v $fltr]] {
                                 upvar 0 v\($i\) __a
                                 if {[array exists __a]} {
@@ -3179 +3994 @@
                             ## empty array
                             append res "    empty array\n"
-                            append nst "unset [list $var](empty)\n"
+                            if {$var == ""} {
+                                append nst "unset (empty)\n"
+                            } else {
+                                append nst "unset [list $var](empty)\n"
+                            }
                         }
                         append res "\}\n$nst"
@@ -3560 +4379 @@
             set max 4
             regexp {^[0-9]+} $args max
+            # handle the observe'ing of 'proc'
+            set proccmd "proc"
+            if {[string match "proc" $name]} { set proccmd $old }
             ## idebug trace could be used here
-            proc $name args "
+            $proccmd $name args "
             for {set i \[info level\]; set max \[expr \[info level\]-$max\]} {
                 \$i>=\$max && !\[catch {uplevel \#\$i info level 0} info\]
@@ -3599 +4421 @@
             }
             if {![llength $args]} { set args observe_var }
+            foreach c [uplevel 1 [list trace vinfo $name]] {
+                # don't double up on the traces
+                if {[list $type $args] == $c} { return }
+            }
             uplevel 1 [list trace $opt $name $type $args]
         }
@@ -3741 +4567 @@
     }
     set sep [string trim [file join . .] .]
-    if {![llength $args]} { set args . }
+    if {![llength $args]} { set args [list [pwd]] }
     if {$::tcl_version >= 8.3} {
         # Newer glob args allow safer dir processing.  The user may still
@@ -3777 +4603 @@
     if {$s(long)} {
         set old [clock scan {1 year ago}]
-        set fmt "%s%9d %s %s\n"
+        set fmt "%s%9ld %s %s\n"
         foreach o $out {
             set d [lindex $o 0]
@@ -3967 +4793 @@
 
     set cmd [lindex $args 0]
-    if {[regexp "^namespace\[ \t\n\]+inscope" $cmd] && [llength $cmd] == 4} {
+    if {[regexp "^:*namespace\[ \t\n\]+inscope" $cmd] \
+            && [llength $cmd] == 4} {
         set arglist [lrange $args 1 end]
         set ret [catch {uplevel 1 $cmd $arglist} result]
@@ -4029 +4856 @@
                 set errorCode $savedErrorCode
                 set errorInfo $savedErrorInfo
-                return [uplevel 1 exec $new [lrange $args 1 end]]
+                if {[info exists ::tkcon::EXPECT] && $::tkcon::EXPECT && [package provide Expect] != ""} {
+                    return [tkcon expect [concat $new [lrange $args 1 end]]]
+                } else {
+                    return [uplevel 1 exec $new [lrange $args 1 end]]
+                }
                 #return [uplevel exec >&@stdout <@stdin $new [lrange $args 1 end]]
             }
@@ -4063 +4894 @@
                     canvas checkbutton clipboard destroy \
                     entry event focus font frame grab grid image \
-                    label listbox lower menu menubutton message \
-                    option pack place radiobutton raise \
+                    label labelframe listbox lower menu menubutton message \
+                    option pack panedwindow place radiobutton raise \
                     scale scrollbar selection send spinbox \
                     text tk tkwait toplevel winfo wm
@@ -4112 +4943 @@
 
     ## Get all Text bindings into TkConsole
-    foreach ev [bind Text] { bind TkConsole $ev [bind Text $ev] }       
+    foreach ev [bind Text] { bind TkConsole $ev [bind Text $ev] }
     ## We really didn't want the newline insertion
     bind TkConsole <Control-Key-o> {}
@@ -4120 +4951 @@
         <<TkCon_Exit>>          <Control-q>
         <<TkCon_New>>           <Control-N>
+        <<TkCon_NewTab>>        <Control-T>
+        <<TkCon_NextTab>>       <Control-Key-Tab>
+        <<TkCon_PrevTab>>       <Control-Shift-Key-Tab>
         <<TkCon_Close>>         <Control-w>
         <<TkCon_About>>         <Control-A>
@@ -4159 +4993 @@
     bind $PRIV(root) <<TkCon_Exit>>     exit
     bind $PRIV(root) <<TkCon_New>>      { ::tkcon::New }
+    bind $PRIV(root) <<TkCon_NewTab>>   { ::tkcon::NewTab }
+    bind $PRIV(root) <<TkCon_NextTab>>  { ::tkcon::GotoTab 1 ; break }
+    bind $PRIV(root) <<TkCon_PrevTab>>  { ::tkcon::GotoTab -1 ; break }
     bind $PRIV(root) <<TkCon_Close>>    { ::tkcon::Destroy }
     bind $PRIV(root) <<TkCon_About>>    { ::tkcon::About }
@@ -4165 +5002 @@
     bind $PRIV(root) <<TkCon_Slave>>    {
         ::tkcon::Attach {}
-        ::tkcon::Prompt "\n" [::tkcon::CmdGet $::tkcon::PRIV(console)]
+        ::tkcon::RePrompt "\n" [::tkcon::CmdGet $::tkcon::PRIV(console)]
     }
     bind $PRIV(root) <<TkCon_Master>>   {
@@ -4173 +5010 @@
             ::tkcon::Attach Main
         }
-        ::tkcon::Prompt "\n" [::tkcon::CmdGet $::tkcon::PRIV(console)]
+        ::tkcon::RePrompt "\n" [::tkcon::CmdGet $::tkcon::PRIV(console)]
     }
     bind $PRIV(root) <<TkCon_Main>>     {
         ::tkcon::Attach Main
-        ::tkcon::Prompt "\n" [::tkcon::CmdGet $::tkcon::PRIV(console)]
+        ::tkcon::RePrompt "\n" [::tkcon::CmdGet $::tkcon::PRIV(console)]
     }
     bind $PRIV(root) <<TkCon_Popup>> {
@@ -4457 +5294 @@
 
     bind TkConsolePost <KeyPress> {
-        if {$::tkcon::OPT(lightcmd) && [string compare {} %A]} {
-            ::tkcon::TagProc %W
-        }
-        set ::tkcon::PRIV(StatusCursor) [%W index insert]
+        if {[winfo exists "%W"]} {
+            if {$::tkcon::OPT(lightcmd) && [string compare {} %A]} {
+                ::tkcon::TagProc %W
+            }
+            set ::tkcon::PRIV(StatusCursor) [%W index insert]
+        }
     }
 
@@ -4477 +5316 @@
 proc ::tkcon::PopupMenu {X Y} {
     variable PRIV
+    variable OPT
 
     set w $PRIV(console)
@@ -4534 +5374 @@
     if {[lsearch $type proc] != -1} {
         $PRIV(context) add command -label "View Procedure" \
-                -command [list edit -attach $app -type proc -- $word]
+                -command [list $OPT(edit) -attach $app -type proc -- $word]
     }
     if {[lsearch $type var] != -1} {
         $PRIV(context) add command -label "View Variable" \
-                -command [list edit -attach $app -type var -- $word]
+                -command [list $OPT(edit) -attach $app -type var -- $word]
     }
     if {[lsearch $type file] != -1} {
         $PRIV(context) add command -label "View File" \
-                -command [list edit -attach $app -type file -- $word]
+                -command [list $OPT(edit) -attach $app -type file -- $word]
     }
     tk_popup $PRIV(context) $X $Y
@@ -4663 +5503 @@
         return
     }
+    variable EXP
+    if {[info exists EXP(spawn_id)]} {
+        exp_send -i $EXP(spawn_id) -- $s
+        return
+    }
     if {[$w comp insert < limit]} {
         $w mark set insert end
@@ -4799 +5644 @@
 }
 
+## ::tkcon::ExpandXotcl - expand an xotcl method name based on $str
+# ARGS: str     - partial proc name to expand
+# Calls:        ::tkcon::ExpandBestMatch
+# Returns:      list containing longest unique match followed by all the
+#               possible further matches
+##
+proc ::tkcon::ExpandXotcl str {
+    # in a first step, get the cmd to check, if we should handle subcommands
+    set cmd [::tkcon::CmdGet $::tkcon::PRIV(console)]
+    # Only do the xotcl magic if there are two cmds and xotcl is loaded
+    if {[llength $cmd] != 2
+        || ![EvalAttached [list info exists ::xotcl::version]]} {
+        return
+    }
+    set obj [lindex $cmd 0]
+    set sub [lindex $cmd 1]
+    set match [EvalAttached [list $obj info methods $sub*]]
+    if {[llength $match] > 1} {
+        regsub -all {([^\\]) } [ExpandBestMatch $match $str] {\1\\ } str
+        set match [linsert $match 0 $str]
+    } else {
+        regsub -all {([^\\]) } $match {\1\\ } match
+    }
+    return $match
+}
+
 ## ::tkcon::ExpandVariable - expand a tcl variable name based on $str
 # ARGS: str     - partial tcl var name to expand
@@ -4813 +5684 @@
             foreach var $match {lappend vars $ary\($var\)}
             return $vars
-        } else {set match $ary\($match\)}
+        } elseif {[llength $match] == 1} {
+            set match $ary\($match\)
+        }
         ## Space transformation avoided for array names.
     } else {
@@ -4890 +5763 @@
 # - Other (e.g. bind, bindtag, image), which need their own function.
 #
-## These functions courtesy Jan Nijtmans (nijtmans@nici.kun.nl)
+## These functions courtesy Jan Nijtmans
 ##
-if {[string compare [info command tk] tk]} {
+if {![llength [info commands tk]]} {
     proc tk {option args} {
         if {![string match app* $option]} {
@@ -4901 +5774 @@
 }
 
-if {[string compare [info command toplevel] toplevel]} {
+if {![llength [info command toplevel]]} {
     proc toplevel {name args} {
-        eval frame $name $args
-        pack $name
+        eval [linsert $args 0 frame $name]
+        grid $name -sticky news
     }
 }
@@ -4946 +5819 @@
         $i alias . ::tkcon::SafeWindow $i {}
         foreach var {tk_version tk_patchLevel tk_library auto_path} {
-            $i eval set $var [list [set $var]]
+            $i eval [list set $var [set $var]]
         }
         $i eval {
@@ -5184 +6057 @@
     if {[string compare $file ""]} {
         package require http 2
+        set headers {}
+        if {[info exists PRIV(proxy)]} {
+            ::http::config -proxyfilter [namespace origin RetrieveFilter]
+            if {[lindex $PRIV(proxy) 1] != {}} {
+                set headers [RetrieveAuthentication]
+            }
+        }
+        set token [::http::geturl $PRIV(HEADURL) \
+                -headers $headers -timeout 30000]
         set token [::http::geturl $PRIV(HEADURL) -timeout 30000]
         ::http::wait $token
         set code [catch {
-            if {[::http::status $token] == "ok"} {
+            set ncode [::http::ncode $token]
+            if {$ncode != 200} {
+                return "expected http return code 200, received $ncode"
+            }
+            set status [::http::status $token]
+            if {$status == "ok"} {
+                set data [::http::data $token]
+                regexp {Id: tkcon.tcl,v (\d+\.\d+)} $data -> rcsVersion
+                regexp {VERSION\s+"(\d+\.\d+[^\"]*)"} $data -> tkconVersion
+                if {(![info exists rcsVersion] || ![info exists tkconVersion])
+                    && [tk_messageBox -type yesno -icon warning \
+                            -parent $PRIV(root) \
+                            -title "Invalid tkcon source code" \
+                            -message "Source code retrieved does not appear\
+                        to be correct.\nContinue with save to \"$file\"?"] \
+                        == "no"} {
+                    return "invalid tkcon source code retrieved"
+                }
                 set fid [open $file w]
                 # We don't want newline mode to change
                 fconfigure $fid -translation binary
-                set data [::http::data $token]
                 puts -nonewline $fid $data
                 close $fid
-                regexp {Id: tkcon.tcl,v (\d+\.\d+)} $data -> rcsVersion
-                regexp {version\s+(\d+\.\d[^\n]*)} $data -> tkconVersion
+            } else {
+                return "expected http status ok, received $status"
             }
         } err]
         ::http::cleanup $token
-        if {$code} {
+        if {$code == 2} {
+            tk_messageBox -type ok -icon info -parent $PRIV(root) \
+                    -title "Failed to retrieve source" \
+                    -message "Failed to retrieve latest tkcon source:\n$err"
+        } elseif {$code} {
             return -code error $err
-        } elseif {[tk_messageBox -type yesno -icon info -parent $PRIV(root) \
-                -title "Retrieved tkcon v$tkconVersion, RCS $rcsVersion" \
-                -message "Successfully retrieved tkcon v$tkconVersion,\
-                RCS $rcsVersion.  Shall I resource (not restart) this\
-                version now?"] == "yes"} {
-            set PRIV(SCRIPT) $file
-            set PRIV(version) $tkconVersion.$rcsVersion
-            ::tkcon::Resource
+        } else {
+            if {![info exists rcsVersion]}   { set rcsVersion   "UNKNOWN" }
+            if {![info exists tkconVersion]} { set tkconVersion "UNKNOWN" }
+            if {[tk_messageBox -type yesno -icon info -parent $PRIV(root) \
+                    -title "Retrieved tkcon v$tkconVersion, RCS $rcsVersion" \
+                    -message "Successfully retrieved tkcon v$tkconVersion,\
+                    RCS $rcsVersion.  Shall I resource (not restart) this\
+                    version now?"] == "yes"} {
+                set PRIV(SCRIPT) $file
+                set PRIV(version) $tkconVersion.$rcsVersion
+                ::tkcon::Resource
+            }
+        }
+    }
+}
+
+## 'send' package that handles multiple communication variants
+##
+# Try using Tk send first, then look for a winsend interp,
+# then try dde and finally have a go at comm
+namespace eval ::send {}
+proc ::send::send {args} {
+    set winfoInterpCmd [list ::winfo interps]
+    array set opts [list displayof {} async 0]
+    while {[string match -* [lindex $args 0]]} {
+        switch -exact -- [lindex $args 0] {
+            -displayof {
+                set opts(displayof) [Pop args 1]
+                lappend winfoInterpCmd -displayof $opts(displayof)
+            }
+            -async     { set opts(async) 1 }
+            -- { Pop args ; break }
+            default {
+                return -code error "bad option \"[lindex $args 0]\":\
+                    should be -displayof, -async or --"
+            }
+        }
+        Pop args
+    }
+    set app [Pop args]
+
+    if {[llength [info commands ::winfo]]
+        && [lsearch -exact [eval $winfoInterpCmd] $app] > -1} {
+        set cmd [list ::send]
+        if {$opts(async) == 1} {lappend cmd -async}
+        if {$opts(displayof) != {}} {lappend cmd -displayof $opts(displayof)}
+        lappend cmd $app
+        eval $cmd $args
+    } elseif {[llength [info commands ::winsend]]
+              && [lsearch -exact [::winsend interps] $app] > -1} {
+        eval [list ::winsend send $app] $args
+    } elseif {[llength [info commands ::dde]]
+              && [lsearch -exact [dde services TclEval {}] \
+                      [list TclEval $app]] > -1} {
+        eval [list ::dde eval $app] $args
+    } elseif {[package provide comm] != {}
+              && [regexp {^[0-9]+$} [lindex $app 0]]} {
+        #if {$opts(displayof) != {} && [llength $app] == 1} {
+        #    lappend app $opts(displayof)
+        #}
+        eval [list ::comm::comm send $app] $args
+    } else {
+        return -code error "bad interp: \"$app\" could not be found"
+    }
+}
+
+proc ::send::interps {args} {
+    set winfoInterpCmd [list ::winfo interps]
+    array set opts [list displayof {}]
+    while {[string match -* [lindex $args 0]]} {
+        switch -exact -- [lindex $args 0] {
+            -displayof {
+                set opts(displayof) [Pop args 1]
+                lappend winfoInterpCmd -displayof $opts(displayof)
+            }
+            --         { Pop args ; break }
+            default {
+                return -code error "bad option \"[lindex $args 0]\":\
+                    should be -displayof or --"
+            }
+        }
+        Pop args
+    }
+
+    set interps {}
+    if {[llength [info commands ::winfo]]} {
+        set interps [concat $interps [eval $winfoInterpCmd]]
+    }
+    if {[llength [info commands ::winsend]]} {
+        set interps [concat $interps [::winsend interps]]
+    }
+    if {[llength [info commands ::dde]]} {
+        set servers {}
+        foreach server [::dde services TclEval {}] {
+            lappend servers [lindex $server 1]
+        }
+        set interps [concat $interps $servers]
+    }
+    if {[package provide comm] != {}} {
+        set interps [concat $interps [::comm::comm interps]]
+    }
+    return $interps
+}
+
+proc ::send::appname {args} {
+    set appname {}
+    if {[llength [info commands ::tk]]} {
+        set appname [eval ::tk appname $args]
+    }
+    if {[llength [info commands ::winsend]]} {
+        set appname [concat $appname [eval ::winsend appname $args]]
+    }
+    if {[llength [info commands ::dde]]} {
+        set appname [concat $appname [eval ::dde servername $args]]
+    }
+    # comm? can set port num and local/global interface.
+    return [lsort -unique $appname]
+}
+
+proc ::send::Pop {varname {nth 0}} {
+    upvar $varname args
+    set r [lindex $args $nth]
+    set args [lreplace $args $nth $nth]
+    return $r
+}
+##
+## end 'send' pacakge
+
+## special case 'tk appname' in Tcl plugin
+if {$::tkcon::PRIV(WWW)} {
+    rename tk ::tkcon::_tk
+    proc tk {cmd args} {
+        if {$cmd == "appname"} {
+            return "tkcon/WWW"
+        } else {
+            return [uplevel 1 ::tkcon::_tk [list $cmd] $args]
         }
     }
@@ -5216 +6246 @@
 ## Meant primarily for my development of this program.  It follows
 ## links until the ultimate source is found.
-## 
-set ::tkcon::PRIV(SCRIPT) [info script]
-if {!$::tkcon::PRIV(WWW) && [string compare $::tkcon::PRIV(SCRIPT) {}]} {
-    # we use a catch here because some wrap apps choke on 'file type'
-    # because TclpLstat wasn't wrappable until 8.4.
-    catch {
-        while {[string match link [file type $::tkcon::PRIV(SCRIPT)]]} {
-            set link [file readlink $::tkcon::PRIV(SCRIPT)]
-            if {[string match relative [file pathtype $link]]} {
-                set ::tkcon::PRIV(SCRIPT) \
-                        [file join [file dirname $::tkcon::PRIV(SCRIPT)] $link]
-            } else {
-                set ::tkcon::PRIV(SCRIPT) $link
-            }
-        }
-        catch {unset link}
-        if {[string match relative [file pathtype $::tkcon::PRIV(SCRIPT)]]} {
-            set ::tkcon::PRIV(SCRIPT) [file join [pwd] $::tkcon::PRIV(SCRIPT)]
-        }
-    }
-}
-
+##
 proc ::tkcon::Resource {} {
     uplevel \#0 {
@@ -5246 +6255 @@
 }
 
-## Initialize only if we haven't yet
+## Initialize only if we haven't yet, and do other stuff that prepares to
+## run.  It only actually inits (and runs) tkcon if it is the main script.
 ##
-if {![info exists ::tkcon::PRIV(root)] || \
-        ![winfo exists $::tkcon::PRIV(root)]} {
-    ::tkcon::Init
-}
+proc ::tkcon::AtSource {} {
+    variable PRIV
+
+    # the info script assumes we always call this while being sourced
+    set PRIV(SCRIPT) [info script]
+    if {!$PRIV(WWW) && [string length $PRIV(SCRIPT)]} {
+        if {[info tclversion] >= 8.4} {
+            set PRIV(SCRIPT) [file normalize $PRIV(SCRIPT)]
+        } else {
+            # we use a catch here because some wrap apps choke on 'file type'
+            # because TclpLstat wasn't wrappable until 8.4.
+            catch {
+                while {[string match link [file type $PRIV(SCRIPT)]]} {
+                    set link [file readlink $PRIV(SCRIPT)]
+                    if {[string match relative [file pathtype $link]]} {
+                        set PRIV(SCRIPT) \
+                            [file join [file dirname $PRIV(SCRIPT)] $link]
+                    } else {
+                        set PRIV(SCRIPT) $link
+                    }
+                }
+                catch {unset link}
+                if {[string match relative [file pathtype $PRIV(SCRIPT)]]} {
+                    set PRIV(SCRIPT) [file join [pwd] $PRIV(SCRIPT)]
+                }
+            }
+        }
+    }
+    # normalize argv0 if it was tkcon to ensure that we'll be able
+    # to load slaves correctly.
+    if {[info exists ::argv0] && [info script] == $::argv0} {
+        set ::argv0 $PRIV(SCRIPT)
+    }
+
+    if {(![info exists PRIV(root)] || ![winfo exists $PRIV(root)]) \
+            && (![info exists ::argv0] || $PRIV(SCRIPT) == $::argv0)} {
+        global argv
+        if {[info exists argv]} {
+            eval ::tkcon::Init $argv
+        } else {
+            ::tkcon::Init
+        }
+    }
+}
+tkcon::AtSource
+
+package provide tkcon $::tkcon::VERSION