fix wayland map mode

Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2023-04-04 18:35:01 +08:00
parent af32998af6
commit f56adbb56e
3 changed files with 26 additions and 29 deletions

View File

@@ -332,13 +332,13 @@ pub fn session_switch_display(id: String, value: i32) {
pub fn session_handle_flutter_key_event(
id: String,
name: String,
keycode: i32,
scancode: i32,
platform_code: i32,
position_code: i32,
lock_modes: i32,
down_or_up: bool,
) {
if let Some(session) = SESSIONS.read().unwrap().get(&id) {
session.handle_flutter_key_event(&name, keycode, scancode, lock_modes, down_or_up);
session.handle_flutter_key_event(&name, platform_code, position_code, lock_modes, down_or_up);
}
}

View File

@@ -529,19 +529,19 @@ impl<T: InvokeUiSession> Session<T> {
pub fn handle_flutter_key_event(
&self,
_name: &str,
keycode: i32,
scancode: i32,
platform_code: i32,
position_code: i32,
lock_modes: i32,
down_or_up: bool,
) {
if scancode < 0 || keycode < 0 {
if position_code < 0 || platform_code < 0 {
return;
}
let keycode: KeyCode = keycode as _;
let scancode: u32 = scancode as _;
let platform_code: KeyCode = platform_code as _;
let position_code: u32 = position_code as _;
#[cfg(not(target_os = "windows"))]
let key = rdev::key_from_code(keycode) as rdev::Key;
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(keycode, scancode);
@@ -554,8 +554,8 @@ impl<T: InvokeUiSession> Session<T> {
let event = Event {
time: SystemTime::now(),
unicode: None,
platform_code: keycode as _,
position_code: scancode as _,
platform_code: platform_code as _,
position_code: position_code as _,
event_type: event_type,
};
keyboard::client::process_event(&event, Some(lock_modes));