From 7d5df2c8a28b37cb5a4f8dfbbb40698ed6507793 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Tue, 29 Mar 2016 22:36:02 -0700
Subject: [PATCH] ui.backend.gtk: only use the timer when not io.backend.unix.

---
 basis/ui/backend/gtk/gtk.factor   | 55 ++++++++-----------------------
 basis/ui/backend/gtk/io/io.factor | 32 ++++++++++++++++--
 2 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/basis/ui/backend/gtk/gtk.factor b/basis/ui/backend/gtk/gtk.factor
index 881e88393a..3ad7650412 100644
--- a/basis/ui/backend/gtk/gtk.factor
+++ b/basis/ui/backend/gtk/gtk.factor
@@ -1,15 +1,16 @@
 ! Copyright (C) 2010, 2011 Anton Gorenko, Philipp Bruschweiler.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors alien.accessors alien.c-types alien.data
-alien.strings arrays assocs classes.struct combinators continuations
-destructors environment gdk.ffi gdk.gl.ffi gdk.pixbuf.ffi glib.ffi
-gobject-introspection.standard-types gobject.ffi gtk.ffi gtk.gl.ffi
-io.encodings.binary io.encodings.utf8 io.files kernel libc literals
-locals math math.bitwise math.vectors namespaces sequences strings
-system threads ui ui.backend ui.backend.gtk.input-methods
-ui.backend.gtk.io ui.clipboards ui.event-loop ui.gadgets
-ui.gadgets.private ui.gadgets.worlds ui.gestures ui.pixel-formats
-ui.pixel-formats.private ui.private vocabs.loader ;
+USING: accessors alien.c-types alien.data alien.strings arrays
+assocs classes.struct combinators continuations destructors
+environment gdk.ffi gdk.gl.ffi gdk.pixbuf.ffi glib.ffi
+gobject-introspection.standard-types gobject.ffi gtk.ffi
+gtk.gl.ffi io.encodings.binary io.encodings.utf8 io.files kernel
+literals locals math math.bitwise math.vectors namespaces
+sequences strings system threads ui ui.backend
+ui.backend.gtk.input-methods ui.backend.gtk.io ui.clipboards
+ui.event-loop ui.gadgets ui.gadgets.private ui.gadgets.worlds
+ui.gestures ui.pixel-formats ui.pixel-formats.private ui.private
+vocabs.loader ;
 IN: ui.backend.gtk
 
 SINGLETON: gtk-ui-backend
@@ -55,34 +56,6 @@ M: gtk-clipboard set-clipboard-contents
         gtk_clipboard_get <gtk-clipboard> swap set-global
     ] 2bi@ ;
 
-! Timer
-
-: set-timeout*-value ( alien value -- )
-    swap 0 set-alien-signed-4 ; inline
-
-: timer-prepare ( source timeout* -- ? )
-    nip sleep-time 1,000,000,000 or
-    [ 1,000,000 /i set-timeout*-value ] keep 0 = ;
-
-: timer-check ( source -- ? )
-    drop sleep-time 0 = ;
-
-: timer-dispatch ( source callback user_data -- ? )
-    3drop yield t ;
-
-: <timer-funcs> ( -- timer-funcs )
-    GSourceFuncs malloc-struct
-        [ timer-prepare ] GSourceFuncsPrepareFunc >>prepare
-        [ timer-check ] GSourceFuncsCheckFunc >>check
-        [ timer-dispatch ] GSourceFuncsDispatchFunc >>dispatch ;
-
-:: with-timer ( quot -- )
-    <timer-funcs> &free
-    GSource heap-size g_source_new &g_source_unref :> source
-    source f g_source_attach drop
-    [ quot call( -- ) ]
-    [ source g_source_destroy ] [ ] cleanup ;
-
 ! User input
 
 CONSTANT: events-mask
@@ -547,10 +520,8 @@ M: gtk-ui-backend (with-ui)
         start-ui
         [
             [
-                [
-                    <yield-callback> f g_idle_add drop
-                    gtk_main
-                ] with-timer
+                <yield-callback> f g_idle_add drop
+                gtk_main
             ] with-event-loop
         ] with-destructors
     ] ui-running ;
diff --git a/basis/ui/backend/gtk/io/io.factor b/basis/ui/backend/gtk/io/io.factor
index 04a69690da..d9dfcf62ed 100644
--- a/basis/ui/backend/gtk/io/io.factor
+++ b/basis/ui/backend/gtk/io/io.factor
@@ -1,8 +1,36 @@
 ! Copyright (C) 2011 Anton Gorenko.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: io.backend kernel ;
+USING: accessors alien.accessors alien.c-types classes.struct
+continuations glib.ffi io.backend kernel libc locals math
+threads ;
 IN: ui.backend.gtk.io
 
 HOOK: with-event-loop io-backend ( quot -- )
 
-M: object with-event-loop call( -- ) ;
+! Timer
+
+: set-timeout*-value ( alien value -- )
+    swap 0 set-alien-signed-4 ; inline
+
+: timer-prepare ( source timeout* -- ? )
+    nip sleep-time 1,000,000,000 or
+    [ 1,000,000 /i set-timeout*-value ] keep 0 = ;
+
+: timer-check ( source -- ? )
+    drop sleep-time 0 = ;
+
+: timer-dispatch ( source callback user_data -- ? )
+    3drop yield t ;
+
+: <timer-funcs> ( -- timer-funcs )
+    GSourceFuncs malloc-struct
+        [ timer-prepare ] GSourceFuncsPrepareFunc >>prepare
+        [ timer-check ] GSourceFuncsCheckFunc >>check
+        [ timer-dispatch ] GSourceFuncsDispatchFunc >>dispatch ;
+
+M:: object with-event-loop ( quot -- )
+    <timer-funcs> &free
+    GSource heap-size g_source_new &g_source_unref :> source
+    source f g_source_attach drop
+    [ quot call( -- ) ]
+    [ source g_source_destroy ] [ ] cleanup ;