development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

cli: fall back to screensaver api for linux no-sleep (#172353)

Browse source
This commit is contained in:
Connor Peet 2023-01-24 23:28:30 -08:00 committed by GitHub
parent e33207a306
commit 5beebeb170
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
cli/src/tunnels/nosleep_linux.rs
View file

@ -28,6 +28,18 @@ trait PMInhibitor {
fn inhibit(&self, what: &str, why: &str) -> zbus::Result<u32>;
}
/// A slightly better documented version which seems commonly used.
#[dbus_proxy(
interface = "org.freedesktop.ScreenSaver",
gen_blocking = false,
default_service = "org.freedesktop.ScreenSaver",
default_path = "/org/freedesktop/ScreenSaver"
)]
trait ScreenSaver {
#[dbus_proxy(name = "Inhibit")]
fn inhibit(&self, what: &str, why: &str) -> zbus::Result<u32>;
}
pub struct SleepInhibitor {
_connection: Connection, // Inhibition is released when the connection is closed
}
@ -38,14 +50,27 @@ impl SleepInhibitor {
.await
.map_err(|e| wrap(e, "error creating dbus session"))?;
let proxy = PMInhibitorProxy::new(&connection)
.await
.map_err(|e| wrap(e, "error getting proxy"))?;
macro_rules! try_inhibit {
($proxy:ident) => {
match $proxy::new(&connection).await {
Ok(proxy) => proxy.inhibit(APPLICATION_NAME, "running tunnel").await,
Err(e) => Err(e),
}
};
}
proxy
.inhibit(APPLICATION_NAME, "running tunnel")
.await
.map_err(|e| wrap(e, "error requesting sleep inhibition"))?;
if let Err(e1) = try_inhibit!(PMInhibitorProxy) {
if let Err(e2) = try_inhibit!(ScreenSaverProxy) {
return Err(wrap(
e2,
format!(
"error requesting sleep inhibition, pminhibitor gave {}, screensaver gave",
e1
),
)
.into());
}
}
Ok(SleepInhibitor {
_connection: connection,