[X2Go-Commits] [x2goclient] 01/02: src/onmainwindow.cpp: pass X2GO_RANDR_XINERAMA=[yes, no] to x2gostartagent as an environment variable based upon the xinerama session setting.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 22ccf7056398173f0fd05e894781a83016efc7dd
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jan 10 07:44:41 2018 +0100

    src/onmainwindow.cpp: pass X2GO_RANDR_XINERAMA=[yes,no] to x2gostartagent as an environment variable based upon the xinerama session setting.
    
    Has no effect when connecting to older X2Go Server versions and handles
    startup correctly with X2Go Server 4.1.0.0.
---
 debian/changelog     |  4 ++++
 src/onmainwindow.cpp | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 478faea..0453a13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,10 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium
     - src/settingswidgets.cpp: don't incorrectly enable whole display settings
       in single display setups. Let debugging mode override this behavior,
       though.
+    - src/onmainwindow.cpp: pass X2GO_RANDR_XINERAMA=[yes,no] to
+      x2gostartagent as an environment variable based upon the xinerama
+      session setting. Has no effect when connecting to older X2Go Server
+      versions and handles startup correctly with X2Go Server 4.1.0.0.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.1.1):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index ae3f11d..97b5039 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -4130,6 +4130,7 @@ void ONMainWindow::startNewSession()
     bool rootless=false;
     resumingSession.published=false;
     bool setDPI=defaultSetDPI;
+    bool xinerama = false;
     uint dpi=defaultDPI;
     QString layout;
     QString type;
@@ -4148,6 +4149,7 @@ void ONMainWindow::startNewSession()
         width=defaultWidth;
         quality=defaultQuality;
         speed=defaultLink;
+        xinerama = defaultXinerama;
         usekbd=defaultSetKbd;
         layout=defaultLayout[0];
         type=defaultKbdType;
@@ -4240,6 +4242,9 @@ void ONMainWindow::startNewSession()
         speed=st->setting()->value ( sid+"/speed",
                                      ( QVariant ) defaultLink ).toInt();
 
+        xinerama = st->setting ()->value (sid + "/xinerama",
+                                          static_cast<QVariant>(defaultXinerama)).toBool ();
+
         clipMode=st->setting()->value ( sid+"/clipboard",
                                         ( QVariant ) defaultClipboardMode ).toString();
 
@@ -4458,13 +4463,22 @@ void ONMainWindow::startNewSession()
     }
     QString dpiEnv;
     QString xdmcpEnv;
+    QString xinerama_env = "X2GO_RANDR_XINERAMA=";
     if ( runRemoteCommand==false && command=="XDMCP" )
         xdmcpEnv="X2GOXDMCP="+xdmcpServer+" ";
     if ( setDPI )
     {
         dpiEnv="X2GODPI="+QString::number ( dpi ) +" ";
     }
-    QString cmd=dpiEnv+xdmcpEnv+"x2gostartagent "+
+
+    if (xinerama) {
+      xinerama_env += "yes";
+    }
+    else {
+      xinerama_env += "no";
+    }
+
+    QString cmd=dpiEnv+xdmcpEnv+ xinerama_env + " x2gostartagent "+
                 geometry+" "+link+" "+pack+
                 " unix-kde-depth_"+depth+" "+layout+" "+type+" ";
     if ( usekbd )

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git