feat, open multi windows

Signed-off-by: dignow <linlong1265@gmail.com>

flutter/lib/desktop/pages/desktop_home_page.dart

@@ -329,8 +329,7 @@ class _DesktopHomePageState extends State<DesktopHomePage>
           "Click to download", () async {
         final Uri url = Uri.parse('https://rustdesk.com/download');
         await launchUrl(url);
-      },
-      closeButton: true);
+      }, closeButton: true);
     }
     if (systemError.isNotEmpty) {
       return buildInstallCard("", systemError, "", () {});
@@ -397,7 +396,6 @@ class _DesktopHomePageState extends State<DesktopHomePage>
   Widget buildInstallCard(String title, String content, String btnText,
       GestureTapCallback onPressed,
       {String? help, String? link, bool? closeButton}) {
-
     void closeCard() {
       setState(() {
         isCardClosed = true;
@@ -555,6 +553,22 @@ class _DesktopHomePageState extends State<DesktopHomePage>
     Get.put<RxBool>(svcStopped, tag: 'stop-service');
     rustDeskWinManager.registerActiveWindowListener(onActiveWindowChanged);
 
+    screenToMap(window_size.Screen screen) => {
+          'frame': {
+            'l': screen.frame.left,
+            't': screen.frame.top,
+            'r': screen.frame.right,
+            'b': screen.frame.bottom,
+          },
+          'visibleFrame': {
+            'l': screen.visibleFrame.left,
+            't': screen.visibleFrame.top,
+            'r': screen.visibleFrame.right,
+            'b': screen.visibleFrame.bottom,
+          },
+          'scaleFactor': screen.scaleFactor,
+        };
+
     rustDeskWinManager.setMethodHandler((call, fromWindowId) async {
       debugPrint(
           "[Main] call ${call.method} with args ${call.arguments} from window $fromWindowId");
@@ -563,24 +577,13 @@ class _DesktopHomePageState extends State<DesktopHomePage>
       } else if (call.method == kWindowGetWindowInfo) {
         final screen = (await window_size.getWindowInfo()).screen;
         if (screen == null) {
-          return "";
+          return '';
         } else {
-          return jsonEncode({
-            'frame': {
-              'l': screen.frame.left,
-              't': screen.frame.top,
-              'r': screen.frame.right,
-              'b': screen.frame.bottom,
-            },
-            'visibleFrame': {
-              'l': screen.visibleFrame.left,
-              't': screen.visibleFrame.top,
-              'r': screen.visibleFrame.right,
-              'b': screen.visibleFrame.bottom,
-            },
-            'scaleFactor': screen.scaleFactor,
-          });
+          return jsonEncode(screenToMap(screen));
         }
+      } else if (call.method == kWindowGetScreenList) {
+        return jsonEncode(
+            (await window_size.getScreenList()).map(screenToMap).toList());
       } else if (call.method == kWindowActionRebuild) {
         reloadCurrentWindow();
       } else if (call.method == kWindowEventShow) {
@@ -613,8 +616,9 @@ class _DesktopHomePageState extends State<DesktopHomePage>
         final peerId = args['peer_id'] as String;
         final display = args['display'] as int;
         final displayCount = args['display_count'] as int;
+        final screenRect = args['screen_rect'];
         await rustDeskWinManager.openMonitorSession(
-            windowId, peerId, display, displayCount);
+            windowId, peerId, display, displayCount, screenRect);
       }
     });
     _uniLinksSubscription = listenUniLinks();

flutter/lib/desktop/pages/desktop_setting_page.dart

@@ -1324,6 +1324,8 @@ class _DisplayState extends State<_Display> {
     if (useTextureRender) {
       children.add(otherRow('Show displays as individual windows',
           kKeyShowDisplaysAsIndividualWindows));
+      children.add(otherRow('Use all my displays when connecting',
+          kKeyUseAllMyMonitorsWhenConnecting));
     }
     return _Card(title: 'Other Default Options', children: children);
   }

flutter/lib/desktop/pages/remote_tab_page.dart

@@ -48,6 +48,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
 
   late ToolbarState _toolbarState;
   String? peerId;
+  bool isScreenRectSet = false;
 
   var connectionMap = RxList<Widget>.empty(growable: true);
 
@@ -59,6 +60,9 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
     final tabWindowId = params['tab_window_id'];
     final display = params['display'];
     final displays = params['displays'];
+    final screenRect = parseScreenRect(params);
+    isScreenRectSet = screenRect != null;
+    tryMoveToScreenAndSetFullscreen(screenRect);
     if (peerId != null) {
       ConnectionTypeState.init(peerId!);
       tabController.onSelected = (id) {
@@ -95,6 +99,18 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
     }
   }
 
+  parseScreenRect(Map<String, dynamic> params) {
+    Rect? screenRect;
+    if (params['screen_rect'] != null) {
+      double l = params['screen_rect']['l'];
+      double t = params['screen_rect']['t'];
+      double r = params['screen_rect']['r'];
+      double b = params['screen_rect']['b'];
+      screenRect = Rect.fromLTRB(l, t, r, b);
+    }
+    return screenRect;
+  }
+
   @override
   void initState() {
     super.initState();
@@ -115,7 +131,9 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
         final tabWindowId = args['tab_window_id'];
         final display = args['display'];
         final displays = args['displays'];
+        final screenRect = parseScreenRect(args);
         windowOnTop(windowId());
+        tryMoveToScreenAndSetFullscreen(screenRect);
         if (tabController.length == 0) {
           if (Platform.isMacOS && stateGlobal.closeOnFullscreen) {
             stateGlobal.setFullscreen(true);
@@ -196,15 +214,17 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
       _update_remote_count();
       return returnValue;
     });
-    Future.delayed(Duration.zero, () {
-      restoreWindowPosition(
-        WindowType.RemoteDesktop,
-        windowId: windowId(),
-        peerId: tabController.state.value.tabs.isEmpty
-            ? null
-            : tabController.state.value.tabs[0].key,
-      );
-    });
+    if (!isScreenRectSet) {
+      Future.delayed(Duration.zero, () {
+        restoreWindowPosition(
+          WindowType.RemoteDesktop,
+          windowId: windowId(),
+          peerId: tabController.state.value.tabs.isEmpty
+              ? null
+              : tabController.state.value.tabs[0].key,
+        );
+      });
+    }
   }
 
   @override
@@ -451,6 +471,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
           c++;
         }
       }
+
       loopCloseWindow();
     }
     ConnectionTypeState.delete(id);

flutter/lib/desktop/widgets/remote_toolbar.dart

@@ -1,12 +1,10 @@
 import 'dart:convert';
 import 'dart:async';
 import 'dart:io';
-import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hbb/common/widgets/toolbar.dart';
-import 'package:flutter_hbb/main.dart';
 import 'package:flutter_hbb/models/chat_model.dart';
 import 'package:flutter_hbb/models/state_model.dart';
 import 'package:flutter_hbb/models/desktop_render_texture.dart';
@@ -744,42 +742,14 @@ class _MonitorMenu extends StatelessWidget {
     );
   }
 
-  // Open new tab or window to show this monitor.
-  // For now just open new window.
-  openMonitorInNewTabOrWindow(int i, PeerInfo pi) {
-    if (kWindowId == null) {
-      // unreachable
-      debugPrint('openMonitorInNewTabOrWindow, unreachable! kWindowId is null');
-      return;
-    }
-    DesktopMultiWindow.invokeMethod(
-        kMainWindowId,
-        kWindowEventOpenMonitorSession,
-        jsonEncode({
-          'window_id': kWindowId!,
-          'peer_id': ffi.id,
-          'display': i,
-          'display_count': pi.displays.length,
-        }));
-  }
-
-  openMonitorInTheSameTab(int i, PeerInfo pi) {
-    final displays = i == kAllDisplayValue
-        ? List.generate(pi.displays.length, (index) => index)
-        : [i];
-    bind.sessionSwitchDisplay(
-        sessionId: ffi.sessionId, value: Int32List.fromList(displays));
-    ffi.ffiModel.switchToNewDisplay(i, ffi.sessionId, id);
-  }
-
   onPressed(int i, PeerInfo pi) {
     _menuDismissCallback(ffi);
     RxInt display = CurrentDisplayState.find(id);
     if (display.value != i) {
       if (isChooseDisplayToOpenInNewWindow(pi, ffi.sessionId)) {
-        openMonitorInNewTabOrWindow(i, pi);
+        openMonitorInNewTabOrWindow(i, ffi.id, pi);
       } else {
-        openMonitorInTheSameTab(i, pi);
+        openMonitorInTheSameTab(i, ffi, pi);
       }
     }
   }