1 files changed, 33 insertions, 31 deletions

diff --git a/otherlibs/graph/image.c b/otherlibs/graph/image.c
index 8d47fc4e5..501398b35 100644
--- a/otherlibs/graph/image.c
+++ b/otherlibs/graph/image.c
@@ -18,15 +18,15 @@
 #include <alloc.h>
 #include <custom.h>
 
-static void gr_free_image(value im)
+static void caml_gr_free_image(value im)
 {
-  XFreePixmap(grdisplay, Data_im(im));
-  if (Mask_im(im) != None) XFreePixmap(grdisplay, Mask_im(im));
+  XFreePixmap(caml_gr_display, Data_im(im));
+  if (Mask_im(im) != None) XFreePixmap(caml_gr_display, Mask_im(im));
 }
 
 static struct custom_operations image_ops = {
   "_image",
-  gr_free_image,
+  caml_gr_free_image,
   custom_compare_default,
   custom_hash_default,
   custom_serialize_default,
@@ -35,71 +35,73 @@ static struct custom_operations image_ops = {
 
 #define Max_image_mem 2000000
 
-value gr_new_image(int w, int h)
+value caml_gr_new_image(int w, int h)
 {
   value res = alloc_custom(&image_ops, sizeof(struct grimage),
                            w * h, Max_image_mem);
   Width_im(res) = w;
   Height_im(res) = h;
-  Data_im(res) = XCreatePixmap(grdisplay, grwindow.win, w, h,
-                               XDefaultDepth(grdisplay, grscreen));
+  Data_im(res) = XCreatePixmap(caml_gr_display, caml_gr_window.win, w, h,
+                               XDefaultDepth(caml_gr_display, caml_gr_screen));
   Mask_im(res) = None;
   return res;
 }
 
-value gr_create_image(value vw, value vh)
+value caml_gr_create_image(value vw, value vh)
 {
-  gr_check_open();
-  return gr_new_image(Int_val(vw), Int_val(vh));
+  caml_gr_check_open();
+  return caml_gr_new_image(Int_val(vw), Int_val(vh));
 }
 
-value gr_blit_image(value im, value vx, value vy)
+value caml_gr_blit_image(value im, value vx, value vy)
 {
   int x = Int_val(vx);
   int y = Int_val(vy);
-  gr_check_open();
-  XCopyArea(grdisplay, grbstore.win, Data_im(im), grbstore.gc,
+  caml_gr_check_open();
+  XCopyArea(caml_gr_display, caml_gr_bstore.win, Data_im(im), caml_gr_bstore.gc,
             x, Bcvt(y) + 1 - Height_im(im),
             Width_im(im), Height_im(im),
             0, 0);
   return Val_unit;
 }
 
-value gr_draw_image(value im, value vx, value vy)
+value caml_gr_draw_image(value im, value vx, value vy)
 {
   int x = Int_val(vx);
   int y = Int_val(vy);
   int wy = Wcvt(y) + 1 - Height_im(im);
   int by = Bcvt(y) + 1 - Height_im(im);
 
-  gr_check_open();
+  caml_gr_check_open();
   if (Mask_im(im) != None) {
-    if(grremember_mode) {
-      XSetClipOrigin(grdisplay, grbstore.gc, x, by);
-      XSetClipMask(grdisplay, grbstore.gc, Mask_im(im));
+    if(caml_gr_remember_modeflag) {
+      XSetClipOrigin(caml_gr_display, caml_gr_bstore.gc, x, by);
+      XSetClipMask(caml_gr_display, caml_gr_bstore.gc, Mask_im(im));
     }
-    if(grdisplay_mode) {
-      XSetClipOrigin(grdisplay, grwindow.gc, x, wy);
-      XSetClipMask(grdisplay, grwindow.gc, Mask_im(im));
+    if(caml_gr_display_modeflag) {
+      XSetClipOrigin(caml_gr_display, caml_gr_window.gc, x, wy);
+      XSetClipMask(caml_gr_display, caml_gr_window.gc, Mask_im(im));
     }
   }
-  if(grremember_mode)
-    XCopyArea(grdisplay, Data_im(im), grbstore.win, grbstore.gc,
+  if(caml_gr_remember_modeflag)
+    XCopyArea(caml_gr_display, Data_im(im), caml_gr_bstore.win, caml_gr_bstore.gc,
               0, 0,
               Width_im(im), Height_im(im),
               x, by);
-  if(grdisplay_mode)
-    XCopyArea(grdisplay, Data_im(im), grwindow.win, grwindow.gc,
+  if(caml_gr_display_modeflag)
+    XCopyArea(caml_gr_display, Data_im(im), caml_gr_window.win, caml_gr_window.gc,
           0, 0,
           Width_im(im), Height_im(im),
           x, wy);
   if (Mask_im(im) != None) {
-    if(grremember_mode)
-      XSetClipMask(grdisplay, grbstore.gc, None);
-    if(grdisplay_mode)
-      XSetClipMask(grdisplay, grwindow.gc, None);
+    if(caml_gr_remember_modeflag)
+      XSetClipMask(caml_gr_display, caml_gr_bstore.gc, None);
+    if(caml_gr_display_modeflag)
+      XSetClipMask(caml_gr_display, caml_gr_window.gc, None);
   }
-  if(grdisplay_mode)
-    XFlush(grdisplay);
+  if(caml_gr_display_modeflag)
+    XFlush(caml_gr_display);
   return Val_unit;
 }
+
+/* eof $Id$ */