(pre-)porting to gtkmathview 0.6.3 && ocaml 3.08

[helm.git] / helm / DEVEL / lablgtkmathview / ml_gtk_mathview.c

diff --git a/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c b/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c
index 41175584dcf5f03d8816f3cdd6d169403350e5b8..f8141f9eb107e478237818ae4f622a103b5f670b 100644 (file)
--- a/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c
+++ b/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c
@@ -97,15 +97,16 @@ ML_2 (gtk_math_view_unselect, GtkMathView_val, Element_val, Unit)
 ML_2 (gtk_math_view_is_selected, GtkMathView_val, Element_val, Val_bool)
 /*
 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)
 ML_3 (gtk_math_view_set_adjustments, GtkMathView_val, GtkAdjustment_val, GtkAdjustment_val, Unit)
+/*
 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_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_log_verbosity, GtkMathView_val, Int_val, Unit)
@@ -123,10 +124,35 @@ value ml_gtk_math_view_get_element_at (value arg1, value arg2, value arg3)
    CAMLreturn (result);
 }
 
+value ml_gtk_math_view_get_adjustments(value arg1)
+{
+   CAMLparam1(arg1);
+   CAMLlocal1(result);
+   GtkAdjustment* hadj;
+   GtkAdjustment* vadj;
+   gtk_math_view_get_adjustments(GtkMathView_val (arg1), &hadj, &vadj);
+   result = alloc(2, 0);
+   Store_field(result, 0, Val_GtkWidget(hadj));
+   Store_field(result, 1, Val_GtkWidget(vadj));
+   CAMLreturn(result);
+}
+
+value ml_gtk_math_view_get_size (value arg1)
+{
+   CAMLparam1(arg1);
+   CAMLlocal1(result);
+   int width, height;
+   gtk_math_view_get_size(GtkMathView_val (arg1), &width, &height);
+   result = alloc(1, 0);
+   Store_field(result, 0, Val_int(width));
+   Store_field(result, 1, Val_int(height));
+   CAMLreturn (result);
+}
+
 value ml_gtk_math_view_get_bounding_box (value arg1)
 {
    CAMLparam1(arg1);
-   CAMLlocal1 (result);
+   CAMLlocal1(result);
    int width, height, depth;
    GtkMathViewBoundingBox gbox;
    gtk_math_view_get_bounding_box(GtkMathView_val (arg1), &gbox);
@@ -140,7 +166,7 @@ value ml_gtk_math_view_get_bounding_box (value arg1)
 value ml_gtk_math_view_get_top (value arg1)
 {
    CAMLparam1(arg1);
-   CAMLlocal1 (result);
+   CAMLlocal1(result);
    int x, y;
    gtk_math_view_get_top(GtkMathView_val (arg1), &x, &y);
    result = alloc(2, 0);
@@ -204,3 +230,22 @@ value ml_gtk_math_view_gdome_element_option_of_boxed_option (value arg1)
 
    CAMLreturn(res);
 }
+
+value ml_gtk_math_view_model_event_of_boxed_option (value arg1)
+{
+   CAMLparam1(arg1);
+   GdomeElement* nr;
+   CAMLlocal1 (valnr);
+   CAMLlocal1 (res);
+
+   assert(arg1 != Val_int(0));
+   GtkMathViewModelEvent* event = (GtkMathViewModelEvent*) Field(Field(arg1,0),1);
+   res = alloc(4, 0);
+   Store_field(res, 0, Val_option_ptr(event->id, Val_Element_ref));
+   Store_field(res, 1, Val_int(event->x));
+   Store_field(res, 2, Val_int(event->y));
+   Store_field(res, 3, Val_int(event->state));
+
+   CAMLreturn(res);
+}
+