Add peer option: zoom cursor & show menubar on conn

Signed-off-by: fufesou <shuanglongchen@yeah.net>

flutter/lib/common/shared_state.dart

@@ -202,6 +202,28 @@ class RemoteCountState {
   static RxInt find() => Get.find<RxInt>(tag: tag());
 }
 
+class PeerBoolOption {
+  static String tag(String id, String opt) => 'peer_{$opt}_$id';
+
+  static void init(String id, String opt, bool Function() init_getter) {
+    final key = tag(id, opt);
+    if (!Get.isRegistered(tag: key)) {
+      final RxBool value = RxBool(init_getter());
+      Get.put(value, tag: key);
+    }
+  }
+
+  static void delete(String id, String opt) {
+    final key = tag(id, opt);
+    if (Get.isRegistered(tag: key)) {
+      Get.delete(tag: key);
+    }
+  }
+
+  static RxBool find(String id, String opt) =>
+      Get.find<RxBool>(tag: tag(id, opt));
+}
+
 class PeerStringOption {
   static String tag(String id, String opt) => 'peer_{$opt}_$id';
 

flutter/lib/desktop/pages/remote_page.dart

@@ -51,6 +51,7 @@ class _RemotePageState extends State<RemotePage>
   String keyboardMode = "legacy";
   final _cursorOverImage = false.obs;
   late RxBool _showRemoteCursor;
+  late RxBool _zoomCursor;
   late RxBool _remoteCursorMoved;
   late RxBool _keyboardEnabled;
 
@@ -68,6 +69,10 @@ class _RemotePageState extends State<RemotePage>
     KeyboardEnabledState.init(id);
     ShowRemoteCursorState.init(id);
     RemoteCursorMovedState.init(id);
+    final optZoomCursor = 'zoom-cursor';
+    PeerBoolOption.init(id, optZoomCursor,
+        () => bind.sessionGetToggleOptionSync(id: id, arg: optZoomCursor));
+    _zoomCursor = PeerBoolOption.find(id, optZoomCursor);
     _showRemoteCursor = ShowRemoteCursorState.find(id);
     _keyboardEnabled = KeyboardEnabledState.find(id);
     _remoteCursorMoved = RemoteCursorMovedState.find(id);
@@ -216,6 +221,7 @@ class _RemotePageState extends State<RemotePage>
         });
         return ImagePaint(
           id: widget.id,
+          zoomCursor: _zoomCursor,
           cursorOverImage: _cursorOverImage,
           keyboardEnabled: _keyboardEnabled,
           remoteCursorMoved: _remoteCursorMoved,
@@ -233,6 +239,7 @@ class _RemotePageState extends State<RemotePage>
         visible: _showRemoteCursor.isTrue && _remoteCursorMoved.isTrue,
         child: CursorPaint(
           id: widget.id,
+          zoomCursor: _zoomCursor,
         ))));
     paints.add(QualityMonitor(_ffi.qualityMonitorModel));
     paints.add(RemoteMenubar(
@@ -253,6 +260,7 @@ class _RemotePageState extends State<RemotePage>
 
 class ImagePaint extends StatefulWidget {
   final String id;
+  final Rx<bool> zoomCursor;
   final Rx<bool> cursorOverImage;
   final Rx<bool> keyboardEnabled;
   final Rx<bool> remoteCursorMoved;
@@ -261,6 +269,7 @@ class ImagePaint extends StatefulWidget {
   ImagePaint(
       {Key? key,
       required this.id,
+      required this.zoomCursor,
       required this.cursorOverImage,
       required this.keyboardEnabled,
       required this.remoteCursorMoved,
@@ -277,6 +286,7 @@ class _ImagePaintState extends State<ImagePaint> {
   final ScrollController _vertical = ScrollController();
 
   String get id => widget.id;
+  Rx<bool> get zoomCursor => widget.zoomCursor;
   Rx<bool> get cursorOverImage => widget.cursorOverImage;
   Rx<bool> get keyboardEnabled => widget.keyboardEnabled;
   Rx<bool> get remoteCursorMoved => widget.remoteCursorMoved;
@@ -357,7 +367,7 @@ class _ImagePaintState extends State<ImagePaint> {
     if (cache == null) {
       return MouseCursor.defer;
     } else {
-      final key = cache.updateGetKey(scale);
+      final key = cache.updateGetKey(scale, zoomCursor.value);
       cursor.addKey(key);
       return FlutterCustomMemoryImageCursor(
         pixbuf: cache.data,
@@ -500,8 +510,13 @@ class _ImagePaintState extends State<ImagePaint> {
 
 class CursorPaint extends StatelessWidget {
   final String id;
+  final RxBool zoomCursor;
 
-  const CursorPaint({Key? key, required this.id}) : super(key: key);
+  const CursorPaint({
+    Key? key,
+    required this.id,
+    required this.zoomCursor,
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -516,13 +531,21 @@ class CursorPaint extends StatelessWidget {
         hoty = m.defaultImage!.height / 2;
       }
     }
-    return CustomPaint(
-      painter: ImagePainter(
-          image: m.image ?? m.defaultImage,
-          x: m.x - hotx + c.x / c.scale,
-          y: m.y - hoty + c.y / c.scale,
-          scale: c.scale),
-    );
+    return zoomCursor.isTrue
+        ? CustomPaint(
+            painter: ImagePainter(
+                image: m.image ?? m.defaultImage,
+                x: m.x - hotx + c.x / c.scale,
+                y: m.y - hoty + c.y / c.scale,
+                scale: c.scale),
+          )
+        : CustomPaint(
+            painter: ImagePainter(
+                image: m.image ?? m.defaultImage,
+                x: (m.x - hotx) * c.scale + c.x,
+                y: (m.y - hoty) * c.scale + c.y,
+                scale: 1.0),
+          );
   }
 }
 

flutter/lib/desktop/widgets/remote_menubar.dart

@@ -47,7 +47,8 @@ class MenubarState {
   }
 
   _initSet(bool s, bool p) {
-    show = RxBool(s);
+    // Show remubar when connection is established.
+    show = RxBool(true);
     _pin = RxBool(p);
   }
 
@@ -1109,6 +1110,25 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
       );
     }());
 
+    /// Show remote cursor
+    displayMenu.add(() {
+      final opt = 'zoom-cursor';
+      final state = PeerBoolOption.find(widget.id, opt);
+      return MenuEntrySwitch2<String>(
+        switchType: SwitchType.scheckbox,
+        text: translate('Zoom cursor'),
+        getter: () {
+          return state;
+        },
+        setter: (bool v) async {
+          state.value = v;
+          await bind.sessionToggleOption(id: widget.id, value: opt);
+        },
+        padding: padding,
+        dismissOnClicked: true,
+      );
+    }());
+
     /// Show quality monitor
     displayMenu.add(MenuEntrySwitch<String>(
       switchType: SwitchType.scheckbox,

flutter/lib/models/model.dart

@@ -718,35 +718,44 @@ class CursorData {
 
   int _doubleToInt(double v) => (v * 10e6).round().toInt();
 
-  double _checkUpdateScale(double scale) {
-    // Update data if scale changed.
-    if (Platform.isWindows) {
-      final tgtWidth = (width * scale).toInt();
-      final tgtHeight = (width * scale).toInt();
-      if (tgtWidth < kMinCursorSize || tgtHeight < kMinCursorSize) {
-        double sw = kMinCursorSize.toDouble() / width;
-        double sh = kMinCursorSize.toDouble() / height;
-        scale = sw < sh ? sh : sw;
+  double _checkUpdateScale(double scale, bool shouldScale) {
+    double oldScale = this.scale;
+    if (!shouldScale) {
+      scale = 1.0;
+    } else {
+      // Update data if scale changed.
+      if (Platform.isWindows) {
+        final tgtWidth = (width * scale).toInt();
+        final tgtHeight = (width * scale).toInt();
+        if (tgtWidth < kMinCursorSize || tgtHeight < kMinCursorSize) {
+          double sw = kMinCursorSize.toDouble() / width;
+          double sh = kMinCursorSize.toDouble() / height;
+          scale = sw < sh ? sh : sw;
+        }
       }
-      if (_doubleToInt(this.scale) != _doubleToInt(scale)) {
+    }
+
+    if (Platform.isWindows) {
+      if (_doubleToInt(oldScale) != _doubleToInt(scale)) {
         data = img2
             .copyResize(
               image!,
               width: (width * scale).toInt(),
               height: (height * scale).toInt(),
-              interpolation: img2.Interpolation.linear,
+              interpolation: img2.Interpolation.average,
             )
             .getBytes(format: img2.Format.bgra);
       }
     }
+
     this.scale = scale;
     hotx = hotxOrigin * scale;
     hoty = hotyOrigin * scale;
     return scale;
   }
 
-  String updateGetKey(double scale) {
-    scale = _checkUpdateScale(scale);
+  String updateGetKey(double scale, bool shouldScale) {
+    scale = _checkUpdateScale(scale, shouldScale);
     return '${peerId}_${id}_${_doubleToInt(width * scale)}_${_doubleToInt(height * scale)}';
   }
 }

src/lang/cn.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", "或"),
         ("Continue with", "使用"),
         ("Elevate", "提权"),
+        ("Zoom cursor", "缩放鼠标"),
     ].iter().cloned().collect();
 }

src/lang/cs.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/da.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/de.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/eo.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/es.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", "o"),
         ("Continue with", "Continuar con"),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/fa.rs

@@ -388,5 +388,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("This PC", "This PC"),
         ("or", "یا"),
         ("Continue with", "ادامه با"),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/fr.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", "ou"),
         ("Continue with", "Continuer avec"),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/hu.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", "vagy"),
         ("Continue with", "Folytatás a következővel"),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/id.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/it.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/ja.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/ko.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/kz.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/pl.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", "albo"),
         ("Continue with", "Kontynuuj z"),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/pt_PT.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/ptbr.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", "ou"),
         ("Continue with", "Continuar com"),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/ru.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", "или"),
         ("Continue with", "Продолжить с"),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/sk.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/template.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/tr.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/tw.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", "提權"),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/ua.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }

src/lang/vn.rs

@@ -389,5 +389,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("or", ""),
         ("Continue with", ""),
         ("Elevate", ""),
+        ("Zoom cursor", ""),
     ].iter().cloned().collect();
 }