diff --git a/autotests/noscreens.cpp b/autotests/noscreens.cpp index 8ee70c5..7b1a199 100644 --- a/autotests/noscreens.cpp +++ b/autotests/noscreens.cpp @@ -1,160 +1,193 @@ /******************************************************************** KSld - the KDE Screenlocker Daemon This file is part of the KDE project. Copyright (C) 2016 Martin Gräßlin This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . *********************************************************************/ #include #include "../ksldapp.h" +#include #include #include #include #include #include #include #include +#include + using namespace KWayland::Server; class NoScreensTest : public QObject { Q_OBJECT Q_SIGNALS: void surfaceShown(); private Q_SLOTS: - void initTestCase(); + void init(); void cleanup(); void testAllQScreensClose(); private: void unlock(); Display *m_display = nullptr; CompositorInterface *m_compositor = nullptr; ShellInterface *m_shell = nullptr; SeatInterface *m_seat = nullptr; PlasmaShellInterface *m_plasma = nullptr; SurfaceInterface *m_surface = nullptr; + ClientConnection *m_clientConnection = nullptr; }; -void NoScreensTest::initTestCase() +void NoScreensTest::init() { - m_display = new Display(this); + m_display = new Display; + m_display->setAutomaticSocketNaming(true); m_display->start(Display::StartMode::ConnectClientsOnly); + QVERIFY(m_display->isRunning()); + m_compositor = m_display->createCompositor(m_display); m_compositor->create(); m_shell = m_display->createShell(m_display); m_shell->create(); m_display->createShm(); m_seat = m_display->createSeat(m_display); m_seat->setHasKeyboard(true); m_seat->setHasPointer(true); m_seat->setHasTouch(true); m_seat->create(); m_display->createDataDeviceManager(m_display)->create(); m_plasma = m_display->createPlasmaShell(m_display); m_plasma->create(); QCoreApplication::instance()->setProperty("platformName", QStringLiteral("wayland")); - ScreenLocker::KSldApp::self(); - ScreenLocker::KSldApp::self()->setWaylandDisplay(m_display); + auto *app = ScreenLocker::KSldApp::self(); + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); env.insert(QStringLiteral("QT_QPA_PLATFORM"), QStringLiteral("wayland")); - ScreenLocker::KSldApp::self()->setGreeterEnvironment(env); - ScreenLocker::KSldApp::self()->initialize(); + app->setGreeterEnvironment(env); + app->initialize(); + + connect(app, &ScreenLocker::KSldApp::aboutToLock, + this, [this, app] { + int sx[2]; + QVERIFY(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sx) >= 0); + + m_clientConnection = m_display->createClient(sx[0]); + QVERIFY(m_clientConnection); + connect(m_clientConnection, &ClientConnection::disconnected, this, [this] { + // The API is currently ill-defined about the ownership of a client connection + // when calling createClient server-side. + m_clientConnection = nullptr; + }); + app->setWaylandFd(sx[1]); + connect(m_seat, &SeatInterface::timestampChanged, + app, &ScreenLocker::KSldApp::userActivity); + + }); + connect(app, &ScreenLocker::KSldApp::unlocked, + this, [this, app] { + if (m_clientConnection) { + delete m_clientConnection; + m_clientConnection = nullptr; + } + disconnect(m_seat, &SeatInterface::timestampChanged, + app, &ScreenLocker::KSldApp::userActivity); + }); + connect(m_shell, &ShellInterface::surfaceCreated, this, [this] (ShellSurfaceInterface *surface) { m_surface = surface->surface(); connect(surface->surface(), &SurfaceInterface::damaged, this, [this, surface] { emit surfaceShown(); ScreenLocker::KSldApp::self()->lockScreenShown(); surface->surface()->frameRendered(0); surface->client()->flush(); } ); } ); } void NoScreensTest::cleanup() { - unlock(); + delete m_display; } void NoScreensTest::unlock() { using namespace ScreenLocker; const auto children = KSldApp::self()->children(); for (auto it = children.begin(); it != children.end(); ++it) { if (qstrcmp((*it)->metaObject()->className(), "LogindIntegration") != 0) { continue; } QMetaObject::invokeMethod(*it, "requestUnlock"); break; } } void NoScreensTest::testAllQScreensClose() { if (!QFile::exists(QStringLiteral("/dev/dri/card0"))) { QSKIP("Needs a DRI device for the greeter"); } QSignalSpy lockedStateSpy(ScreenLocker::KSldApp::self(), &ScreenLocker::KSldApp::lockStateChanged); QVERIFY(lockedStateSpy.isValid()); - QSignalSpy greeterConnectionSpy(ScreenLocker::KSldApp::self(), &ScreenLocker::KSldApp::greeterClientConnectionChanged); - QVERIFY(greeterConnectionSpy.isValid()); QSignalSpy surfaceShownSpy(this, &NoScreensTest::surfaceShown); QVERIFY(surfaceShownSpy.isValid()); // create an Output OutputInterface *output = m_display->createOutput(m_display); output->setGlobalPosition(QPoint(0, 0)); output->setPhysicalSize(QSize(1280, 1024) / 3.8); output->addMode(QSize(1280, 1024)); output->create(); ScreenLocker::KSldApp::self()->lock(ScreenLocker::EstablishLock::Immediate); QCOMPARE(lockedStateSpy.count(), 1); - QCOMPARE(greeterConnectionSpy.count(), 1); QCOMPARE(ScreenLocker::KSldApp::self()->lockState(), ScreenLocker::KSldApp::AcquiringLock); QVERIFY(surfaceShownSpy.wait()); QCOMPARE(ScreenLocker::KSldApp::self()->lockState(), ScreenLocker::KSldApp::Locked); + QVERIFY(m_clientConnection); // give some time to show the window QTest::qWait(5000); // deleting the output should destroy the surface QVERIFY(m_surface); QSignalSpy surfaceDestroyedSpy(m_surface, &QObject::destroyed); QVERIFY(surfaceDestroyedSpy.isValid()); output->deleteLater(); QVERIFY(surfaceDestroyedSpy.wait()); QCOMPARE(ScreenLocker::KSldApp::self()->lockState(), ScreenLocker::KSldApp::Locked); QVERIFY(!lockedStateSpy.wait()); QCOMPARE(ScreenLocker::KSldApp::self()->lockState(), ScreenLocker::KSldApp::Locked); unlock(); QTRY_COMPARE(ScreenLocker::KSldApp::self()->lockState(), ScreenLocker::KSldApp::Unlocked); } QTEST_GUILESS_MAIN(NoScreensTest) #include "noscreens.moc" diff --git a/ksldapp.cpp b/ksldapp.cpp index b27f4e6..8a2f89a 100644 --- a/ksldapp.cpp +++ b/ksldapp.cpp @@ -1,777 +1,766 @@ /******************************************************************** KSld - the KDE Screenlocker Daemon This file is part of the KDE project. Copyright 1999 Martin R. Jones Copyright 2003 Oswald Buddenhagen Copyright 2008 Chani Armitage Copyright (C) 2011 Martin Gräßlin This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . *********************************************************************/ #include "ksldapp.h" #include "interface.h" #include "globalaccel.h" #include "x11locker.h" #include "waylandlocker.h" #include "logind.h" #include "kscreensaversettings.h" #include "powermanagement_inhibition.h" #include #include #include "waylandserver.h" // KDE #include #include #include #include #include -//kwayland -#include -#include - // Qt #include #include #include #include #include // X11 #include #include #ifdef X11_Xinput_FOUND #include #endif // other #include #include #include #include namespace ScreenLocker { static const QString s_qtQuickBackend = QStringLiteral("QT_QUICK_BACKEND"); static KSldApp * s_instance = nullptr; KSldApp* KSldApp::self() { if (!s_instance) { s_instance = new KSldApp(); } return s_instance; } KSldApp::KSldApp(QObject * parent) : QObject(parent) , m_lockState(Unlocked) , m_lockProcess(nullptr) , m_lockWindow(nullptr) , m_waylandServer(new WaylandServer(this)) - , m_waylandDisplay(nullptr) , m_lockedTimer(QElapsedTimer()) , m_idleId(0) , m_lockGrace(0) , m_inGraceTime(false) , m_graceTimer(new QTimer(this)) , m_inhibitCounter(0) , m_logind(nullptr) , m_greeterEnv(QProcessEnvironment::systemEnvironment()) , m_powerManagementInhibition(new PowerManagementInhibition(this)) { m_isX11 = QX11Info::isPlatformX11(); m_isWayland = QCoreApplication::instance()->property("platformName").toString().startsWith( QLatin1String("wayland"), Qt::CaseInsensitive); } KSldApp::~KSldApp() { } static int s_XTimeout; static int s_XInterval; static int s_XBlanking; static int s_XExposures; void KSldApp::cleanUp() { if (m_lockProcess && m_lockProcess->state() != QProcess::NotRunning) { m_lockProcess->terminate(); } delete m_lockProcess; delete m_lockWindow; // Restore X screensaver parameters XSetScreenSaver(QX11Info::display(), s_XTimeout, s_XInterval, s_XBlanking, s_XExposures); } static bool s_graceTimeKill = false; static bool s_logindExit = false; static bool hasXInput() { #ifdef X11_Xinput_FOUND Display *dpy = QX11Info::display(); int xi_opcode, event, error; // init XInput extension if (!XQueryExtension(dpy, "XInputExtension", &xi_opcode, &event, &error)) { return false; } // verify that the XInput extension is at at least version 2.0 int major = 2, minor = 0; int result = XIQueryVersion(dpy, &major, &minor); if (result == BadImplementation) { // Xinput 2.2 returns BadImplementation if checked against 2.0 major = 2; minor = 2; return XIQueryVersion(dpy, &major, &minor) == Success; } return result == Success; #else return false; #endif } void KSldApp::initializeX11() { m_hasXInput2 = hasXInput(); // Save X screensaver parameters XGetScreenSaver(QX11Info::display(), &s_XTimeout, &s_XInterval, &s_XBlanking, &s_XExposures); // And disable it. The internal X screensaver is not used at all, but we use its // internal idle timer (and it is also used by DPMS support in X). This timer must not // be altered by this code, since e.g. resetting the counter after activating our // screensaver would prevent DPMS from activating. We use the timer merely to detect // user activity. XSetScreenSaver(QX11Info::display(), 0, s_XInterval, s_XBlanking, s_XExposures); } void KSldApp::initialize() { if (m_isX11) { initializeX11(); } // Global keys if (KAuthorized::authorizeAction(QStringLiteral("lock_screen"))) { qDebug() << "Configuring Lock Action"; QAction *a = new QAction(this); a->setObjectName(QStringLiteral("Lock Session")); a->setProperty("componentName", QStringLiteral("ksmserver")); a->setText(i18n("Lock Session")); KGlobalAccel::self()->setGlobalShortcut(a, KScreenSaverSettings::defaultShortcuts()); connect(a, &QAction::triggered, this, [this]() { lock(EstablishLock::Immediate); } ); } // idle support auto idleTimeSignal = static_cast(&KIdleTime::timeoutReached); connect(KIdleTime::instance(), idleTimeSignal, this, [this](int identifier) { if (identifier != m_idleId) { // not our identifier return; } if (lockState() != Unlocked) { return; } if (m_inhibitCounter // either we got a direct inhibit request thru our outdated o.f.Screensaver iface ... || isFdoPowerInhibited()) { // ... or the newer one at o.f.PowerManagement.Inhibit // there is at least one process blocking the auto lock of screen locker return; } if (m_lockGrace) { // short-circuit if grace time is zero m_inGraceTime = true; } else if (m_lockGrace == -1) { m_inGraceTime = true; // if no timeout configured, grace time lasts forever } lock(EstablishLock::Delayed); } ); m_lockProcess = new QProcess(); m_lockProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel); m_lockProcess->setReadChannel(QProcess::StandardOutput); auto finishedSignal = static_cast(&QProcess::finished); connect(m_lockProcess, finishedSignal, this, [this](int exitCode, QProcess::ExitStatus exitStatus) { - qDebug() << "Greeter process exitted with status:" << exitStatus << "exit code:" << exitCode; - if (m_isWayland && m_waylandDisplay && m_greeterClientConnection) { - m_greeterClientConnection->destroy(); - } - const bool regularExit = !exitCode && exitStatus == QProcess::NormalExit; if (regularExit || s_graceTimeKill || s_logindExit) { // unlock process finished successfully - we can remove the lock grab if (regularExit) { qDebug() << "Unlocking now on regular exit."; } else if (s_graceTimeKill) { qDebug() << "Unlocking anyway due to grace time."; } else { Q_ASSERT(s_logindExit); qDebug() << "Unlocking anyway since forced through logind."; } s_graceTimeKill = false; s_logindExit = false; doUnlock(); return; } qWarning() << "Greeter process exit unregular. Restarting lock."; m_greeterCrashedCounter++; if (m_greeterCrashedCounter < 4) { // Perhaps it crashed due to a graphics driver issue, force software rendering now qDebug("Trying to lock again with software rendering (%d/4).", m_greeterCrashedCounter); setForceSoftwareRendering(true); startLockProcess(EstablishLock::Immediate); } else if (m_lockWindow) { qWarning("Everything else failed. Need to put Greeter in emergency mode."); m_lockWindow->emergencyShow(); } else { qCritical("Greeter process exitted and we could in no way recover from that!"); } } ); connect(m_lockProcess, &QProcess::errorOccurred, this, [this](QProcess::ProcessError error) { if (error == QProcess::FailedToStart) { qDebug() << "Greeter Process failed to start. Trying to directly unlock again."; doUnlock(); m_waylandServer->stop(); qCritical() << "Greeter Process not available"; } else { qWarning() << "Greeter Process encountered an unhandled error:" << error; } } ); m_lockedTimer.invalidate(); m_graceTimer->setSingleShot(true); connect(m_graceTimer, &QTimer::timeout, this, &KSldApp::endGraceTime); // create our D-Bus interface new Interface(this); // connect to logind m_logind = new LogindIntegration(this); connect(m_logind, &LogindIntegration::requestLock, this, [this]() { lock(EstablishLock::Immediate); } ); connect(m_logind, &LogindIntegration::requestUnlock, this, [this]() { if (lockState() == Locked || lockState() == AcquiringLock) { if (m_lockProcess->state() != QProcess::NotRunning) { s_logindExit = true; m_lockProcess->terminate(); } else { doUnlock(); } } } ); connect(m_logind, &LogindIntegration::prepareForSleep, this, [this](bool goingToSleep) { if (!goingToSleep) { // not interested in doing anything on wakeup return; } if (KScreenSaverSettings::lockOnResume()) { lock(EstablishLock::Immediate); } } ); connect(m_logind, &LogindIntegration::inhibited, this, [this]() { // if we are already locked, we immediately remove the inhibition lock if (m_lockState == KSldApp::Locked) { m_logind->uninhibit(); } } ); connect(m_logind, &LogindIntegration::connectedChanged, this, [this]() { if (m_logind->isConnected() && m_lockState == ScreenLocker::KSldApp::Unlocked && KScreenSaverSettings::lockOnResume()) { m_logind->inhibit(); } } ); connect(this, &KSldApp::locked, this, [this]() { m_logind->uninhibit(); if (m_lockGrace > 0 && m_inGraceTime) { m_graceTimer->start(m_lockGrace); } } ); connect(this, &KSldApp::unlocked, this, [this]() { if (KScreenSaverSettings::lockOnResume()) { m_logind->inhibit(); } } ); m_globalAccel = new GlobalAccel(this); connect(this, &KSldApp::locked, m_globalAccel, &GlobalAccel::prepare); connect(this, &KSldApp::unlocked, m_globalAccel, &GlobalAccel::release); // fallback for non-logind systems: // connect to signal emitted by Solid. This is emitted unconditionally also on logind enabled systems // ksld ignores it in case logind is used QDBusConnection::sessionBus().connect(QStringLiteral("org.kde.Solid.PowerManagement"), QStringLiteral("/org/kde/Solid/PowerManagement/Actions/SuspendSession"), QStringLiteral("org.kde.Solid.PowerManagement.Actions.SuspendSession"), QStringLiteral("aboutToSuspend"), this, SLOT(solidSuspend())); configure(); } void KSldApp::configure() { KScreenSaverSettings::self()->load(); // idle support if (m_idleId) { KIdleTime::instance()->removeIdleTimeout(m_idleId); m_idleId = 0; } const int timeout = KScreenSaverSettings::timeout(); // screen saver enabled means there is an auto lock timer // timeout > 0 is for backwards compatibility with old configs if (KScreenSaverSettings::autolock() && timeout > 0) { // timeout stored in minutes m_idleId = KIdleTime::instance()->addIdleTimeout(timeout*1000*60); } if (KScreenSaverSettings::lock()) { // lockGrace is stored in seconds m_lockGrace = KScreenSaverSettings::lockGrace() * 1000; } else { m_lockGrace = -1; } if (m_logind && m_logind->isConnected()) { if (KScreenSaverSettings::lockOnResume() && !m_logind->isInhibited()) { m_logind->inhibit(); } else if (!KScreenSaverSettings::lockOnResume() && m_logind->isInhibited()) { m_logind->uninhibit(); } } } void KSldApp::lock(EstablishLock establishLock, int attemptCount) { if (lockState() != Unlocked) { // already locked or acquiring lock, no need to lock again // but make sure it's really locked endGraceTime(); if (establishLock == EstablishLock::Immediate) { // signal the greeter to switch to immediateLock mode kill(m_lockProcess->pid(), SIGUSR1); } return; } if (attemptCount == 0) { emit aboutToLock(); } qDebug() << "lock called"; if (!establishGrab()) { if (attemptCount < 3) { qWarning() << "Could not establish screen lock. Trying again in 10ms"; QTimer::singleShot(10, this, [=]() { lock(establishLock, attemptCount+1); }); } else { qCritical() << "Could not establish screen lock"; } return; } KNotification::event(QStringLiteral("locked"), i18n("Screen locked"), QPixmap(), nullptr, KNotification::CloseOnTimeout, QStringLiteral("ksmserver")); // blank the screen showLockWindow(); m_lockState = AcquiringLock; setForceSoftwareRendering(false); // start unlock screen process startLockProcess(establishLock); emit lockStateChanged(); } /* * Forward declarations: * Only called from KSldApp::establishGrab(). Using from somewhere else is incorrect usage! **/ static bool grabKeyboard(); static bool grabMouse(); class XServerGrabber { public: XServerGrabber() { xcb_grab_server(QX11Info::connection()); } ~XServerGrabber() { xcb_ungrab_server(QX11Info::connection()); xcb_flush(QX11Info::connection()); } }; bool KSldApp::establishGrab() { + if (m_isWayland) { + return m_waylandFd >= 0; + } if (!m_isX11) { return true; } XSync(QX11Info::display(), False); XServerGrabber serverGrabber; if (!grabKeyboard()) { return false; } if (!grabMouse()) { XUngrabKeyboard(QX11Info::display(), CurrentTime); XFlush(QX11Info::display()); return false; } #ifdef X11_Xinput_FOUND if (m_hasXInput2) { // get all devices Display *dpy = QX11Info::display(); int numMasters; XIDeviceInfo *masters = XIQueryDevice(dpy, XIAllMasterDevices, &numMasters); bool success = true; for (int i = 0; i < numMasters; ++i) { // ignoring core pointer and core keyboard as we already grabbed them if (qstrcmp(masters[i].name, "Virtual core pointer") == 0) { continue; } if (qstrcmp(masters[i].name, "Virtual core keyboard") == 0) { continue; } XIEventMask mask; uchar bitmask[] = { 0, 0 }; mask.deviceid = masters[i].deviceid; mask.mask = bitmask; mask.mask_len = sizeof(bitmask); XISetMask(bitmask, XI_ButtonPress); XISetMask(bitmask, XI_ButtonRelease); XISetMask(bitmask, XI_Motion); XISetMask(bitmask, XI_Enter); XISetMask(bitmask, XI_Leave); const int result = XIGrabDevice(dpy, masters[i].deviceid, QX11Info::appRootWindow(), XCB_TIME_CURRENT_TIME, XCB_CURSOR_NONE, XIGrabModeAsync, XIGrabModeAsync, True, &mask); if (result != XIGrabSuccess) { success = false; break; } } if (!success) { // ungrab all devices again for (int i = 0; i < numMasters; ++i) { XIUngrabDevice(dpy, masters[i].deviceid, XCB_TIME_CURRENT_TIME); } xcb_connection_t *c = QX11Info::connection(); xcb_ungrab_keyboard(c, XCB_CURRENT_TIME); xcb_ungrab_pointer(c, XCB_CURRENT_TIME); } XIFreeDeviceInfo(masters); XFlush(dpy); return success; } #endif return true; } static bool grabKeyboard() { int rv = XGrabKeyboard( QX11Info::display(), QX11Info::appRootWindow(), True, GrabModeAsync, GrabModeAsync, CurrentTime ); return (rv == GrabSuccess); } static bool grabMouse() { #define GRABEVENTS ButtonPressMask | ButtonReleaseMask | PointerMotionMask | \ EnterWindowMask | LeaveWindowMask int rv = XGrabPointer( QX11Info::display(), QX11Info::appRootWindow(), True, GRABEVENTS, GrabModeAsync, GrabModeAsync, None, None, CurrentTime ); #undef GRABEVENTS return (rv == GrabSuccess); } void KSldApp::doUnlock() { qDebug() << "Grab Released"; if (m_isX11) { xcb_connection_t *c = QX11Info::connection(); xcb_ungrab_keyboard(c, XCB_CURRENT_TIME); xcb_ungrab_pointer(c, XCB_CURRENT_TIME); xcb_flush(c); #ifdef X11_Xinput_FOUND if (m_hasXInput2) { // get all devices Display *dpy = QX11Info::display(); int numMasters; XIDeviceInfo *masters = XIQueryDevice(dpy, XIAllMasterDevices, &numMasters); // ungrab all devices again for (int i = 0; i < numMasters; ++i) { XIUngrabDevice(dpy, masters[i].deviceid, XCB_TIME_CURRENT_TIME); } XIFreeDeviceInfo(masters); XFlush(dpy); } #endif } hideLockWindow(); // delete the window again, to get rid of event filter delete m_lockWindow; m_lockWindow = nullptr; m_lockState = Unlocked; m_lockedTimer.invalidate(); m_greeterCrashedCounter = 0; endGraceTime(); m_waylandServer->stop(); KNotification::event(QStringLiteral("unlocked"), i18n("Screen unlocked"), QPixmap(), nullptr, KNotification::CloseOnTimeout, QStringLiteral("ksmserver")); emit unlocked(); emit lockStateChanged(); } bool KSldApp::isFdoPowerInhibited() const { return m_powerManagementInhibition->isInhibited(); } +void KSldApp::setWaylandFd(int fd) +{ + m_waylandFd = fd; +} + void KSldApp::startLockProcess(EstablishLock establishLock) { QProcessEnvironment env = m_greeterEnv; - if (m_isWayland && m_waylandDisplay) { - int sx[2]; - if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sx) < 0) { - qWarning() << "Can not create socket"; - emit m_lockProcess->errorOccurred(QProcess::FailedToStart); - return; - } - m_greeterClientConnection = m_waylandDisplay->createClient(sx[0]); - connect(m_greeterClientConnection, &QObject::destroyed, this, - [this] (QObject *destroyedObject) { - if (destroyedObject != m_greeterClientConnection) { - return; - } - m_greeterClientConnection = nullptr; - emit greeterClientConnectionChanged(); - } - ); - emit greeterClientConnectionChanged(); - int socket = dup(sx[1]); + if (m_isWayland && m_waylandFd >= 0) { + int socket = dup(m_waylandFd); if (socket >= 0) { env.insert(QStringLiteral("WAYLAND_SOCKET"), QString::number(socket)); } } + QStringList args; if (establishLock == EstablishLock::Immediate) { args << QStringLiteral("--immediateLock"); } if (establishLock == EstablishLock::DefaultToSwitchUser) { args << QStringLiteral("--immediateLock"); args << QStringLiteral("--switchuser"); } if (m_lockGrace > 0) { args << QStringLiteral("--graceTime"); args << QString::number(m_lockGrace); } if (m_lockGrace == -1) { args << QStringLiteral("--nolock"); } if (m_forceSoftwareRendering) { env.insert(s_qtQuickBackend, QStringLiteral("software")); } // start the Wayland server int fd = m_waylandServer->start(); if (fd == -1) { qWarning() << "Could not start the Wayland server."; emit m_lockProcess->errorOccurred(QProcess::FailedToStart); return; } args << QStringLiteral("--ksldfd"); args << QString::number(fd); m_lockProcess->setProcessEnvironment(env); m_lockProcess->start(QStringLiteral(KSCREENLOCKER_GREET_BIN), args); close(fd); } +void KSldApp::userActivity() +{ + if (isGraceTime()) { + unlock(); + } + if (m_lockWindow) { + m_lockWindow->userActivity(); + } +} + void KSldApp::showLockWindow() { if (!m_lockWindow) { if (m_isX11) { m_lockWindow = new X11Locker(this); + + connect(m_lockWindow, &AbstractLocker::userActivity, m_lockWindow, + [this]() { + if (isGraceTime()) { + unlock(); + } + }, + Qt::QueuedConnection + ); } + if (m_isWayland) { - m_lockWindow = new WaylandLocker(m_waylandDisplay, this); + m_lockWindow = new WaylandLocker(this); } if (!m_lockWindow) { return; } m_lockWindow->setGlobalAccel(m_globalAccel); - connect(m_lockWindow, &AbstractLocker::userActivity, m_lockWindow, - [this]() { - if (isGraceTime()) { - unlock(); - } - }, - Qt::QueuedConnection - ); + connect(m_lockWindow, &AbstractLocker::lockWindowShown, m_lockWindow, [this] { lockScreenShown(); } , Qt::QueuedConnection); + connect(m_waylandServer, &WaylandServer::x11WindowAdded, m_lockWindow, &AbstractLocker::addAllowedWindow); } m_lockWindow->showLockWindow(); if (m_isX11) { XSync(QX11Info::display(), False); } } void KSldApp::hideLockWindow() { if (!m_lockWindow) { return; } m_lockWindow->hideLockWindow(); } uint KSldApp::activeTime() const { if (m_lockedTimer.isValid()) { return m_lockedTimer.elapsed(); } return 0; } bool KSldApp::isGraceTime() const { return m_inGraceTime; } void KSldApp::endGraceTime() { m_graceTimer->stop(); m_inGraceTime = false; } void KSldApp::unlock() { if (!isGraceTime()) { return; } s_graceTimeKill = true; m_lockProcess->terminate(); } void KSldApp::inhibit() { ++m_inhibitCounter; } void KSldApp::uninhibit() { --m_inhibitCounter; } void KSldApp::solidSuspend() { // ignore in case that we use logind if (m_logind && m_logind->isConnected()) { return; } if (KScreenSaverSettings::lockOnResume()) { lock(EstablishLock::Immediate); } } -void KSldApp::setWaylandDisplay(KWayland::Server::Display *display) -{ - if (m_waylandDisplay != display) { - m_waylandDisplay = display; - } -} - void KSldApp::lockScreenShown() { if (m_lockState == Locked) { return; } m_lockState = Locked; m_lockedTimer.restart(); emit locked(); emit lockStateChanged(); } void KSldApp::setGreeterEnvironment(const QProcessEnvironment &env) { m_greeterEnv = env; if (m_isWayland) { m_greeterEnv.insert(QStringLiteral("QT_QPA_PLATFORM"), QStringLiteral("wayland")); } } bool KSldApp::event(QEvent *event) { if (m_globalAccel && event->type() == QEvent::KeyPress) { if (m_globalAccel->keyEvent(static_cast(event))) { event->setAccepted(true); } } return false; } } // namespace diff --git a/ksldapp.h b/ksldapp.h index 6553153..02e2640 100644 --- a/ksldapp.h +++ b/ksldapp.h @@ -1,204 +1,194 @@ /******************************************************************** KSld - the KDE Screenlocker Daemon This file is part of the KDE project. Copyright 1999 Martin R. Jones Copyright 2003 Oswald Buddenhagen Copyright 2008 Chani Armitage Copyright (C) 2011 Martin Gräßlin This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . *********************************************************************/ #ifndef SCREENLOCKER_KSLDAPP_H #define SCREENLOCKER_KSLDAPP_H #include #include #include // forward declarations class GlobalAccel; class LogindIntegration; class QTimer; class KSldTest; class PowerManagementInhibition; -namespace KWayland -{ -namespace Server { -class Display; -class ClientConnection; -} -} - namespace ScreenLocker { enum class EstablishLock { Immediate, ///Require password from the start. Use if invoked explicitly by the user Delayed, ///Allow the user to log back in without a password for a configured grace time. DefaultToSwitchUser ///UI should default to showing the "switch user dialog" }; class AbstractLocker; class WaylandServer; class KSCREENLOCKER_EXPORT KSldApp : public QObject { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.ksld.App") Q_ENUMS(LockState) public: enum LockState { Unlocked, AcquiringLock, Locked }; static KSldApp* self(); explicit KSldApp(QObject * parent = nullptr); ~KSldApp() override; LockState lockState() const { return m_lockState; } /** * @returns the number of milliseconds passed since the screen has been locked. **/ uint activeTime() const; void configure(); + void userActivity(); bool isGraceTime() const; - void setWaylandDisplay(KWayland::Server::Display *display); + void setWaylandFd(int fd); - KWayland::Server::ClientConnection *greeterClientConnection() const { - return m_greeterClientConnection; - } void setGreeterEnvironment(const QProcessEnvironment &env); /** * Can be used by the lock window to remove the lock during grace time. **/ void unlock(); void inhibit(); void uninhibit(); void lock(EstablishLock establishLock, int attemptCount = 0); void initialize(); bool event(QEvent *event) override; /** * For testing * @internal **/ int idleId() const { return m_idleId; } /** * For testing * @internal **/ void setIdleId(int idleId) { m_idleId = idleId; } /** * For testing * @internal **/ void setGraceTime(int msec) { m_lockGrace = msec; } bool forceSoftwareRendering() const { return m_forceSoftwareRendering; } void setForceSoftwareRendering(bool force) { m_forceSoftwareRendering = force; } Q_SIGNALS: void aboutToLock(); void locked(); void unlocked(); - void greeterClientConnectionChanged(); void lockStateChanged(); private Q_SLOTS: void cleanUp(); void endGraceTime(); void solidSuspend(); public Q_SLOTS: void lockScreenShown(); private: void initializeX11(); bool establishGrab(); void startLockProcess(EstablishLock establishLock); void showLockWindow(); void hideLockWindow(); void doUnlock(); bool isFdoPowerInhibited() const; LockState m_lockState; QProcess *m_lockProcess; AbstractLocker *m_lockWindow; WaylandServer *m_waylandServer; - KWayland::Server::Display *m_waylandDisplay; - KWayland::Server::ClientConnection *m_greeterClientConnection; + /** * Timer to measure how long the screen is locked. * This information is required by DBus Interface. **/ QElapsedTimer m_lockedTimer; int m_idleId; /** * Number of milliseconds after locking in which user activity will result in screen being * unlocked without requiring a password. **/ int m_lockGrace; /** * Controls whether user activity may remove the lock. Only enabled after idle timeout. **/ bool m_inGraceTime; /** * Grace time ends when timer expires. **/ QTimer *m_graceTimer; int m_inhibitCounter; LogindIntegration *m_logind; GlobalAccel *m_globalAccel = nullptr; bool m_hasXInput2 = false; bool m_forceSoftwareRendering = false; bool m_isX11; bool m_isWayland; int m_greeterCrashedCounter = 0; QProcessEnvironment m_greeterEnv; PowerManagementInhibition *m_powerManagementInhibition; + int m_waylandFd = -1; + // for auto tests friend KSldTest; }; } // namespace #endif // SCREENLOCKER_KSLDAPP_H diff --git a/waylandlocker.cpp b/waylandlocker.cpp index fb6c5de..a0977f3 100644 --- a/waylandlocker.cpp +++ b/waylandlocker.cpp @@ -1,86 +1,79 @@ /******************************************************************** KSld - the KDE Screenlocker Daemon This file is part of the KDE project. Copyright (C) 2015 Bhushan Shah This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . *********************************************************************/ #include "waylandlocker.h" #include #include -#include -#include - namespace ScreenLocker { -WaylandLocker::WaylandLocker(KWayland::Server::Display *display, QObject *parent) +WaylandLocker::WaylandLocker(QObject *parent) : AbstractLocker(parent) { - const auto seats = display->seats(); - for (auto s : seats) { - connect(s, &KWayland::Server::SeatInterface::timestampChanged, this, &WaylandLocker::userActivity); - } if (m_background) { updateGeometryOfBackground(); const auto screens = qApp->screens(); for (auto s : screens) { connect(s, &QScreen::geometryChanged, this, &WaylandLocker::updateGeometryOfBackground); } connect(qApp, &QGuiApplication::screenAdded, this, [this] (QScreen *s) { connect(s, &QScreen::geometryChanged, this, &WaylandLocker::updateGeometryOfBackground); updateGeometryOfBackground(); } ); connect(qApp, &QGuiApplication::screenRemoved, this, &WaylandLocker::updateGeometryOfBackground); } } WaylandLocker::~WaylandLocker() { } void WaylandLocker::updateGeometryOfBackground() { QRect combined; const auto screens = qApp->screens(); for (auto s : screens) { combined = combined.united(s->geometry()); } m_background->setGeometry(combined); m_background->update(); } void WaylandLocker::showLockWindow() { } void WaylandLocker::hideLockWindow() { } void WaylandLocker::addAllowedWindow(quint32 window) { } void WaylandLocker::stayOnTop() { } } diff --git a/waylandlocker.h b/waylandlocker.h index ca7a8d1..3fa8783 100644 --- a/waylandlocker.h +++ b/waylandlocker.h @@ -1,58 +1,58 @@ /******************************************************************** KSld - the KDE Screenlocker Daemon This file is part of the KDE project. Copyright (C) 2015 Bhushan Shah This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . *********************************************************************/ #ifndef WAYLANDLOCKER_H #define WAYLANDLOCKER_H #include "abstractlocker.h" namespace KWayland { namespace Server { class Display; } } namespace ScreenLocker { class WaylandLocker : public AbstractLocker { Q_OBJECT public: - WaylandLocker(KWayland::Server::Display *display, QObject *parent); + WaylandLocker(QObject *parent); ~WaylandLocker() override; void showLockWindow() override; void hideLockWindow() override; void addAllowedWindow(quint32 window) override; private: void stayOnTop() override; void updateGeometryOfBackground(); }; } #endif // WAYLANDLOCKER_H