X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fconfig%2Fxmatrix.xml;h=2a2c72522281f58600bfaf4f68de8a024a38ab27;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=de4f2ac90d904eb2fe6fc0eea2b6983493f685da;hpb=9c9d475ff889ed8be02e8ce8c17da28b93278fca;p=xscreensaver

diff --git a/hacks/config/xmatrix.xml b/hacks/config/xmatrix.xml
index de4f2ac9..2a2c7252 100644
--- a/hacks/config/xmatrix.xml
+++ b/hacks/config/xmatrix.xml
@@ -1,50 +1,66 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="xmatrix" _label="Xmatrix">
+<screensaver name="xmatrix" _label="XMatrix">
 
   <command arg="-root"/>
 
-  <select id="size">
-    <option id="font1" _label="Small Font"  arg-set="-small"/>
-    <option id="font2" _label="Large Font"/>
-  </select>
-
-  <select id="mode">
-    <option id="matrix" _label="Matrix Encoding"/>
-    <option id="binary" _label="Binary Encoding"      arg-set="-binary"/>
-    <option id="hex"    _label="Hexadecimal Encoding" arg-set="-hexadecimal"/>
-    <option id="dna"    _label="Genetic Encoding"     arg-set="-dna"/>
-  </select>
-
-  <select id="fill">
-    <option id="both"   _label="Synergistic Algorithm"/>
-    <option id="top"    _label="Slider Algorithm"    arg-set="-top"/>
-    <option id="bottom" _label="Expansion Algorithm" arg-set="-bottom"/>
-  </select>
-
-  <number id="delay" type="slider" arg="-delay %"
-          _label="Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="20000" default="10000"
-          convert="invert"/>
-
-  <number id="density" type="slider" arg="-density %"
-          _label="Density" _low-label="Sparse" _high-label="Full"
-          low="1" high="100" default="75"/>
+  <hgroup>
+   <select id="size">
+     <option id="font1" _label="Small font"  arg-set="-small"/>
+     <option id="font2" _label="Large font"/>
+   </select>
+
+   <select id="mode">
+     <option id="matrix" _label="Matrix encoding"/>
+     <option id="binary" _label="Binary encoding"      arg-set="-mode binary"/>
+     <option id="hex"    _label="Hexadecimal encoding" arg-set="-mode hex"/>
+     <option id="dna"    _label="Genetic encoding"     arg-set="-mode dna"/>
+     <option id="pipe"   _label="Piped ASCII text"     arg-set="-mode pipe"/>
+   </select>
+
+   <select id="fill">
+     <option id="both"   _label="Synergistic algorithm"/>
+     <option id="top"    _label="Slider algorithm"    arg-set="-insert top"/>
+     <option id="bottom" _label="Expansion algorithm" arg-set="-insert bottom"/>
+   </select>
+  </hgroup>
 
   <hgroup>
-   <boolean id="trace" _label="Run Trace Program" arg-set="-trace"/>
-   <boolean id="knock" _label="Knock Knock" arg-set="-knock-knock"/>
+   <boolean id="trace" _label="Run trace program" arg-unset="-no-trace"/>
+   <boolean id="knock" _label="Knock knock"       arg-unset="-no-knock-knock"/>
+   <string id="phone" _label="Phone number" arg="-phone %"/>
   </hgroup>
 
-  <string id="phone" _label="Phone Number" arg="-phone %"/>
+  <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="density" type="slider" arg="-density %"
+            _label="Density" _low-label="Sparse" _high-label="Full"
+            low="1" high="100" default="75"/>
+
+    <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+
+    <xscreensaver-updater />
+
+   </vgroup>
+   <vgroup>
+    <xscreensaver-text />
+   </vgroup>
+  </hgroup>
 
   <_description>
-Draws dropping characters similar to what is seen on the computer 
-monitors in "The Matrix".
+The "digital rain" effect, as seen on the computer monitors in
+"The Matrix".
+
+See also "GLMatrix" for a 3D rendering of the similar effect that
+appeared in the movie's title sequence.
 
-See also "glmatrix" for a 3D rendering of the similar effect that
-appeared in the title sequence of the movie.
+http://en.wikipedia.org/wiki/Matrix_digital_rain
 
-Written by Jamie Zawinski.
+Written by Jamie Zawinski; 1999.
   </_description>
 </screensaver>