ui.backend.gtk: add rough implementation of non-blocking IO

diff --git a/basis/glib/ffi/ffi.factor b/basis/glib/ffi/ffi.factor
index 3a8229da52248470cc50ec3bd0ec9de43cdd313e..51fa3af04c5dc85f97acae78b257e3bcae2be580 100644 (file)
--- a/basis/glib/ffi/ffi.factor
+++ b/basis/glib/ffi/ffi.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2009 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien alien.c-types alien.libraries alien.syntax
-combinators compiler.units gir kernel system vocabs.parser words ;
+USING: accessors alien alien.c-types alien.destructors
+alien.libraries alien.syntax combinators compiler.units gir
+kernel system vocabs.parser words ;
 IN: glib.ffi
 
 <<
@@ -66,5 +67,13 @@ TYPEDEF: guint16 gunichar2
 TYPEDEF: gpointer pointer
 TYPEDEF: gpointer any
 
+IMPLEMENT-STRUCTS: GPollFD GSource GSourceFuncs ;
+
 GIR: vocab:glib/GLib-2.0.gir
 
+DESTRUCTOR: g_source_unref
+
+CALLBACK: gboolean GSourceFuncsPrepareFunc ( GSource* source, gint* timeout_ ) ;
+CALLBACK: gboolean GSourceFuncsCheckFunc ( GSource* source ) ;
+CALLBACK: gboolean GSourceFuncsDispatchFunc ( GSource* source, GSourceFunc callback, gpointer user_data ) ;
+

diff --git a/basis/gobject/ffi/ffi.factor b/basis/gobject/ffi/ffi.factor
index 404e2f7fbad168bbf8226944533f34aab388e998..a5b74e3aeb407291b8aca96b079fc25a9468f86d 100644 (file)
--- a/basis/gobject/ffi/ffi.factor
+++ b/basis/gobject/ffi/ffi.factor
@@ -25,6 +25,12 @@ GIR: vocab:gobject/GObject-2.0.gir
 IN: gobject.ffi
 
 FORGET: GIOCondition
+FORGET: G_IO_IN
+FORGET: G_IO_OUT
+FORGET: G_IO_PRI
+FORGET: G_IO_ERR
+FORGET: G_IO_HUP
+FORGET: G_IO_NVAL
 
 FUNCTION: void g_object_unref ( GObject* self ) ;
 

diff --git a/basis/ui/backend/gtk/gtk.factor b/basis/ui/backend/gtk/gtk.factor
index 9503e3112908ae6cf9960de9dfb25348a75fe91b..77e170073c49fda23cf7b1d9e365cb81b4edf7d1 100644 (file)
--- a/basis/ui/backend/gtk/gtk.factor
+++ b/basis/ui/backend/gtk/gtk.factor
@@ -1,10 +1,12 @@
 ! Copyright (C) 2010 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien.enums alien.strings arrays ascii assocs
-classes.struct combinators.short-circuit command-line destructors
-io.encodings.utf8 kernel literals locals math math.bitwise
-namespaces sequences strings ui ui.backend ui.clipboards ui.event-loop
-ui.gadgets ui.gadgets.private ui.gadgets.worlds ui.gestures ui.private
+USING: accessors alien.c-types alien.enums alien.strings arrays
+ascii assocs classes.struct combinators.short-circuit
+command-line destructors io.backend.unix.multiplexers
+io.encodings.utf8 io.thread kernel libc literals locals math
+math.bitwise namespaces sequences strings threads ui ui.backend
+ui.clipboards ui.event-loop ui.gadgets ui.gadgets.private
+ui.gadgets.worlds ui.gestures ui.private
 glib.ffi gobject.ffi gtk.ffi gdk.ffi gdk.gl.ffi gtk.gl.ffi ;
 IN: ui.backend.gtk
 
@@ -177,8 +179,48 @@ CONSTANT: action-key-codes
         gtk_clipboard_get <gtk-clipboard> swap set-global
     ] 2bi@ ;
 
-M: gtk-ui-backend do-events
-    f gtk_main_iteration_do drop ui-wait ;
+: io-source-prepare ( source timeout -- result )
+    2drop f ;
+
+: io-source-check ( source -- result )
+    poll_fds>> 0 g_slist_nth_data GPollFD memory>struct
+    revents>> 0 = not ;
+
+: io-source-dispatch ( source callback user_data -- result )
+     3drop
+     0 mx get wait-for-events
+     yield t ;
+
+: timeout-func ( -- func )
+    [ drop yield t ] GSourceFunc ;
+
+: init-timeout ( interval -- )
+    G_PRIORITY_DEFAULT swap timeout-func f f
+    g_timeout_add_full drop ;
+
+CONSTANT: poll-fd-events
+    {
+        G_IO_IN
+        G_IO_OUT
+        G_IO_PRI
+        G_IO_ERR
+        G_IO_HUP
+        G_IO_NVAL
+    }
+
+: create-poll-fd ( -- poll-fd )
+    GPollFD malloc-struct &free
+        mx get fd>> >>fd
+        poll-fd-events [ enum>number ] [ bitor ] map-reduce >>events ;
+
+: init-io-event-source ( -- )
+    GSourceFuncs malloc-struct &free
+        [ io-source-prepare ] GSourceFuncsPrepareFunc >>prepare
+        [ io-source-check ] GSourceFuncsCheckFunc >>check
+        [ io-source-dispatch ] GSourceFuncsDispatchFunc >>dispatch
+    GSource heap-size g_source_new &g_source_unref
+    [ create-poll-fd g_source_add_poll ]
+    [ f g_source_attach drop ] bi ;
 
 M: gtk-ui-backend (with-ui)
     [
@@ -186,7 +228,13 @@ M: gtk-ui-backend (with-ui)
         f f gtk_gl_init
         init-clipboard
         start-ui
-        event-loop
+        f io-thread-running? set-global
+        [
+            init-io-event-source
+            ! is it correct to use timeouts with 'yield'?
+            10 init-timeout
+            gtk_main
+        ] with-destructors
     ] ui-running ;
 
 : connect-signal ( object signal-name callback -- )
@@ -289,7 +337,8 @@ M:: gtk-ui-backend (open-window) ( world -- )
     win gtk_widget_show_all ;
 
 M: gtk-ui-backend (close-window) ( handle -- )
-    window>> [ unregister-window ] [ gtk_widget_destroy ] bi ;
+    window>> [ unregister-window ] [ gtk_widget_destroy ] bi
+    event-loop? [ gtk_main_quit ] unless ;
 
 M: gtk-ui-backend set-title
     swap [ handle>> window>> ] [ utf8 string>alien ] bi*