WIP harfbuzz

diff --git a/vapi/harfbuzz-gobject.vapi b/vapi/harfbuzz-gobject.vapi
index 02a949eba44534f126f7f3315c51702fdc6185ff..35739596c041aeb1e50b2f5ed7727b60fe46453a 100644 (file)
--- a/vapi/harfbuzz-gobject.vapi
+++ b/vapi/harfbuzz-gobject.vapi
@@ -155,6 +155,32 @@ namespace HarfBuzz {
        [GIR (name = "draw_funcs_t")]
        [Version (since = "4.0.0")]
        public class DrawFuncs {
+               [CCode (cname = "hb_draw_close_path")]
+               public void close_path (void* draw_data, HarfBuzz.draw_state_t st);
+               [CCode (cname = "hb_draw_funcs_create")]
+               public static HarfBuzz.DrawFuncs create ();
+               [CCode (cname = "hb_draw_cubic_to")]
+               public void cubic_to (void* draw_data, HarfBuzz.draw_state_t st, float control1_x, float control1_y, float control2_x, float control2_y, float to_x, float to_y);
+               [CCode (cname = "hb_draw_funcs_is_immutable")]
+               public HarfBuzz.Bool is_immutable ();
+               [CCode (cname = "hb_draw_line_to")]
+               public void line_to (void* draw_data, HarfBuzz.draw_state_t st, float to_x, float to_y);
+               [CCode (cname = "hb_draw_funcs_make_immutable")]
+               public void make_immutable ();
+               [CCode (cname = "hb_draw_move_to")]
+               public void move_to (void* draw_data, HarfBuzz.draw_state_t st, float to_x, float to_y);
+               [CCode (cname = "hb_draw_quadratic_to")]
+               public void quadratic_to (void* draw_data, HarfBuzz.draw_state_t st, float control_x, float control_y, float to_x, float to_y);
+               [CCode (cname = "hb_draw_funcs_set_close_path_func")]
+               public void set_close_path_func (owned HarfBuzz.DrawClosePathFunc func);
+               [CCode (cname = "hb_draw_funcs_set_cubic_to_func")]
+               public void set_cubic_to_func (owned HarfBuzz.DrawCubicToFunc func);
+               [CCode (cname = "hb_draw_funcs_set_line_to_func")]
+               public void set_line_to_func (owned HarfBuzz.DrawLineToFunc func);
+               [CCode (cname = "hb_draw_funcs_set_move_to_func")]
+               public void set_move_to_func (owned HarfBuzz.DrawMoveToFunc func);
+               [CCode (cname = "hb_draw_funcs_set_quadratic_to_func")]
+               public void set_quadratic_to_func (owned HarfBuzz.DrawQuadraticToFunc func);
        }
        [CCode (cheader_filename = "hb-gobject.h", cname = "hb_face_t", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "hb_gobject_face_get_type ()")]
        [Compact]
@@ -1784,47 +1810,8 @@ namespace HarfBuzz {
        [Version (since = "2.3.0")]
        public static HarfBuzz.Bool aat_layout_has_tracking (HarfBuzz.Face face);
        [CCode (cheader_filename = "hb-gobject.h")]
-       [Version (since = "4.0.0")]
-       public static void draw_close_path (HarfBuzz.DrawFuncs dfuncs, void* draw_data, HarfBuzz.draw_state_t st);
-       [CCode (cheader_filename = "hb-gobject.h")]
-       [Version (since = "4.0.0")]
-       public static void draw_cubic_to (HarfBuzz.DrawFuncs dfuncs, void* draw_data, HarfBuzz.draw_state_t st, float control1_x, float control1_y, float control2_x, float control2_y, float to_x, float to_y);
-       [CCode (cheader_filename = "hb-gobject.h")]
-       [Version (since = "4.0.0")]
-       public static HarfBuzz.DrawFuncs draw_funcs_create ();
-       [CCode (cheader_filename = "hb-gobject.h")]
-       [Version (since = "4.0.0")]
-       public static HarfBuzz.Bool draw_funcs_is_immutable (HarfBuzz.DrawFuncs dfuncs);
-       [CCode (cheader_filename = "hb-gobject.h")]
-       [Version (since = "4.0.0")]
-       public static void draw_funcs_make_immutable (HarfBuzz.DrawFuncs dfuncs);
-       [CCode (cheader_filename = "hb-gobject.h")]
-       [Version (since = "4.0.0")]
-       public static void draw_funcs_set_close_path_func (HarfBuzz.DrawFuncs dfuncs, owned HarfBuzz.DrawClosePathFunc func);
-       [CCode (cheader_filename = "hb-gobject.h")]
-       [Version (since = "4.0.0")]
-       public static void draw_funcs_set_cubic_to_func (HarfBuzz.DrawFuncs dfuncs, owned HarfBuzz.DrawCubicToFunc func);
-       [CCode (cheader_filename = "hb-gobject.h")]
-       [Version (since = "4.0.0")]
-       public static void draw_funcs_set_line_to_func (HarfBuzz.DrawFuncs dfuncs, owned HarfBuzz.DrawLineToFunc func);
-       [CCode (cheader_filename = "hb-gobject.h")]
-       [Version (since = "4.0.0")]
-       public static void draw_funcs_set_move_to_func (HarfBuzz.DrawFuncs dfuncs, owned HarfBuzz.DrawMoveToFunc func);
-       [CCode (cheader_filename = "hb-gobject.h")]
-       [Version (since = "4.0.0")]
-       public static void draw_funcs_set_quadratic_to_func (HarfBuzz.DrawFuncs dfuncs, owned HarfBuzz.DrawQuadraticToFunc func);
-       [CCode (cheader_filename = "hb-gobject.h")]
-       [Version (since = "4.0.0")]
-       public static void draw_line_to (HarfBuzz.DrawFuncs dfuncs, void* draw_data, HarfBuzz.draw_state_t st, float to_x, float to_y);
-       [CCode (cheader_filename = "hb-gobject.h")]
-       [Version (since = "4.0.0")]
-       public static void draw_move_to (HarfBuzz.DrawFuncs dfuncs, void* draw_data, HarfBuzz.draw_state_t st, float to_x, float to_y);
-       [CCode (cheader_filename = "hb-gobject.h")]
-       [Version (since = "4.0.0")]
-       public static void draw_quadratic_to (HarfBuzz.DrawFuncs dfuncs, void* draw_data, HarfBuzz.draw_state_t st, float control_x, float control_y, float to_x, float to_y);
-       [CCode (cheader_filename = "hb-gobject.h")]
        [Version (since = "0.9.2")]
-       public static HarfBuzz.Face ft_face_create ([CCode (destroy_notify_pos = 1.1)] owned FT.Face ft_face);
+       public static HarfBuzz.Face ft_face_create ([CCode (destroy_notify_pos = 1.1)] FT.Face ft_face);
        [CCode (cheader_filename = "hb-gobject.h")]
        [Version (since = "0.9.2")]
        public static HarfBuzz.Face ft_face_create_cached (FT.Face ft_face);
@@ -1836,7 +1823,7 @@ namespace HarfBuzz {
        public static void ft_font_changed (HarfBuzz.Font font);
        [CCode (cheader_filename = "hb-gobject.h")]
        [Version (since = "0.9.2")]
-       public static HarfBuzz.Font ft_font_create ([CCode (destroy_notify_pos = 1.1)] owned FT.Face ft_face);
+       public static HarfBuzz.Font ft_font_create ([CCode (destroy_notify_pos = 1.1)] FT.Face ft_face);
        [CCode (cheader_filename = "hb-gobject.h")]
        [Version (since = "0.9.38")]
        public static HarfBuzz.Font ft_font_create_referenced (FT.Face ft_face);

diff --git a/vapi/metadata/HarfBuzz-0.0.metadata b/vapi/metadata/HarfBuzz-0.0.metadata
index c79ea3a51fe3a2d8b6ea94b35f4cfb66566976ac..dec0bbac2dbf8903a4e1d1aa6078f80616ee192a 100644 (file)
--- a/vapi/metadata/HarfBuzz-0.0.metadata
+++ b/vapi/metadata/HarfBuzz-0.0.metadata
@@ -109,6 +109,12 @@ unicode_general_category_t name="UnicodeGeneralCategory"
 // re-parenting
 blob_*#function name="blob_(.+)" parent="HarfBuzz.Blob"
 buffer_*#function name="buffer_(.+)" parent="HarfBuzz.Buffer"
+draw_funcs_*#function name="draw_funcs_(.+)" parent="HarfBuzz.DrawFuncs"
+draw_close_path#function name="close_path" parent="HarfBuzz.DrawFuncs"
+draw_cubic_to#function name="cubic_to" parent="HarfBuzz.DrawFuncs"
+draw_line_to#function name="line_to" parent="HarfBuzz.DrawFuncs"
+draw_move_to#function name="move_to" parent="HarfBuzz.DrawFuncs"
+draw_quadratic_to#function name="quadratic_to" parent="HarfBuzz.DrawFuncs"
 face_*#function name="face_(.+)" parent="HarfBuzz.Face"
 feature_*#function name="feature_(.+)" parent="HarfBuzz.Feature"
 font_*#function name="font_(.+)" parent="HarfBuzz.Font"
@@ -121,5 +127,7 @@ unicode_*#function name="unicode_(.+)" parent="HarfBuzz.UnicodeFuncs"
 unicode_funcs_*#function name="unicode_funcs_(.+)" parent="HarfBuzz.UnicodeFuncs"
 variation_*#function name="variation_(.+)" parent="HarfBuzz.Variation"
 
+ft_face_create.ft_face owned=false
+ft_font_create.ft_face owned=false
 variation_to_string.buf out=false owned=false
 variation_t._string.buf out=false owned=false