diff --git a/.github/workflows/flutter-nightly.yml b/.github/workflows/flutter-nightly.yml
index 4ccd42081..eb13edf15 100644
--- a/.github/workflows/flutter-nightly.yml
+++ b/.github/workflows/flutter-nightly.yml
@@ -47,8 +47,8 @@ jobs:
run: |
flutter doctor -v
flutter precache --windows
- Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.0.5-rustdesk/windows-x64-release-flutter.zip -OutFile windows-x64-release-flutter.zip
- Expand-Archive windows-x64-release-flutter.zip -DestinationPath engine
+ Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.0.5-rustdesk.2/windows-x64-flutter-release.zip -OutFile windows-x64-flutter-release.zip
+ Expand-Archive windows-x64-flutter-release.zip -DestinationPath engine
mv -Force engine/* C:/hostedtoolcache/windows/flutter/stable-3.0.5-x64/bin/cache/artifacts/engine/windows-x64-release/
- name: Install Rust toolchain
@@ -142,13 +142,42 @@ jobs:
job:
- {
target: x86_64-apple-darwin,
- os: macos-10.15,
+ os: macos-latest,
extra-build-args: "",
}
steps:
- name: Checkout source code
uses: actions/checkout@v3
+ - name: Import the codesign cert
+ uses: apple-actions/import-codesign-certs@v1
+ with:
+ p12-file-base64: ${{ secrets.MACOS_P12_BASE64 }}
+ p12-password: ${{ secrets.MACOS_P12_PASSWORD }}
+ keychain: rustdesk
+
+ - name: Check sign and import sign key
+ run: |
+ security default-keychain -s rustdesk.keychain
+ security find-identity -v
+
+ - name: Import notarize key
+ uses: timheuer/base64-to-file@v1.2
+ with:
+ # https://gregoryszorc.com/docs/apple-codesign/stable/apple_codesign_rcodesign.html#notarizing-and-stapling
+ fileName: rustdesk.json
+ fileDir: ${{ github.workspace }}
+ encodedString: ${{ secrets.MACOS_NOTARIZE_JSON }}
+
+ - name: Install rcodesign tool
+ shell: bash
+ run: |
+ pushd /tmp
+ wget https://github.com/indygreg/apple-platform-rs/releases/download/apple-codesign%2F0.22.0/apple-codesign-0.22.0-macos-universal.tar.gz
+ tar -zxvf apple-codesign-0.22.0-macos-universal.tar.gz
+ mv apple-codesign-0.22.0-macos-universal/rcodesign /usr/local/bin
+ popd
+
- name: Install build runtime
run: |
brew install llvm create-dmg nasm yasm cmake gcc wget ninja
@@ -158,7 +187,6 @@ jobs:
with:
channel: "stable"
flutter-version: ${{ env.FLUTTER_VERSION }}
- cache: true
- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
@@ -177,8 +205,12 @@ jobs:
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 /tmp
+ wget https://github.com/Kingtous/flutter_rust_bridge/releases/download/1.32.0-rustdesk/flutter_rust_bridge_codegen-x86_64-darwin.tgz
+ tar -zxvf flutter_rust_bridge_codegen-x86_64-darwin.tgz
+ mkdir -p ~/.cargo/bin
+ mv flutter_rust_bridge_codegen ~/.cargo/bin; chmod +x ~/.cargo/bin/flutter_rust_bridge_codegen
+ 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
@@ -192,10 +224,6 @@ jobs:
run: |
$VCPKG_ROOT/vcpkg install libvpx libyuv opus
- - name: Install cargo bundle tools
- run: |
- cargo install cargo-bundle
-
- name: Show version information (Rust, cargo, Clang)
shell: bash
run: |
@@ -211,6 +239,18 @@ jobs:
# --hwcodec not supported on macos yet
./build.py --flutter ${{ matrix.job.extra-build-args }}
+ - name: Codesign app and create signed dmg
+ run: |
+ security default-keychain -s rustdesk.keychain
+ security unlock-keychain -p ${{ secrets.MACOS_P12_PASSWORD }} rustdesk.keychain
+ # start sign the rustdesk.app and dmg
+ rm rustdesk-${{ env.VERSION }}.dmg || true
+ codesign --force --options runtime -s ${{ secrets.MACOS_CODESIGN_IDENTITY }} --deep ./flutter/build/macos/Build/Products/Release/rustdesk.app -v
+ create-dmg --icon "rustdesk.app" 200 190 --hide-extension "rustdesk.app" --window-size 800 400 --app-drop-link 600 185 rustdesk-${{ env.VERSION }}.dmg ./flutter/build/macos/Build/Products/Release/rustdesk.app
+ codesign --force --options runtime -s ${{ secrets.MACOS_CODESIGN_IDENTITY }} --deep rustdesk-${{ env.VERSION }}.dmg -v
+ # notarize the rustdesk-${{ env.VERSION }}.dmg
+ rcodesign notary-submit --api-key-path ${{ github.workspace }}/rustdesk.json --staple rustdesk-${{ env.VERSION }}.dmg
+
- name: Rename rustdesk
run: |
for name in rustdesk*??.dmg; do
@@ -377,7 +417,7 @@ jobs:
run: |
~/.cargo/bin/flutter_rust_bridge_codegen --rust-input ./src/flutter_ffi.rs --dart-output ./flutter/lib/generated_bridge.dart
- - name: Upload Artifcat
+ - name: Upload Artifact
uses: actions/upload-artifact@master
with:
name: bridge-artifact
@@ -559,6 +599,12 @@ jobs:
os: ubuntu-20.04,
extra-build-features: "flatpak",
}
+ - {
+ arch: x86_64,
+ target: x86_64-unknown-linux-gnu,
+ os: ubuntu-20.04,
+ extra-build-features: "appimage",
+ }
# - { target: x86_64-unknown-linux-musl , os: ubuntu-20.04, use-cross: true }
steps:
- name: Maximize build space
@@ -1012,7 +1058,7 @@ jobs:
files: |
rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb
- - name: Upload Artifcat
+ - name: Upload Artifact
uses: actions/upload-artifact@master
if: ${{ contains(matrix.job.extra-build-features, 'flatpak') }}
with:
@@ -1108,6 +1154,12 @@ jobs:
os: ubuntu-18.04,
extra-build-features: "flatpak",
}
+ - {
+ arch: x86_64,
+ target: x86_64-unknown-linux-gnu,
+ os: ubuntu-18.04,
+ extra-build-features: "appimage",
+ }
# - { target: x86_64-unknown-linux-musl , os: ubuntu-20.04, use-cross: true }
steps:
- name: Checkout source code
@@ -1122,7 +1174,7 @@ jobs:
- name: Prepare env
run: |
sudo apt update -y
- sudo apt-get -qq install -y git curl wget nasm yasm libgtk-3-dev
+ sudo apt-get -qq install -y git curl wget nasm yasm libgtk-3-dev libarchive-tools
mkdir -p ./target/release/
- name: Restore the rustdesk lib file
@@ -1177,10 +1229,12 @@ jobs:
shell: bash
run: |
for name in rustdesk*??.deb; do
- mv "$name" "${name%%.deb}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb"
+ # use cp to duplicate deb files to fit other packages.
+ cp "$name" "${name%%.deb}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb"
done
- name: Publish debian package
+ if: ${{ matrix.job.extra-build-features == '' }}
uses: softprops/action-gh-release@v1
with:
prerelease: true
@@ -1188,7 +1242,7 @@ jobs:
files: |
rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb
- - name: Upload Artifcat
+ - name: Upload Artifact
uses: actions/upload-artifact@master
if: ${{ contains(matrix.job.extra-build-features, 'flatpak') }}
with:
@@ -1244,6 +1298,29 @@ jobs:
files: |
res/rustdesk*.zst
+ - name: Build appimage package
+ if: ${{ matrix.job.extra-build-features == 'appimage' }}
+ shell: bash
+ run: |
+ # set-up appimage-builder
+ pushd /tmp
+ wget -O appimage-builder-x86_64.AppImage https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage
+ chmod +x appimage-builder-x86_64.AppImage
+ sudo mv appimage-builder-x86_64.AppImage /usr/local/bin/appimage-builder
+ popd
+ # run appimage-builder
+ pushd appimage
+ sudo appimage-builder --skip-tests
+
+ - name: Publish appimage package
+ if: ${{ matrix.job.extra-build-features == 'appimage' }}
+ uses: softprops/action-gh-release@v1
+ with:
+ prerelease: true
+ tag_name: ${{ env.TAG_NAME }}
+ files: |
+ ./appimage/rustdesk-${{ env.VERSION }}-*.AppImage
+
- name: Publish fedora28/centos8 package
if: ${{ matrix.job.extra-build-features == '' }}
uses: softprops/action-gh-release@v1
diff --git a/Cargo.lock b/Cargo.lock
index 237369d2c..659702704 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -76,7 +76,7 @@ dependencies = [
"alsa-sys",
"bitflags",
"libc",
- "nix 0.23.1",
+ "nix 0.23.2",
]
[[package]]
@@ -175,11 +175,11 @@ dependencies = [
[[package]]
name = "async-channel"
-version = "1.7.1"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28"
+checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
dependencies = [
- "concurrent-queue 1.2.4",
+ "concurrent-queue",
"event-listener",
"futures-core",
]
@@ -192,7 +192,7 @@ checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b"
dependencies = [
"async-lock",
"async-task",
- "concurrent-queue 2.0.0",
+ "concurrent-queue",
"fastrand",
"futures-lite",
"slab",
@@ -200,13 +200,13 @@ dependencies = [
[[package]]
name = "async-io"
-version = "1.10.0"
+version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7"
+checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794"
dependencies = [
"async-lock",
"autocfg 1.1.0",
- "concurrent-queue 1.2.4",
+ "concurrent-queue",
"futures-lite",
"libc",
"log",
@@ -215,7 +215,7 @@ dependencies = [
"slab",
"socket2 0.4.7",
"waker-fn",
- "winapi 0.3.9",
+ "windows-sys 0.42.0",
]
[[package]]
@@ -230,20 +230,20 @@ dependencies = [
[[package]]
name = "async-process"
-version = "1.5.0"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c"
+checksum = "6381ead98388605d0d9ff86371043b5aa922a3905824244de40dc263a14fcba4"
dependencies = [
"async-io",
+ "async-lock",
"autocfg 1.1.0",
"blocking",
"cfg-if 1.0.0",
"event-listener",
"futures-lite",
"libc",
- "once_cell",
"signal-hook",
- "winapi 0.3.9",
+ "windows-sys 0.42.0",
]
[[package]]
@@ -265,9 +265,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
[[package]]
name = "async-trait"
-version = "0.1.58"
+version = "0.1.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c"
+checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364"
dependencies = [
"proc-macro2",
"quote",
@@ -438,16 +438,16 @@ dependencies = [
[[package]]
name = "blocking"
-version = "1.2.0"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc"
+checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8"
dependencies = [
"async-channel",
+ "async-lock",
"async-task",
"atomic-waker",
"fastrand",
"futures-lite",
- "once_cell",
]
[[package]]
@@ -495,15 +495,9 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
dependencies = [
- "serde 1.0.147",
+ "serde 1.0.149",
]
-[[package]]
-name = "cache-padded"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
-
[[package]]
name = "cairo-rs"
version = "0.15.12"
@@ -544,7 +538,7 @@ version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e"
dependencies = [
- "serde 1.0.147",
+ "serde 1.0.149",
]
[[package]]
@@ -553,7 +547,7 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27"
dependencies = [
- "serde 1.0.147",
+ "serde 1.0.149",
]
[[package]]
@@ -565,7 +559,7 @@ dependencies = [
"camino",
"cargo-platform",
"semver 1.0.14",
- "serde 1.0.147",
+ "serde 1.0.149",
"serde_json 1.0.89",
]
@@ -581,7 +575,7 @@ dependencies = [
"log",
"proc-macro2",
"quote",
- "serde 1.0.147",
+ "serde 1.0.149",
"serde_json 1.0.89",
"syn",
"tempfile",
@@ -643,7 +637,7 @@ dependencies = [
"js-sys",
"num-integer",
"num-traits 0.2.15",
- "time 0.1.44",
+ "time 0.1.45",
"wasm-bindgen",
"winapi 0.3.9",
]
@@ -733,7 +727,7 @@ dependencies = [
"cc",
"hbb_common",
"lazy_static",
- "serde 1.0.147",
+ "serde 1.0.149",
"serde_derive",
"thiserror",
]
@@ -824,15 +818,6 @@ dependencies = [
"memchr",
]
-[[package]]
-name = "concurrent-queue"
-version = "1.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
-dependencies = [
- "cache-padded",
-]
-
[[package]]
name = "concurrent-queue"
version = "2.0.0"
@@ -848,7 +833,7 @@ version = "0.4.0"
source = "git+https://github.com/open-trade/confy#630cc28a396cb7d01eefdd9f3824486fe4d8554b"
dependencies = [
"directories-next",
- "serde 1.0.147",
+ "serde 1.0.149",
"thiserror",
"toml",
]
@@ -976,7 +961,7 @@ dependencies = [
"mach",
"ndk 0.6.0",
"ndk-glue 0.6.2",
- "nix 0.23.1",
+ "nix 0.23.2",
"oboe",
"parking_lot 0.11.2",
"stdweb",
@@ -1068,12 +1053,12 @@ dependencies = [
[[package]]
name = "ctrlc"
-version = "3.2.3"
+version = "3.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d91974fbbe88ec1df0c24a4f00f99583667a7e2e6272b2b92d294d81e462173"
+checksum = "1631ca6e3c59112501a9d87fd86f21591ff77acd31331e8a73f8d80a65bbdd71"
dependencies = [
- "nix 0.25.0",
- "winapi 0.3.9",
+ "nix 0.26.1",
+ "windows-sys 0.42.0",
]
[[package]]
@@ -1084,9 +1069,9 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
[[package]]
name = "cxx"
-version = "1.0.82"
+version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453"
+checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -1096,9 +1081,9 @@ dependencies = [
[[package]]
name = "cxx-build"
-version = "1.0.82"
+version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0"
+checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
dependencies = [
"cc",
"codespan-reporting",
@@ -1111,15 +1096,15 @@ dependencies = [
[[package]]
name = "cxxbridge-flags"
-version = "1.0.82"
+version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71"
+checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.82"
+version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470"
+checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
dependencies = [
"proc-macro2",
"quote",
@@ -1332,8 +1317,7 @@ checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e"
[[package]]
name = "default-net"
version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e70d471b0ba4e722c85651b3bb04b6880dfdb1224a43ade80c1295314db646"
+source = "git+https://github.com/Kingtous/default-net#bdaad8dd5b08efcba303e71729d3d0b1d5ccdb25"
dependencies = [
"libc",
"memalloc",
@@ -1458,7 +1442,7 @@ checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f"
dependencies = [
"lazy_static",
"regex",
- "serde 1.0.147",
+ "serde 1.0.149",
"strsim 0.10.0",
]
@@ -1481,7 +1465,7 @@ dependencies = [
"cc",
"hbb_common",
"lazy_static",
- "serde 1.0.147",
+ "serde 1.0.149",
"serde_derive",
"thiserror",
]
@@ -1503,9 +1487,9 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
[[package]]
name = "embed-resource"
-version = "1.7.2"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc24ff8d764818e9ab17963b0593c535f077a513f565e75e4352d758bc4d8c0"
+checksum = "e62abb876c07e4754fae5c14cafa77937841f01740637e17d78dc04352f32a5e"
dependencies = [
"cc",
"rustc_version 0.4.0",
@@ -1533,8 +1517,8 @@ dependencies = [
"log",
"objc",
"pkg-config",
- "rdev 0.5.0-2 (git+https://github.com/asur4s/rdev)",
- "serde 1.0.147",
+ "rdev",
+ "serde 1.0.149",
"serde_derive",
"tfc",
"unicode-segmentation",
@@ -1580,7 +1564,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb"
dependencies = [
"enumflags2_derive",
- "serde 1.0.147",
+ "serde 1.0.149",
]
[[package]]
@@ -1679,7 +1663,7 @@ source = "git+https://github.com/fufesou/evdev#cec616e37790293d2cd2aa54a96601ed6
dependencies = [
"bitvec",
"libc",
- "nix 0.23.1",
+ "nix 0.23.2",
]
[[package]]
@@ -1718,9 +1702,9 @@ dependencies = [
[[package]]
name = "filetime"
-version = "0.2.18"
+version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3"
+checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -1730,12 +1714,12 @@ dependencies = [
[[package]]
name = "flate2"
-version = "1.0.24"
+version = "1.0.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
+checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
dependencies = [
"crc32fast",
- "miniz_oxide 0.5.4",
+ "miniz_oxide 0.6.2",
]
[[package]]
@@ -1787,7 +1771,7 @@ dependencies = [
"pathdiff",
"quote",
"regex",
- "serde 1.0.147",
+ "serde 1.0.149",
"serde_yaml",
"structopt",
"syn",
@@ -2007,7 +1991,7 @@ version = "0.15.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7"
dependencies = [
- "gio-sys",
+ "gio-sys 0.15.10",
"glib-sys 0.15.10",
"gobject-sys 0.15.10",
"libc",
@@ -2022,7 +2006,7 @@ checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
- "gio-sys",
+ "gio-sys 0.15.10",
"glib-sys 0.15.10",
"gobject-sys 0.15.10",
"libc",
@@ -2078,7 +2062,7 @@ dependencies = [
"futures-channel",
"futures-core",
"futures-io",
- "gio-sys",
+ "gio-sys 0.15.10",
"glib 0.15.12",
"libc",
"once_cell",
@@ -2098,6 +2082,19 @@ dependencies = [
"winapi 0.3.9",
]
+[[package]]
+name = "gio-sys"
+version = "0.16.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229"
+dependencies = [
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
+ "libc",
+ "system-deps 6.0.3",
+ "winapi 0.3.9",
+]
+
[[package]]
name = "glib"
version = "0.10.3"
@@ -2137,6 +2134,28 @@ dependencies = [
"thiserror",
]
+[[package]]
+name = "glib"
+version = "0.16.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cd04d150a2c63e6779f43aec7e04f5374252479b7bed5f45146d9c0e821f161"
+dependencies = [
+ "bitflags",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-task",
+ "futures-util",
+ "gio-sys 0.16.3",
+ "glib-macros 0.16.3",
+ "glib-sys 0.16.3",
+ "gobject-sys 0.16.3",
+ "libc",
+ "once_cell",
+ "smallvec",
+ "thiserror",
+]
+
[[package]]
name = "glib-macros"
version = "0.10.1"
@@ -2168,6 +2187,21 @@ dependencies = [
"syn",
]
+[[package]]
+name = "glib-macros"
+version = "0.16.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e084807350b01348b6d9dbabb724d1a0bb987f47a2c85de200e98e12e30733bf"
+dependencies = [
+ "anyhow",
+ "heck 0.4.0",
+ "proc-macro-crate 1.2.1",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "glib-sys"
version = "0.10.1"
@@ -2188,6 +2222,16 @@ dependencies = [
"system-deps 6.0.3",
]
+[[package]]
+name = "glib-sys"
+version = "0.16.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65"
+dependencies = [
+ "libc",
+ "system-deps 6.0.3",
+]
+
[[package]]
name = "glob"
version = "0.3.0"
@@ -2216,6 +2260,17 @@ dependencies = [
"system-deps 6.0.3",
]
+[[package]]
+name = "gobject-sys"
+version = "0.16.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1"
+dependencies = [
+ "glib-sys 0.16.3",
+ "libc",
+ "system-deps 6.0.3",
+]
+
[[package]]
name = "gstreamer"
version = "0.16.7"
@@ -2382,7 +2437,7 @@ dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
"gdk-sys",
- "gio-sys",
+ "gio-sys 0.15.10",
"glib-sys 0.15.10",
"gobject-sys 0.15.10",
"libc",
@@ -2455,7 +2510,7 @@ dependencies = [
"quinn",
"rand 0.8.5",
"regex",
- "serde 1.0.147",
+ "serde 1.0.149",
"serde_derive",
"serde_json 1.0.89",
"socket2 0.3.19",
@@ -2547,12 +2602,12 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "hwcodec"
version = "0.1.0"
-source = "git+https://github.com/21pages/hwcodec#f54d69b35251ade110373403ddefcb8b49c87305"
+source = "git+https://github.com/21pages/hwcodec#e819484c4c010199f2a0977bdf306b4edbeafbae"
dependencies = [
"bindgen 0.59.2",
"cc",
"log",
- "serde 1.0.147",
+ "serde 1.0.149",
"serde_derive",
"serde_json 1.0.89",
]
@@ -2583,9 +2638,9 @@ dependencies = [
[[package]]
name = "hyper-rustls"
-version = "0.23.1"
+version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59df7c4e19c950e6e0e868dcc0a300b09a9b88e9ec55bd879ca819087a77355d"
+checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
dependencies = [
"http",
"hyper",
@@ -2730,9 +2785,9 @@ dependencies = [
[[package]]
name = "ipnet"
-version = "2.5.1"
+version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745"
+checksum = "ec947b7a4ce12e3b87e353abae7ce124d025b6c7d6c5aea5cc0bcf92e9510ded"
[[package]]
name = "itertools"
@@ -2847,9 +2902,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.137"
+version = "0.2.138"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
[[package]]
name = "libdbus-sys"
@@ -2979,7 +3034,7 @@ version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b238e3235c8382b7653c6408ed1b08dd379bdb9fdf990fb0bbae3db2cc0ae963"
dependencies = [
- "nix 0.23.1",
+ "nix 0.23.2",
"winapi 0.3.9",
]
@@ -3004,7 +3059,7 @@ dependencies = [
[[package]]
name = "magnum-opus"
version = "0.4.0"
-source = "git+https://github.com/SoLongAndThanksForAllThePizza/magnum-opus#6247071a64af7b18e2d553e235729e6865f63ece"
+source = "git+https://github.com/rustdesk/magnum-opus#79be072c939168e907fe851690759dcfd6a326af"
dependencies = [
"bindgen 0.59.2",
"target_build_utils",
@@ -3104,6 +3159,15 @@ dependencies = [
"adler",
]
+[[package]]
+name = "miniz_oxide"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+dependencies = [
+ "adler",
+]
+
[[package]]
name = "mio"
version = "0.6.23"
@@ -3180,7 +3244,7 @@ dependencies = [
[[package]]
name = "mouce"
version = "0.2.1"
-source = "git+https://github.com/fufesou/mouce.git#aa18ba25bb47484282e972a4b95a8e1d753230b5"
+source = "git+https://github.com/fufesou/mouce.git#ed83800d532b95d70e39915314f6052aa433e9b9"
dependencies = [
"glob",
]
@@ -3330,9 +3394,9 @@ dependencies = [
[[package]]
name = "nix"
-version = "0.23.1"
+version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
+checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
dependencies = [
"bitflags",
"cc",
@@ -3343,9 +3407,9 @@ dependencies = [
[[package]]
name = "nix"
-version = "0.24.2"
+version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc"
+checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
dependencies = [
"bitflags",
"cfg-if 1.0.0",
@@ -3355,9 +3419,9 @@ dependencies = [
[[package]]
name = "nix"
-version = "0.25.0"
+version = "0.25.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
+checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
dependencies = [
"autocfg 1.1.0",
"bitflags",
@@ -3367,6 +3431,18 @@ dependencies = [
"pin-utils",
]
+[[package]]
+name = "nix"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694"
+dependencies = [
+ "bitflags",
+ "cfg-if 1.0.0",
+ "libc",
+ "static_assertions",
+]
+
[[package]]
name = "nom"
version = "7.1.1"
@@ -3592,9 +3668,9 @@ dependencies = [
[[package]]
name = "ordered-stream"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "034ce384018b245e8d8424bbe90577fbd91a533be74107e465e3474eb2285eef"
+checksum = "01ca8c99d73c6e92ac1358f9f692c22c0bfd9c4701fa086f5d365c0d4ea818ea"
dependencies = [
"futures-core",
"pin-project-lite",
@@ -3676,7 +3752,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
- "parking_lot_core 0.9.4",
+ "parking_lot_core 0.9.5",
]
[[package]]
@@ -3695,9 +3771,9 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.4"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
+checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -3732,9 +3808,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
[[package]]
name = "pest"
-version = "2.4.1"
+version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a528564cc62c19a7acac4d81e01f39e53e25e17b934878f4c6d25cc2836e62f8"
+checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0"
dependencies = [
"thiserror",
"ucd-trie",
@@ -3830,16 +3906,16 @@ dependencies = [
[[package]]
name = "polling"
-version = "2.4.0"
+version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2"
+checksum = "166ca89eb77fd403230b9c156612965a81e094ec6ec3aa13663d4c8b113fa748"
dependencies = [
"autocfg 1.1.0",
"cfg-if 1.0.0",
"libc",
"log",
"wepoll-ffi",
- "winapi 0.3.9",
+ "windows-sys 0.42.0",
]
[[package]]
@@ -4205,11 +4281,10 @@ dependencies = [
[[package]]
name = "rayon"
-version = "1.6.0"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b"
+checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
dependencies = [
- "crossbeam-deque",
"either",
"rayon-core",
]
@@ -4229,7 +4304,7 @@ dependencies = [
[[package]]
name = "rdev"
version = "0.5.0-2"
-source = "git+https://github.com/asur4s/rdev#4051761e7ccf434a443b8e9592c23160c9cace56"
+source = "git+https://github.com/fufesou/rdev#1be26c7e8ed0d43cebdd8331d467bb61130a2e6e"
dependencies = [
"cocoa",
"core-foundation 0.9.3",
@@ -4240,34 +4315,13 @@ dependencies = [
"inotify",
"lazy_static",
"libc",
+ "log",
"mio 0.8.5",
"strum 0.24.1",
"strum_macros 0.24.3",
"widestring 1.0.2",
"winapi 0.3.9",
- "x11 2.20.0",
-]
-
-[[package]]
-name = "rdev"
-version = "0.5.0-2"
-source = "git+https://github.com/rustdesk/rdev#25c29f61bfdf5d8ec50f0a8a7743bc1d85eb2c04"
-dependencies = [
- "cocoa",
- "core-foundation 0.9.3",
- "core-foundation-sys 0.8.3",
- "core-graphics 0.22.3",
- "enum-map",
- "epoll",
- "inotify",
- "lazy_static",
- "libc",
- "mio 0.8.5",
- "strum 0.24.1",
- "strum_macros 0.24.3",
- "widestring 1.0.2",
- "winapi 0.3.9",
- "x11 2.20.0",
+ "x11 2.20.1",
]
[[package]]
@@ -4281,9 +4335,9 @@ dependencies = [
[[package]]
name = "realfft"
-version = "3.1.0"
+version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3052e66d6ebeff8049607775c41d39a58d1dfa91a2733e89f2b7816bce2ea4cc"
+checksum = "93d6b8e8f0c6d2234aa58048d7290c60bf92cd36fd2888cd8331c66ad4f2e1d2"
dependencies = [
"rustfft",
]
@@ -4369,7 +4423,7 @@ dependencies = [
"pin-project-lite",
"rustls",
"rustls-pemfile 1.0.1",
- "serde 1.0.147",
+ "serde 1.0.149",
"serde_json 1.0.89",
"serde_urlencoded",
"tokio",
@@ -4411,9 +4465,20 @@ dependencies = [
[[package]]
name = "rpassword"
-version = "7.1.0"
+version = "7.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20c9f5d2a0c3e2ea729ab3706d22217177770654c3ef5056b68b69d07332d3f5"
+checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322"
+dependencies = [
+ "libc",
+ "rtoolbox",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "rtoolbox"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a"
dependencies = [
"libc",
"winapi 0.3.9",
@@ -4497,6 +4562,7 @@ dependencies = [
"arboard",
"async-process",
"async-trait",
+ "backtrace",
"base64",
"bytes",
"cc",
@@ -4522,6 +4588,7 @@ dependencies = [
"flexi_logger",
"flutter_rust_bridge",
"flutter_rust_bridge_codegen",
+ "glib 0.16.5",
"gtk",
"hbb_common",
"hound",
@@ -4540,17 +4607,17 @@ dependencies = [
"num_cpus",
"objc",
"parity-tokio-ipc",
- "rdev 0.5.0-2 (git+https://github.com/rustdesk/rdev)",
+ "rdev",
"repng",
"reqwest",
- "rpassword 7.1.0",
+ "rpassword 7.2.0",
"rubato",
"runas",
"rust-pulsectl",
"samplerate",
"sciter-rs",
"scrap",
- "serde 1.0.147",
+ "serde 1.0.149",
"serde_derive",
"serde_json 1.0.89",
"sha2",
@@ -4727,7 +4794,7 @@ dependencies = [
"num_cpus",
"quest",
"repng",
- "serde 1.0.147",
+ "serde 1.0.149",
"serde_json 1.0.89",
"target_build_utils",
"tracing",
@@ -4789,7 +4856,7 @@ version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
dependencies = [
- "serde 1.0.147",
+ "serde 1.0.149",
]
[[package]]
@@ -4809,18 +4876,18 @@ checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af"
[[package]]
name = "serde"
-version = "1.0.147"
+version = "1.0.149"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
+checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.147"
+version = "1.0.149"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
+checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4"
dependencies = [
"proc-macro2",
"quote",
@@ -4847,7 +4914,7 @@ checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
dependencies = [
"itoa 1.0.4",
"ryu",
- "serde 1.0.147",
+ "serde 1.0.149",
]
[[package]]
@@ -4870,7 +4937,7 @@ dependencies = [
"form_urlencoded",
"itoa 1.0.4",
"ryu",
- "serde 1.0.147",
+ "serde 1.0.149",
]
[[package]]
@@ -4881,7 +4948,7 @@ checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
dependencies = [
"indexmap",
"ryu",
- "serde 1.0.147",
+ "serde 1.0.149",
"yaml-rust",
]
@@ -4915,7 +4982,7 @@ checksum = "ba8593196da75d9dc4f69349682bd4c2099f8cde114257d1ef7ef1b33d1aba54"
dependencies = [
"cfg-if 1.0.0",
"libc",
- "nix 0.23.1",
+ "nix 0.23.2",
"rand 0.8.5",
"win-sys",
]
@@ -4963,7 +5030,7 @@ version = "0.1.0"
dependencies = [
"confy",
"hbb_common",
- "serde 1.0.147",
+ "serde 1.0.149",
"serde_derive",
"walkdir",
]
@@ -5038,7 +5105,7 @@ dependencies = [
"ed25519",
"libc",
"libsodium-sys",
- "serde 1.0.147",
+ "serde 1.0.149",
]
[[package]]
@@ -5146,9 +5213,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.103"
+version = "1.0.105"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
dependencies = [
"proc-macro2",
"quote",
@@ -5320,7 +5387,7 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
[[package]]
name = "tfc"
version = "0.6.1"
-source = "git+https://github.com/asur4s/The-Fat-Controller#48303c5dacded6ea1873bc5d69bdde3175cf336a"
+source = "git+https://github.com/fufesou/The-Fat-Controller#48303c5dacded6ea1873bc5d69bdde3175cf336a"
dependencies = [
"core-graphics 0.22.3",
"unicode-segmentation",
@@ -5370,9 +5437,9 @@ dependencies = [
[[package]]
name = "time"
-version = "0.1.44"
+version = "0.1.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
dependencies = [
"libc",
"wasi 0.10.0+wasi-snapshot-preview1",
@@ -5414,9 +5481,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
-version = "1.22.0"
+version = "1.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3"
+checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
dependencies = [
"autocfg 1.1.0",
"bytes",
@@ -5429,14 +5496,14 @@ dependencies = [
"signal-hook-registry",
"socket2 0.4.7",
"tokio-macros",
- "winapi 0.3.9",
+ "windows-sys 0.42.0",
]
[[package]]
name = "tokio-macros"
-version = "1.8.0"
+version = "1.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
+checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
dependencies = [
"proc-macro2",
"quote",
@@ -5494,7 +5561,7 @@ version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
dependencies = [
- "serde 1.0.147",
+ "serde 1.0.149",
]
[[package]]
@@ -5580,9 +5647,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "typenum"
-version = "1.15.0"
+version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
[[package]]
name = "ucd-trie"
@@ -5654,7 +5721,7 @@ dependencies = [
"form_urlencoded",
"idna",
"percent-encoding",
- "serde 1.0.147",
+ "serde 1.0.149",
]
[[package]]
@@ -5711,9 +5778,9 @@ dependencies = [
[[package]]
name = "vswhom-sys"
-version = "0.1.1"
+version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22025f6d8eb903ebf920ea6933b70b1e495be37e2cb4099e62c80454aaf57c39"
+checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18"
dependencies = [
"cc",
"libc",
@@ -5833,7 +5900,7 @@ dependencies = [
"bitflags",
"downcast-rs",
"libc",
- "nix 0.24.2",
+ "nix 0.24.3",
"scoped-tls",
"wayland-commons",
"wayland-scanner",
@@ -5846,7 +5913,7 @@ version = "0.29.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902"
dependencies = [
- "nix 0.24.2",
+ "nix 0.24.3",
"once_cell",
"smallvec",
"wayland-sys",
@@ -5858,7 +5925,7 @@ version = "0.29.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661"
dependencies = [
- "nix 0.24.2",
+ "nix 0.24.3",
"wayland-client",
"xcursor",
]
@@ -5937,9 +6004,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
-version = "0.22.5"
+version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
dependencies = [
"webpki",
]
@@ -6404,9 +6471,9 @@ dependencies = [
[[package]]
name = "x11"
-version = "2.20.0"
+version = "2.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7ae97874a928d821b061fce3d1fc52f08071dd53c89a6102bc06efcac3b2908"
+checksum = "c2638d5b9c17ac40575fb54bb461a4b1d2a8d1b4ffcc4ff237d254ec59ddeb82"
dependencies = [
"libc",
"pkg-config",
@@ -6414,9 +6481,9 @@ dependencies = [
[[package]]
name = "x11-dl"
-version = "2.20.0"
+version = "2.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c83627bc137605acc00bb399c7b908ef460b621fc37c953db2b09f88c449ea6"
+checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0"
dependencies = [
"lazy_static",
"libc",
@@ -6461,9 +6528,9 @@ dependencies = [
[[package]]
name = "zbus"
-version = "3.5.0"
+version = "3.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a25ae891bd547674b368906552115143031c16c23a0f2f4b2f5f5436ab2e6a9f"
+checksum = "938ea6da98c75c2c37a86007bd17fd8e208cbec24e086108c87ece98e9edec0d"
dependencies = [
"async-broadcast",
"async-channel",
@@ -6482,11 +6549,11 @@ dependencies = [
"futures-sink",
"futures-util",
"hex",
- "nix 0.25.0",
+ "nix 0.25.1",
"once_cell",
"ordered-stream",
"rand 0.8.5",
- "serde 1.0.147",
+ "serde 1.0.149",
"serde_repr",
"sha1",
"static_assertions",
@@ -6500,9 +6567,9 @@ dependencies = [
[[package]]
name = "zbus_macros"
-version = "3.5.0"
+version = "3.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8aa37701ce7b3a43632d2b0ad9d4aef602b46be6bdd7fba3b7c5007f9f6eb2c2"
+checksum = "45066039ebf3330820e495e854f8b312abb68f0a39e97972d092bd72e8bb3e8e"
dependencies = [
"proc-macro-crate 1.2.1",
"proc-macro2",
@@ -6513,11 +6580,11 @@ dependencies = [
[[package]]
name = "zbus_names"
-version = "2.3.0"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d69bb79b44e1901ed8b217e485d0f01991aec574479b68cb03415f142bc7ae67"
+checksum = "6c737644108627748a660d038974160e0cbb62605536091bdfa28fd7f64d43c8"
dependencies = [
- "serde 1.0.147",
+ "serde 1.0.149",
"static_assertions",
"zvariant",
]
@@ -6553,23 +6620,23 @@ dependencies = [
[[package]]
name = "zvariant"
-version = "3.8.0"
+version = "3.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c817f416f05fcbc833902f1e6064b72b1778573978cfeac54731451ccc9e207"
+checksum = "56f8c89c183461e11867ded456db252eae90874bc6769b7adbea464caa777e51"
dependencies = [
"byteorder",
"enumflags2",
"libc",
- "serde 1.0.147",
+ "serde 1.0.149",
"static_assertions",
"zvariant_derive",
]
[[package]]
name = "zvariant_derive"
-version = "3.8.0"
+version = "3.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd24fffd02794a76eb10109de463444064c88f5adb9e9d1a78488adc332bfef"
+checksum = "155247a5d1ab55e335421c104ccd95d64f17cebbd02f50cdbc1c33385f9c4d81"
dependencies = [
"proc-macro-crate 1.2.1",
"proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index a783b1abe..2713df11d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,7 +47,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/SoLongAndThanksForAllThePizza/magnum-opus" }
+magnum-opus = { git = "https://github.com/rustdesk/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 }
@@ -59,11 +59,11 @@ base64 = "0.13"
sysinfo = "0.24"
num_cpus = "1.13"
bytes = { version = "1.2", features = ["serde"] }
-default-net = "0.11.0"
+default-net = { git = "https://github.com/Kingtous/default-net" }
wol-rs = "0.9.1"
flutter_rust_bridge = { git = "https://github.com/SoLongAndThanksForAllThePizza/flutter_rust_bridge", optional = true }
errno = "0.2.8"
-rdev = { git = "https://github.com/rustdesk/rdev" }
+rdev = { git = "https://github.com/fufesou/rdev" }
url = { version = "2.1", features = ["serde"] }
reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls"], default-features=false }
@@ -118,6 +118,8 @@ dbus = "0.9"
dbus-crossroads = "0.5"
gtk = "0.15"
libappindicator = "0.7"
+glib = "0.16.5"
+backtrace = "0.3"
[target.'cfg(target_os = "android")'.dependencies]
android_logger = "0.11"
diff --git a/README.md b/README.md
index ad19edaa1..79255e455 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,7 @@ Below are the servers you are using for free, it may change along the time. If y
| Germany | Codext | 4 vCPU / 8GB RAM |
| Finland (Helsinki) | 0x101 Cyber Security | 4 vCPU / 8GB RAM |
| USA (Ashburn) | 0x101 Cyber Security | 4 vCPU / 8GB RAM |
+| Ukraine (Kyiv) | dc.volia (2VM) | 2 vCPU / 4GB RAM |
## Dependencies
diff --git a/appimage/AppImageBuilder.yml b/appimage/AppImageBuilder.yml
new file mode 100644
index 000000000..ae95fd2ce
--- /dev/null
+++ b/appimage/AppImageBuilder.yml
@@ -0,0 +1,87 @@
+# appimage-builder recipe see https://appimage-builder.readthedocs.io for details
+version: 1
+script:
+ - rm -rf ./AppDir || true
+ - bsdtar -zxvf ../rustdesk-1.2.0.deb
+ - tar -xvf ./data.tar.xz
+ - mkdir ./AppDir
+ - mv ./usr ./AppDir/usr
+ # 32x32 icon
+ - for i in {32,64,128}; do mkdir -p ./AppDir/usr/share/icons/hicolor/$i\x$i/apps/; cp ../res/$i\x$i.png ./AppDir/usr/share/icons/hicolor/$i\x$i/apps/rustdesk.png; done
+ # desktop file
+ # - sed -i "s/Icon=\/usr\/share\/rustdesk\/files\/rustdesk.png/Icon=rustdesk/g" ./AppDir/usr/share/applications/rustdesk.desktop
+ - rm -rf ./AppDir/usr/share/applications
+AppDir:
+ path: ./AppDir
+ app_info:
+ id: rustdesk
+ name: rustdesk
+ icon: rustdesk
+ version: 1.2.0
+ exec: usr/lib/rustdesk/rustdesk
+ exec_args: $@
+ apt:
+ arch:
+ - amd64
+ allow_unauthenticated: true
+ sources:
+ - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic main restricted
+ - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted
+ - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic universe
+ - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic-updates universe
+ - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic multiverse
+ - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic-updates multiverse
+ - sourceline: deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted
+ universe multiverse
+ - sourceline: deb http://ppa.launchpad.net/pipewire-debian/pipewire-upstream/ubuntu
+ bionic main
+ include:
+ - libc6:amd64
+ - libgtk-3-0
+ - libxcb-randr0
+ - libxdo3
+ - libxfixes3
+ - libxcb-shape0
+ - libxcb-xfixes0
+ - libasound2
+ - libsystemd0
+ - curl
+ - libva-drm2
+ - libva-x11-2
+ - libvdpau1
+ - libgstreamer-plugins-base1.0-0
+ exclude:
+ - humanity-icon-theme
+ - hicolor-icon-theme
+ - adwaita-icon-theme
+ - ubuntu-mono
+ files:
+ include: []
+ exclude:
+ - usr/share/man
+ - usr/share/doc/*/README.*
+ - usr/share/doc/*/changelog.*
+ - usr/share/doc/*/NEWS.*
+ - usr/share/doc/*/TODO.*
+ runtime:
+ env:
+ GIO_MODULE_DIR: $APPDIR/usr/lib/x86_64-linux-gnu/gio/modules/
+ test:
+ fedora-30:
+ image: appimagecrafters/tests-env:fedora-30
+ command: ./AppRun
+ debian-stable:
+ image: appimagecrafters/tests-env:debian-stable
+ command: ./AppRun
+ archlinux-latest:
+ image: appimagecrafters/tests-env:archlinux-latest
+ command: ./AppRun
+ centos-7:
+ image: appimagecrafters/tests-env:centos-7
+ command: ./AppRun
+ ubuntu-xenial:
+ image: appimagecrafters/tests-env:ubuntu-xenial
+ command: ./AppRun
+AppImage:
+ arch: x86_64
+ update-information: guess
diff --git a/build.py b/build.py
index 127469784..6b107ff4b 100755
--- a/build.py
+++ b/build.py
@@ -21,7 +21,7 @@ skip_cargo = False
def custom_os_system(cmd):
err = os._system(cmd)
if err != 0:
- print(f"Error occured when executing: {cmd}. Exiting.")
+ print(f"Error occurred when executing: {cmd}. Exiting.")
sys.exit(-1)
# replace prebuilt os.system
os._system = os.system
@@ -99,6 +99,11 @@ def make_parser():
action='store_true',
help='Build rustdesk libs with the flatpak feature enabled'
)
+ parser.add_argument(
+ '--appimage',
+ action='store_true',
+ help='Build rustdesk libs with the appimage feature enabled'
+ )
parser.add_argument(
'--skip-cargo',
action='store_true',
@@ -236,6 +241,8 @@ def get_features(args):
features.append('flutter')
if args.flatpak:
features.append('flatpak')
+ if args.appimage:
+ features.append('appimage')
print("features:", features)
return features
@@ -305,7 +312,8 @@ def build_flutter_deb(version, features):
def build_flutter_dmg(version, features):
if not skip_cargo:
- os.system(f'cargo build --features {features} --lib --release')
+ # set minimum osx build target, now is 10.14, which is the same as the flutter xcode project
+ os.system(f'MACOSX_DEPLOYMENT_TARGET=10.14 cargo build --features {features} --lib --release')
# copy dylib
os.system(
"cp target/release/liblibrustdesk.dylib target/release/librustdesk.dylib")
@@ -469,6 +477,7 @@ def main():
if pa:
os.system('''
# buggy: rcodesign sign ... path/*, have to sign one by one
+ # install rcodesign via cargo install apple-codesign
#rcodesign sign --p12-file ~/.p12/rustdesk-developer-id.p12 --p12-password-file ~/.p12/.cert-pass --code-signature-flags runtime ./target/release/bundle/osx/RustDesk.app/Contents/MacOS/rustdesk
#rcodesign sign --p12-file ~/.p12/rustdesk-developer-id.p12 --p12-password-file ~/.p12/.cert-pass --code-signature-flags runtime ./target/release/bundle/osx/RustDesk.app/Contents/MacOS/libsciter.dylib
#rcodesign sign --p12-file ~/.p12/rustdesk-developer-id.p12 --p12-password-file ~/.p12/.cert-pass --code-signature-flags runtime ./target/release/bundle/osx/RustDesk.app
@@ -481,9 +490,15 @@ def main():
version, 'rustdesk-%s.dmg' % version)
if pa:
os.system('''
+ # https://pyoxidizer.readthedocs.io/en/apple-codesign-0.14.0/apple_codesign.html
+ # https://pyoxidizer.readthedocs.io/en/stable/tugger_code_signing.html
+ # https://developer.apple.com/developer-id/
+ # goto xcode and login with apple id, manager certificates (Developer ID Application and/or Developer ID Installer) online there (only download and double click (install) cer file can not export p12 because no private key)
#rcodesign sign --p12-file ~/.p12/rustdesk-developer-id.p12 --p12-password-file ~/.p12/.cert-pass --code-signature-flags runtime ./rustdesk-{1}.dmg
codesign -s "Developer ID Application: {0}" --force --options runtime ./rustdesk-{1}.dmg
- # https://pyoxidizer.readthedocs.io/en/latest/apple_codesign_rcodesign.html
+ # https://appstoreconnect.apple.com/access/api
+ # https://gregoryszorc.com/docs/apple-codesign/0.16.0/apple_codesign_rcodesign.html#notarizing-and-stapling
+ # p8 file is generated when you generate api key, download and put it under ~/.private_keys/
rcodesign notarize --api-issuer {2} --api-key {3} --staple ./rustdesk-{1}.dmg
# verify: spctl -a -t exec -v /Applications/RustDesk.app
'''.format(pa, version, os.environ.get('api-issuer'), os.environ.get('api-key')))
diff --git a/build.rs b/build.rs
index 67e40752c..ade63f0bc 100644
--- a/build.rs
+++ b/build.rs
@@ -1,9 +1,16 @@
#[cfg(windows)]
fn build_windows() {
- cc::Build::new().file("src/windows.cc").compile("windows");
+ let file = "src/platform/windows.cc";
+ cc::Build::new().file(file).compile("windows");
println!("cargo:rustc-link-lib=WtsApi32");
- println!("cargo:rerun-if-changed=build.rs");
- println!("cargo:rerun-if-changed=windows.cc");
+ println!("cargo:rerun-if-changed={}", file);
+}
+
+#[cfg(target_os = "macos")]
+fn build_mac() {
+ let file = "src/platform/macos.mm";
+ cc::Build::new().file(file).compile("macos");
+ println!("cargo:rerun-if-changed={}", file);
}
#[cfg(all(windows, feature = "inline"))]
@@ -117,5 +124,8 @@ fn main() {
#[cfg(windows)]
build_windows();
#[cfg(target_os = "macos")]
+ build_mac();
+ #[cfg(target_os = "macos")]
println!("cargo:rustc-link-lib=framework=ApplicationServices");
+ println!("cargo:rerun-if-changed=build.rs");
}
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index 966ad3df8..1f35ef92d 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -4,7 +4,7 @@ Doc: https://rustdesk.com/docs/en/manual/mobile/
In order for a remote device to control your Android device via mouse or touch, you need to allow RustDesk to use the "Accessibility" service, RustDesk uses AccessibilityService API to implement Addroid remote control.
-In addtion to remote control, you can also transfer files between Android devices and PCs easily with RustDesk.
+In addition to remote control, you can also transfer files between Android devices and PCs easily with RustDesk.
You have full control of your data, with no concerns about security. You can use our rendezvous/relay server, or self-hosting, or write your own rendezvous/relay server. Self-hosting server is free and open source: https://github.com/rustdesk/rustdesk-server
diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png
index 543fe8346..3668c7106 100644
Binary files a/fastlane/metadata/android/en-US/images/icon.png and b/fastlane/metadata/android/en-US/images/icon.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
index 32e7b3554..e84ed4d21 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
index 0f9368545..5a83dc1f0 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
index b59279552..629631ac7 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
index a4048ae69..39a15ba77 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/5.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/5.png
index 5d726ab36..5574ee7dc 100644
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/5.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/5.png differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/6.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/6.png
index 2c3fad113..8e0a83a6a 100644
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/6.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/6.png differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/7.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/7.png
index 5873757f9..0618ae0b6 100644
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/7.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/7.png differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/8.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/8.png
index faea2eb16..560902b03 100644
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/8.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/8.png differ
diff --git a/fastlane/metadata/android/fr-FR/full_description.txt b/fastlane/metadata/android/fr-FR/full_description.txt
new file mode 100644
index 000000000..effb820d6
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/full_description.txt
@@ -0,0 +1,11 @@
+Une application de bureau à distance open source, l'alternative open source à TeamViewer.
+Code source : https://github.com/rustdesk/rustdesk
+Doc : https://rustdesk.com/docs/en/manual/mobile/
+
+Pour qu'un appareil distant puisse contrôler votre appareil Android via la souris ou le toucher, vous devez autoriser RustDesk à utiliser le service "Accessibilité", RustDesk utilise l'API AccessibilityService pour implémenter la télécommande Addroid.
+
+En plus du contrôle à distance, vous pouvez également transférer facilement des fichiers entre des appareils Android et des PC avec RustDesk.
+
+Vous avez le contrôle total de vos données, sans aucun souci de sécurité. Vous pouvez utiliser notre serveur de rendez-vous/relais, ou l'auto-hébergement, ou écrire votre propre serveur de rendez-vous/relais. Le serveur auto-hébergé est gratuit et open source : https://github.com/rustdesk/rustdesk-server
+
+Veuillez télécharger et installer la version de bureau à partir de : https://rustdesk.com, vous pourrez alors accéder et contrôler votre bureau à partir de votre mobile, ou contrôler votre mobile à partir du bureau.
diff --git a/fastlane/metadata/android/fr-FR/short_description.txt b/fastlane/metadata/android/fr-FR/short_description.txt
new file mode 100644
index 000000000..e1f4b4b0f
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/short_description.txt
@@ -0,0 +1 @@
+Une application de bureau à distance open source, l'alternative open source à TeamViewer.
diff --git a/flutter/.gitignore b/flutter/.gitignore
index 3cbfc0f54..9c7e52c12 100644
--- a/flutter/.gitignore
+++ b/flutter/.gitignore
@@ -54,3 +54,4 @@ lib/generated_bridge.freezed.dart
flutter_export_environment.sh
Flutter-Generated.xcconfig
key.jks
+macos/rustdesk.xcodeproj/project.xcworkspace/
diff --git a/flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index b3dc255d5..d5d2c49c8 100644
Binary files a/flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index f24291dbf..e30cc5019 100644
Binary files a/flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 8a4e80f53..41ccba607 100644
Binary files a/flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 8bb8d570f..c10349d71 100644
Binary files a/flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 2130526a6..52fde7830 100644
Binary files a/flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/flutter/assets/kb_layout_iso.svg b/flutter/assets/kb_layout_iso.svg
new file mode 100644
index 000000000..69f0c96cb
--- /dev/null
+++ b/flutter/assets/kb_layout_iso.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/flutter/assets/kb_layout_not_iso.svg b/flutter/assets/kb_layout_not_iso.svg
new file mode 100644
index 000000000..09a055be3
--- /dev/null
+++ b/flutter/assets/kb_layout_not_iso.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/flutter/assets/logo.png b/flutter/assets/logo.png
index f854a1dc3..ede0e00c4 100644
Binary files a/flutter/assets/logo.png and b/flutter/assets/logo.png differ
diff --git a/flutter/build_android_deps.sh b/flutter/build_android_deps.sh
index f120346cf..a30abd154 100755
--- a/flutter/build_android_deps.sh
+++ b/flutter/build_android_deps.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-# Build libyuv / opus / libvpx / oboe for Android
-# Required:
+# Build libyuv / opus / libvpx / oboe for Android
+# Required:
# 1. set VCPKG_ROOT / ANDROID_NDK path environment variables
# 2. vcpkg initialized
# 3. ndk, version: 22 (if ndk < 22 you need to change LD as `export LD=$TOOLCHAIN/bin/$NDK_LLVM_TARGET-ld`)
@@ -23,7 +23,7 @@ HOST_TAG="linux-x86_64" # current platform, set as `ls $ANDROID_NDK/toolchains/l
TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/$HOST_TAG
function build {
- ANDROID_ABI=$1
+ ANDROID_ABI=$1
VCPKG_TARGET=$2
NDK_LLVM_TARGET=$3
LIBVPX_TARGET=$4
@@ -111,15 +111,15 @@ patch -N -d build/oboe -p1 < ../src/oboe.patch
# x86_64-linux-android
# i686-linux-android
-# LIBVPX_TARGET :
-# arm64-android-gcc
-# armv7-android-gcc
+# LIBVPX_TARGET :
+# arm64-android-gcc
+# armv7-android-gcc
# x86_64-android-gcc
-# x86-android-gcc
+# x86-android-gcc
# args: ANDROID_ABI VCPKG_TARGET NDK_LLVM_TARGET LIBVPX_TARGET
build arm64-v8a arm64-android aarch64-linux-android arm64-android-gcc
-build armeabi-v7a arm-android arm-linux-androideabi armv7-android-gcc
+build armeabi-v7a arm-android arm-linux-androideabi armv7-android-gcc
# rm -rf build/libvpx
# rm -rf build/oboe
\ No newline at end of file
diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
index d4ae9af18..c35862a8c 100644
Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
index 61c13f60b..900bd13fa 100644
Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
index ed67c27ad..5fc34ce9a 100644
Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
index f974850af..ab315a4c6 100644
Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
index ff419814d..6d69c01e1 100644
Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
index b3cdc7920..b6c8034cd 100644
Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
index 15b2e086d..cf6c7c775 100644
Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
index ed67c27ad..5fc34ce9a 100644
Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
index 94665b74e..6928a4e6d 100644
Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
index 3cf8a0dc2..a13129e15 100644
Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
index 3cf8a0dc2..a13129e15 100644
Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
index 6e21d8ee9..319e70f91 100644
Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
index 01047f4be..229bdf563 100644
Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
index ceb721793..caffb26a3 100644
Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index e416e5517..751104548 100644
Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index 0f5502f54..ed78a8e09 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -46,7 +46,7 @@ var isWebDesktop = false;
var version = "";
int androidVersion = 0;
-/// only avaliable for Windows target
+/// only available for Windows target
int windowsBuildNumber = 0;
DesktopType? desktopType;
@@ -99,22 +99,28 @@ class IconFont {
class ColorThemeExtension extends ThemeExtension {
const ColorThemeExtension({
required this.border,
+ required this.highlight,
});
final Color? border;
+ final Color? highlight;
static const light = ColorThemeExtension(
border: Color(0xFFCCCCCC),
+ highlight: Color(0xFFE5E5E5),
);
static const dark = ColorThemeExtension(
border: Color(0xFF555555),
+ highlight: Color(0xFF3F3F3F),
);
@override
- ThemeExtension copyWith({Color? border}) {
+ ThemeExtension copyWith(
+ {Color? border, Color? highlight}) {
return ColorThemeExtension(
border: border ?? this.border,
+ highlight: highlight ?? this.highlight,
);
}
@@ -126,6 +132,7 @@ class ColorThemeExtension extends ThemeExtension {
}
return ColorThemeExtension(
border: Color.lerp(border, other.border, t),
+ highlight: Color.lerp(highlight, other.highlight, t),
);
}
}
@@ -223,7 +230,7 @@ class MyTheme {
bind.mainSetLocalOption(
key: kCommConfKeyTheme, value: mode.toShortString());
}
- bind.mainChangeTheme(dark: currentThemeMode().toShortString());
+ bind.mainChangeTheme(dark: mode.toShortString());
}
}
@@ -1360,13 +1367,13 @@ connect(BuildContext context, String id,
}
}
-Future> getHttpHeaders() async {
+Map getHttpHeaders() {
return {
'Authorization': 'Bearer ${bind.mainGetLocalOption(key: 'access_token')}'
};
}
-// Simple wrapper of built-in types for refrence use.
+// Simple wrapper of built-in types for reference use.
class SimpleWrapper {
T value;
SimpleWrapper(this.value);
@@ -1402,7 +1409,7 @@ Future reloadAllWindows() async {
/// Indicate the flutter app is running in portable mode.
///
/// [Note]
-/// Portable build is only avaliable on Windows.
+/// Portable build is only available on Windows.
bool isRunningInPortableMode() {
if (!Platform.isWindows) {
return false;
@@ -1411,7 +1418,7 @@ bool isRunningInPortableMode() {
}
/// Window status callback
-void onActiveWindowChanged() async {
+Future onActiveWindowChanged() async {
print(
"[MultiWindowHandler] active window changed: ${rustDeskWinManager.getActiveWindows()}");
if (rustDeskWinManager.getActiveWindows().isEmpty) {
@@ -1503,3 +1510,53 @@ Pointer getOSVERSIONINFOEXPointer() {
bool get kUseCompatibleUiMode =>
Platform.isWindows &&
const [WindowsTarget.w7].contains(windowsBuildNumber.windowsVersion);
+
+class ServerConfig {
+ late String idServer;
+ late String relayServer;
+ late String apiServer;
+ late String key;
+
+ ServerConfig(
+ {String? idServer, String? relayServer, String? apiServer, String? key}) {
+ this.idServer = idServer?.trim() ?? '';
+ this.relayServer = relayServer?.trim() ?? '';
+ this.apiServer = apiServer?.trim() ?? '';
+ this.key = key?.trim() ?? '';
+ }
+
+ /// decode from shared string (from user shared or rustdesk-server generated)
+ /// also see [encode]
+ /// throw when decoding failure
+ ServerConfig.decode(String msg) {
+ final input = msg.split('').reversed.join('');
+ final bytes = base64Decode(base64.normalize(input));
+ final json = jsonDecode(utf8.decode(bytes));
+
+ idServer = json['host'] ?? '';
+ relayServer = json['relay'] ?? '';
+ apiServer = json['api'] ?? '';
+ key = json['key'] ?? '';
+ }
+
+ /// encode to shared string
+ /// also see [ServerConfig.decode]
+ String encode() {
+ Map config = {};
+ config['host'] = idServer.trim();
+ config['relay'] = relayServer.trim();
+ config['api'] = apiServer.trim();
+ config['key'] = key.trim();
+ return base64Encode(Uint8List.fromList(jsonEncode(config).codeUnits))
+ .split('')
+ .reversed
+ .join();
+ }
+
+ /// from local options
+ ServerConfig.fromOptions(Map options)
+ : idServer = options['custom-rendezvous-server'] ?? "",
+ relayServer = options['relay-server'] ?? "",
+ apiServer = options['api-server'] ?? "",
+ key = options['key'] ?? "";
+}
diff --git a/flutter/lib/common/hbbs/hbbs.dart b/flutter/lib/common/hbbs/hbbs.dart
new file mode 100644
index 000000000..27238db67
--- /dev/null
+++ b/flutter/lib/common/hbbs/hbbs.dart
@@ -0,0 +1,119 @@
+import 'package:flutter_hbb/models/peer_model.dart';
+
+class HttpType {
+ static const kAuthReqTypeAccount = "account";
+ static const kAuthReqTypeMobile = "mobile";
+ static const kAuthReqTypeSMSCode = "sms_code";
+ static const kAuthReqTypeEmailCode = "email_code";
+
+ static const kAuthResTypeToken = "access_token";
+ static const kAuthResTypeEmailCheck = "email_check";
+}
+
+class UserPayload {
+ String name = '';
+ String email = '';
+ String note = '';
+ int? status;
+ String grp = '';
+ bool isAdmin = false;
+
+ UserPayload.fromJson(Map json)
+ : name = json['name'] ?? '',
+ email = json['email'] ?? '',
+ note = json['note'] ?? '',
+ status = json['status'],
+ grp = json['grp'] ?? '',
+ isAdmin = json['is_admin'] == true;
+}
+
+class PeerPayload {
+ String id = '';
+ String info = '';
+ int? status;
+ String user = '';
+ String user_name = '';
+ String note = '';
+
+ PeerPayload.fromJson(Map json)
+ : id = json['id'] ?? '',
+ info = json['info'] ?? '',
+ status = json['status'],
+ user = json['user'] ?? '',
+ user_name = json['user_name'] ?? '',
+ note = json['note'] ?? '';
+
+ static Peer toPeer(PeerPayload p) {
+ return Peer.fromJson({"id": p.id});
+ }
+}
+
+class LoginRequest {
+ String? username;
+ String? password;
+ String? id;
+ String? uuid;
+ bool? autoLogin;
+ String? type;
+ String? verificationCode;
+ String? deviceInfo;
+
+ LoginRequest(
+ {this.username,
+ this.password,
+ this.id,
+ this.uuid,
+ this.autoLogin,
+ this.type,
+ this.verificationCode,
+ this.deviceInfo});
+
+ LoginRequest.fromJson(Map json) {
+ username = json['username'];
+ password = json['password'];
+ id = json['id'];
+ uuid = json['uuid'];
+ autoLogin = json['autoLogin'];
+ type = json['type'];
+ verificationCode = json['verificationCode'];
+ deviceInfo = json['deviceInfo'];
+ }
+
+ Map toJson() {
+ final Map data = {};
+ data['username'] = username ?? '';
+ data['password'] = password ?? '';
+ data['id'] = id ?? '';
+ data['uuid'] = uuid ?? '';
+ data['autoLogin'] = autoLogin ?? '';
+ data['type'] = type ?? '';
+ data['verificationCode'] = verificationCode ?? '';
+ data['deviceInfo'] = deviceInfo ?? '';
+ return data;
+ }
+}
+
+class LoginResponse {
+ String? access_token;
+ String? type;
+ UserPayload? user;
+
+ LoginResponse({this.access_token, this.type, this.user});
+
+ LoginResponse.fromJson(Map json) {
+ access_token = json['access_token'];
+ type = json['type'];
+ user = json['user'] != null ? UserPayload.fromJson(json['user']) : null;
+ }
+}
+
+class RequestException implements Exception {
+ int statusCode;
+ String cause;
+ RequestException(this.statusCode, this.cause);
+
+ @override
+ String toString() {
+ return "RequestException, statusCode: $statusCode, error: $cause";
+ }
+}
diff --git a/flutter/lib/common/widgets/address_book.dart b/flutter/lib/common/widgets/address_book.dart
index 799b0be67..34d5af485 100644
--- a/flutter/lib/common/widgets/address_book.dart
+++ b/flutter/lib/common/widgets/address_book.dart
@@ -3,14 +3,12 @@ import 'package:flutter_hbb/common/formatter/id_formatter.dart';
import 'package:flutter_hbb/common/widgets/peer_card.dart';
import 'package:flutter_hbb/common/widgets/peers_view.dart';
import 'package:flutter_hbb/desktop/widgets/popup_menu.dart';
-import 'package:flutter_hbb/desktop/widgets/login.dart';
import '../../consts.dart';
import '../../desktop/widgets/material_mod_popup_menu.dart' as mod_menu;
import 'package:get/get.dart';
import '../../common.dart';
-import '../../desktop/pages/desktop_home_page.dart';
-import '../../mobile/pages/settings_page.dart';
+import 'login.dart';
class AddressBook extends StatefulWidget {
final EdgeInsets? menuPadding;
@@ -28,7 +26,6 @@ class _AddressBookState extends State {
@override
void initState() {
super.initState();
- WidgetsBinding.instance.addPostFrameCallback((_) => gFFI.abModel.pullAb());
}
@override
@@ -42,25 +39,12 @@ class _AddressBookState extends State {
}
});
- handleLogin() {
- // TODO refactor login dialog for desktop and mobile
- if (isDesktop) {
- loginDialog().then((success) {
- if (success) {
- gFFI.abModel.pullAb();
- }
- });
- } else {
- showLogin(gFFI.dialogManager);
- }
- }
-
Future buildBody(BuildContext context) async {
return Obx(() {
if (gFFI.userModel.userName.value.isEmpty) {
return Center(
child: InkWell(
- onTap: handleLogin,
+ onTap: loginDialog,
child: Text(
translate("Login"),
style: const TextStyle(decoration: TextDecoration.underline),
diff --git a/flutter/lib/common/widgets/login.dart b/flutter/lib/common/widgets/login.dart
new file mode 100644
index 000000000..ce27ceb2c
--- /dev/null
+++ b/flutter/lib/common/widgets/login.dart
@@ -0,0 +1,676 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_hbb/common/hbbs/hbbs.dart';
+import 'package:flutter_hbb/models/platform_model.dart';
+import 'package:get/get.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+import '../../common.dart';
+
+class _IconOP extends StatelessWidget {
+ final String icon;
+ final double iconWidth;
+ final EdgeInsets margin;
+ const _IconOP(
+ {Key? key,
+ required this.icon,
+ required this.iconWidth,
+ this.margin = const EdgeInsets.symmetric(horizontal: 4.0)})
+ : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ return Container(
+ margin: margin,
+ child: SvgPicture.asset(
+ 'assets/$icon.svg',
+ width: iconWidth,
+ ),
+ );
+ }
+}
+
+class ButtonOP extends StatelessWidget {
+ final String op;
+ final RxString curOP;
+ final double iconWidth;
+ final Color primaryColor;
+ final double height;
+ final Function() onTap;
+
+ const ButtonOP({
+ Key? key,
+ required this.op,
+ required this.curOP,
+ required this.iconWidth,
+ required this.primaryColor,
+ required this.height,
+ required this.onTap,
+ }) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ return Row(children: [
+ Container(
+ height: height,
+ width: 200,
+ child: Obx(() => ElevatedButton(
+ style: ElevatedButton.styleFrom(
+ primary: curOP.value.isEmpty || curOP.value == op
+ ? primaryColor
+ : Colors.grey,
+ ).copyWith(elevation: ButtonStyleButton.allOrNull(0.0)),
+ onPressed: curOP.value.isEmpty || curOP.value == op ? onTap : null,
+ child: Row(
+ children: [
+ SizedBox(
+ width: 30,
+ child: _IconOP(
+ icon: op,
+ iconWidth: iconWidth,
+ margin: EdgeInsets.only(right: 5),
+ )),
+ Expanded(
+ child: FittedBox(
+ fit: BoxFit.scaleDown,
+ child: Center(
+ child: Text('${translate("Continue with")} $op')))),
+ ],
+ ))),
+ ),
+ ]);
+ }
+}
+
+class ConfigOP {
+ final String op;
+ final double iconWidth;
+ ConfigOP({required this.op, required this.iconWidth});
+}
+
+class WidgetOP extends StatefulWidget {
+ final ConfigOP config;
+ final RxString curOP;
+ final Function(String) cbLogin;
+ const WidgetOP({
+ Key? key,
+ required this.config,
+ required this.curOP,
+ required this.cbLogin,
+ }) : super(key: key);
+
+ @override
+ State createState() {
+ return _WidgetOPState();
+ }
+}
+
+class _WidgetOPState extends State {
+ Timer? _updateTimer;
+ String _stateMsg = '';
+ String _failedMsg = '';
+ String _url = '';
+
+ @override
+ void initState() {
+ super.initState();
+ }
+
+ @override
+ void dispose() {
+ super.dispose();
+ _updateTimer?.cancel();
+ }
+
+ _beginQueryState() {
+ _updateTimer = Timer.periodic(Duration(seconds: 1), (timer) {
+ _updateState();
+ });
+ }
+
+ _updateState() {
+ bind.mainAccountAuthResult().then((result) {
+ if (result.isEmpty) {
+ return;
+ }
+ final resultMap = jsonDecode(result);
+ if (resultMap == null) {
+ return;
+ }
+ final String stateMsg = resultMap['state_msg'];
+ String failedMsg = resultMap['failed_msg'];
+ final String? url = resultMap['url'];
+ final authBody = resultMap['auth_body'];
+ if (_stateMsg != stateMsg || _failedMsg != failedMsg) {
+ if (_url.isEmpty && url != null && url.isNotEmpty) {
+ launchUrl(Uri.parse(url));
+ _url = url;
+ }
+ if (authBody != null) {
+ _updateTimer?.cancel();
+ final String username = authBody['user']['name'];
+ widget.curOP.value = '';
+ widget.cbLogin(username);
+ }
+
+ setState(() {
+ _stateMsg = stateMsg;
+ _failedMsg = failedMsg;
+ if (failedMsg.isNotEmpty) {
+ widget.curOP.value = '';
+ _updateTimer?.cancel();
+ }
+ });
+ }
+ });
+ }
+
+ _resetState() {
+ _stateMsg = '';
+ _failedMsg = '';
+ _url = '';
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Column(
+ children: [
+ ButtonOP(
+ op: widget.config.op,
+ curOP: widget.curOP,
+ iconWidth: widget.config.iconWidth,
+ primaryColor: str2color(widget.config.op, 0x7f),
+ height: 36,
+ onTap: () async {
+ _resetState();
+ widget.curOP.value = widget.config.op;
+ await bind.mainAccountAuth(op: widget.config.op);
+ _beginQueryState();
+ },
+ ),
+ Obx(() {
+ if (widget.curOP.isNotEmpty &&
+ widget.curOP.value != widget.config.op) {
+ _failedMsg = '';
+ }
+ return Offstage(
+ offstage:
+ _failedMsg.isEmpty && widget.curOP.value != widget.config.op,
+ child: Row(
+ children: [
+ Text(
+ _stateMsg,
+ style: TextStyle(fontSize: 12),
+ ),
+ SizedBox(width: 8),
+ Text(
+ _failedMsg,
+ style: TextStyle(
+ fontSize: 14,
+ color: Colors.red,
+ ),
+ ),
+ ],
+ ));
+ }),
+ Obx(
+ () => Offstage(
+ offstage: widget.curOP.value != widget.config.op,
+ child: const SizedBox(
+ height: 5.0,
+ ),
+ ),
+ ),
+ Obx(
+ () => Offstage(
+ offstage: widget.curOP.value != widget.config.op,
+ child: ConstrainedBox(
+ constraints: BoxConstraints(maxHeight: 20),
+ child: ElevatedButton(
+ onPressed: () {
+ widget.curOP.value = '';
+ _updateTimer?.cancel();
+ _resetState();
+ bind.mainAccountAuthCancel();
+ },
+ child: Text(
+ translate('Cancel'),
+ style: TextStyle(fontSize: 15),
+ ),
+ ),
+ ),
+ ),
+ ),
+ ],
+ );
+ }
+}
+
+class LoginWidgetOP extends StatelessWidget {
+ final List ops;
+ final RxString curOP;
+ final Function(String) cbLogin;
+
+ LoginWidgetOP({
+ Key? key,
+ required this.ops,
+ required this.curOP,
+ required this.cbLogin,
+ }) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ var children = ops
+ .map((op) => [
+ WidgetOP(
+ config: op,
+ curOP: curOP,
+ cbLogin: cbLogin,
+ ),
+ const Divider(
+ indent: 5,
+ endIndent: 5,
+ )
+ ])
+ .expand((i) => i)
+ .toList();
+ if (children.isNotEmpty) {
+ children.removeLast();
+ }
+ return SingleChildScrollView(
+ child: Container(
+ width: 200,
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ mainAxisAlignment: MainAxisAlignment.spaceAround,
+ children: children,
+ )));
+ }
+}
+
+class LoginWidgetUserPass extends StatelessWidget {
+ final TextEditingController username;
+ final TextEditingController pass;
+ final String? usernameMsg;
+ final String? passMsg;
+ final bool isInProgress;
+ final RxString curOP;
+ final RxBool autoLogin;
+ final Function() onLogin;
+ final FocusNode? userFocusNode;
+ const LoginWidgetUserPass({
+ Key? key,
+ this.userFocusNode,
+ required this.username,
+ required this.pass,
+ required this.usernameMsg,
+ required this.passMsg,
+ required this.isInProgress,
+ required this.curOP,
+ required this.autoLogin,
+ required this.onLogin,
+ }) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ return Padding(
+ padding: EdgeInsets.all(0),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ const SizedBox(height: 8.0),
+ DialogTextField(
+ title: '${translate("Username")}:',
+ controller: username,
+ focusNode: userFocusNode,
+ prefixIcon: Icon(Icons.account_circle_outlined),
+ errorText: usernameMsg),
+ DialogTextField(
+ title: '${translate("Password")}:',
+ obscureText: true,
+ controller: pass,
+ prefixIcon: Icon(Icons.lock_outline),
+ errorText: passMsg),
+ Obx(() => CheckboxListTile(
+ contentPadding: const EdgeInsets.all(0),
+ dense: true,
+ controlAffinity: ListTileControlAffinity.leading,
+ title: Text(
+ translate("Remember me"),
+ ),
+ value: autoLogin.value,
+ onChanged: (v) {
+ if (v == null) return;
+ autoLogin.value = v;
+ },
+ )),
+ Offstage(
+ offstage: !isInProgress,
+ child: const LinearProgressIndicator()),
+ const SizedBox(height: 12.0),
+ FittedBox(
+ child:
+ Row(mainAxisAlignment: MainAxisAlignment.center, children: [
+ Container(
+ height: 38,
+ width: 200,
+ child: Obx(() => ElevatedButton(
+ child: Text(
+ translate('Login'),
+ style: TextStyle(fontSize: 16),
+ ),
+ onPressed:
+ curOP.value.isEmpty || curOP.value == 'rustdesk'
+ ? () {
+ onLogin();
+ }
+ : null,
+ )),
+ ),
+ ])),
+ ],
+ ));
+ }
+}
+
+class DialogTextField extends StatelessWidget {
+ final String title;
+ final bool obscureText;
+ final String? errorText;
+ final String? helperText;
+ final Widget? prefixIcon;
+ final TextEditingController controller;
+ final FocusNode? focusNode;
+
+ DialogTextField(
+ {Key? key,
+ this.focusNode,
+ this.obscureText = false,
+ this.errorText,
+ this.helperText,
+ this.prefixIcon,
+ required this.title,
+ required this.controller})
+ : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ return Row(
+ children: [
+ Expanded(
+ child: TextField(
+ decoration: InputDecoration(
+ labelText: title,
+ border: const OutlineInputBorder(),
+ prefixIcon: prefixIcon,
+ helperText: helperText,
+ helperMaxLines: 8,
+ errorText: errorText),
+ controller: controller,
+ focusNode: focusNode,
+ autofocus: true,
+ obscureText: obscureText,
+ ),
+ ),
+ ],
+ ).paddingSymmetric(vertical: 4.0);
+ }
+}
+
+/// common login dialog for desktop
+/// call this directly
+Future loginDialog() async {
+ var username = TextEditingController();
+ var password = TextEditingController();
+ final userFocusNode = FocusNode()..requestFocus();
+ Timer(Duration(milliseconds: 100), () => userFocusNode..requestFocus());
+
+ String? usernameMsg;
+ String? passwordMsg;
+ var isInProgress = false;
+ final autoLogin = true.obs;
+ final RxString curOP = ''.obs;
+
+ final res = await gFFI.dialogManager.show((setState, close) {
+ username.addListener(() {
+ if (usernameMsg != null) {
+ setState(() => usernameMsg = null);
+ }
+ });
+
+ password.addListener(() {
+ if (passwordMsg != null) {
+ setState(() => passwordMsg = null);
+ }
+ });
+
+ onDialogCancel() {
+ isInProgress = false;
+ close(false);
+ }
+
+ onLogin() async {
+ // validate
+ if (username.text.isEmpty) {
+ setState(() => usernameMsg = translate('Username missed'));
+ return;
+ }
+ if (password.text.isEmpty) {
+ setState(() => passwordMsg = translate('Password missed'));
+ return;
+ }
+ curOP.value = 'rustdesk';
+ setState(() => isInProgress = true);
+ try {
+ final resp = await gFFI.userModel.login(LoginRequest(
+ username: username.text,
+ password: password.text,
+ id: await bind.mainGetMyId(),
+ uuid: await bind.mainGetUuid(),
+ autoLogin: autoLogin.value,
+ type: HttpType.kAuthReqTypeAccount));
+
+ switch (resp.type) {
+ case HttpType.kAuthResTypeToken:
+ if (resp.access_token != null) {
+ await bind.mainSetLocalOption(
+ key: 'access_token', value: resp.access_token!);
+ close(true);
+ return;
+ }
+ break;
+ case HttpType.kAuthResTypeEmailCheck:
+ setState(() => isInProgress = false);
+ final res = await verificationCodeDialog(resp.user);
+ if (res == true) {
+ close(true);
+ return;
+ }
+ break;
+ default:
+ passwordMsg = "Failed, bad response from server";
+ break;
+ }
+ } on RequestException catch (err) {
+ passwordMsg = translate(err.cause);
+ debugPrintStack(label: err.toString());
+ } catch (err) {
+ passwordMsg = "Unknown Error: $err";
+ debugPrintStack(label: err.toString());
+ }
+ curOP.value = '';
+ setState(() => isInProgress = false);
+ }
+
+ return CustomAlertDialog(
+ title: Text(translate('Login')),
+ contentBoxConstraints: BoxConstraints(minWidth: 400),
+ content: Column(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ const SizedBox(
+ height: 8.0,
+ ),
+ LoginWidgetUserPass(
+ username: username,
+ pass: password,
+ usernameMsg: usernameMsg,
+ passMsg: passwordMsg,
+ isInProgress: isInProgress,
+ curOP: curOP,
+ autoLogin: autoLogin,
+ onLogin: onLogin,
+ userFocusNode: userFocusNode,
+ ),
+ const SizedBox(
+ height: 8.0,
+ ),
+ Center(
+ child: Text(
+ translate('or'),
+ style: TextStyle(fontSize: 16),
+ )),
+ const SizedBox(
+ height: 8.0,
+ ),
+ LoginWidgetOP(
+ ops: [
+ ConfigOP(op: 'Github', iconWidth: 20),
+ ConfigOP(op: 'Google', iconWidth: 20),
+ ConfigOP(op: 'Okta', iconWidth: 38),
+ ],
+ curOP: curOP,
+ cbLogin: (String username) {
+ gFFI.userModel.userName.value = username;
+ close(true);
+ },
+ ),
+ ],
+ ),
+ actions: [msgBoxButton(translate('Close'), onDialogCancel)],
+ onCancel: onDialogCancel,
+ );
+ });
+
+ if (res != null) {
+ // update ab and group status
+ await gFFI.abModel.pullAb();
+ await gFFI.groupModel.pull();
+ }
+
+ return res;
+}
+
+Future verificationCodeDialog(UserPayload? user) async {
+ var autoLogin = true;
+ var isInProgress = false;
+ String? errorText;
+
+ final code = TextEditingController();
+ final focusNode = FocusNode()..requestFocus();
+ Timer(Duration(milliseconds: 100), () => focusNode..requestFocus());
+
+ final res = await gFFI.dialogManager.show((setState, close) {
+ bool validate() {
+ return code.text.length >= 6;
+ }
+
+ code.addListener(() {
+ if (errorText != null) {
+ setState(() => errorText = null);
+ }
+ });
+
+ void onVerify() async {
+ if (!validate()) {
+ setState(
+ () => errorText = translate('Too short, at least 6 characters.'));
+ return;
+ }
+ setState(() => isInProgress = true);
+
+ try {
+ final resp = await gFFI.userModel.login(LoginRequest(
+ verificationCode: code.text,
+ username: user?.name,
+ id: await bind.mainGetMyId(),
+ uuid: await bind.mainGetUuid(),
+ autoLogin: autoLogin,
+ type: HttpType.kAuthReqTypeEmailCode));
+
+ switch (resp.type) {
+ case HttpType.kAuthResTypeToken:
+ if (resp.access_token != null) {
+ await bind.mainSetLocalOption(
+ key: 'access_token', value: resp.access_token!);
+ close(true);
+ return;
+ }
+ break;
+ default:
+ errorText = "Failed, bad response from server";
+ break;
+ }
+ } on RequestException catch (err) {
+ errorText = translate(err.cause);
+ debugPrintStack(label: err.toString());
+ } catch (err) {
+ errorText = "Unknown Error: $err";
+ debugPrintStack(label: err.toString());
+ }
+
+ setState(() => isInProgress = false);
+ }
+
+ return CustomAlertDialog(
+ title: Text(translate("Verification code")),
+ contentBoxConstraints: BoxConstraints(maxWidth: 300),
+ content: Column(
+ children: [
+ Offstage(
+ offstage: user?.email == null,
+ child: TextField(
+ decoration: InputDecoration(
+ labelText: "Email",
+ prefixIcon: Icon(Icons.email),
+ border: InputBorder.none),
+ readOnly: true,
+ controller: TextEditingController(text: user?.email),
+ )),
+ const SizedBox(height: 8),
+ DialogTextField(
+ title: '${translate("Verification code")}:',
+ controller: code,
+ errorText: errorText,
+ focusNode: focusNode,
+ helperText: translate('verification_tip'),
+ ),
+ CheckboxListTile(
+ contentPadding: const EdgeInsets.all(0),
+ dense: true,
+ controlAffinity: ListTileControlAffinity.leading,
+ title: Row(children: [
+ Expanded(child: Text(translate("Trust this device")))
+ ]),
+ value: autoLogin,
+ onChanged: (v) {
+ if (v == null) return;
+ setState(() => autoLogin = !autoLogin);
+ },
+ ),
+ Offstage(
+ offstage: !isInProgress,
+ child: const LinearProgressIndicator()),
+ ],
+ ),
+ actions: [
+ TextButton(onPressed: close, child: Text(translate("Cancel"))),
+ TextButton(onPressed: onVerify, child: Text(translate("Verify"))),
+ ]);
+ });
+
+ return res;
+}
diff --git a/flutter/lib/common/widgets/my_group.dart b/flutter/lib/common/widgets/my_group.dart
new file mode 100644
index 000000000..65eaba40f
--- /dev/null
+++ b/flutter/lib/common/widgets/my_group.dart
@@ -0,0 +1,225 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_hbb/common/widgets/peers_view.dart';
+import 'package:get/get.dart';
+
+import '../../common.dart';
+
+class MyGroup extends StatefulWidget {
+ final EdgeInsets? menuPadding;
+ const MyGroup({Key? key, this.menuPadding}) : super(key: key);
+
+ @override
+ State createState() {
+ return _MyGroupState();
+ }
+}
+
+class _MyGroupState extends State {
+ static final RxString selectedUser = ''.obs;
+ static final RxString searchUserText = ''.obs;
+ static TextEditingController searchUserController = TextEditingController();
+
+ @override
+ void initState() {
+ super.initState();
+ }
+
+ @override
+ Widget build(BuildContext context) => FutureBuilder(
+ future: buildBody(context),
+ builder: (context, snapshot) {
+ if (snapshot.hasData) {
+ return snapshot.data!;
+ } else {
+ return const Offstage();
+ }
+ });
+
+ Future buildBody(BuildContext context) async {
+ return Obx(() {
+ if (gFFI.groupModel.userLoading.value) {
+ return const Center(
+ child: CircularProgressIndicator(),
+ );
+ }
+ if (gFFI.groupModel.userLoadError.isNotEmpty) {
+ return _buildShowError(gFFI.groupModel.userLoadError.value);
+ }
+ if (isDesktop) {
+ return _buildDesktop();
+ } else {
+ return _buildMobile();
+ }
+ });
+ }
+
+ Widget _buildShowError(String error) {
+ return Center(
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Text(translate(error)),
+ TextButton(
+ onPressed: () {
+ gFFI.groupModel.pull();
+ },
+ child: Text(translate("Retry")))
+ ],
+ ));
+ }
+
+ Widget _buildDesktop() {
+ return Obx(
+ () => Row(
+ children: [
+ Card(
+ margin: EdgeInsets.symmetric(horizontal: 4.0),
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(12),
+ side: BorderSide(
+ color: Theme.of(context).scaffoldBackgroundColor)),
+ child: Container(
+ width: 200,
+ height: double.infinity,
+ padding:
+ const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
+ child: Column(
+ children: [
+ _buildLeftHeader(),
+ Expanded(
+ child: Container(
+ width: double.infinity,
+ height: double.infinity,
+ decoration:
+ BoxDecoration(borderRadius: BorderRadius.circular(2)),
+ child: _buildUserContacts(),
+ ).marginSymmetric(vertical: 8.0),
+ )
+ ],
+ ),
+ ),
+ ).marginOnly(right: 8.0),
+ Expanded(
+ child: Align(
+ alignment: Alignment.topLeft,
+ child: MyGroupPeerView(
+ menuPadding: widget.menuPadding,
+ initPeers: gFFI.groupModel.peersShow.value)),
+ )
+ ],
+ ),
+ );
+ }
+
+ Widget _buildMobile() {
+ return Obx(
+ () => Column(
+ children: [
+ Card(
+ margin: EdgeInsets.symmetric(horizontal: 4.0),
+ shape: RoundedRectangleBorder(
+ borderRadius: BorderRadius.circular(12),
+ side: BorderSide(
+ color: Theme.of(context).scaffoldBackgroundColor)),
+ child: Container(
+ padding:
+ const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ _buildLeftHeader(),
+ Container(
+ width: double.infinity,
+ decoration:
+ BoxDecoration(borderRadius: BorderRadius.circular(4)),
+ child: _buildUserContacts(),
+ ).marginSymmetric(vertical: 8.0)
+ ],
+ ),
+ ),
+ ),
+ Divider(),
+ Expanded(
+ child: Align(
+ alignment: Alignment.topLeft,
+ child: MyGroupPeerView(
+ menuPadding: widget.menuPadding,
+ initPeers: gFFI.groupModel.peersShow.value)),
+ )
+ ],
+ ),
+ );
+ }
+
+ Widget _buildLeftHeader() {
+ return Row(
+ children: [
+ Expanded(
+ child: TextField(
+ controller: searchUserController,
+ onChanged: (value) {
+ searchUserText.value = value;
+ },
+ decoration: InputDecoration(
+ prefixIcon: Icon(
+ Icons.search_rounded,
+ color: Theme.of(context).hintColor,
+ ),
+ contentPadding: const EdgeInsets.symmetric(vertical: 10),
+ hintText: translate("Search"),
+ hintStyle:
+ TextStyle(fontSize: 14, color: Theme.of(context).hintColor),
+ border: InputBorder.none,
+ isDense: true,
+ ),
+ )),
+ ],
+ );
+ }
+
+ Widget _buildUserContacts() {
+ return Obx(() {
+ return Column(
+ children: gFFI.groupModel.users
+ .where((p0) {
+ if (searchUserText.isNotEmpty) {
+ return p0.name.contains(searchUserText.value);
+ }
+ return true;
+ })
+ .map((e) => _buildUserItem(e.name))
+ .toList());
+ });
+ }
+
+ Widget _buildUserItem(String username) {
+ return InkWell(onTap: () {
+ if (selectedUser.value != username) {
+ selectedUser.value = username;
+ gFFI.groupModel.pullUserPeers(username);
+ }
+ }, child: Obx(
+ () {
+ bool selected = selectedUser.value == username;
+ return Container(
+ decoration: BoxDecoration(
+ color: selected ? MyTheme.color(context).highlight : null,
+ border: Border(
+ bottom: BorderSide(
+ width: 0.7,
+ color: Theme.of(context).dividerColor.withOpacity(0.1))),
+ ),
+ child: Container(
+ child: Row(
+ children: [
+ Icon(Icons.person_outline_rounded, color: Colors.grey, size: 16)
+ .marginOnly(right: 4),
+ Expanded(child: Text(username)),
+ ],
+ ).paddingSymmetric(vertical: 4),
+ ),
+ );
+ },
+ )).marginSymmetric(horizontal: 12);
+ }
+}
diff --git a/flutter/lib/common/widgets/peer_card.dart b/flutter/lib/common/widgets/peer_card.dart
index 449b67092..a98739606 100644
--- a/flutter/lib/common/widgets/peer_card.dart
+++ b/flutter/lib/common/widgets/peer_card.dart
@@ -321,6 +321,7 @@ enum CardType {
fav,
lan,
ab,
+ grp,
}
abstract class BasePeerCard extends StatelessWidget {
@@ -463,7 +464,7 @@ abstract class BasePeerCard extends StatelessWidget {
);
}
- /// Only avaliable on Windows.
+ /// Only available on Windows.
@protected
MenuEntryBase _createShortCutAction(String id) {
return MenuEntryButton(
@@ -684,6 +685,9 @@ abstract class BasePeerCard extends StatelessWidget {
case CardType.ab:
gFFI.abModel.pullAb();
break;
+ case CardType.grp:
+ gFFI.groupModel.pull();
+ break;
}
}
}
@@ -937,6 +941,41 @@ class AddressBookPeerCard extends BasePeerCard {
}
}
+class MyGroupPeerCard extends BasePeerCard {
+ MyGroupPeerCard({required Peer peer, EdgeInsets? menuPadding, Key? key})
+ : super(
+ peer: peer,
+ cardType: CardType.grp,
+ menuPadding: menuPadding,
+ key: key);
+
+ @override
+ Future>> _buildMenuItems(
+ BuildContext context) async {
+ final List> menuItems = [
+ _connectAction(context, peer),
+ _transferFileAction(context, peer.id),
+ ];
+ if (isDesktop && peer.platform != 'Android') {
+ menuItems.add(_tcpTunnelingAction(context, peer.id));
+ }
+ menuItems.add(await _forceAlwaysRelayAction(peer.id));
+ if (peer.platform == 'Windows') {
+ menuItems.add(_rdpAction(context, peer.id));
+ }
+ menuItems.add(_wolAction(peer.id));
+ if (Platform.isWindows) {
+ menuItems.add(_createShortCutAction(peer.id));
+ }
+ menuItems.add(MenuEntryDivider());
+ menuItems.add(_renameAction(peer.id));
+ if (await bind.mainPeerHasPassword(id: peer.id)) {
+ menuItems.add(_unrememberPasswordAction(peer.id));
+ }
+ return menuItems;
+ }
+}
+
void _rdpDialog(String id, CardType card) async {
String port, username;
if (card == CardType.ab) {
diff --git a/flutter/lib/common/widgets/peer_tab_page.dart b/flutter/lib/common/widgets/peer_tab_page.dart
index 1711e7b72..0c24fe7ea 100644
--- a/flutter/lib/common/widgets/peer_tab_page.dart
+++ b/flutter/lib/common/widgets/peer_tab_page.dart
@@ -1,9 +1,9 @@
-import 'dart:convert';
import 'dart:ui' as ui;
import 'package:bot_toast/bot_toast.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hbb/common/widgets/address_book.dart';
+import 'package:flutter_hbb/common/widgets/my_group.dart';
import 'package:flutter_hbb/common/widgets/peers_view.dart';
import 'package:flutter_hbb/common/widgets/peer_card.dart';
import 'package:flutter_hbb/consts.dart';
@@ -16,6 +16,101 @@ import 'package:get/get.dart';
import '../../common.dart';
import '../../models/platform_model.dart';
+const int groupTabIndex = 4;
+const String defaultGroupTabname = 'Group';
+
+class StatePeerTab {
+ final RxInt currentTab = 0.obs;
+ final RxInt tabHiddenFlag = 0.obs;
+ final RxList tabNames = [
+ 'Recent Sessions',
+ 'Favorites',
+ 'Discovered',
+ 'Address Book',
+ defaultGroupTabname,
+ ].obs;
+
+ StatePeerTab._() {
+ tabHiddenFlag.value = (int.tryParse(
+ bind.getLocalFlutterConfig(k: 'hidden-peer-card'),
+ radix: 2) ??
+ 0);
+ var tabs = _notHiddenTabs();
+ currentTab.value =
+ int.tryParse(bind.getLocalFlutterConfig(k: 'peer-tab-index')) ?? 0;
+ if (!tabs.contains(currentTab.value)) {
+ currentTab.value = 0;
+ }
+ }
+ static final StatePeerTab instance = StatePeerTab._();
+
+ check() {
+ var tabs = _notHiddenTabs();
+ if (filterGroupCard()) {
+ if (currentTab.value == groupTabIndex) {
+ currentTab.value =
+ tabs.firstWhereOrNull((e) => e != groupTabIndex) ?? 0;
+ bind.setLocalFlutterConfig(
+ k: 'peer-tab-index', v: currentTab.value.toString());
+ }
+ } else {
+ if (gFFI.userModel.isAdmin.isFalse &&
+ gFFI.userModel.groupName.isNotEmpty) {
+ tabNames[groupTabIndex] = gFFI.userModel.groupName.value;
+ } else {
+ tabNames[groupTabIndex] = defaultGroupTabname;
+ }
+ if (tabs.contains(groupTabIndex) &&
+ int.tryParse(bind.getLocalFlutterConfig(k: 'peer-tab-index')) ==
+ groupTabIndex) {
+ currentTab.value = groupTabIndex;
+ }
+ }
+ }
+
+ List currentTabs() {
+ var v = List.empty(growable: true);
+ for (int i = 0; i < tabNames.length; i++) {
+ if (!_isTabHidden(i) && !_isTabFilter(i)) {
+ v.add(i);
+ }
+ }
+ return v;
+ }
+
+ bool filterGroupCard() {
+ if (gFFI.groupModel.users.isEmpty ||
+ (gFFI.userModel.isAdmin.isFalse && gFFI.userModel.groupName.isEmpty)) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ bool _isTabHidden(int tabindex) {
+ return tabHiddenFlag & (1 << tabindex) != 0;
+ }
+
+ bool _isTabFilter(int tabIndex) {
+ if (tabIndex == groupTabIndex) {
+ return filterGroupCard();
+ }
+ return false;
+ }
+
+ List _notHiddenTabs() {
+ var v = List.empty(growable: true);
+ for (int i = 0; i < tabNames.length; i++) {
+ if (!_isTabHidden(i)) {
+ v.add(i);
+ }
+ }
+ return v;
+ }
+}
+
+final statePeerTab = StatePeerTab.instance;
+
class PeerTabPage extends StatefulWidget {
const PeerTabPage({Key? key}) : super(key: key);
@override
@@ -23,10 +118,9 @@ class PeerTabPage extends StatefulWidget {
}
class _TabEntry {
- final String name;
final Widget widget;
final Function() load;
- _TabEntry(this.name, this.widget, this.load);
+ _TabEntry(this.widget, this.load);
}
EdgeInsets? _menuPadding() {
@@ -35,65 +129,36 @@ EdgeInsets? _menuPadding() {
class _PeerTabPageState extends State
with SingleTickerProviderStateMixin {
- late final RxInt tabHiddenFlag;
- late final RxString currentTab;
- late final RxList visibleOrderedTabs;
final List<_TabEntry> entries = [
_TabEntry(
- 'Recent Sessions',
RecentPeersView(
menuPadding: _menuPadding(),
),
bind.mainLoadRecentPeers),
_TabEntry(
- 'Favorites',
FavoritePeersView(
menuPadding: _menuPadding(),
),
bind.mainLoadFavPeers),
_TabEntry(
- 'Discovered',
DiscoveredPeersView(
menuPadding: _menuPadding(),
),
bind.mainDiscover),
_TabEntry(
- 'Address Book',
AddressBook(
menuPadding: _menuPadding(),
),
() => {}),
+ _TabEntry(
+ MyGroup(
+ menuPadding: _menuPadding(),
+ ),
+ () => {}),
];
@override
void initState() {
- tabHiddenFlag = (int.tryParse(
- bind.getLocalFlutterConfig(k: 'hidden-peer-card'),
- radix: 2) ??
- 0)
- .obs;
- currentTab = bind.getLocalFlutterConfig(k: 'current-peer-tab').obs;
- visibleOrderedTabs = entries
- .where((e) => !isTabHidden(e.name))
- .map((e) => e.name)
- .toList()
- .obs;
- try {
- final conf = bind.getLocalFlutterConfig(k: 'peer-tab-order');
- if (conf.isNotEmpty) {
- final json = jsonDecode(conf);
- if (json is List) {
- final List list = json.map((e) => e.toString()).toList();
- if (list.length == visibleOrderedTabs.length &&
- visibleOrderedTabs.every((e) => list.contains(e))) {
- visibleOrderedTabs.value = list;
- }
- }
- }
- } catch (e) {
- debugPrintStack(label: '$e');
- }
-
adjustTab();
final uiType = bind.getLocalFlutterConfig(k: 'peer-card-ui-type');
@@ -105,10 +170,11 @@ class _PeerTabPageState extends State
super.initState();
}
- Future handleTabSelection(String tabName) async {
- currentTab.value = tabName;
- await bind.setLocalFlutterConfig(k: 'current-peer-tab', v: tabName);
- entries.firstWhereOrNull((e) => e.name == tabName)?.load();
+ Future handleTabSelection(int tabIndex) async {
+ if (tabIndex < entries.length) {
+ statePeerTab.currentTab.value = tabIndex;
+ entries[tabIndex].load();
+ }
}
@override
@@ -149,65 +215,80 @@ class _PeerTabPageState extends State
Widget _createSwitchBar(BuildContext context) {
final textColor = Theme.of(context).textTheme.titleLarge?.color;
return Obx(() {
- int indexCounter = -1;
- return ReorderableListView(
- buildDefaultDragHandles: false,
- onReorder: (oldIndex, newIndex) {
- var list = visibleOrderedTabs.toList();
- if (oldIndex < newIndex) {
- newIndex -= 1;
- }
- final String item = list.removeAt(oldIndex);
- list.insert(newIndex, item);
- bind.setLocalFlutterConfig(
- k: 'peer-tab-order', v: jsonEncode(list));
- visibleOrderedTabs.value = list;
- },
+ var tabs = statePeerTab.currentTabs();
+ return ListView(
scrollDirection: Axis.horizontal,
- shrinkWrap: true,
- scrollController: ScrollController(),
- children: visibleOrderedTabs.map((t) {
- indexCounter++;
- return ReorderableDragStartListener(
- key: ValueKey(t),
- index: indexCounter,
- child: InkWell(
- child: Container(
- padding: const EdgeInsets.symmetric(horizontal: 8),
- decoration: BoxDecoration(
- color: currentTab.value == t
- ? Theme.of(context).backgroundColor
- : null,
- borderRadius: BorderRadius.circular(isDesktop ? 2 : 6),
+ physics: NeverScrollableScrollPhysics(),
+ controller: ScrollController(),
+ children: tabs.map((t) {
+ return InkWell(
+ child: Container(
+ padding: const EdgeInsets.symmetric(horizontal: 8),
+ decoration: BoxDecoration(
+ color: statePeerTab.currentTab.value == t
+ ? Theme.of(context).backgroundColor
+ : null,
+ borderRadius: BorderRadius.circular(isDesktop ? 2 : 6),
+ ),
+ child: Align(
+ alignment: Alignment.center,
+ child: Text(
+ translatedTabname(t),
+ textAlign: TextAlign.center,
+ style: TextStyle(
+ height: 1,
+ fontSize: 14,
+ color: statePeerTab.currentTab.value == t
+ ? textColor
+ : textColor
+ ?..withOpacity(0.5)),
),
- child: Align(
- alignment: Alignment.center,
- child: Text(
- translate(t),
- textAlign: TextAlign.center,
- style: TextStyle(
- height: 1,
- fontSize: 14,
- color: currentTab.value == t ? textColor : textColor
- ?..withOpacity(0.5)),
- ),
- )),
- onTap: () async => await handleTabSelection(t),
- ),
+ )),
+ onTap: () async {
+ await handleTabSelection(t);
+ await bind.setLocalFlutterConfig(
+ k: 'peer-tab-index', v: t.toString());
+ },
);
}).toList());
});
}
+ translatedTabname(int index) {
+ if (index < statePeerTab.tabNames.length) {
+ final name = statePeerTab.tabNames[index];
+ if (index == groupTabIndex) {
+ if (name == defaultGroupTabname) {
+ return translate(name);
+ } else {
+ return name;
+ }
+ } else {
+ return translate(name);
+ }
+ }
+ assert(false);
+ return index.toString();
+ }
+
Widget _createPeersView() {
final verticalMargin = isDesktop ? 12.0 : 6.0;
return Expanded(
- child: Obx(() =>
- entries.firstWhereOrNull((e) => e.name == currentTab.value)?.widget ??
- visibleContextMenuListener(Center(
- child: Text(translate('Right click to select tabs')),
- ))).marginSymmetric(vertical: verticalMargin),
- );
+ child: Obx(() {
+ var tabs = statePeerTab.currentTabs();
+ if (tabs.isEmpty) {
+ return visibleContextMenuListener(Center(
+ child: Text(translate('Right click to select tabs')),
+ ));
+ } else {
+ if (tabs.contains(statePeerTab.currentTab.value)) {
+ return entries[statePeerTab.currentTab.value].widget;
+ } else {
+ statePeerTab.currentTab.value = tabs[0];
+ return entries[statePeerTab.currentTab.value].widget;
+ }
+ }
+ }).marginSymmetric(vertical: verticalMargin));
}
Widget _createPeerViewTypeSwitch(BuildContext context) {
@@ -240,22 +321,10 @@ class _PeerTabPageState extends State
);
}
- bool isTabHidden(String name) {
- int index = entries.indexWhere((e) => e.name == name);
- if (index >= 0) {
- return tabHiddenFlag & (1 << index) != 0;
- }
- assert(false);
- return false;
- }
-
adjustTab() {
- if (visibleOrderedTabs.isNotEmpty) {
- if (!visibleOrderedTabs.contains(currentTab.value)) {
- handleTabSelection(visibleOrderedTabs[0]);
- }
- } else {
- currentTab.value = '';
+ var tabs = statePeerTab.currentTabs();
+ if (tabs.isNotEmpty && !tabs.contains(statePeerTab.currentTab.value)) {
+ statePeerTab.currentTab.value = tabs[0];
}
}
@@ -278,47 +347,44 @@ class _PeerTabPageState extends State
}
Widget visibleContextMenu(CancelFunc cancelFunc) {
- final List menu = entries.asMap().entries.map((e) {
- int bitMask = 1 << e.key;
- return MenuEntrySwitch(
- switchType: SwitchType.scheckbox,
- text: translate(e.value.name),
- getter: () async {
- return tabHiddenFlag.value & bitMask == 0;
- },
- setter: (show) async {
- if (show) {
- tabHiddenFlag.value &= ~bitMask;
- } else {
- tabHiddenFlag.value |= bitMask;
- }
- await bind.setLocalFlutterConfig(
- k: 'hidden-peer-card', v: tabHiddenFlag.value.toRadixString(2));
- visibleOrderedTabs.removeWhere((e) => isTabHidden(e));
- visibleOrderedTabs.addAll(entries
- .where((e) =>
- !visibleOrderedTabs.contains(e.name) &&
- !isTabHidden(e.name))
- .map((e) => e.name)
- .toList());
- await bind.setLocalFlutterConfig(
- k: 'peer-tab-order', v: jsonEncode(visibleOrderedTabs));
- cancelFunc();
- adjustTab();
- });
- }).toList();
- return mod_menu.PopupMenu(
- items: menu
- .map((entry) => entry.build(
- context,
- const MenuConfig(
- commonColor: MyTheme.accent,
- height: 20.0,
- dividerHeight: 12.0,
- )))
- .expand((i) => i)
- .toList(),
- );
+ return Obx(() {
+ final List menu = List.empty(growable: true);
+ for (int i = 0; i < statePeerTab.tabNames.length; i++) {
+ if (i == groupTabIndex && statePeerTab.filterGroupCard()) {
+ continue;
+ }
+ int bitMask = 1 << i;
+ menu.add(MenuEntrySwitch(
+ switchType: SwitchType.scheckbox,
+ text: translatedTabname(i),
+ getter: () async {
+ return statePeerTab.tabHiddenFlag & bitMask == 0;
+ },
+ setter: (show) async {
+ if (show) {
+ statePeerTab.tabHiddenFlag.value &= ~bitMask;
+ } else {
+ statePeerTab.tabHiddenFlag.value |= bitMask;
+ }
+ await bind.setLocalFlutterConfig(
+ k: 'hidden-peer-card',
+ v: statePeerTab.tabHiddenFlag.value.toRadixString(2));
+ cancelFunc();
+ adjustTab();
+ }));
+ }
+ return mod_menu.PopupMenu(
+ items: menu
+ .map((entry) => entry.build(
+ context,
+ const MenuConfig(
+ commonColor: MyTheme.accent,
+ height: 20.0,
+ dividerHeight: 12.0,
+ )))
+ .expand((i) => i)
+ .toList());
+ });
}
}
diff --git a/flutter/lib/common/widgets/peers_view.dart b/flutter/lib/common/widgets/peers_view.dart
index 6e52bfeb8..9c98f24b8 100644
--- a/flutter/lib/common/widgets/peers_view.dart
+++ b/flutter/lib/common/widgets/peers_view.dart
@@ -326,3 +326,21 @@ class AddressBookPeersView extends BasePeersView {
return true;
}
}
+
+class MyGroupPeerView extends BasePeersView {
+ MyGroupPeerView(
+ {Key? key,
+ EdgeInsets? menuPadding,
+ ScrollController? scrollController,
+ required List initPeers})
+ : super(
+ key: key,
+ name: 'my group peer',
+ loadEvent: 'load_my_group_peers',
+ peerCardBuilder: (Peer peer) => MyGroupPeerCard(
+ peer: peer,
+ menuPadding: menuPadding,
+ ),
+ initPeers: initPeers,
+ );
+}
diff --git a/flutter/lib/common/widgets/remote_input.dart b/flutter/lib/common/widgets/remote_input.dart
index 3a79d24fb..017850cf5 100644
--- a/flutter/lib/common/widgets/remote_input.dart
+++ b/flutter/lib/common/widgets/remote_input.dart
@@ -9,11 +9,12 @@ class RawKeyFocusScope extends StatelessWidget {
final InputModel inputModel;
final Widget child;
- RawKeyFocusScope(
- {this.focusNode,
- this.onFocusChange,
- required this.inputModel,
- required this.child});
+ RawKeyFocusScope({
+ this.focusNode,
+ this.onFocusChange,
+ required this.inputModel,
+ required this.child,
+ });
@override
Widget build(BuildContext context) {
@@ -35,11 +36,15 @@ class RawPointerMouseRegion extends StatelessWidget {
final MouseCursor? cursor;
final PointerEnterEventListener? onEnter;
final PointerExitEventListener? onExit;
+ final PointerDownEventListener? onPointerDown;
+ final PointerUpEventListener? onPointerUp;
RawPointerMouseRegion(
{this.onEnter,
this.onExit,
this.cursor,
+ this.onPointerDown,
+ this.onPointerUp,
required this.inputModel,
required this.child});
@@ -47,8 +52,14 @@ class RawPointerMouseRegion extends StatelessWidget {
Widget build(BuildContext context) {
return Listener(
onPointerHover: inputModel.onPointHoverImage,
- onPointerDown: inputModel.onPointDownImage,
- onPointerUp: inputModel.onPointUpImage,
+ onPointerDown: (evt) {
+ onPointerDown?.call(evt);
+ inputModel.onPointDownImage(evt);
+ },
+ onPointerUp: (evt) {
+ onPointerUp?.call(evt);
+ inputModel.onPointUpImage(evt);
+ },
onPointerMove: inputModel.onPointMoveImage,
onPointerSignal: inputModel.onPointerSignalImage,
/*
diff --git a/flutter/lib/consts.dart b/flutter/lib/consts.dart
index 50e7f594b..7aa200ae9 100644
--- a/flutter/lib/consts.dart
+++ b/flutter/lib/consts.dart
@@ -100,6 +100,8 @@ const kRemoteImageQualityLow = 'low';
/// [kRemoteImageQualityCustom] Custom image quality.
const kRemoteImageQualityCustom = 'custom';
+const kIgnoreDpi = true;
+
/// flutter/packages/flutter/lib/src/services/keyboard_key.dart -> _keyLabels
/// see [LogicalKeyboardKey.keyLabel]
const Map logicalKeyMap = {
diff --git a/flutter/lib/desktop/pages/connection_page.dart b/flutter/lib/desktop/pages/connection_page.dart
index 7500fe99e..85749a256 100644
--- a/flutter/lib/desktop/pages/connection_page.dart
+++ b/flutter/lib/desktop/pages/connection_page.dart
@@ -6,7 +6,6 @@ import 'dart:io';
import 'package:auto_size_text/auto_size_text.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_hbb/common/widgets/address_book.dart';
import 'package:flutter_hbb/consts.dart';
import 'package:flutter_hbb/desktop/widgets/scroll_wrapper.dart';
import 'package:get/get.dart';
@@ -16,7 +15,6 @@ import 'package:window_manager/window_manager.dart';
import '../../common.dart';
import '../../common/formatter/id_formatter.dart';
import '../../common/widgets/peer_tab_page.dart';
-import '../../common/widgets/peers_view.dart';
import '../../models/platform_model.dart';
import '../widgets/button.dart';
@@ -172,6 +170,7 @@ class _ConnectionPageState extends State
Expanded(
child: Obx(
() => TextField(
+ maxLength: 90,
autocorrect: false,
enableSuggestions: false,
keyboardType: TextInputType.visiblePassword,
@@ -179,12 +178,13 @@ class _ConnectionPageState extends State
style: const TextStyle(
fontFamily: 'WorkSans',
fontSize: 22,
- height: 1,
+ height: 1.25,
),
maxLines: 1,
cursorColor:
Theme.of(context).textTheme.titleLarge?.color,
decoration: InputDecoration(
+ counterText: '',
hintText: _idInputFocused.value
? null
: translate('Enter Remote ID'),
diff --git a/flutter/lib/desktop/pages/desktop_home_page.dart b/flutter/lib/desktop/pages/desktop_home_page.dart
index e0cb5a676..fd9814cc2 100644
--- a/flutter/lib/desktop/pages/desktop_home_page.dart
+++ b/flutter/lib/desktop/pages/desktop_home_page.dart
@@ -42,6 +42,7 @@ class _DesktopHomePageState extends State
var svcStopped = false.obs;
var watchIsCanScreenRecording = false;
var watchIsProcessTrust = false;
+ var watchIsInputMonitoring = false;
Timer? _updateTimer;
@override
@@ -334,6 +335,12 @@ class _DesktopHomePageState extends State
bind.mainIsProcessTrusted(prompt: true);
watchIsProcessTrust = true;
}, help: 'Help', link: translate("doc_mac_permission"));
+ } else if (!bind.mainIsCanInputMonitoring(prompt: false)) {
+ return buildInstallCard("Permissions", "config_input", "Configure",
+ () async {
+ bind.mainIsCanInputMonitoring(prompt: true);
+ watchIsInputMonitoring = true;
+ }, help: 'Help', link: translate("doc_mac_permission"));
} else if (!svcStopped.value &&
bind.mainIsInstalled() &&
!bind.mainIsInstalledDaemon(prompt: false)) {
@@ -438,7 +445,6 @@ class _DesktopHomePageState extends State
@override
void initState() {
super.initState();
- bind.mainStartGrabKeyboard();
_updateTimer = periodic_immediate(const Duration(seconds: 1), () async {
await gFFI.serverModel.fetchID();
final url = await bind.mainGetSoftwareUpdateUrl();
@@ -468,6 +474,12 @@ class _DesktopHomePageState extends State
setState(() {});
}
}
+ if (watchIsInputMonitoring) {
+ if (bind.mainIsCanInputMonitoring(prompt: false)) {
+ watchIsInputMonitoring = false;
+ setState(() {});
+ }
+ }
});
Get.put(svcStopped, tag: 'stop-service');
rustDeskWinManager.registerActiveWindowListener(onActiveWindowChanged);
@@ -501,9 +513,9 @@ class _DesktopHomePageState extends State
} else if (call.method == kWindowActionRebuild) {
reloadCurrentWindow();
} else if (call.method == kWindowEventShow) {
- rustDeskWinManager.registerActiveWindow(call.arguments["id"]);
+ await rustDeskWinManager.registerActiveWindow(call.arguments["id"]);
} else if (call.method == kWindowEventHide) {
- rustDeskWinManager.unregisterActiveWindow(call.arguments["id"]);
+ await rustDeskWinManager.unregisterActiveWindow(call.arguments["id"]);
} else if (call.method == kWindowConnect) {
await connectMainDesktop(
call.arguments['id'],
diff --git a/flutter/lib/desktop/pages/desktop_setting_page.dart b/flutter/lib/desktop/pages/desktop_setting_page.dart
index 06cabebe7..ac92da14c 100644
--- a/flutter/lib/desktop/pages/desktop_setting_page.dart
+++ b/flutter/lib/desktop/pages/desktop_setting_page.dart
@@ -8,7 +8,6 @@ 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_tab_page.dart';
-import 'package:flutter_hbb/desktop/widgets/login.dart';
import 'package:flutter_hbb/models/platform_model.dart';
import 'package:flutter_hbb/models/server_model.dart';
import 'package:get/get.dart';
@@ -18,6 +17,7 @@ import 'package:url_launcher/url_launcher_string.dart';
import 'package:flutter_hbb/desktop/widgets/scroll_wrapper.dart';
import '../../common/widgets/dialog.dart';
+import '../../common/widgets/login.dart';
const double _kTabWidth = 235;
const double _kTabHeight = 42;
@@ -125,6 +125,7 @@ class _DesktopSettingPageState extends State
scrollController: controller,
child: PageView(
controller: controller,
+ physics: NeverScrollableScrollPhysics(),
children: const [
_General(),
_Safety(),
@@ -273,6 +274,15 @@ class _GeneralState extends State<_General> {
_OptionCheckBox(context, 'Confirm before closing multiple tabs',
'enable-confirm-closing-tabs'),
_OptionCheckBox(context, 'Adaptive Bitrate', 'enable-abr'),
+ if (Platform.isLinux)
+ Tooltip(
+ message: translate('software_render_tip'),
+ child: _OptionCheckBox(
+ context,
+ "Always use software rendering",
+ 'allow-always-software-render',
+ ),
+ )
]);
}
@@ -932,6 +942,10 @@ class _NetworkState extends State<_Network> with AutomaticKeepAliveClientMixin {
return false;
}
}
+ final old = await bind.mainGetOption(key: 'custom-rendezvous-server');
+ if (old.isNotEmpty && old != idServer) {
+ await gFFI.userModel.logOut();
+ }
// should set one by one
await bind.mainSetOption(
key: 'custom-rendezvous-server', value: idServer);
@@ -954,23 +968,17 @@ class _NetworkState extends State<_Network> with AutomaticKeepAliveClientMixin {
import() {
Clipboard.getData(Clipboard.kTextPlain).then((value) {
- TextEditingController mytext = TextEditingController();
- String? aNullableString = '';
- aNullableString = value?.text;
- mytext.text = aNullableString.toString();
- if (mytext.text.isNotEmpty) {
+ final text = value?.text;
+ if (text != null && text.isNotEmpty) {
try {
- Map config = jsonDecode(mytext.text);
- if (config.containsKey('IdServer')) {
- String id = config['IdServer'] ?? '';
- String relay = config['RelayServer'] ?? '';
- String api = config['ApiServer'] ?? '';
- String key = config['Key'] ?? '';
- idController.text = id;
- relayController.text = relay;
- apiController.text = api;
- keyController.text = key;
- Future success = set(id, relay, api, key);
+ final sc = ServerConfig.decode(text);
+ if (sc.idServer.isNotEmpty) {
+ idController.text = sc.idServer;
+ relayController.text = sc.relayServer;
+ apiController.text = sc.apiServer;
+ keyController.text = sc.key;
+ Future success =
+ set(sc.idServer, sc.relayServer, sc.apiServer, sc.key);
success.then((value) {
if (value) {
showToast(
@@ -992,12 +1000,15 @@ class _NetworkState extends State<_Network> with AutomaticKeepAliveClientMixin {
}
export() {
- Map config = {};
- config['IdServer'] = idController.text.trim();
- config['RelayServer'] = relayController.text.trim();
- config['ApiServer'] = apiController.text.trim();
- config['Key'] = keyController.text.trim();
- Clipboard.setData(ClipboardData(text: jsonEncode(config)));
+ final text = ServerConfig(
+ idServer: idController.text,
+ relayServer: relayController.text,
+ apiServer: apiController.text,
+ key: keyController.text)
+ .encode();
+ debugPrint("ServerConfig export: $text");
+
+ Clipboard.setData(ClipboardData(text: text));
showToast(translate('Export server configuration successfully'));
}
@@ -1059,21 +1070,13 @@ class _AccountState extends State<_Account> {
}
Widget accountAction() {
- return _futureBuilder(future: () async {
- return await gFFI.userModel.getUserName();
- }(), hasData: (_) {
- return Obx(() => _Button(
- gFFI.userModel.userName.value.isEmpty ? 'Login' : 'Logout',
- () => {
- gFFI.userModel.userName.value.isEmpty
- ? loginDialog().then((success) {
- if (success) {
- gFFI.abModel.pullAb();
- }
- })
- : gFFI.userModel.logOut()
- }));
- });
+ return Obx(() => _Button(
+ gFFI.userModel.userName.value.isEmpty ? 'Login' : 'Logout',
+ () => {
+ gFFI.userModel.userName.value.isEmpty
+ ? loginDialog()
+ : gFFI.userModel.logOut()
+ }));
}
}
@@ -1103,29 +1106,31 @@ class _AboutState extends State<_About> {
child: SingleChildScrollView(
controller: scrollController,
physics: NeverScrollableScrollPhysics(),
- child: _Card(title: 'About RustDesk', children: [
+ child: _Card(title: '${translate('About')} RustDesk', children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(
height: 8.0,
),
- Text('Version: $version').marginSymmetric(vertical: 4.0),
- Text('Build Date: $buildDate').marginSymmetric(vertical: 4.0),
+ Text('${translate('Version')}: $version')
+ .marginSymmetric(vertical: 4.0),
+ Text('${translate('Build Date')}: $buildDate')
+ .marginSymmetric(vertical: 4.0),
InkWell(
onTap: () {
launchUrlString('https://rustdesk.com/privacy');
},
- child: const Text(
- 'Privacy Statement',
+ child: Text(
+ translate('Privacy Statement'),
style: linkStyle,
).marginSymmetric(vertical: 4.0)),
InkWell(
onTap: () {
launchUrlString('https://rustdesk.com');
},
- child: const Text(
- 'Website',
+ child: Text(
+ translate('Website'),
style: linkStyle,
).marginSymmetric(vertical: 4.0)),
Container(
@@ -1142,8 +1147,8 @@ class _AboutState extends State<_About> {
'Copyright © 2022 Purslane Ltd.\n$license',
style: const TextStyle(color: Colors.white),
),
- const Text(
- 'Made with heart in this chaotic world!',
+ Text(
+ translate('Slogan_tip'),
style: TextStyle(
fontWeight: FontWeight.w800,
color: Colors.white),
@@ -1227,7 +1232,7 @@ Widget _OptionCheckBox(BuildContext context, String label, String key,
ref.value = option;
if (reverse) option = !option;
String value = bool2option(key, option);
- bind.mainSetOption(key: key, value: value);
+ await bind.mainSetOption(key: key, value: value);
update?.call();
}
}
@@ -1455,6 +1460,8 @@ _LabeledTextField(
enabled: enabled,
obscureText: secure,
decoration: InputDecoration(
+ isDense: true,
+ contentPadding: EdgeInsets.symmetric(vertical: 15),
errorText: errorText.isNotEmpty ? errorText : null),
style: TextStyle(
color: _disabledTextColor(context, enabled),
diff --git a/flutter/lib/desktop/pages/file_manager_page.dart b/flutter/lib/desktop/pages/file_manager_page.dart
index 9d8ef6f7a..60b22a516 100644
--- a/flutter/lib/desktop/pages/file_manager_page.dart
+++ b/flutter/lib/desktop/pages/file_manager_page.dart
@@ -7,6 +7,7 @@ import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_breadcrumb/flutter_breadcrumb.dart';
+import 'package:flutter_hbb/desktop/widgets/list_search_action_listener.dart';
import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
import 'package:flutter_hbb/models/file_model.dart';
import 'package:get/get.dart';
@@ -32,6 +33,18 @@ enum LocationStatus {
fileSearchBar
}
+/// The status of currently focused scope of the mouse
+enum MouseFocusScope {
+ /// Mouse is in local field.
+ local,
+
+ /// Mouse is in remote field.
+ remote,
+
+ /// Mouse is not in local field, remote neither.
+ none
+}
+
class FileManagerPage extends StatefulWidget {
const FileManagerPage({Key? key, required this.id}) : super(key: key);
final String id;
@@ -55,6 +68,11 @@ class _FileManagerPageState extends State
final _searchTextRemote = "".obs;
final _breadCrumbScrollerLocal = ScrollController();
final _breadCrumbScrollerRemote = ScrollController();
+ final _mouseFocusScope = Rx(MouseFocusScope.none);
+ final _keyboardNodeLocal = FocusNode(debugLabel: "keyboardNodeLocal");
+ final _keyboardNodeRemote = FocusNode(debugLabel: "keyboardNodeRemote");
+ final _listSearchBufferLocal = TimeoutStringBuffer();
+ final _listSearchBufferRemote = TimeoutStringBuffer();
/// [_lastClickTime], [_lastClickEntry] help to handle double click
int _lastClickTime =
@@ -197,6 +215,7 @@ class _FileManagerPageState extends State
}
Widget body({bool isLocal = false}) {
+ final scrollController = ScrollController();
return Container(
decoration: BoxDecoration(border: Border.all(color: Colors.black26)),
margin: const EdgeInsets.all(16.0),
@@ -217,8 +236,8 @@ class _FileManagerPageState extends State
children: [
Expanded(
child: SingleChildScrollView(
- controller: ScrollController(),
- child: _buildDataTable(context, isLocal),
+ controller: scrollController,
+ child: _buildDataTable(context, isLocal, scrollController),
),
)
],
@@ -228,7 +247,9 @@ class _FileManagerPageState extends State
);
}
- Widget _buildDataTable(BuildContext context, bool isLocal) {
+ Widget _buildDataTable(
+ BuildContext context, bool isLocal, ScrollController scrollController) {
+ const rowHeight = 25.0;
final fd = model.getCurrentDir(isLocal);
final entries = fd.entries;
final sortIndex = (SortBy style) {
@@ -246,130 +267,219 @@ class _FileManagerPageState extends State
final sortAscending =
isLocal ? model.localSortAscending : model.remoteSortAscending;
- return ObxValue(
- (searchText) {
- final filteredEntries = searchText.isNotEmpty
- ? entries.where((element) {
- return element.name.contains(searchText.value);
- }).toList(growable: false)
- : entries;
- return DataTable(
- key: ValueKey(isLocal ? 0 : 1),
- showCheckboxColumn: false,
- dataRowHeight: 25,
- headingRowHeight: 30,
- horizontalMargin: 8,
- columnSpacing: 8,
- showBottomBorder: true,
- sortColumnIndex: sortIndex,
- sortAscending: sortAscending,
- columns: [
- DataColumn(
- label: Text(
- translate("Name"),
- ).marginSymmetric(horizontal: 4),
- onSort: (columnIndex, ascending) {
- model.changeSortStyle(SortBy.name,
- isLocal: isLocal, ascending: ascending);
- }),
- DataColumn(
- label: Text(
- translate("Modified"),
- ),
- onSort: (columnIndex, ascending) {
- model.changeSortStyle(SortBy.modified,
- isLocal: isLocal, ascending: ascending);
- }),
- DataColumn(
- label: Text(translate("Size")),
- onSort: (columnIndex, ascending) {
- model.changeSortStyle(SortBy.size,
- isLocal: isLocal, ascending: ascending);
- }),
- ],
- rows: filteredEntries.map((entry) {
- final sizeStr =
- entry.isFile ? readableFileSize(entry.size.toDouble()) : "";
- final lastModifiedStr = entry.isDrive
- ? " "
- : "${entry.lastModified().toString().replaceAll(".000", "")} ";
- return DataRow(
- key: ValueKey(entry.name),
- onSelectChanged: (s) {
- _onSelectedChanged(getSelectedItems(isLocal), filteredEntries,
- entry, isLocal);
- },
- selected: getSelectedItems(isLocal).contains(entry),
- cells: [
- DataCell(
- Container(
- width: 200,
- child: Tooltip(
- waitDuration: Duration(milliseconds: 500),
- message: entry.name,
- child: Row(children: [
- entry.isDrive
- ? Image(
- image: iconHardDrive,
- fit: BoxFit.scaleDown,
+ return MouseRegion(
+ onEnter: (evt) {
+ _mouseFocusScope.value =
+ isLocal ? MouseFocusScope.local : MouseFocusScope.remote;
+ if (isLocal) {
+ _keyboardNodeLocal.requestFocus();
+ } else {
+ _keyboardNodeRemote.requestFocus();
+ }
+ },
+ onExit: (evt) {
+ _mouseFocusScope.value = MouseFocusScope.none;
+ },
+ child: ListSearchActionListener(
+ node: isLocal ? _keyboardNodeLocal : _keyboardNodeRemote,
+ buffer: isLocal ? _listSearchBufferLocal : _listSearchBufferRemote,
+ onNext: (buffer) {
+ debugPrint("searching next for $buffer");
+ assert(buffer.length == 1);
+ final selectedEntries = getSelectedItems(isLocal);
+ assert(selectedEntries.length <= 1);
+ var skipCount = 0;
+ if (selectedEntries.items.isNotEmpty) {
+ final index = entries.indexOf(selectedEntries.items.first);
+ if (index < 0) {
+ return;
+ }
+ skipCount = index + 1;
+ }
+ var searchResult = entries
+ .skip(skipCount)
+ .where((element) => element.name.startsWith(buffer));
+ if (searchResult.isEmpty) {
+ // cannot find next, lets restart search from head
+ searchResult =
+ entries.where((element) => element.name.startsWith(buffer));
+ }
+ if (searchResult.isEmpty) {
+ setState(() {
+ getSelectedItems(isLocal).clear();
+ });
+ return;
+ }
+ _jumpToEntry(
+ isLocal, searchResult.first, scrollController, rowHeight, buffer);
+ },
+ onSearch: (buffer) {
+ debugPrint("searching for $buffer");
+ final selectedEntries = getSelectedItems(isLocal);
+ final searchResult =
+ entries.where((element) => element.name.startsWith(buffer));
+ selectedEntries.clear();
+ if (searchResult.isEmpty) {
+ setState(() {
+ getSelectedItems(isLocal).clear();
+ });
+ return;
+ }
+ _jumpToEntry(
+ isLocal, searchResult.first, scrollController, rowHeight, buffer);
+ },
+ child: ObxValue(
+ (searchText) {
+ final filteredEntries = searchText.isNotEmpty
+ ? entries.where((element) {
+ return element.name.contains(searchText.value);
+ }).toList(growable: false)
+ : entries;
+ return DataTable(
+ key: ValueKey(isLocal ? 0 : 1),
+ showCheckboxColumn: false,
+ dataRowHeight: rowHeight,
+ headingRowHeight: 30,
+ horizontalMargin: 8,
+ columnSpacing: 8,
+ showBottomBorder: true,
+ sortColumnIndex: sortIndex,
+ sortAscending: sortAscending,
+ columns: [
+ DataColumn(
+ label: Text(
+ translate("Name"),
+ ).marginSymmetric(horizontal: 4),
+ onSort: (columnIndex, ascending) {
+ model.changeSortStyle(SortBy.name,
+ isLocal: isLocal, ascending: ascending);
+ }),
+ DataColumn(
+ label: Text(
+ translate("Modified"),
+ ),
+ onSort: (columnIndex, ascending) {
+ model.changeSortStyle(SortBy.modified,
+ isLocal: isLocal, ascending: ascending);
+ }),
+ DataColumn(
+ label: Text(translate("Size")),
+ onSort: (columnIndex, ascending) {
+ model.changeSortStyle(SortBy.size,
+ isLocal: isLocal, ascending: ascending);
+ }),
+ ],
+ rows: filteredEntries.map((entry) {
+ final sizeStr =
+ entry.isFile ? readableFileSize(entry.size.toDouble()) : "";
+ final lastModifiedStr = entry.isDrive
+ ? " "
+ : "${entry.lastModified().toString().replaceAll(".000", "")} ";
+ return DataRow(
+ key: ValueKey(entry.name),
+ onSelectChanged: (s) {
+ _onSelectedChanged(getSelectedItems(isLocal),
+ filteredEntries, entry, isLocal);
+ },
+ selected: getSelectedItems(isLocal).contains(entry),
+ cells: [
+ DataCell(
+ Container(
+ width: 200,
+ child: Tooltip(
+ waitDuration: Duration(milliseconds: 500),
+ message: entry.name,
+ child: Row(children: [
+ entry.isDrive
+ ? Image(
+ image: iconHardDrive,
+ fit: BoxFit.scaleDown,
+ color: Theme.of(context)
+ .iconTheme
+ .color
+ ?.withOpacity(0.7))
+ .paddingAll(4)
+ : Icon(
+ entry.isFile
+ ? Icons.feed_outlined
+ : Icons.folder,
+ size: 20,
color: Theme.of(context)
.iconTheme
.color
- ?.withOpacity(0.7))
- .paddingAll(4)
- : Icon(
- entry.isFile
- ? Icons.feed_outlined
- : Icons.folder,
- size: 20,
- color: Theme.of(context)
- .iconTheme
- .color
- ?.withOpacity(0.7),
- ).marginSymmetric(horizontal: 2),
- Expanded(
- child: Text(entry.name,
- overflow: TextOverflow.ellipsis))
- ]),
- )),
- onTap: () {
- final items = getSelectedItems(isLocal);
+ ?.withOpacity(0.7),
+ ).marginSymmetric(horizontal: 2),
+ Expanded(
+ child: Text(entry.name,
+ overflow: TextOverflow.ellipsis))
+ ]),
+ )),
+ onTap: () {
+ final items = getSelectedItems(isLocal);
- // handle double click
- if (_checkDoubleClick(entry)) {
- openDirectory(entry.path, isLocal: isLocal);
- items.clear();
- return;
- }
- _onSelectedChanged(
- items, filteredEntries, entry, isLocal);
- },
- ),
- DataCell(FittedBox(
- child: Tooltip(
+ // handle double click
+ if (_checkDoubleClick(entry)) {
+ openDirectory(entry.path, isLocal: isLocal);
+ items.clear();
+ return;
+ }
+ _onSelectedChanged(
+ items, filteredEntries, entry, isLocal);
+ },
+ ),
+ DataCell(FittedBox(
+ child: Tooltip(
+ waitDuration: Duration(milliseconds: 500),
+ message: lastModifiedStr,
+ child: Text(
+ lastModifiedStr,
+ style: TextStyle(
+ fontSize: 12, color: MyTheme.darkGray),
+ )))),
+ DataCell(Tooltip(
waitDuration: Duration(milliseconds: 500),
- message: lastModifiedStr,
+ message: sizeStr,
child: Text(
- lastModifiedStr,
+ sizeStr,
+ overflow: TextOverflow.ellipsis,
style: TextStyle(
- fontSize: 12, color: MyTheme.darkGray),
- )))),
- DataCell(Tooltip(
- waitDuration: Duration(milliseconds: 500),
- message: sizeStr,
- child: Text(
- sizeStr,
- overflow: TextOverflow.ellipsis,
- style: TextStyle(fontSize: 10, color: MyTheme.darkGray),
- ))),
- ]);
- }).toList(growable: false),
- );
- },
- isLocal ? _searchTextLocal : _searchTextRemote,
+ fontSize: 10, color: MyTheme.darkGray),
+ ))),
+ ]);
+ }).toList(growable: false),
+ );
+ },
+ isLocal ? _searchTextLocal : _searchTextRemote,
+ ),
+ ),
);
}
+ void _jumpToEntry(bool isLocal, Entry entry,
+ ScrollController scrollController, double rowHeight, String buffer) {
+ final entries = model.getCurrentDir(isLocal).entries;
+ final index = entries.indexOf(entry);
+ if (index == -1) {
+ debugPrint("entry is not valid: ${entry.path}");
+ }
+ final selectedEntries = getSelectedItems(isLocal);
+ final searchResult =
+ entries.where((element) => element.name.startsWith(buffer));
+ selectedEntries.clear();
+ if (searchResult.isEmpty) {
+ return;
+ }
+ final offset = min(
+ max(scrollController.position.minScrollExtent,
+ entries.indexOf(searchResult.first) * rowHeight),
+ scrollController.position.maxScrollExtent);
+ scrollController.jumpTo(offset);
+ setState(() {
+ selectedEntries.add(isLocal, searchResult.first);
+ debugPrint("focused on ${searchResult.first.name}");
+ });
+ }
+
void _onSelectedChanged(SelectedItems selectedItems, List entries,
Entry entry, bool isLocal) {
final isCtrlDown = RawKeyboard.instance.keysPressed
@@ -872,6 +982,8 @@ class _FileManagerPageState extends State
},
dismissOnClicked: true));
}
+ } catch (e) {
+ debugPrint("buildBread fetchDirectory err=$e");
} finally {
if (!isLocal) {
_ffi.dialogManager.dismissByTag(loadingTag);
@@ -1015,4 +1127,14 @@ class _FileManagerPageState extends State
}
model.sendFiles(items, isRemote: false);
}
+
+ void refocusKeyboardListener(bool isLocal) {
+ Future.delayed(Duration.zero, () {
+ if (isLocal) {
+ _keyboardNodeLocal.requestFocus();
+ } else {
+ _keyboardNodeRemote.requestFocus();
+ }
+ });
+ }
}
diff --git a/flutter/lib/desktop/pages/remote_page.dart b/flutter/lib/desktop/pages/remote_page.dart
index 7b3e0fe82..55a5bbaef 100644
--- a/flutter/lib/desktop/pages/remote_page.dart
+++ b/flutter/lib/desktop/pages/remote_page.dart
@@ -2,9 +2,12 @@ import 'dart:async';
import 'dart:io';
import 'dart:ui' as ui;
+import 'package:desktop_multi_window/desktop_multi_window.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
+import 'package:flutter_custom_cursor/cursor_manager.dart'
+ as custom_cursor_manager;
import 'package:get/get.dart';
import 'package:provider/provider.dart';
import 'package:wakelock/wakelock.dart';
@@ -20,6 +23,7 @@ import '../../models/model.dart';
import '../../models/platform_model.dart';
import '../../common/shared_state.dart';
import '../widgets/remote_menubar.dart';
+import '../widgets/kb_layout_type_chooser.dart';
bool _isCustomCursorInited = false;
final SimpleWrapper _firstEnterImage = SimpleWrapper(false);
@@ -46,17 +50,17 @@ class RemotePage extends StatefulWidget {
}
class _RemotePageState extends State
- with AutomaticKeepAliveClientMixin {
+ with AutomaticKeepAliveClientMixin, MultiWindowListener {
Timer? _timer;
String keyboardMode = "legacy";
+ bool _isWindowBlur = false;
final _cursorOverImage = false.obs;
late RxBool _showRemoteCursor;
late RxBool _zoomCursor;
late RxBool _remoteCursorMoved;
late RxBool _keyboardEnabled;
- final FocusNode _rawKeyFocusNode = FocusNode();
- var _imageFocused = false;
+ final FocusNode _rawKeyFocusNode = FocusNode(debugLabel: "rawkeyFocusNode");
Function(bool)? _onEnterOrLeaveImage4Menubar;
@@ -92,6 +96,10 @@ class _RemotePageState extends State
_initStates(widget.id);
_ffi = FFI();
Get.put(_ffi, tag: widget.id);
+ _ffi.imageModel.addCallbackOnFirstImage((String peerId) {
+ showKBLayoutTypeChooserIfNeeded(
+ _ffi.ffiModel.pi.platform, _ffi.dialogManager);
+ });
_ffi.start(widget.id);
WidgetsBinding.instance.addPostFrameCallback((_) {
SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: []);
@@ -101,7 +109,6 @@ class _RemotePageState extends State
if (!Platform.isLinux) {
Wakelock.enable();
}
- _rawKeyFocusNode.requestFocus();
_ffi.ffiModel.updateEventListener(widget.id);
_ffi.qualityMonitorModel.checkShowQualityMonitor(widget.id);
// Session option should be set after models.dart/FFI.start
@@ -109,22 +116,59 @@ class _RemotePageState extends State
id: widget.id, arg: 'show-remote-cursor');
_zoomCursor.value =
bind.sessionGetToggleOptionSync(id: widget.id, arg: 'zoom-cursor');
- if (!_isCustomCursorInited) {
- customCursorController.registerNeedUpdateCursorCallback(
- (String? lastKey, String? currentKey) async {
- if (_firstEnterImage.value) {
- _firstEnterImage.value = false;
- return true;
- }
- return lastKey == null || lastKey != currentKey;
- });
- _isCustomCursorInited = true;
+ DesktopMultiWindow.addListener(this);
+ // if (!_isCustomCursorInited) {
+ // customCursorController.registerNeedUpdateCursorCallback(
+ // (String? lastKey, String? currentKey) async {
+ // if (_firstEnterImage.value) {
+ // _firstEnterImage.value = false;
+ // return true;
+ // }
+ // return lastKey == null || lastKey != currentKey;
+ // });
+ // _isCustomCursorInited = true;
+ // }
+ }
+
+ @override
+ void onWindowBlur() {
+ super.onWindowBlur();
+ // On windows, we use `focus` way to handle keyboard better.
+ // Now on Linux, there's some rdev issues which will break the input.
+ // We disable the `focus` way for non-Windows temporarily.
+ if (Platform.isWindows) {
+ _isWindowBlur = true;
+ // unfocus the primary-focus when the whole window is lost focus,
+ // and let OS to handle events instead.
+ _rawKeyFocusNode.unfocus();
+ }
+ }
+
+ @override
+ void onWindowFocus() {
+ super.onWindowFocus();
+ // See [onWindowBlur].
+ if (Platform.isWindows) {
+ _isWindowBlur = false;
+ }
+ }
+
+ @override
+ void onWindowRestore() {
+ super.onWindowRestore();
+ // On windows, we use `onWindowRestore` way to handle window restore from
+ // a minimized state.
+ if (Platform.isWindows) {
+ _isWindowBlur = false;
}
}
@override
void dispose() {
debugPrint("REMOTE PAGE dispose ${widget.id}");
+ // ensure we leave this session, this is a double check
+ bind.sessionEnterOrLeave(id: widget.id, enter: false);
+ DesktopMultiWindow.removeListener(this);
_ffi.dialogManager.hideMobileActionsOverlay();
_ffi.recordingModel.onClose();
_rawKeyFocusNode.dispose();
@@ -153,8 +197,23 @@ class _RemotePageState extends State
color: Colors.black,
child: RawKeyFocusScope(
focusNode: _rawKeyFocusNode,
- onFocusChange: (bool v) {
- _imageFocused = v;
+ onFocusChange: (bool imageFocused) {
+ debugPrint(
+ "onFocusChange(window active:${!_isWindowBlur}) $imageFocused");
+ // See [onWindowBlur].
+ if (Platform.isWindows) {
+ if (_isWindowBlur) {
+ imageFocused = false;
+ Future.delayed(Duration.zero, () {
+ _rawKeyFocusNode.unfocus();
+ });
+ }
+ if (imageFocused) {
+ _ffi.inputModel.enterOrLeave(true);
+ } else {
+ _ffi.inputModel.enterOrLeave(false);
+ }
+ }
},
inputModel: _ffi.inputModel,
child: getBodyForDesktop(context)));
@@ -181,9 +240,6 @@ class _RemotePageState extends State
}
void enterView(PointerEnterEvent evt) {
- if (!_imageFocused) {
- _rawKeyFocusNode.requestFocus();
- }
_cursorOverImage.value = true;
_firstEnterImage.value = true;
if (_onEnterOrLeaveImage4Menubar != null) {
@@ -193,7 +249,13 @@ class _RemotePageState extends State
//
}
}
- _ffi.inputModel.enterOrLeave(true);
+ // See [onWindowBlur].
+ if (!Platform.isWindows) {
+ if (!_rawKeyFocusNode.hasFocus) {
+ _rawKeyFocusNode.requestFocus();
+ }
+ bind.sessionEnterOrLeave(id: widget.id, enter: true);
+ }
}
void leaveView(PointerExitEvent evt) {
@@ -206,7 +268,10 @@ class _RemotePageState extends State
//
}
}
- _ffi.inputModel.enterOrLeave(false);
+ // See [onWindowBlur].
+ if (!Platform.isWindows) {
+ bind.sessionEnterOrLeave(id: widget.id, enter: false);
+ }
}
Widget getBodyForDesktop(BuildContext context) {
@@ -228,6 +293,21 @@ class _RemotePageState extends State
listenerBuilder: (child) => RawPointerMouseRegion(
onEnter: enterView,
onExit: leaveView,
+ onPointerDown: (event) {
+ // A double check for blur status.
+ // Note: If there's an `onPointerDown` event is triggered, `_isWindowBlur` is expected being false.
+ // Sometimes the system does not send the necessary focus event to flutter. We should manually
+ // handle this inconsistent status by setting `_isWindowBlur` to false. So we can
+ // ensure the grab-key thread is running when our users are clicking the remote canvas.
+ if (_isWindowBlur) {
+ debugPrint(
+ "Unexpected status: onPointerDown is triggered while the remote window is in blur status");
+ _isWindowBlur = false;
+ }
+ if (!_rawKeyFocusNode.hasFocus) {
+ _rawKeyFocusNode.requestFocus();
+ }
+ },
inputModel: _ffi.inputModel,
child: child,
),
@@ -235,9 +315,9 @@ class _RemotePageState extends State
}))
];
- if (!_ffi.canvasModel.cursorEmbeded) {
- paints.add(Obx(() => Visibility(
- visible: _showRemoteCursor.isTrue && _remoteCursorMoved.isTrue,
+ if (!_ffi.canvasModel.cursorEmbedded) {
+ paints.add(Obx(() => Offstage(
+ offstage: _showRemoteCursor.isFalse || _remoteCursorMoved.isFalse,
child: CursorPaint(
id: widget.id,
zoomCursor: _zoomCursor,
@@ -302,7 +382,7 @@ class _ImagePaintState extends State {
mouseRegion({child}) => Obx(() => MouseRegion(
cursor: cursorOverImage.isTrue
- ? c.cursorEmbeded
+ ? c.cursorEmbedded
? SystemMouseCursors.none
: keyboardEnabled.isTrue
? (() {
@@ -322,35 +402,36 @@ class _ImagePaintState extends State {
onHover: (evt) {},
child: child));
- if (c.scrollStyle == ScrollStyle.scrollbar) {
+ if (c.imageOverflow.isTrue && c.scrollStyle == ScrollStyle.scrollbar) {
final imageWidth = c.getDisplayWidth() * s;
final imageHeight = c.getDisplayHeight() * s;
+ final imageSize = Size(imageWidth, imageHeight);
final imageWidget = CustomPaint(
- size: Size(imageWidth, imageHeight),
+ size: imageSize,
painter: ImagePainter(image: m.image, x: 0, y: 0, scale: s),
);
return NotificationListener(
- onNotification: (notification) {
- final percentX = _horizontal.hasClients
- ? _horizontal.position.extentBefore /
- (_horizontal.position.extentBefore +
- _horizontal.position.extentInside +
- _horizontal.position.extentAfter)
- : 0.0;
- final percentY = _vertical.hasClients
- ? _vertical.position.extentBefore /
- (_vertical.position.extentBefore +
- _vertical.position.extentInside +
- _vertical.position.extentAfter)
- : 0.0;
- c.setScrollPercent(percentX, percentY);
- return false;
- },
- child: mouseRegion(
- child: _buildCrossScrollbar(context, _buildListener(imageWidget),
- Size(imageWidth, imageHeight))),
- );
+ onNotification: (notification) {
+ final percentX = _horizontal.hasClients
+ ? _horizontal.position.extentBefore /
+ (_horizontal.position.extentBefore +
+ _horizontal.position.extentInside +
+ _horizontal.position.extentAfter)
+ : 0.0;
+ final percentY = _vertical.hasClients
+ ? _vertical.position.extentBefore /
+ (_vertical.position.extentBefore +
+ _vertical.position.extentInside +
+ _vertical.position.extentAfter)
+ : 0.0;
+ c.setScrollPercent(percentX, percentY);
+ return false;
+ },
+ child: mouseRegion(
+ child: Obx(() => _buildCrossScrollbarFromLayout(
+ context, _buildListener(imageWidget), c.size, imageSize)),
+ ));
} else {
final imageWidget = CustomPaint(
size: Size(c.size.width, c.size.height),
@@ -366,15 +447,23 @@ class _ImagePaintState extends State {
return MouseCursor.defer;
} else {
final key = cache.updateGetKey(scale, zoomCursor.value);
- cursor.addKey(key);
- return FlutterCustomMemoryImageCursor(
- pixbuf: cache.data,
- key: key,
- hotx: cache.hotx,
- hoty: cache.hoty,
- imageWidth: (cache.width * cache.scale).toInt(),
- imageHeight: (cache.height * cache.scale).toInt(),
- );
+ if (!cursor.cachedKeys.contains(key)) {
+ debugPrint("Register custom cursor with key $key");
+ // [Safety]
+ // It's ok to call async registerCursor in current synchronous context,
+ // because activating the cursor is also an async call and will always
+ // be executed after this.
+ custom_cursor_manager.CursorManager.instance
+ .registerCursor(custom_cursor_manager.CursorData()
+ ..buffer = cache.data!
+ ..height = (cache.height * cache.scale).toInt()
+ ..width = (cache.width * cache.scale).toInt()
+ ..hotX = cache.hotx
+ ..hotY = cache.hoty
+ ..name = key);
+ cursor.addKey(key);
+ }
+ return FlutterCustomMemoryImageCursor(key: key);
}
}
@@ -477,24 +566,6 @@ class _ImagePaintState extends State {
return widget;
}
- Widget _buildCrossScrollbar(BuildContext context, Widget child, Size size) {
- var layoutSize = MediaQuery.of(context).size;
- // If minimized, w or h may be negative here.
- final w = layoutSize.width - kWindowBorderWidth * 2;
- final h =
- layoutSize.height - kWindowBorderWidth * 2 - kDesktopRemoteTabBarHeight;
- layoutSize = Size(
- w < 0 ? 0 : w,
- h < 0 ? 0 : h,
- );
- bool overflow =
- layoutSize.width < size.width || layoutSize.height < size.height;
- return overflow
- ? Obx(() =>
- _buildCrossScrollbarFromLayout(context, child, layoutSize, size))
- : _buildCrossScrollbarFromLayout(context, child, layoutSize, size);
- }
-
Widget _buildListener(Widget child) {
if (listenerBuilder != null) {
return listenerBuilder!(child);
@@ -529,7 +600,8 @@ class CursorPaint extends StatelessWidget {
double cx = c.x;
double cy = c.y;
- if (c.scrollStyle == ScrollStyle.scrollbar) {
+ if (c.viewStyle.style == kRemoteViewStyleOriginal &&
+ c.scrollStyle == ScrollStyle.scrollbar) {
final d = c.parent.target!.ffiModel.display;
final imageWidth = d.width * c.scale;
final imageHeight = d.height * c.scale;
@@ -538,7 +610,7 @@ class CursorPaint extends StatelessWidget {
}
double x = (m.x - hotx) * c.scale + cx;
- double y = (m.y - hoty) * c.scale + cx;
+ double y = (m.y - hoty) * c.scale + cy;
double scale = 1.0;
if (zoomCursor.isTrue) {
x = m.x - hotx + cx / c.scale;
diff --git a/flutter/lib/desktop/pages/remote_tab_page.dart b/flutter/lib/desktop/pages/remote_tab_page.dart
index 713c3d13c..604787290 100644
--- a/flutter/lib/desktop/pages/remote_tab_page.dart
+++ b/flutter/lib/desktop/pages/remote_tab_page.dart
@@ -257,7 +257,7 @@ class _ConnectionTabPageState extends State {
),
]);
- if (!ffi.canvasModel.cursorEmbeded) {
+ if (!ffi.canvasModel.cursorEmbedded) {
menu.add(MenuEntryDivider());
menu.add(() {
final state = ShowRemoteCursorState.find(key);
diff --git a/flutter/lib/desktop/screen/desktop_remote_screen.dart b/flutter/lib/desktop/screen/desktop_remote_screen.dart
index 57886b2f2..e8361a652 100644
--- a/flutter/lib/desktop/screen/desktop_remote_screen.dart
+++ b/flutter/lib/desktop/screen/desktop_remote_screen.dart
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_hbb/common.dart';
import 'package:flutter_hbb/desktop/pages/remote_tab_page.dart';
+import 'package:flutter_hbb/models/platform_model.dart';
import 'package:flutter_hbb/desktop/widgets/refresh_wrapper.dart';
import 'package:provider/provider.dart';
@@ -8,7 +9,9 @@ import 'package:provider/provider.dart';
class DesktopRemoteScreen extends StatelessWidget {
final Map params;
- const DesktopRemoteScreen({Key? key, required this.params}) : super(key: key);
+ DesktopRemoteScreen({Key? key, required this.params}) : super(key: key) {
+ bind.mainStartGrabKeyboard();
+ }
@override
Widget build(BuildContext context) {
diff --git a/flutter/lib/desktop/widgets/kb_layout_type_chooser.dart b/flutter/lib/desktop/widgets/kb_layout_type_chooser.dart
new file mode 100644
index 000000000..cfbdb0c4e
--- /dev/null
+++ b/flutter/lib/desktop/widgets/kb_layout_type_chooser.dart
@@ -0,0 +1,224 @@
+import 'dart:io';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:flutter_hbb/models/platform_model.dart';
+
+import '../../common.dart';
+
+typedef KBChoosedCallback = Future Function(String);
+
+const double _kImageMarginVertical = 6.0;
+const double _kImageMarginHorizontal = 10.0;
+const double _kImageBoarderWidth = 4.0;
+const double _kImagePaddingWidth = 4.0;
+const Color _kImageBorderColor = Color.fromARGB(125, 202, 247, 2);
+const double _kBorderRadius = 6.0;
+const String _kKBLayoutTypeISO = 'ISO';
+const String _kKBLayoutTypeNotISO = 'Not ISO';
+
+const _kKBLayoutImageMap = {
+ _kKBLayoutTypeISO: 'kb_layout_iso',
+ _kKBLayoutTypeNotISO: 'kb_layout_not_iso',
+};
+
+class _KBImage extends StatelessWidget {
+ final String kbLayoutType;
+ final double imageWidth;
+ final RxString choosedType;
+ const _KBImage({
+ Key? key,
+ required this.kbLayoutType,
+ required this.imageWidth,
+ required this.choosedType,
+ }) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ return Obx(() {
+ return Container(
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(_kBorderRadius),
+ border: Border.all(
+ color: choosedType.value == kbLayoutType
+ ? _kImageBorderColor
+ : Colors.transparent,
+ width: _kImageBoarderWidth,
+ ),
+ ),
+ margin: EdgeInsets.symmetric(
+ horizontal: _kImageMarginHorizontal,
+ vertical: _kImageMarginVertical,
+ ),
+ padding: EdgeInsets.all(_kImagePaddingWidth),
+ child: SvgPicture.asset(
+ 'assets/${_kKBLayoutImageMap[kbLayoutType] ?? ""}.svg',
+ width: imageWidth -
+ _kImageMarginHorizontal * 2 -
+ _kImagePaddingWidth * 2 -
+ _kImageBoarderWidth * 2,
+ ),
+ );
+ });
+ }
+}
+
+class _KBChooser extends StatelessWidget {
+ final String kbLayoutType;
+ final double imageWidth;
+ final RxString choosedType;
+ final KBChoosedCallback cb;
+ const _KBChooser({
+ Key? key,
+ required this.kbLayoutType,
+ required this.imageWidth,
+ required this.choosedType,
+ required this.cb,
+ }) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ onChanged(String? v) async {
+ if (v != null) {
+ if (await cb(v)) {
+ choosedType.value = v;
+ }
+ }
+ }
+
+ return Column(
+ children: [
+ TextButton(
+ onPressed: () {
+ onChanged(kbLayoutType);
+ },
+ child: _KBImage(
+ kbLayoutType: kbLayoutType,
+ imageWidth: imageWidth,
+ choosedType: choosedType,
+ ),
+ style: TextButton.styleFrom(padding: EdgeInsets.zero),
+ ),
+ TextButton(
+ child: Row(
+ children: [
+ Obx(() => Radio(
+ splashRadius: 0,
+ value: kbLayoutType,
+ groupValue: choosedType.value,
+ onChanged: onChanged,
+ )),
+ Text(kbLayoutType),
+ ],
+ ),
+ onPressed: () {
+ onChanged(kbLayoutType);
+ },
+ ),
+ ],
+ );
+ }
+}
+
+class KBLayoutTypeChooser extends StatelessWidget {
+ final RxString choosedType;
+ final double width;
+ final double height;
+ final double dividerWidth;
+ final KBChoosedCallback cb;
+ KBLayoutTypeChooser({
+ Key? key,
+ required this.choosedType,
+ required this.width,
+ required this.height,
+ required this.dividerWidth,
+ required this.cb,
+ }) : super(key: key);
+
+ @override
+ Widget build(BuildContext context) {
+ final imageWidth = width / 2 - dividerWidth;
+ return SizedBox(
+ width: width,
+ height: height,
+ child: Center(
+ child: Row(
+ children: [
+ _KBChooser(
+ kbLayoutType: _kKBLayoutTypeISO,
+ imageWidth: imageWidth,
+ choosedType: choosedType,
+ cb: cb,
+ ),
+ VerticalDivider(
+ width: dividerWidth * 2,
+ ),
+ _KBChooser(
+ kbLayoutType: _kKBLayoutTypeNotISO,
+ imageWidth: imageWidth,
+ choosedType: choosedType,
+ cb: cb,
+ ),
+ ],
+ ),
+ ),
+ );
+ }
+}
+
+RxString KBLayoutType = ''.obs;
+
+String getLocalPlatformForKBLayoutType(String peerPlatform) {
+ String localPlatform = '';
+ if (peerPlatform != 'Mac OS') {
+ return localPlatform;
+ }
+
+ if (Platform.isWindows) {
+ localPlatform = 'Windows';
+ } else if (Platform.isLinux) {
+ localPlatform = 'Linux';
+ }
+ // to-do: web desktop support ?
+ return localPlatform;
+}
+
+showKBLayoutTypeChooserIfNeeded(
+ String peerPlatform,
+ OverlayDialogManager dialogManager,
+) async {
+ final localPlatform = getLocalPlatformForKBLayoutType(peerPlatform);
+ if (localPlatform == '') {
+ return;
+ }
+ KBLayoutType.value = bind.getLocalKbLayoutType();
+ if (KBLayoutType.value == _kKBLayoutTypeISO ||
+ KBLayoutType.value == _kKBLayoutTypeNotISO) {
+ return;
+ }
+ showKBLayoutTypeChooser(localPlatform, dialogManager);
+}
+
+showKBLayoutTypeChooser(
+ String localPlatform,
+ OverlayDialogManager dialogManager,
+) {
+ dialogManager.show((setState, close) {
+ return CustomAlertDialog(
+ title:
+ Text('${translate('Select local keyboard type')} ($localPlatform)'),
+ content: KBLayoutTypeChooser(
+ choosedType: KBLayoutType,
+ width: 360,
+ height: 200,
+ dividerWidth: 4.0,
+ cb: (String v) async {
+ await bind.setLocalKbLayoutType(kbLayoutType: v);
+ KBLayoutType.value = bind.getLocalKbLayoutType();
+ return v == KBLayoutType.value;
+ }),
+ actions: [msgBoxButton(translate('Close'), close)],
+ onCancel: close,
+ );
+ });
+}
diff --git a/flutter/lib/desktop/widgets/list_search_action_listener.dart b/flutter/lib/desktop/widgets/list_search_action_listener.dart
new file mode 100644
index 000000000..9598c3400
--- /dev/null
+++ b/flutter/lib/desktop/widgets/list_search_action_listener.dart
@@ -0,0 +1,75 @@
+import 'package:flutter/material.dart';
+
+class ListSearchActionListener extends StatelessWidget {
+ final FocusNode node;
+ final TimeoutStringBuffer buffer;
+ final Widget child;
+ final Function(String) onNext;
+ final Function(String) onSearch;
+
+ const ListSearchActionListener(
+ {super.key,
+ required this.node,
+ required this.buffer,
+ required this.child,
+ required this.onNext,
+ required this.onSearch});
+
+ @mustCallSuper
+ @override
+ Widget build(BuildContext context) {
+ return KeyboardListener(
+ autofocus: true,
+ onKeyEvent: (kv) {
+ final ch = kv.character;
+ if (ch == null) {
+ return;
+ }
+ final action = buffer.input(ch);
+ switch (action) {
+ case ListSearchAction.search:
+ onSearch(buffer.buffer);
+ break;
+ case ListSearchAction.next:
+ onNext(buffer.buffer);
+ break;
+ }
+ },
+ focusNode: node,
+ child: child);
+ }
+}
+
+enum ListSearchAction { search, next }
+
+class TimeoutStringBuffer {
+ var _buffer = "";
+ late DateTime _duration;
+
+ static int timeoutMilliSec = 1500;
+
+ String get buffer => _buffer;
+
+ TimeoutStringBuffer() {
+ _duration = DateTime.now();
+ }
+
+ ListSearchAction input(String ch) {
+ final curr = DateTime.now();
+ try {
+ if (curr.difference(_duration).inMilliseconds > timeoutMilliSec) {
+ _buffer = ch;
+ return ListSearchAction.search;
+ } else {
+ if (ch == _buffer) {
+ return ListSearchAction.next;
+ } else {
+ _buffer += ch;
+ return ListSearchAction.search;
+ }
+ }
+ } finally {
+ _duration = curr;
+ }
+ }
+}
diff --git a/flutter/lib/desktop/widgets/login.dart b/flutter/lib/desktop/widgets/login.dart
deleted file mode 100644
index 053653ab3..000000000
--- a/flutter/lib/desktop/widgets/login.dart
+++ /dev/null
@@ -1,521 +0,0 @@
-import 'dart:async';
-import 'dart:convert';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_hbb/models/platform_model.dart';
-import 'package:get/get.dart';
-import 'package:flutter_svg/flutter_svg.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-import '../../common.dart';
-
-final kMidButtonPadding = const EdgeInsets.fromLTRB(15, 0, 15, 0);
-
-class _IconOP extends StatelessWidget {
- final String icon;
- final double iconWidth;
- const _IconOP({Key? key, required this.icon, required this.iconWidth})
- : super(key: key);
-
- @override
- Widget build(BuildContext context) {
- return Container(
- margin: const EdgeInsets.symmetric(horizontal: 4.0),
- child: SvgPicture.asset(
- 'assets/$icon.svg',
- width: iconWidth,
- ),
- );
- }
-}
-
-class ButtonOP extends StatelessWidget {
- final String op;
- final RxString curOP;
- final double iconWidth;
- final Color primaryColor;
- final double height;
- final Function() onTap;
-
- const ButtonOP({
- Key? key,
- required this.op,
- required this.curOP,
- required this.iconWidth,
- required this.primaryColor,
- required this.height,
- required this.onTap,
- }) : super(key: key);
-
- @override
- Widget build(BuildContext context) {
- return Row(children: [
- Expanded(
- child: Container(
- height: height,
- padding: kMidButtonPadding,
- child: Obx(() => ElevatedButton(
- style: ElevatedButton.styleFrom(
- primary: curOP.value.isEmpty || curOP.value == op
- ? primaryColor
- : Colors.grey,
- ).copyWith(elevation: ButtonStyleButton.allOrNull(0.0)),
- onPressed:
- curOP.value.isEmpty || curOP.value == op ? onTap : null,
- child: Stack(children: [
- Center(child: Text('${translate("Continue with")} $op')),
- Align(
- alignment: Alignment.centerLeft,
- child: SizedBox(
- width: 120,
- child: _IconOP(
- icon: op,
- iconWidth: iconWidth,
- )),
- ),
- ]),
- )),
- ),
- )
- ]);
- }
-}
-
-class ConfigOP {
- final String op;
- final double iconWidth;
- ConfigOP({required this.op, required this.iconWidth});
-}
-
-class WidgetOP extends StatefulWidget {
- final ConfigOP config;
- final RxString curOP;
- final Function(String) cbLogin;
- const WidgetOP({
- Key? key,
- required this.config,
- required this.curOP,
- required this.cbLogin,
- }) : super(key: key);
-
- @override
- State createState() {
- return _WidgetOPState();
- }
-}
-
-class _WidgetOPState extends State {
- Timer? _updateTimer;
- String _stateMsg = '';
- String _FailedMsg = '';
- String _url = '';
-
- @override
- void initState() {
- super.initState();
- }
-
- @override
- void dispose() {
- super.dispose();
- _updateTimer?.cancel();
- }
-
- _beginQueryState() {
- _updateTimer = Timer.periodic(Duration(seconds: 1), (timer) {
- _updateState();
- });
- }
-
- _updateState() {
- bind.mainAccountAuthResult().then((result) {
- if (result.isEmpty) {
- return;
- }
- final resultMap = jsonDecode(result);
- if (resultMap == null) {
- return;
- }
- final String stateMsg = resultMap['state_msg'];
- String failedMsg = resultMap['failed_msg'];
- final String? url = resultMap['url'];
- final authBody = resultMap['auth_body'];
- if (_stateMsg != stateMsg || _FailedMsg != failedMsg) {
- if (_url.isEmpty && url != null && url.isNotEmpty) {
- launchUrl(Uri.parse(url));
- _url = url;
- }
- if (authBody != null) {
- _updateTimer?.cancel();
- final String username = authBody['user']['name'];
- widget.curOP.value = '';
- widget.cbLogin(username);
- }
-
- setState(() {
- _stateMsg = stateMsg;
- _FailedMsg = failedMsg;
- if (failedMsg.isNotEmpty) {
- widget.curOP.value = '';
- _updateTimer?.cancel();
- }
- });
- }
- });
- }
-
- _resetState() {
- _stateMsg = '';
- _FailedMsg = '';
- _url = '';
- }
-
- @override
- Widget build(BuildContext context) {
- return Column(
- children: [
- ButtonOP(
- op: widget.config.op,
- curOP: widget.curOP,
- iconWidth: widget.config.iconWidth,
- primaryColor: str2color(widget.config.op, 0x7f),
- height: 36,
- onTap: () async {
- _resetState();
- widget.curOP.value = widget.config.op;
- await bind.mainAccountAuth(op: widget.config.op);
- _beginQueryState();
- },
- ),
- Obx(() {
- if (widget.curOP.isNotEmpty &&
- widget.curOP.value != widget.config.op) {
- _FailedMsg = '';
- }
- return Offstage(
- offstage:
- _FailedMsg.isEmpty && widget.curOP.value != widget.config.op,
- child: Row(
- children: [
- Text(
- _stateMsg,
- style: TextStyle(fontSize: 12),
- ),
- SizedBox(width: 8),
- Text(
- _FailedMsg,
- style: TextStyle(
- fontSize: 14,
- color: Colors.red,
- ),
- ),
- ],
- ));
- }),
- Obx(
- () => Offstage(
- offstage: widget.curOP.value != widget.config.op,
- child: const SizedBox(
- height: 5.0,
- ),
- ),
- ),
- Obx(
- () => Offstage(
- offstage: widget.curOP.value != widget.config.op,
- child: ConstrainedBox(
- constraints: BoxConstraints(maxHeight: 20),
- child: ElevatedButton(
- onPressed: () {
- widget.curOP.value = '';
- _updateTimer?.cancel();
- _resetState();
- bind.mainAccountAuthCancel();
- },
- child: Text(
- translate('Cancel'),
- style: TextStyle(fontSize: 15),
- ),
- ),
- ),
- ),
- ),
- ],
- );
- }
-}
-
-class LoginWidgetOP extends StatelessWidget {
- final List ops;
- final RxString curOP;
- final Function(String) cbLogin;
-
- LoginWidgetOP({
- Key? key,
- required this.ops,
- required this.curOP,
- required this.cbLogin,
- }) : super(key: key);
-
- @override
- Widget build(BuildContext context) {
- var children = ops
- .map((op) => [
- WidgetOP(
- config: op,
- curOP: curOP,
- cbLogin: cbLogin,
- ),
- const Divider(
- indent: 5,
- endIndent: 5,
- )
- ])
- .expand((i) => i)
- .toList();
- if (children.isNotEmpty) {
- children.removeLast();
- }
- return SingleChildScrollView(
- child: Column(
- mainAxisSize: MainAxisSize.min,
- mainAxisAlignment: MainAxisAlignment.spaceAround,
- children: children,
- ));
- }
-}
-
-class LoginWidgetUserPass extends StatelessWidget {
- final String username;
- final String pass;
- final String usernameMsg;
- final String passMsg;
- final bool isInProgress;
- final RxString curOP;
- final Function(String, String) onLogin;
- const LoginWidgetUserPass({
- Key? key,
- required this.username,
- required this.pass,
- required this.usernameMsg,
- required this.passMsg,
- required this.isInProgress,
- required this.curOP,
- required this.onLogin,
- }) : super(key: key);
-
- @override
- Widget build(BuildContext context) {
- var userController = TextEditingController(text: username);
- var pwdController = TextEditingController(text: pass);
- return Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- const SizedBox(
- height: 8.0,
- ),
- Container(
- padding: kMidButtonPadding,
- child: Row(
- children: [
- ConstrainedBox(
- constraints: const BoxConstraints(minWidth: 100),
- child: Text(
- '${translate("Username")}:',
- textAlign: TextAlign.start,
- ).marginOnly(bottom: 16.0)),
- const SizedBox(
- width: 24.0,
- ),
- Expanded(
- child: TextField(
- decoration: InputDecoration(
- border: const OutlineInputBorder(),
- errorText: usernameMsg.isNotEmpty ? usernameMsg : null),
- controller: userController,
- focusNode: FocusNode()..requestFocus(),
- ),
- ),
- ],
- ),
- ),
- const SizedBox(
- height: 8.0,
- ),
- Container(
- padding: kMidButtonPadding,
- child: Row(
- children: [
- ConstrainedBox(
- constraints: const BoxConstraints(minWidth: 100),
- child: Text('${translate("Password")}:')
- .marginOnly(bottom: 16.0)),
- const SizedBox(
- width: 24.0,
- ),
- Expanded(
- child: TextField(
- obscureText: true,
- decoration: InputDecoration(
- border: const OutlineInputBorder(),
- errorText: passMsg.isNotEmpty ? passMsg : null),
- controller: pwdController,
- ),
- ),
- ],
- ),
- ),
- const SizedBox(
- height: 4.0,
- ),
- Offstage(
- offstage: !isInProgress, child: const LinearProgressIndicator()),
- const SizedBox(
- height: 12.0,
- ),
- Row(children: [
- Expanded(
- child: Container(
- height: 38,
- padding: kMidButtonPadding,
- child: Obx(() => ElevatedButton(
- style: curOP.value.isEmpty || curOP.value == 'rustdesk'
- ? null
- : ElevatedButton.styleFrom(
- primary: Colors.grey,
- ),
- child: Text(
- translate('Login'),
- style: TextStyle(fontSize: 16),
- ),
- onPressed: curOP.value.isEmpty || curOP.value == 'rustdesk'
- ? () {
- onLogin(userController.text, pwdController.text);
- }
- : null,
- )),
- ),
- ),
- ]),
- ],
- );
- }
-}
-
-/// common login dialog for desktop
-/// call this directly
-Future loginDialog() async {
- String username = '';
- var usernameMsg = '';
- String pass = '';
- var passMsg = '';
- var isInProgress = false;
- var completer = Completer();
- final RxString curOP = ''.obs;
-
- gFFI.dialogManager.show((setState, close) {
- cancel() {
- isInProgress = false;
- completer.complete(false);
- close();
- }
-
- onLogin(String username0, String pass0) async {
- setState(() {
- usernameMsg = '';
- passMsg = '';
- isInProgress = true;
- });
- cancel() {
- curOP.value = '';
- if (isInProgress) {
- setState(() {
- isInProgress = false;
- });
- }
- }
-
- curOP.value = 'rustdesk';
- username = username0;
- pass = pass0;
- if (username.isEmpty) {
- usernameMsg = translate('Username missed');
- cancel();
- return;
- }
- if (pass.isEmpty) {
- passMsg = translate('Password missed');
- cancel();
- return;
- }
- try {
- final resp = await gFFI.userModel.login(username, pass);
- if (resp.containsKey('error')) {
- passMsg = resp['error'];
- cancel();
- return;
- }
- // {access_token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJndWlkIjoiMDFkZjQ2ZjgtZjg3OS00MDE0LTk5Y2QtMGMwYzM2MmViZGJlIiwiZXhwIjoxNjYxNDg2NzYwfQ.GZpe1oI8TfM5yTYNrpcwbI599P4Z_-b2GmnwNl2Lr-w,
- // token_type: Bearer, user: {id: , name: admin, email: null, note: null, status: null, grp: null, is_admin: true}}
- debugPrint('$resp');
- completer.complete(true);
- } catch (err) {
- debugPrintStack(label: err.toString());
- cancel();
- return;
- }
- close();
- }
-
- return CustomAlertDialog(
- title: Text(translate('Login')),
- content: ConstrainedBox(
- constraints: const BoxConstraints(minWidth: 500),
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- const SizedBox(
- height: 8.0,
- ),
- LoginWidgetUserPass(
- username: username,
- pass: pass,
- usernameMsg: usernameMsg,
- passMsg: passMsg,
- isInProgress: isInProgress,
- curOP: curOP,
- onLogin: onLogin,
- ),
- const SizedBox(
- height: 8.0,
- ),
- Center(
- child: Text(
- translate('or'),
- style: TextStyle(fontSize: 16),
- )),
- const SizedBox(
- height: 8.0,
- ),
- LoginWidgetOP(
- ops: [
- ConfigOP(op: 'Github', iconWidth: 20),
- ConfigOP(op: 'Google', iconWidth: 20),
- ConfigOP(op: 'Okta', iconWidth: 38),
- ],
- curOP: curOP,
- cbLogin: (String username) {
- gFFI.userModel.userName.value = username;
- completer.complete(true);
- close();
- },
- ),
- ],
- ),
- ),
- actions: [msgBoxButton(translate('Close'), cancel)],
- onCancel: cancel,
- );
- });
- return completer.future;
-}
diff --git a/flutter/lib/desktop/widgets/popup_menu.dart b/flutter/lib/desktop/widgets/popup_menu.dart
index 20ab31ed9..0cbdad929 100644
--- a/flutter/lib/desktop/widgets/popup_menu.dart
+++ b/flutter/lib/desktop/widgets/popup_menu.dart
@@ -118,6 +118,15 @@ abstract class MenuEntryBase {
this.enabled,
});
List> build(BuildContext context, MenuConfig conf);
+
+ enabledStyle(BuildContext context) => TextStyle(
+ color: Theme.of(context).textTheme.titleLarge?.color,
+ fontSize: MenuConfig.fontSize,
+ fontWeight: FontWeight.normal);
+ disabledStyle() => TextStyle(
+ color: Colors.grey,
+ fontSize: MenuConfig.fontSize,
+ fontWeight: FontWeight.normal);
}
class MenuEntryDivider extends MenuEntryBase {
@@ -189,54 +198,76 @@ class MenuEntryRadios extends MenuEntryBase {
mod_menu.PopupMenuEntry _buildMenuItem(
BuildContext context, MenuConfig conf, MenuEntryRadioOption opt) {
+ Widget getTextChild() {
+ final enabledTextChild = Text(
+ opt.text,
+ style: enabledStyle(context),
+ );
+ final disabledTextChild = Text(
+ opt.text,
+ style: disabledStyle(),
+ );
+ if (opt.enabled == null) {
+ return enabledTextChild;
+ } else {
+ return Obx(
+ () => opt.enabled!.isTrue ? enabledTextChild : disabledTextChild);
+ }
+ }
+
+ final child = Container(
+ padding: padding,
+ alignment: AlignmentDirectional.centerStart,
+ constraints:
+ BoxConstraints(minHeight: conf.height, maxHeight: conf.height),
+ child: Row(
+ children: [
+ getTextChild(),
+ Expanded(
+ child: Align(
+ alignment: Alignment.centerRight,
+ child: Transform.scale(
+ scale: MenuConfig.iconScale,
+ child: Obx(() => opt.value == curOption.value
+ ? IconButton(
+ padding:
+ const EdgeInsets.fromLTRB(8.0, 0.0, 8.0, 0.0),
+ hoverColor: Colors.transparent,
+ focusColor: Colors.transparent,
+ onPressed: () {},
+ icon: Icon(
+ Icons.check,
+ color: (opt.enabled ?? true.obs).isTrue
+ ? conf.commonColor
+ : Colors.grey,
+ ))
+ : const SizedBox.shrink()),
+ ))),
+ ],
+ ),
+ );
+ onPressed() {
+ if (opt.dismissOnClicked && Navigator.canPop(context)) {
+ Navigator.pop(context);
+ }
+ setOption(opt.value);
+ }
+
return mod_menu.PopupMenuItem(
padding: EdgeInsets.zero,
height: conf.height,
child: Container(
- width: conf.boxWidth,
- child: TextButton(
- child: Container(
- padding: padding,
- alignment: AlignmentDirectional.centerStart,
- constraints: BoxConstraints(
- minHeight: conf.height, maxHeight: conf.height),
- child: Row(
- children: [
- Text(
- opt.text,
- style: TextStyle(
- color: Theme.of(context).textTheme.titleLarge?.color,
- fontSize: MenuConfig.fontSize,
- fontWeight: FontWeight.normal),
- ),
- Expanded(
- child: Align(
- alignment: Alignment.centerRight,
- child: Transform.scale(
- scale: MenuConfig.iconScale,
- child: Obx(() => opt.value == curOption.value
- ? IconButton(
- padding: const EdgeInsets.fromLTRB(
- 8.0, 0.0, 8.0, 0.0),
- hoverColor: Colors.transparent,
- focusColor: Colors.transparent,
- onPressed: () {},
- icon: Icon(
- Icons.check,
- color: conf.commonColor,
- ))
- : const SizedBox.shrink()),
- ))),
- ],
- ),
- ),
- onPressed: () {
- if (opt.dismissOnClicked && Navigator.canPop(context)) {
- Navigator.pop(context);
- }
- setOption(opt.value);
- },
- )),
+ width: conf.boxWidth,
+ child: opt.enabled == null
+ ? TextButton(
+ child: child,
+ onPressed: onPressed,
+ )
+ : Obx(() => TextButton(
+ child: child,
+ onPressed: opt.enabled!.isTrue ? onPressed : null,
+ )),
+ ),
);
}
@@ -567,12 +598,9 @@ class MenuEntrySubMenu extends MenuEntryBase {
const SizedBox(width: MenuConfig.midPadding),
Obx(() => Text(
text,
- style: TextStyle(
- color: super.enabled!.value
- ? Theme.of(context).textTheme.titleLarge?.color
- : Colors.grey,
- fontSize: MenuConfig.fontSize,
- fontWeight: FontWeight.normal),
+ style: super.enabled!.value
+ ? enabledStyle(context)
+ : disabledStyle(),
)),
Expanded(
child: Align(
@@ -605,14 +633,6 @@ class MenuEntryButton extends MenuEntryBase {
);
Widget _buildChild(BuildContext context, MenuConfig conf) {
- final enabledStyle = TextStyle(
- color: Theme.of(context).textTheme.titleLarge?.color,
- fontSize: MenuConfig.fontSize,
- fontWeight: FontWeight.normal);
- const disabledStyle = TextStyle(
- color: Colors.grey,
- fontSize: MenuConfig.fontSize,
- fontWeight: FontWeight.normal);
super.enabled ??= true.obs;
return Obx(() => Container(
width: conf.boxWidth,
@@ -631,7 +651,7 @@ class MenuEntryButton extends MenuEntryBase {
constraints:
BoxConstraints(minHeight: conf.height, maxHeight: conf.height),
child: childBuilder(
- super.enabled!.value ? enabledStyle : disabledStyle),
+ super.enabled!.value ? enabledStyle(context) : disabledStyle()),
),
)));
}
diff --git a/flutter/lib/desktop/widgets/remote_menubar.dart b/flutter/lib/desktop/widgets/remote_menubar.dart
index 2ae5b96c4..b69c73091 100644
--- a/flutter/lib/desktop/widgets/remote_menubar.dart
+++ b/flutter/lib/desktop/widgets/remote_menubar.dart
@@ -22,6 +22,7 @@ import '../../models/platform_model.dart';
import '../../common/shared_state.dart';
import './popup_menu.dart';
import './material_mod_popup_menu.dart' as mod_menu;
+import './kb_layout_type_chooser.dart';
class MenubarState {
final kStoreKey = 'remoteMenubarState';
@@ -171,6 +172,8 @@ class _RemoteMenubarState extends State {
@override
Widget build(BuildContext context) {
+ // No need to use future builder here.
+ _updateScreen();
return Align(
alignment: Alignment.topCenter,
child: Obx(() => show.value
@@ -362,8 +365,6 @@ class _RemoteMenubarState extends State {
RxInt display = CurrentDisplayState.find(widget.id);
if (display.value != i) {
bind.sessionSwitchDisplay(id: widget.id, value: i);
- pi.currentDisplay = i;
- display.value = i;
}
},
)
@@ -569,7 +570,8 @@ class _RemoteMenubarState extends State {
),
]);
// {handler.get_audit_server() && {translate('Note')}}
- final auditServer = bind.sessionGetAuditServerSync(id: widget.id);
+ final auditServer =
+ bind.sessionGetAuditServerSync(id: widget.id, typ: "conn");
if (auditServer.isNotEmpty) {
displayMenu.add(
MenuEntryButton(
@@ -697,12 +699,12 @@ class _RemoteMenubarState extends State {
if (_screen == null) {
return false;
}
- double scale = _screen!.scaleFactor;
- double selfWidth = _screen!.frame.width;
- double selfHeight = _screen!.frame.height;
+ final scale = kIgnoreDpi ? 1.0 : _screen!.scaleFactor;
+ double selfWidth = _screen!.visibleFrame.width;
+ double selfHeight = _screen!.visibleFrame.height;
if (isFullscreen) {
- selfWidth = _screen!.visibleFrame.width;
- selfHeight = _screen!.visibleFrame.height;
+ selfWidth = _screen!.frame.width;
+ selfHeight = _screen!.frame.height;
}
final canvasModel = widget.ffi.canvasModel;
@@ -827,7 +829,7 @@ class _RemoteMenubarState extends State {
qualityInitValue = qualityMaxValue;
}
final RxDouble qualitySliderValue = RxDouble(qualityInitValue);
- final debouncerQuanlity = Debouncer(
+ final debouncerQuality = Debouncer(
Duration(milliseconds: 1000),
onChanged: (double v) {
setCustomValues(quality: v);
@@ -843,7 +845,7 @@ class _RemoteMenubarState extends State {
divisions: 90,
onChanged: (double value) {
qualitySliderValue.value = value;
- debouncerQuanlity.value = value;
+ debouncerQuality.value = value;
},
),
SizedBox(
@@ -934,11 +936,13 @@ class _RemoteMenubarState extends State {
text: translate('ScrollAuto'),
value: kRemoteScrollStyleAuto,
dismissOnClicked: true,
+ enabled: widget.ffi.canvasModel.imageOverflow,
),
MenuEntryRadioOption(
text: translate('Scrollbar'),
value: kRemoteScrollStyleBar,
dismissOnClicked: true,
+ enabled: widget.ffi.canvasModel.imageOverflow,
),
],
curOptionGetter: () async =>
@@ -984,15 +988,17 @@ class _RemoteMenubarState extends State {
wndRect.bottom - wndRect.top - mediaSize.height * scale;
final canvasModel = widget.ffi.canvasModel;
- final width = (canvasModel.getDisplayWidth() +
- canvasModel.windowBorderWidth * 2) *
- scale +
- magicWidth;
- final height = (canvasModel.getDisplayHeight() +
- canvasModel.tabBarHeight +
- canvasModel.windowBorderWidth * 2) *
- scale +
- magicHeight;
+ final width =
+ (canvasModel.getDisplayWidth() * canvasModel.scale +
+ canvasModel.windowBorderWidth * 2) *
+ scale +
+ magicWidth;
+ final height =
+ (canvasModel.getDisplayHeight() * canvasModel.scale +
+ canvasModel.tabBarHeight +
+ canvasModel.windowBorderWidth * 2) *
+ scale +
+ magicHeight;
double left = wndRect.left + (wndRect.width - width) / 2;
double top = wndRect.top + (wndRect.height - height) / 2;
@@ -1032,7 +1038,9 @@ class _RemoteMenubarState extends State {
final h265 = codecsJson['h265'] ?? false;
codecs.add(h264);
codecs.add(h265);
- } finally {}
+ } catch (e) {
+ debugPrint("Show Codec Preference err=$e");
+ }
if (codecs.length == 2 && (codecs[0] || codecs[1])) {
displayMenu.add(MenuEntryRadios(
text: translate('Codec Preference'),
@@ -1082,7 +1090,7 @@ class _RemoteMenubarState extends State {
}
/// Show remote cursor
- if (!widget.ffi.canvasModel.cursorEmbeded) {
+ if (!widget.ffi.canvasModel.cursorEmbedded) {
displayMenu.add(() {
final state = ShowRemoteCursorState.find(widget.id);
return MenuEntrySwitch2(
@@ -1182,22 +1190,70 @@ class _RemoteMenubarState extends State {
}
List> _getKeyboardMenu() {
- final keyboardMenu = [
+ final List> keyboardMenu = [
MenuEntryRadios(
text: translate('Ratio'),
optionsGetter: () => [
MenuEntryRadioOption(text: translate('Legacy mode'), value: 'legacy'),
MenuEntryRadioOption(text: translate('Map mode'), value: 'map'),
],
- curOptionGetter: () async =>
- await bind.sessionGetKeyboardName(id: widget.id),
+ curOptionGetter: () async {
+ return await bind.sessionGetKeyboardMode(id: widget.id) ?? "legacy";
+ },
optionSetter: (String oldValue, String newValue) async {
- await bind.sessionSetKeyboardMode(
- id: widget.id, keyboardMode: newValue);
+ await bind.sessionSetKeyboardMode(id: widget.id, value: newValue);
},
)
];
-
+ final localPlatform =
+ getLocalPlatformForKBLayoutType(widget.ffi.ffiModel.pi.platform);
+ if (localPlatform != '') {
+ keyboardMenu.add(MenuEntryDivider());
+ keyboardMenu.add(
+ MenuEntryButton(
+ childBuilder: (TextStyle? style) => Container(
+ alignment: AlignmentDirectional.center,
+ height: _MenubarTheme.height,
+ child: Row(
+ children: [
+ Obx(() => RichText(
+ text: TextSpan(
+ text: '${translate('Local keyboard type')}: ',
+ style: DefaultTextStyle.of(context).style,
+ children: [
+ TextSpan(
+ text: KBLayoutType.value,
+ style: TextStyle(fontWeight: FontWeight.bold),
+ ),
+ ],
+ ),
+ )),
+ Expanded(
+ child: Align(
+ alignment: Alignment.centerRight,
+ child: Transform.scale(
+ scale: 0.8,
+ child: IconButton(
+ padding: EdgeInsets.zero,
+ icon: const Icon(Icons.settings),
+ onPressed: () {
+ if (Navigator.canPop(context)) {
+ Navigator.pop(context);
+ }
+ showKBLayoutTypeChooser(
+ localPlatform, widget.ffi.dialogManager);
+ },
+ ),
+ ),
+ ))
+ ],
+ )),
+ proc: () {},
+ padding: EdgeInsets.zero,
+ dismissOnClicked: false,
+ ),
+ );
+ }
return keyboardMenu;
}
@@ -1357,10 +1413,10 @@ class _DraggableShowHide extends StatefulWidget {
}) : super(key: key);
@override
- State<_DraggableShowHide> createState() => __DraggableShowHideState();
+ State<_DraggableShowHide> createState() => _DraggableShowHideState();
}
-class __DraggableShowHideState extends State<_DraggableShowHide> {
+class _DraggableShowHideState extends State<_DraggableShowHide> {
Offset position = Offset.zero;
Size size = Size.zero;
@@ -1369,7 +1425,8 @@ class __DraggableShowHideState extends State<_DraggableShowHide> {
axis: Axis.horizontal,
child: Icon(
Icons.drag_indicator,
- size: 15,
+ size: 20,
+ color: Colors.grey,
),
feedback: widget,
onDragStarted: (() {
@@ -1412,7 +1469,7 @@ class __DraggableShowHideState extends State<_DraggableShowHide> {
}),
child: Obx((() => Icon(
widget.show.isTrue ? Icons.expand_less : Icons.expand_more,
- size: 15,
+ size: 20,
))),
),
],
@@ -1425,7 +1482,7 @@ class __DraggableShowHideState extends State<_DraggableShowHide> {
border: Border.all(color: MyTheme.border),
),
child: SizedBox(
- height: 15,
+ height: 20,
child: child,
),
),
diff --git a/flutter/lib/desktop/widgets/tabbar_widget.dart b/flutter/lib/desktop/widgets/tabbar_widget.dart
index 436011cb5..91ce6cce6 100644
--- a/flutter/lib/desktop/widgets/tabbar_widget.dart
+++ b/flutter/lib/desktop/widgets/tabbar_widget.dart
@@ -331,6 +331,7 @@ class DesktopTab extends StatelessWidget {
return _buildBlock(
child: Obx(() => PageView(
controller: state.value.pageController,
+ physics: NeverScrollableScrollPhysics(),
children: state.value.tabs
.map((tab) => tab.page)
.toList(growable: false))));
@@ -526,13 +527,19 @@ class WindowActionPanelState extends State
void onWindowClose() async {
// hide window on close
if (widget.isMainWindow) {
+ await rustDeskWinManager.unregisterActiveWindow(0);
+ // `hide` must be placed after unregisterActiveWindow, because once all windows are hidden,
+ // flutter closes the application on macOS. We should ensure the post-run logic has ran successfully.
+ // e.g.: saving window position.
await windowManager.hide();
- rustDeskWinManager.unregisterActiveWindow(0);
} else {
- widget.onClose?.call();
+ // it's safe to hide the subwindow
await WindowController.fromWindowId(windowId!).hide();
- rustDeskWinManager
- .call(WindowType.Main, kWindowEventHide, {"id": windowId!});
+ await Future.wait([
+ rustDeskWinManager
+ .call(WindowType.Main, kWindowEventHide, {"id": windowId!}),
+ widget.onClose?.call() ?? Future.microtask(() => null)
+ ]);
}
super.onWindowClose();
}
diff --git a/flutter/lib/main.dart b/flutter/lib/main.dart
index 2015c02b2..6fd205a22 100644
--- a/flutter/lib/main.dart
+++ b/flutter/lib/main.dart
@@ -117,6 +117,7 @@ void runMainApp(bool startService) async {
// await windowManager.ensureInitialized();
gFFI.serverModel.startService();
}
+ gFFI.userModel.refreshCurrentUser();
runApp(App());
// restore the location of the main window before window hide or show
await restoreWindowPosition(WindowType.Main);
@@ -195,6 +196,8 @@ void runMultiWindow(
// no such appType
exit(0);
}
+ // show window from hidden status
+ WindowController.fromWindowId(windowId!).show();
}
void runConnectionManagerScreen(bool hide) async {
diff --git a/flutter/lib/mobile/pages/connection_page.dart b/flutter/lib/mobile/pages/connection_page.dart
index 957910324..6fce887bf 100644
--- a/flutter/lib/mobile/pages/connection_page.dart
+++ b/flutter/lib/mobile/pages/connection_page.dart
@@ -7,9 +7,8 @@ import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';
import '../../common.dart';
-import '../../common/widgets/address_book.dart';
+import '../../common/widgets/login.dart';
import '../../common/widgets/peer_tab_page.dart';
-import '../../common/widgets/peers_view.dart';
import '../../consts.dart';
import '../../models/model.dart';
import '../../models/platform_model.dart';
@@ -258,7 +257,7 @@ class _WebMenuState extends State {
}
if (value == 'login') {
if (gFFI.userModel.userName.value.isEmpty) {
- showLogin(gFFI.dialogManager);
+ loginDialog();
} else {
gFFI.userModel.logOut();
}
diff --git a/flutter/lib/mobile/pages/remote_page.dart b/flutter/lib/mobile/pages/remote_page.dart
index fcfb8ad60..97ce6268d 100644
--- a/flutter/lib/mobile/pages/remote_page.dart
+++ b/flutter/lib/mobile/pages/remote_page.dart
@@ -518,7 +518,7 @@ class _RemotePageState extends State {
),
),
];
- if (!gFFI.canvasModel.cursorEmbeded) {
+ if (!gFFI.canvasModel.cursorEmbedded) {
paints.add(CursorPaint());
}
return paints;
@@ -527,7 +527,7 @@ class _RemotePageState extends State {
Widget getBodyForDesktopWithListener(bool keyboard) {
var paints = [ImagePaint()];
- if (!gFFI.canvasModel.cursorEmbeded) {
+ if (!gFFI.canvasModel.cursorEmbedded) {
final cursor = bind.sessionGetToggleOptionSync(
id: widget.id, arg: 'show-remote-cursor');
if (keyboard || cursor) {
@@ -692,10 +692,11 @@ class _RemotePageState extends State {
}
void changePhysicalKeyboardInputMode() async {
- var current = await bind.sessionGetKeyboardName(id: widget.id);
+ var current = await bind.sessionGetKeyboardMode(id: widget.id) ?? "legacy";
gFFI.dialogManager.show((setState, close) {
void setMode(String? v) async {
- await bind.sessionSetKeyboardMode(id: widget.id, keyboardMode: v ?? '');
+ await bind.sessionPeerOption(
+ id: widget.id, name: "keyboard-mode", value: v ?? "");
setState(() => current = v ?? '');
Future.delayed(Duration(milliseconds: 300), close);
}
@@ -977,7 +978,9 @@ void showOptions(
final h265 = codecsJson['h265'] ?? false;
codecs.add(h264);
codecs.add(h265);
- } finally {}
+ } catch (e) {
+ debugPrint("Show Codec Preference err=$e");
+ }
}
dialogManager.show((setState, close) {
@@ -1055,7 +1058,7 @@ void showOptions(
final toggles = [
getToggle(id, setState, 'show-quality-monitor', 'Show quality monitor'),
];
- if (!gFFI.canvasModel.cursorEmbeded) {
+ if (!gFFI.canvasModel.cursorEmbedded) {
toggles.insert(0,
getToggle(id, setState, 'show-remote-cursor', 'Show remote cursor'));
}
diff --git a/flutter/lib/mobile/pages/scan_page.dart b/flutter/lib/mobile/pages/scan_page.dart
index 3bd381d92..8778d78f7 100644
--- a/flutter/lib/mobile/pages/scan_page.dart
+++ b/flutter/lib/mobile/pages/scan_page.dart
@@ -1,5 +1,4 @@
import 'dart:async';
-import 'dart:convert';
import 'dart:io';
import 'package:flutter/material.dart';
@@ -9,11 +8,11 @@ import 'package:qr_code_scanner/qr_code_scanner.dart';
import 'package:zxing2/qrcode.dart';
import '../../common.dart';
-import '../../models/platform_model.dart';
+import '../widgets/dialog.dart';
class ScanPage extends StatefulWidget {
@override
- _ScanPageState createState() => _ScanPageState();
+ State createState() => _ScanPageState();
}
class _ScanPageState extends State {
@@ -42,9 +41,9 @@ class _ScanPageState extends State {
icon: Icon(Icons.image_search),
iconSize: 32.0,
onPressed: () async {
- final ImagePicker _picker = ImagePicker();
+ final ImagePicker picker = ImagePicker();
final XFile? file =
- await _picker.pickImage(source: ImageSource.gallery);
+ await picker.pickImage(source: ImageSource.gallery);
if (file != null) {
var image = img.decodeNamedImage(
File(file.path).readAsBytesSync(), file.path)!;
@@ -139,155 +138,12 @@ class _ScanPageState extends State {
return;
}
try {
- Map values = json.decode(data.substring(7));
- var host = values['host'] != null ? values['host'] as String : '';
- var key = values['key'] != null ? values['key'] as String : '';
- var api = values['api'] != null ? values['api'] as String : '';
+ final sc = ServerConfig.decode(data.substring(7));
Timer(Duration(milliseconds: 60), () {
- showServerSettingsWithValue(host, '', key, api, gFFI.dialogManager);
+ showServerSettingsWithValue(sc, gFFI.dialogManager);
});
} catch (e) {
showToast('Invalid QR code');
}
}
}
-
-void showServerSettingsWithValue(String id, String relay, String key,
- String api, OverlayDialogManager dialogManager) async {
- Map oldOptions = jsonDecode(await bind.mainGetOptions());
- String id0 = oldOptions['custom-rendezvous-server'] ?? "";
- String relay0 = oldOptions['relay-server'] ?? "";
- String api0 = oldOptions['api-server'] ?? "";
- String key0 = oldOptions['key'] ?? "";
- var isInProgress = false;
- final idController = TextEditingController(text: id);
- final relayController = TextEditingController(text: relay);
- final apiController = TextEditingController(text: api);
-
- String? idServerMsg;
- String? relayServerMsg;
- String? apiServerMsg;
-
- dialogManager.show((setState, close) {
- Future validate() async {
- if (idController.text != id) {
- final res = await validateAsync(idController.text);
- setState(() => idServerMsg = res);
- if (idServerMsg != null) return false;
- id = idController.text;
- }
- if (relayController.text != relay) {
- relayServerMsg = await validateAsync(relayController.text);
- if (relayServerMsg != null) return false;
- relay = relayController.text;
- }
- if (apiController.text != relay) {
- apiServerMsg = await validateAsync(apiController.text);
- if (apiServerMsg != null) return false;
- api = apiController.text;
- }
- return true;
- }
-
- return CustomAlertDialog(
- title: Text(translate('ID/Relay Server')),
- content: Form(
- child: Column(
- mainAxisSize: MainAxisSize.min,
- children: [
- TextFormField(
- controller: idController,
- decoration: InputDecoration(
- labelText: translate('ID Server'),
- errorText: idServerMsg),
- )
- ] +
- (isAndroid
- ? [
- TextFormField(
- controller: relayController,
- decoration: InputDecoration(
- labelText: translate('Relay Server'),
- errorText: relayServerMsg),
- )
- ]
- : []) +
- [
- TextFormField(
- controller: apiController,
- decoration: InputDecoration(
- labelText: translate('API Server'),
- ),
- autovalidateMode: AutovalidateMode.onUserInteraction,
- validator: (v) {
- if (v != null && v.length > 0) {
- if (!(v.startsWith('http://') ||
- v.startsWith("https://"))) {
- return translate("invalid_http");
- }
- }
- return apiServerMsg;
- },
- ),
- TextFormField(
- initialValue: key,
- decoration: InputDecoration(
- labelText: 'Key',
- ),
- onChanged: (String? value) {
- if (value != null) key = value.trim();
- },
- ),
- Offstage(
- offstage: !isInProgress,
- child: LinearProgressIndicator())
- ])),
- actions: [
- TextButton(
- style: flatButtonStyle,
- onPressed: () {
- close();
- },
- child: Text(translate('Cancel')),
- ),
- TextButton(
- style: flatButtonStyle,
- onPressed: () async {
- setState(() {
- idServerMsg = null;
- relayServerMsg = null;
- apiServerMsg = null;
- isInProgress = true;
- });
- if (await validate()) {
- if (id != id0) {
- bind.mainSetOption(key: "custom-rendezvous-server", value: id);
- }
- if (relay != relay0) {
- bind.mainSetOption(key: "relay-server", value: relay);
- }
- if (key != key0) bind.mainSetOption(key: "key", value: key);
- if (api != api0) {
- bind.mainSetOption(key: "api-server", value: api);
- }
- close();
- }
- setState(() {
- isInProgress = false;
- });
- },
- child: Text(translate('OK')),
- ),
- ],
- );
- });
-}
-
-Future validateAsync(String value) async {
- value = value.trim();
- if (value.isEmpty) {
- return null;
- }
- final res = await bind.mainTestIfValidServer(server: value);
- return res.isEmpty ? null : res;
-}
diff --git a/flutter/lib/mobile/pages/server_page.dart b/flutter/lib/mobile/pages/server_page.dart
index 38ad18f14..abccdf683 100644
--- a/flutter/lib/mobile/pages/server_page.dart
+++ b/flutter/lib/mobile/pages/server_page.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
import 'package:flutter/material.dart';
import 'package:flutter_hbb/mobile/widgets/dialog.dart';
import 'package:provider/provider.dart';
@@ -107,12 +109,23 @@ class ServerPage extends StatefulWidget implements PageShape {
}
class _ServerPageState extends State {
+ Timer? _updateTimer;
+
@override
void initState() {
super.initState();
+ _updateTimer = periodic_immediate(const Duration(seconds: 3), () async {
+ await gFFI.serverModel.fetchID();
+ });
gFFI.serverModel.checkAndroidPermission();
}
+ @override
+ void dispose() {
+ _updateTimer?.cancel();
+ super.dispose();
+ }
+
@override
Widget build(BuildContext context) {
checkService();
diff --git a/flutter/lib/mobile/pages/settings_page.dart b/flutter/lib/mobile/pages/settings_page.dart
index 269439b1d..b14f3ee65 100644
--- a/flutter/lib/mobile/pages/settings_page.dart
+++ b/flutter/lib/mobile/pages/settings_page.dart
@@ -9,6 +9,7 @@ import 'package:url_launcher/url_launcher.dart';
import '../../common.dart';
import '../../common/widgets/dialog.dart';
+import '../../common/widgets/login.dart';
import '../../models/model.dart';
import '../../models/platform_model.dart';
import '../widgets/dialog.dart';
@@ -300,7 +301,7 @@ class _SettingsState extends State with WidgetsBindingObserver {
leading: Icon(Icons.person),
onPressed: (context) {
if (gFFI.userModel.userName.value.isEmpty) {
- showLogin(gFFI.dialogManager);
+ loginDialog();
} else {
gFFI.userModel.logOut();
}
@@ -391,17 +392,13 @@ class _SettingsState extends State with WidgetsBindingObserver {
void showServerSettings(OverlayDialogManager dialogManager) async {
Map options = jsonDecode(await bind.mainGetOptions());
- String id = options['custom-rendezvous-server'] ?? "";
- String relay = options['relay-server'] ?? "";
- String api = options['api-server'] ?? "";
- String key = options['key'] ?? "";
- showServerSettingsWithValue(id, relay, key, api, dialogManager);
+ showServerSettingsWithValue(ServerConfig.fromOptions(options), dialogManager);
}
void showLanguageSettings(OverlayDialogManager dialogManager) async {
try {
final langs = json.decode(await bind.mainGetLangs()) as List;
- var lang = await bind.mainGetLocalOption(key: "lang");
+ var lang = bind.mainGetLocalOption(key: "lang");
dialogManager.show((setState, close) {
setLang(v) {
if (lang != v) {
@@ -486,78 +483,6 @@ void showAbout(OverlayDialogManager dialogManager) {
}, clickMaskDismiss: true, backDismiss: true);
}
-void showLogin(OverlayDialogManager dialogManager) {
- final passwordController = TextEditingController();
- final nameController = TextEditingController();
- var loading = false;
- var error = '';
- dialogManager.show((setState, close) {
- return CustomAlertDialog(
- title: Text(translate('Login')),
- content: Column(mainAxisSize: MainAxisSize.min, children: [
- TextField(
- autofocus: true,
- autocorrect: false,
- enableSuggestions: false,
- keyboardType: TextInputType.visiblePassword,
- decoration: InputDecoration(
- labelText: translate('Username'),
- ),
- controller: nameController,
- ),
- PasswordWidget(controller: passwordController, autoFocus: false),
- ]),
- actions: (loading
- ? [CircularProgressIndicator()]
- : (error != ""
- ? [
- Text(translate(error),
- style: TextStyle(color: Colors.red))
- ]
- : [])) +
- [
- TextButton(
- style: flatButtonStyle,
- onPressed: loading
- ? null
- : () {
- close();
- setState(() {
- loading = false;
- });
- },
- child: Text(translate('Cancel')),
- ),
- TextButton(
- style: flatButtonStyle,
- onPressed: loading
- ? null
- : () async {
- final name = nameController.text.trim();
- final pass = passwordController.text.trim();
- if (name != "" && pass != "") {
- setState(() {
- loading = true;
- });
- final resp = await gFFI.userModel.login(name, pass);
- setState(() {
- loading = false;
- });
- if (resp.containsKey('error')) {
- error = resp['error'];
- return;
- }
- gFFI.abModel.pullAb();
- }
- close();
- },
- child: Text(translate('OK')),
- ),
- ],
- );
- });
-}
-
class ScanButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
diff --git a/flutter/lib/mobile/widgets/dialog.dart b/flutter/lib/mobile/widgets/dialog.dart
index 96f96658a..2df80d9fd 100644
--- a/flutter/lib/mobile/widgets/dialog.dart
+++ b/flutter/lib/mobile/widgets/dialog.dart
@@ -1,4 +1,5 @@
import 'dart:async';
+import 'dart:convert';
import 'package:flutter/material.dart';
import '../../common.dart';
@@ -236,6 +237,145 @@ void wrongPasswordDialog(String id, OverlayDialogManager dialogManager) {
]));
}
+void showServerSettingsWithValue(
+ ServerConfig serverConfig, OverlayDialogManager dialogManager) async {
+ Map oldOptions = jsonDecode(await bind.mainGetOptions());
+ final oldCfg = ServerConfig.fromOptions(oldOptions);
+
+ var isInProgress = false;
+ final idCtrl = TextEditingController(text: serverConfig.idServer);
+ final relayCtrl = TextEditingController(text: serverConfig.relayServer);
+ final apiCtrl = TextEditingController(text: serverConfig.apiServer);
+ final keyCtrl = TextEditingController(text: serverConfig.key);
+
+ String? idServerMsg;
+ String? relayServerMsg;
+ String? apiServerMsg;
+
+ dialogManager.show((setState, close) {
+ Future validate() async {
+ if (idCtrl.text != oldCfg.idServer) {
+ final res = await validateAsync(idCtrl.text);
+ setState(() => idServerMsg = res);
+ if (idServerMsg != null) return false;
+ }
+ if (relayCtrl.text != oldCfg.relayServer) {
+ relayServerMsg = await validateAsync(relayCtrl.text);
+ if (relayServerMsg != null) return false;
+ }
+ if (apiCtrl.text != oldCfg.apiServer) {
+ if (apiServerMsg != null) return false;
+ }
+ return true;
+ }
+
+ return CustomAlertDialog(
+ title: Text(translate('ID/Relay Server')),
+ content: Form(
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ TextFormField(
+ controller: idCtrl,
+ decoration: InputDecoration(
+ labelText: translate('ID Server'),
+ errorText: idServerMsg),
+ )
+ ] +
+ (isAndroid
+ ? [
+ TextFormField(
+ controller: relayCtrl,
+ decoration: InputDecoration(
+ labelText: translate('Relay Server'),
+ errorText: relayServerMsg),
+ )
+ ]
+ : []) +
+ [
+ TextFormField(
+ controller: apiCtrl,
+ decoration: InputDecoration(
+ labelText: translate('API Server'),
+ ),
+ autovalidateMode: AutovalidateMode.onUserInteraction,
+ validator: (v) {
+ if (v != null && v.isNotEmpty) {
+ if (!(v.startsWith('http://') ||
+ v.startsWith("https://"))) {
+ return translate("invalid_http");
+ }
+ }
+ return apiServerMsg;
+ },
+ ),
+ TextFormField(
+ controller: keyCtrl,
+ decoration: InputDecoration(
+ labelText: 'Key',
+ ),
+ ),
+ Offstage(
+ offstage: !isInProgress,
+ child: LinearProgressIndicator())
+ ])),
+ actions: [
+ TextButton(
+ style: flatButtonStyle,
+ onPressed: () {
+ close();
+ },
+ child: Text(translate('Cancel')),
+ ),
+ TextButton(
+ style: flatButtonStyle,
+ onPressed: () async {
+ setState(() {
+ idServerMsg = null;
+ relayServerMsg = null;
+ apiServerMsg = null;
+ isInProgress = true;
+ });
+ if (await validate()) {
+ if (idCtrl.text != oldCfg.idServer) {
+ if (oldCfg.idServer.isNotEmpty) {
+ await gFFI.userModel.logOut();
+ }
+ bind.mainSetOption(
+ key: "custom-rendezvous-server", value: idCtrl.text);
+ }
+ if (relayCtrl.text != oldCfg.relayServer) {
+ bind.mainSetOption(key: "relay-server", value: relayCtrl.text);
+ }
+ if (keyCtrl.text != oldCfg.key) {
+ bind.mainSetOption(key: "key", value: keyCtrl.text);
+ }
+ if (apiCtrl.text != oldCfg.apiServer) {
+ bind.mainSetOption(key: "api-server", value: apiCtrl.text);
+ }
+ close();
+ showToast(translate('Successful'));
+ }
+ setState(() {
+ isInProgress = false;
+ });
+ },
+ child: Text(translate('OK')),
+ ),
+ ],
+ );
+ });
+}
+
+Future validateAsync(String value) async {
+ value = value.trim();
+ if (value.isEmpty) {
+ return null;
+ }
+ final res = await bind.mainTestIfValidServer(server: value);
+ return res.isEmpty ? null : res;
+}
+
class PasswordWidget extends StatefulWidget {
PasswordWidget({Key? key, required this.controller, this.autoFocus = true})
: super(key: key);
@@ -285,7 +425,7 @@ class _PasswordWidgetState extends State {
color: Theme.of(context).primaryColorDark,
),
onPressed: () {
- // Update the state i.e. toogle the state of passwordVisible variable
+ // Update the state i.e. toggle the state of passwordVisible variable
setState(() {
_passwordVisible = !_passwordVisible;
});
diff --git a/flutter/lib/models/ab_model.dart b/flutter/lib/models/ab_model.dart
index ab5a7cb80..175c8424b 100644
--- a/flutter/lib/models/ab_model.dart
+++ b/flutter/lib/models/ab_model.dart
@@ -21,16 +21,13 @@ class AbModel {
AbModel(this.parent);
- FFI? get _ffi => parent.target;
-
Future pullAb() async {
- if (_ffi!.userModel.userName.isEmpty) return;
+ if (gFFI.userModel.userName.isEmpty) return;
abLoading.value = true;
abError.value = "";
final api = "${await bind.mainGetApiServer()}/api/ab/get";
try {
- final resp =
- await http.post(Uri.parse(api), headers: await getHttpHeaders());
+ final resp = await http.post(Uri.parse(api), headers: getHttpHeaders());
if (resp.body.isNotEmpty && resp.body.toLowerCase() != "null") {
Map json = jsonDecode(resp.body);
if (json.containsKey('error')) {
@@ -63,7 +60,8 @@ class AbModel {
return null;
}
- void reset() {
+ Future reset() async {
+ await bind.mainSetLocalOption(key: "selected-tags", value: '');
tags.clear();
peers.clear();
}
@@ -103,7 +101,7 @@ class AbModel {
Future pushAb() async {
abLoading.value = true;
final api = "${await bind.mainGetApiServer()}/api/ab";
- var authHeaders = await getHttpHeaders();
+ var authHeaders = getHttpHeaders();
authHeaders['Content-Type'] = "application/json";
final peersJsonData = peers.map((e) => e.toJson()).toList();
final body = jsonEncode({
@@ -188,9 +186,4 @@ class AbModel {
await pushAb();
}
}
-
- void clear() {
- peers.clear();
- tags.clear();
- }
}
diff --git a/flutter/lib/models/file_model.dart b/flutter/lib/models/file_model.dart
index a7968f701..c08d2e623 100644
--- a/flutter/lib/models/file_model.dart
+++ b/flutter/lib/models/file_model.dart
@@ -213,7 +213,6 @@ class FileModel extends ChangeNotifier {
}
receiveFileDir(Map evt) {
- debugPrint("recv file dir:$evt");
if (evt['is_local'] == "false") {
// init remote home, the connection will automatic read remote home when established,
try {
@@ -237,7 +236,9 @@ class FileModel extends ChangeNotifier {
debugPrint("init remote home:${fd.path}");
_currentRemoteDir = fd;
}
- } finally {}
+ } catch (e) {
+ debugPrint("receiveFileDir err=$e");
+ }
}
_fileFetcher.tryCompleteTask(evt['value'], evt['is_local']);
notifyListeners();
diff --git a/flutter/lib/models/group_model.dart b/flutter/lib/models/group_model.dart
new file mode 100644
index 000000000..4d9fab0e4
--- /dev/null
+++ b/flutter/lib/models/group_model.dart
@@ -0,0 +1,140 @@
+import 'package:flutter/widgets.dart';
+import 'package:flutter_hbb/common.dart';
+import 'package:flutter_hbb/common/widgets/peer_tab_page.dart';
+import 'package:flutter_hbb/common/hbbs/hbbs.dart';
+import 'package:flutter_hbb/models/model.dart';
+import 'package:flutter_hbb/models/peer_model.dart';
+import 'package:flutter_hbb/models/platform_model.dart';
+import 'package:get/get.dart';
+import 'dart:convert';
+import 'package:http/http.dart' as http;
+
+class GroupModel {
+ final RxBool userLoading = false.obs;
+ final RxString userLoadError = "".obs;
+ final RxBool peerLoading = false.obs; //to-do: not used
+ final RxString peerLoadError = "".obs;
+ final RxList users = RxList.empty(growable: true);
+ final RxList peerPayloads = RxList.empty(growable: true);
+ final RxList peersShow = RxList.empty(growable: true);
+ WeakReference parent;
+
+ GroupModel(this.parent);
+
+ Future reset() async {
+ userLoading.value = false;
+ userLoadError.value = "";
+ peerLoading.value = false;
+ peerLoadError.value = "";
+ users.clear();
+ peerPayloads.clear();
+ peersShow.clear();
+ }
+
+ Future pull() async {
+ await reset();
+ if (gFFI.userModel.userName.isEmpty ||
+ (gFFI.userModel.isAdmin.isFalse && gFFI.userModel.groupName.isEmpty)) {
+ statePeerTab.check();
+ return;
+ }
+ userLoading.value = true;
+ userLoadError.value = "";
+ final api = "${await bind.mainGetApiServer()}/api/users";
+ try {
+ var uri0 = Uri.parse(api);
+ final pageSize = 20;
+ var total = 0;
+ int current = 0;
+ do {
+ current += 1;
+ var uri = Uri(
+ scheme: uri0.scheme,
+ host: uri0.host,
+ path: uri0.path,
+ port: uri0.port,
+ queryParameters: {
+ 'current': current.toString(),
+ 'pageSize': pageSize.toString(),
+ if (gFFI.userModel.isAdmin.isFalse)
+ 'grp': gFFI.userModel.groupName.value,
+ });
+ final resp = await http.get(uri, headers: getHttpHeaders());
+ if (resp.body.isNotEmpty && resp.body.toLowerCase() != "null") {
+ Map json = jsonDecode(resp.body);
+ if (json.containsKey('error')) {
+ throw json['error'];
+ } else {
+ if (total == 0) total = json['total'];
+ if (json.containsKey('data')) {
+ final data = json['data'];
+ if (data is List) {
+ for (final user in data) {
+ users.add(UserPayload.fromJson(user));
+ }
+ }
+ }
+ }
+ }
+ } while (current * pageSize < total);
+ } catch (err) {
+ debugPrint('$err');
+ userLoadError.value = err.toString();
+ } finally {
+ userLoading.value = false;
+ statePeerTab.check();
+ }
+ }
+
+ Future pullUserPeers(String username) async {
+ peerPayloads.clear();
+ peersShow.clear();
+ peerLoading.value = true;
+ peerLoadError.value = "";
+ final api = "${await bind.mainGetApiServer()}/api/peers";
+ try {
+ var uri0 = Uri.parse(api);
+ final pageSize = 20;
+ var total = 0;
+ int current = 0;
+ do {
+ current += 1;
+ var uri = Uri(
+ scheme: uri0.scheme,
+ host: uri0.host,
+ path: uri0.path,
+ port: uri0.port,
+ queryParameters: {
+ 'current': current.toString(),
+ 'pageSize': pageSize.toString(),
+ 'grp': gFFI.userModel.groupName.value,
+ 'target_user': username
+ });
+ final resp = await http.get(uri, headers: getHttpHeaders());
+ if (resp.body.isNotEmpty && resp.body.toLowerCase() != "null") {
+ Map json = jsonDecode(resp.body);
+ if (json.containsKey('error')) {
+ throw json['error'];
+ } else {
+ if (total == 0) total = json['total'];
+ if (json.containsKey('data')) {
+ final data = json['data'];
+ if (data is List) {
+ for (final p in data) {
+ final peer = PeerPayload.fromJson(p);
+ peerPayloads.add(peer);
+ peersShow.add(PeerPayload.toPeer(peer));
+ }
+ }
+ }
+ }
+ }
+ } while (current * pageSize < total);
+ } catch (err) {
+ debugPrint('$err');
+ peerLoadError.value = err.toString();
+ } finally {
+ peerLoading.value = false;
+ }
+ }
+}
diff --git a/flutter/lib/models/input_model.dart b/flutter/lib/models/input_model.dart
index bd1131c7a..0137b784e 100644
--- a/flutter/lib/models/input_model.dart
+++ b/flutter/lib/models/input_model.dart
@@ -17,6 +17,10 @@ import './state_model.dart';
/// Mouse button enum.
enum MouseButtons { left, right, wheel }
+const _kMouseEventDown = 'mousedown';
+const _kMouseEventUp = 'mouseup';
+const _kMouseEventMove = 'mousemove';
+
extension ToString on MouseButtons {
String get value {
switch (this) {
@@ -46,7 +50,7 @@ class InputModel {
// mouse
final isPhysicalMouse = false.obs;
- int _lastMouseDownButtons = 0;
+ int _lastButtons = 0;
Offset lastMousePos = Offset.zero;
get id => parent.target?.id ?? "";
@@ -54,7 +58,7 @@ class InputModel {
InputModel(this.parent);
KeyEventResult handleRawKeyEvent(FocusNode data, RawKeyEvent e) {
- bind.sessionGetKeyboardName(id: id).then((result) {
+ bind.sessionGetKeyboardMode(id: id).then((result) {
keyboardMode = result.toString();
});
@@ -183,20 +187,42 @@ class InputModel {
Map getEvent(PointerEvent evt, String type) {
final Map out = {};
- out['type'] = type;
out['x'] = evt.position.dx;
out['y'] = evt.position.dy;
if (alt) out['alt'] = 'true';
if (shift) out['shift'] = 'true';
if (ctrl) out['ctrl'] = 'true';
if (command) out['command'] = 'true';
- out['buttons'] = evt
- .buttons; // left button: 1, right button: 2, middle button: 4, 1 | 2 = 3 (left + right)
- if (evt.buttons != 0) {
- _lastMouseDownButtons = evt.buttons;
+
+ // Check update event type and set buttons to be sent.
+ int buttons = _lastButtons;
+ if (type == _kMouseEventMove) {
+ // flutter may emit move event if one button is pressed and anoter button
+ // is pressing or releasing.
+ if (evt.buttons != _lastButtons) {
+ // For simplicity
+ // Just consider 3 - 1 ((Left + Right buttons) - Left button)
+ // Do not consider 2 - 1 (Right button - Left button)
+ // or 6 - 5 ((Right + Mid buttons) - (Left + Mid buttons))
+ // and so on
+ buttons = evt.buttons - _lastButtons;
+ if (buttons > 0) {
+ type = _kMouseEventDown;
+ } else {
+ type = _kMouseEventUp;
+ buttons = -buttons;
+ }
+ }
} else {
- out['buttons'] = _lastMouseDownButtons;
+ if (evt.buttons != 0) {
+ buttons = evt.buttons;
+ }
}
+ _lastButtons = evt.buttons;
+
+ out['buttons'] = buttons;
+ out['type'] = type;
+
return out;
}
@@ -260,7 +286,7 @@ class InputModel {
isPhysicalMouse.value = true;
}
if (isPhysicalMouse.value) {
- handleMouse(getEvent(e, 'mousemove'));
+ handleMouse(getEvent(e, _kMouseEventMove));
}
}
@@ -325,21 +351,21 @@ class InputModel {
}
}
if (isPhysicalMouse.value) {
- handleMouse(getEvent(e, 'mousedown'));
+ handleMouse(getEvent(e, _kMouseEventDown));
}
}
void onPointUpImage(PointerUpEvent e) {
if (e.kind != ui.PointerDeviceKind.mouse) return;
if (isPhysicalMouse.value) {
- handleMouse(getEvent(e, 'mouseup'));
+ handleMouse(getEvent(e, _kMouseEventUp));
}
}
void onPointMoveImage(PointerMoveEvent e) {
if (e.kind != ui.PointerDeviceKind.mouse) return;
if (isPhysicalMouse.value) {
- handleMouse(getEvent(e, 'mousemove'));
+ handleMouse(getEvent(e, _kMouseEventMove));
}
}
@@ -388,13 +414,13 @@ class InputModel {
var type = '';
var isMove = false;
switch (evt['type']) {
- case 'mousedown':
+ case _kMouseEventDown:
type = 'down';
break;
- case 'mouseup':
+ case _kMouseEventUp:
type = 'up';
break;
- case 'mousemove':
+ case _kMouseEventMove:
isMove = true;
break;
default:
@@ -440,15 +466,21 @@ class InputModel {
evt['y'] = '${y.round()}';
var buttons = '';
switch (evt['buttons']) {
- case 1:
+ case kPrimaryMouseButton:
buttons = 'left';
break;
- case 2:
+ case kSecondaryMouseButton:
buttons = 'right';
break;
- case 4:
+ case kMiddleMouseButton:
buttons = 'wheel';
break;
+ case kBackMouseButton:
+ buttons = 'back';
+ break;
+ case kForwardMouseButton:
+ buttons = 'forward';
+ break;
}
evt['buttons'] = buttons;
bind.sessionSendMouse(id: id, msg: json.encode(evt));
diff --git a/flutter/lib/models/model.dart b/flutter/lib/models/model.dart
index 805bcde33..1cdecbd03 100644
--- a/flutter/lib/models/model.dart
+++ b/flutter/lib/models/model.dart
@@ -12,6 +12,7 @@ import 'package:flutter_hbb/generated_bridge.dart';
import 'package:flutter_hbb/models/ab_model.dart';
import 'package:flutter_hbb/models/chat_model.dart';
import 'package:flutter_hbb/models/file_model.dart';
+import 'package:flutter_hbb/models/group_model.dart';
import 'package:flutter_hbb/models/server_model.dart';
import 'package:flutter_hbb/models/user_model.dart';
import 'package:flutter_hbb/models/state_model.dart';
@@ -19,8 +20,9 @@ import 'package:flutter_hbb/common/shared_state.dart';
import 'package:flutter_hbb/utils/multi_window_manager.dart';
import 'package:tuple/tuple.dart';
import 'package:image/image.dart' as img2;
-import 'package:flutter_custom_cursor/flutter_custom_cursor.dart';
+import 'package:flutter_custom_cursor/cursor_manager.dart';
import 'package:flutter_svg/flutter_svg.dart';
+import 'package:get/get.dart';
import '../common.dart';
import '../common/shared_state.dart';
@@ -140,7 +142,7 @@ class FfiModel with ChangeNotifier {
setConnectionType(
peerId, evt['secure'] == 'true', evt['direct'] == 'true');
} else if (name == 'switch_display') {
- handleSwitchDisplay(evt);
+ handleSwitchDisplay(evt, peerId);
} else if (name == 'cursor_data') {
await parent.target?.cursorModel.updateCursorData(evt);
} else if (name == 'cursor_id') {
@@ -213,7 +215,7 @@ class FfiModel with ChangeNotifier {
}
}
- handleSwitchDisplay(Map evt) {
+ handleSwitchDisplay(Map evt, String peerId) {
final oldOrientation = _display.width > _display.height;
var old = _pi.currentDisplay;
_pi.currentDisplay = int.parse(evt['display']);
@@ -221,11 +223,17 @@ class FfiModel with ChangeNotifier {
_display.y = double.parse(evt['y']);
_display.width = int.parse(evt['width']);
_display.height = int.parse(evt['height']);
- _display.cursorEmbeded = int.parse(evt['cursor_embeded']) == 1;
+ _display.cursorEmbedded = int.parse(evt['cursor_embedded']) == 1;
if (old != _pi.currentDisplay) {
parent.target?.cursorModel.updateDisplayOrigin(_display.x, _display.y);
}
+ try {
+ CurrentDisplayState.find(peerId).value = _pi.currentDisplay;
+ } catch (e) {
+ //
+ }
+
// remote is mobile, and orientation changed
if ((_display.width > _display.height) != oldOrientation) {
gFFI.canvasModel.updateViewStyle();
@@ -331,7 +339,7 @@ class FfiModel with ChangeNotifier {
d.y = d0['y'].toDouble();
d.width = d0['width'];
d.height = d0['height'];
- d.cursorEmbeded = d0['cursor_embeded'] == 1;
+ d.cursorEmbedded = d0['cursor_embedded'] == 1;
_pi.displays.add(d);
}
if (_pi.currentDisplay < _pi.displays.length) {
@@ -380,12 +388,22 @@ class ImageModel with ChangeNotifier {
WeakReference parent;
+ final List _callbacksOnFirstImage = [];
+
ImageModel(this.parent);
+ addCallbackOnFirstImage(Function(String) cb) =>
+ _callbacksOnFirstImage.add(cb);
+
onRgba(Uint8List rgba) {
if (_waitForImage[id]!) {
_waitForImage[id] = false;
parent.target?.dialogManager.dismissAll();
+ if (isDesktop) {
+ for (final cb in _callbacksOnFirstImage) {
+ cb(id);
+ }
+ }
}
final pid = parent.target?.id;
ui.decodeImageFromPixels(
@@ -495,7 +513,7 @@ class ViewStyle {
double get scale {
double s = 1.0;
- if (style == 'adaptive') {
+ if (style == kRemoteViewStyleAdaptive) {
final s1 = width / displayWidth;
final s2 = height / displayHeight;
s = s1 < s2 ? s1 : s2;
@@ -511,6 +529,7 @@ class CanvasModel with ChangeNotifier {
double _y = 0;
// image scale
double _scale = 1.0;
+ Size _size = Size.zero;
// the tabbar over the image
// double tabBarHeight = 0.0;
// the window border's width
@@ -524,6 +543,8 @@ class CanvasModel with ChangeNotifier {
ScrollStyle _scrollStyle = ScrollStyle.scrollauto;
ViewStyle _lastViewStyle = ViewStyle();
+ final _imageOverflow = false.obs;
+
WeakReference parent;
CanvasModel(this.parent);
@@ -531,7 +552,12 @@ class CanvasModel with ChangeNotifier {
double get x => _x;
double get y => _y;
double get scale => _scale;
+ Size get size => _size;
ScrollStyle get scrollStyle => _scrollStyle;
+ ViewStyle get viewStyle => _lastViewStyle;
+ RxBool get imageOverflow => _imageOverflow;
+
+ _resetScroll() => setScrollPercent(0.0, 0.0);
setScrollPercent(double x, double y) {
_scrollX = x;
@@ -542,28 +568,44 @@ class CanvasModel with ChangeNotifier {
double get scrollY => _scrollY;
updateViewStyle() async {
+ Size getSize() {
+ final size = MediaQueryData.fromWindow(ui.window).size;
+ // If minimized, w or h may be negative here.
+ double w = size.width - windowBorderWidth * 2;
+ double h = size.height - tabBarHeight - windowBorderWidth * 2;
+ return Size(w < 0 ? 0 : w, h < 0 ? 0 : h);
+ }
+
final style = await bind.sessionGetViewStyle(id: id);
if (style == null) {
return;
}
- final sizeWidth = size.width;
- final sizeHeight = size.height;
+
+ _size = getSize();
final displayWidth = getDisplayWidth();
final displayHeight = getDisplayHeight();
final viewStyle = ViewStyle(
style: style,
- width: sizeWidth,
- height: sizeHeight,
+ width: size.width,
+ height: size.height,
displayWidth: displayWidth,
displayHeight: displayHeight,
);
if (_lastViewStyle == viewStyle) {
return;
}
+ if (_lastViewStyle.style != viewStyle.style) {
+ _resetScroll();
+ }
_lastViewStyle = viewStyle;
_scale = viewStyle.scale;
- _x = (sizeWidth - displayWidth * _scale) / 2;
- _y = (sizeHeight - displayHeight * _scale) / 2;
+
+ if (kIgnoreDpi && style == kRemoteViewStyleOriginal) {
+ _scale = 1.0 / ui.window.devicePixelRatio;
+ }
+ _x = (size.width - displayWidth * _scale) / 2;
+ _y = (size.height - displayHeight * _scale) / 2;
+ _imageOverflow.value = _x < 0 || y < 0;
notifyListeners();
}
@@ -571,8 +613,7 @@ class CanvasModel with ChangeNotifier {
final style = await bind.sessionGetScrollStyle(id: id);
if (style == kRemoteScrollStyleBar) {
_scrollStyle = ScrollStyle.scrollbar;
- _scrollX = 0.0;
- _scrollY = 0.0;
+ _resetScroll();
} else {
_scrollStyle = ScrollStyle.scrollauto;
}
@@ -586,8 +627,8 @@ class CanvasModel with ChangeNotifier {
notifyListeners();
}
- bool get cursorEmbeded =>
- parent.target?.ffiModel.display.cursorEmbeded ?? false;
+ bool get cursorEmbedded =>
+ parent.target?.ffiModel.display.cursorEmbedded ?? false;
int getDisplayWidth() {
final defaultWidth = (isDesktop || isWebDesktop)
@@ -606,14 +647,6 @@ class CanvasModel with ChangeNotifier {
double get windowBorderWidth => stateGlobal.windowBorderWidth.value;
double get tabBarHeight => stateGlobal.tabBarHeight;
- Size get size {
- final size = MediaQueryData.fromWindow(ui.window).size;
- // If minimized, w or h may be negative here.
- double w = size.width - windowBorderWidth * 2;
- double h = size.height - tabBarHeight - windowBorderWidth * 2;
- return Size(w < 0 ? 0 : w, h < 0 ? 0 : h);
- }
-
moveDesktopMouse(double x, double y) {
// On mobile platforms, move the canvas with the cursor.
final dw = getDisplayWidth() * _scale;
@@ -1113,7 +1146,8 @@ class CursorModel with ChangeNotifier {
_clearCache() {
final keys = {...cachedKeys};
for (var k in keys) {
- customCursorController.freeCache(k);
+ debugPrint("deleting cursor with key $k");
+ CursorManager.instance.deleteCursor(k);
}
}
}
@@ -1220,6 +1254,7 @@ class FFI {
late final ChatModel chatModel; // session
late final FileModel fileModel; // session
late final AbModel abModel; // global
+ late final GroupModel groupModel; // global
late final UserModel userModel; // global
late final QualityMonitorModel qualityMonitorModel; // session
late final RecordingModel recordingModel; // recording
@@ -1233,8 +1268,9 @@ class FFI {
serverModel = ServerModel(WeakReference(this));
chatModel = ChatModel(WeakReference(this));
fileModel = FileModel(WeakReference(this));
- abModel = AbModel(WeakReference(this));
userModel = UserModel(WeakReference(this));
+ abModel = AbModel(WeakReference(this));
+ groupModel = GroupModel(WeakReference(this));
qualityMonitorModel = QualityMonitorModel(WeakReference(this));
recordingModel = RecordingModel(WeakReference(this));
inputModel = InputModel(WeakReference(this));
@@ -1318,7 +1354,7 @@ class Display {
double y = 0;
int width = 0;
int height = 0;
- bool cursorEmbeded = false;
+ bool cursorEmbedded = false;
Display() {
width = (isDesktop || isWebDesktop)
diff --git a/flutter/lib/models/user_model.dart b/flutter/lib/models/user_model.dart
index e6065743c..b0eebee53 100644
--- a/flutter/lib/models/user_model.dart
+++ b/flutter/lib/models/user_model.dart
@@ -1,7 +1,8 @@
import 'dart:async';
import 'dart:convert';
-import 'package:flutter/material.dart';
+import 'package:flutter_hbb/common/hbbs/hbbs.dart';
+import 'package:flutter_hbb/common/widgets/peer_tab_page.dart';
import 'package:get/get.dart';
import 'package:http/http.dart' as http;
@@ -10,17 +11,19 @@ import 'model.dart';
import 'platform_model.dart';
class UserModel {
- var userName = ''.obs;
+ final RxString userName = ''.obs;
+ final RxString groupName = ''.obs;
+ final RxBool isAdmin = false.obs;
WeakReference parent;
- UserModel(this.parent) {
- refreshCurrentUser();
- }
+ UserModel(this.parent);
void refreshCurrentUser() async {
- await getUserName();
final token = bind.mainGetLocalOption(key: 'access_token');
- if (token == '') return;
+ if (token == '') {
+ await _updateOtherModels();
+ return;
+ }
final url = await bind.mainGetApiServer();
final body = {
'id': await bind.mainGetMyId(),
@@ -35,96 +38,95 @@ class UserModel {
body: json.encode(body));
final status = response.statusCode;
if (status == 401 || status == 400) {
- resetToken();
+ reset();
return;
}
- await _parseResp(response.body);
+ final data = json.decode(response.body);
+ final error = data['error'];
+ if (error != null) {
+ throw error;
+ }
+
+ final user = UserPayload.fromJson(data);
+ await _parseAndUpdateUser(user);
} catch (e) {
print('Failed to refreshCurrentUser: $e');
+ } finally {
+ await _updateOtherModels();
}
}
- void resetToken() async {
+ Future reset() async {
await bind.mainSetLocalOption(key: 'access_token', value: '');
- await bind.mainSetLocalOption(key: 'user_info', value: '');
+ await gFFI.abModel.reset();
+ await gFFI.groupModel.reset();
userName.value = '';
+ groupName.value = '';
+ statePeerTab.check();
}
- Future _parseResp(String body) async {
- final data = json.decode(body);
- final error = data['error'];
- if (error != null) {
- return error!;
- }
- final token = data['access_token'];
- if (token != null) {
- await bind.mainSetLocalOption(key: 'access_token', value: token);
- }
- final info = data['user'];
- if (info != null) {
- final value = json.encode(info);
- await bind.mainSetOption(key: 'user_info', value: value);
- userName.value = info['name'];
- }
- return '';
+ Future _parseAndUpdateUser(UserPayload user) async {
+ userName.value = user.name;
+ groupName.value = user.grp;
+ isAdmin.value = user.isAdmin;
}
- Future getUserName() async {
- if (userName.isNotEmpty) {
- return userName.value;
- }
- final userInfo = bind.mainGetLocalOption(key: 'user_info');
- if (userInfo.trim().isEmpty) {
- return '';
- }
- final m = jsonDecode(userInfo);
- if (m == null) {
- userName.value = '';
- } else {
- userName.value = m['name'] ?? '';
- }
- return userName.value;
+ Future _updateOtherModels() async {
+ await gFFI.abModel.pullAb();
+ await gFFI.groupModel.pull();
}
Future logOut() async {
final tag = gFFI.dialogManager.showLoading(translate('Waiting'));
- final url = await bind.mainGetApiServer();
- final _ = await http.post(Uri.parse('$url/api/logout'),
- body: {
- 'id': await bind.mainGetMyId(),
- 'uuid': await bind.mainGetUuid(),
- },
- headers: await getHttpHeaders());
- await Future.wait([
- bind.mainSetLocalOption(key: 'access_token', value: ''),
- bind.mainSetLocalOption(key: 'user_info', value: ''),
- bind.mainSetLocalOption(key: 'selected-tags', value: ''),
- ]);
- parent.target?.abModel.clear();
- userName.value = '';
- gFFI.dialogManager.dismissByTag(tag);
- }
-
- Future> login(String userName, String pass) async {
- final url = await bind.mainGetApiServer();
try {
- final resp = await http.post(Uri.parse('$url/api/login'),
- headers: {'Content-Type': 'application/json'},
- body: jsonEncode({
- 'username': userName,
- 'password': pass,
- 'id': await bind.mainGetMyId(),
- 'uuid': await bind.mainGetUuid()
- }));
- final body = jsonDecode(resp.body);
- bind.mainSetLocalOption(
- key: 'access_token', value: body['access_token'] ?? '');
- bind.mainSetLocalOption(
- key: 'user_info', value: jsonEncode(body['user']));
- this.userName.value = body['user']?['name'] ?? '';
- return body;
- } catch (err) {
- return {'error': '$err'};
+ final url = await bind.mainGetApiServer();
+ await http
+ .post(Uri.parse('$url/api/logout'),
+ body: {
+ 'id': await bind.mainGetMyId(),
+ 'uuid': await bind.mainGetUuid(),
+ },
+ headers: getHttpHeaders())
+ .timeout(Duration(seconds: 2));
+ } catch (e) {
+ print("request /api/logout failed: err=$e");
+ } finally {
+ await reset();
+ gFFI.dialogManager.dismissByTag(tag);
}
}
+
+ /// throw [RequestException]
+ Future login(LoginRequest loginRequest) async {
+ final url = await bind.mainGetApiServer();
+ final resp = await http.post(Uri.parse('$url/api/login'),
+ headers: {'Content-Type': 'application/json'},
+ body: jsonEncode(loginRequest.toJson()));
+
+ final Map body;
+ try {
+ body = jsonDecode(resp.body);
+ } catch (e) {
+ print("jsonDecode resp body failed: ${e.toString()}");
+ rethrow;
+ }
+
+ if (resp.statusCode != 200) {
+ throw RequestException(resp.statusCode, body['error'] ?? '');
+ }
+
+ final LoginResponse loginResponse;
+ try {
+ loginResponse = LoginResponse.fromJson(body);
+ } catch (e) {
+ print("jsonDecode LoginResponse failed: ${e.toString()}");
+ rethrow;
+ }
+
+ if (loginResponse.user != null) {
+ await _parseAndUpdateUser(loginResponse.user!);
+ }
+
+ return loginResponse;
+ }
}
diff --git a/flutter/lib/utils/multi_window_manager.dart b/flutter/lib/utils/multi_window_manager.dart
index 91cb9a08a..cf6d78cd2 100644
--- a/flutter/lib/utils/multi_window_manager.dart
+++ b/flutter/lib/utils/multi_window_manager.dart
@@ -1,6 +1,7 @@
import 'dart:convert';
import 'package:desktop_multi_window/desktop_multi_window.dart';
+import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_hbb/common.dart';
@@ -34,7 +35,7 @@ class RustDeskMultiWindowManager {
static final instance = RustDeskMultiWindowManager._();
final List _activeWindows = List.empty(growable: true);
- final List _windowActiveCallbacks = List.empty(growable: true);
+ final List _windowActiveCallbacks = List.empty(growable: true);
int? _remoteDesktopWindowId;
int? _fileTransferWindowId;
int? _portForwardWindowId;
@@ -191,41 +192,41 @@ class RustDeskMultiWindowManager {
return _activeWindows;
}
- void _notifyActiveWindow() {
+ Future _notifyActiveWindow() async {
for (final callback in _windowActiveCallbacks) {
- callback.call();
+ await callback.call();
}
}
- void registerActiveWindow(int windowId) {
+ Future registerActiveWindow(int windowId) async {
if (_activeWindows.contains(windowId)) {
// ignore
} else {
_activeWindows.add(windowId);
}
- _notifyActiveWindow();
+ await _notifyActiveWindow();
}
/// Remove active window which has [`windowId`]
///
- /// [Avaliability]
+ /// [Availability]
/// This function should only be called from main window.
/// For other windows, please post a unregister(hide) event to main window handler:
/// `rustDeskWinManager.call(WindowType.Main, kWindowEventHide, {"id": windowId!});`
- void unregisterActiveWindow(int windowId) {
+ Future unregisterActiveWindow(int windowId) async {
if (!_activeWindows.contains(windowId)) {
// ignore
} else {
_activeWindows.remove(windowId);
}
- _notifyActiveWindow();
+ await _notifyActiveWindow();
}
- void registerActiveWindowListener(VoidCallback callback) {
+ void registerActiveWindowListener(AsyncCallback callback) {
_windowActiveCallbacks.add(callback);
}
- void unregisterActiveWindowListener(VoidCallback callback) {
+ void unregisterActiveWindowListener(AsyncCallback callback) {
_windowActiveCallbacks.remove(callback);
}
}
diff --git a/flutter/linux/my_application.cc b/flutter/linux/my_application.cc
index 215c6f0ee..21e25fa28 100644
--- a/flutter/linux/my_application.cc
+++ b/flutter/linux/my_application.cc
@@ -23,7 +23,15 @@ static void my_application_activate(GApplication* application) {
GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
// we have custom window frame
gtk_window_set_decorated(window, FALSE);
-
+ // try setting icon for rustdesk, which uses the system cache
+ GtkIconTheme* theme = gtk_icon_theme_get_default();
+ gint icons[4] = {256, 128, 64, 32};
+ for (int i = 0; i < 4; i++) {
+ GdkPixbuf* icon = gtk_icon_theme_load_icon(theme, "rustdesk", icons[i], GTK_ICON_LOOKUP_NO_SVG, NULL);
+ if (icon != nullptr) {
+ gtk_window_set_icon(window, icon);
+ }
+ }
// Use a header bar when running in GNOME as this is the common style used
// by applications and is the setup most users will be using (e.g. Ubuntu
// desktop).
diff --git a/flutter/macos/Runner.xcodeproj/project.pbxproj b/flutter/macos/Runner.xcodeproj/project.pbxproj
index ec4baf141..a8b5306be 100644
--- a/flutter/macos/Runner.xcodeproj/project.pbxproj
+++ b/flutter/macos/Runner.xcodeproj/project.pbxproj
@@ -26,6 +26,8 @@
33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
+ 7E4BCD762966B0EC006D24E2 /* mac-tray-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 7E4BCD742966B0EC006D24E2 /* mac-tray-light.png */; };
+ 7E4BCD772966B0EC006D24E2 /* mac-tray-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7E4BCD752966B0EC006D24E2 /* mac-tray-dark.png */; };
84010BA8292CF66600152837 /* liblibrustdesk.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 84010BA7292CF66600152837 /* liblibrustdesk.dylib */; settings = {ATTRIBUTES = (Weak, ); }; };
84010BA9292CF68300152837 /* liblibrustdesk.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 84010BA7292CF66600152837 /* liblibrustdesk.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
C5E54335B73C89F72DB1B606 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26C84465887F29AE938039CB /* Pods_Runner.framework */; };
@@ -74,6 +76,8 @@
33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; };
7436B85D94E8F7B5A9324869 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; };
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; };
+ 7E4BCD742966B0EC006D24E2 /* mac-tray-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "mac-tray-light.png"; path = "../../res/mac-tray-light.png"; sourceTree = ""; };
+ 7E4BCD752966B0EC006D24E2 /* mac-tray-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "mac-tray-dark.png"; path = "../../res/mac-tray-dark.png"; sourceTree = ""; };
84010BA7292CF66600152837 /* liblibrustdesk.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = liblibrustdesk.dylib; path = ../../target/release/liblibrustdesk.dylib; sourceTree = ""; };
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; };
C3BB669FF6190AE1B11BCAEA /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; };
@@ -127,6 +131,8 @@
33CC11242044D66E0003C045 /* Resources */ = {
isa = PBXGroup;
children = (
+ 7E4BCD752966B0EC006D24E2 /* mac-tray-dark.png */,
+ 7E4BCD742966B0EC006D24E2 /* mac-tray-light.png */,
33CC10F22044A3C60003C045 /* Assets.xcassets */,
33CC10F42044A3C60003C045 /* MainMenu.xib */,
33CC10F72044A3C60003C045 /* Info.plist */,
@@ -253,6 +259,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 7E4BCD762966B0EC006D24E2 /* mac-tray-light.png in Resources */,
+ 7E4BCD772966B0EC006D24E2 /* mac-tray-dark.png in Resources */,
33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */,
33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */,
);
@@ -378,7 +386,7 @@
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = x86_64;
+ ARCHS = "$(ARCHS_STANDARD)";
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -403,6 +411,7 @@
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ ENABLE_HARDENED_RUNTIME = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -428,8 +437,11 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
+ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
+ DEVELOPMENT_TEAM = "";
+ ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@@ -459,7 +471,7 @@
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = x86_64;
+ ARCHS = "$(ARCHS_STANDARD)";
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -513,7 +525,7 @@
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = x86_64;
+ ARCHS = "$(ARCHS_STANDARD)";
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -538,6 +550,7 @@
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ ENABLE_HARDENED_RUNTIME = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -550,6 +563,12 @@
MACOSX_DEPLOYMENT_TARGET = 10.14;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
+ OTHER_LDFLAGS = (
+ "-sectcreate",
+ __CGPreLoginApp,
+ __cgpreloginapp,
+ /dev/null,
+ );
SDKROOT = macosx;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
@@ -563,8 +582,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
+ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
+ DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@@ -590,8 +611,11 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
+ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
+ DEVELOPMENT_TEAM = "";
+ ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@@ -602,6 +626,12 @@
../../target/release,
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
+ OTHER_LDFLAGS = (
+ "-sectcreate",
+ __CGPreLoginApp,
+ __cgpreloginapp,
+ /dev/null,
+ );
PRODUCT_BUNDLE_IDENTIFIER = com.carriez.rustdesk;
PROVISIONING_PROFILE_SPECIFIER = "";
"SWIFT_OBJC_BRIDGING_HEADER[arch=*]" = Runner/bridge_generated.h;
diff --git a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
index 9a3310e01..f51492c53 100644
Binary files a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ
diff --git a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
index 1e8713fda..97555e4a2 100644
Binary files a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ
diff --git a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
index a529bd927..9ea846547 100644
Binary files a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ
diff --git a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
index 7d06c1d80..c695fd3a3 100644
Binary files a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ
diff --git a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
index 2ce172957..a99d7db5a 100644
Binary files a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ
diff --git a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
index 5c192efb8..5ad5a6bcd 100644
Binary files a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ
diff --git a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
index c9bf7b6bb..645580310 100644
Binary files a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ
diff --git a/flutter/macos/Runner/DebugProfile.entitlements b/flutter/macos/Runner/DebugProfile.entitlements
index 9f56413f3..b52c39df4 100644
--- a/flutter/macos/Runner/DebugProfile.entitlements
+++ b/flutter/macos/Runner/DebugProfile.entitlements
@@ -6,6 +6,8 @@
com.apple.security.cs.allow-jit
+ com.apple.security.device.audio-input
+
com.apple.security.network.server
diff --git a/flutter/macos/Runner/MainFlutterWindow.swift b/flutter/macos/Runner/MainFlutterWindow.swift
index 1d16763ee..540cd9ab9 100644
--- a/flutter/macos/Runner/MainFlutterWindow.swift
+++ b/flutter/macos/Runner/MainFlutterWindow.swift
@@ -49,7 +49,8 @@ class MainFlutterWindow: NSWindow {
super.awakeFromNib()
}
-// override func bitsdojo_window_configure() -> UInt {
-// return BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP
-// }
+ override public func order(_ place: NSWindow.OrderingMode, relativeTo otherWin: Int) {
+ super.order(place, relativeTo: otherWin)
+ hiddenWindowAtLaunch()
+ }
}
diff --git a/flutter/macos/Runner/Release.entitlements b/flutter/macos/Runner/Release.entitlements
index 08ba3a3fa..7f588d928 100644
--- a/flutter/macos/Runner/Release.entitlements
+++ b/flutter/macos/Runner/Release.entitlements
@@ -4,6 +4,10 @@
com.apple.security.app-sandbox
+ com.apple.security.cs.allow-jit
+
+ com.apple.security.device.audio-input
+
com.apple.security.network.client
diff --git a/flutter/macos/rustdesk.xcodeproj/project.pbxproj b/flutter/macos/rustdesk.xcodeproj/project.pbxproj
index e334f0ac5..664f88618 100644
--- a/flutter/macos/rustdesk.xcodeproj/project.pbxproj
+++ b/flutter/macos/rustdesk.xcodeproj/project.pbxproj
@@ -108,6 +108,12 @@
PRODUCT_NAME = rustdesk;
SDKROOT = macosx;
SUPPORTS_MACCATALYST = YES;
+ OTHER_LDFLAGS = (
+ "-sectcreate",
+ __CGPreLoginApp,
+ __cgpreloginapp,
+ /dev/null,
+ );
};
name = Release;
};
diff --git a/flutter/pubspec.lock b/flutter/pubspec.lock
index 625862dbf..807f932bb 100644
--- a/flutter/pubspec.lock
+++ b/flutter/pubspec.lock
@@ -105,7 +105,7 @@ packages:
name: build_runner
url: "https://pub.dartlang.org"
source: hosted
- version: "2.3.2"
+ version: "2.3.3"
build_runner_core:
dependency: transitive
description:
@@ -182,7 +182,7 @@ packages:
name: code_builder
url: "https://pub.dartlang.org"
source: hosted
- version: "4.3.0"
+ version: "4.4.0"
collection:
dependency: transitive
description:
@@ -352,7 +352,7 @@ packages:
name: file_picker
url: "https://pub.dartlang.org"
source: hosted
- version: "5.2.2"
+ version: "5.2.4"
fixnum:
dependency: transitive
description:
@@ -389,12 +389,10 @@ packages:
flutter_custom_cursor:
dependency: "direct main"
description:
- path: "."
- ref: "74b1b314142b6775c1243067a3503ac568ebc74b"
- resolved-ref: "74b1b314142b6775c1243067a3503ac568ebc74b"
- url: "https://github.com/Kingtous/rustdesk_flutter_custom_cursor"
- source: git
- version: "0.0.1"
+ name: flutter_custom_cursor
+ url: "https://pub.dartlang.org"
+ source: hosted
+ version: "0.0.2"
flutter_improved_scrolling:
dependency: "direct main"
description:
@@ -455,7 +453,7 @@ packages:
name: freezed
url: "https://pub.dartlang.org"
source: hosted
- version: "2.2.1"
+ version: "2.3.2"
freezed_annotation:
dependency: "direct main"
description:
@@ -546,7 +544,7 @@ packages:
name: image_picker_android
url: "https://pub.dartlang.org"
source: hosted
- version: "0.8.5+3"
+ version: "0.8.5+4"
image_picker_for_web:
dependency: transitive
description:
@@ -560,7 +558,7 @@ packages:
name: image_picker_ios
url: "https://pub.dartlang.org"
source: hosted
- version: "0.8.6+1"
+ version: "0.8.6+3"
image_picker_platform_interface:
dependency: transitive
description:
@@ -637,7 +635,7 @@ packages:
name: mime
url: "https://pub.dartlang.org"
source: hosted
- version: "1.0.2"
+ version: "1.0.3"
nested:
dependency: transitive
description:
@@ -826,7 +824,7 @@ packages:
name: provider
url: "https://pub.dartlang.org"
source: hosted
- version: "6.0.4"
+ version: "6.0.5"
pub_semver:
dependency: transitive
description:
@@ -1113,35 +1111,35 @@ packages:
name: video_player
url: "https://pub.dartlang.org"
source: hosted
- version: "2.4.8"
+ version: "2.4.10"
video_player_android:
dependency: transitive
description:
name: video_player_android
url: "https://pub.dartlang.org"
source: hosted
- version: "2.3.9"
+ version: "2.3.10"
video_player_avfoundation:
dependency: transitive
description:
name: video_player_avfoundation
url: "https://pub.dartlang.org"
source: hosted
- version: "2.3.7"
+ version: "2.3.8"
video_player_platform_interface:
dependency: transitive
description:
name: video_player_platform_interface
url: "https://pub.dartlang.org"
source: hosted
- version: "5.1.4"
+ version: "6.0.1"
video_player_web:
dependency: transitive
description:
name: video_player_web
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.12"
+ version: "2.0.13"
visibility_detector:
dependency: "direct main"
description:
@@ -1204,7 +1202,7 @@ packages:
name: win32
url: "https://pub.dartlang.org"
source: hosted
- version: "3.1.2"
+ version: "3.1.3"
win32_registry:
dependency: transitive
description:
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
index a8a3d7050..705f4650c 100644
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@@ -63,12 +63,9 @@ dependencies:
desktop_multi_window:
git:
url: https://github.com/Kingtous/rustdesk_desktop_multi_window
- ref: 82f9eab81cb2c7bfb938def7a1b399a6279bbc75
+ ref: 057e6eb1bc7dcbcf9dafd1384274a611e4fe7124
freezed_annotation: ^2.0.3
- flutter_custom_cursor:
- git:
- url: https://github.com/Kingtous/rustdesk_flutter_custom_cursor
- ref: 74b1b314142b6775c1243067a3503ac568ebc74b
+ flutter_custom_cursor: ^0.0.2
window_size:
git:
url: https://github.com/google/flutter-desktop-embedding.git
diff --git a/flutter/web/icons/Icon-192.png b/flutter/web/icons/Icon-192.png
index db3e76713..5d4566850 100644
Binary files a/flutter/web/icons/Icon-192.png and b/flutter/web/icons/Icon-192.png differ
diff --git a/flutter/web/icons/Icon-512.png b/flutter/web/icons/Icon-512.png
index 6910947a3..2b1abc3f2 100644
Binary files a/flutter/web/icons/Icon-512.png and b/flutter/web/icons/Icon-512.png differ
diff --git a/flutter/web/icons/Icon-maskable-192.png b/flutter/web/icons/Icon-maskable-192.png
index 36597c1bc..30147e96e 100644
Binary files a/flutter/web/icons/Icon-maskable-192.png and b/flutter/web/icons/Icon-maskable-192.png differ
diff --git a/flutter/web/icons/Icon-maskable-512.png b/flutter/web/icons/Icon-maskable-512.png
index f2f79e64b..e84ca5bc7 100644
Binary files a/flutter/web/icons/Icon-maskable-512.png and b/flutter/web/icons/Icon-maskable-512.png differ
diff --git a/flutter/web/js/gen_js_from_hbb.py b/flutter/web/js/gen_js_from_hbb.py
index 0bdde54e4..8ee553b35 100755
--- a/flutter/web/js/gen_js_from_hbb.py
+++ b/flutter/web/js/gen_js_from_hbb.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-import re
+import re
import os
import glob
from tabnanny import check
@@ -69,7 +69,7 @@ def main():
for ln in open('../../../Cargo.toml', encoding='utf-8'):
if ln.startswith('version ='):
print('export const ' + ln)
-
+
def removeComment(ln):
return re.sub('\s+\/\/.*$', '', ln)
diff --git a/flutter/web/js/src/codec.js b/flutter/web/js/src/codec.js
index dc579b5f3..27c9565ec 100644
--- a/flutter/web/js/src/codec.js
+++ b/flutter/web/js/src/codec.js
@@ -22,8 +22,8 @@
import { simd } from "wasm-feature-detect";
export async function loadVp9(callback) {
- // Multithreading is used only if `options.threading` is true.
- // This requires browser support for the new `SharedArrayBuffer` and `Atomics` APIs,
+ // Multithreading is used only if `options.threading` is true.
+ // This requires browser support for the new `SharedArrayBuffer` and `Atomics` APIs,
// currently available in Firefox and Chrome with experimental flags enabled.
// 所有主流浏览器均默认于2018年1月5日禁用SharedArrayBuffer
const isSIMD = await simd();
diff --git a/flutter/windows/runner/win32_window.cpp b/flutter/windows/runner/win32_window.cpp
index 9ada9ab2e..2ff6d686c 100644
--- a/flutter/windows/runner/win32_window.cpp
+++ b/flutter/windows/runner/win32_window.cpp
@@ -116,7 +116,7 @@ bool Win32Window::CreateAndShow(const std::wstring& title,
HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST);
UINT dpi = FlutterDesktopGetDpiForMonitor(monitor);
double scale_factor = dpi / 96.0;
-
+
HWND window = CreateWindow(
window_class, title.c_str(), WS_OVERLAPPEDWINDOW,
Scale(origin.x, scale_factor), Scale(origin.y, scale_factor),
diff --git a/libs/clipboard/docs/assets/scene3.png b/libs/clipboard/docs/assets/scene3.png
index 639236460..a65a7ac06 100644
Binary files a/libs/clipboard/docs/assets/scene3.png and b/libs/clipboard/docs/assets/scene3.png differ
diff --git a/libs/clipboard/docs/assets/win_A_B.png b/libs/clipboard/docs/assets/win_A_B.png
index 0b6b25d0e..b65e571e7 100644
Binary files a/libs/clipboard/docs/assets/win_A_B.png and b/libs/clipboard/docs/assets/win_A_B.png differ
diff --git a/libs/clipboard/docs/assets/win_B_A.png b/libs/clipboard/docs/assets/win_B_A.png
index 377fa801f..4484b21ac 100644
Binary files a/libs/clipboard/docs/assets/win_B_A.png and b/libs/clipboard/docs/assets/win_B_A.png differ
diff --git a/libs/enigo/.vscode/launch.json b/libs/enigo/.vscode/launch.json
index a7a40dcfe..123e0bc42 100644
--- a/libs/enigo/.vscode/launch.json
+++ b/libs/enigo/.vscode/launch.json
@@ -1,7 +1,7 @@
{
"version": "0.2.0",
"configurations": [
-
+
{
"name": "Debug",
"type": "gdb",
diff --git a/libs/enigo/Cargo.toml b/libs/enigo/Cargo.toml
index 83c79e064..cc4173a97 100644
--- a/libs/enigo/Cargo.toml
+++ b/libs/enigo/Cargo.toml
@@ -22,8 +22,8 @@ appveyor = { repository = "pythoneer/enigo-85xiy" }
serde = { version = "1.0", optional = true }
serde_derive = { version = "1.0", optional = true }
log = "0.4"
-rdev = { git = "https://github.com/asur4s/rdev" }
-tfc = { git = "https://github.com/asur4s/The-Fat-Controller" }
+rdev = { git = "https://github.com/fufesou/rdev" }
+tfc = { git = "https://github.com/fufesou/The-Fat-Controller" }
hbb_common = { path = "../hbb_common" }
[features]
diff --git a/libs/enigo/examples/mouse.rs b/libs/enigo/examples/mouse.rs
index 50a3506cf..f963e041e 100644
--- a/libs/enigo/examples/mouse.rs
+++ b/libs/enigo/examples/mouse.rs
@@ -23,15 +23,18 @@ fn main() {
enigo.mouse_click(MouseButton::Left);
thread::sleep(wait_time);
- enigo.mouse_scroll_x(2);
- thread::sleep(wait_time);
+ #[cfg(not(target_os = "macos"))]
+ {
+ enigo.mouse_scroll_x(2);
+ thread::sleep(wait_time);
- enigo.mouse_scroll_x(-2);
- thread::sleep(wait_time);
+ enigo.mouse_scroll_x(-2);
+ thread::sleep(wait_time);
- enigo.mouse_scroll_y(2);
- thread::sleep(wait_time);
+ enigo.mouse_scroll_y(2);
+ thread::sleep(wait_time);
- enigo.mouse_scroll_y(-2);
- thread::sleep(wait_time);
+ enigo.mouse_scroll_y(-2);
+ thread::sleep(wait_time);
+ }
}
diff --git a/libs/enigo/src/lib.rs b/libs/enigo/src/lib.rs
index 083345e63..fcc2981fd 100644
--- a/libs/enigo/src/lib.rs
+++ b/libs/enigo/src/lib.rs
@@ -21,7 +21,7 @@
//! Possible use cases could be for testing user interfaces on different
//! plattforms,
//! building remote control applications or just automating tasks for user
-//! interfaces unaccessible by a public API or scripting laguage.
+//! interfaces unaccessible by a public API or scripting language.
//!
//! For the keyboard there are currently two modes you can use. The first mode
//! is represented by the [key_sequence]() function
@@ -104,6 +104,10 @@ pub enum MouseButton {
Middle,
/// Right mouse button
Right,
+ /// Back mouse button
+ Back,
+ /// Forward mouse button
+ Forward,
/// Scroll up button
ScrollUp,
@@ -447,8 +451,9 @@ pub trait KeyboardControllable {
where
Self: Sized,
{
- self.key_sequence_parse_try(sequence)
- .expect("Could not parse sequence");
+ if let Err(..) = self.key_sequence_parse_try(sequence) {
+ println!("Could not parse sequence");
+ }
}
/// Same as key_sequence_parse except returns any errors
fn key_sequence_parse_try(&mut self, sequence: &str) -> Result<(), dsl::ParseError>
diff --git a/libs/enigo/src/linux/nix_impl.rs b/libs/enigo/src/linux/nix_impl.rs
index 4eb890c29..47e6d53c0 100644
--- a/libs/enigo/src/linux/nix_impl.rs
+++ b/libs/enigo/src/linux/nix_impl.rs
@@ -88,7 +88,13 @@ impl Default for Enigo {
Self {
is_x11,
tfc: if is_x11 {
- Some(TFC_Context::new().expect("kbd context error"))
+ match TFC_Context::new() {
+ Ok(ctx) => Some(ctx),
+ Err(..) => {
+ println!("kbd context error");
+ None
+ }
+ }
} else {
None
},
diff --git a/libs/enigo/src/linux/xdo.rs b/libs/enigo/src/linux/xdo.rs
index ed2d28dc1..2115d7283 100644
--- a/libs/enigo/src/linux/xdo.rs
+++ b/libs/enigo/src/linux/xdo.rs
@@ -57,6 +57,8 @@ fn mousebutton(button: MouseButton) -> c_int {
MouseButton::ScrollDown => 5,
MouseButton::ScrollLeft => 6,
MouseButton::ScrollRight => 7,
+ MouseButton::Back => 8,
+ MouseButton::Forward => 9,
}
}
@@ -391,8 +393,9 @@ impl KeyboardControllable for EnigoXdo {
where
Self: Sized,
{
- self.key_sequence_parse_try(sequence)
- .expect("Could not parse sequence");
+ if let Err(..) = self.key_sequence_parse_try(sequence) {
+ println!("Could not parse sequence");
+ }
}
fn key_sequence_parse_try(&mut self, sequence: &str) -> Result<(), crate::dsl::ParseError>
diff --git a/libs/enigo/src/macos/macos_impl.rs b/libs/enigo/src/macos/macos_impl.rs
index 937320f7d..55f350895 100644
--- a/libs/enigo/src/macos/macos_impl.rs
+++ b/libs/enigo/src/macos/macos_impl.rs
@@ -40,6 +40,7 @@ const BUF_LEN: usize = 4;
#[allow(improper_ctypes)]
#[allow(non_snake_case)]
#[link(name = "ApplicationServices", kind = "framework")]
+#[link(name = "Carbon", kind = "framework")]
extern "C" {
fn CFDataGetBytePtr(theData: CFDataRef) -> *const u8;
fn TISCopyCurrentKeyboardInputSource() -> TISInputSourceRef;
@@ -68,7 +69,7 @@ extern "C" {
) -> Boolean;
fn CGEventPost(tapLocation: CGEventTapLocation, event: *mut MyCGEvent);
- // Actually return CFDataRef which is const here, but for coding convienence, return *mut c_void
+ // Actually return CFDataRef which is const here, but for coding convenience, return *mut c_void
fn TISGetInputSourceProperty(source: TISInputSourceRef, property: *const c_void)
-> *mut c_void;
// not present in servo/core-graphics
@@ -225,7 +226,10 @@ impl MouseControllable for Enigo {
MouseButton::Left => (CGMouseButton::Left, CGEventType::LeftMouseDown),
MouseButton::Middle => (CGMouseButton::Center, CGEventType::OtherMouseDown),
MouseButton::Right => (CGMouseButton::Right, CGEventType::RightMouseDown),
- _ => unimplemented!(),
+ _ => {
+ log::info!("Unsupported button {:?}", button);
+ return Ok(());
+ },
};
let dest = CGPoint::new(current_x as f64, current_y as f64);
if let Some(src) = self.event_source.as_ref() {
@@ -248,7 +252,10 @@ impl MouseControllable for Enigo {
MouseButton::Left => (CGMouseButton::Left, CGEventType::LeftMouseUp),
MouseButton::Middle => (CGMouseButton::Center, CGEventType::OtherMouseUp),
MouseButton::Right => (CGMouseButton::Right, CGEventType::RightMouseUp),
- _ => unimplemented!(),
+ _ => {
+ log::info!("Unsupported button {:?}", button);
+ return;
+ },
};
let dest = CGPoint::new(current_x as f64, current_y as f64);
if let Some(src) = self.event_source.as_ref() {
diff --git a/libs/enigo/src/win/win_impl.rs b/libs/enigo/src/win/win_impl.rs
index 4a4fd7fc4..2e1108b9e 100644
--- a/libs/enigo/src/win/win_impl.rs
+++ b/libs/enigo/src/win/win_impl.rs
@@ -56,6 +56,20 @@ fn keybd_event(flags: u32, vk: u16, scan: u16) -> DWORD {
input.type_ = INPUT_KEYBOARD;
unsafe {
let dst_ptr = (&mut input.u as *mut _) as *mut u8;
+ let flags = match vk as _ {
+ winapi::um::winuser::VK_HOME |
+ winapi::um::winuser::VK_UP |
+ winapi::um::winuser::VK_PRIOR |
+ winapi::um::winuser::VK_LEFT |
+ winapi::um::winuser::VK_RIGHT |
+ winapi::um::winuser::VK_END |
+ winapi::um::winuser::VK_DOWN |
+ winapi::um::winuser::VK_NEXT |
+ winapi::um::winuser::VK_INSERT |
+ winapi::um::winuser::VK_DELETE => flags | winapi::um::winuser::KEYEVENTF_EXTENDEDKEY,
+ _ => flags,
+ };
+
let k = KEYBDINPUT {
wVk: vk,
wScan: scan,
@@ -134,9 +148,18 @@ impl MouseControllable for Enigo {
MouseButton::Left => MOUSEEVENTF_LEFTDOWN,
MouseButton::Middle => MOUSEEVENTF_MIDDLEDOWN,
MouseButton::Right => MOUSEEVENTF_RIGHTDOWN,
- _ => unimplemented!(),
+ MouseButton::Back => MOUSEEVENTF_XDOWN,
+ MouseButton::Forward => MOUSEEVENTF_XDOWN,
+ _ => {
+ log::info!("Unsupported button {:?}", button);
+ return Ok(());
+ }
+ },
+ match button {
+ MouseButton::Back => XBUTTON1 as _,
+ MouseButton::Forward => XBUTTON2 as _,
+ _ => 0,
},
- 0,
0,
0,
);
@@ -155,9 +178,18 @@ impl MouseControllable for Enigo {
MouseButton::Left => MOUSEEVENTF_LEFTUP,
MouseButton::Middle => MOUSEEVENTF_MIDDLEUP,
MouseButton::Right => MOUSEEVENTF_RIGHTUP,
- _ => unimplemented!(),
+ MouseButton::Back => MOUSEEVENTF_XUP,
+ MouseButton::Forward => MOUSEEVENTF_XUP,
+ _ => {
+ log::info!("Unsupported button {:?}", button);
+ return;
+ }
+ },
+ match button {
+ MouseButton::Back => XBUTTON1 as _,
+ MouseButton::Forward => XBUTTON2 as _,
+ _ => 0,
},
- 0,
0,
0,
);
diff --git a/libs/hbb_common/protos/message.proto b/libs/hbb_common/protos/message.proto
index 9217388aa..650e42104 100644
--- a/libs/hbb_common/protos/message.proto
+++ b/libs/hbb_common/protos/message.proto
@@ -40,7 +40,7 @@ message DisplayInfo {
int32 height = 4;
string name = 5;
bool online = 6;
- bool cursor_embeded = 7;
+ bool cursor_embedded = 7;
}
message PortForward {
@@ -420,7 +420,7 @@ message SwitchDisplay {
sint32 y = 3;
int32 width = 4;
int32 height = 5;
- bool cursor_embeded = 6;
+ bool cursor_embedded = 6;
}
message PermissionInfo {
diff --git a/libs/hbb_common/src/config.rs b/libs/hbb_common/src/config.rs
index 328a1ea59..1d427a2e9 100644
--- a/libs/hbb_common/src/config.rs
+++ b/libs/hbb_common/src/config.rs
@@ -1,7 +1,7 @@
use std::{
collections::HashMap,
fs,
- net::{IpAddr, Ipv4Addr, SocketAddr},
+ net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
path::{Path, PathBuf},
sync::{Arc, Mutex, RwLock},
time::SystemTime,
@@ -203,6 +203,8 @@ pub struct PeerConfig {
pub enable_file_transfer: bool,
#[serde(default)]
pub show_quality_monitor: bool,
+ #[serde(default)]
+ pub keyboard_mode: String,
// The other scalar value must before this
#[serde(default, deserialize_with = "PeerConfig::deserialize_options")]
@@ -509,8 +511,12 @@ impl Config {
}
#[inline]
- pub fn get_any_listen_addr() -> SocketAddr {
- SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 0)
+ pub fn get_any_listen_addr(is_ipv4: bool) -> SocketAddr {
+ if is_ipv4 {
+ SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), 0)
+ } else {
+ SocketAddr::new(IpAddr::V6(Ipv6Addr::UNSPECIFIED), 0)
+ }
}
pub fn get_rendezvous_server() -> String {
@@ -991,6 +997,8 @@ pub struct LocalConfig {
#[serde(default)]
remote_id: String, // latest used one
#[serde(default)]
+ kb_layout_type: String,
+ #[serde(default)]
size: Size,
#[serde(default)]
pub fav: Vec,
@@ -1010,6 +1018,16 @@ impl LocalConfig {
Config::store_(self, "_local");
}
+ pub fn get_kb_layout_type() -> String {
+ LOCAL_CONFIG.read().unwrap().kb_layout_type.clone()
+ }
+
+ pub fn set_kb_layout_type(kb_layout_type: String) {
+ let mut config = LOCAL_CONFIG.write().unwrap();
+ config.kb_layout_type = kb_layout_type;
+ config.store();
+ }
+
pub fn get_size() -> Size {
LOCAL_CONFIG.read().unwrap().size
}
diff --git a/libs/hbb_common/src/fs.rs b/libs/hbb_common/src/fs.rs
index e08414324..fec8b8670 100644
--- a/libs/hbb_common/src/fs.rs
+++ b/libs/hbb_common/src/fs.rs
@@ -578,7 +578,7 @@ impl TransferJob {
///
/// [`Note`]
/// Conditions:
- /// 1. Files are not waiting for comfirmation by peers.
+ /// 1. Files are not waiting for confirmation by peers.
#[inline]
pub fn job_completed(&self) -> bool {
// has no error, Condition 2
diff --git a/libs/hbb_common/src/lib.rs b/libs/hbb_common/src/lib.rs
index ae564685f..85e0100d9 100644
--- a/libs/hbb_common/src/lib.rs
+++ b/libs/hbb_common/src/lib.rs
@@ -10,7 +10,7 @@ pub use protos::rendezvous as rendezvous_proto;
use std::{
fs::File,
io::{self, BufRead},
- net::{Ipv4Addr, SocketAddr, SocketAddrV4},
+ net::{IpAddr, Ipv4Addr, SocketAddr, SocketAddrV4},
path::Path,
time::{self, SystemTime, UNIX_EPOCH},
};
@@ -66,6 +66,21 @@ macro_rules! allow_err {
} else {
}
};
+
+ ($e:expr, $($arg:tt)*) => {
+ if let Err(err) = $e {
+ log::debug!(
+ "{:?}, {}, {}:{}:{}:{}",
+ err,
+ format_args!($($arg)*),
+ module_path!(),
+ file!(),
+ line!(),
+ column!()
+ );
+ } else {
+ }
+ };
}
#[inline]
@@ -102,13 +117,31 @@ impl AddrMangle {
}
bytes[..(16 - n_padding)].to_vec()
}
- _ => {
- panic!("Only support ipv4");
+ SocketAddr::V6(addr_v6) => {
+ let mut x = addr_v6.ip().octets().to_vec();
+ let port: [u8; 2] = addr_v6.port().to_le_bytes();
+ x.push(port[0]);
+ x.push(port[1]);
+ x
}
}
}
pub fn decode(bytes: &[u8]) -> SocketAddr {
+ if bytes.len() > 16 {
+ if bytes.len() != 18 {
+ return Config::get_any_listen_addr(false);
+ }
+ #[allow(invalid_value)]
+ let mut tmp: [u8; 2] = unsafe { std::mem::MaybeUninit::uninit().assume_init() };
+ tmp.copy_from_slice(&bytes[16..]);
+ let port = u16::from_le_bytes(tmp);
+ #[allow(invalid_value)]
+ let mut tmp: [u8; 16] = unsafe { std::mem::MaybeUninit::uninit().assume_init() };
+ tmp.copy_from_slice(&bytes[..16]);
+ let ip = std::net::Ipv6Addr::from(tmp);
+ return SocketAddr::new(IpAddr::V6(ip), port);
+ }
let mut padded = [0u8; 16];
padded[..bytes.len()].copy_from_slice(&bytes);
let number = u128::from_le_bytes(padded);
@@ -249,5 +282,61 @@ mod tests {
fn test_mangle() {
let addr = SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::new(192, 168, 16, 32), 21116));
assert_eq!(addr, AddrMangle::decode(&AddrMangle::encode(addr)));
+
+ let addr = "[2001:db8::1]:8080".parse::().unwrap();
+ assert_eq!(addr, AddrMangle::decode(&AddrMangle::encode(addr)));
+
+ let addr = "[2001:db8:ff::1111]:80".parse::().unwrap();
+ assert_eq!(addr, AddrMangle::decode(&AddrMangle::encode(addr)));
+ }
+
+ #[test]
+ fn test_allow_err() {
+ allow_err!(Err("test err") as Result<(), &str>);
+ allow_err!(
+ Err("test err with msg") as Result<(), &str>,
+ "prompt {}",
+ "failed"
+ );
+ }
+}
+
+#[inline]
+pub fn is_ipv4_str(id: &str) -> bool {
+ regex::Regex::new(r"^\d+\.\d+\.\d+\.\d+(:\d+)?$")
+ .unwrap()
+ .is_match(id)
+}
+
+#[inline]
+pub fn is_ipv6_str(id: &str) -> bool {
+ regex::Regex::new(r"^((([a-fA-F0-9]{1,4}:{1,2})+[a-fA-F0-9]{1,4})|(\[([a-fA-F0-9]{1,4}:{1,2})+[a-fA-F0-9]{1,4}\]:\d+))$")
+ .unwrap()
+ .is_match(id)
+}
+
+#[inline]
+pub fn is_ip_str(id: &str) -> bool {
+ is_ipv4_str(id) || is_ipv6_str(id)
+}
+
+#[cfg(test)]
+mod test_lib {
+ use super::*;
+
+ #[test]
+ fn test_ipv6() {
+ assert_eq!(is_ipv6_str("1:2:3"), true);
+ assert_eq!(is_ipv6_str("[ab:2:3]:12"), true);
+ assert_eq!(is_ipv6_str("[ABEF:2a:3]:12"), true);
+ assert_eq!(is_ipv6_str("[ABEG:2a:3]:12"), false);
+ assert_eq!(is_ipv6_str("1[ab:2:3]:12"), false);
+ assert_eq!(is_ipv6_str("1.1.1.1"), false);
+ assert_eq!(is_ip_str("1.1.1.1"), true);
+ assert_eq!(is_ipv6_str("1:2:"), false);
+ assert_eq!(is_ipv6_str("1:2::0"), true);
+ assert_eq!(is_ipv6_str("[1:2::0]:1"), true);
+ assert_eq!(is_ipv6_str("[1:2::0]:"), false);
+ assert_eq!(is_ipv6_str("1:2::0]:1"), false);
}
}
diff --git a/libs/hbb_common/src/socket_client.rs b/libs/hbb_common/src/socket_client.rs
index 72ab73f16..6f62163d1 100644
--- a/libs/hbb_common/src/socket_client.rs
+++ b/libs/hbb_common/src/socket_client.rs
@@ -9,31 +9,52 @@ use std::net::SocketAddr;
use tokio::net::ToSocketAddrs;
use tokio_socks::{IntoTargetAddr, TargetAddr};
-fn to_socket_addr(host: &str) -> ResultType {
- use std::net::ToSocketAddrs;
- host.to_socket_addrs()?
- .filter(|x| x.is_ipv4())
- .next()
- .context("Failed to solve")
+#[inline]
+pub fn check_port(host: T, port: i32) -> String {
+ let host = host.to_string();
+ if crate::is_ipv6_str(&host) {
+ if host.starts_with("[") {
+ return host;
+ }
+ return format!("[{}]:{}", host, port);
+ }
+ if !host.contains(":") {
+ return format!("{}:{}", host, port);
+ }
+ return host;
}
-pub fn get_target_addr(host: &str) -> ResultType> {
- let addr = match Config::get_network_type() {
- NetworkType::Direct => to_socket_addr(&host)?.into_target_addr()?,
- NetworkType::ProxySocks => host.into_target_addr()?,
+#[inline]
+pub fn increase_port(host: T, offset: i32) -> String {
+ let host = host.to_string();
+ if crate::is_ipv6_str(&host) {
+ if host.starts_with("[") {
+ let tmp: Vec<&str> = host.split("]:").collect();
+ if tmp.len() == 2 {
+ let port: i32 = tmp[1].parse().unwrap_or(0);
+ if port > 0 {
+ return format!("{}]:{}", tmp[0], port + offset);
+ }
+ }
+ }
+ } else if host.contains(":") {
+ let tmp: Vec<&str> = host.split(":").collect();
+ if tmp.len() == 2 {
+ let port: i32 = tmp[1].parse().unwrap_or(0);
+ if port > 0 {
+ return format!("{}:{}", tmp[0], port + offset);
+ }
+ }
}
- .to_owned();
- Ok(addr)
+ return host;
}
pub fn test_if_valid_server(host: &str) -> String {
- let mut host = host.to_owned();
- if !host.contains(":") {
- host = format!("{}:{}", host, 0);
- }
+ let host = check_port(host, 0);
+ use std::net::ToSocketAddrs;
match Config::get_network_type() {
- NetworkType::Direct => match to_socket_addr(&host) {
+ NetworkType::Direct => match host.to_socket_addrs() {
Err(err) => err.to_string(),
Ok(_) => "".to_owned(),
},
@@ -44,33 +65,126 @@ pub fn test_if_valid_server(host: &str) -> String {
}
}
-pub async fn connect_tcp<'t, T: IntoTargetAddr<'t>>(
+pub trait IsResolvedSocketAddr {
+ fn resolve(&self) -> Option<&SocketAddr>;
+}
+
+impl IsResolvedSocketAddr for SocketAddr {
+ fn resolve(&self) -> Option<&SocketAddr> {
+ Some(&self)
+ }
+}
+
+impl IsResolvedSocketAddr for String {
+ fn resolve(&self) -> Option<&SocketAddr> {
+ None
+ }
+}
+
+impl IsResolvedSocketAddr for &str {
+ fn resolve(&self) -> Option<&SocketAddr> {
+ None
+ }
+}
+
+#[inline]
+pub async fn connect_tcp<
+ 't,
+ T: IntoTargetAddr<'t> + ToSocketAddrs + IsResolvedSocketAddr + std::fmt::Display,
+>(
target: T,
- local: SocketAddr,
ms_timeout: u64,
) -> ResultType {
- let target_addr = target.into_target_addr()?;
+ connect_tcp_local(target, None, ms_timeout).await
+}
+pub async fn connect_tcp_local<
+ 't,
+ T: IntoTargetAddr<'t> + ToSocketAddrs + IsResolvedSocketAddr + std::fmt::Display,
+>(
+ target: T,
+ local: Option,
+ ms_timeout: u64,
+) -> ResultType {
if let Some(conf) = Config::get_socks() {
- FramedStream::connect(
+ return FramedStream::connect(
conf.proxy.as_str(),
- target_addr,
+ target,
local,
conf.username.as_str(),
conf.password.as_str(),
ms_timeout,
)
- .await
- } else {
- let addr = std::net::ToSocketAddrs::to_socket_addrs(&target_addr)?
- .filter(|x| x.is_ipv4())
- .next()
- .context("Invalid target addr, no valid ipv4 address can be resolved.")?;
- Ok(FramedStream::new(addr, local, ms_timeout).await?)
+ .await;
+ }
+ if let Some(target) = target.resolve() {
+ if let Some(local) = local {
+ if local.is_ipv6() && target.is_ipv4() {
+ let target = query_nip_io(&target).await?;
+ return Ok(FramedStream::new(target, Some(local), ms_timeout).await?);
+ }
+ }
+ }
+ Ok(FramedStream::new(target, local, ms_timeout).await?)
+}
+
+#[inline]
+pub fn is_ipv4(target: &TargetAddr<'_>) -> bool {
+ match target {
+ TargetAddr::Ip(addr) => addr.is_ipv4(),
+ _ => true,
}
}
-pub async fn new_udp(local: T, ms_timeout: u64) -> ResultType {
+#[inline]
+pub async fn query_nip_io(addr: &SocketAddr) -> ResultType {
+ tokio::net::lookup_host(format!("{}.nip.io:{}", addr.ip(), addr.port()))
+ .await?
+ .filter(|x| x.is_ipv6())
+ .next()
+ .context("Failed to get ipv6 from nip.io")
+}
+
+#[inline]
+pub fn ipv4_to_ipv6(addr: String, ipv4: bool) -> String {
+ if !ipv4 && crate::is_ipv4_str(&addr) {
+ if let Some(ip) = addr.split(":").next() {
+ return addr.replace(ip, &format!("{}.nip.io", ip));
+ }
+ }
+ addr
+}
+
+async fn test_target(target: &str) -> ResultType {
+ if let Ok(Ok(s)) = super::timeout(1000, tokio::net::TcpStream::connect(target)).await {
+ if let Ok(addr) = s.peer_addr() {
+ return Ok(addr);
+ }
+ }
+ tokio::net::lookup_host(target)
+ .await?
+ .next()
+ .context(format!("Failed to look up host for {}", target))
+}
+
+#[inline]
+pub async fn new_udp_for(
+ target: &str,
+ ms_timeout: u64,
+) -> ResultType<(FramedSocket, TargetAddr<'static>)> {
+ let (ipv4, target) = if NetworkType::Direct == Config::get_network_type() {
+ let addr = test_target(target).await?;
+ (addr.is_ipv4(), addr.into_target_addr()?)
+ } else {
+ (true, target.into_target_addr()?)
+ };
+ Ok((
+ new_udp(Config::get_any_listen_addr(ipv4), ms_timeout).await?,
+ target.to_owned(),
+ ))
+}
+
+async fn new_udp(local: T, ms_timeout: u64) -> ResultType {
match Config::get_socks() {
None => Ok(FramedSocket::new(local).await?),
Some(conf) => {
@@ -87,9 +201,82 @@ pub async fn new_udp(local: T, ms_timeout: u64) -> ResultType<
}
}
-pub async fn rebind_udp(local: T) -> ResultType> {
- match Config::get_network_type() {
- NetworkType::Direct => Ok(Some(FramedSocket::new(local).await?)),
- _ => Ok(None),
+pub async fn rebind_udp_for(
+ target: &str,
+) -> ResultType)>> {
+ if Config::get_network_type() != NetworkType::Direct {
+ return Ok(None);
+ }
+ let addr = test_target(target).await?;
+ let v4 = addr.is_ipv4();
+ Ok(Some((
+ FramedSocket::new(Config::get_any_listen_addr(v4)).await?,
+ addr.into_target_addr()?.to_owned(),
+ )))
+}
+
+#[cfg(test)]
+mod tests {
+ use std::net::ToSocketAddrs;
+
+ use super::*;
+
+ #[test]
+ fn test_nat64() {
+ test_nat64_async();
+ }
+
+ #[tokio::main(flavor = "current_thread")]
+ async fn test_nat64_async() {
+ assert_eq!(ipv4_to_ipv6("1.1.1.1".to_owned(), true), "1.1.1.1");
+ assert_eq!(ipv4_to_ipv6("1.1.1.1".to_owned(), false), "1.1.1.1.nip.io");
+ assert_eq!(
+ ipv4_to_ipv6("1.1.1.1:8080".to_owned(), false),
+ "1.1.1.1.nip.io:8080"
+ );
+ assert_eq!(
+ ipv4_to_ipv6("rustdesk.com".to_owned(), false),
+ "rustdesk.com"
+ );
+ if ("rustdesk.com:80")
+ .to_socket_addrs()
+ .unwrap()
+ .next()
+ .unwrap()
+ .is_ipv6()
+ {
+ assert!(query_nip_io(&"1.1.1.1:80".parse().unwrap())
+ .await
+ .unwrap()
+ .is_ipv6());
+ return;
+ }
+ assert!(query_nip_io(&"1.1.1.1:80".parse().unwrap()).await.is_err());
+ }
+
+ #[test]
+ fn test_test_if_valid_server() {
+ assert!(!test_if_valid_server("a").is_empty());
+ // on Linux, "1" is resolved to "0.0.0.1"
+ assert!(test_if_valid_server("1.1.1.1").is_empty());
+ assert!(test_if_valid_server("1.1.1.1:1").is_empty());
+ }
+
+ #[test]
+ fn test_check_port() {
+ assert_eq!(check_port("[1:2]:12", 32), "[1:2]:12");
+ assert_eq!(check_port("1:2", 32), "[1:2]:32");
+ assert_eq!(check_port("z1:2", 32), "z1:2");
+ assert_eq!(check_port("1.1.1.1", 32), "1.1.1.1:32");
+ assert_eq!(check_port("1.1.1.1:32", 32), "1.1.1.1:32");
+ assert_eq!(check_port("test.com:32", 0), "test.com:32");
+ assert_eq!(increase_port("[1:2]:12", 1), "[1:2]:13");
+ assert_eq!(increase_port("1.2.2.4:12", 1), "1.2.2.4:13");
+ assert_eq!(increase_port("1.2.2.4", 1), "1.2.2.4");
+ assert_eq!(increase_port("test.com", 1), "test.com");
+ assert_eq!(increase_port("test.com:13", 4), "test.com:17");
+ assert_eq!(increase_port("1:13", 4), "1:13");
+ assert_eq!(increase_port("22:1:13", 4), "22:1:13");
+ assert_eq!(increase_port("z1:2", 1), "z1:3");
}
}
diff --git a/libs/hbb_common/src/tcp.rs b/libs/hbb_common/src/tcp.rs
index 7966920c2..a1322fc15 100644
--- a/libs/hbb_common/src/tcp.rs
+++ b/libs/hbb_common/src/tcp.rs
@@ -5,7 +5,7 @@ use protobuf::Message;
use sodiumoxide::crypto::secretbox::{self, Key, Nonce};
use std::{
io::{self, Error, ErrorKind},
- net::SocketAddr,
+ net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
ops::{Deref, DerefMut},
pin::Pin,
task::{Context, Poll},
@@ -73,73 +73,79 @@ fn new_socket(addr: std::net::SocketAddr, reuse: bool) -> Result(
- remote_addr: T1,
- local_addr: T2,
+ pub async fn new(
+ remote_addr: T,
+ local_addr: Option,
ms_timeout: u64,
) -> ResultType {
- for local_addr in lookup_host(&local_addr).await? {
- for remote_addr in lookup_host(&remote_addr).await? {
- let stream = super::timeout(
- ms_timeout,
- new_socket(local_addr, true)?.connect(remote_addr),
- )
- .await??;
- stream.set_nodelay(true).ok();
- let addr = stream.local_addr()?;
- return Ok(Self(
- Framed::new(DynTcpStream(Box::new(stream)), BytesCodec::new()),
- addr,
- None,
- 0,
- ));
+ for remote_addr in lookup_host(&remote_addr).await? {
+ let local = if let Some(addr) = local_addr {
+ addr
+ } else {
+ crate::config::Config::get_any_listen_addr(remote_addr.is_ipv4())
+ };
+ if let Ok(socket) = new_socket(local, true) {
+ if let Ok(Ok(stream)) =
+ super::timeout(ms_timeout, socket.connect(remote_addr)).await
+ {
+ stream.set_nodelay(true).ok();
+ let addr = stream.local_addr()?;
+ return Ok(Self(
+ Framed::new(DynTcpStream(Box::new(stream)), BytesCodec::new()),
+ addr,
+ None,
+ 0,
+ ));
+ }
}
}
- bail!("could not resolve to any address");
+ bail!(format!("Failed to connect to {}", remote_addr));
}
- pub async fn connect<'a, 't, P, T1, T2>(
+ pub async fn connect<'a, 't, P, T>(
proxy: P,
- target: T1,
- local: T2,
+ target: T,
+ local_addr: Option,
username: &'a str,
password: &'a str,
ms_timeout: u64,
) -> ResultType
where
P: ToProxyAddrs,
- T1: IntoTargetAddr<'t>,
- T2: ToSocketAddrs,
+ T: IntoTargetAddr<'t>,
{
- if let Some(local) = lookup_host(&local).await?.next() {
- if let Some(proxy) = proxy.to_proxy_addrs().next().await {
- let stream =
- super::timeout(ms_timeout, new_socket(local, true)?.connect(proxy?)).await??;
- stream.set_nodelay(true).ok();
- let stream = if username.trim().is_empty() {
- super::timeout(
- ms_timeout,
- Socks5Stream::connect_with_socket(stream, target),
- )
- .await??
- } else {
- super::timeout(
- ms_timeout,
- Socks5Stream::connect_with_password_and_socket(
- stream, target, username, password,
- ),
- )
- .await??
- };
- let addr = stream.local_addr()?;
- return Ok(Self(
- Framed::new(DynTcpStream(Box::new(stream)), BytesCodec::new()),
- addr,
- None,
- 0,
- ));
+ if let Some(Ok(proxy)) = proxy.to_proxy_addrs().next().await {
+ let local = if let Some(addr) = local_addr {
+ addr
+ } else {
+ crate::config::Config::get_any_listen_addr(proxy.is_ipv4())
};
- };
+ let stream =
+ super::timeout(ms_timeout, new_socket(local, true)?.connect(proxy)).await??;
+ stream.set_nodelay(true).ok();
+ let stream = if username.trim().is_empty() {
+ super::timeout(
+ ms_timeout,
+ Socks5Stream::connect_with_socket(stream, target),
+ )
+ .await??
+ } else {
+ super::timeout(
+ ms_timeout,
+ Socks5Stream::connect_with_password_and_socket(
+ stream, target, username, password,
+ ),
+ )
+ .await??
+ };
+ let addr = stream.local_addr()?;
+ return Ok(Self(
+ Framed::new(DynTcpStream(Box::new(stream)), BytesCodec::new()),
+ addr,
+ None,
+ 0,
+ ));
+ }
bail!("could not resolve to any address");
}
@@ -252,6 +258,38 @@ pub async fn new_listener(addr: T, reuse: bool) -> ResultType<
}
}
+pub async fn listen_any(port: u16) -> ResultType {
+ if let Ok(mut socket) = TcpSocket::new_v6() {
+ #[cfg(unix)]
+ {
+ use std::os::unix::io::{FromRawFd, IntoRawFd};
+ let raw_fd = socket.into_raw_fd();
+ let sock2 = unsafe { socket2::Socket::from_raw_fd(raw_fd) };
+ sock2.set_only_v6(false).ok();
+ socket = unsafe { TcpSocket::from_raw_fd(sock2.into_raw_fd()) };
+ }
+ #[cfg(windows)]
+ {
+ use std::os::windows::prelude::{FromRawSocket, IntoRawSocket};
+ let raw_socket = socket.into_raw_socket();
+ let sock2 = unsafe { socket2::Socket::from_raw_socket(raw_socket) };
+ sock2.set_only_v6(false).ok();
+ socket = unsafe { TcpSocket::from_raw_socket(sock2.into_raw_socket()) };
+ }
+ if socket
+ .bind(SocketAddr::new(IpAddr::V6(Ipv6Addr::UNSPECIFIED), port))
+ .is_ok()
+ {
+ if let Ok(l) = socket.listen(DEFAULT_BACKLOG) {
+ return Ok(l);
+ }
+ }
+ }
+ let s = TcpSocket::new_v4()?;
+ s.bind(SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), port))?;
+ Ok(s.listen(DEFAULT_BACKLOG)?)
+}
+
impl Unpin for DynTcpStream {}
impl AsyncRead for DynTcpStream {
diff --git a/libs/hbb_common/src/udp.rs b/libs/hbb_common/src/udp.rs
index 3532dd1e0..38121a4e1 100644
--- a/libs/hbb_common/src/udp.rs
+++ b/libs/hbb_common/src/udp.rs
@@ -49,7 +49,7 @@ impl FramedSocket {
#[allow(clippy::never_loop)]
pub async fn new_reuse(addr: T) -> ResultType {
- for addr in addr.to_socket_addrs()?.filter(|x| x.is_ipv4()) {
+ for addr in addr.to_socket_addrs()? {
let socket = new_socket(addr, true, 0)?.into_udp_socket();
return Ok(Self::Direct(UdpFramed::new(
UdpSocket::from_std(socket)?,
@@ -63,7 +63,7 @@ impl FramedSocket {
addr: T,
buf_size: usize,
) -> ResultType {
- for addr in addr.to_socket_addrs()?.filter(|x| x.is_ipv4()) {
+ for addr in addr.to_socket_addrs()? {
return Ok(Self::Direct(UdpFramed::new(
UdpSocket::from_std(new_socket(addr, false, buf_size)?.into_udp_socket())?,
BytesCodec::new(),
@@ -164,4 +164,13 @@ impl FramedSocket {
None
}
}
+
+ pub fn is_ipv4(&self) -> bool {
+ if let FramedSocket::Direct(x) = self {
+ if let Ok(v) = x.get_ref().local_addr() {
+ return v.is_ipv4();
+ }
+ }
+ true
+ }
}
diff --git a/libs/portable/src/bin_reader.rs b/libs/portable/src/bin_reader.rs
index 499c18e2c..2d0b1bf7e 100644
--- a/libs/portable/src/bin_reader.rs
+++ b/libs/portable/src/bin_reader.rs
@@ -4,7 +4,10 @@ use std::{
path::PathBuf,
};
+#[cfg(windows)]
const BIN_DATA: &[u8] = include_bytes!("../data.bin");
+#[cfg(not(windows))]
+const BIN_DATA: &[u8] = &[];
// 4bytes
const LENGTH: usize = 4;
const IDENTIFIER_LENGTH: usize = 8;
@@ -118,7 +121,7 @@ impl BinaryReader {
(parsed, executable)
}
- #[cfg(unix)]
+ #[cfg(linux)]
pub fn configure_permission(&self, prefix: &PathBuf) {
use std::os::unix::prelude::PermissionsExt;
diff --git a/libs/portable/src/main.rs b/libs/portable/src/main.rs
index edcbdd1fd..13dd0c3dc 100644
--- a/libs/portable/src/main.rs
+++ b/libs/portable/src/main.rs
@@ -30,7 +30,7 @@ fn setup(reader: BinaryReader, dir: Option, clear: bool) -> Option,
- saved_raw_data: Vec, // for faster compare and copy
+ saved_raw_data: Vec, // for faster compare and copy
}
impl Capturer {
diff --git a/libs/scrap/src/common/codec.rs b/libs/scrap/src/common/codec.rs
index d729342d6..9535e9f3a 100644
--- a/libs/scrap/src/common/codec.rs
+++ b/libs/scrap/src/common/codec.rs
@@ -218,7 +218,7 @@ impl Encoder {
#[inline]
pub fn current_hw_encoder_name() -> Option {
#[cfg(feature = "hwcodec")]
- if check_hwcodec_config() {
+ if enable_hwcodec_option() {
return HwEncoder::current_name().lock().unwrap().clone();
} else {
return None;
@@ -229,7 +229,7 @@ impl Encoder {
pub fn supported_encoding() -> (bool, bool) {
#[cfg(feature = "hwcodec")]
- if check_hwcodec_config() {
+ if enable_hwcodec_option() {
let best = HwEncoder::best();
(
best.h264.as_ref().map_or(false, |c| c.score > 0),
@@ -246,7 +246,7 @@ impl Encoder {
impl Decoder {
pub fn video_codec_state(_id: &str) -> VideoCodecState {
#[cfg(feature = "hwcodec")]
- if check_hwcodec_config() {
+ if enable_hwcodec_option() {
let best = HwDecoder::best();
return VideoCodecState {
score_vpx: SCORE_VPX,
@@ -257,7 +257,7 @@ impl Decoder {
};
}
#[cfg(feature = "mediacodec")]
- if check_hwcodec_config() {
+ if enable_hwcodec_option() {
let score_h264 = if H264_DECODER_SUPPORT.load(std::sync::atomic::Ordering::SeqCst) {
92
} else {
@@ -287,11 +287,19 @@ impl Decoder {
Decoder {
vpx,
#[cfg(feature = "hwcodec")]
- hw: HwDecoder::new_decoders(),
+ hw: if enable_hwcodec_option() {
+ HwDecoder::new_decoders()
+ } else {
+ HwDecoders::default()
+ },
#[cfg(feature = "hwcodec")]
i420: vec![],
#[cfg(feature = "mediacodec")]
- media_codec: MediaCodecDecoder::new_decoders(),
+ media_codec: if enable_hwcodec_option() {
+ MediaCodecDecoder::new_decoders()
+ } else {
+ MediaCodecDecoders::default()
+ },
}
}
@@ -415,7 +423,7 @@ impl Decoder {
}
#[cfg(any(feature = "hwcodec", feature = "mediacodec"))]
-fn check_hwcodec_config() -> bool {
+fn enable_hwcodec_option() -> bool {
if let Some(v) = Config2::get().options.get("enable-hwcodec") {
return v != "N";
}
diff --git a/libs/scrap/src/common/hwcodec.rs b/libs/scrap/src/common/hwcodec.rs
index 166f7516c..c77da3f8f 100644
--- a/libs/scrap/src/common/hwcodec.rs
+++ b/libs/scrap/src/common/hwcodec.rs
@@ -94,7 +94,7 @@ impl EncoderApi for HwEncoder {
frames.push(EncodedVideoFrame {
data: Bytes::from(frame.data),
pts: frame.pts as _,
- key:frame.key == 1,
+ key: frame.key == 1,
..Default::default()
});
}
@@ -175,6 +175,7 @@ pub struct HwDecoder {
pub info: CodecInfo,
}
+#[derive(Default)]
pub struct HwDecoders {
pub h264: Option,
pub h265: Option,
diff --git a/libs/scrap/src/common/mediacodec.rs b/libs/scrap/src/common/mediacodec.rs
index fa821246c..406baecb5 100644
--- a/libs/scrap/src/common/mediacodec.rs
+++ b/libs/scrap/src/common/mediacodec.rs
@@ -37,6 +37,7 @@ impl Deref for MediaCodecDecoder {
}
}
+#[derive(Default)]
pub struct MediaCodecDecoders {
pub h264: Option,
pub h265: Option,
diff --git a/libs/scrap/src/common/mod.rs b/libs/scrap/src/common/mod.rs
index 82f65537b..1de2f89d6 100644
--- a/libs/scrap/src/common/mod.rs
+++ b/libs/scrap/src/common/mod.rs
@@ -44,8 +44,8 @@ pub mod record;
mod vpx;
#[inline]
-pub fn would_block_if_equal(old: &mut Vec