X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fconfig%2Fsonar.xml;h=10d798ea13c18b289701ce2210f484df63299bd1;hp=47a0f69eec8c6392a4451fb35d4a0d8ae655b066;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=2d04c4f22466851aedb6ed0f2919d148f726b889

diff --git a/hacks/config/sonar.xml b/hacks/config/sonar.xml
index 47a0f69e..10d798ea 100644
--- a/hacks/config/sonar.xml
+++ b/hacks/config/sonar.xml
@@ -1,45 +1,83 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<screensaver name="sonar" _label="Sonar">
+<screensaver name="sonar" _label="Sonar" gl="yes">
 
   <command arg="-root"/>
 
-  <select id="ping">
-   <option id="none" _label="Ping mode..."/>
-   <option id="24" _label="Ping subnet/24 (254 hosts)" arg-set="-ping subnet/24"/>
-   <option id="25" _label="Ping subnet/25 (126 hosts)" arg-set="-ping subnet/25"/>
-   <option id="26" _label="Ping subnet/26 (62 hosts)"  arg-set="-ping subnet/26"/>
-   <option id="27" _label="Ping subnet/27 (31 hosts)"  arg-set="-ping subnet/27"/>
-   <option id="28" _label="Ping subnet/28 (14 hosts)"  arg-set="-ping subnet/28"/>
-   <option id="29" _label="Ping subnet/29 (6 hosts)"   arg-set="-ping subnet/29"/>
-   <option id="30" _label="Ping subnet/30 (2 hosts)"   arg-set="-ping subnet/30"/>
-   <option id="ssh" _label="Ping known hosts"   arg-set="-ping /etc/hosts,$HOME/.ssh/known_hosts,$HOME/.ssh/known_hosts2"/>
-  </select>
+  <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="Speed" _low-label="Slow" _high-label="Fast"
+             low="0.1" high="8.0" default="1.0"/>
+
+    <select id="ping">
+     <option id="sn" _label="Ping local subnet"/>
+<!--
+     <option id="24" _label="Ping subnet/24 (254 hosts)" arg-set="-ping subnet/24"/>
+     <option id="25" _label="Ping subnet/25 (126 hosts)" arg-set="-ping subnet/25"/>
+     <option id="26" _label="Ping subnet/26 (62 hosts)"  arg-set="-ping subnet/26"/>
+     <option id="27" _label="Ping subnet/27 (31 hosts)"  arg-set="-ping subnet/27"/>
+     <option id="28" _label="Ping subnet/28 (14 hosts)"/>
+     <option id="29" _label="Ping subnet/29 (6 hosts)"   arg-set="-ping subnet/29"/>
+     <option id="30" _label="Ping subnet/30 (2 hosts)"   arg-set="-ping subnet/30"/>
+-->
+
+     <option id="ssh" _label="Ping known SSH hosts"      arg-set="-ping /etc/hosts,$HOME/.ssh/known_hosts,$HOME/.ssh/known_hosts2"/>
+
+     <option id="popular" _label="Ping Google, Facebook, etc." arg-set="-ping google.com,facebook.com,twitter.com,yahoo.com,flickr.com,www.apple.com,wikipedia.org,linux.org,youtube.com,disqus.com,blogger.com,wordpress.com,tumblr.com,whitehouse.gov"/>
+
+     <option id="sim" _label="Simulation (don't ping)"   arg-set="-ping simulation"/>
+    </select>
+   </vgroup>
+
+   <vgroup>
+    <number id="font" type="slider" arg="-font-size %"
+            _label="Font size" _low-label="Tiny" _high-label="Huge"
+            low="6.0" high="24.0" default="12"/>
+
+    <number id="sweep" type="slider" arg="-sweep-size %"
+            _label="Trail length" _low-label="Short" _high-label="Long"
+            low="0.02" high="0.7" default="0.3"/>
+   </vgroup>
+  </hgroup>
+
 
   <hgroup>
+   <string id="aname" _label="Simulation team A name" arg="-team-a-name %"/>
     <number id="acount" type="spinbutton" arg="-team-a-count %"
-            _label="Simulation Team Members"
-            low="1" high="100" default="4"/>
-    <number id="bcount" type="spinbutton" arg="-team-b-count %"
-            _label="vs."
-            low="1" high="100" default="4"/>
+            _label="A count" low="1" high="100" default="4"/>
   </hgroup>
 
-  <string id="aname" _label="Team A Name" arg="-team-a-name %"/>
-  <string id="bname" _label="Team B Name" arg="-team-b-name %"/>
+  <hgroup>
+   <string id="bname" _label="Simulation team B name" arg="-team-b-name %"/>
+   <number id="bcount" type="spinbutton" arg="-team-b-count %"
+           _label="B count" low="1" high="100" default="4"/>
+  </hgroup>
 
-  <boolean id="dns"   _label="Resolve Host Names" arg-unset="-no-dns"/>
-  <boolean id="times" _label="Show Ping Times"    arg-unset="-no-times"/>
+  <hgroup>
+   <boolean id="dns"     _label="Resolve host names" arg-unset="-no-dns"/>
+   <boolean id="times"   _label="Show ping times"    arg-unset="-no-times"/>
+   <boolean id="wobble"  _label="Tilt"               arg-unset="-no-wobble"/>
+   <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+  </hgroup>
 
-  <!-- #### -ping-timeout [3000] -->
-  <!-- #### -ttl [90] -->
+  <xscreensaver-updater />
 
   <_description>
-This program draws a simulation of a sonar screen.  By default,
-it displays a random assortment of ``bogies'' on the screen, but if
-installed as "setuid root", it can ping (pun intended) your local
-network, and actually plot the proximity of the other hosts on your
-network to you.  Written by Stephen Martin and Jamie Zawinski.
+This draws a sonar screen that pings (get it?) the hosts on
+your local network, and plots their distance (response time) from you.
+The three rings represent ping times of approximately 2.5, 70 and 2,000
+milliseconds respectively.
+
+Alternately, it can run a simulation that doesn't involve hosts.
+
+http://en.wikipedia.org/wiki/Ping#History
 
+Written by Jamie Zawinski and Stephen Martin; 1998.
   </_description>
 </screensaver>