* tkcon.tcl (::tkcon::InitSlave): adjust to make the first file

	passed in to be argv0 in the slave

diff --git a/ChangeLog b/ChangeLog
index e40b8e8854961d434d82be76fbd059f68e92c63d..57c12ce807ba39b6a92fd7fb319018c861a95c75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-05  Jeff Hobbs  <jeffh@ActiveState.com>
+
+       * tkcon.tcl (::tkcon::InitSlave): adjust to make the first file
+       passed in to be argv0 in the slave
+
 2006-08-25  Jeff Hobbs  <jeffh@ActiveState.com>
 
        * tkcon.tcl (tkcon): default wm protocol to hide tkcon when used

diff --git a/tkcon.tcl b/tkcon.tcl
index aa0d51b15a2bf032d92031bdc5f10c382d961d8c..753fb2753b3da1c9960c6bee08095cfc472bdca7 100755 (executable)
--- a/tkcon.tcl
+++ b/tkcon.tcl
@@ -318,6 +318,7 @@ proc ::tkcon::Init {args} {
     ## and slave is created, but before initializing UI or setting packages.
     set slaveargs {}
     set slavefiles {}
+    set slaveargv0 {}
     set truth {^(1|yes|true|on)$}
     for {set i 0} {$i < $argc} {incr i} {
        set arg [lindex $args $i]
@@ -342,6 +343,9 @@ proc ::tkcon::Init {args} {
                default { lappend slaveargs $arg; incr i -1 }
            }
        } elseif {[file isfile $arg]} {
+           if {$i == 0} {
+               set slaveargv0 $arg
+           }
            lappend slavefiles $arg
        } else {
            lappend slaveargs $arg
@@ -350,7 +354,7 @@ proc ::tkcon::Init {args} {
 
     ## Create slave executable
     if {"" != $OPT(exec)} {
-       uplevel \#0 ::tkcon::InitSlave $OPT(exec) $slaveargs
+       InitSlave $OPT(exec) $slaveargs $slaveargv0
     } else {
        set argc [llength $slaveargs]
        set args $slaveargs
@@ -452,7 +456,7 @@ proc ::tkcon::Init {args} {
 # ARGS:        slave   - name of slave to init.  If it does not exist, it is created.
 #      args    - args to pass to a slave as argv/argc
 ##
-proc ::tkcon::InitSlave {slave args} {
+proc ::tkcon::InitSlave {slave {slaveargs {}} {slaveargv0 {}}} {
     variable OPT
     variable COLOR
     variable PRIV
@@ -488,11 +492,17 @@ proc ::tkcon::InitSlave {slave args} {
        interp eval $slave { catch {rename ::gets ::tkcon_tcl_gets} }
        interp alias $slave ::gets $slave ::tkcon_gets
     }
-    if {[info exists argv0]} {interp eval $slave [list set argv0 $argv0]}
+    if {$slaveargv0 != ""} {
+       # If tkcon was invoked with 1 or more filenames, then make the
+       # first filename argv0 in the slave, as tclsh/wish would do it.
+       interp eval $slave [list set argv0 $slaveargv0]
+    } else {
+       if {[info exists argv0]} {interp eval $slave [list set argv0 $argv0]}
+    }
     interp eval $slave set tcl_interactive $tcl_interactive \; \
            set auto_path [list [lremove $auto_path $tk_library]] \; \
-           set argc [llength $args] \; \
-           set argv  [list $args] \; {
+           set argc [llength $slaveargs] \; \
+           set argv  [list $slaveargs] \; {
        if {![llength [info command bgerror]]} {
            proc bgerror err {
                global errorInfo