[X2Go-Commits] [x2goclient] 03/03: - 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
git-admin at x2go.org
git-admin at x2go.org
Fri Jan 24 11:22:05 CET 2014
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 at 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
More information about the x2go-commits
mailing list