diff --git a/README.en.md b/README.en.md index 1be205f..fe16a35 100644 --- a/README.en.md +++ b/README.en.md @@ -613,6 +613,8 @@ separate from the host `uuremote-server`; the default host build and behaviour a terminal emulator (`TERMINAL` selects one). From source: `sudo apt install libsdl2-dev`, then `cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`. +Key combinations use the left/right modifier state attached to each SDL key event. Focus loss releases remote keys; after focus returns, the next non-modifier key restores any still-held Shift/Ctrl/Alt/Win (Command on Mac). This is built in, with no adapter or setting required. + SDL clipboard access reuses the desktop window to avoid temporary-window Dock churn on GNOME Wayland (#37). On niri, data-control-capable `wl-clipboard` is used instead, so synchronization does not require window focus. Other SDL backends synchronize only while that window is focused. The 30 KiB text limit applies. Selections without a supported diff --git a/README.md b/README.md index bf27c2c..a960ac2 100644 --- a/README.md +++ b/README.md @@ -535,6 +535,8 @@ xfce4-session xfce4-panel xfdesktop xfwm4 gnome-terminal`。 `ffmpeg` 命令;SDL 桌面窗口直接同步文本剪贴板(Wayland/X11),无需额外剪贴板工具;终端功能需要本机终端程序(可用 `TERMINAL` 指定)。 从源码构建:`sudo apt install libsdl2-dev`,然后 `cargo build --release --locked --features native-viewer,viewer-sdl --bin uuremote-viewer`。 +组合键使用 SDL 按键事件携带的左右修饰键状态;窗口失焦时释放远端按键,重新聚焦后的下一次普通按键会恢复仍按住的 Shift/Ctrl/Alt/Win(Mac 为 Command)。此行为内置,无需适配库或开关。 + SDL 剪贴板复用桌面窗口,避免 GNOME Wayland 上临时窗口引起的 Dock 跳动(#37)。niri 改用支持 data-control 的 `wl-clipboard`,不需要桌面窗口保持焦点;其他 SDL 后端仅在桌面窗口获得焦点时同步。 保留 30 KiB 文本上限;跳过不含支持的文本格式的本地选择,空文本的识别取决于 SDL2 后端。不带 SDL 的构建保留命令后端。 diff --git a/src/viewer/sdl.rs b/src/viewer/sdl.rs index 2b1fd15..be73216 100644 --- a/src/viewer/sdl.rs +++ b/src/viewer/sdl.rs @@ -345,7 +345,13 @@ fn translate_actions(events:impl IntoIterator,input:&mut Input,viewp if !repeat{*files=true;messages.extend(input.release_all());}None }, _ if !*focused || !input.enabled()=>None, - Event::KeyDown{scancode:Some(s),repeat:false,..}=>input.key(s as i32,true), + Event::KeyDown{scancode:Some(s),keymod,repeat:false,..}=>{ + // FocusLost releases remote keys, while a modifier may remain physically held. + // SDL_Keysym.mod is the event-time snapshot: restore it before the next key, + // without querying the final state of a whole polled batch or typing text. + if !(224..=231).contains(&(s as i32)){messages.extend(sync_modifiers(input,keymod));} + input.key(s as i32,true) + }, Event::KeyUp{scancode:Some(s),..}=>input.key(s as i32,false), Event::MouseMotion{x,y,..}=>viewport.motion(x as f64,y as f64), Event::MouseButtonDown{mouse_btn,..}=>button(mouse_btn).and_then(|b|input.button(b,true)), @@ -366,6 +372,18 @@ fn translate_actions(events:impl IntoIterator,input:&mut Input,viewp } (quit,messages) } +fn sync_modifiers(input:&mut Input,keymod:sdl2::keyboard::Mod)->Vec{ + use sdl2::keyboard::Mod as M; + let modifiers=[(224,M::LCTRLMOD),(225,M::LSHIFTMOD),(226,M::LALTMOD),(227,M::LGUIMOD), + (228,M::RCTRLMOD),(229,M::RSHIFTMOD),(230,M::RALTMOD),(231,M::RGUIMOD)]; + let mut out=Vec::new(); + // Release stale modifiers before pressing new ones. Input deduplicates transitions. + // Caps/Num/Scroll Lock and MODE are not physical held modifiers. + for down in [false,true]{for (scan,flag) in modifiers{ + if keymod.contains(flag)==down{out.extend(input.key(scan,down));} + }}out +} + fn needs_redraw(event:&Event)->bool{ matches!(event,Event::Window{win_event:WindowEvent::SizeChanged(..)|WindowEvent::Resized(..)|WindowEvent::Exposed|WindowEvent::Maximized|WindowEvent::Restored,..}) } @@ -709,6 +727,72 @@ async fn pump_type_job(job: &mut TypeJob, session: &mut Session, window: &mut Wi } } +#[cfg(test)] mod modifier_tests { + use super::*; + use sdl2::keyboard::{Scancode as S,Mod as M}; + fn key(scan:S,down:bool,mods:M)->Event{ + if down{Event::KeyDown{timestamp:0,window_id:1,keycode:None,scancode:Some(scan),keymod:mods,repeat:false}} + else{Event::KeyUp{timestamp:0,window_id:1,keycode:None,scancode:Some(scan),keymod:mods,repeat:false}} + } + fn focus(event:WindowEvent)->Event{Event::Window{timestamp:0,window_id:1,win_event:event}} + fn send(input:&mut Input,focused:&mut bool,events:impl IntoIterator)->Vec{ + translate(events,input,Viewport::fit((800,600),(1920,1080)),focused).1 + } + fn codes(messages:&[serde_json::Value])->Vec<(&str,i64)>{ + messages.iter().map(|m|(m["action"].as_str().unwrap(),m["key"].as_i64().unwrap())).collect() + } + #[test] fn held_left_and_right_modifiers_recover_after_focus_return(){ + for mac in [false,true]{for (scan,flag) in [(S::LCtrl,M::LCTRLMOD),(S::LShift,M::LSHIFTMOD), + (S::LAlt,M::LALTMOD),(S::LGui,M::LGUIMOD),(S::RCtrl,M::RCTRLMOD),(S::RShift,M::RSHIFTMOD), + (S::RAlt,M::RALTMOD),(S::RGui,M::RGUIMOD)]{ + let code=|scan:S|i64::from(if mac{super::super::input::mac_keycode(scan as i32)}else{super::super::input::windows_vk(scan as i32)}.unwrap()); + let mut input=Input::default();input.set_mac(mac);let mut focused=true; + let out=send(&mut input,&mut focused,[key(scan,true,flag),focus(WindowEvent::FocusLost)]); + assert_eq!(codes(&out),vec![("kbd_press",code(scan)),("kbd_release",code(scan))]); + assert!(!focused); + let out=send(&mut input,&mut focused,[focus(WindowEvent::FocusGained),key(S::Num2,true,flag), + key(S::Num2,false,flag),key(scan,false,M::NOMOD)]); + assert_eq!(codes(&out),vec![("kbd_press",code(scan)),("kbd_press",code(S::Num2)), + ("kbd_release",code(S::Num2)),("kbd_release",code(scan))]); + assert!(input.release_all().is_empty()); + }} + } + #[test] fn combined_snapshot_releases_stale_modifiers_before_new_chord(){ + let mut input=Input::default();input.set_mac(true);let mut focused=true; + send(&mut input,&mut focused,[key(S::LShift,true,M::LSHIFTMOD),key(S::RGui,true,M::LSHIFTMOD|M::RGUIMOD)]); + let mods=M::RSHIFTMOD|M::LCTRLMOD|M::LALTMOD; + let out=send(&mut input,&mut focused,[key(S::A,true,mods),key(S::A,false,mods), + key(S::B,true,M::NOMOD),key(S::B,false,M::NOMOD)]); + assert_eq!(codes(&out),vec![("kbd_release",56),("kbd_release",54), + ("kbd_press",59),("kbd_press",58),("kbd_press",60),("kbd_press",0),("kbd_release",0), + ("kbd_release",59),("kbd_release",58),("kbd_release",60),("kbd_press",11),("kbd_release",11)]); + assert!(input.release_all().is_empty()); + } + #[test] fn complete_chords_and_overlapping_letters_are_not_duplicated(){ + let mut input=Input::default();input.set_mac(true);let mut focused=true; + let mods=M::LSHIFTMOD|M::RSHIFTMOD; + let out=send(&mut input,&mut focused,[key(S::LShift,true,M::LSHIFTMOD),key(S::RShift,true,mods), + key(S::A,true,mods),key(S::B,true,mods),key(S::A,false,mods),key(S::LShift,false,M::RSHIFTMOD), + key(S::B,false,M::RSHIFTMOD),key(S::RShift,false,M::NOMOD)]); + assert_eq!(codes(&out),vec![("kbd_press",56),("kbd_press",60),("kbd_press",0),("kbd_press",11), + ("kbd_release",0),("kbd_release",56),("kbd_release",11),("kbd_release",60)]); + assert!(input.release_all().is_empty()); + } + #[test] fn snapshot_is_event_time_and_does_not_create_lock_or_view_only_keys(){ + let mut input=Input::default();let mut focused=true; + let out=send(&mut input,&mut focused,[key(S::Num2,true,M::LSHIFTMOD|M::CAPSMOD|M::NUMMOD|M::MODEMOD), + key(S::Num2,false,M::LSHIFTMOD),key(S::A,true,M::NOMOD),key(S::A,false,M::NOMOD)]); + assert_eq!(codes(&out),vec![("kbd_press",0xa0),("kbd_press",0x32),("kbd_release",0x32), + ("kbd_release",0xa0),("kbd_press",0x41),("kbd_release",0x41)]); + for watch in [false,true]{ + let mut input=Input::new(watch);let mut focused=false; + assert!(send(&mut input,&mut focused,[key(S::A,true,M::LSHIFTMOD)]).is_empty()); + if watch{assert!(send(&mut input,&mut focused,[focus(WindowEvent::FocusGained),key(S::A,true,M::LSHIFTMOD)]).is_empty());} + assert!(input.release_all().is_empty()); + } + } +} + #[cfg(test)] mod tests { use super::*; #[cfg_attr(target_os="macos",ignore)]