===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ox_plot.c,v
retrieving revision 1.10
retrieving revision 1.15
diff -u -p -r1.10 -r1.15
--- OpenXM_contrib2/asir2000/plot/ox_plot.c	2000/11/09 01:51:12	1.10
+++ OpenXM_contrib2/asir2000/plot/ox_plot.c	2001/12/27 07:51:18	1.15
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/plot/ox_plot.c,v 1.9 2000/11/07 06:06:40 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/ox_plot.c,v 1.14 2001/12/25 02:39:07 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -63,11 +63,12 @@ extern int asir_OperandStackSize;
 extern Obj *asir_OperandStack;
 extern int asir_OperandStackPtr;
 
+/* environement is defined in libpari.a */
 extern jmp_buf environnement;
 
 extern int do_message;
 extern int ox_flushing;
-extern jmp_buf ox_env;
+extern JMP_BUF ox_env;
 extern MATHCAP my_mathcap;
 extern char LastError[];
 
@@ -102,16 +103,20 @@ void ox_plot_main(int argc,char **argv)
 	int ds;
 	fd_set r;
 	int n;
+	int use_x;
 
 #if !defined(VISUAL)
 	ox_asir_init(argc,argv);
-	init_plot_display(argc,argv);
-	ds = ConnectionNumber(display);
+	use_x = init_plot_display(argc,argv);
+	if ( use_x )
+		ds = ConnectionNumber(display);
+	else
+		fprintf(stderr,"Entering no X mode\n");
 #endif
 	if ( do_message )
 		fprintf(stderr,"I'm an ox_plot, Version %d.\n",ASIR_VERSION);
 
-	if ( setjmp(ox_env) ) {
+	if ( SETJMP(ox_env) ) {
 		while ( NEXT(asir_infile) )
 			closecurrentinput();
 		reset_current_computation();
@@ -123,7 +128,7 @@ void ox_plot_main(int argc,char **argv)
 #else
 		if ( ox_data_is_available(0) )
 			process_ox();
-		else {
+		else if ( use_x ) {
 			FD_ZERO(&r);
 			FD_SET(3,&r); FD_SET(ds,&r);
 			select(FD_SETSIZE,&r,NULL,NULL,NULL);
@@ -155,7 +160,7 @@ static void process_ox()
 				break;
 			if ( do_message )
 				fprintf(stderr," %s\n",name_of_cmd(cmd));
-			if ( ret = setjmp(env) ) {
+			if ( ret = SETJMP(main_env) ) {
 				if ( ret == 1 ) {
 					create_error(&err,serial,LastError);
 					asir_push_one((Obj)err);
@@ -238,8 +243,7 @@ static void asir_do_cmd(unsigned int cmd,unsigned int 
 	}
 }
 
-static void asir_executeFunction(serial)
-int serial;
+static void asir_executeFunction(int serial)
 { 
 	char *func;
 	int argc;
@@ -249,6 +253,7 @@ int serial;
 	VL vl;
 	ERR err;
 	NODE n,n1; 
+	LIST bytes;
 
 	func = ((STRING)asir_pop_one())->body;
 	argc = (int)(((USINT)asir_pop_one())->body);
@@ -263,6 +268,8 @@ int serial;
 	if ( !strcmp(func,"plot") ) {
 		id = plot(n);
 		STOQ(id,ret); asir_push_one((Obj)ret);
+	} else if ( !strcmp(func,"memory_plot") ) {
+		memory_plot(n,&bytes); asir_push_one((Obj)bytes);
 	} else if ( !strcmp(func,"arrayplot") ) {
 		id = arrayplot(n);
 		STOQ(id,ret); asir_push_one((Obj)ret);