X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Flablgtkmathview%2Fml_gtk_mathview.c;h=51fded25e0bdd28567432a5368541a83292270f5;hb=5325734bc2e4927ed7ec146e35a6f0f2b49f50c1;hp=1f6b19b9f47c31358f3ed8ca107bbb9617614143;hpb=ee18ff6db8d49339230b4212e145964b12c5a523;p=helm.git

diff --git a/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c b/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c
index 1f6b19b9f..51fded25e 100644
--- a/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c
+++ b/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c
@@ -22,63 +22,56 @@
  */
 
 #include <assert.h>
-#include <string.h>
-#include <assert.h>
+
+#include <gtkmathview.h>
 #include <gtk/gtk.h>
+
 #include <caml/mlvalues.h>
 #include <caml/alloc.h>
 #include <caml/memory.h>
 #include <caml/callback.h>
 #include <caml/fail.h>
-
-#include <gtkmathview/gtkmathview.h>
-#include <ml_gtk.h>
+#include <caml/custom.h>
+#include <caml/callback.h>
 
 #include <wrappers.h>
 #include <ml_glib.h>
 #include <ml_gdk.h>
 #include <ml_gtk.h>
+#include <ml_gobject.h>
+#include <ml_gdkpixbuf.h>
+#include <ml_pango.h>
 #include <gtk_tags.h>
+#include <gdk_tags.h>
 
 #include <mlgdomevalue.h>
 
-#define GtkMathView_val(val) check_cast(GTK_MATH_VIEW,val)
-
-#define FontManagerId_val(val) Int_val(val)
-#define Val_FontManagerId(val) Val_int(val)
+/* Init all */
 
-/* As ML_1, but the result is optional */
-#define OML_1(cname, conv1, conv) \
-value ml_##cname (value arg1) { return Val_option_ptr((cname (conv1 (arg1))),conv); }
-/* As ML_3, but the result is optional */
-#define OML_3(cname, conv1, conv2, conv3, conv) \
-value ml_##cname (value arg1, value arg2, value arg3) { return Val_option_ptr((cname (conv1 (arg1), conv2 (arg2), conv3 (arg3))),conv); }
-/* As ML_2, but the second argument is optional */
-#define ML_2O(cname, conv1, conv2, conv) \
-value ml_##cname (value arg1, value arg2) \
-{ return conv (cname (conv1(arg1), ptr_val_option(arg2,conv2))); }
-
-FontManagerId
-font_manager_id_of_value(value v)
+CAMLprim value ml_gtk_mathview_init(value unit)
 {
-  if (v == hash_variant("font_manager_gtk")) return FONT_MANAGER_GTK;
-  else if (v == hash_variant("font_manager_t1")) return FONT_MANAGER_T1;
-  else assert(0);
+    /* Since these are declared const, must force gcc to call them! */
+    GType t = gtk_math_view_get_type();
+    return Val_GType(t);
 }
 
-value
-value_of_font_manager_id(FontManagerId id)
-{
-  switch (id) {
-  case FONT_MANAGER_GTK:
-    return hash_variant("font_manager_gtk");
-  case FONT_MANAGER_T1:
-    return hash_variant("font_manager_t1");
-  default:
-    assert(0);
-    break;
-  }
-}
+#define GtkMathView_val(val) check_cast(GTK_MATH_VIEW,val)
+
+//#####################################
+//
+//#define FontManagerId_val(val) Int_val(val)
+//#define Val_FontManagerId(val) Val_int(val)
+//
+///* As ML_1, but the result is optional */
+//#define OML_1(cname, conv1, conv) \
+//value ml_##cname (value arg1) { return Val_option_ptr((cname (conv1 (arg1))),conv); }
+///* As ML_3, but the result is optional */
+#define OML_3(cname, conv1, conv2, conv3, conv) \
+value ml_##cname (value arg1, value arg2, value arg3) { return Val_option_ptr((cname (conv1 (arg1), conv2 (arg2), conv3 (arg3))),conv); }
+///* As ML_2, but the second argument is optional */
+//#define ML_2O(cname, conv1, conv2, conv) \
+//value ml_##cname (value arg1, value arg2) \
+//{ return conv (cname (conv1(arg1), ptr_val_option(arg2,conv2))); }
 
 value Val_Element_ref(GdomeElement* elem)
 {
@@ -91,7 +84,7 @@ value Val_Element_ref(GdomeElement* elem)
   return Val_Element(elem);
 }
 
-ML_2 (gtk_math_view_new,GtkAdjustment_val, GtkAdjustment_val, Val_GtkWidget_sink)
+OML_3 (gtk_math_view_get_element_at, GtkMathView_val, Int_val, Int_val, Val_Element)
 ML_1 (gtk_math_view_freeze, GtkMathView_val, Unit)
 ML_1 (gtk_math_view_thaw, GtkMathView_val, Unit)
 ML_2 (gtk_math_view_load_uri, GtkMathView_val, String_val, Val_bool)
@@ -100,7 +93,9 @@ ML_1 (gtk_math_view_unload, GtkMathView_val, Unit)
 ML_2 (gtk_math_view_select, GtkMathView_val, Element_val, Unit)
 ML_2 (gtk_math_view_unselect, GtkMathView_val, Element_val, Unit)
 ML_2 (gtk_math_view_is_selected, GtkMathView_val, Element_val, Val_bool)
-OML_3 (gtk_math_view_get_element_at, GtkMathView_val, Int_val, Int_val, Val_Element_ref)
+/*
+ML_2 (gtk_math_view_new,GtkAdjustment_val, GtkAdjustment_val, Val_GtkWidget_sink)
+*/
 ML_1 (gtk_math_view_get_width, GtkMathView_val, Val_int)
 ML_1 (gtk_math_view_get_height, GtkMathView_val, Val_int)
 ML_3 (gtk_math_view_set_top, GtkMathView_val, Int_val, Int_val, Unit)
@@ -108,45 +103,11 @@ ML_3 (gtk_math_view_set_adjustments, GtkMathView_val, GtkAdjustment_val, GtkAdju
 ML_1 (gtk_math_view_get_hadjustment, GtkMathView_val, Val_GtkWidget)
 ML_1 (gtk_math_view_get_vadjustment, GtkMathView_val, Val_GtkWidget)
 ML_1 (gtk_math_view_get_buffer, GtkMathView_val, Val_GdkPixmap)
-ML_1 (gtk_math_view_get_frame, GtkMathView_val, Val_GtkWidget)
+ML_1 (gtk_math_view_get_drawing_area, GtkMathView_val, Val_GtkWidget)
 ML_2 (gtk_math_view_set_font_size, GtkMathView_val, Int_val, Unit)
 ML_1 (gtk_math_view_get_font_size, GtkMathView_val, Val_int)
-ML_2 (gtk_math_view_set_anti_aliasing, GtkMathView_val, Bool_val, Unit)
-ML_1 (gtk_math_view_get_anti_aliasing, GtkMathView_val, Val_bool)
-ML_2 (gtk_math_view_set_transparency, GtkMathView_val, Bool_val, Unit)
-ML_1 (gtk_math_view_get_transparency, GtkMathView_val, Val_bool)
 ML_2 (gtk_math_view_set_log_verbosity, GtkMathView_val, Int_val, Unit)
 ML_1 (gtk_math_view_get_log_verbosity, GtkMathView_val, Val_int)
-ML_2 (gtk_math_view_set_font_manager_type, GtkMathView_val, font_manager_id_of_value, Unit)
-ML_1 (gtk_math_view_get_font_manager_type, GtkMathView_val, value_of_font_manager_id)
-
-value
-ml_gtk_math_view_export_to_postscript_native(value arg1,
-		value w, value h, value x0, value y0, value disable_colors, value arg2)
-{
-   CAMLparam5(arg1,w,h,x0,y0);
-   CAMLxparam2(disable_colors, arg2);
-
-   char *filename;
-   FILE *fd;
-   int res;
-   filename = String_val (arg2);
-   if ((fd = fopen(filename, "w"))) {
-      gtk_math_view_export_to_postscript(GtkMathView_val (arg1),
-		      Int_val(w), Int_val(h), Int_val(x0), Int_val(y0), Bool_val(disable_colors), fd);
-      fclose (fd);
-      res = 1;
-   } else {
-      fprintf(stderr, "Error opening file %s for writing\n", filename);
-      res = 0;
-   }
-   CAMLreturn (Val_bool(res));
-}
-
-value ml_gtk_math_view_export_to_postscript_bytecode (value* arg, int argn)
-{
-   return ml_gtk_math_view_export_to_postscript_native(arg[0], arg[1], arg[2], arg[3], arg[4], arg[5], arg[6]);
-}
 
 value ml_gtk_math_view_get_top (value arg1)
 {
@@ -188,12 +149,7 @@ value ml_gtk_math_view_gdome_element_of_boxed_option (value arg1)
       nr = (GdomeElement*) Field(Field(arg1,0),1);
    }
 
-   if (nr != NULL) {
-     gdome_el_ref(nr, &exc);
-     assert(exc == 0);
-   }
-   
-   res = Val_Element(nr);
+   res = Val_Element_ref(nr);
    if (res==Val_int(0)) {
       assert(0);
    }
@@ -215,11 +171,8 @@ value ml_gtk_math_view_gdome_element_option_of_boxed_option (value arg1)
       GdomeException exc = 0;
       GdomeElement* elem = (GdomeElement*) Field(Field(arg1,0),1);
       assert(elem != NULL);
-      gdome_el_ref(elem, &exc);
-      assert(exc == 0);
-      res = Val_option_ptr(elem, Val_Element);
+      res = Val_option_ptr(elem, Val_Element_ref);
    }
 
    CAMLreturn(res);
 }
-