gobject-introspection: rewrite gir files loading and code generation totally

[factor.git] / basis / pango / ffi / ffi.factor

diff --git a/basis/pango/ffi/ffi.factor b/basis/pango/ffi/ffi.factor
index e6c794e8bf846cd83e30a869050b578090bb80c1..4e05226edc75cba242c38ae3daf9d7924fca8d97 100644 (file)
--- a/basis/pango/ffi/ffi.factor
+++ b/basis/pango/ffi/ffi.factor
@@ -1,10 +1,16 @@
-! Copyright (C) 2009 Anton Gorenko.
+! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.destructors alien.libraries
-alien.syntax combinators kernel system
-gobject-introspection glib.ffi ;
+alien.syntax combinators gobject-introspection
+gobject-introspection.standard-types system vocabs.loader ;
 IN: pango.ffi
 
+<<
+"gobject.ffi" require
+>>
+
+LIBRARY: pango
+
 << 
 "pango" {
     { [ os winnt? ] [ "libpango-1.0-0.dll" cdecl add-library ] }
@@ -13,9 +19,6 @@ IN: pango.ffi
 } cond 
 >>
 
-TYPEDEF: void PangoLayoutRun
-TYPEDEF: guint32 PangoGlyph
-
 IMPLEMENT-STRUCTS: PangoRectangle ;
 
 GIR: vocab:pango/Pango-1.0.gir
@@ -23,3 +26,14 @@ GIR: vocab:pango/Pango-1.0.gir
 DESTRUCTOR: pango_font_description_free
 DESTRUCTOR: pango_layout_iter_free
 
+! <workaround
+
+FORGET: pango_layout_line_index_to_x
+FUNCTION: void
+pango_layout_line_index_to_x ( PangoLayoutLine* line, gint index_, gboolean trailing, gint* x_pos ) ;
+
+FORGET: pango_layout_line_x_to_index
+FUNCTION: gboolean
+pango_layout_line_x_to_index ( PangoLayoutLine* line, gint x_pos, gint* index_, gint* trailing ) ;
+
+! workaround>