From 8fb664cce9900b674de701c11c0c3f328a0761e2 Mon Sep 17 00:00:00 2001
From: fufesou <shuanglongchen@yeah.net>
Date: Tue, 8 Nov 2022 13:37:08 +0800
Subject: [PATCH] desktop mouse better control

Signed-off-by: fufesou <shuanglongchen@yeah.net>
---
 flutter/lib/consts.dart             |  8 +++++++-
 flutter/lib/models/input_model.dart | 10 ++++++++--
 flutter/lib/models/model.dart       | 11 +++++++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/flutter/lib/consts.dart b/flutter/lib/consts.dart
index ea1142033..8287378e9 100644
--- a/flutter/lib/consts.dart
+++ b/flutter/lib/consts.dart
@@ -21,7 +21,7 @@ const String kTabLabelSettingPage = "Settings";
 
 const String kWindowPrefix = "wm_";
 
-// the executable name of the portable version 
+// the executable name of the portable version
 const String kEnvPortableExecutable = "RUSTDESK_APPNAME";
 
 const Color kColorWarn = Color.fromARGB(255, 245, 133, 59);
@@ -60,6 +60,12 @@ const kInvalidValueStr = "InvalidValueStr";
 
 const kMobilePageConstraints = BoxConstraints(maxWidth: 600);
 
+/// [kMouseControlDistance] indicates the distance that self-side move to get control of mouse.
+const kMouseControlDistance = 12;
+
+/// [kMouseControlTimeoutMSec] indicates the timeout (in milliseconds) that self-side can get control of mouse.
+const kMouseControlTimeoutMSec = 1000;
+
 /// flutter/packages/flutter/lib/src/services/keyboard_key.dart -> _keyLabels
 /// see [LogicalKeyboardKey.keyLabel]
 const Map<int, String> logicalKeyMap = <int, String>{
diff --git a/flutter/lib/models/input_model.dart b/flutter/lib/models/input_model.dart
index ed7e5309a..30a01cda7 100644
--- a/flutter/lib/models/input_model.dart
+++ b/flutter/lib/models/input_model.dart
@@ -308,9 +308,15 @@ class InputModel {
     double y = max(0.0, evt['y']);
     final cursorModel = parent.target!.cursorModel;
 
+    if (cursorModel.is_peer_control_protected) {
+      last_mouse_pos = ui.Offset(x, y);
+      return;
+    }
+
     if (!cursorModel.got_mouse_control) {
-      bool self_get_control = (x - last_mouse_pos.dx).abs() > 12 ||
-          (y - last_mouse_pos.dy).abs() > 12;
+      bool self_get_control =
+          (x - last_mouse_pos.dx).abs() > kMouseControlDistance ||
+              (y - last_mouse_pos.dy).abs() > kMouseControlDistance;
       if (self_get_control) {
         cursorModel.got_mouse_control = true;
       } else {
diff --git a/flutter/lib/models/model.dart b/flutter/lib/models/model.dart
index 41b3d056e..be97b41ff 100644
--- a/flutter/lib/models/model.dart
+++ b/flutter/lib/models/model.dart
@@ -741,6 +741,8 @@ class CursorModel with ChangeNotifier {
   double _displayOriginX = 0;
   double _displayOriginY = 0;
   bool got_mouse_control = true;
+  DateTime _last_peer_mouse = DateTime.now()
+      .subtract(Duration(milliseconds: 2 * kMouseControlTimeoutMSec));
   String id = '';
   WeakReference<FFI> parent;
 
@@ -756,6 +758,10 @@ class CursorModel with ChangeNotifier {
   double get hotx => _hotx;
   double get hoty => _hoty;
 
+  bool get is_peer_control_protected =>
+      DateTime.now().difference(_last_peer_mouse).inMilliseconds <
+      kMouseControlTimeoutMSec;
+
   CursorModel(this.parent);
 
   Set<String> get cachedKeys => _cacheKeys;
@@ -917,7 +923,7 @@ class CursorModel with ChangeNotifier {
     if (parent.target?.id != pid) return;
     _image = image;
     _images[id] = Tuple3(image, _hotx, _hoty);
-    await _updateCacheLinux(image, id, width, height);
+    await _updateCache(image, id, width, height);
     try {
       // my throw exception, because the listener maybe already dispose
       notifyListeners();
@@ -926,7 +932,7 @@ class CursorModel with ChangeNotifier {
     }
   }
 
-  _updateCacheLinux(ui.Image image, int id, int w, int h) async {
+  _updateCache(ui.Image image, int id, int w, int h) async {
     Uint8List? data;
     img2.Image? image2;
     if (Platform.isWindows) {
@@ -981,6 +987,7 @@ class CursorModel with ChangeNotifier {
   /// Update the cursor position.
   updateCursorPosition(Map<String, dynamic> evt, String id) async {
     got_mouse_control = false;
+    _last_peer_mouse = DateTime.now();
     _x = double.parse(evt['x']);
     _y = double.parse(evt['y']);
     try {