===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/if.c,v
retrieving revision 1.1.1.1
retrieving revision 1.5
diff -u -p -r1.1.1.1 -r1.5
--- OpenXM_contrib2/asir2000/plot/if.c	1999/12/03 07:39:13	1.1.1.1
+++ OpenXM_contrib2/asir2000/plot/if.c	2000/11/09 01:51:12	1.5
@@ -1,4 +1,52 @@
-/* $OpenXM: OpenXM/src/asir99/plot/if.c,v 1.1.1.1 1999/11/10 08:12:34 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+ * non-exclusive and royalty-free license to use, copy, modify and
+ * redistribute, solely for non-commercial and non-profit purposes, the
+ * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+ * conditions of this Agreement. For the avoidance of doubt, you acquire
+ * only a limited right to use the SOFTWARE hereunder, and FLL or any
+ * third party developer retains all rights, including but not limited to
+ * copyrights, in and to the SOFTWARE.
+ * 
+ * (1) FLL does not grant you a license in any way for commercial
+ * purposes. You may use the SOFTWARE only for non-commercial and
+ * non-profit purposes only, such as academic, research and internal
+ * business use.
+ * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+ * international copyright treaties. If you make copies of the SOFTWARE,
+ * with or without modification, as permitted hereunder, you shall affix
+ * to all such copies of the SOFTWARE the above copyright notice.
+ * (3) An explicit reference to this SOFTWARE and its copyright owner
+ * shall be made on your publication or presentation in any form of the
+ * results obtained by use of the SOFTWARE.
+ * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
+ * for such modification or the source code of the modified part of the
+ * SOFTWARE.
+ * 
+ * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+ * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+ * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+ * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+ * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+ * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+ * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+ * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+ * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+ * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+ * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+ * 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/plot/if.c,v 1.4 2000/11/07 06:06:40 noro Exp $ 
+*/
 #include "ca.h"
 #include "parse.h"
 #include "ox.h"
@@ -6,6 +54,32 @@
 
 extern jmp_buf ox_env;
 
+int open_canvas(NODE arg)
+{
+	int id;
+	struct canvas *can;
+	LIST wsize;
+	STRING wname;
+
+	wsize = (LIST)ARG0(arg);
+	wname = (STRING)ARG1(arg);
+
+	can = canvas[id = search_canvas()];
+	can->mode = MODE_INTERACTIVE;
+	if ( !wsize ) {
+		can->width = DEFAULTWIDTH; can->height = DEFAULTHEIGHT;
+	} else {
+		can->width = QTOS((Q)BDY(BDY(wsize)));
+		can->height = QTOS((Q)BDY(NEXT(BDY(wsize))));
+	}
+	if ( wname )
+		can->wname = BDY(wname);
+	else
+		can->wname = "";
+	create_canvas(can);
+	return id;
+}
+
 int plot(NODE arg)
 {
 	int id;
@@ -94,6 +168,7 @@ int plotover(NODE arg)
 
 int drawcircle(NODE arg)
 {
+#if !defined(VISUAL)
 	int id;
 	int index;
 	pointer ptr;
@@ -119,8 +194,69 @@ int drawcircle(NODE arg)
 		copy_to_canvas(can);
 		return index;
 	}
+#endif
 }
 
+int draw_obj(NODE arg)
+{
+	int index;
+	int x,y,u,v,len,r;
+	NODE obj,n;
+	RealVect *vect;
+	struct canvas *can;
+	int color;
+
+	index = QTOS((Q)ARG0(arg));
+	can = canvas[index];
+	if ( !can || !can->window ) {
+		set_lasterror("draw_obj : canvas does not exist");
+		return -1;
+	}
+
+	obj = BDY((LIST)ARG1(arg));
+	if ( argc(arg) == 3 )
+		color = QTOS((Q)ARG2(arg));
+	else
+		color = 0; /* black */
+	switch ( len = length(obj) ) {
+		case 2: /* point */
+			x = (int)ToReal((Q)ARG0(obj)); y = (int)ToReal((Q)ARG1(obj));
+			draw_point(display,can,x,y,color);
+			MKRVECT2(vect,x,y); MKNODE(n,vect,can->history); can->history = n;
+			break;
+		case 3: /* circle */
+			x = (int)ToReal((Q)ARG0(obj)); y = (int)ToReal((Q)ARG1(obj));
+			r = (int)ToReal((Q)ARG2(obj));
+			MKRVECT3(vect,x,y,r); MKNODE(n,vect,can->history); can->history = n;
+			break;
+		case 4: /* line */
+			x = (int)ToReal((Q)ARG0(obj)); y = (int)ToReal((Q)ARG1(obj));
+			u = (int)ToReal((Q)ARG2(obj)); v = (int)ToReal((Q)ARG3(obj));
+			draw_line(display,can,x,y,u,v,color);
+			MKRVECT4(vect,x,y,u,v); MKNODE(n,vect,can->history); can->history = n;
+			break;
+		default:
+			set_lasterror("draw_obj : invalid request");
+			return -1;
+	}
+	return 0;
+}
+
+int clear_canvas(NODE arg)
+{
+	int index;
+	struct canvas *can;
+
+	index = QTOS((Q)ARG0(arg));
+	can = canvas[index];
+	if ( !can || !can->window )
+		return -1;
+	clear_pixmap(can);
+	copy_to_canvas(can);
+	/* clear the history */
+	can->history = 0;
+}
+
 #define RealtoDbl(r) ((r)?BDY(r):0.0)
 
 int arrayplot(NODE arg)
@@ -249,6 +385,9 @@ POINT spos,epos;
 		if ( can->precise && !can->wide ) {
 			current_can = can;
 			alloc_pixmap(ncan);
+#if defined(VISUAL)
+			ncan->real_can = can;
+#endif
 			qifplotmain(ncan);
 			copy_subimage(ncan,can,spos);
 			copy_to_canvas(can);