===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ifplot.h,v
retrieving revision 1.3
retrieving revision 1.7
diff -u -p -r1.3 -r1.7
--- OpenXM_contrib2/asir2000/plot/ifplot.h	2000/08/22 05:04:31	1.3
+++ OpenXM_contrib2/asir2000/plot/ifplot.h	2000/12/05 01:24:59	1.7
@@ -45,16 +45,11 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/plot/ifplot.h,v 1.2 2000/08/21 08:31:50 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/ifplot.h,v 1.6 2000/11/09 02:30:44 noro Exp $ 
 */
-#if defined(THINK_C)
-#include        <QuickDraw.h>
-#include        <Windows.h>
-#include        <Events.h>
-#include        <OSUtils.h>
-#include        <ToolUtils.h>
-#include        <Fonts.h>
-/* #include        <Strings.h> */
+#if defined(VISUAL)
+/* for Visual C++ */
+#include <windows.h>
 #else
 #include <sys/types.h>
 #include <X11/Xlib.h>
@@ -91,43 +86,37 @@
 #define C_APLOT C_PRIV+7
 #define C_DRAWCIRCLE C_PRIV+8
 
-#define MAXCANVAS 16
+#define MAXCANVAS 64
 #define MAXGC 16
-#if defined(THINK_C)
-#define DEFAULTWIDTH 200
-#define DEFAULTHEIGHT 200
-#else
 #define DEFAULTWIDTH 400
 #define DEFAULTHEIGHT 400
-#endif
 
 #define MODE_IFPLOT 0
 #define MODE_CONPLOT 1
 #define MODE_PLOT 2
+#define MODE_INTERACTIVE 3
 
 #define DIR_X 0
 #define DIR_Y 1
 #define DIR_Z 2
 
-#if defined(THINK_C)
-#define COPYBITS
-
-#define POINT Point
-#define XC(a) ((a).h)
-#define YC(a) ((a).v)
-#define DRAWPOINT(d,p,g,x,y) MoveTo(x,y); Line(0,0)
-#define DRAWLINE(d,p,g,x,y,u,v) MoveTo(x,y); LineTo(u,v)
-#define DRAWSTRING(d,p,g,x,y,s,l) MoveTo(x,y); DrawText(s,0,l)
-#define TEXTWIDTH(f,s,l) TextWidth(s,0,l)
+#if defined(VISUAL)
+/* for Visual C++ */
+#define XC(a) ((a).x)
+#define YC(a) ((a).y)
 #define DISPLAY int
-#define WINDOW WindowPtr
-#define CURSOR CursHandle
-#ifndef COPYBITS
-#define DRAWABLE PicHandle
+#define WINDOW int
+#define CURSOR int
+#define DRAWABLE HDC
+
+/* XXX : use GC argument as the color */
+#define DRAWPOINT(d,p,g,x,y) SetPixel(p,x,y,0) 
+
+#define DRAWLINE(d,p,g,x,y,u,v) MoveToEx(p,x,y,&oldpos); LineTo(p,u,v)
+#define DRAWSTRING(d,p,g,x,y,s,l) TextOut(p,x,y,s,l)
+/* #define TEXTWIDTH(f,s,l) */
 #else
-#define DRAWABLE BitMap
-#endif
-#else
+/* for UNIX */
 #define POINT XPoint
 #define XC(a) ((a).x)
 #define YC(a) ((a).y)
@@ -146,19 +135,36 @@ struct pa {
 	POINT *pos;
 };
 
+typedef struct RealVect {
+	int len;
+	int body[1];
+} RealVect;
+
+#define MKRVECT2(v,x,y)\
+((v)=(RealVect *)MALLOC_ATOMIC(sizeof(RealVect)+sizeof(int)),\
+ (v)->len=2,(v)->body[0]=(x),(v)->body[1]=(y))
+#define MKRVECT3(v,x,y,z)\
+((v)=(RealVect *)MALLOC_ATOMIC(sizeof(RealVect)+2*sizeof(int)),\
+ (v)->len=3,(v)->body[0]=(x),(v)->body[1]=(y),(v)->body[2]=(z))
+#define MKRVECT4(v,x,y,z,u)\
+((v)=(RealVect *)MALLOC_ATOMIC(sizeof(RealVect)+3*sizeof(int)),\
+ (v)->len=4,(v)->body[0]=(x),(v)->body[1]=(y),(v)->body[2]=(z),(v)->body[3]=(u))
+
+#define RV_POINT 1
+#define RV_LINE 2
+#define RV_ARC 3
+
 struct canvas {
 	int index;
-#if defined(THINK_C)
-	Rect rect;
-	WindowRecord record;
-	WindowPtr window;
-#ifndef COPYBITS
-	PicHandle pix;
+#if defined(VISUAL)
+/* for Visual C++ */
+	void *window; /* pointer to CMainFrame */
+	HWND hwnd; /* handle to the canvas window */
+	HDC pix; /* shadow DC on memory */
+	char *prefix;
+	int percentage;
+	struct canvas *real_can;
 #else
-	BitMap pix,wbits;
-	RgnHandle rgnsav;
-#endif
-#else
 	Widget shell,xcoord,ycoord,xdone,ydone,level,wideb,preciseb,noaxisb;
 	Window window;
 	Pixmap pix;
@@ -178,21 +184,24 @@ struct canvas {
 	Q qxmin,qxmax;
 	Q qymin,qymax;
 	struct pa *pa;
+	/* to register the history in the interactive mode */
+	NODE history;
 };
 
 extern struct canvas *canvas[];
 extern struct canvas *current_can;
 
-#ifdef INET
 extern VL CO;
 extern int stream;
-#endif
 
 extern DISPLAY *display;
 extern CURSOR normalcur,runningcur,errorcur;
 
-#if !defined(THINK_C)
+#if defined(VISUAL)
+extern POINT start_point,end_point;
+extern SIZE cansize;
+#else
 extern Window rootwin;
-extern GC drawGC,dashGC,hlGC,scaleGC,clearGC,xorGC,colorGC;
+extern GC drawGC,dashGC,hlGC,scaleGC,clearGC,xorGC,colorGC,cdrawGC;
 extern XFontStruct *sffs;
 #endif