From: Joe Groff <arcata@gmail.com>
Date: Sat, 16 Jan 2010 20:24:47 +0000 (-0800)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.97~5067
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=f7e1ed18b0a8821256e00e42625db760186ede03;hp=e4da6874134c2ec37d29b297d21c54027b99152b

Merge branch 'master' of git://factorcode.org/git/factor
---

diff --git a/basis/ui/gadgets/tracks/tracks.factor b/basis/ui/gadgets/tracks/tracks.factor
index 387f41a6a4..89389485b2 100644
--- a/basis/ui/gadgets/tracks/tracks.factor
+++ b/basis/ui/gadgets/tracks/tracks.factor
@@ -39,7 +39,8 @@ TUPLE: track < pack sizes ;
 M: track layout* ( track -- ) dup track-layout pack-layout ;
 
 : track-pref-dims-1 ( track -- dim )
-    children>> pref-dims max-dim ;
+    [ children>> pref-dims max-dim ]
+    [ pref-dim>> { 0 0 } or ] bi vmax ;
 
 : track-pref-dims-2 ( track -- dim )
     [
diff --git a/basis/ui/gadgets/worlds/worlds.factor b/basis/ui/gadgets/worlds/worlds.factor
index 8f38cee988..8a22107f3a 100644
--- a/basis/ui/gadgets/worlds/worlds.factor
+++ b/basis/ui/gadgets/worlds/worlds.factor
@@ -50,7 +50,8 @@ TUPLE: world-attributes
     status
     gadgets
     { pixel-format-attributes initial: $ default-world-pixel-format-attributes }
-    { window-controls initial: $ default-world-window-controls } ;
+    { window-controls initial: $ default-world-window-controls }
+    pref-dim ;
 
 : <world-attributes> ( -- world-attributes )
     world-attributes new ; inline
@@ -132,7 +133,8 @@ 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 ;
 
 : <world> ( world-attributes -- world )
diff --git a/basis/ui/ui-docs.factor b/basis/ui/ui-docs.factor
index 51ff4c2609..b55ea44c6b 100644
--- a/basis/ui/ui-docs.factor
+++ b/basis/ui/ui-docs.factor
@@ -2,7 +2,7 @@ USING: help.markup help.syntax strings quotations debugger
 namespaces ui.backend ui.gadgets ui.gadgets.worlds
 ui.gadgets.tracks ui.gadgets.packs ui.gadgets.grids
 ui.gadgets.private math.rectangles colors ui.text fonts
-kernel ui.private classes sequences ;
+kernel ui.private vocabs.loader classes sequences ;
 IN: ui
 
 HELP: windows
@@ -150,7 +150,9 @@ ARTICLE: "ui-windows" "Top-level windows"
 "When the gadget is removed from a parent shown in a top-level window, or when the top-level window is closed, a corresponding generic word is called to clean up:"
 { $subsections ungraft* }
 "The root of the gadget hierarchy in a window is a special gadget which is rarely operated on directly, but it is helpful to know it exists:"
-{ $subsections world } ;
+{ $subsections world }
+"There is also syntax for defining a main window as the entry point for a vocabulary:"
+{ $subsections POSTPONE: MAIN-WINDOW: } ;
 
 ARTICLE: "ui-backend" "Developing UI backends"
 "None of the words documented in this section should be called directly by user code. They are only of interest when developing new UI backends."
@@ -325,6 +327,20 @@ HELP: normal-title-bar
 HELP: textured-background
 { $description "Asks for a window to have a background that blends seamlessly with the window frame. Factor will leave the window background transparent and pass mouse button gestures not handled directly by a gadget through to the window system so that the window can be dragged from anywhere on its background." } ;
 
+HELP: MAIN-WINDOW:
+{ $syntax "MAIN-WINDOW: window-word { attributes }
+    attribute-code ;" }
+{ $description "Defines a " { $link POSTPONE: MAIN: } " word for the current vocabulary named " { $snippet "window-word" } " that opens a UI window when the vocabulary is " { $link run } ". The " { $snippet "attributes" } " specify the key-value pairs of the window's " { $link world-attributes } ". The " { $snippet "attribute-code" } " is run with the " { $snippet "world-attributes" } " on the stack; this allows the word to construct gadget objects to place in the " { $snippet "gadget" } " slot or set other runtime-dependent world attributes." }
+{ $examples
+"From the " { $vocab-link "hello-ui" } " vocabulary. Creates a window with the title \"Hi\" containing a label reading \"Hello world\":"
+{ $code
+"""USING: accessors ui ui.gadgets.labels ;
+IN: hello-ui
+
+MAIN-WINDOW: hello { { title "Hi" } }
+    "Hello world" <label> >>gadgets ;"""
+} } ;
+
 ARTICLE: "ui.gadgets.worlds-window-controls" "Window controls"
 "The following window controls can be placed in a " { $link world } " window:"
 { $subsections
diff --git a/basis/ui/ui.factor b/basis/ui/ui.factor
index 8260608cd4..e0fa560935 100644
--- 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,17 @@ M: object close-window
     ui-running? [ call( -- ) ] [ '[ init-ui @ ] (with-ui) ] if ;
 
 HOOK: beep ui-backend ( -- )
+
+: parse-main-window-attributes ( class -- attributes )
+    "{" expect dup all-slots parse-tuple-literal-slots ;
+
+: define-main-window ( word attributes quot -- )
+    [
+        '[ [ f _ clone @ open-window ] with-ui ] (( -- )) define-declared
+    ] [ 2drop current-vocab (>>main) ] 3bi ;
+
+SYNTAX: MAIN-WINDOW:
+    CREATE
+    world-attributes parse-main-window-attributes
+    parse-definition
+    define-main-window ;
diff --git a/extra/bunny/bunny.factor b/extra/bunny/bunny.factor
index b7400c4acb..bbb89f6bea 100644
--- a/extra/bunny/bunny.factor
+++ b/extra/bunny/bunny.factor
@@ -44,24 +44,17 @@ 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 56a60d6fc8..a76f07c0fe 100644
--- 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 0865dabcf7..a154ff82d0 100644
--- 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 dfd73f1236..9c60d8ad1a 100644
--- 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/game/loop/loop.factor b/extra/game/loop/loop.factor
index c0f36d0294..0862a5e48c 100644
--- a/extra/game/loop/loop.factor
+++ b/extra/game/loop/loop.factor
@@ -4,7 +4,7 @@ sequences ;
 IN: game.loop
 
 TUPLE: game-loop
-    { tick-length integer read-only }
+    { tick-interval-micros integer read-only }
     delegate
     { last-tick integer }
     thread 
@@ -24,7 +24,7 @@ SYMBOL: game-loop
     last-tick>> system-micros swap - ;
 
 : tick-slice ( loop -- slice )
-    [ since-last-tick ] [ tick-length>> ] bi /f 1.0 min ;
+    [ since-last-tick ] [ tick-interval-micros>> ] bi /f 1.0 min ;
 
 CONSTANT: MAX-FRAMES-TO-SKIP 5
 
@@ -49,12 +49,12 @@ TUPLE: game-loop-error game-loop error ;
 
 : increment-tick ( loop -- )
     [ 1 + ] change-tick-number
-    dup tick-length>> [ + ] curry change-last-tick
+    dup tick-interval-micros>> [ + ] curry change-last-tick
     drop ;
 
 : ?tick ( loop count -- )
     [ system-micros >>last-tick drop ] [
-        over [ since-last-tick ] [ tick-length>> ] bi >=
+        over [ since-last-tick ] [ tick-interval-micros>> ] bi >=
         [ [ drop increment-tick ] [ drop tick ] [ 1 - ?tick ] 2tri ]
         [ 2drop ] if
     ] if-zero ;
@@ -97,7 +97,7 @@ PRIVATE>
     f >>thread
     drop ;
 
-: <game-loop> ( tick-length delegate -- loop )
+: <game-loop> ( tick-interval-micros delegate -- loop )
     system-micros f f 0 0 system-micros 0 0
     game-loop boa ;
 
diff --git a/extra/game/worlds/worlds.factor b/extra/game/worlds/worlds.factor
index 308b5006cf..f614943f04 100644
--- a/extra/game/worlds/worlds.factor
+++ b/extra/game/worlds/worlds.factor
@@ -1,19 +1,20 @@
-USING: accessors game.input game.loop kernel math ui.gadgets
-ui.gadgets.worlds ui.gestures threads ;
+USING: accessors combinators fry game.input game.loop generic kernel math
+parser sequences ui ui.gadgets ui.gadgets.worlds ui.gestures threads
+words ;
 IN: game.worlds
 
 TUPLE: game-world < world
     game-loop
     { tick-slice float initial: 0.0 } ;
 
-GENERIC: tick-length ( world -- micros )
+GENERIC: tick-interval-micros ( world -- micros )
 
 M: game-world draw*
     swap >>tick-slice relayout-1 yield ;
 
 M: game-world begin-world
     open-game-input 
-    dup [ tick-length ] [ ] bi <game-loop> [ >>game-loop ] keep start-loop
+    dup [ tick-interval-micros ] [ ] bi <game-loop> [ >>game-loop ] keep start-loop
     drop ;
 
 M: game-world end-world
@@ -21,3 +22,29 @@ M: game-world end-world
     close-game-input
     drop ;
 
+TUPLE: game-attributes < world-attributes
+    { tick-interval-micros fixnum read-only } ;
+
+: verify-game-attributes ( attributes -- )
+    world-class>> { f world } member?
+    [ "GAME: must be given a custom world-class" throw ] when ;
+
+: define-game-tick-interval-micros ( attributes -- )
+    [ world-class>> \ tick-interval-micros create-method ]
+    [ tick-interval-micros>> '[ drop _ ] ] bi
+    define ;
+
+: define-game-methods ( attributes -- )
+    {
+        [ verify-game-attributes ]
+        [ define-game-tick-interval-micros ]
+    } cleave ;
+
+: define-game ( word attributes -- )
+    [ [ ] define-main-window ]
+    [ nip define-game-methods ] 2bi ;
+
+SYNTAX: GAME:
+    CREATE
+    game-attributes parse-main-window-attributes
+    define-game ;
diff --git a/extra/gpu/demos/bunny/bunny.factor b/extra/gpu/demos/bunny/bunny.factor
index 57fcf4e3ea..067e934453 100644
--- a/extra/gpu/demos/bunny/bunny.factor
+++ b/extra/gpu/demos/bunny/bunny.factor
@@ -7,7 +7,7 @@ io io.encodings.ascii io.files io.files.temp kernel locals math
 math.matrices math.vectors.simd math.parser math.vectors
 method-chains namespaces sequences splitting threads ui ui.gadgets
 ui.gadgets.worlds ui.pixel-formats specialized-arrays
-specialized-vectors ;
+specialized-vectors literals ;
 FROM: alien.c-types => float ;
 SPECIALIZED-ARRAY: float
 SPECIALIZED-VECTOR: uint
@@ -293,24 +293,19 @@ M: bunny-world draw-world*
 AFTER: bunny-world resize-world
     [ sobel>> framebuffer>> ] [ dim>> ] bi resize-framebuffer ;
 
-M: bunny-world pref-dim* drop { 1024 768 } ;
-M: bunny-world tick-length drop 1000000 60 /i ;
 M: bunny-world wasd-movement-speed drop 1/160. ;
 M: bunny-world wasd-near-plane drop 1/32. ;
 M: bunny-world wasd-far-plane drop 256.0 ;
 
-: bunny-window ( -- )
-    [
-        f T{ world-attributes
-            { world-class bunny-world }
-            { title "Bunny" }
-            { pixel-format-attributes {
-                windowed
-                double-buffered
-                T{ depth-bits { value 24 } }
-            } }
-            { grab-input? t }
-        } open-window
-    ] with-ui ;
-
-MAIN: bunny-window
+GAME: bunny-game {
+        { world-class bunny-world }
+        { title "Bunny" }
+        { pixel-format-attributes {
+            windowed
+            double-buffered
+            T{ depth-bits { value 24 } }
+        } }
+        { grab-input? t }
+        { pref-dim { 1024 768 } }
+        { tick-interval-micros $[ 1,000,000 60 /i ] }
+    }
diff --git a/extra/gpu/demos/raytrace/raytrace.factor b/extra/gpu/demos/raytrace/raytrace.factor
index bac55beacd..8883609bce 100644
--- a/extra/gpu/demos/raytrace/raytrace.factor
+++ b/extra/gpu/demos/raytrace/raytrace.factor
@@ -92,21 +92,16 @@ M: raytrace-world draw-world*
         { "vertex-array"   [ vertex-array>>              ] }
     } <render-set> render ;
 
-M: raytrace-world pref-dim* drop { 1024 768 } ;
-M: raytrace-world tick-length drop 1000000 60 /i ;
 M: raytrace-world wasd-movement-speed drop 1/4. ;
 
-: raytrace-window ( -- )
-    [
-        f T{ world-attributes
-            { world-class raytrace-world }
-            { title "Raytracing" }
-            { pixel-format-attributes {
-                windowed
-                double-buffered
-            } }
-            { grab-input? t }
-        } open-window
-    ] with-ui ;
-
-MAIN: raytrace-window
+GAME: raytrace-game {
+        { world-class raytrace-world }
+        { title "Raytracing" }
+        { pixel-format-attributes {
+            windowed
+            double-buffered
+        } }
+        { grab-input? t }
+        { pref-dim { 1024 768 } }
+        { tick-interval-micros $[ 1,000,000 60 /i ] }
+    }
diff --git a/extra/hello-ui/hello-ui.factor b/extra/hello-ui/hello-ui.factor
index 3843eec091..9ed9457d5a 100644
--- 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 4374db2003..f088fdd53b 100644
--- 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 ae981ae1b3..96e88cb662 100644
--- 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/key-caps/key-caps.factor b/extra/key-caps/key-caps.factor
index da901ed61e..585ca2d16f 100644
--- a/extra/key-caps/key-caps.factor
+++ b/extra/key-caps/key-caps.factor
@@ -173,9 +173,5 @@ M: key-caps-gadget ungraft*
 M: key-caps-gadget handle-gesture
     drop [ key-down? ] [ key-up? ] bi or not ;
 
-: key-caps ( -- )
-    [
-        <key-caps-gadget> { 5 5 } <border> "Key Caps" open-window
-    ] with-ui ;
-
-MAIN: key-caps
+MAIN-WINDOW: key-caps { { title "Key Caps" } }
+    <key-caps-gadget> { 5 5 } <border> >>gadgets ;
diff --git a/extra/lcd/lcd.factor b/extra/lcd/lcd.factor
index 56aa3373e5..0056df046c 100644
--- 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 4238dab168..5d0d55b64e 100644
--- 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 ee9207e4ca..a990dd30c4 100644
--- 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 1a77b501f0..d28bbdb904 100644
--- 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 228107618b..1a3181dfba 100644
--- 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 63d334510a..0cddcfcaa3 100644
--- 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 60662b9e0f..e6f5c6e6ba 100644
--- 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
 opengl.demo-support ui ui.gadgets ui.render threads accessors
-calendar ;
+calendar literals ;
 IN: nehe.5
 
 TUPLE: nehe5-gadget < gadget rtri rquad thread quit? ;
@@ -13,9 +13,6 @@ CONSTANT: height 256
     0.0 >>rtri
     0.0 >>rquad ;
 
-M: nehe5-gadget pref-dim* ( gadget -- dim )
-  drop width height 2array ;
-
 M: nehe5-gadget draw-gadget* ( gadget -- )
   GL_PROJECTION glMatrixMode
   glLoadIdentity
@@ -123,6 +120,5 @@ M: nehe5-gadget graft* ( gadget -- )
 M: nehe5-gadget ungraft* ( gadget -- )
   t >>quit? drop ;
 
-
-: run5 ( -- )
-  <nehe5-gadget> "NeHe Tutorial 5" open-window ;
+MAIN-WINDOW: run5 { { title "NeHe Tutorial 5" } { pref-dim { $ width $ height } } }
+  <nehe5-gadget> >>gadgets ;
diff --git a/extra/nehe/nehe.factor b/extra/nehe/nehe.factor
index 70ab0f0f5d..a4c2aedf23 100644
--- 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
diff --git a/extra/spheres/spheres.factor b/extra/spheres/spheres.factor
index b7431caef8..819dbe892e 100644
--- a/extra/spheres/spheres.factor
+++ b/extra/spheres/spheres.factor
@@ -196,9 +196,6 @@ M: spheres-world end-world
         [ plane-program>> [ delete-gl-program ] when* ]
     } cleave ;
 
-M: spheres-world pref-dim*
-    drop { 640 480 } ;
-
 :: (draw-sphere) ( program center radius -- )
     program "center" glGetAttribLocation center first3 glVertexAttrib3f
     program "radius" glGetAttribLocation radius glVertexAttrib1f
@@ -299,17 +296,13 @@ M: spheres-world draw-world*
         ]
     } cleave ;
 
-: spheres-window ( -- )
-    [
-        f T{ world-attributes
-            { world-class spheres-world }
-            { title "Spheres" }
-            { pixel-format-attributes {
-                windowed
-                double-buffered
-                T{ depth-bits { value 16 } }
-            } }
-        } open-window
-    ] with-ui ;
-
-MAIN: spheres-window
+MAIN-WINDOW: spheres-window {
+        { world-class spheres-world }
+        { title "Spheres" }
+        { pixel-format-attributes {
+            windowed
+            double-buffered
+            T{ depth-bits { value 16 } }
+        } }
+        { pref-dim { 640 480 } }
+    } ;
diff --git a/extra/terrain/terrain.factor b/extra/terrain/terrain.factor
index 89c7ccb8ba..adbeb9c441 100644
--- a/extra/terrain/terrain.factor
+++ b/extra/terrain/terrain.factor
@@ -55,9 +55,6 @@ TUPLE: terrain-world < game-world
         float-4{ 0.0 0.0 0.0 1.0 } >>velocity
         VELOCITY-MODIFIER-NORMAL >>velocity-modifier ;
 
-M: terrain-world tick-length
-    drop 1000000 60 /i ;
-
 : frustum ( dim -- -x x -y y near far )
     dup first2 min v/n
     NEAR-PLANE FOV / v*n first2 [ [ neg ] keep ] bi@
@@ -290,20 +287,15 @@ M: terrain-world draw-world*
         ] with-gl-program ]
     } cleave gl-error ;
 
-M: terrain-world pref-dim* drop { 1024 768 } ;
-
-: terrain-window ( -- )
-    [
-        f T{ world-attributes
-            { world-class terrain-world }
-            { title "Terrain" }
-            { pixel-format-attributes {
-                windowed
-                double-buffered
-                T{ depth-bits { value 24 } }
-            } }
-            { grab-input? t }
-        } open-window
-    ] with-ui ;
-
-MAIN: terrain-window
+GAME: terrain-game {
+        { world-class terrain-world }
+        { title "Terrain" }
+        { pixel-format-attributes {
+            windowed
+            double-buffered
+            T{ depth-bits { value 24 } }
+        } }
+        { grab-input? t }
+        { pref-dim { 1024 768 } }
+        { tick-interval-micros $[ 1,000,000 60 /i ] }
+    }
diff --git a/extra/ui/gadgets/worlds/null/null.factor b/extra/ui/gadgets/worlds/null/null.factor
index 0f116f0d51..eb0e1c1d5c 100644
--- a/extra/ui/gadgets/worlds/null/null.factor
+++ b/extra/ui/gadgets/worlds/null/null.factor
@@ -7,7 +7,6 @@ M: null-world begin-world drop ;
 M: null-world end-world drop ;
 M: null-world draw-world* drop ;
 M: null-world resize-world drop ;
-M: null-world pref-dim* drop { 512 512 } ;
 
 : null-window ( title -- world )
     <world-attributes>
@@ -19,6 +18,7 @@ M: null-world pref-dim* drop { 512 512 } ;
             backing-store
             T{ depth-bits f 24 }
         } >>pixel-format-attributes
+        { 512 512 } >>pref-dim
     f swap open-window* ;
 
 : into-window ( world quot -- world )