Merge branch 'rustdesk:master' into master

zhangbo8418 · Aug 26, 2024 · 3be2498 · 3be2498
2 parents 4475752 + 4b4fd94
commit 3be2498
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 2 deletions.
diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
@@ -50,6 +50,9 @@ final isLinux = isLinux_;
 final isDesktop = isDesktop_;
 final isWeb = isWeb_;
 final isWebDesktop = isWebDesktop_;
+final isWebOnWindows = isWebOnWindows_;
+final isWebOnLinux = isWebOnLinux_;
+final isWebOnMacOs = isWebOnMacOS_;
 var isMobile = isAndroid || isIOS;
 var version = '';
 int androidVersion = 0;

diff --git a/flutter/lib/consts.dart b/flutter/lib/consts.dart
@@ -32,6 +32,7 @@ const String kPeerPlatformWindows = "Windows";
 const String kPeerPlatformLinux = "Linux";
 const String kPeerPlatformMacOS = "Mac OS";
 const String kPeerPlatformAndroid = "Android";
+const String kPeerPlatformWebDesktop = "WebDesktop";
 
 const double kScrollbarThickness = 12.0;
 

diff --git a/flutter/lib/desktop/widgets/kb_layout_type_chooser.dart b/flutter/lib/desktop/widgets/kb_layout_type_chooser.dart
@@ -178,8 +178,9 @@ String getLocalPlatformForKBLayoutType(String peerPlatform) {
     localPlatform = kPeerPlatformWindows;
   } else if (isLinux) {
     localPlatform = kPeerPlatformLinux;
+  } else if (isWebOnWindows || isWebOnLinux) {
+    localPlatform = kPeerPlatformWebDesktop;
   }
-  // to-do: web desktop support ?
   return localPlatform;
 }
 

diff --git a/flutter/lib/native/common.dart b/flutter/lib/native/common.dart
@@ -11,3 +11,7 @@ final isWebDesktop_ = false;
 final isDesktop_ = Platform.isWindows || Platform.isMacOS || Platform.isLinux;
 
 String get screenInfo_ => '';
+
+final isWebOnWindows_ = false;
+final isWebOnLinux_ = false;
+final isWebOnMacOS_ = false;
diff --git a/flutter/lib/web/bridge.dart b/flutter/lib/web/bridge.dart
@@ -234,7 +234,7 @@ class RustdeskImpl {
   }
 
   String getLocalKbLayoutType({dynamic hint}) {
-    throw js.context.callMethod('getByName', ['option:local', 'kb_layout']);
+    return js.context.callMethod('getByName', ['option:local', 'kb_layout']);
   }
 
   Future<void> setLocalKbLayoutType(
@@ -415,6 +415,17 @@ class RustdeskImpl {
         ]));
   }
 
+  Future<void> sessionHandleFlutterRawKeyEvent(
+      {required UuidValue sessionId,
+      required String name,
+      required int platformCode,
+      required int positionCode,
+      required int lockModes,
+      required bool downOrUp,
+      dynamic hint}) {
+    throw UnimplementedError();
+  }
+
   void sessionEnterOrLeave(
       {required UuidValue sessionId, required bool enter, dynamic hint}) {
     throw UnimplementedError();

diff --git a/flutter/lib/web/common.dart b/flutter/lib/web/common.dart
@@ -1,4 +1,5 @@
 import 'dart:js' as js;
+import 'dart:html' as html;
 
 final isAndroid_ = false;
 final isIOS_ = false;
@@ -11,3 +12,9 @@ final isWebDesktop_ = !js.context.callMethod('isMobile');
 final isDesktop_ = false;
 
 String get screenInfo_ => js.context.callMethod('getByName', ['screen_info']);
+
+final _userAgent = html.window.navigator.userAgent.toLowerCase();
+
+final isWebOnWindows_ = _userAgent.contains('win');
+final isWebOnLinux_ = _userAgent.contains('linux');
+final isWebOnMacOS_ = _userAgent.contains('mac');
diff --git a/src/server/input_service.rs b/src/server/input_service.rs
@@ -385,6 +385,9 @@ fn run_cursor(sp: MouseCursorService, state: &mut StateCursor) -> ResultType<()>
 
 fn run_window_focus(sp: EmptyExtraFieldService, state: &mut StateWindowFocus) -> ResultType<()> {
     let displays = super::display_service::get_sync_displays();
+    if displays.len() <= 1 {
+        return Ok(());
+    }
     let disp_idx = crate::get_focused_display(displays);
     if let Some(disp_idx) = disp_idx.map(|id| id as i32) {
         if state.is_changed(disp_idx) {