The branch, master has been updated via ad93ba72500277997ffb92b966dc7d14a5fbe14a (commit) from 4a931302e089e07c9d9f01ca263c1c682ce00974 (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 ad93ba72500277997ffb92b966dc7d14a5fbe14a Author: Oleksandr Shneyder <oleksandr.shneyder@treuchtlingen.de> Date: Thu Feb 23 09:21:47 2012 +0100 not updating Xinerama configuration in "fullscreen" mode. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- onmainwindow.h | 1 + onmainwindow_part2.cpp | 2 ++ onmainwindow_part4.cpp | 14 ++++++++++---- 4 files changed, 15 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e3e0b5e..3d1b9dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,8 @@ x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low [ Oleksandr Shneyder ] * New upstream version (3.99.1.1): - not including <netinet/in.h> on Q_OS_WIN platform. - + - not updating Xinerama configuration in "fullscreen" mode. + [ Mike Gabriel ] * New upstream version (3.99.1.1): - Update copyright year in about window. Including all translations. diff --git a/onmainwindow.h b/onmainwindow.h index 79d60e4..f3aaff4 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -132,6 +132,7 @@ struct x2goSession QString sndPort; QString fsPort; int colorDepth; + bool fullscreen; enum {DESKTOP,ROOTLESS,SHADOW} sessionType; QString command; void operator = ( const x2goSession& s ); diff --git a/onmainwindow_part2.cpp b/onmainwindow_part2.cpp index 7d1a206..f43c179 100644 --- a/onmainwindow_part2.cpp +++ b/onmainwindow_part2.cpp @@ -730,6 +730,7 @@ void ONMainWindow::startNewSession() cmd+=sessTypeStr+QString::number ( shadowMode ) +"XSHAD"+ shadowUser+"XSHAD"+shadowDisplay; } + resumingSession.fullscreen=fullscreen; x2goDebug<<cmd<<endl; if ( managedMode ) { @@ -908,6 +909,7 @@ void ONMainWindow::resumeSession ( const x2goSession& s ) geometry=QString::number ( width ) +"x"+ QString::number ( height ); } + resumingSession.fullscreen=fullscreen; QString link; switch ( speed ) { diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp index 39343a1..9bbdecb 100644 --- a/onmainwindow_part4.cpp +++ b/onmainwindow_part4.cpp @@ -1107,18 +1107,22 @@ void ONMainWindow::slotConfigXinerama() if (newGeometry==lastDisplayGeometry) return; lastDisplayGeometry=newGeometry; - x2goDebug<<"New proxy geometry: "<<lastDisplayGeometry<<endl; + x2goDebug<<"New proxy geometry: "<<lastDisplayGeometry<<endl; QDesktopWidget* root=QApplication::desktop(); QList<QRect> newXineramaScreens; for (int i=0; i< root->numScreens();++i) { - QRect intersection=root->screenGeometry(i).intersected(lastDisplayGeometry); + QRect intersection; + if (resumingSession.fullscreen) + intersection=root->screenGeometry(i); + else + intersection=root->screenGeometry(i).intersected(lastDisplayGeometry); if (!intersection.isNull()) { - x2goDebug<<"intersected with "<<i<<": "<<intersection<<endl; + x2goDebug<<"intersected with "<<i<<": "<<intersection<<endl; intersection.moveLeft(intersection.x()-lastDisplayGeometry.x()); intersection.moveTop(intersection.y()-lastDisplayGeometry.y()); - x2goDebug<<"xinerama screen: "<<intersection<<endl; + x2goDebug<<"xinerama screen: "<<intersection<<endl; newXineramaScreens<<intersection; } } @@ -1143,6 +1147,8 @@ void ONMainWindow::slotConfigXinerama() void ONMainWindow::slotXineramaConfigured() { + if(resumingSession.fullscreen) + return; if (xinSizeInc == -1) xinSizeInc=1; else 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).