From 0296ea9cd342b1ee1bb47fb93ecf8578e6dba827 Mon Sep 17 00:00:00 2001 From: Jannis Froese Date: Wed, 21 Sep 2022 16:39:06 +0200 Subject: [PATCH] add additional default commands listed in xubuntu's xflock4 --- src/linux.rs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/linux.rs b/src/linux.rs index e80fe6f..8537927 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -8,7 +8,12 @@ struct LockCommand<'a> { args: &'a [&'a str], } -static DEFAULT_COMMANDS: [LockCommand; 6] = [ +static DEFAULT_COMMANDS: [LockCommand; 10] = [ + // xfce4-screensaver must be tried before xdg-screensaver to ensure success on XUbuntu + LockCommand { + exe: "/usr/bin/xfce4-screensaver-command", + args: &["--lock"], + }, LockCommand { exe: "/usr/bin/xdg-screensaver", args: &["lock"], @@ -21,10 +26,18 @@ static DEFAULT_COMMANDS: [LockCommand; 6] = [ exe: "/usr/bin/qdbus", args: &["org.freedesktop.ScreenSaver", "/ScreenSaver", "Lock"], }, + LockCommand { + exe: "/usr/bin/light-locker-command", + args: &["-lock"], + }, LockCommand { exe: "/usr/bin/xscreensaver-command", args: &["-lock"], }, + LockCommand { + exe: "/usr/bin/mate-screensaver-command", + args: &["--lock"], + }, LockCommand { exe: "/usr/bin/xlock", args: &["-mode", "blank"], @@ -33,6 +46,10 @@ static DEFAULT_COMMANDS: [LockCommand; 6] = [ exe: "/usr/bin/slock", args: &[], }, + LockCommand { + exe: "/usr/bin/physlock", + args: &["-d"], + }, ]; pub fn lock_screen_linux() -> Result<()> {