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

Merge pull request #2524 from fufesou/keyboard

Browse Source 
fix peer macos
This commit is contained in:
RustDesk 2022-12-12 22:38:35 +08:00 committed by GitHub
commit ea4df9ebc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flutter/lib/desktop/pages/desktop_home_page.dart
View File

@ -438,7 +438,6 @@ class _DesktopHomePageState extends State<DesktopHomePage>
@override @override
void initState() { void initState() {
super.initState(); super.initState();
bind.mainStartGrabKeyboard();
_updateTimer = periodic_immediate(const Duration(seconds: 1), () async { _updateTimer = periodic_immediate(const Duration(seconds: 1), () async {
await gFFI.serverModel.fetchID(); await gFFI.serverModel.fetchID();
final url = await bind.mainGetSoftwareUpdateUrl(); final url = await bind.mainGetSoftwareUpdateUrl();

5
flutter/lib/desktop/screen/desktop_remote_screen.dart
View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_hbb/common.dart'; import 'package:flutter_hbb/common.dart';
import 'package:flutter_hbb/desktop/pages/remote_tab_page.dart'; import 'package:flutter_hbb/desktop/pages/remote_tab_page.dart';
import 'package:flutter_hbb/models/platform_model.dart';
import 'package:flutter_hbb/desktop/widgets/refresh_wrapper.dart'; import 'package:flutter_hbb/desktop/widgets/refresh_wrapper.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -8,7 +9,9 @@ import 'package:provider/provider.dart';
class DesktopRemoteScreen extends StatelessWidget { class DesktopRemoteScreen extends StatelessWidget {
final Map<String, dynamic> params; final Map<String, dynamic> params;
const DesktopRemoteScreen({Key? key, required this.params}) : super(key: key); DesktopRemoteScreen({Key? key, required this.params}) : super(key: key) {
bind.mainStartGrabKeyboard();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

11
src/keyboard.rs
View File

@ -7,7 +7,9 @@ use crate::flutter::FlutterHandler;
use crate::ui::remote::SciterHandler; use crate::ui::remote::SciterHandler;
use crate::ui_session_interface::Session; use crate::ui_session_interface::Session;
use hbb_common::{log, message_proto::*}; use hbb_common::{log, message_proto::*};
use rdev::{Event, EventType, Key, GrabError}; #[cfg(target_os = "linux")]
use rdev::GrabError;
use rdev::{Event, EventType, Key};
use std::{ use std::{
collections::{HashMap, HashSet}, collections::{HashMap, HashSet},
sync::{ sync::{
@ -594,7 +596,8 @@ pub fn legacy_keyboard_mode(event: &Event, key_event: &mut KeyEvent) {
} }
pub fn map_keyboard_mode(event: &Event, key_event: &mut KeyEvent) { pub fn map_keyboard_mode(event: &Event, key_event: &mut KeyEvent) {
let peer = get_peer_platform(); let mut peer = get_peer_platform().to_lowercase();
peer.retain(|c| !c.is_whitespace());
let key = match event.event_type { let key = match event.event_type {
EventType::KeyPress(key) => { EventType::KeyPress(key) => {
@ -608,8 +611,8 @@ pub fn map_keyboard_mode(event: &Event, key_event: &mut KeyEvent) {
_ => return, _ => return,
}; };
let keycode: u32 = match peer.as_str() { let keycode: u32 = match peer.as_str() {
"Windows" => rdev::win_keycode_from_key(key).unwrap_or_default().into(), "windows" => rdev::win_keycode_from_key(key).unwrap_or_default().into(),
"MacOS" => rdev::macos_keycode_from_key(key).unwrap_or_default().into(), "macos" => rdev::macos_keycode_from_key(key).unwrap_or_default().into(),
_ => rdev::linux_keycode_from_key(key).unwrap_or_default().into(), _ => rdev::linux_keycode_from_key(key).unwrap_or_default().into(),
}; };
key_event.set_chr(keycode); key_event.set_chr(keycode);