hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix, alt + tab, switch window, release alt state

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-09-25 00:15:36 +08:00
parent 2080e56f87
commit 9771c652c5
2 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flutter/lib/desktop/pages/remote_page.dart
View File

@ -209,7 +209,7 @@ class _RemotePageState extends State<RemotePage>
debugPrint("REMOTE PAGE dispose session $sessionId ${widget.id}"); debugPrint("REMOTE PAGE dispose session $sessionId ${widget.id}");
await _renderTexture.destroy(closeSession); await _renderTexture.destroy(closeSession);
// ensure we leave this session, this is a double check // ensure we leave this session, this is a double check
bind.sessionEnterOrLeave(sessionId: sessionId, enter: false); _ffi.inputModel.enterOrLeave(false);
DesktopMultiWindow.removeListener(this); DesktopMultiWindow.removeListener(this);
_ffi.dialogManager.hideMobileActionsOverlay(); _ffi.dialogManager.hideMobileActionsOverlay();
_ffi.recordingModel.onClose(); _ffi.recordingModel.onClose();
@ -329,7 +329,7 @@ class _RemotePageState extends State<RemotePage>
if (!_rawKeyFocusNode.hasFocus) { if (!_rawKeyFocusNode.hasFocus) {
_rawKeyFocusNode.requestFocus(); _rawKeyFocusNode.requestFocus();
} }
bind.sessionEnterOrLeave(sessionId: sessionId, enter: true); _ffi.inputModel.enterOrLeave(true);
} }
} }
@ -349,7 +349,7 @@ class _RemotePageState extends State<RemotePage>
} }
// See [onWindowBlur]. // See [onWindowBlur].
if (!Platform.isWindows) { if (!Platform.isWindows) {
bind.sessionEnterOrLeave(sessionId: sessionId, enter: false); _ffi.inputModel.enterOrLeave(false);
} }
} }

36
src/keyboard.rs
View File

@ -14,10 +14,8 @@ use rdev::KeyCode;
use rdev::{Event, EventType, Key}; use rdev::{Event, EventType, Key};
#[cfg(any(target_os = "windows", target_os = "macos"))] #[cfg(any(target_os = "windows", target_os = "macos"))]
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
#[cfg(not(any(target_os = "android", target_os = "ios")))]
use std::time::SystemTime;
use std::{ use std::{
collections::{HashMap, HashSet}, collections::HashMap,
sync::{Arc, Mutex}, sync::{Arc, Mutex},
}; };
@ -35,7 +33,7 @@ const OS_LOWER_MACOS: &str = "macos";
static KEYBOARD_HOOKED: AtomicBool = AtomicBool::new(false); static KEYBOARD_HOOKED: AtomicBool = AtomicBool::new(false);
lazy_static::lazy_static! { lazy_static::lazy_static! {
static ref TO_RELEASE: Arc<Mutex<HashSet<Key>>> = Arc::new(Mutex::new(HashSet::<Key>::new())); static ref TO_RELEASE: Arc<Mutex<HashMap<Key, Event>>> = Arc::new(Mutex::new(HashMap::new()));
static ref MODIFIERS_STATE: Mutex<HashMap<Key, bool>> = { static ref MODIFIERS_STATE: Mutex<HashMap<Key, bool>> = {
let mut m = HashMap::new(); let mut m = HashMap::new();
m.insert(Key::ShiftLeft, false); m.insert(Key::ShiftLeft, false);
@ -336,12 +334,17 @@ pub fn release_remote_keys(keyboard_mode: &str) {
// todo!: client quit suddenly, how to release keys? // todo!: client quit suddenly, how to release keys?
let to_release = TO_RELEASE.lock().unwrap().clone(); let to_release = TO_RELEASE.lock().unwrap().clone();
TO_RELEASE.lock().unwrap().clear(); TO_RELEASE.lock().unwrap().clear();
for key in to_release { for (key, mut event) in to_release.into_iter() {
let event_type = EventType::KeyRelease(key); event.event_type = EventType::KeyRelease(key);
let event = event_type_to_event(event_type);
// to-do: BUG
// Release events should be sent to the corresponding sessions, instead of current session.
client::process_event(keyboard_mode, &event, None); client::process_event(keyboard_mode, &event, None);
// If Alt or AltGr is pressed, we need to send another key stoke to release it.
// Because the controlled side may hold the alt state, if local window is switched by [Alt + Tab].
if key == Key::Alt || key == Key::AltGr {
event.event_type = EventType::KeyPress(key);
client::process_event(keyboard_mode, &event, None);
event.event_type = EventType::KeyRelease(key);
client::process_event(keyboard_mode, &event, None);
}
} }
} }
@ -519,7 +522,7 @@ pub fn event_to_key_events(
match event.event_type { match event.event_type {
EventType::KeyPress(key) => { EventType::KeyPress(key) => {
TO_RELEASE.lock().unwrap().insert(key); TO_RELEASE.lock().unwrap().insert(key, event.clone());
} }
EventType::KeyRelease(key) => { EventType::KeyRelease(key) => {
TO_RELEASE.lock().unwrap().remove(&key); TO_RELEASE.lock().unwrap().remove(&key);
@ -570,19 +573,6 @@ pub fn event_to_key_events(
key_events key_events
} }
#[cfg(not(any(target_os = "android", target_os = "ios")))]
pub fn event_type_to_event(event_type: EventType) -> Event {
Event {
event_type,
time: SystemTime::now(),
unicode: None,
platform_code: 0,
position_code: 0,
#[cfg(any(target_os = "windows", target_os = "macos"))]
extra_data: 0,
}
}
pub fn send_key_event(key_event: &KeyEvent) { pub fn send_key_event(key_event: &KeyEvent) {
#[cfg(not(any(feature = "flutter", feature = "cli")))] #[cfg(not(any(feature = "flutter", feature = "cli")))]
if let Some(session) = CUR_SESSION.lock().unwrap().as_ref() { if let Some(session) = CUR_SESSION.lock().unwrap().as_ref() {