This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goclient. from 1a674c7 Continue development on current release / Baikal LTS branch... new 3920c4d - Increase timeout in ssh_select new 4954ff8 set mod map from client to server on Mac, hide keyboard settings on Mac new d7e5f66 Fix mod map on Mac with kerberos. Fix focus on pass form. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 7 ++++- onmainwindow.cpp | 67 +++++++++++++++++++++++++++++++++++++++++++++++ onmainwindow.h | 7 +++++ settingswidget.cpp | 1 + sshmasterconnection.cpp | 2 +- sshprocess.cpp | 3 --- 6 files changed, 82 insertions(+), 5 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goclient. commit d7e5f660e31cc478313a3cf865a3b1c5bbe29e54 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Thu Jan 23 18:27:04 2014 +0100 Fix mod map on Mac with kerberos. Fix focus on pass form. Conflicts (resolved by Mike Gabriel: debian/changelog --- debian/changelog | 2 ++ onmainwindow.cpp | 41 ++++++++++++++++++++++++++++++++++++++++- onmainwindow.h | 1 + sshprocess.cpp | 3 --- 4 files changed, 43 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0528af7..7a27bea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ x2goclient (4.0.1.4-0x2go1) UNRELEASED; urgency=low * New upstream version (4.0.1.4): - Increase timeout in ssh_select. - Set mod map from client to server on Mac, hide keyboard settings on Mac. + - Fix mod map on Mac with kerberos. + - Fix focus on pass form. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Jan 2014 09:17:39 +0100 diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 51e71fa..27bfb2d 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -5483,7 +5483,14 @@ void ONMainWindow::slotSetModMap() pr.waitForFinished(); kbMap=pr.readAllStandardOutput(); } - sshConnection->executeCommand("export DISPLAY=:"+resumingSession.display+"; echo \\\""+kbMap+"\\\" | xmodmap -"); + if(sshConnection->useKerberos()) + { + sshConnection->executeCommand("export DISPLAY=:"+resumingSession.display+"; echo '"+kbMap+"' | xmodmap -"); + } + else + { + sshConnection->executeCommand("export DISPLAY=:"+resumingSession.display+"; echo \\\""+kbMap+"\\\" | xmodmap -"); + } } #endif @@ -5792,6 +5799,38 @@ void ONMainWindow::slotProxyStdout() x2goDebug<<"Proxy wrote on stdout: "<<resout; } +void ONMainWindow::setFocus() +{ + +#ifdef Q_OS_DARWIN + bool userFocus=false; + bool passFocus=false; + if(passForm && passForm->isVisible()) + { + if(pass && pass->isVisible()&& pass->hasFocus()) + { + passFocus=true; + } + if(login && login->isVisible()&& login->hasFocus()) + { + userFocus=true; + } + } +#endif + QWidget::setFocus(); +#ifdef Q_OS_DARWIN + if(userFocus) + { + login->setFocus(); + } + if(passFocus) + { + pass->setFocus(); + } +#endif + +} + void ONMainWindow::slotShowPassForm() { diff --git a/onmainwindow.h b/onmainwindow.h index 5e0f6bc..8db82ec 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -962,6 +962,7 @@ public slots: void slotEmbedControlAction(); void slotDetachProxyWindow(); void slotActivateWindow(); + void setFocus(); private slots: void slotSnameChanged ( const QString& ); diff --git a/sshprocess.cpp b/sshprocess.cpp index dca196d..ebf6fc1 100755 --- a/sshprocess.cpp +++ b/sshprocess.cpp @@ -221,9 +221,6 @@ void SshProcess::startNormal(const QString& cmd) #endif QString::number(masterCon->getPort())+" -l "+ masterCon->getUser()+" "+ host + " \""+shcmd+"\""; -#ifdef DEBUG - x2goDebug<<"running ssh:" <<sshString<<endl; -#endif procUuid=uuidStr; proc->start(sshString); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goclient. commit 4954ff8b6269a7d6afb6feba8c1fbb48a09c4c40 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Thu Jan 23 17:52:41 2014 +0100 set mod map from client to server on Mac, hide keyboard settings on Mac Conflicts (resolved by Mike Gabriel): debian/changelog --- debian/changelog | 1 + onmainwindow.cpp | 28 ++++++++++++++++++++++++++++ onmainwindow.h | 6 ++++++ settingswidget.cpp | 1 + 4 files changed, 36 insertions(+) diff --git a/debian/changelog b/debian/changelog index a60493f..0528af7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2goclient (4.0.1.4-0x2go1) UNRELEASED; urgency=low [ Oleksandr Shneyder ] * New upstream version (4.0.1.4): - Increase timeout in ssh_select. + - Set mod map from client to server on Mac, hide keyboard settings on Mac. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Jan 2014 09:17:39 +0100 diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 4efd91f..51e71fa 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -5468,6 +5468,24 @@ void ONMainWindow::slotSndTunnelFailed ( bool result, QString output, } +#ifdef Q_OS_DARWIN +void ONMainWindow::slotSetModMap() +{ + if(!nxproxy) + { + return; + } + if(kbMap.length()<=0) + { + x2goDebug<<"get keyboard map"; + QProcess pr(this); + pr.start("xmodmap -pke"); + pr.waitForFinished(); + kbMap=pr.readAllStandardOutput(); + } + sshConnection->executeCommand("export DISPLAY=:"+resumingSession.display+"; echo \\\""+kbMap+"\\\" | xmodmap -"); +} +#endif void ONMainWindow::slotProxyError ( QProcess::ProcessError ) { @@ -5479,6 +5497,10 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) { #ifdef Q_OS_DARWIN + disconnect(modMapTimer, SIGNAL(timeout()), this, SLOT(slotSetModMap())); + delete modMapTimer; + modMapTimer=0; + kbMap=QString::null; //fixes bug, when mainwindow inputs not accepting focus under mac setFocus(); #endif @@ -5722,6 +5744,12 @@ void ONMainWindow::slotProxyStderr() } } sbSusp->setToolTip ( tr ( "Suspend" ) ); +#ifdef Q_OS_DARWIN + modMapTimer=new QTimer(this); + connect(modMapTimer, SIGNAL(timeout()), this, SLOT (slotSetModMap())); + modMapTimer->start(30000); + slotSetModMap(); +#endif if ( newSession ) { runCommand(); diff --git a/onmainwindow.h b/onmainwindow.h index d18fef1..5e0f6bc 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -1064,6 +1064,12 @@ private slots: void slotReconnectSession(); void slotStartBroker(); void slotStartNewBrokerSession (); +#ifdef Q_OS_DARWIN + void slotSetModMap(); +private: + QTimer* modMapTimer; + QString kbMap; +#endif private: void resizeProxyWinOnDisplay(int display); diff --git a/settingswidget.cpp b/settingswidget.cpp index 5ffdd01..4add99c 100644 --- a/settingswidget.cpp +++ b/settingswidget.cpp @@ -236,6 +236,7 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw, arts->hide(); pulse->hide(); esd->setChecked ( true ); + kgb->hide(); #endif #ifndef Q_WS_HILDON setLay->addWidget ( dgb ); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goclient. commit 3920c4d90829ae7152963f76ce14bbd6ccb3ce28 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Thu Jan 23 00:33:35 2014 +0100 - Increase timeout in ssh_select Conflicts (resolved by Mike Gabriel): debian/changelog --- debian/changelog | 4 +++- sshmasterconnection.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a8b55bc..a60493f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2goclient (4.0.1.4-0x2go1) UNRELEASED; urgency=low - * Continue development on current release / Baikal LTS branch... + [ Oleksandr Shneyder ] + * New upstream version (4.0.1.4): + - Increase timeout in ssh_select. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Jan 2014 09:17:39 +0100 diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 8355611..d4f6e34 100755 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -1445,7 +1445,7 @@ void SshMasterConnection::channelLoop() struct timeval tv; tv.tv_sec = 0; - tv.tv_usec = 500; + tv.tv_usec = 100000; int retval; int maxsock=-1; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org