mirror of
https://github.com/weyne85/rustdesk.git
synced 2025-10-29 17:00:05 +00:00
refact: flutter keyboard, map mode (#9160)
Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
@@ -491,9 +491,8 @@ pub fn session_switch_display(is_desktop: bool, session_id: SessionID, value: Ve
|
||||
|
||||
pub fn session_handle_flutter_key_event(
|
||||
session_id: SessionID,
|
||||
name: String,
|
||||
platform_code: i32,
|
||||
position_code: i32,
|
||||
character: String,
|
||||
usb_hid: i32,
|
||||
lock_modes: i32,
|
||||
down_or_up: bool,
|
||||
) {
|
||||
@@ -501,9 +500,8 @@ pub fn session_handle_flutter_key_event(
|
||||
let keyboard_mode = session.get_keyboard_mode();
|
||||
session.handle_flutter_key_event(
|
||||
&keyboard_mode,
|
||||
&name,
|
||||
platform_code,
|
||||
position_code,
|
||||
&character,
|
||||
usb_hid,
|
||||
lock_modes,
|
||||
down_or_up,
|
||||
);
|
||||
|
||||
@@ -803,19 +803,18 @@ impl<T: InvokeUiSession> Session<T> {
|
||||
pub fn handle_flutter_key_event(
|
||||
&self,
|
||||
keyboard_mode: &str,
|
||||
name: &str,
|
||||
platform_code: i32,
|
||||
position_code: i32,
|
||||
character: &str,
|
||||
usb_hid: i32,
|
||||
lock_modes: i32,
|
||||
down_or_up: bool,
|
||||
) {
|
||||
if name == "flutter_key" {
|
||||
self._handle_key_flutter_simulation(keyboard_mode, platform_code, down_or_up);
|
||||
if character == "flutter_key" {
|
||||
self._handle_key_flutter_simulation(keyboard_mode, usb_hid, down_or_up);
|
||||
} else {
|
||||
self._handle_key_non_flutter_simulation(
|
||||
keyboard_mode,
|
||||
platform_code,
|
||||
position_code,
|
||||
character,
|
||||
usb_hid,
|
||||
lock_modes,
|
||||
down_or_up,
|
||||
);
|
||||
@@ -831,10 +830,10 @@ impl<T: InvokeUiSession> Session<T> {
|
||||
) {
|
||||
// https://github.com/flutter/flutter/blob/master/packages/flutter/lib/src/services/keyboard_key.g.dart#L4356
|
||||
let ctrl_key = match platform_code {
|
||||
0x0007007f => Some(ControlKey::VolumeMute),
|
||||
0x00070080 => Some(ControlKey::VolumeUp),
|
||||
0x00070081 => Some(ControlKey::VolumeDown),
|
||||
0x00070066 => Some(ControlKey::Power),
|
||||
0x007f => Some(ControlKey::VolumeMute),
|
||||
0x0080 => Some(ControlKey::VolumeUp),
|
||||
0x0081 => Some(ControlKey::VolumeDown),
|
||||
0x0066 => Some(ControlKey::Power),
|
||||
_ => None,
|
||||
};
|
||||
let Some(ctrl_key) = ctrl_key else { return };
|
||||
@@ -851,22 +850,28 @@ impl<T: InvokeUiSession> Session<T> {
|
||||
fn _handle_key_non_flutter_simulation(
|
||||
&self,
|
||||
keyboard_mode: &str,
|
||||
platform_code: i32,
|
||||
position_code: i32,
|
||||
character: &str,
|
||||
usb_hid: i32,
|
||||
lock_modes: i32,
|
||||
down_or_up: bool,
|
||||
) {
|
||||
if position_code < 0 || platform_code < 0 {
|
||||
return;
|
||||
}
|
||||
let platform_code: u32 = platform_code as _;
|
||||
let position_code: KeyCode = position_code as _;
|
||||
let key = rdev::usb_hid_key_from_code(usb_hid as _);
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
let platform_code: u32 = rdev::win_code_from_key(key).unwrap_or(0);
|
||||
#[cfg(target_os = "windows")]
|
||||
let position_code: KeyCode = rdev::win_scancode_from_key(key).unwrap_or(0) as _;
|
||||
|
||||
#[cfg(not(target_os = "windows"))]
|
||||
let key = rdev::key_from_code(position_code) as rdev::Key;
|
||||
// Windows requires special handling
|
||||
#[cfg(target_os = "windows")]
|
||||
let key = rdev::get_win_key(platform_code, position_code);
|
||||
let position_code: KeyCode = rdev::code_from_key(key).unwrap_or(0) as _;
|
||||
#[cfg(not(any(target_os = "windows", target_os = "linux")))]
|
||||
let platform_code: u32 = position_code as _;
|
||||
// For translate mode.
|
||||
// We need to set the platform code (keysym) if is AltGr.
|
||||
// https://github.com/rustdesk/rustdesk/blob/07cf1b4db5ef2f925efd3b16b87c33ce03c94809/src/keyboard.rs#L1029
|
||||
// https://github.com/flutter/flutter/issues/153811
|
||||
#[cfg(target_os = "linux")]
|
||||
let platform_code: u32 = position_code as _;
|
||||
|
||||
let event_type = if down_or_up {
|
||||
KeyPress(key)
|
||||
@@ -875,7 +880,16 @@ impl<T: InvokeUiSession> Session<T> {
|
||||
};
|
||||
let event = Event {
|
||||
time: SystemTime::now(),
|
||||
unicode: None,
|
||||
unicode: if character.is_empty() {
|
||||
None
|
||||
} else {
|
||||
Some(rdev::UnicodeInfo {
|
||||
name: Some(character.to_string()),
|
||||
unicode: character.encode_utf16().collect(),
|
||||
// is_dead: is not correct here, because flutter cannot detect deadcode for now.
|
||||
is_dead: false,
|
||||
})
|
||||
},
|
||||
platform_code,
|
||||
position_code: position_code as _,
|
||||
event_type,
|
||||
|
||||
Reference in New Issue
Block a user