===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/tcpf.c,v
retrieving revision 1.29
retrieving revision 1.34
diff -u -p -r1.29 -r1.34
--- OpenXM_contrib2/asir2000/io/tcpf.c	2001/12/25 08:59:49	1.29
+++ OpenXM_contrib2/asir2000/io/tcpf.c	2002/08/02 09:43:12	1.34
@@ -44,7 +44,7 @@
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
- * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.28 2001/12/25 05:28:39 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/tcpf.c,v 1.33 2002/08/02 02:28:28 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -491,24 +491,46 @@ static int get_start_path(char *buf)
 		return 1;
 	}
 
+	/* Windows98 */
+	strcpy(buf,"c:\\windows\\command\\start.exe");
+	cygwin_conv_to_full_posix_path(buf,name);
+	if ( !access(name,X_OK) ) {
+		bslash2slash(buf);
+		strcpy(start_path,buf);
+		start_initialized  = 1;
+		return 1;
+	}
+
 	/* Windows2000 */
 	strcpy(buf,"c:\\winnt\\system32\\start.exe");
 	cygwin_conv_to_full_posix_path(buf,name);
 	if ( !access(name,X_OK) ) {
 		bslash2slash(buf);
 		strcpy(start_path,buf);
+		start_initialized  = 1;
 		return 1;
 	}
 
-	/* Windows98 */
-	strcpy(buf,"c:\\windows\\command\\start.exe");
+	strcpy(buf,"c:\\winnt\\system32\\cmd.exe");
 	cygwin_conv_to_full_posix_path(buf,name);
 	if ( !access(name,X_OK) ) {
 		bslash2slash(buf);
-		strcpy(start_path,buf);
+		sprintf(start_path,"%s /c start",buf);
+		strcpy(buf,start_path);
+		start_initialized  = 1;
 		return 1;
 	}
 
+	strcpy(buf,"c:\\windows\\system32\\cmd.exe");
+	cygwin_conv_to_full_posix_path(buf,name);
+	if ( !access(name,X_OK) ) {
+		bslash2slash(buf);
+		sprintf(start_path,"%s /c start",buf);
+		strcpy(buf,start_path);
+		start_initialized  = 1;
+		return 1;
+	}
+
 	return 0;
 }
 
@@ -538,7 +560,7 @@ void spawn_server(char *host,char *launcher,char *serv
 	char *control_port_str,char *server_port_str)
 {
 	char localhost[BUFSIZ];
-	char *dname,*conn_str,*rsh,*dname0;
+	char *dname,*conn_str,*rsh,*dname0,*asirhost;
 	char AsirExe[BUFSIZ];
 	STRING rootdir;
 	char prog[BUFSIZ];
@@ -566,7 +588,11 @@ void spawn_server(char *host,char *launcher,char *serv
 		 */
 		use_ssh = 1;
 	}
-	gethostname(localhost,BUFSIZ);
+	asirhost = (char *)getenv("ASIRHOSTNAME");
+	if ( asirhost )
+		strcpy(localhost,asirhost);
+	else
+		gethostname(localhost,BUFSIZ);
 #if defined(VISUAL)
 	if ( !use_unix )
 		error("spawn_server : not implemented on Windows");
@@ -590,8 +616,15 @@ void spawn_server(char *host,char *launcher,char *serv
 	if ( use_unix || !host ) {
 #if defined(__CYGWIN__)
 		get_launcher_path(win_launcher);
-		if ( dname && get_start_path(win_start) ) {
-  			sprintf(cmd,"%s %s %s %s %s %s %s 1",
+		if ( dname && strchr(dname,':') ) {
+			if ( !fork() ) {
+				setpgid(0,getpid());
+				execlp("xterm","xterm","-name",OX_XTERM,"-T","ox_launch:local","-display",dname,
+					"-geometry","60x10","-e",launcher,use_unix?".":"127.1",conn_str,
+					control_port_str,server_port_str,server,dname,0);
+			}
+		} else if ( dname && get_start_path(win_start) ) {
+  		sprintf(cmd,"%s %s %s %s %s %s %s 1",
 				win_start,win_launcher,use_unix?".":"127.1",conn_str,
 				control_port_str,server_port_str,server);	
 			system(cmd);
@@ -1213,4 +1246,44 @@ void shutdown_all() {
 		m_c_tab[index].m = 0; m_c_tab[index].c = 0;
 		m_c_tab[index].af_unix = 0;
 	}
+}
+
+char *ox_get_servername(int);
+
+int is_ox_plot(int index)
+{
+	char *name;
+
+	check_valid_mctab_index(index);
+	if ( index < 0 )
+		return 0;
+	/* m : client, c : server ??? */
+	name = ox_get_servername(m_c_tab[index].c);
+	return strcmp(name,"ox_plot") ? 0 : 1;
+}
+
+int validate_ox_plot_stream(int index)
+{
+	int i;
+	NODE arg;
+	STRING name;
+	Obj r;
+
+	if ( is_ox_plot(index) )
+		return index;
+	for ( i = 0; i < m_c_i; i++ )
+		if ( is_ox_plot(i) )
+			return i;
+
+	/* create an ox_plot server */
+	MKSTR(name,"ox_plot");
+	arg = mknode(2,0,name);
+	Pox_launch_nox(arg,&r);
+	i = QTOS((Q)r);
+#if defined(VISUAL)
+	Sleep(100);
+	ox_send_cmd(m_c_tab[i].c,SM_nop);
+	ox_flush_stream_force(m_c_tab[i].c);
+#endif
+	return i;
 }