x2goclient.git - master (branch) updated: 3.99.1.0-6-g0cf7b36 - x2go-commits

23 Feb 2012

The branch, master has been updated
       via  0cf7b36b26b81dd2bbb650474ee8af71f82e2ff1 (commit)
      from  ad93ba72500277997ffb92b966dc7d14a5fbe14a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0cf7b36b26b81dd2bbb650474ee8af71f82e2ff1
Author: Oleksandr Shneyder <oleksandr.shneyder@treuchtlingen.de>
Date:   Thu Feb 23 09:49:57 2012 +0100

    command line argument "--xinerama": use Xinerama by default.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog       |    1 +
 onmainwindow.cpp       |    1 +
 onmainwindow.h         |    1 +
 onmainwindow_part3.cpp |    6 ++++++
 onmainwindow_part4.cpp |   24 +++++++++++++-----------
 5 files changed, 22 insertions(+), 11 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 3d1b9dd..b5cacc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (3.99.1.1):
     - not including <netinet/in.h> on Q_OS_WIN platform.
     - not updating Xinerama configuration in "fullscreen" mode.
+    - command line argument "--xinerama": use Xinerama by default.
 
   [ Mike Gabriel ]
   * New upstream version (3.99.1.1):
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index a543ce1..87f9b94 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -64,6 +64,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
     extStarted=false;
     defaultLink=2;
     defaultFullscreen=false;
+    defaultXinerama=false;
     acceptRsa=false;
     cardStarted=false;
     cardReady=false;
diff --git a/onmainwindow.h b/onmainwindow.h
index f3aaff4..5aa76f6 100644
--- a/onmainwindow.h
+++ b/onmainwindow.h
@@ -465,6 +465,7 @@ private:
     bool startMaximized;
     bool startHidden;
     bool defaultUseSound;
+    bool defaultXinerama;
     bool cardStarted;
     bool defaultSetKbd;
     bool showExport;
diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp
index a2e4b07..69a0493 100644
--- a/onmainwindow_part3.cpp
+++ b/onmainwindow_part3.cpp
@@ -247,6 +247,11 @@ bool ONMainWindow::parseParameter ( QString param )
         startMaximized=true;
         return true;
     }
+    if ( param=="--xinerama" )
+    {
+        defaultXinerama=true;
+        return true;
+    }
     if ( param=="--hide" )
     {
         startHidden=true;
@@ -694,6 +699,7 @@ void ONMainWindow::showHelp()
         "--hide\t\t\t\t start hidden\n"
         "--portable\t\t\t start in \"portable\" mode\n"
         "--pgp-card\t\t\t use openPGP card authentication\n"
+        "--xinerama\t\t\t use Xinerama by default\n"
         "--ldap-printing\t\t\t allow client side printing in LDAP mode\n"
         "--add-to-known-hosts\t\t add RSA key fingerprint to "
         ".ssh/known_hosts\n"
diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp
index 9bbdecb..25ca9a1 100644
--- a/onmainwindow_part4.cpp
+++ b/onmainwindow_part4.cpp
@@ -1147,8 +1147,8 @@ void ONMainWindow::slotConfigXinerama()
 
 void ONMainWindow::slotXineramaConfigured()
 {
-    if(resumingSession.fullscreen)
-      return;
+    if (resumingSession.fullscreen)
+        return;
     if (xinSizeInc == -1)
         xinSizeInc=1;
     else
@@ -1173,8 +1173,8 @@ void ONMainWindow::slotFindProxyWin()
 {
 #ifndef Q_OS_DARWIN
     x2goDebug<<"search proxy win: "<<"X2GO-"+resumingSession.sessionId;
-
     proxyWinId=findWindow ( "X2GO-"+resumingSession.sessionId );
+    bool xinerama=defaultXinerama;
     if ( proxyWinId )
     {
         x2goDebug<<"proxy win found:"<<proxyWinId;
@@ -1194,14 +1194,8 @@ void ONMainWindow::slotFindProxyWin()
             else
                 st= new X2goSettings( "sessions" );
             uint displays=QApplication::desktop()->numScreens();
-            if (st->setting()->value ( sid+"/xinerama",
-                                       ( QVariant ) false ).toBool())
-            {
-                x2goDebug<<"Starting xinerama timer\n";
-                lastDisplayGeometry=QRect();
-                xineramaScreens.clear();
-                xineramaTimer->start(500);
-            }
+            xinerama=st->setting()->value ( sid+"/xinerama",
+                                            ( QVariant ) defaultXinerama ).toBool();
             if (st->setting()->value ( sid+"/multidisp",
                                        ( QVariant ) false ).toBool())
             {
@@ -1215,6 +1209,14 @@ void ONMainWindow::slotFindProxyWin()
                 return;
             }
         }
+        if (xinerama)
+        {
+            x2goDebug<<"Starting xinerama timer\n";
+            lastDisplayGeometry=QRect();
+            xineramaScreens.clear();
+            xineramaTimer->start(500);
+        }
+
         if ( embedMode )
         {
             if ( config.rootless )


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).

    