vinzenz/nova-shell
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

extract logind integration into LockService singleton in services/

Browse source
This commit is contained in:
Damocles 2026-04-18 10:06:22 +02:00
parent 5248261975
commit a1c581e443
3 changed files with 101 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

71
shell/lock/Lock.qml
View file

@ -1,15 +1,11 @@
import QtQuick
import Quickshell
import Quickshell.Io
import Quickshell.Wayland
import "../services" as S
Scope {
id: root
readonly property bool _enabled: S.Modules.lock.enable
property string _sessionPath: ""
WlSessionLock {
id: _lock
@ -24,73 +20,30 @@ Scope {
lock: _lock
}
// Resolve the actual logind session object path at startup
Process {
id: _sessionResolver
command: ["busctl", "call", "--system", "org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", "GetSession", "s", "auto"]
running: root._enabled
Connections {
target: S.LockService
stdout: SplitParser {
onRead: data => {
// Output: o "/org/freedesktop/login1/session/_32"
const match = data.match(/"([^"]+)"/);
if (match)
root._sessionPath = match[1];
}
function onLockRequested() {
if (S.LockService.enabled)
_lock.locked = true;
}
onExited: {
if (root._sessionPath) {
_logindMonitor.running = true;
_lockStateCheck.running = true;
}
function onUnlockRequested() {
if (_lock.locked)
_lock.locked = false;
}
}
// Listen for logind Lock/Unlock signals via gdbus monitor.
// TODO: replace with native D-Bus integration when nova-stats becomes a quickshell plugin
Process {
id: _logindMonitor
command: ["gdbus", "monitor", "--system", "--dest", "org.freedesktop.login1", "--object-path", root._sessionPath]
running: false
stdout: SplitParser {
onRead: data => {
if (data.indexOf(".Lock ()") !== -1 && root._enabled)
_lock.locked = true;
else if (data.indexOf(".Unlock ()") !== -1 && _lock.locked)
_lock.locked = false;
}
function onSessionLocked() {
if (S.LockService.enabled && !_lock.locked)
_lock.locked = true;
}
}
// Check if session is already locked on startup (crash recovery)
Process {
id: _lockStateCheck
running: false
command: ["busctl", "get-property", "--system", "org.freedesktop.login1", root._sessionPath, "org.freedesktop.login1.Session", "LockedHint"]
stdout: SplitParser {
onRead: data => {
// Output: b true/false
if (data.indexOf("true") !== -1 && root._enabled && !_lock.locked)
_lock.locked = true;
}
}
}
// Set logind LockedHint when lock state changes
Process {
id: _lockedHint
command: ["busctl", "call", "--system", "org.freedesktop.login1", root._sessionPath || "/org/freedesktop/login1/session/auto", "org.freedesktop.login1.Session", "SetLockedHint", "b", _lock.locked ? "true" : "false"]
}
Connections {
target: _lock
function onLockStateChanged() {
if (root._sessionPath)
_lockedHint.running = true;
S.LockService.setLockedHint(_lock.locked);
}
}
}