Fix niri monitor switching, rotated input and mobile text (#71)

niri 实验性支持:三屏切换、90°/180°/270° 旋转输出的采集与指针映射、手机中文文本输入,全部 gated 在 NIRI_SOCKET,不影响 Hyprland/X11 路径。新增 wayland_transform.h 及其 ASAN 单测。

感谢 @WALKERKILLER 的贡献与 CachyOS + niri 实机验收。

🤖 Generated with [Claude Code](https://claude.com/claude-code)
This commit is contained in:
Sile Liu authored and GitHub committed 2026-10-29 01:39:01 +08:00
1 parent 482c01a85d
commit 835bfa2319
10 files changed
+205 -27

No files matched your search

+44 -4
View File
@@ -199,6 +199,7 @@ pub fn text_probe()->Result<(),String> {
typed+=one;
}
if typed<0 { return Err(format!("Wayland text typing failed ({typed})")); }
std::thread::sleep(std::time::Duration::from_millis(100));
println!("Typed {typed} of {} characters in {} calls; check that they match.",
sequence.chars().filter(|character|*character!='|').count(),sequence.split('|').count());
Ok(())
@@ -234,10 +235,13 @@ fn inventory() -> &'static Inventory {
if !cfg!(all(target_os="linux",feature="wayland"))
|| std::env::var("UU_WAYLAND_MULTISCREEN").ok().as_deref()!=Some("1")
|| backend!=Some(crate::desktop_backend::DesktopBackend::Wayland) {return Inventory {outputs:Vec::new(),x11:false};}
let output=std::process::Command::new("hyprctl").args(["monitors","-j"]).output();
let result=output.map_err(|_|"hyprctl unavailable").and_then(|output| {
if !output.status.success() {return Err("hyprctl failed");}
parse_outputs(&output.stdout,&std::env::var("UU_WAYLAND_OUTPUT").unwrap_or_default())
let niri=std::env::var_os("NIRI_SOCKET").is_some();
let output=if niri {std::process::Command::new("niri").args(["msg","--json","outputs"]).output()}
else {std::process::Command::new("hyprctl").args(["monitors","-j"]).output()};
let result=output.map_err(|_|"monitor command unavailable").and_then(|output| {
if !output.status.success() {return Err("monitor command failed");}
let preferred=std::env::var("UU_WAYLAND_OUTPUT").unwrap_or_default();
if niri {parse_niri_outputs(&output.stdout,&preferred)} else {parse_outputs(&output.stdout,&preferred)}
});
let outputs=match result {Ok(outputs)=>outputs,Err(reason)=>{log::warn!("Wayland multi-screen disabled: {}",reason);Vec::new()}};
Inventory {outputs,x11:false}
@@ -294,6 +298,20 @@ fn parse_x11_monitors(text:&str,preferred:&str,fps:i32)->Result<Vec<Output>,&'st
if outputs.is_empty() || (!preferred.is_empty() && outputs[0].name!=preferred) {return Err("No capturable preferred output");}
Ok(outputs)
}
fn parse_niri_outputs(json:&[u8],preferred:&str)->Result<Vec<Output>,&'static str> {
let inventory=serde_json::from_slice::<serde_json::Map<String,serde_json::Value>>(json).map_err(|_|"Invalid niri inventory")?;
let monitors:Vec<_>=inventory.values().filter_map(|m| {
let logical=m["logical"].as_object()?;
let mode=m["modes"].as_array()?.get(usize::try_from(m["current_mode"].as_u64()?).ok()?)?;
let transform=logical.get("transform")?.as_str()?;
if !matches!(transform,"Normal"|"90"|"180"|"270") {return None;}
let (w,h)=(mode["width"].as_u64()?,mode["height"].as_u64()?);
let (w,h)=if matches!(transform,"90"|"270") {(h,w)} else {(w,h)};
Some(serde_json::json!({"name":m["name"],"width":w,"height":h,"transform":0,
"refreshRate":mode["refresh_rate"].as_f64()?/1000.0}))
}).collect();
parse_outputs(&serde_json::to_vec(&monitors).map_err(|_|"Invalid niri inventory")?,preferred)
}
fn parse_outputs(json:&[u8],preferred:&str)->Result<Vec<Output>,&'static str> {
let monitors=serde_json::from_slice::<Vec<serde_json::Value>>(json).map_err(|_|"Invalid monitor inventory")?;
let mut seen=std::collections::HashSet::new();
@@ -429,6 +447,28 @@ mod selection_regressions {
s.sent(0,current);assert!(s.ready());
}
#[test]
#[ignore = "requires an unlocked Wayland session and UU_WAYLAND_MULTISCREEN=1"]
fn live_monitor_switch_captures_each_output() {
assert!(outputs().len()>1);
init().unwrap();
for (id,output) in outputs().iter().enumerate() {
select(id).unwrap();
let mut frame=vec![0;(output.width as usize)*(output.height as usize)*4];
capture(&mut frame).unwrap();
assert_eq!(selected(),id);
}
select(0).unwrap();
}
#[test]
fn niri_inventory_uses_active_mode_and_rotated_pixel_size() {
let json=br#"{"one":{"name":"DP-1","modes":[{"width":2240,"height":1400,"refresh_rate":60000}],"current_mode":0,"logical":{"transform":"90"}},
"off":{"name":"off","modes":[],"current_mode":null,"logical":null}}"#;
let outputs=parse_niri_outputs(json,"").unwrap();
assert_eq!((outputs.len(),outputs[0].width,outputs[0].height,outputs[0].fps),(1,1400,2240,60));
assert!(parse_niri_outputs(json,"off").is_err());
assert!(parse_niri_outputs(b"[]","").is_err());
}
#[test]
fn mixed_scale_inventory_preserves_pixel_sizes_and_preferred_output() {
let json=br#"[{"name":"eDP-1","width":1920,"height":1080,"scale":1.3333334,"transform":0,"refreshRate":144},
{"name":"HDMI-A-1","width":2560,"height":1440,"scale":1.25,"transform":0,"refreshRate":75}]"#;