X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Flablgtkmathview%2Fml_gtk_mathview.c;h=9a7f98fcf4e2a14a3d97473dc6a1276792399237;hb=caab26f85122e0040555139c48a9111a0b2b9fff;hp=df4719b61736dfaf4c4c72c2f6b142eba70e58dc;hpb=5a7485a8f24e457fd4cc091f24c48f3cb8d11fca;p=helm.git diff --git a/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c b/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c index df4719b61..9a7f98fcf 100644 --- a/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c +++ b/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000, Luca Padovani . +/* Copyright (C) 2000-2003, Luca Padovani , + * Claudio Sacerdoti Coen . * * This file is part of lablgtkmathview, the Ocaml binding * for the GtkMathView widget. @@ -30,7 +31,7 @@ #include #include -#include +#include #include #include @@ -46,10 +47,13 @@ #define FontManagerId_val(val) Int_val(val) #define Val_FontManagerId(val) Val_int(val) -// As ML_1, but the result is optional +/* 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_2, but the second argument is optional +/* 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))); } @@ -76,12 +80,27 @@ value_of_font_manager_id(FontManagerId id) } } +value Val_Element_ref(GdomeElement* elem) +{ + if (elem != NULL) + { + GdomeException exc = 0; + gdome_el_ref(elem, &exc); + g_assert(exc == 0); + } + return Val_Element(elem); +} + ML_2 (gtk_math_view_new,GtkAdjustment_val, GtkAdjustment_val, Val_GtkWidget_sink) -ML_2 (gtk_math_view_load, GtkMathView_val, String_val, Val_bool) -ML_2 (gtk_math_view_load_tree, GtkMathView_val, Document_val, Val_bool) +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) +ML_2 (gtk_math_view_load_doc, GtkMathView_val, Document_val, Val_bool) ML_1 (gtk_math_view_unload, GtkMathView_val, Unit) -OML_1 (gtk_math_view_get_selection, GtkMathView_val, Val_Element) -ML_2O (gtk_math_view_set_selection, GtkMathView_val, Element_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) 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) @@ -90,23 +109,17 @@ 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_kerning, GtkMathView_val, Bool_val, Unit) -ML_1 (gtk_math_view_get_kerning, 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) -OML_1 (gtk_math_view_get_element, GtkMathView_val, Val_Element) -OML_1 (gtk_math_view_get_action, GtkMathView_val, Val_Element) -ML_1 (gtk_math_view_action_get_selected, GtkMathView_val, Val_int) -ML_2 (gtk_math_view_action_set_selected, GtkMathView_val, Int_val, Unit) -ML_1 (gtk_math_view_action_toggle, GtkMathView_val, Unit) value ml_gtk_math_view_export_to_postscript_native(value arg1, @@ -144,23 +157,39 @@ value ml_gtk_math_view_get_top (value arg1) gtk_math_view_get_top(GtkMathView_val (arg1), &x, &y); result = alloc(2, 0); Store_field(result, 0, Val_int(x)); - Store_field(result, 0, Val_int(y)); + Store_field(result, 1, Val_int(y)); CAMLreturn (result); } +/* +value ml_gtk_math_view_get_element_coords (value arg1, value arg2) +{ + CAMLparam2(arg1, arg2); + CAMLlocal1 (result); + int x, y; + gtk_math_view_get_element_coords(GtkMathView_val (arg1), Element_val(arg2), &x, &y); + result = alloc(2, 0); + Store_field(result, 0, Val_int(x)); + Store_field(result, 1, Val_int(y)); + CAMLreturn (result); +} +*/ + value ml_gtk_math_view_gdome_element_of_boxed_option (value arg1) { CAMLparam1(arg1); - GdomeElement* nr; + GdomeException exc = 0; + GdomeElement* nr = NULL; CAMLlocal1 (res); if (arg1==Val_int(0)) { assert(0); } else { - nr = (GdomeElement*) Field(Field(arg1,0), 1); + nr = (GdomeElement*) Field(Field(arg1,0),1); } - res = Val_Element(nr); + + res = Val_Element_ref(nr); if (res==Val_int(0)) { assert(0); } @@ -179,8 +208,12 @@ value ml_gtk_math_view_gdome_element_option_of_boxed_option (value arg1) if (arg1==Val_int(0)) { res=Val_unit; } else { - res = Val_option_ptr((GdomeElement*) Field(Field(arg1,0),1),Val_Element); + GdomeException exc = 0; + GdomeElement* elem = (GdomeElement*) Field(Field(arg1,0),1); + assert(elem != NULL); + res = Val_option_ptr(elem, Val_Element_ref); } CAMLreturn(res); } +