===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/engine2000/plot.c,v
retrieving revision 1.9
retrieving revision 1.13
diff -u -p -r1.9 -r1.13
--- OpenXM_contrib2/windows/engine2000/plot.c	2014/05/09 17:45:49	1.9
+++ OpenXM_contrib2/windows/engine2000/plot.c	2019/03/28 07:04:13	1.13
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/windows/engine2000/plot.c,v 1.8 2014/03/25 19:30:18 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/windows/engine2000/plot.c,v 1.12 2017/08/30 09:40:31 ohara Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -184,19 +184,8 @@ static void process_ox(int id, Obj obj, unsigned int s
 	ERR err;
 	int ret;
 	extern char LastError[];
-	extern int recv_intr;
 
-#if defined(VISUAL)
-	if ( recv_intr ) {
-		if ( recv_intr == 1 ) {
-			recv_intr = 0;
-			int_handler(SIGINT);
-		} else {
-			recv_intr = 0;
-			ox_usr1_handler(0);
-		}
-	}
-#endif
+	check_intr();
 	if ( do_message )
 		fprintf(stderr,"#%d Got %s",serial,name_of_id(id));
 	switch ( id ) {
@@ -235,13 +224,17 @@ static void process_ox(int id, Obj obj, unsigned int s
 
 static void process_resize(struct canvas *can,POINT startp,POINT endp)
 {
-	if ( can->mode == MODE_INTERACTIVE || can->mode == MODE_POLARPLOT )
+	if ( can->mode == modeNO(INTERACTIVE) || can->mode == modeNO(POLARPLOT) )
 		return;
 
-	if ( can->mode == MODE_PLOT )
+#if 0
+	if ( can->mode == modeNO(PLOT) )
 		plot_resize(can,startp,endp);
 	else
 		ifplot_resize(can,startp,endp);
+#else
+	plot_resize(can,startp,endp);
+#endif
 }
 
 static void asir_do_cmd(unsigned int cmd,unsigned int serial)
@@ -249,7 +242,7 @@ static void asir_do_cmd(unsigned int cmd,unsigned int 
 	MATHCAP client_mathcap;
 	LIST list;
 	int i;
-	Q q;
+	Z q;
 
 	switch ( cmd ) {
 		case SM_dupErrors:
@@ -258,7 +251,7 @@ static void asir_do_cmd(unsigned int cmd,unsigned int 
 			break;
 		case SM_getsp:
 			i = asir_OperandStackPtr+1;
-			STOQ(i,q);
+			STOZ(i,q);
 			asir_push_one((Obj)q);
 			break;
 		case SM_popSerializedLocalObject:
@@ -306,7 +299,7 @@ static void asir_executeFunction(int serial)
 	char *func;
 	int argc;
 	int id;
-	Q ret;
+	Z ret;
 	ERR err;
 	NODE n,n1; 
 
@@ -321,17 +314,17 @@ static void asir_executeFunction(int serial)
 		NEXT(n1) = 0;
 	id = -1;
 	if ( !strcmp(func,"plot") ) {
-		id = plot(n,MODE_PLOT);
-		STOQ(id,ret); asir_push_one((Obj)ret);
+		id = plot(n,modeNO(PLOT));
+		STOZ(id,ret); asir_push_one((Obj)ret);
 	}else if ( !strcmp(func,"ifplot") ) {
-		id = plot(n,MODE_IFPLOT);
-		STOQ(id,ret); asir_push_one((Obj)ret);
+		id = plot(n,modeNO(IFPLOT));
+		STOZ(id,ret); asir_push_one((Obj)ret);
 	} else if ( !strcmp(func,"arrayplot") ) {
 		id = arrayplot(n);
-		STOQ(id,ret); asir_push_one((Obj)ret);
+		STOZ(id,ret); asir_push_one((Obj)ret);
 	} else if ( !strcmp(func,"open_canvas") ) {
 		id = open_canvas(n);
-		STOQ(id,ret); asir_push_one((Obj)ret);
+		STOZ(id,ret); asir_push_one((Obj)ret);
 	} else if ( !strcmp(func,"plotover") ) {
 		plotover(n);
 	} else if ( !strcmp(func,"drawcircle") ) {