diff --git a/AGENTS.md b/AGENTS.md index 668822b..e929f37 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -106,6 +106,7 @@ viewer does not reconnect them automatically. | `~/.config/uuremote/host_settings.json` | persisted 安全 settings: auto_lock, keep_mute, mute_permanent | | `UU_DESKTOP_BACKEND` | `auto` (default) / `x11` / `wayland` / `portal` / `kms` (experimental feature) / `none` (headless: no display; desktop offers ignored; tool peers get a nominal 1920x1080 screen + Allow permissions, which the port-mapping viewer requires) | | `UU_INPUT_BACKEND` | `auto` (uinput on Wayland/portal when `/dev/uinput` is accessible, udev `uaccess` rule in README) / `uinput` / `native`. X11 keeps XTest (held-key autorepeat handling) | +| Mac viewer Cmd | With 「使用 macOS 快捷键」 off the Mac viewer sends Cmd=VK_LWIN 0x5B, Option=0xA4, Ctrl=0xA2; connect header `controller_platform`=4 is macOS. For Mac controllers Cmd is held back: Cmd+C/V/A/F/X/Z → Ctrl+key (terminal: Cmd+C/V → Ctrl+Shift+C/V), other combos/alone → Super | | `UU_TERMINAL_SHORTCUTS=0` | disable Ctrl+V → Ctrl+Shift+V in focused X11 terminals (Mac Cmd and Ctrl both arrive as VK_LCONTROL) | | `contrib/virtual-desktop/` | Xvfb + session (`UU_VIRTUAL_SESSION`, `UU_VIRTUAL_BUS=user|private`) for monitorless hosts; serve it with `DISPLAY=:99` | | `UU_VIDEO_ENCODER` | `cpu`: libx264; `vaapi`: explicit Intel/AMD; `nvenc`: force; unset: NVENC→CPU only if `/proc/driver/nvidia/version` or `/dev/nvidia0` exists, else CPU (#10) | diff --git a/Cargo.lock b/Cargo.lock index a289aa1..733ac0b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2649,7 +2649,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uu-remote-linux" -version = "0.1.11" +version = "0.1.12" dependencies = [ "base64 0.22.1", "bytes", diff --git a/Cargo.toml b/Cargo.toml index 6dca77b..efedcce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "uu-remote-linux" -version = "0.1.11" +version = "0.1.12" edition = "2021" authors = ["uu-remote-linux contributors"] description = "Unofficial Linux host for NetEase UU Remote: control a Linux desktop from the official clients" diff --git a/README.en.md b/README.en.md index d8420ee..1064082 100644 --- a/README.en.md +++ b/README.en.md @@ -35,7 +35,7 @@ | Remote assistance (experimental) | Like the official client: share the **device ID + verification code**; the other person enters them under 开始协助 in UU Remote. Works before sign-in (guest identity) and after; see below | | Remote desktop | H.264 video, NVENC hardware encoding on NVIDIA GPUs, libx264 otherwise; the viewer draws its local pointer, so there is no double cursor | | Mouse / keyboard | Absolute and relative motion, clicks, wheel, keys; no spurious key repeat on high-latency links; optional uinput virtual devices on Wayland (layout independent, see below) | -| Terminal shortcuts | Mac viewers send both Cmd and Ctrl as Ctrl. In a focused terminal window Ctrl+V / Cmd+V become Ctrl+Shift+V (paste); Ctrl+C always interrupts, copy with Cmd+Shift+C (X11) | +| Mac shortcuts | **Recommended**: turn off 「使用 macOS 快捷键」 (use macOS shortcuts) in the Mac viewer's remote-window menu; then Cmd+C/V/A/F/X/Z work as on a Mac (Cmd+C/V become Ctrl+Shift+C/V in terminals) and Ctrl+C always interrupts. With the option on, the viewer sends Cmd as Ctrl: in a terminal Ctrl+V / Cmd+V paste, Ctrl+C interrupts, copy is Cmd+Shift+C (X11) | | Pointer shape | Remote cursor shape is mirrored to the viewer (X11) | | Clipboard | Two-way text sync | | Quality / frame rate / resolution | Auto, Original 20M, Ultra 8M, HD 2M, custom; 30/60/90/144 fps; "other resolutions" are scaled by the encoder, the host monitor is left untouched | diff --git a/README.md b/README.md index 4cb52be..b33a789 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ | 远程协助(实验性) | 像官方客户端一样,把**设备 ID + 验证码**发给别人,对方在 UU「开始协助」里输入即可连接;登录前(访客身份)和登录后都能用,见下文 | | 远程桌面 | H.264 视频,NVIDIA 显卡用 NVENC 硬件编码,否则用 libx264;查看端绘制本地鼠标,不会出现双光标 | | 鼠标 / 键盘 | 绝对/相对移动、点击、滚轮、按键;修复了网络延迟导致的按键连发;Wayland 下可用 uinput 虚拟键鼠(不依赖键盘布局,见下文) | -| 终端快捷键 | Mac 控制端的 Cmd 和 Ctrl 到被控端都是 Ctrl。焦点在终端窗口时,Ctrl+V / Cmd+V 自动转成 Ctrl+Shift+V 粘贴;Ctrl+C 始终是中断,复制请用 Cmd+Shift+C(X11) | +| Mac 快捷键 | **推荐**:在 Mac 远控窗口菜单里关闭「使用 macOS 快捷键」,之后和在 Mac 上一样:Cmd+C/V/A/F/X/Z 是复制、粘贴、全选、查找、剪切、撤销(终端里 Cmd+C/V 自动变成 Ctrl+Shift+C/V),Ctrl+C 在终端里始终是中断。保持开启时,客户端会把 Cmd 和 Ctrl 都当成 Ctrl 发送:终端里 Ctrl+V / Cmd+V 自动转成粘贴,Ctrl+C 是中断,复制用 Cmd+Shift+C(X11) | | 鼠标指针样式 | 远端指针形状实时同步(X11) | | 剪贴板 | 双向文本同步 | | 画质 / 帧率 / 分辨率 | 自动、原画 20M、超清 8M、高清 2M、自定义;30/60/90/144 帧;「其他分辨率」由编码器缩放,不改动主机显示器 | diff --git a/docs/release-notes/v0.1.12.md b/docs/release-notes/v0.1.12.md new file mode 100644 index 0000000..b5ae329 --- /dev/null +++ b/docs/release-notes/v0.1.12.md @@ -0,0 +1,15 @@ +Mac 快捷键和在 Mac 上一样用。/ Mac shortcuts work as on a Mac. + +### 新增 / Added +- **Mac 快捷键**:在 Mac 远控窗口菜单里**关闭「使用 macOS 快捷键」**后: + - Cmd+C / V / A / F / X / Z 是复制、粘贴、全选、查找、剪切、撤销(Cmd+Shift+Z 等组合同样可用); + - 在终端里 Cmd+C / Cmd+V 自动变成终端的复制、粘贴(Ctrl+Shift+C / V),**Ctrl+C 始终是中断**; + - 其他 Cmd 组合键和单独按 Cmd 仍然是 Super(Windows 键)。 + 只对 Mac 控制端生效(按连接请求里的控制端平台判断),Windows 和手机控制端不受影响。✅ 已用官方 Mac 客户端在 X11 实机验收。 + 保持该选项开启时行为和以前一样(客户端会把 Cmd 当成 Ctrl 发送)。 + With 「使用 macOS 快捷键」 off, Cmd shortcuts behave as on a Mac (terminal-aware copy/paste), only for macOS viewers. + +### 下载 / Download +`uu-remote-linux-v0.1.12-x86_64-linux.tar.gz`:X11 版可执行文件(x86_64,glibc ≥ 2.35),附带 `contrib/`。 + +**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.** diff --git a/src/input.rs b/src/input.rs index 27a8efc..3313e8f 100644 --- a/src/input.rs +++ b/src/input.rs @@ -43,8 +43,12 @@ struct HeldInput { buttons: std::collections::BTreeSet, keys: std::collecti /// Held modifier VKs (bit 0 Ctrl, 1 Shift, 2 Alt, 3 Win) and keys that got a synthetic Shift. #[derive(Default)] struct Shortcuts { modifiers: u8, shifted: std::collections::BTreeSet } +/// Mac viewer with 「使用 macOS 快捷键」 off sends Cmd as VK_LWIN (verified: Cmd 0x5B, Option 0xA4, +/// Ctrl 0xA2). Cmd is held back until we know whether it starts a Mac shortcut. +#[derive(Default)] +struct CmdState { held: bool, pending: bool, passthrough: bool, combos: std::collections::BTreeMap } -pub struct InputInjector { serial:std::sync::Mutex<()>, owner:std::sync::Mutex, shortcuts: std::sync::Mutex, uinput: Option, screen: std::sync::Mutex<(u32,u32)>, portal_failures: std::sync::atomic::AtomicUsize, portal_outcomes: [std::sync::atomic::AtomicUsize; 3], portal:std::sync::Mutex>>, backend: crate::desktop_backend::DesktopBackend, pending: std::sync::Mutex, held: std::sync::Mutex } +pub struct InputInjector { mac_controller: std::sync::atomic::AtomicBool, cmd: std::sync::Mutex, serial:std::sync::Mutex<()>, owner:std::sync::Mutex, shortcuts: std::sync::Mutex, uinput: Option, screen: std::sync::Mutex<(u32,u32)>, portal_failures: std::sync::atomic::AtomicUsize, portal_outcomes: [std::sync::atomic::AtomicUsize; 3], portal:std::sync::Mutex>>, backend: crate::desktop_backend::DesktopBackend, pending: std::sync::Mutex, held: std::sync::Mutex } impl InputInjector { pub fn new() -> Self { @@ -55,7 +59,7 @@ impl InputInjector { Err(e) => { log::warn!("uinput unavailable ({}); using the desktop input path. See README for the udev rule.", e.kind()); None } } } else { None }; - Self { serial:std::sync::Mutex::new(()), owner:std::sync::Mutex::new(DesktopOwner::default()), shortcuts: std::sync::Mutex::new(Shortcuts::default()), uinput, screen: std::sync::Mutex::new((0,0)), portal_failures: std::sync::atomic::AtomicUsize::new(0), portal_outcomes: std::array::from_fn(|_| std::sync::atomic::AtomicUsize::new(0)), portal:std::sync::Mutex::new(None), backend:crate::desktop_backend::detect().unwrap_or(crate::desktop_backend::DesktopBackend::X11), pending: std::sync::Mutex::new(PendingPointer::default()), held:std::sync::Mutex::new(HeldInput::default()) } + Self { mac_controller: std::sync::atomic::AtomicBool::new(false), cmd: std::sync::Mutex::new(CmdState::default()), serial:std::sync::Mutex::new(()), owner:std::sync::Mutex::new(DesktopOwner::default()), shortcuts: std::sync::Mutex::new(Shortcuts::default()), uinput, screen: std::sync::Mutex::new((0,0)), portal_failures: std::sync::atomic::AtomicUsize::new(0), portal_outcomes: std::array::from_fn(|_| std::sync::atomic::AtomicUsize::new(0)), portal:std::sync::Mutex::new(None), backend:crate::desktop_backend::detect().unwrap_or(crate::desktop_backend::DesktopBackend::X11), pending: std::sync::Mutex::new(PendingPointer::default()), held:std::sync::Mutex::new(HeldInput::default()) } } pub fn bind_portal(&self,session:Option>) { @@ -167,8 +171,62 @@ impl InputInjector { shift } + /// The current desktop controller is the macOS viewer (connect header controller_platform). + pub fn set_mac_controller(&self, mac: bool) { + self.mac_controller.store(mac, std::sync::atomic::Ordering::Relaxed); + *self.cmd.lock().unwrap() = CmdState::default(); + } + + fn terminal_focused(&self) -> bool { + self.backend == crate::desktop_backend::DesktopBackend::X11 && std::env::var_os("DISPLAY").is_some() + && !std::env::var("UU_TERMINAL_SHORTCUTS").is_ok_and(|v| v == "0") + && unsafe { x11_terminal_shortcut_state() } & 1 != 0 + } + + /// Mac habits for a Mac viewer with 「使用 macOS 快捷键」 off: Cmd+C/V/A/F/X/Z (the keys that option + /// lists) become Ctrl+key, and in a focused terminal Cmd+C/V become Ctrl+Shift+C/V (copy/paste) + /// while Ctrl+C still interrupts. Other Cmd combos, and Cmd alone, stay Super. Returns true when handled. + fn mac_cmd(&self, key: i32, is_press: bool) -> bool { + const SUPER_L: u64 = 0xffeb; const CONTROL_L: u64 = 0xffe3; const SHIFT_L: u64 = 0xffe1; + let mut st = self.cmd.lock().unwrap(); + if matches!(key, 0x5b | 0x5c) { + if is_press { st.held = true; st.pending = true; st.passthrough = false; } + else { + if st.passthrough { self.inject_key(SUPER_L, false); } + else if st.pending { self.inject_key(SUPER_L, true); self.inject_key(SUPER_L, false); } + st.held = false; st.pending = false; st.passthrough = false; + } + return true; + } + if !is_press { + let Some(shifted) = st.combos.remove(&key) else { return false }; + self.key_symbol_event(key, false); + if shifted { self.inject_key(SHIFT_L, false); } + self.inject_key(CONTROL_L, false); + return true; + } + if !st.held { return false; } + // Shift/Option/Ctrl pressed with Cmd (e.g. Cmd+Shift+Z) must not decide the combo yet. + if matches!(key, 0x10..=0x12 | 0xa0..=0xa5) { return false; } + if st.combos.contains_key(&key) { self.key_symbol_event(key, true); return true; } // autorepeat + if matches!(key, 0x41 | 0x43 | 0x46 | 0x56 | 0x58 | 0x5a) && !st.passthrough { + st.pending = false; + let shifted = matches!(key, 0x43 | 0x56) && self.terminal_focused(); + self.inject_key(CONTROL_L, true); + if shifted { self.inject_key(SHIFT_L, true); } + self.key_symbol_event(key, true); + st.combos.insert(key, shifted); + static NOTED: std::sync::atomic::AtomicUsize = std::sync::atomic::AtomicUsize::new(0); + if NOTED.fetch_add(1, std::sync::atomic::Ordering::Relaxed) < 4 { log::info!("Mac shortcut: Cmd combo sent as Ctrl{}", if shifted { "+Shift (terminal)" } else { "" }); } + return true; + } + if st.pending { self.inject_key(SUPER_L, true); st.pending = false; st.passthrough = true; } + false + } + pub fn windows_key_event(&self, key: i32, is_press: bool) { let _serial=self.serial.lock().unwrap(); + if self.mac_controller.load(std::sync::atomic::Ordering::Relaxed) && self.mac_cmd(key, is_press) { return; } if self.terminal_shift(key, is_press) { const SHIFT_L: u64 = 0xffe1; if is_press { @@ -221,6 +279,7 @@ impl InputInjector { } *held=HeldInput::default(); *self.shortcuts.lock().unwrap()=Shortcuts::default(); + *self.cmd.lock().unwrap()=CmdState::default(); } // Per-injector budgets cover missing bindings, locked sessions, stale handles // and D-Bus errors. Never include keys, coordinates, text or portal tokens. diff --git a/src/main.rs b/src/main.rs index 34abc7c..662a211 100644 --- a/src/main.rs +++ b/src/main.rs @@ -426,6 +426,8 @@ async fn serve(mut capture: Arc, input: Arc, shutd // One peer per viewer connection (desktop, file transfer, terminal...), keyed by ice_id. let mut next_capture_type: Option<(u64,crate::session_ice::SessionIce)> = None; let mut capture_types: HashMap = HashMap::new(); + let mut mac_by_ice: HashMap = HashMap::new(); + let mut next_mac = false; loop { if *shutdown.borrow() { @@ -579,7 +581,9 @@ async fn serve(mut capture: Arc, input: Arc, shutd .and_then(|s| s.as_str()) ); } - SignalingEvent::ConnectRequest { capture_type, ice_id, transport } => { + SignalingEvent::ConnectRequest { capture_type, ice_id, transport, controller_mac } => { + if mac_by_ice.len()>=32 { mac_by_ice.clear(); } + match ice_id.clone() { Some(id) => { mac_by_ice.insert(id, controller_mac); } None => next_mac = controller_mac } // Pending cloud credentials live only within this room; cap // requests that never receive an offer rather than retain them. if capture_types.len()>=32 { capture_types.clear(); } @@ -610,6 +614,8 @@ async fn serve(mut capture: Arc, input: Arc, shutd let (capture_type,transport) = capture_types.remove(&ice).or_else(|| next_capture_type.take()).unwrap_or((1,crate::session_ice::SessionIce::default())); // CaptureType: 0 unknown, 1 desktop, 2 window; 5 file transfer, 8 terminal, 9 port mapping. let desktop = capture_type <= 2; + let controller_mac = mac_by_ice.remove(&ice).unwrap_or(next_mac); + if desktop { input.set_mac_controller(controller_mac); } log::info!("Offer for connection: capture_type={} desktop={} active_peers={}", capture_type, desktop, sessions.len()); if let Some(old) = sessions.remove(&ice) { let _ = old.pc.close().await; } if desktop { diff --git a/src/signaling.rs b/src/signaling.rs index a706107..75fc38a 100644 --- a/src/signaling.rs +++ b/src/signaling.rs @@ -41,7 +41,7 @@ pub enum SignalingEvent { BeControlled(Value), /// be-controlled with its binary app_data (ConnectOptions): capture type and the /// ice_id it announces, when present. - ConnectRequest { capture_type: u64, ice_id: Option, transport:crate::session_ice::SessionIce }, + ConnectRequest { capture_type: u64, ice_id: Option, transport:crate::session_ice::SessionIce, controller_mac: bool }, Soac(SoacMessage), Released(Value), Left(Value), @@ -317,7 +317,12 @@ impl SignalingClient { let ice_id = ["ice_id", "iceId"].iter().find_map(|k| header.get(*k).or_else(|| header.get("data").and_then(|d| d.get(*k)))) .and_then(|v| v.as_str()).map(str::to_owned); log::info!("be-controlled connect request: capture_type={} header_keys={:?} ice_id_present={}", capture_type, keys, ice_id.is_some()); - let _ = event_sender.send(SignalingEvent::ConnectRequest { capture_type, ice_id, transport:crate::session_ice::SessionIce::from_header(&header) }).await; + // Viewer platform (website enum: 1 windows, 2 android, 3 ios, 4 macos, 5 tv). + let platform = header.get("controller_platform").or_else(|| header.get("data").and_then(|d| d.get("controller_platform"))); + let controller_mac = platform.is_some_and(|v| v.as_i64() == Some(4) + || v.as_str().is_some_and(|s| s == "4" || s.to_ascii_lowercase().contains("mac") || s.to_ascii_lowercase().contains("darwin"))); + log::info!("Controller platform: {} mac={}", platform.map(|v| v.to_string()).unwrap_or_default().chars().take(24).collect::(), controller_mac); + let _ = event_sender.send(SignalingEvent::ConnectRequest { capture_type, ice_id, transport:crate::session_ice::SessionIce::from_header(&header), controller_mac }).await; } } }