From 3b98c55ecff0b0238af60f6817817bde0f6f1b08 Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Sun, 20 Feb 2005 02:49:37 +0000
Subject: [PATCH] dialogs

---
 examples/gadget-test.factor          | 17 +------------
 factor/DefaultVocabularyLookup.java  | 14 +++++-----
 factor/FactorReader.java             |  2 ++
 factor/jedit/FactorPlugin.java       |  1 +
 library/bootstrap/boot-stage2.factor |  2 ++
 library/bootstrap/init-stage2.factor |  3 ++-
 library/io/stream-impl.factor        | 14 +++++++---
 library/io/win32-io-internals.factor |  8 ------
 library/ui/buttons.factor            |  2 +-
 library/ui/dialogs.factor            | 38 ++++++++++++++++++++++++++++
 library/ui/fields.factor             |  2 +-
 library/ui/gadgets.factor            | 12 ++++++---
 library/ui/gestures.factor           |  2 +-
 library/ui/halo.factor               | 18 +++++++++++++
 library/ui/world.factor              | 14 +++++-----
 15 files changed, 101 insertions(+), 48 deletions(-)
 create mode 100644 library/ui/dialogs.factor
 create mode 100644 library/ui/halo.factor

diff --git a/examples/gadget-test.factor b/examples/gadget-test.factor
index b1bd2a1a7f..ca79ae85f2 100644
--- a/examples/gadget-test.factor
+++ b/examples/gadget-test.factor
@@ -36,22 +36,6 @@ USE: stdio
 USE: prettyprint
 USE: words
 
-: grab ( gadget hand -- )
-    [ swap screen-pos swap screen-pos - >rect ] 2keep
-    >r [ move-gadget ] keep r> add-gadget ;
-
-: release ( gadget world -- )
-    >r dup screen-pos >r
-    dup unparent
-    r> >rect pick move-gadget
-    r> add-gadget ;
-
-: moving-actions
-    {{
-            [[ [ button-down 1 ] [ my-hand grab ] ]]
-        [[ [ button-up 1 ] [ world get release ] ]]
-    }} swap set-gadget-gestures ;
-
 : filled? "filled" get checkbox-selected? ;
 
 : <funny-rect>
@@ -72,6 +56,7 @@ USE: words
     "New Rectangle" [ drop 100 100 100 100 <funny-rect> dup [ 255 255 0 ] background set-paint-property world get add-gadget ] <button> "shelf" get add-gadget
     "New Ellipse" [ drop 100 100 200 100 <funny-ellipse> dup [ 0 255 0 ] background set-paint-property world get add-gadget ] <button> "shelf" get add-gadget
     "New Line" [ drop 100 100 200 100 <funny-line> dup [ 255 0 0 ] background set-paint-property world get add-gadget ] <button> "shelf" get add-gadget
+    "Prompt" [ drop "Enter input text:" input-dialog . flush ] <button> "shelf" get add-gadget
     "Filled?" <checkbox> dup "filled" set "shelf" get add-gadget
     "shelf" get "pile" get add-gadget
     "Welcome to Factor " version cat2 <label> "pile" get add-gadget
diff --git a/factor/DefaultVocabularyLookup.java b/factor/DefaultVocabularyLookup.java
index 5035fa1354..a1e7c7f3bf 100644
--- a/factor/DefaultVocabularyLookup.java
+++ b/factor/DefaultVocabularyLookup.java
@@ -121,19 +121,19 @@ public class DefaultVocabularyLookup implements VocabularyLookup
 		pushWord.parsing = new PushWord(pushWord);
 
 		/* OOP */
-		FactorWord generic = define("generic","GENERIC:");
+		FactorWord generic = define("syntax","GENERIC:");
 		generic.parsing = new Definer(generic);
-		FactorWord traits = define("generic","TRAITS:");
+		FactorWord traits = define("syntax","TRAITS:");
 		traits.parsing = new Definer(traits);
-		FactorWord beginMethod = define("generic","M:");
+		FactorWord beginMethod = define("syntax","M:");
 		beginMethod.parsing = new BeginMethod(beginMethod);
-		FactorWord beginConstructor = define("generic","C:");
+		FactorWord beginConstructor = define("syntax","C:");
 		beginConstructor.parsing = new BeginConstructor(beginConstructor);
-		FactorWord beginPredicate = define("generic","PREDICATE:");
+		FactorWord beginPredicate = define("syntax","PREDICATE:");
 		beginPredicate.parsing = new BeginPredicate(beginPredicate);
-		FactorWord beginUnion = define("generic","UNION:");
+		FactorWord beginUnion = define("syntax","UNION:");
 		beginUnion.parsing = new BeginUnion(beginUnion);
-		FactorWord tuple = define("generic","TUPLE:");
+		FactorWord tuple = define("syntax","TUPLE:");
 		tuple.parsing = new Tuple(tuple);
 	} //}}}
 
diff --git a/factor/FactorReader.java b/factor/FactorReader.java
index 88be4656d9..49bb1453c2 100644
--- a/factor/FactorReader.java
+++ b/factor/FactorReader.java
@@ -204,6 +204,8 @@ public class FactorReader
 	//{{{ addUse() method
 	public void addUse(String name)
 	{
+		if(name.equals("!syntax"))
+			return;
 		setUse(new Cons(name,getUse()));
 	} //}}}
 
diff --git a/factor/jedit/FactorPlugin.java b/factor/jedit/FactorPlugin.java
index 7b3fe84d22..c66ce9e4e2 100644
--- a/factor/jedit/FactorPlugin.java
+++ b/factor/jedit/FactorPlugin.java
@@ -116,6 +116,7 @@ public class FactorPlugin extends EditPlugin
 				List args = new ArrayList();
 				args.add(exePath);
 				args.add(imagePath);
+				args.add("-null-stdio");
 				args.add("-shell=telnet");
 				args.add("-telnetd-port=" + PORT);
 				String[] extraArgs = jEdit.getProperty(
diff --git a/library/bootstrap/boot-stage2.factor b/library/bootstrap/boot-stage2.factor
index be61d3505b..9ede682d69 100644
--- a/library/bootstrap/boot-stage2.factor
+++ b/library/bootstrap/boot-stage2.factor
@@ -177,6 +177,8 @@ cpu "x86" = "mini" get not and [
         "/library/ui/labels.factor"
         "/library/ui/buttons.factor"
         "/library/ui/fields.factor"
+        "/library/ui/halo.factor"
+        "/library/ui/dialogs.factor"
         "/library/ui/events.factor"
     ] [
         dup print
diff --git a/library/bootstrap/init-stage2.factor b/library/bootstrap/init-stage2.factor
index c367df1f9f..24157d9b43 100644
--- a/library/bootstrap/init-stage2.factor
+++ b/library/bootstrap/init-stage2.factor
@@ -22,7 +22,8 @@ words unparser kernel-internals console assembler memory ;
     init-error-handler
     init-random
     default-cli-args
-    parse-command-line ;
+    parse-command-line
+    "null-stdio" get [ << null-stream >> stdio set ] when ;
 
 : shell ( str -- )
     #! This handles the -shell:<foo> cli argument.
diff --git a/library/io/stream-impl.factor b/library/io/stream-impl.factor
index 35f09c2750..a577bb2513 100644
--- a/library/io/stream-impl.factor
+++ b/library/io/stream-impl.factor
@@ -41,9 +41,6 @@ M: fd-stream stream-close ( stream -- )
 : <file-writer> ( path -- stream )
     f t open-file <fd-stream> ;
 
-: init-stdio ( -- )
-    stdin stdout <fd-stream> <stdio-stream> stdio set ;
-
 : (fcopy) ( from to -- )
     #! Copy the contents of the fd-stream 'from' to the
     #! fd-stream 'to'. Use fcopy; this word does not close
@@ -64,3 +61,14 @@ M: fd-stream stream-close ( stream -- )
 
 : <resource-stream> ( path -- stream )
     resource-path swap path+ <file-reader> ;
+
+TUPLE: null-stream ;
+M: null-stream stream-flush drop ;
+M: null-stream stream-auto-flush drop ;
+M: null-stream stream-read 2drop f ;
+M: null-stream stream-readln drop f ;
+M: null-stream stream-write-attr 3drop ;
+M: null-stream stream-close drop ;
+
+: init-stdio ( -- )
+    stdin stdout <fd-stream> <stdio-stream> stdio set ;
diff --git a/library/io/win32-io-internals.factor b/library/io/win32-io-internals.factor
index 5319d134d7..ac7cef5875 100644
--- a/library/io/win32-io-internals.factor
+++ b/library/io/win32-io-internals.factor
@@ -138,14 +138,6 @@ END-STRUCT
     ] ifte* 
     win32-io-thread ;
 
-TUPLE: null-stream ;
-M: null-stream stream-flush drop ;
-M: null-stream stream-auto-flush drop ;
-M: null-stream stream-read 2drop f ;
-M: null-stream stream-readln drop f ;
-M: null-stream stream-write-attr 3drop ;
-M: null-stream stream-close drop ;
-
 : win32-init-stdio ( -- )
     INVALID_HANDLE_VALUE NULL NULL 1 CreateIoCompletionPort
     completion-port set 
diff --git a/library/ui/buttons.factor b/library/ui/buttons.factor
index fbb118179a..2ba8b97e29 100644
--- a/library/ui/buttons.factor
+++ b/library/ui/buttons.factor
@@ -76,7 +76,7 @@ TUPLE: checkbox bevel selected? delegate ;
 
 C: checkbox ( label -- checkbox )
     <default-shelf> over set-checkbox-delegate
-    [ >r <label> r> add-gadget ] keep
     [ f bevel-border swap init-checkbox-bevel ] keep
+    [ >r <label> r> add-gadget ] keep
     dup [ toggle-checkbox ] button-actions
     dup update-checkbox ;
diff --git a/library/ui/dialogs.factor b/library/ui/dialogs.factor
new file mode 100644
index 0000000000..2a2bfb2f14
--- /dev/null
+++ b/library/ui/dialogs.factor
@@ -0,0 +1,38 @@
+IN: gadgets
+USING: kernel namespaces threads ;
+
+TUPLE: dialog continuation delegate ;
+
+: dialog-ok ( dialog -- )
+    dup unparent t swap dialog-continuation call ;
+
+: dialog-cancel ( dialog -- )
+    dup unparent f swap dialog-continuation call ;
+
+: <dialog-buttons> ( -- gadget )
+    <default-shelf>
+    "OK" [ [ dialog-ok ] swap handle-gesture drop ]
+    <button> over add-gadget
+    "Cancel" [ [ dialog-cancel ] swap handle-gesture drop ]
+    <button> over add-gadget ;
+
+C: dialog ( content continuation -- gadget )
+    [ set-dialog-continuation ] keep
+    <default-pile> over set-dialog-delegate
+    [ add-gadget ] keep
+    [ >r <dialog-buttons> r> add-gadget ] keep
+    ( bevel-border )
+    dup moving-actions
+    dup [ dialog-ok ] dup set-action
+    dup [ dialog-cancel ] dup set-action ;
+
+: <prompt> ( prompt -- gadget )
+    0 default-gap <pile>
+    [ >r <label> r> add-gadget ] keep
+    [ >r "" <field> r> add-gadget ] keep ;
+
+: <input-dialog> ( prompt continuation -- gadget )
+    >r <prompt> r> <dialog> ;
+
+: input-dialog ( prompt -- input )
+    [ <input-dialog> world get add-gadget (yield) ] callcc1 ;
diff --git a/library/ui/fields.factor b/library/ui/fields.factor
index 4843891ab6..70e18baaca 100644
--- a/library/ui/fields.factor
+++ b/library/ui/fields.factor
@@ -85,7 +85,7 @@ TUPLE: field active? editor delegate ;
     bevel-border dup f bevel-up? set-paint-property ;
 
 M: field user-input* ( ch field -- ? )
-    field-editor [ insert-char ] with-editor f ;
+    field-editor [ insert-char ] with-editor t ;
 
 : field-gestures ( -- hash )
     {{
diff --git a/library/ui/gadgets.factor b/library/ui/gadgets.factor
index 13a2093ece..71e93aad96 100644
--- a/library/ui/gadgets.factor
+++ b/library/ui/gadgets.factor
@@ -44,7 +44,9 @@ C: gadget ( shape -- gadget )
     f swap set-gadget-parent ;
 
 : (add-gadget) ( gadget box -- )
-    [ gadget-children cons ] keep set-gadget-children ;
+    #! This is inefficient.
+    [ gadget-children swap unit append ] keep
+    set-gadget-children ;
 
 : unparent ( gadget -- )
     dup gadget-parent dup [ remove-gadget ] [ 2drop ] ifte ;
@@ -78,15 +80,17 @@ C: gadget ( shape -- gadget )
     ] ifte ; inline
 
 : each-parent ( gadget quot -- ? )
+    #! Keep executing the quotation on higher and higher
+    #! parents until it returns f.
     >r parent-list r> (each-parent) ; inline
 
-: relative-pos ( g1 g2 -- g2-p1 )
-    shape-pos swap screen-pos - ;
-
 : screen-pos ( gadget -- point )
     #! The position of the gadget on the screen.
     0 swap [ shape-pos + t ] each-parent drop ;
 
+: relative-pos ( g1 g2 -- g2-p1 )
+    shape-pos swap screen-pos - ;
+
 : child? ( parent child -- ? )
     dup [
         2dup eq? [ 2drop t ] [ gadget-parent child? ] ifte
diff --git a/library/ui/gestures.factor b/library/ui/gestures.factor
index cc243221f1..a126c17a3f 100644
--- a/library/ui/gestures.factor
+++ b/library/ui/gestures.factor
@@ -24,7 +24,7 @@ USING: alien generic hashtables kernel lists math sdl-event ;
     [ dupd handle-gesture* ] each-parent nip ;
 
 GENERIC: user-input* ( ch gadget -- ? )
-M: gadget user-input* 2drop f ;
+M: gadget user-input* 2drop t ;
 
 : user-input ( ch gadget -- ? )
     [ dupd user-input* ] each-parent nip ;
diff --git a/library/ui/halo.factor b/library/ui/halo.factor
new file mode 100644
index 0000000000..0b5b8353e9
--- /dev/null
+++ b/library/ui/halo.factor
@@ -0,0 +1,18 @@
+! Copyright (C) 2005 Slava Pestov.
+! See http://factor.sf.net/license.txt for BSD license.
+IN: gadgets
+USING: kernel math namespaces ;
+
+: grab ( gadget hand -- )
+    [ swap screen-pos swap screen-pos - >rect ] 2keep
+    >r [ move-gadget ] keep r> add-gadget ;
+
+: release ( gadget world -- )
+    >r dup screen-pos >r dup unparent
+    r> >rect pick move-gadget
+    r> add-gadget ;
+
+: moving-actions ( gadget -- )
+    dup
+    [ my-hand grab ] [ button-down 1 ] set-action
+    [ world get release ] [ button-up 1 ] set-action ;
diff --git a/library/ui/world.factor b/library/ui/world.factor
index 2fb96cfda9..f6808947c3 100644
--- a/library/ui/world.factor
+++ b/library/ui/world.factor
@@ -2,7 +2,7 @@
 ! See http://factor.sf.net/license.txt for BSD license.
 IN: gadgets
 USING: alien generic kernel lists math namespaces sdl sdl-event
-sdl-video ;
+sdl-video threads ;
 
 ! The world gadget is the top level gadget that all (visible)
 ! gadgets are contained in. The current world is stored in the
@@ -52,14 +52,16 @@ DEFER: handle-event
         world get world-step [ SDL_WaitEvent ] [ drop f ] ifte
     ] ifte ;
 
-: run-world ( -- )
+: run-world ( event -- )
     world get world-step [
-        <event> dup eat-events [
-            handle-event run-world
+        dup eat-events [
+            [ handle-event ] in-thread run-world
         ] [
             drop
         ] ifte
-    ] when ;
+    ] [
+        drop
+    ] ifte ;
 
 : start-world ( -- )
     #! Start the Factor graphics subsystem with the given screen
@@ -69,7 +71,7 @@ DEFER: handle-event
     [
         0 x set
         0 y set
-        [ run-world ] with-screen
+        [ <event> run-world ] with-screen
     ] with-scope ;
 
 global [