mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 16:50:41 +01:00
* fix(portal): establish locked desktop control before capture * test(portal): preserve v4 pixel inventory after deferred capture settings * fix(control): refresh lock state after viewer Echo handshake * fix(portal): announce desktop target before locked capture wait * ci: run the desktop_power native test under ASan/UBSan Co-Authored-By: Claude Sonnet 5.5 <[email protected]> * input: skip the Portal release sweep while no session is bound The first locked connection creates its peer before any Portal exists; the sweep then logged two failed injections and a 'reset incomplete' warning for nothing. Co-Authored-By: Claude Sonnet 5.5 <[email protected]> * docs: describe locked cold connections, auto unlock limits and iPhone status Co-Authored-By: Claude Sonnet 5.5 <[email protected]> * fix(portal): treat a cached screen with a closed Portal session as not ready begin() now marks the state as waiting when the cached session is dead, and permission/video/clipboard consumers honor it instead of reporting Allow and starting the stale video path before maintain() has rebuilt capture. Co-Authored-By: Claude Sonnet 5.5 <[email protected]> * fix(portal): gate input on a ready desktop and share recovery backoff Input dispatch kept only the cached screen and dropped State.waiting, so a closed Portal passed the gate once the screen unlocked. The supervisor's recover() and the encoder's stream-loss recovery now share failure backoff and a terminal-denial flag, so a denied consent is not re-prompted by the other path. Co-Authored-By: Claude Sonnet 5.5 <[email protected]> * fix(control): keep unknown lock state unlocked, stop waits on Closing, never drop capture settings - QuerySystemState with no logind lock state (Xvfb/linger) reports unlocked as before. - The Portal wait loop also exits while the channel is Closing. - Capture-setting requests back-pressure instead of try_send dropping the latest setting. Co-Authored-By: Claude Opus 5.5 <[email protected]> --------- Co-authored-by: Claude Sonnet 5.5 <[email protected]> Co-authored-by: VallierDev <[email protected]>
102 lines
3.3 KiB
Rust
102 lines
3.3 KiB
Rust
//! Small GNOME-only display wake and idle-inhibition bridge.
|
|
|
|
#[cfg(all(target_os = "linux", feature = "portal"))]
|
|
mod native {
|
|
use std::{ffi::c_void, ptr::NonNull};
|
|
|
|
extern "C" {
|
|
fn uu_desktop_power_wake() -> i32;
|
|
fn uu_desktop_idle_inhibitor_acquire(error: *mut i32) -> *mut c_void;
|
|
fn uu_desktop_idle_inhibitor_release(inhibitor: *mut c_void);
|
|
}
|
|
|
|
pub struct Handle(NonNull<c_void>);
|
|
|
|
// GDBusConnection is thread-safe; the C handle is only used by its single Drop call.
|
|
unsafe impl Send for Handle {}
|
|
|
|
impl Handle {
|
|
pub fn acquire() -> Result<Self, String> {
|
|
let mut error = 0;
|
|
let pointer = unsafe { uu_desktop_idle_inhibitor_acquire(&mut error) };
|
|
NonNull::new(pointer).map(Self).ok_or_else(|| super::error("idle inhibition", error))
|
|
}
|
|
|
|
pub fn wake() -> Result<(), String> {
|
|
super::check("display wake", unsafe { uu_desktop_power_wake() })
|
|
}
|
|
}
|
|
|
|
impl Drop for Handle {
|
|
fn drop(&mut self) {
|
|
unsafe { uu_desktop_idle_inhibitor_release(self.0.as_ptr()) }
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Set GNOME's display power-save mode to on. This does not unlock the session or change
|
|
/// lock-screen policy. Session-bus setup and each method call are bounded to three seconds.
|
|
pub fn wake() -> Result<(), String> {
|
|
if !gnome_portal_active() {
|
|
return Ok(());
|
|
}
|
|
#[cfg(all(target_os = "linux", feature = "portal"))]
|
|
{
|
|
native::Handle::wake()
|
|
}
|
|
#[cfg(not(all(target_os = "linux", feature = "portal")))]
|
|
{
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
/// Holds a GNOME SessionManager idle-only inhibitor until dropped.
|
|
///
|
|
/// Acquire and drop perform blocking D-Bus work. Session-bus setup and each method call are
|
|
/// bounded to three seconds. Callers on an async runtime should move both operations to a
|
|
/// blocking worker.
|
|
pub struct IdleInhibitor {
|
|
#[cfg(all(target_os = "linux", feature = "portal"))]
|
|
_handle: Option<native::Handle>,
|
|
}
|
|
|
|
impl IdleInhibitor {
|
|
pub fn acquire() -> Result<Self, String> {
|
|
if !gnome_portal_active() {
|
|
return Ok(Self {
|
|
#[cfg(all(target_os = "linux", feature = "portal"))]
|
|
_handle: None,
|
|
});
|
|
}
|
|
#[cfg(all(target_os = "linux", feature = "portal"))]
|
|
{
|
|
native::Handle::acquire().map(|handle| Self { _handle: Some(handle) })
|
|
}
|
|
#[cfg(not(all(target_os = "linux", feature = "portal")))]
|
|
{
|
|
Ok(Self {})
|
|
}
|
|
}
|
|
}
|
|
|
|
fn gnome_portal_active() -> bool {
|
|
let gnome = std::env::var("XDG_CURRENT_DESKTOP").unwrap_or_default().split(':')
|
|
.any(|desktop| desktop.eq_ignore_ascii_case("gnome"));
|
|
gnome && crate::desktop_backend::detect().is_ok_and(|backend| backend == crate::desktop_backend::DesktopBackend::Portal)
|
|
}
|
|
|
|
#[cfg(all(target_os = "linux", feature = "portal"))]
|
|
fn check(operation: &str, code: i32) -> Result<(), String> {
|
|
if code == 0 { Ok(()) } else { Err(error(operation, code)) }
|
|
}
|
|
|
|
#[cfg(all(target_os = "linux", feature = "portal"))]
|
|
fn error(operation: &str, code: i32) -> String {
|
|
let reason = match code {
|
|
1 => "session D-Bus unavailable",
|
|
2 => "GNOME D-Bus operation failed",
|
|
_ => "GNOME D-Bus operation failed",
|
|
};
|
|
format!("{operation}: {reason} (code {code})")
|
|
}
|