mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-17 01:00:41 +01:00
* feat(host): KDE Wayland 被控端防窥模式(隐私 / 关屏) viewer RPC 7 打开防窥时,采集和输入切到 KWin 虚拟输出(portal ScreenCast VIRTUAL), 再用 kscreen-doctor 禁用物理屏;隐私模式随后重新启用物理屏并全屏覆盖桌面壁纸。 防窥期间通过 KWin InputDevice 禁用本地键鼠,指针/按键/文字改走 uinput (KDE 不处理虚拟输出共享上的 portal 输入)。 - privacy_type 实测:1 关闭、2 隐私(壁纸)、3 关屏;SettingMetric 4/7 上报真实状态 - 恢复记录 + privacy-guard 子进程:主机以任何方式结束(含 SIGKILL)都恢复屏幕和输入 - src/privacy_screen/ 分层:控制器/协议/记录/守护/遮挡窗口共享,桌面实现走 Backend trait(kde/) - portal:Session::set_virtual,闭包恢复按当前源重开;编码器随 portal 尺寸变化重建 Refs #140 * fix(privacy): 按 Mac 客户端协议应答防窥请求,修复授权竞态 - FeatureFlag ff_private_screen=2(ENHANCED_PRIVACY),声明支持关屏 - 先回 RPC 7 应答再切换,避免客户端超时报 9998;切换失败发 ReportError -7 - 应答 RPC 25 update_screen_saver_req(RpcResponse 21),隐私模式不再被中止 - SettingMetric 4/7 上报开关与最近一次模式(host_settings.json privacy_type),状态变化推送 SystemStateChange 5 - portal 会话串行打开,打开失败回填一次性授权:快速重连时防窥切换与闭包恢复并发曾清空保存的授权 字段号与枚举取自官方 Mac 客户端的 SwiftProtobuf name map。 已知限制:Mac 客户端防窥菜单切换后仍显示"不启用",实际模式正确。 Refs #140 * fix(privacy): 处理 #146 评审意见 - 预检 uinput:injector 未打开 uinput(/dev/uinput 不可用或 UU_INPUT_BACKEND=native)时, 在改动输出和设备之前拒绝防窥(虚拟输出共享上 KDE 忽略 portal 输入) - leave() 中输入设备恢复失败在恢复输出后向上返回,保留 privacy-power.json 与 guard - record::ownership() 只缓存成功持锁,guard 轮询和 recover() 可重试 - 遮挡窗口就绪握手:privacy-wallpaper 建好窗口后输出 ready,5 秒内未就绪则报错并回滚 - rebase 到 main(#145):DMA-BUF 打开路径跳过虚拟输出、失败同样回填授权; #145 的 uinput 指针路径也按隐私模式的虚拟输出区域换算坐标 - README 表格压缩为一句,细节在 docs/privacy-screen.md Refs #140 * docs(privacy): 注明 ff_system_metrics=3 对应的枚举 Refs #140 * fix(privacy): resolve lifecycle and restoration review findings
46 lines
2.6 KiB
Rust
46 lines
2.6 KiB
Rust
//! Picture mode's cover: a fullscreen keep-above window per physical monitor (GTK, in its own
|
|
//! process so it cannot disturb the host's UI thread), killed on restore and with the host.
|
|
use std::{process::{Child, Command, Stdio}, sync::Mutex};
|
|
|
|
static COVER: Mutex<Option<Child>> = Mutex::new(None);
|
|
|
|
pub fn supported() -> bool { cfg!(uu_gtk) }
|
|
/// `rects` are the monitors to cover in the desktop's logical coordinates (x, y, w, h).
|
|
pub fn show(image: Option<&std::path::Path>, rects: &[[f64; 4]]) -> Result<(), String> {
|
|
hide();
|
|
let exe = std::env::current_exe().map_err(|e| e.kind().to_string())?;
|
|
let mut command = Command::new(exe);
|
|
command.arg("privacy-wallpaper").arg(image.map(|p| p.as_os_str().to_owned()).unwrap_or_default());
|
|
for rect in rects { command.arg(rect.iter().map(|v| (v.round() as i64).to_string()).collect::<Vec<_>>().join(",")); }
|
|
// Keep the pipe writer in Child for the host's lifetime, independently of its spawning thread.
|
|
let mut child = command.stdin(Stdio::piped()).stdout(Stdio::piped()).spawn().map_err(|e| format!("cover window: {}", e.kind()))?;
|
|
// A spawned child is not a shown cover: GTK init or monitor matching can still fail (exit 1/2).
|
|
let stdout = child.stdout.take().ok_or("cover window: no stdout")?;
|
|
let (tx, rx) = std::sync::mpsc::channel();
|
|
std::thread::spawn(move || {
|
|
use std::io::BufRead;
|
|
let mut line = String::new();
|
|
let _ = tx.send(std::io::BufReader::new(stdout).read_line(&mut line).is_ok() && line.trim() == "ready");
|
|
});
|
|
if rx.recv_timeout(std::time::Duration::from_secs(5)) != Ok(true) {
|
|
let _ = child.kill();
|
|
let status = child.wait().ok().and_then(|s| s.code());
|
|
return Err(format!("cover window not shown (exit {status:?})"));
|
|
}
|
|
*COVER.lock().map_err(|_| "cover state poisoned")? = Some(child);
|
|
Ok(())
|
|
}
|
|
pub fn hide() {
|
|
if let Some(mut child) = COVER.lock().ok().and_then(|mut c| c.take()) { let _ = child.kill(); let _ = child.wait(); }
|
|
}
|
|
/// `privacy-wallpaper <image> <x,y,w,h>...`: the cover window process.
|
|
pub fn main(args: &[String]) -> i32 {
|
|
let rects: Vec<i32> = args.iter().skip(1).flat_map(|r| r.split(',').map(|v| v.parse().unwrap_or(-1))).collect();
|
|
#[cfg(uu_gtk)] {
|
|
extern "C" { fn uu_privacy_wallpaper_run(image: *const libc::c_char, rects: *const i32, count: i32) -> i32; }
|
|
let image = std::ffi::CString::new(args.first().cloned().unwrap_or_default()).unwrap_or_default();
|
|
unsafe { uu_privacy_wallpaper_run(image.as_ptr(), rects.as_ptr(), (rects.len() / 4) as i32) }
|
|
}
|
|
#[cfg(not(uu_gtk))] { let _ = rects; 1 }
|
|
}
|