X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fconfig%2Fant.xml;h=88a9ff7feb383718027bbe8aea8e89cdd47f754b;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hp=2266d8584a9305e712567fb7ec1aecc74b49b7c2;hpb=4cecfc89e5e889c7232693897c06168fb378bd5c;p=xscreensaver

diff --git a/hacks/config/ant.xml b/hacks/config/ant.xml
index 2266d858..88a9ff7f 100644
--- a/hacks/config/ant.xml
+++ b/hacks/config/ant.xml
@@ -4,49 +4,69 @@
 
   <command arg="-root"/>
 
-  <boolean id="sharpturn" _label="Sharp Turns" arg-set="-sharpturn"/>
+  <hgroup>
+   <vgroup>
+    <number id="delay" type="slider" arg="-delay %"
+            _label="Frame rate" _low-label="Low" _high-label="High"
+            low="0" high="100000" default="20000"
+            convert="invert"/>
 
-  <boolean id="truchet" _label="Truchet Lines" arg-set="-truchet"/>
+    <number id="cycles" type="slider" arg="-cycles %"
+             _label="Timeout" _low-label="Small" _high-label="Large"
+            low="0" high="800000" default="40000"/>
 
-  <boolean id="eyes" _label="Draw Eyes" arg-set="-eyes"/>
+    <hgroup>
+     <boolean id="sharpturn" _label="Sharp turns" arg-set="-sharpturn"/>
+     <boolean id="truchet" _label="Truchet lines" arg-set="-truchet"/>
+     <boolean id="eyes" _label="Draw eyes" arg-set="-eyes"/>
+    </hgroup>
+   </vgroup>
 
-  <number id="speed" type="slider" arg="-delay %"
-          _label="Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="80000" default="1000"
-          convert="invert"/>
+   <vgroup>
+    <number id="ncolors" type="slider" arg="-ncolors %"
+              _label="Number of colors" _low-label="Three" _high-label="Many"
+              low="3" high="255" default="64"/>
 
-  <number id="cycles" type="slider" arg="-cycles %"
-           _label="Timeout" _low-label="Small" _high-label="Large"
-          low="0" high="800000" default="40000"/>
 
-  <number id="count" type="spinbutton" arg="-count %"
-          _label="Ants Count" low="-20" high="20" default="-3"/>
+    <hgroup>
+     <number id="count" type="spinbutton" arg="-count %"
+             _label="Ants count" low="-20" high="20" default="-3"/>
+     <number id="size" type="spinbutton" arg="-size %"
+              _label="Ant size" low="-18" high="18" default="-12"/>
+    </hgroup>
 
-  <number id="size" type="spinbutton" arg="-size %"
-           _label="Ant Size" low="-18" high="18" default="-12"/>
+    <select id="neighbors">
+      <option id="rand" _label="Random cell shape"/>
+      <option id="three" _label="Three sided cells"
+              arg-set="-neighbors 3"/>
+      <option id="four" _label="Four sided cells"
+              arg-set="-neighbors 4"/>
+      <option id="six" _label="Six sided cells"
+              arg-set="-neighbors 6"/>
+      <option id="nine" _label="Nine sided cells"
+              arg-set="-neighbors 9"/>
+      <option id="twelve" _label="Twelve sided cells"
+              arg-set="-neighbors 12"/>
+    </select>
 
-  <select id="neighbors">
-    <option id="rand" _label="Random Cell Shape"/>
-    <option id="three" _label="Three Sided Cells" 
-            arg-set="-neighbors 3"/>
-    <option id="four" _label="Four Sided Cells"
-            arg-set="-neighbors 4"/>
-    <option id="six" _label="Six Sided Cells" enable="sharpturn"
-            arg-set="-neighbors 6"/>
-    <option id="nine" _label="Nine Sided Cells"
-            arg-set="-neighbors 9"/>
-    <option id="twelve" _label="Twelve Sided Cells" enable="sharpturn"
-            arg-set="-neighbors 12"/>
-  </select>
+    <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+   </vgroup>
+  </hgroup>
 
-  <number id="ncolors" type="slider" arg="-ncolors %"
-            _label="Number of Colors" _low-label="Two" _high-label="Many"
-            low="2" high="255" default="64"/>
+  <xscreensaver-updater />
 
   <_description>
+This screen saver was removed from the XScreenSaver distribution as of
+version 4.22.
+
 A cellular automaton that is really a two-dimensional Turing machine:
-as the heads (``ants'') walk along the screen, they change pixel
+as the heads ("ants") walk along the screen, they change pixel
 values in their path.  Then, as they pass over changed pixels, their
-behavior is influenced.  Written by David Bagley.
+behavior is influenced.
+
+http://en.wikipedia.org/wiki/Langton%27s_ant
+http://en.wikipedia.org/wiki/Turing_machine
+
+Written by David Bagley; 1997.
   </_description>
 </screensaver>