Properly enable/disable Xinerama support in nxagent via cmdline options provider in Xserver/os/utils.c.

  * Xinerama defaults to enabled, using RRXineramaExtension
    (i.e. cmdline option: +rrxinerama).
  * Cmdline option -rrxinerama disables Xinerama support entirely.
  * Cmdline option +xinerama switches from RRXineramaExtension to
    PanoramiXExtension.
  * Cmdline option -xinerama is actually non-functional (i.e. the
    default).
  * If the nx/nx option "xinerama" is handed over to nxagent,
    then Xinerama is only switched on if that given option enables it
    (value: 1) _and_ if either of the Xinerama extensions (PanoramiX
    or RRXinerama) has been initialized (via cmdline options above).

 Fixes ArcticaProject/nx-libs#117.
 Fixes ArcticaProject/nx-libs#134 (makes flawed PR#134 obsolete).

1 files changed, 6 insertions, 6 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.h b/nx-X11/programs/Xserver/hw/nxagent/Options.h
index 02b886242..7e9f8d2ea 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Options.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h
@@ -390,12 +390,12 @@ typedef struct _AgentOptions
   int NoRootlessExit;
 
  /*
-  * Store if the user wants Xinerama. There's a variable called
-  * noPanoramiXExtension in os/utils.c but we cannot rely on that
-  * because RandR and Panoramix change its value when trying to
-  * initialize. So we use this variable to save the user preference
-  * provided by the -/+xinerama parameter before initalizing those
-  * extensions.
+  * Store if the user wants Xinerama. There are variables called
+  * noPanoramiXExtension noRRXineramaExtensison in os/utils.c but
+  * we cannot rely on them because RandR and PanoramiX change their
+  * values when trying to initialize. So we use this variable to
+  * save the user preference provided by the -/+(rr)xinerama parameter(s)
+  * before initalizing those extensions.
   */
 
   int Xinerama;