lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(lock-keys): only apply sysfs LED state on successful reads

Browse Source
This commit is contained in:
Lysec
2026-03-26 15:49:15 +01:00
parent 537ec29f5e
commit 17bfd02204
2 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Services/Keyboard/LockKeysService.qml
+50 -31
View File
@@ -46,48 +46,68 @@ Singleton {
FileView {
id: fileView
path: filePath + "/brightness"
onTextChanged: () => {
// sysfs brightness can fail transiently (e.g. resume); omit console spam like other sysfs FileViews.
printErrors: false
watchChanges: false
function parseBrightnessLedOn(raw) {
var t = raw.trim();
if (t === "" || !/^[0-9]+$/.test(t))
return null;
return parseInt(t, 10) !== 0;
}
function applyLockState(kind, state, emitIfChanged) {
switch (kind) {
case "numlock":
if (emitIfChanged && root.numLockOn !== state) {
root.numLockOn = state;
root.numLockChanged(state);
Logger.i("LockKeysService", "Num Lock:", state, fileView.path);
} else if (!emitIfChanged) {
root.numLockOn = state;
}
break;
case "capslock":
if (emitIfChanged && root.capsLockOn !== state) {
root.capsLockOn = state;
root.capsLockChanged(state);
Logger.i("LockKeysService", "Caps Lock:", state, fileView.path);
} else if (!emitIfChanged) {
root.capsLockOn = state;
}
break;
case "scrolllock":
if (emitIfChanged && root.scrollLockOn !== state) {
root.scrollLockOn = state;
root.scrollLockChanged(state);
Logger.i("LockKeysService", "Scroll Lock:", state, fileView.path);
} else if (!emitIfChanged) {
root.scrollLockOn = state;
}
break;
}
}
// Only apply after a successful read — failed reloads must not update UI (empty text is not "off").
onLoaded: {
if (!fileView.isWanted)
return;
var state = fileView.parseBrightnessLedOn(fileView.text());
if (state === null)
return;
var state = !fileView.text().startsWith("0");
var kind = fileName.split("::")[1];
// First read after polling starts: sync bar/UI from sysfs without firing
// *Changed signals (OSD listens to those and would flash on startup).
if (!fileView.initialCheckDone) {
fileView.initialCheckDone = true;
switch (kind) {
case "numlock":
root.numLockOn = state;
break;
case "capslock":
root.capsLockOn = state;
break;
case "scrolllock":
root.scrollLockOn = state;
break;
}
fileView.applyLockState(kind, state, false);
return;
}
switch (kind) {
case "numlock":
root.numLockOn = state;
root.numLockChanged(state);
Logger.i("LockKeysService", "Num Lock:", state, this.path);
break;
case "capslock":
root.capsLockOn = state;
root.capsLockChanged(state);
Logger.i("LockKeysService", "Caps Lock:", state, this.path);
break;
case "scrolllock":
root.scrollLockOn = state;
root.scrollLockChanged(state);
Logger.i("LockKeysService", "Scroll Lock:", state, this.path);
break;
}
fileView.applyLockState(kind, state, true);
}
// FolderListModel only provides filters for file names, not folders
@@ -100,7 +120,6 @@ Singleton {
return true;
}
}
Logger.i("LockKeysService", "ignoring:", fileView.path);
return false;
}
Widgets/NListView.qml
+1 -1
View File
@@ -250,7 +250,7 @@ Item {
clip: true
boundsBehavior: Flickable.StopAtBounds
NumberAnimation {
id: wheelScrollAnimation
target: listView