Skip to content

fix: support showing lock screen triggered by logind lock signal #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yixinshark merged 1 commit into from
Mar 17, 2026
+29 −8
Merged

fix: support showing lock screen triggered by logind lock signal #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 28 additions & 8 deletions src/dde-session/impl/sessionmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#include <QJsonDocument>
#include <QProcess>
#include <QFile>
#include <QDBusPendingCall>
#include <QDBusPendingCallWatcher>

#include <unistd.h>
#include <signal.h>
Expand Down Expand Up @@ -79,6 +81,7 @@ SessionManager::SessionManager(QObject *parent)
, m_systemd1ManagerInter(new org::freedesktop::systemd1::Manager("org.freedesktop.systemd1", "/org/freedesktop/systemd1", QDBusConnection::sessionBus(), this))
, m_DBusInter(new org::freedesktop::DBus("org.freedesktop.DBus", "/org/freedesktop/DBus", QDBusConnection::sessionBus(), this))
, m_isVM(detectVirtualMachine())
, m_inCallRequestLock(false)
{
initConnections();

Expand Down Expand Up @@ -415,11 +418,20 @@ void SessionManager::RequestHibernate()

void SessionManager::RequestLock()
{
QDBusInterface inter("org.deepin.dde.LockFront1", "/org/deepin/dde/LockFront1", "org.deepin.dde.LockFront1", QDBusConnection::sessionBus(), this);
const QDBusMessage &msg = inter.call("Show");
if (!msg.errorName().isEmpty()) {
qWarning() << "failed to lock, error: " << msg.errorMessage();
}
QDBusInterface inter("org.deepin.dde.LockFront1", "/org/deepin/dde/LockFront1", "org.deepin.dde.LockFront1", QDBusConnection::sessionBus());

// 使用异步调用方式防止当前线程阻塞
QDBusPendingCall async = inter.asyncCall("Show");
QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(async, this);
connect(watcher, &QDBusPendingCallWatcher::finished, this, [this](QDBusPendingCallWatcher *watcher) {
QDBusPendingReply<> reply = *watcher;
if (reply.isError()) {
qWarning() << "failed to lock, async error: " << reply.error().message();
}

m_inCallRequestLock = false;
watcher->deleteLater();
});
}

void SessionManager::RequestLogout()
Expand Down Expand Up @@ -910,16 +922,24 @@ void SessionManager::handleLoginSessionLocked()
{
qDebug() << "login session locked." << locked();
// 在特殊情况下，比如用 dde-switchtogreeter 命令切换到 greeter, 即切换到其他 tty
// 前端(登录界面和锁屏界面)已绑定锁定信号进行了处理，此处只需更新Locked属性。
// 此时同步的 DBus RequestLock 方法不能立即返回，需要使用异步调用避免阻塞主线程。

// 如果已经锁定，则立即返回
if (locked()) {
qDebug() << "already locked";
return;
}

m_locked = true;
emitLockChanged(true);
// 防止短时间内多次同时调用 RequestLock
if (m_inCallRequestLock) {
qDebug() << "handleLoginSessionLocked inCall is true, return";
return;
}

m_inCallRequestLock = true;

qDebug() << "handleLoginSessionLocked call RequestLock begin (async)";
RequestLock();
}

void SessionManager::handleLoginSessionUnlocked()
Expand Down
1 change: 1 addition & 0 deletions src/dde-session/impl/sessionmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,5 +142,6 @@ private Q_SLOTS:
org::freedesktop::DBus *m_DBusInter;

QMap<uint, Inhibitor *> m_inhibitorMap;
bool m_inCallRequestLock;
};
#endif // SESSIONMANAGER_H
Loading