Attachment 666317 Details for Bug 964548

[patch] This should resolve the remaining issues

patch2.diff (text/plain), 5.54 KB, created by Forgotten User qouZmm_Kx7 on 2016-02-20 17:39:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Forgotten User qouZmm_Kx7

Created: 2016-02-20 17:39:58 UTC

Size: 5.54 KB

patch

obsolete

>diff --git a/greeter/greeterapp.cpp b/greeter/greeterapp.cpp
>index b58e1ad..629679e 100644
>--- a/greeter/greeterapp.cpp
>+++ b/greeter/greeterapp.cpp
>@@ -105,6 +105,10 @@ UnlockApp::UnlockApp(int &argc, char **argv)
>     if (QX11Info::isPlatformX11()) {
>         installNativeEventFilter(new FocusOutEventFilter);
>     }
>+    connect(this, &UnlockApp::lastWindowClosed, this, [this]() {
>+       qDebug() << "last window closed";
>+       exit(123);
>+       });
> }
> 
> UnlockApp::~UnlockApp()
>@@ -188,8 +192,8 @@ void UnlockApp::desktopResized()
>         connect(QGuiApplication::screens()[i], &QObject::destroyed, this, &UnlockApp::desktopResized);
>         // create the view
>         auto *view = new KQuickAddons::QuickViewSharedEngine();
>-        view->setColor(Qt::black);
> 
>+        view->setColor(Qt::black);
>         // first create KDeclarative, to be sure that it created a KIO Network Factory
>         KDeclarative::KDeclarative declarative;
>         declarative.setDeclarativeEngine(view->engine());
>diff --git a/greeter/main.cpp b/greeter/main.cpp
>index 5625d36..5005aa3 100644
>--- a/greeter/main.cpp
>+++ b/greeter/main.cpp
>@@ -51,12 +51,15 @@ static void signalHandler(int signum)
> 
> int main(int argc, char* argv[])
> {
>+  int retcode = 0;
>+  bool again = false;
>+  do {
>     KLocalizedString::setApplicationDomain("kscreenlocker_greet");
> 
>     // explicitly disable input methods as it makes it impossible to unlock, see BUG 306932
>     // but explicitly set on screen keyboard such as maliit is allowed
>     if (qgetenv("QT_IM_MODULE") != QByteArrayLiteral("maliit")) {
>-        qputenv("QT_IM_MODULE", QByteArrayLiteral("compose"));
>+      qputenv("QT_IM_MODULE", QByteArrayLiteral("compose"));
>     }
>     ScreenLocker::UnlockApp app(argc, argv);
>     app.setQuitOnLastWindowClosed(false);
>@@ -66,7 +69,7 @@ int main(int argc, char* argv[])
> 
>     // disable session management for the greeter
>     auto disableSessionManagement = [](QSessionManager &sm) {
>-        sm.setRestartHint(QSessionManager::RestartNever);
>+      sm.setRestartHint(QSessionManager::RestartNever);
>     };
>     QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
>     QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
>@@ -77,18 +80,18 @@ int main(int argc, char* argv[])
>     parser.addVersionOption();
> 
>     QCommandLineOption testingOption(QStringLiteral("testing"),
>-                                     i18n("Starts the greeter in testing mode"));
>+	i18n("Starts the greeter in testing mode"));
>     QCommandLineOption immediateLockOption(QStringLiteral("immediateLock"),
>-                                           i18n("Lock immediately, ignoring any grace time etc."));
>+	i18n("Lock immediately, ignoring any grace time etc."));
>     QCommandLineOption graceTimeOption(QStringLiteral("graceTime"),
>-                                       i18n("Delay till the lock user interface gets shown in milliseconds."),
>-                                       QStringLiteral("milliseconds"),
>-                                       QStringLiteral("0"));
>+	i18n("Delay till the lock user interface gets shown in milliseconds."),
>+	QStringLiteral("milliseconds"),
>+	QStringLiteral("0"));
>     QCommandLineOption nolockOption(QStringLiteral("nolock"),
>-                                    i18n("Don't show any lock user interface."));
>+	i18n("Don't show any lock user interface."));
>     QCommandLineOption waylandFdOption(QStringLiteral("ksldfd"),
>-                                       i18n("File descriptor for connecting to ksld."),
>-                                       QStringLiteral("fd"));
>+	i18n("File descriptor for connecting to ksld."),
>+	QStringLiteral("fd"));
> 
>     parser.addOption(testingOption);
>     parser.addOption(immediateLockOption);
>@@ -98,25 +101,25 @@ int main(int argc, char* argv[])
>     parser.process(app);
> 
>     if (parser.isSet(testingOption)) {
>-        app.setTesting(true);
>-        app.setImmediateLock(true);
>+      app.setTesting(true);
>+      app.setImmediateLock(true);
>     } else {
>-        app.setImmediateLock(parser.isSet(immediateLockOption));
>+      app.setImmediateLock(parser.isSet(immediateLockOption));
>     }
>     app.setNoLock(parser.isSet(nolockOption));
> 
>     bool ok = false;
>     int graceTime = parser.value(graceTimeOption).toInt(&ok);
>     if (ok) {
>-        app.setGraceTime(graceTime);
>+      app.setGraceTime(graceTime);
>     }
> 
>     if (parser.isSet(waylandFdOption)) {
>-        ok = false;
>-        const int fd = parser.value(waylandFdOption).toInt(&ok);
>-        if (ok) {
>-            app.setKsldSocket(fd);
>-        }
>+      ok = false;
>+      const int fd = parser.value(waylandFdOption).toInt(&ok);
>+      if (ok) {
>+	app.setKsldSocket(fd);
>+      }
>     }
>     app.desktopResized();
> 
>@@ -124,11 +127,21 @@ int main(int argc, char* argv[])
>     // Crucial for blocking until it is ready, ensuring locking happens before sleep, e.g.
>     std::cout << "Locked at " << QDateTime::currentDateTime().toTime_t() << std::endl;
> 
>-    struct sigaction sa;
>-    sa.sa_handler = signalHandler;
>-    sigemptyset(&sa.sa_mask);
>-    sa.sa_flags = SA_RESTART;
>-    sigaction(SIGTERM, &sa, nullptr);
>-    sigaction(SIGUSR1, &sa, nullptr);
>-    return app.exec();
>+    if (!again) {
>+      struct sigaction sa;
>+      sa.sa_handler = signalHandler;
>+      sigemptyset(&sa.sa_mask);
>+      sa.sa_flags = SA_RESTART;
>+      sigaction(SIGTERM, &sa, nullptr);
>+      sigaction(SIGUSR1, &sa, nullptr);
>+      again = true;
>+    }
>+    else {
>+      app.lockImmediately();
>+    }
>+
>+    retcode = app.exec();
>+  } while (retcode == 123);
>+
>+  return retcode;
> }

Actions: View | Diff

Attachments on bug 964548: 664062 | 664478 | 664559 | 664611 | 665550 | 666317