X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fconfig%2Fmaze.xml;h=faaabc0b6a9df243a2353cdaf895f2e212897224;hp=78705fe38e506717472090d66f9e25fdcf85ac15;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=8eb2873d7054e705c4e83f22d18c40946a9e2529

diff --git a/hacks/config/maze.xml b/hacks/config/maze.xml
index 78705fe3..faaabc0b 100644
--- a/hacks/config/maze.xml
+++ b/hacks/config/maze.xml
@@ -4,50 +4,66 @@
 
   <command arg="-root"/>
 
-  <number id="speed" type="slider" arg="-solve-delay %"
-          _label="Solve Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="10000" default="5000"
-          convert="invert"/>
-
-  <number id="pre-delay" type="slider" arg="-pre-delay %"
-          _label="Pre-Solve Delay"
-          _low-label="0 Seconds" _high-label="10 Seconds"
-          low="0" high="10000000" default="2000000"/>
-
-  <number id="post-delay" type="slider" arg="-post-delay %"
-          _label="Post-Solve Delay"
-          _low-label="0 Seconds" _high-label="10 Seconds"
-          low="0" high="10000000" default="4000000"/>
-
-  <number id="grid-size" type="spinbutton" arg="-grid-size %"
-          _label="Grid Size" low="0" high="100" default="0"/>
-
-  <select id="generator">
-    <option id="mrandom" _label="Random Generator"/>
-    <option id="m0"      _label="Backtracking Generator"
-                         arg-set="-generator 0"/>
-    <option id="m1"      _label="Seeding Generator"
-                         arg-set="-generator 1"/>
-    <option id="m2"      _label="Joining Generator"
-                         arg-set="-generator 2"/>
-  </select>
-
-  <select id="ignorance">
-    <option id="smart" _label="Head Toward Exit"/>
-    <option id="dumb"  _label="Ignorant of Exit Direction"
-            arg-set="-ignorant"/>
-  </select>
-
-  <!-- #### -max-length [5] -->
-  <!-- #### -bridge -->
-  <!-- #### -live-color [green] -->
-  <!-- #### -dead-color [red] -->
-  <!-- #### -skip-color [orange] -->
-  <!-- #### -surround-color [slateblue] -->
+  <hgroup>
+   <vgroup>
+    <number id="delay" type="slider" arg="-solve-delay %"
+            _label="Frame rate" _low-label="Low" _high-label="High"
+            low="0" high="100000" default="10000"
+            convert="invert"/>
+
+    <select id="generator">
+      <option id="mrandom" _label="Random maze generator"/>
+      <option id="m0"      _label="Depth-first backtracking maze generator"
+                           arg-set="-generator 0"/>
+      <option id="m1"      _label="Wall-building maze generator (Prim)"
+                           arg-set="-generator 1"/>
+      <option id="m2"      _label="Set-joining maze generator (Kruskal)"
+                           arg-set="-generator 2"/>
+    </select>
+
+    <hgroup>
+     <select id="ignorance">
+       <option id="smart" _label="Head toward exit"/>
+       <option id="dumb"  _label="Ignorant of exit direction"
+               arg-set="-ignorant"/>
+     </select>
+
+    </hgroup>
+
+    <hgroup>
+     <number id="grid-size" type="spinbutton" arg="-grid-size %"
+             _label="Grid size" low="0" high="100" default="0"/>
+     <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+    </hgroup>
+
+   </vgroup>
+
+   <vgroup>
+    <number id="pre-delay" type="slider" arg="-pre-delay %"
+            _label="Linger before solving"
+            _low-label="0 seconds" _high-label="10 seconds"
+            low="0" high="10000000" default="2000000"/>
+
+    <number id="post-delay" type="slider" arg="-post-delay %"
+            _label="Linger after solving"
+            _low-label="0 seconds" _high-label="10 seconds"
+            low="0" high="10000000" default="4000000"/>
+
+    <xscreensaver-updater />
+
+   </vgroup>
+  </hgroup>
+
 
   <_description>
-This is the ancient X maze demo, modified to work with xscreensaver.
-It generates a random maze, then solves it with visual feedback.
-Originally by Jim Randell; modified by a cast of thousands.
+This generates random mazes, with three different algorithms: Kruskal,
+Prim, and a depth-first recursive backtracker.  It also solves them.
+Backtracking and look-ahead paths are displayed in different colors.
+
+http://en.wikipedia.org/wiki/Maze_generation_algorithm
+http://en.wikipedia.org/wiki/Maze_solving_algorithm
+
+Written by Martin Weiss, Dave Lemke, Jim Randell, Jamie Zawinski,
+Johannes Keukelaar, and Zack Weinberg; 1985.
   </_description>
 </screensaver>