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

diff --git a/hacks/config/munch.xml b/hacks/config/munch.xml
index 8ca089f9..0a21a552 100644
--- a/hacks/config/munch.xml
+++ b/hacks/config/munch.xml
@@ -4,23 +4,39 @@
 
   <command arg="-root"/>
 
-  <number id="speed" type="slider" arg="-delay %"
-          _label="Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="20000" default="5000"
-          convert="invert"/>
-
-  <number id="duration" type="slider" arg="-clear %"
-          _label="Duration" _low-label="Short" _high-label="Long"
-          low="1" high="200" default="50"/>
-
-  <select id="mode">
-    <option id="xor"   _label="XOR"/>
-    <option id="solid" _label="Solid" arg-set="-no-xor"/>
-  </select>
-
-  <!-- #### -no-shift -->
-  <!-- #### -hold [100000] -->
-  <!-- #### -logminwidth [7] -->
+  <hgroup>
+   <vgroup>
+    <number id="delay" type="slider" arg="-delay %"
+            _label="Frame rate" _low-label="Low" _high-label="High"
+            low="0" high="100000" default="10000"
+            convert="invert"/>
+
+    <number id="duration" type="slider" arg="-clear %"
+            _label="Duration" _low-label="Short" _high-label="Long"
+            low="1" high="200" default="65"/>
+
+    <number id="simultaneous" type="slider" arg="-simul %"
+            _label="Simultaneous squares" _low-label="One" _high-label="Many"
+            low="1" high="20" default="5"/>
+   </vgroup>
+   <vgroup>
+    <select id="mismunch">
+      <option id="random"   _label="Munch or mismunch"/>
+      <option id="munch"    _label="Munch only"    arg-set="-classic"/>
+      <option id="mismunch" _label="Mismunch only" arg-set="-mismunch"/>
+    </select>
+
+    <select id="mode">
+      <option id="xor"   _label="XOR"/>
+      <option id="solid" _label="Solid" arg-set="-no-xor"/>
+    </select>
+
+    <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+
+    <xscreensaver-updater />
+
+   </vgroup>
+  </hgroup>
 
   <_description>
         DATAI 2
@@ -29,9 +45,17 @@
         XOR 1,2
         JRST .-4
 
-As reported by HAKMEM, in 1962, Jackson Wright wrote the above PDP-1
-code. That code still lives on in this screenhack, some 35 years
-later.  The number of lines of enclosing code has increased
-substantially, however.  This version is by Tim Showalter.
+As reported by HAKMEM (MIT AI Memo 239, 1972), Jackson Wright wrote
+the above PDP-1 code in 1962. That code still lives on here, some 46
+years later.
+
+In "mismunch" mode, it displays a creatively broken misimplementation
+of the classic munching squares algorithm instead.
+
+http://en.wikipedia.org/wiki/HAKMEM
+http://en.wikipedia.org/wiki/Munching_square
+
+Written by Jackson Wright, Tim Showalter, Jamie Zawinski and
+Steven Hazel; 1997.
   </_description>
 </screensaver>