pry off some ui app boilerplate with a MAIN-WINDOW: syntax

diff --git a/basis/ui/gadgets/worlds/worlds.factor b/basis/ui/gadgets/worlds/worlds.factor
index 83783102538bba16ad7c7750df8dd26fe577fde2..8a22107f3a0d187bad87e78b24c42238dc334dcb 100644 (file)
--- a/basis/ui/gadgets/worlds/worlds.factor
+++ b/basis/ui/gadgets/worlds/worlds.factor
@@ -133,7 +133,7 @@ M: world request-focus-on ( child gadget -- )
         [ window-controls>> >>window-controls ]
         [ initial-background-color >>background-color ]
         [ grab-input?>> >>grab-input? ]
-        [ gadgets>> [ 1 track-add ] each ]
+        [ gadgets>> dup sequence? [ [ 1 track-add ] each ] [ 1 track-add ] if ]
         [ pref-dim>> >>pref-dim ]
     } cleave ;
 

diff --git a/basis/ui/ui.factor b/basis/ui/ui.factor
index 8260608cd4cb40ccb492cc1bd464ce5010264945..1bf7617bc975d02c8fa535278ea702a69010a54a 100644 (file)
--- a/basis/ui/ui.factor
+++ b/basis/ui/ui.factor
@@ -5,7 +5,7 @@ deques sequences threads words continuations init
 combinators combinators.short-circuit hashtables concurrency.flags
 sets accessors calendar fry destructors ui.gadgets ui.gadgets.private
 ui.gadgets.worlds ui.gadgets.tracks ui.gestures ui.backend ui.render
-strings ;
+strings classes.tuple classes.tuple.parser lexer vocabs.parser parser ;
 IN: ui
 
 <PRIVATE
@@ -242,3 +242,15 @@ M: object close-window
     ui-running? [ call( -- ) ] [ '[ init-ui @ ] (with-ui) ] if ;
 
 HOOK: beep ui-backend ( -- )
+
+: parse-main-window ( class -- attributes quot )
+    "{" expect dup all-slots parse-tuple-literal-slots
+    parse-definition ;
+
+: define-main-window ( word attributes quot -- )
+    [
+        '[ [ f _ @ open-window ] with-ui ] (( -- )) define-declared
+    ] [ 2drop current-vocab (>>main) ] 3bi ;
+
+SYNTAX: MAIN-WINDOW:
+    CREATE world-attributes parse-main-window define-main-window ;

diff --git a/extra/bunny/bunny.factor b/extra/bunny/bunny.factor
index b7400c4acb53e054c7497d95dd2d451b8cc41848..97a90af342bd10ba3e46a67327e8c0973bfe09da 100644 (file)
--- a/extra/bunny/bunny.factor
+++ b/extra/bunny/bunny.factor
@@ -44,24 +44,18 @@ M: bunny-world draw-world*
         [ geom>> ] [ get-draw ] bi draw-bunny
     ] if ;
 
-M: bunny-world pref-dim* ( gadget -- dim )
-    drop { 640 480 } ;
-    
 bunny-world H{
     { T{ key-down f f "TAB" } [ next-draw ] }
 } set-gestures
 
-: bunny-window ( -- )
-    [
-        f T{ world-attributes
-            { world-class bunny-world }
-            { title "Bunny" }
-            { pixel-format-attributes {
-                windowed
-                double-buffered
-                T{ depth-bits { value 16 } }
-            } }
-        } open-window
-    ] with-ui ;
-
-MAIN: bunny-window
+MAIN-WINDOW: bunny-window
+    {
+        { world-class bunny-world }
+        { title "Bunny" }
+        { pixel-format-attributes {
+            windowed
+            double-buffered
+            T{ depth-bits { value 16 } }
+        } }
+        { pref-dim { 640 480 } }
+    } ;

diff --git a/extra/color-picker/color-picker.factor b/extra/color-picker/color-picker.factor
index 56a60d6fc8b9ddd1e748ff5f3caf1c974e05757f..a76f07c0fea453d77b8de25d4545519674e51453 100644 (file)
--- a/extra/color-picker/color-picker.factor
+++ b/extra/color-picker/color-picker.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math math.functions math.parser models
+USING: arrays kernel math math.functions math.parser models
 models.arrow models.range models.product sequences ui
 ui.gadgets ui.gadgets.tracks ui.gadgets.labels ui.gadgets.packs
 ui.gadgets.sliders ui.pens.solid ui.render math.rectangles accessors
@@ -45,7 +45,5 @@ M: color-preview model-changed
             ] bi
         ] bi* ;
 
-: color-picker-window ( -- )
-    [ <color-picker> "Color Picker" open-window ] with-ui ;
-
-MAIN: color-picker-window
+MAIN-WINDOW: color-picker-window { { title "Color Picker" } }
+    <color-picker> >>gadgets ;

diff --git a/extra/color-table/color-table.factor b/extra/color-table/color-table.factor
index 0865dabcf7f17a69ae91fc6aa209102ef25e7654..a154ff82d0902e3392834e74f537d95f9858ca81 100644 (file)
--- a/extra/color-table/color-table.factor
+++ b/extra/color-table/color-table.factor
@@ -37,7 +37,5 @@ M: color-renderer row-value
         10 >>min-rows
         10 >>max-rows ;
 
-: color-table-demo ( -- )
-    [ <color-table> <scroller> "Colors" open-window ] with-ui ;
-
-MAIN: color-table-demo
+MAIN-WINDOW: color-table-demo { { title "Colors" } }
+    <color-table> <scroller> >>gadgets ;

diff --git a/extra/demos/demos.factor b/extra/demos/demos.factor
index dfd73f1236d84f758dd6589c03c75c1b95d1fe1e..9c60d8ad1a7eedcbd3d8e2f8520674b7ec8114e9 100644 (file)
--- a/extra/demos/demos.factor
+++ b/extra/demos/demos.factor
@@ -11,6 +11,5 @@ IN: demos
 : <demo-runner> ( -- gadget )
     <pile> 1 >>fill { 2 2 } >>gap demo-vocabs [ <run-vocab-button> add-gadget ] each ;
 
-: demos ( -- ) [ <demo-runner> { 2 2 } <border> <scroller> "Demos" open-window ] with-ui ;
-
-MAIN: demos
\ No newline at end of file
+MAIN-WINDOW: demos { { title "Demos" } }
+    <demo-runner> { 2 2 } <border> <scroller> >>gadgets ;

diff --git a/extra/hello-ui/hello-ui.factor b/extra/hello-ui/hello-ui.factor
index 3843eec091301d8b9b49f5cb73461d7248c8bfcf..9ed9457d5ad5ed1483e0e99dea81e12875fe17b0 100644 (file)
--- a/extra/hello-ui/hello-ui.factor
+++ b/extra/hello-ui/hello-ui.factor
@@ -1,7 +1,5 @@
-USING: ui ui.gadgets.labels ;
+USING: accessors ui ui.gadgets.labels ;
 IN: hello-ui
 
-: hello ( -- )
-    [ "Hello world" <label> "Hi" open-window ] with-ui ;
-
-MAIN: hello
+MAIN-WINDOW: hello { { title "Hi" } }
+    "Hello world" <label> >>gadgets ;

diff --git a/extra/hello-unicode/hello-unicode.factor b/extra/hello-unicode/hello-unicode.factor
index 4374db20031d427d2e216163d155b1ab74d3bf5c..f088fdd53b65b5ab791e1da249b4c95428310ee1 100644 (file)
--- a/extra/hello-unicode/hello-unicode.factor
+++ b/extra/hello-unicode/hello-unicode.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: ui.gadgets.panes ui.gadgets.borders ui io io.styles ;
+USING: accessors ui.gadgets.panes ui.gadgets.borders ui io io.styles ;
 IN: hello-unicode
 
 : <hello-gadget> ( -- gadget )
@@ -15,6 +15,5 @@ IN: hello-unicode
         ] with-style
     ] make-pane { 10 10 } <border> ;
 
-: hello-unicode ( -- ) [ <hello-gadget> "გამარჯობა" open-window ] with-ui ;
-
-MAIN: hello-unicode
\ No newline at end of file
+MAIN-WINDOW: hello-unicode { { title "გამარჯობა" } }
+    <hello-gadget> >>gadgets ;

diff --git a/extra/jamshred/jamshred.factor b/extra/jamshred/jamshred.factor
index ae981ae1b3fc5a021b729a2863a4b575c037a114..96e88cb6627cab288152cdfc15dd0d0df17df7f0 100644 (file)
--- a/extra/jamshred/jamshred.factor
+++ b/extra/jamshred/jamshred.factor
@@ -79,7 +79,5 @@ jamshred-gadget H{
     { mouse-scroll [ handle-mouse-scroll ] }
 } set-gestures
 
-: jamshred-window ( -- )
-    [ <jamshred> <jamshred-gadget> "Jamshred" open-window ] with-ui ;
-
-MAIN: jamshred-window
+MAIN-WINDOW: jamshred-window { { title "Jamshred" } }
+    <jamshred> <jamshred-gadget> >>gadgets ;

diff --git a/extra/lcd/lcd.factor b/extra/lcd/lcd.factor
index 56aa3373e5caee610e50705199b9de8805086a34..0056df046c8e223961c95cd73d601ba1b3fb19e1 100644 (file)
--- a/extra/lcd/lcd.factor
+++ b/extra/lcd/lcd.factor
@@ -24,7 +24,5 @@ IN: lcd
     "99:99:99" lcd >>string
     monospace-font >>font ;
 
-: time-window ( -- )
-    [ time get <time-display> "Time" open-window ] with-ui ;
-
-MAIN: time-window
+MAIN-WINDOW: time-window { { title "Time" } }
+    time get <time-display> >>gadgets ;

diff --git a/extra/maze/maze.factor b/extra/maze/maze.factor
index 4238dab16888c53e09277076ea8b869ff822ee49..5d0d55b64e0957595a19af469c94f98e934bc922 100644 (file)
--- a/extra/maze/maze.factor
+++ b/extra/maze/maze.factor
@@ -61,7 +61,7 @@ M: maze draw-gadget* [ n draw-maze ] draw-canvas ;
 
 M: maze pref-dim* drop { 400 400 } ;
 
-: maze-window ( -- )
-    [ <maze> "Maze" open-window ] with-ui ;
+MAIN-WINDOW: maze-window { { title "Maze" } }
+    <maze> >>gadgets ;
 
 MAIN: maze-window

diff --git a/extra/merger/merger.factor b/extra/merger/merger.factor
index ee9207e4caff4121d83fe92e08798862116cc801..a990dd30c42765d6d7acc9d146e2232b52951e6e 100644 (file)
--- a/extra/merger/merger.factor
+++ b/extra/merger/merger.factor
@@ -4,7 +4,11 @@ ui.gadgets ui.gadgets.buttons ui.gadgets.labeled
 ui.gadgets.tracks ui.gadgets.labels ui.gadgets.glass
 math.rectangles cocoa.dialogs ;
 IN: merger
-: main ( -- ) [
+
+MAIN-WINDOW: merger-window {
+        { title "Merging" }
+        { pref-dim { 300 220 } }
+    }
    vertical <track>
     { "From:" "To:" } f <model> f <model> 2array
     [
@@ -25,7 +29,5 @@ IN: merger
          ] with-directory
       ] keep hide-glass
     ] [ drop ] if ]
-    "merge" swap <border-button> 0.4 track-add { 300 220 } >>pref-dim "Merging" open-window
-] with-ui ;
-
-MAIN: main
\ No newline at end of file
+    "merge" swap <border-button> 0.4 track-add
+    >>gadgets ;

diff --git a/extra/nehe/2/2.factor b/extra/nehe/2/2.factor
index 1a77b501f0d561d31721da7d0af6557606901ba3..d28bbdb9043ca01563ef851b2d66f50b09c6f437 100644 (file)
--- a/extra/nehe/2/2.factor
+++ b/extra/nehe/2/2.factor
@@ -1,5 +1,5 @@
 USING: arrays kernel math opengl opengl.gl opengl.glu
-opengl.demo-support ui ui.gadgets ui.render ;
+opengl.demo-support ui ui.gadgets ui.render literals accessors ;
 IN: nehe.2
 
 TUPLE: nehe2-gadget < gadget ;
@@ -10,9 +10,6 @@ CONSTANT: height 256
 : <nehe2-gadget> (  -- gadget )
   nehe2-gadget new ;
 
-M: nehe2-gadget pref-dim* ( gadget -- dim )
-  drop width height 2array ;
-
 M: nehe2-gadget draw-gadget* ( gadget -- )
   drop
   GL_PROJECTION glMatrixMode
@@ -42,5 +39,5 @@ M: nehe2-gadget draw-gadget* ( gadget -- )
     -1.0 -1.0 0.0 glVertex3f
   ] do-state ;
 
-: run2 ( -- )
-  <nehe2-gadget> "NeHe Tutorial 2" open-window ;
+MAIN-WINDOW: run2 { { title "NeHe Tutorial 2" } { pref-dim { $ width $ height } } }
+  <nehe2-gadget> >>gadgets ;

diff --git a/extra/nehe/3/3.factor b/extra/nehe/3/3.factor
index 228107618b43146b31b7b0fa37842400eb9d427a..1a3181dfbac92f461270d864beca05c5bca3adc7 100644 (file)
--- a/extra/nehe/3/3.factor
+++ b/extra/nehe/3/3.factor
@@ -1,5 +1,5 @@
 USING: arrays kernel math opengl opengl.gl opengl.glu
-opengl.demo-support ui ui.gadgets ui.render ;
+opengl.demo-support ui ui.gadgets ui.render literals accessors ;
 IN: nehe.3
 
 TUPLE: nehe3-gadget < gadget ;
@@ -10,9 +10,6 @@ CONSTANT: height 256
 : <nehe3-gadget> (  -- gadget )
   nehe3-gadget new ;
 
-M: nehe3-gadget pref-dim* ( gadget -- dim )
-  drop width height 2array ;
-
 M: nehe3-gadget draw-gadget* ( gadget -- )
   drop
   GL_PROJECTION glMatrixMode
@@ -46,5 +43,5 @@ M: nehe3-gadget draw-gadget* ( gadget -- )
     -1.0 -1.0 0.0 glVertex3f
   ] do-state ;
 
-: run3 ( -- )
-  <nehe3-gadget> "NeHe Tutorial 3" open-window ;
+MAIN-WINDOW: run3 { { title "NeHe Tutorial 3" } { pref-dim { $ width $ height } } }
+  <nehe3-gadget> >>gadgets ;

diff --git a/extra/nehe/4/4.factor b/extra/nehe/4/4.factor
index 63d334510a604459c01a680f6457a38815b54631..0cddcfcaa3ca3b62f1753d5f91283ef4a4050a39 100644 (file)
--- a/extra/nehe/4/4.factor
+++ b/extra/nehe/4/4.factor
@@ -1,6 +1,6 @@
 USING: arrays kernel math opengl opengl.gl opengl.glu
 opengl.demo-support ui ui.gadgets ui.render threads accessors
-calendar ;
+calendar literals ;
 IN: nehe.4
 
 TUPLE: nehe4-gadget < gadget rtri rquad thread quit? ;
@@ -14,9 +14,6 @@ CONSTANT: height 256
     0.0 >>rtri
     0.0 >>rquad ;
 
-M: nehe4-gadget pref-dim* ( gadget -- dim )
-  drop width height 2array ;
-
 M: nehe4-gadget draw-gadget* ( gadget -- )
   GL_PROJECTION glMatrixMode
   glLoadIdentity
@@ -71,5 +68,5 @@ M: nehe4-gadget graft* ( gadget -- )
 M: nehe4-gadget ungraft* ( gadget -- )
   t >>quit? drop ;
 
-: run4 ( -- )
-  <nehe4-gadget> "NeHe Tutorial 4" open-window ;
+MAIN-WINDOW: run4 { { title "NeHe Tutorial 4" } { pref-dim { $ width $ height } } }
+  <nehe4-gadget> >>gadgets ;

diff --git a/extra/nehe/5/5.factor b/extra/nehe/5/5.factor
index 60662b9e0fc3b35d2147f646bdc520fb47620518..e6f5c6e6bac1beccafbb9c40df7e4b18f4aac5db 100644 (file)
--- a/extra/nehe/5/5.factor
+++ b/extra/nehe/5/5.factor
@@ -1,6 +1,6 @@
 USING: arrays kernel math opengl opengl.gl opengl.glu\r
 opengl.demo-support ui ui.gadgets ui.render threads accessors\r
-calendar ;\r
+calendar literals ;\r
 IN: nehe.5\r
 \r
 TUPLE: nehe5-gadget < gadget rtri rquad thread quit? ;\r
@@ -13,9 +13,6 @@ CONSTANT: height 256
     0.0 >>rtri\r
     0.0 >>rquad ;\r
 \r
-M: nehe5-gadget pref-dim* ( gadget -- dim )\r
-  drop width height 2array ;\r
-\r
 M: nehe5-gadget draw-gadget* ( gadget -- )\r
   GL_PROJECTION glMatrixMode\r
   glLoadIdentity\r
@@ -123,6 +120,5 @@ M: nehe5-gadget graft* ( gadget -- )
 M: nehe5-gadget ungraft* ( gadget -- )\r
   t >>quit? drop ;\r
 \r
-\r
-: run5 ( -- )\r
-  <nehe5-gadget> "NeHe Tutorial 5" open-window ;\r
+MAIN-WINDOW: run5 { { title "NeHe Tutorial 5" } { pref-dim { $ width $ height } } }\r
+  <nehe5-gadget> >>gadgets ;\r

diff --git a/extra/nehe/nehe.factor b/extra/nehe/nehe.factor
index 70ab0f0f5da66fa23a9f6839af8be4b40547b237..a4c2aedf23e41425b5448583d83e5c68f4e6cece 100644 (file)
--- a/extra/nehe/nehe.factor
+++ b/extra/nehe/nehe.factor
@@ -1,15 +1,13 @@
 USING: ui.gadgets.buttons ui.gadgets.packs ui.gadgets ui
-nehe.2 nehe.3 nehe.4 nehe.5 kernel ;
+nehe.2 nehe.3 nehe.4 nehe.5 kernel accessors ;
 IN: nehe
 
-: nehe-window ( -- )
-    [
-        <filled-pile>
-            "Nehe 2" [ drop run2 ] <border-button> add-gadget
-            "Nehe 3" [ drop run3 ] <border-button> add-gadget
-            "Nehe 4" [ drop run4 ] <border-button> add-gadget
-            "Nehe 5" [ drop run5 ] <border-button> add-gadget
-        "Nehe examples" open-window
-    ] with-ui ;
+MAIN-WINDOW: nehe-window { { title "Nehe Examples" } }
+    <filled-pile>
+        "Nehe 2" [ drop run2 ] <border-button> add-gadget
+        "Nehe 3" [ drop run3 ] <border-button> add-gadget
+        "Nehe 4" [ drop run4 ] <border-button> add-gadget
+        "Nehe 5" [ drop run5 ] <border-button> add-gadget
+        >>gadgets ;
 
 MAIN: nehe-window