diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-10 01:05:58 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-18 19:45:04 +0200 |
| commit | 4b4a6a35c47590bd4ab1c16d9bf1398bb51624b2 (patch) | |
| tree | 8b2a43fffc3d0c4498b804f32c8600baad629915 /nx-X11/programs/Xserver/hw/nxagent/Screen.c | |
| parent | 3f8aa38feb327688ef62836613d160e80f868575 (diff) | |
| download | nx-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/Screen.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 20ec3672a..50d278ed7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -1114,11 +1114,6 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen, nxagentChangeOption(ViewportXSpan, nxagentOption(Width) - nxagentOption(RootWidth)); nxagentChangeOption(ViewportYSpan, nxagentOption(Height) - nxagentOption(RootHeight)); - /* PanoramiXExtension enabled via cmdline, turn on Xinerama in nxagent - */ - if( (!noPanoramiXExtension) && (!PanoramiXExtensionDisabledHack) ) - nxagentOption(Xinerama) = True; - if (nxagentReconnectTrap == 0) { if (nxagentOption(Persistent)) |