X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fconfig%2Flavalite.xml;h=9dc82edd52c7edb027d2283db82ad00e7152b7ae;hp=b2ee458a762587b3f072ed9313feef02ff1c5366;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439

diff --git a/hacks/config/lavalite.xml b/hacks/config/lavalite.xml
index b2ee458a..9dc82edd 100644
--- a/hacks/config/lavalite.xml
+++ b/hacks/config/lavalite.xml
@@ -1,25 +1,47 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="lavalite" _label="LavaLite">
+<screensaver name="lavalite" _label="Lavalite" gl="yes">
 
   <command arg="-root"/>
 
-  <number id="delay" type="slider" arg="-delay %"
-          _label="Speed" _low-label="Slow" _high-label="Fast"
-          low="0" high="50000" default="30000"
-          convert="invert"/>
+  <hgroup>
+   <vgroup>
+    <number id="delay" type="slider" arg="-delay %"
+            _label="Frame rate" _low-label="Low" _high-label="High"
+            low="0" high="100000" default="30000"
+            convert="invert"/>
 
-  <number id="speed" type="slider" arg="-speed %"
-          _label="Activity" _low-label="Sparse" _high-label="Dense"
-          low="0.001" high="0.01" default="0.003"/>
+    <number id="speed" type="slider" arg="-speed %"
+            _label="Activity" _low-label="Sparse" _high-label="Dense"
+            low="0.001" high="0.01" default="0.003"/>
+   </vgroup>
+   <vgroup>
+    <number id="count" type="slider" arg="-count %"
+            _label="Max blobs" _low-label="1" _high-label="10"
+            low="1" high="10" default="3"/>
 
-  <number id="count" type="slider" arg="-count %"
-          _label="Max Blobs" _low-label="1" _high-label="10"
-          low="1" high="10" default="3"/>
+    <number id="resolution" type="slider" arg="-resolution %"
+            _label="Resolution" _low-label="Low" _high-label="High"
+            low="10" high="120" default="40"/>
+   </vgroup>
+  </hgroup>
 
-  <number id="resolution" type="slider" arg="-resolution %"
-          _label="Resolution" _low-label="Low" _high-label="High"
-          low="10" high="120" default="40"/>
+  <hgroup>
+   <vgroup>
+
+ <hgroup>
+  <boolean id="impatient" _label="Impatient"   arg-set="-impatient"/>
+  <boolean id="smooth"    _label="Smooth"      arg-unset="-no-smooth"/>
+  <boolean id="wander"    _label="Wander" arg-set="-wander"/>
+ </hgroup>
+
+ <hgroup>
+  <boolean id="wire"      _label="Wireframe"   arg-set="-wireframe"/>
+  <boolean id="showfps"   _label="Show frame rate" arg-set="-fps"/>
+ </hgroup>
+
+   </vgroup>
+   <vgroup>
 
   <select id="style">
     <option id="classic" _label="Classic Lavalite" arg-set="-style classic"/>
@@ -31,30 +53,24 @@
 
   <select id="rotation">
     <option id="no"  _label="Don't Rotate"                 arg-set="-spin 0"/>
-    <option id="x"   _label="Rotate around X axis"/>
+    <option id="x"   _label="Rotate around X axis"         arg-set="-spin X"/>
     <option id="y"   _label="Rotate around Y axis"         arg-set="-spin Y"/>
-    <option id="z"   _label="Rotate around Z axis"         arg-set="-spin Z"/>
+    <option id="z"   _label="Rotate around Z axis"/>
     <option id="xy"  _label="Rotate around X and Y axes"   arg-set="-spin XY"/>
     <option id="xz"  _label="Rotate around X and Z axes"   arg-set="-spin XZ"/>
     <option id="yz"  _label="Rotate around Y and Z axes"   arg-set="-spin YZ"/>
     <option id="xyz" _label="Rotate around all three axes" arg-set="-spin XYZ"/>
   </select>
 
- <hgroup>
-  <boolean id="impatient" _label="Impatient"   arg-set="-impatient"/>
-  <boolean id="smooth"    _label="Smooth"      arg-unset="-no-smooth"/>
-  <boolean id="wander" _label="Wander" arg-set="-wander"/>
- </hgroup>
+   </vgroup>
+  </hgroup>
 
- <hgroup>
-  <boolean id="wire"      _label="Wireframe"   arg-set="-wireframe"/>
-  <boolean id="showfps" _label="Show Frames-per-Second" arg-set="-fps"/>
- </hgroup>
+  <xscreensaver-updater />
 
   <_description>
-Draws a 3D Simulation a Lava Lite(r): odd-shaped blobs of a mysterious
+Draws a 3D Simulation a Lava Lite(r).  Odd-shaped blobs of a mysterious
 substance are heated, slowly rise to the top of the bottle, and then
-drop back down as they cool.  This program requires a fairly fast
+drop back down as they cool.  This simulation requires a fairly fast
 machine (both CPU and 3D performance.)
 
 "LAVA LITE(r) and the configuration of the LAVA(r) brand motion lamp are
@@ -63,6 +79,10 @@ of the globe and base of the motion lamp are registered trademarks of
 Haggerty Enterprises, Inc. in the U.S.A. and in other countries around
 the world."
 
+http://en.wikipedia.org/wiki/Lava_lamp
+http://en.wikipedia.org/wiki/Metaballs
+http://en.wikipedia.org/wiki/Lavarand
+
 Written by Jamie Zawinski; 2002.
   </_description>
 </screensaver>