[Maxima-commits] CVS: maxima/interfaces/xmaxima/Tkmaxima RunMaxima.tcl,1.8,1.9

[Mike C. <mik...@us...>]

Update of /cvsroot/maxima/maxima/interfaces/xmaxima/Tkmaxima
In directory usw-pr-cvs1:/tmp/cvs-serv32554

Modified Files:
	RunMaxima.tcl 
Log Message:
Signal socket failures to the user - maxima has died

Index: RunMaxima.tcl
===================================================================
RCS file: /cvsroot/maxima/maxima/interfaces/xmaxima/Tkmaxima/RunMaxima.tcl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- RunMaxima.tcl	11 Sep 2002 01:09:40 -0000	1.8
+++ RunMaxima.tcl	13 Sep 2002 17:40:58 -0000	1.9
@@ -77,11 +77,13 @@
 }
 
 proc openMaxima { win filter } {
-    global maxima_priv env
+    global maxima_priv env maxima_default
 
-    set port [acceptMaxima $win 4008 $filter]
+    set port $maxima_default(iLocalPort)
+    set port [acceptMaxima $win $port $filter]
     if { $port >= 0 } {
 	set com ""
+	# if {$maxima_priv(platform) == "cygwin"} {set com "/bin/bash "}
 	append com    $maxima_priv(localMaximaServer)
 	regsub PORT $com $port com
 	if { [info exists env(MAXIMA_INT_INPUT_STRING)] } {
@@ -277,10 +279,8 @@
 	vwait [oloc $win pid]
 	after cancel $af
 	if { $pid  == -1 } {
-	    if { "[info  command console]" != "" } { console show }
-	    if { [tk_dialog .jim ask {Starting maxima timed out.  Wait longer?} \
-		      {} yes  no yes ] } {
-		list
+	    if {[tide_yesno {Starting maxima timed out.  Wait longer?}]} {
+		continue
 	    } else {
 		closeMaxima $win
 		set err   "runOneMaxima timed out"
@@ -288,7 +288,7 @@
 		if { [info exists pdata(maximaInit,[oget $win socket])] } {
 		    append err : $pdata(maximaInit,[oget $win socket])
 		}
-		error $err
+		return -code error $err
 	    }
 	}
     }
@@ -308,8 +308,20 @@
     if { ![regexp "\[\$;\]\[ \t\n\r\]*\$" $form ] } {
 	# append form ";"
     }
-    puts -nonewline $maximaSocket $form
-    flush $maximaSocket
+    if {[catch {
+	puts -nonewline $maximaSocket $form
+	flush $maximaSocket} err]} {
+	set mes "Error sending to Maxima:"
+	if {[string match "can not find channel named*" err]} {
+	    # The maxima went away
+	    set maximaSocket ""
+	    unset maximaSocket
+	    set mess [M "$mess\n%s\nYou must Restart" $err]
+	} else {
+	    set mess [M "$mess:\n%s\nYou may need to Restart" $err]
+	}
+	tide_failure $mess
+    }
 }
 
 
@@ -321,7 +333,7 @@
     if { ![regexp "\[\$;\]|^\[ \t]*:" $form ] } {
 	append form ";"
     }
-    sendMaximaCall $win $form\n [list oset $win maximaWait 1]
+    sendMaximaCall $win "$form\n" [list oset $win maximaWait 1]
     #mike FIXME: This should be a counter
     set maximaWait -1
     set af [after $timeout oset $win maximaWait -1]
@@ -372,8 +384,21 @@
     } else {
 	catch { unset pdata($maximaSocket,wait) }
     }
-    puts -nonewline $maximaSocket $form
-    flush $maximaSocket
+    if {[catch {
+	puts -nonewline $maximaSocket $form
+	flush $maximaSocket} err]} {
+	set mes "Error sending to Maxima:"
+	if {[string match "can not find channel named*" err]} {
+	    # The maxima went away
+	    set maximaSocket ""
+	    unset maximaSocket
+	    set mess [M "$mess\n%s\nYou must Restart" $err]
+	} else {
+	    set mess [M "$mess:\n%s\nYou may need to Restart" $err]
+	}
+	tide_failure $mess
+	return
+    }
     if { [info exists counter] } {
 	setAction pdata($maximaSocket,result) $call
     }