From 779db3970d06f9ab720792c4cd9a524a0ce5e9d6 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Wed, 2 Mar 2005 03:19:26 +0000
Subject: [PATCH] fix bootstrap errors

---
 TODO.FACTOR.txt                      |  3 +++
 library/bootstrap/boot-stage2.factor |  4 +++-
 library/ui/paint.factor              | 14 +++++++-------
 library/ui/root-menu.factor          | 18 ++++++++++++++++++
 library/ui/world.factor              | 17 +----------------
 5 files changed, 32 insertions(+), 24 deletions(-)
 create mode 100644 library/ui/root-menu.factor

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 8bebccd7e6..366a42b346 100644
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -6,6 +6,8 @@
 
 + ui:
 
+- inspector: complain if UI not running
+- opening listeners fails
 - menu dragging
 - hide menu after item selected
 - scrollable inspector
@@ -55,6 +57,7 @@
 
 + kernel:
 
+- hash-size regression
 - vectors: ensure its ok with bignum indices
 - cat, reverse-cat primitives
 - code gc
diff --git a/library/bootstrap/boot-stage2.factor b/library/bootstrap/boot-stage2.factor
index be411a18d2..8ddf309989 100644
--- a/library/bootstrap/boot-stage2.factor
+++ b/library/bootstrap/boot-stage2.factor
@@ -173,8 +173,8 @@ cpu "x86" = "mini" get not and [
         "/library/ui/gestures.factor"
         "/library/ui/hand.factor"
         "/library/ui/layouts.factor"
-        "/library/ui/halo.factor"
         "/library/ui/world.factor"
+        "/library/ui/halo.factor"
         "/library/ui/labels.factor"
         "/library/ui/buttons.factor"
         "/library/ui/line-editor.factor"
@@ -182,9 +182,11 @@ cpu "x86" = "mini" get not and [
         "/library/ui/dialogs.factor"
         "/library/ui/events.factor"
         "/library/ui/scrolling.factor"
+        "/library/ui/menus.factor"
         "/library/ui/presentations.factor"
         "/library/ui/panes.factor"
         "/library/ui/inspector.factor"
+        "/library/ui/root-menu.factor"
     ] [
         dup print
         run-resource
diff --git a/library/ui/paint.factor b/library/ui/paint.factor
index ec4058a5e7..67358eb326 100644
--- a/library/ui/paint.factor
+++ b/library/ui/paint.factor
@@ -147,6 +147,13 @@ SYMBOL: clip
 : intersect ( rect rect -- rect )
     [ intersect-x ] 2keep intersect-y clip-rect ;
 
+: >sdl-rect ( rectangle -- sdlrect )
+    [ rectangle-x ] keep
+    [ rectangle-y ] keep
+    [ rectangle-w ] keep
+    rectangle-h
+    make-rect ;
+
 : set-clip ( rect -- ? )
     #! The top/left corner of the clip rectangle is the location
     #! of the gadget on the screen. The bottom/right is the
@@ -170,13 +177,6 @@ M: object shape-clip
         call
     ] with-scope ; inline
 
-: >sdl-rect ( rectangle -- sdlrect )
-    [ rectangle-x ] keep
-    [ rectangle-y ] keep
-    [ rectangle-w ] keep
-    rectangle-h
-    make-rect ;
-
 : draw-gadget ( gadget -- )
     #! All drawing done inside draw-shape is done with the
     #! gadget's paint. If the gadget does not have any custom
diff --git a/library/ui/root-menu.factor b/library/ui/root-menu.factor
new file mode 100644
index 0000000000..2f9cb66bf2
--- /dev/null
+++ b/library/ui/root-menu.factor
@@ -0,0 +1,18 @@
+! Copyright (C) 2005 Slava Pestov.
+! See http://factor.sf.net/license.txt for BSD license.
+IN: gadgets
+USING: kernel memory namespaces ;
+
+SYMBOL: root-menu
+
+: show-root-menu ( -- )
+    root-menu get <menu> show-menu ;
+
+[
+    [[ "Listener" [ <console-pane> <scroller> world get add-gadget ] ]]
+    [[ "Globals" [ global inspect ] ]]
+    [[ "Save image" [ "image" get save-image ] ]]
+    [[ "Exit" [ f world get set-world-running? ] ]]
+] root-menu set
+
+world get [ drop show-root-menu ] [ button-down 1 ] set-action
diff --git a/library/ui/world.factor b/library/ui/world.factor
index 2b42c30b39..9eb75d9abd 100644
--- a/library/ui/world.factor
+++ b/library/ui/world.factor
@@ -56,18 +56,7 @@ DEFER: handle-event
         drop world get world-step [ yield run-world ] when
     ] ifte ;
 
-SYMBOL: root-menu
-
-: show-root-menu ( -- )
-    root-menu get <menu> show-menu ;
-
 global [
-    [
-        [[ "Listener" [ <console-pane> <scroller> world get add-gadget ] ]]
-        [[ "Globals" [ global inspect ] ]]
-        [[ "Save image" [ "image" get save-image ] ]]
-        [[ "Exit" [ f world get set-world-running? ] ]]
-    ] root-menu set
     
     <world> world set
     
@@ -77,13 +66,9 @@ global [
 
         [[ background [ 255 255 255 ] ]]
         [[ foreground [ 0 0 0 ] ]]
-        [[ bevel-1    [ 224 224 255 ] ]]
-        [[ bevel-2    [ 192 192 216 ] ]]
         [[ reverse-video f ]]
-        [[ font       [[ "Sans Serif" 12 ]] ]]
+        [[ font [[ "Sans Serif" 12 ]] ]]
     }} world get set-gadget-paint
-
-    world get [ drop show-root-menu ] [ button-down 1 ] set-action
 ] bind
 
 : title ( -- str )