Commit bf2926ae authored by Oleksandr Shneyder's avatar Oleksandr Shneyder
Browse files

- 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
parent 5791109f
......@@ -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):
......
......@@ -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()
{
......
......@@ -962,6 +962,7 @@ public slots:
void slotEmbedControlAction();
void slotDetachProxyWindow();
void slotActivateWindow();
void setFocus();
private slots:
void slotSnameChanged ( const QString& );
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment