===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/glib,v
retrieving revision 1.15
retrieving revision 1.19
diff -u -p -r1.15 -r1.19
--- OpenXM_contrib2/asir2000/lib/glib	2004/03/11 21:59:36	1.15
+++ OpenXM_contrib2/asir2000/lib/glib	2006/03/08 07:59:15	1.19
@@ -1,10 +1,11 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/lib/glib,v 1.14 2004/03/11 12:25:20 takayama Exp $ */
-/* $Id: glib,v 1.15 2004/03/11 21:59:36 takayama Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/lib/glib,v 1.18 2006/03/08 04:58:15 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 */
@@ -36,9 +37,11 @@ def glib_ox_get_errors(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 = []$
@@ -54,19 +57,29 @@ Glib_xmag = 1$ Glib_ymag=1$ Glib_xoffset=0$ Glib_yoffs
 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) {
   extern Glib_process;
-  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) == []) {
+  /* 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);
 }
 
@@ -82,8 +95,19 @@ def glib_open() {
   extern Glib_canvas_x, Glib_canvas_y,
          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) { 
+  if (type(Glib_server_started) == 0) { 
     Glib_process = ox_launch_nox(0,"ox_plot")$ 
     register_handler(reset_plot); 
     Glib_server_started = 1$ 
@@ -120,6 +144,7 @@ def glib_check_strict() {
   if (Glib_canvas < 0) {
     glib_open();
   }
+  if (Cfep_loaded) return ;
   E = glib_ox_get_errors(Glib_process);
   if (E != []) {
     ox_pops(Glib_process,200);
@@ -132,10 +157,14 @@ def glib_check_strict() {
   }
 }
 
+/*&usage begin: glib_clear()
+  Clear the screen.
+end: */
 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);
+  else cfep.glib_clear();
 }
 
 /*&usage begin: glib_window(Xmin,Ymin,Xmax,Ymax)
@@ -196,10 +225,12 @@ def glib_putpixel(X,Y) {
            Glib_canvas_y-glib_floor(Glib_ymag*(Y+Glib_yoffset))];
   }
   if ( type(C) != -1 ) {
-    draw_obj(Glib_process,Glib_canvas,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 (!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]);
   }
 }
@@ -275,10 +306,12 @@ if (Glib_ps) {
            glib_floor(X1),Glib_canvas_y-glib_floor(Y1)];
   }
   if ( type(Color) != -1 ) {
-    draw_obj(Glib_process,Glib_canvas,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 (!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]);
   }
 }
@@ -349,10 +382,12 @@ def glib_print(X,Y,Text) {
            Glib_canvas_y-glib_floor(Glib_ymag*(Y+Glib_yoffset))];
   }
   if ( type(C) != -1 ) {
-    draw_string(Glib_process,Glib_canvas,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 (!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]);
   }
 }
@@ -371,6 +406,9 @@ def glib_history(L) {
   return 0;
 }
 
+#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.
@@ -381,12 +419,14 @@ def glib_tops() {
   return glib_ps(Glib_h);
 }
 def glib_ps(L) {
+  extern Glib_ps_sx;
+  extern Glib_ps_sy;
   PS = string_to_tb("");
   Prev_color = 0;
   /* Prolog */
   write_to_tb("%%!PS-Adobe-1.0\n",PS);
   write_to_tb("%%BoundingBox: 0 0 " +
-          rtostr(Glib_canvas_x) + " " + rtostr(Glib_canvas_y) + "\n",PS);
+          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);
@@ -410,16 +450,16 @@ def glib_ps(L) {
             rtostr(deval(iand(Prev_color,0xff)/256)) + " setrgbcolor \n",PS);
     }
     if (C[0] == "putpixel") {
-       write_to_tb(rtostr(C[1][0]) + " " + rtostr(C[1][1]) + " ifplot_putpixel \n",PS);
+       write_to_tb(rtostr(xxx(C[1][0])) + " " + rtostr(yyy(C[1][1])) + " ifplot_putpixel \n",PS);
     }
     if (C[0] == "line") {
        write_to_tb(" newpath ",PS);
-       write_to_tb(rtostr(C[1][0]) + " " + rtostr(C[1][1]) + " moveto " +
-             rtostr(C[1][2]) + " " + rtostr(C[1][3]) + " lineto stroke \n",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") {
        write_to_tb("/Times-Roman findfont 10 scalefont setfont \n",PS);
-       write_to_tb(rtostr(C[1][0]) + " " + rtostr(C[1][1]) + " moveto ",PS);
+       write_to_tb(rtostr(xxx(C[1][0])) + " " + rtostr(yyy(C[1][1])) + " moveto ",PS);
        write_to_tb("(" + C[2] + ")  show \n",PS);
     }
   }
@@ -446,6 +486,9 @@ def glib_ps_form(F) {
   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();
@@ -463,6 +506,38 @@ end: */
 def glib_plot(F) {
   Opt = getopt();
   taka_glib_plot(F,Opt);
+}
+
+/*&usage begin: glib_flush();
+  Flush the output. 
+ (Cfep only. It also set initGL to 1.).
+end: */
+def glib_flush() {
+  extern Glib_canvas;
+  if (Glib_canvas < 0) glib_open();
+  if (Cfep_loaded) cfep.draw_flush(Glib_canvas);
+}
+/*&usage begin: glib_set_pixel_size(P)
+  Set the size of putpixel to P. 1.0 is the default.
+ (cfep only).
+end: */
+def glib_set_pixel_size(X) {
+  extern  Glib_canvas;
+  if (Glib_canvas < 0) glib_open();
+  if (!Cfep_loaded) /*Not implemented.*/ ;
+  else cfep.glib_set_pixel_size(X);
+}
+
+/*&usage begin: glib_remove_last()
+  Remove the last object.  glib_flush() should also be called to remove
+  the last object.
+ (cfep only).
+end: */
+def glib_remove_last() {
+  extern  Glib_canvas;
+  if (Glib_canvas < 0) glib_open();
+  if (!Cfep_loaded) /*Not implemented.*/ ;
+  else cfep.glib_remove_last();
 }
 
 end$