Replace the old Motif-based xgps with a new pygtk-based xgps (formerly xgps2).

Replaces 1200-odd lines of difficult-to-maintain C code with
400-odd-lines of Python.

1 files changed, 33 insertions, 45 deletions

diff --git a/gps.xml b/gps.xml
index 992c2805..c9109103 100644
--- a/gps.xml
+++ b/gps.xml
@@ -20,13 +20,11 @@
 
 <cmdsynopsis>
   <command>xgps</command>  
-      <arg choice='opt'><replaceable>X-options</replaceable></arg>
       <arg choice='opt'>-D <replaceable>debug-level</replaceable></arg>
       <arg choice='opt'>-h </arg>
       <arg choice='opt'>-V </arg>
-      <arg choice='opt'>-speedunits <group choice='req'><arg>mph</arg><arg>kph</arg><arg>knots</arg></group></arg>
-      <arg choice='opt'>-altunits <group choice='req'><arg>feet</arg><arg>meters</arg></group></arg>
       <arg choice='opt'>-l <group><arg>d</arg><arg>m</arg><arg>s</arg></group></arg>
+      <arg choice='opt'>-u <group><arg>imperial</arg><arg>nautical</arg><arg>metric</arg></group></arg>
       <group>
 	<replaceable>server</replaceable>
 	  <group> 
@@ -121,6 +119,28 @@ degrees and is the default.  The value 'm' produces degrees and
 decimal minutes.  The value 's' produces degrees, minutes, and decimal
 seconds.</para>
 
+<para><application>xgps</application> and
+<application>cgps</application> look at variables in the environment
+to figure out what units they should default to using for display.
+Here are the variables and values they check:</para>
+
+<screen>
+    GPSD_UNITS one of: 
+              imperial   = miles/feet
+              nautical   = knots/feet
+              metric     = km/meters
+    LC_MEASUREMENT
+	      en_US      = miles/feet
+              C          = miles/feet
+              POSIX      = miles/feet
+              [other]    = km/meters
+    LANG
+	      en_US      = miles/feet
+              C          = miles/feet
+              POSIX      = miles/feet
+              [other]    = km/meters
+</screen>
+
 <para> The <option>-D</option> option, when present, sets a debug
 level; it is primarily for use by GPSD developers.  It enables
 various progress messages to standard error.</para>
@@ -146,25 +166,16 @@ support the feature) the locations of accessible satellites.</para>
 
 <para>In the sky view, satellites are color-coded to indicate quality
 of signal; consult the data display to the left for exact figures in
-dB. Diamond icons indicate WAAS/EGNOS satellites, circles indicate
+dB. Square icons indicate WAAS/EGNOS satellites, circles indicate
 ordinary GPS satellites.  Filled icons were used in the last fix, 
 outline icons were not.</para>
 
-<para>The <option>-speedunits</option> option can be used to set the
-speed units for display; follow the keyword with knots for nautical
-miles per hour, kph for kilometres per hour, or mph for miles per
-hour.  The default is miles per hour.  This option can also be set as
-the X resource 'speedunits'.</para>
-
-<para>The <option>-altunits</option> option can be used to set the
-altitude units for display; follow the keyword with 'meters' or
-'feet'.  The default is feet.  This option can also be set as the X
-resource 'altunits'.</para>
-
-<para>There is a known bug in <application>xgps</application>; it
-assumes the default font size is no more than 18 pixels.  If this
-is not the case, the satellite data display will show fewer than
-12 satellites.</para>
+<para>The <option>-u</option> option can be used to set the
+system units for display; follow the keyword with 'imperial' for
+American units (feet in altitude and error estimates, miles per hour
+in speeds), 'nautical' (feet in altitude and error estimates, knots
+in speed) or 'metric' (meters in altitude and error estimates,
+kiliometers per hour in speeds). </para>
 
 </refsect2>
 <refsect2><title>xgpsspeed</title>
@@ -200,27 +211,6 @@ to two degrees in the areas for which the calculation is valid
 (currently Western Europe, Alaska, and Lower 48 in the USA).  The
 formulas used are those found in the Aviation Formulary v1.43.</para>
 
-<para>Rather than use X resources to determine which units to use, 
-<application>cgps</application> looks at variables in its environment.
-Here are the variables and values it checks:</para>
-
-<screen>
-    GPSD_UNITS one of: 
-              imperial   = miles/feet
-              nautical   = knots/feet
-              metric     = km/meters
-    LC_MEASUREMENT
-	      en_US      = miles/feet
-              C          = miles/feet
-              POSIX      = miles/feet
-              [other]    = km/meters
-    LANG
-	      en_US      = miles/feet
-              C          = miles/feet
-              POSIX      = miles/feet
-              [other]    = km/meters
-</screen>
-
 <para><application>cgps</application> terminates when you send it a
 SIGHUP or SIGINT; given default terminal settings this will happen
 when you type Ctl-C at it.  It will also terminate on 'q'</para>
@@ -256,11 +246,9 @@ configured  to use it, this program listens to DBUS broadcasts
 from <application>gpsd</application>. (org.gpsd.fix).  Otherwise,
 it uses a conventional socket connection. </para>
 
-<para>The <option>-j</option> option is only meaningful in socket mode
-and when collecting fixes from an NMEA device.  Presence of a
-server-port-device specification forces use of sockets even on a D-Bus
-capable system, though this is unlikely to be of interest to anyone
-except GPSD developers.</para>
+<para>Presence of a server-port-device specification forces use of
+sockets even on a D-Bus capable system, though this is unlikely to be
+of interest to anyone except GPSD developers.</para>
 
 </refsect2>
 </refsect1>