awaken-event-loop does nothing if dpy-fd not set; move x11.unix to x11.io.unix

diff --git a/basis/x11/io/unix/authors.txt b/basis/x11/io/unix/authors.txt
new file mode 100644 (file)
index 0000000..d4f5d6b
--- /dev/null
+++ b/basis/x11/io/unix/authors.txt
@@ -0,0 +1 @@
+Slava Pestov
\ No newline at end of file

diff --git a/basis/x11/io/unix/unix.factor b/basis/x11/io/unix/unix.factor
new file mode 100644 (file)
index 0000000..821beb9
--- /dev/null
+++ b/basis/x11/io/unix/unix.factor
@@ -0,0 +1,15 @@
+! Copyright (C) 2009 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: io.backend.unix io.backend.unix.multiplexers
+namespaces system x11 x11.xlib x11.io
+accessors threads sequences kernel ;
+IN: x11.io.unix
+
+SYMBOL: dpy-fd
+
+M: unix init-x-io dpy get XConnectionNumber <fd> dpy-fd set-global ;
+
+M: unix wait-for-display dpy-fd get +input+ wait-for-fd ;
+
+M: unix awaken-event-loop
+    dpy-fd get [ fd>> mx get remove-input-callbacks [ resume ] each ] when* ;
\ No newline at end of file

diff --git a/basis/x11/unix/authors.txt b/basis/x11/unix/authors.txt
deleted file mode 100644 (file)
index d4f5d6b..0000000
--- a/basis/x11/unix/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Slava Pestov
\ No newline at end of file

diff --git a/basis/x11/unix/unix.factor b/basis/x11/unix/unix.factor
deleted file mode 100644 (file)
index 8e3fc34..0000000
--- a/basis/x11/unix/unix.factor
+++ /dev/null
@@ -1,15 +0,0 @@
-! Copyright (C) 2009 Slava Pestov.
-! See http://factorcode.org/license.txt for BSD license.
-USING: io.backend.unix io.backend.unix.multiplexers
-namespaces system x11 x11.xlib x11.io
-accessors threads sequences ;
-IN: x11.unix
-
-SYMBOL: dpy-fd
-
-M: unix init-x-io dpy get XConnectionNumber <fd> dpy-fd set-global ;
-
-M: unix wait-for-display dpy-fd get +input+ wait-for-fd ;
-
-M: unix awaken-event-loop
-    dpy-fd get fd>> mx get remove-input-callbacks [ resume ] each ;
\ No newline at end of file

diff --git a/basis/x11/x11.factor b/basis/x11/x11.factor
index bbda90aa3e459a032766e0c8adc65ddc10eaf8f4..09328c6f6ea895a6b13a087b6fd6b0799961da1b 100644 (file)
--- a/basis/x11/x11.factor
+++ b/basis/x11/x11.factor
@@ -33,4 +33,4 @@ SYMBOL: root
 : with-x ( display-string quot -- )
     [ init-x ] dip [ close-x ] [ ] cleanup ; inline
 
-"io.backend.unix" vocab [ "x11.unix" require ] when
\ No newline at end of file
+"io.backend.unix" vocab [ "x11.io.unix" require ] when
\ No newline at end of file