clutter: update;

extra/clutter/cogl/ffi/ffi.factor

@@ -1,10 +1,15 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.c-types alien.libraries alien.syntax
+USING: alien alien.libraries alien.syntax combinators
-combinators kernel opengl.gl system
+gobject-introspection kernel opengl.gl system vocabs.loader ;
-gobject-introspection glib.ffi ;
 IN: clutter.cogl.ffi
 
+<<
+"gobject.ffi" require
+>>
+
+LIBRARY: clutter.cogl
+
 <<
 "clutter.cogl" {
     { [ os winnt? ] [ drop ] }
@@ -13,13 +18,8 @@ IN: clutter.cogl.ffi
 } cond
 >>
 
-TYPEDEF: int CoglAngle
+FOREIGN-ATOMIC-TYPE: GL.uint GLuint
-TYPEDEF: int CoglFixed
+FOREIGN-ATOMIC-TYPE: GL.enum GLenum
-TYPEDEF: void* CoglHandle
-
-REPLACE-C-TYPE: unsigned\schar uchar
-REPLACE-C-TYPE: unsigned\sint uint
-REPLACE-C-TYPE: unsigned\slong ulong
 
 GIR: vocab:clutter/cogl/Cogl-1.0.gir
 

extra/clutter/ffi/ffi.factor

@@ -1,11 +1,18 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.c-types alien.libraries cairo.ffi
+USING: alien alien.libraries alien.syntax cairo.ffi combinators
-combinators kernel system
+gobject-introspection kernel system vocabs.loader ;
-gobject-introspection clutter.cogl.ffi clutter.json.ffi
-glib.ffi gobject.ffi pango.ffi ;
 IN: clutter.ffi
 
+<<
+"atk.ffi" require
+"pango.cairo.ffi" require
+"clutter.cogl.ffi" require
+"clutter.json.ffi" require
+>>
+
+LIBRARY: clutter
+
 <<
 "clutter" {
     { [ os winnt? ] [ drop ] }
@@ -14,7 +21,7 @@ IN: clutter.ffi
 } cond
 >>
 
-IMPLEMENT-STRUCTS: ClutterVertex ;
+FOREIGN-RECORD-TYPE: cairo.Path cairo_path_t
 
 GIR: vocab:clutter/Clutter-1.0.gir
 

extra/clutter/gtk/ffi/ffi.factor

@@ -1,11 +1,16 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.c-types alien.libraries combinators kernel
+USING: alien alien.libraries alien.syntax combinators
-system
+gobject-introspection kernel system vocabs.loader ;
-gobject-introspection clutter.ffi gdk.pixbuf.ffi glib.ffi
-gtk.ffi ;
 IN: clutter.gtk.ffi
 
+<<
+"clutter.ffi" require
+"gtk.ffi" require
+>>
+
+LIBRARY: clutter.gtk
+
 <<
 "clutter.gtk" {
     { [ os winnt? ] [ drop ] }

extra/clutter/json/ffi/ffi.factor

@@ -1,9 +1,16 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.libraries combinators kernel system
+USING: alien alien.libraries alien.syntax combinators
-gobject-introspection glib.ffi gobject.ffi ;
+gobject-introspection kernel system vocabs.loader ;
 IN: clutter.json.ffi
 
+<<
+"gobject.ffi" require
+"gio.ffi" require
+>>
+
+LIBRARY: clutter.json
+
 <<
 "clutter.json" {
     { [ os winnt? ] [ drop ] }
@@ -12,5 +19,5 @@ IN: clutter.json.ffi
 } cond
 >>
 
-GIR: vocab:clutter/json/ClutterJson-1.0.gir
+GIR: vocab:clutter/json/Json-1.0.gir