This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch revtunnel in repository x2goclient. from 33e81a4 Revrite SSH Classes to support libssh fix new c796fa3 - Increase timeout in ssh_select new 5791109 set mod map from client to server on Mac, hide keyboard settings on Mac new bf2926a - 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 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 | 6 ++++- onmainwindow.cpp | 67 +++++++++++++++++++++++++++++++++++++++++++++++ onmainwindow.h | 7 +++++ settingswidget.cpp | 1 + sshmasterconnection.cpp | 2 +- sshprocess.cpp | 3 --- 6 files changed, 81 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 revtunnel in repository x2goclient. commit 5791109f7f8f4ea6260c8b195420f2ca4be23d3c 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 --- 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 5a2ac3b..bffb4be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ x2goclient (4.0.1.3-0x2go1) UNRELEASED; urgency=low - Update Russian translation file. - Rewrite SSH Classes to support libssh fix - Increase timeout in ssh_select + - set mod map from client to server on Mac, hide keyboard settings on Mac [ Orion Poplawski ] * New upstream version (4.0.1.3): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index ae3eefa..fa8c51e 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 revtunnel in repository x2goclient. commit c796fa35327986f2f4883b39fdb7e0d881c89c38 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Thu Jan 23 00:33:35 2014 +0100 - Increase timeout in ssh_select --- debian/changelog | 3 ++- sshmasterconnection.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2ba3cdc..5a2ac3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,8 @@ x2goclient (4.0.1.3-0x2go1) UNRELEASED; urgency=low - Enables forwarding (delegation) of GSSAPI credentials to the server. - Make GSSAPI delegation configurable. - Update Russian translation file. - - Revrite SSH Classes to support libssh fix + - Rewrite SSH Classes to support libssh fix + - Increase timeout in ssh_select [ Orion Poplawski ] * New upstream version (4.0.1.3): diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index c161ab3..f7012fe 100755 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -1391,7 +1391,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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch revtunnel in repository x2goclient. commit bf2926aeaa4437bd8e2e699f504a7462bf09759a Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Thu Jan 23 18:27:04 2014 +0100 - 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 --- debian/changelog | 4 +++- onmainwindow.cpp | 41 ++++++++++++++++++++++++++++++++++++++++- onmainwindow.h | 1 + sshprocess.cpp | 3 --- 4 files changed, 44 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index bffb4be..9e63f08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,9 @@ x2goclient (4.0.1.3-0x2go1) UNRELEASED; urgency=low - Update Russian translation file. - Rewrite SSH Classes to support libssh fix - Increase timeout in ssh_select - - set mod map from client to server on Mac, hide keyboard settings on Mac + - 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 [ Orion Poplawski ] * New upstream version (4.0.1.3): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index fa8c51e..5c3d2b8 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 93a388c..07c009f 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
-
git-admin＠x2go.org