aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Options.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-10 01:05:58 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-18 19:45:04 +0200
commit4b4a6a35c47590bd4ab1c16d9bf1398bb51624b2 (patch)
tree8b2a43fffc3d0c4498b804f32c8600baad629915 /nx-X11/programs/Xserver/hw/nxagent/Options.c
parent3f8aa38feb327688ef62836613d160e80f868575 (diff)
downloadnx-libs-4b4a6a35c47590bd4ab1c16d9bf1398bb51624b2.tar.gz
nx-libs-4b4a6a35c47590bd4ab1c16d9bf1398bb51624b2.tar.bz2
nx-libs-4b4a6a35c47590bd4ab1c16d9bf1398bb51624b2.zip
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).
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Options.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Options.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.c b/nx-X11/programs/Xserver/hw/nxagent/Options.c
index 8a3275c64..d0ba8aff5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Options.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Options.c
@@ -155,7 +155,7 @@ void nxagentInitOptions()
nxagentOptions.ImageRateLimit = 0;
- nxagentOptions.Xinerama = 0;
+ nxagentOptions.Xinerama = 1;
nxagentOptions.SleepTime = DEFAULT_SLEEP_TIME;
}