===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/glib,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- OpenXM_contrib2/asir2000/lib/glib	2004/03/14 12:56:47	1.16
+++ OpenXM_contrib2/asir2000/lib/glib	2006/03/03 10:36:18	1.17
@@ -1,10 +1,11 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/lib/glib,v 1.15 2004/03/11 21:59:36 takayama Exp $ */
-/* $Id: glib,v 1.16 2004/03/14 12:56:47 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 */
@@ -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 = []$
@@ -61,17 +64,22 @@ 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);
 }
 
@@ -87,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$ 
@@ -125,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);
@@ -140,7 +160,7 @@ 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)
@@ -201,10 +221,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]);
   }
 }
@@ -280,10 +302,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]);
   }
 }
@@ -354,10 +378,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]);
   }
 }
@@ -478,5 +504,9 @@ def glib_plot(F) {
   taka_glib_plot(F,Opt);
 }
 
+def glib_flush() {
+  extern Glib_canvas;
+  if (Cfep_loaded) cfep.draw_flush(Glib_canvas);
+}
 end$