Merge remote-tracking branch 'rd/master' into feat/x11/clipboard-file/init

Signed-off-by: ClSlaid <cailue@bupt.edu.cn>

flutter/lib/common/widgets/address_book.dart

@@ -229,6 +229,22 @@ class _AddressBookState extends State<AddressBook> {
     );
   }
 
+  @protected
+  MenuEntryBase<String> filterMenuItem() {
+    return MenuEntrySwitch<String>(
+      switchType: SwitchType.scheckbox,
+      text: translate('Filter by intersection'),
+      getter: () async {
+        return filterAbTagByIntersection();
+      },
+      setter: (bool v) async {
+        bind.mainSetLocalOption(key: filterAbTagOption, value: v ? 'Y' : '');
+        gFFI.abModel.filterByIntersection.value = v;
+      },
+      dismissOnClicked: true,
+    );
+  }
+
   void _showMenu(RelativeRect pos) {
     final items = [
       getEntry(translate("Add ID"), abAddId),
@@ -236,6 +252,7 @@ class _AddressBookState extends State<AddressBook> {
       getEntry(translate("Unselect all tags"), gFFI.abModel.unsetSelectedTags),
       sortMenuItem(),
       syncMenuItem(),
+      filterMenuItem(),
     ];
 
     mod_menu.showMenu(

flutter/lib/common/widgets/dialog.dart

@@ -1295,7 +1295,7 @@ customImageQualityDialog(SessionID sessionId, String id, FFI ffi) async {
         ConnectionTypeState.find(id).direct.value == ConnectionType.strDirect;
   } catch (_) {}
   bool notShowFps = (await bind.mainIsUsingPublicServer() && direct != true) ||
-      version_cmp(ffi.ffiModel.pi.version, '1.2.0') < 0;
+      versionCmp(ffi.ffiModel.pi.version, '1.2.0') < 0;
 
   final content = customImageQualityWidget(
       initQuality: qualityInitValue,

flutter/lib/common/widgets/peer_card.dart

@@ -600,7 +600,7 @@ abstract class BasePeerCard extends StatelessWidget {
       await _openNewConnInAction(id, 'Open in New Tab', kOptionOpenInTabs);
 
   _openInWindowsAction(String id) async => await _openNewConnInAction(
-      id, 'Open in New Window', kOptionOpenInWindows);
+      id, 'Open in new window', kOptionOpenInWindows);
 
   _openNewConnInOptAction(String id) async =>
       mainGetLocalBoolOptionSync(kOptionOpenNewConnInTabs)

flutter/lib/common/widgets/peers_view.dart

@@ -450,12 +450,21 @@ class AddressBookPeersView extends BasePeersView {
     if (selectedTags.isEmpty) {
       return true;
     }
-    for (final tag in selectedTags) {
-      if (idents.contains(tag)) {
-        return true;
+    if (gFFI.abModel.filterByIntersection.value) {
+      for (final tag in selectedTags) {
+        if (!idents.contains(tag)) {
+          return false;
+        }
       }
+      return true;
+    } else {
+      for (final tag in selectedTags) {
+        if (idents.contains(tag)) {
+          return true;
+        }
+      }
+      return false;
     }
-    return false;
   }
 }
 

flutter/lib/common/widgets/toolbar.dart

@@ -9,6 +9,7 @@ import 'package:flutter_hbb/common/widgets/dialog.dart';
 import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/models/model.dart';
 import 'package:flutter_hbb/models/platform_model.dart';
+import 'package:flutter_hbb/models/desktop_render_texture.dart';
 import 'package:get/get.dart';
 
 bool isEditOsPassword = false;
@@ -90,7 +91,7 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
   v.add(
     TTextMenu(
       child: Row(children: [
-        Text(translate(pi.is_headless ? 'OS Account' : 'OS Password')),
+        Text(translate(pi.isHeadless ? 'OS Account' : 'OS Password')),
         Offstage(
           offstage: isDesktop,
           child: Icon(Icons.edit, color: MyTheme.accent).marginOnly(left: 12),
@@ -99,13 +100,13 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
       trailingIcon: Transform.scale(
         scale: 0.8,
         child: InkWell(
-          onTap: () => pi.is_headless
+          onTap: () => pi.isHeadless
               ? showSetOSAccount(sessionId, ffi.dialogManager)
               : handleOsPasswordEditIcon(sessionId, ffi.dialogManager),
           child: Icon(Icons.edit),
         ),
       ),
-      onPressed: () => pi.is_headless
+      onPressed: () => pi.isHeadless
           ? showSetOSAccount(sessionId, ffi.dialogManager)
           : handleOsPasswordAction(sessionId, ffi.dialogManager),
     ),
@@ -208,7 +209,8 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
       ffiModel.keyboard &&
       pi.platform != kPeerPlatformAndroid &&
       pi.platform != kPeerPlatformMacOS &&
-      version_cmp(pi.version, '1.2.0') >= 0) {
+      versionCmp(pi.version, '1.2.0') >= 0 &&
+      bind.peerGetDefaultSessionsCount(id: id) == 1) {
     v.add(TTextMenu(
         child: Text(translate('Switch Sides')),
         onPressed: () =>
@@ -217,8 +219,9 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
   // refresh
   if (pi.version.isNotEmpty) {
     v.add(TTextMenu(
-        child: Text(translate('Refresh')),
-        onPressed: () => bind.sessionRefresh(sessionId: sessionId)));
+      child: Text(translate('Refresh')),
+      onPressed: () => sessionRefreshVideo(sessionId, pi),
+    ));
   }
   // record
   var codecFormat = ffi.qualityMonitorModel.data.codecFormat;
@@ -377,7 +380,7 @@ Future<List<TToggleMenu>> toolbarDisplayToggle(
   // show remote cursor
   if (pi.platform != kPeerPlatformAndroid &&
       !ffi.canvasModel.cursorEmbedded &&
-      !pi.is_wayland) {
+      !pi.isWayland) {
     final state = ShowRemoteCursorState.find(id);
     final enabled = !ffiModel.viewOnly;
     final option = 'show-remote-cursor';
@@ -486,7 +489,8 @@ Future<List<TToggleMenu>> toolbarDisplayToggle(
         value: rxValue.value,
         onChanged: (value) {
           if (value == null) return;
-          if (ffiModel.pi.currentDisplay != 0) {
+          if (ffiModel.pi.currentDisplay != 0 &&
+              ffiModel.pi.currentDisplay != kAllDisplayValue) {
             msgBox(sessionId, 'custom-nook-nocancel-hasclose', 'info',
                 'Please switch to Display 1 first', '', ffi.dialogManager);
             return;
@@ -510,5 +514,24 @@ Future<List<TToggleMenu>> toolbarDisplayToggle(
         },
         child: Text(translate('Swap control-command key'))));
   }
+
+  if (useTextureRender &&
+      pi.isSupportMultiDisplay &&
+      PrivacyModeState.find(id).isFalse &&
+      pi.displaysCount.value > 1 &&
+      bind.mainGetUserDefaultOption(key: kKeyShowMonitorsToolbar) == 'Y') {
+    final value =
+        bind.sessionGetDisplaysAsIndividualWindows(sessionId: ffi.sessionId) ==
+            'Y';
+    v.add(TToggleMenu(
+        value: value,
+        onChanged: (value) {
+          if (value == null) return;
+          bind.sessionSetDisplaysAsIndividualWindows(
+              sessionId: sessionId, value: value ? 'Y' : '');
+        },
+        child: Text(translate('Show displays as individual windows'))));
+  }
+
   return v;
 }