===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/glib,v
retrieving revision 1.5
retrieving revision 1.17
diff -u -p -r1.5 -r1.17
--- OpenXM_contrib2/asir2000/lib/glib	2002/07/14 03:57:24	1.5
+++ OpenXM_contrib2/asir2000/lib/glib	2006/03/03 10:36:18	1.17
@@ -1,7 +1,13 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/lib/glib,v 1.4 2002/07/10 08:40:58 takayama Exp $ */
-/* $Id: glib,v 1.5 2002/07/14 03:57:24 takayama Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/lib/glib,v 1.16 2004/03/14 12:56:47 takayama Exp $ */
 
+/* BUG: this library has not yet been adapted to the new automatic launcher
+        of ox_plot. 2002, Aug, 4.  Do not load glib more than twice. 
+*/
 
+extern Cfep_loaded$
+
+#define DO_NOT_START_SERVER_EXPLICITLY
+
 /* #define CLIP  1 */
 /* #define DEBUG 1 */
 #define LIST  4
@@ -24,16 +30,18 @@ def roots(F) {
 */
 
 /*  ---------------------------------------------- */
-def ox_get_errors(P) {
+def glib_ox_get_errors(P) {
   ox_push_cmd(P,276);
   return(ox_pop_cmo(P));
 }
 
 def reset_plot() {   
   extern Glib_process;
-  print("  Sending signal to ox_plot",0);
-  ox_reset(Glib_process);
-  print("  Done.");
+  if (!Cfep_loaded) {
+    print("  Sending signal to ox_plot",0);
+    ox_reset(Glib_process);
+    print("  Done.");
+  }
 }
 Glib_ps = 0$
 Glib_h = []$
@@ -41,37 +49,75 @@ Glib_canvas_x = 400$
 Glib_canvas_y = 400$
 Glib_xmin=0$  Glib_xmax=Glib_canvas_x$
 Glib_ymin=0$  Glib_ymax=Glib_canvas_y$
-#define START_SERVER \
-extern Glib_server_started, Glib_process$ \
-if (type(Glib_server_started) == 0) { \
-  Glib_process = ox_launch_nox(0,"ox_plot")$ \
-  register_handler(reset_plot); \
-  Glib_server_started = 1$ \
-}$
+Glib_math_coordinate=0$
 
+
 Glib_canvas = -1$
 Glib_xmag = 1$ Glib_ymag=1$ Glib_xoffset=0$ Glib_yoffset=0$
 Glib_safe_mode = 2 $
 Glib_counter = 100$
 
+extern Glib_ps_sx$
+extern Glib_ps_sy$
+Glib_ps_sx=2$  /* mag=1/2 for PS picture. cf. glib_ps_form, glib_tops */
+Glib_ps_sy=2$  /* mag=1/2 for PS picture */ 
+
 def open_Canvas(P,S) {
-  open_canvas(P,S);
-  R = ox_pop_cmo(P);
-/*
-  if (ox_get_errors(P) == []) {
+  extern Glib_process;
+  /* print("open_Canvas: ",0);print(S); */
+  if (!Cfep_loaded) {
+    if (P < 0) P=open_canvas(S); /* BUG, get process No. */
+    else open_canvas(P,S);
+    Glib_process = P; 
     R = ox_pop_cmo(P);
+    /*
+    if (glib_ox_get_errors(P) == []) {
+      R = ox_pop_cmo(P);
+    }else{
+      debug;
+    }
+    */
   }else{
-    debug;
+    R=cfep.open_canvas(S);
   }
-*/
   return(R);
 }
 
+/*&usage begin: glib_open()
+  It starts the ox_plot server and opens a canvas.
+  The canvas size is set to {Glib_canvas_x} X {Glib_canvas_y}
+  (the default value is 400). 
+  This function is automatically called when the user calls glib
+  functions.
+end: */
+
 def glib_open() {
   extern Glib_canvas_x, Glib_canvas_y,
-         Glib_process, Glib_canvas;
-  START_SERVER  
+         Glib_process, Glib_canvas,
+         Glib_server_started, Glib_process$
+  if (!Cfep_loaded) return glib_openx11();
+  else {
+    Glib_canvas = open_Canvas(-1,[Glib_canvas_x,Glib_canvas_y])$
+    Glib_server_started = 1$ 
+    return(Glib_canvas);
+  }
+}
+def glib_openx11() {
+  extern Glib_canvas_x, Glib_canvas_y,
+         Glib_process, Glib_canvas,
+         Glib_server_started, Glib_process$
+#ifndef DO_NOT_START_SERVER_EXPLICITLY
+  if (type(Glib_server_started) == 0) { 
+    Glib_process = ox_launch_nox(0,"ox_plot")$ 
+    register_handler(reset_plot); 
+    Glib_server_started = 1$ 
+  }$
   Glib_canvas = open_Canvas(Glib_process,[Glib_canvas_x,Glib_canvas_y])$
+#else
+  Glib_canvas = open_Canvas(-1,[Glib_canvas_x,Glib_canvas_y])$
+  register_handler(reset_plot); 
+  Glib_server_started = 1$ 
+#endif
   glib_check_strict();
   return(Glib_canvas);
 }
@@ -98,7 +144,8 @@ def glib_check_strict() {
   if (Glib_canvas < 0) {
     glib_open();
   }
-  E = ox_get_errors(Glib_process);
+  if (Cfep_loaded) return ;
+  E = glib_ox_get_errors(Glib_process);
   if (E != []) {
     ox_pops(Glib_process,200);
     print(E);
@@ -113,12 +160,15 @@ def glib_check_strict() {
 def glib_clear() {
   extern Glib_process, Glib_canvas;
   if (Glib_canvas < 0) glib_open();
-  clear_canvas(Glib_process,Glib_canvas);
+  if (!Cfep_loaded) clear_canvas(Glib_process,Glib_canvas);
 }
 
 /*&usage begin: glib_window(Xmin,Ymin,Xmax,Ymax)
   It generates a window with the left top corner [{Xmin},{Ymin}] and
   the right bottom corner [{Xmax},{Ymax}].
+  If the global variable {Glib_math_coordinate} is set to 1, mathematical
+  coordinate system will be employed, i.e., the left top
+  corner will have the coordinate [{Xmin},{Ymax}].
   example: glib_window(-1,-1,10,10);
 end: */
 def glib_window(Xmin,Ymin,Xmax,Ymax) {
@@ -147,30 +197,42 @@ def glib_check_arg(X,Y) {
   }
 }
 
-/*&usage begin: glib_putpixel(X,Y | color)
+/*&usage begin: glib_putpixel(X,Y|color)
   It puts a pixel at [{X},{Y}] with {color}
   example: glib_putpixel(1,2 | color=0xffff00);
 end: */
 def glib_putpixel(X,Y) {
   extern Glib_process, Glib_canvas,
-         Glib_xoffset, Glib_yoffset, Glib_xmag, Glib_ymag, Glib_ps;
+         Glib_xoffset, Glib_yoffset, Glib_xmag, Glib_ymag, Glib_ps,
+         Glib_math_coordinate, Glib_canvas_y;
   if (Glib_canvas < 0) glib_open();
   glib_check();
   glib_check_arg(X,Y);
   C = getopt(color);
-  Pos = [glib_floor(Glib_xmag*(X+Glib_xoffset)),
-         glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+  if (Glib_math_coordinate) {
+    Pos = [glib_floor(Glib_xmag*(X+Glib_xoffset)),
+           Glib_canvas_y-glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+    Pos2= [glib_floor(Glib_xmag*(X+Glib_xoffset)),
+           glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+  }else{
+    Pos = [glib_floor(Glib_xmag*(X+Glib_xoffset)),
+           glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+    Pos2= [glib_floor(Glib_xmag*(X+Glib_xoffset)),
+           Glib_canvas_y-glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+  }
   if ( type(C) != -1 ) {
-    draw_obj(Glib_process,Glib_canvas,Pos,C);
-    if (Glib_ps) glib_history(["putpixel",Pos,C]);
+    if (!Cfep_loaded) draw_obj(Glib_process,Glib_canvas,Pos,C);
+    else cfep.draw_obj2(Glib_process,Glib_canvas,Pos,C);
+    if (Glib_ps) glib_history(["putpixel",Pos2,C]);
   }else{
-    draw_obj(Glib_process,Glib_canvas,Pos);
-    if (Glib_ps) glib_history(["putpixel",Pos,0]);
+    if (!Cfep_loaded) draw_obj(Glib_process,Glib_canvas,Pos);
+    else cfep.draw_obj(Glib_process,Glib_canvas,Pos);
+    if (Glib_ps) glib_history(["putpixel",Pos2,0]);
   }
 }
 
-/*&usage begin: glib_line(X0,Y0,X1,Y1 | color)
-  It draw the line [{X0},{Y0}]-- [{X1},{Y1}]with {color}
+/*&usage begin: glib_line(X0,Y0,X1,Y1|color)
+  It draws the line [{X0},{Y0}]-- [{X1},{Y1}] with {color}
   example: glib_line(0,0,5,3/2 | color=0xff00ff);
 end: */
 def glib_line(X0,Y0,X1,Y1) {
@@ -188,7 +250,7 @@ def glib_clip_line(X0,Y0,X1,Y1,Color) {
   /* X0, Y0, X1, Y1 should be integers. 
      Coordinates are already translated. */
   extern Glib_process, Glib_canvas, Glib_canvas_x, Glib_canvas_y,
-         Glib_ps;
+         Glib_ps,  Glib_math_coordinate;
   if (Glib_canvas < 0) glib_open();
 
 if (Glib_ps) {
@@ -230,13 +292,23 @@ if (Glib_ps) {
 }
 
   glib_check();
-  Pos = [glib_floor(X0),glib_floor(Y0),glib_floor(X1),glib_floor(Y1)];
+  if (Glib_math_coordinate) {
+    Pos = [glib_floor(X0),Glib_canvas_y-glib_floor(Y0),
+           glib_floor(X1),Glib_canvas_y-glib_floor(Y1)];
+    Pos2= [glib_floor(X0),glib_floor(Y0),glib_floor(X1),glib_floor(Y1)];
+  }else{
+    Pos = [glib_floor(X0),glib_floor(Y0),glib_floor(X1),glib_floor(Y1)];
+    Pos2 = [glib_floor(X0),Glib_canvas_y-glib_floor(Y0),
+           glib_floor(X1),Glib_canvas_y-glib_floor(Y1)];
+  }
   if ( type(Color) != -1 ) {
-    draw_obj(Glib_process,Glib_canvas,Pos,Color);
-    if (Glib_ps) glib_history(["line",Pos,Color]);
+    if (!Cfep_loaded) draw_obj(Glib_process,Glib_canvas,Pos,Color);
+    else cfep.draw_obj2(Glib_process,Glib_canvas,Pos,Color);
+    if (Glib_ps) glib_history(["line",Pos2,Color]);
   }else{
-    draw_obj(Glib_process,Glib_canvas,Pos);
-    if (Glib_ps) glib_history(["line",Pos,0]);
+    if (!Cfep_loaded) draw_obj(Glib_process,Glib_canvas,Pos);
+    else cfep.draw_obj(Glib_process,Glib_canvas,Pos);
+    if (Glib_ps) glib_history(["line",Pos2,0]);
   }
 }
 
@@ -281,31 +353,44 @@ def glib_clip1_y(X0,Y0,X1,Y1,Clip) {
    return([X0,Y0,X1,Y1]);
 }
 
-/*&usage begin:glib_print(X,Y,Text|color)
+/*&usage begin: glib_print(X,Y,Text|color)
   It put a string {Text} at [{X},{Y}] on the glib canvas.
   example: glib_print(100,100,"Hello Worlds" | color=0xff0000);
 end: */
 def glib_print(X,Y,Text) {
   extern Glib_process, Glib_canvas,
-         Glib_xoffset, Glib_yoffset, Glib_xmag, Glib_ymag, Glib_ps;
+         Glib_xoffset, Glib_yoffset, Glib_xmag, Glib_ymag, Glib_ps,
+         Glib_math_coordinate, Glib_canvas_y;
   if (Glib_canvas < 0) glib_open();
   glib_check();
   glib_check_arg(X,Y);
   if (type(Text) != 7) error("glib_print(X,Y,Text): Text must be a string.");
   C = getopt(color);
-  Pos = [glib_floor(Glib_xmag*(X+Glib_xoffset)),
-         glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+  if (Glib_math_coordinate) {
+    Pos = [glib_floor(Glib_xmag*(X+Glib_xoffset)),
+           Glib_canvas_y-glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+    Pos2= [glib_floor(Glib_xmag*(X+Glib_xoffset)),
+           glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+  }else{
+    Pos = [glib_floor(Glib_xmag*(X+Glib_xoffset)),
+           glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+    Pos2= [glib_floor(Glib_xmag*(X+Glib_xoffset)),
+           Glib_canvas_y-glib_floor(Glib_ymag*(Y+Glib_yoffset))];
+  }
   if ( type(C) != -1 ) {
-    draw_string(Glib_process,Glib_canvas,Pos,Text,C);
-    if (Glib_ps) glib_history(["print",Pos,Text,C]);
+    if (!Cfep_loaded) draw_string(Glib_process,Glib_canvas,Pos,Text,C);
+    else cfep.draw_string2(Glib_process,Glib_canvas,Pos,Text,C);
+    if (Glib_ps) glib_history(["print",Pos2,Text,C]);
   }else{
-    draw_string(Glib_process,Glib_canvas,Pos,Text);
-    if (Glib_ps) glib_history(["print",Pos,Text,0]);
+    if (!Cfep_loaded) draw_string(Glib_process,Glib_canvas,Pos,Text);
+    else cfep.draw_string(Glib_process,Glib_canvas,Pos,Text);
+    if (Glib_ps) glib_history(["print",Pos2,Text,0]);
   }
 }
 
 def glib_history(L) {
-  extern Glib_h, Glib_canvas_x, Glib_canvas_y;
+  extern Glib_h, Glib_canvas_x, Glib_canvas_y,
+         Glib_math_coodinate;
   if (L[0] == "putpixel" || L[0] == "print") {
     if (L[1][0] <= Glib_canvas_x && L[1][0] >= 0) {
       if (L[1][1] <= Glib_canvas_x && L[1][1] >= 0) 
@@ -317,32 +402,38 @@ def glib_history(L) {
   return 0;
 }
 
-/*&usage begin:glib_tops()
+#define xxx(x) idiv(x,Glib_ps_sx)
+#define yyy(y) idiv(y,Glib_ps_sy)
+
+/*&usage begin: glib_tops()
   If Glib_ps is set to 1, 
   it returns a postscript program to draw the picture on the canvas.
+  ref: print_output
 end: */
 def glib_tops() {
   extern Glib_h;
   return glib_ps(Glib_h);
 }
 def glib_ps(L) {
-  PS = "";
+  extern Glib_ps_sx;
+  extern Glib_ps_sy;
+  PS = string_to_tb("");
   Prev_color = 0;
   /* Prolog */
-  PS += "%%!PS-Adobe-1.0\n";
-  PS += "%%BoundingBox: 0 0 " +
-          rtostr(Glib_canvas_x) + " " + rtostr(Glib_canvas_y) + "\n";
-  PS += "%%Creator: This is generated by ifplot\n";
-  PS += "%%Title: ifplot\n";
-  PS += "%%EndComments: \n";
-  PS += "0.1 setlinewidth \n";
-  PS += "2 setlinecap \n";
-  PS += "2 setlinejoin \n";
-  PS += "/ifplot_putpixel {  \n";
-  PS += "    /yyy 2 1 roll def /xxx 2 1 roll def \n";
-  PS += "    gsave newpath xxx yyy .5 0 360 arc \n";
-  PS += "    fill grestore \n";
-  PS += "} def \n";
+  write_to_tb("%%!PS-Adobe-1.0\n",PS);
+  write_to_tb("%%BoundingBox: 0 0 " +
+          rtostr(xxx(Glib_canvas_x)) + " " + rtostr(yyy(Glib_canvas_y)) + "\n",PS);
+  write_to_tb("%%Creator: This is generated by ifplot\n",PS);
+  write_to_tb("%%Title: ifplot\n",PS);
+  write_to_tb("%%EndComments: \n",PS);
+  write_to_tb("0.1 setlinewidth \n",PS);
+  write_to_tb("2 setlinecap \n",PS);
+  write_to_tb("2 setlinejoin \n",PS);
+  write_to_tb("/ifplot_putpixel {  \n",PS);
+  write_to_tb("    /yyy 2 1 roll def /xxx 2 1 roll def \n",PS);
+  write_to_tb("    gsave newpath xxx yyy .5 0 360 arc \n",PS);
+  write_to_tb("    fill grestore \n",PS);
+  write_to_tb("} def \n",PS);
 
   L = reverse(L);
   N = length(L);
@@ -350,30 +441,72 @@ def glib_ps(L) {
     C = L[I];
     if (C[length(C)-1] != Prev_color) {
       Prev_color = C[length(C)-1];
-      PS += rtostr(deval(ishift(Prev_color,16)/256)) + " " +
+      write_to_tb(rtostr(deval(ishift(Prev_color,16)/256)) + " " +
             rtostr(deval(iand(ishift(Prev_color,8),0xff)/256)) + " " +
-            rtostr(deval(iand(Prev_color,0xff)/256)) + " setrgbcolor \n";
+            rtostr(deval(iand(Prev_color,0xff)/256)) + " setrgbcolor \n",PS);
     }
     if (C[0] == "putpixel") {
-       PS += rtostr(C[1][0]) + " " + rtostr(C[1][1]) + " ifplot_putpixel \n";
+       write_to_tb(rtostr(xxx(C[1][0])) + " " + rtostr(yyy(C[1][1])) + " ifplot_putpixel \n",PS);
     }
     if (C[0] == "line") {
-       PS += " newpath ";
-       PS += rtostr(C[1][0]) + " " + rtostr(C[1][1]) + " moveto " +
-             rtostr(C[1][2]) + " " + rtostr(C[1][3]) + " lineto stroke \n";
+       write_to_tb(" newpath ",PS);
+       write_to_tb(rtostr(xxx(C[1][0])) + " " + rtostr(yyy(C[1][1])) + " moveto " +
+             rtostr(xxx(C[1][2])) + " " + rtostr(yyy(C[1][3])) + " lineto stroke \n",PS);
     }
     if (C[0] == "print") {
-       PS += "/Times-Roman findfont 10 scalefont setfont \n";
-       PS += rtostr(C[1][0]) + " " + rtostr(C[1][1]) + " moveto ";
-       PS += "(" + C[2] + ")  show \n";
+       write_to_tb("/Times-Roman findfont 10 scalefont setfont \n",PS);
+       write_to_tb(rtostr(xxx(C[1][0])) + " " + rtostr(yyy(C[1][1])) + " moveto ",PS);
+       write_to_tb("(" + C[2] + ")  show \n",PS);
     }
   }
 
   /* Epilog */
-  PS += "0 0 0 setrgbcolor \n";
-  PS += "showpage \n";
+  write_to_tb("0 0 0 setrgbcolor \n",PS);
+  write_to_tb("showpage \n",PS);
 
-  return PS;
+  return tb_to_string(PS);
+}
+
+/*&usage begin: glib_ps_form(S)
+  It returns the PS code generated by executing {S}
+  (experimental).
+  example: glib_ps_form(quote( glib_line(0,0,100,100) ));
+  example: glib_ps_form(quote([glib_line(0,0,100,100),glib_line(100,0,0,100)]));
+  ref: glib_tops
+end: */
+/* Todo.  Change the canvas size.  */
+def glib_ps_form(F) {
+  extern Glib_h;
+  extern Glib_ps;
+  H = Glib_h; /* push Glib_h */
+  P = Glib_ps; /* push Glib_ps */
+
+  Glib_ps=1; Glib_h = [];
+  if (type(F) != 17) {
+    return "Error: argument should be quote(...).";
+  }
+  eval_quote(F);  
+  /* bug. eval_str causes seg fault for ccurve.rr main(8) */
+  R = glib_tops();
+  Glib_h = H; /* pop Glib_h */
+  Glib_ps = P; /* pop Glib_ps */
+  return R;
+}
+
+/*&usage begin: glib_plot(F)
+  It plots an object {F} on the glib canvas.
+  example: glib_plot([[0,1],[0.1,0.9],[0.2,0.7],[0.3,0.5],[0.4,0.8]]);
+  example: glib_plot(tan(x));
+end: */
+/* bug, xmin, xmax, color should be optional variables. */
+def glib_plot(F) {
+  Opt = getopt();
+  taka_glib_plot(F,Opt);
+}
+
+def glib_flush() {
+  extern Glib_canvas;
+  if (Cfep_loaded) cfep.draw_flush(Glib_canvas);
 }
 end$