Skip to content

fix(session): start one lockscreen at a time #19

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

Open
perlowja wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(session): start one lockscreen at a time #19

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
18 changes: 17 additions & 1 deletion src/system/session_manager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,28 @@ namespace Singularity {
*/
public signal void session_ending();

private Subprocess? lockscreen_process = null;

public bool locked { get; private set; default = false; }

public void lock_screen() {
if (lockscreen_process != null) return;

// 1. Native singularity-lockscreen (ext-session-lock-v1 + PAM)
string? lockscreen = find_singularity_binary("singularity-lockscreen");
if (lockscreen != null) {
try {
Process.spawn_command_line_async(lockscreen);
var process = new Subprocess(SubprocessFlags.NONE, lockscreen);
lockscreen_process = process;
locked = true;
process.wait_async.begin(null, (obj, res) => {
try {
process.wait_async.end(res);
} catch (Error e) { }
if (lockscreen_process != process) return;
lockscreen_process = null;
locked = false;
});
return;
} catch (Error e) {
warning("singularity-lockscreen failed: %s", e.message);
Expand Down
28 changes: 28 additions & 0 deletions tests/power_test.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,33 @@ private void test_charge_limit() {
assert(replaced.charge_limit_available);
}

private void test_lock_screen_single_instance() {
string count = Path.build_filename(fixture_root, "lock-starts");
string release = Path.build_filename(fixture_root, "lock-release");
script("singularity-lockscreen",
"echo x >> '%s'\nwhile [ ! -e '%s' ]; do sleep 0.05; done\n".printf(count, release));
Environment.set_variable("PATH",
Path.build_filename(fixture_root, "bin") + ":" + (Environment.get_variable("PATH") ?? "/usr/bin:/bin"), true);

var session = Singularity.SessionManager.get_default();
session.lock_screen();
session.lock_screen();
assert(session.locked);
wait_for(() => read_file(count) != "");
assert(read_file(count) == "x");

write_file(release, "");
wait_for(() => !session.locked);
assert(!session.locked);
FileUtils.remove(release);

session.lock_screen();
wait_for(() => read_file(count) == "x\nx");
assert(read_file(count) == "x\nx");
write_file(release, "");
wait_for(() => !session.locked);
}

public static int main(string[] args) {
Test.init(ref args);
try {
Expand All @@ -238,5 +265,6 @@ public static int main(string[] args) {
Test.add_func("/power/command-suspend", test_command_suspend);
Test.add_func("/power/battery-scan", test_battery_scan);
Test.add_func("/power/charge-limit", test_charge_limit);
Test.add_func("/power/lock-screen-single-instance", test_lock_screen_single_instance);
return Test.run();
}
Loading