Merge branch 'rustdesk/master'

.github/workflows/ci.yml

@@ -78,10 +78,45 @@ jobs:
       shell: bash
       run: |
         case ${{ matrix.job.target }} in
-          x86_64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt install -y g++ gcc git curl wget nasm yasm libgtk-3-dev clang libxcb-randr0-dev libxdo-dev libxfixes-dev libxcb-shape0-dev libxcb-xfixes0-dev libasound2-dev libpulse-dev cmake libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev ;;
+          x86_64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt install -y g++ gcc git curl wget nasm yasm libgtk-3-dev clang libxcb-randr0-dev libxdo-dev libxfixes-dev libxcb-shape0-dev libxcb-xfixes0-dev libasound2-dev libpulse-dev cmake libclang-dev ninja-build libappindicator3-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev;;
           # arm-unknown-linux-*) sudo apt-get -y update ; sudo apt-get -y install gcc-arm-linux-gnueabihf ;;
           # aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu ;;
         esac
+    
+    - name: Install flutter
+      uses: subosito/flutter-action@v2
+      with:
+        channel: 'stable'
+
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        target: ${{ matrix.job.target }}
+        override: true
+        profile: minimal # minimal component installation (ie, no documentation)
+
+    - name: Install flutter rust bridge deps
+      run: |
+        dart pub global activate ffigen --version 5.0.1
+        # flutter_rust_bridge
+        pushd /tmp && git clone https://github.com/SoLongAndThanksForAllThePizza/flutter_rust_bridge --depth=1 && popd
+        pushd /tmp/flutter_rust_bridge/frb_codegen && cargo install --path . && popd
+        pushd flutter && flutter pub get && popd
+        ~/.cargo/bin/flutter_rust_bridge_codegen --rust-input ./src/flutter_ffi.rs --dart-output ./flutter/lib/generated_bridge.dart
+
+    - name: Install corrosion
+      run: |
+        mkdir /tmp/corrosion
+        pushd /tmp/corrosion
+        git clone https://github.com/corrosion-rs/corrosion.git
+        # Optionally, specify -DCMAKE_INSTALL_PREFIX=<target-install-path>. You can install Corrosion anyway
+        cmake -Scorrosion -Bbuild -DCMAKE_BUILD_TYPE=Release
+        cmake --build build --config Release
+        # This next step may require sudo or admin privileges if you're installing to a system location,
+        # which is the default.
+        sudo cmake --install build --config Release
+        popd
 
     - name: Restore from cache and install vcpkg
       uses: lukka/run-vcpkg@v7
@@ -92,15 +127,7 @@ jobs:
     - name: Install vcpkg dependencies
       run: |
         $VCPKG_ROOT/vcpkg install libvpx libyuv opus
-      shell: bash        
-
-    - name: Install Rust toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        target: ${{ matrix.job.target }}
-        override: true
-        profile: minimal # minimal component installation (ie, no documentation)
+      shell: bash
 
     - name: Show version information (Rust, cargo, GCC)
       shell: bash
@@ -114,12 +141,19 @@ jobs:
 
     - uses: Swatinem/rust-cache@v1
   
-    - name: Build
-      uses: actions-rs/cargo@v1
-      with:
-        use-cross: ${{ matrix.job.use-cross }}
-        command: build
-        args: --locked --release --target=${{ matrix.job.target }}
+#    - name: Build
+#      uses: actions-rs/cargo@v1
+#      with:
+#        use-cross: ${{ matrix.job.use-cross }}
+#        command: build
+#        args: --locked --release --target=${{ matrix.job.target }} --features flutter -v
+
+    - name: Build Flutter
+      run: |
+        pushd flutter
+        flutter pub get
+        flutter build linux --release -v
+        popd
 
     # - name: Strip debug information from executable
     #   id: strip

.gitignore

+/build
 /target
 .vscode
 .idea

Cargo.toml

@@ -24,8 +24,9 @@ appimage = []
 use_samplerate = ["samplerate"]
 use_rubato = ["rubato"]
 use_dasp = ["dasp"]
+flutter = ["flutter_rust_bridge"]
+default = ["use_dasp","flutter"]
 hwcodec = ["scrap/hwcodec"]
-default = ["use_dasp"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -44,7 +45,7 @@ libc = "0.2"
 parity-tokio-ipc = { git = "https://github.com/open-trade/parity-tokio-ipc" }
 flexi_logger = { version = "0.22", features = ["async", "use_chrono_for_offset"] }
 runas = "0.2"
-magnum-opus = { git = "https://github.com/open-trade/magnum-opus" }
+magnum-opus = { git = "https://github.com/SoLongAndThanksForAllThePizza/magnum-opus" }
 dasp = { version = "0.11", features = ["signal", "interpolate-linear", "interpolate"], optional = true }
 rubato = { version = "0.12", optional = true }
 samplerate = { version = "0.2", optional = true }
@@ -58,6 +59,8 @@ num_cpus = "1.13"
 bytes = { version = "1.2", features = ["serde"] }
 default-net = "0.11.0"
 wol-rs = "0.9.1"
+flutter_rust_bridge = { git = "https://github.com/SoLongAndThanksForAllThePizza/flutter_rust_bridge", optional = true }
+errno = "0.2.8"
 
 [target.'cfg(not(target_os = "linux"))'.dependencies]
 reqwest = { version = "0.11", features = ["json", "rustls-tls"], default-features=false }
@@ -113,7 +116,7 @@ android_logger = "0.11"
 jni = "0.19"
 
 [target.'cfg(any(target_os = "android", target_os = "ios"))'.dependencies]
-flutter_rust_bridge = "=1.30.0"
+flutter_rust_bridge = { git = "https://github.com/SoLongAndThanksForAllThePizza/flutter_rust_bridge" }
 
 [workspace]
 members = ["libs/scrap", "libs/hbb_common", "libs/enigo", "libs/clipboard", "libs/virtual_display", "libs/simple_rc"]
@@ -131,7 +134,7 @@ winapi = { version = "0.3", features = [ "winnt" ] }
 cc = "1.0"
 hbb_common = { path = "libs/hbb_common" }
 simple_rc = { path = "libs/simple_rc", optional = true }
-flutter_rust_bridge_codegen = "=1.30.0"
+flutter_rust_bridge_codegen = { git = "https://github.com/SoLongAndThanksForAllThePizza/flutter_rust_bridge" }
 
 [dev-dependencies]
 hound = "3.4"

PKGBUILD

 pkgname=rustdesk
-pkgver=1.1.9
+pkgver=1.1.10
 pkgrel=0
 epoch=
 pkgdesc=""
@@ -27,5 +27,5 @@ package() {
   install -Dm 644 $HBB/rustdesk.service -t "${pkgdir}/usr/share/rustdesk/files"
   install -Dm 644 $HBB/rustdesk.desktop -t "${pkgdir}/usr/share/rustdesk/files"
   install -Dm 644 $HBB/pynput_service.py -t "${pkgdir}/usr/share/rustdesk/files"
-  install -Dm 644 $HBB/256-no-margin.png "${pkgdir}/usr/share/rustdesk/files/rustdesk.png"
+  install -Dm 644 $HBB/128x128@2x.png "${pkgdir}/usr/share/rustdesk/files/rustdesk.png"
 }

README.md

@@ -39,14 +39,14 @@ Below are the servers you are using for free, it may change along the time. If y
 
 ## Dependencies
 
-Desktop versions use [sciter](https://sciter.com/) for GUI, please download sciter dynamic library yourself.
+Desktop versions use [sciter](https://sciter.com/) or Flutter for GUI, this tutorial is for Sciter only. 
+
+Please download sciter dynamic library yourself.
 
 [Windows](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.win/x64/sciter.dll) |
 [Linux](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so) |
 [MacOS](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.osx/libsciter.dylib)
 
-Mobile versions use Flutter. We will migrate desktop version from Sciter to Flutter.
-
 ## Raw steps to build
 
 - Prepare your Rust development env and C++ build env

build.rs

@@ -77,15 +77,22 @@ fn install_oboe() {
 }
 
 fn gen_flutter_rust_bridge() {
+    let llvm_path = match std::env::var("LLVM_HOME") {
+        Ok(path) => Some(vec![path]),
+        Err(_) => None,
+    };
     // Tell Cargo that if the given file changes, to rerun this build script.
-    println!("cargo:rerun-if-changed=src/mobile_ffi.rs");
+    println!("cargo:rerun-if-changed=src/flutter_ffi.rs");
     // settings for fbr_codegen
     let opts = lib_flutter_rust_bridge_codegen::Opts {
         // Path of input Rust code
-        rust_input: "src/mobile_ffi.rs".to_string(),
+        rust_input: "src/flutter_ffi.rs".to_string(),
         // Path of output generated Dart code
         dart_output: "flutter/lib/generated_bridge.dart".to_string(),
+        // Path of output generated C header
+        c_output: Some(vec!["flutter/macos/Runner/bridge_generated.h".to_string()]),
         // for other options lets use default
+        llvm_path,
         ..Default::default()
     };
     // run fbr_codegen
@@ -96,11 +103,11 @@ fn main() {
     hbb_common::gen_version();
     install_oboe();
     // there is problem with cfg(target_os) in build.rs, so use our workaround
-    let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
-    if target_os == "android" || target_os == "ios" {
-        gen_flutter_rust_bridge();
-        return;
-    }
+    // let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
+    // if target_os == "android" || target_os == "ios" {
+    gen_flutter_rust_bridge();
+    //     return;
+    // }
     #[cfg(all(windows, feature = "with_rc"))]
     build_rc_source();
     #[cfg(all(windows, feature = "inline"))]

flutter/.gitignore

@@ -45,15 +45,14 @@ jniLibs
 
 # flutter rust bridge
 lib/generated_bridge.dart
+lib/generated_bridge.freezed.dart
 
 # Flutter Generated Files
-linux/flutter/generated_plugin_registrant.cc
-linux/flutter/generated_plugin_registrant.h
-linux/flutter/generated_plugins.cmake
-macos/Flutter/GeneratedPluginRegistrant.swift
-windows/flutter/generated_plugin_registrant.cc
-windows/flutter/generated_plugin_registrant.h
-windows/flutter/generated_plugins.cmake
+**/flutter/GeneratedPluginRegistrant.swift
+**/flutter/generated_plugin_registrant.cc
+**/flutter/generated_plugin_registrant.h
+**/flutter/generated_plugins.cmake
+**/Runner/bridge_generated.h
 flutter_export_environment.sh
 Flutter-Generated.xcconfig
 key.jks

flutter/.metadata

 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
 
 version:
-  revision: 8874f21e79d7ec66d0457c7ab338348e31b17f1d
+  revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
   channel: stable
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+    - platform: linux
+      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+    - platform: macos
+      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+    - platform: windows
+      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

flutter/README.md

+# flutter_hbb
+
+A new Flutter project.
+
+## Getting Started
+
+This project is a starting point for a Flutter application.
+
+A few resources to get you started if this is your first Flutter project:
+
+- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
+- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
+
+For help getting started with Flutter development, view the
+[online documentation](https://docs.flutter.dev/), which offers tutorials,
+samples, guidance on mobile development, and a full API reference.

flutter/analysis_options.yaml

+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at
+  # https://dart-lang.github.io/linter/lints/index.html.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

flutter/lib/cm_main.dart

+import 'package:flutter/material.dart';
+import 'package:flutter_hbb/consts.dart';
+import 'package:flutter_hbb/main.dart';
+import 'package:get/get.dart';
+import 'package:window_manager/window_manager.dart';
+
+import 'common.dart';
+import 'desktop/pages/server_page.dart';
+import 'models/server_model.dart';
+
+/// -t lib/cm_main.dart to test cm
+void main(List<String> args) async {
+  WidgetsFlutterBinding.ensureInitialized();
+  await windowManager.ensureInitialized();
+  await windowManager.setSize(Size(400, 600));
+  await windowManager.setAlignment(Alignment.topRight);
+  await initEnv(kAppTypeMain);
+  gFFI.serverModel.clients
+      .add(Client(0, false, false, "UserA", "123123123", true, false, false));
+  gFFI.serverModel.clients
+      .add(Client(1, false, false, "UserB", "221123123", true, false, false));
+  gFFI.serverModel.clients
+      .add(Client(2, false, false, "UserC", "331123123", true, false, false));
+  gFFI.serverModel.clients
+      .add(Client(3, false, false, "UserD", "441123123", true, false, false));
+  runApp(GetMaterialApp(
+      debugShowCheckedModeBanner: false,
+      theme: getCurrentTheme(),
+      home: DesktopServerPage()));
+}

flutter/lib/common/formatter/id_formatter.dart

+import 'package:flutter/material.dart';
+
+/// TODO: Divide every 3 number to display ID
+class IdFormController extends TextEditingController {}

flutter/lib/consts.dart

+const double kDesktopRemoteTabBarHeight = 28.0;
+
+/// [kAppTypeMain] used by 'Desktop Main Page' , 'Mobile (Client and Server)' , 'Desktop CM Page'
+const String kAppTypeMain = "main";
+const String kAppTypeDesktopRemote = "remote";
+const String kAppTypeDesktopFileTransfer = "file transfer";
+const String kTabLabelHomePage = "Home";
+const String kTabLabelSettingPage = "Settings";
+
+const int kDefaultDisplayWidth = 1280;
+const int kDefaultDisplayHeight = 720;

flutter/lib/desktop/pages/connection_tab_page.dart

+import 'dart:convert';
+
+import 'package:desktop_multi_window/desktop_multi_window.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hbb/common.dart';
+import 'package:flutter_hbb/consts.dart';
+import 'package:flutter_hbb/desktop/pages/remote_page.dart';
+import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
+import 'package:flutter_hbb/utils/multi_window_manager.dart';
+import 'package:get/get.dart';
+
+import '../../models/model.dart';
+
+class ConnectionTabPage extends StatefulWidget {
+  final Map<String, dynamic> params;
+
+  const ConnectionTabPage({Key? key, required this.params}) : super(key: key);
+
+  @override
+  State<ConnectionTabPage> createState() => _ConnectionTabPageState(params);
+}
+
+class _ConnectionTabPageState extends State<ConnectionTabPage> {
+  final tabController = Get.put(DesktopTabController());
+  static final Rx<String> _fullscreenID = "".obs;
+  static final IconData selectedIcon = Icons.desktop_windows_sharp;
+  static final IconData unselectedIcon = Icons.desktop_windows_outlined;
+
+  var connectionMap = RxList<Widget>.empty(growable: true);
+
+  _ConnectionTabPageState(Map<String, dynamic> params) {
+    if (params['id'] != null) {
+      tabController.add(TabInfo(
+          key: params['id'],
+          label: params['id'],
+          selectedIcon: selectedIcon,
+          unselectedIcon: unselectedIcon,
+          page: RemotePage(
+            key: ValueKey(params['id']),
+            id: params['id'],
+            tabBarHeight:
+                _fullscreenID.value.isNotEmpty ? 0 : kDesktopRemoteTabBarHeight,
+            fullscreenID: _fullscreenID,
+          )));
+    }
+  }
+
+  @override
+  void initState() {
+    super.initState();
+
+    tabController.onRemove = (_, id) => onRemoveId(id);
+
+    rustDeskWinManager.setMethodHandler((call, fromWindowId) async {
+      print(
+          "call ${call.method} with args ${call.arguments} from window ${fromWindowId}");
+      // for simplify, just replace connectionId
+      if (call.method == "new_remote_desktop") {
+        final args = jsonDecode(call.arguments);
+        final id = args['id'];
+        window_on_top(windowId());
+        tabController.add(TabInfo(
+            key: id,
+            label: id,
+            selectedIcon: selectedIcon,
+            unselectedIcon: unselectedIcon,
+            page: RemotePage(
+              key: ValueKey(id),
+              id: id,
+              tabBarHeight: _fullscreenID.value.isNotEmpty
+                  ? 0
+                  : kDesktopRemoteTabBarHeight,
+              fullscreenID: _fullscreenID,
+            )));
+      } else if (call.method == "onDestroy") {
+        tabController.state.value.tabs.forEach((tab) {
+          print("executing onDestroy hook, closing ${tab.label}}");
+          final tag = tab.label;
+          ffi(tag).close().then((_) {
+            Get.delete<FFI>(tag: tag);
+          });
+        });
+        Get.back();
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = isDarkTheme() ? TarBarTheme.dark() : TarBarTheme.light();
+    return SubWindowDragToResizeArea(
+      windowId: windowId(),
+      child: Container(
+        decoration: BoxDecoration(
+            border: Border.all(color: MyTheme.color(context).border!)),
+        child: Scaffold(
+            backgroundColor: MyTheme.color(context).bg,
+            body: Obx(() => DesktopTab(
+                  controller: tabController,
+                  theme: theme,
+                  isMainWindow: false,
+                  showTabBar: _fullscreenID.value.isEmpty,
+                  tail: AddButton(
+                    theme: theme,
+                  ).paddingOnly(left: 10),
+                  pageViewBuilder: (pageView) {
+                    WindowController.fromWindowId(windowId())
+                        .setFullscreen(_fullscreenID.value.isNotEmpty);
+                    return pageView;
+                  },
+                ))),
+      ),
+    );
+  }
+
+  void onRemoveId(String id) {
+    ffi(id).close();
+    if (tabController.state.value.tabs.length == 0) {
+      WindowController.fromWindowId(windowId()).close();
+    }
+  }
+
+  int windowId() {
+    return widget.params["windowId"];
+  }
+}

flutter/lib/desktop/pages/desktop_tab_page.dart

+import 'package:flutter/material.dart';
+import 'package:flutter_hbb/common.dart';
+import 'package:flutter_hbb/consts.dart';
+import 'package:flutter_hbb/desktop/pages/desktop_home_page.dart';
+import 'package:flutter_hbb/desktop/pages/desktop_setting_page.dart';
+import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
+import 'package:window_manager/window_manager.dart';
+
+class DesktopTabPage extends StatefulWidget {
+  const DesktopTabPage({Key? key}) : super(key: key);
+
+  @override
+  State<DesktopTabPage> createState() => _DesktopTabPageState();
+}
+
+class _DesktopTabPageState extends State<DesktopTabPage> {
+  final tabController = DesktopTabController();
+
+  @override
+  void initState() {
+    super.initState();
+    tabController.add(TabInfo(
+        key: kTabLabelHomePage,
+        label: kTabLabelHomePage,
+        selectedIcon: Icons.home_sharp,
+        unselectedIcon: Icons.home_outlined,
+        closable: false,
+        page: DesktopHomePage(
+          key: const ValueKey(kTabLabelHomePage),
+        )));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final dark = isDarkTheme();
+    return DragToResizeArea(
+      child: Container(
+        decoration: BoxDecoration(
+            border: Border.all(color: MyTheme.color(context).border!)),
+        child: Scaffold(
+            backgroundColor: MyTheme.color(context).bg,
+            body: DesktopTab(
+              controller: tabController,
+              theme: dark ? TarBarTheme.dark() : TarBarTheme.light(),
+              isMainWindow: true,
+              tail: ActionIcon(
+                message: 'Settings',
+                icon: IconFont.menu,
+                theme: dark ? TarBarTheme.dark() : TarBarTheme.light(),
+                onTap: onAddSetting,
+                is_close: false,
+              ),
+            )),
+      ),
+    );
+  }
+
+  void onAddSetting() {
+    tabController.add(TabInfo(
+        key: kTabLabelSettingPage,
+        label: kTabLabelSettingPage,
+        selectedIcon: Icons.build_sharp,
+        unselectedIcon: Icons.build_outlined,
+        page: DesktopSettingPage(key: const ValueKey(kTabLabelSettingPage))));
+  }
+}

flutter/lib/desktop/screen/desktop_file_transfer_screen.dart

+import 'package:flutter/material.dart';
+import 'package:flutter_hbb/common.dart';
+import 'package:flutter_hbb/desktop/pages/file_manager_tab_page.dart';
+import 'package:provider/provider.dart';
+
+/// multi-tab file transfer remote screen
+class DesktopFileTransferScreen extends StatelessWidget {
+  final Map<String, dynamic> params;
+
+  const DesktopFileTransferScreen({Key? key, required this.params})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return MultiProvider(
+      providers: [
+        ChangeNotifierProvider.value(value: gFFI.ffiModel),
+        ChangeNotifierProvider.value(value: gFFI.imageModel),
+        ChangeNotifierProvider.value(value: gFFI.cursorModel),
+        ChangeNotifierProvider.value(value: gFFI.canvasModel),
+      ],
+      child: Scaffold(
+        body: FileManagerTabPage(
+          params: params,
+        ),
+      ),
+    );
+  }
+}

flutter/lib/desktop/screen/desktop_remote_screen.dart

+import 'package:flutter/material.dart';
+import 'package:flutter_hbb/common.dart';
+import 'package:flutter_hbb/desktop/pages/connection_tab_page.dart';
+import 'package:provider/provider.dart';
+
+/// multi-tab desktop remote screen
+class DesktopRemoteScreen extends StatelessWidget {
+  final Map<String, dynamic> params;
+
+  const DesktopRemoteScreen({Key? key, required this.params}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return MultiProvider(
+        providers: [
+          ChangeNotifierProvider.value(value: gFFI.ffiModel),
+          ChangeNotifierProvider.value(value: gFFI.imageModel),
+          ChangeNotifierProvider.value(value: gFFI.cursorModel),
+          ChangeNotifierProvider.value(value: gFFI.canvasModel),
+        ],
+        child: Scaffold(
+          body: ConnectionTabPage(
+            params: params,
+          ),
+        ));
+  }
+}

flutter/lib/widgets/gesture_help.dart → flutter/lib/mobile/widgets/gesture_help.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hbb/common.dart';
 import 'package:toggle_switch/toggle_switch.dart';
 
-import '../models/model.dart';
+import '../../models/model.dart';
 
 class GestureIcons {
   static const String _family = 'gestureicons';

flutter/lib/models/platform_model.dart

+import 'package:flutter_hbb/generated_bridge.dart';
+import 'native_model.dart' if (dart.library.html) 'web_model.dart';
+
+final platformFFI = PlatformFFI.instance;
+final localeName = PlatformFFI.localeName;
+
+RustdeskImpl get bind => platformFFI.ffiBind;

flutter/linux/.gitignore

+flutter/ephemeral

flutter/macos/Flutter/Flutter-Debug.xcconfig

+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
+#include "ephemeral/Flutter-Generated.xcconfig"