===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ifplot.h,v
retrieving revision 1.19
retrieving revision 1.26
diff -u -p -r1.19 -r1.26
--- OpenXM_contrib2/asir2000/plot/ifplot.h	2014/05/16 08:49:52	1.19
+++ OpenXM_contrib2/asir2000/plot/ifplot.h	2018/03/29 01:32:55	1.26
@@ -45,9 +45,9 @@
  * 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.18 2014/05/13 20:02:40 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/ifplot.h,v 1.25 2017/09/04 01:57:53 noro Exp $ 
 */
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 /* for Visual C++ */
 #include <windows.h>
 #else
@@ -97,6 +97,7 @@
 #define PLOT "plot"
 #define INTERACTIVE "interactive"
 #define POLARPLOT "polarplot"
+#define POLARPLOTD "polarplotD"
 #define PLOTOVER "plotover"
 #define IFPLOTD "ifplotD"
 #define IFPLOTQ "ifplotQ"
@@ -174,13 +175,14 @@
 #define DRAW_STRING 35
 #define OBJ_CP 36
 #define CLEAR_CANVAS 37
+#define POLARPLOTD 38
 */
 
 #define DIR_X 0
 #define DIR_Y 1
 #define DIR_Z 2
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 /* for Visual C++ */
 #define XC(a) ((a).x)
 #define YC(a) ((a).y)
@@ -211,13 +213,13 @@
 #endif
 
 struct pa {
-	int length;
-	POINT *pos;
+  int length;
+  POINT *pos;
 };
 
 typedef struct RealVect {
-	int len;
-	int body[1];
+  int len;
+  int body[1];
 } RealVect;
 
 #define MKRVECT2(v,x,y)\
@@ -238,40 +240,41 @@ typedef struct RealVect {
 #define RV_ARC 3
 
 struct canvas {
-	int index;
-#if defined(VISUAL)
+  int index;
+#if defined(VISUAL) || defined(__MINGW32__)
 /* 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;
+  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
-	Widget shell,xcoord,ycoord,xdone,ydone,level,wideb,preciseb,noaxisb;
-	Window window;
-	Pixmap pix;
+  Widget shell,xcoord,ycoord,xdone,ydone,level,wideb,preciseb,noaxisb;
+  Window window;
+  Pixmap pix;
 #endif
-	char *wname;
-	char mode;
-	char wide;
-	char precise;
-	char noaxis;
-	V vx,vy;
-	P formula;
-	int width,height;
-	double xmin,xmax;
-	double ymin,ymax;
-	double zmin,zmax;
-	double vmin,vmax;
-	int nzstep;
-	Q qxmin,qxmax;
-	Q qymin,qymax;
-	struct pa *pa;
-	/* to register the history in the interactive mode */
-	NODE history;
-	int color;
-	int division;
+  char *wname;
+  int mode;
+  char wide;
+  char precise;
+  char noaxis;
+  V vx,vy;
+  P formula;
+  int width,height;
+  double xmin,xmax;
+  double ymin,ymax;
+  double zmin,zmax;
+  double vmin,vmax;
+  int nzstep;
+  Q qxmin,qxmax;
+  Q qymin,qymax;
+  struct pa *pa;
+  /* to register the history in the interactive mode */
+  NODE history;
+  unsigned int color;
+  int division;
+  int prec;
 };
 
 extern struct canvas *canvas[];
@@ -280,7 +283,6 @@ extern struct canvas *current_can;
 extern char* pfn[];
 
 #if defined(INTERVAL)
-extern Pixel BackPixel;
 extern int Itvplot;
 #endif
 
@@ -290,7 +292,7 @@ extern int stream;
 extern DISPLAY *display;
 extern CURSOR normalcur,runningcur,errorcur;
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 extern POINT start_point,end_point;
 extern SIZE cansize;
 #else
@@ -300,9 +302,9 @@ extern XFontStruct *sffs;
 #endif
 
 struct xcolorForPS {
-	unsigned long pixel;
-	double r,g,b;
-	int print;
+  unsigned long pixel;
+  double r,g,b;
+  int print;
 };
 
 /* prototypes */
@@ -313,13 +315,14 @@ void qcalc(char **,struct canvas *);
 void calcb(double **,struct canvas *,int);
 void calcq(double **,struct canvas *,int);
 void polarcalc(struct canvas *);
+void polarcalcNG(struct canvas *);
 void sturmseq(VL,P,VECT *);
 void seproot(VECT,int,int,int *);
 int numch(VECT,Q,Q);
 void usubstqp(P,Q,Q *);
 void plotcalc(struct canvas *);
 int open_canvas(NODE);
-int plot(NODE,char *);
+int plot(NODE,int);
 int ifplotold(NODE);
 int polarplot(NODE);
 int conplotD(NODE);
@@ -365,21 +368,20 @@ void itvplotmain1(struct canvas *);
 #endif
 void ifplot_resize(struct canvas *,POINT,POINT);
 void plot_resize(struct canvas *,POINT,POINT);
-void ifplotmainOld(struct canvas *);
 void ifplotmain(struct canvas *);
-void ifplotmains(struct canvas *);
+void ifplotmainNG(struct canvas *);
 void qifplotmain(struct canvas *);
-void if_print(DISPLAY *,double **,struct canvas *,int);
-void if_printOld(DISPLAY *,double **,struct canvas *);
+void if_printNG(DISPLAY *,double **,struct canvas *,int);
+void if_print(DISPLAY *,double **,struct canvas *);
 void memory_if_print(double **,struct canvas *,BYTEARRAY *);
 void con_print(DISPLAY *,double **,struct canvas *);
 void memory_con_print(double **,struct canvas *,BYTEARRAY *);
 void qif_print(DISPLAY *,char **,struct canvas *);
 void plot_print(DISPLAY *,struct canvas *);
 void set_drawcolor(unsigned int);
-void draw_character_string(DISPLAY *,struct canvas *,int,int,char *,int);
-void draw_point(DISPLAY *,struct canvas *,int,int,int);
-void draw_line(DISPLAY *,struct canvas *,int,int,int,int,int);
+void draw_character_string(DISPLAY *,struct canvas *,int,int,char *,unsigned int);
+void draw_point(DISPLAY *,struct canvas *,int,int,unsigned int);
+void draw_line(DISPLAY *,struct canvas *,int,int,int,int,unsigned int);
 void pline(DISPLAY *,struct canvas *,DRAWABLE);
 double adjust_scale(double,double);
 void initmarker(struct canvas *,char *);
@@ -401,7 +403,7 @@ int init_plot_display(int,char **);
 void reset_current_computation();
 void process_xevent();
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 int search_active_canvas();
 void destroy_canvas(struct canvas *can);
 void draw_wideframe(struct canvas *can,DRAWABLE d);