ui.*: lets rename ui-running to with-ui-running

Because it is really annoying with global variables having the same name
as words.

diff --git a/basis/ui/backend/cocoa/cocoa.factor b/basis/ui/backend/cocoa/cocoa.factor
index 08cc6136a56b955d32e74b20480e061c85988c22..00a87618cfbe5e3a83701ba2b293ae126c5fcb57 100644 (file)
--- a/basis/ui/backend/cocoa/cocoa.factor
+++ b/basis/ui/backend/cocoa/cocoa.factor
@@ -223,7 +223,7 @@ M: cocoa-ui-backend (with-ui)
             init-thread-timer
             reset-thread-timer
             NSApp -> run
-        ] ui-running
+        ] with-ui-running
     ] with-cocoa ;
 
 cocoa-ui-backend ui-backend set-global

diff --git a/basis/ui/backend/gtk/gtk.factor b/basis/ui/backend/gtk/gtk.factor
index 31e4aac7dd788aff4c10b122cfd5f0d9b6cb8ad8..e82edeb5605da3c86748088384547626ad29871b 100644 (file)
--- a/basis/ui/backend/gtk/gtk.factor
+++ b/basis/ui/backend/gtk/gtk.factor
@@ -511,7 +511,7 @@ M: gtk-ui-backend (with-ui)
         [
             [ [ gtk_main ] with-timer ] with-event-loop
         ] with-destructors
-    ] ui-running ;
+    ] with-ui-running ;
 
 M: gtk-ui-backend stop-event-loop
     gtk_main_quit ;

diff --git a/basis/ui/backend/windows/windows.factor b/basis/ui/backend/windows/windows.factor
index cba8ae5ccc2e2eadb01980e55bac02ab51a0419f..436f26b74564ba6370521fd831d669ea81d803ed 100755 (executable)
--- a/basis/ui/backend/windows/windows.factor
+++ b/basis/ui/backend/windows/windows.factor
@@ -712,7 +712,7 @@ M: windows-ui-backend (with-ui)
             start-ui
             event-loop
         ] [ cleanup-win32-ui ] [ ] cleanup
-    ] ui-running ;
+    ] with-ui-running ;
 
 M: windows-ui-backend beep ( -- )
     0 MessageBeep drop ;

diff --git a/basis/ui/backend/x11/x11.factor b/basis/ui/backend/x11/x11.factor
index d8bc60730815d91a972b1320c3288325b7f0ee7b..38a4cb5cd100bf0407c4f07da624d9b5c9464871 100644 (file)
--- a/basis/ui/backend/x11/x11.factor
+++ b/basis/ui/backend/x11/x11.factor
@@ -327,7 +327,7 @@ M: x11-ui-backend (with-ui) ( quot -- )
                 event-loop
             ] with-xim
         ] with-x
-    ] ui-running ;
+    ] with-ui-running ;
 
 M: x11-ui-backend beep ( -- )
     dpy get 100 XBell drop ;

diff --git a/basis/ui/ui.factor b/basis/ui/ui.factor
index 7788c67e13b48dd3a134dd05ad3d3a9eb2ea2d6c..5cce30ac93a3e1c25b0bafb7315b1fc0fe590174 100644 (file)
--- a/basis/ui/ui.factor
+++ b/basis/ui/ui.factor
@@ -132,9 +132,11 @@ M: world ungraft*
     redraw-worlds
     send-queued-gestures ;
 
-: ui-running ( quot -- )
-    t \ ui-running set-global
-    [ f \ ui-running set-global ] [ ] cleanup ; inline
+SYMBOL: ui-running
+
+: with-ui-running ( quot -- )
+    t ui-running set-global
+    [ f ui-running set-global ] [ ] cleanup ; inline
 
 PRIVATE>
 
@@ -144,7 +146,7 @@ PRIVATE>
     find-last nip ; inline
 
 : ui-running? ( -- ? )
-    \ ui-running get-global ;
+    ui-running get-global ;
 
 <PRIVATE
 
@@ -205,7 +207,7 @@ M: object close-window
     find-world [ ungraft ] when* ;
 
 [
-    f \ ui-running set-global
+    f ui-running set-global
     <flag> ui-notify-flag set-global
 ] "ui" add-startup-hook