Merge branch 'gtk' into gtk-image-loader

Conflicts:
	basis/glib/ffi/ffi.factor
	basis/ui/backend/gtk/gtk.factor

basis/atk/ffi/ffi.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries alien.syntax combinators kernel
 system
-gir glib.ffi gobject.ffi ;
+gobject-introspection glib.ffi gobject.ffi ;
 IN: atk.ffi
 
 <<

basis/atk/summary.txt

@@ -0,0 +1 @@
+Atk binding

basis/atk/tags.txt

@@ -0,0 +1 @@
+bindings

basis/gdk/ffi/ffi.factor

@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.destructors alien.syntax
 alien.libraries cairo.ffi combinators kernel system
-gir gdk.pixbuf.ffi gio.ffi glib.ffi gmodule.ffi gobject.ffi
+gobject-introspection gdk.pixbuf.ffi gio.ffi glib.ffi gmodule.ffi
-pango.ffi ;
+gobject.ffi pango.ffi ;
 IN: gdk.ffi
 
 <<

basis/gdk/gl/ffi/ffi.factor

@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.libraries combinators kernel
 system vocabs.parser words
-gir gdk.ffi gdk.pixbuf.ffi gio.ffi glib.ffi gmodule.ffi
+gobject-introspection gdk.ffi gdk.pixbuf.ffi gio.ffi glib.ffi
-gobject.ffi pango.ffi ;
+gmodule.ffi gobject.ffi pango.ffi ;
 IN: gdk.gl.ffi
 
 <<

basis/gdk/gl/summary.txt

@@ -0,0 +1 @@
+GdkGLExt binding

basis/gdk/gl/tags.txt

@@ -0,0 +1 @@
+bindings

basis/gdk/pixbuf/ffi/ffi.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries combinators kernel system
-gir gio.ffi glib.ffi gmodule.ffi gobject.ffi ;
+gobject-introspection gio.ffi glib.ffi gmodule.ffi gobject.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gdk.pixbuf.ffi
 

basis/gdk/pixbuf/summary.txt

@@ -0,0 +1 @@
+GdkPixbuf binding

basis/gdk/pixbuf/tags.txt

@@ -0,0 +1 @@
+bindings

basis/gdk/summary.txt

@@ -0,0 +1 @@
+Gdk binding

basis/gdk/tags.txt

@@ -0,0 +1 @@
+bindings

basis/gio/ffi/ffi.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries combinators kernel system
-gir glib.ffi gobject.ffi ;
+gobject-introspection glib.ffi gobject.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gio.ffi
 

basis/gio/summary.txt

@@ -0,0 +1 @@
+GIO binding

basis/gio/tags.txt

@@ -0,0 +1 @@
+bindings

basis/glib/ffi/ffi.factor

@@ -1,8 +1,9 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.destructors
-alien.libraries alien.strings alien.syntax combinators gir
+alien.libraries alien.strings alien.syntax combinators
-io.encodings.utf8 kernel system vocabs.parser words ;
+gobject-introspection io.encodings.utf8 kernel system
+vocabs.parser words ;
 IN: glib.ffi
 
 <<

basis/glib/summary.txt

@@ -0,0 +1 @@
+GLib binding

basis/glib/tags.txt

@@ -0,0 +1 @@
+bindings

basis/gmodule/ffi/ffi.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries combinators kernel system
-gir glib.ffi ;
+gobject-introspection glib.ffi ;
 IN: gmodule.ffi
 
 <<

basis/gmodule/summary.txt

@@ -0,0 +1 @@
+GModule binding

basis/gmodule/tags.txt

@@ -0,0 +1 @@
+bindings

basis/gobject-introspection/common/common.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: assocs kernel namespaces ;
-IN: gir.common
+IN: gobject-introspection.common
 
 CONSTANT: ffi-vocab "ffi"
 

basis/gobject-introspection/ffi/ffi.factor

@@ -1,11 +1,12 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.c-types alien.parser arrays
-classes.parser classes.struct combinators combinators.short-circuit
+classes.parser classes.struct combinators
-definitions effects fry gir.common gir.types kernel math.parser
+combinators.short-circuit definitions effects fry
-namespaces parser quotations sequences sequences.generalizations words
+gobject-introspection.common gobject-introspection.types kernel
-words.constant ;
+math.parser namespaces parser quotations sequences
-IN: gir.ffi
+sequences.generalizations words words.constant ;
+IN: gobject-introspection.ffi
 
 : string>c-type ( str -- c-type )
     parse-c-type ;

basis/gobject-introspection/gobject-introspection.factor

@@ -1,8 +1,9 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs combinators gir.common gir.ffi gir.loader
+USING: accessors assocs combinators gobject-introspection.common
+gobject-introspection.ffi gobject-introspection.loader
 kernel lexer locals math namespaces sequences vocabs.parser xml ;
-IN: gir
+IN: gobject-introspection
 
 : with-child-vocab ( name quot -- )
     swap current-vocab name>>

basis/gobject-introspection/loader/loader.factor

@@ -1,10 +1,11 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors ascii combinators fry gir.common gir.repository
+USING: accessors ascii combinators fry
-gir.types kernel math.parser sequences splitting xml.data
+gobject-introspection.common gobject-introspection.repository
-xml.traversal ;
+gobject-introspection.types kernel math.parser sequences
+splitting xml.data xml.traversal ;
 FROM: namespaces => set get ;
-IN: gir.loader
+IN: gobject-introspection.loader
 
 SYMBOL: namespace-prefix
 SYMBOL: namespace-PREFIX
@@ -221,7 +222,6 @@ SYMBOL: namespace-PREFIX
     [ field new ] dip {
         [ "name" attr >>name ]
         [ "writable" attr "1" = >>writable? ]
-        ! Для некоторых field  есть callback в качестве типа, решить, как лучше сделать
         [
             first-child-tag dup name>> main>> "callback" =
             [ drop "gpointer" ] [ "type" attr ] if

basis/gobject-introspection/repository/repository.factor

@@ -1,7 +1,7 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: ;
-IN: gir.repository
+IN: gobject-introspection.repository
 
 TUPLE: node name ;
 

basis/gobject-introspection/summary.txt

@@ -0,0 +1 @@
+GObjectIntrospection support

basis/gobject-introspection/types/types.factor

@@ -1,8 +1,10 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien alien.c-types assocs combinators.short-circuit
+USING: accessors alien alien.c-types assocs
-gir.common gir.repository kernel namespaces specialized-arrays ;
+combinators.short-circuit gobject-introspection.common
-IN: gir.types
+gobject-introspection.repository kernel namespaces
+specialized-arrays ;
+IN: gobject-introspection.types
 
 TUPLE: gwrapper { underlying alien } ;
 TUPLE: grecord < gwrapper ;

basis/gobject/ffi/ffi.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.syntax alien.destructors alien.libraries
 combinators kernel literals math system
-gir glib.ffi ;
+gobject-introspection glib.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gobject.ffi
 

basis/gobject/summary.txt

@@ -0,0 +1 @@
+GObject binding

basis/gobject/tags.txt

@@ -0,0 +1 @@
+bindings

basis/gstreamer/ffi/ffi.factor

@@ -2,12 +2,12 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.syntax alien.libraries combinators kernel
 system
-gir glib.ffi gmodule.ffi gobject.ffi ;
+gobject-introspection glib.ffi gmodule.ffi gobject.ffi ;
 EXCLUDE: alien.c-types => pointer ;
-IN: gst.ffi
+IN: gstreamer.ffi
 
 <<
-"gst" {
+"gstreamer" {
     { [ os winnt? ] [ drop ] }
     { [ os macosx? ] [ drop ] }
     { [ os unix? ] [ "libgstreamer-0.10.so" cdecl add-library ] }
@@ -18,10 +18,10 @@ TYPEDEF: gpointer GstClockID
 TYPEDEF: guint64 GstClockTime
 TYPEDEF: gint64 GstClockTimeDiff
 
-! Временное исправление отсутвующих типов libxml2
+! types from libxml2
 TYPEDEF: void* xmlNodePtr
 TYPEDEF: void* xmlDocPtr
 TYPEDEF: void* xmlNsPtr
 
-GIR: vocab:gst/Gst-0.10.gir
+GIR: vocab:gstreamer/Gst-0.10.gir
 

basis/gstreamer/gstreamer.factor

@@ -1,5 +1,5 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: gst.ffi ;
+USING: gstreamer.ffi ;
-IN: gst
+IN: gstreamer
 

basis/gstreamer/summary.txt

@@ -0,0 +1 @@
+GStreamer binding

basis/gstreamer/tags.txt

@@ -0,0 +1 @@
+bindings

basis/gtk/ffi/ffi.factor

@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.syntax alien.destructors alien.libraries
 cairo.ffi combinators kernel system
-gir atk.ffi gdk.ffi gdk.pixbuf.ffi gio.ffi glib.ffi gmodule.ffi
+gobject-introspection atk.ffi gdk.ffi gdk.pixbuf.ffi gio.ffi
-gobject.ffi pango.ffi ;
+glib.ffi gmodule.ffi gobject.ffi pango.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gtk.ffi
 

basis/gtk/gl/ffi/ffi.factor

@@ -1,8 +1,8 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.libraries combinators kernel system
-gir gdk.ffi gdk.pixbuf.ffi gdk.gl.ffi gio.ffi glib.ffi
+gobject-introspection gdk.ffi gdk.pixbuf.ffi gdk.gl.ffi gio.ffi
-gmodule.ffi gobject.ffi gtk.ffi ;
+glib.ffi gmodule.ffi gobject.ffi gtk.ffi ;
 EXCLUDE: alien.c-types => pointer ;
 IN: gtk.gl.ffi
 

basis/gtk/gl/summary.txt

@@ -0,0 +1 @@
+GtkGLExt binding

basis/gtk/gl/tags.txt

@@ -0,0 +1 @@
+bindings

basis/gtk/summary.txt

@@ -0,0 +1 @@
+Gtk binding

basis/gtk/tags.txt

@@ -0,0 +1 @@
+bindings

basis/pango/cairo/ffi/ffi.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.libraries alien.syntax cairo.ffi
 combinators kernel system
-gir pango.ffi ;
+gobject-introspection pango.ffi ;
 IN: pango.cairo.ffi
 
 << 

basis/pango/cairo/summary.txt

@@ -0,0 +1 @@
+PangoCairo binding

basis/pango/cairo/tags.txt

@@ -0,0 +1 @@
+bindings

basis/pango/ffi/ffi.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.destructors alien.libraries
 alien.syntax combinators kernel system
-gir glib.ffi ;
+gobject-introspection glib.ffi ;
 IN: pango.ffi
 
 << 
@@ -13,7 +13,7 @@ IN: pango.ffi
 } cond 
 >>
 
-TYPEDEF: void PangoLayoutRun ! не совсем верно
+TYPEDEF: void PangoLayoutRun
 TYPEDEF: guint32 PangoGlyph
 
 IMPLEMENT-STRUCTS: PangoRectangle ;

basis/pango/summary.txt

@@ -0,0 +1 @@
+Pango binding

basis/pango/tags.txt

@@ -0,0 +1 @@
+bindings

basis/ui/backend/gtk/gtk.factor

@@ -8,12 +8,9 @@ io.backend.unix.multiplexers io.encodings.utf8 io.thread kernel
 libc literals locals math math.bitwise math.order math.vectors
 namespaces sequences strings system threads ui ui.backend
 ui.clipboards ui.commands ui.event-loop ui.gadgets
-ui.gadgets.menus ui.gadgets.private ui.gadgets.worlds
+ui.gadgets.editors ui.gadgets.menus ui.gadgets.private
-ui.gestures ui.pixel-formats ui.pixel-formats.private
+ui.gadgets.worlds ui.gestures ui.pixel-formats
-ui.private ;
+ui.pixel-formats.private ui.private ;
-RENAME: windows ui.private => ui:windows
-EXCLUDE: ui.gadgets.editors => change-caret ;
-RENAME: change-caret ui.gadgets.editors => editors:change-caret
 IN: ui.backend.gtk
 
 SINGLETON: gtk-ui-backend
@@ -231,7 +228,12 @@ CONSTANT: poll-fd-events
         mx get fd>> >>fd
         poll-fd-events >>events ;
 
-: init-io-event-source ( -- )
+HOOK: init-io-event-source io-backend ( -- )
+
+M: c-io-backend init-io-event-source
+    ;
+
+M: object init-io-event-source
     GSourceFuncs malloc-struct &free
         [ io-source-prepare ] GSourceFuncsPrepareFunc >>prepare
         [ io-source-check ] GSourceFuncsCheckFunc >>check

basis/ui/backend/gtk/summary.txt

@@ -0,0 +1 @@
+Gtk-based UI backend

extra/gir/samples/lowlevel/gstreamer/gstreamer.factor

@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.c-types alien.strings fry byte-arrays classes.struct
 io.encodings.utf8 kernel locals math prettyprint 
-gst.ffi glib.ffi gobject.ffi gtk.ffi ;
+gstreamer.ffi glib.ffi gobject.ffi gtk.ffi ;
 IN: gir.samples.lowlevel.gstreamer
 
 ! CONSTANT: uri "http://www.xiph.org/vorbis/listen/compilation-ogg-q4.ogg"