diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-10-07 20:51:12 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-12-30 00:05:53 +0100 |
| commit | 0297567cd501b6fc012c41ff4a1ae27304ff6a10 (patch) | |
| tree | 5beb83ca372493fa7cde5d0b7b581c27a53726eb /nx-X11/programs/Xserver/hw/nxagent/Screen.c | |
| parent | f40792c436c2e0678f46478002830367b683f20c (diff) | |
| download | nx-libs-0297567cd501b6fc012c41ff4a1ae27304ff6a10.tar.gz nx-libs-0297567cd501b6fc012c41ff4a1ae27304ff6a10.tar.bz2 nx-libs-0297567cd501b6fc012c41ff4a1ae27304ff6a10.zip | |
Provide support for re-enabling Xinerama on session resumptions.
By design, when resuming a session, Xinerama can only be re-enabled
by NX option parsing.
Thus, this change introduces a "xinerama" NX option that can
be loaded via an options file into NX agent when resuming
a session. The new xinerame NX session option also allows
switching on Xinerama at session startup via an option file.
When implementing the new NX Xinerama support into clients (like
TheQVD, X2Go Client, etc., this new xinerama NX option should be
used for activating Xinerama in the NX / QVD / X2Go session.
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Screen.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index 087f3f41a..17e749a6b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -1113,8 +1113,10 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen, nxagentChangeOption(ViewportXSpan, nxagentOption(Width) - nxagentOption(RootWidth)); nxagentChangeOption(ViewportYSpan, nxagentOption(Height) - nxagentOption(RootHeight)); - /* store the user's preference provided via cmdline */ - nxagentOption(Xinerama) = !noPanoramiXExtension; + /* PanoramiXExtension enabled via cmdline, turn on Xinerama in nxagent + */ + if( (!noPanoramiXExtension) && (!PanoramiXExtensionDisabledHack) ) + nxagentOption(Xinerama) = True; if (nxagentReconnectTrap == 0) { |