From 2b91e34a7256f05105b5ce26c72d2a29987d9e8b Mon Sep 17 00:00:00 2001 From: zhaoyingzhen Date: Tue, 17 Mar 2026 16:35:26 +0800 Subject: [PATCH] fix: support showing lock screen triggered by logind lock signal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Support showing the lock screen when receiving a lock signal from logind. - Use asynchronous DBus call for RequestLock to prevent blocking the main thread when locking the session, especially when switching TTY. - Introduce a boolean `m_inCallRequestLock` to prevent multiple concurrent lock requests from being sent in a short time. - 支持接收 logind 的 lock 锁定信号后，触发并显示锁屏。 - 使用异步 DBus 调用 [RequestLock](cci:1://file:///home/zyz/works/work/v25/dde-session/src/dde-session/impl/sessionmanager.cpp:418:0-434:1)，防止在锁定会话（如切换 TTY 时）阻塞主线程。 - 引入了 `m_inCallRequestLock` 标志位，防止短时间内产生多次并发的锁屏请求。 Log: support showing lock screen triggered by logind lock signal Pms: BUG-314653 --- src/dde-session/impl/sessionmanager.cpp | 36 +++++++++++++++++++------ src/dde-session/impl/sessionmanager.h | 1 + 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/dde-session/impl/sessionmanager.cpp b/src/dde-session/impl/sessionmanager.cpp index 43f1bf7..7a27f6c 100644 --- a/src/dde-session/impl/sessionmanager.cpp +++ b/src/dde-session/impl/sessionmanager.cpp @@ -16,6 +16,8 @@ #include #include #include +#include +#include #include #include @@ -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(); @@ -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() @@ -910,7 +922,7 @@ void SessionManager::handleLoginSessionLocked() { qDebug() << "login session locked." << locked(); // 在特殊情况下，比如用 dde-switchtogreeter 命令切换到 greeter, 即切换到其他 tty - // 前端(登录界面和锁屏界面)已绑定锁定信号进行了处理，此处只需更新Locked属性。 + // 此时同步的 DBus RequestLock 方法不能立即返回，需要使用异步调用避免阻塞主线程。 // 如果已经锁定，则立即返回 if (locked()) { @@ -918,8 +930,16 @@ void SessionManager::handleLoginSessionLocked() 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() diff --git a/src/dde-session/impl/sessionmanager.h b/src/dde-session/impl/sessionmanager.h index c2906e8..5d5b867 100644 --- a/src/dde-session/impl/sessionmanager.h +++ b/src/dde-session/impl/sessionmanager.h @@ -142,5 +142,6 @@ private Q_SLOTS: org::freedesktop::DBus *m_DBusInter; QMap m_inhibitorMap; + bool m_inCallRequestLock; }; #endif // SESSIONMANAGER_H