Evolinx/sddm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #946 from madsl/develop

Browse Source 
Refactor setupDisplay() to use two distinct processes
This commit is contained in:
davidedmundson 2017-11-29 22:36:45 +00:00 committed by GitHub
commit cc00330db7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/daemon/XorgDisplayServer.cpp
View File

@ -280,6 +280,8 @@ namespace SDDM {
void XorgDisplayServer::setupDisplay() {
QString displayCommand = mainConfig.X11.DisplayCommand.get();
// create cursor setup process
QProcess *setCursor = new QProcess();
// create display setup script process
QProcess *displayScript = new QProcess();
@ -291,24 +293,28 @@ namespace SDDM {
env.insert(QStringLiteral("XAUTHORITY"), m_authPath);
env.insert(QStringLiteral("SHELL"), QStringLiteral("/bin/sh"));
env.insert(QStringLiteral("XCURSOR_THEME"), mainConfig.Theme.CursorTheme.get());
setCursor->setProcessEnvironment(env);
displayScript->setProcessEnvironment(env);
qDebug() << "Setting default cursor";
displayScript->start(QStringLiteral("xsetroot -cursor_name left_ptr"));
setCursor->start(QStringLiteral("xsetroot -cursor_name left_ptr"));
// delete setCursor on finish
connect(setCursor, SIGNAL(finished(int,QProcess::ExitStatus)), setCursor, SLOT(deleteLater()));
// wait for finished
if (!displayScript->waitForFinished(1000)) {
if (!setCursor->waitForFinished(1000)) {
qWarning() << "Could not setup default cursor";
displayScript->kill();
setCursor->kill();
}
// delete displayScript on finish
connect(displayScript, SIGNAL(finished(int,QProcess::ExitStatus)), displayScript, SLOT(deleteLater()));
// start display setup script
qDebug() << "Running display setup script " << displayCommand;
displayScript->start(displayCommand);
// delete displayScript on finish
connect(displayScript, SIGNAL(finished(int,QProcess::ExitStatus)), displayScript, SLOT(deleteLater()));
// wait for finished
if (!displayScript->waitForFinished(30000))
displayScript->kill();