diff --git a/.claude/commands/reflection.md b/.claude/commands/reflection.md new file mode 100644 index 000000000..9628fc157 --- /dev/null +++ b/.claude/commands/reflection.md @@ -0,0 +1,56 @@ +You are an expert in prompt engineering, specializing in optimizing AI code assistant instructions. Your task is to analyze and improve the instructions for Claude Code. +Follow these steps carefully: + +1. Analysis Phase: +Review the chat history in your context window. + +Then, examine the current Claude instructions, commands and config + +/CLAUDE.md +/.claude/commands/* +**/CLAUDE.md +.claude/settings.json +.claude/settings.local.json + + +Analyze the chat history, instructions, commands and config to identify areas that could be improved. Look for: +- Inconsistencies in Claude's responses +- Misunderstandings of user requests +- Areas where Claude could provide more detailed or accurate information +- Opportunities to enhance Claude's ability to handle specific types of queries or tasks +- New commands or improvements to a commands name, function or response +- Permissions and MCPs we've approved locally that we should add to the config, especially if we've added new tools or require them for the command to work + +2. Interaction Phase: +Present your findings and improvement ideas to the human. For each suggestion: +a) Explain the current issue you've identified +b) Propose a specific change or addition to the instructions +c) Describe how this change would improve Claude's performance + +Wait for feedback from the human on each suggestion before proceeding. If the human approves a change, move it to the implementation phase. If not, refine your suggestion or move on to the next idea. + +3. Implementation Phase: +For each approved change: +a) Clearly state the section of the instructions you're modifying +b) Present the new or modified text for that section +c) Explain how this change addresses the issue identified in the analysis phase + +4. Output Format: +Present your final output in the following structure: + + +[List the issues identified and potential improvements] + + + +[For each approved improvement: +1. Section being modified +2. New or modified instruction text +3. Explanation of how this addresses the identified issue] + + + +[Present the complete, updated set of instructions for Claude, incorporating all approved changes] + + +Remember, your goal is to enhance Claude's performance and consistency while maintaining the core functionality and purpose of the AI assistant. Be thorough in your analysis, clear in your explanations, and precise in your implementations. \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a7d21d7e..6f15cd38a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ env: # CICD_INTERMEDIATES_DIR: "_cicd-intermediates" VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" # for multiarch gcc compatibility - VCPKG_COMMIT_ID: "120deac3062162151622ca4860575a33844ba10b" + VCPKG_COMMIT_ID: "6f29f12e82a8293156836ad81cc9bf5af41fe836" on: workflow_dispatch: @@ -81,23 +81,9 @@ jobs: # - { target: x86_64-apple-darwin , os: macos-10.15 } # - { target: x86_64-pc-windows-gnu , os: windows-2022 } # - { target: x86_64-pc-windows-msvc , os: windows-2022 } - - { target: x86_64-unknown-linux-gnu , os: ubuntu-24.04 } + - { target: x86_64-unknown-linux-gnu , os: ubuntu-22.04 } # - { target: x86_64-unknown-linux-musl , os: ubuntu-20.04, use-cross: true } steps: - - name: Free Disk Space (Ubuntu) - if: runner.os == 'Linux' - # jlumbroso/free-disk-space@main is used in .github\workflows\flutter-build.yml - # But pinning to a specific version to avoid unexpected issues is preferred. - uses: jlumbroso/free-disk-space@v1.3.1 - with: - tool-cache: false - android: true - dotnet: true - haskell: true - large-packages: false - docker-images: true - swap-storage: false - - name: Export GitHub Actions cache environment variables uses: actions/github-script@v6 with: diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index 263bd67dc..36bbe7902 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -23,7 +23,7 @@ env: MAC_RUST_VERSION: "1.81" # 1.81 is requred for macos, because of https://github.com/yury/cidre requires 1.81 CARGO_NDK_VERSION: "3.1.2" SCITER_ARMV7_CMAKE_VERSION: "3.29.7" - SCITER_NASM_DEBVERSION: "2.15.05-1" + SCITER_NASM_DEBVERSION: "2.14-1" LLVM_VERSION: "15.0.6" FLUTTER_VERSION: "3.24.5" ANDROID_FLUTTER_VERSION: "3.24.5" @@ -31,21 +31,20 @@ env: FLUTTER_ELINUX_VERSION: "3.16.9" TAG_NAME: "${{ inputs.upload-tag }}" VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" - # vcpkg version: 2025.08.27 + # vcpkg version: 2025.01.13 # If we change the `VCPKG COMMIT_ID`, please remember: # 1. Call `$VCPKG_ROOT/vcpkg x-update-baseline` to update the baseline in `vcpkg.json`. # Or we may face build issue like # https://github.com/rustdesk/rustdesk/actions/runs/14414119794/job/40427970174 # 2. Update the `VCPKG_COMMIT_ID` in `ci.yml` and `playground.yml`. - VCPKG_COMMIT_ID: "120deac3062162151622ca4860575a33844ba10b" - ARMV7_VCPKG_COMMIT_ID: "6f29f12e82a8293156836ad81cc9bf5af41fe836" # 2025.01.13, got "/opt/artifacts/vcpkg/vcpkg: No such file or directory" with latest version - VERSION: "1.4.6" - NDK_VERSION: "r28c" + VCPKG_COMMIT_ID: "6f29f12e82a8293156836ad81cc9bf5af41fe836" + VERSION: "1.4.0" + NDK_VERSION: "r27c" #signing keys env variable checks ANDROID_SIGNING_KEY: "${{ secrets.ANDROID_SIGNING_KEY }}" MACOS_P12_BASE64: "${{ secrets.MACOS_P12_BASE64 }}" UPLOAD_ARTIFACT: "${{ inputs.upload-artifact }}" - SIGN_BASE_URL: "${{ secrets.SIGN_BASE_URL }}-2" + SIGN_BASE_URL: "${{ secrets.SIGN_BASE_URL }}" jobs: generate-bridge: @@ -178,24 +177,24 @@ jobs: # Download printer driver files and extract them to ./rustdesk try { - Invoke-WebRequest -Uri https://github.com/rustdesk/hbb_common/releases/download/driver/rustdesk_printer_driver_v4-1.4.zip -OutFile rustdesk_printer_driver_v4-1.4.zip + Invoke-WebRequest -Uri https://github.com/rustdesk/hbb_common/releases/download/driver/rustdesk_printer_driver_v4.zip -OutFile rustdesk_printer_driver_v4.zip Invoke-WebRequest -Uri https://github.com/rustdesk/hbb_common/releases/download/driver/printer_driver_adapter.zip -OutFile printer_driver_adapter.zip Invoke-WebRequest -Uri https://github.com/rustdesk/hbb_common/releases/download/driver/sha256sums -OutFile sha256sums # Check and move the files - $checksum_driver = (Select-String -Path .\sha256sums -Pattern '^([a-fA-F0-9]{64}) \*rustdesk_printer_driver_v4-1.4\.zip$').Matches.Groups[1].Value - $downloadsum_driver = Get-FileHash -Path rustdesk_printer_driver_v4-1.4.zip -Algorithm SHA256 - $checksum_adapter = (Select-String -Path .\sha256sums -Pattern '^([a-fA-F0-9]{64}) \*printer_driver_adapter\.zip$').Matches.Groups[1].Value - $downloadsum_adapter = Get-FileHash -Path printer_driver_adapter.zip -Algorithm SHA256 - if ($checksum_driver -eq $downloadsum_driver.Hash -and $checksum_adapter -eq $downloadsum_adapter.Hash) { - Write-Output "rustdesk_printer_driver_v4-1.4, checksums match, extract the file." - Expand-Archive rustdesk_printer_driver_v4-1.4.zip -DestinationPath . + $checksum_driver = (Select-String -Path .\sha256sums -Pattern '^([a-fA-F0-9]{64}) \*rustdesk_printer_driver_v4\.zip$').Matches.Groups[1].Value + $downloadsum_driver = Get-FileHash -Path rustdesk_printer_driver_v4.zip -Algorithm SHA256 + $checksum_dll = (Select-String -Path .\sha256sums -Pattern '^([a-fA-F0-9]{64}) \*printer_driver_adapter\.zip$').Matches.Groups[1].Value + $downloadsum_dll = Get-FileHash -Path printer_driver_adapter.zip -Algorithm SHA256 + if ($checksum_driver -eq $downloadsum_driver.Hash -and $checksum_dll -eq $downloadsum_dll.Hash) { + Write-Output "rustdesk_printer_driver_v4, checksums match, extract the file." + Expand-Archive rustdesk_printer_driver_v4.zip -DestinationPath . mkdir ./rustdesk/drivers - mv -Force .\rustdesk_printer_driver_v4-1.4 ./rustdesk/drivers/RustDeskPrinterDriver + mv -Force .\rustdesk_printer_driver_v4 ./rustdesk/drivers/RustDeskPrinterDriver Expand-Archive printer_driver_adapter.zip -DestinationPath . mv -Force .\printer_driver_adapter.dll ./rustdesk } elseif ($checksum_driver -ne $downloadsum_driver.Hash) { - Write-Output "rustdesk_printer_driver_v4-1.4, checksums do not match, ignore the file." + Write-Output "rustdesk_printer_driver_v4, checksums do not match, ignore the file." } else { Write-Output "printer_driver_adapter.dll, checksums do not match, ignore the file." } @@ -234,11 +233,11 @@ jobs: path: rustdesk - name: Sign rustdesk files - if: env.UPLOAD_ARTIFACT == 'true' && env.SIGN_BASE_URL != '-2' + if: env.UPLOAD_ARTIFACT == 'true' && env.SIGN_BASE_URL != '' shell: bash run: | pip3 install requests argparse - BASE_URL=${{ env.SIGN_BASE_URL }} SECRET_KEY=${{ secrets.SIGN_SECRET_KEY }} python3 res/job.py sign_files ./rustdesk/ + BASE_URL=${{ secrets.SIGN_BASE_URL }} SECRET_KEY=${{ secrets.SIGN_SECRET_KEY }} python3 res/job.py sign_files ./rustdesk/ - name: Build self-extracted executable shell: bash @@ -266,10 +265,10 @@ jobs: sha256sum ../../SignOutput/rustdesk-*.msi - name: Sign rustdesk self-extracted file - if: env.UPLOAD_ARTIFACT == 'true' && env.SIGN_BASE_URL != '-2' + if: env.UPLOAD_ARTIFACT == 'true' && env.SIGN_BASE_URL != '' shell: bash run: | - BASE_URL=${{ env.SIGN_BASE_URL }} SECRET_KEY=${{ secrets.SIGN_SECRET_KEY }} python3 res/job.py sign_files ./SignOutput + BASE_URL=${{ secrets.SIGN_BASE_URL }} SECRET_KEY=${{ secrets.SIGN_SECRET_KEY }} python3 res/job.py sign_files ./SignOutput - name: Publish Release uses: softprops/action-gh-release@v1 @@ -392,19 +391,12 @@ jobs: ls -l ./libs/portable/Runner.res; fi - - name: Upload unsigned - if: env.UPLOAD_ARTIFACT == 'true' - uses: actions/upload-artifact@master - with: - name: rustdesk-unsigned-windows-${{ matrix.job.arch }} - path: Release - - name: Sign rustdesk files - if: env.UPLOAD_ARTIFACT == 'true' && env.SIGN_BASE_URL != '-2' + if: env.UPLOAD_ARTIFACT == 'true' && env.SIGN_BASE_URL != '' shell: bash run: | pip3 install requests argparse - BASE_URL=${{ env.SIGN_BASE_URL }} SECRET_KEY=${{ secrets.SIGN_SECRET_KEY }} python3 res/job.py sign_files ./Release/ + BASE_URL=${{ secrets.SIGN_BASE_URL }} SECRET_KEY=${{ secrets.SIGN_SECRET_KEY }} python3 res/job.py sign_files ./Release/ - name: Build self-extracted executable shell: bash @@ -418,10 +410,10 @@ jobs: mv ./target/release/rustdesk-portable-packer.exe ./SignOutput/rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}-sciter.exe - name: Sign rustdesk self-extracted file - if: env.UPLOAD_ARTIFACT == 'true' && env.SIGN_BASE_URL != '-2' + if: env.UPLOAD_ARTIFACT == 'true' && env.SIGN_BASE_URL != '' shell: bash run: | - BASE_URL=${{ env.SIGN_BASE_URL }} SECRET_KEY=${{ secrets.SIGN_SECRET_KEY }} python3 res/job.py sign_files ./SignOutput/ + BASE_URL=${{ secrets.SIGN_BASE_URL }} SECRET_KEY=${{ secrets.SIGN_SECRET_KEY }} python3 res/job.py sign_files ./SignOutput/ - name: Publish Release uses: softprops/action-gh-release@v1 @@ -432,6 +424,80 @@ jobs: files: | ./SignOutput/rustdesk-*.exe + build-for-macOS-arm64-selfhost: + # use build-for-macOS instead + if: false + runs-on: [self-hosted, macOS, ARM64] + needs: [generate-bridge] + steps: + - name: Export GitHub Actions cache environment variables + uses: actions/github-script@v6 + with: + script: | + core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); + core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); + + - name: Checkout source code + uses: actions/checkout@v4 + with: + submodules: recursive + + - name: Restore bridge files + uses: actions/download-artifact@master + with: + name: bridge-artifact + path: ./ + + - name: Build rustdesk + run: | + ./build.py --flutter --hwcodec --unix-file-copy-paste + + - name: create unsigned dmg + if: env.UPLOAD_ARTIFACT == 'true' + run: | + CREATE_DMG="$(command -v create-dmg)" + CREATE_DMG="$(readlink -f "$CREATE_DMG")" + sed -i -e 's/MAXIMUM_UNMOUNTING_ATTEMPTS=3/MAXIMUM_UNMOUNTING_ATTEMPTS=7/' "$CREATE_DMG" + create-dmg --icon "RustDesk.app" 200 190 --hide-extension "RustDesk.app" --window-size 800 400 --app-drop-link 600 185 rustdesk-${{ env.VERSION }}-arm64.dmg ./flutter/build/macos/Build/Products/Release/RustDesk.app + + - name: Upload unsigned macOS app + if: env.UPLOAD_ARTIFACT == 'true' + uses: actions/upload-artifact@master + with: + name: rustdesk-unsigned-macos-arm64 + path: rustdesk-${{ env.VERSION }}-arm64.dmg # can not upload the directory directly or tar.gz file, which destroy the link structure, causing the codesign failed + + - name: Codesign app and create signed dmg + if: env.MACOS_P12_BASE64 != null && env.UPLOAD_ARTIFACT == 'true' + run: | + # Patch create-dmg to give more attempts to unmount image + CREATE_DMG="$(command -v create-dmg)" + CREATE_DMG="$(readlink -f "$CREATE_DMG")" + sed -i -e 's/MAXIMUM_UNMOUNTING_ATTEMPTS=3/MAXIMUM_UNMOUNTING_ATTEMPTS=7/' "$CREATE_DMG" + # start sign the rustdesk.app and dmg + rm -rf *.dmg || true + codesign --force --options runtime -s ${{ secrets.MACOS_CODESIGN_IDENTITY }} --deep --strict ./flutter/build/macos/Build/Products/Release/RustDesk.app -vvv + 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 --strict rustdesk-${{ env.VERSION }}.dmg -vvv + # notarize the rustdesk-${{ env.VERSION }}.dmg + rcodesign notary-submit --api-key-path ~/.p12/api-key.json --staple rustdesk-${{ env.VERSION }}.dmg + + - name: Rename rustdesk + if: env.UPLOAD_ARTIFACT == 'true' + run: | + for name in rustdesk*??.dmg; do + mv "$name" "${name%%.dmg}-aarch64.dmg" + done + + - name: Publish DMG package + if: env.UPLOAD_ARTIFACT == 'true' + uses: softprops/action-gh-release@v1 + with: + prerelease: true + tag_name: ${{ env.TAG_NAME }} + files: | + rustdesk*-aarch64.dmg + build-rustdesk-ios: if: ${{ inputs.upload-artifact }} name: build rustdesk ios ipa @@ -444,7 +510,7 @@ jobs: - { arch: aarch64, target: aarch64-apple-ios, - os: macos-latest, + os: macos-13, vcpkg-triplet: arm64-ios, } steps: @@ -551,6 +617,63 @@ jobs: # files: | # flutter/build/ios/ipa/*.ipa + build-rustdesk-ios-selfhost: + #if: ${{ inputs.upload-artifact }} + if: false + runs-on: [self-hosted, macOS, ARM64] + needs: [generate-bridge] + strategy: + fail-fast: false + steps: + - name: Export GitHub Actions cache environment variables + uses: actions/github-script@v6 + with: + script: | + core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); + core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); + + - name: Checkout source code + uses: actions/checkout@v4 + with: + submodules: recursive + + # $VCPKG_ROOT/vcpkg install --triplet arm64-ios --x-install-root="$VCPKG_ROOT/installed" + + - name: Restore bridge files + uses: actions/download-artifact@master + with: + name: bridge-artifact + path: ./ + + - name: Build rustdesk lib + run: | + cargo build --features flutter,hwcodec --release --target aarch64-apple-ios --lib + + - name: Build rustdesk + # ios sdk not installed on this machine, I will install it later after I am back home + if: false + shell: bash + run: | + pushd flutter + # flutter build ipa --release --obfuscate --split-debug-info=./split-debug-info --no-codesign + # for easy debugging + flutter build ipa --release --no-codesign + + # - name: Upload Artifacts + # # if: env.ANDROID_SIGNING_KEY != null && env.UPLOAD_ARTIFACT == 'true' + # uses: actions/upload-artifact@master + # with: + # name: rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.apk + # path: flutter/build/ios/ipa/*.ipa + + # - name: Publish ipa package + # # if: env.ANDROID_SIGNING_KEY != null && env.UPLOAD_ARTIFACT == 'true' + # uses: softprops/action-gh-release@v1 + # with: + # prerelease: true + # tag_name: ${{ env.TAG_NAME }} + # files: | + # flutter/build/ios/ipa/*.ipa build-for-macOS: name: ${{ matrix.job.target }} @@ -562,14 +685,14 @@ jobs: job: - { target: x86_64-apple-darwin, - os: macos-15-intel, #macos-latest or macos-14 use M1 now, https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#:~:text=14%20GB-,macos%2Dlatest%20or%20macos%2D14,-The%20macos%2Dlatestlabel + os: macos-13, #macos-latest or macos-14 use M1 now, https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#:~:text=14%20GB-,macos%2Dlatest%20or%20macos%2D14,-The%20macos%2Dlatestlabel extra-build-args: "", arch: x86_64, vcpkg-triplet: x64-osx, } - { target: aarch64-apple-darwin, - os: macos-14, + os: macos-latest, # extra-build-args: "--disable-flutter-texture-render", # disable this for mac, because we see a lot of users reporting flickering both on arm and x64, and we can not confirm if texture rendering has better performance if htere is no vram, https://github.com/rustdesk/rustdesk/issues/6296 extra-build-args: "--screencapturekit", arch: aarch64, @@ -623,7 +746,7 @@ jobs: - name: Install build runtime run: | - brew install llvm create-dmg + brew install llvm create-dmg nasm cmake gcc wget ninja # pkg-config is handled in a separate step, because it may be already installed by `macos-latest`(14.7.1) runner if command -v pkg-config &>/dev/null; then echo "pkg-config is already installed" @@ -631,17 +754,6 @@ jobs: brew install pkg-config fi - - name: Install NASM - run: | - # Install NASM 2.16.x from official release. - # Do NOT use `brew install nasm` which installs NASM 3.x. - # NASM 3.x is a complete rewrite with incompatible CLI options and removed features. - # aom and other multimedia libraries require NASM 2.x for x86/x86_64 assembly. - wget https://www.nasm.us/pub/nasm/releasebuilds/2.16.03/macosx/nasm-2.16.03-macosx.zip - unzip nasm-2.16.03-macosx.zip - sudo cp nasm-2.16.03/nasm /usr/local/bin/nasm - nasm --version - - name: Install flutter uses: subosito/flutter-action@v2 with: @@ -774,7 +886,6 @@ jobs: needs: - build-for-macOS - build-for-windows-flutter - - build-for-windows-sciter runs-on: ubuntu-latest if: ${{ inputs.upload-artifact }} steps: @@ -796,15 +907,9 @@ jobs: name: rustdesk-unsigned-windows-x86_64 path: ./windows-x86_64/ - - name: Download Artifacts - uses: actions/download-artifact@master - with: - name: rustdesk-unsigned-windows-x86 - path: ./windows-x86/ - - name: Combine unsigned app run: | - tar czf rustdesk-${{ env.VERSION }}-unsigned.tar.gz *.dmg windows-x86_64 windows-x86 + tar czf rustdesk-${{ env.VERSION }}-unsigned.tar.gz *.dmg windows-x86_64 - name: Publish unsigned app uses: softprops/action-gh-release@v1 @@ -1012,8 +1117,6 @@ jobs: JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64 run: | export PATH=/usr/lib/jvm/java-17-openjdk-amd64/bin:$PATH - # Increase Gradle JVM memory for CI builds - sed -i "s/org.gradle.jvmargs=-Xmx1024M/org.gradle.jvmargs=-Xmx2g/g" ./flutter/android/gradle.properties # temporary use debug sign config sed -i "s/signingConfigs.release/signingConfigs.debug/g" ./flutter/android/app/build.gradle case ${{ matrix.job.target }} in @@ -1221,8 +1324,6 @@ jobs: JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64 run: | export PATH=/usr/lib/jvm/java-17-openjdk-amd64/bin:$PATH - # Increase Gradle JVM memory for CI builds - sed -i "s/org.gradle.jvmargs=-Xmx1024M/org.gradle.jvmargs=-Xmx2g/g" ./flutter/android/gradle.properties # temporary use debug sign config sed -i "s/signingConfigs.release/signingConfigs.debug/g" ./flutter/android/app/build.gradle mv ./flutter/android/app/src/main/jniLibs/arm64-v8a/liblibrustdesk.so ./flutter/android/app/src/main/jniLibs/arm64-v8a/librustdesk.so @@ -1458,8 +1559,7 @@ jobs: rpm \ unzip \ wget \ - xz-utils \ - libssl-dev + xz-utils # we have libopus compiled by us. apt-get remove -y libopus-dev || true # output devs @@ -1668,14 +1768,6 @@ jobs: with: submodules: recursive - - name: Modify vcpkg.json for armv7 - if: matrix.job.vcpkg-triplet == 'arm-linux' - run: | - # Replace the baseline in vcpkg.json with ARMV7_VCPKG_COMMIT_ID for armv7 builds - sed -i 's/"baseline": ".*"/"baseline": "${{ env.ARMV7_VCPKG_COMMIT_ID }}"/' vcpkg.json - echo "Modified vcpkg.json for armv7 build:" - grep -A 2 -B 2 '"baseline"' vcpkg.json - - name: Free Space run: | df -h @@ -1739,13 +1831,12 @@ jobs: unzip \ wget \ xz-utils \ - zip \ - libssl-dev + zip # arm-linux needs CMake and vcokg built from source as there # are no prebuilts available from Kitware and Microsoft if [ "${{ matrix.job.vcpkg-triplet }}" = "arm-linux" ]; then # install gcc/g++ 8 for vcpkg and OpenSSL headers for CMake - apt-get install -y gcc-8 g++-8 + apt-get install -y gcc-8 g++-8 libssl-dev # bootstrap CMake amd add it to PATH git clone --depth 1 https://github.com/kitware/cmake -b "v${{ env.SCITER_ARMV7_CMAKE_VERSION }}" /tmp/cmake pushd /tmp/cmake @@ -1762,12 +1853,11 @@ jobs: rm -rf vcpkg git clone https://github.com/microsoft/vcpkg pushd vcpkg + git reset --hard ${{ env.VCPKG_COMMIT_ID }} # build vcpkg helper executable with gcc-8 for arm-linux but use prebuilt one on x64-linux if [ "${{ matrix.job.vcpkg-triplet }}" = "arm-linux" ]; then - git reset --hard ${{ env.ARMV7_VCPKG_COMMIT_ID }} CC=/usr/bin/gcc-8 CXX=/usr/bin/g++-8 sh bootstrap-vcpkg.sh -disableMetrics else - git reset --hard ${{ env.VCPKG_COMMIT_ID }} sh bootstrap-vcpkg.sh -disableMetrics fi popd @@ -1888,8 +1978,11 @@ jobs: # https://github.com/AppImage/AppImageKit/wiki/FUSE sudo apt-get install -y libarchive-tools libfuse2 # set-up appimage-builder - # https://github.com/AppImage/AppImageKit/issues/1395 - sudo pip3 install git+https://github.com/rustdesk-org/appimage-builder.git + 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 --recipe ./AppImageBuilder-${{ matrix.job.arch }}.yml @@ -1916,15 +2009,14 @@ jobs: job: - { target: x86_64-unknown-linux-gnu, - # https://github.com/ostreedev/ostree/commit/4bac96a8c817beda37448f9b8c662162bb619981 - distro: ubuntu22.04, + distro: ubuntu18.04, on: ubuntu-22.04, arch: x86_64, suffix: "", } - { target: x86_64-unknown-linux-gnu, - distro: ubuntu22.04, + distro: ubuntu18.04, on: ubuntu-22.04, arch: x86_64, suffix: "-sciter", @@ -1992,8 +2084,6 @@ jobs: if: False name: build-rustdesk-web runs-on: ubuntu-22.04 - permissions: - contents: read strategy: fail-fast: false env: diff --git a/.github/workflows/playground.yml b/.github/workflows/playground.yml index 110437e0f..48e5c4df0 100644 --- a/.github/workflows/playground.yml +++ b/.github/workflows/playground.yml @@ -16,8 +16,8 @@ env: FLUTTER_ELINUX_VERSION: "3.16.9" TAG_NAME: "nightly" VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" - VCPKG_COMMIT_ID: "120deac3062162151622ca4860575a33844ba10b" - VERSION: "1.4.6" + VCPKG_COMMIT_ID: "6f29f12e82a8293156836ad81cc9bf5af41fe836" + VERSION: "1.4.0" NDK_VERSION: "r26d" #signing keys env variable checks ANDROID_SIGNING_KEY: "${{ secrets.ANDROID_SIGNING_KEY }}" @@ -126,7 +126,7 @@ jobs: - name: Install build runtime run: | - brew install llvm create-dmg nasm pkg-config + brew install llvm create-dmg nasm cmake gcc wget ninja pkg-config - name: Install flutter uses: subosito/flutter-action@v2 diff --git a/.github/workflows/winget.yml b/.github/workflows/winget.yml new file mode 100644 index 000000000..6fb0e9f4e --- /dev/null +++ b/.github/workflows/winget.yml @@ -0,0 +1,15 @@ +name: Publish to WinGet +on: + release: + types: [released] + workflow_dispatch: +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: vedantmgoyal9/winget-releaser@main + with: + identifier: RustDesk.RustDesk + version: "1.4.0" + release-tag: "1.4.0" + token: ${{ secrets.WINGET_TOKEN }} diff --git a/.gitignore b/.gitignore index d2e09a906..b4ea62660 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ .vscode .idea .DS_Store -.env libsciter-gtk.so src/ui/inline.rs extractor diff --git a/AGENTS.md b/AGENTS.md deleted file mode 100644 index e36c65fab..000000000 --- a/AGENTS.md +++ /dev/null @@ -1,62 +0,0 @@ -# RustDesk Guide - -## Project Layout - -### Directory Structure -* `src/` Rust app -* `src/server/` audio / clipboard / input / video / network -* `src/platform/` platform-specific code -* `src/ui/` legacy Sciter UI (deprecated) -* `flutter/` current UI -* `libs/hbb_common/` config / proto / shared utils -* `libs/scrap/` screen capture -* `libs/enigo/` input control -* `libs/clipboard/` clipboard -* `libs/hbb_common/src/config.rs` all options - -### Key Components -- **Remote Desktop Protocol**: Custom protocol implemented in `src/rendezvous_mediator.rs` for communicating with rustdesk-server -- **Screen Capture**: Platform-specific screen capture in `libs/scrap/` -- **Input Handling**: Cross-platform input simulation in `libs/enigo/` -- **Audio/Video Services**: Real-time audio/video streaming in `src/server/` -- **File Transfer**: Secure file transfer implementation in `libs/hbb_common/` - -### UI Architecture -- **Legacy UI**: Sciter-based (deprecated) - files in `src/ui/` -- **Modern UI**: Flutter-based - files in `flutter/` - - Desktop: `flutter/lib/desktop/` - - Mobile: `flutter/lib/mobile/` - - Shared: `flutter/lib/common/` and `flutter/lib/models/` - -## Rust Rules - -* Avoid `unwrap()` / `expect()` in production code. -* Exceptions: - - * tests; - * lock acquisition where failure means poisoning, not normal control flow. -* Otherwise prefer `Result` + `?` or explicit handling. -* Do not ignore errors silently. -* Avoid unnecessary `.clone()`. -* Prefer borrowing when practical. -* Do not add dependencies unless needed. -* Keep code simple and idiomatic. - -## Tokio Rules - -* Assume a Tokio runtime already exists. -* Never create nested runtimes. -* Never call `Runtime::block_on()` inside Tokio / async code. -* Do not hide runtime creation inside helpers or libraries. -* Do not hold locks across `.await`. -* Prefer `.await`, `tokio::spawn`, channels. -* Use `spawn_blocking` or dedicated threads for blocking work. -* Do not use `std::thread::sleep()` in async code. - -## Editing Hygiene - -* Change only what is required. -* Prefer the smallest valid diff. -* Do not refactor unrelated code. -* Do not make formatting-only changes. -* Keep naming/style consistent with nearby code. diff --git a/CLAUDE.md b/CLAUDE.md index c31706425..8d46e1fa1 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -1 +1,91 @@ -AGENTS.md +# CLAUDE.md + +This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. + +## Development Commands + +### Build Commands +- `cargo run` - Build and run the desktop application (requires libsciter library) +- `python3 build.py --flutter` - Build Flutter version (desktop) +- `python3 build.py --flutter --release` - Build Flutter version in release mode +- `python3 build.py --hwcodec` - Build with hardware codec support +- `python3 build.py --vram` - Build with VRAM feature (Windows only) +- `cargo build --release` - Build Rust binary in release mode +- `cargo build --features hwcodec` - Build with specific features + +### Flutter Mobile Commands +- `cd flutter && flutter build android` - Build Android APK +- `cd flutter && flutter build ios` - Build iOS app +- `cd flutter && flutter run` - Run Flutter app in development mode +- `cd flutter && flutter test` - Run Flutter tests + +### Testing +- `cargo test` - Run Rust tests +- `cd flutter && flutter test` - Run Flutter tests + +### Platform-Specific Build Scripts +- `flutter/build_android.sh` - Android build script +- `flutter/build_ios.sh` - iOS build script +- `flutter/build_fdroid.sh` - F-Droid build script + +## Project Architecture + +### Directory Structure +- **`src/`** - Main Rust application code + - `src/ui/` - Legacy Sciter UI (deprecated, use Flutter instead) + - `src/server/` - Audio/clipboard/input/video services and network connections + - `src/client.rs` - Peer connection handling + - `src/platform/` - Platform-specific code +- **`flutter/`** - Flutter UI code for desktop and mobile +- **`libs/`** - Core libraries + - `libs/hbb_common/` - Video codec, config, network wrapper, protobuf, file transfer utilities + - `libs/scrap/` - Screen capture functionality + - `libs/enigo/` - Platform-specific keyboard/mouse control + - `libs/clipboard/` - Cross-platform clipboard implementation + +### Key Components +- **Remote Desktop Protocol**: Custom protocol implemented in `src/rendezvous_mediator.rs` for communicating with rustdesk-server +- **Screen Capture**: Platform-specific screen capture in `libs/scrap/` +- **Input Handling**: Cross-platform input simulation in `libs/enigo/` +- **Audio/Video Services**: Real-time audio/video streaming in `src/server/` +- **File Transfer**: Secure file transfer implementation in `libs/hbb_common/` + +### UI Architecture +- **Legacy UI**: Sciter-based (deprecated) - files in `src/ui/` +- **Modern UI**: Flutter-based - files in `flutter/` + - Desktop: `flutter/lib/desktop/` + - Mobile: `flutter/lib/mobile/` + - Shared: `flutter/lib/common/` and `flutter/lib/models/` + +## Important Build Notes + +### Dependencies +- Requires vcpkg for C++ dependencies: `libvpx`, `libyuv`, `opus`, `aom` +- Set `VCPKG_ROOT` environment variable +- Download appropriate Sciter library for legacy UI support + +### Ignore Patterns +When working with files, ignore these directories: +- `target/` - Rust build artifacts +- `flutter/build/` - Flutter build output +- `flutter/.dart_tool/` - Flutter tooling files + +### Cross-Platform Considerations +- Windows builds require additional DLLs and virtual display drivers +- macOS builds need proper signing and notarization for distribution +- Linux builds support multiple package formats (deb, rpm, AppImage) +- Mobile builds require platform-specific toolchains (Android SDK, Xcode) + +### Feature Flags +- `hwcodec` - Hardware video encoding/decoding +- `vram` - VRAM optimization (Windows only) +- `flutter` - Enable Flutter UI +- `unix-file-copy-paste` - Unix file clipboard support +- `screencapturekit` - macOS ScreenCaptureKit (macOS only) + +### Config +All configurations or options are under `libs/hbb_common/src/config.rs` file, 4 types: +- Settings +- Local +- Display +- Built-in diff --git a/Cargo.lock b/Cargo.lock index fe1f67cc0..20e1b34ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,22 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "ab_glyph" -version = "0.2.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e074464580a518d16a7126262fffaaa47af89d4099d4cb403f8ed938ba12ee7d" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", -] - -[[package]] -name = "ab_glyph_rasterizer" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618" - [[package]] name = "addr2line" version = "0.22.0" @@ -33,22 +17,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "adler2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" - -[[package]] -name = "aead" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "crypto-common", - "generic-array", -] - [[package]] name = "aes" version = "0.8.4" @@ -60,20 +28,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "aes-gcm" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - [[package]] name = "ahash" version = "0.7.8" @@ -85,19 +39,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "ahash" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" -dependencies = [ - "cfg-if 1.0.0", - "getrandom 0.3.2", - "once_cell", - "version_check", - "zerocopy 0.8.26", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -155,33 +96,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "android-activity" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" -dependencies = [ - "android-properties", - "bitflags 2.9.1", - "cc", - "cesu8", - "jni", - "jni-sys", - "libc", - "log", - "ndk 0.9.0", - "ndk-context", - "ndk-sys 0.6.0+11769913", - "num_enum 0.7.2", - "thiserror 1.0.61", -] - -[[package]] -name = "android-properties" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" - [[package]] name = "android-tzdata" version = "0.1.1" @@ -251,9 +165,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.13" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" @@ -292,93 +206,30 @@ checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" [[package]] name = "arboard" version = "3.4.0" -source = "git+https://github.com/rustdesk-org/arboard#85be1218668ff218a7b170c9d424fde73e069914" +source = "git+https://github.com/rustdesk-org/arboard#4e16bad260ea05dd7dcdb68cc7549dad3920b940" dependencies = [ "clipboard-win", "core-graphics 0.23.2", "image 0.25.1", "log", "objc2 0.5.2", - "objc2-app-kit 0.2.2", - "objc2-foundation 0.2.2", + "objc2-app-kit", + "objc2-foundation", "parking_lot", "percent-encoding", - "serde 1.0.228", + "serde 1.0.203", "serde_derive", "windows-sys 0.48.0", "wl-clipboard-rs", "x11rb 0.13.1", ] -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - -[[package]] -name = "arrayref" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" - [[package]] name = "arrayvec" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" -[[package]] -name = "as-raw-xcb-connection" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" - -[[package]] -name = "asn1-rs" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" -dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits 0.2.19", - "rusticata-macros", - "thiserror 1.0.61", - "time 0.3.36", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.36", - "syn 2.0.98", - "synstructure", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.36", - "syn 2.0.98", -] - -[[package]] -name = "associative-cache" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46016233fc1bb55c23b856fe556b7db6ccd05119a0a392e04f0b3b7c79058f16" - [[package]] name = "async-broadcast" version = "0.5.1" @@ -403,13 +254,13 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.32" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a89bce6054c720275ac2432fbba080a66a2106a44a1b804553930ca6909f4e0" +checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" dependencies = [ - "compression-codecs", - "compression-core", + "flate2", "futures-core", + "memchr", "pin-project-lite", "tokio", ] @@ -643,17 +494,11 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide", "object", "rustc-demangle", ] -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - [[package]] name = "base32" version = "0.4.0" @@ -678,15 +523,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde 1.0.228", -] - [[package]] name = "bindgen" version = "0.59.2" @@ -789,7 +625,7 @@ version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" dependencies = [ - "serde 1.0.228", + "serde 1.0.203", ] [[package]] @@ -829,15 +665,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-padding" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" -dependencies = [ - "generic-array", -] - [[package]] name = "block-sys" version = "0.1.0-beta.1" @@ -866,15 +693,6 @@ dependencies = [ "objc2 0.5.2", ] -[[package]] -name = "block2" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" -dependencies = [ - "objc2 0.6.4", -] - [[package]] name = "blocking" version = "1.6.1" @@ -933,23 +751,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.23.2" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f154e572231cb6ba2bd1176980827e3d5dc04cc183a75dea38109fbdd672d29" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.36", - "syn 2.0.98", -] +checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" [[package]] name = "byteorder" @@ -963,7 +767,7 @@ version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" dependencies = [ - "serde 1.0.228", + "serde 1.0.203", ] [[package]] @@ -1030,66 +834,6 @@ dependencies = [ "system-deps 6.2.2", ] -[[package]] -name = "calloop" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" -dependencies = [ - "bitflags 2.9.1", - "log", - "polling 3.7.2", - "rustix 0.38.34", - "slab", - "thiserror 1.0.61", -] - -[[package]] -name = "calloop" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9f6e1368bd4621d2c86baa7e37de77a938adf5221e5dd3d6133340101b309e" -dependencies = [ - "bitflags 2.9.1", - "polling 3.7.2", - "rustix 1.1.2", - "slab", - "tracing", -] - -[[package]] -name = "calloop-wayland-source" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" -dependencies = [ - "calloop 0.13.0", - "rustix 0.38.34", - "wayland-backend", - "wayland-client", -] - -[[package]] -name = "calloop-wayland-source" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138efcf0940a02ebf0cc8d1eff41a1682a46b431630f4c52450d6265876021fa" -dependencies = [ - "calloop 0.14.3", - "rustix 1.1.2", - "wayland-backend", - "wayland-client", -] - -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher", -] - [[package]] name = "cc" version = "1.2.13" @@ -1101,18 +845,6 @@ dependencies = [ "shlex", ] -[[package]] -name = "ccm" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae3c82e4355234767756212c570e29833699ab63e6ffd161887314cc5b43847" -dependencies = [ - "aead", - "cipher", - "ctr", - "subtle", -] - [[package]] name = "cesu8" version = "1.1.0" @@ -1162,30 +894,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" -[[package]] -name = "chacha20" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" -dependencies = [ - "cfg-if 1.0.0", - "cipher", - "cpufeatures", -] - -[[package]] -name = "chacha20poly1305" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" -dependencies = [ - "aead", - "chacha20", - "cipher", - "poly1305", - "zeroize", -] - [[package]] name = "chrono" version = "0.4.41" @@ -1197,7 +905,7 @@ dependencies = [ "js-sys", "num-traits 0.2.19", "wasm-bindgen", - "windows-link 0.1.1", + "windows-link", ] [[package]] @@ -1235,7 +943,6 @@ checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common", "inout", - "zeroize", ] [[package]] @@ -1266,18 +973,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.53" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.53" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" dependencies = [ "anstream", "anstyle", @@ -1287,9 +994,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.6" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "clipboard" @@ -1305,13 +1012,13 @@ dependencies = [ "lazy_static", "libc", "objc2 0.5.2", - "objc2-app-kit 0.2.2", - "objc2-foundation 0.2.2", + "objc2-app-kit", + "objc2-foundation", "once_cell", "parking_lot", "percent-encoding", "rand 0.8.5", - "serde 1.0.228", + "serde 1.0.203", "serde_derive", "thiserror 1.0.61", "utf16string", @@ -1324,7 +1031,7 @@ dependencies = [ [[package]] name = "clipboard-master" version = "4.0.0-beta.6" -source = "git+https://github.com/rustdesk-org/clipboard-master#ddc39f00a6211959489ae683aa6ae6eedf03a809" +source = "git+https://github.com/rustdesk-org/clipboard-master#4fb62e5b62fb6350d82b571ec7ba94b3cd466695" dependencies = [ "objc", "objc-foundation", @@ -1448,23 +1155,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "compression-codecs" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8a506ec4b81c460798f572caead636d57d3d7e940f998160f52bd254bf2d23" -dependencies = [ - "compression-core", - "flate2", - "memchr", -] - -[[package]] -name = "compression-core" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47641d3deaf41fb1538ac1f54735925e275eaf3bf4d55c81b137fba797e5cbb" - [[package]] name = "concurrent-queue" version = "2.5.0" @@ -1480,7 +1170,7 @@ version = "0.4.0-2" source = "git+https://github.com/rustdesk-org/confy#83db9ec19a2f97e9718aef69e4fc5611bb382479" dependencies = [ "directories-next", - "serde 1.0.228", + "serde 1.0.203", "thiserror 1.0.61", "toml 0.5.11", ] @@ -1495,12 +1185,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - [[package]] name = "const_fn" version = "0.4.10" @@ -1570,9 +1254,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.10.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" dependencies = [ "core-foundation-sys 0.8.7", "libc", @@ -1682,18 +1366,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core-text" -version = "19.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" -dependencies = [ - "core-foundation 0.9.4", - "core-graphics 0.22.3", - "foreign-types 0.3.2", - "libc", -] - [[package]] name = "core-video-sys" version = "0.1.4" @@ -1708,15 +1380,6 @@ dependencies = [ "objc", ] -[[package]] -name = "core_maths" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77745e017f5edba1a9c1d854f6f3a52dac8a12dd5af5d2f54aecf61e43d80d30" -dependencies = [ - "libm", -] - [[package]] name = "coreaudio-rs" version = "0.11.3" @@ -1842,18 +1505,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" -[[package]] -name = "crypto-bigint" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" -dependencies = [ - "generic-array", - "rand_core 0.6.4", - "subtle", - "zeroize", -] - [[package]] name = "crypto-common" version = "0.1.6" @@ -1861,25 +1512,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.4", "typenum", ] -[[package]] -name = "ctor-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f791803201ab277ace03903de1594460708d2d54df6053f2d9e82f592b19e3b" - -[[package]] -name = "ctr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher", -] - [[package]] name = "ctrlc" version = "3.4.4" @@ -1890,38 +1525,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "cursor-icon" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27ae1dd37df86211c42e150270f82743308803d90a6f6e6651cd730d5e1732f" - -[[package]] -name = "curve25519-dalek" -version = "4.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "curve25519-dalek-derive", - "fiat-crypto", - "rustc_version", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.36", - "syn 2.0.98", -] - [[package]] name = "dart-sys" version = "4.1.5" @@ -2136,31 +1739,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "der" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - -[[package]] -name = "der-parser" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" -dependencies = [ - "asn1-rs", - "displaydoc", - "nom", - "num-bigint", - "num-traits 0.2.19", - "rusticata-macros", -] - [[package]] name = "deranged" version = "0.3.11" @@ -2188,7 +1766,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", - "const-oid", "crypto-common", "subtle", ] @@ -2213,15 +1790,6 @@ dependencies = [ "dirs-sys 0.3.7", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys 0.3.7", -] - [[package]] name = "dirs" version = "5.0.1" @@ -2231,15 +1799,6 @@ dependencies = [ "dirs-sys 0.4.1", ] -[[package]] -name = "dirs" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" -dependencies = [ - "dirs-sys 0.5.0", -] - [[package]] name = "dirs-next" version = "2.0.0" @@ -2257,7 +1816,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", - "redox_users 0.4.5", + "redox_users", "winapi 0.3.9", ] @@ -2269,22 +1828,10 @@ checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", "option-ext", - "redox_users 0.4.5", + "redox_users", "windows-sys 0.48.0", ] -[[package]] -name = "dirs-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" -dependencies = [ - "libc", - "option-ext", - "redox_users 0.5.2", - "windows-sys 0.61.2", -] - [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -2292,7 +1839,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users 0.4.5", + "redox_users", "winapi 0.3.9", ] @@ -2302,27 +1849,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" -[[package]] -name = "dispatch2" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" -dependencies = [ - "bitflags 2.9.1", - "objc2 0.6.4", -] - -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.36", - "syn 2.0.98", -] - [[package]] name = "dlib" version = "0.5.2" @@ -2392,7 +1918,7 @@ checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", - "serde 1.0.228", + "serde 1.0.203", "strsim 0.10.0", ] @@ -2408,81 +1934,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" -[[package]] -name = "drm" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1" -dependencies = [ - "bitflags 2.9.1", - "bytemuck", - "drm-ffi", - "drm-fourcc", - "rustix 0.38.34", -] - -[[package]] -name = "drm-ffi" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53" -dependencies = [ - "drm-sys", - "rustix 0.38.34", -] - -[[package]] -name = "drm-fourcc" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" - -[[package]] -name = "drm-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986" -dependencies = [ - "libc", - "linux-raw-sys 0.6.5", -] - -[[package]] -name = "dtls" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f531dd7c181beaf3cebab3716afa4d0d41ab888be85232583f56bbaf07ca208a" -dependencies = [ - "aes", - "aes-gcm", - "async-trait", - "bincode", - "byteorder", - "cbc", - "ccm", - "chacha20poly1305", - "der-parser", - "hmac", - "log", - "p256", - "p384", - "portable-atomic", - "rand 0.9.2", - "rand_core 0.6.4", - "rcgen", - "ring", - "rustls", - "sec1", - "serde 1.0.228", - "sha1", - "sha2", - "thiserror 1.0.61", - "tokio", - "webrtc-util", - "x25519-dalek", - "x509-parser", -] - [[package]] name = "dtoa" version = "0.4.8" @@ -2502,32 +1953,18 @@ dependencies = [ "cc", "hbb_common", "lazy_static", - "serde 1.0.228", + "serde 1.0.203", "serde_derive", "thiserror 1.0.61", ] -[[package]] -name = "ecdsa" -version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" -dependencies = [ - "der", - "digest", - "elliptic-curve", - "rfc6979", - "signature 2.2.0", - "spki", -] - [[package]] name = "ed25519" version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ - "signature 1.6.4", + "signature", ] [[package]] @@ -2536,39 +1973,17 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" -[[package]] -name = "elliptic-curve" -version = "0.13.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" -dependencies = [ - "base16ct", - "crypto-bigint", - "digest", - "ff", - "generic-array", - "group", - "hkdf", - "pem-rfc7468", - "pkcs8", - "rand_core 0.6.4", - "sec1", - "subtle", - "zeroize", -] - [[package]] name = "enigo" version = "0.0.14" dependencies = [ "core-graphics 0.22.3", "hbb_common", - "libxdo-sys", "log", "objc", "pkg-config", "rdev", - "serde 1.0.228", + "serde 1.0.203", "serde_derive", "tfc", "unicode-segmentation", @@ -2611,7 +2026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", - "serde 1.0.228", + "serde 1.0.203", ] [[package]] @@ -2689,9 +2104,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.14" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2761,7 +2176,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide 0.7.4", + "miniz_oxide", "rayon-core", "smallvec", "zune-inflate", @@ -2791,22 +2206,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "ff" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" -dependencies = [ - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "fiat-crypto" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - [[package]] name = "field-offset" version = "0.3.6" @@ -2819,8 +2218,9 @@ dependencies = [ [[package]] name = "filedescriptor" -version = "0.8.2" -source = "git+https://github.com/rustdesk-org/wezterm?branch=rustdesk/pty_based_0.8.1#80174f8009f41565f0fa8c66dab90d4f9211ae16" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e40758ed24c9b2eeb76c35fb0aebc66c626084edd827e07e1552279814c6682d" dependencies = [ "libc", "thiserror 1.0.61", @@ -2847,12 +2247,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.1.9" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", - "miniz_oxide 0.8.9", + "miniz_oxide", ] [[package]] @@ -2932,29 +2332,6 @@ dependencies = [ "libm", ] -[[package]] -name = "fontconfig-parser" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc773e24e02d4ddd8395fd30dc147524273a83e54e0f312d986ea30de5f5646" -dependencies = [ - "roxmltree", -] - -[[package]] -name = "fontdb" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "457e789b3d1202543297a350643cf459f836cade38934e7a4cf6a39e7cde2905" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2", - "slotmap", - "tinyvec", - "ttf-parser", -] - [[package]] name = "foreign-types" version = "0.3.2" @@ -3062,7 +2439,7 @@ dependencies = [ "nix 0.29.0", "page_size", "smallvec", - "zerocopy 0.8.26", + "zerocopy 0.8.14", ] [[package]] @@ -3275,7 +2652,6 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", - "zeroize", ] [[package]] @@ -3325,16 +2701,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "ghash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" -dependencies = [ - "opaque-debug", - "polyval", -] - [[package]] name = "gif" version = "0.13.1" @@ -3516,17 +2882,6 @@ dependencies = [ "system-deps 6.2.2", ] -[[package]] -name = "group" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" -dependencies = [ - "ff", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "gstreamer" version = "0.16.7" @@ -3728,7 +3083,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.8", + "ahash", ] [[package]] @@ -3748,12 +3103,10 @@ name = "hbb_common" version = "0.1.0" dependencies = [ "anyhow", - "async-recursion", "backtrace", "base64 0.22.1", "bytes", "chrono", - "clap 4.5.53", "confy", "default_net", "directories-next", @@ -3767,7 +3120,6 @@ dependencies = [ "httparse", "lazy_static", "libc", - "libloading 0.8.4", "log", "mac_address", "machine-uid", @@ -3776,14 +3128,12 @@ dependencies = [ "protobuf-codegen", "rand 0.8.5", "regex", - "rustls-native-certs", "rustls-pki-types", "rustls-platform-verifier", - "serde 1.0.228", + "serde 1.0.203", "serde_derive", "serde_json 1.0.118", "sha2", - "smithay-client-toolkit 0.20.0", "socket2 0.3.19", "sodiumoxide", "sysinfo", @@ -3791,19 +3141,15 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls", - "tokio-socks", + "tokio-socks 0.5.2-3", "tokio-tungstenite", "tokio-util", "toml 0.7.8", "tungstenite", "url", - "users 0.11.0", "uuid", - "webpki-roots 1.0.4", - "webrtc", "whoami", "winapi 0.3.9", - "x11 2.21.0", "zstd 0.13.1", ] @@ -3861,15 +3207,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac", -] - [[package]] name = "hmac" version = "0.12.1" @@ -3952,32 +3289,30 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwcodec" version = "0.7.1" -source = "git+https://github.com/rustdesk-org/hwcodec#398e5a8938dd8768ade0fcdc27ea80e8b4b38738" +source = "git+https://github.com/rustdesk-org/hwcodec#0ea7e709d3c48bb6446e33a9cc8fd0e0da5709b9" dependencies = [ "bindgen 0.59.2", "cc", "log", - "serde 1.0.228", + "serde 1.0.203", "serde_derive", "serde_json 1.0.118", ] [[package]] name = "hyper" -version = "1.7.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e" +checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" dependencies = [ - "atomic-waker", "bytes", "futures-channel", - "futures-core", + "futures-util", "http", "http-body", "httparse", "itoa 1.0.11", "pin-project-lite", - "pin-utils", "smallvec", "tokio", "want", @@ -3985,9 +3320,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.7" +version = "0.27.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" +checksum = "03a01595e11bdcec50946522c32dde3fc6914743000a68b93000965f2f02406d" dependencies = [ "http", "hyper", @@ -3998,7 +3333,7 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots 1.0.4", + "webpki-roots 1.0.0", ] [[package]] @@ -4019,21 +3354,17 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.17" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" +checksum = "cf9f1e950e0d9d1d3c47184416723cf29c0d1f93bd8cccf37e4beb6b44f31710" dependencies = [ - "base64 0.22.1", "bytes", "futures-channel", - "futures-core", "futures-util", "http", "http-body", "hyper", - "ipnet", "libc", - "percent-encoding", "pin-project-lite", "socket2 0.5.10", "tokio", @@ -4087,7 +3418,7 @@ dependencies = [ "gif", "jpeg-decoder", "num-traits 0.2.19", - "png 0.17.13", + "png", "qoi", "tiff", ] @@ -4101,7 +3432,7 @@ dependencies = [ "bytemuck", "byteorder", "num-traits 0.2.19", - "png 0.17.13", + "png", "tiff", ] @@ -4168,7 +3499,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "block-padding", "generic-array", ] @@ -4181,27 +3511,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "interceptor" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea51375727680dc15f06e8ad90fa31df75d79dd030100e8ad60eef1c27fe2c98" -dependencies = [ - "async-trait", - "bytes", - "futures", - "log", - "portable-atomic", - "rand 0.9.2", - "rtcp", - "rtp", - "thiserror 1.0.61", - "tokio", - "waitgroup", - "webrtc-srtp", - "webrtc-util", -] - [[package]] name = "io-lifetimes" version = "1.0.11" @@ -4224,19 +3533,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.11.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" - -[[package]] -name = "iri-string" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" -dependencies = [ - "memchr", - "serde 1.0.228", -] +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" @@ -4344,7 +3643,7 @@ dependencies = [ [[package]] name = "kcp-sys" version = "0.1.0" -source = "git+https://github.com/rustdesk-org/kcp-sys#32a6c09fc6223f54aea83981a6aa8995931d29be" +source = "git+https://github.com/rustdesk-org/kcp-sys#1e5e30ab8b8c2f7787ab0f88822de36476531562" dependencies = [ "anyhow", "auto_impl", @@ -4353,10 +3652,9 @@ dependencies = [ "bytes", "cc", "dashmap 6.1.0", - "log", "parking_lot", "rand 0.8.5", - "thiserror 2.0.17", + "thiserror 2.0.11", "tokio", "tokio-util", "tracing", @@ -4395,19 +3693,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ "bitflags 2.9.1", - "serde 1.0.228", + "serde 1.0.203", "unicode-segmentation", ] -[[package]] -name = "kurbo" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" -dependencies = [ - "arrayvec", -] - [[package]] name = "lazy_static" version = "1.5.0" @@ -4494,7 +3783,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if 1.0.0", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -4559,7 +3848,6 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.9.1", "libc", - "redox_syscall 0.5.2", ] [[package]] @@ -4595,8 +3883,11 @@ dependencies = [ [[package]] name = "libxdo-sys" version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db23b9e7e2b7831bbd8aac0bbeeeb7b68cbebc162b227e7052e8e55829a09212" dependencies = [ - "hbb_common", + "libc", + "x11 2.21.0", ] [[package]] @@ -4629,18 +3920,6 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" -[[package]] -name = "linux-raw-sys" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7" - -[[package]] -name = "linux-raw-sys" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" - [[package]] name = "lock_api" version = "0.4.12" @@ -4711,22 +3990,6 @@ dependencies = [ "libc", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if 1.0.0", - "digest", -] - [[package]] name = "md5" version = "0.7.0" @@ -4745,15 +4008,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memmap2" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843a98750cd611cc2965a8213b53b43e715f13c37a9e096c6408e69990961db7" -dependencies = [ - "libc", -] - [[package]] name = "memoffset" version = "0.6.5" @@ -4796,6 +4050,12 @@ dependencies = [ "objc", ] +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -4812,16 +4072,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "miniz_oxide" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" -dependencies = [ - "adler2", - "simd-adler32", -] - [[package]] name = "mio" version = "0.8.11" @@ -4872,23 +4122,21 @@ dependencies = [ [[package]] name = "muda" -version = "0.17.1" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c1738382f66ed56b3b9c8119e794a2e23148ac8ea214eda86622d4cb9d415a" +checksum = "86b959f97c97044e4c96e32e1db292a7d594449546a3c6b77ae613dc3a5b5145" dependencies = [ + "cocoa 0.25.0", "crossbeam-channel", "dpi", "gtk", "keyboard-types", "libxdo", - "objc2 0.6.4", - "objc2-app-kit 0.3.2", - "objc2-core-foundation", - "objc2-foundation 0.3.2", + "objc", "once_cell", - "png 0.17.13", - "thiserror 2.0.17", - "windows-sys 0.60.2", + "png", + "thiserror 1.0.61", + "windows-sys 0.52.0", ] [[package]] @@ -4972,21 +4220,6 @@ dependencies = [ "thiserror 1.0.61", ] -[[package]] -name = "ndk" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" -dependencies = [ - "bitflags 2.9.1", - "jni-sys", - "log", - "ndk-sys 0.6.0+11769913", - "num_enum 0.7.2", - "raw-window-handle 0.6.2", - "thiserror 1.0.61", -] - [[package]] name = "ndk-context" version = "0.1.1" @@ -5011,15 +4244,6 @@ dependencies = [ "jni-sys", ] -[[package]] -name = "ndk-sys" -version = "0.6.0+11769913" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" -dependencies = [ - "jni-sys", -] - [[package]] name = "netlink-packet-core" version = "0.5.0" @@ -5106,7 +4330,6 @@ dependencies = [ "cfg-if 1.0.0", "libc", "memoffset 0.7.1", - "pin-utils", ] [[package]] @@ -5137,7 +4360,7 @@ dependencies = [ [[package]] name = "nokhwa" version = "0.10.7" -source = "git+https://github.com/rustdesk-org/nokhwa.git?branch=fix_from_raw_parts#c2f74662b6ce117f7f94301693fdfadc0b1ec91a" +source = "git+https://github.com/rustdesk-org/nokhwa.git?branch=fix_from_raw_parts#f32e7d68be61db9b1e99016b24edb14543d0383b" dependencies = [ "flume", "image 0.25.1", @@ -5146,13 +4369,13 @@ dependencies = [ "nokhwa-bindings-windows", "nokhwa-core", "paste", - "thiserror 2.0.17", + "thiserror 2.0.11", ] [[package]] name = "nokhwa-bindings-linux" version = "0.1.1" -source = "git+https://github.com/rustdesk-org/nokhwa.git?branch=fix_from_raw_parts#c2f74662b6ce117f7f94301693fdfadc0b1ec91a" +source = "git+https://github.com/rustdesk-org/nokhwa.git?branch=fix_from_raw_parts#f32e7d68be61db9b1e99016b24edb14543d0383b" dependencies = [ "nokhwa-core", "v4l", @@ -5161,7 +4384,7 @@ dependencies = [ [[package]] name = "nokhwa-bindings-macos" version = "0.2.2" -source = "git+https://github.com/rustdesk-org/nokhwa.git?branch=fix_from_raw_parts#c2f74662b6ce117f7f94301693fdfadc0b1ec91a" +source = "git+https://github.com/rustdesk-org/nokhwa.git?branch=fix_from_raw_parts#f32e7d68be61db9b1e99016b24edb14543d0383b" dependencies = [ "block", "cocoa-foundation", @@ -5177,7 +4400,7 @@ dependencies = [ [[package]] name = "nokhwa-bindings-windows" version = "0.4.2" -source = "git+https://github.com/rustdesk-org/nokhwa.git?branch=fix_from_raw_parts#c2f74662b6ce117f7f94301693fdfadc0b1ec91a" +source = "git+https://github.com/rustdesk-org/nokhwa.git?branch=fix_from_raw_parts#f32e7d68be61db9b1e99016b24edb14543d0383b" dependencies = [ "dlopen", "lazy_static", @@ -5189,12 +4412,12 @@ dependencies = [ [[package]] name = "nokhwa-core" version = "0.1.5" -source = "git+https://github.com/rustdesk-org/nokhwa.git?branch=fix_from_raw_parts#c2f74662b6ce117f7f94301693fdfadc0b1ec91a" +source = "git+https://github.com/rustdesk-org/nokhwa.git?branch=fix_from_raw_parts#f32e7d68be61db9b1e99016b24edb14543d0383b" dependencies = [ "bytes", "image 0.25.1", "mozjpeg", - "thiserror 2.0.17", + "thiserror 2.0.11", ] [[package]] @@ -5432,16 +4655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys 0.3.5", - "objc2-encode 4.1.0", -] - -[[package]] -name = "objc2" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f" -dependencies = [ - "objc2-encode 4.1.0", + "objc2-encode 4.0.3", ] [[package]] @@ -5456,46 +4670,10 @@ dependencies = [ "objc2 0.5.2", "objc2-core-data", "objc2-core-image", - "objc2-foundation 0.2.2", + "objc2-foundation", "objc2-quartz-core", ] -[[package]] -name = "objc2-app-kit" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" -dependencies = [ - "bitflags 2.9.1", - "objc2 0.6.4", - "objc2-core-foundation", - "objc2-foundation 0.3.2", -] - -[[package]] -name = "objc2-cloud-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" -dependencies = [ - "bitflags 2.9.1", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-core-location", - "objc2-foundation 0.2.2", -] - -[[package]] -name = "objc2-contacts" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" -dependencies = [ - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation 0.2.2", -] - [[package]] name = "objc2-core-data" version = "0.2.2" @@ -5505,28 +4683,7 @@ dependencies = [ "bitflags 2.9.1", "block2 0.5.1", "objc2 0.5.2", - "objc2-foundation 0.2.2", -] - -[[package]] -name = "objc2-core-foundation" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" -dependencies = [ - "bitflags 2.9.1", - "dispatch2", - "objc2 0.6.4", -] - -[[package]] -name = "objc2-core-graphics" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" -dependencies = [ - "bitflags 2.9.1", - "objc2-core-foundation", + "objc2-foundation", ] [[package]] @@ -5537,22 +4694,10 @@ checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" dependencies = [ "block2 0.5.1", "objc2 0.5.2", - "objc2-foundation 0.2.2", + "objc2-foundation", "objc2-metal", ] -[[package]] -name = "objc2-core-location" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" -dependencies = [ - "block2 0.5.1", - "objc2 0.5.2", - "objc2-contacts", - "objc2-foundation 0.2.2", -] - [[package]] name = "objc2-encode" version = "2.0.0-pre.2" @@ -5564,9 +4709,9 @@ dependencies = [ [[package]] name = "objc2-encode" -version = "4.1.0" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" [[package]] name = "objc2-foundation" @@ -5576,35 +4721,10 @@ checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ "bitflags 2.9.1", "block2 0.5.1", - "dispatch", "libc", "objc2 0.5.2", ] -[[package]] -name = "objc2-foundation" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" -dependencies = [ - "bitflags 2.9.1", - "block2 0.6.2", - "objc2 0.6.4", - "objc2-core-foundation", -] - -[[package]] -name = "objc2-link-presentation" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" -dependencies = [ - "block2 0.5.1", - "objc2 0.5.2", - "objc2-app-kit 0.2.2", - "objc2-foundation 0.2.2", -] - [[package]] name = "objc2-metal" version = "0.2.2" @@ -5614,7 +4734,7 @@ dependencies = [ "bitflags 2.9.1", "block2 0.5.1", "objc2 0.5.2", - "objc2-foundation 0.2.2", + "objc2-foundation", ] [[package]] @@ -5626,65 +4746,10 @@ dependencies = [ "bitflags 2.9.1", "block2 0.5.1", "objc2 0.5.2", - "objc2-foundation 0.2.2", + "objc2-foundation", "objc2-metal", ] -[[package]] -name = "objc2-symbols" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" -dependencies = [ - "objc2 0.5.2", - "objc2-foundation 0.2.2", -] - -[[package]] -name = "objc2-ui-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" -dependencies = [ - "bitflags 2.9.1", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-cloud-kit", - "objc2-core-data", - "objc2-core-image", - "objc2-core-location", - "objc2-foundation 0.2.2", - "objc2-link-presentation", - "objc2-quartz-core", - "objc2-symbols", - "objc2-uniform-type-identifiers", - "objc2-user-notifications", -] - -[[package]] -name = "objc2-uniform-type-identifiers" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" -dependencies = [ - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation 0.2.2", -] - -[[package]] -name = "objc2-user-notifications" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" -dependencies = [ - "bitflags 2.9.1", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-core-location", - "objc2-foundation 0.2.2", -] - [[package]] name = "objc_exception" version = "0.1.2" @@ -5735,27 +4800,12 @@ dependencies = [ "cc", ] -[[package]] -name = "oid-registry" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9" -dependencies = [ - "asn1-rs", -] - [[package]] name = "once_cell" version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "opaque-debug" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" - [[package]] name = "openssl" version = "0.10.68" @@ -5788,15 +4838,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-src" -version = "300.5.3+3.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6bad8cd0233b63971e232cc9c5e83039375b8586d2312f31fda85db8f888c2" -dependencies = [ - "cc", -] - [[package]] name = "openssl-sys" version = "0.9.104" @@ -5805,7 +4846,6 @@ checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] @@ -5816,15 +4856,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" -[[package]] -name = "orbclient" -version = "0.3.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba0b26cec2e24f08ed8bb31519a9333140a6599b867dac464bb150bdb796fd43" -dependencies = [ - "libredox", -] - [[package]] name = "ordered-multimap" version = "0.4.3" @@ -5864,7 +4895,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" dependencies = [ "log", - "serde 1.0.228", + "serde 1.0.203", "windows-sys 0.52.0", ] @@ -5884,7 +4915,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38731fa859ef679f1aec66ca9562165926b442f298467f76f5990f431efe87dc" dependencies = [ - "serde 1.0.228", + "serde 1.0.203", "serde_derive", "serde_json 1.0.118", ] @@ -5895,39 +4926,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "owned_ttf_parser" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36820e9051aca1014ddc75770aab4d68bc1e9e632f0f5627c4086bc216fb583b" -dependencies = [ - "ttf-parser", -] - -[[package]] -name = "p256" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "p384" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - [[package]] name = "page_size" version = "0.6.0" @@ -5996,8 +4994,8 @@ dependencies = [ [[package]] name = "parity-tokio-ipc" -version = "0.7.3-6" -source = "git+https://github.com/rustdesk-org/parity-tokio-ipc#d0ae39bffe5d5a3e8d82a1b6bcb1ca5a9b2f1c01" +version = "0.7.3-5" +source = "git+https://github.com/rustdesk-org/parity-tokio-ipc#c8c8bbcbabf9be1201c53afb0269b92b9b02d291" dependencies = [ "futures", "libc", @@ -6033,7 +5031,7 @@ dependencies = [ "libc", "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -6071,25 +5069,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" -[[package]] -name = "pem" -version = "3.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" -dependencies = [ - "base64 0.22.1", - "serde_core", -] - -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - [[package]] name = "percent-encoding" version = "2.3.1" @@ -6112,16 +5091,7 @@ version = "0.7.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" dependencies = [ - "phf_shared 0.7.24", -] - -[[package]] -name = "phf" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" -dependencies = [ - "phf_shared 0.11.3", + "phf_shared", ] [[package]] @@ -6130,18 +5100,8 @@ version = "0.7.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" dependencies = [ - "phf_generator 0.7.24", - "phf_shared 0.7.24", -] - -[[package]] -name = "phf_codegen" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" -dependencies = [ - "phf_generator 0.11.3", - "phf_shared 0.11.3", + "phf_generator", + "phf_shared", ] [[package]] @@ -6150,61 +5110,17 @@ version = "0.7.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" dependencies = [ - "phf_shared 0.7.24", + "phf_shared", "rand 0.6.5", ] -[[package]] -name = "phf_generator" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" -dependencies = [ - "phf_shared 0.11.3", - "rand 0.8.5", -] - [[package]] name = "phf_shared" version = "0.7.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" dependencies = [ - "siphasher 0.2.3", -] - -[[package]] -name = "phf_shared" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" -dependencies = [ - "siphasher 1.0.1", -] - -[[package]] -name = "piet" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e381186490a3e2017a506d62b759ea8eaf4be14666b13ed53973e8ae193451b1" -dependencies = [ - "kurbo", - "unic-bidi", -] - -[[package]] -name = "piet-coregraphics" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a819b41d2ddb1d8abf3e45e49422f866cba281b4abb5e2fb948bba06e2c3d3f7" -dependencies = [ - "associative-cache", - "core-foundation 0.9.4", - "core-foundation-sys 0.8.7", - "core-graphics 0.22.3", - "core-text", - "foreign-types 0.3.2", - "piet", + "siphasher", ] [[package]] @@ -6250,16 +5166,6 @@ dependencies = [ "futures-io", ] -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - [[package]] name = "pkg-config" version = "0.3.30" @@ -6276,7 +5182,7 @@ dependencies = [ "indexmap", "line-wrap", "quick-xml 0.31.0", - "serde 1.0.228", + "serde 1.0.203", "time 0.3.36", ] @@ -6290,20 +5196,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.4", -] - -[[package]] -name = "png" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61" -dependencies = [ - "bitflags 2.9.1", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide 0.8.9", + "miniz_oxide", ] [[package]] @@ -6337,39 +5230,11 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "poly1305" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" -dependencies = [ - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "polyval" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "portable-atomic" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" - [[package]] name = "portable-pty" version = "0.8.1" -source = "git+https://github.com/rustdesk-org/wezterm?branch=rustdesk/pty_based_0.8.1#80174f8009f41565f0fa8c66dab90d4f9211ae16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806ee80c2a03dbe1a9fb9534f8d19e4c0546b790cde8fd1fea9d6390644cb0be" dependencies = [ "anyhow", "bitflags 1.3.2", @@ -6423,15 +5288,6 @@ dependencies = [ "num-integer", ] -[[package]] -name = "primeorder" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" -dependencies = [ - "elliptic-curve", -] - [[package]] name = "proc-macro-crate" version = "0.1.5" @@ -6614,18 +5470,18 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.37.5" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" dependencies = [ "memchr", ] [[package]] name = "quinn" -version = "0.11.9" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8" dependencies = [ "bytes", "cfg_aliases 0.2.1", @@ -6635,7 +5491,7 @@ dependencies = [ "rustc-hash 2.1.1", "rustls", "socket2 0.5.10", - "thiserror 2.0.17", + "thiserror 2.0.11", "tokio", "tracing", "web-time", @@ -6643,20 +5499,20 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.13" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" +checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e" dependencies = [ "bytes", "getrandom 0.3.2", "lru-slab", - "rand 0.9.2", + "rand 0.9.0", "ring", "rustc-hash 2.1.1", "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.17", + "thiserror 2.0.11", "tinyvec", "tracing", "web-time", @@ -6664,9 +5520,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.14" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" +checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842" dependencies = [ "cfg_aliases 0.2.1", "libc", @@ -6738,12 +5594,13 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", + "zerocopy 0.8.14", ] [[package]] @@ -6903,20 +5760,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rcgen" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2" -dependencies = [ - "pem", - "ring", - "rustls-pki-types", - "time 0.3.36", - "x509-parser", - "yasna", -] - [[package]] name = "rdev" version = "0.5.0-2" @@ -6988,17 +5831,6 @@ dependencies = [ "thiserror 1.0.61", ] -[[package]] -name = "redox_users" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" -dependencies = [ - "getrandom 0.2.15", - "libredox", - "thiserror 2.0.17", -] - [[package]] name = "regex" version = "1.11.1" @@ -7049,9 +5881,8 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" +version = "0.12.15" +source = "git+https://github.com/rustdesk-org/reqwest#9e859438203a71eb86ddc294fbebfde14cba7f7c" dependencies = [ "async-compression", "base64 0.22.1", @@ -7066,41 +5897,36 @@ dependencies = [ "hyper-rustls", "hyper-tls", "hyper-util", + "ipnet", "js-sys", "log", + "mime", "native-tls", + "once_cell", "percent-encoding", "pin-project-lite", "quinn", "rustls", "rustls-native-certs", + "rustls-pemfile", "rustls-pki-types", - "serde 1.0.228", + "serde 1.0.203", "serde_json 1.0.118", "serde_urlencoded", "sync_wrapper", "tokio", "tokio-native-tls", "tokio-rustls", + "tokio-socks 0.5.2", "tokio-util", "tower", - "tower-http", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 1.0.4", -] - -[[package]] -name = "rfc6979" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" -dependencies = [ - "hmac", - "subtle", + "webpki-roots 0.26.9", + "windows-registry", ] [[package]] @@ -7135,12 +5961,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "roxmltree" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" - [[package]] name = "rpassword" version = "2.1.0" @@ -7163,17 +5983,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "rtcp" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d30d1c4091644431c22acf9f8be6191b56805e0e977f15ca7104b4a6d6eaec" -dependencies = [ - "bytes", - "thiserror 1.0.61", - "webrtc-util", -] - [[package]] name = "rtoolbox" version = "0.0.2" @@ -7184,21 +5993,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "rtp" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f126f38ea84c02480e32e547c1459a939052f74fb92117ac3eef23fdac6b023" -dependencies = [ - "bytes", - "memchr", - "portable-atomic", - "rand 0.9.2", - "serde 1.0.228", - "thiserror 1.0.61", - "webrtc-util", -] - [[package]] name = "rubato" version = "0.12.0" @@ -7270,20 +6064,19 @@ dependencies = [ [[package]] name = "rustdesk" -version = "1.4.6" +version = "1.4.0" dependencies = [ "android-wakelock", "android_logger", "arboard", "async-process", "async-trait", - "bytemuck", "bytes", "cc", "cfg-if 1.0.0", "chrono", "cidr-utils", - "clap 4.5.53", + "clap 4.5.8", "clipboard", "clipboard-master", "cocoa 0.24.1", @@ -7303,8 +6096,6 @@ dependencies = [ "evdev", "flutter_rust_bridge", "fon", - "fontdb", - "foreign-types 0.3.2", "fruitbasket", "gtk", "hbb_common", @@ -7317,9 +6108,9 @@ dependencies = [ "kcp-sys", "keepawake", "lazy_static", + "libloading 0.8.4", "libpulse-binding", "libpulse-simple-binding", - "libxdo-sys", "mac_address", "magnum-opus", "nix 0.29.0", @@ -7327,13 +6118,10 @@ dependencies = [ "objc", "objc_id", "once_cell", - "openssl", "os-version", "pam", "parity-tokio-ipc", "percent-encoding", - "piet", - "piet-coregraphics", "portable-pty", "qrcode-generator", "rdev", @@ -7348,33 +6136,29 @@ dependencies = [ "samplerate", "sciter-rs", "scrap", - "serde 1.0.228", + "serde 1.0.203", "serde_derive", "serde_json 1.0.118", "serde_repr", "sha2", "shared_memory", "shutdown_hooks", - "softbuffer", "stunclient", "sys-locale", "system_shutdown", "tao", "tauri-winrt-notification", - "terminfo", "termios 0.3.3", - "tiny-skia", "totp-rs", "tray-icon", - "ttf-parser", "url", + "users 0.11.0", "uuid", "virtual_display", "wallpaper", "winapi 0.3.9", "windows 0.61.1", "windows-service", - "winit", "winreg 0.11.0", "winres", "wol-rs", @@ -7385,14 +6169,13 @@ dependencies = [ [[package]] name = "rustdesk-portable-packer" -version = "1.4.6" +version = "1.4.0" dependencies = [ "brotli", "dirs 5.0.1", "md5", "native-windows-gui", "winapi 0.3.9", - "windows 0.61.1", "winres", ] @@ -7411,15 +6194,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "rusticata-macros" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -dependencies = [ - "nom", -] - [[package]] name = "rustix" version = "0.37.27" @@ -7447,24 +6221,11 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rustix" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" -dependencies = [ - "bitflags 2.9.1", - "errno", - "libc", - "linux-raw-sys 0.11.0", - "windows-sys 0.52.0", -] - [[package]] name = "rustls" -version = "0.23.28" +version = "0.23.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7160e3e10bf4535308537f3c4e1641468cd0e485175d6163087c0393c7d46643" +checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0" dependencies = [ "log", "once_cell", @@ -7484,7 +6245,16 @@ dependencies = [ "openssl-probe", "rustls-pki-types", "schannel", - "security-framework 3.5.1", + "security-framework 3.2.0", +] + +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", ] [[package]] @@ -7498,11 +6268,11 @@ dependencies = [ [[package]] name = "rustls-platform-verifier" -version = "0.6.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784" +checksum = "4a5467026f437b4cb2a533865eaa73eb840019a0916f4b9ec563c6e617e086c9" dependencies = [ - "core-foundation 0.10.1", + "core-foundation 0.10.0", "core-foundation-sys 0.8.7", "jni", "log", @@ -7511,7 +6281,7 @@ dependencies = [ "rustls-native-certs", "rustls-platform-verifier-android", "rustls-webpki", - "security-framework 3.5.1", + "security-framework 3.2.0", "security-framework-sys", "webpki-root-certs", "windows-sys 0.52.0", @@ -7519,15 +6289,15 @@ dependencies = [ [[package]] name = "rustls-platform-verifier-android" -version = "0.1.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" +checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" [[package]] name = "rustls-webpki" -version = "0.103.3" +version = "0.103.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435" +checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03" dependencies = [ "ring", "rustls-pki-types", @@ -7621,52 +6391,12 @@ dependencies = [ "pkg-config", "quest", "repng", - "serde 1.0.228", + "serde 1.0.203", "serde_json 1.0.118", "target_build_utils", "tracing", "webm", "winapi 0.3.9", - "zbus", -] - -[[package]] -name = "sctk-adwaita" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" -dependencies = [ - "ab_glyph", - "log", - "memmap2", - "smithay-client-toolkit 0.19.2", - "tiny-skia", -] - -[[package]] -name = "sdp" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32c374dceda16965d541c8800ce9cc4e1c14acfd661ddf7952feeedc3411e5c6" -dependencies = [ - "rand 0.9.2", - "substring", - "thiserror 1.0.61", - "url", -] - -[[package]] -name = "sec1" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" -dependencies = [ - "base16ct", - "der", - "generic-array", - "pkcs8", - "subtle", - "zeroize", ] [[package]] @@ -7684,12 +6414,12 @@ dependencies = [ [[package]] name = "security-framework" -version = "3.5.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" +checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" dependencies = [ "bitflags 2.9.1", - "core-foundation 0.10.1", + "core-foundation 0.10.0", "core-foundation-sys 0.8.7", "libc", "security-framework-sys", @@ -7697,9 +6427,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.15.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys 0.8.7", "libc", @@ -7719,28 +6449,18 @@ checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" [[package]] name = "serde" -version = "1.0.228" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" -dependencies = [ - "serde_core", - "serde_derive", -] - -[[package]] -name = "serde_core" -version = "1.0.228" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.228" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2 1.0.93", "quote 1.0.36", @@ -7767,7 +6487,7 @@ checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ "itoa 1.0.11", "ryu", - "serde 1.0.228", + "serde 1.0.203", ] [[package]] @@ -7787,7 +6507,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ - "serde 1.0.228", + "serde 1.0.203", ] [[package]] @@ -7799,7 +6519,7 @@ dependencies = [ "form_urlencoded", "itoa 1.0.11", "ryu", - "serde 1.0.228", + "serde 1.0.203", ] [[package]] @@ -7944,16 +6664,6 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core 0.6.4", -] - [[package]] name = "simd-adler32" version = "0.3.7" @@ -7966,12 +6676,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - [[package]] name = "slab" version = "0.4.9" @@ -7981,81 +6685,11 @@ dependencies = [ "autocfg 1.3.0", ] -[[package]] -name = "slotmap" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" -dependencies = [ - "version_check", -] - [[package]] name = "smallvec" -version = "1.15.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" - -[[package]] -name = "smithay-client-toolkit" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" -dependencies = [ - "bitflags 2.9.1", - "calloop 0.13.0", - "calloop-wayland-source 0.3.0", - "cursor-icon", - "libc", - "log", - "memmap2", - "rustix 0.38.34", - "thiserror 1.0.61", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols", - "wayland-protocols-wlr", - "wayland-scanner", - "xkeysym", -] - -[[package]] -name = "smithay-client-toolkit" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0" -dependencies = [ - "bitflags 2.9.1", - "calloop 0.14.3", - "calloop-wayland-source 0.4.1", - "cursor-icon", - "libc", - "log", - "memmap2", - "rustix 1.1.2", - "thiserror 2.0.17", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols", - "wayland-protocols-experimental", - "wayland-protocols-misc", - "wayland-protocols-wlr", - "wayland-scanner", - "xkeysym", -] - -[[package]] -name = "smol_str" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" -dependencies = [ - "serde 1.0.228", -] +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -8097,40 +6731,7 @@ dependencies = [ "ed25519", "libc", "libsodium-sys", - "serde 1.0.228", -] - -[[package]] -name = "softbuffer" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d623bff5d06f60d738990980d782c8c866997d9194cfe79ecad00aa2f76826dd" -dependencies = [ - "as-raw-xcb-connection", - "bytemuck", - "cfg_aliases 0.2.1", - "core-graphics 0.23.2", - "drm", - "fastrand 2.1.0", - "foreign-types 0.5.0", - "js-sys", - "log", - "memmap2", - "objc2 0.5.2", - "objc2-app-kit 0.2.2", - "objc2-foundation 0.2.2", - "objc2-quartz-core", - "raw-window-handle 0.6.2", - "redox_syscall 0.5.2", - "rustix 0.38.34", - "tiny-xlib", - "wasm-bindgen", - "wayland-backend", - "wayland-client", - "wayland-sys", - "web-sys", - "windows-sys 0.52.0", - "x11rb 0.13.1", + "serde 1.0.203", ] [[package]] @@ -8142,16 +6743,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -8164,12 +6755,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" -[[package]] -name = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" - [[package]] name = "strsim" version = "0.8.0" @@ -8225,25 +6810,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "stun" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a512c5d501e3e3b5a4bb3e8e31462d56d54a66b95a28b8596e14422bf21c32b" -dependencies = [ - "base64 0.22.1", - "crc", - "lazy_static", - "md-5", - "rand 0.9.2", - "ring", - "subtle", - "thiserror 1.0.61", - "tokio", - "url", - "webrtc-util", -] - [[package]] name = "stun_codec" version = "0.3.5" @@ -8271,15 +6837,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "substring" -version = "1.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" -dependencies = [ - "autocfg 1.3.0", -] - [[package]] name = "subtle" version = "2.6.1" @@ -8328,17 +6885,6 @@ dependencies = [ "futures-core", ] -[[package]] -name = "synstructure" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.36", - "syn 2.0.98", -] - [[package]] name = "sys-locale" version = "0.3.1" @@ -8448,7 +6994,7 @@ dependencies = [ "objc", "once_cell", "parking_lot", - "png 0.17.13", + "png", "raw-window-handle 0.6.2", "scopeguard", "tao-macros", @@ -8489,8 +7035,8 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "013d134ae4a25ee744ad6129db589018558f620ddfa44043887cdd45fa08e75c" dependencies = [ - "phf 0.7.24", - "phf_codegen 0.7.24", + "phf", + "phf_codegen", "serde_json 0.9.10", ] @@ -8525,19 +7071,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "terminfo" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f" -dependencies = [ - "dirs 4.0.0", - "fnv", - "nom", - "phf 0.11.3", - "phf_codegen 0.11.3", -] - [[package]] name = "termios" version = "0.2.2" @@ -8588,11 +7121,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.17" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" dependencies = [ - "thiserror-impl 2.0.17", + "thiserror-impl 2.0.11", ] [[package]] @@ -8608,9 +7141,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.17" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2 1.0.93", "quote 1.0.36", @@ -8670,7 +7203,7 @@ dependencies = [ "num-conv", "num_threads", "powerfmt", - "serde 1.0.228", + "serde 1.0.203", "time-core", "time-macros", ] @@ -8691,45 +7224,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "tiny-skia" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if 1.0.0", - "log", - "png 0.17.13", - "tiny-skia-path", -] - -[[package]] -name = "tiny-skia-path" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tiny-xlib" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0324504befd01cab6e0c994f34b2ffa257849ee019d3fb3b64fb2c858887d89e" -dependencies = [ - "as-raw-xcb-connection", - "ctor-lite", - "libloading 0.8.4", - "pkg-config", - "tracing", -] - [[package]] name = "tinyvec" version = "1.6.1" @@ -8806,11 +7300,23 @@ dependencies = [ "futures-sink", "futures-util", "pin-project", - "thiserror 2.0.17", + "thiserror 2.0.11", "tokio", "tokio-util", ] +[[package]] +name = "tokio-socks" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" +dependencies = [ + "either", + "futures-util", + "thiserror 1.0.61", + "tokio", +] + [[package]] name = "tokio-tungstenite" version = "0.26.2" @@ -8853,7 +7359,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.228", + "serde 1.0.203", ] [[package]] @@ -8862,7 +7368,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ - "serde 1.0.228", + "serde 1.0.203", "serde_spanned", "toml_datetime", "toml_edit 0.19.15", @@ -8874,7 +7380,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ - "serde 1.0.228", + "serde 1.0.203", "serde_spanned", "toml_datetime", "toml_edit 0.20.2", @@ -8886,7 +7392,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ - "serde 1.0.228", + "serde 1.0.203", ] [[package]] @@ -8896,7 +7402,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", - "serde 1.0.228", + "serde 1.0.203", "serde_spanned", "toml_datetime", "winnow", @@ -8909,7 +7415,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ "indexmap", - "serde 1.0.228", + "serde 1.0.203", "serde_spanned", "toml_datetime", "winnow", @@ -8946,24 +7452,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "tower-http" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" -dependencies = [ - "bitflags 2.9.1", - "bytes", - "futures-util", - "http", - "http-body", - "iri-string", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", -] - [[package]] name = "tower-layer" version = "0.3.3" @@ -8982,7 +7470,6 @@ version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -9075,22 +7562,21 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.21.3" -source = "git+https://github.com/tauri-apps/tray-icon#0a5835b0e6828e37a1f781de9c2d671ae7a939e6" +version = "0.14.3" +source = "git+https://github.com/tauri-apps/tray-icon#d4078696edba67b0ab42cef67e6a421a0332c96f" dependencies = [ + "core-graphics 0.23.2", "crossbeam-channel", - "dirs 6.0.0", + "dirs 5.0.1", "libappindicator", "muda", - "objc2 0.6.4", - "objc2-app-kit 0.3.2", - "objc2-core-foundation", - "objc2-core-graphics", - "objc2-foundation 0.3.2", + "objc2 0.5.2", + "objc2-app-kit", + "objc2-foundation", "once_cell", - "png 0.18.1", - "thiserror 2.0.17", - "windows-sys 0.60.2", + "png", + "thiserror 1.0.61", + "windows-sys 0.52.0", ] [[package]] @@ -9113,15 +7599,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "ttf-parser" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" -dependencies = [ - "core_maths", -] - [[package]] name = "tungstenite" version = "0.26.2" @@ -9134,37 +7611,16 @@ dependencies = [ "httparse", "log", "native-tls", - "rand 0.9.2", + "rand 0.9.0", "rustls", "rustls-native-certs", "rustls-pki-types", "sha1", - "thiserror 2.0.17", + "thiserror 2.0.11", "utf-8", "webpki-roots 0.26.9", ] -[[package]] -name = "turn" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ed995882f66ab94238de77c62e5e778389698ab700afa4696f4754da8f457cb" -dependencies = [ - "async-trait", - "base64 0.22.1", - "futures", - "log", - "md-5", - "portable-atomic", - "rand 0.9.2", - "ring", - "stun", - "thiserror 1.0.61", - "tokio", - "tokio-util", - "webrtc-util", -] - [[package]] name = "typenum" version = "1.17.0" @@ -9231,63 +7687,6 @@ dependencies = [ "libc", ] -[[package]] -name = "unic-bidi" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1356b759fb6a82050666f11dce4b6fe3571781f1449f3ef78074e408d468ec09" -dependencies = [ - "matches", - "unic-ucd-bidi", -] - -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-ucd-bidi" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1d568b51222484e1f8209ce48caa6b430bf352962b877d592c29ab31fb53d8c" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] - -[[package]] -name = "unicase" -version = "2.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" - [[package]] name = "unicode-bidi" version = "0.3.15" @@ -9333,16 +7732,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -[[package]] -name = "universal-hash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] - [[package]] name = "untrusted" version = "0.9.0" @@ -9358,7 +7747,7 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde 1.0.228", + "serde 1.0.203", ] [[package]] @@ -9487,15 +7876,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "waitgroup" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292" -dependencies = [ - "atomic-waker", -] - [[package]] name = "waker-fn" version = "1.2.0" @@ -9589,13 +7969,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.50" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if 1.0.0", "js-sys", - "once_cell", "wasm-bindgen", "web-sys", ] @@ -9634,13 +8013,13 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.11" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35" +checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" dependencies = [ "cc", "downcast-rs", - "rustix 1.1.2", + "rustix 0.38.34", "scoped-tls", "smallvec", "wayland-sys", @@ -9648,43 +8027,21 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d" -dependencies = [ - "bitflags 2.9.1", - "rustix 1.1.2", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-csd-frame" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" -dependencies = [ - "bitflags 2.9.1", - "cursor-icon", - "wayland-backend", -] - -[[package]] -name = "wayland-cursor" version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef9489a8df197ebf3a8ce8a7a7f0a2320035c3743f3c1bd0bdbccf07ce64f95" +checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" dependencies = [ + "bitflags 2.9.1", "rustix 0.38.34", - "wayland-client", - "xcursor", + "wayland-backend", + "wayland-scanner", ] [[package]] name = "wayland-protocols" -version = "0.32.9" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901" +checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa" dependencies = [ "bitflags 2.9.1", "wayland-backend", @@ -9692,45 +8049,6 @@ dependencies = [ "wayland-scanner", ] -[[package]] -name = "wayland-protocols-experimental" -version = "20250721.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a1f863128dcaaec790d7b4b396cc9b9a7a079e878e18c47e6c2d2c5a8dcbb1" -dependencies = [ - "bitflags 2.9.1", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-misc" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfe33d551eb8bffd03ff067a8b44bb963919157841a99957151299a6307d19c" -dependencies = [ - "bitflags 2.9.1", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-plasma" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4" -dependencies = [ - "bitflags 2.9.1", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - [[package]] name = "wayland-protocols-wlr" version = "0.3.3" @@ -9746,32 +8064,31 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.7" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3" +checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" dependencies = [ "proc-macro2 1.0.93", - "quick-xml 0.37.5", + "quick-xml 0.34.0", "quote 1.0.36", ] [[package]] name = "wayland-sys" -version = "0.31.7" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142" +checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" dependencies = [ "dlib", "log", - "once_cell", "pkg-config", ] [[package]] name = "web-sys" -version = "0.3.77" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -9805,9 +8122,9 @@ dependencies = [ [[package]] name = "webpki-root-certs" -version = "1.0.3" +version = "0.26.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d651ec480de84b762e7be71e6efa7461699c19d9e2c272c8d93455f567786e" +checksum = "09aed61f5e8d2c18344b3faa33a4c837855fe56642757754775548fee21386c4" dependencies = [ "rustls-pki-types", ] @@ -9823,182 +8140,13 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "1.0.4" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" +checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb" dependencies = [ "rustls-pki-types", ] -[[package]] -name = "webrtc" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08fd686c0920ac08f3a57eacc48e31f0e4ca1ffefba4478784606f78c14e83ad" -dependencies = [ - "arc-swap", - "async-trait", - "bytes", - "dtls", - "hex", - "interceptor", - "lazy_static", - "log", - "portable-atomic", - "rand 0.9.2", - "rcgen", - "regex", - "ring", - "rtcp", - "rtp", - "sdp", - "serde 1.0.228", - "serde_json 1.0.118", - "sha2", - "smol_str", - "stun", - "thiserror 1.0.61", - "tokio", - "turn", - "unicase", - "url", - "waitgroup", - "webrtc-data", - "webrtc-ice", - "webrtc-mdns", - "webrtc-media", - "webrtc-sctp", - "webrtc-srtp", - "webrtc-util", -] - -[[package]] -name = "webrtc-data" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062a5438d63bb0756a221693d76cc0dd6119affee1dfdfe57abe3a2a8c8b3eea" -dependencies = [ - "bytes", - "log", - "portable-atomic", - "thiserror 1.0.61", - "tokio", - "webrtc-sctp", - "webrtc-util", -] - -[[package]] -name = "webrtc-ice" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cb13fd1a373e68addc4bba0c8ca058627518e54342583d024bdcbb8ae5d97d" -dependencies = [ - "arc-swap", - "async-trait", - "crc", - "log", - "portable-atomic", - "rand 0.9.2", - "serde 1.0.228", - "serde_json 1.0.118", - "stun", - "thiserror 1.0.61", - "tokio", - "turn", - "url", - "uuid", - "waitgroup", - "webrtc-mdns", - "webrtc-util", -] - -[[package]] -name = "webrtc-mdns" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17279a067e75df72ce923fdeb7f04cd808f6f5aa4910dc6bcb4fbe66b396ace" -dependencies = [ - "log", - "socket2 0.5.10", - "thiserror 1.0.61", - "tokio", - "webrtc-util", -] - -[[package]] -name = "webrtc-media" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a84c910fec0848fd5a0d8a5651e0ddbdedaf25a7d3ae3f0b15f71ac73a1773" -dependencies = [ - "byteorder", - "bytes", - "rand 0.9.2", - "rtp", - "thiserror 1.0.61", -] - -[[package]] -name = "webrtc-sctp" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f985465467d8910c1f8ac4382cd64f83b1f6a1a75021a82b221546f6fb3b856f" -dependencies = [ - "arc-swap", - "async-trait", - "bytes", - "crc", - "log", - "portable-atomic", - "rand 0.9.2", - "thiserror 1.0.61", - "tokio", - "webrtc-util", -] - -[[package]] -name = "webrtc-srtp" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d8cdc33413f1d0192670a80ce93d17cb78d57fe3a2414be30d6f6dff121123" -dependencies = [ - "aead", - "aes", - "aes-gcm", - "byteorder", - "bytes", - "ctr", - "hmac", - "log", - "rtcp", - "rtp", - "sha1", - "subtle", - "thiserror 1.0.61", - "tokio", - "webrtc-util", -] - -[[package]] -name = "webrtc-util" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c0c7e0c8f280f2bbfae442701465777ac07adaf46ce0c5863cd58e13fe472a" -dependencies = [ - "async-trait", - "bitflags 1.3.2", - "bytes", - "ipnet", - "lazy_static", - "log", - "nix 0.26.4", - "portable-atomic", - "rand 0.9.2", - "thiserror 1.0.61", - "tokio", - "winapi 0.3.9", -] - [[package]] name = "weezl" version = "0.1.8" @@ -10173,7 +8321,7 @@ dependencies = [ "windows-core 0.52.0", "windows-implement 0.52.0", "windows-interface 0.52.0", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -10183,7 +8331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ "windows-core 0.54.0", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -10195,7 +8343,7 @@ dependencies = [ "windows-collections", "windows-core 0.61.0", "windows-future", - "windows-link 0.1.1", + "windows-link", "windows-numerics", ] @@ -10223,7 +8371,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -10233,7 +8381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ "windows-result 0.1.2", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -10244,7 +8392,7 @@ checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" dependencies = [ "windows-implement 0.60.0", "windows-interface 0.59.1", - "windows-link 0.1.1", + "windows-link", "windows-result 0.3.2", "windows-strings 0.4.0", ] @@ -10256,7 +8404,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32" dependencies = [ "windows-core 0.61.0", - "windows-link 0.1.1", + "windows-link", ] [[package]] @@ -10309,12 +8457,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" -[[package]] -name = "windows-link" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" - [[package]] name = "windows-numerics" version = "0.2.0" @@ -10322,7 +8464,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" dependencies = [ "windows-core 0.61.0", - "windows-link 0.1.1", + "windows-link", +] + +[[package]] +name = "windows-registry" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" +dependencies = [ + "windows-result 0.3.2", + "windows-strings 0.3.1", + "windows-targets 0.53.0", ] [[package]] @@ -10331,7 +8484,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -10340,7 +8493,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" dependencies = [ - "windows-link 0.1.1", + "windows-link", ] [[package]] @@ -10360,7 +8513,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" dependencies = [ - "windows-link 0.1.1", + "windows-link", ] [[package]] @@ -10369,7 +8522,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" dependencies = [ - "windows-link 0.1.1", + "windows-link", ] [[package]] @@ -10396,25 +8549,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", -] - -[[package]] -name = "windows-sys" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" -dependencies = [ - "windows-link 0.2.1", + "windows-targets 0.52.5", ] [[package]] @@ -10449,35 +8584,34 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm 0.52.5", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] name = "windows-targets" -version = "0.53.5" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" dependencies = [ - "windows-link 0.2.1", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", ] [[package]] @@ -10486,7 +8620,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -10512,15 +8646,15 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_gnullvm" -version = "0.53.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" [[package]] name = "windows_aarch64_msvc" @@ -10548,15 +8682,15 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_aarch64_msvc" -version = "0.53.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" [[package]] name = "windows_i686_gnu" @@ -10584,27 +8718,27 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" [[package]] name = "windows_i686_gnu" -version = "0.53.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" [[package]] name = "windows_i686_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_gnullvm" -version = "0.53.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" [[package]] name = "windows_i686_msvc" @@ -10632,15 +8766,15 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_i686_msvc" -version = "0.53.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" [[package]] name = "windows_x86_64_gnu" @@ -10668,15 +8802,15 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnu" -version = "0.53.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" [[package]] name = "windows_x86_64_gnullvm" @@ -10692,15 +8826,15 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_gnullvm" -version = "0.53.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" [[package]] name = "windows_x86_64_msvc" @@ -10728,67 +8862,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "windows_x86_64_msvc" -version = "0.53.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - -[[package]] -name = "winit" -version = "0.30.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a809eacf18c8eca8b6635091543f02a5a06ddf3dad846398795460e6e0ae3cc0" -dependencies = [ - "ahash 0.8.12", - "android-activity", - "atomic-waker", - "bitflags 2.9.1", - "block2 0.5.1", - "bytemuck", - "calloop 0.13.0", - "cfg_aliases 0.2.1", - "concurrent-queue", - "core-foundation 0.9.4", - "core-graphics 0.23.2", - "cursor-icon", - "dpi", - "js-sys", - "libc", - "memmap2", - "ndk 0.9.0", - "objc2 0.5.2", - "objc2-app-kit 0.2.2", - "objc2-foundation 0.2.2", - "objc2-ui-kit", - "orbclient", - "percent-encoding", - "pin-project", - "raw-window-handle 0.6.2", - "redox_syscall 0.4.1", - "rustix 0.38.34", - "sctk-adwaita", - "smithay-client-toolkit 0.19.2", - "smol_str", - "tracing", - "unicode-segmentation", - "wasm-bindgen", - "wasm-bindgen-futures", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-plasma", - "web-sys", - "web-time", - "windows-sys 0.52.0", - "x11-dl", - "x11rb 0.13.1", - "xkbcommon-dl", -] +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "winnow" @@ -10937,11 +9019,7 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ - "as-raw-xcb-connection", "gethostname 0.4.3", - "libc", - "libloading 0.8.4", - "once_cell", "rustix 0.38.34", "x11rb-protocol 0.13.1", ] @@ -10961,36 +9039,6 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" -[[package]] -name = "x25519-dalek" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" -dependencies = [ - "curve25519-dalek", - "rand_core 0.6.4", - "serde 1.0.228", - "zeroize", -] - -[[package]] -name = "x509-parser" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" -dependencies = [ - "asn1-rs", - "data-encoding", - "der-parser", - "lazy_static", - "nom", - "oid-registry", - "ring", - "rusticata-macros", - "thiserror 1.0.61", - "time 0.3.36", -] - [[package]] name = "xattr" version = "1.4.0" @@ -11002,12 +9050,6 @@ dependencies = [ "rustix 0.38.34", ] -[[package]] -name = "xcursor" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b" - [[package]] name = "xdg-home" version = "1.2.0" @@ -11018,34 +9060,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "xkbcommon-dl" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" -dependencies = [ - "bitflags 2.9.1", - "dlib", - "log", - "once_cell", - "xkeysym", -] - -[[package]] -name = "xkeysym" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" - -[[package]] -name = "yasna" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" -dependencies = [ - "time 0.3.36", -] - [[package]] name = "zbus" version = "3.15.2" @@ -11074,7 +9088,7 @@ dependencies = [ "once_cell", "ordered-stream", "rand 0.8.5", - "serde 1.0.228", + "serde 1.0.203", "serde_repr", "sha1", "static_assertions", @@ -11107,7 +9121,7 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ - "serde 1.0.228", + "serde 1.0.203", "static_assertions", "zvariant", ] @@ -11124,11 +9138,11 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.26" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +checksum = "a367f292d93d4eab890745e75a778da40909cab4d6ff8173693812f79c4a2468" dependencies = [ - "zerocopy-derive 0.8.26", + "zerocopy-derive 0.8.14", ] [[package]] @@ -11144,9 +9158,9 @@ dependencies = [ [[package]] name = "zerocopy-derive" -version = "0.8.26" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +checksum = "d3931cb58c62c13adec22e38686b559c86a30565e16ad6e8510a337cedc611e1" dependencies = [ "proc-macro2 1.0.93", "quote 1.0.36", @@ -11158,20 +9172,6 @@ name = "zeroize" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" -dependencies = [ - "proc-macro2 1.0.93", - "quote 1.0.36", - "syn 2.0.98", -] [[package]] name = "zip" @@ -11258,7 +9258,7 @@ dependencies = [ "byteorder", "enumflags2", "libc", - "serde 1.0.228", + "serde 1.0.203", "static_assertions", "zvariant_derive", ] diff --git a/Cargo.toml b/Cargo.toml index fa22dcd7b..06bfcaeb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustdesk" -version = "1.4.6" +version = "1.4.0" authors = ["rustdesk "] edition = "2021" build= "build.rs" @@ -76,14 +76,13 @@ crossbeam-queue = "0.3" hex = "0.4" chrono = "0.4" cidr-utils = "0.5" +libloading = "0.8" fon = "0.6" zip = "0.6" shutdown_hooks = "0.1" totp-rs = { version = "5.4", default-features = false, features = ["gen_secret", "otpauth"] } stunclient = "0.4" kcp-sys= { git = "https://github.com/rustdesk-org/kcp-sys"} -reqwest = { version = "0.12", features = ["blocking", "socks", "json", "native-tls", "rustls-tls", "rustls-tls-native-roots", "gzip"], default-features=false } - [target.'cfg(not(target_os = "linux"))'.dependencies] # https://github.com/rustdesk/rustdesk/discussions/10197, not use cpal on linux cpal = { git = "https://github.com/rustdesk-org/cpal", branch = "osx-screencapturekit" } @@ -99,7 +98,7 @@ ctrlc = "3.2" # arboard = { version = "3.4", features = ["wayland-data-control"] } arboard = { git = "https://github.com/rustdesk-org/arboard", features = ["wayland-data-control"] } clipboard-master = { git = "https://github.com/rustdesk-org/clipboard-master" } -portable-pty = { git = "https://github.com/rustdesk-org/wezterm", branch = "rustdesk/pty_based_0.8.1", package = "portable-pty" } +portable-pty = "0.8.1" # higher version not work on rustc 1.75 system_shutdown = "4.0" qrcode-generator = "4.1" @@ -122,19 +121,10 @@ winapi = { version = "0.3", features = [ ] } windows = { version = "0.61", features = [ "Win32", - "Win32_Foundation", - "Win32_Security", - "Win32_Security_Authorization", - "Win32_Storage_FileSystem", "Win32_System", "Win32_System_Diagnostics", - "Win32_System_Diagnostics_ToolHelp", - "Win32_System_Environment", - "Win32_System_IO", - "Win32_System_Memory", - "Win32_System_Pipes", "Win32_System_Threading", - "Win32_UI_Shell", + "Win32_System_Diagnostics_ToolHelp", ] } winreg = "0.11" windows-service = "0.6" @@ -154,13 +144,9 @@ core-graphics = "0.22" include_dir = "0.7" fruitbasket = "0.10" objc_id = "0.1" -# If we use piet "0.7" here, we must also update core-graphics to "0.24". -piet = "0.6" -piet-coregraphics = "0.6" -foreign-types = "0.3" [target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies] -tray-icon = { git = "https://github.com/tauri-apps/tray-icon", version = "0.21.3" } +tray-icon = { git = "https://github.com/tauri-apps/tray-icon" } tao = { git = "https://github.com/rustdesk-org/tao", branch = "dev" } image = "0.24" @@ -169,14 +155,15 @@ keepawake = { git = "https://github.com/rustdesk-org/keepawake-rs" } [target.'cfg(any(target_os = "windows", target_os = "linux"))'.dependencies] wallpaper = { git = "https://github.com/rustdesk-org/wallpaper.rs" } -tiny-skia = "0.11" -softbuffer = "0.4" -fontdb = "0.23" -bytemuck = "1.23" -ttf-parser = "0.25" + +[target.'cfg(any(target_os = "macos", target_os = "windows"))'.dependencies] +# https://github.com/rustdesk/rustdesk-server-pro/issues/189, using native-tls for better tls support +reqwest = { git = "https://github.com/rustdesk-org/reqwest", features = ["blocking", "socks", "json", "native-tls", "gzip"], default-features=false } + +[target.'cfg(not(any(target_os = "macos", target_os = "windows")))'.dependencies] +reqwest = { git = "https://github.com/rustdesk-org/reqwest", features = ["blocking", "socks", "json", "rustls-tls", "rustls-tls-native-roots", "gzip"], default-features=false } [target.'cfg(target_os = "linux")'.dependencies] -libxdo-sys = "0.11" psimple = { package = "libpulse-simple-binding", version = "2.27" } pulse = { package = "libpulse-binding", version = "2.27" } rust-pulsectl = { git = "https://github.com/rustdesk-org/pulsectl" } @@ -185,6 +172,7 @@ evdev = { git="https://github.com/rustdesk-org/evdev" } dbus = "0.9" dbus-crossroads = "0.5" pam = { git="https://github.com/rustdesk-org/pam" } +users = { version = "0.11" } x11-clipboard = {git="https://github.com/clslaid/x11-clipboard", branch = "feat/store-batch", optional = true} x11rb = {version = "0.12", features = ["all-extensions"], optional = true} percent-encoding = {version = "2.3", optional = true} @@ -192,11 +180,6 @@ once_cell = {version = "1.18", optional = true} nix = { version = "0.29", features = ["term", "process"]} gtk = "0.18" termios = "0.3" -terminfo = "0.8" -winit = "0.30" - -[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies] -openssl = { version = "0.10", features = ["vendored"] } [target.'cfg(target_os = "android")'.dependencies] android_logger = "0.13" @@ -207,11 +190,6 @@ android-wakelock = { git = "https://github.com/rustdesk-org/android-wakelock" } members = ["libs/scrap", "libs/hbb_common", "libs/enigo", "libs/clipboard", "libs/virtual_display", "libs/virtual_display/dylib", "libs/portable", "libs/remote_printer"] exclude = ["vdi/host", "examples/custom_plugin"] -# Patch libxdo-sys to use a stub implementation that doesn't require libxdo -# This allows building and running on systems without libxdo installed (e.g., Wayland-only) -[patch.crates-io] -libxdo-sys = { path = "libs/libxdo-sys-stub" } - [package.metadata.winres] LegalCopyright = "Copyright © 2025 Purslane Ltd. All rights reserved." ProductName = "RustDesk" @@ -245,6 +223,3 @@ panic = 'abort' strip = true #opt-level = 'z' # only have smaller size after strip rpath = true - -[profile.dev] -debug = 1 diff --git a/GEMINI.md b/GEMINI.md deleted file mode 100644 index c31706425..000000000 --- a/GEMINI.md +++ /dev/null @@ -1 +0,0 @@ -AGENTS.md diff --git a/README.md b/README.md index ae5c8d37c..f29be7694 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Docker • Structure • Snapshot
- [Українська] | [česky] | [中文] | [Magyar] | [Español] | [فارسی] | [Français] | [Deutsch] | [Polski] | [Indonesian] | [Suomi] | [മലയാളം] | [日本語] | [Nederlands] | [Italiano] | [Русский] | [Português (Brasil)] | [Esperanto] | [한국어] | [العربي] | [Tiếng Việt] | [Dansk] | [Ελληνικά] | [Türkçe] | [Norsk] | [Română]
+ [Українська] | [česky] | [中文] | [Magyar] | [Español] | [فارسی] | [Français] | [Deutsch] | [Polski] | [Indonesian] | [Suomi] | [മലയാളം] | [日本語] | [Nederlands] | [Italiano] | [Русский] | [Português (Brasil)] | [Esperanto] | [한국어] | [العربي] | [Tiếng Việt] | [Dansk] | [Ελληνικά] | [Türkçe] | [Norsk]
We need your help to translate this README, RustDesk UI and RustDesk Doc to your native language

@@ -15,7 +15,7 @@ Chat with us: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Advanced%20Features-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) Yet another remote desktop solution, written in Rust. Works out of the box with no configuration required. You have full control of your data, with no concerns about security. You can use our rendezvous/relay server, [set up your own](https://rustdesk.com/server), or [write your own rendezvous/relay server](https://github.com/rustdesk/rustdesk-server-demo). diff --git a/appimage/AppImageBuilder-aarch64.yml b/appimage/AppImageBuilder-aarch64.yml index 64d6c2cfa..36297f0e1 100644 --- a/appimage/AppImageBuilder-aarch64.yml +++ b/appimage/AppImageBuilder-aarch64.yml @@ -18,7 +18,7 @@ AppDir: id: rustdesk name: rustdesk icon: rustdesk - version: 1.4.6 + version: 1.4.0 exec: usr/share/rustdesk/rustdesk exec_args: $@ apt: @@ -99,4 +99,3 @@ AppDir: AppImage: arch: aarch64 update-information: guess - comp: gzip diff --git a/appimage/AppImageBuilder-x86_64.yml b/appimage/AppImageBuilder-x86_64.yml index 933673cef..59bcca92b 100644 --- a/appimage/AppImageBuilder-x86_64.yml +++ b/appimage/AppImageBuilder-x86_64.yml @@ -18,7 +18,7 @@ AppDir: id: rustdesk name: rustdesk icon: rustdesk - version: 1.4.6 + version: 1.4.0 exec: usr/share/rustdesk/rustdesk exec_args: $@ apt: @@ -102,4 +102,3 @@ AppDir: AppImage: arch: x86_64 update-information: guess - comp: gzip diff --git a/build.py b/build.py index 5c53e4fc8..87c0dbd34 100755 --- a/build.py +++ b/build.py @@ -299,7 +299,7 @@ Version: %s Architecture: %s Maintainer: rustdesk Homepage: https://rustdesk.com -Depends: libgtk-3-0, libxcb-randr0, libxdo3 | libxdo4, libxfixes3, libxcb-shape0, libxcb-xfixes0, libasound2, libsystemd0, curl, libva2, libva-drm2, libva-x11-2, libgstreamer-plugins-base1.0-0, libpam0g, gstreamer1.0-pipewire%s +Depends: libgtk-3-0, libxcb-randr0, libxdo3, libxfixes3, libxcb-shape0, libxcb-xfixes0, libasound2, libsystemd0, curl, libva2, libva-drm2, libva-x11-2, libgstreamer-plugins-base1.0-0, libpam0g, gstreamer1.0-pipewire%s Recommends: libayatana-appindicator3-1 Description: A remote control software. @@ -512,7 +512,7 @@ def main(): system2('pip3 install -r requirements.txt') system2( f'python3 ./generate.py -f ../../{res_dir} -o . -e ../../{res_dir}/rustdesk-{version}-win7-install.exe') - system2(f'mv ../../{res_dir}/rustdesk-{version}-win7-install.exe ../..') + system2('mv ../../{res_dir}/rustdesk-{version}-win7-install.exe ../..') elif os.path.isfile('/usr/bin/pacman'): # pacman -S -needed base-devel system2("sed -i 's/pkgver=.*/pkgver=%s/g' res/PKGBUILD" % version) diff --git a/build.rs b/build.rs index 92fb1f4b4..3d19ee037 100644 --- a/build.rs +++ b/build.rs @@ -18,7 +18,7 @@ fn build_mac() { b.flag("-DNO_InputMonitoringAuthStatus=1"); } } - b.flag("-std=c++17").file(file).compile("macos"); + b.file(file).compile("macos"); println!("cargo:rerun-if-changed={}", file); } @@ -68,8 +68,11 @@ fn install_android_deps() { } path.push(target); println!( - "cargo:rustc-link-search={}", - path.join("lib").to_str().unwrap() + "{}", + format!( + "cargo:rustc-link-search={}", + path.join("lib").to_str().unwrap() + ) ); println!("cargo:rustc-link-lib=ndk_compat"); println!("cargo:rustc-link-lib=oboe"); diff --git a/docs/CODE_OF_CONDUCT-DE.md b/docs/CODE_OF_CONDUCT-DE.md deleted file mode 100644 index ea4254552..000000000 --- a/docs/CODE_OF_CONDUCT-DE.md +++ /dev/null @@ -1,137 +0,0 @@ - -# Verhaltenskodex (Code of Conduct) für Mitwirkende - -## Unsere Verpflichtung - -Wir als Mitglieder, Mitwirkende und Führungskräfte verpflichten uns, -die Teilnahme unserer Community zu einer Erfahrung zu machen, -die für alle frei von Belästigungen ist, unabhängig von Alter, Körpergröße, -sichtbarer oder unsichtbarer Behinderung, ethnischer Zugehörigkeit, -Geschlechtsmerkmalen, Geschlechtsidentität und -ausdruck, Erfahrungsniveau, -Bildung, sozioökonomischem Status, Nationalität, persönlichem Erscheinungsbild, -Rasse, Religion oder sexueller Identität und Orientierung. - -Wir verpflichten uns, so zu handeln und zu interagieren, dass wir zu einer offenen, -einladenden, vielfältigen, integrativen und lebendigen Gemeinschaft beitragen. - -## Unsere Standards - -Beispiele für Verhaltensweisen, die zu einem positiven Umfeld für unsere -Gemeinschaft beitragen, sind: - -* Empathie und Freundlichkeit gegenüber anderen Menschen zu zeigen -* Respektvoll gegenüber anderen Meinungen, Sichtweisen und Erfahrungen zu sein -* Das Vergeben von sowie das großzügige Empfangen von konstruktivem Feedback -* Verantwortung übernehmen, sich bei den Betroffenen entschuldigen - und aus den Erfahrungen lernen -* Nicht darauf zu achten, was das Beste für sich selbst, - sondern zu Achten, was das Beste für die gesamte Community ist - -Beispiele für nicht akzeptables Verhalten sind: - -* Die Verwendung sexualisierter bzw. anstößiger Sprache oder Bilder - sowie sexuelle Aufmerksamkeit oder Annäherungsversuche jeglicher Art -* Trolling, beleidigende oder herabwürdigende Kommentare - sowie persönliche oder politische Angriffe -* Öffentliche sowie private Belästigung -* Das Teilen privater Informationen anderer Leute ohne deren explizite Zustimmung, - wie bspw. die physische oder die E-Mail-Adresse -* Anderes Verhalten, das in einem professionellen Umfeld begründeter Weise als - unangemessen angesehen werden könnte - -## Durchsetzungsbefugnisse - -Die Leiter der Community sind dafür verantwortlich, unsere Standards für -akzeptables Verhalten zu klären und durchzusetzen und werden angemessene -und faire Korrekturmaßnahmen ergreifen, wenn sie ein Verhalten als unangemessen, -bedrohlich, beleidigend oder schädlich erachten. - -Die Leiter der Community haben das Recht und die Pflicht, Kommentare, Commits, -Code, Wiki-Bearbeitungen, Issues und andere Beiträge, die nicht mit dem -Verhaltenskodex vereinbar sind, zu entfernen, zu bearbeiten oder abzulehnen. -Sie werden, falls angebracht, die Gründe für Moderationsentscheidungen mitteilen. - -## Geltungsbereich - -Dieser Verhaltenskodex gilt in allen Community-Bereichen und auch dann, wenn -eine Person die Community offiziell in öffentlichen Bereichen vertritt. -Beispiele für die Vertretung unserer Community sind die Verwendung einer -offiziellen E-Mail-Adresse, das Posten über einen offiziellen -Social-Media-Account oder die Tätigkeit als ernannter -Vertreter bei einer Online- oder Präsenzveranstaltung. - -## Geltendmachung - -Fälle von missbräuchlichem, belästigendem oder anderweitig inakzeptablem Verhalten können -den für die Durchsetzung zuständigen Community-Leitern -unter [info@rustdesk.com](mailto:info@rustdesk.com) gemeldet werden. -Jeder Fall wird umgehend und fair geprüft und untersucht. - -## Richtlinien zur Geltendmachung - -Die Community-Leiter werden die folgenden Community-Auswirkungsrichtlinien befolgen, -um die Konsequenzen für jede Handlung zu bestimmen, die sie als Verstoß gegen diesen -Verhaltenskodex ansehen: - -### 1. Korrektur - -**Auswirkungen auf die Community**: Verwendung unangemessener Sprache oder anderes -Verhalten, welches als unprofessionell oder in der Community unerwünscht angesehen wird. - -**Konsequenz**: Eine private, schriftliche Verwarnung durch die Leiter der Community, -in der die Art des Verstoßes klar dargelegt und erklärt wird, warum das -Verhalten unangemessen war. Eine öffentliche Entschuldigung kann verlangt werden. - -### 2. Warnung - -**Auswirkungen auf die Community**: Ein Verstoß durch einen einzelnen Vorfall -oder eine Reihe von Handlungen. - -**Konsequenz**: Eine Verwarnung mit Konsequenzen für das weitere Verhalten. Keine -Interaktion mit den beteiligten Personen, einschließlich unaufgeforderter Interaktion mit -denjenigen, die den Verhaltenskodex durchsetzen, für einen bestimmten Zeitraum. Dies -schließt die Vermeidung von Interaktionen in Gemeinschaftsräumen sowie externen Kanälen -wie sozialen Medien ein. Ein Verstoß gegen diese Bedingungen kann zu einer vorübergehenden oder -dauerhaften Sperrung führen. - -### 3. Temporärer Sperrung - - -**Auswirkungen auf die Community**: Ein schwerwiegender Verstoß gegen die Community-Standards, -einschließlich anhaltend unangemessenem Verhalten. - -**Konsequenz**: Eine vorübergehende Sperrung jeglicher Art von Interaktion oder öffentlicher -Kommunikation mit der Community für einen bestimmten Zeitraum. Während dieses Zeitraums sind -keine öffentlichen oder privaten Interaktionen mit den betroffenen Personen, -einschließlich unaufgeforderter Interaktionen mit denjenigen, -die den Verhaltenskodex durchsetzen, erlaubt. -Ein Verstoß gegen diese Bedingungen kann zu einer dauerhaften Sperrung führen. - -### 4. Dauerhafte Sperrung - -**Auswirkungen auf die Community**: Wiederholte Verstöße gegen die Community-Standards, -einschließlich anhaltend unangemessenem Verhalten, Belästigung einer -Person oder Aggression gegenüber oder Herabwürdigung von Personengruppen. - -**Konsequenz**: Ein dauerhafter Ausschluss von jeglicher öffentlicher -Interaktion innerhalb der Community. - -## Quellenangabe - -Dieser Verhaltenskodex ist eine Adaption des [Contributor Covenant][homepage], -Version 2.0, verfügbar unter -[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0]. - -Die Richtlinien zu den Auswirkungen auf die Gemeinschaft wurden inspiriert von -[Mozilla's code of conduct enforcement ladder][Mozilla CoC]. - -Für Antworten auf häufig gestellte Fragen zu diesem Verhaltenskodex siehe die -häufig gestellten Fragen (FAQ) unter -[https://www.contributor-covenant.org/faq][FAQ]. Übersetzungen sind verfügbar -unter [https://www.contributor-covenant.org/translations][translations]. - -[homepage]: https://www.contributor-covenant.org -[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html -[Mozilla CoC]: https://github.com/mozilla/diversity -[FAQ]: https://www.contributor-covenant.org/faq -[translations]: https://www.contributor-covenant.org/translations diff --git a/docs/CODE_OF_CONDUCT-FR.md b/docs/CODE_OF_CONDUCT-FR.md deleted file mode 100644 index dca61e0aa..000000000 --- a/docs/CODE_OF_CONDUCT-FR.md +++ /dev/null @@ -1,143 +0,0 @@ - -# Code de conduite des contributeurs - -## Notre engagement - -En tant que membres, contributeurs et responsables, nous nous engageons à faire -de la participation à notre communauté une expérience exempte de harcèlement pour -tous, indépendamment de l'âge, de la taille corporelle, du handicap visible ou -invisible, de l'origine ethnique, des caractéristiques sexuelles, de l'identité -et de l'expression de genre, du niveau d'expérience, de l'éducation, du statut -socio-économique, de la nationalité, de l'apparence personnelle, de la race, de -la religion ou de l'identité et de l'orientation sexuelle. - -Nous nous engageons à agir et à interagir de manière à contribuer à une -communauté ouverte, accueillante, diversifiée, inclusive et saine. - -## Nos standards - -Exemples de comportements qui contribuent à un environnement positif pour notre -communauté : - -* Faire preuve d'empathie et de bienveillance envers les autres -* Respecter les opinions, les points de vue et les expériences différents -* Donner et accepter gracieusement les retours constructifs -* Assumer ses responsabilités, s'excuser auprès des personnes affectées par nos - erreurs et apprendre de l'expérience -* Se concentrer sur ce qui est le mieux non seulement pour nous en tant - qu'individus, mais pour l'ensemble de la communauté - -Exemples de comportements inacceptables : - -* L'utilisation de langage ou d'images à caractère sexuel, et les attentions ou - avances sexuelles de quelque nature que ce soit -* Le trolling, les commentaires insultants ou désobligeants, et les attaques - personnelles ou politiques -* Le harcèlement public ou privé -* La publication d'informations privées d'autrui, telles qu'une adresse physique - ou électronique, sans autorisation explicite -* Tout autre comportement qui pourrait raisonnablement être considéré comme - inapproprié dans un cadre professionnel - -## Responsabilités en matière d'application - -Les responsables de la communauté sont chargés de clarifier et d'appliquer nos -standards de comportement acceptable et prendront des mesures correctives -appropriées et équitables en réponse à tout comportement qu'ils jugent -inapproprié, menaçant, offensant ou nuisible. - -Les responsables de la communauté ont le droit et la responsabilité de -supprimer, modifier ou rejeter les commentaires, commits, code, modifications -du wiki, issues et autres contributions qui ne sont pas conformes à ce Code de -conduite, et communiqueront les raisons de leurs décisions de modération le cas -échéant. - -## Portée - -Ce Code de conduite s'applique dans tous les espaces communautaires, et -s'applique également lorsqu'une personne représente officiellement la communauté -dans les espaces publics. Les exemples de représentation de notre communauté -incluent l'utilisation d'une adresse e-mail officielle, la publication via un -compte de réseau social officiel, ou le fait d'agir en tant que représentant -désigné lors d'un événement en ligne ou hors ligne. - -## Application - -Les cas de comportements abusifs, harcelants ou autrement inacceptables peuvent -être signalés aux responsables de la communauté chargés de l'application à -[info@rustdesk.com](mailto:info@rustdesk.com). -Toutes les plaintes seront examinées et feront l'objet d'une enquête rapide et -équitable. - -Tous les responsables de la communauté sont tenus de respecter la vie privée et -la sécurité de la personne ayant signalé un incident. - -## Directives d'application - -Les responsables de la communauté suivront ces Directives d'impact communautaire -pour déterminer les conséquences de toute action qu'ils jugent en violation de ce -Code de conduite : - -### 1. Correction - -**Impact communautaire** : Utilisation d'un langage inapproprié ou autre -comportement jugé non professionnel ou indésirable dans la communauté. - -**Conséquence** : Un avertissement écrit et privé de la part des responsables de -la communauté, expliquant la nature de la violation et pourquoi le comportement -était inapproprié. Des excuses publiques peuvent être demandées. - -### 2. Avertissement - -**Impact communautaire** : Une violation par un incident isolé ou une série -d'actions. - -**Conséquence** : Un avertissement avec des conséquences en cas de comportement -répété. Aucune interaction avec les personnes impliquées, y compris les -interactions non sollicitées avec les personnes chargées d'appliquer le Code de -conduite, pendant une période déterminée. Cela inclut d'éviter les interactions -dans les espaces communautaires ainsi que dans les canaux externes comme les -réseaux sociaux. Le non-respect de ces conditions peut entraîner une exclusion -temporaire ou permanente. - -### 3. Exclusion temporaire - -**Impact communautaire** : Une violation grave des standards communautaires, y -compris un comportement inapproprié persistant. - -**Conséquence** : Une exclusion temporaire de toute interaction ou communication -publique avec la communauté pendant une période déterminée. Aucune interaction -publique ou privée avec les personnes impliquées, y compris les interactions non -sollicitées avec les personnes chargées d'appliquer le Code de conduite, n'est -autorisée pendant cette période. Le non-respect de ces conditions peut entraîner -une exclusion permanente. - -### 4. Exclusion permanente - -**Impact communautaire** : Démontrer un schéma de violation des standards -communautaires, y compris un comportement inapproprié persistant, le harcèlement -d'une personne, ou une agression envers des catégories de personnes ou leur -dénigrement. - -**Conséquence** : Une exclusion permanente de toute interaction publique au sein -de la communauté. - -## Attribution - -Ce Code de conduite est adapté du [Contributor Covenant][homepage], version 2.0, -disponible à l'adresse -[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0]. - -Les Directives d'impact communautaire ont été inspirées par -[l'échelle d'application du code de conduite de Mozilla][Mozilla CoC]. - -Pour des réponses aux questions fréquentes sur ce code de conduite, consultez la -FAQ à l'adresse [https://www.contributor-covenant.org/faq][FAQ]. Des traductions -sont disponibles à l'adresse -[https://www.contributor-covenant.org/translations][translations]. - -[homepage]: https://www.contributor-covenant.org -[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html -[Mozilla CoC]: https://github.com/mozilla/diversity -[FAQ]: https://www.contributor-covenant.org/faq -[translations]: https://www.contributor-covenant.org/translations diff --git a/docs/CODE_OF_CONDUCT-KR.md b/docs/CODE_OF_CONDUCT-KR.md deleted file mode 100644 index 40fea02eb..000000000 --- a/docs/CODE_OF_CONDUCT-KR.md +++ /dev/null @@ -1,133 +0,0 @@ - -# 기여자 계약 행동 강령 - -## 우리의 서약 - -회원, 기여자, 리더로서 우리는 나이, 신체 크기, 눈에 -보이거나 보이지 않는 장애, 민족, 성 특성, 성 정체성 및 -표현, 경험 수준, 교육, 사회 경제적 지위, 국적, 외모, -인종, 종교, 성적 정체성 및 지향에 관계없이 모든 사람이 -괴롭힘 없이 커뮤니티에 참여할 수 있도록 할 것을 -서약합니다. - -우리는 개방적이고 환영하며 다양하고 포용적이며 건강한 커뮤니티에 -기여하는 방식으로 행동하고 교류할 것을 약속합니다. - -## 우리의 표준 - -커뮤니티의 긍정적인 환경에 기여하는 행동의 예는 -다음과 같습니다: - -* 다른 사람들에게 공감과 친절을 보여주기 -* 다양한 의견, 관점, 경험을 존중하기 -* 건설적인 피드백을 제공하고 우아하게 받아들이기 -* 우리의 실수로 인해 영향을 받은 사람들에게 책임을 받아들이고 사과하며 - 그 경험을 통해 배우기 -* 우리 개인뿐만 아니라 전체 커뮤니티에 가장 좋은 것이 무엇인지 - 집중하기 - -용납할 수 없는 행동의 예는 다음과 같습니다: - -* 성적인 언어 또는 이미지의 사용, 모든 종류의 성적 관심 또는 - 접근 행위 -* 트롤링, 모욕적이거나 경멸적인 댓글, 개인적 또는 정치적 공격 -* 공개적 또는 사적인 괴롭힘 -* 명시적인 허가 없이 타인의 실제 주소 또는 이메일 주소와 같은 - 개인정보를 게시하는 행위 -* 직업적 환경에서 합리적으로 부적절하다고 간주될 수 있는 - 기타 행위 - -## 시행 책임 - -커뮤니티 리더는 허용되는 행동의 기준을 명확히 하고 시행할 -책임이 있으며 부적절하거나 위협적이거나 모욕적이거나 -유해하다고 판단되는 행동에 대해 적절하고 공정한 시정 조치를 -취합니다. - -커뮤니티 리더는 본 행동 강령에 부합하지 않는 댓글, 커밋, -코드, 위키 편집, 이슈 및 기타 기여를 삭제, 편집 또는 거부할 -권한과 책임이 있으며, 적절한 경우 중재 결정의 이유를 -전달합니다. - -## 범위 - -본 행동 강령은 모든 커뮤니티 공간에서 적용되며, 개인이 공개 -공간에서 커뮤니티를 공식적으로 대표하는 경우에도 적용됩니다. -커뮤니티를 대표하는 예로는 공식 이메일 주소 사용, 공식 소셜 미디어 -계정을 통한 게시, 온라인 또는 오프라인 이벤트에서 지정된 대표자로 -활동하는 것 등이 있습니다. - -## 시행 - -모욕적, 괴롭힘 또는 기타 용납할 수 없는 행동은 - [info@rustdesk.com](mailto:info@rustdesk.com)으로 법 집행을 담당하는 커뮤니티 리더에게 -신고하실 수 있습니다. -모든 불만 사항은 신속하고 공정하게 검토 및 조사됩니다. - -모든 커뮤니티 리더는 모든 사건 신고자의 사생활과 보안을 존중할 의무가 -있습니다. - -## 시행 지침 - -커뮤니티 리더는 이 행동 강령을 위반한 것으로 간주되는 모든 행동에 대한 -결과를 결정할 때 다음 커뮤니티 영향 지침을 따릅니다: - -### 1. 수정 - -**커뮤니티 영향**: 커뮤니티에서 비전문적이거나 환영받지 못하는 -것으로 간주되는 부적절한 언어 사용이나 기타 행위입니다. - -**결과**: 커뮤니티 리더의 비공개 서면 경고. 위반 사항의 성격과 -해당 행동이 부적절했던 이유를 명확히 설명해야 합니다. -공개 사과를 요청할 수도 있습니다. - -### 2. 경고 - -**커뮤니티 영향**: 단일 사건 또는 일련의 행위를 통한 -위반입니다. - -**결과**: 지속적인 행동에 대한 경고 및 결과. 행동 강령 시행 담당자와의 -원치 않는 상호작용을 포함하여 관련자와의 상호작용은 일정 -기간 동안 금지됩니다. 여기에는 공동 공간 및 소셜 미디어와 -같은 외부 채널에서의 상호작용 금지가 포함됩니다. 이러한 -조건을 위반할 경우 일시적 또는 영구적으로 이용이 금지될 수 -있습니다. - -### 3. 일시 금지 - -**커뮤니티 영향**: 지속적인 부적절한 행동을 포함하여 -커뮤니티 기준을 심각하게 위반한 경우입니다. - -**결과**: 일정 기간 동안 커뮤니티와의 모든 상호작용이나 공개적인 소통이 -일시적으로 금지됩니다. 이 기간 동안에는 행동 강령을 시행하는 -사람들과의 원치 않는 상호작용을 포함하여 관련자들과의 공개적 또는 -사적인 상호작용이 허용되지 않습니다. -이러한 조건을 위반할 경우 영구적으로 이용이 금지될 수 있습니다. - -### 4. 영구 금지 - -**커뮤니티 영향**: 지속적인 부적절한 행동, 특정 개인에 대한 괴롭힘, -특정 계층에 대한 공격성 또는 비하 등 공동체 기준을 위반하는 -행동을 보이는 경우입니다. - -**결과**: 공동체 내 모든 종류의 공개적인 상호작용이 영구적으로 -금지됩니다. - -## 귀속 - -본 행동 강령은 [Contributor Covenant][homepage] 버전 2.0을 바탕으로 작성되었으며 -[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0]에서 - 확인하실 수 있습니다. - -커뮤니티 영향 지침은 -[Mozilla's code of conduct enforcement ladder][Mozilla CoC]에서 영감을 받았습니다. - -본 행동 강령에 대한 일반적인 질문은 [https://www.contributor-covenant.org/faq][FAQ]에서 FAQ를 -참조하세요. 번역은 [https://www.contributor-covenant.org/translations][translations]에서 -확인하실 수 있습니다. - -[homepage]: https://www.contributor-covenant.org -[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html -[Mozilla CoC]: https://github.com/mozilla/diversity -[FAQ]: https://www.contributor-covenant.org/faq -[translations]: https://www.contributor-covenant.org/translations diff --git a/docs/CODE_OF_CONDUCT-RO.md b/docs/CODE_OF_CONDUCT-RO.md deleted file mode 100644 index 6fe8564a3..000000000 --- a/docs/CODE_OF_CONDUCT-RO.md +++ /dev/null @@ -1,85 +0,0 @@ -# Codul de Conduită al Contributorilor - -## Angajamentul Nostru - -Noi, ca membri, contribuitori și lideri, ne angajăm să facem ca participarea în comunitatea noastră să fie o experiență fără hărțuire pentru toată lumea, indiferent de vârstă, dimensiunea corpului, dizabilități vizibile sau invizibile, etnie, caracteristici sexuale, identitate și exprimare de gen, nivel de experiență, educație, statut socio-economic, naționalitate, aspect personal, rasă, religie sau identitate și orientare sexuală. - -Ne angajăm să acționăm și să interacționăm în moduri care contribuie la o comunitate deschisă, primitoare, diversă, incluzivă și sănătoasă. - -## Standardele Noastre - -Exemple de comportamente care contribuie la un mediu pozitiv pentru comunitatea noastră includ: - -* Demonstrarea empatiei și a bunătății față de ceilalți -* Respectarea opiniilor, punctelor de vedere și experiențelor diferite -* Oferirea și acceptarea cu grație a feedback-ului constructiv -* Asumarea responsabilității și cererea de scuze celor afectați de greșelile noastre și învățarea din experiență -* Concentrarea pe ceea ce este cel mai bun nu doar pentru noi ca indivizi, ci pentru întreaga comunitate - -Exemple de comportamente inacceptabile includ: - -* Utilizarea limbajului sau imaginilor sexualizate, precum și atenția sau avansurile sexuale de orice fel -* Trollare, insulte sau comentarii denigratoare și atacuri personale sau politice -* Hărțuire publică sau privată -* Publicarea informațiilor private ale altora, cum ar fi adresa fizică sau de e-mail, fără permisiunea explicită -* Alte comportamente care ar putea fi considerate inadecvate într-un cadru profesional - -## Responsabilități de Aplicare - -Liderii comunității sunt responsabili pentru clarificarea și aplicarea standardelor noastre de comportament acceptabil și vor lua măsuri corective adecvate și echitabile ca răspuns la orice comportament pe care îl consideră inadecvat, amenințător, ofensator sau dăunător. - -Liderii comunității au dreptul și responsabilitatea de a elimina, edita sau respinge comentarii, commit-uri, cod, editări wiki, probleme și alte contribuții care nu se aliniază acestui Cod de Conduită și vor comunica motivele pentru deciziile de moderare atunci când este cazul. - -## Domeniu de Aplicare - -Acest Cod de Conduită se aplică în toate spațiile comunității și se aplică și atunci când un individ reprezintă oficial comunitatea în spații publice. -Exemple de reprezentare a comunității includ utilizarea unei adrese de e-mail oficiale, postarea printr-un cont oficial de social media sau acționarea ca reprezentant desemnat la un eveniment online sau offline. - -## Aplicare - -Cazurile de comportament abuziv, hărțuitor sau altfel inacceptabil pot fi raportate liderilor comunității responsabili pentru aplicare la [info@rustdesk.com](mailto:info@rustdesk.com). -Toate plângerile vor fi revizuite și investigate prompt și corect. - -Toți liderii comunității sunt obligați să respecte confidențialitatea și securitatea persoanei care raportează orice incident. - -## Ghiduri de Aplicare - -Liderii comunității vor urma aceste Ghiduri privind Impactul Comunității pentru a stabili consecințele pentru orice acțiune pe care o consideră o încălcare a acestui Cod de Conduită: - -### 1. Corectare - -**Impact asupra comunității**: Utilizarea limbajului neadecvat sau alte comportamente considerate neprofesionale sau nedorite în comunitate. - -**Consecință**: O avertizare scrisă și privată din partea liderilor comunității, oferind claritate asupra naturii încălcării și o explicație despre motivul pentru care comportamentul a fost inadecvat. Poate fi cerută o scuză publică. - -### 2. Avertisment - -**Impact asupra comunității**: Încălcare printr-un incident singular sau o serie de acțiuni. - -**Consecință**: Un avertisment cu consecințe pentru continuarea comportamentului. Nicio interacțiune cu persoanele implicate, inclusiv interacțiuni nesolicitate cu cei care aplică Codul de Conduită, pentru o perioadă specificată. Aceasta include evitarea interacțiunilor în spațiile comunității, precum și pe canale externe, cum ar fi rețelele sociale. Încălcarea acestor termeni poate duce la o suspendare temporară sau permanentă. - -### 3. Suspendare Temporară - -**Impact asupra comunității**: O încălcare serioasă a standardelor comunității, inclusiv comportament neadecvat susținut. - -**Consecință**: Suspendare temporară de la orice tip de interacțiune sau comunicare publică cu comunitatea pentru o perioadă specificată. Nicio interacțiune publică sau privată cu persoanele implicate, inclusiv interacțiuni nesolicitate cu cei care aplică Codul de Conduită, nu este permisă în această perioadă. Încălcarea acestor termeni poate duce la o interdicție permanentă. - -### 4. Interdicție Permanentă - -**Impact asupra comunității**: Demonstrând un tipar de încălcare a standardelor comunității, inclusiv comportament neadecvat susținut, hărțuire a unei persoane sau agresiune față de sau denigrare a unor grupuri de persoane. - -**Consecință**: Interdicție permanentă de la orice tip de interacțiune publică în cadrul comunității. - -## Atribuire - -Acest Cod de Conduită este adaptat din [Contributor Covenant][homepage], versiunea 2.0, disponibil la [https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0]. - -Ghidurile privind Impactul Comunității au fost inspirate de [scara de aplicare a codului de conduită Mozilla][Mozilla CoC]. - -Pentru răspunsuri la întrebări frecvente despre acest cod de conduită, vezi FAQ la [https://www.contributor-covenant.org/faq][FAQ]. Traduceri sunt disponibile la [https://www.contributor-covenant.org/translations][translations]. - -[homepage]: https://www.contributor-covenant.org -[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html -[Mozilla CoC]: https://github.com/mozilla/diversity -[FAQ]: https://www.contributor-covenant.org/faq -[translations]: https://www.contributor-covenant.org/translations \ No newline at end of file diff --git a/docs/CONTRIBUTING-FR.md b/docs/CONTRIBUTING-FR.md deleted file mode 100644 index 6f800de7d..000000000 --- a/docs/CONTRIBUTING-FR.md +++ /dev/null @@ -1,55 +0,0 @@ - -# Contribuer à RustDesk - -RustDesk accueille les contributions de tous. Voici les directives si vous -envisagez de nous aider : - -## Contributions - -Les contributions à RustDesk ou à ses dépendances doivent être soumises sous -forme de pull requests GitHub. Chaque pull request sera examinée par un -contributeur principal (une personne ayant la permission d'intégrer des -correctifs) et sera soit intégrée dans la branche principale, soit accompagnée -de retours sur les modifications requises. Toutes les contributions doivent -suivre ce format, même celles des contributeurs principaux. - -Si vous souhaitez travailler sur une issue, veuillez d'abord la revendiquer en -commentant sur l'issue GitHub indiquant que vous souhaitez la traiter. Cela -permet d'éviter les efforts en double de la part des contributeurs sur la même -issue. - -## Liste de vérification pour les pull requests - -- Partez de la branche master et, si nécessaire, effectuez un rebase sur la - branche master actuelle avant de soumettre votre pull request. Si elle ne - fusionne pas proprement avec master, il vous sera peut-être demandé de - rebaser vos modifications. - -- Les commits doivent être aussi petits que possible, tout en s'assurant que - chaque commit est correct de manière indépendante (c.-à-d. que chaque commit - doit compiler et passer les tests). - -- Les commits doivent être accompagnés d'une signature Developer Certificate of - Origin (http://developercertificate.org), indiquant que vous (et votre - employeur le cas échéant) acceptez d'être liés par les termes de la - [licence du projet](../LICENCE). Dans git, il s'agit de l'option `-s` de - `git commit`. - -- Si votre correctif n'est pas examiné ou si vous avez besoin qu'une personne - spécifique l'examine, vous pouvez @-mentionner un relecteur pour demander une - revue dans la pull request ou un commentaire, ou vous pouvez demander une - revue par [e-mail](mailto:info@rustdesk.com). - -- Ajoutez des tests relatifs au bug corrigé ou à la nouvelle fonctionnalité. - -Pour des instructions git spécifiques, consultez le -[GitHub workflow 101](https://github.com/servo/servo/wiki/GitHub-workflow). - -## Conduite - -https://github.com/rustdesk/rustdesk/blob/master/docs/CODE_OF_CONDUCT.md - -## Communication - -Les contributeurs de RustDesk se retrouvent fréquemment sur -[Discord](https://discord.gg/nDceKgxnkV). diff --git a/docs/CONTRIBUTING-KR.md b/docs/CONTRIBUTING-KR.md index 5e432648e..e0e4aa766 100644 --- a/docs/CONTRIBUTING-KR.md +++ b/docs/CONTRIBUTING-KR.md @@ -1,46 +1,40 @@ -# RustDesk 기여하기 +# RustDesk에 기여하기 -RustDesk는 모든 분들의 참여를 환영합니다. 저희를 도와주실 생각이 있으시다면 - 다음 지침을 따르세요: +RustDesk는 모든 분들의 기여를 환영합니다. RustDesk에 기여하고 싶으시다면 아래 가이드를 참고해 주세요: -## 기여 +## 기여 방법 -RustDesk 또는 그 종속성에 대한 기여는 GitHub 풀 리퀘스트 형태로 -이루어져야 합니다. 각 풀 리퀘스트는 핵심 기여자 (패치 적용 권한이 -있는 사람)가 검토하여 메인 트리에 추가하거나 필요한 변경 사항에 -대한 피드백을 제공합니다. 핵심 기여자의 기여를 포함하여 모든 기여는 -이 형식을 따라야 합니다. +RustDesk 프로젝트 또는 관련 라이브러리에 대한 기여는 GitHub 풀 리퀘스트(Pull Request) 형태로 이루어져야 합니다. +각 풀 리퀘스트는 핵심 기여자(패치 적용 권한이 있는 사람)가 검토하며, +메인 브랜치에 통합되거나 필요한 변경 사항에 대한 피드백을 받게 됩니다. +핵심 기여자를 포함한 모든 기여자는 이 형식을 따라야 합니다. -이슈에 대해 작업하고 싶으시면 먼저 해당 이슈에 대해 작업하고 싶다는 -댓글을 달아 해당 이슈를 요청하세요. 이는 동일한 이슈에 대한 기여자의 -중복된 노력을 방지하기 위한 것입니다. +특정 이슈에 대해 작업하고 싶다면, 먼저 해당 GitHub 이슈에 댓글을 달아 작업 의사를 알려주세요. +이는 여러 기여자가 동일한 이슈에 대해 중복으로 작업하는 것을 방지하기 위함입니다. ## 풀 리퀘스트 체크리스트 -- Master 브랜치에서 브랜치를 만들고, 필요한 경우 풀 리퀘스트를 제출하기 - 전에 현재 마스터 브랜치로 리베이스하세요. 마스터 브랜치와 깔끔하게 - 병합되지 않으면 변경 사항을 리베이스하라는 요청을 받을 수 있습니다. +- master 브랜치에서 새 브랜치를 만들고, 필요한 경우 Pull Request를 제출하기 전에 현재 master + 브랜치로 리베이스하세요. master 브랜치와 깔끔하게 병합(merge)되지 않으면 변경 사항을 + 리베이스하도록 요청받을 수 있습니다. -- 커밋은 가능한 한 작아야 하지만, 각 커밋이 독립적으로 올바른지 확인 - 해야 합니다 (즉, 각 커밋은 컴파일되어 테스트를 통과해야 함). +- 커밋(commit)은 가능한 한 작게 유지하고, 각 커밋이 독립적으로 올바른지 (즉, 각 커밋이 컴파일되고 테스트를 통과하는지) 확인해야 합니다. -- 커밋에는 개발자 출처 증명서 (http://developercertificate.org) - 서명이 첨부되어야 하며, 이는 귀하 (및 해당되는 경우 고용주)가 - [프로젝트 라이선스](../LICENCE). 조건에 구속되는 데 동의한다는 것을 나타냅니다. - git에서는 `git commit`에 `-s` 옵션입니다 +- 커밋에는 개발자 원본 증명서(DCO, Developer Certificate of Origin - http://developercertificate.org) 서명이 포함되어야 합니다. 이는 기여자(해당하는 경우 + 기여자의 고용주 포함)가 [프로젝트 라이선스](../LICENCE) 조건에 동의함을 의미합니다. + Git에서는 `git commit` 명령어에 `-s` 옵션을 사용합니다. -- 패치가 검토되지 않거나 특정인이 검토해야 하는 경우, 풀 리퀘스트나 - 댓글에서 검토자에게 @-답글을 보내 검토를 요청하거나 - [이메일](mailto:info@rustdesk.com)을 통해 검토를 요청할 수 있습니다. +- 패치가 검토되지 않거나 특정 리뷰어의 검토가 필요하다면, 풀 리퀘스트나 댓글에서 + @멘션으로 리뷰어에게 알리거나 [이메일](mailto:info@rustdesk.com)로 검토를 요청할 수 있습니다. -- 수정된 버그 또는 새 기능과 관련된 테스트를 추가합니다. +- 수정한 버그나 추가한 기능과 관련된 테스트 코드를 포함해 주세요. -구체적인 git 지침은, [GitHub workflow 101](https://github.com/servo/servo/wiki/GitHub-workflow)을 참조하세요. +Git 사용에 대한 자세한 내용은 [GitHub workflow 101](https://github.com/servo/servo/wiki/GitHub-workflow) 문서를 참고하세요. -## 행동 강령 +## 기여자 행동 강령 https://github.com/rustdesk/rustdesk/blob/master/docs/CODE_OF_CONDUCT.md -## 커뮤니케이션 +## 소통 채널 -RustDesk 기여자들은 [Discord](https://discord.gg/nDceKgxnkV)에서 활동하고 있습니다. +RustDesk 기여자들은 주로 [Discord](https://discord.gg/nDceKgxnkV)에서 소통합니다. diff --git a/docs/CONTRIBUTING-RO.md b/docs/CONTRIBUTING-RO.md deleted file mode 100644 index 8249fb80f..000000000 --- a/docs/CONTRIBUTING-RO.md +++ /dev/null @@ -1,31 +0,0 @@ -# Contribuții la RustDesk - -RustDesk primește cu plăcere contribuții din partea tuturor. Iată ghidurile dacă te gândești să ne ajuți: - -## Contribuții - -Contribuțiile la RustDesk sau la dependențele sale ar trebui făcute sub forma de pull request-uri pe GitHub. Fiecare pull request va fi revizuit de un contributor principal (cineva cu permisiunea de a aplica patch-uri) și fie va fi integrat în arborele principal, fie vor fi oferite sugestii pentru modificările necesare. Toate contribuțiile trebuie să urmeze acest format, chiar și cele ale contributorilor principali. - -Dacă dorești să lucrezi la o problemă, te rugăm să o revendici mai întâi comentând pe GitHub issue-ul pe care vrei să lucrezi. Aceasta previne eforturi duplicate din partea contributorilor asupra aceleiași probleme. - -## Lista de verificare pentru Pull Request - -- Creează un branch din branch-ul `master` și, dacă este necesar, fă rebase la branch-ul `master` curent înainte de a trimite pull request-ul. Dacă nu se poate integra curat cu `master`, ți se poate cere să faci rebase la modificările tale. - -- Commit-urile ar trebui să fie cât mai mici posibil, asigurând totodată că fiecare commit este corect independent (adică fiecare commit ar trebui să compileze și să treacă testele). - -- Commit-urile trebuie să fie însoțite de un semnătura Developer Certificate of Origin (http://developercertificate.org), care indică faptul că tu (și angajatorul tău, dacă este cazul) ești de acord să respecți termenii [licenței proiectului](../LICENCE). În git, aceasta este opțiunea `-s` la `git commit`. - -- Dacă patch-ul tău nu este revizuit sau ai nevoie ca o anumită persoană să-l revizuiască, poți @-reply unui reviewer cerând o revizuire în pull request sau într-un comentariu, sau poți solicita o revizuire prin [email](mailto:info@rustdesk.com). - -- Adaugă teste relevante pentru bug-ul corectat sau pentru funcționalitatea nouă. - -Pentru instrucțiuni specifice git, vezi [GitHub workflow 101](https://github.com/servo/servo/wiki/GitHub-workflow). - -## Conduită - -[Codul de Conduită RustDesk](https://github.com/rustdesk/rustdesk/blob/master/docs/CODE_OF_CONDUCT.md) - -## Comunicare - -Contributorii RustDesk frecventează [Discord](https://discord.gg/nDceKgxnkV). diff --git a/docs/DEVCONTAINER-DE.md b/docs/DEVCONTAINER-DE.md new file mode 100644 index 000000000..2a0d73f17 --- /dev/null +++ b/docs/DEVCONTAINER-DE.md @@ -0,0 +1,14 @@ + +Nach dem Start von Dev-Container im Docker-Container wird ein Linux-Binrprogramm im Debug-Modus erstellt. + +Derzeit bietet Dev-Container Linux- und Android-Builds sowohl im Debug- als auch im Release-Modus an. + +Nachfolgend finden Sie eine Tabelle mit Befehlen, die im Stammverzeichnis des Projekts ausgefhrt werden mssen, um bestimmte Builds zu erstellen. + +Kommando|Build-Typ|Modus +-|-|-| +`.devcontainer/build.sh --debug linux`|Linux|debug +`.devcontainer/build.sh --release linux`|Linux|release +`.devcontainer/build.sh --debug android`|android-arm64|debug +`.devcontainer/build.sh --release android`|android-arm64|release + diff --git a/docs/DEVCONTAINER-IT.md b/docs/DEVCONTAINER-IT.md new file mode 100644 index 000000000..713c6fc37 --- /dev/null +++ b/docs/DEVCONTAINER-IT.md @@ -0,0 +1,14 @@ + +Dopo l'avvio di devcontainer nel contenitore docker, viene creato un binario linux in modalità debug. + +Attualmente devcontainer consente creazione build Linux e Android sia in modalità debug che in modalità rilascio. + +Di seguito è riportata la tabella dei comandi da eseguire dalla root del progetto per la creazione di build specifiche. + +Comando|Tipo build|Modo +-|-|-| +`.devcontainer/build.sh --debug linux`|Linux|debug +`.devcontainer/build.sh --release linux`|Linux|release +`.devcontainer/build.sh --debug android`|android-arm64|debug +`.devcontainer/build.sh --release android`|android-arm64|release + diff --git a/docs/DEVCONTAINER-JP.md b/docs/DEVCONTAINER-JP.md new file mode 100644 index 000000000..d8a599bef --- /dev/null +++ b/docs/DEVCONTAINER-JP.md @@ -0,0 +1,14 @@ + +docker コンテナで devcontainer を起動すると、デバッグモードの linux バイナリが作成されます。 + +現在 devcontainer では、Linux と android のビルドをデバッグモードとリリースモードの両方で提供しています。 + +以下は、特定のビルドを作成するためにプロジェクトのルートから実行するコマンドの表になります。 + +コマンド|ビルド タイプ|モード +-|-|-| +`.devcontainer/build.sh --debug linux`|Linux|debug +`.devcontainer/build.sh --release linux`|Linux|release +`.devcontainer/build.sh --debug android`|android-arm64|debug +`.devcontainer/build.sh --release android`|android-arm64|release + diff --git a/docs/DEVCONTAINER-NL.md b/docs/DEVCONTAINER-NL.md new file mode 100644 index 000000000..cd6ae456d --- /dev/null +++ b/docs/DEVCONTAINER-NL.md @@ -0,0 +1,15 @@ + +Na de start van devcontainer in docker container wordt een linux binaire in foutmodus aangemaakt. + +Momenteel biedt devcontainer linux en android builds in zowel foutopsporing- als uitgave modus. + +Hieronder staat de tabel met commando's die vanuit de root van het project moeten worden +uitgevoerd om specifieke builds te maken. + +Commando|Build Type|Modus +-|-|-| +`.devcontainer/build.sh --debug linux`|Linux|debug +`.devcontainer/build.sh --release linux`|Linux|release +`.devcontainer/build.sh --debug android`|android-arm64|debug +`.devcontainer/build.sh --release android`|android-arm64|debug + diff --git a/docs/DEVCONTAINER-NO.md b/docs/DEVCONTAINER-NO.md new file mode 100644 index 000000000..1d944ed5d --- /dev/null +++ b/docs/DEVCONTAINER-NO.md @@ -0,0 +1,14 @@ + +Etter start av devcontainer i docker konteineren, blir en linux binærfil i debug modus laget. + +Nå tilbyr devcontainer linux og android builds i både debug og release modus. + +Under er tabellen over kommandoer som kan kjøres fra rot-direktive for kreasjon av spesefike builds. + +Kommando|Build Type|Modus +-|-|-| +`.devcontainer/build.sh --debug linux`|Linux|debug +`.devcontainer/build.sh --release linux`|Linux|release +`.devcontainer/build.sh --debug android`|android-arm64|debug +`.devcontainer/build.sh --release android`|android-arm64|release + diff --git a/docs/DEVCONTAINER-PL.md b/docs/DEVCONTAINER-PL.md new file mode 100644 index 000000000..0aae2b975 --- /dev/null +++ b/docs/DEVCONTAINER-PL.md @@ -0,0 +1,14 @@ + +Po uruchomieniu devcontainer w kontenerze docker, tworzony jest plik binarny linux w trybue debugowania. + +Obecnie devcontainer oferuje kompilowanie wersji dla linux i android w obu trybach - debugowania i wersji finalnej. + +Poniżej tabela poleceń do uruchomienia z głównego folderu do tworzenia wybranych kompilacji. + +Polecenie|Typ kompilacji|Tryb +-|-|-| +`.devcontainer/build.sh --debug linux`|Linux|debug +`.devcontainer/build.sh --release linux`|Linux|release +`.devcontainer/build.sh --debug android`|android-arm64|debug +`.devcontainer/build.sh --release android`|android-arm64|debug + diff --git a/docs/DEVCONTAINER-TR.md b/docs/DEVCONTAINER-TR.md new file mode 100644 index 000000000..7fc14ce5e --- /dev/null +++ b/docs/DEVCONTAINER-TR.md @@ -0,0 +1,12 @@ +Docker konteynerinde devcontainer'ın başlatılmasından sonra, hata ayıklama modunda bir Linux ikili dosyası oluşturulur. + +Şu anda devcontainer, hata ayıklama ve sürüm modunda hem Linux hem de Android derlemeleri sunmaktadır. + +Aşağıda, belirli derlemeler oluşturmak için projenin kökünden çalıştırılması gereken komutlar yer almaktadır. + +Komut | Derleme Türü | Mod +-|-|- +`.devcontainer/build.sh --debug linux` | Linux | hata ayıklama +`.devcontainer/build.sh --release linux` | Linux | sürüm +`.devcontainer/build.sh --debug android` | Android-arm64 | hata ayıklama +`.devcontainer/build.sh --release android` | Android-arm64 | sürüm diff --git a/docs/DEVCONTAINER.md b/docs/DEVCONTAINER.md new file mode 100644 index 000000000..3d04fd399 --- /dev/null +++ b/docs/DEVCONTAINER.md @@ -0,0 +1,14 @@ + +After the start of devcontainer in docker container, a linux binary in debug mode is created. + +Currently devcontainer offers linux and android builds in both debug and release mode. + +Below is the table on commands to run from root of the project for creating specific builds. + +Command|Build Type|Mode +-|-|-| +`.devcontainer/build.sh --debug linux`|Linux|debug +`.devcontainer/build.sh --release linux`|Linux|release +`.devcontainer/build.sh --debug android`|android-arm64|debug +`.devcontainer/build.sh --release android`|android-arm64|release + diff --git a/docs/README-AR.md b/docs/README-AR.md index 5aa09da88..832ed5e83 100644 --- a/docs/README-AR.md +++ b/docs/README-AR.md @@ -11,7 +11,7 @@ [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) :تواصل معنا عبر -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-%D8%A7%D9%84%D9%85%D9%8A%D8%B2%D8%A7%D8%AA%20%D8%A7%D9%84%D9%85%D8%AA%D9%82%D8%AF%D9%85%D8%A9-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) .Rustبرنامج آخر لسطح المكتب عن بعد، مكتوب بـ يعمل خارج الصندوق، لا حاجة إلى إعدادات. لديك سيطرة كاملة على بياناتك، دون مخاوف بشأن الأمن. يمكنك استخدام خادم diff --git a/docs/README-CS.md b/docs/README-CS.md index b208414fe..a00aa1a58 100644 --- a/docs/README-CS.md +++ b/docs/README-CS.md @@ -12,7 +12,7 @@ Popovídejte si s námi: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Pokro%C4%8Dil%C3%A9%20Funkce-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) Zase další software pro přístup k ploše na dálku, naprogramovaný v jazyce Rust. Funguje hned tak, jak je – není třeba žádného nastavování. Svá data máte ve svých rukách, bez obav o zabezpečení. Je možné používat námi poskytovaný propojovací/předávací (relay) server, [vytvořit si svůj vlastní](https://rustdesk.com/server), nebo [si dokonce svůj vlastní naprogramovat](https://github.com/rustdesk/rustdesk-server-demo), budete-li chtít. diff --git a/docs/README-DA.md b/docs/README-DA.md index 9ad109dde..2c6987053 100644 --- a/docs/README-DA.md +++ b/docs/README-DA.md @@ -11,7 +11,7 @@ Chat med os: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Avancerede%20Funktioner-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) Endnu en fjernskrivebordssoftware, skrevet i Rust. Fungerer ud af æsken, ingen konfiguration påkrævet. Du har fuld kontrol over dine data uden bekymringer om sikkerhed. Du kan bruge vores rendezvous/relay-server, [opsætte din egen](https://rustdesk.com/server), eller [skrive din egen rendezvous/relay-server](https://github.com/rustdesk/rustdesk- server-demo). diff --git a/docs/README-DE.md b/docs/README-DE.md index ba8894411..a4a5453c0 100644 --- a/docs/README-DE.md +++ b/docs/README-DE.md @@ -1,21 +1,22 @@

- RustDesk - Dein Remote-Desktop
+ RustDesk - Your remote desktop
+ Server • Kompilieren • Docker • Dateistruktur • Screenshots
- [Українська] | [česky] | [中文] | [Magyar] | [Español] | [فارسی] | [Français] | [Deutsch] | [Polski] | [Indonesian] | [Suomi] | [മലയാളം] | [日本語] | [Nederlands] | [Italiano] | [Русский] | [Português (Brasil)] | [Esperanto] | [한국어] | [العربي] | [Tiếng Việt] | [Dansk] | [Ελληνικά] | [Türkçe] | [Norsk] | [Română]
+ [English] | [Українська] | [česky] | [中文] | [Magyar] | [Español] | [فارسی] | [Français] | [Polski] | [Indonesian] | [Suomi] | [മലയാളം] | [日本語] | [Nederlands] | [Italiano] | [Русский] | [Português (Brasil)] | [Esperanto] | [한국어] | [العربي] | [Tiếng Việt] | [Dansk] | [Ελληνικά]
Wir brauchen Ihre Hilfe, um dieses README, die RustDesk-Benutzeroberfläche und die Dokumentation in Ihre Muttersprache zu übersetzen.

-> [!Caution] +> [!Vorsicht] > **Haftungsausschluss bei Missbrauch::**
> Die Entwickler von RustDesk billigen oder unterstützen keine unethische oder illegale Nutzung dieser Software. Missbrauch, wie unbefugter Zugriff, unbefugte Kontrolle oder Verletzung der Privatsphäre, verstößt strikt gegen unsere Richtlinien. Die Autoren sind nicht verantwortlich für jeglichen Missbrauch der Anwendung. Reden Sie mit uns auf: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Erweiterte%20Funktionen-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) RustDesk ist eine in Rust geschriebene Remote-Desktop-Software, die out of the box ohne besondere Konfiguration funktioniert. Sie haben die volle Kontrolle über Ihre Daten und müssen sich keine Sorgen um die Sicherheit machen. Sie können unseren Rendezvous/Relay-Server nutzen, [einen eigenen Server aufsetzen](https://rustdesk.com/server) oder [einen eigenen Server programmieren](https://github.com/rustdesk/rustdesk-server-demo). @@ -27,14 +28,11 @@ RustDesk heißt jegliche Mitarbeit willkommen. Schauen Sie sich [CONTRIBUTING-DE [**Programm herunterladen**](https://github.com/rustdesk/rustdesk/releases) -[**Nightly Builds**](https://github.com/rustdesk/rustdesk/releases/tag/nightly) +[**Nächtliche Erstellung**](https://github.com/rustdesk/rustdesk/releases/tag/nightly) -[Get it on F-Droid](https://f-droid.org/en/packages/com.carriez.flutter_hbb) -[Get it on Flathub](https://flathub.org/apps/com.rustdesk.RustDesk) ## Abhängigkeiten @@ -66,19 +64,18 @@ Bitte laden Sie die dynamische Bibliothek Sciter selbst herunter. ```sh sudo apt install -y zip g++ gcc git curl wget nasm yasm libgtk-3-dev clang libxcb-randr0-dev libxdo-dev \ libxfixes-dev libxcb-shape0-dev libxcb-xfixes0-dev libasound2-dev libpulse-dev cmake make \ - libclang-dev ninja-build libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libpam0g-dev + libclang-dev ninja-build libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev ``` ### openSUSE Tumbleweed ```sh -sudo zypper install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libXfixes-devel cmake alsa-lib-devel gstreamer-devel gstreamer-plugins-base-devel xdotool-devel pam-devel +sudo zypper install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libXfixes-devel cmake alsa-lib-devel gstreamer-devel gstreamer-plugins-base-devel xdotool-devel ``` - ### Fedora 28 (CentOS 8) ```sh -sudo yum -y install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libxdo-devel libXfixes-devel pulseaudio-libs-devel cmake alsa-lib-devel gstreamer1-devel gstreamer1-plugins-base-devel pam-devel +sudo yum -y install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libxdo-devel libXfixes-devel pulseaudio-libs-devel cmake alsa-lib-devel ``` ### Arch (Manjaro) @@ -117,7 +114,7 @@ cd ```sh curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh source $HOME/.cargo/env -git clone --recurse-submodules https://github.com/rustdesk/rustdesk +git clone https://github.com/rustdesk/rustdesk cd rustdesk mkdir -p target/debug wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so @@ -132,7 +129,6 @@ Beginnen Sie damit, das Repository zu klonen und den Docker-Container zu bauen: ```sh git clone https://github.com/rustdesk/rustdesk cd rustdesk -git submodule update --init --recursive docker build -t "rustdesk-builder" . ``` @@ -161,7 +157,6 @@ Bitte stellen Sie sicher, dass Sie diese Befehle im Stammverzeichnis des RustDes - **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: Video-Codec, Konfiguration, TCP/UDP-Wrapper, Protokoll-Puffer, fs-Funktionen für Dateitransfer und ein paar andere nützliche Funktionen - **[libs/scrap](https://github.com/rustdesk/rustdesk/tree/master/libs/scrap)**: Bildschirmaufnahme - **[libs/enigo](https://github.com/rustdesk/rustdesk/tree/master/libs/enigo)**: Plattformspezifische Maus- und Tastatursteuerung -- **[libs/clipboard](https://github.com/rustdesk/rustdesk/tree/master/libs/clipboard)**: Datei kopieren und einfügen Implementierung für Windows, Linux, macOS. - **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: GUI - **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: Audio/Zwischenablage/Eingabe/Videodienste und Netzwerkverbindungen - **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: Starten einer Peer-Verbindung @@ -172,11 +167,10 @@ Bitte stellen Sie sicher, dass Sie diese Befehle im Stammverzeichnis des RustDes ## Screenshots -![Verbindungsmanager](https://github.com/rustdesk/rustdesk/assets/28412477/db82d4e7-c4bc-4823-8e6f-6af7eadf7651) +![image](https://user-images.githubusercontent.com/71636191/113112362-ae4deb80-923b-11eb-957d-ff88daad4f06.png) -![Verbunden zu einem Windows PC](https://github.com/rustdesk/rustdesk/assets/28412477/9baa91e9-3362-4d06-aa1a-7518edcbd7ea) +![image](https://user-images.githubusercontent.com/71636191/113112619-f705a480-923b-11eb-911d-97e984ef52b6.png) -![Dateiübertragung](https://github.com/rustdesk/rustdesk/assets/28412477/39511ad3-aa9a-4f8c-8947-1cce286a46ad) - -![TCP-Tunneling](https://github.com/rustdesk/rustdesk/assets/28412477/78e8708f-e87e-4570-8373-1360033ea6c5) +![image](https://user-images.githubusercontent.com/71636191/113112857-3fbd5d80-923c-11eb-9836-768325faf906.png) +![image](https://user-images.githubusercontent.com/71636191/135385039-38fdbd72-379a-422d-b97f-33df71fb1cec.png) diff --git a/docs/README-EO.md b/docs/README-EO.md index d2a9315ec..e6bbd3dde 100644 --- a/docs/README-EO.md +++ b/docs/README-EO.md @@ -11,7 +11,7 @@ Babili kun ni: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Altnivela%20Funkcioj-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) Denove alia fora labortabla programo, skribita en Rust. Ĝi funkcias elskatole, ne bezonas konfiguraĵon. Vi havas la tutan kontrolon sur viaj datumoj, sen zorgo pri sekureco. Vi povas uzi nian servilon rendezvous/relajsan, [agordi vian propran](https://rustdesk.com/server), aŭ [skribi vian propran servilon rendezvous/relajsan](https://github.com/rustdesk/rustdesk-server-demo). diff --git a/docs/README-ES.md b/docs/README-ES.md index da939bd7b..607295bea 100644 --- a/docs/README-ES.md +++ b/docs/README-ES.md @@ -15,7 +15,7 @@ Chatea con nosotros: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Caracter%C3%ADsticas%20Avanzadas-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) Otro software de escritorio remoto, escrito en Rust. Funciona de forma inmediata, sin necesidad de configuración. Tienes el control total de tus datos, sin preocupaciones sobre la seguridad. Puedes utilizar nuestro servidor de rendezvous/relay, [instalar el tuyo](https://rustdesk.com/server), o [escribir tu propio servidor rendezvous/relay](https://github.com/rustdesk/rustdesk-server-demo). diff --git a/docs/README-FA.md b/docs/README-FA.md index a0645e02b..704775ffc 100644 --- a/docs/README-FA.md +++ b/docs/README-FA.md @@ -12,7 +12,7 @@ با ما گفتگو کنید: [Reddit](https://www.reddit.com/r/rustdesk) | [Twitter](https://twitter.com/rustdesk) | [Discord](https://discord.gg/nDceKgxnkV) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-%D9%88%DB%8C%DA%98%DA%AF%DB%8C%E2%80%8C%D9%87%D8%A7%DB%8C%20%D9%BE%DB%8C%D8%B4%D8%B1%D9%81%D8%AA%D9%87-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) راست‌دسک (RustDesk) نرم‌افزاری برای کارکردن با رایانه‌ی رومیزی از راه دور است و با زبان برنامه‌نویسی Rust نوشته شده است. نیاز به تنظیمات چندانی ندارد و شما را قادر می سازد تا بدون نگرانی از امنیت اطلاعات خود بر آن‌ها کنترل کامل داشته باشید. diff --git a/docs/README-FI.md b/docs/README-FI.md index 4c167978c..b0956c212 100644 --- a/docs/README-FI.md +++ b/docs/README-FI.md @@ -11,7 +11,7 @@ Juttele meidän kanssa: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Edistyneet%20Ominaisuudet-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) Vielä yksi etätyöpöytäohjelmisto, ohjelmoitu Rust-kielellä. Toimii suoraan pakkauksesta, ei tarvitse asetusta. Hallitset täysin tietojasi, ei tarvitse murehtia turvallisuutta. Voit käyttää meidän rendezvous/relay-palvelinta, [aseta omasi](https://rustdesk.com/server), tai [kirjoittaa oma rendezvous/relay-palvelin](https://github.com/rustdesk/rustdesk-server-demo). diff --git a/docs/README-FR.md b/docs/README-FR.md index 345e53b58..39ff74f20 100644 --- a/docs/README-FR.md +++ b/docs/README-FR.md @@ -11,7 +11,7 @@ Chattez avec nous : [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Fonctionnalit%C3%A9s%20Avanc%C3%A9es-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) Encore un autre logiciel de bureau à distance, écrit en Rust. Fonctionne directement, aucune configuration n'est nécessaire. 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, [configurer le vôtre](https://rustdesk.com/server), ou [écrire votre propre serveur de rendez-vous/relais](https://github.com/rustdesk/rustdesk-server-demo). @@ -34,9 +34,9 @@ Les versions de bureau utilisent [sciter](https://sciter.com/) pour l'interface - Installez [vcpkg](https://github.com/microsoft/vcpkg), et définissez correctement la variable d'environnement `VCPKG_ROOT`. - Windows : vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static - - Linux/macOS : vcpkg install libvpx libyuv opus aom + - Linux/Osx : vcpkg install libvpx libyuv opus aom -- Exécutez `cargo run` +- Exécuter `cargo run` ## Comment compiler/build sous Linux @@ -93,7 +93,7 @@ cd rustdesk mkdir -p target/debug wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so mv libsciter-gtk.so target/debug -cargo run +Exécution du cargo ``` ## Comment construire avec Docker diff --git a/docs/README-GR.md b/docs/README-GR.md index 8b0276bf8..d834708ba 100644 --- a/docs/README-GR.md +++ b/docs/README-GR.md @@ -11,7 +11,7 @@ Επικοινωνήστε μαζί μας μέσω: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-%CE%A0%CF%81%CE%BF%CE%B7%CE%B3%CE%BC%CE%AD%CE%BD%CE%B5%CF%82%20%CE%94%CF%85%CE%BD%CE%B1%CF%84%CF%8C%CF%84%CE%B7%CF%84%CE%B5%CF%82-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) Ένα λογισμικό απομακρυσμένης επιφάνειας εργασίας, γραμμένο σε γλώσσα Rust. Δεν χρειάζεται κάποια παραμετροποίηση, λειτουργεί αμέσως μετά την εγκατάσταση. Έχετε τον πλήρη έλεγχο των δεδομένων σας, χωρίς να ανησυχείτε για την ασφάλειά τους. Μπορείτε να χρησιμοποιήσετε τους προκαθορισμένους διακομιστές rendezvous/αναμετάδοσης, [να εγκαταστήσετε τον δικό σας διακομιστή](https://rustdesk.com/server), ή [να αναπτύξετε ένα δικό σας διακομιστή rendezvous/αναμετάδοσης](https://github.com/rustdesk/rustdesk-server-demo). diff --git a/docs/README-HU.md b/docs/README-HU.md index 82d1d5550..c0275f7f1 100644 --- a/docs/README-HU.md +++ b/docs/README-HU.md @@ -11,7 +11,7 @@ Beszélgess velünk: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Speci%C3%A1lis%20Funkci%C3%B3k-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) A RustDesk egy távoli elérésű asztali szoftver, Rust-ban írva. Működik mindenféle konfiguráció nélkül, feltelepítéssel, vagy anélkül. Az adataidat teljesen te kezeled, nincs szükség aggódásra a harmadik felek miatt. Használhatod a RustDesk punblikus randevú/relay szervereit, [hostolhatsz sajátot](https://rustdesk.com/server), vagy akár [írhatsz is egyet](https://github.com/rustdesk/rustdesk-server-demo). diff --git a/docs/README-ID.md b/docs/README-ID.md index 7b63d0e7e..b953b604e 100644 --- a/docs/README-ID.md +++ b/docs/README-ID.md @@ -11,7 +11,7 @@ Mari mengobrol bersama kami: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Fitur%20Lanjutan-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) [![Open Bounties](https://img.shields.io/endpoint?url=https%3A%2F%2Fconsole.algora.io%2Fapi%2Fshields%2Frustdesk%2Fbounties%3Fstatus%3Dopen)](https://console.algora.io/org/rustdesk/bounties?status=open) diff --git a/docs/README-IT.md b/docs/README-IT.md index 0393ee6c7..7fac0e6e0 100644 --- a/docs/README-IT.md +++ b/docs/README-IT.md @@ -11,7 +11,7 @@ Chatta con noi su: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Funzionalit%C3%A0%20Avanzate-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) [![Bounties aperti](https://img.shields.io/endpoint?url=https%3A%2F%2Fconsole.algora.io%2Fapi%2Fshields%2Frustdesk%2Fbounties%3Fstatus%3Dopen)](https://console.algora.io/org/rustdesk/bounties?status=open) diff --git a/docs/README-JP.md b/docs/README-JP.md index c9f75640b..9beb259f2 100644 --- a/docs/README-JP.md +++ b/docs/README-JP.md @@ -11,7 +11,7 @@ 私たちと話す: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-%E9%AB%98%E5%BA%A6%E3%81%AA%E6%A9%9F%E8%83%BD-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) Rustで書かれた、設定不要ですぐに使えるリモートデスクトップソフトウェアです。自分のデータを完全にコントロールでき、セキュリティの心配もありません。私たちのランデブー/リレーサーバを使うことも、[自分でサーバーをセットアップする](https://rustdesk.com/server) ことも、 [自分でランデブー/リレーサーバを作成する](https://github.com/rustdesk/rustdesk-server-demo)こともできます。 diff --git a/docs/README-KR.md b/docs/README-KR.md index c301fde05..d3f25509b 100644 --- a/docs/README-KR.md +++ b/docs/README-KR.md @@ -1,44 +1,44 @@

RustDesk - Your remote desktop
- 빌드 • - Docker • - 구조 • - 스냇샷
- [English] | [Українська] | [česky] | [中文] | [Magyar] | [Español] | [فارسی] | [Français] | [Deutsch] | [Polski] | [Indonesian] | [Suomi] | [മലയാളം] | [日本語] | [Nederlands] | [Italiano] | [Русский] | [Português (Brasil)] | [Esperanto] | [한국어] | [العربي] | [Tiếng Việt] | [Dansk] | [Ελληνικά] | [Türkçe] | [Norsk]
- 이 README, RustDesk UI 및 RustDesk 문서를 귀하의 모국어로 번역하는 데 도움이 필요합니다 + Build • + Docker • + Structure • + Snapshot
+ [English] | [Українська] | [česky] | [中文] | [Magyar] | [Español] | [فارسی] | [Français] | [Deutsch] | [Polski] | [Indonesian] | [Suomi] | [മലയാളം] | [日本語] | [Nederlands] | [Italiano] | [Русский] | [Português (Brasil)] | [Esperanto] | [العربي] | [Tiếng Việt] | [Dansk] | [Ελληνικά] | [Türkçe] | [Norsk]
+ 이 README와 RustDesk UI 및 RustDesk 문서를 여러분의 모국어로 번역하는 데 도움이 필요합니다.

> [!Caution] -> **오용 면책 조항:**
-> RustDesk의 개발자는 이 소프트웨어의 비윤리적 또는 불법적인 사용을 묵인하거나 지원하지 않습니다. 무단 액세스, 제어 또는 개인정보 침해와 같은 오용은 엄격하게 당사의 지침에 위배됩니다. 작성자는 응용 프로그램의 오용에 대해 책임을 지지 않습니다. +> **오용 관련 면책 조항:**
+> RustDesk 개발자는 이 소프트웨어의 비윤리적이거나 불법적인 사용을 용납하거나 지원하지 않습니다. 무단 액세스, 제어 또는 사생활 침해와 같은 오용은 당사의 가이드라인에 엄격히 위배됩니다. 개발자는 애플리케이션의 오용에 대해 책임을 지지 않습니다. + +채팅하기: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -우리와 채팅: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-%EA%B3%A0%EA%B8%89%20%EA%B8%B0%EB%8A%A5-blue)](https://rustdesk.com/pricing.html) - -또 하나의 원격 데스크톱 솔루션으로, Rust로 작성되었습니다. 별도의 설정 없이 바로 사용할 수 있습니다. 데이터에 대한 완전한 통제권을 가지며 보안에 대한 걱정이 없습니다. 저희 랑데부/릴레이 서버를 사용하거나, [직접 설정](https://rustdesk.com/server)하거나, [자신만의 랑데부/릴레이 서버를 작성](https://github.com/rustdesk/rustdesk-server-demo)할 수 있습니다. +Rust로 작성되었고, 설정 없이 바로 사용할 수 있는 원격 데스크톱 소프트웨어입니다. 자신의 데이터를 완전히 제어할 수 있고, 보안 염려도 없습니다. 저희 rendezvous/relay 서버를 사용하거나, [직접 설정](https://rustdesk.com/server)하거나 [자체 rendezvous/relay 서버를 구축](https://github.com/rustdesk/rustdesk-server-demo)할 수도 있습니다. ![image](https://user-images.githubusercontent.com/71636191/171661982-430285f0-2e12-4b1d-9957-4a58e375304d.png) -RustDesk는 모든 분들의 기여를 환영합니다. 시작하는 데 도움이 필요하면 [CONTRIBUTING-KR.md](CONTRIBUTING-KR.md)를 참조하세요. +RustDesk는 모든 기여를 환영합니다. 기여하고 싶다면 [`CONTRIBUTING-KR.md`](CONTRIBUTING-KR.md)를 참고해 주세요. -[**자주 묻는 질문**](https://github.com/rustdesk/rustdesk/wiki/FAQ) +[**자주 묻는 질문 (FAQ)**](https://github.com/rustdesk/rustdesk/wiki/FAQ) [**바이너리 다운로드**](https://github.com/rustdesk/rustdesk/releases) -[**개발자 빌드**](https://github.com/rustdesk/rustdesk/releases/tag/nightly) +[**나이틀리 빌드**](https://github.com/rustdesk/rustdesk/releases/tag/nightly) [Get it on F-Droid](https://f-droid.org/en/packages/com.carriez.flutter_hbb) [Get it on Flathub](https://flathub.org/apps/com.rustdesk.RustDesk) -## 종속성 +## 의존성 -데스크톱 버전은 GUI로 Flutter 또는 Sciter (더 이상 지원되지 않음)를 사용하며, 이 자습서는 시작하기 더 쉽고 친숙한 Sciter 전용입니다. Flutter 버전 빌드는 [CI](https://github.com/rustdesk/rustdesk/blob/master/.github/workflows/flutter-build.yml)을 확인하세요. +데스크톱 버전은 GUI에 Flutter 또는 Sciter (지원 중단됨)를 사용합니다. 이 튜토리얼은 Sciter 전용이며, 시작하기 더 쉽고 친숙하기 때문입니다. Flutter 버전 빌드는 [CI](https://github.com/rustdesk/rustdesk/blob/master/.github/workflows/flutter-build.yml)를 확인하세요. Sciter 동적 라이브러리를 직접 다운로드하세요. @@ -46,20 +46,20 @@ Sciter 동적 라이브러리를 직접 다운로드하세요. [Linux](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so) | [macOS](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.osx/libsciter.dylib) -## 빌드를 위한 원시 단계 +## 기본 빌드 방법 -- Rust 개발 환경과 C++ 빌드 환경을 준비합니다 +- Rust 개발 환경과 C++ 빌드 환경을 준비하세요. -- [vcpkg](https://github.com/microsoft/vcpkg)를 설치하고 `VCPKG_ROOT` 환경 변수를 올바르게 설정합니다 +- [vcpkg](https://github.com/microsoft/vcpkg)를 설치하고 `VCPKG_ROOT` 환경변수를 정확히 설정하세요. - Windows: vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static - - Linux/macOS: vcpkg install libvpx libyuv opus aom + - Linux/MacOS: vcpkg install libvpx libyuv opus aom -- `cargo run` 실행 +- `cargo run`을 실행합니다. ## [빌드](https://rustdesk.com/docs/en/dev/build/) -## Linux에서 빌드하는 방법 +## Linux에서 빌드 방법 ### Ubuntu 18 (Debian 10) @@ -99,7 +99,7 @@ export VCPKG_ROOT=$HOME/vcpkg vcpkg/vcpkg install libvpx libyuv opus aom ``` -### libvpx 수정 (Fedora용) +### libvpx 수정 (For Fedora용) ```sh cd vcpkg/buildtrees/libvpx/src @@ -136,41 +136,41 @@ git submodule update --init --recursive docker build -t "rustdesk-builder" . ``` -그런 다음 응용 프로그램을 빌드해야 할 때마다 다음 명령을 실행합니다: +그 다음, 애플리케이션을 빌드하려면 다음 명령을 실행하세요: ```sh docker run --rm -it -v $PWD:/home/user/rustdesk -v rustdesk-git-cache:/home/user/.cargo/git -v rustdesk-registry-cache:/home/user/.cargo/registry -e PUID="$(id -u)" -e PGID="$(id -g)" rustdesk-builder ``` -첫 번째 빌드는 종속성이 캐시되기까지 시간이 오래 걸릴 수 있으며, 이후 빌드는 더 빨라집니다. 또한 빌드 명령에 다른 인수를 지정해야 하는 경우 명령 끝의 `` 위치에 인수를 지정할 수 있습니다. 예를 들어 최적화된 릴리스 버전을 빌드하려면 위의 명령 뒤에 `--release`를 추가하면 됩니다. 결과 실행 파일은 시스템의 대상 폴더에서 사용할 수 있으며 실행할 수 있습니다:: +첫 빌드 시에는 의존성이 캐시되느라 시간이 더 걸릴 수 있지만, 그 이후 빌드부터는 더 빨라집니다. 빌드 명령에 다른 인수를 추가하고 싶다면, 명령 끝의 `` 부분에 지정하세요. 예를 들어, 최적화된 릴리즈 버전을 빌드하고 싶다면 위 명령 뒤에 `--release`를 붙여 실행합니다. 결과 실행 파일은 시스템의 target 폴더에 생성되며, 다음 명령으로 실행할 수 있습니다: ```sh target/debug/rustdesk ``` -또는 릴리스 실행 파일을 실행하는 경우: +또는, 릴리즈 실행 파일을 실행하는 경우: ```sh target/release/rustdesk ``` -RustDesk 리포지토리의 루트에서 이러한 명령을 실행하고 있는지 확인하세요. 그렇지 않으면 응용 프로그램이 필요한 리소스를 찾지 못할 수 있습니다. 또한 `install` 또는 `run` 과 같은 다른 cargo 하위 명령은 호스트가 아닌 컨테이너 내부에 프로그램을 설치하거나 실행하므로 현재 이 방법을 통해 지원되지 않는다는 점에 유의하세요. +이 명령들은 RustDesk 리포지토리의 루트 디렉토리에서 실행해야 합니다. 그렇지 않으면 애플리케이션이 필요한 리소스를 찾지 못할 수 있습니다. 또한, `install` 또는 `run`과 같은 cargo 하위 명령은 호스트가 아닌 컨테이너 내부에 프로그램을 설치하거나 실행하므로 현재 이 방식은 지원되지 않습니다. 이 점에 유의해 주세요. ## 파일 구조 -- **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: 비디오 코덱, 구성, tcp/udp wrapper, protobuf, 파일 전송을 위한 fs 함수 및 기타 유틸리티 함수 -- **[libs/scrap](https://github.com/rustdesk/rustdesk/tree/master/libs/scrap)**: 화면 캡쳐 +- **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: 비디오 코덱, 설정, TCP/UDP 래퍼, Protobuf, 파일 전송을 위한 fs 함수 및 기타 유틸리티 함수 +- **[libs/scrap](https://github.com/rustdesk/rustdesk/tree/master/libs/scrap)**: 화면 캡처 - **[libs/enigo](https://github.com/rustdesk/rustdesk/tree/master/libs/enigo)**: 플랫폼별 키보드/마우스 제어 - **[libs/clipboard](https://github.com/rustdesk/rustdesk/tree/master/libs/clipboard)**: Windows, Linux, macOS용 파일 복사 및 붙여넣기 구현 -- **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: 더 이상 사용되지 않는 Sciter UI (지원 중단) +- **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: 더 이상 사용되지 않는 Sciter UI (지원 중단됨) - **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: 오디오/클립보드/입력/비디오 서비스 및 네트워크 연결 - **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: 피어 연결 시작 -- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: [rustdesk-server](https://github.com/rustdesk/rustdesk-server)와 통신, 원격 다이렉트 (TCP 홀 펀칭) 또는 릴레이 연결 대기 +- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: [rustdesk-server](https://github.com/rustdesk/rustdesk-server)와 통신, Remote Direct (TCP Hole Punching) 또는 Relayed Connection 대기 - **[src/platform](https://github.com/rustdesk/rustdesk/tree/master/src/platform)**: 플랫폼별 코드 - **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: 데스크톱 및 모바일용 Flutter 코드 - **[flutter/web/js](https://github.com/rustdesk/rustdesk/tree/master/flutter/web/v1/js)**: Flutter 웹 클라이언트용 JavaScript -## 스크린샷 +## 스냅샷 ![Connection Manager](https://github.com/rustdesk/rustdesk/assets/28412477/db82d4e7-c4bc-4823-8e6f-6af7eadf7651) diff --git a/docs/README-ML.md b/docs/README-ML.md index 225d7b952..13b74ff02 100644 --- a/docs/README-ML.md +++ b/docs/README-ML.md @@ -11,7 +11,7 @@ ഞങ്ങളുമായി ചാറ്റ് ചെയ്യുക: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-%E0%B4%B5%E0%B4%BF%E0%B4%95%E0%B4%B8%E0%B4%BF%E0%B4%A4%20%E0%B4%B8%E0%B4%B5%E0%B4%BF%E0%B4%B6%E0%B5%87%E0%B4%B7%E0%B4%A4%E0%B4%95%E0%B5%BE-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) റസ്റ്റിൽ എഴുതിയ മറ്റൊരു റിമോട്ട് ഡെസ്ക്ടോപ്പ് സോഫ്റ്റ്‌വെയർ. ബോക്‌സിന് പുറത്ത് പ്രവർത്തിക്കുന്നു, കോൺഫിഗറേഷൻ ആവശ്യമില്ല. സുരക്ഷയെക്കുറിച്ച് ആശങ്കകളൊന്നുമില്ലാതെ, നിങ്ങളുടെ ഡാറ്റയുടെ പൂർണ്ണ നിയന്ത്രണം നിങ്ങൾക്കുണ്ട്. നിങ്ങൾക്ക് ഞങ്ങളുടെ rendezvous/relay സെർവർ ഉപയോഗിക്കാം, [സ്വന്തമായി സജ്ജീകരിക്കുക](https://rustdesk.com/server), അല്ലെങ്കിൽ [നിങ്ങളുടെ സ്വന്തം rendezvous/relay സെർവർ എഴുതുക](https://github.com/rustdesk/rustdesk-server-demo). diff --git a/docs/README-NL.md b/docs/README-NL.md index 45d68b20e..cb5f5b343 100644 --- a/docs/README-NL.md +++ b/docs/README-NL.md @@ -11,7 +11,7 @@ Chat met ons: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Geavanceerde%20Functies-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) Alweer een andere programma voor -bureaublad op afstand-, geschreven in Rust. Werkt -out of the box-, geen configuratie nodig. U heeft volledige controle over uw gegevens, en hoeft zich geen zorgen te maken over de beveiliging. U kunt onze rendez-vous/relay server gebruiken, [je eigen server opzetten](https://rustdesk.com/blog/id-relay-set), of [je eigen rendez-vous/relay-server schrijven](https://github.com/rustdesk/rustdesk-server-demo). diff --git a/docs/README-NO.md b/docs/README-NO.md index 1352e8aed..e77dcf853 100644 --- a/docs/README-NO.md +++ b/docs/README-NO.md @@ -11,7 +11,7 @@ Snakk med oss: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Avanserte%20Funksjoner-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) Enda en annen fjernstyrt desktop programvare, skrevet i Rust. Virker rett ut av pakken, ingen konfigurasjon nødvendig. Du har full kontroll over din data, uten beskymring for sikkerhet. Du kan bruke vår rendezvous_mediator/relay server, [sett opp din egen](https://rustdesk.com/server), eller [skriv din egen rendezvous_mediator/relay server](https://github.com/rustdesk/rustdesk-server-demo). diff --git a/docs/README-PL.md b/docs/README-PL.md index 437682a9c..a68d87dfc 100644 --- a/docs/README-PL.md +++ b/docs/README-PL.md @@ -11,11 +11,9 @@ Porozmawiaj z nami na: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Zaawansowane%20Funkcje-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) -## O projekcie - -RustDesk to wieloplatformowe oprogramowanie do zdalnego pulpitu, napisane w języku Rust, zaprojektowane z myślą o prostocie wdrożenia, bezpieczeństwie i pełnej kontroli użytkownika nad danymi. Aplikacja działa od razu po uruchomieniu i nie wymaga skomplikowanej konfiguracji. Możesz skorzystać z naszego darmowego serwera publicznego, [skonfigurować własny](https://rustdesk.com/server), lub [napisać własny serwer](https://github.com/rustdesk/rustdesk-server-demo). +Kolejny program do zdalnego pulpitu, napisany w Rust. Działa od samego początku, nie wymaga konfiguracji. Masz pełną kontrolę nad swoimi danymi, bez obaw o bezpieczeństwo. Możesz skorzystać z naszego darmowego serwera publicznego, [skonfigurować własny](https://rustdesk.com/server), lub [napisać własny serwer](https://github.com/rustdesk/rustdesk-server-demo). ![image](https://user-images.githubusercontent.com/71636191/171661982-430285f0-2e12-4b1d-9957-4a58e375304d.png) @@ -33,7 +31,7 @@ RustDesk zaprasza do współpracy każdego. Zobacz [`docs/CONTRIBUTING-PL.md`](C ## Zależności -Wersje desktopowe korzystają z biblioteki [sciter](https://sciter.com/) jako silnika GUI. Bibliotekę Sciter należy pobrać i zainstalować samodzielnie. +Wersje desktopowe używają [sciter](https://sciter.com/) dla GUI, proszę pobrać samodzielnie bibliotekę sciter. [Windows](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.win/x64/sciter.dll) | [Linux](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so) | diff --git a/docs/README-PTBR.md b/docs/README-PTBR.md index 6c3e6b99f..ff1e8f7ef 100644 --- a/docs/README-PTBR.md +++ b/docs/README-PTBR.md @@ -11,7 +11,7 @@ Converse conosco: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Recursos%20Avan%C3%A7ados-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) Mais um software de desktop remoto, escrito em Rust. Funciona por padrão, sem necessidade de configuração. Você tem completo controle de seus dados, sem se preocupar com segurança. Você pode usar nossos servidores de rendezvous/relay, [configurar seu próprio](https://rustdesk.com/server), ou [escrever seu próprio servidor de rendezvous/relay](https://github.com/rustdesk/rustdesk-server-demo). diff --git a/docs/README-RO.md b/docs/README-RO.md deleted file mode 100644 index be7ecf164..000000000 --- a/docs/README-RO.md +++ /dev/null @@ -1,181 +0,0 @@ -

- RustDesk - desktopul tău la distanță
- Construire • - Docker • - Structură • - Capturi
- [Українська] | [česky] | [中文] | [Magyar] | [Español] | [فارسی] | [Français] | [Deutsch] | [Polski] | [Indonesian] | [Suomi] | [മലയാളം] | [日本語] | [Nederlands] | [Italiano] | [Русский] | [Português (Brasil)] | [Esperanto] | [한국어] | [العربي] | [Tiếng Việt] | [Dansk] | [Ελληνικά] | [Türkçe] | [Norsk] | [Română]
- Avem nevoie de ajutorul tău pentru a traduce acest README, RustDesk UI și RustDesk Doc în limba ta maternă -

- -> [!Atenție] -> **Declinare de responsabilitate privind utilizarea abuzivă:**
-> Dezvoltatorii RustDesk nu susțin sau aprobă utilizarea neetică sau ilegală a acestui software. Utilizarea abuzivă, cum ar fi accesul neautorizat, controlul sau invadarea intimității, este strict împotriva regulilor noastre. Autorii nu sunt responsabili pentru utilizarea necorespunzătoare a aplicației. - - -Conversați cu noi: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) - -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Advanced%20Features-blue)](https://rustdesk.com/pricing.html) - -Încă o soluție de desktop la distanță scrisă în Rust. Funcționează imediat, fără configurare necesară. Ai control total asupra datelor tale, fără probleme de securitate. Poți folosi serverul nostru de rendezvous/relay, [să-ți configurezi propriul server](https://rustdesk.com/server) sau [să scrii propriul server de rendezvous/relay](https://github.com/rustdesk/rustdesk-server-demo). - -![imagine](https://user-images.githubusercontent.com/71636191/171661982-430285f0-2e12-4b1d-9957-4a58e375304d.png) - -RustDesk primește contribuții de la oricine. Vezi [CONTRIBUTING.md](../docs/CONTRIBUTING.md) pentru ajutor la început. - -[**ÎNTREBĂRI FRECVENTE (FAQ)**](https://github.com/rustdesk/rustdesk/wiki/FAQ) - -[**DESCĂRCARE BINARE**](https://github.com/rustdesk/rustdesk/releases) - -[**BUILD NIGHTLY**](https://github.com/rustdesk/rustdesk/releases/tag/nightly) - -[Get it on F-Droid](https://f-droid.org/en/packages/com.carriez.flutter_hbb) -[Get it on Flathub](https://flathub.org/apps/com.rustdesk.RustDesk) - -## Dependențe - -Versiunile desktop folosesc Flutter sau Sciter (depreciat) pentru interfață; acest ghid este pentru Sciter doar, deoarece este mai ușor și mai prietenos pentru început. Vezi [CI](https://github.com/rustdesk/rustdesk/blob/master/.github/workflows/flutter-build.yml) pentru construire cu Flutter. - -Te rugăm să descarci singur librăria dinamică Sciter. - -[Windows](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.win/x64/sciter.dll) | -[Linux](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so) | -[macOS](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.osx/libsciter.dylib) - -## Pași pentru construire (Raw Steps to build) - -- Pregătește mediul de dezvoltare Rust și mediul de construire C++ - -- Instalează [vcpkg](https://github.com/microsoft/vcpkg) și setează corect variabila de mediu `VCPKG_ROOT` - - - Windows: vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static - - Linux/macOS: vcpkg install libvpx libyuv opus aom - -- rulează `cargo run` - -## [Construire](https://rustdesk.com/docs/en/dev/build/) - -## Cum se construiește pe Linux - -### Ubuntu 18 (Debian 10) - -```sh -sudo apt install -y zip g++ gcc git curl wget nasm yasm libgtk-3-dev clang libxcb-randr0-dev libxdo-dev \ - libxfixes-dev libxcb-shape0-dev libxcb-xfixes0-dev libasound2-dev libpulse-dev cmake make \ - libclang-dev ninja-build libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libpam0g-dev -``` - -### openSUSE Tumbleweed - -```sh -sudo zypper install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libXfixes-devel cmake alsa-lib-devel gstreamer-devel gstreamer-plugins-base-devel xdotool-devel pam-devel -``` - -### Fedora 28 (CentOS 8) - -```sh -sudo yum -y install gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libxdo-devel libXfixes-devel pulseaudio-libs-devel cmake alsa-lib-devel gstreamer1-devel gstreamer1-plugins-base-devel pam-devel -``` - -### Arch (Manjaro) - -```sh -sudo pacman -Syu --needed unzip git cmake gcc curl wget yasm nasm zip make pkg-config clang gtk3 xdotool libxcb libxfixes alsa-lib pipewire -``` - -### Instalează vcpkg - -```sh -git clone https://github.com/microsoft/vcpkg -cd vcpkg -git checkout 2023.04.15 -cd .. -vcpkg/bootstrap-vcpkg.sh -export VCPKG_ROOT=$HOME/vcpkg -vcpkg/vcpkg install libvpx libyuv opus aom -``` - -### Repară libvpx (Pentru Fedora) - -```sh -cd vcpkg/buildtrees/libvpx/src -cd * -./configure -sed -i 's/CFLAGS+=-I/CFLAGS+=-fPIC -I/g' Makefile -sed -i 's/CXXFLAGS+=-I/CXXFLAGS+=-fPIC -I/g' Makefile -make -cp libvpx.a $HOME/vcpkg/installed/x64-linux/lib/ -cd -``` - -### Build - -```sh -curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -source $HOME/.cargo/env -git clone --recurse-submodules https://github.com/rustdesk/rustdesk -cd rustdesk -mkdir -p target/debug -wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so -mv libsciter-gtk.so target/debug -VCPKG_ROOT=$HOME/vcpkg cargo run -``` - -## Cum să construiești cu Docker - -Începe prin clonarea repository-ului și construirea imaginii Docker: - -```sh -git clone https://github.com/rustdesk/rustdesk -cd rustdesk -git submodule update --init --recursive -docker build -t "rustdesk-builder" . -``` - -Apoi, de fiecare dată când trebuie să construiești aplicația, rulează comanda următoare: - -```sh -docker run --rm -it -v $PWD:/home/user/rustdesk -v rustdesk-git-cache:/home/user/.cargo/git -v rustdesk-registry-cache:/home/user/.cargo/registry -e PUID="$(id -u)" -e PGID="$(id -g)" rustdesk-builder -``` - -Reține că prima construire poate dura mai mult până când dependențele sunt în cache; construirile ulterioare vor fi mai rapide. De asemenea, dacă trebuie să specifici argumente diferite comenzii de build, le poți adăuga la finalul comenzii în poziția ``. De exemplu, pentru a construi o versiune optimizată de release, adaugă `--release`. Executabilul rezultat va fi disponibil în folderul `target` pe sistemul tău, și poate fi rulat cu: - -```sh -target/debug/rustdesk -``` - -Sau, dacă rulezi un executabil release: - -```sh -target/release/rustdesk -``` - -Asigură-te că rulezi aceste comenzi din rădăcina repository-ului RustDesk, altfel aplicația poate să nu găsească resursele necesare. De asemenea, reține că alte subcomenzi cargo, cum ar fi `install` sau `run`, nu sunt acceptate în prezent prin această metodă, deoarece ar instala sau rula programul în interiorul containerului în loc de gazdă. - -## Structura fișierelor - -- **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: codec video, config, wrapper tcp/udp, protobuf, funcții fs pentru transfer de fișiere și alte funcții utilitare -- **[libs/scrap](https://github.com/rustdesk/rustdesk/tree/master/libs/scrap)**: capturare ecran -- **[libs/enigo](https://github.com/rustdesk/rustdesk/tree/master/libs/enigo)**: control tastatură/mouse specific platformei -- **[libs/clipboard](https://github.com/rustdesk/rustdesk/tree/master/libs/clipboard)**: implementare copy/paste pentru fișiere pentru Windows, Linux, macOS. -- **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: interfață Sciter învechită (depreciată) -- **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: servicii audio/clipboard/input/video și conexiuni de rețea -- **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: inițiază o conexiune peer -- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: comunică cu [rustdesk-server](https://github.com/rustdesk/rustdesk-server), așteaptă conexiune directă remote (TCP hole punching) sau prin relay -- **[src/platform](https://github.com/rustdesk/rustdesk/tree/master/src/platform)**: cod specific platformei -- **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: cod Flutter pentru desktop și mobil -- **[flutter/web/js](https://github.com/rustdesk/rustdesk/tree/master/flutter/web/v1/js)**: JavaScript pentru clientul Flutter web - -## Capturi de ecran - -![Connection Manager](https://github.com/rustdesk/rustdesk/assets/28412477/db82d4e7-c4bc-4823-8e6f-6af7eadf7651) - -![Connected to a Windows PC](https://github.com/rustdesk/rustdesk/assets/28412477/9baa91e9-3362-4d06-aa1a-7518edcbd7ea) - -![File Transfer](https://github.com/rustdesk/rustdesk/assets/28412477/39511ad3-aa9a-4f8c-8947-1cce286a46ad) - -![TCP Tunneling](https://github.com/rustdesk/rustdesk/assets/28412477/78e8708f-e87e-4570-8373-1360033ea6c5) diff --git a/docs/README-RU.md b/docs/README-RU.md index 928faad07..d6aaaf2cb 100644 --- a/docs/README-RU.md +++ b/docs/README-RU.md @@ -15,7 +15,7 @@ Общение с нами: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-%D0%A0%D0%B0%D1%81%D1%88%D0%B8%D1%80%D0%B5%D0%BD%D0%BD%D1%8B%D0%B5%20%D0%92%D0%BE%D0%B7%D0%BC%D0%BE%D0%B6%D0%BD%D0%BE%D1%81%D1%82%D0%B8-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) Ещё одно программное обеспечение для удаленного рабочего стола, написанное на Rust. Работает из коробки, настройки не требует. Вы полностью контролируете свои данные, не беспокоясь о безопасности. Вы можете использовать наш сервер ретрансляции, [настроить свой собственный](https://rustdesk.com/server), или [написать свой](https://github.com/rustdesk/rustdesk-server-demo). @@ -167,7 +167,7 @@ target/release/rustdesk - **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: графический пользовательский интерфейс на Sciter (устаревшее) - **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: сервисы аудио, буфера обмена, ввода, видео и сетевых подключений - **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: одноранговое соединение -- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: связь с [сервером RustDesk](https://github.com/rustdesk/rustdesk-server), ожидает удаленного прямого (через TCP hole punching) или ретранслируемого соединения +- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: связь с [сервером Rustdesk](https://github.com/rustdesk/rustdesk-server), ожидает удаленного прямого (через TCP hole punching) или ретранслируемого соединения - **[src/platform](https://github.com/rustdesk/rustdesk/tree/master/src/platform)**: специфичный для платформы код - **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: код Flutter для ПК-версии и мобильных устройств - **[flutter/web/js](https://github.com/rustdesk/rustdesk/tree/master/flutter/web/v1/js)**: JavaScript для Web-клиента Flutter diff --git a/docs/README-TR.md b/docs/README-TR.md index 99c961e8b..d9481b2c7 100644 --- a/docs/README-TR.md +++ b/docs/README-TR.md @@ -7,37 +7,34 @@ Dosya Yapısı • Ekran Görüntüleri
[Українська] | [česky] | [中文] | [Magyar] | [Español] | [فارسی] | [Français] | [Deutsch] | [Polski] | [Indonesian] | [Suomi] | [മലയാളം] | [日本語] | [Nederlands] | [Italiano] | [Русский] | [Português (Brasil)] | [Esperanto] | [한국어] | [العربي] | [Tiếng Việt] | [Dansk] | [Ελληνικά]
- README, RustDesk UI ve RustDesk Dökümantasyonu'nu ana dilinize çevirmemiz için yardımınıza ihtiyacımız var + README, RustDesk UI ve RustDesk Belge'sini ana dilinize çevirmemiz için yardımınıza ihtiyacımız var

- -> [!Dikkat] -> **Yanlış Kullanım Uyarısı:**
-> RustDesk geliştiricileri, bu yazılımın etik olmayan veya yasa dışı kullanımını onaylamaz veya desteklemez. Yetkisiz erişim, kontrol veya gizlilik ihlali gibi kötüye kullanımlar kesinlikle yönergelerimize aykırıdır. Yazarlar, uygulamanın herhangi bir yanlış kullanımından sorumlu değildir. - Bizimle sohbet edin: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-Geli%C5%9Fmi%C5%9F%20%C3%96zellikler-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) -Rust dilinde yazılmış, başka bir uzak masaüstü yazılımı daha. Hiçbir yapılandırma gerekmeksizin, hemen kullanıma hazır. Güvenlik konusunda hiçbir endişe duymadan, verileriniz üzerinde tam kontrole sahip olun. Kendi rendezvous/relay sunucumuzu kullanabilirsiniz, [kendi sunucunuzu kurabilirsiniz](https://rustdesk.com/server) veya [kendi rendezvous/relay sunucunuzu yazabilirsiniz](https://github.com/rustdesk/rustdesk-server-demo). +Başka bir uzak masaüstü yazılımı daha, Rust dilinde yazılmış. Hemen kullanıma hazır, hiçbir yapılandırma gerektirmez. Verilerinizin tam kontrolünü elinizde tutarsınız ve güvenlikle ilgili endişeleriniz olmaz. Kendi buluş/iletme sunucumuzu kullanabilirsiniz, [kendi sunucunuzu kurabilirsiniz](https://rustdesk.com/server) veya [kendi buluş/iletme sunucunuzu yazabilirsiniz](https://github.com/rustdesk/rustdesk-server-demo). ![image](https://user-images.githubusercontent.com/71636191/171661982-430285f0-2e12-4b1d-9957-4a58e375304d.png) -RustDesk, herkesin katkısına açıktır. Başlamak için [CONTRIBUTING.md](CONTRIBUTING-TR.md) belgesine göz atın. +RustDesk, herkesten katkıyı kabul eder. Başlamak için [CONTRIBUTING.md](CONTRIBUTING-TR.md) belgesine göz atın. [**SSS**](https://github.com/rustdesk/rustdesk/wiki/FAQ) -[**BINARY İNDİR**](https://github.com/rustdesk/rustdesk/releases) +[**BİNARİ İNDİR**](https://github.com/rustdesk/rustdesk/releases) -[**NIGHTLY DERLEME**](https://github.com/rustdesk/rustdesk/releases/tag/nightly) +[**NİGHTLY DERLEME**](https://github.com/rustdesk/rustdesk/releases/tag/nightly) [F-Droid'de Alın](https://f-droid.org/en/packages/com.carriez.flutter_hbb) -## Gereksinimler +## Bağımlılıklar -Masaüstü sürümleri GUI için; [Sciter](https://sciter.com/)(kaldırılacak) veya Flutter kullanır. Sciter daha kolay ve başlamak için daha dostcanlısı, bundan dolayı bu kılavuz sadece Sciter içindir. Flutter sürümünü derlemek için [CI](https://github.com/rustdesk/rustdesk/blob/master/.github/workflows/flutter-build.yml)'ımıza bakın. +Masaüstü sürümleri GUI için + + [Sciter](https://sciter.com/) veya Flutter kullanır, bu kılavuz sadece Sciter içindir. Lütfen Sciter dinamik kütüphanesini kendiniz indirin. @@ -49,7 +46,7 @@ Lütfen Sciter dinamik kütüphanesini kendiniz indirin. - Rust geliştirme ortamınızı ve C++ derleme ortamınızı hazırlayın. -- [vcpkg](https://github.com/microsoft/vcpkg) yükleyin ve `VCPKG_ROOT` ortam değişkenini doğru bir şekilde ayarlayın. +- [vcpkg](https://github.com/microsoft/vcpkg) yükleyin ve `VCPKG_ROOT` çevresel değişkenini doğru bir şekilde ayarlayın. - Windows: vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static - Linux/macOS: vcpkg install libvpx libyuv opus aom @@ -126,7 +123,7 @@ VCPKG_ROOT=$HOME/vcpkg cargo run ## Docker ile Derleme Nasıl Yapılır -Önce repository'i klonlayın ve Docker container'ını oluşturun. +Öncelikle deposunu klonlayın ve Docker konteynerini oluşturun: ```sh git clone https://github.com/rustdesk/rustdesk @@ -134,40 +131,44 @@ cd rustdesk docker build -t "rustdesk-builder" . ``` -Ardından, uygulamayı her derlemeniz gerektiğinde aşağıdaki komutu çalıştırın: +Ardından, uygulamayı derlemek için her seferinde aşağıdaki komutu çalıştırın: ```sh docker run --rm -it -v $PWD:/home/user/rustdesk -v rustdesk-git-cache:/home/user/.cargo/git -v rustdesk-registry-cache:/home/user/.cargo/registry -e PUID="$(id -u)" -e PGID="$(id -g)" rustdesk-builder ``` -Bilin ki ilk derlemeniz gereksinimlerin önbelleği yüklenmesinden ötürü uzun sürebilir, sonraki derlemeleriniz daha hızlı olacaktır. Ayrıca, derleme komutuna isteğe bağlı argümanlar belirtmeniz gerekiyorsa, bunu komutun sonunda ki `` yerine yazabilirsiniz. Örneğin, optimize edilmiş bir sürümü derlemek isterseniz, yukarıdaki komutu çalıştırdıktan sonra `--release` ekleyebilirsiniz. Oluşan çalıştırılabilir dosya sisteminizdeki hedef klasöründe bulunacak ve şu komutla çalıştırılabilir olacaktır: +İlk derleme, bağımlılıklar önbelleğe alınmadan önce daha uzun sürebilir, sonraki derlemeler daha hızlı olacaktır. Ayrıca, derleme komutuna isteğe bağlı argümanlar belirtmeniz gerekiyorsa, bunu + + komutun sonunda `<İSTEĞE BAĞLI-ARGÜMANLAR>` pozisyonunda yapabilirsiniz. Örneğin, optimize edilmiş bir sürümü derlemek isterseniz, yukarıdaki komutu çalıştırdıktan sonra `--release` ekleyebilirsiniz. Oluşan yürütülebilir dosya sisteminizdeki hedef klasöründe bulunacak ve şu komutla çalıştırılabilir: ```sh target/debug/rustdesk ``` -Veya, yayım çalıştırılabilir dosyası için: +Veya, yayın yürütülebilir dosyası çalıştırılıyorsa: ```sh target/release/rustdesk ``` -Lütfen bu komutları RustDesk reposunun root klasöründe çalıştırdığınızdan emin olun, aksi takdirde uygulama gereken kaynakları bulamayabilir. Ayrıca, `install` veya `run` gibi diğer cargo altkomutları şu anda bu yöntem aracılığıyla desteklenmemektedir, çünkü bunlar programı konteyner içinde kurar veya çalıştırır, ana makinede değil. +Lütfen bu komutları RustDesk deposunun kökünden çalıştırdığınızdan emin olun, aksi takdirde uygulama gereken kaynakları bulamayabilir. Ayrıca, `install` veya `run` gibi diğer cargo altkomutları şu anda bu yöntem aracılığıyla desteklenmemektedir, çünkü bunlar programı konteyner içinde kurar veya çalıştırır ve ana makinede değil. ## Dosya Yapısı -- **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: video codec, config, tcp/udp wrapper, protobuf, dosya transferi için fs fonksiyonları ve diğer bazı yardımcı işlevler +- **[libs/hbb_common](https://github.com/rustdesk/rustdesk/tree/master/libs/hbb_common)**: video kodlayıcı, yapılandırma, tcp/udp sarmalayıcı, protobuf, dosya transferi için fs işlevleri ve diğer bazı yardımcı işlevler - **[libs/scrap](https://github.com/rustdesk/rustdesk/tree/master/libs/scrap)**: ekran yakalama - **[libs/enigo](https://github.com/rustdesk/rustdesk/tree/master/libs/enigo)**: platforma özgü klavye/fare kontrolü -- **[libs/clipboard](https://github.com/rustdesk/rustdesk/tree/master/libs/clipboard)**: platforma özgü kopyala/yapıştır implementasyonları. -- **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: Eski Sciter UI (kaldırılacak) -- **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: ses/pano/input/video servisleri ve ağ bağlantıları -- **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: Eşli bağlantı başlat -- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: [rustdesk-server](https://github.com/rustdesk/rustdesk-server) ile iletişime gir, remote direct(TCP delik açma) yada relay bağlantısı için bekle +- **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: GUI +- **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: ses/pasta/klavye/video hizmetleri ve ağ bağlantıları +- **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: bir eş bağlantısı başlatır +- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: [rustdesk-server](https://github.com/rustdesk/rustdesk-server) ile iletişim kurar, uzak doğrudan (TCP delik vurma) veya iletme bağlantısını bekler - **[src/platform](https://github.com/rustdesk/rustdesk/tree/master/src/platform)**: platforma özgü kod -- **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: Masaüstü ve mobil için Flutter kodu -- **[flutter/web/js](https://github.com/rustdesk/rustdesk/tree/master/flutter/web/v1/js)**: Flutter web istemcisi için JavaScript +- **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: mobil için Flutter kodu +- **[flutter/web/js](https://github.com/rustdesk/rustdesk/tree/master/flutter/web/js)**: Flutter web istemcisi için JavaScript +> [!Dikkat] +> **Yanlış Kullanım Uyarısı:**
+> RustDesk geliştiricileri, bu yazılımın etik olmayan veya yasa dışı kullanımını onaylamaz veya desteklemez. Yetkisiz erişim, kontrol veya gizlilik ihlali gibi kötüye kullanımlar kesinlikle yönergelerimize aykırıdır. Yazarlar, uygulamanın herhangi bir yanlış kullanımından sorumlu değildir. ## Ekran Görüntüleri diff --git a/docs/README-UA.md b/docs/README-UA.md index eb4c9edec..fb8807494 100644 --- a/docs/README-UA.md +++ b/docs/README-UA.md @@ -11,7 +11,7 @@ Спілкування з нами: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-%D0%A0%D0%BE%D0%B7%D1%88%D0%B8%D1%80%D0%B5%D0%BD%D1%96%20%D0%A4%D1%83%D0%BD%D0%BA%D1%86%D1%96%D1%97-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) Ще один застосунок для віддаленого керування стільницею, написаний на Rust. Працює з коробки, не потребує налаштування. Ви повністю контролюєте свої дані, не турбуючись про безпеку. Ви можете використовувати наш сервер ретрансляції, [налаштувати свій власний](https://rustdesk.com/server), або [написати свій власний сервер ретрансляції](https://github.com/rustdesk/rustdesk-server-demo). diff --git a/docs/README-VN.md b/docs/README-VN.md index 38cdc10fb..db83aff1c 100644 --- a/docs/README-VN.md +++ b/docs/README-VN.md @@ -13,7 +13,7 @@ Hãy trao đổi với chúng tôi qua: [Discord](https://discord.gg/nDceKgxnkV) | [Twitter](https://twitter.com/rustdesk) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-T%C3%ADnh%20N%C4%83ng%20N%C3%A2ng%20Cao-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) RustDesk là một phần mềm điểu khiển máy tính từ xa mã nguồn mở, được viết bằng Rust. Nó hoạt động ngay sau khi cài đặt, không yêu cầu cấu hình phức tạp. Bạn có toàn quyền kiểm soát với dữ liệu của mình mà không cần phải lo lắng về vấn đề bảo mật. Bạn có thể sử dụng máy chủ rendezvous/relay của chúng tôi hoặc [tự cài đặt máy chủ của riêng mình](https://rustdesk.com/server) hay thậm chí [tự tạo máy chủ rendezvous/relay cho riêng bạn](https://github.com/rustdesk/rustdesk-server-demo). diff --git a/docs/README-ZH.md b/docs/README-ZH.md index 9328e52e9..2899aa01b 100644 --- a/docs/README-ZH.md +++ b/docs/README-ZH.md @@ -14,7 +14,7 @@ 与我们交流: [知乎](https://www.zhihu.com/people/rustdesk) | [Discord](https://discord.gg/nDceKgxnkV) | [Reddit](https://www.reddit.com/r/rustdesk) | [YouTube](https://www.youtube.com/@rustdesk) -[![RustDesk Server Pro](https://img.shields.io/badge/RustDesk%20Server%20Pro-%E9%AB%98%E7%BA%A7%E5%8A%9F%E8%83%BD-blue)](https://rustdesk.com/pricing.html) +[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/I2I04VU09) 远程桌面软件，开箱即用，无需任何配置。您完全掌控数据，不用担心安全问题。您可以使用我们的注册/中继服务器， 或者[自己设置](https://rustdesk.com/server)， diff --git a/docs/SECURITY-FR.md b/docs/SECURITY-FR.md deleted file mode 100644 index 1cf2c6167..000000000 --- a/docs/SECURITY-FR.md +++ /dev/null @@ -1,16 +0,0 @@ - -# Politique de sécurité - -## Signaler une vulnérabilité - -Nous accordons une très grande importance à la sécurité du projet. Nous -encourageons tous les utilisateurs à nous signaler toute vulnérabilité qu'ils -découvrent. - -Si vous trouvez une vulnérabilité de sécurité dans le projet RustDesk, veuillez -la signaler de manière responsable en envoyant un e-mail à info@rustdesk.com. - -À ce stade, nous n'avons pas de programme de bug bounty. Nous sommes une petite -équipe qui s'attaque à un grand défi. Nous vous encourageons vivement à signaler -toute vulnérabilité de manière responsable afin que nous puissions continuer à -développer une application sécurisée pour l'ensemble de la communauté. diff --git a/docs/SECURITY-KR.md b/docs/SECURITY-KR.md index 94ce8f2ba..d1f576e3f 100644 --- a/docs/SECURITY-KR.md +++ b/docs/SECURITY-KR.md @@ -2,6 +2,6 @@ ## 취약점 보고 -저희는 프로젝트의 보안을 매우 중요하게 생각합니다. 모든 사용자가 발견한 취약점을 저희에게 보고할 것을 권장합니다. RustDesk 프로젝트에서 보안 취약점이 발견되면 info@rustdesk.com으로 이메일을 보내 책임감 있게 보고해 주시기 바랍니다. +저희는 프로젝트의 보안을 매우 중요하게 생각합니다. 모든 사용자가 발견한 취약점을 저희에게 보고할 것을 권장합니다. RustDesk 프로젝트에서 보안 취약점이 발견되면 info@rustdesk.com 로 이메일을 보내 책임감 있게 보고해 주시기 바랍니다. -현재로서는 버그 현상금 프로그램이 없습니다. 저희는 큰 문제를 해결하기 위해 노력하는 소규모 팀입니다. 전체 커뮤니티를 위한 안전한 응용 프로그램을 계속 구축할 수 있도록 취약점을 책임감 있게 신고해 주시기 바랍니다. +현재로서는 버그 현상금 프로그램이 없습니다. 저희는 큰 문제를 해결하기 위해 노력하는 소규모 팀입니다. 전체 커뮤니티를 위한 안전한 애플리케이션을 계속 구축할 수 있도록 취약점을 책임감 있게 신고해 주시기 바랍니다. diff --git a/docs/SECURITY-RO.md b/docs/SECURITY-RO.md deleted file mode 100644 index 029e01d53..000000000 --- a/docs/SECURITY-RO.md +++ /dev/null @@ -1,9 +0,0 @@ -# Politica de Securitate - -## Raportarea unei Vulnerabilități - -Acordăm o mare importanță securității proiectului. Încurajăm toți utilizatorii să ne raporteze orice vulnerabilități pe care le descoperă. -Dacă găsești o vulnerabilitate de securitate în proiectul RustDesk, te rugăm să o raportezi responsabil trimițând un e-mail la info@rustdesk.com. - -În acest moment, nu avem un program de recompense pentru descoperirea de bug-uri. Suntem o echipă mică care încearcă să rezolve o problemă mare. -Te rugăm să raportezi orice vulnerabilitate în mod responsabil, astfel încât să putem continua să construim o aplicație sigură pentru întreaga comunitate. diff --git a/docs/iOS_AUDIO_CAPTURE.md b/docs/iOS_AUDIO_CAPTURE.md new file mode 100644 index 000000000..67ffb8487 --- /dev/null +++ b/docs/iOS_AUDIO_CAPTURE.md @@ -0,0 +1,88 @@ +# iOS Audio Capture Implementation + +## Overview + +RustDesk iOS audio capture is implemented following the existing audio service pattern, capturing app audio by default and sending it to peers using the Opus codec. + +## Architecture + +### Components + +1. **Native Layer** (`libs/scrap/src/ios/native/ScreenCapture.m`) + - Captures audio using ReplayKit's audio sample buffers + - Supports both app audio and microphone audio + - Converts audio format information for Rust processing + +2. **FFI Layer** (`libs/scrap/src/ios/ffi.rs`) + - Provides safe Rust bindings for audio control + - `enable_audio(mic: bool, app_audio: bool)` - Enable/disable audio sources + - `set_audio_callback()` - Register callback for audio data + +3. **Audio Service** (`src/server/audio_service.rs::ios_impl`) + - Follows the same pattern as other platforms + - Uses Opus encoder with 48kHz stereo configuration + - Processes audio in 10ms chunks (480 samples) + - Sends encoded audio as `AudioFrame` messages + +## Audio Flow + +1. **Capture**: ReplayKit provides audio as Linear PCM in CMSampleBuffer format +2. **Callback**: Native code passes raw PCM data to Rust via FFI callback +3. **Conversion**: Rust converts audio data from i16 to f32 normalized [-1.0, 1.0] +4. **Encoding**: Opus encoder compresses audio for network transmission +5. **Transmission**: Encoded audio sent to peers as protobuf messages + +## Configuration + +- **Sample Rate**: 48,000 Hz (standard for all platforms) +- **Channels**: 2 (Stereo) +- **Format**: Linear PCM, typically 16-bit +- **Encoder**: Opus with LowDelay application mode +- **Frame Size**: 480 samples (10ms at 48kHz) + +## Usage + +By default, app audio is captured automatically when screen recording starts: + +```rust +// In audio_service.rs +enable_audio(false, true); // mic=false, app_audio=true +``` + +To enable microphone: +```rust +enable_audio(true, true); // mic=true, app_audio=true +``` + +## Permissions + +- **App Audio**: No additional permission required (part of screen recording) +- **Microphone**: Requires `NSMicrophoneUsageDescription` in Info.plist + +## Implementation Details + +### Audio Format Handling + +The native layer logs audio format on first capture: +``` +Audio format - Sample rate: 48000, Channels: 2, Bits per channel: 16, Format: 1819304813 +``` + +### Zero Detection + +Like other platforms, implements audio zero gate to avoid sending silent frames: +- Tracks consecutive zero frames +- Stops sending after 800 frames of silence +- Resumes immediately when audio detected + +### Thread Safety + +- Audio callback runs on ReplayKit's audio queue +- Uses Rust channels for thread-safe communication +- Non-blocking receive in service loop + +## Limitations + +- Audio only available during active screen capture +- System audio requires Broadcast Upload Extension +- Audio/video synchronization handled separately \ No newline at end of file diff --git a/docs/iOS_SCREEN_AUDIO_CAPTURE_IMPLEMENTATION.md b/docs/iOS_SCREEN_AUDIO_CAPTURE_IMPLEMENTATION.md new file mode 100644 index 000000000..38de73855 --- /dev/null +++ b/docs/iOS_SCREEN_AUDIO_CAPTURE_IMPLEMENTATION.md @@ -0,0 +1,336 @@ +# iOS Screen and Audio Capture Implementation Guide + +## Overview + +This document describes the complete implementation of screen and audio capture for iOS in RustDesk. The implementation uses Apple's ReplayKit framework through FFI, allowing screen recording with minimal overhead while maintaining compatibility with RustDesk's existing architecture. + +## Architecture Overview + +``` +┌─────────────────────────────────────────────────────────────────────┐ +│ iOS System │ +├─────────────────────────────────────────────────────────────────────┤ +│ │ +│ ┌─────────────────┐ ┌─────────────────┐ ┌────────────────┐ │ +│ │ ReplayKit │ │ Main App │ │ Broadcast Ext. │ │ +│ │ │ │ │ │ (System-wide) │ │ +│ │ - RPScreen │────▶│ Objective-C │◀───│ │ │ +│ │ Recorder │ │ ScreenCapture │ │ SampleHandler │ │ +│ │ - Video/Audio │ │ ↓ │ │ │ │ +│ └─────────────────┘ │ C Interface │ └────────────────┘ │ +│ │ ↓ │ │ +│ │ Rust FFI │ │ +│ │ ↓ │ │ +│ │ Capture/Audio │ │ +│ │ Services │ │ +│ └─────────────────┘ │ +└─────────────────────────────────────────────────────────────────────┘ +``` + +## Directory Structure + +``` +rustdesk/ +├── libs/scrap/src/ios/ +│ ├── mod.rs # Rust capture implementation +│ ├── ffi.rs # FFI bindings +│ ├── native/ +│ │ ├── ScreenCapture.h # C interface header +│ │ └── ScreenCapture.m # Objective-C implementation +│ └── README.md # iOS-specific documentation +├── flutter/ios/ +│ ├── Runner/ +│ │ └── Info.plist # Permissions +│ └── BroadcastExtension/ # System-wide capture +│ ├── SampleHandler.h/m # Broadcast extension +│ └── Info.plist # Extension config +└── src/server/ + └── audio_service.rs # iOS audio integration +``` + +## Implementation Components + +### 1. Native Layer (Objective-C) + +#### ScreenCapture.h - C Interface +```objective-c +// Video capture +void ios_capture_init(void); +bool ios_capture_start(void); +void ios_capture_stop(void); +uint32_t ios_capture_get_frame(uint8_t* buffer, uint32_t buffer_size, + uint32_t* out_width, uint32_t* out_height); + +// Audio capture +void ios_capture_set_audio_enabled(bool enable_mic, bool enable_app_audio); +typedef void (*audio_callback_t)(const uint8_t* data, uint32_t size, bool is_mic); +void ios_capture_set_audio_callback(audio_callback_t callback); + +// System-wide capture +void ios_capture_show_broadcast_picker(void); +bool ios_capture_is_broadcasting(void); +``` + +#### ScreenCapture.m - Implementation Details +- Uses `RPScreenRecorder` for in-app capture +- Handles both video and audio sample buffers +- Converts BGRA to RGBA pixel format +- Thread-safe frame buffer management +- CFMessagePort for IPC with broadcast extension + +### 2. FFI Layer (Rust) + +#### ffi.rs - Safe Rust Bindings +```rust +pub fn init() +pub fn start_capture() -> bool +pub fn stop_capture() +pub fn get_frame() -> Option<(Vec, u32, u32)> +pub fn enable_audio(mic: bool, app_audio: bool) +pub fn set_audio_callback(callback: Option) +pub fn show_broadcast_picker() +``` + +Key features: +- Lazy static buffers to reduce allocations +- Callback mechanism for asynchronous frame updates +- Thread-safe frame buffer access + +### 3. Rust Capture Implementation + +#### mod.rs - Capturer Implementation +```rust +pub struct Capturer { + width: usize, + height: usize, + display: Display, + frame_data: Vec, + last_frame: Vec, +} + +impl TraitCapturer for Capturer { + fn frame<'a>(&'a mut self, timeout: Duration) -> io::Result> +} +``` + +Features: +- Implements RustDesk's `TraitCapturer` interface +- Frame deduplication using `would_block_if_equal` +- Automatic cleanup on drop +- Compatible with existing video pipeline + +### 4. Audio Service Integration + +#### audio_service.rs - iOS Audio Module +```rust +#[cfg(target_os = "ios")] +mod ios_impl { + const SAMPLE_RATE: u32 = 48000; + const CHANNELS: u16 = 2; + const FRAMES_PER_BUFFER: usize = 480; // 10ms + + pub struct State { + encoder: Option, + receiver: Option>>, + // ... + } +} +``` + +Features: +- Opus encoder with 48kHz stereo +- PCM i16 to f32 conversion +- Zero detection for silence gating +- Non-blocking audio processing + +### 5. Broadcast Upload Extension + +For system-wide capture (captures other apps): + +#### SampleHandler.m +- Runs in separate process +- Captures entire screen +- Sends frames via CFMessagePort to main app +- Memory-efficient frame transfer + +## Capture Modes + +### 1. In-App Capture (Default) +```rust +// Captures only RustDesk app +let display = Display::primary()?; +let mut capturer = Capturer::new(display)?; +``` + +### 2. System-Wide Capture +```rust +// Shows iOS broadcast picker +ffi::show_broadcast_picker(); +// User must manually start from Control Center +``` + +## Build Configuration + +### Cargo.toml +```toml +[build-dependencies] +cc = "1.0" # For compiling Objective-C +``` + +### build.rs +```rust +if target_os == "ios" { + cc::Build::new() + .file("src/ios/native/ScreenCapture.m") + .flag("-fobjc-arc") + .flag("-fmodules") + .compile("ScreenCapture"); +} +``` + +### Info.plist Permissions +```xml +NSMicrophoneUsageDescription +This app needs microphone access for screen recording with audio +``` + +## Data Flow + +### Video Capture Flow +1. ReplayKit captures screen → CMSampleBuffer +2. Native code converts BGRA → RGBA +3. Frame callback or polling from Rust +4. Rust checks for duplicate frames +5. Creates `Frame::PixelBuffer` for video pipeline +6. Existing video encoder/transmission + +### Audio Capture Flow +1. ReplayKit captures app audio → CMSampleBuffer +2. Native extracts Linear PCM data +3. FFI callback to Rust audio service +4. Convert i16 PCM → f32 normalized +5. Opus encoding at 48kHz +6. Send as `AudioFrame` protobuf + +## Memory Management + +### Optimizations +- Reuse static buffers for frame data (33MB max) +- Lazy allocation based on actual frame size +- Frame deduplication to avoid redundant processing +- Proper synchronization with `@synchronized` blocks +- Weak references in completion handlers + +### Cleanup +- `dealloc` method for CFMessagePort cleanup +- Drop implementation stops capture +- Automatic buffer cleanup + +## Performance Considerations + +### Frame Rate +- 30-60 FPS depending on device +- Frame skipping in broadcast extension (every 2nd frame) +- Non-blocking frame retrieval + +### Latency +- In-app: ~2-5ms capture latency +- System-wide: ~10-20ms (IPC overhead) +- Audio: ~10ms chunks for low latency + +### CPU Usage +- Hardware-accelerated capture +- Efficient pixel format conversion +- Minimal memory copies + +## Security & Privacy + +### Permissions Required +- Screen Recording (always required) +- Microphone (optional, for mic audio) + +### User Control +- Recording indicator shown by iOS +- User must grant permission +- Can stop anytime from Control Center + +### App Groups (for Broadcast Extension) +``` +group.com.carriez.rustdesk.screenshare +``` + +## Integration with RustDesk + +### Video Service +- Works with existing `scrap` infrastructure +- Compatible with all video encoders (VP8/9, H264/5) +- Standard frame processing pipeline + +### Audio Service +- Integrated as platform-specific implementation +- Same Opus encoding as other platforms +- Compatible with existing audio routing + +## Limitations + +1. **No cursor capture** - iOS doesn't expose cursor +2. **Permission required** - User must explicitly allow +3. **Broadcast extension memory** - Limited to ~50MB +4. **Background execution** - Limited by iOS policies + +## Testing + +### Build for iOS +```bash +cd flutter +flutter build ios +``` + +### Required Setup in Xcode +1. Add Broadcast Upload Extension target +2. Configure app groups +3. Set up code signing +4. Link ReplayKit framework + +### Test Scenarios +1. In-app screen capture +2. System-wide broadcast +3. Audio capture (app/mic) +4. Permission handling +5. Background/foreground transitions + +## Troubleshooting + +### Common Issues + +1. **No frames received** + - Check screen recording permission + - Verify capture is started + - Check frame timeout settings + +2. **Audio not working** + - Verify microphone permission + - Check audio callback registration + - Confirm audio format compatibility + +3. **Broadcast extension not appearing** + - Verify bundle identifiers + - Check code signing + - Ensure extension is included in build + +4. **Memory warnings** + - Reduce frame rate in broadcast extension + - Check buffer allocations + - Monitor memory usage + +## Future Improvements + +1. **Hardware encoding** - Use VideoToolbox for H.264 +2. **Adaptive quality** - Adjust based on network/CPU +3. **Picture-in-Picture** - Support PiP mode +4. **Screen orientation** - Better rotation handling +5. **Audio enhancements** - Noise suppression, echo cancellation + +## Conclusion + +This implementation provides full screen and audio capture capabilities for iOS while maintaining compatibility with RustDesk's cross-platform architecture. The use of FFI minimizes overhead while allowing native iOS features to be accessed from Rust code. \ No newline at end of file diff --git a/flatpak/com.rustdesk.RustDesk.metainfo.xml b/flatpak/com.rustdesk.RustDesk.metainfo.xml index 90bdafcb5..0d3b33bb8 100644 --- a/flatpak/com.rustdesk.RustDesk.metainfo.xml +++ b/flatpak/com.rustdesk.RustDesk.metainfo.xml @@ -18,7 +18,7 @@
  • Supports VP8 / VP9 / AV1 software codecs, and H264 / H265 hardware codecs.
  • Own your data, easily set up self-hosting solution on your infrastructure.
  • P2P connection with end-to-end encryption based on NaCl.
    • -
  • No administrative privileges or installation needed for Windows, elevate privilege locally or from remote on demand.
    • +
  • No administrative privileges or installation needed for Windows, elevate priviledge locally or from remote on demand.
  • We like to keep things simple and will strive to make simpler where possible.

    • @@ -56,4 +56,4 @@ pointing - + \ No newline at end of file diff --git a/flatpak/rustdesk.json b/flatpak/rustdesk.json index 2418ac2a6..af1bc5fe7 100644 --- a/flatpak/rustdesk.json +++ b/flatpak/rustdesk.json @@ -55,8 +55,8 @@ ], "finish-args": [ "--share=ipc", + "--socket=fallback-x11", "--socket=wayland", - "--socket=x11", "--share=network", "--filesystem=home", "--device=dri", diff --git a/flutter/android/app/build.gradle b/flutter/android/app/build.gradle index 830cbc2dd..c55425165 100644 --- a/flutter/android/app/build.gradle +++ b/flutter/android/app/build.gradle @@ -1,6 +1,4 @@ import com.google.protobuf.gradle.* -import groovy.json.JsonSlurper - plugins { id "com.google.protobuf" version "0.9.4" id "com.android.application" @@ -32,37 +30,8 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -// Add rustls-platform-verifier Android support -String findRustlsPlatformVerifierMavenDir() { - def dependencyText = providers.exec { - it.workingDir = new File("../..") - commandLine("cargo", "metadata", "--format-version", "1") - }.standardOutput.asText.get() - - def dependencyJson = new JsonSlurper().parseText(dependencyText) - def pkg = dependencyJson.packages.find { it.name == "rustls-platform-verifier-android" } - - if (pkg == null) { - throw new GradleException("rustls-platform-verifier-android package not found in cargo metadata!") - } - - def manifestPath = file(pkg.manifest_path) - def mavenDir = new File(manifestPath.parentFile, "maven") - - if (!mavenDir.exists()) { - throw new GradleException("Maven directory not found at: ${mavenDir.path}") - } - - println("✓ Found rustls-platform-verifier maven repo at: ${mavenDir.path}") - return mavenDir.path -} - - -repositories { - maven { - url = findRustlsPlatformVerifierMavenDir() - metadataSources.artifact() - } +dependencies { + implementation 'com.google.protobuf:protobuf-javalite:3.20.1' } protobuf { @@ -98,7 +67,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.carriez.flutter_hbb" - minSdkVersion 22 + minSdkVersion 21 targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -128,10 +97,8 @@ flutter { } dependencies { - implementation 'com.google.protobuf:protobuf-javalite:3.20.1' implementation "androidx.media:media:1.6.0" implementation 'com.github.getActivity:XXPermissions:18.5' implementation("org.jetbrains.kotlin:kotlin-stdlib") { version { strictly("1.9.10") } } implementation 'com.caverock:androidsvg-aar:1.4' - implementation "rustls:rustls-platform-verifier:0.1.1" } diff --git a/flutter/android/app/proguard-rules b/flutter/android/app/proguard-rules index 517402567..0b12a6cda 100644 --- a/flutter/android/app/proguard-rules +++ b/flutter/android/app/proguard-rules @@ -1,7 +1,4 @@ # Keep class members from protobuf generated code. -keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite { ; -} - -# Keep rustls-platform-verifier classes for JNI --keep, includedescriptorclasses class org.rustls.platformverifier.** { *; } \ No newline at end of file +} \ No newline at end of file diff --git a/flutter/android/app/src/main/AndroidManifest.xml b/flutter/android/app/src/main/AndroidManifest.xml index f4788af4c..47533612b 100644 --- a/flutter/android/app/src/main/AndroidManifest.xml +++ b/flutter/android/app/src/main/AndroidManifest.xml @@ -23,7 +23,6 @@ when (menuItem.itemId) { idShowRustDesk -> { @@ -392,3 +389,4 @@ class FloatingWindowService : Service(), View.OnTouchListener { return false } } + diff --git a/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/MainActivity.kt b/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/MainActivity.kt index fea8e5519..a19c2ae9d 100644 --- a/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/MainActivity.kt +++ b/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/MainActivity.kt @@ -62,13 +62,7 @@ class MainActivity : FlutterActivity() { channelTag ) initFlutterChannel(flutterMethodChannel!!) - thread { - try { - setCodecInfo() - } catch (e: Exception) { - Log.e("MainActivity", "Failed to setCodecInfo: ${e.message}", e) - } - } + thread { setCodecInfo() } } override fun onResume() { diff --git a/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/MainApplication.kt b/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/MainApplication.kt deleted file mode 100644 index 59a3b0fb4..000000000 --- a/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/MainApplication.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.carriez.flutter_hbb - -import android.app.Application -import android.util.Log -import ffi.FFI - -class MainApplication : Application() { - companion object { - private const val TAG = "MainApplication" - } - - override fun onCreate() { - super.onCreate() - Log.d(TAG, "App start") - FFI.onAppStart(applicationContext) - } -} diff --git a/flutter/android/app/src/main/kotlin/ffi.kt b/flutter/android/app/src/main/kotlin/ffi.kt index e3c9d9830..9f0f0216b 100644 --- a/flutter/android/app/src/main/kotlin/ffi.kt +++ b/flutter/android/app/src/main/kotlin/ffi.kt @@ -13,7 +13,6 @@ object FFI { } external fun init(ctx: Context) - external fun onAppStart(ctx: Context) external fun setClipboardManager(clipboardManager: RdClipboardManager) external fun startServer(app_dir: String, custom_client_config: String) external fun startService() @@ -24,7 +23,6 @@ object FFI { external fun setFrameRawEnable(name: String, value: Boolean) external fun setCodecInfo(info: String) external fun getLocalOption(key: String): String - external fun getBuildinOption(key: String): String external fun onClipboardUpdate(clips: ByteBuffer) external fun isServiceClipboardEnabled(): Boolean } diff --git a/flutter/assets/auth-microsoft.svg b/flutter/assets/auth-microsoft.svg deleted file mode 100644 index c9ce5f9cf..000000000 --- a/flutter/assets/auth-microsoft.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/flutter/assets/keyboard.svg b/flutter/assets/keyboard.svg new file mode 100644 index 000000000..0e94a5a62 --- /dev/null +++ b/flutter/assets/keyboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/flutter/assets/keyboard_mouse.svg b/flutter/assets/keyboard_mouse.svg deleted file mode 100644 index f6a5b4b2b..000000000 --- a/flutter/assets/keyboard_mouse.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/flutter/build_fdroid.sh b/flutter/build_fdroid.sh index d50a6a6ce..ecfb444ef 100755 --- a/flutter/build_fdroid.sh +++ b/flutter/build_fdroid.sh @@ -7,7 +7,7 @@ # 2024, Vasyl Gello # -# The script is invoked by F-Droid builder system step-by-step. +# The script is invoked by F-Droid builder system ste-by-step. # # It accepts the following arguments: # @@ -16,6 +16,7 @@ # - Android architecture to build APK for: armeabi-v7a arm64-v8av x86 x86_64 # - The build step to execute: # +# + sudo-deps: as root, install needed Debian packages into builder VM # + prebuild: patch sources and do other stuff before the build # + build: perform actual build of APK file # @@ -183,9 +184,13 @@ prebuild) fi # Map NDK version to revision - NDK_VERSION="$(curl https://gitlab.com/fdroid/android-sdk-transparency-log/-/raw/master/signed/checksums.json | - jq -r ".\"https://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-linux.zip\"[0].\"source.properties\"" | - sed -n -E 's/.*Pkg.Revision = ([0-9.]+).*/\1/p')" + + NDK_VERSION="$(wget \ + -qO- \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + 'https://api.github.com/repos/android/ndk/releases' | + jq -r ".[] | select(.tag_name == \"${NDK_VERSION}\") | .body | match(\"ndkVersion \\\"(.*)\\\"\").captures[0].string")" if [ -z "${NDK_VERSION}" ]; then echo "ERROR: Can not map Android NDK codename to revision!" >&2 @@ -311,18 +316,6 @@ prebuild) # `FLUTTER_BRIDGE_VERSION` an restore the pubspec later if [ "${FLUTTER_VERSION}" != "${FLUTTER_BRIDGE_VERSION}" ]; then - # Find first libclang.so and set BRIDGE_LLVM_PATH - - BRIDGE_LLVM_PATH="$(find /usr/lib/ -name libclang.so | head -n1)" - - if [ -z "${BRIDGE_LLVM_PATH}" ]; then - echo 'ERROR: Can not find libclang.so for bridge generator!' >&2 - exit 1 - fi - - BRIDGE_LLVM_PATH="$(dirname "${BRIDGE_LLVM_PATH}")" - BRIDGE_LLVM_PATH="$(dirname "${BRIDGE_LLVM_PATH}")" - # Install Flutter bridge version prepare_flutter "${FLUTTER_BRIDGE_VERSION}" "${HOME}/flutter" @@ -351,8 +344,7 @@ prebuild) flutter_rust_bridge_codegen \ --rust-input ./src/flutter_ffi.rs \ - --dart-output ./flutter/lib/generated_bridge.dart \ - --llvm-path "${BRIDGE_LLVM_PATH}" + --dart-output ./flutter/lib/generated_bridge.dart # Add bridge files to save-list @@ -363,15 +355,13 @@ prebuild) git checkout '*' git clean -dffx git reset - - unset BRIDGE_LLVM_PATH fi # Install Flutter version for RustDesk library build prepare_flutter "${FLUTTER_VERSION}" "${HOME}/flutter" - # gms is not in these files now, but we still keep the following line for future reference(maybe). + # gms is not in thoes files now, but we still keep the following line for future reference(maybe). sed \ -i \ @@ -424,9 +414,13 @@ build) .github/workflows/flutter-build.yml)" # Map NDK version to revision - NDK_VERSION="$(curl https://gitlab.com/fdroid/android-sdk-transparency-log/-/raw/master/signed/checksums.json | - jq -r ".\"https://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-linux.zip\"[0].\"source.properties\"" | - sed -n -E 's/.*Pkg.Revision = ([0-9.]+).*/\1/p')" + + NDK_VERSION="$(wget \ + -qO- \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + 'https://api.github.com/repos/android/ndk/releases' | + jq -r ".[] | select(.tag_name == \"${NDK_VERSION}\") | .body | match(\"ndkVersion \\\"(.*)\\\"\").captures[0].string")" if [ -z "${NDK_VERSION}" ]; then echo "ERROR: Can not map Android NDK codename to revision!" >&2 diff --git a/flutter/ios/BroadcastExtension/Info.plist b/flutter/ios/BroadcastExtension/Info.plist new file mode 100644 index 000000000..b1448614e --- /dev/null +++ b/flutter/ios/BroadcastExtension/Info.plist @@ -0,0 +1,33 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + RustDesk Screen Broadcast + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + NSExtension + + NSExtensionPointIdentifier + com.apple.broadcast-services-upload + NSExtensionPrincipalClass + SampleHandler + RPBroadcastProcessMode + RPBroadcastProcessModeSampleBuffer + + + \ No newline at end of file diff --git a/flutter/ios/BroadcastExtension/SampleHandler.h b/flutter/ios/BroadcastExtension/SampleHandler.h new file mode 100644 index 000000000..852fcd936 --- /dev/null +++ b/flutter/ios/BroadcastExtension/SampleHandler.h @@ -0,0 +1,5 @@ +#import + +@interface SampleHandler : RPBroadcastSampleHandler + +@end \ No newline at end of file diff --git a/flutter/ios/BroadcastExtension/SampleHandler.m b/flutter/ios/BroadcastExtension/SampleHandler.m new file mode 100644 index 000000000..5068259ba --- /dev/null +++ b/flutter/ios/BroadcastExtension/SampleHandler.m @@ -0,0 +1,122 @@ +#import "SampleHandler.h" +#import + +@interface SampleHandler () +@property (nonatomic, strong) dispatch_queue_t videoQueue; +@property (nonatomic, assign) CFMessagePortRef messagePort; +@property (nonatomic, assign) BOOL isConnected; +@end + +@implementation SampleHandler + +- (instancetype)init { + self = [super init]; + if (self) { + _videoQueue = dispatch_queue_create("com.rustdesk.broadcast.video", DISPATCH_QUEUE_SERIAL); + _isConnected = NO; + } + return self; +} + +- (void)broadcastStartedWithSetupInfo:(NSDictionary *)setupInfo { + // Create message port to communicate with main app + NSString *portName = @"com.rustdesk.screencast.port"; + + self.messagePort = CFMessagePortCreateRemote(kCFAllocatorDefault, (__bridge CFStringRef)portName); + + if (self.messagePort) { + self.isConnected = YES; + os_log_info(OS_LOG_DEFAULT, "Connected to main app via message port"); + } else { + os_log_error(OS_LOG_DEFAULT, "Failed to connect to main app"); + [self finishBroadcastWithError:[NSError errorWithDomain:@"com.rustdesk.broadcast" + code:1 + userInfo:@{NSLocalizedDescriptionKey: @"Failed to connect to main app"}]]; + } +} + +- (void)broadcastPaused { + // Handle pause +} + +- (void)broadcastResumed { + // Handle resume +} + +- (void)broadcastFinished { + if (self.messagePort) { + CFRelease(self.messagePort); + self.messagePort = NULL; + } + self.isConnected = NO; +} + +- (void)processSampleBuffer:(CMSampleBufferRef)sampleBuffer withType:(RPSampleBufferType)sampleBufferType { + if (!self.isConnected || !self.messagePort) { + return; + } + + switch (sampleBufferType) { + case RPSampleBufferTypeVideo: + dispatch_async(self.videoQueue, ^{ + [self processVideoSampleBuffer:sampleBuffer]; + }); + break; + + case RPSampleBufferTypeAudioApp: + case RPSampleBufferTypeAudioMic: + // Handle audio if needed + break; + + default: + break; + } +} + +- (void)processVideoSampleBuffer:(CMSampleBufferRef)sampleBuffer { + CVImageBufferRef imageBuffer = CMSampleBufferGetImageBuffer(sampleBuffer); + if (!imageBuffer) { + return; + } + + CVPixelBufferLockBaseAddress(imageBuffer, kCVPixelBufferLock_ReadOnly); + + size_t width = CVPixelBufferGetWidth(imageBuffer); + size_t height = CVPixelBufferGetHeight(imageBuffer); + size_t bytesPerRow = CVPixelBufferGetBytesPerRow(imageBuffer); + void *baseAddress = CVPixelBufferGetBaseAddress(imageBuffer); + + if (baseAddress) { + // Create a header with frame info + struct FrameHeader { + uint32_t width; + uint32_t height; + uint32_t dataSize; + } header = { + .width = (uint32_t)width, + .height = (uint32_t)height, + .dataSize = (uint32_t)(width * height * 4) // Always RGBA format + }; + + // Send header first + CFDataRef headerData = CFDataCreate(kCFAllocatorDefault, (const UInt8 *)&header, sizeof(header)); + + if (headerData) { + SInt32 result = CFMessagePortSendRequest(self.messagePort, 1, headerData, 1.0, 0.0, NULL, NULL); + CFRelease(headerData); + + if (result == kCFMessagePortSuccess) { + // Send frame data + CFDataRef frameData = CFDataCreate(kCFAllocatorDefault, (const UInt8 *)baseAddress, header.dataSize); + if (frameData) { + CFMessagePortSendRequest(self.messagePort, 2, frameData, 1.0, 0.0, NULL, NULL); + CFRelease(frameData); + } + } + } + } + + CVPixelBufferUnlockBaseAddress(imageBuffer, kCVPixelBufferLock_ReadOnly); +} + +@end \ No newline at end of file diff --git a/flutter/ios/Runner/Info.plist b/flutter/ios/Runner/Info.plist index 9351dac53..55542dd21 100644 --- a/flutter/ios/Runner/Info.plist +++ b/flutter/ios/Runner/Info.plist @@ -43,8 +43,6 @@ UIApplicationSupportsIndirectInputEvents - UIFileSharingEnabled - UILaunchStoryboardName LaunchScreen UIMainStoryboardFile @@ -62,8 +60,6 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - UISupportsDocumentBrowser - UIViewControllerBasedStatusBarAppearance ITSAppUsesNonExemptEncryption @@ -74,6 +70,8 @@ This app needs camera access to scan QR codes NSPhotoLibraryUsageDescription This app needs photo library access to get QR codes from image + NSMicrophoneUsageDescription + This app needs microphone access for screen recording with audio CADisableMinimumFrameDurationOnPhone UIApplicationSupportsIndirectInputEvents diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart index 366a7b6ba..0fc8aa6c0 100644 --- a/flutter/lib/common.dart +++ b/flutter/lib/common.dart @@ -13,18 +13,15 @@ import 'package:flutter_hbb/desktop/widgets/refresh_wrapper.dart'; import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart'; import 'package:flutter_hbb/main.dart'; import 'package:flutter_hbb/models/peer_model.dart'; -import 'package:flutter_hbb/models/peer_tab_model.dart'; import 'package:flutter_hbb/models/state_model.dart'; import 'package:flutter_hbb/utils/multi_window_manager.dart'; import 'package:flutter_hbb/utils/platform_channel.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; -import 'package:get/get_rx/src/rx_workers/utils/debouncer.dart'; import 'package:provider/provider.dart'; import 'package:uni_links/uni_links.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:uuid/uuid.dart'; -import 'package:wakelock_plus/wakelock_plus.dart'; import 'package:window_manager/window_manager.dart'; import 'package:window_size/window_size.dart' as window_size; @@ -45,7 +42,6 @@ import 'package:flutter_hbb/native/win32.dart' if (dart.library.html) 'package:flutter_hbb/web/win32.dart'; import 'package:flutter_hbb/native/common.dart' if (dart.library.html) 'package:flutter_hbb/web/common.dart'; -import 'package:flutter_hbb/utils/http_service.dart' as http; final globalKey = GlobalKey(); final navigationBarKey = GlobalKey(); @@ -78,9 +74,6 @@ bool _ignoreDevicePixelRatio = true; int windowsBuildNumber = 0; DesktopType? desktopType; -// Tolerance used for floating-point position comparisons to avoid precision errors. -const double _kPositionEpsilon = 1e-6; - bool get isMainDesktopWindow => desktopType == DesktopType.main || desktopType == DesktopType.cm; @@ -112,10 +105,6 @@ enum DesktopType { portForward, } -bool isDoubleEqual(double a, double b) { - return (a - b).abs() < _kPositionEpsilon; -} - class IconFont { static const _family1 = 'Tabbar'; static const _family2 = 'PeerSearchbar'; @@ -716,17 +705,6 @@ closeConnection({String? id}) { stateGlobal.isInMainPage = true; } else { final controller = Get.find(); - if (controller.tabType == DesktopTabType.terminal && - controller.onCloseWindow != null) { - // Terminal windows are scoped to one peer. The optional id passed to - // closeConnection() is that peer id, not a terminal tab key - // (${peerId}_${terminalId}). Closing from terminal dialogs should close - // the peer's whole terminal window, including all terminal tabs. - unawaited(controller.onCloseWindow!().catchError((e, _) { - debugPrint('[closeConnection] Failed to close terminal window: $e'); - })); - return; - } controller.closeBy(id); } } @@ -1022,15 +1000,13 @@ makeMobileActionsOverlayEntry(VoidCallback? onHide, {FFI? ffi}) { }); } -void showToast(String text, - {Duration timeout = const Duration(seconds: 3), - Alignment alignment = const Alignment(0.0, 0.8)}) { +void showToast(String text, {Duration timeout = const Duration(seconds: 3)}) { final overlayState = globalKey.currentState?.overlay; if (overlayState == null) return; final entry = OverlayEntry(builder: (context) { return IgnorePointer( child: Align( - alignment: alignment, + alignment: const Alignment(0.0, 0.8), child: Container( decoration: BoxDecoration( color: MyTheme.color(context).toastBg, @@ -1135,23 +1111,18 @@ class CustomAlertDialog extends StatelessWidget { Widget createDialogContent(String text) { final RegExp linkRegExp = RegExp(r'(https?://[^\s]+)'); - bool hasLink = linkRegExp.hasMatch(text); - - // Early return: no link, use default theme color - if (!hasLink) { - return SelectableText(text, style: const TextStyle(fontSize: 15)); - } - final List spans = []; int start = 0; + bool hasLink = false; linkRegExp.allMatches(text).forEach((match) { + hasLink = true; if (match.start > start) { spans.add(TextSpan(text: text.substring(start, match.start))); } spans.add(TextSpan( text: match.group(0) ?? '', - style: const TextStyle( + style: TextStyle( color: Colors.blue, decoration: TextDecoration.underline, ), @@ -1169,9 +1140,13 @@ Widget createDialogContent(String text) { spans.add(TextSpan(text: text.substring(start))); } + if (!hasLink) { + return SelectableText(text, style: const TextStyle(fontSize: 15)); + } + return SelectableText.rich( TextSpan( - style: const TextStyle(fontSize: 15), + style: TextStyle(color: Colors.black, fontSize: 15), children: spans, ), ); @@ -1590,7 +1565,7 @@ bool option2bool(String option, String value) { option == kOptionForceAlwaysRelay) { res = value == "Y"; } else { - // "" is true + assert(false); res = value != "N"; } return res; @@ -1608,6 +1583,7 @@ String bool2option(String option, bool b) { option == kOptionForceAlwaysRelay) { res = b ? 'Y' : defaultOptionNo; } else { + assert(false); res = b ? 'Y' : 'N'; } return res; @@ -1643,8 +1619,7 @@ bool mainGetPeerBoolOptionSync(String id, String key) { // Use `sessionGetToggleOption()` and `sessionToggleOption()` instead. // Because all session options use `Y` and `` as values. -Future matchPeer( - String searchText, Peer peer, PeerTabIndex peerTabIndex) async { +Future matchPeer(String searchText, Peer peer) async { if (searchText.isEmpty) { return true; } @@ -1655,14 +1630,11 @@ Future matchPeer( peer.username.toLowerCase().contains(searchText)) { return true; } - if (peer.alias.toLowerCase().contains(searchText)) { - return true; + final alias = peer.alias; + if (alias.isEmpty) { + return false; } - if (peerTabShowNote(peerTabIndex) && - peer.note.toLowerCase().contains(searchText)) { - return true; - } - return false; + return alias.toLowerCase().contains(searchText); } /// Get the image for the current [platform]. @@ -1692,15 +1664,6 @@ class LastWindowPosition { LastWindowPosition(this.width, this.height, this.offsetWidth, this.offsetHeight, this.isMaximized, this.isFullscreen); - bool equals(LastWindowPosition other) { - return ((width == other.width) && - (height == other.height) && - (offsetWidth == other.offsetWidth) && - (offsetHeight == other.offsetHeight) && - (isMaximized == other.isMaximized) && - (isFullscreen == other.isFullscreen)); - } - Map toJson() { return { "width": width, @@ -1740,36 +1703,24 @@ String get windowFramePrefix => ? "incoming_" : (bind.isOutgoingOnly() ? "outgoing_" : "")); -typedef WindowKey = ({WindowType type, int? windowId}); - -LastWindowPosition? _lastWindowPosition = null; -final Debouncer _saveWindowDebounce = Debouncer(delay: Duration(seconds: 1)); - /// Save window position and size on exit /// Note that windowId must be provided if it's subwindow -Future saveWindowPosition(WindowType type, - {int? windowId, bool? flush}) async { +Future saveWindowPosition(WindowType type, {int? windowId}) async { if (type != WindowType.Main && windowId == null) { debugPrint( "Error: windowId cannot be null when saving positions for sub window"); } - Offset? position; - Size? sz; + late Offset position; + late Size sz; late bool isMaximized; bool isFullscreen = stateGlobal.fullscreen.isTrue; - setPreFrame() { final pos = bind.getLocalFlutterOption(k: windowFramePrefix + type.name); var lpos = LastWindowPosition.loadFromString(pos); - if (lpos != null) { - if (lpos.offsetWidth != null && lpos.offsetHeight != null) { - position = Offset(lpos.offsetWidth!, lpos.offsetHeight!); - } - if (lpos.width != null && lpos.height != null) { - sz = Size(lpos.width!, lpos.height!); - } - } + position = Offset( + lpos?.offsetWidth ?? position.dx, lpos?.offsetHeight ?? position.dy); + sz = Size(lpos?.width ?? sz.width, lpos?.height ?? sz.height); } switch (type) { @@ -1809,56 +1760,30 @@ Future saveWindowPosition(WindowType type, } break; } - if (isWindows && position != null) { + if (isWindows) { const kMinOffset = -10000; const kMaxOffset = 10000; - if (position!.dx < kMinOffset || - position!.dy < kMinOffset || - position!.dx > kMaxOffset || - position!.dy > kMaxOffset) { + if (position.dx < kMinOffset || + position.dy < kMinOffset || + position.dx > kMaxOffset || + position.dy > kMaxOffset) { debugPrint("Invalid position: $position, ignore saving position"); return; } } - final pos = LastWindowPosition(sz?.width, sz?.height, position?.dx, - position?.dy, isMaximized, isFullscreen); + final pos = LastWindowPosition( + sz.width, sz.height, position.dx, position.dy, isMaximized, isFullscreen); + debugPrint( + "Saving frame: $windowId: ${pos.width}/${pos.height}, offset:${pos.offsetWidth}/${pos.offsetHeight}, isMaximized:${pos.isMaximized}, isFullscreen:${pos.isFullscreen}"); - final WindowKey key = (type: type, windowId: windowId); + await bind.setLocalFlutterOption( + k: windowFramePrefix + type.name, v: pos.toString()); - final bool haveNewWindowPosition = - (_lastWindowPosition == null) || !pos.equals(_lastWindowPosition!); - final bool isPreviousNewWindowPositionPending = _saveWindowDebounce.isRunning; - - if (haveNewWindowPosition || isPreviousNewWindowPositionPending) { - _lastWindowPosition = pos; - - if (flush ?? false) { - // If a previous update is pending, replace it. - _saveWindowDebounce.cancel(); - await _saveWindowPositionActual(key); - } else if (haveNewWindowPosition) { - _saveWindowDebounce.call(() => _saveWindowPositionActual(key)); - } - } -} - -Future _saveWindowPositionActual(WindowKey key) async { - LastWindowPosition? pos = _lastWindowPosition; - - if (pos != null) { - debugPrint( - "Saving frame: ${key.windowId}: ${pos.width}/${pos.height}, offset:${pos.offsetWidth}/${pos.offsetHeight}, isMaximized:${pos.isMaximized}, isFullscreen:${pos.isFullscreen}"); - - await bind.setLocalFlutterOption( - k: windowFramePrefix + key.type.name, v: pos.toString()); - - if ((key.type == WindowType.RemoteDesktop || - key.type == WindowType.ViewCamera) && - key.windowId != null) { - await _saveSessionWindowPosition(key.type, key.windowId!, - pos.isMaximized ?? false, pos.isFullscreen ?? false, pos); - } + if ((type == WindowType.RemoteDesktop || type == WindowType.ViewCamera) && + windowId != null) { + await _saveSessionWindowPosition( + type, windowId, isMaximized, isFullscreen, pos); } } @@ -1924,8 +1849,6 @@ Future _adjustRestoreMainWindowSize(double? width, double? height) async { return Size(restoreWidth, restoreHeight); } -// Consider using Rect.contains() instead, -// though the implementation is not exactly the same. bool isPointInRect(Offset point, Rect rect) { return point.dx >= rect.left && point.dx <= rect.right && @@ -1944,41 +1867,44 @@ Future _adjustRestoreMainWindowOffset( return null; } + double? frameLeft; + double? frameTop; + double? frameRight; + double? frameBottom; + if (isDesktop || isWebDesktop) { - final screens = await window_size.getScreenList(); - if (screens.isNotEmpty) { - final windowRect = Rect.fromLTWH(left, top, width, height); - bool isVisible = false; - for (final screen in screens) { - final intersection = windowRect.intersect(screen.visibleFrame); - if (intersection.width >= 10.0 && intersection.height >= 10.0) { - isVisible = true; - break; - } - } - if (!isVisible) { - return null; - } - return Offset(left, top); + for (final screen in await window_size.getScreenList()) { + frameLeft = frameLeft == null + ? screen.visibleFrame.left + : min(screen.visibleFrame.left, frameLeft); + frameTop = frameTop == null + ? screen.visibleFrame.top + : min(screen.visibleFrame.top, frameTop); + frameRight = frameRight == null + ? screen.visibleFrame.right + : max(screen.visibleFrame.right, frameRight); + frameBottom = frameBottom == null + ? screen.visibleFrame.bottom + : max(screen.visibleFrame.bottom, frameBottom); } } - - double frameLeft = 0.0; - double frameTop = 0.0; - double frameRight = ((isDesktop || isWebDesktop) - ? kDesktopMaxDisplaySize - : kMobileMaxDisplaySize) - .toDouble(); - double frameBottom = ((isDesktop || isWebDesktop) - ? kDesktopMaxDisplaySize - : kMobileMaxDisplaySize) - .toDouble(); - + if (frameLeft == null) { + frameLeft = 0.0; + frameTop = 0.0; + frameRight = ((isDesktop || isWebDesktop) + ? kDesktopMaxDisplaySize + : kMobileMaxDisplaySize) + .toDouble(); + frameBottom = ((isDesktop || isWebDesktop) + ? kDesktopMaxDisplaySize + : kMobileMaxDisplaySize) + .toDouble(); + } final minWidth = 10.0; - if ((left + minWidth) > frameRight || - (top + minWidth) > frameBottom || + if ((left + minWidth) > frameRight! || + (top + minWidth) > frameBottom! || (left + width - minWidth) < frameLeft || - top < frameTop) { + top < frameTop!) { return null; } else { return Offset(left, top); @@ -2020,24 +1946,8 @@ Future restoreWindowPosition(WindowType type, var lpos = LastWindowPosition.loadFromString(pos); if (lpos == null) { - debugPrint("No window position saved, trying to center the window."); - switch (type) { - case WindowType.Main: - // Center the main window only if no position is saved (on first run). - if (isWindows || isLinux) { - await windowManager.center(); - } - // For MacOS, the window is already centered by default. - // See https://github.com/rustdesk/rustdesk/blob/9b9276e7524523d7f667fefcd0694d981443df0e/flutter/macos/Runner/Base.lproj/MainMenu.xib#L333 - // If `` in `` is not set, the window will be centered. - break; - default: - // No need to change the position of a sub window if no position is saved, - // since the default position is already centered. - // https://github.com/rustdesk/rustdesk/blob/317639169359936f7f9f85ef445ec9774218772d/flutter/lib/utils/multi_window_manager.dart#L163 - break; - } - return true; + debugPrint("no window position saved, ignoring position restoration"); + return false; } if (type == WindowType.RemoteDesktop || type == WindowType.ViewCamera) { if (!isRemotePeerPos && windowId != null) { @@ -2214,10 +2124,6 @@ enum UriLinkType { terminal, } -setEnvTerminalAdmin() { - bind.mainSetEnv(key: 'IS_TERMINAL_ADMIN', value: 'Y'); -} - // uri link handler bool handleUriLink({List? cmdArgs, Uri? uri, String? uriString}) { List? args; @@ -2285,12 +2191,6 @@ bool handleUriLink({List? cmdArgs, Uri? uri, String? uriString}) { id = args[i + 1]; i++; break; - case '--terminal-admin': - setEnvTerminalAdmin(); - type = UriLinkType.terminal; - id = args[i + 1]; - i++; - break; case '--password': password = args[i + 1]; i++; @@ -2364,8 +2264,7 @@ List? urlLinkToCmdArgs(Uri uri) { "view-camera", "port-forward", "rdp", - "terminal", - "terminal-admin", + "terminal" ]; if (uri.authority.isEmpty && uri.path.split('').every((char) => char == '/')) { @@ -2376,19 +2275,6 @@ List? urlLinkToCmdArgs(Uri uri) { id = uri.path.substring("/new/".length); } else if (uri.authority == "config") { if (isAndroid || isIOS) { - final allowDeepLinkServerSettings = - bind.mainGetBuildinOption(key: kOptionAllowDeepLinkServerSettings) == - 'Y'; - if (!allowDeepLinkServerSettings) { - debugPrint( - "Ignore rustdesk://config because $kOptionAllowDeepLinkServerSettings is not enabled."); - // Keep the user-facing error generic; detailed rejection reason is in debug logs. - // Delay toast to avoid missing overlay during cold-start deeplink handling. - Timer(Duration(seconds: 1), () { - showToast(translate('Failed')); - }); - return null; - } final config = uri.path.substring("/".length); // add a timer to make showToast work Timer(Duration(seconds: 1), () { @@ -2398,24 +2284,11 @@ List? urlLinkToCmdArgs(Uri uri) { return null; } else if (uri.authority == "password") { if (isAndroid || isIOS) { - final allowDeepLinkPassword = - bind.mainGetBuildinOption(key: kOptionAllowDeepLinkPassword) == 'Y'; - if (!allowDeepLinkPassword) { - debugPrint( - "Ignore rustdesk://password because $kOptionAllowDeepLinkPassword is not enabled."); - // Keep the user-facing error generic; detailed rejection reason is in debug logs. - // Delay toast to avoid missing overlay during cold-start deeplink handling. - Timer(Duration(seconds: 1), () { - showToast(translate('Failed')); - }); - return null; - } final password = uri.path.substring("/".length); if (password.isNotEmpty) { Timer(Duration(seconds: 1), () async { - final ok = - await bind.mainSetPermanentPasswordWithResult(password: password); - showToast(translate(ok ? 'Successful' : 'Failed')); + await bind.mainSetPermanentPassword(password: password); + showToast(translate('Successful')); }); } } @@ -2461,10 +2334,6 @@ List? urlLinkToCmdArgs(Uri uri) { } else if (command == '--terminal') { connect(Get.context!, id, isTerminal: true, forceRelay: forceRelay, password: password); - } else if (command == 'terminal-admin') { - setEnvTerminalAdmin(); - connect(Get.context!, id, - isTerminal: true, forceRelay: forceRelay, password: password); } else { // Default to remote desktop for '--connect', '--play', or direct connection connect(Get.context!, id, forceRelay: forceRelay, password: password); @@ -2711,55 +2580,6 @@ class SimpleWrapper { SimpleWrapper(this.value); } -/// Wakelock manager with reference counting for desktop. -/// Ensures wakelock is only disabled when all sessions are closed/minimized. -/// -/// Note: Each isolate has its own WakelockPlus instance with independent assertion. -/// As long as one isolate has wakelock enabled, the screen stays awake. -/// This manager handles multiple tabs within the same isolate. -class WakelockManager { - static final Set _enabledKeys = {}; - // Don't use WakelockPlus.enabled, it causes error on Android: - // Unhandled Exception: FormatException: Message corrupted - // - // On Linux, multiple enable() calls create only one inhibit, but each disable() - // only releases if _cookie != null. So we need our own _enabled state to avoid - // calling disable() when not enabled. - // See: https://github.com/fluttercommunity/wakelock_plus/blob/0c74e5bbc6aefac57b6c96bb7ef987705ed559ec/wakelock_plus/lib/src/wakelock_plus_linux_plugin.dart#L48 - static bool _enabled = false; - - static void enable(UniqueKey key, {bool isServer = false}) { - // Check if we should keep awake during outgoing sessions - if (!isServer) { - final keepAwake = - mainGetLocalBoolOptionSync(kOptionKeepAwakeDuringOutgoingSessions); - if (!keepAwake) { - return; // Don't enable wakelock if user disabled keep awake - } - } - if (isDesktop) { - _enabledKeys.add(key); - } - if (!_enabled) { - _enabled = true; - WakelockPlus.enable(); - } - } - - static void disable(UniqueKey key) { - if (isDesktop) { - _enabledKeys.remove(key); - if (_enabledKeys.isNotEmpty) { - return; - } - } - if (_enabled) { - WakelockPlus.disable(); - _enabled = false; - } - } -} - /// call this to reload current window. /// /// [Note] @@ -2916,7 +2736,7 @@ class ServerConfig { } catch (err) { final input = msg.split('').reversed.join(''); final bytes = base64Decode(base64.normalize(input)); - json = jsonDecode(utf8.decode(bytes, allowMalformed: true)); + json = jsonDecode(utf8.decode(bytes)); } idServer = json['host'] ?? ''; relayServer = json['relay'] ?? ''; @@ -3033,7 +2853,7 @@ Future updateSystemWindowTheme() async { /// /// Note: not found a general solution for rust based AVFoundation bingding. /// [AVFoundation] crate has compile error. -const kMacOSPermChannel = MethodChannel("org.rustdesk.rustdesk/host"); +const kMacOSPermChannel = MethodChannel("org.rustdesk.rustdesk/macos"); enum PermissionAuthorizeType { undetermined, @@ -3100,26 +2920,10 @@ Future start_service(bool is_start) async { } Future canBeBlocked() async { - if (isWeb) { - // Web can only act as a controller, never as a controlled side, - // so it should never be blocked by a remote session. - return false; - } - // First check control permission - final controlPermission = await bind.mainGetCommon( - key: "is-remote-modify-enabled-by-control-permissions"); - if (controlPermission == "true") { - return false; - } else if (controlPermission == "false") { - return true; - } - - // Check local settings - var accessMode = await bind.mainGetOption(key: kOptionAccessMode); - var isCustomAccessMode = accessMode != 'full' && accessMode != 'view'; + var access_mode = await bind.mainGetOption(key: kOptionAccessMode); var option = option2bool(kOptionAllowRemoteConfigModification, await bind.mainGetOption(key: kOptionAllowRemoteConfigModification)); - return accessMode == 'view' || (isCustomAccessMode && !option); + return access_mode == 'view' || (access_mode.isEmpty && !option); } // to-do: web not implemented @@ -3882,16 +3686,6 @@ setResizable(bool resizable) { isOptionFixed(String key) => bind.mainIsOptionFixed(key: key); -bool isChangePermanentPasswordDisabled() => - bind.mainGetBuildinOption(key: kOptionDisableChangePermanentPassword) == - 'Y'; - -bool isChangeIdDisabled() => - bind.mainGetBuildinOption(key: kOptionDisableChangeId) == 'Y'; - -bool isUnlockPinDisabled() => - bind.mainGetBuildinOption(key: kOptionDisableUnlockPin) == 'Y'; - bool? _isCustomClient; bool get isCustomClient { _isCustomClient ??= bind.isCustomClient(); @@ -4099,98 +3893,3 @@ String get appName { } return _appName; } - -String getConnectionText(bool secure, bool direct, String streamType) { - String connectionText; - if (secure && direct) { - connectionText = translate("Direct and encrypted connection"); - } else if (secure && !direct) { - connectionText = translate("Relayed and encrypted connection"); - } else if (!secure && direct) { - connectionText = translate("Direct and unencrypted connection"); - } else { - connectionText = translate("Relayed and unencrypted connection"); - } - if (streamType == 'Relay') { - streamType = 'TCP'; - } - if (streamType.isEmpty) { - return connectionText; - } else { - return '$connectionText ($streamType)'; - } -} - -String decode_http_response(http.Response resp) { - try { - // https://github.com/rustdesk/rustdesk-server-pro/discussions/758 - return utf8.decode(resp.bodyBytes, allowMalformed: true); - } catch (e) { - debugPrint('Failed to decode response as UTF-8: $e'); - // Fallback to bodyString which handles encoding automatically - return resp.body; - } -} - -bool peerTabShowNote(PeerTabIndex peerTabIndex) { - return peerTabIndex == PeerTabIndex.ab || peerTabIndex == PeerTabIndex.group; -} - -// TODO: We should support individual bits combinations in the future. -// But for now, just keep it simple, because the old code only supports single button. -// No users have requested multi-button support yet. -String mouseButtonsToPeer(int buttons) { - switch (buttons) { - case kPrimaryMouseButton: - return 'left'; - case kSecondaryMouseButton: - return 'right'; - case kMiddleMouseButton: - return 'wheel'; - case kBackMouseButton: - return 'back'; - case kForwardMouseButton: - return 'forward'; - default: - return ''; - } -} - -/// Build an avatar widget from an avatar URL or data URI string. -/// Returns [fallback] if avatar is empty or cannot be decoded. -/// [borderRadius] defaults to [size]/2 (circle). -Widget? buildAvatarWidget({ - required String avatar, - required double size, - double? borderRadius, - Widget? fallback, -}) { - final trimmed = avatar.trim(); - if (trimmed.isEmpty) return fallback; - - ImageProvider? imageProvider; - if (trimmed.startsWith('data:image/')) { - final comma = trimmed.indexOf(','); - if (comma > 0) { - try { - imageProvider = MemoryImage(base64Decode(trimmed.substring(comma + 1))); - } catch (_) {} - } - } else if (trimmed.startsWith('http://') || trimmed.startsWith('https://')) { - imageProvider = NetworkImage(trimmed); - } - - if (imageProvider == null) return fallback; - - final radius = borderRadius ?? size / 2; - return ClipRRect( - borderRadius: BorderRadius.circular(radius), - child: Image( - image: imageProvider, - width: size, - height: size, - fit: BoxFit.cover, - errorBuilder: (_, __, ___) => fallback ?? SizedBox.shrink(), - ), - ); -} diff --git a/flutter/lib/common/hbbs/hbbs.dart b/flutter/lib/common/hbbs/hbbs.dart index 0c729e4df..97baf546a 100644 --- a/flutter/lib/common/hbbs/hbbs.dart +++ b/flutter/lib/common/hbbs/hbbs.dart @@ -25,8 +25,6 @@ enum UserStatus { kDisabled, kNormal, kUnverified } // Is all the fields of the user needed? class UserPayload { String name = ''; - String displayName = ''; - String avatar = ''; String email = ''; String note = ''; String? verifier; @@ -35,8 +33,6 @@ class UserPayload { UserPayload.fromJson(Map json) : name = json['name'] ?? '', - displayName = json['display_name'] ?? '', - avatar = json['avatar'] ?? '', email = json['email'] ?? '', note = json['note'] ?? '', verifier = json['verifier'], @@ -50,8 +46,6 @@ class UserPayload { Map toJson() { final Map map = { 'name': name, - 'display_name': displayName, - 'avatar': avatar, 'status': status == UserStatus.kDisabled ? 0 : status == UserStatus.kUnverified @@ -64,14 +58,9 @@ class UserPayload { Map toGroupCacheJson() { final Map map = { 'name': name, - 'display_name': displayName, }; return map; } - - String get displayNameOrName { - return displayName.trim().isEmpty ? name : displayName; - } } class PeerPayload { @@ -100,7 +89,6 @@ class PeerPayload { "platform": _platform(p.info['os']), "hostname": p.info['device_name'], "device_group_name": p.device_group_name, - "note": p.note, }); } @@ -260,17 +248,15 @@ class AbProfile { String name; String owner; String? note; - dynamic info; int rule; - AbProfile(this.guid, this.name, this.owner, this.note, this.rule, this.info); + AbProfile(this.guid, this.name, this.owner, this.note, this.rule); AbProfile.fromJson(Map json) : guid = json['guid'] ?? '', name = json['name'] ?? '', owner = json['owner'] ?? '', note = json['note'] ?? '', - info = json['info'], rule = json['rule'] ?? 0; } diff --git a/flutter/lib/common/shared_state.dart b/flutter/lib/common/shared_state.dart index 4f9373ccd..908c98a70 100644 --- a/flutter/lib/common/shared_state.dart +++ b/flutter/lib/common/shared_state.dart @@ -77,11 +77,9 @@ class CurrentDisplayState { class ConnectionType { final Rx _secure = kInvalidValueStr.obs; final Rx _direct = kInvalidValueStr.obs; - final Rx _stream_type = kInvalidValueStr.obs; Rx get secure => _secure; Rx get direct => _direct; - Rx get stream_type => _stream_type; static String get strSecure => 'secure'; static String get strInsecure => 'insecure'; @@ -96,14 +94,9 @@ class ConnectionType { _direct.value = v ? strDirect : strIndirect; } - void setStreamType(String v) { - _stream_type.value = v; - } - bool isValid() { return _secure.value != kInvalidValueStr && - _direct.value != kInvalidValueStr && - _stream_type.value != kInvalidValueStr; + _direct.value != kInvalidValueStr; } } diff --git a/flutter/lib/common/widgets/address_book.dart b/flutter/lib/common/widgets/address_book.dart index 054a1666c..6a3cec8ad 100644 --- a/flutter/lib/common/widgets/address_book.dart +++ b/flutter/lib/common/widgets/address_book.dart @@ -54,9 +54,9 @@ class _AddressBookState extends State { const LinearProgressIndicator(), buildErrorBanner(context, loading: gFFI.abModel.currentAbLoading, - err: gFFI.abModel.abPullError, + err: gFFI.abModel.currentAbPullError, retry: null, - close: gFFI.abModel.clearPullErrors), + close: () => gFFI.abModel.currentAbPullError.value = ''), buildErrorBanner(context, loading: gFFI.abModel.currentAbLoading, err: gFFI.abModel.currentAbPushError, @@ -466,7 +466,6 @@ class _AddressBookState extends State { IDTextEditingController idController = IDTextEditingController(text: ''); TextEditingController aliasController = TextEditingController(text: ''); TextEditingController passwordController = TextEditingController(text: ''); - TextEditingController noteController = TextEditingController(text: ''); final tags = List.of(gFFI.abModel.currentAbTags); var selectedTag = List.empty(growable: true).obs; final style = TextStyle(fontSize: 14.0); @@ -495,11 +494,7 @@ class _AddressBookState extends State { password = passwordController.text; } String? errMsg2 = await gFFI.abModel.addIdToCurrent( - id, - aliasController.text.trim(), - password, - selectedTag, - noteController.text); + id, aliasController.text.trim(), password, selectedTag); if (errMsg2 != null) { setState(() { isInProgress = false; @@ -605,24 +600,6 @@ class _AddressBookState extends State { ), ).workaroundFreezeLinuxMint(), )), - row( - label: Text( - translate('Note'), - style: style, - ), - input: Obx( - () => TextField( - controller: noteController, - maxLines: 3, - minLines: 1, - maxLength: 300, - decoration: InputDecoration( - labelText: stateGlobal.isPortrait.isFalse - ? null - : translate('Note'), - ), - ).workaroundFreezeLinuxMint(), - )), if (gFFI.abModel.currentAbTags.isNotEmpty) Align( alignment: Alignment.centerLeft, diff --git a/flutter/lib/common/widgets/custom_scale_base.dart b/flutter/lib/common/widgets/custom_scale_base.dart deleted file mode 100644 index 6eceef13f..000000000 --- a/flutter/lib/common/widgets/custom_scale_base.dart +++ /dev/null @@ -1,156 +0,0 @@ -import 'dart:async'; - -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:debounce_throttle/debounce_throttle.dart'; -import 'package:flutter_hbb/consts.dart'; -import 'package:flutter_hbb/models/model.dart'; -import 'package:flutter_hbb/models/platform_model.dart'; -import 'package:flutter_hbb/utils/scale.dart'; -import 'package:flutter_hbb/common.dart'; - -/// Base class providing shared custom scale control logic for both mobile and desktop widgets. -/// Implementations must provide [ffi] and [onScaleChanged] getters. -abstract class CustomScaleControls extends State { - /// FFI instance for session interaction - FFI get ffi; - - /// Callback invoked when scale value changes - ValueChanged? get onScaleChanged; - - late int _scaleValue; - late final Debouncer _debouncerScale; - // Normalized slider position in [0, 1]. We map it nonlinearly to percent. - double _scalePos = 0.0; - - int get scaleValue => _scaleValue; - double get scalePos => _scalePos; - - int mapPosToPercent(double p) => _mapPosToPercent(p); - - static const int minPercent = kScaleCustomMinPercent; - static const int pivotPercent = kScaleCustomPivotPercent; // 100% should be at 1/3 of track - static const int maxPercent = kScaleCustomMaxPercent; - static const double pivotPos = kScaleCustomPivotPos; // first 1/3 → up to 100% - static const double detentEpsilon = kScaleCustomDetentEpsilon; // snap range around pivot (~0.6%) - - // Clamp helper for local use - int _clampScale(int v) => clampCustomScalePercent(v); - - // Map normalized position [0,1] → percent [5,1000] with 100 at 1/3 width. - int _mapPosToPercent(double p) { - if (p <= 0.0) return minPercent; - if (p >= 1.0) return maxPercent; - if (p <= pivotPos) { - final q = p / pivotPos; // 0..1 - final v = minPercent + q * (pivotPercent - minPercent); - return _clampScale(v.round()); - } else { - final q = (p - pivotPos) / (1.0 - pivotPos); // 0..1 - final v = pivotPercent + q * (maxPercent - pivotPercent); - return _clampScale(v.round()); - } - } - - // Map percent [5,1000] → normalized position [0,1] - double _mapPercentToPos(int percent) { - final p = _clampScale(percent); - if (p <= pivotPercent) { - final q = (p - minPercent) / (pivotPercent - minPercent); - return q * pivotPos; - } else { - final q = (p - pivotPercent) / (maxPercent - pivotPercent); - return pivotPos + q * (1.0 - pivotPos); - } - } - - // Snap normalized position to the pivot when close to it - double _snapNormalizedPos(double p) { - if ((p - pivotPos).abs() <= detentEpsilon) return pivotPos; - if (p < 0.0) return 0.0; - if (p > 1.0) return 1.0; - return p; - } - - @override - void initState() { - super.initState(); - _scaleValue = 100; - _debouncerScale = Debouncer( - kDebounceCustomScaleDuration, - onChanged: (v) async { - await _applyScale(v); - }, - initialValue: _scaleValue, - ); - WidgetsBinding.instance.addPostFrameCallback((_) async { - try { - final v = await getSessionCustomScalePercent(ffi.sessionId); - if (mounted) { - setState(() { - _scaleValue = v; - _scalePos = _mapPercentToPos(v); - }); - } - } catch (e, st) { - debugPrint('[CustomScale] Failed to get initial value: $e'); - debugPrintStack(stackTrace: st); - } - }); - } - - Future _applyScale(int v) async { - v = clampCustomScalePercent(v); - setState(() { - _scaleValue = v; - }); - try { - await bind.sessionSetFlutterOption( - sessionId: ffi.sessionId, - k: kCustomScalePercentKey, - v: v.toString()); - final curStyle = await bind.sessionGetViewStyle(sessionId: ffi.sessionId); - if (curStyle != kRemoteViewStyleCustom) { - await bind.sessionSetViewStyle( - sessionId: ffi.sessionId, value: kRemoteViewStyleCustom); - } - await ffi.canvasModel.updateViewStyle(); - if (isMobile) { - HapticFeedback.selectionClick(); - } - onScaleChanged?.call(v); - } catch (e, st) { - debugPrint('[CustomScale] Apply failed: $e'); - debugPrintStack(stackTrace: st); - } - } - - void nudgeScale(int delta) { - final next = _clampScale(_scaleValue + delta); - setState(() { - _scaleValue = next; - _scalePos = _mapPercentToPos(next); - }); - onScaleChanged?.call(next); - _debouncerScale.value = next; - } - - @override - void dispose() { - _debouncerScale.cancel(); - super.dispose(); - } - - void onSliderChanged(double v) { - final snapped = _snapNormalizedPos(v); - final next = _mapPosToPercent(snapped); - if (next != _scaleValue || snapped != _scalePos) { - setState(() { - _scalePos = snapped; - _scaleValue = next; - }); - onScaleChanged?.call(next); - _debouncerScale.value = next; - } - } -} diff --git a/flutter/lib/common/widgets/dialog.dart b/flutter/lib/common/widgets/dialog.dart index 7534fb2a1..7c75f96f7 100644 --- a/flutter/lib/common/widgets/dialog.dart +++ b/flutter/lib/common/widgets/dialog.dart @@ -7,29 +7,20 @@ import 'package:flutter/services.dart'; import 'package:flutter_hbb/common/shared_state.dart'; import 'package:flutter_hbb/common/widgets/setting_widgets.dart'; import 'package:flutter_hbb/consts.dart'; -import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart'; import 'package:flutter_hbb/models/peer_model.dart'; import 'package:flutter_hbb/models/peer_tab_model.dart'; import 'package:flutter_hbb/models/state_model.dart'; import 'package:get/get.dart'; import 'package:qr_flutter/qr_flutter.dart'; -import 'package:flutter_hbb/utils/http_service.dart' as http; import '../../common.dart'; import '../../models/model.dart'; import '../../models/platform_model.dart'; import 'address_book.dart'; -void clientClose(SessionID sessionId, FFI ffi) async { - if (allowAskForNoteAtEndOfConnection(ffi, true)) { - if (await showConnEndAuditDialogCloseCanceled(ffi: ffi)) { - return; - } - closeConnection(); - } else { - msgBox(sessionId, 'info', 'Close', 'Are you sure to close the connection?', - '', ffi.dialogManager); - } +void clientClose(SessionID sessionId, OverlayDialogManager dialogManager) { + msgBox(sessionId, 'info', 'Close', 'Are you sure to close the connection?', + '', dialogManager); } abstract class ValidationRule { @@ -828,33 +819,23 @@ void enterPasswordDialog( } void enterUserLoginDialog( - SessionID sessionId, - OverlayDialogManager dialogManager, - String osAccountDescTip, - bool canRememberAccount) async { + SessionID sessionId, OverlayDialogManager dialogManager) async { await _connectDialog( sessionId, dialogManager, osUsernameController: TextEditingController(), osPasswordController: TextEditingController(), - osAccountDescTip: osAccountDescTip, - canRememberAccount: canRememberAccount, ); } void enterUserLoginAndPasswordDialog( - SessionID sessionId, - OverlayDialogManager dialogManager, - String osAccountDescTip, - bool canRememberAccount) async { + SessionID sessionId, OverlayDialogManager dialogManager) async { await _connectDialog( sessionId, dialogManager, osUsernameController: TextEditingController(), osPasswordController: TextEditingController(), passwordController: TextEditingController(), - osAccountDescTip: osAccountDescTip, - canRememberAccount: canRememberAccount, ); } @@ -864,28 +845,17 @@ _connectDialog( TextEditingController? osUsernameController, TextEditingController? osPasswordController, TextEditingController? passwordController, - String? osAccountDescTip, - bool canRememberAccount = true, }) async { - final errUsername = ''.obs; var rememberPassword = false; if (passwordController != null) { rememberPassword = await bind.sessionGetRemember(sessionId: sessionId) ?? false; } var rememberAccount = false; - if (canRememberAccount && osUsernameController != null) { + if (osUsernameController != null) { rememberAccount = await bind.sessionGetRemember(sessionId: sessionId) ?? false; } - if (osUsernameController != null) { - osUsernameController.addListener(() { - if (errUsername.value.isNotEmpty) { - errUsername.value = ''; - } - }); - } - dialogManager.dismissAll(); dialogManager.show((setState, close, context) { cancel() { @@ -894,13 +864,6 @@ _connectDialog( } submit() { - if (osUsernameController != null) { - if (osUsernameController.text.trim().isEmpty) { - errUsername.value = translate('Empty Username'); - setState(() {}); - return; - } - } final osUsername = osUsernameController?.text.trim() ?? ''; final osPassword = osPasswordController?.text.trim() ?? ''; final password = passwordController?.text.trim() ?? ''; @@ -964,39 +927,26 @@ _connectDialog( } return Column( children: [ - if (osAccountDescTip != null) descWidget(translate(osAccountDescTip)), + descWidget(translate('login_linux_tip')), DialogTextField( title: translate(DialogTextField.kUsernameTitle), controller: osUsernameController, prefixIcon: DialogTextField.kUsernameIcon, errorText: null, ), - if (errUsername.value.isNotEmpty) - Align( - alignment: Alignment.centerLeft, - child: SelectableText( - errUsername.value, - style: TextStyle( - color: Theme.of(context).colorScheme.error, - fontSize: 12, - ), - textAlign: TextAlign.left, - ).paddingOnly(left: 12, bottom: 2), - ), PasswordWidget( controller: osPasswordController, autoFocus: false, ), - if (canRememberAccount) - rememberWidget( - translate('remember_account_tip'), - rememberAccount, - (v) { - if (v != null) { - setState(() => rememberAccount = v); - } - }, - ), + rememberWidget( + translate('remember_account_tip'), + rememberAccount, + (v) { + if (v != null) { + setState(() => rememberAccount = v); + } + }, + ), ], ); } @@ -1186,7 +1136,7 @@ void showRequestElevationDialog( DialogTextField( controller: userController, title: translate('Username'), - hintText: translate('elevation_username_tip'), + hintText: translate('eg: admin'), prefixIcon: DialogTextField.kUsernameIcon, errorText: errUser.isEmpty ? null : errUser.value, ), @@ -1518,71 +1468,56 @@ showSetOSAccount( }); } -Widget buildNoteTextField({ - required TextEditingController controller, - required VoidCallback onEscape, -}) { - final focusNode = FocusNode( - onKey: (FocusNode node, RawKeyEvent evt) { - if (evt.logicalKey.keyLabel == 'Enter') { - if (evt is RawKeyDownEvent) { - int pos = controller.selection.base.offset; - controller.text = - '${controller.text.substring(0, pos)}\n${controller.text.substring(pos)}'; - controller.selection = - TextSelection.fromPosition(TextPosition(offset: pos + 1)); - } - return KeyEventResult.handled; - } - if (evt.logicalKey.keyLabel == 'Esc') { - if (evt is RawKeyDownEvent) { - onEscape(); - } - return KeyEventResult.handled; - } else { - return KeyEventResult.ignored; - } - }, - ); - - return TextField( - autofocus: true, - keyboardType: TextInputType.multiline, - textInputAction: TextInputAction.newline, - decoration: InputDecoration( - hintText: translate('input note here'), - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(8), - ), - contentPadding: EdgeInsets.all(12), - ), - minLines: 5, - maxLines: null, - maxLength: 256, - controller: controller, - focusNode: focusNode, - ).workaroundFreezeLinuxMint(); -} - showAuditDialog(FFI ffi) async { - final controller = TextEditingController( - text: bind.sessionGetLastAuditNote(sessionId: ffi.sessionId)); + final controller = TextEditingController(text: ffi.auditNote); ffi.dialogManager.show((setState, close, context) { submit() { var text = controller.text; bind.sessionSendNote(sessionId: ffi.sessionId, note: text); + ffi.auditNote = text; close(); } + late final focusNode = FocusNode( + onKey: (FocusNode node, RawKeyEvent evt) { + if (evt.logicalKey.keyLabel == 'Enter') { + if (evt is RawKeyDownEvent) { + int pos = controller.selection.base.offset; + controller.text = + '${controller.text.substring(0, pos)}\n${controller.text.substring(pos)}'; + controller.selection = + TextSelection.fromPosition(TextPosition(offset: pos + 1)); + } + return KeyEventResult.handled; + } + if (evt.logicalKey.keyLabel == 'Esc') { + if (evt is RawKeyDownEvent) { + close(); + } + return KeyEventResult.handled; + } else { + return KeyEventResult.ignored; + } + }, + ); + return CustomAlertDialog( title: Text(translate('Note')), content: SizedBox( width: 250, height: 120, - child: buildNoteTextField( + child: TextField( + autofocus: true, + keyboardType: TextInputType.multiline, + textInputAction: TextInputAction.newline, + decoration: const InputDecoration.collapsed( + hintText: 'input note here', + ), + maxLines: null, + maxLength: 256, controller: controller, - onEscape: close, - )), + focusNode: focusNode, + ).workaroundFreezeLinuxMint()), actions: [ dialogButton('Cancel', onPressed: close, isOutline: true), dialogButton('OK', onPressed: submit) @@ -1593,223 +1528,6 @@ showAuditDialog(FFI ffi) async { }); } -bool allowAskForNoteAtEndOfConnection(FFI? ffi, bool closedByControlling) { - if (ffi == null) { - return false; - } - return mainGetLocalBoolOptionSync(kOptionAllowAskForNoteAtEndOfConnection) && - bind - .sessionGetAuditServerSync(sessionId: ffi.sessionId, typ: "conn") - .isNotEmpty && - bind.sessionGetAuditGuid(sessionId: ffi.sessionId).isNotEmpty && - bind.sessionGetLastAuditNote(sessionId: ffi.sessionId).isEmpty && - (!closedByControlling || - bind.willSessionCloseCloseSession(sessionId: ffi.sessionId)); -} - -// return value: close canceled -// true: return -// false: go on -Future desktopTryShowTabAuditDialogCloseCancelled( - {required String id, required DesktopTabController tabController}) async { - try { - final page = - tabController.state.value.tabs.firstWhere((tab) => tab.key == id).page; - final ffi = (page as dynamic).ffi; - final res = await showConnEndAuditDialogCloseCanceled(ffi: ffi); - return res; - } catch (e) { - debugPrint('Failed to show audit dialog: $e'); - return false; - } -} - -// return value: -// true: return -// false: go on -Future showConnEndAuditDialogCloseCanceled( - {required FFI ffi, String? type, String? title, String? text}) async { - final res = await _showConnEndAuditDialogCloseCanceled( - ffi: ffi, type: type, title: title, text: text); - if (res == true) { - return true; - } - return false; -} - -// return value: -// true: return -// false / null: go on -Future _showConnEndAuditDialogCloseCanceled({ - required FFI ffi, - String? type, - String? title, - String? text, -}) async { - final closedByControlling = type == null; - final showDialog = allowAskForNoteAtEndOfConnection(ffi, closedByControlling); - if (!showDialog) { - return false; - } - ffi.dialogManager.dismissAll(); - - Future updateAuditNoteByGuid(String auditGuid, String note) async { - debugPrint('Updating audit note for GUID: $auditGuid, note: $note'); - try { - final apiServer = await bind.mainGetApiServer(); - if (apiServer.isEmpty) { - debugPrint('API server is empty, cannot update audit note'); - return; - } - final url = '$apiServer/api/audit'; - var headers = getHttpHeaders(); - headers['Content-Type'] = "application/json"; - final body = jsonEncode({ - 'guid': auditGuid, - 'note': note, - }); - - final response = await http.put( - Uri.parse(url), - headers: headers, - body: body, - ); - - if (response.statusCode == 200) { - debugPrint('Successfully updated audit note for GUID: $auditGuid'); - } else { - debugPrint( - 'Failed to update audit note. Status: ${response.statusCode}, Body: ${response.body}'); - } - } catch (e) { - debugPrint('Error updating audit note: $e'); - } - } - - final controller = TextEditingController(); - bool askForNote = - mainGetLocalBoolOptionSync(kOptionAllowAskForNoteAtEndOfConnection); - final isOptFixed = isOptionFixed(kOptionAllowAskForNoteAtEndOfConnection); - bool isInProgress = false; - - return await ffi.dialogManager.show((setState, close, context) { - cancel() { - close(true); - } - - set() async { - if (isInProgress) return; - setState(() { - isInProgress = true; - }); - var text = controller.text; - if (text.isNotEmpty) { - await updateAuditNoteByGuid( - bind.sessionGetAuditGuid(sessionId: ffi.sessionId), text) - .timeout(const Duration(seconds: 6), onTimeout: () { - debugPrint('updateAuditNoteByGuid timeout after 6s'); - }); - } - // Save the "ask for note" preference - if (!isOptFixed) { - await mainSetLocalBoolOption( - kOptionAllowAskForNoteAtEndOfConnection, askForNote); - } - } - - submit() async { - await set(); - close(false); - } - - final buttons = [ - dialogButton('OK', onPressed: isInProgress ? null : submit) - ]; - if (type == 'relay-hint' || type == 'relay-hint2') { - buttons.add(dialogButton('Retry', onPressed: () async { - await set(); - close(true); - ffi.ffiModel.reconnect(ffi.dialogManager, ffi.sessionId, false); - })); - if (type == 'relay-hint2') { - buttons.add(dialogButton('Connect via relay', onPressed: () async { - await set(); - close(true); - ffi.ffiModel.reconnect(ffi.dialogManager, ffi.sessionId, true); - })); - } - } - if (closedByControlling) { - buttons.add(dialogButton('Cancel', - onPressed: isInProgress ? null : cancel, isOutline: true)); - } - - Widget content; - if (closedByControlling) { - content = SelectionArea( - child: msgboxContent( - 'info', 'Close', 'Are you sure to close the connection?')); - } else { - content = - SelectionArea(child: msgboxContent(type, title ?? '', text ?? '')); - } - - return CustomAlertDialog( - title: null, - content: SizedBox( - width: 350, - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - content, - const SizedBox(height: 16), - SizedBox( - height: 120, - child: buildNoteTextField( - controller: controller, - onEscape: cancel, - ), - ), - if (!isOptFixed) ...[ - const SizedBox(height: 8), - InkWell( - onTap: () { - setState(() { - askForNote = !askForNote; - }); - }, - child: Row( - children: [ - Checkbox( - value: askForNote, - onChanged: (value) { - setState(() { - askForNote = value ?? false; - }); - }, - ), - Expanded( - child: Text( - translate('note-at-conn-end-tip'), - style: const TextStyle(fontSize: 13), - ), - ), - ], - ), - ), - ], - if (isInProgress) - const LinearProgressIndicator().marginOnly(top: 4), - ], - )), - actions: buttons, - onSubmit: submit, - onCancel: cancel, - ); - }); -} - void showConfirmSwitchSidesDialog( SessionID sessionId, String id, OverlayDialogManager dialogManager) async { dialogManager.show((setState, close, context) { @@ -2024,49 +1742,6 @@ void editAbTagDialog( }); } -void editAbPeerNoteDialog(String id) { - var isInProgress = false; - final currentNote = gFFI.abModel.getPeerNote(id); - var controller = TextEditingController(text: currentNote); - - gFFI.dialogManager.show((setState, close, context) { - submit() async { - setState(() { - isInProgress = true; - }); - await gFFI.abModel.changeNote(id: id, note: controller.text); - close(); - } - - return CustomAlertDialog( - title: Text(translate("Edit note")), - content: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - TextField( - controller: controller, - autofocus: true, - maxLines: 3, - minLines: 1, - maxLength: 300, - decoration: InputDecoration( - labelText: translate('Note'), - ), - ).workaroundFreezeLinuxMint(), - // NOT use Offstage to wrap LinearProgressIndicator - if (isInProgress) const LinearProgressIndicator(), - ], - ), - actions: [ - dialogButton("Cancel", onPressed: close, isOutline: true), - dialogButton("OK", onPressed: submit), - ], - onSubmit: submit, - onCancel: close, - ); - }); -} - void renameDialog( {required String oldName, FormFieldValidator? validator, @@ -2362,20 +2037,15 @@ void showWindowsSessionsDialog( return CustomAlertDialog( title: null, - content: Column( - mainAxisSize: MainAxisSize.min, - children: [ - msgboxContent(type, title, text).marginOnly(bottom: 12), - ComboBox( - keys: sids, - values: names, - initialKey: selectedUserValue, - onChanged: (value) { - selectedUserValue = value; - }), - ], - ), + content: msgboxContent(type, title, text), actions: [ + ComboBox( + keys: sids, + values: names, + initialKey: selectedUserValue, + onChanged: (value) { + selectedUserValue = value; + }), dialogButton('Connect', onPressed: submit, isOutline: false), ], ); diff --git a/flutter/lib/common/widgets/gestures.dart b/flutter/lib/common/widgets/gestures.dart index 0501ca453..b3cfeae6e 100644 --- a/flutter/lib/common/widgets/gestures.dart +++ b/flutter/lib/common/widgets/gestures.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:flutter/gestures.dart'; import 'package:flutter/widgets.dart'; -import 'package:flutter_hbb/common/widgets/remote_input.dart'; enum GestureState { none, @@ -25,7 +24,6 @@ class CustomTouchGestureRecognizer extends ScaleGestureRecognizer { GestureDragStartCallback? onOneFingerPanStart; GestureDragUpdateCallback? onOneFingerPanUpdate; GestureDragEndCallback? onOneFingerPanEnd; - GestureDragCancelCallback? onOneFingerPanCancel; // twoFingerScale : scale + pan event GestureScaleStartCallback? onTwoFingerScaleStart; @@ -98,12 +96,6 @@ class CustomTouchGestureRecognizer extends ScaleGestureRecognizer { if (onTwoFingerScaleEnd != null) { onTwoFingerScaleEnd!(d); } - if (isSpecialHoldDragActive) { - // If we are in special drag mode, we need to reset the state. - // Otherwise, the next `onTwoFingerScaleUpdate()` will handle a wrong `focalPoint`. - _currentState = GestureState.none; - return; - } break; case GestureState.threeFingerVerticalDrag: debugPrint("ThreeFingerState.vertical onEnd"); @@ -170,27 +162,6 @@ class CustomTouchGestureRecognizer extends ScaleGestureRecognizer { DragEndDetails _getDragEndDetails(ScaleEndDetails d) => DragEndDetails(velocity: d.velocity); - - @override - void rejectGesture(int pointer) { - super.rejectGesture(pointer); - switch (_currentState) { - case GestureState.oneFingerPan: - if (onOneFingerPanCancel != null) { - onOneFingerPanCancel!(); - } - break; - case GestureState.twoFingerScale: - // Reset scale state if needed, currently self-contained - break; - case GestureState.threeFingerVerticalDrag: - // Reset drag state if needed, currently self-contained - break; - default: - break; - } - _currentState = GestureState.none; - } } class HoldTapMoveGestureRecognizer extends GestureRecognizer { @@ -739,7 +710,6 @@ RawGestureDetector getMixinGestureDetector({ GestureDragStartCallback? onOneFingerPanStart, GestureDragUpdateCallback? onOneFingerPanUpdate, GestureDragEndCallback? onOneFingerPanEnd, - GestureDragCancelCallback? onOneFingerPanCancel, GestureScaleUpdateCallback? onTwoFingerScaleUpdate, GestureScaleEndCallback? onTwoFingerScaleEnd, GestureDragUpdateCallback? onThreeFingerVerticalDragUpdate, @@ -788,7 +758,6 @@ RawGestureDetector getMixinGestureDetector({ ..onOneFingerPanStart = onOneFingerPanStart ..onOneFingerPanUpdate = onOneFingerPanUpdate ..onOneFingerPanEnd = onOneFingerPanEnd - ..onOneFingerPanCancel = onOneFingerPanCancel ..onTwoFingerScaleUpdate = onTwoFingerScaleUpdate ..onTwoFingerScaleEnd = onTwoFingerScaleEnd ..onThreeFingerVerticalDragUpdate = onThreeFingerVerticalDragUpdate; diff --git a/flutter/lib/common/widgets/login.dart b/flutter/lib/common/widgets/login.dart index ee376de68..c1f18f0a8 100644 --- a/flutter/lib/common/widgets/login.dart +++ b/flutter/lib/common/widgets/login.dart @@ -20,8 +20,7 @@ const kOpSvgList = [ 'okta', 'facebook', 'azure', - 'auth0', - 'microsoft' + 'auth0' ]; class _IconOP extends StatelessWidget { @@ -104,7 +103,7 @@ class ButtonOP extends StatelessWidget { child: FittedBox( fit: BoxFit.scaleDown, child: Center( - child: Text(translate("Continue with {$opLabel}"))), + child: Text('${translate("Continue with")} $opLabel')), ), ), ], @@ -225,59 +224,21 @@ class _WidgetOPState extends State { return Offstage( offstage: _failedMsg.isEmpty && widget.curOP.value != widget.config.op, - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - if (_stateMsg.isNotEmpty && _failedMsg.isEmpty) - Padding( - padding: const EdgeInsets.only(top: 8.0), - child: SelectableText( - translate(_stateMsg), - style: DefaultTextStyle.of(context) - .style - .copyWith(fontSize: 12), - ), - ), - if (_failedMsg.isNotEmpty) - Padding( - padding: const EdgeInsets.only(top: 8.0), - child: Builder(builder: (context) { - final errorColor = - Theme.of(context).colorScheme.error; - final bgColor = Theme.of(context) - .colorScheme - .errorContainer - .withOpacity(0.3); - return Container( - padding: const EdgeInsets.symmetric( - horizontal: 8.0, vertical: 6.0), - decoration: BoxDecoration( - color: bgColor, - borderRadius: BorderRadius.circular(4.0), + child: RichText( + text: TextSpan( + text: '$_stateMsg ', + style: + DefaultTextStyle.of(context).style.copyWith(fontSize: 12), + children: [ + TextSpan( + text: _failedMsg, + style: DefaultTextStyle.of(context).style.copyWith( + fontSize: 14, + color: Colors.red, ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Icon(Icons.error_outline, - color: errorColor, size: 16), - const SizedBox(width: 6), - Flexible( - child: SelectableText( - translate(_failedMsg), - style: DefaultTextStyle.of(context) - .style - .copyWith( - fontSize: 13, - color: errorColor, - ), - ), - ), - ], - ), - ); - }), ), - ], + ], + ), ), ); }), @@ -439,8 +400,6 @@ Future loginDialog() async { String? passwordMsg; var isInProgress = false; final RxString curOP = ''.obs; - // Track hover state for the close icon - bool isCloseHovered = false; final loginOptions = [].obs; Future.delayed(Duration.zero, () async { @@ -598,27 +557,21 @@ Future loginDialog() async { Text( translate('Login'), ).marginOnly(top: MyTheme.dialogPadding), - MouseRegion( - onEnter: (_) => setState(() => isCloseHovered = true), - onExit: (_) => setState(() => isCloseHovered = false), - child: InkWell( - child: Icon( - Icons.close, - size: 25, - // No need to handle the branch of null. - // Because we can ensure the color is not null when debug. - color: isCloseHovered - ? Colors.white - : Theme.of(context) - .textTheme - .titleLarge - ?.color - ?.withOpacity(0.55), - ), - onTap: onDialogCancel, - hoverColor: Colors.red, - borderRadius: BorderRadius.circular(5), + InkWell( + child: Icon( + Icons.close, + size: 25, + // No need to handle the branch of null. + // Because we can ensure the color is not null when debug. + color: Theme.of(context) + .textTheme + .titleLarge + ?.color + ?.withOpacity(0.55), ), + onTap: onDialogCancel, + hoverColor: Colors.red, + borderRadius: BorderRadius.circular(5), ).marginOnly(top: 10, right: 15), ], ); diff --git a/flutter/lib/common/widgets/my_group.dart b/flutter/lib/common/widgets/my_group.dart index 74ce34e71..6207a7363 100644 --- a/flutter/lib/common/widgets/my_group.dart +++ b/flutter/lib/common/widgets/my_group.dart @@ -158,18 +158,12 @@ class _MyGroupState extends State { return Obx(() { final userItems = gFFI.groupModel.users.where((p0) { if (searchAccessibleItemNameText.isNotEmpty) { - final search = searchAccessibleItemNameText.value.toLowerCase(); - return p0.name.toLowerCase().contains(search) || - p0.displayNameOrName.toLowerCase().contains(search); + return p0.name + .toLowerCase() + .contains(searchAccessibleItemNameText.value.toLowerCase()); } return true; }).toList(); - // Count occurrences of each displayNameOrName to detect duplicates - final displayNameCount = {}; - for (final u in userItems) { - final dn = u.displayNameOrName; - displayNameCount[dn] = (displayNameCount[dn] ?? 0) + 1; - } final deviceGroupItems = gFFI.groupModel.deviceGroups.where((p0) { if (searchAccessibleItemNameText.isNotEmpty) { return p0.name @@ -183,8 +177,7 @@ class _MyGroupState extends State { itemCount: deviceGroupItems.length + userItems.length, itemBuilder: (context, index) => index < deviceGroupItems.length ? _buildDeviceGroupItem(deviceGroupItems[index]) - : _buildUserItem(userItems[index - deviceGroupItems.length], - displayNameCount)); + : _buildUserItem(userItems[index - deviceGroupItems.length])); var maxHeight = max(MediaQuery.of(context).size.height / 6, 100.0); return Obx(() => stateGlobal.isPortrait.isFalse ? listView(false) @@ -192,14 +185,8 @@ class _MyGroupState extends State { }); } - Widget _buildUserItem(UserPayload user, Map displayNameCount) { + Widget _buildUserItem(UserPayload user) { final username = user.name; - final dn = user.displayNameOrName; - final isDuplicate = (displayNameCount[dn] ?? 0) > 1; - final displayName = - isDuplicate && user.displayName.trim().isNotEmpty - ? '${user.displayName} (@$username)' - : dn; return InkWell(onTap: () { isSelectedDeviceGroup.value = false; if (selectedAccessibleItemName.value != username) { @@ -235,14 +222,14 @@ class _MyGroupState extends State { alignment: Alignment.center, child: Center( child: Text( - displayName.characters.first.toUpperCase(), + username.characters.first.toUpperCase(), style: TextStyle(color: Colors.white), textAlign: TextAlign.center, ), ), ), ).marginOnly(right: 4), - if (isMe) Flexible(child: Text(displayName)), + if (isMe) Flexible(child: Text(username)), if (isMe) Flexible( child: Container( @@ -259,7 +246,7 @@ class _MyGroupState extends State { ), ), ), - if (!isMe) Expanded(child: Text(displayName)), + if (!isMe) Expanded(child: Text(username)), ], ).paddingSymmetric(vertical: 4), ), diff --git a/flutter/lib/common/widgets/overlay.dart b/flutter/lib/common/widgets/overlay.dart index 3fb63616d..9b20136e1 100644 --- a/flutter/lib/common/widgets/overlay.dart +++ b/flutter/lib/common/widgets/overlay.dart @@ -50,7 +50,6 @@ class DraggableChatWindow extends StatelessWidget { ) : Draggable( checkKeyboard: true, - checkScreenSize: true, position: draggablePositions.chatWindow, width: width, height: height, @@ -396,10 +395,7 @@ class _DraggableState extends State { _chatModel?.setChatWindowPosition(position); } - checkScreenSize() { - // Ensure the draggable always stays within current screen bounds - widget.position.tryAdjust(widget.width, widget.height, 1); - } + checkScreenSize() {} checkKeyboard() { final bottomHeight = MediaQuery.of(context).viewInsets.bottom; @@ -521,12 +517,6 @@ class IOSDraggableState extends State { _lastBottomHeight = bottomHeight; } - @override - void initState() { - super.initState(); - position.tryAdjust(_width, _height, 1); - } - @override Widget build(BuildContext context) { checkKeyboard(); diff --git a/flutter/lib/common/widgets/peer_card.dart b/flutter/lib/common/widgets/peer_card.dart index 1f9f3ed7f..d664f3d80 100644 --- a/flutter/lib/common/widgets/peer_card.dart +++ b/flutter/lib/common/widgets/peer_card.dart @@ -127,10 +127,6 @@ class _PeerCardState extends State<_PeerCard> ); } - bool _showNote(Peer peer) { - return peerTabShowNote(widget.tab) && peer.note.isNotEmpty; - } - makeChild(bool isPortrait, Peer peer) { final name = hideUsernameOnCard == true ? peer.hostname @@ -138,8 +134,6 @@ class _PeerCardState extends State<_PeerCard> final greyStyle = TextStyle( fontSize: 11, color: Theme.of(context).textTheme.titleLarge?.color?.withOpacity(0.6)); - final showNote = _showNote(peer); - return Row( mainAxisSize: MainAxisSize.max, children: [ @@ -191,44 +185,14 @@ class _PeerCardState extends State<_PeerCard> style: Theme.of(context).textTheme.titleSmall, )), ]).marginOnly(top: isPortrait ? 0 : 2), - Row( - children: [ - Flexible( - child: Tooltip( - message: name, - waitDuration: const Duration(seconds: 1), - child: Align( - alignment: Alignment.centerLeft, - child: Text( - name, - style: isPortrait ? null : greyStyle, - textAlign: TextAlign.start, - overflow: TextOverflow.ellipsis, - ), - ), - ), - ), - if (showNote) - Expanded( - child: Tooltip( - message: peer.note, - waitDuration: const Duration(seconds: 1), - child: Align( - alignment: Alignment.centerLeft, - child: Text( - peer.note, - style: isPortrait ? null : greyStyle, - textAlign: TextAlign.start, - overflow: TextOverflow.ellipsis, - ).marginOnly( - left: peerCardUiType.value == - PeerUiType.list - ? 32 - : 4), - ), - ), - ) - ], + Align( + alignment: Alignment.centerLeft, + child: Text( + name, + style: isPortrait ? null : greyStyle, + textAlign: TextAlign.start, + overflow: TextOverflow.ellipsis, + ), ), ], ).marginOnly(top: 2), @@ -314,7 +278,7 @@ class _PeerCardState extends State<_PeerCard> padding: const EdgeInsets.all(6), child: getPlatformImage(peer.platform, size: 60), - ), + ).marginOnly(top: 4), Row( children: [ Expanded( @@ -333,26 +297,8 @@ class _PeerCardState extends State<_PeerCard> ), ], ), - if (_showNote(peer)) - Row( - children: [ - Expanded( - child: Tooltip( - message: peer.note, - waitDuration: const Duration(seconds: 1), - child: Text( - peer.note, - style: const TextStyle( - color: Colors.white38, - fontSize: 10), - textAlign: TextAlign.center, - overflow: TextOverflow.ellipsis, - ), - )) - ], - ), ], - ).paddingOnly(top: 4.0, left: 4.0, right: 4.0), + ).paddingAll(4.0), ), ], ), @@ -546,7 +492,6 @@ abstract class BasePeerCard extends StatelessWidget { bool isTcpTunneling = false, bool isRDP = false, bool isTerminal = false, - bool isTerminalRunAsAdmin = false, }) { return MenuEntryButton( childBuilder: (TextStyle? style) => Text( @@ -554,9 +499,6 @@ abstract class BasePeerCard extends StatelessWidget { style: style, ), proc: () { - if (isTerminalRunAsAdmin) { - setEnvTerminalAdmin(); - } connectInPeerTab( context, peer, @@ -565,7 +507,7 @@ abstract class BasePeerCard extends StatelessWidget { isViewCamera: isViewCamera, isTcpTunneling: isTcpTunneling, isRDP: isRDP, - isTerminal: isTerminal || isTerminalRunAsAdmin, + isTerminal: isTerminal, ); }, padding: menuPadding, @@ -605,20 +547,11 @@ abstract class BasePeerCard extends StatelessWidget { MenuEntryBase _terminalAction(BuildContext context) { return _connectCommonAction( context, - '${translate('Terminal')} (beta)', + translate('Terminal'), isTerminal: true, ); } - @protected - MenuEntryBase _terminalRunAsAdminAction(BuildContext context) { - return _connectCommonAction( - context, - '${translate('Terminal (Run as administrator)')} (beta)', - isTerminalRunAsAdmin: true, - ); - } - @protected MenuEntryBase _tcpTunnelingAction(BuildContext context) { return _connectCommonAction( @@ -973,10 +906,6 @@ class RecentPeerCard extends BasePeerCard { _terminalAction(context), ]; - if (peer.platform == kPeerPlatformWindows) { - menuItems.add(_terminalRunAsAdminAction(context)); - } - final List favs = (await bind.mainGetFav()).toList(); if (isDesktop && peer.platform != kPeerPlatformAndroid) { @@ -1037,11 +966,6 @@ class FavoritePeerCard extends BasePeerCard { _viewCameraAction(context), _terminalAction(context), ]; - - if (peer.platform == kPeerPlatformWindows) { - menuItems.add(_terminalRunAsAdminAction(context)); - } - if (isDesktop && peer.platform != kPeerPlatformAndroid) { menuItems.add(_tcpTunnelingAction(context)); } @@ -1098,10 +1022,6 @@ class DiscoveredPeerCard extends BasePeerCard { _terminalAction(context), ]; - if (peer.platform == kPeerPlatformWindows) { - menuItems.add(_terminalRunAsAdminAction(context)); - } - final List favs = (await bind.mainGetFav()).toList(); if (isDesktop && peer.platform != kPeerPlatformAndroid) { @@ -1156,11 +1076,6 @@ class AddressBookPeerCard extends BasePeerCard { _viewCameraAction(context), _terminalAction(context), ]; - - if (peer.platform == kPeerPlatformWindows) { - menuItems.add(_terminalRunAsAdminAction(context)); - } - if (isDesktop && peer.platform != kPeerPlatformAndroid) { menuItems.add(_tcpTunnelingAction(context)); } @@ -1188,7 +1103,6 @@ class AddressBookPeerCard extends BasePeerCard { if (gFFI.abModel.currentAbTags.isNotEmpty) { menuItems.add(_editTagAction(peer.id)); } - menuItems.add(_editNoteAction(peer.id)); } final addressbooks = gFFI.abModel.addressBooksCanWrite(); if (gFFI.peerTabModel.currentTab == PeerTabIndex.ab.index) { @@ -1228,21 +1142,6 @@ class AddressBookPeerCard extends BasePeerCard { ); } - @protected - MenuEntryBase _editNoteAction(String id) { - return MenuEntryButton( - childBuilder: (TextStyle? style) => Text( - translate('Edit note'), - style: style, - ), - proc: () { - editAbPeerNoteDialog(id); - }, - padding: super.menuPadding, - dismissOnClicked: true, - ); - } - @protected @override Future _getAlias(String id) async => @@ -1313,11 +1212,6 @@ class MyGroupPeerCard extends BasePeerCard { _viewCameraAction(context), _terminalAction(context), ]; - - if (peer.platform == kPeerPlatformWindows) { - menuItems.add(_terminalRunAsAdminAction(context)); - } - if (isDesktop && peer.platform != kPeerPlatformAndroid) { menuItems.add(_tcpTunnelingAction(context)); } @@ -1561,13 +1455,6 @@ void connectInPeerTab(BuildContext context, Peer peer, PeerTabIndex tab, password = peer.password; isSharedPassword = true; } - if (password.isEmpty) { - final abPassword = gFFI.abModel.getdefaultSharedPassword(); - if (abPassword != null) { - password = abPassword; - isSharedPassword = true; - } - } } } connect(context, peer.id, diff --git a/flutter/lib/common/widgets/peers_view.dart b/flutter/lib/common/widgets/peers_view.dart index 5be5af272..94f4af035 100644 --- a/flutter/lib/common/widgets/peers_view.dart +++ b/flutter/lib/common/widgets/peers_view.dart @@ -71,12 +71,10 @@ class _PeersView extends StatefulWidget { final Peers peers; final PeerFilter? peerFilter; final PeerCardBuilder peerCardBuilder; - final PeerTabIndex peerTabIndex; const _PeersView( {required this.peers, required this.peerCardBuilder, - required this.peerTabIndex, this.peerFilter, Key? key}) : super(key: key); @@ -397,8 +395,8 @@ class _PeersViewState extends State<_PeersView> return peers; } searchText = searchText.toLowerCase(); - final matches = await Future.wait( - peers.map((peer) => matchPeer(searchText, peer, widget.peerTabIndex))); + final matches = + await Future.wait(peers.map((peer) => matchPeer(searchText, peer))); final filteredList = List.empty(growable: true); for (var i = 0; i < peers.length; i++) { if (matches[i]) { @@ -443,10 +441,7 @@ abstract class BasePeersView extends StatelessWidget { break; } return _PeersView( - peers: peers, - peerFilter: peerFilter, - peerCardBuilder: peerCardBuilder, - peerTabIndex: peerTabIndex); + peers: peers, peerFilter: peerFilter, peerCardBuilder: peerCardBuilder); } } @@ -570,14 +565,11 @@ class MyGroupPeerView extends BasePeersView { static bool filter(Peer peer) { final model = gFFI.groupModel; if (model.searchAccessibleItemNameText.isNotEmpty) { - final text = model.searchAccessibleItemNameText.value.toLowerCase(); - final searchPeersOfUser = model.users.any((user) => - user.name == peer.loginName && - (user.name.toLowerCase().contains(text) || - user.displayNameOrName.toLowerCase().contains(text))); - final searchPeersOfDeviceGroup = - peer.device_group_name.toLowerCase().contains(text) && - model.deviceGroups.any((g) => g.name == peer.device_group_name); + final text = model.searchAccessibleItemNameText.value; + final searchPeersOfUser = peer.loginName.contains(text) && + model.users.any((user) => user.name == peer.loginName); + final searchPeersOfDeviceGroup = peer.device_group_name.contains(text) && + model.deviceGroups.any((g) => g.name == peer.device_group_name); if (!searchPeersOfUser && !searchPeersOfDeviceGroup) { return false; } diff --git a/flutter/lib/common/widgets/remote_input.dart b/flutter/lib/common/widgets/remote_input.dart index 9515ca759..8eb0ecbc3 100644 --- a/flutter/lib/common/widgets/remote_input.dart +++ b/flutter/lib/common/widgets/remote_input.dart @@ -31,7 +31,7 @@ class RawKeyFocusScope extends StatelessWidget { // https://github.com/flutter/flutter/issues/154053 final useRawKeyEvents = isLinux && !isWeb; // FIXME: On Windows, `AltGr` will generate `Alt` and `Control` key events, - // while `Alt` and `Control` are separated key events for en-US input method. + // while `Alt` and `Control` are seperated key events for en-US input method. return FocusScope( autofocus: true, child: Focus( @@ -51,13 +51,6 @@ class RawKeyFocusScope extends StatelessWidget { } } -// For virtual mouse when using the mouse mode on mobile. -// Special hold-drag mode: one finger holds a button (left/right button), another finger pans. -// This flag is to override the scale gesture to a pan gesture. -bool isSpecialHoldDragActive = false; -// Cache the last focal point to calculate deltas in special hold-drag mode. -Offset _lastSpecialHoldDragFocalPoint = Offset.zero; - class RawTouchGestureDetectorRegion extends StatefulWidget { final Widget child; final FFI ffi; @@ -104,12 +97,6 @@ class _RawTouchGestureDetectorRegionState bool _touchModePanStarted = false; Offset _doubleFinerTapPosition = Offset.zero; - // For mouse mode, we need to block the events when the cursor is in a blocked area. - // So we need to cache the last tap down position. - Offset? _lastTapDownPositionForMouseMode; - // Cache global position for onTap (which lacks position info). - Offset? _lastTapDownGlobalPosition; - FFI get ffi => widget.ffi; FfiModel get ffiModel => widget.ffiModel; InputModel get inputModel => widget.inputModel; @@ -125,20 +112,11 @@ class _RawTouchGestureDetectorRegionState } bool isNotTouchBasedDevice() { - return !kTouchBasedDeviceKinds.contains(lastDeviceKind); - } - - // Mobile, mouse mode. - // Check if should block the mouse tap event (`_lastTapDownPositionForMouseMode`). - bool shouldBlockMouseModeEvent() { - return _lastTapDownPositionForMouseMode != null && - ffi.cursorModel.shouldBlock(_lastTapDownPositionForMouseMode!.dx, - _lastTapDownPositionForMouseMode!.dy); + return !kTouchBasedDeviceKinds.contains(lastDeviceKind); } onTapDown(TapDownDetails d) async { lastDeviceKind = d.kind; - _lastTapDownGlobalPosition = d.globalPosition; if (isNotTouchBasedDevice()) { return; } @@ -146,8 +124,6 @@ class _RawTouchGestureDetectorRegionState _lastPosOfDoubleTapDown = d.localPosition; // Desktop or mobile "Touch mode" _lastTapDownDetails = d; - } else { - _lastTapDownPositionForMouseMode = d.localPosition; } } @@ -157,16 +133,11 @@ class _RawTouchGestureDetectorRegionState if (isNotTouchBasedDevice()) { return; } - // Filter duplicate touch tap events on iOS (Magic Mouse issue). - if (inputModel.shouldIgnoreTouchTap(d.globalPosition)) { - return; - } if (handleTouch) { final isMoved = await ffi.cursorModel.move(d.localPosition.dx, d.localPosition.dy); if (isMoved) { - // If pan already handled 'down', don't send it again. - if (lastTapDownDetails != null && !_touchModePanStarted) { + if (lastTapDownDetails != null) { await inputModel.tapDown(MouseButtons.left); } await inputModel.tapUp(MouseButtons.left); @@ -178,17 +149,7 @@ class _RawTouchGestureDetectorRegionState if (isNotTouchBasedDevice()) { return; } - // Filter duplicate touch tap events on iOS (Magic Mouse issue). - final lastPos = _lastTapDownGlobalPosition; - if (lastPos != null && inputModel.shouldIgnoreTouchTap(lastPos)) { - return; - } if (!handleTouch) { - // Cannot use `_lastTapDownDetails` because Flutter calls `onTapUp` before `onTap`, clearing the cached details. - // Using `_lastTapDownPositionForMouseMode` instead. - if (shouldBlockMouseModeEvent()) { - return; - } // Mobile, "Mouse mode" await inputModel.tap(MouseButtons.left); } @@ -202,8 +163,6 @@ class _RawTouchGestureDetectorRegionState if (handleTouch) { _lastPosOfDoubleTapDown = d.localPosition; await ffi.cursorModel.move(d.localPosition.dx, d.localPosition.dy); - } else { - _lastTapDownPositionForMouseMode = d.localPosition; } } @@ -218,12 +177,6 @@ class _RawTouchGestureDetectorRegionState !ffi.cursorModel.isInRemoteRect(_lastPosOfDoubleTapDown)) { return; } - // Check if the position is in a blocked area when using the mouse mode. - if (!handleTouch) { - if (shouldBlockMouseModeEvent()) { - return; - } - } await inputModel.tap(MouseButtons.left); await inputModel.tap(MouseButtons.left); } @@ -245,8 +198,6 @@ class _RawTouchGestureDetectorRegionState .move(_cacheLongPressPosition.dx, _cacheLongPressPosition.dy); await inputModel.tapDown(MouseButtons.left); } - } else { - _lastTapDownPositionForMouseMode = d.localPosition; } } @@ -271,10 +222,6 @@ class _RawTouchGestureDetectorRegionState if (!isMoved) { return; } - } else { - if (shouldBlockMouseModeEvent()) { - return; - } } await inputModel.tap(MouseButtons.right); } else { @@ -327,7 +274,6 @@ class _RawTouchGestureDetectorRegionState return; } if (!handleTouch) { - if (isSpecialHoldDragActive) return; await inputModel.sendMouse('down', MouseButtons.left); } } @@ -337,7 +283,6 @@ class _RawTouchGestureDetectorRegionState return; } if (!handleTouch) { - if (isSpecialHoldDragActive) return; await ffi.cursorModel.updatePan(d.delta, d.localPosition, handleTouch); } } @@ -385,10 +330,7 @@ class _RawTouchGestureDetectorRegionState await ffi.cursorModel .move(_cacheLongPressPosition.dx, _cacheLongPressPosition.dy); } - // In relative mouse mode, skip mouse down - only send movement via sendMobileRelativeMouseMove - if (!inputModel.relativeMouseMode.value) { - await inputModel.sendMouse('down', MouseButtons.left); - } + await inputModel.sendMouse('down', MouseButtons.left); await ffi.cursorModel.move(d.localPosition.dx, d.localPosition.dy); } else { final offset = ffi.cursorModel.offset; @@ -413,12 +355,7 @@ class _RawTouchGestureDetectorRegionState if (handleTouch && !_touchModePanStarted) { return; } - // In relative mouse mode, send delta directly without position tracking. - if (inputModel.relativeMouseMode.value) { - await inputModel.sendMobileRelativeMouseMove(d.delta.dx, d.delta.dy); - } else { - await ffi.cursorModel.updatePan(d.delta, d.localPosition, handleTouch); - } + await ffi.cursorModel.updatePan(d.delta, d.localPosition, handleTouch); } onOneFingerPanEnd(DragEndDetails d) async { @@ -430,47 +367,22 @@ class _RawTouchGestureDetectorRegionState ffi.cursorModel.clearRemoteWindowCoords(); } if (handleTouch) { - // In relative mouse mode, skip mouse up - matches the skipped mouse down in onOneFingerPanStart - if (!inputModel.relativeMouseMode.value) { - await inputModel.sendMouse('up', MouseButtons.left); - } + await inputModel.sendMouse('up', MouseButtons.left); } } - // Reset `_touchModePanStarted` if the one-finger pan gesture is cancelled - // or rejected by the gesture arena. Without this, the flag can remain - // stuck in the "started" state and cause issues such as the Magic Mouse - // double-click problem on iPad with magic mouse. - onOneFingerPanCancel() { - _touchModePanStarted = false; - } - // scale + pan event onTwoFingerScaleStart(ScaleStartDetails d) { _lastTapDownDetails = null; if (isNotTouchBasedDevice()) { return; } - if (isSpecialHoldDragActive) { - // Initialize the last focal point to calculate deltas manually. - _lastSpecialHoldDragFocalPoint = d.focalPoint; - } } onTwoFingerScaleUpdate(ScaleUpdateDetails d) async { if (isNotTouchBasedDevice()) { return; } - - // If in special drag mode, perform a pan instead of a scale. - if (isSpecialHoldDragActive) { - // Calculate delta manually to avoid the jumpy behavior. - final delta = d.focalPoint - _lastSpecialHoldDragFocalPoint; - _lastSpecialHoldDragFocalPoint = d.focalPoint; - await ffi.cursorModel.updatePan(delta * 2.0, d.focalPoint, handleTouch); - return; - } - if ((isDesktop || isWebDesktop)) { final scale = ((d.scale - _scale) * 1000).toInt(); _scale = d.scale; @@ -508,9 +420,7 @@ class _RawTouchGestureDetectorRegionState // No idea why we need to set the view style to "" here. // bind.sessionSetViewStyle(sessionId: sessionId, value: ""); } - if (!isSpecialHoldDragActive) { - await inputModel.sendMouse('up', MouseButtons.left); - } + await inputModel.sendMouse('up', MouseButtons.left); } get onHoldDragCancel => null; @@ -532,9 +442,7 @@ class _RawTouchGestureDetectorRegionState // Official TapGestureRecognizer: GestureRecognizerFactoryWithHandlers( - () => TapGestureRecognizer( - supportedDevices: kTouchBasedDeviceKinds, - ), (instance) { + () => TapGestureRecognizer(), (instance) { instance ..onTapDown = onTapDown ..onTapUp = onTapUp @@ -542,18 +450,14 @@ class _RawTouchGestureDetectorRegionState }), DoubleTapGestureRecognizer: GestureRecognizerFactoryWithHandlers( - () => DoubleTapGestureRecognizer( - supportedDevices: kTouchBasedDeviceKinds, - ), (instance) { + () => DoubleTapGestureRecognizer(), (instance) { instance ..onDoubleTapDown = onDoubleTapDown ..onDoubleTap = onDoubleTap; }), LongPressGestureRecognizer: GestureRecognizerFactoryWithHandlers( - () => LongPressGestureRecognizer( - supportedDevices: kTouchBasedDeviceKinds, - ), (instance) { + () => LongPressGestureRecognizer(), (instance) { instance ..onLongPressDown = onLongPressDown ..onLongPressUp = onLongPressUp @@ -563,9 +467,7 @@ class _RawTouchGestureDetectorRegionState // Customized HoldTapMoveGestureRecognizer: GestureRecognizerFactoryWithHandlers( - () => HoldTapMoveGestureRecognizer( - supportedDevices: kTouchBasedDeviceKinds, - ), + () => HoldTapMoveGestureRecognizer(), (instance) => instance ..onHoldDragStart = onHoldDragStart ..onHoldDragUpdate = onHoldDragUpdate @@ -573,24 +475,19 @@ class _RawTouchGestureDetectorRegionState ..onHoldDragEnd = onHoldDragEnd), DoubleFinerTapGestureRecognizer: GestureRecognizerFactoryWithHandlers( - () => DoubleFinerTapGestureRecognizer( - supportedDevices: kTouchBasedDeviceKinds, - ), (instance) { + () => DoubleFinerTapGestureRecognizer(), (instance) { instance ..onDoubleFinerTap = onDoubleFinerTap ..onDoubleFinerTapDown = onDoubleFinerTapDown; }), CustomTouchGestureRecognizer: GestureRecognizerFactoryWithHandlers( - () => CustomTouchGestureRecognizer( - supportedDevices: kTouchBasedDeviceKinds, - ), (instance) { + () => CustomTouchGestureRecognizer(), (instance) { instance.onOneFingerPanStart = (DragStartDetails d) => onOneFingerPanStart(context, d); instance ..onOneFingerPanUpdate = onOneFingerPanUpdate ..onOneFingerPanEnd = onOneFingerPanEnd - ..onOneFingerPanCancel = onOneFingerPanCancel ..onTwoFingerScaleStart = onTwoFingerScaleStart ..onTwoFingerScaleUpdate = onTwoFingerScaleUpdate ..onTwoFingerScaleEnd = onTwoFingerScaleEnd diff --git a/flutter/lib/common/widgets/setting_widgets.dart b/flutter/lib/common/widgets/setting_widgets.dart index f3be77003..b57657274 100644 --- a/flutter/lib/common/widgets/setting_widgets.dart +++ b/flutter/lib/common/widgets/setting_widgets.dart @@ -230,6 +230,7 @@ List<(String, String)> otherDefaultSettings() { ('Disable clipboard', kOptionDisableClipboard), ('Lock after session end', kOptionLockAfterSessionEnd), ('Privacy mode', kOptionPrivacyMode), + if (isMobile) ('Touch mode', kOptionTouchMode), ('True color (4:4:4)', kOptionI444), ('Reverse mouse wheel', kKeyReverseMouseWheel), ('swap-left-right-mouse', kOptionSwapLeftRightMouse), diff --git a/flutter/lib/common/widgets/toolbar.dart b/flutter/lib/common/widgets/toolbar.dart index 537014246..ee05e52a3 100644 --- a/flutter/lib/common/widgets/toolbar.dart +++ b/flutter/lib/common/widgets/toolbar.dart @@ -6,22 +6,14 @@ import 'package:flutter/services.dart'; import 'package:flutter_hbb/common.dart'; import 'package:flutter_hbb/common/shared_state.dart'; import 'package:flutter_hbb/common/widgets/dialog.dart'; -import 'package:flutter_hbb/common/widgets/login.dart'; import 'package:flutter_hbb/consts.dart'; import 'package:flutter_hbb/desktop/widgets/remote_toolbar.dart'; import 'package:flutter_hbb/models/model.dart'; import 'package:flutter_hbb/models/platform_model.dart'; -import 'package:flutter_hbb/utils/multi_window_manager.dart'; import 'package:get/get.dart'; bool isEditOsPassword = false; -// macOS privacy mode blacks out all online displays, so switching the remote -// display does not weaken the local privacy protection. -bool allowDisplaySwitchInPrivacyMode(PeerInfo pi) { - return pi.platform == kPeerPlatformMacOS; -} - class TTextMenu { final Widget child; final VoidCallback? onPressed; @@ -191,7 +183,7 @@ List toolbarControls(BuildContext context, String id, FFI ffi) { ); v.add( TTextMenu( - child: Text('${translate('Terminal')} (beta)'), + child: Text(translate('Terminal')), onPressed: () => connectWithToken(isTerminal: true)), ); v.add( @@ -201,26 +193,14 @@ List toolbarControls(BuildContext context, String id, FFI ffi) { ); } // note - if (isDefaultConn && !bind.isDisableAccount()) { + if (isDefaultConn && + bind + .sessionGetAuditServerSync(sessionId: sessionId, typ: "conn") + .isNotEmpty) { v.add( TTextMenu( child: Text(translate('Note')), - onPressed: () async { - bool isLogin = - bind.mainGetLocalOption(key: 'access_token').isNotEmpty; - if (!isLogin) { - final res = await loginDialog(); - if (res != true) return; - // Desktop: send message to main window to refresh login status - // Web: login is required before connection, so no need to refresh - // Mobile: same isolate, no need to send message - if (isDesktop) { - rustDeskWinManager.call( - WindowType.Main, kWindowRefreshCurrentUser, ""); - } - } - showAuditDialog(ffi); - }), + onPressed: () => showAuditDialog(ffi)), ); } // divider @@ -281,6 +261,7 @@ List toolbarControls(BuildContext context, String id, FFI ffi) { isDesktop && ffiModel.keyboard && pi.platform != kPeerPlatformAndroid && + pi.platform != kPeerPlatformMacOS && versionCmp(pi.version, '1.2.0') >= 0 && bind.peerGetSessionsCount(id: id, connType: ffi.connType.index) == 1) { v.add(TTextMenu( @@ -382,11 +363,6 @@ Future>> toolbarViewStyle( child: Text(translate('Scale adaptive')), value: kRemoteViewStyleAdaptive, groupValue: groupValue, - onChanged: onChanged), - TRadioMenu( - child: Text(translate('Scale custom')), - value: kRemoteViewStyleCustom, - groupValue: groupValue, onChanged: onChanged) ]; } @@ -690,9 +666,8 @@ Future> toolbarDisplayToggle( child: Text(translate('Lock after session end')))); } - final privacyModeState = PrivacyModeState.find(id); if (pi.isSupportMultiDisplay && - (privacyModeState.isEmpty || allowDisplaySwitchInPrivacyMode(pi)) && + PrivacyModeState.find(id).isEmpty && pi.displaysCount.value > 1 && bind.mainGetUserDefaultOption(key: kKeyShowMonitorsToolbar) == 'Y') { final value = @@ -766,25 +741,15 @@ List toolbarPrivacyMode( final ffiModel = ffi.ffiModel; final pi = ffiModel.pi; final sessionId = ffi.sessionId; - final hasPrivacyModePermission = ffiModel.permissions['privacy_mode'] != false; - - // Backend revocation already attempts to turn privacy mode off. - // Still keep this menu when privacy mode is active, so users can turn it off - // if there is a sync delay, version mismatch, or off attempt failure. - if (!hasPrivacyModePermission && privacyModeState.isEmpty) { - return []; // No permission and not active, hide options. - } getDefaultMenu(Future Function(SessionID sid, String opt) toggleFunc) { - final enabled = - !ffiModel.viewOnly && (hasPrivacyModePermission || privacyModeState.isNotEmpty); + final enabled = !ffi.ffiModel.viewOnly; return TToggleMenu( value: privacyModeState.isNotEmpty, onChanged: enabled ? (value) { if (value == null) return; - if (!allowDisplaySwitchInPrivacyMode(pi) && - ffiModel.pi.currentDisplay != 0 && + if (ffiModel.pi.currentDisplay != 0 && ffiModel.pi.currentDisplay != kAllDisplayValue) { msgBox( sessionId, @@ -827,29 +792,18 @@ List toolbarPrivacyMode( }) ]; } else { - final visibleImpls = hasPrivacyModePermission - ? privacyModeImpls - : privacyModeImpls.where((e) { - final implKey = (e as List)[0] as String; - return privacyModeState.value == implKey; - }).toList(); - return visibleImpls.map((e) { + return privacyModeImpls.map((e) { final implKey = (e as List)[0] as String; final implName = (e)[1] as String; - final enabled = !ffiModel.viewOnly && - (hasPrivacyModePermission || privacyModeState.value == implKey); return TToggleMenu( child: Text(translate(implName)), value: privacyModeState.value == implKey, - onChanged: enabled - ? (value) { - if (value == null) return; - if (value && !hasPrivacyModePermission) return; - togglePrivacyModeTime = DateTime.now(); - bind.sessionTogglePrivacyMode( - sessionId: sessionId, implKey: implKey, on: value); - } - : null); + onChanged: (value) { + if (value == null) return; + togglePrivacyModeTime = DateTime.now(); + bind.sessionTogglePrivacyMode( + sessionId: sessionId, implKey: implKey, on: value); + }); }).toList(); } } @@ -858,7 +812,6 @@ List toolbarKeyboardToggles(FFI ffi) { final ffiModel = ffi.ffiModel; final pi = ffiModel.pi; final sessionId = ffi.sessionId; - final isDefaultConn = ffi.connType == ConnType.defaultConn; List v = []; // swap key @@ -880,34 +833,6 @@ List toolbarKeyboardToggles(FFI ffi) { child: Text(translate('Swap control-command key')))); } - // Relative mouse mode (gaming mode). - // Only show when server supports MOUSE_TYPE_MOVE_RELATIVE (version >= 1.4.5) - // Note: This feature is only available in Flutter client. Sciter client does not support this. - // Web client is not supported yet due to Pointer Lock API integration complexity with Flutter's input system. - // Wayland is not supported due to cursor warping limitations. - // Mobile: This option is now in GestureHelp widget, shown only when joystick is visible. - final isWayland = isDesktop && isLinux && bind.mainCurrentIsWayland(); - if (isDesktop && - isDefaultConn && - !isWeb && - !isWayland && - ffiModel.keyboard && - !ffiModel.viewOnly && - ffi.inputModel.isRelativeMouseModeSupported) { - v.add(TToggleMenu( - value: ffi.inputModel.relativeMouseMode.value, - onChanged: (value) { - if (value == null) return; - final previousValue = ffi.inputModel.relativeMouseMode.value; - final success = ffi.inputModel.setRelativeMouseMode(value); - if (!success) { - // Revert the observable toggle to reflect the actual state - ffi.inputModel.relativeMouseMode.value = previousValue; - } - }, - child: Text(translate('Relative mouse mode')))); - } - // reverse mouse wheel if (ffiModel.keyboard) { var optionValue = diff --git a/flutter/lib/consts.dart b/flutter/lib/consts.dart index adf7b1d45..ef42318f0 100644 --- a/flutter/lib/consts.dart +++ b/flutter/lib/consts.dart @@ -50,7 +50,6 @@ const String kAppTypeDesktopPortForward = "port forward"; const String kAppTypeDesktopTerminal = "terminal"; const String kWindowMainWindowOnTop = "main_window_on_top"; -const String kWindowRefreshCurrentUser = "refresh_current_user"; const String kWindowGetWindowInfo = "get_window_info"; const String kWindowGetScreenList = "get_screen_list"; // This method is not used, maybe it can be removed. @@ -59,14 +58,12 @@ const String kWindowActionRebuild = "rebuild"; const String kWindowEventHide = "hide"; const String kWindowEventShow = "show"; const String kWindowConnect = "connect"; -const String kWindowBumpMouse = "bump_mouse"; const String kWindowEventNewRemoteDesktop = "new_remote_desktop"; const String kWindowEventNewFileTransfer = "new_file_transfer"; const String kWindowEventNewViewCamera = "new_view_camera"; const String kWindowEventNewPortForward = "new_port_forward"; const String kWindowEventNewTerminal = "new_terminal"; -const String kWindowEventRestoreTerminalSessions = "restore_terminal_sessions"; const String kWindowEventActiveSession = "active_session"; const String kWindowEventActiveDisplaySession = "active_display_session"; const String kWindowEventGetRemoteList = "get_remote_list"; @@ -80,7 +77,6 @@ const String kWindowEventOpenMonitorSession = "open_monitor_session"; const String kOptionViewStyle = "view_style"; const String kOptionScrollStyle = "scroll_style"; -const String kOptionEdgeScrollEdgeThickness = "edge-scroll-edge-thickness"; const String kOptionImageQuality = "image_quality"; const String kOptionOpenNewConnInTabs = "enable-open-new-connections-in-tabs"; const String kOptionTextureRender = "use-texture-render"; @@ -114,9 +110,6 @@ const String kOptionTerminalPersistent = "terminal-persistent"; const String kOptionEnableTunnel = "enable-tunnel"; const String kOptionEnableRemoteRestart = "enable-remote-restart"; const String kOptionEnableBlockInput = "enable-block-input"; -const String kOptionEnablePrivacyMode = "enable-privacy-mode"; -const String kOptionEnablePermChangeInAcceptWindow = - "enable-perm-change-in-accept-window"; const String kOptionAllowRemoteConfigModification = "allow-remote-config-modification"; const String kOptionVerificationMethod = "verification-method"; @@ -124,7 +117,6 @@ const String kOptionApproveMode = "approve-mode"; const String kOptionAllowNumericOneTimePassword = "allow-numeric-one-time-password"; const String kOptionCollapseToolbar = "collapse_toolbar"; -const String kOptionHideToolbar = "hide-toolbar"; const String kOptionShowRemoteCursor = "show_remote_cursor"; const String kOptionFollowRemoteCursor = "follow_remote_cursor"; const String kOptionFollowRemoteWindow = "follow_remote_window"; @@ -142,10 +134,6 @@ const String kOptionSwapLeftRightMouse = "swap-left-right-mouse"; const String kOptionCodecPreference = "codec-preference"; const String kOptionRemoteMenubarDragLeft = "remote-menubar-drag-left"; const String kOptionRemoteMenubarDragRight = "remote-menubar-drag-right"; -const String kOptionRemoteMenubarEdge = "remote-menubar-edge"; -const String kOptionRemoteMenubarFraction = "remote-menubar-frac"; -const String kOptionAllowMultiEdgeToolbarDock = - "allow-multi-edge-toolbar-dock"; const String kOptionHideAbTagsPanel = "hideAbTagsPanel"; const String kOptionRemoteMenubarState = "remoteMenubarState"; const String kOptionPeerSorting = "peer-sorting"; @@ -166,48 +154,28 @@ const String kOptionAllowRemoteCmModification = "allow-remote-cm-modification"; const String kOptionEnableUdpPunch = "enable-udp-punch"; const String kOptionEnableIpv6Punch = "enable-ipv6-punch"; const String kOptionEnableTrustedDevices = "enable-trusted-devices"; -const String kOptionShowVirtualMouse = "show-virtual-mouse"; -const String kOptionVirtualMouseScale = "virtual-mouse-scale"; -const String kOptionShowVirtualJoystick = "show-virtual-joystick"; -const String kOptionAllowAskForNoteAtEndOfConnection = "allow-ask-for-note"; -const String kOptionEnableShowTerminalExtraKeys = "enable-show-terminal-extra-keys"; // network options const String kOptionAllowWebSocket = "allow-websocket"; -const String kOptionAllowInsecureTLSFallback = "allow-insecure-tls-fallback"; -const String kOptionDisableUdp = "disable-udp"; -const String kOptionEnableFlutterHttpOnRust = "enable-flutter-http-on-rust"; -// builtin options +// buildin opitons const String kOptionHideServerSetting = "hide-server-settings"; const String kOptionHideProxySetting = "hide-proxy-settings"; const String kOptionHideWebSocketSetting = "hide-websocket-settings"; -const String kOptionHideStopService = "hide-stop-service"; const String kOptionHideRemotePrinterSetting = "hide-remote-printer-settings"; const String kOptionHideSecuritySetting = "hide-security-settings"; const String kOptionHideNetworkSetting = "hide-network-settings"; const String kOptionRemovePresetPasswordWarning = "remove-preset-password-warning"; -const String kOptionDisableChangePermanentPassword = - "disable-change-permanent-password"; -const String kOptionDisableChangeId = "disable-change-id"; -const String kOptionDisableUnlockPin = "disable-unlock-pin"; const kHideUsernameOnCard = "hide-username-on-card"; const String kOptionHideHelpCards = "hide-help-cards"; -const String kOptionAllowDeepLinkPassword = "allow-deep-link-password"; -const String kOptionAllowDeepLinkServerSettings = - "allow-deep-link-server-settings"; const String kOptionToggleViewOnly = "view-only"; -const String kOptionToggleShowMyCursor = "show-my-cursor"; const String kOptionDisableFloatingWindow = "disable-floating-window"; const String kOptionKeepScreenOn = "keep-screen-on"; -const String kOptionKeepAwakeDuringIncomingSessions = "keep-awake-during-incoming-sessions"; -const String kOptionKeepAwakeDuringOutgoingSessions = "keep-awake-during-outgoing-sessions"; - const String kOptionShowMobileAction = "showMobileActions"; const String kUrlActionClose = "close"; @@ -272,33 +240,6 @@ const int kMinTrackpadSpeed = 10; const int kDefaultTrackpadSpeed = 100; const int kMaxTrackpadSpeed = 1000; -// relative mouse mode -/// Throttle duration (in milliseconds) for updating pointer lock center during -/// window move/resize events. Lower values provide more responsive updates but -/// may cause performance issues during rapid window operations. -const int kDefaultPointerLockCenterThrottleMs = 100; - -/// Minimum server version required for relative mouse mode (MOUSE_TYPE_MOVE_RELATIVE). -/// Servers older than this version will ignore relative mouse events. -/// -/// IMPORTANT: This value must be kept in sync with the Rust constant -/// `MIN_VERSION_RELATIVE_MOUSE_MODE` in `src/common.rs`. -const String kMinVersionForRelativeMouseMode = '1.4.5'; - -/// Maximum delta value for relative mouse movement. -/// Large values could cause issues with i32 overflow on server side, -/// and no reasonable mouse movement should exceed this bound. -/// -/// IMPORTANT: This value must be kept in sync with the Rust constant -/// `MAX_RELATIVE_MOUSE_DELTA` in `src/server/input_service.rs`. -const int kMaxRelativeMouseDelta = 10000; - -/// Debounce duration (in milliseconds) for relative mouse mode toggle. -/// This prevents double-toggle from race condition between Rust rdev grab loop -/// and Flutter keyboard handling. Value should be small enough to allow -/// intentional quick toggles but large enough to prevent accidental double-triggers. -const int kRelativeMouseModeToggleDebounceMs = 150; - // incomming (should be incoming) is kept, because change it will break the previous setting. const String kKeyPrinterIncomingJobAction = 'printer-incomming-job-action'; const String kValuePrinterIncomingJobDismiss = 'dismiss'; @@ -370,18 +311,12 @@ const kRemoteViewStyleOriginal = 'original'; /// [kRemoteViewStyleAdaptive] Show remote image scaling by ratio factor. const kRemoteViewStyleAdaptive = 'adaptive'; -/// [kRemoteViewStyleCustom] Show remote image at a user-defined scale percent. -const kRemoteViewStyleCustom = 'custom'; - /// [kRemoteScrollStyleAuto] Scroll image auto by position. const kRemoteScrollStyleAuto = 'scrollauto'; /// [kRemoteScrollStyleBar] Scroll image with scroll bar. const kRemoteScrollStyleBar = 'scrollbar'; -/// [kRemoteScrollStyleEdge] Scroll image auto at edges. -const kRemoteScrollStyleEdge = 'scrolledge'; - /// [kScrollModeDefault] Mouse or touchpad, the default scroll mode. const kScrollModeDefault = 'default'; @@ -408,17 +343,6 @@ const Set kTouchBasedDeviceKinds = { PointerDeviceKind.invertedStylus, }; -// Scale custom related constants -const String kCustomScalePercentKey = - 'custom_scale_percent'; // Flutter option key for storing custom scale percent (integer 5-1000) -const int kScaleCustomMinPercent = 5; -const int kScaleCustomPivotPercent = 100; // 100% should be at 1/3 of track -const int kScaleCustomMaxPercent = 1000; -const double kScaleCustomPivotPos = 1.0 / 3.0; // first 1/3 → up to 100% -const double kScaleCustomDetentEpsilon = - 0.006; // snap range around pivot (~0.6%) -const Duration kDebounceCustomScaleDuration = Duration(milliseconds: 300); - // ================================ mobile ================================ // Magic numbers, maybe need to avoid it or use a better way to get them. diff --git a/flutter/lib/desktop/pages/connection_page.dart b/flutter/lib/desktop/pages/connection_page.dart index bdf3829e1..41553b8db 100644 --- a/flutter/lib/desktop/pages/connection_page.dart +++ b/flutter/lib/desktop/pages/connection_page.dart @@ -374,7 +374,6 @@ class _ConnectionPageState extends State rdpUsername: '', loginName: '', device_group_name: '', - note: '', ); _autocompleteOpts = [emptyPeer]; } else { @@ -537,68 +536,64 @@ class _ConnectionPageState extends State builder: (context, setState) { var offset = Offset(0, 0); return Obx(() => InkWell( - child: _menuOpen.value - ? Transform.rotate( - angle: pi, - child: Icon(IconFont.more, size: 14), - ) - : Icon(IconFont.more, size: 14), - onTapDown: (e) { - offset = e.globalPosition; - }, - onTap: () async { - _menuOpen.value = true; - final x = offset.dx; - final y = offset.dy; - await mod_menu - .showMenu( - context: context, - position: RelativeRect.fromLTRB(x, y, x, y), - items: [ - ( - 'Transfer file', - () => onConnect(isFileTransfer: true) - ), - ( - 'View camera', - () => onConnect(isViewCamera: true) - ), - ( - '${translate('Terminal')} (beta)', - () => onConnect(isTerminal: true) - ), - ] - .map((e) => MenuEntryButton( - childBuilder: (TextStyle? style) => - Text( - translate(e.$1), - style: style, - ), - proc: () => e.$2(), - padding: EdgeInsets.symmetric( - horizontal: - kDesktopMenuPadding.left), - dismissOnClicked: true, - )) - .map((e) => e.build( - context, - const MenuConfig( - commonColor: CustomPopupMenuTheme - .commonColor, - height: - CustomPopupMenuTheme.height, - dividerHeight: - CustomPopupMenuTheme - .dividerHeight))) - .expand((i) => i) - .toList(), - elevation: 8, + child: _menuOpen.value + ? Transform.rotate( + angle: pi, + child: Icon(IconFont.more, size: 14), ) - .then((_) { - _menuOpen.value = false; - }); - }, - )); + : Icon(IconFont.more, size: 14), + onTapDown: (e) { + offset = e.globalPosition; + }, + onTap: () async { + _menuOpen.value = true; + final x = offset.dx; + final y = offset.dy; + await mod_menu + .showMenu( + context: context, + position: RelativeRect.fromLTRB(x, y, x, y), + items: [ + ( + 'Transfer file', + () => onConnect(isFileTransfer: true) + ), + ( + 'View camera', + () => onConnect(isViewCamera: true) + ), + ( + 'Terminal', + () => onConnect(isTerminal: true) + ), + ] + .map((e) => MenuEntryButton( + childBuilder: (TextStyle? style) => Text( + translate(e.$1), + style: style, + ), + proc: () => e.$2(), + padding: EdgeInsets.symmetric( + horizontal: kDesktopMenuPadding.left), + dismissOnClicked: true, + )) + .map((e) => e.build( + context, + const MenuConfig( + commonColor: + CustomPopupMenuTheme.commonColor, + height: CustomPopupMenuTheme.height, + dividerHeight: CustomPopupMenuTheme + .dividerHeight))) + .expand((i) => i) + .toList(), + elevation: 8, + ) + .then((_) { + _menuOpen.value = false; + }); + }, + )); }, ), ), diff --git a/flutter/lib/desktop/pages/desktop_home_page.dart b/flutter/lib/desktop/pages/desktop_home_page.dart index 42ec10032..0f302d8e1 100644 --- a/flutter/lib/desktop/pages/desktop_home_page.dart +++ b/flutter/lib/desktop/pages/desktop_home_page.dart @@ -18,7 +18,6 @@ import 'package:flutter_hbb/models/server_model.dart'; import 'package:flutter_hbb/models/state_model.dart'; import 'package:flutter_hbb/plugin/ui_manager.dart'; import 'package:flutter_hbb/utils/multi_window_manager.dart'; -import 'package:flutter_hbb/utils/platform_channel.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -435,7 +434,7 @@ class _DesktopHomePageState extends State !isCardClosed && bind.mainUriPrefixSync().contains('rustdesk')) { final isToUpdate = (isWindows || isMacOS) && bind.mainIsInstalled(); - String btnText = isToUpdate ? 'Update' : 'Download'; + String btnText = isToUpdate ? 'Click to update' : 'Click to download'; GestureTapCallback onPressed = () async { final Uri url = Uri.parse('https://rustdesk.com/download'); await launchUrl(url); @@ -450,11 +449,7 @@ class _DesktopHomePageState extends State "${translate("new-version-of-{${bind.mainGetAppNameSync()}}-tip")} (${bind.mainGetNewVersion()}).", btnText, onPressed, - closeButton: true, - help: isToUpdate ? 'Changelog' : null, - link: isToUpdate - ? 'https://github.com/rustdesk/rustdesk/releases/tag/${bind.mainGetNewVersion()}' - : null); + closeButton: true); } if (systemError.isNotEmpty) { return buildInstallCard("", systemError, "", () {}); @@ -765,23 +760,11 @@ class _DesktopHomePageState extends State 'scaleFactor': screen.scaleFactor, }; - bool isChattyMethod(String methodName) { - switch (methodName) { - case kWindowBumpMouse: return true; - } - - return false; - } - rustDeskWinManager.setMethodHandler((call, fromWindowId) async { - if (!isChattyMethod(call.method)) { - debugPrint( + debugPrint( "[Main] call ${call.method} with args ${call.arguments} from window $fromWindowId"); - } if (call.method == kWindowMainWindowOnTop) { windowOnTop(null); - } else if (call.method == kWindowRefreshCurrentUser) { - gFFI.userModel.refreshCurrentUser(); } else if (call.method == kWindowGetWindowInfo) { final screen = (await window_size.getWindowInfo()).screen; if (screen == null) { @@ -810,10 +793,6 @@ class _DesktopHomePageState extends State forceRelay: call.arguments['forceRelay'], connToken: call.arguments['connToken'], ); - } else if (call.method == kWindowBumpMouse) { - return RdPlatformChannel.instance.bumpMouse( - dx: call.arguments['dx'], - dy: call.arguments['dy']); } else if (call.method == kWindowEventMoveTabToNewWindow) { final args = call.arguments.split(','); int? windowId; @@ -908,17 +887,12 @@ class _DesktopHomePageState extends State } void setPasswordDialog({VoidCallback? notEmptyCallback}) async { - final p0 = TextEditingController(text: ""); - final p1 = TextEditingController(text: ""); + final pw = await bind.mainGetPermanentPassword(); + final p0 = TextEditingController(text: pw); + final p1 = TextEditingController(text: pw); var errMsg0 = ""; var errMsg1 = ""; - final localPasswordSet = - (await bind.mainGetCommon(key: "local-permanent-password-set")) == "true"; - final permanentPasswordSet = - (await bind.mainGetCommon(key: "permanent-password-set")) == "true"; - final presetPassword = permanentPasswordSet && !localPasswordSet; - var canSubmit = false; - final RxString rxPass = "".obs; + final RxString rxPass = pw.trim().obs; final rules = [ DigitValidationRule(), UppercaseValidationRule(), @@ -927,21 +901,9 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async { MinCharactersValidationRule(8), ]; final maxLength = bind.mainMaxEncryptLen(); - final statusTip = localPasswordSet - ? translate('password-hidden-tip') - : (presetPassword ? translate('preset-password-in-use-tip') : ''); - final showStatusTipOnMobile = - statusTip.isNotEmpty && !isDesktop && !isWebDesktop; gFFI.dialogManager.show((setState, close, context) { - updateCanSubmit() { - canSubmit = p0.text.trim().isNotEmpty || p1.text.trim().isNotEmpty; - } - - submit() async { - if (!canSubmit) { - return; - } + submit() { setState(() { errMsg0 = ""; errMsg1 = ""; @@ -964,13 +926,7 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async { }); return; } - final ok = await bind.mainSetPermanentPasswordWithResult(password: pass); - if (!ok) { - setState(() { - errMsg0 = '${translate('Prompt')}: ${translate("Failed")}'; - }); - return; - } + bind.mainSetPermanentPassword(password: pass); if (pass.isNotEmpty) { notEmptyCallback?.call(); } @@ -978,20 +934,14 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async { } return CustomAlertDialog( - title: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon(Icons.key, color: MyTheme.accent), - Text(translate("Set Password")).paddingOnly(left: 10), - ], - ), + title: Text(translate("Set Password")), content: ConstrainedBox( constraints: const BoxConstraints(minWidth: 500), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - SizedBox( - height: showStatusTipOnMobile ? 0.0 : 6.0, + const SizedBox( + height: 8.0, ), Row( children: [ @@ -1007,7 +957,6 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async { rxPass.value = value.trim(); setState(() { errMsg0 = ''; - updateCanSubmit(); }); }, maxLength: maxLength, @@ -1019,9 +968,9 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async { children: [ Expanded(child: PasswordStrengthIndicator(password: rxPass)), ], - ).marginOnly(top: 2, bottom: showStatusTipOnMobile ? 2 : 8), - SizedBox( - height: showStatusTipOnMobile ? 0.0 : 8.0, + ).marginSymmetric(vertical: 8), + const SizedBox( + height: 8.0, ), Row( children: [ @@ -1035,7 +984,6 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async { onChanged: (value) { setState(() { errMsg1 = ''; - updateCanSubmit(); }); }, maxLength: maxLength, @@ -1043,23 +991,11 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async { ), ], ), - if (statusTip.isNotEmpty) - Row( - children: [ - Icon(Icons.info, color: Colors.amber, size: 18) - .marginOnly(right: 6), - Expanded( - child: Text( - statusTip, - style: const TextStyle(fontSize: 13, height: 1.1), - )) - ], - ).marginOnly(top: 6, bottom: 2), - SizedBox( - height: showStatusTipOnMobile ? 0.0 : 8.0, + const SizedBox( + height: 8.0, ), Obx(() => Wrap( - runSpacing: showStatusTipOnMobile ? 2.0 : 8.0, + runSpacing: 8, spacing: 4, children: rules.map((e) { var checked = e.validate(rxPass.value.trim()); @@ -1079,67 +1015,11 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async { ], ), ), - actions: (() { - final cancelButton = dialogButton( - "Cancel", - icon: Icon(Icons.close_rounded), - onPressed: close, - isOutline: true, - ); - final removeButton = dialogButton( - "Remove", - icon: Icon(Icons.delete_outline_rounded), - onPressed: () async { - setState(() { - errMsg0 = ""; - errMsg1 = ""; - }); - final ok = - await bind.mainSetPermanentPasswordWithResult(password: ""); - if (!ok) { - setState(() { - errMsg0 = '${translate('Prompt')}: ${translate("Failed")}'; - }); - return; - } - close(); - }, - buttonStyle: ButtonStyle( - backgroundColor: MaterialStatePropertyAll(Colors.red)), - ); - final okButton = dialogButton( - "OK", - icon: Icon(Icons.done_rounded), - onPressed: canSubmit ? submit : null, - ); - if (!isDesktop && !isWebDesktop && localPasswordSet) { - return [ - Align( - alignment: Alignment.centerRight, - child: FittedBox( - fit: BoxFit.scaleDown, - alignment: Alignment.centerRight, - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - cancelButton, - const SizedBox(width: 4), - removeButton, - const SizedBox(width: 4), - okButton, - ], - ), - ), - ), - ]; - } - return [ - cancelButton, - if (localPasswordSet) removeButton, - okButton, - ]; - })(), - onSubmit: canSubmit ? submit : null, + actions: [ + dialogButton("Cancel", onPressed: close, isOutline: true), + dialogButton("OK", onPressed: submit), + ], + onSubmit: submit, onCancel: close, ); }); diff --git a/flutter/lib/desktop/pages/desktop_setting_page.dart b/flutter/lib/desktop/pages/desktop_setting_page.dart index d1d620014..9d182f9f8 100644 --- a/flutter/lib/desktop/pages/desktop_setting_page.dart +++ b/flutter/lib/desktop/pages/desktop_setting_page.dart @@ -11,7 +11,6 @@ import 'package:flutter_hbb/common/widgets/setting_widgets.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/remote_toolbar.dart'; import 'package:flutter_hbb/mobile/widgets/dialog.dart'; import 'package:flutter_hbb/models/platform_model.dart'; import 'package:flutter_hbb/models/printer_model.dart'; @@ -458,46 +457,28 @@ class _GeneralState extends State<_General> { return const Offstage(); } - final hideStopService = - bind.mainGetBuildinOption(key: kOptionHideStopService) == 'Y'; - - return Obx(() { - if (hideStopService && !serviceStop.value) { - return const Offstage(); - } - - return _Card(title: 'Service', children: [ - _Button(serviceStop.value ? 'Start' : 'Stop', () { - () async { - serviceBtnEnabled.value = false; - await start_service(serviceStop.value); - // enable the button after 1 second - Future.delayed(const Duration(seconds: 1), () { - serviceBtnEnabled.value = true; - }); - }(); - }, enabled: serviceBtnEnabled.value) - ]); - }); + return _Card(title: 'Service', children: [ + Obx(() => _Button(serviceStop.value ? 'Start' : 'Stop', () { + () async { + serviceBtnEnabled.value = false; + await start_service(serviceStop.value); + // enable the button after 1 second + Future.delayed(const Duration(seconds: 1), () { + serviceBtnEnabled.value = true; + }); + }(); + }, enabled: serviceBtnEnabled.value)) + ]); } Widget other() { - final showAutoUpdate = isWindows && bind.mainIsInstalled(); + final showAutoUpdate = + isWindows && bind.mainIsInstalled() && !bind.isCustomClient(); final children = [ if (!isWeb && !bind.isIncomingOnly()) _OptionCheckBox(context, 'Confirm before closing multiple tabs', kOptionEnableConfirmClosingTabs, isServer: false), - if (!bind.isIncomingOnly()) - _OptionCheckBox( - context, - 'allow-remote-toolbar-docking-any-edge', - kOptionAllowMultiEdgeToolbarDock, - isServer: false, - update: (_) { - reloadAllWindows(); - }, - ), _OptionCheckBox(context, 'Adaptive bitrate', kOptionEnableAbr), if (!isWeb) wallpaper(), if (!isWeb && !bind.isIncomingOnly()) ...[ @@ -575,36 +556,10 @@ class _GeneralState extends State<_General> { ], ], ]; - - // Add client-side wakelock option for desktop platforms - if (!bind.isIncomingOnly()) { - children.add(_OptionCheckBox( - context, - 'keep-awake-during-outgoing-sessions-label', - kOptionKeepAwakeDuringOutgoingSessions, - isServer: false, - )); - } - if (!isWeb && bind.mainShowOption(key: kOptionAllowLinuxHeadless)) { children.add(_OptionCheckBox( context, 'Allow linux headless', kOptionAllowLinuxHeadless)); } - if (!bind.isDisableAccount()) { - children.add(_OptionCheckBox( - context, - 'note-at-conn-end-tip', - kOptionAllowAskForNoteAtEndOfConnection, - isServer: false, - optSetter: (key, value) async { - if (value && !gFFI.userModel.isLogin) { - final res = await loginDialog(); - if (res != true) return; - } - await mainSetLocalBoolOption(key, value); - }, - )); - } return _Card(title: 'Other', children: children); } @@ -854,8 +809,7 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin { permissions(context), password(context), _Card(title: '2FA', children: [tfa()]), - if (!isChangeIdDisabled()) - _Card(title: 'ID', children: [changeId()]), + _Card(title: 'ID', children: [changeId()]), more(context), ]), ), @@ -1072,10 +1026,6 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin { _OptionCheckBox(context, 'Enable blocking user input', kOptionEnableBlockInput, enabled: enabled, fakeValue: fakeValue), - if (bind.mainSupportedPrivacyModeImpls() != '[]') - _OptionCheckBox( - context, 'Enable privacy mode', kOptionEnablePrivacyMode, - enabled: enabled, fakeValue: fakeValue), _OptionCheckBox(context, 'Enable remote configuration modification', kOptionAllowRemoteConfigModification, enabled: enabled, fakeValue: fakeValue), @@ -1123,13 +1073,8 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin { if (value == passwordValues[passwordKeys .indexOf(kUsePermanentPassword)] && - (await bind.mainGetCommon( - key: "permanent-password-set")) != - "true") { - if (isChangePermanentPasswordDisabled()) { - await callback(); - return; - } + (await bind.mainGetPermanentPassword()) + .isEmpty) { setPasswordDialog(notEmptyCallback: callback); } else { await callback(); @@ -1232,9 +1177,9 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin { ], ), enabled: tmpEnabled && !locked), - if (usePassword) numericOneTimePassword, + numericOneTimePassword, if (usePassword) radios[1], - if (usePassword && !isChangePermanentPasswordDisabled()) + if (usePassword) _SubButton('Set permanent password', setPasswordDialog, permEnabled && !locked), // if (usePassword) @@ -1253,14 +1198,11 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin { ...directIp(context), whitelist(), ...autoDisconnect(context), - _OptionCheckBox(context, 'keep-awake-during-incoming-sessions-label', - kOptionKeepAwakeDuringIncomingSessions, - reverse: false, enabled: enabled), if (bind.mainIsInstalled()) _OptionCheckBox(context, 'allow-only-conn-window-open-tip', 'allow-only-conn-window-open', reverse: false, enabled: enabled), - if (bind.mainIsInstalled() && !isUnlockPinDisabled()) unlockPin() + if (bind.mainIsInstalled()) unlockPin() ]); } @@ -1580,8 +1522,9 @@ class _NetworkState extends State<_Network> with AutomaticKeepAliveClientMixin { bind.mainGetBuildinOption(key: kOptionHideServerSetting) == 'Y'; final hideProxy = isWeb || bind.mainGetBuildinOption(key: kOptionHideProxySetting) == 'Y'; - final hideWebSocket = isWeb || - bind.mainGetBuildinOption(key: kOptionHideWebSocketSetting) == 'Y'; + // final hideWebSocket = isWeb || + // bind.mainGetBuildinOption(key: kOptionHideWebSocketSetting) == 'Y'; + final hideWebSocket = true; if (hideServer && hideProxy && hideWebSocket) { return Offstage(); @@ -1643,27 +1586,6 @@ class _NetworkState extends State<_Network> with AutomaticKeepAliveClientMixin { ); } - Widget switchWidget(IconData icon, String title, String tooltipMessage, - String optionKey) => - listTile( - icon: icon, - title: title, - showTooltip: true, - tooltipMessage: tooltipMessage, - trailing: Switch( - value: mainGetBoolOptionSync(optionKey), - onChanged: locked || isOptionFixed(optionKey) - ? null - : (value) { - mainSetBoolOption(optionKey, value); - setState(() {}); - }, - ), - ); - - final outgoingOnly = bind.isOutgoingOnly(); - - final divider = const Divider(height: 1, indent: 16, endIndent: 16); return _Card( title: 'Network', children: [ @@ -1675,65 +1597,33 @@ class _NetworkState extends State<_Network> with AutomaticKeepAliveClientMixin { listTile( icon: Icons.dns_outlined, title: 'ID/Relay Server', - onTap: () => showServerSettings(gFFI.dialogManager, setState), + onTap: () => showServerSettings(gFFI.dialogManager), ), - if (!hideProxy && !hideServer) divider, + if (!hideServer && (!hideProxy || !hideWebSocket)) + Divider(height: 1, indent: 16, endIndent: 16), if (!hideProxy) listTile( icon: Icons.network_ping_outlined, title: 'Socks5/Http(s) Proxy', onTap: changeSocks5Proxy, ), - if (!hideWebSocket && (!hideServer || !hideProxy)) divider, + if (!hideProxy && !hideWebSocket) + Divider(height: 1, indent: 16, endIndent: 16), if (!hideWebSocket) - switchWidget( - Icons.web_asset_outlined, - 'Use WebSocket', - '${translate('websocket_tip')}\n\n${translate('server-oss-not-support-tip')}', - kOptionAllowWebSocket), - if (!isWeb) - futureBuilder( - future: bind.mainIsUsingPublicServer(), - hasData: (isUsingPublicServer) { - if (isUsingPublicServer) { - return Offstage(); - } else { - return Column( - children: [ - if (!hideServer || !hideProxy || !hideWebSocket) - divider, - switchWidget( - Icons.no_encryption_outlined, - 'Allow insecure TLS fallback', - 'allow-insecure-tls-fallback-tip', - kOptionAllowInsecureTLSFallback), - if (!outgoingOnly) divider, - if (!outgoingOnly) - listTile( - icon: Icons.lan_outlined, - title: 'Disable UDP', - showTooltip: true, - tooltipMessage: - '${translate('disable-udp-tip')}\n\n${translate('server-oss-not-support-tip')}', - trailing: Switch( - value: bind.mainGetOptionSync( - key: kOptionDisableUdp) == - 'Y', - onChanged: - locked || isOptionFixed(kOptionDisableUdp) - ? null - : (value) async { - await bind.mainSetOption( - key: kOptionDisableUdp, - value: value ? 'Y' : 'N'); - setState(() {}); - }, - ), - ), - ], - ); - } - }, + listTile( + icon: Icons.web_asset_outlined, + title: 'Use WebSocket', + showTooltip: true, + tooltipMessage: 'websocket_tip', + trailing: Switch( + value: mainGetBoolOptionSync(kOptionAllowWebSocket), + onChanged: locked + ? null + : (value) { + mainSetBoolOption(kOptionAllowWebSocket, value); + setState(() {}); + }, + ), ), ], ), @@ -1796,13 +1686,6 @@ class _DisplayState extends State<_Display> { } final groupValue = bind.mainGetUserDefaultOption(key: kOptionScrollStyle); - - onEdgeScrollEdgeThicknessChanged(double value) async { - await bind.mainSetUserDefaultOption( - key: kOptionEdgeScrollEdgeThickness, value: value.round().toString()); - setState(() {}); - } - return _Card(title: 'Default Scroll Style', children: [ _Radio(context, value: kRemoteScrollStyleAuto, @@ -1814,23 +1697,6 @@ class _DisplayState extends State<_Display> { groupValue: groupValue, label: 'Scrollbar', onChanged: isOptFixed ? null : onChanged), - if (!isWeb) ...[ - _Radio(context, - value: kRemoteScrollStyleEdge, - groupValue: groupValue, - label: 'ScrollEdge', - onChanged: isOptFixed ? null : onChanged), - Offstage( - offstage: groupValue != kRemoteScrollStyleEdge, - child: EdgeThicknessControl( - value: double.tryParse(bind.mainGetUserDefaultOption( - key: kOptionEdgeScrollEdgeThickness)) ?? - 100.0, - onChanged: isOptionFixed(kOptionEdgeScrollEdgeThickness) - ? null - : onEdgeScrollEdgeThicknessChanged, - )), - ], ]); } @@ -1872,9 +1738,9 @@ class _DisplayState extends State<_Display> { } Widget trackpadSpeed(BuildContext context) { - final initSpeed = - (int.tryParse(bind.mainGetUserDefaultOption(key: kKeyTrackpadSpeed)) ?? - kDefaultTrackpadSpeed); + final initSpeed = (int.tryParse( + bind.mainGetUserDefaultOption(key: kKeyTrackpadSpeed)) ?? + kDefaultTrackpadSpeed); final curSpeed = SimpleWrapper(initSpeed); void onDebouncer(int v) { bind.mainSetUserDefaultOption( @@ -2039,9 +1905,7 @@ class _AccountState extends State<_Account> { Widget accountAction() { return Obx(() => _Button( - gFFI.userModel.userName.value.isEmpty - ? 'Login' - : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})', + gFFI.userModel.userName.value.isEmpty ? 'Login' : 'Logout', () => { gFFI.userModel.userName.value.isEmpty ? loginDialog() @@ -2050,65 +1914,24 @@ class _AccountState extends State<_Account> { } Widget useInfo() { + text(String key, String value) { + return Align( + alignment: Alignment.centerLeft, + child: SelectionArea(child: Text('${translate(key)}: $value')) + .marginSymmetric(vertical: 4), + ); + } + return Obx(() => Offstage( offstage: gFFI.userModel.userName.value.isEmpty, - child: Container( - padding: const EdgeInsets.all(12), - decoration: BoxDecoration( - color: Theme.of(context).colorScheme.surfaceContainerHighest, - borderRadius: BorderRadius.circular(10), - ), - child: Builder(builder: (context) { - final avatarWidget = _buildUserAvatar(); - return Row( - children: [ - if (avatarWidget != null) avatarWidget, - const SizedBox(width: 12), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - gFFI.userModel.displayNameOrUserName, - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: const TextStyle( - fontSize: 16, - fontWeight: FontWeight.w600, - ), - ), - const SizedBox(height: 2), - SelectionArea( - child: Text( - '@${gFFI.userModel.userName.value}', - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 13, - color: - Theme.of(context).textTheme.bodySmall?.color, - ), - ), - ), - ], - ), - ), - ], - ); - }), + child: Column( + children: [ + text('Username', gFFI.userModel.userName.value), + // text('Group', gFFI.groupModel.groupName.value), + ], ), )).marginOnly(left: 18, top: 16); } - - Widget? _buildUserAvatar() { - // Resolve relative avatar path at display time - final avatar = - bind.mainResolveAvatarUrl(avatar: gFFI.userModel.avatar.value); - return buildAvatarWidget( - avatar: avatar, - size: 44, - ); - } } class _Checkbox extends StatefulWidget { @@ -2196,9 +2019,7 @@ class _PluginState extends State<_Plugin> { Widget accountAction() { return Obx(() => _Button( - gFFI.userModel.userName.value.isEmpty - ? 'Login' - : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})', + gFFI.userModel.userName.value.isEmpty ? 'Login' : 'Logout', () => { gFFI.userModel.userName.value.isEmpty ? loginDialog() @@ -2606,49 +2427,6 @@ class WaylandCard extends StatefulWidget { class _WaylandCardState extends State { final restoreTokenKey = 'wayland-restore-token'; - static const _kClearShortcutsInhibitorEventKey = - 'clear-gnome-shortcuts-inhibitor-permission-res'; - final _clearShortcutsInhibitorFailedMsg = ''.obs; - // Don't show the shortcuts permission reset button for now. - // Users can change it manually: - // "Settings" -> "Apps" -> "RustDesk" -> "Permissions" -> "Inhibit Shortcuts". - // For resetting(clearing) the permission from the portal permission store, you can - // use (replace with the RustDesk desktop file ID): - // busctl --user call org.freedesktop.impl.portal.PermissionStore \ - // /org/freedesktop/impl/portal/PermissionStore org.freedesktop.impl.portal.PermissionStore \ - // DeletePermission sss "gnome" "shortcuts-inhibitor" "" - // On a native install this is typically "rustdesk.desktop"; on Flatpak it is usually - // the exported desktop ID derived from the Flatpak app-id (e.g. "com.rustdesk.RustDesk.desktop"). - // - // We may add it back in the future if needed. - final showResetInhibitorPermission = false; - - @override - void initState() { - super.initState(); - if (showResetInhibitorPermission) { - platformFFI.registerEventHandler( - _kClearShortcutsInhibitorEventKey, _kClearShortcutsInhibitorEventKey, - (evt) async { - if (!mounted) return; - if (evt['success'] == true) { - setState(() {}); - } else { - _clearShortcutsInhibitorFailedMsg.value = - evt['msg'] as String? ?? 'Unknown error'; - } - }); - } - } - - @override - void dispose() { - if (showResetInhibitorPermission) { - platformFFI.unregisterEventHandler( - _kClearShortcutsInhibitorEventKey, _kClearShortcutsInhibitorEventKey); - } - super.dispose(); - } @override Widget build(BuildContext context) { @@ -2656,16 +2434,9 @@ class _WaylandCardState extends State { future: bind.mainHandleWaylandScreencastRestoreToken( key: restoreTokenKey, value: "get"), hasData: (restoreToken) { - final hasShortcutsPermission = showResetInhibitorPermission && - bind.mainGetCommonSync( - key: "has-gnome-shortcuts-inhibitor-permission") == - "true"; - final children = [ if (restoreToken.isNotEmpty) _buildClearScreenSelection(context, restoreToken), - if (hasShortcutsPermission) - _buildClearShortcutsInhibitorPermission(context), ]; return Offstage( offstage: children.isEmpty, @@ -2710,50 +2481,6 @@ class _WaylandCardState extends State { ), ); } - - Widget _buildClearShortcutsInhibitorPermission(BuildContext context) { - onConfirm() { - _clearShortcutsInhibitorFailedMsg.value = ''; - bind.mainSetCommon( - key: "clear-gnome-shortcuts-inhibitor-permission", value: ""); - gFFI.dialogManager.dismissAll(); - } - - showConfirmMsgBox() => msgBoxCommon( - gFFI.dialogManager, - 'Confirmation', - Text( - translate('confirm-clear-shortcuts-inhibitor-permission-tip'), - ), - [ - dialogButton('OK', onPressed: onConfirm), - dialogButton('Cancel', - onPressed: () => gFFI.dialogManager.dismissAll()) - ]); - - return Column(children: [ - Obx( - () => _clearShortcutsInhibitorFailedMsg.value.isEmpty - ? Offstage() - : Align( - alignment: Alignment.topLeft, - child: Text(_clearShortcutsInhibitorFailedMsg.value, - style: DefaultTextStyle.of(context) - .style - .copyWith(color: Colors.red)) - .marginOnly(bottom: 10.0)), - ), - _Button( - 'Reset keyboard shortcuts permission', - showConfirmMsgBox, - tip: 'clear-shortcuts-inhibitor-permission-tip', - style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( - Theme.of(context).colorScheme.error.withOpacity(0.75)), - ), - ), - ]); - } } // ignore: non_constant_identifier_names @@ -2835,7 +2562,7 @@ Widget _lock( ]).marginSymmetric(vertical: 2)), onPressed: () async { final unlockPin = bind.mainGetUnlockPin(); - if (unlockPin.isEmpty || isUnlockPinDisabled()) { + if (unlockPin.isEmpty) { bool checked = await callMainCheckSuperUserPermission(); if (checked) { onUnlock(); diff --git a/flutter/lib/desktop/pages/file_manager_page.dart b/flutter/lib/desktop/pages/file_manager_page.dart index cf97351b3..3f555dcaa 100644 --- a/flutter/lib/desktop/pages/file_manager_page.dart +++ b/flutter/lib/desktop/pages/file_manager_page.dart @@ -3,7 +3,6 @@ import 'dart:io'; import 'dart:math'; import 'package:extended_text/extended_text.dart'; -import 'package:flutter_hbb/common/widgets/dialog.dart'; import 'package:flutter_hbb/desktop/widgets/dragable_divider.dart'; import 'package:percent_indicator/percent_indicator.dart'; import 'package:desktop_drop/desktop_drop.dart'; @@ -17,6 +16,7 @@ import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart'; import 'package:flutter_hbb/models/file_model.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; +import 'package:wakelock_plus/wakelock_plus.dart'; import 'package:flutter_hbb/web/dummy.dart' if (dart.library.html) 'package:flutter_hbb/web/web_unique.dart'; @@ -52,7 +52,7 @@ enum MouseFocusScope { } class FileManagerPage extends StatefulWidget { - FileManagerPage( + const FileManagerPage( {Key? key, required this.id, required this.password, @@ -67,16 +67,9 @@ class FileManagerPage extends StatefulWidget { final bool? forceRelay; final String? connToken; final DesktopTabController? tabController; - final SimpleWrapper?> _lastState = SimpleWrapper(null); - - FFI get ffi => (_lastState.value! as _FileManagerPageState)._ffi; @override - State createState() { - final state = _FileManagerPageState(); - _lastState.value = state; - return state; - } + State createState() => _FileManagerPageState(); } class _FileManagerPageState extends State @@ -85,7 +78,6 @@ class _FileManagerPageState extends State final _dropMaskVisible = false.obs; // TODO impl drop mask final _overlayKeyState = OverlayKeyState(); - final _uniqueKey = UniqueKey(); late FFI _ffi; @@ -107,7 +99,9 @@ class _FileManagerPageState extends State .showLoading(translate('Connecting...'), onCancel: closeConnection); }); Get.put(_ffi, tag: 'ft_${widget.id}'); - WakelockManager.enable(_uniqueKey); + if (!isLinux) { + WakelockPlus.enable(); + } if (isWeb) { _ffi.ffiModel.updateEventListener(_ffi.sessionId, widget.id); } @@ -125,7 +119,9 @@ class _FileManagerPageState extends State model.close().whenComplete(() { _ffi.close(); _ffi.dialogManager.dismissAll(); - WakelockManager.disable(_uniqueKey); + if (!isLinux) { + WakelockPlus.disable(); + } Get.delete(tag: 'ft_${widget.id}'); }); WidgetsBinding.instance.removeObserver(this); @@ -143,26 +139,12 @@ class _FileManagerPageState extends State } } - Widget willPopScope(Widget child) { - if (isWeb) { - return WillPopScope( - onWillPop: () async { - clientClose(_ffi.sessionId, _ffi); - return false; - }, - child: child, - ); - } else { - return child; - } - } - @override Widget build(BuildContext context) { super.build(context); return Overlay(key: _overlayKeyState.key, initialEntries: [ OverlayEntry(builder: (_) { - return willPopScope(Scaffold( + return Scaffold( backgroundColor: Theme.of(context).scaffoldBackgroundColor, body: Row( children: [ @@ -178,7 +160,7 @@ class _FileManagerPageState extends State Flexible(flex: 2, child: statusList()) ], ), - )); + ); }) ]); } @@ -278,9 +260,11 @@ class _FileManagerPageState extends State item.state != JobState.inProgress, child: LinearPercentIndicator( animateFromLastPercent: true, - center: Text(item.percentText), + center: Text( + '${(item.finishedSize / item.totalSize * 100).toStringAsFixed(0)}%', + ), barRadius: Radius.circular(15), - percent: item.percent, + percent: item.finishedSize / item.totalSize, progressColor: MyTheme.accent, backgroundColor: Theme.of(context).hoverColor, lineHeight: kDesktopFileTransferRowHeight, diff --git a/flutter/lib/desktop/pages/file_manager_tab_page.dart b/flutter/lib/desktop/pages/file_manager_tab_page.dart index ed3e9682d..525149889 100644 --- a/flutter/lib/desktop/pages/file_manager_tab_page.dart +++ b/flutter/lib/desktop/pages/file_manager_tab_page.dart @@ -3,7 +3,6 @@ import 'dart:convert'; import 'package:desktop_multi_window/desktop_multi_window.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hbb/common.dart'; -import 'package:flutter_hbb/common/widgets/dialog.dart'; import 'package:flutter_hbb/consts.dart'; import 'package:flutter_hbb/models/state_model.dart'; import 'package:flutter_hbb/desktop/pages/file_manager_page.dart'; @@ -41,15 +40,7 @@ class _FileManagerTabPageState extends State { label: params['id'], selectedIcon: selectedIcon, unselectedIcon: unselectedIcon, - onTabCloseButton: () async { - if (await desktopTryShowTabAuditDialogCloseCancelled( - id: params['id'], - tabController: tabController, - )) { - return; - } - tabController.closeBy(params['id']); - }, + onTabCloseButton: () => tabController.closeBy(params['id']), page: FileManagerPage( key: ValueKey(params['id']), id: params['id'], @@ -78,15 +69,7 @@ class _FileManagerTabPageState extends State { label: id, selectedIcon: selectedIcon, unselectedIcon: unselectedIcon, - onTabCloseButton: () async { - if (await desktopTryShowTabAuditDialogCloseCancelled( - id: id, - tabController: tabController, - )) { - return; - } - tabController.closeBy(id); - }, + onTabCloseButton: () => tabController.closeBy(id), page: FileManagerPage( key: ValueKey(id), id: id, @@ -149,14 +132,6 @@ class _FileManagerTabPageState extends State { Future handleWindowCloseButton() async { final connLength = tabController.state.value.tabs.length; - if (connLength == 1) { - if (await desktopTryShowTabAuditDialogCloseCancelled( - id: tabController.state.value.tabs[0].key, - tabController: tabController, - )) { - return false; - } - } if (connLength <= 1) { tabController.clear(); return true; diff --git a/flutter/lib/desktop/pages/port_forward_page.dart b/flutter/lib/desktop/pages/port_forward_page.dart index 13dca0eaf..6671d041b 100644 --- a/flutter/lib/desktop/pages/port_forward_page.dart +++ b/flutter/lib/desktop/pages/port_forward_page.dart @@ -25,7 +25,7 @@ class _PortForward { } class PortForwardPage extends StatefulWidget { - PortForwardPage({ + const PortForwardPage({ Key? key, required this.id, required this.password, @@ -42,16 +42,9 @@ class PortForwardPage extends StatefulWidget { final bool? forceRelay; final bool? isSharedPassword; final String? connToken; - final SimpleWrapper?> _lastState = SimpleWrapper(null); - - FFI get ffi => (_lastState.value! as _PortForwardPageState)._ffi; @override - State createState() { - final state = _PortForwardPageState(); - _lastState.value = state; - return state; - } + State createState() => _PortForwardPageState(); } class _PortForwardPageState extends State diff --git a/flutter/lib/desktop/pages/remote_page.dart b/flutter/lib/desktop/pages/remote_page.dart index 29e710bbc..912b06b02 100644 --- a/flutter/lib/desktop/pages/remote_page.dart +++ b/flutter/lib/desktop/pages/remote_page.dart @@ -3,9 +3,9 @@ import 'dart:async'; import 'package:desktop_multi_window/desktop_multi_window.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:flutter/scheduler.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; +import 'package:wakelock_plus/wakelock_plus.dart'; import 'package:flutter_hbb/models/state_model.dart'; import '../../consts.dart'; @@ -15,7 +15,6 @@ import '../../common.dart'; import '../../common/widgets/dialog.dart'; import '../../common/widgets/toolbar.dart'; import '../../models/model.dart'; -import '../../models/input_model.dart'; import '../../models/platform_model.dart'; import '../../common/shared_state.dart'; import '../../utils/image.dart'; @@ -73,10 +72,7 @@ class RemotePage extends StatefulWidget { } class _RemotePageState extends State - with - AutomaticKeepAliveClientMixin, - MultiWindowListener, - TickerProviderStateMixin { + with AutomaticKeepAliveClientMixin, MultiWindowListener { Timer? _timer; String keyboardMode = "legacy"; bool _isWindowBlur = false; @@ -85,16 +81,11 @@ class _RemotePageState extends State late RxBool _zoomCursor; late RxBool _remoteCursorMoved; late RxBool _keyboardEnabled; - final _uniqueKey = UniqueKey(); var _blockableOverlayState = BlockableOverlayState(); final FocusNode _rawKeyFocusNode = FocusNode(debugLabel: "rawkeyFocusNode"); - // Debounce timer for pointer lock center updates during window events. - // Uses kDefaultPointerLockCenterThrottleMs from consts.dart for the duration. - Timer? _pointerLockCenterDebounceTimer; - // We need `_instanceIdOnEnterOrLeaveImage4Toolbar` together with `_onEnterOrLeaveImage4Toolbar` // to identify the toolbar instance and its callback function. int? _instanceIdOnEnterOrLeaveImage4Toolbar; @@ -121,13 +112,11 @@ class _RemotePageState extends State _ffi = FFI(widget.sessionId); Get.put(_ffi, tag: widget.id); _ffi.imageModel.addCallbackOnFirstImage((String peerId) { - _ffi.canvasModel.activateLocalCursor(); showKBLayoutTypeChooserIfNeeded( _ffi.ffiModel.pi.platform, _ffi.dialogManager); _ffi.recordingModel .updateStatus(bind.sessionGetIsRecording(sessionId: _ffi.sessionId)); }); - _ffi.canvasModel.initializeEdgeScrollFallback(this); _ffi.start( widget.id, password: widget.password, @@ -143,7 +132,9 @@ class _RemotePageState extends State _ffi.dialogManager .showLoading(translate('Connecting...'), onCancel: closeConnection); }); - WakelockManager.enable(_uniqueKey); + if (!isLinux) { + WakelockPlus.enable(); + } _ffi.ffiModel.updateEventListener(sessionId, widget.id); if (!isWeb) bind.pluginSyncUi(syncTo: kAppTypeDesktopRemote); @@ -174,16 +165,6 @@ class _RemotePageState extends State WidgetsBinding.instance.addPostFrameCallback((_) { widget.tabController?.onSelected?.call(widget.id); }); - - // Register callback to cancel debounce timer when relative mouse mode is disabled - _ffi.inputModel.onRelativeMouseModeDisabled = - _cancelPointerLockCenterDebounceTimer; - } - - /// Cancel the pointer lock center debounce timer - void _cancelPointerLockCenterDebounceTimer() { - _pointerLockCenterDebounceTimer?.cancel(); - _pointerLockCenterDebounceTimer = null; } @override @@ -199,13 +180,6 @@ class _RemotePageState extends State _rawKeyFocusNode.unfocus(); } stateGlobal.isFocused.value = false; - - // When window loses focus, temporarily release relative mouse mode constraints - // to allow user to interact with other applications normally. - // The cursor will be re-hidden and re-centered when window regains focus. - if (_ffi.inputModel.relativeMouseMode.value) { - _ffi.inputModel.onWindowBlur(); - } } @override @@ -216,12 +190,6 @@ class _RemotePageState extends State _isWindowBlur = false; } stateGlobal.isFocused.value = true; - - // Restore relative mouse mode constraints when window regains focus. - if (_ffi.inputModel.relativeMouseMode.value) { - _rawKeyFocusNode.requestFocus(); - _ffi.inputModel.onWindowFocus(); - } } @override @@ -232,59 +200,25 @@ class _RemotePageState extends State if (isWindows) { _isWindowBlur = false; } - WakelockManager.enable(_uniqueKey); - // Update pointer lock center when window is restored - _updatePointerLockCenterIfNeeded(); + if (!isLinux) { + WakelockPlus.enable(); + } } // When the window is unminimized, onWindowMaximize or onWindowRestore can be called when the old state was maximized or not. @override void onWindowMaximize() { super.onWindowMaximize(); - WakelockManager.enable(_uniqueKey); - // Update pointer lock center when window is maximized - _updatePointerLockCenterIfNeeded(); - } - - @override - void onWindowResize() { - super.onWindowResize(); - // Update pointer lock center when window is resized - _updatePointerLockCenterIfNeeded(); - } - - @override - void onWindowMove() { - super.onWindowMove(); - // Update pointer lock center when window is moved - _updatePointerLockCenterIfNeeded(); - } - - /// Update pointer lock center with debouncing to avoid excessive updates - /// during rapid window move/resize events. - void _updatePointerLockCenterIfNeeded() { - if (!_ffi.inputModel.relativeMouseMode.value) return; - - // Cancel any pending update and schedule a new one (debounce pattern) - _pointerLockCenterDebounceTimer?.cancel(); - _pointerLockCenterDebounceTimer = Timer( - const Duration(milliseconds: kDefaultPointerLockCenterThrottleMs), - () { - if (!mounted) return; - if (_ffi.inputModel.relativeMouseMode.value) { - _ffi.inputModel.updatePointerLockCenter(); - } - }, - ); + if (!isLinux) { + WakelockPlus.enable(); + } } @override void onWindowMinimize() { super.onWindowMinimize(); - WakelockManager.disable(_uniqueKey); - // Release cursor constraints when minimized - if (_ffi.inputModel.relativeMouseMode.value) { - _ffi.inputModel.onWindowBlur(); + if (!isLinux) { + WakelockPlus.disable(); } } @@ -311,16 +245,6 @@ class _RemotePageState extends State // https://github.com/flutter/flutter/issues/64935 super.dispose(); debugPrint("REMOTE PAGE dispose session $sessionId ${widget.id}"); - - // Defensive cleanup: ensure host system-key propagation is reset even if - // MouseRegion.onExit never fired (e.g., tab closed while cursor inside). - if (!isWeb) bind.hostStopSystemKeyPropagate(stopped: true); - - _pointerLockCenterDebounceTimer?.cancel(); - _pointerLockCenterDebounceTimer = null; - // Clear callback reference to prevent memory leaks and stale references - _ffi.inputModel.onRelativeMouseModeDisabled = null; - // Relative mouse mode cleanup is centralized in FFI.close(closeSession: ...). _ffi.textureModel.onRemotePageDispose(closeSession); if (closeSession) { // ensure we leave this session, this is a double check @@ -338,7 +262,9 @@ class _RemotePageState extends State await SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: SystemUiOverlay.values); } - WakelockManager.disable(_uniqueKey); + if (!isLinux) { + await WakelockPlus.disable(); + } await Get.delete(tag: widget.id); removeSharedStates(widget.id); } @@ -422,15 +348,10 @@ class _RemotePageState extends State } }(), // Use Overlay to enable rebuild every time on menu button click. - // Hide toolbar when relative mouse mode is active to prevent - // cursor from escaping to toolbar area. - Obx(() => _ffi.inputModel.relativeMouseMode.value - ? const Offstage() - : _ffi.ffiModel.pi.isSet.isTrue - ? Overlay(initialEntries: [ - OverlayEntry(builder: remoteToolbar) - ]) - : remoteToolbar(context)), + _ffi.ffiModel.pi.isSet.isTrue + ? Overlay( + initialEntries: [OverlayEntry(builder: remoteToolbar)]) + : remoteToolbar(context), _ffi.ffiModel.pi.isSet.isFalse ? emptyOverlay() : Offstage(), ], ), @@ -474,7 +395,7 @@ class _RemotePageState extends State super.build(context); return WillPopScope( onWillPop: () async { - clientClose(sessionId, _ffi); + clientClose(sessionId, _ffi.dialogManager); return false; }, child: MultiProvider(providers: [ @@ -487,8 +408,6 @@ class _RemotePageState extends State } void enterView(PointerEnterEvent evt) { - _ffi.canvasModel.rearmEdgeScroll(); - _cursorOverImage.value = true; _firstEnterImage.value = true; if (_onEnterOrLeaveImage4Toolbar != null) { @@ -498,7 +417,6 @@ class _RemotePageState extends State // } } - // See [onWindowBlur]. if (!isWindows) { if (!_rawKeyFocusNode.hasFocus) { @@ -509,8 +427,6 @@ class _RemotePageState extends State } void leaveView(PointerExitEvent evt) { - _ffi.canvasModel.disableEdgeScroll(); - if (_ffi.ffiModel.keyboard) { _ffi.inputModel.tryMoveEdgeOnExit(evt.position); } @@ -524,7 +440,6 @@ class _RemotePageState extends State // } } - // See [onWindowBlur]. if (!isWindows) { _ffi.inputModel.enterOrLeave(false); @@ -572,39 +487,33 @@ class _RemotePageState extends State Widget getBodyForDesktop(BuildContext context) { var paints = [ - MouseRegion( - onEnter: (evt) { - if (!isWeb) bind.hostStopSystemKeyPropagate(stopped: false); - }, - onExit: (evt) { - if (!isWeb) bind.hostStopSystemKeyPropagate(stopped: true); - }, - child: _ViewStyleUpdater( - canvasModel: _ffi.canvasModel, - inputModel: _ffi.inputModel, - child: Builder(builder: (context) { - final peerDisplay = CurrentDisplayState.find(widget.id); - return Obx( - () => _ffi.ffiModel.pi.isSet.isFalse - ? Container(color: Colors.transparent) - : Obx(() { - _ffi.textureModel.updateCurrentDisplay(peerDisplay.value); - return ImagePaint( - id: widget.id, - zoomCursor: _zoomCursor, - cursorOverImage: _cursorOverImage, - keyboardEnabled: _keyboardEnabled, - remoteCursorMoved: _remoteCursorMoved, - listenerBuilder: (child) => - _buildRawTouchAndPointerRegion( - child, enterView, leaveView), - ffi: _ffi, - ); - }), - ); - }), - ), - ) + MouseRegion(onEnter: (evt) { + if (!isWeb) bind.hostStopSystemKeyPropagate(stopped: false); + }, onExit: (evt) { + if (!isWeb) bind.hostStopSystemKeyPropagate(stopped: true); + }, child: LayoutBuilder(builder: (context, constraints) { + final c = Provider.of(context, listen: false); + Future.delayed(Duration.zero, () => c.updateViewStyle()); + final peerDisplay = CurrentDisplayState.find(widget.id); + return Obx( + () => _ffi.ffiModel.pi.isSet.isFalse + ? Container(color: Colors.transparent) + : Obx(() { + widget.toolbarState.initShow(sessionId); + _ffi.textureModel.updateCurrentDisplay(peerDisplay.value); + return ImagePaint( + id: widget.id, + zoomCursor: _zoomCursor, + cursorOverImage: _cursorOverImage, + keyboardEnabled: _keyboardEnabled, + remoteCursorMoved: _remoteCursorMoved, + listenerBuilder: (child) => _buildRawTouchAndPointerRegion( + child, enterView, leaveView), + ffi: _ffi, + ); + }), + ); + })) ]; if (!_ffi.canvasModel.cursorEmbedded) { @@ -633,63 +542,6 @@ class _RemotePageState extends State bool get wantKeepAlive => true; } -/// A widget that tracks the view size and updates CanvasModel.updateViewStyle() -/// and InputModel.updateImageWidgetSize() only when size actually changes. -/// This avoids scheduling post-frame callbacks on every LayoutBuilder rebuild. -class _ViewStyleUpdater extends StatefulWidget { - final CanvasModel canvasModel; - final InputModel inputModel; - final Widget child; - - const _ViewStyleUpdater({ - Key? key, - required this.canvasModel, - required this.inputModel, - required this.child, - }) : super(key: key); - - @override - State<_ViewStyleUpdater> createState() => _ViewStyleUpdaterState(); -} - -class _ViewStyleUpdaterState extends State<_ViewStyleUpdater> { - Size? _lastSize; - bool _callbackScheduled = false; - - @override - Widget build(BuildContext context) { - return LayoutBuilder( - builder: (context, constraints) { - final maxWidth = constraints.maxWidth; - final maxHeight = constraints.maxHeight; - // Guard against infinite constraints (e.g., unconstrained ancestor). - if (!maxWidth.isFinite || !maxHeight.isFinite) { - return widget.child; - } - final newSize = Size(maxWidth, maxHeight); - if (_lastSize != newSize) { - _lastSize = newSize; - // Schedule the update for after the current frame to avoid setState during build. - // Use _callbackScheduled flag to prevent accumulating multiple callbacks - // when size changes rapidly before any callback executes. - if (!_callbackScheduled) { - _callbackScheduled = true; - SchedulerBinding.instance.addPostFrameCallback((_) { - _callbackScheduled = false; - final currentSize = _lastSize; - if (mounted && currentSize != null) { - widget.canvasModel.updateViewStyle(); - widget.inputModel.updateImageWidgetSize(currentSize); - } - }); - } - } - return widget.child; - }, - ); - } -} - class ImagePaint extends StatefulWidget { final FFI ffi; final String id; @@ -754,29 +606,26 @@ class _ImagePaintState extends State { cursor: cursorOverImage.isTrue ? c.cursorEmbedded ? SystemMouseCursors.none - // Hide cursor when relative mouse mode is active - : widget.ffi.inputModel.relativeMouseMode.value - ? SystemMouseCursors.none - : keyboardEnabled.isTrue - ? (() { - if (remoteCursorMoved.isTrue) { - _lastRemoteCursorMoved = true; - return SystemMouseCursors.none; - } else { - if (_lastRemoteCursorMoved) { - _lastRemoteCursorMoved = false; - _firstEnterImage.value = true; - } - return _buildCustomCursor( - context, getCursorScale()); - } - }()) - : _buildDisabledCursor(context, getCursorScale()) + : keyboardEnabled.isTrue + ? (() { + if (remoteCursorMoved.isTrue) { + _lastRemoteCursorMoved = true; + return SystemMouseCursors.none; + } else { + if (_lastRemoteCursorMoved) { + _lastRemoteCursorMoved = false; + _firstEnterImage.value = true; + } + return _buildCustomCursor( + context, getCursorScale()); + } + }()) + : _buildDisabledCursor(context, getCursorScale()) : MouseCursor.defer, onHover: (evt) {}, child: child); }); - if (c.imageOverflow.isTrue && c.scrollStyle != ScrollStyle.scrollauto) { + if (c.imageOverflow.isTrue && c.scrollStyle == ScrollStyle.scrollbar) { final paintWidth = c.getDisplayWidth() * s; final paintHeight = c.getDisplayHeight() * s; final paintSize = Size(paintWidth, paintHeight); @@ -831,20 +680,9 @@ class _ImagePaintState extends State { Widget _buildScrollAutoNonTextureRender( ImageModel m, CanvasModel c, double s) { - double sizeScale = s; - if (widget.ffi.ffiModel.isPeerLinux) { - final displays = widget.ffi.ffiModel.pi.getCurDisplays(); - if (displays.isNotEmpty) { - sizeScale = s / displays[0].scale; - } - } return CustomPaint( size: Size(c.size.width, c.size.height), - painter: ImagePainter( - image: m.image, - x: c.x / sizeScale, - y: c.y / sizeScale, - scale: sizeScale), + painter: ImagePainter(image: m.image, x: c.x / s, y: c.y / s, scale: s), ); } @@ -857,19 +695,17 @@ class _ImagePaintState extends State { if (rect == null) { return Container(); } - final isPeerLinux = ffiModel.isPeerLinux; final curDisplay = ffiModel.pi.currentDisplay; for (var i = 0; i < displays.length; i++) { final textureId = widget.ffi.textureModel .getTextureId(curDisplay == kAllDisplayValue ? i : curDisplay); if (true) { // both "textureId.value != -1" and "true" seems ok - final sizeScale = isPeerLinux ? s / displays[i].scale : s; children.add(Positioned( left: (displays[i].x - rect.left) * s + offset.dx, top: (displays[i].y - rect.top) * s + offset.dy, - width: displays[i].width * sizeScale, - height: displays[i].height * sizeScale, + width: displays[i].width * s, + height: displays[i].height * s, child: Obx(() => Texture( textureId: textureId.value, filterQuality: diff --git a/flutter/lib/desktop/pages/remote_tab_page.dart b/flutter/lib/desktop/pages/remote_tab_page.dart index ccd5935ce..644f6c336 100644 --- a/flutter/lib/desktop/pages/remote_tab_page.dart +++ b/flutter/lib/desktop/pages/remote_tab_page.dart @@ -80,15 +80,7 @@ class _ConnectionTabPageState extends State { label: peerId!, selectedIcon: selectedIcon, unselectedIcon: unselectedIcon, - onTabCloseButton: () async { - if (await desktopTryShowTabAuditDialogCloseCancelled( - id: peerId!, - tabController: tabController, - )) { - return; - } - tabController.closeBy(peerId!); - }, + onTabCloseButton: () => tabController.closeBy(peerId), page: RemotePage( key: ValueKey(peerId), id: peerId!, @@ -135,13 +127,7 @@ class _ConnectionTabPageState extends State { body: DesktopTab( controller: tabController, onWindowCloseButton: handleWindowCloseButton, - tail: Row( - mainAxisSize: MainAxisSize.min, - children: [ - _RelativeMouseModeHint(tabController: tabController), - const AddButton(), - ], - ), + tail: const AddButton(), selectedBorderColor: MyTheme.accent, pageViewBuilder: (pageView) => pageView, labelGetter: DesktopTab.tablabelGetter, @@ -160,8 +146,16 @@ class _ConnectionTabPageState extends State { connectionType.secure.value == ConnectionType.strSecure; bool direct = connectionType.direct.value == ConnectionType.strDirect; - String msgConn = getConnectionText( - secure, direct, connectionType.stream_type.value); + String msgConn; + if (secure && direct) { + msgConn = translate("Direct and encrypted connection"); + } else if (secure && !direct) { + msgConn = translate("Relayed and encrypted connection"); + } else if (!secure && direct) { + msgConn = translate("Direct and unencrypted connection"); + } else { + msgConn = translate("Relayed and unencrypted connection"); + } var msgFingerprint = '${translate('Fingerprint')}:\n'; var fingerprint = FingerprintState.find(key).value; if (fingerprint.isEmpty) { @@ -257,11 +251,11 @@ class _ConnectionTabPageState extends State { MenuEntryButton( childBuilder: (TextStyle? style) => Obx(() => Text( translate( - toolbarState.hide.isTrue ? 'Show Toolbar' : 'Hide Toolbar'), + toolbarState.show.isTrue ? 'Hide Toolbar' : 'Show Toolbar'), style: style, )), proc: () { - toolbarState.switchHide(sessionId); + toolbarState.switchShow(sessionId); cancelFunc(); }, padding: padding, @@ -330,13 +324,7 @@ class _ConnectionTabPageState extends State { translate('Close'), style: style, ), - proc: () async { - if (await desktopTryShowTabAuditDialogCloseCancelled( - id: key, - tabController: tabController, - )) { - return; - } + proc: () { tabController.closeBy(key); cancelFunc(); }, @@ -380,8 +368,6 @@ class _ConnectionTabPageState extends State { loopCloseWindow(); } ConnectionTypeState.delete(id); - // Clean up relative mouse mode state for this peer. - stateGlobal.relativeMouseModeState.remove(id); _update_remote_count(); } @@ -391,14 +377,6 @@ class _ConnectionTabPageState extends State { Future handleWindowCloseButton() async { final connLength = tabController.length; - if (connLength == 1) { - if (await desktopTryShowTabAuditDialogCloseCancelled( - id: tabController.state.value.tabs[0].key, - tabController: tabController, - )) { - return false; - } - } if (connLength <= 1) { tabController.clear(); return true; @@ -453,15 +431,7 @@ class _ConnectionTabPageState extends State { label: id, selectedIcon: selectedIcon, unselectedIcon: unselectedIcon, - onTabCloseButton: () async { - if (await desktopTryShowTabAuditDialogCloseCancelled( - id: id, - tabController: tabController, - )) { - return; - } - tabController.closeBy(id); - }, + onTabCloseButton: () => tabController.closeBy(id), page: RemotePage( key: ValueKey(id), id: id, @@ -556,69 +526,3 @@ class _ConnectionTabPageState extends State { return returnValue; } } - -/// A widget that displays a hint in the tab bar when relative mouse mode is active. -/// This helps users remember how to exit relative mouse mode. -class _RelativeMouseModeHint extends StatelessWidget { - final DesktopTabController tabController; - - const _RelativeMouseModeHint({Key? key, required this.tabController}) - : super(key: key); - - @override - Widget build(BuildContext context) { - return Obx(() { - // Check if there are any tabs - if (tabController.state.value.tabs.isEmpty) { - return const SizedBox.shrink(); - } - - // Get current selected tab's RemotePage - final selectedTabInfo = tabController.state.value.selectedTabInfo; - if (selectedTabInfo.page is! RemotePage) { - return const SizedBox.shrink(); - } - - final remotePage = selectedTabInfo.page as RemotePage; - final String peerId = remotePage.id; - - // Use global state to check relative mouse mode (synced from InputModel). - // This avoids timing issues with FFI registration. - final isRelativeMouseMode = - stateGlobal.relativeMouseModeState[peerId] ?? false; - - if (!isRelativeMouseMode) { - return const SizedBox.shrink(); - } - - return Container( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), - margin: const EdgeInsets.only(right: 8), - decoration: BoxDecoration( - color: Colors.orange.withOpacity(0.2), - borderRadius: BorderRadius.circular(4), - border: Border.all(color: Colors.orange.withOpacity(0.5)), - ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Icon( - Icons.mouse, - size: 14, - color: Colors.orange[700], - ), - const SizedBox(width: 4), - Text( - translate( - 'rel-mouse-exit-{${isMacOS ? "Cmd+G" : "Ctrl+Alt"}}-tip'), - style: TextStyle( - fontSize: 11, - color: Colors.orange[700], - ), - ), - ], - ), - ); - }); - } -} diff --git a/flutter/lib/desktop/pages/server_page.dart b/flutter/lib/desktop/pages/server_page.dart index 8bd7df08b..4ee29756f 100644 --- a/flutter/lib/desktop/pages/server_page.dart +++ b/flutter/lib/desktop/pages/server_page.dart @@ -462,7 +462,23 @@ class _CmHeaderState extends State<_CmHeader> child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ - _buildClientAvatar().marginOnly(right: 10.0), + Container( + width: 70, + height: 70, + alignment: Alignment.center, + decoration: BoxDecoration( + color: str2color(client.name), + borderRadius: BorderRadius.circular(15.0), + ), + child: Text( + client.name[0], + style: TextStyle( + fontWeight: FontWeight.bold, + color: Colors.white, + fontSize: 55, + ), + ), + ).marginOnly(right: 10.0), Expanded( child: Column( mainAxisAlignment: MainAxisAlignment.start, @@ -566,36 +582,6 @@ class _CmHeaderState extends State<_CmHeader> @override bool get wantKeepAlive => true; - - Widget _buildClientAvatar() { - return buildAvatarWidget( - avatar: client.avatar, - size: 70, - borderRadius: 15, - fallback: _buildInitialAvatar(), - ) ?? - _buildInitialAvatar(); - } - - Widget _buildInitialAvatar() { - return Container( - width: 70, - height: 70, - alignment: Alignment.center, - decoration: BoxDecoration( - color: str2color(client.name), - borderRadius: BorderRadius.circular(15.0), - ), - child: Text( - client.name.isNotEmpty ? client.name[0] : '?', - style: TextStyle( - fontWeight: FontWeight.bold, - color: Colors.white, - fontSize: 55, - ), - ), - ); - } } class _PrivilegeBoard extends StatefulWidget { @@ -610,24 +596,19 @@ class _PrivilegeBoard extends StatefulWidget { class _PrivilegeBoardState extends State<_PrivilegeBoard> { late final client = widget.client; Widget buildPermissionIcon(bool enabled, IconData iconData, - Function(bool)? onTap, String tooltipText, - {required bool canModify}) { + Function(bool)? onTap, String tooltipText) { return Tooltip( message: "$tooltipText: ${enabled ? "ON" : "OFF"}", waitDuration: Duration.zero, child: Container( decoration: BoxDecoration( - color: enabled - ? (canModify ? MyTheme.accent : MyTheme.accent.withOpacity(0.6)) - : Colors.grey[700], + color: enabled ? MyTheme.accent : Colors.grey[700], borderRadius: BorderRadius.circular(10.0), ), padding: EdgeInsets.all(8.0), child: InkWell( - onTap: canModify - ? () => - checkClickTime(widget.client.id, () => onTap?.call(!enabled)) - : null, + onTap: () => + checkClickTime(widget.client.id, () => onTap?.call(!enabled)), child: Column( mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ @@ -648,9 +629,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> { Widget build(BuildContext context) { final crossAxisCount = 4; final spacing = 10.0; - final canModifyPermission = - bind.mainGetBuildinOption(key: kOptionEnablePermChangeInAcceptWindow) != - 'N'; return Container( width: double.infinity, height: 160.0, @@ -697,7 +675,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> { }); }, translate('Enable audio'), - canModify: canModifyPermission, ), buildPermissionIcon( client.recording, @@ -712,7 +689,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> { }); }, translate('Enable recording session'), - canModify: canModifyPermission, ), ] : [ @@ -729,7 +705,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> { }); }, translate('Enable keyboard/mouse'), - canModify: canModifyPermission, ), buildPermissionIcon( client.clipboard, @@ -744,7 +719,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> { }); }, translate('Enable clipboard'), - canModify: canModifyPermission, ), buildPermissionIcon( client.audio, @@ -759,7 +733,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> { }); }, translate('Enable audio'), - canModify: canModifyPermission, ), buildPermissionIcon( client.file, @@ -774,7 +747,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> { }); }, translate('Enable file copy and paste'), - canModify: canModifyPermission, ), buildPermissionIcon( client.restart, @@ -789,7 +761,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> { }); }, translate('Enable remote restart'), - canModify: canModifyPermission, ), buildPermissionIcon( client.recording, @@ -804,7 +775,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> { }); }, translate('Enable recording session'), - canModify: canModifyPermission, ), // only windows support block input if (isWindows) @@ -821,23 +791,6 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> { }); }, translate('Enable blocking user input'), - canModify: canModifyPermission, - ), - if (bind.mainSupportedPrivacyModeImpls() != '[]') - buildPermissionIcon( - client.privacyMode, - Icons.visibility_off, - (enabled) { - bind.cmSwitchPermission( - connId: client.id, - name: "privacy_mode", - enabled: enabled); - setState(() { - client.privacyMode = enabled; - }); - }, - translate('Enable privacy mode'), - canModify: canModifyPermission, ) ], ), diff --git a/flutter/lib/desktop/pages/terminal_page.dart b/flutter/lib/desktop/pages/terminal_page.dart index d38dc4a8b..f28545415 100644 --- a/flutter/lib/desktop/pages/terminal_page.dart +++ b/flutter/lib/desktop/pages/terminal_page.dart @@ -1,4 +1,3 @@ -import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_hbb/common.dart'; @@ -9,14 +8,13 @@ import 'package:xterm/xterm.dart'; import 'terminal_connection_manager.dart'; class TerminalPage extends StatefulWidget { - TerminalPage({ + const TerminalPage({ Key? key, required this.id, required this.password, required this.tabController, required this.isSharedPassword, required this.terminalId, - required this.tabKey, this.forceRelay, this.connToken, }) : super(key: key); @@ -28,38 +26,19 @@ class TerminalPage extends StatefulWidget { final String? connToken; final int terminalId; - /// Tab key for focus management, passed from parent to avoid duplicate construction - final String tabKey; - final SimpleWrapper?> _lastState = SimpleWrapper(null); - - FFI get ffi => (_lastState.value! as _TerminalPageState)._ffi; - @override - State createState() { - final state = _TerminalPageState(); - _lastState.value = state; - return state; - } + State createState() => _TerminalPageState(); } class _TerminalPageState extends State with AutomaticKeepAliveClientMixin { - static const EdgeInsets _defaultTerminalPadding = - EdgeInsets.symmetric(horizontal: 5.0, vertical: 2.0); - late FFI _ffi; late TerminalModel _terminalModel; - double? _cellHeight; - final FocusNode _terminalFocusNode = FocusNode(canRequestFocus: false); - StreamSubscription? _tabStateSubscription; @override void initState() { super.initState(); - // Listen for tab selection changes to request focus - _tabStateSubscription = widget.tabController.state.listen(_onTabStateChanged); - // Use shared FFI instance from connection manager _ffi = TerminalConnectionManager.getConnection( peerId: widget.id, @@ -74,37 +53,18 @@ class _TerminalPageState extends State debugPrint( '[TerminalPage] Terminal model created for terminal ${widget.terminalId}'); - _terminalModel.onResizeExternal = (w, h, pw, ph) { - _cellHeight = ph * 1.0; - - // Enable focus once terminal has valid dimensions (first valid resize) - if (!_terminalFocusNode.canRequestFocus && w > 0 && h > 0) { - _terminalFocusNode.canRequestFocus = true; - // Auto-focus if this tab is currently selected - _requestFocusIfSelected(); - } - - // Schedule the setState for the next frame - WidgetsBinding.instance.addPostFrameCallback((_) { - if (mounted) { - setState(() {}); - } - }); - }; - // Register this terminal model with FFI for event routing _ffi.registerTerminalModel(widget.terminalId, _terminalModel); // Initialize terminal connection WidgetsBinding.instance.addPostFrameCallback((_) { widget.tabController.onSelected?.call(widget.id); - + // Check if this is a new connection or additional terminal // Note: When a connection exists, the ref count will be > 1 after this terminal is added - final isExistingConnection = - TerminalConnectionManager.hasConnection(widget.id) && - TerminalConnectionManager.getTerminalCount(widget.id) > 1; - + final isExistingConnection = TerminalConnectionManager.hasConnection(widget.id) && + TerminalConnectionManager.getTerminalCount(widget.id) > 1; + if (!isExistingConnection) { // First terminal - show loading dialog, wait for onReady _ffi.dialogManager @@ -119,100 +79,38 @@ class _TerminalPageState extends State @override void dispose() { - // Cancel tab state subscription to prevent memory leak - _tabStateSubscription?.cancel(); // Unregister terminal model from FFI _ffi.unregisterTerminalModel(widget.terminalId); _terminalModel.dispose(); - _terminalFocusNode.dispose(); // Release connection reference instead of closing directly TerminalConnectionManager.releaseConnection(widget.id); super.dispose(); } - void _onTabStateChanged(DesktopTabState state) { - // Check if this tab is now selected and request focus - if (state.selected >= 0 && state.selected < state.tabs.length) { - final selectedTab = state.tabs[state.selected]; - if (selectedTab.key == widget.tabKey && mounted) { - _requestFocusIfSelected(); - } - } - } - - void _requestFocusIfSelected() { - if (!mounted || !_terminalFocusNode.canRequestFocus) return; - // Use post-frame callback to ensure widget is fully laid out in focus tree - WidgetsBinding.instance.addPostFrameCallback((_) { - // Re-check conditions after frame: mounted, focusable, still selected, not already focused - if (!mounted || !_terminalFocusNode.canRequestFocus || _terminalFocusNode.hasFocus) return; - final state = widget.tabController.state.value; - if (state.selected >= 0 && state.selected < state.tabs.length) { - if (state.tabs[state.selected].key == widget.tabKey) { - _terminalFocusNode.requestFocus(); - } - } - }); - } - - // This method ensures that the number of visible rows is an integer by computing the - // extra space left after dividing the available height by the height of a single - // terminal row (`_cellHeight`) and distributing it evenly as top and bottom padding. - EdgeInsets _calculatePadding(double heightPx) { - final cellHeight = _cellHeight; - if (!heightPx.isFinite || - heightPx <= 0 || - cellHeight == null || - !cellHeight.isFinite || - cellHeight <= 0) { - return _defaultTerminalPadding; - } - final rows = (heightPx / cellHeight).floor(); - if (rows <= 0) { - return _defaultTerminalPadding; - } - final extraSpace = heightPx - rows * cellHeight; - if (!extraSpace.isFinite || extraSpace < 0) { - return _defaultTerminalPadding; - } - final topBottom = extraSpace / 2.0; - return EdgeInsets.symmetric( - horizontal: _defaultTerminalPadding.horizontal / 2, - vertical: topBottom, - ); - } - @override Widget build(BuildContext context) { super.build(context); return Scaffold( backgroundColor: Theme.of(context).scaffoldBackgroundColor, - body: LayoutBuilder( - builder: (context, constraints) { - final heightPx = constraints.maxHeight; - return TerminalView( - _terminalModel.terminal, - controller: _terminalModel.terminalController, - focusNode: _terminalFocusNode, - // Note: autofocus is not used here because focus is managed manually - // via _onTabStateChanged() to handle tab switching properly. - backgroundOpacity: 0.7, - padding: _calculatePadding(heightPx), - onSecondaryTapDown: (details, offset) async { - final selection = _terminalModel.terminalController.selection; - if (selection != null) { - final text = _terminalModel.terminal.buffer.getText(selection); - _terminalModel.terminalController.clearSelection(); - await Clipboard.setData(ClipboardData(text: text)); - } else { - final data = await Clipboard.getData('text/plain'); - final text = data?.text; - if (text != null) { - _terminalModel.terminal.paste(text); - } - } - }, - ); + body: TerminalView( + _terminalModel.terminal, + controller: _terminalModel.terminalController, + autofocus: true, + backgroundOpacity: 0.7, + padding: const EdgeInsets.symmetric(horizontal: 5.0, vertical: 2.0), + onSecondaryTapDown: (details, offset) async { + final selection = _terminalModel.terminalController.selection; + if (selection != null) { + final text = _terminalModel.terminal.buffer.getText(selection); + _terminalModel.terminalController.clearSelection(); + await Clipboard.setData(ClipboardData(text: text)); + } else { + final data = await Clipboard.getData('text/plain'); + final text = data?.text; + if (text != null) { + _terminalModel.terminal.paste(text); + } + } }, ), ); diff --git a/flutter/lib/desktop/pages/terminal_tab_page.dart b/flutter/lib/desktop/pages/terminal_tab_page.dart index 63289e94d..ee2529107 100644 --- a/flutter/lib/desktop/pages/terminal_tab_page.dart +++ b/flutter/lib/desktop/pages/terminal_tab_page.dart @@ -4,7 +4,6 @@ import 'package:desktop_multi_window/desktop_multi_window.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_hbb/common.dart'; -import 'package:flutter_hbb/common/widgets/dialog.dart'; import 'package:flutter_hbb/consts.dart'; import 'package:flutter_hbb/models/state_model.dart'; import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart'; @@ -34,10 +33,6 @@ class _TerminalTabPageState extends State { static const IconData selectedIcon = Icons.terminal; static const IconData unselectedIcon = Icons.terminal_outlined; int _nextTerminalId = 1; - // Lightweight idempotency guard for async close operations - final Set _closingTabs = {}; - // When true, all session cleanup should persist (window-level close in progress) - bool _windowClosing = false; _TerminalTabPageState(Map params) { Get.put(DesktopTabController(tabType: DesktopTabType.terminal)); @@ -46,7 +41,6 @@ class _TerminalTabPageState extends State { .setTitle(getWindowNameWithId(id)); }; tabController.onRemoved = (_, id) => onRemoveId(id); - tabController.onCloseWindow = _closeWindowFromConnection; final terminalId = params['terminalId'] ?? _nextTerminalId++; tabController.add(_createTerminalTab( peerId: params['id'], @@ -67,20 +61,27 @@ class _TerminalTabPageState extends State { String? connToken, }) { final tabKey = '${peerId}_$terminalId'; - final alias = bind.mainGetPeerOptionSync(id: peerId, key: 'alias'); - final tabLabel = - alias.isNotEmpty ? '$alias #$terminalId' : '$peerId #$terminalId'; return TabInfo( key: tabKey, - label: tabLabel, + label: '$peerId #$terminalId', selectedIcon: selectedIcon, unselectedIcon: unselectedIcon, - onTabCloseButton: () => _closeTab(tabKey), + onTabCloseButton: () async { + // Close the terminal session first + final ffi = TerminalConnectionManager.getExistingConnection(peerId); + if (ffi != null) { + final terminalModel = ffi.terminalModels[terminalId]; + if (terminalModel != null) { + await terminalModel.closeTerminal(); + } + } + // Then close the tab + tabController.closeBy(tabKey); + }, page: TerminalPage( key: ValueKey(tabKey), id: peerId, terminalId: terminalId, - tabKey: tabKey, password: password, isSharedPassword: isSharedPassword, tabController: tabController, @@ -90,161 +91,6 @@ class _TerminalTabPageState extends State { ); } - /// Unified tab close handler for all close paths (button, shortcut, programmatic). - /// Shows audit dialog, cleans up session if not persistent, then removes the UI tab. - Future _closeTab(String tabKey) async { - // Idempotency guard: skip if already closing this tab - if (_closingTabs.contains(tabKey)) return; - _closingTabs.add(tabKey); - - try { - // Snapshot peerTabCount BEFORE any await to avoid race with concurrent - // _closeAllTabs clearing tabController (which would make the live count - // drop to 0 and incorrectly trigger session persistence). - // Note: the snapshot may become stale if other individual tabs are closed - // during the audit dialog, but this is an acceptable trade-off. - int? snapshotPeerTabCount; - final parsed = _parseTabKey(tabKey); - if (parsed != null) { - final (peerId, _) = parsed; - snapshotPeerTabCount = tabController.state.value.tabs.where((t) { - final p = _parseTabKey(t.key); - return p != null && p.$1 == peerId; - }).length; - } - - if (await desktopTryShowTabAuditDialogCloseCancelled( - id: tabKey, - tabController: tabController, - )) { - return; - } - - // Close terminal session if not in persistent mode. - // Wrapped separately so session cleanup failure never blocks UI tab removal. - try { - await _closeTerminalSessionIfNeeded(tabKey, - peerTabCount: snapshotPeerTabCount); - } catch (e) { - debugPrint('[TerminalTabPage] Session cleanup failed for $tabKey: $e'); - } - // Always close the tab from UI, regardless of session cleanup result - tabController.closeBy(tabKey); - } catch (e) { - debugPrint('[TerminalTabPage] Error closing tab $tabKey: $e'); - } finally { - _closingTabs.remove(tabKey); - } - } - - /// Close all tabs with session cleanup. - /// Used for window-level close operations (onDestroy, handleWindowCloseButton). - /// UI tabs are removed immediately; session cleanup runs in parallel with a - /// bounded timeout so window close is not blocked indefinitely. - Future _closeAllTabs() async { - _windowClosing = true; - final tabKeys = tabController.state.value.tabs.map((t) => t.key).toList(); - // Remove all UI tabs immediately (same instant behavior as the old tabController.clear()) - // Keep the cleanup target lookup below synchronous before its first await: - // it relies on the current frame still retaining each TerminalPage's FFI/model. - tabController.clear(); - // Run session cleanup in parallel with bounded timeout (closeTerminal() has internal 3s timeout). - // Skip tabs already being closed by a concurrent _closeTab() to avoid duplicate FFI calls. - final futures = tabKeys - .where((tabKey) => !_closingTabs.contains(tabKey)) - .map((tabKey) async { - try { - await _closeTerminalSessionIfNeeded(tabKey, persistAll: true); - } catch (e) { - debugPrint('[TerminalTabPage] Session cleanup failed for $tabKey: $e'); - } - }).toList(); - if (futures.isNotEmpty) { - await Future.wait(futures).timeout( - const Duration(seconds: 4), - onTimeout: () { - debugPrint( - '[TerminalTabPage] Session cleanup timed out for batch close'); - return []; - }, - ); - } - } - - /// Close the terminal session on server side based on persistent mode. - /// - /// [persistAll] controls behavior when persistent mode is enabled: - /// - `true` (window close): persist all sessions, don't close any. - /// - `false` (tab close): only persist the last session for the peer, - /// close others so only the most recent disconnected session survives. - /// - /// Note: if [_windowClosing] is true, persistAll is forced to true so that - /// in-flight _closeTab() calls don't accidentally close sessions that the - /// window-close flow intends to preserve. - Future _closeTerminalSessionIfNeeded(String tabKey, - {bool persistAll = false, int? peerTabCount}) async { - // If window close is in progress, override to persist all sessions - // even if this call originated from an individual tab close. - if (_windowClosing) { - persistAll = true; - } - final parsed = _parseTabKey(tabKey); - if (parsed == null) return; - final (peerId, terminalId) = parsed; - - final ffi = TerminalConnectionManager.getExistingConnection(peerId); - if (ffi == null) return; - - final isPersistent = bind.sessionGetToggleOptionSync( - sessionId: ffi.sessionId, - arg: kOptionTerminalPersistent, - ); - - if (isPersistent) { - if (persistAll) { - // Window close: persist all sessions - return; - } - // Tab close: only persist if this is the last tab for this peer. - // Use the snapshot value if provided (avoids race with concurrent tab removal). - final effectivePeerTabCount = peerTabCount ?? - tabController.state.value.tabs.where((t) { - final p = _parseTabKey(t.key); - return p != null && p.$1 == peerId; - }).length; - if (effectivePeerTabCount <= 1) { - // Last tab for this peer — persist the session - return; - } - // Not the last tab — fall through to close the session - } - - final terminalModel = ffi.terminalModels[terminalId]; - if (terminalModel != null) { - // closeTerminal() has internal 3s timeout, no need for external timeout - await terminalModel.closeTerminal(); - } - } - - /// Parse tabKey (format: "peerId_terminalId") into its components. - /// Note: peerId may contain underscores, so we use lastIndexOf('_'). - /// Returns null if tabKey format is invalid. - (String peerId, int terminalId)? _parseTabKey(String tabKey) { - final lastUnderscore = tabKey.lastIndexOf('_'); - if (lastUnderscore <= 0) { - debugPrint('[TerminalTabPage] Invalid tabKey format: $tabKey'); - return null; - } - final terminalIdStr = tabKey.substring(lastUnderscore + 1); - final terminalId = int.tryParse(terminalIdStr); - if (terminalId == null) { - debugPrint('[TerminalTabPage] Invalid terminalId in tabKey: $tabKey'); - return null; - } - final peerId = tabKey.substring(0, lastUnderscore); - return (peerId, terminalId); - } - Widget _tabMenuBuilder(String peerId, CancelFunc cancelFunc) { final List> menu = []; const EdgeInsets padding = EdgeInsets.only(left: 8.0, right: 5.0); @@ -278,7 +124,7 @@ class _TerminalTabPageState extends State { }, setter: (bool v) async { final ffi = Get.find(tag: 'terminal_$peerId'); - await bind.sessionToggleOption( + bind.sessionToggleOption( sessionId: ffi.sessionId, value: kOptionTerminalPersistent, ); @@ -325,28 +171,10 @@ class _TerminalTabPageState extends State { forceRelay: args['forceRelay'], connToken: args['connToken'], )); - } else if (call.method == kWindowEventRestoreTerminalSessions) { - _restoreSessions(call.arguments); } else if (call.method == "onDestroy") { - // Clean up sessions before window destruction (bounded wait) - await _closeAllTabs(); + tabController.clear(); } else if (call.method == kWindowActionRebuild) { reloadCurrentWindow(); - } else if (call.method == kWindowEventActiveSession) { - if (tabController.state.value.tabs.isEmpty) { - return false; - } - final currentTab = tabController.state.value.selectedTabInfo; - assert(call.arguments is String, - "Expected String arguments for kWindowEventActiveSession, got ${call.arguments.runtimeType}"); - // Use lastIndexOf to handle peerIds containing underscores - final lastUnderscore = currentTab.key.lastIndexOf('_'); - if (lastUnderscore > 0 && - currentTab.key.substring(0, lastUnderscore) == call.arguments) { - windowOnTop(windowId()); - return true; - } - return false; } }); Future.delayed(Duration.zero, () { @@ -360,58 +188,6 @@ class _TerminalTabPageState extends State { super.dispose(); } - Future _restoreSessions(String arguments) async { - Map? args; - try { - args = jsonDecode(arguments) as Map; - } catch (e) { - debugPrint("Error parsing JSON arguments in _restoreSessions: $e"); - return; - } - final persistentSessions = - args['persistent_sessions'] as List? ?? []; - final sortedSessions = persistentSessions.whereType().toList()..sort(); - var peerId = args['peer_id'] as String? ?? ''; - if (peerId.isEmpty) { - if (tabController.state.value.tabs.isEmpty || - tabController.state.value.selected >= - tabController.state.value.tabs.length) { - debugPrint('[TerminalTabPage] Skip restore: no selected tab'); - return; - } - final currentTab = tabController.state.value.selectedTabInfo; - final parsed = _parseTabKey(currentTab.key); - if (parsed == null) return; - peerId = parsed.$1; - } - final existingTerminalIds = tabController.state.value.tabs - .map((tab) => _parseTabKey(tab.key)) - .where((parsed) => parsed != null && parsed.$1 == peerId) - .map((parsed) => parsed!.$2) - .toSet(); - if (existingTerminalIds.isEmpty) { - debugPrint( - '[TerminalTabPage] Skip restore: no seed tab for peer $peerId'); - return; - } - for (final terminalId in sortedSessions) { - if (!existingTerminalIds.add(terminalId)) { - continue; - } - _addNewTerminal(peerId, terminalId: terminalId); - // A delay is required to ensure the UI has sufficient time to update - // before adding the next terminal. Without this delay, `_TerminalPageState::dispose()` - // may be called prematurely while the tab widget is still in the tab controller. - // This behavior is likely due to a race condition between the UI rendering lifecycle - // and the addition of new tabs. Attempts to use `_TerminalPageState::addPostFrameCallback()` - // to wait for the previous page to be ready were unsuccessful, as the observed call sequence is: - // `initState() 2 -> dispose() 2 -> postFrameCallback() 2`, followed by `initState() 3`. - // The `Future.delayed` approach mitigates this issue by introducing a buffer period, - // allowing the UI to stabilize before proceeding. - await Future.delayed(const Duration(milliseconds: 300)); - } - } - bool _handleKeyEvent(KeyEvent event) { if (event is KeyDownEvent) { // Use Cmd+T on macOS, Ctrl+Shift+T on other platforms @@ -439,7 +215,7 @@ class _TerminalTabPageState extends State { // macOS: Cmd+W (standard for close tab) final currentTab = tabController.state.value.selectedTabInfo; if (tabController.state.value.tabs.length > 1) { - _closeTab(currentTab.key); + tabController.closeBy(currentTab.key); return true; } } else if (!isMacOS && @@ -448,7 +224,7 @@ class _TerminalTabPageState extends State { // Other platforms: Ctrl+Shift+W (to avoid conflict with Ctrl+W word delete) final currentTab = tabController.state.value.selectedTabInfo; if (tabController.state.value.tabs.length > 1) { - _closeTab(currentTab.key); + tabController.closeBy(currentTab.key); return true; } } @@ -500,23 +276,17 @@ class _TerminalTabPageState extends State { return false; } - void _addNewTerminal(String peerId, {int? terminalId}) { + void _addNewTerminal(String peerId) { // Find first tab for this peer to get connection parameters final firstTab = tabController.state.value.tabs.firstWhere( - (tab) { - final last = tab.key.lastIndexOf('_'); - return last > 0 && tab.key.substring(0, last) == peerId; - }, + (tab) => tab.key.startsWith('$peerId\_'), ); if (firstTab.page is TerminalPage) { final page = firstTab.page as TerminalPage; - final newTerminalId = terminalId ?? _nextTerminalId++; - if (terminalId != null && terminalId >= _nextTerminalId) { - _nextTerminalId = terminalId + 1; - } + final terminalId = _nextTerminalId++; tabController.add(_createTerminalTab( peerId: peerId, - terminalId: newTerminalId, + terminalId: terminalId, password: page.password, isSharedPassword: page.isSharedPassword, forceRelay: page.forceRelay, @@ -525,12 +295,13 @@ class _TerminalTabPageState extends State { } } - void _addNewTerminalForCurrentPeer({int? terminalId}) { + void _addNewTerminalForCurrentPeer() { final currentTab = tabController.state.value.selectedTabInfo; - final parsed = _parseTabKey(currentTab.key); - if (parsed == null) return; - final (peerId, _) = parsed; - _addNewTerminal(peerId, terminalId: terminalId); + final parts = currentTab.key.split('_'); + if (parts.isNotEmpty) { + final peerId = parts[0]; + _addNewTerminal(peerId); + } } @override @@ -544,9 +315,10 @@ class _TerminalTabPageState extends State { selectedBorderColor: MyTheme.accent, labelGetter: DesktopTab.tablabelGetter, tabMenuBuilder: (key) { - final parsed = _parseTabKey(key); - if (parsed == null) return Container(); - final (peerId, _) = parsed; + // Extract peerId from tab key (format: "peerId_terminalId") + final parts = key.split('_'); + if (parts.isEmpty) return Container(); + final peerId = parts[0]; return _tabMenuBuilder(peerId, () {}); }, )); @@ -575,11 +347,6 @@ class _TerminalTabPageState extends State { } } - Future _closeWindowFromConnection() async { - await _closeAllTabs(); - await WindowController.fromWindowId(windowId()).close(); - } - int windowId() { return widget.params["windowId"]; } @@ -597,16 +364,8 @@ class _TerminalTabPageState extends State { Future handleWindowCloseButton() async { final connLength = tabController.state.value.tabs.length; - if (connLength == 1) { - if (await desktopTryShowTabAuditDialogCloseCancelled( - id: tabController.state.value.tabs[0].key, - tabController: tabController, - )) { - return false; - } - } if (connLength <= 1) { - await _closeAllTabs(); + tabController.clear(); return true; } else { final bool res; @@ -617,7 +376,7 @@ class _TerminalTabPageState extends State { res = await closeConfirmDialog(); } if (res) { - await _closeAllTabs(); + tabController.clear(); } return res; } diff --git a/flutter/lib/desktop/pages/view_camera_page.dart b/flutter/lib/desktop/pages/view_camera_page.dart index c45ec4d86..a1cc5c8a0 100644 --- a/flutter/lib/desktop/pages/view_camera_page.dart +++ b/flutter/lib/desktop/pages/view_camera_page.dart @@ -6,6 +6,7 @@ import 'package:flutter/services.dart'; import 'package:flutter_hbb/common/widgets/remote_input.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; +import 'package:wakelock_plus/wakelock_plus.dart'; import 'package:flutter_hbb/models/state_model.dart'; import '../../consts.dart'; @@ -76,7 +77,6 @@ class _ViewCameraPageState extends State String keyboardMode = "legacy"; bool _isWindowBlur = false; final _cursorOverImage = false.obs; - final _uniqueKey = UniqueKey(); var _blockableOverlayState = BlockableOverlayState(); @@ -124,7 +124,9 @@ class _ViewCameraPageState extends State _ffi.dialogManager .showLoading(translate('Connecting...'), onCancel: closeConnection); }); - WakelockManager.enable(_uniqueKey); + if (!isLinux) { + WakelockPlus.enable(); + } _ffi.ffiModel.updateEventListener(sessionId, widget.id); if (!isWeb) bind.pluginSyncUi(syncTo: kAppTypeDesktopRemote); @@ -183,20 +185,26 @@ class _ViewCameraPageState extends State if (isWindows) { _isWindowBlur = false; } - WakelockManager.enable(_uniqueKey); + if (!isLinux) { + WakelockPlus.enable(); + } } // When the window is unminimized, onWindowMaximize or onWindowRestore can be called when the old state was maximized or not. @override void onWindowMaximize() { super.onWindowMaximize(); - WakelockManager.enable(_uniqueKey); + if (!isLinux) { + WakelockPlus.enable(); + } } @override void onWindowMinimize() { super.onWindowMinimize(); - WakelockManager.disable(_uniqueKey); + if (!isLinux) { + WakelockPlus.disable(); + } } @override @@ -239,7 +247,9 @@ class _ViewCameraPageState extends State await SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: SystemUiOverlay.values); } - WakelockManager.disable(_uniqueKey); + if (!isLinux) { + await WakelockPlus.disable(); + } await Get.delete(tag: widget.id); removeSharedStates(widget.id); } @@ -350,7 +360,7 @@ class _ViewCameraPageState extends State super.build(context); return WillPopScope( onWillPop: () async { - clientClose(sessionId, _ffi); + clientClose(sessionId, _ffi.dialogManager); return false; }, child: MultiProvider(providers: [ @@ -455,6 +465,7 @@ class _ViewCameraPageState extends State () => _ffi.ffiModel.pi.isSet.isFalse ? Container(color: Colors.transparent) : Obx(() { + widget.toolbarState.initShow(sessionId); _ffi.textureModel.updateCurrentDisplay(peerDisplay.value); return ImagePaint( id: widget.id, @@ -516,7 +527,7 @@ class _ImagePaintState extends State { bool isViewOriginal() => c.viewStyle.style == kRemoteViewStyleOriginal; - if (c.imageOverflow.isTrue && c.scrollStyle != ScrollStyle.scrollauto) { + if (c.imageOverflow.isTrue && c.scrollStyle == ScrollStyle.scrollbar) { final paintWidth = c.getDisplayWidth() * s; final paintHeight = c.getDisplayHeight() * s; final paintSize = Size(paintWidth, paintHeight); diff --git a/flutter/lib/desktop/pages/view_camera_tab_page.dart b/flutter/lib/desktop/pages/view_camera_tab_page.dart index 36fa623ff..4510949fa 100644 --- a/flutter/lib/desktop/pages/view_camera_tab_page.dart +++ b/flutter/lib/desktop/pages/view_camera_tab_page.dart @@ -6,7 +6,6 @@ import 'package:desktop_multi_window/desktop_multi_window.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hbb/common.dart'; import 'package:flutter_hbb/common/shared_state.dart'; -import 'package:flutter_hbb/common/widgets/dialog.dart'; import 'package:flutter_hbb/consts.dart'; import 'package:flutter_hbb/models/input_model.dart'; import 'package:flutter_hbb/models/state_model.dart'; @@ -80,15 +79,7 @@ class _ViewCameraTabPageState extends State { label: peerId!, selectedIcon: selectedIcon, unselectedIcon: unselectedIcon, - onTabCloseButton: () async { - if (await desktopTryShowTabAuditDialogCloseCancelled( - id: peerId!, - tabController: tabController, - )) { - return; - } - tabController.closeBy(peerId!); - }, + onTabCloseButton: () => tabController.closeBy(peerId), page: ViewCameraPage( key: ValueKey(peerId), id: peerId!, @@ -154,8 +145,16 @@ class _ViewCameraTabPageState extends State { connectionType.secure.value == ConnectionType.strSecure; bool direct = connectionType.direct.value == ConnectionType.strDirect; - String msgConn = getConnectionText( - secure, direct, connectionType.stream_type.value); + String msgConn; + if (secure && direct) { + msgConn = translate("Direct and encrypted connection"); + } else if (secure && !direct) { + msgConn = translate("Relayed and encrypted connection"); + } else if (!secure && direct) { + msgConn = translate("Direct and unencrypted connection"); + } else { + msgConn = translate("Relayed and unencrypted connection"); + } var msgFingerprint = '${translate('Fingerprint')}:\n'; var fingerprint = FingerprintState.find(key).value; if (fingerprint.isEmpty) { @@ -250,11 +249,11 @@ class _ViewCameraTabPageState extends State { MenuEntryButton( childBuilder: (TextStyle? style) => Obx(() => Text( translate( - toolbarState.hide.isTrue ? 'Show Toolbar' : 'Hide Toolbar'), + toolbarState.show.isTrue ? 'Hide Toolbar' : 'Show Toolbar'), style: style, )), proc: () { - toolbarState.switchHide(sessionId); + toolbarState.switchShow(sessionId); cancelFunc(); }, padding: padding, @@ -296,13 +295,7 @@ class _ViewCameraTabPageState extends State { translate('Close'), style: style, ), - proc: () async { - if (await desktopTryShowTabAuditDialogCloseCancelled( - id: key, - tabController: tabController, - )) { - return; - } + proc: () { tabController.closeBy(key); cancelFunc(); }, @@ -355,14 +348,6 @@ class _ViewCameraTabPageState extends State { Future handleWindowCloseButton() async { final connLength = tabController.length; - if (connLength == 1) { - if (await desktopTryShowTabAuditDialogCloseCancelled( - id: tabController.state.value.tabs[0].key, - tabController: tabController, - )) { - return false; - } - } if (connLength <= 1) { tabController.clear(); return true; @@ -416,15 +401,7 @@ class _ViewCameraTabPageState extends State { label: id, selectedIcon: selectedIcon, unselectedIcon: unselectedIcon, - onTabCloseButton: () async { - if (await desktopTryShowTabAuditDialogCloseCancelled( - id: id, - tabController: tabController, - )) { - return; - } - tabController.closeBy(id); - }, + onTabCloseButton: () => tabController.closeBy(id), page: ViewCameraPage( key: ValueKey(id), id: id, diff --git a/flutter/lib/desktop/widgets/remote_toolbar.dart b/flutter/lib/desktop/widgets/remote_toolbar.dart index 44a2dc1c7..f29908d51 100644 --- a/flutter/lib/desktop/widgets/remote_toolbar.dart +++ b/flutter/lib/desktop/widgets/remote_toolbar.dart @@ -25,232 +25,12 @@ import '../../models/platform_model.dart'; import '../../common/shared_state.dart'; import './popup_menu.dart'; import './kb_layout_type_chooser.dart'; -import 'package:flutter_hbb/utils/scale.dart'; -import 'package:flutter_hbb/common/widgets/custom_scale_base.dart'; - -enum _ToolbarEdge { top, right, bottom, left } - -_ToolbarEdge _parseToolbarEdge(String? s) { - switch (s) { - case 'right': - return _ToolbarEdge.right; - case 'bottom': - return _ToolbarEdge.bottom; - case 'left': - return _ToolbarEdge.left; - default: - return _ToolbarEdge.top; - } -} - -String _toolbarEdgeToString(_ToolbarEdge e) { - switch (e) { - case _ToolbarEdge.top: - return 'top'; - case _ToolbarEdge.right: - return 'right'; - case _ToolbarEdge.bottom: - return 'bottom'; - case _ToolbarEdge.left: - return 'left'; - } -} - -bool _isHorizontalEdge(_ToolbarEdge e) => - e == _ToolbarEdge.top || e == _ToolbarEdge.bottom; - -const _legacyRemoteMenubarDragX = 'remote-menubar-drag-x'; - -double _clampToolbarFraction(double fraction, double left, double right) { - if (fraction < left) fraction = left; - if (fraction > right) fraction = right; - return fraction; -} - -Size _toolbarSizeForEdge(_ToolbarEdge edge, Size? measured) { - final isHorizontal = _isHorizontalEdge(edge); - final fallback = isHorizontal ? const Size(360, 40) : const Size(40, 360); - final size = measured ?? fallback; - final long = size.longestSide; - final short = size.shortestSide; - return Size(isHorizontal ? long : short, isHorizontal ? short : long); -} - -Offset _toolbarOffsetForEdge({ - required _ToolbarEdge edge, - required double fraction, - required Size parentSize, - required Size toolbarSize, -}) { - final xTravel = parentSize.width - toolbarSize.width; - final yTravel = parentSize.height - toolbarSize.height; - switch (edge) { - case _ToolbarEdge.top: - return Offset(xTravel * fraction, 0); - case _ToolbarEdge.bottom: - return Offset(xTravel * fraction, yTravel); - case _ToolbarEdge.left: - return Offset(0, yTravel * fraction); - case _ToolbarEdge.right: - return Offset(xTravel, yTravel * fraction); - } -} - -double _fractionForAlignedDrag({ - required double cursor, - required double grabOffset, - required double parentExtent, - required double toolbarExtent, - required double left, - required double right, -}) { - final travelExtent = parentExtent - toolbarExtent; - if (travelExtent <= 0) { - return _clampToolbarFraction(0.5, left, right); - } - return _clampToolbarFraction( - (cursor - grabOffset) / travelExtent, left, right); -} - -({double left, double right}) _fractionBoundsForEdge( - _ToolbarEdge edge, - double left, - double right, -) { - return _isHorizontalEdge(edge) - ? (left: left, right: right) - : (left: 0, right: 1); -} - -String _toolbarRawFraction({ - required bool multiEdgeEnabled, - required _ToolbarEdge edge, - required String? savedFraction, - required String? legacyFraction, -}) { - if (!multiEdgeEnabled) { - return (legacyFraction != null && legacyFraction.isNotEmpty) - ? legacyFraction - : '0.5'; - } - if (savedFraction != null && savedFraction.isNotEmpty) { - return savedFraction; - } - if (edge == _ToolbarEdge.top && - legacyFraction != null && - legacyFraction.isNotEmpty) { - return legacyFraction; - } - return '0.5'; -} - -// Returns the alignment for the wrapper Align that positions the entire -// toolbar against the given edge at the given fraction along that edge. -// Alignment uses [-1, 1] coordinates (0 = center). -Alignment _alignmentForEdge(_ToolbarEdge edge, double fraction) { - final f = fraction * 2 - 1; - switch (edge) { - case _ToolbarEdge.top: - return Alignment(f, -1); - case _ToolbarEdge.bottom: - return Alignment(f, 1); - case _ToolbarEdge.left: - return Alignment(-1, f); - case _ToolbarEdge.right: - return Alignment(1, f); - } -} - -// The drag handle hangs off the side of the toolbar facing away from the -// docked edge, so the icons themselves sit flush against that edge. -BorderRadius _collapseHandleBorderRadius(_ToolbarEdge edge) { - const r = Radius.circular(5); - switch (edge) { - case _ToolbarEdge.top: - return const BorderRadius.vertical(bottom: r); - case _ToolbarEdge.bottom: - return const BorderRadius.vertical(top: r); - case _ToolbarEdge.left: - return const BorderRadius.horizontal(right: r); - case _ToolbarEdge.right: - return const BorderRadius.horizontal(left: r); - } -} - -int _monitorMenuQuarterTurns(_ToolbarEdge edge) { - switch (edge) { - case _ToolbarEdge.left: - return 1; - case _ToolbarEdge.right: - return 3; - case _ToolbarEdge.top: - case _ToolbarEdge.bottom: - return 0; - } -} - -IconData _toolbarCollapseIcon(_ToolbarEdge edge, bool isCollapsed) { - switch (edge) { - case _ToolbarEdge.top: - return isCollapsed ? Icons.expand_more : Icons.expand_less; - case _ToolbarEdge.bottom: - return isCollapsed ? Icons.expand_less : Icons.expand_more; - case _ToolbarEdge.left: - return isCollapsed ? Icons.chevron_right : Icons.chevron_left; - case _ToolbarEdge.right: - return isCollapsed ? Icons.chevron_left : Icons.chevron_right; - } -} - -class _ToolbarDockingOptions { - _ToolbarDockingOptions({ - required this.edge, - required this.fraction, - required this.multiEdgeEnabled, - }); - - _ToolbarEdge edge; - double fraction; - bool multiEdgeEnabled; -} - -final _toolbarDockingOptionsBySession = {}; - -String _toolbarDockingCacheKey(SessionID sessionId) => sessionId.toString(); - -_ToolbarDockingOptions? _cachedToolbarDockingOptions(SessionID sessionId) => - _toolbarDockingOptionsBySession[_toolbarDockingCacheKey(sessionId)]; - -void _cacheToolbarDockingOptions({ - required SessionID sessionId, - required _ToolbarEdge edge, - required double fraction, - required bool multiEdgeEnabled, -}) { - final key = _toolbarDockingCacheKey(sessionId); - final cached = _toolbarDockingOptionsBySession[key]; - if (cached == null) { - _toolbarDockingOptionsBySession[key] = _ToolbarDockingOptions( - edge: edge, - fraction: fraction, - multiEdgeEnabled: multiEdgeEnabled, - ); - return; - } - cached.edge = edge; - cached.fraction = fraction; - cached.multiEdgeEnabled = multiEdgeEnabled; -} class ToolbarState { late RxBool _pin; - RxBool collapse = false.obs; - RxBool hide = false.obs; - - // Track initialization state to prevent flickering - final RxBool initialized = false.obs; - bool _isInitializing = false; + bool isShowInited = false; + RxBool show = false.obs; ToolbarState() { _pin = RxBool(false); @@ -271,39 +51,19 @@ class ToolbarState { bool get pin => _pin.value; - /// Initialize all toolbar states from session options. - /// This should be called once when the toolbar is first created. - Future init(SessionID sessionId) async { - if (initialized.value || _isInitializing) return; - _isInitializing = true; - - try { - // Load both states in parallel for better performance - final results = await Future.wait([ - bind.sessionGetToggleOption( - sessionId: sessionId, arg: kOptionCollapseToolbar), - bind.sessionGetToggleOption( - sessionId: sessionId, arg: kOptionHideToolbar), - ]); - - collapse.value = results[0] ?? false; - hide.value = results[1] ?? false; - } finally { - _isInitializing = false; - initialized.value = true; - } - } - - switchCollapse(SessionID sessionId) async { + switchShow(SessionID sessionId) async { bind.sessionToggleOption( sessionId: sessionId, value: kOptionCollapseToolbar); - collapse.value = !collapse.value; + show.value = !show.value; } - // Switch hide state for entire toolbar visibility - switchHide(SessionID sessionId) async { - bind.sessionToggleOption(sessionId: sessionId, value: kOptionHideToolbar); - hide.value = !hide.value; + initShow(SessionID sessionId) async { + if (!isShowInited) { + show.value = !(await bind.sessionGetToggleOption( + sessionId: sessionId, arg: kOptionCollapseToolbar) ?? + false); + isShowInited = true; + } } switchPin() async { @@ -392,6 +152,129 @@ class _ToolbarTheme { typedef DismissFunc = void Function(); class RemoteMenuEntry { + static MenuEntryRadios viewStyle( + String remoteId, + FFI ffi, + EdgeInsets padding, { + DismissFunc? dismissFunc, + DismissCallback? dismissCallback, + RxString? rxViewStyle, + }) { + return MenuEntryRadios( + text: translate('Ratio'), + optionsGetter: () => [ + MenuEntryRadioOption( + text: translate('Scale original'), + value: kRemoteViewStyleOriginal, + dismissOnClicked: true, + dismissCallback: dismissCallback, + ), + MenuEntryRadioOption( + text: translate('Scale adaptive'), + value: kRemoteViewStyleAdaptive, + dismissOnClicked: true, + dismissCallback: dismissCallback, + ), + ], + curOptionGetter: () async { + // null means peer id is not found, which there's no need to care about + final viewStyle = + await bind.sessionGetViewStyle(sessionId: ffi.sessionId) ?? ''; + if (rxViewStyle != null) { + rxViewStyle.value = viewStyle; + } + return viewStyle; + }, + optionSetter: (String oldValue, String newValue) async { + await bind.sessionSetViewStyle( + sessionId: ffi.sessionId, value: newValue); + if (rxViewStyle != null) { + rxViewStyle.value = newValue; + } + ffi.canvasModel.updateViewStyle(); + if (dismissFunc != null) { + dismissFunc(); + } + }, + padding: padding, + dismissOnClicked: true, + dismissCallback: dismissCallback, + ); + } + + static MenuEntrySwitch2 showRemoteCursor( + String remoteId, + SessionID sessionId, + EdgeInsets padding, { + DismissFunc? dismissFunc, + DismissCallback? dismissCallback, + }) { + final state = ShowRemoteCursorState.find(remoteId); + final optKey = 'show-remote-cursor'; + return MenuEntrySwitch2( + switchType: SwitchType.scheckbox, + text: translate('Show remote cursor'), + getter: () { + return state; + }, + setter: (bool v) async { + await bind.sessionToggleOption(sessionId: sessionId, value: optKey); + state.value = + bind.sessionGetToggleOptionSync(sessionId: sessionId, arg: optKey); + if (dismissFunc != null) { + dismissFunc(); + } + }, + padding: padding, + dismissOnClicked: true, + dismissCallback: dismissCallback, + ); + } + + static MenuEntrySwitch disableClipboard( + SessionID sessionId, + EdgeInsets? padding, { + DismissFunc? dismissFunc, + DismissCallback? dismissCallback, + }) { + return createSwitchMenuEntry( + sessionId, + 'Disable clipboard', + 'disable-clipboard', + padding, + true, + dismissCallback: dismissCallback, + ); + } + + static MenuEntrySwitch createSwitchMenuEntry( + SessionID sessionId, + String text, + String option, + EdgeInsets? padding, + bool dismissOnClicked, { + DismissFunc? dismissFunc, + DismissCallback? dismissCallback, + }) { + return MenuEntrySwitch( + switchType: SwitchType.scheckbox, + text: translate(text), + getter: () async { + return bind.sessionGetToggleOptionSync( + sessionId: sessionId, arg: option); + }, + setter: (bool v) async { + await bind.sessionToggleOption(sessionId: sessionId, value: option); + if (dismissFunc != null) { + dismissFunc(); + } + }, + padding: padding, + dismissOnClicked: dismissOnClicked, + dismissCallback: dismissCallback, + ); + } + static MenuEntryButton insertLock( SessionID sessionId, EdgeInsets? padding, { @@ -464,26 +347,8 @@ class RemoteToolbar extends StatefulWidget { class _RemoteToolbarState extends State { late Debouncer _debouncerHide; bool _isCursorOverImage = false; - final _fraction = 0.5.obs; - final _edge = _ToolbarEdge.top.obs; + final _fractionX = 0.5.obs; final _dragging = false.obs; - // Live drag preview: where the toolbar would dock if the user dropped now. - final _previewEdge = Rxn<_ToolbarEdge>(); - final _previewFraction = Rxn(); - // Measured size of the live toolbar, so the preview ghost matches reality - // (collapsed handle vs expanded toolbar). Updated after every layout pass. - final _toolbarSize = Rxn(); - final _toolbarKey = GlobalKey(debugLabel: 'remote_toolbar_root'); - // When false (default), the toolbar stays on the top edge and the drag - // handle just slides it horizontally — preserving long-standing UX while - // still fixing the bug where dragging only moved the handle. When true, - // the user has opted into multi-edge docking with nearest-edge snap. - // Kept in sync after settings-triggered rebuilds. - final _multiEdgeEnabled = false.obs; - final _dockingOptionsInitialized = false.obs; - bool _pendingDockingOptionSync = false; - int _dockingOptionSyncSerial = 0; - int _dragEpoch = 0; int get windowId => stateGlobal.windowId; @@ -493,8 +358,7 @@ class _RemoteToolbarState extends State { // setState(() {}); } - RxBool get collapse => widget.state.collapse; - RxBool get hide => widget.state.hide; + RxBool get show => widget.state.show; bool get pin => widget.state.pin; PeerInfo get pi => widget.ffi.ffiModel.pi; @@ -505,146 +369,16 @@ class _RemoteToolbarState extends State { void _minimize() async => await WindowController.fromWindowId(windowId).minimize(); - Future _syncDockingOptions({required bool force}) async { - final syncSerial = ++_dockingOptionSyncSerial; - if (_dragging.isTrue) { - _deferDockingOptionsSync(); - return; - } - final dragEpoch = _dragEpoch; - - // Use the canonical helper so the option's documented default semantics - // apply (allow-* prefix => default false). Keeping it raw-string would - // diverge from how _OptionCheckBox displays the same key. - final multiEdgeEnabled = - mainGetLocalBoolOptionSync(kOptionAllowMultiEdgeToolbarDock); - final cached = _cachedToolbarDockingOptions(widget.ffi.sessionId); - if (cached == null && pi.isSet.isFalse) { - return; - } - final hadDockingOptions = cached != null; - final wasMultiEdgeEnabled = - cached?.multiEdgeEnabled ?? _multiEdgeEnabled.value; - if (!force && - hadDockingOptions && - wasMultiEdgeEnabled == multiEdgeEnabled) { - _pendingDockingOptionSync = false; - return; - } - - final savedFraction = await bind.sessionGetOption( - sessionId: widget.ffi.sessionId, arg: kOptionRemoteMenubarFraction); - // Backward compat: legacy horizontal-only position. - final legacyFraction = await bind.sessionGetOption( - sessionId: widget.ffi.sessionId, arg: _legacyRemoteMenubarDragX); - if (!mounted || syncSerial != _dockingOptionSyncSerial) return; - - var nextEdge = _edge.value; - var savedFractionForNextEdge = savedFraction; - var keepCurrentPosition = false; - if (!multiEdgeEnabled) { - nextEdge = _ToolbarEdge.top; - } else if (force || wasMultiEdgeEnabled || cached == null) { - final edgeStr = await bind.sessionGetOption( - sessionId: widget.ffi.sessionId, arg: kOptionRemoteMenubarEdge); - if (!mounted || syncSerial != _dockingOptionSyncSerial) return; - nextEdge = _parseToolbarEdge(edgeStr); - } else { - // The setting changed from top-only to multi-edge while this toolbar is - // already visible. Keep its current position instead of jumping to the - // last saved multi-edge dock. - nextEdge = cached.edge; - savedFractionForNextEdge = cached.fraction.toString(); - keepCurrentPosition = true; - } - - final rawFraction = _toolbarRawFraction( - multiEdgeEnabled: multiEdgeEnabled, - edge: nextEdge, - savedFraction: savedFractionForNextEdge, - legacyFraction: legacyFraction, - ); - // Clamp to the saved drag-bound contract so a corrupted or out-of-range - // saved value can't bypass it until the user drags again. - final dragLeft = double.tryParse( - bind.mainGetLocalOption(key: kOptionRemoteMenubarDragLeft)) ?? - 0.0; - final dragRight = double.tryParse( - bind.mainGetLocalOption(key: kOptionRemoteMenubarDragRight)) ?? - 1.0; - final fractionBounds = - _fractionBoundsForEdge(nextEdge, dragLeft, dragRight); - final nextFraction = (double.tryParse(rawFraction) ?? 0.5) - .clamp(fractionBounds.left, fractionBounds.right) - .toDouble(); - if (!mounted || syncSerial != _dockingOptionSyncSerial) return; - if (_dragging.isTrue || dragEpoch != _dragEpoch) { - _deferDockingOptionsSync(); - return; - } - _edge.value = nextEdge; - _fraction.value = nextFraction; - _multiEdgeEnabled.value = multiEdgeEnabled; - _dockingOptionsInitialized.value = true; - _cacheToolbarDockingOptions( - sessionId: widget.ffi.sessionId, - edge: nextEdge, - fraction: nextFraction, - multiEdgeEnabled: multiEdgeEnabled, - ); - _pendingDockingOptionSync = false; - if (!multiEdgeEnabled || keepCurrentPosition) { - bind.sessionPeerOption( - sessionId: widget.ffi.sessionId, - name: kOptionRemoteMenubarEdge, - value: _toolbarEdgeToString(nextEdge), - ); - bind.sessionPeerOption( - sessionId: widget.ffi.sessionId, - name: kOptionRemoteMenubarFraction, - value: nextFraction.toString(), - ); - } - } - - void _deferDockingOptionsSync() { - _pendingDockingOptionSync = true; - if (_dragging.isFalse) { - _syncDockingOptionsAfterDragIfNeeded(); - } - } - - void _markToolbarDragEpoch() { - ++_dragEpoch; - } - - void _syncDockingOptionsAfterDragIfNeeded() { - if (!_pendingDockingOptionSync) return; - WidgetsBinding.instance.addPostFrameCallback((_) async { - await _syncDockingOptions(force: false); - }); - } - @override initState() { super.initState(); - final cached = _cachedToolbarDockingOptions(widget.ffi.sessionId); - final multiEdgeEnabled = - mainGetLocalBoolOptionSync(kOptionAllowMultiEdgeToolbarDock); - final shouldResetToTop = - cached != null && cached.multiEdgeEnabled && !multiEdgeEnabled; - if (cached != null && !shouldResetToTop) { - _edge.value = cached.edge; - _fraction.value = cached.fraction; - _multiEdgeEnabled.value = multiEdgeEnabled; - _dockingOptionsInitialized.value = true; - } - WidgetsBinding.instance.addPostFrameCallback((_) async { - await _syncDockingOptions(force: cached == null || shouldResetToTop); - // Initialize toolbar states (collapse, hide) from session options - widget.state.init(widget.ffi.sessionId); + _fractionX.value = double.tryParse(await bind.sessionGetOption( + sessionId: widget.ffi.sessionId, + arg: 'remote-menubar-drag-x') ?? + '0.5') ?? + 0.5; }); _debouncerHide = Debouncer( @@ -663,146 +397,62 @@ class _RemoteToolbarState extends State { }); } - @override - void didUpdateWidget(covariant RemoteToolbar oldWidget) { - super.didUpdateWidget(oldWidget); - WidgetsBinding.instance.addPostFrameCallback((_) async { - await _syncDockingOptions(force: false); - }); - } - _debouncerHideProc(int v) { - if (!pin && collapse.isFalse && _isCursorOverImage && _dragging.isFalse) { - collapse.value = true; + if (!pin && show.isTrue && _isCursorOverImage && _dragging.isFalse) { + show.value = false; } } @override dispose() { - ++_dockingOptionSyncSerial; - widget.onEnterOrLeaveImageCleaner(identityHashCode(this)); super.dispose(); + + widget.onEnterOrLeaveImageCleaner(identityHashCode(this)); } @override Widget build(BuildContext context) { - return Obx(() { - // Wait for initialization to complete to prevent flickering - if (!widget.state.initialized.value || - !_dockingOptionsInitialized.value) { - return const SizedBox.shrink(); - } - // If toolbar is hidden, return empty widget - if (hide.value) { - return const SizedBox.shrink(); - } - final edge = _edge.value; - final isHorizontal = _isHorizontalEdge(edge); - - // Measure the live toolbar after every layout so the preview ghost can - // match its actual footprint (collapsed handle vs expanded toolbar). - WidgetsBinding.instance.addPostFrameCallback((_) { - if (_dragging.isTrue) return; - final ro = _toolbarKey.currentContext?.findRenderObject(); - if (ro is RenderBox && ro.hasSize) { - final s = ro.size; - if (_toolbarSize.value != s) _toolbarSize.value = s; - } - }); - - final toolbar = Align( - alignment: _alignmentForEdge(edge, _fraction.value), - child: KeyedSubtree( - key: _toolbarKey, - child: collapse.isFalse - ? _buildToolbar(context, edge, isHorizontal) - : _buildDraggableCollapse(context, edge, isHorizontal), - ), - ); - - // Always return the Stack — even when not dragging — so the toolbar's - // position in the Element tree stays stable. Wrapping/unwrapping it - // mid-drag was killing the Draggable's gesture state. - return Stack( - fit: StackFit.expand, - children: [ - IgnorePointer( - child: Obx(() { - final pe = _previewEdge.value; - final pf = _previewFraction.value; - if (!_dragging.isTrue || pe == null || pf == null) { - return const SizedBox.shrink(); - } - return _buildDragPreview(context, pe, pf, _toolbarSize.value); - }), - ), - toolbar, - ], - ); - }); - } - - Widget _buildDragPreview(BuildContext context, _ToolbarEdge edge, - double fraction, Size? measured) { - final color = Theme.of(context).colorScheme.primary; - // Use the measured live toolbar size so collapsed vs expanded looks - // right. The current orientation may differ from the preview orientation - // (e.g. dragging a top-docked toolbar toward the left edge), so swap the - // long/short axes when previewing a different orientation. - final previewSize = _toolbarSizeForEdge(edge, measured); return Align( - alignment: _alignmentForEdge(edge, fraction), - child: Container( - width: previewSize.width, - height: previewSize.height, - decoration: BoxDecoration( - color: color.withOpacity(0.10), - borderRadius: BorderRadius.circular(6), - border: Border.all(color: color.withOpacity(0.55), width: 1.5), - ), - ), + alignment: Alignment.topCenter, + child: Obx(() => show.value + ? _buildToolbar(context) + : _buildDraggableShowHide(context)), ); } - Widget _buildDraggableCollapse( - BuildContext context, _ToolbarEdge edge, bool isHorizontal) { + Widget _buildDraggableShowHide(BuildContext context) { return Obx(() { - if (collapse.isFalse && _dragging.isFalse) { + if (show.isTrue && _dragging.isFalse) { triggerAutoHide(); } - final borderRadius = _collapseHandleBorderRadius(edge); - return Offstage( - offstage: _dragging.isTrue, - child: Material( - elevation: _ToolbarTheme.elevation, - shadowColor: MyTheme.color(context).shadow, - borderRadius: borderRadius, - child: _DraggableShowHide( - id: widget.id, - sessionId: widget.ffi.sessionId, - dragging: _dragging, - fraction: _fraction, - edge: _edge, - previewEdge: _previewEdge, - previewFraction: _previewFraction, - toolbarSize: _toolbarSize, - markDragEpoch: _markToolbarDragEpoch, - syncDockingOptionsAfterDragIfNeeded: - _syncDockingOptionsAfterDragIfNeeded, - isHorizontal: isHorizontal, - multiEdgeEnabled: _multiEdgeEnabled.value, - toolbarState: widget.state, - setFullscreen: _setFullscreen, - setMinimize: _minimize, + final borderRadius = BorderRadius.vertical( + bottom: Radius.circular(5), + ); + return Align( + alignment: FractionalOffset(_fractionX.value, 0), + child: Offstage( + offstage: _dragging.isTrue, + child: Material( + elevation: _ToolbarTheme.elevation, + shadowColor: MyTheme.color(context).shadow, borderRadius: borderRadius, + child: _DraggableShowHide( + id: widget.id, + sessionId: widget.ffi.sessionId, + dragging: _dragging, + fractionX: _fractionX, + toolbarState: widget.state, + setFullscreen: _setFullscreen, + setMinimize: _minimize, + borderRadius: borderRadius, + ), ), ), ); }); } - Widget _buildToolbar( - BuildContext context, _ToolbarEdge edge, bool isHorizontal) { + Widget _buildToolbar(BuildContext context) { final List toolbarItems = []; toolbarItems.add(_PinMenu(state: widget.state)); if (!isWebDesktop) { @@ -810,13 +460,11 @@ class _RemoteToolbarState extends State { } toolbarItems.add(Obx(() { - if ((PrivacyModeState.find(widget.id).isEmpty || - allowDisplaySwitchInPrivacyMode(pi)) && + if (PrivacyModeState.find(widget.id).isEmpty && pi.displaysCount.value > 1) { return _MonitorMenu( id: widget.id, ffi: widget.ffi, - edge: edge, setRemoteState: widget.setRemoteState); } else { return Offstage(); @@ -842,53 +490,37 @@ class _RemoteToolbarState extends State { if (!isWeb) toolbarItems.add(_RecordMenu()); toolbarItems.add(_CloseMenu(id: widget.id, ffi: widget.ffi)); final toolbarBorderRadius = BorderRadius.all(Radius.circular(4.0)); - // innerAxis: how the toolbar icons themselves flow. - // outerAxis: how the toolbar block and the handle stack against each other - // (perpendicular to the dock edge, so the handle hangs off the interior face). - final innerAxis = isHorizontal ? Axis.horizontal : Axis.vertical; - final outerAxis = isHorizontal ? Axis.vertical : Axis.horizontal; - final spacer = isHorizontal - ? SizedBox(width: _ToolbarTheme.buttonHMargin * 2) - : SizedBox(height: _ToolbarTheme.buttonHMargin * 2); - final toolbarMaterial = Material( - elevation: _ToolbarTheme.elevation, - shadowColor: MyTheme.color(context).shadow, - borderRadius: toolbarBorderRadius, - color: Theme.of(context) - .menuBarTheme - .style - ?.backgroundColor - ?.resolve(MaterialState.values.toSet()), - child: SingleChildScrollView( - scrollDirection: innerAxis, - child: Theme( - data: themeData(), - child: _ToolbarTheme.borderWrapper( - context, - Flex( - direction: innerAxis, - mainAxisSize: MainAxisSize.min, - children: [ - spacer, - ...toolbarItems, - spacer, - ], - ), - toolbarBorderRadius), - ), - ), - ); - final handle = _buildDraggableCollapse(context, edge, isHorizontal); - // The handle hangs off the interior face of the toolbar (away from the - // docked edge), centered along that face by the Flex's default cross-axis - // alignment, so the icons themselves sit flush against the docked edge. - final children = (edge == _ToolbarEdge.top || edge == _ToolbarEdge.left) - ? [toolbarMaterial, handle] - : [handle, toolbarMaterial]; - return Flex( - direction: outerAxis, + return Column( mainAxisSize: MainAxisSize.min, - children: children, + children: [ + Material( + elevation: _ToolbarTheme.elevation, + shadowColor: MyTheme.color(context).shadow, + borderRadius: toolbarBorderRadius, + color: Theme.of(context) + .menuBarTheme + .style + ?.backgroundColor + ?.resolve(MaterialState.values.toSet()), + child: SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: Theme( + data: themeData(), + child: _ToolbarTheme.borderWrapper( + context, + Row( + children: [ + SizedBox(width: _ToolbarTheme.buttonHMargin * 2), + ...toolbarItems, + SizedBox(width: _ToolbarTheme.buttonHMargin * 2) + ], + ), + toolbarBorderRadius), + ), + ), + ), + _buildDraggableShowHide(context), + ], ); } @@ -967,13 +599,11 @@ class _MobileActionMenu extends StatelessWidget { class _MonitorMenu extends StatelessWidget { final String id; final FFI ffi; - final _ToolbarEdge edge; final Function(VoidCallback) setRemoteState; const _MonitorMenu({ Key? key, required this.id, required this.ffi, - required this.edge, required this.setRemoteState, }) : super(key: key); @@ -984,17 +614,9 @@ class _MonitorMenu extends StatelessWidget { !isWeb && ffi.ffiModel.pi.isSupportMultiDisplay; @override - Widget build(BuildContext context) { - final child = showMonitorsToolbar - ? buildMultiMonitorMenu(context) - : Obx(() => buildMonitorMenu(context)); - final quarterTurns = _monitorMenuQuarterTurns(edge); - if (quarterTurns == 0) return child; - return RotatedBox( - quarterTurns: quarterTurns, - child: child, - ); - } + Widget build(BuildContext context) => showMonitorsToolbar + ? buildMultiMonitorMenu(context) + : Obx(() => buildMonitorMenu(context)); Widget buildMonitorMenu(BuildContext context) { final width = SimpleWrapper(0); @@ -1010,7 +632,7 @@ class _MonitorMenu extends StatelessWidget { menuStyle: MenuStyle( padding: MaterialStatePropertyAll(EdgeInsets.symmetric(horizontal: 6))), - menuChildrenGetter: (_) => [buildMonitorSubmenuWidget(context)]); + menuChildrenGetter: () => [buildMonitorSubmenuWidget(context)]); } Widget buildMultiMonitorMenu(BuildContext context) { @@ -1126,8 +748,7 @@ class _MonitorMenu extends StatelessWidget { } final scale = _ToolbarTheme.buttonSize / rect.height * 0.75; - final height = rect.height * scale; - final startY = (_ToolbarTheme.buttonSize - height) * 0.5; + final startY = (_ToolbarTheme.buttonSize - rect.height * scale) * 0.5; final startX = startY; final children = []; @@ -1170,7 +791,7 @@ class _MonitorMenu extends StatelessWidget { width.value = rect.width * scale + startX * 2; return SizedBox( width: width.value, - height: height + startY * 2, + height: rect.height * scale + startY * 2, child: Stack( children: children, ), @@ -1222,7 +843,7 @@ class _ControlMenu extends StatelessWidget { color: _ToolbarTheme.blueColor, hoverColor: _ToolbarTheme.hoverBlueColor, ffi: ffi, - menuChildrenGetter: (_) => toolbarControls(context, id, ffi).map((e) { + menuChildrenGetter: () => toolbarControls(context, id, ffi).map((e) { if (e.divider) { return Divider(); } else { @@ -1403,7 +1024,6 @@ class _DisplayMenu extends StatefulWidget { } class _DisplayMenuState extends State<_DisplayMenu> { - final RxInt _customPercent = 100.obs; late final ScreenAdjustor _screenAdjustor = ScreenAdjustor( id: widget.id, ffi: widget.ffi, @@ -1417,29 +1037,14 @@ class _DisplayMenuState extends State<_DisplayMenu> { FFI get ffi => widget.ffi; String get id => widget.id; - @override - void initState() { - super.initState(); - // Initialize custom percent from stored option once - WidgetsBinding.instance.addPostFrameCallback((_) async { - try { - final v = await getSessionCustomScalePercent(widget.ffi.sessionId); - if (_customPercent.value != v) { - _customPercent.value = v; - } - } catch (_) {} - }); - } - @override Widget build(BuildContext context) { - final colorScheme = Theme.of(context).colorScheme; _screenAdjustor.updateScreen(); - menuChildrenGetter(_IconSubmenuButtonState state) { + menuChildrenGetter() { final menuChildren = [ _screenAdjustor.adjustWindow(context), - viewStyle(customPercent: _customPercent), - scrollStyle(state, colorScheme), + viewStyle(), + scrollStyle(), imageQuality(), codec(), if (ffi.connType == ConnType.defaultConn) @@ -1459,10 +1064,10 @@ class _DisplayMenuState extends State<_DisplayMenu> { toggles(), ]; // privacy mode - final privacyModeState = PrivacyModeState.find(id); if (ffi.connType == ConnType.defaultConn && - (pi.features.privacyMode || privacyModeState.isNotEmpty) && - (ffiModel.keyboard || privacyModeState.isNotEmpty)) { + ffiModel.keyboard && + pi.features.privacyMode) { + final privacyModeState = PrivacyModeState.find(id); final privacyModeList = toolbarPrivacyMode(privacyModeState, context, id, ffi); if (privacyModeList.length == 1) { @@ -1503,146 +1108,62 @@ class _DisplayMenuState extends State<_DisplayMenu> { ); } - viewStyle({required RxInt customPercent}) { + viewStyle() { return futureBuilder( future: toolbarViewStyle(context, widget.id, widget.ffi), hasData: (data) { final v = data as List>; - final bool isCustomSelected = v.isNotEmpty - ? v.first.groupValue == kRemoteViewStyleCustom - : false; return Column(children: [ - ...v.map((e) { - final isCustom = e.value == kRemoteViewStyleCustom; - final child = - isCustom ? Text(translate('Scale custom')) : e.child; - // Whether the current selection is already custom - final bool isGroupCustomSelected = - e.groupValue == kRemoteViewStyleCustom; - // Keep menu open when switching INTO custom so the slider is visible immediately - final bool keepOpenForThisItem = - isCustom && !isGroupCustomSelected; - return RdoMenuButton( - value: e.value, - groupValue: e.groupValue, - onChanged: (value) { - // Perform the original change - e.onChanged?.call(value); - // Only force a rebuild when we keep the menu open to reveal the slider - if (keepOpenForThisItem) { - setState(() {}); - } - }, - child: child, - ffi: ffi, - // When entering custom, keep submenu open to show the slider controls - closeOnActivate: !keepOpenForThisItem); - }).toList(), - // Only show a divider when custom is NOT selected - if (!isCustomSelected) Divider(), - _customControlsIfCustomSelected( - onChanged: (v) => customPercent.value = v), + ...v + .map((e) => RdoMenuButton( + value: e.value, + groupValue: e.groupValue, + onChanged: e.onChanged, + child: e.child, + ffi: ffi)) + .toList(), + Divider(), ]); }); } - Widget _customControlsIfCustomSelected({ValueChanged? onChanged}) { - return futureBuilder(future: () async { - final current = await bind.sessionGetViewStyle(sessionId: ffi.sessionId); - return current == kRemoteViewStyleCustom; - }(), hasData: (data) { - final isCustom = data as bool; - return AnimatedSwitcher( - duration: Duration(milliseconds: 220), - switchInCurve: Curves.easeOut, - switchOutCurve: Curves.easeIn, - child: isCustom - ? _CustomScaleMenuControls(ffi: ffi, onChanged: onChanged) - : SizedBox.shrink(), - ); - }); - } - - scrollStyle(_IconSubmenuButtonState state, ColorScheme colorScheme) { + scrollStyle() { return futureBuilder(future: () async { final viewStyle = await bind.sessionGetViewStyle(sessionId: ffi.sessionId) ?? ''; - final visible = viewStyle == kRemoteViewStyleOriginal || - viewStyle == kRemoteViewStyleCustom; + final visible = viewStyle == kRemoteViewStyleOriginal; final scrollStyle = await bind.sessionGetScrollStyle(sessionId: ffi.sessionId) ?? ''; - final edgeScrollEdgeThickness = await bind - .sessionGetEdgeScrollEdgeThickness(sessionId: ffi.sessionId); - return { - 'visible': visible, - 'scrollStyle': scrollStyle, - 'edgeScrollEdgeThickness': edgeScrollEdgeThickness, - }; + return {'visible': visible, 'scrollStyle': scrollStyle}; }(), hasData: (data) { final visible = data['visible'] as bool; if (!visible) return Offstage(); final groupValue = data['scrollStyle'] as String; - final edgeScrollEdgeThickness = data['edgeScrollEdgeThickness'] as int; - - onChangeScrollStyle(String? value) async { + onChange(String? value) async { if (value == null) return; await bind.sessionSetScrollStyle( sessionId: ffi.sessionId, value: value); widget.ffi.canvasModel.updateScrollStyle(); - state.setState(() {}); } - onChangeEdgeScrollEdgeThickness(double? value) async { - if (value == null) return; - final newThickness = value.round(); - await bind.sessionSetEdgeScrollEdgeThickness( - sessionId: ffi.sessionId, value: newThickness); - widget.ffi.canvasModel.updateEdgeScrollEdgeThickness(newThickness); - state.setState(() {}); - } - - return Obx(() => Column(children: [ - RdoMenuButton( - child: Text(translate('ScrollAuto')), - value: kRemoteScrollStyleAuto, - groupValue: groupValue, - onChanged: widget.ffi.canvasModel.imageOverflow.value - ? (value) => onChangeScrollStyle(value) - : null, - closeOnActivate: groupValue != kRemoteScrollStyleEdge, - ffi: widget.ffi, - ), - RdoMenuButton( - child: Text(translate('Scrollbar')), - value: kRemoteScrollStyleBar, - groupValue: groupValue, - onChanged: widget.ffi.canvasModel.imageOverflow.value - ? (value) => onChangeScrollStyle(value) - : null, - closeOnActivate: groupValue != kRemoteScrollStyleEdge, - ffi: widget.ffi, - ), - if (!isWeb) ...[ - RdoMenuButton( - child: Text(translate('ScrollEdge')), - value: kRemoteScrollStyleEdge, - groupValue: groupValue, - closeOnActivate: false, - onChanged: widget.ffi.canvasModel.imageOverflow.value - ? (value) => onChangeScrollStyle(value) - : null, - ffi: widget.ffi, - ), - Offstage( - offstage: groupValue != kRemoteScrollStyleEdge, - child: EdgeThicknessControl( - value: edgeScrollEdgeThickness.toDouble(), - onChanged: onChangeEdgeScrollEdgeThickness, - colorScheme: colorScheme, - )), - ], - Divider(), - ])); + final enabled = widget.ffi.canvasModel.imageOverflow.value; + return Column(children: [ + RdoMenuButton( + child: Text(translate('ScrollAuto')), + value: kRemoteScrollStyleAuto, + groupValue: groupValue, + onChanged: enabled ? (value) => onChange(value) : null, + ffi: widget.ffi, + ), + RdoMenuButton( + child: Text(translate('Scrollbar')), + value: kRemoteScrollStyleBar, + groupValue: groupValue, + onChanged: enabled ? (value) => onChange(value) : null, + ffi: widget.ffi, + ), + Divider(), + ]); }); } @@ -1724,178 +1245,6 @@ class _DisplayMenuState extends State<_DisplayMenu> { } } -class _CustomScaleMenuControls extends StatefulWidget { - final FFI ffi; - final ValueChanged? onChanged; - const _CustomScaleMenuControls({Key? key, required this.ffi, this.onChanged}) - : super(key: key); - - @override - State<_CustomScaleMenuControls> createState() => - _CustomScaleMenuControlsState(); -} - -class _CustomScaleMenuControlsState - extends CustomScaleControls<_CustomScaleMenuControls> { - @override - FFI get ffi => widget.ffi; - - @override - ValueChanged? get onScaleChanged => widget.onChanged; - - @override - Widget build(BuildContext context) { - final colorScheme = Theme.of(context).colorScheme; - const smallBtnConstraints = BoxConstraints(minWidth: 28, minHeight: 28); - - final sliderControl = Semantics( - label: translate('Custom scale slider'), - value: '$scaleValue%', - child: SliderTheme( - data: SliderTheme.of(context).copyWith( - activeTrackColor: colorScheme.primary, - thumbColor: colorScheme.primary, - overlayColor: colorScheme.primary.withOpacity(0.1), - showValueIndicator: ShowValueIndicator.never, - thumbShape: _RectValueThumbShape( - min: CustomScaleControls.minPercent.toDouble(), - max: CustomScaleControls.maxPercent.toDouble(), - width: 52, - height: 24, - radius: 4, - displayValueForNormalized: (t) => mapPosToPercent(t), - ), - ), - child: Slider( - value: scalePos, - min: 0.0, - max: 1.0, - // Use a wide range of divisions (calculated as (CustomScaleControls.maxPercent - CustomScaleControls.minPercent)) to provide ~1% precision increments. - // This allows users to set precise scale values. Lower values would require more fine-tuning via the +/- buttons, which is undesirable for big ranges. - divisions: - (CustomScaleControls.maxPercent - CustomScaleControls.minPercent) - .round(), - onChanged: onSliderChanged, - ), - ), - ); - - return Column(children: [ - Padding( - padding: const EdgeInsets.symmetric(horizontal: 12.0), - child: Row(children: [ - Tooltip( - message: translate('Decrease'), - child: IconButton( - iconSize: 16, - padding: EdgeInsets.all(1), - constraints: smallBtnConstraints, - icon: const Icon(Icons.remove), - onPressed: () => nudgeScale(-1), - ), - ), - Expanded(child: sliderControl), - Tooltip( - message: translate('Increase'), - child: IconButton( - iconSize: 16, - padding: EdgeInsets.all(1), - constraints: smallBtnConstraints, - icon: const Icon(Icons.add), - onPressed: () => nudgeScale(1), - ), - ), - ]), - ), - Divider(), - ]); - } -} - -// Lightweight rectangular thumb that paints the current percentage. -// Stateless and uses only SliderTheme colors; avoids allocations beyond a TextPainter per frame. -class _RectValueThumbShape extends SliderComponentShape { - final double min; - final double max; - final double width; - final double height; - final double radius; - final String unit; - // Optional mapper to compute display value from normalized position [0,1] - // If null, falls back to linear interpolation between min and max. - final int Function(double normalized)? displayValueForNormalized; - - const _RectValueThumbShape({ - required this.min, - required this.max, - required this.width, - required this.height, - required this.radius, - this.displayValueForNormalized, - this.unit = '%', - }); - - @override - Size getPreferredSize(bool isEnabled, bool isDiscrete) { - return Size(width, height); - } - - @override - void paint( - PaintingContext context, - Offset center, { - required Animation activationAnimation, - required Animation enableAnimation, - required bool isDiscrete, - required TextPainter labelPainter, - required RenderBox parentBox, - required SliderThemeData sliderTheme, - required TextDirection textDirection, - required double value, - required double textScaleFactor, - required Size sizeWithOverflow, - }) { - final Canvas canvas = context.canvas; - - // Resolve color based on enabled/disabled animation, with safe fallbacks. - final ColorTween colorTween = ColorTween( - begin: sliderTheme.disabledThumbColor, - end: sliderTheme.thumbColor, - ); - final Color? evaluatedColor = colorTween.evaluate(enableAnimation); - final Color? thumbColor = sliderTheme.thumbColor; - final Color fillColor = evaluatedColor ?? thumbColor ?? Colors.blueAccent; - - final RRect rrect = RRect.fromRectAndRadius( - Rect.fromCenter(center: center, width: width, height: height), - Radius.circular(radius), - ); - final Paint paint = Paint()..color = fillColor; - canvas.drawRRect(rrect, paint); - - // Compute displayed value from normalized slider value. - final int displayValue = displayValueForNormalized != null - ? displayValueForNormalized!(value) - : (min + value * (max - min)).round(); - final TextSpan span = TextSpan( - text: '$displayValue$unit', - style: const TextStyle( - color: Colors.white, - fontSize: 12, - fontWeight: FontWeight.w600, - ), - ); - final TextPainter tp = TextPainter( - text: span, - textAlign: TextAlign.center, - textDirection: textDirection, - ); - tp.layout(maxWidth: width - 4); - tp.paint( - canvas, Offset(center.dx - tp.width / 2, center.dy - tp.height / 2)); - } -} - class _ResolutionsMenu extends StatefulWidget { final String id; final FFI ffi; @@ -2228,35 +1577,22 @@ class _KeyboardMenu extends StatelessWidget { Widget build(BuildContext context) { var ffiModel = Provider.of(context); if (!ffiModel.keyboard) return Offstage(); - toolbarToggles() { - final toggles = toolbarKeyboardToggles(ffi) - .map((e) => CkbMenuButton( - value: e.value, - onChanged: e.onChanged, - child: e.child, - ffi: ffi) as Widget) - .toList(); - if (toggles.isNotEmpty) { - toggles.add(Divider()); - } - return toggles; - } - + toolbarToggles() => toolbarKeyboardToggles(ffi) + .map((e) => CkbMenuButton( + value: e.value, onChanged: e.onChanged, child: e.child, ffi: ffi)) + .toList(); return _IconSubmenuButton( tooltip: 'Keyboard Settings', - svg: "assets/keyboard_mouse.svg", + svg: "assets/keyboard.svg", ffi: ffi, color: _ToolbarTheme.blueColor, hoverColor: _ToolbarTheme.hoverBlueColor, - menuChildrenGetter: (_) => [ + menuChildrenGetter: () => [ keyboardMode(), localKeyboardType(), inputSource(), Divider(), viewMode(), - if ([kPeerPlatformWindows, kPeerPlatformMacOS, kPeerPlatformLinux] - .contains(pi.platform)) - showMyCursor(), Divider(), ...toolbarToggles(), ...mouseSpeed(), @@ -2324,18 +1660,8 @@ class _KeyboardMenu extends StatelessWidget { continue; } - if (pi.isWayland) { - // Legacy mode is hidden on desktop control side because dead keys - // don't work properly on Wayland. When the control side is mobile, - // Legacy mode is used automatically (mobile always sends Legacy events). - if (mode.key == kKeyLegacyMode) { - continue; - } - // Translate mode requires server >= 1.4.6. - if (mode.key == kKeyTranslateMode && - versionCmp(pi.version, '1.4.6') < 0) { - continue; - } + if (pi.isWayland && mode.key != kKeyMapMode) { + continue; } var text = translate(mode.menu); @@ -2423,43 +1749,12 @@ class _KeyboardMenu extends StatelessWidget { final viewOnly = await bind.sessionGetToggleOption( sessionId: ffi.sessionId, arg: kOptionToggleViewOnly); ffiModel.setViewOnly(id, viewOnly ?? value); - final showMyCursor = await bind.sessionGetToggleOption( - sessionId: ffi.sessionId, arg: kOptionToggleShowMyCursor); - ffiModel.setShowMyCursor(showMyCursor ?? value); } : null, ffi: ffi, child: Text(translate('View Mode'))); } - showMyCursor() { - final ffiModel = ffi.ffiModel; - return CkbMenuButton( - value: ffiModel.showMyCursor, - onChanged: (value) async { - if (value == null) return; - await bind.sessionToggleOption( - sessionId: ffi.sessionId, value: kOptionToggleShowMyCursor); - final showMyCursor = await bind.sessionGetToggleOption( - sessionId: ffi.sessionId, - arg: kOptionToggleShowMyCursor) ?? - value; - ffiModel.setShowMyCursor(showMyCursor); - - // Also set view only if showMyCursor is enabled and viewOnly is not enabled. - if (showMyCursor && !ffiModel.viewOnly) { - await bind.sessionToggleOption( - sessionId: ffi.sessionId, value: kOptionToggleViewOnly); - final viewOnly = await bind.sessionGetToggleOption( - sessionId: ffi.sessionId, arg: kOptionToggleViewOnly); - ffiModel.setViewOnly(id, viewOnly ?? value); - } - }, - ffi: ffi, - child: Text(translate('Show my cursor'))) - .paddingOnly(left: 26.0); - } - mobileActions() { if (pi.platform != kPeerPlatformAndroid) return []; final enabled = versionCmp(pi.version, '1.2.7') >= 0; @@ -2523,7 +1818,7 @@ class _ChatMenuState extends State<_ChatMenu> { ffi: widget.ffi, color: _ToolbarTheme.blueColor, hoverColor: _ToolbarTheme.hoverBlueColor, - menuChildrenGetter: (_) => [textChat(), voiceCall()]); + menuChildrenGetter: () => [textChat(), voiceCall()]); } } @@ -2579,7 +1874,7 @@ class _VoiceCallMenu extends StatelessWidget { @override Widget build(BuildContext context) { - menuChildrenGetter(_IconSubmenuButtonState state) { + menuChildrenGetter() { final audioInput = AudioInput( builder: (devices, currentDevice, setDevice) { return Column( @@ -2685,12 +1980,7 @@ class _CloseMenu extends StatelessWidget { return _IconMenuButton( assetName: 'assets/close.svg', tooltip: 'Close', - onPressed: () async { - if (await showConnEndAuditDialogCloseCanceled(ffi: ffi)) { - return; - } - closeConnection(id: id); - }, + onPressed: () => closeConnection(id: id), color: _ToolbarTheme.redColor, hoverColor: _ToolbarTheme.hoverRedColor, ); @@ -2784,7 +2074,7 @@ class _IconSubmenuButton extends StatefulWidget { final Widget? icon; final Color color; final Color hoverColor; - final List Function(_IconSubmenuButtonState state) menuChildrenGetter; + final List Function() menuChildrenGetter; final MenuStyle? menuStyle; final FFI? ffi; final double? width; @@ -2809,11 +2099,6 @@ class _IconSubmenuButton extends StatefulWidget { class _IconSubmenuButtonState extends State<_IconSubmenuButton> { bool hover = false; - @override // discard @protected - void setState(VoidCallback fn) { - super.setState(fn); - } - @override Widget build(BuildContext context) { assert(widget.svg != null || widget.icon != null); @@ -2846,7 +2131,7 @@ class _IconSubmenuButtonState extends State<_IconSubmenuButton> { ), child: icon))), menuChildren: widget - .menuChildrenGetter(this) + .menuChildrenGetter() .map((e) => _buildPointerTrackWidget(e, widget.ffi)) .toList())); return MenuBar(children: [ @@ -2947,8 +2232,6 @@ class RdoMenuButton extends StatelessWidget { final ValueChanged? onChanged; final Widget? child; final FFI? ffi; - // When true, submenu will be dismissed on activate; when false, it stays open. - final bool closeOnActivate; const RdoMenuButton({ Key? key, required this.value, @@ -2956,7 +2239,6 @@ class RdoMenuButton extends StatelessWidget { required this.child, this.ffi, this.onChanged, - this.closeOnActivate = true, }) : super(key: key); @override @@ -2965,10 +2247,9 @@ class RdoMenuButton extends StatelessWidget { value: value, groupValue: groupValue, child: child, - closeOnActivate: closeOnActivate, onChanged: onChanged != null ? (T? value) { - if (ffi != null && closeOnActivate) { + if (ffi != null) { _menuDismissCallback(ffi!); } onChanged?.call(value); @@ -2981,18 +2262,7 @@ class RdoMenuButton extends StatelessWidget { class _DraggableShowHide extends StatefulWidget { final String id; final SessionID sessionId; - final RxDouble fraction; - final Rx<_ToolbarEdge> edge; - final Rxn<_ToolbarEdge> previewEdge; - final Rxn previewFraction; - final Rxn toolbarSize; - final VoidCallback markDragEpoch; - final VoidCallback syncDockingOptionsAfterDragIfNeeded; - final bool isHorizontal; - // Whether multi-edge docking is enabled for this session (toggled in - // Settings -> Other). When false, the drag handle slides the toolbar - // horizontally on the top edge and never switches edges. - final bool multiEdgeEnabled; + final RxDouble fractionX; final RxBool dragging; final ToolbarState toolbarState; final BorderRadius borderRadius; @@ -3004,15 +2274,7 @@ class _DraggableShowHide extends StatefulWidget { Key? key, required this.id, required this.sessionId, - required this.fraction, - required this.edge, - required this.previewEdge, - required this.previewFraction, - required this.toolbarSize, - required this.markDragEpoch, - required this.syncDockingOptionsAfterDragIfNeeded, - required this.isHorizontal, - required this.multiEdgeEnabled, + required this.fractionX, required this.dragging, required this.toolbarState, required this.setFullscreen, @@ -3025,14 +2287,12 @@ class _DraggableShowHide extends StatefulWidget { } class _DraggableShowHideState extends State<_DraggableShowHide> { + Offset position = Offset.zero; + Size size = Size.zero; double left = 0.0; double right = 1.0; - Offset? _lastPointerDown; - Offset? _dragGrabOffset; - double? _dragLongAxisGrabOffset; - Size? _dragToolbarSize; - RxBool get collapse => widget.toolbarState.collapse; + RxBool get show => widget.toolbarState.show; @override initState() { @@ -3056,174 +2316,41 @@ class _DraggableShowHideState extends State<_DraggableShowHide> { } } - // Bias applied to the currently-previewed edge so a drag hovering between - // two edges doesn't flicker. Only relevant when multi-edge is enabled. - static const double _switchHysteresisPx = 50.0; - - _ToolbarEdge _nearestToolbarEdge(Offset cursor, Size mediaSize) { - if (!widget.multiEdgeEnabled) return widget.edge.value; - - double rawDist(_ToolbarEdge e) { - switch (e) { - case _ToolbarEdge.top: - return cursor.dy; - case _ToolbarEdge.bottom: - return mediaSize.height - cursor.dy; - case _ToolbarEdge.left: - return cursor.dx; - case _ToolbarEdge.right: - return mediaSize.width - cursor.dx; - } - } - - final previewed = widget.previewEdge.value; - var winner = widget.edge.value; - var best = double.infinity; - for (final e in _ToolbarEdge.values) { - final biased = - e == previewed ? rawDist(e) - _switchHysteresisPx : rawDist(e); - if (biased < best) { - best = biased; - winner = e; - } - } - return winner; - } - - void _ensureDragGrabOffset(Offset cursor) { - if (_dragGrabOffset != null) return; - final mediaSize = MediaQueryData.fromView(View.of(context)).size; - final toolbarSize = - _toolbarSizeForEdge(widget.edge.value, widget.toolbarSize.value); - _dragToolbarSize = toolbarSize; - final toolbarOffset = _toolbarOffsetForEdge( - edge: widget.edge.value, - fraction: widget.fraction.value, - parentSize: mediaSize, - toolbarSize: toolbarSize, - ); - _dragGrabOffset = cursor - toolbarOffset; - _dragLongAxisGrabOffset = _isHorizontalEdge(widget.edge.value) - ? _dragGrabOffset?.dx - : _dragGrabOffset?.dy; - } - - double _dragGrabOffsetForEdge(_ToolbarEdge edge, Size toolbarSize) { - final offset = _dragLongAxisGrabOffset ?? 0; - final extent = - _isHorizontalEdge(edge) ? toolbarSize.width : toolbarSize.height; - return _clampToolbarFraction(offset, 0, extent); - } - - void _updatePreview(Offset cursor) { - _ensureDragGrabOffset(cursor); - final mediaSize = MediaQueryData.fromView(View.of(context)).size; - final winner = _nearestToolbarEdge(cursor, mediaSize); - widget.previewEdge.value = winner; - - final toolbarSize = _toolbarSizeForEdge(winner, _dragToolbarSize); - final grabOffset = _dragGrabOffsetForEdge(winner, toolbarSize); - final double frac; - if (winner == _ToolbarEdge.top || winner == _ToolbarEdge.bottom) { - frac = _fractionForAlignedDrag( - cursor: cursor.dx, - grabOffset: grabOffset, - parentExtent: mediaSize.width, - toolbarExtent: toolbarSize.width, - left: left, - right: right, - ); - } else { - final fractionBounds = _fractionBoundsForEdge(winner, left, right); - frac = _fractionForAlignedDrag( - cursor: cursor.dy, - grabOffset: grabOffset, - parentExtent: mediaSize.height, - toolbarExtent: toolbarSize.height, - left: fractionBounds.left, - right: fractionBounds.right, - ); - } - widget.previewFraction.value = frac; - } - - void _resetDragTracking() { - _lastPointerDown = null; - _dragGrabOffset = null; - _dragLongAxisGrabOffset = null; - _dragToolbarSize = null; - } - - void _commitPreview() { - final newEdge = widget.previewEdge.value; - final frac = widget.previewFraction.value; - widget.previewEdge.value = null; - widget.previewFraction.value = null; - widget.dragging.value = false; - widget.markDragEpoch(); - _resetDragTracking(); - widget.syncDockingOptionsAfterDragIfNeeded(); - if (newEdge == null || frac == null) return; - widget.edge.value = newEdge; - widget.fraction.value = frac; - _cacheToolbarDockingOptions( - sessionId: widget.sessionId, - edge: newEdge, - fraction: frac, - multiEdgeEnabled: widget.multiEdgeEnabled, - ); - bind.sessionPeerOption( - sessionId: widget.sessionId, - name: kOptionRemoteMenubarEdge, - value: _toolbarEdgeToString(newEdge), - ); - bind.sessionPeerOption( - sessionId: widget.sessionId, - name: kOptionRemoteMenubarFraction, - value: frac.toString(), - ); - if (widget.multiEdgeEnabled) { - return; - } - bind.sessionPeerOption( - sessionId: widget.sessionId, - name: _legacyRemoteMenubarDragX, - value: frac.toString(), - ); - } - Widget _buildDraggable(BuildContext context) { - return Listener( - onPointerDown: (event) => _lastPointerDown = event.position, - child: Draggable( - // When multi-edge docking is off the toolbar stays on the top edge, - // so lock the feedback to horizontal motion — otherwise the handle - // floats away from the top while dragging and the toolbar looks - // unmoored. When multi-edge is on we need 2D drag for snap-to-edge. - axis: widget.multiEdgeEnabled ? null : Axis.horizontal, - child: Icon( - widget.isHorizontal ? Icons.drag_indicator : Icons.drag_handle, - size: 20, - color: MyTheme.color(context).drag_indicator, - ), - feedback: widget, - onDragStarted: () { - widget.markDragEpoch(); - final pointerDown = _lastPointerDown; - if (pointerDown != null) { - _ensureDragGrabOffset(pointerDown); - } - widget.dragging.value = true; - // Seed the preview at the current docked edge/fraction so something - // shows the instant the drag begins, before the first onDragUpdate. - widget.previewEdge.value = widget.edge.value; - widget.previewFraction.value = widget.fraction.value; - }, - onDragUpdate: (details) { - _updatePreview(details.globalPosition); - }, - onDragEnd: (_) => _commitPreview(), + return Draggable( + axis: Axis.horizontal, + child: Icon( + Icons.drag_indicator, + size: 20, + color: MyTheme.color(context).drag_indicator, ), + feedback: widget, + onDragStarted: (() { + final RenderObject? renderObj = context.findRenderObject(); + if (renderObj != null) { + final RenderBox renderBox = renderObj as RenderBox; + size = renderBox.size; + position = renderBox.localToGlobal(Offset.zero); + } + widget.dragging.value = true; + }), + onDragEnd: (details) { + final mediaSize = MediaQueryData.fromView(View.of(context)).size; + widget.fractionX.value += + (details.offset.dx - position.dx) / (mediaSize.width - size.width); + if (widget.fractionX.value < left) { + widget.fractionX.value = left; + } + if (widget.fractionX.value > right) { + widget.fractionX.value = right; + } + bind.sessionPeerOption( + sessionId: widget.sessionId, + name: 'remote-menubar-drag-x', + value: widget.fractionX.value.toString(), + ); + widget.dragging.value = false; + }, ); } @@ -3253,9 +2380,7 @@ class _DraggableShowHideState extends State<_DraggableShowHide> { ); } - final axis = widget.isHorizontal ? Axis.horizontal : Axis.vertical; - final child = Flex( - direction: axis, + final child = Row( mainAxisSize: MainAxisSize.min, children: [ _buildDraggable(context), @@ -3290,20 +2415,20 @@ class _DraggableShowHideState extends State<_DraggableShowHide> { )), buttonWrapper( () => setState(() { - widget.toolbarState.switchCollapse(widget.sessionId); + widget.toolbarState.switchShow(widget.sessionId); }), Obx((() => Tooltip( - message: translate( - collapse.isFalse ? 'Hide Toolbar' : 'Show Toolbar'), + message: + translate(show.isTrue ? 'Hide Toolbar' : 'Show Toolbar'), child: Icon( - _toolbarCollapseIcon(widget.edge.value, collapse.isTrue), + show.isTrue ? Icons.expand_less : Icons.expand_more, size: iconSize, ), ))), ), if (isWebDesktop) Obx(() { - if (collapse.isFalse) { + if (show.isTrue) { return Offstage(); } else { return buttonWrapper( @@ -3338,8 +2463,7 @@ class _DraggableShowHideState extends State<_DraggableShowHide> { borderRadius: widget.borderRadius, ), child: SizedBox( - height: widget.isHorizontal ? 20 : null, - width: widget.isHorizontal ? null : 20, + height: 20, child: child, ), ), @@ -3366,56 +2490,3 @@ Widget _buildPointerTrackWidget(Widget child, FFI? ffi) { ), ); } - -class EdgeThicknessControl extends StatelessWidget { - final double value; - final ValueChanged? onChanged; - final ColorScheme? colorScheme; - - const EdgeThicknessControl({ - Key? key, - required this.value, - this.onChanged, - this.colorScheme, - }) : super(key: key); - - static const double kMin = 20; - static const double kMax = 150; - - @override - Widget build(BuildContext context) { - final colorScheme = this.colorScheme ?? Theme.of(context).colorScheme; - - final slider = SliderTheme( - data: SliderTheme.of(context).copyWith( - activeTrackColor: colorScheme.primary, - thumbColor: colorScheme.primary, - overlayColor: colorScheme.primary.withOpacity(0.1), - showValueIndicator: ShowValueIndicator.never, - thumbShape: _RectValueThumbShape( - min: EdgeThicknessControl.kMin, - max: EdgeThicknessControl.kMax, - width: 52, - height: 24, - radius: 4, - unit: 'px', - ), - ), - child: Semantics( - value: value.toInt().toString(), - child: Slider( - value: value, - min: EdgeThicknessControl.kMin, - max: EdgeThicknessControl.kMax, - divisions: - (EdgeThicknessControl.kMax - EdgeThicknessControl.kMin).round(), - semanticFormatterCallback: (double newValue) => - "${newValue.round()}px", - onChanged: onChanged, - ), - ), - ); - - return slider; - } -} diff --git a/flutter/lib/desktop/widgets/tabbar_widget.dart b/flutter/lib/desktop/widgets/tabbar_widget.dart index 9ef7d38d9..c1cc433ad 100644 --- a/flutter/lib/desktop/widgets/tabbar_widget.dart +++ b/flutter/lib/desktop/widgets/tabbar_widget.dart @@ -99,7 +99,6 @@ class DesktopTabController { /// index, key Function(int, String)? onRemoved; Function(String)? onSelected; - Future Function()? onCloseWindow; DesktopTabController( {required this.tabType, this.onRemoved, this.onSelected}); @@ -293,6 +292,7 @@ class DesktopTab extends StatefulWidget { // ignore: must_be_immutable class _DesktopTabState extends State with MultiWindowListener, WindowListener { + final _saveFrameDebounce = Debouncer(delay: Duration(seconds: 1)); Timer? _macOSCheckRestoreTimer; int _macOSCheckRestoreCounter = 0; @@ -370,7 +370,7 @@ class _DesktopTabState extends State void _setMaximized(bool maximize) { stateGlobal.setMaximized(maximize); - _saveFrame(); + _saveFrameDebounce.call(_saveFrame); setState(() {}); } @@ -405,29 +405,24 @@ class _DesktopTabState extends State super.onWindowUnmaximize(); } - _saveFrame({bool? flush}) async { - try { - if (tabType == DesktopTabType.main) { - await saveWindowPosition(WindowType.Main, flush: flush); - } else if (kWindowType != null && kWindowId != null) { - await saveWindowPosition(kWindowType!, - windowId: kWindowId, flush: flush); - } - } catch (e) { - debugPrint('Error saving window position: $e'); + _saveFrame() async { + if (tabType == DesktopTabType.main) { + await saveWindowPosition(WindowType.Main); + } else if (kWindowType != null && kWindowId != null) { + await saveWindowPosition(kWindowType!, windowId: kWindowId); } } @override void onWindowMoved() { - _saveFrame(); + _saveFrameDebounce.call(_saveFrame); super.onWindowMoved(); } @override void onWindowResized() { - _saveFrame(); - super.onWindowResized(); + _saveFrameDebounce.call(_saveFrame); + super.onWindowMoved(); } @override @@ -465,8 +460,6 @@ class _DesktopTabState extends State }); } - await _saveFrame(flush: true); - // hide window on close if (isMainWindow) { if (rustDeskWinManager.getActiveWindows().contains(kMainWindowId)) { @@ -593,13 +586,14 @@ class _DesktopTabState extends State } Widget _buildBar() { - final isIncomingHomePage = bind.isIncomingOnly() && isInHomePage(); return Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Expanded( child: GestureDetector( // custom double tap handler - onTap: !isIncomingHomePage && showMaximize + onTap: !(bind.isIncomingOnly() && isInHomePage()) && + showMaximize ? () { final current = DateTime.now().millisecondsSinceEpoch; final elapsed = current - _lastClickTime; @@ -610,7 +604,7 @@ class _DesktopTabState extends State .then((value) => stateGlobal.setMaximized(value)); } } - : (isIncomingHomePage ? () {} : null), // Keep tap recognizer for Windows touch. + : null, onPanStart: (_) => startDragging(isMainWindow), onPanCancel: () { // We want to disable dragging of the tab area in the tab bar. @@ -1085,12 +1079,11 @@ class _TabState extends State<_Tab> with RestorationMixin { return ConstrainedBox( constraints: BoxConstraints(maxWidth: widget.maxLabelWidth ?? 200), child: Tooltip( - message: - widget.tabType == DesktopTabType.main ? '' : widget.label.value, + message: widget.tabType == DesktopTabType.main + ? '' + : translate(widget.label.value), child: Text( - widget.tabType == DesktopTabType.main - ? translate(widget.label.value) - : widget.label.value, + translate(widget.label.value), textAlign: TextAlign.center, style: TextStyle( color: isSelected diff --git a/flutter/lib/desktop/widgets/update_progress.dart b/flutter/lib/desktop/widgets/update_progress.dart index 93f661b7b..ac425fa2b 100644 --- a/flutter/lib/desktop/widgets/update_progress.dart +++ b/flutter/lib/desktop/widgets/update_progress.dart @@ -7,10 +7,7 @@ import 'package:flutter_hbb/models/platform_model.dart'; import 'package:get/get.dart'; import 'package:url_launcher/url_launcher.dart'; -final _isExtracting = false.obs; - void handleUpdate(String releasePageUrl) { - _isExtracting.value = false; String downloadUrl = releasePageUrl.replaceAll('tag', 'download'); String version = downloadUrl.substring(downloadUrl.lastIndexOf('/') + 1); final String downloadFile = @@ -28,15 +25,13 @@ void handleUpdate(String releasePageUrl) { gFFI.dialogManager.dismissAll(); gFFI.dialogManager.show((setState, close, context) { return CustomAlertDialog( - title: Obx(() => Text(translate(_isExtracting.isTrue - ? 'Preparing for installation ...' - : 'Downloading {$appName}'))), + title: Text(translate('Downloading {$appName}')), content: UpdateProgress(releasePageUrl, downloadUrl, downloadId, onCanceled) .marginSymmetric(horizontal: 8) .paddingOnly(top: 12), actions: [ - if (_isExtracting.isFalse) dialogButton(translate('Cancel'), onPressed: () async { + dialogButton(translate('Cancel'), onPressed: () async { onCanceled.value(); await bind.mainSetCommon( key: 'cancel-downloader', value: downloadId.value); @@ -76,7 +71,6 @@ class UpdateProgressState extends State { int _downloadedSize = 0; int _getDataFailedCount = 0; final String _eventKeyDownloadNewVersion = 'download-new-version'; - final String _eventKeyExtractUpdateDmg = 'extract-update-dmg'; @override void initState() { @@ -88,11 +82,6 @@ class UpdateProgressState extends State { _eventKeyDownloadNewVersion, handleDownloadNewVersion, replace: true); bind.mainSetCommon(key: 'download-new-version', value: widget.downloadUrl); - if (isMacOS) { - platformFFI.registerEventHandler(_eventKeyExtractUpdateDmg, - _eventKeyExtractUpdateDmg, handleExtractUpdateDmg, - replace: true); - } } @override @@ -100,10 +89,6 @@ class UpdateProgressState extends State { cancelQueryTimer(); platformFFI.unregisterEventHandler( _eventKeyDownloadNewVersion, _eventKeyDownloadNewVersion); - if (isMacOS) { - platformFFI.unregisterEventHandler( - _eventKeyExtractUpdateDmg, _eventKeyExtractUpdateDmg); - } super.dispose(); } @@ -128,13 +113,10 @@ class UpdateProgressState extends State { } } - // `isExtractDmg` is true when handling extract-update-dmg event. - // It's a rare case that the dmg file is corrupted and cannot be extracted. - void _onError(String error, {bool isExtractDmg = false}) { + void _onError(String error) { cancelQueryTimer(); - debugPrint( - '${isExtractDmg ? "Extract" : "Download"} new version error: $error'); + debugPrint('Download new version error: $error'); final msgBoxType = 'custom-nocancel-nook-hasclose'; final msgBoxTitle = 'Error'; final msgBoxText = 'download-new-version-failed-tip'; @@ -156,7 +138,7 @@ class UpdateProgressState extends State { final List buttons = [ dialogButton('Download', onPressed: jumplink), - if (!isExtractDmg) dialogButton('Retry', onPressed: retry), + dialogButton('Retry', onPressed: retry), dialogButton('Close', onPressed: close), ]; dialogManager.dismissAll(); @@ -212,13 +194,19 @@ class UpdateProgressState extends State { _onError('The download file size is 0.'); } else { setState(() {}); - if (isMacOS) { - bind.mainSetCommon( - key: 'extract-update-dmg', value: widget.downloadUrl); - _isExtracting.value = true; - } else { - updateMsgBox(); - } + msgBox( + gFFI.sessionId, + 'custom-nocancel', + '{$appName} Update', + '{$appName}-to-update-tip', + '', + gFFI.dialogManager, + onSubmit: () { + debugPrint('Downloaded, update to new version now'); + bind.mainSetCommon(key: 'update-me', value: widget.downloadUrl); + }, + submitTimeout: 5, + ); } } else { setState(() {}); @@ -226,38 +214,17 @@ class UpdateProgressState extends State { } } - void updateMsgBox() { - msgBox( - gFFI.sessionId, - 'custom-nocancel', - '{$appName} Update', - '{$appName}-to-update-tip', - '', - gFFI.dialogManager, - onSubmit: () { - debugPrint('Downloaded, update to new version now'); - bind.mainSetCommon(key: 'update-me', value: widget.downloadUrl); - }, - submitTimeout: 5, - ); - } - - Future handleExtractUpdateDmg(Map evt) async { - _isExtracting.value = false; - if (evt.containsKey('err') && (evt['err'] as String).isNotEmpty) { - _onError(evt['err'] as String, isExtractDmg: true); - } else { - updateMsgBox(); - } - } - @override Widget build(BuildContext context) { - getValue() => _totalSize == null + return onDownloading(context); + } + + Widget onDownloading(BuildContext context) { + final value = _totalSize == null ? 0.0 : (_totalSize == 0 ? 1.0 : _downloadedSize / _totalSize!); return LinearProgressIndicator( - value: _isExtracting.isTrue ? null : getValue(), + value: value, minHeight: 20, borderRadius: BorderRadius.circular(5), backgroundColor: Colors.grey[300], diff --git a/flutter/lib/main.dart b/flutter/lib/main.dart index 91773afe7..80a3bff89 100644 --- a/flutter/lib/main.dart +++ b/flutter/lib/main.dart @@ -147,15 +147,9 @@ void runMainApp(bool startService) async { gFFI.userModel.refreshCurrentUser(); runApp(App()); - bool? alwaysOnTop; - if (isDesktop) { - alwaysOnTop = - bind.mainGetBuildinOption(key: "main-window-always-on-top") == 'Y'; - } - // Set window option. - WindowOptions windowOptions = getHiddenTitleBarWindowOptions( - isMainWindow: true, alwaysOnTop: alwaysOnTop); + WindowOptions windowOptions = + getHiddenTitleBarWindowOptions(isMainWindow: true); windowManager.waitUntilReadyToShow(windowOptions, () async { // Restore the location of the main window before window hide or show. await restoreWindowPosition(WindowType.Main); diff --git a/flutter/lib/mobile/pages/connection_page.dart b/flutter/lib/mobile/pages/connection_page.dart index 0e7e0a480..07aaaef8c 100644 --- a/flutter/lib/mobile/pages/connection_page.dart +++ b/flutter/lib/mobile/pages/connection_page.dart @@ -182,7 +182,6 @@ class _ConnectionPageState extends State { rdpUsername: '', loginName: '', device_group_name: '', - note: '', ); _autocompleteOpts = [emptyPeer]; } else { diff --git a/flutter/lib/mobile/pages/file_manager_page.dart b/flutter/lib/mobile/pages/file_manager_page.dart index 1e793bca7..3faf8f8b0 100644 --- a/flutter/lib/mobile/pages/file_manager_page.dart +++ b/flutter/lib/mobile/pages/file_manager_page.dart @@ -5,17 +5,14 @@ import 'package:flutter_breadcrumb/flutter_breadcrumb.dart'; import 'package:flutter_hbb/models/file_model.dart'; import 'package:get/get.dart'; import 'package:toggle_switch/toggle_switch.dart'; +import 'package:wakelock_plus/wakelock_plus.dart'; import '../../common.dart'; import '../../common/widgets/dialog.dart'; class FileManagerPage extends StatefulWidget { FileManagerPage( - {Key? key, - required this.id, - this.password, - this.isSharedPassword, - this.forceRelay}) + {Key? key, required this.id, this.password, this.isSharedPassword, this.forceRelay}) : super(key: key); final String id; final String? password; @@ -71,7 +68,6 @@ class _FileManagerPageState extends State { showLocal ? model.localController : model.remoteController; FileDirectory get currentDir => currentFileController.directory.value; DirectoryOptions get currentOptions => currentFileController.options.value; - final _uniqueKey = UniqueKey(); @override void initState() { @@ -86,7 +82,7 @@ class _FileManagerPageState extends State { .showLoading(translate('Connecting...'), onCancel: closeConnection); }); gFFI.ffiModel.updateEventListener(gFFI.sessionId, widget.id); - WakelockManager.enable(_uniqueKey); + WakelockPlus.enable(); } @override @@ -94,9 +90,8 @@ class _FileManagerPageState extends State { model.close().whenComplete(() { gFFI.close(); gFFI.dialogManager.dismissAll(); - WakelockManager.disable(_uniqueKey); + WakelockPlus.disable(); }); - model.jobController.clear(); super.dispose(); } @@ -117,7 +112,8 @@ class _FileManagerPageState extends State { leading: Row(children: [ IconButton( icon: Icon(Icons.close), - onPressed: () => clientClose(gFFI.sessionId, gFFI)), + onPressed: () => + clientClose(gFFI.sessionId, gFFI.dialogManager)), ]), centerTitle: true, title: ToggleSwitch( @@ -355,21 +351,15 @@ class _FileManagerPageState extends State { return Offstage(); } - // Find the first job that is in progress (the one actually transferring data) - // Rust backend processes jobs sequentially, so the first inProgress job is the active one - final activeJob = jobTable - .firstWhereOrNull((job) => job.state == JobState.inProgress) ?? - jobTable.last; - - switch (activeJob.state) { + switch (jobTable.last.state) { case JobState.inProgress: return BottomSheetBody( leading: CircularProgressIndicator(), title: translate("Waiting"), text: - "${translate("Speed")}: ${readableFileSize(activeJob.speed)}/s", + "${translate("Speed")}: ${readableFileSize(jobTable.last.speed)}/s", onCanceled: () { - model.jobController.cancelJob(activeJob.id); + model.jobController.cancelJob(jobTable.last.id); jobTable.clear(); }, ); @@ -377,7 +367,7 @@ class _FileManagerPageState extends State { return BottomSheetBody( leading: Icon(Icons.check), title: "${translate("Successful")}!", - text: activeJob.display(), + text: jobTable.last.display(), onCanceled: () => jobTable.clear(), ); case JobState.error: @@ -434,7 +424,6 @@ class FileManagerView extends StatefulWidget { class _FileManagerViewState extends State { final _listScrollController = ScrollController(); final _breadCrumbScroller = ScrollController(); - late final ascending = Rx(controller.sortAscending); bool get isLocal => widget.controller.isLocal; FileController get controller => widget.controller; @@ -646,17 +635,7 @@ class _FileManagerViewState extends State { )) .toList(); }, - onSelected: (sortBy) { - // If selecting the same sort option, flip the order - // If selecting a different sort option, use ascending order - if (controller.sortBy.value == sortBy) { - ascending.value = !controller.sortAscending; - } else { - ascending.value = true; - } - controller.changeSortStyle(sortBy, - ascending: ascending.value); - }), + onSelected: controller.changeSortStyle), ], ) ], diff --git a/flutter/lib/mobile/pages/home_page.dart b/flutter/lib/mobile/pages/home_page.dart index 651ec4f17..7f0b1f693 100644 --- a/flutter/lib/mobile/pages/home_page.dart +++ b/flutter/lib/mobile/pages/home_page.dart @@ -29,9 +29,9 @@ class HomePageState extends State { int get selectedIndex => _selectedIndex; final List _pages = []; int _chatPageTabIndex = -1; - bool get isChatPageCurrentTab => isAndroid + bool get isChatPageCurrentTab => (isAndroid || isIOS) ? _selectedIndex == _chatPageTabIndex - : false; // change this when ios have chat page + : false; void refreshPages() { setState(() { @@ -52,7 +52,7 @@ class HomePageState extends State { appBarActions: [], )); } - if (isAndroid && !bind.isOutgoingOnly()) { + if ((isAndroid || isIOS) && !bind.isOutgoingOnly()) { _chatPageTabIndex = _pages.length; _pages.addAll([ChatPage(type: ChatPageType.mobileMain), ServerPage()]); } @@ -230,12 +230,6 @@ class WebHomePage extends StatelessWidget { id = args[i + 1]; i++; break; - case '--terminal-admin': - setEnvTerminalAdmin(); - isTerminal = true; - id = args[i + 1]; - i++; - break; case '--password': password = args[i + 1]; i++; diff --git a/flutter/lib/mobile/pages/remote_page.dart b/flutter/lib/mobile/pages/remote_page.dart index 74a5af45c..b707fd38f 100644 --- a/flutter/lib/mobile/pages/remote_page.dart +++ b/flutter/lib/mobile/pages/remote_page.dart @@ -1,18 +1,18 @@ import 'dart:async'; +import 'dart:ui' as ui; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_hbb/common/shared_state.dart'; import 'package:flutter_hbb/common/widgets/toolbar.dart'; import 'package:flutter_hbb/consts.dart'; -import 'package:flutter_hbb/mobile/widgets/floating_mouse.dart'; -import 'package:flutter_hbb/mobile/widgets/floating_mouse_widgets.dart'; import 'package:flutter_hbb/mobile/widgets/gesture_help.dart'; import 'package:flutter_hbb/models/chat_model.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; import 'package:flutter_svg/svg.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; +import 'package:wakelock_plus/wakelock_plus.dart'; import '../../common.dart'; import '../../common/widgets/overlay.dart'; @@ -23,7 +23,6 @@ import '../../models/model.dart'; import '../../models/platform_model.dart'; import '../../utils/image.dart'; import '../widgets/dialog.dart'; -import '../widgets/custom_scale_widget.dart'; final initText = '1' * 1024; @@ -41,12 +40,7 @@ void _disableAndroidSoftKeyboard({bool? isKeyboardVisible}) { } class RemotePage extends StatefulWidget { - RemotePage( - {Key? key, - required this.id, - this.password, - this.isSharedPassword, - this.forceRelay}) + RemotePage({Key? key, required this.id, this.password, this.isSharedPassword, this.forceRelay}) : super(key: key); final String id; @@ -64,8 +58,9 @@ class _RemotePageState extends State with WidgetsBindingObserver { bool _showGestureHelp = false; String _value = ''; Orientation? _currentOrientation; - final _uniqueKey = UniqueKey(); - Timer? _iosKeyboardWorkaroundTimer; + double _viewInsetsBottom = 0; + + Timer? _timerDidChangeMetrics; final _blockableOverlayState = BlockableOverlayState(); @@ -102,7 +97,9 @@ class _RemotePageState extends State with WidgetsBindingObserver { gFFI.dialogManager .showLoading(translate('Connecting...'), onCancel: closeConnection); }); - WakelockManager.enable(_uniqueKey); + if (!isWeb) { + WakelockPlus.enable(); + } _physicalFocusNode.requestFocus(); gFFI.inputModel.listenToMouse(true); gFFI.qualityMonitorModel.checkShowQualityMonitor(sessionId); @@ -137,11 +134,13 @@ class _RemotePageState extends State with WidgetsBindingObserver { _physicalFocusNode.dispose(); await gFFI.close(); _timer?.cancel(); - _iosKeyboardWorkaroundTimer?.cancel(); + _timerDidChangeMetrics?.cancel(); gFFI.dialogManager.dismissAll(); await SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: SystemUiOverlay.values); - WakelockManager.disable(_uniqueKey); + if (!isWeb) { + await WakelockPlus.disable(); + } await keyboardSubscription.cancel(); removeSharedStates(widget.id); // `on_voice_call_closed` should be called when the connection is ended. @@ -163,6 +162,26 @@ class _RemotePageState extends State with WidgetsBindingObserver { gFFI.invokeMethod("try_sync_clipboard"); } + @override + void didChangeMetrics() { + // If the soft keyboard is visible and the canvas has been changed(panned or scaled) + // Don't try reset the view style and focus the cursor. + if (gFFI.cursorModel.lastKeyboardIsVisible && + gFFI.canvasModel.isMobileCanvasChanged) { + return; + } + + final newBottom = MediaQueryData.fromView(ui.window).viewInsets.bottom; + _timerDidChangeMetrics?.cancel(); + _timerDidChangeMetrics = Timer(Duration(milliseconds: 100), () async { + // We need this comparation because poping up the floating action will also trigger `didChangeMetrics()`. + if (newBottom != _viewInsetsBottom) { + gFFI.canvasModel.mobileFocusCanvasCursor(); + _viewInsetsBottom = newBottom; + } + }); + } + // to-do: It should be better to use transparent color instead of the bgColor. // But for now, the transparent color will cause the canvas to be white. // I'm sure that the white color is caused by the Overlay widget in BlockableOverlay. @@ -184,24 +203,7 @@ class _RemotePageState extends State with WidgetsBindingObserver { gFFI.ffiModel.pi.version.isNotEmpty) { gFFI.invokeMethod("enable_soft_keyboard", false); } - - // Workaround for iOS: physical keyboard input fails after virtual keyboard is hidden - // https://github.com/flutter/flutter/issues/39900 - // https://github.com/rustdesk/rustdesk/discussions/11843#discussioncomment-13499698 - Virtual keyboard issue - if (isIOS) { - _iosKeyboardWorkaroundTimer?.cancel(); - _iosKeyboardWorkaroundTimer = Timer(Duration(milliseconds: 100), () { - if (!mounted) return; - _physicalFocusNode.unfocus(); - _iosKeyboardWorkaroundTimer = Timer(Duration(milliseconds: 50), () { - if (!mounted) return; - _physicalFocusNode.requestFocus(); - }); - }); - } } else { - _iosKeyboardWorkaroundTimer?.cancel(); - _iosKeyboardWorkaroundTimer = null; _timer?.cancel(); _timer = Timer(kMobileDelaySoftKeyboardFocus, () { SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, @@ -356,7 +358,7 @@ class _RemotePageState extends State with WidgetsBindingObserver { return WillPopScope( onWillPop: () async { - clientClose(sessionId, gFFI); + clientClose(sessionId, gFFI.dialogManager); return false; }, child: Scaffold( @@ -426,10 +428,12 @@ class _RemotePageState extends State with WidgetsBindingObserver { } return Container( color: MyTheme.canvasColor, - child: RawTouchGestureDetectorRegion( - child: getBodyForMobile(), - ffi: gFFI, - ), + child: inputModel.isPhysicalMouse.value + ? getBodyForMobile() + : RawTouchGestureDetectorRegion( + child: getBodyForMobile(), + ffi: gFFI, + ), ); }), ), @@ -472,7 +476,7 @@ class _RemotePageState extends State with WidgetsBindingObserver { color: Colors.white, icon: Icon(Icons.clear), onPressed: () { - clientClose(sessionId, gFFI); + clientClose(sessionId, gFFI.dialogManager); }, ), IconButton( @@ -557,9 +561,7 @@ class _RemotePageState extends State with WidgetsBindingObserver { } bool get showCursorPaint => - !gFFI.ffiModel.isPeerAndroid && - !gFFI.canvasModel.cursorEmbedded && - !gFFI.inputModel.relativeMouseMode.value; + !gFFI.ffiModel.isPeerAndroid && !gFFI.canvasModel.cursorEmbedded; Widget getBodyForMobile() { final keyboardIsVisible = keyboardVisibilityController.isVisible; @@ -567,7 +569,7 @@ class _RemotePageState extends State with WidgetsBindingObserver { color: MyTheme.canvasColor, child: Stack(children: () { final paints = [ - ImagePaint(ffiModel: gFFI.ffiModel), + ImagePaint(), Positioned( top: 10, right: 10, @@ -610,22 +612,13 @@ class _RemotePageState extends State with WidgetsBindingObserver { if (showCursorPaint) { paints.add(CursorPaint(widget.id)); } - if (gFFI.ffiModel.touchMode) { - paints.add(FloatingMouse( - ffi: gFFI, - )); - } else { - paints.add(FloatingMouseWidgets( - ffi: gFFI, - )); - } return paints; }())); } Widget getBodyForDesktopWithListener() { final ffiModel = Provider.of(context); - var paints = [ImagePaint(ffiModel: ffiModel)]; + var paints = [ImagePaint()]; if (showCursorPaint) { final cursor = bind.sessionGetToggleOptionSync( sessionId: sessionId, arg: 'show-remote-cursor'); @@ -791,15 +784,13 @@ class _RemotePageState extends State with WidgetsBindingObserver { controller: ScrollController(), padding: EdgeInsets.symmetric(vertical: 10), child: GestureHelp( - touchMode: gFFI.ffiModel.touchMode, - onTouchModeChange: (t) { - gFFI.ffiModel.toggleTouchMode(); - final v = gFFI.ffiModel.touchMode ? 'Y' : 'N'; - bind.mainSetLocalOption(key: kOptionTouchMode, value: v); - }, - virtualMouseMode: gFFI.ffiModel.virtualMouseMode, - inputModel: gFFI.inputModel, - ))); + touchMode: gFFI.ffiModel.touchMode, + onTouchModeChange: (t) { + gFFI.ffiModel.toggleTouchMode(); + final v = gFFI.ffiModel.touchMode ? 'Y' : ''; + bind.sessionPeerOption( + sessionId: sessionId, name: kOptionTouchMode, value: v); + }))); } // * Currently mobile does not enable map mode @@ -1046,20 +1037,11 @@ class _KeyHelpToolsState extends State { } class ImagePaint extends StatelessWidget { - final FfiModel ffiModel; - ImagePaint({Key? key, required this.ffiModel}) : super(key: key); - @override Widget build(BuildContext context) { final m = Provider.of(context); final c = Provider.of(context); var s = c.scale; - if (ffiModel.isPeerLinux) { - final displays = ffiModel.pi.getCurDisplays(); - if (displays.isNotEmpty) { - s = s / displays[0].scale; - } - } final adjust = c.getAdjustY(); return CustomPaint( painter: ImagePainter( @@ -1123,21 +1105,13 @@ void showOptions( BuildContext context, String id, OverlayDialogManager dialogManager) async { var displays = []; final pi = gFFI.ffiModel.pi; - final image = gFFI.ffiModel.getConnectionImageText(); + final image = gFFI.ffiModel.getConnectionImage(); if (image != null) { displays.add(Padding(padding: const EdgeInsets.only(top: 8), child: image)); } if (pi.displays.length > 1 && pi.currentDisplay != kAllDisplayValue) { final cur = pi.currentDisplay; final children = []; - final isDarkTheme = MyTheme.currentThemeMode() == ThemeMode.dark; - final numColorSelected = Colors.white; - final numColorUnselected = isDarkTheme ? Colors.grey : Colors.black87; - // We can't use `Theme.of(context).primaryColor` here, the color is: - // - light theme: 0xff2196f3 (Colors.blue) - // - dark theme: 0xff212121 (the canvas color?) - final numBgSelected = - Theme.of(context).colorScheme.primary.withOpacity(0.6); for (var i = 0; i < pi.displays.length; ++i) { children.add(InkWell( onTap: () { @@ -1151,12 +1125,13 @@ void showOptions( decoration: BoxDecoration( border: Border.all(color: Theme.of(context).hintColor), borderRadius: BorderRadius.circular(2), - color: i == cur ? numBgSelected : null), + color: i == cur + ? Theme.of(context).primaryColor.withOpacity(0.6) + : null), child: Center( child: Text((i + 1).toString(), style: TextStyle( - color: - i == cur ? numColorSelected : numColorUnselected, + color: i == cur ? Colors.white : Colors.black87, fontWeight: FontWeight.bold)))))); } displays.add(Padding( @@ -1183,8 +1158,7 @@ void showOptions( List privacyModeList = []; // privacy mode final privacyModeState = PrivacyModeState.find(id); - if ((gFFI.ffiModel.pi.features.privacyMode && gFFI.ffiModel.keyboard) || - privacyModeState.isNotEmpty) { + if (gFFI.ffiModel.keyboard && gFFI.ffiModel.pi.features.privacyMode) { privacyModeList = toolbarPrivacyMode(privacyModeState, context, id, gFFI); if (privacyModeList.length == 1) { displayToggles.add(privacyModeList[0]); @@ -1210,10 +1184,6 @@ void showOptions( if (v != null) viewStyle.value = v; } : null)), - // Show custom scale controls when custom view style is selected - Obx(() => viewStyle.value == kRemoteViewStyleCustom - ? MobileCustomScaleControls(ffi: gFFI) - : const SizedBox.shrink()), const Divider(color: MyTheme.border), for (var e in imageQualityRadios) Obx(() => getRadio( diff --git a/flutter/lib/mobile/pages/scan_page.dart b/flutter/lib/mobile/pages/scan_page.dart index 5bc033565..e92400dba 100644 --- a/flutter/lib/mobile/pages/scan_page.dart +++ b/flutter/lib/mobile/pages/scan_page.dart @@ -156,7 +156,7 @@ class _ScanPageState extends State { try { final sc = ServerConfig.decode(data.substring(7)); Timer(Duration(milliseconds: 60), () { - showServerSettingsWithValue(sc, gFFI.dialogManager, null); + showServerSettingsWithValue(sc, gFFI.dialogManager); }); } catch (e) { showToast('Invalid QR code'); diff --git a/flutter/lib/mobile/pages/server_page.dart b/flutter/lib/mobile/pages/server_page.dart index cd3f97a53..74fe0a4aa 100644 --- a/flutter/lib/mobile/pages/server_page.dart +++ b/flutter/lib/mobile/pages/server_page.dart @@ -61,13 +61,12 @@ class _DropDownAction extends StatelessWidget { final isAllowNumericOneTimePassword = gFFI.serverModel.allowNumericOneTimePassword; return [ - if (!isChangeIdDisabled()) - PopupMenuItem( - enabled: gFFI.serverModel.connectStatus > 0, - value: "changeID", - child: Text(translate("Change ID")), - ), - if (!isChangeIdDisabled()) const PopupMenuDivider(), + PopupMenuItem( + enabled: gFFI.serverModel.connectStatus > 0, + value: "changeID", + child: Text(translate("Change ID")), + ), + const PopupMenuDivider(), PopupMenuItem( value: 'AcceptSessionsViaPassword', child: listTile( @@ -88,8 +87,7 @@ class _DropDownAction extends StatelessWidget { ), if (showPasswordOption) const PopupMenuDivider(), if (showPasswordOption && - verificationMethod != kUseTemporaryPassword && - !isChangePermanentPasswordDisabled()) + verificationMethod != kUseTemporaryPassword) PopupMenuItem( value: "setPermanentPassword", child: Text(translate("Set permanent password")), @@ -150,12 +148,7 @@ class _DropDownAction extends StatelessWidget { } if (value == kUsePermanentPassword && - (await bind.mainGetCommon(key: "permanent-password-set")) != - "true") { - if (isChangePermanentPasswordDisabled()) { - callback(); - return; - } + (await bind.mainGetPermanentPassword()).isEmpty) { setPasswordDialog(notEmptyCallback: callback); } else { callback(); @@ -188,7 +181,11 @@ class _ServerPageState extends State { _updateTimer = periodic_immediate(const Duration(seconds: 3), () async { await gFFI.serverModel.fetchID(); }); - gFFI.serverModel.checkAndroidPermission(); + if (isAndroid) { + gFFI.serverModel.checkAndroidPermission(); + } else if (isIOS) { + gFFI.serverModel.checkIOSPermission(); + } } @override @@ -247,7 +244,7 @@ class ServiceNotRunningNotification extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text(translate("android_start_service_tip"), + Text(translate(isAndroid ? "android_start_service_tip" : "Start screen sharing service"), style: const TextStyle(fontSize: 12, color: MyTheme.darkGray)) .marginOnly(bottom: 8), @@ -582,21 +579,11 @@ class _PermissionCheckerState extends State { @override Widget build(BuildContext context) { final serverModel = Provider.of(context); - final hasAudioPermission = androidVersion >= 30; - final hideStopService = isAndroid && - bind.mainGetBuildinOption(key: kOptionHideStopService) == 'Y'; - final allowPermChangeInAcceptWindow = option2bool( - kOptionEnablePermChangeInAcceptWindow, - bind.mainGetBuildinOption( - key: kOptionEnablePermChangeInAcceptWindow, - )); - final permissionChangeLocked = isAndroid && - serverModel.clients.any((c) => !c.disconnected) && - !allowPermChangeInAcceptWindow; + final hasAudioPermission = isIOS || androidVersion >= 30; return PaddingCard( title: translate("Permissions"), child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ - serverModel.mediaOk && !hideStopService + serverModel.mediaOk ? ElevatedButton.icon( style: ButtonStyle( backgroundColor: @@ -606,30 +593,22 @@ class _PermissionCheckerState extends State { label: Text(translate("Stop service"))) .marginOnly(bottom: 8) : SizedBox.shrink(), - if (!hideStopService || !serverModel.mediaOk) - PermissionRow( - translate("Screen Capture"), - serverModel.mediaOk, - !serverModel.mediaOk && - gFFI.userModel.userName.value.isEmpty && - bind.mainGetLocalOption(key: "show-scam-warning") != "N" - ? () => showScamWarning(context, serverModel) - : serverModel.toggleService), PermissionRow( - translate("Input Control"), - serverModel.inputOk, - serverModel.toggleInput, - ), - PermissionRow( - translate("Transfer file"), - serverModel.fileOk, - serverModel.toggleFile, - enabled: !permissionChangeLocked, - ), + translate("Screen Capture"), + serverModel.mediaOk, + !serverModel.mediaOk && + gFFI.userModel.userName.value.isEmpty && + bind.mainGetLocalOption(key: "show-scam-warning") != "N" + ? () => showScamWarning(context, serverModel) + : serverModel.toggleService), + PermissionRow(translate("Input Control"), serverModel.inputOk, + serverModel.toggleInput), + if (!isIOS) + PermissionRow(translate("Transfer file"), serverModel.fileOk, + serverModel.toggleFile), hasAudioPermission - ? PermissionRow(translate("Audio Capture"), serverModel.audioOk, - serverModel.toggleAudio, - enabled: !permissionChangeLocked) + ? PermissionRow(translate(isIOS ? "Microphone" : "Audio Capture"), serverModel.audioOk, + serverModel.toggleAudio) : Row(children: [ Icon(Icons.info_outline).marginOnly(right: 15), Expanded( @@ -638,25 +617,30 @@ class _PermissionCheckerState extends State { style: const TextStyle(color: MyTheme.darkGray), )) ]), - PermissionRow( - translate("Enable clipboard"), - serverModel.clipboardOk, - serverModel.toggleClipboard, - enabled: !permissionChangeLocked, - ), + if (!isIOS) + PermissionRow(translate("Enable clipboard"), serverModel.clipboardOk, + serverModel.toggleClipboard), + if (isIOS) ...[ + Row(children: [ + Icon(Icons.info_outline, size: 16).marginOnly(right: 8), + Expanded( + child: Text( + translate("File transfer and clipboard sync are not available during iOS screen sharing"), + style: const TextStyle(fontSize: 12, color: MyTheme.darkGray), + )) + ]).marginOnly(top: 8), + ], ])); } } class PermissionRow extends StatelessWidget { - const PermissionRow(this.name, this.isOk, this.onPressed, - {Key? key, this.enabled = true}) + const PermissionRow(this.name, this.isOk, this.onPressed, {Key? key}) : super(key: key); final String name; final bool isOk; final VoidCallback onPressed; - final bool enabled; @override Widget build(BuildContext context) { @@ -665,11 +649,9 @@ class PermissionRow extends StatelessWidget { contentPadding: EdgeInsets.all(0), title: Text(name), value: isOk, - onChanged: enabled - ? (bool value) { - onPressed(); - } - : null); + onChanged: (bool value) { + onPressed(); + }); } } @@ -682,8 +664,9 @@ class ConnectionManager extends StatelessWidget { return Column( children: serverModel.clients .map((client) => PaddingCard( - title: translate( - client.isFileTransfer ? "Transfer file" : "Share screen"), + title: translate(client.isFileTransfer + ? "Transfer file" + : "Share screen"), titleIcon: client.isFileTransfer ? Icon(Icons.folder_outlined) : Icon(Icons.mobile_screen_share), @@ -869,7 +852,13 @@ class ClientInfo extends StatelessWidget { flex: -1, child: Padding( padding: const EdgeInsets.only(right: 12), - child: _buildAvatar(context))), + child: CircleAvatar( + backgroundColor: str2color( + client.name, + Theme.of(context).brightness == Brightness.light + ? 255 + : 150), + child: Text(client.name[0])))), Expanded( child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -882,20 +871,6 @@ class ClientInfo extends StatelessWidget { ), ])); } - - Widget _buildAvatar(BuildContext context) { - final fallback = CircleAvatar( - backgroundColor: str2color(client.name, - Theme.of(context).brightness == Brightness.light ? 255 : 150), - child: Text(client.name.isNotEmpty ? client.name[0] : '?'), - ); - return buildAvatarWidget( - avatar: client.avatar, - size: 40, - fallback: fallback, - ) ?? - fallback; - } } void androidChannelInit() { diff --git a/flutter/lib/mobile/pages/settings_page.dart b/flutter/lib/mobile/pages/settings_page.dart index 509260636..3602ca0d7 100644 --- a/flutter/lib/mobile/pages/settings_page.dart +++ b/flutter/lib/mobile/pages/settings_page.dart @@ -71,7 +71,6 @@ class _SettingsState extends State with WidgetsBindingObserver { var _ignoreBatteryOpt = false; var _enableStartOnBoot = false; var _checkUpdateOnStartup = false; - var _showTerminalExtraKeys = false; var _floatingWindowDisabled = false; var _keepScreenOn = KeepScreenOn.duringControlled; // relay on floating window var _enableAbr = false; @@ -95,12 +94,7 @@ class _SettingsState extends State with WidgetsBindingObserver { var _hideWebSocket = false; var _enableTrustedDevices = false; var _enableUdpPunch = false; - var _allowInsecureTlsFallback = false; - var _disableUdp = false; var _enableIpv6Punch = false; - var _isUsingPublicServer = false; - var _allowAskForNoteAtEndOfConnection = false; - var _preventSleepWhileConnected = true; _SettingsState() { _enableAbr = option2bool( @@ -115,9 +109,6 @@ class _SettingsState extends State with WidgetsBindingObserver { _enableHardwareCodec = option2bool(kOptionEnableHwcodec, bind.mainGetOptionSync(key: kOptionEnableHwcodec)); _allowWebSocket = mainGetBoolOptionSync(kOptionAllowWebSocket); - _allowInsecureTlsFallback = - mainGetBoolOptionSync(kOptionAllowInsecureTLSFallback); - _disableUdp = bind.mainGetOptionSync(key: kOptionDisableUdp) == 'Y'; _autoRecordIncomingSession = option2bool(kOptionAllowAutoRecordIncoming, bind.mainGetOptionSync(key: kOptionAllowAutoRecordIncoming)); _autoRecordOutgoingSession = option2bool(kOptionAllowAutoRecordOutgoing, @@ -139,12 +130,6 @@ class _SettingsState extends State with WidgetsBindingObserver { _enableTrustedDevices = mainGetBoolOptionSync(kOptionEnableTrustedDevices); _enableUdpPunch = mainGetLocalBoolOptionSync(kOptionEnableUdpPunch); _enableIpv6Punch = mainGetLocalBoolOptionSync(kOptionEnableIpv6Punch); - _allowAskForNoteAtEndOfConnection = - mainGetLocalBoolOptionSync(kOptionAllowAskForNoteAtEndOfConnection); - _preventSleepWhileConnected = - mainGetLocalBoolOptionSync(kOptionKeepAwakeDuringOutgoingSessions); - _showTerminalExtraKeys = - mainGetLocalBoolOptionSync(kOptionEnableShowTerminalExtraKeys); } @override @@ -215,13 +200,6 @@ class _SettingsState extends State with WidgetsBindingObserver { update = true; _buildDate = buildDate; } - - final isUsingPublicServer = await bind.mainIsUsingPublicServer(); - if (_isUsingPublicServer != isUsingPublicServer) { - update = true; - _isUsingPublicServer = isUsingPublicServer; - } - if (update) { setState(() {}); } @@ -400,7 +378,7 @@ class _SettingsState extends State with WidgetsBindingObserver { }, ), SettingsTile.switchTile( - title: Text(translate('Adaptive bitrate')), + title: Text('${translate('Adaptive bitrate')} (beta)'), initialValue: _enableAbr, onToggle: isOptionFixed(kOptionEnableAbr) ? null @@ -562,7 +540,7 @@ class _SettingsState extends State with WidgetsBindingObserver { enhancementsTiles.add(SettingsTile.switchTile( initialValue: _enableStartOnBoot, title: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text(translate('Start on boot')), + Text("${translate('Start on boot')} (beta)"), Text( '* ${translate('Start the screen sharing service on boot, requires special permissions')}', style: Theme.of(context).textTheme.bodySmall), @@ -608,23 +586,6 @@ class _SettingsState extends State with WidgetsBindingObserver { ); } - enhancementsTiles.add( - SettingsTile.switchTile( - initialValue: _showTerminalExtraKeys, - title: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text(translate('Show terminal extra keys')), - ]), - onToggle: (bool v) async { - await mainSetLocalBoolOption(kOptionEnableShowTerminalExtraKeys, v); - final newValue = - mainGetLocalBoolOptionSync(kOptionEnableShowTerminalExtraKeys); - setState(() { - _showTerminalExtraKeys = newValue; - }); - }, - ), - ); - onFloatingWindowChanged(bool toValue) async { if (toValue) { if (!await AndroidPermissionManager.check(kSystemAlertWindow)) { @@ -641,39 +602,44 @@ class _SettingsState extends State with WidgetsBindingObserver { gFFI.serverModel.androidUpdatekeepScreenOn(); } - enhancementsTiles.add(SettingsTile.switchTile( - initialValue: !_floatingWindowDisabled, - title: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ - Text(translate('Floating window')), - Text('* ${translate('floating_window_tip')}', - style: Theme.of(context).textTheme.bodySmall), - ]), - onToggle: bind.mainIsOptionFixed(key: kOptionDisableFloatingWindow) - ? null - : onFloatingWindowChanged)); + if (isAndroid) { + enhancementsTiles.add(SettingsTile.switchTile( + initialValue: !_floatingWindowDisabled, + title: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ + Text(translate('Floating window')), + Text('* ${translate('floating_window_tip')}', + style: Theme.of(context).textTheme.bodySmall), + ]), + onToggle: bind.mainIsOptionFixed(key: kOptionDisableFloatingWindow) + ? null + : onFloatingWindowChanged)); + } - enhancementsTiles.add(_getPopupDialogRadioEntry( - title: 'Keep screen on', - list: [ - _RadioEntry('Never', _keepScreenOnToOption(KeepScreenOn.never)), - _RadioEntry('During controlled', - _keepScreenOnToOption(KeepScreenOn.duringControlled)), - _RadioEntry('During service is on', - _keepScreenOnToOption(KeepScreenOn.serviceOn)), - ], - getter: () => _keepScreenOnToOption(_floatingWindowDisabled - ? KeepScreenOn.never - : optionToKeepScreenOn( - bind.mainGetLocalOption(key: kOptionKeepScreenOn))), - asyncSetter: isOptionFixed(kOptionKeepScreenOn) || _floatingWindowDisabled - ? null - : (value) async { - await bind.mainSetLocalOption( - key: kOptionKeepScreenOn, value: value); - setState(() => _keepScreenOn = optionToKeepScreenOn(value)); - gFFI.serverModel.androidUpdatekeepScreenOn(); - }, - )); + if (isAndroid) { + enhancementsTiles.add(_getPopupDialogRadioEntry( + title: 'Keep screen on', + list: [ + _RadioEntry('Never', _keepScreenOnToOption(KeepScreenOn.never)), + _RadioEntry('During controlled', + _keepScreenOnToOption(KeepScreenOn.duringControlled)), + _RadioEntry('During service is on', + _keepScreenOnToOption(KeepScreenOn.serviceOn)), + ], + getter: () => _keepScreenOnToOption( + _floatingWindowDisabled + ? KeepScreenOn.never + : optionToKeepScreenOn( + bind.mainGetLocalOption(key: kOptionKeepScreenOn))), + asyncSetter: isOptionFixed(kOptionKeepScreenOn) || _floatingWindowDisabled + ? null + : (value) async { + await bind.mainSetLocalOption( + key: kOptionKeepScreenOn, value: value); + setState(() => _keepScreenOn = optionToKeepScreenOn(value)); + gFFI.serverModel.androidUpdatekeepScreenOn(); + }, + )); + } final disabledSettings = bind.isDisableSettings(); final hideSecuritySettings = @@ -688,18 +654,8 @@ class _SettingsState extends State with WidgetsBindingObserver { SettingsTile( title: Obx(() => Text(gFFI.userModel.userName.value.isEmpty ? translate('Login') - : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})')), - leading: Obx(() { - final avatar = bind.mainResolveAvatarUrl( - avatar: gFFI.userModel.avatar.value); - return buildAvatarWidget( - avatar: avatar, - size: 28, - borderRadius: null, - fallback: Icon(Icons.person), - ) ?? - Icon(Icons.person); - }), + : '${translate('Logout')} (${gFFI.userModel.userName.value})')), + leading: Icon(Icons.person), onPressed: (context) { if (gFFI.userModel.userName.value.isEmpty) { loginDialog(); @@ -716,10 +672,7 @@ class _SettingsState extends State with WidgetsBindingObserver { title: Text(translate('ID/Relay Server')), leading: Icon(Icons.cloud), onPressed: (context) { - showServerSettings(gFFI.dialogManager, (callback) async { - _isUsingPublicServer = await bind.mainIsUsingPublicServer(); - setState(callback); - }); + showServerSettings(gFFI.dialogManager); }), if (!_hideNetwork && !_hideProxy) SettingsTile( @@ -743,38 +696,6 @@ class _SettingsState extends State with WidgetsBindingObserver { }); }, ), - if (!_isUsingPublicServer) - SettingsTile.switchTile( - title: Text(translate('Allow insecure TLS fallback')), - initialValue: _allowInsecureTlsFallback, - onToggle: isOptionFixed(kOptionAllowInsecureTLSFallback) - ? null - : (v) async { - await mainSetBoolOption( - kOptionAllowInsecureTLSFallback, v); - final newValue = mainGetBoolOptionSync( - kOptionAllowInsecureTLSFallback); - setState(() { - _allowInsecureTlsFallback = newValue; - }); - }, - ), - if (isAndroid && !outgoingOnly && !_isUsingPublicServer) - SettingsTile.switchTile( - title: Text(translate('Disable UDP')), - initialValue: _disableUdp, - onToggle: isOptionFixed(kOptionDisableUdp) - ? null - : (v) async { - await bind.mainSetOption( - key: kOptionDisableUdp, value: v ? 'Y' : 'N'); - final newValue = - bind.mainGetOptionSync(key: kOptionDisableUdp) == 'Y'; - setState(() { - _disableUdp = newValue; - }); - }, - ), if (!incomingOnly) SettingsTile.switchTile( title: Text(translate('Enable UDP hole punching')), @@ -818,38 +739,7 @@ class _SettingsState extends State with WidgetsBindingObserver { onPressed: (context) { showThemeSettings(gFFI.dialogManager); }, - ), - if (!bind.isDisableAccount()) - SettingsTile.switchTile( - title: Text(translate('note-at-conn-end-tip')), - initialValue: _allowAskForNoteAtEndOfConnection, - onToggle: (v) async { - if (v && !gFFI.userModel.isLogin) { - final res = await loginDialog(); - if (res != true) return; - } - await mainSetLocalBoolOption( - kOptionAllowAskForNoteAtEndOfConnection, v); - final newValue = mainGetLocalBoolOptionSync( - kOptionAllowAskForNoteAtEndOfConnection); - setState(() { - _allowAskForNoteAtEndOfConnection = newValue; - }); - }, - ), - if (!incomingOnly) - SettingsTile.switchTile( - title: - Text(translate('keep-awake-during-outgoing-sessions-label')), - initialValue: _preventSleepWhileConnected, - onToggle: (v) async { - await mainSetLocalBoolOption( - kOptionKeepAwakeDuringOutgoingSessions, v); - setState(() { - _preventSleepWhileConnected = v; - }); - }, - ), + ) ]), if (isAndroid) SettingsSection(title: Text(translate('Hardware Codec')), tiles: [ @@ -925,7 +815,7 @@ class _SettingsState extends State with WidgetsBindingObserver { !outgoingOnly && !hideSecuritySettings) SettingsSection(title: Text('2FA'), tiles: tfaTiles), - if (isAndroid && + if ((isAndroid || isIOS) && !disabledSettings && !outgoingOnly && !hideSecuritySettings) @@ -934,7 +824,7 @@ class _SettingsState extends State with WidgetsBindingObserver { tiles: shareScreenTiles, ), if (!bind.isIncomingOnly()) defaultDisplaySection(), - if (isAndroid && + if ((isAndroid || isIOS) && !disabledSettings && !outgoingOnly && !hideSecuritySettings) diff --git a/flutter/lib/mobile/pages/terminal_page.dart b/flutter/lib/mobile/pages/terminal_page.dart index aff85b40c..d7d17994c 100644 --- a/flutter/lib/mobile/pages/terminal_page.dart +++ b/flutter/lib/mobile/pages/terminal_page.dart @@ -1,16 +1,10 @@ -import 'dart:async'; -import 'dart:math'; -import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_hbb/common.dart'; -import 'package:flutter_hbb/common/widgets/dialog.dart'; import 'package:flutter_hbb/models/model.dart'; import 'package:flutter_hbb/models/terminal_model.dart'; -import 'package:google_fonts/google_fonts.dart'; import 'package:xterm/xterm.dart'; import '../../desktop/pages/terminal_connection_manager.dart'; -import '../../consts.dart'; class TerminalPage extends StatefulWidget { const TerminalPage({ @@ -33,31 +27,13 @@ class TerminalPage extends StatefulWidget { } class _TerminalPageState extends State - with AutomaticKeepAliveClientMixin, WidgetsBindingObserver { + with AutomaticKeepAliveClientMixin { late FFI _ffi; late TerminalModel _terminalModel; - double? _cellHeight; - double _sysKeyboardHeight = 0; - Timer? _keyboardDebounce; - final GlobalKey _keyboardKey = GlobalKey(); - double _keyboardHeight = 0; - late bool _showTerminalExtraKeys; - // For iOS edge swipe gesture - double _swipeStartX = 0; - double _swipeCurrentX = 0; - - // For web only. - // 'monospace' does not work on web, use Google Fonts, `??` is only for null safety. - final String _robotoMonoFontFamily = isWeb - ? (GoogleFonts.robotoMono().fontFamily ?? 'monospace') - : 'monospace'; - - SessionID get sessionId => _ffi.sessionId; @override void initState() { super.initState(); - WidgetsBinding.instance.addObserver(this); debugPrint( '[TerminalPage] Initializing terminal ${widget.terminalId} for peer ${widget.id}'); @@ -76,25 +52,13 @@ class _TerminalPageState extends State debugPrint( '[TerminalPage] Terminal model created for terminal ${widget.terminalId}'); - _terminalModel.onResizeExternal = (w, h, pw, ph) { - _cellHeight = ph * 1.0; - }; - // Register this terminal model with FFI for event routing _ffi.registerTerminalModel(widget.terminalId, _terminalModel); - // Web desktop users have full hardware keyboard access, so the on-screen - // terminal extra keys bar is unnecessary and disabled. - _showTerminalExtraKeys = !isWebDesktop && - mainGetLocalBoolOptionSync(kOptionEnableShowTerminalExtraKeys); // Initialize terminal connection WidgetsBinding.instance.addPostFrameCallback((_) { _ffi.dialogManager .showLoading(translate('Connecting...'), onCancel: closeConnection); - - if (_showTerminalExtraKeys) { - _updateKeyboardHeight(); - } }); _ffi.ffiModel.updateEventListener(_ffi.sessionId, widget.id); } @@ -104,338 +68,39 @@ class _TerminalPageState extends State // Unregister terminal model from FFI _ffi.unregisterTerminalModel(widget.terminalId); _terminalModel.dispose(); - _keyboardDebounce?.cancel(); - WidgetsBinding.instance.removeObserver(this); super.dispose(); TerminalConnectionManager.releaseConnection(widget.id); } - @override - void didChangeMetrics() { - super.didChangeMetrics(); - - _keyboardDebounce?.cancel(); - _keyboardDebounce = Timer(const Duration(milliseconds: 20), () { - final bottomInset = MediaQuery.of(context).viewInsets.bottom; - setState(() { - _sysKeyboardHeight = bottomInset; - }); - }); - } - - void _updateKeyboardHeight() { - if (_keyboardKey.currentContext != null) { - final renderBox = _keyboardKey.currentContext!.findRenderObject() as RenderBox; - _keyboardHeight = renderBox.size.height; - } - } - - EdgeInsets _calculatePadding(double heightPx) { - if (_cellHeight == null) { - return const EdgeInsets.symmetric(horizontal: 5.0, vertical: 2.0); - } - final realHeight = heightPx - _sysKeyboardHeight - _keyboardHeight; - final rows = (realHeight / _cellHeight!).floor(); - final extraSpace = realHeight - rows * _cellHeight!; - final topBottom = max(0.0, extraSpace / 2.0); - return EdgeInsets.only(left: 5.0, right: 5.0, top: topBottom, bottom: topBottom + _sysKeyboardHeight + _keyboardHeight); - } - @override Widget build(BuildContext context) { super.build(context); - return WillPopScope( - onWillPop: () async { - clientClose(sessionId, _ffi); - return false; // Prevent default back behavior - }, - child: buildBody(), - ); - } - - Widget buildBody() { - final scaffold = Scaffold( - resizeToAvoidBottomInset: false, // Disable automatic layout adjustment; manually control UI updates to prevent flickering when the keyboard shows/hides + return Scaffold( backgroundColor: Theme.of(context).scaffoldBackgroundColor, - body: Stack( - children: [ - Positioned.fill( - child: SafeArea( - top: true, - child: LayoutBuilder( - builder: (context, constraints) { - final heightPx = constraints.maxHeight; - return TerminalView( - _terminalModel.terminal, - controller: _terminalModel.terminalController, - autofocus: true, - textStyle: _getTerminalStyle(), - backgroundOpacity: 0.7, - // The following comment is from xterm.dart source code: - // Workaround to detect delete key for platforms and IMEs that do not - // emit a hardware delete event. Preferred on mobile platforms. [false] by - // default. - // - // Android works fine without this workaround. - deleteDetection: isIOS, - padding: _calculatePadding(heightPx), - onSecondaryTapDown: (details, offset) async { - final selection = _terminalModel.terminalController.selection; - if (selection != null) { - final text = _terminalModel.terminal.buffer.getText(selection); - _terminalModel.terminalController.clearSelection(); - await Clipboard.setData(ClipboardData(text: text)); - } else { - final data = await Clipboard.getData('text/plain'); - final text = data?.text; - if (text != null) { - _terminalModel.terminal.paste(text); - } - } - }, - ); - }, - ), - ), - ), - if (_showTerminalExtraKeys) _buildFloatingKeyboard(), - // iOS-style circular close button in top-right corner - if (isIOS) _buildCloseButton(), - ], - ), - ); - - // Add iOS edge swipe gesture to exit (similar to Android back button) - if (isIOS) { - return LayoutBuilder( - builder: (context, constraints) { - final screenWidth = constraints.maxWidth; - // Base thresholds on screen width but clamp to reasonable logical pixel ranges - // Edge detection region: ~10% of width, clamped between 20 and 80 logical pixels - final edgeThreshold = (screenWidth * 0.1).clamp(20.0, 80.0); - // Required horizontal movement: ~25% of width, clamped between 80 and 300 logical pixels - final swipeThreshold = (screenWidth * 0.25).clamp(80.0, 300.0); - - return RawGestureDetector( - behavior: HitTestBehavior.translucent, - gestures: { - HorizontalDragGestureRecognizer: GestureRecognizerFactoryWithHandlers( - () => HorizontalDragGestureRecognizer( - debugOwner: this, - // Only respond to touch input, exclude mouse/trackpad - supportedDevices: kTouchBasedDeviceKinds, - ), - (HorizontalDragGestureRecognizer instance) { - instance - // Capture initial touch-down position (before touch slop) - ..onDown = (details) { - _swipeStartX = details.localPosition.dx; - _swipeCurrentX = details.localPosition.dx; - } - ..onUpdate = (details) { - _swipeCurrentX = details.localPosition.dx; - } - ..onEnd = (details) { - // Check if swipe started from left edge and moved right - if (_swipeStartX < edgeThreshold && (_swipeCurrentX - _swipeStartX) > swipeThreshold) { - clientClose(sessionId, _ffi); - } - _swipeStartX = 0; - _swipeCurrentX = 0; - } - ..onCancel = () { - _swipeStartX = 0; - _swipeCurrentX = 0; - }; - }, - ), - }, - child: scaffold, - ); + body: TerminalView( + _terminalModel.terminal, + controller: _terminalModel.terminalController, + autofocus: true, + backgroundOpacity: 0.7, + padding: const EdgeInsets.symmetric(horizontal: 5.0, vertical: 2.0), + onSecondaryTapDown: (details, offset) async { + final selection = _terminalModel.terminalController.selection; + if (selection != null) { + final text = _terminalModel.terminal.buffer.getText(selection); + _terminalModel.terminalController.clearSelection(); + await Clipboard.setData(ClipboardData(text: text)); + } else { + final data = await Clipboard.getData('text/plain'); + final text = data?.text; + if (text != null) { + _terminalModel.terminal.paste(text); + } + } }, - ); - } - - return scaffold; - } - - Widget _buildCloseButton() { - return Positioned( - top: 0, - right: 0, - child: SafeArea( - minimum: const EdgeInsets.only( - top: 16, // iOS standard margin - right: 16, // iOS standard margin - ), - child: Semantics( - button: true, - label: translate('Close'), - child: Container( - width: 44, // iOS standard tap target size - height: 44, - decoration: BoxDecoration( - color: Colors.black.withOpacity(0.5), // Half transparency - shape: BoxShape.circle, - ), - child: Material( - color: Colors.transparent, - shape: const CircleBorder(), - clipBehavior: Clip.antiAlias, - child: InkWell( - customBorder: const CircleBorder(), - onTap: () { - clientClose(sessionId, _ffi); - }, - child: Tooltip( - message: translate('Close'), - child: const Icon( - Icons.chevron_left, // iOS-style back arrow - color: Colors.white, - size: 28, - ), - ), - ), - ), - ), - ), ), ); } - Widget _buildFloatingKeyboard() { - return AnimatedPositioned( - duration: const Duration(milliseconds: 200), - left: 0, - right: 0, - bottom: _sysKeyboardHeight, - child: Container( - key: _keyboardKey, - color: Theme.of(context).scaffoldBackgroundColor, - padding: EdgeInsets.zero, - child: Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - _buildKeyButton('Esc'), - const SizedBox(width: 2), - _buildKeyButton('/'), - const SizedBox(width: 2), - _buildKeyButton('|'), - const SizedBox(width: 2), - _buildKeyButton('Home'), - const SizedBox(width: 2), - _buildKeyButton('↑'), - const SizedBox(width: 2), - _buildKeyButton('End'), - const SizedBox(width: 2), - _buildKeyButton('PgUp'), - ], - ), - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - _buildKeyButton('Tab'), - const SizedBox(width: 2), - _buildKeyButton('Ctrl+C'), - const SizedBox(width: 2), - _buildKeyButton('~'), - const SizedBox(width: 2), - _buildKeyButton('←'), - const SizedBox(width: 2), - _buildKeyButton('↓'), - const SizedBox(width: 2), - _buildKeyButton('→'), - const SizedBox(width: 2), - _buildKeyButton('PgDn'), - ], - ), - ], - ), - ), - ); - } - - Widget _buildKeyButton(String label) { - return ElevatedButton( - onPressed: () { - _sendKeyToTerminal(label); - }, - child: Text(label), - style: ElevatedButton.styleFrom( - minimumSize: const Size(48, 32), - padding: EdgeInsets.zero, - textStyle: const TextStyle(fontSize: 12), - backgroundColor: Theme.of(context).colorScheme.surfaceVariant, - foregroundColor: Theme.of(context).colorScheme.onSurfaceVariant, - ), - ); - } - - void _sendKeyToTerminal(String key) { - String? send; - - switch (key) { - case 'Esc': - send = '\x1B'; - break; - case 'Tab': - send = '\t'; - break; - case 'Ctrl+C': - send = '\x03'; - break; - - case '↑': - send = '\x1B[A'; - break; - case '↓': - send = '\x1B[B'; - break; - case '→': - send = '\x1B[C'; - break; - case '←': - send = '\x1B[D'; - break; - - case 'Home': - send = '\x1B[H'; - break; - case 'End': - send = '\x1B[F'; - break; - case 'PgUp': - send = '\x1B[5~'; - break; - case 'PgDn': - send = '\x1B[6~'; - break; - - default: - send = key; - break; - } - - if (send != null) { - _terminalModel.sendVirtualKey(send); - } - } - - // https://github.com/TerminalStudio/xterm.dart/issues/42#issuecomment-877495472 - // https://github.com/TerminalStudio/xterm.dart/issues/198#issuecomment-2526548458 - TerminalStyle _getTerminalStyle() { - return isWeb - ? TerminalStyle( - fontFamily: _robotoMonoFontFamily, - fontSize: 14, - ) - : const TerminalStyle(); - } - @override bool get wantKeepAlive => true; } diff --git a/flutter/lib/mobile/pages/view_camera_page.dart b/flutter/lib/mobile/pages/view_camera_page.dart index 08c8cda1a..1b668673a 100644 --- a/flutter/lib/mobile/pages/view_camera_page.dart +++ b/flutter/lib/mobile/pages/view_camera_page.dart @@ -11,6 +11,7 @@ import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; import 'package:flutter_svg/svg.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; +import 'package:wakelock_plus/wakelock_plus.dart'; import '../../common.dart'; import '../../common/widgets/overlay.dart'; @@ -38,11 +39,7 @@ void _disableAndroidSoftKeyboard({bool? isKeyboardVisible}) { class ViewCameraPage extends StatefulWidget { ViewCameraPage( - {Key? key, - required this.id, - this.password, - this.isSharedPassword, - this.forceRelay}) + {Key? key, required this.id, this.password, this.isSharedPassword, this.forceRelay}) : super(key: key); final String id; @@ -61,7 +58,7 @@ class _ViewCameraPageState extends State bool _showGestureHelp = false; Orientation? _currentOrientation; double _viewInsetsBottom = 0; - final _uniqueKey = UniqueKey(); + Timer? _timerDidChangeMetrics; final _blockableOverlayState = BlockableOverlayState(); @@ -99,7 +96,9 @@ class _ViewCameraPageState extends State gFFI.dialogManager .showLoading(translate('Connecting...'), onCancel: closeConnection); }); - WakelockManager.enable(_uniqueKey); + if (!isWeb) { + WakelockPlus.enable(); + } _physicalFocusNode.requestFocus(); gFFI.inputModel.listenToMouse(true); gFFI.qualityMonitorModel.checkShowQualityMonitor(sessionId); @@ -136,7 +135,9 @@ class _ViewCameraPageState extends State gFFI.dialogManager.dismissAll(); await SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: SystemUiOverlay.values); - WakelockManager.disable(_uniqueKey); + if (!isWeb) { + await WakelockPlus.disable(); + } removeSharedStates(widget.id); // `on_voice_call_closed` should be called when the connection is ended. // The inner logic of `on_voice_call_closed` will check if the voice call is active. @@ -192,7 +193,7 @@ class _ViewCameraPageState extends State return WillPopScope( onWillPop: () async { - clientClose(sessionId, gFFI); + clientClose(sessionId, gFFI.dialogManager); return false; }, child: Scaffold( @@ -259,11 +260,13 @@ class _ViewCameraPageState extends State } return Container( color: MyTheme.canvasColor, - child: RawTouchGestureDetectorRegion( - child: getBodyForMobile(), - ffi: gFFI, - isCamera: true, - ), + child: inputModel.isPhysicalMouse.value + ? getBodyForMobile() + : RawTouchGestureDetectorRegion( + child: getBodyForMobile(), + ffi: gFFI, + isCamera: true, + ), ); }), ), @@ -303,7 +306,7 @@ class _ViewCameraPageState extends State color: Colors.white, icon: Icon(Icons.clear), onPressed: () { - clientClose(sessionId, gFFI); + clientClose(sessionId, gFFI.dialogManager); }, ), IconButton( @@ -576,21 +579,13 @@ void showOptions( BuildContext context, String id, OverlayDialogManager dialogManager) async { var displays = []; final pi = gFFI.ffiModel.pi; - final image = gFFI.ffiModel.getConnectionImageText(); + final image = gFFI.ffiModel.getConnectionImage(); if (image != null) { displays.add(Padding(padding: const EdgeInsets.only(top: 8), child: image)); } if (pi.displays.length > 1 && pi.currentDisplay != kAllDisplayValue) { final cur = pi.currentDisplay; final children = []; - final isDarkTheme = MyTheme.currentThemeMode() == ThemeMode.dark; - final numColorSelected = Colors.white; - final numColorUnselected = isDarkTheme ? Colors.grey : Colors.black87; - // We can't use `Theme.of(context).primaryColor` here, the color is: - // - light theme: 0xff2196f3 (Colors.blue) - // - dark theme: 0xff212121 (the canvas color?) - final numBgSelected = - Theme.of(context).colorScheme.primary.withOpacity(0.6); for (var i = 0; i < pi.displays.length; ++i) { children.add(InkWell( onTap: () { @@ -604,12 +599,13 @@ void showOptions( decoration: BoxDecoration( border: Border.all(color: Theme.of(context).hintColor), borderRadius: BorderRadius.circular(2), - color: i == cur ? numBgSelected : null), + color: i == cur + ? Theme.of(context).primaryColor.withOpacity(0.6) + : null), child: Center( child: Text((i + 1).toString(), style: TextStyle( - color: - i == cur ? numColorSelected : numColorUnselected, + color: i == cur ? Colors.white : Colors.black87, fontWeight: FontWeight.bold)))))); } displays.add(Padding( diff --git a/flutter/lib/mobile/widgets/custom_scale_widget.dart b/flutter/lib/mobile/widgets/custom_scale_widget.dart deleted file mode 100644 index 91d538b2c..000000000 --- a/flutter/lib/mobile/widgets/custom_scale_widget.dart +++ /dev/null @@ -1,71 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_hbb/models/model.dart'; -import 'package:flutter_hbb/common.dart'; -import 'package:flutter_hbb/common/widgets/custom_scale_base.dart'; - -class MobileCustomScaleControls extends StatefulWidget { - final FFI ffi; - final ValueChanged? onChanged; - const MobileCustomScaleControls({super.key, required this.ffi, this.onChanged}); - - @override - State createState() => _MobileCustomScaleControlsState(); -} - -class _MobileCustomScaleControlsState extends CustomScaleControls { - @override - FFI get ffi => widget.ffi; - - @override - ValueChanged? get onScaleChanged => widget.onChanged; - - @override - Widget build(BuildContext context) { - // Smaller button size for mobile - const smallBtnConstraints = BoxConstraints(minWidth: 32, minHeight: 32); - - final sliderControl = Slider( - value: scalePos, - min: 0.0, - max: 1.0, - divisions: (CustomScaleControls.maxPercent - CustomScaleControls.minPercent).round(), - label: '$scaleValue%', - onChanged: onSliderChanged, - ); - - return Padding( - padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 8.0), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Text( - '${translate("Scale custom")}: $scaleValue%', - style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500), - ), - const SizedBox(height: 8), - Row( - children: [ - IconButton( - iconSize: 20, - padding: const EdgeInsets.all(4), - constraints: smallBtnConstraints, - icon: const Icon(Icons.remove), - tooltip: translate('Decrease'), - onPressed: () => nudgeScale(-1), - ), - Expanded(child: sliderControl), - IconButton( - iconSize: 20, - padding: const EdgeInsets.all(4), - constraints: smallBtnConstraints, - icon: const Icon(Icons.add), - tooltip: translate('Increase'), - onPressed: () => nudgeScale(1), - ), - ], - ), - ], - ), - ); - } -} diff --git a/flutter/lib/mobile/widgets/dialog.dart b/flutter/lib/mobile/widgets/dialog.dart index 8b645bb88..ebedd79d4 100644 --- a/flutter/lib/mobile/widgets/dialog.dart +++ b/flutter/lib/mobile/widgets/dialog.dart @@ -12,6 +12,100 @@ void _showSuccess() { showToast(translate("Successful")); } +void _showError() { + showToast(translate("Error")); +} + +void setPermanentPasswordDialog(OverlayDialogManager dialogManager) async { + final pw = await bind.mainGetPermanentPassword(); + final p0 = TextEditingController(text: pw); + final p1 = TextEditingController(text: pw); + var validateLength = false; + var validateSame = false; + dialogManager.show((setState, close, context) { + submit() async { + close(); + dialogManager.showLoading(translate("Waiting")); + if (await gFFI.serverModel.setPermanentPassword(p0.text)) { + dialogManager.dismissAll(); + _showSuccess(); + } else { + dialogManager.dismissAll(); + _showError(); + } + } + + return CustomAlertDialog( + title: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon(Icons.password_rounded, color: MyTheme.accent), + Text(translate('Set your own password')).paddingOnly(left: 10), + ], + ), + content: Form( + autovalidateMode: AutovalidateMode.onUserInteraction, + child: Column(mainAxisSize: MainAxisSize.min, children: [ + TextFormField( + autofocus: true, + obscureText: true, + keyboardType: TextInputType.visiblePassword, + decoration: InputDecoration( + labelText: translate('Password'), + ), + controller: p0, + validator: (v) { + if (v == null) return null; + final val = v.trim().length > 5; + if (validateLength != val) { + // use delay to make setState success + Future.delayed(Duration(microseconds: 1), + () => setState(() => validateLength = val)); + } + return val + ? null + : translate('Too short, at least 6 characters.'); + }, + ).workaroundFreezeLinuxMint(), + TextFormField( + obscureText: true, + keyboardType: TextInputType.visiblePassword, + decoration: InputDecoration( + labelText: translate('Confirmation'), + ), + controller: p1, + validator: (v) { + if (v == null) return null; + final val = p0.text == v; + if (validateSame != val) { + Future.delayed(Duration(microseconds: 1), + () => setState(() => validateSame = val)); + } + return val + ? null + : translate('The confirmation is not identical.'); + }, + ).workaroundFreezeLinuxMint(), + ])), + onCancel: close, + onSubmit: (validateLength && validateSame) ? submit : null, + actions: [ + dialogButton( + 'Cancel', + icon: Icon(Icons.close_rounded), + onPressed: close, + isOutline: true, + ), + dialogButton( + 'OK', + icon: Icon(Icons.done_rounded), + onPressed: (validateLength && validateSame) ? submit : null, + ), + ], + ); + }); +} + void setTemporaryPasswordLengthDialog( OverlayDialogManager dialogManager) async { List lengths = ['6', '8', '10']; @@ -53,22 +147,18 @@ void setTemporaryPasswordLengthDialog( }, backDismiss: true, clickMaskDismiss: true); } -void showServerSettings(OverlayDialogManager dialogManager, - void Function(VoidCallback) setState) async { +void showServerSettings(OverlayDialogManager dialogManager) async { Map options = {}; try { options = jsonDecode(await bind.mainGetOptions()); } catch (e) { print("Invalid server config: $e"); } - showServerSettingsWithValue( - ServerConfig.fromOptions(options), dialogManager, setState); + showServerSettingsWithValue(ServerConfig.fromOptions(options), dialogManager); } void showServerSettingsWithValue( - ServerConfig serverConfig, - OverlayDialogManager dialogManager, - void Function(VoidCallback)? upSetState) async { + ServerConfig serverConfig, OverlayDialogManager dialogManager) async { var isInProgress = false; final idCtrl = TextEditingController(text: serverConfig.idServer); final relayCtrl = TextEditingController(text: serverConfig.relayServer); @@ -198,7 +288,6 @@ void showServerSettingsWithValue( if (await submit()) { close(); showToast(translate('Successful')); - upSetState?.call(() {}); } else { showToast(translate('Failed')); } diff --git a/flutter/lib/mobile/widgets/floating_mouse.dart b/flutter/lib/mobile/widgets/floating_mouse.dart deleted file mode 100644 index d18011c63..000000000 --- a/flutter/lib/mobile/widgets/floating_mouse.dart +++ /dev/null @@ -1,1209 +0,0 @@ -// This floating mouse widget simulates a physical mouse when connecting from mobile to desktop in touch mode. - -import 'dart:async'; -import 'dart:math'; -import 'package:flutter/material.dart'; -import 'package:flutter_hbb/common.dart'; -import 'package:flutter_hbb/models/input_model.dart'; -import 'package:flutter_hbb/models/model.dart'; -import 'package:flutter_hbb/utils/image.dart'; -import 'package:provider/provider.dart'; - -const int _kDotCount = 60; -const double _kDotAngle = 2 * pi / _kDotCount; -final Color _kDefaultColor = Colors.grey.withOpacity(0.7); -final Color _kDefaultHighlightColor = Colors.white24.withOpacity(0.7); -final Color _kTapDownColor = Colors.blue.withOpacity(0.7); -const double _baseMouseWidth = 112.0; -const double _baseMouseHeight = 138.0; -const double _kShowPressedScale = 1.2; -const double kScaleMax = 1.8; -const double kScaleMin = 0.8; - -double? _tryParseCoordinateFromEvt(Map? evt, String key) { - if (evt == null) return null; - final coord = evt[key]; - if (coord == null) return null; - return double.tryParse(coord); -} - -class FloatingMouse extends StatefulWidget { - final FFI ffi; - const FloatingMouse({ - super.key, - required this.ffi, - }); - - @override - State createState() => _FloatingMouseState(); -} - -class _CanvasScrollState { - static const double speedPressed = 3.0; - final InputModel inputModel; - final CanvasModel canvasModel; - final int _intervalMillis = 30; - Timer? _timer; - double _dx = 0; - double _dy = 0; - double _speed = 1.0; - Rect _displayRect = Rect.zero; - Offset _mouseGlobalPosition = Offset.zero; - - _CanvasScrollState({required this.inputModel, required this.canvasModel}); - - double get step => 5.0 * canvasModel.scale; - - set scrollX(double speed) { - _dx = step; - setSpeed(speed); - } - - set scrollY(double speed) { - _dy = step; - setSpeed(speed); - } - - void tryCancel() { - _dx = 0; - _dy = 0; - if (_timer == null) return; - _timer?.cancel(); - _timer = null; - } - - void setPressedSpeed() { - setSpeed(_speed > 0 - ? _CanvasScrollState.speedPressed - : -_CanvasScrollState.speedPressed); - } - - void setReleasedSpeed() { - setSpeed(_speed > 0 ? 1.0 : -1.0); - } - - void setSpeed(double newSpeed) { - _speed = newSpeed; - if (_speed > 0) { - _speed = _speed.clamp(0.1, 10.0); - } else { - _speed = _speed.clamp(-10.0, -0.1); - } - if (_dx != 0) { - _dx = step * _speed; - } else if (_dy != 0) { - _dy = step * _speed; - } - } - - void tryStart(Rect displayRect, Offset mouseGlobalPosition) { - _displayRect = displayRect; - _mouseGlobalPosition = mouseGlobalPosition; - if (_timer != null) return; - _timer = Timer.periodic(Duration(milliseconds: _intervalMillis), (timer) { - if (_dx == 0 && _dy == 0) { - tryCancel(); - } else { - if (_dx != 0) { - canvasModel.panX(_dx); - } - if (_dy != 0) { - canvasModel.panY(_dy); - } - final evt = inputModel.processEventToPeer( - InputModel.getMouseEventMove(), _mouseGlobalPosition, - moveCanvas: false); - if (shouldCancelScrollTimer(evt)) { - tryCancel(); - } - } - }); - } - - bool shouldCancelScrollTimer(Map? evt) { - if (evt == null) { - return true; - } - double s = canvasModel.scale; - assert(s > 0, 'canvasModel.scale should always be positive'); - if (s <= 0) { - return true; - } - if (_dx != 0) { - final x = _tryParseCoordinateFromEvt(evt, 'x'); - if (x == null) { - return true; - } else { - if (_dx < 0) { - if (isDoubleEqual(_displayRect.right - 1, x)) { - return true; - } else { - final dxDisplay = _dx / s; - if ((x - dxDisplay) > (_displayRect.right - 1)) { - canvasModel.panX((x - _displayRect.right + 1) * s); - return true; - } - } - } else { - if (isDoubleEqual(x, _displayRect.left)) { - return true; - } else { - final dxDisplay = _dx / s; - if ((x - dxDisplay) < _displayRect.left) { - canvasModel.panX((x - _displayRect.left) * s); - return true; - } - } - } - } - } - if (_dy != 0) { - final y = _tryParseCoordinateFromEvt(evt, 'y'); - if (y == null) { - return true; - } else { - if (_dy < 0) { - if (isDoubleEqual(_displayRect.bottom - 1, y)) { - return true; - } else { - final dyDisplay = _dy / s; - if ((y - dyDisplay) > (_displayRect.bottom - 1)) { - canvasModel.panY((y - _displayRect.bottom + 1) * s); - return true; - } - } - } else { - if (isDoubleEqual(y, _displayRect.top)) { - return true; - } else { - final dyDisplay = _dy / s; - if ((y - dyDisplay) < _displayRect.top) { - canvasModel.panY((y - _displayRect.top) * s); - return true; - } - } - } - } - } - return false; - } -} - -class _FloatingMouseState extends State { - Rect? _lastBlockedRect; - final GlobalKey _scrollWheelUpKey = GlobalKey(); - final GlobalKey _scrollWheelDownKey = GlobalKey(); - final GlobalKey _mouseWidgetKey = GlobalKey(); - final GlobalKey _cursorPaintKey = GlobalKey(); - - Offset _position = Offset.zero; - bool _isInitialized = false; - double _baseMouseScale = 1.0; - double _mouseScale = 1.0; - bool _isExpanded = true; - bool _isScrolling = false; - Offset? _scrollCenter; - double _snappedPointerAngle = 0.0; - double? _lastSnappedAngle; - late final _CanvasScrollState _canvasScrollState; - Orientation? _previousOrientation; - Timer? _collapseTimer; - late final VirtualMouseMode _virtualMouseMode; - - void _resetCollapseTimer() { - _collapseTimer?.cancel(); - if (_isExpanded) { - _collapseTimer = Timer(const Duration(seconds: 7), () { - if (mounted && _isExpanded) { - final minMouseScale = (_baseMouseScale * 0.3); - setState(() { - _mouseScale = minMouseScale; - _isExpanded = false; - _position += _expandOffset; - }); - } - }); - } - } - - double get mouseWidth => _baseMouseWidth * _mouseScale; - double get mouseHeight => _baseMouseHeight * _mouseScale; - - InputModel get _inputModel => widget.ffi.inputModel; - CursorModel get _cursorModel => widget.ffi.cursorModel; - CanvasModel get _canvasModel => widget.ffi.canvasModel; - - Offset get _expandOffset => - Offset(84 * _baseMouseScale, 12 * _baseMouseScale); - - @override - void initState() { - super.initState(); - _virtualMouseMode = widget.ffi.ffiModel.virtualMouseMode; - _virtualMouseMode.addListener(_onVirtualMouseModeChanged); - _canvasScrollState = - _CanvasScrollState(inputModel: _inputModel, canvasModel: _canvasModel); - _cursorModel.blockEvents = false; - WidgetsBinding.instance.addPostFrameCallback((_) { - _resetPosition(); - _resetCollapseTimer(); - }); - } - - void _onVirtualMouseModeChanged() { - if (mounted) { - setState(() { - if (_virtualMouseMode.showVirtualMouse) { - _isExpanded = true; - _resetCollapseTimer(); - } - }); - } - } - - @override - void didChangeDependencies() { - super.didChangeDependencies(); - final currentOrientation = MediaQuery.of(context).orientation; - if (_previousOrientation != null && - _previousOrientation != currentOrientation) { - _resetPosition(); - } - _previousOrientation = currentOrientation; - } - - void _resetPosition() { - setState(() { - final size = MediaQuery.of(context).size; - _position = Offset( - (size.width - _baseMouseWidth * _mouseScale) / 2, - (size.height - _baseMouseHeight * _mouseScale) / 2, - ); - _isInitialized = true; - }); - WidgetsBinding.instance.addPostFrameCallback((_) { - if (mounted) _updateBlockedRect(); - }); - } - - @override - void dispose() { - if (_lastBlockedRect != null) { - _cursorModel.removeBlockedRect(_lastBlockedRect!); - } - _virtualMouseMode.removeListener(_onVirtualMouseModeChanged); - _canvasScrollState.tryCancel(); - _cursorModel.blockEvents = false; - _collapseTimer?.cancel(); - super.dispose(); - } - - void _updateBlockedRect() { - final context = _mouseWidgetKey.currentContext; - if (context == null) return; - final renderBox = context.findRenderObject() as RenderBox?; - if (renderBox == null || !renderBox.attached) return; - - final newRect = renderBox.localToGlobal(Offset.zero) & renderBox.size; - - if (_lastBlockedRect != null) { - _cursorModel.removeBlockedRect(_lastBlockedRect!); - } - _cursorModel.addBlockedRect(newRect); - _lastBlockedRect = newRect; - } - - Offset _getMouseGlobalPosition() { - final RenderBox? renderBox = - _cursorPaintKey.currentContext?.findRenderObject() as RenderBox?; - if (renderBox != null) { - return renderBox.localToGlobal(Offset.zero); - } else { - return _position; - } - } - - static Offset? _getPositionFromMouseRetEvt(Map? evt) { - final x = _tryParseCoordinateFromEvt(evt, 'x'); - final y = _tryParseCoordinateFromEvt(evt, 'y'); - if (x == null || y == null) { - return null; - } - return Offset(x, y); - } - - // Returns true if [value] is within 2.01 pixels of [edge]. - // We need this near check because it can make the auto scroll easier to trigger and control. - bool _isValueNearEdge(double edge, double value) { - return (value - edge).abs() < 2.01; - } - - bool _isValueAtEdge(double edge, double value) { - return (value - edge).abs() < 0.01; - } - - bool _isValueAtOrOutsideEdge(double edge, double? value) { - // If value is null, then consider it outside the edge. - return value == null || isDoubleEqual(value, edge); - } - - // If the mouse is very close to the edge of the display, - // we can only start auto scroll when the mouse is at the edge of the screen. - bool _shouldAutoScrollIfCursorNearRemoteEdge(double remoteEdge, - double remoteValue, double localEdge, double localValue) { - if ((remoteEdge - remoteValue).abs() < 100.0) { - if (!_isValueAtEdge(localEdge, localValue)) { - return false; - } - } - return true; - } - - void _onMoveUpdateDelta(Offset delta) { - _resetCollapseTimer(); - final context = this.context; - final size = MediaQuery.of(context).size; - Offset newPosition = _position + delta; - double minX = 0; - double minY = 0; - double maxX = size.width - mouseWidth; - double maxY = size.height - mouseHeight; - newPosition = Offset( - newPosition.dx.clamp(minX, maxX), - newPosition.dy.clamp(minY, maxY), - ); - setState(() { - final isPositionChanged = !(isDoubleEqual(newPosition.dx, _position.dx) && - isDoubleEqual(newPosition.dy, _position.dy)); - _position = newPosition; - if (!_isExpanded) { - return; - } - - Offset? mouseGlobalPosition; - Offset? positionInRemoteDisplay; - if (isPositionChanged) { - mouseGlobalPosition = _getMouseGlobalPosition(); - final evt = _inputModel.handleMouse( - InputModel.getMouseEventMove(), mouseGlobalPosition, - moveCanvas: false); - positionInRemoteDisplay = _getPositionFromMouseRetEvt(evt); - WidgetsBinding.instance.addPostFrameCallback((_) { - if (mounted) _updateBlockedRect(); - }); - } - - // Get the display rect - final displayRect = widget.ffi.ffiModel.displaysRect(); - if (displayRect == null) { - _canvasScrollState.tryCancel(); - return; - } - - // Get the mouse global position and position in remote display - mouseGlobalPosition ??= _getMouseGlobalPosition(); - if (positionInRemoteDisplay == null) { - final evt = _inputModel.processEventToPeer( - InputModel.getMouseEventMove(), mouseGlobalPosition, - moveCanvas: false); - positionInRemoteDisplay = _getPositionFromMouseRetEvt(evt); - } - - // Check if need to start auto canvas scroll - // If: - // 1. The mouse is near the edge of the screen. - // 2. The position in remote display is in the rect of the display. - // 3. If the remote cursor is near the edge of the remote display, - // then the local mouse must be at the edge of the screen. - // Then start auto canvas scroll. - if (_isValueNearEdge(minX, _position.dx)) { - bool shouldStartScroll = true; - if (_isValueAtOrOutsideEdge( - displayRect.left, positionInRemoteDisplay?.dx)) { - shouldStartScroll = false; - } - if (positionInRemoteDisplay != null) { - if (!_shouldAutoScrollIfCursorNearRemoteEdge(displayRect.left, - positionInRemoteDisplay.dx, minX, _position.dx)) { - shouldStartScroll = false; - } - } - if (!shouldStartScroll) { - _canvasScrollState.tryCancel(); - return; - } - _canvasScrollState.scrollX = 1.0 * _CanvasScrollState.speedPressed; - } else if (_isValueNearEdge(minY, _position.dy)) { - bool shouldStartScroll = true; - if (_isValueAtOrOutsideEdge( - displayRect.top, positionInRemoteDisplay?.dy)) { - shouldStartScroll = false; - } - if (positionInRemoteDisplay != null) { - if (!_shouldAutoScrollIfCursorNearRemoteEdge(displayRect.top, - positionInRemoteDisplay.dy, minY, _position.dy)) { - shouldStartScroll = false; - } - } - if (!shouldStartScroll) { - _canvasScrollState.tryCancel(); - return; - } - _canvasScrollState.scrollY = 1.0 * _CanvasScrollState.speedPressed; - } else if (_isValueNearEdge(maxX, _position.dx)) { - bool shouldStartScroll = true; - if (_isValueAtOrOutsideEdge( - displayRect.right - 1, positionInRemoteDisplay?.dx)) { - shouldStartScroll = false; - } - if (positionInRemoteDisplay != null) { - if (!_shouldAutoScrollIfCursorNearRemoteEdge(displayRect.right - 1, - positionInRemoteDisplay.dx, maxX, _position.dx)) { - shouldStartScroll = false; - } - } - if (!shouldStartScroll) { - _canvasScrollState.tryCancel(); - return; - } - _canvasScrollState.scrollX = -1.0 * _CanvasScrollState.speedPressed; - } else if (_isValueNearEdge(maxY, _position.dy)) { - bool shouldStartScroll = true; - if (_isValueAtOrOutsideEdge( - displayRect.bottom - 1, positionInRemoteDisplay?.dy)) { - shouldStartScroll = false; - } - if (positionInRemoteDisplay != null) { - if (!_shouldAutoScrollIfCursorNearRemoteEdge(displayRect.bottom - 1, - positionInRemoteDisplay.dy, maxY, _position.dy)) { - shouldStartScroll = false; - } - } - if (!shouldStartScroll) { - _canvasScrollState.tryCancel(); - return; - } - _canvasScrollState.scrollY = -1.0 * _CanvasScrollState.speedPressed; - } else { - _canvasScrollState.tryCancel(); - return; - } - _canvasScrollState.tryStart(displayRect, mouseGlobalPosition); - }); - } - - void _onDragHandleUpdate(DragUpdateDetails details) => - _onMoveUpdateDelta(details.delta); - - void _onBodyPointerMoveUpdate(PointerMoveEvent event) => - _onMoveUpdateDelta(event.delta); - - bool _containsPosition(GlobalKey key, Offset pos) { - final contextScroll = key.currentContext; - if (contextScroll == null) return false; - final RenderBox? scrollWheelBox = - contextScroll.findRenderObject() as RenderBox?; - if (scrollWheelBox == null || !scrollWheelBox.attached) return false; - Rect rect = scrollWheelBox.localToGlobal(Offset.zero) & scrollWheelBox.size; - return rect.contains(pos); - } - - void _handlePointerDown(PointerDownEvent event) { - _resetCollapseTimer(); - if (_isScrolling) return; - if (_containsPosition(_scrollWheelUpKey, event.position) || - _containsPosition(_scrollWheelDownKey, event.position)) { - final contextMouse = _mouseWidgetKey.currentContext; - if (contextMouse == null) return; - final RenderBox? mouseBox = contextMouse.findRenderObject() as RenderBox?; - if (mouseBox == null || !mouseBox.attached) return; - - // Only enter scroll mode when all RenderObjects are available. - final Offset mouseTopLeft = mouseBox.localToGlobal(Offset.zero); - final Size mouseSize = mouseBox.size; - final Offset center = - mouseTopLeft + Offset(mouseSize.width / 2, mouseSize.height / 2); - - final vector = event.position - center; - final rawAngle = atan2(vector.dy, vector.dx); - - final closestDotIndex = (rawAngle / _kDotAngle).round(); - _lastSnappedAngle = closestDotIndex * _kDotAngle; - - setState(() { - _isScrolling = true; - _cursorModel.blockEvents = true; - _scrollCenter = center; - _snappedPointerAngle = _lastSnappedAngle!; - }); - } - } - - void _handlePointerMove(PointerMoveEvent event) { - _resetCollapseTimer(); - if (!_isScrolling || _scrollCenter == null || _lastSnappedAngle == null) { - return; - } - - final touchPosition = event.position; - final vector = touchPosition - _scrollCenter!; - final rawCurrentAngle = atan2(vector.dy, vector.dx); - - final closestDotIndex = (rawCurrentAngle / _kDotAngle).round(); - final snappedCurrentAngle = closestDotIndex * _kDotAngle; - - if (snappedCurrentAngle == _lastSnappedAngle) return; - - double deltaAngle = snappedCurrentAngle - _lastSnappedAngle!; - - if (deltaAngle.abs() > pi) { - deltaAngle = (deltaAngle > 0) ? deltaAngle - 2 * pi : deltaAngle + 2 * pi; - } - - _lastSnappedAngle = snappedCurrentAngle; - - setState(() { - _snappedPointerAngle = snappedCurrentAngle; - _inputModel.scroll(deltaAngle > 0 ? -1 : 1); - }); - } - - void _tryCancelScrolling() { - _resetCollapseTimer(); - if (!_isScrolling) return; - setState(() { - _isScrolling = false; - _cursorModel.blockEvents = false; - _lastSnappedAngle = null; - _scrollCenter = null; - }); - } - - void _handlePointerUp(PointerUpEvent event) => _tryCancelScrolling(); - void _handlePointerCancel(PointerCancelEvent event) => _tryCancelScrolling(); - - @override - Widget build(BuildContext context) { - if (!_isInitialized) { - return const Offstage(); - } - final virtualMouseMode = _virtualMouseMode; - if (!virtualMouseMode.showVirtualMouse) { - return const Offstage(); - } - _baseMouseScale = virtualMouseMode.virtualMouseScale; - if (_isExpanded) { - _mouseScale = _baseMouseScale; - } else { - final minMouseScale = (_baseMouseScale * 0.3); - _mouseScale = minMouseScale; - } - return Listener( - onPointerDown: _isExpanded ? _handlePointerDown : null, - onPointerMove: _handlePointerMove, - onPointerUp: _handlePointerUp, - onPointerCancel: _handlePointerCancel, - behavior: HitTestBehavior.translucent, - child: Stack( - children: [ - if (!_isScrolling) - Positioned( - left: _position.dx, - top: _position.dy, - child: _buildMouseWithHide(), - ), - if (_isScrolling && _scrollCenter != null) - Positioned.fill( - child: Builder( - builder: (context) { - final RenderBox? customPaintBox = - context.findRenderObject() as RenderBox?; - if (customPaintBox == null || !customPaintBox.attached) { - WidgetsBinding.instance.addPostFrameCallback((_) { - if (mounted && _isScrolling) setState(() {}); - }); - return const SizedBox.expand(); - } - final Offset customPaintTopLeft = - customPaintBox.localToGlobal(Offset.zero); - final Offset localCenter = - _scrollCenter! - customPaintTopLeft; - return CustomPaint( - painter: DottedCirclePainter( - center: localCenter, - pointerAngle: _snappedPointerAngle, - scale: _mouseScale, - ), - ); - }, - ), - ), - ], - ), - ); - } - - Widget _buildMouseWithHide() { - double minMouseScale = (_baseMouseScale * 0.3); - if (!_isExpanded) { - return SizedBox( - width: mouseWidth, - height: mouseHeight, - child: GestureDetector( - onPanUpdate: _onDragHandleUpdate, - onTap: () { - setState(() { - _mouseScale = _baseMouseScale; - _isExpanded = true; - _position -= _expandOffset; - }); - _resetCollapseTimer(); - }, - child: MouseBody( - scrollWheelUpKey: _scrollWheelUpKey, - scrollWheelDownKey: _scrollWheelDownKey, - mouseWidgetKey: _mouseWidgetKey, - inputModel: _isExpanded ? _inputModel : null, - scale: _mouseScale, - resetCollapseTimer: _resetCollapseTimer, - ), - )); - } else { - return SizedBox( - width: mouseWidth, - height: mouseHeight, - child: Column( - children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - CursorPaint( - key: _cursorPaintKey, - scale: _mouseScale, - ), - const Spacer(), - GestureDetector( - onTap: () { - _collapseTimer?.cancel(); - setState(() { - _mouseScale = minMouseScale; - _isExpanded = false; - _position += _expandOffset; - }); - }, - child: Container( - width: 18 * _mouseScale, - height: 18 * _mouseScale, - child: Center( - child: Container( - width: 14 * _mouseScale, - height: 14 * _mouseScale, - decoration: const BoxDecoration( - color: Colors.grey, - shape: BoxShape.circle, - ), - alignment: Alignment.center, - child: Icon(Icons.close, - color: Colors.white, size: 12 * _mouseScale), - ), - ), - ), - ), - ], - ), - Padding( - padding: EdgeInsets.only(left: 14 * _mouseScale), - child: MouseBody( - scrollWheelUpKey: _scrollWheelUpKey, - scrollWheelDownKey: _scrollWheelDownKey, - mouseWidgetKey: _mouseWidgetKey, - onPointerMoveUpdate: _onBodyPointerMoveUpdate, - cancelCanvasScroll: _canvasScrollState.tryCancel, - setCanvasScrollPressed: _canvasScrollState.setPressedSpeed, - setCanvasScrollReleased: _canvasScrollState.setReleasedSpeed, - inputModel: _isExpanded ? _inputModel : null, - scale: _mouseScale, - resetCollapseTimer: _resetCollapseTimer, - )), - ], - ), - ); - } - } -} - -class MouseBody extends StatefulWidget { - final GlobalKey scrollWheelUpKey; - final GlobalKey scrollWheelDownKey; - final GlobalKey mouseWidgetKey; - final Function(PointerMoveEvent)? onPointerMoveUpdate; - final Function()? cancelCanvasScroll; - final Function()? setCanvasScrollPressed; - final Function()? setCanvasScrollReleased; - final InputModel? inputModel; - final double scale; - final Function()? resetCollapseTimer; - const MouseBody({ - super.key, - required this.scrollWheelUpKey, - required this.scrollWheelDownKey, - required this.mouseWidgetKey, - required this.scale, - this.inputModel, - this.onPointerMoveUpdate, - this.cancelCanvasScroll, - this.setCanvasScrollPressed, - this.setCanvasScrollReleased, - this.resetCollapseTimer, - }); - - @override - State createState() => _MouseBodyState(); -} - -class WidgetScale { - final double scale; - final double translateScale; - - const WidgetScale({required this.scale, required this.translateScale}); - - static WidgetScale getScale(bool down, double s) { - if (down) { - return WidgetScale( - scale: s * _kShowPressedScale, - translateScale: s * (_kShowPressedScale - 1.0) * 0.5); - } else { - return WidgetScale(scale: s, translateScale: 0.0); - } - } -} - -class _MouseBodyState extends State { - bool _leftDown = false; - bool _rightDown = false; - bool _midDown = false; - bool _dragDown = false; - - Widget _buildScrollUpDown(GlobalKey key, IconData iconData, double s) { - return Container( - key: key, - height: 17 * s, - child: Icon( - iconData, - color: _kDefaultHighlightColor, - size: 14 * s, - ), - ); - } - - Widget _buildScrollMidButton(double s) { - return Listener( - onPointerDown: widget.inputModel != null - ? (event) { - widget.resetCollapseTimer?.call(); - setState(() { - _midDown = true; - widget.inputModel?.tapDown(MouseButtons.wheel); - }); - } - : null, - onPointerUp: widget.inputModel != null - ? (event) { - setState(() { - _midDown = false; - widget.inputModel?.tapUp(MouseButtons.wheel); - widget.cancelCanvasScroll?.call(); - }); - } - : null, - onPointerCancel: widget.inputModel != null - ? (event) { - setState(() { - _midDown = false; - widget.inputModel?.tapUp(MouseButtons.wheel); - widget.cancelCanvasScroll?.call(); - }); - } - : null, - onPointerMove: widget.onPointerMoveUpdate, - behavior: HitTestBehavior.opaque, - child: Container( - height: 28 * s, - child: Center( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Container( - width: 6 * s, - height: 2 * s, - color: _kDefaultHighlightColor, - ), - SizedBox(height: 3 * s), - Container( - width: 8 * s, - height: 2 * s, - color: _kDefaultHighlightColor, - ), - SizedBox(height: 3 * s), - Container( - width: 6 * s, - height: 2 * s, - color: _kDefaultHighlightColor, - ), - ], - ), - ), - ), - ); - } - - @override - Widget build(BuildContext context) { - final s = widget.scale; - final leftScale = WidgetScale.getScale(_leftDown, s); - final rightScale = WidgetScale.getScale(_rightDown, s); - final midScale = WidgetScale.getScale(_midDown, s); - return Row( - children: [ - SizedBox( - key: widget.mouseWidgetKey, - width: 80 * s, - height: 120 * s, - child: Column( - children: [ - SizedBox( - height: 55 * s, - child: Stack( - clipBehavior: Clip.none, - children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - // Left button - Transform.translate( - offset: Offset( - -(80 - 24) * 0.5 * leftScale.translateScale, - -32 * leftScale.translateScale), - child: SizedBox( - width: (80 - 24) * 0.5 * leftScale.scale, - child: Listener( - onPointerMove: widget.onPointerMoveUpdate, - onPointerDown: widget.inputModel != null - ? (event) { - widget.resetCollapseTimer?.call(); - setState(() { - _leftDown = true; - widget.inputModel - ?.tapDown(MouseButtons.left); - }); - } - : null, - onPointerUp: widget.inputModel != null - ? (event) => setState(() { - _leftDown = false; - widget.inputModel - ?.tapUp(MouseButtons.left); - widget.cancelCanvasScroll?.call(); - }) - : null, - onPointerCancel: widget.inputModel != null - ? (event) => setState(() { - _leftDown = false; - widget.inputModel - ?.tapUp(MouseButtons.left); - widget.cancelCanvasScroll?.call(); - }) - : null, - child: Container( - decoration: BoxDecoration( - color: _leftDown - ? _kTapDownColor - : _kDefaultColor, - borderRadius: BorderRadius.only( - topLeft: Radius.circular(22 * s)), - ), - margin: EdgeInsets.only(right: 0.5 * s), - ), - ), - ), - ), - const Spacer(), - Transform.translate( - offset: Offset( - (80 - 24) * 0.5 * rightScale.translateScale, - -32 * rightScale.translateScale), - child: SizedBox( - width: (80 - 24) * 0.5 * rightScale.scale, - child: Listener( - onPointerMove: widget.onPointerMoveUpdate, - onPointerDown: widget.inputModel != null - ? (event) { - widget.resetCollapseTimer?.call(); - setState(() { - _rightDown = true; - widget.inputModel - ?.tapDown(MouseButtons.right); - }); - } - : null, - onPointerUp: widget.inputModel != null - ? (event) => setState(() { - _rightDown = false; - widget.inputModel - ?.tapUp(MouseButtons.right); - widget.cancelCanvasScroll?.call(); - }) - : null, - onPointerCancel: widget.inputModel != null - ? (event) => setState(() { - _rightDown = false; - widget.inputModel - ?.tapUp(MouseButtons.right); - widget.cancelCanvasScroll?.call(); - }) - : null, - child: Container( - decoration: BoxDecoration( - color: _rightDown - ? _kTapDownColor - : _kDefaultColor, - borderRadius: BorderRadius.only( - topRight: Radius.circular(22 * s)), - ), - margin: EdgeInsets.only(left: 0.5 * s), - ), - ), - ), - ), - ], - ), - // Middle function area overflows Row bottom - Positioned( - left: (80 * s - 22 * s) / 2, - top: 0, - child: Transform.translate( - offset: Offset(0, -2 * s), - child: Container( - width: 22 * s, - height: 67 * s, - decoration: BoxDecoration( - color: Colors.grey.withOpacity(0.7), - borderRadius: BorderRadius.vertical( - top: Radius.circular(12 * s), - bottom: Radius.circular(16 * s), - ), - ), - padding: EdgeInsets.symmetric(vertical: 2 * s), - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - _buildScrollUpDown(widget.scrollWheelUpKey, - Icons.keyboard_arrow_up, midScale.scale), - _buildScrollMidButton(midScale.scale), - _buildScrollUpDown(widget.scrollWheelDownKey, - Icons.keyboard_arrow_down, midScale.scale), - ], - ), - ), - ), - ), - ], - ), - ), - // Thin gap separates upper and lower parts - SizedBox(height: 1 * s), - // Bottom part: drag area (top middle indentation) - Expanded( - child: Listener( - onPointerMove: widget.onPointerMoveUpdate, - onPointerDown: widget.inputModel != null - ? (event) { - widget.resetCollapseTimer?.call(); - setState(() { - _dragDown = true; - }); - widget.setCanvasScrollPressed?.call(); - } - : null, - onPointerUp: widget.inputModel != null - ? (event) { - setState(() { - _dragDown = false; - }); - widget.setCanvasScrollReleased?.call(); - } - : null, - onPointerCancel: widget.inputModel != null - ? (event) { - setState(() { - _dragDown = false; - }); - widget.setCanvasScrollReleased?.call(); - } - : null, - behavior: HitTestBehavior.opaque, - child: CustomPaint( - painter: DragAreaTopIndentPainter( - color: _dragDown ? _kTapDownColor : _kDefaultColor, - scale: widget.scale), - child: Container( - width: 80 * s, - alignment: Alignment.center, - child: Transform.rotate( - angle: pi / 2, - child: Icon(Icons.drag_indicator, - color: _kDefaultHighlightColor, size: 18 * s), - ), - ), - ), - ), - ), - ], - ), - ), - const Spacer() - ], - ); - } -} - -class DottedCirclePainter extends CustomPainter { - final Offset center; - final double pointerAngle; - final double scale; - final Offset? scrollWheelCenter; - - DottedCirclePainter( - {required this.center, - required this.pointerAngle, - required this.scale, - this.scrollWheelCenter}); - - @override - void paint(Canvas canvas, Size size) { - final radius = 48.0 * scale; - final circlePaint = Paint() - ..color = Colors.grey.shade400 - ..style = PaintingStyle.fill; - final pointerPaint = Paint() - ..color = Colors.blue - ..style = PaintingStyle.fill; - - const dotRadius = 2.5; - for (int i = 0; i < _kDotCount; i += 3) { - final angle = i * _kDotAngle; - final dotX = center.dx + radius * cos(angle); - final dotY = center.dy + radius * sin(angle); - canvas.drawCircle(Offset(dotX, dotY), dotRadius, circlePaint); - } - - final pointerX = center.dx + radius * cos(pointerAngle); - final pointerY = center.dy + radius * sin(pointerAngle); - final pointerPosition = Offset(pointerX, pointerY); - canvas.drawCircle(pointerPosition, 8.0, pointerPaint); - } - - @override - bool shouldRepaint(covariant DottedCirclePainter oldDelegate) { - return oldDelegate.pointerAngle != pointerAngle || - oldDelegate.center != center || - oldDelegate.scrollWheelCenter != scrollWheelCenter; - } -} - -// Painter for the bottom center indentation of the drag area -class BottomIndentPainter extends CustomPainter { - @override - void paint(Canvas canvas, Size size) { - final paint = Paint() - ..color = Colors.grey.withOpacity(0.7) - ..style = PaintingStyle.fill; - // Draw bottom semicircle - final center = Offset(size.width / 2, size.height); - canvas.drawArc( - Rect.fromCenter(center: center, width: size.width, height: size.height), - pi, - pi, - false, - paint, - ); - // Use background color to carve a circular notch in the middle - final clearPaint = Paint()..blendMode = BlendMode.clear; - canvas.drawCircle(Offset(size.width / 2, size.height - 10), 10, clearPaint); - } - - @override - bool shouldRepaint(covariant CustomPainter oldDelegate) => false; -} - -// Painter for the top center indentation of the drag area -class DragAreaTopIndentPainter extends CustomPainter { - final double scale; - final Color color; - DragAreaTopIndentPainter({required this.color, required this.scale}); - - @override - void paint(Canvas canvas, Size size) { - // Use saveLayer to make the hollow part transparent - final paint = Paint() - ..color = color - ..style = PaintingStyle.fill; - canvas.saveLayer(Offset.zero & size, Paint()); - // Draw drag area main body (rectangle + bottom rounded corners) - final rect = Rect.fromLTWH(0, 0, size.width, size.height); - final rrect = RRect.fromRectAndCorners( - rect, - bottomLeft: Radius.circular(40 * scale), - bottomRight: Radius.circular(40 * scale), - ); - canvas.drawRRect(rrect, paint); - // Use BlendMode.dstOut to carve a smaller semicircular notch at the top center - final clearPaint = Paint()..blendMode = BlendMode.dstOut; - canvas.drawArc( - Rect.fromCenter( - center: Offset(size.width / 2, 0), - width: 25 * scale, - height: 20 * scale), - 0, - pi, - false, - clearPaint, - ); - canvas.restore(); - } - - @override - bool shouldRepaint(covariant DragAreaTopIndentPainter oldDelegate) { - return oldDelegate.color != color || oldDelegate.scale != scale; - } -} - -class CursorPaint extends StatelessWidget { - final double scale; - CursorPaint({super.key, required this.scale}); - - @override - Widget build(BuildContext context) { - final cursorModel = Provider.of(context); - double hotx = cursorModel.hotx; - double hoty = cursorModel.hoty; - var image = cursorModel.image; - if (image == null) { - if (preDefaultCursor.image != null) { - image = preDefaultCursor.image; - hotx = preDefaultCursor.image!.width / 2; - hoty = preDefaultCursor.image!.height / 2; - } - } - if (image == null) { - return const Offstage(); - } - assert(scale > 0, 'scale should always be positive'); - if (scale <= 0) { - return const Offstage(); - } - return CustomPaint( - painter: ImagePainter(image: image, x: -hotx, y: -hoty, scale: scale), - ); - } -} diff --git a/flutter/lib/mobile/widgets/floating_mouse_widgets.dart b/flutter/lib/mobile/widgets/floating_mouse_widgets.dart deleted file mode 100644 index dbcc606af..000000000 --- a/flutter/lib/mobile/widgets/floating_mouse_widgets.dart +++ /dev/null @@ -1,905 +0,0 @@ -// These floating mouse widgets are used to simulate a physical mouse -// when "mobile" -> "desktop" in mouse mode. -// This file does not contain whole mouse widgets, it only contains -// parts that help to control, such as wheel scroll and wheel button. - -import 'dart:async'; -import 'dart:convert'; -import 'dart:math'; - -import 'package:flutter/material.dart'; - -import 'package:flutter_hbb/common.dart'; -import 'package:flutter_hbb/common/widgets/remote_input.dart'; -import 'package:flutter_hbb/models/input_model.dart'; -import 'package:flutter_hbb/models/model.dart'; -import 'package:flutter_hbb/models/platform_model.dart'; - -// Used for the wheel button and wheel scroll widgets -const double _kSpaceToHorizontalEdge = 25; -const double _wheelWidth = 50; -const double _wheelHeight = 162; -// Used for the left/right button widgets -const double _kSpaceToVerticalEdge = 15; -const double _kSpaceBetweenLeftRightButtons = 40; -const double _kLeftRightButtonWidth = 55; -const double _kLeftRightButtonHeight = 40; -const double _kBorderWidth = 1; -final Color _kDefaultBorderColor = Colors.white.withOpacity(0.7); -final Color _kDefaultColor = Colors.black.withOpacity(0.4); -final Color _kTapDownColor = Colors.blue.withOpacity(0.7); -final Color _kWidgetHighlightColor = Colors.white.withOpacity(0.9); -const int _kInputTimerIntervalMillis = 100; - -class FloatingMouseWidgets extends StatefulWidget { - final FFI ffi; - const FloatingMouseWidgets({ - super.key, - required this.ffi, - }); - - @override - State createState() => _FloatingMouseWidgetsState(); -} - -class _FloatingMouseWidgetsState extends State { - InputModel get _inputModel => widget.ffi.inputModel; - CursorModel get _cursorModel => widget.ffi.cursorModel; - late final VirtualMouseMode _virtualMouseMode; - - @override - void initState() { - super.initState(); - _virtualMouseMode = widget.ffi.ffiModel.virtualMouseMode; - _virtualMouseMode.addListener(_onVirtualMouseModeChanged); - _cursorModel.blockEvents = false; - isSpecialHoldDragActive = false; - } - - void _onVirtualMouseModeChanged() { - if (mounted) { - setState(() {}); - } - } - - @override - void dispose() { - _virtualMouseMode.removeListener(_onVirtualMouseModeChanged); - super.dispose(); - _cursorModel.blockEvents = false; - isSpecialHoldDragActive = false; - } - - @override - Widget build(BuildContext context) { - final virtualMouseMode = _virtualMouseMode; - if (!virtualMouseMode.showVirtualMouse) { - return const Offstage(); - } - return Stack( - children: [ - FloatingWheel( - inputModel: _inputModel, - cursorModel: _cursorModel, - ), - if (virtualMouseMode.showVirtualJoystick) - VirtualJoystick( - cursorModel: _cursorModel, - inputModel: _inputModel, - ), - FloatingLeftRightButton( - isLeft: true, - inputModel: _inputModel, - cursorModel: _cursorModel, - ), - FloatingLeftRightButton( - isLeft: false, - inputModel: _inputModel, - cursorModel: _cursorModel, - ), - ], - ); - } -} - -class FloatingWheel extends StatefulWidget { - final InputModel inputModel; - final CursorModel cursorModel; - const FloatingWheel( - {super.key, required this.inputModel, required this.cursorModel}); - - @override - State createState() => _FloatingWheelState(); -} - -class _FloatingWheelState extends State { - Offset _position = Offset.zero; - bool _isInitialized = false; - Rect? _lastBlockedRect; - - bool _isUpDown = false; - bool _isMidDown = false; - bool _isDownDown = false; - - Orientation? _previousOrientation; - - Timer? _scrollTimer; - - InputModel get _inputModel => widget.inputModel; - CursorModel get _cursorModel => widget.cursorModel; - - @override - void initState() { - super.initState(); - WidgetsBinding.instance.addPostFrameCallback((_) { - _resetPosition(); - }); - } - - void _resetPosition() { - final size = MediaQuery.of(context).size; - setState(() { - _position = Offset( - size.width - _wheelWidth - _kSpaceToHorizontalEdge, - (size.height - _wheelHeight) / 2, - ); - _isInitialized = true; - }); - WidgetsBinding.instance.addPostFrameCallback((_) { - if (mounted) _updateBlockedRect(); - }); - } - - void _updateBlockedRect() { - if (_lastBlockedRect != null) { - _cursorModel.removeBlockedRect(_lastBlockedRect!); - } - final newRect = - Rect.fromLTWH(_position.dx, _position.dy, _wheelWidth, _wheelHeight); - _cursorModel.addBlockedRect(newRect); - _lastBlockedRect = newRect; - } - - @override - void dispose() { - _scrollTimer?.cancel(); - if (_lastBlockedRect != null) { - _cursorModel.removeBlockedRect(_lastBlockedRect!); - } - super.dispose(); - } - - @override - void didChangeDependencies() { - super.didChangeDependencies(); - final currentOrientation = MediaQuery.of(context).orientation; - if (_previousOrientation != null && - _previousOrientation != currentOrientation) { - _resetPosition(); - } - _previousOrientation = currentOrientation; - } - - Widget _buildUpDownButton( - void Function(PointerDownEvent) onPointerDown, - void Function(PointerUpEvent) onPointerUp, - void Function(PointerCancelEvent) onPointerCancel, - bool Function() flagGetter, - BorderRadiusGeometry borderRadius, - IconData iconData) { - return Listener( - onPointerDown: onPointerDown, - onPointerUp: onPointerUp, - onPointerCancel: onPointerCancel, - child: Container( - width: _wheelWidth, - height: 55, - alignment: Alignment.center, - decoration: BoxDecoration( - color: _kDefaultColor, - border: Border.all( - color: flagGetter() ? _kTapDownColor : _kDefaultBorderColor, - width: 1), - borderRadius: borderRadius, - ), - child: Icon(iconData, color: _kDefaultBorderColor, size: 32), - ), - ); - } - - @override - Widget build(BuildContext context) { - if (!_isInitialized) { - return Positioned(child: Offstage()); - } - return Positioned( - left: _position.dx, - top: _position.dy, - child: _buildWidget(context), - ); - } - - Widget _buildWidget(BuildContext context) { - return Container( - width: _wheelWidth, - height: _wheelHeight, - child: Column( - children: [ - _buildUpDownButton( - (event) { - setState(() { - _isUpDown = true; - }); - _startScrollTimer(1); - }, - (event) { - setState(() { - _isUpDown = false; - }); - _stopScrollTimer(); - }, - (event) { - setState(() { - _isUpDown = false; - }); - _stopScrollTimer(); - }, - () => _isUpDown, - BorderRadius.vertical(top: Radius.circular(_wheelWidth * 0.5)), - Icons.keyboard_arrow_up, - ), - Listener( - onPointerDown: (event) { - setState(() { - _isMidDown = true; - }); - _inputModel.tapDown(MouseButtons.wheel); - }, - onPointerUp: (event) { - setState(() { - _isMidDown = false; - }); - _inputModel.tapUp(MouseButtons.wheel); - }, - onPointerCancel: (event) { - setState(() { - _isMidDown = false; - }); - _inputModel.tapUp(MouseButtons.wheel); - }, - child: Container( - width: _wheelWidth, - height: 52, - decoration: BoxDecoration( - color: _kDefaultColor, - border: Border.symmetric( - vertical: BorderSide( - color: - _isMidDown ? _kTapDownColor : _kDefaultBorderColor, - width: _kBorderWidth)), - ), - child: Center( - child: Container( - width: _wheelWidth - 10, - height: _wheelWidth - 10, - child: Center( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Container( - width: 18, - height: 2, - color: _kDefaultBorderColor, - ), - SizedBox(height: 6), - Container( - width: 24, - height: 2, - color: _kDefaultBorderColor, - ), - SizedBox(height: 6), - Container( - width: 18, - height: 2, - color: _kDefaultBorderColor, - ), - ], - ), - ), - ), - ), - ), - ), - _buildUpDownButton( - (event) { - setState(() { - _isDownDown = true; - }); - _startScrollTimer(-1); - }, - (event) { - setState(() { - _isDownDown = false; - }); - _stopScrollTimer(); - }, - (event) { - setState(() { - _isDownDown = false; - }); - _stopScrollTimer(); - }, - () => _isDownDown, - BorderRadius.vertical(bottom: Radius.circular(_wheelWidth * 0.5)), - Icons.keyboard_arrow_down, - ), - ], - ), - ); - } - - void _startScrollTimer(int direction) { - _scrollTimer?.cancel(); - _inputModel.scroll(direction); - _scrollTimer = Timer.periodic( - Duration(milliseconds: _kInputTimerIntervalMillis), (timer) { - _inputModel.scroll(direction); - }); - } - - void _stopScrollTimer() { - _scrollTimer?.cancel(); - _scrollTimer = null; - } -} - -class FloatingLeftRightButton extends StatefulWidget { - final bool isLeft; - final InputModel inputModel; - final CursorModel cursorModel; - const FloatingLeftRightButton( - {super.key, - required this.isLeft, - required this.inputModel, - required this.cursorModel}); - - @override - State createState() => - _FloatingLeftRightButtonState(); -} - -class _FloatingLeftRightButtonState extends State { - Offset _position = Offset.zero; - bool _isInitialized = false; - bool _isDown = false; - Rect? _lastBlockedRect; - - Orientation? _previousOrientation; - Offset _preSavedPos = Offset.zero; - - // Gesture ambiguity resolution - Timer? _tapDownTimer; - final Duration _pressTimeout = const Duration(milliseconds: 200); - bool _isDragging = false; - - bool get _isLeft => widget.isLeft; - InputModel get _inputModel => widget.inputModel; - CursorModel get _cursorModel => widget.cursorModel; - - @override - void initState() { - super.initState(); - WidgetsBinding.instance.addPostFrameCallback((_) { - final currentOrientation = MediaQuery.of(context).orientation; - _previousOrientation = currentOrientation; - _resetPosition(currentOrientation); - }); - } - - @override - void dispose() { - if (_lastBlockedRect != null) { - _cursorModel.removeBlockedRect(_lastBlockedRect!); - } - _tapDownTimer?.cancel(); - _trySavePosition(); - super.dispose(); - } - - @override - void didChangeDependencies() { - super.didChangeDependencies(); - final currentOrientation = MediaQuery.of(context).orientation; - if (_previousOrientation == null || - _previousOrientation != currentOrientation) { - _resetPosition(currentOrientation); - } - _previousOrientation = currentOrientation; - } - - double _getOffsetX(double w) { - if (_isLeft) { - return (w - _kLeftRightButtonWidth * 2 - _kSpaceBetweenLeftRightButtons) * - 0.5; - } else { - return (w + _kSpaceBetweenLeftRightButtons) * 0.5; - } - } - - String _getPositionKey(Orientation ori) { - final strLeftRight = _isLeft ? 'l' : 'r'; - final strOri = ori == Orientation.landscape ? 'l' : 'p'; - return '$strLeftRight$strOri-mouse-btn-pos'; - } - - static Offset? _loadPositionFromString(String s) { - if (s.isEmpty) { - return null; - } - try { - final m = jsonDecode(s); - return Offset(m['x'], m['y']); - } catch (e) { - debugPrintStack(label: 'Failed to load position "$s" $e'); - return null; - } - } - - void _trySavePosition() { - if (_previousOrientation == null) return; - if (((_position - _preSavedPos)).distanceSquared < 0.1) return; - final pos = jsonEncode({ - 'x': _position.dx, - 'y': _position.dy, - }); - bind.setLocalFlutterOption( - k: _getPositionKey(_previousOrientation!), v: pos); - _preSavedPos = _position; - } - - void _restorePosition(Orientation ori) { - final ps = bind.getLocalFlutterOption(k: _getPositionKey(ori)); - final pos = _loadPositionFromString(ps); - if (pos == null) { - final size = MediaQuery.of(context).size; - _position = Offset(_getOffsetX(size.width), - size.height - _kSpaceToVerticalEdge - _kLeftRightButtonHeight); - } else { - _position = pos; - _preSavedPos = pos; - } - } - - void _resetPosition(Orientation ori) { - setState(() { - _restorePosition(ori); - _isInitialized = true; - }); - WidgetsBinding.instance.addPostFrameCallback((_) { - if (mounted) _updateBlockedRect(); - }); - } - - void _updateBlockedRect() { - if (_lastBlockedRect != null) { - _cursorModel.removeBlockedRect(_lastBlockedRect!); - } - final newRect = Rect.fromLTWH(_position.dx, _position.dy, - _kLeftRightButtonWidth, _kLeftRightButtonHeight); - _cursorModel.addBlockedRect(newRect); - _lastBlockedRect = newRect; - } - - void _onMoveUpdateDelta(Offset delta) { - final context = this.context; - final size = MediaQuery.of(context).size; - Offset newPosition = _position + delta; - double minX = _kSpaceToHorizontalEdge; - double minY = _kSpaceToVerticalEdge; - double maxX = size.width - _kLeftRightButtonWidth - _kSpaceToHorizontalEdge; - double maxY = size.height - _kLeftRightButtonHeight - _kSpaceToVerticalEdge; - newPosition = Offset( - newPosition.dx.clamp(minX, maxX), - newPosition.dy.clamp(minY, maxY), - ); - final isPositionChanged = !(isDoubleEqual(newPosition.dx, _position.dx) && - isDoubleEqual(newPosition.dy, _position.dy)); - setState(() { - _position = newPosition; - }); - if (isPositionChanged) { - WidgetsBinding.instance.addPostFrameCallback((_) { - if (mounted) _updateBlockedRect(); - }); - } - } - - void _onBodyPointerMoveUpdate(PointerMoveEvent event) { - _cursorModel.blockEvents = true; - // If move, it's a drag, not a tap. - _isDragging = true; - // Cancel the timer to prevent it from being recognized as a tap/hold. - _tapDownTimer?.cancel(); - _tapDownTimer = null; - _onMoveUpdateDelta(event.delta); - } - - Widget _buildButtonIcon() { - final double w = _kLeftRightButtonWidth * 0.45; - final double h = _kLeftRightButtonHeight * 0.75; - final double borderRadius = w * 0.5; - final double quarterCircleRadius = borderRadius * 0.9; - return Stack( - children: [ - Container( - width: w, - height: h, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(_kLeftRightButtonWidth * 0.225), - color: Colors.white, - ), - ), - Positioned( - left: _isLeft ? quarterCircleRadius * 0.25 : null, - right: _isLeft ? null : quarterCircleRadius * 0.25, - top: quarterCircleRadius * 0.25, - child: CustomPaint( - size: Size(quarterCircleRadius * 2, quarterCircleRadius * 2), - painter: _QuarterCirclePainter( - color: _kDefaultColor, - isLeft: _isLeft, - radius: quarterCircleRadius, - ), - ), - ), - ], - ); - } - - @override - Widget build(BuildContext context) { - if (!_isInitialized) { - return Positioned(child: Offstage()); - } - return Positioned( - left: _position.dx, - top: _position.dy, - // We can't use the GestureDetector here, because `onTapDown` may be - // triggered sometimes when dragging. - child: Listener( - onPointerMove: _onBodyPointerMoveUpdate, - onPointerDown: (event) async { - _isDragging = false; - setState(() { - _isDown = true; - }); - // Start a timer. If it fires, it's a hold. - _tapDownTimer?.cancel(); - _tapDownTimer = Timer(_pressTimeout, () { - isSpecialHoldDragActive = true; - () async { - await _cursorModel.syncCursorPosition(); - await _inputModel - .tapDown(_isLeft ? MouseButtons.left : MouseButtons.right); - }(); - _tapDownTimer = null; - }); - }, - onPointerUp: (event) { - _cursorModel.blockEvents = false; - setState(() { - _isDown = false; - }); - // If timer is active, it's a quick tap. - if (_tapDownTimer != null) { - _tapDownTimer!.cancel(); - _tapDownTimer = null; - // Fire tap down and up quickly. - _inputModel - .tapDown(_isLeft ? MouseButtons.left : MouseButtons.right) - .then( - (_) => Future.delayed(const Duration(milliseconds: 50), () { - _inputModel.tapUp( - _isLeft ? MouseButtons.left : MouseButtons.right); - })); - } else { - // If it's not a quick tap, it could be a hold or drag. - // If it was a hold, isSpecialHoldDragActive is true. - if (isSpecialHoldDragActive) { - _inputModel - .tapUp(_isLeft ? MouseButtons.left : MouseButtons.right); - } - } - - if (_isDragging) { - _trySavePosition(); - } - isSpecialHoldDragActive = false; - }, - onPointerCancel: (event) { - _cursorModel.blockEvents = false; - setState(() { - _isDown = false; - }); - _tapDownTimer?.cancel(); - _tapDownTimer = null; - if (isSpecialHoldDragActive) { - _inputModel.tapUp(_isLeft ? MouseButtons.left : MouseButtons.right); - } - isSpecialHoldDragActive = false; - if (_isDragging) { - _trySavePosition(); - } - }, - child: Container( - width: _kLeftRightButtonWidth, - height: _kLeftRightButtonHeight, - alignment: Alignment.center, - decoration: BoxDecoration( - color: _kDefaultColor, - border: Border.all( - color: _isDown ? _kTapDownColor : _kDefaultBorderColor, - width: _kBorderWidth), - borderRadius: _isLeft - ? BorderRadius.horizontal( - left: Radius.circular(_kLeftRightButtonHeight * 0.5)) - : BorderRadius.horizontal( - right: Radius.circular(_kLeftRightButtonHeight * 0.5)), - ), - child: _buildButtonIcon(), - ), - ), - ); - } -} - -class _QuarterCirclePainter extends CustomPainter { - final Color color; - final bool isLeft; - final double radius; - _QuarterCirclePainter( - {required this.color, required this.isLeft, required this.radius}); - - @override - void paint(Canvas canvas, Size size) { - final paint = Paint() - ..color = color - ..style = PaintingStyle.fill; - final rect = Rect.fromLTWH(0, 0, radius * 2, radius * 2); - if (isLeft) { - canvas.drawArc(rect, -pi, pi / 2, true, paint); - } else { - canvas.drawArc(rect, -pi / 2, pi / 2, true, paint); - } - } - - @override - bool shouldRepaint(CustomPainter oldDelegate) => false; -} - -// Virtual joystick can send either absolute movement (via updatePan) -// or relative movement (via sendMobileRelativeMouseMove) depending on the -// InputModel.relativeMouseMode setting. -class VirtualJoystick extends StatefulWidget { - final CursorModel cursorModel; - final InputModel inputModel; - - const VirtualJoystick({ - super.key, - required this.cursorModel, - required this.inputModel, - }); - - @override - State createState() => _VirtualJoystickState(); -} - -class _VirtualJoystickState extends State { - Offset _position = Offset.zero; - bool _isInitialized = false; - Offset _offset = Offset.zero; - final double _joystickRadius = 50.0; - final double _thumbRadius = 20.0; - final double _moveStep = 3.0; - final double _speed = 1.0; - - /// Scale factor for relative mouse movement sensitivity. - /// Higher values result in faster cursor movement on the remote machine. - static const double _kRelativeMouseScale = 3.0; - - // One-shot timer to detect a drag gesture - Timer? _dragStartTimer; - // Periodic timer for continuous movement - Timer? _continuousMoveTimer; - Size? _lastScreenSize; - bool _isPressed = false; - - /// Check if relative mouse mode is enabled. - bool get _useRelativeMouse => widget.inputModel.relativeMouseMode.value; - - @override - void initState() { - super.initState(); - widget.cursorModel.blockEvents = false; - WidgetsBinding.instance.addPostFrameCallback((_) { - _lastScreenSize = MediaQuery.of(context).size; - _resetPosition(); - }); - } - - @override - void dispose() { - _stopSendEventTimer(); - widget.cursorModel.blockEvents = false; - super.dispose(); - } - - @override - void didChangeDependencies() { - super.didChangeDependencies(); - final currentScreenSize = MediaQuery.of(context).size; - if (_lastScreenSize != null && _lastScreenSize != currentScreenSize) { - _resetPosition(); - } - _lastScreenSize = currentScreenSize; - } - - void _resetPosition() { - final size = MediaQuery.of(context).size; - setState(() { - _position = Offset( - _kSpaceToHorizontalEdge + _joystickRadius, - size.height * 0.5 + _joystickRadius * 1.5, - ); - _isInitialized = true; - }); - } - - Offset _offsetToPanDelta(Offset offset) { - return Offset( - offset.dx / _joystickRadius, - offset.dy / _joystickRadius, - ); - } - - /// Send movement delta to remote machine. - /// Uses relative mouse mode if enabled, otherwise uses absolute updatePan. - void _sendMovement(Offset delta) { - if (_useRelativeMouse) { - widget.inputModel.sendMobileRelativeMouseMove( - delta.dx * _kRelativeMouseScale, delta.dy * _kRelativeMouseScale); - } else { - // In absolute mode, use cursorModel.updatePan which tracks position. - widget.cursorModel.updatePan(delta, Offset.zero, false); - } - } - - void _stopSendEventTimer() { - _dragStartTimer?.cancel(); - _continuousMoveTimer?.cancel(); - _dragStartTimer = null; - _continuousMoveTimer = null; - } - - @override - Widget build(BuildContext context) { - if (!_isInitialized) { - return Positioned(child: Offstage()); - } - return Positioned( - left: _position.dx - _joystickRadius, - top: _position.dy - _joystickRadius, - child: GestureDetector( - onPanStart: (details) { - setState(() { - _isPressed = true; - }); - widget.cursorModel.blockEvents = true; - _updateOffset(details.localPosition); - - // 1. Send a single, small pan event immediately for responsiveness. - // The movement is small for a gentle start. - final initialDelta = _offsetToPanDelta(_offset); - if (initialDelta.distance > 0) { - _sendMovement(initialDelta); - } - - // 2. Start a one-shot timer to check if the user is holding for a drag. - _dragStartTimer?.cancel(); - _dragStartTimer = Timer(const Duration(milliseconds: 120), () { - // 3. If the timer fires, it's a drag. Start the continuous movement timer. - _continuousMoveTimer?.cancel(); - _continuousMoveTimer = - periodic_immediate(const Duration(milliseconds: 20), () async { - if (_offset != Offset.zero) { - _sendMovement(_offsetToPanDelta(_offset) * _moveStep * _speed); - } - }); - }); - }, - onPanUpdate: (details) { - _updateOffset(details.localPosition); - }, - onPanEnd: (details) { - setState(() { - _offset = Offset.zero; - _isPressed = false; - }); - widget.cursorModel.blockEvents = false; - - // 4. Critical step: On pan end, cancel all timers. - // If it was a flick, this cancels the drag detection before it fires. - // If it was a drag, this stops the continuous movement. - _stopSendEventTimer(); - }, - child: CustomPaint( - size: Size(_joystickRadius * 2, _joystickRadius * 2), - painter: _JoystickPainter( - _offset, _joystickRadius, _thumbRadius, _isPressed), - ), - ), - ); - } - - void _updateOffset(Offset localPosition) { - final center = Offset(_joystickRadius, _joystickRadius); - final offset = localPosition - center; - final distance = offset.distance; - - if (distance <= _joystickRadius) { - setState(() { - _offset = offset; - }); - } else { - final clampedOffset = offset / distance * _joystickRadius; - setState(() { - _offset = clampedOffset; - }); - } - } -} - -class _JoystickPainter extends CustomPainter { - final Offset _offset; - final double _joystickRadius; - final double _thumbRadius; - final bool _isPressed; - - _JoystickPainter( - this._offset, this._joystickRadius, this._thumbRadius, this._isPressed); - - @override - void paint(Canvas canvas, Size size) { - final center = Offset(size.width / 2, size.height / 2); - final joystickColor = _kDefaultColor; - final borderColor = _isPressed ? _kTapDownColor : _kDefaultBorderColor; - final thumbColor = _kWidgetHighlightColor; - - final joystickPaint = Paint() - ..color = joystickColor - ..style = PaintingStyle.fill; - - final borderPaint = Paint() - ..color = borderColor - ..style = PaintingStyle.stroke - ..strokeWidth = 1.5; - - final thumbPaint = Paint() - ..color = thumbColor - ..style = PaintingStyle.fill; - - // Draw joystick base and border - canvas.drawCircle(center, _joystickRadius, joystickPaint); - canvas.drawCircle(center, _joystickRadius, borderPaint); - - // Draw thumb - final thumbCenter = center + _offset; - canvas.drawCircle(thumbCenter, _thumbRadius, thumbPaint); - } - - @override - bool shouldRepaint(covariant _JoystickPainter oldDelegate) { - return oldDelegate._offset != _offset || - oldDelegate._isPressed != _isPressed; - } -} diff --git a/flutter/lib/mobile/widgets/gesture_help.dart b/flutter/lib/mobile/widgets/gesture_help.dart index 8e86681b4..5ba696489 100644 --- a/flutter/lib/mobile/widgets/gesture_help.dart +++ b/flutter/lib/mobile/widgets/gesture_help.dart @@ -1,8 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_hbb/common.dart'; -import 'package:flutter_hbb/models/input_model.dart'; -import 'package:flutter_hbb/models/model.dart'; -import 'package:get/get.dart'; import 'package:toggle_switch/toggle_switch.dart'; class GestureIcons { @@ -38,41 +35,24 @@ typedef OnTouchModeChange = void Function(bool); class GestureHelp extends StatefulWidget { GestureHelp( - {Key? key, - required this.touchMode, - required this.onTouchModeChange, - required this.virtualMouseMode, - this.inputModel}) + {Key? key, required this.touchMode, required this.onTouchModeChange}) : super(key: key); final bool touchMode; final OnTouchModeChange onTouchModeChange; - final VirtualMouseMode virtualMouseMode; - final InputModel? inputModel; @override - State createState() => - _GestureHelpState(touchMode, virtualMouseMode); + State createState() => _GestureHelpState(touchMode); } class _GestureHelpState extends State { late int _selectedIndex; late bool _touchMode; - final VirtualMouseMode _virtualMouseMode; - _GestureHelpState(bool touchMode, VirtualMouseMode virtualMouseMode) - : _virtualMouseMode = virtualMouseMode { + _GestureHelpState(bool touchMode) { _touchMode = touchMode; _selectedIndex = _touchMode ? 1 : 0; } - /// Helper to exit relative mouse mode when certain conditions are met. - /// This reduces code duplication across multiple UI callbacks. - void _exitRelativeMouseModeIf(bool condition) { - if (condition) { - widget.inputModel?.setRelativeMouseMode(false); - } - } - @override Widget build(BuildContext context) { final size = MediaQuery.of(context).size; @@ -88,193 +68,31 @@ class _GestureHelpState extends State { padding: const EdgeInsets.symmetric(vertical: 12.0), child: Column( mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, children: [ - Center( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - ToggleSwitch( - initialLabelIndex: _selectedIndex, - activeFgColor: Colors.white, - inactiveFgColor: Colors.white60, - activeBgColor: [MyTheme.accent], - inactiveBgColor: Theme.of(context).hintColor, - totalSwitches: 2, - minWidth: 150, - fontSize: 15, - iconSize: 18, - labels: [ - translate("Mouse mode"), - translate("Touch mode") - ], - icons: [Icons.mouse, Icons.touch_app], - onToggle: (index) { - setState(() { - if (_selectedIndex != index) { - _selectedIndex = index ?? 0; - _touchMode = index == 0 ? false : true; - widget.onTouchModeChange(_touchMode); - // Exit relative mouse mode when switching to touch mode - _exitRelativeMouseModeIf(_touchMode); - } - }); - }, - ), - Transform.translate( - offset: const Offset(-10.0, 0.0), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Checkbox( - value: _virtualMouseMode.showVirtualMouse, - onChanged: (value) async { - if (value == null) return; - await _virtualMouseMode.toggleVirtualMouse(); - // Exit relative mouse mode when virtual mouse is hidden - _exitRelativeMouseModeIf( - !_virtualMouseMode.showVirtualMouse); - setState(() {}); - }, - ), - InkWell( - onTap: () async { - await _virtualMouseMode.toggleVirtualMouse(); - // Exit relative mouse mode when virtual mouse is hidden - _exitRelativeMouseModeIf( - !_virtualMouseMode.showVirtualMouse); - setState(() {}); - }, - child: Text(translate('Show virtual mouse')), - ), - ], - ), - ), - if (_touchMode && _virtualMouseMode.showVirtualMouse) - Padding( - // Indent "Virtual mouse size" - padding: const EdgeInsets.only(left: 24.0), - child: SizedBox( - width: 260, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - Padding( - padding: const EdgeInsets.only( - top: 0.0, bottom: 0), - child: Text(translate('Virtual mouse size')), - ), - Transform.translate( - offset: Offset(-0.0, -6.0), - child: Row( - children: [ - Padding( - padding: - const EdgeInsets.only(left: 0.0), - child: Text(translate('Small')), - ), - Expanded( - child: Slider( - value: _virtualMouseMode - .virtualMouseScale, - min: 0.8, - max: 1.8, - divisions: 10, - onChanged: (value) { - _virtualMouseMode - .setVirtualMouseScale(value); - setState(() {}); - }, - ), - ), - Padding( - padding: - const EdgeInsets.only(right: 16.0), - child: Text(translate('Large')), - ), - ], - ), - ), - ], - ), - ), - ), - if (!_touchMode && _virtualMouseMode.showVirtualMouse) - Transform.translate( - offset: const Offset(-10.0, -12.0), - child: Padding( - // Indent "Show virtual joystick" - padding: const EdgeInsets.only(left: 24.0), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Checkbox( - value: - _virtualMouseMode.showVirtualJoystick, - onChanged: (value) async { - if (value == null) return; - await _virtualMouseMode - .toggleVirtualJoystick(); - // Exit relative mouse mode when joystick is hidden - _exitRelativeMouseModeIf( - !_virtualMouseMode - .showVirtualJoystick); - setState(() {}); - }, - ), - InkWell( - onTap: () async { - await _virtualMouseMode - .toggleVirtualJoystick(); - // Exit relative mouse mode when joystick is hidden - _exitRelativeMouseModeIf( - !_virtualMouseMode - .showVirtualJoystick); - setState(() {}); - }, - child: Text( - translate("Show virtual joystick")), - ), - ], - )), - ), - // Relative mouse mode option - only visible when joystick is shown - if (!_touchMode && - _virtualMouseMode.showVirtualMouse && - _virtualMouseMode.showVirtualJoystick && - widget.inputModel != null) - Obx(() => Transform.translate( - offset: const Offset(-10.0, -24.0), - child: Padding( - // Indent further for 'Relative mouse mode' - padding: const EdgeInsets.only(left: 48.0), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Checkbox( - value: widget.inputModel! - .relativeMouseMode.value, - onChanged: (value) { - if (value == null) return; - widget.inputModel! - .setRelativeMouseMode(value); - }, - ), - InkWell( - onTap: () { - widget.inputModel! - .toggleRelativeMouseMode(); - }, - child: Text( - translate('Relative mouse mode')), - ), - ], - )), - )), - ], - ), + ToggleSwitch( + initialLabelIndex: _selectedIndex, + activeFgColor: Colors.white, + inactiveFgColor: Colors.white60, + activeBgColor: [MyTheme.accent], + inactiveBgColor: Theme.of(context).hintColor, + totalSwitches: 2, + minWidth: 150, + fontSize: 15, + iconSize: 18, + labels: [translate("Mouse mode"), translate("Touch mode")], + icons: [Icons.mouse, Icons.touch_app], + onToggle: (index) { + setState(() { + if (_selectedIndex != index) { + _selectedIndex = index ?? 0; + _touchMode = index == 0 ? false : true; + widget.onTouchModeChange(_touchMode); + } + }); + }, ), + const SizedBox(height: 30), Container( child: Wrap( spacing: space, diff --git a/flutter/lib/models/ab_model.dart b/flutter/lib/models/ab_model.dart index 001887c0c..790bc62fe 100644 --- a/flutter/lib/models/ab_model.dart +++ b/flutter/lib/models/ab_model.dart @@ -1,5 +1,6 @@ import 'dart:async'; import 'dart:convert'; +import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter_hbb/common/hbbs/hbbs.dart'; @@ -52,9 +53,7 @@ class AbModel { RxBool get currentAbLoading => current.abLoading; bool get currentAbEmpty => current.peers.isEmpty && current.tags.isEmpty; - final _listPullError = ''.obs; - RxString get abPullError => - _listPullError.value.isNotEmpty ? _listPullError : current.pullError; + RxString get currentAbPullError => current.pullError; RxString get currentAbPushError => current.pushError; String? _personalAbGuid; RxBool legacyMode = false.obs; @@ -69,7 +68,6 @@ class AbModel { var _syncFromRecentLock = false; var _timerCounter = 0; var _cacheLoadOnceFlag = false; - var _pulledOnce = false; var listInitialized = false; var _maxPeerOneAb = 0; @@ -99,17 +97,10 @@ class AbModel { print("reset ab model"); addressbooks.clear(); _currentName.value = ''; - _listPullError.value = ''; - _pulledOnce = false; await bind.mainClearAb(); listInitialized = false; } - void clearPullErrors() { - _listPullError.value = ''; - current.pullError.value = ''; - } - // #region ab /// Pulls the address book data from the server. /// @@ -119,49 +110,39 @@ class AbModel { var _pulling = false; Future pullAb( {required ForcePullAb? force, required bool quiet}) async { - if (bind.isDisableAb()) return; - if (!gFFI.userModel.isLogin) return; - if (gFFI.userModel.networkError.isNotEmpty) return; if (_pulling) return; - if (force == null && _pulledOnce) { - return; - } _pulling = true; - if (!quiet) { - _listPullError.value = ''; - current.pullError.value = ''; - } try { await _pullAb(force: force, quiet: quiet); _refreshTab(); } catch (_) {} _pulling = false; - _pulledOnce = true; } Future _pullAb( {required ForcePullAb? force, required bool quiet}) async { + if (bind.isDisableAb()) return; + if (!gFFI.userModel.isLogin) return; + if (gFFI.userModel.networkError.isNotEmpty) return; if (force == null && listInitialized && current.initialized) return; debugPrint("pullAb, force: $force, quiet: $quiet"); if (!listInitialized || force == ForcePullAb.listAndCurrent) { try { // Read personal guid every time to avoid upgrading the server without closing the main window _personalAbGuid = null; - // `true`: continue init. `false`: stop, error already recorded. - if (!await _getPersonalAbGuid(quiet: quiet)) { - return; - } + await _getPersonalAbGuid(); + // Determine legacy mode based on whether _personalAbGuid is null legacyMode.value = _personalAbGuid == null; if (!legacyMode.value && _maxPeerOneAb == 0) { - await _getAbSettings(quiet: quiet); + await _getAbSettings(); } if (_personalAbGuid != null) { debugPrint("pull ab list"); List abProfiles = List.empty(growable: true); abProfiles.add(AbProfile(_personalAbGuid!, _personalAddressBookName, - gFFI.userModel.userName.value, null, ShareRule.read.value, null)); + gFFI.userModel.userName.value, null, ShareRule.read.value)); // get all address book name - await _getSharedAbProfiles(abProfiles, quiet: quiet); + await _getSharedAbProfiles(abProfiles); addressbooks.removeWhere((key, value) => abProfiles.firstWhereOrNull((e) => e.name == key) == null); for (int i = 0; i < abProfiles.length; i++) { @@ -201,7 +182,6 @@ class AbModel { } } catch (e) { debugPrint("pull ab list error: $e"); - _setListPullError(e, quiet: quiet); } } else if (listInitialized && (!current.initialized || force == ForcePullAb.current)) { @@ -217,85 +197,60 @@ class AbModel { } } - void _setListPullError(Object err, {required bool quiet, int? statusCode}) { - if (!quiet) { - _listPullError.value = - '${translate('pull_ab_failed_tip')}: ${translate(err.toString())}'; - } - if (statusCode == 401) { - gFFI.userModel.reset(resetOther: true); - } - } - - Future _getAbSettings({required bool quiet}) async { - int? statusCode; + Future _getAbSettings() async { try { final api = "${await bind.mainGetApiServer()}/api/ab/settings"; var headers = getHttpHeaders(); headers['Content-Type'] = "application/json"; - _setEmptyBody(headers); final resp = await http.post(Uri.parse(api), headers: headers); - statusCode = resp.statusCode; - if (statusCode == 404) { + if (resp.statusCode == 404) { debugPrint("HTTP 404, api server doesn't support shared address book"); return false; } Map json = - _jsonDecodeRespMap(decode_http_response(resp), resp.statusCode); + _jsonDecodeRespMap(utf8.decode(resp.bodyBytes), resp.statusCode); if (json.containsKey('error')) { throw json['error']; } - if (statusCode != 200) { - throw 'HTTP $statusCode'; + if (resp.statusCode != 200) { + throw 'HTTP ${resp.statusCode}'; } _maxPeerOneAb = json['max_peer_one_ab'] ?? 0; return true; } catch (err) { debugPrint('get ab settings err: ${err.toString()}'); - _setListPullError(err, quiet: quiet, statusCode: statusCode); } return false; } - /// Loads `/api/ab/personal`. - /// Returns `true` to continue init, `false` to stop after a real error. - Future _getPersonalAbGuid({required bool quiet}) async { - int? statusCode; + Future _getPersonalAbGuid() async { try { final api = "${await bind.mainGetApiServer()}/api/ab/personal"; var headers = getHttpHeaders(); headers['Content-Type'] = "application/json"; - _setEmptyBody(headers); final resp = await http.post(Uri.parse(api), headers: headers); - statusCode = resp.statusCode; - if (statusCode == 404) { + if (resp.statusCode == 404) { debugPrint("HTTP 404, current api server is legacy mode"); - // Old server: keep `_personalAbGuid` null and continue in legacy mode. - return true; + return false; } Map json = - _jsonDecodeRespMap(decode_http_response(resp), resp.statusCode); + _jsonDecodeRespMap(utf8.decode(resp.bodyBytes), resp.statusCode); if (json.containsKey('error')) { throw json['error']; } - if (statusCode != 200) { - throw 'HTTP $statusCode'; + if (resp.statusCode != 200) { + throw 'HTTP ${resp.statusCode}'; } _personalAbGuid = json['guid']; - // New server: guid is available, continue in non-legacy mode. return true; } catch (err) { debugPrint('get personal ab err: ${err.toString()}'); - _setListPullError(err, quiet: quiet, statusCode: statusCode); } - // Real error: stop the current pull. return false; } - Future _getSharedAbProfiles(List profiles, - {required bool quiet}) async { + Future _getSharedAbProfiles(List profiles) async { final api = "${await bind.mainGetApiServer()}/api/ab/shared/profiles"; - int? statusCode; try { var uri0 = Uri.parse(api); final pageSize = 100; @@ -314,21 +269,14 @@ class AbModel { }); var headers = getHttpHeaders(); headers['Content-Type'] = "application/json"; - _setEmptyBody(headers); final resp = await http.post(uri, headers: headers); - statusCode = resp.statusCode; - if (statusCode == 404) { - debugPrint( - "HTTP 404, api server doesn't support shared address book"); - return false; - } Map json = - _jsonDecodeRespMap(decode_http_response(resp), resp.statusCode); + _jsonDecodeRespMap(utf8.decode(resp.bodyBytes), resp.statusCode); if (json.containsKey('error')) { throw json['error']; } - if (statusCode != 200) { - throw 'HTTP $statusCode'; + if (resp.statusCode != 200) { + throw 'HTTP ${resp.statusCode}'; } if (json.containsKey('total')) { if (total == 0) total = json['total']; @@ -351,7 +299,6 @@ class AbModel { return true; } catch (err) { debugPrint('_getSharedAbProfiles err: ${err.toString()}'); - _setListPullError(err, quiet: quiet, statusCode: statusCode); } return false; } @@ -372,8 +319,8 @@ class AbModel { // #endregion // #region peer - Future addIdToCurrent(String id, String alias, String password, - List tags, String note) async { + Future addIdToCurrent( + String id, String alias, String password, List tags) async { if (currentAbPeers.where((element) => element.id == id).isNotEmpty) { return "$id already exists in address book $_currentName"; } @@ -386,9 +333,6 @@ class AbModel { if (password.isNotEmpty) { peer['password'] = password; } - if (note.isNotEmpty) { - peer['note'] = note; - } final ret = await addPeersTo([peer], _currentName.value); _syncAllFromRecent = true; return ret; @@ -432,14 +376,6 @@ class AbModel { return res; } - Future changeNote({required String id, required String note}) async { - bool res = await current.changeNote(id: id, note: note); - await pullNonLegacyAfterChange(); - currentAbPeers.refresh(); - // no need to save cache - return res; - } - Future changePersonalHashPassword(String id, String hash) async { var ret = false; final personalAb = addressbooks[_personalAddressBookName]; @@ -673,7 +609,7 @@ class AbModel { if (name == null || guid == null) { continue; } - ab = Ab(AbProfile(guid, name, '', '', ShareRule.read.value, null), + ab = Ab(AbProfile(guid, name, '', '', ShareRule.read.value), name == _personalAddressBookName); } addressbooks[name] = ab; @@ -722,15 +658,6 @@ class AbModel { } } - String getPeerNote(String id) { - final it = currentAbPeers.where((p0) => p0.id == id); - if (it.isEmpty) { - return ''; - } else { - return it.first.note; - } - } - Color getCurrentAbTagColor(String tag) { if (tag == kUntagged) { return MyTheme.accent; @@ -840,28 +767,6 @@ class AbModel { _peerIdUpdateListeners.remove(key); } - String? getdefaultSharedPassword() { - if (current.isPersonal()) { - return null; - } - final profile = current.sharedProfile(); - if (profile == null) { - return null; - } - try { - if (profile.info is Map) { - final password = (profile.info as Map)['password']; - if (password is String && password.isNotEmpty) { - return password; - } - } - return null; - } catch (e) { - debugPrint("getdefaultSharedPassword: $e"); - return null; - } - } - // #endregion } @@ -936,8 +841,6 @@ abstract class BaseAb { Future changeAlias({required String id, required String alias}); - Future changeNote({required String id, required String note}); - Future changePersonalHashPassword(String id, String hash); Future changeSharedPassword(String id, String password); @@ -1022,7 +925,7 @@ class LegacyAb extends BaseAb { peers.clear(); } else if (resp.body.isNotEmpty) { Map json = - _jsonDecodeRespMap(decode_http_response(resp), resp.statusCode); + _jsonDecodeRespMap(utf8.decode(resp.bodyBytes), resp.statusCode); if (json.containsKey('error')) { throw json['error']; } else if (json.containsKey('data')) { @@ -1065,14 +968,22 @@ class LegacyAb extends BaseAb { var authHeaders = getHttpHeaders(); authHeaders['Content-Type'] = "application/json"; final body = jsonEncode({"data": jsonEncode(_serialize())}); - http.Response resp = - await http.post(Uri.parse(api), headers: authHeaders, body: body); + http.Response resp; + // support compression + if (licensedDevices > 0 && body.length > 1024) { + authHeaders['Content-Encoding'] = "gzip"; + resp = await http.post(Uri.parse(api), + headers: authHeaders, body: GZipCodec().encode(utf8.encode(body))); + } else { + resp = + await http.post(Uri.parse(api), headers: authHeaders, body: body); + } if (resp.statusCode == 200 && (resp.body.isEmpty || resp.body.toLowerCase() == 'null')) { ret = true; } else { Map json = - _jsonDecodeRespMap(decode_http_response(resp), resp.statusCode); + _jsonDecodeRespMap(utf8.decode(resp.bodyBytes), resp.statusCode); if (json.containsKey('error')) { throw json['error']; } else if (resp.statusCode == 200) { @@ -1157,12 +1068,6 @@ class LegacyAb extends BaseAb { return await pushAb(); } - @override - Future changeNote({required String id, required String note}) async { - // no need to implement - return false; - } - @override Future changeSharedPassword(String id, String password) async { // no need to implement @@ -1451,11 +1356,10 @@ class Ab extends BaseAb { }); var headers = getHttpHeaders(); headers['Content-Type'] = "application/json"; - _setEmptyBody(headers); final resp = await http.post(uri, headers: headers); statusCode = resp.statusCode; Map json = - _jsonDecodeRespMap(decode_http_response(resp), resp.statusCode); + _jsonDecodeRespMap(utf8.decode(resp.bodyBytes), resp.statusCode); if (json.containsKey('error')) { throw json['error']; } @@ -1509,11 +1413,10 @@ class Ab extends BaseAb { ); var headers = getHttpHeaders(); headers['Content-Type'] = "application/json"; - _setEmptyBody(headers); final resp = await http.post(uri, headers: headers); statusCode = resp.statusCode; List json = - _jsonDecodeRespList(decode_http_response(resp), resp.statusCode); + _jsonDecodeRespList(utf8.decode(resp.bodyBytes), resp.statusCode); if (resp.statusCode != 200) { throw 'HTTP ${resp.statusCode}'; } @@ -1624,27 +1527,6 @@ class Ab extends BaseAb { } } - @override - Future changeNote({required String id, required String note}) async { - try { - final api = - "${await bind.mainGetApiServer()}/api/ab/peer/update/${profile.guid}"; - var headers = getHttpHeaders(); - headers['Content-Type'] = "application/json"; - final body = jsonEncode({"id": id, "note": note}); - final resp = await http.put(Uri.parse(api), headers: headers, body: body); - final errMsg = _jsonDecodeActionResp(resp); - if (errMsg.isNotEmpty) { - BotToast.showText(contentColor: Colors.red, text: errMsg); - return false; - } - return true; - } catch (err) { - debugPrint('changeNote err: ${err.toString()}'); - return false; - } - } - Future _setPassword(Object bodyContent) async { try { final api = @@ -1911,11 +1793,6 @@ class DummyAb extends BaseAb { return false; } - @override - Future changeNote({required String id, required String note}) async { - return false; - } - @override Future changePersonalHashPassword(String id, String hash) async { return false; @@ -2024,8 +1901,3 @@ String _jsonDecodeActionResp(http.Response resp) { } return errMsg; } - -// https://github.com/seanmonstar/reqwest/issues/838 -void _setEmptyBody(Map headers) { - headers['Content-Length'] = '0'; -} diff --git a/flutter/lib/models/cm_file_model.dart b/flutter/lib/models/cm_file_model.dart index 46935c188..6609f1191 100644 --- a/flutter/lib/models/cm_file_model.dart +++ b/flutter/lib/models/cm_file_model.dart @@ -275,7 +275,7 @@ class TransferJobSerdeData { : this( connId: d['connId'] ?? 0, id: int.tryParse(d['id'].toString()) ?? 0, - path: d['dataSource'] ?? '', + path: d['path'] ?? '', isRemote: d['isRemote'] ?? false, totalSize: d['totalSize'] ?? 0, finishedSize: d['finishedSize'] ?? 0, diff --git a/flutter/lib/models/file_model.dart b/flutter/lib/models/file_model.dart index 7d91b03b3..fabbcc00c 100644 --- a/flutter/lib/models/file_model.dart +++ b/flutter/lib/models/file_model.dart @@ -30,17 +30,15 @@ enum SortBy { class JobID { int _count = 0; int next() { + String v = bind.mainGetCommonSync(key: 'transfer-job-id'); try { - if (!isWeb) { - String v = bind.mainGetCommonSync(key: 'transfer-job-id'); - return int.parse(v); - } + return int.parse(v); } catch (e) { - debugPrint("Failed to get transfer job id: $e"); + // unreachable. But we still handle it to make it safe. + // If we return -1, we have to check it in the caller. + _count++; + return _count; } - // Finally increase the count if on the web or if failed to get the id. - _count++; - return _count; } } @@ -113,34 +111,6 @@ class FileModel { fileFetcher.tryCompleteEmptyDirsTask(evt['value'], evt['is_local']); } - // This method fixes a deadlock that occurred when the previous code directly - // called jobController.jobError(evt) in the job_error event handler. - // - // The problem with directly calling jobController.jobError(): - // 1. fetchDirectoryRecursiveToRemove(jobID) registers readRecursiveTasks[jobID] - // and waits for completion - // 2. If the remote has no permission (or some other errors), it returns a FileTransferError - // 3. The error triggers job_error event, which called jobController.jobError() - // 4. jobController.jobError() calls getJob(jobID) to find the job in jobTable - // 5. But addDeleteDirJob() is called AFTER fetchDirectoryRecursiveToRemove(), - // so the job doesn't exist yet in jobTable - // 6. Result: jobController.jobError() does nothing useful, and - // readRecursiveTasks[jobID] never completes, causing a 2s timeout - // - // Solution: Before calling jobController.jobError(), we first check if there's - // a pending readRecursiveTasks with this ID and complete it with the error. - void handleJobError(Map evt) { - final id = int.tryParse(evt['id']?.toString() ?? ''); - if (id != null) { - final err = evt['err']?.toString() ?? 'Unknown error'; - fileFetcher.tryCompleteRecursiveTaskWithError(id, err); - } - // Always call jobController.jobError(evt) to ensure all error events are processed, - // even if the event does not have a valid job ID. This allows for generic error handling - // or logging of unexpected errors. - jobController.jobError(evt); - } - Future postOverrideFileConfirm(Map evt) async { evtLoop.pushEvent( _FileDialogEvent(WeakReference(this), FileDialogType.overwrite, evt)); @@ -391,30 +361,14 @@ class FileController { await Future.delayed(Duration(milliseconds: 100)); - final savedDir = (await bind.sessionGetPeerOption( + final dir = (await bind.sessionGetPeerOption( sessionId: sessionId, name: isLocal ? "local_dir" : "remote_dir")); - Future tryOpenReadyDirs() async { - final dirs = { - if (directory.value.path.isNotEmpty) directory.value.path, - if (savedDir.isNotEmpty) savedDir, - options.value.home, - }; - for (final dir in dirs) { - if (await _openDirectoryPath(dir, isBack: true)) { - return true; - } - } - return false; - } - - var opened = await tryOpenReadyDirs(); + openDirectory(dir.isEmpty ? options.value.home : dir); await Future.delayed(Duration(seconds: 1)); - if (!opened) { - // The peer may become ready during the reconnect delay, so retry the - // same candidates instead of only retrying the default home directory. - await tryOpenReadyDirs(); + if (directory.value.path.isEmpty) { + openDirectory(options.value.home); } } @@ -445,23 +399,19 @@ class FileController { }); } - Future refresh() async { - // "." can be both a refresh command and a real remote directory path. - // Refresh must bypass openDirectory's command dispatch to avoid recursion. - return await _openDirectoryPath(directory.value.path, isBack: true); + Future refresh() async { + await openDirectory(directory.value.path); } - Future openDirectory(String path, {bool isBack = false}) async { - if (!isBack && path == ".") { - return await refresh(); + Future openDirectory(String path, {bool isBack = false}) async { + if (path == ".") { + refresh(); + return; } - if (!isBack && path == "..") { - return await _goToParentDirectory(isBack: isBack); + if (path == "..") { + goToParentDirectory(); + return; } - return await _openDirectoryPath(path, isBack: isBack); - } - - Future _openDirectoryPath(String path, {bool isBack = false}) async { if (!isBack) { pushHistory(); } @@ -478,10 +428,8 @@ class FileController { final fd = await fileFetcher.fetchDirectory(path, isLocal, showHidden); fd.format(isWindows, sort: sortBy.value); directory.value = fd; - return true; } catch (e) { debugPrint("Failed to openDirectory $path: $e"); - return false; } } @@ -509,22 +457,19 @@ class FileController { goBack(); return; } - unawaited(_openDirectoryPath(path, isBack: true).then((_) {})); + openDirectory(path, isBack: true); } void goToParentDirectory() { - unawaited(_goToParentDirectory().then((_) {})); - } - - Future _goToParentDirectory({bool isBack = false}) async { final isWindows = options.value.isWindows; final dirPath = directory.value.path; var parent = PathUtil.dirname(dirPath, isWindows); // specially for C:\, D:\, goto '/' if (parent == dirPath && isWindows) { - return await _openDirectoryPath('/', isBack: isBack); + openDirectory('/'); + return; } - return await _openDirectoryPath(parent, isBack: isBack); + openDirectory(parent); } // TODO deprecated this @@ -644,21 +589,8 @@ class FileController { } else if (item.isDirectory) { title = translate("Not an empty directory"); dialogManager?.showLoading(translate("Waiting")); - final FileDirectory fd; - try { - fd = await fileFetcher.fetchDirectoryRecursiveToRemove( - jobID, item.path, items.isLocal, true); - } catch (e) { - dialogManager?.dismissAll(); - final dm = dialogManager; - if (dm != null) { - msgBox(sessionId, 'custom-error-nook-nocancel-hasclose', - translate("Error"), e.toString(), '', dm); - } else { - debugPrint("removeAction error msgbox failed: $e"); - } - return; - } + final fd = await fileFetcher.fetchDirectoryRecursiveToRemove( + jobID, item.path, items.isLocal, true); if (fd.path.isEmpty) { fd.path = item.path; } @@ -672,7 +604,7 @@ class FileController { item.name, false); if (confirm == true) { - await sendRemoveEmptyDir( + sendRemoveEmptyDir( item.path, 0, deleteJobId, @@ -713,7 +645,7 @@ class FileController { // handle remove res; if (item.isDirectory && res['file_num'] == (entries.length - 1).toString()) { - await sendRemoveEmptyDir(item.path, i, deleteJobId); + sendRemoveEmptyDir(item.path, i, deleteJobId); } } else { jobController.updateJobStatus(deleteJobId, @@ -726,7 +658,7 @@ class FileController { final res = await jobController.jobResultListener.start(); if (item.isDirectory && res['file_num'] == (entries.length - 1).toString()) { - await sendRemoveEmptyDir(item.path, i, deleteJobId); + sendRemoveEmptyDir(item.path, i, deleteJobId); } } } else { @@ -821,9 +753,9 @@ class FileController { fileNum: fileNum); } - Future sendRemoveEmptyDir(String path, int fileNum, int actId) async { + void sendRemoveEmptyDir(String path, int fileNum, int actId) { history.removeWhere((element) => element.contains(path)); - await bind.sessionRemoveAllEmptyDirs( + bind.sessionRemoveAllEmptyDirs( sessionId: sessionId, actId: actId, path: path, isRemote: !isLocal); } @@ -1099,54 +1031,30 @@ class JobController { await bind.sessionCancelJob(sessionId: sessionId, actId: id); } - Future loadLastJob(Map evt) async { + void loadLastJob(Map evt) { debugPrint("load last job: $evt"); Map jobDetail = json.decode(evt['value']); + // int id = int.parse(jobDetail['id']); String remote = jobDetail['remote']; String to = jobDetail['to']; bool showHidden = jobDetail['show_hidden']; int fileNum = jobDetail['file_num']; bool isRemote = jobDetail['is_remote']; - bool isAutoStart = jobDetail['auto_start'] == true; - int currJobId = -1; - if (isAutoStart) { - // Ensure jobDetail['id'] exists and is an int - if (jobDetail.containsKey('id') && - jobDetail['id'] != null && - jobDetail['id'] is int) { - currJobId = jobDetail['id']; - } - } - if (currJobId < 0) { - // If id is missing or invalid, disable auto-start and assign a new job id - isAutoStart = false; - currJobId = JobController.jobID.next(); - } - - if (!isAutoStart) { - if (!(isDesktop || isWebDesktop)) { - // Don't add to job table if not auto start on mobile. - // Because mobile does not support job list view now. - return; - } - - // Add to job table if not auto start on desktop. - String fileName = path.basename(isRemote ? remote : to); - final jobProgress = JobProgress() - ..type = JobType.transfer - ..fileName = fileName - ..jobName = isRemote ? remote : to - ..id = currJobId - ..isRemoteToLocal = isRemote - ..fileNum = fileNum - ..remote = remote - ..to = to - ..showHidden = showHidden - ..state = JobState.paused; - jobTable.add(jobProgress); - } - - await bind.sessionAddJob( + final currJobId = JobController.jobID.next(); + String fileName = path.basename(isRemote ? remote : to); + var jobProgress = JobProgress() + ..type = JobType.transfer + ..fileName = fileName + ..jobName = isRemote ? remote : to + ..id = currJobId + ..isRemoteToLocal = isRemote + ..fileNum = fileNum + ..remote = remote + ..to = to + ..showHidden = showHidden + ..state = JobState.paused; + jobTable.add(jobProgress); + bind.sessionAddJob( sessionId: sessionId, isRemote: isRemote, includeHidden: showHidden, @@ -1155,11 +1063,6 @@ class JobController { to: isRemote ? to : remote, fileNum: fileNum, ); - - if (isAutoStart) { - await bind.sessionResumeJob( - sessionId: sessionId, actId: currJobId, isRemote: isRemote); - } } void resumeJob(int jobId) { @@ -1190,11 +1093,6 @@ class JobController { } debugPrint("update folder files: $info"); } - - void clear() { - jobTable.clear(); - jobResultListener.clear(); - } } class JobResultListener { @@ -1341,15 +1239,6 @@ class FileFetcher { } } - // Complete a pending recursive read task with an error. - // See FileModel.handleJobError() for why this is necessary. - void tryCompleteRecursiveTaskWithError(int id, String error) { - final completer = readRecursiveTasks.remove(id); - if (completer != null && !completer.isCompleted) { - completer.completeError(error); - } - } - Future> readEmptyDirs( String path, bool isLocal, bool showHidden) async { try { @@ -1513,10 +1402,6 @@ class JobProgress { var err = ""; int lastTransferredSize = 0; - double get percent => - totalSize > 0 ? (finishedSize.toDouble() / totalSize) : 0.0; - String get percentText => '${(percent * 100).toStringAsFixed(0)}%'; - clear() { type = JobType.none; state = JobState.none; diff --git a/flutter/lib/models/group_model.dart b/flutter/lib/models/group_model.dart index d55cff453..534e897e9 100644 --- a/flutter/lib/models/group_model.dart +++ b/flutter/lib/models/group_model.dart @@ -122,7 +122,7 @@ class GroupModel { final resp = await http.get(uri, headers: getHttpHeaders()); _statusCode = resp.statusCode; Map json = - _jsonDecodeResp(decode_http_response(resp), resp.statusCode); + _jsonDecodeResp(utf8.decode(resp.bodyBytes), resp.statusCode); if (json.containsKey('error')) { throw json['error']; } @@ -180,7 +180,7 @@ class GroupModel { final resp = await http.get(uri, headers: getHttpHeaders()); _statusCode = resp.statusCode; Map json = - _jsonDecodeResp(decode_http_response(resp), resp.statusCode); + _jsonDecodeResp(utf8.decode(resp.bodyBytes), resp.statusCode); if (json.containsKey('error')) { if (json['error'] == 'Admin required!' || json['error'] @@ -246,7 +246,7 @@ class GroupModel { _statusCode = resp.statusCode; Map json = - _jsonDecodeResp(decode_http_response(resp), resp.statusCode); + _jsonDecodeResp(utf8.decode(resp.bodyBytes), resp.statusCode); if (json.containsKey('error')) { throw json['error']; } @@ -343,7 +343,6 @@ class GroupModel { } reset() async { - initialized = false; groupLoadError.value = ''; deviceGroups.clear(); users.clear(); diff --git a/flutter/lib/models/input_model.dart b/flutter/lib/models/input_model.dart index 984d6a25c..dcccf8f7c 100644 --- a/flutter/lib/models/input_model.dart +++ b/flutter/lib/models/input_model.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; import 'dart:math'; -import 'package:flutter/foundation.dart'; import 'dart:ui' as ui; import 'package:desktop_multi_window/desktop_multi_window.dart'; @@ -15,14 +14,11 @@ import 'package:get/get.dart'; import '../../models/model.dart'; import '../../models/platform_model.dart'; -import '../../models/state_model.dart'; -import 'input_modifier_utils.dart'; -import 'relative_mouse_model.dart'; import '../common.dart'; import '../consts.dart'; /// Mouse button enum. -enum MouseButtons { left, right, wheel, back, forward } +enum MouseButtons { left, right, wheel, back } const _kMouseEventDown = 'mousedown'; const _kMouseEventUp = 'mouseup'; @@ -46,7 +42,8 @@ class CanvasCoords { 'scale': scale, 'scrollX': scrollX, 'scrollY': scrollY, - 'scrollStyle': scrollStyle.toJson(), + 'scrollStyle': + scrollStyle == ScrollStyle.scrollauto ? 'scrollauto' : 'scrollbar', 'size': { 'w': size.width, 'h': size.height, @@ -61,8 +58,9 @@ class CanvasCoords { model.scale = json['scale']; model.scrollX = json['scrollX']; model.scrollY = json['scrollY']; - model.scrollStyle = - ScrollStyle.fromJson(json['scrollStyle'], ScrollStyle.scrollauto); + model.scrollStyle = json['scrollStyle'] == 'scrollauto' + ? ScrollStyle.scrollauto + : ScrollStyle.scrollbar; model.size = Size(json['size']['w'], json['size']['h']); return model; } @@ -159,8 +157,6 @@ extension ToString on MouseButtons { return 'wheel'; case MouseButtons.back: return 'back'; - case MouseButtons.forward: - return 'forward'; } } } @@ -331,80 +327,6 @@ class ToReleaseKeys { } class InputModel { - // Side mouse button support for Linux. - // Flutter's Linux embedder drops X11 button 8/9 events, so we capture them - // natively via GDK and forward through the platform channel. - static InputModel? _activeSideButtonModel; - // Tracks per-button which model received a side button down event, so the - // matching up event is routed there even if the pointer has left the view - // or a different button was pressed in between. - static final Map _sideButtonDownModels = {}; - static bool _sideButtonChannelInitialized = false; - - /// Each Flutter engine (main window + sub-windows from desktop_multi_window) - /// runs its own Dart isolate with its own statics. Called from initEnv() - /// which runs per-engine, so each isolate registers its own handler tied - /// to its own set of InputModels. - static void initSideButtonChannel() { - if (!isLinux) return; - if (_sideButtonChannelInitialized) return; - _sideButtonChannelInitialized = true; - - const channel = MethodChannel('org.rustdesk.rustdesk/side_buttons'); - channel.setMethodCallHandler((call) async { - if (call.method == 'onSideMouseButton') { - final args = call.arguments as Map; - final button = args['button'] as String; - final type = args['type'] as String; - final mb = button == 'back' ? MouseButtons.back : MouseButtons.forward; - - if (type == 'down') { - final model = _activeSideButtonModel; - if (model != null && - !(model.isViewOnly && !model.showMyCursor) && - model.keyboardPerm && - !model.isViewCamera) { - _sideButtonDownModels[mb] = model; - // Fire-and-forget to avoid blocking the platform channel handler. - unawaited(model._sendMouseUnchecked(type, mb).catchError((Object e) { - debugPrint('[InputModel] failed to send side button $type for $mb: $e'); - })); - } - } else { - // Only route 'up' when we recorded the matching 'down'; - // dropping avoids sending unpaired 'up' to an unrelated session. - // Use _sendMouseUnchecked to bypass permission checks so the - // release always goes through even if permissions changed. - final model = _sideButtonDownModels.remove(mb); - if (model != null) { - unawaited(model._sendMouseUnchecked(type, mb).catchError((Object e) { - debugPrint('[InputModel] failed to send side button $type for $mb: $e'); - })); - } - } - } - return null; - }); - } - - /// Clear any static references to this model (prevents stale routing). - /// Releases any held side buttons on the peer so closing a session - /// mid-press does not leave a stuck button. - void disposeSideButtonTracking() { - if (_activeSideButtonModel == this) _activeSideButtonModel = null; - final held = _sideButtonDownModels.entries - .where((e) => e.value == this) - .map((e) => e.key) - .toList(); - for (final mb in held) { - _sideButtonDownModels.remove(mb); - // Best-effort release; session may already be tearing down. - unawaited(_sendMouseUnchecked('up', mb).catchError((Object e) { - debugPrint('[InputModel] failed to release side button $mb: $e'); - })); - } - } - final WeakReference parent; String keyboardMode = ''; @@ -426,47 +348,18 @@ class InputModel { final _trackpadAdjustPeerLinux = 0.06; // This is an experience value. final _trackpadAdjustMacToWin = 2.50; - // Ignore directional locking for very small deltas on both axes (including - // tiny single-axis movement) to avoid over-filtering near zero. - static const double _trackpadAxisNoiseThreshold = 0.2; - // Lock to dominant axis only when one axis is clearly stronger. - // 1.6 means the dominant axis must be >= 60% larger than the other. - static const double _trackpadAxisLockRatio = 1.6; int _trackpadSpeed = kDefaultTrackpadSpeed; double _trackpadSpeedInner = kDefaultTrackpadSpeed / 100.0; var _trackpadScrollUnsent = Offset.zero; - // Mobile relative mouse delta accumulators (for slow/fine movements). - double _mobileDeltaRemainderX = 0.0; - double _mobileDeltaRemainderY = 0.0; - var _lastScale = 1.0; bool _pointerMovedAfterEnter = false; - bool _pointerInsideImage = false; // mouse final isPhysicalMouse = false.obs; int _lastButtons = 0; Offset lastMousePos = Offset.zero; - int _lastWheelTsUs = 0; - - // Wheel acceleration thresholds. - static const int _wheelAccelFastThresholdUs = 40000; // 40ms - static const int _wheelAccelMediumThresholdUs = 80000; // 80ms - static const double _wheelBurstVelocityThreshold = - 0.002; // delta units per microsecond - // Wheel burst acceleration (empirical tuning). - // Applies only to fast, non-smooth bursts to preserve single-step scrolling. - // Flutter uses microseconds for dt, so velocity is in delta/us. - - // Relative mouse mode (for games/3D apps). - final relativeMouseMode = false.obs; - late final RelativeMouseModel _relativeMouse; - // Callback to cancel external throttle timer when relative mouse mode is disabled. - VoidCallback? onRelativeMouseModeDisabled; - // Disposer for the relativeMouseMode observer (to prevent memory leaks). - Worker? _relativeMouseModeDisposer; bool _queryOtherWindowCoords = false; Rect? _windowRect; @@ -477,109 +370,13 @@ class InputModel { bool get keyboardPerm => parent.target!.ffiModel.keyboard; String get id => parent.target?.id ?? ''; String? get peerPlatform => parent.target?.ffiModel.pi.platform; - String get peerVersion => parent.target?.ffiModel.pi.version ?? ''; bool get isViewOnly => parent.target!.ffiModel.viewOnly; - bool get showMyCursor => parent.target!.ffiModel.showMyCursor; double get devicePixelRatio => parent.target!.canvasModel.devicePixelRatio; bool get isViewCamera => parent.target!.connType == ConnType.viewCamera; int get trackpadSpeed => _trackpadSpeed; - bool get useEdgeScroll => - parent.target!.canvasModel.scrollStyle == ScrollStyle.scrolledge; - - /// Check if the connected server supports relative mouse mode. - bool get isRelativeMouseModeSupported => _relativeMouse.isSupported; InputModel(this.parent) { - initSideButtonChannel(); sessionId = parent.target!.sessionId; - _relativeMouse = RelativeMouseModel( - sessionId: sessionId, - enabled: relativeMouseMode, - keyboardPerm: () => keyboardPerm, - isViewCamera: () => isViewCamera, - peerVersion: () => peerVersion, - peerPlatform: () => peerPlatform, - modify: (msg) => modify(msg), - getPointerInsideImage: () => _pointerInsideImage, - setPointerInsideImage: (inside) => _pointerInsideImage = inside, - ); - _relativeMouse.onDisabled = () => onRelativeMouseModeDisabled?.call(); - - // Sync relative mouse mode state to global state for UI components (e.g., tab bar hint). - _relativeMouseModeDisposer = ever(relativeMouseMode, (bool value) { - final peerId = id; - if (peerId.isNotEmpty) { - stateGlobal.relativeMouseModeState[peerId] = value; - } - }); - } - - // https://github.com/flutter/flutter/issues/157241 - // Infer CapsLock state from the character output. - // This is needed because Flutter's HardwareKeyboard.lockModesEnabled may report - // incorrect CapsLock state on iOS. - bool _getIosCapsFromCharacter(KeyEvent e) { - if (!isIOS) return false; - final ch = e.character; - return _getIosCapsFromCharacterImpl( - ch, HardwareKeyboard.instance.isShiftPressed); - } - - // RawKeyEvent version of _getIosCapsFromCharacter. - bool _getIosCapsFromRawCharacter(RawKeyEvent e) { - if (!isIOS) return false; - final ch = e.character; - return _getIosCapsFromCharacterImpl(ch, e.isShiftPressed); - } - - // Shared implementation for inferring CapsLock state from character. - // Uses Unicode-aware case detection to support non-ASCII letters (e.g., ü/Ü, é/É). - // - // Limitations: - // 1. This inference assumes the client and server use the same keyboard layout. - // If layouts differ (e.g., client uses EN, server uses DE), the character output - // may not match expectations. For example, ';' on EN layout maps to 'ö' on DE - // layout, making it impossible to correctly infer CapsLock state from the - // character alone. - // 2. On iOS, CapsLock+Shift produces uppercase letters (unlike desktop where it - // produces lowercase). This method cannot handle that case correctly. - bool _getIosCapsFromCharacterImpl(String? ch, bool shiftPressed) { - if (ch == null || ch.length != 1) return false; - // Use Dart's built-in Unicode-aware case detection - final upper = ch.toUpperCase(); - final lower = ch.toLowerCase(); - final isUpper = upper == ch && lower != ch; - final isLower = lower == ch && upper != ch; - // Skip non-letter characters (e.g., numbers, symbols, CJK characters without case) - if (!isUpper && !isLower) return false; - return isUpper != shiftPressed; - } - - int _buildLockModes(bool iosCapsLock) { - const capslock = 1; - const numlock = 2; - const scrolllock = 3; - int lockModes = 0; - if (isIOS) { - if (iosCapsLock) { - lockModes |= (1 << capslock); - } - // Ignore "NumLock/ScrollLock" on iOS for now. - } else { - if (HardwareKeyboard.instance.lockModesEnabled - .contains(KeyboardLockMode.capsLock)) { - lockModes |= (1 << capslock); - } - if (HardwareKeyboard.instance.lockModesEnabled - .contains(KeyboardLockMode.numLock)) { - lockModes |= (1 << numlock); - } - if (HardwareKeyboard.instance.lockModesEnabled - .contains(KeyboardLockMode.scrollLock)) { - lockModes |= (1 << scrolllock); - } - } - return lockModes; } // This function must be called after the peer info is received. @@ -699,38 +496,6 @@ class InputModel { } } - // Safe: this only re-dispatches synthesized Shift key-up events. - // The key-up path clears the tracked Shift state so this does not loop. - void _releaseTrackedShiftKeyEventIfNeeded() { - final leftShift = toReleaseKeys.lastLShiftKeyEvent; - final rightShift = toReleaseKeys.lastRShiftKeyEvent; - if (leftShift != null) { - handleKeyEvent(leftShift); - } - if (rightShift != null) { - handleKeyEvent(rightShift); - } - } - - // Safe: this only re-dispatches synthesized Shift key-up events. - // The raw key-up path clears the tracked Shift state so this does not loop. - void _releaseTrackedRawShiftKeyEventIfNeeded() { - final leftShift = toReleaseRawKeys.lastLShiftKeyEvent; - final rightShift = toReleaseRawKeys.lastRShiftKeyEvent; - if (leftShift != null) { - handleRawKeyEvent(RawKeyUpEvent( - data: leftShift.data, - character: leftShift.character, - )); - } - if (rightShift != null) { - handleRawKeyEvent(RawKeyUpEvent( - data: rightShift.data, - character: rightShift.character, - )); - } - } - KeyEventResult handleRawKeyEvent(RawKeyEvent e) { if (isViewOnly) return KeyEventResult.handled; if (isViewCamera) return KeyEventResult.handled; @@ -742,15 +507,6 @@ class InputModel { } } - if (_relativeMouse.handleRawKeyEvent(e)) { - return KeyEventResult.handled; - } - - bool iosCapsLock = false; - if (isIOS && e is RawKeyDownEvent) { - iosCapsLock = _getIosCapsFromRawCharacter(e); - } - final key = e.logicalKey; if (e is RawKeyDownEvent) { if (!e.repeat) { @@ -785,30 +541,9 @@ class InputModel { toReleaseRawKeys.updateKeyUp(key, e); } - // On some mobile soft-keyboard paths, Flutter may leave cached Shift state - // set even though the current raw key event is not shifted anymore. - if (e is RawKeyDownEvent && - shouldReleaseStaleMobileShift( - isMobile: isMobile, - cachedShiftPressed: shift, - actualShiftPressed: e.isShiftPressed, - logicalKey: e.logicalKey, - hasTrackedShiftKeyDown: toReleaseRawKeys.lastLShiftKeyEvent != null || - toReleaseRawKeys.lastRShiftKeyEvent != null, - )) { - if (kDebugMode) { - debugPrint( - 'input: releasing stale mobile Shift before replaying tracked raw ' - 'key-up (logicalKey=${e.logicalKey.keyLabel}, ' - 'actualShiftPressed=${e.isShiftPressed}, cachedShiftPressed=$shift)', - ); - } - _releaseTrackedRawShiftKeyEventIfNeeded(); - } - // * Currently mobile does not enable map mode if ((isDesktop || isWebDesktop) && keyboardMode == kKeyMapMode) { - mapKeyboardModeRaw(e, iosCapsLock); + mapKeyboardModeRaw(e); } else { legacyKeyboardModeRaw(e); } @@ -834,23 +569,6 @@ class InputModel { } } - if (_relativeMouse.handleKeyEvent( - e, - ctrlPressed: ctrl, - shiftPressed: shift, - altPressed: alt, - commandPressed: command, - )) { - return KeyEventResult.handled; - } - - bool iosCapsLock = false; - if (isIOS && (e is KeyDownEvent || e is KeyRepeatEvent)) { - iosCapsLock = _getIosCapsFromCharacter(e); - } - - // Update cached modifier state before sending the event. The stale mobile - // Shift release check below relies on this cached state. if (e is KeyUpEvent) { handleKeyUpEventModifiers(e); } else if (e is KeyDownEvent) { @@ -888,21 +606,6 @@ class InputModel { } } } - - // On some mobile soft-keyboard paths, Flutter may leave cached Shift state - // set even though the current key event is not shifted anymore. - if (e is KeyDownEvent && - shouldReleaseStaleMobileShift( - isMobile: isMobile, - cachedShiftPressed: shift, - actualShiftPressed: HardwareKeyboard.instance.isShiftPressed, - logicalKey: e.logicalKey, - hasTrackedShiftKeyDown: toReleaseKeys.lastLShiftKeyEvent != null || - toReleaseKeys.lastRShiftKeyEvent != null, - )) { - _releaseTrackedShiftKeyEventIfNeeded(); - } - final isDesktopAndMapMode = isDesktop || (isWebDesktop && keyboardMode == kKeyMapMode); if (isMobileAndMapMode || isDesktopAndMapMode) { @@ -911,8 +614,7 @@ class InputModel { e.character ?? '', e.physicalKey.usbHidUsage & 0xFFFF, // Show repeat event be converted to "release+press" events? - e is KeyDownEvent || e is KeyRepeatEvent, - iosCapsLock); + e is KeyDownEvent || e is KeyRepeatEvent); } else { legacyKeyboardMode(e); } @@ -921,9 +623,23 @@ class InputModel { } /// Send Key Event - void newKeyboardMode( - String character, int usbHid, bool down, bool iosCapsLock) { - final lockModes = _buildLockModes(iosCapsLock); + void newKeyboardMode(String character, int usbHid, bool down) { + const capslock = 1; + const numlock = 2; + const scrolllock = 3; + int lockModes = 0; + if (HardwareKeyboard.instance.lockModesEnabled + .contains(KeyboardLockMode.capsLock)) { + lockModes |= (1 << capslock); + } + if (HardwareKeyboard.instance.lockModesEnabled + .contains(KeyboardLockMode.numLock)) { + lockModes |= (1 << numlock); + } + if (HardwareKeyboard.instance.lockModesEnabled + .contains(KeyboardLockMode.scrollLock)) { + lockModes |= (1 << scrolllock); + } bind.sessionHandleFlutterKeyEvent( sessionId: sessionId, character: character, @@ -932,7 +648,7 @@ class InputModel { downOrUp: down); } - void mapKeyboardModeRaw(RawKeyEvent e, bool iosCapsLock) { + void mapKeyboardModeRaw(RawKeyEvent e) { int positionCode = -1; int platformCode = -1; bool down; @@ -963,14 +679,27 @@ class InputModel { } else { down = false; } - inputRawKey( - e.character ?? '', platformCode, positionCode, down, iosCapsLock); + inputRawKey(e.character ?? '', platformCode, positionCode, down); } /// Send raw Key Event - void inputRawKey(String name, int platformCode, int positionCode, bool down, - bool iosCapsLock) { - final lockModes = _buildLockModes(iosCapsLock); + void inputRawKey(String name, int platformCode, int positionCode, bool down) { + const capslock = 1; + const numlock = 2; + const scrolllock = 3; + int lockModes = 0; + if (HardwareKeyboard.instance.lockModesEnabled + .contains(KeyboardLockMode.capsLock)) { + lockModes |= (1 << capslock); + } + if (HardwareKeyboard.instance.lockModesEnabled + .contains(KeyboardLockMode.numLock)) { + lockModes |= (1 << numlock); + } + if (HardwareKeyboard.instance.lockModesEnabled + .contains(KeyboardLockMode.scrollLock)) { + lockModes |= (1 << scrolllock); + } bind.sessionHandleFlutterRawKeyEvent( sessionId: sessionId, name: name, @@ -1036,17 +765,9 @@ class InputModel { command: command); } - static Map getMouseEventMove() => { - 'type': _kMouseEventMove, - 'buttons': 0, - }; - Map _getMouseEvent(PointerEvent evt, String type) { final Map out = {}; - bool hasStaleButtonsOnMouseUp = - type == _kMouseEventUp && evt.buttons == _lastButtons; - // Check update event type and set buttons to be sent. int buttons = _lastButtons; if (type == _kMouseEventMove) { @@ -1071,7 +792,7 @@ class InputModel { buttons = evt.buttons; } } - _lastButtons = hasStaleButtonsOnMouseUp ? 0 : evt.buttons; + _lastButtons = evt.buttons; out['buttons'] = buttons; out['type'] = type; @@ -1115,41 +836,24 @@ class InputModel { return evt; } - /// Send mouse event unconditionally (no permission checks). - /// Used for side button releases that must go through even if permissions - /// changed after the matching down was sent. - Future _sendMouseUnchecked(String type, MouseButtons button) async { - await bind.sessionSendMouse( - sessionId: sessionId, - msg: json.encode(modify({'type': type, 'buttons': button.value}))); - } - /// Send mouse press event. Future sendMouse(String type, MouseButtons button) async { if (!keyboardPerm) return; if (isViewCamera) return; - await _sendMouseUnchecked(type, button); + await bind.sessionSendMouse( + sessionId: sessionId, + msg: json.encode(modify({'type': type, 'buttons': button.value}))); } void enterOrLeave(bool enter) { toReleaseKeys.release(handleKeyEvent); toReleaseRawKeys.release(handleRawKeyEvent); _pointerMovedAfterEnter = false; - _pointerInsideImage = enter; - _lastWheelTsUs = 0; - - // Track active model for side button events (Linux). - if (enter) { - _activeSideButtonModel = this; - } else if (_activeSideButtonModel == this) { - _activeSideButtonModel = null; - } // Fix status if (!enter) { resetModifiers(); } - _relativeMouse.onEnterOrLeaveImage(enter); _flingTimer?.cancel(); if (!isInputSourceFlutter) { bind.sessionEnterOrLeave(sessionId: sessionId, enter: enter); @@ -1170,142 +874,15 @@ class InputModel { msg: json.encode(modify({'x': '$x2', 'y': '$y2'}))); } - /// Send relative mouse movement for mobile clients (virtual joystick). - /// This method is for touch-based controls that want to send delta values. - /// Uses the 'move_relative' type which bypasses absolute position tracking. - /// - /// Accumulates fractional deltas to avoid losing slow/fine movements. - /// Only sends events when relative mouse mode is enabled and supported. - Future sendMobileRelativeMouseMove(double dx, double dy) async { - if (!keyboardPerm) return; - if (isViewCamera) return; - // Only send relative mouse events when relative mode is enabled and supported. - if (!isRelativeMouseModeSupported || !relativeMouseMode.value) return; - _mobileDeltaRemainderX += dx; - _mobileDeltaRemainderY += dy; - final x = _mobileDeltaRemainderX.truncate(); - final y = _mobileDeltaRemainderY.truncate(); - _mobileDeltaRemainderX -= x; - _mobileDeltaRemainderY -= y; - if (x == 0 && y == 0) return; - await bind.sessionSendMouse( - sessionId: sessionId, - msg: json.encode(modify({ - 'type': 'move_relative', - 'x': '$x', - 'y': '$y', - }))); - } - - /// Update the pointer lock center position based on current window frame. - Future updatePointerLockCenter({Offset? localCenter}) { - return _relativeMouse.updatePointerLockCenter(localCenter: localCenter); - } - - /// Get the current image widget size (for comparison to avoid unnecessary updates). - Size? get imageWidgetSize => _relativeMouse.imageWidgetSize; - - /// Update the image widget size for center calculation. - void updateImageWidgetSize(Size size) { - _relativeMouse.updateImageWidgetSize(size); - } - - void toggleRelativeMouseMode() { - _relativeMouse.toggleRelativeMouseMode(); - } - - bool setRelativeMouseMode(bool enabled) { - return _relativeMouse.setRelativeMouseMode(enabled); - } - - /// Exit relative mouse mode and release all modifier keys to the remote. - /// This is called when the user presses the exit shortcut (Ctrl+Alt on Win/Linux, Cmd+G on macOS). - /// We need to send key-up events for all modifiers because the shortcut itself may have - /// blocked some key events, leaving the remote in a state where modifiers are stuck. - void exitRelativeMouseModeWithKeyRelease() { - if (!_relativeMouse.enabled.value) return; - - // First, send release events for all modifier keys to the remote. - // This ensures the remote doesn't have stuck modifier keys after exiting. - // Use press: false, down: false to send key-up events without modifiers attached. - final modifiersToRelease = [ - 'Control_L', - 'Control_R', - 'Alt_L', - 'Alt_R', - 'Shift_L', - 'Shift_R', - 'Meta_L', // Command/Super left - 'Meta_R', // Command/Super right - ]; - - for (final key in modifiersToRelease) { - bind.sessionInputKey( - sessionId: sessionId, - name: key, - down: false, - press: false, - alt: false, - ctrl: false, - shift: false, - command: false, - ); - } - - // Reset local modifier state - resetModifiers(); - - // Now exit relative mouse mode - _relativeMouse.setRelativeMouseMode(false); - } - - void disposeRelativeMouseMode() { - _relativeMouse.dispose(); - onRelativeMouseModeDisabled = null; - // Cancel the relative mouse mode observer and clean up global state. - _relativeMouseModeDisposer?.dispose(); - _relativeMouseModeDisposer = null; - final peerId = id; - if (peerId.isNotEmpty) { - stateGlobal.relativeMouseModeState.remove(peerId); - } - } - - void onWindowBlur() { - _relativeMouse.onWindowBlur(); - } - - void onWindowFocus() { - _relativeMouse.onWindowFocus(); - } - void onPointHoverImage(PointerHoverEvent e) { _stopFling = true; - if (isViewOnly && !showMyCursor) return; + if (isViewOnly) return; if (e.kind != ui.PointerDeviceKind.mouse) return; - - // May fix https://github.com/rustdesk/rustdesk/issues/13009 - if (isIOS && e.synthesized && e.position == Offset.zero && e.buttons == 0) { - // iOS may emit a synthesized hover event at (0,0) when the mouse is disconnected. - // Ignore this event to prevent cursor jumping. - debugPrint('Ignored synthesized hover at (0,0) on iOS'); - return; - } - - // Only update pointer region when relative mouse mode is enabled. - // This avoids unnecessary tracking when not in relative mode. - if (_relativeMouse.enabled.value) { - _relativeMouse.updatePointerRegionTopLeftGlobal(e); - } - if (!isPhysicalMouse.value) { isPhysicalMouse.value = true; } if (isPhysicalMouse.value) { - if (!_relativeMouse.handleRelativeMouseMove(e.localPosition)) { - handleMouse(_getMouseEvent(e, _kMouseEventMove), e.position, - edgeScroll: useEdgeScroll); - } + handleMouse(_getMouseEvent(e, _kMouseEventMove), e.position); } } @@ -1341,7 +918,6 @@ class InputModel { if (isMacOS && peerPlatform == kPeerPlatformWindows) { delta *= _trackpadAdjustMacToWin; } - delta = _filterTrackpadDeltaAxis(delta); _trackpadLastDelta = delta; var x = delta.dx.toInt(); @@ -1374,24 +950,6 @@ class InputModel { } } - Offset _filterTrackpadDeltaAxis(Offset delta) { - final absDx = delta.dx.abs(); - final absDy = delta.dy.abs(); - // Keep diagonal intent when movement is tiny on both axes. - if (absDx < _trackpadAxisNoiseThreshold && - absDy < _trackpadAxisNoiseThreshold) { - return delta; - } - // Dominant-axis lock to reduce accidental cross-axis scrolling noise. - if (absDy >= absDx * _trackpadAxisLockRatio) { - return Offset(0, delta.dy); - } - if (absDx >= absDy * _trackpadAxisLockRatio) { - return Offset(delta.dx, 0); - } - return delta; - } - void _scheduleFling(double x, double y, int delay) { if (isViewCamera) return; if ((x == 0 && y == 0) || _stopFling) { @@ -1473,113 +1031,38 @@ class InputModel { _trackpadLastDelta = Offset.zero; } - // iOS Magic Mouse duplicate event detection. - // When using Magic Mouse on iPad, iOS may emit both mouse and touch events - // for the same click in certain areas (like top-left corner). - int _lastMouseDownTimeMs = 0; - ui.Offset _lastMouseDownPos = ui.Offset.zero; - - /// Check if a touch tap event should be ignored because it's a duplicate - /// of a recent mouse event (iOS Magic Mouse issue). - bool shouldIgnoreTouchTap(ui.Offset pos) { - if (!isIOS) return false; - final nowMs = DateTime.now().millisecondsSinceEpoch; - final dt = nowMs - _lastMouseDownTimeMs; - final distance = (_lastMouseDownPos - pos).distance; - // If touch tap is within 2000ms and 80px of the last mouse down, - // it's likely a duplicate event from the same Magic Mouse click. - if (dt >= 0 && dt < 2000 && distance < 80.0) { - debugPrint("shouldIgnoreTouchTap: IGNORED (dt=$dt, dist=$distance)"); - return true; - } - return false; - } - - /// iOS may emit a synthesized touch event after a real mouse click. - /// This helper ignores touch-down events that arrive shortly after a mouse down, - /// even when the position is far (e.g., near the top edge). - bool _shouldIgnoreTouchAfterMouse(int nowMs) { - if (!isIOS) return false; - const int kTouchAfterMouseWindowMs = 700; - final dt = nowMs - _lastMouseDownTimeMs; - return dt >= 0 && dt < kTouchAfterMouseWindowMs; - } - void onPointDownImage(PointerDownEvent e) { debugPrint("onPointDownImage ${e.kind}"); _stopFling = true; if (isDesktop) _queryOtherWindowCoords = true; _remoteWindowCoords = []; _windowRect = null; - if (isViewOnly && !showMyCursor) return; + if (isViewOnly) return; if (isViewCamera) return; - - // Track mouse down events for duplicate detection on iOS. - final nowMs = DateTime.now().millisecondsSinceEpoch; - if (e.kind == ui.PointerDeviceKind.mouse) { - if (!isPhysicalMouse.value) { - isPhysicalMouse.value = true; - } - _lastMouseDownTimeMs = nowMs; - _lastMouseDownPos = e.position; - } - - if (_relativeMouse.enabled.value) { - _relativeMouse.updatePointerRegionTopLeftGlobal(e); - } - if (e.kind != ui.PointerDeviceKind.mouse) { - // Ignore duplicate touch events that follow a recent mouse click (iOS Magic Mouse issue). - if (isPhysicalMouse.value && _shouldIgnoreTouchAfterMouse(nowMs)) { - return; - } if (isPhysicalMouse.value) { isPhysicalMouse.value = false; } } if (isPhysicalMouse.value) { - // In relative mouse mode, send button events without position. - // Use _relativeMouse.enabled.value consistently with the guard above. - if (_relativeMouse.enabled.value) { - _relativeMouse - .sendRelativeMouseButton(_getMouseEvent(e, _kMouseEventDown)); - } else { - handleMouse(_getMouseEvent(e, _kMouseEventDown), e.position); - } + handleMouse(_getMouseEvent(e, _kMouseEventDown), e.position); } } void onPointUpImage(PointerUpEvent e) { if (isDesktop) _queryOtherWindowCoords = false; - if (isViewOnly && !showMyCursor) return; + if (isViewOnly) return; if (isViewCamera) return; - - if (_relativeMouse.enabled.value) { - _relativeMouse.updatePointerRegionTopLeftGlobal(e); - } - if (e.kind != ui.PointerDeviceKind.mouse) return; if (isPhysicalMouse.value) { - // In relative mouse mode, send button events without position. - // Use _relativeMouse.enabled.value consistently with the guard above. - if (_relativeMouse.enabled.value) { - _relativeMouse - .sendRelativeMouseButton(_getMouseEvent(e, _kMouseEventUp)); - } else { - handleMouse(_getMouseEvent(e, _kMouseEventUp), e.position); - } + handleMouse(_getMouseEvent(e, _kMouseEventUp), e.position); } } void onPointMoveImage(PointerMoveEvent e) { - if (isViewOnly && !showMyCursor) return; + if (isViewOnly) return; if (isViewCamera) return; if (e.kind != ui.PointerDeviceKind.mouse) return; - - if (_relativeMouse.enabled.value) { - _relativeMouse.updatePointerRegionTopLeftGlobal(e); - } - if (_queryOtherWindowCoords) { Future.delayed(Duration.zero, () async { _windowRect = await fillRemoteCoordsAndGetCurFrame(_remoteWindowCoords); @@ -1587,10 +1070,7 @@ class InputModel { _queryOtherWindowCoords = false; } if (isPhysicalMouse.value) { - if (!_relativeMouse.handleRelativeMouseMove(e.localPosition)) { - handleMouse(_getMouseEvent(e, _kMouseEventMove), e.position, - edgeScroll: useEdgeScroll); - } + handleMouse(_getMouseEvent(e, _kMouseEventMove), e.position); } } @@ -1614,53 +1094,21 @@ class InputModel { return null; } - /// Handle scroll/wheel events. - /// Note: Scroll events intentionally use absolute positioning even in relative mouse mode. - /// This is because scroll events don't need relative positioning - they represent - /// scroll deltas that are independent of cursor position. Games and 3D applications - /// handle scroll events the same way regardless of mouse mode. void onPointerSignalImage(PointerSignalEvent e) { if (isViewOnly) return; if (isViewCamera) return; if (e is PointerScrollEvent) { - final rawDx = e.scrollDelta.dx; - final rawDy = e.scrollDelta.dy; - final dominantDelta = rawDx.abs() > rawDy.abs() ? rawDx.abs() : rawDy.abs(); - final isSmooth = dominantDelta < 1; - final nowUs = DateTime.now().microsecondsSinceEpoch; - final dtUs = _lastWheelTsUs == 0 ? 0 : nowUs - _lastWheelTsUs; - _lastWheelTsUs = nowUs; - int accel = 1; - if (!isSmooth && - dtUs > 0 && - dtUs <= _wheelAccelMediumThresholdUs && - (isWindows || isLinux) && - peerPlatform == kPeerPlatformMacOS) { - final velocity = dominantDelta / dtUs; - if (velocity >= _wheelBurstVelocityThreshold) { - if (dtUs < _wheelAccelFastThresholdUs) { - accel = 3; - } else { - accel = 2; - } - } - } - var dx = rawDx.toInt(); - var dy = rawDy.toInt(); - if (rawDx.abs() > rawDy.abs()) { - dy = 0; - } else { - dx = 0; - } + var dx = e.scrollDelta.dx.toInt(); + var dy = e.scrollDelta.dy.toInt(); if (dx > 0) { - dx = -accel; + dx = -1; } else if (dx < 0) { - dx = accel; + dx = 1; } if (dy > 0) { - dy = -accel; + dy = -1; } else if (dy < 0) { - dy = accel; + dy = 1; } bind.sessionSendMouse( sessionId: sessionId, @@ -1671,7 +1119,7 @@ class InputModel { void refreshMousePos() => handleMouse({ 'buttons': 0, 'type': _kMouseEventMove, - }, lastMousePos, edgeScroll: useEdgeScroll); + }, lastMousePos); void tryMoveEdgeOnExit(Offset pos) => handleMouse( { @@ -1773,18 +1221,16 @@ class InputModel { return false; } - Map? processEventToPeer( + void handleMouse( Map evt, Offset offset, { bool onExit = false, - bool moveCanvas = true, - bool edgeScroll = false, }) { - if (isViewCamera) return null; + if (isViewCamera) return; double x = offset.dx; double y = max(0.0, offset.dy); if (_checkPeerControlProtected(x, y)) { - return null; + return; } var type = kMouseEventTypeDefault; @@ -1801,7 +1247,7 @@ class InputModel { isMove = true; break; default: - return null; + return; } evt['type'] = type; @@ -1819,11 +1265,9 @@ class InputModel { type, onExit: onExit, buttons: evt['buttons'], - moveCanvas: moveCanvas, - edgeScroll: edgeScroll, ); if (pos == null) { - return null; + return; } if (type != '') { evt['x'] = '0'; @@ -1833,35 +1277,15 @@ class InputModel { evt['y'] = '${pos.y.toInt()}'; } - final buttons = evt['buttons']; - if (buttons is int) { - evt['buttons'] = mouseButtonsToPeer(buttons); - } else { - // Log warning if buttons exists but is not an int (unexpected caller). - // Keep empty string fallback for missing buttons to preserve move/hover behavior. - if (buttons != null) { - debugPrint( - '[InputModel] processEventToPeer: unexpected buttons type: ${buttons.runtimeType}, value: $buttons'); - } - evt['buttons'] = ''; - } - return evt; - } - - Map? handleMouse( - Map evt, - Offset offset, { - bool onExit = false, - bool moveCanvas = true, - bool edgeScroll = false, - }) { - final evtToPeer = processEventToPeer(evt, offset, - onExit: onExit, moveCanvas: moveCanvas, edgeScroll: edgeScroll); - if (evtToPeer != null) { - bind.sessionSendMouse( - sessionId: sessionId, msg: json.encode(modify(evtToPeer))); - } - return evtToPeer; + Map mapButtons = { + kPrimaryMouseButton: 'left', + kSecondaryMouseButton: 'right', + kMiddleMouseButton: 'wheel', + kBackMouseButton: 'back', + kForwardMouseButton: 'forward' + }; + evt['buttons'] = mapButtons[evt['buttons']] ?? ''; + bind.sessionSendMouse(sessionId: sessionId, msg: json.encode(modify(evt))); } Point? handlePointerDevicePos( @@ -1872,8 +1296,6 @@ class InputModel { String evtType, { bool onExit = false, int buttons = kPrimaryMouseButton, - bool moveCanvas = true, - bool edgeScroll = false, }) { final ffiModel = parent.target!.ffiModel; CanvasCoords canvas = @@ -1890,12 +1312,8 @@ class InputModel { isMove = false; canvas = coords.canvas; rect = coords.remoteRect; - x -= isWindows - ? coords.relativeOffset.dx / devicePixelRatio - : coords.relativeOffset.dx; - y -= isWindows - ? coords.relativeOffset.dy / devicePixelRatio - : coords.relativeOffset.dy; + x -= coords.relativeOffset.dx / devicePixelRatio; + y -= coords.relativeOffset.dy / devicePixelRatio; } } } @@ -1903,15 +1321,7 @@ class InputModel { y -= CanvasModel.topToEdge; x -= CanvasModel.leftToEdge; if (isMove) { - final canvasModel = parent.target!.canvasModel; - - if (edgeScroll) { - canvasModel.edgeScrollMouse(x, y); - } else if (moveCanvas) { - canvasModel.moveDesktopMouse(x, y); - } - - canvasModel.updateLocalCursor(x, y); + parent.target!.canvasModel.moveDesktopMouse(x, y); } return _handlePointerDevicePos( @@ -1928,21 +1338,15 @@ class InputModel { } bool _isInCurrentWindow(double x, double y) { - var w = _windowRect!.width; - var h = _windowRect!.height; - if (isWindows) { - w /= devicePixelRatio; - h /= devicePixelRatio; - } + final w = _windowRect!.width / devicePixelRatio; + final h = _windowRect!.width / devicePixelRatio; return x >= 0 && y >= 0 && x <= w && y <= h; } static RemoteWindowCoords? findRemoteCoords(double x, double y, List remoteWindowCoords, double devicePixelRatio) { - if (isWindows) { - x *= devicePixelRatio; - y *= devicePixelRatio; - } + x *= devicePixelRatio; + y *= devicePixelRatio; for (final c in remoteWindowCoords) { if (x >= c.relativeOffset.dx && y >= c.relativeOffset.dy && @@ -1974,7 +1378,7 @@ class InputModel { var nearBottom = (canvas.size.height - y) < nearThr; final imageWidth = rect.width * canvas.scale; final imageHeight = rect.height * canvas.scale; - if (canvas.scrollStyle != ScrollStyle.scrollauto) { + if (canvas.scrollStyle == ScrollStyle.scrollbar) { x += imageWidth * canvas.scrollX; y += imageHeight * canvas.scrollY; @@ -2096,9 +1500,9 @@ class InputModel { // Simulate a key press event. // `usbHidUsage` is the USB HID usage code of the key. Future tapHidKey(int usbHidUsage) async { - newKeyboardMode(kKeyFlutterKey, usbHidUsage, true, false); + newKeyboardMode(kKeyFlutterKey, usbHidUsage, true); await Future.delayed(Duration(milliseconds: 100)); - newKeyboardMode(kKeyFlutterKey, usbHidUsage, false, false); + newKeyboardMode(kKeyFlutterKey, usbHidUsage, false); } Future onMobileVolumeUp() async => diff --git a/flutter/lib/models/input_modifier_utils.dart b/flutter/lib/models/input_modifier_utils.dart deleted file mode 100644 index e65c32790..000000000 --- a/flutter/lib/models/input_modifier_utils.dart +++ /dev/null @@ -1,38 +0,0 @@ -import 'package:flutter/services.dart'; - -/// Returns true when a stale mobile one-shot Shift state should be released -/// by replaying a tracked Shift key-down as a synthesized key-up. -/// -/// This is only valid on mobile when Flutter's cached Shift state is still on -/// (`cachedShiftPressed == true`) but the current hardware/raw event reports -/// Shift as off (`actualShiftPressed == false`). -/// -/// A tracked Shift key-down is required so the caller can safely synthesize the -/// matching key-up. Both `shiftLeft` and `shiftRight` are excluded because the -/// Shift key event itself must be processed first; otherwise we could release -/// the tracked key while still handling the original Shift press/release. -/// Callers should evaluate this only after their cached modifier state has been -/// updated for the current event. -/// -/// When this returns true, the caller logs a line like: -/// `input: releasing stale mobile Shift before replaying tracked raw key-up` -/// immediately before calling `_releaseTrackedRawShiftKeyEventIfNeeded()`. -bool shouldReleaseStaleMobileShift({ - required bool isMobile, - required bool cachedShiftPressed, - required bool actualShiftPressed, - required LogicalKeyboardKey logicalKey, - required bool hasTrackedShiftKeyDown, -}) { - if (!isMobile || !cachedShiftPressed || actualShiftPressed) { - return false; - } - if (!hasTrackedShiftKeyDown) { - return false; - } - if (logicalKey == LogicalKeyboardKey.shiftLeft || - logicalKey == LogicalKeyboardKey.shiftRight) { - return false; - } - return true; -} diff --git a/flutter/lib/models/model.dart b/flutter/lib/models/model.dart index e94834a2b..b15112025 100644 --- a/flutter/lib/models/model.dart +++ b/flutter/lib/models/model.dart @@ -9,7 +9,6 @@ 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/scheduler.dart'; import 'package:flutter_hbb/common/widgets/peers_view.dart'; import 'package:flutter_hbb/consts.dart'; import 'package:flutter_hbb/models/ab_model.dart'; @@ -30,7 +29,6 @@ import 'package:flutter_hbb/plugin/manager.dart'; import 'package:flutter_hbb/plugin/widgets/desc_ui.dart'; import 'package:flutter_hbb/common/shared_state.dart'; import 'package:flutter_hbb/utils/multi_window_manager.dart'; -import 'package:flutter_hbb/utils/http_service.dart' as http; import 'package:tuple/tuple.dart'; import 'package:image/image.dart' as img2; import 'package:flutter_svg/flutter_svg.dart'; @@ -38,14 +36,12 @@ import 'package:get/get.dart'; import 'package:uuid/uuid.dart'; import 'package:window_manager/window_manager.dart'; import 'package:file_picker/file_picker.dart'; -import 'package:vector_math/vector_math.dart' show Vector2; import '../common.dart'; import '../utils/image.dart' as img; import '../common/widgets/dialog.dart'; import 'input_model.dart'; import 'platform_model.dart'; -import 'package:flutter_hbb/utils/scale.dart'; import 'package:flutter_hbb/generated_bridge.dart' if (dart.library.html) 'package:flutter_hbb/web/bridge.dart'; @@ -65,7 +61,6 @@ class CachedPeerData { bool secure = false; bool direct = false; - String streamType = ''; CachedPeerData(); @@ -79,7 +74,6 @@ class CachedPeerData { 'permissions': permissions, 'secure': secure, 'direct': direct, - 'streamType': streamType, }); } @@ -98,7 +92,6 @@ class CachedPeerData { }); data.secure = map['secure']; data.direct = map['direct']; - data.streamType = map['streamType']; return data; } catch (e) { debugPrint('Failed to parse CachedPeerData: $e'); @@ -117,12 +110,9 @@ class FfiModel with ChangeNotifier { bool? _secure; bool? _direct; bool _touchMode = false; - late VirtualMouseMode virtualMouseMode; Timer? _timer; var _reconnects = 1; - DateTime? _offlineReconnectStartTime; bool _viewOnly = false; - bool _showMyCursor = false; WeakReference parent; late final SessionID sessionId; @@ -160,10 +150,7 @@ class FfiModel with ChangeNotifier { bool get isPeerAndroid => _pi.platform == kPeerPlatformAndroid; bool get isPeerMobile => isPeerAndroid; - bool get isPeerLinux => _pi.platform == kPeerPlatformLinux; - bool get viewOnly => _viewOnly; - bool get showMyCursor => _showMyCursor; set inputBlocked(v) { _inputBlocked = v; @@ -173,7 +160,6 @@ class FfiModel with ChangeNotifier { clear(); sessionId = parent.target!.sessionId; cachedPeerData.permissions = _permissions; - virtualMouseMode = VirtualMouseMode(this); } Rect? globalDisplaysRect() => _getDisplaysRect(_pi.displays, true); @@ -182,9 +168,6 @@ class FfiModel with ChangeNotifier { if (displays.isEmpty) { return null; } - if (isPeerLinux) { - useDisplayScale = true; - } int scale(int len, double s) { if (useDisplayScale) { return len.toDouble() ~/ s; @@ -214,9 +197,6 @@ class FfiModel with ChangeNotifier { } updatePermission(Map evt, String id) { - // Track previous keyboard permission to detect revocation. - final hadKeyboardPerm = _permissions['keyboard'] != false; - evt.forEach((k, v) { if (k == 'name' || k.isEmpty) return; _permissions[k] = v == 'true'; @@ -225,18 +205,6 @@ class FfiModel with ChangeNotifier { if (parent.target?.connType == ConnType.defaultConn) { KeyboardEnabledState.find(id).value = _permissions['keyboard'] != false; } - - // If keyboard permission was revoked while relative mouse mode is active, - // forcefully disable relative mouse mode to prevent the user from being trapped. - final hasKeyboardPerm = _permissions['keyboard'] != false; - if (hadKeyboardPerm && !hasKeyboardPerm) { - final inputModel = parent.target?.inputModel; - if (inputModel != null && inputModel.relativeMouseMode.value) { - inputModel.setRelativeMouseMode(false); - showToast(translate('rel-mouse-permission-lost-tip')); - } - } - debugPrint('updatePermission: $_permissions'); notifyListeners(); } @@ -255,45 +223,27 @@ class FfiModel with ChangeNotifier { timerScreenshot?.cancel(); } - setConnectionType( - String peerId, bool secure, bool direct, String streamType) { + setConnectionType(String peerId, bool secure, bool direct) { cachedPeerData.secure = secure; cachedPeerData.direct = direct; - cachedPeerData.streamType = streamType; _secure = secure; _direct = direct; try { var connectionType = ConnectionTypeState.find(peerId); connectionType.setSecure(secure); connectionType.setDirect(direct); - connectionType.setStreamType(streamType); } catch (e) { // } } - Widget? getConnectionImageText() { + Widget? getConnectionImage() { if (secure == null || direct == null) { return null; } else { final icon = '${secure == true ? 'secure' : 'insecure'}${direct == true ? '' : '_relay'}'; - final iconWidget = - SvgPicture.asset('assets/$icon.svg', width: 48, height: 48); - String connectionText = - getConnectionText(secure!, direct!, cachedPeerData.streamType); - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - iconWidget, - SizedBox(height: 4), - Text( - connectionText, - style: TextStyle(fontSize: 12), - textAlign: TextAlign.center, - ), - ], - ); + return SvgPicture.asset('assets/$icon.svg', width: 48, height: 48); } } @@ -310,7 +260,7 @@ class FfiModel with ChangeNotifier { 'link': '', }, sessionId, peerId); updatePrivacyMode(data.updatePrivacyMode, sessionId, peerId); - setConnectionType(peerId, data.secure, data.direct, data.streamType); + setConnectionType(peerId, data.secure, data.direct); await handlePeerInfo(data.peerInfo, peerId, true); for (final element in data.cursorDataList) { updateLastCursorId(element); @@ -339,8 +289,8 @@ class FfiModel with ChangeNotifier { } else if (name == 'sync_platform_additions') { handlePlatformAdditions(evt, sessionId, peerId); } else if (name == 'connection_ready') { - setConnectionType(peerId, evt['secure'] == 'true', - evt['direct'] == 'true', evt['stream_type'] ?? ''); + setConnectionType( + peerId, evt['secure'] == 'true', evt['direct'] == 'true'); } else if (name == 'switch_display') { // switch display is kept for backward compatibility handleSwitchDisplay(evt, sessionId, peerId); @@ -379,7 +329,7 @@ class FfiModel with ChangeNotifier { parent.target?.fileModel.refreshAll(); } } else if (name == 'job_error') { - parent.target?.fileModel.handleJobError(evt); + parent.target?.fileModel.jobController.jobError(evt); } else if (name == 'override_file_confirm') { parent.target?.fileModel.postOverrideFileConfirm(evt); } else if (name == 'load_last_job') { @@ -473,9 +423,6 @@ class FfiModel with ChangeNotifier { _handlePrinterRequest(evt, sessionId, peerId); } else if (name == 'screenshot') { _handleScreenshot(evt, sessionId, peerId); - } else if (name == 'exit_relative_mouse_mode') { - // Handle exit shortcut from rdev grab loop (Ctrl+Alt on Win/Linux, Cmd+G on macOS) - parent.target?.inputModel.exitRelativeMouseModeWithKeyRelease(); } else { debugPrint('Event is not handled in the fixed branch: $name'); } @@ -784,8 +731,7 @@ class FfiModel with ChangeNotifier { } } - Future updateCurDisplay(SessionID sessionId, - {updateCursorPos = false}) async { + updateCurDisplay(SessionID sessionId, {updateCursorPos = false}) { final newRect = displaysRect(); if (newRect == null) { return; @@ -797,19 +743,9 @@ class FfiModel with ChangeNotifier { updateCursorPos: updateCursorPos); } _rect = newRect; - // Await updateViewStyle to ensure view geometry is fully updated before - // updating pointer lock center. This prevents stale center calculations. - await parent.target?.canvasModel + parent.target?.canvasModel .updateViewStyle(refreshMousePos: updateCursorPos); _updateSessionWidthHeight(sessionId); - - // Keep pointer lock center in sync when using relative mouse mode. - // Note: updatePointerLockCenter is async-safe (handles errors internally), - // so we fire-and-forget here. - final inputModel = parent.target?.inputModel; - if (inputModel != null && inputModel.relativeMouseMode.value) { - inputModel.updatePointerLockCenter(); - } } } @@ -893,17 +829,6 @@ class FfiModel with ChangeNotifier { final title = evt['title']; final text = evt['text']; final link = evt['link']; - - // Disable relative mouse mode on any error-type message to ensure cursor is released. - // This includes connection errors, session-ending messages, elevation errors, etc. - // Safety: releasing pointer lock on errors prevents the user from being stuck. - if (title == 'Connection Error' || - type == 'error' || - type == 'restarting' || - (type is String && type.contains('error'))) { - parent.target?.inputModel.setRelativeMouseMode(false); - } - if (type == 're-input-password') { wrongPasswordDialog(sessionId, dialogManager, type, title, text); } else if (type == 'input-2fa') { @@ -911,16 +836,10 @@ class FfiModel with ChangeNotifier { } else if (type == 'input-password') { enterPasswordDialog(sessionId, dialogManager); } else if (type == 'session-login' || type == 'session-re-login') { - enterUserLoginDialog(sessionId, dialogManager, 'login_linux_tip', true); - } else if (type == 'session-login-password') { - enterUserLoginAndPasswordDialog( - sessionId, dialogManager, 'login_linux_tip', true); - } else if (type == 'terminal-admin-login') { - enterUserLoginDialog( - sessionId, dialogManager, 'terminal-admin-login-tip', false); - } else if (type == 'terminal-admin-login-password') { - enterUserLoginAndPasswordDialog( - sessionId, dialogManager, 'terminal-admin-login-tip', false); + enterUserLoginDialog(sessionId, dialogManager); + } else if (type == 'session-login-password' || + type == 'session-login-password') { + enterUserLoginAndPasswordDialog(sessionId, dialogManager); } else if (type == 'restarting') { showMsgBox(sessionId, type, title, text, link, false, dialogManager, hasCancel: false); @@ -941,46 +860,11 @@ class FfiModel with ChangeNotifier { showPrivacyFailedDialog( sessionId, type, title, text, link, hasRetry, dialogManager); } else { - var hasRetry = evt['hasRetry'] == 'true'; - if (!hasRetry) { - hasRetry = shouldAutoRetryOnOffline(type, title, text); - } + final hasRetry = evt['hasRetry'] == 'true'; showMsgBox(sessionId, type, title, text, link, hasRetry, dialogManager); } } - /// Auto-retry check for "Remote desktop is offline" error. - /// returns true to auto-retry, false otherwise. - bool shouldAutoRetryOnOffline( - String type, - String title, - String text, - ) { - if (type == 'error' && - title == 'Connection Error' && - text == 'Remote desktop is offline' && - _pi.isSet.isTrue) { - // Auto retry for ~30s (server's peer offline threshold) when controlled peer's account changes - // (e.g., signout, switch user, login into OS) causes temporary offline via websocket/tcp connection. - // The actual wait may exceed 30s (e.g., 20s elapsed + 16s next retry = 36s), which is acceptable - // since the controlled side reconnects quickly after account changes. - // Uses time-based check instead of _reconnects count because user can manually retry. - // https://github.com/rustdesk/rustdesk/discussions/14048 - if (_offlineReconnectStartTime == null) { - // First offline, record time and start retry - _offlineReconnectStartTime = DateTime.now(); - return true; - } else { - final elapsed = - DateTime.now().difference(_offlineReconnectStartTime!).inSeconds; - if (elapsed < 30) { - return true; - } - } - } - return false; - } - handleToast(Map evt, SessionID sessionId, String peerId) { final type = evt['type'] ?? 'info'; final text = evt['text'] ?? ''; @@ -1015,33 +899,11 @@ class FfiModel with ChangeNotifier { /// Show a message box with [type], [title] and [text]. showMsgBox(SessionID sessionId, String type, String title, String text, String link, bool hasRetry, OverlayDialogManager dialogManager, - {bool? hasCancel}) async { - final noteAllowed = parent.target != null && - allowAskForNoteAtEndOfConnection(parent.target, false) && - (title == "Connection Error" || type == "restarting"); - final showNoteEdit = noteAllowed && !hasRetry; - if (showNoteEdit) { - await showConnEndAuditDialogCloseCanceled( - ffi: parent.target!, type: type, title: title, text: text); - closeConnection(); - } else { - VoidCallback? onSubmit; - if (noteAllowed && hasRetry) { - final ffi = parent.target!; - onSubmit = () async { - _timer?.cancel(); - _timer = null; - await showConnEndAuditDialogCloseCanceled( - ffi: ffi, type: type, title: title, text: text); - closeConnection(); - }; - } - msgBox(sessionId, type, title, text, link, dialogManager, - hasCancel: hasCancel, - reconnect: hasRetry ? reconnect : null, - reconnectTimeout: hasRetry ? _reconnects : null, - onSubmit: onSubmit); - } + {bool? hasCancel}) { + msgBox(sessionId, type, title, text, link, dialogManager, + hasCancel: hasCancel, + reconnect: hasRetry ? reconnect : null, + reconnectTimeout: hasRetry ? _reconnects : null); _timer?.cancel(); if (hasRetry) { _timer = Timer(Duration(seconds: _reconnects), () { @@ -1050,14 +912,11 @@ class FfiModel with ChangeNotifier { _reconnects *= 2; } else { _reconnects = 1; - _offlineReconnectStartTime = null; } } void reconnect(OverlayDialogManager dialogManager, SessionID sessionId, bool forceRelay) { - // Disable relative mouse mode before reconnecting to ensure cursor is released. - parent.target?.inputModel.setRelativeMouseMode(false); bind.sessionReconnect(sessionId: sessionId, forceRelay: forceRelay); clearPermissions(); dialogManager.dismissAll(); @@ -1065,30 +924,8 @@ class FfiModel with ChangeNotifier { onCancel: closeConnection); } - Future showRelayHintDialog( - SessionID sessionId, - String type, - String title, - String text, - OverlayDialogManager dialogManager, - String peerId) async { - var hint = "\n\n${translate('relay_hint_tip')}"; - if (text.contains("10054") || text.contains("104")) { - hint = ""; - } - final text2 = "${translate(text)}$hint"; - - if (parent.target != null && - allowAskForNoteAtEndOfConnection(parent.target, false) && - pi.isSet.isTrue) { - if (await showConnEndAuditDialogCloseCanceled( - ffi: parent.target!, type: type, title: title, text: text2)) { - return; - } - closeConnection(); - return; - } - + void showRelayHintDialog(SessionID sessionId, String type, String title, + String text, OverlayDialogManager dialogManager, String peerId) { dialogManager.show(tag: '$sessionId-$type', (setState, close, context) { onClose() { closeConnection(); @@ -1097,10 +934,13 @@ class FfiModel with ChangeNotifier { final style = ElevatedButton.styleFrom(backgroundColor: Colors.green[700]); - + var hint = "\n\n${translate('relay_hint_tip')}"; + if (text.contains("10054") || text.contains("104")) { + hint = ""; + } return CustomAlertDialog( title: null, - content: msgboxContent(type, title, text2), + content: msgboxContent(type, title, "${translate(text)}$hint"), actions: [ dialogButton('Close', onPressed: onClose, isOutline: true), if (type == 'relay-hint') @@ -1174,114 +1014,28 @@ class FfiModel with ChangeNotifier { sessionId: sessionId, display: pi.currentDisplay == kAllDisplayValue ? 0 : pi.currentDisplay, - width: displays[0].width, - height: displays[0].height, + width: _rect!.width.toInt(), + height: _rect!.height.toInt(), ); } else { for (int i = 0; i < displays.length; ++i) { bind.sessionSetSize( sessionId: sessionId, display: i, - width: displays[i].width, - height: displays[i].height, + width: displays[i].width.toInt(), + height: displays[i].height.toInt(), ); } } } } - void _queryAuditGuid(String peerId) async { - try { - if (bind.isDisableAccount()) { - return; - } - if (bind - .sessionGetAuditServerSync(sessionId: sessionId, typ: "conn/active") - .isEmpty) { - return; - } - if (!mainGetLocalBoolOptionSync( - kOptionAllowAskForNoteAtEndOfConnection)) { - return; - } - if (bind.sessionGetAuditGuid(sessionId: sessionId).isNotEmpty) { - debugPrint('Get cached audit GUID'); - return; - } - final url = bind.sessionGetAuditServerSync( - sessionId: sessionId, typ: "conn/active"); - if (url.isEmpty) { - return; - } - final initialConnSessionId = - bind.sessionGetConnSessionId(sessionId: sessionId); - final connType = switch (parent.target?.connType) { - ConnType.defaultConn => 0, - ConnType.fileTransfer => 1, - ConnType.portForward => 2, - ConnType.rdp => 2, - ConnType.viewCamera => 3, - ConnType.terminal => 4, - _ => 0, - }; - - const retryIntervals = [1, 1, 2, 2, 3, 3]; - - for (int attempt = 1; attempt <= retryIntervals.length; attempt++) { - final currentConnSessionId = - bind.sessionGetConnSessionId(sessionId: sessionId); - if (currentConnSessionId != initialConnSessionId) { - debugPrint('connSessionId changed, stopping audit GUID query'); - return; - } - - final fullUrl = - '$url?id=$peerId&session_id=$currentConnSessionId&conn_type=$connType'; - - debugPrint( - 'Querying audit GUID, attempt $attempt/${retryIntervals.length}'); - try { - var headers = getHttpHeaders(); - headers['Content-Type'] = "application/json"; - - final response = await http.get( - Uri.parse(fullUrl), - headers: headers, - ); - - if (response.statusCode == 200) { - final guid = jsonDecode(response.body) as String?; - if (guid != null && guid.isNotEmpty) { - bind.sessionSetAuditGuid(sessionId: sessionId, guid: guid); - debugPrint('Successfully retrieved audit GUID'); - return; - } - } else { - debugPrint( - 'Failed to query audit GUID. Status: ${response.statusCode}, Body: ${response.body}'); - return; - } - } catch (e) { - debugPrint('Error querying audit GUID (attempt $attempt): $e'); - } - - if (attempt < retryIntervals.length) { - await Future.delayed(Duration(seconds: retryIntervals[attempt - 1])); - } - } - - debugPrint( - 'Failed to retrieve audit GUID after ${retryIntervals.length} attempts'); - } catch (e) { - debugPrint('Error in _queryAuditGuid: $e'); - } - } - /// Handle the peer info event based on [evt]. handlePeerInfo(Map evt, String peerId, bool isCache) async { parent.target?.chatModel.voiceCallStatus.value = VoiceCallStatus.notStarted; - _queryAuditGuid(peerId); + // This call is to ensuer the keyboard mode is updated depending on the peer version. + parent.target?.inputModel.updateKeyboardMode(); // Map clone is required here, otherwise "evt" may be changed by other threads through the reference. // Because this function is asynchronous, there's an "await" in this function. @@ -1294,17 +1048,6 @@ class FfiModel with ChangeNotifier { parent.target?.dialogManager.dismissAll(); _pi.version = evt['version']; - // Note: Relative mouse mode is NOT auto-enabled on connect. - // Users must manually enable it via toolbar or keyboard shortcut (Ctrl+Alt+Shift+M). - // - // For desktop/webDesktop, keyboard mode initialization is handled later by - // checkDesktopKeyboardMode() which may change the mode if not supported, - // followed by updateKeyboardMode() to sync InputModel.keyboardMode. - // For mobile, updateKeyboardMode() is currently a no-op (only executes on desktop/web), - // but we call it here for consistency and future-proofing. - if (isMobile) { - parent.target?.inputModel.updateKeyboardMode(); - } _pi.isSupportMultiUiSession = bind.isSupportMultiUiSession(version: _pi.version); _pi.username = evt['username']; @@ -1332,23 +1075,9 @@ class FfiModel with ChangeNotifier { if (isPeerAndroid) { _touchMode = true; } else { - // `kOptionTouchMode` is originally peer option, but it is moved to local option later. - // We check local option first, if not set, then check peer option. - // Because if local option is not empty: - // 1. User has set the touch mode explicitly. - // 2. The advanced option (custom client) is set. - // Then we choose to use the local option. - final optLocal = bind.mainGetLocalOption(key: kOptionTouchMode); - if (optLocal != '') { - _touchMode = optLocal == 'Y'; - } else { - final optSession = await bind.sessionGetOption( - sessionId: sessionId, arg: kOptionTouchMode); - _touchMode = optSession != ''; - } - } - if (isMobile) { - virtualMouseMode.loadOptions(); + _touchMode = await bind.sessionGetOption( + sessionId: sessionId, arg: kOptionTouchMode) != + ''; } if (connType == ConnType.fileTransfer) { parent.target?.fileModel.onReady(); @@ -1373,7 +1102,6 @@ class FfiModel with ChangeNotifier { } if (displays.isNotEmpty) { _reconnects = 1; - _offlineReconnectStartTime = null; waitForFirstImage.value = true; isRefreshing = false; } @@ -1389,8 +1117,6 @@ class FfiModel with ChangeNotifier { peerId, bind.sessionGetToggleOptionSync( sessionId: sessionId, arg: kOptionToggleViewOnly)); - setShowMyCursor(bind.sessionGetToggleOptionSync( - sessionId: sessionId, arg: kOptionToggleShowMyCursor)); } if (connType == ConnType.defaultConn || connType == ConnType.viewCamera) { final platformAdditions = evt['platform_additions']; @@ -1407,11 +1133,7 @@ class FfiModel with ChangeNotifier { stateGlobal.resetLastResolutionGroupValues(peerId); if (isDesktop || isWebDesktop) { - // checkDesktopKeyboardMode may change the keyboard mode if the current - // mode is not supported. Re-sync InputModel.keyboardMode afterwards. - // Note: updateKeyboardMode() is a no-op on mobile (early-returns). - await checkDesktopKeyboardMode(); - await parent.target?.inputModel.updateKeyboardMode(); + checkDesktopKeyboardMode(); } notifyListeners(); @@ -1553,17 +1275,8 @@ class FfiModel with ChangeNotifier { d.cursorEmbedded = evt['cursor_embedded'] == 1; d.originalWidth = evt['original_width'] ?? kInvalidResolutionValue; d.originalHeight = evt['original_height'] ?? kInvalidResolutionValue; - d._scale = 1.0; - final scaledWidth = evt['scaled_width']; - if (scaledWidth != null) { - final sw = int.tryParse(scaledWidth.toString()); - if (sw != null && sw > 0 && d.width > 0) { - d._scale = max(d.width.toDouble() / sw, 1.0); - } else { - debugPrint( - "Invalid scaled_width ($scaledWidth) or width (${d.width}), using default scale 1.0"); - } - } + double v = (evt['scale']?.toDouble() ?? 100.0) / 100; + d._scale = v > 1.0 ? v : 1.0; return d; } @@ -1754,79 +1467,6 @@ class FfiModel with ChangeNotifier { notifyListeners(); } } - - void setShowMyCursor(bool value) { - if (_showMyCursor != value) { - _showMyCursor = value; - notifyListeners(); - } - } -} - -class VirtualMouseMode with ChangeNotifier { - bool _showVirtualMouse = false; - double _virtualMouseScale = 1.0; - bool _showVirtualJoystick = false; - - bool get showVirtualMouse => _showVirtualMouse; - double get virtualMouseScale => _virtualMouseScale; - bool get showVirtualJoystick => _showVirtualJoystick; - - FfiModel ffiModel; - - VirtualMouseMode(this.ffiModel); - - bool _shouldShow() => !ffiModel.isPeerAndroid; - - setShowVirtualMouse(bool b) { - if (b == _showVirtualMouse) return; - if (_shouldShow()) { - _showVirtualMouse = b; - notifyListeners(); - } - } - - setVirtualMouseScale(double s) { - if (s <= 0) return; - if (s == _virtualMouseScale) return; - _virtualMouseScale = s; - bind.mainSetLocalOption(key: kOptionVirtualMouseScale, value: s.toString()); - notifyListeners(); - } - - setShowVirtualJoystick(bool b) { - if (b == _showVirtualJoystick) return; - if (_shouldShow()) { - _showVirtualJoystick = b; - notifyListeners(); - } - } - - void loadOptions() { - _showVirtualMouse = - bind.mainGetLocalOption(key: kOptionShowVirtualMouse) == 'Y'; - _virtualMouseScale = double.tryParse( - bind.mainGetLocalOption(key: kOptionVirtualMouseScale)) ?? - 1.0; - _showVirtualJoystick = - bind.mainGetLocalOption(key: kOptionShowVirtualJoystick) == 'Y'; - notifyListeners(); - } - - Future toggleVirtualMouse() async { - await bind.mainSetLocalOption( - key: kOptionShowVirtualMouse, value: showVirtualMouse ? 'N' : 'Y'); - setShowVirtualMouse( - bind.mainGetLocalOption(key: kOptionShowVirtualMouse) == 'Y'); - } - - Future toggleVirtualJoystick() async { - await bind.mainSetLocalOption( - key: kOptionShowVirtualJoystick, - value: showVirtualJoystick ? 'N' : 'Y'); - setShowVirtualJoystick( - bind.mainGetLocalOption(key: kOptionShowVirtualJoystick) == 'Y'); - } } class ImageModel with ChangeNotifier { @@ -1904,7 +1544,6 @@ class ImageModel with ChangeNotifier { if (isDesktop || isWebDesktop) { await parent.target?.canvasModel.updateViewStyle(); await parent.target?.canvasModel.updateScrollStyle(); - await parent.target?.canvasModel.initializeEdgeScrollEdgeThickness(); } if (parent.target != null) { await initializeCursorAndCanvas(parent.target!); @@ -1953,56 +1592,8 @@ class ImageModel with ChangeNotifier { } enum ScrollStyle { - scrollbar(kRemoteScrollStyleBar), - scrollauto(kRemoteScrollStyleAuto), - scrolledge(kRemoteScrollStyleEdge); - - const ScrollStyle(this.stringValue); - - final String stringValue; - - String toJson() { - return name; - } - - static ScrollStyle fromJson(String json, [ScrollStyle? fallbackValue]) { - switch (json) { - case 'scrollbar': - return scrollbar; - case 'scrollauto': - return scrollauto; - case 'scrolledge': - return scrolledge; - } - - if (fallbackValue != null) { - return fallbackValue; - } - - throw ArgumentError("Unknown ScrollStyle JSON value: '$json'"); - } - - @override - String toString() { - return stringValue; - } - - static ScrollStyle fromString(String string, [ScrollStyle? fallbackValue]) { - switch (string) { - case kRemoteScrollStyleBar: - return scrollbar; - case kRemoteScrollStyleAuto: - return scrollauto; - case kRemoteScrollStyleEdge: - return scrolledge; - } - - if (fallbackValue != null) { - return fallbackValue; - } - - throw ArgumentError("Unknown ScrollStyle string value: '$string'"); - } + scrollbar, + scrollauto, } class ViewStyle { @@ -2070,67 +1661,11 @@ class ViewStyle { final s2 = height / displayHeight; s = s1 < s2 ? s1 : s2; } - } else if (style == kRemoteViewStyleCustom) { - // Custom scale is session-scoped and applied in CanvasModel.updateViewStyle() } return s; } } -enum EdgeScrollState { - inactive, - armed, - active, -} - -class EdgeScrollFallbackState { - final CanvasModel _owner; - - late Ticker _ticker; - - Duration _lastTotalElapsed = Duration.zero; - bool _nextEventIsFirst = true; - Vector2 _encroachment = Vector2.zero(); - - EdgeScrollFallbackState(this._owner, TickerProvider tickerProvider) { - _ticker = tickerProvider.createTicker(emitTick); - } - - void setEncroachment(Vector2 encroachment) { - _encroachment = encroachment; - } - - void emitTick(Duration totalElapsed) { - if (_nextEventIsFirst) { - _lastTotalElapsed = totalElapsed; - _nextEventIsFirst = false; - } else { - final thisTickElapsed = totalElapsed - _lastTotalElapsed; - - const double kFrameTime = 1000.0 / 60.0; - const double kSpeedFactor = 0.1; - - var delta = _encroachment * - (kSpeedFactor * thisTickElapsed.inMilliseconds / kFrameTime); - - _owner.performEdgeScroll(delta); - - _lastTotalElapsed = totalElapsed; - } - } - - void start() { - if (!_ticker.isActive) { - _nextEventIsFirst = true; - _ticker.start(); - } - } - - void stop() { - _ticker.stop(); - } -} - class CanvasModel with ChangeNotifier { // image offset of canvas double _x = 0; @@ -2152,21 +1687,9 @@ class CanvasModel with ChangeNotifier { // scroll offset y percent double _scrollY = 0.0; ScrollStyle _scrollStyle = ScrollStyle.scrollauto; - // edge scroll mode: trigger scrolling when the cursor is close to the edge of the view - int _edgeScrollEdgeThickness = 100; - // tracks whether edge scroll should be active, prevents spurious - // scrolling when the cursor enters the view from outside - EdgeScrollState _edgeScrollState = EdgeScrollState.inactive; - // fallback strategy for when Bump Mouse isn't available - late EdgeScrollFallbackState _edgeScrollFallbackState; - // to avoid hammering a non-functional Bump Mouse - bool _bumpMouseIsWorking = true; ViewStyle _lastViewStyle = ViewStyle.defaultViewStyle(); Timer? _timerMobileFocusCanvasCursor; - Timer? _timerMobileRestoreCanvasOffset; - Offset? _offsetBeforeMobileSoftKeyboard; - double? _scaleBeforeMobileSoftKeyboard; // `isMobileCanvasChanged` is used to avoid canvas reset when changing the input method // after showing the soft keyboard. @@ -2194,18 +1717,9 @@ class CanvasModel with ChangeNotifier { _resetScroll() => setScrollPercent(0.0, 0.0); - void setScrollPercent(double x, double y) { - _scrollX = x.isFinite ? x : 0.0; - _scrollY = y.isFinite ? y : 0.0; - } - - void pushScrollPositionToUI(double scrollPixelX, double scrollPixelY) { - if (_horizontal.hasClients) { - _horizontal.jumpTo(scrollPixelX); - } - if (_vertical.hasClients) { - _vertical.jumpTo(scrollPixelY); - } + setScrollPercent(double x, double y) { + _scrollX = x; + _scrollY = y; } ScrollController get scrollHorizontal => _horizontal; @@ -2230,32 +1744,10 @@ class CanvasModel with ChangeNotifier { double w = size.width - leftToEdge - rightToEdge; double h = size.height - topToEdge - bottomToEdge; if (isMobile) { - // Account for horizontal safe area insets on both orientations. - w = w - mediaData.padding.left - mediaData.padding.right; - // Vertically, subtract the bottom keyboard inset (viewInsets.bottom) and any - // bottom overlay (e.g. key-help tools) so the canvas is not covered. h = h - mediaData.viewInsets.bottom - (parent.target?.cursorModel.keyHelpToolsRectToAdjustCanvas?.bottom ?? 0); - // Orientation-specific handling: - // - Portrait: additionally subtract top padding (e.g. status bar / notch) - // - Landscape: does not subtract mediaData.padding.top/bottom (home indicator auto-hides) - final isPortrait = size.height > size.width; - if (isPortrait) { - // In portrait mode, subtract the top safe-area padding (e.g. status bar / notch) - // so the remote image is not truncated, while keeping the bottom inset to avoid - // introducing unnecessary blank space around the canvas. - // - // iOS -> Android, portrait, adjust mode: - // h = h (no padding subtracted): top and bottom are truncated - // https://github.com/user-attachments/assets/30ed4559-c27e-432b-847f-8fec23c9f998 - // h = h - top - bottom: extra blank spaces appear - // https://github.com/user-attachments/assets/12a98817-3b4e-43aa-be0f-4b03cf364b7e - // h = h - top (current): works fine - // https://github.com/user-attachments/assets/95f047f2-7f47-4a36-8113-5023989a0c81 - h = h - mediaData.padding.top; - } } return Size(w < 0 ? 0 : w, h < 0 ? 0 : h); } @@ -2285,13 +1777,7 @@ class CanvasModel with ChangeNotifier { displayWidth: displayWidth, displayHeight: displayHeight, ); - // If only the Custom scale percent changed, proceed to update even if - // the basic ViewStyle fields are equal. - // In Custom scale mode, the scale percent can change independently of the other - // ViewStyle fields and is not captured by the equality check. Therefore, we must - // allow updates to proceed when style == kRemoteViewStyleCustom, even if the - // rest of the ViewStyle fields are unchanged. - if (_lastViewStyle == viewStyle && style != kRemoteViewStyleCustom) { + if (_lastViewStyle == viewStyle) { return; } if (_lastViewStyle.style != viewStyle.style) { @@ -2300,30 +1786,12 @@ class CanvasModel with ChangeNotifier { _lastViewStyle = viewStyle; _scale = viewStyle.scale; - // Apply custom scale percent when in Custom mode - if (style == kRemoteViewStyleCustom) { - try { - _scale = await getSessionCustomScale(sessionId); - } catch (e, stack) { - debugPrint('Error in getSessionCustomScale: $e'); - debugPrintStack(stackTrace: stack); - _scale = 1.0; - } - } - _devicePixelRatio = ui.window.devicePixelRatio; - if (kIgnoreDpi) { - if (style == kRemoteViewStyleOriginal) { - _scale = 1.0 / _devicePixelRatio; - } else if (_scale != 0 && style == kRemoteViewStyleCustom) { - _scale /= _devicePixelRatio; - } + if (kIgnoreDpi && style == kRemoteViewStyleOriginal) { + _scale = 1.0 / _devicePixelRatio; } _resetCanvasOffset(displayWidth, displayHeight); - final overflow = _x < 0 || y < 0; - if (_imageOverflow.value != overflow) { - _imageOverflow.value = overflow; - } + _imageOverflow.value = _x < 0 || y < 0; if (notify) { notifyListeners(); } @@ -2342,47 +1810,30 @@ class CanvasModel with ChangeNotifier { } tryUpdateScrollStyle(Duration duration, String? style) async { - if (_scrollStyle == ScrollStyle.scrollauto) return; + if (_scrollStyle != ScrollStyle.scrollbar) return; style ??= await bind.sessionGetViewStyle(sessionId: sessionId); - if (style != kRemoteViewStyleOriginal && style != kRemoteViewStyleCustom) { + if (style != kRemoteViewStyleOriginal) { return; } _resetScroll(); - Future.delayed(duration, () async { updateScrollPercent(); }); } - Future updateScrollStyle() async { + updateScrollStyle() async { final style = await bind.sessionGetScrollStyle(sessionId: sessionId); - - _scrollStyle = - style != null ? ScrollStyle.fromString(style) : ScrollStyle.scrollauto; - - if (_scrollStyle != ScrollStyle.scrollauto) { + if (style == kRemoteScrollStyleBar) { + _scrollStyle = ScrollStyle.scrollbar; _resetScroll(); + } else { + _scrollStyle = ScrollStyle.scrollauto; } - notifyListeners(); } - Future initializeEdgeScrollEdgeThickness() async { - final savedValue = - await bind.sessionGetEdgeScrollEdgeThickness(sessionId: sessionId); - - if (savedValue != null) { - _edgeScrollEdgeThickness = savedValue; - } - } - - void updateEdgeScrollEdgeThickness(int newThickness) { - _edgeScrollEdgeThickness = newThickness; - notifyListeners(); - } - - void update(double x, double y, double scale) { + update(double x, double y, double scale) { _x = x; _y = y; _scale = scale; @@ -2409,33 +1860,7 @@ class CanvasModel with ChangeNotifier { static double get windowBorderWidth => stateGlobal.windowBorderWidth.value; static double get tabBarHeight => stateGlobal.tabBarHeight; - void activateLocalCursor() { - if (isDesktop || isWebDesktop) { - try { - RemoteCursorMovedState.find(id).value = false; - } catch (e) { - // - } - } - } - - void updateLocalCursor(double x, double y) { - // If keyboard is not permitted, do not move cursor when mouse is moving. - if (parent.target != null && parent.target!.ffiModel.keyboard) { - // Draw cursor if is not desktop. - if (!(isDesktop || isWebDesktop)) { - parent.target!.cursorModel.moveLocal(x, y); - } else { - try { - RemoteCursorMovedState.find(id).value = false; - } catch (e) { - // - } - } - } - } - - void moveDesktopMouse(double x, double y) { + moveDesktopMouse(double x, double y) { if (size.width == 0 || size.height == 0) { return; } @@ -2464,128 +1889,24 @@ class CanvasModel with ChangeNotifier { if (dxOffset != 0 || dyOffset != 0) { notifyListeners(); } - } - void initializeEdgeScrollFallback(TickerProvider tickerProvider) { - _edgeScrollFallbackState = EdgeScrollFallbackState(this, tickerProvider); - } - - void disableEdgeScroll() { - _edgeScrollState = EdgeScrollState.inactive; - cancelEdgeScroll(); - } - - void rearmEdgeScroll() { - _edgeScrollState = EdgeScrollState.armed; - } - - void cancelEdgeScroll() { - _edgeScrollFallbackState.stop(); - } - - (Vector2, Vector2) getScrollInfo() { - final scrollPixel = Vector2( - _horizontal.hasClients ? _horizontal.position.pixels : 0, - _vertical.hasClients ? _vertical.position.pixels : 0); - - final max = Vector2( - _horizontal.hasClients ? _horizontal.position.maxScrollExtent : 0, - _vertical.hasClients ? _vertical.position.maxScrollExtent : 0); - - return (scrollPixel, max); - } - - void edgeScrollMouse(double x, double y) async { - if ((_edgeScrollState == EdgeScrollState.inactive) || - (size.width == 0 || size.height == 0) || - !(_horizontal.hasClients || _vertical.hasClients)) { - return; - } - - if (_edgeScrollState == EdgeScrollState.armed) { - // Edge scroll is armed to become active once the cursor - // is observed within the rectangle interior to the - // edge scroll regions. If the user has just moved the - // cursor in from outside of the window, edge scrolling - // doesn't happen yet. - final clientArea = Rect.fromLTWH(0, 0, size.width, size.height); - - final innerZone = clientArea.deflate(_edgeScrollEdgeThickness.toDouble()); - - if (innerZone.contains(Offset(x, y))) { - _edgeScrollState = EdgeScrollState.active; + // If keyboard is not permitted, do not move cursor when mouse is moving. + if (parent.target != null && parent.target!.ffiModel.keyboard) { + // Draw cursor if is not desktop. + if (!(isDesktop || isWebDesktop)) { + parent.target!.cursorModel.moveLocal(x, y); } else { - // Not yet. - return; - } - } - - var dxOffset = 0.0; - var dyOffset = 0.0; - - if (x < _edgeScrollEdgeThickness) { - dxOffset = x - _edgeScrollEdgeThickness; - } else if (x >= size.width - _edgeScrollEdgeThickness) { - dxOffset = x - (size.width - _edgeScrollEdgeThickness); - } - - if (y < _edgeScrollEdgeThickness) { - dyOffset = y - _edgeScrollEdgeThickness; - } else if (y >= size.height - _edgeScrollEdgeThickness) { - dyOffset = y - (size.height - _edgeScrollEdgeThickness); - } - - var encroachment = Vector2(dxOffset, dyOffset); - - var (scrollPixel, max) = getScrollInfo(); - - encroachment.clamp(-scrollPixel, max - scrollPixel); - - if (encroachment.length2 == 0) { - _edgeScrollFallbackState.stop(); - } else { - var bumpAmount = -encroachment; - - // Round away from 0: this ensures that the mouse will be bumped clear of - // whichever edge scroll zone(s) it is in - bumpAmount.x += bumpAmount.x.sign * 0.5; - bumpAmount.y += bumpAmount.y.sign * 0.5; - - var bumpMouseSucceeded = _bumpMouseIsWorking && - (await rustDeskWinManager.call(WindowType.Main, kWindowBumpMouse, - {"dx": bumpAmount.x.round(), "dy": bumpAmount.y.round()})) - .result; - - if (bumpMouseSucceeded) { - performEdgeScroll(encroachment); - } else { - // If we can't BumpMouse, then we switch to slower scrolling with autorepeat - - // Don't keep hammering BumpMouse if it's not working. - _bumpMouseIsWorking = false; - - // Keep scrolling as long as the user is overtop of an edge. - _edgeScrollFallbackState.setEncroachment(encroachment); - _edgeScrollFallbackState.start(); + try { + RemoteCursorMovedState.find(id).value = false; + } catch (e) { + // + } } } } - void performEdgeScroll(Vector2 delta) { - var (scrollPixel, max) = getScrollInfo(); - - scrollPixel += delta; - - scrollPixel.clamp(Vector2.zero(), max); - - var scrollPixelPercent = scrollPixel.clone(); - - scrollPixelPercent.divide(max); - scrollPixelPercent.scale(100.0); - - setScrollPercent(scrollPixelPercent.x, scrollPixelPercent.y); - pushScrollPositionToUI(scrollPixel.x, scrollPixel.y); - + set scale(v) { + _scale = v; notifyListeners(); } @@ -2654,9 +1975,6 @@ class CanvasModel with ChangeNotifier { _scale = 1.0; _lastViewStyle = ViewStyle.defaultViewStyle(); _timerMobileFocusCanvasCursor?.cancel(); - _timerMobileRestoreCanvasOffset?.cancel(); - _offsetBeforeMobileSoftKeyboard = null; - _scaleBeforeMobileSoftKeyboard = null; } updateScrollPercent() { @@ -2685,31 +2003,6 @@ class CanvasModel with ChangeNotifier { }); } - void saveMobileOffsetBeforeSoftKeyboard() { - _timerMobileRestoreCanvasOffset?.cancel(); - _offsetBeforeMobileSoftKeyboard = Offset(_x, _y); - _scaleBeforeMobileSoftKeyboard = _scale; - } - - void restoreMobileOffsetAfterSoftKeyboard() { - _timerMobileRestoreCanvasOffset?.cancel(); - _timerMobileFocusCanvasCursor?.cancel(); - final targetOffset = _offsetBeforeMobileSoftKeyboard; - final targetScale = _scaleBeforeMobileSoftKeyboard; - if (targetOffset == null || targetScale == null) { - return; - } - _timerMobileRestoreCanvasOffset = Timer(Duration(milliseconds: 100), () { - updateSize(); - _x = targetOffset.dx; - _y = targetOffset.dy; - _scale = targetScale; - _offsetBeforeMobileSoftKeyboard = null; - _scaleBeforeMobileSoftKeyboard = null; - notifyListeners(); - }); - } - // mobile only // Move the canvas to make the cursor visible(center) on the screen. void _moveToCenterCursor() { @@ -2935,25 +2228,9 @@ class CursorModel with ChangeNotifier { Rect? get keyHelpToolsRectToAdjustCanvas => _lastKeyboardIsVisible ? _keyHelpToolsRect : null; - // The blocked rect is used to block the pointer/touch events in the remote page. - final List _blockedRects = []; - // Used in shouldBlock(). - // _blockEvents is a flag to block pointer/touch events on the remote image. - // It is set to true to prevent accidental touch events in the following scenarios: - // 1. In floating mouse mode, when the scroll circle is shown. - // 2. In floating mouse widgets mode, when the left/right buttons are moving. - // 3. In floating mouse widgets mode, when using the virtual joystick. - // When _blockEvents is true, all pointer/touch events are blocked regardless of the contents of _blockedRects. - // _blockedRects contains specific rectangular regions where events are blocked; these are checked when _blockEvents is false. - // In summary: _blockEvents acts as a global block, while _blockedRects provides fine-grained blocking. - bool _blockEvents = false; - List get blockedRects => List.unmodifiable(_blockedRects); - - set blockEvents(bool v) => _blockEvents = v; - - keyHelpToolsVisibilityChanged(Rect? rect, bool keyboardIsVisible) { - _keyHelpToolsRect = rect; - if (rect == null) { + keyHelpToolsVisibilityChanged(Rect? r, bool keyboardIsVisible) { + _keyHelpToolsRect = r; + if (r == null) { _lastIsBlocked = false; } else { // Block the touch event is safe here. @@ -2962,25 +2239,12 @@ class CursorModel with ChangeNotifier { _lastIsBlocked = true; } if (isMobile && _lastKeyboardIsVisible != keyboardIsVisible) { - if (keyboardIsVisible) { - parent.target?.canvasModel.saveMobileOffsetBeforeSoftKeyboard(); - parent.target?.canvasModel.mobileFocusCanvasCursor(); - parent.target?.canvasModel.isMobileCanvasChanged = false; - } else { - parent.target?.canvasModel.restoreMobileOffsetAfterSoftKeyboard(); - } + parent.target?.canvasModel.mobileFocusCanvasCursor(); + parent.target?.canvasModel.isMobileCanvasChanged = false; } _lastKeyboardIsVisible = keyboardIsVisible; } - addBlockedRect(Rect rect) { - _blockedRects.add(rect); - } - - removeBlockedRect(Rect rect) { - _blockedRects.remove(rect); - } - get lastIsBlocked => _lastIsBlocked; ui.Image? get image => _image; @@ -3047,22 +2311,13 @@ class CursorModel with ChangeNotifier { // mobile Soft keyboard, block touch event from the KeyHelpTools shouldBlock(double x, double y) { - if (_blockEvents) { - return true; - } - final offset = Offset(x, y); - for (final rect in _blockedRects) { - if (isPointInRect(offset, rect)) { - return true; - } - } - - // For help tools rectangle, only block touch event when in touch mode. if (!(parent.target?.ffiModel.touchMode ?? false)) { return false; } - if (_keyHelpToolsRect != null && - isPointInRect(offset, _keyHelpToolsRect!)) { + if (_keyHelpToolsRect == null) { + return false; + } + if (isPointInRect(Offset(x, y), _keyHelpToolsRect!)) { return true; } return false; @@ -3082,10 +2337,6 @@ class CursorModel with ChangeNotifier { return true; } - Future syncCursorPosition() async { - await parent.target?.inputModel.moveMouse(_x, _y); - } - bool isInRemoteRect(Offset offset) { return getRemotePosInRect(offset) != null; } @@ -3155,10 +2406,9 @@ class CursorModel with ChangeNotifier { var cx = r.center.dx; var cy = r.center.dy; var tryMoveCanvasX = false; - final displayRect = parent.target?.ffiModel.rect; if (dx > 0) { final maxCanvasCanMove = _displayOriginX + - (displayRect?.width ?? 1280) - + (parent.target?.imageModel.image!.width ?? 1280) - r.right.roundToDouble(); tryMoveCanvasX = _x + dx > cx && maxCanvasCanMove > 0; if (tryMoveCanvasX) { @@ -3180,7 +2430,7 @@ class CursorModel with ChangeNotifier { var tryMoveCanvasY = false; if (dy > 0) { final mayCanvasCanMove = _displayOriginY + - (displayRect?.height ?? 720) - + (parent.target?.imageModel.image!.height ?? 720) - r.bottom.roundToDouble(); tryMoveCanvasY = _y + dy > cy && mayCanvasCanMove > 0; if (tryMoveCanvasY) { @@ -3601,6 +2851,7 @@ class FFI { var version = ''; var connType = ConnType.defaultConn; var closed = false; + var auditNote = ''; /// dialogManager use late to ensure init after main page binding [globalKey] late final dialogManager = OverlayDialogManager(); @@ -3691,6 +2942,7 @@ class FFI { List? displays, }) { closed = false; + auditNote = ''; if (isMobile) mobileReset(); assert( (!(isPortForward && isViewCamera)) && @@ -3882,7 +3134,6 @@ class FFI { dialogManager.dismissAll(); await canvasModel.updateViewStyle(); await canvasModel.updateScrollStyle(); - await canvasModel.initializeEdgeScrollEdgeThickness(); for (final cb in imageModel.callbacksOnFirstImage) { cb(id); } @@ -3930,9 +3181,6 @@ class FFI { ffiModel.clear(); canvasModel.clear(); inputModel.resetModifiers(); - // Dispose relative mouse mode resources to ensure cursor is restored - inputModel.disposeRelativeMouseMode(); - inputModel.disposeSideButtonTracking(); if (closeSession) { await bind.sessionClose(sessionId: sessionId); } @@ -3960,7 +3208,7 @@ class FFI { } void routeTerminalResponse(Map evt) { - final int terminalId = TerminalModel.getTerminalIdFromEvt(evt); + final int terminalId = evt['terminal_id'] ?? 0; // Route to specific terminal model if it exists final model = _terminalModels[terminalId]; diff --git a/flutter/lib/models/native_model.dart b/flutter/lib/models/native_model.dart index b57867838..337f53278 100644 --- a/flutter/lib/models/native_model.dart +++ b/flutter/lib/models/native_model.dart @@ -156,10 +156,7 @@ class PlatformFFI { // only support for android _homeDir = (await ExternalPath.getExternalStorageDirectories())[0]; } else if (isIOS) { - // The previous code was `_homeDir = (await getDownloadsDirectory())?.path ?? '';`, - // which provided the `downloads` path in the sandbox. - // It is unclear why we now use the `data` directory in the sandbox instead. - _homeDir = _ffiBind.mainGetDataDirIos(appDir: _dir); + _homeDir = _ffiBind.mainGetDataDirIos(); } else { // no need to set home dir } diff --git a/flutter/lib/models/peer_model.dart b/flutter/lib/models/peer_model.dart index 59acdd591..35236dd4c 100644 --- a/flutter/lib/models/peer_model.dart +++ b/flutter/lib/models/peer_model.dart @@ -20,7 +20,6 @@ class Peer { bool online = false; String loginName; //login username String device_group_name; - String note; bool? sameServer; String getId() { @@ -44,7 +43,6 @@ class Peer { rdpUsername = json['rdpUsername'] ?? '', loginName = json['loginName'] ?? '', device_group_name = json['device_group_name'] ?? '', - note = json['note'] is String ? json['note'] : '', sameServer = json['same_server']; Map toJson() { @@ -62,7 +60,6 @@ class Peer { "rdpUsername": rdpUsername, 'loginName': loginName, 'device_group_name': device_group_name, - 'note': note, 'same_server': sameServer, }; } @@ -107,7 +104,6 @@ class Peer { required this.rdpUsername, required this.loginName, required this.device_group_name, - required this.note, this.sameServer, }); @@ -126,7 +122,6 @@ class Peer { rdpUsername: '', loginName: '', device_group_name: '', - note: '', ); bool equal(Peer other) { return id == other.id && @@ -141,8 +136,7 @@ class Peer { rdpPort == other.rdpPort && rdpUsername == other.rdpUsername && device_group_name == other.device_group_name && - loginName == other.loginName && - note == other.note; + loginName == other.loginName; } Peer.copy(Peer other) @@ -160,7 +154,6 @@ class Peer { rdpUsername: other.rdpUsername, loginName: other.loginName, device_group_name: other.device_group_name, - note: other.note, sameServer: other.sameServer); } diff --git a/flutter/lib/models/peer_tab_model.dart b/flutter/lib/models/peer_tab_model.dart index e5fa7fb03..d152f7349 100644 --- a/flutter/lib/models/peer_tab_model.dart +++ b/flutter/lib/models/peer_tab_model.dart @@ -40,7 +40,7 @@ class PeerTabModel with ChangeNotifier { List isEnabled = List.from([ true, true, - !isWeb && bind.mainGetLocalOption(key: "disable-discovery-panel") != "Y", + !isWeb, !(bind.isDisableAb() || bind.isDisableAccount()), !(bind.isDisableGroupPanel() || bind.isDisableAccount()), ]); diff --git a/flutter/lib/models/relative_mouse_model.dart b/flutter/lib/models/relative_mouse_model.dart deleted file mode 100644 index 2673cb8ae..000000000 --- a/flutter/lib/models/relative_mouse_model.dart +++ /dev/null @@ -1,1061 +0,0 @@ -import 'dart:async'; -import 'dart:convert'; -import 'dart:math' as math; -import 'dart:ui' as ui; - -import 'package:desktop_multi_window/desktop_multi_window.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter/widgets.dart'; -import 'package:flutter_hbb/main.dart'; -import 'package:flutter_hbb/utils/relative_mouse_accumulator.dart'; -import 'package:get/get.dart'; - -import '../common.dart'; -import '../consts.dart'; -import 'platform_model.dart'; - -class RelativeMouseModel { - final SessionID sessionId; - final RxBool enabled; - - final bool Function() keyboardPerm; - final bool Function() isViewCamera; - final String Function() peerVersion; - final String? Function() peerPlatform; - - final Map Function(Map msg) modify; - - final bool Function() getPointerInsideImage; - final void Function(bool inside) setPointerInsideImage; - - RelativeMouseModel({ - required this.sessionId, - required this.enabled, - required this.keyboardPerm, - required this.isViewCamera, - required this.peerVersion, - required this.peerPlatform, - required this.modify, - required this.getPointerInsideImage, - required this.setPointerInsideImage, - }); - - final RelativeMouseAccumulator _accumulator = RelativeMouseAccumulator(); - - // Native relative mouse mode support (macOS only) - // Uses CGAssociateMouseAndMouseCursorPosition to lock cursor and NSEvent monitor for raw delta. - static MethodChannel? _hostChannel; - // The currently active model receiving native mouse delta events. - // Note: Race condition between multiple sessions is not a concern here because - // when relative mouse mode is active, the cursor is locked and the user cannot - // switch to another session window. The user must first exit relative mouse mode - // (via Cmd+G on macOS or Ctrl+Alt on Windows/Linux) before they can interact - // with a different session. - static RelativeMouseModel? _activeNativeModel; - static bool _hostChannelInitialized = false; - - /// Initialize the host channel for native relative mouse mode. - /// This should be called once when the app starts on macOS. - static void initHostChannel() { - if (!isMacOS) return; - if (_hostChannelInitialized) return; - _hostChannelInitialized = true; - - _hostChannel = const MethodChannel('org.rustdesk.rustdesk/host'); - _hostChannel!.setMethodCallHandler((call) async { - if (call.method == 'onMouseDelta') { - final args = call.arguments as Map; - final dx = args['dx'] as int; - final dy = args['dy'] as int; - _activeNativeModel?._onNativeMouseDelta(dx, dy); - } - return null; - }); - } - - // TODO(perf): Consider routing native delta through RelativeMouseAccumulator/throttle - // if high-polling mice (e.g. 1000Hz+) cause message flooding on the network. - void _onNativeMouseDelta(int dx, int dy) { - if (!enabled.value) return; - // Send directly to remote without accumulator (native already provides integer deltas) - _sendMouseMessageToSession({ - 'type': 'move_relative', - 'x': '$dx', - 'y': '$dy', - }); - } - - Future _enableNativeRelativeMouseMode() async { - if (!isMacOS) return false; - if (_hostChannel == null) { - initHostChannel(); - if (_hostChannel == null) return false; - } - - // Defensive guard: prevent overwriting an already-active native session. - // In practice, this should not happen because when relative mouse mode is active, - // the cursor is locked and the user cannot switch to another session window. - // The user must first exit relative mouse mode (via Cmd+G on macOS or Ctrl+Alt on - // Windows/Linux) before interacting with a different session. - if (_activeNativeModel != null && _activeNativeModel != this) { - debugPrint( - '[RelMouse] Another model already has native relative mouse mode active'); - return false; - } - - try { - final result = - await _hostChannel!.invokeMethod('enableNativeRelativeMouseMode'); - if (result == true) { - _activeNativeModel = this; - return true; - } - } catch (e) { - debugPrint('[RelMouse] Failed to enable native relative mouse mode: $e'); - } - return false; - } - - Future _disableNativeRelativeMouseMode() async { - if (!isMacOS) return; - if (_hostChannel == null) return; - - // Only the owning model should disable native mode to avoid - // one session inadvertently disrupting another's native relative mouse state. - if (_activeNativeModel != this) { - return; - } - - try { - await _hostChannel!.invokeMethod('disableNativeRelativeMouseMode'); - } catch (e) { - debugPrint('[RelMouse] Failed to disable native relative mouse mode: $e'); - } finally { - if (_activeNativeModel == this) { - _activeNativeModel = null; - } - } - } - - // Whether native relative mouse mode is currently active for this model - bool get _isNativeRelativeMouseModeActive => - isMacOS && _activeNativeModel == this; - - // Pointer lock center in LOCAL widget coordinates (for delta calculation) - Offset? _pointerLockCenterLocal; - // Pointer lock center in SCREEN coordinates (for OS cursor re-centering) - Offset? _pointerLockCenterScreen; - // Pointer region top-left in Flutter view coordinates. - // Computed from PointerEvent.position - PointerEvent.localPosition. - Offset? _pointerRegionTopLeftGlobal; - // Last pointer position in LOCAL widget coordinates (fallback when center is not ready). - Offset? _lastPointerLocalPos; - - // Track whether we currently have an OS-level cursor clip active (Windows only). - // TODO(accuracy): Revisit window/client/border clipping math if users report misaligned - // clipping on custom or maximized window decorations. Consider using platform APIs - // (e.g. GetClientRect on Windows) instead of Flutter's window coordinates. - bool _cursorClipApplied = false; - - // Track whether a recenter operation is in progress to prevent overlapping calls. - bool _recenterInProgress = false; - - // Request token for async enable operation to prevent stale callbacks. - // Incremented on each enable attempt, callbacks check if token still matches. - int _enableRequestId = 0; - - // Throttle buffer for batching mouse move messages (reduces network flooding). - int _pendingDeltaX = 0; - int _pendingDeltaY = 0; - Timer? _throttleTimer; - static const Duration _throttleInterval = Duration(milliseconds: 16); - - // Size of the remote image widget (for center calculation) - Size? _imageWidgetSize; - - // Debounce timestamp for relative mouse mode toggle to prevent race conditions - // between Rust rdev grab loop and Flutter keyboard handling. - DateTime? _lastToggle; - - // Track key down state for exit shortcut. - // macOS: Cmd+G - track G key - // Windows/Linux: Ctrl+Alt - track whichever modifier was pressed last - // When key down is blocked (shortcut triggered), we also need to block - // the corresponding key up to avoid orphan key up events being sent to remote. - bool _exitShortcutKeyDown = false; - - // Callback to cancel external throttle timer when relative mouse mode is disabled. - VoidCallback? onDisabled; - - bool get isSupported { - // On Linux/Wayland, cursor warping is not supported, hide the option entirely. - if (isDesktop && isLinux && bind.mainCurrentIsWayland()) { - return false; - } - // Relative mouse mode is unsupported on remote Linux: - // 1. Long-press key events are unsupported. - // 2. The Wayland display server lacks cursor warping support. - final platform = peerPlatform(); - if (platform == kPeerPlatformLinux) { - return false; - } - final v = peerVersion(); - if (v.isEmpty) return false; - return versionCmp(v, kMinVersionForRelativeMouseMode) >= 0; - } - - Size? get imageWidgetSize => _imageWidgetSize; - - void updateImageWidgetSize(Size size) { - _imageWidgetSize = size; - if (enabled.value) { - _pointerLockCenterLocal = Offset(size.width / 2, size.height / 2); - } - } - - void updatePointerRegionTopLeftGlobal(PointerEvent e) { - _pointerRegionTopLeftGlobal = e.position - e.localPosition; - } - - /// Shared helper for handling exit shortcut for relative mouse mode. - /// Returns true if the event was handled and should not be forwarded. - /// - /// Exit shortcuts (only work when relative mouse mode is active): - /// - macOS: Cmd+G - /// - Windows/Linux: Ctrl+Alt (any order - triggered when both are pressed) - /// - /// [logicalKey] - the logical key of the event - /// [isKeyUp] - whether the event is a key up event - /// [isKeyDown] - whether the event is a key down event - /// [ctrlPressed], [altPressed], [commandPressed] - modifier states - bool _handleExitShortcut({ - required LogicalKeyboardKey logicalKey, - required bool isKeyUp, - required bool isKeyDown, - required bool ctrlPressed, - required bool altPressed, - required bool commandPressed, - }) { - if (!isDesktop || !keyboardPerm() || isViewCamera()) return false; - - // Only handle exit shortcuts when relative mouse mode is active - if (!enabled.value) return false; - - // Block key up if key down was blocked (to avoid orphan key up event on remote). - if (isKeyUp && _exitShortcutKeyDown) { - _exitShortcutKeyDown = false; - return true; - } - - if (!isKeyDown) return false; - - // macOS: Cmd+G to exit - if (isMacOS) { - final isGKey = logicalKey == LogicalKeyboardKey.keyG; - if (isGKey && commandPressed) { - _exitShortcutKeyDown = true; - setRelativeMouseMode(false); - return true; - } - return false; - } - - // Windows/Linux: Ctrl+Alt to exit - // Triggered when both modifiers are pressed (check on either Ctrl or Alt key down) - final isCtrlKey = logicalKey == LogicalKeyboardKey.controlLeft || - logicalKey == LogicalKeyboardKey.controlRight; - final isAltKey = logicalKey == LogicalKeyboardKey.altLeft || - logicalKey == LogicalKeyboardKey.altRight; - - // When Ctrl is pressed and Alt is already down, or vice versa - if ((isCtrlKey && altPressed) || (isAltKey && ctrlPressed)) { - _exitShortcutKeyDown = true; - setRelativeMouseMode(false); - return true; - } - - return false; - } - - bool handleKeyEvent( - KeyEvent e, { - required bool ctrlPressed, - required bool shiftPressed, - required bool altPressed, - required bool commandPressed, - }) { - return _handleExitShortcut( - logicalKey: e.logicalKey, - isKeyUp: e is KeyUpEvent, - isKeyDown: e is KeyDownEvent, - ctrlPressed: ctrlPressed, - altPressed: altPressed, - commandPressed: commandPressed, - ); - } - - /// Handle raw key events for relative mouse mode. - /// Returns true if the event was handled and should not be forwarded. - bool handleRawKeyEvent(RawKeyEvent e) { - final modifiers = e.data; - return _handleExitShortcut( - logicalKey: e.logicalKey, - isKeyUp: e is RawKeyUpEvent, - isKeyDown: e is RawKeyDownEvent, - ctrlPressed: modifiers.isControlPressed, - altPressed: modifiers.isAltPressed, - commandPressed: modifiers.isMetaPressed, - ); - } - - void onEnterOrLeaveImage(bool enter) { - if (!enabled.value) return; - - // Keep the shared pointer-in-image flag in sync. - setPointerInsideImage(enter); - - // macOS native mode: cursor is locked by CGAssociateMouseAndMouseCursorPosition, - // no need for recenter logic. - if (_isNativeRelativeMouseModeActive) { - return; - } - - if (!enter) { - _releaseCursorClip(); - return; - } - - // Windows: clip cursor to window rect - // Linux: use recenter method - updatePointerLockCenter().then((_) { - _recenterMouse(); - }); - } - - void onWindowBlur() { - if (!enabled.value) return; - - // Focus can change while the pointer is outside the window (e.g. taskbar activation). - // Do not rely on the previous "pointer inside" state across focus boundaries. - setPointerInsideImage(false); - // macOS native mode: don't call _releaseCursorClip as it would break CGAssociateMouseAndMouseCursorPosition - if (!_isNativeRelativeMouseModeActive) { - _releaseCursorClip(); - } - } - - void onWindowFocus() { - if (!enabled.value) return; - - // macOS native mode: cursor is already locked - if (_isNativeRelativeMouseModeActive) { - setPointerInsideImage(false); - return; - } - - // Guard: image widget size must be available for proper center calculation. - if (_imageWidgetSize == null) { - _disableWithCleanup(); - return; - } - - // Fail-safe: keep cursor usable on focus gain. Pointer lock will be re-engaged - // on the next pointer enter/move/hover inside the remote image. - setPointerInsideImage(false); - _releaseCursorClip(); - - // Best-effort: refresh center so the next engage is immediate. - updatePointerLockCenter(); - } - - void toggleRelativeMouseMode() { - final now = DateTime.now(); - if (_lastToggle != null && - now.difference(_lastToggle!).inMilliseconds < - kRelativeMouseModeToggleDebounceMs) { - return; - } - _lastToggle = now; - setRelativeMouseMode(!enabled.value); - } - - bool setRelativeMouseMode(bool value) { - // Web is not supported due to Pointer Lock API integration complexity with Flutter's input system - if (isWeb) { - return false; - } - - if (value) { - if (!keyboardPerm() || isViewCamera()) { - return false; - } - - if (isDesktop && _imageWidgetSize == null) { - // Desktop only: Ensure image widget size is available for proper center calculation. - showToast(translate('rel-mouse-not-ready-tip')); - return false; - } - - if (!isSupported) { - // Check server version support before enabling. - showToast(translate('rel-mouse-not-supported-peer-tip')); - return false; - } - } - - if (value) { - try { - if (isDesktop) { - final requestId = ++_enableRequestId; - if (isMacOS) { - // macOS: Use native relative mouse mode with CGAssociateMouseAndMouseCursorPosition - // This locks the cursor in place and provides raw delta via NSEvent monitor. - _enableNativeRelativeMouseMode().then((success) { - // Guard against stale callback: user may have toggled off relative mode - // while the async enable was in progress. - if (_enableRequestId != requestId) { - return; - } - if (success) { - _completeEnableRelativeMouseMode(); - } - // Note: _enableNativeRelativeMouseMode already handles its own cleanup on failure - }); - } else { - // Windows/Linux: Use Flutter-based cursor recenter approach - if (!getPointerInsideImage()) { - _releaseCursorClip(); - } - - updatePointerLockCenter().then((_) => _recenterMouse()).then((_) { - if (_enableRequestId != requestId) { - return; - } - _completeEnableRelativeMouseMode(); - }).catchError((e) { - if (_enableRequestId != requestId) { - return; - } - debugPrint('[RelMouse] Platform setup failed: $e'); - _resetState(); - }); - } - } else { - // Mobile: enable immediately (no platform-specific setup needed) - _completeEnableRelativeMouseMode(); - } - } catch (e) { - _disableWithCleanup(); - return false; - } - } else { - // Best-effort marker for Rust rdev grab loop (ESC behavior). - // Bypass keyboardPerm check to ensure Rust state is always synced, - // even if permission was revoked while relative mode was active. - _sendMouseMessageToSession( - { - 'relative_mouse_mode': '0', - }, - disableRelativeOnError: false, - bypassKeyboardPerm: true, - ); - - // Desktop only: cursor manipulation - if (isDesktop) { - if (isMacOS) { - // macOS: Disable native relative mouse mode - // This already calls CGAssociateMouseAndMouseCursorPosition(1) to re-associate mouse - _disableNativeRelativeMouseMode(); - } else { - _releaseCursorClip(); - } - } - enabled.value = false; - _resetState(); - onDisabled?.call(); - } - - return true; - } - - /// Called when platform setup completes successfully to finalize enabling relative mouse mode. - void _completeEnableRelativeMouseMode() { - enabled.value = true; - - // Show toast notification so user knows how to exit relative mouse mode (desktop only). - if (isDesktop) { - showToast( - translate('rel-mouse-exit-{${isMacOS ? "Cmd+G" : "Ctrl+Alt"}}-tip'), - alignment: Alignment.center); - } - - // Best-effort marker for Rust rdev grab loop (ESC behavior) and peer/server state. - // This uses a no-op delta so it does not move the remote cursor. - // Intentionally fire-and-forget: we don't block enabling on this marker message. - // Failures are logged but do not disable relative mouse mode. - _sendMouseMessageToSession( - { - 'relative_mouse_mode': '1', - 'type': 'move_relative', - 'x': '0', - 'y': '0', - }, - disableRelativeOnError: false, - ).catchError((e) { - debugPrint('[RelMouse] Failed to send enable marker: $e'); - return false; - }); - } - - // Flag to skip the first mouse move event after recenter (it's the recenter itself). - bool _skipNextMouseMove = false; - - /// Handle relative mouse movement based on current local pointer position. - /// Returns true if the event was handled in relative mode, false otherwise. - bool handleRelativeMouseMove(Offset localPosition) { - if (!enabled.value) return false; - - // macOS: Native mode handles delta via callback, skip Flutter-based handling. - if (_isNativeRelativeMouseModeActive) { - return true; - } - - // Pointer move/hover implies we're inside the remote image. - _ensurePointerLockEngaged(); - - // Skip the mouse move event triggered by recenter operation itself. - if (_skipNextMouseMove) { - _skipNextMouseMove = false; - _lastPointerLocalPos = localPosition; - return true; - } - - final lastLocal = _lastPointerLocalPos; - _lastPointerLocalPos = localPosition; - - // Linux-specific: Proactive recenter check before processing delta. - // On Linux, we don't have clip_cursor, so if the cursor moves too fast - // it may escape the window before _recenterIfNearEdge can catch it. - // Check now and recenter immediately if needed. - if (isLinux) { - _recenterIfNearEdgeLinux(localPosition); - } - - // Calculate delta from last position (not from center). - // This avoids issues with CGWarpMouseCursorPosition integer rounding. - if (lastLocal != null) { - final delta = localPosition - lastLocal; - if (delta.dx != 0 || delta.dy != 0) { - sendRelativeMouseMove(delta.dx, delta.dy); - } - } - - return true; - } - - /// Linux-specific: More aggressive recenter check to prevent cursor escape. - /// Called synchronously before processing mouse delta to ensure cursor stays within bounds. - void _recenterIfNearEdgeLinux(Offset localPosition) { - final size = _imageWidgetSize; - if (size == null) return; - - final edgeThreshold = _calculateEdgeThreshold(size); - - final nearLeft = localPosition.dx < edgeThreshold; - final nearRight = localPosition.dx > size.width - edgeThreshold; - final nearTop = localPosition.dy < edgeThreshold; - final nearBottom = localPosition.dy > size.height - edgeThreshold; - - if (nearLeft || nearRight || nearTop || nearBottom) { - _recenterMouse(); - } - } - - void sendRelativeMouseMove(double dx, double dy) { - if (!isDesktop) return; - - final delta = _accumulator.add(dx, dy, maxDelta: kMaxRelativeMouseDelta); - if (delta == null) return; - - // Buffer the delta for throttled sending. - _pendingDeltaX += delta.x; - _pendingDeltaY += delta.y; - - // Start or refresh the throttle timer. - if (_throttleTimer == null || !_throttleTimer!.isActive) { - _throttleTimer = Timer(_throttleInterval, () => _flushPendingDelta()); - } - } - - Future _flushPendingDelta() async { - if (!isDesktop) return; - if (_pendingDeltaX == 0 && _pendingDeltaY == 0) return; - - final x = _pendingDeltaX; - final y = _pendingDeltaY; - _pendingDeltaX = 0; - _pendingDeltaY = 0; - - final ok = await _sendMouseMessageToSession({ - 'type': 'move_relative', - 'x': '$x', - 'y': '$y', - }); - if (!ok) return; - - // Only recenter when mouse is near the edge of the image widget. - // This allows smooth mouse movement without constant recentering. - _recenterIfNearEdge(); - } - - // Edge threshold parameters for recenter detection. - // Threshold is calculated as: min(maxThreshold, min(width, height) * fraction) - static const double _edgeThresholdFraction = 0.1; // 10% of smaller dimension - static const double _edgeThresholdMax = - 100.0; // Maximum threshold in logical pixels - static const double _edgeThresholdMin = - 20.0; // Minimum threshold for very small widgets - - // Linux-specific edge threshold parameters (more aggressive to prevent cursor escape). - // On Linux, we don't have clip_cursor capability, so we need to recenter earlier - // to prevent the cursor from escaping the window when moving fast. - static const double _edgeThresholdFractionLinux = - 0.25; // 25% of smaller dimension - static const double _edgeThresholdMaxLinux = - 200.0; // Larger maximum threshold for Linux - static const double _edgeThresholdMinLinux = - 50.0; // Larger minimum threshold for Linux - - /// Calculate dynamic edge threshold based on widget size. - double _calculateEdgeThreshold(Size size) { - final smallerDimension = math.min(size.width, size.height); - if (isLinux) { - // Use more aggressive thresholds on Linux to prevent cursor escape. - final dynamicThreshold = smallerDimension * _edgeThresholdFractionLinux; - return dynamicThreshold.clamp( - _edgeThresholdMinLinux, _edgeThresholdMaxLinux); - } - final dynamicThreshold = smallerDimension * _edgeThresholdFraction; - // Clamp between min and max thresholds - return dynamicThreshold.clamp(_edgeThresholdMin, _edgeThresholdMax); - } - - /// Recenter the cursor only if it's near the edge of the image widget. - void _recenterIfNearEdge() { - final lastPos = _lastPointerLocalPos; - final size = _imageWidgetSize; - if (lastPos == null || size == null) return; - - // Dynamic threshold based on widget size - final edgeThreshold = _calculateEdgeThreshold(size); - - final nearLeft = lastPos.dx < edgeThreshold; - final nearRight = lastPos.dx > size.width - edgeThreshold; - final nearTop = lastPos.dy < edgeThreshold; - final nearBottom = lastPos.dy > size.height - edgeThreshold; - - if (nearLeft || nearRight || nearTop || nearBottom) { - _recenterMouse(); - } - } - - /// Send mouse button event without position (for relative mouse mode). - Future sendRelativeMouseButton(Map evt) async { - if (!enabled.value) return; - _ensurePointerLockEngaged(); - - final rawType = evt['type']; - final rawButtons = evt['buttons']; - if (rawType is! String || rawButtons is! int) return; - - final type = _mouseEventTypeToPeer(rawType); - if (type.isEmpty) return; - - final buttons = mouseButtonsToPeer(rawButtons); - if (buttons.isEmpty) return; - - await _sendMouseMessageToSession({ - 'type': type, - 'buttons': buttons, - }); - } - - static String _mouseEventTypeToPeer(String type) { - switch (type) { - case 'mousedown': - return kMouseEventTypeDown; - case 'mouseup': - return kMouseEventTypeUp; - default: - return ''; - } - } - - Future _sendMouseMessageToSession( - Map msg, { - bool disableRelativeOnError = true, - bool bypassKeyboardPerm = false, - }) async { - if (!bypassKeyboardPerm && !keyboardPerm()) return false; - if (isViewCamera()) return false; - - try { - await bind.sessionSendMouse( - sessionId: sessionId, - msg: json.encode(modify(msg)), - ); - return true; - } catch (e) { - debugPrint('[RelMouse] Error sending mouse message: $e'); - if (disableRelativeOnError && enabled.value) { - _disableWithCleanup(); - } - return false; - } - } - - /// Retry parameters for cursor re-centering. - static const int _recenterMaxRetries = 3; - static const Duration _recenterRetryDelay = Duration(milliseconds: 100); - - /// Recenter the cursor to the pointer lock center. - /// Fire-and-forget safe: prevents overlapping calls and catches errors internally. - Future _recenterMouse() async { - // Prevent overlapping recenter operations under high-frequency mouse moves. - if (_recenterInProgress) return; - _recenterInProgress = true; - - try { - if (!enabled.value) return; - if (!getPointerInsideImage()) return; - - final center = _pointerLockCenterScreen; - if (center == null) { - return; - } - - for (int attempt = 0; attempt < _recenterMaxRetries; attempt++) { - // Check preconditions before each attempt. - if (!enabled.value || !getPointerInsideImage()) return; - - final ok = bind.mainSetCursorPosition( - x: center.dx.toInt(), - y: center.dy.toInt(), - ); - if (ok) { - // Skip the next mouse move event - it's triggered by the recenter itself. - _skipNextMouseMove = true; - return; - } - - // Wait before retrying (except on the last attempt). - if (attempt < _recenterMaxRetries - 1) { - await Future.delayed(_recenterRetryDelay); - } - } - - // All attempts failed. - _disableWithCleanup(); - showToast(translate('rel-mouse-lock-failed-tip')); - } catch (e, st) { - debugPrint('[RelMouse] Unexpected error in _recenterMouse: $e\n$st'); - } finally { - _recenterInProgress = false; - } - } - - Future updatePointerLockCenter({Offset? localCenter}) async { - if (!isDesktop) return; - - // Null safety check for kWindowId. - if (kWindowId == null) { - if (enabled.value) { - _disableWithCleanup(); - } - return; - } - - try { - final wc = WindowController.fromWindowId(kWindowId!); - final frame = await wc.getFrame(); - - if (frame.width <= 0 || frame.height <= 0) { - if (enabled.value) { - _disableWithCleanup(); - } - return; - } - - if (localCenter != null) { - _pointerLockCenterLocal = localCenter; - } else if (_imageWidgetSize != null) { - _pointerLockCenterLocal = Offset( - _imageWidgetSize!.width / 2, - _imageWidgetSize!.height / 2, - ); - } else { - if (enabled.value) { - _disableWithCleanup(); - } - return; - } - - // Calculate screen coordinates for OS cursor positioning. - // Use PlatformDispatcher instead of deprecated ui.window. - final view = ui.PlatformDispatcher.instance.views.firstOrNull; - if (view == null) { - debugPrint('[RelMouse] No view available for coordinate calculation'); - if (enabled.value) { - _disableWithCleanup(); - } - return; - } - final scale = view.devicePixelRatio; - - if (_pointerRegionTopLeftGlobal != null && scale > 0) { - // On macOS, window frame and CGWarpMouseCursorPosition use points (not pixels). - // On Windows, they use pixels. - // Flutter's logical coordinates are in points on macOS. - final centerInView = - _pointerRegionTopLeftGlobal! + _pointerLockCenterLocal!; - - // Calculate client area offset (excluding title bar and borders) - final clientPhysical = view.physicalSize; - - // macOS: Window frame and CGWarpMouseCursorPosition both use points (not pixels). - // We convert clientPhysical (pixels) to points via `/ scale` to compute titleBarHeight, - // which is the difference between the total window height and the Flutter view height. - if (isMacOS) { - final clientHeightPoints = clientPhysical.height / scale; - final titleBarHeight = frame.height - clientHeightPoints; - - _pointerLockCenterScreen = Offset( - frame.left + centerInView.dx, - frame.top + titleBarHeight + centerInView.dy, - ); - } else { - // Windows/Linux: Use pixel coordinates. We estimate the client-area offset using - // a heuristic based on the difference between frame size and client physical size. - // This assumes symmetric horizontal borders (extraW / 2) and that the remaining - // vertical space (extraH - borderBottom) is the title bar height. - // Limitation: This heuristic may be inaccurate for maximized windows, custom window - // decorations, or when the OS uses different border styles. - // TODO: Replace this heuristic with platform API calls (e.g., GetClientRect on Windows) - // if precise client-area offsets are required. - final extraW = frame.width - clientPhysical.width; - final extraH = frame.height - clientPhysical.height; - final borderX = extraW > 0 ? extraW / 2 : 0.0; - final borderBottom = borderX; - final borderTop = extraH > borderBottom ? extraH - borderBottom : 0.0; - final clientTopLeftScreen = - Offset(frame.left + borderX, frame.top + borderTop); - - // Calculate tentative center, then validate it's within frame bounds. - // This guards against heuristic inaccuracies (e.g., maximized windows). - final tentativeCenter = Offset( - clientTopLeftScreen.dx + centerInView.dx * scale, - clientTopLeftScreen.dy + centerInView.dy * scale, - ); - final withinFrame = tentativeCenter.dx >= frame.left && - tentativeCenter.dx <= frame.left + frame.width && - tentativeCenter.dy >= frame.top && - tentativeCenter.dy <= frame.top + frame.height; - _pointerLockCenterScreen = withinFrame - ? tentativeCenter - : Offset( - frame.left + frame.width / 2, frame.top + frame.height / 2); - } - } else { - _pointerLockCenterScreen = Offset( - frame.left + frame.width / 2, - frame.top + frame.height / 2, - ); - } - - if (enabled.value && isWindows && getPointerInsideImage()) { - _applyCursorClipForFrame(frame); - } else if (enabled.value && isWindows && _cursorClipApplied) { - // Only release if we actually have a clip applied to avoid redundant FFI calls. - _releaseCursorClip(); - } - // macOS: no clip_cursor (CGAssociateMouseAndMouseCursorPosition stops mouse events) - // Instead, we use recenter method like other platforms. - } catch (e) { - if (enabled.value) { - _disableWithCleanup(); - } else { - _pointerLockCenterLocal = null; - _pointerLockCenterScreen = null; - } - } - } - - void _ensurePointerLockEngaged() { - if (!enabled.value) return; - if (!isDesktop) return; - - setPointerInsideImage(true); - - final needsCenter = - _pointerLockCenterLocal == null || _pointerLockCenterScreen == null; - // Windows only: cursor clip - final needsClip = isWindows && !_cursorClipApplied; - if (needsCenter || needsClip) { - updatePointerLockCenter() - .then((_) => _recenterMouse()) - .catchError((Object e, StackTrace st) { - debugPrint('[RelMouse] updatePointerLockCenter failed: $e\n$st'); - _disableWithCleanup(); - }); - } - } - - void _applyCursorClipForFrame(Rect frame) { - if (!isWindows) return; - - // Use PlatformDispatcher to get the device pixel ratio for proper scaling. - final view = ui.PlatformDispatcher.instance.views.firstOrNull; - final scale = view?.devicePixelRatio ?? 1.0; - - // Get the Flutter view's physical size (client area in pixels). - final clientPhysical = view?.physicalSize ?? ui.Size.zero; - - // Calculate the non-client area (OS window title bar, borders). - // frame includes the entire window (title bar + borders + client area). - final extraW = frame.width - clientPhysical.width; - final extraH = frame.height - clientPhysical.height; - - // Assume symmetric horizontal borders. - final borderX = extraW > 0 ? extraW / 2 : 0.0; - // Bottom border is typically the same as side borders. - final borderBottom = borderX; - // OS window title bar height is the remaining vertical non-client space. - final borderTop = extraH > borderBottom ? extraH - borderBottom : 0.0; - - // Calculate client area top-left in screen coordinates. - final clientTopLeftScreen = - Offset(frame.left + borderX, frame.top + borderTop); - - int left, top, right, bottom; - - // If we have precise image widget info, clip to the remote image area. - // This excludes the Flutter app's internal title bar and toolbar. - if (_pointerRegionTopLeftGlobal != null && - _imageWidgetSize != null && - scale > 0) { - // _pointerRegionTopLeftGlobal is in Flutter logical coordinates (relative to client area). - // Convert to screen physical coordinates. - left = (clientTopLeftScreen.dx + _pointerRegionTopLeftGlobal!.dx * scale) - .toInt(); - top = (clientTopLeftScreen.dy + _pointerRegionTopLeftGlobal!.dy * scale) - .toInt(); - right = (left + _imageWidgetSize!.width * scale).toInt(); - bottom = (top + _imageWidgetSize!.height * scale).toInt(); - } else { - // Fallback: clip to client area (excluding OS window decorations). - left = clientTopLeftScreen.dx.toInt(); - top = clientTopLeftScreen.dy.toInt(); - right = (frame.left + frame.width - borderX).toInt(); - bottom = (frame.top + frame.height - borderBottom).toInt(); - } - - _cursorClipApplied = bind.mainClipCursor( - left: left, - top: top, - right: right, - bottom: bottom, - enable: true, - ); - } - - void _releaseCursorClip() { - if (!_cursorClipApplied) return; - _cursorClipApplied = false; - if (!isWindows) return; - - bind.mainClipCursor( - left: 0, - top: 0, - right: 0, - bottom: 0, - enable: false, - ); - } - - void _resetState() { - // Flush any pending delta before clearing state. - // This ensures the last buffered movement is sent before values are zeroed. - // Fire-and-forget: we don't wait for the async send to complete. - if (_throttleTimer != null || _pendingDeltaX != 0 || _pendingDeltaY != 0) { - _throttleTimer?.cancel(); - _throttleTimer = null; - if (_pendingDeltaX != 0 || _pendingDeltaY != 0) { - final x = _pendingDeltaX; - final y = _pendingDeltaY; - _pendingDeltaX = 0; - _pendingDeltaY = 0; - // Send without awaiting; skip recenter since we're disabling. - _sendMouseMessageToSession({ - 'type': 'move_relative', - 'x': '$x', - 'y': '$y', - }, disableRelativeOnError: false); - } - } - _accumulator.reset(); - _pointerLockCenterLocal = null; - _pointerLockCenterScreen = null; - _pointerRegionTopLeftGlobal = null; - _lastPointerLocalPos = null; - _skipNextMouseMove = false; - setPointerInsideImage(false); - _cursorClipApplied = false; - _exitShortcutKeyDown = false; - } - - /// Core cleanup logic shared by [_disableWithCleanup] and [dispose]. - /// Sends disable message to Rust, releases platform resources, and resets state. - void _performCleanupCore() { - // Best-effort marker for Rust rdev grab loop (ESC behavior). - // Bypass keyboardPerm check to ensure Rust state is always synced. - _sendMouseMessageToSession( - { - 'relative_mouse_mode': '0', - }, - disableRelativeOnError: false, - bypassKeyboardPerm: true, - ); - - // macOS: Disable native relative mouse mode - // This already calls CGAssociateMouseAndMouseCursorPosition(1) to re-associate mouse - if (isMacOS) { - _disableNativeRelativeMouseMode(); - } else { - _releaseCursorClip(); - } - - _resetState(); - } - - void _disableWithCleanup() { - _performCleanupCore(); - enabled.value = false; - onDisabled?.call(); - } - - bool _disposed = false; - - void dispose() { - if (_disposed) return; - _disposed = true; - - _performCleanupCore(); - _imageWidgetSize = null; - _lastToggle = null; - // Set enabled to false BEFORE calling onDisabled, consistent with _disableWithCleanup(). - enabled.value = false; - // Trigger callback before clearing it, so external cleanup can run. - onDisabled?.call(); - onDisabled = null; - } -} diff --git a/flutter/lib/models/server_model.dart b/flutter/lib/models/server_model.dart index 40c94fcf5..9bb79bdeb 100644 --- a/flutter/lib/models/server_model.dart +++ b/flutter/lib/models/server_model.dart @@ -8,6 +8,7 @@ import 'package:flutter_hbb/mobile/pages/settings_page.dart'; import 'package:flutter_hbb/models/chat_model.dart'; import 'package:flutter_hbb/models/platform_model.dart'; import 'package:get/get.dart'; +import 'package:wakelock_plus/wakelock_plus.dart'; import 'package:window_manager/window_manager.dart'; import '../common.dart'; @@ -50,8 +51,6 @@ class ServerModel with ChangeNotifier { Timer? cmHiddenTimer; - final _wakelockKey = UniqueKey(); - bool get isStart => _isStart; bool get mediaOk => _mediaOk; @@ -227,6 +226,30 @@ class ServerModel with ChangeNotifier { notifyListeners(); } + /// Check iOS permissions for screen recording and microphone + checkIOSPermission() async { + // For iOS, we need to check screen recording permission + // This is typically done when user tries to start screen sharing + + // microphone - only audio available on iOS + final audioOption = await bind.mainGetOption(key: kOptionEnableAudio); + _audioOk = audioOption != 'N'; + + // file - Not available on iOS during screen share + _fileOk = false; + bind.mainSetOption(key: kOptionEnableFileTransfer, value: "N"); + + // clipboard - Not available on iOS during screen share + _clipboardOk = false; + bind.mainSetOption(key: kOptionEnableClipboard, value: "N"); + + // media/screen recording - will be checked when actually starting + _mediaOk = true; + _inputOk = true; + + notifyListeners(); + } + updatePasswordModel() async { var update = false; final temporaryPassword = await bind.mainGetTemporaryPassword(); @@ -298,7 +321,7 @@ class ServerModel with ChangeNotifier { } toggleAudio() async { - if (clients.any((c) => !c.disconnected)) { + if (clients.isNotEmpty) { await showClientsMayNotBeChangedAlert(parent.target); } if (!_audioOk && !await AndroidPermissionManager.check(kRecordAudio)) { @@ -312,11 +335,19 @@ class ServerModel with ChangeNotifier { _audioOk = !_audioOk; bind.mainSetOption( key: kOptionEnableAudio, value: _audioOk ? defaultOptionYes : 'N'); + + // For iOS, automatically restart the service to apply microphone change + // iOS ReplayKit sets microphoneEnabled when capture starts and cannot be changed dynamically + // Must restart capture with new microphone setting + if (isIOS && _isStart) { + _restartServiceForAudio(); + } + notifyListeners(); } toggleFile() async { - if (clients.any((c) => !c.disconnected)) { + if (clients.isNotEmpty) { await showClientsMayNotBeChangedAlert(parent.target); } if (!_fileOk && @@ -345,7 +376,7 @@ class ServerModel with ChangeNotifier { } toggleInput() async { - if (clients.any((c) => !c.disconnected)) { + if (clients.isNotEmpty) { await showClientsMayNotBeChangedAlert(parent.target); } if (_inputOk) { @@ -467,8 +498,21 @@ class ServerModel with ChangeNotifier { await parent.target?.invokeMethod("stop_service"); await bind.mainStopService(); notifyListeners(); - // for androidUpdatekeepScreenOn only - WakelockManager.disable(_wakelockKey); + if (!isLinux) { + // current linux is not supported + WakelockPlus.disable(); + } + } + + Future setPermanentPassword(String newPW) async { + await bind.mainSetPermanentPassword(password: newPW); + await Future.delayed(Duration(milliseconds: 500)); + final pw = await bind.mainGetPermanentPassword(); + if (newPW == pw) { + return true; + } else { + return false; + } } fetchID() async { @@ -479,6 +523,25 @@ class ServerModel with ChangeNotifier { } } + /// Restart service for iOS audio permission change + /// iOS ReplayKit requires setting microphoneEnabled at capture start time + /// Cannot dynamically enable/disable microphone during active capture session + _restartServiceForAudio() async { + if (!isIOS) return; + + // Show a quick toast to inform user + showToast(translate("Restarting service to apply microphone change")); + + // Stop the current capture + parent.target?.invokeMethod("stop_service"); + + // Small delay to ensure clean stop + await Future.delayed(Duration(milliseconds: 500)); + + // Start with new audio settings + parent.target?.invokeMethod("start_service"); + } + changeStatue(String name, bool value) { debugPrint("changeStatue value $value"); switch (name) { @@ -549,19 +612,10 @@ class ServerModel with ChangeNotifier { if (index < 0) { _clients.add(client); } else { - if (_clients[index].authorized) { - _clients[index].privacyMode = client.privacyMode; - notifyListeners(); - return; - } _clients[index].authorized = true; - _clients[index].privacyMode = client.privacyMode; } } else { - final index = _clients.indexWhere((c) => c.id == client.id); - if (index >= 0) { - _clients[index].privacyMode = client.privacyMode; - notifyListeners(); + if (_clients.any((c) => c.id == client.id)) { return; } _clients.add(client); @@ -610,12 +664,12 @@ class ServerModel with ChangeNotifier { void showLoginDialog(Client client) { showClientDialog( client, - client.isFileTransfer - ? "Transfer file" + client.isFileTransfer + ? "Transfer file" : client.isViewCamera ? "View camera" - : client.isTerminal - ? "Terminal" + : client.isTerminal + ? "Terminal" : "Share screen", 'Do you accept?', 'android_new_connection_tip', @@ -782,6 +836,7 @@ class ServerModel with ChangeNotifier { } } + void androidUpdatekeepScreenOn() async { if (!isAndroid) return; var floatingWindowDisabled = @@ -794,10 +849,12 @@ class ServerModel with ChangeNotifier { final on = ((keepScreenOn == KeepScreenOn.serviceOn) && _isStart) || (keepScreenOn == KeepScreenOn.duringControlled && _clients.map((e) => !e.disconnected).isNotEmpty); - if (on) { - WakelockManager.enable(_wakelockKey, isServer: true); - } else { - WakelockManager.disable(_wakelockKey); + if (on != await WakelockPlus.enabled) { + if (on) { + WakelockPlus.enable(); + } else { + WakelockPlus.disable(); + } } } } @@ -818,7 +875,6 @@ class Client { bool isTerminal = false; String portForward = ""; String name = ""; - String avatar = ""; String peerId = ""; // peer user's id,show at app bool keyboard = false; bool clipboard = false; @@ -827,7 +883,6 @@ class Client { bool restart = false; bool recording = false; bool blockInput = false; - bool privacyMode = false; bool disconnected = false; bool fromSwitch = false; bool inVoiceCall = false; @@ -847,7 +902,6 @@ class Client { isTerminal = json['is_terminal'] ?? false; portForward = json['port_forward']; name = json['name']; - avatar = json['avatar'] ?? ''; peerId = json['peer_id']; keyboard = json['keyboard']; clipboard = json['clipboard']; @@ -856,7 +910,6 @@ class Client { restart = json['restart']; recording = json['recording']; blockInput = json['block_input']; - privacyMode = json['privacy_mode'] ?? privacyMode; disconnected = json['disconnected']; fromSwitch = json['from_switch']; inVoiceCall = json['in_voice_call']; @@ -872,7 +925,6 @@ class Client { data['is_terminal'] = isTerminal; data['port_forward'] = portForward; data['name'] = name; - data['avatar'] = avatar; data['peer_id'] = peerId; data['keyboard'] = keyboard; data['clipboard'] = clipboard; @@ -881,7 +933,6 @@ class Client { data['restart'] = restart; data['recording'] = recording; data['block_input'] = blockInput; - data['privacy_mode'] = privacyMode; data['disconnected'] = disconnected; data['from_switch'] = fromSwitch; data['in_voice_call'] = inVoiceCall; diff --git a/flutter/lib/models/state_model.dart b/flutter/lib/models/state_model.dart index 77195d662..2e1b516df 100644 --- a/flutter/lib/models/state_model.dart +++ b/flutter/lib/models/state_model.dart @@ -1,4 +1,5 @@ import 'package:desktop_multi_window/desktop_multi_window.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_hbb/common.dart'; import 'package:get/get.dart'; @@ -29,11 +30,6 @@ class StateGlobal { String _inputSource = ''; - // Track relative mouse mode state for each peer connection. - // Key: peerId, Value: true if relative mouse mode is active. - // Note: This is session-only runtime state, NOT persisted to config. - final RxMap relativeMouseModeState = {}.obs; - // Use for desktop -> remote toolbar -> resolution final Map> _lastResolutionGroupValues = {}; diff --git a/flutter/lib/models/terminal_model.dart b/flutter/lib/models/terminal_model.dart index 8961d2dd8..3284c539b 100644 --- a/flutter/lib/models/terminal_model.dart +++ b/flutter/lib/models/terminal_model.dart @@ -1,11 +1,7 @@ import 'dart:async'; 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_hbb/common.dart'; -import 'package:flutter_hbb/consts.dart'; -import 'package:flutter_hbb/main.dart'; import 'package:xterm/xterm.dart'; import 'model.dart'; @@ -24,35 +20,8 @@ class TerminalModel with ChangeNotifier { bool _disposed = false; final _inputBuffer = []; - // Buffer for output data received before terminal view has valid dimensions. - // This prevents NaN errors when writing to terminal before layout is complete. - final _pendingOutputChunks = []; - final _pendingOutputSuppressFlags = []; - int _pendingOutputSize = 0; - static const int _kMaxOutputBufferChars = 8 * 1024; - // View ready state: true when terminal has valid dimensions, safe to write - bool _terminalViewReady = false; - bool _markViewReadyScheduled = false; - bool _suppressTerminalOutput = false; - bool _suppressNextTerminalDataOutput = false; - - void Function(int w, int h, int pw, int ph)? onResizeExternal; Future _handleInput(String data) async { - // Soft keyboards (notably iOS) emit '\n' when Enter is pressed, while a - // real keyboard's Enter sends '\r'. Some Android keyboards also emit '\n'. - // - Peer Windows: '\r' works, '\n' is just a newline. - // - Peer Linux: canonical-mode shells accept both, but raw-mode apps - // (readline, prompt_toolkit, vim, TUI frameworks) expect '\r'. - // - Peer macOS: same as Linux, raw-mode apps expect '\r' - // (https://github.com/rustdesk/rustdesk/issues/14907). - // So on mobile / web-mobile, always normalize a lone '\n' to '\r'. - // We deliberately do not touch multi-character payloads (e.g. pasted text) - // so embedded newlines in pasted content are preserved. - final isMobileOrWebMobile = (isMobile || (isWeb && !isWebDesktop)); - if (isMobileOrWebMobile && data == '\n') { - data = '\r'; - } if (_terminalOpened) { // Send user input to remote terminal try { @@ -75,26 +44,13 @@ class TerminalModel with ChangeNotifier { terminalController = TerminalController(); // Setup terminal callbacks - terminal.onOutput = (data) { - if (_suppressTerminalOutput) return; - _handleInput(data); - }; + terminal.onOutput = _handleInput; terminal.onResize = (w, h, pw, ph) async { // Validate all dimensions before using them if (w > 0 && h > 0 && pw > 0 && ph > 0) { debugPrint( '[TerminalModel] Terminal resized to ${w}x$h (pixel: ${pw}x$ph)'); - - // This piece of code must be placed before the conditional check in order to initialize properly. - onResizeExternal?.call(w, h, pw, ph); - - // Mark terminal view as ready and flush any buffered output on first valid resize. - // Must be after onResizeExternal so the view layer has valid dimensions before flushing. - if (!_terminalViewReady) { - _scheduleMarkViewReady(); - } - if (_terminalOpened) { // Notify remote terminal of resize try { @@ -118,16 +74,14 @@ class TerminalModel with ChangeNotifier { void onReady() { parent.dialogManager.dismissAll(); - // Fire and forget - don't block onReady. If the transport reconnects while - // this model is still open, re-send OpenTerminal so the remote service marks - // the persistent session active again and resumes output streaming. - openTerminal(force: _terminalOpened).catchError((e) { + // Fire and forget - don't block onReady + openTerminal().catchError((e) { debugPrint('[TerminalModel] Error opening terminal: $e'); }); } - Future openTerminal({bool force = false}) async { - if (_terminalOpened && !force) return; + Future openTerminal() async { + if (_terminalOpened) return; // Request the remote side to open a terminal with default shell // The remote side will decide which shell to use based on its OS @@ -164,15 +118,11 @@ class TerminalModel with ChangeNotifier { debugPrint('[TerminalModel] Error calling sessionOpenTerminal: $e'); // Optionally show error to user if (e is TimeoutException) { - _writeToTerminal('Failed to open terminal: Connection timeout\r\n'); + terminal.write('Failed to open terminal: Connection timeout\r\n'); } } } - Future sendVirtualKey(String data) async { - return _handleInput(data); - } - Future closeTerminal() async { if (_terminalOpened) { try { @@ -198,58 +148,9 @@ class TerminalModel with ChangeNotifier { } } - static int getTerminalIdFromEvt(Map evt) { - if (evt.containsKey('terminal_id')) { - final v = evt['terminal_id']; - if (v is int) { - // Desktop and mobile send terminal_id as an int - return v; - } else if (v is String) { - // Web sends terminal_id as a string - final parsed = int.tryParse(v); - if (parsed != null) { - return parsed; - } else { - debugPrint( - '[TerminalModel] Failed to parse terminal_id as integer: $v. Expected a numeric string.'); - return 0; - } - } else { - // Unexpected type, log and handle gracefully - debugPrint( - '[TerminalModel] Unexpected terminal_id type: ${v.runtimeType}, value: $v. Expected int or String.'); - return 0; - } - } else { - debugPrint('[TerminalModel] Event does not contain terminal_id'); - return 0; - } - } - - static bool getSuccessFromEvt(Map evt) { - if (evt.containsKey('success')) { - final v = evt['success']; - if (v is bool) { - // Desktop and mobile - return v; - } else if (v is String) { - // Web - return v.toLowerCase() == 'true'; - } else { - // Unexpected type, log and handle gracefully - debugPrint( - '[TerminalModel] Unexpected success type: ${v.runtimeType}, value: $v. Expected bool or String.'); - return false; - } - } else { - debugPrint('[TerminalModel] Event does not contain success'); - return false; - } - } - void handleTerminalResponse(Map evt) { final String? type = evt['type']; - final int evtTerminalId = getTerminalIdFromEvt(evt); + final int evtTerminalId = evt['terminal_id'] ?? 0; // Only handle events for this terminal if (evtTerminalId != terminalId) { @@ -275,9 +176,9 @@ class TerminalModel with ChangeNotifier { } void _handleTerminalOpened(Map evt) { - final bool success = getSuccessFromEvt(evt); - final String message = evt['message']?.toString() ?? ''; - final String? serviceId = evt['service_id']?.toString(); + final bool success = evt['success'] ?? false; + final String message = evt['message'] ?? ''; + final String? serviceId = evt['service_id']; debugPrint( '[TerminalModel] Terminal opened response: success=$success, message=$message, service_id=$serviceId'); @@ -285,21 +186,7 @@ class TerminalModel with ChangeNotifier { if (success) { _terminalOpened = true; - // On reconnect, the server may replay recent output. That replay can include - // terminal queries like DSR/DA; xterm answers them through onOutput as - // "^[[1;1R^[[2;2R^[[>0;0;0c", which must not be sent back to the peer. - final replayTerminalOutput = evt['replay_terminal_output']; - _suppressNextTerminalDataOutput = replayTerminalOutput == true || - message == 'Reconnected to existing terminal with pending output'; - - // Fallback: if terminal view is not yet ready but already has valid - // dimensions (e.g. layout completed before open response arrived), - // mark view ready now to avoid output stuck in buffer indefinitely. - if (!_terminalViewReady && - terminal.viewWidth > 0 && - terminal.viewHeight > 0) { - _scheduleMarkViewReady(); - } + // Service ID is now saved on the Rust side in handle_terminal_response // Process any buffered input _processBufferedInputAsync().then((_) { @@ -308,23 +195,8 @@ class TerminalModel with ChangeNotifier { debugPrint('[TerminalModel] Error processing buffered input: $e'); notifyListeners(); }); - - final persistentSessions = - (evt['persistent_sessions'] as List? ?? []) - .whereType() - .where((id) => !parent.terminalModels.containsKey(id)) - .toList(); - if (kWindowId != null && persistentSessions.isNotEmpty) { - DesktopMultiWindow.invokeMethod( - kWindowId!, - kWindowEventRestoreTerminalSessions, - jsonEncode({ - 'peer_id': id, - 'persistent_sessions': persistentSessions, - })); - } } else { - _writeToTerminal('Failed to open terminal: $message\r\n'); + terminal.write('Failed to open terminal: $message\r\n'); } } @@ -349,148 +221,48 @@ class TerminalModel with ChangeNotifier { final data = evt['data']; if (data != null) { - final suppressTerminalOutput = _suppressNextTerminalDataOutput; - _suppressNextTerminalDataOutput = false; try { String text = ''; if (data is String) { // Try to decode as base64 first try { final bytes = base64Decode(data); - text = utf8.decode(bytes, allowMalformed: true); + text = utf8.decode(bytes); } catch (e) { // If base64 decode fails, treat as plain text text = data; } } else if (data is List) { // Handle if data comes as byte array - text = utf8.decode(List.from(data), allowMalformed: true); + text = utf8.decode(List.from(data)); } else { debugPrint('[TerminalModel] Unknown data type: ${data.runtimeType}'); return; } - _writeToTerminal(text, suppressTerminalOutput: suppressTerminalOutput); + terminal.write(text); } catch (e) { debugPrint('[TerminalModel] Failed to process terminal data: $e'); } } } - /// Write text to terminal, buffering if the view is not yet ready. - /// All terminal output should go through this method to avoid NaN errors - /// from writing before the terminal view has valid layout dimensions. - void _writeToTerminal( - String text, { - bool suppressTerminalOutput = false, - }) { - if (!_terminalViewReady) { - // If a single chunk exceeds the cap, keep only its tail. - // Note: truncation may split a multi-byte ANSI escape sequence, - // which can cause a brief visual glitch on flush. This is acceptable - // because it only affects the pre-layout buffering window and the - // terminal will self-correct on subsequent output. - if (text.length >= _kMaxOutputBufferChars) { - final truncated = text.substring(text.length - _kMaxOutputBufferChars); - _pendingOutputChunks - ..clear() - ..add(truncated); - _pendingOutputSuppressFlags - ..clear() - ..add(suppressTerminalOutput); - _pendingOutputSize = truncated.length; - } else { - _pendingOutputChunks.add(text); - _pendingOutputSuppressFlags.add(suppressTerminalOutput); - _pendingOutputSize += text.length; - // Drop oldest chunks if exceeds limit (whole chunks to preserve ANSI sequences) - while (_pendingOutputSize > _kMaxOutputBufferChars && - _pendingOutputChunks.length > 1) { - final removed = _pendingOutputChunks.removeAt(0); - _pendingOutputSuppressFlags.removeAt(0); - _pendingOutputSize -= removed.length; - } - } - return; - } - _writeTerminalChunk(text, suppressTerminalOutput: suppressTerminalOutput); - } - - void _flushOutputBuffer() { - if (_pendingOutputChunks.isEmpty) return; - debugPrint( - '[TerminalModel] Flushing $_pendingOutputSize buffered chars (${_pendingOutputChunks.length} chunks)'); - for (var i = 0; i < _pendingOutputChunks.length; i++) { - _writeTerminalChunk( - _pendingOutputChunks[i], - suppressTerminalOutput: _pendingOutputSuppressFlags[i], - ); - } - _pendingOutputChunks.clear(); - _pendingOutputSuppressFlags.clear(); - _pendingOutputSize = 0; - } - - void _writeTerminalChunk( - String text, { - required bool suppressTerminalOutput, - }) { - if (!suppressTerminalOutput) { - terminal.write(text); - return; - } - final previous = _suppressTerminalOutput; - _suppressTerminalOutput = true; - try { - terminal.write(text); - } finally { - _suppressTerminalOutput = previous; - } - } - - /// Mark terminal view as ready and flush buffered output. - void _scheduleMarkViewReady() { - if (_disposed || _terminalViewReady || _markViewReadyScheduled) return; - _markViewReadyScheduled = true; - WidgetsBinding.instance.addPostFrameCallback((_) { - _markViewReadyScheduled = false; - if (_disposed || _terminalViewReady) return; - if (terminal.viewWidth > 0 && terminal.viewHeight > 0) { - _markViewReady(); - } - }); - WidgetsBinding.instance.ensureVisualUpdate(); - } - - void _markViewReady() { - if (_terminalViewReady) return; - _terminalViewReady = true; - _flushOutputBuffer(); - } - void _handleTerminalClosed(Map evt) { final int exitCode = evt['exit_code'] ?? 0; - _writeToTerminal('\r\nTerminal closed with exit code: $exitCode\r\n'); + terminal.write('\r\nTerminal closed with exit code: $exitCode\r\n'); _terminalOpened = false; notifyListeners(); } void _handleTerminalError(Map evt) { final String message = evt['message'] ?? 'Unknown error'; - _writeToTerminal('\r\nTerminal error: $message\r\n'); + terminal.write('\r\nTerminal error: $message\r\n'); } @override void dispose() { if (_disposed) return; _disposed = true; - // Clear buffers to free memory - _inputBuffer.clear(); - _pendingOutputChunks.clear(); - _pendingOutputSuppressFlags.clear(); - _pendingOutputSize = 0; - _markViewReadyScheduled = false; - _suppressNextTerminalDataOutput = false; // Terminal cleanup is handled server-side when service closes super.dispose(); } diff --git a/flutter/lib/models/user_model.dart b/flutter/lib/models/user_model.dart index cecb58eaa..99a538062 100644 --- a/flutter/lib/models/user_model.dart +++ b/flutter/lib/models/user_model.dart @@ -16,25 +16,9 @@ bool refreshingUser = false; class UserModel { final RxString userName = ''.obs; - final RxString displayName = ''.obs; - final RxString avatar = ''.obs; final RxBool isAdmin = false.obs; final RxString networkError = ''.obs; bool get isLogin => userName.isNotEmpty; - String get displayNameOrUserName => - displayName.value.trim().isEmpty ? userName.value : displayName.value; - String get accountLabelWithHandle { - final username = userName.value.trim(); - if (username.isEmpty) { - return ''; - } - final preferred = displayName.value.trim(); - if (preferred.isEmpty || preferred == username) { - return username; - } - return '$preferred (@$username)'; - } - WeakReference parent; UserModel(this.parent) { @@ -82,7 +66,7 @@ class UserModel { reset(resetOther: status == 401); return; } - final data = json.decode(decode_http_response(response)); + final data = json.decode(utf8.decode(response.bodyBytes)); final error = data['error']; if (error != null) { throw error; @@ -114,9 +98,7 @@ class UserModel { _updateLocalUserInfo() { final userInfo = getLocalUserInfo(); if (userInfo != null) { - userName.value = (userInfo['name'] ?? '').toString(); - displayName.value = (userInfo['display_name'] ?? '').toString(); - avatar.value = (userInfo['avatar'] ?? '').toString(); + userName.value = userInfo['name']; } } @@ -128,14 +110,10 @@ class UserModel { await gFFI.groupModel.reset(); } userName.value = ''; - displayName.value = ''; - avatar.value = ''; } _parseAndUpdateUser(UserPayload user) { userName.value = user.name; - displayName.value = user.displayName; - avatar.value = user.avatar; isAdmin.value = user.isAdmin; bind.mainSetLocalOption(key: 'user_info', value: jsonEncode(user)); if (isWeb) { @@ -182,7 +160,7 @@ class UserModel { final Map body; try { - body = jsonDecode(decode_http_response(resp)); + body = jsonDecode(utf8.decode(resp.bodyBytes)); } catch (e) { debugPrint("login: jsonDecode resp body failed: ${e.toString()}"); if (resp.statusCode != 200) { diff --git a/flutter/lib/utils/http_service.dart b/flutter/lib/utils/http_service.dart index 1618e25ff..49855017b 100644 --- a/flutter/lib/utils/http_service.dart +++ b/flutter/lib/utils/http_service.dart @@ -1,9 +1,7 @@ import 'dart:convert'; import 'package:flutter/foundation.dart'; -import 'package:flutter_hbb/consts.dart'; import 'package:http/http.dart' as http; import '../models/platform_model.dart'; -import 'package:flutter_hbb/common.dart'; export 'package:http/http.dart' show Response; enum HttpMethod { get, post, put, delete } @@ -17,19 +15,11 @@ class HttpService { }) async { headers ??= {'Content-Type': 'application/json'}; - // Use Rust HTTP implementation for non-web platforms for consistency. - var useFlutterHttp = (isWeb || kIsWeb); - if (!useFlutterHttp) { - final enableFlutterHttpOnRust = - mainGetLocalBoolOptionSync(kOptionEnableFlutterHttpOnRust); - // Use flutter http if: - // Not `enableFlutterHttpOnRust` and no proxy is set - useFlutterHttp = - !(enableFlutterHttpOnRust || await bind.mainGetProxyStatus()); - } + // Determine if there is currently a proxy setting, and if so, use FFI to call the Rust HTTP method. + final isProxy = await bind.mainGetProxyStatus(); - if (useFlutterHttp) { - return await _pollFlutterHttp(url, method, headers: headers, body: body); + if (!isProxy) { + return await _pollFultterHttp(url, method, headers: headers, body: body); } String headersJson = jsonEncode(headers); @@ -44,7 +34,7 @@ class HttpService { return _parseHttpResponse(resJson); } - Future _pollFlutterHttp( + Future _pollFultterHttp( Uri url, HttpMethod method, { Map? headers, @@ -97,8 +87,7 @@ class HttpService { int statusCode = parsedJson['status_code']; return http.Response(body, statusCode, headers: headers); } catch (e) { - print('Failed to parse response\n$responseJson\nError:\n$e'); - throw Exception('Failed to parse response.\n$responseJson'); + throw Exception('Failed to parse response: $e'); } } } diff --git a/flutter/lib/utils/multi_window_manager.dart b/flutter/lib/utils/multi_window_manager.dart index 9e26f8cf9..a7b06b5c7 100644 --- a/flutter/lib/utils/multi_window_manager.dart +++ b/flutter/lib/utils/multi_window_manager.dart @@ -354,16 +354,6 @@ class RustDeskMultiWindowManager { bool? forceRelay, String? connToken, }) async { - // Iterate through terminal windows in reverse order to prioritize - // the most recently added or used windows, as they are more likely - // to have an active session. - for (final windowId in _terminalWindows.reversed) { - if (await DesktopMultiWindow.invokeMethod( - windowId, kWindowEventActiveSession, remoteId)) { - return MultiWindowCallResult(windowId, null); - } - } - // Terminal windows should always create new windows, not reuse // This avoids the MissingPluginException when trying to invoke // new_terminal on an inactive window @@ -376,7 +366,7 @@ class RustDeskMultiWindowManager { "connToken": connToken, }; final msg = jsonEncode(params); - + // Always create a new window for terminal final windowId = await newSessionWindow( WindowType.Terminal, remoteId, msg, _terminalWindows, false); @@ -470,17 +460,9 @@ class RustDeskMultiWindowManager { if (windows.isEmpty) { return; } - for (int i = 0; i < windows.length; i++) { - final wId = windows[i]; - final shouldSavePos = type != WindowType.Terminal || i == windows.length - 1; - if (shouldSavePos) { - debugPrint("closing multi window, type: ${type.toString()} id: $wId"); - try { - await saveWindowPosition(type, windowId: wId); - } catch (e) { - debugPrint('Failed to save window position of $wId, $e'); - } - } + for (final wId in windows) { + debugPrint("closing multi window, type: ${type.toString()} id: $wId"); + await saveWindowPosition(type, windowId: wId); try { await WindowController.fromWindowId(wId).setPreventClose(false); await WindowController.fromWindowId(wId).close(); diff --git a/flutter/lib/utils/platform_channel.dart b/flutter/lib/utils/platform_channel.dart index 9e53ca076..eaea4e79f 100644 --- a/flutter/lib/utils/platform_channel.dart +++ b/flutter/lib/utils/platform_channel.dart @@ -13,18 +13,8 @@ class RdPlatformChannel { static RdPlatformChannel get instance => _windowUtil; - final MethodChannel _hostMethodChannel = - MethodChannel("org.rustdesk.rustdesk/host"); - - /// Bump the position of the mouse cursor, if applicable - Future bumpMouse({required int dx, required int dy}) async { - // No debug output; this call is too chatty. - - bool? result = await _hostMethodChannel - .invokeMethod("bumpMouse", {"dx": dx, "dy": dy}); - - return result ?? false; - } + final MethodChannel _osxMethodChannel = + MethodChannel("org.rustdesk.rustdesk/macos"); /// Change the theme of the system window Future changeSystemWindowTheme(SystemWindowTheme theme) { @@ -33,13 +23,13 @@ class RdPlatformChannel { print( "[Window ${kWindowId ?? 'Main'}] change system window theme to ${theme.name}"); } - return _hostMethodChannel + return _osxMethodChannel .invokeMethod("setWindowTheme", {"themeName": theme.name}); } /// Terminate .app manually. Future terminate() { assert(isMacOS); - return _hostMethodChannel.invokeMethod("terminate"); + return _osxMethodChannel.invokeMethod("terminate"); } } diff --git a/flutter/lib/utils/relative_mouse_accumulator.dart b/flutter/lib/utils/relative_mouse_accumulator.dart deleted file mode 100644 index 0b1426449..000000000 --- a/flutter/lib/utils/relative_mouse_accumulator.dart +++ /dev/null @@ -1,58 +0,0 @@ -/// A small helper for accumulating fractional mouse deltas and emitting integer deltas. -/// -/// Relative mouse mode uses integer deltas on the wire, but Flutter pointer deltas -/// are doubles. This accumulator preserves sub-pixel movement by carrying the -/// fractional remainder across events. -class RelativeMouseDelta { - final int x; - final int y; - - const RelativeMouseDelta(this.x, this.y); -} - -/// Accumulates fractional mouse deltas and returns integer deltas when available. -class RelativeMouseAccumulator { - double _fracX = 0.0; - double _fracY = 0.0; - - /// Adds a delta and returns an integer delta when at least one axis reaches a - /// magnitude of 1px (after truncation towards zero). - /// - /// If [maxDelta] is > 0, the returned integer delta is clamped to - /// [-maxDelta, maxDelta] on each axis. - RelativeMouseDelta? add( - double dx, - double dy, { - required int maxDelta, - }) { - // Guard against misuse: negative maxDelta would silently disable clamping. - assert(maxDelta >= 0, 'maxDelta must be non-negative'); - - _fracX += dx; - _fracY += dy; - - int intX = _fracX.truncate(); - int intY = _fracY.truncate(); - - if (intX == 0 && intY == 0) { - return null; - } - - // Clamp before subtracting so excess movement is preserved in the accumulator - // rather than being permanently discarded during spikes. - if (maxDelta > 0) { - intX = intX.clamp(-maxDelta, maxDelta); - intY = intY.clamp(-maxDelta, maxDelta); - } - - _fracX -= intX; - _fracY -= intY; - - return RelativeMouseDelta(intX, intY); - } - - void reset() { - _fracX = 0.0; - _fracY = 0.0; - } -} diff --git a/flutter/lib/utils/scale.dart b/flutter/lib/utils/scale.dart deleted file mode 100644 index d1f380a4c..000000000 --- a/flutter/lib/utils/scale.dart +++ /dev/null @@ -1,34 +0,0 @@ -import 'package:flutter_hbb/consts.dart'; -import 'package:flutter_hbb/models/platform_model.dart'; -import 'package:uuid/uuid.dart'; - -/// Clamp custom scale percent to supported bounds. -/// Keep this in sync with the slider's minimum in the desktop toolbar UI. -/// -/// This function exists to ensure consistent clamping behavior across the app -/// and to provide a single point of reference for the valid scale range. -int clampCustomScalePercent(int percent) { - return percent.clamp(kScaleCustomMinPercent, kScaleCustomMaxPercent); -} - -/// Parse a string percent and clamp. Defaults to 100 when invalid. -int parseCustomScalePercent(String? s, {int defaultPercent = 100}) { - final parsed = int.tryParse(s ?? '') ?? defaultPercent; - return clampCustomScalePercent(parsed); -} - -/// Convert a percent value to scale factor after clamping. -double percentToScale(int percent) => clampCustomScalePercent(percent) / 100.0; - -/// Fetch, parse and clamp the custom scale percent for a session. -Future getSessionCustomScalePercent(UuidValue sessionId) async { - final opt = await bind.sessionGetFlutterOption( - sessionId: sessionId, k: kCustomScalePercentKey); - return parseCustomScalePercent(opt); -} - -/// Fetch and compute the custom scale factor for a session. -Future getSessionCustomScale(UuidValue sessionId) async { - final p = await getSessionCustomScalePercent(sessionId); - return percentToScale(p); -} diff --git a/flutter/lib/web/bridge.dart b/flutter/lib/web/bridge.dart index 54e6a9a9b..f1839c630 100644 --- a/flutter/lib/web/bridge.dart +++ b/flutter/lib/web/bridge.dart @@ -812,7 +812,7 @@ class RustdeskImpl { } String mainGetAppNameSync({dynamic hint}) { - return js.context.callMethod('getByName', ['app-name']); + return 'RustDesk'; } String mainUriPrefixSync({dynamic hint}) { @@ -908,18 +908,8 @@ class RustdeskImpl { return js.context.callMethod('getByName', ['option:local', key]); } - // Do not return the real environment variables. - // Use the global variable as the environment variable in web. String mainGetEnv({required String key, dynamic hint}) { - return js.context.callMethod('getByName', ['envvar', key]); - } - - // Use the global variable as the environment variable in web. - void mainSetEnv({required String key, String? value, dynamic hint}) { - js.context.callMethod('setByName', [ - 'envvar', - jsonEncode({'name': key, 'value': value}) - ]); + throw UnimplementedError("mainGetEnv"); } Future mainSetLocalOption( @@ -1159,6 +1149,10 @@ class RustdeskImpl { return Future.value(''); } + Future mainGetPermanentPassword({dynamic hint}) { + return Future.value(''); + } + Future mainGetFingerprint({dynamic hint}) { return Future.value(''); } @@ -1342,9 +1336,9 @@ class RustdeskImpl { throw UnimplementedError("mainUpdateTemporaryPassword"); } - Future mainSetPermanentPasswordWithResult( + Future mainSetPermanentPassword( {required String password, dynamic hint}) { - throw UnimplementedError("mainSetPermanentPasswordWithResult"); + throw UnimplementedError("mainSetPermanentPassword"); } Future mainCheckSuperUserPermission({dynamic hint}) { @@ -1538,10 +1532,7 @@ class RustdeskImpl { Future mainAccountAuth( {required String op, required bool rememberMe, dynamic hint}) { - // Safari only allows auth popups while handling the original user gesture. - // Use Future.sync so the JS call runs synchronously (pre-opening the OIDC - // window) while any interop error still surfaces as a Future error. - return Future.sync(() => js.context.callMethod('setByName', [ + return Future(() => js.context.callMethod('setByName', [ 'account_auth', jsonEncode({'op': op, 'remember': rememberMe}) ])); @@ -1608,28 +1599,23 @@ class RustdeskImpl { } bool isCustomClient({dynamic hint}) { - // is_custom_client() checks if app name is not "RustDesk" - return mainGetAppNameSync(hint: hint) != "RustDesk"; + return false; } bool isDisableSettings({dynamic hint}) { - // Checks HARD_SETTINGS["disable-settings"] == "Y" - return mainGetHardOption(key: "disable-settings", hint: hint) == "Y"; + return false; } bool isDisableAb({dynamic hint}) { - // Checks HARD_SETTINGS["disable-ab"] == "Y" - return mainGetHardOption(key: "disable-ab", hint: hint) == "Y"; + return false; } bool isDisableGroupPanel({dynamic hint}) { - // Checks LocalConfig::get_option("disable-group-panel") == "Y" - return mainGetLocalOption(key: "disable-group-panel", hint: hint) == "Y"; + return false; } bool isDisableAccount({dynamic hint}) { - // Checks HARD_SETTINGS["disable-account"] == "Y" - return mainGetHardOption(key: "disable-account", hint: hint) == "Y"; + return false; } bool isDisableInstallation({dynamic hint}) { @@ -1729,7 +1715,7 @@ class RustdeskImpl { } String mainSupportedPrivacyModeImpls({dynamic hint}) { - return '[]'; + throw UnimplementedError("mainSupportedPrivacyModeImpls"); } String mainSupportedInputSource({dynamic hint}) { @@ -1752,7 +1738,7 @@ class RustdeskImpl { } String mainGetHardOption({required String key, dynamic hint}) { - return mainGetLocalOption(key: key, hint: hint); + throw UnimplementedError("mainGetHardOption"); } Future mainCheckHwcodec({dynamic hint}) { @@ -1825,7 +1811,7 @@ class RustdeskImpl { } String mainGetBuildinOption({required String key, dynamic hint}) { - return mainGetLocalOption(key: key, hint: hint); + return ''; } String installInstallOptions({dynamic hint}) { @@ -1974,7 +1960,9 @@ class RustdeskImpl { } Future sessionCloseTerminal( - {required UuidValue sessionId, required int terminalId, dynamic hint}) { + {required UuidValue sessionId, + required int terminalId, + dynamic hint}) { return Future(() => js.context.callMethod('setByName', [ 'close_terminal', jsonEncode({ @@ -1983,59 +1971,5 @@ class RustdeskImpl { ])); } - Future sessionGetEdgeScrollEdgeThickness( - {required UuidValue sessionId, dynamic hint}) { - final thickness = js.context.callMethod( - 'getByName', ['option:session', 'edge-scroll-edge-thickness']); - return Future(() => int.tryParse(thickness) ?? 100); - } - - Future sessionSetEdgeScrollEdgeThickness( - {required UuidValue sessionId, required int value, dynamic hint}) { - return Future(() => js.context.callMethod('setByName', - ['option:session', 'edge-scroll-edge-thickness', value.toString()])); - } - - String sessionGetConnSessionId({required UuidValue sessionId, dynamic hint}) { - return js.context.callMethod('getByName', ['conn_session_id']); - } - - bool willSessionCloseCloseSession( - {required UuidValue sessionId, dynamic hint}) { - return true; - } - - String sessionGetLastAuditNote({required UuidValue sessionId, dynamic hint}) { - return js.context.callMethod('getByName', ['last_audit_note']); - } - - Future sessionSetAuditGuid( - {required UuidValue sessionId, required String guid, dynamic hint}) { - return Future( - () => js.context.callMethod('setByName', ['audit_guid', guid])); - } - - String sessionGetAuditGuid({required UuidValue sessionId, dynamic hint}) { - return js.context.callMethod('getByName', ['audit_guid']); - } - - bool mainSetCursorPosition({required int x, required int y, dynamic hint}) { - return false; - } - - bool mainClipCursor( - {required int left, - required int top, - required int right, - required int bottom, - required bool enable, - dynamic hint}) { - return false; - } - - String mainResolveAvatarUrl({required String avatar, dynamic hint}) { - return js.context.callMethod('getByName', ['resolve_avatar_url', avatar])?.toString() ?? avatar; - } - void dispose() {} } diff --git a/flutter/linux/CMakeLists.txt b/flutter/linux/CMakeLists.txt index 56a8dbb70..a9fd84088 100644 --- a/flutter/linux/CMakeLists.txt +++ b/flutter/linux/CMakeLists.txt @@ -1,6 +1,6 @@ # Project-level configuration. cmake_minimum_required(VERSION 3.10) -project(runner LANGUAGES C CXX) +project(runner LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. @@ -54,55 +54,6 @@ add_subdirectory(${FLUTTER_MANAGED_DIR}) find_package(PkgConfig REQUIRED) pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) -# Wayland protocol for keyboard shortcuts inhibit -pkg_check_modules(WAYLAND_CLIENT IMPORTED_TARGET wayland-client) -pkg_check_modules(WAYLAND_PROTOCOLS_PKG QUIET wayland-protocols) -pkg_check_modules(WAYLAND_SCANNER_PKG QUIET wayland-scanner) - -if(WAYLAND_PROTOCOLS_PKG_FOUND) - pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) -endif() -if(WAYLAND_SCANNER_PKG_FOUND) - pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) -endif() - -if(WAYLAND_CLIENT_FOUND AND WAYLAND_PROTOCOLS_DIR AND WAYLAND_SCANNER) - set(KEYBOARD_SHORTCUTS_INHIBIT_PROTOCOL - "${WAYLAND_PROTOCOLS_DIR}/unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml") - - if(EXISTS ${KEYBOARD_SHORTCUTS_INHIBIT_PROTOCOL}) - set(WAYLAND_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/wayland-protocols") - file(MAKE_DIRECTORY ${WAYLAND_GENERATED_DIR}) - - # Generate client header - add_custom_command( - OUTPUT "${WAYLAND_GENERATED_DIR}/keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h" - COMMAND ${WAYLAND_SCANNER} client-header - ${KEYBOARD_SHORTCUTS_INHIBIT_PROTOCOL} - "${WAYLAND_GENERATED_DIR}/keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h" - DEPENDS ${KEYBOARD_SHORTCUTS_INHIBIT_PROTOCOL} - VERBATIM - ) - - # Generate protocol code - add_custom_command( - OUTPUT "${WAYLAND_GENERATED_DIR}/keyboard-shortcuts-inhibit-unstable-v1-protocol.c" - COMMAND ${WAYLAND_SCANNER} private-code - ${KEYBOARD_SHORTCUTS_INHIBIT_PROTOCOL} - "${WAYLAND_GENERATED_DIR}/keyboard-shortcuts-inhibit-unstable-v1-protocol.c" - DEPENDS ${KEYBOARD_SHORTCUTS_INHIBIT_PROTOCOL} - VERBATIM - ) - - set(WAYLAND_PROTOCOL_SOURCES - "${WAYLAND_GENERATED_DIR}/keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h" - "${WAYLAND_GENERATED_DIR}/keyboard-shortcuts-inhibit-unstable-v1-protocol.c" - ) - - set(HAS_KEYBOARD_SHORTCUTS_INHIBIT TRUE) - endif() -endif() - add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") # Define the application target. To change its name, change BINARY_NAME above, @@ -112,11 +63,7 @@ add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") add_executable(${BINARY_NAME} "main.cc" "my_application.cc" - "wayland_shortcuts_inhibit.cc" - "bump_mouse.cc" - "bump_mouse_x11.cc" "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" - ${WAYLAND_PROTOCOL_SOURCES} ) # Apply the standard set of build settings. This can be removed for applications @@ -129,13 +76,6 @@ target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) target_link_libraries(${BINARY_NAME} PRIVATE ${CMAKE_DL_LIBS}) # target_link_libraries(${BINARY_NAME} PRIVATE librustdesk) -# Wayland support for keyboard shortcuts inhibit -if(HAS_KEYBOARD_SHORTCUTS_INHIBIT) - target_compile_definitions(${BINARY_NAME} PRIVATE HAS_KEYBOARD_SHORTCUTS_INHIBIT) - target_include_directories(${BINARY_NAME} PRIVATE ${WAYLAND_GENERATED_DIR}) - target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::WAYLAND_CLIENT) -endif() - # Run the Flutter tool portions of the build. This must not be removed. add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/flutter/linux/bump_mouse.cc b/flutter/linux/bump_mouse.cc deleted file mode 100644 index 985aa6e81..000000000 --- a/flutter/linux/bump_mouse.cc +++ /dev/null @@ -1,18 +0,0 @@ -#include "bump_mouse.h" - -#include "bump_mouse_x11.h" - -#include - -bool bump_mouse(int dx, int dy) -{ - GdkDisplay *display = gdk_display_get_default(); - - if (GDK_IS_X11_DISPLAY(display)) { - return bump_mouse_x11(dx, dy); - } - else { - // Don't know how to support this. - return false; - } -} diff --git a/flutter/linux/bump_mouse.h b/flutter/linux/bump_mouse.h deleted file mode 100644 index 0861e44e8..000000000 --- a/flutter/linux/bump_mouse.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -bool bump_mouse(int dx, int dy); diff --git a/flutter/linux/bump_mouse_x11.cc b/flutter/linux/bump_mouse_x11.cc deleted file mode 100644 index 7889ea302..000000000 --- a/flutter/linux/bump_mouse_x11.cc +++ /dev/null @@ -1,30 +0,0 @@ -#include "bump_mouse.h" - -#include - -#include - -#include - -bool bump_mouse_x11(int dx, int dy) -{ - GdkDevice *mouse_device; - -#if GTK_CHECK_VERSION(3, 20, 0) - auto seat = gdk_display_get_default_seat(gdk_display_get_default()); - - mouse_device = gdk_seat_get_pointer(seat); -#else - auto devman = gdk_display_get_device_manager(gdk_display_get_default()); - - mouse_device = gdk_device_manager_get_client_pointer(devman); -#endif - - GdkScreen *screen; - gint x, y; - - gdk_device_get_position(mouse_device, &screen, &x, &y); - gdk_device_warp(mouse_device, screen, x + dx, y + dy); - - return true; -} diff --git a/flutter/linux/bump_mouse_x11.h b/flutter/linux/bump_mouse_x11.h deleted file mode 100644 index 00bbaaad9..000000000 --- a/flutter/linux/bump_mouse_x11.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -bool bump_mouse_x11(int dx, int dy); diff --git a/flutter/linux/my_application.cc b/flutter/linux/my_application.cc index 210adba96..b9d36a0ce 100644 --- a/flutter/linux/my_application.cc +++ b/flutter/linux/my_application.cc @@ -1,118 +1,33 @@ #include "my_application.h" -#include "bump_mouse.h" - #include #ifdef GDK_WINDOWING_X11 #include #endif -#if defined(GDK_WINDOWING_WAYLAND) && defined(HAS_KEYBOARD_SHORTCUTS_INHIBIT) -#include "wayland_shortcuts_inhibit.h" -#endif - -#include #include "flutter/generated_plugin_registrant.h" struct _MyApplication { GtkApplication parent_instance; char** dart_entrypoint_arguments; - FlMethodChannel* host_channel; }; G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) -void host_channel_call_handler(FlMethodChannel* channel, FlMethodCall* method_call, gpointer user_data); - GtkWidget *find_gl_area(GtkWidget *widget); void try_set_transparent(GtkWindow* window, GdkScreen* screen, FlView* view); extern bool gIsConnectionManager; -// --- Side mouse button support (back/forward) --- -// Flutter's Linux embedder doesn't deliver X11 button 8/9 events to Dart. -// We intercept them via GDK and forward through a dedicated platform channel. - -static const char* kSideButtonChannelName = "org.rustdesk.rustdesk/side_buttons"; - -static gboolean on_side_button_event(GtkWidget* widget, GdkEventButton* event, gpointer user_data) { - if (event->button != 8 && event->button != 9) { - return FALSE; - } - // Ignore GDK_2BUTTON_PRESS / GDK_3BUTTON_PRESS (double/triple-click synthetic - // events) - only handle real press and release. - if (event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) { - return FALSE; - } - - FlMethodChannel* channel = FL_METHOD_CHANNEL(user_data); - if (channel == NULL) return FALSE; - - g_autoptr(FlValue) args = fl_value_new_map(); - fl_value_set_string_take(args, "button", - fl_value_new_string(event->button == 8 ? "back" : "forward")); - fl_value_set_string_take(args, "type", - fl_value_new_string(event->type == GDK_BUTTON_PRESS ? "down" : "up")); - - fl_method_channel_invoke_method(channel, "onSideMouseButton", args, - NULL, NULL, NULL); - - return TRUE; -} - -static FlMethodChannel* side_buttons_create_channel(FlEngine* engine) { - g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); - return fl_method_channel_new( - fl_engine_get_binary_messenger(engine), - kSideButtonChannelName, - FL_METHOD_CODEC(codec)); -} - -static void side_buttons_channel_destroy(gpointer data) { - g_object_unref(data); -} - -static void side_buttons_init_for_window(GtkWindow* window, FlMethodChannel* channel) { - // Guard against double-initialization (would leave dangling signal user_data). - if (g_object_get_data(G_OBJECT(window), "side-buttons-channel") != NULL) return; - - gtk_widget_add_events(GTK_WIDGET(window), - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); - // Store channel on the window so it stays alive and is freed with the window. - g_object_set_data_full(G_OBJECT(window), "side-buttons-channel", - g_object_ref(channel), side_buttons_channel_destroy); - g_signal_connect(window, "button-press-event", - G_CALLBACK(on_side_button_event), channel); - g_signal_connect(window, "button-release-event", - G_CALLBACK(on_side_button_event), channel); -} - -static void on_subwindow_created(FlPluginRegistry* registry) { -#if defined(GDK_WINDOWING_WAYLAND) && defined(HAS_KEYBOARD_SHORTCUTS_INHIBIT) - wayland_shortcuts_inhibit_init_for_subwindow(registry); -#endif - // Set up side button forwarding for sub-windows. - if (registry == NULL || !FL_IS_VIEW(registry)) return; - FlView* view = FL_VIEW(registry); - GtkWidget* toplevel = gtk_widget_get_toplevel(GTK_WIDGET(view)); - if (toplevel != NULL && GTK_IS_WINDOW(toplevel)) { - FlMethodChannel* channel = side_buttons_create_channel(fl_view_get_engine(view)); - if (channel == NULL) return; - side_buttons_init_for_window(GTK_WINDOW(toplevel), channel); - g_object_unref(channel); // window now owns a ref via g_object_set_data_full - } -} - GtkWidget *find_gl_area(GtkWidget *widget); // Implements GApplication::activate. static void my_application_activate(GApplication* application) { MyApplication* self = MY_APPLICATION(application); - GtkWindow* window = GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); gtk_window_set_decorated(window, FALSE); - // try setting icon for rustdesk, which uses the system cache + // 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++) { @@ -170,31 +85,8 @@ static void my_application_activate(GApplication* application) { gtk_widget_show(GTK_WIDGET(window)); gtk_widget_show(GTK_WIDGET(view)); - // Register callback for sub-windows created by desktop_multi_window plugin. - // Handles both Wayland shortcuts inhibition (guarded inside) and side button - // forwarding. Safe to call on X11-only builds - the plugin just stores the - // callback pointer regardless of windowing system. - desktop_multi_window_plugin_set_window_created_callback( - (WindowCreatedCallback)on_subwindow_created); - fl_register_plugins(FL_PLUGIN_REGISTRY(view)); - g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); - self->host_channel = fl_method_channel_new( - fl_engine_get_binary_messenger(fl_view_get_engine(view)), - "org.rustdesk.rustdesk/host", - FL_METHOD_CODEC(codec)); - fl_method_channel_set_method_call_handler( - self->host_channel, - host_channel_call_handler, - self, - nullptr); - - // Forward side mouse button events (back/forward) to Dart on the main window. - FlMethodChannel* side_channel = side_buttons_create_channel(fl_view_get_engine(view)); - side_buttons_init_for_window(window, side_channel); - g_object_unref(side_channel); - gtk_widget_grab_focus(GTK_WIDGET(view)); } @@ -221,7 +113,6 @@ static gboolean my_application_local_command_line(GApplication* application, gch static void my_application_dispose(GObject* object) { MyApplication* self = MY_APPLICATION(object); g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); - g_clear_object(&self->host_channel); G_OBJECT_CLASS(my_application_parent_class)->dispose(object); } @@ -240,61 +131,6 @@ MyApplication* my_application_new() { nullptr)); } -void host_channel_call_handler(FlMethodChannel* channel, FlMethodCall* method_call, gpointer user_data) -{ - if (strcmp(fl_method_call_get_name(method_call), "bumpMouse") == 0) { - FlValue *args = fl_method_call_get_args(method_call); - - FlValue *dxValue = nullptr; - FlValue *dyValue = nullptr; - - switch (fl_value_get_type(args)) - { - case FL_VALUE_TYPE_MAP: - { - dxValue = fl_value_lookup_string(args, "dx"); - dyValue = fl_value_lookup_string(args, "dy"); - - break; - } - case FL_VALUE_TYPE_LIST: - { - int listSize = fl_value_get_length(args); - - dxValue = (listSize >= 1) ? fl_value_get_list_value(args, 0) : nullptr; - dyValue = (listSize >= 2) ? fl_value_get_list_value(args, 1) : nullptr; - - break; - } - - default: break; - } - - int dx = 0, dy = 0; - - if (dxValue && (fl_value_get_type(dxValue) == FL_VALUE_TYPE_INT)) { - dx = fl_value_get_int(dxValue); - } - - if (dyValue && (fl_value_get_type(dyValue) == FL_VALUE_TYPE_INT)) { - dy = fl_value_get_int(dyValue); - } - - bool result = bump_mouse(dx, dy); - - FlValue *result_value = fl_value_new_bool(result); - - GError *error = nullptr; - - if (!fl_method_call_respond_success(method_call, result_value, &error)) { - g_warning("Failed to send Flutter Platform Channel response: %s", error->message); - g_error_free(error); - } - - fl_value_unref(result_value); - } -} - GtkWidget *find_gl_area(GtkWidget *widget) { if (GTK_IS_GL_AREA(widget)) { @@ -324,7 +160,7 @@ void try_set_transparent(GtkWindow* window, GdkScreen* screen, FlView* view) GtkWidget *gl_area = NULL; printf("Try setting transparent\n"); - + gl_area = find_gl_area(GTK_WIDGET(view)); if (gl_area != NULL) { gtk_gl_area_set_has_alpha(GTK_GL_AREA(gl_area), TRUE); diff --git a/flutter/linux/wayland_shortcuts_inhibit.cc b/flutter/linux/wayland_shortcuts_inhibit.cc deleted file mode 100644 index 76c45be4d..000000000 --- a/flutter/linux/wayland_shortcuts_inhibit.cc +++ /dev/null @@ -1,244 +0,0 @@ -// Wayland keyboard shortcuts inhibit implementation -// Uses the zwp_keyboard_shortcuts_inhibit_manager_v1 protocol to request -// the compositor to disable system shortcuts for specific windows. - -#include "wayland_shortcuts_inhibit.h" - -#if defined(GDK_WINDOWING_WAYLAND) && defined(HAS_KEYBOARD_SHORTCUTS_INHIBIT) - -#include -#include -#include -#include "keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h" - -// Data structure to hold inhibitor state for each window -typedef struct { - struct zwp_keyboard_shortcuts_inhibit_manager_v1* manager; - struct zwp_keyboard_shortcuts_inhibitor_v1* inhibitor; -} ShortcutsInhibitData; - -// Cleanup function for ShortcutsInhibitData -static void shortcuts_inhibit_data_free(gpointer data) { - ShortcutsInhibitData* inhibit_data = static_cast(data); - if (inhibit_data->inhibitor != NULL) { - zwp_keyboard_shortcuts_inhibitor_v1_destroy(inhibit_data->inhibitor); - } - if (inhibit_data->manager != NULL) { - zwp_keyboard_shortcuts_inhibit_manager_v1_destroy(inhibit_data->manager); - } - g_free(inhibit_data); -} - -// Wayland registry handler to find the shortcuts inhibit manager -static void registry_handle_global(void* data, struct wl_registry* registry, - uint32_t name, const char* interface, - uint32_t /*version*/) { - ShortcutsInhibitData* inhibit_data = static_cast(data); - if (strcmp(interface, - zwp_keyboard_shortcuts_inhibit_manager_v1_interface.name) == 0) { - inhibit_data->manager = - static_cast(wl_registry_bind( - registry, name, &zwp_keyboard_shortcuts_inhibit_manager_v1_interface, - 1)); - } -} - -static void registry_handle_global_remove(void* /*data*/, struct wl_registry* /*registry*/, - uint32_t /*name*/) { - // Not needed for this use case -} - -static const struct wl_registry_listener registry_listener = { - registry_handle_global, - registry_handle_global_remove, -}; - -// Inhibitor event handlers -static void inhibitor_active(void* /*data*/, - struct zwp_keyboard_shortcuts_inhibitor_v1* /*inhibitor*/) { - // Inhibitor is now active, shortcuts are being captured -} - -static void inhibitor_inactive(void* /*data*/, - struct zwp_keyboard_shortcuts_inhibitor_v1* /*inhibitor*/) { - // Inhibitor is now inactive, shortcuts restored to compositor -} - -static const struct zwp_keyboard_shortcuts_inhibitor_v1_listener inhibitor_listener = { - inhibitor_active, - inhibitor_inactive, -}; - -// Forward declaration -static void uninhibit_keyboard_shortcuts(GtkWindow* window); - -// Inhibit keyboard shortcuts on Wayland for a specific window -static void inhibit_keyboard_shortcuts(GtkWindow* window) { - GdkDisplay* display = gtk_widget_get_display(GTK_WIDGET(window)); - if (!GDK_IS_WAYLAND_DISPLAY(display)) { - return; - } - - // Check if already inhibited for this window - if (g_object_get_data(G_OBJECT(window), "shortcuts-inhibit-data") != NULL) { - return; - } - - ShortcutsInhibitData* inhibit_data = g_new0(ShortcutsInhibitData, 1); - - struct wl_display* wl_display = gdk_wayland_display_get_wl_display(display); - if (wl_display == NULL) { - shortcuts_inhibit_data_free(inhibit_data); - return; - } - - struct wl_registry* registry = wl_display_get_registry(wl_display); - if (registry == NULL) { - shortcuts_inhibit_data_free(inhibit_data); - return; - } - - wl_registry_add_listener(registry, ®istry_listener, inhibit_data); - wl_display_roundtrip(wl_display); - - if (inhibit_data->manager == NULL) { - wl_registry_destroy(registry); - shortcuts_inhibit_data_free(inhibit_data); - return; - } - - GdkWindow* gdk_window = gtk_widget_get_window(GTK_WIDGET(window)); - if (gdk_window == NULL) { - wl_registry_destroy(registry); - shortcuts_inhibit_data_free(inhibit_data); - return; - } - - struct wl_surface* surface = gdk_wayland_window_get_wl_surface(gdk_window); - if (surface == NULL) { - wl_registry_destroy(registry); - shortcuts_inhibit_data_free(inhibit_data); - return; - } - - GdkSeat* gdk_seat = gdk_display_get_default_seat(display); - if (gdk_seat == NULL) { - wl_registry_destroy(registry); - shortcuts_inhibit_data_free(inhibit_data); - return; - } - - struct wl_seat* seat = gdk_wayland_seat_get_wl_seat(gdk_seat); - if (seat == NULL) { - wl_registry_destroy(registry); - shortcuts_inhibit_data_free(inhibit_data); - return; - } - - inhibit_data->inhibitor = - zwp_keyboard_shortcuts_inhibit_manager_v1_inhibit_shortcuts( - inhibit_data->manager, surface, seat); - - if (inhibit_data->inhibitor == NULL) { - wl_registry_destroy(registry); - shortcuts_inhibit_data_free(inhibit_data); - return; - } - - // Add listener to monitor active/inactive state - zwp_keyboard_shortcuts_inhibitor_v1_add_listener( - inhibit_data->inhibitor, &inhibitor_listener, window); - - wl_display_roundtrip(wl_display); - wl_registry_destroy(registry); - - // Associate the inhibit data with the window for cleanup on destroy - g_object_set_data_full(G_OBJECT(window), "shortcuts-inhibit-data", - inhibit_data, shortcuts_inhibit_data_free); -} - -// Remove keyboard shortcuts inhibitor from a window -static void uninhibit_keyboard_shortcuts(GtkWindow* window) { - ShortcutsInhibitData* inhibit_data = static_cast( - g_object_get_data(G_OBJECT(window), "shortcuts-inhibit-data")); - - if (inhibit_data == NULL) { - return; - } - - // This will trigger shortcuts_inhibit_data_free via g_object_set_data - g_object_set_data(G_OBJECT(window), "shortcuts-inhibit-data", NULL); -} - -// Focus event handlers for dynamic inhibitor management -static gboolean on_window_focus_in(GtkWidget* widget, GdkEventFocus* /*event*/, gpointer /*user_data*/) { - if (GTK_IS_WINDOW(widget)) { - inhibit_keyboard_shortcuts(GTK_WINDOW(widget)); - } - return FALSE; // Continue event propagation -} - -static gboolean on_window_focus_out(GtkWidget* widget, GdkEventFocus* /*event*/, gpointer /*user_data*/) { - if (GTK_IS_WINDOW(widget)) { - uninhibit_keyboard_shortcuts(GTK_WINDOW(widget)); - } - return FALSE; // Continue event propagation -} - -// Key for marking window as having focus handlers connected -static const char* const kFocusHandlersConnectedKey = "shortcuts-inhibit-focus-handlers-connected"; -// Key for marking window as having a pending realize handler -static const char* const kRealizeHandlerConnectedKey = "shortcuts-inhibit-realize-handler-connected"; - -// Callback when window is realized (mapped to screen) -// Sets up focus-based inhibitor management -static void on_window_realize(GtkWidget* widget, gpointer /*user_data*/) { - if (GTK_IS_WINDOW(widget)) { - // Check if focus handlers are already connected to avoid duplicates - if (g_object_get_data(G_OBJECT(widget), kFocusHandlersConnectedKey) != NULL) { - return; - } - - // Connect focus events for dynamic inhibitor management - g_signal_connect(widget, "focus-in-event", - G_CALLBACK(on_window_focus_in), NULL); - g_signal_connect(widget, "focus-out-event", - G_CALLBACK(on_window_focus_out), NULL); - - // Mark as connected to prevent duplicate connections - g_object_set_data(G_OBJECT(widget), kFocusHandlersConnectedKey, GINT_TO_POINTER(1)); - - // If window already has focus, create inhibitor now - if (gtk_window_has_toplevel_focus(GTK_WINDOW(widget))) { - inhibit_keyboard_shortcuts(GTK_WINDOW(widget)); - } - } -} - -// Public API: Initialize shortcuts inhibit for a sub-window -void wayland_shortcuts_inhibit_init_for_subwindow(void* view) { - GtkWidget* widget = GTK_WIDGET(view); - GtkWidget* toplevel = gtk_widget_get_toplevel(widget); - - if (toplevel != NULL && GTK_IS_WINDOW(toplevel)) { - // Check if already initialized to avoid duplicate realize handlers - if (g_object_get_data(G_OBJECT(toplevel), kFocusHandlersConnectedKey) != NULL || - g_object_get_data(G_OBJECT(toplevel), kRealizeHandlerConnectedKey) != NULL) { - return; - } - - if (gtk_widget_get_realized(toplevel)) { - // Window is already realized, set up focus handlers now - on_window_realize(toplevel, NULL); - } else { - // Mark realize handler as connected to prevent duplicate connections - // if called again before window is realized - g_object_set_data(G_OBJECT(toplevel), kRealizeHandlerConnectedKey, GINT_TO_POINTER(1)); - // Wait for window to be realized - g_signal_connect(toplevel, "realize", - G_CALLBACK(on_window_realize), NULL); - } - } -} - -#endif // defined(GDK_WINDOWING_WAYLAND) && defined(HAS_KEYBOARD_SHORTCUTS_INHIBIT) diff --git a/flutter/linux/wayland_shortcuts_inhibit.h b/flutter/linux/wayland_shortcuts_inhibit.h deleted file mode 100644 index c0996931a..000000000 --- a/flutter/linux/wayland_shortcuts_inhibit.h +++ /dev/null @@ -1,22 +0,0 @@ -// Wayland keyboard shortcuts inhibit support -// This module provides functionality to inhibit system keyboard shortcuts -// on Wayland compositors, allowing remote desktop windows to capture all -// key events including Super, Alt+Tab, etc. - -#ifndef WAYLAND_SHORTCUTS_INHIBIT_H_ -#define WAYLAND_SHORTCUTS_INHIBIT_H_ - -#include - -#if defined(GDK_WINDOWING_WAYLAND) && defined(HAS_KEYBOARD_SHORTCUTS_INHIBIT) - -// Initialize shortcuts inhibit for a sub-window created by desktop_multi_window plugin. -// This sets up focus-based inhibitor management: inhibitor is created when -// the window gains focus and destroyed when it loses focus. -// -// @param view The FlView of the sub-window -void wayland_shortcuts_inhibit_init_for_subwindow(void* view); - -#endif // defined(GDK_WINDOWING_WAYLAND) && defined(HAS_KEYBOARD_SHORTCUTS_INHIBIT) - -#endif // WAYLAND_SHORTCUTS_INHIBIT_H_ diff --git a/flutter/macos/Runner.xcodeproj/project.pbxproj b/flutter/macos/Runner.xcodeproj/project.pbxproj index c41bfa117..f38badcbb 100644 --- a/flutter/macos/Runner.xcodeproj/project.pbxproj +++ b/flutter/macos/Runner.xcodeproj/project.pbxproj @@ -433,7 +433,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = HZF9JMC8YN; + DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -579,7 +579,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = HZF9JMC8YN; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -609,7 +609,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = HZF9JMC8YN; + DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( diff --git a/flutter/macos/Runner/MainFlutterWindow.swift b/flutter/macos/Runner/MainFlutterWindow.swift index 1cc72419b..b0e20d6ae 100644 --- a/flutter/macos/Runner/MainFlutterWindow.swift +++ b/flutter/macos/Runner/MainFlutterWindow.swift @@ -19,22 +19,6 @@ import window_manager import window_size import texture_rgba_renderer -// Global state for relative mouse mode -// All properties and methods must be accessed on the main thread since they -// interact with NSEvent monitors, CoreGraphics APIs, and Flutter channels. -// Note: We avoid @MainActor to maintain macOS 10.14 compatibility. -class RelativeMouseState { - static let shared = RelativeMouseState() - - var enabled = false - var eventMonitor: Any? - var deltaChannel: FlutterMethodChannel? - var accumulatedDeltaX: CGFloat = 0 - var accumulatedDeltaY: CGFloat = 0 - - private init() {} -} - class MainFlutterWindow: NSWindow { override func awakeFromNib() { rustdesk_core_main(); @@ -45,7 +29,7 @@ class MainFlutterWindow: NSWindow { // register self method handler let registrar = flutterViewController.registrar(forPlugin: "RustDeskPlugin") setMethodHandler(registrar: registrar) - + RegisterGeneratedPlugins(registry: flutterViewController) FlutterMultiWindowPlugin.setOnWindowCreatedCallback { controller in @@ -66,120 +50,22 @@ class MainFlutterWindow: NSWindow { WindowSizePlugin.register(with: controller.registrar(forPlugin: "WindowSizePlugin")) TextureRgbaRendererPlugin.register(with: controller.registrar(forPlugin: "TextureRgbaRendererPlugin")) } - + super.awakeFromNib() } - + override public func order(_ place: NSWindow.OrderingMode, relativeTo otherWin: Int) { super.order(place, relativeTo: otherWin) hiddenWindowAtLaunch() } - + /// Override window theme. public func setWindowInterfaceMode(window: NSWindow, themeName: String) { window.appearance = NSAppearance(named: themeName == "light" ? .aqua : .darkAqua) } - - private func enableNativeRelativeMouseMode(channel: FlutterMethodChannel) -> Bool { - assert(Thread.isMainThread, "enableNativeRelativeMouseMode must be called on the main thread") - let state = RelativeMouseState.shared - if state.enabled { - // Already enabled: update the channel so this caller receives deltas. - state.deltaChannel = channel - return true - } - - // Dissociate mouse from cursor position - this locks the cursor in place - // Do this FIRST before setting any state - let result = CGAssociateMouseAndMouseCursorPosition(0) - if result != CGError.success { - NSLog("[RustDesk] Failed to dissociate mouse from cursor position: %d", result.rawValue) - return false - } - - // Only set state after CG call succeeds - state.deltaChannel = channel - state.accumulatedDeltaX = 0 - state.accumulatedDeltaY = 0 - - // Add local event monitor to capture mouse delta. - // Note: Local event monitors are always called on the main thread, - // so accessing main-thread-only state is safe here. - state.eventMonitor = NSEvent.addLocalMonitorForEvents(matching: [.mouseMoved, .leftMouseDragged, .rightMouseDragged, .otherMouseDragged]) { [weak state] event in - guard let state = state else { return event } - // Guard against race: mode may be disabled between weak capture and this check. - guard state.enabled else { return event } - let deltaX = event.deltaX - let deltaY = event.deltaY - - if deltaX != 0 || deltaY != 0 { - // Accumulate delta (main thread only - NSEvent local monitors always run on main thread) - state.accumulatedDeltaX += deltaX - state.accumulatedDeltaY += deltaY - - // Only send if we have integer movement - let intX = Int(state.accumulatedDeltaX) - let intY = Int(state.accumulatedDeltaY) - - if intX != 0 || intY != 0 { - state.accumulatedDeltaX -= CGFloat(intX) - state.accumulatedDeltaY -= CGFloat(intY) - - // Send delta to Flutter (already on main thread) - state.deltaChannel?.invokeMethod("onMouseDelta", arguments: ["dx": intX, "dy": intY]) - } - } - - return event - } - - // Check if monitor was created successfully - if state.eventMonitor == nil { - NSLog("[RustDesk] Failed to create event monitor for relative mouse mode") - // Re-associate mouse since we failed - CGAssociateMouseAndMouseCursorPosition(1) - state.deltaChannel = nil - return false - } - - // Set enabled LAST after everything succeeds - state.enabled = true - return true - } - - private func disableNativeRelativeMouseMode() { - assert(Thread.isMainThread, "disableNativeRelativeMouseMode must be called on the main thread") - let state = RelativeMouseState.shared - if !state.enabled { return } - - state.enabled = false - - // Remove event monitor - if let monitor = state.eventMonitor { - NSEvent.removeMonitor(monitor) - state.eventMonitor = nil - } - - state.deltaChannel = nil - state.accumulatedDeltaX = 0 - state.accumulatedDeltaY = 0 - - // Re-associate mouse with cursor position (non-blocking with async retry) - let result = CGAssociateMouseAndMouseCursorPosition(1) - if result != CGError.success { - NSLog("[RustDesk] Failed to re-associate mouse with cursor position: %d, scheduling retry...", result.rawValue) - // Non-blocking retry after 50ms - DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) { - let retryResult = CGAssociateMouseAndMouseCursorPosition(1) - if retryResult != CGError.success { - NSLog("[RustDesk] Retry failed to re-associate mouse: %d. Cursor may remain locked.", retryResult.rawValue) - } - } - } - } - + public func setMethodHandler(registrar: FlutterPluginRegistrar) { - let channel = FlutterMethodChannel(name: "org.rustdesk.rustdesk/host", binaryMessenger: registrar.messenger) + let channel = FlutterMethodChannel(name: "org.rustdesk.rustdesk/macos", binaryMessenger: registrar.messenger) channel.setMethodCallHandler({ (call, result) -> Void in switch call.method { @@ -210,74 +96,9 @@ class MainFlutterWindow: NSWindow { } case "requestRecordAudio": AVCaptureDevice.requestAccess(for: .audio, completionHandler: { granted in - DispatchQueue.main.async { - result(granted) - } + result(granted) }) break - case "bumpMouse": - var dx = 0 - var dy = 0 - - if let argMap = call.arguments as? [String: Any] { - dx = (argMap["dx"] as? Int) ?? 0 - dy = (argMap["dy"] as? Int) ?? 0 - } - else if let argList = call.arguments as? [Any] { - dx = argList.count >= 1 ? (argList[0] as? Int) ?? 0 : 0 - dy = argList.count >= 2 ? (argList[1] as? Int) ?? 0 : 0 - } - - var mouseLoc: CGPoint - - if let dummyEvent = CGEvent(source: nil) { // can this ever fail? - mouseLoc = dummyEvent.location - } - else if let screenFrame = NSScreen.screens.first?.frame { - // NeXTStep: Origin is lower-left of primary screen, positive is up - // Cocoa Core Graphics: Origin is upper-left of primary screen, positive is down - let nsMouseLoc = NSEvent.mouseLocation - - mouseLoc = CGPoint( - x: nsMouseLoc.x, - y: NSHeight(screenFrame) - nsMouseLoc.y) - } - else { - result(false) - break - } - - let newLoc = CGPoint(x: mouseLoc.x + CGFloat(dx), y: mouseLoc.y + CGFloat(dy)) - - CGDisplayMoveCursorToPoint(0, newLoc) - - // By default, Cocoa suppresses mouse events briefly after a call to warp the - // cursor to a new location. This is good if you want to draw the user's - // attention to the fact that the mouse is now in a particular location, but - // it's bad in this case; we get called as part of the handling of edge - // scrolling, which means the mouse is typically still in motion, and we want - // the cursor to keep moving smoothly uninterrupted. - // - // This function's main action is to toggle whether the mouse cursor is - // associated with the mouse position, but setting it to true when it's - // already true has the side-effect of cancelling this motion suppression. - // - // However, we must NOT call this when relative mouse mode is active, - // as it would break the pointer lock established by enableNativeRelativeMouseMode. - if !RelativeMouseState.shared.enabled { - CGAssociateMouseAndMouseCursorPosition(1 /* true */) - } - - result(true) - - case "enableNativeRelativeMouseMode": - let success = self.enableNativeRelativeMouseMode(channel: channel) - result(success) - - case "disableNativeRelativeMouseMode": - self.disableNativeRelativeMouseMode() - result(true) - default: result(FlutterMethodNotImplemented) } diff --git a/flutter/ndk_x86.sh b/flutter/ndk_x86.sh index 57e121274..617c25f65 100755 --- a/flutter/ndk_x86.sh +++ b/flutter/ndk_x86.sh @@ -1,10 +1,2 @@ #!/usr/bin/env bash - -# -# Fix OpenSSL build with Android NDK clang on 32-bit architectures -# - -export CFLAGS="-DBROKEN_CLANG_ATOMICS" -export CXXFLAGS="-DBROKEN_CLANG_ATOMICS" - cargo ndk --platform 21 --target i686-linux-android build --release --features flutter diff --git a/flutter/pubspec.lock b/flutter/pubspec.lock index c6f8aa1c2..aba6c7879 100644 --- a/flutter/pubspec.lock +++ b/flutter/pubspec.lock @@ -689,14 +689,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.3" - google_fonts: - dependency: "direct main" - description: - name: google_fonts - sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82 - url: "https://pub.dev" - source: hosted - version: "6.2.1" graphs: dependency: transitive description: diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml index eddf5a19d..03de1a4eb 100644 --- a/flutter/pubspec.yaml +++ b/flutter/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # 1.1.9-1 works for android, but for ios it becomes 1.1.91, need to set it to 1.1.9-a.1 for iOS, will get 1.1.9.1, but iOS store not allow 4 numbers -version: 1.4.6+64 +version: 1.4.0+58 environment: sdk: '^3.1.0' @@ -108,13 +108,11 @@ dependencies: extended_text: 14.0.0 xterm: 4.0.0 sqflite: 2.2.0 - google_fonts: ^6.2.1 - vector_math: ^2.1.4 dev_dependencies: icons_launcher: ^2.0.4 - flutter_test: - sdk: flutter + #flutter_test: + #sdk: flutter build_runner: ^2.4.6 freezed: ^2.4.2 flutter_lints: ^2.0.2 diff --git a/flutter/test/input_modifier_utils_test.dart b/flutter/test/input_modifier_utils_test.dart deleted file mode 100644 index 2e1971753..000000000 --- a/flutter/test/input_modifier_utils_test.dart +++ /dev/null @@ -1,125 +0,0 @@ -import 'package:flutter/services.dart'; -import 'package:flutter_test/flutter_test.dart'; -import 'package:flutter_hbb/models/input_modifier_utils.dart'; - -void main() { - group('shouldReleaseStaleMobileShift', () { - test('does not release when cached shift is already false', () { - expect( - shouldReleaseStaleMobileShift( - isMobile: true, - cachedShiftPressed: false, - actualShiftPressed: false, - logicalKey: LogicalKeyboardKey.keyD, - hasTrackedShiftKeyDown: true, - ), - isFalse, - ); - }); - - test('releases one-shot mobile shift after a text key', () { - expect( - shouldReleaseStaleMobileShift( - isMobile: true, - cachedShiftPressed: true, - actualShiftPressed: false, - logicalKey: LogicalKeyboardKey.keyD, - hasTrackedShiftKeyDown: true, - ), - isTrue, - ); - }); - - test('does not release manually toggled shift without tracked key down', - () { - expect( - shouldReleaseStaleMobileShift( - isMobile: true, - cachedShiftPressed: true, - actualShiftPressed: false, - logicalKey: LogicalKeyboardKey.keyD, - hasTrackedShiftKeyDown: false, - ), - isFalse, - ); - }); - - test('does not release when shift is still physically pressed', () { - expect( - shouldReleaseStaleMobileShift( - isMobile: true, - cachedShiftPressed: true, - actualShiftPressed: true, - logicalKey: LogicalKeyboardKey.keyD, - hasTrackedShiftKeyDown: true, - ), - isFalse, - ); - }); - - test('does not release on non-mobile platforms', () { - expect( - shouldReleaseStaleMobileShift( - isMobile: false, - cachedShiftPressed: true, - actualShiftPressed: false, - logicalKey: LogicalKeyboardKey.keyD, - hasTrackedShiftKeyDown: true, - ), - isFalse, - ); - }); - - test('releases on enter key', () { - expect( - shouldReleaseStaleMobileShift( - isMobile: true, - cachedShiftPressed: true, - actualShiftPressed: false, - logicalKey: LogicalKeyboardKey.enter, - hasTrackedShiftKeyDown: true, - ), - isTrue, - ); - }); - - test('releases on arrow key', () { - expect( - shouldReleaseStaleMobileShift( - isMobile: true, - cachedShiftPressed: true, - actualShiftPressed: false, - logicalKey: LogicalKeyboardKey.arrowLeft, - hasTrackedShiftKeyDown: true, - ), - isTrue, - ); - }); - - test('does not release on modifier events', () { - expect( - shouldReleaseStaleMobileShift( - isMobile: true, - cachedShiftPressed: true, - actualShiftPressed: false, - logicalKey: LogicalKeyboardKey.shiftLeft, - hasTrackedShiftKeyDown: true, - ), - isFalse, - ); - }); - - test('does not release on shiftRight modifier events', () { - expect( - shouldReleaseStaleMobileShift( - isMobile: true, - cachedShiftPressed: true, - actualShiftPressed: false, - logicalKey: LogicalKeyboardKey.shiftRight, - hasTrackedShiftKeyDown: true, - ), - isFalse, - ); - }); - }); -} diff --git a/flutter/windows/runner/CMakeLists.txt b/flutter/windows/runner/CMakeLists.txt index 2dbf0a973..17411a8ab 100644 --- a/flutter/windows/runner/CMakeLists.txt +++ b/flutter/windows/runner/CMakeLists.txt @@ -10,7 +10,6 @@ add_executable(${BINARY_NAME} WIN32 "flutter_window.cpp" "main.cpp" "utils.cpp" - "win32_desktop.cpp" "win32_window.cpp" "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" "Runner.rc" diff --git a/flutter/windows/runner/flutter_window.cpp b/flutter/windows/runner/flutter_window.cpp index 903fb2fa0..3ccbdd4f4 100644 --- a/flutter/windows/runner/flutter_window.cpp +++ b/flutter/windows/runner/flutter_window.cpp @@ -1,24 +1,13 @@ #include "flutter_window.h" +#include + #include #include #include #include "flutter/generated_plugin_registrant.h" -#include -#include -#include -#include -#include - -#include - -#include -#include - -#include "win32_desktop.h" - FlutterWindow::FlutterWindow(const flutter::DartProject& project) : project_(project) {} @@ -40,48 +29,6 @@ bool FlutterWindow::OnCreate() { return false; } RegisterPlugins(flutter_controller_->engine()); - - flutter::MethodChannel<> channel( - flutter_controller_->engine()->messenger(), - "org.rustdesk.rustdesk/host", - &flutter::StandardMethodCodec::GetInstance()); - - channel.SetMethodCallHandler( - [](const flutter::MethodCall<>& call, std::unique_ptr> result) { - if (call.method_name() == "bumpMouse") { - auto arguments = call.arguments(); - - int dx = 0, dy = 0; - - if (std::holds_alternative(*arguments)) { - auto argsMap = std::get(*arguments); - - auto dxIt = argsMap.find(flutter::EncodableValue("dx")); - auto dyIt = argsMap.find(flutter::EncodableValue("dy")); - - if ((dxIt != argsMap.end()) && std::holds_alternative(dxIt->second)) { - dx = std::get(dxIt->second); - } - if ((dyIt != argsMap.end()) && std::holds_alternative(dyIt->second)) { - dy = std::get(dyIt->second); - } - } else if (std::holds_alternative(*arguments)) { - auto argsList = std::get(*arguments); - - if ((argsList.size() >= 1) && std::holds_alternative(argsList[0])) { - dx = std::get(argsList[0]); - } - if ((argsList.size() >= 2) && std::holds_alternative(argsList[1])) { - dy = std::get(argsList[1]); - } - } - - bool succeeded = Win32Desktop::BumpMouse(dx, dy); - - result->Success(succeeded); - } - }); - DesktopMultiWindowSetWindowCreatedCallback([](void *controller) { auto *flutter_view_controller = reinterpret_cast(controller); diff --git a/flutter/windows/runner/main.cpp b/flutter/windows/runner/main.cpp index cd9f386b1..5c55d1c28 100644 --- a/flutter/windows/runner/main.cpp +++ b/flutter/windows/runner/main.cpp @@ -7,7 +7,6 @@ #include #include -#include "win32_desktop.h" #include "flutter_window.h" #include "utils.h" @@ -127,22 +126,8 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); FlutterWindow window(project); - - // Get primary monitor's work area. - Win32Window::Point workarea_origin(0, 0); - Win32Window::Size workarea_size(0, 0); - - Win32Desktop::GetWorkArea(workarea_origin, workarea_size); - - // Compute window bounds for default main window position: (10, 10) x(800, 600) - Win32Window::Point relative_origin(10, 10); - - Win32Window::Point origin(workarea_origin.x + relative_origin.x, workarea_origin.y + relative_origin.y); - Win32Window::Size size(800u, 600u); - - // Fit the window to the monitor's work area. - Win32Desktop::FitToWorkArea(origin, size); - + Win32Window::Point origin(10, 10); + Win32Window::Size size(800, 600); std::wstring window_title; if (is_cm_page) { window_title = app_name + L" - Connection Manager"; diff --git a/flutter/windows/runner/win32_desktop.cpp b/flutter/windows/runner/win32_desktop.cpp deleted file mode 100644 index 4274f6ec5..000000000 --- a/flutter/windows/runner/win32_desktop.cpp +++ /dev/null @@ -1,82 +0,0 @@ -#include "win32_desktop.h" - -#include - -#include - -namespace Win32Desktop -{ - void GetWorkArea(Win32Window::Point& origin, Win32Window::Size& size) - { - RECT windowRect; - - windowRect.left = origin.x; - windowRect.top = origin.y; - windowRect.right = origin.x + size.width; - windowRect.bottom = origin.y + size.height; - - HMONITOR hMonitor = MonitorFromRect(&windowRect, MONITOR_DEFAULTTONEAREST); - - if (hMonitor == NULL) - hMonitor = MonitorFromWindow(NULL, MONITOR_DEFAULTTOPRIMARY); - - RECT workAreaRect; - workAreaRect.left = 0; - workAreaRect.top = 0; - workAreaRect.right = 1280; - workAreaRect.bottom = 1024 - 40; // default Windows 10 task bar height - - if (hMonitor != NULL) - { - MONITORINFO monitorInfo = {0}; - - monitorInfo.cbSize = sizeof(monitorInfo); - - if (GetMonitorInfoW(hMonitor, &monitorInfo)) - { - workAreaRect = monitorInfo.rcWork; - } - } - - origin.x = workAreaRect.left; - origin.y = workAreaRect.top; - - size.width = workAreaRect.right - workAreaRect.left; - size.height = workAreaRect.bottom - workAreaRect.top; - } - - void FitToWorkArea(Win32Window::Point& origin, Win32Window::Size& size) - { - // Retrieve the work area of the monitor that contains or - // is closed to the supplied window bounds. - Win32Window::Point workarea_origin = origin; - Win32Window::Size workarea_size = size; - - GetWorkArea(workarea_origin, workarea_size); - - // Translate the window so that its top/left is inside the work area. - origin.x = std::max(origin.x, workarea_origin.x); - origin.y = std::max(origin.y, workarea_origin.y); - - // Crop the window if it extends past the bottom/right of the work area. - Win32Window::Point workarea_bottom_right( - workarea_origin.x + workarea_size.width, - workarea_origin.y + workarea_size.height); - - size.width = std::min(size.width, workarea_bottom_right.x - origin.x); - size.height = std::min(size.height, workarea_bottom_right.y - origin.y); - } - - bool BumpMouse(int dx, int dy) - { - POINT pos; - - if (GetCursorPos(&pos)) - { - SetCursorPos(pos.x + dx, pos.y + dy); - return true; - } - - return false; - } -} diff --git a/flutter/windows/runner/win32_desktop.h b/flutter/windows/runner/win32_desktop.h deleted file mode 100644 index 8a07478e5..000000000 --- a/flutter/windows/runner/win32_desktop.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef RUNNER_WIN32_DESKTOP_H_ -#define RUNNER_WIN32_DESKTOP_H_ - -#include "win32_window.h" - -namespace Win32Desktop -{ - void GetWorkArea(Win32Window::Point& origin, Win32Window::Size& size); - void FitToWorkArea(Win32Window::Point& origin, Win32Window::Size& size); - bool BumpMouse(int dx, int dy); -} - -#endif // RUNNER_WIN32_DESKTOP_H_ diff --git a/flutter/windows/runner/win32_window.cpp b/flutter/windows/runner/win32_window.cpp index 606ef0aa3..2c25f00dd 100644 --- a/flutter/windows/runner/win32_window.cpp +++ b/flutter/windows/runner/win32_window.cpp @@ -7,7 +7,6 @@ #include // for getenv and _putenv #include // for strcmp -#include // for std::wstring namespace { @@ -16,43 +15,6 @@ constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; // The number of Win32Window objects that currently exist. static int g_active_window_count = 0; -// Static variable to hold the custom icon (needs cleanup on exit) -static HICON g_custom_icon_ = nullptr; - -// Try to load icon from data\flutter_assets\assets\icon.ico if it exists. -// Returns nullptr if the file doesn't exist or can't be loaded. -HICON LoadCustomIcon() { - if (g_custom_icon_ != nullptr) { - return g_custom_icon_; - } - wchar_t exe_path[MAX_PATH]; - if (!GetModuleFileNameW(nullptr, exe_path, MAX_PATH)) { - return nullptr; - } - - std::wstring icon_path = exe_path; - size_t last_slash = icon_path.find_last_of(L"\\/"); - if (last_slash == std::wstring::npos) { - return nullptr; - } - - icon_path = icon_path.substr(0, last_slash + 1); - icon_path += L"data\\flutter_assets\\assets\\icon.ico"; - - // Check file attributes - reject if missing, directory, or reparse point (symlink/junction) - DWORD file_attr = GetFileAttributesW(icon_path.c_str()); - if (file_attr == INVALID_FILE_ATTRIBUTES || - (file_attr & FILE_ATTRIBUTE_DIRECTORY) || - (file_attr & FILE_ATTRIBUTE_REPARSE_POINT)) { - return nullptr; - } - - g_custom_icon_ = (HICON)LoadImageW( - nullptr, icon_path.c_str(), IMAGE_ICON, 0, 0, - LR_LOADFROMFILE | LR_DEFAULTSIZE); - return g_custom_icon_; -} - using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); // Scale helper to convert logical scaler values to physical using passed in @@ -119,16 +81,8 @@ const wchar_t* WindowClassRegistrar::GetWindowClass() { window_class.cbClsExtra = 0; window_class.cbWndExtra = 0; window_class.hInstance = GetModuleHandle(nullptr); - - // Try to load icon from data\flutter_assets\assets\icon.ico if it exists - HICON custom_icon = LoadCustomIcon(); - if (custom_icon != nullptr) { - window_class.hIcon = custom_icon; - } else { - window_class.hIcon = - LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); - } - + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); window_class.hbrBackground = 0; window_class.lpszMenuName = nullptr; window_class.lpfnWndProc = Win32Window::WndProc; @@ -141,12 +95,6 @@ const wchar_t* WindowClassRegistrar::GetWindowClass() { void WindowClassRegistrar::UnregisterWindowClass() { UnregisterClass(kWindowClassName, nullptr); class_registered_ = false; - - // Clean up the custom icon if it was loaded - if (g_custom_icon_ != nullptr) { - DestroyIcon(g_custom_icon_); - g_custom_icon_ = nullptr; - } } Win32Window::Win32Window() { diff --git a/libs/clipboard/README.md b/libs/clipboard/README.md index ec08cbf04..6333a0644 100644 --- a/libs/clipboard/README.md +++ b/libs/clipboard/README.md @@ -10,7 +10,7 @@ TODO: Move this lib to a separate project. ## How it works -Terminologies: +Terminalogies: - cliprdr: this module - local: the endpoint which initiates a file copy events @@ -50,7 +50,7 @@ sequenceDiagram r ->> l: Format List Response (notified) r ->> l: Format Data Request (requests file list) activate l - note left of l: Retrieve file list from system clipboard + note left of l: Retrive file list from system clipboard l ->> r: Format Data Response (containing file list) deactivate l note over r: Update system clipboard with received file list @@ -84,10 +84,10 @@ and copy files to remote. The protocol was originally designed as an extension of the Windows RDP, so the specific message packages fits windows well. -When starting cliprdr, a thread is spawned to create an invisible window +When starting cliprdr, a thread is spawn to create a invisible window and to subscribe to OLE clipboard events. The window's callback (see `cliprdr_proc` in `src/windows/wf_cliprdr.c`) was -set to handle a variety of events. +set to handle a variaty of events. Detailed implementation is shown in pictures above. @@ -108,18 +108,18 @@ after filtering out those pointing to our FUSE directory or duplicated, send format list directly to remote. The cliprdr server also uses clipboard client for setting clipboard, -or retrieve paths from system. +or retrive paths from system. #### Local File List -The local file list is a temporary list of file metadata. +The local file list is a temperary list of file metadata. When receiving file contents PDU from peer, the server picks out the file requested and open it for reading if necessary. Also when receiving Format Data Request PDU from remote asking for file list, the local file list should be rebuilt from file list retrieved from Clipboard Client. -Some caching and preloading could be done on it since applications are likely to read +Some caching and preloading could done on it since applications are likely to read on the list sequentially. #### FUSE server diff --git a/libs/clipboard/src/cliprdr.h b/libs/clipboard/src/cliprdr.h index 33e3d522a..8b9cecef0 100644 --- a/libs/clipboard/src/cliprdr.h +++ b/libs/clipboard/src/cliprdr.h @@ -170,8 +170,6 @@ extern "C" typedef UINT (*pcNotifyClipboardMsg)(UINT32 connID, const NOTIFICATION_MESSAGE *msg); - typedef UINT (*pcHandleClipboardFiles)(UINT32 connID, size_t nFiles, WCHAR **fileNames); - typedef UINT (*pcCliprdrClientFormatList)(CliprdrClientContext *context, const CLIPRDR_FORMAT_LIST *formatList); typedef UINT (*pcCliprdrServerFormatList)(CliprdrClientContext *context, @@ -219,7 +217,6 @@ extern "C" pcCliprdrMonitorReady MonitorReady; pcCliprdrTempDirectory TempDirectory; pcNotifyClipboardMsg NotifyClipboardMsg; - pcHandleClipboardFiles HandleClipboardFiles; pcCliprdrClientFormatList ClientFormatList; pcCliprdrServerFormatList ServerFormatList; pcCliprdrClientFormatListResponse ClientFormatListResponse; diff --git a/libs/clipboard/src/lib.rs b/libs/clipboard/src/lib.rs index 5ce9afe28..f28fe083d 100644 --- a/libs/clipboard/src/lib.rs +++ b/libs/clipboard/src/lib.rs @@ -132,9 +132,6 @@ pub enum ClipboardFile { requested_data: Vec, }, TryEmpty, - Files { - files: Vec<(String, u64)>, - }, } struct MsgChannel { diff --git a/libs/clipboard/src/platform/unix/fuse/cs.rs b/libs/clipboard/src/platform/unix/fuse/cs.rs index fa1dea71d..0f1cf8739 100644 --- a/libs/clipboard/src/platform/unix/fuse/cs.rs +++ b/libs/clipboard/src/platform/unix/fuse/cs.rs @@ -12,7 +12,7 @@ //! //! For now, we transfer all file names with windows separators, UTF-16 encoded. //! *Need a way to transfer file names with '\' safely*. -//! Maybe we can use URL encoded file names and '/' separators as a new standard, while keep the support to old schemes. +//! Maybe we can use URL encoded file names and '/' seperators as a new standard, while keep the support to old schemes. //! //! # Note //! - all files on FS should be read only, and mark the owner to be the current user diff --git a/libs/clipboard/src/platform/unix/serv_files.rs b/libs/clipboard/src/platform/unix/serv_files.rs index 6f4fb54a4..a401e0b5c 100644 --- a/libs/clipboard/src/platform/unix/serv_files.rs +++ b/libs/clipboard/src/platform/unix/serv_files.rs @@ -5,7 +5,7 @@ use hbb_common::{ log, }; use parking_lot::Mutex; -use std::{path::PathBuf, sync::Arc, usize}; +use std::{path::PathBuf, sync::Arc}; lazy_static::lazy_static! { // local files are cached, this value should not be changed when copying files @@ -34,7 +34,6 @@ enum FileContentsRequest { struct ClipFiles { files: Vec, file_list: Vec, - first_file_index: usize, files_pdu: Vec, } @@ -42,7 +41,6 @@ impl ClipFiles { fn clear(&mut self) { self.files.clear(); self.file_list.clear(); - self.first_file_index = usize::MAX; self.files_pdu.clear(); } @@ -52,11 +50,6 @@ impl ClipFiles { .map(|s| PathBuf::from(s)) .collect::>(); self.file_list = construct_file_list(&clipboard_paths)?; - self.first_file_index = self - .file_list - .iter() - .position(|f| !f.path.is_dir()) - .unwrap_or(usize::MAX); self.files = clipboard_files.to_vec(); Ok(()) } @@ -70,33 +63,6 @@ impl ClipFiles { self.files_pdu = data.to_vec() } - fn get_files_for_audit(&self, request: &FileContentsRequest) -> Option { - if let FileContentsRequest::Range { - file_idx, offset, .. - } = request - { - if *file_idx == self.first_file_index && *offset == 0 { - let files: Vec<(String, u64)> = self - .file_list - .iter() - .filter_map(|f| { - if f.path.is_file() { - Some((f.path.to_string_lossy().to_string(), f.size)) - } else { - None - } - }) - .collect::<_>(); - if files.is_empty() { - return None; - } else { - return Some(ClipboardFile::Files { files }); - } - } - } - None - } - fn serve_file_contents( &mut self, conn_id: i32, @@ -226,7 +192,7 @@ pub fn read_file_contents( n_position_low: i32, n_position_high: i32, cb_requested: i32, -) -> Vec> { +) -> Result { let fcr = if dw_flags == 0x1 { FileContentsRequest::Size { stream_id, @@ -243,18 +209,12 @@ pub fn read_file_contents( length, } } else { - return vec![Err(CliprdrError::InvalidRequest { + return Err(CliprdrError::InvalidRequest { description: format!("got invalid FileContentsRequest, dw_flats: {dw_flags}"), - })]; + }); }; - let mut clip_files = CLIP_FILES.lock(); - let mut res = vec![]; - if let Some(files_res) = clip_files.get_files_for_audit(&fcr) { - res.push(Ok(files_res)); - } - res.push(clip_files.serve_file_contents(conn_id, fcr)); - res + CLIP_FILES.lock().serve_file_contents(conn_id, fcr) } pub fn sync_files(files: &[String]) -> Result<(), CliprdrError> { diff --git a/libs/clipboard/src/platform/windows.rs b/libs/clipboard/src/platform/windows.rs index cdeb3e4b0..3734406e0 100644 --- a/libs/clipboard/src/platform/windows.rs +++ b/libs/clipboard/src/platform/windows.rs @@ -381,9 +381,6 @@ pub type pcCliprdrTempDirectory = ::std::option::Option< pub type pcNotifyClipboardMsg = ::std::option::Option< unsafe extern "C" fn(connID: UINT32, msg: *const NOTIFICATION_MESSAGE) -> UINT, >; -pub type pcHandleClipboardFiles = ::std::option::Option< - unsafe extern "C" fn(connID: UINT32, nFiles: size_t, fileNames: *mut *mut WCHAR) -> UINT, ->; pub type pcCliprdrClientFormatList = ::std::option::Option< unsafe extern "C" fn( context: *mut CliprdrClientContext, @@ -495,7 +492,6 @@ pub struct _cliprdr_client_context { pub MonitorReady: pcCliprdrMonitorReady, pub TempDirectory: pcCliprdrTempDirectory, pub NotifyClipboardMsg: pcNotifyClipboardMsg, - pub HandleClipboardFiles: pcHandleClipboardFiles, pub ClientFormatList: pcCliprdrClientFormatList, pub ServerFormatList: pcCliprdrServerFormatList, pub ClientFormatListResponse: pcCliprdrClientFormatListResponse, @@ -533,7 +529,6 @@ impl CliprdrClientContext { enable_others: bool, response_wait_timeout_secs: u32, notify_callback: pcNotifyClipboardMsg, - handle_clipboard_files: pcHandleClipboardFiles, client_format_list: pcCliprdrClientFormatList, client_format_list_response: pcCliprdrClientFormatListResponse, client_format_data_request: pcCliprdrClientFormatDataRequest, @@ -552,7 +547,6 @@ impl CliprdrClientContext { MonitorReady: None, TempDirectory: None, NotifyClipboardMsg: notify_callback, - HandleClipboardFiles: handle_clipboard_files, ClientFormatList: client_format_list, ServerFormatList: None, ClientFormatListResponse: client_format_list_response, @@ -764,9 +758,6 @@ pub fn server_clip_file( ret ); } - ClipboardFile::Files { .. } => { - // unreachable - } } ret } @@ -976,7 +967,6 @@ pub fn create_cliprdr_context( enable_others, response_wait_timeout_secs, Some(notify_callback), - Some(handle_clipboard_files), Some(client_format_list), Some(client_format_list_response), Some(client_format_data_request), @@ -1031,61 +1021,6 @@ extern "C" fn notify_callback(conn_id: UINT32, msg: *const NOTIFICATION_MESSAGE) 0 } -extern "C" fn handle_clipboard_files( - conn_id: UINT32, - n_files: size_t, - file_names: *mut *mut WCHAR, -) -> UINT { - if n_files == 0 { - return 0; - } - - let data = unsafe { - let mut files = Vec::new(); - use std::ffi::OsString; - use std::os::windows::ffi::OsStringExt; - for i in 0..n_files { - let file_name_ptr = *file_names.offset(i as isize); - if !file_name_ptr.is_null() { - let mut len = 0; - while *file_name_ptr.offset(len) != 0 { - len += 1; - } - let slice = std::slice::from_raw_parts(file_name_ptr, len as usize); - let os_string = OsString::from_wide(slice); - match os_string.to_str() { - Some(n) => match std::fs::metadata(n) { - Ok(meta) => { - if meta.is_file() { - files.push((n.to_owned(), meta.len())); - } - } - Err(e) => { - log::warn!( - "handle_clipboard_files: Failed to get metadata for file '{}': {}", - n, - e - ); - } - }, - None => { - log::warn!("handle_clipboard_files: Failed to convert file name to UTF-8"); - } - }; - } - } - if files.is_empty() { - return 0; - } - - ClipboardFile::Files { files } - }; - // no need to handle result here - allow_err!(send_data(conn_id as _, data)); - - 0 -} - extern "C" fn client_format_list( _context: *mut CliprdrClientContext, clip_format_list: *const CLIPRDR_FORMAT_LIST, diff --git a/libs/clipboard/src/windows/wf_cliprdr.c b/libs/clipboard/src/windows/wf_cliprdr.c index 95d1d1a5c..e065be215 100644 --- a/libs/clipboard/src/windows/wf_cliprdr.c +++ b/libs/clipboard/src/windows/wf_cliprdr.c @@ -239,7 +239,6 @@ struct wf_clipboard size_t nFiles; size_t file_array_size; WCHAR **file_names; - size_t first_file_index; FILEDESCRIPTORW **fileDescriptor; BOOL legacyApi; @@ -624,7 +623,6 @@ void CliprdrStream_Delete(CliprdrStream *instance) if (instance) { free(instance->iStream.lpVtbl); - instance->iStream.lpVtbl = NULL; free(instance); } } @@ -2026,7 +2024,6 @@ static void clear_file_array(wfClipboard *clipboard) clipboard->file_array_size = 0; clipboard->nFiles = 0; - clipboard->first_file_index = (size_t)-1; } static BOOL wf_cliprdr_get_file_contents(WCHAR *file_name, BYTE *buffer, LONG positionLow, @@ -2161,7 +2158,7 @@ static BOOL wf_cliprdr_add_to_file_arrays(wfClipboard *clipboard, WCHAR *full_fi return FALSE; /* add to name array */ - clipboard->file_names[clipboard->nFiles] = (LPWSTR)malloc((size_t)MAX_PATH * sizeof(WCHAR)); + clipboard->file_names[clipboard->nFiles] = (LPWSTR)malloc(MAX_PATH * 2); if (!clipboard->file_names[clipboard->nFiles]) return FALSE; @@ -2182,11 +2179,6 @@ static BOOL wf_cliprdr_add_to_file_arrays(wfClipboard *clipboard, WCHAR *full_fi return FALSE; } - if ((clipboard->fileDescriptor[clipboard->nFiles]->dwFileAttributes & - FILE_ATTRIBUTE_DIRECTORY) == 0) { - clipboard->first_file_index = clipboard->nFiles; - } - clipboard->nFiles++; return TRUE; } @@ -2976,14 +2968,6 @@ wf_cliprdr_server_file_contents_request(CliprdrClientContext *context, { LARGE_INTEGER dlibMove; ULARGE_INTEGER dlibNewPosition; - - if (clipboard->nFiles > 0 && - fileContentsRequest->listIndex == (UINT32)clipboard->first_file_index && - fileContentsRequest->nPositionLow == 0 && - fileContentsRequest->nPositionHigh == 0) { - clipboard->context->HandleClipboardFiles(fileContentsRequest->connID, clipboard->nFiles, clipboard->file_names); - } - dlibMove.HighPart = fileContentsRequest->nPositionHigh; dlibMove.LowPart = fileContentsRequest->nPositionLow; hRet = IStream_Seek(pStreamStc, dlibMove, STREAM_SEEK_SET, &dlibNewPosition); @@ -3015,13 +2999,6 @@ wf_cliprdr_server_file_contents_request(CliprdrClientContext *context, rc = ERROR_INTERNAL_ERROR; goto exit; } - - if (clipboard->nFiles > 0 && - fileContentsRequest->listIndex == (UINT32)clipboard->first_file_index && - fileContentsRequest->nPositionLow == 0 && - fileContentsRequest->nPositionHigh == 0) { - clipboard->context->HandleClipboardFiles(fileContentsRequest->connID, clipboard->nFiles, clipboard->file_names); - } bRet = wf_cliprdr_get_file_contents( clipboard->file_names[fileContentsRequest->listIndex], pData, fileContentsRequest->nPositionLow, fileContentsRequest->nPositionHigh, cbRequested, diff --git a/libs/enigo/Cargo.toml b/libs/enigo/Cargo.toml index 6468eeedd..a5b6d5622 100644 --- a/libs/enigo/Cargo.toml +++ b/libs/enigo/Cargo.toml @@ -37,8 +37,5 @@ core-graphics = "0.22" objc = "0.2" unicode-segmentation = "1.10" -[target.'cfg(target_os = "linux")'.dependencies] -libxdo-sys = "0.11" - [build-dependencies] pkg-config = "0.3" diff --git a/libs/enigo/src/linux/nix_impl.rs b/libs/enigo/src/linux/nix_impl.rs index c16be3469..902d77948 100644 --- a/libs/enigo/src/linux/nix_impl.rs +++ b/libs/enigo/src/linux/nix_impl.rs @@ -261,8 +261,6 @@ impl KeyboardControllable for Enigo { } else { if let Some(keyboard) = &mut self.custom_keyboard { keyboard.key_sequence(sequence) - } else { - log::warn!("Enigo::key_sequence: no custom_keyboard set for Wayland!"); } } } @@ -279,7 +277,6 @@ impl KeyboardControllable for Enigo { if let Some(keyboard) = &mut self.custom_keyboard { keyboard.key_down(key) } else { - log::warn!("Enigo::key_down: no custom_keyboard set for Wayland!"); Ok(()) } } @@ -293,24 +290,13 @@ impl KeyboardControllable for Enigo { } else { if let Some(keyboard) = &mut self.custom_keyboard { keyboard.key_up(key) - } else { - log::warn!("Enigo::key_up: no custom_keyboard set for Wayland!"); } } } fn key_click(&mut self, key: Key) { - if self.is_x11 { - // X11: try tfc first, then fallback to key_down/key_up - if self.tfc_key_click(key).is_err() { - self.key_down(key).ok(); - self.key_up(key); - } - } else { - if let Some(keyboard) = &mut self.custom_keyboard { - keyboard.key_click(key); - } else { - log::warn!("Enigo::key_click: no custom_keyboard set for Wayland!"); - } + if self.tfc_key_click(key).is_err() { + self.key_down(key).ok(); + self.key_up(key); } } } diff --git a/libs/enigo/src/linux/xdo.rs b/libs/enigo/src/linux/xdo.rs index 7796904f9..f0f7d49af 100644 --- a/libs/enigo/src/linux/xdo.rs +++ b/libs/enigo/src/linux/xdo.rs @@ -1,23 +1,50 @@ -//! XDO-based input emulation for Linux. -//! -//! This module uses libxdo-sys (patched to use dynamic loading stub) for input emulation. -//! The stub handles dynamic loading of libxdo, so we just call the functions directly. -//! -//! If libxdo is not available at runtime, all operations become no-ops. - use crate::{Key, KeyboardControllable, MouseButton, MouseControllable}; -use hbb_common::libc::c_int; -use hbb_common::x11::xlib::{Display, XCloseDisplay, XGetPointerMapping, XOpenDisplay}; -use libxdo_sys::{self, xdo_t, CURRENTWINDOW}; -use std::{borrow::Cow, ffi::CString}; +use hbb_common::libc::{c_char, c_int, c_void, useconds_t}; +use std::{borrow::Cow, ffi::CString, ptr}; -/// Default delay per keypress in microseconds. -/// This value is passed to libxdo functions and must fit in `useconds_t` (u32). +const CURRENT_WINDOW: c_int = 0; const DEFAULT_DELAY: u64 = 12000; +type Window = c_int; +type Xdo = *const c_void; -/// Maximum allowed delay value (u32::MAX as u64). -const MAX_DELAY: u64 = u32::MAX as u64; +#[link(name = "xdo")] +extern "C" { + fn xdo_free(xdo: Xdo); + fn xdo_new(display: *const c_char) -> Xdo; + + fn xdo_click_window(xdo: Xdo, window: Window, button: c_int) -> c_int; + fn xdo_mouse_down(xdo: Xdo, window: Window, button: c_int) -> c_int; + fn xdo_mouse_up(xdo: Xdo, window: Window, button: c_int) -> c_int; + fn xdo_move_mouse(xdo: Xdo, x: c_int, y: c_int, screen: c_int) -> c_int; + fn xdo_move_mouse_relative(xdo: Xdo, x: c_int, y: c_int) -> c_int; + + fn xdo_enter_text_window( + xdo: Xdo, + window: Window, + string: *const c_char, + delay: useconds_t, + ) -> c_int; + fn xdo_send_keysequence_window( + xdo: Xdo, + window: Window, + string: *const c_char, + delay: useconds_t, + ) -> c_int; + fn xdo_send_keysequence_window_down( + xdo: Xdo, + window: Window, + string: *const c_char, + delay: useconds_t, + ) -> c_int; + fn xdo_send_keysequence_window_up( + xdo: Xdo, + window: Window, + string: *const c_char, + delay: useconds_t, + ) -> c_int; + fn xdo_get_input_state(xdo: Xdo) -> u32; +} fn mousebutton(button: MouseButton) -> c_int { match button { @@ -33,54 +60,9 @@ fn mousebutton(button: MouseButton) -> c_int { } } -/// Minimum number of buttons the X11 core pointer must support. -/// Buttons 8 (Back) and 9 (Forward) are needed for mouse side buttons. -const MIN_POINTER_BUTTONS: usize = 9; - -/// Check that the X11 core pointer's button map includes at least 9 buttons -/// so that `XTestFakeButtonEvent` can simulate Back (8) and Forward (9). -/// -/// RustDesk's uinput "Mouse passthrough" device normally provides enough -/// buttons, but we log a warning if the map is too small so the issue is -/// diagnosable. `XSetPointerMapping` cannot extend the button count (its -/// length must match `XGetPointerMapping`), so we only diagnose here. -fn check_x11_button_map() { - // Skip on non-X11 sessions to avoid noisy "XOpenDisplay failed" warnings - // on pure Wayland or headless environments without $DISPLAY. - if std::env::var_os("DISPLAY").is_none() { - return; - } - - let display: *mut Display = unsafe { XOpenDisplay(std::ptr::null()) }; - if display.is_null() { - log::warn!("XOpenDisplay failed, cannot check button map"); - return; - } - - let mut current_map = [0u8; 32]; - let nbuttons = - unsafe { XGetPointerMapping(display, current_map.as_mut_ptr(), current_map.len() as i32) }; - unsafe { XCloseDisplay(display) }; - - if nbuttons < 0 { - log::warn!("XGetPointerMapping failed (returned {nbuttons})"); - return; - } - - let nbuttons = nbuttons as usize; - if nbuttons >= MIN_POINTER_BUTTONS { - log::info!("X11 pointer has {nbuttons} buttons, side buttons supported"); - } else { - log::warn!( - "X11 pointer has only {nbuttons} buttons (need {MIN_POINTER_BUTTONS}); \ - back/forward side buttons may not work until a device with more buttons is added" - ); - } -} - /// The main struct for handling the event emitting pub(super) struct EnigoXdo { - xdo: *mut xdo_t, + xdo: Xdo, delay: u64, } // This is safe, we have a unique pointer. @@ -88,62 +70,37 @@ pub(super) struct EnigoXdo { unsafe impl Send for EnigoXdo {} impl Default for EnigoXdo { - /// Create a new EnigoXdo instance. - /// - /// If libxdo is not available, the xdo pointer will be null and all - /// input operations will be no-ops. + /// Create a new EnigoXdo instance fn default() -> Self { - let xdo = unsafe { libxdo_sys::xdo_new(std::ptr::null()) }; - if xdo.is_null() { - log::warn!("Failed to create xdo context, xdo functions will be disabled"); - } else { - log::info!("xdo context created successfully"); - check_x11_button_map(); - } Self { - xdo, + xdo: unsafe { xdo_new(ptr::null()) }, delay: DEFAULT_DELAY, } } } - impl EnigoXdo { - /// Get the delay per keypress in microseconds. - /// - /// Default value is 12000 (12ms). This is Linux-specific. + /// Get the delay per keypress. + /// Default value is 12000. + /// This is Linux-specific. pub fn delay(&self) -> u64 { self.delay } - - /// Set the delay per keypress in microseconds. - /// - /// This is Linux-specific. The value is clamped to `u32::MAX` (approximately - /// 4295 seconds) because libxdo uses `useconds_t` which is typically `u32`. - /// - /// # Arguments - /// * `delay` - Delay in microseconds. Values exceeding `u32::MAX` will be clamped. + /// Set the delay per keypress. + /// This is Linux-specific. pub fn set_delay(&mut self, delay: u64) { - self.delay = delay.min(MAX_DELAY); - if delay > MAX_DELAY { - log::warn!( - "delay value {} exceeds maximum {}, clamped", - delay, - MAX_DELAY - ); - } + self.delay = delay; } } - impl Drop for EnigoXdo { fn drop(&mut self) { - if !self.xdo.is_null() { - unsafe { - libxdo_sys::xdo_free(self.xdo); - } + if self.xdo.is_null() { + return; + } + unsafe { + xdo_free(self.xdo); } } } - impl MouseControllable for EnigoXdo { fn as_any(&self) -> &dyn std::any::Any { self @@ -158,47 +115,42 @@ impl MouseControllable for EnigoXdo { return; } unsafe { - libxdo_sys::xdo_move_mouse(self.xdo as *const _, x, y, 0); + xdo_move_mouse(self.xdo, x as c_int, y as c_int, 0); } } - fn mouse_move_relative(&mut self, x: i32, y: i32) { if self.xdo.is_null() { return; } unsafe { - libxdo_sys::xdo_move_mouse_relative(self.xdo as *const _, x, y); + xdo_move_mouse_relative(self.xdo, x as c_int, y as c_int); } } - fn mouse_down(&mut self, button: MouseButton) -> crate::ResultType { if self.xdo.is_null() { return Ok(()); } unsafe { - libxdo_sys::xdo_mouse_down(self.xdo as *const _, CURRENTWINDOW, mousebutton(button)); + xdo_mouse_down(self.xdo, CURRENT_WINDOW, mousebutton(button)); } Ok(()) } - fn mouse_up(&mut self, button: MouseButton) { if self.xdo.is_null() { return; } unsafe { - libxdo_sys::xdo_mouse_up(self.xdo as *const _, CURRENTWINDOW, mousebutton(button)); + xdo_mouse_up(self.xdo, CURRENT_WINDOW, mousebutton(button)); } } - fn mouse_click(&mut self, button: MouseButton) { if self.xdo.is_null() { return; } unsafe { - libxdo_sys::xdo_click_window(self.xdo as *const _, CURRENTWINDOW, mousebutton(button)); + xdo_click_window(self.xdo, CURRENT_WINDOW, mousebutton(button)); } } - fn mouse_scroll_x(&mut self, length: i32) { let button; let mut length = length; @@ -217,7 +169,6 @@ impl MouseControllable for EnigoXdo { self.mouse_click(button); } } - fn mouse_scroll_y(&mut self, length: i32) { let button; let mut length = length; @@ -237,7 +188,6 @@ impl MouseControllable for EnigoXdo { } } } - fn keysequence<'a>(key: Key) -> Cow<'a, str> { if let Key::Layout(c) = key { return Cow::Owned(format!("U{:X}", c as u32)); @@ -334,7 +284,6 @@ fn keysequence<'a>(key: Key) -> Cow<'a, str> { _ => "", }) } - impl KeyboardControllable for EnigoXdo { fn as_any(&self) -> &dyn std::any::Any { self @@ -365,7 +314,7 @@ impl KeyboardControllable for EnigoXdo { let mod_alt = 1 << 3; let mod_numlock = 1 << 4; let mod_meta = 1 << 6; - let mask = unsafe { libxdo_sys::xdo_get_input_state(self.xdo as *const _) }; + let mask = unsafe { xdo_get_input_state(self.xdo) }; match key { Key::Shift => mask & mod_shift != 0, Key::CapsLock => mask & mod_lock != 0, @@ -383,59 +332,56 @@ impl KeyboardControllable for EnigoXdo { } if let Ok(string) = CString::new(sequence) { unsafe { - libxdo_sys::xdo_enter_text_window( - self.xdo as *const _, - CURRENTWINDOW, + xdo_enter_text_window( + self.xdo, + CURRENT_WINDOW, string.as_ptr(), - self.delay as libxdo_sys::useconds_t, + self.delay as useconds_t, ); } } } - fn key_down(&mut self, key: Key) -> crate::ResultType { if self.xdo.is_null() { return Ok(()); } let string = CString::new(&*keysequence(key))?; unsafe { - libxdo_sys::xdo_send_keysequence_window_down( - self.xdo as *const _, - CURRENTWINDOW, + xdo_send_keysequence_window_down( + self.xdo, + CURRENT_WINDOW, string.as_ptr(), - self.delay as libxdo_sys::useconds_t, + self.delay as useconds_t, ); } Ok(()) } - fn key_up(&mut self, key: Key) { if self.xdo.is_null() { return; } if let Ok(string) = CString::new(&*keysequence(key)) { unsafe { - libxdo_sys::xdo_send_keysequence_window_up( - self.xdo as *const _, - CURRENTWINDOW, + xdo_send_keysequence_window_up( + self.xdo, + CURRENT_WINDOW, string.as_ptr(), - self.delay as libxdo_sys::useconds_t, + self.delay as useconds_t, ); } } } - fn key_click(&mut self, key: Key) { if self.xdo.is_null() { return; } if let Ok(string) = CString::new(&*keysequence(key)) { unsafe { - libxdo_sys::xdo_send_keysequence_window( - self.xdo as *const _, - CURRENTWINDOW, + xdo_send_keysequence_window( + self.xdo, + CURRENT_WINDOW, string.as_ptr(), - self.delay as libxdo_sys::useconds_t, + self.delay as useconds_t, ); } } diff --git a/libs/enigo/src/macos/macos_impl.rs b/libs/enigo/src/macos/macos_impl.rs index 20f5d0cbf..d85f3576f 100644 --- a/libs/enigo/src/macos/macos_impl.rs +++ b/libs/enigo/src/macos/macos_impl.rs @@ -208,56 +208,42 @@ impl MouseControllable for Enigo { } fn mouse_move_to(&mut self, x: i32, y: i32) { - // For absolute movement, we don't set delta values - // This maintains backward compatibility - self.mouse_move_to_impl(x, y, None); + let pressed = Self::pressed_buttons(); + + let event_type = if pressed & 1 > 0 { + CGEventType::LeftMouseDragged + } else if pressed & 2 > 0 { + CGEventType::RightMouseDragged + } else { + CGEventType::MouseMoved + }; + + let dest = CGPoint::new(x as f64, y as f64); + if let Some(src) = self.event_source.as_ref() { + if let Ok(event) = + CGEvent::new_mouse_event(src.clone(), event_type, dest, CGMouseButton::Left) + { + self.post(event, None); + } + } } fn mouse_move_relative(&mut self, x: i32, y: i32) { let (display_width, display_height) = Self::main_display_size(); let (current_x, y_inv) = Self::mouse_location_raw_coords(); let current_y = (display_height as i32) - y_inv; - // Use saturating arithmetic to prevent overflow/wraparound - let mut new_x = current_x.saturating_add(x); - let mut new_y = current_y.saturating_add(y); + let new_x = current_x + x; + let new_y = current_y + y; - // Define screen center and edge margins for cursor reset - let center_x = (display_width / 2) as i32; - let center_y = (display_height / 2) as i32; - // Margin calculation: 5% of the smaller screen dimension with a minimum of 50px. - // This provides a comfortable buffer zone to detect when the cursor is approaching - // screen edges, allowing us to reset it to center before it hits the boundary. - // This ensures continuous relative mouse movement without getting stuck at edges. - let margin = (display_width.min(display_height) / 20).max(50) as i32; - - // Check if cursor is approaching screen boundaries - // Use saturating_sub to prevent negative thresholds on very small displays - let right = (display_width as i32).saturating_sub(margin); - let bottom = (display_height as i32).saturating_sub(margin); - let near_edge = new_x < margin - || new_x > right - || new_y < margin - || new_y > bottom; - - if near_edge { - // Reset cursor to screen center to allow continuous movement - // The delta values are still passed correctly for games/apps - new_x = center_x; - new_y = center_y; + if new_x < 0 + || new_x as usize > display_width + || new_y < 0 + || new_y as usize > display_height + { + return; } - // Clamp to screen bounds as a safety measure. - // Use saturating_sub(1) to ensure coordinates don't exceed the last valid pixel. - let max_x = (display_width as i32).saturating_sub(1).max(0); - let max_y = (display_height as i32).saturating_sub(1).max(0); - new_x = new_x.clamp(0, max_x); - new_y = new_y.clamp(0, max_y); - - // Pass delta values for relative movement - // This is critical for browser Pointer Lock API support - // The delta fields (MOUSE_EVENT_DELTA_X/Y) are used by browsers - // to calculate movementX/Y in Pointer Lock mode - self.mouse_move_to_impl(new_x, new_y, Some((x, y))); + self.mouse_move_to(new_x, new_y); } fn mouse_down(&mut self, button: MouseButton) -> crate::ResultType { @@ -487,43 +473,6 @@ impl Enigo { } } - /// Internal implementation for mouse movement with optional delta values. - /// - /// The `delta` parameter is crucial for browser Pointer Lock API support. - /// When a browser enters Pointer Lock mode, it reads mouse delta values - /// (MOUSE_EVENT_DELTA_X/Y) directly from CGEvent to calculate movementX/Y. - /// Without setting these fields, the browser sees zero movement. - fn mouse_move_to_impl(&mut self, x: i32, y: i32, delta: Option<(i32, i32)>) { - let pressed = Self::pressed_buttons(); - - // Determine event type and corresponding mouse button based on pressed buttons. - // The CGMouseButton must match the event type for drag events. - let (event_type, button) = if pressed & 1 > 0 { - (CGEventType::LeftMouseDragged, CGMouseButton::Left) - } else if pressed & 2 > 0 { - (CGEventType::RightMouseDragged, CGMouseButton::Right) - } else if pressed & 4 > 0 { - (CGEventType::OtherMouseDragged, CGMouseButton::Center) - } else { - (CGEventType::MouseMoved, CGMouseButton::Left) // Button doesn't matter for MouseMoved - }; - - let dest = CGPoint::new(x as f64, y as f64); - if let Some(src) = self.event_source.as_ref() { - if let Ok(event) = - CGEvent::new_mouse_event(src.clone(), event_type, dest, button) - { - // Set delta fields for relative mouse movement - // This is essential for Pointer Lock API in browsers - if let Some((dx, dy)) = delta { - event.set_integer_value_field(EventField::MOUSE_EVENT_DELTA_X, dx as i64); - event.set_integer_value_field(EventField::MOUSE_EVENT_DELTA_Y, dy as i64); - } - self.post(event, None); - } - } - } - /// Fetches the `(width, height)` in pixels of the main display pub fn main_display_size() -> (usize, usize) { let display_id = unsafe { CGMainDisplayID() }; diff --git a/libs/enigo/src/win/win_impl.rs b/libs/enigo/src/win/win_impl.rs index a6b465ea1..882dba126 100644 --- a/libs/enigo/src/win/win_impl.rs +++ b/libs/enigo/src/win/win_impl.rs @@ -269,7 +269,7 @@ impl KeyboardControllable for Enigo { for pos in 0..mod_len { let rpos = mod_len - 1 - pos; if flag & (0x0001 << rpos) != 0 { - self.key_up(modifiers[rpos]); + self.key_up(modifiers[pos]); } } @@ -298,18 +298,7 @@ impl KeyboardControllable for Enigo { } fn key_up(&mut self, key: Key) { - match key { - Key::Layout(c) => { - let code = self.get_layoutdependent_keycode(c); - if code as u16 != 0xFFFF { - let vk = code & 0x00FF; - keybd_event(KEYEVENTF_KEYUP, vk, 0); - } - } - _ => { - keybd_event(KEYEVENTF_KEYUP, self.key_to_keycode(key), 0); - } - } + keybd_event(KEYEVENTF_KEYUP, self.key_to_keycode(key), 0); } fn get_key_state(&mut self, key: Key) -> bool { diff --git a/libs/hbb_common b/libs/hbb_common index 9043c15ac..f850a167a 160000 --- a/libs/hbb_common +++ b/libs/hbb_common @@ -1 +1 @@ -Subproject commit 9043c15acc6d5b42b6c12ad284c16c1ec172f1f0 +Subproject commit f850a167ac403444451cf90c64d39fa6d3a58e1a diff --git a/libs/libxdo-sys-stub/Cargo.toml b/libs/libxdo-sys-stub/Cargo.toml deleted file mode 100644 index 0b52cfb63..000000000 --- a/libs/libxdo-sys-stub/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "libxdo-sys" -version = "0.11.0" -edition = "2021" -publish = false -description = "Dynamic loading wrapper for libxdo-sys that doesn't require libxdo at compile/link time" - -[dependencies] -hbb_common = { path = "../hbb_common" } diff --git a/libs/libxdo-sys-stub/src/lib.rs b/libs/libxdo-sys-stub/src/lib.rs deleted file mode 100644 index 53d0e099c..000000000 --- a/libs/libxdo-sys-stub/src/lib.rs +++ /dev/null @@ -1,505 +0,0 @@ -//! Dynamic loading wrapper for libxdo. -//! -//! Provides the same API as libxdo-sys but loads libxdo at runtime, -//! allowing the program to run on systems without libxdo installed -//! (e.g., Wayland-only environments). - -use hbb_common::{ - libc::{c_char, c_int, c_uint}, - libloading::{Library, Symbol}, - log, -}; -use std::sync::OnceLock; - -pub use hbb_common::x11::xlib::{Display, Screen, Window}; - -#[repr(C)] -pub struct xdo_t { - _private: [u8; 0], -} - -#[repr(C)] -pub struct charcodemap_t { - _private: [u8; 0], -} - -#[repr(C)] -pub struct xdo_search_t { - _private: [u8; 0], -} - -pub type useconds_t = c_uint; - -pub const CURRENTWINDOW: Window = 0; - -type FnXdoNew = unsafe extern "C" fn(*const c_char) -> *mut xdo_t; -type FnXdoNewWithOpenedDisplay = - unsafe extern "C" fn(*mut Display, *const c_char, c_int) -> *mut xdo_t; -type FnXdoFree = unsafe extern "C" fn(*mut xdo_t); -type FnXdoSendKeysequenceWindow = - unsafe extern "C" fn(*const xdo_t, Window, *const c_char, useconds_t) -> c_int; -type FnXdoSendKeysequenceWindowDown = - unsafe extern "C" fn(*const xdo_t, Window, *const c_char, useconds_t) -> c_int; -type FnXdoSendKeysequenceWindowUp = - unsafe extern "C" fn(*const xdo_t, Window, *const c_char, useconds_t) -> c_int; -type FnXdoEnterTextWindow = - unsafe extern "C" fn(*const xdo_t, Window, *const c_char, useconds_t) -> c_int; -type FnXdoClickWindow = unsafe extern "C" fn(*const xdo_t, Window, c_int) -> c_int; -type FnXdoMouseDown = unsafe extern "C" fn(*const xdo_t, Window, c_int) -> c_int; -type FnXdoMouseUp = unsafe extern "C" fn(*const xdo_t, Window, c_int) -> c_int; -type FnXdoMoveMouse = unsafe extern "C" fn(*const xdo_t, c_int, c_int, c_int) -> c_int; -type FnXdoMoveMouseRelative = unsafe extern "C" fn(*const xdo_t, c_int, c_int) -> c_int; -type FnXdoMoveMouseRelativeToWindow = - unsafe extern "C" fn(*const xdo_t, Window, c_int, c_int) -> c_int; -type FnXdoGetMouseLocation = - unsafe extern "C" fn(*const xdo_t, *mut c_int, *mut c_int, *mut c_int) -> c_int; -type FnXdoGetMouseLocation2 = - unsafe extern "C" fn(*const xdo_t, *mut c_int, *mut c_int, *mut c_int, *mut Window) -> c_int; -type FnXdoGetActiveWindow = unsafe extern "C" fn(*const xdo_t, *mut Window) -> c_int; -type FnXdoGetFocusedWindow = unsafe extern "C" fn(*const xdo_t, *mut Window) -> c_int; -type FnXdoGetFocusedWindowSane = unsafe extern "C" fn(*const xdo_t, *mut Window) -> c_int; -type FnXdoGetWindowLocation = - unsafe extern "C" fn(*const xdo_t, Window, *mut c_int, *mut c_int, *mut *mut Screen) -> c_int; -type FnXdoGetWindowSize = - unsafe extern "C" fn(*const xdo_t, Window, *mut c_uint, *mut c_uint) -> c_int; -type FnXdoGetInputState = unsafe extern "C" fn(*const xdo_t) -> c_uint; -type FnXdoActivateWindow = unsafe extern "C" fn(*const xdo_t, Window) -> c_int; -type FnXdoWaitForMouseMoveFrom = unsafe extern "C" fn(*const xdo_t, c_int, c_int) -> c_int; -type FnXdoWaitForMouseMoveTo = unsafe extern "C" fn(*const xdo_t, c_int, c_int) -> c_int; -type FnXdoSetWindowClass = - unsafe extern "C" fn(*const xdo_t, Window, *const c_char, *const c_char) -> c_int; -type FnXdoSearchWindows = - unsafe extern "C" fn(*const xdo_t, *const xdo_search_t, *mut *mut Window, *mut c_uint) -> c_int; - -struct XdoLib { - _lib: Library, - xdo_new: FnXdoNew, - xdo_new_with_opened_display: Option, - xdo_free: FnXdoFree, - xdo_send_keysequence_window: FnXdoSendKeysequenceWindow, - xdo_send_keysequence_window_down: Option, - xdo_send_keysequence_window_up: Option, - xdo_enter_text_window: Option, - xdo_click_window: Option, - xdo_mouse_down: Option, - xdo_mouse_up: Option, - xdo_move_mouse: Option, - xdo_move_mouse_relative: Option, - xdo_move_mouse_relative_to_window: Option, - xdo_get_mouse_location: Option, - xdo_get_mouse_location2: Option, - xdo_get_active_window: Option, - xdo_get_focused_window: Option, - xdo_get_focused_window_sane: Option, - xdo_get_window_location: Option, - xdo_get_window_size: Option, - xdo_get_input_state: Option, - xdo_activate_window: Option, - xdo_wait_for_mouse_move_from: Option, - xdo_wait_for_mouse_move_to: Option, - xdo_set_window_class: Option, - xdo_search_windows: Option, -} - -impl XdoLib { - fn load() -> Option { - // https://github.com/rustdesk/rustdesk/issues/13711 - const LIB_NAMES: [&str; 3] = ["libxdo.so.4", "libxdo.so.3", "libxdo.so"]; - - unsafe { - let (lib, lib_name) = LIB_NAMES - .iter() - .find_map(|name| Library::new(name).ok().map(|lib| (lib, *name)))?; - - log::info!("libxdo-sys Loaded {}", lib_name); - - let xdo_new: FnXdoNew = *lib.get(b"xdo_new").ok()?; - let xdo_free: FnXdoFree = *lib.get(b"xdo_free").ok()?; - let xdo_send_keysequence_window: FnXdoSendKeysequenceWindow = - *lib.get(b"xdo_send_keysequence_window").ok()?; - - let xdo_new_with_opened_display = lib - .get(b"xdo_new_with_opened_display") - .ok() - .map(|s: Symbol| *s); - let xdo_send_keysequence_window_down = lib - .get(b"xdo_send_keysequence_window_down") - .ok() - .map(|s: Symbol| *s); - let xdo_send_keysequence_window_up = lib - .get(b"xdo_send_keysequence_window_up") - .ok() - .map(|s: Symbol| *s); - let xdo_enter_text_window = lib - .get(b"xdo_enter_text_window") - .ok() - .map(|s: Symbol| *s); - let xdo_click_window = lib - .get(b"xdo_click_window") - .ok() - .map(|s: Symbol| *s); - let xdo_mouse_down = lib - .get(b"xdo_mouse_down") - .ok() - .map(|s: Symbol| *s); - let xdo_mouse_up = lib - .get(b"xdo_mouse_up") - .ok() - .map(|s: Symbol| *s); - let xdo_move_mouse = lib - .get(b"xdo_move_mouse") - .ok() - .map(|s: Symbol| *s); - let xdo_move_mouse_relative = lib - .get(b"xdo_move_mouse_relative") - .ok() - .map(|s: Symbol| *s); - let xdo_move_mouse_relative_to_window = lib - .get(b"xdo_move_mouse_relative_to_window") - .ok() - .map(|s: Symbol| *s); - let xdo_get_mouse_location = lib - .get(b"xdo_get_mouse_location") - .ok() - .map(|s: Symbol| *s); - let xdo_get_mouse_location2 = lib - .get(b"xdo_get_mouse_location2") - .ok() - .map(|s: Symbol| *s); - let xdo_get_active_window = lib - .get(b"xdo_get_active_window") - .ok() - .map(|s: Symbol| *s); - let xdo_get_focused_window = lib - .get(b"xdo_get_focused_window") - .ok() - .map(|s: Symbol| *s); - let xdo_get_focused_window_sane = lib - .get(b"xdo_get_focused_window_sane") - .ok() - .map(|s: Symbol| *s); - let xdo_get_window_location = lib - .get(b"xdo_get_window_location") - .ok() - .map(|s: Symbol| *s); - let xdo_get_window_size = lib - .get(b"xdo_get_window_size") - .ok() - .map(|s: Symbol| *s); - let xdo_get_input_state = lib - .get(b"xdo_get_input_state") - .ok() - .map(|s: Symbol| *s); - let xdo_activate_window = lib - .get(b"xdo_activate_window") - .ok() - .map(|s: Symbol| *s); - let xdo_wait_for_mouse_move_from = lib - .get(b"xdo_wait_for_mouse_move_from") - .ok() - .map(|s: Symbol| *s); - let xdo_wait_for_mouse_move_to = lib - .get(b"xdo_wait_for_mouse_move_to") - .ok() - .map(|s: Symbol| *s); - let xdo_set_window_class = lib - .get(b"xdo_set_window_class") - .ok() - .map(|s: Symbol| *s); - let xdo_search_windows = lib - .get(b"xdo_search_windows") - .ok() - .map(|s: Symbol| *s); - - Some(Self { - _lib: lib, - xdo_new, - xdo_new_with_opened_display, - xdo_free, - xdo_send_keysequence_window, - xdo_send_keysequence_window_down, - xdo_send_keysequence_window_up, - xdo_enter_text_window, - xdo_click_window, - xdo_mouse_down, - xdo_mouse_up, - xdo_move_mouse, - xdo_move_mouse_relative, - xdo_move_mouse_relative_to_window, - xdo_get_mouse_location, - xdo_get_mouse_location2, - xdo_get_active_window, - xdo_get_focused_window, - xdo_get_focused_window_sane, - xdo_get_window_location, - xdo_get_window_size, - xdo_get_input_state, - xdo_activate_window, - xdo_wait_for_mouse_move_from, - xdo_wait_for_mouse_move_to, - xdo_set_window_class, - xdo_search_windows, - }) - } - } -} - -static XDO_LIB: OnceLock> = OnceLock::new(); - -fn get_lib() -> Option<&'static XdoLib> { - XDO_LIB - .get_or_init(|| { - let lib = XdoLib::load(); - if lib.is_none() { - log::info!("libxdo-sys libxdo not found, xdo functions will be disabled"); - } - lib - }) - .as_ref() -} - -pub unsafe extern "C" fn xdo_new(display: *const c_char) -> *mut xdo_t { - get_lib().map_or(std::ptr::null_mut(), |lib| (lib.xdo_new)(display)) -} - -pub unsafe extern "C" fn xdo_new_with_opened_display( - xdpy: *mut Display, - display: *const c_char, - close_display_when_freed: c_int, -) -> *mut xdo_t { - get_lib() - .and_then(|lib| lib.xdo_new_with_opened_display) - .map_or(std::ptr::null_mut(), |f| { - f(xdpy, display, close_display_when_freed) - }) -} - -pub unsafe extern "C" fn xdo_free(xdo: *mut xdo_t) { - if xdo.is_null() { - return; - } - if let Some(lib) = get_lib() { - (lib.xdo_free)(xdo); - } -} - -pub unsafe extern "C" fn xdo_send_keysequence_window( - xdo: *const xdo_t, - window: Window, - keysequence: *const c_char, - delay: useconds_t, -) -> c_int { - get_lib().map_or(1, |lib| { - (lib.xdo_send_keysequence_window)(xdo, window, keysequence, delay) - }) -} - -pub unsafe extern "C" fn xdo_send_keysequence_window_down( - xdo: *const xdo_t, - window: Window, - keysequence: *const c_char, - delay: useconds_t, -) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_send_keysequence_window_down) - .map_or(1, |f| f(xdo, window, keysequence, delay)) -} - -pub unsafe extern "C" fn xdo_send_keysequence_window_up( - xdo: *const xdo_t, - window: Window, - keysequence: *const c_char, - delay: useconds_t, -) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_send_keysequence_window_up) - .map_or(1, |f| f(xdo, window, keysequence, delay)) -} - -pub unsafe extern "C" fn xdo_enter_text_window( - xdo: *const xdo_t, - window: Window, - string: *const c_char, - delay: useconds_t, -) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_enter_text_window) - .map_or(1, |f| f(xdo, window, string, delay)) -} - -pub unsafe extern "C" fn xdo_click_window( - xdo: *const xdo_t, - window: Window, - button: c_int, -) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_click_window) - .map_or(1, |f| f(xdo, window, button)) -} - -pub unsafe extern "C" fn xdo_mouse_down(xdo: *const xdo_t, window: Window, button: c_int) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_mouse_down) - .map_or(1, |f| f(xdo, window, button)) -} - -pub unsafe extern "C" fn xdo_mouse_up(xdo: *const xdo_t, window: Window, button: c_int) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_mouse_up) - .map_or(1, |f| f(xdo, window, button)) -} - -pub unsafe extern "C" fn xdo_move_mouse( - xdo: *const xdo_t, - x: c_int, - y: c_int, - screen: c_int, -) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_move_mouse) - .map_or(1, |f| f(xdo, x, y, screen)) -} - -pub unsafe extern "C" fn xdo_move_mouse_relative(xdo: *const xdo_t, x: c_int, y: c_int) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_move_mouse_relative) - .map_or(1, |f| f(xdo, x, y)) -} - -pub unsafe extern "C" fn xdo_move_mouse_relative_to_window( - xdo: *const xdo_t, - window: Window, - x: c_int, - y: c_int, -) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_move_mouse_relative_to_window) - .map_or(1, |f| f(xdo, window, x, y)) -} - -pub unsafe extern "C" fn xdo_get_mouse_location( - xdo: *const xdo_t, - x: *mut c_int, - y: *mut c_int, - screen_num: *mut c_int, -) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_get_mouse_location) - .map_or(1, |f| f(xdo, x, y, screen_num)) -} - -pub unsafe extern "C" fn xdo_get_mouse_location2( - xdo: *const xdo_t, - x: *mut c_int, - y: *mut c_int, - screen_num: *mut c_int, - window: *mut Window, -) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_get_mouse_location2) - .map_or(1, |f| f(xdo, x, y, screen_num, window)) -} - -pub unsafe extern "C" fn xdo_get_active_window( - xdo: *const xdo_t, - window_ret: *mut Window, -) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_get_active_window) - .map_or(1, |f| f(xdo, window_ret)) -} - -pub unsafe extern "C" fn xdo_get_focused_window( - xdo: *const xdo_t, - window_ret: *mut Window, -) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_get_focused_window) - .map_or(1, |f| f(xdo, window_ret)) -} - -pub unsafe extern "C" fn xdo_get_focused_window_sane( - xdo: *const xdo_t, - window_ret: *mut Window, -) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_get_focused_window_sane) - .map_or(1, |f| f(xdo, window_ret)) -} - -pub unsafe extern "C" fn xdo_get_window_location( - xdo: *const xdo_t, - window: Window, - x: *mut c_int, - y: *mut c_int, - screen_ret: *mut *mut Screen, -) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_get_window_location) - .map_or(1, |f| f(xdo, window, x, y, screen_ret)) -} - -pub unsafe extern "C" fn xdo_get_window_size( - xdo: *const xdo_t, - window: Window, - width: *mut c_uint, - height: *mut c_uint, -) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_get_window_size) - .map_or(1, |f| f(xdo, window, width, height)) -} - -pub unsafe extern "C" fn xdo_get_input_state(xdo: *const xdo_t) -> c_uint { - get_lib() - .and_then(|lib| lib.xdo_get_input_state) - .map_or(0, |f| f(xdo)) -} - -pub unsafe extern "C" fn xdo_activate_window(xdo: *const xdo_t, wid: Window) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_activate_window) - .map_or(1, |f| f(xdo, wid)) -} - -pub unsafe extern "C" fn xdo_wait_for_mouse_move_from( - xdo: *const xdo_t, - origin_x: c_int, - origin_y: c_int, -) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_wait_for_mouse_move_from) - .map_or(1, |f| f(xdo, origin_x, origin_y)) -} - -pub unsafe extern "C" fn xdo_wait_for_mouse_move_to( - xdo: *const xdo_t, - dest_x: c_int, - dest_y: c_int, -) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_wait_for_mouse_move_to) - .map_or(1, |f| f(xdo, dest_x, dest_y)) -} - -pub unsafe extern "C" fn xdo_set_window_class( - xdo: *const xdo_t, - wid: Window, - name: *const c_char, - class: *const c_char, -) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_set_window_class) - .map_or(1, |f| f(xdo, wid, name, class)) -} - -pub unsafe extern "C" fn xdo_search_windows( - xdo: *const xdo_t, - search: *const xdo_search_t, - windowlist_ret: *mut *mut Window, - nwindows_ret: *mut c_uint, -) -> c_int { - get_lib() - .and_then(|lib| lib.xdo_search_windows) - .map_or(1, |f| f(xdo, search, windowlist_ret, nwindows_ret)) -} diff --git a/libs/portable/Cargo.toml b/libs/portable/Cargo.toml index 184079be8..2855b3cb6 100644 --- a/libs/portable/Cargo.toml +++ b/libs/portable/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustdesk-portable-packer" -version = "1.4.6" +version = "1.4.0" edition = "2021" description = "RustDesk Remote Desktop" @@ -15,14 +15,6 @@ md5 = "0.7" winapi = { version = "0.3", features = ["winbase"] } [target.'cfg(target_os = "windows")'.dependencies] -windows = { version = "0.61", features = [ - "Wdk", - "Wdk_System", - "Wdk_System_SystemServices", - "Win32", - "Win32_System", - "Win32_System_SystemInformation", -] } native-windows-gui = {version = "1.0", default-features = false, features = ["animation-timer", "image-decoder"]} [package.metadata.winres] diff --git a/libs/portable/src/main.rs b/libs/portable/src/main.rs index b7ff44ec5..87d4897c2 100644 --- a/libs/portable/src/main.rs +++ b/libs/portable/src/main.rs @@ -92,46 +92,12 @@ fn setup( } write_meta(&dir, ts); #[cfg(windows)] - win::copy_runtime_broker(&dir); + windows::copy_runtime_broker(&dir); #[cfg(linux)] reader.configure_permission(&dir); Some(dir.join(&reader.exe)) } -fn use_null_stdio() -> bool { - #[cfg(windows)] - { - // When running in CMD on Windows 7, using Stdio::inherit() with spawn returns an "invalid handle" error. - // Since using Stdio::null() didn’t cause any issues, and determining whether the program is launched from CMD or by double-clicking would require calling more APIs during startup, we also use Stdio::null() when launched by double-clicking on Windows 7. - let is_windows_7 = is_windows_7(); - println!("is windows7: {}", is_windows_7); - return is_windows_7; - } - #[cfg(not(windows))] - false -} - -#[cfg(windows)] -fn is_windows_7() -> bool { - use windows::Wdk::System::SystemServices::RtlGetVersion; - use windows::Win32::System::SystemInformation::OSVERSIONINFOW; - - unsafe { - let mut version_info = OSVERSIONINFOW::default(); - version_info.dwOSVersionInfoSize = std::mem::size_of::() as u32; - - if RtlGetVersion(&mut version_info).is_ok() { - // Windows 7 is version 6.1 - println!( - "Windows version: {}.{}", - version_info.dwMajorVersion, version_info.dwMinorVersion - ); - return version_info.dwMajorVersion == 6 && version_info.dwMinorVersion == 1; - } - } - false -} - fn execute(path: PathBuf, args: Vec, _ui: bool) { println!("executing {}", path.display()); // setup env @@ -148,18 +114,12 @@ fn execute(path: PathBuf, args: Vec, _ui: bool) { cmd.env(SET_FOREGROUND_WINDOW_ENV_KEY, "1"); } } - - cmd.env(APPNAME_RUNTIME_ENV_KEY, exe_name); - if use_null_stdio() { - cmd.stdin(Stdio::null()) - .stdout(Stdio::null()) - .stderr(Stdio::null()); - } else { - cmd.stdin(Stdio::inherit()) - .stdout(Stdio::inherit()) - .stderr(Stdio::inherit()); - } - let _child = cmd.spawn(); + let _child = cmd + .env(APPNAME_RUNTIME_ENV_KEY, exe_name) + .stdin(Stdio::inherit()) + .stdout(Stdio::inherit()) + .stderr(Stdio::inherit()) + .spawn(); #[cfg(windows)] if _ui { @@ -187,10 +147,7 @@ fn main() { i += 1; } let click_setup = args.is_empty() && arg_exe.to_lowercase().ends_with("install.exe"); - #[cfg(windows)] - let quick_support = args.is_empty() && win::is_quick_support_exe(&arg_exe); - #[cfg(not(windows))] - let quick_support = false; + let quick_support = args.is_empty() && arg_exe.to_lowercase().ends_with("qs.exe"); let mut ui = false; let reader = BinaryReader::default(); @@ -211,7 +168,7 @@ fn main() { } #[cfg(windows)] -mod win { +mod windows { use std::{fs, os::windows::process::CommandExt, path::Path, process::Command}; // Used for privacy mode(magnifier impl). @@ -237,12 +194,4 @@ mod win { .output(); let _allow_err = std::fs::copy(src, &format!("{}\\{}", dir.to_string_lossy(), tgt)); } - - /// Check if the executable is a Quick Support version. - /// Note: This function must be kept in sync with `src/core_main.rs`. - #[inline] - pub(super) fn is_quick_support_exe(exe: &str) -> bool { - let exe = exe.to_lowercase(); - exe.contains("-qs-") || exe.contains("-qs.exe") || exe.contains("_qs.exe") - } } diff --git a/libs/remote_printer/src/setup/mod.rs b/libs/remote_printer/src/setup/mod.rs index 562a7300f..ddf386de3 100644 --- a/libs/remote_printer/src/setup/mod.rs +++ b/libs/remote_printer/src/setup/mod.rs @@ -1,5 +1,3 @@ -#![allow(non_snake_case)] - use hbb_common::{bail, ResultType}; use std::{io, ptr::null_mut}; use winapi::{ diff --git a/libs/scrap/Cargo.toml b/libs/scrap/Cargo.toml index 505eca2de..16196d11f 100644 --- a/libs/scrap/Cargo.toml +++ b/libs/scrap/Cargo.toml @@ -10,7 +10,7 @@ authors = ["Ram "] edition = "2018" [features] -wayland = ["gstreamer", "gstreamer-app", "gstreamer-video", "dbus", "tracing", "zbus"] +wayland = ["gstreamer", "gstreamer-app", "gstreamer-video", "dbus", "tracing"] mediacodec = ["ndk"] linux-pkg-config = ["dep:pkg-config"] hwcodec = ["dep:hwcodec"] @@ -57,7 +57,6 @@ tracing = { version = "0.1", optional = true } gstreamer = { version = "0.16", optional = true } gstreamer-app = { version = "0.16", features = ["v1_10"], optional = true } gstreamer-video = { version = "0.16", optional = true } -zbus = { version = "3.15", optional = true } [dependencies.hwcodec] git = "https://github.com/rustdesk-org/hwcodec" diff --git a/libs/scrap/build.rs b/libs/scrap/build.rs index 73765055d..0c0cd274e 100644 --- a/libs/scrap/build.rs +++ b/libs/scrap/build.rs @@ -62,15 +62,21 @@ fn link_vcpkg(mut path: PathBuf, name: &str) -> PathBuf { } path.push(target); println!( - "cargo:rustc-link-lib=static={}", - name.trim_start_matches("lib") + "{}", + format!( + "cargo:rustc-link-lib=static={}", + name.trim_start_matches("lib") + ) ); println!( - "cargo:rustc-link-search={}", - path.join("lib").to_str().unwrap() + "{}", + format!( + "cargo:rustc-link-search={}", + path.join("lib").to_str().unwrap() + ) ); let include = path.join("include"); - println!("cargo:include={}", include.to_str().unwrap()); + println!("{}", format!("cargo:include={}", include.to_str().unwrap())); include } @@ -105,17 +111,23 @@ fn link_homebrew_m1(name: &str) -> PathBuf { path.push(directories.pop().unwrap()); // Link the library. println!( - "cargo:rustc-link-lib=static={}", - name.trim_start_matches("lib") + "{}", + format!( + "cargo:rustc-link-lib=static={}", + name.trim_start_matches("lib") + ) ); // Add the library path. println!( - "cargo:rustc-link-search={}", - path.join("lib").to_str().unwrap() + "{}", + format!( + "cargo:rustc-link-search={}", + path.join("lib").to_str().unwrap() + ) ); // Add the include path. let include = path.join("include"); - println!("cargo:include={}", include.to_str().unwrap()); + println!("{}", format!("cargo:include={}", include.to_str().unwrap())); include } @@ -227,12 +239,6 @@ fn ffmpeg() { */ fn main() { - // in this crate, these are also valid configurations - println!("cargo:rustc-check-cfg=cfg(dxgi,quartz,x11)"); - - // there is problem with cfg(target_os) in build.rs, so use our workaround - let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap(); - // note: all link symbol names in x86 (32-bit) are prefixed wth "_". // run "rustup show" to show current default toolchain, if it is stable-x86-pc-windows-msvc, // please install x64 toolchain by "rustup toolchain install stable-x86_64-pc-windows-msvc", @@ -250,6 +256,8 @@ fn main() { gen_vcpkg_package("libyuv", "yuv_ffi.h", "yuv_ffi.rs", ".*"); // ffmpeg(); + // there is problem with cfg(target_os) in build.rs, so use our workaround + let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap(); if target_os == "ios" { // nothing } else if target_os == "android" { diff --git a/libs/scrap/src/android/ffi.rs b/libs/scrap/src/android/ffi.rs index 2c891a932..7433e6b09 100644 --- a/libs/scrap/src/android/ffi.rs +++ b/libs/scrap/src/android/ffi.rs @@ -22,7 +22,6 @@ use std::time::{Duration, Instant}; lazy_static! { static ref JVM: RwLock> = RwLock::new(None); static ref MAIN_SERVICE_CTX: RwLock> = RwLock::new(None); // MainService -> video service / audio service / info - static ref APPLICATION_CONTEXT: RwLock> = RwLock::new(None); static ref VIDEO_RAW: Mutex = Mutex::new(FrameRaw::new("video", MAX_VIDEO_FRAME_TIMEOUT)); static ref AUDIO_RAW: Mutex = Mutex::new(FrameRaw::new("audio", MAX_AUDIO_FRAME_TIMEOUT)); static ref NDK_CONTEXT_INITED: Mutex = Default::default(); @@ -463,23 +462,6 @@ fn init_ndk_context(java_vm: *mut c_void, context_jobject: *mut c_void) { *lock = true; } -fn try_init_rustls_platform_verifier(env: &mut JNIEnv, context_jobject: *mut c_void) { - use hbb_common::config::ANDROID_RUSTLS_PLATFORM_VERIFIER_INITIALIZED as INITIALIZED; - use std::sync::atomic::Ordering; - let initialized = INITIALIZED.load(Ordering::Relaxed); - if !initialized { - let ctx_for_rustls = unsafe { JObject::from_raw(context_jobject as jni::sys::jobject) }; - if let Err(e) = - hbb_common::rustls_platform_verifier::android::init_hosted(env, ctx_for_rustls) - { - log::error!("Failed to initialize rustls-platform-verifier: {:?}", e); - } else { - INITIALIZED.store(true, Ordering::Relaxed); - log::info!("rustls-platform-verifier initialized successfully"); - } - } -} - // https://cjycode.com/flutter_rust_bridge/guides/how-to/ndk-init #[no_mangle] pub extern "C" fn JNI_OnLoad(vm: jni::JavaVM, res: *mut std::os::raw::c_void) -> jni::sys::jint { @@ -489,23 +471,3 @@ pub extern "C" fn JNI_OnLoad(vm: jni::JavaVM, res: *mut std::os::raw::c_void) -> } jni::JNIVersion::V6.into() } - -#[no_mangle] -pub extern "system" fn Java_ffi_FFI_onAppStart(mut env: JNIEnv, _class: JClass, ctx: JObject) { - if ctx.is_null() { - log::error!("application context is null"); - return; - } - if APPLICATION_CONTEXT.read().unwrap().is_some() { - log::info!("application context already initialized"); - return; - } - if let Ok(jvm) = env.get_java_vm() { - if let Ok(context) = env.new_global_ref(ctx) { - let java_vm = jvm.get_java_vm_pointer() as *mut c_void; - let context_jobject = context.as_obj().as_raw() as *mut c_void; - *APPLICATION_CONTEXT.write().unwrap() = Some(context); - try_init_rustls_platform_verifier(&mut env, context_jobject); - } - } -} diff --git a/libs/scrap/src/common/aom.rs b/libs/scrap/src/common/aom.rs index e5093e54b..4bf17a2fe 100644 --- a/libs/scrap/src/common/aom.rs +++ b/libs/scrap/src/common/aom.rs @@ -287,7 +287,7 @@ impl EncoderApi for AomEncoder { } impl AomEncoder { - pub fn encode<'a>(&'a mut self, ms: i64, data: &[u8], stride_align: usize) -> Result> { + pub fn encode(&mut self, ms: i64, data: &[u8], stride_align: usize) -> Result { let bpp = if self.i444 { 24 } else { 12 }; if data.len() < self.width * self.height * bpp / 8 { return Err(Error::FailedCall("len not enough".to_string())); @@ -461,7 +461,7 @@ impl AomDecoder { Ok(Self { ctx }) } - pub fn decode<'a>(&'a mut self, data: &[u8]) -> Result> { + pub fn decode(&mut self, data: &[u8]) -> Result { call_aom!(aom_codec_decode( &mut self.ctx, data.as_ptr(), @@ -476,7 +476,7 @@ impl AomDecoder { } /// Notify the decoder to return any pending frame - pub fn flush<'a>(&'a mut self) -> Result> { + pub fn flush(&mut self) -> Result { call_aom!(aom_codec_decode( &mut self.ctx, ptr::null(), diff --git a/libs/scrap/src/common/camera.rs b/libs/scrap/src/common/camera.rs index ea259bdc1..da5d62613 100644 --- a/libs/scrap/src/common/camera.rs +++ b/libs/scrap/src/common/camera.rs @@ -17,9 +17,7 @@ use hbb_common::message_proto::{DisplayInfo, Resolution}; use crate::AdapterDevice; use crate::common::{bail, ResultType}; -use crate::{Frame, TraitCapturer}; -#[cfg(any(target_os = "windows", target_os = "linux"))] -use crate::{PixelBuffer, Pixfmt}; +use crate::{Frame, PixelBuffer, Pixfmt, TraitCapturer}; pub const PRIMARY_CAMERA_IDX: usize = 0; lazy_static::lazy_static! { @@ -164,11 +162,11 @@ impl Cameras { return Ok(Vec::new()); } - pub fn exists(_index: usize) -> bool { + pub fn exists(index: usize) -> bool { false } - pub fn get_camera_resolution(_index: usize) -> ResultType { + pub fn get_camera_resolution(index: usize) -> ResultType { bail!(CAMERA_NOT_SUPPORTED); } @@ -176,7 +174,7 @@ impl Cameras { vec![] } - pub fn get_capturer(_current: usize) -> ResultType> { + pub fn get_capturer(current: usize) -> ResultType> { bail!(CAMERA_NOT_SUPPORTED); } } @@ -203,7 +201,6 @@ impl CameraCapturer { }) } - #[allow(dead_code)] #[cfg(not(any(target_os = "windows", target_os = "linux")))] fn new(_current: usize) -> ResultType { bail!(CAMERA_NOT_SUPPORTED); @@ -268,12 +265,12 @@ impl TraitCapturer for CameraCapturer { #[cfg(windows)] fn is_gdi(&self) -> bool { - true + false } #[cfg(windows)] fn set_gdi(&mut self) -> bool { - true + false } #[cfg(feature = "vram")] diff --git a/libs/scrap/src/common/codec.rs b/libs/scrap/src/common/codec.rs index 9b072e1bd..8eb0c1589 100644 --- a/libs/scrap/src/common/codec.rs +++ b/libs/scrap/src/common/codec.rs @@ -18,17 +18,10 @@ use crate::{ CodecFormat, EncodeInput, EncodeYuvFormat, ImageRgb, ImageTexture, }; -#[cfg(any( - feature = "hwcodec", - feature = "mediacodec", - feature = "vram", - target_os = "windows" -))] -use hbb_common::config::option2bool; use hbb_common::{ anyhow::anyhow, bail, - config::{Config, PeerConfig}, + config::{option2bool, Config, PeerConfig}, lazy_static, log, message_proto::{ supported_decoding::PreferCodec, video_frame, Chroma, CodecAbility, EncodedVideoFrames, diff --git a/libs/scrap/src/common/hwcodec.rs b/libs/scrap/src/common/hwcodec.rs index 17eda7f3c..7ee9b3d61 100644 --- a/libs/scrap/src/common/hwcodec.rs +++ b/libs/scrap/src/common/hwcodec.rs @@ -364,7 +364,7 @@ impl HwRamDecoder { } } } - pub fn decode<'a>(&'a mut self, data: &[u8]) -> ResultType>> { + pub fn decode(&mut self, data: &[u8]) -> ResultType> { match self.decoder.decode(data) { Ok(v) => Ok(v.iter().map(|f| HwRamDecoderImage { frame: f }).collect()), Err(e) => Err(anyhow!(e)), @@ -678,8 +678,6 @@ impl HwCodecConfig { } pub fn check_available_hwcodec() -> String { - #[cfg(any(target_os = "linux", target_os = "macos"))] - hwcodec::common::setup_parent_death_signal(); let ctx = EncodeContext { name: String::from(""), mc_name: None, @@ -687,7 +685,7 @@ pub fn check_available_hwcodec() -> String { height: 720, pixfmt: DEFAULT_PIXFMT, align: HW_STRIDE_ALIGN as _, - kbs: 1000, + kbs: 0, fps: DEFAULT_FPS, gop: DEFAULT_GOP, quality: DEFAULT_HW_QUALITY, @@ -726,8 +724,6 @@ pub fn start_check_process() { if let Some(_) = exe.file_name().to_owned() { let arg = "--check-hwcodec-config"; if let Ok(mut child) = std::process::Command::new(exe).arg(arg).spawn() { - #[cfg(windows)] - hwcodec::common::child_exit_when_parent_exit(child.id()); // wait up to 30 seconds, it maybe slow on windows startup for poorly performing machines for _ in 0..30 { std::thread::sleep(std::time::Duration::from_secs(1)); diff --git a/libs/scrap/src/common/linux.rs b/libs/scrap/src/common/linux.rs index ba5e8e7ff..4e83e6e7c 100644 --- a/libs/scrap/src/common/linux.rs +++ b/libs/scrap/src/common/linux.rs @@ -88,27 +88,6 @@ impl Display { } } - pub fn scale(&self) -> f64 { - match self { - Display::X11(_d) => 1.0, - Display::WAYLAND(d) => d.scale(), - } - } - - pub fn logical_width(&self) -> usize { - match self { - Display::X11(d) => d.width(), - Display::WAYLAND(d) => d.logical_width(), - } - } - - pub fn logical_height(&self) -> usize { - match self { - Display::X11(d) => d.height(), - Display::WAYLAND(d) => d.logical_height(), - } - } - pub fn origin(&self) -> (i32, i32) { match self { Display::X11(d) => d.origin(), diff --git a/libs/scrap/src/common/mediacodec.rs b/libs/scrap/src/common/mediacodec.rs index 8ec5e6b8f..bd3eace7b 100644 --- a/libs/scrap/src/common/mediacodec.rs +++ b/libs/scrap/src/common/mediacodec.rs @@ -151,7 +151,7 @@ fn create_media_codec(name: &str, direction: MediaCodecDirection) -> Option Self { diff --git a/libs/scrap/src/common/vpxcodec.rs b/libs/scrap/src/common/vpxcodec.rs index f41dfb134..244f38ed5 100644 --- a/libs/scrap/src/common/vpxcodec.rs +++ b/libs/scrap/src/common/vpxcodec.rs @@ -231,7 +231,7 @@ impl EncoderApi for VpxEncoder { } impl VpxEncoder { - pub fn encode<'a>(&'a mut self, pts: i64, data: &[u8], stride_align: usize) -> Result> { + pub fn encode(&mut self, pts: i64, data: &[u8], stride_align: usize) -> Result { let bpp = if self.i444 { 24 } else { 12 }; if data.len() < self.width * self.height * bpp / 8 { return Err(Error::FailedCall("len not enough".to_string())); @@ -268,7 +268,7 @@ impl VpxEncoder { } /// Notify the encoder to return any pending packets - pub fn flush<'a>(&'a mut self) -> Result> { + pub fn flush(&mut self) -> Result { call_vpx!(vpx_codec_encode( &mut self.ctx, ptr::null(), @@ -473,7 +473,7 @@ impl VpxDecoder { /// The `data` slice is sent to the decoder /// /// It matches a call to `vpx_codec_decode`. - pub fn decode<'a>(&'a mut self, data: &[u8]) -> Result> { + pub fn decode(&mut self, data: &[u8]) -> Result { call_vpx!(vpx_codec_decode( &mut self.ctx, data.as_ptr(), @@ -489,7 +489,7 @@ impl VpxDecoder { } /// Notify the decoder to return any pending frame - pub fn flush<'a>(&'a mut self) -> Result> { + pub fn flush(&mut self) -> Result { call_vpx!(vpx_codec_decode( &mut self.ctx, ptr::null(), diff --git a/libs/scrap/src/common/vram.rs b/libs/scrap/src/common/vram.rs index 22645d92b..c003fa698 100644 --- a/libs/scrap/src/common/vram.rs +++ b/libs/scrap/src/common/vram.rs @@ -367,7 +367,7 @@ impl VRamDecoder { } } } - pub fn decode<'a>(&'a mut self, data: &[u8]) -> ResultType>> { + pub fn decode(&mut self, data: &[u8]) -> ResultType> { match self.decoder.decode(data) { Ok(v) => Ok(v.iter().map(|f| VRamDecoderImage { frame: f }).collect()), Err(e) => Err(anyhow!(e)), diff --git a/libs/scrap/src/common/wayland.rs b/libs/scrap/src/common/wayland.rs index 30b5f4d54..afcfc4a53 100644 --- a/libs/scrap/src/common/wayland.rs +++ b/libs/scrap/src/common/wayland.rs @@ -8,6 +8,7 @@ use super::x11::PixelBuffer; pub struct Capturer(Display, Box, Vec); + lazy_static::lazy_static! { static ref MAP_ERR: RwLock io::Error>> = Default::default(); } @@ -60,7 +61,7 @@ impl TraitCapturer for Capturer { } } -pub struct Display(pub(crate) pipewire::PipeWireCapturable); +pub struct Display(pipewire::PipeWireCapturable); impl Display { pub fn primary() -> io::Result { @@ -80,35 +81,11 @@ impl Display { } pub fn width(&self) -> usize { - self.physical_width() + self.0.size.0 } pub fn height(&self) -> usize { - self.physical_height() - } - - pub fn physical_width(&self) -> usize { - self.0.physical_size.0 - } - - pub fn physical_height(&self) -> usize { - self.0.physical_size.1 - } - - pub fn logical_width(&self) -> usize { - self.0.logical_size.0 - } - - pub fn logical_height(&self) -> usize { - self.0.logical_size.1 - } - - pub fn scale(&self) -> f64 { - if self.logical_width() == 0 { - 1.0 - } else { - self.physical_width() as f64 / self.logical_width() as f64 - } + self.0.size.1 } pub fn origin(&self) -> (i32, i32) { @@ -120,7 +97,7 @@ impl Display { } pub fn is_primary(&self) -> bool { - self.0.primary + false } pub fn name(&self) -> String { diff --git a/libs/scrap/src/dxgi/mag.rs b/libs/scrap/src/dxgi/mag.rs index 75fc892cf..cc36b3c23 100644 --- a/libs/scrap/src/dxgi/mag.rs +++ b/libs/scrap/src/dxgi/mag.rs @@ -1,6 +1,4 @@ // logic from webrtc -- https://github.com/shiguredo/libwebrtc/blob/main/modules/desktop_capture/win/screen_capturer_win_magnifier.cc -#![allow(non_snake_case)] - use lazy_static; use std::{ ffi::CString, diff --git a/libs/scrap/src/ios/README.md b/libs/scrap/src/ios/README.md new file mode 100644 index 000000000..b78056cc2 --- /dev/null +++ b/libs/scrap/src/ios/README.md @@ -0,0 +1,96 @@ +# iOS Screen Capture Implementation + +This implementation provides screen capture functionality for iOS using ReplayKit framework through Rust FFI. + +## Architecture + +### Components + +1. **Native Layer** (`native/ScreenCapture.m`) + - Implements ReplayKit screen recording for in-app capture + - Handles message port communication for system-wide capture + - Converts pixel formats (BGRA to RGBA) + - Provides C interface for Rust FFI + +2. **FFI Layer** (`ffi.rs`) + - Rust bindings to native C functions + - Frame buffer management + - Callback mechanism for frame updates + +3. **Rust Interface** (`mod.rs`) + - Implements `TraitCapturer` for compatibility with RustDesk + - Frame management and duplicate detection + - Display information handling + +4. **Broadcast Extension** (`flutter/ios/BroadcastExtension/`) + - Separate app extension for system-wide screen capture + - Uses message ports to send frames to main app + - Required for capturing content outside the app + +## Features + +### In-App Capture +- Uses `RPScreenRecorder` API +- Captures only RustDesk app content +- No additional permissions required beyond initial prompt + +### System-Wide Capture +- Uses Broadcast Upload Extension +- Can capture entire screen including other apps +- Requires user to explicitly start from Control Center +- Communicates via CFMessagePort + +## Usage + +```rust +// Initialize and start capture +let display = Display::primary()?; +let mut capturer = Capturer::new(display)?; + +// Get frames +match capturer.frame(Duration::from_millis(33)) { + Ok(frame) => { + // Process frame + } + Err(e) if e.kind() == io::ErrorKind::WouldBlock => { + // No new frame available + } + Err(e) => { + // Handle error + } +} + +// For system-wide capture +ffi::show_broadcast_picker(); +``` + +## Setup Requirements + +1. **Xcode Configuration** + - Add Broadcast Upload Extension target + - Configure app groups (if using shared container) + - Set up proper code signing + +2. **Info.plist** + - Add microphone usage description (for audio capture) + - Configure broadcast extension settings + +3. **Build Settings** + - Link ReplayKit framework + - Enable Objective-C ARC + - Set minimum iOS version to 11.0 (12.0 for broadcast picker) + +## Limitations + +- Screen recording requires iOS 11.0+ +- System-wide capture requires iOS 12.0+ +- User must grant permission for screen recording +- Performance depends on device capabilities +- Broadcast extension has memory limits (~50MB) + +## Security Considerations + +- Screen recording is a sensitive permission +- iOS shows recording indicator when active +- Broadcast extension runs in separate process +- Message port communication is local only \ No newline at end of file diff --git a/libs/scrap/src/ios/ffi.rs b/libs/scrap/src/ios/ffi.rs new file mode 100644 index 000000000..7b8d271df --- /dev/null +++ b/libs/scrap/src/ios/ffi.rs @@ -0,0 +1,165 @@ +use std::os::raw::{c_uint, c_uchar, c_void}; +use std::sync::{Arc, Mutex}; +use std::ptr; + +#[link(name = "ScreenCapture", kind = "static")] +extern "C" { + fn ios_capture_init(); + fn ios_capture_start() -> bool; + fn ios_capture_stop(); + fn ios_capture_is_active() -> bool; + fn ios_capture_get_frame( + buffer: *mut c_uchar, + buffer_size: c_uint, + out_width: *mut c_uint, + out_height: *mut c_uint, + ) -> c_uint; + fn ios_capture_get_display_info(width: *mut c_uint, height: *mut c_uint); + fn ios_capture_set_callback(callback: Option); + fn ios_capture_show_broadcast_picker(); + fn ios_capture_is_broadcasting() -> bool; + fn ios_capture_set_audio_enabled(enable_mic: bool, enable_app_audio: bool); + fn ios_capture_set_audio_callback(callback: Option); +} + +lazy_static::lazy_static! { + static ref FRAME_BUFFER: Arc> = Arc::new(Mutex::new(FrameBuffer::new())); + static ref INITIALIZED: Mutex = Mutex::new(false); +} + +struct FrameBuffer { + data: Vec, + width: u32, + height: u32, + updated: bool, +} + +impl FrameBuffer { + fn new() -> Self { + FrameBuffer { + data: Vec::new(), + width: 0, + height: 0, + updated: false, + } + } + + fn update(&mut self, data: &[u8], width: u32, height: u32) { + self.data.clear(); + self.data.extend_from_slice(data); + self.width = width; + self.height = height; + self.updated = true; + } + + fn get(&mut self) -> Option<(Vec, u32, u32)> { + if self.updated && !self.data.is_empty() { + self.updated = false; // Reset flag after consuming + Some((self.data.clone(), self.width, self.height)) + } else { + None + } + } +} + +extern "C" fn frame_callback(data: *const c_uchar, size: c_uint, width: c_uint, height: c_uint) { + if !data.is_null() && size > 0 { + let slice = unsafe { std::slice::from_raw_parts(data, size as usize) }; + let mut buffer = FRAME_BUFFER.lock().unwrap(); + buffer.update(slice, width, height); + } +} + +pub fn init() { + let mut initialized = INITIALIZED.lock().unwrap(); + if !*initialized { + unsafe { + ios_capture_init(); + ios_capture_set_callback(Some(frame_callback)); + } + *initialized = true; + log::info!("iOS screen capture initialized"); + } +} + +pub fn start_capture() -> bool { + init(); + unsafe { ios_capture_start() } +} + +pub fn stop_capture() { + unsafe { ios_capture_stop() } +} + +pub fn is_capturing() -> bool { + unsafe { ios_capture_is_active() } +} + +lazy_static::lazy_static! { + static ref TEMP_BUFFER: Mutex> = Mutex::new(vec![0u8; 4096 * 2160 * 4]); +} + +pub fn get_frame() -> Option<(Vec, u32, u32)> { + // Try callback-based frame first + if let Ok(mut buffer) = FRAME_BUFFER.try_lock() { + if let Some(frame) = buffer.get() { + return Some(frame); + } + } + + // Fallback to polling + let mut width: c_uint = 0; + let mut height: c_uint = 0; + + let mut temp_buffer = TEMP_BUFFER.lock().unwrap(); + + let size = unsafe { + ios_capture_get_frame( + temp_buffer.as_mut_ptr(), + temp_buffer.len() as c_uint, + &mut width, + &mut height, + ) + }; + + if size > 0 && width > 0 && height > 0 { + // Only allocate new Vec for the actual data + let frame_data = temp_buffer[..size as usize].to_vec(); + Some((frame_data, width, height)) + } else { + None + } +} + +pub fn get_display_info() -> (u32, u32) { + let mut width: c_uint = 0; + let mut height: c_uint = 0; + unsafe { + ios_capture_get_display_info(&mut width, &mut height); + } + (width, height) +} + +pub fn show_broadcast_picker() { + unsafe { + ios_capture_show_broadcast_picker(); + } +} + +pub fn is_broadcasting() -> bool { + unsafe { + ios_capture_is_broadcasting() + } +} + +pub fn enable_audio(mic: bool, app_audio: bool) { + unsafe { + ios_capture_set_audio_enabled(mic, app_audio); + } +} + +pub fn set_audio_callback(callback: Option) { + unsafe { + ios_capture_set_audio_callback(callback); + } +} \ No newline at end of file diff --git a/libs/scrap/src/ios/mod.rs b/libs/scrap/src/ios/mod.rs new file mode 100644 index 000000000..d9c1c9fd5 --- /dev/null +++ b/libs/scrap/src/ios/mod.rs @@ -0,0 +1,179 @@ +pub mod ffi; + +use std::io; +use std::time::{Duration, Instant}; +use crate::{would_block_if_equal, TraitCapturer}; + +pub struct Capturer { + width: usize, + height: usize, + display: Display, + frame_data: Vec, + last_frame: Vec, +} + +impl Capturer { + pub fn new(display: Display) -> io::Result { + ffi::init(); + + let (width, height) = ffi::get_display_info(); + + if !ffi::start_capture() { + return Err(io::Error::new( + io::ErrorKind::PermissionDenied, + "Failed to start iOS screen capture. User permission may be required." + )); + } + + Ok(Capturer { + width: width as usize, + height: height as usize, + display, + frame_data: Vec::new(), + last_frame: Vec::new(), + }) + } + + pub fn width(&self) -> usize { + self.width + } + + pub fn height(&self) -> usize { + self.height + } +} + +impl Drop for Capturer { + fn drop(&mut self) { + ffi::stop_capture(); + } +} + +impl TraitCapturer for Capturer { + fn frame<'a>(&'a mut self, timeout: Duration) -> io::Result> { + let start = Instant::now(); + + loop { + if let Some((data, width, height)) = ffi::get_frame() { + // Update dimensions if they changed + self.width = width as usize; + self.height = height as usize; + + // Check if frame is different from last + // would_block_if_equal returns Err when frames are EQUAL (should block) + match would_block_if_equal(&self.last_frame, &data) { + Ok(_) => { + // Frame is different, use it + self.frame_data = data; + std::mem::swap(&mut self.frame_data, &mut self.last_frame); + + let pixel_buffer = PixelBuffer { + data: &self.last_frame, + width: self.width, + height: self.height, + stride: vec![self.width * 4], + }; + + return Ok(crate::Frame::PixelBuffer(pixel_buffer)); + } + Err(_) => { + // Frame is same as last, skip + } + } + } + + if start.elapsed() >= timeout { + return Err(io::ErrorKind::WouldBlock.into()); + } + + // Small sleep to avoid busy waiting + std::thread::sleep(Duration::from_millis(1)); + } + } +} + +pub struct PixelBuffer<'a> { + data: &'a [u8], + width: usize, + height: usize, + stride: Vec, +} + +impl<'a> crate::TraitPixelBuffer for PixelBuffer<'a> { + fn data(&self) -> &[u8] { + self.data + } + + fn width(&self) -> usize { + self.width + } + + fn height(&self) -> usize { + self.height + } + + fn stride(&self) -> Vec { + self.stride.clone() + } + + fn pixfmt(&self) -> crate::Pixfmt { + crate::Pixfmt::RGBA + } +} + +#[derive(Debug, Clone, Copy)] +pub struct Display { + pub primary: bool, +} + +impl Display { + pub fn primary() -> io::Result { + Ok(Display { primary: true }) + } + + pub fn all() -> io::Result> { + Ok(vec![Display { primary: true }]) + } + + pub fn width(&self) -> usize { + let (width, _) = ffi::get_display_info(); + width as usize + } + + pub fn height(&self) -> usize { + let (_, height) = ffi::get_display_info(); + height as usize + } + + pub fn name(&self) -> String { + "iOS Display".to_string() + } + + pub fn is_online(&self) -> bool { + true + } + + pub fn is_primary(&self) -> bool { + self.primary + } + + pub fn origin(&self) -> (i32, i32) { + (0, 0) + } + + pub fn id(&self) -> usize { + 1 + } +} + +pub fn is_supported() -> bool { + true +} + +pub fn is_cursor_embedded() -> bool { + true +} + +pub fn is_mag_supported() -> bool { + false +} \ No newline at end of file diff --git a/libs/scrap/src/ios/native/ScreenCapture.h b/libs/scrap/src/ios/native/ScreenCapture.h new file mode 100644 index 000000000..56902658f --- /dev/null +++ b/libs/scrap/src/ios/native/ScreenCapture.h @@ -0,0 +1,56 @@ +#ifndef SCREEN_CAPTURE_H +#define SCREEN_CAPTURE_H + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +// Initialize iOS screen capture +void ios_capture_init(void); + +// Start screen capture +bool ios_capture_start(void); + +// Stop screen capture +void ios_capture_stop(void); + +// Check if capturing +bool ios_capture_is_active(void); + +// Get current frame data +// Returns frame size, or 0 if no frame available +// Buffer must be large enough to hold width * height * 4 bytes (RGBA) +uint32_t ios_capture_get_frame(uint8_t* buffer, uint32_t buffer_size, + uint32_t* out_width, uint32_t* out_height); + +// Get display info +void ios_capture_get_display_info(uint32_t* width, uint32_t* height); + +// Callback for frame updates from native side +typedef void (*frame_callback_t)(const uint8_t* data, uint32_t size, + uint32_t width, uint32_t height); + +// Set frame callback +void ios_capture_set_callback(frame_callback_t callback); + +// Show broadcast picker for system-wide capture +void ios_capture_show_broadcast_picker(void); + +// Check if broadcasting (system-wide capture) +bool ios_capture_is_broadcasting(void); + +// Audio capture control +void ios_capture_set_audio_enabled(bool enable_mic, bool enable_app_audio); + +// Audio callback +typedef void (*audio_callback_t)(const uint8_t* data, uint32_t size, bool is_mic); +void ios_capture_set_audio_callback(audio_callback_t callback); + +#ifdef __cplusplus +} +#endif + +#endif // SCREEN_CAPTURE_H \ No newline at end of file diff --git a/libs/scrap/src/ios/native/ScreenCapture.m b/libs/scrap/src/ios/native/ScreenCapture.m new file mode 100644 index 000000000..6418415fa --- /dev/null +++ b/libs/scrap/src/ios/native/ScreenCapture.m @@ -0,0 +1,455 @@ +#import +#import +#import +#import "ScreenCapture.h" + +@interface ScreenCaptureHandler : NSObject +@property (nonatomic, strong) RPScreenRecorder *screenRecorder; +@property (nonatomic, assign) BOOL isCapturing; +@property (nonatomic, strong) NSMutableData *frameBuffer; +@property (nonatomic, assign) CGSize lastFrameSize; +@property (nonatomic, strong) dispatch_queue_t processingQueue; +@property (nonatomic, assign) frame_callback_t frameCallback; +@property (nonatomic, assign) CFMessagePortRef localPort; +@property (nonatomic, assign) BOOL isBroadcasting; +@property (nonatomic, assign) BOOL enableMicAudio; +@property (nonatomic, assign) BOOL enableAppAudio; +@property (nonatomic, assign) audio_callback_t audioCallback; +@property (nonatomic, assign) UIInterfaceOrientation lastOrientation; +@end + +@implementation ScreenCaptureHandler + +static ScreenCaptureHandler *sharedHandler = nil; + ++ (instancetype)sharedInstance { + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + sharedHandler = [[ScreenCaptureHandler alloc] init]; + }); + return sharedHandler; +} + +- (instancetype)init { + self = [super init]; + if (self) { + _screenRecorder = [RPScreenRecorder sharedRecorder]; + _screenRecorder.delegate = self; + _isCapturing = NO; + _frameBuffer = [NSMutableData dataWithCapacity:1920 * 1080 * 4]; // Initial capacity + _lastFrameSize = CGSizeZero; + _processingQueue = dispatch_queue_create("com.rustdesk.screencapture", DISPATCH_QUEUE_SERIAL); + _isBroadcasting = NO; + _lastOrientation = UIInterfaceOrientationUnknown; + + // Default audio settings - microphone OFF for privacy + _enableMicAudio = NO; + _enableAppAudio = NO; // App audio only captures RustDesk's own audio, not useful + + [self setupMessagePort]; + + // Register for orientation change notifications + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(orientationDidChange:) + name:UIDeviceOrientationDidChangeNotification + object:nil]; + } + return self; +} + +- (void)setupMessagePort { + NSString *portName = @"com.rustdesk.screencast.port"; + + CFMessagePortContext context = {0, (__bridge void *)self, NULL, NULL, NULL}; + Boolean shouldFreeInfo = false; + self.localPort = CFMessagePortCreateLocal(kCFAllocatorDefault, + (__bridge CFStringRef)portName, + messagePortCallback, + &context, + &shouldFreeInfo); + + if (self.localPort) { + CFRunLoopSourceRef runLoopSource = CFMessagePortCreateRunLoopSource(kCFAllocatorDefault, self.localPort, 0); + if (runLoopSource) { + CFRunLoopAddSource(CFRunLoopGetMain(), runLoopSource, kCFRunLoopCommonModes); + CFRelease(runLoopSource); + } + } +} + +- (void)dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + if (self.localPort) { + CFMessagePortInvalidate(self.localPort); + CFRelease(self.localPort); + self.localPort = NULL; + } +} + +- (void)orientationDidChange:(NSNotification *)notification { + UIInterfaceOrientation currentOrientation = [[UIApplication sharedApplication] statusBarOrientation]; + if (currentOrientation != self.lastOrientation) { + self.lastOrientation = currentOrientation; + NSLog(@"Orientation changed to: %ld", (long)currentOrientation); + // The next frame capture will automatically pick up the new dimensions + } +} + +static CFDataRef messagePortCallback(CFMessagePortRef local, SInt32 msgid, CFDataRef data, void *info) { + ScreenCaptureHandler *handler = (__bridge ScreenCaptureHandler *)info; + + if (msgid == 1 && data) { + // Frame header + struct FrameHeader { + uint32_t width; + uint32_t height; + uint32_t dataSize; + } header; + + CFDataGetBytes(data, CFRangeMake(0, sizeof(header)), (UInt8 *)&header); + handler.lastFrameSize = CGSizeMake(header.width, header.height); + + } else if (msgid == 2 && data) { + // Frame data + dispatch_async(handler.processingQueue, ^{ + @synchronized(handler.frameBuffer) { + [handler.frameBuffer setData:(__bridge NSData *)data]; + handler.isBroadcasting = YES; + + // Call callback if set + if (handler.frameCallback) { + handler.frameCallback((const uint8_t *)handler.frameBuffer.bytes, + (uint32_t)handler.frameBuffer.length, + (uint32_t)handler.lastFrameSize.width, + (uint32_t)handler.lastFrameSize.height); + } + } + }); + } + + return NULL; +} + +- (BOOL)startCapture { + if (self.isCapturing || ![self.screenRecorder isAvailable]) { + return NO; + } + + // Configure audio based on user setting + // This must be set before starting capture and cannot be changed during capture + // To change microphone setting, must stop and restart capture + self.screenRecorder.microphoneEnabled = self.enableMicAudio; + + __weak typeof(self) weakSelf = self; + + [self.screenRecorder startCaptureWithHandler:^(CMSampleBufferRef sampleBuffer, RPSampleBufferType bufferType, NSError *error) { + if (error) { + NSLog(@"Screen capture error: %@", error.localizedDescription); + return; + } + + switch (bufferType) { + case RPSampleBufferTypeVideo: + [weakSelf processSampleBuffer:sampleBuffer]; + break; + + case RPSampleBufferTypeAudioApp: + // App audio only captures RustDesk's own audio, not useful + // iOS doesn't allow capturing other apps' audio + break; + + case RPSampleBufferTypeAudioMic: + if (weakSelf.enableMicAudio && weakSelf.audioCallback) { + [weakSelf processAudioSampleBuffer:sampleBuffer isMic:YES]; + } + break; + + default: + break; + } + } completionHandler:^(NSError *error) { + if (error) { + NSLog(@"Failed to start capture: %@", error.localizedDescription); + weakSelf.isCapturing = NO; + } else { + weakSelf.isCapturing = YES; + } + }]; + + return YES; +} + +- (void)stopCapture { + if (!self.isCapturing) { + return; + } + + __weak typeof(self) weakSelf = self; + [self.screenRecorder stopCaptureWithHandler:^(NSError *error) { + if (error) { + NSLog(@"Error stopping capture: %@", error.localizedDescription); + } + weakSelf.isCapturing = NO; + }]; +} + +- (void)processSampleBuffer:(CMSampleBufferRef)sampleBuffer { + CVImageBufferRef imageBuffer = CMSampleBufferGetImageBuffer(sampleBuffer); + if (!imageBuffer) { + return; + } + + dispatch_async(self.processingQueue, ^{ + CVPixelBufferLockBaseAddress(imageBuffer, kCVPixelBufferLock_ReadOnly); + + size_t width = CVPixelBufferGetWidth(imageBuffer); + size_t height = CVPixelBufferGetHeight(imageBuffer); + size_t bytesPerRow = CVPixelBufferGetBytesPerRow(imageBuffer); + void *baseAddress = CVPixelBufferGetBaseAddress(imageBuffer); + + self.lastFrameSize = CGSizeMake(width, height); + + // Ensure buffer is large enough + size_t requiredSize = width * height * 4; + @synchronized(self.frameBuffer) { + if (self.frameBuffer.length < requiredSize) { + [self.frameBuffer setLength:requiredSize]; + } + } + + @synchronized(self.frameBuffer) { + uint8_t *src = (uint8_t *)baseAddress; + uint8_t *dst = (uint8_t *)self.frameBuffer.mutableBytes; + + // Convert BGRA to RGBA + OSType pixelFormat = CVPixelBufferGetPixelFormatType(imageBuffer); + if (pixelFormat == kCVPixelFormatType_32BGRA) { + for (size_t y = 0; y < height; y++) { + for (size_t x = 0; x < width; x++) { + size_t srcIdx = y * bytesPerRow + x * 4; + size_t dstIdx = y * width * 4 + x * 4; + + // Bounds check + if (srcIdx + 3 < bytesPerRow * height && dstIdx + 3 < requiredSize) { + dst[dstIdx + 0] = src[srcIdx + 2]; // R + dst[dstIdx + 1] = src[srcIdx + 1]; // G + dst[dstIdx + 2] = src[srcIdx + 0]; // B + dst[dstIdx + 3] = src[srcIdx + 3]; // A + } + } + } + } else { + // Copy as-is if already RGBA + memcpy(dst, src, MIN(requiredSize, bytesPerRow * height)); + } + + CVPixelBufferUnlockBaseAddress(imageBuffer, kCVPixelBufferLock_ReadOnly); + + // Call the callback if set + if (self.frameCallback) { + self.frameCallback(dst, (uint32_t)requiredSize, (uint32_t)width, (uint32_t)height); + } + } + }); +} + +- (NSData *)getCurrentFrame { + @synchronized(self.frameBuffer) { + return [self.frameBuffer copy]; + } +} + +- (void)processAudioSampleBuffer:(CMSampleBufferRef)sampleBuffer isMic:(BOOL)isMic { + // Get audio format information + CMFormatDescriptionRef formatDesc = CMSampleBufferGetFormatDescription(sampleBuffer); + const AudioStreamBasicDescription *asbd = CMAudioFormatDescriptionGetStreamBasicDescription(formatDesc); + + if (!asbd) { + NSLog(@"Failed to get audio format description"); + return; + } + + // Verify it's PCM format we can handle + if (asbd->mFormatID != kAudioFormatLinearPCM) { + NSLog(@"Unsupported audio format: %u", asbd->mFormatID); + return; + } + + // Log format info once + static BOOL loggedFormat = NO; + if (!loggedFormat) { + NSLog(@"Audio format - Sample rate: %.0f, Channels: %d, Bits per channel: %d, Format: %u, Flags: %u", + asbd->mSampleRate, asbd->mChannelsPerFrame, asbd->mBitsPerChannel, + asbd->mFormatID, asbd->mFormatFlags); + loggedFormat = YES; + } + + // Get audio buffer list + CMBlockBufferRef blockBuffer = CMSampleBufferGetDataBuffer(sampleBuffer); + if (!blockBuffer) { + // Try to get audio buffer list for interleaved audio + AudioBufferList audioBufferList; + size_t bufferListSizeNeededOut; + OSStatus status = CMSampleBufferGetAudioBufferListWithRetainedBlockBuffer( + sampleBuffer, + &bufferListSizeNeededOut, + &audioBufferList, + sizeof(audioBufferList), + NULL, + NULL, + kCMSampleBufferFlag_AudioBufferList_Assure16ByteAlignment, + &blockBuffer + ); + + if (status != noErr || audioBufferList.mNumberBuffers == 0) { + NSLog(@"Failed to get audio buffer list: %d", status); + return; + } + + // Process first buffer (assuming non-interleaved) + AudioBuffer *audioBuffer = &audioBufferList.mBuffers[0]; + if (self.audioCallback && audioBuffer->mData && audioBuffer->mDataByteSize > 0) { + self.audioCallback((const uint8_t *)audioBuffer->mData, + (uint32_t)audioBuffer->mDataByteSize, isMic); + } + + if (blockBuffer) { + CFRelease(blockBuffer); + } + return; + } + + size_t lengthAtOffset; + size_t totalLength; + char *dataPointer; + + OSStatus status = CMBlockBufferGetDataPointer(blockBuffer, 0, &lengthAtOffset, &totalLength, &dataPointer); + if (status != kCMBlockBufferNoErr || !dataPointer) { + return; + } + + // Call the audio callback with proper format info + if (self.audioCallback) { + // Pass raw PCM data - the Rust side will handle conversion based on format + self.audioCallback((const uint8_t *)dataPointer, (uint32_t)totalLength, isMic); + } +} + +#pragma mark - RPScreenRecorderDelegate + +- (void)screenRecorderDidChangeAvailability:(RPScreenRecorder *)screenRecorder { + NSLog(@"Screen recorder availability changed: %@", screenRecorder.isAvailable ? @"Available" : @"Not available"); +} + +- (void)screenRecorder:(RPScreenRecorder *)screenRecorder didStopRecordingWithPreviewViewController:(RPPreviewViewController *)previewViewController error:(NSError *)error { + self.isCapturing = NO; + if (error) { + NSLog(@"Recording stopped with error: %@", error.localizedDescription); + } +} + +@end + +// C interface implementation + +void ios_capture_init(void) { + [ScreenCaptureHandler sharedInstance]; +} + +bool ios_capture_start(void) { + return [[ScreenCaptureHandler sharedInstance] startCapture]; +} + +void ios_capture_stop(void) { + [[ScreenCaptureHandler sharedInstance] stopCapture]; +} + +bool ios_capture_is_active(void) { + return [ScreenCaptureHandler sharedInstance].isCapturing; +} + +uint32_t ios_capture_get_frame(uint8_t* buffer, uint32_t buffer_size, + uint32_t* out_width, uint32_t* out_height) { + ScreenCaptureHandler *handler = [ScreenCaptureHandler sharedInstance]; + + @synchronized(handler.frameBuffer) { + if (handler.frameBuffer.length == 0 || handler.lastFrameSize.width == 0) { + return 0; + } + + uint32_t width = (uint32_t)handler.lastFrameSize.width; + uint32_t height = (uint32_t)handler.lastFrameSize.height; + uint32_t frameSize = width * height * 4; + + if (buffer_size < frameSize) { + return 0; + } + + memcpy(buffer, handler.frameBuffer.bytes, frameSize); + + if (out_width) *out_width = width; + if (out_height) *out_height = height; + + return frameSize; + } +} + +void ios_capture_get_display_info(uint32_t* width, uint32_t* height) { + UIScreen *mainScreen = [UIScreen mainScreen]; + CGFloat scale = mainScreen.scale; + CGSize screenSize = mainScreen.bounds.size; + + if (width) *width = (uint32_t)(screenSize.width * scale); + if (height) *height = (uint32_t)(screenSize.height * scale); +} + +void ios_capture_set_callback(frame_callback_t callback) { + [ScreenCaptureHandler sharedInstance].frameCallback = callback; +} + +void ios_capture_show_broadcast_picker(void) { + dispatch_async(dispatch_get_main_queue(), ^{ + if (@available(iOS 12.0, *)) { + RPSystemBroadcastPickerView *picker = [[RPSystemBroadcastPickerView alloc] init]; + picker.preferredExtension = @"com.carriez.rustdesk.BroadcastExtension"; + picker.showsMicrophoneButton = NO; + + // Add to current window temporarily + UIWindow *window = UIApplication.sharedApplication.windows.firstObject; + if (window) { + picker.frame = CGRectMake(-100, -100, 100, 100); + [window addSubview:picker]; + + // Programmatically tap the button + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + for (UIView *subview in picker.subviews) { + if ([subview isKindOfClass:[UIButton class]]) { + [(UIButton *)subview sendActionsForControlEvents:UIControlEventTouchUpInside]; + break; + } + } + + // Remove after a delay + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [picker removeFromSuperview]; + }); + }); + } + } + }); +} + +bool ios_capture_is_broadcasting(void) { + return [ScreenCaptureHandler sharedInstance].isBroadcasting; +} + +void ios_capture_set_audio_enabled(bool enable_mic, bool enable_app_audio) { + ScreenCaptureHandler *handler = [ScreenCaptureHandler sharedInstance]; + handler.enableMicAudio = enable_mic; + handler.enableAppAudio = enable_app_audio; +} + +void ios_capture_set_audio_callback(audio_callback_t callback) { + [ScreenCaptureHandler sharedInstance].audioCallback = callback; +} \ No newline at end of file diff --git a/libs/scrap/src/lib.rs b/libs/scrap/src/lib.rs index 77070d1a2..0a28a1045 100644 --- a/libs/scrap/src/lib.rs +++ b/libs/scrap/src/lib.rs @@ -23,4 +23,7 @@ pub mod dxgi; #[cfg(target_os = "android")] pub mod android; +#[cfg(target_os = "ios")] +pub mod ios; + mod common; diff --git a/libs/scrap/src/wayland.rs b/libs/scrap/src/wayland.rs index 341f2b800..501fec859 100644 --- a/libs/scrap/src/wayland.rs +++ b/libs/scrap/src/wayland.rs @@ -1,6 +1,5 @@ pub mod capturable; pub mod pipewire; -pub mod display; mod screencast_portal; mod request_portal; pub mod remote_desktop_portal; diff --git a/libs/scrap/src/wayland/capturable.rs b/libs/scrap/src/wayland/capturable.rs index 070b66799..61f80ecbf 100644 --- a/libs/scrap/src/wayland/capturable.rs +++ b/libs/scrap/src/wayland/capturable.rs @@ -24,7 +24,7 @@ impl<'a> PixelProvider<'a> { } pub trait Recorder { - fn capture(&mut self, timeout_ms: u64) -> Result, Box>; + fn capture(&mut self, timeout_ms: u64) -> Result>; } pub trait BoxCloneCapturable { diff --git a/libs/scrap/src/wayland/display.rs b/libs/scrap/src/wayland/display.rs deleted file mode 100644 index a5c937491..000000000 --- a/libs/scrap/src/wayland/display.rs +++ /dev/null @@ -1,256 +0,0 @@ -use hbb_common::regex::Regex; -use lazy_static::lazy_static; -use std::sync::Mutex; -use std::{ - process::{Command, Output, Stdio}, - sync::Arc, - time::{Duration, Instant}, -}; -use tracing::warn; - -use hbb_common::platform::linux::{get_wayland_displays, WaylandDisplayInfo}; - -lazy_static! { - static ref DISPLAYS: Mutex>> = Mutex::new(None); -} - -const COMMAND_TIMEOUT: Duration = Duration::from_millis(1000); - -pub struct Displays { - pub primary: usize, - pub displays: Vec, -} - -// We need this helper to run commands with a timeout, as some commands may hang. -// `kscreen-doctor -o` is known to hang when: -// 1. On Archlinux, Both GNOME and KDE Plasma are installed. -// 2. Run this command in a GNOME session. -fn run_with_timeout( - program: &str, - args: &[&str], - timeout: Duration, - label: &str, -) -> Option { - let mut child = Command::new(program) - .args(args) - .stdout(Stdio::piped()) - .stderr(Stdio::piped()) - .spawn() - .ok()?; - - let start = Instant::now(); - loop { - if let Ok(Some(_)) = child.try_wait() { - break; - } - if start.elapsed() >= timeout { - warn!("{} command timed out after {:?}", label, timeout); - if let Err(e) = child.kill() { - warn!("Failed to kill child process for '{}': {}", label, e); - } - if let Err(e) = child.wait() { - warn!("Failed to wait for child process for '{}': {}", label, e); - } - return None; - } - std::thread::sleep(Duration::from_millis(30)); - } - - match child.wait_with_output() { - Ok(output) => { - if !output.status.success() { - warn!("{} command failed with status: {}", label, output.status); - return None; - } - Some(output) - } - Err(_) => None, - } -} - -// There are some limitations with xrandr method: -// 1. It only works when XWayland is running. -// 2. The distro may not have xrandr installed by default. -// 3. xrandr may not report "primary" in its output. eg. openSUSE Leap 15.6 KDE Plasma. -fn try_xrandr_primary() -> Option { - let output = Command::new("xrandr").output().ok()?; - if !output.status.success() { - return None; - } - - let text = String::from_utf8_lossy(&output.stdout); - for line in text.lines() { - if line.contains("primary") && line.contains("connected") { - if let Some(name) = line.split_whitespace().next() { - return Some(name.to_string()); - } - } - } - None -} - -fn try_kscreen_primary() -> Option { - if !hbb_common::platform::linux::is_kde_session() { - return None; - } - - let output = run_with_timeout( - "kscreen-doctor", - &["-o"], - COMMAND_TIMEOUT, - "kscreen-doctor -o", - )?; - if !output.status.success() { - return None; - } - - let text = String::from_utf8_lossy(&output.stdout); - - // Remove ANSI color codes - let re_ansi = Regex::new(r"\x1b\[[0-9;]*m").ok()?; - let clean_text = re_ansi.replace_all(&text, ""); - - // Split the text into blocks, each starting with "Output:". - // The first element of the split will be empty, so we skip it. - for block in clean_text.split("Output:").skip(1) { - // Check if this block describes the primary monitor. - if block.contains("priority 1") { - // The monitor name is the second piece of text in the block, after the ID. - // e.g., " 1 eDP-1 enabled..." -> "eDP-1" - if let Some(name) = block.split_whitespace().nth(1) { - return Some(name.to_string()); - } - } - } - - None -} - -fn try_gdbus_primary() -> Option { - let output = run_with_timeout( - "gdbus", - &[ - "call", - "--session", - "--dest", - "org.gnome.Mutter.DisplayConfig", - "--object-path", - "/org/gnome/Mutter/DisplayConfig", - "--method", - "org.gnome.Mutter.DisplayConfig.GetCurrentState", - ], - COMMAND_TIMEOUT, - "gdbus DisplayConfig.GetCurrentState", - )?; - - if !output.status.success() { - return None; - } - - let text = String::from_utf8_lossy(&output.stdout); - - // Match logical monitor entries with primary=true - // Pattern: (x, y, scale, transform, true, [('connector-name', ...), ...], ...) - // Use regex to find entries where 5th field is true, then extract connector name - // Example matched text: "(0, 0, 1.5, 0, true, [('HDMI-1', 'MHH', 'Monitor', '0x00000000')], ...)" - let re = Regex::new(r"\([^()]*,\s*true,\s*\[\('([^']+)'").ok()?; - - if let Some(captures) = re.captures(&text) { - return captures.get(1).map(|m| m.as_str().to_string()); - } - - None -} - -fn get_primary_monitor() -> Option { - try_xrandr_primary() - .or_else(try_kscreen_primary) - .or_else(try_gdbus_primary) -} - -pub fn get_displays() -> Arc { - let mut lock = DISPLAYS.lock().unwrap(); - match lock.as_ref() { - Some(displays) => displays.clone(), - None => match get_wayland_displays() { - Ok(displays) => { - let mut primary_index = None; - if let Some(name) = get_primary_monitor() { - for (i, display) in displays.iter().enumerate() { - if display.name == name { - primary_index = Some(i); - break; - } - } - }; - if primary_index.is_none() { - for (i, display) in displays.iter().enumerate() { - if display.x == 0 && display.y == 0 { - primary_index = Some(i); - break; - } - } - } - let displays = Arc::new(Displays { - primary: primary_index.unwrap_or(0), - displays, - }); - *lock = Some(displays.clone()); - displays - } - Err(err) => { - warn!("Failed to get wayland displays: {}", err); - Arc::new(Displays { - primary: 0, - displays: Vec::new(), - }) - } - }, - } -} - -#[inline] -pub fn clear_wayland_displays_cache() { - let _ = DISPLAYS.lock().unwrap().take(); -} - -// Return (min_x, max_x, min_y, max_y) -pub fn get_desktop_rect_for_uinput() -> Option<(i32, i32, i32, i32)> { - let wayland_displays = get_displays(); - let displays = &wayland_displays.displays; - if displays.is_empty() { - return None; - } - - // For compatibility, if only one display, we use the physical size for `uinput`. - // Otherwise, we use the logical size for `uinput`. - if displays.len() == 1 { - let d = &displays[0]; - return Some((d.x, d.x + d.width, d.y, d.y + d.height)); - } - - let mut min_x = i32::MAX; - let mut min_y = i32::MAX; - let mut max_x = i32::MIN; - let mut max_y = i32::MIN; - for d in displays.iter() { - min_x = min_x.min(d.x); - min_y = min_y.min(d.y); - let size = if let Some(logical_size) = d.logical_size { - logical_size - } else { - // When `logical_size` is None, we cannot obtain the correct desktop rectangle. - // This may occur if the Wayland compositor does not provide logical size information, - // or if display information is incomplete. We fall back to physical size, which provides - // usable dimensions, but may not always be correct depending on compositor behavior. - warn!( - "Display at ({}, {}) is missing logical_size; falling back to physical size ({}, {}).", - d.x, d.y, d.width, d.height - ); - (d.width, d.height) - }; - max_x = max_x.max(d.x + size.0); - max_y = max_y.max(d.y + size.1); - } - Some((min_x, max_x, min_y, max_y)) -} diff --git a/libs/scrap/src/wayland/pipewire.rs b/libs/scrap/src/wayland/pipewire.rs index 8859d0d3b..9b2c5a6e0 100644 --- a/libs/scrap/src/wayland/pipewire.rs +++ b/libs/scrap/src/wayland/pipewire.rs @@ -2,12 +2,9 @@ use std::collections::HashMap; use std::error::Error; use std::os::unix::io::AsRawFd; use std::process::Command; -use std::sync::{ - atomic::{AtomicBool, AtomicU8, Ordering}, - Arc, Mutex, -}; +use std::sync::{atomic::AtomicBool, Arc, Mutex}; use std::time::Duration; -use tracing::{debug, error, trace, warn}; +use tracing::{debug, trace, warn}; use dbus::{ arg::{OwnedFd, PropMap, RefArg, Variant}, @@ -20,58 +17,23 @@ use gstreamer as gst; use gstreamer::prelude::*; use gstreamer_app::AppSink; -use lazy_static::lazy_static; -use serde::{Deserialize, Serialize}; - -use hbb_common::{bail, config, platform::linux::CMD_SH, serde_json, tokio, ResultType}; +use hbb_common::config; use super::capturable::PixelProvider; use super::capturable::{Capturable, Recorder}; -use super::display::{clear_wayland_displays_cache, get_displays, Displays}; use super::remote_desktop_portal::OrgFreedesktopPortalRemoteDesktop as remote_desktop_portal; use super::request_portal::OrgFreedesktopPortalRequestResponse; use super::screencast_portal::OrgFreedesktopPortalScreenCast as screencast_portal; +use hbb_common::platform::linux::CMD_SH; +use lazy_static::lazy_static; lazy_static! { pub static ref RDP_SESSION_INFO: Mutex> = Mutex::new(None); } -#[derive(Serialize, Deserialize)] -// For KDE Plasma only, because GNOME provides position info. -struct PipewireDisplayOffsetCache { - // We need to compare the displays, because: - // 1. On Archlinux KDE Plasma - // 2. One display, and connect, remember share choice. - // 3. Plug in another monitor. - // 4. The portal will reuse the restore token, no new share choice dialog, but the share screen is different. - // The controlling side will see the new monitor. - // All displays as one string for easy comparison - // name1-x1-y1-width1-height1;name2-x2-y2-width2-height2;... - display_key: String, - restore_token: String, - offsets: Vec<(i32, i32)>, -} - -// KDE Plasma may not provide position info -static HAS_POSITION_ATTR: AtomicBool = AtomicBool::new(false); -static IS_SERVER_RUNNING: AtomicU8 = AtomicU8::new(0); // 0: uninitialized, 1:true, 2: false - -impl PipewireDisplayOffsetCache { - fn displays_to_key(displays: &Arc) -> String { - displays - .displays - .iter() - .map(|d| format!("{}-{}-{}-{}-{}", d.name, d.x, d.y, d.width, d.height)) - .collect::>() - .join(";") - } -} - #[inline] pub fn close_session() { let _ = RDP_SESSION_INFO.lock().unwrap().take(); - clear_wayland_displays_cache(); - HAS_POSITION_ATTR.store(false, Ordering::SeqCst); } #[inline] @@ -90,8 +52,6 @@ pub fn try_close_session() { } if close { *rdp_info = None; - clear_wayland_displays_cache(); - HAS_POSITION_ATTR.store(false, Ordering::SeqCst); } } @@ -115,10 +75,6 @@ impl PwStreamInfo { pub fn get_size(&self) -> (usize, usize) { self.size } - - pub fn get_position(&self) -> (i32, i32) { - self.position - } } #[derive(Debug)] @@ -152,10 +108,8 @@ pub struct PipeWireCapturable { fd: OwnedFd, path: u64, source_type: u64, - pub primary: bool, pub position: (i32, i32), - pub logical_size: (usize, usize), - pub physical_size: (usize, usize), + pub size: (usize, usize), } impl PipeWireCapturable { @@ -163,31 +117,27 @@ impl PipeWireCapturable { conn: Arc, fd: OwnedFd, resolution: Arc>>, - stream: &PwStreamInfo, + stream: PwStreamInfo, ) -> Self { // alternative to get screen resolution as stream.size is not always correct ex: on fractional scaling // https://github.com/rustdesk/rustdesk/issues/6116#issuecomment-1817724244 - let physical_size = get_res(Self { + let size = get_res(Self { dbus_conn: conn.clone(), fd: fd.clone(), path: stream.path, source_type: stream.source_type, - primary: false, position: stream.position, - logical_size: stream.size, - physical_size: (0, 0), + size: stream.size, }) .unwrap_or(stream.size); - *resolution.lock().unwrap() = Some(physical_size); + *resolution.lock().unwrap() = Some(size); Self { dbus_conn: conn, fd, path: stream.path, source_type: stream.source_type, - primary: false, position: stream.position, - logical_size: stream.size, - physical_size, + size, } } } @@ -264,7 +214,7 @@ pub struct PipeWireRecorder { } impl PipeWireRecorder { - pub fn new(capturable: PipeWireCapturable) -> ResultType { + pub fn new(capturable: PipeWireCapturable) -> Result> { let pipeline = gst::Pipeline::new(None); let src = gst::ElementFactory::make("pipewiresrc", None)?; @@ -276,21 +226,12 @@ impl PipeWireRecorder { // see: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/982 src.set_property("always-copy", &true)?; - // COSMIC/Wayland fix: insert videoconvert between pipewiresrc and appsink. - // xdg-desktop-portal-cosmic's modifier negotiation fails when the downstream - // format set is too narrow (appsink only accepts BGRx/RGBx), producing - // "no more output formats" / not-negotiated (-4). videoconvert accepts any - // system-memory video/x-raw format, widening negotiation so the portal can - // settle on a format it can deliver via its SHM path. - let convert = gst::ElementFactory::make("videoconvert", None)?; - let sink = gst::ElementFactory::make("appsink", None)?; sink.set_property("drop", &true)?; sink.set_property("max-buffers", &1u32)?; - pipeline.add_many(&[&src, &convert, &sink])?; - src.link(&convert)?; - convert.link(&sink)?; + pipeline.add_many(&[&src, &sink])?; + src.link(&sink)?; let appsink = sink .dynamic_cast::() @@ -306,40 +247,7 @@ impl PipeWireRecorder { )); appsink.set_caps(Some(&caps)); - // [Workaround] - // Crash may occur if there are multiple pipelines started at the same time. - // `pipeline.get_state()` can significantly reduce the probability of crashes, - // but cannot completely resolve this issue. - // Adding a short sleep period can also reduce the probability of crashes. - debug!( - "[gstreamer] Setting pipeline {} to PLAYING state...", - capturable.fd.as_raw_fd() - ); pipeline.set_state(gst::State::Playing)?; - - // If `is_server_running()` is false, it means using remote_desktop_portal, - // which does not use multiple streams, so no need to wait for state change. - if is_server_running() { - // Wait for the state change to actually complete before proceeding. - // The 2000ms timeout for pipeline state change was chosen based on empirical testing. - let state_change = pipeline.get_state(gst::ClockTime::from_mseconds(2000)); - match state_change { - (Ok(_), gst::State::Playing, _) => { - debug!( - "[gstreamer] Pipeline {} state confirmed as PLAYING.", - capturable.fd.as_raw_fd() - ); - } - (result, state, pending) => { - warn!( - "[gstreamer] Pipeline {} state change incomplete: result={:?}, state={:?}, pending={:?}", - capturable.fd.as_raw_fd(), result, state, pending - ); - } - } - std::thread::sleep(std::time::Duration::from_millis(150)); - } - Ok(Self { pipeline, appsink, @@ -355,7 +263,7 @@ impl PipeWireRecorder { } impl Recorder for PipeWireRecorder { - fn capture(&mut self, timeout_ms: u64) -> Result, Box> { + fn capture(&mut self, timeout_ms: u64) -> Result> { if let Some(sample) = self .appsink .try_pull_sample(gst::ClockTime::from_mseconds(timeout_ms)) @@ -458,8 +366,6 @@ impl Drop for PipeWireRecorder { if let Err(err) = self.pipeline.set_state(gst::State::Null) { warn!("Failed to stop GStreamer pipeline: {}.", err); } - // Wait for state change to complete to avoid races during PipeWire teardown. - let _ = self.pipeline.get_state(gst::ClockTime::from_mseconds(2000)); } } @@ -490,18 +396,18 @@ where 0 => {} 1 => { warn!("DBus response: User cancelled interaction."); - failure_out.store(true, Ordering::SeqCst); + failure_out.store(true, std::sync::atomic::Ordering::Relaxed); return true; } c => { warn!("DBus response: Unknown error, code: {}.", c); - failure_out.store(true, Ordering::SeqCst); + failure_out.store(true, std::sync::atomic::Ordering::Relaxed); return true; } } if let Err(err) = f(r, c, m) { warn!("Error requesting screen capture via dbus: {}", err); - failure_out.store(true, Ordering::SeqCst); + failure_out.store(true, std::sync::atomic::Ordering::Relaxed); } true }) @@ -582,7 +488,6 @@ fn streams_from_response(response: OrgFreedesktopPortalRequestResponse) -> Vec

    Vec

    Result { let conn = SyncConnection::new_session()?; @@ -606,15 +510,16 @@ pub fn get_available_cursor_modes() -> Result { } // mostly inspired by https://gitlab.gnome.org/-/snippets/39 -pub fn request_remote_desktop( - capture_cursor: bool, -) -> ResultType<( - SyncConnection, - OwnedFd, - Vec, - dbus::Path<'static>, - bool, -)> { +pub fn request_remote_desktop() -> Result< + ( + SyncConnection, + OwnedFd, + Vec, + dbus::Path<'static>, + bool, + ), + Box, +> { unsafe { if !INIT { gstreamer::init()?; @@ -669,7 +574,6 @@ pub fn request_remote_desktop( session.clone(), failure.clone(), is_support_restore_token, - capture_cursor, ), failure_res.clone(), )?; @@ -682,7 +586,7 @@ pub fn request_remote_desktop( break; } - if failure_res.load(Ordering::SeqCst) { + if failure_res.load(std::sync::atomic::Ordering::Relaxed) { break; } } @@ -703,7 +607,9 @@ pub fn request_remote_desktop( } } } - bail!("Failed to obtain screen capture. You may need to upgrade the PipeWire library for better compatibility. Please check https://github.com/rustdesk/rustdesk/issues/8600#issuecomment-2254720954 for more details.") + Err(Box::new(DBusError( +"Failed to obtain screen capture. You may need to upgrade the PipeWire library for better compatibility. Please check https://github.com/rustdesk/rustdesk/issues/8600#issuecomment-2254720954 for more details.".into() + ))) } fn on_create_session_response( @@ -712,7 +618,6 @@ fn on_create_session_response( session: Arc>>>, failure: Arc, is_support_restore_token: bool, - capture_cursor: bool, ) -> impl Fn( OrgFreedesktopPortalRequestResponse, &SyncConnection, @@ -756,19 +661,9 @@ fn on_create_session_response( Variant(Box::new("u3".to_string())), ); // https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.ScreenCast.html - if is_server_running() { - args.insert("multiple".into(), Variant(Box::new(true))); - } + // args.insert("multiple".into(), Variant(Box::new(true))); args.insert("types".into(), Variant(Box::new(1u32))); //| 2u32))); - if capture_cursor { - get_available_cursor_modes().ok().map(|modes| { - if modes & 0x2 != 0 { - args.insert("cursor_mode".to_string(), Variant(Box::new(2u32))); - } - }); - } - let path = portal.select_sources(ses.clone(), args)?; handle_response( c, @@ -830,9 +725,7 @@ fn on_select_devices_response( Variant(Box::new("u3".to_string())), ); // https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.ScreenCast.html - if is_server_running() { - args.insert("multiple".into(), Variant(Box::new(true))); - } + // args.insert("multiple".into(), Variant(Box::new(true))); args.insert("types".into(), Variant(Box::new(1u32))); //| 2u32))); let session = session.clone(); @@ -941,7 +834,7 @@ pub fn get_capturables() -> Result, Box> { }; if rdp_connection.is_none() { - let (conn, fd, streams, session, is_support_restore_token) = request_remote_desktop(false)?; + let (conn, fd, streams, session, is_support_restore_token) = request_remote_desktop()?; let conn = Arc::new(conn); let rdp_info = RdpSessionInfo { @@ -955,7 +848,7 @@ pub fn get_capturables() -> Result, Box> { *rdp_connection = Some(rdp_info); } - let rdp_info = match rdp_connection.as_mut() { + let rdp_info = match rdp_connection.as_ref() { Some(res) => res, None => { return Err(Box::new(DBusError("RDP response is None.".into()))); @@ -964,7 +857,8 @@ pub fn get_capturables() -> Result, Box> { Ok(rdp_info .streams - .iter() + .clone() + .into_iter() .map(|s| { PipeWireCapturable::new( rdp_info.conn.clone(), @@ -985,12 +879,7 @@ pub fn get_capturables() -> Result, Box> { // // `screencast_portal` supports restore_token and persist_mode if the version is greater than or equal to 4. // `remote_desktop_portal` does not support restore_token and persist_mode. -pub(crate) fn is_server_running() -> bool { - let v = IS_SERVER_RUNNING.load(Ordering::SeqCst); - if v > 0 { - return v == 1; - } - +fn is_server_running() -> bool { let app_name = config::APP_NAME.read().unwrap().clone().to_lowercase(); let output = match Command::new(CMD_SH.as_str()) .arg("-c") @@ -1005,533 +894,5 @@ pub(crate) fn is_server_running() -> bool { let output_str = String::from_utf8_lossy(&output.stdout); let is_running = output_str.contains(&format!("{} --server", app_name)); - IS_SERVER_RUNNING.store(if is_running { 1 } else { 2 }, Ordering::SeqCst); is_running } - -// The logical size reported by portal may be different from the size reported by `get_displays()`. -// So we need to use the workaround here. -// 1. openSUSE, KDE Plasma -// 2. Kubuntu 24.04 TLS, after running `sudo apt install plasma-workspace-wayland` -// Maybe it's a bug, and we can remove this workaround in the future. -pub fn try_fix_logical_size(shared_displays: &mut Vec) { - if !is_server_running() { - return; - } - - let wayland_displays = get_displays(); - if wayland_displays.displays.is_empty() { - return; - } - - for sd in shared_displays.iter_mut() { - if let crate::Display::WAYLAND(d) = sd { - let capturable = &mut d.0; - for wd in wayland_displays.displays.iter() { - if capturable.position.0 == wd.x && capturable.position.1 == wd.y { - if let Some(logical_size) = wd.logical_size { - if capturable.physical_size.0 != wd.width as usize - || capturable.physical_size.1 != wd.height as usize - { - // If "Full Workspace" is selected in the portal dialog, - // the physical size reported by portal may not match the display info. - debug!( - "Physical size of capturable ({:?}) does not match display info: ({:?}) - ({:?}). Skipping logical size fix.", - capturable.position, - capturable.physical_size, - (wd.width as usize, wd.height as usize) - ); - break; - } - - if capturable.logical_size.0 != logical_size.0 as usize - || capturable.logical_size.1 != logical_size.1 as usize - { - warn!( - "Fixing logical size of capturable from {:?} to {:?} based on display info {:?}.", - capturable.logical_size, - logical_size, - wd - ); - capturable.logical_size = - (logical_size.0 as usize, logical_size.1 as usize); - } - } - break; - } - } - } - } -} - -pub fn fill_displays( - mouse_move_to: impl Fn(i32, i32), - get_cursor_pos: fn() -> Option<(i32, i32)>, - shared_displays: &mut Vec, -) -> ResultType<()> { - if !is_server_running() { - return Ok(()); - } - - let mut rdp_connection = RDP_SESSION_INFO.lock().unwrap(); - let rdp_info = match rdp_connection.as_mut() { - Some(res) => res, - None => { - // Unreachable - bail!("RDP session info is None when filling display positions."); - } - }; - - let all_displays = get_displays(); - if !HAS_POSITION_ATTR.load(Ordering::SeqCst) { - if all_displays.displays.len() > 1 { - debug!("Multiple Wayland displays detected, adjusting stream positions accordingly."); - try_fill_positions( - mouse_move_to, - get_cursor_pos, - &all_displays, - shared_displays, - &mut rdp_info.streams, - )?; - } - HAS_POSITION_ATTR.store(true, Ordering::SeqCst); - } - - if all_displays.displays.len() > 1 { - sort_streams(&all_displays, shared_displays, &mut rdp_info.streams); - } - - shared_displays.iter_mut().next().map(|d| { - if let crate::Display::WAYLAND(d) = d { - d.0.primary = true; - } - }); - - Ok(()) -} - -fn try_fill_positions( - mouse_move_to: impl Fn(i32, i32), - get_cursor_pos: fn() -> Option<(i32, i32)>, - displays: &Arc, - shared_displays: &mut Vec, - streams: &mut Vec, -) -> ResultType<()> { - let pipewire_display_offset = config::LocalConfig::get_option(PIPEWIRE_DISPLAY_OFFSET_CONF_KEY); - if !pipewire_display_offset.is_empty() { - if try_fill_positions_from_cache( - pipewire_display_offset, - displays, - shared_displays, - streams, - ) { - return Ok(()); - } - config::LocalConfig::set_option(PIPEWIRE_DISPLAY_OFFSET_CONF_KEY.to_owned(), "".to_owned()); - } - - let mut multi_matched_indices = Vec::new(); - for (i, sd) in shared_displays.iter_mut().enumerate() { - if let crate::Display::WAYLAND(d) = sd { - let capturable = &mut d.0; - let mut match_count = 0; - for wd in displays.displays.iter() { - if capturable.physical_size.0 == wd.width as usize - && capturable.physical_size.1 == wd.height as usize - { - capturable.position = (wd.x, wd.y); - if let Some(pw_stream) = streams.get_mut(i) { - pw_stream.position = (wd.x, wd.y); - } - match_count += 1; - } - } - if match_count == 0 { - warn!( - "No matching display found for capturable with size {:?}.", - capturable.physical_size - ); - } else if match_count > 1 { - multi_matched_indices.push(i); - } - } - } - - if !multi_matched_indices.is_empty() { - fill_multi_matched_positions( - mouse_move_to, - get_cursor_pos, - displays, - shared_displays, - streams, - multi_matched_indices, - )?; - } - - save_positions_to_cache(displays, shared_displays); - Ok(()) -} - -fn try_fill_positions_from_cache( - cache_str: String, - displays: &Arc, - shared_displays: &mut Vec, - streams: &mut Vec, -) -> bool { - let Ok(cache) = serde_json::from_str::(&cache_str) else { - return false; - }; - - if cache.offsets.len() != shared_displays.len() { - return false; - } - - let display_key = PipewireDisplayOffsetCache::displays_to_key(displays); - if cache.display_key != display_key { - return false; - } - - let restore_token = config::LocalConfig::get_option(RESTORE_TOKEN_CONF_KEY); - if cache.restore_token != restore_token { - return false; - } - - for (i, sd) in shared_displays.iter_mut().enumerate() { - if let crate::Display::WAYLAND(d) = sd { - let capturable = &mut d.0; - if let Some((x_off, y_off)) = cache.offsets.get(i) { - capturable.position = (*x_off, *y_off); - if let Some(pw_stream) = streams.get_mut(i) { - pw_stream.position = (*x_off, *y_off); - } - } - } - } - true -} - -fn save_positions_to_cache(displays: &Arc, shared_displays: &Vec) { - let restore_token = config::LocalConfig::get_option(RESTORE_TOKEN_CONF_KEY); - if restore_token.is_empty() { - return; - } - - let mut offsets = Vec::new(); - for sd in shared_displays.iter() { - if let crate::Display::WAYLAND(d) = sd { - let capturable = &d.0; - offsets.push((capturable.position.0, capturable.position.1)); - } - } - - let display_key = PipewireDisplayOffsetCache::displays_to_key(displays); - let cache = PipewireDisplayOffsetCache { - display_key, - restore_token, - offsets, - }; - - if let Ok(s) = serde_json::to_string(&cache) { - config::LocalConfig::set_option(PIPEWIRE_DISPLAY_OFFSET_CONF_KEY.to_owned(), s); - } -} - -fn compare_left_up_corner(w: usize, d1: &[u8], d2: &[u8]) -> bool { - if w == 0 { - return false; - } - if d1.len() != d2.len() { - return false; - } - let bpp = 4; // BGR0/RGB0 - let stride = w.saturating_mul(bpp); - if stride == 0 || d1.len() < stride || d2.len() < stride { - return false; - } - let h = d1.len() / stride; - if h == 0 { - return false; - } - - let roi_w = std::cmp::min(36, w); - let roi_h = std::cmp::min(36, h); - let mut diff_px = 0usize; - let total_px = roi_w * roi_h; - // Minimum number of differing pixels required to consider images different. - const MIN_DIFF_PIXELS: usize = 8; - // Divisor for threshold calculation: allows up to 1/8 of ROI pixels to differ before returning true. - const DIFF_THRESHOLD_DIVISOR: usize = 8; - let threshold = std::cmp::max(MIN_DIFF_PIXELS, total_px / DIFF_THRESHOLD_DIVISOR); - - for y in 0..roi_h { - let row_off = y * stride; - for x in 0..roi_w { - let i = row_off + x * bpp; - let a = &d1[i..i + bpp]; - let b = &d2[i..i + bpp]; - if a != b { - diff_px += 1; - if diff_px >= threshold { - return true; - } - } - } - } - false -} - -fn fill_multi_matched_positions( - mouse_move_to: impl Fn(i32, i32), - get_cursor_pos: fn() -> Option<(i32, i32)>, - displays: &Arc, - shared_displays: &mut Vec, - streams: &mut Vec, - multi_matched_indices: Vec, -) -> ResultType<()> { - debug!( - "Multiple capturables ({:?}) match the same display size, attempting to disambiguate positions.", - &multi_matched_indices); - if multi_matched_indices.is_empty() { - return Ok(()); - } - - let is_support_embeded_cursor = get_available_cursor_modes() - .ok() - .map(|modes| modes & 0x2 != 0) - .unwrap_or(false); - if is_support_embeded_cursor { - fill_multi_matched_positions_cursor( - mouse_move_to, - get_cursor_pos, - displays, - shared_displays, - streams, - multi_matched_indices, - )?; - } - - Ok(()) -} - -fn mouse_move_to_( - mouse_move_to: &impl Fn(i32, i32), - get_cursor_pos: fn() -> Option<(i32, i32)>, - x: i32, - y: i32, -) { - const MOVE_MOUSE_TIMEOUT: Duration = Duration::from_millis(150); - let start = std::time::Instant::now(); - while start.elapsed() < MOVE_MOUSE_TIMEOUT { - mouse_move_to(x, y); - std::thread::sleep(Duration::from_millis(20)); - if let Some((x1, y1)) = get_cursor_pos() { - if x1 == x && y1 == y { - return; - } - } - } - warn!( - "Failed to move mouse to ({}, {}) within timeout: {:?}.", - x, y, &MOVE_MOUSE_TIMEOUT - ); -} - -fn fill_multi_matched_positions_cursor( - mouse_move_to: impl Fn(i32, i32), - get_cursor_pos: fn() -> Option<(i32, i32)>, - displays: &Arc, - shared_displays: &mut Vec, - streams: &mut Vec, - multi_matched_indices: Vec, -) -> ResultType<()> { - // This creates a new remote desktop session for cursor-based position detection. - // The session is temporary, used only for disambiguation, and is dropped after detection completes. - let (conn, fd, streams_with_cursor, _session, _is_support_restore_token) = - request_remote_desktop(true)?; - let conn = Arc::new(conn); - - let mut matched_indices = Vec::new(); - const CAPTURE_TIMEOUT_MS: u64 = 1_000; - for idx in multi_matched_indices { - match ( - shared_displays.get_mut(idx), - streams.get_mut(idx), - streams_with_cursor.get(idx), - ) { - (Some(crate::Display::WAYLAND(d)), Some(pw_stream), Some(pw_stream_with_cursor)) => { - // Check if only one display matches the size - let mut match_count = 0; - for (i, wd) in displays.displays.iter().enumerate() { - if matched_indices.contains(&i) { - continue; - } - if d.0.physical_size.0 == wd.width as usize - && d.0.physical_size.1 == wd.height as usize - { - match_count += 1; - } - } - if match_count == 0 { - error!( - "No matching display found for capturable with size {:?}.", - d.0.physical_size - ); - continue; - } - if match_count == 1 { - for (i, wd) in displays.displays.iter().enumerate() { - if matched_indices.contains(&i) { - continue; - } - if d.0.physical_size.0 == wd.width as usize - && d.0.physical_size.1 == wd.height as usize - { - d.0.position = (wd.x, wd.y); - pw_stream.position = (wd.x, wd.y); - matched_indices.push(i); - debug!( - "Disambiguated position for capturable with size {:?} to ({}, {}).", - d.0.physical_size, wd.x, wd.y - ); - break; - } - } - continue; - } - - // Move the mouse to a neutral position first, - // to avoid interference from previous position. - mouse_move_to_(&mouse_move_to, get_cursor_pos, 300, 300); - - let mut rec = PipeWireRecorder::new(PipeWireCapturable { - dbus_conn: conn.clone(), - fd: fd.clone(), - path: pw_stream_with_cursor.path, - source_type: pw_stream_with_cursor.source_type, - primary: false, - position: pw_stream_with_cursor.position, - logical_size: pw_stream_with_cursor.size, - physical_size: (0, 0), - })?; - // Take first frame and copy owned buffer to avoid borrow across second capture - let (is_bgr, w, first_buf): (bool, usize, Vec) = - match rec.capture(CAPTURE_TIMEOUT_MS) { - Ok(PixelProvider::BGR0(w, _, data1)) => (true, w, data1.to_vec()), - Ok(PixelProvider::RGB0(w, _, data1)) => (false, w, data1.to_vec()), - Ok(_) => { - error!("Unexpected pixel format on first capture."); - continue; - } - Err(e) => { - error!( - "Failed to capture screen for position disambiguation: {}", - e - ); - continue; - } - }; - - let matched_len = matched_indices.len(); - for (i, wd) in displays.displays.iter().enumerate() { - if matched_indices.contains(&i) { - continue; - } - - if wd.width as usize == d.0.physical_size.0 - && wd.height as usize == d.0.physical_size.1 - { - mouse_move_to_(&mouse_move_to, get_cursor_pos, wd.x + 8, wd.y + 8); - rec.saved_raw_data.clear(); - match rec.capture(CAPTURE_TIMEOUT_MS) { - Ok(PixelProvider::BGR0(_, _, data2)) if is_bgr => { - if compare_left_up_corner(w, &first_buf, data2) { - d.0.position = (wd.x, wd.y); - pw_stream.position = (wd.x, wd.y); - matched_indices.push(i); - debug!( - "Disambiguated position for capturable with size {:?} to ({}, {}).", - d.0.physical_size, wd.x, wd.y - ); - break; - } - } - Ok(PixelProvider::RGB0(_, _, data2)) if !is_bgr => { - if compare_left_up_corner(w, &first_buf, data2) { - d.0.position = (wd.x, wd.y); - pw_stream.position = (wd.x, wd.y); - matched_indices.push(i); - debug!( - "Disambiguated position for capturable with size {:?} to ({}, {}).", - d.0.physical_size, wd.x, wd.y - ); - break; - } - } - Ok(_) => { - // unreachable - error!("Pixel format changed between captures, cannot disambiguate position."); - } - Err(e) => { - error!( - "Failed to capture screen for position disambiguation: {}", - e - ); - } - } - } - } - if matched_len == matched_indices.len() { - error!( - "Failed to disambiguate position for capturable with size {:?}.", - d.0.physical_size - ); - } - } - _ => {} - } - } - - Ok(()) -} - -fn sort_streams( - displays: &Arc, - shared_displays: &mut Vec, - streams: &mut Vec, -) { - if streams.is_empty() { - // unreachable - error!("No streams available to sort."); - return; - } - - // put the main display first, then the rest by the order of displays - let mut display_order: Vec<(i32, i32)> = Vec::new(); - if let Some(d) = displays.displays.get(displays.primary) { - display_order.push((d.x, d.y)); - } - for (i, d) in displays.displays.iter().enumerate() { - if i != displays.primary { - display_order.push((d.x, d.y)); - } - } - - let mut sorted_streams = Vec::new(); - let mut sorted_shared_displays = Vec::new(); - // Move matching items in order without cloning - for (x, y) in display_order.into_iter() { - for i in 0..streams.len() { - if streams[i].position.0 == x && streams[i].position.1 == y { - sorted_streams.push(streams.remove(i)); - // shared_displays.len() must be equal to streams.len() - // But we still check the length to avoid panic - if shared_displays.len() > i { - sorted_shared_displays.push(shared_displays.remove(i)); - } - break; - } - } - } - *streams = sorted_streams; - *shared_displays = sorted_shared_displays; -} diff --git a/libs/scrap/src/x11/server.rs b/libs/scrap/src/x11/server.rs index 7ae145d40..f9983f7cf 100644 --- a/libs/scrap/src/x11/server.rs +++ b/libs/scrap/src/x11/server.rs @@ -98,7 +98,7 @@ unsafe fn check_x11_shm_available(c: *mut xcb_connection_t) -> Result<(), Error> let mut e: *mut xcb_generic_error_t = std::ptr::null_mut(); let reply = xcb_shm_query_version_reply(c, cookie, &mut e as _); if reply.is_null() { - // TODO: Should separate SHM disabled from SHM not supported? + // TODO: Should seperate SHM disabled from SHM not supported? return Err(Error::UnsupportedExtension); } else { // https://github.com/FFmpeg/FFmpeg/blob/6229e4ac425b4566446edefb67d5c225eb397b58/libavdevice/xcbgrab.c#L229 diff --git a/libs/virtual_display/dylib/README.md b/libs/virtual_display/dylib/README.md index fb71c3c56..30fa588f1 100644 --- a/libs/virtual_display/dylib/README.md +++ b/libs/virtual_display/dylib/README.md @@ -29,4 +29,4 @@ TODO ## X11 -## macOS +## OSX diff --git a/res/DEBIAN/postinst b/res/DEBIAN/postinst index 57bb30d61..dad333ee5 100755 --- a/res/DEBIAN/postinst +++ b/res/DEBIAN/postinst @@ -6,13 +6,15 @@ if [ "$1" = configure ]; then INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') ln -f -s /usr/share/rustdesk/rustdesk /usr/bin/rustdesk - + if [ "systemd" == "$INITSYS" ]; then if [ -e /etc/systemd/system/rustdesk.service ]; then rm /etc/systemd/system/rustdesk.service /usr/lib/systemd/system/rustdesk.service /usr/lib/systemd/user/rustdesk.service >/dev/null 2>&1 fi - mkdir -p /usr/lib/systemd/system/ + version=$(python3 -V 2>&1 | grep -Po '(?<=Python )(.+)') + parsedVersion=$(echo "${version//./}") + mkdir -p /usr/lib/systemd/system/ cp /usr/share/rustdesk/files/systemd/rustdesk.service /usr/lib/systemd/system/rustdesk.service # try fix error in Ubuntu 18.04 # Failed to reload rustdesk.service: Unit rustdesk.service is not loaded properly: Exec format error. diff --git a/res/PKGBUILD b/res/PKGBUILD index dd266eb2a..a5601bf31 100644 --- a/res/PKGBUILD +++ b/res/PKGBUILD @@ -1,5 +1,5 @@ pkgname=rustdesk -pkgver=1.4.6 +pkgver=1.4.0 pkgrel=0 epoch= pkgdesc="" diff --git a/res/ab.py b/res/ab.py deleted file mode 100644 index 11f52282b..000000000 --- a/res/ab.py +++ /dev/null @@ -1,791 +0,0 @@ -#!/usr/bin/env python3 - -import requests -import argparse -import json -from datetime import datetime, timedelta - - -def get_personal_ab(url, token): - """Get personal address book GUID""" - headers = {"Authorization": f"Bearer {token}"} - - response = requests.get(f"{url}/api/ab/personal", headers=headers) - - if response.status_code != 200: - return f"Error: {response.status_code} - {response.text}" - - return response.json() - - -def view_shared_abs(url, token, name=None): - """View all shared address books (excluding personal ones)""" - headers = {"Authorization": f"Bearer {token}"} - pageSize = 30 - params = { - "name": name, - } - - filtered_params = { - k: "%" + v + "%" if (v != "-" and "%" not in v and k != "name") else v - for k, v in params.items() - if v is not None - } - filtered_params["pageSize"] = pageSize - - abs = [] - current = 0 - - while True: - current += 1 - filtered_params["current"] = current - response = requests.get(f"{url}/api/ab/shared/profiles", headers=headers, params=filtered_params) - if response.status_code != 200: - print(f"Error: HTTP {response.status_code} - {response.text}") - exit(1) - - response_json = response.json() - if "error" in response_json: - print(f"Error: {response_json['error']}") - exit(1) - - data = response_json.get("data", []) - abs.extend(data) - - total = response_json.get("total", 0) - if len(data) < pageSize or current * pageSize >= total: - break - - return abs - - -def get_ab_by_name(url, token, ab_name): - """Get address book by name""" - abs = view_shared_abs(url, token, ab_name) - for ab in abs: - if ab["name"] == ab_name: - return ab - return None - - -def view_ab_peers(url, token, ab_guid, peer_id=None, alias=None): - """View peers in an address book""" - headers = {"Authorization": f"Bearer {token}"} - pageSize = 30 - params = { - "ab": ab_guid, - "id": peer_id, - "alias": alias, - } - - filtered_params = { - k: "%" + v + "%" if (v != "-" and "%" not in v and k not in ["ab"]) else v - for k, v in params.items() - if v is not None - } - filtered_params["pageSize"] = pageSize - - peers = [] - current = 0 - - while True: - current += 1 - filtered_params["current"] = current - response = requests.get(f"{url}/api/ab/peers", headers=headers, params=filtered_params) - if response.status_code != 200: - print(f"Error: HTTP {response.status_code} - {response.text}") - exit(1) - - response_json = response.json() - if "error" in response_json: - print(f"Error: {response_json['error']}") - exit(1) - - data = response_json.get("data", []) - peers.extend(data) - - total = response_json.get("total", 0) - if len(data) < pageSize or current * pageSize >= total: - break - - return peers - - -def view_ab_tags(url, token, ab_guid): - """View tags in an address book""" - headers = {"Authorization": f"Bearer {token}"} - response = requests.get(f"{url}/api/ab/tags/{ab_guid}", headers=headers) - response_json = check_response(response) - - # Format color values as hex - if response_json: - for tag in response_json: - if "color" in tag and tag["color"] is not None: - # Convert color to hex format - color_value = tag["color"] - if isinstance(color_value, int): - tag["color"] = f"0x{color_value:08X}" - - return response_json if response_json else [] - - -def check_response(response): - """Check API response and return result""" - if response.status_code != 200: - print(f"Error: HTTP {response.status_code} - {response.text}") - exit(1) - - try: - response_json = response.json() - if "error" in response_json: - print(f"Error: {response_json['error']}") - exit(1) - return response_json - except ValueError: - return response.text or "Success" - - -def add_peer(url, token, ab_guid, peer_id, alias=None, note=None, tags=None, password=None): - """Add a peer to address book""" - print(f"Adding peer {peer_id} to address book") - headers = {"Authorization": f"Bearer {token}"} - - payload = { - "id": peer_id, - "note": note, - } - - # Add peer info if provided - info = {} - if alias: - info["alias"] = alias - if tags: - info["tags"] = tags if isinstance(tags, list) else [tags] - if password: - info["password"] = password - - if info: - payload.update(info) - - response = requests.post(f"{url}/api/ab/peer/add/{ab_guid}", headers=headers, json=payload) - return check_response(response) - - -def delete_peer(url, token, ab_guid, peer_ids): - """Delete peers from address book by IDs""" - if isinstance(peer_ids, str): - peer_ids = [peer_ids] - - print(f"Deleting peers {peer_ids} from address book") - headers = {"Authorization": f"Bearer {token}"} - response = requests.delete(f"{url}/api/ab/peer/{ab_guid}", headers=headers, json=peer_ids) - return check_response(response) - -def update_peer(url, token, ab_guid, peer_id, alias=None, note=None, tags=None, password=None): - """Update a peer in address book""" - print(f"Updating peer {peer_id} in address book") - headers = {"Authorization": f"Bearer {token}"} - - # Check if at least one parameter is provided for update - update_params = [alias, note, tags, password] - if all(param is None for param in update_params): - return "Error: At least one parameter must be specified for update" - - payload = { - "id": peer_id, - } - - # Add fields to update - info = {} - if alias is not None: - info["alias"] = alias - if tags is not None: - info["tags"] = tags if isinstance(tags, list) else [tags] - if password is not None: - info["password"] = password - - if info: - payload.update(info) - - if note is not None: - payload["note"] = note - - response = requests.put(f"{url}/api/ab/peer/update/{ab_guid}", headers=headers, json=payload) - return check_response(response) - - -def str2color(tag_name, existing_colors=None): - """Generate color for tag name similar to str2color2 function""" - if existing_colors is None: - existing_colors = [] - - color_map = { - "red": 0xFFFF0000, - "green": 0xFF008000, - "blue": 0xFF0000FF, - "orange": 0xFFFF9800, - "purple": 0xFF9C27B0, - "grey": 0xFF9E9E9E, - "cyan": 0xFF00BCD4, - "lime": 0xFFCDDC39, - "teal": 0xFF009688, - "pink": 0xFFF48FB1, - "indigo": 0xFF3F51B5, - "brown": 0xFF795548, - } - - lower_name = tag_name.lower() - - # Check if tag name matches a predefined color - if lower_name in color_map: - return color_map[lower_name] - - # Special case for yellow - if lower_name == "yellow": - return 0xFFFFFF00 - - # Generate hash-based color - hash_value = 0 - for char in tag_name: - hash_value += ord(char) - - color_list = list(color_map.values()) - hash_value = hash_value % len(color_list) - result = color_list[hash_value] - - # If color is already used, try to find an unused one - if result in existing_colors: - for color in color_list: - if color not in existing_colors: - result = color - break - - return result - - -def add_tag(url, token, ab_guid, tag_name, color=None): - """Add a tag to address book""" - print(f"Adding tag '{tag_name}' to address book") - headers = {"Authorization": f"Bearer {token}"} - - # If no color specified, generate one based on tag name - if color is None: - # Get existing tags to avoid color conflicts - try: - existing_tags = view_ab_tags(url, token, ab_guid) - existing_colors = [tag.get("color", 0) for tag in existing_tags] - color = str2color(tag_name, existing_colors) - except: - # Fallback to default color if we can't get existing tags - color = str2color(tag_name) - - payload = { - "name": tag_name, - "color": color, - } - - response = requests.post(f"{url}/api/ab/tag/add/{ab_guid}", headers=headers, json=payload) - return check_response(response) - - -def update_tag(url, token, ab_guid, tag_name, color): - """Update a tag in address book""" - print(f"Updating tag '{tag_name}' in address book") - headers = {"Authorization": f"Bearer {token}"} - - payload = { - "name": tag_name, - "color": color, - } - - response = requests.put(f"{url}/api/ab/tag/update/{ab_guid}", headers=headers, json=payload) - return check_response(response) - - -def delete_tags(url, token, ab_guid, tag_names): - """Delete tags from address book""" - if isinstance(tag_names, str): - tag_names = [tag_names] - - print(f"Deleting tags {tag_names} from address book") - headers = {"Authorization": f"Bearer {token}"} - response = requests.delete(f"{url}/api/ab/tag/{ab_guid}", headers=headers, json=tag_names) - return check_response(response) - - -def add_shared_ab(url, token, name, note=None, password=None): - """Add a new shared address book""" - print(f"Adding shared address book '{name}'") - headers = {"Authorization": f"Bearer {token}"} - - payload = { - "name": name, - "note": note, - } - - # Add info if password is provided - if password: - payload["info"] = { - "password": password - } - - response = requests.post(f"{url}/api/ab/shared/add", headers=headers, json=payload) - return check_response(response) - - -def update_shared_ab(url, token, ab_guid, name=None, note=None, owner=None, password=None): - """Update a shared address book""" - print(f"Updating shared address book {ab_guid}") - headers = {"Authorization": f"Bearer {token}"} - - # Check if at least one parameter is provided for update - update_params = [name, note, owner, password] - if all(param is None for param in update_params): - return "Error: At least one parameter must be specified for update" - - payload = { - "guid": ab_guid, - } - - if name is not None: - payload["name"] = name - if note is not None: - payload["note"] = note - if owner is not None: - payload["owner"] = owner - if password is not None: - payload["info"] = { - "password": password - } - - response = requests.put(f"{url}/api/ab/shared/update/profile", headers=headers, json=payload) - return check_response(response) - - -def delete_shared_abs(url, token, ab_guids): - """Delete shared address books""" - if isinstance(ab_guids, str): - ab_guids = [ab_guids] - - print(f"Deleting shared address books {ab_guids}") - headers = {"Authorization": f"Bearer {token}"} - response = requests.delete(f"{url}/api/ab/shared", headers=headers, json=ab_guids) - return check_response(response) - - -def permission_to_string(permission): - """Convert numeric permission to string representation""" - permission_map = { - 1: "ro", # Read - 2: "rw", # ReadWrite - 3: "full" # FullControl - } - return permission_map.get(permission, str(permission)) - - -def string_to_permission(permission_str): - """Convert string permission to numeric representation""" - permission_map = { - "ro": 1, # Read - "rw": 2, # ReadWrite - "full": 3 # FullControl - } - return permission_map.get(permission_str.lower(), None) - - -def view_ab_rules(url, token, ab_guid): - """View rules in an address book""" - headers = {"Authorization": f"Bearer {token}"} - pageSize = 30 - params = { - "ab": ab_guid, - "pageSize": pageSize, - } - - rules = [] - current = 0 - - while True: - current += 1 - params["current"] = current - response = requests.get(f"{url}/api/ab/rules", headers=headers, params=params) - if response.status_code != 200: - print(f"Error: HTTP {response.status_code} - {response.text}") - exit(1) - - response_json = response.json() - if "error" in response_json: - print(f"Error: {response_json['error']}") - exit(1) - - data = response_json.get("data", []) - rules.extend(data) - - total = response_json.get("total", 0) - if len(data) < pageSize or current * pageSize >= total: - break - - # Convert numeric permissions to string format - for rule in rules: - if "rule" in rule: - rule["rule"] = permission_to_string(rule["rule"]) - - return rules - - -def add_ab_rule(url, token, ab_guid, rule_type, user=None, group=None, rule=1): - """Add a rule to address book""" - print(f"Adding {rule_type} rule to address book") - headers = {"Authorization": f"Bearer {token}"} - - payload = { - "guid": ab_guid, - "rule": rule, - } - - if rule_type == "user" and user: - payload["user"] = user - elif rule_type == "group" and group: - payload["group"] = group - elif rule_type == "everyone": - # For everyone, both user and group are None (not included in payload) - pass - - response = requests.post(f"{url}/api/ab/rule", headers=headers, json=payload) - return check_response(response) - - -def update_ab_rule(url, token, rule_guid, rule): - """Update an address book rule""" - print(f"Updating rule {rule_guid}") - headers = {"Authorization": f"Bearer {token}"} - - payload = { - "guid": rule_guid, - "rule": rule, - } - - response = requests.patch(f"{url}/api/ab/rule", headers=headers, json=payload) - return check_response(response) - - -def delete_ab_rules(url, token, rule_guids): - """Delete address book rules""" - if isinstance(rule_guids, str): - rule_guids = [rule_guids] - - print(f"Deleting rules {rule_guids}") - headers = {"Authorization": f"Bearer {token}"} - response = requests.delete(f"{url}/api/ab/rules", headers=headers, json=rule_guids) - return check_response(response) - - -def main(): - def parse_color(value): - """Parse color value - supports both hex (0xFF00FF00) and decimal""" - if value.startswith('0x') or value.startswith('0X'): - return int(value, 16) - else: - return int(value) - - def parse_permission(value): - """Parse permission value - supports both string (ro/rw/full) and numeric (1/2/3)""" - # Try to parse as string first - permission_num = string_to_permission(value) - if permission_num is not None: - return permission_num - - # Try to parse as integer for backward compatibility - try: - num_value = int(value) - if num_value in [1, 2, 3]: - return num_value - else: - raise argparse.ArgumentTypeError(f"Invalid permission value: {value}. Must be one of: ro, rw, full, 1, 2, 3") - except ValueError: - raise argparse.ArgumentTypeError(f"Invalid permission value: {value}. Must be one of: ro, rw, full, 1, 2, 3") - - parser = argparse.ArgumentParser(description="Address Book manager") - - # Required arguments - parser.add_argument( - "command", - choices=["view-ab", "add-ab", "update-ab", "delete-ab", "get-personal-ab", - "view-peer", "add-peer", "update-peer", "delete-peer", - "view-tag", "add-tag", "update-tag", "delete-tag", - "view-rule", "add-rule", "update-rule", "delete-rule"], - help="Command to execute", - ) - - # Global arguments (used by all commands) - parser.add_argument("--url", required=True, help="URL of the API") - parser.add_argument("--token", required=True, help="Bearer token for authentication") - - # Address book identification (used by most commands except get-personal-ab) - parser.add_argument("--ab-name", help="Address book name (for identification)") - parser.add_argument("--ab-guid", help="Address book GUID (alternative to ab-name)") - - # Address book management arguments - parser.add_argument("--ab-update-name", help="New address book name (for update)") - parser.add_argument("--note", help="Note field") - parser.add_argument("--password", help="Password field") - parser.add_argument("--owner", help="Address book owner (username)") - - # Peer management arguments - parser.add_argument("--peer-id", help="Peer ID") - parser.add_argument("--alias", help="Peer alias") - parser.add_argument("--tags", help="Peer tags (supports both 'tag1,tag2' and '[tag1,tag2]' formats, use '[]' to clear tags)") - - # Tag management arguments - parser.add_argument("--tag-name", help="Tag name") - parser.add_argument("--tag-color", type=parse_color, help="Tag color (hex number like 0xFF00FF00 or decimal, auto-generated if not specified)") - - # Rule management arguments - parser.add_argument("--rule-type", choices=["user", "group", "everyone"], help="Rule type (auto-detected if not specified)") - parser.add_argument("--rule-user", help="Rule target user name (auto-sets rule-type=user)") - parser.add_argument("--rule-group", help="Rule target group name (auto-sets rule-type=group)") - parser.add_argument("--rule-permission", type=parse_permission, help="Rule permission (ro=Read, rw=ReadWrite, full=FullControl, or numeric 1/2/3)") - parser.add_argument("--rule-guid", help="Rule GUID (for update/delete)") - - args = parser.parse_args() - - # Remove trailing slashes from URL - while args.url.endswith("/"): - args.url = args.url[:-1] - - if args.command == "view-ab": - # View all shared address books - abs = view_shared_abs(args.url, args.token, args.ab_name) - print(json.dumps(abs, indent=2)) - - elif args.command == "get-personal-ab": - # Get personal address book GUID - personal_ab = get_personal_ab(args.url, args.token) - print(json.dumps(personal_ab, indent=2)) - - elif args.command in ["add-ab", "update-ab", "delete-ab"]: - # Address book management commands - if args.command == "add-ab": - if not args.ab_name: - print("Error: --ab-name is required for add-ab command") - return - - result = add_shared_ab(args.url, args.token, args.ab_name, args.note, args.password) - print(f"Result: {result}") - - elif args.command in ["update-ab", "delete-ab"]: - # Commands that need ab-name or ab-guid - if not args.ab_name and not args.ab_guid: - print("Error: --ab-name or --ab-guid is required for this command") - return - - if args.ab_name and args.ab_guid: - print("Error: Cannot specify both --ab-name and --ab-guid") - return - - if args.ab_guid: - ab_guid = args.ab_guid - print(f"Working with address book GUID: {ab_guid}") - else: - # Get address book by name - ab = get_ab_by_name(args.url, args.token, args.ab_name) - if not ab: - print(f"Error: Address book '{args.ab_name}' not found") - return - ab_guid = ab["guid"] - print(f"Working with address book: {args.ab_name} (GUID: {ab_guid})") - - if args.command == "update-ab": - result = update_shared_ab(args.url, args.token, ab_guid, args.ab_update_name, args.note, args.owner, args.password) - print(f"Result: {result}") - - elif args.command == "delete-ab": - result = delete_shared_abs(args.url, args.token, ab_guid) - print(f"Result: {result}") - - elif args.command in ["view-peer", "add-peer", "update-peer", "delete-peer", "view-tag", "add-tag", "update-tag", "delete-tag", "view-rule", "add-rule", "update-rule", "delete-rule"]: - if not args.ab_name and not args.ab_guid: - print("Error: --ab-name or --ab-guid is required for this command") - return - - if args.ab_name and args.ab_guid: - print("Error: Cannot specify both --ab-name and --ab-guid") - return - - if args.ab_guid: - ab_guid = args.ab_guid - print(f"Working with address book GUID: {ab_guid}") - else: - # Get address book by name - ab = get_ab_by_name(args.url, args.token, args.ab_name) - if not ab: - print(f"Error: Address book '{args.ab_name}' not found") - return - - ab_guid = ab["guid"] - print(f"Working with address book: {args.ab_name} (GUID: {ab_guid})") - - if args.command == "view-peer": - peers = view_ab_peers(args.url, args.token, ab_guid, args.peer_id, args.alias) - print(json.dumps(peers, indent=2)) - - elif args.command == "add-peer": - if not args.peer_id: - print("Error: --peer-id is required for add-peer command") - return - - # Handle tags parsing - support both [tag1,tag2] and tag1,tag2 formats - tags = None - if args.tags is not None: - if args.tags == "[]": - tags = [] # Empty list to clear tags - else: - # Remove brackets if present and split by comma - tags_str = args.tags.strip() - if tags_str.startswith('[') and tags_str.endswith(']'): - tags_str = tags_str[1:-1] # Remove brackets - tags = [tag.strip() for tag in tags_str.split(",") if tag.strip()] - - result = add_peer( - args.url, - args.token, - ab_guid, - args.peer_id, - args.alias, - args.note, - tags, - args.password - ) - print(f"Result: {result}") - - elif args.command == "update-peer": - if not args.peer_id: - print("Error: --peer-id is required for update-peer command") - return - - # Handle tags parsing - support both [tag1,tag2] and tag1,tag2 formats - tags = None - if args.tags is not None: - if args.tags == "[]": - tags = [] # Empty list to clear tags - else: - # Remove brackets if present and split by comma - tags_str = args.tags.strip() - if tags_str.startswith('[') and tags_str.endswith(']'): - tags_str = tags_str[1:-1] # Remove brackets - tags = [tag.strip() for tag in tags_str.split(",") if tag.strip()] - - result = update_peer( - args.url, - args.token, - ab_guid, - args.peer_id, - args.alias, - args.note, - tags, - args.password - ) - print(f"Result: {result}") - - elif args.command == "delete-peer": - if not args.peer_id: - print("Error: --peer-id is required for delete-peer command") - return - - result = delete_peer(args.url, args.token, ab_guid, args.peer_id) - print(f"Result: {result}") - - elif args.command == "view-tag": - tags = view_ab_tags(args.url, args.token, ab_guid) - print(json.dumps(tags, indent=2)) - - elif args.command == "add-tag": - if not args.tag_name: - print("Error: --tag-name is required for add-tag command") - return - - result = add_tag(args.url, args.token, ab_guid, args.tag_name, args.tag_color) - print(f"Result: {result}") - - elif args.command == "update-tag": - if not args.tag_name: - print("Error: --tag-name is required for update-tag command") - return - - result = update_tag(args.url, args.token, ab_guid, args.tag_name, args.tag_color) - print(f"Result: {result}") - - elif args.command == "delete-tag": - if not args.tag_name: - print("Error: --tag-name is required for delete-tag command") - return - - result = delete_tags(args.url, args.token, ab_guid, args.tag_name) - print(f"Result: {result}") - - elif args.command == "view-rule": - rules = view_ab_rules(args.url, args.token, ab_guid) - print(json.dumps(rules, indent=2)) - - elif args.command == "add-rule": - if not args.rule_permission: - print("Error: --rule-permission is required for add-rule command") - return - - # Auto-detect rule type if not explicitly specified - if not args.rule_type: - if args.rule_user and args.rule_group: - print("Error: Cannot specify both --rule-user and --rule-group") - return - elif args.rule_user: - rule_type = "user" - elif args.rule_group: - rule_type = "group" - else: - print("Error: Must specify --rule-type=everyone, --rule-user, or --rule-group") - return - else: - rule_type = args.rule_type - - # Validate explicit rule type with parameters - if rule_type == "user" and not args.rule_user: - print("Error: --rule-user is required when rule-type=user") - return - elif rule_type == "group" and not args.rule_group: - print("Error: --rule-group is required when rule-type=group") - return - elif rule_type == "user" and args.rule_group: - print("Error: Cannot specify --rule-group when rule-type=user") - return - elif rule_type == "group" and args.rule_user: - print("Error: Cannot specify --rule-user when rule-type=group") - return - elif rule_type == "everyone" and (args.rule_user or args.rule_group): - print("Error: Cannot specify --rule-user or --rule-group when rule-type=everyone") - return - - result = add_ab_rule(args.url, args.token, ab_guid, rule_type, args.rule_user, args.rule_group, args.rule_permission) - print(f"Result: {result}") - - elif args.command == "update-rule": - if not args.rule_guid: - print("Error: --rule-guid is required for update-rule command") - return - if not args.rule_permission: - print("Error: --rule-permission is required for update-rule command") - return - - result = update_ab_rule(args.url, args.token, args.rule_guid, args.rule_permission) - print(f"Result: {result}") - - elif args.command == "delete-rule": - if not args.rule_guid: - print("Error: --rule-guid is required for delete-rule command") - return - - result = delete_ab_rules(args.url, args.token, args.rule_guid) - print(f"Result: {result}") - - -if __name__ == "__main__": - main() diff --git a/res/audits.py b/res/audits.py deleted file mode 100755 index 77b0fd120..000000000 --- a/res/audits.py +++ /dev/null @@ -1,374 +0,0 @@ -#!/usr/bin/env python3 - -import requests -import argparse -import json -from datetime import datetime, timedelta, timezone - - -def format_timestamp(timestamp): - """Convert Unix timestamp to readable local datetime""" - if timestamp is None: - return None - try: - # Convert to local time - local_dt = datetime.fromtimestamp(timestamp) - return local_dt.strftime("%Y-%m-%d %H:%M:%S") - except (ValueError, TypeError): - return timestamp - - -def parse_local_time_to_utc_string(time_str): - """Parse local time string to UTC time string for API filtering""" - try: - # Parse the local time string - local_dt = datetime.strptime(time_str, "%Y-%m-%d %H:%M:%S.%f") - # Make the datetime object timezone-aware using system's local timezone - local_dt = local_dt.replace(tzinfo=datetime.now().astimezone().tzinfo) - utc_dt = local_dt.astimezone(timezone.utc) - return utc_dt.strftime("%Y-%m-%d %H:%M:%S.000") - except ValueError: - try: - # Try without microseconds - local_dt = datetime.strptime(time_str, "%Y-%m-%d %H:%M:%S") - # Make the datetime object timezone-aware using system's local timezone - local_dt = local_dt.replace(tzinfo=datetime.now().astimezone().tzinfo) - utc_dt = local_dt.astimezone(timezone.utc) - return utc_dt.strftime("%Y-%m-%d %H:%M:%S.000") - except ValueError: - return None - - -def get_connection_type_name(conn_type): - """Convert connection type number to readable name""" - type_map = { - 0: "Remote Desktop", - 1: "File Transfer", - 2: "Port Transfer", - 3: "View Camera", - 4: "Terminal" - } - return type_map.get(conn_type, f"Unknown ({conn_type})") - - -def get_console_type_name(console_type): - """Convert console audit type number to readable name""" - type_map = { - 0: "Group Management", - 1: "User Management", - 2: "Device Management", - 3: "Address Book Management" - } - return type_map.get(console_type, f"Unknown ({console_type})") - - -def get_console_operation_name(operation_code): - """Convert console operation code to readable name""" - operation_map = { - 0: "User Login", - 1: "Add Group", - 2: "Add User", - 3: "Add Device", - 4: "Delete Groups", - 5: "Disconnect Device", - 6: "Enable Users", - 7: "Disable Users", - 8: "Enable Devices", - 9: "Disable Devices", - 10: "Update Group", - 11: "Update User", - 12: "Update Device", - 13: "Delete User", - 14: "Delete Device", - 15: "Add Address Book", - 16: "Delete Address Book", - 17: "Change Address Book Name", - 18: "Delete Devices in the Address Book Recycle Bin", - 19: "Empty Address Book Recycle Bin", - 20: "Add Address Book Permission", - 21: "Delete Address Book Permission", - 22: "Update Address Book Permission" - } - return operation_map.get(operation_code, f"Unknown ({operation_code})") - - -def get_alarm_type_name(alarm_type): - """Convert alarm type number to readable name""" - type_map = { - 0: "Access attempt outside the IP whitelist", - 1: "Over 30 consecutive access attempts", - 2: "Multiple access attempts within one minute", - 3: "Over 30 consecutive login attempts", - 4: "Multiple login attempts within one minute", - 5: "Multiple login attempts within one hour" - } - return type_map.get(alarm_type, f"Unknown ({alarm_type})") - - -def enhance_audit_data(data, audit_type): - """Enhance audit data with readable formats""" - if not data: - return data - - enhanced_data = [] - for item in data: - enhanced_item = item.copy() - - # Convert timestamps - replace original values - if 'created_at' in enhanced_item: - enhanced_item['created_at'] = format_timestamp(enhanced_item['created_at']) - if 'end_time' in enhanced_item: - enhanced_item['end_time'] = format_timestamp(enhanced_item['end_time']) - - # Add type-specific enhancements - replace original values - if audit_type == 'conn': - if 'conn_type' in enhanced_item: - enhanced_item['conn_type'] = get_connection_type_name(enhanced_item['conn_type']) - else: - enhanced_item['conn_type'] = "Not Logged In" - - elif audit_type == 'console': - if 'typ' in enhanced_item: - # Replace typ field with type and convert to readable name - enhanced_item['type'] = get_console_type_name(enhanced_item['typ']) - del enhanced_item['typ'] - if 'iop' in enhanced_item: - # Replace iop field with operation and convert to readable name - enhanced_item['operation'] = get_console_operation_name(enhanced_item['iop']) - del enhanced_item['iop'] - - elif audit_type == 'alarm' and 'typ' in enhanced_item: - # Replace typ field with type and convert to readable name - enhanced_item['type'] = get_alarm_type_name(enhanced_item['typ']) - del enhanced_item['typ'] - - enhanced_data.append(enhanced_item) - - return enhanced_data - - -def check_response(response): - """Check API response and return result""" - if response.status_code != 200: - print(f"Error: HTTP {response.status_code} - {response.text}") - exit(1) - - try: - response_json = response.json() - if "error" in response_json: - print(f"Error: {response_json['error']}") - exit(1) - return response_json - except ValueError: - return response.text or "Success" - - -def view_audits_common(url, token, endpoint, filters=None, page_size=None, current=None, - created_at=None, days_ago=None, non_wildcard_fields=None): - """Common function for viewing audits""" - headers = {"Authorization": f"Bearer {token}"} - - # Set default page size and current page - if page_size is None: - page_size = 10 - if current is None: - current = 1 - - params = { - "pageSize": page_size, - "current": current - } - - # Add filter parameters if provided - if filters: - for key, value in filters.items(): - if value is not None: - params[key] = value - - # Handle time filters - if days_ago is not None: - # Calculate datetime from days ago - target_time = datetime.now() - timedelta(days=days_ago) - # Convert to UTC time string using system timezone - utc_timestamp = target_time.timestamp() - utc_dt = datetime.fromtimestamp(utc_timestamp, timezone.utc) - params["created_at"] = utc_dt.strftime("%Y-%m-%d %H:%M:%S.000") - elif created_at: - # Parse local time string and convert to UTC time string - utc_time_str = parse_local_time_to_utc_string(created_at) - if utc_time_str is not None: - params["created_at"] = utc_time_str - else: - # If parsing fails, pass the original value - params["created_at"] = created_at - - # Apply wildcard patterns for string fields (excluding specific fields) - if non_wildcard_fields is None: - non_wildcard_fields = set() - - # Always exclude these fields from wildcard treatment - non_wildcard_fields.update(["created_at", "pageSize", "current"]) - - string_params = {} - for k, v in params.items(): - if isinstance(v, str) and k not in non_wildcard_fields: - if v != "-" and "%" not in v: - string_params[k] = "%" + v + "%" - else: - string_params[k] = v - else: - string_params[k] = v - - response = requests.get(f"{url}/api/audits/{endpoint}", headers=headers, params=string_params) - response_json = check_response(response) - - # Enhance the data with readable formats - data = enhance_audit_data(response_json.get("data", []), endpoint) - - return { - "data": data, - "total": response_json.get("total", 0), - "current": current, - "pageSize": page_size - } - - -def view_conn_audits(url, token, remote=None, conn_type=None, - page_size=None, current=None, created_at=None, days_ago=None): - """View connection audits""" - filters = { - "remote": remote, - "conn_type": conn_type - } - non_wildcard_fields = {"conn_type"} - - return view_audits_common( - url, token, "conn", filters, page_size, current, created_at, days_ago, non_wildcard_fields - ) - - -def view_file_audits(url, token, remote=None, - page_size=None, current=None, created_at=None, days_ago=None): - """View file audits""" - filters = { - "remote": remote - } - non_wildcard_fields = set() - - return view_audits_common( - url, token, "file", filters, page_size, current, created_at, days_ago, non_wildcard_fields - ) - - -def view_alarm_audits(url, token, device=None, - page_size=None, current=None, created_at=None, days_ago=None): - """View alarm audits""" - filters = { - "device": device - } - non_wildcard_fields = set() - - return view_audits_common( - url, token, "alarm", filters, page_size, current, created_at, days_ago, non_wildcard_fields - ) - - -def view_console_audits(url, token, operator=None, - page_size=None, current=None, created_at=None, days_ago=None): - """View console audits""" - filters = { - "operator": operator - } - non_wildcard_fields = set() - - return view_audits_common( - url, token, "console", filters, page_size, current, created_at, days_ago, non_wildcard_fields - ) - - -def main(): - parser = argparse.ArgumentParser(description="Audits manager") - parser.add_argument( - "command", - choices=["view-conn", "view-file", "view-alarm", "view-console"], - help="Command to execute", - ) - parser.add_argument("--url", required=True, help="URL of the API") - parser.add_argument("--token", required=True, help="Bearer token for authentication") - - # Pagination parameters - parser.add_argument("--page-size", type=int, default=10, help="Number of records per page (default: 10)") - parser.add_argument("--current", type=int, default=1, help="Current page number (default: 1)") - - # Time filtering parameters - parser.add_argument("--created-at", help="Filter by creation time in local time (format: 2025-09-16 14:15:57 or 2025-09-16 14:15:57.000)") - parser.add_argument("--days-ago", type=int, help="Filter by days ago (e.g., 7 for last 7 days)") - - # Audit filters (simplified) - parser.add_argument("--remote", help="Remote peer ID filter (for conn/file audits)") - parser.add_argument("--device", help="Device ID filter (for alarm audits)") - parser.add_argument("--conn-type", type=int, help="Connection type filter (for conn audits only): 0=Remote Desktop, 1=File Transfer, 2=Port Transfer, 3=View Camera, 4=Terminal") - parser.add_argument("--operator", help="Operator filter (for console audits only)") - - args = parser.parse_args() - - # Remove trailing slashes from URL - while args.url.endswith("/"): - args.url = args.url[:-1] - - if args.command == "view-conn": - # View connection audits - result = view_conn_audits( - args.url, - args.token, - args.remote, - args.conn_type, - args.page_size, - args.current, - args.created_at, - args.days_ago - ) - print(json.dumps(result, indent=2)) - - elif args.command == "view-file": - # View file audits - result = view_file_audits( - args.url, - args.token, - args.remote, - args.page_size, - args.current, - args.created_at, - args.days_ago - ) - print(json.dumps(result, indent=2)) - - elif args.command == "view-alarm": - # View alarm audits - result = view_alarm_audits( - args.url, - args.token, - args.device, - args.page_size, - args.current, - args.created_at, - args.days_ago - ) - print(json.dumps(result, indent=2)) - - elif args.command == "view-console": - # View console audits - result = view_console_audits( - args.url, - args.token, - args.operator, - args.page_size, - args.current, - args.created_at, - args.days_ago - ) - print(json.dumps(result, indent=2)) - - -if __name__ == "__main__": - main() diff --git a/res/device-groups.py b/res/device-groups.py deleted file mode 100755 index dd861aefc..000000000 --- a/res/device-groups.py +++ /dev/null @@ -1,274 +0,0 @@ -#!/usr/bin/env python3 - -import requests -import argparse -import json - - -def check_response(response): - """ - Check API response and handle errors. - - Two error cases: - 1. Status code is not 200 -> exit with error - 2. Response contains {"error": "xxx"} -> exit with error - """ - if response.status_code != 200: - print(f"Error: HTTP {response.status_code}: {response.text}") - exit(1) - - # Check for {"error": "xxx"} in response - if response.text and response.text.strip(): - try: - json_data = response.json() - if isinstance(json_data, dict) and "error" in json_data: - print(f"Error: {json_data['error']}") - exit(1) - return json_data - except ValueError: - return response.text - - return None - - -def headers_with(token): - return {"Authorization": f"Bearer {token}", "Content-Type": "application/json"} - - -# ---------- Device Group APIs ---------- - -def list_groups(url, token, name=None, page_size=50): - headers = headers_with(token) - params = {"pageSize": page_size} - if name: - params["name"] = name - data, current = [], 0 - while True: - current += 1 - params["current"] = current - r = requests.get(f"{url}/api/device-groups", headers=headers, params=params) - if r.status_code != 200: - print(f"Error: HTTP {r.status_code} - {r.text}") - exit(1) - res = r.json() - if "error" in res: - print(f"Error: {res['error']}") - exit(1) - rows = res.get("data", []) - data.extend(rows) - total = res.get("total", 0) - if len(rows) < page_size or current * page_size >= total: - break - return data - - -def get_group_by_name(url, token, name): - groups = list_groups(url, token, name) - for g in groups: - if str(g.get("name")) == name: - return g - return None - - -def create_group(url, token, name, note=None, accessed_from=None): - headers = headers_with(token) - payload = {"name": name} - if note: - payload["note"] = note - if accessed_from: - payload["allowed_incomings"] = accessed_from - r = requests.post(f"{url}/api/device-groups", headers=headers, json=payload) - return check_response(r) - - -def update_group(url, token, name, new_name=None, note=None, accessed_from=None): - headers = headers_with(token) - g = get_group_by_name(url, token, name) - if not g: - print(f"Error: Group '{name}' not found") - exit(1) - guid = g.get("guid") - payload = {} - if new_name is not None: - payload["name"] = new_name - if note is not None: - payload["note"] = note - if accessed_from is not None: - payload["allowed_incomings"] = accessed_from - r = requests.patch(f"{url}/api/device-groups/{guid}", headers=headers, json=payload) - check_response(r) - return "Success" - - -def delete_groups(url, token, names): - headers = headers_with(token) - if isinstance(names, str): - names = [names] - for n in names: - g = get_group_by_name(url, token, n) - if not g: - print(f"Error: Group '{n}' not found") - exit(1) - guid = g.get("guid") - r = requests.delete(f"{url}/api/device-groups/{guid}", headers=headers) - check_response(r) - return "Success" - - -# ---------- Device group assign APIs (name -> guid) ---------- - -def view_devices(url, token, group_name=None, id=None, device_name=None, - user_name=None, device_username=None, page_size=50): - """View devices in a device group with filters""" - headers = headers_with(token) - - # Separate exact match and fuzzy match params - params = {} - fuzzy_params = { - "id": id, - "device_name": device_name, - "user_name": user_name, - "device_username": device_username, - } - - # Add device_group_name without wildcard (exact match) - if group_name: - params["device_group_name"] = group_name - - # Add wildcard for fuzzy search to other params - for k, v in fuzzy_params.items(): - if v is not None: - params[k] = "%" + v + "%" if (v != "-" and "%" not in v) else v - - params["pageSize"] = page_size - - data, current = [], 0 - while True: - current += 1 - params["current"] = current - r = requests.get(f"{url}/api/devices", headers=headers, params=params) - if r.status_code != 200: - return check_response(r) - res = r.json() - rows = res.get("data", []) - data.extend(rows) - total = res.get("total", 0) - if len(rows) < page_size or current * page_size >= total: - break - return data - - -def add_devices(url, token, group_name, device_ids): - headers = headers_with(token) - g = get_group_by_name(url, token, group_name) - if not g: - return f"Group '{group_name}' not found" - guid = g.get("guid") - payload = device_ids if isinstance(device_ids, list) else [device_ids] - r = requests.post(f"{url}/api/device-groups/{guid}", headers=headers, json=payload) - return check_response(r) - - -def remove_devices(url, token, group_name, device_ids): - headers = headers_with(token) - g = get_group_by_name(url, token, group_name) - if not g: - return f"Group '{group_name}' not found" - guid = g.get("guid") - payload = device_ids if isinstance(device_ids, list) else [device_ids] - r = requests.delete(f"{url}/api/device-groups/{guid}/devices", headers=headers, json=payload) - return check_response(r) - - -def parse_rules(s): - if not s: - return None - try: - v = json.loads(s) - if isinstance(v, list): - # expect list of {"type": number, "name": string} - return v - except Exception: - pass - return None - - -def main(): - parser = argparse.ArgumentParser(description="Device Group manager") - parser.add_argument("command", choices=[ - "view", "add", "update", "delete", - "view-devices", "add-devices", "remove-devices" - ], help=( - "Command to execute. " - "[view/add/update/delete/add-devices/remove-devices: require Device Group Permission] " - "[view-devices: require Device Permission]" - )) - parser.add_argument("--url", required=True) - parser.add_argument("--token", required=True) - - parser.add_argument("--name", help="Device group name (exact match)") - parser.add_argument("--new-name", help="New device group name (for update)") - parser.add_argument("--note", help="Note") - - parser.add_argument("--accessed-from", help="JSON array: '[{\"type\":0|2,\"name\":\"...\"}]' (0=User Group, 2=User)") - - parser.add_argument("--ids", help="Comma separated device IDs for add-devices/remove-devices") - - # Filters for view-devices command - parser.add_argument("--id", help="Device ID filter (for view-devices)") - parser.add_argument("--device-name", help="Device name filter (for view-devices)") - parser.add_argument("--user-name", help="User name filter (owner of device, for view-devices)") - parser.add_argument("--device-username", help="Device username filter (logged in user on device, for view-devices)") - - args = parser.parse_args() - while args.url.endswith("/"): args.url = args.url[:-1] - - if args.command == "view": - res = list_groups(args.url, args.token, args.name) - print(json.dumps(res, indent=2)) - elif args.command == "add": - if not args.name: - print("Error: --name is required") - exit(1) - print(create_group( - args.url, args.token, args.name, args.note, - parse_rules(args.accessed_from) - )) - elif args.command == "update": - if not args.name: - print("Error: --name is required") - exit(1) - print(update_group( - args.url, args.token, args.name, args.new_name, args.note, - parse_rules(args.accessed_from) - )) - elif args.command == "delete": - if not args.name: - print("Error: --name is required (supports comma separated)") - exit(1) - names = [x.strip() for x in args.name.split(",") if x.strip()] - print(delete_groups(args.url, args.token, names)) - elif args.command == "view-devices": - res = view_devices( - args.url, - args.token, - group_name=args.name, - id=args.id, - device_name=args.device_name, - user_name=args.user_name, - device_username=args.device_username - ) - print(json.dumps(res, indent=2)) - elif args.command in ("add-devices", "remove-devices"): - if not args.name or not args.ids: - print("Error: --name and --ids are required for add/remove devices") - exit(1) - ids = [x.strip() for x in args.ids.split(",") if x.strip()] - if args.command == "add-devices": - print(add_devices(args.url, args.token, args.name, ids)) - else: - print(remove_devices(args.url, args.token, args.name, ids)) - - -if __name__ == "__main__": - main() diff --git a/res/devices.py b/res/devices.py index 832f0509b..215bd6dff 100755 --- a/res/devices.py +++ b/res/devices.py @@ -34,20 +34,12 @@ def view( devices = [] - current = 0 + current = 1 while True: - current += 1 params["current"] = current response = requests.get(f"{url}/api/devices", headers=headers, params=params) - if response.status_code != 200: - print(f"Error: HTTP {response.status_code} - {response.text}") - exit(1) - response_json = response.json() - if "error" in response_json: - print(f"Error: {response_json['error']}") - exit(1) data = response_json.get("data", []) @@ -62,25 +54,22 @@ def view( devices.append(device) total = response_json.get("total", 0) - if len(data) < pageSize or current * pageSize >= total: + current += pageSize + if len(data) < pageSize or current > total: break return devices def check(response): - if response.status_code != 200: - print(f"Error: HTTP {response.status_code} - {response.text}") - exit(1) - - try: - response_json = response.json() - if "error" in response_json: - print(f"Error: {response_json['error']}") - exit(1) - return response_json - except ValueError: - return response.text or "Success" + if response.status_code == 200: + try: + response_json = response.json() + return response_json + except ValueError: + return response.text or "Success" + else: + return "Failed", response.status_code, response.text def disable(url, token, guid, id): @@ -106,17 +95,8 @@ def delete(url, token, guid, id): def assign(url, token, guid, id, type, value): print("assign", id, type, value) - valid_types = [ - "ab", - "strategy_name", - "user_name", - "device_group_name", - "note", - "device_username", - "device_name", - ] - if type not in valid_types: - print(f"Invalid type, it must be one of: {', '.join(valid_types)}") + if type != "ab" and type != "strategy_name" and type != "user_name": + print("Invalid type, it must be 'ab', 'strategy_name' or 'user_name'") return data = {"type": type, "value": value} headers = {"Authorization": f"Bearer {token}"} @@ -144,7 +124,7 @@ def main(): parser.add_argument("--device_group_name", help="Device group name") parser.add_argument( "--assign_to", - help="=, e.g. user_name=mike, strategy_name=test, device_group_name=group1, note=note1, device_username=username1, device_name=name1, ab=ab1, ab=ab1,tag1,alias1,password1,note1" + help="=, e.g. user_name=mike, strategy_name=test, ab=ab1, ab=ab1,tag1", ) parser.add_argument( "--offline_days", type=int, help="Offline duration in days, e.g., 7" @@ -168,37 +148,28 @@ def main(): if args.command == "view": for device in devices: print(device) - elif args.command in ["disable", "enable", "delete", "assign"]: - # Check if we need user confirmation for multiple devices - if len(devices) > 1: - print(f"Found {len(devices)} devices. Do you want to proceed with {args.command} operation on the devices? (Y/N)") - confirmation = input("Type 'Y' to confirm: ").strip() - if confirmation.upper() != 'Y': - print("Operation cancelled.") - return - - if args.command == "disable": - for device in devices: - response = disable(args.url, args.token, device["guid"], device["id"]) - print(response) - elif args.command == "enable": - for device in devices: - response = enable(args.url, args.token, device["guid"], device["id"]) - print(response) - elif args.command == "delete": - for device in devices: - response = delete(args.url, args.token, device["guid"], device["id"]) - print(response) - elif args.command == "assign": - if "=" not in args.assign_to: - print("Invalid assign_to format, it must be =") - return - type, value = args.assign_to.split("=", 1) - for device in devices: - response = assign( - args.url, args.token, device["guid"], device["id"], type, value - ) - print(response) + elif args.command == "disable": + for device in devices: + response = disable(args.url, args.token, device["guid"], device["id"]) + print(response) + elif args.command == "enable": + for device in devices: + response = enable(args.url, args.token, device["guid"], device["id"]) + print(response) + elif args.command == "delete": + for device in devices: + response = delete(args.url, args.token, device["guid"], device["id"]) + print(response) + elif args.command == "assign": + if "=" not in args.assign_to: + print("Invalid assign_to format, it must be =") + return + type, value = args.assign_to.split("=", 1) + for device in devices: + response = assign( + args.url, args.token, device["guid"], device["id"], type, value + ) + print(response) if __name__ == "__main__": diff --git a/res/job.py b/res/job.py index e53105fd3..13ea9e81d 100755 --- a/res/job.py +++ b/res/job.py @@ -205,13 +205,9 @@ def sign_files(dir_path, only_ext=None): if not only_ext[i].startswith("."): only_ext[i] = "." + only_ext[i] for root, dirs, files in os.walk(dir_path): - is_signed_dir = "RustDeskPrinterDriver" in root or "usbmmidd_v2" in root for file in files: file_path = os.path.join(root, file) _, ext = os.path.splitext(file_path) - # only sign the exe files in signed dirs - if is_signed_dir and ext not in [".exe"]: - continue if only_ext and ext not in only_ext: continue if ext in SIGN_EXTENSIONS: diff --git a/res/msi/CustomActions/CustomActions.cpp b/res/msi/CustomActions/CustomActions.cpp index f4780dd87..fafbab6b5 100644 --- a/res/msi/CustomActions/CustomActions.cpp +++ b/res/msi/CustomActions/CustomActions.cpp @@ -31,161 +31,24 @@ LExit: return WcaFinalize(er); } -// Helper function to safely delete a file using handle-based deletion. -// Directories are refused after opening the handle. -BOOL SafeDeleteItem(LPCWSTR fullPath) -{ - // Open the file/directory with delete and attribute-read access plus FILE_FLAG_OPEN_REPARSE_POINT - // to prevent following symlinks. - // Use shared access to allow deletion even when other processes have the file open. - DWORD flags = FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT; - HANDLE hFile = CreateFileW( - fullPath, - DELETE | FILE_READ_ATTRIBUTES, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, // Allow shared access - NULL, - OPEN_EXISTING, - flags, - NULL - ); - - if (hFile == INVALID_HANDLE_VALUE) - { - WcaLog(LOGMSG_STANDARD, "SafeDeleteItem: Failed to open '%ls'. Error: %lu", fullPath, GetLastError()); - return FALSE; - } - - BY_HANDLE_FILE_INFORMATION fileInfo; - if (FALSE == GetFileInformationByHandle(hFile, &fileInfo)) - { - WcaLog(LOGMSG_STANDARD, "SafeDeleteItem: Failed to inspect '%ls'. Error: %lu", fullPath, GetLastError()); - CloseHandle(hFile); - return FALSE; - } - - if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - { - WcaLog(LOGMSG_STANDARD, "SafeDeleteItem: Refusing to delete directory '%ls'.", fullPath); - CloseHandle(hFile); - return FALSE; - } - - // Use SetFileInformationByHandle to mark for deletion. - // The file will be deleted when the handle is closed. - FILE_DISPOSITION_INFO dispInfo; - dispInfo.DeleteFile = TRUE; - - BOOL result = SetFileInformationByHandle( - hFile, - FileDispositionInfo, - &dispInfo, - sizeof(dispInfo) - ); - - if (!result) - { - DWORD error = GetLastError(); - WcaLog(LOGMSG_STANDARD, "SafeDeleteItem: Failed to mark '%ls' for deletion. Error: %lu", fullPath, error); - } - - CloseHandle(hFile); - return result; -} - -BOOL PathEndsWithSlash(LPCWSTR path) -{ - size_t length = 0; - HRESULT hr = StringCchLengthW(path, MAX_PATH, &length); - if (FAILED(hr) || length == 0) - { - return FALSE; - } - - WCHAR last = path[length - 1]; - return last == L'\\' || last == L'/'; -} - -void ClearReadOnlyAttribute(LPCWSTR fullPath, DWORD attributes) -{ - if (!(attributes & FILE_ATTRIBUTE_READONLY)) - { - return; - } - - DWORD writableAttributes = attributes & ~FILE_ATTRIBUTE_READONLY; - if (writableAttributes == 0) - { - writableAttributes = FILE_ATTRIBUTE_NORMAL; - } - - if (SetFileAttributesW(fullPath, writableAttributes)) - { - WcaLog(LOGMSG_STANDARD, "Runtime cleanup cleared read-only attribute for '%ls'.", fullPath); - return; - } - - WcaLog(LOGMSG_STANDARD, "Runtime cleanup failed to clear read-only attribute for '%ls'. Error: %lu", fullPath, GetLastError()); -} - -BOOL DeleteRuntimeGeneratedFile(LPCWSTR installFolder, LPCWSTR fileName) -{ - WCHAR fullPath[MAX_PATH]; - LPCWSTR separator = PathEndsWithSlash(installFolder) ? L"" : L"\\"; - HRESULT hr = StringCchPrintfW(fullPath, MAX_PATH, L"%s%s%s", installFolder, separator, fileName); - if (FAILED(hr)) - { - WcaLog(LOGMSG_STANDARD, "Runtime cleanup path is too long for '%ls'.", fileName); - return FALSE; - } - - DWORD attributes = GetFileAttributesW(fullPath); - if (attributes == INVALID_FILE_ATTRIBUTES) - { - DWORD error = GetLastError(); - if (error == ERROR_FILE_NOT_FOUND || error == ERROR_PATH_NOT_FOUND) - { - return TRUE; - } - - WcaLog(LOGMSG_STANDARD, "Runtime cleanup cannot stat '%ls'. Error: %lu", fullPath, error); - return FALSE; - } - - if (attributes & FILE_ATTRIBUTE_DIRECTORY) - { - WcaLog(LOGMSG_STANDARD, "Runtime cleanup skipped directory '%ls'.", fullPath); - return FALSE; - } - - ClearReadOnlyAttribute(fullPath, attributes); - WcaLog(LOGMSG_STANDARD, "Runtime cleanup deleting '%ls'.", fullPath); - return SafeDeleteItem(fullPath); -} - -// See `Package.wxs` for the sequence of this custom action. +// CAUTION: We can't simply remove the install folder here, because silent repair/upgrade will fail. +// `RemoveInstallFolder()` is a deferred custom action, it will be executed after the files are copied. +// `msiexec /i package.msi /qn` // -// Upgrade/uninstall sequence: -// 1. InstallInitialize -// 2. RemoveExistingProducts -// ├─ TerminateProcesses -// ├─ TryStopDeleteService -// ├─ RemoveRuntimeGeneratedFiles - <-- Here -// └─ RemoveFiles -// 3. InstallValidate -// 4. InstallFiles -// 5. InstallExecute -// 6. InstallFinalize -UINT __stdcall RemoveRuntimeGeneratedFiles( +// So we need to delete the files separately in install folder. +UINT __stdcall RemoveInstallFolder( __in MSIHANDLE hInstall) { HRESULT hr = S_OK; DWORD er = ERROR_SUCCESS; + int nResult = 0; LPWSTR installFolder = NULL; LPWSTR pwz = NULL; LPWSTR pwzData = NULL; + WCHAR runtimeBroker[1024] = { 0, }; - hr = WcaInitialize(hInstall, "RemoveRuntimeGeneratedFiles"); + hr = WcaInitialize(hInstall, "RemoveInstallFolder"); ExitOnFailure(hr, "Failed to initialize"); hr = WcaGetProperty(L"CustomActionData", &pwzData); @@ -193,21 +56,26 @@ UINT __stdcall RemoveRuntimeGeneratedFiles( pwz = pwzData; hr = WcaReadStringFromCaData(&pwz, &installFolder); - ExitOnFailure(hr, "failed to read install folder from custom action data: %ls", pwz); + ExitOnFailure(hr, "failed to read database key from custom action data: %ls", pwz); - if (installFolder == NULL || installFolder[0] == L'\0') { - WcaLog(LOGMSG_STANDARD, "Install folder path is empty, skipping runtime cleanup."); - goto LExit; + StringCchPrintfW(runtimeBroker, sizeof(runtimeBroker) / sizeof(runtimeBroker[0]), L"%ls\\RuntimeBroker_rustdesk.exe", installFolder); + + SHFILEOPSTRUCTW fileOp; + ZeroMemory(&fileOp, sizeof(SHFILEOPSTRUCT)); + fileOp.wFunc = FO_DELETE; + fileOp.pFrom = runtimeBroker; + fileOp.fFlags = FOF_NOCONFIRMATION | FOF_SILENT; + + nResult = SHFileOperationW(&fileOp); + if (nResult == 0) + { + WcaLog(LOGMSG_STANDARD, "The external file \"%ls\" has been deleted.", runtimeBroker); } - - if (PathIsRootW(installFolder)) { - WcaLog(LOGMSG_STANDARD, "Refusing runtime cleanup in root folder '%ls'.", installFolder); - goto LExit; + else + { + WcaLog(LOGMSG_STANDARD, "The external file \"%ls\" has not been deleted, error code: 0x%02X. Please refer to https://learn.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-shfileoperationa for the error codes.", runtimeBroker, nResult); } - WcaLog(LOGMSG_STANDARD, "Removing runtime-generated files from install folder: %ls", installFolder); - DeleteRuntimeGeneratedFile(installFolder, L"RuntimeBroker_rustdesk.exe"); - LExit: ReleaseStr(pwzData); @@ -241,12 +109,9 @@ bool TerminateProcessIfNotContainsParam(pfnNtQueryInformationProcess NtQueryInfo { if (pebUpp.CommandLine.Length > 0) { - // Allocate extra space for null terminator - WCHAR *commandLine = (WCHAR *)malloc(pebUpp.CommandLine.Length + sizeof(WCHAR)); + WCHAR *commandLine = (WCHAR *)malloc(pebUpp.CommandLine.Length); if (commandLine != NULL) { - // Initialize all bytes to zero for safety - memset(commandLine, 0, pebUpp.CommandLine.Length + sizeof(WCHAR)); if (ReadProcessMemory(process, pebUpp.CommandLine.Buffer, commandLine, pebUpp.CommandLine.Length, &dwBytesRead)) { @@ -603,10 +468,10 @@ UINT __stdcall TryStopDeleteService(__in MSIHANDLE hInstall) } if (IsServiceRunningW(svcName)) { - WcaLog(LOGMSG_STANDARD, "Service \"%ls\" is not stopped after 1000 ms.", svcName); + WcaLog(LOGMSG_STANDARD, "Service \"%ls\" is not stoped after 1000 ms.", svcName); } else { - WcaLog(LOGMSG_STANDARD, "Service \"%ls\" is stopped.", svcName); + WcaLog(LOGMSG_STANDARD, "Service \"%ls\" is stoped.", svcName); } if (MyDeleteServiceW(svcName)) { @@ -632,7 +497,7 @@ UINT __stdcall TryStopDeleteService(__in MSIHANDLE hInstall) } // It's really strange that we need sleep here. - // But the upgrading may be stuck at "copying new files" because the file is in using. + // But the upgrading may be stucked at "copying new files" because the file is in using. // Steps to reproduce: Install -> stop service in tray --> start service -> upgrade // Sleep(300); @@ -745,7 +610,7 @@ UINT __stdcall AddRegSoftwareSASGeneration(__in MSIHANDLE hInstall) } // Why RegSetValueExW always return 998? - // + // result = RegCreateKeyExW(HKEY_LOCAL_MACHINE, subKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); if (result != ERROR_SUCCESS) { WcaLog(LOGMSG_STANDARD, "Failed to create or open registry key: %d", result); @@ -861,7 +726,7 @@ void TryCreateStartServiceByShell(LPWSTR svcName, LPWSTR svcBinary, LPWSTR szSvc i = 0; j = 0; // svcBinary is a string with double quotes, we need to escape it for shell arguments. - // It is original used for `CreateServiceW`. + // It is orignal used for `CreateServiceW`. // eg. "C:\Program Files\MyApp\MyApp.exe" --service -> \"C:\Program Files\MyApp\MyApp.exe\" --service while (true) { if (svcBinary[j] == L'"') { diff --git a/res/msi/CustomActions/CustomActions.def b/res/msi/CustomActions/CustomActions.def index d50fbf59b..01b03490c 100644 --- a/res/msi/CustomActions/CustomActions.def +++ b/res/msi/CustomActions/CustomActions.def @@ -2,7 +2,7 @@ LIBRARY "CustomActions" EXPORTS CustomActionHello - RemoveRuntimeGeneratedFiles + RemoveInstallFolder TerminateProcesses AddFirewallRules SetPropertyIsServiceRunning diff --git a/res/msi/Package/Components/Folders.wxs b/res/msi/Package/Components/Folders.wxs index 6911600e9..de9edb7f3 100644 --- a/res/msi/Package/Components/Folders.wxs +++ b/res/msi/Package/Components/Folders.wxs @@ -16,15 +16,8 @@ - - - - - - - - - + + diff --git a/res/msi/Package/Components/RustDesk.wxs b/res/msi/Package/Components/RustDesk.wxs index 952172bdc..337e84ec3 100644 --- a/res/msi/Package/Components/RustDesk.wxs +++ b/res/msi/Package/Components/RustDesk.wxs @@ -12,7 +12,7 @@ - + @@ -77,21 +77,21 @@ - - - + + + - + - + - + - + diff --git a/res/msi/Package/Fragments/CustomActions.wxs b/res/msi/Package/Fragments/CustomActions.wxs index 3a9811eb8..3727c0dd3 100644 --- a/res/msi/Package/Fragments/CustomActions.wxs +++ b/res/msi/Package/Fragments/CustomActions.wxs @@ -5,7 +5,7 @@ - + diff --git a/res/msi/Package/UI/MyInstallDlg.wxs b/res/msi/Package/UI/MyInstallDlg.wxs index 06c37097c..bf59d569c 100644 --- a/res/msi/Package/UI/MyInstallDlg.wxs +++ b/res/msi/Package/UI/MyInstallDlg.wxs @@ -23,13 +23,12 @@ Patch dialog sequence: --> - - + @@ -65,16 +64,9 @@ Patch dialog sequence: - - - - - - - - - - + + + diff --git a/res/msi/preprocess.py b/res/msi/preprocess.py index c590549f4..cb2140d21 100644 --- a/res/msi/preprocess.py +++ b/res/msi/preprocess.py @@ -336,9 +336,7 @@ def gen_custom_ARPSYSTEMCOMPONENT_True(args, dist_dir): f'{indent}\n' ) - # EstimatedSize in uninstall registry must be in KB. - estimated_size_bytes = get_folder_size(dist_dir) - estimated_size = max(1, (estimated_size_bytes + 1023) // 1024) + estimated_size = get_folder_size(dist_dir) lines_new.append( f'{indent}\n' ) diff --git a/res/rpm-flutter-suse.spec b/res/rpm-flutter-suse.spec index bb2b56af6..1f566c6ec 100644 --- a/res/rpm-flutter-suse.spec +++ b/res/rpm-flutter-suse.spec @@ -1,12 +1,12 @@ Name: rustdesk -Version: 1.4.6 +Version: 1.4.0 Release: 0 Summary: RPM package License: GPL-3.0 URL: https://rustdesk.com Vendor: rustdesk -Requires: gtk3 libxcb1 libXfixes3 alsa-utils libXtst6 libva2 pam gstreamer-plugins-base gstreamer-plugin-pipewire -Recommends: libayatana-appindicator3-1 xdotool +Requires: gtk3 libxcb1 xdotool libXfixes3 alsa-utils libXtst6 libva2 pam gstreamer-plugins-base gstreamer-plugin-pipewire +Recommends: libayatana-appindicator3-1 Provides: libdesktop_drop_plugin.so()(64bit), libdesktop_multi_window_plugin.so()(64bit), libfile_selector_linux_plugin.so()(64bit), libflutter_custom_cursor_plugin.so()(64bit), libflutter_linux_gtk.so()(64bit), libscreen_retriever_plugin.so()(64bit), libtray_manager_plugin.so()(64bit), liburl_launcher_linux_plugin.so()(64bit), libwindow_manager_plugin.so()(64bit), libwindow_size_plugin.so()(64bit), libtexture_rgba_renderer_plugin.so()(64bit) # https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/ diff --git a/res/rpm-flutter.spec b/res/rpm-flutter.spec index 1a077ee7e..7323c92f2 100644 --- a/res/rpm-flutter.spec +++ b/res/rpm-flutter.spec @@ -1,12 +1,12 @@ Name: rustdesk -Version: 1.4.6 +Version: 1.4.0 Release: 0 Summary: RPM package License: GPL-3.0 URL: https://rustdesk.com Vendor: rustdesk -Requires: gtk3 libxcb libXfixes alsa-lib libva pam gstreamer1-plugins-base -Recommends: libayatana-appindicator-gtk3 libxdo +Requires: gtk3 libxcb libxdo libXfixes alsa-lib libva pam gstreamer1-plugins-base +Recommends: libayatana-appindicator-gtk3 Provides: libdesktop_drop_plugin.so()(64bit), libdesktop_multi_window_plugin.so()(64bit), libfile_selector_linux_plugin.so()(64bit), libflutter_custom_cursor_plugin.so()(64bit), libflutter_linux_gtk.so()(64bit), libscreen_retriever_plugin.so()(64bit), libtray_manager_plugin.so()(64bit), liburl_launcher_linux_plugin.so()(64bit), libwindow_manager_plugin.so()(64bit), libwindow_size_plugin.so()(64bit), libtexture_rgba_renderer_plugin.so()(64bit) # https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/ diff --git a/res/rpm-suse.spec b/res/rpm-suse.spec index 14364eb77..79b26d6f0 100644 --- a/res/rpm-suse.spec +++ b/res/rpm-suse.spec @@ -3,8 +3,8 @@ Version: 1.1.9 Release: 0 Summary: RPM package License: GPL-3.0 -Requires: gtk3 libxcb1 libXfixes3 alsa-utils libXtst6 libva2 pam gstreamer-plugins-base gstreamer-plugin-pipewire -Recommends: libayatana-appindicator3-1 xdotool +Requires: gtk3 libxcb1 xdotool libXfixes3 alsa-utils libXtst6 libva2 pam gstreamer-plugins-base gstreamer-plugin-pipewire +Recommends: libayatana-appindicator3-1 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/ diff --git a/res/rpm.spec b/res/rpm.spec index 6a7377b8b..0a64cbb3c 100644 --- a/res/rpm.spec +++ b/res/rpm.spec @@ -1,12 +1,12 @@ Name: rustdesk -Version: 1.4.6 +Version: 1.4.0 Release: 0 Summary: RPM package License: GPL-3.0 URL: https://rustdesk.com Vendor: rustdesk -Requires: gtk3 libxcb libXfixes alsa-lib libva2 pam gstreamer1-plugins-base -Recommends: libayatana-appindicator-gtk3 libxdo +Requires: gtk3 libxcb libxdo libXfixes alsa-lib libva2 pam gstreamer1-plugins-base +Recommends: libayatana-appindicator-gtk3 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/ diff --git a/res/rustdesk-link.desktop b/res/rustdesk-link.desktop index c7a9bd5cb..c6f4d3f2a 100644 --- a/res/rustdesk-link.desktop +++ b/res/rustdesk-link.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Name=RustDesk +Name=RustDeskURL Scheme Handler NoDisplay=true MimeType=x-scheme-handler/rustdesk; TryExec=rustdesk diff --git a/res/rustdesk.desktop b/res/rustdesk.desktop index 4e7d14fe5..eb8c3b9be 100644 --- a/res/rustdesk.desktop +++ b/res/rustdesk.desktop @@ -8,7 +8,7 @@ Terminal=false Type=Application StartupNotify=true Categories=Network;RemoteAccess;GTK; -Keywords=internet;linux;dart;rust;remote-control;p2p;teamviewer;rust-lang;rdp;remote-desktop;vnc; +Keywords=internet; Actions=new-window; StartupWMClass=rustdesk diff --git a/res/rustdesk.service b/res/rustdesk.service index 1b3feb194..6ec806845 100644 --- a/res/rustdesk.service +++ b/res/rustdesk.service @@ -16,7 +16,6 @@ KillMode=mixed TimeoutStopSec=30 User=root LimitNOFILE=100000 -Environment="PULSE_LATENCY_MSEC=60" "PIPEWIRE_LATENCY=1024/48000" [Install] WantedBy=multi-user.target diff --git a/res/setup.nsi b/res/setup.nsi new file mode 100644 index 000000000..21cee15c8 --- /dev/null +++ b/res/setup.nsi @@ -0,0 +1,178 @@ +Unicode true + +#################################################################### +# Includes + +!include nsDialogs.nsh +!include MUI2.nsh +!include x64.nsh +!include LogicLib.nsh + +#################################################################### +# File Info + +!define PRODUCT_NAME "RustDesk" +!define PRODUCT_DESCRIPTION "Installer for ${PRODUCT_NAME}" +!define COPYRIGHT "Copyright © 2021" +!define VERSION "1.1.6" + +VIProductVersion "${VERSION}.0" +VIAddVersionKey "ProductName" "${PRODUCT_NAME}" +VIAddVersionKey "ProductVersion" "${VERSION}" +VIAddVersionKey "FileDescription" "${PRODUCT_DESCRIPTION}" +VIAddVersionKey "LegalCopyright" "${COPYRIGHT}" +VIAddVersionKey "FileVersion" "${VERSION}.0" + +#################################################################### +# Installer Attributes + +Name "${PRODUCT_NAME}" +Outfile "rustdesk-${VERSION}-setup.exe" +Caption "Setup - ${PRODUCT_NAME}" +BrandingText "${PRODUCT_NAME}" + +ShowInstDetails show +RequestExecutionLevel admin +SetOverwrite on + +InstallDir "$PROGRAMFILES64\${PRODUCT_NAME}" + +#################################################################### +# Pages + +!define MUI_ICON "icon.ico" +!define MUI_ABORTWARNING +!define MUI_LANGDLL_ALLLANGUAGES +!define MUI_FINISHPAGE_SHOWREADME "" +!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED +!define MUI_FINISHPAGE_SHOWREADME_TEXT "Create desktop shortcut" +!define MUI_FINISHPAGE_SHOWREADME_FUNCTION CreateDesktopShortcut +!define MUI_FINISHPAGE_RUN "$INSTDIR\${PRODUCT_NAME}.exe" + +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +#################################################################### +# Language + +!insertmacro MUI_LANGUAGE "English" ; The first language is the default language +!insertmacro MUI_LANGUAGE "French" +!insertmacro MUI_LANGUAGE "German" +!insertmacro MUI_LANGUAGE "Spanish" +!insertmacro MUI_LANGUAGE "SpanishInternational" +!insertmacro MUI_LANGUAGE "SimpChinese" +!insertmacro MUI_LANGUAGE "TradChinese" +!insertmacro MUI_LANGUAGE "Japanese" +!insertmacro MUI_LANGUAGE "Korean" +!insertmacro MUI_LANGUAGE "Italian" +!insertmacro MUI_LANGUAGE "Dutch" +!insertmacro MUI_LANGUAGE "Danish" +!insertmacro MUI_LANGUAGE "Swedish" +!insertmacro MUI_LANGUAGE "Norwegian" +!insertmacro MUI_LANGUAGE "NorwegianNynorsk" +!insertmacro MUI_LANGUAGE "Finnish" +!insertmacro MUI_LANGUAGE "Greek" +!insertmacro MUI_LANGUAGE "Russian" +!insertmacro MUI_LANGUAGE "Portuguese" +!insertmacro MUI_LANGUAGE "PortugueseBR" +!insertmacro MUI_LANGUAGE "Polish" +!insertmacro MUI_LANGUAGE "Ukrainian" +!insertmacro MUI_LANGUAGE "Czech" +!insertmacro MUI_LANGUAGE "Slovak" +!insertmacro MUI_LANGUAGE "Croatian" +!insertmacro MUI_LANGUAGE "Bulgarian" +!insertmacro MUI_LANGUAGE "Hungarian" +!insertmacro MUI_LANGUAGE "Thai" +!insertmacro MUI_LANGUAGE "Romanian" +!insertmacro MUI_LANGUAGE "Latvian" +!insertmacro MUI_LANGUAGE "Macedonian" +!insertmacro MUI_LANGUAGE "Estonian" +!insertmacro MUI_LANGUAGE "Turkish" +!insertmacro MUI_LANGUAGE "Lithuanian" +!insertmacro MUI_LANGUAGE "Slovenian" +!insertmacro MUI_LANGUAGE "Serbian" +!insertmacro MUI_LANGUAGE "SerbianLatin" +!insertmacro MUI_LANGUAGE "Arabic" +!insertmacro MUI_LANGUAGE "Farsi" +!insertmacro MUI_LANGUAGE "Hebrew" +!insertmacro MUI_LANGUAGE "Indonesian" +!insertmacro MUI_LANGUAGE "Mongolian" +!insertmacro MUI_LANGUAGE "Luxembourgish" +!insertmacro MUI_LANGUAGE "Albanian" +!insertmacro MUI_LANGUAGE "Breton" +!insertmacro MUI_LANGUAGE "Belarusian" +!insertmacro MUI_LANGUAGE "Icelandic" +!insertmacro MUI_LANGUAGE "Malay" +!insertmacro MUI_LANGUAGE "Bosnian" +!insertmacro MUI_LANGUAGE "Kurdish" +!insertmacro MUI_LANGUAGE "Irish" +!insertmacro MUI_LANGUAGE "Uzbek" +!insertmacro MUI_LANGUAGE "Galician" +!insertmacro MUI_LANGUAGE "Afrikaans" +!insertmacro MUI_LANGUAGE "Catalan" +!insertmacro MUI_LANGUAGE "Esperanto" +!insertmacro MUI_LANGUAGE "Asturian" +!insertmacro MUI_LANGUAGE "Basque" +!insertmacro MUI_LANGUAGE "Pashto" +!insertmacro MUI_LANGUAGE "ScotsGaelic" +!insertmacro MUI_LANGUAGE "Georgian" +!insertmacro MUI_LANGUAGE "Vietnamese" +!insertmacro MUI_LANGUAGE "Welsh" +!insertmacro MUI_LANGUAGE "Armenian" +!insertmacro MUI_LANGUAGE "Corsican" +!insertmacro MUI_LANGUAGE "Tatar" +!insertmacro MUI_LANGUAGE "Hindi" + + +#################################################################### +# Sections + +Section "Install" + SetOutPath $INSTDIR + + # Regkeys + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayIcon" "$INSTDIR\${PRODUCT_NAME}.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName" "${PRODUCT_NAME} (x64)" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayVersion" "${VERSION}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" '"$INSTDIR\${PRODUCT_NAME}.exe" --uninstall' + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "InstallLocation" "$INSTDIR" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "Publisher" "Purslane Ltd." + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "HelpLink" "https://www.rustdesk.com/" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "URLInfoAbout" "https://www.rustdesk.com/" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "URLUpdateInfo" "https://www.rustdesk.com/" + + nsExec::Exec "taskkill /F /IM ${PRODUCT_NAME}.exe" + Sleep 500 ; Give time for process to be completely killed + File "${PRODUCT_NAME}.exe" + + SetShellVarContext all + CreateShortCut "$INSTDIR\Uninstall ${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe" "--uninstall" "msiexec.exe" + CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}" + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe" + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall ${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe" "--uninstall" "msiexec.exe" + CreateShortCut "$SMSTARTUP\${PRODUCT_NAME} Tray.lnk" "$INSTDIR\${PRODUCT_NAME}.exe" "--tray" + + nsExec::Exec 'sc create ${PRODUCT_NAME} start=auto DisplayName="${PRODUCT_NAME} Service" binPath= "\"$INSTDIR\${PRODUCT_NAME}.exe\" --service"' + nsExec::Exec 'netsh advfirewall firewall add rule name="${PRODUCT_NAME} Service" dir=in action=allow program="$INSTDIR\${PRODUCT_NAME}.exe" enable=yes' + nsExec::Exec 'sc start ${PRODUCT_NAME}' +SectionEnd + +#################################################################### +# Functions + +Function .onInit + # RustDesk is 64-bit only + ${IfNot} ${RunningX64} + MessageBox MB_ICONSTOP "${PRODUCT_NAME} is 64-bit only!" + Quit + ${EndIf} + ${DisableX64FSRedirection} + SetRegView 64 + + !insertmacro MUI_LANGDLL_DISPLAY +FunctionEnd + +Function CreateDesktopShortcut + CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe" +FunctionEnd diff --git a/res/strategies.py b/res/strategies.py deleted file mode 100755 index 178d8d9e7..000000000 --- a/res/strategies.py +++ /dev/null @@ -1,301 +0,0 @@ -#!/usr/bin/env python3 - -import requests -import argparse -import json - - -def check_response(response): - """ - Check API response and handle errors. - - Two error cases: - 1. Status code is not 200 -> exit with error - 2. Response contains {"error": "xxx"} -> exit with error - """ - if response.status_code != 200: - print(f"Error: HTTP {response.status_code}: {response.text}") - exit(1) - - # Check for {"error": "xxx"} in response - if response.text and response.text.strip(): - try: - json_data = response.json() - if isinstance(json_data, dict) and "error" in json_data: - print(f"Error: {json_data['error']}") - exit(1) - return json_data - except ValueError: - return response.text - - return None - - -def headers_with(token): - return {"Authorization": f"Bearer {token}", "Content-Type": "application/json"} - - -# ---------- Strategies APIs ---------- - -def list_strategies(url, token): - """List all strategies""" - headers = headers_with(token) - r = requests.get(f"{url}/api/strategies", headers=headers) - return check_response(r) - - -def get_strategy_by_guid(url, token, guid): - """Get strategy by GUID""" - headers = headers_with(token) - r = requests.get(f"{url}/api/strategies/{guid}", headers=headers) - return check_response(r) - - -def get_strategy_by_name(url, token, name): - """Get strategy by name""" - strategies = list_strategies(url, token) - if not strategies: - return None - for s in strategies: - if str(s.get("name")) == name: - return s - return None - - -def enable_strategy(url, token, name): - """Enable a strategy""" - headers = headers_with(token) - strategy = get_strategy_by_name(url, token, name) - if not strategy: - print(f"Error: Strategy '{name}' not found") - exit(1) - guid = strategy.get("guid") - r = requests.put(f"{url}/api/strategies/{guid}/status", headers=headers, json=True) - check_response(r) - return "Success" - - -def disable_strategy(url, token, name): - """Disable a strategy""" - headers = headers_with(token) - strategy = get_strategy_by_name(url, token, name) - if not strategy: - print(f"Error: Strategy '{name}' not found") - exit(1) - guid = strategy.get("guid") - r = requests.put(f"{url}/api/strategies/{guid}/status", headers=headers, json=False) - check_response(r) - return "Success" - - -def get_device_guid_by_id(url, token, device_id): - """Get device GUID by device ID (exact match)""" - headers = headers_with(token) - params = {"id": device_id, "pageSize": 50} - r = requests.get(f"{url}/api/devices", headers=headers, params=params) - res = check_response(r) - if not res: - return None - - devices_data = res.get("data", []) if isinstance(res, dict) else res - for d in devices_data: - if d.get("id") == device_id: - return d.get("guid") - return None - - -def get_user_guid_by_name(url, token, name): - """Get user GUID by exact name match""" - headers = headers_with(token) - params = {"name": name, "pageSize": 50} - r = requests.get(f"{url}/api/users", headers=headers, params=params) - res = check_response(r) - if not res: - return None - - users_data = res.get("data", []) if isinstance(res, dict) else res - for u in users_data: - if u.get("name") == name: - return u.get("guid") - return None - - -def get_device_group_guid_by_name(url, token, name): - """Get device group GUID by exact name match""" - headers = headers_with(token) - params = {"pageSize": 50, "name": name} - r = requests.get(f"{url}/api/device-groups", headers=headers, params=params) - res = check_response(r) - if not res: - return None - - groups_data = res.get("data", []) if isinstance(res, dict) else res - for g in groups_data: - if g.get("name") == name: - return g.get("guid") - return None - - -def assign_strategy(url, token, strategy_name, peers=None, users=None, device_groups=None): - """ - Assign strategy to peers, users, or device groups - - Args: - strategy_name: Name of the strategy (or None to unassign) - peers: List of device IDs or GUIDs - users: List of user names or GUIDs - device_groups: List of device group names or GUIDs - """ - headers = headers_with(token) - - # Get strategy GUID if strategy_name is provided - strategy_guid = None - if strategy_name: - strategy = get_strategy_by_name(url, token, strategy_name) - if not strategy: - print(f"Error: Strategy '{strategy_name}' not found") - exit(1) - strategy_guid = strategy.get("guid") - - # Convert device IDs to GUIDs - peer_guids = [] - if peers: - for peer in peers: - # Check if it's already a GUID format - if len(peer) == 36 and peer.count('-') == 4: - peer_guids.append(peer) - else: - # Treat as device ID, look it up - guid = get_device_guid_by_id(url, token, peer) - if not guid: - print(f"Error: Device '{peer}' not found") - exit(1) - peer_guids.append(guid) - - # Convert user names to GUIDs - user_guids = [] - if users: - for user in users: - # Check if it's already a GUID format - if len(user) == 36 and user.count('-') == 4: - user_guids.append(user) - else: - # Treat as username, look it up - guid = get_user_guid_by_name(url, token, user) - if not guid: - print(f"Error: User '{user}' not found") - exit(1) - user_guids.append(guid) - - # Convert device group names to GUIDs - device_group_guids = [] - if device_groups: - for dg in device_groups: - # Check if it's already a GUID format - if len(dg) == 36 and dg.count('-') == 4: - device_group_guids.append(dg) - else: - # Treat as device group name, look it up - guid = get_device_group_guid_by_name(url, token, dg) - if not guid: - print(f"Error: Device group '{dg}' not found") - exit(1) - device_group_guids.append(guid) - - # Build payload - payload = {} - if strategy_guid: - payload["strategy"] = strategy_guid - - payload["peers"] = peer_guids - payload["users"] = user_guids - payload["groups"] = device_group_guids - - r = requests.post(f"{url}/api/strategies/assign", headers=headers, json=payload) - check_response(r) - - -def main(): - parser = argparse.ArgumentParser(description="Strategy manager") - parser.add_argument("command", choices=[ - "list", "view", "enable", "disable", "assign", "unassign" - ]) - parser.add_argument("--url", required=True, help="Server URL") - parser.add_argument("--token", required=True, help="API token") - - parser.add_argument("--name", help="Strategy name (for view/enable/disable/assign commands)") - parser.add_argument("--guid", help="Strategy GUID (for view command, alternative to --name)") - - # For assign/unassign commands - parser.add_argument("--peers", help="Comma separated device IDs or GUIDs (requires Device Permission:r)") - parser.add_argument("--users", help="Comma separated user names or GUIDs (requires User Permission:r)") - parser.add_argument("--device-groups", help="Comma separated device group names or GUIDs (requires Device Group Permission:r)") - - args = parser.parse_args() - while args.url.endswith("/"): args.url = args.url[:-1] - - if args.command == "list": - res = list_strategies(args.url, args.token) - print(json.dumps(res, indent=2)) - - elif args.command == "view": - if args.guid: - res = get_strategy_by_guid(args.url, args.token, args.guid) - print(json.dumps(res, indent=2)) - elif args.name: - strategy = get_strategy_by_name(args.url, args.token, args.name) - if not strategy: - print(f"Error: Strategy '{args.name}' not found") - exit(1) - # Get full details by GUID - guid = strategy.get("guid") - res = get_strategy_by_guid(args.url, args.token, guid) - print(json.dumps(res, indent=2)) - else: - print("Error: --name or --guid is required for view command") - exit(1) - - elif args.command == "enable": - if not args.name: - print("Error: --name is required") - exit(1) - print(enable_strategy(args.url, args.token, args.name)) - - elif args.command == "disable": - if not args.name: - print("Error: --name is required") - exit(1) - print(disable_strategy(args.url, args.token, args.name)) - - elif args.command == "assign": - if not args.name: - print("Error: --name is required") - exit(1) - if not args.peers and not args.users and not args.device_groups: - print("Error: at least one of --peers, --users, or --device-groups is required") - exit(1) - - peers = [x.strip() for x in args.peers.split(",") if x.strip()] if args.peers else None - users = [x.strip() for x in args.users.split(",") if x.strip()] if args.users else None - device_groups = [x.strip() for x in args.device_groups.split(",") if x.strip()] if args.device_groups else None - - assign_strategy(args.url, args.token, args.name, peers=peers, users=users, device_groups=device_groups) - count = (len(peers) if peers else 0) + (len(users) if users else 0) + (len(device_groups) if device_groups else 0) - print(f"Success: Assigned strategy '{args.name}' to {count} target(s)") - - elif args.command == "unassign": - if not args.peers and not args.users and not args.device_groups: - print("Error: at least one of --peers, --users, or --device-groups is required") - exit(1) - - peers = [x.strip() for x in args.peers.split(",") if x.strip()] if args.peers else None - users = [x.strip() for x in args.users.split(",") if x.strip()] if args.users else None - device_groups = [x.strip() for x in args.device_groups.split(",") if x.strip()] if args.device_groups else None - - assign_strategy(args.url, args.token, None, peers=peers, users=users, device_groups=device_groups) - count = (len(peers) if peers else 0) + (len(users) if users else 0) + (len(device_groups) if device_groups else 0) - print(f"Success: Unassigned strategy from {count} target(s)") - - -if __name__ == "__main__": - main() diff --git a/res/user-groups.py b/res/user-groups.py deleted file mode 100755 index 5df16c3b6..000000000 --- a/res/user-groups.py +++ /dev/null @@ -1,302 +0,0 @@ -#!/usr/bin/env python3 - -import requests -import argparse -import json - - -def check_response(response): - """ - Check API response and handle errors. - - Two error cases: - 1. Status code is not 200 -> exit with error - 2. Response contains {"error": "xxx"} -> exit with error - """ - if response.status_code != 200: - print(f"Error: HTTP {response.status_code}: {response.text}") - exit(1) - - # Check for {"error": "xxx"} in response - if response.text and response.text.strip(): - try: - json_data = response.json() - if isinstance(json_data, dict) and "error" in json_data: - print(f"Error: {json_data['error']}") - exit(1) - return json_data - except ValueError: - return response.text - - return None - - -def headers_with(token): - return {"Authorization": f"Bearer {token}", "Content-Type": "application/json"} - - -# ---------- User Group APIs ---------- - -def list_groups(url, token, name=None, page_size=50): - headers = headers_with(token) - params = {"pageSize": page_size} - if name: - params["name"] = name - data, current = [], 0 - while True: - current += 1 - params["current"] = current - r = requests.get(f"{url}/api/user-groups", headers=headers, params=params) - if r.status_code != 200: - print(f"Error: HTTP {r.status_code} - {r.text}") - exit(1) - res = r.json() - if "error" in res: - print(f"Error: {res['error']}") - exit(1) - rows = res.get("data", []) - data.extend(rows) - total = res.get("total", 0) - if len(rows) < page_size or current * page_size >= total: - break - return data - - -def get_group_by_name(url, token, name): - groups = list_groups(url, token, name) - for g in groups: - if str(g.get("name")) == name: - return g - return None - - -def create_group(url, token, name, note=None, accessed_from=None, access_to=None): - headers = headers_with(token) - payload = {"name": name} - if note: - payload["note"] = note - if accessed_from: - payload["allowed_incomings"] = accessed_from - if access_to: - payload["allowed_outgoings"] = access_to - r = requests.post(f"{url}/api/user-groups", headers=headers, json=payload) - return check_response(r) - - -def update_group(url, token, name, new_name=None, note=None, accessed_from=None, access_to=None): - headers = headers_with(token) - g = get_group_by_name(url, token, name) - if not g: - print(f"Error: Group '{name}' not found") - exit(1) - guid = g.get("guid") - payload = {} - if new_name is not None: - payload["name"] = new_name - if note is not None: - payload["note"] = note - if accessed_from is not None: - payload["allowed_incomings"] = accessed_from - if access_to is not None: - payload["allowed_outgoings"] = access_to - r = requests.patch(f"{url}/api/user-groups/{guid}", headers=headers, json=payload) - check_response(r) - return "Success" - - -def delete_groups(url, token, names): - headers = headers_with(token) - if isinstance(names, str): - names = [names] - for n in names: - g = get_group_by_name(url, token, n) - if not g: - print(f"Error: Group '{n}' not found") - exit(1) - guid = g.get("guid") - r = requests.delete(f"{url}/api/user-groups/{guid}", headers=headers) - check_response(r) - return "Success" - - -# ---------- User management in group ---------- - -def view_users(url, token, group_name=None, name=None, page_size=50): - """View users in a user group with filters""" - headers = headers_with(token) - - # Separate exact match and fuzzy match params - params = {} - fuzzy_params = { - "name": name, - } - - # Add group_name without wildcard (exact match) - if group_name: - params["group_name"] = group_name - - # Add wildcard for fuzzy search to other params - for k, v in fuzzy_params.items(): - if v is not None: - params[k] = "%" + v + "%" if (v != "-" and "%" not in v) else v - - params["pageSize"] = page_size - - data, current = [], 0 - while True: - current += 1 - params["current"] = current - r = requests.get(f"{url}/api/users", headers=headers, params=params) - if r.status_code != 200: - return check_response(r) - res = r.json() - rows = res.get("data", []) - data.extend(rows) - total = res.get("total", 0) - if len(rows) < page_size or current * page_size >= total: - break - return data - - -def add_users(url, token, group_name, user_names): - """Add users to a user group""" - headers = headers_with(token) - if isinstance(user_names, str): - user_names = [user_names] - - # Get the user group guid - g = get_group_by_name(url, token, group_name) - if not g: - print(f"Error: Group '{group_name}' not found") - exit(1) - guid = g.get("guid") - - # Get user GUIDs - user_guids = [] - errors = [] - - for user_name in user_names: - # Get user by exact name match - params = {"name": user_name, "pageSize": 50} - r = requests.get(f"{url}/api/users", headers=headers, params=params) - if r.status_code != 200: - errors.append(f"{user_name}: HTTP {r.status_code}") - continue - - users_data = r.json() - users_list = users_data.get("data", []) - user = None - for u in users_list: - if u.get("name") == user_name: - user = u - break - - if not user: - errors.append(f"{user_name}: User not found") - continue - - user_guids.append(user["guid"]) - - if not user_guids: - msg = "Error: No valid users found" - if errors: - msg += ". " + "; ".join(errors) - print(msg) - exit(1) - - # Add users to group using POST /api/user-groups/:guid - r = requests.post(f"{url}/api/user-groups/{guid}", headers=headers, json=user_guids) - check_response(r) - - success_msg = f"Success: Added {len(user_guids)} user(s) to group '{group_name}'" - if errors: - return success_msg + " (with errors: " + "; ".join(errors) + ")" - return success_msg - - -def parse_rules(s): - if not s: - return None - try: - v = json.loads(s) - if isinstance(v, list): - # expect list of {"type": number, "name": string} - return v - except Exception: - pass - return None - - -def main(): - parser = argparse.ArgumentParser(description="User Group manager") - parser.add_argument("command", choices=[ - "view", "add", "update", "delete", - "view-users", "add-users" - ], help=( - "Command to execute. " - "[view/add/update/delete/add-users: require User Group Permission] " - "[view-users: require User Permission]" - )) - parser.add_argument("--url", required=True) - parser.add_argument("--token", required=True) - - parser.add_argument("--name", help="User group name (exact match)") - parser.add_argument("--new-name", help="New user group name (for update)") - parser.add_argument("--note", help="Note") - - parser.add_argument("--accessed-from", help="JSON array: '[{\"type\":0|2,\"name\":\"...\"}]' (0=User Group, 2=User)") - parser.add_argument("--access-to", help="JSON array: '[{\"type\":0|1,\"name\":\"...\"}]' (0=User Group, 1=Device Group)") - - parser.add_argument("--users", help="Comma separated usernames for add-users") - - # Filters for view-users command - parser.add_argument("--user-name", help="User name filter (for view-users, supports fuzzy search)") - - args = parser.parse_args() - while args.url.endswith("/"): args.url = args.url[:-1] - - if args.command == "view": - res = list_groups(args.url, args.token, args.name) - print(json.dumps(res, indent=2)) - elif args.command == "add": - if not args.name: - print("Error: --name is required") - exit(1) - print(create_group( - args.url, args.token, args.name, args.note, - parse_rules(args.accessed_from), - parse_rules(args.access_to) - )) - elif args.command == "update": - if not args.name: - print("Error: --name is required") - exit(1) - print(update_group( - args.url, args.token, args.name, args.new_name, args.note, - parse_rules(args.accessed_from), - parse_rules(args.access_to) - )) - elif args.command == "delete": - if not args.name: - print("Error: --name is required (supports comma separated)") - exit(1) - names = [x.strip() for x in args.name.split(",") if x.strip()] - print(delete_groups(args.url, args.token, names)) - elif args.command == "view-users": - res = view_users( - args.url, - args.token, - group_name=args.name, - name=args.user_name - ) - print(json.dumps(res, indent=2)) - elif args.command == "add-users": - if not args.name or not args.users: - print("Error: --name and --users are required") - exit(1) - users = [x.strip() for x in args.users.split(",") if x.strip()] - print(add_users(args.url, args.token, args.name, users)) - - -if __name__ == "__main__": - main() diff --git a/res/users.py b/res/users.py index 02b114715..54297f06a 100755 --- a/res/users.py +++ b/res/users.py @@ -5,28 +5,6 @@ import argparse from datetime import datetime, timedelta -def check_response(response): - """ - Check API response and handle errors properly. - Exit with code 1 if there's an error. - """ - if response.status_code != 200: - print(f"Error: HTTP {response.status_code}: {response.text}") - exit(1) - - if response.text and response.text.strip(): - try: - json_data = response.json() - if isinstance(json_data, dict) and "error" in json_data: - print(f"Error: {json_data['error']}") - exit(1) - return json_data - except ValueError: - return response.text - - return None - - def view( url, token, @@ -49,147 +27,61 @@ def view( users = [] - current = 0 + current = 1 while True: - current += 1 params["current"] = current response = requests.get(f"{url}/api/users", headers=headers, params=params) - if response.status_code != 200: - print(f"Error: HTTP {response.status_code} - {response.text}") - exit(1) - response_json = response.json() - if "error" in response_json: - print(f"Error: {response_json['error']}") - exit(1) data = response_json.get("data", []) users.extend(data) total = response_json.get("total", 0) - if len(data) < pageSize or current * pageSize >= total: + current += pageSize + if len(data) < pageSize or current > total: break return users +def check(response): + if response.status_code == 200: + try: + response_json = response.json() + return response_json + except ValueError: + return response.text or "Success" + else: + return "Failed", response.status_code, response.text + + def disable(url, token, guid, name): print("Disable", name) headers = {"Authorization": f"Bearer {token}"} response = requests.post(f"{url}/api/users/{guid}/disable", headers=headers) - check_response(response) + return check(response) def enable(url, token, guid, name): print("Enable", name) headers = {"Authorization": f"Bearer {token}"} response = requests.post(f"{url}/api/users/{guid}/enable", headers=headers) - check_response(response) + return check(response) -def delete_user(url, token, guid, name): +def delete(url, token, guid, name): print("Delete", name) headers = {"Authorization": f"Bearer {token}"} response = requests.delete(f"{url}/api/users/{guid}", headers=headers) - check_response(response) - - -def new_user(url, token, name, password, group_name=None, email=None, note=None): - """Create a new user""" - headers = {"Authorization": f"Bearer {token}", "Content-Type": "application/json"} - payload = { - "name": name, - "password": password, - } - if group_name: - payload["group_name"] = group_name - if email: - payload["email"] = email - if note: - payload["note"] = note - response = requests.post(f"{url}/api/users", headers=headers, json=payload) - check_response(response) - - -def invite_user(url, token, email, name, group_name=None, note=None): - """Invite a user by email""" - headers = {"Authorization": f"Bearer {token}", "Content-Type": "application/json"} - payload = { - "email": email, - "name": name, - } - if group_name: - payload["group_name"] = group_name - if note: - payload["note"] = note - response = requests.post(f"{url}/api/users/invite", headers=headers, json=payload) - check_response(response) - - -def enable_2fa_enforce(url, token, user_guids, base_url): - """Enable 2FA enforcement for users""" - headers = {"Authorization": f"Bearer {token}", "Content-Type": "application/json"} - payload = { - "user_guids": user_guids if isinstance(user_guids, list) else [user_guids], - "enforce": True, - "url": base_url - } - response = requests.put(f"{url}/api/users/tfa/totp/enforce", headers=headers, json=payload) - check_response(response) - - -def disable_2fa_enforce(url, token, user_guids, base_url=""): - """Disable 2FA enforcement for users""" - headers = {"Authorization": f"Bearer {token}", "Content-Type": "application/json"} - payload = { - "user_guids": user_guids if isinstance(user_guids, list) else [user_guids], - "enforce": False, - "url": base_url - } - response = requests.put(f"{url}/api/users/tfa/totp/enforce", headers=headers, json=payload) - check_response(response) - - -def disable_email_verification(url, token, user_guids): - """Disable email login verification for users""" - headers = {"Authorization": f"Bearer {token}", "Content-Type": "application/json"} - payload = { - "user_guids": user_guids if isinstance(user_guids, list) else [user_guids], - "type": "email" - } - response = requests.put(f"{url}/api/users/disable_login_verification", headers=headers, json=payload) - check_response(response) - - -def reset_2fa(url, token, user_guids): - """Reset 2FA for users""" - headers = {"Authorization": f"Bearer {token}", "Content-Type": "application/json"} - payload = { - "user_guids": user_guids if isinstance(user_guids, list) else [user_guids], - "type": "2fa" - } - response = requests.put(f"{url}/api/users/disable_login_verification", headers=headers, json=payload) - check_response(response) - - -def force_logout(url, token, user_guids): - """Force logout users""" - headers = {"Authorization": f"Bearer {token}", "Content-Type": "application/json"} - payload = { - "user_guids": user_guids if isinstance(user_guids, list) else [user_guids], - } - response = requests.post(f"{url}/api/users/force-logout", headers=headers, json=payload) - check_response(response) + return check(response) def main(): parser = argparse.ArgumentParser(description="User manager") parser.add_argument( "command", - choices=["view", "disable", "enable", "delete", "new", "invite", - "enable-2fa-enforce", "disable-2fa-enforce", - "disable-email-verification", "reset-2fa", "force-logout"], + choices=["view", "disable", "enable", "delete"], help="Command to execute", ) parser.add_argument("--url", required=True, help="URL of the API") @@ -197,32 +89,12 @@ def main(): "--token", required=True, help="Bearer token for authentication" ) parser.add_argument("--name", help="User name") - parser.add_argument("--group_name", help="Group name (for filtering in view, or for new/invite command)") - parser.add_argument("--password", help="User password (for new command)") - parser.add_argument("--email", help="User email (for invite command)") - parser.add_argument("--note", help="User note (for new/invite command)") - parser.add_argument("--web-console-url", help="Web console URL (for 2FA enforce commands)") + parser.add_argument("--group_name", help="Group name") args = parser.parse_args() while args.url.endswith("/"): args.url = args.url[:-1] - if args.command == "new": - if not args.name or not args.password or not args.group_name: - print("Error: --name and --password and --group_name are required for new command") - exit(1) - new_user(args.url, args.token, args.name, args.password, args.group_name, args.email, args.note) - print("Success: User created") - return - - if args.command == "invite": - if not args.email or not args.name or not args.group_name: - print("Error: --email and --name and --group_name are required for invite command") - exit(1) - invite_user(args.url, args.token, args.email, args.name, args.group_name, args.note) - print("Success: Invitation sent") - return - users = view( args.url, args.token, @@ -231,61 +103,20 @@ def main(): ) if args.command == "view": - if len(users) == 0: - print("Found 0 users") - else: - for user in users: - print(user) - elif args.command in ["disable", "enable", "delete", "enable-2fa-enforce", - "disable-2fa-enforce", "disable-email-verification", "reset-2fa", "force-logout"]: - if len(users) == 0: - print("Found 0 users") - return - - # Check if we need user confirmation for multiple users - if len(users) > 1: - print(f"Found {len(users)} users. Do you want to proceed with {args.command} operation on the users? (Y/N)") - confirmation = input("Type 'Y' to confirm: ").strip() - if confirmation.upper() != 'Y': - print("Operation cancelled.") - return - - if args.command == "disable": - for user in users: - disable(args.url, args.token, user["guid"], user["name"]) - print("Success") - elif args.command == "enable": - for user in users: - enable(args.url, args.token, user["guid"], user["name"]) - print("Success") - elif args.command == "delete": - for user in users: - delete_user(args.url, args.token, user["guid"], user["name"]) - print("Success") - elif args.command == "enable-2fa-enforce": - if not args.web_console_url: - print("Error: --web-console-url is required for enable-2fa-enforce") - exit(1) - user_guids = [user["guid"] for user in users] - enable_2fa_enforce(args.url, args.token, user_guids, args.web_console_url) - print(f"Success: Enabled 2FA enforcement for {len(users)} user(s)") - elif args.command == "disable-2fa-enforce": - user_guids = [user["guid"] for user in users] - web_url = args.web_console_url or "" - disable_2fa_enforce(args.url, args.token, user_guids, web_url) - print(f"Success: Disabled 2FA enforcement for {len(users)} user(s)") - elif args.command == "disable-email-verification": - user_guids = [user["guid"] for user in users] - disable_email_verification(args.url, args.token, user_guids) - print(f"Success: Disabled email verification for {len(users)} user(s)") - elif args.command == "reset-2fa": - user_guids = [user["guid"] for user in users] - reset_2fa(args.url, args.token, user_guids) - print(f"Success: Reset 2FA for {len(users)} user(s)") - elif args.command == "force-logout": - user_guids = [user["guid"] for user in users] - force_logout(args.url, args.token, user_guids) - print(f"Success: Force logout for {len(users)} user(s)") + for user in users: + print(user) + elif args.command == "disable": + for user in users: + response = disable(args.url, args.token, user["guid"], user["name"]) + print(response) + elif args.command == "enable": + for user in users: + response = enable(args.url, args.token, user["guid"], user["name"]) + print(response) + elif args.command == "delete": + for user in users: + response = delete(args.url, args.token, user["guid"], user["name"]) + print(response) if __name__ == "__main__": diff --git a/res/vcpkg/aom/portfile.cmake b/res/vcpkg/aom/portfile.cmake index f7b1e3c43..24b025173 100644 --- a/res/vcpkg/aom/portfile.cmake +++ b/res/vcpkg/aom/portfile.cmake @@ -22,7 +22,7 @@ else() vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL "https://aomedia.googlesource.com/aom" - REF 10aece4157eb79315da205f39e19bf6ab3ee30d0 # 3.12.1 + REF d6f30ae474dd6c358f26de0a0fc26a0d7340a84c # 3.11.0 PATCHES aom-uninitialized-pointer.diff # aom-avx2.diff diff --git a/res/vcpkg/aom/vcpkg.json b/res/vcpkg/aom/vcpkg.json index 70a12d83e..9ff755f6b 100644 --- a/res/vcpkg/aom/vcpkg.json +++ b/res/vcpkg/aom/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aom", - "version-semver": "3.12.1", + "version-semver": "3.11.0", "port-version": 0, "description": "AV1 codec library", "homepage": "https://aomedia.googlesource.com/aom", diff --git a/res/vcpkg/ffmpeg/patch/0011-android-mediacodec-encode-align-64.patch b/res/vcpkg/ffmpeg/patch/0011-android-mediacodec-encode-align-64.patch deleted file mode 100644 index 28661cb75..000000000 --- a/res/vcpkg/ffmpeg/patch/0011-android-mediacodec-encode-align-64.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a609e1666c79ccce4faf7aa61d509bf202df9149 Mon Sep 17 00:00:00 2001 -From: 21pages -Date: Fri, 5 Sep 2025 21:35:37 +0800 -Subject: [PATCH] android mediacodec encode align 64 - -Signed-off-by: 21pages ---- - libavcodec/mediacodecenc.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/libavcodec/mediacodecenc.c b/libavcodec/mediacodecenc.c -index 221f7360f4..768c8151df 100644 ---- a/libavcodec/mediacodecenc.c -+++ b/libavcodec/mediacodecenc.c -@@ -242,18 +242,19 @@ static av_cold int mediacodec_init(AVCodecContext *avctx) - ff_AMediaFormat_setString(format, "mime", codec_mime); - // Workaround the alignment requirement of mediacodec. We can't do it - // silently for AV_PIX_FMT_MEDIACODEC. -+ const int align = 64; - if (avctx->pix_fmt != AV_PIX_FMT_MEDIACODEC && - (avctx->codec_id == AV_CODEC_ID_H264 || - avctx->codec_id == AV_CODEC_ID_HEVC)) { -- s->width = FFALIGN(avctx->width, 16); -- s->height = FFALIGN(avctx->height, 16); -+ s->width = FFALIGN(avctx->width, align); -+ s->height = FFALIGN(avctx->height, align); - } else { - s->width = avctx->width; - s->height = avctx->height; -- if (s->width % 16 || s->height % 16) -+ if (s->width % align || s->height % align) - av_log(avctx, AV_LOG_WARNING, -- "Video size %dx%d isn't align to 16, it may have device compatibility issue\n", -- s->width, s->height); -+ "Video size %dx%d isn't align to %d, it may have device compatibility issue\n", -+ s->width, s->height, align); - } - ff_AMediaFormat_setInt32(format, "width", s->width); - ff_AMediaFormat_setInt32(format, "height", s->height); --- -2.43.0.windows.1 - diff --git a/res/vcpkg/ffmpeg/patch/0012-fix-macos-big-sur-CVBufferCopyAttachments.patch b/res/vcpkg/ffmpeg/patch/0012-fix-macos-big-sur-CVBufferCopyAttachments.patch deleted file mode 100644 index efcd58162..000000000 --- a/res/vcpkg/ffmpeg/patch/0012-fix-macos-big-sur-CVBufferCopyAttachments.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: RustDesk -Date: Fri, 1 Nov 2025 08:00:00 +0000 -Subject: [PATCH] Fix CVBufferCopyAttachments crash on macOS Big Sur - -Use weak linking for CVBufferCopyAttachments to avoid symbol resolution -crash on macOS < 12. The function will be NULL on older systems and the -code will fall back to the deprecated CVBufferGetAttachments. - -This fixes a crash on macOS Big Sur (11.x) where CVBufferCopyAttachments -is not available. The runtime check with __builtin_available is not enough -because the symbol is still resolved at load time, causing a dyld error. - -Fixes: https://github.com/rustdesk/rustdesk/issues/13377 ---- - libavutil/hwcontext_videotoolbox.c | 21 ++++++++++++++++++++- - 1 file changed, 20 insertions(+), 1 deletion(-) - -diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c -index 0000000000..1111111111 100644 ---- a/libavutil/hwcontext_videotoolbox.c -+++ b/libavutil/hwcontext_videotoolbox.c -@@ -33,6 +33,25 @@ - #include "pixfmt.h" - #include "pixdesc.h" - -+// Weak import CVBufferCopyAttachments to support macOS < 12 -+// The runtime check with __builtin_available is not enough because -+// the symbol is still resolved at load time, causing dyld errors on Big Sur. -+// With weak_import, the function pointer will be NULL on older systems. -+#if TARGET_OS_OSX && defined(__MAC_12_0) && __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_12_0 -+extern CFDictionaryRef CVBufferCopyAttachments(CVBufferRef buffer, CVAttachmentMode mode) -+ __attribute__((weak_import)); -+#endif -+#if TARGET_OS_IOS && defined(__IPHONE_15_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_15_0 -+extern CFDictionaryRef CVBufferCopyAttachments(CVBufferRef buffer, CVAttachmentMode mode) -+ __attribute__((weak_import)); -+#endif -+#if TARGET_OS_TV && defined(__TVOS_15_0) && __TV_OS_VERSION_MAX_ALLOWED >= __TVOS_15_0 -+extern CFDictionaryRef CVBufferCopyAttachments(CVBufferRef buffer, CVAttachmentMode mode) -+ __attribute__((weak_import)); -+#endif -+ -+// End of weak import section -+ - typedef struct VTFramesContext { - /** - * The public AVVTFramesContext. See hwcontext_videotoolbox.h for it. -@@ -547,7 +566,7 @@ static CFDictionaryRef vt_cv_buffer_copy_attachments(CVBufferRef buffer, - (TARGET_OS_TV && defined(__TVOS_15_0) && __TV_OS_VERSION_MAX_ALLOWED >= __TVOS_15_0) - // On recent enough versions, just use the respective API - if (__builtin_available(macOS 12.0, iOS 15.0, tvOS 15.0, *)) -- return CVBufferCopyAttachments(buffer, attachment_mode); -+ if (CVBufferCopyAttachments != NULL) return CVBufferCopyAttachments(buffer, attachment_mode); - #endif - - // Check that the target is lower than macOS 12 / iOS 15 / tvOS 15 --- -2.43.0 - diff --git a/res/vcpkg/ffmpeg/portfile.cmake b/res/vcpkg/ffmpeg/portfile.cmake index 16cef8350..9d09c5264 100644 --- a/res/vcpkg/ffmpeg/portfile.cmake +++ b/res/vcpkg/ffmpeg/portfile.cmake @@ -26,8 +26,6 @@ vcpkg_from_github( patch/0008-remove-amf-loop-query.patch patch/0009-fix-nvenc-reconfigure-blur.patch patch/0010.disable-loading-DLLs-from-app-dir.patch - patch/0011-android-mediacodec-encode-align-64.patch - patch/0012-fix-macos-big-sur-CVBufferCopyAttachments.patch ) if(SOURCE_PATH MATCHES " ") @@ -178,7 +176,6 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android") string(APPEND OPTIONS "\ --target-os=android \ --disable-asm \ ---disable-iconv \ --enable-jni \ --enable-mediacodec \ --disable-hwaccels \ diff --git a/res/vcpkg/libvpx/0002-Fix-nasm-debug-format-flag.patch b/res/vcpkg/libvpx/0002-Fix-nasm-debug-format-flag.patch new file mode 100644 index 000000000..5f4749ae0 --- /dev/null +++ b/res/vcpkg/libvpx/0002-Fix-nasm-debug-format-flag.patch @@ -0,0 +1,21 @@ +diff --git a/build/make/configure.sh b/build/make/configure.sh +index 81d30a1..325017e 100644 +--- a/build/make/configure.sh ++++ b/build/make/configure.sh +@@ -1370,12 +1370,14 @@ EOF + case ${tgt_os} in + win32) + add_asflags -f win32 +- enabled debug && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 + EXE_SFX=.exe + ;; + win64) + add_asflags -f win64 +- enabled debug && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 ++ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 + EXE_SFX=.exe + ;; + linux*|solaris*|android*) diff --git a/res/vcpkg/libvpx/0003-add-uwp-v142-and-v143-support.patch b/res/vcpkg/libvpx/0003-add-uwp-v142-and-v143-support.patch index c9a01b744..32222238c 100644 --- a/res/vcpkg/libvpx/0003-add-uwp-v142-and-v143-support.patch +++ b/res/vcpkg/libvpx/0003-add-uwp-v142-and-v143-support.patch @@ -1,8 +1,8 @@ diff --git a/build/make/configure.sh b/build/make/configure.sh -index cc5bf6ce4..9380e87a7 100644 +index 110f16e..c161d0e 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh -@@ -1092,7 +1092,7 @@ EOF +@@ -1038,7 +1038,7 @@ EOF # A number of ARM-based Windows platforms are constrained by their # respective SDKs' limitations. Fortunately, these are all 32-bit ABIs # and so can be selected as 'win32'. @@ -11,7 +11,7 @@ index cc5bf6ce4..9380e87a7 100644 asm_conversion_cmd="${source_path_mk}/build/make/ads2armasm_ms.pl" AS_SFX=.S msvs_arch_dir=arm-msvs -@@ -1366,6 +1366,9 @@ EOF +@@ -1272,6 +1272,9 @@ EOF android) soft_enable realtime_only ;; @@ -21,12 +21,12 @@ index cc5bf6ce4..9380e87a7 100644 win*) enabled gcc && add_cflags -fno-common ;; -@@ -1484,14 +1487,26 @@ EOF +@@ -1390,6 +1393,16 @@ EOF fi AS_SFX=.asm case ${tgt_os} in + uwp) -+ if [ ${tgt_isa} = "x86" ] || [ ${tgt_isa} = "armv7" ]; then ++ if [ {$tgt_isa} = "x86" ] || [ {$tgt_isa} = "armv7" ]; then + add_asflags -f win32 + else + add_asflags -f win64 @@ -37,20 +37,8 @@ index cc5bf6ce4..9380e87a7 100644 + ;; win32) add_asflags -f win32 -- enabled debug && add_asflags -g cv8 -+ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 -+ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 - EXE_SFX=.exe - ;; - win64) - add_asflags -f win64 -- enabled debug && add_asflags -g cv8 -+ enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 -+ enabled debug && [ "${AS}" = nasm ] && add_asflags -gcv8 - EXE_SFX=.exe - ;; - linux*|solaris*|android*) -@@ -1622,6 +1637,8 @@ EOF + enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 +@@ -1519,6 +1532,8 @@ EOF # Almost every platform uses pthreads. if enabled multithread; then case ${toolchain} in @@ -60,10 +48,10 @@ index cc5bf6ce4..9380e87a7 100644 ;; *-android-gcc) diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh -index 1e1db05bb..543eb37b2 100755 +index 58bb66b..b4cad6c 100644 --- a/build/make/gen_msvs_vcxproj.sh +++ b/build/make/gen_msvs_vcxproj.sh -@@ -310,7 +310,22 @@ generate_vcxproj() { +@@ -296,7 +296,22 @@ generate_vcxproj() { tag_content ProjectGuid "{${guid}}" tag_content RootNamespace ${name} tag_content Keyword ManagedCProj @@ -87,7 +75,7 @@ index 1e1db05bb..543eb37b2 100755 tag_content AppContainerApplication true # The application type can be one of "Windows Store", # "Windows Phone" or "Windows Phone Silverlight". The -@@ -412,7 +427,7 @@ generate_vcxproj() { +@@ -394,7 +409,7 @@ generate_vcxproj() { Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'" if [ "$name" == "vpx" ]; then hostplat=$plat @@ -97,19 +85,19 @@ index 1e1db05bb..543eb37b2 100755 fi fi diff --git a/configure b/configure -index 457bd6b38..fa4bce71b 100755 +index b212e07..1a9fa98 100755 --- a/configure +++ b/configure -@@ -105,6 +105,8 @@ all_platforms="${all_platforms} arm64-darwin22-gcc" +@@ -104,6 +104,8 @@ all_platforms="${all_platforms} arm64-darwin21-gcc" + all_platforms="${all_platforms} arm64-darwin22-gcc" all_platforms="${all_platforms} arm64-darwin23-gcc" - all_platforms="${all_platforms} arm64-darwin24-gcc" all_platforms="${all_platforms} arm64-linux-gcc" +all_platforms="${all_platforms} arm64-uwp-vs16" +all_platforms="${all_platforms} arm64-uwp-vs17" all_platforms="${all_platforms} arm64-win64-gcc" all_platforms="${all_platforms} arm64-win64-vs15" all_platforms="${all_platforms} arm64-win64-vs16" -@@ -116,6 +118,8 @@ all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 +@@ -115,6 +117,8 @@ all_platforms="${all_platforms} armv7-darwin-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-rvct" #neon Cortex-A8 all_platforms="${all_platforms} armv7-linux-gcc" #neon Cortex-A8 all_platforms="${all_platforms} armv7-none-rvct" #neon Cortex-A8 @@ -118,7 +106,7 @@ index 457bd6b38..fa4bce71b 100755 all_platforms="${all_platforms} armv7-win32-gcc" all_platforms="${all_platforms} armv7-win32-vs14" all_platforms="${all_platforms} armv7-win32-vs15" -@@ -147,6 +151,8 @@ all_platforms="${all_platforms} x86-linux-gcc" +@@ -146,6 +150,8 @@ all_platforms="${all_platforms} x86-linux-gcc" all_platforms="${all_platforms} x86-linux-icc" all_platforms="${all_platforms} x86-os2-gcc" all_platforms="${all_platforms} x86-solaris-gcc" @@ -127,7 +115,7 @@ index 457bd6b38..fa4bce71b 100755 all_platforms="${all_platforms} x86-win32-gcc" all_platforms="${all_platforms} x86-win32-vs14" all_platforms="${all_platforms} x86-win32-vs15" -@@ -173,6 +179,8 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc" +@@ -171,6 +177,8 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc" all_platforms="${all_platforms} x86_64-linux-gcc" all_platforms="${all_platforms} x86_64-linux-icc" all_platforms="${all_platforms} x86_64-solaris-gcc" @@ -136,7 +124,7 @@ index 457bd6b38..fa4bce71b 100755 all_platforms="${all_platforms} x86_64-win64-gcc" all_platforms="${all_platforms} x86_64-win64-vs14" all_platforms="${all_platforms} x86_64-win64-vs15" -@@ -507,11 +515,10 @@ process_targets() { +@@ -503,11 +511,10 @@ process_targets() { ! enabled multithread && DIST_DIR="${DIST_DIR}-nomt" ! enabled install_docs && DIST_DIR="${DIST_DIR}-nodocs" DIST_DIR="${DIST_DIR}-${tgt_isa}-${tgt_os}" @@ -152,7 +140,7 @@ index 457bd6b38..fa4bce71b 100755 if [ -f "${source_path}/build/make/version.sh" ]; then ver=`"$source_path/build/make/version.sh" --bare "$source_path"` DIST_DIR="${DIST_DIR}-${ver}" -@@ -600,6 +607,10 @@ process_detect() { +@@ -596,6 +603,10 @@ process_detect() { # Specialize windows and POSIX environments. case $toolchain in @@ -163,6 +151,3 @@ index 457bd6b38..fa4bce71b 100755 *-win*-*) # Don't check for any headers in Windows builds. false --- -2.49.0 - diff --git a/res/vcpkg/libvpx/portfile.cmake b/res/vcpkg/libvpx/portfile.cmake index fbc60b9d8..ac54eafd4 100644 --- a/res/vcpkg/libvpx/portfile.cmake +++ b/res/vcpkg/libvpx/portfile.cmake @@ -4,9 +4,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO webmproject/libvpx REF "v${VERSION}" - SHA512 824fe8719e4115ec359ae0642f5e1cea051d458f09eb8c24d60858cf082f66e411215e23228173ab154044bafbdfbb2d93b589bb726f55b233939b91f928aae0 + SHA512 8f483653a324c710fd431b87fd0d5d6f476f006bd8c8e9c6d1fa6abd105d6a40ac81c8fd5638b431c455d57ab2ee823c165e9875eb3932e6e518477422da3a7b HEAD_REF master PATCHES + 0002-Fix-nasm-debug-format-flag.patch 0003-add-uwp-v142-and-v143-support.patch 0004-remove-library-suffixes.patch ) @@ -225,12 +226,6 @@ else() set(LIBVPX_TARGET "generic-gnu") # use default target endif() - if (VCPKG_HOST_IS_OPENBSD OR VCPKG_HOST_IS_FREEBSD) - set(MAKE_BINARY "gmake") - else() - set(MAKE_BINARY "make") - endif() - message(STATUS "Build info. Target: ${LIBVPX_TARGET}; Options: ${OPTIONS}") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") @@ -251,7 +246,7 @@ else() message(STATUS "Building libvpx for Release") vcpkg_execute_required_process( COMMAND - ${BASH} --noprofile --norc -c "${MAKE_BINARY} -j${VCPKG_CONCURRENCY}" + ${BASH} --noprofile --norc -c "make -j${VCPKG_CONCURRENCY}" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" LOGNAME build-${TARGET_TRIPLET}-rel ) @@ -259,7 +254,7 @@ else() message(STATUS "Installing libvpx for Release") vcpkg_execute_required_process( COMMAND - ${BASH} --noprofile --norc -c "${MAKE_BINARY} install" + ${BASH} --noprofile --norc -c "make install" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" LOGNAME install-${TARGET_TRIPLET}-rel ) @@ -285,7 +280,7 @@ else() message(STATUS "Building libvpx for Debug") vcpkg_execute_required_process( COMMAND - ${BASH} --noprofile --norc -c "${MAKE_BINARY} -j${VCPKG_CONCURRENCY}" + ${BASH} --noprofile --norc -c "make -j${VCPKG_CONCURRENCY}" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" LOGNAME build-${TARGET_TRIPLET}-dbg ) @@ -293,7 +288,7 @@ else() message(STATUS "Installing libvpx for Debug") vcpkg_execute_required_process( COMMAND - ${BASH} --noprofile --norc -c "${MAKE_BINARY} install" + ${BASH} --noprofile --norc -c "make install" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" LOGNAME install-${TARGET_TRIPLET}-dbg ) diff --git a/res/vcpkg/libvpx/vcpkg.json b/res/vcpkg/libvpx/vcpkg.json index ac9775ef6..d19c5daca 100644 --- a/res/vcpkg/libvpx/vcpkg.json +++ b/res/vcpkg/libvpx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libvpx", - "version": "1.15.2", + "version": "1.15.0", + "port-version": 0, "description": "The reference software implementation for the video coding formats VP8 and VP9.", "homepage": "https://github.com/webmproject/libvpx", "license": "BSD-3-Clause", diff --git a/src/cli.rs b/src/cli.rs index 2f3b3550f..f61bfe92f 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -25,13 +25,7 @@ impl Session { pub fn new(id: &str, sender: mpsc::UnboundedSender) -> Self { let mut password = "".to_owned(); if PeerConfig::load(id).password.is_empty() { - match rpassword::prompt_password("Enter password: ") { - Ok(p) => password = p, - Err(e) => { - log::error!("Failed to read password: {:?}", e); - password = "".to_owned(); - } - } + password = rpassword::prompt_password("Enter password: ").unwrap(); } let session = Self { id: id.to_owned(), diff --git a/src/client.rs b/src/client.rs index 321a49ee6..4bda93d43 100644 --- a/src/client.rs +++ b/src/client.rs @@ -33,7 +33,7 @@ use crate::{ create_symmetric_key_msg, decode_id_pk, get_rs_pk, is_keyboard_mode_supported, kcp_stream::KcpStream, secure_tcp, - ui_interface::{get_builtin_option, resolve_avatar_url, use_texture_render}, + ui_interface::{get_builtin_option, use_texture_render}, ui_session_interface::{InvokeUiSession, Session}, }; #[cfg(feature = "unix-file-copy-paste")] @@ -119,13 +119,10 @@ pub const LOGIN_MSG_NO_PASSWORD_ACCESS: &str = "No Password Access"; pub const LOGIN_MSG_OFFLINE: &str = "Offline"; pub const LOGIN_SCREEN_WAYLAND: &str = "Wayland login screen is not supported"; #[cfg(target_os = "linux")] -pub const SCRAP_UBUNTU_HIGHER_REQUIRED: &str = "ubuntu-21-04-required"; +pub const SCRAP_UBUNTU_HIGHER_REQUIRED: &str = "Wayland requires Ubuntu 21.04 or higher version."; #[cfg(target_os = "linux")] pub const SCRAP_OTHER_VERSION_OR_X11_REQUIRED: &str = - "wayland-requires-higher-linux-version"; -#[cfg(target_os = "linux")] -pub const SCRAP_XDP_PORTAL_UNAVAILABLE: &str = - "xdp-portal-unavailable"; + "Wayland requires higher version of linux distro. Please try X11 desktop or change your OS."; pub const SCRAP_X11_REQUIRED: &str = "x11 expected"; pub const SCRAP_X11_REF_URL: &str = "https://rustdesk.com/docs/en/manual/linux/#x11-required"; @@ -195,19 +192,13 @@ impl Client { conn_type: ConnType, interface: impl Interface, ) -> ResultType<( - ( - Stream, - bool, - Option>, - Option, - &'static str, - ), + (Stream, bool, Option>, Option), (i32, String), )> { debug_assert!(peer == interface.get_id()); interface.update_direct(None); interface.update_received(false); - match Self::_start(peer, key, token, conn_type, interface.clone()).await { + match Self::_start(peer, key, token, conn_type, interface).await { Err(err) => { let err_str = err.to_string(); if err_str.starts_with("Failed") { @@ -216,19 +207,7 @@ impl Client { return Err(err); } } - Ok(x) => { - // Set x.2 to true only in the connect() function to indicate that direct_failures needs to be updated; everywhere else it should be set to false. - if x.2 { - let direct_failures = interface.get_lch().read().unwrap().direct_failures; - let direct = x.0 .1; - if !interface.is_force_relay() && (direct_failures == 0) != direct { - let n = if direct { 0 } else { 1 }; - log::info!("direct_failures updated to {}", n); - interface.get_lch().write().unwrap().set_direct_failure(n); - } - } - Ok((x.0, x.1)) - } + Ok(x) => Ok(x), } } @@ -240,15 +219,8 @@ impl Client { conn_type: ConnType, interface: impl Interface, ) -> ResultType<( - ( - Stream, - bool, - Option>, - Option, - &'static str, - ), + (Stream, bool, Option>, Option), (i32, String), - bool, )> { if config::is_incoming_only() { bail!("Incoming only mode"); @@ -262,10 +234,8 @@ impl Client { true, None, None, - "TCP", ), (0, "".to_owned()), - false, )); } // Allow connect to {domain}:{port} @@ -276,10 +246,8 @@ impl Client { true, None, None, - "TCP", ), (0, "".to_owned()), - false, )); } @@ -289,7 +257,7 @@ impl Client { } else { (peer, "", key, token) }; - let (rendezvous_server, servers, contained) = if other_server.is_empty() { + let (mut rendezvous_server, servers, contained) = if other_server.is_empty() { crate::get_rendezvous_server(1_000).await } else { if other_server == PUBLIC_SERVER { @@ -311,10 +279,10 @@ impl Client { } let (stop_udp_tx, stop_udp_rx) = oneshot::channel::<()>(); - let udp = + let mut udp = // no need to care about multiple rendezvous servers case, since it is acutally not used any more. // Shared state for UDP NAT test result - if crate::get_udp_punch_enabled() && !interface.is_force_relay() { + if crate::get_udp_punch_enabled() { if let Ok((socket, addr)) = new_direct_udp_for(&rendezvous_server).await { let udp_port = Arc::new(Mutex::new(0)); let up_cloned = udp_port.clone(); @@ -330,64 +298,6 @@ impl Client { } else { (None, None) }; - let fut = Self::_start_inner( - peer.to_owned(), - key.to_owned(), - token.to_owned(), - conn_type, - interface.clone(), - udp.clone(), - Some(stop_udp_tx), - rendezvous_server.clone(), - servers.clone(), - contained, - ); - if udp.0.is_none() { - return fut.await; - } - let mut connect_futures = Vec::new(); - connect_futures.push(fut.boxed()); - let fut = Self::_start_inner( - peer.to_owned(), - key.to_owned(), - token.to_owned(), - conn_type, - interface, - (None, None), - None, - rendezvous_server, - servers, - contained, - ); - connect_futures.push(fut.boxed()); - match select_ok(connect_futures).await { - Ok(conn) => Ok((conn.0 .0, conn.0 .1, conn.0 .2)), - Err(e) => Err(e), - } - } - - async fn _start_inner( - peer: String, - key: String, - token: String, - conn_type: ConnType, - interface: impl Interface, - mut udp: (Option>, Option>>), - stop_udp_tx: Option>, - mut rendezvous_server: String, - servers: Vec, - contained: bool, - ) -> ResultType<( - ( - Stream, - bool, - Option>, - Option, - &'static str, - ), - (i32, String), - bool, - )> { let mut start = Instant::now(); let mut socket = connect_tcp(&*rendezvous_server, CONNECT_TIMEOUT).await; debug_assert!(!servers.contains(&rendezvous_server)); @@ -417,8 +327,9 @@ impl Client { let my_nat_type = crate::get_nat_type(100).await; let mut is_local = false; let mut feedback = 0; + let force_relay = interface.is_force_relay() || use_ws() || Config::is_proxy(); use hbb_common::protobuf::Enum; - let nat_type = if interface.is_force_relay() { + let nat_type = if force_relay { NatType::SYMMETRIC } else { NatType::from_i32(my_nat_type).unwrap_or(NatType::UNKNOWN_NAT) @@ -426,7 +337,7 @@ impl Client { if !key.is_empty() && !token.is_empty() { // mainly for the security of token - secure_tcp(&mut socket, &key) + secure_tcp(&mut socket, key) .await .map_err(|e| anyhow!("Failed to secure tcp: {}", e))?; } else if let Some(udp) = udp.1.as_ref() { @@ -444,7 +355,7 @@ impl Client { } } // Stop UDP NAT test task if still running - stop_udp_tx.map(|tx| tx.send(())); + let _ = stop_udp_tx.send(()); let mut msg_out = RendezvousMessage::new(); let mut ipv6 = if crate::get_ipv6_punch_enabled() { if let Some((socket, addr)) = crate::get_ipv6_socket().await { @@ -456,7 +367,6 @@ impl Client { (None, None) }; let udp_nat_port = udp.1.map(|x| *x.lock().unwrap()).unwrap_or(0); - let punch_type = if udp_nat_port > 0 { "UDP" } else { "TCP" }; msg_out.set_punch_hole_request(PunchHoleRequest { id: peer.to_owned(), token: token.to_owned(), @@ -465,18 +375,12 @@ impl Client { conn_type: conn_type.into(), version: crate::VERSION.to_owned(), udp_port: udp_nat_port as _, - force_relay: interface.is_force_relay(), + force_relay, socket_addr_v6: ipv6.1.unwrap_or_default(), ..Default::default() }); for i in 1..=3 { - log::info!( - "#{} {} punch attempt with {}, id: {}", - i, - punch_type, - my_addr, - peer - ); + log::info!("#{} punch attempt with {}, id: {}", i, my_addr, peer); socket.send(&msg_out).await?; // below timeout should not bigger than hbbs's connection timeout. if let Some(msg_in) = @@ -527,7 +431,7 @@ impl Client { } } } - log::info!("{} Hole Punched {} = {}", punch_type, peer, peer_addr); + log::info!("Hole Punched {} = {}", peer, peer_addr); break; } } @@ -543,24 +447,23 @@ impl Client { let addr = AddrMangle::decode(&rr.socket_addr_v6); if addr.port() > 0 { if s.connect(addr).await.is_ok() { - connect_futures - .push(udp_nat_connect(s, "IPv6", CONNECT_TIMEOUT).boxed()); + connect_futures.push(udp_nat_connect(s, "IPv6").boxed()); } } } signed_id_pk = rr.pk().into(); let fut = Self::create_relay( - &peer, + peer, rr.uuid, rr.relay_server, - &key, + key, conn_type, my_addr.is_ipv4(), ); connect_futures.push( async move { let conn = fut.await?; - Ok((conn, None, if use_ws() { "WebSocket" } else { "Relay" })) + Ok((conn, None, "Relay")) } .boxed(), ); @@ -574,12 +477,8 @@ impl Client { feedback = rr.feedback; log::info!("{:?} used to establish {typ} connection", start.elapsed()); let pk = - Self::secure_connection(&peer, signed_id_pk, &key, &mut conn).await?; - return Ok(( - (conn, typ == "IPv6", pk, kcp, typ), - (feedback, rendezvous_server), - false, - )); + Self::secure_connection(peer, signed_id_pk, key, &mut conn).await?; + return Ok(((conn, false, pk, kcp), (feedback, rendezvous_server))); } _ => { log::error!("Unexpected protobuf msg received: {:?}", msg_in); @@ -593,9 +492,8 @@ impl Client { } let time_used = start.elapsed().as_millis() as u64; log::info!( - "{} ms used to {} punch hole, relay_server: {}, {}", + "{} ms used to punch hole, relay_server: {}, {}", time_used, - punch_type, relay_server, if is_local { "is_local: true".to_owned() @@ -607,7 +505,7 @@ impl Client { Self::connect( my_addr, peer_addr, - &peer, + peer, signed_id_pk, &relay_server, &rendezvous_server, @@ -615,17 +513,15 @@ impl Client { peer_nat_type, my_nat_type, is_local, - &key, - &token, + key, + token, conn_type, interface, udp.0, ipv6.0, - punch_type, ) .await?, (feedback, rendezvous_server), - true, )) } @@ -647,14 +543,7 @@ impl Client { interface: impl Interface, udp_socket_nat: Option>, udp_socket_v6: Option>, - punch_type: &str, - ) -> ResultType<( - Stream, - bool, - Option>, - Option, - &'static str, - )> { + ) -> ResultType<(Stream, bool, Option>, Option)> { let direct_failures = interface.get_lch().read().unwrap().direct_failures; let mut connect_timeout = 0; const MIN: u64 = 1000; @@ -700,10 +589,10 @@ impl Client { .boxed(), ); if let Some(udp_socket_nat) = udp_socket_nat { - connect_futures.push(udp_nat_connect(udp_socket_nat, "UDP", connect_timeout).boxed()); + connect_futures.push(udp_nat_connect(udp_socket_nat, "UDP").boxed()); } if let Some(udp_socket_v6) = udp_socket_v6 { - connect_futures.push(udp_nat_connect(udp_socket_v6, "IPv6", connect_timeout).boxed()); + connect_futures.push(udp_nat_connect(udp_socket_v6, "IPv6").boxed()); } // Run all connection attempts concurrently, return the first successful one let (mut conn, kcp, mut typ) = match select_ok(connect_futures).await { @@ -712,6 +601,7 @@ impl Client { }; let mut direct = !conn.is_err(); + interface.update_direct(Some(direct)); if interface.is_force_relay() || conn.is_err() { if !relay_server.is_empty() { conn = Self::request_relay( @@ -724,9 +614,8 @@ impl Client { conn_type, ) .await; + interface.update_direct(Some(false)); if let Err(e) = conn { - // this direct is mainly used by on_establish_connection_error, so we update it here before bail - interface.update_direct(Some(false)); bail!("Failed to connect via relay server: {}", e); } typ = "Relay"; @@ -735,23 +624,15 @@ impl Client { bail!("Failed to make direct connection to remote desktop"); } } + if !relay_server.is_empty() && (direct_failures == 0) != direct { + let n = if direct { 0 } else { 1 }; + log::info!("direct_failures updated to {}", n); + interface.get_lch().write().unwrap().set_direct_failure(n); + } let mut conn = conn?; - log::info!( - "{:?} used to establish {typ} connection with {} punch", - start.elapsed(), - punch_type - ); - let res = Self::secure_connection(peer_id, signed_id_pk, key, &mut conn).await; - let pk: Option> = match res { - Ok(pk) => pk, - Err(e) => { - // this direct is mainly used by on_establish_connection_error, so we update it here before bail - interface.update_direct(Some(direct)); - bail!(e); - } - }; - log::debug!("{} punch secure_connection ok", punch_type); - Ok((conn, direct, pk, kcp, typ)) + log::info!("{:?} used to establish {typ} connection", start.elapsed()); + let pk = Self::secure_connection(peer_id, signed_id_pk, key, &mut conn).await?; + Ok((conn, direct, pk, kcp)) } /// Establish secure connection with the server. @@ -1730,7 +1611,6 @@ struct ConnToken { pub struct LoginConfigHandler { id: String, pub conn_type: ConnType, - pub is_terminal_admin: bool, hash: Hash, password: Vec, // remember password for reconnect pub remember: bool, @@ -1745,9 +1625,6 @@ pub struct LoginConfigHandler { pub direct: Option, pub received: bool, switch_uuid: Option, - #[cfg(feature = "flutter")] - #[cfg(not(any(target_os = "android", target_os = "ios")))] - switch_back_allowed: bool, pub save_ab_password_to_recent: bool, // true: connected with ab password pub other_server: Option<(String, String, String)>, pub custom_fps: Arc>>, @@ -1852,51 +1729,21 @@ impl LoginConfigHandler { self.restarting_remote_device = false; self.force_relay = config::option2bool("force-always-relay", &self.get_option("force-always-relay")) - || force_relay - || use_ws() - || Config::is_proxy(); + || force_relay; if let Some((real_id, server, key)) = &self.other_server { let other_server_key = self.get_option("other-server-key"); if !other_server_key.is_empty() && key.is_empty() { self.other_server = Some((real_id.to_owned(), server.to_owned(), other_server_key)); } } - self.direct = None; self.received = false; - #[cfg(feature = "flutter")] - #[cfg(not(any(target_os = "android", target_os = "ios")))] - { - self.switch_back_allowed = false; - } self.switch_uuid = switch_uuid; self.adapter_luid = adapter_luid; self.selected_windows_session_id = None; self.shared_password = shared_password; self.record_state = false; self.record_permission = true; - - // `std::env::remove_var("IS_TERMINAL_ADMIN");` is called in `session_add_sync()` - `flutter_ffi.rs`. - let is_terminal_admin = conn_type == ConnType::TERMINAL - && std::env::var("IS_TERMINAL_ADMIN").map_or(false, |v| v == "Y"); - self.is_terminal_admin = is_terminal_admin; - } - - #[cfg(feature = "flutter")] - #[cfg(not(any(target_os = "android", target_os = "ios")))] - pub fn allow_switch_back_once(&mut self) { - self.switch_back_allowed = true; - } - - #[cfg(feature = "flutter")] - #[cfg(not(any(target_os = "android", target_os = "ios")))] - pub fn consume_switch_back_permission(&mut self) -> bool { - if self.switch_back_allowed { - self.switch_back_allowed = false; - true - } else { - false - } } /// Check if the client should auto login. @@ -2004,24 +1851,13 @@ impl LoginConfigHandler { /// /// # Arguments /// - /// * `value` - The scroll style to be saved. + /// * `value` - The view style to be saved. pub fn save_scroll_style(&mut self, value: String) { let mut config = self.load_config(); config.scroll_style = value; self.save_config(config); } - /// Save edge scroll edge thickness to the current config. - /// - /// # Arguments - /// - /// * `value` - The edge thickness to be saved. - pub fn save_edge_scroll_edge_thickness(&mut self, value: i32) { - let mut config = self.load_config(); - config.edge_scroll_edge_thickness = value; - self.save_config(config); - } - /// Set a ui config of flutter for handler's [`PeerConfig`]. /// /// # Arguments @@ -2066,7 +1902,7 @@ impl LoginConfigHandler { /// // It's Ok to check the option empty in this function. // `toggle_option()` is only called in a session. - // Custom client advanced settings will not effect this function. + // Custom client advanced settings will not affact this function. pub fn toggle_option(&mut self, name: String) -> Option { let mut option = OptionMessage::default(); let mut config = self.load_config(); @@ -2120,7 +1956,7 @@ impl LoginConfigHandler { .into(); } else if name == keys::OPTION_TERMINAL_PERSISTENT { config.terminal_persistent.v = !config.terminal_persistent.v; - option.terminal_persistent = (if config.terminal_persistent.v { + option.terminal_persistent = (if config.terminal_persistent.v { BoolOption::Yes } else { BoolOption::No @@ -2171,19 +2007,7 @@ impl LoginConfigHandler { option.show_remote_cursor = f(self.get_toggle_option("show-remote-cursor")); option.enable_file_transfer = f(self.config.enable_file_copy_paste.v); option.lock_after_session_end = f(self.config.lock_after_session_end.v); - if config.show_my_cursor.v { - config.show_my_cursor.v = false; - option.show_my_cursor = BoolOption::No.into(); - } } - } else if name == "show-my-cursor" { - config.show_my_cursor.v = !config.show_my_cursor.v; - option.show_my_cursor = if config.show_my_cursor.v { - BoolOption::Yes - } else { - BoolOption::No - } - .into(); } else { let is_set = self .options @@ -2276,9 +2100,6 @@ impl LoginConfigHandler { if view_only || self.get_toggle_option("show-remote-cursor") { msg.show_remote_cursor = BoolOption::Yes.into(); } - if view_only && self.get_toggle_option("show-my-cursor") { - msg.show_my_cursor = BoolOption::Yes.into(); - } if self.get_toggle_option("follow-remote-cursor") { msg.follow_remote_cursor = BoolOption::Yes.into(); } @@ -2341,7 +2162,7 @@ impl LoginConfigHandler { /// // It's Ok to check the option empty in this function. // `get_toggle_option()` is only called in a session. - // Custom client advanced settings will not effect this function. + // Custom client advanced settings will not affact this function. pub fn get_toggle_option(&self, name: &str) -> bool { if name == "show-remote-cursor" { self.config.show_remote_cursor.v @@ -2363,8 +2184,6 @@ impl LoginConfigHandler { self.config.allow_swap_key.v } else if name == "view-only" { self.config.view_only.v - } else if name == "show-my-cursor" { - self.config.show_my_cursor.v } else if name == "follow-remote-cursor" { self.config.follow_remote_cursor.v } else if name == "follow-remote-window" { @@ -2653,32 +2472,15 @@ impl LoginConfigHandler { } else { (my_id, self.id.clone()) }; - let mut avatar = get_builtin_option(keys::OPTION_AVATAR); - if avatar.is_empty() { - avatar = serde_json::from_str::(&LocalConfig::get_option( - "user_info", - )) - .ok() - .and_then(|x| { - x.get("avatar") - .and_then(|x| x.as_str()) - .map(|x| x.trim().to_owned()) - }) - .unwrap_or_default(); - } - avatar = resolve_avatar_url(avatar); let mut display_name = get_builtin_option(keys::OPTION_DISPLAY_NAME); if display_name.is_empty() { display_name = serde_json::from_str::(&LocalConfig::get_option("user_info")) .map(|x| { - x.get("display_name") - .and_then(|x| x.as_str()) - .map(|x| x.trim()) - .filter(|x| !x.is_empty()) - .or_else(|| x.get("name").and_then(|x| x.as_str())) - .map(|x| x.to_owned()) + x.get("name") + .map(|x| x.as_str().unwrap_or_default()) .unwrap_or_default() + .to_owned() }) .unwrap_or_default(); } @@ -2726,7 +2528,6 @@ impl LoginConfigHandler { }) .into(), hwid, - avatar, ..Default::default() }; match self.conn_type { @@ -2743,7 +2544,7 @@ impl LoginConfigHandler { }), ConnType::TERMINAL => { let mut terminal = Terminal::new(); - terminal.service_id = self.get_option(self.get_key_terminal_service_id()); + terminal.service_id = self.get_option("terminal-service-id"); lr.set_terminal(terminal); } _ => {} @@ -2794,14 +2595,6 @@ impl LoginConfigHandler { pub fn get_id(&self) -> &str { &self.id } - - pub fn get_key_terminal_service_id(&self) -> &'static str { - if self.is_terminal_admin { - "terminal-admin-service-id" - } else { - "terminal-service-id" - } - } } /// Media data. @@ -3402,36 +3195,6 @@ pub fn handle_login_error( } } -#[cfg(feature = "flutter")] -#[cfg(not(any(target_os = "android", target_os = "ios")))] -async fn consume_local_switch_sides_uuid(id: &str, uuid: &Uuid) -> bool { - let Ok(mut conn) = crate::ipc::connect(1000, "").await else { - return false; - }; - let uuid = uuid.to_string(); - if conn - .send(&crate::ipc::Data::SwitchSidesUuid( - uuid.clone(), - id.to_owned(), - None, - )) - .await - .is_err() - { - return false; - } - match conn.next_timeout(1000).await { - Ok(Some(crate::ipc::Data::SwitchSidesUuid( - returned_uuid, - returned_id, - Some(true), - ))) => { - returned_uuid == uuid && returned_id == id - } - _ => false, - } -} - /// Handle hash message sent by peer. /// Hash will be used for login. /// @@ -3452,22 +3215,12 @@ pub async fn handle_hash( // Take care of password application order // switch_uuid - #[cfg(feature = "flutter")] - #[cfg(not(any(target_os = "android", target_os = "ios")))] - { - let uuid = lc.write().unwrap().switch_uuid.take(); - if let Some(uuid) = uuid { - if let Ok(uuid) = uuid::Uuid::from_str(&uuid) { - let id = lc.read().unwrap().id.clone(); - if !consume_local_switch_sides_uuid(&id, &uuid).await { - log::warn!("Ignored untrusted switch_uuid"); - } else { - lc.write().unwrap().allow_switch_back_once(); - send_switch_login_request(lc.clone(), peer, uuid).await; - lc.write().unwrap().password_source = Default::default(); - return; - } - } + let uuid = lc.write().unwrap().switch_uuid.take(); + if let Some(uuid) = uuid { + if let Ok(uuid) = uuid::Uuid::from_str(&uuid) { + send_switch_login_request(lc.clone(), peer, uuid).await; + lc.write().unwrap().password_source = Default::default(); + return; } } // last password @@ -3521,19 +3274,6 @@ pub async fn handle_hash( } lc.write().unwrap().password = password.clone(); - - let is_terminal_admin = lc.read().unwrap().is_terminal_admin; - let is_terminal = lc.read().unwrap().conn_type.eq(&ConnType::TERMINAL); - if is_terminal && is_terminal_admin { - if password.is_empty() { - interface.msgbox("terminal-admin-login-password", "", "", ""); - } else { - interface.msgbox("terminal-admin-login", "", "", ""); - } - lc.write().unwrap().hash = hash; - return; - } - let password = if password.is_empty() { // login without password, the remote side can click accept interface.msgbox("input-password", "Password Required", "", ""); @@ -3545,15 +3285,8 @@ pub async fn handle_hash( hasher.finalize()[..].into() }; - let is_terminal = lc.read().unwrap().conn_type.eq(&ConnType::TERMINAL); - let (os_username, os_password) = if is_terminal { - ("".to_owned(), "".to_owned()) - } else { - ( - lc.read().unwrap().get_option("os-username"), - lc.read().unwrap().get_option("os-password"), - ) - }; + let os_username = lc.read().unwrap().get_option("os-username"); + let os_password = lc.read().unwrap().get_option("os-password"); send_login(lc.clone(), os_username, os_password, password, peer).await; lc.write().unwrap().hash = hash; @@ -3925,17 +3658,12 @@ pub fn check_if_retry(msgtype: &str, title: &str, text: &str, retry_for_relay: b && title == "Connection Error" && ((text.contains("10054") || text.contains("104")) && retry_for_relay || (!text.to_lowercase().contains("offline") - && !text.to_lowercase().contains("not exist") - && (!text.to_lowercase().contains("handshake") - // https://github.com/snapview/tungstenite-rs/blob/e7e060a89a72cb08e31c25a6c7284dc1bd982e23/src/error.rs#L248 - || text - .to_lowercase() - .contains("connection reset without closing handshake") && use_ws()) + && !text.to_lowercase().contains("exist") + && !text.to_lowercase().contains("handshake") && !text.to_lowercase().contains("failed") && !text.to_lowercase().contains("resolve") && !text.to_lowercase().contains("mismatch") && !text.to_lowercase().contains("manually") - && !text.to_lowercase().contains("restricted") && !text.to_lowercase().contains("not allowed"))) } @@ -4246,7 +3974,6 @@ async fn test_udp_uat( async fn udp_nat_connect( socket: Arc, typ: &'static str, - ms_timeout: u64, ) -> ResultType<(Stream, Option, &'static str)> { crate::punch_udp(socket.clone(), false) .await @@ -4254,7 +3981,7 @@ async fn udp_nat_connect( log::debug!("{err}"); anyhow!(err) })?; - let res = KcpStream::connect(socket, Duration::from_millis(ms_timeout)) + let res = KcpStream::connect(socket, Duration::from_secs(CONNECT_TIMEOUT as _)) .await .map_err(|err| { log::debug!("Failed to connect KCP stream: {}", err); diff --git a/src/client/file_trait.rs b/src/client/file_trait.rs index 003767bcb..e6b977818 100644 --- a/src/client/file_trait.rs +++ b/src/client/file_trait.rs @@ -3,32 +3,14 @@ use hbb_common::{fs, log, message_proto::*}; use super::{Data, Interface}; pub trait FileManager: Interface { - #[cfg(not(any( - target_os = "android", - target_os = "ios", - feature = "cli", - feature = "flutter" - )))] fn get_home_dir(&self) -> String { fs::get_home_as_string() } - #[cfg(not(any( - target_os = "android", - target_os = "ios", - feature = "cli", - feature = "flutter" - )))] fn get_next_job_id(&self) -> i32 { fs::get_next_job_id() } - #[cfg(not(any( - target_os = "android", - target_os = "ios", - feature = "cli", - feature = "flutter" - )))] fn update_next_job_id(&self, id: i32) { fs::update_next_job_id(id); } @@ -51,6 +33,20 @@ pub trait FileManager: Interface { } } + #[cfg(any( + target_os = "android", + target_os = "ios", + feature = "cli", + feature = "flutter" + ))] + fn read_dir(&self, path: &str, include_hidden: bool) -> String { + use crate::common::make_fd_to_json; + match fs::read_dir(&fs::get_path(path), include_hidden) { + Ok(fd) => make_fd_to_json(fd.id, fd.path, &fd.entries), + Err(_) => "".into(), + } + } + fn cancel_job(&self, id: i32) { self.send(Data::CancelJob(id)); } @@ -87,22 +83,10 @@ pub trait FileManager: Interface { self.send(Data::RemoveDirAll((id, path, is_remote, include_hidden))); } - #[cfg(not(any( - target_os = "android", - target_os = "ios", - feature = "cli", - feature = "flutter" - )))] fn confirm_delete_files(&self, id: i32, file_num: i32) { self.send(Data::ConfirmDeleteFiles((id, file_num))); } - #[cfg(not(any( - target_os = "android", - target_os = "ios", - feature = "cli", - feature = "flutter" - )))] fn set_no_confirm(&self, id: i32) { self.send(Data::SetNoConfirm(id)); } diff --git a/src/client/io_loop.rs b/src/client/io_loop.rs index 5eb7a273a..e2838cc22 100644 --- a/src/client/io_loop.rs +++ b/src/client/io_loop.rs @@ -77,7 +77,6 @@ pub struct Remote { video_threads: HashMap, chroma: Arc>>, last_record_state: bool, - sent_close_reason: bool, } #[derive(Default)] @@ -126,7 +125,6 @@ impl Remote { video_threads: Default::default(), chroma: Default::default(), last_record_state: false, - sent_close_reason: false, } } @@ -174,14 +172,13 @@ impl Remote { ) .await { - Ok(((mut peer, direct, pk, kcp, stream_type), (feedback, rendezvous_server))) => { + Ok(((mut peer, direct, pk, _kcp), (feedback, rendezvous_server))) => { self.handler .connection_round_state .lock() .unwrap() .set_connected(); - self.handler - .set_connection_type(peer.is_secured(), direct, stream_type); // flutter -> connection_ready + self.handler.set_connection_type(peer.is_secured(), direct); // flutter -> connection_ready self.handler.update_direct(Some(direct)); if conn_type == ConnType::DEFAULT_CONN || conn_type == ConnType::VIEW_CAMERA { self.handler @@ -323,13 +320,6 @@ impl Remote { if let Some(s) = self.stop_voice_call_sender.take() { s.send(()).ok(); } - if kcp.is_some() { - // Send the close reason if it hasn't been sent yet, as KCP cannot detect the socket close event. - self.send_close_reason(&mut peer, "kcp").await; - // KCP does not send messages immediately, so wait to ensure the last message is sent. - // 1ms works in my test, but 30ms is more reliable. - tokio::time::sleep(Duration::from_millis(30)).await; - } } Err(err) => { self.handler.on_establish_connection_error(err.to_string()); @@ -521,22 +511,14 @@ impl Remote { } } - async fn send_close_reason(&mut self, peer: &mut Stream, reason: &str) { - if self.sent_close_reason { - return; - } - let mut misc = Misc::new(); - misc.set_close_reason(reason.to_owned()); - let mut msg = Message::new(); - msg.set_misc(misc); - allow_err!(peer.send(&msg).await); - self.sent_close_reason = true; - } - async fn handle_msg_from_ui(&mut self, data: Data, peer: &mut Stream) -> bool { match data { Data::Close => { - self.send_close_reason(peer, "").await; + let mut misc = Misc::new(); + misc.set_close_reason("".to_owned()); + let mut msg = Message::new(); + msg.set_misc(misc); + allow_err!(peer.send(&msg).await); return false; } Data::Login((os_username, os_password, password, remember)) => { @@ -586,6 +568,7 @@ impl Remote { file_num, include_hidden, is_remote, + Vec::new(), od, )); allow_err!( @@ -658,6 +641,7 @@ impl Remote { file_num, include_hidden, is_remote, + Vec::new(), od, ); job.is_last_job = true; @@ -702,7 +686,6 @@ impl Remote { if is_remote { if let Some(job) = get_job(id, &mut self.write_jobs) { job.is_last_job = false; - job.is_resume = true; allow_err!( peer.send(&fs::new_send( id, @@ -717,25 +700,14 @@ impl Remote { } else { if let Some(job) = get_job(id, &mut self.read_jobs) { match &job.data_source { - fs::DataSource::FilePath(_p) => { + fs::DataSource::FilePath(p) => { job.is_last_job = false; - job.is_resume = true; - job.set_finished_size_on_resume(); - #[cfg(not(windows))] - let files = job.files().clone(); - #[cfg(windows)] - let mut files = job.files().clone(); - #[cfg(windows)] - if self.handler.peer_platform() != "Windows" { - // peer is not windows, need transform \ to / - fs::transform_windows_path(&mut files); - } allow_err!( peer.send(&fs::new_receive( id, - job.remote.clone(), + p.to_string_lossy().to_string(), job.file_num, - files, + job.files.clone(), job.total_size(), )) .await @@ -781,8 +753,7 @@ impl Remote { Some(file_transfer_send_confirm_request::Union::Skip(true)) }, ..Default::default() - }) - .await; + }); } } else { if let Some(job) = fs::get_job(id, &mut self.write_jobs) { @@ -801,7 +772,7 @@ impl Remote { }, ..Default::default() }; - job.confirm(&req).await; + job.confirm(&req); file_action.set_send_confirm(req); msg.set_file_action(file_action); allow_err!(peer.send(&msg).await); @@ -843,7 +814,19 @@ impl Remote { } } Data::CancelJob(id) => { - self.cancel_transfer_job(id, peer).await; + let mut msg_out = Message::new(); + let mut file_action = FileAction::new(); + file_action.set_cancel(FileTransferCancel { + id: id, + ..Default::default() + }); + msg_out.set_file_action(file_action); + allow_err!(peer.send(&msg_out).await); + if let Some(job) = fs::remove_job(id, &mut self.write_jobs) { + job.remove_download_file(); + } + let _ = fs::remove_job(id, &mut self.read_jobs); + self.remove_jobs.remove(&id); } Data::RemoveDir((id, path)) => { let mut msg_out = Message::new(); @@ -1039,26 +1022,8 @@ impl Remote { } } - async fn cancel_transfer_job(&mut self, id: i32, peer: &mut Stream) { - let mut msg_out = Message::new(); - let mut file_action = FileAction::new(); - file_action.set_cancel(FileTransferCancel { - id, - ..Default::default() - }); - msg_out.set_file_action(file_action); - allow_err!(peer.send(&msg_out).await); - if let Some(job) = fs::remove_job(id, &mut self.write_jobs) { - job.remove_download_file(); - } - let _ = fs::remove_job(id, &mut self.read_jobs); - self.remove_jobs.remove(&id); - } - pub async fn sync_jobs_status_to_local(&mut self) -> bool { - if !self.is_connected { - return false; - } + log::info!("sync transfer job status"); let mut config: PeerConfig = self.handler.load_config(); let mut transfer_metas = TransferSerde::default(); for job in self.read_jobs.iter() { @@ -1448,23 +1413,6 @@ impl Remote { if !self.handler.lc.read().unwrap().disable_clipboard.v { #[cfg(not(any(target_os = "android", target_os = "ios")))] update_clipboard(_mcb.clipboards, ClipboardSide::Client); - #[cfg(target_os = "ios")] - { - if let Some(cb) = _mcb - .clipboards - .iter() - .find(|c| c.format.enum_value() == Ok(ClipboardFormat::Text)) - { - let content = if cb.compress { - hbb_common::compress::decompress(&cb.content) - } else { - cb.content.to_vec() - }; - if let Ok(content) = String::from_utf8(content) { - self.handler.clipboard(content); - } - } - } #[cfg(target_os = "android")] crate::clipboard::handle_msg_multi_clipboards(_mcb); } @@ -1489,43 +1437,13 @@ impl Remote { fs::transform_windows_path(&mut entries); } } - // We cannot call cancel_transfer_job/handle_job_status while holding - // a mutable borrow from fs::get_job(&mut self.write_jobs), so defer - // the error handling until after the borrow scope ends. - let mut set_files_err = None; + self.handler + .update_folder_files(fd.id, &entries, fd.path, false, false); if let Some(job) = fs::get_job(fd.id, &mut self.write_jobs) { log::info!("job set_files: {:?}", entries); - if let Err(err) = job.set_files(entries) { - set_files_err = Some(err.to_string()); - } else { - job.set_finished_size_on_resume(); - self.handler.update_folder_files( - fd.id, - job.files(), - fd.path, - false, - false, - ); - } + job.set_files(entries); } else if let Some(job) = self.remove_jobs.get_mut(&fd.id) { - // Intentionally keep raw entries here: - // - remote remove flow executes deletions on peer side; - // - local remove flow is populated from local get_recursive_files(). job.files = entries; - self.handler - .update_folder_files(fd.id, &job.files, fd.path, false, false); - } else { - self.handler - .update_folder_files(fd.id, &entries, fd.path, false, false); - } - if let Some(err) = set_files_err { - log::warn!( - "Rejected unsafe file list from remote peer for job {}: {}", - fd.id, - err - ); - self.cancel_transfer_job(fd.id, peer).await; - self.handle_job_status(fd.id, -1, Some(err)); } } Some(file_response::Union::Digest(digest)) => { @@ -1535,21 +1453,14 @@ impl Remote { if let fs::DataSource::FilePath(p) = &job.data_source { let read_path = get_string(&fs::TransferJob::join(p, &file.name)); - let mut overwrite_strategy = + let overwrite_strategy = job.default_overwrite_strategy(); - let mut offset = 0; - if digest.is_identical && job.is_resume { - if digest.transferred_size > 0 { - overwrite_strategy = Some(true); - offset = digest.transferred_size as _; - } - } if let Some(overwrite) = overwrite_strategy { let req = FileTransferSendConfirmRequest { id: digest.id, file_num: digest.file_num, union: Some(if overwrite { - file_transfer_send_confirm_request::Union::OffsetBlk(offset) + file_transfer_send_confirm_request::Union::OffsetBlk(0) } else { file_transfer_send_confirm_request::Union::Skip( true, @@ -1557,7 +1468,7 @@ impl Remote { }), ..Default::default() }; - job.confirm(&req).await; + job.confirm(&req); let msg = new_send_confirm(req); allow_err!(peer.send(&msg).await); } else { @@ -1578,40 +1489,25 @@ impl Remote { if let fs::DataSource::FilePath(p) = &job.data_source { let write_path = get_string(&fs::TransferJob::join(p, &file.name)); - job.set_digest(digest.file_size, digest.last_modified); - let peer_ver = self.handler.lc.read().unwrap().version; - let is_support_resume = - crate::is_support_file_transfer_resume_num( - peer_ver, - ); + let overwrite_strategy = + job.default_overwrite_strategy(); match fs::is_write_need_confirmation( - is_support_resume && job.is_resume, &write_path, &digest, ) { Ok(res) => match res { DigestCheckResult::IsSame => { let req = FileTransferSendConfirmRequest { - id: digest.id, - file_num: digest.file_num, - union: Some(file_transfer_send_confirm_request::Union::Skip(true)), - ..Default::default() - }; - job.confirm(&req).await; + id: digest.id, + file_num: digest.file_num, + union: Some(file_transfer_send_confirm_request::Union::Skip(true)), + ..Default::default() + }; + job.confirm(&req); let msg = new_send_confirm(req); allow_err!(peer.send(&msg).await); } DigestCheckResult::NeedConfirm(digest) => { - let mut overwrite_strategy = - job.default_overwrite_strategy(); - let mut offset = 0; - if digest.is_identical - && job.is_resume - && digest.transferred_size > 0 - { - overwrite_strategy = Some(true); - offset = digest.transferred_size as _; - } if let Some(overwrite) = overwrite_strategy { let req = @@ -1619,13 +1515,13 @@ impl Remote { id: digest.id, file_num: digest.file_num, union: Some(if overwrite { - file_transfer_send_confirm_request::Union::OffsetBlk(offset) + file_transfer_send_confirm_request::Union::OffsetBlk(0) } else { file_transfer_send_confirm_request::Union::Skip(true) }), ..Default::default() }; - job.confirm(&req).await; + job.confirm(&req); let msg = new_send_confirm(req); allow_err!(peer.send(&msg).await); } else { @@ -1645,7 +1541,7 @@ impl Remote { union: Some(file_transfer_send_confirm_request::Union::OffsetBlk(0)), ..Default::default() }; - job.confirm(&req).await; + job.confirm(&req); let msg = new_send_confirm(req); allow_err!(peer.send(&msg).await); } @@ -1724,7 +1620,6 @@ impl Remote { } Some(file_response::Union::Error(e)) => { let job_type = fs::remove_job(e.id, &mut self.write_jobs) - .or_else(|| fs::remove_job(e.id, &mut self.read_jobs)) .map(|j| j.r#type) .unwrap_or(fs::JobType::Generic); match job_type { @@ -1797,9 +1692,6 @@ impl Remote { Ok(Permission::BlockInput) => { self.handler.set_permission("block_input", p.enabled); } - Ok(Permission::PrivacyMode) => { - self.handler.set_permission("privacy_mode", p.enabled); - } _ => {} } } @@ -1809,13 +1701,6 @@ impl Remote { thread.video_sender.send(MediaData::Reset).ok(); } - let mut scale = 1.0; - if let Some(pi) = &self.handler.lc.read().unwrap().peer_info { - if let Some(d) = pi.displays.get(s.display as usize) { - scale = d.scale; - } - } - if s.width > 0 && s.height > 0 { self.handler.set_display( s.x, @@ -1823,12 +1708,10 @@ impl Remote { s.width, s.height, s.cursor_embedded, - scale, ); } } Some(misc::Union::CloseReason(c)) => { - self.sent_close_reason = true; // The controlled end will close, no need to send close reason self.handler.msgbox("error", "Connection Error", &c, ""); return false; } @@ -1923,23 +1806,9 @@ impl Remote { ); } } - #[cfg(feature = "flutter")] - #[cfg(not(any(target_os = "android", target_os = "ios")))] Some(misc::Union::SwitchBack(_)) => { - let allow_switch_back = self - .handler - .lc - .write() - .unwrap() - .consume_switch_back_permission(); - if allow_switch_back { - self.handler.switch_back(&self.handler.get_id()); - } else { - log::warn!( - "Ignored unsolicited SwitchBack from {}", - self.handler.get_id() - ); - } + #[cfg(feature = "flutter")] + self.handler.switch_back(&self.handler.get_id()); } #[cfg(all(feature = "flutter", feature = "plugin_framework"))] #[cfg(not(any(target_os = "android", target_os = "ios")))] @@ -2018,7 +1887,7 @@ impl Remote { }, Some(file_action::Union::SendConfirm(c)) => { if let Some(job) = fs::get_job(c.id, &mut self.read_jobs) { - job.confirm(&c).await; + job.confirm(&c); } } _ => {} @@ -2075,9 +1944,10 @@ impl Remote { use hbb_common::message_proto::terminal_response::Union; if let Some(Union::Opened(opened)) = &response.union { if opened.success && !opened.service_id.is_empty() { - let mut lc = self.handler.lc.write().unwrap(); - let key = lc.get_key_terminal_service_id().to_owned(); - lc.set_option(key, opened.service_id.clone()); + self.handler.lc.write().unwrap().set_option( + "terminal-service-id".to_owned(), + opened.service_id.clone(), + ); } } self.handler.handle_terminal_response(response); @@ -2344,7 +2214,7 @@ impl Remote { } #[cfg(feature = "unix-file-copy-paste")] if crate::is_support_file_copy_paste_num(self.handler.lc.read().unwrap().version) { - let mut out_msgs = vec![]; + let mut out_msg = None; #[cfg(target_os = "macos")] if clipboard::platform::unix::macos::should_handle_msg(&clip) { @@ -2356,7 +2226,7 @@ impl Remote { log::error!("failed to handle cliprdr msg: {}", e); } } else { - out_msgs = unix_file_clip::serve_clip_messages( + out_msg = unix_file_clip::serve_clip_messages( ClipboardSide::Client, clip, self.client_conn_id, @@ -2365,14 +2235,14 @@ impl Remote { #[cfg(not(target_os = "macos"))] { - out_msgs = unix_file_clip::serve_clip_messages( + out_msg = unix_file_clip::serve_clip_messages( ClipboardSide::Client, clip, self.client_conn_id, ); } - for msg in out_msgs.into_iter() { + if let Some(msg) = out_msg { allow_err!(_peer.send(&msg).await); } } diff --git a/src/clipboard.rs b/src/clipboard.rs index cae7d03ac..db8cb4cfe 100644 --- a/src/clipboard.rs +++ b/src/clipboard.rs @@ -117,7 +117,7 @@ pub fn check_clipboard_files( None } -#[cfg(all(target_os = "linux", feature = "unix-file-copy-paste"))] +#[cfg(feature = "unix-file-copy-paste")] pub fn update_clipboard_files(files: Vec, side: ClipboardSide) { if !files.is_empty() { std::thread::spawn(move || { @@ -141,7 +141,6 @@ pub fn try_empty_clipboard_files(_side: ClipboardSide, _conn_id: i32) { } } } - #[allow(unused_mut)] if let Some(mut ctx) = ctx.as_mut() { #[cfg(target_os = "linux")] { @@ -197,7 +196,7 @@ pub fn check_clipboard_cm() -> ResultType { #[cfg(not(target_os = "android"))] fn update_clipboard_(multi_clipboards: Vec, side: ClipboardSide) { - let to_update_data = proto::from_multi_clipboards(multi_clipboards); + let to_update_data = proto::from_multi_clipbards(multi_clipboards); if to_update_data.is_empty() { return; } @@ -257,7 +256,7 @@ impl ClipboardContext { let mut i = 1; loop { // Try 5 times to create clipboard - // Arboard::new() connect to X server or Wayland compositor, which should be OK most times + // Arboard::new() connect to X server or Wayland compositor, which shoud be ok at most time // But sometimes, the connection may fail, so we retry here. match arboard::Clipboard::new() { Ok(x) => { @@ -314,7 +313,7 @@ impl ClipboardContext { pub fn get(&mut self, side: ClipboardSide, force: bool) -> ResultType> { let data = self.get_formats_filter(SUPPORTED_FORMATS, side, force)?; - // We have a separate service named `file-clipboard` to handle file copy-paste. + // We have a seperate service named `file-clipboard` to handle file copy-paste. // We need to read the file urls because file copy may set the other clipboard formats such as text. #[cfg(feature = "unix-file-copy-paste")] { @@ -427,12 +426,21 @@ impl ClipboardContext { // Don't use `hbb_common::platform::linux::is_kde()` here. // It's not correct in the server process. #[cfg(target_os = "linux")] - let is_kde_x11 = hbb_common::platform::linux::is_kde_session() - && crate::platform::linux::is_x11(); + let is_kde_x11 = { + use hbb_common::platform::linux::CMD_SH; + let is_kde = std::process::Command::new(CMD_SH.as_str()) + .arg("-c") + .arg("ps -e | grep -E kded[0-9]+ | grep -v grep") + .stdout(std::process::Stdio::piped()) + .output() + .map(|o| !o.stdout.is_empty()) + .unwrap_or(false); + is_kde && crate::platform::linux::is_x11() + }; #[cfg(target_os = "macos")] let is_kde_x11 = false; let clear_holder_text = if is_kde_x11 { - "RustDesk placeholder to clear the file clipboard" + "RustDesk placeholder to clear the file clipbard" } else { "" } @@ -672,7 +680,7 @@ mod proto { } #[cfg(not(target_os = "android"))] - pub fn from_multi_clipboards(multi_clipboards: Vec) -> Vec { + pub fn from_multi_clipbards(multi_clipboards: Vec) -> Vec { multi_clipboards .into_iter() .filter_map(from_clipboard) @@ -748,7 +756,7 @@ pub fn get_clipboards_msg(client: bool) -> Option { } // We need this mod to notify multiple subscribers when the clipboard changes. -// Because only one clipboard master(listener) can trigger the clipboard change event multiple listeners are created on Linux(x11). +// Because only one clipboard master(listener) can tigger the clipboard change event multiple listeners are created on Linux(x11). // https://github.com/rustdesk-org/clipboard-master/blob/4fb62e5b62fb6350d82b571ec7ba94b3cd466695/src/master/x11.rs#L226 #[cfg(not(target_os = "android"))] pub mod clipboard_listener { @@ -814,7 +822,7 @@ pub mod clipboard_listener { subscribers: listener_lock.subscribers.clone(), }; let (tx_start_res, rx_start_res) = channel(); - let h = start_clipboard_master_thread(handler, tx_start_res); + let h = start_clipbard_master_thread(handler, tx_start_res); let shutdown = match rx_start_res.recv() { Ok((Some(s), _)) => s, Ok((None, err)) => { @@ -854,7 +862,7 @@ pub mod clipboard_listener { log::info!("Clipboard listener unsubscribed: {}", name); } - fn start_clipboard_master_thread( + fn start_clipbard_master_thread( handler: impl ClipboardHandler + Send + 'static, tx_start_res: Sender<(Option, String)>, ) -> JoinHandle<()> { diff --git a/src/clipboard_file.rs b/src/clipboard_file.rs index 724d8aea9..d7c72f981 100644 --- a/src/clipboard_file.rs +++ b/src/clipboard_file.rs @@ -143,40 +143,6 @@ pub fn clip_2_msg(clip: ClipboardFile) -> Message { })), ..Default::default() }, - ClipboardFile::Files { files } => { - let files = files - .iter() - .filter_map(|(f, s)| { - if *s == 0 { - if let Ok(meta) = std::fs::metadata(f) { - Some(CliprdrFile { - name: f.to_owned(), - size: meta.len(), - ..Default::default() - }) - } else { - None - } - } else { - Some(CliprdrFile { - name: f.to_owned(), - size: *s, - ..Default::default() - }) - } - }) - .collect::>(); - Message { - union: Some(message::Union::Cliprdr(Cliprdr { - union: Some(cliprdr::Union::Files(CliprdrFiles { - files, - ..Default::default() - })), - ..Default::default() - })), - ..Default::default() - } - } } } @@ -226,10 +192,12 @@ pub fn msg_2_clip(msg: Cliprdr) -> Option { #[cfg(feature = "unix-file-copy-paste")] pub mod unix_file_clip { - use super::*; - #[cfg(target_os = "linux")] - use crate::clipboard::update_clipboard_files; - use crate::clipboard::{try_empty_clipboard_files, ClipboardSide}; + use crate::clipboard::try_empty_clipboard_files; + + use super::{ + super::clipboard::{update_clipboard_files, ClipboardSide}, + *, + }; #[cfg(target_os = "linux")] use clipboard::platform::unix::fuse; use clipboard::platform::unix::{ @@ -277,7 +245,7 @@ pub mod unix_file_clip { side: ClipboardSide, clip: ClipboardFile, conn_id: i32, - ) -> Vec { + ) -> Option { log::debug!("got clipfile from client peer"); match clip { ClipboardFile::MonitorReady => { @@ -291,7 +259,7 @@ pub mod unix_file_clip { .is_some() { log::error!("no file contents format found"); - return vec![]; + return None; }; let Some(file_descriptor_id) = format_list .iter() @@ -299,13 +267,13 @@ pub mod unix_file_clip { .map(|(id, _)| *id) else { log::error!("no file descriptor format found"); - return vec![]; + return None; }; // sync file system from peer let data = ClipboardFile::FormatDataRequest { requested_format_id: file_descriptor_id, }; - return vec![clip_2_msg(data)]; + return Some(clip_2_msg(data)); } ClipboardFile::FormatListResponse { msg_flags: _msg_flags, @@ -316,13 +284,13 @@ pub mod unix_file_clip { log::debug!("requested format id: {}", _requested_format_id); let format_data = serv_files::get_file_list_pdu(); if !format_data.is_empty() { - return vec![clip_2_msg(ClipboardFile::FormatDataResponse { + return Some(clip_2_msg(ClipboardFile::FormatDataResponse { msg_flags: 1, format_data, - })]; + })); } // empty file list, send failure message - return vec![msg_resp_format_data_failure()]; + return Some(msg_resp_format_data_failure()); } #[cfg(target_os = "linux")] ClipboardFile::FormatDataResponse { @@ -363,7 +331,7 @@ pub mod unix_file_clip { .. } => { log::debug!("file contents request: stream_id: {}, list_index: {}, dw_flags: {}, n_position_low: {}, n_position_high: {}, cb_requested: {}", stream_id, list_index, dw_flags, n_position_low, n_position_high, cb_requested); - return serv_files::read_file_contents( + match serv_files::read_file_contents( conn_id, stream_id, list_index, @@ -371,16 +339,15 @@ pub mod unix_file_clip { n_position_low, n_position_high, cb_requested, - ) - .into_iter() - .map(|res| match res { - Ok(data) => clip_2_msg(data), + ) { + Ok(data) => { + return Some(clip_2_msg(data)); + } Err(e) => { log::error!("failed to read file contents: {:?}", e); - resp_file_contents_fail(stream_id) + return Some(resp_file_contents_fail(stream_id)); } - }) - .collect::<_>(); + } } #[cfg(target_os = "linux")] ClipboardFile::FileContentsResponse { @@ -422,6 +389,6 @@ pub mod unix_file_clip { log::error!("unsupported clipboard file type"); } } - vec![] + None } } diff --git a/src/common.rs b/src/common.rs index 69e3ec304..214d6c1ab 100644 --- a/src/common.rs +++ b/src/common.rs @@ -8,12 +8,11 @@ use std::{ use serde_json::{json, Map, Value}; -#[cfg(not(target_os = "ios"))] +#[cfg(not(any(target_os = "android", target_os = "ios")))] use hbb_common::whoami; use hbb_common::{ allow_err, anyhow::{anyhow, Context}, - async_recursion::async_recursion, bail, base64, bytes::Bytes, config::{ @@ -28,7 +27,6 @@ use hbb_common::{ socket_client, sodiumoxide::crypto::{box_, secretbox, sign}, timeout, - tls::{get_cached_tls_accept_invalid_cert, get_cached_tls_type, upsert_tls_cache, TlsType}, tokio::{ self, net::UdpSocket, @@ -38,8 +36,8 @@ use hbb_common::{ }; use crate::{ - hbbs_http::{create_http_client_async, get_url_for_tls}, - ui_interface::{get_api_server as ui_get_api_server, get_option, is_installed, set_option}, + hbbs_http::create_http_client_async, + ui_interface::{get_option, set_option}, }; #[derive(Debug, Eq, PartialEq)] @@ -71,19 +69,6 @@ pub mod input { pub const MOUSE_TYPE_UP: i32 = 2; pub const MOUSE_TYPE_WHEEL: i32 = 3; pub const MOUSE_TYPE_TRACKPAD: i32 = 4; - /// Relative mouse movement type for gaming/3D applications. - /// This type sends delta (dx, dy) values instead of absolute coordinates. - /// NOTE: This is only supported by the Flutter client. The Sciter client (deprecated) - /// does not support relative mouse mode due to: - /// 1. Fixed send_mouse() function signature that doesn't allow type differentiation - /// 2. Lack of pointer lock API in Sciter/TIS - /// 3. No OS cursor control (hide/show/clip) FFI bindings in Sciter UI - pub const MOUSE_TYPE_MOVE_RELATIVE: i32 = 5; - - /// Mask to extract the mouse event type from the mask field. - /// The lower 3 bits contain the event type (MOUSE_TYPE_*), giving a valid range of 0-7. - /// Currently defined types use values 0-5; values 6 and 7 are reserved for future use. - pub const MOUSE_TYPE_MASK: i32 = 0x7; pub const MOUSE_BUTTON_LEFT: i32 = 0x01; pub const MOUSE_BUTTON_RIGHT: i32 = 0x02; @@ -178,48 +163,12 @@ pub fn is_support_screenshot_num(ver: i64) -> bool { ver >= hbb_common::get_version_number("1.4.0") } -#[inline] -pub fn is_support_file_transfer_resume(ver: &str) -> bool { - is_support_file_transfer_resume_num(hbb_common::get_version_number(ver)) -} - -#[inline] -pub fn is_support_file_transfer_resume_num(ver: i64) -> bool { - ver >= hbb_common::get_version_number("1.4.2") -} - -/// Minimum server version required for relative mouse mode support. -/// This constant must mirror Flutter's `kMinVersionForRelativeMouseMode` in `consts.dart`. -const MIN_VERSION_RELATIVE_MOUSE_MODE: &str = "1.4.5"; - -#[inline] -pub fn is_support_relative_mouse_mode(ver: &str) -> bool { - is_support_relative_mouse_mode_num(hbb_common::get_version_number(ver)) -} - -#[inline] -pub fn is_support_relative_mouse_mode_num(ver: i64) -> bool { - ver >= hbb_common::get_version_number(MIN_VERSION_RELATIVE_MOUSE_MODE) -} - // is server process, with "--server" args #[inline] pub fn is_server() -> bool { *IS_SERVER } -#[inline] -pub fn need_fs_cm_send_files() -> bool { - #[cfg(windows)] - { - is_server() - } - #[cfg(not(windows))] - { - false - } -} - #[inline] pub fn is_main() -> bool { *IS_MAIN @@ -827,22 +776,12 @@ pub fn username() -> String { return DEVICE_NAME.lock().unwrap().clone(); } -// Exactly the implementation of "whoami::hostname()". -// This wrapper is to suppress warnings. -#[inline(always)] -#[cfg(not(target_os = "ios"))] -pub fn whoami_hostname() -> String { - let mut hostname = whoami::fallible::hostname().unwrap_or_else(|_| "localhost".to_string()); - hostname.make_ascii_lowercase(); - hostname -} - #[inline] pub fn hostname() -> String { #[cfg(not(any(target_os = "android", target_os = "ios")))] { #[allow(unused_mut)] - let mut name = whoami_hostname(); + let mut name = whoami::hostname(); // some time, there is .local, some time not, so remove it for osx #[cfg(target_os = "macos")] if name.ends_with(".local") { @@ -949,35 +888,15 @@ pub fn check_software_update() { } } -// No need to check `danger_accept_invalid_cert` for now. -// Because the url is always `https://api.rustdesk.com/version/latest`. #[tokio::main(flavor = "current_thread")] pub async fn do_check_software_update() -> hbb_common::ResultType<()> { let (request, url) = hbb_common::version_check_request(hbb_common::VER_TYPE_RUSTDESK_CLIENT.to_string()); - let proxy_conf = Config::get_socks(); - let tls_url = get_url_for_tls(&url, &proxy_conf); - let tls_type = get_cached_tls_type(tls_url); - let is_tls_not_cached = tls_type.is_none(); - let tls_type = tls_type.unwrap_or(TlsType::Rustls); - let client = create_http_client_async(tls_type, false); - let latest_release_response = match client.post(&url).json(&request).send().await { - Ok(resp) => { - upsert_tls_cache(tls_url, tls_type, false); - resp - } - Err(err) => { - if is_tls_not_cached && err.is_request() { - let tls_type = TlsType::NativeTls; - let client = create_http_client_async(tls_type, false); - let resp = client.post(&url).json(&request).send().await?; - upsert_tls_cache(tls_url, tls_type, false); - resp - } else { - return Err(err.into()); - } - } - }; + let latest_release_response = create_http_client_async() + .post(url) + .json(&request) + .send() + .await?; let bytes = latest_release_response.bytes().await?; let resp: hbb_common::VersionCheckResponse = serde_json::from_slice(&bytes)?; let response_url = resp.url; @@ -1072,6 +991,10 @@ fn get_api_server_(api: String, custom: String) -> String { if !api.is_empty() { return api.to_owned(); } + let api = option_env!("API_SERVER").unwrap_or_default(); + if !api.is_empty() { + return api.into(); + } let s0 = get_custom_rendezvous_server(custom); if !s0.is_empty() { let s = crate::increase_port(&s0, -2); @@ -1086,8 +1009,7 @@ fn get_api_server_(api: String, custom: String) -> String { #[inline] pub fn is_public(url: &str) -> bool { - let url = url.to_ascii_lowercase(); - url.contains("rustdesk.com/") || url.ends_with("rustdesk.com") + url.contains("rustdesk.com") } pub fn get_udp_punch_enabled() -> bool { @@ -1124,303 +1046,8 @@ pub fn get_audit_server(api: String, custom: String, typ: String) -> String { format!("{}/api/audit/{}", url, typ) } -/// Check if we should use raw TCP proxy for API calls. -/// Returns true if USE_RAW_TCP_FOR_API builtin option is "Y", WebSocket is off, -/// and the target URL belongs to the configured non-public API host. -#[inline] -fn should_use_raw_tcp_for_api(url: &str) -> bool { - get_builtin_option(keys::OPTION_USE_RAW_TCP_FOR_API) == "Y" - && !use_ws() - && is_tcp_proxy_api_target(url) -} - -/// Check if we can attempt raw TCP proxy fallback for this target URL. -#[inline] -fn can_fallback_to_raw_tcp(url: &str) -> bool { - !use_ws() && is_tcp_proxy_api_target(url) -} - -#[inline] -fn should_use_tcp_proxy_for_api_url(url: &str, api_url: &str) -> bool { - if api_url.is_empty() || is_public(api_url) { - return false; - } - - let target_host = url::Url::parse(url) - .ok() - .and_then(|parsed| parsed.host_str().map(|host| host.to_ascii_lowercase())); - let api_host = url::Url::parse(api_url) - .ok() - .and_then(|parsed| parsed.host_str().map(|host| host.to_ascii_lowercase())); - - matches!((target_host, api_host), (Some(target), Some(api)) if target == api) -} - -#[inline] -fn is_tcp_proxy_api_target(url: &str) -> bool { - should_use_tcp_proxy_for_api_url(url, &ui_get_api_server()) -} - -fn tcp_proxy_log_target(url: &str) -> String { - url::Url::parse(url) - .ok() - .map(|parsed| { - let mut redacted = format!("{}://", parsed.scheme()); - let Some(host) = parsed.host() else { - return "".to_owned(); - }; - redacted.push_str(&host.to_string()); - if let Some(port) = parsed.port() { - redacted.push(':'); - redacted.push_str(&port.to_string()); - } - redacted.push_str(parsed.path()); - redacted - }) - .unwrap_or_else(|| "".to_owned()) -} - -#[inline] -fn get_tcp_proxy_addr() -> String { - check_port(Config::get_rendezvous_server(), RENDEZVOUS_PORT) -} - -/// Send an HTTP request via the rendezvous server's TCP proxy using protobuf. -/// Connects with `connect_tcp` + `secure_tcp`, sends `HttpProxyRequest`, -/// receives `HttpProxyResponse`. -/// -/// The entire operation (connect + handshake + send + receive) is wrapped in -/// an overall timeout of `CONNECT_TIMEOUT + READ_TIMEOUT` so that a stall at -/// any stage cannot block the caller indefinitely. -async fn tcp_proxy_request( - method: &str, - url: &str, - body: &[u8], - headers: Vec, -) -> ResultType { - let tcp_addr = get_tcp_proxy_addr(); - if tcp_addr.is_empty() { - bail!("No rendezvous server configured for TCP proxy"); - } - - let parsed = url::Url::parse(url)?; - let path = if let Some(query) = parsed.query() { - format!("{}?{}", parsed.path(), query) - } else { - parsed.path().to_string() - }; - - log::debug!( - "Sending {} {} via TCP proxy to {}", - method, - parsed.path(), - tcp_addr - ); - - let overall_timeout = CONNECT_TIMEOUT + READ_TIMEOUT; - timeout(overall_timeout, async { - let mut conn = socket_client::connect_tcp(&*tcp_addr, CONNECT_TIMEOUT).await?; - let key = crate::get_key(true).await; - secure_tcp_silent(&mut conn, &key).await?; - - let mut req = HttpProxyRequest::new(); - req.method = method.to_uppercase(); - req.path = path; - req.headers = headers.into(); - req.body = Bytes::from(body.to_vec()); - - let mut msg_out = RendezvousMessage::new(); - msg_out.set_http_proxy_request(req); - conn.send(&msg_out).await?; - - match conn.next().await { - Some(Ok(bytes)) => { - let msg_in = RendezvousMessage::parse_from_bytes(&bytes)?; - match msg_in.union { - Some(rendezvous_message::Union::HttpProxyResponse(resp)) => Ok(resp), - _ => bail!("Unexpected response from TCP proxy"), - } - } - Some(Err(e)) => bail!("TCP proxy read error: {}", e), - None => bail!("TCP proxy connection closed without response"), - } - }) - .await? -} - -/// Build HeaderEntry list from "Key: Value" style header string (used by post_request). -/// If the caller supplies a Content-Type header it overrides the default `application/json`. -fn parse_simple_header(header: &str) -> Vec { - let mut entries = Vec::new(); - let mut has_content_type = false; - if !header.is_empty() { - let tmp: Vec<&str> = header.splitn(2, ": ").collect(); - if tmp.len() == 2 { - if tmp[0].eq_ignore_ascii_case("Content-Type") { - has_content_type = true; - } - entries.push(HeaderEntry { - name: tmp[0].into(), - value: tmp[1].into(), - ..Default::default() - }); - } - } - if !has_content_type { - entries.insert( - 0, - HeaderEntry { - name: "Content-Type".into(), - value: "application/json".into(), - ..Default::default() - }, - ); - } - entries -} - -/// POST request via TCP proxy. -async fn post_request_via_tcp_proxy(url: &str, body: &str, header: &str) -> ResultType { - let headers = parse_simple_header(header); - let resp = tcp_proxy_request("POST", url, body.as_bytes(), headers).await?; - if !resp.error.is_empty() { - bail!("TCP proxy error: {}", resp.error); - } - Ok(String::from_utf8_lossy(&resp.body).to_string()) -} - -fn http_proxy_response_to_json(resp: HttpProxyResponse) -> ResultType { - if !resp.error.is_empty() { - bail!("TCP proxy error: {}", resp.error); - } - - let mut response_headers = Map::new(); - for entry in resp.headers.iter() { - response_headers.insert(entry.name.to_lowercase(), json!(entry.value)); - } - - let mut result = Map::new(); - result.insert("status_code".to_string(), json!(resp.status)); - result.insert("headers".to_string(), Value::Object(response_headers)); - result.insert( - "body".to_string(), - json!(String::from_utf8_lossy(&resp.body)), - ); - - serde_json::to_string(&result).map_err(|e| anyhow!("Failed to serialize response: {}", e)) -} - -fn parse_json_header_entries(header: &str) -> ResultType> { - let v: Value = serde_json::from_str(header)?; - if let Value::Object(obj) = v { - Ok(obj - .iter() - .map(|(key, value)| HeaderEntry { - name: key.clone(), - value: value.as_str().unwrap_or_default().into(), - ..Default::default() - }) - .collect()) - } else { - Err(anyhow!("HTTP header information parsing failed!")) - } -} - -/// Returns (status_code, body_text). Separating status so the wrapper can decide on fallback. -async fn post_request_http(url: &str, body: &str, header: &str) -> ResultType<(u16, String)> { - let proxy_conf = Config::get_socks(); - let tls_url = get_url_for_tls(url, &proxy_conf); - let tls_type = get_cached_tls_type(tls_url); - let danger_accept_invalid_cert = get_cached_tls_accept_invalid_cert(tls_url); - let response = post_request_( - url, - tls_url, - body.to_owned(), - header, - tls_type, - danger_accept_invalid_cert, - danger_accept_invalid_cert, - ) - .await?; - let status = response.status().as_u16(); - let text = response.text().await?; - Ok((status, text)) -} - -/// Try `http_fn` first; on connection failure or 5xx, fall back to `tcp_fn` -/// if the URL is eligible. 4xx responses are returned as-is. -async fn with_tcp_proxy_fallback( - url: &str, - method: &str, - http_fn: HttpFut, - tcp_fn: TcpFut, -) -> ResultType -where - HttpFut: Future>, - TcpFut: Future>, -{ - if should_use_raw_tcp_for_api(url) { - return tcp_fn.await; - } - - let http_result = http_fn.await; - let should_fallback = match &http_result { - Err(_) => true, - Ok((status, _)) => *status >= 500, - }; - - if should_fallback && can_fallback_to_raw_tcp(url) { - log::warn!( - "HTTP {} to {} failed or 5xx (result: {:?}), trying TCP proxy fallback", - method, - tcp_proxy_log_target(url), - http_result - .as_ref() - .map(|(s, _)| *s) - .map_err(|e| e.to_string()), - ); - match tcp_fn.await { - Ok(resp) => return Ok(resp), - Err(tcp_err) => { - log::warn!("TCP proxy fallback also failed: {:?}", tcp_err); - } - } - } - - http_result.map(|(_status, text)| text) -} - -/// POST request with raw TCP proxy support. -/// - If `USE_RAW_TCP_FOR_API` is "Y" and WS is off, goes directly through TCP proxy. -/// - Otherwise tries HTTP first; on connection failure or 5xx status, -/// falls back to TCP proxy if WS is off. -/// - 4xx responses are returned as-is (server is reachable, business logic error). -/// - If fallback also fails, returns the original HTTP result (text or error). pub async fn post_request(url: String, body: String, header: &str) -> ResultType { - with_tcp_proxy_fallback( - &url, - "POST", - post_request_http(&url, &body, header), - post_request_via_tcp_proxy(&url, &body, header), - ) - .await -} - -#[async_recursion] -async fn post_request_( - url: &str, - tls_url: &str, - body: String, - header: &str, - tls_type: Option, - danger_accept_invalid_cert: Option, - original_danger_accept_invalid_cert: Option, -) -> ResultType { - let mut req = create_http_client_async( - tls_type.unwrap_or(TlsType::Rustls), - danger_accept_invalid_cert.unwrap_or(false), - ) - .post(url); + let mut req = create_http_client_async().post(url); if !header.is_empty() { let tmp: Vec<&str> = header.split(": ").collect(); if tmp.len() == 2 { @@ -1429,66 +1056,7 @@ async fn post_request_( } req = req.header("Content-Type", "application/json"); let to = std::time::Duration::from_secs(12); - if tls_type.is_some() && danger_accept_invalid_cert.is_some() { - // This branch is used to reduce a `clone()` when both `tls_type` and - // `danger_accept_invalid_cert` are cached. - match req.body(body.clone()).timeout(to).send().await { - Ok(resp) => { - upsert_tls_cache( - tls_url, - tls_type.unwrap_or(TlsType::Rustls), - danger_accept_invalid_cert.unwrap_or(false), - ); - Ok(resp) - } - Err(e) => Err(anyhow!("{:?}", e)), - } - } else { - match req.body(body.clone()).timeout(to).send().await { - Ok(resp) => { - upsert_tls_cache( - tls_url, - tls_type.unwrap_or(TlsType::Rustls), - danger_accept_invalid_cert.unwrap_or(false), - ); - Ok(resp) - } - Err(e) => { - if (tls_type.is_none() || danger_accept_invalid_cert.is_none()) && e.is_request() { - if danger_accept_invalid_cert.is_none() { - log::warn!( - "HTTP request failed: {:?}, try again, danger accept invalid cert", - e - ); - post_request_( - url, - tls_url, - body, - header, - tls_type, - Some(true), - original_danger_accept_invalid_cert, - ) - .await - } else { - log::warn!("HTTP request failed: {:?}, try again with native-tls", e); - post_request_( - url, - tls_url, - body, - header, - Some(TlsType::NativeTls), - original_danger_accept_invalid_cert, - original_danger_accept_invalid_cert, - ) - .await - } - } else { - Err(anyhow!("{:?}", e)) - } - } - } - } + Ok(req.body(body).timeout(to).send().await?.text().await?) } #[tokio::main(flavor = "current_thread")] @@ -1496,155 +1064,6 @@ pub async fn post_request_sync(url: String, body: String, header: &str) -> Resul post_request(url, body, header).await } -#[async_recursion] -async fn get_http_response_async( - url: &str, - tls_url: &str, - method: &str, - body: Option, - header: &str, - tls_type: Option, - danger_accept_invalid_cert: Option, - original_danger_accept_invalid_cert: Option, -) -> ResultType { - let http_client = create_http_client_async( - tls_type.unwrap_or(TlsType::Rustls), - danger_accept_invalid_cert.unwrap_or(false), - ); - let normalized_method = method.to_ascii_lowercase(); - let mut http_client = match normalized_method.as_str() { - "get" => http_client.get(url), - "post" => http_client.post(url), - "put" => http_client.put(url), - "delete" => http_client.delete(url), - _ => return Err(anyhow!("The HTTP request method is not supported!")), - }; - for entry in parse_json_header_entries(header)? { - http_client = http_client.header(entry.name, entry.value); - } - - if tls_type.is_some() && danger_accept_invalid_cert.is_some() { - if let Some(b) = body { - http_client = http_client.body(b); - } - match http_client - .timeout(std::time::Duration::from_secs(12)) - .send() - .await - { - Ok(resp) => { - upsert_tls_cache( - tls_url, - tls_type.unwrap_or(TlsType::Rustls), - danger_accept_invalid_cert.unwrap_or(false), - ); - Ok(resp) - } - Err(e) => Err(anyhow!("{:?}", e)), - } - } else { - if let Some(b) = body.clone() { - http_client = http_client.body(b); - } - - match http_client - .timeout(std::time::Duration::from_secs(12)) - .send() - .await - { - Ok(resp) => { - upsert_tls_cache( - tls_url, - tls_type.unwrap_or(TlsType::Rustls), - danger_accept_invalid_cert.unwrap_or(false), - ); - Ok(resp) - } - Err(e) => { - if (tls_type.is_none() || danger_accept_invalid_cert.is_none()) && e.is_request() { - if danger_accept_invalid_cert.is_none() { - log::warn!( - "HTTP request failed: {:?}, try again, danger accept invalid cert", - e - ); - get_http_response_async( - url, - tls_url, - method, - body, - header, - tls_type, - Some(true), - original_danger_accept_invalid_cert, - ) - .await - } else { - log::warn!("HTTP request failed: {:?}, try again with native-tls", e); - get_http_response_async( - url, - tls_url, - method, - body, - header, - Some(TlsType::NativeTls), - original_danger_accept_invalid_cert, - original_danger_accept_invalid_cert, - ) - .await - } - } else { - Err(anyhow!("{:?}", e)) - } - } - } - } -} - -/// Returns (status_code, json_string) so the caller can inspect the status -/// without re-parsing the serialized JSON. -async fn http_request_http( - url: &str, - method: &str, - body: Option, - header: &str, -) -> ResultType<(u16, String)> { - let proxy_conf = Config::get_socks(); - let tls_url = get_url_for_tls(url, &proxy_conf); - let tls_type = get_cached_tls_type(tls_url); - let danger_accept_invalid_cert = get_cached_tls_accept_invalid_cert(tls_url); - let response = get_http_response_async( - url, - tls_url, - method, - body, - header, - tls_type, - danger_accept_invalid_cert, - danger_accept_invalid_cert, - ) - .await?; - // Serialize response headers - let mut response_headers = Map::new(); - for (key, value) in response.headers() { - response_headers.insert(key.to_string(), json!(value.to_str().unwrap_or(""))); - } - - let status_code = response.status().as_u16(); - let response_body = response.text().await?; - - // Construct the JSON object - let mut result = Map::new(); - result.insert("status_code".to_string(), json!(status_code)); - result.insert("headers".to_string(), Value::Object(response_headers)); - result.insert("body".to_string(), json!(response_body)); - - // Convert map to JSON string - let json_str = serde_json::to_string(&result) - .map_err(|e| anyhow!("Failed to serialize response: {}", e))?; - Ok((status_code, json_str)) -} - -/// HTTP request with raw TCP proxy support. #[tokio::main(flavor = "current_thread")] pub async fn http_request_sync( url: String, @@ -1652,28 +1071,56 @@ pub async fn http_request_sync( body: Option, header: String, ) -> ResultType { - with_tcp_proxy_fallback( - &url, - &method, - http_request_http(&url, &method, body.clone(), &header), - http_request_via_tcp_proxy(&url, &method, body.as_deref(), &header), - ) - .await -} + let http_client = create_http_client_async(); + let mut http_client = match method.as_str() { + "get" => http_client.get(url), + "post" => http_client.post(url), + "put" => http_client.put(url), + "delete" => http_client.delete(url), + _ => return Err(anyhow!("The HTTP request method is not supported!")), + }; + let v = serde_json::from_str(header.as_str())?; -/// General HTTP request via TCP proxy. Header is a JSON string (used by http_request_sync). -/// Returns a JSON string with status_code, headers, body (same format as http_request_sync). -async fn http_request_via_tcp_proxy( - url: &str, - method: &str, - body: Option<&str>, - header: &str, -) -> ResultType { - let headers = parse_json_header_entries(header)?; - let body_bytes = body.unwrap_or("").as_bytes(); + if let Value::Object(obj) = v { + for (key, value) in obj.iter() { + http_client = http_client.header(key, value.as_str().unwrap_or_default()); + } + } else { + return Err(anyhow!("HTTP header information parsing failed!")); + } - let resp = tcp_proxy_request(method, url, body_bytes, headers).await?; - http_proxy_response_to_json(resp) + if let Some(b) = body { + http_client = http_client.body(b); + } + + let response = http_client + .timeout(std::time::Duration::from_secs(12)) + .send() + .await?; + + // Serialize response headers + let mut response_headers = serde_json::map::Map::new(); + for (key, value) in response.headers() { + response_headers.insert( + key.to_string(), + serde_json::json!(value.to_str().unwrap_or("")), + ); + } + + let status_code = response.status().as_u16(); + let response_body = response.text().await?; + + // Construct the JSON object + let mut result = serde_json::map::Map::new(); + result.insert("status_code".to_string(), serde_json::json!(status_code)); + result.insert( + "headers".to_string(), + serde_json::Value::Object(response_headers), + ); + result.insert("body".to_string(), serde_json::json!(response_body)); + + // Convert map to JSON string + serde_json::to_string(&result).map_err(|e| anyhow!("Failed to serialize response: {}", e)) } #[inline] @@ -1936,7 +1383,7 @@ pub fn check_process(arg: &str, mut same_uid: bool) -> bool { false } -async fn secure_tcp_impl(conn: &mut Stream, key: &str, log_on_success: bool) -> ResultType<()> { +pub async fn secure_tcp(conn: &mut Stream, key: &str) -> ResultType<()> { // Skip additional encryption when using WebSocket connections (wss://) // as WebSocket Secure (wss://) already provides transport layer encryption. // This doesn't affect the end-to-end encryption between clients, @@ -1969,9 +1416,7 @@ async fn secure_tcp_impl(conn: &mut Stream, key: &str, log_on_success: bool) -> }); timeout(CONNECT_TIMEOUT, conn.send(&msg_out)).await??; conn.set_key(key); - if log_on_success { - log::info!("Connection secured"); - } + log::info!("Connection secured"); } _ => {} } @@ -1982,14 +1427,6 @@ async fn secure_tcp_impl(conn: &mut Stream, key: &str, log_on_success: bool) -> Ok(()) } -pub async fn secure_tcp(conn: &mut Stream, key: &str) -> ResultType<()> { - secure_tcp_impl(conn, key, true).await -} - -async fn secure_tcp_silent(conn: &mut Stream, key: &str) -> ResultType<()> { - secure_tcp_impl(conn, key, false).await -} - #[inline] fn get_pk(pk: &[u8]) -> Option<[u8; 32]> { if pk.len() == 32 { @@ -2032,7 +1469,8 @@ pub fn create_symmetric_key_msg(their_pk_b: [u8; 32]) -> (Bytes, Bytes, secretbo #[inline] pub fn using_public_server() -> bool { - crate::get_custom_rendezvous_server(get_option("custom-rendezvous-server")).is_empty() + option_env!("RENDEZVOUS_SERVER").unwrap_or("").is_empty() + && crate::get_custom_rendezvous_server(get_option("custom-rendezvous-server")).is_empty() } pub struct ThrottledInterval { @@ -2285,7 +1723,7 @@ pub fn is_custom_client() -> bool { get_app_name() != "RustDesk" } -pub fn verify_login(_raw: &str, _id: &str) -> bool { +pub fn verify_login(raw: &str, id: &str) -> bool { true /* if is_custom_client() { @@ -2314,7 +1752,7 @@ pub fn verify_login(_raw: &str, _id: &str) -> bool { #[inline] pub fn is_udp_disabled() -> bool { - Config::get_option(keys::OPTION_DISABLE_UDP) == "Y" + get_builtin_option(keys::OPTION_DISABLE_UDP) == "Y" } // this crate https://github.com/yoshd/stun-client supports nat type @@ -2582,44 +2020,6 @@ pub async fn get_ipv6_socket() -> Option<(Arc, bytes::Bytes)> { None } -// The color is the same to `str2color()` in flutter. -pub fn str2color(s: &str, alpha: u8) -> u32 { - let bytes = s.as_bytes(); - // dart code `160 << 16 + 114 << 8 + 91` results `0`. - let mut hash: u32 = 0; - for &byte in bytes { - let code = byte as u32; - hash = code.wrapping_add((hash << 5).wrapping_sub(hash)); - } - - hash = hash % 16777216; - let rgb = hash & 0xFF7FFF; - - (alpha as u32) << 24 | rgb -} - -/// Check control permission state from a u64 bitmap. -/// Each permission uses 2 bits: 0 = not set, 1 = disable, 2 = enable, 3 = invalid (treated as not set) -/// Returns: Some(true) = enabled, Some(false) = disabled, None = not set or invalid -pub fn get_control_permission( - permissions: u64, - permission: hbb_common::rendezvous_proto::control_permissions::Permission, -) -> Option { - use hbb_common::protobuf::Enum; - let index = permission.value(); - if index >= 0 && index < 32 { - let shift = index * 2; - let value = (permissions >> shift) & 0b11; - match value { - 1 => Some(false), // disable - 2 => Some(true), // enable - _ => None, // 0 = not set, 3 = invalid - } - } else { - None - } -} - #[cfg(test)] mod tests { use super::*; @@ -2760,248 +2160,4 @@ mod tests { Duration::from_nanos(0) ); } - - #[test] - fn test_is_public() { - // Test URLs containing "rustdesk.com/" - assert!(is_public("https://rustdesk.com/")); - assert!(is_public("https://www.rustdesk.com/")); - assert!(is_public("https://api.rustdesk.com/v1")); - assert!(is_public("https://API.RUSTDESK.COM/v1")); - assert!(is_public("https://rustdesk.com/path")); - - // Test URLs ending with "rustdesk.com" - assert!(is_public("rustdesk.com")); - assert!(is_public("https://rustdesk.com")); - assert!(is_public("https://RustDesk.com")); - assert!(is_public("http://www.rustdesk.com")); - assert!(is_public("https://api.rustdesk.com")); - - // Test non-public URLs - assert!(!is_public("https://example.com")); - assert!(!is_public("https://custom-server.com")); - assert!(!is_public("http://192.168.1.1")); - assert!(!is_public("localhost")); - assert!(!is_public("https://rustdesk.computer.com")); - assert!(!is_public("rustdesk.comhello.com")); - } - - #[test] - fn test_should_use_tcp_proxy_for_api_url() { - assert!(should_use_tcp_proxy_for_api_url( - "https://admin.example.com/api/login", - "https://admin.example.com" - )); - assert!(should_use_tcp_proxy_for_api_url( - "https://admin.example.com:21114/api/login", - "https://admin.example.com" - )); - assert!(!should_use_tcp_proxy_for_api_url( - "https://api.telegram.org/bot123/sendMessage", - "https://admin.example.com" - )); - assert!(!should_use_tcp_proxy_for_api_url( - "https://admin.rustdesk.com/api/login", - "https://admin.rustdesk.com" - )); - assert!(!should_use_tcp_proxy_for_api_url( - "https://admin.example.com/api/login", - "not a url" - )); - assert!(!should_use_tcp_proxy_for_api_url( - "not a url", - "https://admin.example.com" - )); - } - - #[test] - fn test_get_tcp_proxy_addr_normalizes_bare_ipv6_host() { - struct RestoreCustomRendezvousServer(String); - - impl Drop for RestoreCustomRendezvousServer { - fn drop(&mut self) { - Config::set_option( - keys::OPTION_CUSTOM_RENDEZVOUS_SERVER.to_string(), - self.0.clone(), - ); - } - } - - let _restore = RestoreCustomRendezvousServer(Config::get_option( - keys::OPTION_CUSTOM_RENDEZVOUS_SERVER, - )); - Config::set_option( - keys::OPTION_CUSTOM_RENDEZVOUS_SERVER.to_string(), - "1:2".to_string(), - ); - - assert_eq!(get_tcp_proxy_addr(), format!("[1:2]:{RENDEZVOUS_PORT}")); - } - - #[tokio::test] - async fn test_http_request_via_tcp_proxy_rejects_invalid_header_json() { - let result = http_request_via_tcp_proxy("not a url", "get", None, "{").await; - assert!(result.is_err()); - } - - #[tokio::test] - async fn test_http_request_via_tcp_proxy_rejects_non_object_header_json() { - let err = http_request_via_tcp_proxy("not a url", "get", None, "[]") - .await - .unwrap_err() - .to_string(); - assert!(err.contains("HTTP header information parsing failed!")); - } - - #[test] - fn test_parse_json_header_entries_preserves_single_content_type() { - let headers = parse_json_header_entries( - r#"{"Content-Type":"text/plain","Authorization":"Bearer token"}"#, - ) - .unwrap(); - - assert_eq!( - headers - .iter() - .filter(|entry| entry.name.eq_ignore_ascii_case("Content-Type")) - .count(), - 1 - ); - assert_eq!( - headers - .iter() - .find(|entry| entry.name.eq_ignore_ascii_case("Content-Type")) - .map(|entry| entry.value.as_str()), - Some("text/plain") - ); - } - - #[test] - fn test_parse_json_header_entries_does_not_add_default_content_type() { - let headers = parse_json_header_entries(r#"{"Authorization":"Bearer token"}"#).unwrap(); - - assert!(!headers - .iter() - .any(|entry| entry.name.eq_ignore_ascii_case("Content-Type"))); - } - - #[test] - fn test_parse_simple_header_respects_custom_content_type() { - let headers = parse_simple_header("Content-Type: text/plain"); - - assert_eq!( - headers - .iter() - .filter(|entry| entry.name.eq_ignore_ascii_case("Content-Type")) - .count(), - 1 - ); - assert_eq!( - headers - .iter() - .find(|entry| entry.name.eq_ignore_ascii_case("Content-Type")) - .map(|entry| entry.value.as_str()), - Some("text/plain") - ); - } - - #[test] - fn test_parse_simple_header_preserves_non_content_type_header() { - let headers = parse_simple_header("Authorization: Bearer token"); - - assert!(headers.iter().any(|entry| { - entry.name.eq_ignore_ascii_case("Authorization") - && entry.value.as_str() == "Bearer token" - })); - assert_eq!( - headers - .iter() - .filter(|entry| entry.name.eq_ignore_ascii_case("Content-Type")) - .count(), - 1 - ); - assert_eq!( - headers - .iter() - .find(|entry| entry.name.eq_ignore_ascii_case("Content-Type")) - .map(|entry| entry.value.as_str()), - Some("application/json") - ); - } - - #[test] - fn test_tcp_proxy_log_target_redacts_query_only() { - assert_eq!( - tcp_proxy_log_target("https://example.com/api/heartbeat?token=secret"), - "https://example.com/api/heartbeat" - ); - } - - #[test] - fn test_tcp_proxy_log_target_brackets_ipv6_host_with_port() { - assert_eq!( - tcp_proxy_log_target("https://[2001:db8::1]:21114/api/heartbeat?token=secret"), - "https://[2001:db8::1]:21114/api/heartbeat" - ); - } - - #[test] - fn test_http_proxy_response_to_json() { - let mut resp = HttpProxyResponse { - status: 200, - body: br#"{"ok":true}"#.to_vec().into(), - ..Default::default() - }; - resp.headers.push(HeaderEntry { - name: "Content-Type".into(), - value: "application/json".into(), - ..Default::default() - }); - - let json = http_proxy_response_to_json(resp).unwrap(); - let value: Value = serde_json::from_str(&json).unwrap(); - assert_eq!(value["status_code"], 200); - assert_eq!(value["headers"]["content-type"], "application/json"); - assert_eq!(value["body"], r#"{"ok":true}"#); - - let err = http_proxy_response_to_json(HttpProxyResponse { - error: "dial failed".into(), - ..Default::default() - }) - .unwrap_err() - .to_string(); - assert!(err.contains("TCP proxy error: dial failed")); - } - - #[test] - fn test_mouse_event_constants_and_mask_layout() { - use super::input::*; - - // Verify MOUSE_TYPE constants are unique and within the mask range. - let types = [ - MOUSE_TYPE_MOVE, - MOUSE_TYPE_DOWN, - MOUSE_TYPE_UP, - MOUSE_TYPE_WHEEL, - MOUSE_TYPE_TRACKPAD, - MOUSE_TYPE_MOVE_RELATIVE, - ]; - - let mut seen = std::collections::HashSet::new(); - for t in types.iter() { - assert!(seen.insert(*t), "Duplicate mouse type: {}", t); - assert_eq!( - *t & MOUSE_TYPE_MASK, - *t, - "Mouse type {} exceeds mask {}", - t, - MOUSE_TYPE_MASK - ); - } - - // The mask layout is: lower 3 bits for type, upper bits for buttons (shifted by 3). - let combined_mask = MOUSE_TYPE_DOWN | ((MOUSE_BUTTON_LEFT | MOUSE_BUTTON_RIGHT) << 3); - assert_eq!(combined_mask & MOUSE_TYPE_MASK, MOUSE_TYPE_DOWN); - assert_eq!(combined_mask >> 3, MOUSE_BUTTON_LEFT | MOUSE_BUTTON_RIGHT); - } } diff --git a/src/core_main.rs b/src/core_main.rs index 4515faa6b..cee6ac0b9 100644 --- a/src/core_main.rs +++ b/src/core_main.rs @@ -29,9 +29,6 @@ macro_rules! my_println{ /// If it returns [`Some`], then the process will continue, and flutter gui will be started. #[cfg(not(any(target_os = "android", target_os = "ios")))] pub fn core_main() -> Option> { - if !crate::common::global_init() { - return None; - } crate::load_custom_client(); #[cfg(windows)] if !crate::platform::windows::bootstrap() { @@ -58,7 +55,6 @@ pub fn core_main() -> Option> { "--file-transfer", "--view-camera", "--port-forward", - "--terminal", "--rdp", ] .contains(&arg.as_str()) @@ -140,25 +136,20 @@ pub fn core_main() -> Option> { { _is_quick_support |= !crate::platform::is_installed() && args.is_empty() - && (is_quick_support_exe(&arg_exe) + && (arg_exe.to_lowercase().contains("-qs-") || config::LocalConfig::get_option("pre-elevate-service") == "Y" || (!click_setup && crate::platform::is_elevated(None).unwrap_or(false))); crate::portable_service::client::set_quick_support(_is_quick_support); } let mut log_name = "".to_owned(); - // Keep portable-service logs under a stable directory name. - let has_portable_service_shmem_arg = args - .iter() - .any(|arg| arg.starts_with("--portable-service-shmem-name=")); - if has_portable_service_shmem_arg { - log_name = "portable-service".to_owned(); - } else if args.len() > 0 && args[0].starts_with("--") { + if args.len() > 0 && args[0].starts_with("--") { let name = args[0].replace("--", ""); if !name.is_empty() { log_name = name; } } hbb_common::init_log(false, &log_name); + log::info!("main start args: {:?}, env: {:?}", args, std::env::args()); // linux uni (url) go here. #[cfg(all(target_os = "linux", feature = "flutter"))] @@ -187,32 +178,10 @@ pub fn core_main() -> Option> { #[cfg(not(any(target_os = "android", target_os = "ios")))] init_plugins(&args); if args.is_empty() || crate::common::is_empty_uni_link(&args[0]) { - #[cfg(target_os = "macos")] - { - crate::platform::macos::try_remove_temp_update_dir(None); - } - #[cfg(windows)] - { - crate::platform::try_remove_temp_update_files(); - hbb_common::config::PeerConfig::preload_peers(); - } + hbb_common::config::PeerConfig::preload_peers(); std::thread::spawn(move || crate::start_server(false, no_server)); } else { - #[cfg(any(target_os = "linux", target_os = "macos"))] - // Root CLI management commands must talk to the user `--server` main IPC. - // Example: `sudo rustdesk --option custom-rendezvous-server` should query the - // user's IPC instead of root's `/tmp/-0/ipc`; `connect()` still limits this - // routing to empty-postfix main IPC only. - let _user_main_ipc_scope = if crate::platform::is_installed() - && is_root() - && is_user_main_ipc_scope_cli_command(&args) - { - Some(crate::ipc::UserMainIpcScope::new()) - } else { - None - }; - #[cfg(windows)] { use crate::platform; @@ -225,24 +194,17 @@ pub fn core_main() -> Option> { if config::is_disable_installation() { return None; } - - let text = match crate::platform::prepare_custom_client_update() { - Err(e) => { - log::error!("Error preparing custom client update: {}", e); - "Update failed!".to_string() + let res = platform::update_me(false); + let text = match res { + Ok(_) => translate("Update successfully!".to_string()), + Err(err) => { + log::error!("Failed with error: {err}"); + translate("Update failed!".to_string()) } - Ok(false) => "Update failed!".to_string(), - Ok(true) => match platform::update_me(false) { - Ok(_) => "Updated successfully!".to_string(), - Err(err) => { - log::error!("Failed with error: {err}"); - "Update failed!".to_string() - } - }, }; Toast::new(Toast::POWERSHELL_APP_ID) .title(&config::APP_NAME.read().unwrap()) - .text1(&translate(text)) + .text1(&text) .sound(Some(Sound::Default)) .duration(Duration::Short) .show() @@ -335,35 +297,14 @@ pub fn core_main() -> Option> { { use crate::platform; if args[0] == "--update" { - if args.len() > 1 && args[1].ends_with(".dmg") { - // Version check is unnecessary unless downgrading to an older version - // that lacks "update dmg" support. This is a special case since we cannot - // detect the version before extracting the DMG, so we skip the check. - let dmg_path = &args[1]; - println!("Updating from DMG: {}", dmg_path); - match platform::update_from_dmg(dmg_path) { - Ok(_) => { - println!("Update process from DMG started successfully."); - // The new process will handle the rest. We can exit. - } - Err(err) => { - eprintln!("Failed to start update from DMG: {}", err); - } + let _text = match platform::update_me() { + Ok(_) => { + log::info!("{}", translate("Update successfully!".to_string())); } - } else { - println!("Starting update process..."); - log::info!("Starting update process..."); - let _text = match platform::update_me() { - Ok(_) => { - println!("{}", translate("Updated successfully!".to_string())); - log::info!("Updated successfully!"); - } - Err(err) => { - eprintln!("Update failed with error: {}", err); - log::error!("Update failed with error: {err}"); - } - }; - } + Err(err) => { + log::error!("Update failed with error: {err}"); + } + }; return None; } } @@ -432,14 +373,6 @@ pub fn core_main() -> Option> { } return None; } else if args[0] == "--password" { - if config::is_disable_settings() { - println!("Settings are disabled!"); - return None; - } - if config::Config::is_disable_change_permanent_password() { - println!("Changing permanent password is disabled!"); - return None; - } if args.len() == 2 { if crate::platform::is_installed() && is_root() { if let Err(err) = crate::ipc::set_permanent_password(args[1].to_owned()) { @@ -453,10 +386,6 @@ pub fn core_main() -> Option> { } return None; } else if args[0] == "--set-unlock-pin" { - if config::Config::is_disable_unlock_pin() { - println!("Unlock PIN is disabled!"); - return None; - } #[cfg(feature = "flutter")] if args.len() == 2 { if crate::platform::is_installed() && is_root() { @@ -474,14 +403,6 @@ pub fn core_main() -> Option> { println!("{}", crate::ipc::get_id()); return None; } else if args[0] == "--set-id" { - if config::is_disable_settings() { - println!("Settings are disabled!"); - return None; - } - if config::Config::is_disable_change_id() { - println!("Changing ID is disabled!"); - return None; - } if args.len() == 2 { if crate::platform::is_installed() && is_root() { let old_id = crate::ipc::get_id(); @@ -521,10 +442,6 @@ pub fn core_main() -> Option> { } return None; } else if args[0] == "--option" { - if config::is_disable_settings() { - println!("Settings are disabled!"); - return None; - } if crate::platform::is_installed() && is_root() { if args.len() == 2 { let options = crate::ipc::get_options(); @@ -546,25 +463,51 @@ pub fn core_main() -> Option> { let token = args[pos + 1].to_owned(); let id = crate::ipc::get_id(); let uuid = crate::encode64(hbb_common::get_uuid()); - let get_value = |c: &str| { - let pos = args.iter().position(|x| x == c).unwrap_or(max); - if pos < max { - Some(args[pos + 1].to_owned()) - } else { - None - } - }; - let user_name = get_value("--user_name"); - let strategy_name = get_value("--strategy_name"); - let address_book_name = get_value("--address_book_name"); - let address_book_tag = get_value("--address_book_tag"); - let address_book_alias = get_value("--address_book_alias"); - let address_book_password = get_value("--address_book_password"); - let address_book_note = get_value("--address_book_note"); - let device_group_name = get_value("--device_group_name"); - let note = get_value("--note"); - let device_username = get_value("--device_username"); - let device_name = get_value("--device_name"); + let mut user_name = None; + let pos = args.iter().position(|x| x == "--user_name").unwrap_or(max); + if pos < max { + user_name = Some(args[pos + 1].to_owned()); + } + let mut strategy_name = None; + let pos = args + .iter() + .position(|x| x == "--strategy_name") + .unwrap_or(max); + if pos < max { + strategy_name = Some(args[pos + 1].to_owned()); + } + let mut address_book_name = None; + let pos = args + .iter() + .position(|x| x == "--address_book_name") + .unwrap_or(max); + if pos < max { + address_book_name = Some(args[pos + 1].to_owned()); + } + let mut address_book_tag = None; + let pos = args + .iter() + .position(|x| x == "--address_book_tag") + .unwrap_or(max); + if pos < max { + address_book_tag = Some(args[pos + 1].to_owned()); + } + let mut address_book_alias = None; + let pos = args + .iter() + .position(|x| x == "--address_book_alias") + .unwrap_or(max); + if pos < max { + address_book_alias = Some(args[pos + 1].to_owned()); + } + let mut device_group_name = None; + let pos = args + .iter() + .position(|x| x == "--device_group_name") + .unwrap_or(max); + if pos < max { + device_group_name = Some(args[pos + 1].to_owned()); + } let mut body = serde_json::json!({ "id": id, "uuid": uuid, @@ -574,19 +517,9 @@ pub fn core_main() -> Option> { && strategy_name.is_none() && address_book_name.is_none() && device_group_name.is_none() - && note.is_none() - && device_username.is_none() - && device_name.is_none() { println!( - r#"At least one of the following options is required: - --user_name - --strategy_name - --address_book_name - --device_group_name - --note - --device_username - --device_name"# + "--user_name or --strategy_name or --address_book_name or --device_group_name is required!" ); } else { if let Some(name) = user_name { @@ -603,25 +536,10 @@ pub fn core_main() -> Option> { if let Some(name) = address_book_alias { body["address_book_alias"] = serde_json::json!(name); } - if let Some(name) = address_book_password { - body["address_book_password"] = serde_json::json!(name); - } - if let Some(name) = address_book_note { - body["address_book_note"] = serde_json::json!(name); - } } if let Some(name) = device_group_name { body["device_group_name"] = serde_json::json!(name); } - if let Some(name) = note { - body["note"] = serde_json::json!(name); - } - if let Some(name) = device_username { - body["device_username"] = serde_json::json!(name); - } - if let Some(name) = device_name { - body["device_name"] = serde_json::json!(name); - } let url = crate::ui_interface::get_api_server() + "/api/devices/cli"; match crate::post_request_sync(url, body.to_string(), &header) { Err(err) => println!("{}", err), @@ -641,113 +559,10 @@ pub fn core_main() -> Option> { println!("Installation and administrative privileges required!"); } return None; - } else if args[0] == "--deploy" { - if config::Config::no_register_device() { - println!("Cannot deploy an unregistrable device!"); - } else if crate::platform::is_installed() && is_root() { - let max = args.len() - 1; - let pos = args.iter().position(|x| x == "--token").unwrap_or(max); - if pos >= max { - println!("--token is required!"); - return None; - } - let token = args[pos + 1].to_owned(); - let get_value = |c: &str| { - let pos = args.iter().position(|x| x == c).unwrap_or(max); - if pos < max { - Some(args[pos + 1].to_owned()) - } else { - None - } - }; - let new_id = get_value("--id"); - let local_id = crate::ipc::get_id(); - let id_to_deploy = new_id.clone().unwrap_or_else(|| local_id.clone()); - let uuid = crate::encode64(hbb_common::get_uuid()); - let pk = crate::encode64( - hbb_common::config::Config::get_key_pair().1, - ); - let body = serde_json::json!({ - "id": id_to_deploy, - "uuid": uuid, - "pk": pk, - }); - let header = "Authorization: Bearer ".to_owned() + &token; - let url = crate::ui_interface::get_api_server() + "/api/devices/deploy"; - match crate::post_request_sync(url, body.to_string(), &header) { - Err(err) => { - println!("Request failed: {}", err); - std::process::exit(1); - } - Ok(text) => { - let parsed: serde_json::Value = - serde_json::from_str(&text).unwrap_or(serde_json::Value::Null); - let result = parsed["result"].as_str().unwrap_or(""); - match result { - "OK" => { - if let Some(ref new_id) = new_id { - if *new_id != local_id { - if let Err(err) = - crate::ipc::set_config("id", new_id.clone()) - { - println!( - "Failed to persist deployed id locally: {}", - err - ); - std::process::exit(1); - } - } - } - if let Err(err) = crate::ipc::notify_deployed() { - log::warn!("Failed to notify deployed state: {}", err); - } - println!("Device deployed."); - } - "NOT_ENABLED" => { - println!("Server does not require deployment."); - std::process::exit(3); - } - "INVALID_INPUT" => { - println!("Invalid input."); - std::process::exit(5); - } - "ID_TAKEN" => { - println!( - "Id `{}` is already used by another machine on the server.", - id_to_deploy - ); - std::process::exit(6); - } - _ => { - if text.is_empty() { - println!("Unknown response."); - } else { - println!("{}", text); - } - std::process::exit(1); - } - } - } - } - } else { - println!("Installation and administrative privileges required!"); - } - return None; } else if args[0] == "--check-hwcodec-config" { #[cfg(feature = "hwcodec")] crate::ipc::hwcodec_process(); return None; - } else if args[0] == "--terminal-helper" { - // Terminal helper process - runs as user to create ConPTY - // This is needed because ConPTY has compatibility issues with CreateProcessAsUserW - #[cfg(target_os = "windows")] - { - let helper_args: Vec = args[1..].to_vec(); - if let Err(e) = crate::server::terminal_helper::run_terminal_helper(&helper_args) { - log::error!("Terminal helper failed: {}", e); - } - } - return None; } else if args[0] == "--cm" { // call connection manager to establish connections // meanwhile, return true to call flutter window to show control panel @@ -760,12 +575,6 @@ pub fn core_main() -> Option> { crate::flutter::connection_manager::start_cm_no_ui(); } return None; - } else if args[0] == "--whiteboard" { - #[cfg(not(any(target_os = "android", target_os = "ios")))] - { - crate::whiteboard::run(); - } - return None; } else if args[0] == "-gtk-sudo" { // rustdesk service kill `rustdesk --` processes #[cfg(target_os = "linux")] @@ -855,7 +664,7 @@ fn core_main_invoke_new_connection(mut args: std::env::Args) -> Option { + | "--rdp" => { authority = Some((&arg.to_string()[2..]).to_owned()); id = args.next(); } @@ -951,63 +760,3 @@ fn is_root() -> bool { #[allow(unreachable_code)] crate::platform::is_root() } - -#[cfg(any(target_os = "linux", target_os = "macos", test))] -fn is_user_main_ipc_scope_cli_command(args: &[String]) -> bool { - matches!( - args.first().map(String::as_str), - Some("--password") - | Some("--set-unlock-pin") - | Some("--get-id") - | Some("--set-id") - | Some("--config") - | Some("--option") - | Some("--assign") - | Some("--deploy") - ) -} - -#[cfg(test)] -mod tests { - use super::*; - - fn args(values: &[&str]) -> Vec { - values.iter().map(|value| value.to_string()).collect() - } - - #[test] - fn user_main_ipc_scope_cli_command_matches_management_commands_only() { - for command in [ - "--password", - "--set-unlock-pin", - "--get-id", - "--set-id", - "--config", - "--option", - "--assign", - "--deploy", - ] { - assert!(is_user_main_ipc_scope_cli_command(&args(&[command]))); - } - - for command in [ - "--service", - "--server", - "--tray", - "--cm", - "--check-hwcodec-config", - "--connect", - ] { - assert!(!is_user_main_ipc_scope_cli_command(&args(&[command]))); - } - } -} - -/// Check if the executable is a Quick Support version. -/// Note: This function must be kept in sync with `libs/portable/src/main.rs`. -#[cfg(windows)] -#[inline] -fn is_quick_support_exe(exe: &str) -> bool { - let exe = exe.to_lowercase(); - exe.contains("-qs-") || exe.contains("-qs.exe") || exe.contains("_qs.exe") -} diff --git a/src/flutter.rs b/src/flutter.rs index f8b04bf6c..e3c3c8c0d 100644 --- a/src/flutter.rs +++ b/src/flutter.rs @@ -15,15 +15,15 @@ use hbb_common::{ }; use serde::Serialize; use serde_json::json; -#[cfg(target_os = "windows")] -use std::io::{Error as IoError, ErrorKind as IoErrorKind}; + use std::{ collections::{HashMap, HashSet}, ffi::CString, + io::{Error as IoError, ErrorKind as IoErrorKind}, os::raw::{c_char, c_int, c_void}, str::FromStr, sync::{ - atomic::{AtomicBool, AtomicUsize, Ordering}, + atomic::{AtomicBool, Ordering}, Arc, RwLock, }, }; @@ -111,7 +111,6 @@ pub extern "C" fn rustdesk_core_main() -> bool { #[cfg(target_os = "macos")] std::process::exit(0); } - #[cfg(not(target_os = "macos"))] false } @@ -609,22 +608,7 @@ impl FlutterHandler { h.insert("original_width", original_resolution.width); h.insert("original_height", original_resolution.height); } - // Don't convert scale (x 100) to i32 directly. - // (d.scale * 100.0f64) as i32 may produces inaccuracies. - // - // Example: GNOME Wayland with Fractional Scaling enabled: - // - Physical resolution: 2560x1600 - // - Logical resolution: 1074x1065 - // - Scale factor: 150% - // Passing physical dimensions and scale factor prevents accurate logical resolution calculation - // since 2560/1.5 = 1706.666... (rounded to 1706.67) and 1600/1.5 = 1066.666... (rounded to 1066.67) - // h.insert("scale", (d.scale * 100.0f64) as i32); - - // Send scaled_width for accurate logical scale calculation. - if d.scale > 0.0 { - let scaled_width = (d.width as f64 / d.scale).round() as i32; - h.insert("scaled_width", scaled_width); - } + h.insert("scale", (d.scale * 100.0f64) as i32); msg_vec.push(h); } serde_json::ser::to_string(&msg_vec).unwrap_or("".to_owned()) @@ -694,7 +678,7 @@ impl InvokeUiSession for FlutterHandler { } /// unused in flutter, use switch_display or set_peer_info - fn set_display(&self, _x: i32, _y: i32, _w: i32, _h: i32, _cursor_embedded: bool, _scale: f64) {} + fn set_display(&self, _x: i32, _y: i32, _w: i32, _h: i32, _cursor_embedded: bool) {} fn update_privacy_mode(&self) { self.push_event::<&str>("update_privacy_mode", &[], &[]); @@ -732,13 +716,12 @@ impl InvokeUiSession for FlutterHandler { ); } - fn set_connection_type(&self, is_secured: bool, direct: bool, stream_type: &str) { + fn set_connection_type(&self, is_secured: bool, direct: bool) { self.push_event( "connection_ready", &[ ("secure", &is_secured.to_string()), ("direct", &direct.to_string()), - ("stream_type", &stream_type.to_string()), ], &[], ); @@ -771,7 +754,7 @@ impl InvokeUiSession for FlutterHandler { // unused in flutter fn clear_all_jobs(&self) {} - fn load_last_job(&self, _cnt: i32, job_json: &str, _auto_start: bool) { + fn load_last_job(&self, _cnt: i32, job_json: &str) { self.push_event("load_last_job", &[("value", job_json)], &[]); } @@ -1135,14 +1118,7 @@ impl InvokeUiSession for FlutterHandler { ("message", json!(&opened.message)), ("pid", json!(opened.pid)), ("service_id", json!(&opened.service_id)), - ( - "replay_terminal_output", - json!(opened.replay_terminal_output), - ), ]; - if !opened.persistent_sessions.is_empty() { - event_data.push(("persistent_sessions", json!(opened.persistent_sessions))); - } self.push_event_("terminal_response", &event_data, &[], &[]); } Some(Union::Data(data)) => { @@ -1347,7 +1323,6 @@ pub fn session_add( server_keyboard_enabled: Arc::new(RwLock::new(true)), server_file_transfer_enabled: Arc::new(RwLock::new(true)), server_clipboard_enabled: Arc::new(RwLock::new(true)), - reconnect_count: Arc::new(AtomicUsize::new(0)), ..Default::default() }; @@ -2000,7 +1975,7 @@ pub(super) fn session_update_virtual_display(session: &FlutterSession, index: i3 let mut vdisplays = displays.split(',').collect::>(); let len = vdisplays.len(); if index == 0 { - // 0 means we can't toggle the virtual display by index. + // 0 means we cann't toggle the virtual display by index. vdisplays.remove(vdisplays.len() - 1); } else { if let Some(i) = vdisplays.iter().position(|&x| x == index.to_string()) { @@ -2122,26 +2097,6 @@ pub mod sessions { s } - /// Check if removing a session by session_id would result in removing the entire peer. - /// - /// Returns: - /// - `true`: The session exists and removing it would leave the peer with no other sessions, - /// so the entire peer would be removed (equivalent to `remove_session_by_session_id` returning `Some`) - /// - `false`: The session doesn't exist, or it exists but the peer has other sessions, - /// so the peer would not be removed (equivalent to `remove_session_by_session_id` returning `None`) - #[inline] - pub fn would_remove_peer_by_session_id(id: &SessionID) -> bool { - for (_peer_key, s) in SESSIONS.read().unwrap().iter() { - let read_lock = s.ui_handler.session_handlers.read().unwrap(); - if read_lock.contains_key(id) { - // Found the session, check if it's the only one for this peer - return read_lock.len() == 1; - } - } - // Session not found - false - } - fn check_remove_unused_displays( current: Option, session_id: &SessionID, diff --git a/src/flutter_ffi.rs b/src/flutter_ffi.rs index 4b62b4fca..5a6b66a0b 100644 --- a/src/flutter_ffi.rs +++ b/src/flutter_ffi.rs @@ -1,7 +1,5 @@ #[cfg(not(any(target_os = "android", target_os = "ios")))] use crate::keyboard::input_source::{change_input_source, get_cur_session_input_source}; -#[cfg(target_os = "linux")] -use crate::platform::linux::is_x11; use crate::{ client::file_trait::FileManager, common::{make_fd_to_json, make_vec_fd_to_json}, @@ -39,11 +37,7 @@ lazy_static::lazy_static! { fn initialize(app_dir: &str, custom_client_config: &str) { flutter::async_tasks::start_flutter_async_runner(); - // `APP_DIR` is set in `main_get_data_dir_ios()` on iOS. - #[cfg(not(target_os = "ios"))] - { - *config::APP_DIR.write().unwrap() = app_dir.to_owned(); - } + *config::APP_DIR.write().unwrap() = app_dir.to_owned(); // core_main's load_custom_client does not work for flutter since it is only applied to its load_library in main.c if custom_client_config.is_empty() { crate::load_custom_client(); @@ -72,10 +66,6 @@ fn initialize(app_dir: &str, custom_client_config: &str) { init_from_env(Env::default().filter_or(DEFAULT_FILTER_ENV, "debug")); crate::common::test_nat_type(); } - #[cfg(any(target_os = "android", target_os = "ios"))] - { - let _ = crate::common::global_init(); - } #[cfg(not(any(target_os = "android", target_os = "ios")))] { // core_main's init_log does not work for flutter since it is only applied to its load_library in main.c @@ -148,7 +138,7 @@ pub fn session_add_sync( is_shared_password: bool, conn_token: Option, ) -> SyncReturn { - let add_res = session_add( + if let Err(e) = session_add( &session_id, &id, is_file_transfer, @@ -161,14 +151,7 @@ pub fn session_add_sync( password, is_shared_password, conn_token, - ); - // We can't put the remove call together with `std::env::var("IS_TERMINAL_ADMIN")`. - // Because there are some `bail!` in `session_add()`, we must make sure `IS_TERMINAL_ADMIN` is removed at last. - if is_terminal { - std::env::remove_var("IS_TERMINAL_ADMIN"); - } - - if let Err(e) = add_res { + ) { SyncReturn(format!("Failed to add session with id {}, {}", &id, e)) } else { SyncReturn("".to_owned()) @@ -256,10 +239,6 @@ pub fn session_get_enable_trusted_devices(session_id: SessionID) -> SyncReturn SyncReturn { - SyncReturn(sessions::would_remove_peer_by_session_id(&session_id)) -} - pub fn session_close(session_id: SessionID) { if let Some(session) = sessions::remove_session_by_session_id(&session_id) { // `release_remote_keys` is not required for mobile platforms in common cases. @@ -283,10 +262,7 @@ pub fn session_take_screenshot(session_id: SessionID, display: usize) { } } -pub fn session_handle_screenshot( - #[allow(unused_variables)] session_id: SessionID, - action: String, -) -> String { +pub fn session_handle_screenshot(session_id: SessionID, action: String) -> String { crate::client::screenshot::handle_screenshot(action) } @@ -406,20 +382,6 @@ pub fn session_set_scroll_style(session_id: SessionID, value: String) { } } -pub fn session_get_edge_scroll_edge_thickness(session_id: SessionID) -> Option { - if let Some(session) = sessions::get_session_by_session_id(&session_id) { - Some(session.get_edge_scroll_edge_thickness()) - } else { - None - } -} - -pub fn session_set_edge_scroll_edge_thickness(session_id: SessionID, value: i32) { - if let Some(session) = sessions::get_session_by_session_id(&session_id) { - session.save_edge_scroll_edge_thickness(value); - } -} - pub fn session_get_image_quality(session_id: SessionID) -> Option { if let Some(session) = sessions::get_session_by_session_id(&session_id) { Some(session.get_image_quality()) @@ -605,30 +567,21 @@ pub fn session_handle_flutter_raw_key_event( } } +// SyncReturn<()> is used to make sure enter() and leave() are executed in the sequence this function is called. +// // If the cursor jumps between remote page of two connections, leave view and enter view will be called. // session_enter_or_leave() will be called then. -// As Rust is multi-threaded, enter() can be called before leave(). -// The Rust-side grab ownership state filters stale transitions. +// As rust is multi-thread, it is possible that enter() is called before leave(). +// This will cause the keyboard input to take no effect. pub fn session_enter_or_leave(_session_id: SessionID, _enter: bool) -> SyncReturn<()> { #[cfg(not(any(target_os = "android", target_os = "ios")))] if let Some(session) = sessions::get_session_by_session_id(&_session_id) { let keyboard_mode = session.get_keyboard_mode(); - // Use the full per-window UUID (not lc.session_id which is per-connection) - // so that two windows viewing the same peer get distinct grab owners. - let window_id = _session_id.as_u128(); if _enter { set_cur_session_id_(_session_id, &keyboard_mode); - crate::keyboard::client::change_grab_status( - crate::common::GrabState::Run, - &keyboard_mode, - window_id, - ); + session.enter(keyboard_mode); } else { - crate::keyboard::client::change_grab_status( - crate::common::GrabState::Wait, - &keyboard_mode, - window_id, - ); + session.leave(keyboard_mode); } } SyncReturn(()) @@ -669,10 +622,7 @@ pub fn session_open_terminal(session_id: SessionID, terminal_id: i32, rows: u32, if let Some(session) = sessions::get_session_by_session_id(&session_id) { session.open_terminal(terminal_id, rows, cols); } else { - log::error!( - "[flutter_ffi] Session not found for session_id: {}", - session_id - ); + log::error!("[flutter_ffi] Session not found for session_id: {}", session_id); } } @@ -972,27 +922,6 @@ pub fn main_show_option(_key: String) -> SyncReturn { } pub fn main_set_option(key: String, value: String) { - #[cfg(target_os = "android")] - { - let is_permission_option = key.eq(config::keys::OPTION_ENABLE_CLIPBOARD) - || key.eq(config::keys::OPTION_ENABLE_FILE_TRANSFER) - || key.eq(config::keys::OPTION_ENABLE_AUDIO); - let allow_perm_change_in_accept_window = config::option2bool( - config::keys::OPTION_ENABLE_PERM_CHANGE_IN_ACCEPT_WINDOW, - &crate::get_builtin_option(config::keys::OPTION_ENABLE_PERM_CHANGE_IN_ACCEPT_WINDOW), - ); - if is_permission_option - && !allow_perm_change_in_accept_window - && crate::ui_cm_interface::has_active_clients() - { - log::info!( - "blocked main_set_option by policy, key={}, value={}", - key, - value - ); - return; - } - } #[cfg(target_os = "android")] if key.eq(config::keys::OPTION_ENABLE_KEYBOARD) { crate::ui_cm_interface::switch_permission_all( @@ -1008,19 +937,10 @@ pub fn main_set_option(key: String, value: String) { ); } - // If `is_allow_tls_fallback` and https proxy is used, we need to restart rendezvous mediator. - // No need to check if https proxy is used, because this option does not change frequently - // and restarting mediator is safe even https proxy is not used. - let is_allow_tls_fallback = key.eq(config::keys::OPTION_ALLOW_INSECURE_TLS_FALLBACK); - if is_allow_tls_fallback - || key.eq("custom-rendezvous-server") + if key.eq("custom-rendezvous-server") || key.eq(config::keys::OPTION_ALLOW_WEBSOCKET) - || key.eq(config::keys::OPTION_DISABLE_UDP) || key.eq("api-server") { - if is_allow_tls_fallback { - hbb_common::tls::reset_tls_cache(); - } set_option(key, value.clone()); #[cfg(target_os = "android")] crate::rendezvous_mediator::RendezvousMediator::restart(); @@ -1040,29 +960,7 @@ pub fn main_get_options_sync() -> SyncReturn { } pub fn main_set_options(json: String) { - let mut map: HashMap = serde_json::from_str(&json).unwrap_or(HashMap::new()); - #[cfg(target_os = "android")] - { - let allow_perm_change_in_accept_window = config::option2bool( - config::keys::OPTION_ENABLE_PERM_CHANGE_IN_ACCEPT_WINDOW, - &crate::get_builtin_option(config::keys::OPTION_ENABLE_PERM_CHANGE_IN_ACCEPT_WINDOW), - ); - if !allow_perm_change_in_accept_window && crate::ui_cm_interface::has_active_clients() { - for key in [ - config::keys::OPTION_ENABLE_CLIPBOARD, - config::keys::OPTION_ENABLE_FILE_TRANSFER, - config::keys::OPTION_ENABLE_AUDIO, - ] { - if let Some(value) = map.remove(key) { - log::info!( - "blocked main_set_options item by policy, key={}, value={}", - key, - value - ); - } - } - } - } + let map: HashMap = serde_json::from_str(&json).unwrap_or(HashMap::new()); if !map.is_empty() { set_options(map) } @@ -1153,10 +1051,6 @@ pub fn main_get_api_server() -> String { get_api_server() } -pub fn main_resolve_avatar_url(avatar: String) -> SyncReturn { - SyncReturn(resolve_avatar_url(avatar)) -} - pub fn main_http_request(url: String, method: String, body: Option, header: String) { http_request(url, method, body, header) } @@ -1173,35 +1067,6 @@ pub fn main_get_env(key: String) -> SyncReturn { SyncReturn(std::env::var(key).unwrap_or_default()) } -// Dart does not support changing environment variables. -// `Platform.environment['MY_VAR'] = 'VAR';` will throw an error -// `Unsupported operation: Cannot modify unmodifiable map`. -// -// And we need to share the environment variables between rust and dart isolates sometimes. -pub fn main_set_env(key: String, value: Option) -> SyncReturn<()> { - let is_valid_key = !key.is_empty() && !key.contains('=') && !key.contains('\0'); - debug_assert!(is_valid_key, "Invalid environment variable key: {}", key); - if !is_valid_key { - log::error!("Invalid environment variable key: {}", key); - return SyncReturn(()); - } - - match value { - Some(v) => { - let is_valid_value = !v.contains('\0'); - debug_assert!(is_valid_value, "Invalid environment variable value: {}", v); - if !is_valid_value { - log::error!("Invalid environment variable value: {}", v); - return SyncReturn(()); - } - std::env::set_var(key, v); - } - None => std::env::remove_var(key), - } - - SyncReturn(()) -} - pub fn main_set_local_option(key: String, value: String) { let is_texture_render_key = key.eq(config::keys::OPTION_TEXTURE_RENDER); let is_d3d_render_key = key.eq(config::keys::OPTION_ALLOW_D3D_RENDER); @@ -1271,66 +1136,6 @@ pub fn main_set_input_source(session_id: SessionID, value: String) { } } -/// Set cursor position (for pointer lock re-centering). -/// -/// # Returns -/// - `true`: cursor position was successfully set -/// - `false`: operation failed or not supported -/// -/// # Platform behavior -/// - Windows/macOS/Linux: attempts to move the cursor to (x, y) -/// - Android/iOS: no-op, always returns `false` -pub fn main_set_cursor_position(x: i32, y: i32) -> SyncReturn { - #[cfg(not(any(target_os = "android", target_os = "ios")))] - { - SyncReturn(crate::set_cursor_pos(x, y)) - } - #[cfg(any(target_os = "android", target_os = "ios"))] - { - let _ = (x, y); - SyncReturn(false) - } -} - -/// Clip cursor to a rectangle (for pointer lock). -/// -/// When `enable` is true, the cursor is clipped to the rectangle defined by -/// `left`, `top`, `right`, `bottom`. When `enable` is false, the rectangle -/// values are ignored and the cursor is unclipped. -/// -/// # Returns -/// - `true`: operation succeeded or no-op completed -/// - `false`: operation failed -/// -/// # Platform behavior -/// - Windows: uses ClipCursor API to confine cursor to the specified rectangle -/// - macOS: uses CGAssociateMouseAndMouseCursorPosition for pointer lock effect; -/// the rect coordinates are ignored (only Some/None matters) -/// - Linux: no-op, always returns `true`; use pointer warping for similar effect -/// - Android/iOS: no-op, always returns `false` -pub fn main_clip_cursor( - left: i32, - top: i32, - right: i32, - bottom: i32, - enable: bool, -) -> SyncReturn { - #[cfg(not(any(target_os = "android", target_os = "ios")))] - { - let rect = if enable { - Some((left, top, right, bottom)) - } else { - None - }; - SyncReturn(crate::clip_cursor(rect)) - } - #[cfg(any(target_os = "android", target_os = "ios"))] - { - let _ = (left, top, right, bottom, enable); - SyncReturn(false) - } -} - pub fn main_get_my_id() -> String { get_id() } @@ -1580,7 +1385,20 @@ pub fn main_handle_relay_id(id: String) -> String { } pub fn main_is_option_fixed(key: String) -> SyncReturn { - SyncReturn(is_option_fixed(&key)) + SyncReturn( + config::OVERWRITE_DISPLAY_SETTINGS + .read() + .unwrap() + .contains_key(&key) + || config::OVERWRITE_LOCAL_SETTINGS + .read() + .unwrap() + .contains_key(&key) + || config::OVERWRITE_SETTINGS + .read() + .unwrap() + .contains_key(&key), + ) } pub fn main_get_main_display() -> SyncReturn { @@ -1589,45 +1407,19 @@ pub fn main_get_main_display() -> SyncReturn { #[cfg(not(target_os = "ios"))] let mut display_info = "".to_owned(); #[cfg(not(target_os = "ios"))] - { - #[cfg(not(target_os = "linux"))] - let is_linux_wayland = false; - #[cfg(target_os = "linux")] - let is_linux_wayland = !is_x11(); - - if !is_linux_wayland { - if let Ok(displays) = crate::display_service::try_get_displays() { - // to-do: Need to detect current display index. - if let Some(display) = displays.iter().next() { - display_info = serde_json::to_string(&HashMap::from([ - ("w", display.width()), - ("h", display.height()), - ])) - .unwrap_or_default(); - } - } - } - - #[cfg(target_os = "linux")] - if is_linux_wayland { - let displays = scrap::wayland::display::get_displays(); - if let Some(display) = displays.displays.get(displays.primary) { - let logical_size = display - .logical_size - .unwrap_or((display.width, display.height)); - display_info = serde_json::to_string(&HashMap::from([ - ("w", logical_size.0), - ("h", logical_size.1), - ])) - .unwrap_or_default(); - } + if let Ok(displays) = crate::display_service::try_get_displays() { + // to-do: Need to detect current display index. + if let Some(display) = displays.iter().next() { + display_info = serde_json::to_string(&HashMap::from([ + ("w", display.width()), + ("h", display.height()), + ])) + .unwrap_or_default(); } } SyncReturn(display_info) } -// No need to check if is on Wayland in this function. -// The Flutter side gets display information on Wayland using a different method. pub fn main_get_displays() -> SyncReturn { #[cfg(target_os = "ios")] let display_info = "".to_owned(); @@ -1745,8 +1537,8 @@ pub fn main_get_temporary_password() -> String { ui_interface::temporary_password() } -pub fn main_set_permanent_password_with_result(password: String) -> bool { - ui_interface::set_permanent_password_with_result(password) +pub fn main_get_permanent_password() -> String { + ui_interface::permanent_password() } pub fn main_get_fingerprint() -> String { @@ -1864,99 +1656,8 @@ pub fn session_send_pointer(session_id: SessionID, msg: String) { super::flutter::session_send_pointer(session_id, msg); } -/// Send mouse event from Flutter to the remote peer. -/// -/// # Relative Mouse Mode Message Contract -/// -/// When the message contains a `relative_mouse_mode` field, this function validates -/// and filters activation/deactivation markers. -/// -/// **Mode Authority:** -/// The Flutter InputModel is authoritative for relative mouse mode activation/deactivation. -/// The server (via `input_service.rs`) only consumes forwarded delta movements and tracks -/// relative movement processing state, but does NOT control mode activation/deactivation. -/// -/// **Deactivation Markers are Local-Only:** -/// Deactivation markers (`relative_mouse_mode: "0"`) are NEVER forwarded to the server. -/// They are handled entirely on the client side to reset local UI state (cursor visibility, -/// pointer lock, etc.). The server does not rely on deactivation markers and should not -/// expect to receive them. -/// -/// **Contract (Flutter side MUST adhere to):** -/// 1. `relative_mouse_mode` field is ONLY present on activation/deactivation marker messages, -/// NEVER on normal pointer events (move, button, scroll). -/// 2. Deactivation marker: `{"relative_mouse_mode": "0"}` - local-only, never forwarded. -/// 3. Activation marker: `{"relative_mouse_mode": "1", "type": "move_relative", "x": "0", "y": "0"}` -/// - MUST use `type="move_relative"` with `x="0"` and `y="0"` (safe no-op). -/// - Any other combination is dropped to prevent accidental cursor movement. -/// -/// If these assumptions are violated (e.g., `relative_mouse_mode` is added to normal events), -/// legitimate mouse events may be silently dropped by the early-return logic below. pub fn session_send_mouse(session_id: SessionID, msg: String) { if let Ok(m) = serde_json::from_str::>(&msg) { - // Relative mouse mode marker validation (Flutter-only). - // This only validates and filters markers; the server tracks per-connection - // relative-movement processing state but not mode activation/deactivation. - // See doc comment above for the message contract. - if let Some(v) = m.get("relative_mouse_mode") { - let active = matches!(v.as_str(), "1" | "Y" | "on"); - - // Disable marker: local-only, never forwarded to the server. - // The server does not track mode deactivation; it simply stops receiving - // relative move events when the client exits relative mouse mode. - if !active { - #[cfg(not(any(target_os = "android", target_os = "ios")))] - crate::keyboard::set_relative_mouse_mode_state(false); - return; - } - - // Enable marker: validate BEFORE setting state to avoid desync. - // This ensures we only mark as active if the marker will actually be forwarded. - - // Enable marker is allowed to go through only if it's a safe no-op relative move. - // This avoids accidentally moving the remote cursor (e.g. if type/x/y are missing). - let msg_type = m.get("type").map(|t| t.as_str()); - if msg_type != Some("move_relative") { - log::warn!( - "relative_mouse_mode activation marker has invalid type: {:?}, expected 'move_relative'. Dropping.", - msg_type - ); - return; - } - let x_marker = m - .get("x") - .map(|x| x.parse::().unwrap_or(0)) - .unwrap_or(0); - let y_marker = m - .get("y") - .map(|y| y.parse::().unwrap_or(0)) - .unwrap_or(0); - if x_marker != 0 || y_marker != 0 { - log::warn!( - "relative_mouse_mode activation marker has non-zero coordinates: x={}, y={}. Dropping.", - x_marker, y_marker - ); - return; - } - - // Guard against unexpected fields that could turn this no-op into a real event. - if m.contains_key("buttons") - || m.contains_key("alt") - || m.contains_key("ctrl") - || m.contains_key("shift") - || m.contains_key("command") - { - log::warn!( - "relative_mouse_mode activation marker contains unexpected fields (buttons/alt/ctrl/shift/command). Dropping." - ); - return; - } - - // All validation passed - marker will be forwarded as a no-op relative move. - #[cfg(not(any(target_os = "android", target_os = "ios")))] - crate::keyboard::set_relative_mouse_mode_state(true); - } - let alt = m.get("alt").is_some(); let ctrl = m.get("ctrl").is_some(); let shift = m.get("shift").is_some(); @@ -1976,7 +1677,6 @@ pub fn session_send_mouse(session_id: SessionID, msg: String) { "up" => MOUSE_TYPE_UP, "wheel" => MOUSE_TYPE_WHEEL, "trackpad" => MOUSE_TYPE_TRACKPAD, - "move_relative" => MOUSE_TYPE_MOVE_RELATIVE, _ => 0, }; } @@ -2017,36 +1717,6 @@ pub fn session_send_note(session_id: SessionID, note: String) { } } -pub fn session_get_last_audit_note(session_id: SessionID) -> SyncReturn { - if let Some(session) = sessions::get_session_by_session_id(&session_id) { - SyncReturn(session.last_audit_note.lock().unwrap().clone()) - } else { - SyncReturn("".to_owned()) - } -} - -pub fn session_set_audit_guid(session_id: SessionID, guid: String) { - if let Some(session) = sessions::get_session_by_session_id(&session_id) { - *session.audit_guid.lock().unwrap() = guid; - } -} - -pub fn session_get_audit_guid(session_id: SessionID) -> SyncReturn { - if let Some(session) = sessions::get_session_by_session_id(&session_id) { - SyncReturn(session.audit_guid.lock().unwrap().clone()) - } else { - SyncReturn("".to_owned()) - } -} - -pub fn session_get_conn_session_id(session_id: SessionID) -> SyncReturn { - if let Some(session) = sessions::get_session_by_session_id(&session_id) { - SyncReturn(session.lc.read().unwrap().session_id.to_string()) - } else { - SyncReturn("".to_owned()) - } -} - pub fn session_alternative_codecs(session_id: SessionID) -> String { if let Some(session) = sessions::get_session_by_session_id(&session_id) { let (vp8, av1, h264, h265) = session.alternative_codecs(); @@ -2093,8 +1763,7 @@ pub fn main_set_home_dir(_home: String) { } // This is a temporary method to get data dir for ios -pub fn main_get_data_dir_ios(app_dir: String) -> SyncReturn { - *config::APP_DIR.write().unwrap() = app_dir; +pub fn main_get_data_dir_ios() -> SyncReturn { let data_dir = config::Config::path("data"); if !data_dir.exists() { if let Err(e) = std::fs::create_dir_all(&data_dir) { @@ -2124,6 +1793,10 @@ pub fn main_update_temporary_password() { update_temporary_password(); } +pub fn main_set_permanent_password(password: String) { + set_permanent_password(password); +} + pub fn main_check_super_user_permission() -> bool { check_super_user_permission() } @@ -2213,7 +1886,7 @@ pub fn cm_elevate_portable(conn_id: i32) { } pub fn cm_switch_back(conn_id: i32) { - #[cfg(not(any(target_os = "android", target_os = "ios")))] + #[cfg(not(any(target_os = "ios")))] crate::ui_cm_interface::switch_back(conn_id); } @@ -2471,23 +2144,16 @@ pub fn is_disable_installation() -> SyncReturn { } pub fn is_preset_password() -> bool { - let hard = config::HARD_SETTINGS + config::HARD_SETTINGS .read() .unwrap() .get("password") - .cloned() - .unwrap_or_default(); - if hard.is_empty() { - return false; - } - - // On desktop, service owns the authoritative config; query it via IPC and return only a boolean. - #[cfg(not(any(target_os = "android", target_os = "ios")))] - return crate::ipc::is_permanent_password_preset(); - - // On mobile, we have no service IPC; verify against local storage. - #[cfg(any(target_os = "android", target_os = "ios"))] - return config::Config::matches_permanent_password_plain(&hard); + .map_or(false, |p| { + #[cfg(not(any(target_os = "android", target_os = "ios")))] + return p == &crate::ipc::get_permanent_password(); + #[cfg(any(target_os = "android", target_os = "ios"))] + return p == &config::Config::get_permanent_password(); + }) } // Don't call this function for desktop version. @@ -2811,22 +2477,6 @@ pub fn main_get_common(key: String) -> String { return false.to_string(); } else if key == "transfer-job-id" { return hbb_common::fs::get_next_job_id().to_string(); - } else if key == "is-remote-modify-enabled-by-control-permissions" { - return match is_remote_modify_enabled_by_control_permissions() { - Some(true) => "true", - Some(false) => "false", - None => "", - } - .to_string(); - } else if key == "has-gnome-shortcuts-inhibitor-permission" { - #[cfg(target_os = "linux")] - return crate::platform::linux::has_gnome_shortcuts_inhibitor_permission().to_string(); - #[cfg(not(target_os = "linux"))] - return false.to_string(); - } else if key == "permanent-password-set" { - return ui_interface::is_permanent_password_set().to_string(); - } else if key == "local-permanent-password-set" { - return ui_interface::is_local_permanent_password_set().to_string(); } else { if key.starts_with("download-data-") { let id = key.replace("download-data-", ""); @@ -2839,13 +2489,10 @@ pub fn main_get_common(key: String) -> String { } else if key.starts_with("download-file-") { let _version = key.replace("download-file-", ""); #[cfg(target_os = "windows")] - return match ( - crate::platform::windows::is_msi_installed(), - crate::common::is_custom_client(), - ) { - (Ok(true), false) => format!("rustdesk-{_version}-x86_64.msi"), - (Ok(true), true) | (Ok(false), _) => format!("rustdesk-{_version}-x86_64.exe"), - (Err(e), _) => { + return match crate::platform::windows::is_msi_installed() { + Ok(true) => format!("rustdesk-{_version}-x86_64.msi"), + Ok(false) => format!("rustdesk-{_version}-x86_64.exe"), + Err(e) => { log::error!("Failed to check if is msi: {}", e); format!("error:update-failed-check-msi-tip") } @@ -2936,38 +2583,36 @@ pub fn main_set_common(_key: String, _value: String) { } else if _key == "update-me" { if let Some(new_version_file) = get_download_file_from_url(&_value) { log::debug!( - "New version file is downloaded, update begin, {:?}", + "New version file is downloaed, update begin, {:?}", new_version_file.to_str() ); if let Some(f) = new_version_file.to_str() { // 1.4.0 does not support "--update" // But we can assume that the new version supports it. - - #[cfg(any(target_os = "windows", target_os = "macos"))] + #[cfg(target_os = "windows")] + if f.ends_with(".exe") { + if let Err(e) = + crate::platform::run_exe_in_cur_session(f, vec!["--update"], false) + { + log::error!("Failed to run the update exe: {}", e); + } + } else if f.ends_with(".msi") { + if let Err(e) = crate::platform::update_me_msi(f, false) { + log::error!("Failed to run the update msi: {}", e); + } + } else { + // unreachable!() + } + #[cfg(target_os = "macos")] match crate::platform::update_to(f) { Ok(_) => { - log::info!("Update process is launched successfully!"); + log::info!("Update successfully!"); } Err(e) => { log::error!("Failed to update to new version, {}", e); - fs::remove_file(f).ok(); } } - } - } - } else if _key == "extract-update-dmg" { - #[cfg(target_os = "macos")] - { - if let Some(new_version_file) = get_download_file_from_url(&_value) { - if let Some(f) = new_version_file.to_str() { - crate::platform::macos::extract_update_dmg(f); - } else { - // unreachable!() - log::error!("Failed to get the new version file path"); - } - } else { - // unreachable!() - log::error!("Failed to get the new version file from url: {}", _value); + fs::remove_file(f).ok(); } } } @@ -2978,29 +2623,6 @@ pub fn main_set_common(_key: String, _value: String) { } else if _key == "cancel-downloader" { crate::hbbs_http::downloader::cancel(&_value); } - - #[cfg(target_os = "linux")] - if _key == "clear-gnome-shortcuts-inhibitor-permission" { - std::thread::spawn(move || { - let (success, msg) = - match crate::platform::linux::clear_gnome_shortcuts_inhibitor_permission() { - Ok(_) => (true, "".to_owned()), - Err(e) => (false, e.to_string()), - }; - let data = HashMap::from([ - ( - "name", - serde_json::json!("clear-gnome-shortcuts-inhibitor-permission-res"), - ), - ("success", serde_json::json!(success)), - ("msg", serde_json::json!(msg)), - ]); - let _res = flutter::push_global_event( - flutter::APP_TYPE_MAIN, - serde_json::ser::to_string(&data).unwrap_or("".to_owned()), - ); - }); - } } pub fn session_get_common_sync( @@ -3011,11 +2633,7 @@ pub fn session_get_common_sync( SyncReturn(session_get_common(session_id, key, param)) } -pub fn session_get_common( - session_id: SessionID, - key: String, - #[allow(unused_variables)] param: String, -) -> Option { +pub fn session_get_common(session_id: SessionID, key: String, param: String) -> Option { if let Some(s) = sessions::get_session_by_session_id(&session_id) { let v = if key == "is_screenshot_supported" { s.is_screenshot_supported().to_string() @@ -3108,22 +2726,6 @@ pub mod server_side { return env.new_string(res).unwrap_or_default().into_raw(); } - #[no_mangle] - pub unsafe extern "system" fn Java_ffi_FFI_getBuildinOption( - env: JNIEnv, - _class: JClass, - key: JString, - ) -> jstring { - let mut env = env; - let res = if let Ok(key) = env.get_string(&key) { - let key: String = key.into(); - super::get_builtin_option(&key) - } else { - "".into() - }; - return env.new_string(res).unwrap_or_default().into_raw(); - } - #[no_mangle] pub unsafe extern "system" fn Java_ffi_FFI_isServiceClipboardEnabled( env: JNIEnv, diff --git a/src/hbbs_http.rs b/src/hbbs_http.rs index 9e4538697..e79534e2c 100644 --- a/src/hbbs_http.rs +++ b/src/hbbs_http.rs @@ -1,17 +1,15 @@ -use hbb_common::ResultType; +use reqwest::blocking::Response; use serde::de::DeserializeOwned; use serde_json::{Map, Value}; #[cfg(feature = "flutter")] pub mod account; -pub mod downloader; mod http_client; pub mod record_upload; pub mod sync; -pub use http_client::{ - create_http_client_async, create_http_client_async_with_url, create_http_client_with_url, - get_url_for_tls, -}; +pub mod downloader; +pub use http_client::create_http_client; +pub use http_client::create_http_client_async; #[derive(Debug)] pub enum HbbHttpResponse { @@ -21,9 +19,11 @@ pub enum HbbHttpResponse { Data(T), } -impl HbbHttpResponse { - pub fn parse(body: &str) -> ResultType { - let map = serde_json::from_str::>(body)?; +impl TryFrom for HbbHttpResponse { + type Error = reqwest::Error; + + fn try_from(resp: Response) -> Result>::Error> { + let map = resp.json::>()?; if let Some(error) = map.get("error") { if let Some(err) = error.as_str() { Ok(Self::Error(err.to_owned())) diff --git a/src/hbbs_http/account.rs b/src/hbbs_http/account.rs index 3f824113b..8d4eb28b1 100644 --- a/src/hbbs_http/account.rs +++ b/src/hbbs_http/account.rs @@ -1,6 +1,7 @@ use super::HbbHttpResponse; -use crate::hbbs_http::create_http_client_with_url; +use crate::hbbs_http::create_http_client; use hbb_common::{config::LocalConfig, log, ResultType}; +use reqwest::blocking::Client; use serde_derive::{Deserialize, Serialize}; use serde_repr::{Deserialize_repr, Serialize_repr}; use std::{ @@ -16,7 +17,6 @@ lazy_static::lazy_static! { const QUERY_INTERVAL_SECS: f32 = 1.0; const QUERY_TIMEOUT_SECS: u64 = 60 * 3; - const REQUESTING_ACCOUNT_AUTH: &str = "Requesting account auth"; const WAITING_ACCOUNT_AUTH: &str = "Waiting account auth"; const LOGIN_ACCOUNT_AUTH: &str = "Login account auth"; @@ -80,10 +80,6 @@ pub enum UserStatus { pub struct UserPayload { pub name: String, #[serde(default)] - pub display_name: Option, - #[serde(default)] - pub avatar: Option, - #[serde(default)] pub email: Option, #[serde(default)] pub note: Option, @@ -108,7 +104,7 @@ pub struct AuthBody { } pub struct OidcSession { - warmed_api_server: Option, + client: Client, state_msg: &'static str, failed_msg: String, code_url: Option, @@ -135,7 +131,7 @@ impl Default for UserStatus { impl OidcSession { fn new() -> Self { Self { - warmed_api_server: None, + client: create_http_client(), state_msg: REQUESTING_ACCOUNT_AUTH, failed_msg: "".to_owned(), code_url: None, @@ -146,33 +142,25 @@ impl OidcSession { } } - fn ensure_client(api_server: &str) { - let mut write_guard = OIDC_SESSION.write().unwrap(); - if write_guard.warmed_api_server.as_deref() == Some(api_server) { - return; - } - // This URL is used to detect the appropriate TLS implementation for the server. - let login_option_url = format!("{}/api/login-options", api_server); - let _ = create_http_client_with_url(&login_option_url); - write_guard.warmed_api_server = Some(api_server.to_owned()); - } - fn auth( api_server: &str, op: &str, id: &str, uuid: &str, ) -> ResultType> { - Self::ensure_client(api_server); - let body = serde_json::json!({ - "op": op, - "id": id, - "uuid": uuid, - "deviceInfo": crate::ui_interface::get_login_device_info(), - }) - .to_string(); - let resp = crate::post_request_sync(format!("{}/api/oidc/auth", api_server), body, "")?; - HbbHttpResponse::parse(&resp) + Ok(OIDC_SESSION + .read() + .unwrap() + .client + .post(format!("{}/api/oidc/auth", api_server)) + .json(&serde_json::json!({ + "op": op, + "id": id, + "uuid": uuid, + "deviceInfo": crate::ui_interface::get_login_device_info(), + })) + .send()? + .try_into()?) } fn query( @@ -185,20 +173,13 @@ impl OidcSession { &format!("{}/api/oidc/auth-query", api_server), &[("code", code), ("id", id), ("uuid", uuid)], )?; - Self::ensure_client(api_server); - #[derive(Deserialize)] - struct HttpResponseBody { - body: String, - } - - let resp = crate::http_request_sync( - url.to_string(), - "GET".to_owned(), - None, - "{}".to_owned(), - )?; - let resp = serde_json::from_str::(&resp)?; - HbbHttpResponse::parse(&resp.body) + Ok(OIDC_SESSION + .read() + .unwrap() + .client + .get(url) + .send()? + .try_into()?) } fn reset(&mut self) { @@ -270,13 +251,7 @@ impl OidcSession { ); LocalConfig::set_option( "user_info".to_owned(), - serde_json::json!({ - "name": auth_body.user.name, - "display_name": auth_body.user.display_name, - "avatar": auth_body.user.avatar, - "status": auth_body.user.status - }) - .to_string(), + serde_json::json!({ "name": auth_body.user.name, "status": auth_body.user.status }).to_string(), ); } } diff --git a/src/hbbs_http/downloader.rs b/src/hbbs_http/downloader.rs index 573e7e77c..4821b0814 100644 --- a/src/hbbs_http/downloader.rs +++ b/src/hbbs_http/downloader.rs @@ -1,4 +1,4 @@ -use super::create_http_client_async_with_url; +use super::create_http_client_async; use hbb_common::{ bail, lazy_static::lazy_static, @@ -53,25 +53,8 @@ pub fn download_file( auto_del_dur: Option, ) -> ResultType { let id = url.clone(); - // First pass: if a non-error downloader exists for this URL, reuse it. - // If an errored downloader exists, remove it so this call can retry. - let mut stale_path = None; - { - let mut downloaders = DOWNLOADERS.lock().unwrap(); - if let Some(downloader) = downloaders.get(&id) { - if downloader.error.is_none() { - return Ok(id); - } - stale_path = downloader.path.clone(); - downloaders.remove(&id); - } - } - if let Some(p) = stale_path { - if p.exists() { - if let Err(e) = std::fs::remove_file(&p) { - log::warn!("Failed to remove stale download file {}: {}", p.display(), e); - } - } + if DOWNLOADERS.lock().unwrap().contains_key(&id) { + return Ok(id); } if let Some(path) = path.as_ref() { @@ -92,26 +75,8 @@ pub fn download_file( tx_cancel: tx, finished: false, }; - // Second pass (atomic with insert) to avoid race with another concurrent caller. - let mut stale_path_after_check = None; - { - let mut downloaders = DOWNLOADERS.lock().unwrap(); - if let Some(existing) = downloaders.get(&id) { - if existing.error.is_none() { - return Ok(id); - } - stale_path_after_check = existing.path.clone(); - downloaders.remove(&id); - } - downloaders.insert(id.clone(), downloader); - } - if let Some(p) = stale_path_after_check { - if p.exists() { - if let Err(e) = std::fs::remove_file(&p) { - log::warn!("Failed to remove stale download file {}: {}", p.display(), e); - } - } - } + let mut downloaders = DOWNLOADERS.lock().unwrap(); + downloaders.insert(id.clone(), downloader); let id2 = id.clone(); std::thread::spawn( @@ -167,7 +132,7 @@ async fn do_download( auto_del_dur: Option, mut rx_cancel: UnboundedReceiver<()>, ) -> ResultType { - let client = create_http_client_async_with_url(&url).await; + let client = create_http_client_async(); let mut is_all_downloaded = false; tokio::select! { diff --git a/src/hbbs_http/http_client.rs b/src/hbbs_http/http_client.rs index 432e5fa38..8d6f529b7 100644 --- a/src/hbbs_http/http_client.rs +++ b/src/hbbs_http/http_client.rs @@ -1,74 +1,42 @@ -use hbb_common::{ - async_recursion::async_recursion, - config::{Config, Socks5Server}, - log::{self, info}, - proxy::{Proxy, ProxyScheme}, - tls::{ - get_cached_tls_accept_invalid_cert, get_cached_tls_type, is_plain, upsert_tls_cache, - TlsType, - }, -}; -use reqwest::{blocking::Client as SyncClient, Client as AsyncClient}; +use hbb_common::config::Config; +use hbb_common::log::info; +use hbb_common::proxy::{Proxy, ProxyScheme}; +use reqwest::blocking::Client as SyncClient; +use reqwest::Client as AsyncClient; macro_rules! configure_http_client { - ($builder:expr, $tls_type:expr, $danger_accept_invalid_cert:expr, $Client: ty) => {{ + ($builder:expr, $Client: ty) => {{ // https://github.com/rustdesk/rustdesk/issues/11569 // https://docs.rs/reqwest/latest/reqwest/struct.ClientBuilder.html#method.no_proxy let mut builder = $builder.no_proxy(); - - match $tls_type { - TlsType::Plain => {} - TlsType::NativeTls => { - builder = builder.use_native_tls(); - if $danger_accept_invalid_cert { - builder = builder.danger_accept_invalid_certs(true); - } - } - TlsType::Rustls => { - #[cfg(any(target_os = "android", target_os = "ios"))] - match hbb_common::verifier::client_config($danger_accept_invalid_cert) { - Ok(client_config) => { - builder = builder.use_preconfigured_tls(client_config); - } - Err(e) => { - hbb_common::log::error!("Failed to get client config: {}", e); - } - } - #[cfg(not(any(target_os = "android", target_os = "ios")))] - { - builder = builder.use_rustls_tls(); - if $danger_accept_invalid_cert { - builder = builder.danger_accept_invalid_certs(true); - } - } - } - } - let client = if let Some(conf) = Config::get_socks() { let proxy_result = Proxy::from_conf(&conf, None); match proxy_result { Ok(proxy) => { let proxy_setup = match &proxy.intercept { - ProxyScheme::Http { host, .. } => { - reqwest::Proxy::all(format!("http://{}", host)) - } - ProxyScheme::Https { host, .. } => { - reqwest::Proxy::all(format!("https://{}", host)) - } - ProxyScheme::Socks5 { addr, .. } => { - reqwest::Proxy::all(&format!("socks5://{}", addr)) - } + ProxyScheme::Http { host, .. } =>{ reqwest::Proxy::all(format!("http://{}", host))}, + ProxyScheme::Https { host, .. } => {reqwest::Proxy::all(format!("https://{}", host))}, + ProxyScheme::Socks5 { addr, .. } => { reqwest::Proxy::all(&format!("socks5://{}", addr)) } }; match proxy_setup { - Ok(mut p) => { + Ok(p) => { + builder = builder.proxy(p); if let Some(auth) = proxy.intercept.maybe_auth() { - if !auth.username().is_empty() && !auth.password().is_empty() { - p = p.basic_auth(auth.username(), auth.password()); + let basic_auth = + format!("Basic {}", auth.get_basic_authorization()); + if let Ok(auth) = basic_auth.parse() { + builder = builder.default_headers( + vec![( + reqwest::header::PROXY_AUTHORIZATION, + auth, + )] + .into_iter() + .collect(), + ); } } - builder = builder.proxy(p); builder.build().unwrap_or_else(|e| { info!("Failed to create a proxied client: {}", e); <$Client>::new() @@ -96,241 +64,12 @@ macro_rules! configure_http_client { }}; } -pub fn create_http_client(tls_type: TlsType, danger_accept_invalid_cert: bool) -> SyncClient { +pub fn create_http_client() -> SyncClient { let builder = SyncClient::builder(); - configure_http_client!(builder, tls_type, danger_accept_invalid_cert, SyncClient) + configure_http_client!(builder, SyncClient) } -pub fn create_http_client_async( - tls_type: TlsType, - danger_accept_invalid_cert: bool, -) -> AsyncClient { +pub fn create_http_client_async() -> AsyncClient { let builder = AsyncClient::builder(); - configure_http_client!(builder, tls_type, danger_accept_invalid_cert, AsyncClient) -} - -pub fn get_url_for_tls<'a>(url: &'a str, proxy_conf: &'a Option) -> &'a str { - if is_plain(url) { - if let Some(conf) = proxy_conf { - if conf.proxy.starts_with("https://") { - return &conf.proxy; - } - } - } - url -} - -pub fn create_http_client_with_url(url: &str) -> SyncClient { - let proxy_conf = Config::get_socks(); - let tls_url = get_url_for_tls(url, &proxy_conf); - let tls_type = get_cached_tls_type(tls_url); - let is_tls_type_cached = tls_type.is_some(); - let tls_type = tls_type.unwrap_or(TlsType::Rustls); - let tls_danger_accept_invalid_cert = get_cached_tls_accept_invalid_cert(tls_url); - create_http_client_with_url_( - url, - tls_url, - tls_type, - is_tls_type_cached, - tls_danger_accept_invalid_cert, - tls_danger_accept_invalid_cert, - ) -} - -fn create_http_client_with_url_( - url: &str, - tls_url: &str, - tls_type: TlsType, - is_tls_type_cached: bool, - danger_accept_invalid_cert: Option, - original_danger_accept_invalid_cert: Option, -) -> SyncClient { - let mut client = create_http_client(tls_type, danger_accept_invalid_cert.unwrap_or(false)); - if is_tls_type_cached && original_danger_accept_invalid_cert.is_some() { - return client; - } - if let Err(e) = client.head(url).send() { - if e.is_request() { - match (tls_type, is_tls_type_cached, danger_accept_invalid_cert) { - (TlsType::Rustls, _, None) => { - log::warn!( - "Failed to connect to server {} with rustls-tls: {:?}, trying accept invalid cert", - tls_url, - e - ); - client = create_http_client_with_url_( - url, - tls_url, - tls_type, - is_tls_type_cached, - Some(true), - original_danger_accept_invalid_cert, - ); - } - (TlsType::Rustls, false, Some(_)) => { - log::warn!( - "Failed to connect to server {} with rustls-tls: {:?}, trying native-tls", - tls_url, - e - ); - client = create_http_client_with_url_( - url, - tls_url, - TlsType::NativeTls, - is_tls_type_cached, - original_danger_accept_invalid_cert, - original_danger_accept_invalid_cert, - ); - } - (TlsType::NativeTls, _, None) => { - log::warn!( - "Failed to connect to server {} with native-tls: {:?}, trying accept invalid cert", - tls_url, - e - ); - client = create_http_client_with_url_( - url, - tls_url, - tls_type, - is_tls_type_cached, - Some(true), - original_danger_accept_invalid_cert, - ); - } - _ => { - log::error!( - "Failed to connect to server {} with {:?}, err: {:?}.", - tls_url, - tls_type, - e - ); - } - } - } else { - log::warn!( - "Failed to connect to server {} with {:?}, err: {}.", - tls_url, - tls_type, - e - ); - } - } else { - log::info!( - "Successfully connected to server {} with {:?}", - tls_url, - tls_type - ); - upsert_tls_cache( - tls_url, - tls_type, - danger_accept_invalid_cert.unwrap_or(false), - ); - } - client -} - -pub async fn create_http_client_async_with_url(url: &str) -> AsyncClient { - let proxy_conf = Config::get_socks(); - let tls_url = get_url_for_tls(url, &proxy_conf); - let tls_type = get_cached_tls_type(tls_url); - let is_tls_type_cached = tls_type.is_some(); - let tls_type = tls_type.unwrap_or(TlsType::Rustls); - let danger_accept_invalid_cert = get_cached_tls_accept_invalid_cert(tls_url); - create_http_client_async_with_url_( - url, - tls_url, - tls_type, - is_tls_type_cached, - danger_accept_invalid_cert, - danger_accept_invalid_cert, - ) - .await -} - -#[async_recursion] -async fn create_http_client_async_with_url_( - url: &str, - tls_url: &str, - tls_type: TlsType, - is_tls_type_cached: bool, - danger_accept_invalid_cert: Option, - original_danger_accept_invalid_cert: Option, -) -> AsyncClient { - let mut client = - create_http_client_async(tls_type, danger_accept_invalid_cert.unwrap_or(false)); - if is_tls_type_cached && original_danger_accept_invalid_cert.is_some() { - return client; - } - if let Err(e) = client.head(url).send().await { - match (tls_type, is_tls_type_cached, danger_accept_invalid_cert) { - (TlsType::Rustls, _, None) => { - log::warn!( - "Failed to connect to server {} with rustls-tls: {:?}, trying accept invalid cert", - tls_url, - e - ); - client = create_http_client_async_with_url_( - url, - tls_url, - tls_type, - is_tls_type_cached, - Some(true), - original_danger_accept_invalid_cert, - ) - .await; - } - (TlsType::Rustls, false, Some(_)) => { - log::warn!( - "Failed to connect to server {} with rustls-tls: {:?}, trying native-tls", - tls_url, - e - ); - client = create_http_client_async_with_url_( - url, - tls_url, - TlsType::NativeTls, - is_tls_type_cached, - original_danger_accept_invalid_cert, - original_danger_accept_invalid_cert, - ) - .await; - } - (TlsType::NativeTls, _, None) => { - log::warn!( - "Failed to connect to server {} with native-tls: {:?}, trying accept invalid cert", - tls_url, - e - ); - client = create_http_client_async_with_url_( - url, - tls_url, - tls_type, - is_tls_type_cached, - Some(true), - original_danger_accept_invalid_cert, - ) - .await; - } - _ => { - log::error!( - "Failed to connect to server {} with {:?}, err: {:?}.", - tls_url, - tls_type, - e - ); - } - } - } else { - log::info!( - "Successfully connected to server {} with {:?}", - tls_url, - tls_type - ); - upsert_tls_cache( - tls_url, - tls_type, - danger_accept_invalid_cert.unwrap_or(false), - ); - } - client + configure_http_client!(builder, AsyncClient) } diff --git a/src/hbbs_http/record_upload.rs b/src/hbbs_http/record_upload.rs index ac51d5c32..a25aae42d 100644 --- a/src/hbbs_http/record_upload.rs +++ b/src/hbbs_http/record_upload.rs @@ -1,4 +1,4 @@ -use crate::hbbs_http::create_http_client_with_url; +use crate::hbbs_http::create_http_client; use bytes::Bytes; use hbb_common::{bail, config::Config, lazy_static, log, ResultType}; use reqwest::blocking::{Body, Client}; @@ -25,57 +25,51 @@ pub fn is_enable() -> bool { } pub fn run(rx: Receiver) { - std::thread::spawn(move || { - let api_server = crate::get_api_server( + let mut uploader = RecordUploader { + client: create_http_client(), + api_server: crate::get_api_server( Config::get_option("api-server"), Config::get_option("custom-rendezvous-server"), - ); - // This URL is used for TLS connectivity testing and fallback detection. - let login_option_url = format!("{}/api/login-options", &api_server); - let client = create_http_client_with_url(&login_option_url); - let mut uploader = RecordUploader { - client, - api_server, - filepath: Default::default(), - filename: Default::default(), - upload_size: Default::default(), - running: Default::default(), - last_send: Instant::now(), - }; - loop { - if let Err(e) = match rx.recv() { - Ok(state) => match state { - RecordState::NewFile(filepath) => uploader.handle_new_file(filepath), - RecordState::NewFrame => { - if uploader.running { - uploader.handle_frame(false) - } else { - Ok(()) - } + ), + filepath: Default::default(), + filename: Default::default(), + upload_size: Default::default(), + running: Default::default(), + last_send: Instant::now(), + }; + std::thread::spawn(move || loop { + if let Err(e) = match rx.recv() { + Ok(state) => match state { + RecordState::NewFile(filepath) => uploader.handle_new_file(filepath), + RecordState::NewFrame => { + if uploader.running { + uploader.handle_frame(false) + } else { + Ok(()) } - RecordState::WriteTail => { - if uploader.running { - uploader.handle_tail() - } else { - Ok(()) - } - } - RecordState::RemoveFile => { - if uploader.running { - uploader.handle_remove() - } else { - Ok(()) - } - } - }, - Err(e) => { - log::trace!("upload thread stop: {}", e); - break; } - } { - uploader.running = false; - log::error!("upload stop: {}", e); + RecordState::WriteTail => { + if uploader.running { + uploader.handle_tail() + } else { + Ok(()) + } + } + RecordState::RemoveFile => { + if uploader.running { + uploader.handle_remove() + } else { + Ok(()) + } + } + }, + Err(e) => { + log::trace!("upload thread stop: {}", e); + break; } + } { + uploader.running = false; + log::error!("upload stop: {}", e); } }); } diff --git a/src/hbbs_http/sync.rs b/src/hbbs_http/sync.rs index 1bb61943f..b82464b24 100644 --- a/src/hbbs_http/sync.rs +++ b/src/hbbs_http/sync.rs @@ -140,18 +140,6 @@ async fn start_hbbs_sync_async() { if !ab_tag.is_empty() { v[keys::OPTION_PRESET_ADDRESS_BOOK_TAG] = json!(ab_tag); } - let ab_alias = Config::get_option(keys::OPTION_PRESET_ADDRESS_BOOK_ALIAS); - if !ab_alias.is_empty() { - v[keys::OPTION_PRESET_ADDRESS_BOOK_ALIAS] = json!(ab_alias); - } - let ab_password = Config::get_option(keys::OPTION_PRESET_ADDRESS_BOOK_PASSWORD); - if !ab_password.is_empty() { - v[keys::OPTION_PRESET_ADDRESS_BOOK_PASSWORD] = json!(ab_password); - } - let ab_note = Config::get_option(keys::OPTION_PRESET_ADDRESS_BOOK_NOTE); - if !ab_note.is_empty() { - v[keys::OPTION_PRESET_ADDRESS_BOOK_NOTE] = json!(ab_note); - } let username = get_builtin_option(keys::OPTION_PRESET_USERNAME); if !username.is_empty() { v[keys::OPTION_PRESET_USERNAME] = json!(username); @@ -164,18 +152,6 @@ async fn start_hbbs_sync_async() { if !device_group_name.is_empty() { v[keys::OPTION_PRESET_DEVICE_GROUP_NAME] = json!(device_group_name); } - let device_username = Config::get_option(keys::OPTION_PRESET_DEVICE_USERNAME); - if !device_username.is_empty() { - v["username"] = json!(device_username); - } - let device_name = Config::get_option(keys::OPTION_PRESET_DEVICE_NAME); - if !device_name.is_empty() { - v["hostname"] = json!(device_name); - } - let note = Config::get_option(keys::OPTION_PRESET_NOTE); - if !note.is_empty() { - v[keys::OPTION_PRESET_NOTE] = json!(note); - } let v = v.to_string(); let mut hash = "".to_owned(); if crate::is_public(&url) { @@ -278,7 +254,7 @@ fn heartbeat_url() -> String { Config::get_option("api-server"), Config::get_option("custom-rendezvous-server"), ); - if url.is_empty() || crate::is_public(&url) { + if url.is_empty() || url.contains("rustdesk.com") { return "".to_owned(); } format!("{}/api/heartbeat", url) @@ -286,14 +262,10 @@ fn heartbeat_url() -> String { fn handle_config_options(config_options: HashMap) { let mut options = Config::get_options(); - let default_settings = config::DEFAULT_SETTINGS.read().unwrap().clone(); config_options .iter() .map(|(k, v)| { - // Priority: user config > default advanced options. - // Only when default advanced options are also empty, remove user option (fallback to built-in default); - // otherwise insert an empty value so user config remains present. - if v.is_empty() && default_settings.get(k).map_or("", |v| v).is_empty() { + if v.is_empty() { options.remove(k); } else { options.insert(k.to_string(), v.to_string()); diff --git a/src/ipc.rs b/src/ipc.rs index ffe1b08a5..1ae048162 100644 --- a/src/ipc.rs +++ b/src/ipc.rs @@ -1,24 +1,25 @@ -#[path = "ipc/auth.rs"] -mod ipc_auth; -#[cfg(any(target_os = "linux", target_os = "macos"))] -#[path = "ipc/fs.rs"] -mod ipc_fs; +use crate::{ + common::CheckTestNatType, + privacy_mode::PrivacyModeState, + ui_interface::{get_local_option, set_local_option}, +}; +use bytes::Bytes; +use parity_tokio_ipc::{ + Connection as Conn, ConnectionClient as ConnClient, Endpoint, Incoming, SecurityAttributes, +}; +use serde_derive::{Deserialize, Serialize}; +use std::{ + collections::HashMap, + sync::atomic::{AtomicBool, Ordering}, +}; +#[cfg(not(windows))] +use std::{fs::File, io::prelude::*}; #[cfg(all(feature = "flutter", feature = "plugin_framework"))] #[cfg(not(any(target_os = "android", target_os = "ios")))] use crate::plugin::ipc::Plugin; -use crate::{ - common::{is_server, CheckTestNatType}, - privacy_mode, - privacy_mode::PrivacyModeState, - rendezvous_mediator::RendezvousMediator, - ui_interface::{get_local_option, set_local_option}, -}; -use bytes::Bytes; #[cfg(not(any(target_os = "android", target_os = "ios")))] pub use clipboard::ClipboardFile; -#[cfg(target_os = "linux")] -use hbb_common::anyhow; use hbb_common::{ allow_err, bail, bytes, bytes_codec::BytesCodec, @@ -33,92 +34,13 @@ use hbb_common::{ tokio_util::codec::Framed, ResultType, }; -#[cfg(windows)] -pub(crate) use ipc_auth::authorize_windows_portable_service_ipc_connection; -#[cfg(windows)] -pub(crate) use ipc_auth::ensure_peer_executable_matches_current_by_pid_opt; -#[cfg(windows)] -pub(crate) use ipc_auth::log_rejected_windows_ipc_connection; -#[cfg(any(target_os = "linux", target_os = "macos"))] -use ipc_auth::{active_uid, authorize_service_scoped_ipc_connection}; -#[cfg(windows)] -use ipc_auth::{ - authorize_windows_main_ipc_connection, portable_service_listener_security_attributes, - should_allow_everyone_create_on_windows, -}; -#[cfg(target_os = "linux")] -pub(crate) use ipc_auth::{ - ensure_peer_executable_matches_current_by_fd, is_allowed_service_peer_uid, - log_rejected_uinput_connection, peer_uid_from_fd, -}; -#[cfg(target_os = "linux")] -use ipc_fs::terminal_count_candidate_uids; -#[cfg(any(target_os = "linux", target_os = "macos"))] -use ipc_fs::{ - check_pid, ensure_secure_ipc_parent_dir, scrub_secure_ipc_parent_dir, - should_scrub_parent_entries_after_check_pid, write_pid, -}; -use parity_tokio_ipc::{ - Connection as Conn, ConnectionClient as ConnClient, Endpoint, Incoming, SecurityAttributes, -}; -use serde_derive::{Deserialize, Serialize}; -#[cfg(any(target_os = "linux", target_os = "macos"))] -use std::cell::Cell; -#[cfg(any(target_os = "linux", target_os = "macos"))] -use std::os::unix::fs::PermissionsExt; -use std::{ - collections::HashMap, - sync::atomic::{AtomicBool, Ordering}, -}; + +use crate::{common::is_server, privacy_mode, rendezvous_mediator::RendezvousMediator}; // IPC actions here. pub const IPC_ACTION_CLOSE: &str = "close"; -#[cfg(target_os = "windows")] -const PORTABLE_SERVICE_IPC_HANDSHAKE_TIMEOUT_MS: u64 = 3_000; -#[cfg(target_os = "windows")] -pub(crate) const IPC_TOKEN_LEN: usize = 64; -#[cfg(target_os = "windows")] -const IPC_TOKEN_RANDOM_BYTES: usize = IPC_TOKEN_LEN / 2; -#[cfg(target_os = "windows")] -const _: () = assert!(IPC_TOKEN_LEN % 2 == 0); pub static EXIT_RECV_CLOSE: AtomicBool = AtomicBool::new(true); -#[cfg(any(target_os = "linux", target_os = "macos"))] -thread_local! { - static USE_USER_MAIN_IPC: Cell = Cell::new(false); -} - -#[must_use = "bind this guard to a local variable to keep the IPC scope active"] -/// Thread-local guard for routing root main IPC to the active user on Linux/macOS. -#[cfg(any(target_os = "linux", target_os = "macos"))] -pub(crate) struct UserMainIpcScope { - previous: bool, -} - -#[cfg(any(target_os = "linux", target_os = "macos"))] -impl UserMainIpcScope { - pub(crate) fn new() -> Self { - let previous = USE_USER_MAIN_IPC.with(|use_user_main| { - let previous = use_user_main.get(); - use_user_main.set(true); - previous - }); - Self { previous } - } -} - -#[cfg(any(target_os = "linux", target_os = "macos"))] -impl Drop for UserMainIpcScope { - fn drop(&mut self) { - USE_USER_MAIN_IPC.with(|use_user_main| use_user_main.set(self.previous)); - } -} - -#[inline] -pub async fn connect_service(ms_timeout: u64) -> ResultType> { - connect(ms_timeout, crate::POSTFIX_SERVICE).await -} - #[derive(Debug, Serialize, Deserialize, Clone)] #[serde(tag = "t", content = "c")] pub enum FS { @@ -182,41 +104,12 @@ pub enum FS { file_size: u64, last_modified: u64, is_upload: bool, - is_resume: bool, }, - SendConfirm(Vec), Rename { id: i32, path: String, new_name: String, }, - // CM-side file reading operations (Windows only) - // These enable Connection Manager to read files and stream them back to Connection - ReadFile { - path: String, - id: i32, - file_num: i32, - include_hidden: bool, - conn_id: i32, - overwrite_detection: bool, - }, - CancelRead { - id: i32, - conn_id: i32, - }, - SendConfirmForRead { - id: i32, - file_num: i32, - skip: bool, - offset_blk: u32, - conn_id: i32, - }, - ReadAllFiles { - path: String, - id: i32, - include_hidden: bool, - conn_id: i32, - }, } #[cfg(target_os = "windows")] @@ -281,10 +174,8 @@ pub enum DataControl { pub enum DataPortableService { Ping, Pong, - AuthToken(String), - AuthResult(bool), ConnCount(Option), - Mouse((Vec, i32, String, u32, bool, bool)), + Mouse((Vec, i32)), Pointer((Vec, i32)), Key(Vec), RequestStart, @@ -302,7 +193,6 @@ pub enum Data { is_terminal: bool, peer_id: String, name: String, - avatar: String, authorized: bool, port_forward: String, keyboard: bool, @@ -313,7 +203,6 @@ pub enum Data { restart: bool, recording: bool, block_input: bool, - privacy_mode: bool, from_switch: bool, }, ChatMessage { @@ -349,7 +238,6 @@ pub enum Data { ClipboardNonFile(Option<(String, Vec)>), PrivacyModeState((i32, PrivacyModeState, String)), TestRendezvousServer, - Deployed, #[cfg(not(any(target_os = "android", target_os = "ios")))] Keyboard(DataKeyboard), #[cfg(not(any(target_os = "android", target_os = "ios")))] @@ -362,14 +250,7 @@ pub enum Data { Empty, Disconnected, DataPortableService(DataPortableService), - #[cfg(feature = "flutter")] - #[cfg(not(any(target_os = "android", target_os = "ios")))] SwitchSidesRequest(String), - #[cfg(feature = "flutter")] - #[cfg(not(any(target_os = "android", target_os = "ios")))] - SwitchSidesUuid(String, String, Option), - #[cfg(feature = "flutter")] - #[cfg(not(any(target_os = "android", target_os = "ios")))] SwitchSidesBack, UrlLink(String), VoiceCallIncoming, @@ -385,76 +266,10 @@ pub enum Data { #[cfg(windows)] ControlledSessionCount(usize), CmErr(String), - // CM-side file reading responses (Windows only) - // These are sent from CM back to Connection when CM handles file reading - /// Response to ReadFile: contains initial file list or error - ReadJobInitResult { - id: i32, - file_num: i32, - include_hidden: bool, - conn_id: i32, - /// Serialized protobuf bytes of FileDirectory, or error string - result: Result, String>, - }, - /// File data block read by CM. - /// - /// The actual data is sent separately via `send_raw()` after this message to avoid - /// JSON encoding overhead for large binary data. This mirrors the `WriteBlock` pattern. - /// - /// **Protocol:** - /// - Sender: `send(FileBlockFromCM{...})` then `send_raw(data)` - /// - Receiver: `next()` returns `FileBlockFromCM`, then `next_raw()` returns data bytes - /// - /// **Note on empty data (e.g., empty files):** - /// Empty data is supported. The IPC connection uses `BytesCodec` with `raw=false` (default), - /// which prefixes each frame with a length header. So `send_raw(Bytes::new())` sends a - /// 1-byte frame (length=0), and `next_raw()` correctly returns an empty `BytesMut`. - /// See `libs/hbb_common/src/bytes_codec.rs` test `test_codec2` for verification. - FileBlockFromCM { - id: i32, - file_num: i32, - /// Data is sent separately via `send_raw()` to avoid JSON encoding overhead. - /// This field is skipped during serialization; sender must call `send_raw()` after sending. - /// Receiver must call `next_raw()` and populate this field manually. - #[serde(skip)] - data: bytes::Bytes, - compressed: bool, - conn_id: i32, - }, - /// File read completed successfully - FileReadDone { - id: i32, - file_num: i32, - conn_id: i32, - }, - /// File read failed with error - FileReadError { - id: i32, - file_num: i32, - err: String, - conn_id: i32, - }, - /// Digest info from CM for overwrite detection - FileDigestFromCM { - id: i32, - file_num: i32, - last_modified: u64, - file_size: u64, - is_resume: bool, - conn_id: i32, - }, - /// Response to ReadAllFiles: recursive directory listing - AllFilesResult { - id: i32, - conn_id: i32, - path: String, - /// Serialized protobuf bytes of FileDirectory, or error string - result: Result, String>, - }, CheckHwcodec, #[cfg(feature = "flutter")] VideoConnCount(Option), - // Although the key is not necessary, it is used to avoid hardcoding the key. + // Although the key is not neccessary, it is used to avoid hardcoding the key. WaylandScreencastRestoreToken((String, String)), HwCodecConfig(Option), RemoveTrustedDevices(Vec), @@ -472,11 +287,6 @@ pub enum Data { #[cfg(target_os = "windows")] PortForwardSessionCount(Option), SocksWs(Option, String)>>), - #[cfg(not(any(target_os = "android", target_os = "ios")))] - Whiteboard((String, crate::whiteboard::CustomEvent)), - ControlPermissionsRemoteModify(Option), - #[cfg(target_os = "windows")] - FileTransferEnabledState(Option), } #[tokio::main(flavor = "current_thread")] @@ -488,22 +298,6 @@ pub async fn start(postfix: &str) -> ResultType<()> { Ok(stream) => { let mut stream = Connection::new(stream); let postfix = postfix.to_owned(); - #[cfg(any(target_os = "linux", target_os = "macos"))] - if config::is_service_ipc_postfix(&postfix) { - if !authorize_service_scoped_ipc_connection(&stream, &postfix) { - continue; - } - } - #[cfg(windows)] - if postfix.is_empty() { - // Windows main IPC (`postfix == ""`) is authorized here. - // Other security-sensitive channels use dedicated authorization paths: - // - `_portable_service`: portable-service listener + handshake policy - // - service-scoped postfixes: service-specific listener/authorization - if !authorize_windows_main_ipc_connection(&stream, &postfix) { - continue; - } - } tokio::spawn(async move { loop { match stream.next().await { @@ -512,48 +306,9 @@ pub async fn start(postfix: &str) -> ResultType<()> { break; } Ok(Some(data)) => { - // On Linux/macOS, the protected `_service` channel is used only for - // syncing config between root service and the active user process. - // - // NOTE: `is_service_ipc_postfix()` also includes `_uinput_*`, but those - // channels are handled by the dedicated uinput listener/protocol in - // `src/server/uinput.rs` and therefore do not share this Data enum - // allowlist. The SyncConfig allowlist here is intentionally scoped to the - // `_service` channel only. - // - // Keep this explicit branch to avoid policy drift between `_service` and - // uinput IPC paths while still minimizing exposed message surface here. - #[cfg(any(target_os = "linux", target_os = "macos"))] - if postfix == crate::POSTFIX_SERVICE { - if matches!(&data, Data::SyncConfig(_)) { - handle(data, &mut stream).await; - } else { - log::warn!( - "Rejected non-sync data on protected _service IPC channel: postfix={}, data_kind={:?}, peer_uid={:?}", - postfix, - std::mem::discriminant(&data), - stream.peer_uid() - ); - // Close the connection to avoid keeping a protected channel - // alive while repeatedly receiving invalid traffic. - break; - } - continue; - } handle(data, &mut stream).await; } - Ok(None) => { - // `Ok(None)` means a complete frame arrived but did not - // deserialize into `Data`. Peer close/reset is returned as - // `Err` by `ConnectionTmpl::next()`. Keep the historical - // ignore behavior except on the protected `_service` channel. - #[cfg(any(target_os = "linux", target_os = "macos"))] - { - if postfix == crate::POSTFIX_SERVICE { - break; - } - } - } + _ => {} } } }); @@ -568,77 +323,20 @@ pub async fn start(postfix: &str) -> ResultType<()> { pub async fn new_listener(postfix: &str) -> ResultType { let path = Config::ipc_path(postfix); - #[cfg(any(target_os = "linux", target_os = "macos"))] - let should_scrub_parent_entries = ensure_secure_ipc_parent_dir(&path, postfix)?; - #[cfg(any(target_os = "linux", target_os = "macos"))] - let existing_listener_alive = check_pid(postfix).await; - #[cfg(any(target_os = "linux", target_os = "macos"))] - if should_scrub_parent_entries_after_check_pid( - should_scrub_parent_entries, - existing_listener_alive, - ) { - scrub_secure_ipc_parent_dir(&path, postfix)?; - } + #[cfg(not(any(windows, target_os = "android", target_os = "ios")))] + check_pid(postfix).await; let mut endpoint = Endpoint::new(path.clone()); - let security_attrs = { - #[cfg(windows)] - { - if postfix == "_portable_service" { - portable_service_listener_security_attributes() - } else if should_allow_everyone_create_on_windows(postfix) { - SecurityAttributes::allow_everyone_create() - } else { - Ok(SecurityAttributes::empty()) - } - } - #[cfg(not(windows))] - { - SecurityAttributes::allow_everyone_create() - } - }; - match security_attrs { + match SecurityAttributes::allow_everyone_create() { Ok(attr) => endpoint.set_security_attributes(attr), - Err(err) => { - log::error!("Failed to set ipc{} security: {}", postfix, err); - #[cfg(windows)] - if postfix == "_portable_service" { - // Fail closed for `_portable_service` when SDDL construction fails. - // This endpoint is security-critical and must not start with default ACLs. - return Err(err.into()); - } - } + Err(err) => log::error!("Failed to set ipc{} security: {}", postfix, err), }; match endpoint.incoming() { Ok(incoming) => { - if postfix == crate::POSTFIX_SERVICE { - log::info!("Started protected ipc service server: postfix={}", postfix); - } else { - log::info!("Started ipc{} server at path: {}", postfix, &path); - } - #[cfg(any(target_os = "linux", target_os = "macos"))] + log::info!("Started ipc{} server at path: {}", postfix, &path); + #[cfg(not(windows))] { - // NOTE: On Linux/macOS, some IPC sockets are intentionally world-connectable - // (0666) so the active (non-root) user process can connect. Authorization is - // enforced at accept-time for these channels, and the protected `_service` - // channel is further restricted by an explicit message allowlist (SyncConfig - // only). - let socket_mode = if config::is_service_ipc_postfix(postfix) { - 0o0666 - } else { - 0o0600 - }; - if let Err(err) = - std::fs::set_permissions(&path, std::fs::Permissions::from_mode(socket_mode)) - { - log::error!( - "Failed to set permissions on ipc{} socket at path {}: {}", - postfix, - &path, - err - ); - std::fs::remove_file(&path).ok(); - return Err(err.into()); - } + use std::os::unix::fs::PermissionsExt; + std::fs::set_permissions(&path, std::fs::Permissions::from_mode(0o0777)).ok(); write_pid(postfix); } Ok(incoming) @@ -661,8 +359,6 @@ pub struct CheckIfRestart { audio_input: String, voice_call_input: String, ws: String, - disable_udp: String, - allow_insecure_tls_fallback: String, api_server: String, } @@ -674,31 +370,17 @@ impl CheckIfRestart { audio_input: Config::get_option("audio-input"), voice_call_input: Config::get_option("voice-call-input"), ws: Config::get_option(OPTION_ALLOW_WEBSOCKET), - disable_udp: Config::get_option(config::keys::OPTION_DISABLE_UDP), - allow_insecure_tls_fallback: Config::get_option( - config::keys::OPTION_ALLOW_INSECURE_TLS_FALLBACK, - ), api_server: Config::get_option("api-server"), } } } impl Drop for CheckIfRestart { fn drop(&mut self) { - // If https proxy is used, we need to restart rendezvous mediator. - // No need to check if https proxy is used, because this option does not change frequently - // and restarting mediator is safe even https proxy is not used. - let allow_insecure_tls_fallback_changed = self.allow_insecure_tls_fallback - != Config::get_option(config::keys::OPTION_ALLOW_INSECURE_TLS_FALLBACK); - if allow_insecure_tls_fallback_changed - || self.stop_service != Config::get_option("stop-service") + if self.stop_service != Config::get_option("stop-service") || self.rendezvous_servers != Config::get_rendezvous_servers() || self.ws != Config::get_option(OPTION_ALLOW_WEBSOCKET) - || self.disable_udp != Config::get_option(config::keys::OPTION_DISABLE_UDP) || self.api_server != Config::get_option("api-server") { - if allow_insecure_tls_fallback_changed { - hbb_common::tls::reset_tls_cache(); - } RendezvousMediator::restart(); } if self.audio_input != Config::get_option("audio-input") { @@ -829,29 +511,8 @@ async fn handle(data: Data, stream: &mut Connection) { value = Some(Config::get_id()); } else if name == "temporary-password" { value = Some(password::temporary_password()); - } else if name == "permanent-password-storage-and-salt" { - let (storage, salt) = Config::get_local_permanent_password_storage_and_salt(); - value = Some(storage + "\n" + &salt); - } else if name == "permanent-password-set" { - value = Some(if Config::has_permanent_password() { - "Y".to_owned() - } else { - "N".to_owned() - }); - } else if name == "permanent-password-is-preset" { - let hard = config::HARD_SETTINGS - .read() - .unwrap() - .get("password") - .cloned() - .unwrap_or_default(); - let is_preset = - !hard.is_empty() && Config::matches_permanent_password_plain(&hard); - value = Some(if is_preset { - "Y".to_owned() - } else { - "N".to_owned() - }); + } else if name == "permanent-password" { + value = Some(Config::get_permanent_password()); } else if name == "salt" { value = Some(Config::get_salt()); } else if name == "rendezvous_server" { @@ -887,24 +548,13 @@ async fn handle(data: Data, stream: &mut Connection) { allow_err!(stream.send(&Data::Config((name, value))).await); } Some(value) => { - let mut updated = true; if name == "id" { Config::set_key_confirmed(false); Config::set_id(&value); } else if name == "temporary-password" { password::update_temporary_password(); } else if name == "permanent-password" { - if Config::is_disable_change_permanent_password() { - log::warn!("Changing permanent password is disabled"); - updated = false; - } else { - Config::set_permanent_password(&value); - } - // Explicitly ACK/NACK permanent-password writes. This allows UIs/FFI to - // distinguish "accepted by daemon" vs "IPC send succeeded" without - // reading back any secret. - let ack = if updated { "Y" } else { "N" }.to_owned(); - allow_err!(stream.send(&Data::Config((name.clone(), Some(ack)))).await); + Config::set_permanent_password(&value); } else if name == "salt" { Config::set_salt(&value); } else if name == "voice-call-input" { @@ -914,9 +564,7 @@ async fn handle(data: Data, stream: &mut Connection) { } else { return; } - if updated { - log::info!("{} updated", name); - } + log::info!("{} updated", name); } }, Data::Options(value) => match value { @@ -967,12 +615,6 @@ async fn handle(data: Data, stream: &mut Connection) { Data::TestRendezvousServer => { crate::test_rendezvous_server(); } - Data::Deployed => { - crate::rendezvous_mediator::NEEDS_DEPLOY.store(false, Ordering::SeqCst); - crate::rendezvous_mediator::RendezvousMediator::restart(); - } - #[cfg(feature = "flutter")] - #[cfg(not(any(target_os = "android", target_os = "ios")))] Data::SwitchSidesRequest(id) => { let uuid = uuid::Uuid::new_v4(); crate::server::insert_switch_sides_uuid(id, uuid.clone()); @@ -982,19 +624,6 @@ async fn handle(data: Data, stream: &mut Connection) { .await ); } - #[cfg(feature = "flutter")] - #[cfg(not(any(target_os = "android", target_os = "ios")))] - Data::SwitchSidesUuid(uuid, id, None) => { - let allowed = uuid - .parse::() - .map(|uuid| crate::server::remove_pending_switch_sides_uuid(&id, &uuid)) - .unwrap_or(false); - allow_err!( - stream - .send(&Data::SwitchSidesUuid(uuid, id, Some(allowed))) - .await - ); - } #[cfg(all(feature = "flutter", feature = "plugin_framework"))] #[cfg(not(any(target_os = "android", target_os = "ios")))] Data::Plugin(plugin) => crate::plugin::ipc::handle_plugin(plugin, stream).await, @@ -1120,236 +749,14 @@ async fn handle(data: Data, stream: &mut Connection) { // Port forward session count is only a get value. } }, - Data::ControlPermissionsRemoteModify(_) => { - use hbb_common::rendezvous_proto::control_permissions::Permission; - let state = - crate::server::get_control_permission_state(Permission::remote_modify, true); - allow_err!( - stream - .send(&Data::ControlPermissionsRemoteModify(state)) - .await - ); - } - #[cfg(target_os = "windows")] - Data::FileTransferEnabledState(_) => { - use hbb_common::rendezvous_proto::control_permissions::Permission; - let state = crate::server::get_control_permission_state(Permission::file, false); - let enabled = state.unwrap_or_else(|| { - crate::server::Connection::is_permission_enabled_locally( - config::keys::OPTION_ENABLE_FILE_TRANSFER, - ) - }); - allow_err!( - stream - .send(&Data::FileTransferEnabledState(Some(enabled))) - .await - ); - } - _ => {} - }; -} - -#[cfg(target_os = "windows")] -pub(crate) fn generate_one_time_ipc_token() -> ResultType { - use hbb_common::rand::{rngs::OsRng, RngCore as _}; - use std::fmt::Write as _; - - let mut random_bytes = [0u8; IPC_TOKEN_RANDOM_BYTES]; - let mut rng = OsRng; - rng.try_fill_bytes(&mut random_bytes).map_err(|err| { - hbb_common::anyhow::anyhow!( - "failed to generate portable service ipc token from OsRng: {}", - err - ) - })?; - - let mut token = String::with_capacity(IPC_TOKEN_LEN); - for byte in random_bytes { - let _ = write!(token, "{:02x}", byte); - } - Ok(token) -} - -#[cfg(target_os = "windows")] -pub(crate) fn constant_time_ipc_token_eq(expected: &str, candidate: &str) -> bool { - if expected.len() != IPC_TOKEN_LEN || candidate.len() != IPC_TOKEN_LEN { - return false; - } - expected - .as_bytes() - .iter() - .zip(candidate.as_bytes().iter()) - .fold(0u8, |diff, (left, right)| diff | (*left ^ *right)) - == 0 -} - -#[cfg(target_os = "windows")] -pub(crate) async fn portable_service_ipc_handshake_as_client( - stream: &mut ConnectionTmpl, - token: &str, -) -> ResultType<()> -where - T: AsyncRead + AsyncWrite + std::marker::Unpin, -{ - stream - .send(&Data::DataPortableService(DataPortableService::AuthToken( - token.to_owned(), - ))) - .await?; - match stream - .next_timeout(PORTABLE_SERVICE_IPC_HANDSHAKE_TIMEOUT_MS) - .await? - { - Some(Data::DataPortableService(DataPortableService::AuthResult(true))) => Ok(()), - Some(Data::DataPortableService(DataPortableService::AuthResult(false))) => { - bail!("portable service ipc handshake was rejected by server") - } - Some(_) | None => bail!("portable service ipc handshake returned an unexpected response"), - } -} - -#[cfg(target_os = "windows")] -pub(crate) async fn portable_service_ipc_handshake_as_server( - stream: &mut ConnectionTmpl, - mut validate_token: F, -) -> ResultType<()> -where - T: AsyncRead + AsyncWrite + std::marker::Unpin, - // Token validators must use `constant_time_ipc_token_eq` or an equivalent - // fixed-length comparison; this handshake is part of the privilege boundary. - F: FnMut(&str) -> bool, -{ - let authorized = match stream - .next_timeout(PORTABLE_SERVICE_IPC_HANDSHAKE_TIMEOUT_MS) - .await? - { - Some(Data::DataPortableService(DataPortableService::AuthToken(token))) => { - validate_token(&token) - } - Some(_) | None => false, - }; - stream - .send(&Data::DataPortableService(DataPortableService::AuthResult( - authorized, - ))) - .await?; - if !authorized { - bail!("portable service ipc handshake failed") - } - Ok(()) -} - -#[inline] -async fn connect_with_path(ms_timeout: u64, path: &str) -> ResultType> { - let client = timeout(ms_timeout, Endpoint::connect(path)).await??; - Ok(ConnectionTmpl::new(client)) -} - -#[cfg(any(target_os = "linux", target_os = "macos"))] -#[inline] -fn select_server_uid_for_user_main_ipc( - server_uids: &[u32], - active_uid: Option, - prefer_root: bool, -) -> ResultType { - let mut server_uids = server_uids.to_vec(); - server_uids.sort_unstable(); - server_uids.dedup(); - - match server_uids.as_slice() { - [] => { - if let Some(uid) = active_uid { - // If no `--server` processes are found but the active user is identifiable, - // try the active user anyway because the main process may also listen on "" IPC. - return Ok(uid); - } else { - bail!("No --server process found for user main IPC") - } - } - [uid] => return Ok(*uid), _ => {} } - - if prefer_root && server_uids.contains(&0) { - return Ok(0); - } - if let Some(active_uid) = active_uid.filter(|uid| server_uids.contains(uid)) { - return Ok(active_uid); - } - bail!("Multiple --server processes found for user main IPC"); -} - -#[cfg(any(target_os = "linux", target_os = "macos"))] -fn running_server_uids_for_current_exe() -> ResultType> { - let current_exe = std::env::current_exe()?; - let current_exe_path = std::fs::canonicalize(¤t_exe)?; - let current_pid = hbb_common::sysinfo::Pid::from_u32(std::process::id()); - let mut sys = hbb_common::sysinfo::System::new(); - sys.refresh_processes(); - let mut server_uids = Vec::new(); - for process in sys.processes().values() { - if process.pid() == current_pid { - continue; - } - if process.cmd().get(1).map_or(true, |arg| arg != "--server") { - continue; - } - let Ok(process_path) = std::fs::canonicalize(process.exe()) else { - continue; - }; - if process_path != current_exe_path { - continue; - } - let Some(uid) = process.user_id().map(|uid| **uid as u32) else { - // Root CLI management commands need a stable matching `--server` target. - // If this key process races during enumeration, failing the command is clearer - // than silently skipping it; `--server` is not expected to exit frequently. - bail!("Failed to read --server process uid"); - }; - server_uids.push(uid); - } - Ok(server_uids) -} - -#[cfg(any(target_os = "linux", target_os = "macos"))] -fn user_main_ipc_server_uid() -> ResultType { - let server_uids = running_server_uids_for_current_exe()?; - #[cfg(target_os = "linux")] - let prefer_root = crate::platform::linux::is_login_screen_wayland(); - #[cfg(target_os = "macos")] - let prefer_root = false; - select_server_uid_for_user_main_ipc(&server_uids, active_uid(), prefer_root) } pub async fn connect(ms_timeout: u64, postfix: &str) -> ResultType> { - #[cfg(any(target_os = "linux", target_os = "macos"))] - { - let use_user_main_ipc = USE_USER_MAIN_IPC.with(|use_user_main| use_user_main.get()); - let is_root_main_ipc = - unsafe { hbb_common::libc::geteuid() == 0 } && postfix.is_empty() && use_user_main_ipc; - if is_root_main_ipc { - let uid = user_main_ipc_server_uid()?; - let path = Config::ipc_path_for_uid(uid, postfix); - return connect_with_path(ms_timeout, &path).await; - } - let path = Config::ipc_path(postfix); - return connect_with_path(ms_timeout, &path).await; - } - #[cfg(not(any(target_os = "linux", target_os = "macos")))] - { - let path = Config::ipc_path(postfix); - connect_with_path(ms_timeout, &path).await - } -} - -#[cfg(target_os = "linux")] -pub async fn connect_for_uid( - ms_timeout: u64, - uid: u32, - postfix: &str, -) -> ResultType> { - let path = Config::ipc_path_for_uid(uid, postfix); - connect_with_path(ms_timeout, &path).await + let path = Config::ipc_path(postfix); + let client = timeout(ms_timeout, Endpoint::connect(&path)).await??; + Ok(ConnectionTmpl::new(client)) } #[cfg(target_os = "linux")] @@ -1429,6 +836,54 @@ pub async fn start_pa() { } } +#[inline] +#[cfg(not(windows))] +fn get_pid_file(postfix: &str) -> String { + let path = Config::ipc_path(postfix); + format!("{}.pid", path) +} + +#[cfg(not(any(windows, target_os = "android", target_os = "ios")))] +async fn check_pid(postfix: &str) { + let pid_file = get_pid_file(postfix); + if let Ok(mut file) = File::open(&pid_file) { + let mut content = String::new(); + file.read_to_string(&mut content).ok(); + let pid = content.parse::().unwrap_or(0); + if pid > 0 { + use hbb_common::sysinfo::System; + let mut sys = System::new(); + sys.refresh_processes(); + if let Some(p) = sys.process(pid.into()) { + if let Some(current) = sys.process((std::process::id() as usize).into()) { + if current.name() == p.name() { + // double check with connect + if connect(1000, postfix).await.is_ok() { + return; + } + } + } + } + } + } + // if not remove old ipc file, the new ipc creation will fail + // if we remove a ipc file, but the old ipc process is still running, + // new connection to the ipc will connect to new ipc, old connection to old ipc still keep alive + std::fs::remove_file(&Config::ipc_path(postfix)).ok(); +} + +#[inline] +#[cfg(not(windows))] +fn write_pid(postfix: &str) { + let path = get_pid_file(postfix); + if let Ok(mut file) = File::create(&path) { + use std::os::unix::fs::PermissionsExt; + std::fs::set_permissions(&path, std::fs::Permissions::from_mode(0o0777)).ok(); + file.write_all(&std::process::id().to_string().into_bytes()) + .ok(); + } +} + pub struct ConnectionTmpl { inner: Framed, } @@ -1542,57 +997,13 @@ pub fn update_temporary_password() -> ResultType<()> { set_config("temporary-password", "".to_owned()) } -fn apply_permanent_password_storage_and_salt_payload(payload: Option<&str>) -> ResultType<()> { - let Some(payload) = payload else { - return Ok(()); - }; - let Some((storage, salt)) = payload.split_once('\n') else { - bail!("Invalid permanent-password-storage-and-salt payload"); - }; - - if storage.is_empty() { - Config::set_permanent_password_storage_for_sync("", "")?; - return Ok(()); +pub fn get_permanent_password() -> String { + if let Ok(Some(v)) = get_config("permanent-password") { + Config::set_permanent_password(&v); + v + } else { + Config::get_permanent_password() } - - Config::set_permanent_password_storage_for_sync(storage, salt)?; - Ok(()) -} - -pub fn sync_permanent_password_storage_from_daemon() -> ResultType<()> { - let v = get_config("permanent-password-storage-and-salt")?; - apply_permanent_password_storage_and_salt_payload(v.as_deref()) -} - -async fn sync_permanent_password_storage_from_daemon_async() -> ResultType<()> { - let ms_timeout = 1_000; - let v = get_config_async("permanent-password-storage-and-salt", ms_timeout).await?; - apply_permanent_password_storage_and_salt_payload(v.as_deref()) -} - -pub fn is_permanent_password_set() -> bool { - match get_config("permanent-password-set") { - Ok(Some(v)) => { - let v = v.trim(); - return v == "Y"; - } - Ok(None) => { - // No response/value (timeout). - } - Err(_) => { - // Connection error. - } - } - log::warn!("Failed to query permanent password state from daemon"); - false -} - -pub fn is_permanent_password_preset() -> bool { - if let Ok(Some(v)) = get_config("permanent-password-is-preset") { - let v = v.trim(); - return v == "Y"; - } - false } pub fn get_fingerprint() -> String { @@ -1602,41 +1013,8 @@ pub fn get_fingerprint() -> String { } pub fn set_permanent_password(v: String) -> ResultType<()> { - if Config::is_disable_change_permanent_password() { - bail!("Changing permanent password is disabled"); - } - if set_permanent_password_with_ack(v)? { - Ok(()) - } else { - bail!("Changing permanent password was rejected by daemon"); - } -} - -#[tokio::main(flavor = "current_thread")] -pub async fn set_permanent_password_with_ack(v: String) -> ResultType { - set_permanent_password_with_ack_async(v).await -} - -async fn set_permanent_password_with_ack_async(v: String) -> ResultType { - // The daemon ACK/NACK is expected quickly since it applies the config in-process. - let ms_timeout = 1_000; - let mut c = connect(ms_timeout, "").await?; - c.send_config("permanent-password", v).await?; - if let Some(Data::Config((name2, Some(v)))) = c.next_timeout(ms_timeout).await? { - if name2 == "permanent-password" { - let v = v.trim(); - let ok = v == "Y"; - if ok { - // Ensure the hashed permanent password storage is written to the user config file. - // This sync must not affect the daemon ACK outcome. - if let Err(err) = sync_permanent_password_storage_from_daemon_async().await { - log::warn!("Failed to sync permanent password storage from daemon: {err}"); - } - } - return Ok(ok); - } - } - Ok(false) + Config::set_permanent_password(&v); + set_config("permanent-password", v) } #[cfg(feature = "flutter")] @@ -1875,13 +1253,6 @@ pub async fn test_rendezvous_server() -> ResultType<()> { Ok(()) } -#[tokio::main(flavor = "current_thread")] -pub async fn notify_deployed() -> ResultType<()> { - let mut c = connect(1000, "").await?; - c.send(&Data::Deployed).await?; - Ok(()) -} - #[tokio::main(flavor = "current_thread")] pub async fn send_url_scheme(url: String) -> ResultType<()> { connect(1_000, "_url") @@ -1899,10 +1270,9 @@ pub fn close_all_instances() -> ResultType { } } -#[cfg(windows)] #[tokio::main(flavor = "current_thread")] pub async fn connect_to_user_session(usid: Option) -> ResultType<()> { - let mut stream = crate::ipc::connect_service(1000).await?; + let mut stream = crate::ipc::connect(1000, crate::POSTFIX_SERVICE).await?; timeout(1000, stream.send(&crate::ipc::Data::UserSid(usid))).await??; Ok(()) } @@ -2028,76 +1398,13 @@ pub async fn update_controlling_session_count(count: usize) -> ResultType<()> { #[cfg(target_os = "linux")] #[tokio::main(flavor = "current_thread")] pub async fn get_terminal_session_count() -> ResultType { - let timeout_ms = 1_000; - let effective_uid = unsafe { hbb_common::libc::geteuid() as u32 }; - let candidate_uids = terminal_count_candidate_uids(effective_uid); - let mut last_err: Option = None; - for candidate_uid in candidate_uids { - let socket_path = Config::ipc_path_for_uid(candidate_uid, ""); - let connect_result = timeout(timeout_ms, Endpoint::connect(&socket_path)) - .await - .map_err(|err| { - anyhow::anyhow!( - "Timeout connecting to terminal ipc at {}: {}", - socket_path, - err - ) - }); - let connection = match connect_result { - Ok(Ok(connection)) => connection, - Ok(Err(err)) => { - last_err = Some(anyhow::anyhow!( - "Failed to connect to terminal ipc at {}: {}", - socket_path, - err - )); - continue; - } - Err(err) => { - last_err = Some(err); - continue; - } - }; - let mut ipc_conn = ConnectionTmpl::new(connection); - if let Err(err) = ipc_conn.send(&Data::TerminalSessionCount(0)).await { - last_err = Some(anyhow::anyhow!( - "Failed to request terminal session count via ipc at {}: {}", - socket_path, - err - )); - continue; - } - match ipc_conn.next_timeout(timeout_ms).await { - Ok(Some(Data::TerminalSessionCount(session_count))) => { - return Ok(session_count); - } - Ok(None) => { - last_err = Some(anyhow::anyhow!( - "Invalid response when requesting terminal session count via ipc at {}", - socket_path - )); - } - Ok(other) => { - last_err = Some(anyhow::anyhow!( - "Unexpected response when requesting terminal session count via ipc at {}: {:?}", - socket_path, - other.map(|v| std::mem::discriminant(&v)) - )); - } - Err(err) => { - last_err = Some(anyhow::anyhow!( - "Failed to read terminal session count via ipc at {}: {}", - socket_path, - err - )); - } - } - } - if let Some(err) = last_err { - Err(err.into()) - } else { - Ok(0) + let ms_timeout = 1_000; + let mut c = connect(ms_timeout, "").await?; + c.send(&Data::TerminalSessionCount(0)).await?; + if let Some(Data::TerminalSessionCount(c)) = c.next_timeout(ms_timeout).await? { + return Ok(c); } + Ok(0) } async fn handle_wayland_screencast_restore_token( @@ -2128,81 +1435,9 @@ pub async fn set_install_option(k: String, v: String) -> ResultType<()> { #[cfg(test)] mod test { use super::*; - #[test] fn verify_ffi_enum_data_size() { println!("{}", std::mem::size_of::()); - assert!(std::mem::size_of::() <= 120); - } - - #[cfg(any(target_os = "linux", target_os = "macos"))] - #[test] - fn test_service_ipc_path_is_shared_across_uids() { - assert_eq!( - Config::ipc_path_for_uid(0, crate::POSTFIX_SERVICE), - Config::ipc_path_for_uid(501, crate::POSTFIX_SERVICE) - ); - } - - #[cfg(any(target_os = "linux", target_os = "macos"))] - #[test] - fn test_ipc_path_differs_by_uid_for_cm() { - let effective_uid = unsafe { hbb_common::libc::geteuid() as u32 }; - let other_uid = effective_uid.saturating_add(1); - let postfix = "_cm"; - - // Default connect path targets the current effective uid. - assert_eq!( - Config::ipc_path(postfix), - Config::ipc_path_for_uid(effective_uid, postfix) - ); - // A different uid yields a different socket path - this is the root cause of the - // cross-user regression when root spawns a user process but still connects as uid 0. - assert_ne!( - Config::ipc_path(postfix), - Config::ipc_path_for_uid(other_uid, postfix) - ); - } - - #[cfg(any(target_os = "linux", target_os = "macos"))] - #[test] - fn test_select_server_uid_uses_active_uid_when_no_server_found() { - assert_eq!( - select_server_uid_for_user_main_ipc(&[], Some(501), false).unwrap(), - 501 - ); - } - - #[cfg(any(target_os = "linux", target_os = "macos"))] - #[test] - fn test_select_server_uid_uses_single_server_uid() { - assert_eq!( - select_server_uid_for_user_main_ipc(&[501], None, false).unwrap(), - 501 - ); - } - - #[cfg(any(target_os = "linux", target_os = "macos"))] - #[test] - fn test_select_server_uid_prefers_active_uid_with_multiple_servers() { - assert_eq!( - select_server_uid_for_user_main_ipc(&[0, 501], Some(501), false).unwrap(), - 501 - ); - } - - #[cfg(any(target_os = "linux", target_os = "macos"))] - #[test] - fn test_select_server_uid_prefers_root_on_wayland_login_screen() { - assert_eq!( - select_server_uid_for_user_main_ipc(&[0, 501], Some(501), true).unwrap(), - 0 - ); - } - - #[cfg(any(target_os = "linux", target_os = "macos"))] - #[test] - fn test_select_server_uid_fails_when_multiple_servers_are_ambiguous() { - assert!(select_server_uid_for_user_main_ipc(&[501, 502], None, false).is_err()); + assert!(std::mem::size_of::() <= 96); } } diff --git a/src/ipc/auth.rs b/src/ipc/auth.rs deleted file mode 100644 index 77fd148c6..000000000 --- a/src/ipc/auth.rs +++ /dev/null @@ -1,1075 +0,0 @@ -use crate::ipc::{Connection, ConnectionTmpl}; -#[cfg(all(windows, not(feature = "flutter")))] -use hbb_common::sha2::{Digest, Sha256}; -#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))] -use hbb_common::{anyhow, bail, log, ResultType}; -#[cfg(any(target_os = "linux", target_os = "macos"))] -use hbb_common::{ - libc, - tokio::io::{AsyncRead, AsyncWrite}, -}; -#[cfg(windows)] -use parity_tokio_ipc::SecurityAttributes; -#[cfg(windows)] -use std::io; -#[cfg(all(windows, not(feature = "flutter")))] -use std::io::Read; -#[cfg(target_os = "macos")] -use std::os::unix::fs::MetadataExt; -#[cfg(any(target_os = "linux", target_os = "macos"))] -use std::os::unix::io::RawFd; -#[cfg(windows)] -use std::os::windows::io::AsRawHandle; -#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))] -use std::{ - fs, - path::{Path, PathBuf}, - sync::{Mutex, OnceLock}, -}; -#[cfg(windows)] -use windows::Win32::{Foundation::HANDLE, System::Pipes::GetNamedPipeClientProcessId}; - -#[cfg(windows)] -#[inline] -pub(crate) fn should_allow_everyone_create_on_windows(postfix: &str) -> bool { - postfix.is_empty() || hbb_common::config::is_service_ipc_postfix(postfix) -} - -#[cfg(windows)] -#[inline] -pub(crate) fn portable_service_listener_security_attributes() -> io::Result { - let user_sid = crate::platform::windows::current_process_user_sid_string().map_err(|err| { - io::Error::new( - io::ErrorKind::Other, - format!("failed to resolve current process SID: {}", err), - ) - })?; - debug_assert!( - user_sid.starts_with("S-1-") - && user_sid - .bytes() - .all(|byte| byte.is_ascii_digit() || byte == b'-'), - "current_process_user_sid_string returned a non-SDDL SID: {}", - user_sid - ); - // SDDL: - // - `D:P` => protected DACL (no inherited ACEs) - // - `(A;;GA;;;SY)` => allow GENERIC_ALL to LocalSystem - // - `(A;;GA;;;{user_sid})` => allow GENERIC_ALL to current process user SID - // References: - // - Security Descriptor String Format: https://learn.microsoft.com/en-us/windows/win32/secauthz/security-descriptor-string-format - // - ACE strings in SDDL: https://learn.microsoft.com/en-us/windows/win32/secauthz/ace-strings - let sddl = format!("D:P(A;;GA;;;SY)(A;;GA;;;{user_sid})"); - SecurityAttributes::from_sddl(&sddl).map_err(|err| { - io::Error::new( - io::ErrorKind::Other, - format!( - "failed to build portable service listener security attributes from SDDL '{}': {}", - sddl, err - ), - ) - }) -} - -#[cfg(target_os = "macos")] -#[inline] -fn macos_service_ipc_allows_gui_and_service_binaries( - peer_exe: &Path, - current_exe: &Path, - postfix: &str, -) -> bool { - if postfix != crate::POSTFIX_SERVICE { - return false; - } - let Some(peer_dir) = peer_exe.parent() else { - return false; - }; - let Some(current_dir) = current_exe.parent() else { - return false; - }; - if !executable_paths_match(peer_dir, current_dir) { - return false; - } - - // On installed macOS builds, `_service` is listened by the `service` binary while the GUI - // process connects from the app executable within the same app bundle. - let gui_exe_name = std::ffi::OsString::from(crate::get_app_name()); - let gui_exe = gui_exe_name.as_os_str(); - let service_exe = std::ffi::OsStr::new("service"); - let allowed_exe = [Some(gui_exe), Some(service_exe)]; - let peer_name = peer_exe.file_name(); - let current_name = current_exe.file_name(); - allowed_exe - .iter() - .any(|name| os_str_eq_ignore_ascii_case(peer_name, *name)) - && allowed_exe - .iter() - .any(|name| os_str_eq_ignore_ascii_case(current_name, *name)) -} - -#[cfg(target_os = "windows")] -#[inline] -fn windows_portable_service_ipc_allows_logon_helper_executable( - _peer_exe: &Path, - postfix: &str, -) -> bool { - if postfix != "_portable_service" { - return false; - } - #[cfg(feature = "flutter")] - { - false - } - #[cfg(not(feature = "flutter"))] - { - let Some((_, expected)) = crate::platform::windows::portable_service_logon_helper_paths() - else { - return false; - }; - let Ok(expected) = fs::canonicalize(expected) else { - return false; - }; - let Ok(current_exe) = current_exe_canonical_path() else { - return false; - }; - portable_service_helper_is_trusted(_peer_exe, &expected, ¤t_exe) - } -} - -#[cfg(windows)] -#[inline] -pub(crate) fn is_allowed_windows_session_scoped_peer( - client_is_system: bool, - client_session_id: Option, - expected_session_id: Option, -) -> bool { - client_is_system - || matches!( - (client_session_id, expected_session_id), - (Some(client), Some(expected)) if client == expected - ) -} - -#[cfg(windows)] -#[inline] -fn is_allowed_windows_portable_service_peer( - client_is_system: Option, - _client_session_id: Option, - _expected_session_id: Option, -) -> bool { - // Portable-service listener DACL includes SYSTEM and current-process SID. - // In the portable-service path, current process is expected to run as SYSTEM, - // and the higher-layer peer policy stays SYSTEM-only. - matches!(client_is_system, Some(true)) -} - -#[cfg(any(target_os = "macos", target_os = "linux"))] -#[inline] -pub(crate) fn is_allowed_service_peer_uid(peer_uid: u32, active_uid: Option) -> bool { - // Root is allowed at the UID gate because the service side may run as root. - // Callers still enforce executable matching before accepting service-scoped peers. - peer_uid == 0 || active_uid.is_some_and(|uid| uid == peer_uid) -} - -#[cfg(target_os = "macos")] -#[inline] -fn console_owner_uid() -> Option { - fs::metadata("/dev/console") - .ok() - .map(|metadata| metadata.uid()) -} - -#[cfg(target_os = "macos")] -#[inline] -fn active_uid_strict() -> Option { - // Prefer the filesystem metadata over parsing external command output. - console_owner_uid() -} - -#[cfg(target_os = "linux")] -#[inline] -fn active_uid_strict() -> Option { - let reported_uid_raw = crate::platform::linux::get_active_userid(); - let trimmed = reported_uid_raw.trim(); - if let Ok(uid) = trimmed.parse::() { - return Some(uid); - } - if trimmed.is_empty() { - log::debug!("Failed to resolve active user uid on linux: active uid is empty"); - } else { - log::warn!("Failed to parse active user uid on linux: '{}'", trimmed); - } - None -} - -#[cfg(any(target_os = "linux", target_os = "macos"))] -#[inline] -pub(crate) fn active_uid() -> Option { - active_uid_strict() -} - -#[cfg(any(target_os = "linux", target_os = "macos"))] -#[inline] -pub(crate) fn peer_uid_from_fd(fd: RawFd) -> Option { - #[cfg(target_os = "linux")] - { - return peer_cred_from_fd(fd).map(|cred| cred.uid as u32); - } - #[cfg(target_os = "macos")] - { - let mut uid = 0; - let mut gid = 0; - if unsafe { libc::getpeereid(fd, &mut uid, &mut gid) } == 0 { - Some(uid as u32) - } else { - None - } - } -} - -#[cfg(any(target_os = "linux", target_os = "macos"))] -#[inline] -fn peer_pid_from_fd(fd: RawFd) -> Option { - #[cfg(target_os = "linux")] - { - return peer_cred_from_fd(fd).and_then(|cred| (cred.pid > 0).then_some(cred.pid as u32)); - } - #[cfg(target_os = "macos")] - { - let mut pid = 0; - let mut len = std::mem::size_of::() as _; - let rc = unsafe { - libc::getsockopt( - fd, - libc::SOL_LOCAL, - libc::LOCAL_PEERPID, - &mut pid as *mut _ as *mut libc::c_void, - &mut len, - ) - }; - if rc == 0 && pid > 0 { - Some(pid as _) - } else { - None - } - } -} - -#[cfg(target_os = "linux")] -#[inline] -fn peer_cred_from_fd(fd: RawFd) -> Option { - let mut cred: libc::ucred = unsafe { std::mem::zeroed() }; - let mut len = std::mem::size_of::() as _; - let rc = unsafe { - libc::getsockopt( - fd, - libc::SOL_SOCKET, - libc::SO_PEERCRED, - &mut cred as *mut _ as *mut libc::c_void, - &mut len, - ) - }; - if rc == 0 { - Some(cred) - } else { - None - } -} - -#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))] -#[inline] -fn current_exe_canonical_path() -> ResultType { - let current = std::env::current_exe() - .map_err(|err| anyhow::anyhow!("Failed to resolve current executable path: {}", err))?; - fs::canonicalize(¤t).map_err(|err| { - anyhow::anyhow!( - "Failed to canonicalize current executable path '{}': {}", - current.display(), - err - ) - .into() - }) -} - -#[cfg(target_os = "linux")] -#[inline] -fn peer_exe_canonical_path_by_pid(peer_pid: u32) -> ResultType { - let proc_exe = PathBuf::from(format!("/proc/{peer_pid}/exe")); - let peer_exe = fs::read_link(&proc_exe).map_err(|err| { - anyhow::anyhow!( - "Failed to read peer executable link '{}': {}", - proc_exe.display(), - err - ) - })?; - fs::canonicalize(&peer_exe).map_err(|err| { - anyhow::anyhow!( - "Failed to canonicalize peer executable path '{}': {}", - peer_exe.display(), - err - ) - .into() - }) -} - -#[cfg(target_os = "macos")] -#[inline] -fn peer_exe_canonical_path_by_pid(peer_pid: u32) -> ResultType { - const PROC_PIDPATH_BUF_SIZE: usize = libc::PROC_PIDPATHINFO_MAXSIZE as _; - let mut buffer = vec![0u8; PROC_PIDPATH_BUF_SIZE]; - let length = unsafe { - libc::proc_pidpath( - peer_pid as _, - buffer.as_mut_ptr() as _, - PROC_PIDPATH_BUF_SIZE as _, - ) - }; - if length <= 0 { - bail!("Failed to query peer process path from pid {}", peer_pid); - } - buffer.truncate(length as _); - let path = PathBuf::from(String::from_utf8_lossy(&buffer).to_string()); - fs::canonicalize(&path).map_err(|err| { - anyhow::anyhow!( - "Failed to canonicalize peer executable path '{}': {}", - path.display(), - err - ) - .into() - }) -} - -#[cfg(target_os = "windows")] -#[inline] -fn peer_exe_canonical_path_by_pid(peer_pid: u32) -> ResultType { - let path = crate::platform::windows::get_process_executable_path(peer_pid)?; - fs::canonicalize(&path).map_err(|err| { - anyhow::anyhow!( - "Failed to canonicalize peer executable path '{}': {}", - path.display(), - err - ) - .into() - }) -} - -#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))] -#[inline] -pub(crate) fn executable_paths_match(left: &Path, right: &Path) -> bool { - #[cfg(target_os = "windows")] - { - // Callers pass paths resolved through fs::canonicalize() first, so NT - // namespace paths and 8.3 short names are expected to be resolved before - // this check. Keep this normalization limited to remaining Win32 spelling - // differences. - fn normalize(path: &Path) -> String { - let mut normalized = path.to_string_lossy().replace('/', "\\"); - if let Some(stripped) = normalized.strip_prefix(r"\\?\") { - normalized = stripped.to_owned(); - } - normalized.to_ascii_lowercase() - } - return normalize(left) == normalize(right); - } - #[cfg(target_os = "macos")] - { - return paths_refer_to_same_file(left, right); - } - #[cfg(not(any(target_os = "windows", target_os = "macos")))] - { - left == right - } -} - -#[cfg(target_os = "macos")] -#[inline] -fn paths_refer_to_same_file(left: &Path, right: &Path) -> bool { - if left == right { - return true; - } - let (Ok(left), Ok(right)) = (fs::metadata(left), fs::metadata(right)) else { - return false; - }; - left.dev() == right.dev() && left.ino() == right.ino() -} - -#[cfg(target_os = "macos")] -#[inline] -fn os_str_eq_ignore_ascii_case( - left: Option<&std::ffi::OsStr>, - right: Option<&std::ffi::OsStr>, -) -> bool { - let (Some(left), Some(right)) = (left, right) else { - return false; - }; - left.to_string_lossy() - .eq_ignore_ascii_case(&right.to_string_lossy()) -} - -#[cfg(all(windows, not(feature = "flutter")))] -#[inline] -fn file_sha256(path: &Path) -> ResultType<[u8; 32]> { - let mut file = fs::File::open(path)?; - let mut hasher = Sha256::new(); - let mut buffer = [0u8; 8 * 1024]; - loop { - let read_bytes = file.read(&mut buffer)?; - if read_bytes == 0 { - break; - } - hasher.update(&buffer[..read_bytes]); - } - Ok(hasher.finalize().into()) -} - -#[cfg(all(windows, not(feature = "flutter")))] -#[inline] -fn portable_service_helper_is_trusted( - peer_exe: &Path, - expected_exe: &Path, - current_exe: &Path, -) -> bool { - if !executable_paths_match(peer_exe, expected_exe) { - return false; - } - let peer_hash = match file_sha256(peer_exe) { - Ok(hash) => hash, - Err(err) => { - log::warn!( - "Failed to hash peer portable helper executable '{}': {}", - peer_exe.display(), - err - ); - return false; - } - }; - let current_hash = match file_sha256(current_exe) { - Ok(hash) => hash, - Err(err) => { - log::warn!( - "Failed to hash current executable '{}' for portable helper trust check: {}", - current_exe.display(), - err - ); - return false; - } - }; - peer_hash == current_hash -} - -#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))] -#[inline] -fn ensure_peer_executable_matches_current_by_pid(peer_pid: u32, postfix: &str) -> ResultType<()> { - let peer_exe = peer_exe_canonical_path_by_pid(peer_pid)?; - let current_exe = current_exe_canonical_path()?; - if executable_paths_match(&peer_exe, ¤t_exe) { - return Ok(()); - } - #[cfg(target_os = "macos")] - if macos_service_ipc_allows_gui_and_service_binaries(&peer_exe, ¤t_exe, postfix) { - return Ok(()); - } - #[cfg(target_os = "windows")] - if windows_portable_service_ipc_allows_logon_helper_executable(&peer_exe, postfix) { - return Ok(()); - } - bail!( - "Peer executable path mismatch on ipc channel '{}': peer_pid={}, peer_exe='{}', current_exe='{}'", - postfix, - peer_pid, - peer_exe.display(), - current_exe.display() - ); -} - -#[cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))] -#[inline] -pub(crate) fn ensure_peer_executable_matches_current_by_pid_opt( - peer_pid: Option, - postfix: &str, -) -> ResultType<()> { - let peer_pid = peer_pid.ok_or_else(|| { - anyhow::anyhow!("Failed to resolve peer pid on ipc channel '{}'", postfix) - })?; - ensure_peer_executable_matches_current_by_pid(peer_pid, postfix) -} - -#[cfg(target_os = "linux")] -#[inline] -pub(crate) fn ensure_peer_executable_matches_current_by_fd( - fd: RawFd, - postfix: &str, -) -> ResultType<()> { - let peer_pid = peer_pid_from_fd(fd).ok_or_else(|| { - anyhow::anyhow!("Failed to resolve peer pid on ipc channel '{}'", postfix) - })?; - ensure_peer_executable_matches_current_by_pid(peer_pid, postfix) -} - -#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))] -const UNAUTHORIZED_IPC_LOG_INTERVAL: std::time::Duration = std::time::Duration::from_secs(5); - -#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))] -#[derive(Default)] -struct UnauthorizedIpcLogThrottle { - last_log_at: Option, - suppressed: u64, -} - -#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))] -impl UnauthorizedIpcLogThrottle { - #[inline] - fn on_reject(&mut self, now: std::time::Instant) -> Option { - if let Some(last) = self.last_log_at { - if now.saturating_duration_since(last) < UNAUTHORIZED_IPC_LOG_INTERVAL { - self.suppressed += 1; - return None; - } - } - self.last_log_at = Some(now); - Some(std::mem::take(&mut self.suppressed)) - } -} - -#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))] -#[inline] -fn throttled_unauthorized_ipc_log( - throttle_cell: &OnceLock>, - emit: impl FnOnce(u64), -) { - let throttle = throttle_cell.get_or_init(|| Mutex::new(UnauthorizedIpcLogThrottle::default())); - let should_log = match throttle.lock() { - Ok(mut throttle) => throttle.on_reject(std::time::Instant::now()), - Err(_) => Some(0), - }; - if let Some(suppressed) = should_log { - emit(suppressed); - } -} - -#[cfg(any(target_os = "linux", target_os = "macos"))] -#[inline] -fn log_rejected_service_connection(postfix: &str, peer_uid: Option, active_uid: Option) { - static LOG_THROTTLE: OnceLock> = OnceLock::new(); - throttled_unauthorized_ipc_log(&LOG_THROTTLE, |suppressed| { - if suppressed > 0 { - log::warn!( - "Rejected unauthorized connection on protected service-scoped IPC channel: postfix={}, peer_uid={:?}, active_uid={:?} (suppressed {} similar events)", - postfix, - peer_uid, - active_uid, - suppressed - ); - } else { - log::warn!( - "Rejected unauthorized connection on protected service-scoped IPC channel: postfix={}, peer_uid={:?}, active_uid={:?}", - postfix, - peer_uid, - active_uid - ); - } - }); -} - -#[cfg(target_os = "linux")] -#[inline] -pub(crate) fn log_rejected_uinput_connection( - postfix: &str, - peer_uid: Option, - active_uid: Option, -) { - static LOG_THROTTLE: OnceLock> = OnceLock::new(); - throttled_unauthorized_ipc_log(&LOG_THROTTLE, |suppressed| { - if suppressed > 0 { - log::warn!( - "Rejected unauthorized connection on uinput ipc channel: postfix={}, peer_uid={:?}, active_uid={:?} (suppressed {} similar events)", - postfix, - peer_uid, - active_uid, - suppressed - ); - } else { - log::warn!( - "Rejected unauthorized connection on uinput ipc channel: postfix={}, peer_uid={:?}, active_uid={:?}", - postfix, - peer_uid, - active_uid - ); - } - }); -} - -#[cfg(windows)] -#[inline] -pub(crate) fn log_rejected_windows_ipc_connection( - postfix: &str, - peer_pid: Option, - peer_session_id: Option, - expected_session_id: Option, - peer_is_system: Option, - peer_is_elevated: Option, -) { - static LOG_THROTTLE: OnceLock> = OnceLock::new(); - throttled_unauthorized_ipc_log(&LOG_THROTTLE, |suppressed| { - if suppressed > 0 { - log::warn!( - "Rejected unauthorized connection on ipc channel: postfix={}, peer_pid={:?}, peer_session_id={:?}, expected_session_id={:?}, peer_is_system={:?}, peer_is_elevated={:?} (suppressed {} similar events)", - postfix, - peer_pid, - peer_session_id, - expected_session_id, - peer_is_system, - peer_is_elevated, - suppressed - ); - } else { - log::warn!( - "Rejected unauthorized connection on ipc channel: postfix={}, peer_pid={:?}, peer_session_id={:?}, expected_session_id={:?}, peer_is_system={:?}, peer_is_elevated={:?}", - postfix, - peer_pid, - peer_session_id, - expected_session_id, - peer_is_system, - peer_is_elevated - ); - } - }); -} - -#[cfg(any(target_os = "linux", target_os = "macos"))] -pub(crate) fn authorize_service_scoped_ipc_connection(stream: &Connection, postfix: &str) -> bool { - let peer_pid = stream.peer_pid(); - let (authorized, peer_uid, active_uid) = stream.service_authorization_status(); - if !authorized { - log_rejected_service_connection(postfix, peer_uid, active_uid); - return false; - } - if let Err(err) = ensure_peer_executable_matches_current_by_pid_opt(peer_pid, postfix) { - log::warn!( - "Rejected unauthorized connection on protected service-scoped IPC channel due to executable mismatch: postfix={}, peer_pid={:?}, err={}", - postfix, - peer_pid, - err - ); - return false; - } - true -} - -#[cfg(windows)] -pub(crate) fn authorize_windows_main_ipc_connection(stream: &Connection, postfix: &str) -> bool { - let ( - authorized, - peer_pid, - peer_session_id, - server_session_id, - peer_is_system, - peer_is_elevated, - ) = stream.server_authorization_status(); - if !authorized { - log_rejected_windows_ipc_connection( - postfix, - peer_pid, - peer_session_id, - server_session_id, - peer_is_system, - peer_is_elevated, - ); - return false; - } - if let Err(err) = ensure_peer_executable_matches_current_by_pid_opt(peer_pid, postfix) { - log::warn!( - "Rejected unauthorized connection on ipc channel due to executable mismatch: postfix={}, peer_pid={:?}, err={}", - postfix, - peer_pid, - err - ); - return false; - } - true -} - -#[cfg(windows)] -pub(crate) fn authorize_windows_portable_service_ipc_connection( - stream: &Connection, - postfix: &str, -) -> bool { - // Portable service IPC policy: - // - only SYSTEM peers are authorized by is_allowed_windows_portable_service_peer() - // - expected_session_id is still collected for diagnostics and identity checks - // - final privilege boundary is enforced by named-pipe ACL + one-time token handshake - // - when peer identity is unavailable on some hosts, executable verification remains - // best-effort telemetry (not fail-closed) to avoid breaking valid SYSTEM bootstrap - // flows that cannot be fully introspected - let expected_session_id = crate::platform::windows::get_current_process_session_id(); - let (authorized, peer_pid, peer_session_id, peer_is_system) = - stream.portable_service_authorization_status_for_session(expected_session_id); - if !authorized { - // Session lookup may succeed while SYSTEM identity lookup fails, so only the - // SYSTEM identity result determines whether peer identity is unavailable here. - // Don't use `peer_pid.is_some() && peer_session_id.is_none() && peer_is_system.is_none();` here. - let identity_unavailable = peer_pid.is_some() && peer_is_system.is_none(); - if identity_unavailable { - // In portable-service startup, resolving SYSTEM peer identity may fail on some hosts. - // `ProcessIdToSessionId` can still succeed while `OpenProcessToken(TOKEN_QUERY)` is - // denied by the peer token DACL or missing privileges. Treat that partial identity - // failure as unavailable and defer final authorization to pipe ACL + token handshake. - if let Err(err) = ensure_peer_executable_matches_current_by_pid_opt(peer_pid, postfix) { - log::warn!( - "Portable service ipc peer identity unavailable and executable verification failed; continue with ACL+token-gated flow: postfix={}, peer_pid={:?}, err={}", - postfix, - peer_pid, - err - ); - } else { - log::warn!( - "Portable service ipc peer identity unavailable; executable verification matched, continue with ACL+token-gated flow: postfix={}, peer_pid={:?}, expected_session_id={:?}", - postfix, - peer_pid, - expected_session_id - ); - } - return true; - } - log::warn!( - "Rejected unauthorized connection on portable service ipc channel: postfix={}, peer_pid={:?}, peer_session_id={:?}, expected_session_id={:?}, peer_is_system={:?}", - postfix, - peer_pid, - peer_session_id, - expected_session_id, - peer_is_system - ); - return false; - } - true -} - -#[cfg(any(target_os = "linux", target_os = "macos"))] -impl ConnectionTmpl -where - T: AsyncRead + AsyncWrite + std::marker::Unpin + std::os::unix::io::AsRawFd, -{ - pub(super) fn peer_uid(&self) -> Option { - peer_uid_from_fd(self.inner.get_ref().as_raw_fd()) - } - - fn service_authorization_status(&self) -> (bool, Option, Option) { - let peer_uid = self.peer_uid(); - // On Linux, `_service` can use the cached active UID from the service loop for - // stable config sync. Uinput does a fresh active-UID lookup in its own authorizer. - let active_uid = active_uid(); - let authorized = peer_uid.is_some_and(|uid| is_allowed_service_peer_uid(uid, active_uid)); - (authorized, peer_uid, active_uid) - } - - pub(super) fn peer_pid(&self) -> Option { - peer_pid_from_fd(self.inner.get_ref().as_raw_fd()) - } -} - -#[cfg(windows)] -impl ConnectionTmpl { - fn peer_pid(&self) -> Option { - let pipe_handle = self.inner.get_ref().as_raw_handle(); - if pipe_handle.is_null() { - return None; - } - let mut pid = 0u32; - let ok = unsafe { GetNamedPipeClientProcessId(HANDLE(pipe_handle), &mut pid as *mut u32) } - .is_ok(); - if ok && pid != 0 { - Some(pid) - } else { - None - } - } - - fn server_authorization_status( - &self, - ) -> ( - bool, - Option, - Option, - Option, - Option, - Option, - ) { - let peer_pid = self.peer_pid(); - let server_session_id = crate::platform::windows::get_current_process_session_id(); - let peer_session_id = - peer_pid.and_then(crate::platform::windows::get_session_id_of_process); - let peer_is_system_result = - peer_pid.map(crate::platform::windows::is_process_running_as_system); - let peer_is_system = peer_is_system_result - .as_ref() - .and_then(|r| r.as_ref().ok().copied()); - let session_authorized = is_allowed_windows_session_scoped_peer( - peer_is_system.unwrap_or(false), - peer_session_id, - server_session_id, - ); - let peer_is_elevated_result = if session_authorized { - None - } else { - peer_pid.map(|pid| crate::platform::windows::is_elevated(Some(pid))) - }; - let peer_is_elevated = peer_is_elevated_result - .as_ref() - .and_then(|r| r.as_ref().ok().copied()); - if server_session_id.is_none() - && !peer_is_system.unwrap_or(false) - && !peer_is_elevated.unwrap_or(false) - { - // When the server session id cannot be determined, the session-id allow-path is - // disabled and only privileged peers can be authorized. - log::debug!( - "IPC authorization: server session id unavailable; rejecting non-privileged peer, peer_pid={:?}, peer_session_id={:?}", - peer_pid, - peer_session_id - ); - } - // Main IPC trusts same-session peers, LocalSystem, and elevated administrators. - // Service-scoped IPC channels keep their own stricter authorization paths. - let authorized = session_authorized || peer_is_elevated.unwrap_or(false); - if !authorized { - if let (Some(pid), Some(Err(err))) = (peer_pid, peer_is_system_result.as_ref()) { - log::debug!( - "Failed to determine whether peer process is SYSTEM, pid={}, err={}", - pid, - err - ); - } - if let (Some(pid), Some(Err(err))) = (peer_pid, peer_is_elevated_result.as_ref()) { - log::debug!( - "Failed to determine whether peer process is elevated, pid={}, err={}", - pid, - err - ); - } - } - ( - authorized, - peer_pid, - peer_session_id, - server_session_id, - peer_is_system, - peer_is_elevated, - ) - } - - pub(crate) fn service_authorization_status_for_session( - &self, - expected_active_session_id: Option, - ) -> (bool, Option, Option, Option) { - let peer_pid = self.peer_pid(); - let peer_session_id = - peer_pid.and_then(crate::platform::windows::get_session_id_of_process); - let peer_is_system_result = - peer_pid.map(crate::platform::windows::is_process_running_as_system); - let peer_is_system = peer_is_system_result - .as_ref() - .and_then(|r| r.as_ref().ok().copied()); - let authorized = is_allowed_windows_session_scoped_peer( - peer_is_system.unwrap_or(false), - peer_session_id, - expected_active_session_id, - ); - if !authorized { - if let (Some(pid), Some(Err(err))) = (peer_pid, peer_is_system_result.as_ref()) { - log::debug!( - "Failed to determine whether peer process is SYSTEM, pid={}, err={}", - pid, - err - ); - } - } - (authorized, peer_pid, peer_session_id, peer_is_system) - } - - pub(crate) fn portable_service_authorization_status_for_session( - &self, - expected_active_session_id: Option, - ) -> (bool, Option, Option, Option) { - // Portable-service policy: - // only SYSTEM peers are allowed. - let (_service_authorized, peer_pid, peer_session_id, peer_is_system) = - self.service_authorization_status_for_session(expected_active_session_id); - ( - is_allowed_windows_portable_service_peer( - peer_is_system, - peer_session_id, - expected_active_session_id, - ), - peer_pid, - peer_session_id, - peer_is_system, - ) - } -} - -#[cfg(test)] -mod tests { - #[test] - #[cfg(any(target_os = "macos", target_os = "linux"))] - fn test_service_peer_uid_policy() { - assert!(super::is_allowed_service_peer_uid(0, None)); - assert!(super::is_allowed_service_peer_uid(501, Some(501))); - assert!(!super::is_allowed_service_peer_uid(502, Some(501))); - assert!(!super::is_allowed_service_peer_uid(501, None)); - } - - #[test] - #[cfg(windows)] - fn test_windows_server_peer_policy() { - assert!(super::is_allowed_windows_session_scoped_peer( - true, None, None - )); - assert!(super::is_allowed_windows_session_scoped_peer( - false, - Some(1), - Some(1) - )); - assert!(!super::is_allowed_windows_session_scoped_peer( - false, - Some(1), - Some(2) - )); - assert!(!super::is_allowed_windows_session_scoped_peer( - false, - None, - Some(1) - )); - } - - #[test] - #[cfg(windows)] - fn test_windows_portable_service_peer_policy() { - assert!(super::is_allowed_windows_portable_service_peer( - Some(true), - None, - None - )); - assert!(!super::is_allowed_windows_portable_service_peer( - Some(false), - Some(1), - Some(1) - )); - assert!(!super::is_allowed_windows_portable_service_peer( - Some(false), - Some(1), - Some(2) - )); - assert!(!super::is_allowed_windows_portable_service_peer( - None, - Some(1), - Some(1) - )); - } - - #[test] - #[cfg(windows)] - fn test_should_allow_everyone_create_on_windows_policy() { - assert!(super::should_allow_everyone_create_on_windows("")); - assert!(super::should_allow_everyone_create_on_windows("_service")); - assert!(!super::should_allow_everyone_create_on_windows( - "_portable_service" - )); - } - - #[test] - #[cfg(windows)] - fn test_executable_paths_match_windows_normalization() { - let left = std::path::PathBuf::from(r"\\?\C:\Program Files\RustDesk\RustDesk.exe"); - let right = std::path::PathBuf::from(r"c:\program files\rustdesk\rustdesk.exe"); - assert!(super::executable_paths_match(&left, &right)); - } - - #[test] - #[cfg(target_os = "macos")] - fn test_os_str_eq_ignore_ascii_case_for_process_names() { - assert!(super::os_str_eq_ignore_ascii_case( - Some(std::ffi::OsStr::new("RustDesk")), - Some(std::ffi::OsStr::new("rustdesk")) - )); - assert!(!super::os_str_eq_ignore_ascii_case( - Some(std::ffi::OsStr::new("RustDesk")), - Some(std::ffi::OsStr::new("service")) - )); - } - - #[cfg(all(windows, not(feature = "flutter")))] - struct TempDirGuard(std::path::PathBuf); - - #[cfg(all(windows, not(feature = "flutter")))] - impl Drop for TempDirGuard { - fn drop(&mut self) { - let _ = std::fs::remove_dir_all(&self.0); - } - } - - #[test] - #[cfg(all(windows, not(feature = "flutter")))] - fn test_portable_service_helper_trust_requires_content_match() { - let unique = format!( - "rustdesk-portable-helper-trust-test-{}-{}", - std::process::id(), - std::time::SystemTime::now() - .duration_since(std::time::UNIX_EPOCH) - .unwrap_or_default() - .as_nanos() - ); - let base = std::env::temp_dir().join(unique); - std::fs::create_dir_all(&base).unwrap(); - let _cleanup = TempDirGuard(base.clone()); - - let current_exe = base.join("current.exe"); - let helper_exe = base.join("helper.exe"); - std::fs::write(¤t_exe, b"trusted-binary").unwrap(); - std::fs::write(&helper_exe, b"tampered-binary").unwrap(); - - assert!( - !super::portable_service_helper_is_trusted(&helper_exe, &helper_exe, ¤t_exe), - "helper trust check must reject path-match-only binaries with mismatched content" - ); - } - - #[test] - #[cfg(all(windows, not(feature = "flutter")))] - fn test_portable_service_helper_trust_accepts_matching_content() { - let unique = format!( - "rustdesk-portable-helper-trust-match-test-{}-{}", - std::process::id(), - std::time::SystemTime::now() - .duration_since(std::time::UNIX_EPOCH) - .unwrap_or_default() - .as_nanos() - ); - let base = std::env::temp_dir().join(unique); - std::fs::create_dir_all(&base).unwrap(); - let _cleanup = TempDirGuard(base.clone()); - - let current_exe = base.join("current.exe"); - let helper_exe = base.join("helper.exe"); - std::fs::write(¤t_exe, b"trusted-binary").unwrap(); - std::fs::write(&helper_exe, b"trusted-binary").unwrap(); - - assert!(super::portable_service_helper_is_trusted( - &helper_exe, - &helper_exe, - ¤t_exe - )); - } - - #[cfg(target_os = "macos")] - #[test] - fn test_console_owner_uid_matches_get_active_userid() { - let console_uid = - super::console_owner_uid().expect("/dev/console must have a resolvable uid"); - let raw_uid = crate::platform::macos::get_active_userid(); - let parsed_uid: u32 = raw_uid - .trim() - .parse() - .unwrap_or_else(|_| panic!("failed to parse get_active_userid() output: '{raw_uid}'")); - assert_eq!(parsed_uid, console_uid); - } -} diff --git a/src/ipc/fs.rs b/src/ipc/fs.rs deleted file mode 100644 index e0157f3a9..000000000 --- a/src/ipc/fs.rs +++ /dev/null @@ -1,951 +0,0 @@ -#[cfg(target_os = "linux")] -use super::ipc_auth::active_uid; -use crate::ipc::{connect, Data}; -use hbb_common::{config, log, ResultType}; -use std::{ - ffi::CString, - io::{Error, ErrorKind}, - os::unix::ffi::OsStrExt, - path::Path, -}; - -struct FdGuard(i32); -impl Drop for FdGuard { - fn drop(&mut self) { - unsafe { - hbb_common::libc::close(self.0); - } - } -} - -#[cfg(target_os = "linux")] -#[inline] -pub(crate) fn terminal_count_candidate_uids(effective_uid: u32) -> Vec { - if effective_uid != 0 { - return vec![effective_uid]; - } - let mut candidates = Vec::with_capacity(2); - if let Some(uid) = active_uid().filter(|uid| *uid != 0) { - candidates.push(uid); - } - candidates.push(0); - candidates -} - -#[inline] -fn expected_ipc_parent_mode(postfix: &str) -> u32 { - if config::is_service_ipc_postfix(postfix) { - 0o0711 - } else { - 0o0700 - } -} - -fn open_ipc_parent_dir_fd(parent_c: &CString) -> std::io::Result { - let fd = unsafe { - hbb_common::libc::open( - parent_c.as_ptr(), - hbb_common::libc::O_RDONLY - | hbb_common::libc::O_DIRECTORY - | hbb_common::libc::O_CLOEXEC - | hbb_common::libc::O_NOFOLLOW, - ) - }; - if fd < 0 { - Err(std::io::Error::last_os_error()) - } else { - Ok(fd) - } -} - -// Remove one preexisting IPC artifact via an already-opened parent directory FD. -// -// Security intent: -// - Bind cleanup to the exact parent inode that passed O_NOFOLLOW + fstat checks. -// - Avoid path-based TOCTOU during scrub (e.g., parent path rename/swap race). -// -// Flow: -// 1) fstatat(..., AT_SYMLINK_NOFOLLOW) to inspect the target entry under parent_fd. -// 2) Decide file vs directory from st_mode. -// 3) unlinkat relative to parent_fd (AT_REMOVEDIR for directories). -// -// Error policy: -// - NotFound is treated as benign (already removed / raced away). -// - Other errors are surfaced explicitly. -fn remove_parent_entry_via_fd( - parent_fd: i32, - parent_dir: &Path, - entry_name: &str, -) -> ResultType<()> { - if entry_name.contains('/') { - return Err(Error::new( - ErrorKind::InvalidInput, - format!( - "invalid ipc parent entry name (contains '/'): parent={}, entry={}", - parent_dir.display(), - entry_name - ), - ) - .into()); - } - let entry_c = CString::new(entry_name.as_bytes().to_vec()).map_err(|err| { - Error::new( - ErrorKind::InvalidInput, - format!( - "invalid ipc parent entry name: parent={}, entry={}, err={}", - parent_dir.display(), - entry_name, - err - ), - ) - })?; - let mut stat: hbb_common::libc::stat = unsafe { std::mem::zeroed() }; - let stat_rc = unsafe { - hbb_common::libc::fstatat( - parent_fd, - entry_c.as_ptr(), - &mut stat, - hbb_common::libc::AT_SYMLINK_NOFOLLOW, - ) - }; - if stat_rc != 0 { - let err = std::io::Error::last_os_error(); - if err.kind() == ErrorKind::NotFound { - return Ok(()); - } - return Err(Error::new( - err.kind(), - format!( - "failed to stat preexisting ipc parent dir entry by fd: parent={}, entry={}, err={}", - parent_dir.display(), - entry_name, - err - ), - ) - .into()); - } - - let is_dir = (stat.st_mode & (hbb_common::libc::S_IFMT as hbb_common::libc::mode_t)) - == hbb_common::libc::S_IFDIR; - let unlink_flags = if is_dir { - hbb_common::libc::AT_REMOVEDIR - } else { - 0 - }; - let unlink_rc = - unsafe { hbb_common::libc::unlinkat(parent_fd, entry_c.as_ptr(), unlink_flags) }; - if unlink_rc != 0 { - let err = std::io::Error::last_os_error(); - if err.kind() == ErrorKind::NotFound { - return Ok(()); - } - return Err(Error::new( - err.kind(), - format!( - "failed to remove preexisting ipc parent dir entry by fd: parent={}, entry={}, err={}", - parent_dir.display(), - entry_name, - err - ), - ) - .into()); - } - Ok(()) -} - -fn scrub_preexisting_ipc_parent_entries( - parent_fd: i32, - parent_dir: &Path, - postfix: &str, -) -> ResultType<()> { - let ipc_basename = format!("ipc{}", postfix); - remove_parent_entry_via_fd(parent_fd, parent_dir, &ipc_basename)?; - remove_parent_entry_via_fd(parent_fd, parent_dir, &format!("{}.pid", ipc_basename))?; - Ok(()) -} - -fn remove_ipc_socket_via_secure_parent_fd(postfix: &str) -> ResultType<()> { - let path = config::Config::ipc_path(postfix); - let parent_dir = Path::new(&path) - .parent() - .ok_or_else(|| Error::new(ErrorKind::InvalidInput, format!("invalid ipc path: {path}")))?; - let parent_c = CString::new(parent_dir.as_os_str().as_bytes().to_vec())?; - let fd = match open_ipc_parent_dir_fd(&parent_c) { - Ok(fd) => fd, - Err(open_err) => { - if open_err.kind() == ErrorKind::NotFound { - return Ok(()); - } - return Err(Error::new( - open_err.kind(), - format!( - "failed to open ipc parent dir for stale socket cleanup (no-follow): postfix={}, parent={}, err={}", - postfix, - parent_dir.display(), - open_err - ), - ) - .into()); - } - }; - let _fd_guard = FdGuard(fd); - remove_parent_entry_via_fd(fd, parent_dir, &format!("ipc{}", postfix)) -} - -// Purpose: -// - Harden the IPC parent directory before creating/listening socket files. -// - Prevent symlink/path-race abuse and reject unsafe owner/mode. -// -// Approach: -// - Open parent dir with O_NOFOLLOW/O_DIRECTORY and operate on that fd. -// - Validate inode type/owner/mode via fstat. -// - For protected service postfix, optionally adopt owner (root only), then scrub stale -// rustdesk IPC artifacts when directory trust boundary changed. -// -// Main steps: -// 1) Resolve parent path and open/create directory securely. -// 2) Verify directory inode type and owner uid. -// 3) Enforce expected mode via fchmod on opened fd. -// 4) Scrub stale IPC artifacts when owner/mode was unsafe before hardening. -// -// References: -// - open(2): O_NOFOLLOW/O_DIRECTORY/O_CLOEXEC -// https://man7.org/linux/man-pages/man2/open.2.html -// - fstat(2): verify file type/metadata on opened fd -// https://man7.org/linux/man-pages/man2/fstat.2.html -// - fchown(2): adopt ownership when running as root -// https://man7.org/linux/man-pages/man2/chown.2.html -// - fchmod(2): enforce exact mode on opened fd -// https://man7.org/linux/man-pages/man2/fchmod.2.html -pub(crate) fn ensure_secure_ipc_parent_dir(path: &str, postfix: &str) -> ResultType { - let parent_dir = Path::new(path) - .parent() - .ok_or_else(|| Error::new(ErrorKind::InvalidInput, format!("invalid ipc path: {path}")))?; - // Harden against common TOCTOU by opening the parent directory with O_NOFOLLOW (so the parent - // itself cannot be a symlink) and then operating on its FD (fstat/fchown/fchmod). This ensures - // we mutate the inode we opened, though it does not protect against symlinks in ancestor path - // components. - let parent_c = CString::new(parent_dir.as_os_str().as_bytes().to_vec())?; - let fd = match open_ipc_parent_dir_fd(&parent_c) { - Ok(fd) => fd, - Err(open_err) => { - // If the directory doesn't exist yet, create it with the expected mode. The parent - // dir is intended to be a single-level /tmp path, so mkdir is sufficient here. - if open_err.raw_os_error() == Some(hbb_common::libc::ENOENT) { - let expected_mode = expected_ipc_parent_mode(postfix); - let rc = unsafe { - hbb_common::libc::mkdir( - parent_c.as_ptr(), - expected_mode as hbb_common::libc::mode_t, - ) - }; - if rc != 0 { - let mkdir_err = std::io::Error::last_os_error(); - // Handle a race where another process created the directory first. - if mkdir_err.raw_os_error() != Some(hbb_common::libc::EEXIST) { - return Err(Error::new( - mkdir_err.kind(), - format!( - "failed to mkdir ipc parent dir: postfix={}, parent={}, err={}", - postfix, - parent_dir.display(), - mkdir_err - ), - ) - .into()); - } - } - match open_ipc_parent_dir_fd(&parent_c) { - Ok(fd) => fd, - Err(err) => { - return Err(Error::new( - err.kind(), - format!( - "failed to open ipc parent dir (no-follow): postfix={}, parent={}, err={}", - postfix, - parent_dir.display(), - err - ), - ) - .into()); - } - } - } else { - return Err(Error::new( - open_err.kind(), - format!( - "failed to open ipc parent dir (no-follow): postfix={}, parent={}, err={}", - postfix, - parent_dir.display(), - open_err - ), - ) - .into()); - } - } - }; - let _fd_guard = FdGuard(fd); - - let mut st: hbb_common::libc::stat = unsafe { std::mem::zeroed() }; - if unsafe { hbb_common::libc::fstat(fd, &mut st as *mut _) } != 0 { - let os_err = std::io::Error::last_os_error(); - return Err(Error::new( - os_err.kind(), - format!( - "failed to stat ipc parent dir: postfix={}, parent={}, err={}", - postfix, - parent_dir.display(), - os_err - ), - ) - .into()); - } - let mode = st.st_mode as u32; - let is_dir = (mode & (hbb_common::libc::S_IFMT as u32)) == (hbb_common::libc::S_IFDIR as u32); - if !is_dir { - return Err(Error::new( - ErrorKind::PermissionDenied, - format!( - "ipc parent is not directory: postfix={}, parent={}", - postfix, - parent_dir.display() - ), - ) - .into()); - } - - let expected_uid = unsafe { hbb_common::libc::geteuid() as u32 }; - let mut owner_uid = st.st_uid as u32; - let mut adopted_foreign_service_parent = false; - // Service-scoped IPC may be created by different privilege contexts historically. - // If running as root on protected service postfix, try adopting ownership first. - if owner_uid != expected_uid && expected_uid == 0 && config::is_service_ipc_postfix(postfix) { - let rc = unsafe { - hbb_common::libc::fchown( - fd, - expected_uid as hbb_common::libc::uid_t, - hbb_common::libc::gid_t::MAX, - ) - }; - if rc == 0 { - let mut st2: hbb_common::libc::stat = unsafe { std::mem::zeroed() }; - if unsafe { hbb_common::libc::fstat(fd, &mut st2 as *mut _) } == 0 { - owner_uid = st2.st_uid as u32; - st = st2; - adopted_foreign_service_parent = true; - } - } else { - // Keep behavior unchanged; capture errno to ease diagnosing why chown failed. - let err = std::io::Error::last_os_error(); - log::warn!( - "Failed to chown ipc parent dir, parent={}, postfix={}, expected_uid={}, rc={}, err={:?}", - parent_dir.display(), - postfix, - expected_uid, - rc, - err - ); - } - } - if owner_uid != expected_uid { - return Err(Error::new( - ErrorKind::PermissionDenied, - format!( - "unsafe ipc parent owner, postfix={}, expected uid {expected_uid}, got {owner_uid}: {}", - postfix, - parent_dir.display() - ), - ) - .into()); - } - - let expected_mode = expected_ipc_parent_mode(postfix); - // Include special bits (setuid/setgid/sticky) to ensure the directory is hardened to the exact - // expected mode. - let current_mode = (st.st_mode as u32) & 0o7777; - let repaired_parent_mode = current_mode != expected_mode; - let had_untrusted_parent_mode = (current_mode & 0o022) != 0; - if repaired_parent_mode { - // Use fchmod on the opened fd to avoid path-race between check and chmod. - if unsafe { hbb_common::libc::fchmod(fd, expected_mode as hbb_common::libc::mode_t) } != 0 { - let os_err = std::io::Error::last_os_error(); - return Err(Error::new( - os_err.kind(), - format!( - "failed to chmod ipc parent dir: postfix={}, parent={}, err={}", - postfix, - parent_dir.display(), - os_err - ), - ) - .into()); - } - } - let should_scrub = - repaired_parent_mode || adopted_foreign_service_parent || had_untrusted_parent_mode; - Ok(should_scrub) -} - -pub(crate) fn scrub_secure_ipc_parent_dir(path: &str, postfix: &str) -> ResultType<()> { - let parent_dir = Path::new(path) - .parent() - .ok_or_else(|| Error::new(ErrorKind::InvalidInput, format!("invalid ipc path: {path}")))?; - let parent_c = CString::new(parent_dir.as_os_str().as_bytes().to_vec())?; - let fd = open_ipc_parent_dir_fd(&parent_c).map_err(|err| { - Error::new( - err.kind(), - format!( - "failed to open ipc parent dir for scrub (no-follow): postfix={}, parent={}, err={}", - postfix, - parent_dir.display(), - err - ), - ) - })?; - let _fd_guard = FdGuard(fd); - scrub_preexisting_ipc_parent_entries(fd, parent_dir, postfix) -} - -#[inline] -pub(crate) fn get_pid_file(postfix: &str) -> String { - let path = config::Config::ipc_path(postfix); - format!("{}.pid", path) -} - -// Purpose: -// - Write current process pid to pid file without following attacker-controlled symlinks. -// - Ensure the pid file is a regular file owned by the opened inode path. -// -// Approach: -// - Use libc open/fstat/write syscalls (FFI) so flags and inode validation are explicit. -// - Open file with O_NOFOLLOW/O_CLOEXEC and verify S_IFREG with fstat before write. -// - Keep unsafe scopes minimal and check syscall return values immediately. -// -// Main steps: -// 1) Secure-open pid file (without truncation). -// 2) Validate opened inode is a regular file owned by current euid. -// 3) Enforce pid file mode to 0600 and truncate via ftruncate after validation. -// 4) Write process id bytes through fd. -// -// Why not plain std::fs::write? -// - std::fs helpers cannot enforce this exact open-time hardening sequence -// (especially "open with O_NOFOLLOW, then fstat the same opened inode"). -// -// References: -// - open(2): O_NOFOLLOW/O_CLOEXEC/O_NONBLOCK -// https://man7.org/linux/man-pages/man2/open.2.html -// - fstat(2): verify file type on opened fd -// https://man7.org/linux/man-pages/man2/fstat.2.html -// - fchmod(2): enforce secure mode on reused pid file -// https://man7.org/linux/man-pages/man2/fchmod.2.html -// - ftruncate(2): truncate after validation -// https://man7.org/linux/man-pages/man2/ftruncate.2.html -// - write(2): write bytes via fd -// https://man7.org/linux/man-pages/man2/write.2.html -fn write_pid_file(path: &Path) -> ResultType<()> { - let path_c = CString::new(path.as_os_str().as_bytes().to_vec()).map_err(|err| { - Error::new( - ErrorKind::InvalidInput, - format!("invalid pid file path '{}': {}", path.display(), err), - ) - })?; - let flags = hbb_common::libc::O_WRONLY - | hbb_common::libc::O_CREAT - | hbb_common::libc::O_CLOEXEC - | hbb_common::libc::O_NOFOLLOW - | hbb_common::libc::O_NONBLOCK; - let fd = unsafe { hbb_common::libc::open(path_c.as_ptr(), flags, 0o0600) }; - if fd < 0 { - let os_err = std::io::Error::last_os_error(); - return Err(Error::new( - os_err.kind(), - format!( - "failed to open pid file with no-follow '{}': {}", - path.display(), - os_err - ), - ) - .into()); - } - let _fd_guard = FdGuard(fd); - let mut stat: hbb_common::libc::stat = unsafe { std::mem::zeroed() }; - if unsafe { hbb_common::libc::fstat(fd, &mut stat) } != 0 { - let os_err = std::io::Error::last_os_error(); - return Err(Error::new( - os_err.kind(), - format!("failed to stat pid file '{}': {}", path.display(), os_err), - ) - .into()); - } - if (stat.st_mode & (hbb_common::libc::S_IFMT as hbb_common::libc::mode_t)) - != (hbb_common::libc::S_IFREG as hbb_common::libc::mode_t) - { - return Err(Error::new( - ErrorKind::PermissionDenied, - format!("pid file path is not a regular file: '{}'", path.display()), - ) - .into()); - } - let expected_uid = unsafe { hbb_common::libc::geteuid() as u32 }; - if stat.st_uid as u32 != expected_uid { - return Err(Error::new( - ErrorKind::PermissionDenied, - format!( - "pid file owner mismatch: expected uid {}, got {} for '{}'", - expected_uid, - stat.st_uid, - path.display() - ), - ) - .into()); - } - if unsafe { hbb_common::libc::fchmod(fd, 0o600) } != 0 { - let os_err = std::io::Error::last_os_error(); - return Err(Error::new( - os_err.kind(), - format!("failed to chmod pid file '{}': {}", path.display(), os_err), - ) - .into()); - } - if unsafe { hbb_common::libc::ftruncate(fd, 0) } != 0 { - let os_err = std::io::Error::last_os_error(); - return Err(Error::new( - os_err.kind(), - format!( - "failed to truncate pid file '{}': {}", - path.display(), - os_err - ), - ) - .into()); - } - - let bytes = std::process::id().to_string(); - let buf = bytes.as_bytes(); - // `write(2)` is allowed to return a short write even for regular files. - // PID content is tiny and usually written in one shot, but we still loop - // until all bytes are persisted so this path is semantically correct. - let mut written = 0usize; - while written < buf.len() { - let rc = unsafe { - hbb_common::libc::write( - fd, - buf[written..].as_ptr() as *const hbb_common::libc::c_void, - buf.len() - written, - ) - }; - if rc < 0 { - let os_err = std::io::Error::last_os_error(); - return Err(Error::new( - os_err.kind(), - format!("failed to write pid file '{}': {}", path.display(), os_err), - ) - .into()); - } - if rc == 0 { - return Err(Error::new( - ErrorKind::WriteZero, - format!( - "failed to write pid file '{}': write returned 0 bytes", - path.display() - ), - ) - .into()); - } - written += rc as usize; - } - Ok(()) -} - -#[inline] -pub(crate) fn write_pid(postfix: &str) { - let path = std::path::PathBuf::from(get_pid_file(postfix)); - if let Err(err) = write_pid_file(&path) { - log::warn!( - "Failed to write pid file for postfix '{}', path='{}', err={}", - postfix, - path.display(), - err - ); - } -} - -// Purpose: -// - Read pid file safely and avoid trusting symlink/non-regular files. -// -// Approach: -// - Use libc open/fstat/read syscalls (FFI) to control flags and inode checks. -// - Open path with O_NOFOLLOW, validate opened fd via fstat, then read and parse. -// - Keep unsafe scopes minimal and check syscall return values immediately. -// -// Main steps: -// 1) Secure-open pid file read-only. -// 2) Ensure fd points to regular file. -// 3) Read bytes and parse usize pid. -// -// References: -// - open(2): O_NOFOLLOW/O_CLOEXEC/O_NONBLOCK -// https://man7.org/linux/man-pages/man2/open.2.html -// - fstat(2): validate S_IFREG on opened fd -// https://man7.org/linux/man-pages/man2/fstat.2.html -// - read(2): read bytes via fd -// https://man7.org/linux/man-pages/man2/read.2.html -#[inline] -fn read_pid_file_secure(path: &Path) -> Option { - let path_c = CString::new(path.as_os_str().as_bytes().to_vec()).ok()?; - let flags = hbb_common::libc::O_RDONLY - | hbb_common::libc::O_CLOEXEC - | hbb_common::libc::O_NOFOLLOW - | hbb_common::libc::O_NONBLOCK; - let fd = unsafe { hbb_common::libc::open(path_c.as_ptr(), flags) }; - if fd < 0 { - return None; - } - let _fd_guard = FdGuard(fd); - - let mut stat: hbb_common::libc::stat = unsafe { std::mem::zeroed() }; - if unsafe { hbb_common::libc::fstat(fd, &mut stat) } != 0 { - return None; - } - if (stat.st_mode & (hbb_common::libc::S_IFMT as hbb_common::libc::mode_t)) - != (hbb_common::libc::S_IFREG as hbb_common::libc::mode_t) - { - return None; - } - - let mut buffer = [0u8; 64]; - let read_len = unsafe { - hbb_common::libc::read( - fd, - buffer.as_mut_ptr() as *mut hbb_common::libc::c_void, - buffer.len(), - ) - }; - if read_len <= 0 { - return None; - } - let content = String::from_utf8_lossy(&buffer[..read_len as usize]).to_string(); - content.trim().parse::().ok() -} - -#[inline] -async fn probe_existing_listener(postfix: &str) -> bool { - let Ok(mut stream) = connect(1000, postfix).await else { - return false; - }; - if postfix != crate::POSTFIX_SERVICE { - return true; - } - if stream.send(&Data::SyncConfig(None)).await.is_err() { - return false; - } - matches!( - stream.next_timeout(1000).await, - Ok(Some(Data::SyncConfig(Some(_)))) - ) -} - -pub(crate) async fn check_pid(postfix: &str) -> bool { - let pid_file = std::path::PathBuf::from(get_pid_file(postfix)); - if let Some(pid) = read_pid_file_secure(&pid_file) { - if pid > 0 { - let mut sys = hbb_common::sysinfo::System::new(); - sys.refresh_processes(); - if let Some(p) = sys.process(pid.into()) { - if let Some(current) = sys.process((std::process::id() as usize).into()) { - if current.name() == p.name() && probe_existing_listener(postfix).await { - return true; - } - } - } - } - } - if probe_existing_listener(postfix).await { - return true; - } - // if not remove old ipc file, the new ipc creation will fail - // if we remove a ipc file, but the old ipc process is still running, - // new connection to the ipc will connect to new ipc, old connection to old ipc still keep alive - if let Err(err) = remove_ipc_socket_via_secure_parent_fd(postfix) { - log::debug!( - "Failed to remove stale ipc socket via secure parent fd: postfix={}, err={}", - postfix, - err - ); - } - false -} - -#[inline] -pub(crate) fn should_scrub_parent_entries_after_check_pid( - should_scrub_parent_entries: bool, - existing_listener_alive: bool, -) -> bool { - should_scrub_parent_entries && !existing_listener_alive -} - -#[cfg(test)] -mod tests { - #[test] - fn test_write_pid_file_rejects_symlink() { - use std::os::unix::fs::symlink; - - let unique = format!( - "rustdesk-ipc-pid-file-test-{}-{}", - std::process::id(), - std::time::SystemTime::now() - .duration_since(std::time::UNIX_EPOCH) - .unwrap_or_default() - .as_nanos() - ); - let base = std::env::temp_dir().join(unique); - std::fs::create_dir_all(&base).unwrap(); - - let target = base.join("target_pid"); - std::fs::write(&target, b"origin").unwrap(); - let link = base.join("pid_link"); - symlink(&target, &link).unwrap(); - - let res = super::write_pid_file(&link); - assert!(res.is_err()); - assert_eq!(std::fs::read_to_string(&target).unwrap(), "origin"); - - std::fs::remove_file(&link).ok(); - std::fs::remove_file(&target).ok(); - std::fs::remove_dir_all(&base).ok(); - } - - #[test] - fn test_ensure_secure_ipc_parent_dir_rejects_symlink_parent() { - use std::os::unix::fs::symlink; - - let unique = format!( - "rustdesk-ipc-secure-dir-test-{}-{}", - std::process::id(), - std::time::SystemTime::now() - .duration_since(std::time::UNIX_EPOCH) - .unwrap_or_default() - .as_nanos() - ); - let base = std::env::temp_dir().join(unique); - let real_dir = base.join("real"); - let link_dir = base.join("link"); - std::fs::create_dir_all(&real_dir).unwrap(); - symlink(&real_dir, &link_dir).unwrap(); - let ipc_path = link_dir.join("ipc_service"); - let res = - super::ensure_secure_ipc_parent_dir(ipc_path.to_string_lossy().as_ref(), "_service"); - assert!(res.is_err()); - std::fs::remove_file(&link_dir).ok(); - std::fs::remove_dir_all(&real_dir).ok(); - std::fs::remove_dir_all(&base).ok(); - } - - #[test] - fn test_ensure_secure_ipc_parent_dir_creates_parent_with_expected_mode() { - use std::os::unix::fs::PermissionsExt; - - let unique = format!( - "rustdesk-ipc-secure-dir-create-test-{}-{}", - std::process::id(), - std::time::SystemTime::now() - .duration_since(std::time::UNIX_EPOCH) - .unwrap_or_default() - .as_nanos() - ); - let base = std::env::temp_dir().join(unique); - std::fs::create_dir_all(&base).unwrap(); - - // Intentionally choose a parent that does not exist to exercise the ENOENT -> mkdir branch. - let parent_dir = base.join("parent"); - assert!(!parent_dir.exists()); - let ipc_path = parent_dir.join("ipc"); - - let res = super::ensure_secure_ipc_parent_dir(ipc_path.to_string_lossy().as_ref(), ""); - // Restrictive umask can make mkdir create a stricter initial mode. In that case - // ensure_secure_ipc_parent_dir repairs it with fchmod and may request a scrub. - res.unwrap(); - - let md = std::fs::metadata(&parent_dir).unwrap(); - assert!(md.is_dir()); - let mode = md.permissions().mode() & 0o777; - assert_eq!(mode, 0o0700); - - std::fs::remove_dir_all(&base).ok(); - } - - #[test] - fn test_scrub_preexisting_ipc_parent_entries_only_removes_target_postfix_artifacts() { - use std::os::unix::ffi::OsStrExt; - - let unique = format!( - "rustdesk-ipc-scrub-test-{}-{}", - std::process::id(), - std::time::SystemTime::now() - .duration_since(std::time::UNIX_EPOCH) - .unwrap_or_default() - .as_nanos() - ); - let base = std::env::temp_dir().join(unique); - std::fs::create_dir_all(&base).unwrap(); - - let ipc_file = base.join("ipc_service"); - let ipc_pid_file = base.join("ipc_service.pid"); - let ipc_other_postfix_file = base.join("ipc_uinput_1"); - let keep_file = base.join("keep.txt"); - let keep_dir = base.join("keep_dir"); - - std::fs::write(&ipc_file, b"socket-placeholder").unwrap(); - std::fs::write(&ipc_pid_file, b"1234").unwrap(); - std::fs::write(&ipc_other_postfix_file, b"other-postfix").unwrap(); - std::fs::write(&keep_file, b"keep").unwrap(); - std::fs::create_dir_all(&keep_dir).unwrap(); - - let base_c = std::ffi::CString::new(base.as_os_str().as_bytes().to_vec()).unwrap(); - let base_fd = super::open_ipc_parent_dir_fd(&base_c).unwrap(); - let _base_guard = super::FdGuard(base_fd); - super::scrub_preexisting_ipc_parent_entries(base_fd, &base, "_service").unwrap(); - - assert!(!ipc_file.exists()); - assert!(!ipc_pid_file.exists()); - assert!(ipc_other_postfix_file.exists()); - assert!(keep_file.exists()); - assert!(keep_dir.exists()); - - std::fs::remove_file(&ipc_other_postfix_file).ok(); - std::fs::remove_file(&keep_file).ok(); - std::fs::remove_dir_all(&keep_dir).ok(); - std::fs::remove_dir_all(&base).ok(); - } - - #[test] - fn test_scrub_preexisting_ipc_parent_entries_should_bind_to_opened_inode_not_path() { - use std::os::unix::ffi::OsStrExt; - - let unique = format!( - "rustdesk-ipc-scrub-fd-bind-test-{}-{}", - std::process::id(), - std::time::SystemTime::now() - .duration_since(std::time::UNIX_EPOCH) - .unwrap_or_default() - .as_nanos() - ); - let base = std::env::temp_dir().join(unique); - std::fs::create_dir_all(&base).unwrap(); - - let trusted_parent = base.join("trusted_parent"); - let trusted_parent_moved = base.join("trusted_parent_moved"); - let attacker_parent = base.join("attacker_parent"); - std::fs::create_dir_all(&trusted_parent).unwrap(); - std::fs::create_dir_all(&attacker_parent).unwrap(); - - let trusted_ipc_file = trusted_parent.join("ipc_service"); - let attacker_ipc_file = attacker_parent.join("ipc_service"); - std::fs::write(&trusted_ipc_file, b"trusted").unwrap(); - std::fs::write(&attacker_ipc_file, b"attacker").unwrap(); - - let trusted_parent_c = - std::ffi::CString::new(trusted_parent.as_os_str().as_bytes().to_vec()).unwrap(); - let trusted_parent_fd = super::open_ipc_parent_dir_fd(&trusted_parent_c).unwrap(); - let _trusted_parent_guard = super::FdGuard(trusted_parent_fd); - - // Swap the path after the trusted inode has been opened. - std::fs::rename(&trusted_parent, &trusted_parent_moved).unwrap(); - std::fs::rename(&attacker_parent, &trusted_parent).unwrap(); - - super::scrub_preexisting_ipc_parent_entries(trusted_parent_fd, &trusted_parent, "_service") - .unwrap(); - - // Expected secure behavior: scrub should target the inode that was opened before path swap. - assert!( - !trusted_parent_moved.join("ipc_service").exists(), - "trusted inode artifact should be removed even after path swap" - ); - assert!( - trusted_parent.join("ipc_service").exists(), - "path-swapped attacker directory should not be scrubbed" - ); - - std::fs::remove_dir_all(&base).ok(); - } - - #[test] - fn test_ensure_secure_ipc_parent_dir_keeps_service_artifacts_before_liveness_probe() { - use std::os::unix::fs::PermissionsExt; - - let unique = format!( - "rustdesk-ipc-secure-dir-order-test-{}-{}", - std::process::id(), - std::time::SystemTime::now() - .duration_since(std::time::UNIX_EPOCH) - .unwrap_or_default() - .as_nanos() - ); - let base = std::env::temp_dir().join(unique); - std::fs::create_dir_all(&base).unwrap(); - - let parent_dir = base.join("service_parent"); - std::fs::create_dir_all(&parent_dir).unwrap(); - // Trigger "had_untrusted_service_parent_mode". - std::fs::set_permissions(&parent_dir, std::fs::Permissions::from_mode(0o777)).unwrap(); - - let ipc_file = parent_dir.join("ipc_service"); - let ipc_pid_file = parent_dir.join("ipc_service.pid"); - std::fs::write(&ipc_file, b"socket-placeholder").unwrap(); - std::fs::write(&ipc_pid_file, b"1234").unwrap(); - - let res = - super::ensure_secure_ipc_parent_dir(ipc_file.to_string_lossy().as_ref(), "_service"); - assert_eq!(res.unwrap(), true); - - // Parent hardening should run first; artifacts should stay until liveness probe completes. - assert!(ipc_file.exists(), "ipc socket marker should be preserved"); - assert!(ipc_pid_file.exists(), "pid marker should be preserved"); - - std::fs::remove_dir_all(&base).ok(); - } - - #[test] - fn test_ensure_secure_ipc_parent_dir_marks_non_service_mode_repair_for_scrub() { - use std::os::unix::fs::PermissionsExt; - - let unique = format!( - "rustdesk-ipc-nonservice-mode-repair-test-{}-{}", - std::process::id(), - std::time::SystemTime::now() - .duration_since(std::time::UNIX_EPOCH) - .unwrap_or_default() - .as_nanos() - ); - let base = std::env::temp_dir().join(unique); - std::fs::create_dir_all(&base).unwrap(); - - let parent_dir = base.join("non_service_parent"); - std::fs::create_dir_all(&parent_dir).unwrap(); - std::fs::set_permissions(&parent_dir, std::fs::Permissions::from_mode(0o755)).unwrap(); - - let ipc_file = parent_dir.join("ipc"); - std::fs::write(&ipc_file, b"socket-placeholder").unwrap(); - - let res = super::ensure_secure_ipc_parent_dir(ipc_file.to_string_lossy().as_ref(), ""); - assert_eq!(res.unwrap(), true); - - std::fs::remove_dir_all(&base).ok(); - } - - #[test] - fn test_should_scrub_parent_entries_after_check_pid_only_when_requested_and_not_alive() { - assert!(!super::should_scrub_parent_entries_after_check_pid( - false, false - )); - assert!(!super::should_scrub_parent_entries_after_check_pid( - false, true - )); - assert!(super::should_scrub_parent_entries_after_check_pid( - true, false - )); - assert!(!super::should_scrub_parent_entries_after_check_pid( - true, true - )); - } -} diff --git a/src/keyboard.rs b/src/keyboard.rs index b9cf4da2d..bc9ec8a77 100644 --- a/src/keyboard.rs +++ b/src/keyboard.rs @@ -32,33 +32,9 @@ const OS_LOWER_MACOS: &str = "macos"; #[allow(dead_code)] const OS_LOWER_ANDROID: &str = "android"; -#[cfg(any(target_os = "windows", target_os = "macos", target_os = "linux"))] +#[cfg(any(target_os = "windows", target_os = "macos"))] static KEYBOARD_HOOKED: AtomicBool = AtomicBool::new(false); -// Track key down state for relative mouse mode exit shortcut. -// macOS: Cmd+G (track G key) -// Windows/Linux: Ctrl+Alt (track whichever modifier was pressed last) -// This prevents the exit from retriggering on OS key-repeat. -#[cfg(all(feature = "flutter", any(target_os = "windows", target_os = "macos", target_os = "linux")))] -static EXIT_SHORTCUT_KEY_DOWN: AtomicBool = AtomicBool::new(false); - -// Track whether relative mouse mode is currently active. -// This is set by Flutter via set_relative_mouse_mode_state() and checked -// by the rdev grab loop to determine if exit shortcuts should be processed. -#[cfg(all(feature = "flutter", any(target_os = "windows", target_os = "macos", target_os = "linux")))] -static RELATIVE_MOUSE_MODE_ACTIVE: AtomicBool = AtomicBool::new(false); - -/// Set the relative mouse mode state from Flutter. -/// This is called when entering or exiting relative mouse mode. -#[cfg(all(feature = "flutter", any(target_os = "windows", target_os = "macos", target_os = "linux")))] -pub fn set_relative_mouse_mode_state(active: bool) { - RELATIVE_MOUSE_MODE_ACTIVE.store(active, Ordering::SeqCst); - // Reset exit shortcut state when mode changes to avoid stale state - if !active { - EXIT_SHORTCUT_KEY_DOWN.store(false, Ordering::SeqCst); - } -} - #[cfg(feature = "flutter")] #[cfg(not(any(target_os = "android", target_os = "ios")))] static IS_RDEV_ENABLED: AtomicBool = AtomicBool::new(false); @@ -82,67 +58,8 @@ lazy_static::lazy_static! { pub mod client { use super::*; - /// Tracks grab ownership and serializes transitions across threads. - /// - /// Multiple Flutter isolates (one per session window) call - /// `change_grab_status(Run/Wait)` concurrently. Without serialization a - /// stale `Wait` from session A can clobber session B's freshly acquired - /// grab on any desktop OS. - /// - /// Windows and macOS are less susceptible in practice because the Flutter - /// side triggers `enterView` only after a mouse click inside the window, - /// but we cannot rely on that. On Linux/X11, `XGrabKeyboard` can also - /// cause a focus-change feedback loop (~10 Hz), so `last_grab` debounces - /// spurious `Wait` events that arrive shortly after a `Run`. - #[derive(Default)] - struct GrabOwnerState { - owner: Option, - last_grab: Option, - /// True while a deferred-release thread is in flight. Prevents - /// spawning redundant threads during the X11 feedback loop. - deferred_pending: bool, - } - - /// How long after a grab acquisition we suppress Wait from the same session. - /// Must exceed one full X11 feedback cycle (~100 ms: 50 ms enable + 50 ms disable). - #[cfg(target_os = "linux")] - const GRAB_DEBOUNCE_MS: u128 = 300; - lazy_static::lazy_static! { static ref IS_GRAB_STARTED: Arc> = Arc::new(Mutex::new(false)); - static ref GRAB_STATE: Arc> = Arc::new(Mutex::new(GrabOwnerState::default())); - } - - #[cfg(target_os = "linux")] - lazy_static::lazy_static! { - static ref GRAB_OP_LOCK: Mutex<()> = Mutex::new(()); - } - - #[cfg(target_os = "linux")] - fn apply_run_grab_if_owner(session_id: u128, disable_first: bool) { - let _lock = GRAB_OP_LOCK.lock().unwrap(); - let gs = GRAB_STATE.lock().unwrap(); - if gs.owner != Some(session_id) { - return; - } - drop(gs); - if disable_first { - log::debug!("[grab] handoff: disable_grab before re-grab"); - rdev::disable_grab(); - } - rdev::enable_grab(); - } - - #[cfg(target_os = "linux")] - fn disable_grab_if_released() { - let _lock = GRAB_OP_LOCK.lock().unwrap(); - let should_disable = { - let gs = GRAB_STATE.lock().unwrap(); - gs.owner.is_none() && gs.last_grab.is_none() - }; - if should_disable { - rdev::disable_grab(); - } } pub fn start_grab_loop() { @@ -155,167 +72,36 @@ pub mod client { } #[cfg(not(any(target_os = "android", target_os = "ios")))] - pub fn change_grab_status(state: GrabState, keyboard_mode: &str, session_id: u128) { + pub fn change_grab_status(state: GrabState, keyboard_mode: &str) { #[cfg(feature = "flutter")] if !IS_RDEV_ENABLED.load(Ordering::SeqCst) { return; } - // Serialize transitions so a stale `Wait` from a previous owner cannot - // clobber a fresh `Run` from a different session window. - let mut release_after_unlock = None; - #[cfg(target_os = "linux")] - let mut run_grab_after_unlock = None; - #[cfg(target_os = "linux")] - let mut disable_after_unlock = false; - let mut gs = GRAB_STATE.lock().unwrap(); match state { GrabState::Ready => {} GrabState::Run => { #[cfg(windows)] update_grab_get_key_name(keyboard_mode); - - // Idempotent: if this session already owns the grab, just - // refresh the debounce timer (proves the session is still - // actively focused) and skip the actual grab call. - if gs.owner == Some(session_id) { - gs.last_grab = Some(std::time::Instant::now()); - // Reset so the next Wait can spawn a fresh deferred-release - // timer with an up-to-date snapshot of last_grab. - gs.deferred_pending = false; - log::debug!( - "[grab] Run(0x{:x}): already owner, refresh debounce", - session_id - ); - return; - } - - log::debug!( - "[grab] Run(0x{:x}): prev_owner={}, mode={}", - session_id, - gs.owner - .map_or("none".to_string(), |id| format!("0x{:x}", id)), - keyboard_mode, - ); - - #[cfg(any(target_os = "windows", target_os = "macos", target_os = "linux"))] - KEYBOARD_HOOKED.store(true, Ordering::SeqCst); + #[cfg(any(target_os = "windows", target_os = "macos"))] + KEYBOARD_HOOKED.swap(true, Ordering::SeqCst); #[cfg(target_os = "linux")] - let had_owner = gs.owner.is_some(); - gs.owner = Some(session_id); - gs.last_grab = Some(std::time::Instant::now()); - // Invalidate any in-flight deferred release from the previous - // owner so it cannot suppress a fresh timer for the new owner. - gs.deferred_pending = false; - #[cfg(target_os = "linux")] - { - run_grab_after_unlock = Some(had_owner); - } + rdev::enable_grab(); } GrabState::Wait => { - // Drop stale `Wait` events that do not correspond to the - // current grab owner. This prevents a late PointerExit from - // session A from releasing session B's freshly acquired grab. - if gs.owner != Some(session_id) { - log::debug!( - "[grab] Wait(0x{:x}): ignored, owner={}", - session_id, - gs.owner - .map_or("none".to_string(), |id| format!("0x{:x}", id)), - ); - return; - } - - // Debounce: on Linux/X11, XGrabKeyboard causes a focus-change - // feedback loop (grab -> PointerExit -> ungrab -> PointerEnter -> - // grab -> ...). Suppress Wait if the grab was acquired recently - // by this same session -- it is X11 feedback, not a real leave. - // A deferred release is scheduled so that a genuine leave within - // the debounce window is not permanently lost. - #[cfg(target_os = "linux")] - if let Some(t) = gs.last_grab { - let elapsed = t.elapsed().as_millis(); - if elapsed < GRAB_DEBOUNCE_MS { - if !gs.deferred_pending { - log::debug!( - "[grab] Wait(0x{:x}): debounced ({}ms < {}ms), scheduling deferred release", - session_id, elapsed, GRAB_DEBOUNCE_MS, - ); - gs.deferred_pending = true; - let remaining = (GRAB_DEBOUNCE_MS - elapsed) as u64 + 50; - let snapshot = gs.last_grab; - let mode = keyboard_mode.to_string(); - std::thread::spawn(move || { - std::thread::sleep(std::time::Duration::from_millis(remaining)); - let release_keys = { - let mut gs = GRAB_STATE.lock().unwrap(); - // Release only if no new Run has refreshed the grab since. - if gs.owner == Some(session_id) && gs.last_grab == snapshot { - let to_release = take_remote_keys(); - gs.deferred_pending = false; - log::debug!( - "[grab] Wait(0x{:x}): deferred release", - session_id - ); - KEYBOARD_HOOKED.store(false, Ordering::SeqCst); - gs.owner = None; - gs.last_grab = None; - Some(to_release) - } else { - log::debug!( - "[grab] Wait(0x{:x}): deferred release cancelled (grab refreshed)", - session_id, - ); - None - } - }; - if let Some(to_release) = release_keys { - disable_grab_if_released(); - release_remote_keys_for_events(&mode, to_release); - } - }); - } else { - log::debug!( - "[grab] Wait(0x{:x}): debounced, deferred release already pending", - session_id, - ); - } - return; - } - } - - log::debug!("[grab] Wait(0x{:x}): releasing grab", session_id); - #[cfg(windows)] rdev::set_get_key_unicode(false); - #[cfg(any(target_os = "windows", target_os = "macos", target_os = "linux"))] - KEYBOARD_HOOKED.store(false, Ordering::SeqCst); + release_remote_keys(keyboard_mode); + + #[cfg(any(target_os = "windows", target_os = "macos"))] + KEYBOARD_HOOKED.swap(false, Ordering::SeqCst); - gs.owner = None; - gs.last_grab = None; - gs.deferred_pending = false; - release_after_unlock = Some(take_remote_keys()); #[cfg(target_os = "linux")] - { - disable_after_unlock = true; - } + rdev::disable_grab(); } GrabState::Exit => {} } - drop(gs); - #[cfg(target_os = "linux")] - { - if disable_after_unlock { - disable_grab_if_released(); - } - if let Some(disable_first) = run_grab_after_unlock { - apply_run_grab_if_owner(session_id, disable_first); - } - } - if let Some(to_release) = release_after_unlock { - release_remote_keys_for_events(keyboard_mode, to_release); - } } pub fn process_event(keyboard_mode: &str, event: &Event, lock_modes: Option) { @@ -480,135 +266,6 @@ fn get_keyboard_mode() -> String { "legacy".to_string() } -/// Check if exit shortcut for relative mouse mode is active. -/// Exit shortcuts (only exits, not toggles): -/// - macOS: Cmd+G -/// - Windows/Linux: Ctrl+Alt (triggered when both are pressed) -/// Note: This shortcut is only available in Flutter client. Sciter client does not support relative mouse mode. -#[cfg(feature = "flutter")] -#[cfg(any(target_os = "windows", target_os = "macos", target_os = "linux"))] -fn is_exit_relative_mouse_shortcut(key: Key) -> bool { - let modifiers = MODIFIERS_STATE.lock().unwrap(); - - #[cfg(target_os = "macos")] - { - // macOS: Cmd+G to exit - if key != Key::KeyG { - return false; - } - let meta = *modifiers.get(&Key::MetaLeft).unwrap_or(&false) - || *modifiers.get(&Key::MetaRight).unwrap_or(&false); - return meta; - } - - #[cfg(not(target_os = "macos"))] - { - // Windows/Linux: Ctrl+Alt to exit - // Triggered when Ctrl is pressed while Alt is down, or Alt is pressed while Ctrl is down - let is_ctrl_key = key == Key::ControlLeft || key == Key::ControlRight; - let is_alt_key = key == Key::Alt || key == Key::AltGr; - - if !is_ctrl_key && !is_alt_key { - return false; - } - - let ctrl = *modifiers.get(&Key::ControlLeft).unwrap_or(&false) - || *modifiers.get(&Key::ControlRight).unwrap_or(&false); - let alt = *modifiers.get(&Key::Alt).unwrap_or(&false) - || *modifiers.get(&Key::AltGr).unwrap_or(&false); - - // When Ctrl is pressed and Alt is already down, or vice versa - (is_ctrl_key && alt) || (is_alt_key && ctrl) - } -} - -/// Notify Flutter to exit relative mouse mode. -/// Note: This is Flutter-only. Sciter client does not support relative mouse mode. -#[cfg(feature = "flutter")] -#[cfg(any(target_os = "windows", target_os = "macos", target_os = "linux"))] -fn notify_exit_relative_mouse_mode() { - let session_id = flutter::get_cur_session_id(); - flutter::push_session_event(&session_id, "exit_relative_mouse_mode", vec![]); -} - -/// Handle relative mouse mode shortcuts in the rdev grab loop. -/// Returns true if the event should be blocked from being sent to the peer. -#[cfg(feature = "flutter")] -#[cfg(any(target_os = "windows", target_os = "macos", target_os = "linux"))] -#[inline] -fn can_exit_relative_mouse_mode_from_grab_loop() -> bool { - // Only process exit shortcuts when relative mouse mode is actually active. - // This prevents blocking Ctrl+Alt (or Cmd+G) when not in relative mouse mode. - if !RELATIVE_MOUSE_MODE_ACTIVE.load(Ordering::SeqCst) { - return false; - } - - let Some(session) = flutter::get_cur_session() else { - return false; - }; - - // Only for remote desktop sessions. - if !session.is_default() { - return false; - } - - // Must have keyboard permission and not be in view-only mode. - if !*session.server_keyboard_enabled.read().unwrap() { - return false; - } - let lc = session.lc.read().unwrap(); - if lc.view_only.v { - return false; - } - - // Peer must support relative mouse mode. - crate::common::is_support_relative_mouse_mode_num(lc.version) -} - -#[cfg(feature = "flutter")] -#[cfg(any(target_os = "windows", target_os = "macos", target_os = "linux"))] -#[inline] -fn should_block_relative_mouse_shortcut(key: Key, is_press: bool) -> bool { - if !KEYBOARD_HOOKED.load(Ordering::SeqCst) { - return false; - } - - // Determine which key to track for key-up blocking based on platform - #[cfg(target_os = "macos")] - let is_tracked_key = key == Key::KeyG; - #[cfg(not(target_os = "macos"))] - let is_tracked_key = key == Key::ControlLeft - || key == Key::ControlRight - || key == Key::Alt - || key == Key::AltGr; - - // Block key up if key down was blocked (to avoid orphan key up event on remote). - // This must be checked before clearing the flag below. - if is_tracked_key && !is_press && EXIT_SHORTCUT_KEY_DOWN.swap(false, Ordering::SeqCst) { - return true; - } - - // Exit relative mouse mode shortcuts: - // - macOS: Cmd+G - // - Windows/Linux: Ctrl+Alt - // Guard it to supported/eligible sessions to avoid blocking the chord unexpectedly. - if is_exit_relative_mouse_shortcut(key) { - if !can_exit_relative_mouse_mode_from_grab_loop() { - return false; - } - if is_press { - // Only trigger exit on transition from "not pressed" to "pressed". - // This prevents retriggering on OS key-repeat. - if !EXIT_SHORTCUT_KEY_DOWN.swap(true, Ordering::SeqCst) { - notify_exit_relative_mouse_mode(); - } - } - return true; - } - - false -} - fn start_grab_loop() { std::env::set_var("KEYBOARD_ONLY", "y"); #[cfg(any(target_os = "windows", target_os = "macos"))] @@ -621,12 +278,6 @@ fn start_grab_loop() { let _scan_code = event.position_code; let _code = event.platform_code as KeyCode; - - #[cfg(feature = "flutter")] - if should_block_relative_mouse_shortcut(key, is_press) { - return None; - } - let res = if KEYBOARD_HOOKED.load(Ordering::SeqCst) { client::process_event(&get_keyboard_mode(), &event, None); if is_press { @@ -686,14 +337,9 @@ fn start_grab_loop() { #[cfg(target_os = "linux")] if let Err(err) = rdev::start_grab_listen(move |event: Event| match event.event_type { EventType::KeyPress(key) | EventType::KeyRelease(key) => { - let is_press = matches!(event.event_type, EventType::KeyPress(_)); if let Key::Unknown(keycode) = key { log::error!("rdev get unknown key, keycode is {:?}", keycode); } else { - #[cfg(feature = "flutter")] - if should_block_relative_mouse_shortcut(key, is_press) { - return None; - } client::process_event(&get_keyboard_mode(), &event, None); } None @@ -729,12 +375,10 @@ pub fn is_long_press(event: &Event) -> bool { return false; } -fn take_remote_keys() -> HashMap { - let mut to_release = TO_RELEASE.lock().unwrap(); - std::mem::take(&mut *to_release) -} - -fn release_remote_keys_for_events(keyboard_mode: &str, to_release: HashMap) { +pub fn release_remote_keys(keyboard_mode: &str) { + // todo!: client quit suddenly, how to release keys? + let to_release = TO_RELEASE.lock().unwrap().clone(); + TO_RELEASE.lock().unwrap().clear(); for (key, mut event) in to_release.into_iter() { event.event_type = EventType::KeyRelease(key); client::process_event(keyboard_mode, &event, None); @@ -749,12 +393,6 @@ fn release_remote_keys_for_events(keyboard_mode: &str, to_release: HashMap KeyboardMode { match keyboard_mode { "map" => KeyboardMode::Map, @@ -780,7 +418,6 @@ pub fn is_modifier(key: &rdev::Key) -> bool { } #[inline] -#[allow(dead_code)] pub fn is_modifier_code(evt: &KeyEvent) -> bool { match evt.union { Some(key_event::Union::Chr(code)) => { @@ -945,6 +582,7 @@ pub fn event_to_key_events( ) -> Vec { peer.retain(|c| !c.is_whitespace()); + let mut key_event = KeyEvent::new(); update_modifiers_state(event); match event.event_type { @@ -957,7 +595,6 @@ pub fn event_to_key_events( _ => {} } - let mut key_event = KeyEvent::new(); key_event.mode = keyboard_mode.into(); let mut key_events = match keyboard_mode { @@ -1265,7 +902,7 @@ fn _map_keyboard_mode(_peer: &str, event: &Event, mut key_event: KeyEvent) -> Op let keycode = match _peer { OS_LOWER_WINDOWS => { // https://github.com/rustdesk/rustdesk/issues/1371 - // Filter scancodes that are greater than 255 and the height word is not 0xE0. + // Filter scancodes that are greater than 255 and the hight word is not 0xE0. if event.position_code > 255 && (event.position_code >> 8) != 0xE0 { return None; } diff --git a/src/lan.rs b/src/lan.rs index 38c31adf9..f2f370587 100644 --- a/src/lan.rs +++ b/src/lan.rs @@ -1,5 +1,3 @@ -#[cfg(not(target_os = "ios"))] -use hbb_common::whoami; use hbb_common::{ allow_err, anyhow::bail, @@ -12,7 +10,7 @@ use hbb_common::{ self, sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender}, }, - ResultType, + whoami, ResultType, }; use std::{ @@ -47,7 +45,7 @@ pub(super) fn start_listening() -> ResultType<()> { } if let Some(self_addr) = get_ipaddr_by_peer(&addr) { let mut msg_out = Message::new(); - let mut hostname = crate::whoami_hostname(); + let mut hostname = whoami::hostname(); // The default hostname is "localhost" which is a bit confusing if hostname == "localhost" { hostname = "unknown".to_owned(); diff --git a/src/lang.rs b/src/lang.rs index 6302c2aed..a4a68905c 100644 --- a/src/lang.rs +++ b/src/lang.rs @@ -16,10 +16,8 @@ mod es; mod et; mod eu; mod fa; -mod gu; mod fr; mod he; -mod hi; mod hr; mod hu; mod id; @@ -48,8 +46,6 @@ mod uk; mod vi; mod ta; mod ge; -mod fi; -mod ml; pub const LANGS: &[(&str, &str)] = &[ ("en", "English"), @@ -97,10 +93,6 @@ pub const LANGS: &[(&str, &str)] = &[ ("sc", "Sardu"), ("ta", "தமிழ்"), ("ge", "ქართული"), - ("fi", "Suomi"), - ("ml", "മലയാളം"), - ("hi", "हिंदी"), - ("gu", "ગુજરાતી"), ]; #[cfg(not(any(target_os = "android", target_os = "ios")))] @@ -160,7 +152,6 @@ pub fn translate_locale(name: String, locale: &str) -> String { "kz" => kz::T.deref(), "uk" => uk::T.deref(), "fa" => fa::T.deref(), - "fi" => fi::T.deref(), "ca" => ca::T.deref(), "el" => el::T.deref(), "sv" => sv::T.deref(), @@ -179,9 +170,6 @@ pub fn translate_locale(name: String, locale: &str) -> String { "sc" => sc::T.deref(), "ta" => ta::T.deref(), "ge" => ge::T.deref(), - "ml" => ml::T.deref(), - "hi" => hi::T.deref(), - "gu" => gu::T.deref(), _ => en::T.deref(), }; let (name, placeholder_value) = extract_placeholder(&name); @@ -195,26 +183,7 @@ pub fn translate_locale(name: String, locale: &str) -> String { && !name.starts_with("upgrade_rustdesk_server_pro") && name != "powered_by_me" { - let app_name = crate::get_app_name(); - if !app_name.contains("RustDesk") { - s = s.replace("RustDesk", &app_name); - } else { - // https://github.com/rustdesk/rustdesk-server-pro/issues/845 - // If app_name contains "RustDesk" (e.g., "RustDesk-Admin"), we need to avoid - // replacing "RustDesk" within the already-substituted app_name, which would - // cause duplication like "RustDesk-Admin" -> "RustDesk-Admin-Admin". - // - // app_name only contains alphanumeric and hyphen. - const PLACEHOLDER: &str = "#A-P-P-N-A-M-E#"; - if !s.contains(PLACEHOLDER) { - s = s.replace(&app_name, PLACEHOLDER); - s = s.replace("RustDesk", &app_name); - s = s.replace(PLACEHOLDER, &app_name); - } else { - // It's very unlikely to reach here. - // Skip replacement to avoid incorrect result. - } - } + s = s.replace("RustDesk", &crate::get_app_name()); } } s diff --git a/src/lang/ar.rs b/src/lang/ar.rs index e13404802..8da03788f 100644 --- a/src/lang/ar.rs +++ b/src/lang/ar.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "كلمة مرور نظام التشغيل"), ("install_tip", "بسبب صلاحيات تحكم حساب المستخدم. RustDesk قد لا يعمل بشكل صحيح في جهة البعيد في بعض الحالات. لتفادي ذلك. الرجاء الضغط على الزر ادناه لتثبيت RustDesk في جهازك."), ("Click to upgrade", "اضغط للارتقاء"), + ("Click to download", "اضغط للتنزيل"), + ("Click to update", "ضغط للتحديث"), ("Configure", "تهيئة"), ("config_acc", "لتتمكن من التحكم بسطح مكتبك البعيد, تحتاج الى منح RustDesk اذونات \"امكانية الوصول\"."), ("config_screen", "لتتمكن من الوصول الى سطح مكتبك البعيد, تحتاج الى منح RustDesk اذونات \"تسجيل الشاشة\"."), @@ -258,10 +260,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Three-Finger vertically", "ثلاث اصابع افقيا"), ("Mouse Wheel", "عجلة الفارة"), ("Two-Finger Move", "نقل الاصبعين"), - ("Canvas Move", "تحريك اللوحة"), + ("Canvas Move", ""), ("Pinch to Zoom", "قرصة للتكبير"), - ("Canvas Zoom", "تكبير اللوحة"), - ("Reset canvas", "إعادة تعيين اللوحة"), + ("Canvas Zoom", ""), + ("Reset canvas", ""), ("No permission of file transfer", "لا يوجد اذن نقل الملف"), ("Note", "ملاحظة"), ("Connection", "الاتصال"), @@ -360,7 +362,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Recording", "التسجيل"), ("Directory", "المسار"), ("Automatically record incoming sessions", "تسجيل الجلسات القادمة تلقائيا"), - ("Automatically record outgoing sessions", "تسجيل الجلسات الصادرة تلقائيا"), + ("Automatically record outgoing sessions", ""), ("Change", "تغيير"), ("Start session recording", "بدء تسجيل الجلسة"), ("Stop session recording", "ايقاف تسجيل الجلسة"), @@ -368,7 +370,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable LAN discovery", "تفعيل اكتشاف الشبكة المحلية"), ("Deny LAN discovery", "رفض اكتشاف الشبكة المحلية"), ("Write a message", "اكتب رسالة"), - ("Prompt", "موجه"), + ("Prompt", ""), ("Please wait for confirmation of UAC...", "الرجاء انتظار تاكيد تحكم حساب المستخدم..."), ("elevated_foreground_window_tip", "النافذة الحالية لسطح المكتب البعيد تحتاج صلاحية اعلى لتعمل, لذلك لن تستطيع استخدام الفارة ولوحة المفاتيح مؤقتا. تستطيع انت تطلب من المستخدم البعيد تصغير النافذة الحالية, او ضفط زر الارتقاء في نافذة ادارة الاتصال. لتفادي هذة المشكلة من المستحسن تثبيت البرنامج في الجهاز البعيد."), ("Disconnected", "مفصول"), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "اعدادات لوحة المفاتيح"), ("Full Access", "وصول كامل"), ("Screen Share", "مشاركة الشاشة"), - ("ubuntu-21-04-required", "Wayland يتطلب نسخة ابونتو 21.04 او اعلى."), - ("wayland-requires-higher-linux-version", "Wayland يتطلب نسخة اعلى من توزيعة لينكس. الرجاء تجربة سطح مكتب X11 او غير نظام تشغيلك."), - ("xdp-portal-unavailable", "لاقط شاشة Wayland فشل. بوابة سطح مكتب XDG ربما توقفت عن العمل او حدث خطأ بها. جرب اعادة تشغليها عن طريق 'systemctl --user restart xdg-desktop-portal'."), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland يتطلب نسخة ابونتو 21.04 او اعلى."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland يتطلب نسخة اعلى من توزيعة لينكس. الرجاء تجربة سطح مكتب X11 او غير نظام تشغيلك."), ("JumpLink", "رابط القفز"), ("Please Select the screen to be shared(Operate on the peer side).", "الرجاء اختيار شاشة لمشاركتها (تعمل على جانب القرين)."), ("Show RustDesk", "عرض RustDesk"), ("This PC", "هذا الحاسب"), ("or", "او"), + ("Continue with", "متابعة مع"), ("Elevate", "ارتقاء"), ("Zoom cursor", "تكبير المؤشر"), ("Accept sessions via password", "قبول الجلسات عبر كلمة المرور"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "لا يوجد اقران مفضلين حتى الان؟\nحسنا لنبحث عن شخص للاتصال معه ومن ثم اضافته للمفضلة."), ("empty_lan_tip", "اه لا, يبدو انك لم تكتشف اي قرين بعد."), ("empty_address_book_tip", "يا عزيزي, يبدو انه لايوجد حاليا اي اقران في كتاب العناوين."), + ("eg: admin", "مثلا: admin"), ("Empty Username", "اسم مستخدم فارغ"), ("Empty Password", "كلمة مرور فارغة"), ("Me", "انا"), @@ -696,54 +699,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable camera", "تمكين الكاميرا"), ("No cameras", "لا توجد كاميرات"), ("view_camera_unsupported_tip", "عرض الكاميرا غير مدعوم في هذا الجهاز"), - ("Terminal", "الطرفية"), - ("Enable terminal", "تمكين الطرفية"), - ("New tab", "تبويب جديد"), - ("Keep terminal sessions on disconnect", "الاحتفاظ بجلسات الطرفية عند قطع الاتصال"), - ("Terminal (Run as administrator)", "الطرفية (تشغيل كمسؤول)"), - ("terminal-admin-login-tip", "لتشغيل الطرفية كمسؤول، يرجى إدخال اسم المستخدم وكلمة المرور للمسؤول."), - ("Failed to get user token.", "فشل في الحصول على رمز المستخدم."), - ("Incorrect username or password.", "اسم المستخدم أو كلمة المرور غير صحيحة."), - ("The user is not an administrator.", "المستخدم ليس لديه صلاحيات المسؤول."), - ("Failed to check if the user is an administrator.", "فشل التحقق مما إذا كان المستخدم لديه صلاحيات المسؤول."), - ("Supported only in the installed version.", "مدعوم فقط في النسخة المُثبتة."), - ("elevation_username_tip", "يرجى إدخال اسم مستخدم بصلاحيات المسؤول للمتابعة."), - ("Preparing for installation ...", "جارٍ التحضير للتثبيت..."), - ("Show my cursor", "إظهار المؤشر الخاص بي"), - ("Scale custom", "مقياس مخصص"), - ("Custom scale slider", "شريط تمرير المقياس المخصص"), - ("Decrease", "تصغير"), - ("Increase", "تكبير"), - ("Show virtual mouse", "إظهار الفأرة الافتراضية"), - ("Virtual mouse size", "حجم الفأرة الافتراضية"), - ("Small", "صغير"), - ("Large", "كبير"), - ("Show virtual joystick", "إظهار عصا التحكم الافتراضية"), - ("Edit note", "تعديل الملاحظة"), - ("Alias", "اسم مستعار"), - ("ScrollEdge", "حافة التمرير"), - ("Allow insecure TLS fallback", "السماح بالرجوع إلى TLS غير الآمن"), - ("allow-insecure-tls-fallback-tip", "يسمح باستخدام اتصال TLS غير آمن عند فشل الاتصال الآمن"), - ("Disable UDP", "تعطيل UDP"), - ("disable-udp-tip", "عند التفعيل لن يتم استخدام بروتوكول UDP"), - ("server-oss-not-support-tip", "هذه الميزة غير مدعومة من قبل خادمك"), - ("input note here", "أدخل الملاحظة هنا"), - ("note-at-conn-end-tip", "سيتم عرض هذه الملاحظة عند نهاية الاتصال"), - ("Show terminal extra keys", "إظهار مفاتيح إضافية في الطرفية"), - ("Relative mouse mode", "وضع الماوس النسبي"), - ("rel-mouse-not-supported-peer-tip", "وضع الماوس النسبي غير مدعوم على الجهاز الآخر"), - ("rel-mouse-not-ready-tip", "وضع الماوس النسبي غير جاهز"), - ("rel-mouse-lock-failed-tip", "فشل قفل الماوس النسبي"), - ("rel-mouse-exit-{}-tip", "للخروج من وضع الماوس النسبي اضغط على {}"), - ("rel-mouse-permission-lost-tip", "تم فقدان إذن الماوس النسبي"), - ("Changelog", "سجل التغييرات"), - ("keep-awake-during-outgoing-sessions-label", "إبقاء الجهاز نشطًا أثناء الجلسات الصادرة"), - ("keep-awake-during-incoming-sessions-label", "إبقاء الجهاز نشطًا أثناء الجلسات الواردة"), - ("Continue with {}", "متابعة مع {}"), - ("Display Name", "اسم العرض"), - ("password-hidden-tip", "كلمة المرور مخفية"), - ("preset-password-in-use-tip", "كلمة المرور المحددة مسبقًا قيد الاستخدام"), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/be.rs b/src/lang/be.rs index 9f6b69c8b..85c424cae 100644 --- a/src/lang/be.rs +++ b/src/lang/be.rs @@ -1,19 +1,19 @@ lazy_static::lazy_static! { pub static ref T: std::collections::HashMap<&'static str, &'static str> = [ - ("Status", "Стан"), + ("Status", "Статус"), ("Your Desktop", "Ваш працоўны стол"), ("desk_tip", "Ваш працоўны стол даступны з гэтым ID і паролем."), ("Password", "Пароль"), - ("Ready", "Гатова"), + ("Ready", "Гатовы"), ("Established", "Усталявана"), - ("connecting_status", "Ідзе падключэнне да сеткі RustDesk..."), + ("connecting_status", "Падключэнне да сеткі RustDesk..."), ("Enable service", "Уключыць службу"), ("Start service", "Запусціць службу"), ("Service is running", "Служба запушчана"), ("Service is not running", "Служба не запушчана"), - ("not_ready_status", "Не падключана. Праверце падключэнне."), - ("Control Remote Desktop", "Новае падключэнне"), + ("not_ready_status", "Не падключана. Праверце злучэнне."), + ("Control Remote Desktop", "Кіраванне выдаленым працоўным сталом"), ("Transfer file", "Перадаць файлы"), ("Connect", "Падключыцца"), ("Recent sessions", "Апошнія сеансы"), @@ -22,7 +22,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("TCP tunneling", "TCP-тунэляванне"), ("Remove", "Выдаліць"), ("Refresh random password", "Абнавіць выпадковы пароль"), - ("Set your own password", "Задаць свой пароль"), + ("Set your own password", "Усталяваць свой пароль"), ("Enable keyboard/mouse", "Выкарыстоўваць клавіятуру/мыш"), ("Enable clipboard", "Выкарыстоўваць буфер абмену"), ("Enable file transfer", "Выкарыстоўваць перадачу файлаў"), @@ -41,17 +41,17 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("length %min% to %max%", "даўжыня %min%...%max%"), ("starts with a letter", "пачынаецца з літары"), ("allowed characters", "дазволеныя сімвалы"), - ("id_change_tip", "Дазволена выкарыстоўваць толькі сімвалы a-z, A-Z, 0-9, - (dash) і _ (падкрэсліванне). Першай павінна быць літара a-z, A-Z. Даўжыня ад 6 да 16."), + ("id_change_tip", "Дапускаюцца толькі сімвалы a-z, A-Z, 0-9, - (dash) і _ (падкрэсліванне). Першай павінна быць літара a-z, A-Z. Даўжыня ад 6 да 16."), ("Website", "Сайт"), ("About", "Пра праграму"), ("Slogan_tip", "Зроблена з душой у гэтым вар'яцкім свеце!"), - ("Privacy Statement", "Заява аб канфідэнцыйнасці"), + ("Privacy Statement", "Заява аб канфідэнцыяльнасці"), ("Mute", "Адключыць гук"), ("Build Date", "Дата зборкі"), ("Version", "Версія"), ("Home", "Галоўная"), - ("Audio Input", "Аўдыяўваход"), - ("Enhancements", "Паляпшэнні"), + ("Audio Input", "Аўдыёўваход"), + ("Enhancements", "Палепшанні"), ("Hardware Codec", "Апаратны кодэк"), ("Adaptive bitrate", "Адаптыўны бітрэйт"), ("ID Server", "Сервер ID"), @@ -63,10 +63,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("server_not_support", "Пакуль не падтрымліваецца серверам"), ("Not available", "Недаступна"), ("Too frequent", "Занадта часта"), - ("Cancel", "Скасаваць"), + ("Cancel", "Адмяніць"), ("Skip", "Прапусціць"), ("Close", "Закрыць"), - ("Retry", "Паўтарыць спробу"), + ("Retry", "Паўтор"), ("OK", "ОК"), ("Password Required", "Патрабуецца пароль"), ("Please enter your password", "Увядзіце пароль"), @@ -75,14 +75,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Do you want to enter again?", "Паўтарыць уваход?"), ("Connection Error", "Памылка падключэння"), ("Error", "Памылка"), - ("Reset by the peer", "Скінута абанентам"), + ("Reset by the peer", "Скінута выдаленым вузлом"), ("Connecting...", "Падключэнне..."), - ("Connection in progress. Please wait.", "Ідзе падключэнне. Пачакайце."), + ("Connection in progress. Please wait.", "Выконваецца падключэнне. Пачакайце."), ("Please try 1 minute later", "Паспрабуйце праз хвіліну"), ("Login Error", "Памылка ўваходу"), ("Successful", "Паспяхова"), - ("Connected, waiting for image...", "Падключана, чаканне відарыса..."), - ("Name", "Назва"), + ("Connected, waiting for image...", "Падключана, чаканне выявы..."), + ("Name", "Імя"), ("Type", "Тып"), ("Modified", "Зменена"), ("Size", "Памер"), @@ -91,78 +91,80 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Send", "Адправіць"), ("Refresh File", "Абнавіць файл"), ("Local", "Лакальны"), - ("Remote", "Аддалены"), - ("Remote Computer", "Аддалены камп'ютар"), + ("Remote", "Выдалены"), + ("Remote Computer", "Выдалены камп'ютар"), ("Local Computer", "Лакальны камп'ютар"), ("Confirm Delete", "Пацвердзіць выдаленне"), ("Delete", "Выдаліць"), ("Properties", "Уласцівасці"), ("Multi Select", "Шматлікі выбар"), - ("Select All", "Выбраць усе"), - ("Unselect All", "Скасаваць выбар усіх"), - ("Empty Directory", "Пусты каталог"), - ("Not an empty directory", "Каталог не пусты"), + ("Select All", "Абраць усе"), + ("Unselect All", "Зняць усе"), + ("Empty Directory", "Пустая тэчка"), + ("Not an empty directory", "Тэчка не пустая"), ("Are you sure you want to delete this file?", "Выдаліць гэты файл?"), - ("Are you sure you want to delete this empty directory?", "Выдаліць пусты каталог?"), - ("Are you sure you want to delete the file of this directory?", "Выдаліць файл з гэтага каталога?"), + ("Are you sure you want to delete this empty directory?", "Выдаліць пустую тэчку?"), + ("Are you sure you want to delete the file of this directory?", "Выдаліць файл з гэтай тэчкі?"), ("Do this for all conflicts", "Прымяніць да ўсіх канфліктаў"), - ("This is irreversible!", "Гэтага нельга адрабіць!"), - ("Deleting", "Ідзе выдаленне"), + ("This is irreversible!", "Гэта неабаротна!"), + ("Deleting", "Выдаленне"), ("files", "файлы"), ("Waiting", "Чаканне"), ("Finished", "Завершана"), ("Speed", "Хуткасць"), - ("Custom Image Quality", "Карыстальніцкая якасць відарыса"), - ("Privacy mode", "Рэжым канфідэнцыйнасці"), - ("Block user input", "Заблакіраваць увод на аддаленай прыладзе"), - ("Unblock user input", "Разблакіраваць увод на аддаленай прыладзе"), + ("Custom Image Quality", "Якасць выявы па запыце"), + ("Privacy mode", "Рэжым прыватнасці"), + ("Block user input", "Забараніць ўвод на аддаленай прыладзе"), + ("Unblock user input", "Адблакіраваць ўвод на аддаленай прыладзе"), ("Adjust Window", "Наладзіць акно"), ("Original", "Арыгінал"), ("Shrink", "Сціснуць"), ("Stretch", "Расцягнуць"), - ("Scrollbar", "Паласа прагортвання"), - ("ScrollAuto", "Аўта-прагортванне"), - ("Good image quality", "Добрая якасць відарыса"), - ("Balanced", "Баланс паміж якасцю і хуткасцю"), - ("Optimize reaction time", "Аптымізацыя хуткасці рэакцыі"), - ("Custom", "Карыстальніцкая"), + ("Scrollbar", "Паласа пракруткі"), + ("ScrollAuto", "Аўта-пракрутка"), + ("Good image quality", "Добрая якасць выявы"), + ("Balanced", "Баланс паміж якасцю і адказам"), + ("Optimize reaction time", "Оптымізацыя часу адказу"), + ("Custom", "Зададзена карыстальнікам"), ("Show remote cursor", "Паказваць аддалены курсор"), ("Show quality monitor", "Паказваць манітор якасці"), ("Disable clipboard", "Адключыць буфер абмену"), - ("Lock after session end", "Заблакіраваць уліковы запіс пасля сеанса"), + ("Lock after session end", "Заблакаваць уліковы запіс пасля сеансу"), ("Insert Ctrl + Alt + Del", "Уставіць Ctrl + Alt + Del"), - ("Insert Lock", "Заблакіраваць уліковы запіс"), + ("Insert Lock", "Заблакаваць уліковы запіс"), ("Refresh", "Абнавіць"), ("ID does not exist", "ID не існуе"), - ("Failed to connect to rendezvous server", "Немагчыма падключыцца да прамежкавага сервера"), + ("Failed to connect to rendezvous server", "Немагчыма падключыцца да паседкавага сервера"), ("Please try later", "Паспрабуйце пазней"), ("Remote desktop is offline", "Аддаленая прылада не ў сетцы"), ("Key mismatch", "Неадпаведнасць ключоў"), ("Timeout", "Час чакання скончыўся"), ("Failed to connect to relay server", "Немагчыма падключыцца да рэтранслятара"), - ("Failed to connect via rendezvous server", "Немагчыма падключыцца праз прамежкавы сервер"), + ("Failed to connect via rendezvous server", "Немагчыма падключыцца праз паседкавы сервер"), ("Failed to connect via relay server", "Немагчыма падключыцца праз рэтранслятар"), - ("Failed to make direct connection to remote desktop", "Не ўдалося ўсталяваць прамога падключэння да аддаленай прылады"), - ("Set Password", "Задаць пароль"), - ("OS Password", "Пароль уваходу ў аперацыйную сістэму"), - ("install_tip", "У некаторых выпадках з-за UAC, RustDesk можа працаваць на баку абанента неадпаведным чынам. Каб пазбегнуць магчымых праблем з UAC, націсніце кнопку ніжэй для ўсталявання RustDesk у сістэме."), + ("Failed to make direct connection to remote desktop", "Не ўдалося ўсталяваць прамое падключэнне да аддаленага працоўнага стала"), + ("Set Password", "Усталяваць пароль"), + ("OS Password", "Пароль ўваходу ў аперацыйную сістэму"), + ("install_tip", "У некаторых выпадках RustDesk можа працаваць няправільна на аддаленым вузле з-за UAC. Каб пазбегнуць магчымых праблем з UAC, націсніце кнопку ніжэй для ўстаноўкі RustDesk у сістэме."), ("Click to upgrade", "Абнавіць"), + ("Click to download", "Спампаваць"), + ("Click to update", "Абнавіць"), ("Configure", "Наладзіць"), - ("config_acc", "Каб аддаленна кіраваць сваім працоўным сталом, вам трэба дазволіць RustDesk правы \"доступу\""), - ("config_screen", "Для аддаленага доступу да працоўнага стала вам трэба даць RustDesk правы \"здымку экрана\"."), - ("Installing ...", "Ідзе ўсталёўванне..."), + ("config_acc", "Каб аддаленна кіраваць сваім працоўным сталом, вам неабходна дазволіць RustDesk правы доступу."), + ("config_screen", "Для аддаленага доступу да працоўнага сталу вам неабходна дазволіць RustDesk правы здымку экрана."), + ("Installing ...", "Ідзе ўстаноўка..."), ("Install", "Усталяваць"), - ("Installation", "Усталёўванне"), - ("Installation Path", "Шлях усталёўвання"), + ("Installation", "Устаноўка"), + ("Installation Path", "Шлях устаноўкі"), ("Create start menu shortcuts", "Стварыць ярлыкі ў меню \"Пуск\""), ("Create desktop icon", "Стварыць значок на працоўным стале"), - ("agreement_tip", "Пачынаючы ўсталёўванне, вы прымаеце ўмовы ліцэнзійнага пагаднення."), + ("agreement_tip", "Пачынаючы ўстаноўку, вы прымаеце ўмовы ліцэнзійнага ўгоды."), ("Accept and Install", "Прыняць і ўсталяваць"), - ("End-user license agreement", "Ліцэнзійнае пагадненне з канчатковым карыстальнікам"), - ("Generating ...", "Ідзе генерыраванне..."), - ("Your installation is lower version.", "Усталявана ранейшая версія"), - ("not_close_tcp_tip", "Не закрываць гэтага акна пры выкарыстанні тунэлю."), - ("Listening ...", "Чаканне..."), + ("End-user license agreement", "Ліцэнзійная ўгода з канчатковым карыстальнікам"), + ("Generating ...", "Генеруецца..."), + ("Your installation is lower version.", "Ваша ўстаноўка ніжэйшай версіі"), + ("not_close_tcp_tip", "Не зачыняць гэта акно пры выкарыстанні тунэлю."), + ("Listening ...", "Праслухоўванне..."), ("Remote Host", "Аддалены хост"), ("Remote Port", "Аддалены порт"), ("Action", "Дзеянне"), @@ -170,120 +172,120 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Local Port", "Лакальны порт"), ("Local Address", "Лакальны адрас"), ("Change Local Port", "Змяніць лакальны порт"), - ("setup_server_tip", "Для хутчэйшага падключэння наладзьце ўласны сервер."), + ("setup_server_tip", "Для хуткага падключэння наладзьце свой сервер."), ("Too short, at least 6 characters.", "Занадта кароткі, мінімум 6 сімвалаў."), - ("The confirmation is not identical.", "Пацвярджэнне не супадае."), + ("The confirmation is not identical.", "Пацверджанне не супадае."), ("Permissions", "Дазволы"), ("Accept", "Прыняць"), ("Dismiss", "Адхіліць"), ("Disconnect", "Адключыць"), - ("Enable file copy and paste", "Дазволіць капіяванне і ўстаўку файлаў"), + ("Enable file copy and paste", "Дазволіць капіраванне і ўстаўку файлаў"), ("Connected", "Падключана"), ("Direct and encrypted connection", "Прамое і зашыфраванае падключэнне"), ("Relayed and encrypted connection", "Рэтрансляванае і зашыфраванае падключэнне"), ("Direct and unencrypted connection", "Прамое і незашыфраванае падключэнне"), ("Relayed and unencrypted connection", "Рэтрансляванае і незашыфраванае падключэнне"), - ("Enter Remote ID", "Увядзіце ID абанента"), + ("Enter Remote ID", "Увядзіце дыстанцыйны ID"), ("Enter your password", "Увядзіце пароль"), - ("Logging in...", "Уваходжанне..."), - ("Enable RDP session sharing", "Уключыць абагульванне сеанса RDP"), - ("Auto Login", "Аўтаматычны ўваход ва ўліковы запіс"), + ("Logging in...", "Уваход..."), + ("Enable RDP session sharing", "Дазволіць абмен сеансамі RDP"), + ("Auto Login", "Аўтаматычны ўваход у ўліковы запіс"), ("Enable direct IP access", "Дазволіць прамы доступ па IP-адрасе"), ("Rename", "Перайменаваць"), ("Space", "Месца"), ("Create desktop shortcut", "Стварыць ярлык на працоўным стале"), ("Change Path", "Змяніць шлях"), - ("Create Folder", "Стварыць папку"), - ("Please enter the folder name", "Увядзіце імя папкі"), + ("Create Folder", "Стварыць тэчку"), + ("Please enter the folder name", "Калі ласка, увядзіце імя тэчкі"), ("Fix it", "Выправіць"), ("Warning", "Папярэджанне"), ("Login screen using Wayland is not supported", "Уваход у сістэму з выкарыстаннем Wayland не падтрымліваецца"), ("Reboot required", "Патрабуецца перазагрузка"), - ("Unsupported display server", "Сервер адлюстравання не падтрымліваецца"), + ("Unsupported display server", "Непадтрымліваемы сервер адлюстравання"), ("x11 expected", "Чакаецца X11"), ("Port", "Порт"), ("Settings", "Налады"), ("Username", "Імя карыстальніка"), - ("Invalid port", "Памылковы порт"), - ("Closed manually by the peer", "Закрыта абанентам уручную"), - ("Enable remote configuration modification", "Дазволіць аддаленае змяненне канфігурацыі"), - ("Run without install", "Запусціць без усталявання"), + ("Invalid port", "Няправільны порт"), + ("Closed manually by the peer", "Зачынена аддаленым вузлом уручную"), + ("Enable remote configuration modification", "Дазволіць змену канфігурацыі аддалена"), + ("Run without install", "Запусціць без ўстаноўкі"), ("Connect via relay", "Падключыцца праз рэтранслятар"), ("Always connect via relay", "Заўсёды падключацца праз рэтранслятар"), - ("whitelist_tip", "Атрымліваць доступ да маёй прылады могуць толькі IP-адрасы з белага спісу."), + ("whitelist_tip", "Толькі IP-адрэсы з белага спісу могуць атрымаць доступ да маёй прылады."), ("Login", "Увайсці"), ("Verify", "Праверыць"), - ("Remember me", "Запомніць"), - ("Trust this device", "Давяраць гэтай прыладзе"), + ("Remember me", "Запомніць мяне"), + ("Trust this device", "Даверыць гэтую прыладу"), ("Verification code", "Праверачны код"), - ("verification_tip", "Выяўлена новая прылада, на зарэгістраваны адрас электроннай пошты адпраўлены праверачны код. Увядзіце яго, каб працягнуць уваходжанне ў сістэму."), + ("verification_tip", "Выяўлена новая прылада, на зарэгістраваны адрас электроннай пошты адпраўлены праверачны код. Увядзіце яго, каб працягнуць уваход у сістэму."), ("Logout", "Выйсці"), - ("Tags", "Цэтлікі"), + ("Tags", "Тэгі"), ("Search ID", "Пошук по ID"), - ("whitelist_sep", "Падзяленне коскай, кропкай з коскай, прабелам або новым радком."), + ("whitelist_sep", "Аддзяліць запятой, коскай з запятой, прабелам ці новым радком."), ("Add ID", "Дадаць ID"), - ("Add Tag", "Дадаць цэтлік"), - ("Unselect all tags", "Скасаваць выбар усіх цэтлікаў"), + ("Add Tag", "Дадаць тэг"), + ("Unselect all tags", "Скасаваць выбар усіх тэгаў"), ("Network error", "Памылка сеткі"), - ("Username missed", "Прапушчана імя карыстальніка"), - ("Password missed", "Прапушчаны пароль"), - ("Wrong credentials", "Памылковае імя або пароль"), - ("The verification code is incorrect or has expired", "Памылковы або пратэрмінаваны праверачны код"), - ("Edit Tag", "Рэдагаваць цэтлік"), - ("Forget Password", "Не захоўваць пароль"), + ("Username missed", "Адсутнічае імя карыстальніка"), + ("Password missed", "Забыты пароль"), + ("Wrong credentials", "Няправільныя імя ці пароль"), + ("The verification code is incorrect or has expired", "Праверачны код няправільны або скончыўся тэрмін яго дзеяння"), + ("Edit Tag", "Рэдагаваць тэг"), + ("Forget Password", "Забыць пароль"), ("Favorites", "Абранае"), ("Add to Favorites", "Дадаць у абранае"), ("Remove from Favorites", "Выдаліць з абранага"), ("Empty", "Пуста"), - ("Invalid folder name", "Недапушчальная назва папкі"), + ("Invalid folder name", "Недапушчальнае імя тэчкі"), ("Socks5 Proxy", "Socks5-проксі"), ("Socks5/Http(s) Proxy", "Socks5/Http(s)-проксі"), ("Discovered", "Знойдзена"), - ("install_daemon_tip", "Для запуску пры загрузцы трэба ўсталяваць сістэмную службу"), - ("Remote ID", "ID абанента"), + ("install_daemon_tip", "Для запуску пры загрузцы неабходна ўстанавіць сістэмную службу"), + ("Remote ID", "Аддалены ID"), ("Paste", "Уставіць"), - ("Paste here?", "Уставіць сюды?"), - ("Are you sure to close the connection?", "Закрыць падключэнне?"), + ("Paste here?", "Уставіць тут?"), + ("Are you sure to close the connection?", "Ці ўпэўненыя, што жадаеце закрыць падключэнне?"), ("Download new version", "Спампаваць новую версію"), ("Touch mode", "Рэжым сэнсарнага экрана"), - ("Mouse mode", "Рэжым мышы/сэнсарнай панэлі"), - ("One-Finger Tap", "Націсканне адным пальцам"), + ("Mouse mode", "Рэжым мышы/трэкпада"), + ("One-Finger Tap", "Націск адным пальцам"), ("Left Mouse", "Левая кнопка мышы"), - ("One-Long Tap", "Доўгае націсканне адным пальцам"), - ("Two-Finger Tap", "Націсканне двума пальцамі"), + ("One-Long Tap", "Доўгі націск адным пальцам"), + ("Two-Finger Tap", "Націск двума пальцамі"), ("Right Mouse", "Правая кнопка мышы"), ("One-Finger Move", "Перамяшчэнне адным пальцам"), - ("Double Tap & Move", "Двайное націсканне і перамяшчэнне"), + ("Double Tap & Move", "Двайны націск і перамяшчэнне"), ("Mouse Drag", "Перацягванне мышшу"), ("Three-Finger vertically", "Трыма пальцамі па вертыкалі"), - ("Mouse Wheel", "Колца мышы"), + ("Mouse Wheel", "Кола мышы"), ("Two-Finger Move", "Перамяшчэнне двума пальцамі"), ("Canvas Move", "Перамяшчэнне палатна"), - ("Pinch to Zoom", "Маштабаванне шчыпком"), - ("Canvas Zoom", "Маштабаванне палатна"), - ("Reset canvas", "Скінуць маштабаванне палатна"), + ("Pinch to Zoom", "Маштабаванне сціскам"), + ("Canvas Zoom", "Маштаб палатна"), + ("Reset canvas", "Скінуць палатно"), ("No permission of file transfer", "Няма дазволу на перадачу файлаў"), ("Note", "Нататка"), ("Connection", "Падключэнне"), - ("Share screen", "Дэманстрацыя экрана"), + ("Share screen", "Дзяліцца экранам"), ("Chat", "Чат"), ("Total", "Усяго"), ("items", "элементы"), ("Selected", "Выбрана"), ("Screen Capture", "Захоп экрана"), ("Input Control", "Кіраванне ўводам"), - ("Audio Capture", "Захоп аўдыя"), - ("Do you accept?", "Вы згодныя?"), + ("Audio Capture", "Захоп аўдыё"), + ("Do you accept?", "Ці вы згодны?"), ("Open System Setting", "Адкрыць налады сістэмы"), ("How to get Android input permission?", "Як атрымаць дазвол на ўвод Android?"), - ("android_input_permission_tip1", "Каб аддаленая прылада магла кіраваць вашай Android-прыладай з дапамогай мышы або націсканняў, трэба дазволіць RustDesk выкарыстоўваць службу \"Спецыяльныя магчымасці\"."), - ("android_input_permission_tip2", "Зайдзіце на адпаведную старонку сістэмных налад, знайдзіце і перайдзіце ва \"Усталяваныя службы\", уключыце службу \"RustDesk Input\"."), - ("android_new_connection_tip", "Новы запыт на кіраванне вашай бягучай прыладай."), - ("android_service_will_start_tip", "Уключэнне захопу экрана аўтаматычна запускае службу, дазваляючы іншым прыладам запытаць падключэнне да гэтай прылады."), - ("android_stop_service_tip", "Закрыццё службы аўтаматычна закрые ўсе ўстаноўленыя падключэнні."), - ("android_version_audio_tip", "Бягучая версія Android не падтрымлівае захопу гуку, абнавіце яе да Android 10 ці вышэй."), + ("android_input_permission_tip1", "Каб аддалёная прылада магла кіраваць вашай Android-прыладай з дапамогай мышы або націсканняў, неабходна дазволіць RustDesk выкарыстоўваць паслугу \"Асаблівыя магчымасці\"."), + ("android_input_permission_tip2", "Зайдзіце на адпаведную старонку сістэмных налад, знайдзіце і ўступіце ў \"Устаноўленыя паслугі\", уключыце паслугу \"RustDesk Input\"."), + ("android_new_connection_tip", "Атрыманы запыт на кіраванне вашай бягучай прыладай."), + ("android_service_will_start_tip", "Уключэнне захопу экрана аўтаматычна запускае службу, дазваляючы іншым прыладам запытаць падлучэнне да гэтай прылады."), + ("android_stop_service_tip", "Закрыццё службы аўтаматычна зачыніць усе ўстаноўленыя падлучэнні."), + ("android_version_audio_tip", "Бягучая версія Android не падтрымлівае захоп звуку, абнавіце яе да Android 10 ці вышэй."), ("android_start_service_tip", "Націсніце [Запусціць службу] або дазвольце [Захоп экрана], каб запусціць службу дэманстрацыі экрана."), - ("android_permission_may_not_change_tip", "Дазволы для ўстаноўленых падключэнняў не могуць быць зменены, патрабуецца перападключэнне."), + ("android_permission_may_not_change_tip", "Дазволы для ўстаноўленых падлучэнняў не могуць быць змененыя, неабходна перападключэнне."), ("Account", "Уліковы запіс"), ("Overwrite", "Перазапісаць"), ("This file exists, skip or overwrite this file?", "Файл існуе, прапусціць ці перазапісаць яго?"), @@ -291,47 +293,47 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Help", "Дапамога"), ("Failed", "Не ўдалося"), ("Succeeded", "Выканана"), - ("Someone turns on privacy mode, exit", "Хтосьці ўключыў рэжым канфідэнцыйнасці, выхад"), + ("Someone turns on privacy mode, exit", "Хтосьці ўключыў рэжым прыватнасці, выхад"), ("Unsupported", "Не падтрымліваецца"), - ("Peer denied", "Забаронена абанентам"), - ("Please install plugins", "Усталюйце ўбудовы"), - ("Peer exit", "Абанент выйшаў"), - ("Failed to turn off", "Немагчыма выключыць"), - ("Turned off", "Выключаны"), + ("Peer denied", "Адмоўлена аддаленым вузлом"), + ("Please install plugins", "Усталюйце плагіны"), + ("Peer exit", "Аддалены вузел адключаны"), + ("Failed to turn off", "Немагчыма адключыць"), + ("Turned off", "Адключаны"), ("Language", "Мова"), ("Keep RustDesk background service", "Захаваць фонавую службу RustDesk"), - ("Ignore Battery Optimizations", "Ігнараваць аптымізацыю ўжывання батарэі"), + ("Ignore Battery Optimizations", "Ігнараваць аптымізацыю патрэблення батарэі"), ("android_open_battery_optimizations_tip", "Перайдзіце на наступную старонку налад"), ("Start on boot", "Запускаць пры загрузцы"), ("Start the screen sharing service on boot, requires special permissions", "Запускаць службу дэманстрацыі экрана пры загрузцы (патрабуюцца спецыяльныя дазволы)"), ("Connection not allowed", "Падключэнне не дазволена"), - ("Legacy mode", "Састарэлы рэжым"), + ("Legacy mode", "Стары рэжым"), ("Map mode", "Рэжым супастаўлення"), ("Translate mode", "Рэжым перакладу"), ("Use permanent password", "Выкарыстоўваць пастаянны пароль"), ("Use both passwords", "Выкарыстоўваць абодва паролі"), - ("Set permanent password", "Задаць пастаянны пароль"), + ("Set permanent password", "Устанавіць пастаянны пароль"), ("Enable remote restart", "Дазволіць аддалены перазапуск"), ("Restart remote device", "Перазапусціць аддаленую прыладу"), - ("Are you sure you want to restart", "Вы ўпэўненыя, што хочаце зрабіць перазапуск?"), - ("Restarting remote device", "Ідзе перазапуск аддаленай прылады"), - ("remote_restarting_tip", "Аддаленая прылада перазапускаецца. Закрыйце гэта паведамленне і праз некаторы час перападключыцеся, выкарыстоўваючы пастаянны пароль."), - ("Copied", "Скапіявана"), + ("Are you sure you want to restart", "Вы ўпэўненыя, што хочаце перазагрузіць?"), + ("Restarting remote device", "Перазапуск аддаленай прылады"), + ("remote_restarting_tip", "Аддаленая прылада перазапускаецца. Закрыйце гэтае паведамленне і праз некаторы час перападключыцеся, выкарыстоўваючы пастаянны пароль."), + ("Copied", "Скапіравана"), ("Exit Fullscreen", "Выйсці з поўнаэкраннага рэжыму"), ("Fullscreen", "Поўнаэкранны рэжым"), ("Mobile Actions", "Мабільныя дзеянні"), - ("Select Monitor", "Выберыце манітор"), - ("Control Actions", "Дзеянні па кіраванні"), + ("Select Monitor", "Выбраць манітор"), + ("Control Actions", "Дзеянні па кіраванню"), ("Display Settings", "Налады адлюстравання"), ("Ratio", "Суадносіны"), - ("Image Quality", "Якасць відарыса"), - ("Scroll Style", "Стыль прагортвання"), + ("Image Quality", "Якасць выявы"), + ("Scroll Style", "Стыль пракруткі"), ("Show Toolbar", "Паказаць панэль інструментаў"), ("Hide Toolbar", "Схаваць панэль інструментаў"), - ("Direct Connection", "Прамое падключэнне"), - ("Relay Connection", "Рэтрансляванае падключэнне"), - ("Secure Connection", "Бяспечнае падключэнне"), - ("Insecure Connection", "Нябяспечнае падключэнне"), + ("Direct Connection", "Прамаое злучэнне"), + ("Relay Connection", "Рэтрансляванае злучэнне"), + ("Secure Connection", "Бяспечнае злучэнне"), + ("Insecure Connection", "Нябяспечнае злучэнне"), ("Scale original", "Арыгінальны маштаб"), ("Scale adaptive", "Адаптыўны маштаб"), ("General", "Агульныя"), @@ -339,13 +341,13 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Theme", "Тэма"), ("Dark Theme", "Цёмная тэма"), ("Light Theme", "Светлая тэма"), - ("Dark", "Цёмная"), - ("Light", "Светлая"), - ("Follow System", "Сістэмная"), + ("Dark", "Цёмны"), + ("Light", "Светлы"), + ("Follow System", "Прытрымлівацца сістэмы"), ("Enable hardware codec", "Уключыць апаратны кодэк"), - ("Unlock Security Settings", "Разблакіраваць налады бяспекі"), + ("Unlock Security Settings", "Разблакаваць налады бяспекі"), ("Enable audio", "Уключыць перадачу гуку"), - ("Unlock Network Settings", "Разблакіраваць сеткавыя налады"), + ("Unlock Network Settings", "Разблакаваць сеткавыя налады"), ("Server", "Сервер"), ("Direct IP Access", "Прамы IP-доступ"), ("Proxy", "Проксі"), @@ -358,7 +360,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Pin Toolbar", "Закрэпіць панэль інструментаў"), ("Unpin Toolbar", "Адкрэпіць панэль інструментаў"), ("Recording", "Запіс"), - ("Directory", "Каталог"), + ("Directory", "Тэчка"), ("Automatically record incoming sessions", "Аўтаматычна запісваць уваходныя сесіі"), ("Automatically record outgoing sessions", ""), ("Change", "Змяніць"), @@ -370,35 +372,35 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Write a message", "Напісаць паведамленне"), ("Prompt", "Падказка"), ("Please wait for confirmation of UAC...", "Дачакайцеся пацверджання UAC..."), - ("elevated_foreground_window_tip", "Бягучае акно аддаленага працоўнага стала патрабуе вышэйшых прывілегій для працы, таму часова немагчыма выкарыстоўваць мыш і клавіятуру. Можна папрасіць абанента згарнуць бягучае акно або націснуць кнопку павышэння правоў у акне кіравання падключэннем. Каб прадухіліць гэту праблему ў будучыні, рэкамендуецца ўсталяваць праграмнае забеспячэнне на аддаленай прыладзе."), + ("elevated_foreground_window_tip", "Бягучае акно аддаленага працоўнага стала патрабуе вышэйшых прывілегій для працы, таму часова немагчыма выкарыстоўваць мыш і клавіятуру. Можна папрасіць аддаленага карыстальніка згорнуць бягучае акно або націснуць кнопку павышэння правоў у акне кіравання падлучэннем. Каб прадухіліць гэтую праблему ў будучыні, рэкамендуецца ўстанавіць праграмнае забеспячэнне на аддаленай прыладзе."), ("Disconnected", "Адключана"), ("Other", "Іншае"), - ("Confirm before closing multiple tabs", "Пацвердзіць закрыццё некалькіх укладак"), + ("Confirm before closing multiple tabs", "Пацвердзіць закрыццё некалькіх ўкладак"), ("Keyboard Settings", "Налады клавіятуры"), ("Full Access", "Поўны доступ"), ("Screen Share", "Дэманстрацыя экрана"), - ("ubuntu-21-04-required", "Wayland патрабуе Ubuntu версіі 21.04 або навейшай."), - ("wayland-requires-higher-linux-version", "Для Wayland патрабуецца вышэйшая версія дыстрыбутыва Linux. Карыстайцеся працоўным сталом X11 або зменіце сваю АС."), - ("xdp-portal-unavailable", ""), - ("JumpLink", "Прагляд"), - ("Please Select the screen to be shared(Operate on the peer side).", "Выберыце экран для дэманстрацыі (кіруецца на баку абанента)."), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland патрабуе Ubuntu версіі 21.04 або навейшай."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Для Wayland патрабуецца вышэйшая версія дыстрыбутыву Linux. Карыстайцеся працоўным сталом X11 або зменіце сваю АС."), + ("JumpLink", "Перайсці па спасылцы"), + ("Please Select the screen to be shared(Operate on the peer side).", "Выберыце экран для дэманстрацыі (кіруецца аддаленай стараной)."), ("Show RustDesk", "Паказаць RustDesk"), - ("This PC", "Гэты камп’ютар"), + ("This PC", "Гэты кампутар"), ("or", "або"), + ("Continue with", "Працягнуць з"), ("Elevate", "Павысіць"), - ("Zoom cursor", "Маштабаванне курсора"), + ("Zoom cursor", "Павялічэнне курсора"), ("Accept sessions via password", "Прымаць сеансы па паролю"), ("Accept sessions via click", "Прымаць сеансы націскам кнопкі"), ("Accept sessions via both", "Прымаць сеансы па паролю і націскам кнопкі"), - ("Please wait for the remote side to accept your session request...", "Дачакайцеся, пакуль абанент прымае ваш запыт на сеанс..."), + ("Please wait for the remote side to accept your session request...", "Дачакайцеся, пакуль аддаленая старана прыме ваш запыт на сеанс..."), ("One-time Password", "Аднаразовы пароль"), ("Use one-time password", "Выкарыстоўваць аднаразовы пароль"), ("One-time password length", "Даўжыня аднагаразовага пароля"), ("Request access to your device", "Запыт на доступ да вашай прылады"), - ("Hide connection management window", "Схаваць акно кіравання падключэннямі"), + ("Hide connection management window", "Схаваць акно кіравання падлучэннямі"), ("hide_cm_tip", "Дазваляць схаванне акна ў выпадку, калі прымаюцца сесіі па паролю або выкарыстоўваецца пастаянны пароль"), - ("wayland_experiment_tip", "Падтрымка Wayland знаходзіцца на эксперыментальнай стадыі, калі вам трэба аўтаматычны доступ, выкарыстоўвайце X11."), - ("Right click to select tabs", "Выбар укладак націсканнем правай кнопкі мышы"), + ("wayland_experiment_tip", "Падтрымка Wayland знаходзіцца на эксперыментальнай стадыі, калі вам неабходны аўтаматычны доступ, выкарыстоўвайце X11."), + ("Right click to select tabs", "Правы клік для выбару ўкладак"), ("Skipped", "Прапушчана"), ("Add to address book", "Дадаць у адрасную кнігу"), ("Group", "Група"), @@ -406,71 +408,72 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Closed manually by web console", "Закрыта ўручную праз вэб-кансоль"), ("Local keyboard type", "Тып лакальнай клавіятуры"), ("Select local keyboard type", "Выберыце тып лакальнай клавіятуры"), - ("software_render_tip", "Калі ў вас ёсць відэакарта Nvidia і аддаленае акно закрываецца адразу пасля падключэння, магчыма, дапаможа ўсталяванне драйвера Nouveau і выбар выкарыстання праграмнай візуалізацыі. Патрабуецца перазагрузка."), + ("software_render_tip", "Калі ў вас ёсць відэакарта Nvidia і аддаленае акно зачыняецца адразу пасля падлучэння, магчыма, дапаможа ўстаноўка драйвера Nouveau і выбар выкарыстання праграмнай візуалізацыі. Патрабуецца перазагрузка."), ("Always use software rendering", "Заўсёды выкарыстоўваць праграмную візуалізацыю"), - ("config_input", "Каб кіраваць аддаленым працоўным сталом праз клавіятуру, трэба дазволіць RustDesk \"Маніторынг уводу\"."), - ("config_microphone", "Каб размаўляць з абанентам, трэба дазволіць RustDesk запіс аўдыя."), - ("request_elevation_tip", "Таксама можна запытаць павышэння правоў, калі хто-небудзь знаходзіцца на баку абанента."), + ("config_input", "Каб кіраваць аддаленым працоўным сталом праз клавіятуру, неабходна дазволіць RustDesk маніторынг уводу."), + ("config_microphone", "Каб размаўляць з аддаленай старонкай, неабходна дазволіць RustDesk запіс аўдыё."), + ("request_elevation_tip", "Таксама можна запытаць павышэнне правоў, калі хто-небудзь знаходзіцца на аддаленай старонцы."), ("Wait", "Чакайце"), ("Elevation Error", "Памылка павышэння правоў"), - ("Ask the remote user for authentication", "Запытаць праверку сапраўднасці ў абанента"), - ("Choose this if the remote account is administrator", "Выберыце гэта, калі абанент з'яўляецца адміністратарам"), + ("Ask the remote user for authentication", "Запытаць аўтэнтыфікацыю ў аддаленага карыстальніка"), + ("Choose this if the remote account is administrator", "Выберыце гэта, калі аддалены акаўнт з'яўляецца адміністратарам"), ("Transmit the username and password of administrator", "Перадаць імя карыстальніка і пароль адміністратара"), - ("still_click_uac_tip", "Дагэтуль патрэбна, каб абанент націснуў \"OK\" ў акне UAC пры запуску RustDesk."), - ("Request Elevation", "Запытаць павышэння"), - ("wait_accept_uac_tip", "Пачакайце, пакуль абанент пацвердзіць запыт UAC."), - ("Elevate successfully", "Правы павышаны"), - ("uppercase", "верхні рэгістр"), - ("lowercase", "ніжні рэгістр"), - ("digit", "лічбы"), - ("special character", "спецыяльныя сімвалы"), - ("length>=8", "8+ сімвалаў"), + ("still_click_uac_tip", "Дагэтуль патрэбна, каб аддалены карыстальнік націснуў \"OK\" ў акне UAC пры запуску RustDesk."), + ("Request Elevation", "Запыт на павышэнне"), + ("wait_accept_uac_tip", "Пачакайце, пакуль аддалены карыстальнік пацвердзіць запыт UAC."), + ("Elevate successfully", "Павышэнне паспяхова выканана"), + ("uppercase", "Вялікія літары"), + ("lowercase", "Малыя літары"), + ("digit", "Лічбы"), + ("special character", "Спецыяльныя сімвалы"), + ("length>=8", "Даўжыня >= 8 сімвалаў"), ("Weak", "Слабы"), ("Medium", "Сярэдні"), ("Strong", "Моцны"), ("Switch Sides", "Пераключыць бакі"), - ("Please confirm if you want to share your desktop?", "Вы сапраўды дазваляеце дэманстрацыю працоўнага стала?"), + ("Please confirm if you want to share your desktop?", "Пацвердзіце, калі хочаце дазволіць паказ вашага працоўнага стала?"), ("Display", "Адлюстраванне"), - ("Default View Style", "Стандартны стыль адлюстравання"), - ("Default Scroll Style", "Стандартны стыль прагортвання"), - ("Default Image Quality", "Стандартная якасць відарыса"), - ("Default Codec", "Стандартны кодэк"), + ("Default View Style", "Стыль адлюстравання па змаўчанні"), + ("Default Scroll Style", "Стыль пракруткі па змаўчанні"), + ("Default Image Quality", "Якасць выявы па змаўчанні"), + ("Default Codec", "Кодэк па змаўчанні"), ("Bitrate", "Бітрэйт"), ("FPS", "Колькасць кадраў у секунду"), ("Auto", "Аўта"), - ("Other Default Options", "Іншыя стандартныя параметры"), + ("Other Default Options", "Іншыя параметры па змаўчанні"), ("Voice call", "Галасавы выклік"), ("Text chat", "Тэкставы чат"), ("Stop voice call", "Спыніць галасавы выклік"), - ("relay_hint_tip", "Непасрэднае падключэнне можа быць немагчымым. У гэтым выпадку можна спрабаваць падключыцца праз рэтранслятар.\nАкрамя таго, калі вы хочаце адразу выкарыстоўваць рэтранслятар, можна дадаць да ідэнтыфікатара суфікс \"/r\" або ўключыць \"Заўсёды падключацца праз рэтранслятар\" у наладах абанента."), + ("relay_hint_tip", "Непасрэднае падключэнне можа быць немагчымым. У гэтым выпадку можна спрабаваць падключыцца праз рэлей.\nАкрамя таго, калі вы хочаце адразу выкарыстоўваць рэлей, можна дадаць да ідэнтыфікатара суфікс \"/r\" або ўключыць \"Заўсёды падключацца праз рэлей\" ў наладах аддаленага вузла."), ("Reconnect", "Перападключыць"), ("Codec", "Кодэк"), - ("Resolution", "Раздзяляльнасць"), + ("Resolution", "Разрознасць"), ("No transfers in progress", "Перадача не ажыццяўляецца"), ("Set one-time password length", "Усталяваць даўжыню аднаразовага пароля"), ("RDP Settings", "Налады RDP"), ("Sort by", "Сартаваць па"), - ("New Connection", "Новае падключэнне"), + ("New Connection", "Новае злучэнне"), ("Restore", "Аднавіць"), ("Minimize", "Згарнуць"), ("Maximize", "Разгарнуць"), ("Your Device", "Ваша прылада"), ("empty_recent_tip", "Няма апошніх сеансаў!\nЧас запланаваць новы."), - ("empty_favorite_tip", "Яшчэ няма абраных абанентаў?\nДавайце знойдзем, каго можна дадаць у абранае."), - ("empty_lan_tip", "Абанентаў не знойдзена."), - ("empty_address_book_tip", "У адраснай кнізе няма абанентаў."), + ("empty_favorite_tip", "Яшчэ няма выбраных аддаленых вузлоў?\nДавайце знойдзем, каго можна дадаць у выбранае."), + ("empty_lan_tip", "Не знойдзены аддаленыя вузлы."), + ("empty_address_book_tip", "У адраснай кнізе няма аддаленых вузлоў."), + ("eg: admin", "напрыклад: admin"), ("Empty Username", "Пустае імя карыстальніка"), ("Empty Password", "Пусты пароль"), ("Me", "Я"), - ("identical_file_tip", "Файл ідэнтычны файлу абанента"), + ("identical_file_tip", "Файл ідэнтычны файлу на аддаленым вузле"), ("show_monitors_tip", "Паказваць маніторы на панэлі інструментаў"), ("View Mode", "Рэжым прагляду"), - ("login_linux_tip", "Каб уключыць сеанс працоўнага стала X, трэба ўвайсці ў аддалены ўліковы запіс Linux."), + ("login_linux_tip", "Каб ўключыць сеанс працоўнага стала X, неабходна ўвайсці ў аддалены акаўнт Linux."), ("verify_rustdesk_password_tip", "Пацвердзіць пароль RustDesk"), - ("remember_account_tip", "Запомніць гэты ўліковы запіс"), - ("os_account_desk_tip", "Гэты ўліковы запіс выкарыстоўваецца для ўваходу ў аддаленую аперацыйную сістэму і ўключэння сеанса працоўнага стала ў рэжыме headless."), + ("remember_account_tip", "Запомніць гэты акаўнт"), + ("os_account_desk_tip", "Гэты акаўнт выкарыстоўваецца для ўваходу ў аддаленую аперацыйную сістэму і ўключэння сеансу працоўнага сталу ў рэжыме headless."), ("OS Account", "Акаўнт АС"), - ("another_user_login_title_tip", "Іншы карыстальнік ужо ўвайшоў у сістэму"), + ("another_user_login_title_tip", "Іншы карыстальнік ўжо ўвайшоў у сістэму"), ("another_user_login_text_tip", "Адключыць"), ("xorg_not_found_title_tip", "Xorg не знойдзены"), ("xorg_not_found_text_tip", "Усталюйце Xorg"), @@ -478,39 +481,39 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("no_desktop_text_tip", "Усталюйце GNOME Desktop"), ("No need to elevate", "Павышэнне правоў не патрабуецца"), ("System Sound", "Сістэмны гук"), - ("Default", "Стандартна"), + ("Default", "Па змаўчанні"), ("New RDP", "Новы RDP"), ("Fingerprint", "Адбітак"), - ("Copy Fingerprint", "Капіяваць адбітак"), + ("Copy Fingerprint", "Капіраваць адбітак"), ("no fingerprints", "адбіткі адсутнічаюць"), - ("Select a peer", "Выберыце абанента"), - ("Select peers", "Выберыце абанентаў"), - ("Plugins", "Убудовы"), + ("Select a peer", "Выберыце аддалены ўзел"), + ("Select peers", "Выберыце аддаленыя ўзлы"), + ("Plugins", "Плагіны"), ("Uninstall", "Выдаліць"), ("Update", "Абнавіць"), ("Enable", "Уключыць"), ("Disable", "Адключыць"), ("Options", "Параметры"), - ("resolution_original_tip", "Арыгінальная раздзяляльнасць"), - ("resolution_fit_local_tip", "Супадзенне з лакальнай раздзяляльнасцю"), - ("resolution_custom_tip", "Карыстацкая раздзяляльнасць"), + ("resolution_original_tip", "Арыгінальнае разознасць"), + ("resolution_fit_local_tip", "Супадзенне з лакальнай разрознасцю"), + ("resolution_custom_tip", "Карыстацкая разрознасць"), ("Collapse toolbar", "Згарнуць панэль інструментаў"), ("Accept and Elevate", "Прыняць і павысіць"), - ("accept_and_elevate_btn_tooltip", "Дазволіць падключэнне і павысіць правы UAC."), - ("clipboard_wait_response_timeout_tip", "Час чакання адказу капіявання буфера абмену скончыўся"), - ("Incoming connection", "Уваходнае падключэнне"), - ("Outgoing connection", "Выходнае падключэнне"), - ("Exit", "Выйсці"), + ("accept_and_elevate_btn_tooltip", "Дазволіць падлучэнне і павысіць правы UAC."), + ("clipboard_wait_response_timeout_tip", "Час чакання адказу капіравання буфера абмену скончыўся"), + ("Incoming connection", "Уваходнае падлучэнне"), + ("Outgoing connection", "Выходнае падлучэнне"), + ("Exit", "Выхад"), ("Open", "Адкрыць"), - ("logout_tip", "Вы сапраўды хочаце выйсці?"), + ("logout_tip", "Вы сапраўды жадаеце выйсці?"), ("Service", "Служба"), ("Start", "Запусціць"), ("Stop", "Спыніць"), - ("exceed_max_devices", "Дасягнута максімальная колькасць кантраляваных прылад."), + ("exceed_max_devices", "Дасягнута максімальная колькасць кіруемых прылад."), ("Sync with recent sessions", "Сінхранізацыя з апошнімі сеансамі"), - ("Sort tags", "Сартаваць цэтлікі"), - ("Open connection in new tab", "Адкрыць падключэнне ў новай укладцы"), - ("Move tab to new window", "Перамясціць укладку ў новае акно"), + ("Sort tags", "Сартаваць тэгі"), + ("Open connection in new tab", "Адкрыць падлучэнне ў новай ўкладцы"), + ("Move tab to new window", "Перамясціць ўкладку ў новае акно"), ("Can not be empty", "Ня можа быць пустым"), ("Already exists", "Ужо існуе"), ("Change Password", "Змяніць пароль"), @@ -519,231 +522,186 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Grid View", "Сетка"), ("List View", "Спіс"), ("Select", "Выбар"), - ("Toggle Tags", "Пераключыць цэтлікі"), + ("Toggle Tags", "Пераключыць тэгі"), ("pull_ab_failed_tip", "Немагчыма абнавіць адрасную кнігу"), ("push_ab_failed_tip", "Немагчыма сінхранізаваць адрасную кнігу з серверам"), ("synced_peer_readded_tip", "Прылады, якія былі на апошніх сеансах, будуць сінхранізаваны з адраснай кнігай."), ("Change Color", "Змяніць колер"), ("Primary Color", "Асноўны колер"), ("HSV Color", "Колер HSV"), - ("Installation Successful!", "Усталяванне выканана!"), - ("Installation failed!", "Усталяванне не ўдалося."), - ("Reverse mouse wheel", "Адваротнае прагортванне мышшу"), - ("{} sessions", "Колькасць сеансаў: {}"), - ("scam_title", "Вас могуць ПАДМАНУЦЬ!"), - ("scam_text1", "Калі вы размаўляеце па тэлефоне з кімсьці НЕЗНАЁМЫМ і каму вы НЕ ДАВЕРАЕЦЕ, і гэта асоба просіць вас выкарыстаць RustDesk і запусціць яго службу, не працягвайце і неадкладна скончыце размову."), - ("scam_text2", "Магчыма, гэта аферыст, які спрабуе скрасці вашы грошы або іншую асабістую інфармацыю."), + ("Installation Successful!", "Інсталяцыя прайшла паспяхова!"), + ("Installation failed!", "Інсталяцыя не ўдалася!"), + ("Reverse mouse wheel", "Рэверс кола мышы"), + ("{} sessions", "{} сеансаў"), + ("scam_title", "Вы можаце быць АБМАНУТЫ!"), + ("scam_text1", "Калі вы размаўляеце па тэлефоне з кімсці, каго вы НЕ ВЕДАЕЦЕ і каму НЕ ДАВЕРАЕЦЕ, і ён просіць вас выкарыстаць RustDesk і запусціць яго службу, не працягвайце і неадкладна адмяніце размову."), + ("scam_text2", "Магчыма, гэта аферыст, які паспрабуе ўкрасць вашыя грошы або іншую асабістую інфармацыю."), ("Don't show again", "Не паказваць больш"), - ("I Agree", "Згаджаюся"), + ("I Agree", "Я згодны"), ("Decline", "Адхіліць"), ("Timeout in minutes", "Час чакання (у хвілінах)"), - ("auto_disconnect_option_tip", "Аўтаматычна закрываць уваходныя сеансы пры неактыўнасці карыстальніка"), - ("Connection failed due to inactivity", "Збой падключэння з-за неактыўнасці"), + ("auto_disconnect_option_tip", "Аўтаматычна зачыняць уваходныя сеансы пры неактыўнасці карыстальніка"), + ("Connection failed due to inactivity", "Падлучэнне не ўдалося з-за неактыўнасці"), ("Check for software update on startup", "Праверка абнаўленняў праграмы пры запуску"), - ("upgrade_rustdesk_server_pro_to_{}_tip", "Абнавіце RustDesk Server Pro да версіі {} або навейшай!"), + ("upgrade_rustdesk_server_pro_to_{}_tip", "Абнавіце RustDesk Server Pro да версіі {} або новейшай!"), ("pull_group_failed_tip", "Немагчыма абнавіць групу"), ("Filter by intersection", "Фільтраваць па перасячэнні"), - ("Remove wallpaper during incoming sessions", "Схаваць шпалеры працоўнага стала ў часе ўваходнага сеанса"), + ("Remove wallpaper during incoming sessions", "Схаваць фон працоўнага стала падчас ўваходнага сеансу"), ("Test", "Тэст"), - ("display_is_plugged_out_msg", "Дысплэй адключаны, пераключыцеся на першы дысплэй."), - ("No displays", "Няма дысплэяў"), + ("display_is_plugged_out_msg", "Дысплей адключаны, пераключыцеся на першы дысплей."), + ("No displays", "Няма дысплеяў"), ("Open in new window", "Адкрыць у новым акне"), - ("Show displays as individual windows", "Паказваць дысплэі ў асобных вокнах"), - ("Use all my displays for the remote session", "Выкарыстоўваць усе мае дысплэі для аддаленага сеанса"), - ("selinux_tip", "На вашай прыладзе ўключаны SELinux, што можа ствараць перашкоды ў працы RustDesk на баку абанента."), - ("Change view", "Рэжым"), + ("Show displays as individual windows", "Паказваць дысплеі ў асобных акнах"), + ("Use all my displays for the remote session", "Выкарыстоўваць усе мае дысплеі для аддаленага сеансу"), + ("selinux_tip", "На вашай прыладзе ўключаны SELinux, што можа перашкаджаць правільнай працы RustDesk на кіруючым баку."), + ("Change view", "Змяніць выгляд"), ("Big tiles", "Вялікія пліткі"), ("Small tiles", "Маленькія пліткі"), ("List", "Спіс"), - ("Virtual display", "Віртуальны дысплэй"), + ("Virtual display", "Віртуальны дысплей"), ("Plug out all", "Адключыць усё"), ("True color (4:4:4)", "True color (4:4:4)"), - ("Enable blocking user input", "Дазволіць блакіраванне ўводу на прыладзе"), - ("id_input_tip", "Можна ўвесці ідэнтыфікатар, прамы IP-адрас або дамен з портам (<дамен>:<порт>).\nКаб атрымаць доступ да прылады на іншым серверы, дадайце адрас сервера (@<адрас_сервера>?key=<ключ_значэнне>), напрыклад:\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nКалі трэба атрымаць доступ да прылады на агульнадаступным серверы, увядзіце \"@public\", ключ для публічнага сервера не патрабуецца."), + ("Enable blocking user input", "Дазволіць блакаванне ўводу карыстальніка на прыладзе"), + ("id_input_tip", "Можна ўвесці ідэнтыфікатар, просты IP-адрас або дамен з портам (<дамен>:<порт>).\nКаб атрымаць доступ да прылады на іншым серверы, дадайце адрас сервера (@<адрас_сервера>?key=<ключ_значэнне>), напрыклад:\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nКалі неабходна атрымаць доступ да прылады на грамадскім серверы, увядзіце \"@public\", ключ для грамадскага сервера не патрабуецца."), ("privacy_mode_impl_mag_tip", "Рэжым 1"), ("privacy_mode_impl_virtual_display_tip", "Рэжым 2"), - ("Enter privacy mode", "Уключыць рэжым канфідэнцыйнасці"), - ("Exit privacy mode", "Адключыць рэжым канфідэнцыйнасці"), - ("idd_not_support_under_win10_2004_tip", "Драйвер непрамога адлюстравання не падтрымліваецца. Патрабуецца Windows 10 версіі 2004 або навейшая."), + ("Enter privacy mode", "Уключыць рэжым канфідэнцыяльнасці"), + ("Exit privacy mode", "Адключыць рэжым канфідэнцыяльнасці"), + ("idd_not_support_under_win10_2004_tip", "Драйвер непрамога адлюстравання не падтрымліваецца. Патрабуецца Windows 10 версіі 2004 ці навейшая."), ("input_source_1_tip", "Крыніца ўводу 1"), ("input_source_2_tip", "Крыніца ўводу 2"), ("Swap control-command key", "Памяняць месцамі значэнні кнопак Ctrl і Command"), ("swap-left-right-mouse", "Памяняць месцамі значэнні левай і правай кнопак мышы"), - ("2FA code", "Код двухфактарнай праверкі сапраўднасці"), + ("2FA code", "Код двухфактарнай аўтэнтыфікацыі"), ("More", "Яшчэ"), - ("enable-2fa-title", "Выкарыстоўваць двухфактарную праверку сапраўднасці"), - ("enable-2fa-desc", "Наладзьце праграму праверкі сапраўднасці. Выкарыстоўвайце, напрыклад, Authy, Microsoft або Google Authenticator на тэлефоне ці камп’ютары.\n\nАдскануйце QR-код з дапамогай праграмы праверкі сапраўднасці і ўвядзіце код, які пакажа гэта праграма, каб уключыць двухфактарную праверку сапраўднасці."), + ("enable-2fa-title", "Выкарыстоўваць двухфактарную аўтэнтыфікацыю"), + ("enable-2fa-desc", "Наладзьце праграму аўтэнтыфікацыі. Выкарыстоўвайце, напрыклад, Authy, Microsoft або Google Authenticator на тэлефоне ці кампутары.\n\nСкануйце QR-код з дапамогай праграмы аўтэнтыфікацыі і ўвядзіце код, які пакажа гэта праграма, каб уключыць двухфактарную аўтэнтыфікацыю."), ("wrong-2fa-code", "Немагчыма пацвердзіць код. Праверце код і налады мясцовага часу."), - ("enter-2fa-title", "Двухфактарная праверка сапраўднасці"), - ("Email verification code must be 6 characters.", "Код пацвярджэння па электроннай пошце павінен складацца з 6 сімвалаў."), - ("2FA code must be 6 digits.", "Код двухфактарнай праверкі сапраўднасці павінен складацца з 6 лічбаў."), + ("enter-2fa-title", "Двухфактарная аутэнтыфікацыя"), + ("Email verification code must be 6 characters.", "Код верыфікацыі па электроннай пошце павінен складацца з 6 сімвалаў."), + ("2FA code must be 6 digits.", "Код двухфактарнай аутэнтыфікацыі павінен складацца з 6 лічбаў."), ("Multiple Windows sessions found", "Знойдзена некалькі сеансаў Windows"), - ("Please select the session you want to connect to", "Выберыце сеанс, да якога вы хочаце падключыцца"), - ("powered_by_me", "Заснавана на RustDesk"), + ("Please select the session you want to connect to", "Выберыце сеанс, да якога вы жадаеце падключыцца"), + ("powered_by_me", "На аснове RustDesk"), ("outgoing_only_desk_tip", "Гэта спецыялізаваная версія.\nВы можаце падключацца да іншых прылад, але іншыя прылады не могуць падключацца да вашай."), - ("preset_password_warning", "Гэта спецыялізаваная версія з прадвызначаным паролем. Любы, хто ведае гэты пароль, можа атрымаць поўны кантроль над вашай прыладай. Калі гэта для вас нечакана, адразу выдаліце гэта праграмнае забеспячэнне."), + ("preset_password_warning", "Гэта спецыялізаваная версія з устаноўленым загадзя паролем. Любы, хто ведае гэты пароль, можа атрымаць поўны кантроль над вашай прыладай. Калі гэта для вас нечакана, адразу выдаліце гэта праграмнае забеспячэнне."), ("Security Alert", "Папярэджанне аб бяспецы"), ("My address book", "Мая адрасная кніга"), - ("Personal", "Асабістая"), + ("Personal", "Асабісты"), ("Owner", "Уладальнік"), - ("Set shared password", "Задаць агульны пароль"), + ("Set shared password", "Устанавіць агульны пароль"), ("Exist in", "Існуе ў"), ("Read-only", "Толькі для чытання"), ("Read/Write", "Чытанне і запіс"), - ("Full Control", "Поўны доступ"), + ("Full Control", "Поўны кантроль"), ("share_warning_tip", "Палі вышэй з'яўляюцца агульнымі і бачнымі іншым."), ("Everyone", "Усе"), ("ab_web_console_tip", "Больш у вэб-кансолі"), - ("allow-only-conn-window-open-tip", "Дазволіць падключэнне толькі пры адкрытым акне RustDesk"), - ("no_need_privacy_mode_no_physical_displays_tip", "Фізічныя дысплэі адсутнічаюць, няма патрэбы выкарыстоўваць рэжым канфідэнцыйнасці."), - ("Follow remote cursor", "Прытрымлівацца аддаленага курсора"), - ("Follow remote window focus", "Прытрымлівацца фокуса аддаленага акна"), - ("default_proxy_tip", "Стандартныя пратакол і порт: Socks5 і 1080"), + ("allow-only-conn-window-open-tip", "Дазволіць толькі падключэнне пры адкрытым акне RustDesk"), + ("no_need_privacy_mode_no_physical_displays_tip", "Фізічныя дысплеі адсутнічаюць, няма патрэбы выкарыстоўваць рэжым канфідэнцыяльнасці."), + ("Follow remote cursor", "Сачыць за аддаленага курсарам"), + ("Follow remote window focus", "Сачыць за фокусам аддаленага акна"), + ("default_proxy_tip", "Пратакол і порт па змаўчанні: Socks5 і 1080"), ("no_audio_input_device_tip", "Прылада ўваходнага аудыё не знойдзена."), ("Incoming", "Уваходныя"), ("Outgoing", "Выходныя"), - ("Clear Wayland screen selection", "Скасаваць выбар экрана Wayland"), - ("clear_Wayland_screen_selection_tip", "Пасля скасавання можна зноў выбраць экран для дэманстрацыі."), - ("confirm_clear_Wayland_screen_selection_tip", "Скасаваць выбар экрана Wayland?"), - ("android_new_voice_call_tip", "Прыйшоў новы запыт на галасавы выклік. Калі вы прымеце яго, гук пераключыцца на галасавае падключэнне."), - ("texture_render_tip", "Выкарыстоўваць візуалізацыю тэкстур, каб зрабіць відарысы больш плаўнымі."), - ("Use texture rendering", "Візуалізацыя тэкстур"), - ("Floating window", "Нефіксаванае акно"), + ("Clear Wayland screen selection", "Адмяніць выбар экрана Wayland"), + ("clear_Wayland_screen_selection_tip", "Пасля адмены можна зноў выбраць экран для дэманстрацыі."), + ("confirm_clear_Wayland_screen_selection_tip", "Адмяніць выбар экрана Wayland?"), + ("android_new_voice_call_tip", "Атрыман новы запыт на галасавы выклік. Калі вы прымеце яго, гук пераключыцца на галасавае злучэнне."), + ("texture_render_tip", "Выкарыстоўваць візуалізацыю тэкстураў для павышэння каб плаўнасці выявы."), + ("Use texture rendering", "Візуалізацыя тэкстураў"), + ("Floating window", "Плавучае акно"), ("floating_window_tip", "Дапамагае падтрымліваць фонавую службу RustDesk"), ("Keep screen on", "Трымаць экран уключаным"), ("Never", "Ніколі"), ("During controlled", "Пры кіраванні"), ("During service is on", "Пры запушчанай службе"), ("Capture screen using DirectX", "Захоп экрана з выкарыстаннем DirectX"), - ("Back", "Назад"), - ("Apps", "Праграмы"), - ("Volume up", "Гучнасць+"), - ("Volume down", "Гучнасць-"), - ("Power", "Сілкаванне"), - ("Telegram bot", "Telegram-бот"), - ("enable-bot-tip", "Калі ўключана, можна атрымліваць код двухфактарнай праверкі сапраўднасці ад бота. Таксама ён можа выконваць функцыю апавяшчэння пра падключэнне."), - ("enable-bot-desc", "1) Адкрыйце чат з @BotFather.\n2) Адпраўце каманду \"/newbot\". Пасля выканання гэтага кроку вы атрымаеце токен.\n3) Пачніце чат з вашым толькі што створаным ботам. Адпраўце паведамленне, якое пачынаецца з касой рысы (\"/\"), напрыклад, \"/hello\", каб яго актываваць.\n"), - ("cancel-2fa-confirm-tip", "Адключыць двухфактарную праверку сапраўднасці?"), - ("cancel-bot-confirm-tip", "Адключыць Telegram-бота"), - ("About RustDesk", "Пра RustDesk"), - ("Send clipboard keystrokes", "Адпраўляць націсканні клавіш у буфер абмену"), - ("network_error_tip", "Праверце падключэнне да сеткі, пасля чаго націсніце \"Паўтарыць спробу\"."), - ("Unlock with PIN", "Разблакіраваць PIN-кодам"), - ("Requires at least {} characters", "Патрабуецца больш сімвалаў (ад {})"), - ("Wrong PIN", "Памылковы PIN-код"), - ("Set PIN", "Задаць PIN-код"), - ("Enable trusted devices", "Уключэнне давераных прылад"), - ("Manage trusted devices", "Кіраванне даверанымі прыладамі"), - ("Platform", "Платформа"), - ("Days remaining", "Засталося дзён"), - ("enable-trusted-devices-tip", "Дазволіць давераным прыладам прапускаць праверку сапраўднасці 2FA"), - ("Parent directory", "Бацькоўскі каталог"), - ("Resume", "Працягнуць"), - ("Invalid file name", "Памылковая назва файла"), - ("one-way-file-transfer-tip", "На баку абанента ўключана аднабаковая перадача файлаў."), - ("Authentication Required", "Патрабуецца праверка сапраўднасці"), - ("Authenticate", "Прайсці праверку"), - ("web_id_input_tip", "Можна ўвесці ID на тым самым серверы, прамы доступ па IP у вэб-кліенце не падтрымліваецца.\nКалі вы хочаце атрымаць доступ да прылады на іншым серверы, дадайце адрас сервера (@<адрас_сервера>?key=<ключ>), напрыклад,\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nКалі вы хочаце атрымаць доступ да прылады на публічным серверы, увядзіце \"@public\", для публічнага сервера ключ не патрэбны."), - ("Download", "Спампаваць"), - ("Upload folder", "Запампаваць папку"), - ("Upload files", "Запампаваць файлы"), - ("Clipboard is synchronized", "Буфер абмену сінхранізаваны"), - ("Update client clipboard", "Абнавіць буфер абмену кліента"), - ("Untagged", "Без цэтліка"), - ("new-version-of-{}-tip", "Даступна новая версія {}"), - ("Accessible devices", "Даступныя прылады"), - ("upgrade_remote_rustdesk_client_to_{}_tip", "Абнавіце кліент RustDesk да версіі {} або навейшай на баку абанента!"), - ("d3d_render_tip", "Пры ўключэнні візуалізацыі D3D на некаторых прыладах аддалены экран можа быць чорным."), - ("Use D3D rendering", "Выкарыстоўваць візуалізацыю D3D"), - ("Printer", "Прынтар"), - ("printer-os-requirement-tip", "Для работы функцыі выходнай сувязі з прынтарам патрабуецца Windows 10 або навейшай версіі."), - ("printer-requires-installed-{}-client-tip", "Каб выкарыстоўваць аддалены друк, {} павінен быць усталяваны на гэтай прыладзе."), - ("printer-{}-not-installed-tip", "Прынтар {} не ўсталяваны."), - ("printer-{}-ready-tip", "Прынтар {} усталяваны і гатовы да выкарыстання."), - ("Install {} Printer", "Усталюйце прынтар {}"), - ("Outgoing Print Jobs", "Выходныя заданні друку"), - ("Incoming Print Jobs", "Уваходныя заданні друку"), - ("Incoming Print Job", "Уваходнае заданне друку"), - ("use-the-default-printer-tip", "Выкарыстоўваць прынтар стандартна"), - ("use-the-selected-printer-tip", "Выкарыстоўваць выбраны прынтар"), - ("auto-print-tip", "Аўтаматычна выконваць друк на выбраным прынтары"), - ("print-incoming-job-confirm-tip", "З аддаленай прылады атрымана заданне на друк. Выканаць яго лакальна?"), - ("remote-printing-disallowed-tile-tip", "Аддалены друк забаронены"), - ("remote-printing-disallowed-text-tip", "Налады дазволаў на баку абанента забараняюць аддалены друк."), - ("save-settings-tip", "Захаваць налады"), - ("dont-show-again-tip", "Больш не паказваць"), - ("Take screenshot", "Зрабіць здымак экрана"), - ("Taking screenshot", "Робіцца здымак экрана"), - ("screenshot-merged-screen-not-supported-tip", "Аб’яднанне здымкаў экранаў з некалькіх дысплэяў у дадзены момант не падтрымліваецца. Пераключыцеся на адзін з дысплэяў і паўтарыце дзеянне."), - ("screenshot-action-tip", "Выберыце, што рабіць з атрыманым здымкам экрана."), - ("Save as", "Захаваць у файл"), - ("Copy to clipboard", "Скапіяваць у буфер абмену"), - ("Enable remote printer", "Выкарыстоўваць аддалены прынтар"), - ("Downloading {}", "Ідзе спампоўванне {}"), - ("{} Update", "Абнавіць {}"), - ("{}-to-update-tip", "{} закрыецца і ўсталюе новую версію."), - ("download-new-version-failed-tip", "Памылка спампоўвання. Можна паўтарыць спробу або націснуць кнопку \"Спампаваць\", каб спампаваць праграму з афіцыйнага сайта і абнавіць уручную."), - ("Auto update", "Аўтаматычнае абнаўленне"), - ("update-failed-check-msi-tip", "Немагчыма вызначыць метад усталявання. Націсніце кнопку \"Спампаваць\", каб спампаваць праграму з афіцыйнага сайта і абнавіце яго ўручную."), - ("websocket_tip", "WebSocket падтрымлівае толькі падключэнні да рэтранслятара."), - ("Use WebSocket", "Выкарыстоўваць WebSocket"), - ("Trackpad speed", "Хуткасць трэкпада"), - ("Default trackpad speed", "Стандартная хуткасць трэкпада"), - ("Numeric one-time password", "Лічбавы аднаразовы пароль"), - ("Enable IPv6 P2P connection", "Выкарыстоўваць падключэнне IPv6 P2P"), - ("Enable UDP hole punching", "Выкарыстоўваць UDP hole punching"), - ("View camera", "Рэжым камеры"), - ("Enable camera", "Уключыць камеру"), - ("No cameras", "Камера адсутнічае"), - ("view_camera_unsupported_tip", "Аддаленая прылада не падтрымлівае рэжыму камеры."), - ("Terminal", "Тэрмінал"), - ("Enable terminal", "Уключыць тэрмінал"), - ("New tab", "Новая ўкладка"), - ("Keep terminal sessions on disconnect", "Захоўваць сеансы тэрмінала пры адключэнні"), - ("Terminal (Run as administrator)", "Тэрмінал (адміністратар)"), - ("terminal-admin-login-tip", "Увядзіце імя карыстальніка і пароль адміністратара абанента."), - ("Failed to get user token.", "Не ўдалося атрымаць токен карыстальніка."), - ("Incorrect username or password.", "Памылковае імя карыстальніка або пароль."), - ("The user is not an administrator.", "Карыстальнік не з’яўляецца адміністратарам."), - ("Failed to check if the user is an administrator.", "Немагчыма праверыць, ці з’яўляецца карыстальнік адміністратарам."), - ("Supported only in the installed version.", "Падтрымліваецца толькі ва ўсталёвачнай версіі."), - ("elevation_username_tip", "Увядзіце карыстальніка або дамен\\карыстальніка"), - ("Preparing for installation ...", "Ідзе падрыхтоўка да ўсталявання..."), - ("Show my cursor", "Паказваць мой курсор"), - ("Scale custom", "Карыстальніцкае маштабаванне"), - ("Custom scale slider", "Карыстальніцкі паўзунок маштабавання"), - ("Decrease", "Паменшыць"), - ("Increase", "Павялічыць"), - ("Show virtual mouse", "Паказаць віртуальную мыш"), - ("Virtual mouse size", "Памер віртуальнай мышы"), - ("Small", "Маленькі"), - ("Large", "Вялікі"), - ("Show virtual joystick", "Паказваць віртуальны джойстык"), - ("Edit note", "Змяніць нататку"), - ("Alias", "Псеўданім"), - ("ScrollEdge", "Прагортваць з краю"), - ("Allow insecure TLS fallback", "Дазволіць небяспечныя TLS"), - ("allow-insecure-tls-fallback-tip", "Стандартна RustDesk правярае сертыфікат сервера на наяўнасць пратаколаў, якія выкарыстоўваюць TLS.\nКалі гэта функцыя ўключана, RustDesk прапусціць дадзены этап і працягне працу ў выпадку няўдалай праверкі."), - ("Disable UDP", "Выключыць UDP"), - ("disable-udp-tip", "Вызначае, ці варта выкарыстоўваць толькі TCP.\nКалі ўключана, RustDesk не будзе выкарыстоўваць UDP 21116, замест чаго будзе выкарыстоўвацца TCP 21116."), - ("server-oss-not-support-tip", "ЗАЎВАГА! у OSS-серверы RustDesk гэта функцыя адсутнічае."), - ("input note here", "увядзіце нататку"), - ("note-at-conn-end-tip", "Запытваць нататку ў канцы сеанса"), - ("Show terminal extra keys", "Паказваць дадатковыя кнопкі тэрмінала"), - ("Relative mouse mode", "Рэжым адноснага перамяшчэння мышы"), - ("rel-mouse-not-supported-peer-tip", "Рэжым адноснага перамяшчэння мышы не падтрымліваецца падключаным абанентам."), - ("rel-mouse-not-ready-tip", "Рэжым адноснага перамяшчэння мышы яшчэ не гатовы. Паспрабуйце зноў."), - ("rel-mouse-lock-failed-tip", "Немагчыма заблакіраваць курсор. Рэжым адноснага перамяшчэння мышы адключаны."), - ("rel-mouse-exit-{}-tip", "Націсніце {}, каб выйсці."), - ("rel-mouse-permission-lost-tip", "Дазвол на выкарыстанне клавіятуры скасаваны. Рэжым адноснага перамяшчэння мышы адключаны."), - ("Changelog", "Журнал змяненняў"), - ("keep-awake-during-outgoing-sessions-label", "Не адключаць экрана ў часе выходных сеансаў"), - ("keep-awake-during-incoming-sessions-label", "Не адключаць экрана ў часе ўваходных сеансаў"), - ("Continue with {}", "Працягнуць з {}"), - ("Display Name", "Імя для адлюстравання"), - ("password-hidden-tip", "Зададзены пастаянны пароль (скрыты)."), - ("preset-password-in-use-tip", "Пададзены пароль цяпер выкарыстоўваецца"), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Back", ""), + ("Apps", ""), + ("Volume up", ""), + ("Volume down", ""), + ("Power", ""), + ("Telegram bot", ""), + ("enable-bot-tip", ""), + ("enable-bot-desc", ""), + ("cancel-2fa-confirm-tip", ""), + ("cancel-bot-confirm-tip", ""), + ("About RustDesk", ""), + ("Send clipboard keystrokes", ""), + ("network_error_tip", ""), + ("Unlock with PIN", ""), + ("Requires at least {} characters", ""), + ("Wrong PIN", ""), + ("Set PIN", ""), + ("Enable trusted devices", ""), + ("Manage trusted devices", ""), + ("Platform", ""), + ("Days remaining", ""), + ("enable-trusted-devices-tip", ""), + ("Parent directory", ""), + ("Resume", ""), + ("Invalid file name", ""), + ("one-way-file-transfer-tip", ""), + ("Authentication Required", ""), + ("Authenticate", ""), + ("web_id_input_tip", ""), + ("Download", ""), + ("Upload folder", ""), + ("Upload files", ""), + ("Clipboard is synchronized", ""), + ("Update client clipboard", ""), + ("Untagged", ""), + ("new-version-of-{}-tip", ""), + ("Accessible devices", ""), + ("upgrade_remote_rustdesk_client_to_{}_tip", "Калі ласка, абнавіце кліент RustDesk да версіі {} або навейшай на аддаленым баку!"), + ("d3d_render_tip", ""), + ("Use D3D rendering", ""), + ("Printer", ""), + ("printer-os-requirement-tip", ""), + ("printer-requires-installed-{}-client-tip", ""), + ("printer-{}-not-installed-tip", ""), + ("printer-{}-ready-tip", ""), + ("Install {} Printer", ""), + ("Outgoing Print Jobs", ""), + ("Incoming Print Jobs", ""), + ("Incoming Print Job", ""), + ("use-the-default-printer-tip", ""), + ("use-the-selected-printer-tip", ""), + ("auto-print-tip", ""), + ("print-incoming-job-confirm-tip", ""), + ("remote-printing-disallowed-tile-tip", ""), + ("remote-printing-disallowed-text-tip", ""), + ("save-settings-tip", ""), + ("dont-show-again-tip", ""), + ("Take screenshot", ""), + ("Taking screenshot", ""), + ("screenshot-merged-screen-not-supported-tip", ""), + ("screenshot-action-tip", ""), + ("Save as", ""), + ("Copy to clipboard", ""), + ("Enable remote printer", ""), + ("Downloading {}", ""), + ("{} Update", ""), + ("{}-to-update-tip", ""), + ("download-new-version-failed-tip", ""), + ("Auto update", ""), + ("update-failed-check-msi-tip", ""), + ("websocket_tip", ""), + ("Use WebSocket", ""), + ("Trackpad speed", ""), + ("Default trackpad speed", ""), + ("Numeric one-time password", ""), + ("Enable IPv6 P2P connection", ""), + ("Enable UDP hole punching", ""), + ("View camera", "Прагляд камеры"), + ("Enable camera", ""), + ("No cameras", ""), + ("view_camera_unsupported_tip", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/bg.rs b/src/lang/bg.rs index 0aa61b1eb..1bf1a4845 100644 --- a/src/lang/bg.rs +++ b/src/lang/bg.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Парола на Операционната система"), ("install_tip", "Поради UAC, RustDesk в някои случай не може да работи правилно за отдалечена достъп. За да заобиколите UAC, моля, натиснете копчето по-долу, за да поставите RustDesk като системна услуга."), ("Click to upgrade", "Натиснете, за да надстроите"), + ("Click to download", "Натиснете, за да изтеглите"), + ("Click to update", "Натиснете, за да обновите"), ("Configure", "Настройване"), ("config_acc", "За да управлявате вашия работна среда отдалечено, трябва да предоставите на RustDesk права от раздел \"Достъпност\"."), ("config_screen", "За да управлявате вашия работна среда отдалечено, трябва да предоставите на RustDesk права от раздел \"Запис на екрана\"."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Настройки на клавиатурата"), ("Full Access", "Пълен достъп"), ("Screen Share", "Споделяне на екрана"), - ("ubuntu-21-04-required", "Wayland изисква Ubuntu 21.04 или по-нов"), - ("wayland-requires-higher-linux-version", "Wayland изисква по-нов Linux. Моля, опитайте с X11 или сменете операционната система."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland изисква Ubuntu 21.04 или по-нов"), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland изисква по-нов Linux. Моля, опитайте с X11 или сменете операционната система."), ("JumpLink", "Препратка"), ("Please Select the screen to be shared(Operate on the peer side).", "Моля, изберете екрана, който да бъде споделен (спрямо отдалечената страна)."), ("Show RustDesk", "Покажи RustDesk"), ("This PC", "Този компютър"), ("or", "или"), + ("Continue with", "Продължи с"), ("Elevate", "Повишаване"), ("Zoom cursor", "Уголемяване курсор"), ("Accept sessions via password", "Приемане сесии чрез парола"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Все още нямате любими връзки?\nНека намерим някой, с когото да се свържете, и да го добавим към вашите любими!"), ("empty_lan_tip", "О, не, изглежда, че все още не сме открили връзки."), ("empty_address_book_tip", "Изглежда, че в момента няма изброени връзки във вашата адресна книга."), + ("eg: admin", "напр. admin"), ("Empty Username", "Празно потребителско име"), ("Empty Password", "Празна парола"), ("Me", "Аз"), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Продължи с {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ca.rs b/src/lang/ca.rs index 2f706cc89..c6ece9ec1 100644 --- a/src/lang/ca.rs +++ b/src/lang/ca.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Contrasenya del sistema"), ("install_tip", "En alguns casos és possible que el RustDesk no funcioni correctament per les restriccions UAC («User Account Control»; Control de comptes d'usuari). Per evitar aquest problema, instal·leu el RustDesk al vostre sistema."), ("Click to upgrade", "Feu clic per a actualitzar"), + ("Click to download", "Feu clic per a baixar"), + ("Click to update", "Feu clic per a actualitzar"), ("Configure", "Configura"), ("config_acc", "Per a poder controlar el dispositiu remotament, faciliteu al RustDesk els permisos d'accessibilitat."), ("config_screen", "Per a poder controlar el dispositiu remotament, faciliteu al RustDesk els permisos de gravació de pantalla."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Configuració del teclat"), ("Full Access", "Accés complet"), ("Screen Share", "Compartició de pantalla"), - ("ubuntu-21-04-required", "Wayland requereix Ubuntu 21.04 o superior"), - ("wayland-requires-higher-linux-version", "Wayland requereix una versió superior de sistema Linux per a funcionar. Proveu iniciant un entorn d'escriptori amb x11 o actualitzeu el vostre sistema operatiu."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland requereix Ubuntu 21.04 o superior"), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland requereix una versió superior de sistema Linux per a funcionar. Proveu iniciant un entorn d'escriptori amb x11 o actualitzeu el vostre sistema operatiu."), ("JumpLink", "Marcador"), ("Please Select the screen to be shared(Operate on the peer side).", "Seleccioneu la pantalla que compartireu (quina serà visible al client)"), ("Show RustDesk", "Mostra el RustDesk"), ("This PC", "Aquest equip"), ("or", "o"), + ("Continue with", "Continua amb"), ("Elevate", "Permisos ampliats"), ("Zoom cursor", "Escala del ratolí"), ("Accept sessions via password", "Accepta les sessions mitjançant una contrasenya"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "No heu afegit cap dispositiu aquí!\nPodeu afegir dispositius favorits en qualsevol moment."), ("empty_lan_tip", "No s'ha trobat cap dispositiu proper."), ("empty_address_book_tip", "Sembla que no teniu cap dispositiu a la vostra llista d'adreces."), + ("eg: admin", "p. ex.:admin"), ("Empty Username", "Nom d'usuari buit"), ("Empty Password", "Contrasenya buida"), ("Me", "Vós"), @@ -652,18 +655,18 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Untagged", "Sense etiquetar"), ("new-version-of-{}-tip", ""), ("Accessible devices", "Dispositius accessibles"), - ("upgrade_remote_rustdesk_client_to_{}_tip", ""), + ("upgrade_remote_rustdesk_client_to_{}_tip", "Veuillez mettre à niveau le client RustDesk vers la version {} ou plus récente du côté distant !"), ("d3d_render_tip", ""), - ("Use D3D rendering", "Utilitza renderització D3D"), - ("Printer", "Impressora"), + ("Use D3D rendering", ""), + ("Printer", ""), ("printer-os-requirement-tip", ""), ("printer-requires-installed-{}-client-tip", ""), ("printer-{}-not-installed-tip", ""), ("printer-{}-ready-tip", ""), - ("Install {} Printer", "Instal·la {} impressora"), - ("Outgoing Print Jobs", "Treballs d'impressió sortints"), - ("Incoming Print Jobs", "Treballs d'impressió entrants"), - ("Incoming Print Job", "Treballs d'impressió entrant"), + ("Install {} Printer", ""), + ("Outgoing Print Jobs", ""), + ("Incoming Print Jobs", ""), + ("Incoming Print Job", ""), ("use-the-default-printer-tip", ""), ("use-the-selected-printer-tip", ""), ("auto-print-tip", ""), @@ -672,78 +675,33 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remote-printing-disallowed-text-tip", ""), ("save-settings-tip", ""), ("dont-show-again-tip", ""), - ("Take screenshot", "Fes una captura de pantalla"), - ("Taking screenshot", "Fent la captura de pantalla"), + ("Take screenshot", ""), + ("Taking screenshot", ""), ("screenshot-merged-screen-not-supported-tip", ""), ("screenshot-action-tip", ""), - ("Save as", "Anomena i desa"), - ("Copy to clipboard", "Copia al porta-retalls"), - ("Enable remote printer", "Habilita l'impressora remota"), - ("Downloading {}", "Descarregant {}"), - ("{} Update", "{} Actualitza"), + ("Save as", ""), + ("Copy to clipboard", ""), + ("Enable remote printer", ""), + ("Downloading {}", ""), + ("{} Update", ""), ("{}-to-update-tip", ""), ("download-new-version-failed-tip", ""), - ("Auto update", "Actualització automàtica"), + ("Auto update", ""), ("update-failed-check-msi-tip", ""), ("websocket_tip", ""), ("Use WebSocket", ""), - ("Trackpad speed", "Velocitat del trackpad"), - ("Default trackpad speed", "Velocitat per defecte del trackpad"), - ("Numeric one-time password", "Contrasenya numèrica d'un sol ús"), - ("Enable IPv6 P2P connection", "Habilita la connexió IPv6 P2P"), - ("Enable UDP hole punching", "Activa la perforació UDP"), + ("Trackpad speed", ""), + ("Default trackpad speed", ""), + ("Numeric one-time password", ""), + ("Enable IPv6 P2P connection", ""), + ("Enable UDP hole punching", ""), ("View camera", "Mostra la càmera"), - ("Enable camera", "Habilita la càmera"), - ("No cameras", "No hi ha càmeres"), + ("Enable camera", ""), + ("No cameras", ""), ("view_camera_unsupported_tip", ""), - ("Terminal", "Terminal"), - ("Enable terminal", "Habilita el terminal"), - ("New tab", "Nova finestra"), - ("Keep terminal sessions on disconnect", "Mantingues les sessions de terminal desconnectades"), - ("Terminal (Run as administrator)", "Terminal (executa com a administrador"), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", "No s'ha pogut obtenir el token d'usuari."), - ("Incorrect username or password.", "Nom d'usuari o contrasenya incorrecte"), - ("The user is not an administrator.", "Aquest usuari no és administrador"), - ("Failed to check if the user is an administrator.", "No s'ha pogut comprovar si l'usuari és administrador."), - ("Supported only in the installed version.", "Només compatible amb la versió instal·lada."), - ("elevation_username_tip", ""), - ("Preparing for installation ...", "Preparant per a l'instal·lació..."), - ("Show my cursor", "Mostra el meu punter"), - ("Scale custom", "Escala personalitzada"), - ("Custom scale slider", "Control lliscant d'escala personalitzada"), - ("Decrease", "Disminueix"), - ("Increase", "Augmenta"), - ("Show virtual mouse", "Mostra el ratolí virtual"), - ("Virtual mouse size", "Mida del ratolí virtual"), - ("Small", "Petita"), - ("Large", "Gran"), - ("Show virtual joystick", "Mostra el joystick virtual"), - ("Edit note", "Edita la nota"), - ("Alias", "Alias"), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Continua amb {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/cn.rs b/src/lang/cn.rs index a90e5e194..f7110573f 100644 --- a/src/lang/cn.rs +++ b/src/lang/cn.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "操作系统密码"), ("install_tip", "你正在运行未安装版本，由于 UAC 限制，作为被控端，会在某些情况下无法控制鼠标键盘，或者录制屏幕，请点击下面的按钮将 RustDesk 安装到系统，从而规避上述问题。"), ("Click to upgrade", "点击这里升级"), + ("Click to download", "点击这里下载"), + ("Click to update", "点击这里更新"), ("Configure", "配置"), ("config_acc", "为了能够远程控制你的桌面, 请给予 RustDesk \"辅助功能\" 权限。"), ("config_screen", "为了能够远程访问你的桌面, 请给予 RustDesk \"屏幕录制\" 权限。"), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "键盘设置"), ("Full Access", "完全访问"), ("Screen Share", "仅共享屏幕"), - ("ubuntu-21-04-required", "Wayland 需要 Ubuntu 21.04 或更高版本。"), - ("wayland-requires-higher-linux-version", "Wayland 需要更高版本的 linux 发行版。 请尝试 X11 桌面或更改您的操作系统。"), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland 需要 Ubuntu 21.04 或更高版本。"), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland 需要更高版本的 linux 发行版。 请尝试 X11 桌面或更改您的操作系统。"), ("JumpLink", "查看"), ("Please Select the screen to be shared(Operate on the peer side).", "请选择要分享的画面（对端操作）。"), ("Show RustDesk", "显示 RustDesk"), ("This PC", "此电脑"), ("or", "或"), + ("Continue with", "使用"), ("Elevate", "提权"), ("Zoom cursor", "缩放光标"), ("Accept sessions via password", "只允许密码访问"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "还没有收藏的被控端？找一个人连接并将其添加到收藏吧！"), ("empty_lan_tip", "情况不妙，似乎未发现任何被控端！"), ("empty_address_book_tip", "似乎目前地址簿内无被控端"), + ("eg: admin", "例如：admin"), ("Empty Username", "空用户名"), ("Empty Password", "空密码"), ("Me", "我"), @@ -683,67 +686,22 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("{} Update", "{} 更新"), ("{}-to-update-tip", "即将关闭 {} ，并安装新版本。"), ("download-new-version-failed-tip", "下载失败，您可以重试或者点击\"下载\"按钮，从发布网址下载，并手动升级。"), - ("Auto update", "自动更新"), + ("Auto update", ""), ("update-failed-check-msi-tip", "安装方式检测失败。请点击\"下载\"按钮，从发布网址下载，并手动升级。"), ("websocket_tip", "使用 WebSocket 时，仅支持中继连接。"), ("Use WebSocket", "使用 WebSocket"), ("Trackpad speed", "触控板速度"), ("Default trackpad speed", "默认触控板速度"), ("Numeric one-time password", "一次性密码为数字"), - ("Enable IPv6 P2P connection", "启用 IPv6 P2P 连接"), - ("Enable UDP hole punching", "启用 UDP 打洞"), + ("Enable IPv6 P2P connection", ""), + ("Enable UDP hole punching", ""), ("View camera", "查看摄像头"), ("Enable camera", "允许查看摄像头"), ("No cameras", "没有摄像头"), ("view_camera_unsupported_tip", "您的远程端不支持查看摄像头。"), - ("Terminal", "终端"), - ("Enable terminal", "启用终端"), - ("New tab", "新建选项卡"), - ("Keep terminal sessions on disconnect", "断开连接时保持终端会话"), - ("Terminal (Run as administrator)", "终端（以管理员身份运行）"), - ("terminal-admin-login-tip", "请输入被控端的管理员账号密码。"), - ("Failed to get user token.", "获取用户令牌时出错。"), - ("Incorrect username or password.", "用户名或密码不正确。"), - ("The user is not an administrator.", "用户不是管理员。"), - ("Failed to check if the user is an administrator.", "检查用户是否为管理员时出错。"), - ("Supported only in the installed version.", "仅在以安装版本受支持。"), - ("elevation_username_tip", "输入用户名或域名\\用户名"), - ("Preparing for installation ...", "准备安装..."), - ("Show my cursor", "显示我的光标"), - ("Scale custom", "自定义缩放"), - ("Custom scale slider", "自定义缩放滑块"), - ("Decrease", "缩小"), - ("Increase", "放大"), - ("Show virtual mouse", "显示虚拟鼠标"), - ("Virtual mouse size", "虚拟鼠标大小"), - ("Small", "小"), - ("Large", "大"), - ("Show virtual joystick", "显示虚拟摇杆"), - ("Edit note", "编辑备注"), - ("Alias", "别名"), - ("ScrollEdge", "边缘滚动"), - ("Allow insecure TLS fallback", "允许回退到不安全的 TLS 连接"), - ("allow-insecure-tls-fallback-tip", "默认情况下，对于使用 TLS 的协议，RustDesk 会验证服务器证书。\n启用此选项后，在验证失败时，RustDesk 将转为跳过验证步骤并继续连接。"), - ("Disable UDP", "禁用 UDP"), - ("disable-udp-tip", "控制是否仅使用 TCP。\n启用此选项后，RustDesk 将不再使用 UDP 21116，而是使用 TCP 21116。"), - ("server-oss-not-support-tip", "注意：RustDesk 开源服务器 (OSS server) 不包含此功能。"), - ("input note here", "输入备注"), - ("note-at-conn-end-tip", "在连接结束时请求备注"), - ("Show terminal extra keys", "显示终端扩展键"), - ("Relative mouse mode", "相对鼠标模式"), - ("rel-mouse-not-supported-peer-tip", "被控端不支持相对鼠标模式"), - ("rel-mouse-not-ready-tip", "相对鼠标模式尚未准备好，请稍后再试"), - ("rel-mouse-lock-failed-tip", "无法锁定鼠标，相对鼠标模式已禁用"), - ("rel-mouse-exit-{}-tip", "按下 {} 退出"), - ("rel-mouse-permission-lost-tip", "键盘权限被撤销。相对鼠标模式已被禁用。"), - ("Changelog", "更新日志"), - ("keep-awake-during-outgoing-sessions-label", "传出会话期间保持屏幕常亮"), - ("keep-awake-during-incoming-sessions-label", "传入会话期间保持屏幕常亮"), - ("Continue with {}", "使用 {} 登录"), - ("Display Name", "显示名称"), - ("password-hidden-tip", "永久密码已设置（已隐藏）"), - ("preset-password-in-use-tip", "当前使用预设密码"), - ("Enable privacy mode", "允许隐私模式"), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/cs.rs b/src/lang/cs.rs index 7f50d826f..1b5a0b492 100644 --- a/src/lang/cs.rs +++ b/src/lang/cs.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Heslo do operačního systému"), ("install_tip", "Kvůli řízení oprávnění v systému (UAC), RustDesk v některých případech na protistraně nefunguje správně. Abyste se UAC vyhnuli, klikněte na níže uvedené tlačítko a nainstalujte tak RustDesk do systému."), ("Click to upgrade", "Aktualizovat"), + ("Click to download", "Stáhnout"), + ("Click to update", "Aktualizovat"), ("Configure", "Nastavit"), ("config_acc", "Aby bylo možné na dálku ovládat vaši plochu, je třeba aplikaci RustDesk udělit oprávnění pro \"Zpřístupnění pro hendikepované\"."), ("config_screen", "Aby bylo možné přistupovat k vaší ploše na dálku, je třeba aplikaci RustDesk udělit oprávnění pro \"Nahrávání obsahu obrazovky\"."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Nastavení klávesnice"), ("Full Access", "Úplný přístup"), ("Screen Share", "Sdílení obrazovky"), - ("ubuntu-21-04-required", "Wayland vyžaduje Ubuntu 21.04, nebo vyšší verzi."), - ("wayland-requires-higher-linux-version", "Wayland vyžaduje vyšší verzi linuxové distribuce. Zkuste prosím X11 desktop, nebo změňte OS."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland vyžaduje Ubuntu 21.04, nebo vyšší verzi."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland vyžaduje vyšší verzi linuxové distribuce. Zkuste prosím X11 desktop, nebo změňte OS."), ("JumpLink", "JumpLink"), ("Please Select the screen to be shared(Operate on the peer side).", "Vyberte prosím obrazovku, kterou chcete sdílet (Ovládejte na straně protistrany)."), ("Show RustDesk", "Zobrazit RustDesk"), ("This PC", "Tento počítač"), ("or", "nebo"), + ("Continue with", "Pokračovat s"), ("Elevate", "Zvýšit"), ("Zoom cursor", "Kurzor přiblížení"), ("Accept sessions via password", "Přijímat relace pomocí hesla"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Ještě nemáte oblíbené protistrany?\nNajděte někoho, s kým se můžete spojit, a přidejte si ho do oblíbených!"), ("empty_lan_tip", "Ale ne, vypadá, že jsme ještě neobjevili žádné protistrany."), ("empty_address_book_tip", "Ach bože, zdá se, že ve vašem adresáři nejsou v současné době uvedeni žádní kolegové."), + ("eg: admin", "např. admin"), ("Empty Username", "Prázdné uživatelské jméno"), ("Empty Password", "Prázdné heslo"), ("Me", "Já"), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Pokračovat s {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/da.rs b/src/lang/da.rs index c9d3b4eb0..0aab88c9c 100644 --- a/src/lang/da.rs +++ b/src/lang/da.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Operativsystemadgangskode"), ("install_tip", "På grund af UAC kan RustDesk ikke fungere korrekt i nogle tilfælde på fjernskrivebordet. For at undgå UAC skal du klikke på knappen nedenfor for at installere RustDesk på systemet"), ("Click to upgrade", "Klik for at opgradere"), + ("Click to download", "Klik for at downloade"), + ("Click to update", "Klik for at opdatere"), ("Configure", "Konfigurer"), ("config_acc", "For at kontrollere dit skrivebord på afstand skal du give RustDesk \"Access \" Rettigheder."), ("config_screen", "For at kunne få adgang til dit skrivebord langtfra, skal du give RustDesk \"skærmstøtte \" tilladelser."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Tastaturindstillinger"), ("Full Access", "Fuld adgang"), ("Screen Share", "Skærmdeling"), - ("ubuntu-21-04-required", "Wayland kræver Ubuntu version 21.04 eller nyere."), - ("wayland-requires-higher-linux-version", "Wayland kræver en højere version af Linux distro. Prøv venligst X11 desktop eller skift dit OS."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland kræver Ubuntu version 21.04 eller nyere."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland kræver en højere version af Linux distro. Prøv venligst X11 desktop eller skift dit OS."), ("JumpLink", "JumpLink"), ("Please Select the screen to be shared(Operate on the peer side).", "Vælg venligst den skærm, der skal deles (Betjen på modtagersiden)."), ("Show RustDesk", "Vis RustDesk"), ("This PC", "Denne PC"), ("or", "eller"), + ("Continue with", "Fortsæt med"), ("Elevate", "Elevér"), ("Zoom cursor", "Zoom markør"), ("Accept sessions via password", "Acceptér sessioner via adgangskode"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Ingen yndlings modparter endnu?\nLad os finde én at forbinde til, og tilføje den til dine favoritter!"), ("empty_lan_tip", "Åh nej, det ser ud til, at vi ikke kunne finde nogen modparter endnu."), ("empty_address_book_tip", "Åh nej, det ser ud til at der ikke er nogle modparter der er tilføjet til din adressebog."), + ("eg: admin", "fx: admin"), ("Empty Username", "Tom brugernavn"), ("Empty Password", "Tom adgangskode"), ("Me", "Mig"), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Fortsæt med {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/de.rs b/src/lang/de.rs index e6233e91e..9b68d2821 100644 --- a/src/lang/de.rs +++ b/src/lang/de.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Betriebssystem-Passwort"), ("install_tip", "Aufgrund der Benutzerkontensteuerung (UAC) kann RustDesk in manchen Fällen nicht ordnungsgemäß funktionieren. Um die Benutzerkontensteuerung zu umgehen, klicken Sie bitte auf die Schaltfläche unten und installieren RustDesk auf dem System."), ("Click to upgrade", "Zum Upgraden klicken"), + ("Click to download", "Zum Herunterladen klicken"), + ("Click to update", "Zum Aktualisieren klicken"), ("Configure", "Konfigurieren"), ("config_acc", "Um Ihren PC aus der Ferne zu steuern, müssen Sie RustDesk Zugriffsrechte erteilen."), ("config_screen", "Um aus der Ferne auf Ihren PC zugreifen zu können, müssen Sie RustDesk die Berechtigung \"Bildschirmaufnahme\" erteilen."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Tastatureinstellungen"), ("Full Access", "Vollzugriff"), ("Screen Share", "Bildschirmfreigabe"), - ("ubuntu-21-04-required", "Wayland erfordert Ubuntu 21.04 oder eine höhere Version."), - ("wayland-requires-higher-linux-version", "Wayland erfordert eine höhere Version der Linux-Distribution. Bitte versuchen Sie den X11-Desktop oder ändern Sie Ihr Betriebssystem."), - ("xdp-portal-unavailable", "Die Bildschirmaufnahme mit Wayland ist fehlgeschlagen. Das XDG-Desktop-Portal ist möglicherweise abgestürzt oder nicht verfügbar. Versuchen Sie, es mit `systemctl --user restart xdg-desktop-portal` neu zu starten."), - ("JumpLink", "Anzeigen"), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland erfordert Ubuntu 21.04 oder eine höhere Version."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland erfordert eine höhere Version der Linux-Distribution. Bitte versuchen Sie den X11-Desktop oder ändern Sie Ihr Betriebssystem."), + ("JumpLink", "View"), ("Please Select the screen to be shared(Operate on the peer side).", "Bitte wählen Sie den freizugebenden Bildschirm aus (Bedienung auf der Gegenseite)."), ("Show RustDesk", "RustDesk anzeigen"), ("This PC", "Dieser PC"), ("or", "oder"), + ("Continue with", "Fortfahren mit"), ("Elevate", "Zugriff gewähren"), ("Zoom cursor", "Cursor vergrößern"), ("Accept sessions via password", "Sitzung mit Passwort bestätigen"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Noch keine favorisierte Gegenstelle?\nLassen Sie uns jemanden finden, mit dem wir uns verbinden können und fügen Sie ihn zu Ihren Favoriten hinzu!"), ("empty_lan_tip", "Oh nein, es sieht so aus, als hätten wir noch keine Gegenstelle entdeckt."), ("empty_address_book_tip", "Oh je, es scheint, dass in Ihrem Adressbuch derzeit keine Gegenstellen aufgeführt sind."), + ("eg: admin", "z. B.: admin"), ("Empty Username", "Leerer Benutzername"), ("Empty Password", "Leeres Passwort"), ("Me", "Ich"), @@ -562,8 +565,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("id_input_tip", "Sie können eine ID, eine direkte IP oder eine Domäne mit einem Port (:) eingeben.\nWenn Sie auf ein Gerät auf einem anderen Server zugreifen wollen, fügen Sie bitte die Serveradresse (@?key=) hinzu, zum Beispiel\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nWenn Sie auf ein Gerät auf einem öffentlichen Server zugreifen wollen, geben Sie bitte \"@public\" ein. Der Schlüssel wird für öffentliche Server nicht benötigt.\n\nWenn Sie bei der ersten Verbindung die Verwendung einer Relay-Verbindung erzwingen wollen, fügen Sie \"/r\" am Ende der ID hinzu, zum Beispiel \"9123456234/r\"."), ("privacy_mode_impl_mag_tip", "Modus 1"), ("privacy_mode_impl_virtual_display_tip", "Modus 2"), - ("Enter privacy mode", "Datenschutzmodus aktiviert"), - ("Exit privacy mode", "Datenschutzmodus beendet"), + ("Enter privacy mode", "Datenschutzmodus aktivieren"), + ("Exit privacy mode", "Datenschutzmodus beenden"), ("idd_not_support_under_win10_2004_tip", "Indirekter Grafiktreiber wird nicht unterstützt. Windows 10, Version 2004 oder neuer ist erforderlich."), ("input_source_1_tip", "Eingangsquelle 1"), ("input_source_2_tip", "Eingangsquelle 2"), @@ -666,7 +669,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Incoming Print Job", "Eingehender Druckauftrag"), ("use-the-default-printer-tip", "Standarddrucker verwenden"), ("use-the-selected-printer-tip", "Ausgewählten Drucker verwenden"), - ("auto-print-tip", "Automatisch mit dem ausgewählten Drucker drucken"), + ("auto-print-tip", "Automatischer Druck mit dem ausgewählten Drucker."), ("print-incoming-job-confirm-tip", "Sie haben einen Druckauftrag aus der Ferne erhalten. Möchten Sie ihn bei sich selbst ausführen?"), ("remote-printing-disallowed-tile-tip", "Entferntes Drucken nicht erlaubt"), ("remote-printing-disallowed-text-tip", "Die Berechtigungseinstellungen der kontrollierten Seite verweigern den entfernten Druck."), @@ -696,54 +699,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable camera", "Kamera zulassen"), ("No cameras", "Keine Kameras"), ("view_camera_unsupported_tip", "Das entfernte Gerät kann die Kamera nicht anzeigen."), - ("Terminal", "Terminal"), - ("Enable terminal", "Terminal zulassen"), - ("New tab", "Neuer Tab"), - ("Keep terminal sessions on disconnect", "Terminalsitzungen beim Trennen der Verbindung beibehalten"), - ("Terminal (Run as administrator)", "Terminal (als Administrator ausführen)"), - ("terminal-admin-login-tip", "Bitte geben Sie den Benutzernamen und das Passwort des Administrators der kontrollierten Seite ein."), - ("Failed to get user token.", "Benutzer-Token konnte nicht abgerufen werden."), - ("Incorrect username or password.", "Falscher Benutzername oder falsches Passwort."), - ("The user is not an administrator.", "Der Benutzer ist kein Administrator."), - ("Failed to check if the user is an administrator.", "Es konnte nicht geprüft werden, ob der Benutzer ein Administrator ist."), - ("Supported only in the installed version.", "Wird nur in der installierten Version unterstützt."), - ("elevation_username_tip", "Geben Sie Benutzername oder Domäne\\Benutzername ein"), - ("Preparing for installation ...", "Installation wird vorbereitet …"), - ("Show my cursor", "Meinen Cursor anzeigen"), - ("Scale custom", "Benutzerdefinierte Skalierung"), - ("Custom scale slider", "Schieberegler für benutzerdefinierte Skalierung"), - ("Decrease", "Verringern"), - ("Increase", "Erhöhen"), - ("Show virtual mouse", "Virtuelle Maus anzeigen"), - ("Virtual mouse size", "Virtuelle Mausgröße"), - ("Small", "Klein"), - ("Large", "Groß"), - ("Show virtual joystick", "Virtuellen Joystick anzeigen"), - ("Edit note", "Hinweis bearbeiten"), - ("Alias", "Alias"), - ("ScrollEdge", "Scrollen am Rand"), - ("Allow insecure TLS fallback", "Unsicheres TLS-Fallback zulassen"), - ("allow-insecure-tls-fallback-tip", "Standardmäßig überprüft RustDesk das Serverzertifikat für Protokolle, die TLS verwenden. Wenn diese Option aktiviert ist, überspringt RustDesk den Überprüfungsschritt und fährt im Falle eines Überprüfungsfehlers fort."), - ("Disable UDP", "UDP deaktivieren"), - ("disable-udp-tip", "Legt fest, ob nur TCP verwendet werden soll. Wenn diese Option aktiviert ist, verwendet RustDesk nicht mehr UDP 21116, sondern stattdessen TCP 21116."), - ("server-oss-not-support-tip", "HINWEIS: RustDesk Server OSS enthält diese Funktion nicht."), - ("input note here", "Hier eine Notiz eingeben"), - ("note-at-conn-end-tip", "Am Ende der Verbindung um eine Notiz bitten."), - ("Show terminal extra keys", "Zusätzliche Tasten des Terminals anzeigen"), - ("Relative mouse mode", "Relativer Mausmodus"), - ("rel-mouse-not-supported-peer-tip", "Der relative Mausmodus wird von der verbundenen Gegenstelle nicht unterstützt."), - ("rel-mouse-not-ready-tip", "Der relative Mausmodus ist noch nicht bereit. Bitte versuchen Sie es erneut."), - ("rel-mouse-lock-failed-tip", "Cursor konnte nicht gesperrt werden. Der relative Mausmodus wurde deaktiviert."), - ("rel-mouse-exit-{}-tip", "Drücken Sie {} zum Beenden."), - ("rel-mouse-permission-lost-tip", "Die Tastaturberechtigung wurde widerrufen. Der relative Mausmodus wurde deaktiviert."), - ("Changelog", "Änderungsprotokoll"), - ("keep-awake-during-outgoing-sessions-label", "Bildschirm während ausgehender Sitzungen aktiv halten"), - ("keep-awake-during-incoming-sessions-label", "Bildschirm während eingehender Sitzungen aktiv halten"), - ("Continue with {}", "Fortfahren mit {}"), - ("Display Name", "Anzeigename"), - ("password-hidden-tip", "Ein permanentes Passwort wurde festgelegt (ausgeblendet)."), - ("preset-password-in-use-tip", "Das voreingestellte Passwort wird derzeit verwendet."), - ("Enable privacy mode", "Datenschutzmodus aktivieren"), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/el.rs b/src/lang/el.rs index d03bb069c..2accbd9a7 100644 --- a/src/lang/el.rs +++ b/src/lang/el.rs @@ -3,7 +3,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = [ ("Status", "Κατάσταση"), ("Your Desktop", "Ο σταθμός εργασίας σας"), - ("desk_tip", "Η πρόσβαση στον σταθμό εργασίας σας είναι δυνατή με αυτό το ID και τον κωδικό πρόσβασης."), + ("desk_tip", "Η πρόσβαση στον σταθμό εργασίας σας είναι δυνατή με αυτό το αναγνωριστικό και τον κωδικό πρόσβασης."), ("Password", "Κωδικός πρόσβασης"), ("Ready", "Έτοιμο"), ("Established", "Συνδέθηκε"), @@ -19,16 +19,16 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Recent sessions", "Πρόσφατες συνεδρίες"), ("Address book", "Βιβλίο διευθύνσεων"), ("Confirmation", "Επιβεβαίωση"), - ("TCP tunneling", "Σήραγγα TCP"), + ("TCP tunneling", "TCP tunneling"), ("Remove", "Κατάργηση"), - ("Refresh random password", "Ανανέωση τυχαίου κωδικού πρόσβασης"), + ("Refresh random password", "Νέος τυχαίος κωδικός πρόσβασης"), ("Set your own password", "Ορίστε τον δικό σας κωδικό πρόσβασης"), ("Enable keyboard/mouse", "Ενεργοποίηση πληκτρολογίου/ποντικιού"), ("Enable clipboard", "Ενεργοποίηση προχείρου"), ("Enable file transfer", "Ενεργοποίηση μεταφοράς αρχείων"), - ("Enable TCP tunneling", "Ενεργοποίηση σήραγγας TCP"), + ("Enable TCP tunneling", "Ενεργοποίηση TCP tunneling"), ("IP Whitelisting", "Λίστα επιτρεπόμενων IP"), - ("ID/Relay Server", "ID/Διακομιστής Αναμετάδοσης"), + ("ID/Relay Server", "Διακομιστής ID/Αναμετάδοσης"), ("Import server config", "Εισαγωγή διαμόρφωσης διακομιστή"), ("Export Server Config", "Εξαγωγή διαμόρφωσης διακομιστή"), ("Import server configuration successfully", "Επιτυχής εισαγωγή διαμόρφωσης διακομιστή"), @@ -36,14 +36,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Invalid server configuration", "Μη έγκυρη διαμόρφωση διακομιστή"), ("Clipboard is empty", "Το πρόχειρο είναι κενό"), ("Stop service", "Διακοπή υπηρεσίας"), - ("Change ID", "Αλλαγή του ID σας"), + ("Change ID", "Αλλαγή αναγνωριστικού ID"), ("Your new ID", "Το νέο σας ID"), ("length %min% to %max%", "μέγεθος από %min% έως %max%"), ("starts with a letter", "ξεκινά με γράμμα"), ("allowed characters", "επιτρεπόμενοι χαρακτήρες"), ("id_change_tip", "Επιτρέπονται μόνο οι χαρακτήρες a-z, A-Z, 0-9, - (παύλα) και _ (κάτω παύλα). Το πρώτο γράμμα πρέπει να είναι a-z, A-Z και το μήκος πρέπει να είναι μεταξύ 6 και 16 χαρακτήρων."), ("Website", "Ιστότοπος"), - ("About", "Σχετικά"), + ("About", "Πληροφορίες"), ("Slogan_tip", "Φτιαγμένο με πάθος - σε έναν κόσμο που βυθίζεται στο χάος!"), ("Privacy Statement", "Πολιτική απορρήτου"), ("Mute", "Σίγαση"), @@ -53,7 +53,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Audio Input", "Είσοδος ήχου"), ("Enhancements", "Βελτιώσεις"), ("Hardware Codec", "Κωδικοποιητής υλικού"), - ("Adaptive bitrate", "Προσαρμοστικός ρυθμός μετάδοσης bit"), + ("Adaptive bitrate", "Adaptive bitrate"), ("ID Server", "Διακομιστής ID"), ("Relay Server", "Διακομιστής αναμετάδοσης"), ("API Server", "Διακομιστής API"), @@ -67,18 +67,18 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Skip", "Παράλειψη"), ("Close", "Κλείσιμο"), ("Retry", "Δοκίμασε ξανά"), - ("OK", "Εντάξει"), + ("OK", "ΟΚ"), ("Password Required", "Απαιτείται κωδικός πρόσβασης"), ("Please enter your password", "Παρακαλώ εισάγετε τον κωδικό πρόσβασης"), ("Remember password", "Απομνημόνευση κωδικού πρόσβασης"), ("Wrong Password", "Λάθος κωδικός πρόσβασης"), - ("Do you want to enter again?", "Θέλετε να γίνει επανασύνδεση;"), + ("Do you want to enter again?", "Επανασύνδεση;"), ("Connection Error", "Σφάλμα σύνδεσης"), ("Error", "Σφάλμα"), ("Reset by the peer", "Η σύνδεση επαναφέρθηκε από τον απομακρυσμένο σταθμό"), ("Connecting...", "Σύνδεση..."), ("Connection in progress. Please wait.", "Σύνδεση σε εξέλιξη. Παρακαλώ περιμένετε."), - ("Please try 1 minute later", "Παρακαλώ δοκιμάστε ξανά σε 1 λεπτό"), + ("Please try 1 minute later", "Παρακαλώ ξαναδοκιμάστε σε 1 λεπτό"), ("Login Error", "Σφάλμα εισόδου"), ("Successful", "Επιτυχής"), ("Connected, waiting for image...", "Συνδέθηκε, αναμονή για εικόνα..."), @@ -101,10 +101,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Select All", "Επιλογή όλων"), ("Unselect All", "Κατάργηση επιλογής όλων"), ("Empty Directory", "Κενός φάκελος"), - ("Not an empty directory", "Η διαδρομή δεν είναι κενή"), + ("Not an empty directory", "Ο φάκελος δεν είναι κενός"), ("Are you sure you want to delete this file?", "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το αρχείο;"), - ("Are you sure you want to delete this empty directory?", "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την κενή διαδρομή;"), - ("Are you sure you want to delete the file of this directory?", "Είστε βέβαιοι ότι θέλετε να διαγράψετε το αρχείο αυτής της διαδρομής;"), + ("Are you sure you want to delete this empty directory?", "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτόν τον κενό φάκελο;"), + ("Are you sure you want to delete the file of this directory?", "Είστε βέβαιοι ότι θέλετε να διαγράψετε το αρχείο αυτού του φακέλου;"), ("Do this for all conflicts", "Κάνε αυτό για όλες τις διενέξεις"), ("This is irreversible!", "Αυτό είναι μη αναστρέψιμο!"), ("Deleting", "Διαγραφή"), @@ -133,8 +133,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Insert Ctrl + Alt + Del", "Εισαγωγή Ctrl + Alt + Del"), ("Insert Lock", "Κλείδωμα απομακρυσμένου σταθμού"), ("Refresh", "Ανανέωση"), - ("ID does not exist", "Το ID αυτό δεν υπάρχει"), - ("Failed to connect to rendezvous server", "Αποτυχία σύνδεσης με τον διακομιστή"), + ("ID does not exist", "Το αναγνωριστικό ID δεν υπάρχει"), + ("Failed to connect to rendezvous server", "Αποτυχία σύνδεσης με διακομιστή"), ("Please try later", "Παρακαλώ δοκιμάστε αργότερα"), ("Remote desktop is offline", "Ο απομακρυσμένος σταθμός εργασίας είναι εκτός σύνδεσης"), ("Key mismatch", "Μη έγκυρο κλειδί"), @@ -146,17 +146,19 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Set Password", "Ορίστε κωδικό πρόσβασης"), ("OS Password", "Κωδικός πρόσβασης λειτουργικού συστήματος"), ("install_tip", "Λόγω UAC, το RustDesk ενδέχεται να μην λειτουργεί σωστά σε ορισμένες περιπτώσεις. Για να αποφύγετε το UAC, κάντε κλικ στο κουμπί παρακάτω για να εγκαταστήσετε το RustDesk στο σύστημα"), - ("Click to upgrade", "Κάντε κλίκ για αναβάθμιση τώρα"), + ("Click to upgrade", "Αναβάθμιση τώρα"), + ("Click to download", "Λήψη τώρα"), + ("Click to update", "Ενημέρωση τώρα"), ("Configure", "Διαμόρφωση"), - ("config_acc", "Για να ελέγξετε την επιφάνεια εργασίας σας από απόσταση, πρέπει να παραχωρήσετε στο RustDesk το δικαίωμα της \"Προσβασιμότητας\"."), - ("config_screen", "Για να αποκτήσετε απομακρυσμένη πρόσβαση στην επιφάνεια εργασίας σας, πρέπει να παραχωρήσετε στο RustDesk το δικαίωμα της \"Εγγραφή οθόνης\"."), + ("config_acc", "Για τον απομακρυσμένο έλεγχο του υπολογιστή σας, πρέπει να εκχωρήσετε δικαιώματα πρόσβασης στο RustDesk."), + ("config_screen", "Για να αποκτήσετε απομακρυσμένη πρόσβαση στον υπολογιστή σας, πρέπει να εκχωρήσετε το δικαίωμα RustDesk \"Screen Capture\"."), ("Installing ...", "Γίνεται εγκατάσταση ..."), ("Install", "Εγκατάσταση"), ("Installation", "Η εγκατάσταση"), ("Installation Path", "Διαδρομή εγκατάστασης"), ("Create start menu shortcuts", "Δημιουργία συντομεύσεων μενού έναρξης"), ("Create desktop icon", "Δημιουργία εικονιδίου επιφάνειας εργασίας"), - ("agreement_tip", "Με την εγκατάσταση, αποδέχεστε την άδεια χρήσης"), + ("agreement_tip", "Με την εγκατάσταση αποδέχεστε την άδεια χρήσης"), ("Accept and Install", "Αποδοχή και εγκατάσταση"), ("End-user license agreement", "Σύμβαση άδειας χρήσης τελικού χρήστη"), ("Generating ...", "Δημιουργία ..."), @@ -170,8 +172,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Local Port", "Τοπική θύρα"), ("Local Address", "Τοπική διεύθυνση"), ("Change Local Port", "Αλλαγή τοπικής θύρας"), - ("setup_server_tip", "Για πιο γρήγορη σύνδεση, παρακαλούμε να ρυθμίστε τον δικό σας διακομιστή σύνδεσης"), - ("Too short, at least 6 characters.", "Πολύ μικρό, χρειάζεται τουλάχιστον 6 χαρακτήρες."), + ("setup_server_tip", "Για πιο γρήγορη σύνδεση, ρυθμίστε τον δικό σας διακομιστή σύνδεσης"), + ("Too short, at least 6 characters.", "Πολύ μικρό, τουλάχιστον 6 χαρακτήρες."), ("The confirmation is not identical.", "Η επιβεβαίωση δεν είναι πανομοιότυπη."), ("Permissions", "Άδειες"), ("Accept", "Αποδοχή"), @@ -183,7 +185,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Relayed and encrypted connection", "Κρυπτογραφημένη σύνδεση με αναμετάδοση"), ("Direct and unencrypted connection", "Άμεση και μη κρυπτογραφημένη σύνδεση"), ("Relayed and unencrypted connection", "Μη κρυπτογραφημένη σύνδεση με αναμετάδοση"), - ("Enter Remote ID", "Εισαγωγή του απομακρυσμένου ID"), + ("Enter Remote ID", "Εισαγωγή απομακρυσμένου ID"), ("Enter your password", "Εισάγετε τον κωδικό σας"), ("Logging in...", "Γίνεται σύνδεση..."), ("Enable RDP session sharing", "Ενεργοποίηση κοινής χρήσης RDP"), @@ -200,35 +202,35 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Login screen using Wayland is not supported", "Η οθόνη εισόδου με χρήση του Wayland δεν υποστηρίζεται"), ("Reboot required", "Απαιτείται επανεκκίνηση"), ("Unsupported display server", "Μη υποστηριζόμενος διακομιστής εμφάνισης "), - ("x11 expected", "αναμένεται X11"), + ("x11 expected", "απαιτείται X11"), ("Port", "Θύρα"), ("Settings", "Ρυθμίσεις"), ("Username", "Όνομα χρήστη"), ("Invalid port", "Μη έγκυρη θύρα"), - ("Closed manually by the peer", "Τερματίστηκε από τον απομακρυσμένο σταθμό"), - ("Enable remote configuration modification", "Ενεργοποίηση απομακρυσμένης τροποποίησης διαμόρφωσης"), + ("Closed manually by the peer", "Έκλεισε από τον απομακρυσμένο σταθμό"), + ("Enable remote configuration modification", "Ενεργοποίηση απομακρυσμένης τροποποίησης ρυθμίσεων"), ("Run without install", "Εκτέλεση χωρίς εγκατάσταση"), - ("Connect via relay", "Σύνδεση μέσω αναμεταδότη"), - ("Always connect via relay", "Να γίνεται σύνδεση πάντα μέσω αναμεταδότη"), - ("whitelist_tip", "Μόνο οι IP της λίστας επιτρεπόμενων να έχουν πρόσβαση σε εμένα"), + ("Connect via relay", "Πραγματοποίηση σύνδεση μέσω αναμεταδότη"), + ("Always connect via relay", "Σύνδεση πάντα μέσω αναμεταδότη"), + ("whitelist_tip", "Μόνο οι IP της λίστας επιτρεπόμενων έχουν πρόσβαση"), ("Login", "Σύνδεση"), ("Verify", "Επαλήθευση"), ("Remember me", "Να με θυμάσαι"), - ("Trust this device", "Να εμπιστεύομαι αυτή την συσκευή"), + ("Trust this device", "Εμπιστεύομαι αυτή την συσκευή"), ("Verification code", "Κωδικός επαλήθευσης"), - ("verification_tip", "Ένας κωδικός επαλήθευσης έχει σταλεί στην καταχωρημένη διεύθυνση email. Εισαγάγετε τον κωδικό επαλήθευσης για να συνεχίσετε τη σύνδεση."), + ("verification_tip", "Εντοπίστηκε νέα συσκευή και εστάλη ένας κωδικός επαλήθευσης στην καταχωρισμένη διεύθυνση email. Εισαγάγετε τον κωδικό επαλήθευσης για να συνδεθείτε ξανά."), ("Logout", "Αποσύνδεση"), ("Tags", "Ετικέτες"), ("Search ID", "Αναζήτηση ID"), - ("whitelist_sep", "Διαχωρίζονται με κόμμα, ερωτηματικό, κενό ή νέα γραμμή"), - ("Add ID", "Προσθήκη ID"), + ("whitelist_sep", "Διαχωρίζονται με κόμμα, ερωτηματικό, διάστημα ή νέα γραμμή"), + ("Add ID", "Προσθήκη αναγνωριστικού ID"), ("Add Tag", "Προσθήκη ετικέτας"), - ("Unselect all tags", "Αποεπιλογή όλων των ετικετών"), + ("Unselect all tags", "Κατάργηση επιλογής όλων των ετικετών"), ("Network error", "Σφάλμα δικτύου"), ("Username missed", "Δεν συμπληρώσατε το όνομα χρήστη"), ("Password missed", "Δεν συμπληρώσατε τον κωδικό πρόσβασης"), ("Wrong credentials", "Λάθος διαπιστευτήρια"), - ("The verification code is incorrect or has expired", "Ο κωδικός επαλήθευσης είναι λανθασμένος ή έχει λήξει"), + ("The verification code is incorrect or has expired", ""), ("Edit Tag", "Επεξεργασία ετικέτας"), ("Forget Password", "Διαγραφή απομνημονευμένου κωδικού"), ("Favorites", "Αγαπημένα"), @@ -239,7 +241,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Socks5 Proxy", "Διαμεσολαβητής Socks5"), ("Socks5/Http(s) Proxy", "Διαμεσολαβητής Socks5/Http(s)"), ("Discovered", "Ανακαλύφθηκαν"), - ("install_daemon_tip", "Για να ξεκινά με την εκκίνηση του υπολογιστή, πρέπει να εγκαταστήσετε την υπηρεσία συστήματος."), + ("install_daemon_tip", "Για να ξεκινά με την εκκίνηση του υπολογιστή, πρέπει να εγκαταστήσετε την υπηρεσία συστήματος"), ("Remote ID", "Απομακρυσμένο ID"), ("Paste", "Επικόλληση"), ("Paste here?", "Επικόλληση εδώ;"), @@ -262,28 +264,28 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Pinch to Zoom", "Τσίμπημα για ζουμ"), ("Canvas Zoom", "Ζουμ σε καμβά"), ("Reset canvas", "Επαναφορά καμβά"), - ("No permission of file transfer", "Δεν υπάρχει άδεια για την μεταφορά αρχείων"), + ("No permission of file transfer", "Δεν υπάρχει άδεια για μεταφορά αρχείων"), ("Note", "Σημείωση"), ("Connection", "Σύνδεση"), ("Share screen", "Κοινή χρήση οθόνης"), ("Chat", "Κουβέντα"), ("Total", "Σύνολο"), ("items", "στοιχεία"), - ("Selected", "Επιλεγμένα"), - ("Screen Capture", "Καταγραφή οθόνης"), + ("Selected", "Επιλεγμένο"), + ("Screen Capture", "Αποτύπωση οθόνης"), ("Input Control", "Έλεγχος εισόδου"), ("Audio Capture", "Εγγραφή ήχου"), ("Do you accept?", "Δέχεσαι;"), ("Open System Setting", "Άνοιγμα ρυθμίσεων συστήματος"), - ("How to get Android input permission?", "Πώς να αποκτήσω άδεια εισόδου για Android;"), + ("How to get Android input permission?", "Πώς να αποκτήσω άδεια εισαγωγής Android;"), ("android_input_permission_tip1", "Για να μπορεί μία απομακρυσμένη συσκευή να ελέγχει τη συσκευή σας Android, πρέπει να επιτρέψετε στο RustDesk να χρησιμοποιεί την υπηρεσία \"Προσβασιμότητα\"."), - ("android_input_permission_tip2", "Παρακαλούμε να μεταβείτε στην επόμενη σελίδα ρυθμίσεων συστήματος, βρείτε και πληκτρολογήστε [Εγκατεστημένες υπηρεσίες], ενεργοποιήστε την υπηρεσία [Είσοδος RustDesk]."), - ("android_new_connection_tip", "Έχει ληφθεί νέο αίτημα ελέγχου, το οποίο θέλει να ελέγξει την τρέχουσα συσκευή σας."), - ("android_service_will_start_tip", "Η ενεργοποίηση της \"Καταγραφής οθόνης\" θα ξεκινήσει αυτόματα την υπηρεσία, επιτρέποντας σε άλλες συσκευές να ζητήσουν σύνδεση με τη συσκευή σας."), - ("android_stop_service_tip", "Το κλείσιμο της υπηρεσίας αυτής θα κλείσει αυτόματα όλες τις υπάρχουσες συνδέσεις."), - ("android_version_audio_tip", "Η τρέχουσα έκδοση Android δεν υποστηρίζει εγγραφή ήχου, αναβαθμίστε σε Android 10 ή νεότερη έκδοση."), - ("android_start_service_tip", "Πατήστε [Έναρξη υπηρεσίας] ή ενεργοποιήστε την άδεια [Καταγραφή οθόνης] για να ξεκινήσετε την υπηρεσία κοινής χρήσης οθόνης."), - ("android_permission_may_not_change_tip", "Τα δικαιώματα για τις καθιερωμένες συνδέσεις δεν μπορούν να αλλάξουν άμεσα μέχρι να επανασυνδεθούν."), + ("android_input_permission_tip2", "Παρακαλώ μεταβείτε στην επόμενη σελίδα ρυθμίσεων συστήματος, βρείτε και πληκτρολογήστε [Εγκατεστημένες υπηρεσίες], ενεργοποιήστε την υπηρεσία [Είσοδος RustDesk]."), + ("android_new_connection_tip", "θέλω να ελέγξω τη συσκευή σου."), + ("android_service_will_start_tip", "Η ενεργοποίηση της κοινής χρήσης οθόνης θα ξεκινήσει αυτόματα την υπηρεσία, ώστε άλλες συσκευές να μπορούν να ελέγχουν αυτήν τη συσκευή Android."), + ("android_stop_service_tip", "Η απενεργοποίηση της υπηρεσίας θα αποσυνδέσει αυτόματα όλες τις εγκατεστημένες συνδέσεις."), + ("android_version_audio_tip", "Η έκδοση Android που διαθέτετε δεν υποστηρίζει εγγραφή ήχου, ενημερώστε το σε Android 10 ή νεότερη έκδοση, εάν είναι δυνατόν."), + ("android_start_service_tip", ""), + ("android_permission_may_not_change_tip", ""), ("Account", "Λογαριασμός"), ("Overwrite", "Αντικατάσταση"), ("This file exists, skip or overwrite this file?", "Αυτό το αρχείο υπάρχει, παράβλεψη ή αντικατάσταση αυτού του αρχείου;"), @@ -293,14 +295,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Επιτυχής"), ("Someone turns on privacy mode, exit", "Κάποιος ενεργοποιεί τη λειτουργία απορρήτου, έξοδος"), ("Unsupported", "Δεν υποστηρίζεται"), - ("Peer denied", "Ο απομακρυσμένος σταθμός έχει απορριφθεί"), + ("Peer denied", "Ο απομακρυσμένος σταθμός απέρριψε τη σύνδεση"), ("Please install plugins", "Παρακαλώ εγκαταστήστε τα πρόσθετα"), ("Peer exit", "Ο απομακρυσμένος σταθμός έχει αποσυνδεθεί"), ("Failed to turn off", "Αποτυχία απενεργοποίησης"), ("Turned off", "Απενεργοποιημένο"), ("Language", "Γλώσσα"), - ("Keep RustDesk background service", "Διατήρηση της υπηρεσίας παρασκηνίου του RustDesk"), - ("Ignore Battery Optimizations", "Αγνόηση βελτιστοποιήσεων μπαταρίας"), + ("Keep RustDesk background service", "Εκτέλεση του RustDesk στο παρασκήνιο"), + ("Ignore Battery Optimizations", "Παράβλεψη βελτιστοποιήσεων μπαταρίας"), ("android_open_battery_optimizations_tip", "Θέλετε να ανοίξετε τις ρυθμίσεις βελτιστοποίησης μπαταρίας;"), ("Start on boot", "Έναρξη κατά την εκκίνηση"), ("Start the screen sharing service on boot, requires special permissions", "Η έναρξη της υπηρεσίας κοινής χρήσης οθόνης κατά την εκκίνηση, απαιτεί ειδικά δικαιώματα"), @@ -315,11 +317,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Restart remote device", "Επανεκκίνηση απομακρυσμένης συσκευής"), ("Are you sure you want to restart", "Είστε βέβαιοι ότι θέλετε να κάνετε επανεκκίνηση"), ("Restarting remote device", "Γίνεται επανεκκίνηση της απομακρυσμένης συσκευής"), - ("remote_restarting_tip", "Γίνεται επανεκκίνηση της απομακρυσμένης συσκευής. Κλείστε αυτό το πλαίσιο μηνύματος και επανασυνδεθείτε με τον μόνιμο κωδικό πρόσβασης μετά από λίγο."), + ("remote_restarting_tip", "Η απομακρυσμένη συσκευή επανεκκινείται, κλείστε αυτό το μήνυμα και επανασυνδεθείτε χρησιμοποιώντας τον μόνιμο κωδικό πρόσβασης."), ("Copied", "Αντιγράφηκε"), ("Exit Fullscreen", "Έξοδος από πλήρη οθόνη"), ("Fullscreen", "Πλήρης οθόνη"), - ("Mobile Actions", "Ενέργειες για κινητά"), + ("Mobile Actions", "Mobile Actions"), ("Select Monitor", "Επιλογή οθόνης"), ("Control Actions", "Ενέργειες ελέγχου"), ("Display Settings", "Ρυθμίσεις οθόνης"), @@ -347,7 +349,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable audio", "Ενεργοποίηση ήχου"), ("Unlock Network Settings", "Ξεκλείδωμα ρυθμίσεων δικτύου"), ("Server", "Διακομιστής"), - ("Direct IP Access", "Άμεση πρόσβαση IP"), + ("Direct IP Access", "Πρόσβαση με χρήση IP"), ("Proxy", "Διαμεσολαβητής"), ("Apply", "Εφαρμογή"), ("Disconnect all devices?", "Αποσύνδεση όλων των συσκευών;"), @@ -358,7 +360,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Pin Toolbar", "Καρφίτσωμα γραμμής εργαλείων"), ("Unpin Toolbar", "Ξεκαρφίτσωμα γραμμής εργαλείων"), ("Recording", "Εγγραφή"), - ("Directory", "Διαδρομή"), + ("Directory", "Φάκελος εγγραφών"), ("Automatically record incoming sessions", "Αυτόματη εγγραφή εισερχόμενων συνεδριών"), ("Automatically record outgoing sessions", "Αυτόματη εγγραφή εξερχόμενων συνεδριών"), ("Change", "Αλλαγή"), @@ -373,24 +375,24 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("elevated_foreground_window_tip", "Το τρέχον παράθυρο της απομακρυσμένης επιφάνειας εργασίας απαιτεί υψηλότερα δικαιώματα για να λειτουργήσει, επομένως δεν μπορεί να χρησιμοποιήσει προσωρινά το ποντίκι και το πληκτρολόγιο. Μπορείτε να ζητήσετε από τον απομακρυσμένο χρήστη να ελαχιστοποιήσει το τρέχον παράθυρο ή να κάνετε κλικ στο κουμπί ανύψωσης στο παράθυρο διαχείρισης σύνδεσης. Για να αποφύγετε αυτό το πρόβλημα, συνιστάται η εγκατάσταση του λογισμικού στην απομακρυσμένη συσκευή."), ("Disconnected", "Αποσυνδέθηκε"), ("Other", "Άλλα"), - ("Confirm before closing multiple tabs", "Επιβεβαίωση πριν κλείσουν πολλαπλές καρτέλες"), + ("Confirm before closing multiple tabs", "Επιβεβαίωση πριν κλείσετε πολλές καρτέλες"), ("Keyboard Settings", "Ρυθμίσεις πληκτρολογίου"), ("Full Access", "Πλήρης πρόσβαση"), ("Screen Share", "Κοινή χρήση οθόνης"), - ("ubuntu-21-04-required", "Το Wayland απαιτεί Ubuntu 21.04 ή νεότερη έκδοση."), - ("wayland-requires-higher-linux-version", "Το Wayland απαιτεί υψηλότερη έκδοση διανομής του linux. Δοκιμάστε την επιφάνεια εργασίας X11 ή αλλάξτε το λειτουργικό σας σύστημα."), - ("xdp-portal-unavailable", ""), - ("JumpLink", "Σύνδεσμος μετάβασης"), + ("Wayland requires Ubuntu 21.04 or higher version.", "Το Wayland απαιτεί Ubuntu 21.04 ή νεότερη έκδοση."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Το Wayland απαιτεί υψηλότερη έκδοση του linux distro. Δοκιμάστε την επιφάνεια εργασίας X11 ή αλλάξτε το λειτουργικό σας σύστημα."), + ("JumpLink", "Προβολή"), ("Please Select the screen to be shared(Operate on the peer side).", "Επιλέξτε την οθόνη που θέλετε να μοιραστείτε (Λειτουργία στην πλευρά του απομακρυσμένου σταθμού)."), - ("Show RustDesk", "Εμφάνιση του RustDesk"), + ("Show RustDesk", "Εμφάνιση RustDesk"), ("This PC", "Αυτός ο υπολογιστής"), ("or", "ή"), + ("Continue with", "Συνέχεια με"), ("Elevate", "Ανύψωση"), - ("Zoom cursor", "Δρομέας ζουμ"), + ("Zoom cursor", "Kέρσορας μεγέθυνσης"), ("Accept sessions via password", "Αποδοχή συνεδριών με κωδικό πρόσβασης"), ("Accept sessions via click", "Αποδοχή συνεδριών με κλικ"), ("Accept sessions via both", "Αποδοχή συνεδριών και με τα δύο"), - ("Please wait for the remote side to accept your session request...", "Παρακαλώ περιμένετε μέχρι η απομακρυσμένη πλευρά να αποδεχτεί το αίτημα της συνεδρίας σας..."), + ("Please wait for the remote side to accept your session request...", "Παρακαλώ περιμένετε μέχρι η απομακρυσμένη πλευρά να αποδεχτεί το αίτημα συνεδρίας σας..."), ("One-time Password", "Κωδικός μίας χρήσης"), ("Use one-time password", "Χρήση κωδικού πρόσβασης μίας χρήσης"), ("One-time password length", "Μήκος κωδικού πρόσβασης μίας χρήσης"), @@ -399,27 +401,27 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("hide_cm_tip", "Να επιτρέπεται η απόκρυψη, μόνο εάν αποδέχεστε συνδέσεις μέσω κωδικού πρόσβασης και χρησιμοποιείτε μόνιμο κωδικό πρόσβασης"), ("wayland_experiment_tip", "Η υποστήριξη Wayland βρίσκεται σε πειραματικό στάδιο, χρησιμοποιήστε το X11 εάν χρειάζεστε πρόσβαση χωρίς επίβλεψη."), ("Right click to select tabs", "Κάντε δεξί κλικ για να επιλέξετε καρτέλες"), - ("Skipped", "Παραλήφθηκε"), - ("Add to address book", "Προσθήκη στο βιβλίο διευθύνσεων"), + ("Skipped", "Παράλειψη"), + ("Add to address book", "Προσθήκη στο Βιβλίο Διευθύνσεων"), ("Group", "Ομάδα"), ("Search", "Αναζήτηση"), - ("Closed manually by web console", "Κλείσιμο χειροκίνητα από την κονσόλα ιστού"), + ("Closed manually by web console", "Κλειστό χειροκίνητα από την κονσόλα web"), ("Local keyboard type", "Τύπος τοπικού πληκτρολογίου"), ("Select local keyboard type", "Επιλογή τύπου τοπικού πληκτρολογίου"), - ("software_render_tip", "Εάν χρησιμοποιείτε κάρτα γραφικών της Nvidia σε Linux και το παράθυρο απομακρυσμένης πρόσβασης κλείνει αμέσως μετά τη σύνδεση, η μετάβαση στο πρόγραμμα οδήγησης της Nouveau ανοιχτού κώδικα και η επιλογή χρήσης απόδοσης λογισμικού μπορεί να βοηθήσει. Απαιτείται επανεκκίνηση του λογισμικού."), - ("Always use software rendering", "Να χρησιμοποιείτε πάντα η απόδοση λογισμικού"), - ("config_input", "Για να ελέγξετε την απομακρυσμένη επιφάνεια εργασίας με το πληκτρολόγιο, πρέπει να παραχωρήσετε στο RustDesk το δικαίωμα της \"Παρακολούθηση εισόδου\"."), - ("config_microphone", "Για να μιλήσετε εξ αποστάσεως, πρέπει να παραχωρήσετε στο RustDesk το δικαίωμα της \"Εγγραφή ήχου\"."), - ("request_elevation_tip", "Μπορείτε επίσης να ζητήσετε ανύψωση εάν υπάρχει κάποιος στην απομακρυσμένη πλευρά."), + ("software_render_tip", "Εάν έχετε κάρτα γραφικών Nvidia και το παράθυρο σύνδεσης κλείνει αμέσως μετά τη σύνδεση, η εγκατάσταση του προγράμματος οδήγησης nouveau και η επιλογή χρήσης της επιτάχυνσης γραφικών μέσω λογισμικού μπορεί να βοηθήσει. Απαιτείται επανεκκίνηση."), + ("Always use software rendering", "Επιτάχυνση γραφικών μέσω λογισμικού"), + ("config_input", "Για να ελέγξετε την απομακρυσμένη επιφάνεια εργασίας με πληκτρολόγιο, πρέπει να εκχωρήσετε δικαιώματα στο RustDesk"), + ("config_microphone", "Ρύθμιση μικροφώνου"), + ("request_elevation_tip", "αίτημα ανύψωσης δικαιωμάτων χρήστη"), ("Wait", "Περιμένετε"), - ("Elevation Error", "Σφάλμα ανύψωσης"), + ("Elevation Error", "Σφάλμα ανύψωσης δικαιωμάτων χρήστη"), ("Ask the remote user for authentication", "Ζητήστε από τον απομακρυσμένο χρήστη έλεγχο ταυτότητας"), ("Choose this if the remote account is administrator", "Επιλέξτε αυτό εάν ο απομακρυσμένος λογαριασμός είναι διαχειριστής"), - ("Transmit the username and password of administrator", "Μεταδώστε το όνομα χρήστη και τον κωδικό πρόσβασης του διαχειριστή"), - ("still_click_uac_tip", "Εξακολουθεί να απαιτεί από τον απομακρυσμένο χρήστη να κάνει κλικ στο πλήκτρο Εντάξει στο παράθυρο UAC όπου εκτελείται το RustDesk."), - ("Request Elevation", "Αίτημα ανύψωσης"), - ("wait_accept_uac_tip", "Περιμένετε μέχρι ο απομακρυσμένος χρήστης να αποδεχτεί το παράθυρο διαλόγου UAC."), - ("Elevate successfully", "Επιτυχής ανύψωση"), + ("Transmit the username and password of administrator", "Αποστολή του ονόματος χρήστη και του κωδικού πρόσβασης του διαχειριστή"), + ("still_click_uac_tip", "Εξακολουθεί να απαιτεί από τον απομακρυσμένο χρήστη να κάνει κλικ στο OK στο παράθυρο UAC όπου εκτελείται το RustDesk."), + ("Request Elevation", "Αίτημα ανύψωσης δικαιωμάτων χρήστη"), + ("wait_accept_uac_tip", "Περιμένετε να αποδεχτεί ο απομακρυσμένος χρήστης το παράθυρο διαλόγου UAC."), + ("Elevate successfully", "Επιτυχής ανύψωση δικαιωμάτων χρήστη"), ("uppercase", "κεφαλαία γράμματα"), ("lowercase", "πεζά γράμματα"), ("digit", "αριθμός"), @@ -428,7 +430,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Weak", "Αδύναμο"), ("Medium", "Μέτριο"), ("Strong", "Δυνατό"), - ("Switch Sides", "Αλλαγή πλευρών"), + ("Switch Sides", "Εναλλαγή πλευράς"), ("Please confirm if you want to share your desktop?", "Παρακαλώ επιβεβαιώστε αν επιθυμείτε την κοινή χρήση της επιφάνειας εργασίας;"), ("Display", "Εμφάνιση"), ("Default View Style", "Προκαθορισμένος τρόπος εμφάνισης"), @@ -442,11 +444,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Voice call", "Φωνητική κλήση"), ("Text chat", "Συνομιλία κειμένου"), ("Stop voice call", "Διακοπή φωνητικής κλήσης"), - ("relay_hint_tip", "Ενδέχεται να μην είναι δυνατή η απευθείας σύνδεση: μπορείτε να δοκιμάσετε να συνδεθείτε μέσω αναμετάδοσης. Επιπλέον, εάν θέλετε να χρησιμοποιήσετε την αναμετάδοση στην πρώτη σας προσπάθεια, μπορείτε να προσθέσετε την \"/r\" κατάληξη στο ID ή να επιλέξετε την επιλογή \"Πάντα σύνδεση μέσω αναμετάδοσης\" στην κάρτα πρόσφατων συνεδριών, εάν υπάρχει."), + ("relay_hint_tip", "Εάν δεν είναι δυνατή η απευθείας σύνδεση, μπορείτε να δοκιμάσετε να συνδεθείτε μέσω διακομιστή αναμετάδοσης"), ("Reconnect", "Επανασύνδεση"), ("Codec", "Κωδικοποίηση"), ("Resolution", "Ανάλυση"), - ("No transfers in progress", "Δεν υπάρχουν μεταφορές σε εξέλιξη"), + ("No transfers in progress", "Δεν υπάρχει μεταφορά σε εξέλιξη"), ("Set one-time password length", "Μέγεθος κωδικού μιας χρήσης"), ("RDP Settings", "Ρυθμίσεις RDP"), ("Sort by", "Ταξινόμηση κατά"), @@ -455,35 +457,36 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Minimize", "Ελαχιστοποίηση"), ("Maximize", "Μεγιστοποίηση"), ("Your Device", "Η συσκευή σας"), - ("empty_recent_tip", "Ωχ, δεν υπάρχουν πρόσφατες συνεδρίες!\nΏρα να προγραμματίσετε μια νέα."), - ("empty_favorite_tip", "Δεν έχετε ακόμα αγαπημένους απομακρυσμένους σταθμούς;\nΑς βρούμε κάποιον για να συνδεθούμε και ας τον προσθέσουμε στα αγαπημένα σας!"), - ("empty_lan_tip", "Ωχ όχι, φαίνεται ότι δεν έχουμε ανακαλύψει ακόμη κανέναν απομακρυσμένο σταθμό."), - ("empty_address_book_tip", "Ω, Αγαπητέ/ή μου, φαίνεται ότι αυτήν τη στιγμή δεν υπάρχουν απομακρυσμένοι σταθμοί στο βιβλίο διευθύνσεών σας."), + ("empty_recent_tip", "Δεν υπάρχουν πρόσφατες συνεδρίες!\nΔοκιμάστε να ξεκινήσετε μια νέα."), + ("empty_favorite_tip", "Δεν υπάρχουν ακόμη αγαπημένες συνδέσεις;\nΑφού πραγματοποιήσετε σύνδεση με κάποιο απομακρυσμένο σταθμό, μπορείτε να τον προσθέσετε στα αγαπημένα σας!"), + ("empty_lan_tip", "Δεν έχουμε ανακαλυφθεί ακόμη απομακρυσμένοι σταθμοί."), + ("empty_address_book_tip", "Φαίνεται ότι αυτή τη στιγμή δεν υπάρχουν αγαπημένες συνδέσεις στο βιβλίο διευθύνσεών σας."), + ("eg: admin", "π.χ. admin"), ("Empty Username", "Κενό όνομα χρήστη"), ("Empty Password", "Κενός κωδικός πρόσβασης"), ("Me", "Εγώ"), - ("identical_file_tip", "Αυτό το αρχείο είναι πανομοιότυπο με αυτό του απομακρυσμένου σταθμού."), + ("identical_file_tip", "Το αρχείο είναι πανομοιότυπο με αυτό του άλλου υπολογιστή."), ("show_monitors_tip", "Εμφάνιση οθονών στη γραμμή εργαλείων"), ("View Mode", "Λειτουργία προβολής"), - ("login_linux_tip", "Πρέπει να συνδεθείτε σε έναν απομακρυσμένο λογαριασμό Linux για να ενεργοποιήσετε μια συνεδρία επιφάνειας εργασίας X"), + ("login_linux_tip", "Απαιτείται είσοδος σε απομακρυσμένο λογαριασμό Linux για την ενεργοποίηση του περιβάλλον εργασίας Χ."), ("verify_rustdesk_password_tip", "Επιβεβαιώστε τον κωδικό του RustDesk"), ("remember_account_tip", "Απομνημόνευση αυτού του λογαριασμού"), - ("os_account_desk_tip", "Αυτός ο λογαριασμός χρησιμοποιείται για σύνδεση στο απομακρυσμένο λειτουργικό σύστημα και ενεργοποίηση της συνεδρίας επιφάνειας εργασίας σε headless"), + ("os_account_desk_tip", "Αυτός ο λογαριασμός θα χρησιμοποιηθεί για την είσοδο και διαχείριση του απομακρυσμένου λειτουργικού συστήματος"), ("OS Account", "Λογαριασμός λειτουργικού συστήματος"), ("another_user_login_title_tip", "Υπάρχει ήδη άλλος συνδεδεμένος χρήστης"), ("another_user_login_text_tip", "Αποσύνδεση"), ("xorg_not_found_title_tip", "Δεν βρέθηκε το Xorg"), ("xorg_not_found_text_tip", "Παρακαλώ εγκαταστήστε το Xorg"), - ("no_desktop_title_tip", "Δεν υπάρχει διαθέσιμο περιβάλλον επιφάνειας εργασίας"), + ("no_desktop_title_tip", "Δεν υπάρχει διαθέσιμη επιφάνεια εργασίας"), ("no_desktop_text_tip", "Παρακαλώ εγκαταστήστε το περιβάλλον GNOME"), - ("No need to elevate", "Δεν χρειάζεται ανύψωση"), + ("No need to elevate", "Δεν χρειάζονται αυξημένα δικαιώματα"), ("System Sound", "Ήχος συστήματος"), ("Default", "Προκαθορισμένο"), - ("New RDP", "Νέα RDP"), - ("Fingerprint", "Δακτυλικό αποτύπωμα"), - ("Copy Fingerprint", "Αντιγραφή δακτυλικού αποτυπώματος"), - ("no fingerprints", "χωρίς δακτυλικά αποτυπώματα"), - ("Select a peer", "Επιλέξτε έναν σταθμό"), + ("New RDP", "Νέα απομακρυσμένη σύνδεση"), + ("Fingerprint", ""), + ("Copy Fingerprint", ""), + ("no fingerprints", ""), + ("Select a peer", "Επιλέξτε σταθμό"), ("Select peers", "Επιλέξτε σταθμούς"), ("Plugins", "Επεκτάσεις"), ("Uninstall", "Κατάργηση εγκατάστασης"), @@ -494,10 +497,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("resolution_original_tip", "Αρχική ανάλυση"), ("resolution_fit_local_tip", "Προσαρμογή στην τοπική ανάλυση"), ("resolution_custom_tip", "Προσαρμοσμένη ανάλυση"), - ("Collapse toolbar", "Σύμπτυξη γραμμής εργαλείων"), - ("Accept and Elevate", "Αποδοχή και ανύψωση"), - ("accept_and_elevate_btn_tooltip", "Αποδεχτείτε τη σύνδεση και ανυψώστε τα δικαιώματα UAC."), - ("clipboard_wait_response_timeout_tip", "Λήξη χρονικού ορίου αναμονής για απάντηση αντιγραφής."), + ("Collapse toolbar", "Εμφάνιση γραμμής εργαλείων"), + ("Accept and Elevate", "Αποδοχή με αυξημένα δικαιώματα"), + ("accept_and_elevate_btn_tooltip", "Αποδοχή της σύνδεσης με αυξημένα δικαιώματα χρήστη"), + ("clipboard_wait_response_timeout_tip", "Έληξε ο χρόνος αναμονής για την ανταπόκριση της αντιγραφής"), ("Incoming connection", "Εισερχόμενη σύνδεση"), ("Outgoing connection", "Εξερχόμενη σύνδεση"), ("Exit", "Έξοδος"), @@ -506,7 +509,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Service", "Υπηρεσία"), ("Start", "Έναρξη"), ("Stop", "Διακοπή"), - ("exceed_max_devices", "Έχετε φτάσει τον μέγιστο αριθμό διαχειριζόμενων συσκευών."), + ("exceed_max_devices", "Υπέρβαση μέγιστου ορίου αποθηκευμένων συνδέσεων"), ("Sync with recent sessions", "Συγχρονισμός των πρόσφατων συνεδριών"), ("Sort tags", "Ταξινόμηση ετικετών"), ("Open connection in new tab", "Άνοιγμα σύνδεσης σε νέα καρτέλα"), @@ -515,14 +518,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Already exists", "Υπάρχει ήδη"), ("Change Password", "Αλλαγή κωδικού"), ("Refresh Password", "Ανανέωση κωδικού"), - ("ID", "ID"), + ("ID", ""), ("Grid View", "Προβολή σε πλακίδια"), ("List View", "Προβολή σε λίστα"), ("Select", "Επιλογή"), ("Toggle Tags", "Εναλλαγή ετικετών"), - ("pull_ab_failed_tip", "Η ανανέωση του βιβλίου διευθύνσεων απέτυχε"), - ("push_ab_failed_tip", "Αποτυχία συγχρονισμού του βιβλίου διευθύνσεων με τον διακομιστή"), - ("synced_peer_readded_tip", "Οι συσκευές που υπήρχαν στις πρόσφατες συνεδρίες θα συγχρονιστούν ξανά με το βιβλίο διευθύνσεων."), + ("pull_ab_failed_tip", "Αποτυχία ανανέωσης βιβλίου διευθύνσεων"), + ("push_ab_failed_tip", "Αποτυχία συγχρονισμού βιβλίου διευθύνσεων"), + ("synced_peer_readded_tip", "Οι συσκευές των τρεχουσών συνεδριών θα συγχρονιστούν με το βιβλίο διευθύνσεων"), ("Change Color", "Αλλαγή χρώματος"), ("Primary Color", "Κυρίως χρώμα"), ("HSV Color", "Χρώμα HSV"), @@ -537,31 +540,31 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("I Agree", "Συμφωνώ"), ("Decline", "Διαφωνώ"), ("Timeout in minutes", "Τέλος χρόνου σε λεπτά"), - ("auto_disconnect_option_tip", "Αυτόματο κλείσιμο εισερχόμενων συνεδριών σε περίπτωση αδράνειας χρήστη"), + ("auto_disconnect_option_tip", "Αυτόματη αποσύνδεση απομακρυσμένης συνεδρίας έπειτα από την πάροδο του χρονικού ορίου αδράνειας "), ("Connection failed due to inactivity", "Η σύνδεση τερματίστηκε έπειτα από την πάροδο του χρόνου αδράνειας"), - ("Check for software update on startup", "Έλεγχος για ενημερώσεις κατά την εκκίνηση"), - ("upgrade_rustdesk_server_pro_to_{}_tip", "Παρακαλώ ενημερώστε το RustDesk Server Pro στην έκδοση {} ή νεότερη!"), + ("Check for software update on startup", "Έλεγχος για ενημερώσεις κατα την εκκίνηση"), + ("upgrade_rustdesk_server_pro_to_{}_tip", "Παρακαλώ ενημερώστε τον RustDesk Server Pro στην έκδοση {} ή νεότερη!"), ("pull_group_failed_tip", "Αποτυχία ανανέωσης της ομάδας"), - ("Filter by intersection", "Φιλτράρισμα κατά διασταύρωση"), + ("Filter by intersection", ""), ("Remove wallpaper during incoming sessions", "Αφαίρεση εικόνας φόντου στις εισερχόμενες συνδέσεις"), ("Test", "Δοκιμή"), - ("display_is_plugged_out_msg", "Η οθόνη είναι αποσυνδεδεμένη από την πρίζα, μεταβείτε στην πρώτη οθόνη."), + ("display_is_plugged_out_msg", "Η οθόνη έχει αποσυνδεθεί, επιστρέψτε στην κύρια οθόνη προβολής"), ("No displays", "Δεν υπάρχουν οθόνες"), ("Open in new window", "Άνοιγμα σε νέο παράθυρο"), ("Show displays as individual windows", "Εμφάνιση οθονών σε ξεχωριστά παράθυρα"), ("Use all my displays for the remote session", "Χρήση όλων των οθονών της απομακρυσμένης σύνδεσης"), - ("selinux_tip", "Το SELinux είναι ενεργοποιημένο στη συσκευή σας, κάτι που ενδέχεται να εμποδίσει την σωστή λειτουργία του RustDesk ως ελεγχόμενης πλευράς."), + ("selinux_tip", "Έχετε ενεργοποιημένο το SELinux, το οποίο πιθανόν εμποδίζει την ορθή λειτουργία του RustDesk."), ("Change view", "Αλλαγή απεικόνισης"), ("Big tiles", "Μεγάλα εικονίδια"), ("Small tiles", "Μικρά εικονίδια"), ("List", "Λίστα"), ("Virtual display", "Εινονική οθόνη"), ("Plug out all", "Αποσύνδεση όλων"), - ("True color (4:4:4)", "Αληθινό χρώμα (4:4:4)"), + ("True color (4:4:4)", ""), ("Enable blocking user input", "Ενεργοποίηση αποκλεισμού χειρισμού από τον χρήστη"), - ("id_input_tip", "Μπορείτε να εισάγετε ένα ID, μια διεύθυνση IP, ή ένα όνομα τομέα με την αντίστοιχη πόρτα (:).\nΑν θέλετε να συνδεθείτε σε μια συσκευή σε άλλο διακομιστή, παρακαλώ να προσθέσετε και την διεύθυνση του διακομιστή (@?key=), για παράδειγμα,\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nΑν θέλετε να συνδεθείτε σε κάποιο δημόσιο διακομιστή, προσθέστε το όνομά του \"@public\", η παράμετρος key δεν απαιτείται για τους δημόσιους διακομιστές."), - ("privacy_mode_impl_mag_tip", "Λειτουργία 1"), - ("privacy_mode_impl_virtual_display_tip", "Λειτουργία 2"), + ("id_input_tip", "Μπορείτε να εισάγετε ενα ID, μια διεύθυνση IP, ή ένα όνομα τομέα με την αντίστοιχη πόρτα (:).\nΑν θέλετε να συνδεθείτε σε μια συσκευή σε άλλο διακομιστή, παρακαλώ να προσθέσετε και την διεύθυνση του διακομιστή (@?key=), για παράδειγμα,\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nΑν θέλετε να συνδεθείτε σε κάποιο δημόσιο διακομιστή, προσθέστε το όνομά του \"@public\", η παράμετρος key δεν απαιτείται για τους δημόσιους διακομιστές."), + ("privacy_mode_impl_mag_tip", "Προφύλαξη Οθόνης"), + ("privacy_mode_impl_virtual_display_tip", "Εικονική Οθόνη"), ("Enter privacy mode", "Ενεργοποίηση λειτουργίας απορρήτου"), ("Exit privacy mode", "Διακοπή λειτουργίας απορρήτου"), ("idd_not_support_under_win10_2004_tip", "Το πρόγραμμα οδήγησης έμμεσης οθόνης δεν υποστηρίζεται. Απαιτείτε λειτουργικό σύστημα Windows 10 έκδοση 2004 ή νεότερο."), @@ -571,26 +574,26 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("swap-left-right-mouse", "Εναλλαγή αριστερό-δεξί κουμπί του ποντικιού"), ("2FA code", "κωδικός 2FA"), ("More", "Περισσότερα"), - ("enable-2fa-title", "Ενεργοποίηση πιστοποίησης δύο παραγόντων"), - ("enable-2fa-desc", "Παρακαλούμε να ρυθμίστε τώρα τον έλεγχο ταυτότητας. Μπορείτε να χρησιμοποιήσετε μια εφαρμογή ελέγχου ταυτότητας όπως το Authy, το Microsoft ή το Google Authenticator στο τηλέφωνο ή τον υπολογιστή σας.\n\nΣαρώστε τον κωδικό QR με την εφαρμογή σας και εισαγάγετε τον κωδικό που εμφανίζει η εφαρμογή σας για να ενεργοποιήσετε τον έλεγχο ταυτότητας δύο παραγόντων."), - ("wrong-2fa-code", "Δεν είναι δυνατή η επαλήθευση του κωδικού. Ελέγξτε ότι οι ρυθμίσεις κωδικού και τοπικής ώρας είναι σωστές."), + ("enable-2fa-title", "Ενεργοποίηση Πιστοποίησης Δύο Παραγόντων"), + ("enable-2fa-desc", "Ρυθμίστε τον έλεγχο ταυτότητας τώρα. Μπορείτε να χρησιμοποιήσετε μια εφαρμογή ελέγχου ταυτότητας όπως Authy, Microsoft ή Google Authenticator στο τηλέφωνο ή στην επιφάνεια εργασίας σας.Σαρώστε τον κωδικό QR με την εφαρμογή σας και εισαγάγετε τον κωδικό που εμφανίζει η εφαρμογή σας για να ενεργοποιήσετε τον έλεγχο ταυτότητας δύο παραγόντων."), + ("wrong-2fa-code", "Δεν είναι δυνατή η επαλήθευση του κωδικού. Ελέγξτε ότι ο κωδικός και οι ρυθμίσεις τοπικής ώρας είναι σωστές"), ("enter-2fa-title", "Έλεγχος ταυτότητας δύο παραγόντων"), - ("Email verification code must be 6 characters.", "Ο κωδικός επαλήθευσης email πρέπει να είναι έως 6 χαρακτήρες"), + ("Email verification code must be 6 characters.", "Ο κωδικός επαλήθευσης email πρέπει να είναι εως 6 χαρακτήρες"), ("2FA code must be 6 digits.", "Ο κωδικός 2FA πρέπει να είναι 6ψήφιος."), - ("Multiple Windows sessions found", "Βρέθηκαν πολλές συνεδρίες των Windows"), + ("Multiple Windows sessions found", ""), ("Please select the session you want to connect to", "Επιλέξτε τη συνεδρία στην οποία θέλετε να συνδεθείτε"), - ("powered_by_me", "Με την υποστήριξη του RustDesk"), - ("outgoing_only_desk_tip", "Αυτή είναι μια προσαρμοσμένη έκδοση.\nΜπορείτε να συνδεθείτε με άλλες συσκευές, αλλά άλλες συσκευές δεν μπορούν να συνδεθούν με τη δική σας συσκευή."), - ("preset_password_warning", "Αυτή η προσαρμοσμένη έκδοση συνοδεύεται από έναν προκαθορισμένο κωδικό πρόσβασης. Όποιος γνωρίζει αυτόν τον κωδικό πρόσβασης θα μπορούσε να αποκτήσει τον πλήρη έλεγχο της συσκευής σας. Εάν δεν το περιμένατε αυτό, απεγκαταστήστε αμέσως το λογισμικό."), + ("powered_by_me", "Με την υποστήριξη της RustDesk"), + ("outgoing_only_desk_tip", ""), + ("preset_password_warning", "προειδοποίηση προκαθορισμένου κωδικού πρόσβασης"), ("Security Alert", "Ειδοποίηση ασφαλείας"), ("My address book", "Το βιβλίο διευθύνσεών μου"), ("Personal", "Προσωπικό"), ("Owner", "Ιδιοκτήτης"), - ("Set shared password", "Ορίστε έναν κοινόχρηστο κωδικό πρόσβασης"), + ("Set shared password", "Ορίστε κοινόχρηστο κωδικό πρόσβασης"), ("Exist in", "Υπάρχει στο"), ("Read-only", "Μόνο για ανάγνωση"), ("Read/Write", "Ανάγνωση/Εγγραφή"), - ("Full Control", "Πλήρης έλεγχος"), + ("Full Control", "Πλήρης Έλεγχος"), ("share_warning_tip", "Τα παραπάνω πεδία είναι κοινόχρηστα και ορατά σε άλλους."), ("Everyone", "Όλοι"), ("ab_web_console_tip", "Περισσότερα στην κονσόλα web"), @@ -598,18 +601,18 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("no_need_privacy_mode_no_physical_displays_tip", "Δεν υπάρχουν φυσικές οθόνες, δεν χρειάζεται να χρησιμοποιήσετε τη λειτουργία απορρήτου."), ("Follow remote cursor", "Παρακολούθηση απομακρυσμένου κέρσορα"), ("Follow remote window focus", "Παρακολούθηση απομακρυσμένου ενεργού παραθύρου"), - ("default_proxy_tip", "Το προεπιλεγμένο πρωτόκολλο και η θύρα είναι Socks5 και 1080"), + ("default_proxy_tip", "Προκαθορισμένο πρωτόκολλο Socks5 στην πόρτα 1080"), ("no_audio_input_device_tip", "Δεν βρέθηκε συσκευή εισόδου ήχου."), ("Incoming", "Εισερχόμενη"), ("Outgoing", "Εξερχόμενη"), - ("Clear Wayland screen selection", "Εκκαθάριση επιλογής οθόνης Wayland"), - ("clear_Wayland_screen_selection_tip", "Αφού διαγράψετε την επιλογή οθόνης, μπορείτε να επιλέξετε ξανά την οθόνη για κοινή χρήση."), - ("confirm_clear_Wayland_screen_selection_tip", "Είστε βέβαιοι ότι θέλετε να διαγράψετε την επιλογή οθόνης Wayland;"), - ("android_new_voice_call_tip", "Ελήφθη ένα νέο αίτημα φωνητικής κλήσης. Εάν το αποδεχτείτε, ο ήχος θα μεταβεί σε φωνητική επικοινωνία."), - ("texture_render_tip", "Χρησιμοποιήστε την απόδοση υφής για να κάνετε τις εικόνες πιο ομαλές. Μπορείτε να δοκιμάσετε να απενεργοποιήσετε αυτήν την επιλογή εάν αντιμετωπίσετε προβλήματα απόδοσης."), - ("Use texture rendering", "Χρήση απόδοσης υφής"), - ("Floating window", "Πλωτό παράθυρο"), - ("floating_window_tip", "Βοηθά στη διατήρηση της υπηρεσίας παρασκηνίου RustDesk"), + ("Clear Wayland screen selection", ""), + ("clear_Wayland_screen_selection_tip", ""), + ("confirm_clear_Wayland_screen_selection_tip", ""), + ("android_new_voice_call_tip", ""), + ("texture_render_tip", ""), + ("Use texture rendering", ""), + ("Floating window", ""), + ("floating_window_tip", ""), ("Keep screen on", "Διατήρηση οθόνης Ανοιχτή"), ("Never", "Ποτέ"), ("During controlled", "Κατα την διάρκεια απομακρυσμένου ελέγχου"), @@ -619,8 +622,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Apps", "Εφαρμογές"), ("Volume up", "Αύξηση έντασης"), ("Volume down", "Μείωση έντασης"), - ("Power", "Ενέργεια"), - ("Telegram bot", "Telegram bot"), + ("Power", ""), + ("Telegram bot", ""), ("enable-bot-tip", "Εάν ενεργοποιήσετε αυτήν τη δυνατότητα, μπορείτε να λάβετε τον κωδικό 2FA από το bot σας. Μπορεί επίσης να λειτουργήσει ως ειδοποίηση σύνδεσης."), ("enable-bot-desc", "1, Ανοίξτε μια συνομιλία με τον @BotFather., Στείλτε την εντολή \"/newbot\". Θα λάβετε ένα διακριτικό αφού ολοκληρώσετε αυτό το βήμα.3, Ξεκινήστε μια συνομιλία με το bot που μόλις δημιουργήσατε. Στείλτε ένα μήνυμα που αρχίζει με κάθετο (\"/\") όπως \"/hello\" για να το ενεργοποιήσετε."), ("cancel-2fa-confirm-tip", "Είστε βέβαιοι ότι θέλετε να ακυρώσετε το 2FA;"), @@ -640,11 +643,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Parent directory", "Γονικός φάκελος"), ("Resume", "Συνέχεια"), ("Invalid file name", "Μη έγκυρο όνομα αρχείου"), - ("one-way-file-transfer-tip", "Η μονόδρομη μεταφορά αρχείων είναι ενεργοποιημένη στην ελεγχόμενη πλευρά."), + ("one-way-file-transfer-tip", ""), ("Authentication Required", "Απαιτείται έλεγχος ταυτότητας"), ("Authenticate", "Πιστοποίηση"), - ("web_id_input_tip", "Μπορείτε να εισαγάγετε ένα ID στον ίδιο διακομιστή, η άμεση πρόσβαση IP δεν υποστηρίζεται στον web client.\nΕάν θέλετε να αποκτήσετε πρόσβαση σε μια συσκευή σε άλλον διακομιστή, παρακαλούμε να προσθέστε τη διεύθυνση διακομιστή (@?key=), για παράδειγμα,\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nΕάν θέλετε να αποκτήσετε πρόσβαση σε μια συσκευή σε δημόσιο διακομιστή, παρακαλούμε να εισαγάγετε \"@public\". Το κλειδί δεν είναι απαραίτητο για δημόσιο διακομιστή."), - ("Download", "Λήψη"), + ("web_id_input_tip", ""), + ("Download", ""), ("Upload folder", "Μεταφόρτωση φακέλου"), ("Upload files", "Μεταφόρτωση αρχείων"), ("Clipboard is synchronized", "Το πρόχειρο έχει συγχρονιστεί"), @@ -653,97 +656,52 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("new-version-of-{}-tip", "Υπάρχει διαθέσιμη νέα έκδοση του {}"), ("Accessible devices", "Προσβάσιμες συσκευές"), ("upgrade_remote_rustdesk_client_to_{}_tip", "Αναβαθμίστε τον πελάτη RustDesk στην έκδοση {} ή νεότερη στην απομακρυσμένη πλευρά!"), - ("d3d_render_tip", "Όταν είναι ενεργοποιημένη η απόδοση D3D, η οθόνη του τηλεχειριστηρίου ενδέχεται να είναι μαύρη σε ορισμένα μηχανήματα."), - ("Use D3D rendering", "Χρήση απόδοσης D3D"), - ("Printer", "Εκτυπωτής"), - ("printer-os-requirement-tip", "Η λειτουργία εξερχόμενης εκτύπωσης του εκτυπωτή απαιτεί Windows 10 ή νεότερη έκδοση."), - ("printer-requires-installed-{}-client-tip", "Για να χρησιμοποιήσετε την απομακρυσμένη εκτύπωση, πρέπει να εγκατασταθεί το {} σε αυτήν τη συσκευή."), - ("printer-{}-not-installed-tip", "Ο εκτυπωτής {} δεν είναι εγκατεστημένος."), - ("printer-{}-ready-tip", "Ο εκτυπωτής {} είναι εγκατεστημένος και έτοιμος για χρήση."), - ("Install {} Printer", "Εγκατάσταση εκτυπωτή {}"), - ("Outgoing Print Jobs", "Εξερχόμενες εργασίες εκτύπωσης"), - ("Incoming Print Jobs", "Εισερχόμενες εργασίες εκτύπωσης"), - ("Incoming Print Job", "Εισερχόμενη εργασία εκτύπωσης"), - ("use-the-default-printer-tip", "Χρήση του προεπιλεγμένου εκτυπωτή"), - ("use-the-selected-printer-tip", "Χρήση του επιλεγμένου εκτυπωτή"), - ("auto-print-tip", "Εκτυπώστε αυτόματα χρησιμοποιώντας τον επιλεγμένο εκτυπωτή."), - ("print-incoming-job-confirm-tip", "Λάβατε μια εργασία εκτύπωσης από απόσταση. Θέλετε να την εκτελέσετε από την πλευρά σας;"), - ("remote-printing-disallowed-tile-tip", "Η απομακρυσμένη εκτύπωση δεν επιτρέπεται"), - ("remote-printing-disallowed-text-tip", "Οι ρυθμίσεις δικαιωμάτων της ελεγχόμενης πλευράς απαγορεύουν την Απομακρυσμένη Εκτύπωση."), - ("save-settings-tip", "Αποθήκευση ρυθμίσεων"), - ("dont-show-again-tip", "Να μην εμφανιστεί ξανά αυτό"), - ("Take screenshot", "Λήψη στιγμιότυπου οθόνης"), - ("Taking screenshot", "Γίνεται λήψη στιγμιότυπου οθόνης"), - ("screenshot-merged-screen-not-supported-tip", "Η συγχώνευση στιγμιότυπων οθόνης από πολλές οθόνες δεν υποστηρίζεται προς το παρόν. Αλλάξτε σε μία μόνο οθόνη και δοκιμάστε ξανά."), - ("screenshot-action-tip", "Επιλέξτε πώς θα συνεχίσετε με το στιγμιότυπο οθόνης."), - ("Save as", "Αποθήκευση ως"), - ("Copy to clipboard", "Αντιγραφή στο πρόχειρο"), - ("Enable remote printer", "Ενεργοποίηση απομακρυσμένου εκτυπωτή"), - ("Downloading {}", "Γίνεται Λήψη {}"), - ("{} Update", "{} Ενημέρωση"), - ("{}-to-update-tip", "Το {} θα κλείσει τώρα και θα εγκαταστήσει τη νέα έκδοση."), - ("download-new-version-failed-tip", "Η λήψη απέτυχε. Μπορείτε να δοκιμάσετε ξανά ή να κάνετε κλικ στο κουμπί \"Λήψη\" για να κάνετε λήψη από τη σελίδα έκδοσης και να κάνετε αναβάθμιση χειροκίνητα."), - ("Auto update", "Αυτόματη ενημέρωση"), - ("update-failed-check-msi-tip", "Η μέθοδος εγκατάστασης απέτυχε. Κάντε κλικ στο κουμπί \"Λήψη\" για λήψη από τη σελίδα έκδοσης και κάντε χειροκίνητα την αναβάθμιση."), - ("websocket_tip", "Όταν χρησιμοποιείτε το WebSocket, υποστηρίζονται μόνο συνδέσεις αναμετάδοσης."), - ("Use WebSocket", "Χρήση WebSocket"), - ("Trackpad speed", "Ταχύτητα trackpad"), - ("Default trackpad speed", "Προεπιλεγμένη ταχύτητα trackpad"), - ("Numeric one-time password", "Αριθμητικός κωδικός πρόσβασης μίας χρήσης"), - ("Enable IPv6 P2P connection", "Ενεργοποίηση σύνδεσης IPv6 P2P"), - ("Enable UDP hole punching", "Ενεργοποίηση διάτρησης οπών UDP"), + ("d3d_render_tip", ""), + ("Use D3D rendering", ""), + ("Printer", ""), + ("printer-os-requirement-tip", ""), + ("printer-requires-installed-{}-client-tip", ""), + ("printer-{}-not-installed-tip", ""), + ("printer-{}-ready-tip", ""), + ("Install {} Printer", ""), + ("Outgoing Print Jobs", ""), + ("Incoming Print Jobs", ""), + ("Incoming Print Job", ""), + ("use-the-default-printer-tip", ""), + ("use-the-selected-printer-tip", ""), + ("auto-print-tip", ""), + ("print-incoming-job-confirm-tip", ""), + ("remote-printing-disallowed-tile-tip", ""), + ("remote-printing-disallowed-text-tip", ""), + ("save-settings-tip", ""), + ("dont-show-again-tip", ""), + ("Take screenshot", ""), + ("Taking screenshot", ""), + ("screenshot-merged-screen-not-supported-tip", ""), + ("screenshot-action-tip", ""), + ("Save as", ""), + ("Copy to clipboard", ""), + ("Enable remote printer", ""), + ("Downloading {}", ""), + ("{} Update", ""), + ("{}-to-update-tip", ""), + ("download-new-version-failed-tip", ""), + ("Auto update", ""), + ("update-failed-check-msi-tip", ""), + ("websocket_tip", ""), + ("Use WebSocket", ""), + ("Trackpad speed", ""), + ("Default trackpad speed", ""), + ("Numeric one-time password", ""), + ("Enable IPv6 P2P connection", ""), + ("Enable UDP hole punching", ""), ("View camera", "Προβολή κάμερας"), - ("Enable camera", "Ενεργοποίηση κάμερας"), - ("No cameras", "Δεν υπάρχουν κάμερες"), - ("view_camera_unsupported_tip", "Η τηλεχειριστήριο δεν υποστηρίζει την προβολή της κάμερας."), - ("Terminal", "Τερματικό"), - ("Enable terminal", "Ενεργοποίηση τερματικού"), - ("New tab", "Νέα καρτέλα"), - ("Keep terminal sessions on disconnect", "Διατήρηση περιόδων λειτουργίας τερματικού κατά την αποσύνδεση"), - ("Terminal (Run as administrator)", "Τερματικό (Εκτέλεση ως διαχειριστής)"), - ("terminal-admin-login-tip", "Παρακαλώ εισάγετε το όνομα χρήστη και τον κωδικό πρόσβασης διαχειριστή της ελεγχόμενης πλευράς."), - ("Failed to get user token.", "Αποτυχία λήψης διακριτικού χρήστη."), - ("Incorrect username or password.", "Λανθασμένο όνομα χρήστη ή κωδικός πρόσβασης."), - ("The user is not an administrator.", "Ο χρήστης δεν είναι διαχειριστής."), - ("Failed to check if the user is an administrator.", "Αποτυχία ελέγχου εάν ο χρήστης είναι διαχειριστής."), - ("Supported only in the installed version.", "Υποστηρίζεται μόνο στην εγκατεστημένη έκδοση."), - ("elevation_username_tip", "Εισαγάγετε όνομα χρήστη ή τομέα\\όνομα χρήστη"), - ("Preparing for installation ...", "Προετοιμασία για εγκατάσταση..."), - ("Show my cursor", "Εμφάνιση του κέρσορα μου"), - ("Scale custom", "Προσαρμοσμένη κλίμακα"), - ("Custom scale slider", "Ρυθμιστικό προσαρμοσμένης κλίμακας"), - ("Decrease", "Μείωση"), - ("Increase", "Αύξηση"), - ("Show virtual mouse", "Εμφάνιση εικονικού ποντικιού"), - ("Virtual mouse size", "Μέγεθος εικονικού ποντικιού"), - ("Small", "Μικρό"), - ("Large", "Μεγάλο"), - ("Show virtual joystick", "Εμφάνιση εικονικού joystick"), - ("Edit note", "Επεξεργασία σημείωσης"), - ("Alias", "Ψευδώνυμο"), - ("ScrollEdge", "Άκρη κύλισης"), - ("Allow insecure TLS fallback", "Να επιτρέπεται η μη ασφαλής εφεδρική λειτουργία TLS"), - ("allow-insecure-tls-fallback-tip", "Από προεπιλογή, το RustDesk επαληθεύει το πιστοποιητικό διακομιστή για πρωτόκολλα που χρησιμοποιούν TLS.\nΜε ενεργοποιημένη αυτήν την επιλογή, το RustDesk θα παρακάμψει το βήμα επαλήθευσης και θα προχωρήσει σε περίπτωση αποτυχίας επαλήθευσης."), - ("Disable UDP", "Απενεργοποίηση UDP"), - ("disable-udp-tip", "Ελέγχει εάν θα χρησιμοποιείται μόνο TCP.\nΌταν είναι ενεργοποιημένη αυτή η επιλογή, το RustDesk δεν θα χρησιμοποιεί πλέον το UDP 21116, αλλά θα χρησιμοποιείται το TCP 21116."), - ("server-oss-not-support-tip", "ΣΗΜΕΙΩΣΗ: Το OSS του διακομιστή RustDesk δεν περιλαμβάνει αυτήν τη λειτουργία."), - ("input note here", "εισάγετε σημείωση εδώ"), - ("note-at-conn-end-tip", "Ζητήστε σημείωση στο τέλος της σύνδεσης"), - ("Show terminal extra keys", "Εμφάνιση επιπλέον κλειδιών τερματικού"), - ("Relative mouse mode", "Σχετική λειτουργία ποντικιού"), - ("rel-mouse-not-supported-peer-tip", "Η λειτουργία σχετικού ποντικιού δεν υποστηρίζεται από τον συνδεδεμένο ομότιμο υπολογιστή."), - ("rel-mouse-not-ready-tip", "Η λειτουργία σχετικού ποντικιού δεν είναι ακόμη έτοιμη. Δοκιμάστε ξανά."), - ("rel-mouse-lock-failed-tip", "Αποτυχία κλειδώματος δρομέα. Η λειτουργία σχετικού ποντικιού έχει απενεργοποιηθεί."), - ("rel-mouse-exit-{}-tip", "Πιέστε {} για έξοδο."), - ("rel-mouse-permission-lost-tip", "Η άδεια πληκτρολογίου ανακλήθηκε. Η λειτουργία σχετικού ποντικιού απενεργοποιήθηκε."), - ("Changelog", "Αρχείο αλλαγών"), - ("keep-awake-during-outgoing-sessions-label", "Διατήρηση ενεργής οθόνης κατά τη διάρκεια εξερχόμενων συνεδριών"), - ("keep-awake-during-incoming-sessions-label", "Διατήρηση ενεργής οθόνης κατά τη διάρκεια των εισερχόμενων συνεδριών"), - ("Continue with {}", "Συνέχεια με {}"), - ("Display Name", "Εμφανιζόμενο όνομα"), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Enable camera", ""), + ("No cameras", ""), + ("view_camera_unsupported_tip", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/en.rs b/src/lang/en.rs index 595169b8a..4570c8324 100644 --- a/src/lang/en.rs +++ b/src/lang/en.rs @@ -120,9 +120,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Keyboard settings"), ("Full Access", "Full access"), ("Screen Share", "Screen share"), - ("ubuntu-21-04-required", "Wayland requires Ubuntu 21.04 or higher version."), - ("wayland-requires-higher-linux-version", "Wayland requires higher version of linux distro. Please try X11 desktop or change your OS."), - ("xdp-portal-unavailable", "Wayland screen capture failed. The XDG Desktop Portal may have crashed or is unavailable. Try restarting it with `systemctl --user restart xdg-desktop-portal`."), ("JumpLink", "View"), ("Please Select the screen to be shared(Operate on the peer side).", "Please select the screen to be shared(Operate on the peer side)."), ("One-time Password", "One-time password"), @@ -223,7 +220,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("default_proxy_tip", "Default protocol and port are Socks5 and 1080"), ("no_audio_input_device_tip", "No audio input device found."), ("clear_Wayland_screen_selection_tip", "After clearing the screen selection, you can reselect the screen to share."), - ("confirm_clear_Wayland_screen_selection_tip", "Are you sure you want to clear the Wayland screen selection?"), + ("confirm_clear_Wayland_screen_selection_tip", "Are you sure to clear the Wayland screen selection?"), ("android_new_voice_call_tip", "A new voice call request was received. If you accept, the audio will switch to voice communication."), ("texture_render_tip", "Use texture rendering to make the pictures smoother. You could try disabling this option if you encounter rendering issues."), ("floating_window_tip", "It helps to keep RustDesk background service"), @@ -259,21 +256,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("download-new-version-failed-tip", "Download failed. You can try again or click the \"Download\" button to download from the release page and upgrade manually."), ("update-failed-check-msi-tip", "Installation method check failed. Please click the \"Download\" button to download from the release page and upgrade manually."), ("websocket_tip", "When using WebSocket, only relay connections are supported."), - ("terminal-admin-login-tip", "Please input the administrator username and password of the controlled side."), - ("elevation_username_tip", "Input username or domain\\username"), - ("allow-insecure-tls-fallback-tip", "By default, RustDesk verifies the server certificate for protocols using TLS.\nWith this option enabled, RustDesk will fall back to skipping the verification step and proceed in case of verification failure."), - ("disable-udp-tip", "Controls whether to use TCP only.\nWhen this option enabled, RustDesk will not use UDP 21116 any more, TCP 21116 will be used instead."), - ("server-oss-not-support-tip", "NOTE: RustDesk server OSS doesn't include this feature."), - ("note-at-conn-end-tip", "Ask for note at end of connection"), - ("rel-mouse-not-supported-peer-tip", "Relative Mouse Mode is not supported by the connected peer."), - ("rel-mouse-not-ready-tip", "Relative Mouse Mode is not ready yet. Please try again."), - ("rel-mouse-lock-failed-tip", "Failed to lock cursor. Relative Mouse Mode has been disabled."), - ("rel-mouse-exit-{}-tip", "Press {} to exit."), - ("rel-mouse-permission-lost-tip", "Keyboard permission was revoked. Relative Mouse Mode has been disabled."), - ("keep-awake-during-outgoing-sessions-label", "Keep screen awake during outgoing sessions"), - ("keep-awake-during-incoming-sessions-label", "Keep screen awake during incoming sessions"), - ("password-hidden-tip", "Permanent password is set (hidden)."), - ("preset-password-in-use-tip", "Preset password is currently in use."), - ("allow-remote-toolbar-docking-any-edge", "Allow docking remote toolbar to any window edge"), ].iter().cloned().collect(); } diff --git a/src/lang/eo.rs b/src/lang/eo.rs index 131a85fbf..a9dda55e7 100644 --- a/src/lang/eo.rs +++ b/src/lang/eo.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Pasvorto de la operaciumo"), ("install_tip", "Vi ne uzas instalita versio. Pro limigoj pro UAC, kiel aparato kontrolata, en kelkaj kazoj, ne estos ebla kontroli la muson kaj klavaron aŭ registri la ekranon. Bonvolu alkliku la butonon malsupre por instali RustDesk sur la operaciumo por eviti la demando supre."), ("Click to upgrade", "Alklaki por plibonigi"), + ("Click to download", "Alklaki por elŝuti"), + ("Click to update", "Alklaki por ĝisdatigi"), ("Configure", "Konfiguri"), ("config_acc", "Por uzi vian foran aparaton, bonvolu doni la permeson \"alirebleco\" al RustDesk."), ("config_screen", "Por uzi vian foran aparaton, bonvolu doni la permeson \"ekranregistrado\" al RustDesk."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", ""), ("Full Access", ""), ("Screen Share", ""), - ("ubuntu-21-04-required", "Wayland postulas Ubuntu 21.04 aŭ pli altan version."), - ("wayland-requires-higher-linux-version", "Wayland postulas pli altan version de linuksa distro. Bonvolu provi X11-labortablon aŭ ŝanĝi vian OS."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland postulas Ubuntu 21.04 aŭ pli altan version."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland postulas pli altan version de linuksa distro. Bonvolu provi X11-labortablon aŭ ŝanĝi vian OS."), ("JumpLink", "View"), ("Please Select the screen to be shared(Operate on the peer side).", "Bonvolu Elekti la ekranon por esti dividita (Funkciu ĉe la sama flanko)."), ("Show RustDesk", ""), ("This PC", ""), ("or", ""), + ("Continue with", ""), ("Elevate", ""), ("Zoom cursor", ""), ("Accept sessions via password", ""), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", ""), ("empty_lan_tip", ""), ("empty_address_book_tip", ""), + ("eg: admin", ""), ("Empty Username", ""), ("Empty Password", ""), ("Me", ""), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", ""), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/es.rs b/src/lang/es.rs index 5e73b58a8..ac588e710 100644 --- a/src/lang/es.rs +++ b/src/lang/es.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Contraseña del sistema operativo"), ("install_tip", "Debido al Control de cuentas de usuario, es posible que RustDesk no funcione correctamente como escritorio remoto. Para evitar este problema, haga clic en el botón de abajo para instalar RustDesk a nivel de sistema."), ("Click to upgrade", "Clic para actualizar"), + ("Click to download", "Clic para descargar"), + ("Click to update", "Clic para refrescar"), ("Configure", "Configurar"), ("config_acc", "Para controlar su escritorio desde el exterior, debe otorgar permiso a RustDesk de \"Accesibilidad\"."), ("config_screen", "Para controlar su escritorio desde el exterior, debe otorgar permiso a RustDesk de \"Grabación de pantalla\"."), @@ -208,7 +210,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Closed manually by the peer", "Cerrado manualmente por el par"), ("Enable remote configuration modification", "Habilitar modificación remota de configuración"), ("Run without install", "Ejecutar sin instalar"), - ("Connect via relay", "Conectar a través de relay"), + ("Connect via relay", ""), ("Always connect via relay", "Conéctese siempre a través de relay"), ("whitelist_tip", "Solo las direcciones IP autorizadas pueden conectarse a este escritorio"), ("Login", "Iniciar sesión"), @@ -228,7 +230,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Username missed", "Olvidó su nombre de usuario"), ("Password missed", "Olvidó su contraseña"), ("Wrong credentials", "Credenciales incorrectas"), - ("The verification code is incorrect or has expired", "El código de verificación es incorrecto o ha caducado"), + ("The verification code is incorrect or has expired", ""), ("Edit Tag", "Editar tag"), ("Forget Password", "Olvidar contraseña"), ("Favorites", "Favoritos"), @@ -302,8 +304,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keep RustDesk background service", "Dejar RustDesk como Servicio en 2do plano"), ("Ignore Battery Optimizations", "Ignorar optimizacioens de bateria"), ("android_open_battery_optimizations_tip", "Si deseas deshabilitar esta característica, por favor, ve a la página siguiente de ajustes, busca y entra en [Batería] y desmarca [Sin restricción]"), - ("Start on boot", "Iniciar al arrancar"), - ("Start the screen sharing service on boot, requires special permissions", "Iniciar el servicio de pantalla compartida al arrancar, requiere permisos especiales"), + ("Start on boot", ""), + ("Start the screen sharing service on boot, requires special permissions", ""), ("Connection not allowed", "Conexión no disponible"), ("Legacy mode", "Modo heredado"), ("Map mode", "Modo mapa"), @@ -326,8 +328,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Ratio", "Relación"), ("Image Quality", "Calidad de imagen"), ("Scroll Style", "Estilo de desplazamiento"), - ("Show Toolbar", "Mostrar herramientas"), - ("Hide Toolbar", "Ocultar herramientas"), + ("Show Toolbar", ""), + ("Hide Toolbar", ""), ("Direct Connection", "Conexión directa"), ("Relay Connection", "Conexión Relay"), ("Secure Connection", "Conexión segura"), @@ -338,7 +340,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Security", "Seguridad"), ("Theme", "Tema"), ("Dark Theme", "Tema Oscuro"), - ("Light Theme", "Tema claro"), + ("Light Theme", ""), ("Dark", "Oscuro"), ("Light", "Claro"), ("Follow System", "Tema del sistema"), @@ -355,12 +357,12 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Audio Input Device", "Dispositivo de entrada de audio"), ("Use IP Whitelisting", "Usar lista de IPs admitidas"), ("Network", "Red"), - ("Pin Toolbar", "Anclar herramientas"), - ("Unpin Toolbar", "Desanclar herramientas"), + ("Pin Toolbar", ""), + ("Unpin Toolbar", ""), ("Recording", "Grabando"), ("Directory", "Directorio"), ("Automatically record incoming sessions", "Grabación automática de sesiones entrantes"), - ("Automatically record outgoing sessions", "Grabación automática de sesiones salientes"), + ("Automatically record outgoing sessions", ""), ("Change", "Cambiar"), ("Start session recording", "Comenzar grabación de sesión"), ("Stop session recording", "Detener grabación de sesión"), @@ -368,7 +370,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable LAN discovery", "Habilitar descubrimiento de LAN"), ("Deny LAN discovery", "Denegar descubrimiento de LAN"), ("Write a message", "Escribir un mensaje"), - ("Prompt", "Solicitud"), + ("Prompt", ""), ("Please wait for confirmation of UAC...", "Por favor, espera confirmación de UAC"), ("elevated_foreground_window_tip", "La ventana actual del escritorio remoto necesita privilegios elevados para funcionar, así que no puedes usar ratón y teclado temporalmente. Puedes solicitar al usuario remoto que minimize la ventana actual o hacer clic en el botón de elevación de la ventana de gestión de conexión. Para evitar este problema, se recomienda instalar el programa en el dispositivo remto."), ("Disconnected", "Desconectado"), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Ajustes de teclado"), ("Full Access", "Acceso completo"), ("Screen Share", "Compartir pantalla"), - ("ubuntu-21-04-required", "Wayland requiere Ubuntu 21.04 o una versión superior."), - ("wayland-requires-higher-linux-version", "Wayland requiere una versión superior de la distribución de Linux. Pruebe el escritorio X11 o cambie su sistema operativo."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland requiere Ubuntu 21.04 o una versión superior."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland requiere una versión superior de la distribución de Linux. Pruebe el escritorio X11 o cambie su sistema operativo."), ("JumpLink", "Ver"), ("Please Select the screen to be shared(Operate on the peer side).", "Seleccione la pantalla que se compartirá (Operar en el lado del par)."), ("Show RustDesk", "Mostrar RustDesk"), ("This PC", "Este PC"), ("or", "o"), + ("Continue with", "Continuar con"), ("Elevate", "Elevar privilegios"), ("Zoom cursor", "Ampliar cursor"), ("Accept sessions via password", "Aceptar sesiones a través de contraseña"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "¿Sin pares favoritos aún?\nEncontremos uno al que conectarte y ¡añádelo a tus favoritos!"), ("empty_lan_tip", "Oh no, parece que aún no has descubierto ningún par."), ("empty_address_book_tip", "Parece que actualmente no hay pares en tu directorio."), + ("eg: admin", "ej.: admin"), ("Empty Username", "Nombre de usuario vacío"), ("Empty Password", "Contraseña vacía"), ("Me", "Yo"), @@ -616,9 +619,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("During service is on", "Mientras el servicio está activo"), ("Capture screen using DirectX", "Capturar pantalla con DirectX"), ("Back", "Atrás"), - ("Apps", "Aplicaciones"), - ("Volume up", "Subir volumen"), - ("Volume down", "Bajar volumen"), + ("Apps", ""), + ("Volume up", "Bajar volumen"), + ("Volume down", "Subir volumen"), ("Power", "Encendido"), ("Telegram bot", "Bot de Telegram"), ("enable-bot-tip", "Si activas esta característica puedes recibir código 2FA de tu bot. También puede funcionar como notificación de conexión."), @@ -651,7 +654,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Update client clipboard", "Actualizar portapapeles del cliente"), ("Untagged", "Sin itiquetar"), ("new-version-of-{}-tip", "Hay una nueva versión de {} disponible"), - ("Accessible devices", "Dispositivos accesibles"), + ("Accessible devices", ""), ("upgrade_remote_rustdesk_client_to_{}_tip", "Por favor, actualiza el cliente RustDesk a la versión {} o superior en el lado remoto"), ("d3d_render_tip", "Al activar el renderizado D3D, la pantalla de control remoto puede verse negra en algunos equipos."), ("Use D3D rendering", "Usar renderizado D3D"), @@ -679,7 +682,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Save as", "Guardar como"), ("Copy to clipboard", "Copiar al portapapeles"), ("Enable remote printer", "Habilitar impresora remota"), - ("Downloading {}", "Descargando {}"), + ("Downloading {}", "Descarngando {}"), ("{} Update", "{} Actualizar"), ("{}-to-update-tip", "{} Se cerrará ahora e instalará la nueva versión."), ("download-new-version-failed-tip", "Descarga fallida. Puedes volver a intentarlo o hacer clic en el botón \"Download\" para descargar desde la página de lanzamientos y actualizar manualmente."), @@ -689,61 +692,16 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Use WebSocket", "Usar WebSocket"), ("Trackpad speed", "Velocidad de trackpad"), ("Default trackpad speed", "Velocidad predeterminada de trackpad"), - ("Numeric one-time password", "Contraseña numérica de un solo uso"), - ("Enable IPv6 P2P connection", "Habilitar conexión IPv6 P2P"), - ("Enable UDP hole punching", "Habilitar perforación de agujero UDP"), + ("Numeric one-time password", ""), + ("Enable IPv6 P2P connection", ""), + ("Enable UDP hole punching", ""), ("View camera", "Ver cámara"), ("Enable camera", "Habilitar cámara"), ("No cameras", "No hay cámaras"), ("view_camera_unsupported_tip", "El dispositivo remoto no soporta la visualización de la cámara."), ("Terminal", ""), - ("Enable terminal", "Habilitar terminal"), - ("New tab", "Nueva pestaña"), - ("Keep terminal sessions on disconnect", "Mantener sesiones de terminal al desconectar"), - ("Terminal (Run as administrator)", "Terminal (Ejecutar como administrador)"), - ("terminal-admin-login-tip", "Por favor, introduzca el usuario y la contrasseña del administrador en el lado controlado."), - ("Failed to get user token.", "No se ha podido obtener el token de usuario"), - ("Incorrect username or password.", "Nombre y contraseña incorrectos"), - ("The user is not an administrator.", "El usuario no es un administrador."), - ("Failed to check if the user is an administrator.", "No se ha podido comprobar si el usuario es un administrador."), - ("Supported only in the installed version.", "Soportado solo en la versión instalada."), - ("elevation_username_tip", "Introduzca el nombre de usuario o dominio\\NombreDeUsuario"), - ("Preparing for installation ...", "Preparando instlación..."), - ("Show my cursor", "Mostrar mi cursor"), - ("Scale custom", "Escala personalizada"), - ("Custom scale slider", "Control deslizante de escala personalizada"), - ("Decrease", "Disminuir"), - ("Increase", "Aumentar"), - ("Show virtual mouse", "Mostrar ratón virtual"), - ("Virtual mouse size", "Tamaño del ratón virtual"), - ("Small", "Pequeño"), - ("Large", "Grande"), - ("Show virtual joystick", "Mostrar joystick virtual"), - ("Edit note", "Editar nota"), - ("Alias", ""), - ("ScrollEdge", "Desplazamiento de pantalla"), - ("Allow insecure TLS fallback", "Permitir conexión TLS insegura de respaldo"), - ("allow-insecure-tls-fallback-tip", "De forma predeterminada, RustDesk verifica el certificado de servidor para protocolos que usen TLS.\nCon esta opción habilitada, Rustdesk volverá al paso de omisión de verificación y procederá en caso de fallo de verificación."), - ("Disable UDP", "Inhabilitar UDP"), - ("disable-udp-tip", "Controla si se usa TCP solamente.\nCuando esta opción está activa, RustDesk no usará más el puerto UDP 21116, en su lugar se usará el TCP 21116."), - ("server-oss-not-support-tip", "NOTA: El servidor RustDesk OSS no incluye esta característica."), - ("input note here", "Introducir nota aquí"), - ("note-at-conn-end-tip", "Pedir nota al finalizar la conexión"), - ("Show terminal extra keys", "Mostrar teclas extra del terminal"), - ("Relative mouse mode", "Modo de ratón relativo"), - ("rel-mouse-not-supported-peer-tip", "El modo relativo de ratón no está soportado por el par."), - ("rel-mouse-not-ready-tip", "El modo relativo de ratón aún no está preparado. Por favor, inténtalo de nuevo."), - ("rel-mouse-lock-failed-tip", "Ha fallado el bloqueo del cursor. El modo relativo del ratón ha sido inhabilitado."), - ("rel-mouse-exit-{}-tip", "Pulsa {} para salir."), - ("rel-mouse-permission-lost-tip", "Permiso de teclado revocado. El modo relativo del ratón ha sido inhabilitado."), - ("Changelog", "Registro de cambios"), - ("keep-awake-during-outgoing-sessions-label", "Mantener la pantalla activa durante sesiones salientes"), - ("keep-awake-during-incoming-sessions-label", "Mantener la pantalla activa durante sesiones entrantes"), - ("Continue with {}", "Continuar con {}"), - ("Display Name", "Nombre de pantalla"), - ("password-hidden-tip", "La contraseña permanente está ajustada a (oculta)."), - ("preset-password-in-use-tip", "Se está usando la contraseña predeterminada."), - ("Enable privacy mode", "Habilitar modo privado"), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/et.rs b/src/lang/et.rs index 76abc8563..bde374601 100644 --- a/src/lang/et.rs +++ b/src/lang/et.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Opsüsteemi parool"), ("install_tip", "Kasutajakonto kontrolli (UAC) tõttu ei saa RustDesk mõnel juhul korralikult kaugjuhtimispoolena töötada. Kontrolli vältimiseks palun klõpsa alloleval nupul, et RustDesk oma süsteemi paigaldada."), ("Click to upgrade", "Vajuta täiendamiseks"), + ("Click to download", "Vajuta allalaadimiseks"), + ("Click to update", "Vajuta uuendamiseks"), ("Configure", "Seadista"), ("config_acc", "Töölaua kaugjuhtimiseks tuleb RustDeskile anda \"juurdepääsetavuse\" õigused."), ("config_screen", "Töölaua kaugjuhtimiseks tuleb RustDeskile anda \"ekraanisalvestuse\" õigused."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Klaviatuurisätted"), ("Full Access", "Täielik ligipääs"), ("Screen Share", "Ekraanijagamine"), - ("ubuntu-21-04-required", "Wayland nõuab Ubuntu 21.04 või uuemat versiooni."), - ("wayland-requires-higher-linux-version", "Wayland nõuab Linuxi distributsiooni uuemat versiooni. Palun proovi X11 töölaual või muuda oma operatsioonisüsteemi."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland nõuab Ubuntu 21.04 või uuemat versiooni."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland nõuab Linuxi distributsiooni uuemat versiooni. Palun proovi X11 töölaual või muuda oma operatsioonisüsteemi."), ("JumpLink", "JumpLink"), ("Please Select the screen to be shared(Operate on the peer side).", "Palun vali jagatav ekraan (tegutse partneri poolel)."), ("Show RustDesk", "Kuva RustDesk"), ("This PC", "See arvuti"), ("or", "või"), + ("Continue with", "Jätka koos"), ("Elevate", "Tõsta"), ("Zoom cursor", "Suumi kursorit"), ("Accept sessions via password", "Aktsepteeri seansid parooli kaudu"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Ei ole veel ühtegi lemmikpartnerit?\nLeia keegi, kellega suhelda ja lisa ta oma lemmikute hulka!"), ("empty_lan_tip", "Oh ei, tundub, et me pole veel ühtegi partnerit avastanud."), ("empty_address_book_tip", "Oh ei, tundub et sinu aadressiraamatus ei ole hetkel ühtegi partnerit."), + ("eg: admin", "nt admin"), ("Empty Username", "Tühi kasutajanimi"), ("Empty Password", "Tühi parool"), ("Me", "Mina"), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Jätka koos {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/eu.rs b/src/lang/eu.rs index 9e19d1fea..46f3e8a9b 100644 --- a/src/lang/eu.rs +++ b/src/lang/eu.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Sistema eragilearen pasahitza"), ("install_tip", "Erabiltzaile Kontuen Kontrolarengatik, RustDesk ezin du ondo funtzionatu urruneko mahaigainean. EKK saihesteko, mesedez, egin klik azpiko botoian RustDesk sistema mailan instalatzeko."), ("Click to upgrade", "Egin klik bertsio-berritzeko"), + ("Click to download", "Egin klik deskargatzeko"), + ("Click to update", "Egin klik eguneratzeko"), ("Configure", "Konfiguratu"), ("config_acc", "Zure mahaigaina urrunetik kontrolatzeko, RustDesk-i \"Irisgarritasuna\" baimenak eman behar dituzu."), ("config_screen", "Zure mahaigaina kanpotik kontrolatzeko, RustDesk-i \"Pantaila grabatu\" baimena eman behar duzu."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Teklatuaren ezarpenak"), ("Full Access", "Sarbide osoa"), ("Screen Share", "Pantailaren partekatzea"), - ("ubuntu-21-04-required", "Wayland Ubuntu 21.04 edo bertsio berriagoa behar du."), - ("wayland-requires-higher-linux-version", "Wayland-ek linux banaketa berriago bat behar du. Saiatu X11 mahaigainarekin edo aldatu zure sistema eragilea."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland Ubuntu 21.04 edo bertsio berriagoa behar du."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland-ek linux banaketa berriago bat behar du. Saiatu X11 mahaigainarekin edo aldatu zure sistema eragilea."), ("JumpLink", "Ikusi"), ("Please Select the screen to be shared(Operate on the peer side).", "Mesedez, hautatu partekatuko den pantaila (Kudeatu parekidearen aldean)"), ("Show RustDesk", "Erakutsi RustDesk"), ("This PC", "PC hau"), ("or", "edo"), + ("Continue with", "Jarraitu honekin"), ("Elevate", "Igo maila"), ("Zoom cursor", "Handitu kurtsorea"), ("Accept sessions via password", "Onartu saioak pasahitzaren bidez"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Parekide gogokorik gabe oraindik?\nBilatu norbait konektatzeko eta gehitu zure gogokoetara!"), ("empty_lan_tip", "Ai ez, badirudi ez duzula parekiderik aurkitu oraindik."), ("empty_address_book_tip", "Badirudi ez dagoela parekiderik zure helbide-liburuan."), + ("eg: admin", "adib. admin"), ("Empty Username", "Erabiltzaile-izena hutsik"), ("Empty Password", "Pasahitza hutsik"), ("Me", "Ni"), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "{} honekin jarraitu"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/fa.rs b/src/lang/fa.rs index 9e01b7eb0..538e0610c 100644 --- a/src/lang/fa.rs +++ b/src/lang/fa.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "رمز عبور سیستم عامل"), ("install_tip", "لطفا برنامه را نصب کنید UAC و جلوگیری از خطای RustDesk برای راحتی در استفاده از نرم افزار"), ("Click to upgrade", "برای ارتقا کلیک کنید"), + ("Click to download", "برای دانلود کلیک کنید"), + ("Click to update", "برای به روز رسانی کلیک کنید"), ("Configure", "تنظیم"), ("config_acc", "بدهید \"access\" مجوز RustDesk برای کنترل از راه دور دسکتاپ باید به"), ("config_screen", "بدهید \"screenshot\" مجوز RustDesk برای کنترل از راه دور دسکتاپ باید به"), @@ -184,7 +186,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Direct and unencrypted connection", "اتصال مستقیم و بدون رمزگذاری"), ("Relayed and unencrypted connection", "و رمزگذاری نشده Relay اتصال از طریق"), ("Enter Remote ID", "شناسه از راه دور را وارد کنید"), - ("Enter your password", "رمز عبور خود را وارد کنید"), + ("Enter your password", "زمر عبور خود را وارد کنید"), ("Logging in...", "...در حال ورود"), ("Enable RDP session sharing", "را فعال کنید RDP اشتراک گذاری جلسه"), ("Auto Login", "ورود خودکار"), @@ -200,7 +202,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Login screen using Wayland is not supported", "پشتیبانی نمی شود Wayland ورود به سیستم با استفاده از "), ("Reboot required", "راه اندازی مجدد مورد نیاز است"), ("Unsupported display server", "سرور تصویر پشتیبانی نشده است"), - ("x11 expected", "X11 مورد انتظار است"), + ("x11 expected", ""), ("Port", "پورت"), ("Settings", "تنظیمات"), ("Username", "نام کاربری"), @@ -258,10 +260,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Three-Finger vertically", "سه انگشت عمودی"), ("Mouse Wheel", "چرخ ماوس"), ("Two-Finger Move", "با دو انگشت حرکت کنید"), - ("Canvas Move", "حرکت دادن صفحه"), + ("Canvas Move", ""), ("Pinch to Zoom", "با دو انگشت بکشید تا زوم شود"), - ("Canvas Zoom", "بزرگنمایی صفحه"), - ("Reset canvas", "بازنشانی صفحه"), + ("Canvas Zoom", ""), + ("Reset canvas", ""), ("No permission of file transfer", "مجوز انتقال فایل داده نشده"), ("Note", "یادداشت"), ("Connection", "ارتباط"), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "تنظیمات صفحه کلید"), ("Full Access", "دسترسی کامل"), ("Screen Share", "اشتراک گذاری صفحه"), - ("ubuntu-21-04-required", "نیازمند اوبونتو نسخه 21.04 یا بالاتر است Wayland"), - ("wayland-requires-higher-linux-version", "استفاده کنید و یا سیستم عامل خود را تغییر دهید X11 نیازمند نسخه بالاتری از توزیع لینوکس است. لطفا از دسکتاپ با سیستم"), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "نیازمند اوبونتو نسخه 21.04 یا بالاتر است Wayland"), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "استفاده کنید و یا سیستم عامل خود را تغییر دهید X11 نیازمند نسخه بالاتری از توزیع لینوکس است. لطفا از دسکتاپ با سیستم"), ("JumpLink", "چشم انداز"), ("Please Select the screen to be shared(Operate on the peer side).", "لطفاً صفحه‌ای را برای اشتراک‌گذاری انتخاب کنید (در سمت همتا به همتا کار کنید)."), ("Show RustDesk", "RustDesk نمایش"), ("This PC", "This PC"), ("or", "یا"), + ("Continue with", "ادامه با"), ("Elevate", "ارتقاء"), ("Zoom cursor", " بزرگنمایی نشانگر ماوس"), ("Accept sessions via password", "قبول درخواست با رمز عبور"), @@ -436,7 +438,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Default Image Quality", "کیفیت تصویر پیش فرض"), ("Default Codec", "کدک پیش فرض"), ("Bitrate", "میزان بیت صفحه نمایش"), - ("FPS", "فریم در ثانیه"), + ("FPS", "FPS"), ("Auto", "خودکار"), ("Other Default Options", "سایر گزینه های پیش فرض"), ("Voice call", "تماس صوتی"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "هنوز همتای مورد علاقه‌ای ندارید؟\nبیایید فردی را برای ارتباط پیدا کنیم و آن را به موارد دلخواه خود اضافه کنیم!"), ("empty_lan_tip", "اوه نه، به نظر می رسد که ما هنوز همتای خود را پیدا نکرده ایم"), ("empty_address_book_tip", "اوه ، به نظر می رسد که در حال حاضر هیچ همتایی در دفترچه آدرس شما وجود ندارد"), + ("eg: admin", "مثال : admin"), ("Empty Username", "نام کاربری خالی است"), ("Empty Password", "رمز عبور خالی است"), ("Me", "من"), @@ -525,7 +528,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("synced_peer_readded_tip", "دستگاه هایی که در جلسات اخیر حضور داشتند با دفترچه آدرس همگام سازی می شوند"), ("Change Color", "تغییر رنگ"), ("Primary Color", "رنگ اولیه"), - ("HSV Color", "رنگ HSV"), + ("HSV Color", "رنگ HDV"), ("Installation Successful!", "نصب با موفقیت انجام شد!"), ("Installation failed!", "نصب انجام نشد!"), ("Reverse mouse wheel", "معکوس کردن چرخ موس"), @@ -542,7 +545,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Check for software update on startup", "در هنگلم شروع برنامه بروزرسانی را بررسی کن"), ("upgrade_rustdesk_server_pro_to_{}_tip", "را به نسخه {} یا جدیدتر ارتقا دهید RustDesk Server Pro لظفا"), ("pull_group_failed_tip", "گروه بازخوانی نشد"), - ("Filter by intersection", "فیلتر بر اساس اشتراک"), + ("Filter by intersection", ""), ("Remove wallpaper during incoming sessions", "را در جلسات ورودی حذف کنید Wallpaper"), ("Test", "تست"), ("display_is_plugged_out_msg", "صفحه نمایش قطع شده است، به صفحه نمایش اول بروید."), @@ -597,12 +600,12 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("allow-only-conn-window-open-tip", "باز است اتصال برقرار شود RustDesk زمانی که"), ("no_need_privacy_mode_no_physical_displays_tip", "بدون نمایشگر فیزیکی نیازی به استفاده از حالت خصوصی نیست"), ("Follow remote cursor", "مکان نما ریموت را دنبال کنید"), - ("Follow remote window focus", "دنبال کردن فوکوس پنجره راه دور"), + ("Follow remote window focus", ""), ("default_proxy_tip", "و پورت 1080 می باشد Sock5 پرونکل پیش فرض"), ("no_audio_input_device_tip", "دستگاه ورودی صوتی پیدا نشد"), ("Incoming", "ورودی"), ("Outgoing", "خروجی"), - ("Clear Wayland screen selection", "پاک کردن انتخاب صفحه Wayland"), + ("Clear Wayland screen selection", ""), ("clear_Wayland_screen_selection_tip", "پس از پاک کردن صفحه انتخابی، می توانید صفحه را برای اشتراک گذاری مجدد انتخاب کنید"), ("confirm_clear_Wayland_screen_selection_tip", "را پاک می کنید؟ Wayland آیا مطمئن هستید که انتخاب صفحه"), ("android_new_voice_call_tip", "یک درخواست تماس صوتی جدید دریافت شد. اگر بپذیرید، صدا به ارتباط صوتی تغییر خواهد کرد."), @@ -619,10 +622,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Apps", "برنامه ها"), ("Volume up", "افزایش صدا"), ("Volume down", "کاهش صدا"), - ("Power", "پاور"), + ("Power", ""), ("Telegram bot", "ربات تلگرام"), ("enable-bot-tip", "اگر این ویژگی را فعال کنید، می توانید کد تائید دو مرحله ای را از ربات خود دریافت کنید. همچنین می تواند به عنوان یک اعلان اتصال عمل کند."), - ("enable-bot-desc", "ربات، اعلان‌های اتصال و کدهای تأیید دو مرحله‌ای را برای شما ارسال می‌کند."), + ("enable-bot-desc", ""), ("cancel-2fa-confirm-tip", "آیا مطمئن هستید که می خواهید تائید دو مرحله ای را لغو کنید؟"), ("cancel-bot-confirm-tip", "آیا مطمئن هستید که می خواهید ربات تلگرام را لغو کنید؟"), ("About RustDesk", "RustDesk درباره"), @@ -695,55 +698,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("View camera", "نمایش دوربین"), ("Enable camera", "فعال کردن دوربین"), ("No cameras", "هیچ دوربینی یافت نشد"), - ("view_camera_unsupported_tip", "ریموت از مشاهده دوربین پشتیبانی نمی کند."), - ("Terminal", "ترمینال"), - ("Enable terminal", "فعال‌سازی ترمینال"), - ("New tab", "زبانه جدید"), - ("Keep terminal sessions on disconnect", "حفظ جلسات ترمینال پس از قطع اتصال"), - ("Terminal (Run as administrator)", "ترمینال (اجرای به عنوان مدیر سیستم)"), - ("terminal-admin-login-tip", "برای اجرای ترمینال به‌ عنوان مدیر، نام کاربری و رمز عبور مدیر سیستم ریموت را وارد کنید."), - ("Failed to get user token.", "دریافت توکن کاربر ناموفق بود."), - ("Incorrect username or password.", "نام کاربری یا رمز عبور اشتباه است."), - ("The user is not an administrator.", "کاربر دارای دسترسی مدیر سیستم نیست."), - ("Failed to check if the user is an administrator.", "بررسی وضعیت مدیر سیستم برای کاربر ناموفق بود."), - ("Supported only in the installed version.", "فقط در نسخه نصب‌ شده پشتیبانی می‌شود."), - ("elevation_username_tip", "وارد نمایید domain\\username یا username نام کاربری را به صورت"), - ("Preparing for installation ...", "در حال آماده‌سازی برای نصب..."), - ("Show my cursor", "نمایش نشانگر من"), - ("Scale custom", "مقیاس سفارشی"), - ("Custom scale slider", "نوار لغزنده مقیاس سفارشی"), - ("Decrease", "کاهش"), - ("Increase", "افزایش"), - ("Show virtual mouse", "نمایش ماوس مجازی"), - ("Virtual mouse size", "اندازه ماوس مجازی"), - ("Small", "کوچک"), - ("Large", "بزرگ"), - ("Show virtual joystick", "نمایش جوی‌استیک مجازی"), - ("Edit note", "ویرایش یادداشت"), - ("Alias", "نام مستعار"), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", "استفاده از TLS غیر امن در ارتباط"), - ("allow-insecure-tls-fallback-tip", "به‌طور پیش‌فرض، RustDesk گواهی سرور را برای پروتکل‌ها با استفاده از TLS تأیید می‌کند.\nبا فعال بودن این گزینه، RustDesk دوباره مرحله تأیید را رد می‌کند و در صورت عدم موفقیت تأیید ادامه می‌دهد."), - ("Disable UDP", "UDP غیر فعال کردن"), - ("disable-udp-tip", "کنترل می کند که آیا فقط از TCP استفاده شود یا خیر.\nوقتی این گزینه فعال باشد، RustDesk دیگر از UDP 21116 استفاده نمی کند، به جای آن از TCP 21116 استفاده می شود."), - ("server-oss-not-support-tip", "توجه: سرور RustDesk OSS این ویژگی را ندارد."), - ("input note here", "یادداشت را اینجا وارد کنید"), - ("note-at-conn-end-tip", "در پایان اتصال، یادداشت بخواهید"), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "ادامه با {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), + ("view_camera_unsupported_tip", "دوربین در این دستگاه پشتیبانی نمی‌شود"), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/fi.rs b/src/lang/fi.rs deleted file mode 100644 index f8283685b..000000000 --- a/src/lang/fi.rs +++ /dev/null @@ -1,749 +0,0 @@ -lazy_static::lazy_static! { -pub static ref T: std::collections::HashMap<&'static str, &'static str> = - [ - ("Status", "Tila"), - ("Your Desktop", "Oma työpöytä"), - ("desk_tip", "Työpöytääsi voidaan käyttää tällä tunnuksella ja salasanalla."), - ("Password", "Salasana"), - ("Ready", "Valmis"), - ("Established", "Yhdistetty"), - ("connecting_status", "Yhdistetään RustDesk verkkoon..."), - ("Enable service", "Ota palvelu käyttöön"), - ("Start service", "Käynnistä palvelu"), - ("Service is running", "Palvelu on käynnissä"), - ("Service is not running", "Palvelu ei ole käynnissä"), - ("not_ready_status", "Ei valmis tarkista yhteys."), - ("Control Remote Desktop", "Hallitse etätyöpöytää"), - ("Transfer file", "Siirrä tiedosto"), - ("Connect", "Yhdistä"), - ("Recent sessions", "Viimeisimmät istunnot"), - ("Address book", "Osoitekirja"), - ("Confirmation", "Vahvistus"), - ("TCP tunneling", "TCP tunnelointi"), - ("Remove", "Poista"), - ("Refresh random password", "Päivitä satunnainen salasana"), - ("Set your own password", "Aseta oma salasana"), - ("Enable keyboard/mouse", "Salli näppäimistö ja hiiri"), - ("Enable clipboard", "Salli leikepöytä"), - ("Enable file transfer", "Salli tiedostonsiirto"), - ("Enable TCP tunneling", "Salli TCP tunnelointi"), - ("IP Whitelisting", "IP osoitteiden sallintalista"), - ("ID/Relay Server", "ID/Välityspalvelin"), - ("Import server config", "Tuo palvelimen asetukset"), - ("Export Server Config", "Vie palvelimen asetukset"), - ("Import server configuration successfully", "Palvelimen asetukset tuotu onnistuneesti"), - ("Export server configuration successfully", "Palvelimen asetukset viety onnistuneesti"), - ("Invalid server configuration", "Virheellinen palvelimen määritys"), - ("Clipboard is empty", "Leikepöytä on tyhjä"), - ("Stop service", "Pysäytä palvelu"), - ("Change ID", "Vaihda ID"), - ("Your new ID", "Uusi ID"), - ("length %min% to %max%", "pituus %min%–%max%"), - ("starts with a letter", "alkaa kirjaimella"), - ("allowed characters", "sallitut merkit"), - ("id_change_tip", "Sallitut merkit: a–z, A–Z, 0–9, - ja _. Ensimmäisen merkin on oltava kirjain. Pituus 6–16 merkkiä."), - ("Website", "Verkkosivusto"), - ("About", "Tietoa"), - ("Slogan_tip", "Tehty sydämellä tässä kaoottisessa maailmassa!"), - ("Privacy Statement", "Tietosuojaseloste"), - ("Mute", "Mykistä"), - ("Build Date", "Koontipäivä"), - ("Version", "Versio"), - ("Home", "Etusivu"), - ("Audio Input", "Äänitulo"), - ("Enhancements", "Parannukset"), - ("Hardware Codec", "Laitteistokoodekki"), - ("Adaptive bitrate", "Mukautuva bittinopeus"), - ("ID Server", "ID palvelin"), - ("Relay Server", "Välityspalvelin"), - ("API Server", "API palvelin"), - ("invalid_http", "Osoitteen on alettava http:// tai https://"), - ("Invalid IP", "Virheellinen IP osoite"), - ("Invalid format", "Virheellinen muoto"), - ("server_not_support", "Palvelin ei tue tätä ominaisuutta"), - ("Not available", "Ei saatavilla"), - ("Too frequent", "Liian tiheä pyyntö"), - ("Cancel", "Peruuta"), - ("Skip", "Ohita"), - ("Close", "Sulje"), - ("Retry", "Yritä uudelleen"), - ("OK", "OK"), - ("Password Required", "Salasana vaaditaan"), - ("Please enter your password", "Syötä salasanasi"), - ("Remember password", "Muista salasana"), - ("Wrong Password", "Väärä salasana"), - ("Do you want to enter again?", "Haluatko yrittää uudelleen?"), - ("Connection Error", "Yhteysvirhe"), - ("Error", "Virhe"), - ("Reset by the peer", "Yhteys katkaistu vastapuolen toimesta"), - ("Connecting...", "Yhdistetään..."), - ("Connection in progress. Please wait.", "Yhdistetään – odota hetki."), - ("Please try 1 minute later", "Yritä uudelleen minuutin kuluttua"), - ("Login Error", "Kirjautumisvirhe"), - ("Successful", "Onnistui"), - ("Connected, waiting for image...", "Yhdistetty, odotetaan kuvaa..."), - ("Name", "Nimi"), - ("Type", "Tyyppi"), - ("Modified", "Muokattu"), - ("Size", "Koko"), - ("Show Hidden Files", "Näytä piilotetut tiedostot"), - ("Receive", "Vastaanota"), - ("Send", "Lähetä"), - ("Refresh File", "Päivitä tiedosto"), - ("Local", "Paikallinen"), - ("Remote", "Etä"), - ("Remote Computer", "Etätietokone"), - ("Local Computer", "Paikallinen tietokone"), - ("Confirm Delete", "Vahvista poisto"), - ("Delete", "Poista"), - ("Properties", "Ominaisuudet"), - ("Multi Select", "Monivalinta"), - ("Select All", "Valitse kaikki"), - ("Unselect All", "Poista kaikki valinnat"), - ("Empty Directory", "Tyhjä kansio"), - ("Not an empty directory", "Hakemisto ei ole tyhjä"), - ("Are you sure you want to delete this file?", "Haluatko varmasti poistaa tämän tiedoston?"), - ("Are you sure you want to delete this empty directory?", "Haluatko varmasti poistaa tämän tyhjän hakemiston?"), - ("Are you sure you want to delete the file of this directory?", "Haluatko varmasti poistaa tämän hakemiston tiedoston?"), - ("Do this for all conflicts", "Tee sama kaikille ristiriidoille"), - ("This is irreversible!", "Tätä toimintoa ei voi perua!"), - ("Deleting", "Poistetaan"), - ("files", "tiedostoa"), - ("Waiting", "Odotetaan"), - ("Finished", "Valmis"), - ("Speed", "Nopeus"), - ("Custom Image Quality", "Mukautettu kuvanlaatu"), - ("Privacy mode", "Yksityisyystila"), - ("Block user input", "Estä käyttäjän toiminta"), - ("Unblock user input", "Salli käyttäjän toiminta"), - ("Adjust Window", "Sovita ikkuna"), - ("Original", "Alkuperäinen"), - ("Shrink", "Pienennä"), - ("Stretch", "Venytä"), - ("Scrollbar", "Vierityspalkki"), - ("ScrollAuto", "Automaattinen vieritys"), - ("Good image quality", "Hyvä kuvanlaatu"), - ("Balanced", "Tasapainotettu"), - ("Optimize reaction time", "Optimoi vasteaika"), - ("Custom", "Mukautettu"), - ("Show remote cursor", "Näytä etäkursori"), - ("Show quality monitor", "Näytä laadunvalvonta"), - ("Disable clipboard", "Poista leikepöytä käytöstä"), - ("Lock after session end", "Lukitse istunnon päätyttyä"), - ("Insert Ctrl + Alt + Del", "Lähetä Ctrl + Alt + Del"), - ("Insert Lock", "Aseta lukitse"), - ("Refresh", "Päivitä"), - ("ID does not exist", "Tunnusta ei ole olemassa"), - ("Failed to connect to rendezvous server", "Yhteys tapaamispalvelimeen epäonnistui"), - ("Please try later", "Yritä myöhemmin uudelleen"), - ("Remote desktop is offline", "Etätyöpöytä ei ole online tilassa"), - ("Key mismatch", "Avaimet eivät täsmää"), - ("Timeout", "Aikakatkaisu"), - ("Failed to connect to relay server", "Yhteys välityspalvelimeen epäonnistui"), - ("Failed to connect via rendezvous server", "Yhteys tapaamispalvelimen kautta epäonnistui"), - ("Failed to connect via relay server", "Yhteys välityspalvelimen kautta epäonnistui"), - ("Failed to make direct connection to remote desktop", "Suora yhteys etätyöpöytään epäonnistui"), - ("Set Password", "Aseta salasana"), - ("OS Password", "Käyttöjärjestelmän salasana"), - ("install_tip", "Joissain tapauksissa RustDesk ei toimi oikein etäpuolella UAC:n vuoksi. Välttääksesi tämän, napsauta alla olevaa painiketta asentaaksesi RustDeskin järjestelmään."), - ("Click to upgrade", "Päivitä napsauttamalla"), - ("Configure", "Määritä"), - ("config_acc", "Etätyöpöydän hallintaa varten sinun on annettava RustDeskille ”Esteettömyys”-oikeudet."), - ("config_screen", "Etätyöpöydän käyttöä varten sinun on annettava RustDeskille ”Näytön tallennus” oikeudet."), - ("Installing ...", "Asennetaan ..."), - ("Install", "Asenna"), - ("Installation", "Asennus"), - ("Installation Path", "Asennuspolku"), - ("Create start menu shortcuts", "Luo pikakuvakkeet Käynnistä valikkoon"), - ("Create desktop icon", "Luo kuvake työpöydälle"), - ("agreement_tip", "Aloittamalla asennuksen hyväksyt käyttöoikeussopimuksen."), - ("Accept and Install", "Hyväksy ja asenna"), - ("End-user license agreement", "Käyttöoikeussopimus"), - ("Generating ...", "Luodaan ..."), - ("Your installation is lower version.", "Asennettu versio on vanhempi."), - ("not_close_tcp_tip", "Älä sulje tätä ikkunaa tunnelin ollessa käytössä"), - ("Listening ...", "Kuunnellaan ..."), - ("Remote Host", "Etätietokone"), - ("Remote Port", "Etäportti"), - ("Action", "Toiminto"), - ("Add", "Lisää"), - ("Local Port", "Paikallinen portti"), - ("Local Address", "Paikallinen osoite"), - ("Change Local Port", "Vaihda paikallinen porttia"), - ("setup_server_tip", "Nopeampaa yhteyttä varten voit asettaa oman palvelimen"), - ("Too short, at least 6 characters.", "Liian lyhyt, vähintään 6 merkkiä."), - ("The confirmation is not identical.", "Vahvistus ei täsmää."), - ("Permissions", "Oikeudet"), - ("Accept", "Hyväksy"), - ("Dismiss", "Hylkää"), - ("Disconnect", "Katkaise yhteys"), - ("Enable file copy and paste", "Salli tiedostojen kopiointi ja liittäminen"), - ("Connected", "Yhdistetty"), - ("Direct and encrypted connection", "Suora ja salattu yhteys"), - ("Relayed and encrypted connection", "Välitetty ja salattu yhteys"), - ("Direct and unencrypted connection", "Suora ja salaamaton yhteys"), - ("Relayed and unencrypted connection", "Välitetty ja salaamaton yhteys"), - ("Enter Remote ID", "Anna ID"), - ("Enter your password", "Syötä salasanasi"), - ("Logging in...", "Kirjaudutaan sisään..."), - ("Enable RDP session sharing", "Salli RDP istunnon jakaminen"), - ("Auto Login", "Automaattinen kirjautuminen"), - ("Enable direct IP access", "Salli suora IP yhteys"), - ("Rename", "Nimeä uudelleen"), - ("Space", "Välilyönti"), - ("Create desktop shortcut", "Luo työpöydän pikakuvake"), - ("Change Path", "Vaihda polku"), - ("Create Folder", "Luo kansio"), - ("Please enter the folder name", "Anna kansion nimi"), - ("Fix it", "Korjaa"), - ("Warning", "Varoitus"), - ("Login screen using Wayland is not supported", "Kirjautumisnäyttö Waylandilla ei ole tuettu"), - ("Reboot required", "Uudelleenkäynnistys vaaditaan"), - ("Unsupported display server", "Näyttöpalvelin ei ole tuettu"), - ("x11 expected", "X11 odotettu"), - ("Port", "Portti"), - ("Settings", "Asetukset"), - ("Username", "Käyttäjänimi"), - ("Invalid port", "Virheellinen portti"), - ("Closed manually by the peer", "Suljettu vastapuolen toimesta"), - ("Enable remote configuration modification", "Salli etäasetusten muokkaus"), - ("Run without install", "Suorita ilman asennusta"), - ("Connect via relay", "Yhdistä välityspalvelimen kautta"), - ("Always connect via relay", "Yhdistä aina välityspalvelimen kautta"), - ("whitelist_tip", "Vain sallitut IP osoitteet voivat muodostaa yhteyden"), - ("Login", "Kirjaudu sisään"), - ("Verify", "Vahvista"), - ("Remember me", "Muista minut"), - ("Trust this device", "Luota tähän laitteeseen"), - ("Verification code", "Vahvistuskoodi"), - ("verification_tip", "Vahvistuskoodi on lähetetty rekisteröityyn sähköpostiosoitteeseen. Syötä koodi jatkaaksesi kirjautumista."), - ("Logout", "Kirjaudu ulos"), - ("Tags", "Tunnisteet"), - ("Search ID", "Hae ID"), - ("whitelist_sep", "Valkoisen listan erotin"), - ("Add ID", "Lisää ID"), - ("Add Tag", "Lisää tunniste"), - ("Unselect all tags", "Poista kaikki tunnistevalinnat"), - ("Network error", "Verkkovirhe"), - ("Username missed", "Käyttäjänimi puuttuu"), - ("Password missed", "Salasana puuttuu"), - ("Wrong credentials", "Virheelliset kirjautumistiedot"), - ("The verification code is incorrect or has expired", "Vahvistuskoodi on virheellinen tai vanhentunut"), - ("Edit Tag", "Muokkaa tunnistetta"), - ("Forget Password", "Unohditko salasanasi"), - ("Favorites", "Suosikit"), - ("Add to Favorites", "Lisää suosikkeihin"), - ("Remove from Favorites", "Poista suosikeista"), - ("Empty", "Tyhjä"), - ("Invalid folder name", "Virheellinen kansion nimi"), - ("Socks5 Proxy", "Socks5 välityspalvelin"), - ("Socks5/Http(s) Proxy", "Socks5/HTTP(s)-välityspalvelin"), - ("Discovered", "Löydetty"), - ("install_daemon_tip", "Palvelun automaattista käynnistystä varten RustDesk daemon on asennettava järjestelmään."), - ("Remote ID", "Etätunnus"), - ("Paste", "Liitä"), - ("Paste here?", "Liitä tähän?"), - ("Are you sure to close the connection?", "Haluatko varmasti katkaista yhteyden?"), - ("Download new version", "Lataa uusi versio"), - ("Touch mode", "Kosketustila"), - ("Mouse mode", "Hiiritila"), - ("One-Finger Tap", "Yksi sormipainallus"), - ("Left Mouse", "Vasen hiiren painike"), - ("One-Long Tap", "Pitkä painallus yhdellä sormella"), - ("Two-Finger Tap", "Kahden sormen napautus"), - ("Right Mouse", "Oikea hiiren painike"), - ("One-Finger Move", "Yhden sormen liike"), - ("Double Tap & Move", "Kaksoisnapautus ja liike"), - ("Mouse Drag", "Vedä hiirellä"), - ("Three-Finger vertically", "Kolmen sormen pystysuora liike"), - ("Mouse Wheel", "Hiiren rulla"), - ("Two-Finger Move", "Kahden sormen liike"), - ("Canvas Move", "Siirrä näkymää"), - ("Pinch to Zoom", "Lähennä tai loitonna"), - ("Canvas Zoom", "Suurennus"), - ("Reset canvas", "Palauta näkymä"), - ("No permission of file transfer", "Ei oikeutta tiedostonsiirtoon"), - ("Note", "Huomautus"), - ("Connection", "Yhteys"), - ("Share screen", "Jaa näyttö"), - ("Chat", "Keskustelu"), - ("Total", "Yhteensä"), - ("items", "kohdetta"), - ("Selected", "Valittu"), - ("Screen Capture", "Näytön kaappaus"), - ("Input Control", "Tulon hallinta"), - ("Audio Capture", "Äänen tallennus"), - ("Do you accept?", "Hyväksytkö?"), - ("Open System Setting", "Avaa järjestelmäasetukset"), - ("How to get Android input permission?", "Kuinka myöntää Androidin oikeudet?"), - ("android_input_permission_tip1", "Siirry Androidin asetuksiin ja ota RustDeskille käyttöön 'Syötteen ohjaus' oikeus."), - ("android_input_permission_tip2", "Jos et löydä asetusta, etsi 'Esteettömyys' ja salli RustDesk ohjelman käyttö."), - ("android_new_connection_tip", "Uusi yhteyspyyntö vastaanotettu."), - ("android_service_will_start_tip", "RustDesk palvelu käynnistyy taustalla."), - ("android_stop_service_tip", "Pysäytä taustapalvelu tarvittaessa RustDeskin asetuksista."), - ("android_version_audio_tip", "Äänensiirto vaatii Android 10:n tai uudemman."), - ("android_start_service_tip", "RustDesk palvelu käynnistetään..."), - ("android_permission_may_not_change_tip", "Oikeudet eivät ehkä päivity heti. Käynnistä sovellus uudelleen, jos muutokset eivät tule voimaan."), - ("Account", "Tili"), - ("Overwrite", "Korvaa"), - ("This file exists, skip or overwrite this file?", "Tämä tiedosto on jo olemassa, ohitetaanko vai korvataanko se?"), - ("Quit", "Poistu"), - ("Help", "Ohje"), - ("Failed", "Epäonnistui"), - ("Succeeded", "Onnistui"), - ("Someone turns on privacy mode, exit", "Yksityisyystila otettu käyttöön, poistutaan"), - ("Unsupported", "Ei tuettu"), - ("Peer denied", "Vastapuoli hylkäsi pyynnön"), - ("Please install plugins", "Asenna tarvittavat lisäosat"), - ("Peer exit", "Vastapuoli sulki yhteyden"), - ("Failed to turn off", "Sammutus epäonnistui"), - ("Turned off", "Sammutettu"), - ("Language", "Kieli"), - ("Keep RustDesk background service", "Pidä RustDeskin taustapalvelu käynnissä"), - ("Ignore Battery Optimizations", "Ohita akun optimoinnit"), - ("android_open_battery_optimizations_tip", "Poista RustDeskin akkuoptimointi, jotta yhteys pysyy vakaana taustalla."), - ("Start on boot", "Käynnistä automaattisesti laitteen käynnistyessä"), - ("Start the screen sharing service on boot, requires special permissions", "Käynnistä näytönjakopalvelu laitteen käynnistyessä (vaatii erityisoikeudet)"), - ("Connection not allowed", "Yhteyttä ei sallita"), - ("Legacy mode", "Perinteinen tila"), - ("Map mode", "Karttatila"), - ("Translate mode", "Käännöstila"), - ("Use permanent password", "Käytä pysyvää salasanaa"), - ("Use both passwords", "Käytä molempia salasanoja"), - ("Set permanent password", "Aseta pysyvä salasana"), - ("Enable remote restart", "Salli etäuudelleenkäynnistys"), - ("Restart remote device", "Käynnistä etälaite uudelleen"), - ("Are you sure you want to restart", "Haluatko varmasti käynnistää laitteen uudelleen?"), - ("Restarting remote device", "Etälaitetta käynnistetään uudelleen"), - ("remote_restarting_tip", "Odota, kunnes etälaite käynnistyy uudelleen ja muodostaa yhteyden."), - ("Copied", "Kopioitu"), - ("Exit Fullscreen", "Poistu koko näytöstä"), - ("Fullscreen", "Koko näyttö"), - ("Mobile Actions", "Puhelin toiminnot"), - ("Select Monitor", "Valitse näyttö"), - ("Control Actions", "Ohjaustoiminnot"), - ("Display Settings", "Näyttöasetukset"), - ("Ratio", "Suhde"), - ("Image Quality", "Kuvanlaatu"), - ("Scroll Style", "Vieritystyyli"), - ("Show Toolbar", "Näytä työkalupalkki"), - ("Hide Toolbar", "Piilota työkalupalkki"), - ("Direct Connection", "Suora yhteys"), - ("Relay Connection", "Välitetty yhteys"), - ("Secure Connection", "Suojattu yhteys"), - ("Insecure Connection", "Suojaamaton yhteys"), - ("Scale original", "Skaalaa alkuperäinen"), - ("Scale adaptive", "Mukautuva skaalaus"), - ("General", "Yleiset"), - ("Security", "Turvallisuus"), - ("Theme", "Teema"), - ("Dark Theme", "Tumma teema"), - ("Light Theme", "Vaalea teema"), - ("Dark", "Tumma"), - ("Light", "Vaalea"), - ("Follow System", "Seuraa järjestelmän teemaa"), - ("Enable hardware codec", "Käytä laitteistokoodausta"), - ("Unlock Security Settings", "Avaa suojausasetukset"), - ("Enable audio", "Ota ääni käyttöön"), - ("Unlock Network Settings", "Avaa verkkoasetukset"), - ("Server", "Palvelin"), - ("Direct IP Access", "Suora IP yhteys"), - ("Proxy", "Välityspalvelin"), - ("Apply", "Käytä"), - ("Disconnect all devices?", "Katkaistaanko yhteys kaikkiin laitteisiin?"), - ("Clear", "Tyhjennä"), - ("Audio Input Device", "Äänitulolaite"), - ("Use IP Whitelisting", "Käytä IP sallitut listaa"), - ("Network", "Verkko"), - ("Pin Toolbar", "Kiinnitä työkalupalkki"), - ("Unpin Toolbar", "Irrota työkalupalkki"), - ("Recording", "Tallennus"), - ("Directory", "Hakemisto"), - ("Automatically record incoming sessions", "Tallenna saapuvat istunnot automaattisesti"), - ("Automatically record outgoing sessions", "Tallenna lähtevät istunnot automaattisesti"), - ("Change", "Vaihda"), - ("Start session recording", "Aloita istunnon tallennus"), - ("Stop session recording", "Lopeta istunnon tallennus"), - ("Enable recording session", "Ota istunnon tallennus käyttöön"), - ("Enable LAN discovery", "Ota LAN havaitseminen käyttöön"), - ("Deny LAN discovery", "Estä LAN havaitseminen"), - ("Write a message", "Kirjoita viesti"), - ("Prompt", "Kehote"), - ("Please wait for confirmation of UAC...", "Odota UAC hyväksyntää..."), - ("elevated_foreground_window_tip", "Käyttäjävalvontaikkuna on etualalla, hyväksy pyyntö etäkäytön jatkamiseksi."), - ("Disconnected", "Yhteys katkaistu"), - ("Other", "Muu"), - ("Confirm before closing multiple tabs", "Vahvista ennen useiden välilehtien sulkemista"), - ("Keyboard Settings", "Näppäimistöasetukset"), - ("Full Access", "Täysi käyttöoikeus"), - ("Screen Share", "Näytönjako"), - ("ubuntu-21-04-required", "Wayland vaatii Ubuntu 21.04:n tai uudemman version."), - ("wayland-requires-higher-linux-version", "Wayland vaatii uudemman Linux jakelun version. Kokeile X11 työpöytää tai vaihda käyttöjärjestelmää."), - ("xdp-portal-unavailable", ""), - ("JumpLink", "Pikalinkki"), - ("Please Select the screen to be shared(Operate on the peer side).", "Valitse jaettava näyttö (toiminto etäpäässä)."), - ("Show RustDesk", "Näytä RustDesk"), - ("This PC", "Tämä tietokone"), - ("or", "tai"), - ("Elevate", "Korota oikeudet"), - ("Zoom cursor", "Suurennusosoitin"), - ("Accept sessions via password", "Hyväksy istunnot salasanalla"), - ("Accept sessions via click", "Hyväksy istunnot napsauttamalla"), - ("Accept sessions via both", "Hyväksy istunnot kummallakin tavalla"), - ("Please wait for the remote side to accept your session request...", "Odota, että etäpää hyväksyy istuntopyyntösi..."), - ("One-time Password", "Kertakäyttösalasana"), - ("Use one-time password", "Käytä kertakäyttösalasanaa"), - ("One-time password length", "Kertakäyttösalasanan pituus"), - ("Request access to your device", "Pyydä pääsyä laitteeseesi"), - ("Hide connection management window", "Piilota yhteydenhallintaikkuna"), - ("hide_cm_tip", "Yhteydenhallintaikkuna voidaan piilottaa, jotta etäistunto ei keskeydy."), - ("wayland_experiment_tip", "Wayland tuki on kokeellinen ja saattaa aiheuttaa yhteysongelmia."), - ("Right click to select tabs", "Valitse välilehti hiiren oikealla painikkeella"), - ("Skipped", "Ohitettu"), - ("Add to address book", "Lisää osoitekirjaan"), - ("Group", "Ryhmä"), - ("Search", "Haku"), - ("Closed manually by web console", "Suljettu manuaalisesti verkkokonsolista"), - ("Local keyboard type", "Paikallinen näppäimistötyyppi"), - ("Select local keyboard type", "Valitse paikallinen näppäimistötyyppi"), - ("software_render_tip", "Jos laitteistokiihdytys ei toimi oikein, voit käyttää ohjelmistopohjaista renderöintiä."), - ("Always use software rendering", "Käytä aina ohjelmistopohjaista renderöintiä"), - ("config_input", "Syöteasetukset"), - ("config_microphone", "Mikrofoni"), - ("request_elevation_tip", "Etätoiminto vaatii järjestelmänvalvojan oikeudet."), - ("Wait", "Odota"), - ("Elevation Error", "Oikeuksien korotus epäonnistui"), - ("Ask the remote user for authentication", "Pyydä etäkäyttäjää vahvistamaan oikeudet"), - ("Choose this if the remote account is administrator", "Valitse tämä, jos etätili on järjestelmänvalvoja"), - ("Transmit the username and password of administrator", "Lähetä järjestelmänvalvojan käyttäjätunnus ja salasana"), - ("still_click_uac_tip", "Etäkäyttäjän on edelleen hyväksyttävä UAC kehote omalla koneellaan."), - ("Request Elevation", "Pyydä oikeuksien korotusta"), - ("wait_accept_uac_tip", "Odota, että etäkäyttäjä hyväksyy UAC pyynnön..."), - ("Elevate successfully", "Oikeuksien korotus onnistui"), - ("uppercase", "iso kirjain"), - ("lowercase", "pieni kirjain"), - ("digit", "numero"), - ("special character", "erikoismerkki"), - ("length>=8", "vähintään 8 merkkiä"), - ("Weak", "Heikko"), - ("Medium", "Keskitaso"), - ("Strong", "Vahva"), - ("Switch Sides", "Vaihda puolia"), - ("Please confirm if you want to share your desktop?", "Haluatko varmasti jakaa työpöytäsi?"), - ("Display", "Näyttö"), - ("Default View Style", "Oletusnäkymän tyyli"), - ("Default Scroll Style", "Oletusvieritys tyyli"), - ("Default Image Quality", "Oletuskuvanlaatu"), - ("Default Codec", "Oletuskoodekki"), - ("Bitrate", "Bittinopeus"), - ("FPS", "Kuvataajuus (FPS)"), - ("Auto", "Automaattinen"), - ("Other Default Options", "Muut oletusasetukset"), - ("Voice call", "Äänipuhelu"), - ("Text chat", "Tekstikeskustelu"), - ("Stop voice call", "Lopeta äänipuhelu"), - ("relay_hint_tip", "Jos suora yhteys ei toimi, käytetään automaattisesti välityspalvelinta."), - ("Reconnect", "Yhdistä uudelleen"), - ("Codec", "Koodekki"), - ("Resolution", "Resoluutio"), - ("No transfers in progress", "Ei käynnissä olevia siirtoja"), - ("Set one-time password length", "Aseta kertakäyttösalasanan pituus"), - ("RDP Settings", "RDP asetukset"), - ("Sort by", "Järjestä"), - ("New Connection", "Uusi yhteys"), - ("Restore", "Palauta"), - ("Minimize", "Pienennä"), - ("Maximize", "Suurenna"), - ("Your Device", "Sinun laitteesi"), - ("empty_recent_tip", "Ei äskettäisiä istuntoja"), - ("empty_favorite_tip", "Ei suosikkeja"), - ("empty_lan_tip", "LAN laitteita ei löytynyt"), - ("empty_address_book_tip", "Osoitekirja on tyhjä"), - ("Empty Username", "Tyhjä käyttäjänimi"), - ("Empty Password", "Tyhjä salasana"), - ("Me", "Minä"), - ("identical_file_tip", "Saman niminen tiedosto on jo olemassa"), - ("show_monitors_tip", "Näytä kaikki käytettävissä olevat näytöt"), - ("View Mode", "Näkymätila"), - ("login_linux_tip", "Kirjaudu sisään Linux käyttäjätunnuksellasi"), - ("verify_rustdesk_password_tip", "Vahvista RustDesk salasanasi kirjautumista varten"), - ("remember_account_tip", "Muista tilini kirjautumista varten"), - ("os_account_desk_tip", "Käytä käyttöjärjestelmän käyttäjätiliä kirjautumiseen"), - ("OS Account", "Käyttöjärjestelmän tili"), - ("another_user_login_title_tip", "Toinen käyttäjä on kirjautunut sisään"), - ("another_user_login_text_tip", "Etäistunto keskeytetään, koska toinen käyttäjä on ottanut hallinnan."), - ("xorg_not_found_title_tip", "Xorg ei löydy"), - ("xorg_not_found_text_tip", "X11 palvelinta ei löydetty. Vaihda Xorg ympäristöön jatkaaksesi."), - ("no_desktop_title_tip", "Työpöytää ei havaittu"), - ("no_desktop_text_tip", "Työpöytäympäristöä ei löydy. Asenna esimerkiksi GNOME tai XFCE."), - ("No need to elevate", "Oikeuksien korotusta ei tarvita"), - ("System Sound", "Järjestelmän ääni"), - ("Default", "Oletus"), - ("New RDP", "Uusi RDP yhteys"), - ("Fingerprint", "Sormenjälki"), - ("Copy Fingerprint", "Kopioi sormenjälki"), - ("no fingerprints", "Ei sormenjälkiä"), - ("Select a peer", "Valitse vastapää"), - ("Select peers", "Valitse useita vastapään laitteita"), - ("Plugins", "Laajennukset"), - ("Uninstall", "Poista asennus"), - ("Update", "Päivitä"), - ("Enable", "Ota käyttöön"), - ("Disable", "Poista käytöstä"), - ("Options", "Asetukset"), - ("resolution_original_tip", "Näytä alkuperäisessä resoluutiossa ilman skaalausta"), - ("resolution_fit_local_tip", "Sovita etänäyttö paikalliseen näkymään"), - ("resolution_custom_tip", "Käytä mukautettua resoluutiota"), - ("Collapse toolbar", "Tiivistä työkalupalkki"), - ("Accept and Elevate", "Hyväksy ja korota oikeudet"), - ("accept_and_elevate_btn_tooltip", "Hyväksy ja korota oikeudet järjestelmänvalvojaksi"), - ("clipboard_wait_response_timeout_tip", "Leikepöydän pyyntö aikakatkaistiin – ei vastausta etäpäästä."), - ("Incoming connection", "Saapuva yhteys"), - ("Outgoing connection", "Lähtevä yhteys"), - ("Exit", "Poistu"), - ("Open", "Avaa"), - ("logout_tip", "Haluatko varmasti kirjautua ulos?"), - ("Service", "Palvelu"), - ("Start", "Käynnistä"), - ("Stop", "Pysäytä"), - ("exceed_max_devices", "Olet saavuttanut hallittavien laitteiden enimmäismäärän."), - ("Sync with recent sessions", "Synkronoi viimeisimpiin istuntoihin"), - ("Sort tags", "Järjestä tunnisteet"), - ("Open connection in new tab", "Avaa yhteys uuteen välilehteen"), - ("Move tab to new window", "Siirrä välilehti uuteen ikkunaan"), - ("Can not be empty", "Ei voi olla tyhjä"), - ("Already exists", "On jo olemassa"), - ("Change Password", "Vaihda salasana"), - ("Refresh Password", "Päivitä salasana"), - ("ID", "Tunnus"), - ("Grid View", "Ruudukkonäkymä"), - ("List View", "Luettelonäkymä"), - ("Select", "Valitse"), - ("Toggle Tags", "Näytä/piilota tunnisteet"), - ("pull_ab_failed_tip", "Osoitekirjan lataus epäonnistui palvelimelta."), - ("push_ab_failed_tip", "Osoitekirjan lähetys palvelimelle epäonnistui."), - ("synced_peer_readded_tip", "Synkronoitu laite lisättiin uudelleen."), - ("Change Color", "Vaihda väri"), - ("Primary Color", "Pääväri"), - ("HSV Color", "HSV väriarvot"), - ("Installation Successful!", "Asennus onnistui!"), - ("Installation failed!", "Asennus epäonnistui!"), - ("Reverse mouse wheel", "Käänteinen hiiren rullaussuunta"), - ("{} sessions", "{} istuntoa"), - ("scam_title", "Huijausvaroitus"), - ("scam_text1", "Älä anna tuntemattomille henkilöille pääsyä tietokoneeseesi."), - ("scam_text2", "RustDesk ei koskaan pyydä maksua tai etäkäyttöä ilman lupaasi."), - ("Don't show again", "Älä näytä uudelleen"), - ("I Agree", "Hyväksyn"), - ("Decline", "Hylkää"), - ("Timeout in minutes", "Aikakatkaisu minuuteissa"), - ("auto_disconnect_option_tip", "Katkaise yhteys automaattisesti, jos ei aktiivisuutta määräaikaan mennessä."), - ("Connection failed due to inactivity", "Yhteys epäonnistui toimettomuuden vuoksi"), - ("Check for software update on startup", "Tarkista ohjelmistopäivitykset käynnistyksen yhteydessä"), - ("upgrade_rustdesk_server_pro_to_{}_tip", "Päivitä RustDesk Server Pro versioon {} jatkaaksesi."), - ("pull_group_failed_tip", "Ryhmäasetusten nouto epäonnistui."), - ("Filter by intersection", "Suodata leikkausten perusteella"), - ("Remove wallpaper during incoming sessions", "Poista taustakuva saapuvien istuntojen ajaksi"), - ("Test", "Testaa"), - ("display_is_plugged_out_msg", "Näyttö on irrotettu"), - ("No displays", "Ei näyttöjä"), - ("Open in new window", "Avaa uudessa ikkunassa"), - ("Show displays as individual windows", "Näytä näytöt erillisinä ikkunoina"), - ("Use all my displays for the remote session", "Käytä kaikkia näyttöjä etäistunnossa"), - ("selinux_tip", "SELinux saattaa estää etäyhteyden toiminnan. Tarkista asetukset."), - ("Change view", "Vaihda näkymä"), - ("Big tiles", "Suuret ruudut"), - ("Small tiles", "Pienet ruudut"), - ("List", "Lista"), - ("Virtual display", "Virtuaalinäyttö"), - ("Plug out all", "Irrota kaikki"), - ("True color (4:4:4)", "Tarkka väri (4:4:4)"), - ("Enable blocking user input", "Estä käyttäjän syöte etäpäässä"), - ("id_input_tip", "Anna etätunnus muodossa tunnus@palvelin"), - ("privacy_mode_impl_mag_tip", "Yksityisyystila käyttää suurennustekniikkaa piilottaakseen sisällön."), - ("privacy_mode_impl_virtual_display_tip", "Yksityisyystila käyttää virtuaalinäyttöä tietosuojan takaamiseksi."), - ("Enter privacy mode", "Siirry yksityisyystilaan"), - ("Exit privacy mode", "Poistu yksityisyystilasta"), - ("idd_not_support_under_win10_2004_tip", "Virtuaalinäyttöä ei tueta Windows 10 2004 versiota vanhemmissa järjestelmissä."), - ("input_source_1_tip", "Valitse syöte 1: fyysinen näppäimistö tai hiiri"), - ("input_source_2_tip", "Valitse syöte 2: virtuaalinen syöte"), - ("Swap control-command key", "Vaihda Ctrl ja Command näppäinten paikkaa"), - ("swap-left-right-mouse", "Vaihda hiiren vasen ja oikea painike"), - ("2FA code", "2FA koodi"), - ("More", "Lisää"), - ("enable-2fa-title", "Ota kaksivaiheinen todennus käyttöön"), - ("enable-2fa-desc", "Lisää turvallisuutta vahvistamalla kirjautumisesi 2FA koodilla."), - ("wrong-2fa-code", "Väärä 2FA koodi"), - ("enter-2fa-title", "Syötä 2FA koodi"), - ("Email verification code must be 6 characters.", "Sähköpostivarmennuskoodin on oltava 6 merkkiä pitkä."), - ("2FA code must be 6 digits.", "2FA koodin on oltava 6 numeroa."), - ("Multiple Windows sessions found", "Useita Windows istuntoja havaittu"), - ("Please select the session you want to connect to", "Valitse istunto, johon haluat muodostaa yhteyden"), - ("powered_by_me", "Ylpeästi kehitetty omavaraisesti"), - ("outgoing_only_desk_tip", "Tämä asennus tukee vain lähteviä yhteyksiä."), - ("preset_password_warning", "Esiasetettu salasana voi olla turvaton — vaihda se suojataksesi yhteytesi."), - ("Security Alert", "Turvailmoitus"), - ("My address book", "Oma osoitekirja"), - ("Personal", "Henkilökohtainen"), - ("Owner", "Omistaja"), - ("Set shared password", "Aseta jaettu salasana"), - ("Exist in", "Sisältyy kohteeseen"), - ("Read-only", "Vain luku"), - ("Read/Write", "Luku ja kirjoitus"), - ("Full Control", "Täysi hallinta"), - ("share_warning_tip", "Jakaminen antaa muille pääsyn laitteeseesi. Varmista, että luotat käyttäjään."), - ("Everyone", "Kaikki"), - ("ab_web_console_tip", "Osoitekirjaa voidaan hallita myös verkkokonsolin kautta."), - ("allow-only-conn-window-open-tip", "Salli vain yksi yhteyshallintaikkuna kerrallaan."), - ("no_need_privacy_mode_no_physical_displays_tip", "Yksityisyystilaa ei tarvita, koska fyysisiä näyttöjä ei ole."), - ("Follow remote cursor", "Seuraa etäosoitinta"), - ("Follow remote window focus", "Seuraa etäikkunan kohdistusta"), - ("default_proxy_tip", "Käytetään oletusarvoista välityspalvelinta, ellei muuta määritetty."), - ("no_audio_input_device_tip", "Äänitulolaitetta ei löydy."), - ("Incoming", "Saapuva"), - ("Outgoing", "Lähtevä"), - ("Clear Wayland screen selection", "Tyhjennä Wayland näyttövalinta"), - ("clear_Wayland_screen_selection_tip", "Tyhjentää nykyisen Wayland näytön valinnan."), - ("confirm_clear_Wayland_screen_selection_tip", "Haluatko varmasti tyhjentää Wayland näyttövalinnan?"), - ("android_new_voice_call_tip", "Uusi äänipuhelu aloitettu"), - ("texture_render_tip", "Käytä tekstuuripohjaista renderöintiä paremman suorituskyvyn saavuttamiseksi."), - ("Use texture rendering", "Käytä tekstuurirenderöintiä"), - ("Floating window", "Kelluva ikkuna"), - ("floating_window_tip", "Kelluva ikkuna pysyy muiden sovellusten päällä etäistunnon aikana."), - ("Keep screen on", "Pidä näyttö päällä"), - ("Never", "Ei koskaan"), - ("During controlled", "Kun etäohjattuna"), - ("During service is on", "Kun palvelu on käynnissä"), - ("Capture screen using DirectX", "Kaappaa näyttö käyttämällä DirectX"), - ("Back", "Takaisin"), - ("Apps", "Sovellukset"), - ("Volume up", "Lisää äänenvoimakkuutta"), - ("Volume down", "Vähennä äänenvoimakkuutta"), - ("Power", "Virta"), - ("Telegram bot", "Telegram-botti"), - ("enable-bot-tip", "Ota Telegram botti käyttöön etähallintaa varten."), - ("enable-bot-desc", "Mahdollistaa ilmoitukset ja etätoiminnot Telegramin kautta."), - ("cancel-2fa-confirm-tip", "Haluatko varmasti poistaa kaksivaiheisen todennuksen käytöstä?"), - ("cancel-bot-confirm-tip", "Haluatko varmasti poistaa Telegram-botin käytöstä?"), - ("About RustDesk", "Tietoa RustDeskistä"), - ("Send clipboard keystrokes", "Lähetä leikepöydän näppäinsyötteet"), - ("network_error_tip", "Verkkovirhe – tarkista yhteys ja yritä uudelleen."), - ("Unlock with PIN", "Avaa PIN-koodilla"), - ("Requires at least {} characters", "Vaatii vähintään {} merkkiä"), - ("Wrong PIN", "Väärä PIN-koodi"), - ("Set PIN", "Aseta PIN-koodi"), - ("Enable trusted devices", "Ota luotetut laitteet käyttöön"), - ("Manage trusted devices", "Hallitse luotettuja laitteita"), - ("Platform", "Alusta"), - ("Days remaining", "Päiviä jäljellä"), - ("enable-trusted-devices-tip", "Vain luotetut laitteet voivat muodostaa yhteyden ilman lisävahvistusta."), - ("Parent directory", "Ylähakemisto"), - ("Resume", "Jatka"), - ("Invalid file name", "Virheellinen tiedostonimi"), - ("one-way-file-transfer-tip", "Tiedostonsiirto on yksisuuntainen – vain lähetys tai vastaanotto."), - ("Authentication Required", "Tunnistautuminen vaaditaan"), - ("Authenticate", "Tunnistaudu"), - ("web_id_input_tip", "Anna etätunnus verkkoliittymässä muodossa tunnus@palvelin"), - ("Download", "Lataa"), - ("Upload folder", "Lataa kansio"), - ("Upload files", "Lataa tiedostoja"), - ("Clipboard is synchronized", "Leikepöytä on synkronoitu"), - ("Update client clipboard", "Päivitä asiakkaan leikepöytä"), - ("Untagged", "Tunnisteeton"), - ("new-version-of-{}-tip", "Uusi versio sovelluksesta {} on saatavilla"), - ("Accessible devices", "Käytettävissä olevat laitteet"), - ("upgrade_remote_rustdesk_client_to_{}_tip", "Päivitä etä-RustDesk-asiakasversioon {} yhteensopivuuden takaamiseksi"), - ("d3d_render_tip", "Käytä Direct3D-renderöintiä paremman suorituskyvyn saavuttamiseksi"), - ("Use D3D rendering", "Käytä D3D-renderöintiä"), - ("Printer", "Tulostin"), - ("printer-os-requirement-tip", "Tulostustoiminto vaatii yhteensopivan käyttöjärjestelmän"), - ("printer-requires-installed-{}-client-tip", "Tulostus vaatii, että {} asiakas on asennettu"), - ("printer-{}-not-installed-tip", "{} tulostinta ei ole asennettu"), - ("printer-{}-ready-tip", "{}-tulostin on valmis"), - ("Install {} Printer", "Asenna {} tulostin"), - ("Outgoing Print Jobs", "Lähtevät tulostustyöt"), - ("Incoming Print Jobs", "Saapuvat tulostustyöt"), - ("Incoming Print Job", "Saapuva tulostustyö"), - ("use-the-default-printer-tip", "Käytä oletustulostinta"), - ("use-the-selected-printer-tip", "Käytä valittua tulostinta"), - ("auto-print-tip", "Tulosta saapuvat työt automaattisesti"), - ("print-incoming-job-confirm-tip", "Hyväksytäänkö saapuvan tulostustyön tulostus?"), - ("remote-printing-disallowed-tile-tip", "Etätulostus estetty"), - ("remote-printing-disallowed-text-tip", "Etätulostus ei ole sallittu tässä laitteessa tai yhteydessä."), - ("save-settings-tip", "Tallenna asetukset"), - ("dont-show-again-tip", "Älä näytä uudelleen"), - ("Take screenshot", "Ota kuvakaappaus"), - ("Taking screenshot", "Otetaan kuvakaappausta"), - ("screenshot-merged-screen-not-supported-tip", "Yhdistetyn näytön kuvakaappaus ei ole tuettu"), - ("screenshot-action-tip", "Valitse, mitä haluat tehdä kuvakaappaukselle"), - ("Save as", "Tallenna nimellä"), - ("Copy to clipboard", "Kopioi leikepöydälle"), - ("Enable remote printer", "Ota etätulostin käyttöön"), - ("Downloading {}", "Ladataan {}"), - ("{} Update", "{} päivitys"), - ("{}-to-update-tip", "Päivitä sovellus {} jatkaaksesi"), - ("download-new-version-failed-tip", "Uuden version lataus epäonnistui"), - ("Auto update", "Automaattinen päivitys"), - ("update-failed-check-msi-tip", "Päivitys epäonnistui – tarkista MSI asennuspaketti"), - ("websocket_tip", "Käytä WebSocket protokollaa yhteyden muodostamiseen"), - ("Use WebSocket", "Käytä WebSocketia"), - ("Trackpad speed", "Kosketuslevyn nopeus"), - ("Default trackpad speed", "Oletusnopeus kosketuslevylle"), - ("Numeric one-time password", "Numeerinen kertakäyttösalasana"), - ("Enable IPv6 P2P connection", "Ota IPv6 P2P yhteys käyttöön"), - ("Enable UDP hole punching", "Ota käyttöön UDP hole punching tekniikka"), - ("View camera", "Näytä kamera"), - ("Enable camera", "Ota kamera käyttöön"), - ("No cameras", "Ei kameroita"), - ("view_camera_unsupported_tip", "Kameranäkymä ei ole tuettu tällä alustalla"), - ("Terminal", "Pääte"), - ("Enable terminal", "Ota pääte käyttöön"), - ("New tab", "Uusi välilehti"), - ("Keep terminal sessions on disconnect", "Säilytä pääteistunnot yhteyden katketessa"), - ("Terminal (Run as administrator)", "Pääte (Suorita järjestelmänvalvojana)"), - ("terminal-admin-login-tip", "Kirjaudu järjestelmänvalvojana käyttääksesi tätä päätettä"), - ("Failed to get user token.", "Käyttäjätunnuksen hakeminen epäonnistui."), - ("Incorrect username or password.", "Virheellinen käyttäjätunnus tai salasana."), - ("The user is not an administrator.", "Käyttäjä ei ole järjestelmänvalvoja."), - ("Failed to check if the user is an administrator.", "Järjestelmänvalvojan tarkistus epäonnistui."), - ("Supported only in the installed version.", "Tuettu vain asennetussa versiossa."), - ("elevation_username_tip", "Anna järjestelmänvalvojan käyttäjätunnus oikeuksien korotusta varten"), - ("Preparing for installation ...", "Valmistellaan asennusta..."), - ("Show my cursor", "Näytä osoittimeni"), - ("Scale custom", "Mukautettu skaalaus"), - ("Custom scale slider", "Mukautetun skaalauksen liukusäädin"), - ("Decrease", "Pienennä"), - ("Increase", "Suurenna"), - ("Show virtual mouse", "Näytä virtuaalinen hiiri"), - ("Virtual mouse size", "Virtuaalihiiren koko"), - ("Small", "Pieni"), - ("Large", "Suuri"), - ("Show virtual joystick", "Näytä virtuaalinen ohjain"), - ("Edit note", "Muokkaa muistiinpanoa"), - ("Alias", "Alias"), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Jatka käyttäen {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), - ].iter().cloned().collect(); -} diff --git a/src/lang/fr.rs b/src/lang/fr.rs index f21d9b0df..5e1266fd8 100644 --- a/src/lang/fr.rs +++ b/src/lang/fr.rs @@ -106,7 +106,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Are you sure you want to delete this empty directory?", "Voulez-vous vraiment supprimer ce répertoire vide ?"), ("Are you sure you want to delete the file of this directory?", "Voulez-vous vraiment supprimer le fichier de ce répertoire ?"), ("Do this for all conflicts", "Appliquer à tous les conflits"), - ("This is irreversible!", "Cette action est irréversible !"), + ("This is irreversible!", "Ceci est irréversible !"), ("Deleting", "Suppression"), ("files", "fichiers"), ("Waiting", "En attente"), @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Mot de passe du système d’exploitation"), ("install_tip", "RustDesk n’est pas installé, ce qui peut limiter son utilisation à cause de l’UAC. Cliquez ci-dessous pour l’installer."), ("Click to upgrade", "Mettre à niveau"), + ("Click to download", "Télécharger"), + ("Click to update", "Mettre à jour"), ("Configure", "Configurer"), ("config_acc", "L’autorisation « Accessibilité » est requise pour contrôler votre bureau à distance."), ("config_screen", "L’autorisation « Enregistrement d’écran » est requise pour accéder à votre bureau à distance."), @@ -313,7 +315,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Set permanent password", "Définir le mot de passe permanent"), ("Enable remote restart", "Activer le redémarrage à distance"), ("Restart remote device", "Redémarrer l’appareil distant"), - ("Are you sure you want to restart", "Voulez-vous vraiment redémarrer"), + ("Are you sure you want to restart", "Voulez-vous vraiment redémarrer l’appareil ?"), ("Restarting remote device", "Redémarrage de l’appareil distant"), ("remote_restarting_tip", "L'appareil distant redémarre ; veuillez fermer cette boîte de dialogue et vous reconnecter en utilisant le mot de passe permanent dans quelques instants"), ("Copied", "Copié"), @@ -332,8 +334,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Relay Connection", "Connexion via relais"), ("Secure Connection", "Connexion sécurisée"), ("Insecure Connection", "Connexion non sécurisée"), - ("Scale original", "Échelle originale"), - ("Scale adaptive", "Échelle adaptative"), + ("Scale original", "Échelle 100 %"), + ("Scale adaptive", "Mise à l’échelle auto"), ("General", "Général"), ("Security", "Sécurité"), ("Theme", "Thème"), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Paramètres du clavier"), ("Full Access", "Accès total"), ("Screen Share", "Partage d’écran"), - ("ubuntu-21-04-required", "Wayland nécessite Ubuntu 21.04 ou une version ultérieure."), - ("wayland-requires-higher-linux-version", "Wayland nécessite une version ultérieure de votre distribution Linux. Veuillez essayer le bureau X11 ou changer de système d’exploitation."), - ("xdp-portal-unavailable", "Échec de la capture de l’écran Wayland. Le portail de bureau XDG a peut-être planté ou n’est pas disponible. Essayez de le redémarrer avec la commande `systemctl --user restart xdg-desktop-portal`."), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland nécessite Ubuntu 21.04 ou une version ultérieure."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland nécessite une version ultérieure de votre distribution Linux. Veuillez essayer le bureau X11 ou changer de système d’exploitation."), ("JumpLink", "Afficher"), ("Please Select the screen to be shared(Operate on the peer side).", "Veuillez sélectionner l’écran à partager (côté appareil distant)."), ("Show RustDesk", "Afficher RustDesk"), ("This PC", "Ce PC"), ("or", "ou"), + ("Continue with", "Continuer avec"), ("Elevate", "Élever les privilèges"), ("Zoom cursor", "Augmenter la taille du curseur"), ("Accept sessions via password", "Accepter les sessions via mot de passe"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Vous n’avez pas encore d’appareils distants favoris ?\nTrouvez quelqu’un avec qui vous connecter et ajoutez-le à vos favoris !"), ("empty_lan_tip", "Oh non, il semble que nous n’avons pas encore découvert d’appareils sur le réseau local."), ("empty_address_book_tip", "Mince, il n’y a actuellement aucun appareil distant répertorié dans votre carnet d’adresses."), + ("eg: admin", "ex : admin"), ("Empty Username", "Nom d’utilisation non renseigné"), ("Empty Password", "Mot de passe non renseigné"), ("Me", "Moi"), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", "Activer le terminal"), ("New tab", "Nouvel onglet"), ("Keep terminal sessions on disconnect", "Maintenir les sessions du terminal lors de la déconnexion"), - ("Terminal (Run as administrator)", "Terminal (administrateur)"), - ("terminal-admin-login-tip", "Veuillez saisir le nom d’utilisateur et le mot de passe de l’administrateur de l’appareil contrôlé."), - ("Failed to get user token.", "Échec de l’obtention du jeton utilisateur."), - ("Incorrect username or password.", "Nom d’utilisateur ou mot de passe incorrect."), - ("The user is not an administrator.", "L’utilisateur n’est pas un administrateur."), - ("Failed to check if the user is an administrator.", "Échec de la vérification du statut d’administrateur de l’utilisateur."), - ("Supported only in the installed version.", "Uniquement pris en charge dans la version installée."), - ("elevation_username_tip", "Saisissez un nom d’utilisateur ou un domaine\\utilisateur"), - ("Preparing for installation ...", "Préparation de l’installation…"), - ("Show my cursor", "Afficher mon curseur"), - ("Scale custom", "Échelle personnalisée"), - ("Custom scale slider", "Curseur d’échelle personnalisée"), - ("Decrease", "Diminuer"), - ("Increase", "Augmenter"), - ("Show virtual mouse", "Afficher la souris virtuelle"), - ("Virtual mouse size", "Taille de la souris virtuelle"), - ("Small", "Petite"), - ("Large", "Grande"), - ("Show virtual joystick", "Afficher le joystick virtuel"), - ("Edit note", "Modifier la note"), - ("Alias", "Alias"), - ("ScrollEdge", "Défilement sur les bords"), - ("Allow insecure TLS fallback", "Utiliser une connexion TLS non sécurisée si nécessaire"), - ("allow-insecure-tls-fallback-tip", "Par défaut, RustDesk vérifie le certificat du serveur lors de l’utilisation de protocoles utilisant TLS.\nLorsque cette option est activée, RustDesk autorise les connexions même en cas d’échec de l’étape de vérification."), - ("Disable UDP", "Désactiver UDP"), - ("disable-udp-tip", "Contrôle l’utilisation exclusive du mode TCP.\nLorsque cette option est activée, RustDesk n’utilise plus le port UDP 21116 et utilise le port TCP 21116 à la place."), - ("server-oss-not-support-tip", "Note : Cette fonctionnalité n’est pas disponible sous la version open-source du serveur RustDesk."), - ("input note here", "saisir la note ici"), - ("note-at-conn-end-tip", "Proposer de rédiger une note une fois la connexion terminée"), - ("Show terminal extra keys", "Afficher les touches supplémentaires du terminal"), - ("Relative mouse mode", "Mode souris relative"), - ("rel-mouse-not-supported-peer-tip", "Le mode souris relative n’est pas pris en charge par l’appareil distant."), - ("rel-mouse-not-ready-tip", "Le mode souris relative n’est pas encore prêt ; veuillez réessayer."), - ("rel-mouse-lock-failed-tip", "Échec du verrouillage du curseur. Le mode souris relative a été désactivé."), - ("rel-mouse-exit-{}-tip", "Appuyez sur {} pour quitter."), - ("rel-mouse-permission-lost-tip", "L’autorisation de contrôle du clavier a été révoquée. Le mode souris relative a été désactivé."), - ("Changelog", "Journal des modifications"), - ("keep-awake-during-outgoing-sessions-label", "Maintenir l’écran allumé lors des sessions sortantes"), - ("keep-awake-during-incoming-sessions-label", "Maintenir l’écran allumé lors des sessions entrantes"), - ("Continue with {}", "Continuer avec {}"), - ("Display Name", "Nom d’affichage"), - ("password-hidden-tip", "Le mot de passe permanent est défini (masqué)."), - ("preset-password-in-use-tip", "Le mot de passe prédéfini est actuellement utilisé."), - ("Enable privacy mode", "Activer le mode de confidentialité"), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ge.rs b/src/lang/ge.rs index 2fc8f282d..6adc2606d 100644 --- a/src/lang/ge.rs +++ b/src/lang/ge.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "ოპერაციული სისტემის პაროლი"), ("install_tip", "ზოგიერთ შემთხვევაში UAC-ის გამო RustDesk შეიძლება არასწორად მუშაობდეს დაშორებულ კვანძზე. UAC-თან დაკავშირებული პრობლემების თავიდან ასაცილებლად დააჭირეთ ქვემოთ მოცემულ ღილაკს სისტემაში RustDesk-ის დასაყენებლად."), ("Click to upgrade", "დააჭირეთ განახლებისთვის"), + ("Click to download", "დააჭირეთ ჩამოსატვირთად"), + ("Click to update", "დააჭირეთ განახლებისთვის"), ("Configure", "კონფიგურაცია"), ("config_acc", "თქვენი სამუშაო მაგიდის დისტანციური მართვისთვის უნდა მიანიჭოთ RustDesk-ს \"წვდომის\" უფლებები"), ("config_screen", "სამუშაო მაგიდაზე დისტანციური წვდომისთვის უნდა მიანიჭოთ RustDesk-ს \"ეკრანის ანაბეჭდის\" უფლებები"), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "კლავიატურის პარამეტრები"), ("Full Access", "სრული წვდომა"), ("Screen Share", "ეკრანის გაზიარება"), - ("ubuntu-21-04-required", "Wayland საჭიროებს Ubuntu 21.04 ან უფრო ახალ ვერსიას."), - ("wayland-requires-higher-linux-version", "Wayland-ს სჭირდება Linux-ის დისტრიბუტივის უფრო ახალი ვერსია. გამოიყენეთ X11 სამუშაო მაგიდა ან შეცვალეთ ოპერაციული სისტემა."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland საჭიროებს Ubuntu 21.04 ან უფრო ახალ ვერსიას."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland-ს სჭირდება Linux-ის დისტრიბუტივის უფრო ახალი ვერსია. გამოიყენეთ X11 სამუშაო მაგიდა ან შეცვალეთ ოპერაციული სისტემა."), ("JumpLink", "ნახვა"), ("Please Select the screen to be shared(Operate on the peer side).", "აირჩიეთ ეკრანი გასაზიარებლად (იმუშავეთ პარტნიორის მხარეს)."), ("Show RustDesk", "RustDesk-ის ჩვენება"), ("This PC", "ეს კომპიუტერი"), ("or", "ან"), + ("Continue with", "გაგრძელება"), ("Elevate", "უფლებების აწევა"), ("Zoom cursor", "კურსორის მასშტაბირება"), ("Accept sessions via password", "სესიების მიღება პაროლით"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "ჯერ არ გაქვთ რჩეული დისტანციური კვანძები?\nმოდით, ვნახოთ, ვის შეიძლება დავამატოთ რჩეულებში!"), ("empty_lan_tip", "დისტანციური კვანძები ვერ მოიძებნა."), ("empty_address_book_tip", "მისამართების წიგნში არ არის დისტანციური კვანძები."), + ("eg: admin", "მაგ: admin"), ("Empty Username", "ცარიელი მომხმარებლის სახელი"), ("Empty Password", "ცარიელი პაროლი"), ("Me", "მე"), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "{}-ით გაგრძელება"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/gu.rs b/src/lang/gu.rs deleted file mode 100644 index ac0a588a8..000000000 --- a/src/lang/gu.rs +++ /dev/null @@ -1,749 +0,0 @@ -lazy_static::lazy_static! { -pub static ref T: std::collections::HashMap<&'static str, &'static str> = - [ - ("Status", "સ્થિતિ"), - ("Your Desktop", "તમારું ડેસ્કટોપ"), - ("desk_tip", "તમારું ડેસ્કટોપ આ ID અને પાસવર્ડ દ્વારા એક્સેસ કરી શકાય છે."), - ("Password", "પાસવર્ડ"), - ("Ready", "તૈયાર"), - ("Established", "સ્થાપિત"), - ("connecting_status", "નેટવર્ક સાથે જોડાઈ રહ્યું છે..."), - ("Enable service", "સેવા સક્ષમ કરો"), - ("Start service", "સેવા શરૂ કરો"), - ("Service is running", "સેવા કાર્યરત છે"), - ("Service is not running", "સેવા કાર્યરત નથી"), - ("not_ready_status", "તૈયાર નથી. કૃપા કરીને તમારું કનેક્શન તપાસો"), - ("Control Remote Desktop", "રિમોટ ડેસ્કટોપ નિયંત્રિત કરો"), - ("Transfer file", "ફાઇલ ટ્રાન્સફર"), - ("Connect", "કનેક્ટ કરો"), - ("Recent sessions", "તાજેતરના સત્રો"), - ("Address book", "એડ્રેસ બુક"), - ("Confirmation", "પુષ્ટિકરણ"), - ("TCP tunneling", "TCP ટનલિંગ"), - ("Remove", "દૂર કરો"), - ("Refresh random password", "રેન્ડમ પાસવર્ડ બદલો"), - ("Set your own password", "તમારો પોતાનો પાસવર્ડ સેટ કરો"), - ("Enable keyboard/mouse", "કીબોર્ડ/માઉસ સક્ષમ કરો"), - ("Enable clipboard", "ક્લિપબોર્ડ સક્ષમ કરો"), - ("Enable file transfer", "ફાઇલ ટ્રાન્સફર સક્ષમ કરો"), - ("Enable TCP tunneling", "TCP ટનલિંગ સક્ષમ કરો"), - ("IP Whitelisting", "IP વ્હાઇટલિસ્ટિંગ"), - ("ID/Relay Server", "ID/રિલે સર્વર"), - ("Import server config", "સર્વર કોન્ફિગ ઈમ્પોર્ટ કરો"), - ("Export Server Config", "સર્વર કોન્ફિગ એક્સપોર્ટ કરો"), - ("Import server configuration successfully", "સર્વર કોન્ફિગરેશન સફળતાપૂર્વક ઈમ્પોર્ટ થયું"), - ("Export server configuration successfully", "સર્વર કોન્ફિગરેશન સફળતાપૂર્વક એક્સપોર્ટ થયું"), - ("Invalid server configuration", "અમાન્ય સર્વર કોન્ફિગરેશન"), - ("Clipboard is empty", "ક્લિપબોર્ડ ખાલી છે"), - ("Stop service", "સેવા બંધ કરો"), - ("Change ID", "ID બદલો"), - ("Your new ID", "તમારું નવું ID"), - ("length %min% to %max%", "લંબાઈ %min% થી %max% સુધી"), - ("starts with a letter", "અક્ષરથી શરૂ થાય છે"), - ("allowed characters", "માન્ય અક્ષરો"), - ("id_change_tip", "ID બદલ્યા પછી વર્તમાન કનેક્શન તૂટી જશે."), - ("Website", "વેબસાઇટ"), - ("About", "વિશે"), - ("Slogan_tip", "વધુ સારા અનુભવ માટે બનાવેલ રિમોટ ડેસ્કટોપ સોફ્ટવેર"), - ("Privacy Statement", "ગોપનીયતા નિવેદન"), - ("Mute", "મ્યૂટ કરો"), - ("Build Date", "બિલ્ડ તારીખ"), - ("Version", "સંસ્કરણ (Version)"), - ("Home", "હોમ"), - ("Audio Input", "ઓડિયો ઇનપુટ"), - ("Enhancements", "વધારાની સુવિધાઓ"), - ("Hardware Codec", "હાર્ડવેર કોડેક"), - ("Adaptive bitrate", "એડેપ્ટિવ બિટરેટ"), - ("ID Server", "ID સર્વર"), - ("Relay Server", "રિલે સર્વર"), - ("API Server", "API સર્વર"), - ("invalid_http", "અમાન્ય HTTP લિંક"), - ("Invalid IP", "અમાન્ય IP"), - ("Invalid format", "અમાન્ય ફોર્મેટ"), - ("server_not_support", "સર્વર દ્વારા સમર્થિત નથી"), - ("Not available", "ઉપલબ્ધ નથી"), - ("Too frequent", "ખૂબ વારંવાર"), - ("Cancel", "રદ કરો"), - ("Skip", "રહેવા દો (Skip)"), - ("Close", "બંધ કરો"), - ("Retry", "ફરી પ્રયાસ કરો"), - ("OK", "બરાબર"), - ("Password Required", "પાસવર્ડ જરૂરી છે"), - ("Please enter your password", "કૃપા કરીને તમારો પાસવર્ડ દાખલ કરો"), - ("Remember password", "પાસવર્ડ યાદ રાખો"), - ("Wrong Password", "ખોટો પાસવર્ડ"), - ("Do you want to enter again?", "શું તમે ફરીથી દાખલ કરવા માંગો છો?"), - ("Connection Error", "કનેક્શન ભૂલ"), - ("Error", "ભૂલ"), - ("Reset by the peer", "સામેના છેડેથી રિસેટ કરવામાં આવ્યું"), - ("Connecting...", "જોડાઈ રહ્યું છે..."), - ("Connection in progress. Please wait.", "કનેક્શન ચાલુ છે. કૃપા કરીને રાહ જુઓ."), - ("Please try 1 minute later", "કૃપા કરીને 1 મિનિટ પછી ફરી પ્રયાસ કરો"), - ("Login Error", "લોગિન ભૂલ"), - ("Successful", "સફળ"), - ("Connected, waiting for image...", "જોડાયેલ, ઇમેજની રાહ જોવાય છે..."), - ("Name", "નામ"), - ("Type", "પ્રકાર"), - ("Modified", "સુધારેલ"), - ("Size", "કદ (Size)"), - ("Show Hidden Files", "છુપાયેલી ફાઇલો બતાવો"), - ("Receive", "મેળવો"), - ("Send", "મોકલો"), - ("Refresh File", "ફાઇલ રિફ્રેશ કરો"), - ("Local", "લોકલ"), - ("Remote", "રિમોટ"), - ("Remote Computer", "રિમોટ કોમ્પ્યુટર"), - ("Local Computer", "લોકલ કોમ્પ્યુટર"), - ("Confirm Delete", "કાઢી નાખવાની પુષ્ટિ કરો"), - ("Delete", "કાઢી નાખો"), - ("Properties", "ગુણધર્મો (Properties)"), - ("Multi Select", "બહુ-પસંદગી"), - ("Select All", "બધું પસંદ કરો"), - ("Unselect All", "બધું નાપસંદ કરો"), - ("Empty Directory", "ખાલી ડિરેક્ટરી"), - ("Not an empty directory", "ડિરેક્ટરી ખાલી નથી"), - ("Are you sure you want to delete this file?", "શું તમે ખરેખર આ ફાઇલ કાઢી નાખવા માંગો છો?"), - ("Are you sure you want to delete this empty directory?", "શું તમે ખરેખર આ ખાલી ડિરેક્ટરી કાઢી નાખવા માંગો છો?"), - ("Are you sure you want to delete the file of this directory?", "શું તમે ખરેખર આ ડિરેક્ટરીની ફાઇલ કાઢી નાખવા માંગો છો?"), - ("Do this for all conflicts", "તમામ વિવાદો માટે આ કરો"), - ("This is irreversible!", "આ બદલી શકાશે નહીં!"), - ("Deleting", "કાઢી નાખવામાં આવી રહ્યું છે"), - ("files", "ફાઇલો"), - ("Waiting", "રાહ જુઓ"), - ("Finished", "પૂરું થયું"), - ("Speed", "ગતિ"), - ("Custom Image Quality", "કસ્ટમ ઇમેજ ગુણવત્તા"), - ("Privacy mode", "પ્રાઇવસી મોડ"), - ("Block user input", "યુઝર ઇનપુટ બ્લોક કરો"), - ("Unblock user input", "યુઝર ઇનપુટ અનબ્લોક કરો"), - ("Adjust Window", "વિન્ડો એડજસ્ટ કરો"), - ("Original", "મૂળ (Original)"), - ("Shrink", "સંકોચો (Shrink)"), - ("Stretch", "ખેંચો (Stretch)"), - ("Scrollbar", "સ્ક્રોલબાર"), - ("ScrollAuto", "ઓટો સ્ક્રોલ"), - ("Good image quality", "સારી ઇમેજ ગુણવત્તા"), - ("Balanced", "સંતુલિત"), - ("Optimize reaction time", "પ્રતિક્રિયા સમય શ્રેષ્ઠ બનાવો"), - ("Custom", "કસ્ટમ"), - ("Show remote cursor", "રિમોટ કર્સર બતાવો"), - ("Show quality monitor", "ક્વોલિટી મોનિટર બતાવો"), - ("Disable clipboard", "ક્લિપબોર્ડ અક્ષમ કરો"), - ("Lock after session end", "સત્ર સમાપ્ત થયા પછી લોક કરો"), - ("Insert Ctrl + Alt + Del", "Ctrl + Alt + Del દાખલ કરો"), - ("Insert Lock", "લોક દાખલ કરો"), - ("Refresh", "રિફ્રેશ કરો"), - ("ID does not exist", "ID અસ્તિત્વમાં નથી"), - ("Failed to connect to rendezvous server", "Rendezvous સર્વર સાથે જોડવામાં નિષ્ફળ"), - ("Please try later", "કૃપા કરીને પછી પ્રયાસ કરો"), - ("Remote desktop is offline", "રિમોટ ડેસ્કટોપ ઓફલાઇન છે"), - ("Key mismatch", "કી મેળ ખાતી નથી"), - ("Timeout", "સમય સમાપ્ત"), - ("Failed to connect to relay server", "રિલે સર્વર સાથે જોડવામાં નિષ્ફળ"), - ("Failed to connect via rendezvous server", "Rendezvous સર્વર દ્વારા જોડવામાં નિષ્ફળ"), - ("Failed to connect via relay server", "રિલે સર્વર દ્વારા જોડવામાં નિષ્ફળ"), - ("Failed to make direct connection to remote desktop", "રિમોટ ડેસ્કટોપ સાથે સીધું જોડાણ કરવામાં નિષ્ફળ"), - ("Set Password", "પાસવર્ડ સેટ કરો"), - ("OS Password", "OS પાસવર્ડ"), - ("install_tip", "શ્રેષ્ઠ પ્રદર્શન માટે, કૃપા કરીને ઇન્સ્ટોલ કરો."), - ("Click to upgrade", "અપગ્રેડ કરવા માટે ક્લિક કરો"), - ("Configure", "કોન્ફિગર કરો"), - ("config_acc", "એક્સેસિબિલિટી કોન્ફિગર કરો"), - ("config_screen", "સ્ક્રીન કોન્ફિગર કરો"), - ("Installing ...", "ઇન્સ્ટોલ થઈ રહ્યું છે..."), - ("Install", "ઇન્સ્ટોલ કરો"), - ("Installation", "ઇન્સ્ટોલેશન"), - ("Installation Path", "ઇન્સ્ટોલેશન પાથ"), - ("Create start menu shortcuts", "સ્ટાર્ટ મેનૂ શોર્ટકટ બનાવો"), - ("Create desktop icon", "ડેસ્કટોપ આઇકોન બનાવો"), - ("agreement_tip", "ઇન્સ્ટોલ કરીને તમે લાયસન્સ કરાર સ્વીકારો છો."), - ("Accept and Install", "સ્વીકારો અને ઇન્સ્ટોલ કરો"), - ("End-user license agreement", "અંતિમ વપરાશકર્તા લાયસન્સ કરાર"), - ("Generating ...", "જનરેટ થઈ રહ્યું છે..."), - ("Your installation is lower version.", "તમારું ઇન્સ્ટોલેશન જૂનું સંસ્કરણ છે."), - ("not_close_tcp_tip", "ટનલનો ઉપયોગ કરતી વખતે આ વિન્ડો બંધ કરશો નહીં."), - ("Listening ...", "સાંભળી રહ્યું છે..."), - ("Remote Host", "રિમોટ હોસ્ટ"), - ("Remote Port", "રિમોટ પોર્ટ"), - ("Action", "ક્રિયા"), - ("Add", "ઉમેરો"), - ("Local Port", "લોકલ પોર્ટ"), - ("Local Address", "લોકલ સરનામું"), - ("Change Local Port", "લોકલ પોર્ટ બદલો"), - ("setup_server_tip", "ઝડપી કનેક્શન માટે તમારું પોતાનું સર્વર સેટ કરો"), - ("Too short, at least 6 characters.", "ખૂબ ટૂંકું, ઓછામાં ઓછા 6 અક્ષરો હોવા જોઈએ."), - ("The confirmation is not identical.", "પુષ્ટિકરણ સરખું નથી."), - ("Permissions", "પરવાનગીઓ"), - ("Accept", "સ્વીકારો"), - ("Dismiss", "ખારીજ કરો"), - ("Disconnect", "ડિસ્કનેક્ટ કરો"), - ("Enable file copy and paste", "ફાઇલ કોપી અને પેસ્ટ સક્ષમ કરો"), - ("Connected", "જોડાયેલ"), - ("Direct and encrypted connection", "સીધું અને એન્ક્રિપ્ટેડ કનેક્શન"), - ("Relayed and encrypted connection", "રિલે અને એન્ક્રિપ્ટેડ કનેક્શન"), - ("Direct and unencrypted connection", "સીધું અને અનએન્ક્રિપ્ટેડ કનેક્શન"), - ("Relayed and unencrypted connection", "રિલે અને અનએન્ક્રિપ્ટેડ કનેક્શન"), - ("Enter Remote ID", "રિમોટ ID દાખલ કરો"), - ("Enter your password", "તમારો પાસવર્ડ દાખલ કરો"), - ("Logging in...", "લોગિન થઈ રહ્યું છે..."), - ("Enable RDP session sharing", "RDP સત્ર શેરિંગ સક્ષમ કરો"), - ("Auto Login", "ઓટો લોગિન"), - ("Enable direct IP access", "સીધું IP એક્સેસ સક્ષમ કરો"), - ("Rename", "નામ બદલો"), - ("Space", "જગ્યા (Space)"), - ("Create desktop shortcut", "ડેસ્કટોપ શોર્ટકટ બનાવો"), - ("Change Path", "પાથ બદલો"), - ("Create Folder", "ફોલ્ડર બનાવો"), - ("Please enter the folder name", "કૃપા કરીને ફોલ્ડરનું નામ દાખલ કરો"), - ("Fix it", "તેને ઠીક કરો"), - ("Warning", "ચેતવણી"), - ("Login screen using Wayland is not supported", "Wayland ઉપયોગ કરતી લોગિન સ્ક્રીન સમર્થિત નથી"), - ("Reboot required", "રિબૂટ જરૂરી છે"), - ("Unsupported display server", "અસમર્થિત ડિસ્પ્લે સર્વર"), - ("x11 expected", "x11 અપેક્ષિત છે"), - ("Port", "પોર્ટ"), - ("Settings", "સેટિંગ્સ"), - ("Username", "વપરાશકર્તા નામ"), - ("Invalid port", "અમાન્ય પોર્ટ"), - ("Closed manually by the peer", "સામેથી મેન્યુઅલી બંધ કરવામાં આવ્યું"), - ("Enable remote configuration modification", "રિમોટ કોન્ફિગરેશન ફેરફાર સક્ષમ કરો"), - ("Run without install", "ઇન્સ્ટોલ કર્યા વગર ચલાવો"), - ("Connect via relay", "રિલે દ્વારા કનેક્ટ કરો"), - ("Always connect via relay", "હંમેશા રિલે દ્વારા કનેક્ટ કરો"), - ("whitelist_tip", "માત્ર વ્હાઇટલિસ્ટ કરેલ IP જ મને એક્સેસ કરી શકે છે"), - ("Login", "લોગિન"), - ("Verify", "ચકાસો"), - ("Remember me", "મને યાદ રાખો"), - ("Trust this device", "આ ઉપકરણ પર વિશ્વાસ કરો"), - ("Verification code", "વેરિફિકેશન કોડ"), - ("verification_tip", "વેરિફિકેશન કોડ તમારા ઇમેઇલ પર મોકલવામાં આવ્યો છે"), - ("Logout", "લોગઆઉટ"), - ("Tags", "ટેગ્સ"), - ("Search ID", "ID શોધો"), - ("whitelist_sep", "અલ્પવિરામ, અર્ધવિરામ અથવા સ્પેસ દ્વારા અલગ કરો"), - ("Add ID", "ID ઉમેરો"), - ("Add Tag", "ટેગ ઉમેરો"), - ("Unselect all tags", "તમામ ટેગ નાપસંદ કરો"), - ("Network error", "નેટવર્ક ભૂલ"), - ("Username missed", "વપરાશકર્તા નામ બાકી છે"), - ("Password missed", "પાસવર્ડ બાકી છે"), - ("Wrong credentials", "ખોટી વિગતો"), - ("The verification code is incorrect or has expired", "વેરિફિકેશન કોડ ખોટો છે અથવા તેની મર્યાદા પૂરી થઈ ગઈ છે"), - ("Edit Tag", "ટેગ સુધારો"), - ("Forget Password", "પાસવર્ડ ભૂલી ગયા"), - ("Favorites", "પસંદગીના"), - ("Add to Favorites", "પસંદગીમાં ઉમેરો"), - ("Remove from Favorites", "પસંદગીમાંથી દૂર કરો"), - ("Empty", "ખાલી"), - ("Invalid folder name", "અમાન્ય ફોલ્ડર નામ"), - ("Socks5 Proxy", "Socks5 પ્રોક્સી"), - ("Socks5/Http(s) Proxy", "Socks5/Http(s) પ્રોક્સી"), - ("Discovered", "શોધાયેલ"), - ("install_daemon_tip", "બૂટ વખતે શરૂ કરવા માટે સેવા ઇન્સ્ટોલ કરો"), - ("Remote ID", "રિમોટ ID"), - ("Paste", "પેસ્ટ કરો"), - ("Paste here?", "અહીં પેસ્ટ કરવું છે?"), - ("Are you sure to close the connection?", "શું તમે ખરેખર કનેક્શન બંધ કરવા માંગો છો?"), - ("Download new version", "નવું સંસ્કરણ ડાઉનલોડ કરો"), - ("Touch mode", "ટચ મોડ"), - ("Mouse mode", "માઉસ મોડ"), - ("One-Finger Tap", "એક આંગળીથી ટેપ"), - ("Left Mouse", "ડાબું માઉસ બટન"), - ("One-Long Tap", "એક લાંબો ટેપ"), - ("Two-Finger Tap", "બે આંગળીથી ટેપ"), - ("Right Mouse", "જમણું માઉસ બટન"), - ("One-Finger Move", "એક આંગળીથી હલનચલન"), - ("Double Tap & Move", "ડબલ ટેપ અને હલનચલન"), - ("Mouse Drag", "માઉસ ડ્રેગ"), - ("Three-Finger vertically", "ત્રણ આંગળી ઊભી રીતે"), - ("Mouse Wheel", "માઉસ વ્હીલ"), - ("Two-Finger Move", "બે આંગળીથી હલનચલન"), - ("Canvas Move", "કેનવાસ ખસેડો"), - ("Pinch to Zoom", "ઝૂમ કરવા માટે પિંચ કરો"), - ("Canvas Zoom", "કેનવાસ ઝૂમ"), - ("Reset canvas", "કેનવાસ રિસેટ કરો"), - ("No permission of file transfer", "ફાઇલ ટ્રાન્સફરની પરવાનગી નથી"), - ("Note", "નોંધ"), - ("Connection", "કનેક્શન"), - ("Share screen", "સ્ક્રીન શેર કરો"), - ("Chat", "ચેટ"), - ("Total", "કુલ"), - ("items", "વસ્તુઓ"), - ("Selected", "પસંદ કરેલ"), - ("Screen Capture", "સ્ક્રીન કેપ્ચર"), - ("Input Control", "ઇનપુટ નિયંત્રણ"), - ("Audio Capture", "ઓડિયો કેપ્ચર"), - ("Do you accept?", "શું તમે સ્વીકારો છો?"), - ("Open System Setting", "સિસ્ટમ સેટિંગ ખોલો"), - ("How to get Android input permission?", "Android ઇનપુટ પરવાનગી કેવી રીતે મેળવવી?"), - ("android_input_permission_tip1", "ઇનપુટ પરવાનગી મેળવવા માટે એક્સેસિબિલિટી સેવા સક્ષમ કરો."), - ("android_input_permission_tip2", "કૃપા કરીને સેટિંગ્સમાં RustDesk શોધો અને તેને ચાલુ કરો."), - ("android_new_connection_tip", "નવો કંટ્રોલ વિનંતી પ્રાપ્ત થઈ છે."), - ("android_service_will_start_tip", "સ્ક્રીન કેપ્ચર ચાલુ કરવાથી સેવા આપમેળે શરૂ થશે."), - ("android_stop_service_tip", "સેવા બંધ કરવાથી તમામ કનેક્શન બંધ થઈ જશે."), - ("android_version_audio_tip", "ઓડિયો કેપ્ચર માત્ર Android 10 કે તેથી ઉપરના વર્ઝનમાં ઉપલબ્ધ છે."), - ("android_start_service_tip", "સ્ક્રીન શેરિંગ સેવા શરૂ કરવા ક્લિક કરો."), - ("android_permission_may_not_change_tip", "પરવાનગીઓ પછીથી બદલી શકાશે નહીં, કૃપા કરીને કાળજીપૂર્વક પસંદ કરો."), - ("Account", "ખાતું"), - ("Overwrite", "ઓવરરાઇટ કરો"), - ("This file exists, skip or overwrite this file?", "આ ફાઇલ અસ્તિત્વમાં છે, રહેવા દેવી છે કે ઓવરરાઇટ કરવી છે?"), - ("Quit", "બહાર નીકળો"), - ("Help", "મદદ"), - ("Failed", "નિષ્ફળ"), - ("Succeeded", "સફળ"), - ("Someone turns on privacy mode, exit", "કોઈએ પ્રાઇવસી મોડ ચાલુ કર્યો છે, બહાર નીકળો"), - ("Unsupported", "અસમર્થિત"), - ("Peer denied", "સામેથી નકારવામાં આવ્યું"), - ("Please install plugins", "કૃપા કરીને પ્લગઇન્સ ઇન્સ્ટોલ કરો"), - ("Peer exit", "સામેથી કોઈ બહાર નીકળી ગયું"), - ("Failed to turn off", "બંધ કરવામાં નિષ્ફળ"), - ("Turned off", "બંધ કરવામાં આવ્યું"), - ("Language", "ભાષા"), - ("Keep RustDesk background service", "RustDesk બેકગ્રાઉન્ડ સેવા ચાલુ રાખો"), - ("Ignore Battery Optimizations", "બેટરી ઓપ્ટિમાઇઝેશન અવગણો"), - ("android_open_battery_optimizations_tip", "ડિસ્કનેક્શન ટાળવા માટે બેટરી ઓપ્ટિમાઇઝેશન સેટિંગ ખોલો"), - ("Start on boot", "બૂટ પર શરૂ કરો"), - ("Start the screen sharing service on boot, requires special permissions", "બૂટ પર સ્ક્રીન શેરિંગ શરૂ કરો, ખાસ પરવાનગીની જરૂર છે"), - ("Connection not allowed", "કનેક્શનની પરવાનગી નથી"), - ("Legacy mode", "લેગસી મોડ"), - ("Map mode", "મેપ મોડ"), - ("Translate mode", "અનુવાદ મોડ"), - ("Use permanent password", "કાયમી પાસવર્ડનો ઉપયોગ કરો"), - ("Use both passwords", "બંને પાસવર્ડનો ઉપયોગ કરો"), - ("Set permanent password", "કાયમી પાસવર્ડ સેટ કરો"), - ("Enable remote restart", "રિમોટ રિસ્ટાર્ટ સક્ષમ કરો"), - ("Restart remote device", "રિમોટ ઉપકરણ રિસ્ટાર્ટ કરો"), - ("Are you sure you want to restart", "શું તમે ખરેખર રિસ્ટાર્ટ કરવા માંગો છો?"), - ("Restarting remote device", "રિમોટ ઉપકરણ રિસ્ટાર્ટ થઈ રહ્યું છે"), - ("remote_restarting_tip", "રિમોટ ઉપકરણ રિસ્ટાર્ટ થઈ રહ્યું છે, કૃપા કરીને રાહ જુઓ..."), - ("Copied", "કોપી થઈ ગયું"), - ("Exit Fullscreen", "ફુલસ્ક્રીનમાંથી બહાર નીકળો"), - ("Fullscreen", "ફુલસ્ક્રીન"), - ("Mobile Actions", "મોબાઇલ ક્રિયાઓ"), - ("Select Monitor", "મોનિટર પસંદ કરો"), - ("Control Actions", "નિયંત્રણ ક્રિયાઓ"), - ("Display Settings", "ડિસ્પ્લે સેટિંગ્સ"), - ("Ratio", "રેશિયો (Ratio)"), - ("Image Quality", "ઇમેજ ગુણવત્તા"), - ("Scroll Style", "સ્ક્રોલ શૈલી"), - ("Show Toolbar", "ટૂલબાર બતાવો"), - ("Hide Toolbar", "ટૂલબાર છુપાવો"), - ("Direct Connection", "સીધું કનેક્શન"), - ("Relay Connection", "રિલે કનેક્શન"), - ("Secure Connection", "સુરક્ષિત કનેક્શન"), - ("Insecure Connection", "અસુરક્ષિત કનેક્શન"), - ("Scale original", "મૂળ સ્કેલ"), - ("Scale adaptive", "એડેપ્ટિવ સ્કેલ"), - ("General", "સામાન્ય"), - ("Security", "સુરક્ષા"), - ("Theme", "થીમ"), - ("Dark Theme", "ડાર્ક થીમ"), - ("Light Theme", "લાઇટ થીમ"), - ("Dark", "ડાર્ક"), - ("Light", "લાઇટ"), - ("Follow System", "સિસ્ટમ મુજબ"), - ("Enable hardware codec", "હાર્ડવેર કોડેક સક્ષમ કરો"), - ("Unlock Security Settings", "સુરક્ષા સેટિંગ્સ અનલોક કરો"), - ("Enable audio", "ઓડિયો સક્ષમ કરો"), - ("Unlock Network Settings", "નેટવર્ક સેટિંગ્સ અનલોક કરો"), - ("Server", "સર્વર"), - ("Direct IP Access", "સીધું IP એક્સેસ"), - ("Proxy", "પ્રોક્સી"), - ("Apply", "લાગુ કરો"), - ("Disconnect all devices?", "તમામ ઉપકરણો ડિસ્કનેક્ટ કરવા છે?"), - ("Clear", "સાફ કરો"), - ("Audio Input Device", "ઓડિયો ઇનપુટ ઉપકરણ"), - ("Use IP Whitelisting", "IP વ્હાઇટલિસ્ટિંગનો ઉપયોગ કરો"), - ("Network", "નેટવર્ક"), - ("Pin Toolbar", "ટૂલબાર પિન કરો"), - ("Unpin Toolbar", "ટૂલબાર અનપિન કરો"), - ("Recording", "રેકોર્ડિંગ"), - ("Directory", "ડિરેક્ટરી"), - ("Automatically record incoming sessions", "આવતા સત્રો આપમેળે રેકોર્ડ કરો"), - ("Automatically record outgoing sessions", "જતા સત્રો આપમેળે રેકોર્ડ કરો"), - ("Change", "બદલો"), - ("Start session recording", "સત્ર રેકોર્ડિંગ શરૂ કરો"), - ("Stop session recording", "સત્ર રેકોર્ડિંગ બંધ કરો"), - ("Enable recording session", "સત્ર રેકોર્ડિંગ સક્ષમ કરો"), - ("Enable LAN discovery", "LAN ડિસ્કવરી સક્ષમ કરો"), - ("Deny LAN discovery", "LAN ડિસ્કવરી નકારો"), - ("Write a message", "સંદેશ લખો"), - ("Prompt", "પ્રોમ્પ્ટ"), - ("Please wait for confirmation of UAC...", "કૃપા કરીને UAC પુષ્ટિની રાહ જુઓ..."), - ("elevated_foreground_window_tip", "રિમોટની વર્તમાન વિન્ડોને વધારે પરવાનગીની જરૂર છે."), - ("Disconnected", "ડિસ્કનેક્ટ થઈ ગયું"), - ("Other", "અન્ય"), - ("Confirm before closing multiple tabs", "બહુવિધ ટેબ્સ બંધ કરતા પહેલા પુષ્ટિ કરો"), - ("Keyboard Settings", "કીબોર્ડ સેટિંગ્સ"), - ("Full Access", "પૂર્ણ એક્સેસ"), - ("Screen Share", "સ્ક્રીન શેર"), - ("ubuntu-21-04-required", "Ubuntu 21.04 કે તેથી ઉપર જરૂરી છે"), - ("wayland-requires-higher-linux-version", "Wayland માટે ઉચ્ચ Linux વર્ઝન જરૂરી છે"), - ("xdp-portal-unavailable", "XDP પોર્ટલ અનુપલબ્ધ છે"), - ("JumpLink", "JumpLink"), - ("Please Select the screen to be shared(Operate on the peer side).", "કૃપા કરીને શેર કરવાની સ્ક્રીન પસંદ કરો (સામેના છેડે કાર્ય કરો)."), - ("Show RustDesk", "RustDesk બતાવો"), - ("This PC", "આ PC"), - ("or", "અથવા"), - ("Elevate", "એલિવેટ કરો"), - ("Zoom cursor", "ઝૂમ કર્સર"), - ("Accept sessions via password", "પાસવર્ડ દ્વારા સત્રો સ્વીકારો"), - ("Accept sessions via click", "ક્લિક દ્વારા સત્રો સ્વીકારો"), - ("Accept sessions via both", "બંને દ્વારા સત્રો સ્વીકારો"), - ("Please wait for the remote side to accept your session request...", "કૃપા કરીને સામેનો છેડો વિનંતી સ્વીકારે તેની રાહ જુઓ..."), - ("One-time Password", "વન-ટાઇમ પાસવર્ડ (OTP)"), - ("Use one-time password", "વન-ટાઇમ પાસવર્ડનો ઉપયોગ કરો"), - ("One-time password length", "OTP ની લંબાઈ"), - ("Request access to your device", "તમારા ઉપકરણના એક્સેસ માટે વિનંતી"), - ("Hide connection management window", "કનેક્શન મેનેજમેન્ટ વિન્ડો છુપાવો"), - ("hide_cm_tip", "જો પાસવર્ડ દ્વારા કનેક્શન હોય તો જ છુપાવો"), - ("wayland_experiment_tip", "Wayland સપોર્ટ હજુ પ્રાયોગિક ધોરણે છે"), - ("Right click to select tabs", "ટેબ્સ પસંદ કરવા રાઇટ ક્લિક કરો"), - ("Skipped", "રહેવા દીધું (Skipped)"), - ("Add to address book", "એડ્રેસ બુકમાં ઉમેરો"), - ("Group", "ગ્રુપ"), - ("Search", "શોધો"), - ("Closed manually by web console", "વેબ કન્સોલ દ્વારા મેન્યુઅલી બંધ કરવામાં આવ્યું"), - ("Local keyboard type", "લોકલ કીબોર્ડ પ્રકાર"), - ("Select local keyboard type", "લોકલ કીબોર્ડ પ્રકાર પસંદ કરો"), - ("software_render_tip", "જો સ્ક્રીન કાળી દેખાય, તો આ અજમાવો"), - ("Always use software rendering", "હંમેશા સોફ્ટવેર રેન્ડરિંગનો ઉપયોગ કરો"), - ("config_input", "ઇનપુટ કોન્ફિગર કરો"), - ("config_microphone", "માઇક્રોફોન કોન્ફિગર કરો"), - ("request_elevation_tip", "સામેથી ઉચ્ચ પરવાનગી (Elevation) માટે વિનંતી કરો"), - ("Wait", "રાહ જુઓ"), - ("Elevation Error", "એલિવેશન ભૂલ"), - ("Ask the remote user for authentication", "સામેના યુઝરને ઓથેન્ટિકેશન માટે પૂછો"), - ("Choose this if the remote account is administrator", "જો સામેનું ખાતું એડમિનિસ્ટ્રેટર હોય તો આ પસંદ કરો"), - ("Transmit the username and password of administrator", "એડમિનિસ્ટ્રેટરનું નામ અને પાસવર્ડ મોકલો"), - ("still_click_uac_tip", "રિમોટ યુઝરે હજુ પણ UAC વિન્ડોમાં 'હા' ક્લિક કરવું પડશે."), - ("Request Elevation", "એલિવેશન માટે વિનંતી કરો"), - ("wait_accept_uac_tip", "કૃપા કરીને સામેનો યુઝર UAC સ્વીકારે તેની રાહ જુઓ."), - ("Elevate successfully", "સફળતાપૂર્વક એલિવેટ થયું"), - ("uppercase", "મોટા અક્ષરો (Uppercase)"), - ("lowercase", "નાના અક્ષરો (Lowercase)"), - ("digit", "અંક (Digit)"), - ("special character", "ખાસ અક્ષર"), - ("length>=8", "લંબાઈ >= 8"), - ("Weak", "નબળું"), - ("Medium", "મધ્યમ"), - ("Strong", "મજબૂત"), - ("Switch Sides", "બાજુઓ બદલો"), - ("Please confirm if you want to share your desktop?", "શું તમે તમારું ડેસ્કટોપ શેર કરવા માંગો છો?"), - ("Display", "ડિસ્પ્લે"), - ("Default View Style", "ડિફોલ્ટ વ્યુ શૈલી"), - ("Default Scroll Style", "ડિફોલ્ટ સ્ક્રોલ શૈલી"), - ("Default Image Quality", "ડિફોલ્ટ ઇમેજ ગુણવત્તા"), - ("Default Codec", "ડિફોલ્ટ કોડેક"), - ("Bitrate", "બિટરેટ"), - ("FPS", "FPS"), - ("Auto", "ઓટો"), - ("Other Default Options", "અન્ય ડિફોલ્ટ વિકલ્પો"), - ("Voice call", "વોઇસ કોલ"), - ("Text chat", "ટેક્સ્ટ ચેટ"), - ("Stop voice call", "વોઇસ કોલ બંધ કરો"), - ("relay_hint_tip", "સીધું કનેક્શન શક્ય નથી; તમે રિલે દ્વારા પ્રયાસ કરી શકો છો."), - ("Reconnect", "ફરી કનેક્ટ કરો"), - ("Codec", "કોડેક"), - ("Resolution", "રિઝોલ્યુશન"), - ("No transfers in progress", "કોઈ ટ્રાન્સફર ચાલુ નથી"), - ("Set one-time password length", "OTP લંબાઈ સેટ કરો"), - ("RDP Settings", "RDP સેટિંગ્સ"), - ("Sort by", "ક્રમબદ્ધ કરો"), - ("New Connection", "નવું કનેક્શન"), - ("Restore", "રીસ્ટોર"), - ("Minimize", "મિનિમાઇઝ"), - ("Maximize", "મેક્સિમાઇઝ"), - ("Your Device", "તમારું ઉપકરણ"), - ("empty_recent_tip", "તાજેતરના સત્રો અહીં દેખાશે."), - ("empty_favorite_tip", "પસંદગીના ઉપકરણો અહીં દેખાશે."), - ("empty_lan_tip", "નેટવર્ક પરના ઉપકરણો અહીં દેખાશે."), - ("empty_address_book_tip", "તમારી એડ્રેસ બુક ખાલી છે."), - ("Empty Username", "ખાલી યુઝરનેમ"), - ("Empty Password", "ખાલી પાસવર્ડ"), - ("Me", "હું"), - ("identical_file_tip", "આ ફાઇલ પહેલેથી જ અસ્તિત્વમાં છે."), - ("show_monitors_tip", "ટૂલબારમાં મોનિટર બતાવો"), - ("View Mode", "વ્યુ મોડ"), - ("login_linux_tip", "રિમોટ Linux સત્ર માટે તમારે લોગિન કરવું પડશે"), - ("verify_rustdesk_password_tip", "RustDesk પાસવર્ડ ચકાસો"), - ("remember_account_tip", "આ ખાતું યાદ રાખો"), - ("os_account_desk_tip", "એક્સેસ માટે OS ખાતાનો ઉપયોગ કરો"), - ("OS Account", "OS ખાતું"), - ("another_user_login_title_tip", "બીજો યુઝર પહેલેથી લોગિન છે"), - ("another_user_login_text_tip", "ડિસ્કનેક્ટ કરો અને ફરી પ્રયાસ કરો"), - ("xorg_not_found_title_tip", "Xorg મળ્યું નથી"), - ("xorg_not_found_text_tip", "કૃપા કરીને Xorg ઇન્સ્ટોલ કરો"), - ("no_desktop_title_tip", "કોઈ ડેસ્કટોપ ઉપલબ્ધ નથી"), - ("no_desktop_text_tip", "કૃપા કરીને Linux ડેસ્કટોપ ઇન્સ્ટોલ કરો"), - ("No need to elevate", "એલિવેટ કરવાની જરૂર નથી"), - ("System Sound", "સિસ્ટમ સાઉન્ડ"), - ("Default", "ડિફોલ્ટ"), - ("New RDP", "નવું RDP"), - ("Fingerprint", "ફિંગરપ્રિન્ટ"), - ("Copy Fingerprint", "ફિંગરપ્રિન્ટ કોપી કરો"), - ("no fingerprints", "કોઈ ફિંગરપ્રિન્ટ નથી"), - ("Select a peer", "એક પીઅર પસંદ કરો"), - ("Select peers", "પીઅર્સ પસંદ કરો"), - ("Plugins", "પ્લગઇન્સ"), - ("Uninstall", "અનઇન્સ્ટોલ કરો"), - ("Update", "અપડેટ કરો"), - ("Enable", "સક્ષમ કરો"), - ("Disable", "અક્ષમ કરો"), - ("Options", "વિકલ્પો"), - ("resolution_original_tip", "મૂળ રિઝોલ્યુશન"), - ("resolution_fit_local_tip", "સ્ક્રીન મુજબ ફીટ કરો"), - ("resolution_custom_tip", "કસ્ટમ રિઝોલ્યુશન"), - ("Collapse toolbar", "ટૂલબાર નાનું કરો"), - ("Accept and Elevate", "સ્વીકારો અને એલિવેટ કરો"), - ("accept_and_elevate_btn_tooltip", "કનેક્શન સ્વીકારો અને UAC પરવાનગીઓ મેળવો."), - ("clipboard_wait_response_timeout_tip", "ક્લિપબોર્ડ પ્રતિક્રિયા માટે સમય સમાપ્ત થયો."), - ("Incoming connection", "આવતું કનેક્શન"), - ("Outgoing connection", "જતું કનેક્શન"), - ("Exit", "બહાર નીકળો"), - ("Open", "ખોલો"), - ("logout_tip", "શું તમે ખરેખર લોગઆઉટ કરવા માંગો છો?"), - ("Service", "સેવા"), - ("Start", "શરૂ કરો"), - ("Stop", "બંધ કરો"), - ("exceed_max_devices", "તમે ઉપકરણોની મહત્તમ મર્યાદા વટાવી દીધી છે."), - ("Sync with recent sessions", "તાજેતરના સત્રો સાથે સિંક કરો"), - ("Sort tags", "ટેગ્સ ક્રમબદ્ધ કરો"), - ("Open connection in new tab", "નવી ટેબમાં કનેક્શન ખોલો"), - ("Move tab to new window", "ટેબને નવી વિન્ડોમાં ખસેડો"), - ("Can not be empty", "ખાલી ન હોઈ શકે"), - ("Already exists", "પહેલેથી અસ્તિત્વમાં છે"), - ("Change Password", "પાસવર્ડ બદલો"), - ("Refresh Password", "પાસવર્ડ રિફ્રેશ કરો"), - ("ID", "ID"), - ("Grid View", "ગ્રીડ વ્યુ"), - ("List View", "લિસ્ટ વ્યુ"), - ("Select", "પસંદ કરો"), - ("Toggle Tags", "ટેગ્સ ચાલુ/બંધ કરો"), - ("pull_ab_failed_tip", "એડ્રેસ બુક અપડેટ કરવામાં નિષ્ફળ."), - ("push_ab_failed_tip", "એડ્રેસ બુક સિંક કરવામાં નિષ્ફળ."), - ("synced_peer_readded_tip", "તાજેતરના સત્રોના ઉપકરણો એડ્રેસ બુકમાં સિંક થયા."), - ("Change Color", "રંગ બદલો"), - ("Primary Color", "પ્રાથમિક રંગ"), - ("HSV Color", "HSV રંગ"), - ("Installation Successful!", "ઇન્સ્ટોલેશન સફળ!"), - ("Installation failed!", "ઇન્સ્ટોલેશન નિષ્ફળ!"), - ("Reverse mouse wheel", "માઉસ વ્હીલ ઊલટું કરો"), - ("{} sessions", "{} સત્રો"), - ("scam_title", "છેતરપિંડીની ચેતવણી!"), - ("scam_text1", "જો તમે અજાણી વ્યક્તિ સાથે વાત કરી રહ્યા હો અને તેણે RustDesk વાપરવા કહ્યું હોય, તો તરત ડિસ્કનેક્ટ કરો."), - ("scam_text2", "આ એક છેતરપિંડી હોઈ શકે છે. કોઈને પાસવર્ડ આપશો નહીં."), - ("Don't show again", "ફરીથી ના બતાવશો"), - ("I Agree", "હું સહમત છું"), - ("Decline", "અસ્વીકાર"), - ("Timeout in minutes", "મિનિટોમાં ટાઇમઆઉટ"), - ("auto_disconnect_option_tip", "નિષ્ક્રિયતા પર આપમેળે ડિસ્કનેક્ટ કરો"), - ("Connection failed due to inactivity", "નિષ્ક્રિયતાને કારણે કનેક્શન નિષ્ફળ"), - ("Check for software update on startup", "શરૂઆતમાં અપડેટ તપાસો"), - ("upgrade_rustdesk_server_pro_to_{}_tip", "સર્વર પ્રો ને {} માં અપગ્રેડ કરો"), - ("pull_group_failed_tip", "ગ્રુપ ખેંચવામાં (Pull) નિષ્ફળ"), - ("Filter by intersection", "ઇન્ટરસેક્શન દ્વારા ફિલ્ટર કરો"), - ("Remove wallpaper during incoming sessions", "કનેક્શન દરમિયાન વોલપેપર હટાવો"), - ("Test", "ટેસ્ટ"), - ("display_is_plugged_out_msg", "ડિસ્પ્લે કાઢી નાખવામાં આવ્યું છે."), - ("No displays", "કોઈ ડિસ્પ્લે નથી"), - ("Open in new window", "નવી વિન્ડોમાં ખોલો"), - ("Show displays as individual windows", "દરેક ડિસ્પ્લે અલગ વિન્ડોમાં બતાવો"), - ("Use all my displays for the remote session", "તમામ ડિસ્પ્લેનો ઉપયોગ કરો"), - ("selinux_tip", "SELinux ઉપકરણ પર સક્ષમ છે."), - ("Change view", "વ્યુ બદલો"), - ("Big tiles", "મોટી ટાઇલ્સ"), - ("Small tiles", "નાની ટાઇલ્સ"), - ("List", "લિસ્ટ"), - ("Virtual display", "વર્ચ્યુઅલ ડિસ્પ્લે"), - ("Plug out all", "બધું કાઢી નાખો (Plug out)"), - ("True color (4:4:4)", "ટ્રુ કલર (4:4:4)"), - ("Enable blocking user input", "યુઝર ઇનપુટ બ્લોકિંગ સક્ષમ કરો"), - ("id_input_tip", "તમે ID, Alias અથવા IP એડ્રેસ દાખલ કરી શકો છો."), - ("privacy_mode_impl_mag_tip", "મેગ્નિફાયર પ્રાઇવસી મોડ"), - ("privacy_mode_impl_virtual_display_tip", "વર્ચ્યુઅલ ડિસ્પ્લે પ્રાઇવસી મોડ"), - ("Enter privacy mode", "પ્રાઇવસી મોડમાં પ્રવેશ કરો"), - ("Exit privacy mode", "પ્રાઇવસી મોડમાંથી બહાર નીકળો"), - ("idd_not_support_under_win10_2004_tip", "વર્ચ્યુઅલ ડિસ્પ્લે Windows 10 (2004) કે તેથી ઉપર જ સક્ષમ છે."), - ("input_source_1_tip", "ઇનપુટ સ્ત્રોત ૧"), - ("input_source_2_tip", "ઇનપુટ સ્ત્રોત ૨"), - ("Swap control-command key", "Control અને Command કી બદલો"), - ("swap-left-right-mouse", "ડાબું અને જમણું માઉસ બટન બદલો"), - ("2FA code", "2FA કોડ"), - ("More", "વધારે"), - ("enable-2fa-title", "2FA સક્ષમ કરો"), - ("enable-2fa-desc", "તમારું ઓથેન્ટિકેટર એપ સેટ કરો."), - ("wrong-2fa-code", "ખોટો 2FA કોડ."), - ("enter-2fa-title", "2FA કોડ દાખલ કરો"), - ("Email verification code must be 6 characters.", "ઇમેઇલ કોડ 6 અક્ષરનો હોવો જોઈએ."), - ("2FA code must be 6 digits.", "2FA કોડ 6 અંકનો હોવો જોઈએ."), - ("Multiple Windows sessions found", "બહુવિધ Windows સત્રો મળ્યા"), - ("Please select the session you want to connect to", "કૃપા કરીને જે સત્ર સાથે જોડાવું હોય તે પસંદ કરો"), - ("powered_by_me", "મારા દ્વારા સંચાલિત"), - ("outgoing_only_desk_tip", "આ માત્ર આઉટગોઇંગ મોડ છે"), - ("preset_password_warning", "સુરક્ષા માટે પાસવર્ડ બદલો."), - ("Security Alert", "સુરક્ષા ચેતવણી"), - ("My address book", "મારી એડ્રેસ બુક"), - ("Personal", "વ્યક્તિગત"), - ("Owner", "માલિક"), - ("Set shared password", "શેર કરેલ પાસવર્ડ સેટ કરો"), - ("Exist in", "માં અસ્તિત્વ ધરાવે છે"), - ("Read-only", "માત્ર વાંચવા માટે"), - ("Read/Write", "વાંચવા/લખવા માટે"), - ("Full Control", "પૂર્ણ નિયંત્રણ"), - ("share_warning_tip", "તમે તમારો એક્સેસ શેર કરી રહ્યા છો."), - ("Everyone", "દરેક વ્યક્તિ"), - ("ab_web_console_tip", "વેબ કન્સોલ એડ્રેસ બુક"), - ("allow-only-conn-window-open-tip", "માત્ર RustDesk વિન્ડો ખુલ્લી હોય ત્યારે જ કનેક્શનની મંજૂરી આપો"), - ("no_need_privacy_mode_no_physical_displays_tip", "ભૌતિક ડિસ્પ્લે નથી, પ્રાઇવસી મોડની જરૂર નથી."), - ("Follow remote cursor", "રિમોટ કર્સરને અનુસરો"), - ("Follow remote window focus", "રિમોટ વિન્ડો ફોકસને અનુસરો"), - ("default_proxy_tip", "ડિફોલ્ટ પ્રોક્સી સેટિંગ"), - ("no_audio_input_device_tip", "કોઈ ઓડિયો ઇનપુટ મળ્યું નથી."), - ("Incoming", "આવતું"), - ("Outgoing", "જતું"), - ("Clear Wayland screen selection", "Wayland સ્ક્રીન સિલેક્શન સાફ કરો"), - ("clear_Wayland_screen_selection_tip", "સ્ક્રીન સિલેક્શન રીસેટ કરો."), - ("confirm_clear_Wayland_screen_selection_tip", "શું તમે સિલેક્શન સાફ કરવા માંગો છો?"), - ("android_new_voice_call_tip", "નવો વોઇસ કોલ વિનંતી"), - ("texture_render_tip", "ટેક્સચર રેન્ડરિંગ વાપરો"), - ("Use texture rendering", "ટેક્સચર રેન્ડરિંગનો ઉપયોગ કરો"), - ("Floating window", "ફ્લોટિંગ વિન્ડો"), - ("floating_window_tip", "બેકગ્રાઉન્ડમાં હોય ત્યારે RustDesk બતાવો"), - ("Keep screen on", "સ્ક્રીન ચાલુ રાખો"), - ("Never", "ક્યારેય નહીં"), - ("During controlled", "નિયંત્રણ દરમિયાન"), - ("During service is on", "જ્યારે સેવા ચાલુ હોય ત્યારે"), - ("Capture screen using DirectX", "DirectX દ્વારા સ્ક્રીન કેપ્ચર કરો"), - ("Back", "પાછળ"), - ("Apps", "એપ્સ"), - ("Volume up", "અવાજ વધારો"), - ("Volume down", "અવાજ ઘટાડો"), - ("Power", "પાવર"), - ("Telegram bot", "Telegram બોટ"), - ("enable-bot-tip", "સૂચનાઓ માટે બોટ સક્ષમ કરો"), - ("enable-bot-desc", "સૂચનાઓ માટે ટેલિગ્રામ બોટ સેટ કરો."), - ("cancel-2fa-confirm-tip", "શું તમે 2FA રદ કરવા માંગો છો?"), - ("cancel-bot-confirm-tip", "શું તમે બોટ રદ કરવા માંગો છો?"), - ("About RustDesk", "RustDesk વિશે"), - ("Send clipboard keystrokes", "ક્લિપબોર્ડ કી-સ્ટ્રોક્સ મોકલો"), - ("network_error_tip", "નેટવર્ક ભૂલ, ફરી પ્રયાસ કરો."), - ("Unlock with PIN", "PIN થી અનલોક કરો"), - ("Requires at least {} characters", "ઓછામાં ઓછા {} અક્ષર જરૂરી"), - ("Wrong PIN", "ખોટો PIN"), - ("Set PIN", "PIN સેટ કરો"), - ("Enable trusted devices", "વિશ્વાસપાત્ર ઉપકરણો સક્ષમ કરો"), - ("Manage trusted devices", "વિશ્વાસપાત્ર ઉપકરણો સંચાલિત કરો"), - ("Platform", "પ્લેટફોર્મ"), - ("Days remaining", "બાકી દિવસો"), - ("enable-trusted-devices-tip", "માત્ર વિશ્વાસપાત્ર ઉપકરણો જ પાસવર્ડ વગર જોડાઈ શકે"), - ("Parent directory", "પેરન્ટ ડિરેક્ટરી"), - ("Resume", "ફરી શરૂ કરો"), - ("Invalid file name", "અમાન્ય ફાઇલ નામ"), - ("one-way-file-transfer-tip", "માત્ર એકતરફી ફાઇલ ટ્રાન્સફરની મંજૂરી છે"), - ("Authentication Required", "ઓથેન્ટિકેશન જરૂરી"), - ("Authenticate", "ઓથેન્ટિકેટ કરો"), - ("web_id_input_tip", "રિમોટ ID દાખલ કરો"), - ("Download", "ડાઉનલોડ"), - ("Upload folder", "ફોલ્ડર અપલોડ કરો"), - ("Upload files", "ફાઇલો અપલોડ કરો"), - ("Clipboard is synchronized", "ક્લિપબોર્ડ સિંક થયેલ છે"), - ("Update client clipboard", "ક્લાયન્ટ ક્લિપબોર્ડ અપડેટ કરો"), - ("Untagged", "ટેગ વગરનું"), - ("new-version-of-{}-tip", "{} નું નવું વર્ઝન ઉપલબ્ધ છે"), - ("Accessible devices", "એક્સેસિબલ ઉપકરણો"), - ("upgrade_remote_rustdesk_client_to_{}_tip", "રિમોટ ક્લાયન્ટને {} માં અપગ્રેડ કરો"), - ("d3d_render_tip", "D3D રેન્ડરિંગ વાપરો"), - ("Use D3D rendering", ""), - ("Printer", "પ્રિન્ટર"), - ("printer-os-requirement-tip", "પ્રિન્ટિંગ માટે Windows જરૂરી છે."), - ("printer-requires-installed-{}-client-tip", "આ માટે {} ક્લાયન્ટ ઇન્સ્ટોલ હોવું જોઈએ."), - ("printer-{}-not-installed-tip", "પ્રિન્ટર {} ઇન્સ્ટોલ નથી."), - ("printer-{}-ready-tip", "પ્રિન્ટર {} તૈયાર છે."), - ("Install {} Printer", "{} પ્રિન્ટર ઇન્સ્ટોલ કરો"), - ("Outgoing Print Jobs", "જતા પ્રિન્ટ કાર્યો"), - ("Incoming Print Jobs", "આવતા પ્રિન્ટ કાર્યો"), - ("Incoming Print Job", "આવતું પ્રિન્ટ કાર્ય"), - ("use-the-default-printer-tip", "ડિફોલ્ટ પ્રિન્ટર વાપરો"), - ("use-the-selected-printer-tip", "પસંદ કરેલ પ્રિન્ટર વાપરો"), - ("auto-print-tip", "આપમેળે પ્રિન્ટ કરો"), - ("print-incoming-job-confirm-tip", "પ્રિન્ટ કરતા પહેલા પુષ્ટિ કરો"), - ("remote-printing-disallowed-tile-tip", "રિમોટ પ્રિન્ટિંગની મંજૂરી નથી"), - ("remote-printing-disallowed-text-tip", "સેટિંગ્સમાં રિમોટ પ્રિન્ટિંગ સક્ષમ કરો."), - ("save-settings-tip", "સેટિંગ્સ સાચવો"), - ("dont-show-again-tip", "ફરીથી ના બતાવશો"), - ("Take screenshot", "સ્ક્રીનશોટ લો"), - ("Taking screenshot", "સ્ક્રીનશોટ લેવાઈ રહ્યો છે"), - ("screenshot-merged-screen-not-supported-tip", "મર્જ કરેલ સ્ક્રીનશોટ સપોર્ટેડ નથી."), - ("screenshot-action-tip", "સ્ક્રીનશોટ પછીની ક્રિયા"), - ("Save as", "તરીકે સાચવો"), - ("Copy to clipboard", "ક્લિપબોર્ડમાં કોપી કરો"), - ("Enable remote printer", "રિમોટ પ્રિન્ટર સક્ષમ કરો"), - ("Downloading {}", "{} ડાઉનલોડ થઈ રહ્યું છે"), - ("{} Update", "{} અપડેટ"), - ("{}-to-update-tip", "અપડેટ કરવા માટે {}"), - ("download-new-version-failed-tip", "નવું વર્ઝન ડાઉનલોડ કરવામાં નિષ્ફળ."), - ("Auto update", "ઓટો અપડેટ"), - ("update-failed-check-msi-tip", "અપડેટ નિષ્ફળ, MSI ફાઇલ તપાસો."), - ("websocket_tip", "જો પોર્ટ બ્લોક હોય તો WebSocket વાપરો."), - ("Use WebSocket", "WebSocket નો ઉપયોગ કરો"), - ("Trackpad speed", "ટ્રેકપેડ સ્પીડ"), - ("Default trackpad speed", "ડિફોલ્ટ ટ્રેકપેડ સ્પીડ"), - ("Numeric one-time password", "ન્યુમેરિક OTP"), - ("Enable IPv6 P2P connection", "IPv6 P2P કનેક્શન સક્ષમ કરો"), - ("Enable UDP hole punching", "UDP હોલ પંચિંગ સક્ષમ કરો"), - ("View camera", "કેમેરા જુઓ"), - ("Enable camera", "કેમેરા સક્ષમ કરો"), - ("No cameras", "કોઈ કેમેરા મળ્યો નથી"), - ("view_camera_unsupported_tip", "રિમોટ કેમેરા સપોર્ટેડ નથી."), - ("Terminal", "ટર્મિનલ"), - ("Enable terminal", "ટર્મિનલ સક્ષમ કરો"), - ("New tab", "નવી ટેબ"), - ("Keep terminal sessions on disconnect", "ડિસ્કનેક્ટ વખતે ટર્મિનલ ચાલુ રાખો"), - ("Terminal (Run as administrator)", "ટર્મિનલ (એડમિનિસ્ટ્રેટર તરીકે)"), - ("terminal-admin-login-tip", "એડમિન લોગિન જરૂરી છે."), - ("Failed to get user token.", "યુઝર ટોકન મેળવવામાં નિષ્ફળ."), - ("Incorrect username or password.", "ખોટું યુઝરનેમ કે પાસવર્ડ."), - ("The user is not an administrator.", "યુઝર એડમિનિસ્ટ્રેટર નથી."), - ("Failed to check if the user is an administrator.", "યુઝર એડમિન છે કે નહીં તે ચકાસવામાં નિષ્ફળ."), - ("Supported only in the installed version.", "માત્ર ઇન્સ્ટોલ કરેલ વર્ઝનમાં ઉપલબ્ધ."), - ("elevation_username_tip", "એડમિનિસ્ટ્રેટર નામ દાખલ કરો"), - ("Preparing for installation ...", "ઇન્સ્ટોલેશનની તૈયારી..."), - ("Show my cursor", "મારું કર્સર બતાવો"), - ("Scale custom", "કસ્ટમ સ્કેલ"), - ("Custom scale slider", "કસ્ટમ સ્કેલ સ્લાઇડર"), - ("Decrease", "ઘટાડો"), - ("Increase", "વધારો"), - ("Show virtual mouse", "વર્ચ્યુઅલ માઉસ બતાવો"), - ("Virtual mouse size", "વર્ચ્યુઅલ માઉસ કદ"), - ("Small", "નાનું"), - ("Large", "મોટું"), - ("Show virtual joystick", "વર્ચ્યુઅલ જોયસ્ટિક બતાવો"), - ("Edit note", "નોંધ સુધારો"), - ("Alias", "Alias (ઉપનામ)"), - ("ScrollEdge", "સ્ક્રોલ એજ"), - ("Allow insecure TLS fallback", "અસુરક્ષિત TLS ફોલબેકની મંજૂરી આપો"), - ("allow-insecure-tls-fallback-tip", "જૂના સર્વર માટે વાપરો."), - ("Disable UDP", "UDP અક્ષમ કરો"), - ("disable-udp-tip", "કનેક્શન સમસ્યાઓ માટે UDP બંધ કરો."), - ("server-oss-not-support-tip", "OSS સર્વર આને સપોર્ટ કરતું નથી."), - ("input note here", "અહીં નોંધ લખો"), - ("note-at-conn-end-tip", "કનેક્શનના અંતે નોંધ બતાવો"), - ("Show terminal extra keys", "ટર્મિનલની વધારાની કી બતાવો"), - ("Relative mouse mode", "રીલેટિવ માઉસ મોડ"), - ("rel-mouse-not-supported-peer-tip", "સામેથી સપોર્ટેડ નથી."), - ("rel-mouse-not-ready-tip", "તૈયાર નથી."), - ("rel-mouse-lock-failed-tip", "માઉસ લોક નિષ્ફળ."), - ("rel-mouse-exit-{}-tip", "બહાર નીકળવા {} દબાવો"), - ("rel-mouse-permission-lost-tip", "પરવાનગી ગુમાવી દીધી."), - ("Changelog", "Changelog (ફેરફારો)"), - ("keep-awake-during-outgoing-sessions-label", "આઉટગોઇંગ સત્ર વખતે જાગૃત રાખો"), - ("keep-awake-during-incoming-sessions-label", "ઇનકમિંગ સત્ર વખતે જાગૃત રાખો"), - ("Continue with {}", "{} સાથે આગળ વધો"), - ("Display Name", "ડિસ્પ્લે નામ"), - ("password-hidden-tip", "સુરક્ષા માટે પાસવર્ડ છુપાવેલ છે."), - ("preset-password-in-use-tip", "પ્રીસેટ પાસવર્ડ વપરાશમાં છે."), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), - ].iter().cloned().collect(); -} diff --git a/src/lang/he.rs b/src/lang/he.rs index 44b940784..af33c8c5f 100644 --- a/src/lang/he.rs +++ b/src/lang/he.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "סיסמת מערכת הפעלה"), ("install_tip", "בגלל UAC, RustDesk לא יכול לפעול כראוי כצד מרוחק בחלק מהמקרים. כדי להימנע מ-UAC, אנא לחץ על הכפתור למטה כדי להתקין את RustDesk במערכת."), ("Click to upgrade", "לחץ כדי לשדרג"), + ("Click to download", "לחץ כדי להוריד"), + ("Click to update", "לחץ כדי לעדכן"), ("Configure", "הגדר"), ("config_acc", "כדי לשלוט מרחוק בשולחן העבודה שלך, עליך להעניק ל-RustDesk הרשאות \"נגישות\"."), ("config_screen", "כדי לגשת מרחוק לשולחן העבודה שלך, עליך להעניק ל-RustDesk הרשאות \"הקלטת מסך\"."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "הגדרות מקלדת"), ("Full Access", "גישה מלאה"), ("Screen Share", "שיתוף מסך"), - ("ubuntu-21-04-required", "Wayland דורש Ubuntu 21.04 או גרסה גבוהה יותר"), - ("wayland-requires-higher-linux-version", "Wayland דורש גרסת הפצת לינוקס גבוהה יותר. אנא נסה שולחן עבודה מסוג X11 או החלף מערכת הפעלה"), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland דורש Ubuntu 21.04 או גרסה גבוהה יותר"), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland דורש גרסת הפצת לינוקס גבוהה יותר. אנא נסה שולחן עבודה מסוג X11 או החלף מערכת הפעלה"), ("JumpLink", "קישור מהיר"), ("Please Select the screen to be shared(Operate on the peer side).", "אנא בחר את המסך לשיתוף (פעולה בצד העמית)."), ("Show RustDesk", "הצג את RustDesk"), ("This PC", "מחשב זה"), ("or", "או"), + ("Continue with", "המשך עם"), ("Elevate", "הפעל הרשאות מורחבות"), ("Zoom cursor", "הגדל סמן"), ("Accept sessions via password", "קבל הפעלות באמצעות סיסמה"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "עדיין אין עמיתים מועדפים?\nבא נמצא מישהו להתחבר אליו ונוסיף אותו למועדפים!"), ("empty_lan_tip", "אוי לא, נראה שעדיין לא גילינו עמיתים."), ("empty_address_book_tip", "אבוי, נראה שכרגע אין עמיתים בספר הכתובות שלך."), + ("eg: admin", "לדוגמה: admin"), ("Empty Username", "שם משתמש ריק"), ("Empty Password", "סיסמה ריקה"), ("Me", "אני"), @@ -696,54 +699,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable camera", "הפעל מצלמה"), ("No cameras", "אין מצלמות"), ("view_camera_unsupported_tip", "הצגת מצלמה אינה נתמכת במכשיר המרוחק"), - ("Terminal", "מסוף"), - ("Enable terminal", "אפשר מסוף"), - ("New tab", "טאב חדש"), - ("Keep terminal sessions on disconnect", "שמור על הטרמינל סשן בניתוק"), - ("Terminal (Run as administrator)", "מסוף (הרץ כמנהל)"), - ("terminal-admin-login-tip", "מסוף-טיפ-כניסת-אדמין"), - ("Failed to get user token.", "נכשל בקבלת הטוקן של המשתמש"), - ("Incorrect username or password.", "שם משתמש או סיסמא אינם נכונים"), - ("The user is not an administrator.", "המשתמש אינו מנהל"), - ("Failed to check if the user is an administrator.", "נכשל בבדיקה אם המשתמש הוא מנהל"), - ("Supported only in the installed version.", "נתמך רק בגרסה המותקנת"), - ("elevation_username_tip", "רמז_ליוזר_להעלאת_הרשאה"), - ("Preparing for installation ...", "הכנה להתקנה..."), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "המשך עם {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/hi.rs b/src/lang/hi.rs deleted file mode 100644 index 904d43118..000000000 --- a/src/lang/hi.rs +++ /dev/null @@ -1,749 +0,0 @@ -lazy_static::lazy_static! { -pub static ref T: std::collections::HashMap<&'static str, &'static str> = - [ - ("Status", "स्थिति"), - ("Your Desktop", "आपका डेस्कटॉप"), - ("desk_tip", "आपका डेस्कटॉप इस आईडी और पासवर्ड से एक्सेस किया जा सकता है।"), - ("Password", "पासवर्ड"), - ("Ready", "तैयार"), - ("Established", "स्थापित"), - ("connecting_status", "नेटवर्क से जुड़ रहा है..."), - ("Enable service", "सेवा सक्षम करें"), - ("Start service", "सेवा शुरू करें"), - ("Service is running", "सेवा चल रही है"), - ("Service is not running", "सेवा नहीं चल रही है"), - ("not_ready_status", "तैयार नहीं। कृपया अपना कनेक्शन जांचें"), - ("Control Remote Desktop", "रिमोट डेस्कटॉप नियंत्रित करें"), - ("Transfer file", "फ़ाइल स्थानांतरण"), - ("Connect", "जुड़ें"), - ("Recent sessions", "हाल के सत्र"), - ("Address book", "पता पुस्तिका"), - ("Confirmation", "पुष्टि"), - ("TCP tunneling", "TCP टनलिंग"), - ("Remove", "हटाएं"), - ("Refresh random password", "यादृच्छिक (Random) पासवर्ड बदलें"), - ("Set your own password", "अपना पासवर्ड सेट करें"), - ("Enable keyboard/mouse", "कीबोर्ड/माउस सक्षम करें"), - ("Enable clipboard", "क्लिपबोर्ड सक्षम करें"), - ("Enable file transfer", "फ़ाइल स्थानांतरण सक्षम करें"), - ("Enable TCP tunneling", "TCP टनलिंग सक्षम करें"), - ("IP Whitelisting", "IP श्वेतसूची (Whitelisting)"), - ("ID/Relay Server", "ID/रिले सर्वर"), - ("Import server config", "सर्वर कॉन्फ़िगरेशन इम्पोर्ट करें"), - ("Export Server Config", "सर्वर कॉन्फ़िगरेशन एक्सपोर्ट करें"), - ("Import server configuration successfully", "सर्वर कॉन्फ़िगरेशन सफलतापूर्वक इम्पोर्ट किया गया"), - ("Export server configuration successfully", "सर्वर कॉन्फ़िगरेशन सफलतापूर्वक एक्सपोर्ट किया गया"), - ("Invalid server configuration", "अमान्य सर्वर कॉन्फ़िगरेशन"), - ("Clipboard is empty", "क्लिपबोर्ड खाली है"), - ("Stop service", "सेवा रोकें"), - ("Change ID", "ID बदलें"), - ("Your new ID", "आपकी नई ID"), - ("length %min% to %max%", "लंबाई %min% से %max% तक"), - ("starts with a letter", "एक अक्षर से शुरू होता है"), - ("allowed characters", "अनुमत अक्षर"), - ("id_change_tip", "ID बदलने के बाद वर्तमान कनेक्शन टूट जाएगा।"), - ("Website", "वेबसाइट"), - ("About", "के बारे में"), - ("Slogan_tip", "बेहतर अनुभव के लिए बनाया गया रिमोट डेस्कटॉप सॉफ़्टवेयर"), - ("Privacy Statement", "गोपनीयता कथन"), - ("Mute", "म्यूट करें"), - ("Build Date", "निर्माण तिथि"), - ("Version", "संस्करण"), - ("Home", "होम"), - ("Audio Input", "ऑडियो इनपुट"), - ("Enhancements", "वृद्धि (Enhancements)"), - ("Hardware Codec", "हार्डवेयर कोडेक"), - ("Adaptive bitrate", "अनुकूली (Adaptive) बिटरेट"), - ("ID Server", "ID सर्वर"), - ("Relay Server", "रिले सर्वर"), - ("API Server", "API सर्वर"), - ("invalid_http", "अमान्य HTTP लिंक"), - ("Invalid IP", "अमान्य IP"), - ("Invalid format", "अमान्य प्रारूप"), - ("server_not_support", "सर्वर द्वारा समर्थित नहीं"), - ("Not available", "उपलब्ध नहीं"), - ("Too frequent", "बहुत बार-बार"), - ("Cancel", "रद्द करें"), - ("Skip", "छोड़ें"), - ("Close", "बंद करें"), - ("Retry", "पुनः प्रयास करें"), - ("OK", "ठीक है"), - ("Password Required", "पासवर्ड आवश्यक है"), - ("Please enter your password", "कृपया अपना पासवर्ड दर्ज करें"), - ("Remember password", "पासवर्ड याद रखें"), - ("Wrong Password", "गलत पासवर्ड"), - ("Do you want to enter again?", "क्या आप दोबारा दर्ज करना चाहते हैं?"), - ("Connection Error", "कनेक्शन त्रुटि"), - ("Error", "त्रुटि"), - ("Reset by the peer", "दूसरे सिस्टम द्वारा रिसेट किया गया"), - ("Connecting...", "जुड़ रहा है..."), - ("Connection in progress. Please wait.", "कनेक्शन जारी है। कृपया प्रतीक्षा करें।"), - ("Please try 1 minute later", "कृपया 1 मिनट बाद पुनः प्रयास करें"), - ("Login Error", "लॉगिन त्रुटि"), - ("Successful", "सफल"), - ("Connected, waiting for image...", "जुड़ गया, इमेज की प्रतीक्षा कर रहा है..."), - ("Name", "नाम"), - ("Type", "प्रकार"), - ("Modified", "संशोधित"), - ("Size", "आकार"), - ("Show Hidden Files", "छिपी हुई फाइलें दिखाएं"), - ("Receive", "प्राप्त करें"), - ("Send", "भेजें"), - ("Refresh File", "फ़ाइल रिफ्रेश करें"), - ("Local", "स्थानीय (Local)"), - ("Remote", "रिमोट"), - ("Remote Computer", "रिमोट कंप्यूटर"), - ("Local Computer", "स्थानीय कंप्यूटर"), - ("Confirm Delete", "हटाने की पुष्टि करें"), - ("Delete", "हटाएं"), - ("Properties", "गुण (Properties)"), - ("Multi Select", "बहु-चयन"), - ("Select All", "सभी चुनें"), - ("Unselect All", "सभी अचयनित करें"), - ("Empty Directory", "खाली निर्देशिका"), - ("Not an empty directory", "निर्देशिका खाली नहीं है"), - ("Are you sure you want to delete this file?", "क्या आप वाकई इस फ़ाइल को हटाना चाहते हैं?"), - ("Are you sure you want to delete this empty directory?", "क्या आप वाकई इस खाली निर्देशिका को हटाना चाहते हैं?"), - ("Are you sure you want to delete the file of this directory?", "क्या आप वाकई इस निर्देशिका की फ़ाइल को हटाना चाहते हैं?"), - ("Do this for all conflicts", "सभी विवादों के लिए यह करें"), - ("This is irreversible!", "इसे वापस नहीं लिया जा सकता!"), - ("Deleting", "हटाया जा रहा है"), - ("files", "फाइलें"), - ("Waiting", "प्रतीक्षा कर रहा है"), - ("Finished", "पूरा हुआ"), - ("Speed", "गति"), - ("Custom Image Quality", "कस्टम इमेज गुणवत्ता"), - ("Privacy mode", "गोपनीयता मोड"), - ("Block user input", "उपयोगकर्ता इनपुट ब्लॉक करें"), - ("Unblock user input", "उपयोगकर्ता इनपुट अनब्लॉक करें"), - ("Adjust Window", "विंडो समायोजित करें"), - ("Original", "मूल (Original)"), - ("Shrink", "सिकुड़ें"), - ("Stretch", "खिंचाव (Stretch)"), - ("Scrollbar", "स्क्रोलबार"), - ("ScrollAuto", "ऑटो स्क्रॉल"), - ("Good image quality", "अच्छी इमेज गुणवत्ता"), - ("Balanced", "संतुलित"), - ("Optimize reaction time", "प्रतिक्रिया समय अनुकूलित करें"), - ("Custom", "कस्टम"), - ("Show remote cursor", "रिमोट कर्सर दिखाएं"), - ("Show quality monitor", "गुणवत्ता मॉनिटर दिखाएं"), - ("Disable clipboard", "क्लिपबोर्ड अक्षम करें"), - ("Lock after session end", "सत्र समाप्त होने के बाद लॉक करें"), - ("Insert Ctrl + Alt + Del", "Ctrl + Alt + Del डालें"), - ("Insert Lock", "लॉक डालें"), - ("Refresh", "रिफ्रेश करें"), - ("ID does not exist", "ID मौजूद नहीं है"), - ("Failed to connect to rendezvous server", "Rendezvous सर्वर से जुड़ने में विफल"), - ("Please try later", "कृपया बाद में प्रयास करें"), - ("Remote desktop is offline", "रिमोट डेस्कटॉप ऑफ़लाइन है"), - ("Key mismatch", "कुंजी बेमेल (Key mismatch)"), - ("Timeout", "समय समाप्त"), - ("Failed to connect to relay server", "रिले सर्वर से जुड़ने में विफल"), - ("Failed to connect via rendezvous server", "Rendezvous सर्वर के माध्यम से जुड़ने में विफल"), - ("Failed to connect via relay server", "रिले सर्वर के माध्यम से जुड़ने में विफल"), - ("Failed to make direct connection to remote desktop", "रिमोट डेस्कटॉप से सीधा कनेक्शन बनाने में विफल"), - ("Set Password", "पासवर्ड सेट करें"), - ("OS Password", "OS पासवर्ड"), - ("install_tip", "सर्वोत्तम प्रदर्शन के लिए, इसे इंस्टॉल करें।"), - ("Click to upgrade", "अपग्रेड करने के लिए क्लिक करें"), - ("Configure", "कॉन्फ़िगर करें"), - ("config_acc", "एक्सेसिबिलिटी कॉन्फ़िगर करें"), - ("config_screen", "स्क्रीन कॉन्फ़िगर करें"), - ("Installing ...", "इंस्टॉल हो रहा है..."), - ("Install", "इंस्टॉल करें"), - ("Installation", "इंस्टॉलेशन"), - ("Installation Path", "इंस्टॉलेशन पाथ"), - ("Create start menu shortcuts", "स्टार्ट मेनू शॉर्टकट बनाएं"), - ("Create desktop icon", "डेस्कटॉप आइकन बनाएं"), - ("agreement_tip", "इंस्टॉल करके आप लाइसेंस समझौते को स्वीकार करते हैं।"), - ("Accept and Install", "स्वीकार करें और इंस्टॉल करें"), - ("End-user license agreement", "अंतिम उपयोगकर्ता लाइसेंस समझौता"), - ("Generating ...", "बनाया जा रहा है..."), - ("Your installation is lower version.", "आपका वर्तमान इंस्टॉलेशन पुराना संस्करण है।"), - ("not_close_tcp_tip", "टनल का उपयोग करते समय इस विंडो को बंद न करें।"), - ("Listening ...", "सुन रहा है (Listening)..."), - ("Remote Host", "रिमोट होस्ट"), - ("Remote Port", "रिमोट पोर्ट"), - ("Action", "कार्य"), - ("Add", "जोड़ें"), - ("Local Port", "स्थानीय पोर्ट"), - ("Local Address", "स्थानीय पता"), - ("Change Local Port", "स्थानीय पोर्ट बदलें"), - ("setup_server_tip", "तेज़ कनेक्शन के लिए अपना खुद का सर्वर सेटअप करें"), - ("Too short, at least 6 characters.", "बहुत छोटा, कम से कम 6 अक्षर होने चाहिए।"), - ("The confirmation is not identical.", "पुष्टि समान नहीं है।"), - ("Permissions", "अनुमतियाँ"), - ("Accept", "स्वीकार करें"), - ("Dismiss", "खारिज करें"), - ("Disconnect", "डिस्कनेक्ट करें"), - ("Enable file copy and paste", "फ़ाइल कॉपी और पेस्ट सक्षम करें"), - ("Connected", "जुड़ गया"), - ("Direct and encrypted connection", "सीधा और एन्क्रिप्टेड कनेक्शन"), - ("Relayed and encrypted connection", "रिले और एन्क्रिप्टेड कनेक्शन"), - ("Direct and unencrypted connection", "सीधा और अनएन्क्रिप्टेड कनेक्शन"), - ("Relayed and unencrypted connection", "रिले और अनएन्क्रिप्टेड कनेक्शन"), - ("Enter Remote ID", "रिमोट ID दर्ज करें"), - ("Enter your password", "अपना पासवर्ड दर्ज करें"), - ("Logging in...", "लॉग इन हो रहा है..."), - ("Enable RDP session sharing", "RDP सत्र साझाकरण सक्षम करें"), - ("Auto Login", "ऑटो लॉगिन"), - ("Enable direct IP access", "सीधी IP पहुंच सक्षम करें"), - ("Rename", "नाम बदलें"), - ("Space", "स्थान (Space)"), - ("Create desktop shortcut", "डेस्कटॉप शॉर्टकट बनाएं"), - ("Change Path", "पाथ बदलें"), - ("Create Folder", "फ़ोल्डर बनाएं"), - ("Please enter the folder name", "कृपया फ़ोल्डर का नाम दर्ज करें"), - ("Fix it", "इसे ठीक करें"), - ("Warning", "चेतावनी"), - ("Login screen using Wayland is not supported", "Wayland का उपयोग करने वाली लॉगिन स्क्रीन समर्थित नहीं है"), - ("Reboot required", "रीबूट आवश्यक है"), - ("Unsupported display server", "असमर्थित डिस्प्ले सर्वर"), - ("x11 expected", "x11 अपेक्षित है"), - ("Port", "पोर्ट"), - ("Settings", "सेटिंग्स"), - ("Username", "उपयोगकर्ता नाम"), - ("Invalid port", "अमान्य पोर्ट"), - ("Closed manually by the peer", "दूसरे सिस्टम द्वारा मैन्युअल रूप से बंद किया गया"), - ("Enable remote configuration modification", "रिमोट कॉन्फ़िगरेशन संशोधन सक्षम करें"), - ("Run without install", "बिना इंस्टॉल किए चलाएं"), - ("Connect via relay", "रिले के माध्यम से जुड़ें"), - ("Always connect via relay", "हमेशा रिले के माध्यम से जुड़ें"), - ("whitelist_tip", "केवल श्वेतसूचीबद्ध IP ही मुझ तक पहुंच सकते हैं"), - ("Login", "लॉगिन"), - ("Verify", "सत्यापित करें"), - ("Remember me", "मुझे याद रखें"), - ("Trust this device", "इस डिवाइस पर भरोसा करें"), - ("Verification code", "सत्यापन कोड"), - ("verification_tip", "एक सत्यापन कोड आपके ईमेल पर भेजा गया है"), - ("Logout", "लॉगआउट"), - ("Tags", "टैग"), - ("Search ID", "ID खोजें"), - ("whitelist_sep", "अल्पविराम, अर्धविराम या रिक्त स्थान द्वारा अलग किया गया"), - ("Add ID", "ID जोड़ें"), - ("Add Tag", "टैग जोड़ें"), - ("Unselect all tags", "सभी टैग अचयनित करें"), - ("Network error", "नेटवर्क त्रुटि"), - ("Username missed", "उपयोगकर्ता नाम छूट गया"), - ("Password missed", "पासवर्ड छूट गया"), - ("Wrong credentials", "गलत क्रेडेंशियल"), - ("The verification code is incorrect or has expired", "सत्यापन कोड गलत है या समाप्त हो गया है"), - ("Edit Tag", "टैग संपादित करें"), - ("Forget Password", "पासवर्ड भूल गए"), - ("Favorites", "पसंदीदा"), - ("Add to Favorites", "पसंदीदा में जोड़ें"), - ("Remove from Favorites", "पसंदीदा से हटाएं"), - ("Empty", "खाली"), - ("Invalid folder name", "अमान्य फ़ोल्डर नाम"), - ("Socks5 Proxy", "Socks5 प्रॉक्सी"), - ("Socks5/Http(s) Proxy", "Socks5/Http(s) प्रॉक्सी"), - ("Discovered", "खोजा गया"), - ("install_daemon_tip", "बूट पर शुरू करने के लिए सेवा इंस्टॉल करें"), - ("Remote ID", "रिमोट ID"), - ("Paste", "पेस्ट करें"), - ("Paste here?", "यहाँ पेस्ट करें?"), - ("Are you sure to close the connection?", "क्या आप वाकई कनेक्शन बंद करना चाहते हैं?"), - ("Download new version", "नया संस्करण डाउनलोड करें"), - ("Touch mode", "टच मोड"), - ("Mouse mode", "माउस मोड"), - ("One-Finger Tap", "एक उंगली से टैप"), - ("Left Mouse", "बायां माउस"), - ("One-Long Tap", "एक लंबा टैप"), - ("Two-Finger Tap", "दो उंगलियों से टैप"), - ("Right Mouse", "दायां माउस"), - ("One-Finger Move", "एक उंगली से हिलाएं"), - ("Double Tap & Move", "डबल टैप और हिलाएं"), - ("Mouse Drag", "माउस ड्रैग"), - ("Three-Finger vertically", "तीन उंगलियां लंबवत"), - ("Mouse Wheel", "माउस व्हील"), - ("Two-Finger Move", "दो उंगलियों से हिलाएं"), - ("Canvas Move", "कैनवास मूव"), - ("Pinch to Zoom", "ज़ूम करने के लिए पिंच करें"), - ("Canvas Zoom", "कैनवास ज़ूम"), - ("Reset canvas", "कैनवास रिसेट करें"), - ("No permission of file transfer", "फ़ाइल स्थानांतरण की अनुमति नहीं है"), - ("Note", "नोट"), - ("Connection", "कनेक्शन"), - ("Share screen", "स्क्रीन शेयर करें"), - ("Chat", "चैट"), - ("Total", "कुल"), - ("items", "आइटम"), - ("Selected", "चयनित"), - ("Screen Capture", "स्क्रीन कैप्चर"), - ("Input Control", "इनपुट नियंत्रण"), - ("Audio Capture", "ऑडियो कैप्चर"), - ("Do you accept?", "क्या आप स्वीकार करते हैं?"), - ("Open System Setting", "सिस्टम सेटिंग खोलें"), - ("How to get Android input permission?", "Android इनपुट अनुमति कैसे प्राप्त करें?"), - ("android_input_permission_tip1", "इनपुट अनुमति प्राप्त करने के लिए एक्सेसिबिलिटी सेवा सक्षम करें।"), - ("android_input_permission_tip2", "कृपया सिस्टम सेटिंग में RustDesk खोजें और इसे चालू करें।"), - ("android_new_connection_tip", "एक नया नियंत्रण अनुरोध प्राप्त हुआ है।"), - ("android_service_will_start_tip", "स्क्रीन कैप्चर चालू करने से सेवा अपने आप शुरू हो जाएगी।"), - ("android_stop_service_tip", "सेवा बंद करने से सभी कनेक्शन टूट जाएंगे।"), - ("android_version_audio_tip", "ऑडियो कैप्चर केवल Android 10 या उच्चतर पर समर्थित है।"), - ("android_start_service_tip", "स्क्रीन शेयरिंग सेवा शुरू करने के लिए क्लिक करें।"), - ("android_permission_may_not_change_tip", "अनुमतियाँ बाद में नहीं बदली जा सकती हैं, कृपया ध्यान से चुनें।"), - ("Account", "खाता"), - ("Overwrite", "ओवरराइट (Overwrite) करें"), - ("This file exists, skip or overwrite this file?", "यह फ़ाइल मौजूद है, छोड़ें या ओवरराइट करें?"), - ("Quit", "बाहर निकलें"), - ("Help", "सहायता"), - ("Failed", "विफल"), - ("Succeeded", "सफल"), - ("Someone turns on privacy mode, exit", "किसी ने गोपनीयता मोड चालू किया है, बाहर निकल रहे हैं"), - ("Unsupported", "असमर्थित"), - ("Peer denied", "दूसरे सिस्टम ने मना कर दिया"), - ("Please install plugins", "कृपया प्लगइन्स इंस्टॉल करें"), - ("Peer exit", "दूसरा सिस्टम बाहर निकल गया"), - ("Failed to turn off", "बंद करने में विफल"), - ("Turned off", "बंद कर दिया गया"), - ("Language", "भाषा"), - ("Keep RustDesk background service", "RustDesk बैकग्राउंड सेवा चालू रखें"), - ("Ignore Battery Optimizations", "बैटरी ऑप्टिमाइजेशन को अनदेखा करें"), - ("android_open_battery_optimizations_tip", "डिस्कनेक्शन से बचने के लिए बैटरी ऑप्टिमाइजेशन सेटिंग खोलें"), - ("Start on boot", "बूट पर शुरू करें"), - ("Start the screen sharing service on boot, requires special permissions", "बूट पर स्क्रीन शेयरिंग सेवा शुरू करें, विशेष अनुमतियों की आवश्यकता है"), - ("Connection not allowed", "कनेक्शन की अनुमति नहीं है"), - ("Legacy mode", "लेगेसी (Legacy) मोड"), - ("Map mode", "मैप मोड"), - ("Translate mode", "अनुवाद मोड"), - ("Use permanent password", "स्थायी पासवर्ड का उपयोग करें"), - ("Use both passwords", "दोनों पासवर्ड का उपयोग करें"), - ("Set permanent password", "स्थायी पासवर्ड सेट करें"), - ("Enable remote restart", "रिमोट रीस्टार्ट सक्षम करें"), - ("Restart remote device", "रिमोट डिवाइस रीस्टार्ट करें"), - ("Are you sure you want to restart", "क्या आप वाकई रीस्टार्ट करना चाहते हैं?"), - ("Restarting remote device", "रिमोट डिवाइस रीस्टार्ट हो रहा है"), - ("remote_restarting_tip", "रिमोट डिवाइस रीस्टार्ट हो रहा है, कृपया प्रतीक्षा करें..."), - ("Copied", "कॉपी किया गया"), - ("Exit Fullscreen", "फुलस्क्रीन से बाहर निकलें"), - ("Fullscreen", "फुलस्क्रीन"), - ("Mobile Actions", "मोबाइल क्रियाएं"), - ("Select Monitor", "मॉनिटर चुनें"), - ("Control Actions", "नियंत्रण क्रियाएं"), - ("Display Settings", "डिस्प्ले सेटिंग्स"), - ("Ratio", "अनुपात (Ratio)"), - ("Image Quality", "इमेज गुणवत्ता"), - ("Scroll Style", "स्क्रॉल शैली"), - ("Show Toolbar", "टूलबार दिखाएं"), - ("Hide Toolbar", "टूलबार छुपाएं"), - ("Direct Connection", "सीधा कनेक्शन"), - ("Relay Connection", "रिले कनेक्शन"), - ("Secure Connection", "सुरक्षित कनेक्शन"), - ("Insecure Connection", "असुरक्षित कनेक्शन"), - ("Scale original", "मूल पैमाना"), - ("Scale adaptive", "अनुकूली पैमाना"), - ("General", "सामान्य"), - ("Security", "सुरक्षा"), - ("Theme", "थीम"), - ("Dark Theme", "डार्क थीम"), - ("Light Theme", "लाइट थीम"), - ("Dark", "डार्क"), - ("Light", "लाइट"), - ("Follow System", "सिस्टम का पालन करें"), - ("Enable hardware codec", "हार्डवेयर कोडेक सक्षम करें"), - ("Unlock Security Settings", "सुरक्षा सेटिंग्स अनलॉक करें"), - ("Enable audio", "ऑडियो सक्षम करें"), - ("Unlock Network Settings", "नेटवर्क सेटिंग्स अनलॉक करें"), - ("Server", "सर्वर"), - ("Direct IP Access", "सीधी IP पहुंच"), - ("Proxy", "प्रॉक्सी"), - ("Apply", "लागू करें"), - ("Disconnect all devices?", "सभी डिवाइस डिस्कनेक्ट करें?"), - ("Clear", "साफ करें"), - ("Audio Input Device", "ऑडियो इनपुट डिवाइस"), - ("Use IP Whitelisting", "IP श्वेतसूची का उपयोग करें"), - ("Network", "नेटवर्क"), - ("Pin Toolbar", "टूलबार पिन करें"), - ("Unpin Toolbar", "टूलबार अनपिन करें"), - ("Recording", "रिकॉर्डिंग"), - ("Directory", "निर्देशिका"), - ("Automatically record incoming sessions", "आने वाले सत्रों को स्वचालित रूप से रिकॉर्ड करें"), - ("Automatically record outgoing sessions", "जाने वाले सत्रों को स्वचालित रूप से रिकॉर्ड करें"), - ("Change", "बदलें"), - ("Start session recording", "सत्र रिकॉर्डिंग शुरू करें"), - ("Stop session recording", "सत्र रिकॉर्डिंग रोकें"), - ("Enable recording session", "सत्र रिकॉर्डिंग सक्षम करें"), - ("Enable LAN discovery", "LAN खोज सक्षम करें"), - ("Deny LAN discovery", "LAN खोज अस्वीकार करें"), - ("Write a message", "संदेश लिखें"), - ("Prompt", "प्रॉम्प्ट"), - ("Please wait for confirmation of UAC...", "कृपया UAC की पुष्टि की प्रतीक्षा करें..."), - ("elevated_foreground_window_tip", "रिमोट डेस्कटॉप की वर्तमान विंडो को उच्च अनुमतियों की आवश्यकता है।"), - ("Disconnected", "डिस्कनेक्ट हो गया"), - ("Other", "अन्य"), - ("Confirm before closing multiple tabs", "एकाधिक टैब बंद करने से पहले पुष्टि करें"), - ("Keyboard Settings", "कीबोर्ड सेटिंग्स"), - ("Full Access", "पूर्ण पहुंच (Full Access)"), - ("Screen Share", "स्क्रीन शेयर"), - ("ubuntu-21-04-required", "Ubuntu 21.04 या उच्चतर आवश्यक है"), - ("wayland-requires-higher-linux-version", "Wayland के लिए उच्च Linux संस्करण आवश्यक है"), - ("xdp-portal-unavailable", "XDP पोर्टल अनुपलब्ध है"), - ("JumpLink", "JumpLink"), - ("Please Select the screen to be shared(Operate on the peer side).", "कृपया साझा की जाने वाली स्क्रीन चुनें (दूसरे सिस्टम पर संचालित करें)।"), - ("Show RustDesk", "RustDesk दिखाएं"), - ("This PC", "यह PC"), - ("or", "या"), - ("Elevate", "एलीवेट (Elevate) करें"), - ("Zoom cursor", "ज़ूम कर्सर"), - ("Accept sessions via password", "पासवर्ड के माध्यम से सत्र स्वीकार करें"), - ("Accept sessions via click", "क्लिक के माध्यम से सत्र स्वीकार करें"), - ("Accept sessions via both", "दोनों के माध्यम से सत्र स्वीकार करें"), - ("Please wait for the remote side to accept your session request...", "कृपया रिमोट साइड द्वारा आपके सत्र अनुरोध को स्वीकार करने की प्रतीक्षा करें..."), - ("One-time Password", "वन-टाइम पासवर्ड"), - ("Use one-time password", "वन-टाइम पासवर्ड का उपयोग करें"), - ("One-time password length", "वन-टाइम पासवर्ड की लंबाई"), - ("Request access to your device", "आपके डिवाइस तक पहुंच का अनुरोध"), - ("Hide connection management window", "कनेक्शन प्रबंधन विंडो छुपाएं"), - ("hide_cm_tip", "केवल तभी छुपाएं जब पासवर्ड से कनेक्शन की अनुमति हो"), - ("wayland_experiment_tip", "Wayland समर्थन अभी परीक्षण मोड में है"), - ("Right click to select tabs", "टैब चुनने के लिए राइट क्लिक करें"), - ("Skipped", "छोड़ दिया गया"), - ("Add to address book", "पता पुस्तिका में जोड़ें"), - ("Group", "समूह"), - ("Search", "खोजें"), - ("Closed manually by web console", "वेब कंसोल द्वारा मैन्युअल रूप से बंद किया गया"), - ("Local keyboard type", "स्थानीय कीबोर्ड प्रकार"), - ("Select local keyboard type", "स्थानीय कीबोर्ड प्रकार चुनें"), - ("software_render_tip", "यदि आपकी स्क्रीन काली है, तो इसे आज़माएं"), - ("Always use software rendering", "हमेशा सॉफ़्टवेयर रेंडरिंग का उपयोग करें"), - ("config_input", "इनपुट कॉन्फ़िगर करें"), - ("config_microphone", "माइक्रोफ़ोन कॉन्फ़िगर करें"), - ("request_elevation_tip", "रिमोट साइड से उच्च अनुमतियों का अनुरोध करें"), - ("Wait", "प्रतीक्षा करें"), - ("Elevation Error", "एलीवेशन (Elevation) त्रुटि"), - ("Ask the remote user for authentication", "रिमोट उपयोगकर्ता से प्रमाणीकरण मांगें"), - ("Choose this if the remote account is administrator", "यदि रिमोट खाता व्यवस्थापक (Admin) है तो इसे चुनें"), - ("Transmit the username and password of administrator", "व्यवस्थापक का उपयोगकर्ता नाम और पासवर्ड भेजें"), - ("still_click_uac_tip", "रिमोट उपयोगकर्ता को अभी भी UAC विंडो पर 'हाँ' क्लिक करना होगा।"), - ("Request Elevation", "एलीवेशन का अनुरोध करें"), - ("wait_accept_uac_tip", "कृपया रिमोट उपयोगकर्ता द्वारा UAC स्वीकार करने की प्रतीक्षा करें।"), - ("Elevate successfully", "सफलतापूर्वक एलीवेट किया गया"), - ("uppercase", "बड़े अक्षर (Uppercase)"), - ("lowercase", "छोटे अक्षर (Lowercase)"), - ("digit", "अंक (Digit)"), - ("special character", "विशेष वर्ण"), - ("length>=8", "लंबाई >= 8"), - ("Weak", "कमजोर"), - ("Medium", "मध्यम"), - ("Strong", "मजबूत"), - ("Switch Sides", "साइड्स बदलें"), - ("Please confirm if you want to share your desktop?", "कृपया पुष्टि करें कि क्या आप अपना डेस्कटॉप साझा करना चाहते हैं?"), - ("Display", "डिस्प्ले"), - ("Default View Style", "डिफ़ॉल्ट व्यू शैली"), - ("Default Scroll Style", "डिफ़ॉल्ट स्क्रॉल शैली"), - ("Default Image Quality", "डिफ़ॉल्ट इमेज गुणवत्ता"), - ("Default Codec", "डिफ़ॉल्ट कोडेक"), - ("Bitrate", "बिटरेट"), - ("FPS", "FPS"), - ("Auto", "ऑटो"), - ("Other Default Options", "अन्य डिफ़ॉल्ट विकल्प"), - ("Voice call", "वॉयस कॉल"), - ("Text chat", "टेक्स्ट चैट"), - ("Stop voice call", "वॉयस कॉल बंद करें"), - ("relay_hint_tip", "सीधा कनेक्शन संभव नहीं हो सकता; आप रिले के माध्यम से जुड़ने का प्रयास कर सकते हैं।"), - ("Reconnect", "पुनः कनेक्ट करें"), - ("Codec", "कोडेक"), - ("Resolution", "रिज़ॉल्यूशन"), - ("No transfers in progress", "कोई स्थानांतरण जारी नहीं है"), - ("Set one-time password length", "वन-टाइम पासवर्ड की लंबाई सेट करें"), - ("RDP Settings", "RDP सेटिंग्स"), - ("Sort by", "इसके अनुसार क्रमबद्ध करें"), - ("New Connection", "नया कनेक्शन"), - ("Restore", "पुनर्स्थापित करें"), - ("Minimize", "मिनिमाइज करें"), - ("Maximize", "मैक्सिमाइज करें"), - ("Your Device", "आपका डिवाइस"), - ("empty_recent_tip", "हाल के सत्र यहाँ दिखाई देंगे।"), - ("empty_favorite_tip", "पसंदीदा डिवाइस यहाँ दिखाई देंगे।"), - ("empty_lan_tip", "खोजे गए डिवाइस यहाँ दिखाई देंगे।"), - ("empty_address_book_tip", "आपके पता पुस्तिका में वर्तमान में कोई डिवाइस नहीं है।"), - ("Empty Username", "खाली उपयोगकर्ता नाम"), - ("Empty Password", "खाली पासवर्ड"), - ("Me", "मैं"), - ("identical_file_tip", "यह फ़ाइल पहले से ही मौजूद है।"), - ("show_monitors_tip", "टूलबार में मॉनिटर दिखाएं"), - ("View Mode", "व्यू मोड"), - ("login_linux_tip", "रिमोट Linux सत्र शुरू करने के लिए आपको लॉगिन करना होगा"), - ("verify_rustdesk_password_tip", "RustDesk पासवर्ड सत्यापित करें"), - ("remember_account_tip", "इस खाते को याद रखें"), - ("os_account_desk_tip", "रिमोट डेस्कटॉप को एक्सेस करने के लिए OS खाते का उपयोग करें"), - ("OS Account", "OS खाता"), - ("another_user_login_title_tip", "एक अन्य उपयोगकर्ता पहले से ही लॉगिन है"), - ("another_user_login_text_tip", "डिस्कनेक्ट करें और पुनः प्रयास करें"), - ("xorg_not_found_title_tip", "Xorg नहीं मिला"), - ("xorg_not_found_text_tip", "कृपया Xorg इंस्टॉल करें"), - ("no_desktop_title_tip", "कोई डेस्कटॉप उपलब्ध नहीं है"), - ("no_desktop_text_tip", "कृपया Linux डेस्कटॉप इंस्टॉल करें"), - ("No need to elevate", "एलीवेट करने की आवश्यकता नहीं है"), - ("System Sound", "सिस्टम साउंड"), - ("Default", "डिफ़ॉल्ट"), - ("New RDP", "नया RDP"), - ("Fingerprint", "फिंगरप्रिंट"), - ("Copy Fingerprint", "फिंगरप्रिंट कॉपी करें"), - ("no fingerprints", "कोई फिंगरप्रिंट नहीं"), - ("Select a peer", "एक पीयर (Peer) चुनें"), - ("Select peers", "पीयर्स चुनें"), - ("Plugins", "प्लगइन्स"), - ("Uninstall", "अनइंस्टॉल करें"), - ("Update", "अपडेट करें"), - ("Enable", "सक्षम करें"), - ("Disable", "अक्षम करें"), - ("Options", "विकल्प"), - ("resolution_original_tip", "मूल रिज़ॉल्यूशन"), - ("resolution_fit_local_tip", "स्थानीय स्क्रीन में फिट करें"), - ("resolution_custom_tip", "कस्टम रिज़ॉल्यूशन"), - ("Collapse toolbar", "टूलबार समेटें"), - ("Accept and Elevate", "स्वीकार करें और एलीवेट करें"), - ("accept_and_elevate_btn_tooltip", "कनेक्शन स्वीकार करें और UAC अनुमतियाँ मांगें।"), - ("clipboard_wait_response_timeout_tip", "क्लिपबोर्ड प्रतिक्रिया के लिए समय समाप्त हो गया।"), - ("Incoming connection", "आने वाला कनेक्शन"), - ("Outgoing connection", "जाने वाला कनेक्शन"), - ("Exit", "बाहर निकलें"), - ("Open", "खोलें"), - ("logout_tip", "क्या आप वाकई लॉगआउट करना चाहते हैं?"), - ("Service", "सेवा"), - ("Start", "शुरू करें"), - ("Stop", "रोकें"), - ("exceed_max_devices", "आप डिवाइस की अधिकतम सीमा को पार कर चुके हैं।"), - ("Sync with recent sessions", "हाल के सत्रों के साथ सिंक करें"), - ("Sort tags", "टैग क्रमबद्ध करें"), - ("Open connection in new tab", "नये टैब में कनेक्शन खोलें"), - ("Move tab to new window", "टैब को नयी विंडो में ले जाएं"), - ("Can not be empty", "खाली नहीं हो सकता"), - ("Already exists", "पहले से मौजूद है"), - ("Change Password", "पासवर्ड बदलें"), - ("Refresh Password", "पासवर्ड रिफ्रेश करें"), - ("ID", "ID"), - ("Grid View", "ग्रिड व्यू"), - ("List View", "लिस्ट व्यू"), - ("Select", "चुनें"), - ("Toggle Tags", "टैग टॉगल करें"), - ("pull_ab_failed_tip", "पता पुस्तिका अपडेट करने में विफल।"), - ("push_ab_failed_tip", "सर्वर पर पता पुस्तिका सिंक करने में विफल।"), - ("synced_peer_readded_tip", "हाल के सत्रों में मौजूद डिवाइस पता पुस्तिका में सिंक किए गए थे।"), - ("Change Color", "रंग बदलें"), - ("Primary Color", "प्राथमिक रंग"), - ("HSV Color", "HSV रंग"), - ("Installation Successful!", "इंस्टॉलेशन सफल रहा!"), - ("Installation failed!", "इंस्टॉलेशन विफल रहा!"), - ("Reverse mouse wheel", "माउस व्हील उल्टा करें"), - ("{} sessions", "{} सत्र"), - ("scam_title", "धोखाधड़ी की चेतावनी!"), - ("scam_text1", "यदि आप किसी ऐसे व्यक्ति से बात कर रहे हैं जिसे आप नहीं जानते और जिसने आपसे RustDesk उपयोग करने को कहा है, तो तुरंत डिस्कनेक्ट कर दें।"), - ("scam_text2", "यह एक घोटाला हो सकता है। अपना आईडी या पासवर्ड किसी को न दें।"), - ("Don't show again", "दोबारा न दिखाएं"), - ("I Agree", "मैं सहमत हूँ"), - ("Decline", "अस्वीकार करें"), - ("Timeout in minutes", "मिनटों में टाइमआउट"), - ("auto_disconnect_option_tip", "निष्क्रियता पर स्वचालित रूप से डिस्कनेक्ट करें"), - ("Connection failed due to inactivity", "निष्क्रियता के कारण कनेक्शन विफल रहा"), - ("Check for software update on startup", "स्टार्टअप पर सॉफ़्टवेयर अपडेट की जांच करें"), - ("upgrade_rustdesk_server_pro_to_{}_tip", "RustDesk सर्वर प्रो को संस्करण {} में अपग्रेड करें"), - ("pull_group_failed_tip", "समूह खींचने (Pull) में विफल"), - ("Filter by intersection", "इंटरसेक्शन द्वारा फ़िल्टर करें"), - ("Remove wallpaper during incoming sessions", "आने वाले सत्रों के दौरान वॉलपेपर हटा दें"), - ("Test", "परीक्षण"), - ("display_is_plugged_out_msg", "डिस्प्ले हटा दिया गया है।"), - ("No displays", "कोई डिस्प्ले नहीं"), - ("Open in new window", "नयी विंडो में खोलें"), - ("Show displays as individual windows", "डिस्प्ले को व्यक्तिगत विंडो के रूप में दिखाएं"), - ("Use all my displays for the remote session", "रिमोट सत्र के लिए मेरे सभी डिस्प्ले का उपयोग करें"), - ("selinux_tip", "डिवाइस पर SELinux सक्षम है।"), - ("Change view", "व्यू बदलें"), - ("Big tiles", "बड़ी टाइलें"), - ("Small tiles", "छोटी टाइलें"), - ("List", "लिस्ट"), - ("Virtual display", "वर्चुअल डिस्प्ले"), - ("Plug out all", "सभी अनप्लग करें"), - ("True color (4:4:4)", "सच्चा रंग (4:4:4)"), - ("Enable blocking user input", "उपयोगकर्ता इनपुट को ब्लॉक करना सक्षम करें"), - ("id_input_tip", "आप ID, उपनाम (Alias) या IP पता दर्ज कर सकते हैं।"), - ("privacy_mode_impl_mag_tip", "मैग्निफायर (Magnifier) गोपनीयता मोड"), - ("privacy_mode_impl_virtual_display_tip", "वर्चुअल डिस्प्ले गोपनीयता मोड"), - ("Enter privacy mode", "गोपनीयता मोड में प्रवेश करें"), - ("Exit privacy mode", "गोपनीयता मोड से बाहर निकलें"), - ("idd_not_support_under_win10_2004_tip", "वर्चुअल डिस्प्ले Windows 10 संस्करण 2004 या उच्चतर पर समर्थित है।"), - ("input_source_1_tip", "इनपुट स्रोत 1"), - ("input_source_2_tip", "इनपुट स्रोत 2"), - ("Swap control-command key", "Control और Command कुंजियों को बदलें"), - ("swap-left-right-mouse", "बाएं और दाएं माउस बटन को बदलें"), - ("2FA code", "2FA कोड"), - ("More", "अधिक"), - ("enable-2fa-title", "द्वि-कारक प्रमाणीकरण (2FA) सक्षम करें"), - ("enable-2fa-desc", "कृपया अपना ऑथेंटिकेटर ऐप सेट करें।"), - ("wrong-2fa-code", "गलत 2FA कोड।"), - ("enter-2fa-title", "2FA कोड दर्ज करें"), - ("Email verification code must be 6 characters.", "ईमेल सत्यापन कोड 6 अक्षरों का होना चाहिए।"), - ("2FA code must be 6 digits.", "2FA कोड 6 अंकों का होना चाहिए।"), - ("Multiple Windows sessions found", "एकाधिक Windows सत्र मिले"), - ("Please select the session you want to connect to", "कृपया वह सत्र चुनें जिससे आप जुड़ना चाहते हैं"), - ("powered_by_me", "मेरे द्वारा संचालित"), - ("outgoing_only_desk_tip", "यह केवल आउटगोइंग मोड है"), - ("preset_password_warning", "सुरक्षा के लिए, कृपया डिफ़ॉल्ट पासवर्ड बदलें।"), - ("Security Alert", "सुरक्षा चेतावनी"), - ("My address book", "मेरी पता पुस्तिका"), - ("Personal", "व्यक्तिगत"), - ("Owner", "स्वामी"), - ("Set shared password", "साझा पासवर्ड सेट करें"), - ("Exist in", "इसमें मौजूद है"), - ("Read-only", "केवल पढ़ने के लिए"), - ("Read/Write", "पढ़ना/लिखना"), - ("Full Control", "पूर्ण नियंत्रण"), - ("share_warning_tip", "सावधानी: आप अपना एक्सेस साझा कर रहे हैं।"), - ("Everyone", "हर कोई"), - ("ab_web_console_tip", "वेब कंसोल पता पुस्तिका"), - ("allow-only-conn-window-open-tip", "केवल तभी कनेक्शन की अनुमति दें जब RustDesk विंडो खुली हो"), - ("no_need_privacy_mode_no_physical_displays_tip", "कोई भौतिक डिस्प्ले नहीं मिला, गोपनीयता मोड की आवश्यकता नहीं है।"), - ("Follow remote cursor", "रिमोट कर्सर का पालन करें"), - ("Follow remote window focus", "रिमोट विंडो फोकस का पालन करें"), - ("default_proxy_tip", "डिफ़ॉल्ट प्रॉक्सी सेटिंग"), - ("no_audio_input_device_tip", "कोई ऑडियो इनपुट डिवाइस नहीं मिला।"), - ("Incoming", "आने वाली"), - ("Outgoing", "जाने वाली"), - ("Clear Wayland screen selection", "Wayland स्क्रीन चयन साफ़ करें"), - ("clear_Wayland_screen_selection_tip", "Wayland के स्क्रीन चयन को रीसेट करें।"), - ("confirm_clear_Wayland_screen_selection_tip", "क्या आप वाकई स्क्रीन चयन साफ़ करना चाहते हैं?"), - ("android_new_voice_call_tip", "नया वॉयस कॉल अनुरोध"), - ("texture_render_tip", "टेक्सचर रेंडरिंग का उपयोग करें"), - ("Use texture rendering", "टेक्सचर रेंडरिंग का उपयोग करें"), - ("Floating window", "फ्लोटिंग विंडो"), - ("floating_window_tip", "बैकग्राउंड में रहने के दौरान RustDesk को दिखाएं"), - ("Keep screen on", "स्क्रीन चालू रखें"), - ("Never", "कभी नहीं"), - ("During controlled", "नियंत्रण के दौरान"), - ("During service is on", "जब सेवा चालू हो"), - ("Capture screen using DirectX", "DirectX का उपयोग करके स्क्रीन कैप्चर करें"), - ("Back", "पीछे"), - ("Apps", "ऐप्स"), - ("Volume up", "आवाज़ बढ़ाएं"), - ("Volume down", "आवाज़ कम करें"), - ("Power", "पावर"), - ("Telegram bot", "Telegram बॉट"), - ("enable-bot-tip", "सूचनाओं के लिए बोट सक्षम करें"), - ("enable-bot-desc", "निर्देशों के लिए हमारे टेलीग्राम बोट को देखें।"), - ("cancel-2fa-confirm-tip", "क्या आप वाकई 2FA रद्द करना चाहते हैं?"), - ("cancel-bot-confirm-tip", "क्या आप वाकई बोट रद्द करना चाहते हैं?"), - ("About RustDesk", "RustDesk के बारे में"), - ("Send clipboard keystrokes", "क्लिपबोर्ड कीस्ट्रोक्स भेजें"), - ("network_error_tip", "नेटवर्क कनेक्शन त्रुटि, कृपया पुनः प्रयास करें।"), - ("Unlock with PIN", "PIN से अनलॉक करें"), - ("Requires at least {} characters", "कम से कम {} अक्षरों की आवश्यकता है"), - ("Wrong PIN", "गलत PIN"), - ("Set PIN", "PIN सेट करें"), - ("Enable trusted devices", "विश्वसनीय डिवाइस सक्षम करें"), - ("Manage trusted devices", "विश्वसनीय डिवाइस प्रबंधित करें"), - ("Platform", "प्लेटफ़ॉर्म"), - ("Days remaining", "शेष दिन"), - ("enable-trusted-devices-tip", "केवल विश्वसनीय डिवाइस ही पासवर्ड के बिना जुड़ सकते हैं"), - ("Parent directory", "पैरेंट निर्देशिका"), - ("Resume", "फिर से शुरू करें"), - ("Invalid file name", "अमान्य फ़ाइल नाम"), - ("one-way-file-transfer-tip", "केवल एकतरफा फ़ाइल स्थानांतरण की अनुमति है"), - ("Authentication Required", "प्रमाणीकरण आवश्यक"), - ("Authenticate", "प्रमाणित करें"), - ("web_id_input_tip", "रिमोट आईडी दर्ज करें"), - ("Download", "डाउनलोड करें"), - ("Upload folder", "फ़ोल्डर अपलोड करें"), - ("Upload files", "फाइलें अपलोड करें"), - ("Clipboard is synchronized", "क्लिपबोर्ड सिंक हो गया है"), - ("Update client clipboard", "क्लाइंट क्लिपबोर्ड अपडेट करें"), - ("Untagged", "बिना टैग वाला"), - ("new-version-of-{}-tip", "{} का नया संस्करण उपलब्ध है"), - ("Accessible devices", "सुलभ डिवाइस"), - ("upgrade_remote_rustdesk_client_to_{}_tip", "रिमोट RustDesk क्लाइंट को संस्करण {} में अपग्रेड करें"), - ("d3d_render_tip", "D3D रेंडरिंग का उपयोग करें"), - ("Use D3D rendering", ""), - ("Printer", "प्रिंटर"), - ("printer-os-requirement-tip", "प्रिंटिंग के लिए Windows आवश्यक है।"), - ("printer-requires-installed-{}-client-tip", "इसके लिए क्लाइंट साइड पर {} इंस्टॉल होना चाहिए।"), - ("printer-{}-not-installed-tip", "प्रिंटर {} इंस्टॉल नहीं है।"), - ("printer-{}-ready-tip", "प्रिंटर {} तैयार है।"), - ("Install {} Printer", "{} प्रिंटर इंस्टॉल करें"), - ("Outgoing Print Jobs", "आउटगोइंग प्रिंट कार्य"), - ("Incoming Print Jobs", "इनकमिंग प्रिंट कार्य"), - ("Incoming Print Job", "इनकमिंग प्रिंट कार्य"), - ("use-the-default-printer-tip", "डिफ़ॉल्ट प्रिंटर का उपयोग करें"), - ("use-the-selected-printer-tip", "चयनित प्रिंटर का उपयोग करें"), - ("auto-print-tip", "स्वचालित रूप से प्रिंट करें"), - ("print-incoming-job-confirm-tip", "प्रिंट कार्य स्वीकार करने से पहले पुष्टि करें"), - ("remote-printing-disallowed-tile-tip", "रिमोट प्रिंटिंग की अनुमति नहीं है"), - ("remote-printing-disallowed-text-tip", "कृपया सेटिंग्स में रिमोट प्रिंटिंग सक्षम करें।"), - ("save-settings-tip", "सेटिंग्स सुरक्षित करें"), - ("dont-show-again-tip", "दोबारा न दिखाएं"), - ("Take screenshot", "स्क्रीनशॉट लें"), - ("Taking screenshot", "स्क्रीनशॉट लिया जा रहा है"), - ("screenshot-merged-screen-not-supported-tip", "मर्ज की गई स्क्रीन के स्क्रीनशॉट समर्थित नहीं हैं।"), - ("screenshot-action-tip", "स्क्रीनशॉट लेने के बाद की कार्रवाई"), - ("Save as", "इस रूप में सहेजें"), - ("Copy to clipboard", "क्लिपबोर्ड पर कॉपी करें"), - ("Enable remote printer", "रिमोट प्रिंटर सक्षम करें"), - ("Downloading {}", "{} डाउनलोड हो रहा है"), - ("{} Update", "{} अपडेट"), - ("{}-to-update-tip", "अपडेट करने के लिए {}"), - ("download-new-version-failed-tip", "नया संस्करण डाउनलोड करने में विफल।"), - ("Auto update", "ऑटो अपडेट"), - ("update-failed-check-msi-tip", "अपडेट विफल, कृपया MSI फ़ाइल की जांच करें।"), - ("websocket_tip", "यदि पोर्ट ब्लॉक हैं, तो WebSocket का उपयोग करें।"), - ("Use WebSocket", "WebSocket का उपयोग करें"), - ("Trackpad speed", "ट्रैकपैड गति"), - ("Default trackpad speed", "डिफ़ॉल्ट ट्रैकपैड गति"), - ("Numeric one-time password", "संख्यात्मक वन-टाइम पासवर्ड"), - ("Enable IPv6 P2P connection", "IPv6 P2P कनेक्शन सक्षम करें"), - ("Enable UDP hole punching", "UDP होल पंचिंग सक्षम करें"), - ("View camera", "कैमरा देखें"), - ("Enable camera", "कैमरा सक्षम करें"), - ("No cameras", "कोई कैमरा नहीं मिला"), - ("view_camera_unsupported_tip", "रिमोट कैमरा समर्थित नहीं है।"), - ("Terminal", "टर्मिनल"), - ("Enable terminal", "टर्मिनल सक्षम करें"), - ("New tab", "नया टैब"), - ("Keep terminal sessions on disconnect", "डिस्कनेक्ट होने पर टर्मिनल सत्र चालू रखें"), - ("Terminal (Run as administrator)", "टर्मिनल (प्रशासक के रूप में चलाएं)"), - ("terminal-admin-login-tip", "प्रशासक लॉगिन आवश्यक है।"), - ("Failed to get user token.", "उपयोगकर्ता टोकन प्राप्त करने में विफल।"), - ("Incorrect username or password.", "गलत उपयोगकर्ता नाम या पासवर्ड।"), - ("The user is not an administrator.", "उपयोगकर्ता प्रशासक नहीं है।"), - ("Failed to check if the user is an administrator.", "जांचने में विफल कि क्या उपयोगकर्ता व्यवस्थापक है।"), - ("Supported only in the installed version.", "केवल इंस्टॉल किए गए संस्करण में समर्थित।"), - ("elevation_username_tip", "प्रशासक उपयोगकर्ता नाम दर्ज करें"), - ("Preparing for installation ...", "स्थापना की तैयारी..."), - ("Show my cursor", "मेरा कर्सर दिखाएं"), - ("Scale custom", "कस्टम पैमाना"), - ("Custom scale slider", "कस्टम स्केल स्लाइडर"), - ("Decrease", "घटाएं"), - ("Increase", "बढ़ाएं"), - ("Show virtual mouse", "वर्चुअल माउस दिखाएं"), - ("Virtual mouse size", "वर्चुअल माउस का आकार"), - ("Small", "छोटा"), - ("Large", "बड़ा"), - ("Show virtual joystick", "वर्चुअल जॉयस्टिक दिखाएं"), - ("Edit note", "नोट संपादित करें"), - ("Alias", "उपनाम (Alias)"), - ("ScrollEdge", "किनारे से स्क्रॉल"), - ("Allow insecure TLS fallback", "असुरक्षित TLS फ़ालबैक की अनुमति दें"), - ("allow-insecure-tls-fallback-tip", "पुराने सर्वर कनेक्शन के लिए उपयोग करें।"), - ("Disable UDP", "UDP अक्षम करें"), - ("disable-udp-tip", "कनेक्शन समस्याओं के लिए UDP बंद करें।"), - ("server-oss-not-support-tip", "OSS सर्वर इसका समर्थन नहीं करता।"), - ("input note here", "यहाँ नोट दर्ज करें"), - ("note-at-conn-end-tip", "कनेक्शन के अंत में नोट दिखाएं"), - ("Show terminal extra keys", "टर्मिनल की अतिरिक्त कुंजियाँ दिखाएं"), - ("Relative mouse mode", "सापेक्ष (Relative) माउस मोड"), - ("rel-mouse-not-supported-peer-tip", "रिमोट साइड पर समर्थित नहीं है।"), - ("rel-mouse-not-ready-tip", "तैयार नहीं है।"), - ("rel-mouse-lock-failed-tip", "माउस लॉक विफल।"), - ("rel-mouse-exit-{}-tip", "बाहर निकलने के लिए {} दबाएं"), - ("rel-mouse-permission-lost-tip", "अनुमति खो गई।"), - ("Changelog", "परिवर्तन सूची (Changelog)"), - ("keep-awake-during-outgoing-sessions-label", "आउटगोइंग सत्र के दौरान जागते रहें"), - ("keep-awake-during-incoming-sessions-label", "इनकमिंग सत्र के दौरान जागते रहें"), - ("Continue with {}", "{} के साथ जारी रखें"), - ("Display Name", "प्रदर्शित नाम"), - ("password-hidden-tip", "पासवर्ड सुरक्षा के लिए छिपा हुआ है।"), - ("preset-password-in-use-tip", "पूर्व-निर्धारित पासवर्ड उपयोग में है।"), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), - ].iter().cloned().collect(); -} diff --git a/src/lang/hr.rs b/src/lang/hr.rs index 0593ff6b7..e1ea1837f 100644 --- a/src/lang/hr.rs +++ b/src/lang/hr.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Lozinka OS-a"), ("install_tip", "Zbog UAC-a RustDesk ne može u nekim slučajevima raditi pravilno. Da biste prevazišli UAC, kliknite na tipku ispod da instalirate RustDesk na sustav."), ("Click to upgrade", "Klik za nadogradnju"), + ("Click to download", "Klik za preuzimanje"), + ("Click to update", "Klik za ažuriranje"), ("Configure", "Konfiguracija"), ("config_acc", "Da biste daljinski kontrolirali radnu površinu, RustDesk-u trebate dodijeliti prava za \"Pristupačnost\"."), ("config_screen", "Da biste daljinski pristupili radnoj površini, RustDesk-u trebate dodijeliti prava za \"Snimanje zaslona\"."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Postavke tipkovnice"), ("Full Access", "Potpuni pristup"), ("Screen Share", "Dijeljenje zaslona"), - ("ubuntu-21-04-required", "Wayland zahtijeva Ubuntu verziju 21.04 ili višu"), - ("wayland-requires-higher-linux-version", "Wayland zahtijeva višu verziju Linux distribucije. Molimo isprobjate X11 ili promijenite OS."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland zahtijeva Ubuntu verziju 21.04 ili višu"), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland zahtijeva višu verziju Linux distribucije. Molimo isprobjate X11 ili promijenite OS."), ("JumpLink", "Vidi"), ("Please Select the screen to be shared(Operate on the peer side).", "Molimo odaberite zaslon koji će biti podijeljen (Za rad na strani klijenta)"), ("Show RustDesk", "Prikaži RustDesk"), ("This PC", "Ovo računalo"), ("or", "ili"), + ("Continue with", "Nastavi sa"), ("Elevate", "Izdigni"), ("Zoom cursor", "Zumiraj kursor"), ("Accept sessions via password", "Prihvati sesije preko lozinke"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Još nemate nijednog omiljenog partnera?\nPronađite nekoga s kim se možete povezati i dodajte ga u svoje favorite!"), ("empty_lan_tip", "Ali ne, izgleda da još nismo otkrili niti jednu drugu stranu."), ("empty_address_book_tip", "Izgleda da trenutno nemate nijednog kolege navedenog u svom imeniku."), + ("eg: admin", "napr. admin"), ("Empty Username", "Prazno korisničko ime"), ("Empty Password", "Prazna lozinka"), ("Me", "Ja"), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Nastavi sa {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/hu.rs b/src/lang/hu.rs index 3eb16890f..18c12b177 100644 --- a/src/lang/hu.rs +++ b/src/lang/hu.rs @@ -7,7 +7,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Password", "Jelszó"), ("Ready", "Kész"), ("Established", "Létrejött"), - ("connecting_status", "Kapcsolódás folyamatban ..."), + ("connecting_status", "Kapcsolódás folyamatban…"), ("Enable service", "Szolgáltatás engedélyezése"), ("Start service", "Szolgáltatás indítása"), ("Service is running", "Szolgáltatás aktív"), @@ -36,13 +36,13 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Invalid server configuration", "Érvénytelen kiszolgáló-konfiguráció"), ("Clipboard is empty", "A vágólap üres"), ("Stop service", "Szolgáltatás leállítása"), - ("Change ID", "Azonosító módosítása"), - ("Your new ID", "Új azonosító"), + ("Change ID", "Azonosító megváltoztatása"), + ("Your new ID", "Az új azonosítója"), ("length %min% to %max%", "hossz %min% és %max% között"), ("starts with a letter", "betűvel kezdődik"), ("allowed characters", "engedélyezett karakterek"), ("id_change_tip", "Csak a-z, A-Z, 0-9, - (kötőjel) csoportokba tartozó karakterek, illetve a _ karakter van engedélyezve. Az első karakternek mindenképpen a-z, A-Z csoportokba kell esnie. Az azonosító hosszúsága 6-tól, 16 karakter."), - ("Website", "Weboldal"), + ("Website", "Webhely"), ("About", "Névjegy"), ("Slogan_tip", "Szenvedéllyel programozva - egy káoszba süllyedő világban!"), ("Privacy Statement", "Adatvédelmi nyilatkozat"), @@ -50,14 +50,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Build Date", "Összeállítás ideje"), ("Version", "Verzió"), ("Home", "Kezdőképernyő"), - ("Audio Input", "Hangbemenet"), + ("Audio Input", "Hangátvitel"), ("Enhancements", "Fejlesztések"), ("Hardware Codec", "Hardveres kodek"), ("Adaptive bitrate", "Adaptív bitráta"), - ("ID Server", "ID-kiszolgáló"), + ("ID Server", "ID kiszolgáló"), ("Relay Server", "Továbbító-kiszolgáló"), - ("API Server", "API-kiszolgáló"), - ("invalid_http", "A címnek mindenképpen http(s)://-rel kell kezdődnie."), + ("API Server", "API kiszolgáló"), + ("invalid_http", "A címnek mindenképpen http(s)://-el kell kezdődnie."), ("Invalid IP", "A megadott IP-cím érvénytelen"), ("Invalid format", "Érvénytelen formátum"), ("server_not_support", "A kiszolgáló nem támogatja"), @@ -76,12 +76,12 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Connection Error", "Kapcsolódási hiba"), ("Error", "Hiba"), ("Reset by the peer", "A kapcsolatot a másik fél lezárta."), - ("Connecting...", "Kapcsolódás..."), - ("Connection in progress. Please wait.", "A kapcsolódás folyamatban van. Kis türelmet ..."), + ("Connecting...", "Kapcsolódás…"), + ("Connection in progress. Please wait.", "A kapcsolódás folyamatban van. Kis türelmet…"), ("Please try 1 minute later", "Próbálja meg 1 perc múlva"), ("Login Error", "Bejelentkezési hiba"), ("Successful", "Sikeres"), - ("Connected, waiting for image...", "Kapcsolódva, várakozás a képadatokra..."), + ("Connected, waiting for image...", "Kapcsolódva, várakozás a képadatokra…"), ("Name", "Név"), ("Type", "Típus"), ("Modified", "Módosított"), @@ -105,10 +105,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Are you sure you want to delete this file?", "Biztosan törli ezt a fájlt?"), ("Are you sure you want to delete this empty directory?", "Biztosan törli ezt az üres könyvtárat?"), ("Are you sure you want to delete the file of this directory?", "Biztosan törli a könyvtár tartalmát?"), - ("Do this for all conflicts", "Tegye ezt minden ütközés esetén"), + ("Do this for all conflicts", "Tegye ezt minden ütközéskor"), ("This is irreversible!", "Ez a művelet nem vonható vissza!"), ("Deleting", "Törlés folyamatban"), - ("files", "fájl"), + ("files", "fájlok"), ("Waiting", "Várakozás"), ("Finished", "Befejezve"), ("Speed", "Sebesség"), @@ -130,14 +130,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Show quality monitor", "Kijelző minőségének ellenőrzése"), ("Disable clipboard", "Közös vágólap kikapcsolása"), ("Lock after session end", "Távoli fiók zárolása a munkamenet végén"), - ("Insert Ctrl + Alt + Del", "Illessze be a Ctrl + Alt + Del billentyűzetkombinációt"), + ("Insert Ctrl + Alt + Del", "Illessze be a Ctrl + Alt + Del"), ("Insert Lock", "Távoli fiók zárolása"), ("Refresh", "Frissítés"), ("ID does not exist", "Az azonosító nem létezik"), ("Failed to connect to rendezvous server", "Nem sikerült kapcsolódni a kiszolgálóhoz"), ("Please try later", "Próbálja meg később"), ("Remote desktop is offline", "A távoli számítógép offline állapotban van"), - ("Key mismatch", "Kulcseltérés"), + ("Key mismatch", "Eltérés a kulcsokban"), ("Timeout", "Időtúllépés"), ("Failed to connect to relay server", "Nem sikerült kapcsolódni a továbbító-kiszolgálóhoz"), ("Failed to connect via rendezvous server", "Nem sikerült kapcsolódni a kiszolgálón keresztül"), @@ -147,29 +147,31 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Operációs rendszer jelszavának beállítása"), ("install_tip", "Előfordul, hogy bizonyos esetekben hiba léphet fel a Portable verzió használatakor. A megfelelő működés érdekében, telepítse a RustDesk alkalmazást a számítógépére."), ("Click to upgrade", "Kattintson ide a frissítés telepítéséhez"), + ("Click to download", "Kattintson ide a letöltéshez"), + ("Click to update", "Kattintson ide a frissítés letöltéséhez"), ("Configure", "Beállítás"), - ("config_acc", "A számítógép távoli vezérléséhez a RustDesknek hozzáférési jogokat kell adnia."), - ("config_screen", "Ahhoz, hogy távolról hozzáférhessen a számítógépéhez, meg kell adnia a RustDesknek a „Képernyőfelvétel” jogosultságot."), - ("Installing ...", "Telepítés ..."), - ("Install", "Telepítse"), + ("config_acc", "A távoli vezérléshez a RustDesknek „Kisegítő lehetőségek” engedélyre van szüksége"), + ("config_screen", "A távoli vezérléshez szükséges a „Képernyőfelvétel” engedély megadása"), + ("Installing ...", "Telepítés…"), + ("Install", "Telepítés"), ("Installation", "Telepítés"), ("Installation Path", "Telepítési útvonal"), ("Create start menu shortcuts", "Start menü parancsikonok létrehozása"), ("Create desktop icon", "Ikon létrehozása az asztalon"), - ("agreement_tip", "A telepítés folytatásával automatikusan elfogadásra kerül a licenc szerződés."), + ("agreement_tip", "A telepítés folytatásával automatikusan elfogadásra kerül a licensz szerződés."), ("Accept and Install", "Elfogadás és telepítés"), - ("End-user license agreement", "Végfelhasználói licenc szerződés"), - ("Generating ...", "Létrehozás ..."), + ("End-user license agreement", "Végfelhasználói licensz szerződés"), + ("Generating ...", "Létrehozás…"), ("Your installation is lower version.", "A telepített verzió alacsonyabb."), ("not_close_tcp_tip", "Ne zárja be ezt az ablakot, amíg TCP-alagutat használ"), - ("Listening ...", "Figyelés ..."), + ("Listening ...", "Figyelés…"), ("Remote Host", "Távoli kiszolgáló"), ("Remote Port", "Távoli port"), ("Action", "Indítás"), ("Add", "Hozzáadás"), ("Local Port", "Helyi port"), ("Local Address", "Helyi cím"), - ("Change Local Port", "Helyi port módosítása"), + ("Change Local Port", "Helyi port megváltoztatása"), ("setup_server_tip", "Gyorsabb kapcsolat érdekében, hozzon létre saját kiszolgálót"), ("Too short, at least 6 characters.", "Túl rövid, legalább 6 karakter."), ("The confirmation is not identical.", "A megerősítés nem volt azonos"), @@ -177,7 +179,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Accept", "Elfogadás"), ("Dismiss", "Elutasítás"), ("Disconnect", "Kapcsolat bontása"), - ("Enable file copy and paste", "Fájlmásolás és beillesztés engedélyezése"), + ("Enable file copy and paste", "Fájlok másolásának és beillesztésének engedélyezése"), ("Connected", "Kapcsolódva"), ("Direct and encrypted connection", "Közvetlen, és titkosított kapcsolat"), ("Relayed and encrypted connection", "Továbbított, és titkosított kapcsolat"), @@ -185,7 +187,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Relayed and unencrypted connection", "Továbbított, és nem titkosított kapcsolat"), ("Enter Remote ID", "Távoli számítógép azonosítója"), ("Enter your password", "Adja meg a jelszavát"), - ("Logging in...", "Belépés folyamatban..."), + ("Logging in...", "Belépés folyamatban…"), ("Enable RDP session sharing", "RDP-munkamenet-megosztás engedélyezése"), ("Auto Login", "Automatikus bejelentkezés"), ("Enable direct IP access", "Közvetlen IP-elérés engedélyezése"), @@ -197,15 +199,15 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Please enter the folder name", "Adja meg a mappa nevét"), ("Fix it", "Javítás"), ("Warning", "Figyelmeztetés"), - ("Login screen using Wayland is not supported", "A Wayland használatával történő bejelentkezési képernyő nem támogatott"), + ("Login screen using Wayland is not supported", "Bejelentkezéskori Wayland használata nem támogatott"), ("Reboot required", "Újraindítás szükséges"), ("Unsupported display server", "Nem támogatott megjelenítő kiszolgáló"), - ("x11 expected", "x11-re számított"), + ("x11 expected", "x11-re számítottt"), ("Port", "Port"), ("Settings", "Beállítások"), ("Username", "Felhasználónév"), ("Invalid port", "Érvénytelen port"), - ("Closed manually by the peer", "A kapcsolatot a másik fél saját kezűleg bezárta"), + ("Closed manually by the peer", "A kapcsolatot a másik fél kézileg bezárta"), ("Enable remote configuration modification", "Távoli konfiguráció-módosítás engedélyezése"), ("Run without install", "Futtatás telepítés nélkül"), ("Connect via relay", "Kapcsolódás továbbító-kiszolgálón keresztül"), @@ -219,8 +221,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("verification_tip", "A regisztrált e-mail-címre egy ellenőrző kód lesz elküldve. Adja meg az ellenőrző kódot az újbóli bejelentkezéshez."), ("Logout", "Kilépés"), ("Tags", "Címkék"), - ("Search ID", "Azonosító keresése..."), - ("whitelist_sep", "A címeket vesszővel, pontosvesszővel, szóközzel vagy új sorral kell elválasztani"), + ("Search ID", "Azonosító keresése…"), + ("whitelist_sep", "A címeket veszővel, pontosvesszővel, szóközzel, vagy új sorral válassza el"), ("Add ID", "Azonosító hozzáadása"), ("Add Tag", "Címke hozzáadása"), ("Unselect all tags", "A címkék kijelölésének megszüntetése"), @@ -230,7 +232,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Wrong credentials", "Hibás felhasználónév vagy jelszó"), ("The verification code is incorrect or has expired", "A hitelesítőkód érvénytelen vagy lejárt"), ("Edit Tag", "Címke szerkesztése"), - ("Forget Password", "Jelszó elfelejtése"), + ("Forget Password", "A jelszó megjegyzésének megszüntetése"), ("Favorites", "Kedvencek"), ("Add to Favorites", "Hozzáadás a kedvencekhez"), ("Remove from Favorites", "Eltávolítás a kedvencekből"), @@ -239,7 +241,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Socks5 Proxy", "Socks5 Proxy"), ("Socks5/Http(s) Proxy", "Socks5/Http(s) Proxy"), ("Discovered", "Felfedezett"), - ("install_daemon_tip", "Automatikus indításhoz szükséges a szolgáltatás telepítése"), + ("install_daemon_tip", "Az automatikus indításhoz szükséges a szolgáltatás telepítése"), ("Remote ID", "Távoli azonosító"), ("Paste", "Beillesztés"), ("Paste here?", "Beillesztés ide?"), @@ -253,12 +255,12 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Two-Finger Tap", "Kétujjas érintés"), ("Right Mouse", "Jobb egér gomb"), ("One-Finger Move", "Egyujjas mozgatás"), - ("Double Tap & Move", "Dupla érintés és mozgatás"), + ("Double Tap & Move", "Dupla érintés, és mozgatás"), ("Mouse Drag", "Mozgatás egérrel"), ("Three-Finger vertically", "Három ujj függőlegesen"), ("Mouse Wheel", "Egérgörgő"), ("Two-Finger Move", "Kétujjas mozgatás"), - ("Canvas Move", "Nézet módosítása"), + ("Canvas Move", "Nézet mozgatása"), ("Pinch to Zoom", "Kétujjas nagyítás"), ("Canvas Zoom", "Nézet nagyítása"), ("Reset canvas", "Nézet visszaállítása"), @@ -268,7 +270,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Share screen", "Képernyőmegosztás"), ("Chat", "Csevegés"), ("Total", "Összes"), - ("items", "elem"), + ("items", "elemek"), ("Selected", "Kijelölve"), ("Screen Capture", "Képernyőrögzítés"), ("Input Control", "Távoli vezérlés"), @@ -276,13 +278,13 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Do you accept?", "Elfogadás?"), ("Open System Setting", "Rendszerbeállítások megnyitása"), ("How to get Android input permission?", "Hogyan állítható be az Androidos beviteli engedély?"), - ("android_input_permission_tip1", "Ahhoz, hogy egy távoli eszköz vezérelhesse Android készülékét, engedélyeznie kell a RustDesk számára a „Hozzáférhetőség” szolgáltatás használatát."), - ("android_input_permission_tip2", "A következő rendszerbeállítások oldalon a letöltött alkalmazások menüponton belül, kapcsolja be a „RustDesk Input” szolgáltatást."), + ("android_input_permission_tip1", "A távoli vezérléshez engedélyezze a „Kisegítő lehetőségek” lehetőséget."), + ("android_input_permission_tip2", "A következő rendszerbeállítások oldalon a letöltött alkalmazások menüponton belül, kapcsolja be a [RustDesk Input] szolgáltatást."), ("android_new_connection_tip", "Új kérés érkezett, mely vezérelni szeretné az eszközét"), - ("android_service_will_start_tip", "A képernyőmegosztás aktiválása automatikusan elindítja a szolgáltatást, így más eszközök is vezérelhetik ezt az Android-eszközt."), + ("android_service_will_start_tip", "A „Képernyőrögzítés” bekapcsolásával automatikus elindul a szolgáltatás, lehetővé téve, hogy más eszközök kapcsolódási kérelmet küldhessenek"), ("android_stop_service_tip", "A szolgáltatás leállítása automatikusan szétkapcsol minden létező kapcsolatot."), ("android_version_audio_tip", "A jelenlegi Android verzió nem támogatja a hangrögzítést, frissítsen legalább Android 10-re, vagy egy újabb verzióra."), - ("android_start_service_tip", "A képernyőmegosztó szolgáltatás elindításához koppintson a „Kapcsolási szolgáltatás indítása” gombra, vagy aktiválja a „Képernyőfelvétel” engedélyt."), + ("android_start_service_tip", "A képernyőmegosztó szolgáltatás elindításához koppintson a „továbbító-kiszolgáló-szolgáltatás indítása” gombra, vagy aktiválja a „Képernyőfelvétel” engedélyt."), ("android_permission_may_not_change_tip", "A meglévő kapcsolatok engedélyei csak új kapcsolódás után módosulnak."), ("Account", "Fiók"), ("Overwrite", "Felülírás"), @@ -303,7 +305,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Ignore Battery Optimizations", "Akkumulátorkímélő figyelmen kívül hagyása"), ("android_open_battery_optimizations_tip", "Ha le szeretné tiltani ezt a funkciót, lépjen a RustDesk alkalmazás beállításaiba, keresse meg az [Akkumulátorkímélő] lehetőséget és válassza a nincs korlátozás lehetőséget."), ("Start on boot", "Indítás bekapcsoláskor"), - ("Start the screen sharing service on boot, requires special permissions", "Indítsa el a képernyőmegosztó szolgáltatást rendszerindításkor, mely speciális engedélyeket is igényel"), + ("Start the screen sharing service on boot, requires special permissions", "Indítsa el a képernyőmegosztó szolgáltatást rendszerindításkor, speciális engedélyeket igényel"), ("Connection not allowed", "A kapcsolódás nem engedélyezett"), ("Legacy mode", "Kompatibilitási mód"), ("Map mode", "Hozzárendelési mód"), @@ -314,7 +316,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable remote restart", "Távoli újraindítás engedélyezése"), ("Restart remote device", "Távoli eszköz újraindítása"), ("Are you sure you want to restart", "Biztosan újra szeretné indítani?"), - ("Restarting remote device", "Távoli eszköz újraindítása..."), + ("Restarting remote device", "Távoli eszköz újraindítása…"), ("remote_restarting_tip", "A távoli eszköz újraindul, zárja be ezt az üzenetet, kapcsolódjon újra az állandó jelszavával"), ("Copied", "Másolva"), ("Exit Fullscreen", "Kilépés teljes képernyős módból"), @@ -352,7 +354,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Apply", "Alkalmaz"), ("Disconnect all devices?", "Leválasztja az összes eszközt?"), ("Clear", "Tisztítás"), - ("Audio Input Device", "Hangbemeneti eszköz"), + ("Audio Input Device", "Audio bemeneti eszköz"), ("Use IP Whitelisting", "Engedélyezési lista használata"), ("Network", "Hálózat"), ("Pin Toolbar", "Eszköztár kitűzése"), @@ -361,36 +363,36 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Directory", "Könyvtár"), ("Automatically record incoming sessions", "A bejövő munkamenetek automatikus rögzítése"), ("Automatically record outgoing sessions", "A kimenő munkamenetek automatikus rögzítése"), - ("Change", "Módosítás"), - ("Start session recording", "Munkamenet-rögzítés indítása"), - ("Stop session recording", "Munkamenet-rögzítés leállítása"), - ("Enable recording session", "Munkamenet-rögzítés engedélyezése"), + ("Change", "Változtatás"), + ("Start session recording", "Munkamenet rögzítés indítása"), + ("Stop session recording", "Munkamenet rögzítés leállítása"), + ("Enable recording session", "Munkamenet rögzítés engedélyezése"), ("Enable LAN discovery", "Felfedezés engedélyezése"), ("Deny LAN discovery", "Felfedezés tiltása"), ("Write a message", "Üzenet írása"), ("Prompt", "Kérés"), - ("Please wait for confirmation of UAC...", "Várjon az UAC megerősítésére..."), + ("Please wait for confirmation of UAC...", "Várjon az UAC megerősítésére…"), ("elevated_foreground_window_tip", "A távvezérelt számítógép jelenleg nyitott ablakához magasabb szintű jogok szükségesek. Ezért jelenleg nem lehetséges az egér és a billentyűzet használata. Kérje meg azt a felhasználót, akinek a számítógépét távolról vezérli, hogy minimalizálja az ablakot, vagy növelje a jogokat. A jövőbeni probléma elkerülése érdekében ajánlott a szoftvert a távvezérelt számítógépre telepíteni."), ("Disconnected", "Kapcsolat bontva"), ("Other", "Egyéb"), ("Confirm before closing multiple tabs", "Biztosan bezárja az összes lapot?"), - ("Keyboard Settings", "Billentyűzetbeállítások"), + ("Keyboard Settings", "Billentyűzet beállítások"), ("Full Access", "Teljes hozzáférés"), ("Screen Share", "Képernyőmegosztás"), - ("ubuntu-21-04-required", "A Waylandhez Ubuntu 21.04 vagy újabb verzió szükséges."), - ("wayland-requires-higher-linux-version", "A Wayland a Linux disztribúció magasabb verzióját igényli. Próbálja ki az X11 asztali környezetet, vagy változtassa meg az operációs rendszert."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "A Waylandhez Ubuntu 21.04 vagy újabb verzió szükséges."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "A Wayland a Linux disztribúció magasabb verzióját igényli. Próbálja ki az X11 desktopot, vagy változtassa meg az operációs rendszert."), ("JumpLink", "Hiperhivatkozás"), ("Please Select the screen to be shared(Operate on the peer side).", "Válassza ki a megosztani kívánt képernyőt."), ("Show RustDesk", "A RustDesk megjelenítése"), ("This PC", "Ez a számítógép"), ("or", "vagy"), + ("Continue with", "Folytatás a következővel"), ("Elevate", "Hozzáférés engedélyezése"), ("Zoom cursor", "Kurzor nagyítása"), ("Accept sessions via password", "Munkamenetek elfogadása jelszóval"), ("Accept sessions via click", "Munkamenetek elfogadása kattintással"), ("Accept sessions via both", "Munkamenetek fogadása mindkettőn keresztül"), - ("Please wait for the remote side to accept your session request...", "Várjon, amíg a távoli oldal elfogadja a munkamenet-kérelmét..."), + ("Please wait for the remote side to accept your session request...", "Várjon, amíg a távoli oldal elfogadja a munkamenet-kérelmét…"), ("One-time Password", "Egyszer használatos jelszó"), ("Use one-time password", "Használjon ideiglenes jelszót"), ("One-time password length", "Egyszer használatos jelszó hossza"), @@ -403,11 +405,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Add to address book", "Hozzáadás a címjegyzékhez"), ("Group", "Csoport"), ("Search", "Keresés"), - ("Closed manually by web console", "Saját kezűleg bezárva a webkonzolon keresztül"), + ("Closed manually by web console", "Kézzel bezárva a webkonzolon keresztül"), ("Local keyboard type", "Helyi billentyűzet típusa"), ("Select local keyboard type", "Helyi billentyűzet típusának kiválasztása"), - ("software_render_tip", "Ha Nvidia grafikus kártyát használ Linux alatt, és a távoli ablak a kapcsolat létrehozása után azonnal bezáródik, akkor a Nouveau nyílt forráskódú illesztőprogramra való váltás és a szoftveres leképezés alkalmazása segíthet. A szoftvert újra kell indítani."), - ("Always use software rendering", "Mindig szoftveres leképezést használjon"), + ("software_render_tip", "Ha Nvidia grafikus kártyát használ Linux alatt, és a távoli ablak a kapcsolat létrehozása után azonnal bezáródik, akkor a Nouveau nyílt forráskódú illesztőprogramra való váltás és a szoftveres renderelés használata segíthet. A szoftvert újra kell indítani."), + ("Always use software rendering", "Mindig szoftveres renderelést használjon"), ("config_input", "Ahhoz, hogy a távoli asztalt a billentyűzettel vezérelhesse, a RustDesknek meg kell adnia a „Bemenet figyelése” jogosultságot."), ("config_microphone", "Ahhoz, hogy távolról beszélhessen, meg kell adnia a RustDesknek a „Hangfelvétel” jogosultságot."), ("request_elevation_tip", "Akkor is kérhet megnövelt jogokat, ha valaki a partneroldalon van."), @@ -442,7 +444,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Voice call", "Hanghívás"), ("Text chat", "Szöveges csevegés"), ("Stop voice call", "Hanghívás leállítása"), - ("relay_hint_tip", "Ha a közvetlen kapcsolat nem lehetséges, megpróbálhat kapcsolatot létesíteni egy továbbító-kiszolgálón keresztül.\nHa az első próbálkozáskor továbbító-kiszolgálón keresztüli kapcsolatot szeretne létrehozni, használhatja az „/r” utótagot. Az azonosítóhoz vagy a „Mindig továbbító-kiszolgálón keresztül kapcsolódom” opcióhoz a legutóbbi munkamenetek listájában, ha van ilyen."), + ("relay_hint_tip", "Ha a közvetlen kapcsolat nem lehetséges, megpróbálhat kapcsolatot létesíteni egy továbbító-kiszolgálón keresztül.\nHa az első próbálkozáskor továbbító-kiszolgálón keresztüli kapcsolatot szeretne létrehozni, használhatja az „/r” utótagot. az azonosítóhoz vagy a „Mindig továbbító-kiszolgálón keresztül kapcsolódom” opcióhoz a legutóbbi munkamenetek listájában, ha van ilyen."), ("Reconnect", "Újrakapcsolódás"), ("Codec", "Kodek"), ("Resolution", "Felbontás"), @@ -454,11 +456,12 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Restore", "Visszaállítás"), ("Minimize", "Minimalizálás"), ("Maximize", "Maximalizálás"), - ("Your Device", "Az én eszközöm"), + ("Your Device", "Az Ön eszköze"), ("empty_recent_tip", "Nincsenek aktuális munkamenetek!\nIdeje ütemezni egy újat."), - ("empty_favorite_tip", "Még nincs kedvenc távoli állomása?\nHagyja, hogy találjunk valakit, akivel kapcsolatba tud lépni, és adja hozzá a kedvencekhez!"), + ("empty_favorite_tip", "Még nincs kedvenc távoli állomása?\nHagyja, hogy találjunk valakit, akivel kapcsolatba tud lépni, és add hozzá a kedvenceidhez!"), ("empty_lan_tip", "Úgy tűnik, még nem adott hozzá egyetlen távoli helyszínt sem."), ("empty_address_book_tip", "Úgy tűnik, hogy jelenleg nincsenek távoli állomások a címjegyzékében."), + ("eg: admin", "pl: adminisztrátor"), ("Empty Username", "Üres felhasználónév"), ("Empty Password", "Üres jelszó"), ("Me", "Ön"), @@ -490,7 +493,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Update", "Frissítés"), ("Enable", "Engedélyezés"), ("Disable", "Letiltás"), - ("Options", "Opciók"), + ("Options", "Beállítások"), ("resolution_original_tip", "Eredeti felbontás"), ("resolution_fit_local_tip", "Helyi felbontás beállítása"), ("resolution_custom_tip", "Testre szabható felbontás"), @@ -515,7 +518,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Already exists", "Már létezik"), ("Change Password", "Jelszó módosítása"), ("Refresh Password", "Jelszó frissítése"), - ("ID", "Azonosító"), + ("ID", "ID"), ("Grid View", "Mozaik nézet"), ("List View", "Lista nézet"), ("Select", "Kiválasztás"), @@ -543,14 +546,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("upgrade_rustdesk_server_pro_to_{}_tip", "Frissítse a RustDesk Server Prot a(z) {} vagy újabb verzióra!"), ("pull_group_failed_tip", "A csoport frissítése nem sikerült"), ("Filter by intersection", "Szűrés metszéspontok szerint"), - ("Remove wallpaper during incoming sessions", "Háttérkép eltávolítása bejövő munkameneteknél"), + ("Remove wallpaper during incoming sessions", "Távolítsa el a háttérképet a bejövő munkamenetek közben"), ("Test", "Teszt"), ("display_is_plugged_out_msg", "A képernyő nincs csatlakoztatva, váltson az első képernyőre."), ("No displays", "Nincsenek kijelzők"), ("Open in new window", "Megnyitás új ablakban"), ("Show displays as individual windows", "Kijelzők megjelenítése egyedi ablakokként"), - ("Use all my displays for the remote session", "Összes kijelző használata a távoli munkamenethez"), - ("selinux_tip", "A SELinux engedélyezve van az eszközén, ami azt okozhatja, hogy a RustDesk nem fut megfelelően, mint ellenőrzött."), + ("Use all my displays for the remote session", "Az összes kijelzőm használata a távoli munkamenethez"), + ("selinux_tip", "A SELinux engedélyezve van az eszközén, ami azt okozhatja, hogy a RustDesk nem fut megfelelően, mint ellenőrzött webhely."), ("Change view", "Nézet módosítása"), ("Big tiles", "Nagy csempék"), ("Small tiles", "Kis csempék"), @@ -559,7 +562,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Plug out all", "Kapcsolja ki az összeset"), ("True color (4:4:4)", "Valódi szín (4:4:4)"), ("Enable blocking user input", "Engedélyezze a felhasználói bevitel blokkolását"), - ("id_input_tip", "Megadhat egy azonosítót, egy közvetlen IP-címet vagy egy tartományt egy porttal (:).\nHa egy másik kiszolgálón lévő eszközhöz szeretne hozzáférni, adja meg a kiszolgáló címét (@?key=), például\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nHa egy nyilvános kiszolgálón lévő eszközhöz szeretne hozzáférni, adja meg a „@public” lehetőséget. A kulcsra nincs szükség nyilvános kiszolgálók esetén.\n\nHa az első kapcsolathoz továbbító-kiszolgálón keresztüli kapcsolatot akar kényszeríteni, adja hozzá az „/r” az azonosítót a végén, például „9123456234/r”."), + ("id_input_tip", "Megadhat egy azonosítót, egy közvetlen IP-címet vagy egy tartományt egy porttal (:).\nHa egy másik kiszolgálón lévő eszközhöz szeretne hozzáférni, adja meg a kiszolgáló címét (@?key=), például\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nHa egy nyilvános kiszolgálón lévő eszközhöz szeretne hozzáférni, adja meg a „@public” lehetőséget. in. A kulcsra nincs szükség nyilvános kiszolgálók esetén.\n\nHa az első kapcsolathoz továbbító-kiszolgálón keresztüli kapcsolatot akar kényszeríteni, adja hozzá az „/r” az azonosítót a végén, például „9123456234/r”."), ("privacy_mode_impl_mag_tip", "1. mód"), ("privacy_mode_impl_virtual_display_tip", "2. mód"), ("Enter privacy mode", "Lépjen be az adatvédelmi módba"), @@ -577,7 +580,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("enter-2fa-title", "Kétfaktoros hitelesítés"), ("Email verification code must be 6 characters.", "Az e-mailben kapott ellenőrző-kódnak 6 karakterből kell állnia."), ("2FA code must be 6 digits.", "A 2FA-kódnak 6 számjegyűnek kell lennie."), - ("Multiple Windows sessions found", "Több Windows-munkamenet található"), + ("Multiple Windows sessions found", "Több Windows munkamenet található"), ("Please select the session you want to connect to", "Válassza ki a munkamenetet, amelyhez kapcsolódni szeretne"), ("powered_by_me", "Üzemeltető: RustDesk"), ("outgoing_only_desk_tip", "Ez a RustDesk testre szabott kimenete.\nMás eszközökhöz kapcsolódhat, de más eszközök nem kapcsolódhatnak az Ön eszközéhez."), @@ -594,20 +597,20 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("share_warning_tip", "A fenti mezők megosztottak és mások számára is láthatóak."), ("Everyone", "Mindenki"), ("ab_web_console_tip", "További információk a webes konzolról"), - ("allow-only-conn-window-open-tip", "Csak akkor engedélyezze a kapcsolódást, ha a RustDesk ablaka nyitva van."), + ("allow-only-conn-window-open-tip", "Csak akkor engedélyezze a kapcsolódást, ha a RustDesk ablak nyitva van."), ("no_need_privacy_mode_no_physical_displays_tip", "Nincsenek fizikai képernyők; Nincs szükség az adatvédelmi üzemmód használatára."), ("Follow remote cursor", "Kövesse a távoli kurzort"), - ("Follow remote window focus", "Kövesse a távoli ablakfókuszt"), + ("Follow remote window focus", "Kövesse a távoli ablak fókuszt"), ("default_proxy_tip", "A szabványos protokoll és port SOCKS5 és 1080"), ("no_audio_input_device_tip", "Nem található hangbemeneti eszköz."), ("Incoming", "Bejövő"), ("Outgoing", "Kimenő"), ("Clear Wayland screen selection", "Wayland képernyő kiválasztásának törlése"), ("clear_Wayland_screen_selection_tip", "A képernyőválasztás törlése után újra kiválaszthatja a megosztandó képernyőt."), - ("confirm_clear_Wayland_screen_selection_tip", "Biztosan törölni szeretné a Wayland képernyő kiválasztását?"), + ("confirm_clear_Wayland_screen_selection_tip", "Biztos, hogy törölni szeretné a Wayland képernyő kiválasztását?"), ("android_new_voice_call_tip", "Új hanghívás-kérés érkezett. Ha elfogadja a megkeresést, a hang átvált hangkommunikációra."), - ("texture_render_tip", "Használja a textúra leképezést a képek simábbá tételéhez. Ezt az opciót kikapcsolhatja, ha leképezési problémái vannak."), - ("Use texture rendering", "Textúra leképezés használata"), + ("texture_render_tip", "Használja a textúra renderelést a képek simábbá tételéhez. Ezt az opciót kikapcsolhatja, ha renderelési problémái vannak."), + ("Use texture rendering", "Textúra renderelés használata"), ("Floating window", "Lebegő ablak"), ("floating_window_tip", "Segít, ha a RustDesk a háttérben fut."), ("Keep screen on", "Tartsa a képernyőt bekapcsolva"), @@ -619,13 +622,13 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Apps", "Alkalmazások"), ("Volume up", "Hangerő fel"), ("Volume down", "Hangerő le"), - ("Power", "Főkapcsoló"), + ("Power", "Teljesítmény"), ("Telegram bot", "Telegram bot"), ("enable-bot-tip", "Ha aktiválja ezt a funkciót, akkor a 2FA-kódot a botjától kaphatja meg. Kapcsolati értesítésként is használható."), - ("enable-bot-desc", "1. Nyisson csevegést @BotFather.\n2. Küldje el a „/newbot” parancsot. Miután ezt a lépést elvégezte, kap egy tokent.\n3. Indítson csevegést az újonnan létrehozott botjával. Küldjön egy olyan üzenetet, amely egy perjel („/”) kezdetű, pl. „/hello” az aktiváláshoz.\n"), - ("cancel-2fa-confirm-tip", "Biztosan vissza akarja vonni a 2FA-hitelesítést?"), + ("enable-bot-desc", "1. Nyisson csevegést @BotFather.\n2. Küldje el a „/newbot” parancsot. Miután ezt a lépést elvégezte, kap egy tokent.\n3. Indítson csevegést az újonnan létrehozott botjával. Küldjön egy olyan üzenetet, amely egy perjelrel kezdődik („/”), pl. B. „/hello” az aktiváláshoz.\n"), + ("cancel-2fa-confirm-tip", "Biztosan le akarja mondani a 2FA-t?"), ("cancel-bot-confirm-tip", "Biztosan le akarja mondani a Telegram botot?"), - ("About RustDesk", "A RustDesk névjegye"), + ("About RustDesk", "RustDesk névjegye"), ("Send clipboard keystrokes", "Billentyűleütések küldése a vágólapra"), ("network_error_tip", "Ellenőrizze a hálózati kapcsolatot, majd próbálja meg újra."), ("Unlock with PIN", "Feloldás PIN-kóddal"), @@ -643,7 +646,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("one-way-file-transfer-tip", "Az egyirányú fájlátvitel engedélyezve van a vezérelt oldalon."), ("Authentication Required", "Hitelesítés szükséges"), ("Authenticate", "Hitelesítés"), - ("web_id_input_tip", "Azonos kiszolgálón lévő azonosítót adhat meg, a közvetlen IP elérés nem támogatott a webkliensben.\nHa egy másik kiszolgálón lévő eszközhöz szeretne hozzáférni, adja meg a kiszolgáló címét (@?key=), például\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nHa egy nyilvános kiszolgálón lévő eszközhöz szeretne hozzáférni, adja meg az „@public” kulcsot. A kulcsra nincs szükség a nyilvános kiszolgálók esetében."), + ("web_id_input_tip", "Azonos kiszolgálón lévő azonosítót adhat meg, a közvetlen IP elérés nem támogatott a webkliensben.\nHa egy másik kiszolgálón lévő eszközhöz szeretne hozzáférni, adja meg a kiszolgáló címét (@?key=), például\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nHa egy nyilvános kiszolgálón lévő eszközhöz szeretne hozzáférni, adja meg a „@public” betűt. in. A kulcsra nincs szükség a nyilvános kiszolgálók esetében."), ("Download", "Letöltés"), ("Upload folder", "Mappa feltöltése"), ("Upload files", "Fájlok feltöltése"), @@ -653,14 +656,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("new-version-of-{}-tip", "A(z) {} új verziója"), ("Accessible devices", "Hozzáférhető eszközök"), ("upgrade_remote_rustdesk_client_to_{}_tip", "Frissítse a RustDesk klienst {} vagy újabb verziójára a távoli oldalon!"), - ("d3d_render_tip", "D3D leképezés"), - ("Use D3D rendering", "D3D leképezés használata"), + ("d3d_render_tip", "D3D renderelés"), + ("Use D3D rendering", "D3D renderelés használata"), ("Printer", "Nyomtató"), ("printer-os-requirement-tip", "Nyomtató operációs rendszerének minimális rendszerkövetelménye"), ("printer-requires-installed-{}-client-tip", "A nyomtatóhoz szükséges a(z) {} kliens telepítése"), ("printer-{}-not-installed-tip", "A(z) {} nyomtató nincs telepítve"), ("printer-{}-ready-tip", "A(z) {} nyomtató készen áll"), - ("Install {} Printer", "A(z) {} nyomtató telepítése"), + ("Install {} Printer", "A(z) {} nyomtató nyomtató telepítése"), ("Outgoing Print Jobs", "Kimenő nyomtatási feladatok"), ("Incoming Print Jobs", "Bejövő nyomtatási feladatok"), ("Incoming Print Job", "Bejövő nyomtatási feladat"), @@ -673,77 +676,32 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("save-settings-tip", "Beállítások mentése"), ("dont-show-again-tip", "Ne jelenítse meg újra"), ("Take screenshot", "Képernyőkép készítése"), - ("Taking screenshot", "Képernyőkép készítése..."), + ("Taking screenshot", "Képernyőkép készítése…"), ("screenshot-merged-screen-not-supported-tip", "Egyesített képernyőről nem támogatott a képernyőkép készítése"), ("screenshot-action-tip", "Képernyőkép-művelet"), ("Save as", "Mentés másként"), ("Copy to clipboard", "Másolás a vágólapra"), ("Enable remote printer", "Távoli nyomtatók engedélyezése"), - ("Downloading {}", "{} letöltése"), - ("{} Update", "{} frissítés"), - ("{}-to-update-tip", "{} bezárása és az új verzió telepítése."), - ("download-new-version-failed-tip", "Ha a letöltés sikertelen, akkor vagy újrapróbálkozhat, vagy a „Letöltés” gombra kattintva letöltheti a kiadási oldalról, és manuálisan frissíthet."), + ("Downloading {}", "Letöltés {}"), + ("{} Update", "{} Frissítés"), + ("{}-to-update-tip", "A {} bezárása és az új verzió telepítése."), + ("download-new-version-failed-tip", "Ha a letöltés sikertelen, akkor vagy újrapróbálkozhat, vagy a \"Letöltés\" gombra kattintva letöltheti a kiadási oldalról, és manuálisan frissíthet."), ("Auto update", "Automatikus frissítés"), - ("update-failed-check-msi-tip", "A telepítési módszer felismerése nem sikerült. Kattintson a „Letöltés” gombra, hogy letöltse a kiadási oldalról, és manuálisan frissítse."), + ("update-failed-check-msi-tip", "A telepítési módszer felismerése nem sikerült. Kérjük, kattintson a \"Letöltés\" gombra, hogy letöltse a kiadási oldalról, és manuálisan frissítse."), ("websocket_tip", "WebSocket használatakor csak a relé-kapcsolatok támogatottak."), ("Use WebSocket", "WebSocket használata"), ("Trackpad speed", "Érintőpad sebessége"), ("Default trackpad speed", "Alapértelmezett érintőpad sebessége"), - ("Numeric one-time password", "Numerikus, egyszer használatos jelszó"), - ("Enable IPv6 P2P connection", "IPv6 P2P kapcsolat engedélyezése"), - ("Enable UDP hole punching", "UDP résszűrés engedélyezése"), - ("View camera", "Kamera nézet"), + ("Numeric one-time password", ""), + ("Enable IPv6 P2P connection", ""), + ("Enable UDP hole punching", ""), + ("View camera", "Kamera megtekintése"), ("Enable camera", "Kamera engedélyezése"), ("No cameras", "Nincs kamera"), ("view_camera_unsupported_tip", "A kameranézet nem támogatott"), - ("Terminal", "Terminál"), - ("Enable terminal", "Terminál engedélyezése"), - ("New tab", "Új lap"), - ("Keep terminal sessions on disconnect", "Terminál munkamenetek megtartása leválasztáskor"), - ("Terminal (Run as administrator)", "Terminál (rendszergazdaként futtatva)"), - ("terminal-admin-login-tip", "Adja meg a felügyelt terminál rendszergazdai fiókjának jelszavát."), - ("Failed to get user token.", "Hiba a felhasználói token lekérdezésekor."), - ("Incorrect username or password.", "A felhasználónév vagy a jelszó helytelen."), - ("The user is not an administrator.", "A felhasználó nem rendszergazda."), - ("Failed to check if the user is an administrator.", "Hiba merült fel annak ellenőrzése során, hogy a felhasználó rendszergazda-e."), - ("Supported only in the installed version.", "Csak a telepített változatban támogatott."), - ("elevation_username_tip", "Felhasználónév vagy tartománynév megadása"), - ("Preparing for installation ...", "Felkészülés a telepítésre ..."), - ("Show my cursor", "Kurzor megjelenítése"), - ("Scale custom", "Egyéni méretarány"), - ("Custom scale slider", "Egyéni méretarány-csúszka"), - ("Decrease", "Csökkentés"), - ("Increase", "Növelés"), - ("Show virtual mouse", "Virtuális egér megjelenítése"), - ("Virtual mouse size", "Virtuális egér mérete"), - ("Small", "Kicsi"), - ("Large", "Nagy"), - ("Show virtual joystick", "Virtuális vezérlő megjelenítése"), - ("Edit note", "Megjegyzés szerkesztése"), - ("Alias", "Álnév"), - ("ScrollEdge", "Görgetés az ablak szélein"), - ("Allow insecure TLS fallback", "Nem biztonságos TLS-tartalék engedélyezése"), - ("allow-insecure-tls-fallback-tip", "Alapértelmezés szerint a RustDesk ellenőrzi a kiszolgáló tanúsítványát a TLS-protokollok esetében. Ha ez a beállítás engedélyezve van, a RustDesk kihagyja az ellenőrzési lépést, és az ellenőrzés sikertelensége esetén folytatja a műveletet."), - ("Disable UDP", "UDP letiltása"), - ("disable-udp-tip", "Meghatározza, hogy csak TCP-t használjon-e. Ha ez az beállítás engedélyezve van, a RustDesk nem fogja többé használni a 21116-os UDP-portot, helyette a 21116-os TCP-portot fogja használni."), - ("server-oss-not-support-tip", "MEGJEGYZÉS: Az OSS RustDesk kiszolgáló nem támogatja ezt a funkciót."), - ("input note here", "Megjegyzés beírása"), - ("note-at-conn-end-tip", "Kérjen megjegyzést a kapcsolat végén"), - ("Show terminal extra keys", "További terminálgombok megjelenítése"), - ("Relative mouse mode", "Relatív egér mód"), - ("rel-mouse-not-supported-peer-tip", "A kapcsolódott partner nem támogatja a relatív egér módot."), - ("rel-mouse-not-ready-tip", "A relatív egér mód még nem elérhető. Próbálja meg újra."), - ("rel-mouse-lock-failed-tip", "Nem sikerült zárolni a kurzort. A relatív egér mód le lett tiltva."), - ("rel-mouse-exit-{}-tip", "A kilépéshez nyomja meg a következő gombot: {}"), - ("rel-mouse-permission-lost-tip", "A billentyűzet-hozzáférés vissza lett vonva. A relatív egér mód le lett tilva."), - ("Changelog", "Változáslista"), - ("keep-awake-during-outgoing-sessions-label", "Képernyő aktív állapotban tartása a kimenő munkamenetek során"), - ("keep-awake-during-incoming-sessions-label", "Képernyő aktív állapotban tartása a bejövő munkamenetek során"), - ("Continue with {}", "Folytatás ezzel: {}"), - ("Display Name", "Kijelző név"), - ("password-hidden-tip", "Állandó jelszó lett beállítva (rejtett)."), - ("preset-password-in-use-tip", "Jelenleg az alapértelmezett jelszót használja."), - ("Enable privacy mode", "Adatvédelmi mód aktiválása"), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/id.rs b/src/lang/id.rs index bcda0a3a8..fcc72431d 100644 --- a/src/lang/id.rs +++ b/src/lang/id.rs @@ -3,7 +3,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = [ ("Status", "Status"), ("Your Desktop", "Desktop Anda"), - ("desk_tip", "Akses desktop kamu dengan ID & Kata sandi ini"), + ("desk_tip", "Akses desktop anda dengan ID & Kata sandi ini"), ("Password", "Kata sandi"), ("Ready", "Sudah siap"), ("Established", "Didirikan"), @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Kata Sandi OS"), ("install_tip", "Karena UAC, RustDesk tidak dapat bekerja dengan baik sebagai sisi remote dalam beberapa kasus. Untuk menghindari UAC, silakan klik tombol di bawah ini untuk menginstal RustDesk ke sistem."), ("Click to upgrade", "Klik untuk upgrade"), + ("Click to download", "Klik untuk unduh"), + ("Click to update", "Klik untuk memperbarui"), ("Configure", "Konfigurasi"), ("config_acc", "Agar bisa mengontrol Desktopmu dari jarak jauh, Kamu harus memberikan izin \"Aksesibilitas\" untuk RustDesk."), ("config_screen", "Agar bisa mengakses Desktopmu dari jarak jauh, kamu harus memberikan izin \"Perekaman Layar\" untuk RustDesk."), @@ -244,7 +246,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Paste", "Tempel"), ("Paste here?", "Tempel disini?"), ("Are you sure to close the connection?", "Apakah kamu yakin akan menutup koneksi?"), - ("Download new version", "Download versi baru"), + ("Download new version", "Unduh versi baru"), ("Touch mode", "Mode Layar Sentuh"), ("Mouse mode", "Mode Mouse"), ("One-Finger Tap", "Ketuk Satu Jari"), @@ -273,10 +275,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Screen Capture", "Tangkapan Layar"), ("Input Control", "Kontrol input"), ("Audio Capture", "Rekam Suara"), - ("Do you accept?", "Apakah kamu setuju?"), + ("Do you accept?", "Apakah anda setuju?"), ("Open System Setting", "Buka Pengaturan Sistem"), ("How to get Android input permission?", "Bagaimana cara mendapatkan izin input dari Android?"), - ("android_input_permission_tip1", "Agar perangkat jarak jauh dapat mengontrol perangkat Android melalui mouse atau sentuhan, Kamu harus memberikan izin/permission kd RustDesk untuk menggunakan layanan \"Aksesibilitas\"."), + ("android_input_permission_tip1", "Agar perangkat jarak jauh dapat mengontrol perangkat Android Anda melalui mouse atau sentuhan, Anda harus mengizinkan RustDesk untuk menggunakan layanan \"Aksesibilitas\"."), ("android_input_permission_tip2", "Silakan buka halaman pengaturan sistem berikutnya, temukan dan masuk ke [Layanan Terinstal], aktifkan layanan [Input RustDesk]."), ("android_new_connection_tip", "Permintaan akses remote telah diterima"), ("android_service_will_start_tip", "Mengaktifkan \"Tangkapan Layar\" akan memulai secara otomatis, memungkinkan perangkat lain untuk meminta koneksi ke perangkat Anda."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Pengaturan Papan Ketik"), ("Full Access", "Akses penuh"), ("Screen Share", "Berbagi Layar"), - ("ubuntu-21-04-required", "Wayland membutuhkan Ubuntu 21.04 atau versi yang lebih tinggi."), - ("wayland-requires-higher-linux-version", "Wayland membutuhkan versi distro linux yang lebih tinggi. Silakan coba desktop X11 atau ubah OS Anda."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland membutuhkan Ubuntu 21.04 atau versi yang lebih tinggi."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland membutuhkan versi distro linux yang lebih tinggi. Silakan coba desktop X11 atau ubah OS Anda."), ("JumpLink", "Tautan Cepat"), ("Please Select the screen to be shared(Operate on the peer side).", "Silakan Pilih layar yang akan dibagikan kepada rekan anda."), ("Show RustDesk", "Tampilkan RustDesk"), ("This PC", "PC ini"), ("or", "atau"), + ("Continue with", "Lanjutkan dengan"), ("Elevate", "Elevasi"), ("Zoom cursor", "Perbersar Kursor"), ("Accept sessions via password", "Izinkan sesi dengan kata sandi"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Belum ada rekan favorit?\nTemukan seseorang untuk terhubung dan tambahkan ke favorit!"), ("empty_lan_tip", "Sepertinya kami belum memiliki rekan"), ("empty_address_book_tip", "Tampaknya saat ini tidak ada rekan yang terdaftar dalam buku alamat Anda"), + ("eg: admin", "contoh: admin"), ("Empty Username", "Nama pengguna kosong"), ("Empty Password", "Kata sandi kosong"), ("Me", "Saya"), @@ -620,7 +623,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Volume up", "Naikkan volume"), ("Volume down", "Turunkan volume"), ("Power", ""), - ("Telegram bot", "Bot Telegram"), + ("Telegram bot", ""), ("enable-bot-tip", "Jika fitur ini diaktifkan, Kamu dapat menerima kode 2FA dari bot, serta mendapatkan notifikasi tentang koneksi."), ("enable-bot-desc", "1. Buka chat dengan @BotFather.\n2. Kirim perintah \"/newbot\". Setelah menyelesaikan langkah ini, Kamu akan mendapatkan token\n3. Mulai percakapan dengan bot yang baru dibuat. Kirim pesan yang dimulai dengan garis miring (\"/\") seperti \"/hello\" untuk mengaktifkannya."), ("cancel-2fa-confirm-tip", "Apakah Kamu yakin ingin membatalkan 2FA?"), @@ -647,7 +650,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Download", "Download"), ("Upload folder", "Upload folder"), ("Upload files", "Upload file"), - ("Clipboard is synchronized", "Clipboard disinkronisasi"), + ("Clipboard is synchronized", ""), ("Update client clipboard", ""), ("Untagged", ""), ("new-version-of-{}-tip", "Versi {} sudah tersedia."), @@ -668,82 +671,37 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("use-the-selected-printer-tip", ""), ("auto-print-tip", ""), ("print-incoming-job-confirm-tip", ""), - ("remote-printing-disallowed-tile-tip", "Remote Printing tidak diizinkan"), - ("remote-printing-disallowed-text-tip", "Komputer yang diakses tidak mengizinkan Remote Printing."), - ("save-settings-tip", "Simpan pengaturan"), - ("dont-show-again-tip", "Jangan tampilkan lagi"), - ("Take screenshot", "Ambil tangkapan layar"), - ("Taking screenshot", "Mengambil tangkapan layar"), + ("remote-printing-disallowed-tile-tip", ""), + ("remote-printing-disallowed-text-tip", ""), + ("save-settings-tip", ""), + ("dont-show-again-tip", ""), + ("Take screenshot", ""), + ("Taking screenshot", ""), ("screenshot-merged-screen-not-supported-tip", ""), ("screenshot-action-tip", ""), - ("Save as", "Simpan sebagai"), - ("Copy to clipboard", "Salin ke papan klip"), - ("Enable remote printer", "Aktifkan printer jarak jauh"), - ("Downloading {}", "Mendownload {}"), - ("{} Update", "Perbarui {}"), - ("{}-to-update-tip", "{} akan ditutup dan menginstal versi baru"), - ("download-new-version-failed-tip", "Gagal mendownload. Kamu bisa mencoba lagi nanti atau klik tombol \"Download\" melakukan download dari halaman rilis dan meningkatkan versi secara manual."), - ("Auto update", "Pembaruan otomatis"), + ("Save as", ""), + ("Copy to clipboard", ""), + ("Enable remote printer", ""), + ("Downloading {}", ""), + ("{} Update", ""), + ("{}-to-update-tip", ""), + ("download-new-version-failed-tip", ""), + ("Auto update", ""), ("update-failed-check-msi-tip", ""), ("websocket_tip", ""), - ("Use WebSocket", "Gunakan WebSocket"), - ("Trackpad speed", "Kecepatan trackpad"), - ("Default trackpad speed", "Kecepatan default trackpad"), - ("Numeric one-time password", "Kata sandi sekali pakai numerik"), - ("Enable IPv6 P2P connection", "Aktifkan koneksi P2P IPv6"), - ("Enable UDP hole punching", "Aktifkan UDP hole punching"), + ("Use WebSocket", ""), + ("Trackpad speed", ""), + ("Default trackpad speed", ""), + ("Numeric one-time password", ""), + ("Enable IPv6 P2P connection", ""), + ("Enable UDP hole punching", ""), ("View camera", "Lihat Kamera"), ("Enable camera", "Aktifkan kamera"), ("No cameras", "Tidak ada kamera"), ("view_camera_unsupported_tip", "Perangkat yang terhubung tidak mendukung tampilan kamera."), - ("Terminal", "Terminal"), - ("Enable terminal", "Aktifkan terminal"), - ("New tab", "Tab baru"), - ("Keep terminal sessions on disconnect", "Pertahankan sesi terminal saat terputus"), - ("Terminal (Run as administrator)", "Terminal (Jalankan sebagai administrator)"), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", "Gagal mendapatkan token pengguna."), - ("Incorrect username or password.", "Nama pengguna atau kata sandi salah."), - ("The user is not an administrator.", "Pengguna bukanlah administrator."), - ("Failed to check if the user is an administrator.", "Gagal memeriksa apakah pengguna adalah administrator."), - ("Supported only in the installed version.", "Hanya didukung pada versi yang terinstal."), - ("elevation_username_tip", "panduan_elevasi_nama_pengguna"), - ("Preparing for installation ...", "Mempersiapkan instalasi ..."), - ("Show my cursor", "Tampilkan kursor saya"), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Lanjutkan dengan {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/it.rs b/src/lang/it.rs index a5132e027..96974e36c 100644 --- a/src/lang/it.rs +++ b/src/lang/it.rs @@ -102,9 +102,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Unselect All", "Deseleziona tutto"), ("Empty Directory", "Cartella vuota"), ("Not an empty directory", "Non è una cartella vuota"), - ("Are you sure you want to delete this file?", "Vuoi eliminare questo file?"), - ("Are you sure you want to delete this empty directory?", "Vuoi eliminare questa cartella vuota?"), - ("Are you sure you want to delete the file of this directory?", "Vuoi eliminare il file di questa cartella?"), + ("Are you sure you want to delete this file?", "Sei sicuro di voler eliminare questo file?"), + ("Are you sure you want to delete this empty directory?", "Sei sicuro di voler eliminare questa cartella vuota?"), + ("Are you sure you want to delete the file of this directory?", "Sei sicuro di voler eliminare il file di questa cartella?"), ("Do this for all conflicts", "Ricorda questa scelta per tutti i conflitti"), ("This is irreversible!", "Questo è irreversibile!"), ("Deleting", "Eliminazione di"), @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Password sistema operativo"), ("install_tip", "A causa del Controllo Account Utente (UAC), RustDesk potrebbe non funzionare correttamente come desktop remoto.\nPer evitare questo problema, fai clic sul tasto qui sotto per installare RustDesk a livello di sistema."), ("Click to upgrade", "Aggiorna"), + ("Click to download", "Download"), + ("Click to update", "Aggiorna"), ("Configure", "Configura"), ("config_acc", "Per controllare il desktop dall'esterno, devi fornire a RustDesk il permesso 'Accessibilità'."), ("config_screen", "Per controllare il desktop dall'esterno, devi fornire a RustDesk il permesso 'Registrazione schermo'."), @@ -243,7 +245,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Remote ID", "ID remoto"), ("Paste", "Incolla"), ("Paste here?", "Incollare qui?"), - ("Are you sure to close the connection?", "Vuoi chiudere la connessione?"), + ("Are you sure to close the connection?", "Sei sicuro di voler chiudere la connessione?"), ("Download new version", "Scarica nuova versione"), ("Touch mode", "Modalità tocco"), ("Mouse mode", "Modalità mouse"), @@ -313,7 +315,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Set permanent password", "Imposta password permanente"), ("Enable remote restart", "Abilita riavvio da remoto"), ("Restart remote device", "Riavvia dispositivo remoto"), - ("Are you sure you want to restart", "Vuoi riavviare?"), + ("Are you sure you want to restart", "Sei sicuro di voler riavviare?"), ("Restarting remote device", "Il dispositivo remoto si sta riavviando"), ("remote_restarting_tip", "Riavvia il dispositivo remoto"), ("Copied", "Copiato"), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Impostazioni tastiera"), ("Full Access", "Accesso completo"), ("Screen Share", "Condivisione schermo"), - ("ubuntu-21-04-required", "Wayland richiede Ubuntu 21.04 o versione successiva."), - ("wayland-requires-higher-linux-version", "Wayland richiede una versione superiore della distribuzione Linux.\nProva X11 desktop o cambia il sistema operativo."), - ("xdp-portal-unavailable", "Acquisizione dello schermo di Wayland non riuscita. Il portale desktop XDG potrebbe essersi bloccato o non essere disponibile. Prova a riavviarlo con `systemctl --user restart xdg-desktop-portal`."), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland richiede Ubuntu 21.04 o versione successiva."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland richiede una versione superiore della distribuzione Linux.\nProva X11 desktop o cambia il sistema operativo."), ("JumpLink", "Vai a"), ("Please Select the screen to be shared(Operate on the peer side).", "Seleziona lo schermo da condividere (opera sul lato dispositivo remoto)."), ("Show RustDesk", "Visualizza RustDesk"), ("This PC", "Questo PC"), ("or", "O"), + ("Continue with", "Continua con"), ("Elevate", "Eleva"), ("Zoom cursor", "Cursore zoom"), ("Accept sessions via password", "Accetta sessioni via password"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Ancora nessuna connessione?\nTrova qualcuno con cui connetterti e aggiungilo ai preferiti!"), ("empty_lan_tip", "Sembra proprio che non sia stata rilevata nessuna connessione."), ("empty_address_book_tip", "Sembra che per ora nella rubrica non ci siano connessioni."), + ("eg: admin", "es: admin"), ("Empty Username", "Nome utente vuoto"), ("Empty Password", "Password vuota"), ("Me", "Io"), @@ -502,7 +505,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Outgoing connection", "Connessioni in uscita"), ("Exit", "Esci da RustDesk"), ("Open", "Apri RustDesk"), - ("logout_tip", "Vuoi disconnetterti?"), + ("logout_tip", "Sei sicuro di voler uscire?"), ("Service", "Servizio"), ("Start", "Avvia"), ("Stop", "Ferma"), @@ -604,7 +607,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Outgoing", "In uscita"), ("Clear Wayland screen selection", "Annulla selezione schermata Wayland"), ("clear_Wayland_screen_selection_tip", "Dopo aver annullato la selezione schermo, è possibile selezionare nuovamente lo schermo da condividere."), - ("confirm_clear_Wayland_screen_selection_tip", "Vuoi annullare la selezione schermo Wayland?"), + ("confirm_clear_Wayland_screen_selection_tip", "Sei sicuro di voler annullare la selezione schermo Wayland?"), ("android_new_voice_call_tip", "È stata ricevuta una nuova richiesta di chiamata vocale. Se accetti, l'audio passerà alla comunicazione vocale."), ("texture_render_tip", "Usa il rendering texture per rendere le immagini più fluide. Se riscontri problemi di rendering prova a disabilitare questa opzione."), ("Use texture rendering", "Usa rendering texture"), @@ -623,8 +626,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Telegram bot", "Bot Telegram"), ("enable-bot-tip", "Se abiliti questa funzione, puoi ricevere il codice 2FA dal tuo bot.\nPuò anche funzionare come notifica di connessione."), ("enable-bot-desc", "1. apri una chat con @BotFather.\n2. Invia il comando \"/newbot\", dopo aver completato questo passaggio riceverai un token.\n3. Avvia una chat con il tuo bot appena creato. Per attivarlo Invia un messaggio che inizia con una barra (\"/\") tipo \"/hello\".\n"), - ("cancel-2fa-confirm-tip", "Vuoi disabilitare 2FA?"), - ("cancel-bot-confirm-tip", "Vuoi disabilitare il bot Telegram?"), + ("cancel-2fa-confirm-tip", "Sei sicuro di voler annullare 2FA?"), + ("cancel-bot-confirm-tip", "Sei sicuro di voler annullare Telegram?"), ("About RustDesk", "Info su RustDesk"), ("Send clipboard keystrokes", "Invia sequenze tasti appunti"), ("network_error_tip", "Controlla la connessione di rete, quindi seleziona 'Riprova'."), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", "Abilita terminale"), ("New tab", "Nuova scheda"), ("Keep terminal sessions on disconnect", "Quando disconetti mantieni attiva sessione terminale"), - ("Terminal (Run as administrator)", "Terminale (esegui come amministratore)"), - ("terminal-admin-login-tip", "Inserisci il nome utente e la password dell'amministratore del lato controllato."), - ("Failed to get user token.", "Impossibile ottenere il token utente."), - ("Incorrect username or password.", "Nome utente o password non corretti."), - ("The user is not an administrator.", "L'utente non è un amministratore."), - ("Failed to check if the user is an administrator.", "Impossibile verificare se l'utente è un amministratore."), - ("Supported only in the installed version.", "Supportato solo nella versione installata."), - ("elevation_username_tip", "Inserisci Nome utente o dominio sorgente\\nome Utente"), - ("Preparing for installation ...", "Preparazione installazione..."), - ("Show my cursor", "Visualizza il mio cursore"), - ("Scale custom", "Scala personalizzata"), - ("Custom scale slider", "Cursore scala personalizzata"), - ("Decrease", "Diminuisci"), - ("Increase", "Aumenta"), - ("Show virtual mouse", "Visualizza mouse virtuale"), - ("Virtual mouse size", "Dimensione mouse virtuale"), - ("Small", "Piccola"), - ("Large", "Grande"), - ("Show virtual joystick", "Visualizza joystick virtuale"), - ("Edit note", "Modifica nota"), - ("Alias", "Alias"), - ("ScrollEdge", "Bordo scorrimento"), - ("Allow insecure TLS fallback", "Consenti fallback TLS non sicuro"), - ("allow-insecure-tls-fallback-tip", "Per impostazione predefinita, RustDesk verifica il certificato del server per i protocolli usando TLS.\nCon questa opzione abilitata, RustDesk salterà il passaggio di verifica e procederà in caso di errore di verifica."), - ("Disable UDP", "Disabilita UDP"), - ("disable-udp-tip", "Controlla se usare solo TCP.\nQuando questa opzione è abilitata, RustDesk non userà più UDP 21116, verrà invece usato TCP 21116."), - ("server-oss-not-support-tip", "Nota: il sistema operativo del server RustDesk non include questa funzionalità."), - ("input note here", "Inserisci nota qui"), - ("note-at-conn-end-tip", "Visualizza nota alla fine della connessione"), - ("Show terminal extra keys", "Visualizza tasti aggiuntivi terminale"), - ("Relative mouse mode", "Modalità relativa mouse"), - ("rel-mouse-not-supported-peer-tip", "La modalità mouse relativa non è supportata dal peer connesso."), - ("rel-mouse-not-ready-tip", "La modalità mouse relativa non è ancora pronta. Riprova."), - ("rel-mouse-lock-failed-tip", "Impossibile bloccare il cursore. La modalità mouse relativa è stata disabilitata."), - ("rel-mouse-exit-{}-tip", "Premi {} per uscire."), - ("rel-mouse-permission-lost-tip", "È stata revocato l'accesso alla tastiera. La modalità mouse relativa è stata disabilitata."), - ("Changelog", "Novità programma"), - ("keep-awake-during-outgoing-sessions-label", "Mantieni lo schermo attivo durante le sessioni in uscita"), - ("keep-awake-during-incoming-sessions-label", "Mantieni lo schermo attivo durante le sessioni in ingresso"), - ("Continue with {}", "Continua con {}"), - ("Display Name", "Visualizza nome"), - ("password-hidden-tip", "È impostata una password permanente (nascosta)."), - ("preset-password-in-use-tip", "È attualmente in uso la password preimpostata."), - ("Enable privacy mode", "Abilita modalità privacy"), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ja.rs b/src/lang/ja.rs index 2879e86bf..14e322eeb 100644 --- a/src/lang/ja.rs +++ b/src/lang/ja.rs @@ -3,31 +3,31 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = [ ("Status", "状態"), ("Your Desktop", "あなたのコンピューター"), - ("desk_tip", "下記の ID とパスワードでこのコンピューターにアクセスできます。"), + ("desk_tip", "下記のIDとパスワードであなたのコンピューターにアクセスできます。"), ("Password", "パスワード"), ("Ready", "準備完了"), ("Established", "接続完了"), - ("connecting_status", "RustDesk ネットワークに接続中..."), - ("Enable service", "サービスを有効化する"), + ("connecting_status", "RuskDeskネットワークに接続中..."), + ("Enable service", "サービスを有効化"), ("Start service", "サービスを開始"), ("Service is running", "サービスが実行されています"), ("Service is not running", "サービスは停止しています"), ("not_ready_status", "接続できません。ネットワーク接続を確認してください"), - ("Control Remote Desktop", "リモートデスクトップを操作"), - ("Transfer file", "ファイルを転送"), + ("Control Remote Desktop", "リモートコンピューターを操作"), + ("Transfer file", "ファイル転送"), ("Connect", "接続"), ("Recent sessions", "最近のセッション"), ("Address book", "アドレス帳"), ("Confirmation", "確認"), - ("TCP tunneling", "TCP トンネリング"), + ("TCP tunneling", "TCPトンネリング"), ("Remove", "削除"), ("Refresh random password", "ランダムパスワードを再生成"), ("Set your own password", "パスワードを設定"), - ("Enable keyboard/mouse", "キーボード/マウスを有効化する"), - ("Enable clipboard", "クリップボードを有効化する"), - ("Enable file transfer", "ファイル転送を有効化する"), - ("Enable TCP tunneling", "TCP トンネリングを有効化する"), - ("IP Whitelisting", "IP ホワイトリスト"), + ("Enable keyboard/mouse", "キーボード/マウスを有効化"), + ("Enable clipboard", "クリップボードを有効化"), + ("Enable file transfer", "ファイル転送を有効化"), + ("Enable TCP tunneling", "TCPトンネリングを有効化"), + ("IP Whitelisting", "IPホワイトリスト"), ("ID/Relay Server", "認証/中継サーバー"), ("Import server config", "サーバー設定をインポート"), ("Export Server Config", "サーバー設定をエクスポート"), @@ -36,30 +36,30 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Invalid server configuration", "無効なサーバー設定です"), ("Clipboard is empty", "クリップボードは空です"), ("Stop service", "サービスを停止"), - ("Change ID", "ID を変更"), - ("Your new ID", "新しい ID"), - ("length %min% to %max%", "%min%～%max% 文字の長さ"), - ("starts with a letter", "アルファベットで始まる"), - ("allowed characters", "使用可能な文字"), - ("id_change_tip", "使用できるのは大文字・小文字のアルファベット、数字、アンダースコア (_) のみです。先頭の文字はアルファベット、長さは 6 文字から 16 文字である必要があります。"), + ("Change ID", "IDを変更"), + ("Your new ID", "新しいID"), + ("length %min% to %max%", "長さが%min%～%max%文字"), + ("starts with a letter", "始まりがアルファベット"), + ("allowed characters", "使用可能な文字のみ"), + ("id_change_tip", "使用できるのは大文字・小文字のアルファベット、数字、アンダースコア（_）のみです。先頭の文字はアルファベット、長さは6文字から16文字である必要があります。"), ("Website", "公式サイト"), - ("About", "RustDesk について"), + ("About", "RustDeskについて"), ("Slogan_tip", "この混沌とした世界から、愛をこめて！"), ("Privacy Statement", "プライバシーポリシー"), ("Mute", "ミュート"), ("Build Date", "ビルド日時"), ("Version", "バージョン"), ("Home", "ホーム"), - ("Audio Input", "オーディオ入力"), + ("Audio Input", "音声入力"), ("Enhancements", "拡張機能"), ("Hardware Codec", "ハードウェアコーデック"), - ("Adaptive bitrate", "可変ビットレートを使用する"), + ("Adaptive bitrate", "可変ビットレート"), ("ID Server", "認証サーバー"), ("Relay Server", "中継サーバー"), - ("API Server", "API サーバー"), - ("invalid_http", "http:// または https:// から始まる必要があります。"), - ("Invalid IP", "無効な IP"), - ("Invalid format", "無効な形式"), + ("API Server", "APIサーバー"), + ("invalid_http", "http://またはhttps://から始まる必要があります。"), + ("Invalid IP", "無効なIP"), + ("Invalid format", "無効なフォーマット"), ("server_not_support", "このサーバーには現在対応していません。"), ("Not available", "利用不可"), ("Too frequent", "接続の頻度が高すぎます！"), @@ -78,7 +78,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Reset by the peer", "リモートホストによって接続がリセットされました"), ("Connecting...", "接続中..."), ("Connection in progress. Please wait.", "接続中です。しばらくお待ちください。"), - ("Please try 1 minute later", "1 分後にもう一度お試しください"), + ("Please try 1 minute later", "1分後にもう一度お試しください"), ("Login Error", "ログインエラー"), ("Successful", "成功"), ("Connected, waiting for image...", "接続完了、映像を待機しています..."), @@ -86,7 +86,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Type", "種類"), ("Modified", "最終更新日"), ("Size", "サイズ"), - ("Show Hidden Files", "隠しファイルを表示する"), + ("Show Hidden Files", "隠しファイルを表示"), ("Receive", "受信"), ("Send", "送信"), ("Refresh File", "ファイルを更新"), @@ -112,7 +112,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Waiting", "待機中"), ("Finished", "完了"), ("Speed", "速度"), - ("Custom Image Quality", "カスタム画質"), + ("Custom Image Quality", "画質をカスタムする"), ("Privacy mode", "プライバシーモード"), ("Block user input", "ユーザーの入力をブロック"), ("Unblock user input", "ユーザーの入力を許可"), @@ -122,34 +122,36 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Stretch", "伸縮"), ("Scrollbar", "スクロールバー"), ("ScrollAuto", "自動スクロール"), - ("Good image quality", "画質を優先"), + ("Good image quality", "画質優先"), ("Balanced", "バランス"), - ("Optimize reaction time", "速度を優先"), + ("Optimize reaction time", "速度優先"), ("Custom", "カスタム"), - ("Show remote cursor", "リモートコンピューターのカーソルを表示する"), - ("Show quality monitor", "ディスプレイの品質を表示する"), - ("Disable clipboard", "クリップボードを無効化する"), + ("Show remote cursor", "リモートコンピューターのカーソルを表示"), + ("Show quality monitor", "品質モニターを表示"), + ("Disable clipboard", "クリップボードを無効化"), ("Lock after session end", "セッション終了後にロックする"), - ("Insert Ctrl + Alt + Del", "Ctrl + Alt + Del を送信"), + ("Insert Ctrl + Alt + Del", "Ctrl + Alt + Del 送信"), ("Insert Lock", "ロック命令を送信"), ("Refresh", "更新"), - ("ID does not exist", "ID が存在しません"), + ("ID does not exist", "IDが存在しません"), ("Failed to connect to rendezvous server", "ランデブーサーバーに接続できませんでした"), ("Please try later", "後でもう一度お試しください"), - ("Remote desktop is offline", "リモートデスクトップはオフラインです"), + ("Remote desktop is offline", "リモートコンピューターがオフラインです"), ("Key mismatch", "キーが一致しません"), ("Timeout", "タイムアウト"), ("Failed to connect to relay server", "中継サーバーに接続できませんでした"), ("Failed to connect via rendezvous server", "ランデブーサーバー経由で接続できませんでした"), ("Failed to connect via relay server", "中継サーバー経由で接続できませんでした"), - ("Failed to make direct connection to remote desktop", "リモートデスクトップと直接接続できませんでした"), + ("Failed to make direct connection to remote desktop", "リモートコンピューターと直接接続できませんでした"), ("Set Password", "パスワードを設定"), - ("OS Password", "OS のパスワード"), - ("install_tip", "UAC の影響により、RustDesk がリモートデスクトップ上で正常に動作しない場合があります。UAC を回避するには、下のボタンをクリックしてシステムに RustDesk をインストールしてください。"), + ("OS Password", "OSのパスワード"), + ("install_tip", "UACの影響により、RustDeskがリモートコンピューター上で正常に動作しない場合があります。UACを回避するには、下のボタンをクリックしてシステムにRustDeskをインストールしてください。"), ("Click to upgrade", "アップグレード"), + ("Click to download", "ダウンロード"), + ("Click to update", "アップデート"), ("Configure", "設定"), - ("config_acc", "リモートからあなたのコンピューターを操作するには、RustDesk に「アクセシビリティ」権限を与える必要があります。"), - ("config_screen", "リモートからあなたのコンピューターにアクセスするには、RustDesk に「画面録画」の権限を与える必要があります。"), + ("config_acc", "リモートからあなたのコンピューターを操作するには、RustDeskに「アクセシビリティ」権限を与える必要があります。"), + ("config_screen", "リモートからあなたのコンピューターにアクセスするには、RustDeskに「画面録画」の権限を与える必要があります。"), ("Installing ...", "インストール中..."), ("Install", "インストール"), ("Installation", "インストール"), @@ -158,46 +160,46 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Create desktop icon", "デスクトップにアイコンを作成する"), ("agreement_tip", "インストールを開始することで、ライセンス条項に同意したとみなされます。"), ("Accept and Install", "同意してインストール"), - ("End-user license agreement", "エンドユーザーライセンス条項"), + ("End-user license agreement", "エンドユーザー ライセンス条項"), ("Generating ...", "生成中..."), ("Your installation is lower version.", "インストールされているバージョンが古くなっています。"), ("not_close_tcp_tip", "トンネルの使用中はこのウィンドウを閉じないでください"), - ("Listening ...", "リスニング中..."), + ("Listening ...", "リッスン中 ..."), ("Remote Host", "リモートホスト"), ("Remote Port", "リモートポート"), ("Action", "操作"), ("Add", "追加"), - ("Local Port", "ローカルポート"), - ("Local Address", "ローカルアドレス"), + ("Local Port", "ローカルのポート"), + ("Local Address", "ローカルポート"), ("Change Local Port", "ローカルポートを変更"), - ("setup_server_tip", "より高速に接続したい場合は、自分のサーバーをセットアップすることを推奨します。"), - ("Too short, at least 6 characters.", "文字数が短すぎます。最低文字数は 6 文字です。"), + ("setup_server_tip", "より高速に接続したい場合は、自分のサーバーをセットアップすることをおすすめします"), + ("Too short, at least 6 characters.", "文字数が短すぎます。最低文字数は6文字です。"), ("The confirmation is not identical.", "確認欄と入力が一致しません。"), ("Permissions", "権限"), ("Accept", "承諾"), - ("Dismiss", "却下"), + ("Dismiss", "無視"), ("Disconnect", "切断"), - ("Enable file copy and paste", "ファイルのコピーと貼り付けを許可する"), + ("Enable file copy and paste", "ファイルのコピーと貼り付けを許可"), ("Connected", "接続済み"), - ("Direct and encrypted connection", "直接接続: 接続は暗号化されています"), - ("Relayed and encrypted connection", "中継接続: 接続は暗号化されています"), - ("Direct and unencrypted connection", "直接接続: 接続が暗号化されていません"), - ("Relayed and unencrypted connection", "中継接続: 接続が暗号化されていません"), - ("Enter Remote ID", "リモート ID を入力"), + ("Direct and encrypted connection", "直接接続 接続は暗号化されています"), + ("Relayed and encrypted connection", "中継接続 接続は暗号化されています"), + ("Direct and unencrypted connection", "直接接続 接続が暗号化されていません"), + ("Relayed and unencrypted connection", "中継接続 接続が暗号化されていません"), + ("Enter Remote ID", "リモートIDを入力"), ("Enter your password", "パスワードを入力"), ("Logging in...", "ログイン中..."), - ("Enable RDP session sharing", "RDP セッション共有を有効化する"), + ("Enable RDP session sharing", "RDPセッション共有を有効化"), ("Auto Login", "自動ログイン"), - ("Enable direct IP access", "直接 IP アクセスを有効化する"), + ("Enable direct IP access", "直接IPアクセスを有効化"), ("Rename", "名前の変更"), ("Space", "スペース"), ("Create desktop shortcut", "デスクトップにショートカットを作成する"), ("Change Path", "パスを変更"), - ("Create Folder", "フォルダーを作成"), - ("Please enter the folder name", "フォルダー名を入力してください"), + ("Create Folder", "フォルダを作成"), + ("Please enter the folder name", "フォルダ名を入力してください"), ("Fix it", "修復する"), ("Warning", "警告"), - ("Login screen using Wayland is not supported", "Wayland を使用したログインスクリーンはサポートされていません"), + ("Login screen using Wayland is not supported", "Waylandを使用したログインスクリーンはサポートされていません"), ("Reboot required", "再起動が必要です"), ("Unsupported display server", "サポートされていないディスプレイサーバー"), ("x11 expected", "X11 が必要です"), @@ -206,11 +208,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Username", "ユーザー名"), ("Invalid port", "無効なポート"), ("Closed manually by the peer", "リモートホストによって切断されました"), - ("Enable remote configuration modification", "リモート設定の変更を有効化する"), + ("Enable remote configuration modification", "リモート設定の変更を有効化"), ("Run without install", "インストールせずに実行"), ("Connect via relay", "中継サーバー経由で接続"), ("Always connect via relay", "常に中継サーバー経由で接続"), - ("whitelist_tip", "ホワイトリストに登録された IP からのみ接続を許可します"), + ("whitelist_tip", "ホワイトリストに登録されたIPからのみ接続を許可します"), ("Login", "ログイン"), ("Verify", "認証"), ("Remember me", "入力内容を記憶する"), @@ -219,55 +221,55 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("verification_tip", "登録されたメールアドレスに認証コードが送信されました。認証コードを入力して、ログインを続行してください。"), ("Logout", "ログアウト"), ("Tags", "タグ"), - ("Search ID", "ID を検索"), - ("whitelist_sep", "コンマやセミコロン、空白、改行で区切ってください"), - ("Add ID", "ID を追加"), + ("Search ID", "IDを検索"), + ("whitelist_sep", "カンマやセミコロン、空白、改行で区切ってください"), + ("Add ID", "IDを追加"), ("Add Tag", "タグを追加"), - ("Unselect all tags", "すべてのタグの選択を解除"), + ("Unselect all tags", "全てのタグを選択解除"), ("Network error", "ネットワークエラー"), ("Username missed", "ユーザー名がありません"), ("Password missed", "パスワードがありません"), ("Wrong credentials", "資格情報が間違っています"), ("The verification code is incorrect or has expired", "認証コードが間違っているか、有効期限が切れています"), ("Edit Tag", "タグを編集"), - ("Forget Password", "パスワードを忘れた"), + ("Forget Password", "パスワードを忘れる"), ("Favorites", "お気に入り"), ("Add to Favorites", "お気に入りに追加"), ("Remove from Favorites", "お気に入りから削除"), ("Empty", "空"), - ("Invalid folder name", "無効なフォルダー名"), - ("Socks5 Proxy", "SOCKS5 プロキシ"), - ("Socks5/Http(s) Proxy", "Socks5/Http(s) プロキシ"), + ("Invalid folder name", "無効なフォルダ名"), + ("Socks5 Proxy", "SOCKS5プロキシ"), + ("Socks5/Http(s) Proxy", "Socks5/Http(s)プロキシ"), ("Discovered", "発見済み"), - ("install_daemon_tip", "起動時に RustDesk を開始するには、システムサービスをインストールする必要があります。"), - ("Remote ID", "リモート ID"), + ("install_daemon_tip", "起動時にRustDeskを開始するには、システムサービスをインストールする必要があります。"), + ("Remote ID", "リモートID"), ("Paste", "貼り付け"), ("Paste here?", "ここに貼り付けますか？"), ("Are you sure to close the connection?", "本当に切断しますか？"), ("Download new version", "新しいバージョンをダウンロード"), ("Touch mode", "タッチモード"), ("Mouse mode", "マウスモード"), - ("One-Finger Tap", "1 本指でタップ"), + ("One-Finger Tap", "1本指でタップ"), ("Left Mouse", "マウス左クリック"), - ("One-Long Tap", "1 本指でロングタップ"), - ("Two-Finger Tap", "2 本指でタップ"), + ("One-Long Tap", "1本指でロングタップ"), + ("Two-Finger Tap", "2本指でタップ"), ("Right Mouse", "マウス右クリック"), - ("One-Finger Move", "1 本指でドラッグ"), - ("Double Tap & Move", "2 本指でタップ&ドラッグ"), + ("One-Finger Move", "1本指でドラッグ"), + ("Double Tap & Move", "2本指でタップ&ドラッグ"), ("Mouse Drag", "マウスドラッグ"), - ("Three-Finger vertically", "3 本指で縦方向"), + ("Three-Finger vertically", "3本指で縦方向"), ("Mouse Wheel", "マウスホイール"), - ("Two-Finger Move", "2 本指でドラッグ"), + ("Two-Finger Move", "2本指でドラッグ"), ("Canvas Move", "キャンバスの移動"), - ("Pinch to Zoom", "ピンチして拡大"), - ("Canvas Zoom", "キャンバスの拡大"), + ("Pinch to Zoom", "ピンチしてズーム"), + ("Canvas Zoom", "キャンバスのズーム"), ("Reset canvas", "キャンバスのリセット"), ("No permission of file transfer", "ファイル転送の権限がありません"), ("Note", "ノート"), ("Connection", "接続"), ("Share screen", "画面を共有"), ("Chat", "チャット"), - ("Total", "合計"), + ("Total", "計"), ("items", "個のアイテム"), ("Selected", "選択済み"), ("Screen Capture", "画面キャプチャ"), @@ -275,13 +277,13 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Audio Capture", "音声キャプチャ"), ("Do you accept?", "許可しますか？"), ("Open System Setting", "システム設定を開く"), - ("How to get Android input permission?", "Android の入力権限を取得するには？"), - ("android_input_permission_tip1", "この Android デバイスをリモートコンピューターからマウスやタッチで操作するには、RustDesk に「ユーザー補助」からサービスの使用を許可する必要があります。"), + ("How to get Android input permission?", "Androidの入力権限を取得するには？"), + ("android_input_permission_tip1", "このAndroid端末をリモートコンピューターからマウスやタッチで操作するには、RustDeskに「アクセシビリティ」サービスの使用を許可する必要があります。"), ("android_input_permission_tip2", "次の端末設定ページに進み、「インストール済みアプリ」から「RustDesk Input」を有効にしてください。"), ("android_new_connection_tip", "新しい操作リクエストが届きました。この端末を操作しようとしています。"), ("android_service_will_start_tip", "「画面キャプチャ」を有効にするとサービスが自動的に開始され、他の端末がこの端末への接続をリクエストできるようになります。"), ("android_stop_service_tip", "サービスを停止すると、自動的に現在のセッションがすべて閉じられます。"), - ("android_version_audio_tip", "現在の Android バージョンでは音声キャプチャはサポートされていません。Android 10 以降に更新してください。"), + ("android_version_audio_tip", "現在のAndroidバージョンでは音声キャプチャはサポートされていません。Android 10以降に更新してください。"), ("android_start_service_tip", "「サービスを開始」をタップするか、「画面キャプチャ」の許可を有効にすると、画面共有サービスが開始されます。"), ("android_permission_may_not_change_tip", "権限の変更は現在のセッションには適用されません。再接続後に適用されます。"), ("Account", "アカウント"), @@ -301,39 +303,39 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Language", "言語"), ("Keep RustDesk background service", "RustDesk バックグラウンドサービスを維持"), ("Ignore Battery Optimizations", "バッテリーの最適化を無効にする"), - ("android_open_battery_optimizations_tip", "この機能を使わない場合は、RustDesk アプリの設定ページから「バッテリー」に進み、「制限しない」を選択してください。"), + ("android_open_battery_optimizations_tip", "この機能を使わない場合は、RestDeskアプリの設定ページから「バッテリー」に進み、「制限なし」のチェックを外してください"), ("Start on boot", "起動時に自動実行する"), ("Start the screen sharing service on boot, requires special permissions", "起動時に画面共有サービスを開始します。これには特別な権限が必要です。"), ("Connection not allowed", "接続が許可されていません"), ("Legacy mode", "レガシーモード"), ("Map mode", "マップモード"), ("Translate mode", "変換モード"), - ("Use permanent password", "固定パスワードを使用する"), - ("Use both passwords", "両方のパスワードを使用する"), + ("Use permanent password", "固定パスワードを使用"), + ("Use both passwords", "どちらのパスワードも使用"), ("Set permanent password", "固定パスワードを設定"), - ("Enable remote restart", "リモートからの再起動を有効化する"), + ("Enable remote restart", "リモートからの再起動を有効化"), ("Restart remote device", "リモートの端末を再起動"), ("Are you sure you want to restart", "本当に再起動しますか"), - ("Restarting remote device", "リモートデバイスを再起動中"), + ("Restarting remote device", "リモートコンピューターを再起動中"), ("remote_restarting_tip", "リモートコンピューターは再起動中です。このメッセージボックスを閉じて、しばらくした後にパスワードを使用して再接続してください。"), ("Copied", "コピーしました"), ("Exit Fullscreen", "全画面表示を終了"), ("Fullscreen", "全画面表示"), - ("Mobile Actions", "モバイルアクション"), - ("Select Monitor", "ディスプレイを選択"), - ("Control Actions", "コントロールアクション"), + ("Mobile Actions", "モバイル アクション"), + ("Select Monitor", "モニターを選択"), + ("Control Actions", "コントロール アクション"), ("Display Settings", "ディスプレイの設定"), ("Ratio", "比率"), ("Image Quality", "画質"), - ("Scroll Style", "スクロールスタイル"), + ("Scroll Style", "スクロール スタイル"), ("Show Toolbar", "ツールバーを表示"), ("Hide Toolbar", "ツールバーを隠す"), ("Direct Connection", "直接接続"), ("Relay Connection", "中継接続"), ("Secure Connection", "安全な接続"), ("Insecure Connection", "安全でない接続"), - ("Scale original", "オリジナルのサイズ"), - ("Scale adaptive", "ウィンドウに合わせる"), + ("Scale original", "オリジナルサイズ"), + ("Scale adaptive", "フィットウィンドウ"), ("General", "一般"), ("Security", "セキュリティ"), ("Theme", "テーマ"), @@ -342,54 +344,54 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Dark", "ダーク"), ("Light", "ライト"), ("Follow System", "システム設定に従う"), - ("Enable hardware codec", "ハードウェアコーデックを有効化する"), + ("Enable hardware codec", "ハードウェアコーデックを有効化"), ("Unlock Security Settings", "セキュリティ設定のロックを解除"), - ("Enable audio", "オーディオを有効化する"), + ("Enable audio", "オーディオを有効化"), ("Unlock Network Settings", "ネットワーク設定のロックを解除"), ("Server", "サーバー"), - ("Direct IP Access", "直接 IP 接続"), + ("Direct IP Access", "直接IP接続"), ("Proxy", "プロキシ"), ("Apply", "適用"), ("Disconnect all devices?", "すべてのデバイスから切断しますか？"), ("Clear", "クリア"), ("Audio Input Device", "音声入力デバイス"), - ("Use IP Whitelisting", "IP ホワイトリストを使用する"), + ("Use IP Whitelisting", "IPホワイトリストを使用する"), ("Network", "ネットワーク"), - ("Pin Toolbar", "ツールバーをピン留め"), - ("Unpin Toolbar", "ツールバーのピン留めを解除"), + ("Pin Toolbar", "ツールバーをピン止め"), + ("Unpin Toolbar", "ツールバーのピン止めを解除"), ("Recording", "録画"), ("Directory", "ディレクトリ"), ("Automatically record incoming sessions", "受信したセッションを自動で記録する"), - ("Automatically record outgoing sessions", "送信したセッションを自動で記録する"), + ("Automatically record outgoing sessions", ""), ("Change", "変更"), ("Start session recording", "セッションの録画を開始"), ("Stop session recording", "セッションの録画を停止"), - ("Enable recording session", "セッションの録画を有効化する"), - ("Enable LAN discovery", "LAN の探索を有効化する"), - ("Deny LAN discovery", "LAN の探索を拒否する"), + ("Enable recording session", "セッションの録画を有効化"), + ("Enable LAN discovery", "LAN探索を有効化"), + ("Deny LAN discovery", "LAN探索を拒否"), ("Write a message", "メッセージを書き込む"), ("Prompt", "必須"), - ("Please wait for confirmation of UAC...", "UAC の承認を待機しています..."), - ("elevated_foreground_window_tip", "リモートデスクトップでフォーカスされているウィンドウの操作にはより高い権限が必要なため、マウスとキーボードが一時的に使用できなくなっています。リモートユーザーにウィンドウを最小化、または接続管理画面から権限を昇格するよう要求してください。この問題を回避するには、リモートコンピューターに RustDesk をインストールしてください。"), + ("Please wait for confirmation of UAC...", "UACの承認を待機しています..."), + ("elevated_foreground_window_tip", "リモートデスクトップでフォーカスされているウィンドウの操作にはより高い権限が必要なため、マウスとキーボードが一時的に使用できなくなっています。リモートユーザーにウィンドウを最小化、または接続管理画面から権限を昇格するよう要求してください。この問題を回避するには、リモートコンピューターにRustDeskをインストールしてください。"), ("Disconnected", "切断しました"), ("Other", "その他"), ("Confirm before closing multiple tabs", "複数のタブを閉じる前に確認する"), - ("Keyboard Settings", "キーボードの設定"), + ("Keyboard Settings", "キーボード設定"), ("Full Access", "フルアクセス"), ("Screen Share", "画面共有"), - ("ubuntu-21-04-required", "Wayland を使用するには、Ubuntu 21.04 以降のバージョンが必要です。"), - ("wayland-requires-higher-linux-version", "Wayland を使用するには、より新しい Linux ディストリビューションが必要です。 X11 デスクトップを試すか、OS を変更してください。"), - ("xdp-portal-unavailable", ""), - ("JumpLink", "表示"), + ("Wayland requires Ubuntu 21.04 or higher version.", "Waylandを使用するには、Ubuntu 21.04 以降のバージョンが必要です。"), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Waylandを使用するには、より新しいLinuxディストリビューションが必要です。 X11デスクトップを試すか、OSを変更してください。"), + ("JumpLink", "View"), ("Please Select the screen to be shared(Operate on the peer side).", "共有する画面を選択してください(リモートコンピューターが操作します)"), - ("Show RustDesk", "RustDesk を表示"), - ("This PC", "この PC"), + ("Show RustDesk", "RustDeskを表示"), + ("This PC", "このPC"), ("or", "または"), + ("Continue with", "で続行"), ("Elevate", "昇格"), - ("Zoom cursor", "カーソルを拡大する"), - ("Accept sessions via password", "パスワードでセッションを承認"), - ("Accept sessions via click", "クリックでセッションを承認"), - ("Accept sessions via both", "両方の方法でセッションを承認"), + ("Zoom cursor", "拡大カーソル"), + ("Accept sessions via password", "パスワードによるセッションの許可"), + ("Accept sessions via click", "クリックによるセッションの承認"), + ("Accept sessions via both", "両方の方法でセッションを許可する"), ("Please wait for the remote side to accept your session request...", "リモートコンピューターがあなたのセッション要求を受け入れるまでお待ちください..."), ("One-time Password", "ワンタイムパスワード"), ("Use one-time password", "ワンタイムパスワードを使用する"), @@ -397,48 +399,48 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Request access to your device", "デバイスへのアクセス要求"), ("Hide connection management window", "接続管理画面を隠す"), ("hide_cm_tip", "パスワードによるセッションを許可し、固定パスワードを使用する場合にのみ、管理画面の非表示を許可する。"), - ("wayland_experiment_tip", "Wayland のサポートは試験的なものです。無人アクセスを使用する場合はX11デスクトップをご利用ください。"), - ("Right click to select tabs", "右クリックでタブを選択"), + ("wayland_experiment_tip", "Waylandのサポートは試験的なものです。無人アクセスを使用する場合はX11デスクトップをご利用ください。"), + ("Right click to select tabs", "右クリックでタフを選択"), ("Skipped", "スキップ"), ("Add to address book", "アドレス帳に追加"), ("Group", "グループ"), ("Search", "検索"), - ("Closed manually by web console", "Web コンソールによって閉じられました"), + ("Closed manually by web console", "Webコンソールによって閉じられました"), ("Local keyboard type", "キーボードのタイプ"), ("Select local keyboard type", "キーボードのタイプを選択"), - ("software_render_tip", "Linux で NVIDIA 製のグラフィックカードを使用していると、接続後すぐにリモートウィンドウが閉じてしまう場合があります。オープンソースの Nouveau ドライバーに切り替えて、ソフトウェアレンダリングを使用するよう設定すると解決するかもしれません。(RustDesk の再起動が必要です)"), + ("software_render_tip", "LinuxでNvidia製のグラフィックカードを使用していると、接続後すぐにリモートウィンドウが閉じてしまう場合があります。オープンソースのNouveauドライバに切り替え、ソフトウェアレンダリングを使用するよう設定すると解決するかもしれません。(RustDeskの再起動が必要です)"), ("Always use software rendering", "常にソフトウェアレンダリングを使用する"), - ("config_input", "リモートコンピューターをキーボードで操作するには、RustDesk に「入力監視」権限を与える必要があります。"), - ("config_microphone", "リモートコンピューターと通話するには、RustDesk に「音声録音」権限を与える必要があります。"), + ("config_input", "リモートコンピューターをキーボードで操作するには、RustDeskに「入力監視」権限を与える必要があります。"), + ("config_microphone", "リモートコンピューターと通話するには、RustDeskに「音声録音」権限を与える必要があります。"), ("request_elevation_tip", "リモートユーザーがいる場合は、権限の昇格をリクエストできます。"), ("Wait", "待機"), ("Elevation Error", "昇格エラー"), ("Ask the remote user for authentication", "リモートユーザーに認証をリクエストする"), ("Choose this if the remote account is administrator", "使用中のリモートコンピューター アカウントが管理者の場合はこちらを選択してください"), ("Transmit the username and password of administrator", "管理者のユーザー名とパスワードを送信"), - ("still_click_uac_tip", "リモートデスクトップユーザーが RustDesk を実行する際に、UACを許可する必要があります。"), + ("still_click_uac_tip", "リモートデスクトップ ユーザーがRustDeskを実行する際に、UACを許可する必要があります。"), ("Request Elevation", "権限の昇格をリクエストする"), - ("wait_accept_uac_tip", "リモートデスクトップ ユーザーが UAC ダイアログを許可するまでしばらくお待ちください。"), + ("wait_accept_uac_tip", "リモートデスクトップ ユーザーがUACダイアログを許可するまでしばらくお待ちください。"), ("Elevate successfully", "権限の昇格に成功しました"), ("uppercase", "大文字"), ("lowercase", "小文字"), ("digit", "桁数"), ("special character", "特殊文字"), - ("length>=8", "8 文字以上"), + ("length>=8", "8文字以上"), ("Weak", "脆弱"), ("Medium", "普通"), ("Strong", "強力"), ("Switch Sides", "接続方向の切り替え"), ("Please confirm if you want to share your desktop?", "デスクトップの共有を許可しますか？"), ("Display", "ディスプレイ"), - ("Default View Style", "既定の表示スタイル"), - ("Default Scroll Style", "既定のスクロールスタイル"), - ("Default Image Quality", "既定の画質"), - ("Default Codec", "既定のコーデック"), + ("Default View Style", "デフォルトの表示スタイル"), + ("Default Scroll Style", "デフォルトのスクロールスタイル"), + ("Default Image Quality", "デフォルトの画質"), + ("Default Codec", "デフォルトのコーデック"), ("Bitrate", "ビットレート"), ("FPS", "FPS"), ("Auto", "自動"), - ("Other Default Options", "その他の既定の設定"), + ("Other Default Options", "その他のデフォルト設定"), ("Voice call", "音声通話"), ("Text chat", "テキストチャット"), ("Stop voice call", "音声通話を終了"), @@ -448,7 +450,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Resolution", "解像度"), ("No transfers in progress", "進行中の転送はありません"), ("Set one-time password length", "ワンタイムパスワードの長さを設定する"), - ("RDP Settings", "RDP 設定"), + ("RDP Settings", "RDP設定"), ("Sort by", "並べ替え"), ("New Connection", "新規接続"), ("Restore", "復元"), @@ -459,27 +461,28 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "お気に入りのリモートコンピュータがないようですね？あなたの接続先を登録しましょう！"), ("empty_lan_tip", "あらら、まだ近くのコンピューターは発見できていないようです。"), ("empty_address_book_tip", "驚くべきことに、あなたのアドレス帳には現在コンピューターが登録されていません。"), + ("eg: admin", "例: 管理者"), ("Empty Username", "空のユーザー名"), ("Empty Password", "空のパスワード"), ("Me", "あなた"), ("identical_file_tip", "このファイルはリモートコンピューターと同一です。"), - ("show_monitors_tip", "ツールバーにディスプレイを表示する"), + ("show_monitors_tip", "ツールバーにモニターを表示します"), ("View Mode", "表示モード"), - ("login_linux_tip", "X デスクトップのセッションにログインするには、リモートコンピューターのLinuxアカウントにログインする必要があります。"), - ("verify_rustdesk_password_tip", "RustDesk のパスワードを確認する"), + ("login_linux_tip", "Xデスクトップのセッションにログインするには、リモートコンピューターのLinuxアカウントにログインする必要があります。"), + ("verify_rustdesk_password_tip", "RustDeskのパスワードを確認する"), ("remember_account_tip", "このアカウントを記憶する"), - ("os_account_desk_tip", "このアカウントは、リモートコンピューターの OS にログインし、ヘッドレスでセッションを有効化するために使用されます。"), - ("OS Account", "OS のアカウント"), + ("os_account_desk_tip", "このアカウントは、リモートコンピューターのOSにログインし、ヘッドレスでセッションを有効化するために使用されます。"), + ("OS Account", "OSのアカウント"), ("another_user_login_title_tip", "他のユーザーがすでにログインしています"), ("another_user_login_text_tip", "切断しました"), - ("xorg_not_found_title_tip", "Xorg サーバーが見つかりませんでした。"), - ("xorg_not_found_text_tip", "Xorg をインストールしてください"), + ("xorg_not_found_title_tip", "Xorgサーバーが見つかりませんでした。"), + ("xorg_not_found_text_tip", "Xorgをインストールしてください"), ("no_desktop_title_tip", "デスクトップ環境が見つかりませんでした。"), - ("no_desktop_text_tip", "GNOME デスクトップ環境をインストールしてください"), + ("no_desktop_text_tip", "GNOMEデスクトップ環境をインストールしてください"), ("No need to elevate", "権限昇格の必要はありません"), ("System Sound", "システム音声"), - ("Default", "既定"), - ("New RDP", "新しい RDP"), + ("Default", "デフォルト"), + ("New RDP", "新しいRDP"), ("Fingerprint", "フィンガープリント"), ("Copy Fingerprint", "フィンガープリントをコピー"), ("no fingerprints", "フィンガープリントがありません"), @@ -496,7 +499,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("resolution_custom_tip", "カスタム解像度"), ("Collapse toolbar", "ツールバーを折りたたむ"), ("Accept and Elevate", "承認して権限を昇格する"), - ("accept_and_elevate_btn_tooltip", "接続を受け入れた上で、UAC 権限を昇格します。"), + ("accept_and_elevate_btn_tooltip", "接続を受け入れた上で、UAC権限を昇格します。"), ("clipboard_wait_response_timeout_tip", "クリップボードのコピーがタイムアウトしました。"), ("Incoming connection", "接続の受信"), ("Outgoing connection", "接続の送信"), @@ -514,74 +517,74 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Can not be empty", "空にすることはできません"), ("Already exists", "すでに存在します"), ("Change Password", "パスワードを変更"), - ("Refresh Password", "パスワードを更新"), + ("Refresh Password", "パスワードをリフレッシュ"), ("ID", "ID"), - ("Grid View", "グリッド表示"), - ("List View", "リスト表示"), + ("Grid View", "グリッドビュー"), + ("List View", "リストビュー"), ("Select", "選択"), ("Toggle Tags", "タグの切り替え"), ("pull_ab_failed_tip", "アドレス帳の更新に失敗しました"), ("push_ab_failed_tip", "サーバーへのアドレス帳の同期に失敗しました"), ("synced_peer_readded_tip", "最近セッションを行ったデバイスはアドレス帳に同期されます。"), ("Change Color", "色の変更"), - ("Primary Color", "プライマリカラー"), - ("HSV Color", "HSV カラー"), + ("Primary Color", "プライマリ カラー"), + ("HSV Color", "HSVカラー"), ("Installation Successful!", "インストールに成功しました！"), ("Installation failed!", "インストールに失敗しました。"), ("Reverse mouse wheel", "マウスホイールを反転する"), - ("{} sessions", "{} 件のセッション"), + ("{} sessions", "{}件のセッション"), ("scam_title", "あなたは詐欺にあっているかもしれません！"), - ("scam_text1", "もし、知らない相手から電話で RustDesk のインストールやサービスの開始を依頼された場合、作業を進めずに、すぐに電話を切ってください。"), + ("scam_text1", "もし、知らない相手から電話でRustDeskのインストールやサービスの開始を依頼された場合、作業を進めずに、すぐに電話を切ってください。"), ("scam_text2", "相手はあなたからお金や個人情報を盗もうとする詐欺師である可能性があります。"), ("Don't show again", "今後表示しない"), ("I Agree", "同意する"), ("Decline", "同意しない"), - ("Timeout in minutes", "タイムアウトまでの時間 (分)"), + ("Timeout in minutes", "タイムアウトまでの時間(分)"), ("auto_disconnect_option_tip", "ユーザーが非アクティブの場合、自動的に受信したセッションを閉じる"), - ("Connection failed due to inactivity", "リモートデスクトップユーザーが非アクティブなため、接続に失敗しました"), - ("Check for software update on startup", "起動時にソフトウェアの更新を確認する"), - ("upgrade_rustdesk_server_pro_to_{}_tip", "RustDesk Server Pro をバージョン {} 以上にアップグレードしてください！"), + ("Connection failed due to inactivity", "リモートデスクトップ ユーザーが非アクティブなため、接続に失敗しました"), + ("Check for software update on startup", "起動時にソフトウェアの更新をチェック"), + ("upgrade_rustdesk_server_pro_to_{}_tip", "RustDesk Server Proをバージョン{}以上にアップグレードしてください！"), ("pull_group_failed_tip", "グループの更新に失敗しました"), ("Filter by intersection", "交差位置でフィルター"), ("Remove wallpaper during incoming sessions", "セッションの受信中、デスクトップ背景を削除する"), ("Test", "テスト"), - ("display_is_plugged_out_msg", "ディスプレイが接続されていません。最初のディスプレイを選択してください。"), - ("No displays", "ディスプレイがありません"), + ("display_is_plugged_out_msg", "モニターが接続されていません。最初のモニターを選択してください。"), + ("No displays", "モニターがありません"), ("Open in new window", "新しいウィンドウで開く"), - ("Show displays as individual windows", "ディスプレイを個別のウィンドウとして表示する"), + ("Show displays as individual windows", "モニターを別々のウィンドウとして表示"), ("Use all my displays for the remote session", "すべてのディスプレイをセッションで使用する"), - ("selinux_tip", "SELinuxが有効になっているため、RustDesk が正常に動作しない可能性があります。"), - ("Change view", "表示を変更"), + ("selinux_tip", "SELinuxが有効になっているため、RustDeskが正常に動作しない可能性があります。"), + ("Change view", "表示変更"), ("Big tiles", "大きなタイル"), ("Small tiles", "小さなタイル"), ("List", "リスト"), - ("Virtual display", "仮想ディスプレイ"), - ("Plug out all", "すべて切断"), - ("True color (4:4:4)", "True Color (4:4:4)"), - ("Enable blocking user input", "ユーザー入力のブロックを有効化する"), - ("id_input_tip", "ID、IPアドレス、またはドメインとポート番号(<ドメイン>:<ポート>)を使用できます。\n他のサーバーのデバイスにアクセスしたい場合は、サーバーアドレス(@<サーバーアドレス>?key=<キーの値>)を追加してください。 \n(例: 9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=)\nパブリックサーバーのデバイスに接続したい場合は、「@public」のように入力してください。パブリックサーバーの場合、キーは不要です。\n\n初回接続で中継接続を行いたい場合は、「9123456234/r」のように末尾に「/r」を付けてください。"), + ("Virtual display", "仮想モニター"), + ("Plug out all", "すべて切断する"), + ("True color (4:4:4)", "True color (4:4:4)"), + ("Enable blocking user input", "ユーザー入力のブロックを有効化"), + ("id_input_tip", "ID、IPアドレス、またはドメインとポート番号(<ドメイン>:<ポート>)を使用できます。\n他のサーバーのデバイスにアクセスしたい場合は、サーバーアドレス(@<サーバーアドレス>?key=<キーの値>)を追加してください。 \n(例:9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=)\nパブリックサーバーのデバイスに接続したい場合は、「@public」のように入力してください。パブリックサーバーの場合、キーは不要です。\n\n初回接続で中継接続を行いたい場合は、「9123456234/r」のように末尾に「/r」を付けてください。"), ("privacy_mode_impl_mag_tip", "モード 1"), ("privacy_mode_impl_virtual_display_tip", "モード 2"), ("Enter privacy mode", "プライバシーモードを起動"), ("Exit privacy mode", "プライバシーモードを終了"), - ("idd_not_support_under_win10_2004_tip", "Indirect display driver には対応していません。Windows 10 バージョン 2004 以降が必要です。"), + ("idd_not_support_under_win10_2004_tip", "Indirect display driverには対応していません。Windows 10 バージョン2004以降が必要です。"), ("input_source_1_tip", "入力ソース 1"), ("input_source_2_tip", "入力ソース 2"), - ("Swap control-command key", "ctrl と command キーを入れ替える"), + ("Swap control-command key", "ctrlとcommandキーを入れ替える"), ("swap-left-right-mouse", "マウスのクリックを入れ替える"), ("2FA code", "二要素認証コード"), ("More", "詳細"), - ("enable-2fa-title", "二要素認証を有効化する"), - ("enable-2fa-desc", "認証アプリをセットアップします。Authy、Microsoft または Google 認証システムなどが PC またはスマートフォンで利用できます。\n\nQR コードをスキャンし、アプリが表示するコードを入力することで二要素認証が有効になります。"), + ("enable-2fa-title", "二要素認証を有効化"), + ("enable-2fa-desc", "認証アプリをセットアップします。Authy、MicrosoftまたはGoogle AuthenticatorなどがPCまたはスマートフォンで利用できます。\n\nQRコードをスキャンし、アプリが表示するコードを入力することで二要素認証が有効になります。"), ("wrong-2fa-code", "コードが違います。コードと端末の時刻設定が正しいかをご確認ください。"), ("enter-2fa-title", "二要素認証"), - ("Email verification code must be 6 characters.", "電子メール認証コードは 6 文字である必要があります。"), - ("2FA code must be 6 digits.", "二要素認証コードは 6 文字である必要があります。"), - ("Multiple Windows sessions found", "複数の Windows セッションが見つかりました"), + ("Email verification code must be 6 characters.", "電子メール認証コードは6文字である必要があります。"), + ("2FA code must be 6 digits.", "二要素認証コードは6文字である必要があります。"), + ("Multiple Windows sessions found", "複数のWindowsセッションが見つかりました"), ("Please select the session you want to connect to", "接続したいセッションを選択してください"), ("powered_by_me", "Powered by RustDesk"), ("outgoing_only_desk_tip", "カスタマイズされたエディションを使用しています。\n他のコンピューターに接続できますが、他のコンピューターからのリクエストは受信できません。"), - ("preset_password_warning", "このエディションには、既定で固定パスワードが設定されています。このパスワードを知っているユーザーはあなたのデバイスを完全にコントロールできるため、そのような危険がある場合は直ちに RustDesk をアンインストールして下さい！"), + ("preset_password_warning", "このエディションには、デフォルトで固定パスワードが設定されています。このパスワードを知っているユーザーはあなたのデバイスを完全にコントロールできるため、そのような危険がある場合は直ちにRustDeskをアンインストールして下さい！"), ("Security Alert", "セキュリティ警告"), ("My address book", "あなたのアドレス帳"), ("Personal", "個人"), @@ -593,157 +596,112 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Full Control", "フルアクセス"), ("share_warning_tip", "フィールドは共有され、他の人からも閲覧できます。"), ("Everyone", "全員"), - ("ab_web_console_tip", "Web コンソールの詳細"), - ("allow-only-conn-window-open-tip", "RustDesk のウィンドウが開いている場合のみ接続を許可する"), - ("no_need_privacy_mode_no_physical_displays_tip", "物理ディスプレイが存在しないため、プライバシーモードは不要です。"), - ("Follow remote cursor", "リモートカーソルに追従する"), - ("Follow remote window focus", "リモートウィンドウのフォーカスに追従する"), - ("default_proxy_tip", "既定のプロトコルとポートは Socks5 と 1080 です。"), + ("ab_web_console_tip", "webコンソールの詳細"), + ("allow-only-conn-window-open-tip", "RustDeskのウィンドウが開いている場合のみ接続を許可する"), + ("no_need_privacy_mode_no_physical_displays_tip", "物理モニターが存在しないため、プライバシーモードは不要です。"), + ("Follow remote cursor", "リモートカーソルに追従"), + ("Follow remote window focus", "リモートウィンドウのフォーカスに追従"), + ("default_proxy_tip", "デフォルトのプロトコルとポートはSocks5と1080です。"), ("no_audio_input_device_tip", "オーディオ入力デバイスが見つかりません。"), ("Incoming", "受信"), ("Outgoing", "発信"), - ("Clear Wayland screen selection", "Wayland の画面選択をクリア"), + ("Clear Wayland screen selection", "Waylandの画面選択をクリア"), ("clear_Wayland_screen_selection_tip", "画面選択をクリア後、共有画面を再び選択できます。"), - ("confirm_clear_Wayland_screen_selection_tip", "本当に Wayland の画面選択をクリアしますか？"), + ("confirm_clear_Wayland_screen_selection_tip", "本当にWaylandの画面選択をクリアしますか？"), ("android_new_voice_call_tip", "新しい音声通話リクエストを受信しました。承認すると音声通話に切り替わります。"), ("texture_render_tip", "テクスチャレンダリングを使用し、画像をより滑らかに描画します。レンダリングの問題が発生した場合は無効にしてみてください。"), - ("Use texture rendering", "テクスチャレンダリングを使用する"), + ("Use texture rendering", "テクスチャレンダリングを使用"), ("Floating window", "フローティングウィンドウ"), - ("floating_window_tip", "RustDesk のバックグラウンドサービスを維持するために使用されます。"), + ("floating_window_tip", "RustDeskのバックグラウンドサービスを維持するために使用されます。"), ("Keep screen on", "常に画面をオン"), ("Never", "画面をオンにしない"), ("During controlled", "操作中"), - ("During service is on", "サービスが動作中"), - ("Capture screen using DirectX", "画面キャプチャに DirectX を使用する"), + ("During service is on", "サービスの動作中"), + ("Capture screen using DirectX", "DirectXを使用した画面キャプチャ"), ("Back", "戻る"), ("Apps", "アプリ"), - ("Volume up", "音量を上げる"), - ("Volume down", "音量を下げる"), + ("Volume up", "音量アップ"), + ("Volume down", "音量ダウン"), ("Power", "電源"), - ("Telegram bot", "Telegram ボット"), + ("Telegram bot", "Telegram Bot"), ("enable-bot-tip", "この機能を有効にすると、ボットから二要素認証コードを受け取ることができます。また、接続時の通知としても機能します。"), - ("enable-bot-desc", "1. @BotFather のチャットを開きます。\n2. 「/newbot」コマンドを送信します。送信後、トークンを取得できます。\n3. 新しく作成したボットとチャットを開始します。「/hello」のようにスラッシュで始まるメッセージを送信して起動します。\n"), + ("enable-bot-desc", "1. @BotFatherのチャットを開きます。\n2. 「/newbot」コマンドを送信します。送信後、トークンを取得できます。\n3. 新しく作成したbotとチャットを開始します。「/hello」のようにスラッシュで始まるメッセージを送信して起動します。\n"), ("cancel-2fa-confirm-tip", "本当に二要素認証をキャンセルしますか？"), - ("cancel-bot-confirm-tip", "本当に Telegram ボットをキャンセルしますか？"), - ("About RustDesk", "RustDesk について"), + ("cancel-bot-confirm-tip", "本当にTelegram Botをキャンセルしますか？"), + ("About RustDesk", "RustDeskについて"), ("Send clipboard keystrokes", "クリップボードの内容をキー入力として送信する"), ("network_error_tip", "ネットワーク接続を確認し、再度お試しください。"), - ("Unlock with PIN", "PIN でロックを解除する"), - ("Requires at least {} characters", "最低でも {} 文字が必要です"), - ("Wrong PIN", "PIN が間違っています"), - ("Set PIN", "PIN を設定"), - ("Enable trusted devices", "承認済みデバイスを有効化する"), - ("Manage trusted devices", "承認済みデバイスの管理"), + ("Unlock with PIN", "PINでロック解除"), + ("Requires at least {} characters", "最低でも{}文字必要です"), + ("Wrong PIN", "PINが間違っています"), + ("Set PIN", "PINを設定"), + ("Enable trusted devices", "承認済デバイスを有効化"), + ("Manage trusted devices", "承認済デバイスの管理"), ("Platform", "プラットフォーム"), ("Days remaining", "残り日数"), - ("enable-trusted-devices-tip", "承認済みのデバイスで 2FA の確認をスキップします。"), + ("enable-trusted-devices-tip", "承認済デバイスで2FAチェックをスキップします。"), ("Parent directory", "親ディレクトリ"), ("Resume", "再開"), ("Invalid file name", "無効なファイル名"), - ("one-way-file-transfer-tip", "コントロールをされる側では一方向のファイル転送が有効になります。"), - ("Authentication Required", "認証が必要です"), - ("Authenticate", "認証"), - ("web_id_input_tip", "同じサーバー内の ID を入力できます。Web クライアントでは直接 IP アドレスによるアクセスはサポートされていません。\n別のサーバー上のデバイスにアクセスする場合は、サーバーアドレス (@?key=) を入力してください。\n 例: 9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=\nパブリックサーバー上のデバイスにアクセスする場合は、「@public」と入力してください。パブリックサーバーはキーは不要です。"), - ("Download", "ダウンロード"), - ("Upload folder", "フォルダーをアップロード"), - ("Upload files", "ファイルをアップロード"), - ("Clipboard is synchronized", "クリップボードを同期しました"), - ("Update client clipboard", "クライアントのクリップボードを更新"), - ("Untagged", "タグ付けなし"), - ("new-version-of-{}-tip", "{} の新しいバージョンが利用可能です"), - ("Accessible devices", "アクセス可能なデバイス"), - ("upgrade_remote_rustdesk_client_to_{}_tip", "リモート側の RustDesk クライアントをバージョン {} 以上にアップグレードしてください！"), - ("d3d_render_tip", "D3D レンダリングを有効化すると、一部の環境ではリモートコントロール画面が黒くなる場合があります。"), - ("Use D3D rendering", "D3D レンダリングを使用する"), - ("Printer", "プリンター"), - ("printer-os-requirement-tip", "プリンター送信機能は Windows 10 以降が必要です。"), - ("printer-requires-installed-{}-client-tip", "リモート印刷を使用するには、このデバイスに {} がインストールされている必要があります。"), - ("printer-{}-not-installed-tip", "{} のプリンターがインストールされていません。"), - ("printer-{}-ready-tip", "{} のプリンターがインストールされ、使用可能になっています。"), - ("Install {} Printer", " {} のプリンターをインストール"), - ("Outgoing Print Jobs", "印刷ジョブの送信"), - ("Incoming Print Jobs", "印刷ジョブの受信"), - ("Incoming Print Job", "印刷ジョブの受信"), - ("use-the-default-printer-tip", "既定のプリンターを使用する"), - ("use-the-selected-printer-tip", "選択したプリンターを使用する"), - ("auto-print-tip", "選択したプリンターを使用して自動的に印刷する"), - ("print-incoming-job-confirm-tip", "リモートから印刷ジョブを受信しました。こちらで実行しますか？"), - ("remote-printing-disallowed-tile-tip", "リモート印刷は許可されていません"), - ("remote-printing-disallowed-text-tip", "コントロールされる側の権限の設定により、リモート印刷が拒否されました。"), - ("save-settings-tip", "設定を保存します"), - ("dont-show-again-tip", "今後は表示しない"), - ("Take screenshot", "スクリーンショットを撮影"), - ("Taking screenshot", "スクリーンショットを撮影中"), - ("screenshot-merged-screen-not-supported-tip", "複数のディスプレイのスクリーンショットの結合は、現在サポートされていません。単一のディスプレイに切り替えてもう一度お試しください。"), - ("screenshot-action-tip", "スクリーンショットを続行する方法を選択してください。"), - ("Save as", "保存先"), - ("Copy to clipboard", "クリップボードにコピー"), - ("Enable remote printer", "リモートプリンターを有効化する"), - ("Downloading {}", "{} をダウンロード中"), - ("{} Update", "{} を更新"), - ("{}-to-update-tip", "{} を終了して新しいバージョンがインストールされます。"), - ("download-new-version-failed-tip", "ダウンロードに失敗しました。もう一度お試しいただくか、「ダウンロード」ボタンをクリックしてリリースページからダウンロードし、手動でアップグレードしてください。"), - ("Auto update", "ソフトウェアの自動更新を行う"), - ("update-failed-check-msi-tip", "インストール方法の確認に失敗しました。「ダウンロード」ボタンをクリックしてリリースページからダウンロードし、手動でアップグレードしてください。"), - ("websocket_tip", "WebSocket を使用する場合、リレー接続のみがサポートされます。"), - ("Use WebSocket", "WebSocket を使用する"), - ("Trackpad speed", "トラックパッドの速度"), - ("Default trackpad speed", "既定のトラックパッドの速度"), - ("Numeric one-time password", "数字のワンタイムパスワード"), - ("Enable IPv6 P2P connection", "IPv6 P2P 接続を有効化する"), - ("Enable UDP hole punching", "UDP ホールパンチを有効化する"), + ("one-way-file-transfer-tip", ""), + ("Authentication Required", ""), + ("Authenticate", ""), + ("web_id_input_tip", ""), + ("Download", ""), + ("Upload folder", ""), + ("Upload files", ""), + ("Clipboard is synchronized", ""), + ("Update client clipboard", ""), + ("Untagged", ""), + ("new-version-of-{}-tip", ""), + ("Accessible devices", ""), + ("upgrade_remote_rustdesk_client_to_{}_tip", "リモート側のRustDeskクライアントをバージョン{}以上にアップグレードしてください！"), + ("d3d_render_tip", ""), + ("Use D3D rendering", ""), + ("Printer", ""), + ("printer-os-requirement-tip", ""), + ("printer-requires-installed-{}-client-tip", ""), + ("printer-{}-not-installed-tip", ""), + ("printer-{}-ready-tip", ""), + ("Install {} Printer", ""), + ("Outgoing Print Jobs", ""), + ("Incoming Print Jobs", ""), + ("Incoming Print Job", ""), + ("use-the-default-printer-tip", ""), + ("use-the-selected-printer-tip", ""), + ("auto-print-tip", ""), + ("print-incoming-job-confirm-tip", ""), + ("remote-printing-disallowed-tile-tip", ""), + ("remote-printing-disallowed-text-tip", ""), + ("save-settings-tip", ""), + ("dont-show-again-tip", ""), + ("Take screenshot", ""), + ("Taking screenshot", ""), + ("screenshot-merged-screen-not-supported-tip", ""), + ("screenshot-action-tip", ""), + ("Save as", ""), + ("Copy to clipboard", ""), + ("Enable remote printer", ""), + ("Downloading {}", ""), + ("{} Update", ""), + ("{}-to-update-tip", ""), + ("download-new-version-failed-tip", ""), + ("Auto update", ""), + ("update-failed-check-msi-tip", ""), + ("websocket_tip", ""), + ("Use WebSocket", ""), + ("Trackpad speed", ""), + ("Default trackpad speed", ""), + ("Numeric one-time password", ""), + ("Enable IPv6 P2P connection", ""), + ("Enable UDP hole punching", ""), ("View camera", "カメラを表示"), - ("Enable camera", "カメラを有効化する"), - ("No cameras", "カメラなし"), - ("view_camera_unsupported_tip", "リモートデバイスはカメラの表示をサポートしていません。"), - ("Terminal", "ターミナル"), - ("Enable terminal", "ターミナルを有効化する"), - ("New tab", "新しいタブ"), - ("Keep terminal sessions on disconnect", "切断時にターミナルセッションを維持する"), - ("Terminal (Run as administrator)", "管理者として実行"), - ("terminal-admin-login-tip", "リモート側の管理者ユーザー名とパスワードを入力してください。"), - ("Failed to get user token.", "ユーザートークンの取得に失敗しました。"), - ("Incorrect username or password.", "ユーザー名またはパスワードが正しくありません。"), - ("The user is not an administrator.", "このユーザーは管理者ではありません。"), - ("Failed to check if the user is an administrator.", "ユーザーが管理者であるかどうかを確認できませんでした。"), - ("Supported only in the installed version.", "インストールされたバージョンでのみサポートされます。"), - ("elevation_username_tip", "ユーザー名またはドメインのユーザー名を入力してください。"), - ("Preparing for installation ...", "インストールの準備中です..."), - ("Show my cursor", "自分のカーソルを表示する"), - ("Scale custom", "カスタムスケール"), - ("Custom scale slider", "カスタムスケールのスライダー"), - ("Decrease", "縮小"), - ("Increase", "拡大"), - ("Show virtual mouse", "仮想マウスを表示する"), - ("Virtual mouse size", "仮想マウスのサイズ"), - ("Small", "小"), - ("Large", "中"), - ("Show virtual joystick", "仮想ジョイスティックを表示する"), - ("Edit note", "メモを編集"), - ("Alias", "エイリアス"), - ("ScrollEdge", "スクロールエッジ"), - ("Allow insecure TLS fallback", "安全ではない TLS フォールバックを許可する"), - ("allow-insecure-tls-fallback-tip", "既定では RustDesk は TLS を使用するプロトコルのサーバー証明書を検証します。\nこのオプションを有効化すると RustDesk は検証の手順をスキップして、検証に失敗した場合の処理を続行します。"), - ("Disable UDP", "UDP を無効化する"), - ("disable-udp-tip", "TCP のみ使用するかどうかを制御します。\nこのオプションを有効化すると、RustDesk は UDP 21116 を使用せずに TCP 21116 を使用するようになります。"), - ("server-oss-not-support-tip", "注意: RustDesk Server OSS にはこの機能が含まれていません。"), - ("input note here", "ここにメモを入力"), - ("note-at-conn-end-tip", "接続終了時にメモを要求する"), - ("Show terminal extra keys", "ターミナルの追加キーを表示する"), - ("Relative mouse mode", "相対マウスモード"), - ("rel-mouse-not-supported-peer-tip", "接続先のデバイスは相対マウスモードに対応していません。"), - ("rel-mouse-not-ready-tip", "相対マウスモードはまだ準備できていません。再度お試しください。"), - ("rel-mouse-lock-failed-tip", "カーソルをロックできませんでした。相対マウスモードは無効化されています。"), - ("rel-mouse-exit-{}-tip", "「{}」を押して終了します。"), - ("rel-mouse-permission-lost-tip", "キーボード操作の権限が取り消されました。相対マウスモードは無効化されています。"), - ("Changelog", "更新履歴"), - ("keep-awake-during-outgoing-sessions-label", "送信セッション中は、画面のスリープを無効化する"), - ("keep-awake-during-incoming-sessions-label", "受信セッション中は、画面のスリープを無効化する"), - ("Continue with {}", "{} で続行する"), - ("Display Name", "表示名"), - ("password-hidden-tip", "永続的なパスワードが設定されています (非表示)"), - ("preset-password-in-use-tip", "プリセットパスワードが現在使用されています"), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Enable camera", ""), + ("No cameras", ""), + ("view_camera_unsupported_tip", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ko.rs b/src/lang/ko.rs index 350d570b0..863748e37 100644 --- a/src/lang/ko.rs +++ b/src/lang/ko.rs @@ -3,49 +3,49 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = [ ("Status", "상태"), ("Your Desktop", "내 데스크탑"), - ("desk_tip", "이 ID와 비밀번호로 데스크탑에 액세스할 수 있습니다."), + ("desk_tip", "이 ID와 비밀번호를 사용하여 원격으로 이 데스크톱에 액세스할 수 있습니다."), ("Password", "비밀번호"), - ("Ready", "준비 완료"), + ("Ready", "준비됨"), ("Established", "연결됨"), - ("connecting_status", "RustDesk 네트워크에 연결 중..."), + ("connecting_status", "RustDesk 네트워크에 연결하는 중..."), ("Enable service", "서비스 활성화"), ("Start service", "서비스 시작"), - ("Service is running", "서비스가 실행 중입니다"), - ("Service is not running", "서비스가 실행되지 않았습니다"), - ("not_ready_status", "준비되지 않았습니다. 연결을 확인해 주세요"), + ("Service is running", "서비스 실행 중"), + ("Service is not running", "서비스 중지됨"), + ("not_ready_status", "준비되지 않았습니다. 네트워크 연결을 확인해 주세요."), ("Control Remote Desktop", "원격 데스크탑 제어"), ("Transfer file", "파일 전송"), ("Connect", "연결"), ("Recent sessions", "최근 세션"), - ("Address book", "주소록"), + ("Address book", "세션 주소록"), ("Confirmation", "확인"), ("TCP tunneling", "TCP 터널링"), ("Remove", "삭제"), - ("Refresh random password", "임의의 비밀번호 새로 고침"), - ("Set your own password", "자신만의 비밀번호 설정"), - ("Enable keyboard/mouse", "키보드/마우스 허용"), - ("Enable clipboard", "클립보드 허용"), - ("Enable file transfer", "파일 전송 허용"), - ("Enable TCP tunneling", "TCP 터널링 허용"), + ("Refresh random password", "랜덤 비밀번호 갱신"), + ("Set your own password", "사용자 지정 비밀번호 설정"), + ("Enable keyboard/mouse", "키보드/마우스 활성화"), + ("Enable clipboard", "클립보드 활성화"), + ("Enable file transfer", "파일 전송 활성화"), + ("Enable TCP tunneling", "TCP 터널링 활성화"), ("IP Whitelisting", "IP 화이트리스트"), ("ID/Relay Server", "ID/릴레이 서버"), - ("Import server config", "서버 구성 가져오기"), - ("Export Server Config", "서버 구성 내보내기"), - ("Import server configuration successfully", "서버 구성 가져오기에 성공했습니다"), - ("Export server configuration successfully", "서버 구성 내보내기가 성공했습니다"), - ("Invalid server configuration", "잘못된 서버 구성입니다"), + ("Import server config", "서버 설정 가져오기"), + ("Export Server Config", "서버 설정 내보내기"), + ("Import server configuration successfully", "서버 구성을 성공적으로 가져왔습니다."), + ("Export server configuration successfully", "서버 구성을 성공적으로 내보냈습니다."), + ("Invalid server configuration", "잘못된 서버 구성입니다."), ("Clipboard is empty", "클립보드가 비어있습니다"), ("Stop service", "서비스 중지"), ("Change ID", "ID 변경"), ("Your new ID", "새 ID"), - ("length %min% to %max%", "길이 %min% ~ %max%"), + ("length %min% to %max%", "길이: %min% ~ %max%"), ("starts with a letter", "문자로 시작해야 합니다"), ("allowed characters", "허용되는 문자"), - ("id_change_tip", "a-z, A-Z, 0-9, -(대시) 및 _(밑줄) 문자만 허용됩니다. 첫 글자는 a-z, A-Z여야 합니다. 길이는 6에서 16 사이여야 합니다."), + ("id_change_tip", "ID는 a-z, A-Z, 0-9, -(하이픈), _(밑줄) 문자만 사용할 수 있습니다. 첫 글자는 영문자(a-z, A-Z)여야 하며, 길이는 6자에서 16자 사이여야 합니다."), ("Website", "웹사이트"), ("About", "정보"), - ("Slogan_tip", "이 혼란스러운 세상에서 마음을 담아 만들었습니다! - 한국어 번역: 비너스걸"), - ("Privacy Statement", "개인정보 보호정책"), + ("Slogan_tip", "이 혼란스러운 세상에서 마음을 담아 만들었습니다!"), + ("Privacy Statement", "개인정보처리방침"), ("Mute", "음소거"), ("Build Date", "빌드 날짜"), ("Version", "버전"), @@ -53,43 +53,43 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Audio Input", "오디오 입력"), ("Enhancements", "향상된 기능"), ("Hardware Codec", "하드웨어 코덱"), - ("Adaptive bitrate", "적응형 비트레이트"), + ("Adaptive bitrate", "가변 비트레이트"), ("ID Server", "ID 서버"), ("Relay Server", "릴레이 서버"), ("API Server", "API 서버"), ("invalid_http", "http:// 또는 https://로 시작해야 합니다"), - ("Invalid IP", "유효하지 않은 IP 주소입니다"), - ("Invalid format", "유효하지 않은 형식입니다"), - ("server_not_support", "아직 서버에서 지원되지 않습니다"), - ("Not available", "사용할 수 없음"), - ("Too frequent", "너무 빈번합니다"), + ("Invalid IP", "유효하지 않은 IP 주소입니다."), + ("Invalid format", "유효하지 않은 형식입니다."), + ("server_not_support", "서버에서 아직 지원하지 않는 기능입니다."), + ("Not available", "사용할 수 없습니다."), + ("Too frequent", "변경 요청이 너무 잦습니다. 잠시 후 다시 시도해 주세요."), ("Cancel", "취소"), ("Skip", "건너뛰기"), ("Close", "닫기"), ("Retry", "재시도"), ("OK", "확인"), - ("Password Required", "비밀번호 필요"), - ("Please enter your password", "비밀번호를 입력하세요"), + ("Password Required", "비밀번호가 필요합니다."), + ("Please enter your password", "비밀번호를 입력해 주세요."), ("Remember password", "비밀번호 기억"), - ("Wrong Password", "잘못된 비밀번호"), + ("Wrong Password", "잘못된 비밀번호입니다."), ("Do you want to enter again?", "다시 입력하시겠습니까?"), ("Connection Error", "연결 오류"), ("Error", "오류"), - ("Reset by the peer", "피어에 의해 초기화"), - ("Connecting...", "연결 중..."), - ("Connection in progress. Please wait.", "연결이 진행 중입니다. 기다려 주세요."), - ("Please try 1 minute later", "1분 후에 다시 시도하세요"), + ("Reset by the peer", "피어에 의해 연결이 초기화되었습니다."), + ("Connecting...", "연결 중입니다..."), + ("Connection in progress. Please wait.", "연결 진행 중입니다. 잠시만 기다려 주세요."), + ("Please try 1 minute later", "1분 후에 다시 시도해 주세요."), ("Login Error", "로그인 오류"), - ("Successful", "성공"), - ("Connected, waiting for image...", "연결됨, 화면을 기다리는 중..."), + ("Successful", "성공했습니다."), + ("Connected, waiting for image...", "연결되었습니다. 화면을 기다리는 중입니다..."), ("Name", "이름"), ("Type", "유형"), - ("Modified", "수정 날짜"), + ("Modified", "수정일"), ("Size", "크기"), - ("Show Hidden Files", "숨김 파일 표시"), + ("Show Hidden Files", "숨겨진 파일 표시"), ("Receive", "받기"), ("Send", "보내기"), - ("Refresh File", "파일 새로 고침"), + ("Refresh File", "파일 새로고침"), ("Local", "로컬"), ("Remote", "원격"), ("Remote Computer", "원격 컴퓨터"), @@ -98,29 +98,29 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Delete", "삭제"), ("Properties", "속성"), ("Multi Select", "다중 선택"), - ("Select All", "모두 선택"), - ("Unselect All", "모두 선택 해제"), - ("Empty Directory", "빈 디렉터리입니다"), - ("Not an empty directory", "빈 디렉터리가 아닙니다"), + ("Select All", "전체 선택"), + ("Unselect All", "전체 선택 해제"), + ("Empty Directory", "빈 폴더입니다"), + ("Not an empty directory", "폴더가 비어 있지 않습니다"), ("Are you sure you want to delete this file?", "이 파일을 삭제하시겠습니까?"), - ("Are you sure you want to delete this empty directory?", "이 빈 디렉터리를 삭제하시겠습니까?"), - ("Are you sure you want to delete the file of this directory?", "이 디렉터리의 파일을 삭제하시겠습니까?"), - ("Do this for all conflicts", "모든 충돌에 대해 이렇게 하세요"), - ("This is irreversible!", "이것은 되돌릴 수 없습니다!"), + ("Are you sure you want to delete this empty directory?", "이 빈 폴더를 삭제하시겠습니까?"), + ("Are you sure you want to delete the file of this directory?", "이 폴더의 모든 파일을 삭제하시겠습니까?"), + ("Do this for all conflicts", "모든 충돌 항목에 이 작업 적용"), + ("This is irreversible!", "이 작업은 되돌릴 수 없습니다."), ("Deleting", "삭제 중"), ("files", "파일"), ("Waiting", "대기 중"), - ("Finished", "완료되었습니다"), + ("Finished", "완료되었습니다."), ("Speed", "속도"), ("Custom Image Quality", "사용자 지정 이미지 품질"), - ("Privacy mode", "개인정보 보호 모드"), + ("Privacy mode", "프라이버시 모드"), ("Block user input", "사용자 입력 차단"), ("Unblock user input", "사용자 입력 차단 해제"), ("Adjust Window", "창 크기 조정"), - ("Original", "원본"), + ("Original", "원본 크기"), ("Shrink", "축소"), - ("Stretch", "늘이기"), - ("Scrollbar", "스크롤 막대"), + ("Stretch", "확대"), + ("Scrollbar", "스크롤바"), ("ScrollAuto", "자동 스크롤"), ("Good image quality", "좋은 이미지 품질"), ("Balanced", "균형 잡힌"), @@ -128,201 +128,203 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Custom", "사용자 지정"), ("Show remote cursor", "원격 커서 표시"), ("Show quality monitor", "품질 모니터 표시"), - ("Disable clipboard", "클립보드 사용 안 함"), - ("Lock after session end", "세션 종료 후 잠금"), - ("Insert Ctrl + Alt + Del", "Ctrl + Alt + Del 삽입"), - ("Insert Lock", "삽입 잠금"), + ("Disable clipboard", "클립보드 비활성화"), + ("Lock after session end", "세션 종료 후 화면 잠금"), + ("Insert Ctrl + Alt + Del", "Ctrl + Alt + Del 입력"), + ("Insert Lock", "입력 잠금"), ("Refresh", "새로 고침"), - ("ID does not exist", "ID가 존재하지 않습니다"), - ("Failed to connect to rendezvous server", "랑데부 서버 연결에 실패했습니다"), - ("Please try later", "나중에 시도해 주세요"), - ("Remote desktop is offline", "원격 데스크탑이 오프라인입니다"), - ("Key mismatch", "키가 일치하지 않습니다"), - ("Timeout", "시간 초과"), - ("Failed to connect to relay server", "릴레이 서버 연결에 실패했습니다"), - ("Failed to connect via rendezvous server", "랑데부 서버를 통한 연결에 실패했습니다"), - ("Failed to connect via relay server", "릴레이 서버를 통한 연결에 실패했습니다"), - ("Failed to make direct connection to remote desktop", "원격 데스크탑 직접 연결에 실패했습니다"), + ("ID does not exist", "ID가 존재하지 않습니다."), + ("Failed to connect to rendezvous server", "랑데부 서버 연결에 실패했습니다."), + ("Please try later", "나중에 다시 시도해 주세요."), + ("Remote desktop is offline", "원격 데스크톱이 오프라인입니다."), + ("Key mismatch", "키가 일치하지 않습니다."), + ("Timeout", "시간이 초과되었습니다."), + ("Failed to connect to relay server", "릴레이 서버 연결에 실패했습니다."), + ("Failed to connect via rendezvous server", "랑데부 서버를 통한 연결에 실패했습니다."), + ("Failed to connect via relay server", "릴레이 서버를 통한 연결에 실패했습니다."), + ("Failed to make direct connection to remote desktop", "원격 데스크톱에 직접 연결하지 못했습니다."), ("Set Password", "비밀번호 설정"), ("OS Password", "OS 비밀번호"), - ("install_tip", "UAC로 인해 경우에 따라 RustDesk가 원격 쪽에서 제대로 작동하지 않을 수 있습니다. UAC를 피하려면 아래 버튼을 클릭하여 시스템에 RustDesk를 설치하세요."), - ("Click to upgrade", "업그레이드"), + ("install_tip", "UAC(사용자 계정 컨트롤)로 인해 일부 원격 제어 기능이 제한될 수 있습니다. 모든 기능을 사용하려면 RustDesk를 시스템에 설치해야 합니다."), + ("Click to upgrade", "업그레이드하려면 클릭하세요."), + ("Click to download", "다운로드하려면 클릭하세요."), + ("Click to update", "업데이트하려면 클릭하세요."), ("Configure", "구성"), - ("config_acc", "데스크탑을 원격으로 제어하려면 RustDesk에 \"접근성\" 권한을 부여해야 합니다."), - ("config_screen", "데스크탑에 원격으로 액세스하려면 RustDesk에 \"화면 녹화\" 권한을 부여해야 합니다."), - ("Installing ...", "설치 중..."), + ("config_acc", "이 데스크톱을 원격으로 제어하려면 RustDesk에 '손쉬운 사용' 권한을 부여해야 합니다."), + ("config_screen", "이 데스크톱 화면을 원격으로 보려면 RustDesk에 '화면 기록' 권한을 부여해야 합니다."), + ("Installing ...", "설치 중입니다..."), ("Install", "설치하기"), ("Installation", "설치"), ("Installation Path", "설치 경로"), - ("Create start menu shortcuts", "시작 메뉴에 바로가기 만들기"), - ("Create desktop icon", "바탕 화면 아이콘 만들기"), - ("agreement_tip", "설치를 시작하면 라이선스 계약을 수락하는 것입니다."), - ("Accept and Install", "수락하고 설치"), - ("End-user license agreement", "최종 사용자 라이선스 계약"), - ("Generating ...", "생성 중 ..."), - ("Your installation is lower version.", "설치된 버전이 낮습니다."), - ("not_close_tcp_tip", "터널을 사용하는 동안에는 이 창을 닫지 마세요"), - ("Listening ...", "수신 대기 중 ..."), + ("Create start menu shortcuts", "시작 메뉴에 바로가기 생성"), + ("Create desktop icon", "데스크탑 아이콘 생성"), + ("agreement_tip", "설치를 시작하려면 라이선스 계약에 동의해야 합니다."), + ("Accept and Install", "동의하고 설치"), + ("End-user license agreement", "최종 사용자 사용권 계약"), + ("Generating ...", "생성 중..."), + ("Your installation is lower version.", "현재 설치된 버전이 실행 중인 버전보다 낮습니다."), + ("not_close_tcp_tip", "TCP 터널링 연결 중에는 이 창을 닫지 마십시오."), + ("Listening ...", "연결 대기 중..."), ("Remote Host", "원격 호스트"), ("Remote Port", "원격 포트"), - ("Action", "동작"), + ("Action", "액션"), ("Add", "추가"), ("Local Port", "로컬 포트"), ("Local Address", "로컬 주소"), ("Change Local Port", "로컬 포트 변경"), - ("setup_server_tip", "더 빠른 연결을 위해, 자신만의 서버를 설정해 주세요."), - ("Too short, at least 6 characters.", "너무 짧습니다. 최소 6자 이상입니다."), - ("The confirmation is not identical.", "확인이 동일하지 않습니다."), + ("setup_server_tip", "자체 서버를 설정하면 더 빠른 연결 속도를 경험할 수 있습니다."), + ("Too short, at least 6 characters.", "너무 짧습니다. 최소 6자 이상 입력해 주세요."), + ("The confirmation is not identical.", "확인 입력이 일치하지 않습니다."), ("Permissions", "권한"), ("Accept", "수락"), - ("Dismiss", "거부"), - ("Disconnect", "연결 해제"), - ("Enable file copy and paste", "파일 복사 및 붙여넣기 허용"), + ("Dismiss", "무시"), + ("Disconnect", "연결 종료"), + ("Enable file copy and paste", "파일 복사/붙여넣기 허용"), ("Connected", "연결됨"), - ("Direct and encrypted connection", "직접 및 암호화된 연결"), - ("Relayed and encrypted connection", "릴레이 및 암호화된 연결"), - ("Direct and unencrypted connection", "직접 및 암호화되지 않은 연결"), - ("Relayed and unencrypted connection", "릴레이 및 암호화되지 않은 연결"), - ("Enter Remote ID", "원격 ID 입력"), - ("Enter your password", "비밀번호 입력"), + ("Direct and encrypted connection", "직접 연결 (암호화됨)"), + ("Relayed and encrypted connection", "릴레이 연결 (암호화됨)"), + ("Direct and unencrypted connection", "직접 연결 (암호화되지 않음)"), + ("Relayed and unencrypted connection", "릴레이 연결 (암호화되지 않음)"), + ("Enter Remote ID", "원격 ID를 입력하세요"), + ("Enter your password", "비밀번호를 입력하세요"), ("Logging in...", "로그인 중..."), - ("Enable RDP session sharing", "RDP 세션 공유 허용"), + ("Enable RDP session sharing", "RDP 세션 공유 활성화"), ("Auto Login", "자동 로그인"), - ("Enable direct IP access", "직접 IP 액세스 허용"), - ("Rename", "이름 바꾸기"), - ("Space", "공백"), - ("Create desktop shortcut", "바탕 화면 바로가기 만들기"), + ("Enable direct IP access", "직접 IP 접속 활성화"), + ("Rename", "이름 변경"), + ("Space", "공간"), + ("Create desktop shortcut", "데스크탑 바로가기 생성"), ("Change Path", "경로 변경"), - ("Create Folder", "폴더 만들기"), - ("Please enter the folder name", "폴더 이름을 입력해주세요"), + ("Create Folder", "폴더 생성"), + ("Please enter the folder name", "폴더 이름을 입력해 주세요."), ("Fix it", "문제 해결"), ("Warning", "경고"), - ("Login screen using Wayland is not supported", "Wayland를 사용한 로그인 화면은 지원되지 않습니다"), - ("Reboot required", "재부팅이 필요합니다"), - ("Unsupported display server", "지원하지 않는 디스플레이 서버"), - ("x11 expected", "x11 환경이 필요합니다"), + ("Login screen using Wayland is not supported", "Wayland를 사용한 로그인 화면은 지원되지 않습니다."), + ("Reboot required", "재부팅이 필요합니다."), + ("Unsupported display server", "지원하지 않는 디스플레이 서버입니다."), + ("x11 expected", "X11 환경이 필요합니다."), ("Port", "포트"), ("Settings", "설정"), - ("Username", "사용자 이름"), - ("Invalid port", "유효하지 않은 포트입니다"), - ("Closed manually by the peer", "피어가 수동으로 닫았습니다"), - ("Enable remote configuration modification", "원격 구성 수정 허용"), - ("Run without install", "설치 없이 실행"), - ("Connect via relay", "릴레이를 통해 연결"), - ("Always connect via relay", "항상 릴레이를 통해 연결"), - ("whitelist_tip", "화이트리스트에 있는 IP만 나에게 액세스할 수 있음"), + ("Username", "사용자명"), + ("Invalid port", "유효하지 않은 포트입니다."), + ("Closed manually by the peer", "상대방이 수동으로 연결을 종료했습니다."), + ("Enable remote configuration modification", "원격 설정 변경 허용"), + ("Run without install", "설치하지 않고 실행"), + ("Connect via relay", "릴레이 서버를 통해 연결"), + ("Always connect via relay", "항상 릴레이 서버를 통해 연결"), + ("whitelist_tip", "IP 화이트리스트에 등록된 IP 주소만 이 기기에 연결할 수 있습니다."), ("Login", "로그인"), - ("Verify", "확인"), - ("Remember me", "기억하기"), - ("Trust this device", "이 장치를 신뢰"), - ("Verification code", "인증 코드"), - ("verification_tip", "등록한 이메일 주소로 인증 코드가 전송되었으니 인증 코드를 입력하여 로그인을 계속하세요."), + ("Verify", "인증"), + ("Remember me", "로그인 정보 기억"), + ("Trust this device", "이 기기 신뢰"), + ("Verification code", "인증 번호"), + ("verification_tip", "등록된 이메일 주소로 인증 코드를 보냈습니다. 코드를 입력하여 로그인을 완료하세요."), ("Logout", "로그아웃"), ("Tags", "태그"), ("Search ID", "ID 검색"), - ("whitelist_sep", "쉼표, 세미콜론, 공백 또는 새 줄로 구분합니다."), + ("whitelist_sep", "쉼표(,), 세미콜론(;), 공백 또는 줄바꿈으로 구분하여 여러 IP를 입력할 수 있습니다."), ("Add ID", "ID 추가"), ("Add Tag", "태그 추가"), ("Unselect all tags", "모든 태그 선택 해제"), ("Network error", "네트워크 오류"), - ("Username missed", "사용자 이름이 누락되었습니다"), - ("Password missed", "비밀번호가 누락되었습니다"), - ("Wrong credentials", "잘못된 자격 증명"), - ("The verification code is incorrect or has expired", "인증 코드가 올바르지 않거나 만료되었습니다."), - ("Edit Tag", "태그 편집"), - ("Forget Password", "비밀번호 분실"), + ("Username missed", "사용자 이름을 입력해 주세요."), + ("Password missed", "비밀번호를 입력해 주세요."), + ("Wrong credentials", "로그인 정보가 정확하지 않습니다."), + ("The verification code is incorrect or has expired", "인증 코드가 정확하지 않거나 만료되었습니다."), + ("Edit Tag", "태그 수정"), + ("Forget Password", "비밀번호 기억하지 않기"), ("Favorites", "즐겨찾기"), ("Add to Favorites", "즐겨찾기에 추가"), ("Remove from Favorites", "즐겨찾기에서 삭제"), - ("Empty", "비어 있음"), - ("Invalid folder name", "유효하지 않은 폴더 이름"), + ("Empty", "비어있음"), + ("Invalid folder name", "유효하지 않은 폴더명"), ("Socks5 Proxy", "Socks5 프록시"), - ("Socks5/Http(s) Proxy", "Socks5/Http(s) 프록시"), + ("Socks5/Http(s) Proxy", "Socks5/HTTP(S) 프록시 서버"), ("Discovered", "발견됨"), - ("install_daemon_tip", "부팅할 때 시작하려면 시스템 서비스를 설치해야 합니다."), + ("install_daemon_tip", "부팅 시 자동으로 시작하려면 시스템 서비스를 설치해야 합니다."), ("Remote ID", "원격 ID"), ("Paste", "붙여넣기"), - ("Paste here?", "여기에 붙여넣으시겠습니까?"), - ("Are you sure to close the connection?", "연결을 종료하시겠습니까?"), + ("Paste here?", "여기에 붙여넣을까요?"), + ("Are you sure to close the connection?", "연결을 종료할까요?"), ("Download new version", "새 버전 다운로드"), ("Touch mode", "터치 모드"), ("Mouse mode", "마우스 모드"), ("One-Finger Tap", "한 손가락 탭"), ("Left Mouse", "왼쪽 마우스"), - ("One-Long Tap", "한 번 길게 탭"), + ("One-Long Tap", "길게 탭하기"), ("Two-Finger Tap", "두 손가락 탭"), ("Right Mouse", "오른쪽 마우스"), ("One-Finger Move", "한 손가락으로 이동"), - ("Double Tap & Move", "두 번 탭하고 이동"), - ("Mouse Drag", "마우스 끌기"), - ("Three-Finger vertically", "세 손가락으로 수직"), + ("Double Tap & Move", "두 번 탭 후 이동"), + ("Mouse Drag", "마우스 드래그"), + ("Three-Finger vertically", "세 손가락으로 수직 스크롤"), ("Mouse Wheel", "마우스 휠"), ("Two-Finger Move", "두 손가락으로 이동"), ("Canvas Move", "캔버스 이동"), - ("Pinch to Zoom", "찝어서 확대/축소"), - ("Canvas Zoom", "캔버스 확대/축소"), + ("Pinch to Zoom", "손가락으로 확대/축소"), + ("Canvas Zoom", "캔버스 확대"), ("Reset canvas", "캔버스 초기화"), - ("No permission of file transfer", "파일 전송 권한이 없습니다"), - ("Note", "노트"), + ("No permission of file transfer", "파일 전송 권한이 없습니다."), + ("Note", "메모"), ("Connection", "연결"), ("Share screen", "화면 공유"), ("Chat", "채팅"), - ("Total", "전체"), - ("items", "항목"), + ("Total", "총"), + ("items", "개"), ("Selected", "선택됨"), ("Screen Capture", "화면 캡처"), ("Input Control", "입력 제어"), ("Audio Capture", "오디오 캡처"), ("Do you accept?", "수락하시겠습니까?"), ("Open System Setting", "시스템 설정 열기"), - ("How to get Android input permission?", "Android 입력 권한을 얻는 방법은?"), - ("android_input_permission_tip1", "원격 장치에서 마우스나 터치로 Android 장치를 제어하려면 RustDesk가 \"접근성\" 서비스를 사용하도록 허용해야 합니다."), - ("android_input_permission_tip2", "다음 시스템 설정 페이지로 이동하여 [설치된 서비스]를 찾아 들어가서 [RustDesk 입력] 서비스를 켜세요."), - ("android_new_connection_tip", "현재 장치를 제어하려는 새로운 제어 요청이 수신되었습니다."), - ("android_service_will_start_tip", "\"화면 캡처\"를 켜면 자동으로 서비스가 시작되어 다른 장치가 내 장치에 연결을 요청할 수 있습니다."), - ("android_stop_service_tip", "서비스를 닫으면 설정된 모든 연결이 자동으로 닫힙니다."), - ("android_version_audio_tip", "현재 Android 버전은 오디오 캡처를 지원하지 않으므로 Android 10 이상으로 업그레이드하세요."), - ("android_start_service_tip", "[서비스 시작]을 탭하거나 [화면 캡처] 권한을 활성화하여 화면 공유 서비스를 시작합니다."), - ("android_permission_may_not_change_tip", "설정된 연결에 대한 권한은 다시 연결할 때까지 즉시 변경되지 않을 수 있습니다."), + ("How to get Android input permission?", "Android 입력 권한을 얻는 방법"), + ("android_input_permission_tip1", "원격 마우스 또는 터치로 Android 기기를 제어하려면 RustDesk의 '손쉬운 사용' 서비스 사용을 허용해야 합니다."), + ("android_input_permission_tip2", "시스템 설정의 [설치된 서비스]에서 [RustDesk Input] 서비스를 찾아 활성화하세요."), + ("android_new_connection_tip", "새로운 원격 제어 요청이 있습니다."), + ("android_service_will_start_tip", "'화면 공유'를 켜면 서비스가 자동으로 시작되어 다른 기기에서 이 기기로 연결을 요청할 수 있습니다."), + ("android_stop_service_tip", "서비스를 중지하면 현재 활성화된 모든 연결이 끊어집니다."), + ("android_version_audio_tip", "현재 Android 버전은 오디오 공유를 지원하지 않습니다. Android 10 이상으로 업그레이드하세요."), + ("android_start_service_tip", "'서비스 시작'을 탭하거나 '화면 공유' 권한을 켜서 화면 공유 서비스를 시작하세요."), + ("android_permission_may_not_change_tip", "이미 연결된 세션의 권한은 다시 연결하기 전까지 적용되지 않을 수 있습니다."), ("Account", "계정"), ("Overwrite", "덮어쓰기"), - ("This file exists, skip or overwrite this file?", "이 파일이 이미 존재합니다, 건너뛰거나 덮어쓰시겠습니까?"), + ("This file exists, skip or overwrite this file?", "같은 이름의 파일이 이미 존재합니다. 건너뛰거나 덮어쓰시겠습니까?"), ("Quit", "종료"), ("Help", "도움말"), ("Failed", "실패"), ("Succeeded", "성공"), - ("Someone turns on privacy mode, exit", "누군가 개인정보 보호 모드를 켰습니다, 연결을 종료합니다"), + ("Someone turns on privacy mode, exit", "프라이버시 모드가 활성화되어 연결이 종료됩니다."), ("Unsupported", "지원되지 않음"), - ("Peer denied", "연결 거부됨"), - ("Please install plugins", "플러그인을 설치해주세요"), - ("Peer exit", "피어 종료"), + ("Peer denied", "상대방이 연결 요청을 거부했습니다."), + ("Please install plugins", "플러그인을 설치하세요."), + ("Peer exit", "상대방이 연결을 종료했습니다."), ("Failed to turn off", "끄기 실패"), ("Turned off", "꺼짐"), ("Language", "언어"), - ("Keep RustDesk background service", "RustDesk 백그라운드 서비스 유지"), - ("Ignore Battery Optimizations", "배터리 최적화 무시"), - ("android_open_battery_optimizations_tip", "이 기능을 비활성화하려면 다음 RustDesk 응용 프로그램 설정 페이지로 이동하여 [배터리]를 찾아서 입력하고 [제한 없음]을 선택 취소하세요"), - ("Start on boot", "부팅 시 시작"), - ("Start the screen sharing service on boot, requires special permissions", "부팅 시 화면 공유 서비스를 시작하려면 특별 권한이 필요합니다"), - ("Connection not allowed", "연결이 허용되지 않았습니다"), + ("Keep RustDesk background service", "RustDesk 백그라운드 서비스 실행 유지"), + ("Ignore Battery Optimizations", "배터리 최적화에서 제외"), + ("android_open_battery_optimizations_tip", "배터리 최적화 대상에서 제외하려면, RustDesk 앱 설정 페이지로 이동하여 [배터리] 항목에서 [제한 없음]을 선택하세요."), + ("Start on boot", "부팅 시 자동 시작"), + ("Start the screen sharing service on boot, requires special permissions", "부팅 시 화면 공유 서비스를 시작하려면 특별한 권한이 필요합니다."), + ("Connection not allowed", "연결이 허용되지 않았습니다."), ("Legacy mode", "레거시 모드"), ("Map mode", "맵 모드"), ("Translate mode", "번역 모드"), ("Use permanent password", "영구 비밀번호 사용"), - ("Use both passwords", "두 가지 비밀번호 모두 사용"), + ("Use both passwords", "(일회용/영구) 비밀번호 모두 사용"), ("Set permanent password", "영구 비밀번호 설정"), ("Enable remote restart", "원격 재시작 허용"), - ("Restart remote device", "원격 장치 다시 시작"), - ("Are you sure you want to restart", "다시 시작하시겠습니까"), - ("Restarting remote device", "원격 장치를 다시 시작하는 중"), - ("remote_restarting_tip", "원격 장치가 다시 시작되고 있습니다. 이 메시지 상자를 닫고 잠시 후 영구 비밀번호로 다시 연결해 주세요"), - ("Copied", "복사되었습니다"), + ("Restart remote device", "원격 기기 재시작"), + ("Are you sure you want to restart", "정말 재시작하시겠습니까?"), + ("Restarting remote device", "원격 기기를 재시작하는 중입니다."), + ("remote_restarting_tip", "원격 기기를 재시작하는 중입니다. 이 메시지 창을 닫고 잠시 후 영구 비밀번호로 다시 연결하세요."), + ("Copied", "복사되었습니다."), ("Exit Fullscreen", "전체 화면 종료"), ("Fullscreen", "전체 화면"), ("Mobile Actions", "모바일 작업"), ("Select Monitor", "모니터 선택"), ("Control Actions", "제어 작업"), - ("Display Settings", "디스플레이 설정"), + ("Display Settings", "화면 설정"), ("Ratio", "비율"), ("Image Quality", "이미지 품질"), ("Scroll Style", "스크롤 스타일"), @@ -332,25 +334,25 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Relay Connection", "릴레이 연결"), ("Secure Connection", "보안 연결"), ("Insecure Connection", "보안되지 않은 연결"), - ("Scale original", "원본 크기 조정"), - ("Scale adaptive", "크기 조정 가능"), + ("Scale original", "원본 크기로 조정"), + ("Scale adaptive", "창에 맞게 조정"), ("General", "일반"), ("Security", "보안"), ("Theme", "테마"), ("Dark Theme", "어두운 테마"), ("Light Theme", "밝은 테마"), - ("Dark", "어두운"), - ("Light", "밝은"), + ("Dark", "어둡게"), + ("Light", "밝게"), ("Follow System", "시스템 설정 따름"), ("Enable hardware codec", "하드웨어 코덱 활성화"), ("Unlock Security Settings", "보안 설정 잠금 해제"), - ("Enable audio", "오디오 허용"), + ("Enable audio", "오디오 활성화"), ("Unlock Network Settings", "네트워크 설정 잠금 해제"), ("Server", "서버"), - ("Direct IP Access", "직접 IP 연결"), + ("Direct IP Access", "IP 주소로 직접 연결"), ("Proxy", "프록시"), ("Apply", "적용"), - ("Disconnect all devices?", "모든 장치의 연결을 해제하시겠습니까?"), + ("Disconnect all devices?", "모든 기기의 연결을 해제하시겠습니까?"), ("Clear", "지우기"), ("Audio Input Device", "오디오 입력 장치"), ("Use IP Whitelisting", "IP 화이트리스트 사용"), @@ -358,68 +360,68 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Pin Toolbar", "도구 모음 고정"), ("Unpin Toolbar", "도구 모음 고정 해제"), ("Recording", "녹화"), - ("Directory", "디렉터리"), - ("Automatically record incoming sessions", "수신 세션 자동 녹화"), - ("Automatically record outgoing sessions", "발신 세션 자동 녹화"), + ("Directory", "저장 위치"), + ("Automatically record incoming sessions", "수신 세션을 자동으로 녹화"), + ("Automatically record outgoing sessions", "발신 세션을 자동으로 녹화"), ("Change", "변경"), ("Start session recording", "세션 녹화 시작"), ("Stop session recording", "세션 녹화 중지"), - ("Enable recording session", "세션 녹화 허용"), + ("Enable recording session", "세션 녹화 활성화"), ("Enable LAN discovery", "LAN 검색 허용"), ("Deny LAN discovery", "LAN 검색 거부"), - ("Write a message", "메시지 쓰기"), + ("Write a message", "메시지 작성"), ("Prompt", "프롬프트"), - ("Please wait for confirmation of UAC...", "UAC 확인을 기다려주세요..."), - ("elevated_foreground_window_tip", "원격 데스크탑의 현재 창을 작동하려면 더 높은 권한이 필요하므로 일시적으로 마우스와 키보드를 사용할 수 없습니다. 원격 사용자에게 현재 창을 최소화하도록 요청하거나 연결 관리 창에서 권한 상승 버튼을 클릭할 수 있습니다. 이 문제를 방지하려면 원격 장치에 소프트웨어를 설치하는 것이 좋습니다."), + ("Please wait for confirmation of UAC...", "상대방의 UAC(사용자 계정 컨트롤) 확인을 기다리는 중입니다..."), + ("elevated_foreground_window_tip", "원격 데스크톱의 현재 창을 제어하려면 관리자 권한이 필요합니다. 일시적으로 마우스와 키보드를 사용할 수 없다면, 상대방에게 현재 창을 최소화하도록 요청하거나 연결 관리 창에서 '권한 상승'을 클릭하세요. 이 문제를 방지하려면 원격 기기에 RustDesk를 설치하는 것이 좋습니다."), ("Disconnected", "연결 끊김"), ("Other", "기타"), ("Confirm before closing multiple tabs", "여러 탭을 닫기 전에 확인"), ("Keyboard Settings", "키보드 설정"), - ("Full Access", "전체 액세스"), + ("Full Access", "전체 권한"), ("Screen Share", "화면 공유"), - ("ubuntu-21-04-required", "Wayland는 Ubuntu 21.04 이상 버전이 필요합니다."), - ("wayland-requires-higher-linux-version", "Wayland는 상위 버전의 Linux 배포판이 필요합니다. X11 데스크탑을 사용하거나 OS를 변경하세요."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland는 Ubuntu 21.04 이상 버전이 필요합니다."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland는 최신 Linux 배포판이 필요합니다. X11 데스크톱 환경을 사용하거나 OS를 변경해 주세요."), ("JumpLink", "점프 링크"), - ("Please Select the screen to be shared(Operate on the peer side).", "공유할 화면을 선택하세요 (피어 측에서 작동)"), - ("Show RustDesk", "RustDesk 표시"), + ("Please Select the screen to be shared(Operate on the peer side).", "공유할 화면을 선택하세요 (상대방 기기에서 선택)."), + ("Show RustDesk", "RustDesk 창 표시"), ("This PC", "이 PC"), ("or", "또는"), + ("Continue with", "~(으)로 계속"), ("Elevate", "권한 상승"), - ("Zoom cursor", "커서 확대/축소"), - ("Accept sessions via password", "비밀번호를 통해 세션 수락"), - ("Accept sessions via click", "클릭을 통해 세션 수락"), - ("Accept sessions via both", "두 가지 방법을 통해 세션 수락"), - ("Please wait for the remote side to accept your session request...", "원격 측에서 세션 요청을 수락할 때까지 기다려주세요..."), + ("Zoom cursor", "커서 확대"), + ("Accept sessions via password", "비밀번호로 세션 수락"), + ("Accept sessions via click", "클릭으로 세션 수락"), + ("Accept sessions via both", "두 가지 방식 모두 사용"), + ("Please wait for the remote side to accept your session request...", "상대방이 연결 요청을 수락할 때까지 기다려 주세요..."), ("One-time Password", "일회용 비밀번호"), ("Use one-time password", "일회용 비밀번호 사용"), ("One-time password length", "일회용 비밀번호 길이"), - ("Request access to your device", "장치에 대한 액세스 권한을 요청"), + ("Request access to your device", "기기 접근 권한을 요청합니다."), ("Hide connection management window", "연결 관리 창 숨기기"), - ("hide_cm_tip", "비밀번호를 통해 세션을 수락하고 영구 비밀번호를 사용하는 경우에만 숨기기 허용"), - ("wayland_experiment_tip", "Wayland 지원은 실험 단계에 있으며, 무인 접근이 필요한 경우 X11을 사용해 주세요."), - ("Right click to select tabs", "마우스 오른쪽 버튼을 클릭하여 탭 선택"), + ("hide_cm_tip", "연결 관리 창 숨기기 기능은 영구 비밀번호를 사용하는 연결에만 적용됩니다."), + ("wayland_experiment_tip", "Wayland 지원은 실험 단계 기능입니다. 무인 액세스가 필요하면 X11을 사용하세요."), + ("Right click to select tabs", "마우스 오른쪽 버튼으로 탭 선택"), ("Skipped", "건너뜀"), ("Add to address book", "주소록에 추가"), ("Group", "그룹"), ("Search", "검색"), - ("Closed manually by web console", "웹 콘솔에 의해 수동으로 닫힘"), + ("Closed manually by web console", "웹 콘솔에서 수동으로 연결을 종료했습니다."), ("Local keyboard type", "로컬 키보드 유형"), ("Select local keyboard type", "로컬 키보드 유형 선택"), - ("software_render_tip", "Linux에서 Nvidia 그래픽 카드를 사용 중인데 원격 창이 연결 즉시 닫히는 경우 오픈 소스 Nouveau 드라이버로 전환하고 소프트웨어 렌더링을 사용하기로 선택하는 것이 도움이 될 수 있습니다. 소프트웨어를 재시작해야 합니다."), + ("software_render_tip", "Nvidia 그래픽 카드 사용 시 연결 후 원격 창이 바로 닫힌다면, nouveau 드라이버를 설치하고 소프트웨어 렌더링을 사용해 보세요. 변경 사항을 적용하려면 프로그램을 다시 시작해야 합니다."), ("Always use software rendering", "항상 소프트웨어 렌더링 사용"), - ("config_input", "키보드로 원격 데스크탑을 제어하려면 RustDesk에 \"입력 모니터링\" 권한을 부여해야 합니다."), - ("config_microphone", "원격으로 통화하려면 RustDesk에 \"오디오 녹음\" 권한을 부여해야 합니다."), - ("request_elevation_tip", "원격 측에 사람이 있는 경우 권한 상승을 요청할 수도 있습니다."), + ("config_input", "키보드로 원격 데스크톱을 제어하려면 RustDesk에 '입력 모니터링' 권한을 허용해 주세요."), + ("config_microphone", "마이크로 오디오를 전송하려면 RustDesk에 '오디오 녹음' 권한을 허용해 주세요."), + ("request_elevation_tip", "상대방이 관리자 권한 상승을 요청할 수 있습니다."), ("Wait", "대기"), ("Elevation Error", "권한 상승 오류"), ("Ask the remote user for authentication", "원격 사용자에게 인증 요청"), - ("Choose this if the remote account is administrator", "원격 계정이 관리자인 경우 이 옵션을 선택합니다"), - ("Transmit the username and password of administrator", "관리자의 사용자 이름과 비밀번호 전송"), - ("still_click_uac_tip", "여전히 원격 사용자가 RustDesk를 실행하는 UAC 창에서 확인을 클릭해야 합니다."), + ("Choose this if the remote account is administrator", "원격 계정이 관리자 계정인 경우 선택하세요."), + ("Transmit the username and password of administrator", "관리자 계정의 사용자 이름과 비밀번호를 전송합니다."), + ("still_click_uac_tip", "원격 사용자는 RustDesk를 실행하는 UAC(사용자 계정 컨트롤) 창에서 '예'를 클릭해야 합니다."), ("Request Elevation", "권한 상승 요청"), - ("wait_accept_uac_tip", "원격 사용자가 UAC 대화 상자를 수락할 때까지 기다리세요."), - ("Elevate successfully", "권한 상승이 성공하였습니다"), + ("wait_accept_uac_tip", "원격 사용자가 UAC(사용자 계정 컨트롤) 대화 상자를 확인할 때까지 기다려 주세요."), + ("Elevate successfully", "관리자 권한으로 실행되었습니다."), ("uppercase", "대문자"), ("lowercase", "소문자"), ("digit", "숫자"), @@ -428,8 +430,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Weak", "약함"), ("Medium", "보통"), ("Strong", "강력"), - ("Switch Sides", "역할 전환"), - ("Please confirm if you want to share your desktop?", "데스크탑을 공유하시겠습니까?"), + ("Switch Sides", "제어 방향 전환"), + ("Please confirm if you want to share your desktop?", "데스크톱 화면을 공유하시겠습니까?"), ("Display", "디스플레이"), ("Default View Style", "기본 보기 스타일"), ("Default Scroll Style", "기본 스크롤 스타일"), @@ -442,11 +444,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Voice call", "음성 통화"), ("Text chat", "텍스트 채팅"), ("Stop voice call", "음성 통화 종료"), - ("relay_hint_tip", "직접 연결이 불가능할 수 있으며 릴레이를 통해 연결을 시도할 수 있습니다. 또한 첫 번째 시도에서 릴레이를 사용하려면 아이디에 \"/r\" 접미사를 추가하거나 최근 세션 카드에 \"항상 릴레이를 통해 연결\" 옵션이 있는 경우 이 옵션을 선택하면 됩니다."), + ("relay_hint_tip", "직접 연결이 어려울 경우 릴레이 서버를 통해 연결해 보세요. \nID 뒤에 '/r'을 추가하여 바로 릴레이 연결을 사용하거나, 최근 연결 목록의 항목에서 릴레이 연결을 강제할 수 있습니다."), ("Reconnect", "다시 연결"), ("Codec", "코덱"), ("Resolution", "해상도"), - ("No transfers in progress", "진행 중인 전송이 없습니다"), + ("No transfers in progress", "진행 중인 전송이 없습니다."), ("Set one-time password length", "일회용 비밀번호 길이 설정"), ("RDP Settings", "RDP 설정"), ("Sort by", "정렬 기준"), @@ -454,296 +456,252 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Restore", "복원"), ("Minimize", "최소화"), ("Maximize", "최대화"), - ("Your Device", "내 장치"), - ("empty_recent_tip", "어머나, 최근 세션이 없네요!\n새로운 것을 계획할 시간입니다."), - ("empty_favorite_tip", "아직 즐겨찾는 피어가 없나요?\n연결하고 싶은 피어를 찾아 즐겨찾기에 추가해 보세요!"), - ("empty_lan_tip", "오 아니요, 아직 피어를 발견하지 못한 것 같습니다."), - ("empty_address_book_tip", "오, 이게 무슨 일인지 주소록에 현재 나열된 피어가 없는 것 같습니다."), - ("Empty Username", "사용자 이름이 비어있습니다"), - ("Empty Password", "비밀번호가 비어있습니다"), + ("Your Device", "내 기기"), + ("empty_recent_tip", "최근 연결 기록이 없습니다. 새 연결을 시작해 보세요."), + ("empty_favorite_tip", "즐겨찾는 기기가 없습니다. 새 즐겨찾기를 추가해 보세요."), + ("empty_lan_tip", "LAN 내에서 검색된 기기가 없습니다."), + ("empty_address_book_tip", "주소록에 등록된 기기가 없습니다."), + ("eg: admin", "예: 관리자"), + ("Empty Username", "사용자 이름이 비어 있습니다."), + ("Empty Password", "비밀번호가 비어 있습니다."), ("Me", "나"), ("identical_file_tip", "이 파일은 상대방의 파일과 일치합니다."), - ("show_monitors_tip", "도구 모음에 모니터 표시"), + ("show_monitors_tip", "도구 모음에 모니터 목록 표시"), ("View Mode", "보기 모드"), - ("login_linux_tip", "X 데스크탑을 활성화하려면 제어되는 터미널의 Linux 계정에 로그인하세요"), + ("login_linux_tip", "X 데스크톱 세션을 시작하려면 원격 Linux 시스템 계정으로 로그인하세요."), ("verify_rustdesk_password_tip", "RustDesk 비밀번호 확인"), ("remember_account_tip", "이 계정 기억하기"), - ("os_account_desk_tip", "이 계정은 원격 OS에 로그인하고 헤드리스에서 데스크탑 세션을 활성화하는 데 사용됩니다."), + ("os_account_desk_tip", "모니터가 없는(헤드리스) 환경에서 이 계정으로 원격 시스템에 로그인하여 데스크톱 세션을 활성화할 수 있습니다."), ("OS Account", "OS 계정"), - ("another_user_login_title_tip", "다른 사용자가 이미 로그인했습니다"), - ("another_user_login_text_tip", "연결 끊기"), - ("xorg_not_found_title_tip", "Xorg를 찾을 수 없습니다"), - ("xorg_not_found_text_tip", "Xorg를 설치해 주세요"), - ("no_desktop_title_tip", "사용 가능한 데스크탑 환경이 없습니다"), - ("no_desktop_text_tip", "GNOME 데스크탑을 설치해 주세요"), - ("No need to elevate", "권한 상승이 필요없습니다"), - ("System Sound", "시스템 소리"), + ("another_user_login_title_tip", "다른 사용자가 로그인되어 있습니다"), + ("another_user_login_text_tip", "연결 종료"), + ("xorg_not_found_title_tip", "Xorg가 설치되지 않았습니다"), + ("xorg_not_found_text_tip", "Xorg를 설치해 주세요."), + ("no_desktop_title_tip", "데스크톱 환경이 설치되지 않았습니다."), + ("no_desktop_text_tip", "데스크톱 환경을 설치해 주세요."), + ("No need to elevate", "권한 상승이 필요하지 않습니다."), + ("System Sound", "시스템 사운드"), ("Default", "기본"), - ("New RDP", "새 RDP"), + ("New RDP", "새로운 RDP"), ("Fingerprint", "지문"), ("Copy Fingerprint", "지문 복사"), ("no fingerprints", "지문이 없습니다"), - ("Select a peer", "피어 선택"), - ("Select peers", "피어 선택"), + ("Select a peer", "상대방 선택"), + ("Select peers", "상대방 선택 (복수)"), ("Plugins", "플러그인"), - ("Uninstall", "설치 제거"), + ("Uninstall", "제거"), ("Update", "업데이트"), - ("Enable", "허용"), - ("Disable", "사용 안 함"), + ("Enable", "활성화"), + ("Disable", "비활성화"), ("Options", "옵션"), ("resolution_original_tip", "원본 해상도"), ("resolution_fit_local_tip", "로컬 화면에 맞춤"), ("resolution_custom_tip", "사용자 지정 해상도"), ("Collapse toolbar", "도구 모음 접기"), ("Accept and Elevate", "수락 및 권한 상승"), - ("accept_and_elevate_btn_tooltip", "연결을 수락하고 UAC 권한을 높입니다."), - ("clipboard_wait_response_timeout_tip", "복사 응답을 기다리는 동안 시간이 초과되었습니다."), + ("accept_and_elevate_btn_tooltip", "연결 수락 및 UAC 권한 상승"), + ("clipboard_wait_response_timeout_tip", "클립보드 응답 시간이 초과되었습니다."), ("Incoming connection", "수신 연결"), ("Outgoing connection", "발신 연결"), ("Exit", "종료"), ("Open", "열기"), - ("logout_tip", "로그아웃하시겠습니까?"), + ("logout_tip", "정말 로그아웃하시겠습니까?"), ("Service", "서비스"), ("Start", "시작"), ("Stop", "중지"), - ("exceed_max_devices", "관리되는 장치의 최대 수에 도달했습니다."), - ("Sync with recent sessions", "최근 세션과 동기화"), + ("exceed_max_devices", "관리 중인 기기 수가 최대치에 도달했습니다."), + ("Sync with recent sessions", "최근 연결 기록과 동기화"), ("Sort tags", "태그 정렬"), ("Open connection in new tab", "새 탭에서 연결 열기"), - ("Move tab to new window", "새 창으로 탭 이동"), + ("Move tab to new window", "탭을 새 창으로 이동"), ("Can not be empty", "비워둘 수 없습니다"), - ("Already exists", "이미 존재합니다"), + ("Already exists", "이미 존재합니다."), ("Change Password", "비밀번호 변경"), - ("Refresh Password", "비밀번호 새로 고침"), + ("Refresh Password", "비밀번호 새로고침"), ("ID", "ID"), - ("Grid View", "격자 보기"), - ("List View", "목록 보기"), + ("Grid View", "그리드 보기"), + ("List View", "리스트 보기"), ("Select", "선택"), ("Toggle Tags", "태그 전환"), - ("pull_ab_failed_tip", "주소록을 새로 고치지 못했습니다"), - ("push_ab_failed_tip", "주소록을 서버에 동기화하지 못했습니다"), - ("synced_peer_readded_tip", "최근 세션에 있던 장치들이 주소록으로 다시 동기화될 것입니다."), + ("pull_ab_failed_tip", "주소록을 가져오지 못했습니다."), + ("push_ab_failed_tip", "주소록 업로드 실패"), + ("synced_peer_readded_tip", "최근 연결 기록에 있는 기기는 주소록에 다시 동기화됩니다."), ("Change Color", "색상 변경"), ("Primary Color", "기본 색상"), ("HSV Color", "HSV 색상"), - ("Installation Successful!", "설치에 성공했습니다!"), - ("Installation failed!", "설치에 실패했습니다!"), + ("Installation Successful!", "설치가 완료되었습니다."), + ("Installation failed!", "설치에 실패했습니다."), ("Reverse mouse wheel", "마우스 휠 반전"), ("{} sessions", "{} 세션"), - ("scam_title", "사기를 당하고 있을 수 있습니다!"), - ("scam_text1", "알지 못하고 신뢰할 수 없는 사람이 전화를 걸어 RustDesk를 사용하고 서비스를 시작하라고 요청하는 경우 계속 진행하지 말고 즉시 전화를 끊으세요."), - ("scam_text2", "사기꾼이 귀하의 돈이나 기타 개인 정보를 훔치려 할 가능성이 높습니다."), + ("scam_title", "사기 피해에 주의하세요!"), + ("scam_text1", "모르는 사람이 RustDesk 사용을 요청하며 접근하는 경우, 사기일 수 있으니 즉시 연결을 종료하세요."), + ("scam_text2", "금전 또는 개인 정보를 탈취하려는 사기꾼일 가능성이 높습니다."), ("Don't show again", "다시 표시하지 않음"), - ("I Agree", "동의"), + ("I Agree", "동의합니다"), ("Decline", "거절"), - ("Timeout in minutes", "시간 초과 (분)"), - ("auto_disconnect_option_tip", "사용자가 비활성 상태일 때 수신 세션 자동 종료"), - ("Connection failed due to inactivity", "활동이 없어 자동으로 연결이 끊어졌습니다"), + ("Timeout in minutes", "시간 초과(분)"), + ("auto_disconnect_option_tip", "비활성 시 연결 자동 종료"), + ("Connection failed due to inactivity", "장시간 활동이 없어 연결이 자동으로 종료되었습니다"), ("Check for software update on startup", "시작 시 소프트웨어 업데이트 확인"), ("upgrade_rustdesk_server_pro_to_{}_tip", "RustDesk Server Pro를 {} 버전 이상으로 업그레이드하세요!"), - ("pull_group_failed_tip", "그룹 새로 고침에 실패했습니다"), - ("Filter by intersection", "교차해서 필터링"), - ("Remove wallpaper during incoming sessions", "수신 세션 동안 배경화면 제거"), + ("pull_group_failed_tip", "그룹 정보를 가져오지 못했습니다"), + ("Filter by intersection", "교집합으로 필터링"), + ("Remove wallpaper during incoming sessions", "연결 수락 시 배경화면 제거"), ("Test", "테스트"), - ("display_is_plugged_out_msg", "디스플레이가 분리되어 있으면 첫 번째 디스플레이로 전환합니다."), + ("display_is_plugged_out_msg", "디스플레이 연결이 해제되었습니다. 첫 번째 디스플레이로 전환하세요."), ("No displays", "디스플레이 없음"), ("Open in new window", "새 창에서 열기"), ("Show displays as individual windows", "디스플레이를 개별 창으로 표시"), - ("Use all my displays for the remote session", "원격 세션에 내 모든 디스플레이 사용"), - ("selinux_tip", "SELinux가 장치에서 활성화되어 있어 RustDesk가 제어된 상태로 제대로 작동하지 않을 수 있습니다."), + ("Use all my displays for the remote session", "원격 연결에 내 모든 디스플레이 사용"), + ("selinux_tip", "SELinux가 활성화된 경우 RustDesk가 호스트로 제대로 작동하지 않을 수 있습니다."), ("Change view", "보기 변경"), ("Big tiles", "큰 타일"), ("Small tiles", "작은 타일"), - ("List", "목록"), + ("List", "리스트"), ("Virtual display", "가상 디스플레이"), - ("Plug out all", "모든 플러그를 뽑으세요"), + ("Plug out all", "모든 가상 디스플레이 연결 끊기"), ("True color (4:4:4)", "트루컬러 (4:4:4)"), - ("Enable blocking user input", "사용자 입력 차단 허용"), - ("id_input_tip", "ID, 직접 IP 또는 포트가 있는 도메인 (:)을 입력할 수 있습니다.\n다른 서버에 있는 장치에 액세스하려면 서버 주소 (@?key=)를 추가하세요. 예를들어 \n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\n공용 서버의 장치에 액세스하려면 \"@public\"을 입력하세요. 공용 서버에서는 키가 필요하지 않습니다.\n\n첫 번째 연결에서 릴레이 연결을 강제로 사용하려면 ID 끝에 \"/r\"을 추가합니다, 예를들면 \"9123456234/r\"."), + ("Enable blocking user input", "원격 사용자 입력 차단 활성화"), + ("id_input_tip", "ID, IP 주소 또는 도메인과 포트(:)를 입력하세요.\n다른 서버의 기기에 연결하려면 서버 주소(@?key=)를 입력하세요."), ("privacy_mode_impl_mag_tip", "모드 1"), ("privacy_mode_impl_virtual_display_tip", "모드 2"), - ("Enter privacy mode", "개인정보 보호 모드 시작"), - ("Exit privacy mode", "개인정보 보호 모드 종료"), - ("idd_not_support_under_win10_2004_tip", "간접 디스플레이 드라이버는 지원되지 않습니다. Windows 10 버전 2004 이상이 필요합니다."), + ("Enter privacy mode", "프라이버시 모드 시작"), + ("Exit privacy mode", "프라이버시 모드 종료"), + ("idd_not_support_under_win10_2004_tip", "간접 디스플레이 드라이버(IDD)는 Windows 10 버전 2004 이상에서 지원됩니다."), ("input_source_1_tip", "입력 소스 1"), ("input_source_2_tip", "입력 소스 2"), ("Swap control-command key", "Control 및 Command 키 교체"), - ("swap-left-right-mouse", "마우스 왼쪽 버튼과 오른쪽 버튼 교체"), - ("2FA code", "이중 인증 코드"), - ("More", "더 많은"), - ("enable-2fa-title", "이중 인증 허용"), - ("enable-2fa-desc", "지금 인증앱을 설정해 주세요. 휴대폰이나 데스크탑에서 Authy, Microsoft 또는 Google 인증기와 같은 인증기 앱을 사용할 수 있습니다.\n\n앱으로 QR 코드를 스캔하고 앱에 표시된 코드를 입력하면 이중 인증이 가능합니다."), - ("wrong-2fa-code", "코드를 확인할 수 없습니다. 코드와 현지 시간 설정이 올바른지 확인합니다"), - ("enter-2fa-title", "이중 인증"), + ("swap-left-right-mouse", "마우스 왼쪽 버튼과 오른쪽 버튼 바꾸기"), + ("2FA code", "2단계 인증 코드"), + ("More", "더보기"), + ("enable-2fa-title", "2단계 인증 활성화"), + ("enable-2fa-desc", "지금 인증 앱을 설정하십시오. Authy, Microsoft/Google Authenticator와 같은 모바일 또는 데스크톱 인증 앱을 사용할 수 있습니다. QR 코드를 스캔한 후, 인증 앱에 표시된 코드를 입력하면 2단계 인증이 활성화됩니다."), + ("wrong-2fa-code", "코드를 확인할 수 없습니다. 인증 코드와 기기 시간이 정확한지 확인해 주십시오."), + ("enter-2fa-title", "2단계 인증"), ("Email verification code must be 6 characters.", "이메일 인증 코드는 6자여야 합니다."), - ("2FA code must be 6 digits.", "이중 인증 코드는 6자리여야 합니다."), - ("Multiple Windows sessions found", "여러 Windows 세션이 발견되었습니다"), - ("Please select the session you want to connect to", "연결할 세션을 선택해 주세요"), + ("2FA code must be 6 digits.", "2단계 인증 코드는 6자리여야 합니다."), + ("Multiple Windows sessions found", "여러 Windows 세션이 발견되었습니다."), + ("Please select the session you want to connect to", "연결하려는 세션을 선택해 주십시오."), ("powered_by_me", "RustDesk 제공"), - ("outgoing_only_desk_tip", "이것은 맞춤형 에디션입니다.\n다른 장치에 연결할 수는 있지만 귀하의 기기에 연결할 수 없습니다."), - ("preset_password_warning", "이 맞춤형 에디션에는 미리 설정된 비밀번호가 함께 제공됩니다. 이 비밀번호를 아는 사람이라면 누구나 기기를 완전히 제어할 수 있습니다. 예상치 못한 경우 즉시 소프트웨어를 제거하세요."), + ("outgoing_only_desk_tip", "이 버전은 발신 연결 전용입니다.\n다른 기기에 연결할 수는 있지만, 다른 기기에서 이 기기로 연결할 수는 없습니다."), + ("preset_password_warning", "이 맞춤형 버전에는 미리 설정된 비밀번호가 포함되어 있습니다. 이 비밀번호를 아는 사람은 누구나 기기를 완전히 제어할 수 있으니, 의도치 않은 경우 즉시 이 소프트웨어를 삭제하십시오."), ("Security Alert", "보안 경고"), ("My address book", "내 주소록"), ("Personal", "개인"), ("Owner", "소유자"), ("Set shared password", "공유 비밀번호 설정"), - ("Exist in", "다음 위치 존재"), + ("Exist in", "다음 위치에 존재:"), ("Read-only", "읽기 전용"), ("Read/Write", "읽기/쓰기"), ("Full Control", "전체 제어"), - ("share_warning_tip", "위의 필드는 공유되고 다른 사람들에게 보입니다."), + ("share_warning_tip", "위에 선택한 항목은 다른 사용자와 공유되어 접근할 수 있습니다."), ("Everyone", "모두"), - ("ab_web_console_tip", "웹 콘솔에 대해 더 알아보기"), - ("allow-only-conn-window-open-tip", "RustDesk 창이 열려 있을 때만 연결 허용"), - ("no_need_privacy_mode_no_physical_displays_tip", "실제 디스플레이가 없으므로 개인 정보 보호 모드를 사용할 필요가 없습니다."), + ("ab_web_console_tip", "웹 콘솔 자세히 알아보기"), + ("allow-only-conn-window-open-tip", "RustDesk 창이 열려 있는 경우에만 연결 허용"), + ("no_need_privacy_mode_no_physical_displays_tip", "물리적 디스플레이가 없는 경우 프라이버시 모드를 사용할 필요가 없습니다."), ("Follow remote cursor", "원격 커서 따라가기"), - ("Follow remote window focus", "원격 창 초점 따라가기"), - ("default_proxy_tip", "기본 프로토콜 및 포트는 Socks5 및 1080입니다"), + ("Follow remote window focus", "원격 창 포커스 따라가기"), + ("default_proxy_tip", "기본 프로토콜과 포트는 Socks5와 1080입니다."), ("no_audio_input_device_tip", "오디오 입력 장치를 찾을 수 없습니다."), - ("Incoming", "수신"), - ("Outgoing", "발신"), - ("Clear Wayland screen selection", "Wayland 화면 선택 지우기"), - ("clear_Wayland_screen_selection_tip", "화면 선택을 지운 후, 공유할 화면을 다시 선택할 수 있습니다."), + ("Incoming", "수신 중"), + ("Outgoing", "발신 중"), + ("Clear Wayland screen selection", "Wayland 화면 선택 취소"), + ("clear_Wayland_screen_selection_tip", "화면 선택을 취소하고 공유할 화면을 다시 선택할 수 있습니다."), ("confirm_clear_Wayland_screen_selection_tip", "Wayland 화면 선택을 정말 취소하시겠습니까?"), - ("android_new_voice_call_tip", "새 음성 통화 요청이 수신되었습니다. 수락하면 오디오가 음성 통신으로 전환됩니다."), - ("texture_render_tip", "텍스처 렌더링을 사용하여 사진을 더 부드럽게 만듭니다. 렌더링 문제가 발생하면 이 옵션을 비활성화할 수 있습니다."), + ("android_new_voice_call_tip", "새 음성 통화 요청이 있습니다. 수락하면 오디오가 음성 통화로 전환됩니다."), + ("texture_render_tip", "텍스처 렌더링은 이미지 품질을 향상시킵니다. 렌더링 문제가 발생하면 이 옵션을 비활성화하십시오."), ("Use texture rendering", "텍스처 렌더링 사용"), ("Floating window", "플로팅 창"), - ("floating_window_tip", "RustDesk 백그라운드 서비스를 유지하는 데 도움이 됩니다"), + ("floating_window_tip", "RustDesk 백그라운드 서비스 유지를 권장합니다."), ("Keep screen on", "화면 켜짐 유지"), ("Never", "없음"), - ("During controlled", "제어되는 동안"), - ("During service is on", "서비스 중"), - ("Capture screen using DirectX", "DirectX를 사용하여 화면 캡처"), + ("During controlled", "원격 제어 중"), + ("During service is on", "서비스 실행 중"), + ("Capture screen using DirectX", "DirectX로 화면 캡처"), ("Back", "뒤로"), ("Apps", "앱"), ("Volume up", "볼륨 높이기"), ("Volume down", "볼륨 낮추기"), ("Power", "전원"), - ("Telegram bot", "Telegram 봇"), - ("enable-bot-tip", "이 기능을 활성화하면 봇에서 이중 인증 코드를 받을 수 있습니다. 또한 연결 알림 기능도 할 수 있습니다."), - ("enable-bot-desc", "1. @BotFather와 채팅을 시작합니다.\n2. \"/newbot\" 명령을 보내주세요. 이 단계를 완료하면 토큰을 받게 됩니다.\n3. 새로 만든 봇과 채팅을 시작합니다. \"/hello\"와 같이 앞에 슬래시 (\"/\")로 시작하는 메시지를 보내 활성화합니다."), - ("cancel-2fa-confirm-tip", "이중 인증을 취소하시겠습니까?"), - ("cancel-bot-confirm-tip", "Telegram 봇을 취소하시겠습니까?"), + ("Telegram bot", "텔레그램 봇"), + ("enable-bot-tip", "이 기능을 활성화하면 텔레그램 봇으로 2단계 인증 코드를 받고 연결 알림도 받을 수 있습니다."), + ("enable-bot-desc", "1. @BotFather와 대화를 시작하십시오.\n2. '/newbot' 명령을 보내 토큰을 받으십시오.\n3. 새로 만든 봇과 대화를 시작하고 '/hello' 같은 명령을 보내 봇을 활성화하십시오."), + ("cancel-2fa-confirm-tip", "2단계 인증을 정말 취소하시겠습니까?"), + ("cancel-bot-confirm-tip", "텔레그램 봇을 정말 삭제하시겠습니까?"), ("About RustDesk", "RustDesk 정보"), - ("Send clipboard keystrokes", "클립보드 키 입력 보내기"), - ("network_error_tip", "네트워크 연결을 확인한 다음 재시도를 클릭하세요."), + ("Send clipboard keystrokes", "클립보드 키 입력 전송"), + ("network_error_tip", "네트워크 연결을 확인한 후 다시 시도하십시오."), ("Unlock with PIN", "PIN으로 잠금 해제"), - ("Requires at least {} characters", "최소 {}자 이상 필요합니다."), + ("Requires at least {} characters", "최소 {}자 이상 입력해야 합니다."), ("Wrong PIN", "잘못된 PIN"), ("Set PIN", "PIN 설정"), - ("Enable trusted devices", "신뢰할 수 있는 장치 허용"), - ("Manage trusted devices", "신뢰할 수 있는 장치 관리"), + ("Enable trusted devices", "신뢰하는 기기 활성화"), + ("Manage trusted devices", "신뢰하는 기기 관리"), ("Platform", "플랫폼"), - ("Days remaining", "일 남음"), - ("enable-trusted-devices-tip", "신뢰할 수 있는 장치에서 이중 인증 건너뛰기"), - ("Parent directory", "상위 디렉터리"), + ("Days remaining", "남은 일수"), + ("enable-trusted-devices-tip", "신뢰하는 기기에서 2단계 인증 건너뛰기"), + ("Parent directory", "상위 디렉토리"), ("Resume", "재개"), ("Invalid file name", "잘못된 파일 이름"), - ("one-way-file-transfer-tip", "제어되는 측에서는 단방향 파일 전송이 가능합니다."), - ("Authentication Required", "인증 필요"), + ("one-way-file-transfer-tip", "단방향 파일 전송은 원격 제어 대상 기기에서 활성화해야 합니다."), + ("Authentication Required", "인증이 필요합니다."), ("Authenticate", "인증"), - ("web_id_input_tip", "동일한 서버에 ID를 입력할 수 있으며, 웹 클라이언트에서는 다이렉트 IP 액세스가 지원되지 않습니다.\n다른 서버에 있는 장치에 액세스하려면 서버 주소 (@?key=)를 추가해 주세요. 예를 들어 \n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\n공용 서버에서 장치에 액세스하려면 \"@public\"을 입력해 주세요. 공용 서버에는 키가 필요하지 않습니다."), + ("web_id_input_tip", "동일 서버 내 ID를 입력하십시오. 웹 클라이언트는 IP 직접 연결을 지원하지 않습니다.\n다른 서버의 기기에 연결하려면 서버 주소(@?key=)를 입력하십시오. 예:\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=\n공용 서버 기기에 연결하려면 '@public'을 입력하십시오. (공용 서버는 키가 필요 없습니다.)"), ("Download", "다운로드"), ("Upload folder", "폴더 업로드"), ("Upload files", "파일 업로드"), - ("Clipboard is synchronized", "클립보드가 동기화되었습니다"), + ("Clipboard is synchronized", "클립보드가 동기화되었습니다."), ("Update client clipboard", "클라이언트 클립보드 업데이트"), ("Untagged", "태그 없음"), - ("new-version-of-{}-tip", "{}의 새 버전을 사용할 수 있습니다"), - ("Accessible devices", "액세스 가능한 장치"), - ("upgrade_remote_rustdesk_client_to_{}_tip", "RustDesk 클라이언트를 원격 버전 {} 이상으로 업그레이드해 주세요!"), - ("d3d_render_tip", "D3D 렌더링이 활성화되면 일부 기기에서는 원격 화면이 검은색으로 표시될 수 있습니다."), - ("Use D3D rendering", "D3D 렌더링 사용"), + ("new-version-of-{}-tip", "{}의 새 버전이 출시되었습니다."), + ("Accessible devices", "연결 가능한 기기"), + ("upgrade_remote_rustdesk_client_to_{}_tip", "원격 기기의 RustDesk 클라이언트를 {} 버전 이상으로 업그레이드하십시오!"), + ("d3d_render_tip", "D3D 렌더링을 활성화하면 일부 기기에서 원격 화면이 표시되지 않을 수 있습니다."), + ("Use D3D rendering", "D3D 렌더링 활성화"), ("Printer", "프린터"), - ("printer-os-requirement-tip", "프린터 출력 기능은 Windows 10 이상이 필요합니다."), - ("printer-requires-installed-{}-client-tip", "원격 인쇄 기능을 사용하려면 이 장치에 {}를 설치해야 합니다."), + ("printer-os-requirement-tip", "프린터 출력 기능은 Windows 10 이상에서 지원됩니다."), + ("printer-requires-installed-{}-client-tip", "원격 인쇄 기능을 사용하려면 이 기기에 {}를 설치해야 합니다."), ("printer-{}-not-installed-tip", "{} 프린터가 설치되지 않았습니다."), - ("printer-{}-ready-tip", "{} 프린터가 설치되어 사용할 준비가 되었습니다."), + ("printer-{}-ready-tip", "{} 프린터가 설치되었습니다. 인쇄 기능을 사용할 수 있습니다."), ("Install {} Printer", "{} 프린터 설치"), - ("Outgoing Print Jobs", "발신 인쇄 작업"), - ("Incoming Print Jobs", "수신 인쇄 작업"), - ("Incoming Print Job", "수신 인쇄 작업"), + ("Outgoing Print Jobs", "보낸 인쇄 작업"), + ("Incoming Print Jobs", "받은 인쇄 작업"), + ("Incoming Print Job", "받은 인쇄 작업"), ("use-the-default-printer-tip", "기본 프린터 사용"), ("use-the-selected-printer-tip", "선택한 프린터 사용"), - ("auto-print-tip", "선택한 프린터를 사용하여 자동으로 인쇄합니다."), - ("print-incoming-job-confirm-tip", "원격에서 인쇄 작업을 받았습니다. 옆에서 실행하시겠습니까?"), - ("remote-printing-disallowed-tile-tip", "원격 인쇄 허용 안 함"), - ("remote-printing-disallowed-text-tip", "제어측의 권한 설정에서 원격 인쇄를 거부합니다."), + ("auto-print-tip", "선택한 프린터로 자동 인쇄"), + ("print-incoming-job-confirm-tip", "원격 인쇄 작업을 받았습니다. 인쇄하시겠습니까?"), + ("remote-printing-disallowed-tile-tip", "원격 인쇄 비허용"), + ("remote-printing-disallowed-text-tip", "원격 제어 대상 기기의 권한 설정에서 원격 인쇄가 거부되었습니다."), ("save-settings-tip", "설정 저장"), ("dont-show-again-tip", "다시 표시하지 않음"), - ("Take screenshot", "스크린샷 찍기"), - ("Taking screenshot", "스크린샷 찍는 중"), - ("screenshot-merged-screen-not-supported-tip", "현재 다중 디스플레이의 스크린샷 병합이 지원되지 않습니다. 단일 디스플레이로 전환한 후 다시 시도해 주세요."), - ("screenshot-action-tip", "스크린샷을 계속 진행할 방법을 선택해 주세요."), + ("Take screenshot", "스크린샷 캡처"), + ("Taking screenshot", "스크린샷 저장 중"), + ("screenshot-merged-screen-not-supported-tip", "다중 디스플레이 화면 병합 스크린샷은 현재 지원되지 않습니다. 단일 디스플레이로 전환한 후 다시 시도하십시오."), + ("screenshot-action-tip", "스크린샷 저장 방식을 선택하십시오."), ("Save as", "다른 이름으로 저장"), ("Copy to clipboard", "클립보드에 복사"), - ("Enable remote printer", "원격 프린터 허용"), + ("Enable remote printer", "원격 프린터 활성화"), ("Downloading {}", "{} 다운로드 중"), ("{} Update", "{} 업데이트"), - ("{}-to-update-tip", "{}가 지금 닫히고 새 버전을 설치합니다."), - ("download-new-version-failed-tip", "다운로드에 실패했습니다. 다시 시도하거나 \"다운로드\" 버튼을 클릭하여 릴리스 페이지에서 다운로드하고 수동으로 업그레이드할 수 있습니다."), + ("{}-to-update-tip", ""), + ("download-new-version-failed-tip", "다운로드에 실패했습니다. 다시 시도하거나 '다운로드' 버튼을 클릭하여 릴리스 페이지에서 직접 다운로드한 후 수동으로 업그레이드하십시오."), ("Auto update", "자동 업데이트"), - ("update-failed-check-msi-tip", "설치 방법 확인에 실패했습니다. \"다운로드\" 버튼을 클릭하여 릴리스 페이지에서 다운로드하고 수동으로 업그레이드하세요."), - ("websocket_tip", "WebSocket을 사용할 때는 릴레이 연결만 지원됩니다."), + ("update-failed-check-msi-tip", "설치 방법을 확인할 수 없습니다. '다운로드' 버튼을 클릭하여 릴리스 페이지에서 직접 다운로드한 후 수동으로 업그레이드하십시오."), + ("websocket_tip", "WebSocket 사용 시 릴레이 연결만 지원됩니다."), ("Use WebSocket", "웹소켓 사용"), ("Trackpad speed", "트랙패드 속도"), ("Default trackpad speed", "기본 트랙패드 속도"), - ("Numeric one-time password", "숫자 일회용 비밀번호"), - ("Enable IPv6 P2P connection", "IPv6 P2P 연결 사용"), - ("Enable UDP hole punching", "UDP 홀 펀칭 사용"), + ("Numeric one-time password", "일회용 비밀번호"), + ("Enable IPv6 P2P connection", ""), + ("Enable UDP hole punching", ""), ("View camera", "카메라 보기"), - ("Enable camera", "카메라 허용"), + ("Enable camera", "카메라 보기 허용"), ("No cameras", "카메라 없음"), - ("view_camera_unsupported_tip", "원격 장치가 카메라 보기를 지원하지 않습니다."), - ("Terminal", "터미널"), - ("Enable terminal", "터미널 허용"), - ("New tab", "새 탭"), - ("Keep terminal sessions on disconnect", "연결이 끊어져도 터미널 세션 유지"), - ("Terminal (Run as administrator)", "터미널 (관리자 권한으로 실행)"), - ("terminal-admin-login-tip", "제어되는 측의 관리자 사용자 이름과 비밀번호를 입력하세요."), - ("Failed to get user token.", "사용자 토큰을 가져오는 데 실패했습니다."), - ("Incorrect username or password.", "사용자 이름이나 비밀번호가 올바르지 않습니다."), - ("The user is not an administrator.", "사용자가 관리자가 아닙니다."), - ("Failed to check if the user is an administrator.", "사용자가 관리자인지 확인하는 데 실패했습니다."), - ("Supported only in the installed version.", "설치된 버전에서만 지원됩니다."), - ("elevation_username_tip", "사용자 이름 또는 도메인\\사용자 이름 입력"), - ("Preparing for installation ...", "설치 준비 중 ..."), - ("Show my cursor", "내 커서 표시"), - ("Scale custom", "사용자 지정 크기 조정"), - ("Custom scale slider", "사용자 지정 크기 조정 슬라이더"), - ("Decrease", "축소"), - ("Increase", "확대"), - ("Show virtual mouse", "가상 마우스 표시"), - ("Virtual mouse size", "가상 마우스 크기"), - ("Small", "작게"), - ("Large", "크게"), - ("Show virtual joystick", "가상 조이스틱 표시"), - ("Edit note", "노트 편집"), - ("Alias", "별명"), - ("ScrollEdge", "가장자리 스크롤"), - ("Allow insecure TLS fallback", "보안되지 않은 TLS 폴백 허용"), - ("allow-insecure-tls-fallback-tip", "기본적으로 RustDesk는 TLS를 사용하여 프로토콜에 대한 서버 인증서를 검증합니다.\n이 옵션을 활성화하면 RustDesk는 인증 단계를 건너뛰고 인증 실패 시 진행합니다."), - ("Disable UDP", "UDP 사용 안 함"), - ("disable-udp-tip", "TCP만 사용할지 여부를 제어합니다.\n이 옵션을 활성화하면 RustDesk는 더 이상 UDP 2116을 사용하지 않고 대신 TCP 2116을 사용합니다."), - ("server-oss-not-support-tip", "참고: RustDesk 서버 OSS에는 이 기능이 포함되어 있지 않습니다."), - ("input note here", "여기에 노트 입력"), - ("note-at-conn-end-tip", "연결이 끝날 때 메모 요청"), - ("Show terminal extra keys", "터미널 추가 키 표시"), - ("Relative mouse mode", "상대 마우스 모드"), - ("rel-mouse-not-supported-peer-tip", "연결된 피어에서 상대 마우스 모드를 지원하지 않습니다."), - ("rel-mouse-not-ready-tip", "상대 마우스 모드가 아직 준비되지 않았습니다. 다시 시도해 주세요."), - ("rel-mouse-lock-failed-tip", "커서 잠금에 실패했습니다. 상대 마우스 모드가 비활성화되었습니다"), - ("rel-mouse-exit-{}-tip", "종료하려면 {}을(를) 누르세요."), - ("rel-mouse-permission-lost-tip", "키보드 권한이 취소되었습니다. 상대 마우스 모드가 비활성화되었습니다."), - ("Changelog", "변경 기록"), - ("keep-awake-during-outgoing-sessions-label", "발신 세션 중 화면 켜짐 유지"), - ("keep-awake-during-incoming-sessions-label", "수신 세션 중 화면 켜짐 유지"), - ("Continue with {}", "{}(으)로 계속"), - ("Display Name", "표시 이름"), - ("password-hidden-tip", "영구 비밀번호가 설정되었습니다 (숨김)."), - ("preset-password-in-use-tip", "현재 사전 설정된 비밀번호가 사용 중입니다."), - ("Enable privacy mode", "개인정보 보호 모드 사용함"), - ("allow-remote-toolbar-docking-any-edge", ""), + ("view_camera_unsupported_tip", "원격 기기에서 카메라 보기를 지원하지 않습니다."), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/kz.rs b/src/lang/kz.rs index 4476fadc7..b02bd1c0d 100644 --- a/src/lang/kz.rs +++ b/src/lang/kz.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "OS Құпия сөзі"), ("install_tip", "UAC кесірінен, RustDesk кейбірде қашықтағы жақ ретінде дұрыс жұмыс істей алмайды. UAC'пен қиындықты болдырмау үшін, төмендегі батырманы басып RustDesk'ті жүйеге орнатыңыз."), ("Click to upgrade", "Жаңғырту үшін басыңыз"), + ("Click to download", "Жүктеу үшін басыңыз"), + ("Click to update", "Жаңарту үшін басыңыз"), ("Configure", "Қалыптау"), ("config_acc", "Сіздің Жұмыс үстеліңізді қашықтан басқару үшін, RustDesk'ке \"Қолжетімділік\" рұқсаттарын беруіңіз керек."), ("config_screen", "Сіздің Жұмыс үстеліңізге қашықтан қол жеткізу үшін, RustDesk'ке \"Екіренді Жазу\" рұқсаттарын беруіңіз керек."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", ""), ("Full Access", ""), ("Screen Share", ""), - ("ubuntu-21-04-required", "Wayland Ubuntu 21.04 немесе одан жоғары нұсқасын қажет етеді."), - ("wayland-requires-higher-linux-version", "Wayland linux дистрибутивінің жоғарырақ нұсқасын қажет етеді. X11 жұмыс үстелін қолданып көріңіз немесе операциялық жүйеңізді өзгертіңіз."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland Ubuntu 21.04 немесе одан жоғары нұсқасын қажет етеді."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland linux дистрибутивінің жоғарырақ нұсқасын қажет етеді. X11 жұмыс үстелін қолданып көріңіз немесе операциялық жүйеңізді өзгертіңіз."), ("JumpLink", "View"), ("Please Select the screen to be shared(Operate on the peer side).", "Бөлісетін экранды таңдаңыз (бірдей жағынан жұмыс жасаңыз)."), ("Show RustDesk", ""), ("This PC", ""), ("or", ""), + ("Continue with", ""), ("Elevate", ""), ("Zoom cursor", ""), ("Accept sessions via password", ""), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", ""), ("empty_lan_tip", ""), ("empty_address_book_tip", ""), + ("eg: admin", ""), ("Empty Username", ""), ("Empty Password", ""), ("Me", ""), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", ""), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/lt.rs b/src/lang/lt.rs index 47ace51ae..598a54efd 100644 --- a/src/lang/lt.rs +++ b/src/lang/lt.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "OS slaptažodis"), ("install_tip", "Kai kuriais atvejais UAC gali priversti RustDesk netinkamai veikti nuotoliniame pagrindiniame kompiuteryje. Norėdami apeiti UAC, spustelėkite toliau esantį mygtuką, kad įdiegtumėte RustDesk į savo kompiuterį."), ("Click to upgrade", "Spustelėkite, jei norite atnaujinti"), + ("Click to download", "Spustelėkite norėdami atsisiųsti"), + ("Click to update", "Spustelėkite norėdami atnaujinti"), ("Configure", "Konfigūruoti"), ("config_acc", "Norėdami nuotoliniu būdu valdyti darbalaukį, turite suteikti RustDesk \"prieigos\" leidimus"), ("config_screen", "Norėdami nuotoliniu būdu pasiekti darbalaukį, turite suteikti RustDesk leidimus \"ekrano kopija\""), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Klaviatūros nustatymai"), ("Full Access", "Pilna prieiga"), ("Screen Share", "Ekrano bendrinimas"), - ("ubuntu-21-04-required", "Wayland reikalauja Ubuntu 21.04 arba naujesnės versijos."), - ("wayland-requires-higher-linux-version", "Wayland reikalinga naujesnės Linux Distro versijos. Išbandykite X11 darbalaukį arba pakeiskite OS."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland reikalauja Ubuntu 21.04 arba naujesnės versijos."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland reikalinga naujesnės Linux Distro versijos. Išbandykite X11 darbalaukį arba pakeiskite OS."), ("JumpLink", "Peržiūra"), ("Please Select the screen to be shared(Operate on the peer side).", "Prašome pasirinkti ekraną, kurį norite bendrinti (veikiantį kitoje pusėje)."), ("Show RustDesk", "Rodyti RustDesk"), ("This PC", "Šis kompiuteris"), ("or", "arba"), + ("Continue with", "Tęsti su"), ("Elevate", "Pakelti"), ("Zoom cursor", "Mastelio keitimo žymeklis"), ("Accept sessions via password", "Priimti seansus naudojant slaptažodį"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Dar neturite parankinių nuotolinių seansų."), ("empty_lan_tip", "Nuotolinių mazgų nerasta."), ("empty_address_book_tip", "Adresų knygelėje nėra nuotolinių kompiuterių."), + ("eg: admin", "pvz.: administratorius"), ("Empty Username", "Tuščias naudotojo vardas"), ("Empty Password", "Tuščias slaptažodis"), ("Me", "Aš"), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Tęsti su {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/lv.rs b/src/lang/lv.rs index 4f8e1f59f..327a45317 100644 --- a/src/lang/lv.rs +++ b/src/lang/lv.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "OS parole"), ("install_tip", "UAC dēļ RustDesk dažos gadījumos nevar pareizi darboties kā attālā puse. Lai izvairītos no UAC, lūdzu, noklikšķiniet uz tālāk esošās pogas, lai instalētu RustDesk sistēmā."), ("Click to upgrade", "Jaunināt"), + ("Click to download", "Lejupielādēt"), + ("Click to update", "Atjaunināt"), ("Configure", "Konfigurēt"), ("config_acc", "Lai attālināti vadītu savu darbvirsmu, jums ir jāpiešķir RustDesk \"Pieejamība\" atļaujas."), ("config_screen", "Lai attālināti piekļūtu darbvirsmai, jums ir jāpiešķir RustDesk \"Ekrāna tveršana\" atļaujas."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Tastatūras iestatījumi"), ("Full Access", "Pilna piekļuve"), ("Screen Share", "Ekrāna kopīgošana"), - ("ubuntu-21-04-required", "Wayland nepieciešama Ubuntu 21.04 vai jaunāka versija."), - ("wayland-requires-higher-linux-version", "Wayland nepieciešama augstāka Linux distro versija. Lūdzu, izmēģiniet X11 desktop vai mainiet savu OS."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland nepieciešama Ubuntu 21.04 vai jaunāka versija."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland nepieciešama augstāka Linux distro versija. Lūdzu, izmēģiniet X11 desktop vai mainiet savu OS."), ("JumpLink", "Skatīt"), ("Please Select the screen to be shared(Operate on the peer side).", "Lūdzu, atlasiet kopīgojamo ekrānu (darbojieties sesijas pusē)."), ("Show RustDesk", "Rādīt RustDesk"), ("This PC", "Šis dators"), ("or", "vai"), + ("Continue with", "Turpināt ar"), ("Elevate", "Pacelt"), ("Zoom cursor", "Tālummaiņas kursors"), ("Accept sessions via password", "Pieņemt sesijas, izmantojot paroli"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Vēl nav iecienītākās sesijas?\nAtradīsim kādu, ar ko sazināties, un pievienosim to jūsu izlasei!"), ("empty_lan_tip", "Ak nē! Šķiet, ka mēs vēl neesam atklājuši nevienu sesiju."), ("empty_address_book_tip", "Ak vai, izskatās, ka jūsu adrešu grāmatā šobrīd nav neviena sesija."), + ("eg: admin", "piemēram: admin"), ("Empty Username", "Tukšs lietotājvārds"), ("Empty Password", "Tukša parole"), ("Me", "Es"), @@ -690,60 +693,15 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Trackpad speed", "Skārienpaliktņa ātrums"), ("Default trackpad speed", "Noklusējuma skārienpaliktņa ātrums"), ("Numeric one-time password", "Vienreiz lietojama ciparu parole"), - ("Enable IPv6 P2P connection", "Iespējot IPv6 P2P savienojumu"), - ("Enable UDP hole punching", "Iespējot UDP caurumu veidošanu"), + ("Enable IPv6 P2P connection", ""), + ("Enable UDP hole punching", ""), ("View camera", "Skatīt kameru"), ("Enable camera", "Iespējot kameru"), ("No cameras", "Nav kameru"), ("view_camera_unsupported_tip", "Attālā ierīce neatbalsta kameras skatīšanos."), - ("Terminal", "Terminālis"), - ("Enable terminal", "Iespējot termināli"), - ("New tab", "Jauna cilne"), - ("Keep terminal sessions on disconnect", "Atvienojoties saglabāt termināļa sesijas"), - ("Terminal (Run as administrator)", "Terminālis (Palaist kā administratoram)"), - ("terminal-admin-login-tip", "Lūdzu, ievadiet kontrolētās puses administratora lietotājvārdu un paroli."), - ("Failed to get user token.", "Neizdevās iegūt lietotāja atļauju."), - ("Incorrect username or password.", "Nepareizs lietotājvārds vai parole."), - ("The user is not an administrator.", "Lietotājs nav administrators."), - ("Failed to check if the user is an administrator.", "Neizdevās pārbaudīt, vai lietotājs ir administrators."), - ("Supported only in the installed version.", "Atbalstīts tikai instalētajā versijā."), - ("elevation_username_tip", "Ievadiet lietotājvārdu vai domēnu\\lietotājvārdu"), - ("Preparing for installation ...", "Gatavošanās instalēšanai..."), - ("Show my cursor", "Rādīt manu kursoru"), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Turpināt ar {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ml.rs b/src/lang/ml.rs deleted file mode 100644 index 4dcfe9e74..000000000 --- a/src/lang/ml.rs +++ /dev/null @@ -1,749 +0,0 @@ -lazy_static::lazy_static! { -pub static ref T: std::collections::HashMap<&'static str, &'static str> = - [ - ("Status", "നില"), - ("Your Desktop", "നിങ്ങളുടെ ഡെസ്ക്ടോപ്പ്"), - ("desk_tip", "ഈ ഐഡിയും പാസ്‌വേഡും ഉപയോഗിച്ച് നിങ്ങളുടെ ഡെസ്ക്ടോപ്പ് ആക്‌സസ് ചെയ്യാം."), - ("Password", "പാസ്‌വേഡ്"), - ("Ready", "തയ്യാറാണ്"), - ("Established", "ബന്ധം സ്ഥാപിച്ചു"), - ("connecting_status", "നെറ്റ്‌വർക്കുമായി ബന്ധിപ്പിക്കുന്നു..."), - ("Enable service", "സർവീസ് പ്രവർത്തനക്ഷമമാക്കുക"), - ("Start service", "സർവീസ് തുടങ്ങുക"), - ("Service is running", "സർവീസ് പ്രവർത്തിക്കുന്നു"), - ("Service is not running", "സർവീസ് പ്രവർത്തിക്കുന്നില്ല"), - ("not_ready_status", "തയ്യാറായിട്ടില്ല. ദയവായി നിങ്ങളുടെ കണക്ഷൻ പരിശോധിക്കുക"), - ("Control Remote Desktop", "റിമോട്ട് ഡെസ്ക്ടോപ്പ് നിയന്ത്രിക്കുക"), - ("Transfer file", "ഫയൽ കൈമാറുക"), - ("Connect", "കണക്ട് ചെയ്യുക"), - ("Recent sessions", "സമീപകാല സെഷനുകൾ"), - ("Address book", "അഡ്രസ് ബുക്ക്"), - ("Confirmation", "സ്ഥിരീകരണം"), - ("TCP tunneling", "TCP ടണലിംഗ്"), - ("Remove", "നീക്കം ചെയ്യുക"), - ("Refresh random password", "പുതിയ പാസ്‌വേഡ് ജനറേറ്റ് ചെയ്യുക"), - ("Set your own password", "സ്വന്തം പാസ്‌വേഡ് സെറ്റ് ചെയ്യുക"), - ("Enable keyboard/mouse", "കീബോർഡ്/മൗസ് അനുവദിക്കുക"), - ("Enable clipboard", "ക്ലിപ്പ്ബോർഡ് അനുവദിക്കുക"), - ("Enable file transfer", "ഫയൽ കൈമാറ്റം അനുവദിക്കുക"), - ("Enable TCP tunneling", "TCP ടണലിംഗ് അനുവദിക്കുക"), - ("IP Whitelisting", "IP വൈറ്റ്‌ലിസ്റ്റിംഗ്"), - ("ID/Relay Server", "ID/റിലേ സെർവർ"), - ("Import server config", "സെർവർ കോൺഫിഗറേഷൻ ഇമ്പോർട്ട് ചെയ്യുക"), - ("Export Server Config", "സെർവർ കോൺഫിഗറേഷൻ എക്‌സ്‌പോർട്ട് ചെയ്യുക"), - ("Import server configuration successfully", "സെർവർ കോൺഫിഗറേഷൻ വിജയകരമായി ഇമ്പോർട്ട് ചെയ്തു"), - ("Export server configuration successfully", "സെർവർ കോൺഫിഗറേഷൻ വിജയകരമായി എക്‌സ്‌പോർട്ട് ചെയ്തു"), - ("Invalid server configuration", "അസാധുവായ സെർവർ കോൺഫിഗറേഷൻ"), - ("Clipboard is empty", "ക്ലിപ്പ്ബോർഡ് ശൂന്യമാണ്"), - ("Stop service", "സർവീസ് നിർത്തുക"), - ("Change ID", "ഐഡി മാറ്റുക"), - ("Your new ID", "നിങ്ങളുടെ പുതിയ ഐഡി"), - ("length %min% to %max%", "നീളം %min% മുതൽ %max% വരെ"), - ("starts with a letter", "അക്ഷരത്തിൽ തുടങ്ങണം"), - ("allowed characters", "അനുവദനീയമായ അക്ഷരങ്ങൾ"), - ("id_change_tip", "ഐഡി മാറ്റിയാൽ നിലവിലുള്ള കണക്ഷൻ വിച്ഛേദിക്കപ്പെടും."), - ("Website", "വെബ്സൈറ്റ്"), - ("About", "വിവരങ്ങൾ"), - ("Slogan_tip", "മികച്ച അനുഭവത്തിനായി നിർമ്മിച്ച റിമോട്ട് ഡെസ്ക്ടോപ്പ് സോഫ്റ്റ്‌വെയർ"), - ("Privacy Statement", "സ്വകാര്യതാ പ്രസ്താവന"), - ("Mute", "നിശബ്ദമാക്കുക"), - ("Build Date", "നിർമ്മാണ തീയതി"), - ("Version", "പതിപ്പ്"), - ("Home", "ഹോം"), - ("Audio Input", "ഓഡിയോ ഇൻപുട്ട്"), - ("Enhancements", "മെച്ചപ്പെടുത്തലുകൾ"), - ("Hardware Codec", "ഹാർഡ്‌വെയർ കോഡെക്"), - ("Adaptive bitrate", "അഡാപ്റ്റീവ് ബിറ്റ്റേറ്റ്"), - ("ID Server", "ID സെർവർ"), - ("Relay Server", "റിലേ സെർവർ"), - ("API Server", "API സെർവർ"), - ("invalid_http", "അസാധുവായ HTTP ലിങ്ക്"), - ("Invalid IP", "അസാധുവായ IP"), - ("Invalid format", "അസാധുവായ ഫോർമാറ്റ്"), - ("server_not_support", "സെർവർ പിന്തുണയ്ക്കുന്നില്ല"), - ("Not available", "ലഭ്യമല്ല"), - ("Too frequent", "അമിതമായ തവണകൾ"), - ("Cancel", "റദ്ദാക്കുക"), - ("Skip", "ഒഴിവാക്കുക"), - ("Close", "അടയ്ക്കുക"), - ("Retry", "വീണ്ടും ശ്രമിക്കുക"), - ("OK", "ശരി"), - ("Password Required", "പാസ്‌വേഡ് ആവശ്യമാണ്"), - ("Please enter your password", "ദയവായി നിങ്ങളുടെ പാസ്‌വേഡ് നൽകുക"), - ("Remember password", "പാസ്‌വേഡ് ഓർമ്മിക്കുക"), - ("Wrong Password", "തെറ്റായ പാസ്‌വേഡ്"), - ("Do you want to enter again?", "നിങ്ങൾക്ക് വീണ്ടും ശ്രമിക്കണോ?"), - ("Connection Error", "കണക്ഷൻ പിശക്"), - ("Error", "പിശക്"), - ("Reset by the peer", "മറുഭാഗത്തുനിന്ന് റീസെറ്റ് ചെയ്തു"), - ("Connecting...", "ബന്ധിപ്പിക്കുന്നു..."), - ("Connection in progress. Please wait.", "കണക്ഷൻ നടക്കുന്നു. ദയവായി കാത്തിരിക്കുക."), - ("Please try 1 minute later", "ദയവായി ഒരു മിനിറ്റിന് ശേഷം ശ്രമിക്കുക"), - ("Login Error", "ലോഗിൻ പിശക്"), - ("Successful", "വിജയിച്ചു"), - ("Connected, waiting for image...", "ബന്ധിപ്പിച്ചു, ചിത്രത്തിനായി കാത്തിരിക്കുന്നു..."), - ("Name", "പേര്"), - ("Type", "തരം"), - ("Modified", "മാറ്റം വരുത്തിയത്"), - ("Size", "വലിപ്പം"), - ("Show Hidden Files", "മറഞ്ഞിരിക്കുന്ന ഫയലുകൾ കാണിക്കുക"), - ("Receive", "സ്വീകരിക്കുക"), - ("Send", "അയക്കുക"), - ("Refresh File", "ഫയൽ പുതുക്കുക"), - ("Local", "ലോക്കൽ"), - ("Remote", "റിമോട്ട്"), - ("Remote Computer", "റിമോട്ട് കമ്പ്യൂട്ടർ"), - ("Local Computer", "ലോക്കൽ കമ്പ്യൂട്ടർ"), - ("Confirm Delete", "ഡിലീറ്റ് ചെയ്യുന്നത് സ്ഥിരീകരിക്കുക"), - ("Delete", "ഡിലീറ്റ് ചെയ്യുക"), - ("Properties", "പ്രോപ്പർട്ടീസ്"), - ("Multi Select", "ഒന്നിലധികം തിരഞ്ഞെടുക്കുക"), - ("Select All", "എല്ലാം തിരഞ്ഞെടുക്കുക"), - ("Unselect All", "തിരഞ്ഞെടുത്തവ ഒഴിവാക്കുക"), - ("Empty Directory", "ശൂന്യമായ ഡയറക്ടറി"), - ("Not an empty directory", "ഡയറക്ടറി ശൂന്യമല്ല"), - ("Are you sure you want to delete this file?", "ഈ ഫയൽ ഡിലീറ്റ് ചെയ്യണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?"), - ("Are you sure you want to delete this empty directory?", "ഈ ശൂന്യമായ ഡയറക്ടറി ഡിലീറ്റ് ചെയ്യണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?"), - ("Are you sure you want to delete the file of this directory?", "ഈ ഡയറക്ടറിയിലെ ഫയലുകൾ ഡിലീറ്റ് ചെയ്യണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?"), - ("Do this for all conflicts", "എല്ലാ വൈരുദ്ധ്യങ്ങൾക്കും ഇതുതന്നെ ചെയ്യുക"), - ("This is irreversible!", "ഇത് പഴയപടിയാക്കാൻ കഴിയില്ല!"), - ("Deleting", "ഡിലീറ്റ് ചെയ്യുന്നു"), - ("files", "ഫയലുകൾ"), - ("Waiting", "കാത്തിരിക്കുന്നു"), - ("Finished", "പൂർത്തിയായി"), - ("Speed", "വേഗത"), - ("Custom Image Quality", "ഇമേജ് ക്വാളിറ്റി മാറ്റുക"), - ("Privacy mode", "സ്വകാര്യ മോഡ്"), - ("Block user input", "യൂസർ ഇൻപുട്ട് തടയുക"), - ("Unblock user input", "യൂസർ ഇൻപുട്ട് അനുവദിക്കുക"), - ("Adjust Window", "വിൻഡോ ക്രമീകരിക്കുക"), - ("Original", "ഒറിജിനൽ"), - ("Shrink", "ചുരുക്കുക"), - ("Stretch", "വലിപ്പിക്കുക"), - ("Scrollbar", "സ്ക്രോൾബാർ"), - ("ScrollAuto", "ഓട്ടോ സ്ക്രോൾ"), - ("Good image quality", "നല്ല ക്വാളിറ്റി"), - ("Balanced", "സന്തുലിതം"), - ("Optimize reaction time", "പ്രതികരണ സമയം മെച്ചപ്പെടുത്തുക"), - ("Custom", "കസ്റ്റം"), - ("Show remote cursor", "റിമോട്ട് കർസർ കാണിക്കുക"), - ("Show quality monitor", "ക്വാളിറ്റി മോണിറ്റർ കാണിക്കുക"), - ("Disable clipboard", "ക്ലിപ്പ്ബോർഡ് ഒഴിവാക്കുക"), - ("Lock after session end", "സെഷൻ കഴിഞ്ഞാൽ ലോക്ക് ചെയ്യുക"), - ("Insert Ctrl + Alt + Del", "Ctrl + Alt + Del നൽകുക"), - ("Insert Lock", "ലോക്ക് ചെയ്യുക"), - ("Refresh", "പുതുക്കുക"), - ("ID does not exist", "ഐഡി നിലവിലില്ല"), - ("Failed to connect to rendezvous server", "സെർവറുമായി ബന്ധിപ്പിക്കുന്നതിൽ പരാജയപ്പെട്ടു"), - ("Please try later", "ദയവായി പിന്നീട് ശ്രമിക്കുക"), - ("Remote desktop is offline", "റിമോട്ട് ഡെസ്ക്ടോപ്പ് ഓഫ്‌ലൈനാണ്"), - ("Key mismatch", "കീ പൊരുത്തക്കേട്"), - ("Timeout", "സമയം കഴിഞ്ഞു"), - ("Failed to connect to relay server", "റിലേ സെർവറുമായി ബന്ധിപ്പിക്കുന്നതിൽ പരാജയപ്പെട്ടു"), - ("Failed to connect via rendezvous server", "സെർവർ വഴി ബന്ധിപ്പിക്കുന്നതിൽ പരാജയപ്പെട്ടു"), - ("Failed to connect via relay server", "റിലേ സെർവർ വഴി ബന്ധിപ്പിക്കുന്നതിൽ പരാജയപ്പെട്ടു"), - ("Failed to make direct connection to remote desktop", "നേരിട്ട് ബന്ധിപ്പിക്കുന്നതിൽ പരാജയപ്പെട്ടു"), - ("Set Password", "പാസ്‌വേഡ് നൽകുക"), - ("OS Password", "OS പാസ്‌വേഡ്"), - ("install_tip", "മികച്ച പ്രകടനത്തിനായി ഇൻസ്റ്റാൾ ചെയ്യുക."), - ("Click to upgrade", "അപ്‌ഗ്രേഡ് ചെയ്യാൻ ക്ലിക്ക് ചെയ്യുക"), - ("Configure", "ക്രമീകരിക്കുക"), - ("config_acc", "അക്‌സസിബിലിറ്റി ക്രമീകരിക്കുക"), - ("config_screen", "സ്ക്രീൻ ക്രമീകരിക്കുക"), - ("Installing ...", "ഇൻസ്റ്റാൾ ചെയ്യുന്നു..."), - ("Install", "ഇൻസ്റ്റാൾ ചെയ്യുക"), - ("Installation", "ഇൻസ്റ്റാളേഷൻ"), - ("Installation Path", "ഇൻസ്റ്റാളേഷൻ പാത്ത്"), - ("Create start menu shortcuts", "സ്റ്റാർട്ട് മെനുവിൽ ഷോർട്ട്കട്ട് ഉണ്ടാക്കുക"), - ("Create desktop icon", "ഡെസ്ക്ടോപ്പ് ഐക്കൺ ഉണ്ടാക്കുക"), - ("agreement_tip", "ഇൻസ്റ്റാൾ ചെയ്യുന്നതിലൂടെ നിങ്ങൾ കരാറുകൾ അംഗീകരിക്കുന്നു."), - ("Accept and Install", "അംഗീകരിച്ച് ഇൻസ്റ്റാൾ ചെയ്യുക"), - ("End-user license agreement", "ലൈസൻസ് കരാർ"), - ("Generating ...", "ഉണ്ടാക്കുന്നു..."), - ("Your installation is lower version.", "നിങ്ങളുടെ ഇൻസ്റ്റാളേഷൻ പഴയ പതിപ്പാണ്."), - ("not_close_tcp_tip", "ടണൽ ഉപയോഗിക്കുമ്പോൾ ഈ വിൻഡോ അടയ്ക്കരുത്."), - ("Listening ...", "ശ്രദ്ധിക്കുന്നു..."), - ("Remote Host", "റിമോട്ട് ഹോസ്റ്റ്"), - ("Remote Port", "റിമോട്ട് പോർട്ട്"), - ("Action", "നടപടി"), - ("Add", "ചേർക്കുക"), - ("Local Port", "ലോക്കൽ പോർട്ട്"), - ("Local Address", "ലോക്കൽ അഡ്രസ്"), - ("Change Local Port", "ലോക്കൽ പോർട്ട് മാറ്റുക"), - ("setup_server_tip", "വേഗതയുള്ള കണക്ഷനായി സ്വന്തം സെർവർ സജ്ജമാക്കുക"), - ("Too short, at least 6 characters.", "വളരെ ചെറുതാണ്, കുറഞ്ഞത് 6 അക്ഷരങ്ങൾ വേണം."), - ("The confirmation is not identical.", "സ്ഥിരീകരണം ഒരേപോലെയല്ല."), - ("Permissions", "അനുമതികൾ"), - ("Accept", "സ്വീകരിക്കുക"), - ("Dismiss", "നിരസിക്കുക"), - ("Disconnect", "വിച്ഛേദിക്കുക"), - ("Enable file copy and paste", "ഫയൽ കോപ്പി-പേസ്റ്റ് അനുവദിക്കുക"), - ("Connected", "ബന്ധിപ്പിച്ചു"), - ("Direct and encrypted connection", "നേരിട്ടുള്ളതും എൻക്രിപ്റ്റ് ചെയ്തതുമായ കണക്ഷൻ"), - ("Relayed and encrypted connection", "റിലേ വഴിയുള്ള എൻക്രിപ്റ്റ് ചെയ്ത കണക്ഷൻ"), - ("Direct and unencrypted connection", "നേരിട്ടുള്ളതും എൻക്രിപ്റ്റ് ചെയ്യാത്തതുമായ കണക്ഷൻ"), - ("Relayed and unencrypted connection", "റിലേ വഴിയുള്ള എൻക്രിപ്റ്റ് ചെയ്യാത്ത കണക്ഷൻ"), - ("Enter Remote ID", "റിമോട്ട് ഐഡി നൽകുക"), - ("Enter your password", "നിങ്ങളുടെ പാസ്‌വേഡ് നൽകുക"), - ("Logging in...", "ലോഗിൻ ചെയ്യുന്നു..."), - ("Enable RDP session sharing", "RDP സെഷൻ പങ്കിടൽ അനുവദിക്കുക"), - ("Auto Login", "ഓട്ടോ ലോഗിൻ"), - ("Enable direct IP access", "നേരിട്ടുള്ള IP ആക്‌സസ് അനുവദിക്കുക"), - ("Rename", "പേര് മാറ്റുക"), - ("Space", "സ്പേസ്"), - ("Create desktop shortcut", "ഡെസ്ക്ടോപ്പ് ഷോർട്ട്കട്ട് ഉണ്ടാക്കുക"), - ("Change Path", "പാത്ത് മാറ്റുക"), - ("Create Folder", "ഫോൾഡർ ഉണ്ടാക്കുക"), - ("Please enter the folder name", "ദയവായി ഫോൾഡറിന്റെ പേര് നൽകുക"), - ("Fix it", "പരിഹരിക്കുക"), - ("Warning", "മുന്നറിയിപ്പ്"), - ("Login screen using Wayland is not supported", "Wayland വഴിയുള്ള ലോഗിൻ സപ്പോർട്ട് ചെയ്യുന്നില്ല"), - ("Reboot required", "റീബൂട്ട് ആവശ്യമാണ്"), - ("Unsupported display server", "പിന്തുണയ്ക്കാത്ത ഡിസ്‌പ്ലേ സെർവർ"), - ("x11 expected", "x11 ആവശ്യമാണ്"), - ("Port", "പോർട്ട്"), - ("Settings", "ക്രമീകരണങ്ങൾ"), - ("Username", "യൂസർ നെയിം"), - ("Invalid port", "അസാധുവായ പോർട്ട്"), - ("Closed manually by the peer", "മറുഭാഗത്തുനിന്നും മാനുവലായി അടച്ചു"), - ("Enable remote configuration modification", "റിമോട്ട് കോൺഫിഗറേഷൻ മാറ്റങ്ങൾ അനുവദിക്കുക"), - ("Run without install", "ഇൻസ്റ്റാൾ ചെയ്യാതെ പ്രവർത്തിപ്പിക്കുക"), - ("Connect via relay", "റിലേ വഴി കണക്ട് ചെയ്യുക"), - ("Always connect via relay", "എപ്പോഴും റിലേ വഴി കണക്ട് ചെയ്യുക"), - ("whitelist_tip", "വൈറ്റ്‌ലിസ്റ്റ് ചെയ്ത ഐപികൾക്ക് മാത്രമേ എന്നെ ആക്‌സസ് ചെയ്യാൻ കഴിയൂ"), - ("Login", "ലോഗിൻ"), - ("Verify", "പരിശോധിക്കുക"), - ("Remember me", "എന്നെ ഓർമ്മിക്കുക"), - ("Trust this device", "ഈ ഉപകരണം വിശ്വസിക്കുക"), - ("Verification code", "വെരിഫിക്കേഷൻ കോഡ്"), - ("verification_tip", "വെരിഫിക്കേഷൻ കോഡ് നിങ്ങളുടെ ഇമെയിലിലേക്ക് അയച്ചു"), - ("Logout", "ലോഗൗട്ട്"), - ("Tags", "ടാഗുകൾ"), - ("Search ID", "ഐഡി തിരയുക"), - ("whitelist_sep", "കോമ, സെമി കോളൻ അല്ലെങ്കിൽ സ്പേസ് ഉപയോഗിച്ച് തിരിക്കുക"), - ("Add ID", "ഐഡി ചേർക്കുക"), - ("Add Tag", "ടാഗ് ചേർക്കുക"), - ("Unselect all tags", "എല്ലാ ടാഗുകളും ഒഴിവാക്കുക"), - ("Network error", "നെറ്റ്‌വർക്ക് പിശക്"), - ("Username missed", "യൂസർ നെയിം നൽകിയില്ല"), - ("Password missed", "പാസ്‌വേഡ് നൽകിയില്ല"), - ("Wrong credentials", "തെറ്റായ വിവരങ്ങൾ"), - ("The verification code is incorrect or has expired", "കോഡ് തെറ്റാണ് അല്ലെങ്കിൽ കാലാവധി കഴിഞ്ഞു"), - ("Edit Tag", "ടാഗ് മാറ്റുക"), - ("Forget Password", "പാസ്‌വേഡ് മറന്നു"), - ("Favorites", "പ്രിയപ്പെട്ടവ"), - ("Add to Favorites", "പ്രിയപ്പെട്ടവയിലേക്ക് ചേർക്കുക"), - ("Remove from Favorites", "പ്രിയപ്പെട്ടവയിൽ നിന്ന് നീക്കം ചെയ്യുക"), - ("Empty", "ശൂന്യം"), - ("Invalid folder name", "അസാധുവായ ഫോൾഡർ പേര്"), - ("Socks5 Proxy", "Socks5 പ്രോക്സി"), - ("Socks5/Http(s) Proxy", "Socks5/Http(s) പ്രോക്സി"), - ("Discovered", "കണ്ടെത്തിയവ"), - ("install_daemon_tip", "കമ്പ്യൂട്ടർ തുടങ്ങുമ്പോൾ തന്നെ പ്രവർത്തിക്കാൻ സർവീസ് ഇൻസ്റ്റാൾ ചെയ്യുക"), - ("Remote ID", "റിമോട്ട് ഐഡി"), - ("Paste", "പേസ്റ്റ്"), - ("Paste here?", "ഇവിടെ പേസ്റ്റ് ചെയ്യണോ?"), - ("Are you sure to close the connection?", "കണക്ഷൻ നിർത്തണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?"), - ("Download new version", "പുതിയ പതിപ്പ് ഡൗൺലോഡ് ചെയ്യുക"), - ("Touch mode", "ടച്ച് മോഡ്"), - ("Mouse mode", "മൗസ് മോഡ്"), - ("One-Finger Tap", "ഒരു വിരൽ ടാപ്പ്"), - ("Left Mouse", "മൗസ് ഇടത് ബട്ടൺ"), - ("One-Long Tap", "ഒരു നീണ്ട ടാപ്പ്"), - ("Two-Finger Tap", "രണ്ട് വിരൽ ടാപ്പ്"), - ("Right Mouse", "മൗസ് വലത് ബട്ടൺ"), - ("One-Finger Move", "ഒരു വിരൽ നീക്കം"), - ("Double Tap & Move", "രണ്ട് ടാപ്പും നീക്കവും"), - ("Mouse Drag", "മൗസ് ഡ്രാഗ്"), - ("Three-Finger vertically", "മൂന്ന് വിരൽ ലംബമായി"), - ("Mouse Wheel", "മൗസ് വീൽ"), - ("Two-Finger Move", "രണ്ട് വിരൽ നീക്കം"), - ("Canvas Move", "ക്യാൻവാസ് നീക്കുക"), - ("Pinch to Zoom", "സൂം ചെയ്യാൻ പിഞ്ച് ചെയ്യുക"), - ("Canvas Zoom", "ക്യാൻവാസ് സൂം"), - ("Reset canvas", "ക്യാൻവാസ് റീസെറ്റ് ചെയ്യുക"), - ("No permission of file transfer", "ഫയൽ കൈമാറ്റത്തിന് അനുമതിയില്ല"), - ("Note", "കുറിപ്പ്"), - ("Connection", "കണക്ഷൻ"), - ("Share screen", "സ്ക്രീൻ പങ്കിടുക"), - ("Chat", "ചാറ്റ്"), - ("Total", "ആകെ"), - ("items", "ഇനങ്ങൾ"), - ("Selected", "തിഞ്ഞെടുത്തവ"), - ("Screen Capture", "സ്ക്രീൻ ക്യാപ്ചർ"), - ("Input Control", "ഇൻപുട്ട് നിയന്ത്രണം"), - ("Audio Capture", "ഓഡിയോ ക്യാപ്ചർ"), - ("Do you accept?", "നിങ്ങൾ അംഗീകരിക്കുന്നുണ്ടോ?"), - ("Open System Setting", "സിസ്റ്റം സെറ്റിംഗ്സ് തുറക്കുക"), - ("How to get Android input permission?", "ആൻഡ്രോയിഡ് ഇൻപുട്ട് അനുമതി എങ്ങനെ നേടാം?"), - ("android_input_permission_tip1", "ഇൻപുട്ട് അനുമതിക്കായി ആക്‌സസിബിലിറ്റി സർവീസ് ഓൺ ചെയ്യുക."), - ("android_input_permission_tip2", "സെറ്റിംഗ്സിൽ RustDesk കണ്ടെത്തി അത് ഓൺ ചെയ്യുക."), - ("android_new_connection_tip", "പുതിയ കണക്ഷൻ അഭ്യർത്ഥന ലഭിച്ചു."), - ("android_service_will_start_tip", "സ്ക്രീൻ ക്യാപ്ചർ ഓൺ ചെയ്താൽ സർവീസ് താനേ തുടങ്ങും."), - ("android_stop_service_tip", "സർവീസ് നിർത്തുന്നത് എല്ലാ കണക്ഷനുകളും വിച്ഛേദിക്കും."), - ("android_version_audio_tip", "ആൻഡ്രോയിഡ് 10-ൽ കൂടുതൽ വേണം ഓഡിയോ ക്യാപ്ചർ ചെയ്യാൻ."), - ("android_start_service_tip", "സ്ക്രീൻ ഷെയറിംഗ് തുടങ്ങാൻ ക്ലിക്ക് ചെയ്യുക."), - ("android_permission_may_not_change_tip", "അനുമതികൾ പിന്നീട് മാറ്റാൻ കഴിയില്ല, ശ്രദ്ധിച്ച് തിരഞ്ഞെടുക്കുക."), - ("Account", "അക്കൗണ്ട്"), - ("Overwrite", "തിരുത്തിയെഴുതുക (Overwrite)"), - ("This file exists, skip or overwrite this file?", "ഈ ഫയൽ നിലവിലുണ്ട്, ഒഴിവാക്കണോ അതോ തിരുത്തിയെഴുതണോ?"), - ("Quit", "പുറത്തുകടക്കുക"), - ("Help", "സഹായം"), - ("Failed", "പരാജയപ്പെട്ടു"), - ("Succeeded", "വിജയിച്ചു"), - ("Someone turns on privacy mode, exit", "ആരോ പ്രൈവസി മോഡ് ഓൺ ചെയ്തു, പുറത്തുകടക്കുന്നു"), - ("Unsupported", "പിന്തുണയ്ക്കുന്നില്ല"), - ("Peer denied", "മറുഭാഗത്തുനിന്ന് നിരസിച്ചു"), - ("Please install plugins", "ദയവായി പ്ലഗിനുകൾ ഇൻസ്റ്റാൾ ചെയ്യുക"), - ("Peer exit", "മറുഭാഗത്തുനിന്ന് പുറത്തുകടന്നു"), - ("Failed to turn off", "ഓഫ് ചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു"), - ("Turned off", "ഓഫ് ചെയ്തു"), - ("Language", "ഭാഷ"), - ("Keep RustDesk background service", "RustDesk ബാക്ക്ഗ്രൗണ്ടിൽ പ്രവർത്തിപ്പിക്കുക"), - ("Ignore Battery Optimizations", "ബാറ്ററി ഒപ്റ്റിമൈസേഷൻ അവഗണിക്കുക"), - ("android_open_battery_optimizations_tip", "കണക്ഷൻ മുറിയാതിരിക്കാൻ ബാറ്ററി ഒപ്റ്റിമൈസേഷൻ സെറ്റിംഗ്സ് തുറക്കുക"), - ("Start on boot", "തുടങ്ങുമ്പോൾ തന്നെ പ്രവർത്തിക്കുക"), - ("Start the screen sharing service on boot, requires special permissions", "തുടങ്ങുമ്പോൾ തന്നെ സ്ക്രീൻ ഷെയറിംഗ് തുടങ്ങുക, പ്രത്യേക അനുമതി ആവശ്യമാണ്"), - ("Connection not allowed", "കണക്ഷൻ അനുവദനീയമല്ല"), - ("Legacy mode", "ലെഗസി മോഡ്"), - ("Map mode", "മാപ്പ് മോഡ്"), - ("Translate mode", "ട്രാൻസ്ലേറ്റ് മോഡ്"), - ("Use permanent password", "സ്ഥിരമായ പാസ്‌വേഡ് ഉപയോഗിക്കുക"), - ("Use both passwords", "രണ്ട് പാസ്‌വേഡുകളും ഉപയോഗിക്കുക"), - ("Set permanent password", "സ്ഥിരമായ പാസ്‌വേഡ് സജ്ജമാക്കുക"), - ("Enable remote restart", "റിമോട്ട് റീസ്റ്റാർട്ട് അനുവദിക്കുക"), - ("Restart remote device", "റിമോട്ട് ഉപകരണം റീസ്റ്റാർട്ട് ചെയ്യുക"), - ("Are you sure you want to restart", "റീസ്റ്റാർട്ട് ചെയ്യണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?"), - ("Restarting remote device", "റിമോട്ട് ഉപകരണം റീസ്റ്റാർട്ട് ചെയ്യുന്നു"), - ("remote_restarting_tip", "റിമോട്ട് ഉപകരണം റീസ്റ്റാർട്ട് ചെയ്യുന്നു, ദയവായി കാത്തിരിക്കുക..."), - ("Copied", "കോപ്പി ചെയ്തു"), - ("Exit Fullscreen", "ഫുൾ സ്ക്രീനിൽ നിന്ന് പുറത്തുകടക്കുക"), - ("Fullscreen", "ഫുൾ സ്ക്രീൻ"), - ("Mobile Actions", "മൊബൈൽ നടപടികൾ"), - ("Select Monitor", "മോണിറ്റർ തിരഞ്ഞെടുക്കുക"), - ("Control Actions", "നിയന്ത്രണ നടപടികൾ"), - ("Display Settings", "ഡിസ്‌പ്ലേ ക്രമീകരണങ്ങൾ"), - ("Ratio", "അനുപാതം (Ratio)"), - ("Image Quality", "ചിത്രത്തിന്റെ ഗുണനിലവാരം"), - ("Scroll Style", "സ്ക്രോൾ സ്റ്റൈൽ"), - ("Show Toolbar", "ടൂൾബാർ കാണിക്കുക"), - ("Hide Toolbar", "ടൂൾബാർ മറയ്ക്കുക"), - ("Direct Connection", "നേരിട്ടുള്ള കണക്ഷൻ"), - ("Relay Connection", "റിലേ കണക്ഷൻ"), - ("Secure Connection", "സുരക്ഷിതമായ കണക്ഷൻ"), - ("Insecure Connection", "സുരക്ഷിതമല്ലാത്ത കണക്ഷൻ"), - ("Scale original", "ഒറിജിനൽ വലിപ്പം"), - ("Scale adaptive", "അഡാപ്റ്റീവ് വലിപ്പം"), - ("General", "പൊതുവായവ"), - ("Security", "സുരക്ഷ"), - ("Theme", "തീം"), - ("Dark Theme", "ഡാർക്ക് തീം"), - ("Light Theme", "ലൈറ്റ് തീം"), - ("Dark", "ഡാർക്ക്"), - ("Light", "ലൈറ്റ്"), - ("Follow System", "സിസ്റ്റം അനുസരിച്ച്"), - ("Enable hardware codec", "ഹാർഡ്‌വെയർ കോഡെക് അനുവദിക്കുക"), - ("Unlock Security Settings", "സുരക്ഷാ ക്രമീകരണങ്ങൾ അൺലോക്ക് ചെയ്യുക"), - ("Enable audio", "ശബ്ദം അനുവദിക്കുക"), - ("Unlock Network Settings", "നെറ്റ്‌വർക്ക് ക്രമീകരണങ്ങൾ അൺലോക്ക് ചെയ്യുക"), - ("Server", "സെർവർ"), - ("Direct IP Access", "നേരിട്ടുള്ള IP ആക്‌സസ്"), - ("Proxy", "പ്രോക്സി"), - ("Apply", "പ്രയോഗിക്കുക"), - ("Disconnect all devices?", "എല്ലാ ഉപകരണങ്ങളും വിച്ഛേദിക്കണോ?"), - ("Clear", "വൃത്തിയാക്കുക"), - ("Audio Input Device", "ശബ്ദ ഇൻപുട്ട് ഉപകരണം"), - ("Use IP Whitelisting", "IP വൈറ്റ്‌ലിസ്റ്റിംഗ് ഉപയോഗിക്കുക"), - ("Network", "നെറ്റ്‌വർക്ക്"), - ("Pin Toolbar", "ടൂൾബാർ പിൻ ചെയ്യുക"), - ("Unpin Toolbar", "ടൂൾബാർ അൺപിൻ ചെയ്യുക"), - ("Recording", "റെക്കോർഡിംഗ്"), - ("Directory", "ഡയറക്ടറി"), - ("Automatically record incoming sessions", "വരുന്ന സെഷനുകൾ താനേ റെക്കോർഡ് ചെയ്യുക"), - ("Automatically record outgoing sessions", "പോകുന്ന സെഷനുകൾ താനേ റെക്കോർഡ് ചെയ്യുക"), - ("Change", "മാറ്റുക"), - ("Start session recording", "റെക്കോർഡിംഗ് തുടങ്ങുക"), - ("Stop session recording", "റെക്കോർഡിംഗ് നിർത്തുക"), - ("Enable recording session", "സെഷൻ റെക്കോർഡിംഗ് അനുവദിക്കുക"), - ("Enable LAN discovery", "LAN കണ്ടെത്തൽ അനുവദിക്കുക"), - ("Deny LAN discovery", "LAN കണ്ടെത്തൽ നിരസിക്കുക"), - ("Write a message", "സന്ദേശം എഴുതുക"), - ("Prompt", "പ്രോംപ്റ്റ്"), - ("Please wait for confirmation of UAC...", "UAC സ്ഥിരീകരണത്തിനായി കാത്തിരിക്കുക..."), - ("elevated_foreground_window_tip", "റിമോട്ടിലെ വിൻഡോയ്ക്ക് കൂടുതൽ അനുമതി ആവശ്യമാണ്."), - ("Disconnected", "വിച്ഛേദിച്ചു"), - ("Other", "മറ്റുള്ളവ"), - ("Confirm before closing multiple tabs", "ടാബുകൾ അടയ്ക്കുന്നതിന് മുൻപ് സ്ഥിരീകരിക്കുക"), - ("Keyboard Settings", "കീബോർഡ് ക്രമീകരണങ്ങൾ"), - ("Full Access", "പൂർണ്ണ ആക്‌സസ്"), - ("Screen Share", "സ്ക്രീൻ ഷെയർ"), - ("ubuntu-21-04-required", "Ubuntu 21.04 എങ്കിലും വേണം"), - ("wayland-requires-higher-linux-version", "Wayland-ന് പുതിയ ലിനക്സ് പതിപ്പ് ആവശ്യമാണ്"), - ("xdp-portal-unavailable", "XDP പോർട്ടൽ ലഭ്യമല്ല"), - ("JumpLink", "ജമ്പ്‌ലിങ്ക്"), - ("Please Select the screen to be shared(Operate on the peer side).", "പങ്കിടാനുള്ള സ്ക്രീൻ തിരഞ്ഞെടുക്കുക (മറുഭാഗത്ത് ചെയ്യുക)."), - ("Show RustDesk", "RustDesk കാണിക്കുക"), - ("This PC", "ഈ പിസി"), - ("or", "അല്ലെങ്കിൽ"), - ("Elevate", "എലിവേറ്റ് ചെയ്യുക"), - ("Zoom cursor", "സൂം കർസർ"), - ("Accept sessions via password", "പാസ്‌വേഡ് വഴി സെഷനുകൾ അനുവദിക്കുക"), - ("Accept sessions via click", "ക്ലിക്ക് വഴി സെഷനുകൾ അനുവദിക്കുക"), - ("Accept sessions via both", "രണ്ടും വഴി സെഷനുകൾ അനുവദിക്കുക"), - ("Please wait for the remote side to accept your session request...", "മറുഭാഗം അനുമതി നൽകാനായി കാത്തിരിക്കുക..."), - ("One-time Password", "ഒറ്റത്തവണ പാസ്‌വേഡ്"), - ("Use one-time password", "ഒറ്റത്തവണ പാസ്‌വേഡ് ഉപയോഗിക്കുക"), - ("One-time password length", "ഒറ്റത്തവണ പാസ്‌വേഡ് നീളം"), - ("Request access to your device", "നിങ്ങളുടെ ഉപകരണം ആക്‌സസ് ചെയ്യാൻ അനുമതി ചോദിക്കുന്നു"), - ("Hide connection management window", "കണക്ഷൻ മാനേജ്‌മെന്റ് വിൻഡോ മറയ്ക്കുക"), - ("hide_cm_tip", "പാസ്‌വേഡ് വഴിയുള്ള കണക്ഷൻ ആണെങ്കിൽ മാത്രം മറയ്ക്കുക"), - ("wayland_experiment_tip", "Wayland പിന്തുണ പരീക്ഷണാടിസ്ഥാനത്തിലാണ്"), - ("Right click to select tabs", "ടാബുകൾ തിരഞ്ഞെടുക്കാൻ വലത് ക്ലിക്ക് ചെയ്യുക"), - ("Skipped", "ഒഴിവാക്കി"), - ("Add to address book", "അഡ്രസ് ബുക്കിലേക്ക് ചേർക്കുക"), - ("Group", "ഗ്രൂപ്പ്"), - ("Search", "തിരയുക"), - ("Closed manually by web console", "വെബ് കൺസോൾ വഴി മാനുവലായി അടച്ചു"), - ("Local keyboard type", "ലോക്കൽ കീബോർഡ് തരം"), - ("Select local keyboard type", "ലോക്കൽ കീബോർഡ് തരം തിരഞ്ഞെടുക്കുക"), - ("software_render_tip", "സ്ക്രീൻ കറുത്തിരിക്കുകയാണെങ്കിൽ ഇത് പരീക്ഷിക്കുക"), - ("Always use software rendering", "എപ്പോഴും സോഫ്റ്റ്‌വെയർ റെൻഡറിംഗ് ഉപയോഗിക്കുക"), - ("config_input", "ഇൻപുട്ട് ക്രമീകരിക്കുക"), - ("config_microphone", "മൈക്രോഫോൺ ക്രമീകരിക്കുക"), - ("request_elevation_tip", "മറുഭാഗത്തുനിന്ന് എലവേഷൻ ആവശ്യപ്പെടുക"), - ("Wait", "കാത്തിരിക്കുക"), - ("Elevation Error", "എലവേഷൻ പിശക്"), - ("Ask the remote user for authentication", "റിമോട്ട് ഉപയോക്താവിനോട് അനുമതി ചോദിക്കുക"), - ("Choose this if the remote account is administrator", "റിമോട്ട് അക്കൗണ്ട് അഡ്മിനിസ്ട്രേറ്റർ ആണെങ്കിൽ ഇത് തിരഞ്ഞെടുക്കുക"), - ("Transmit the username and password of administrator", "അഡ്മിനിസ്ട്രേറ്റർ വിവരങ്ങൾ അയക്കുക"), - ("still_click_uac_tip", "റിമോട്ട് ഉപയോക്താവ് UAC വിൻഡോയിൽ 'അതെ' എന്ന് ക്ലിക്ക് ചെയ്യേണ്ടതുണ്ട്."), - ("Request Elevation", "എലവേഷൻ ആവശ്യപ്പെടുക"), - ("wait_accept_uac_tip", "റിമോട്ട് ഉപയോക്താവ് UAC അംഗീകരിക്കാൻ കാത്തിരിക്കുക."), - ("Elevate successfully", "വിജയകരമായി എലവേറ്റ് ചെയ്തു"), - ("uppercase", "വലിയ അക്ഷരം (Uppercase)"), - ("lowercase", "ചെറിയ അക്ഷരം (Lowercase)"), - ("digit", "അക്കം"), - ("special character", "പ്രത്യേക ചിഹ്നം"), - ("length>=8", "നീളം >= 8"), - ("Weak", "ദുർബലം"), - ("Medium", "ഇടത്തരം"), - ("Strong", "ശക്തം"), - ("Switch Sides", "വശങ്ങൾ മാറ്റുക"), - ("Please confirm if you want to share your desktop?", "നിങ്ങളുടെ ഡെസ്ക്ടോപ്പ് പങ്കിടണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?"), - ("Display", "ഡിസ്‌പ്ലേ"), - ("Default View Style", "സാധാരണ വ്യൂ സ്റ്റൈൽ"), - ("Default Scroll Style", "സാധാരണ സ്ക്രോൾ സ്റ്റൈൽ"), - ("Default Image Quality", "സാധാരണ ഇമേജ് ക്വാളിറ്റി"), - ("Default Codec", "സാധാരണ കോഡെക്"), - ("Bitrate", "ബിറ്റ്റേറ്റ്"), - ("FPS", "FPS"), - ("Auto", "ഓട്ടോ"), - ("Other Default Options", "മറ്റ് സാധാരണ ഓപ്ഷനുകൾ"), - ("Voice call", "വോയിസ് കോൾ"), - ("Text chat", "ടെക്സ്റ്റ് ചാറ്റ്"), - ("Stop voice call", "വോയിസ് കോൾ നിർത്തുക"), - ("relay_hint_tip", "നേരിട്ടുള്ള കണക്ഷൻ സാധ്യമല്ല; റിലേ വഴി ശ്രമിക്കാം."), - ("Reconnect", "വീണ്ടും കണക്ട് ചെയ്യുക"), - ("Codec", "കോഡെക്"), - ("Resolution", "റെസല്യൂഷൻ"), - ("No transfers in progress", "കൈമാറ്റങ്ങളൊന്നും നടക്കുന്നില്ല"), - ("Set one-time password length", "ഒറ്റത്തവണ പാസ്‌വേഡ് നീളം നിശ്ചയിക്കുക"), - ("RDP Settings", "RDP ക്രമീകരണങ്ങൾ"), - ("Sort by", "ക്രമീകരിക്കുക"), - ("New Connection", "പുതിയ കണക്ഷൻ"), - ("Restore", "പുനഃസ്ഥാപിക്കുക"), - ("Minimize", "ചുരുക്കുക"), - ("Maximize", "വലുതാക്കുക"), - ("Your Device", "നിങ്ങളുടെ ഉപകരണം"), - ("empty_recent_tip", "സമീപകാല സെഷനുകൾ ഇവിടെ കാണാം."), - ("empty_favorite_tip", "പ്രിയപ്പെട്ടവ ഇവിടെ കാണാം."), - ("empty_lan_tip", "ലോക്കൽ നെറ്റ്‌വർക്കിലെ ഉപകരണങ്ങൾ ഇവിടെ കാണാം."), - ("empty_address_book_tip", "അഡ്രസ് ബുക്ക് ശൂന്യമാണ്."), - ("Empty Username", "യൂസർ നെയിം നൽകിയില്ല"), - ("Empty Password", "പാസ്‌വേഡ് നൽകിയില്ല"), - ("Me", "ഞാൻ"), - ("identical_file_tip", "ഈ ഫയൽ നിലവിലുണ്ട്."), - ("show_monitors_tip", "ടൂൾബാറിൽ മോണിറ്ററുകൾ കാണിക്കുക"), - ("View Mode", "വ്യൂ മോഡ്"), - ("login_linux_tip", "റിമോട്ട് ലിനക്സ് സെഷനായി ലോഗിൻ ചെയ്യണം"), - ("verify_rustdesk_password_tip", "RustDesk പാസ്‌വേഡ് പരിശോധിക്കുക"), - ("remember_account_tip", "ഈ അക്കൗണ്ട് ഓർമ്മിക്കുക"), - ("os_account_desk_tip", "ആക്‌സസിനായി OS അക്കൗണ്ട് ഉപയോഗിക്കുക"), - ("OS Account", "OS അക്കൗണ്ട്"), - ("another_user_login_title_tip", "മറ്റൊരു ഉപയോക്താവ് ലോഗിൻ ചെയ്തിട്ടുണ്ട്"), - ("another_user_login_text_tip", "വിച്ഛേദിച്ച ശേഷം വീണ്ടും ശ്രമിക്കുക"), - ("xorg_not_found_title_tip", "Xorg കണ്ടെത്താനായില്ല"), - ("xorg_not_found_text_tip", "ദയവായി Xorg ഇൻസ്റ്റാൾ ചെയ്യുക"), - ("no_desktop_title_tip", "ഡെസ്ക്ടോപ്പ് ലഭ്യമല്ല"), - ("no_desktop_text_tip", "ദയവായി ലിനക്സ് ഡെസ്ക്ടോപ്പ് ഇൻസ്റ്റാൾ ചെയ്യുക"), - ("No need to elevate", "എലവേറ്റ് ചെയ്യേണ്ടതില്ല"), - ("System Sound", "സിസ്റ്റം സൗണ്ട്"), - ("Default", "ഡിഫോൾട്ട്"), - ("New RDP", "പുതിയ RDP"), - ("Fingerprint", "ഫിംഗർപ്രിന്റ്"), - ("Copy Fingerprint", "ഫിംഗർപ്രിന്റ് കോപ്പി ചെയ്യുക"), - ("no fingerprints", "ഫിംഗർപ്രിന്റുകൾ ഇല്ല"), - ("Select a peer", "ഒരാളെ തിരഞ്ഞെടുക്കുക"), - ("Select peers", "തിരഞ്ഞെടുക്കുക"), - ("Plugins", "പ്ലഗിനുകൾ"), - ("Uninstall", "അൺഇൻസ്റ്റാൾ ചെയ്യുക"), - ("Update", "അപ്ഡേറ്റ് ചെയ്യുക"), - ("Enable", "പ്രവർത്തനക്ഷമമാക്കുക"), - ("Disable", "പ്രവർത്തനരഹിതമാക്കുക"), - ("Options", "ഓപ്ഷനുകൾ"), - ("resolution_original_tip", "ഒറിജിനൽ റെസല്യൂഷൻ"), - ("resolution_fit_local_tip", "ലോക്കൽ സ്ക്രീനിന് അനുയോജ്യം"), - ("resolution_custom_tip", "കസ്റ്റം റെസല്യൂഷൻ"), - ("Collapse toolbar", "ടൂൾബാർ ചുരുക്കുക"), - ("Accept and Elevate", "അംഗീകരിച്ച് എലവേറ്റ് ചെയ്യുക"), - ("accept_and_elevate_btn_tooltip", "കണക്ഷൻ അംഗീകരിച്ച് UAC അനുമതികൾ നൽകുക."), - ("clipboard_wait_response_timeout_tip", "ക്ലിപ്പ്ബോർഡ് മറുപടിക്കായി കാത്തിരുന്നു സമയം കഴിഞ്ഞു."), - ("Incoming connection", "വരുന്ന കണക്ഷൻ"), - ("Outgoing connection", "പോകുന്ന കണക്ഷൻ"), - ("Exit", "പുറത്തുകടക്കുക"), - ("Open", "തുറക്കുക"), - ("logout_tip", "നിങ്ങൾക്ക് ലോഗൗട്ട് ചെയ്യണമെന്ന് ഉറപ്പാണോ?"), - ("Service", "സർവീസ്"), - ("Start", "തുടങ്ങുക"), - ("Stop", "നിർത്തുക"), - ("exceed_max_devices", "നിങ്ങൾ ഉപകരണങ്ങളുടെ പരിധി കവിഞ്ഞു."), - ("Sync with recent sessions", "സമീപകാല സെഷനുകളുമായി സિંക് ചെയ്യുക"), - ("Sort tags", "ടാഗുകൾ ക്രമീകരിക്കുക"), - ("Open connection in new tab", "പുതിയ ടാബിൽ തുറക്കുക"), - ("Move tab to new window", "ടാബ് പുതിയ വിൻഡോയിലേക്ക് മാറ്റുക"), - ("Can not be empty", "ശൂന്യമാകാൻ പാടില്ല"), - ("Already exists", "നിലവിലുണ്ട്"), - ("Change Password", "പാസ്‌വേഡ് മാറ്റുക"), - ("Refresh Password", "പാസ്‌വേഡ് പുതുക്കുക"), - ("ID", "ഐഡി"), - ("Grid View", "ഗ്രിഡ് വ്യൂ"), - ("List View", "ലിസ്റ്റ് വ്യൂ"), - ("Select", "തിരഞ്ഞെടുക്കുക"), - ("Toggle Tags", "ടാഗുകൾ മാറ്റുക"), - ("pull_ab_failed_tip", "അഡ്രസ് ബുക്ക് അപ്‌ഡേറ്റ് ചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു."), - ("push_ab_failed_tip", "അഡ്രസ് ബുക്ക് സિંക് ചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു."), - ("synced_peer_readded_tip", "സമീപകാല ഉപകരണം അഡ്രസ് ബുക്കിലേക്ക് സિંക് ചെയ്തു."), - ("Change Color", "നിറം മാറ്റുക"), - ("Primary Color", "പ്രധാന നിറം"), - ("HSV Color", "HSV നിറം"), - ("Installation Successful!", "ഇൻസ്റ്റാളേഷൻ വിജയിച്ചു!"), - ("Installation failed!", "ഇൻസ്റ്റാളേഷൻ പരാജയപ്പെട്ടു!"), - ("Reverse mouse wheel", "മൗസ് വീൽ തിരിക്കുക"), - ("{} sessions", "{} സെഷനുകൾ"), - ("scam_title", "തട്ടിപ്പ് മുന്നറിയിപ്പ്!"), - ("scam_text1", "നിങ്ങൾക്ക് പരിചയമില്ലാത്ത ആരെങ്കിലും RustDesk ഉപയോഗിക്കാൻ ആവശ്യപ്പെട്ടാൽ ഉടൻ കണക്ഷൻ വിച്ഛേദിക്കുക."), - ("scam_text2", "ഇതൊരു തട്ടിപ്പായിരിക്കാം. ആർക്കും പാസ്‌വേഡ് നൽകരുത്."), - ("Don't show again", "വീണ്ടും കാണിക്കരുത്"), - ("I Agree", "ഞാൻ സമ്മതിക്കുന്നു"), - ("Decline", "നിരസിക്കുന്നു"), - ("Timeout in minutes", "മിനിറ്റുകളിൽ സമയം നിശ്ചയിക്കുക"), - ("auto_disconnect_option_tip", "പ്രവർത്തനമില്ലെങ്കിൽ താനേ വിച്ഛേദിക്കുക"), - ("Connection failed due to inactivity", "പ്രവർത്തനമില്ലാത്തതിനാൽ കണക്ഷൻ വിച്ഛേദിച്ചു"), - ("Check for software update on startup", "തുടങ്ങുമ്പോൾ അപ്‌ഡേറ്റ് ഉണ്ടോ എന്ന് പരിശോധിക്കുക"), - ("upgrade_rustdesk_server_pro_to_{}_tip", "സെർവർ പ്രോ {} ലേക്ക് അപ്‌ഗ്രേഡ് ചെയ്യുക"), - ("pull_group_failed_tip", "ഗ്രൂപ്പ് വിവരങ്ങൾ ലഭിക്കുന്നതിൽ പരാജയപ്പെട്ടു"), - ("Filter by intersection", "ഇന്റർസെക്ഷൻ വഴി ഫിൽട്ടർ ചെയ്യുക"), - ("Remove wallpaper during incoming sessions", "കണക്ഷൻ സമയത്ത് വാൾപേപ്പർ മാറ്റുക"), - ("Test", "പരിശോധിക്കുക"), - ("display_is_plugged_out_msg", "ഡിസ്‌പ്ലേ ഊരിയിരിക്കുകയാണ്."), - ("No displays", "ഡിസ്‌പ്ലേകൾ ഇല്ല"), - ("Open in new window", "പുതിയ വിൻഡോയിൽ തുറക്കുക"), - ("Show displays as individual windows", "ഓരോ ഡിസ്‌പ്ലേയും ഓരോ വിൻഡോയായി കാണിക്കുക"), - ("Use all my displays for the remote session", "എല്ലാ ഡിസ്‌പ്ലേകളും ഉപയോഗിക്കുക"), - ("selinux_tip", "SELinux പ്രവർത്തനക്ഷമമാണ്."), - ("Change view", "കാഴ്ച മാറ്റുക"), - ("Big tiles", "വലിയ ടൈലുകൾ"), - ("Small tiles", "ചെറിയ ടൈലുകൾ"), - ("List", "ലിസ്റ്റ്"), - ("Virtual display", "വെർച്വൽ ഡിസ്‌പ്ലേ"), - ("Plug out all", "എല്ലാം ഊരുക"), - ("True color (4:4:4)", "ട്രൂ കളർ (4:4:4)"), - ("Enable blocking user input", "യൂസർ ഇൻപുട്ട് തടയുന്നത് അനുവദിക്കുക"), - ("id_input_tip", "നിങ്ങൾക്ക് ഐഡി, ഏലിയാസ് അല്ലെങ്കിൽ ഐപി നൽകാം."), - ("privacy_mode_impl_mag_tip", "മാഗ്നിഫയർ സ്വകാര്യ മോഡ്"), - ("privacy_mode_impl_virtual_display_tip", "വെർച്വൽ ഡിസ്‌പ്ലേ സ്വകാര്യ മോഡ്"), - ("Enter privacy mode", "സ്വകാര്യ മോഡിലേക്ക് കടക്കുക"), - ("Exit privacy mode", "സ്വകാര്യ മോഡിൽ നിന്ന് പുറത്തുകടക്കുക"), - ("idd_not_support_under_win10_2004_tip", "Windows 10 (2004) എങ്കിലും വേണം."), - ("input_source_1_tip", "ഇൻപുട്ട് സോഴ്സ് 1"), - ("input_source_2_tip", "ഇൻപുട്ട് സോഴ്സ് 2"), - ("Swap control-command key", "Control-Command കീകൾ പരസ്പരം മാറ്റുക"), - ("swap-left-right-mouse", "ഇടത്-വലത് മൗസ് ബട്ടണുകൾ മാറ്റുക"), - ("2FA code", "2FA കോഡ്"), - ("More", "കൂടുതൽ"), - ("enable-2fa-title", "2FA ഓൺ ചെയ്യുക"), - ("enable-2fa-desc", "അതന്റിക്കേറ്റർ ആപ്പ് സജ്ജമാക്കുക."), - ("wrong-2fa-code", "തെറ്റായ 2FA കോഡ്."), - ("enter-2fa-title", "2FA കോഡ് നൽകുക"), - ("Email verification code must be 6 characters.", "ഇമെയിൽ കോഡ് 6 അക്ഷരങ്ങൾ വേണം."), - ("2FA code must be 6 digits.", "2FA കോഡ് 6 അക്കങ്ങൾ വേണം."), - ("Multiple Windows sessions found", "ഒന്നിലധികം വിൻഡോസ് സെഷനുകൾ കണ്ടെത്തി"), - ("Please select the session you want to connect to", "ബന്ധിപ്പിക്കേണ്ട സെഷൻ തിരഞ്ഞെടുക്കുക"), - ("powered_by_me", "ഞാൻ നിർമ്മിച്ചത്"), - ("outgoing_only_desk_tip", "ഇതൊരു ഔട്ട്‌ഗോയിംഗ് മോഡ് മാത്രമാണ്"), - ("preset_password_warning", "സുരക്ഷയ്ക്കായി പാസ്‌വേഡ് മാറ്റുക."), - ("Security Alert", "സുരക്ഷാ മുന്നറിയിപ്പ്"), - ("My address book", "എന്റെ അഡ്രസ് ബുക്ക്"), - ("Personal", "വ്യക്തിഗതം"), - ("Owner", "ഉടമസ്ഥൻ"), - ("Set shared password", "പങ്കിട്ട പാസ്‌വേഡ് സജ്ജമാക്കുക"), - ("Exist in", "നിലവിലുള്ളത്"), - ("Read-only", "വായിക്കാൻ മാത്രം"), - ("Read/Write", "വായിക്കാനും എഴുതാനും"), - ("Full Control", "പൂർണ്ണ നിയന്ത്രണം"), - ("share_warning_tip", "നിങ്ങളുടെ വിവരങ്ങൾ പങ്കിടുകയാണ്."), - ("Everyone", "എല്ലാവരും"), - ("ab_web_console_tip", "വെബ് കൺസോൾ അഡ്രസ് ബുക്ക്"), - ("allow-only-conn-window-open-tip", "RustDesk വിൻഡോ തുറന്നിരിക്കുമ്പോൾ മാത്രം കണക്ഷൻ അനുവദിക്കുക"), - ("no_need_privacy_mode_no_physical_displays_tip", "ഡിസ്‌പ്ലേ ഇല്ലാത്തതിനാൽ സ്വകാര്യ മോഡ് ആവശ്യമില്ല."), - ("Follow remote cursor", "റിമോട്ട് കർസറിനെ പിന്തുടരുക"), - ("Follow remote window focus", "റിമോട്ട് വിൻഡോ ഫോക്കസിനെ പിന്തുടരുക"), - ("default_proxy_tip", "ഡിഫോൾട്ട് പ്രോക്സി ക്രമീകരണം"), - ("no_audio_input_device_tip", "ഓഡിയോ ഇൻപുട്ട് ഉപകരണം കണ്ടെത്തിയില്ല."), - ("Incoming", "വരുന്നവ"), - ("Outgoing", "പോകുന്നവ"), - ("Clear Wayland screen selection", "Wayland സ്ക്രീൻ സെലക്ഷൻ മാറ്റുക"), - ("clear_Wayland_screen_selection_tip", "സ്ക്രീൻ സെലക്ഷൻ റീസെറ്റ് ചെയ്യുക."), - ("confirm_clear_Wayland_screen_selection_tip", "സെലക്ഷൻ മാറ്റണമെന്ന് ഉറപ്പാണോ?"), - ("android_new_voice_call_tip", "പുതിയ വോയിസ് കോൾ അഭ്യർത്ഥന"), - ("texture_render_tip", "ടെക്സ്ചർ റെൻഡറിംഗ് ഉപയോഗിക്കുക"), - ("Use texture rendering", "ടെക്സ്ചർ റെൻഡറിംഗ് ഉപയോഗിക്കുക"), - ("Floating window", "ഫ്ലോട്ടിംഗ് വിൻഡോ"), - ("floating_window_tip", "ബാക്ക്ഗ്രൗണ്ടിലാണെങ്കിലും RustDesk കാണിക്കുക"), - ("Keep screen on", "സ്ക്രീൻ ഓഫ് ആകാതെ വെക്കുക"), - ("Never", "ഒരിക്കലുമില്ല"), - ("During controlled", "നിയന്ത്രിക്കുമ്പോൾ"), - ("During service is on", "സർവീസ് ഓൺ ആയിരിക്കുമ്പോൾ"), - ("Capture screen using DirectX", "DirectX ഉപയോഗിച്ച് സ്ക്രീൻ ക്യാപ്ചർ ചെയ്യുക"), - ("Back", "പുറകോട്ട്"), - ("Apps", "ആപ്പുകൾ"), - ("Volume up", "ശബ്ദം കൂട്ടുക"), - ("Volume down", "ശബ്ദം കുറയ്ക്കുക"), - ("Power", "പവർ"), - ("Telegram bot", "ടെലഗ്രാം ബോട്ട്"), - ("enable-bot-tip", "അറിയിപ്പുകൾക്കായി ബോട്ട് ഓൺ ചെയ്യുക"), - ("enable-bot-desc", "ടെലഗ്രാം ബോട്ട് സജ്ജമാക്കുക."), - ("cancel-2fa-confirm-tip", "2FA റദ്ദാക്കണമെന്ന് ഉറപ്പാണോ?"), - ("cancel-bot-confirm-tip", "ബോട്ട് റദ്ദാക്കണമെന്ന് ഉറപ്പാണോ?"), - ("About RustDesk", "RustDesk-നെ കുറിച്ച്"), - ("Send clipboard keystrokes", "ക്ലിപ്പ്ബോർഡ് കീസ്ട്രോക്കുകൾ അയക്കുക"), - ("network_error_tip", "നെറ്റ്‌വർക്ക് പിശക്, വീണ്ടും ശ്രമിക്കുക."), - ("Unlock with PIN", "പിൻ ഉപയോഗിച്ച് അൺലോക്ക് ചെയ്യുക"), - ("Requires at least {} characters", "കുറഞ്ഞത് {} അക്ഷരങ്ങൾ വേണം"), - ("Wrong PIN", "തെറ്റായ പിൻ"), - ("Set PIN", "പിൻ സജ്ജമാക്കുക"), - ("Enable trusted devices", "വിശ്വസനീയമായ ഉപകരണങ്ങൾ അനുവദിക്കുക"), - ("Manage trusted devices", "വിശ്വസനീയമായ ഉപകരണങ്ങൾ നിയന്ത്രിക്കുക"), - ("Platform", "പ്ലാറ്റ്‌ഫോം"), - ("Days remaining", "ബാക്കിയുള്ള ദിവസങ്ങൾ"), - ("enable-trusted-devices-tip", "വിശ്വസനീയമായവയ്ക്ക് പാസ്‌വേഡ് വേണ്ട"), - ("Parent directory", "പ്രധാന ഡയറക്ടറി"), - ("Resume", "തുടരുക"), - ("Invalid file name", "അസാധുവായ ഫയൽ പേര്"), - ("one-way-file-transfer-tip", "ഒരു വശത്തേക്ക് മാത്രമുള്ള ഫയൽ കൈമാറ്റം"), - ("Authentication Required", "അംഗീകാരം ആവശ്യമാണ്"), - ("Authenticate", "അംഗീകരിക്കുക"), - ("web_id_input_tip", "റിമോട്ട് ഐഡി നൽകുക"), - ("Download", "ഡൗൺലോഡ്"), - ("Upload folder", "ഫോൾഡർ അപ്‌ലോഡ് ചെയ്യുക"), - ("Upload files", "ഫയലുകൾ അപ്‌ലോഡ് ചെയ്യുക"), - ("Clipboard is synchronized", "ക്ലിപ്പ്ബോർഡ് സങ്കലനം ചെയ്തു"), - ("Update client clipboard", "ക്ലയന്റ് ക്ലിപ്പ്ബോർഡ് പുതുക്കുക"), - ("Untagged", "ടാഗ് ചെയ്യാത്തവ"), - ("new-version-of-{}-tip", "{} പുതിയ പതിപ്പ് ലഭ്യമാണ്"), - ("Accessible devices", "ലഭ്യമായ ഉപകരണങ്ങൾ"), - ("upgrade_remote_rustdesk_client_to_{}_tip", "റിമോട്ട് പതിപ്പ് {} ലേക്ക് മാറ്റുക"), - ("d3d_render_tip", "D3D റെൻഡറിംഗ് ഉപയോഗിക്കുക"), - ("Use D3D rendering", ""), - ("Printer", "പ്രിന്റർ"), - ("printer-os-requirement-tip", "പ്രിന്റിംഗിന് വിൻഡോസ് വേണം."), - ("printer-requires-installed-{}-client-tip", "ഇതിന് {} ക്ലയന്റ് ഇൻസ്റ്റാൾ ചെയ്യണം."), - ("printer-{}-not-installed-tip", "പ്രിന്റർ {} ഇൻസ്റ്റാൾ ചെയ്തിട്ടില്ല."), - ("printer-{}-ready-tip", "പ്രിന്റർ {} തയ്യാറാണ്."), - ("Install {} Printer", "{} പ്രിന്റർ ഇൻസ്റ്റാൾ ചെയ്യുക"), - ("Outgoing Print Jobs", "പോകുന്ന പ്രിന്റ് ജോലികൾ"), - ("Incoming Print Jobs", "വരുന്ന പ്രിന്റ് ജോലികൾ"), - ("Incoming Print Job", "വരുന്ന പ്രിന്റ് ജോലി"), - ("use-the-default-printer-tip", "ഡിഫോൾട്ട് പ്രിന്റർ ഉപയോഗിക്കുക"), - ("use-the-selected-printer-tip", "തിഞ്ഞെടുത്ത പ്രിന്റർ ഉപയോഗിക്കുക"), - ("auto-print-tip", "താനേ പ്രിന്റ് ചെയ്യുക"), - ("print-incoming-job-confirm-tip", "പ്രിന്റ് ചെയ്യുന്നതിന് മുൻപ് ചോദിക്കുക"), - ("remote-printing-disallowed-tile-tip", "റിമോട്ട് പ്രിന്റിംഗ് അനുവദനീയമല്ല"), - ("remote-printing-disallowed-text-tip", "സെറ്റിംഗ്സിൽ റിമോട്ട് പ്രിന്റിംഗ് ഓൺ ചെയ്യുക."), - ("save-settings-tip", "സെറ്റിംഗ്സ് സേവ് ചെയ്യുക"), - ("dont-show-again-tip", "വീണ്ടും കാണിക്കരുത്"), - ("Take screenshot", "സ്ക്രീൻഷോട്ട് എടുക്കുക"), - ("Taking screenshot", "സ്ക്രീൻഷോട്ട് എടുക്കുന്നു"), - ("screenshot-merged-screen-not-supported-tip", "മെർജ് ചെയ്ത സ്ക്രീൻഷോട്ട് പിന്തുണയ്ക്കുന്നില്ല."), - ("screenshot-action-tip", "സ്ക്രീൻഷോട്ടിന് ശേഷമുള്ള നടപടി"), - ("Save as", "പേരിൽ സേവ് ചെയ്യുക"), - ("Copy to clipboard", "ക്ലിപ്പ്ബോർഡിലേക്ക് കോപ്പി ചെയ്യുക"), - ("Enable remote printer", "റിമോട്ട് പ്രിന്റർ അനുവദിക്കുക"), - ("Downloading {}", "{} ഡൗൺലോഡ് ചെയ്യുന്നു"), - ("{} Update", "{} അപ്‌ഡേറ്റ്"), - ("{}-to-update-tip", "അപ്‌ഡേറ്റ് ചെയ്യാൻ {}"), - ("download-new-version-failed-tip", "പുതിയ പതിപ്പ് ഡൗൺലോഡ് ചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു."), - ("Auto update", "ഓട്ടോ അപ്‌ഡേറ്റ്"), - ("update-failed-check-msi-tip", "അപ്‌ഡേറ്റ് പരാജയപ്പെട്ടു, MSI ഫയൽ പരിശോധിക്കുക."), - ("websocket_tip", "പോട്ടുകൾ തടഞ്ഞിട്ടുണ്ടെങ്കിൽ WebSocket ഉപയോഗിക്കുക."), - ("Use WebSocket", "WebSocket ഉപയോഗിക്കുക"), - ("Trackpad speed", "ട്രാക്ക്പാഡ് വേഗത"), - ("Default trackpad speed", "സാധാരണ ട്രാക്ക്പാഡ് വേഗത"), - ("Numeric one-time password", "അക്കങ്ങൾ മാത്രമുള്ള OTP"), - ("Enable IPv6 P2P connection", "IPv6 P2P കണക്ഷൻ അനുവദിക്കുക"), - ("Enable UDP hole punching", "UDP ഹോൾ പഞ്ചിംഗ് അനുവദിക്കുക"), - ("View camera", "ക്യാമറ കാണുക"), - ("Enable camera", "ക്യാമറ ഓൺ ചെയ്യുക"), - ("No cameras", "ക്യാമറകൾ കണ്ടെത്തിയില്ല"), - ("view_camera_unsupported_tip", "റിമോട്ട് ക്യാമറ പിന്തുണയ്ക്കുന്നില്ല."), - ("Terminal", "ടെർമിനൽ"), - ("Enable terminal", "ടെർമിനൽ അനുവദിക്കുക"), - ("New tab", "പുതിയ ടാബ്"), - ("Keep terminal sessions on disconnect", "വിച്ഛേദിക്കുമ്പോൾ ടെർമിനൽ സെഷൻ നിർത്തരുത്"), - ("Terminal (Run as administrator)", "ടെർമിനൽ (അഡ്മിനിസ്ട്രേറ്ററായി)"), - ("terminal-admin-login-tip", "അഡ്മിൻ ലോഗിൻ ആവശ്യമാണ്."), - ("Failed to get user token.", "യൂസർ ടോക്കൺ ലഭിക്കുന്നതിൽ പരാജയപ്പെട്ടു."), - ("Incorrect username or password.", "തെറ്റായ യൂസർ നെയിം അല്ലെങ്കിൽ പാസ്‌വേഡ്."), - ("The user is not an administrator.", "ഉപയോക്താവ് അഡ്മിനിസ്ട്രേറ്ററല്ല."), - ("Failed to check if the user is an administrator.", "അഡ്മിൻ ആണോ എന്ന് പരിശോധിക്കുന്നതിൽ പരാജയപ്പെട്ടു."), - ("Supported only in the installed version.", "ഇൻസ്റ്റാൾ ചെയ്ത പതിപ്പിൽ മാത്രം ലഭ്യം."), - ("elevation_username_tip", "അഡ്മിനിസ്ട്രേറ്റർ പേര് നൽകുക"), - ("Preparing for installation ...", "ഇൻസ്റ്റാളേഷനായി ഒരുങ്ങുന്നു..."), - ("Show my cursor", "എന്റെ കർസർ കാണിക്കുക"), - ("Scale custom", "കസ്റ്റം സ്കെയിൽ"), - ("Custom scale slider", "കസ്റ്റം സ്കെയിൽ സ്ലൈഡർ"), - ("Decrease", "കുറയ്ക്കുക"), - ("Increase", "കൂട്ടുക"), - ("Show virtual mouse", "വെർച്വൽ മൗസ് കാണിക്കുക"), - ("Virtual mouse size", "വെർച്വൽ മൗസ് വലിപ്പം"), - ("Small", "ചെറുത്"), - ("Large", "വലുത്"), - ("Show virtual joystick", "വെർച്വൽ ജോയ്സ്റ്റിക് കാണിക്കുക"), - ("Edit note", "കുറിപ്പ് മാറ്റുക"), - ("Alias", "ഏലിയാസ് (Alias)"), - ("ScrollEdge", "സ്ക്രോൾ എഡ്ജ്"), - ("Allow insecure TLS fallback", "സുരക്ഷിതമല്ലാത്ത TLS അനുവദിക്കുക"), - ("allow-insecure-tls-fallback-tip", "പഴയ സെർവറുകൾക്കായി ഉപയോഗിക്കുക."), - ("Disable UDP", "UDP ഒഴിവാക്കുക"), - ("disable-udp-tip", "കണക്ഷൻ പ്രശ്നങ്ങൾക്ക് UDP ഒഴിവാക്കുക."), - ("server-oss-not-support-tip", "OSS സെർവർ ഇത് പിന്തുണയ്ക്കുന്നില്ല."), - ("input note here", "ഇവിടെ കുറിപ്പ് എഴുതുക"), - ("note-at-conn-end-tip", "കണക്ഷൻ കഴിയുമ്പോൾ കുറിപ്പ് കാണിക്കുക"), - ("Show terminal extra keys", "ടെർമിനൽ കീകൾ കാണിക്കുക"), - ("Relative mouse mode", "റിലേറ്റീവ് മൗസ് മോഡ്"), - ("rel-mouse-not-supported-peer-tip", "മറുഭാഗം പിന്തുണയ്ക്കുന്നില്ല."), - ("rel-mouse-not-ready-tip", "തയ്യാറായിട്ടില്ല."), - ("rel-mouse-lock-failed-tip", "മൗസ് ലോക്ക് പരാജയപ്പെട്ടു."), - ("rel-mouse-exit-{}-tip", "പുറത്തുകടക്കാൻ {} അമർത്തുക"), - ("rel-mouse-permission-lost-tip", "അനുമതി നഷ്ടപ്പെട്ടു."), - ("Changelog", "മാറ്റങ്ങൾ (Changelog)"), - ("keep-awake-during-outgoing-sessions-label", "സെഷൻ നടക്കുമ്പോൾ ഉറക്കത്തിലാകരുത്"), - ("keep-awake-during-incoming-sessions-label", "സെഷൻ വരുമ്പോൾ ഉറക്കത്തിലാകരുത്"), - ("Continue with {}", "{} ഉപയോഗിച്ച് തുടരുക"), - ("Display Name", "ഡിസ്‌പ്ലേ പേര്"), - ("password-hidden-tip", "സുരക്ഷയ്ക്കായി പാസ്‌വേഡ് മറച്ചിരിക്കുന്നു."), - ("preset-password-in-use-tip", "പ്രീസെറ്റ് പാസ്‌വേഡ് ഉപയോഗത്തിലാണ്."), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), - ].iter().cloned().collect(); -} diff --git a/src/lang/nb.rs b/src/lang/nb.rs index 9325dfa1f..c2719c86e 100644 --- a/src/lang/nb.rs +++ b/src/lang/nb.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Operativsystempassord"), ("install_tip", "På grunn av UAC kan RustDesk ikke fungere korrekt i enkelte tillfeller på fjernskrivebordet. For å unngå UAC klikker du på knappen nedenfor for å installere RustDesk på systemet"), ("Click to upgrade", "Klikk for å oppgradere"), + ("Click to download", "Klikk for å laste ned"), + ("Click to update", "Klikk for å oppdatere"), ("Configure", "Konfigurer"), ("config_acc", "For å kontrollere ditt skrivebord med fjernstyring må du gi RustDesk \"Access \" Rettigheter."), ("config_screen", "For å kunne få adgang til ditt skrivebord med fjernstyring, må du gi RustDesk \"skjerstøtte \" tillatelser."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Tastaturinnstillinger"), ("Full Access", "Full tilgang"), ("Screen Share", "Skjermdeling"), - ("ubuntu-21-04-required", "Wayland krever Ubuntu version 21.04 eller nyere."), - ("wayland-requires-higher-linux-version", "Wayland krever en nyere versjon av Linux. Prøv X11 desktop eller skift OS."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland krever Ubuntu version 21.04 eller nyere."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland krever en nyere versjon av Linux. Prøv X11 desktop eller skift OS."), ("JumpLink", "JumpLink"), ("Please Select the screen to be shared(Operate on the peer side).", "vennligst velg den skjermen, som skal deles (fjernstyres)."), ("Show RustDesk", "Vis RustDesk"), ("This PC", "Denne PC"), ("or", "eller"), + ("Continue with", "Fortsett med"), ("Elevate", "Elever"), ("Zoom cursor", "Zoom markør"), ("Accept sessions via password", "Aksepter sesjoner via passord"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", ""), ("empty_lan_tip", ""), ("empty_address_book_tip", ""), + ("eg: admin", "f.eks.: admin"), ("Empty Username", "Tøm brukernavn"), ("Empty Password", "Tøm passord"), ("Me", "Meg"), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Fortsett med {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/nl.rs b/src/lang/nl.rs index 55d272666..0d4f6c808 100644 --- a/src/lang/nl.rs +++ b/src/lang/nl.rs @@ -44,7 +44,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("id_change_tip", "Alleen de letters a-z, A-Z, 0-9, - (dash), _ (underscore) kunnen worden gebruikt. De eerste letter moet a-z, A-Z zijn. De lengte moet tussen 6 en 16 liggen."), ("Website", "Website"), ("About", "Over"), - ("Slogan_tip", "Met hart en ziel gemaakt in deze chaotische wereld!"), + ("Slogan_tip", "Met hart gemaakt in deze chaotische wereld!"), ("Privacy Statement", "Privacyverklaring"), ("Mute", "Geluid uit"), ("Build Date", "Datum"), @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "OS Wachtwoord"), ("install_tip", "Door UAC-beperkingen lukt het niet altijd om uw bureaublad op afstand te bedienen. Installeer RustDesk op het systeem om dit probleem te voorkomen."), ("Click to upgrade", "Klik voor upgrade"), + ("Click to download", "Klik om te downloaden"), + ("Click to update", "Klik om bij te werken"), ("Configure", "Configureren"), ("config_acc", "Om uw apparaat op afstand te kunnen bedienen, moet u RustDesk toestemming voor Toegankelijkheid geven."), ("config_screen", "Om uw apparaat op afstand te kunnen bedienen, moet u RustDesk toestemming voor Schermopname geven."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Toetsenbordinstellingen"), ("Full Access", "Volledige Toegang"), ("Screen Share", "Scherm Delen"), - ("ubuntu-21-04-required", "Wayland vereist Ubuntu 21.04 of hoger."), - ("wayland-requires-higher-linux-version", "Wayland vereist een hogere versie van Linux distro. Probeer X11 desktop of verander van OS."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland vereist Ubuntu 21.04 of hoger."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland vereist een hogere versie van Linux distro. Probeer X11 desktop of verander van OS."), ("JumpLink", "JumpLink"), ("Please Select the screen to be shared(Operate on the peer side).", "Selecteer het scherm dat moet worden gedeeld (Bediening aan de kant van de peer)."), ("Show RustDesk", "Toon RustDesk"), ("This PC", "Deze PC"), ("or", "of"), + ("Continue with", "Ga verder met"), ("Elevate", "Verhoog"), ("Zoom cursor", "Zoom cursor"), ("Accept sessions via password", "Sessies accepteren via wachtwoord"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Nog geen favoriete stations op afstand? Laat ons iemand vinden om mee te verbinden en voeg hem toe aan uw favorieten!"), ("empty_lan_tip", "Oh nee, het lijkt erop dat we nog geen extern station hebben ontdekt."), ("empty_address_book_tip", "Oh jee, het lijkt erop dat er momenteel geen externe stations in uw adresboek staan."), + ("eg: admin", "bijvoorbeeld: admin"), ("Empty Username", "Gebruikersnaam Leeg"), ("Empty Password", "Wachtwoord Leeg"), ("Me", "Ik"), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", "Terminal inschakelen"), ("New tab", "Nieuw tabblad"), ("Keep terminal sessions on disconnect", "Terminalsessies bij verbreking van de verbinding behouden"), - ("Terminal (Run as administrator)", "Terminal (Als administrator uitvoeren)"), - ("terminal-admin-login-tip", "Voer de gebruikersnaam en het wachtwoord in van de beheerder van het gecontroleerde apparaat."), - ("Failed to get user token.", "Kan geen gebruikerstoken krijgen."), - ("Incorrect username or password.", "Foutieve gebruikersnaam of wachtwoord."), - ("The user is not an administrator.", "De gebruiker is geen beheerder."), - ("Failed to check if the user is an administrator.", "Fout bij het controleren of de gebruiker een beheerder is."), - ("Supported only in the installed version.", "Alleen ondersteund in de geïnstalleerde versie."), - ("elevation_username_tip", "Voer je gebruikersnaam of domeinnaam in"), - ("Preparing for installation ...", "Installatie voorbereiden ..."), - ("Show my cursor", "Toon mijn cursor"), - ("Scale custom", "Aangepaste schaal"), - ("Custom scale slider", "Aangepaste schuifregelaar voor schaal"), - ("Decrease", "Verlagen"), - ("Increase", "Verhogen"), - ("Show virtual mouse", "Virtuele muis weergeven"), - ("Virtual mouse size", "Virtuele muis grootte"), - ("Small", "Klein"), - ("Large", "Groot"), - ("Show virtual joystick", "Virtuele joystick weergeven"), - ("Edit note", "Opmerking bewerken"), - ("Alias", "Alias"), - ("ScrollEdge", "Schuifbalk"), - ("Allow insecure TLS fallback", "Onbeveiligde TLS-terugval toestaan"), - ("allow-insecure-tls-fallback-tip", "Standaard controleert RustDesk het certificaat van de server bij het gebruik van protocollen die TLS gebruiken. Wanneer deze optie is ingeschakeld, laat RustDesk verbindingen toe, zelfs als de verificatiestap mislukt."), - ("Disable UDP", "UDP uitschakelen"), - ("disable-udp-tip", "Controleert of alleen TCP moet worden gebruikt. Als deze optie is ingeschakeld, gebruikt RustDesk niet langer UDP 21116, maar TCP 21116."), - ("server-oss-not-support-tip", "Opmerking: Deze functie is niet beschikbaar in de open-sourceversie van de RustDesk-server."), - ("input note here", "voeg hier een opmerking toe"), - ("note-at-conn-end-tip", "Vraag om een opmerking aan het einde van de verbinding"), - ("Show terminal extra keys", "Toon extra toetsen voor terminal"), - ("Relative mouse mode", "Relatieve muismodus"), - ("rel-mouse-not-supported-peer-tip", "De relatieve muismodus wordt niet ondersteund door het externe apparaat."), - ("rel-mouse-not-ready-tip", "De relatieve muismodus was nog niet klaar, probeer het later opnieuw."), - ("rel-mouse-lock-failed-tip", "Het vergrendelen van de cursor is mislukt. De relatieve muismodus is uitgeschakeld."), - ("rel-mouse-exit-{}-tip", "Druk op {} om af te sluiten."), - ("rel-mouse-permission-lost-tip", "De toetsenbordcontrole is uitgeschakeld. De relatieve muismodus is uitgeschakeld."), - ("Changelog", "Wijzigingenlogboek"), - ("keep-awake-during-outgoing-sessions-label", "Houd het scherm open tijdens de uitgaande sessies."), - ("keep-awake-during-incoming-sessions-label", "Houd het scherm open tijdens de inkomende sessies."), - ("Continue with {}", "Ga verder met {}"), - ("Display Name", "Naam Weergeven"), - ("password-hidden-tip", "Er is een permanent wachtwoord ingesteld (verborgen)."), - ("preset-password-in-use-tip", "Het basis wachtwoord is momenteel in gebruik."), - ("Enable privacy mode", "Privacymodus inschakelen"), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/pl.rs b/src/lang/pl.rs index fdf4ae8c5..93b328f0a 100644 --- a/src/lang/pl.rs +++ b/src/lang/pl.rs @@ -13,7 +13,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Service is running", "Usługa uruchomiona"), ("Service is not running", "Usługa nie jest uruchomiona"), ("not_ready_status", "Brak gotowości"), - ("Control Remote Desktop", "Steruj pulpitem zdalnym"), + ("Control Remote Desktop", "Połącz się z"), ("Transfer file", "Transfer plików"), ("Connect", "Połącz"), ("Recent sessions", "Ostatnie sesje"), @@ -75,7 +75,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Do you want to enter again?", "Czy chcesz wprowadzić ponownie?"), ("Connection Error", "Błąd połączenia"), ("Error", "Błąd"), - ("Reset by the peer", "Połączenie zresetowane przez zdalne urządzenie"), + ("Reset by the peer", "Połączenie zresetowanie przez zdalne urządzenie"), ("Connecting...", "Łączenie..."), ("Connection in progress. Please wait.", "Trwa łączenie. Proszę czekać."), ("Please try 1 minute later", "Spróbuj za minutę"), @@ -120,7 +120,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Original", "Oryginalny"), ("Shrink", "Zmniejsz"), ("Stretch", "Rozciągnij"), - ("Scrollbar", "Pasek przewijania"), + ("Scrollbar", "Przewijanie ręczne"), ("ScrollAuto", "Przewijanie automatyczne"), ("Good image quality", "Wysoka jakość obrazu"), ("Balanced", "Tryb zbalansowany"), @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Hasło systemu operacyjnego"), ("install_tip", "RustDesk może nie działać poprawnie na maszynie zdalnej z przyczyn związanych z UAC. W celu uniknięcia problemów z UAC, kliknij poniższy przycisk by zainstalować RustDesk w swoim systemie."), ("Click to upgrade", "Zaktualizuj"), + ("Click to download", "Pobierz"), + ("Click to update", "Uaktualnij"), ("Configure", "Konfiguruj"), ("config_acc", "Konfiguracja konta"), ("config_screen", "Konfiguracja ekranu"), @@ -161,7 +163,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("End-user license agreement", "Umowa licencyjna użytkownika końcowego"), ("Generating ...", "Trwa generowanie..."), ("Your installation is lower version.", "Twoja instalacja jest w niższej wersji"), - ("not_close_tcp_tip", "Podczas korzystania z tunelowania, nie zamykaj tego okna."), + ("not_close_tcp_tip", "Podczas korzystanie z tunelowania, nie zamykaj tego okna."), ("Listening ...", "Nasłuchiwanie..."), ("Remote Host", "Host zdalny"), ("Remote Port", "Port zdalny"), @@ -198,7 +200,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Fix it", "Napraw to"), ("Warning", "Ostrzeżenie"), ("Login screen using Wayland is not supported", "Ekran logowania korzystający z Wayland nie jest obsługiwany"), - ("Reboot required", "Wymagane ponowne uruchomienie"), + ("Reboot required", "Wymagany ponowne uruchomienie"), ("Unsupported display server", "Nieobsługiwany serwer wyświetlania"), ("x11 expected", "Wymagany jest X11"), ("Port", "Port"), @@ -225,7 +227,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Add Tag", "Dodaj Tag"), ("Unselect all tags", "Odznacz wszystkie tagi"), ("Network error", "Błąd sieci"), - ("Username missed", "Nieprawidłowa nazwa użytkownika"), + ("Username missed", "Nieprawidłowe nazwa użytkownika"), ("Password missed", "Nieprawidłowe hasło"), ("Wrong credentials", "Błędne dane uwierzytelniające"), ("The verification code is incorrect or has expired", "Kod weryfikacyjny jest niepoprawny lub wygasł"), @@ -265,7 +267,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No permission of file transfer", "Brak uprawnień na przesyłanie plików"), ("Note", "Notatka"), ("Connection", "Połączenie"), - ("Share screen", "Udostępnianie ekranu"), + ("Share screen", "Udostępnij ekran"), ("Chat", "Czat"), ("Total", "Łącznie"), ("items", "elementów"), @@ -314,10 +316,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable remote restart", "Włącz zdalne restartowanie"), ("Restart remote device", "Zrestartuj zdalne urządzenie"), ("Are you sure you want to restart", "Czy na pewno uruchomić ponownie"), - ("Restarting remote device", "Trwa restartowanie zdalnego urządzenia"), + ("Restarting remote device", "Trwa restartowanie Zdalnego Urządzenia"), ("remote_restarting_tip", "Trwa ponownie uruchomienie zdalnego urządzenia, zamknij ten komunikat i ponownie nawiąż za chwilę połączenie używając hasła permanentnego"), ("Copied", "Skopiowano"), - ("Exit Fullscreen", "Wyłącz tryb pełnoekranowy"), + ("Exit Fullscreen", "Wyłączyć tryb pełnoekranowy"), ("Fullscreen", "Tryb pełnoekranowy"), ("Mobile Actions", "Dostępne mobilne polecenia"), ("Select Monitor", "Wybierz ekran"), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Ustawienia klawiatury"), ("Full Access", "Pełny dostęp"), ("Screen Share", "Udostępnianie ekranu"), - ("ubuntu-21-04-required", "Wayland wymaga Ubuntu 21.04 lub nowszego."), - ("wayland-requires-higher-linux-version", "Wayland wymaga nowszej dystrybucji Linuksa. Wypróbuj pulpit X11 lub zmień system operacyjny."), - ("xdp-portal-unavailable", "Nie udało się przechwycić ekranu Wayland. Portal XDG Desktop mógł ulec awarii lub jest niedostępny. Spróbuj go ponownie uruchomić poleceniem `systemctl --user restart xdg-desktop-portal`."), - ("JumpLink", "Podgląd"), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland wymaga Ubuntu 21.04 lub nowszego."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland wymaga nowszej dystrybucji Linuksa. Wypróbuj pulpit X11 lub zmień system operacyjny."), + ("JumpLink", "View"), ("Please Select the screen to be shared(Operate on the peer side).", "Wybierz ekran do udostępnienia (działaj po zdalnego urządzenia)."), ("Show RustDesk", "Pokaż RustDesk"), ("This PC", "Ten komputer"), ("or", "lub"), + ("Continue with", "Kontynuuj z"), ("Elevate", "Uzyskaj uprawnienia"), ("Zoom cursor", "Powiększenie kursora"), ("Accept sessions via password", "Uwierzytelnij sesję używając hasła"), @@ -403,13 +405,13 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Add to address book", "Dodaj do Książki Adresowej"), ("Group", "Grupy"), ("Search", "Szukaj"), - ("Closed manually by web console", "Zakończone ręcznie z poziomu konsoli webowej"), + ("Closed manually by web console", "Zakończone manualnie z konsoli Web"), ("Local keyboard type", "Lokalny typ klawiatury"), ("Select local keyboard type", "Wybierz lokalny typ klawiatury"), ("software_render_tip", "Jeżeli posiadasz kartę graficzną Nvidia i okno zamyka się natychmiast po nawiązaniu połączenia, instalacja sterownika nouveau i wybór renderowania programowego mogą pomóc. Restart aplikacji jest wymagany."), ("Always use software rendering", "Zawsze używaj renderowania programowego"), ("config_input", "By kontrolować zdalne urządzenie przy pomocy klawiatury, musisz udzielić aplikacji RustDesk uprawnień do \"Urządzeń Wejściowych\"."), - ("config_microphone", "Aby umożliwić zdalne rozmowy należy przyznać RustDesk uprawnienia do \"Nagrań audio\"."), + ("config_microphone", "Aby umożliwić zdalne rozmowy należy przyznać RuskDesk uprawnienia do \"Nagrań audio\"."), ("request_elevation_tip", "Możesz poprosić o podniesienie uprawnień jeżeli ktoś posiada dostęp do zdalnego urządzenia."), ("Wait", "Czekaj"), ("Elevation Error", "Błąd przy podnoszeniu uprawnień"), @@ -459,8 +461,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Brak ulubionych?\nZnajdźmy kogoś, z kim możesz się połączyć i dodaj Go do ulubionych!"), ("empty_lan_tip", "Ojej, wygląda na to, że nie odkryliśmy żadnych urządzeń z RustDesk w Twojej sieci."), ("empty_address_book_tip", "Ojej, wygląda na to, że nie ma żadnych wpisów w Twojej książce adresowej."), - ("Empty Username", "Pole nazwy użytkownika jest puste"), - ("Empty Password", "Pole hasła jest puste"), + ("eg: admin", "np. admin"), + ("Empty Username", "Pusty użytkownik"), + ("Empty Password", "Puste hasło"), ("Me", "Ja"), ("identical_file_tip", "Ten plik jest identyczny z plikiem na drugim komputerze."), ("show_monitors_tip", "Pokaż monitory w zasobniku"), @@ -696,54 +699,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable camera", "Włącz kamerę"), ("No cameras", "Brak kamer"), ("view_camera_unsupported_tip", "Zdalne urządzenie nie obsługuje podglądu kamery."), - ("Terminal", "Terminal"), - ("Enable terminal", "Włącz terminal"), - ("New tab", "Nowa zakładka"), - ("Keep terminal sessions on disconnect", "Utrzymaj sesję terminala przy rozłączeniu"), - ("Terminal (Run as administrator)", "Terminal (uruchom jako administrator)"), - ("terminal-admin-login-tip", "Proszę wprowadzić użytkownika i hasło administratora kontrolowanego urządzenia."), - ("Failed to get user token.", "Błąd pobierania tokenu użytkownika."), - ("Incorrect username or password.", "Nieprawidłowy użytkownik lub hasło."), - ("The user is not an administrator.", "Użytkownik nie posiada praw administratora."), - ("Failed to check if the user is an administrator.", "Błąd sprawdzania, czy użytkownik jest administratorem."), - ("Supported only in the installed version.", "Wspierane tylko dla zainstalowanej aplikacji."), - ("elevation_username_tip", "Podaj nazwę użytkownika lub domena\\użytkownik"), - ("Preparing for installation ...", "Przygotowywanie do instalacji ..."), - ("Show my cursor", "Pokaż mój kursor"), - ("Scale custom", "Skala użytkownika"), - ("Custom scale slider", "Suwak skali użytkownika"), - ("Decrease", "Zmniejsz"), - ("Increase", "Zwiększ"), - ("Show virtual mouse", "Pokaż wirtualną mysz"), - ("Virtual mouse size", "Wielkość wirtualnego kursora myszy"), - ("Small", "Mały"), - ("Large", "Duży"), - ("Show virtual joystick", "Pokaz wirtualny joystick"), - ("Edit note", "Edytuj notatkę"), - ("Alias", "Alias"), - ("ScrollEdge", "Przewijanie na krawędzi"), - ("Allow insecure TLS fallback", "Zezwól na nie zweryfikowane połączenia TLS"), - ("allow-insecure-tls-fallback-tip", "Domyślnie RustDesk weryfikuje certyfikat serwera dla protokołów korzystających z TLS.\n Po włączeniu tej opcji, RustDesk pominie etap weryfikacji i będzie kontynuował działanie w przypadku negatywnej weryfikacji."), - ("Disable UDP", "Wyłącz protokół UDP"), - ("disable-udp-tip", "Kontroluje, czy używać wyłącznie protokołu TCP.\nPo włączeniu tej opcji, RustDesk nie będzie używać protokołu UDP 21116, zamiast niego będzie używać protokołu TCP 21116."), - ("server-oss-not-support-tip", "UWAGA: Serwer OSS RustDesk nie obsługuje tej funkcji."), - ("input note here", "Wstaw tutaj notatkę"), - ("note-at-conn-end-tip", "Poproś o notatkę po zakończeniu połączenia."), - ("Show terminal extra keys", "Pokaż dodatkowe klawisze terminala"), - ("Relative mouse mode", "Tryb przechwytywania myszy"), - ("rel-mouse-not-supported-peer-tip", "Zdalne urządzenie nie obsługuje trybu przechwytywania myszy"), - ("rel-mouse-not-ready-tip", "Tryb przechwytywania myszy nie jest gotowy"), - ("rel-mouse-lock-failed-tip", "Nie udało się przechwycić kursora myszy"), - ("rel-mouse-exit-{}-tip", "Aby wyłączyć tryb przechwytywania myszy, naciśnij {}"), - ("rel-mouse-permission-lost-tip", "Utracono uprawnienia do trybu przechwytywania myszy"), - ("Changelog", "Dziennik zmian"), - ("keep-awake-during-outgoing-sessions-label", "Utrzymuj urządzenie w stanie aktywnym podczas sesji wychodzących"), - ("keep-awake-during-incoming-sessions-label", "Utrzymuj urządzenie w stanie aktywnym podczas sesji przychodzących"), - ("Continue with {}", "Kontynuuj z {}"), - ("Display Name", "Nazwa wyświetlana"), - ("password-hidden-tip", "Ustawiono (ukryto) stare hasło."), - ("preset-password-in-use-tip", "Obecnie używane jest hasło domyślne."), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/pt_PT.rs b/src/lang/pt_PT.rs index 4138b46e4..c4fc78187 100644 --- a/src/lang/pt_PT.rs +++ b/src/lang/pt_PT.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Senha do SO"), ("install_tip", "Devido ao UAC, o RustDesk não funciona correctamente em alguns casos. Para evitar o UAC, por favor clique no botão abaixo para instalar o RustDesk no sistema."), ("Click to upgrade", "Clique para atualizar"), + ("Click to download", "Clique para carregar"), + ("Click to update", "Clique para fazer a actualização"), ("Configure", "Configurar"), ("config_acc", "Para controlar o seu Ambiente de Trabalho remotamente, é preciso conceder ao RustDesk permissões de \"Acessibilidade\"."), ("config_screen", "Para aceder ao seu Ambiente de Trabalho remotamente, é preciso conceder ao RustDesk permissões de \"Gravar a Tela\"/"), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Configurações do teclado"), ("Full Access", "Controlo total"), ("Screen Share", ""), - ("ubuntu-21-04-required", "Wayland requer Ubuntu 21.04 ou versão superior."), - ("wayland-requires-higher-linux-version", "Wayland requer uma versão superior da distribuição linux. Por favor, tente o desktop X11 ou mude seu sistema operacional."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland requer Ubuntu 21.04 ou versão superior."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland requer uma versão superior da distribuição linux. Por favor, tente o desktop X11 ou mude seu sistema operacional."), ("JumpLink", "View"), ("Please Select the screen to be shared(Operate on the peer side).", "Por favor, selecione a tela a ser compartilhada (operar no lado do peer)."), ("Show RustDesk", ""), ("This PC", ""), ("or", ""), + ("Continue with", ""), ("Elevate", ""), ("Zoom cursor", ""), ("Accept sessions via password", ""), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", ""), ("empty_lan_tip", ""), ("empty_address_book_tip", ""), + ("eg: admin", ""), ("Empty Username", ""), ("Empty Password", ""), ("Me", ""), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", "Escala personalizada"), - ("Custom scale slider", "Controlo deslizante de escala personalizada"), - ("Decrease", "Diminuir"), - ("Increase", "Aumentar"), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", ""), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs index 1428a71d0..1a715121d 100644 --- a/src/lang/ptbr.rs +++ b/src/lang/ptbr.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Senha do SO"), ("install_tip", "Devido ao UAC, o RustDesk não funciona corretamente como o lado remoto em alguns casos. Para evitar o UAC, por favor clique no botão abaixo para instalar o RustDesk no sistema."), ("Click to upgrade", "Clique para fazer o upgrade"), + ("Click to download", "Clique para baixar"), + ("Click to update", "Clique para fazer o update"), ("Configure", "Configurar"), ("config_acc", "Para controlar seu computador remotamente, você precisa conceder ao RustDesk permissões de \"Acessibilidade\"."), ("config_screen", "Para acessar seu computador remotamente, você precisa conceder ao RustDesk permissões de \"Gravar a Tela\"/"), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Configurações de teclado"), ("Full Access", "Acesso completo"), ("Screen Share", "Compartilhamento de tela"), - ("ubuntu-21-04-required", "Wayland requer Ubuntu 21.04 ou versão superior."), - ("wayland-requires-higher-linux-version", "Wayland requer uma versão superior da distribuição linux. Por favor, tente o desktop X11 ou mude seu sistema operacional."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland requer Ubuntu 21.04 ou versão superior."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland requer uma versão superior da distribuição linux. Por favor, tente o desktop X11 ou mude seu sistema operacional."), ("JumpLink", "JumpLink"), ("Please Select the screen to be shared(Operate on the peer side).", "Por favor, selecione a tela a ser compartilhada (operar no lado do parceiro)."), ("Show RustDesk", "Exibir RustDesk"), ("This PC", "Este Computador"), ("or", "ou"), + ("Continue with", "Continuar com"), ("Elevate", "Elevar"), ("Zoom cursor", "Aumentar cursor"), ("Accept sessions via password", "Aceitar sessões via senha"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Ainda não há parceiros favoritos?\nVamos encontrar alguém para se conectar e adicioná-lo aos seus favoritos!"), ("empty_lan_tip", "Ah não, parece que ainda não descobrimos nenhum parceiro."), ("empty_address_book_tip", "Oh céus, parece que atualmente não há parceiros listados em seu catálogo de endereços."), + ("eg: admin", "ex. admin"), ("Empty Username", "Nome de Usuário vazio"), ("Empty Password", "Senha Vazia"), ("Me", "Eu"), @@ -672,78 +675,33 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remote-printing-disallowed-text-tip", "As configurações do dispositivo controlado não permitem impressão remota."), ("save-settings-tip", "Salvar configurações"), ("dont-show-again-tip", "Não mostrar novamente"), - ("Take screenshot", "Capturar de tela"), - ("Taking screenshot", "Capturando tela"), - ("screenshot-merged-screen-not-supported-tip", "Mesclar a captura de tela de múltiplos monitores não é suportada no momento. Por favor, alterne para um único monitor e tente novamente."), - ("screenshot-action-tip", "Por favor, selecione como seguir com a captura de tela."), - ("Save as", "Salvar como"), - ("Copy to clipboard", "Copiar para área de transferência"), - ("Enable remote printer", "Habilitar impressora remota"), - ("Downloading {}", "Baixando {}"), - ("{} Update", "Atualização do {}"), - ("{}-to-update-tip", "{} será fechado agora para instalar a nova versão."), - ("download-new-version-failed-tip", "Falha no download. Você pode tentar novamente ou clicar no botão \"Download\" para baixar da página releases e atualizar manualmente."), - ("Auto update", "Atualização automática"), - ("update-failed-check-msi-tip", "Falha na verificação do método de instalação. Clique no botão \"Download\" para baixar da página releases e atualizar manualmente."), - ("websocket_tip", "Usando WebSocket, apenas conexões via relay são suportadas."), - ("Use WebSocket", "Usar WebSocket"), - ("Trackpad speed", "Velocidade do trackpad"), - ("Default trackpad speed", "Velocidade padrão do trackpad"), - ("Numeric one-time password", "Senha numérica de uso único"), - ("Enable IPv6 P2P connection", "Habilitar conexão IPv6 P2P"), - ("Enable UDP hole punching", "Habilitar UDP hole punching"), + ("Take screenshot", ""), + ("Taking screenshot", ""), + ("screenshot-merged-screen-not-supported-tip", ""), + ("screenshot-action-tip", ""), + ("Save as", ""), + ("Copy to clipboard", ""), + ("Enable remote printer", ""), + ("Downloading {}", ""), + ("{} Update", ""), + ("{}-to-update-tip", ""), + ("download-new-version-failed-tip", ""), + ("Auto update", ""), + ("update-failed-check-msi-tip", ""), + ("websocket_tip", ""), + ("Use WebSocket", ""), + ("Trackpad speed", ""), + ("Default trackpad speed", ""), + ("Numeric one-time password", ""), + ("Enable IPv6 P2P connection", ""), + ("Enable UDP hole punching", ""), ("View camera", "Visualizar câmera"), ("Enable camera", "Ativar câmera"), ("No cameras", "Sem câmeras"), ("view_camera_unsupported_tip", "O dispositivo remoto não suporta visualização da câmera."), - ("Terminal", "Terminal"), - ("Enable terminal", "Habilitar Terminal"), - ("New tab", "Nova aba"), - ("Keep terminal sessions on disconnect", "Manter sessões de terminal ao desconectar"), - ("Terminal (Run as administrator)", "Terminal (Executar como administrador)"), - ("terminal-admin-login-tip", "Insira o nome do usuário e senha de administrador do dispositivo controlado."), - ("Failed to get user token.", "Falha ao obter token do usuário."), - ("Incorrect username or password.", "Usuário ou senha incorretos"), - ("The user is not an administrator.", "O usuário não é administrador"), - ("Failed to check if the user is an administrator.", "Falha ao verificar se o usuário é administrador"), - ("Supported only in the installed version.", "Funciona somente na versão instalada"), - ("elevation_username_tip", "Insira o nome do usuário ou domínio\\usuário"), - ("Preparing for installation ...", "Preparando para instalação ..."), - ("Show my cursor", "Mostrar meu cursor"), - ("Scale custom", "Escala personalizada"), - ("Custom scale slider", "Controle deslizante de escala personalizada"), - ("Decrease", "Diminuir"), - ("Increase", "Aumentar"), - ("Show virtual mouse", "Mostrar mouse virtual"), - ("Virtual mouse size", "Tamanho do mouse virtual"), - ("Small", "Pequeno"), - ("Large", "Grande"), - ("Show virtual joystick", "Mostrar joystick virtual"), - ("Edit note", "Editar nota"), - ("Alias", "Apelido"), - ("ScrollEdge", "Rolagem nas bordas"), - ("Allow insecure TLS fallback", "Permitir fallback TLS inseguro"), - ("allow-insecure-tls-fallback-tip", "Por padrão, o RustDesk verifica o certificado do servidor para protocolos que usam TLS.\nCom esta opção habilitada, o RustDesk ignorará a verificação e prosseguirá em caso de falha."), - ("Disable UDP", "Desabilitar UDP"), - ("disable-udp-tip", "Controla se deve usar somente TCP.\nCom esta opção habilitada, o RustDesk não usará mais UDP 21116, TCP 21116 será usado no lugar."), - ("server-oss-not-support-tip", "NOTA: O servidor RustDesk OSS não inclui este recurso."), - ("input note here", "Insira uma nota aqui"), - ("note-at-conn-end-tip", "Solicitar nota ao final da conexão"), - ("Show terminal extra keys", "Mostrar teclas extras do terminal"), - ("Relative mouse mode", "Modo de Mouse Relativo"), - ("rel-mouse-not-supported-peer-tip", "O Modo de Mouse Relativo não é suportado pelo parceiro conectado."), - ("rel-mouse-not-ready-tip", "O Modo de Mouse Relativo ainda não está pronto. Por favor, tente novamente."), - ("rel-mouse-lock-failed-tip", "Falha ao bloquear o cursor. O Modo de Mouse Relativo foi desabilitado."), - ("rel-mouse-exit-{}-tip", "Pressione {} para sair."), - ("rel-mouse-permission-lost-tip", "Permissão de teclado revogada. O Modo Mouse Relativo foi desabilitado."), - ("Changelog", "Registro de alterações"), - ("keep-awake-during-outgoing-sessions-label", "Manter tela ativa durante sessões de saída"), - ("keep-awake-during-incoming-sessions-label", "Manter tela ativa durante sessões de entrada"), - ("Continue with {}", "Continuar com {}"), - ("Display Name", "Nome de Exibição"), - ("password-hidden-tip", "A senha permanente está definida como (oculta)."), - ("preset-password-in-use-tip", "A senha predefinida está sendo usada."), - ("Enable privacy mode", "Habilitar modo de privacidade"), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ro.rs b/src/lang/ro.rs index bde4a4201..41d86baab 100644 --- a/src/lang/ro.rs +++ b/src/lang/ro.rs @@ -62,7 +62,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Invalid format", "Format nevalid"), ("server_not_support", "Încă nu este compatibil cu serverul"), ("Not available", "Indisponibil"), - ("Too frequent", "Prea frecvent"), + ("Too frequent", "Modificat prea frecvent"), ("Cancel", "Anulează"), ("Skip", "Omite"), ("Close", "Închide"), @@ -87,7 +87,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Modified", "Modificat"), ("Size", "Dimensiune"), ("Show Hidden Files", "Afișează fișiere ascunse"), - ("Receive", "Primește"), + ("Receive", "Acceptă"), ("Send", "Trimite"), ("Refresh File", "Actualizează fișier"), ("Local", "Local"), @@ -108,7 +108,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Do this for all conflicts", "Aplică la toate conflictele"), ("This is irreversible!", "Această acțiune este ireversibilă!"), ("Deleting", "În curs de ștergere..."), - ("files", "fișiere"), + ("files", "fișier"), ("Waiting", "În așteptare..."), ("Finished", "Finalizat"), ("Speed", "Viteză"), @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Parolă sistem"), ("install_tip", "Din cauza restricțiilor CCU, este posibil ca RustDesk să nu funcționeze corespunzător. Pentru a evita acest lucru, dă clic pe butonul de mai jos pentru a instala RustDesk."), ("Click to upgrade", "Dă clic pentru a face upgrade"), + ("Click to download", "Dă clic pentru a descărca"), + ("Click to update", "Dă clic pentru a actualiza"), ("Configure", "Configurează"), ("config_acc", "Pentru a controla desktopul la distanță, trebuie să permiți RustDesk acces la setările de Accesibilitate."), ("config_screen", "Pentru a controla desktopul la distanță, trebuie să permiți RustDesk acces la setările de Înregistrare ecran."), @@ -203,7 +205,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("x11 expected", "Este necesar X11"), ("Port", "Port"), ("Settings", "Setări"), - ("Username", "Nume utilizator"), + ("Username", " Nume utilizator"), ("Invalid port", "Port nevalid"), ("Closed manually by the peer", "Conexiune închisă manual de dispozitivul pereche"), ("Enable remote configuration modification", "Activează modificarea configurației de la distanță"), @@ -216,7 +218,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Remember me", "Reține-mă"), ("Trust this device", "Acest dispozitiv este de încredere"), ("Verification code", "Cod de verificare"), - ("verification_tip", "Introdu codul de verificare trimis la adresa ta de e-mail sau generat de aplicația de autentificare."), + ("verification_tip", ""), ("Logout", "Deconectează-te"), ("Tags", "Etichete"), ("Search ID", "Caută după ID"), @@ -228,9 +230,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Username missed", "Lipsește numele de utilizator"), ("Password missed", "Lipsește parola"), ("Wrong credentials", "Nume sau parolă greșită"), - ("The verification code is incorrect or has expired", "Codul de verificare este incorect sau a expirat"), + ("The verification code is incorrect or has expired", ""), ("Edit Tag", "Modifică etichetă"), - ("Forget Password", "Parolă uitată"), + ("Forget Password", "Uită parola"), ("Favorites", "Favorite"), ("Add to Favorites", "Adaugă la Favorite"), ("Remove from Favorites", "Șterge din Favorite"), @@ -263,7 +265,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Canvas Zoom", "Mărire ecran"), ("Reset canvas", "Reinițializează ecranul"), ("No permission of file transfer", "Nicio permisiune pentru transferul de fișiere"), - ("Note", "Notă"), + ("Note", "Reține"), ("Connection", "Conexiune"), ("Share screen", "Partajează ecran"), ("Chat", "Mesaje"), @@ -276,14 +278,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Do you accept?", "Accepți?"), ("Open System Setting", "Deschide setări sistem"), ("How to get Android input permission?", "Cum autorizez dispozitive de intrare pe Android?"), - ("android_input_permission_tip1", "Pentru ca un dispozitiv la distanță să poată controla un dispozitiv Android folosind mouse-ul sau suportul tactil, trebuie să permiți RustDesk să utilizeze serviciul „Accesibilitate\"."), + ("android_input_permission_tip1", "Pentru ca un dispozitiv la distanță să poată controla un dispozitiv Android folosind mouse-ul sau suportul tactil, trebuie să permiți RustDesk să utilize serviciul „Accesibilitate”."), ("android_input_permission_tip2", "Accesează următoarea pagină din Setări, deschide [Aplicații instalate] și pornește serviciul [RustDesk Input]."), ("android_new_connection_tip", "Ai primit o nouă solicitare de controlare a dispozitivului actual."), ("android_service_will_start_tip", "Activarea setării de capturare a ecranului va porni automat serviciul, permițând altor dispozitive să solicite conectarea la dispozitivul tău."), ("android_stop_service_tip", "Închiderea serviciului va închide automat toate conexiunile stabilite."), ("android_version_audio_tip", "Versiunea actuală de Android nu suportă captura audio. Fă upgrade la Android 10 sau la o versiune superioară."), ("android_start_service_tip", "Apasă [Pornește serviciu] sau DESCHIDE [Capturare ecran] pentru a porni serviciul de partajare a ecranului."), - ("android_permission_may_not_change_tip", "Este posibil ca unele permisiuni să nu poată fi modificate în funcție de versiunea de Android."), + ("android_permission_may_not_change_tip", ""), ("Account", "Cont"), ("Overwrite", "Suprascrie"), ("This file exists, skip or overwrite this file?", "Fișier deja existent. Omite sau suprascrie?"), @@ -304,15 +306,15 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("android_open_battery_optimizations_tip", "Pentru dezactivarea acestei funcții, accesează setările aplicației RustDesk, deschide secțiunea [Baterie] și deselectează [Fără restricții]."), ("Start on boot", "Pornește la boot"), ("Start the screen sharing service on boot, requires special permissions", "Pornește serviciul de partajare a ecranului la boot; necesită permisiuni speciale"), - ("Connection not allowed", "Conexiune neautorizată"), + ("Connection not allowed", "Conexiune neautoriztă"), ("Legacy mode", "Mod legacy"), ("Map mode", "Mod hartă"), ("Translate mode", "Mod traducere"), ("Use permanent password", "Folosește parola permanentă"), - ("Use both passwords", "Folosește ambele parole"), + ("Use both passwords", "Folosește ambele programe"), ("Set permanent password", "Setează parola permanentă"), ("Enable remote restart", "Activează repornirea la distanță"), - ("Restart remote device", "Repornește dispozitivul la distanță"), + ("Restart remote device", "Repornește dispozivul la distanță"), ("Are you sure you want to restart", "Sigur vrei să repornești dispozitivul?"), ("Restarting remote device", "Se repornește dispozitivul la distanță"), ("remote_restarting_tip", "Dispozitivul este în curs de repornire. Închide acest mesaj și reconectează-te cu parola permanentă după un timp."), @@ -359,8 +361,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Unpin Toolbar", "Detașează bara de instrumente"), ("Recording", "Înregistrare"), ("Directory", "Director"), - ("Automatically record incoming sessions", "Înregistrează automat sesiunile primite"), - ("Automatically record outgoing sessions", "Înregistrează automat sesiunile de ieșire"), + ("Automatically record incoming sessions", "Înregistrează automat sesiunile viitoare"), + ("Automatically record outgoing sessions", ""), ("Change", "Modifică"), ("Start session recording", "Începe înregistrarea"), ("Stop session recording", "Oprește înregistrarea"), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Setări tastatură"), ("Full Access", "Acces total"), ("Screen Share", "Partajare ecran"), - ("ubuntu-21-04-required", "Wayland necesită Ubuntu 21.04 sau o versiune superioară."), - ("wayland-requires-higher-linux-version", "Wayland necesită o versiune superioară a distribuției Linux. Încearcă desktopul X11 sau schimbă sistemul de operare."), - ("xdp-portal-unavailable", "Portalul XDG Desktop nu este disponibil. Asigură-te că rulezi o sesiune Wayland cu suport pentru portal."), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland necesită Ubuntu 21.04 sau o versiune superioară."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland necesită o versiune superioară a distribuției Linux. Încearcă desktopul X11 sau schimbă sistemul de operare."), ("JumpLink", "Afișează"), ("Please Select the screen to be shared(Operate on the peer side).", "Partajează ecranul care urmează să fie partajat (operează din partea dispozitivului pereche)."), ("Show RustDesk", "Afișează RustDesk"), ("This PC", "Acest PC"), ("or", "sau"), + ("Continue with", "Continuă cu"), ("Elevate", "Sporește privilegii"), ("Zoom cursor", "Cursor lupă"), ("Accept sessions via password", "Acceptă începerea sesiunii folosind parola"), @@ -436,13 +438,13 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Default Image Quality", "Calitatea implicită a imaginii"), ("Default Codec", "Codec implicit"), ("Bitrate", "Rată de biți"), - ("FPS", "FPS"), + ("FPS", "CPS"), ("Auto", "Auto"), ("Other Default Options", "Alte opțiuni implicite"), ("Voice call", "Apel vocal"), ("Text chat", "Conversație text"), ("Stop voice call", "Încheie apel vocal"), - ("relay_hint_tip", "Este posibil să nu te poți conecta direct; poți încerca să te conectezi prin retransmisie. De asemenea, dacă dorești să te conectezi direct prin retransmisie, poți adăuga sufixul „/r\" la ID sau să bifezi opțiunea Conectează-te mereu prin retransmisie."), + ("relay_hint_tip", "Este posibil să nu te poți conecta direct; poți încerca să te conectezi prin retransmisie. De asemenea, dacă dorești să te conectezi direct prin retransmisie, poți adăuga sufixul „/r” la ID sau să bifezi opțiunea Conectează-te mereu prin retransmisie."), ("Reconnect", "Reconectează-te"), ("Codec", "Codec"), ("Resolution", "Rezoluție"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Încă nu ai niciun dispozitiv pereche favorit?\nHai să-ți găsim pe cineva cu care să te conectezi, iar apoi poți adăuga dispozitivul la Favorite!"), ("empty_lan_tip", "Of! S-ar părea că încă nu am descoperit niciun dispozitiv."), ("empty_address_book_tip", "Măi să fie! Se pare că deocamdată nu figurează niciun dispozitiv în agenda ta."), + ("eg: admin", "ex: admin"), ("Empty Username", "Nume utilizator nespecificat"), ("Empty Password", "Parolă nespecificată"), ("Me", "Eu"), @@ -503,247 +506,202 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Exit", "Ieși"), ("Open", "Deschide"), ("logout_tip", "Sigur vrei să te deconectezi?"), - ("Service", "Serviciu"), - ("Start", "Pornește"), - ("Stop", "Oprește"), - ("exceed_max_devices", "Numărul maxim de dispozitive a fost depășit"), - ("Sync with recent sessions", "Sincronizează cu sesiunile recente"), - ("Sort tags", "Sortează etichete"), - ("Open connection in new tab", "Deschide conexiunea într-o filă nouă"), - ("Move tab to new window", "Mută fila într-o fereastră nouă"), - ("Can not be empty", "Nu poate fi gol"), - ("Already exists", "Există deja"), - ("Change Password", "Schimbă parola"), - ("Refresh Password", "Reîmprospătează parola"), - ("ID", "ID"), - ("Grid View", "Vizualizare grilă"), - ("List View", "Vizualizare listă"), - ("Select", "Selectează"), - ("Toggle Tags", "Comută etichete"), - ("pull_ab_failed_tip", "Sincronizarea agendei a eșuat. Verifică conexiunea la rețea sau autentifică-te din nou."), - ("push_ab_failed_tip", "Salvarea agendei pe server a eșuat. Verifică conexiunea la rețea sau autentifică-te din nou."), - ("synced_peer_readded_tip", "Dispozitivele pereche eliminate au fost re-adăugate automat din sesiunile recente."), - ("Change Color", "Schimbă culoarea"), - ("Primary Color", "Culoare principală"), - ("HSV Color", "Culoare HSV"), - ("Installation Successful!", "Instalare reușită!"), - ("Installation failed!", "Instalare eșuată!"), - ("Reverse mouse wheel", "Inversează rotiță mouse"), - ("{} sessions", "{} sesiuni"), - ("scam_title", "Avertisment de securitate"), - ("scam_text1", "Escrocii se pot da drept angajați ai asistenței tehnice și îți pot solicita să instalezi sau să rulezi RustDesk pentru a-ți accesa dispozitivul."), - ("scam_text2", "Dacă nu ai contactat tu primul asistența tehnică, te rugăm să închizi această aplicație imediat."), - ("Don't show again", "Nu mai afișa"), - ("I Agree", "Sunt de acord"), - ("Decline", "Refuză"), - ("Timeout in minutes", "Timp de expirare în minute"), - ("auto_disconnect_option_tip", "Deconectează automat sesiunile de la distanță după o perioadă de inactivitate."), - ("Connection failed due to inactivity", "Conexiunea a eșuat din cauza inactivității"), - ("Check for software update on startup", "Verifică actualizări la pornire"), - ("upgrade_rustdesk_server_pro_to_{}_tip", "Versiunea serverului RustDesk Pro este mai mică decât {}. Te rugăm să o actualizezi."), - ("pull_group_failed_tip", "Sincronizarea grupului a eșuat. Verifică conexiunea la rețea sau autentifică-te din nou."), - ("Filter by intersection", "Filtrează prin intersecție"), - ("Remove wallpaper during incoming sessions", "Elimină imaginea de fundal în timpul sesiunilor primite"), - ("Test", "Test"), - ("display_is_plugged_out_msg", "Monitorul selectat a fost deconectat. Sesiunea continuă pe monitorul disponibil."), - ("No displays", "Niciun monitor"), - ("Open in new window", "Deschide în fereastră nouă"), - ("Show displays as individual windows", "Afișează monitoarele ca ferestre individuale"), - ("Use all my displays for the remote session", "Folosește toate monitoarele mele pentru sesiunea la distanță"), - ("selinux_tip", "SELinux este activat pe acest sistem. Este posibil ca unele funcții să nu funcționeze corect. Te rugăm să consulți documentația pentru instrucțiuni de configurare."), - ("Change view", "Schimbă vizualizarea"), - ("Big tiles", "Dale mari"), - ("Small tiles", "Dale mici"), - ("List", "Listă"), - ("Virtual display", "Monitor virtual"), - ("Plug out all", "Deconectează toate"), - ("True color (4:4:4)", "Culori reale (4:4:4)"), - ("Enable blocking user input", "Activează blocarea intrărilor utilizatorului"), - ("id_input_tip", "Introdu ID-ul sau adresa IP a dispozitivului la distanță"), - ("privacy_mode_impl_mag_tip", "Modul privat prin Magnificare — nu este suportat pe toate sistemele"), - ("privacy_mode_impl_virtual_display_tip", "Modul privat prin monitor virtual — necesită driverul de monitor virtual"), - ("Enter privacy mode", "Intră în modul privat"), - ("Exit privacy mode", "Ieși din modul privat"), - ("idd_not_support_under_win10_2004_tip", "Driverul de monitor virtual nu este suportat pe versiuni de Windows anterioare versiunii 2004 (build 19041)."), - ("input_source_1_tip", "Sursă de intrare 1 — folosește metodele standard de simulare a tastaturii și mouse-ului"), - ("input_source_2_tip", "Sursă de intrare 2 — folosește driver-ul RustDesk pentru simulare la nivel de kernel"), - ("Swap control-command key", "Schimbă tastele Control și Command"), - ("swap-left-right-mouse", "Schimbă butoanele stâng și drept ale mouse-ului"), - ("2FA code", "Cod 2FA"), - ("More", "Mai mult"), - ("enable-2fa-title", "Activează autentificarea în doi pași (2FA)"), - ("enable-2fa-desc", "Scanează codul QR cu o aplicație de autentificare (de ex. Google Authenticator) și introdu codul generat pentru a confirma activarea."), - ("wrong-2fa-code", "Cod 2FA incorect"), - ("enter-2fa-title", "Introdu codul de autentificare în doi pași"), - ("Email verification code must be 6 characters.", "Codul de verificare prin e-mail trebuie să aibă 6 caractere."), - ("2FA code must be 6 digits.", "Codul 2FA trebuie să conțină 6 cifre."), - ("Multiple Windows sessions found", "Au fost găsite mai multe sesiuni Windows"), - ("Please select the session you want to connect to", "Selectează sesiunea la care vrei să te conectezi"), - ("powered_by_me", "Realizat cu RustDesk"), - ("outgoing_only_desk_tip", "Acest dispozitiv este configurat doar pentru conexiuni de ieșire și nu acceptă conexiuni de intrare."), - ("preset_password_warning", "Parola prestabilită nu este recomandată din motive de securitate. Te rugăm să o schimbi cât mai curând posibil."), - ("Security Alert", "Alertă de securitate"), - ("My address book", "Agenda mea"), - ("Personal", "Personal"), - ("Owner", "Proprietar"), - ("Set shared password", "Setează parola partajată"), - ("Exist in", "Există în"), - ("Read-only", "Doar citire"), - ("Read/Write", "Citire/Scriere"), - ("Full Control", "Control total"), - ("share_warning_tip", "Datele partajate vor fi vizibile pentru toți membrii grupului selectat. Asigură-te că partajezi doar informații adecvate."), - ("Everyone", "Toată lumea"), - ("ab_web_console_tip", "Gestionează agenda prin consola web RustDesk Pro."), - ("allow-only-conn-window-open-tip", "Permite conexiunile numai atunci când fereastra de gestionare a conexiunilor este deschisă"), - ("no_need_privacy_mode_no_physical_displays_tip", "Modul privat nu este necesar deoarece nu există monitoare fizice conectate."), - ("Follow remote cursor", "Urmărește cursorul de la distanță"), - ("Follow remote window focus", "Urmărește fereastra activă de la distanță"), - ("default_proxy_tip", "Proxy-ul implicit este utilizat pentru toate conexiunile dacă nu este specificat altul."), - ("no_audio_input_device_tip", "Nu a fost găsit niciun dispozitiv de intrare audio. Conectează un microfon și reîncearcă."), - ("Incoming", "Intrare"), - ("Outgoing", "Ieșire"), - ("Clear Wayland screen selection", "Șterge selecția de ecran Wayland"), - ("clear_Wayland_screen_selection_tip", "Șterge selecția de ecran Wayland salvată, astfel încât să poți alege un alt ecran la următoarea conexiune."), - ("confirm_clear_Wayland_screen_selection_tip", "Sigur vrei să ștergi selecția de ecran Wayland?"), - ("android_new_voice_call_tip", "Ai primit un nou apel vocal. Apasă pentru a accepta sau respinge."), - ("texture_render_tip", "Randarea prin textură poate îmbunătăți performanța grafică pe unele dispozitive. Repornește aplicația dacă apar probleme de afișare."), - ("Use texture rendering", "Folosește randarea prin textură"), - ("Floating window", "Fereastră flotantă"), - ("floating_window_tip", "Fereastra flotantă ajută la menținerea serviciului de partajare a ecranului activ în fundal pe Android."), - ("Keep screen on", "Menține ecranul pornit"), - ("Never", "Niciodată"), - ("During controlled", "În timpul controlului"), - ("During service is on", "Cât timp serviciul este activ"), - ("Capture screen using DirectX", "Capturează ecranul folosind DirectX"), - ("Back", "Înapoi"), - ("Apps", "Aplicații"), - ("Volume up", "Mărește volumul"), - ("Volume down", "Micșorează volumul"), - ("Power", "Alimentare"), - ("Telegram bot", "Bot Telegram"), - ("enable-bot-tip", "Activează botul Telegram pentru a primi notificări și a gestiona conexiunile."), - ("enable-bot-desc", "Configurează un bot Telegram pentru notificări RustDesk. Introdu token-ul botului și ID-ul chat-ului."), - ("cancel-2fa-confirm-tip", "Sigur vrei să dezactivezi autentificarea în doi pași? Aceasta va reduce securitatea contului tău."), - ("cancel-bot-confirm-tip", "Sigur vrei să dezactivezi botul Telegram?"), - ("About RustDesk", "Despre RustDesk"), - ("Send clipboard keystrokes", "Trimite conținutul clipboard-ului ca apăsări de taste"), - ("network_error_tip", "Eroare de rețea. Verifică conexiunea la internet și încearcă din nou."), - ("Unlock with PIN", "Deblochează cu PIN"), - ("Requires at least {} characters", "Necesită cel puțin {} caractere"), - ("Wrong PIN", "PIN incorect"), - ("Set PIN", "Setează PIN"), - ("Enable trusted devices", "Activează dispozitive de încredere"), - ("Manage trusted devices", "Gestionează dispozitivele de încredere"), - ("Platform", "Platformă"), - ("Days remaining", "Zile rămase"), - ("enable-trusted-devices-tip", "Dispozitivele de încredere pot accesa contul fără verificare suplimentară."), - ("Parent directory", "Director părinte"), - ("Resume", "Reia"), - ("Invalid file name", "Nume de fișier nevalid"), - ("one-way-file-transfer-tip", "Transferul de fișiere în sens unic permite doar trimiterea sau primirea de fișiere, nu ambele direcții simultan."), - ("Authentication Required", "Autentificare necesară"), - ("Authenticate", "Autentifică-te"), - ("web_id_input_tip", "Introdu ID-ul RustDesk al dispozitivului la care vrei să te conectezi"), - ("Download", "Descarcă"), - ("Upload folder", "Încarcă folder"), - ("Upload files", "Încarcă fișiere"), - ("Clipboard is synchronized", "Clipboard-ul este sincronizat"), - ("Update client clipboard", "Actualizează clipboard-ul clientului"), - ("Untagged", "Neetichetat"), - ("new-version-of-{}-tip", "Este disponibilă o nouă versiune a {}. Fă clic pentru a actualiza."), - ("Accessible devices", "Dispozitive accesibile"), - ("upgrade_remote_rustdesk_client_to_{}_tip", "Versiunea clientului RustDesk de la distanță este mai mică decât {}. Te rugăm să o actualizezi pentru o compatibilitate completă."), - ("d3d_render_tip", "Randarea Direct3D poate îmbunătăți performanța pe sistemele Windows cu suport hardware adecvat."), - ("Use D3D rendering", "Folosește randarea D3D"), - ("Printer", "Imprimantă"), - ("printer-os-requirement-tip", "Imprimarea la distanță necesită Windows 10 sau o versiune superioară."), - ("printer-requires-installed-{}-client-tip", "Imprimarea la distanță necesită instalarea clientului {} pe dispozitivul local."), - ("printer-{}-not-installed-tip", "Imprimanta {} nu este instalată. Instalează driverul imprimantei pentru a continua."), - ("printer-{}-ready-tip", "Imprimanta {} este pregătită pentru utilizare."), - ("Install {} Printer", "Instalează imprimanta {}"), - ("Outgoing Print Jobs", "Lucrări de imprimare de ieșire"), - ("Incoming Print Jobs", "Lucrări de imprimare de intrare"), - ("Incoming Print Job", "Lucrare de imprimare de intrare"), - ("use-the-default-printer-tip", "Folosește imprimanta implicită a sistemului pentru lucrările de imprimare primite."), - ("use-the-selected-printer-tip", "Folosește imprimanta selectată pentru lucrările de imprimare primite."), - ("auto-print-tip", "Imprimă automat lucrările primite fără confirmare."), - ("print-incoming-job-confirm-tip", "Ai primit o lucrare de imprimare. Vrei să o imprimești?"), - ("remote-printing-disallowed-tile-tip", "Imprimare la distanță nepermisă"), - ("remote-printing-disallowed-text-tip", "Dispozitivul la distanță nu permite imprimarea. Contactează administratorul pentru a activa această funcție."), - ("save-settings-tip", "Salvează setările curente ca implicite pentru sesiunile viitoare."), - ("dont-show-again-tip", "Nu mai afișa acest mesaj"), - ("Take screenshot", "Fă captură de ecran"), - ("Taking screenshot", "Se face captura de ecran..."), - ("screenshot-merged-screen-not-supported-tip", "Captura de ecran a ecranului combinat nu este suportată în prezent."), - ("screenshot-action-tip", "Selectează acțiunea pentru captura de ecran: salvează ca fișier sau copiază în clipboard."), - ("Save as", "Salvează ca"), - ("Copy to clipboard", "Copiază în clipboard"), - ("Enable remote printer", "Activează imprimanta la distanță"), - ("Downloading {}", "Se descarcă {}"), - ("{} Update", "Actualizare {}"), - ("{}-to-update-tip", "Este disponibilă o actualizare pentru {}. Fă clic pentru a descărca și instala."), - ("download-new-version-failed-tip", "Descărcarea noii versiuni a eșuat. Verifică conexiunea la internet și încearcă din nou."), - ("Auto update", "Actualizare automată"), - ("update-failed-check-msi-tip", "Actualizarea a eșuat. Încearcă să descarci și să instalezi manual fișierul MSI."), - ("websocket_tip", "WebSocket oferă o conexiune mai stabilă în unele medii de rețea restrictive."), - ("Use WebSocket", "Folosește WebSocket"), - ("Trackpad speed", "Viteza touchpad-ului"), - ("Default trackpad speed", "Viteza implicită a touchpad-ului"), - ("Numeric one-time password", "Parolă unică numerică"), - ("Enable IPv6 P2P connection", "Activează conexiunea P2P prin IPv6"), - ("Enable UDP hole punching", "Activează traversarea UDP (hole punching)"), + ("Service", ""), + ("Start", ""), + ("Stop", ""), + ("exceed_max_devices", ""), + ("Sync with recent sessions", ""), + ("Sort tags", ""), + ("Open connection in new tab", ""), + ("Move tab to new window", ""), + ("Can not be empty", ""), + ("Already exists", ""), + ("Change Password", ""), + ("Refresh Password", ""), + ("ID", ""), + ("Grid View", ""), + ("List View", ""), + ("Select", ""), + ("Toggle Tags", ""), + ("pull_ab_failed_tip", ""), + ("push_ab_failed_tip", ""), + ("synced_peer_readded_tip", ""), + ("Change Color", ""), + ("Primary Color", ""), + ("HSV Color", ""), + ("Installation Successful!", ""), + ("Installation failed!", ""), + ("Reverse mouse wheel", ""), + ("{} sessions", ""), + ("scam_title", ""), + ("scam_text1", ""), + ("scam_text2", ""), + ("Don't show again", ""), + ("I Agree", ""), + ("Decline", ""), + ("Timeout in minutes", ""), + ("auto_disconnect_option_tip", ""), + ("Connection failed due to inactivity", ""), + ("Check for software update on startup", ""), + ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), + ("Filter by intersection", ""), + ("Remove wallpaper during incoming sessions", ""), + ("Test", ""), + ("display_is_plugged_out_msg", ""), + ("No displays", ""), + ("Open in new window", ""), + ("Show displays as individual windows", ""), + ("Use all my displays for the remote session", ""), + ("selinux_tip", ""), + ("Change view", ""), + ("Big tiles", ""), + ("Small tiles", ""), + ("List", ""), + ("Virtual display", ""), + ("Plug out all", ""), + ("True color (4:4:4)", ""), + ("Enable blocking user input", ""), + ("id_input_tip", ""), + ("privacy_mode_impl_mag_tip", ""), + ("privacy_mode_impl_virtual_display_tip", ""), + ("Enter privacy mode", ""), + ("Exit privacy mode", ""), + ("idd_not_support_under_win10_2004_tip", ""), + ("input_source_1_tip", ""), + ("input_source_2_tip", ""), + ("Swap control-command key", ""), + ("swap-left-right-mouse", ""), + ("2FA code", ""), + ("More", ""), + ("enable-2fa-title", ""), + ("enable-2fa-desc", ""), + ("wrong-2fa-code", ""), + ("enter-2fa-title", ""), + ("Email verification code must be 6 characters.", ""), + ("2FA code must be 6 digits.", ""), + ("Multiple Windows sessions found", ""), + ("Please select the session you want to connect to", ""), + ("powered_by_me", ""), + ("outgoing_only_desk_tip", ""), + ("preset_password_warning", ""), + ("Security Alert", ""), + ("My address book", ""), + ("Personal", ""), + ("Owner", ""), + ("Set shared password", ""), + ("Exist in", ""), + ("Read-only", ""), + ("Read/Write", ""), + ("Full Control", ""), + ("share_warning_tip", ""), + ("Everyone", ""), + ("ab_web_console_tip", ""), + ("allow-only-conn-window-open-tip", ""), + ("no_need_privacy_mode_no_physical_displays_tip", ""), + ("Follow remote cursor", ""), + ("Follow remote window focus", ""), + ("default_proxy_tip", ""), + ("no_audio_input_device_tip", ""), + ("Incoming", ""), + ("Outgoing", ""), + ("Clear Wayland screen selection", ""), + ("clear_Wayland_screen_selection_tip", ""), + ("confirm_clear_Wayland_screen_selection_tip", ""), + ("android_new_voice_call_tip", ""), + ("texture_render_tip", ""), + ("Use texture rendering", ""), + ("Floating window", ""), + ("floating_window_tip", ""), + ("Keep screen on", ""), + ("Never", ""), + ("During controlled", ""), + ("During service is on", ""), + ("Capture screen using DirectX", ""), + ("Back", ""), + ("Apps", ""), + ("Volume up", ""), + ("Volume down", ""), + ("Power", ""), + ("Telegram bot", ""), + ("enable-bot-tip", ""), + ("enable-bot-desc", ""), + ("cancel-2fa-confirm-tip", ""), + ("cancel-bot-confirm-tip", ""), + ("About RustDesk", ""), + ("Send clipboard keystrokes", ""), + ("network_error_tip", ""), + ("Unlock with PIN", ""), + ("Requires at least {} characters", ""), + ("Wrong PIN", ""), + ("Set PIN", ""), + ("Enable trusted devices", ""), + ("Manage trusted devices", ""), + ("Platform", ""), + ("Days remaining", ""), + ("enable-trusted-devices-tip", ""), + ("Parent directory", ""), + ("Resume", ""), + ("Invalid file name", ""), + ("one-way-file-transfer-tip", ""), + ("Authentication Required", ""), + ("Authenticate", ""), + ("web_id_input_tip", ""), + ("Download", ""), + ("Upload folder", ""), + ("Upload files", ""), + ("Clipboard is synchronized", ""), + ("Update client clipboard", ""), + ("Untagged", ""), + ("new-version-of-{}-tip", ""), + ("Accessible devices", ""), + ("upgrade_remote_rustdesk_client_to_{}_tip", ""), + ("d3d_render_tip", ""), + ("Use D3D rendering", ""), + ("Printer", ""), + ("printer-os-requirement-tip", ""), + ("printer-requires-installed-{}-client-tip", ""), + ("printer-{}-not-installed-tip", ""), + ("printer-{}-ready-tip", ""), + ("Install {} Printer", ""), + ("Outgoing Print Jobs", ""), + ("Incoming Print Jobs", ""), + ("Incoming Print Job", ""), + ("use-the-default-printer-tip", ""), + ("use-the-selected-printer-tip", ""), + ("auto-print-tip", ""), + ("print-incoming-job-confirm-tip", ""), + ("remote-printing-disallowed-tile-tip", ""), + ("remote-printing-disallowed-text-tip", ""), + ("save-settings-tip", ""), + ("dont-show-again-tip", ""), + ("Take screenshot", ""), + ("Taking screenshot", ""), + ("screenshot-merged-screen-not-supported-tip", ""), + ("screenshot-action-tip", ""), + ("Save as", ""), + ("Copy to clipboard", ""), + ("Enable remote printer", ""), + ("Downloading {}", ""), + ("{} Update", ""), + ("{}-to-update-tip", ""), + ("download-new-version-failed-tip", ""), + ("Auto update", ""), + ("update-failed-check-msi-tip", ""), + ("websocket_tip", ""), + ("Use WebSocket", ""), + ("Trackpad speed", ""), + ("Default trackpad speed", ""), + ("Numeric one-time password", ""), + ("Enable IPv6 P2P connection", ""), + ("Enable UDP hole punching", ""), ("View camera", "Vezi camera"), - ("Enable camera", "Activează camera"), - ("No cameras", "Nicio cameră disponibilă"), - ("view_camera_unsupported_tip", "Vizualizarea camerei nu este suportată pe dispozitivul la distanță."), - ("Terminal", "Terminal"), - ("Enable terminal", "Activează terminalul"), - ("New tab", "Filă nouă"), - ("Keep terminal sessions on disconnect", "Păstrează sesiunile de terminal la deconectare"), - ("Terminal (Run as administrator)", "Terminal (Rulează ca administrator)"), - ("terminal-admin-login-tip", "Introdu datele de autentificare ale administratorului pentru a rula terminalul cu privilegii sporite."), - ("Failed to get user token.", "Obținerea tokenului de utilizator a eșuat."), - ("Incorrect username or password.", "Nume de utilizator sau parolă incorectă."), - ("The user is not an administrator.", "Utilizatorul nu este administrator."), - ("Failed to check if the user is an administrator.", "Verificarea privilegiilor de administrator a eșuat."), - ("Supported only in the installed version.", "Suportat doar în versiunea instalată."), - ("elevation_username_tip", "Introdu numele de utilizator al contului de administrator pentru a solicita sporirea privilegiilor."), - ("Preparing for installation ...", "Se pregătește instalarea..."), - ("Show my cursor", "Afișează cursorul meu"), - ("Scale custom", "Scalare personalizată"), - ("Custom scale slider", "Glisor pentru scalare personalizată"), - ("Decrease", "Micșorează"), - ("Increase", "Mărește"), - ("Show virtual mouse", "Afișează mouse virtual"), - ("Virtual mouse size", "Dimensiunea mouse-ului virtual"), - ("Small", "Mic"), - ("Large", "Mare"), - ("Show virtual joystick", "Afișează joystick virtual"), - ("Edit note", "Editează notă"), - ("Alias", "Alias"), - ("ScrollEdge", "Derulare la margine"), - ("Allow insecure TLS fallback", "Permite revenirea la TLS nesecurizat"), - ("allow-insecure-tls-fallback-tip", "Permite conexiunile cu certificate TLS nevalide sau expirate. Nu este recomandat din motive de securitate."), - ("Disable UDP", "Dezactivează UDP"), - ("disable-udp-tip", "Dezactivează conexiunile UDP și folosește doar TCP. Poate reduce performanța conexiunii."), - ("server-oss-not-support-tip", "Serverul open-source nu suportă această funcție. Folosește RustDesk Pro pentru funcționalitate completă."), - ("input note here", "Introdu o notă aici"), - ("note-at-conn-end-tip", "Afișează această notă la sfârșitul sesiunii de conexiune."), - ("Show terminal extra keys", "Afișează taste suplimentare pentru terminal"), - ("Relative mouse mode", "Mod mouse relativ"), - ("rel-mouse-not-supported-peer-tip", "Dispozitivul pereche nu suportă modul mouse relativ."), - ("rel-mouse-not-ready-tip", "Modul mouse relativ nu este pregătit. Încearcă din nou."), - ("rel-mouse-lock-failed-tip", "Blocarea mouse-ului în modul relativ a eșuat."), - ("rel-mouse-exit-{}-tip", "Apasă {} pentru a ieși din modul mouse relativ."), - ("rel-mouse-permission-lost-tip", "Permisiunea pentru modul mouse relativ a fost pierdută."), - ("Changelog", "Jurnal de modificări"), - ("keep-awake-during-outgoing-sessions-label", "Menține ecranul activ în timpul sesiunilor de ieșire"), - ("keep-awake-during-incoming-sessions-label", "Menține ecranul activ în timpul sesiunilor de intrare"), - ("Continue with {}", "Continuă cu {}"), - ("Display Name", "Nume afișat"), - ("password-hidden-tip", "Parola este ascunsă din motive de securitate. Fă clic pe pictograma ochiului pentru a o afișa."), - ("preset-password-in-use-tip", "Se folosește o parolă prestabilită. Se recomandă setarea unei parole personalizate pentru securitate sporită."), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Enable camera", ""), + ("No cameras", ""), + ("view_camera_unsupported_tip", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ru.rs b/src/lang/ru.rs index 2605582f4..0b40df0a7 100644 --- a/src/lang/ru.rs +++ b/src/lang/ru.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Пароль входа в ОС"), ("install_tip", "В некоторых случаях из-за UAC RustDesk может работать неправильно на удалённом узле. Чтобы избежать возможных проблем с UAC, нажмите кнопку ниже для установки RustDesk в системе."), ("Click to upgrade", "Нажмите, чтобы обновить"), + ("Click to download", "Нажмите, чтобы скачать"), + ("Click to update", "Нажмите, чтобы обновить"), ("Configure", "Настроить"), ("config_acc", "Чтобы удалённо управлять своим рабочим столом, вы должны предоставить RustDesk права \"доступа\""), ("config_screen", "Для удалённого доступа к рабочему столу вы должны предоставить RustDesk права \"снимок экрана\""), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Настройки клавиатуры"), ("Full Access", "Полный доступ"), ("Screen Share", "Демонстрация экрана"), - ("ubuntu-21-04-required", "Wayland требуется Ubuntu версии 21.04 или новее."), - ("wayland-requires-higher-linux-version", "Для Wayland требуется более поздняя версия дистрибутива Linux. Используйте рабочий стол X11 или смените ОС."), - ("xdp-portal-unavailable", "Невозможно сделать снимок экрана Wayland. Возможно, в XDG Desktop Portal сбой или он недоступен. Попробуйте перезапустить его с помощью `systemctl --user restart xdg-desktop-portal`."), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland требуется Ubuntu версии 21.04 или новее."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Для Wayland требуется более поздняя версия дистрибутива Linux. Используйте рабочий стол X11 или смените ОС."), ("JumpLink", "Просмотр"), ("Please Select the screen to be shared(Operate on the peer side).", "Выберите экран для демонстрации (работайте на одноранговой стороне)."), ("Show RustDesk", "Показать RustDesk"), ("This PC", "Этот компьютер"), ("or", "или"), + ("Continue with", "Продолжить с"), ("Elevate", "Повысить"), ("Zoom cursor", "Масштабировать курсор"), ("Accept sessions via password", "Принимать сеансы по паролю"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Ещё нет избранных удалённых узлов?\nДавайте найдём, кого можно добавить в избранное!"), ("empty_lan_tip", "Не найдено удалённых узлов."), ("empty_address_book_tip", "В адресной книге нет удалённых узлов."), + ("eg: admin", "например: admin"), ("Empty Username", "Пустое имя пользователя"), ("Empty Password", "Пустой пароль"), ("Me", "Я"), @@ -626,7 +629,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("cancel-2fa-confirm-tip", "Отключить двухфакторную аутентификацию?"), ("cancel-bot-confirm-tip", "Отключить Telegram-бота?"), ("About RustDesk", "О RustDesk"), - ("Send clipboard keystrokes", "Отправлять нажатия клавиш в буфер обмена"), + ("Send clipboard keystrokes", "Отправлять нажатия клавиш из буфера обмена"), ("network_error_tip", "Проверьте подключение к сети, затем нажмите \"Повтор\"."), ("Unlock with PIN", "Разблокировать PIN-кодом"), ("Requires at least {} characters", "Требуется не менее {} символов"), @@ -666,7 +669,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Incoming Print Job", "Входящее задание печати"), ("use-the-default-printer-tip", "Использовать принтер по умолчанию"), ("use-the-selected-printer-tip", "Использовать выбранный принтер"), - ("auto-print-tip", "Автоматически выполнять печать на выбранном принтере"), + ("auto-print-tip", "Автоматически выполнять печать на выбранном принтере."), ("print-incoming-job-confirm-tip", "Получено задание на печать с удалённого устройства. Выполнить его локально?"), ("remote-printing-disallowed-tile-tip", "Удалённая печать запрещена"), ("remote-printing-disallowed-text-tip", "Настройки разрешений на управляемой стороне запрещают удалённую печать."), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", "Включить терминал"), ("New tab", "Новая вкладка"), ("Keep terminal sessions on disconnect", "Сохранять сеансы терминала при отключении"), - ("Terminal (Run as administrator)", "Терминал (администратор)"), - ("terminal-admin-login-tip", "Введите имя пользователя и пароль администратора управляемой стороны."), - ("Failed to get user token.", "Невозможно получить токен пользователя."), - ("Incorrect username or password.", "Неправильное имя пользователя или пароль."), - ("The user is not an administrator.", "Пользователь не является администратором."), - ("Failed to check if the user is an administrator.", "Невозможно проверить, является ли пользователь администратором."), - ("Supported only in the installed version.", "Поддерживается только в установочной версии."), - ("elevation_username_tip", "Введите пользователя или домен\\пользователя"), - ("Preparing for installation ...", "Подготовка к установке..."), - ("Show my cursor", "Показывать мой курсор"), - ("Scale custom", "Пользовательский масштаб"), - ("Custom scale slider", "Ползунок пользовательского масштаба"), - ("Decrease", "Уменьшить"), - ("Increase", "Увеличить"), - ("Show virtual mouse", "Показать виртуальную мышь"), - ("Virtual mouse size", "Размер виртуальной мыши"), - ("Small", "Маленький"), - ("Large", "Большой"), - ("Show virtual joystick", "Показать виртуальный джойстик"), - ("Edit note", "Изменить заметку"), - ("Alias", "Псевдоним"), - ("ScrollEdge", "Прокрутка по краю"), - ("Allow insecure TLS fallback", "Разрешать небезопасные TLS"), - ("allow-insecure-tls-fallback-tip", "По умолчанию RustDesk проверяет сертификат сервера на наличие протоколов, использующих TLS.\nЕсли эта функция включена, RustDesk пропустит данный этап и продолжит работу в случае неудачной проверки."), - ("Disable UDP", "Отключить UDP"), - ("disable-udp-tip", "Определяет, следует ли использовать только TCP.\nЕсли включено, RustDesk не будет использовать UDP 21116, вместо него будет использоваться TCP 21116."), - ("server-oss-not-support-tip", "ПРИМЕЧАНИЕ: в OSS-сервере RustDesk эта функция отсутствует."), - ("input note here", "введите заметку"), - ("note-at-conn-end-tip", "Запрашивать заметку в конце соединения"), - ("Show terminal extra keys", "Показывать дополнительные кнопки терминала"), - ("Relative mouse mode", "Режим относительного перемещения мыши"), - ("rel-mouse-not-supported-peer-tip", "Режим относительного перемещения мыши не поддерживается подключённым узлом."), - ("rel-mouse-not-ready-tip", "Режим относительного перемещения мыши ещё не готов. Попробуйте снова."), - ("rel-mouse-lock-failed-tip", "Невозможно заблокировать курсор. Режим относительного перемещения мыши отключён."), - ("rel-mouse-exit-{}-tip", "Нажмите {} для выхода."), - ("rel-mouse-permission-lost-tip", "Разрешение на использование клавиатуры отменено. Режим относительного перемещения мыши отключён."), - ("Changelog", "Журнал изменений"), - ("keep-awake-during-outgoing-sessions-label", "Не отключать экран во время исходящих сеансов"), - ("keep-awake-during-incoming-sessions-label", "Не отключать экран во время входящих сеансов"), - ("Continue with {}", "Продолжить с {}"), - ("Display Name", "Отображаемое имя"), - ("password-hidden-tip", "Установлен постоянный пароль (скрытый)."), - ("preset-password-in-use-tip", "Установленный пароль сейчас используется."), - ("Enable privacy mode", "Использовать режим конфиденциальности"), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sc.rs b/src/lang/sc.rs index 06919b752..14d5b7e04 100644 --- a/src/lang/sc.rs +++ b/src/lang/sc.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Crae sistema operativu"), ("install_tip", "Pro neghe de su Controllu Contu Utente (UAC), RustDesk diat pòdere non funtzionare comente si tocat comente iscrivania remota.\nPro evitare custu problema, incarca in su butone inoghe in suta pro installare RustDesk a livellu de sistema."), ("Click to upgrade", "Atualiza"), + ("Click to download", "Iscàrriga"), + ("Click to update", "Annoa"), ("Configure", "Cunfigura"), ("config_acc", "Pro controllare s'iscrivania dae foras, depes frunire a RustDesk su permissu 'Atzessibilidade'."), ("config_screen", "Pro controllare s'iscrivania dae foras, depes frunire a RustDesk su permissu 'Registratzione ischermu'."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Impostatziones de tecladu"), ("Full Access", "Atzessu cumpridu"), ("Screen Share", "Cumpartzidura de ischermu"), - ("ubuntu-21-04-required", "Wayland tenet bisòngiu de Ubuntu 21.04 o versione prus noa."), - ("wayland-requires-higher-linux-version", "Wayland tenet bisòngiu de una versione prus noa de sa distributzione Linux.\nProa X11 pro elaboradores o càmbia su sistema operativu."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland tenet bisòngiu de Ubuntu 21.04 o versione prus noa."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland tenet bisòngiu de una versione prus noa de sa distributzione Linux.\nProa X11 pro elaboradores o càmbia su sistema operativu."), ("JumpLink", "Bae a"), ("Please Select the screen to be shared(Operate on the peer side).", "Seletziona s'ischermu de cumpartzire (òpera dae s'ala de su dispositivu remotu)."), ("Show RustDesk", "Mustra RustDesk"), ("This PC", "Custu PC"), ("or", "O"), + ("Continue with", "Sighi cun"), ("Elevate", "Cresche"), ("Zoom cursor", "Cursore de ismanniamentu"), ("Accept sessions via password", "Atzeta sessiones cun sa crae"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Galu peruna connessione?\nBusca calicunu cun chie ti collegare e annanghe·lu a sos preferidos!"), ("empty_lan_tip", "Paret a beru chi non siat istada atzapada peruna connessione."), ("empty_address_book_tip", "Paret chi pro como in sa rubrica non b'apat connessiones."), + ("eg: admin", "es: admin"), ("Empty Username", "Nùmene utente bòidu"), ("Empty Password", "Crae bòida"), ("Me", "Deo"), @@ -672,78 +675,33 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remote-printing-disallowed-text-tip", "Sas impostatziones de sos permissos de s'ala controllada negant s'imprenta remota."), ("save-settings-tip", "Sarva sas impostatziones"), ("dont-show-again-tip", "Non mustres prus custu messàgiu"), - ("Take screenshot", "Faghe un'ischermada"), - ("Taking screenshot", "Faghende un'ischermada"), - ("screenshot-merged-screen-not-supported-tip", "S'unione de sa catura de ischermadas de prus ischermos como no est suportada.\nCola a un'ischermu ebbia e torra a proare."), - ("screenshot-action-tip", "Seletziona comente sighire cun s'ischermada."), - ("Save as", "Sarva comente"), - ("Copy to clipboard", "Còpia in punta de billete"), - ("Enable remote printer", "Abìlita imprentadora remota"), - ("Downloading {}", "Iscarrighende {}"), - ("{} Update", "Atualiza {}"), - ("{}-to-update-tip", "{} s'at a serrare e a installare sa versione nova"), - ("download-new-version-failed-tip", "Iscarrigamentu fallidu.\nPodes torrare a proare o seletzionare 'Iscàrriga' pro iscarrigare e atualizare a manera manuale."), - ("Auto update", "Atualizatzione automàtica"), - ("update-failed-check-msi-tip", "Controllu de sa manera de installatzione fallidu.\nSeletziona 'Iscàrriga' pro iscarrigare su programma e l'atualizare a manera manuale."), - ("websocket_tip", "Cando impreas WebSocket, sunt suportadas petzi sas connessiones de tràmuda relay"), - ("Use WebSocket", "Imprea WebSocket"), - ("Trackpad speed", "Velotzidade de su pannellu tàtile"), - ("Default trackpad speed", "Velotzidade predefinida de su pannellu tàtile"), - ("Numeric one-time password", "Crae numèrica monoimpreu"), - ("Enable IPv6 P2P connection", "Abìlita connessione P2P IPv6"), - ("Enable UDP hole punching", "Abìlita s'istampadura UDP"), + ("Take screenshot", ""), + ("Taking screenshot", ""), + ("screenshot-merged-screen-not-supported-tip", ""), + ("screenshot-action-tip", ""), + ("Save as", ""), + ("Copy to clipboard", ""), + ("Enable remote printer", ""), + ("Downloading {}", ""), + ("{} Update", ""), + ("{}-to-update-tip", ""), + ("download-new-version-failed-tip", ""), + ("Auto update", ""), + ("update-failed-check-msi-tip", ""), + ("websocket_tip", ""), + ("Use WebSocket", ""), + ("Trackpad speed", ""), + ("Default trackpad speed", ""), + ("Numeric one-time password", ""), + ("Enable IPv6 P2P connection", ""), + ("Enable UDP hole punching", ""), ("View camera", "Mustra sa càmera"), ("Enable camera", "Abìlita sa càmera"), ("No cameras", "Peruna càmera"), ("view_camera_unsupported_tip", "Su dispositivu remotu non suportat sa visualizatzione de sa càmera"), - ("Terminal", "Terminale"), - ("Enable terminal", "Abìlita su terminale"), - ("New tab", "Ischeda noa"), - ("Keep terminal sessions on disconnect", "Cando ti disconnetes mantene aberta sa sessione de terminale"), - ("Terminal (Run as administrator)", "Terminale (imprea comente amministradore)"), - ("terminal-admin-login-tip", "Inserta su nùmene utente e sa crae de intrada de s'amministradore de s'ala controllada."), - ("Failed to get user token.", "Otenimentu de su getone de utente fallidu."), - ("Incorrect username or password.", "Nùmene utente o crae de intrada isballiados."), - ("The user is not an administrator.", "S'utente no est un'amministradore."), - ("Failed to check if the user is an administrator.", "Non faghet a verificare si s'utente est un'amministradore."), - ("Supported only in the installed version.", "Suportadu petzi in sa versione installada."), - ("elevation_username_tip", "Inserta Nùmene utente o domìniu de fonte\\nùmene Utente"), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Sighi cun {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sk.rs b/src/lang/sk.rs index 963f48728..439c90d00 100644 --- a/src/lang/sk.rs +++ b/src/lang/sk.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Heslo do operačného systému"), ("install_tip", "V niektorých prípadoch RustDesk nefunguje správne z dôvodu riadenia užívateľských oprávnení (UAC). Vyhnete sa tomu kliknutím na nižšie zobrazene tlačítko a nainštalovaním RuskDesk do systému."), ("Click to upgrade", "Kliknutím nainštalujete aktualizáciu"), + ("Click to download", "Kliknutím potvrďte stiahnutie"), + ("Click to update", "Kliknutím aktualizovať"), ("Configure", "Nastaviť"), ("config_acc", "Aby bolo možné na diaľku ovládať vašu plochu, je potrebné aplikácii RustDesk udeliť práva \"Dostupnosť\"."), ("config_screen", "Aby bolo možné na diaľku sledovať vašu obrazovku, je potrebné aplikácii RustDesk udeliť práva \"Zachytávanie obsahu obrazovky\"."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Nastavenia klávesnice"), ("Full Access", "Úplný prístup"), ("Screen Share", "Zdielanie obrazovky"), - ("ubuntu-21-04-required", "Wayland vyžaduje Ubuntu 21.04 alebo vyššiu verziu."), - ("wayland-requires-higher-linux-version", "Wayland vyžaduje vyššiu verziu linuxovej distribúcie. Skúste X11 desktop alebo zmeňte OS."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland vyžaduje Ubuntu 21.04 alebo vyššiu verziu."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland vyžaduje vyššiu verziu linuxovej distribúcie. Skúste X11 desktop alebo zmeňte OS."), ("JumpLink", "View"), ("Please Select the screen to be shared(Operate on the peer side).", "Vyberte obrazovku, ktorú chcete zdieľať (Ovládajte na strane partnera)."), ("Show RustDesk", "Zobraziť RustDesk"), ("This PC", "Tento počítač"), ("or", "alebo"), + ("Continue with", "Pokračovať s"), ("Elevate", "Zvýšiť"), ("Zoom cursor", "Kurzor priblíženia"), ("Accept sessions via password", "Prijímanie relácií pomocou hesla"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Ešte nemáte obľúbeného partnera?\nNájdite niekoho, s kým sa môžete spojiť, a pridajte si ho do obľúbených!"), ("empty_lan_tip", "Ale nie, zdá sa, že sme zatiaľ neobjavili žiadnu protistranu."), ("empty_address_book_tip", "Ach bože, zdá sa, že vo vašom adresári momentálne nie sú uvedení žiadni kolegovia."), + ("eg: admin", "napr. admin"), ("Empty Username", "Prázdne používateľské meno"), ("Empty Password", "Prázdne heslo"), ("Me", "Ja"), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Pokračovať s {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sl.rs b/src/lang/sl.rs index 0f85af0c3..78551d37d 100755 --- a/src/lang/sl.rs +++ b/src/lang/sl.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Geslo operacijskega sistema"), ("install_tip", "Zaradi nadzora uporabniškega računa, RustDesk v nekaterih primerih na oddaljeni strani ne deluje pravilno. Temu se lahko izognete z namestitvijo."), ("Click to upgrade", "Klikni za nadgradnjo"), + ("Click to download", "Klikni za prenos"), + ("Click to update", "Klikni za posodobitev"), ("Configure", "Nastavi"), ("config_acc", "Za oddaljeni nadzor namizja morate RustDesku dodeliti pravico za dostopnost"), ("config_screen", "Za oddaljeni dostop do namizja morate RustDesku dodeliti pravico snemanje zaslona"), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Nastavitve tipkovnice"), ("Full Access", "Poln dostop"), ("Screen Share", "Deljenje zaslona"), - ("ubuntu-21-04-required", "Wayland zahteva Ubuntu 21.04 ali novejši"), - ("wayland-requires-higher-linux-version", "Zahtevana je novejša različica Waylanda. Posodobite vašo distribucijo ali pa uporabite X11."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland zahteva Ubuntu 21.04 ali novejši"), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Zahtevana je novejša različica Waylanda. Posodobite vašo distribucijo ali pa uporabite X11."), ("JumpLink", "Pogled"), ("Please Select the screen to be shared(Operate on the peer side).", "Izberite zaslon za delitev (na oddaljeni strani)."), ("Show RustDesk", "Prikaži RustDesk"), ("This PC", "Ta računalnik"), ("or", "ali"), + ("Continue with", "Nadaljuj z"), ("Elevate", "Povzdig pravic"), ("Zoom cursor", "Prilagodi velikost miškinega kazalca"), ("Accept sessions via password", "Sprejmi seje z geslom"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Nimate še priljubljenih partnerjev?\nVzpostavite povezavo, in jo dodajte med priljubljene."), ("empty_lan_tip", "Nismo našli še nobenih partnerjev."), ("empty_address_book_tip", "Vaš adresar je prazen."), + ("eg: admin", "npr. admin"), ("Empty Username", "Prazno uporabniško ime"), ("Empty Password", "Prazno geslo"), ("Me", "Jaz"), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Nadaljuj z {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sq.rs b/src/lang/sq.rs index 7c965cd45..f8aa4e6b3 100644 --- a/src/lang/sq.rs +++ b/src/lang/sq.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "OS fjalëkalim"), ("install_tip", "Për shkak të UAC, RustDesk nuk mund të punoj sic duhet si nje remote në distancë në disa raste. Për të shamngur UAC, ju lutem klikoni butonin më poshtë për të instaluar RustDesk në sistem."), ("Click to upgrade", "Klikoni për përmirësim"), + ("Click to download", "Klikoni për tu shkarkuar"), + ("Click to update", "Klikoni për përditësim"), ("Configure", "Koniguro"), ("config_acc", "Për të kontrolluar Desktopin tuaj nga distanca, duhet të jepni leje RustDesk \"Aksesueshmëri\"."), ("config_screen", "Për të aksesuar Desktopin tuaj nga distanca, duhet ti jepni lejet RustDesk \"Regjistrimin e ekranit\"."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Cilësimet e tastierës"), ("Full Access", "Qasje e plotë"), ("Screen Share", "Ndarja e ekranit"), - ("ubuntu-21-04-required", "Wayland kërkon Ubuntu 21.04 ose version më të lartë"), - ("wayland-requires-higher-linux-version", "Wayland kërkon një version më të lartë të shpërndarjes linux. Ju lutemi provoni desktopin X11 ose ndryshoni OS."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland kërkon Ubuntu 21.04 ose version më të lartë"), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland kërkon një version më të lartë të shpërndarjes linux. Ju lutemi provoni desktopin X11 ose ndryshoni OS."), ("JumpLink", "JumpLink"), ("Please Select the screen to be shared(Operate on the peer side).", "Ju lutemi zgjidhni ekranin që do të ndahet (Vepro në anën e kolegëve"), ("Show RustDesk", "Shfaq RustDesk"), ("This PC", "Ky PC"), ("or", "ose"), + ("Continue with", "Vazhdo me"), ("Elevate", "Ngritja"), ("Zoom cursor", "Zmadho kursorin"), ("Accept sessions via password", "Prano sesionin nëpërmjet fjalëkalimit"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", ""), ("empty_lan_tip", ""), ("empty_address_book_tip", ""), + ("eg: admin", ""), ("Empty Username", ""), ("Empty Password", ""), ("Me", ""), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Vazhdo me {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sr.rs b/src/lang/sr.rs index fc33e4671..f2be9629f 100644 --- a/src/lang/sr.rs +++ b/src/lang/sr.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "OS lozinka"), ("install_tip", "Zbog UAC RustDesk ne može raditi pravilno u nekim slučajevima. Da biste prevazišli UAC, kliknite taster ispod da instalirate RustDesk na sistem."), ("Click to upgrade", "Klik za nadogradnju"), + ("Click to download", "Klik za preuzimanje"), + ("Click to update", "Klik za ažuriranje"), ("Configure", "Konfigurisanje"), ("config_acc", "Da biste daljinski kontrolisali radnu površinu, RustDesk-u treba da dodelite \"Accessibility\" prava."), ("config_screen", "Da biste daljinski pristupili radnoj površini, RustDesk-u treba da dodelite \"Screen Recording\" prava."), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Postavke tastature"), ("Full Access", "Pun pristup"), ("Screen Share", "Deljenje ekrana"), - ("ubuntu-21-04-required", "Wayland zahteva Ubuntu 21.04 ili veću verziju"), - ("wayland-requires-higher-linux-version", "Wayland zahteva veću verziju Linux distribucije. Molimo pokušajte X11 ili promenite OS."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland zahteva Ubuntu 21.04 ili veću verziju"), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland zahteva veću verziju Linux distribucije. Molimo pokušajte X11 ili promenite OS."), ("JumpLink", "Vidi"), ("Please Select the screen to be shared(Operate on the peer side).", "Molimo izaberite ekran koji će biti podeljen (Za rad na klijent strani)"), ("Show RustDesk", "Prikazi RustDesk"), ("This PC", "Ovaj PC"), ("or", "ili"), + ("Continue with", "Nastavi sa"), ("Elevate", "Izdigni"), ("Zoom cursor", "Zumiraj kursor"), ("Accept sessions via password", "Prihvati sesije preko lozinke"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", ""), ("empty_lan_tip", ""), ("empty_address_book_tip", ""), + ("eg: admin", ""), ("Empty Username", ""), ("Empty Password", ""), ("Me", ""), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Nastavi sa {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sv.rs b/src/lang/sv.rs index 664dc4745..ecd6122c5 100644 --- a/src/lang/sv.rs +++ b/src/lang/sv.rs @@ -38,18 +38,18 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Stop service", "Avsluta tjänsten"), ("Change ID", "Byt ID"), ("Your new ID", "Ditt nya ID"), - ("length %min% to %max%", "längd %min% till %max%"), - ("starts with a letter", "börjar med en bokstav"), - ("allowed characters", "tillåtna tecken"), + ("length %min% to %max%", ""), + ("starts with a letter", ""), + ("allowed characters", ""), ("id_change_tip", "Bara a-z, A-Z, 0-9, - (dash) och _ (understräck) tecken är tillåtna. Den första bokstaven måste vara a-z, A-Z. Längd mellan 6 och 16."), ("Website", "Hemsida"), ("About", "Om"), ("Slogan_tip", ""), - ("Privacy Statement", "Integritetspolicy"), + ("Privacy Statement", ""), ("Mute", "Tyst"), ("Build Date", ""), - ("Version", "Version"), - ("Home", "Hem"), + ("Version", ""), + ("Home", ""), ("Audio Input", "Ljud input"), ("Enhancements", "Förbättringar"), ("Hardware Codec", "Hårdvarucodec"), @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "OS lösenord"), ("install_tip", "På grund av UAC, kan inte RustDesk fungera ordentligt på klientsidan. För att undvika problem med UAC, tryck på knappen nedan för att installera RustDesk på systemet."), ("Click to upgrade", "Klicka för att nedgradera"), + ("Click to download", "Klicka för att ladda ner"), + ("Click to update", "Klicka för att uppdatera"), ("Configure", "Konfigurera"), ("config_acc", "För att kontrollera din dator på distans måste du ge RustDesk \"Tillgänglighets\" rättigheter."), ("config_screen", "För att kontrollera din dator på distans måste du ge RustDesk \"Skärminspelnings\" rättigheter."), @@ -216,7 +218,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Remember me", "Kom ihåg mig"), ("Trust this device", "Lita på denna enhet"), ("Verification code", "Verifikationskod"), - ("verification_tip", "verifikation_tips"), + ("verification_tip", ""), ("Logout", "Logga ut"), ("Tags", "Taggar"), ("Search ID", "Sök ID"), @@ -228,7 +230,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Username missed", "Användarnamn saknas"), ("Password missed", "Lösenord saknas"), ("Wrong credentials", "Fel användarnamn eller lösenord"), - ("The verification code is incorrect or has expired", "Verifikationskoden är felaktig eller har löpt ut"), + ("The verification code is incorrect or has expired", ""), ("Edit Tag", "Ändra Tagg"), ("Forget Password", "Glöm lösenord"), ("Favorites", "Favoriter"), @@ -282,7 +284,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("android_service_will_start_tip", "Sätter du på \"skärminspelning\" kommer tjänsten automatiskt att starta. Detta tillåter andra enheter att kontrollera din enhet."), ("android_stop_service_tip", "Genom att stänga av tjänsten kommer alla enheter att kopplas ifrån."), ("android_version_audio_tip", "Din version av Android stödjer inte ljudinspelning, Android 10 eller nyare krävs"), - ("android_start_service_tip", "android_start_service_tips"), + ("android_start_service_tip", ""), ("android_permission_may_not_change_tip", ""), ("Account", "Konto"), ("Overwrite", "Skriv över"), @@ -302,8 +304,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keep RustDesk background service", "Behåll RustDesk i bakgrunden"), ("Ignore Battery Optimizations", "Ignorera batterioptimering"), ("android_open_battery_optimizations_tip", "Om du vill stänga av denna funktion, gå till nästa RustDesk programs inställningar, hitta [Batteri], Checka ur [Obegränsad]"), - ("Start on boot", "Starta vid uppstart"), - ("Start the screen sharing service on boot, requires special permissions", "Starta skärmdelningstjänsten vid uppstart, kräver särskilda rättigheter"), + ("Start on boot", ""), + ("Start the screen sharing service on boot, requires special permissions", ""), ("Connection not allowed", "Anslutning ej tillåten"), ("Legacy mode", "Legacy mode"), ("Map mode", "Kartläge"), @@ -326,8 +328,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Ratio", "Ratio"), ("Image Quality", "Bildkvalitet"), ("Scroll Style", "Scrollstil"), - ("Show Toolbar", "Visa verktygsfältet"), - ("Hide Toolbar", "Dölj verktygsfältet"), + ("Show Toolbar", ""), + ("Hide Toolbar", ""), ("Direct Connection", "Direktanslutning"), ("Relay Connection", "Relayanslutning"), ("Secure Connection", "Säker anslutning"), @@ -338,7 +340,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Security", "Säkerhet"), ("Theme", "Tema"), ("Dark Theme", "Mörkt tema"), - ("Light Theme", "Ljust tema"), + ("Light Theme", ""), ("Dark", "Mörk"), ("Light", "Ljus"), ("Follow System", "Följ system"), @@ -355,12 +357,12 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Audio Input Device", "Inmatningsenhet för ljud"), ("Use IP Whitelisting", "Använd IP-Vitlistning"), ("Network", "Nätverk"), - ("Pin Toolbar", "Fäst verktygsfältet"), - ("Unpin Toolbar", "Ta bort verktygsfältet"), + ("Pin Toolbar", ""), + ("Unpin Toolbar", ""), ("Recording", "Spelar in"), ("Directory", "Katalog"), ("Automatically record incoming sessions", "Spela in inkommande sessioner automatiskt"), - ("Automatically record outgoing sessions", "Spela in utgående sessioner automatiskt"), + ("Automatically record outgoing sessions", ""), ("Change", "Byt"), ("Start session recording", "Starta inspelning"), ("Stop session recording", "Avsluta inspelning"), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Tangentbordsinställningar"), ("Full Access", "Full tillgång"), ("Screen Share", "Skärmdelning"), - ("ubuntu-21-04-required", "Wayland kräver Ubuntu 21.04 eller högre."), - ("wayland-requires-higher-linux-version", "Wayland kräver en högre version av linux. Försök igen eller byt OS."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland kräver Ubuntu 21.04 eller högre."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland kräver en högre version av linux. Försök igen eller byt OS."), ("JumpLink", "JumpLink"), ("Please Select the screen to be shared(Operate on the peer side).", "Välj skärm att dela"), ("Show RustDesk", "Visa RustDesk"), ("This PC", "Denna dator"), ("or", "eller"), + ("Continue with", "Fortsätt med"), ("Elevate", "Höj upp"), ("Zoom cursor", "Zoom"), ("Accept sessions via password", "Acceptera sessioner via lösenord"), @@ -398,78 +400,79 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Hide connection management window", "Göm hanteringsfönster"), ("hide_cm_tip", "Tillåt att gömma endast om accepterande sessioner med lösenord och permanenta lösenord"), ("wayland_experiment_tip", ""), - ("Right click to select tabs", "Högerklicka för att välja flikar"), - ("Skipped", "Hoppade över"), - ("Add to address book", "Lägg till i adressboken"), - ("Group", "Grupp"), - ("Search", "Sök"), - ("Closed manually by web console", "Stängt manuellt av webkonsolen"), - ("Local keyboard type", "Lokal tangentbordstyp"), - ("Select local keyboard type", "Välj lokal tangentbordstyp"), + ("Right click to select tabs", ""), + ("Skipped", ""), + ("Add to address book", ""), + ("Group", ""), + ("Search", ""), + ("Closed manually by web console", ""), + ("Local keyboard type", ""), + ("Select local keyboard type", ""), ("software_render_tip", ""), - ("Always use software rendering", "Använd alltid mjukvarurendering"), + ("Always use software rendering", ""), ("config_input", ""), ("config_microphone", ""), ("request_elevation_tip", ""), - ("Wait", "Vänta"), + ("Wait", ""), ("Elevation Error", ""), - ("Ask the remote user for authentication", "Fråga fjärranvändaren för autentisering"), - ("Choose this if the remote account is administrator", "Välj detta om fjärrkontot är administratör"), - ("Transmit the username and password of administrator", "Skicka administratörens användarnamn och lösenord"), + ("Ask the remote user for authentication", ""), + ("Choose this if the remote account is administrator", ""), + ("Transmit the username and password of administrator", ""), ("still_click_uac_tip", ""), ("Request Elevation", ""), ("wait_accept_uac_tip", ""), ("Elevate successfully", ""), - ("uppercase", "versal"), - ("lowercase", "gemen"), - ("digit", "siffra"), - ("special character", "specialtecken"), - ("length>=8", "längd>=8"), - ("Weak", "Svag"), - ("Medium", "Medium"), - ("Strong", "Stark"), - ("Switch Sides", "Byt sidor"), - ("Please confirm if you want to share your desktop?", "Vänligen bekräfta att du vill dela ditt skrivbord?"), - ("Display", "Display"), - ("Default View Style", "Standardvisningsstil"), - ("Default Scroll Style", "Standardscrollstil"), - ("Default Image Quality", "Standardbildkvalitet"), - ("Default Codec", "Standard Kodek"), - ("Bitrate", "Bithastighet"), - ("FPS", "FPS"), - ("Auto", "Auto"), - ("Other Default Options", "Andra Standardinställningar"), - ("Voice call", "Röstsamtal"), - ("Text chat", "Meddelandechatt"), - ("Stop voice call", "Stoppa röstsamtal"), + ("uppercase", ""), + ("lowercase", ""), + ("digit", ""), + ("special character", ""), + ("length>=8", ""), + ("Weak", ""), + ("Medium", ""), + ("Strong", ""), + ("Switch Sides", ""), + ("Please confirm if you want to share your desktop?", ""), + ("Display", ""), + ("Default View Style", ""), + ("Default Scroll Style", ""), + ("Default Image Quality", ""), + ("Default Codec", ""), + ("Bitrate", ""), + ("FPS", ""), + ("Auto", ""), + ("Other Default Options", ""), + ("Voice call", ""), + ("Text chat", ""), + ("Stop voice call", ""), ("relay_hint_tip", ""), - ("Reconnect", "Återanslut"), - ("Codec", "Kodek"), - ("Resolution", "Upplösning"), - ("No transfers in progress", "Inga överförningar pågår"), - ("Set one-time password length", "Ställ in engångslösenordets längd"), - ("RDP Settings", "RDP inställningar"), - ("Sort by", "Sortera efter"), - ("New Connection", "Ny Anslutning"), - ("Restore", "Återställ"), - ("Minimize", "Minimera"), - ("Maximize", "Maximera"), - ("Your Device", "Din Enhet"), + ("Reconnect", ""), + ("Codec", ""), + ("Resolution", ""), + ("No transfers in progress", ""), + ("Set one-time password length", ""), + ("RDP Settings", ""), + ("Sort by", ""), + ("New Connection", ""), + ("Restore", ""), + ("Minimize", ""), + ("Maximize", ""), + ("Your Device", ""), ("empty_recent_tip", ""), ("empty_favorite_tip", ""), ("empty_lan_tip", ""), ("empty_address_book_tip", ""), - ("Empty Username", "Tomt användarnamn"), - ("Empty Password", "Tomt lösenord"), - ("Me", "Jag"), + ("eg: admin", ""), + ("Empty Username", ""), + ("Empty Password", ""), + ("Me", ""), ("identical_file_tip", ""), ("show_monitors_tip", ""), - ("View Mode", "Visningsläge"), + ("View Mode", ""), ("login_linux_tip", ""), ("verify_rustdesk_password_tip", ""), ("remember_account_tip", ""), ("os_account_desk_tip", ""), - ("OS Account", "OS-konto"), + ("OS Account", ""), ("another_user_login_title_tip", ""), ("another_user_login_text_tip", ""), ("xorg_not_found_title_tip", ""), @@ -477,193 +480,193 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("no_desktop_title_tip", ""), ("no_desktop_text_tip", ""), ("No need to elevate", ""), - ("System Sound", "Systemljud"), - ("Default", "Standard"), - ("New RDP", "Ny RDP"), - ("Fingerprint", "Fingeravtryck"), - ("Copy Fingerprint", "Kopiera fingeravtryck"), - ("no fingerprints", "inga fingeravtryck"), + ("System Sound", ""), + ("Default", ""), + ("New RDP", ""), + ("Fingerprint", ""), + ("Copy Fingerprint", ""), + ("no fingerprints", ""), ("Select a peer", ""), ("Select peers", ""), - ("Plugins", "Plugin"), - ("Uninstall", "Avinstallera"), - ("Update", "Uppdatera"), - ("Enable", "Aktivera"), - ("Disable", "Inaktivera"), - ("Options", "Inställningar"), + ("Plugins", ""), + ("Uninstall", ""), + ("Update", ""), + ("Enable", ""), + ("Disable", ""), + ("Options", ""), ("resolution_original_tip", ""), ("resolution_fit_local_tip", ""), ("resolution_custom_tip", ""), - ("Collapse toolbar", "Komprimera verktygsfältet"), + ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), ("clipboard_wait_response_timeout_tip", ""), - ("Incoming connection", "Inkommande anslutning"), - ("Outgoing connection", "Utgående anslutning"), - ("Exit", "Stäng"), - ("Open", "Öppna"), + ("Incoming connection", ""), + ("Outgoing connection", ""), + ("Exit", ""), + ("Open", ""), ("logout_tip", ""), - ("Service", "Tjänst"), - ("Start", "Start"), - ("Stop", "Stopp"), + ("Service", ""), + ("Start", ""), + ("Stop", ""), ("exceed_max_devices", ""), - ("Sync with recent sessions", "Synkronisera med senaste sessioner"), - ("Sort tags", "Sortera taggar"), - ("Open connection in new tab", "Öppna anslutning i ny flik"), - ("Move tab to new window", "Flytta flik till nytt fönster"), - ("Can not be empty", "Kan ej vara tom"), - ("Already exists", "Existerar redan"), - ("Change Password", "Byt lösenord"), - ("Refresh Password", "Uppdatera lösenord"), - ("ID", "ID"), - ("Grid View", "Rutnätsvy"), - ("List View", "Listvy"), - ("Select", "Välj"), - ("Toggle Tags", "Växla flikar"), + ("Sync with recent sessions", ""), + ("Sort tags", ""), + ("Open connection in new tab", ""), + ("Move tab to new window", ""), + ("Can not be empty", ""), + ("Already exists", ""), + ("Change Password", ""), + ("Refresh Password", ""), + ("ID", ""), + ("Grid View", ""), + ("List View", ""), + ("Select", ""), + ("Toggle Tags", ""), ("pull_ab_failed_tip", ""), ("push_ab_failed_tip", ""), ("synced_peer_readded_tip", ""), - ("Change Color", "Byt färg"), - ("Primary Color", "Primärfärg"), - ("HSV Color", "HSV färg"), - ("Installation Successful!", "Installationen lyckades!"), - ("Installation failed!", "Installationen misslyckades!"), - ("Reverse mouse wheel", "Ändra riktning för scrollhjulet"), - ("{} sessions", "{} sessioner"), + ("Change Color", ""), + ("Primary Color", ""), + ("HSV Color", ""), + ("Installation Successful!", ""), + ("Installation failed!", ""), + ("Reverse mouse wheel", ""), + ("{} sessions", ""), ("scam_title", ""), ("scam_text1", ""), ("scam_text2", ""), - ("Don't show again", "Visa inte igen"), - ("I Agree", "Jag godkänner"), - ("Decline", "Avböj"), - ("Timeout in minutes", "Timeout i minuter"), + ("Don't show again", ""), + ("I Agree", ""), + ("Decline", ""), + ("Timeout in minutes", ""), ("auto_disconnect_option_tip", ""), - ("Connection failed due to inactivity", "Anslutningen misslyckades på grund av inaktivitet"), - ("Check for software update on startup", "Kolla efter mjukvaruuppdateringar vid start"), + ("Connection failed due to inactivity", ""), + ("Check for software update on startup", ""), ("upgrade_rustdesk_server_pro_to_{}_tip", ""), ("pull_group_failed_tip", ""), ("Filter by intersection", ""), - ("Remove wallpaper during incoming sessions", "Dölj bakgrunden vid inkommande sessioner"), - ("Test", "Test"), + ("Remove wallpaper during incoming sessions", ""), + ("Test", ""), ("display_is_plugged_out_msg", ""), - ("No displays", "Inga skärmar"), - ("Open in new window", "Öppna i nytt fönster"), - ("Show displays as individual windows", "Visa skärmar som enskilda fönster"), - ("Use all my displays for the remote session", "Använd alla mina skärmar för fjärrsessionen"), + ("No displays", ""), + ("Open in new window", ""), + ("Show displays as individual windows", ""), + ("Use all my displays for the remote session", ""), ("selinux_tip", ""), - ("Change view", "Byt vy"), - ("Big tiles", "Stora rutor"), - ("Small tiles", "Små rutor"), - ("List", "Lista"), - ("Virtual display", "Virtuell skärm"), - ("Plug out all", "Koppla ur alla"), - ("True color (4:4:4)", "Sann färg (4:4:4)"), - ("Enable blocking user input", "Aktivera blockering av användarinmatning"), + ("Change view", ""), + ("Big tiles", ""), + ("Small tiles", ""), + ("List", ""), + ("Virtual display", ""), + ("Plug out all", ""), + ("True color (4:4:4)", ""), + ("Enable blocking user input", ""), ("id_input_tip", ""), ("privacy_mode_impl_mag_tip", ""), ("privacy_mode_impl_virtual_display_tip", ""), - ("Enter privacy mode", "Aktivera privatläge"), - ("Exit privacy mode", "Inaktivera privatläge"), + ("Enter privacy mode", ""), + ("Exit privacy mode", ""), ("idd_not_support_under_win10_2004_tip", ""), ("input_source_1_tip", ""), ("input_source_2_tip", ""), - ("Swap control-command key", "Byt control-command knapp"), + ("Swap control-command key", ""), ("swap-left-right-mouse", ""), - ("2FA code", "Tvåstegsverifieringskod"), - ("More", "Mer"), + ("2FA code", ""), + ("More", ""), ("enable-2fa-title", ""), ("enable-2fa-desc", ""), ("wrong-2fa-code", ""), ("enter-2fa-title", ""), - ("Email verification code must be 6 characters.", "Mailverifikationskoden måste vara 6 tecken."), - ("2FA code must be 6 digits.", "Tvåstegsverifikationskoden måste vara 6 siffor."), - ("Multiple Windows sessions found", "Flera Windows sessioner hittades"), - ("Please select the session you want to connect to", "Välj den session du vill ansluta till"), + ("Email verification code must be 6 characters.", ""), + ("2FA code must be 6 digits.", ""), + ("Multiple Windows sessions found", ""), + ("Please select the session you want to connect to", ""), ("powered_by_me", ""), ("outgoing_only_desk_tip", ""), ("preset_password_warning", ""), - ("Security Alert", "Säkerhetsvarning"), - ("My address book", "Min adressbok"), - ("Personal", "Personlig"), - ("Owner", "Ägare"), - ("Set shared password", "Välj delat lösenord"), - ("Exist in", "Existerar i"), - ("Read-only", "Skrivskyddad"), - ("Read/Write", "Läs/Skriv"), - ("Full Control", "Full kontroll"), + ("Security Alert", ""), + ("My address book", ""), + ("Personal", ""), + ("Owner", ""), + ("Set shared password", ""), + ("Exist in", ""), + ("Read-only", ""), + ("Read/Write", ""), + ("Full Control", ""), ("share_warning_tip", ""), - ("Everyone", "Alla"), + ("Everyone", ""), ("ab_web_console_tip", ""), ("allow-only-conn-window-open-tip", ""), ("no_need_privacy_mode_no_physical_displays_tip", ""), - ("Follow remote cursor", "Följ fjärrpekaren"), - ("Follow remote window focus", "Följ fjärrfönstrets fokus"), + ("Follow remote cursor", ""), + ("Follow remote window focus", ""), ("default_proxy_tip", ""), ("no_audio_input_device_tip", ""), - ("Incoming", "Inkommande"), - ("Outgoing", "Utgående"), - ("Clear Wayland screen selection", "Rensa wayland-skärmens val"), + ("Incoming", ""), + ("Outgoing", ""), + ("Clear Wayland screen selection", ""), ("clear_Wayland_screen_selection_tip", ""), ("confirm_clear_Wayland_screen_selection_tip", ""), ("android_new_voice_call_tip", ""), ("texture_render_tip", ""), - ("Use texture rendering", "Använd texturrendering"), - ("Floating window", "Flytande fönster"), + ("Use texture rendering", ""), + ("Floating window", ""), ("floating_window_tip", ""), - ("Keep screen on", "Behåll skärmen på"), - ("Never", "Aldrig"), + ("Keep screen on", ""), + ("Never", ""), ("During controlled", ""), - ("During service is on", "Medan tjänsten är på"), - ("Capture screen using DirectX", "Spela in skärmen med DirectX"), - ("Back", "Bak"), - ("Apps", "Appar"), - ("Volume up", "Volym upp"), - ("Volume down", "Volym ner"), - ("Power", "Strömbrytare"), - ("Telegram bot", "Telegram bot"), + ("During service is on", ""), + ("Capture screen using DirectX", ""), + ("Back", ""), + ("Apps", ""), + ("Volume up", ""), + ("Volume down", ""), + ("Power", ""), + ("Telegram bot", ""), ("enable-bot-tip", ""), ("enable-bot-desc", ""), ("cancel-2fa-confirm-tip", ""), ("cancel-bot-confirm-tip", ""), - ("About RustDesk", "Om RustDesk"), - ("Send clipboard keystrokes", "Skicka knappkombination för urklipp"), + ("About RustDesk", ""), + ("Send clipboard keystrokes", ""), ("network_error_tip", ""), - ("Unlock with PIN", "Lås upp med PIN"), - ("Requires at least {} characters", "Kräver minst {} tecken}"), - ("Wrong PIN", "Fel PIN"), - ("Set PIN", "Välj PIN"), - ("Enable trusted devices", "Tillåt betrodda enheter"), - ("Manage trusted devices", "Hantera betrodda enheter"), - ("Platform", "Plattform"), - ("Days remaining", "Dagar kvar"), + ("Unlock with PIN", ""), + ("Requires at least {} characters", ""), + ("Wrong PIN", ""), + ("Set PIN", ""), + ("Enable trusted devices", ""), + ("Manage trusted devices", ""), + ("Platform", ""), + ("Days remaining", ""), ("enable-trusted-devices-tip", ""), - ("Parent directory", "Föräldrakatalog"), - ("Resume", "Återuppta"), - ("Invalid file name", "Felaktigt filnamn"), + ("Parent directory", ""), + ("Resume", ""), + ("Invalid file name", ""), ("one-way-file-transfer-tip", ""), - ("Authentication Required", "Autentisering krävs"), - ("Authenticate", "Autentisera"), + ("Authentication Required", ""), + ("Authenticate", ""), ("web_id_input_tip", ""), - ("Download", "Ladda ner"), - ("Upload folder", "Ladda upp mapp"), - ("Upload files", "Ladda upp filer"), - ("Clipboard is synchronized", "Urklippet är synkroniserat"), - ("Update client clipboard", "Uppdatera klientens urklipp"), - ("Untagged", "Otaggad"), + ("Download", ""), + ("Upload folder", ""), + ("Upload files", ""), + ("Clipboard is synchronized", ""), + ("Update client clipboard", ""), + ("Untagged", ""), ("new-version-of-{}-tip", ""), - ("Accessible devices", "Tillgängliga enheter"), + ("Accessible devices", ""), ("upgrade_remote_rustdesk_client_to_{}_tip", ""), ("d3d_render_tip", ""), - ("Use D3D rendering", "Använd D3D rendering"), - ("Printer", "Skrivarer"), + ("Use D3D rendering", ""), + ("Printer", ""), ("printer-os-requirement-tip", ""), ("printer-requires-installed-{}-client-tip", ""), ("printer-{}-not-installed-tip", ""), ("printer-{}-ready-tip", ""), - ("Install {} Printer", "Installera {} skrivare"), - ("Outgoing Print Jobs", "Utgående skrivarjobb"), - ("Incoming Print Jobs", "Inkommande skrivarjobb"), - ("Incoming Print Job", "Inkommande skrivarjobb"), + ("Install {} Printer", ""), + ("Outgoing Print Jobs", ""), + ("Incoming Print Jobs", ""), + ("Incoming Print Job", ""), ("use-the-default-printer-tip", ""), ("use-the-selected-printer-tip", ""), ("auto-print-tip", ""), @@ -672,78 +675,33 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("remote-printing-disallowed-text-tip", ""), ("save-settings-tip", ""), ("dont-show-again-tip", ""), - ("Take screenshot", "Ta skärmbild"), - ("Taking screenshot", "Tar skärmbild"), + ("Take screenshot", ""), + ("Taking screenshot", ""), ("screenshot-merged-screen-not-supported-tip", ""), ("screenshot-action-tip", ""), - ("Save as", "Spara som"), - ("Copy to clipboard", "Kppiera till urklipp"), - ("Enable remote printer", "Aktivera fjärrskrivare"), - ("Downloading {}", "Laddar ner {}"), - ("{} Update", "{} Uppdatera"), + ("Save as", ""), + ("Copy to clipboard", ""), + ("Enable remote printer", ""), + ("Downloading {}", ""), + ("{} Update", ""), ("{}-to-update-tip", ""), ("download-new-version-failed-tip", ""), - ("Auto update", "Automatisk uppdatering"), + ("Auto update", ""), ("update-failed-check-msi-tip", ""), ("websocket_tip", ""), - ("Use WebSocket", "Använd WebSocket"), - ("Trackpad speed", "Styrplattans hastighet"), - ("Default trackpad speed", "Standardhastighet för styrplattan"), - ("Numeric one-time password", "Numeriskt engångslösenord"), - ("Enable IPv6 P2P connection", "Aktivera IPv6 P2P anslutning"), - ("Enable UDP hole punching", "Aktivera UDP hålslagning"), + ("Use WebSocket", ""), + ("Trackpad speed", ""), + ("Default trackpad speed", ""), + ("Numeric one-time password", ""), + ("Enable IPv6 P2P connection", ""), + ("Enable UDP hole punching", ""), ("View camera", "Visa kamera"), - ("Enable camera", "Aktivera kamera"), - ("No cameras", "Inga kameror"), + ("Enable camera", ""), + ("No cameras", ""), ("view_camera_unsupported_tip", ""), - ("Terminal", "Terminal"), - ("Enable terminal", "Aktivera terminal"), - ("New tab", "Ny flik"), - ("Keep terminal sessions on disconnect", "Behåll terminalsessioner vid frånkpppling"), - ("Terminal (Run as administrator)", "Terminal (Kör som administratör)"), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", "Misslyckades med att hämta användartoken."), - ("Incorrect username or password.", "Felaktigt användarnamn eller lösenord."), - ("The user is not an administrator.", "Användaren är inte en administratör."), - ("Failed to check if the user is an administrator.", "Misslyckades med att kontrollera om användaren är administratör."), - ("Supported only in the installed version.", "Stöds endast i den installerade versionen."), - ("elevation_username_tip", ""), - ("Preparing for installation ...", "Förbereder för installation ..."), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Fortsätt med {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ta.rs b/src/lang/ta.rs index 93aeb6462..272766831 100644 --- a/src/lang/ta.rs +++ b/src/lang/ta.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "OS கடவுச்சொல்"), ("install_tip", "நிறுவு_குறிப்பு"), ("Click to upgrade", "மேம்படுத்த கிளிக் செய்"), + ("Click to download", "பதிவிறக்க கிளிக் செய்"), + ("Click to update", "புதுப்பிக்க கிளிக் செய்"), ("Configure", "உள்ளமை"), ("config_acc", "உள்ளமைவு_அக்கெஸ்ஸ்"), ("config_screen", "config_screen"), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "விசைப்பலகை அமைப்புகள்"), ("Full Access", "முழு அணுகல்"), ("Screen Share", "திரை பகிர்வு"), - ("ubuntu-21-04-required", "Wayland க்கு Ubuntu 21.04+ தேவை"), - ("wayland-requires-higher-linux-version", "Wayland க்கு உயர் Linux பதிப்பு தேவை. X11 முயற்சிக்கவும் அல்லது OS மாற்றவும்."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland க்கு Ubuntu 21.04+ தேவை"), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland க்கு உயர் Linux பதிப்பு தேவை. X11 முயற்சிக்கவும் அல்லது OS மாற்றவும்."), ("JumpLink", "ஜம்ப் லிங்க்"), ("Please Select the screen to be shared(Operate on the peer side).", "பகிரப்பட வேண்டிய திரை தேர்ந்தெடுக்கவும்"), ("Show RustDesk", "RustDesk ஐ காட்டு"), ("This PC", "இந்த PC"), ("or", "அல்லது"), + ("Continue with", "உடன் தொடர்"), ("Elevate", "உயர்த்து"), ("Zoom cursor", "கர்சரை பெரிதாக்கு"), ("Accept sessions via password", "கடவுச்சொல் வழியாக அமர்வுகளை ஏற்று"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "காலி_விருப்பமான_குறிப்பு"), ("empty_lan_tip", "காலி_லேன்_குறிப்பு"), ("empty_address_book_tip", "காலி_முகவரி_புத்தக_குறிப்பு"), + ("eg: admin", "எ.கா: admin"), ("Empty Username", "காலி பயனர்பெயர்"), ("Empty Password", "காலி கடவுச்சொல்"), ("Me", "நான்"), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "{} உடன் தொடர்"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/template.rs b/src/lang/template.rs index 33b359c5e..a4934e82e 100644 --- a/src/lang/template.rs +++ b/src/lang/template.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", ""), ("install_tip", ""), ("Click to upgrade", ""), + ("Click to download", ""), + ("Click to update", ""), ("Configure", ""), ("config_acc", ""), ("config_screen", ""), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", ""), ("Full Access", ""), ("Screen Share", ""), - ("ubuntu-21-04-required", ""), - ("wayland-requires-higher-linux-version", ""), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", ""), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", ""), ("JumpLink", ""), ("Please Select the screen to be shared(Operate on the peer side).", ""), ("Show RustDesk", ""), ("This PC", ""), ("or", ""), + ("Continue with", ""), ("Elevate", ""), ("Zoom cursor", ""), ("Accept sessions via password", ""), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", ""), ("empty_lan_tip", ""), ("empty_address_book_tip", ""), + ("eg: admin", ""), ("Empty Username", ""), ("Empty Password", ""), ("Me", ""), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", ""), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/th.rs b/src/lang/th.rs index a24c60bf6..65774bffc 100644 --- a/src/lang/th.rs +++ b/src/lang/th.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "รหัสผ่านระบบปฏิบัติการ"), ("install_tip", "เนื่องด้วยข้อจำกัดของการใช้งาน UAC ทำให้ RustDesk ไม่สามารถทำงานได้ปกติในฝั่งปลายทางในบางครั้ง เพื่อหลีกเลี่ยงข้อจำกัดของ UAC กรุณากดปุ่มด้านล่างเพื่อติดตั้ง RustDesk ไปยังระบบของคุณ"), ("Click to upgrade", "คลิกเพื่ออัปเกรด"), + ("Click to download", "คลิกเพื่อดาวน์โหลด"), + ("Click to update", "คลิกเพื่ออัปเดต"), ("Configure", "ปรับแต่งค่า"), ("config_acc", "เพื่อที่จะควบคุมเดสก์ท็อปปลายทางของคุณ คุณจำเป็นจะต้องอนุญาตสิทธิ์ \"การเข้าถึง\" ให้แก่ RustDesk"), ("config_screen", "เพื่อที่จะควบคุมเดสก์ท็อปปลายทางของคุณ คุณจำเป็นจะต้องอนุญาตสิทธิ์ \"การบันทึกภาพหน้าจอ\" ให้แก่ RustDesk"), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "การตั้งค่าคีย์บอร์ด"), ("Full Access", "การเข้าถึงทั้งหมด"), ("Screen Share", "การแชร์จอ"), - ("ubuntu-21-04-required", "Wayland ต้องการ Ubuntu เวอร์ชัน 21.04 หรือสูงกว่า"), - ("wayland-requires-higher-linux-version", "Wayland ต้องการลินุกซ์เวอร์ชันที่สูงกว่านี้ กรุณาเปลี่ยนไปใช้เดสก์ท็อป X11 หรือเปลี่ยนระบบปฏิบัติการของคุณ"), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland ต้องการ Ubuntu เวอร์ชัน 21.04 หรือสูงกว่า"), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland ต้องการลินุกซ์เวอร์ชันที่สูงกว่านี้ กรุณาเปลี่ยนไปใช้เดสก์ท็อป X11 หรือเปลี่ยนระบบปฏิบัติการของคุณ"), ("JumpLink", "View"), ("Please Select the screen to be shared(Operate on the peer side).", "กรุณาเลือกหน้าจอที่ต้องการแชร์ (ใช้งานในอีกฝั่งของการเชื่อมต่อ)"), ("Show RustDesk", "แสดง RustDesk"), ("This PC", "พีซีเครื่องนี้"), ("or", "หรือ"), + ("Continue with", "ทำต่อด้วย"), ("Elevate", "ยกระดับ"), ("Zoom cursor", "ขยายเคอร์เซอร์"), ("Accept sessions via password", "ยอมรับการเชื่อมต่อด้วยรหัสผ่าน"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "ยังไม่มีการเชื่อมต่อรายการโปรดเหรอ? มาเริ่มต้นหาใครซักคนเพื่อเชื่อมต่อด้วย และเพิ่มเข้าไปยังรายการโปรดของคุณกัน"), ("empty_lan_tip", "ไม่นะ ดูเหมือนว่าเราจะยังไม่พบใครตรงนี้"), ("empty_address_book_tip", "ดูเหมือนว่าคุณยังไม่มีใครถูกบันทึกในสมุดรายชื่อของคุณ"), + ("eg: admin", "เช่น ผู้ดูแลระบบ"), ("Empty Username", "ชื่อผู้ใช้งานว่างเปล่า"), ("Empty Password", "รหัสผ่านว่างเปล่า"), ("Me", "ฉัน"), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", ""), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "ทำต่อด้วย {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/tr.rs b/src/lang/tr.rs index c28086cc9..8284dcc51 100644 --- a/src/lang/tr.rs +++ b/src/lang/tr.rs @@ -3,8 +3,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = [ ("Status", "Durum"), ("Your Desktop", "Sizin Masaüstünüz"), - ("desk_tip", "Masaüstünüze bu ID ve parola ile erişilebilir"), - ("Password", "Parola"), + ("desk_tip", "Masaüstünüze bu ID ve şifre ile erişilebilir"), + ("Password", "Şifre"), ("Ready", "Hazır"), ("Established", "Bağlantı sağlandı"), ("connecting_status", "Bağlanılıyor "), @@ -13,16 +13,16 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Service is running", "Servis çalışıyor"), ("Service is not running", "Servis çalışmıyor"), ("not_ready_status", "Hazır değil. Bağlantınızı kontrol edin"), - ("Control Remote Desktop", "Uzak Masaüstünü Denetle"), + ("Control Remote Desktop", "Bağlanılacak Uzak Bağlantı ID"), ("Transfer file", "Dosya transferi"), ("Connect", "Bağlan"), - ("Recent sessions", "Son oturumlar"), + ("Recent sessions", "Son Bağlanılanlar"), ("Address book", "Adres Defteri"), ("Confirmation", "Onayla"), - ("TCP tunneling", "TCP tünelleri"), + ("TCP tunneling", "TCP Tünelleri"), ("Remove", "Kaldır"), - ("Refresh random password", "Yeni rastgele parola oluştur"), - ("Set your own password", "Kendi parolanı oluştur"), + ("Refresh random password", "Yeni rastgele şifre oluştur"), + ("Set your own password", "Kendi şifreni oluştur"), ("Enable keyboard/mouse", "Klavye ve Fareye izin ver"), ("Enable clipboard", "Kopyalanan geçici veriye izin ver"), ("Enable file transfer", "Dosya Transferine izin ver"), @@ -37,19 +37,19 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Clipboard is empty", "Kopyalanan geçici veri boş"), ("Stop service", "Servisi Durdur"), ("Change ID", "ID Değiştir"), - ("Your new ID", "Yeni ID'niz"), - ("length %min% to %max%", "uzunluk %min% ila %max%"), - ("starts with a letter", "bir harfle başlar"), - ("allowed characters", "izin verilen karakterler"), + ("Your new ID", ""), + ("length %min% to %max%", ""), + ("starts with a letter", ""), + ("allowed characters", ""), ("id_change_tip", "Yalnızca a-z, A-Z, 0-9, - (dash) ve _ (alt çizgi) karakterlerini kullanabilirsiniz. İlk karakter a-z veya A-Z olmalıdır. Uzunluk 6 ile 16 karakter arasında olmalıdır."), ("Website", "Website"), ("About", "Hakkında"), - ("Slogan_tip", "Bu kaotik dünyada gönülden yapıldı!"), - ("Privacy Statement", "Gizlilik Beyanı"), + ("Slogan_tip", ""), + ("Privacy Statement", ""), ("Mute", "Sustur"), - ("Build Date", "Derleme Tarihi"), - ("Version", "Sürüm"), - ("Home", "Ana Sayfa"), + ("Build Date", ""), + ("Version", ""), + ("Home", ""), ("Audio Input", "Ses Girişi"), ("Enhancements", "Geliştirmeler"), ("Hardware Codec", "Donanımsal Codec"), @@ -64,18 +64,18 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Not available", "Erişilebilir değil"), ("Too frequent", "Çok sık"), ("Cancel", "İptal"), - ("Skip", "Atla"), + ("Skip", "Geç"), ("Close", "Kapat"), ("Retry", "Tekrar Dene"), ("OK", "Tamam"), - ("Password Required", "Parola Gerekli"), - ("Please enter your password", "Lütfen parolanızı giriniz"), - ("Remember password", "Parolayı hatırla"), - ("Wrong Password", "Hatalı parola"), + ("Password Required", "Şifre Gerekli"), + ("Please enter your password", "Lütfen şifrenizi giriniz"), + ("Remember password", "Şifreyi hatırla"), + ("Wrong Password", "Hatalı şifre"), ("Do you want to enter again?", "Tekrar giriş yapmak ister misiniz?"), ("Connection Error", "Bağlantı Hatası"), ("Error", "Hata"), - ("Reset by the peer", "Eş tarafından sıfırlandı"), + ("Reset by the peer", "Eş tarafında sıfırla"), ("Connecting...", "Bağlanılıyor..."), ("Connection in progress. Please wait.", "Bağlantı sağlanıyor. Lütfen bekleyiniz."), ("Please try 1 minute later", "Lütfen 1 dakika sonra tekrar deneyiniz"), @@ -135,18 +135,20 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Refresh", "Yenile"), ("ID does not exist", "ID bulunamadı"), ("Failed to connect to rendezvous server", "ID oluşturma sunucusuna bağlanılamadı"), - ("Please try later", "Daha sonra tekrar deneyiniz"), + ("Please try later", "Dağa sonra tekrar deneyiniz"), ("Remote desktop is offline", "Uzak masaüstü kapalı"), ("Key mismatch", "Anahtar uyumlu değil"), ("Timeout", "Zaman aşımı"), ("Failed to connect to relay server", "Relay sunucusuna bağlanılamadı"), ("Failed to connect via rendezvous server", "ID oluşturma sunucusuna bağlanılamadı"), - ("Failed to connect via relay server", "Aktarma sunucusuna bağlanılamadı"), + ("Failed to connect via relay server", "Relay oluşturma sunucusuna bağlanılamadı"), ("Failed to make direct connection to remote desktop", "Uzak masaüstüne doğrudan bağlantı kurulamadı"), - ("Set Password", "Parola ayarla"), - ("OS Password", "İşletim Sistemi Parolası"), + ("Set Password", "Şifre ayarla"), + ("OS Password", "İşletim Sistemi Şifresi"), ("install_tip", "Kullanıcı Hesabı Denetimi nedeniyle, RustDesk bir uzak masaüstü olarak düzgün çalışmayabilir. Bu sorunu önlemek için, RustDesk'i sistem seviyesinde kurmak için aşağıdaki butona tıklayın."), ("Click to upgrade", "Yükseltmek için tıklayınız"), + ("Click to download", "İndirmek için tıklayınız"), + ("Click to update", "Güncellemek için tıklayınız"), ("Configure", "Ayarla"), ("config_acc", "Masaüstünüzü dışarıdan kontrol etmek için RustDesk'e \"Erişilebilirlik\""), ("config_screen", "Masaüstünüzü dışarıdan kontrol etmek için RustDesk'e \"Ekran Kaydı\" iznini vermeniz gerekir."), @@ -184,7 +186,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Direct and unencrypted connection", "Doğrudan ve şifrelenmemiş bağlantı"), ("Relayed and unencrypted connection", "Aktarmalı ve şifrelenmemiş bağlantı"), ("Enter Remote ID", "Uzak ID'yi Girin"), - ("Enter your password", "Parolanızı girin"), + ("Enter your password", "Şifrenizi girin"), ("Logging in...", "Giriş yapılıyor..."), ("Enable RDP session sharing", "RDP oturum paylaşımını etkinleştir"), ("Auto Login", "Otomatik giriş"), @@ -208,15 +210,15 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Closed manually by the peer", "Eş tarafından manuel olarak kapatıldı"), ("Enable remote configuration modification", "Uzaktan yapılandırma değişikliğini etkinleştir"), ("Run without install", "Yüklemeden çalıştır"), - ("Connect via relay", "Aktarmalı üzerinden bağlan"), - ("Always connect via relay", "Her zaman aktarmalı üzerinden bağlan"), + ("Connect via relay", ""), + ("Always connect via relay", "Always connect via relay"), ("whitelist_tip", "Bu masaüstüne yalnızca yetkili IP adresleri bağlanabilir"), ("Login", "Giriş yap"), - ("Verify", "Doğrula"), - ("Remember me", "Beni hatırla"), - ("Trust this device", "Bu cihaza güvenin"), - ("Verification code", "Doğrulama kodu"), - ("verification_tip", "doğrulama tipi"), + ("Verify", ""), + ("Remember me", ""), + ("Trust this device", ""), + ("Verification code", ""), + ("verification_tip", ""), ("Logout", "Çıkış yap"), ("Tags", "Etiketler"), ("Search ID", "ID Arama"), @@ -226,11 +228,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Unselect all tags", "Tüm etiketlerin seçimini kaldır"), ("Network error", "Bağlantı hatası"), ("Username missed", "Kullanıcı adı boş"), - ("Password missed", "Parola boş"), + ("Password missed", "Şifre boş"), ("Wrong credentials", "Yanlış kimlik bilgileri"), - ("The verification code is incorrect or has expired", "Doğrulama kodu hatalı veya süresi dolmuş"), + ("The verification code is incorrect or has expired", ""), ("Edit Tag", "Etiketi düzenle"), - ("Forget Password", "Parolayı Unut"), + ("Forget Password", "Şifreyi Unut"), ("Favorites", "Favoriler"), ("Add to Favorites", "Favorilere ekle"), ("Remove from Favorites", "Favorilerden çıkar"), @@ -268,9 +270,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Share screen", "Ekranı Paylaş"), ("Chat", "Mesajlaş"), ("Total", "Toplam"), - ("items", "ögeler"), + ("items", "öğeler"), ("Selected", "Seçildi"), - ("Screen Capture", "Ekran Görüntüsü"), + ("Screen Capture", "Ekran görüntüsü"), ("Input Control", "Giriş Kontrolü"), ("Audio Capture", "Ses Yakalama"), ("Do you accept?", "Kabul ediyor musun?"), @@ -282,10 +284,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("android_service_will_start_tip", "Ekran Yakalamanın etkinleştirilmesi, hizmeti otomatik olarak başlatacak ve diğer cihazların bu cihazdan bağlantı talep etmesine izin verecektir."), ("android_stop_service_tip", "Hizmetin kapatılması, kurulan tüm bağlantıları otomatik olarak kapatacaktır."), ("android_version_audio_tip", "Mevcut Android sürümü ses yakalamayı desteklemiyor, lütfen Android 10 veya sonraki bir sürüme yükseltin."), - ("android_start_service_tip", "Ekran paylaşım hizmetini başlatmak için [Hizmeti başlat] ögesine dokunun veya [Ekran Görüntüsü] iznini etkinleştirin."), - ("android_permission_may_not_change_tip", "Kurulan bağlantılara ait izinler, yeniden bağlantı kurulana kadar anında değiştirilemez."), + ("android_start_service_tip", ""), + ("android_permission_may_not_change_tip", ""), ("Account", "Hesap"), - ("Overwrite", "Üzerine yaz"), + ("Overwrite", "üzerine yaz"), ("This file exists, skip or overwrite this file?", "Bu dosya var, bu dosya atlansın veya üzerine yazılsın mı?"), ("Quit", "Çıkış"), ("Help", "Yardım"), @@ -295,50 +297,50 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Unsupported", "desteklenmiyor"), ("Peer denied", "eş reddedildi"), ("Please install plugins", "Lütfen eklentileri yükleyin"), - ("Peer exit", "Eş çıkışı"), - ("Failed to turn off", "Kapatılamadı"), + ("Peer exit", "eş çıkışı"), + ("Failed to turn off", "kapatılamadı"), ("Turned off", "Kapatıldı"), ("Language", "Dil"), ("Keep RustDesk background service", "RustDesk arka plan hizmetini sürdürün"), ("Ignore Battery Optimizations", "Pil Optimizasyonlarını Yoksay"), - ("android_open_battery_optimizations_tip", "Bu özelliği devre dışı bırakmak istiyorsanız lütfen bir sonraki RustDesk uygulama ayarları sayfasına gidin, [Pil] ögesini bulun ve girin, [Sınırsız] ögesinin işaretini kaldırın"), - ("Start on boot", "Önyüklemede başla"), - ("Start the screen sharing service on boot, requires special permissions", "Ekran paylaşım hizmetini önyüklemede başlatmak için özel izinler gerekir"), - ("Connection not allowed", "Bağlantıya izin verilmedi"), + ("android_open_battery_optimizations_tip", ""), + ("Start on boot", ""), + ("Start the screen sharing service on boot, requires special permissions", ""), + ("Connection not allowed", "bağlantıya izin verilmedi"), ("Legacy mode", "Eski mod"), ("Map mode", "Haritalama modu"), ("Translate mode", "Çeviri modu"), - ("Use permanent password", "Kalıcı parola kullan"), - ("Use both passwords", "İki parolayı da kullan"), - ("Set permanent password", "Kalıcı parola oluştur"), + ("Use permanent password", "Kalıcı şifre kullan"), + ("Use both passwords", "İki şifreyide kullan"), + ("Set permanent password", "Kalıcı şifre oluştur"), ("Enable remote restart", "Uzaktan yeniden başlatmayı aktif et"), ("Restart remote device", "Uzaktaki cihazı yeniden başlat"), - ("Are you sure you want to restart", "Yeniden başlatmak istediğine emin misin?"), + ("Are you sure you want to restart", "Yeniden başlatmak istediğinize emin misin?"), ("Restarting remote device", "Uzaktan yeniden başlatılıyor"), - ("remote_restarting_tip", "Uzak cihaz yeniden başlatılıyor, lütfen bu mesaj kutusunu kapatın ve bir süre sonra kalıcı parola ile yeniden bağlanın"), + ("remote_restarting_tip", "remote_restarting_tip"), ("Copied", "Kopyalandı"), - ("Exit Fullscreen", "Tam Ekrandan Çık"), - ("Fullscreen", "Tam Ekran"), + ("Exit Fullscreen", "Tam ekrandan çık"), + ("Fullscreen", "Tam ekran"), ("Mobile Actions", "Mobil İşlemler"), ("Select Monitor", "Monitörü Seç"), ("Control Actions", "Kontrol Eylemleri"), - ("Display Settings", "Görüntü Ayarları"), + ("Display Settings", "Görüntü ayarları"), ("Ratio", "Oran"), - ("Image Quality", "Görüntü Kalitesi"), + ("Image Quality", "Görüntü kalitesi"), ("Scroll Style", "Kaydırma Stili"), - ("Show Toolbar", "Araç Çubuğunu Göster"), - ("Hide Toolbar", "Araç Çubuğunu Gizle"), + ("Show Toolbar", ""), + ("Hide Toolbar", ""), ("Direct Connection", "Doğrudan Bağlantı"), - ("Relay Connection", "Aktarmalı Bağlantı"), - ("Secure Connection", "Güvenli Bağlantı"), - ("Insecure Connection", "Güvenli Olmayan Bağlantı"), - ("Scale original", "Orijinal ölçekte"), - ("Scale adaptive", "Uyarlanabilir ölçekte"), + ("Relay Connection", "Röle Bağlantısı"), + ("Secure Connection", "Güvenli bağlantı"), + ("Insecure Connection", "Güvenli Bağlantı"), + ("Scale original", "Orijinali ölçeklendir"), + ("Scale adaptive", "Ölçek uyarlanabilir"), ("General", "Genel"), ("Security", "Güvenlik"), ("Theme", "Tema"), ("Dark Theme", "Koyu Tema"), - ("Light Theme", "Açık Tema"), + ("Light Theme", ""), ("Dark", "Koyu"), ("Light", "Açık"), ("Follow System", "Sisteme Uy"), @@ -347,26 +349,26 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable audio", "Sesi Aktif Et"), ("Unlock Network Settings", "Ağ Ayarlarını Aç"), ("Server", "Sunucu"), - ("Direct IP Access", "Doğrudan IP Erişimi"), + ("Direct IP Access", "Direk IP Erişimi"), ("Proxy", "Vekil"), ("Apply", "Uygula"), - ("Disconnect all devices?", "Tüm cihazların bağlantısı kesilsin mi?"), + ("Disconnect all devices?", "Tüm cihazların bağlantısını kes?"), ("Clear", "Temizle"), ("Audio Input Device", "Ses Giriş Aygıtı"), ("Use IP Whitelisting", "IP Beyaz Listeyi Kullan"), ("Network", "Ağ"), - ("Pin Toolbar", "Araç Çubuğunu Sabitle"), - ("Unpin Toolbar", "Araç Çubuğunu Sabitlemeyi Kaldır"), - ("Recording", "Kaydediliyor"), - ("Directory", "Dizin"), - ("Automatically record incoming sessions", "Gelen oturumları otomatik olarak kaydet"), - ("Automatically record outgoing sessions", "Giden oturumları otomatik olarak kaydet"), + ("Pin Toolbar", ""), + ("Unpin Toolbar", ""), + ("Recording", "Kayıt Ediliyor"), + ("Directory", "Klasör"), + ("Automatically record incoming sessions", "Gelen oturumları otomatik olarak kayıt et"), + ("Automatically record outgoing sessions", ""), ("Change", "Değiştir"), ("Start session recording", "Oturum kaydını başlat"), ("Stop session recording", "Oturum kaydını sonlandır"), ("Enable recording session", "Kayıt Oturumunu Aktif Et"), ("Enable LAN discovery", "Yerel Ağ Keşfine İzin Ver"), - ("Deny LAN discovery", "Yerel Ağ Keşfine İzin Verme"), + ("Deny LAN discovery", "Yerl Ağ Keşfine İzin Verme"), ("Write a message", "Bir mesaj yazın"), ("Prompt", "İstem"), ("Please wait for confirmation of UAC...", "UAC onayı için lütfen bekleyiniz..."), @@ -377,23 +379,23 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Klavye Ayarları"), ("Full Access", "Tam Erişim"), ("Screen Share", "Ekran Paylaşımı"), - ("ubuntu-21-04-required", "Wayland, Ubuntu 21.04 veya daha yüksek bir sürüm gerektirir."), - ("wayland-requires-higher-linux-version", "Wayland, linux dağıtımının daha yüksek bir sürümünü gerektirir. Lütfen X11 masaüstünü deneyin veya işletim sisteminizi değiştirin."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland, Ubuntu 21.04 veya daha yüksek bir sürüm gerektirir."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland, linux dağıtımının daha yüksek bir sürümünü gerektirir. Lütfen X11 masaüstünü deneyin veya işletim sisteminizi değiştirin."), ("JumpLink", "View"), ("Please Select the screen to be shared(Operate on the peer side).", "Lütfen paylaşılacak ekranı seçiniz (Ekran tarafında çalıştırın)."), ("Show RustDesk", "RustDesk'i Göster"), ("This PC", "Bu PC"), ("or", "veya"), + ("Continue with", "bununla devam et"), ("Elevate", "Yükseltme"), ("Zoom cursor", "Yakınlaştırma imleci"), ("Accept sessions via password", "Oturumları parola ile kabul etme"), ("Accept sessions via click", "Tıklama yoluyla oturumları kabul edin"), ("Accept sessions via both", "Her ikisi aracılığıyla oturumları kabul edin"), ("Please wait for the remote side to accept your session request...", "Lütfen uzak tarafın oturum isteğinizi kabul etmesini bekleyin..."), - ("One-time Password", "Tek Kullanımlık Parola"), + ("One-time Password", "Tek Kullanımlık Şifre"), ("Use one-time password", "Tek seferlik parola kullanın"), - ("One-time password length", "Tek seferlik parola uzunluğu"), + ("One-time password length", "Tek seferlik şifre uzunluğu"), ("Request access to your device", "Cihazınıza erişim talep edin"), ("Hide connection management window", "Bağlantı yönetimi penceresini gizle"), ("hide_cm_tip", "Oturumları yalnızca parola ile kabul edebilir ve kalıcı parola kullanıyorsanız gizlemeye izin verin"), @@ -442,7 +444,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Voice call", "Sesli görüşme"), ("Text chat", "Metin sohbeti"), ("Stop voice call", "Sesli görüşmeyi durdur"), - ("relay_hint_tip", "Doğrudan bağlanmak mümkün olmayabilir; aktarmalı bağlanmayı deneyebilirsiniz. Ayrıca, ilk denemenizde aktarma sunucusu kullanmak istiyorsanız ID'nin sonuna \"/r\" ekleyebilir veya son oturum kartındaki \"Her Zaman Aktarmalı Üzerinden Bağlan\" seçeneğini seçebilirsiniz."), + ("relay_hint_tip", "Doğrudan bağlanmak mümkün olmayabilir; röle aracılığıyla bağlanmayı deneyebilirsiniz. Ayrıca, ilk denemenizde bir röle kullanmak istiyorsanız, ID'nin sonuna \"/r\" ekleyebilir veya son oturum kartındaki \"Her Zaman Röle Üzerinden Bağlan\" seçeneğini seçebilirsiniz."), ("Reconnect", "Yeniden Bağlan"), ("Codec", "Kodlayıcı"), ("Resolution", "Çözünürlük"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Henüz favori cihazınız yok mu?\nBağlanacak ve favorilere eklemek için birini bulalım!"), ("empty_lan_tip", "Hayır, henüz hiçbir cihaz bulamadık gibi görünüyor."), ("empty_address_book_tip", "Üzgünüm, şu anda adres defterinizde kayıtlı cihaz yok gibi görünüyor."), + ("eg: admin", "örn: admin"), ("Empty Username", "Boş Kullanıcı Adı"), ("Empty Password", "Boş Parola"), ("Me", "Ben"), @@ -477,7 +480,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("no_desktop_title_tip", "Masaüstü mevcut değil"), ("no_desktop_text_tip", "Lütfen GNOME masaüstünü yükleyin"), ("No need to elevate", "Yükseltmeye gerek yok"), - ("System Sound", "Sistem Sesi"), + ("System Sound", "Sistem Ses"), ("Default", "Varsayılan"), ("New RDP", "Yeni RDP"), ("Fingerprint", "Parmak İzi"), @@ -495,7 +498,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("resolution_fit_local_tip", "Yerel çözünürlüğe sığdır"), ("resolution_custom_tip", "Özel çözünürlük"), ("Collapse toolbar", "Araç çubuğunu daralt"), - ("Accept and Elevate", "Kabul Et ve Yükselt"), + ("Accept and Elevate", "Kabul et ve yükselt"), ("accept_and_elevate_btn_tooltip", "Bağlantıyı kabul et ve UAC izinlerini yükselt."), ("clipboard_wait_response_timeout_tip", "Kopyalama yanıtı için zaman aşımına uğradı."), ("Incoming connection", "Gelen bağlantı"), @@ -526,224 +529,179 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Change Color", "Rengi Değiştir"), ("Primary Color", "Birincil Renk"), ("HSV Color", "HSV Rengi"), - ("Installation Successful!", "Kurulum Başarılı!"), - ("Installation failed!", "Kurulum başarısız!"), - ("Reverse mouse wheel", "Ters fare tekerleği"), - ("{} sessions", "{} oturum"), - ("scam_title", "Dolandırılıyor Olabilirsiniz!"), - ("scam_text1", "Eğer tanımadığınız ve güvenmediğiniz birisiyle telefonda konuşuyorsanız ve sizden RustDesk'i kullanmanızı ve hizmeti başlatmanızı istiyorsa devam etmeyin ve hemen telefonu kapatın."), - ("scam_text2", "Muhtemelen paranızı veya diğer özel bilgilerinizi çalmaya çalışan dolandırıcılardır."), - ("Don't show again", "Bir daha gösterme"), - ("I Agree", "Kabul Ediyorum"), - ("Decline", "Reddet"), - ("Timeout in minutes", "Zaman aşımı (dakika)"), - ("auto_disconnect_option_tip", "Kullanıcı etkin olmadığında gelen oturumları otomatik olarak kapat"), - ("Connection failed due to inactivity", "Etkin olmama nedeniyle otomatik olarak bağlantı kesildi"), - ("Check for software update on startup", "Başlangıçta yazılım güncellemesini kontrol et"), - ("upgrade_rustdesk_server_pro_to_{}_tip", "Lütfen RustDesk Server Pro'yu {} veya daha yeni bir sürüme yükseltin!"), - ("pull_group_failed_tip", "Grup yenilenemedi"), - ("Filter by intersection", "Kesişim noktasına göre filtrele"), - ("Remove wallpaper during incoming sessions", "Gelen oturumlar sırasında duvar kağıdını kaldır"), - ("Test", "Test"), - ("display_is_plugged_out_msg", "Ekran fişi çekilmiş, ilk ekrana geç."), - ("No displays", "Görüntü yok"), - ("Open in new window", "Yeni pencerede aç"), - ("Show displays as individual windows", "Ekranları ayrı pencereler olarak göster"), - ("Use all my displays for the remote session", "Uzak oturum için tüm ekranlarımı kullan"), - ("selinux_tip", "Cihazınızda SELinux etkin olduğundan, RustDesk'in kontrollü tarafta düzgün çalışmasını engelleyebilir."), - ("Change view", "Görünümü değiştir"), - ("Big tiles", "Büyük döşemeler"), - ("Small tiles", "Küçük döşemeler"), - ("List", "Liste"), - ("Virtual display", "Sanal ekran"), - ("Plug out all", "Tümünü çıkar"), - ("True color (4:4:4)", "Gerçek renk (4:4:4)"), - ("Enable blocking user input", "Kullanıcı girişini engellemeyi etkinleştir"), - ("id_input_tip", "Bir ID, doğrudan IP veya portlu bir etki alanı (:) girebilirsiniz.\nBaşka bir sunucudaki bir cihaza erişmek istiyorsanız lütfen sunucu adresini (@?key=) ekleyin, örneğin,\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nGenel bir sunucudaki bir cihaza erişmek istiyorsanız lütfen \"@public\" girin, genel sunucu için anahtara gerek yoktur.\n\nİlk bağlantıda bir aktarma bağlantısının kullanılmasını zorlamak istiyorsanız ID'nin sonuna \"/r\" ekleyin, örneğin, \"9123456234/r\"."), - ("privacy_mode_impl_mag_tip", "Mod 1"), - ("privacy_mode_impl_virtual_display_tip", "Mod 2"), - ("Enter privacy mode", "Gizlilik moduna gir"), - ("Exit privacy mode", "Gizlilik modundan çık"), - ("idd_not_support_under_win10_2004_tip", "Dolaylı ekran sürücüsü desteklenmiyor. Windows 10, sürüm 2004 veya daha yenisi gereklidir."), - ("input_source_1_tip", "Giriş kaynağı 1"), - ("input_source_2_tip", "Giriş kaynağı 2"), - ("Swap control-command key", "Kontrol-komut tuşunu değiştir"), - ("swap-left-right-mouse", "Sol-sağ fare tuşlarını değiştir"), - ("2FA code", "2FA kodu"), - ("More", "Daha"), - ("enable-2fa-title", "İki faktörlü kimlik doğrulamayı etkinleştir"), - ("enable-2fa-desc", "Lütfen kimlik doğrulayıcınızı şimdi kurun. Telefonunuzda veya masaüstünüzde Authy, Microsoft veya Google Authenticator gibi bir kimlik doğrulayıcı uygulaması kullanabilirsiniz. İki faktörlü kimlik doğrulamayı etkinleştirmek için QR kodunu uygulamanızla tarayın ve uygulamanızın gösterdiği kodu girin."), - ("wrong-2fa-code", "Kod doğrulanamıyor. Kod ve yerel saat ayarlarının doğru olduğundan emin olun."), - ("enter-2fa-title", "İki faktörlü kimlik doğrulama"), - ("Email verification code must be 6 characters.", "E-posta doğrulama kodu 6 karakterden oluşmalıdır."), - ("2FA code must be 6 digits.", "2FA kodu 6 haneli olmalıdır."), - ("Multiple Windows sessions found", "Birden fazla Windows oturumu bulundu"), - ("Please select the session you want to connect to", "Lütfen bağlanmak istediğiniz oturumu seçin"), - ("powered_by_me", "RustDesk tarafından desteklenmektedir"), - ("outgoing_only_desk_tip", "Bu özelleştirilmiş bir sürümdür.\nDiğer cihazlara bağlanabilirsiniz, ancak diğer cihazlar cihazınıza bağlanamaz."), - ("preset_password_warning", "Bu özelleştirilmiş sürüm, önceden ayarlanmış bir parola ile birlikte gelir. Bu parolayı bilen herkes cihazınızın tam kontrolünü ele geçirebilir. Bunu beklemiyorsanız yazılımı hemen kaldırın."), - ("Security Alert", "Güvenlik Uyarısı"), - ("My address book", "Adres defterim"), - ("Personal", "Kişisel"), - ("Owner", "Sahip"), - ("Set shared password", "Paylaşılan parolayı ayarla"), - ("Exist in", "İçinde varolan"), - ("Read-only", "Salt okunur"), - ("Read/Write", "Okuma/Yazma"), - ("Full Control", "Tam Kontrol"), - ("share_warning_tip", "Yukarıdaki alanlar paylaşılır ve başkaları tarafından görülebilir"), - ("Everyone", "Herkes"), - ("ab_web_console_tip", "Web konsolu hakkında daha fazla bilgi"), - ("allow-only-conn-window-open-tip", "Yalnızca RustDesk penceresi açıksa bağlantıya izin ver"), - ("no_need_privacy_mode_no_physical_displays_tip", "Fiziksel ekran yok, gizlilik modunu kullanmaya gerek yok."), - ("Follow remote cursor", "Uzak imleci takip et"), - ("Follow remote window focus", "Uzak pencere odağını takip et"), - ("default_proxy_tip", "Varsayılan protokol ve port Socks5 ve 1080'dir."), - ("no_audio_input_device_tip", "Ses girişi aygıtı bulunamadı."), - ("Incoming", "Gelen"), - ("Outgoing", "Giden"), - ("Clear Wayland screen selection", "Wayland ekran seçimini temizle"), - ("clear_Wayland_screen_selection_tip", "Ekran seçimini temizledikten sonra paylaşılacak ekranı tekrar seçebilirsiniz."), - ("confirm_clear_Wayland_screen_selection_tip", "Wayland ekran seçimini temizlemek istediğinizden emin misiniz?"), - ("android_new_voice_call_tip", "Yeni bir sesli arama isteği alındı. Kabul ederseniz sesli iletişime geçilecektir."), - ("texture_render_tip", "Resimleri daha pürüzsüz hale getirmek için doku oluşturmayı kullanın. Oluşturma sorunlarıyla karşılaşırsanız bu seçeneği devre dışı bırakmayı deneyebilirsiniz."), - ("Use texture rendering", "Doku oluşturmayı kullan"), - ("Floating window", "Yüzen pencere"), - ("floating_window_tip", "RustDesk arka plan hizmetini açık tutmaya yardımcı olur"), - ("Keep screen on", "Ekranı açık tut"), - ("Never", "Asla"), - ("During controlled", "Kontrol sırasında"), - ("During service is on", "Servis açıkken"), - ("Capture screen using DirectX", "DirectX kullanarak ekran görüntüsü al"), - ("Back", "Geri"), - ("Apps", "Uygulamalar"), - ("Volume up", "Sesi yükselt"), - ("Volume down", "Sesi azalt"), - ("Power", "Güç"), - ("Telegram bot", "Telegram botu"), - ("enable-bot-tip", "Bu özelliği etkinleştirirseniz botunuzdan 2FA kodunu alabilirsiniz. Aynı zamanda bağlantı bildirimi işlevi de görebilir."), - ("enable-bot-desc", "1. @BotFather ile bir sohbet açın.\n2. \"/newbot\" komutunu gönderin. Bu adımı tamamladıktan sonra bir jeton alacaksınız.\n3. Yeni oluşturduğunuz botla bir sohbet başlatın. Etkinleştirmek için eğik çizgiyle (\"/\") başlayan \"/merhaba\" gibi bir mesaj gönderin.\n"), - ("cancel-2fa-confirm-tip", "2FA'yı iptal etmek istediğinizden emin misiniz?"), - ("cancel-bot-confirm-tip", "Telegram botunu iptal etmek istediğinizden emin misiniz?"), - ("About RustDesk", "RustDesk Hakkında"), - ("Send clipboard keystrokes", "Panoya tuş vuruşlarını gönder"), - ("network_error_tip", "Lütfen ağ bağlantınızı kontrol edin ve ardından yeniden dene'ye tıklayın."), - ("Unlock with PIN", "PIN ile kilidi açın"), - ("Requires at least {} characters", "En az {} karakter gerektirir"), - ("Wrong PIN", "Yanlış PIN"), - ("Set PIN", "PIN'i ayarla"), - ("Enable trusted devices", "Güvenilir cihazları etkinleştir"), - ("Manage trusted devices", "Güvenilir cihazları yönet"), - ("Platform", "Platform"), - ("Days remaining", "Kalan gün sayısı"), - ("enable-trusted-devices-tip", "Güvenilir cihazlarda 2FA doğrulamasını atla"), - ("Parent directory", "Üst dizin"), - ("Resume", "Devam ettir"), - ("Invalid file name", "Geçersiz dosya adı"), - ("one-way-file-transfer-tip", "Kontrol edilen tarafta tek yönlü dosya transferi aktiftir."), - ("Authentication Required", "Kimlik Doğrulama Gerekli"), - ("Authenticate", "Kimlik Doğrula"), - ("web_id_input_tip", "Aynı sunucuda bir kimlik girebilirsiniz, web istemcisinde doğrudan IP erişimi desteklenmez.\nBaşka bir sunucudaki bir cihaza erişmek istiyorsanız lütfen sunucu adresini (@?key=) ekleyin, örneğin,\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=.\nGenel bir sunucudaki bir cihaza erişmek istiyorsanız, lütfen \"@public\" girin, genel sunucu için anahtara gerek yoktur."), - ("Download", "İndir"), - ("Upload folder", "Klasör yükle"), - ("Upload files", "Dosya yükle"), - ("Clipboard is synchronized", "Pano senkronize edildi"), - ("Update client clipboard", "İstemci panosunu güncelle"), - ("Untagged", "Etiketsiz"), - ("new-version-of-{}-tip", "{}'nin yeni bir sürümü mevcut"), - ("Accessible devices", "Erişilebilir cihazlar"), - ("upgrade_remote_rustdesk_client_to_{}_tip", "Lütfen uzak tarafta RustDesk istemcisini {} sürümüne veya daha yenisine güncelleyin!"), - ("d3d_render_tip", "D3D oluşturma etkinleştirildiğinde, bazı bilgisayarlarda uzak kontrol ekranı siyah görünebilir."), - ("Use D3D rendering", "D3D oluşturmayı kullan"), - ("Printer", "Yazıcı"), - ("printer-os-requirement-tip", "Yazıcı çıkış fonksiyonu için Windows 10 veya üzeri gereklidir."), - ("printer-requires-installed-{}-client-tip", "Uzaktan yazdırmayı kullanabilmek için bu cihaza {} yüklenmesi gerekir."), - ("printer-{}-not-installed-tip", "{} Yazıcısı yüklü değil."), - ("printer-{}-ready-tip", "{} Yazıcısı kuruldu ve kullanıma hazır."), - ("Install {} Printer", "{} Yazıcısını Yükle"), - ("Outgoing Print Jobs", "Giden Yazdırma İşleri"), - ("Incoming Print Jobs", "Gelen Yazdırma İşleri"), - ("Incoming Print Job", "Gelen Yazdırma İşi"), - ("use-the-default-printer-tip", "Varsayılan yazıcıyı kullan"), - ("use-the-selected-printer-tip", "Seçili yazıcıyı kullan"), - ("auto-print-tip", "Seçili yazıcıyı kullanarak otomatik olarak yazdır."), - ("print-incoming-job-confirm-tip", "Uzak bir kaynaktan yazdırma işi aldınız. Bunu kendi tarafınızda çalıştırmak ister misiniz?"), - ("remote-printing-disallowed-tile-tip", "Uzak Yazdırma engellendi"), - ("remote-printing-disallowed-text-tip", "Kontrol edilen tarafın izin ayarları Uzak Yazdırmaya izin vermiyor."), - ("save-settings-tip", "Ayarları kaydet"), - ("dont-show-again-tip", "Bunu bir daha gösterme"), - ("Take screenshot", "Ekran görüntüsü al"), - ("Taking screenshot", "Ekran görüntüsü alınıyor"), - ("screenshot-merged-screen-not-supported-tip", "Birden fazla ekranın ekran görüntülerinin birleştirilmesi şu anda desteklenmiyor. Lütfen tek bir ekrana geçin ve tekrar deneyin."), - ("screenshot-action-tip", "Lütfen ekran görüntüsüyle nasıl devam edeceğinizi seçin."), - ("Save as", "Farklı kaydet"), - ("Copy to clipboard", "Panoya kopyala"), - ("Enable remote printer", "Uzak yazıcıyı etkinleştir"), - ("Downloading {}", "{} indiriliyor"), - ("{} Update", "{} Güncellemesi"), - ("{}-to-update-tip", "{} şimdi kapanacak ve yeni sürüm kurulacak."), - ("download-new-version-failed-tip", "İndirme başarısız oldu. Tekrar deneyebilir veya 'İndir' düğmesine tıklayarak sürüm sayfasından manuel olarak indirip güncelleyebilirsiniz."), - ("Auto update", "Otomatik güncelleme"), - ("update-failed-check-msi-tip", "Kurulum yöntemi denetimi başarısız oldu. Sürüm sayfasından indirmek ve manuel olarak yükseltmek için lütfen \"İndir\" düğmesine tıklayın."), - ("websocket_tip", "WebSocket kullanıldığında yalnızca aktarma bağlantıları desteklenir."), - ("Use WebSocket", "WebSocket'ı kullan"), - ("Trackpad speed", "İzleme paneli hızı"), - ("Default trackpad speed", "Varsayılan izleme paneli hızı"), - ("Numeric one-time password", "Sayısal tek seferlik parola"), - ("Enable IPv6 P2P connection", "IPv6 P2P bağlantısını etkinleştir"), - ("Enable UDP hole punching", "UDP delik açmayı etkinleştir"), + ("Installation Successful!", ""), + ("Installation failed!", ""), + ("Reverse mouse wheel", ""), + ("{} sessions", ""), + ("scam_title", ""), + ("scam_text1", ""), + ("scam_text2", ""), + ("Don't show again", ""), + ("I Agree", ""), + ("Decline", ""), + ("Timeout in minutes", ""), + ("auto_disconnect_option_tip", ""), + ("Connection failed due to inactivity", ""), + ("Check for software update on startup", ""), + ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), + ("Filter by intersection", ""), + ("Remove wallpaper during incoming sessions", ""), + ("Test", ""), + ("display_is_plugged_out_msg", ""), + ("No displays", ""), + ("Open in new window", ""), + ("Show displays as individual windows", ""), + ("Use all my displays for the remote session", ""), + ("selinux_tip", ""), + ("Change view", ""), + ("Big tiles", ""), + ("Small tiles", ""), + ("List", ""), + ("Virtual display", ""), + ("Plug out all", ""), + ("True color (4:4:4)", ""), + ("Enable blocking user input", ""), + ("id_input_tip", ""), + ("privacy_mode_impl_mag_tip", ""), + ("privacy_mode_impl_virtual_display_tip", ""), + ("Enter privacy mode", ""), + ("Exit privacy mode", ""), + ("idd_not_support_under_win10_2004_tip", ""), + ("input_source_1_tip", ""), + ("input_source_2_tip", ""), + ("Swap control-command key", ""), + ("swap-left-right-mouse", ""), + ("2FA code", ""), + ("More", ""), + ("enable-2fa-title", ""), + ("enable-2fa-desc", ""), + ("wrong-2fa-code", ""), + ("enter-2fa-title", ""), + ("Email verification code must be 6 characters.", ""), + ("2FA code must be 6 digits.", ""), + ("Multiple Windows sessions found", ""), + ("Please select the session you want to connect to", ""), + ("powered_by_me", ""), + ("outgoing_only_desk_tip", ""), + ("preset_password_warning", ""), + ("Security Alert", ""), + ("My address book", ""), + ("Personal", ""), + ("Owner", ""), + ("Set shared password", ""), + ("Exist in", ""), + ("Read-only", ""), + ("Read/Write", ""), + ("Full Control", ""), + ("share_warning_tip", ""), + ("Everyone", ""), + ("ab_web_console_tip", ""), + ("allow-only-conn-window-open-tip", ""), + ("no_need_privacy_mode_no_physical_displays_tip", ""), + ("Follow remote cursor", ""), + ("Follow remote window focus", ""), + ("default_proxy_tip", ""), + ("no_audio_input_device_tip", ""), + ("Incoming", ""), + ("Outgoing", ""), + ("Clear Wayland screen selection", ""), + ("clear_Wayland_screen_selection_tip", ""), + ("confirm_clear_Wayland_screen_selection_tip", ""), + ("android_new_voice_call_tip", ""), + ("texture_render_tip", ""), + ("Use texture rendering", ""), + ("Floating window", ""), + ("floating_window_tip", ""), + ("Keep screen on", ""), + ("Never", ""), + ("During controlled", ""), + ("During service is on", ""), + ("Capture screen using DirectX", ""), + ("Back", ""), + ("Apps", ""), + ("Volume up", ""), + ("Volume down", ""), + ("Power", ""), + ("Telegram bot", ""), + ("enable-bot-tip", ""), + ("enable-bot-desc", ""), + ("cancel-2fa-confirm-tip", ""), + ("cancel-bot-confirm-tip", ""), + ("About RustDesk", ""), + ("Send clipboard keystrokes", ""), + ("network_error_tip", ""), + ("Unlock with PIN", ""), + ("Requires at least {} characters", ""), + ("Wrong PIN", ""), + ("Set PIN", ""), + ("Enable trusted devices", ""), + ("Manage trusted devices", ""), + ("Platform", ""), + ("Days remaining", ""), + ("enable-trusted-devices-tip", ""), + ("Parent directory", ""), + ("Resume", ""), + ("Invalid file name", ""), + ("one-way-file-transfer-tip", ""), + ("Authentication Required", ""), + ("Authenticate", ""), + ("web_id_input_tip", ""), + ("Download", ""), + ("Upload folder", ""), + ("Upload files", ""), + ("Clipboard is synchronized", ""), + ("Update client clipboard", ""), + ("Untagged", ""), + ("new-version-of-{}-tip", ""), + ("Accessible devices", ""), + ("upgrade_remote_rustdesk_client_to_{}_tip", ""), + ("d3d_render_tip", ""), + ("Use D3D rendering", ""), + ("Printer", ""), + ("printer-os-requirement-tip", ""), + ("printer-requires-installed-{}-client-tip", ""), + ("printer-{}-not-installed-tip", ""), + ("printer-{}-ready-tip", ""), + ("Install {} Printer", ""), + ("Outgoing Print Jobs", ""), + ("Incoming Print Jobs", ""), + ("Incoming Print Job", ""), + ("use-the-default-printer-tip", ""), + ("use-the-selected-printer-tip", ""), + ("auto-print-tip", ""), + ("print-incoming-job-confirm-tip", ""), + ("remote-printing-disallowed-tile-tip", ""), + ("remote-printing-disallowed-text-tip", ""), + ("save-settings-tip", ""), + ("dont-show-again-tip", ""), + ("Take screenshot", ""), + ("Taking screenshot", ""), + ("screenshot-merged-screen-not-supported-tip", ""), + ("screenshot-action-tip", ""), + ("Save as", ""), + ("Copy to clipboard", ""), + ("Enable remote printer", ""), + ("Downloading {}", ""), + ("{} Update", ""), + ("{}-to-update-tip", ""), + ("download-new-version-failed-tip", ""), + ("Auto update", ""), + ("update-failed-check-msi-tip", ""), + ("websocket_tip", ""), + ("Use WebSocket", ""), + ("Trackpad speed", ""), + ("Default trackpad speed", ""), + ("Numeric one-time password", ""), + ("Enable IPv6 P2P connection", ""), + ("Enable UDP hole punching", ""), ("View camera", "Kamerayı görüntüle"), - ("Enable camera", "Kamerayı etkinleştir"), - ("No cameras", "Kamera yok"), - ("view_camera_unsupported_tip", "Uzak cihaz, kameranın görüntülenmesini desteklemiyor."), - ("Terminal", "Terminal"), - ("Enable terminal", "Terminali etkinleştir"), - ("New tab", "Yeni sekme"), - ("Keep terminal sessions on disconnect", "Bağlantı kesildiğinde terminal oturumlarını açık tut"), - ("Terminal (Run as administrator)", "Terminal (Yönetici olarak çalıştır)"), - ("terminal-admin-login-tip", "Lütfen kontrol edilen tarafın yönetici kullanıcı adı ve parolasını giriniz."), - ("Failed to get user token.", "Kullanıcı belirteci alınamadı."), - ("Incorrect username or password.", "Hatalı kullanıcı adı veya parola."), - ("The user is not an administrator.", "Kullanıcı bir yönetici değil."), - ("Failed to check if the user is an administrator.", "Kullanıcının yönetici olup olmadığı kontrol edilemedi."), - ("Supported only in the installed version.", "Sadece yüklü sürümde desteklenir."), - ("elevation_username_tip", "Kullanıcı adı veya etki alanı\\kullanıcı adı girin"), - ("Preparing for installation ...", "Kuruluma hazırlanıyor..."), - ("Show my cursor", "İmlecimi göster"), - ("Scale custom", "Özel ölçekte"), - ("Custom scale slider", "Özel ölçek kaydırıcısı"), - ("Decrease", "Azalt"), - ("Increase", "Arttır"), - ("Show virtual mouse", "Sanal fareyi göster"), - ("Virtual mouse size", "Sanal fare boyutu"), - ("Small", "Küçük"), - ("Large", "Büyük"), - ("Show virtual joystick", "Sanal joystiği göster"), - ("Edit note", "Notu düzenle"), - ("Alias", "Takma ad"), - ("ScrollEdge", "Kaydırma kenarı"), - ("Allow insecure TLS fallback", "Güvensiz TLS geri dönüşüne izin ver"), - ("allow-insecure-tls-fallback-tip", "Varsayılan olarak, RustDesk sunucu sertifikasını TLS kullanarak protokoller için doğrular.\nBu seçenek etkinleştirildiğinde, doğrulama başarısızlığı durumunda RustDesk doğrulama adımını atlayarak işleme devam eder."), - ("Disable UDP", "UDP'yi devre dışı bırak"), - ("disable-udp-tip", "Yalnızca TCP kullanılıp kullanılmayacağını kontrol eder.\nBu seçenek etkinleştirildiğinde, RustDesk artık UDP 21116'yı kullanmayacak, bunun yerine TCP 21116 kullanılacaktır."), - ("server-oss-not-support-tip", "NOT: RustDesk sunucu OSS'si bu özelliği içermemektedir."), - ("input note here", "Notu buraya girin"), - ("note-at-conn-end-tip", "Bağlantı bittiğinde not sorulsun"), - ("Show terminal extra keys", "Terminal ek tuşlarını göster"), - ("Relative mouse mode", "Fareyi göreli modda kullan"), - ("rel-mouse-not-supported-peer-tip", "Karşı taraf göreli fare modunu desteklemiyor"), - ("rel-mouse-not-ready-tip", "Göreli fare modu henüz hazır değil"), - ("rel-mouse-lock-failed-tip", "Göreli fare kilitlenemedi"), - ("rel-mouse-exit-{}-tip", "Göreli fare modundan çıkmak için {}"), - ("rel-mouse-permission-lost-tip", "Göreli fare izinleri geçerli değil"), - ("Changelog", "Değişiklik Günlüğü"), - ("keep-awake-during-outgoing-sessions-label", "Giden oturumlar süresince ekranı açık tutun"), - ("keep-awake-during-incoming-sessions-label", "Gelen oturumlar süresince ekranı açık tutun"), - ("Continue with {}", "{} ile devam et"), - ("Display Name", "Görünen Ad"), - ("password-hidden-tip", "Parola gizli"), - ("preset-password-in-use-tip", "Önceden ayarlanmış parola kullanılıyor"), - ("Enable privacy mode", "Gizlilik modunu etkinleştir"), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Enable camera", ""), + ("No cameras", ""), + ("view_camera_unsupported_tip", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/tw.rs b/src/lang/tw.rs index 6df025303..b5e44d07a 100644 --- a/src/lang/tw.rs +++ b/src/lang/tw.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "作業系統密碼"), ("install_tip", "UAC 會導致 RustDesk 在某些情況下無法正常作為遠端端點運作。若要避開 UAC，請點選下方按鈕將 RustDesk 安裝到系統中。"), ("Click to upgrade", "點選以升級"), + ("Click to download", "點選以下載"), + ("Click to update", "點選以更新"), ("Configure", "設定"), ("config_acc", "為了遠端控制您的桌面，您需要授予 RustDesk「無障礙功能」權限。"), ("config_screen", "為了遠端存取您的桌面，您需要授予 RustDesk「螢幕錄製」權限。"), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "鍵盤設定"), ("Full Access", "完全存取"), ("Screen Share", "僅分享螢幕畫面"), - ("ubuntu-21-04-required", "Wayland 需要 Ubuntu 21.04 或更新的版本。"), - ("wayland-requires-higher-linux-version", "Wayland 需要更新版的 Linux 發行版。請嘗試使用 X11 桌面或更改您的作業系統。"), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland 需要 Ubuntu 21.04 或更新的版本。"), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland 需要更新版的 Linux 發行版。請嘗試使用 X11 桌面或更改您的作業系統。"), ("JumpLink", "查看"), ("Please Select the screen to be shared(Operate on the peer side).", "請選擇要分享的螢幕畫面（在對方的裝置上操作）。"), ("Show RustDesk", "顯示 RustDesk"), ("This PC", "此電腦"), ("or", "或"), + ("Continue with", "繼續"), ("Elevate", "提升權限"), ("Zoom cursor", "縮放游標"), ("Accept sessions via password", "只允許透過輸入密碼進行連線"), @@ -413,7 +415,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("request_elevation_tip", "如果遠端使用者可以操作電腦，您可以請求提升權限。"), ("Wait", "等待"), ("Elevation Error", "權限提升失敗"), - ("Ask the remote user for authentication", "請求遠端使用者進行驗證"), + ("Ask the remote user for authentication", "請求遠端使用者進行驗證驗證"), ("Choose this if the remote account is administrator", "當遠端使用者帳戶是管理員時，請選擇此選項"), ("Transmit the username and password of administrator", "傳送管理員的使用者名稱和密碼"), ("still_click_uac_tip", "依然需要遠端使用者在執行 RustDesk 時於 UAC 視窗點選「是」。"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "空空如也"), ("empty_lan_tip", "喔不，看來我們目前找不到任何夥伴。"), ("empty_address_book_tip", "老天，看來您的通訊錄中沒有任何夥伴。"), + ("eg: admin", "例如：admin"), ("Empty Username", "空使用者帳號"), ("Empty Password", "空密碼"), ("Me", "我"), @@ -493,7 +496,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Options", "選項"), ("resolution_original_tip", "原始解析度"), ("resolution_fit_local_tip", "調整成本機解析度"), - ("resolution_custom_tip", "自訂解析度"), + ("resolution_custom_tip", "自動解析度"), ("Collapse toolbar", "收回工具列"), ("Accept and Elevate", "接受並提升權限"), ("accept_and_elevate_btn_tooltip", "接受連線並提升 UAC 權限。"), @@ -521,7 +524,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Select", "選擇"), ("Toggle Tags", "切換標籤"), ("pull_ab_failed_tip", "通訊錄更新失敗"), - ("push_ab_failed_tip", "同步通訊錄至伺服器失敗"), + ("push_ab_failed_tip", "成功同步通訊錄至伺服器"), ("synced_peer_readded_tip", "最近工作階段中存在的裝置將會被重新同步到通訊錄。"), ("Change Color", "更改顏色"), ("Primary Color", "基本色"), @@ -682,9 +685,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Downloading {}", "正在下載 {} 並安裝新版本。"), ("{} Update", "{} 更新"), ("{}-to-update-tip", "即將關閉 {} 並安裝新版本。"), - ("download-new-version-failed-tip", "下載失敗，您可以重試或點擊\"下載\"按鈕以從發布網址下載，並手動升級。"), + ("download-new-version-failed-tip", "安裝方式偵測失敗，請點擊\"下載\"按鈕以從發布網址下載，並手動升級。"), ("Auto update", "自動更新"), - ("update-failed-check-msi-tip", "安裝方式偵測失敗，請點擊\"下載\"按鈕以從發布網址下載，並手動升級。"), + ("update-failed-check-msi-tip", "下載失敗，您可以重試或點擊\"下載\"按鈕以從發布網址下載，並手動升級。"), ("websocket_tip", "使用 WebSocket 時，只支援使用中繼連接。"), ("Use WebSocket", "使用 WebSocket"), ("Trackpad speed", "觸控板速度"), @@ -696,54 +699,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable camera", "允許查看鏡頭"), ("No cameras", "沒有鏡頭"), ("view_camera_unsupported_tip", "您的遠端設備不支援查看鏡頭"), - ("Terminal", "終端機"), - ("Enable terminal", "啟用終端機"), - ("New tab", "新分頁"), - ("Keep terminal sessions on disconnect", "在斷線時保持終端機的工作階段"), - ("Terminal (Run as administrator)", "終端機（使用系統管理員執行）"), - ("terminal-admin-login-tip", "請輸入被控端系統管理員的使用者名稱與密碼"), - ("Failed to get user token.", "取得使用者權杖失敗"), - ("Incorrect username or password.", "使用者名稱或密碼不正確"), - ("The user is not an administrator.", "使用者並不是系統管理員"), - ("Failed to check if the user is an administrator.", "檢查使用者是否是系統管理員時失敗了"), - ("Supported only in the installed version.", "僅支援於已安裝的版本"), - ("elevation_username_tip", "輸入使用者名稱或網域\\使用者名稱"), - ("Preparing for installation ...", "正在準備安裝..."), - ("Show my cursor", "顯示我的游標"), - ("Scale custom", "自訂縮放"), - ("Custom scale slider", "自訂縮放滑桿"), - ("Decrease", "縮小"), - ("Increase", "放大"), - ("Show virtual mouse", "顯示虛擬滑鼠"), - ("Virtual mouse size", "虛擬滑鼠大小"), - ("Small", "小"), - ("Large", "大"), - ("Show virtual joystick", "顯示虛擬搖桿"), - ("Edit note", "編輯備註"), - ("Alias", "別名"), - ("ScrollEdge", "邊緣滾動"), - ("Allow insecure TLS fallback", "允許降級到不安全的 TLS 連接"), - ("allow-insecure-tls-fallback-tip", "預設情況下，對於使用 TLS 的協定，RustDesk 會驗證伺服器的憑證。\n啟用此選項後，在驗證失敗時，RustDesk 將轉為跳過驗證步驟並繼續連接。"), - ("Disable UDP", "停用 UDP"), - ("disable-udp-tip", "控制是否僅使用 TCP。\n啟用此選項後，RustDesk 將不再使用 UDP 21116，而是使用 TCP 21116。"), - ("server-oss-not-support-tip", "注意：RustDesk 開源伺服器 (OSS server) 不包含此功能。"), - ("input note here", "輸入備註"), - ("note-at-conn-end-tip", "在連接結束時請求備註"), - ("Show terminal extra keys", "顯示終端機額外按鍵"), - ("Relative mouse mode", "相對滑鼠模式"), - ("rel-mouse-not-supported-peer-tip", "被控端不支援相對滑鼠模式"), - ("rel-mouse-not-ready-tip", "相對滑鼠模式尚未就緒，請稍候再試"), - ("rel-mouse-lock-failed-tip", "無法鎖定游標，相對滑鼠模式已停用"), - ("rel-mouse-exit-{}-tip", "按下 {} 退出"), - ("rel-mouse-permission-lost-tip", "鍵盤權限被撤銷，相對滑鼠模式已被停用"), - ("Changelog", "更新日誌"), - ("keep-awake-during-outgoing-sessions-label", "在連出工作階段期間保持螢幕喚醒"), - ("keep-awake-during-incoming-sessions-label", "在連入工作階段期間保持螢幕喚醒"), - ("Continue with {}", "使用 {} 登入"), - ("Display Name", "顯示名稱"), - ("password-hidden-tip", "固定密碼已設定（已隱藏）"), - ("preset-password-in-use-tip", "目前正在使用預設密碼"), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lang/uk.rs b/src/lang/uk.rs index 7107bc261..7a5103ef3 100644 --- a/src/lang/uk.rs +++ b/src/lang/uk.rs @@ -147,6 +147,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("OS Password", "Пароль ОС"), ("install_tip", "Через UAC, в деяких випадках RustDesk може працювати некоректно на віддаленому вузлі. Щоб уникнути UAC, натисніть кнопку нижче для встановлення RustDesk в системі"), ("Click to upgrade", "Натисніть, щоб перевірити наявність оновлень"), + ("Click to download", "Натисніть, щоб отримати"), + ("Click to update", "Натисніть, щоб оновити"), ("Configure", "Налаштувати"), ("config_acc", "Для віддаленого керування вашою стільницею, вам необхідно надати RustDesk дозволи \"Спеціальні можливості\""), ("config_screen", "Для віддаленого доступу до вашої стільниці, вам необхідно надати RustDesk дозволи на \"Запис екрана\""), @@ -377,14 +379,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Keyboard Settings", "Налаштування клавіатури"), ("Full Access", "Повний доступ"), ("Screen Share", "Демонстрація екрана"), - ("ubuntu-21-04-required", "Wayland потребує Ubuntu 21.04 або новішої версії."), - ("wayland-requires-higher-linux-version", "Для Wayland потрібна новіша версія дистрибутива Linux. Будь ласка, спробуйте стільницю на X11 або змініть свою ОС."), - ("xdp-portal-unavailable", ""), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland потребує Ubuntu 21.04 або новішої версії."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Для Wayland потрібна новіша версія дистрибутива Linux. Будь ласка, спробуйте стільницю на X11 або змініть свою ОС."), ("JumpLink", "Перегляд"), ("Please Select the screen to be shared(Operate on the peer side).", "Будь ласка, виберіть екран, до якого потрібно надати доступ (на віддаленому пристрої)."), ("Show RustDesk", "Показати RustDesk"), ("This PC", "Цей ПК"), ("or", "чи"), + ("Continue with", "Продовжити з"), ("Elevate", "Розширення прав"), ("Zoom cursor", "Збільшити вказівник"), ("Accept sessions via password", "Підтверджувати сеанси паролем"), @@ -459,6 +461,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "Досі немає улюблених вузлів?\nДавайте організуємо нове підключення та додамо його до улюблених!"), ("empty_lan_tip", "О ні, схоже ми ще не виявили жодного віддаленого пристрою."), ("empty_address_book_tip", "Ой лишенько, схоже у вашій адресній книзі немає жодного віддаленого пристрою."), + ("eg: admin", "напр., admin"), ("Empty Username", "Незаповнене імʼя"), ("Empty Password", "Незаповнений пароль"), ("Me", "Я"), @@ -700,50 +703,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable terminal", ""), ("New tab", ""), ("Keep terminal sessions on disconnect", ""), - ("Terminal (Run as administrator)", ""), - ("terminal-admin-login-tip", ""), - ("Failed to get user token.", ""), - ("Incorrect username or password.", ""), - ("The user is not an administrator.", ""), - ("Failed to check if the user is an administrator.", ""), - ("Supported only in the installed version.", ""), - ("elevation_username_tip", ""), - ("Preparing for installation ...", ""), - ("Show my cursor", ""), - ("Scale custom", "Користувацький масштаб"), - ("Custom scale slider", ""), - ("Decrease", ""), - ("Increase", ""), - ("Show virtual mouse", ""), - ("Virtual mouse size", ""), - ("Small", ""), - ("Large", ""), - ("Show virtual joystick", ""), - ("Edit note", ""), - ("Alias", ""), - ("ScrollEdge", ""), - ("Allow insecure TLS fallback", ""), - ("allow-insecure-tls-fallback-tip", ""), - ("Disable UDP", ""), - ("disable-udp-tip", ""), - ("server-oss-not-support-tip", ""), - ("input note here", ""), - ("note-at-conn-end-tip", ""), - ("Show terminal extra keys", ""), - ("Relative mouse mode", ""), - ("rel-mouse-not-supported-peer-tip", ""), - ("rel-mouse-not-ready-tip", ""), - ("rel-mouse-lock-failed-tip", ""), - ("rel-mouse-exit-{}-tip", ""), - ("rel-mouse-permission-lost-tip", ""), - ("Changelog", ""), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Продовжити з {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), ].iter().cloned().collect(); } diff --git a/src/lang/vi.rs b/src/lang/vi.rs index 0910025ed..332c51d68 100644 --- a/src/lang/vi.rs +++ b/src/lang/vi.rs @@ -3,10 +3,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = [ ("Status", "Trạng thái hiện tại"), ("Your Desktop", "Desktop của bạn"), - ("desk_tip", "Desktop của bạn có thể được truy cập bằng ID và mật khẩu này."), + ("desk_tip", "Desktop của bạn có thể đuợc truy cập bằng ID và mật khẩu này."), ("Password", "Mật khẩu"), ("Ready", "Sẵn sàng"), - ("Established", "Đã được thiết lập"), + ("Established", "Đã đuợc thiết lập"), ("connecting_status", "Đang kết nối đến mạng lưới RustDesk..."), ("Enable service", "Bật dịch vụ"), ("Start service", "Bắt đầu dịch vụ"), @@ -16,19 +16,19 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Control Remote Desktop", "Điều khiển Desktop Từ Xa"), ("Transfer file", "Truyền Tệp Tin"), ("Connect", "Kết nối"), - ("Recent sessions", "Các phiên gần đây"), - ("Address book", "Sổ địa chỉ"), + ("Recent sessions", "Các session gần đây"), + ("Address book", "Quyển địa chỉ"), ("Confirmation", "Xác nhận"), ("TCP tunneling", "TCP tunneling"), ("Remove", "Loại bỏ"), ("Refresh random password", "Làm mới mật khẩu ngẫu nhiên"), ("Set your own password", "Đặt mật khẩu riêng"), ("Enable keyboard/mouse", "Cho phép sử dụng bàn phím/chuột"), - ("Enable clipboard", "Cho phép sử dụng Clipboard"), + ("Enable clipboard", "Cho phép sử dụng clipboard"), ("Enable file transfer", "Cho phép truyền tệp tin"), ("Enable TCP tunneling", "Cho phép TCP tunneling"), - ("IP Whitelisting", "Danh sách trắng IP"), - ("ID/Relay Server", "Máy chủ ID/Chuyển tiếp"), + ("IP Whitelisting", "Cho phép IP"), + ("ID/Relay Server", "Máy chủ ID/chuyển tiếp"), ("Import server config", "Nhập cấu hình máy chủ"), ("Export Server Config", "Xuất cấu hình máy chủ"), ("Import server configuration successfully", "Nhập cấu hình máy chủ thành công"), @@ -38,20 +38,20 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Stop service", "Dừng dịch vụ"), ("Change ID", "Thay đổi ID"), ("Your new ID", "ID mới của bạn"), - ("length %min% to %max%", "độ dài từ %min% đến %max%"), - ("starts with a letter", "bắt đầu bằng một chữ cái"), - ("allowed characters", "các ký tự được phép"), - ("id_change_tip", "Các ký tự được phép: a-z, A-Z, 0-9, - (gạch ngang) và _ (gạch dưới). Ký tự đầu tiên phải là chữ cái. Độ dài từ 6 đến 16."), + ("length %min% to %max%", "độ dài %min% đến %max%"), + ("starts with a letter", "bắt đầu bằng một chữ"), + ("allowed characters", "các ký tự cho phép"), + ("id_change_tip", "Các kí tự đuợc phép là: từ a-z, A-Z, 0-9, - (dash) và _ (dấu gạch dưới). Kí tự đầu tiên phải bắt đầu từ a-z, A-Z. Độ dài kí tự từ 6 đến 16"), ("Website", "Trang web"), ("About", "Giới thiệu"), - ("Slogan_tip", "Được tạo ra với sự tận tâm trong thế giới đầy hỗn loạn này!"), - ("Privacy Statement", "Chính sách bảo mật"), + ("Slogan_tip", ""), + ("Privacy Statement", "Bảo Mật Thông tin"), ("Mute", "Tắt tiếng"), - ("Build Date", "Ngày đóng gói"), + ("Build Date", "Ngày xuất bản"), ("Version", "Phiên bản"), ("Home", "Trang chủ"), ("Audio Input", "Đầu vào âm thanh"), - ("Enhancements", "Tiện ích mở rộng"), + ("Enhancements", "Các tiện ích"), ("Hardware Codec", "Codec phần cứng"), ("Adaptive bitrate", "Bitrate thích ứng"), ("ID Server", "Máy chủ ID"), @@ -59,37 +59,37 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("API Server", "Máy chủ API"), ("invalid_http", "phải bắt đầu bằng http:// hoặc https://"), ("Invalid IP", "IP không hợp lệ"), - ("Invalid format", "Định dạng không hợp lệ"), - ("server_not_support", "Máy chủ chưa hỗ trợ"), - ("Not available", "Không khả dụng"), - ("Too frequent", "Thao tác quá thường xuyên"), + ("Invalid format", "Định dạng không hợp lệnh"), + ("server_not_support", "Chưa đuợc hỗ trợ bởi máy chủ"), + ("Not available", "Chưa có mặt"), + ("Too frequent", "Quá thường xuyên"), ("Cancel", "Hủy"), ("Skip", "Bỏ qua"), ("Close", "Đóng"), ("Retry", "Thử lại"), ("OK", "OK"), ("Password Required", "Yêu cầu mật khẩu"), - ("Please enter your password", "Vui lòng nhập mật khẩu"), + ("Please enter your password", "Mời nhập mật khẩu"), ("Remember password", "Nhớ mật khẩu"), ("Wrong Password", "Sai mật khẩu"), ("Do you want to enter again?", "Bạn có muốn nhập lại không?"), - ("Connection Error", "Lỗi kết nối"), + ("Connection Error", "Kết nối bị lỗi"), ("Error", "Lỗi"), - ("Reset by the peer", "Phía đối tác đã đặt lại kết nối"), + ("Reset by the peer", "Đựoc cài đặt lại bởi người dùng từ xa"), ("Connecting...", "Đang kết nối..."), - ("Connection in progress. Please wait.", "Đang thiết lập kết nối. Vui lòng chờ."), - ("Please try 1 minute later", "Vui lòng thử lại sau 1 phút"), - ("Login Error", "Lỗi đăng nhập"), + ("Connection in progress. Please wait.", "Đang kết nối. Vui lòng chờ."), + ("Please try 1 minute later", "Hãy thử lại sau 1 phút"), + ("Login Error", "Đăng nhập bị lỗi"), ("Successful", "Thành công"), ("Connected, waiting for image...", "Đã kết nối, đang đợi hình ảnh..."), ("Name", "Tên"), ("Type", "Loại"), - ("Modified", "Ngày chỉnh sửa"), + ("Modified", "Chỉnh sửa"), ("Size", "Kích cỡ"), - ("Show Hidden Files", "Hiện tệp ẩn"), + ("Show Hidden Files", "Hiển thị tệp tin bị ẩn"), ("Receive", "Nhận"), ("Send", "Gửi"), - ("Refresh File", "Làm mới tệp"), + ("Refresh File", "Làm mới tệp tin"), ("Local", "Cục bộ"), ("Remote", "Từ xa"), ("Remote Computer", "Máy tính từ xa"), @@ -100,22 +100,22 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Multi Select", "Chọn nhiều"), ("Select All", "Chọn tất cả"), ("Unselect All", "Bỏ chọn tất cả"), - ("Empty Directory", "Thư mục trống"), - ("Not an empty directory", "Thư mục không trống"), - ("Are you sure you want to delete this file?", "Bạn có chắc chắn muốn xóa tệp này không?"), - ("Are you sure you want to delete this empty directory?", "Bạn có chắc chắn muốn xóa thư mục trống này không?"), - ("Are you sure you want to delete the file of this directory?", "Bạn có chắc chắn muốn xóa các tệp trong thư mục này không?"), - ("Do this for all conflicts", "Áp dụng cho mọi xung đột"), - ("This is irreversible!", "Hành động này không thể hoàn tác!"), + ("Empty Directory", "Thư mục rỗng"), + ("Not an empty directory", "Không phải thư mục rỗng"), + ("Are you sure you want to delete this file?", "Bạn chắc bạn có muốn xóa tệp tin này không?"), + ("Are you sure you want to delete this empty directory?", "Bạn chắc bạn có muốn xóa thư mục rỗng này không?"), + ("Are you sure you want to delete the file of this directory?", "Bạn chắc bạn có muốn xóa những tệp tin trong thư mục này không?"), + ("Do this for all conflicts", "Xác nhận đối với tất cả các trùng lặp"), + ("This is irreversible!", "Không thể hoàn tác!"), ("Deleting", "Đang xóa"), - ("files", "tệp"), + ("files", "các tệp tin"), ("Waiting", "Đang chờ"), ("Finished", "Hoàn thành"), ("Speed", "Tốc độ"), - ("Custom Image Quality", "Tùy chỉnh chất lượng hình ảnh"), + ("Custom Image Quality", "Chất lượng hình ảnh"), ("Privacy mode", "Chế độ riêng tư"), - ("Block user input", "Chặn tương tác người dùng"), - ("Unblock user input", "Hủy chặn tương tác người dùng"), + ("Block user input", "Chặn các tương tác từ người dùng"), + ("Unblock user input", "Hủy chặn các tương tác từ người dùng"), ("Adjust Window", "Điều chỉnh cửa sổ"), ("Original", "Gốc"), ("Shrink", "Thu nhỏ"), @@ -124,216 +124,218 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("ScrollAuto", "Tự động cuộn"), ("Good image quality", "Chất lượng hình ảnh tốt"), ("Balanced", "Cân bằng"), - ("Optimize reaction time", "Tối ưu thời gian phản hồi"), + ("Optimize reaction time", "Tối ưu thời gian phản ứng"), ("Custom", "Tùy chỉnh"), - ("Show remote cursor", "Hiện con trỏ từ xa"), - ("Show quality monitor", "Hiện thông tin chất lượng"), - ("Disable clipboard", "Tắt Clipboard"), - ("Lock after session end", "Khóa máy sau khi kết thúc"), - ("Insert Ctrl + Alt + Del", "Gửi Ctrl + Alt + Del"), - ("Insert Lock", "Khóa máy"), + ("Show remote cursor", "Hiển thị con trỏ từ máy từ xa"), + ("Show quality monitor", "Hiện thị chất lượng của màn hình"), + ("Disable clipboard", "Tắt clipboard"), + ("Lock after session end", "Khóa sau khi kết thúc phiên kết nối"), + ("Insert Ctrl + Alt + Del", "Cài Ctrl + Alt + Del"), + ("Insert Lock", "Cài khóa"), ("Refresh", "Làm mới"), ("ID does not exist", "ID không tồn tại"), - ("Failed to connect to rendezvous server", "Không thể kết nối đến máy chủ Rendezvous"), - ("Please try later", "Vui lòng thử lại sau"), - ("Remote desktop is offline", "Máy tính từ xa đang ngoại tuyến"), - ("Key mismatch", "Khóa không khớp"), + ("Failed to connect to rendezvous server", "Không thể kết nối đến máy chủ rendezvous"), + ("Please try later", "Thử lại sau"), + ("Remote desktop is offline", "Máy tính từ xa hiện đang offline"), + ("Key mismatch", "Chìa không khớp"), ("Timeout", "Quá thời gian"), - ("Failed to connect to relay server", "Không thể kết nối tới máy chủ Chuyển tiếp"), - ("Failed to connect via rendezvous server", "Không thể kết nối qua máy chủ Rendezvous"), - ("Failed to connect via relay server", "Không thể kết nối qua máy chủ Chuyển tiếp"), - ("Failed to make direct connection to remote desktop", "Không thể kết nối trực tiếp"), - ("Set Password", "Đặt mật khẩu"), + ("Failed to connect to relay server", "Không thể kết nối tới máy chủ chuyển tiếp"), + ("Failed to connect via rendezvous server", "Không thể kết nối qua máy chủ rendezvous"), + ("Failed to connect via relay server", "Không thể kết nối qua máy chủ chuyển tiếp"), + ("Failed to make direct connection to remote desktop", "Không thể kết nối thẳng tới máy tính từ xa"), + ("Set Password", "Cài đặt mật khẩu"), ("OS Password", "Mật khẩu hệ điều hành"), - ("install_tip", "Do cơ chế UAC, RustDesk có thể không hoạt động ổn định ở phía người dùng từ xa trong một số trường hợp. Để tránh vấn đề này, vui lòng nhấn nút bên dưới để cài đặt RustDesk vào hệ thống."), + ("install_tip", "Do UAC, RustDesk sẽ không thể hoạt động đúng cách là bên từ xa trong vài trường hợp. Để tránh UAC, hãy nhấn cái nút dưới đây để cài RustDesk vào hệ thống."), ("Click to upgrade", "Nhấn để nâng cấp"), - ("Configure", "Cấu hình"), - ("config_acc", "Để điều khiển từ xa, bạn cần cấp quyền \"Trợ năng\" cho RustDesk."), - ("config_screen", "Để truy cập từ xa, bạn cần cấp quyền \"Ghi màn hình\" cho RustDesk."), - ("Installing ...", "Đang cài đặt..."), - ("Install", "Cài đặt"), - ("Installation", "Cài đặt"), - ("Installation Path", "Đường dẫn cài đặt"), - ("Create start menu shortcuts", "Tạo shortcut ở Start Menu"), - ("Create desktop icon", "Tạo biểu tượng ngoài màn hình"), - ("agreement_tip", "Bằng việc bắt đầu cài đặt, bạn đồng ý với các điều khoản cấp phép."), - ("Accept and Install", "Chấp nhận và Cài đặt"), - ("End-user license agreement", "Thỏa thuận người dùng cuối"), - ("Generating ...", "Đang khởi tạo..."), - ("Your installation is lower version.", "Phiên bản cài đặt của bạn cũ hơn."), - ("not_close_tcp_tip", "Đừng đóng cửa sổ này khi đang sử dụng Tunnel"), - ("Listening ...", "Đang lắng nghe..."), - ("Remote Host", "Máy chủ từ xa"), + ("Click to download", "Nhấn để tải xuống"), + ("Click to update", "Nhấn để cập nhật"), + ("Configure", "Cài đặt"), + ("config_acc", "Để có thể điều khiển máy tính từ xa, bạn cần phải cung cấp quyền \"Trợ năng\" cho RustDesk"), + ("config_screen", "Để có thể truy cập máy tính từ xa, bạn cần phải cung cấp quyền \"Ghi Màn Hình\" cho RustDesk."), + ("Installing ...", "Đang cài ..."), + ("Install", "Cài"), + ("Installation", "Cài"), + ("Installation Path", "Địa điểm cài"), + ("Create start menu shortcuts", "Tạo shortcut tại start menu"), + ("Create desktop icon", "Tạo biểu tượng trên desktop"), + ("agreement_tip", "Bằng cách bắt đầu cài đặt, bạn chấp nhận thỏa thuận cấp phép."), + ("Accept and Install", "Chấp nhận và Cài"), + ("End-user license agreement", "Thỏa thuận cấp phép dành cho người dùng"), + ("Generating ...", "Đang tạo ..."), + ("Your installation is lower version.", "Phiên bản của bạn là phiên bản cũ"), + ("not_close_tcp_tip", "Đừng đóng cửa sổ này khi bạn đang sử dụng tunnel"), + ("Listening ...", "Đang nghe ..."), + ("Remote Host", "Máy từ xa"), ("Remote Port", "Cổng từ xa"), ("Action", "Hành động"), ("Add", "Thêm"), ("Local Port", "Cổng nội bộ"), ("Local Address", "Địa chỉ nội bộ"), - ("Change Local Port", "Đổi cổng nội bộ"), - ("setup_server_tip", "Để kết nối nhanh hơn, hãy tự thiết lập máy chủ riêng"), - ("Too short, at least 6 characters.", "Quá ngắn, cần ít nhất 6 ký tự."), - ("The confirmation is not identical.", "Mật khẩu xác nhận không khớp"), + ("Change Local Port", "Thay đổi cổng nội bộ"), + ("setup_server_tip", "Để kết nối nhanh hơn, hãy tự tạo máy chủ riêng"), + ("Too short, at least 6 characters.", "Quá ngắn, độ dài phải ít nhất là 6."), + ("The confirmation is not identical.", "Xác minh không khớp"), ("Permissions", "Quyền"), ("Accept", "Chấp nhận"), ("Dismiss", "Bỏ qua"), ("Disconnect", "Ngắt kết nối"), - ("Enable file copy and paste", "Cho phép sao chép và dán tệp"), + ("Enable file copy and paste", "Cho phép sao chép và dán tệp tin"), ("Connected", "Đã kết nối"), - ("Direct and encrypted connection", "Kết nối trực tiếp và mã hóa"), + ("Direct and encrypted connection", "Kết nối trực tiếp và đuợc mã hóa"), ("Relayed and encrypted connection", "Kết nối chuyển tiếp và mã hóa"), - ("Direct and unencrypted connection", "Kết nối trực tiếp và không mã hóa"), - ("Relayed and unencrypted connection", "Kết nối chuyển tiếp và không mã hóa"), + ("Direct and unencrypted connection", "Kết nối trực tiếp và không đuợc mã hóa"), + ("Relayed and unencrypted connection", "Kết nối chuyển tiếp và không đuợc mã hóa"), ("Enter Remote ID", "Nhập ID từ xa"), - ("Enter your password", "Nhập mật khẩu của bạn"), - ("Logging in...", "Đang đăng nhập..."), - ("Enable RDP session sharing", "Cho phép chia sẻ phiên RDP"), + ("Enter your password", "Nhập mật khẩu"), + ("Logging in...", "Đang đăng nhập"), + ("Enable RDP session sharing", "Cho phép chia sẻ phiên kết nối RDP"), ("Auto Login", "Tự động đăng nhập"), - ("Enable direct IP access", "Cho phép truy cập IP trực tiếp"), + ("Enable direct IP access", "Cho phép truy cập trực tiếp qua IP"), ("Rename", "Đổi tên"), - ("Space", "Khoảng cách"), - ("Create desktop shortcut", "Tạo shortcut màn hình"), - ("Change Path", "Đổi đường dẫn"), + ("Space", "Dấu cách"), + ("Create desktop shortcut", "Tạo shortcut trên desktop"), + ("Change Path", "Đổi địa điểm"), ("Create Folder", "Tạo thư mục"), - ("Please enter the folder name", "Vui lòng nhập tên thư mục"), - ("Fix it", "Sửa lỗi"), + ("Please enter the folder name", "Hãy nhập tên thư mục"), + ("Fix it", "Sửa nó"), ("Warning", "Cảnh báo"), - ("Login screen using Wayland is not supported", "Màn hình đăng nhập Wayland không được hỗ trợ"), + ("Login screen using Wayland is not supported", "Màn hình đăng nhập sử dụng Wayland không được hỗ trợ"), ("Reboot required", "Yêu cầu khởi động lại"), - ("Unsupported display server", "Máy chủ hiển thị không được hỗ trợ"), - ("x11 expected", "Yêu cầu X11"), + ("Unsupported display server", "Máy chủ hiển thị không đuợc hỗ trọ"), + ("x11 expected", "Cần x11"), ("Port", "Cổng"), ("Settings", "Cài đặt"), ("Username", "Tên người dùng"), ("Invalid port", "Cổng không hợp lệ"), - ("Closed manually by the peer", "Bị đóng thủ công bởi đối tác"), - ("Enable remote configuration modification", "Cho phép sửa cấu hình từ xa"), - ("Run without install", "Chạy không cần cài đặt"), - ("Connect via relay", "Kết nối qua chuyển tiếp"), - ("Always connect via relay", "Luôn kết nối qua chuyển tiếp"), - ("whitelist_tip", "Chỉ IP trong danh sách trắng mới có thể truy cập"), + ("Closed manually by the peer", "Đã đóng thủ công bởi người dùng từ xa"), + ("Enable remote configuration modification", "Cho phép thay đổi cấu hình bên từ xa"), + ("Run without install", "Chạy mà không cần cài đặt"), + ("Connect via relay", "Kết nối qua máy chủ chuyển tiếp"), + ("Always connect via relay", "Luôn kết nối qua máy chủ chuyển tiếp"), + ("whitelist_tip", "Chỉ có những IP đựoc cho phép mới có thể truy cập"), ("Login", "Đăng nhập"), ("Verify", "Xác thực"), - ("Remember me", "Ghi nhớ"), - ("Trust this device", "Tin tưởng thiết bị này"), + ("Remember me", "Nhớ tài khoản"), + ("Trust this device", "Tin thiết bị này"), ("Verification code", "Mã xác thực"), - ("verification_tip", "Bạn đang đăng nhập trên thiết bị mới. Một mã xác thực đã được gửi đến email của bạn, vui lòng nhập mã để tiếp tục."), + ("verification_tip", "Bạn đang đăng nhập trên một thiết bị mới, một mã xác thực đã được gửi tới email đăng ký của bạn, hãy nhập mã xác thực để tiếp tục đăng nhập."), ("Logout", "Đăng xuất"), - ("Tags", "Thẻ"), + ("Tags", "Tags"), ("Search ID", "Tìm ID"), - ("whitelist_sep", "Phân cách bởi dấu phẩy, dấu chấm phẩy, khoảng trắng hoặc dòng mới"), + ("whitelist_sep", "Đuợc cách nhau bởi dấu phẩy, dấu chấm phẩy, dấu cách hay dòng mới"), ("Add ID", "Thêm ID"), - ("Add Tag", "Thêm thẻ"), - ("Unselect all tags", "Bỏ chọn tất cả thẻ"), + ("Add Tag", "Thêm Tag"), + ("Unselect all tags", "Hủy chọn tất cả các tag"), ("Network error", "Lỗi mạng"), - ("Username missed", "Thiếu tên người dùng"), - ("Password missed", "Thiếu mật khẩu"), - ("Wrong credentials", "Thông tin đăng nhập sai"), - ("The verification code is incorrect or has expired", "Mã xác thực không đúng hoặc đã hết hạn"), - ("Edit Tag", "Sửa thẻ"), + ("Username missed", "Mất tên người dùng"), + ("Password missed", "Mất mật khẩu"), + ("Wrong credentials", "Chứng danh bị sai"), + ("The verification code is incorrect or has expired", ""), + ("Edit Tag", "Chỉnh sửa Tag"), ("Forget Password", "Quên mật khẩu"), - ("Favorites", "Yêu thích"), - ("Add to Favorites", "Thêm vào yêu thích"), - ("Remove from Favorites", "Xóa khỏi yêu thích"), + ("Favorites", "Ưa thích"), + ("Add to Favorites", "Thêm vào mục Ưa thích"), + ("Remove from Favorites", "Xóa khỏi mục Ưa thích"), ("Empty", "Trống"), ("Invalid folder name", "Tên thư mục không hợp lệ"), - ("Socks5 Proxy", "Socks5 Proxy"), - ("Socks5/Http(s) Proxy", "Socks5/Http(s) Proxy"), - ("Discovered", "Đã phát hiện"), - ("install_daemon_tip", "Để khởi động cùng hệ thống, bạn cần cài đặt dịch vụ daemon."), + ("Socks5 Proxy", "Proxy Socks5"), + ("Socks5/Http(s) Proxy", "Proxy Socks5/Http(s)"), + ("Discovered", "Đuợc phát hiện"), + ("install_daemon_tip", "Để chạy lúc khởi động máy, bạn cần phải cài dịch vụ hệ thống."), ("Remote ID", "ID từ xa"), ("Paste", "Dán"), - ("Paste here?", "Dán vào đây?"), - ("Are you sure to close the connection?", "Bạn có chắc chắn muốn đóng kết nối?"), - ("Download new version", "Tải phiên bản mới"), + ("Paste here?", "Dán ở đây?"), + ("Are you sure to close the connection?", "Bạn có chắc muốn đóng kết nối không"), + ("Download new version", "Tải về phiên bản mới"), ("Touch mode", "Chế độ chạm"), - ("Mouse mode", "Chế độ chuột"), - ("One-Finger Tap", "Chạm một ngón"), + ("Mouse mode", "Chế độ dùng chuột"), + ("One-Finger Tap", "Chạm bằng một ngón tay"), ("Left Mouse", "Chuột trái"), - ("One-Long Tap", "Chạm giữ một ngón"), - ("Two-Finger Tap", "Chạm hai ngón"), + ("One-Long Tap", "Chạm lâu bằng một ngón tay"), + ("Two-Finger Tap", "Chạm bằng hai ngón tay"), ("Right Mouse", "Chuột phải"), - ("One-Finger Move", "Di chuyển một ngón"), - ("Double Tap & Move", "Chạm đúp và di chuyển"), - ("Mouse Drag", "Kéo chuột"), - ("Three-Finger vertically", "Ba ngón theo chiều dọc"), - ("Mouse Wheel", "Con lăn chuột"), - ("Two-Finger Move", "Di chuyển hai ngón"), - ("Canvas Move", "Di chuyển khung hình"), - ("Pinch to Zoom", "Véo để thu phóng"), - ("Canvas Zoom", "Thu phóng khung hình"), - ("Reset canvas", "Đặt lại khung hình"), - ("No permission of file transfer", "Không có quyền truyền tệp"), - ("Note", "Ghi chú"), + ("One-Finger Move", "Di chuyển bằng một ngón tay"), + ("Double Tap & Move", "Chạm hai lần và di chuyển"), + ("Mouse Drag", "Di chuyển bằng chuột"), + ("Three-Finger vertically", "Ba ngón tay theo chiều dọc"), + ("Mouse Wheel", "Bánh xe lăn trê con chuột"), + ("Two-Finger Move", "Di chuyển bằng hai ngón tay"), + ("Canvas Move", "Di chuyển canvas"), + ("Pinch to Zoom", "Véo để phóng to/nhỏ"), + ("Canvas Zoom", "Phóng to/nhỏ canvas"), + ("Reset canvas", "Cài đặt lại canvas"), + ("No permission of file transfer", "Không có quyền truyền tệp tin"), + ("Note", "Ghi nhớ"), ("Connection", "Kết nối"), ("Share screen", "Chia sẻ màn hình"), - ("Chat", "Trò chuyện"), - ("Total", "Tổng cộng"), - ("items", "mục"), - ("Selected", "Đã chọn"), - ("Screen Capture", "Chụp màn hình"), - ("Input Control", "Kiểm soát đầu vào"), + ("Chat", "Chat"), + ("Total", "Tổng"), + ("items", "items"), + ("Selected", "Đã đuợc chọn"), + ("Screen Capture", "Ghi màn hình"), + ("Input Control", "Điều khiển đầu vào"), ("Audio Capture", "Ghi âm thanh"), - ("Do you accept?", "Bạn có đồng ý không?"), + ("Do you accept?", "Bạn có chấp nhận không?"), ("Open System Setting", "Mở cài đặt hệ thống"), - ("How to get Android input permission?", "Làm sao để lấy quyền nhập liệu trên Android?"), - ("android_input_permission_tip1", "Để điều khiển Android bằng chuột hoặc chạm, bạn cần cấp quyền [Trợ năng]."), - ("android_input_permission_tip2", "Vui lòng tìm [Dịch vụ đã cài đặt] trong cài đặt và bật [RustDesk Input]."), - ("android_new_connection_tip", "Yêu cầu điều khiển mới đã được nhận."), - ("android_service_will_start_tip", "Bật [Ghi màn hình] sẽ tự động khởi động dịch vụ."), - ("android_stop_service_tip", "Dừng dịch vụ sẽ đóng tất cả các kết nối."), - ("android_version_audio_tip", "Phiên bản Android này không hỗ trợ ghi âm, vui lòng nâng cấp lên Android 10+."), - ("android_start_service_tip", "Nhấn [Bắt đầu dịch vụ] để chia sẻ màn hình."), - ("android_permission_may_not_change_tip", "Quyền có thể không thay đổi ngay lập tức cho đến khi kết nối lại."), + ("How to get Android input permission?", "Cách để có quyền nhập trên Android?"), + ("android_input_permission_tip1", "Để thiết bị từ xa điều khiển thiết bị Android của bạn bằng chuột hoặc chạm, bạn cần cho phép RustDesk sử dụng dịch vụ \"Trợ năng\"."), + ("android_input_permission_tip2", "Vui lòng chuyển đến trang cài đặt hệ thống tiếp theo, tìm và nhập [Dịch vụ đã cài đặt], bật dịch vụ [RustDesk Input]."), + ("android_new_connection_tip", "Yêu cầu kiểm soát mới đã được nhận, yêu cầu này muốn kiểm soát thiết bị hiện tại của bạn."), + ("android_service_will_start_tip", "Bật \"Ghi màn hình\" sẽ tự động khởi động dịch vụ, cho phép các thiết bị khác yêu cầu kết nối với thiết bị của bạn."), + ("android_stop_service_tip", "Đóng dịch vụ sẽ tự động đóng tất cả các kết nối đã thiết lập."), + ("android_version_audio_tip", "Phiên bản Android hiện tại không hỗ trợ ghi âm, vui lòng nâng cấp lên Android 10 trở lên."), + ("android_start_service_tip", "Nhấn [Bắt đầu dịch vụ] hoặc bật quyền [Ghi màn hình] để bắt đầu dịch vụ chia sẻ màn hình"), + ("android_permission_may_not_change_tip", "Quyền cho các kết nối đã được thiếp lập có thể không được thay đổi ngay cho tới khi kết nối lại"), ("Account", "Tài khoản"), ("Overwrite", "Ghi đè"), - ("This file exists, skip or overwrite this file?", "Tệp đã tồn tại, bỏ qua hay ghi đè?"), + ("This file exists, skip or overwrite this file?", "Tệp tin này đã tồn tại, bạn có muốn bỏ qua hay ghi đè lên tệp tin này?"), ("Quit", "Thoát"), ("Help", "Trợ giúp"), ("Failed", "Thất bại"), ("Succeeded", "Thành công"), - ("Someone turns on privacy mode, exit", "Chế độ riêng tư đã được bật, thoát"), + ("Someone turns on privacy mode, exit", "Ai đó đã bật chế độ riêng tư, thoát"), ("Unsupported", "Không hỗ trợ"), - ("Peer denied", "Đối tác từ chối"), - ("Please install plugins", "Vui lòng cài đặt plugin"), - ("Peer exit", "Đối tác đã thoát"), + ("Peer denied", "Người dùng từ xa đã từ chối"), + ("Please install plugins", "Hãy cài plugins"), + ("Peer exit", "Người dùng từ xa đã thoát"), ("Failed to turn off", "Không thể tắt"), ("Turned off", "Đã tắt"), ("Language", "Ngôn ngữ"), - ("Keep RustDesk background service", "Giữ dịch vụ RustDesk chạy nền"), - ("Ignore Battery Optimizations", "Bỏ qua tối ưu hóa pin"), - ("android_open_battery_optimizations_tip", "Vui lòng chọn [Không hạn chế] trong cài đặt Pin."), - ("Start on boot", "Khởi động cùng hệ thống"), - ("Start the screen sharing service on boot, requires special permissions", "Khởi động dịch vụ chia sẻ màn hình khi bật máy (cần quyền đặc biệt)"), - ("Connection not allowed", "Kết nối không được phép"), + ("Keep RustDesk background service", "Giữ dịch vụ nền RustDesk"), + ("Ignore Battery Optimizations", "Bỏ qua các tối ưu pin"), + ("android_open_battery_optimizations_tip", "Nếu bạn muốn tắt tính năng này, vui lòng chuyển đến trang cài đặt ứng dụng RustDesk tiếp theo, tìm và nhập [Pin], Bỏ chọn [Không hạn chế]"), + ("Start on boot", "Chạy khi khởi động"), + ("Start the screen sharing service on boot, requires special permissions", "Chạy dịch vụ chia sẻ màn hình khi khởi động, yêu cầu quyền đặc biệt"), + ("Connection not allowed", "Kết nối không đuợc phép"), ("Legacy mode", "Chế độ cũ"), - ("Map mode", "Chế độ bản đồ"), - ("Translate mode", "Chế độ dịch"), - ("Use permanent password", "Dùng mật khẩu vĩnh viễn"), - ("Use both passwords", "Dùng cả hai mật khẩu"), + ("Map mode", "Chế độ map"), + ("Translate mode", "Chế độ phiên dịch"), + ("Use permanent password", "Sử dụng mật khẩu vĩnh viễn"), + ("Use both passwords", "Sử dụng cả hai mật khẩu"), ("Set permanent password", "Đặt mật khẩu vĩnh viễn"), - ("Enable remote restart", "Cho phép khởi động lại từ xa"), - ("Restart remote device", "Khởi động lại máy từ xa"), - ("Are you sure you want to restart", "Bạn có chắc chắn muốn khởi động lại?"), - ("Restarting remote device", "Đang khởi động lại máy từ xa..."), - ("remote_restarting_tip", "Máy từ xa đang khởi động lại, vui lòng kết nối lại sau ít phút."), + ("Enable remote restart", "Bật khởi động lại từ xa"), + ("Restart remote device", "Khởi động lại thiết bị từ xa"), + ("Are you sure you want to restart", "Bạn có chắc bạn muốn khởi động lại không"), + ("Restarting remote device", "Đang khởi động lại thiết bị từ xa"), + ("remote_restarting_tip", "Thiết bị từ xa đang khởi động lại, hãy đóng cửa sổ tin nhắn này và kết nối lại với mật khẩu vĩnh viễn sau một khoảng thời gian"), ("Copied", "Đã sao chép"), ("Exit Fullscreen", "Thoát toàn màn hình"), ("Fullscreen", "Toàn màn hình"), - ("Mobile Actions", "Thao tác di động"), + ("Mobile Actions", "Hành động trên thiết bị di động"), ("Select Monitor", "Chọn màn hình"), - ("Control Actions", "Thao tác điều khiển"), - ("Display Settings", "Cài đặt hiển thị"), - ("Ratio", "Tỷ lệ"), + ("Control Actions", "Kiểm soát hành động"), + ("Display Settings", "Thiết lập hiển thị"), + ("Ratio", "Tỉ lệ"), ("Image Quality", "Chất lượng hình ảnh"), ("Scroll Style", "Kiểu cuộn"), ("Show Toolbar", "Hiện thanh công cụ"), ("Hide Toolbar", "Ẩn thanh công cụ"), ("Direct Connection", "Kết nối trực tiếp"), ("Relay Connection", "Kết nối chuyển tiếp"), - ("Secure Connection", "Kết nối bảo mật"), - ("Insecure Connection", "Kết nối không bảo mật"), - ("Scale original", "Tỷ lệ gốc"), - ("Scale adaptive", "Tỷ lệ thích ứng"), + ("Secure Connection", "Kết nối an toàn"), + ("Insecure Connection", "Kết nối không an toàn"), + ("Scale original", "Quy mô gốc"), + ("Scale adaptive", "Quy mô thích ứng"), ("General", "Chung"), ("Security", "Bảo mật"), ("Theme", "Chủ đề"), @@ -342,112 +344,112 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Dark", "Tối"), ("Light", "Sáng"), ("Follow System", "Theo hệ thống"), - ("Enable hardware codec", "Bật Codec phần cứng"), + ("Enable hardware codec", "Bật codec phần cứng"), ("Unlock Security Settings", "Mở khóa cài đặt bảo mật"), ("Enable audio", "Bật âm thanh"), ("Unlock Network Settings", "Mở khóa cài đặt mạng"), ("Server", "Máy chủ"), - ("Direct IP Access", "Truy cập IP trực tiếp"), - ("Proxy", "Proxy"), + ("Direct IP Access", "Truy cập trực tiếp qua IP"), + ("Proxy", ""), ("Apply", "Áp dụng"), - ("Disconnect all devices?", "Ngắt tất cả thiết bị?"), - ("Clear", "Xóa sạch"), - ("Audio Input Device", "Thiết bị đầu vào âm thanh"), - ("Use IP Whitelisting", "Sử dụng danh sách trắng IP"), + ("Disconnect all devices?", "Ngắt kết nối tất cả thiết bị"), + ("Clear", "Làm trống"), + ("Audio Input Device", "Thiết bị âm thanh đầu vào"), + ("Use IP Whitelisting", "Dùng danh sách các IP cho phép"), ("Network", "Mạng"), ("Pin Toolbar", "Ghim thanh công cụ"), ("Unpin Toolbar", "Bỏ ghim thanh công cụ"), ("Recording", "Đang ghi hình"), ("Directory", "Thư mục"), - ("Automatically record incoming sessions", "Tự động ghi lại các kết nối đến"), - ("Automatically record outgoing sessions", "Tự động ghi lại các kết nối đi"), + ("Automatically record incoming sessions", "Tự động ghi những phiên kết nối vào"), + ("Automatically record outgoing sessions", ""), ("Change", "Thay đổi"), - ("Start session recording", "Bắt đầu ghi hình phiên"), - ("Stop session recording", "Dừng ghi hình phiên"), - ("Enable recording session", "Cho phép ghi hình phiên"), - ("Enable LAN discovery", "Bật phát hiện trong mạng LAN"), - ("Deny LAN discovery", "Từ chối phát hiện trong mạng LAN"), - ("Write a message", "Viết tin nhắn..."), - ("Prompt", "Gợi ý"), - ("Please wait for confirmation of UAC...", "Vui lòng chờ xác nhận UAC..."), - ("elevated_foreground_window_tip", "Cửa sổ phía trước yêu cầu quyền cao hơn, tạm thời không thể sử dụng chuột/phím. Yêu cầu phía đối tác thu nhỏ cửa sổ hoặc cấp quyền."), + ("Start session recording", "Bắt đầu ghi hình phiên kết nối"), + ("Stop session recording", "Dừng ghi hình phiên kết nối"), + ("Enable recording session", "Bật ghi hình phiên kết nối"), + ("Enable LAN discovery", "Bật phát hiện mạng nội bộ (LAN)"), + ("Deny LAN discovery", "Từ chối phát hiện mạng nội bộ (LAN)"), + ("Write a message", "Viết một tin nhắn"), + ("Prompt", ""), + ("Please wait for confirmation of UAC...", "Vui lòng chờ cho phép UAC"), + ("elevated_foreground_window_tip", "Cửa sổ hiện tại của máy tính từ xa yêu cầu quyền cao hơn để vận hành, nên bạn không thể sử dụng chuột và bàn phím tạm thời. Bạn có thể yêu cầu người dùng từ xa thu nhỏ cửa sổ hiện tại, hoặc nhấn vào nút Cấp Quyền trong cửa sổ quản lý kết nối. Để tránh tính trạng này, chúng tôi gợi ý nên cài đặt phần mềm ở phía thiết bị từ xa."), ("Disconnected", "Đã ngắt kết nối"), ("Other", "Khác"), - ("Confirm before closing multiple tabs", "Xác nhận trước khi đóng nhiều tab"), + ("Confirm before closing multiple tabs", "Xác nhận trước khi đóng nhiều cửa sổ"), ("Keyboard Settings", "Cài đặt bàn phím"), - ("Full Access", "Toàn quyền truy cập"), + ("Full Access", "Truy cập không giới hạng"), ("Screen Share", "Chia sẻ màn hình"), - ("ubuntu-21-04-required", "Wayland yêu cầu Ubuntu 21.04 trở lên."), - ("wayland-requires-higher-linux-version", "Wayland yêu cầu phiên bản Linux mới hơn. Hãy thử X11 hoặc đổi hệ điều hành."), - ("xdp-portal-unavailable", ""), - ("JumpLink", "Xem"), - ("Please Select the screen to be shared(Operate on the peer side).", "Vui lòng chọn màn hình chia sẻ (Thao tác ở phía đối tác)."), + ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland yêu cầu phiên bản Ubuntu 21.04 trở lên."), + ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland yêu cầu phiên bản distro linux cao hơn. Vui lòng thử máy tính để bàn X11 hoặc thay đổi hệ điều hành của bạn."), + ("JumpLink", "View"), + ("Please Select the screen to be shared(Operate on the peer side).", "Vui lòng Chọn màn hình để chia sẻ (Vận hành ở phía người dùng từ xa)."), ("Show RustDesk", "Hiện RustDesk"), - ("This PC", "Máy tính này"), + ("This PC", ""), ("or", "hoặc"), - ("Elevate", "Nâng quyền"), - ("Zoom cursor", "Phóng to con trỏ"), - ("Accept sessions via password", "Chấp nhận phiên qua mật khẩu"), - ("Accept sessions via click", "Chấp nhận phiên qua xác nhận"), - ("Accept sessions via both", "Chấp nhận phiên qua cả hai"), - ("Please wait for the remote side to accept your session request...", "Vui lòng chờ phía đối tác chấp nhận yêu cầu kết nối..."), - ("One-time Password", "Mật khẩu dùng một lần"), - ("Use one-time password", "Sử dụng mật khẩu một lần"), + ("Continue with", "Tiếp tục với"), + ("Elevate", "Cấp Quyền"), + ("Zoom cursor", "Phóng to chuột"), + ("Accept sessions via password", "Chấp nhận phiên kết nối bằng mật khẩu"), + ("Accept sessions via click", "Chấp nhận phiên kết nối bằng chuột"), + ("Accept sessions via both", "Chấp nhận phiên kết nối bằng cả hai"), + ("Please wait for the remote side to accept your session request...", "Vui lòng chờ phía người dùng từ xa chấp nhận kết nối của bạn..."), + ("One-time Password", "Mật khẩu một lần"), + ("Use one-time password", "Dùng mật khẩu một lần"), ("One-time password length", "Độ dài mật khẩu một lần"), - ("Request access to your device", "Yêu cầu truy cập thiết bị của bạn"), + ("Request access to your device", "Yêu cầu quyền truy cập vào thiết bị của bạn"), ("Hide connection management window", "Ẩn cửa sổ quản lý kết nối"), - ("hide_cm_tip", "Chỉ ẩn khi sử dụng mật khẩu vĩnh viễn"), - ("wayland_experiment_tip", "Wayland đang thử nghiệm, hãy dùng X11 nếu muốn ổn định."), - ("Right click to select tabs", "Chuột phải để chọn tab"), + ("hide_cm_tip", "Cho phép ẩn chỉ khi chấp nhận phiên kết nối bằng mật khẩu vĩnh viễn"), + ("wayland_experiment_tip", "Hỗ trợ cho Wayland đang trong giai đoạn thử nghiệm, vui lòng dùng DX11 nếu bạn muốn sử dụng kết nối không giám sát."), + ("Right click to select tabs", "Chuột phải để chọn cửa sổ"), ("Skipped", "Đã bỏ qua"), - ("Add to address book", "Thêm vào sổ địa chỉ"), + ("Add to address book", "Thêm vào Quyển địa chỉ"), ("Group", "Nhóm"), - ("Search", "Tìm kiếm"), - ("Closed manually by web console", "Đã đóng bởi Web Console"), + ("Search", "Tìm"), + ("Closed manually by web console", "Đã đóng thủ công bằng bảng điều khiển web"), ("Local keyboard type", "Loại bàn phím cục bộ"), - ("Select local keyboard type", "Chọn loại bàn phím cục bộ"), - ("software_render_tip", "Nếu gặp lỗi hiển thị trên Linux với Nvidia, hãy thử phần mềm render."), - ("Always use software rendering", "Luôn sử dụng render bằng phần mềm"), - ("config_input", "Cấp quyền [Theo dõi đầu vào] để dùng bàn phím."), - ("config_microphone", "Cấp quyền [Ghi âm] để trò chuyện."), - ("request_elevation_tip", "Bạn cũng có thể yêu cầu nâng quyền từ người ở phía xa."), + ("Select local keyboard type", "Chọn kiểu bàn phím cục bộ"), + ("software_render_tip", "Nếu bạn đang dùng card đồ họa Nvidia trên Linux và cửa sổ từ xa bị tắt ngay lập tức sau khi kết nối, chuyển sang driver mã nguồn mở Nouveau và chọn sử dụng render bằng phần mềm có thể khắc phục được. Yêu cầu khởi động lại phần mềm."), + ("Always use software rendering", "Cho phép render bằng phần mềm"), + ("config_input", "Để điều khiển được máy tính từ xa với bàn phím, bạn cần cho phép RustDesk quyền \"Theo dõi đầu vào\" (Input Monitoring)"), + ("config_microphone", "Để nói chuyện từ xa, bạn phải cho phép RustDesk quyền \"Ghi âm thanh\" (Record Audio)"), + ("request_elevation_tip", "Bạn cũng có thể yêu cầu được cấp quyền nếu có người nào đó ở bên phía kết nối."), ("Wait", "Chờ"), - ("Elevation Error", "Lỗi nâng quyền"), + ("Elevation Error", "Cấp Quyền Lỗi"), ("Ask the remote user for authentication", "Yêu cầu người dùng từ xa xác thực"), - ("Choose this if the remote account is administrator", "Chọn nếu tài khoản từ xa là Quản trị viên"), - ("Transmit the username and password of administrator", "Gửi tên đăng nhập và mật khẩu Quản trị viên"), - ("still_click_uac_tip", "Người dùng từ xa vẫn cần nhấn OK trên hộp thoại UAC."), - ("Request Elevation", "Yêu cầu nâng quyền"), - ("wait_accept_uac_tip", "Vui lòng chờ đối tác chấp nhận UAC."), - ("Elevate successfully", "Nâng quyền thành công"), + ("Choose this if the remote account is administrator", "Chọn cái này nếu tài khoản từ xa là quản trị viên"), + ("Transmit the username and password of administrator", "Truyền tên tài khoản và mật khẩu của quản trị viên"), + ("still_click_uac_tip", "Vẫn cần người dùng từ xa nhấn OK trên cửa sổ UAC của RustDesk đang chạy."), + ("Request Elevation", "Yêu cầu Cấp Quyền"), + ("wait_accept_uac_tip", "Vui lòng chờ cho người dùng từ xa chấp nhận cửa sổ UAC"), + ("Elevate successfully", "Cấp quyền thành công"), ("uppercase", "chữ hoa"), ("lowercase", "chữ thường"), - ("digit", "số"), + ("digit", "chữ số"), ("special character", "ký tự đặc biệt"), - ("length>=8", "độ dài >= 8"), + ("length>=8", "độ dài>=8"), ("Weak", "Yếu"), ("Medium", "Trung bình"), - ("Strong", "Mạnh"), + ("Strong", "Mạng"), ("Switch Sides", "Đổi bên"), - ("Please confirm if you want to share your desktop?", "Xác nhận chia sẻ màn hình?"), + ("Please confirm if you want to share your desktop?", "Vui lòng xác nhận nếu bạn muốn chia sẻ máy tính?"), ("Display", "Hiển thị"), ("Default View Style", "Kiểu xem mặc định"), ("Default Scroll Style", "Kiểu cuộn mặc định"), ("Default Image Quality", "Chất lượng hình ảnh mặc định"), ("Default Codec", "Codec mặc định"), - ("Bitrate", "Bitrate"), - ("FPS", "FPS"), + ("Bitrate", "T"), + ("FPS", ""), ("Auto", "Tự động"), ("Other Default Options", "Các tùy chọn mặc định khác"), - ("Voice call", "Gọi thoại"), - ("Text chat", "Chat văn bản"), - ("Stop voice call", "Dừng gọi thoại"), - ("relay_hint_tip", "Nếu không kết nối trực tiếp được, hãy thử qua máy chủ chuyển tiếp (ID/r)."), + ("Voice call", "Gọi âm thanh"), + ("Text chat", "Tin nhắn"), + ("Stop voice call", "Dừng cuộc gọi"), + ("relay_hint_tip", "Việc kết nối trực tiếp có thể không khả thi, bạn có thể thử kết nối qua máy chủ chuyển tiếp. \nThêm vào đó, nếu bạn muốn sử dụng máy chủ chuyển tiếp trong lần thử đầu tiên, bạn có thể thêm hậu tố \"/r\" vào sau ID, hoặc chọn tùy chọn \"Luôn kết nối qua máy chủ chuyển tiếp\""), ("Reconnect", "Kết nối lại"), - ("Codec", "Codec"), + ("Codec", ""), ("Resolution", "Độ phân giải"), - ("No transfers in progress", "Không có tệp nào đang truyền"), - ("Set one-time password length", "Đặt độ dài mật khẩu một lần"), + ("No transfers in progress", "Không có tệp tin nào đang được truyền"), + ("Set one-time password length", "Thiết lập độ dài mật khẩu một lần"), ("RDP Settings", "Cài đặt RDP"), ("Sort by", "Sắp xếp theo"), ("New Connection", "Kết nối mới"), @@ -455,295 +457,251 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Minimize", "Thu nhỏ"), ("Maximize", "Phóng to"), ("Your Device", "Thiết bị của bạn"), - ("empty_recent_tip", "Chưa có kết nối gần đây."), - ("empty_favorite_tip", "Chưa có mục yêu thích."), - ("empty_lan_tip", "Không tìm thấy thiết bị nào trong LAN."), - ("empty_address_book_tip", "Sổ địa chỉ đang trống."), - ("Empty Username", "Tên người dùng trống"), + ("empty_recent_tip", "Oops, không có kết nối nào gần đây!\nĐã đến lúc kết nối rồi."), + ("empty_favorite_tip", "Chưa có người dùng yêu thích nào cả?\nHãy tìm ai đó để kết nối cùng và thêm họ vào danh sách yêu thích!"), + ("empty_lan_tip", "Ôi không, có vẻ như chúng ta chưa phát hiện ra bất cứ người dùng nào cả."), + ("empty_address_book_tip", "Ôi bạn ơi, có vẻ như bạn chưa thêm ai vào quyển địa chỉ cả."), + ("eg: admin", "ví dụ: admin"), + ("Empty Username", "Tên tài khoản trống"), ("Empty Password", "Mật khẩu trống"), ("Me", "Tôi"), - ("identical_file_tip", "Tệp này giống hệt ở phía đối tác."), - ("show_monitors_tip", "Hiện màn hình trên thanh công cụ"), + ("identical_file_tip", "Tệp tin này giống hệt với tệp tin của người dùng từ xa"), + ("show_monitors_tip", "Hiện các màn hình trong thanh công cụ"), ("View Mode", "Chế độ xem"), - ("login_linux_tip", "Cần đăng nhập tài khoản Linux để kích hoạt X session."), + ("login_linux_tip", "Bạn cần đăng nhập vào tài khoản Linux từ xa để bật X phiên kết nối"), ("verify_rustdesk_password_tip", "Xác thực mật khẩu RustDesk"), ("remember_account_tip", "Nhớ tài khoản này"), - ("os_account_desk_tip", "Tài khoản OS được dùng để đăng nhập và chạy session không màn hình (headless)."), - ("OS Account", "Tài khoản OS"), - ("another_user_login_title_tip", "Người dùng khác đã đăng nhập"), - ("another_user_login_text_tip", "Ngắt kết nối hiện tại"), + ("os_account_desk_tip", "Tài khoản này đã được dùng để đăng nhập tới hệ điều hành từ xa và kích hoạt phiên kết nối ở chế độ headless"), + ("OS Account", "Tài khoản hệ điều hành"), + ("another_user_login_title_tip", "Có người dùng khác đã đăng nhập"), + ("another_user_login_text_tip", "Ngắt kết nối"), ("xorg_not_found_title_tip", "Không tìm thấy Xorg"), ("xorg_not_found_text_tip", "Vui lòng cài đặt Xorg"), - ("no_desktop_title_tip", "Không có desktop"), - ("no_desktop_text_tip", "Vui lòng cài đặt GNOME hoặc desktop khác."), - ("No need to elevate", "Không cần nâng quyền"), + ("no_desktop_title_tip", "Không có desktop khả dụng"), + ("no_desktop_text_tip", "Vui lòng cài đặt desktop GNOME"), + ("No need to elevate", "Không cần phải cấp quyền"), ("System Sound", "Âm thanh hệ thống"), ("Default", "Mặc định"), ("New RDP", "RDP mới"), - ("Fingerprint", "Dấu vân tay"), + ("Fingerprint", ""), ("Copy Fingerprint", "Sao chép fingerprint"), - ("no fingerprints", "không có fingerprint"), - ("Select a peer", "Chọn một đối tác"), - ("Select peers", "Chọn các đối tác"), - ("Plugins", "Plugin"), + ("no fingerprints", "không có fingerprints"), + ("Select a peer", "Chọn một người dùng"), + ("Select peers", "Chọn nhiều người dùng"), + ("Plugins", "Tiện ích"), ("Uninstall", "Gỡ cài đặt"), ("Update", "Cập nhật"), ("Enable", "Bật"), ("Disable", "Tắt"), ("Options", "Tùy chọn"), ("resolution_original_tip", "Độ phân giải gốc"), - ("resolution_fit_local_tip", "Vừa với máy cục bộ"), + ("resolution_fit_local_tip", "Vừa với độ phân giải cục bộ"), ("resolution_custom_tip", "Độ phân giải tùy chỉnh"), - ("Collapse toolbar", "Thu gọn thanh công cụ"), - ("Accept and Elevate", "Chấp nhận và Nâng quyền"), - ("accept_and_elevate_btn_tooltip", "Chấp nhận kết nối và nâng quyền UAC."), - ("clipboard_wait_response_timeout_tip", "Hết thời gian chờ Clipboard phản hồi."), - ("Incoming connection", "Kết nối đến"), - ("Outgoing connection", "Kết nối đi"), - ("Exit", "Thoát"), - ("Open", "Mở"), - ("logout_tip", "Bạn có chắc muốn đăng xuất?"), - ("Service", "Dịch vụ"), - ("Start", "Bắt đầu"), - ("Stop", "Dừng"), - ("exceed_max_devices", "Vượt quá số lượng thiết bị tối đa."), - ("Sync with recent sessions", "Đồng bộ với các phiên gần đây"), - ("Sort tags", "Sắp xếp thẻ"), - ("Open connection in new tab", "Mở kết nối trong tab mới"), - ("Move tab to new window", "Di chuyển tab sang cửa sổ mới"), - ("Can not be empty", "Không được để trống"), - ("Already exists", "Đã tồn tại"), - ("Change Password", "Đổi mật khẩu"), - ("Refresh Password", "Làm mới mật khẩu"), - ("ID", "ID"), - ("Grid View", "Dạng lưới"), - ("List View", "Dạng danh sách"), - ("Select", "Chọn"), - ("Toggle Tags", "Bật/Tắt thẻ"), - ("pull_ab_failed_tip", "Lấy sổ địa chỉ thất bại."), - ("push_ab_failed_tip", "Đồng bộ sổ địa chỉ thất bại."), - ("synced_peer_readded_tip", "Thiết bị đã đồng bộ được thêm lại."), - ("Change Color", "Đổi màu"), - ("Primary Color", "Màu chính"), - ("HSV Color", "Màu HSV"), - ("Installation Successful!", "Cài đặt thành công!"), - ("Installation failed!", "Cài đặt thất bại!"), - ("Reverse mouse wheel", "Đảo ngược con lăn chuột"), - ("{} sessions", "{} phiên"), - ("scam_title", "CẢNH BÁO LỪA ĐẢO"), - ("scam_text1", "KHÔNG chia sẻ ID/Mật khẩu với người lạ qua điện thoại. Nếu họ yêu cầu, họ có thể là kẻ lừa đảo."), - ("scam_text2", "Chỉ sử dụng RustDesk với những người bạn thực sự tin tưởng."), - ("Don't show again", "Không hiển thị lại"), - ("I Agree", "Tôi đồng ý"), - ("Decline", "Từ chối"), - ("Timeout in minutes", "Thời gian chờ (phút)"), - ("auto_disconnect_option_tip", "Tự động ngắt kết nối khi không hoạt động"), - ("Connection failed due to inactivity", "Ngắt kết nối do không hoạt động"), - ("Check for software update on startup", "Kiểm tra cập nhật khi khởi động"), - ("upgrade_rustdesk_server_pro_to_{}_tip", "Nâng cấp lên Pro để có thêm tính năng"), - ("pull_group_failed_tip", "Lấy thông tin nhóm thất bại"), - ("Filter by intersection", "Lọc theo giao điểm"), - ("Remove wallpaper during incoming sessions", "Xóa hình nền khi có kết nối đến"), - ("Test", "Kiểm tra"), - ("display_is_plugged_out_msg", "Màn hình đã bị rút."), - ("No displays", "Không có màn hình"), - ("Open in new window", "Mở trong cửa sổ mới"), - ("Show displays as individual windows", "Hiển thị mỗi màn hình một cửa sổ"), - ("Use all my displays for the remote session", "Sử dụng tất cả màn hình của tôi"), - ("selinux_tip", "SELinux đang bật, có thể gây lỗi."), - ("Change view", "Đổi kiểu xem"), - ("Big tiles", "Ô lớn"), - ("Small tiles", "Ô nhỏ"), - ("List", "Danh sách"), - ("Virtual display", "Màn hình ảo"), - ("Plug out all", "Rút tất cả"), - ("True color (4:4:4)", "Màu thực (4:4:4)"), - ("Enable blocking user input", "Cho phép chặn đầu vào người dùng"), - ("id_input_tip", "Nhập ID hoặc IP."), - ("privacy_mode_impl_mag_tip", "Chế độ riêng tư (Magnifier)"), - ("privacy_mode_impl_virtual_display_tip", "Chế độ riêng tư (Virtual Display)"), - ("Enter privacy mode", "Vào chế độ riêng tư"), - ("Exit privacy mode", "Thoát chế độ riêng tư"), - ("idd_not_support_under_win10_2004_tip", "Yêu cầu Windows 10 2004 trở lên."), - ("input_source_1_tip", "Nguồn đầu vào 1"), - ("input_source_2_tip", "Nguồn đầu vào 2"), - ("Swap control-command key", "Hoán đổi phím Ctrl-Cmd"), - ("swap-left-right-mouse", "Hoán đổi chuột trái-phải"), - ("2FA code", "Mã 2FA"), - ("More", "Thêm"), - ("enable-2fa-title", "Bật xác thực 2 bước"), - ("enable-2fa-desc", "Vui lòng quét mã QR để bật 2FA."), - ("wrong-2fa-code", "Mã 2FA sai"), - ("enter-2fa-title", "Nhập mã 2FA"), - ("Email verification code must be 6 characters.", "Mã xác thực email phải có 6 ký tự."), - ("2FA code must be 6 digits.", "Mã 2FA phải có 6 chữ số."), - ("Multiple Windows sessions found", "Tìm thấy nhiều phiên Windows"), - ("Please select the session you want to connect to", "Chọn phiên bạn muốn kết nối"), - ("powered_by_me", "Cung cấp bởi tôi"), - ("outgoing_only_desk_tip", "Chỉ cho phép kết nối đi."), - ("preset_password_warning", "Cảnh báo mật khẩu thiết lập sẵn"), - ("Security Alert", "Cảnh báo bảo mật"), - ("My address book", "Sổ địa chỉ của tôi"), - ("Personal", "Cá nhân"), - ("Owner", "Chủ sở hữu"), - ("Set shared password", "Đặt mật khẩu chia sẻ"), - ("Exist in", "Tồn tại trong"), - ("Read-only", "Chỉ đọc"), - ("Read/Write", "Đọc/Ghi"), - ("Full Control", "Toàn quyền"), - ("share_warning_tip", "Cẩn thận khi chia sẻ quyền điều khiển!"), - ("Everyone", "Mọi người"), - ("ab_web_console_tip", "Quản lý qua Web Console"), - ("allow-only-conn-window-open-tip", "Chỉ cho phép khi cửa sổ RustDesk mở"), - ("no_need_privacy_mode_no_physical_displays_tip", "Không cần chế độ riêng tư vì không có màn hình vật lý."), - ("Follow remote cursor", "Theo con trỏ từ xa"), - ("Follow remote window focus", "Theo tiêu điểm cửa sổ từ xa"), - ("default_proxy_tip", "Proxy mặc định"), - ("no_audio_input_device_tip", "Không tìm thấy thiết bị thu âm."), - ("Incoming", "Đang đến"), - ("Outgoing", "Đang đi"), - ("Clear Wayland screen selection", "Xóa lựa chọn màn hình Wayland"), - ("clear_Wayland_screen_selection_tip", "Đặt lại các quyền chọn màn hình."), - ("confirm_clear_Wayland_screen_selection_tip", "Bạn có chắc muốn đặt lại?"), - ("android_new_voice_call_tip", "Yêu cầu gọi thoại mới."), - ("texture_render_tip", "Sử dụng Texture Rendering"), - ("Use texture rendering", "Sử dụng Texture Rendering"), - ("Floating window", "Cửa sổ nổi"), - ("floating_window_tip", "Giữ RustDesk trên cùng"), - ("Keep screen on", "Giữ màn hình luôn bật"), - ("Never", "Không bao giờ"), - ("During controlled", "Trong khi bị điều khiển"), - ("During service is on", "Trong khi dịch vụ đang bật"), - ("Capture screen using DirectX", "Chụp màn hình bằng DirectX"), - ("Back", "Trở về"), - ("Apps", "Ứng dụng"), - ("Volume up", "Tăng âm lượng"), - ("Volume down", "Giảm âm lượng"), - ("Power", "Nguồn"), - ("Telegram bot", "Telegram Bot"), - ("enable-bot-tip", "Bật thông báo qua Telegram"), - ("enable-bot-desc", "Liên kết với Telegram Bot của bạn."), - ("cancel-2fa-confirm-tip", "Xác nhận tắt 2FA?"), - ("cancel-bot-confirm-tip", "Xác nhận tắt Bot?"), - ("About RustDesk", "Về RustDesk"), - ("Send clipboard keystrokes", "Gửi phím từ Clipboard"), - ("network_error_tip", "Lỗi mạng, vui lòng kiểm tra lại."), - ("Unlock with PIN", "Mở khóa bằng mã PIN"), - ("Requires at least {} characters", "Yêu cầu ít nhất {} ký tự"), - ("Wrong PIN", "Mã PIN sai"), - ("Set PIN", "Đặt mã PIN"), - ("Enable trusted devices", "Bật thiết bị tin cậy"), - ("Manage trusted devices", "Quản lý thiết bị tin cậy"), - ("Platform", "Nền tảng"), - ("Days remaining", "Số ngày còn lại"), - ("enable-trusted-devices-tip", "Chỉ thiết bị tin cậy mới có thể kết nối không cần mật khẩu."), - ("Parent directory", "Thư mục cha"), - ("Resume", "Tiếp tục"), - ("Invalid file name", "Tên tệp không hợp lệ"), - ("one-way-file-transfer-tip", "Chỉ cho phép truyền tệp một chiều."), - ("Authentication Required", "Yêu cầu xác thực"), - ("Authenticate", "Xác thực"), - ("web_id_input_tip", "Nhập ID để bắt đầu kết nối Web."), - ("Download", "Tải xuống"), - ("Upload folder", "Tải lên thư mục"), - ("Upload files", "Tải lên tệp"), - ("Clipboard is synchronized", "Clipboard đã được đồng bộ"), - ("Update client clipboard", "Cập nhật Clipboard của khách"), - ("Untagged", "Chưa gắn thẻ"), - ("new-version-of-{}-tip", "Đã có phiên bản mới của {}"), - ("Accessible devices", "Thiết bị có thể truy cập"), - ("upgrade_remote_rustdesk_client_to_{}_tip", "Vui lòng nâng cấp đối tác lên {}"), - ("d3d_render_tip", "Sử dụng D3D Rendering"), - ("Use D3D rendering", "Sử dụng D3D Rendering"), - ("Printer", "Máy in"), - ("printer-os-requirement-tip", "Yêu cầu hệ điều hành hỗ trợ máy in."), - ("printer-requires-installed-{}-client-tip", "Cần cài đặt driver {}"), - ("printer-{}-not-installed-tip", "Máy in {} chưa được cài đặt."), - ("printer-{}-ready-tip", "Máy in {} đã sẵn sàng."), - ("Install {} Printer", "Cài đặt máy in {}"), - ("Outgoing Print Jobs", "Yêu cầu in đi"), - ("Incoming Print Jobs", "Yêu cầu in đến"), - ("Incoming Print Job", "Yêu cầu in đến"), - ("use-the-default-printer-tip", "Sử dụng máy in mặc định"), - ("use-the-selected-printer-tip", "Sử dụng máy in đã chọn"), - ("auto-print-tip", "Tự động in"), - ("print-incoming-job-confirm-tip", "Xác nhận in tệp này?"), - ("remote-printing-disallowed-tile-tip", "In từ xa bị cấm"), - ("remote-printing-disallowed-text-tip", "Vui lòng bật quyền in trong cài đặt."), - ("save-settings-tip", "Lưu cài đặt"), - ("dont-show-again-tip", "Đừng hiện lại"), - ("Take screenshot", "Chụp màn hình"), - ("Taking screenshot", "Đang chụp màn hình..."), - ("screenshot-merged-screen-not-supported-tip", "Không hỗ trợ chụp gộp nhiều màn hình."), - ("screenshot-action-tip", "Hành động chụp màn hình"), - ("Save as", "Lưu thành"), - ("Copy to clipboard", "Sao chép vào Clipboard"), - ("Enable remote printer", "Bật máy in từ xa"), - ("Downloading {}", "Đang tải xuống {}"), - ("{} Update", "Cập nhật {}"), - ("{}-to-update-tip", "Cần nâng cấp để sử dụng tính năng này."), - ("download-new-version-failed-tip", "Tải phiên bản mới thất bại."), - ("Auto update", "Tự động cập nhật"), - ("update-failed-check-msi-tip", "Cập nhật lỗi, vui lòng kiểm tra file MSI."), - ("websocket_tip", "Sử dụng giao thức WebSocket"), - ("Use WebSocket", "Sử dụng WebSocket"), - ("Trackpad speed", "Tốc độ Trackpad"), - ("Default trackpad speed", "Tốc độ Trackpad mặc định"), - ("Numeric one-time password", "Mật khẩu số dùng một lần"), - ("Enable IPv6 P2P connection", "Cho phép kết nối IPv6 P2P"), - ("Enable UDP hole punching", "Bật UDP Hole Punching"), - ("View camera", "Xem Camera"), - ("Enable camera", "Bật Camera"), - ("No cameras", "Không có camera"), - ("view_camera_unsupported_tip", "Đối tác chưa hỗ trợ xem camera."), - ("Terminal", "Terminal"), - ("Enable terminal", "Bật Terminal"), - ("New tab", "Tab mới"), - ("Keep terminal sessions on disconnect", "Giữ phiên terminal khi ngắt kết nối"), - ("Terminal (Run as administrator)", "Terminal (Quyền Quản trị viên)"), - ("terminal-admin-login-tip", "Đang đăng nhập quyền quản trị..."), - ("Failed to get user token.", "Lấy mã token người dùng thất bại."), - ("Incorrect username or password.", "Tên người dùng hoặc mật khẩu sai."), - ("The user is not an administrator.", "Người dùng không phải Quản trị viên."), - ("Failed to check if the user is an administrator.", "Kiểm tra quyền Quản trị viên thất bại."), - ("Supported only in the installed version.", "Chỉ hỗ trợ trên bản đã cài đặt."), - ("elevation_username_tip", "Tên đăng nhập để nâng quyền"), - ("Preparing for installation ...", "Đang chuẩn bị cài đặt..."), - ("Show my cursor", "Hiện con trỏ của tôi"), - ("Scale custom", "Tùy chỉnh tỷ lệ"), - ("Custom scale slider", "Thanh trượt tỷ lệ"), - ("Decrease", "Giảm"), - ("Increase", "Tăng"), - ("Show virtual mouse", "Hiện chuột ảo"), - ("Virtual mouse size", "Kích thước chuột ảo"), - ("Small", "Nhỏ"), - ("Large", "Lớn"), - ("Show virtual joystick", "Hiện Joystick ảo"), - ("Edit note", "Sửa ghi chú"), - ("Alias", "Bí danh"), - ("ScrollEdge", "Cuộn ở cạnh"), - ("Allow insecure TLS fallback", "Cho phép hạ cấp TLS không an toàn"), - ("allow-insecure-tls-fallback-tip", "Cho phép kết nối nếu máy chủ dùng TLS cũ."), - ("Disable UDP", "Tắt UDP"), - ("disable-udp-tip", "Chỉ sử dụng TCP để kết nối."), - ("server-oss-not-support-tip", "Máy chủ mã nguồn mở không hỗ trợ tính năng này."), - ("input note here", "nhập ghi chú tại đây"), - ("note-at-conn-end-tip", "Hiện ghi chú khi kết thúc phiên"), - ("Show terminal extra keys", "Hiện các phím phụ Terminal"), - ("Relative mouse mode", "Chế độ chuột tương đối"), - ("rel-mouse-not-supported-peer-tip", "Đối tác không hỗ trợ chuột tương đối."), - ("rel-mouse-not-ready-tip", "Chuột tương đối chưa sẵn sàng."), - ("rel-mouse-lock-failed-tip", "Khóa chuột thất bại."), - ("rel-mouse-exit-{}-tip", "Thoát chế độ chuột tương đối: {}"), - ("rel-mouse-permission-lost-tip", "Mất quyền điều khiển chuột tương đối."), - ("Changelog", "Nhật ký thay đổi"), - ("keep-awake-during-outgoing-sessions-label", ""), - ("keep-awake-during-incoming-sessions-label", ""), - ("Continue with {}", "Tiếp tục với {}"), - ("Display Name", ""), - ("password-hidden-tip", ""), - ("preset-password-in-use-tip", ""), - ("Enable privacy mode", ""), - ("allow-remote-toolbar-docking-any-edge", ""), + ("Collapse toolbar", "Thu nhỏ thanh công cụ"), + ("Accept and Elevate", "Chấp nhận và Cấp Quyền"), + ("accept_and_elevate_btn_tooltip", "Chấp nhận kết nối và cấp các quyền UAC."), + ("clipboard_wait_response_timeout_tip", ""), + ("Incoming connection", ""), + ("Outgoing connection", ""), + ("Exit", ""), + ("Open", ""), + ("logout_tip", ""), + ("Service", ""), + ("Start", ""), + ("Stop", ""), + ("exceed_max_devices", ""), + ("Sync with recent sessions", ""), + ("Sort tags", ""), + ("Open connection in new tab", ""), + ("Move tab to new window", ""), + ("Can not be empty", ""), + ("Already exists", ""), + ("Change Password", ""), + ("Refresh Password", ""), + ("ID", ""), + ("Grid View", ""), + ("List View", ""), + ("Select", ""), + ("Toggle Tags", ""), + ("pull_ab_failed_tip", ""), + ("push_ab_failed_tip", ""), + ("synced_peer_readded_tip", ""), + ("Change Color", ""), + ("Primary Color", ""), + ("HSV Color", ""), + ("Installation Successful!", ""), + ("Installation failed!", ""), + ("Reverse mouse wheel", ""), + ("{} sessions", ""), + ("scam_title", ""), + ("scam_text1", ""), + ("scam_text2", ""), + ("Don't show again", ""), + ("I Agree", ""), + ("Decline", ""), + ("Timeout in minutes", ""), + ("auto_disconnect_option_tip", ""), + ("Connection failed due to inactivity", ""), + ("Check for software update on startup", ""), + ("upgrade_rustdesk_server_pro_to_{}_tip", ""), + ("pull_group_failed_tip", ""), + ("Filter by intersection", ""), + ("Remove wallpaper during incoming sessions", ""), + ("Test", ""), + ("display_is_plugged_out_msg", ""), + ("No displays", ""), + ("Open in new window", ""), + ("Show displays as individual windows", ""), + ("Use all my displays for the remote session", ""), + ("selinux_tip", ""), + ("Change view", ""), + ("Big tiles", ""), + ("Small tiles", ""), + ("List", ""), + ("Virtual display", ""), + ("Plug out all", ""), + ("True color (4:4:4)", ""), + ("Enable blocking user input", ""), + ("id_input_tip", ""), + ("privacy_mode_impl_mag_tip", ""), + ("privacy_mode_impl_virtual_display_tip", ""), + ("Enter privacy mode", ""), + ("Exit privacy mode", ""), + ("idd_not_support_under_win10_2004_tip", ""), + ("input_source_1_tip", ""), + ("input_source_2_tip", ""), + ("Swap control-command key", ""), + ("swap-left-right-mouse", ""), + ("2FA code", ""), + ("More", ""), + ("enable-2fa-title", ""), + ("enable-2fa-desc", ""), + ("wrong-2fa-code", ""), + ("enter-2fa-title", ""), + ("Email verification code must be 6 characters.", ""), + ("2FA code must be 6 digits.", ""), + ("Multiple Windows sessions found", ""), + ("Please select the session you want to connect to", ""), + ("powered_by_me", ""), + ("outgoing_only_desk_tip", ""), + ("preset_password_warning", ""), + ("Security Alert", ""), + ("My address book", ""), + ("Personal", ""), + ("Owner", ""), + ("Set shared password", ""), + ("Exist in", ""), + ("Read-only", ""), + ("Read/Write", ""), + ("Full Control", ""), + ("share_warning_tip", ""), + ("Everyone", ""), + ("ab_web_console_tip", ""), + ("allow-only-conn-window-open-tip", ""), + ("no_need_privacy_mode_no_physical_displays_tip", ""), + ("Follow remote cursor", ""), + ("Follow remote window focus", ""), + ("default_proxy_tip", ""), + ("no_audio_input_device_tip", ""), + ("Incoming", ""), + ("Outgoing", ""), + ("Clear Wayland screen selection", ""), + ("clear_Wayland_screen_selection_tip", ""), + ("confirm_clear_Wayland_screen_selection_tip", ""), + ("android_new_voice_call_tip", ""), + ("texture_render_tip", ""), + ("Use texture rendering", ""), + ("Floating window", ""), + ("floating_window_tip", ""), + ("Keep screen on", ""), + ("Never", ""), + ("During controlled", ""), + ("During service is on", ""), + ("Capture screen using DirectX", ""), + ("Back", ""), + ("Apps", ""), + ("Volume up", ""), + ("Volume down", ""), + ("Power", ""), + ("Telegram bot", ""), + ("enable-bot-tip", ""), + ("enable-bot-desc", ""), + ("cancel-2fa-confirm-tip", ""), + ("cancel-bot-confirm-tip", ""), + ("About RustDesk", ""), + ("Send clipboard keystrokes", ""), + ("network_error_tip", ""), + ("Unlock with PIN", ""), + ("Requires at least {} characters", ""), + ("Wrong PIN", ""), + ("Set PIN", ""), + ("Enable trusted devices", ""), + ("Manage trusted devices", ""), + ("Platform", ""), + ("Days remaining", ""), + ("enable-trusted-devices-tip", ""), + ("Parent directory", ""), + ("Resume", ""), + ("Invalid file name", ""), + ("one-way-file-transfer-tip", ""), + ("Authentication Required", ""), + ("Authenticate", ""), + ("web_id_input_tip", ""), + ("Download", ""), + ("Upload folder", ""), + ("Upload files", ""), + ("Clipboard is synchronized", ""), + ("Update client clipboard", ""), + ("Untagged", ""), + ("new-version-of-{}-tip", ""), + ("Accessible devices", ""), + ("upgrade_remote_rustdesk_client_to_{}_tip", ""), + ("d3d_render_tip", ""), + ("Use D3D rendering", ""), + ("Printer", ""), + ("printer-os-requirement-tip", ""), + ("printer-requires-installed-{}-client-tip", ""), + ("printer-{}-not-installed-tip", ""), + ("printer-{}-ready-tip", ""), + ("Install {} Printer", ""), + ("Outgoing Print Jobs", ""), + ("Incoming Print Jobs", ""), + ("Incoming Print Job", ""), + ("use-the-default-printer-tip", ""), + ("use-the-selected-printer-tip", ""), + ("auto-print-tip", ""), + ("print-incoming-job-confirm-tip", ""), + ("remote-printing-disallowed-tile-tip", ""), + ("remote-printing-disallowed-text-tip", ""), + ("save-settings-tip", ""), + ("dont-show-again-tip", ""), + ("Take screenshot", ""), + ("Taking screenshot", ""), + ("screenshot-merged-screen-not-supported-tip", ""), + ("screenshot-action-tip", ""), + ("Save as", ""), + ("Copy to clipboard", ""), + ("Enable remote printer", ""), + ("Downloading {}", ""), + ("{} Update", ""), + ("{}-to-update-tip", ""), + ("download-new-version-failed-tip", ""), + ("Auto update", ""), + ("update-failed-check-msi-tip", ""), + ("websocket_tip", ""), + ("Use WebSocket", ""), + ("Trackpad speed", ""), + ("Default trackpad speed", ""), + ("Numeric one-time password", ""), + ("Enable IPv6 P2P connection", ""), + ("Enable UDP hole punching", ""), + ("View camera", "Xem camera"), + ("Enable camera", ""), + ("No cameras", ""), + ("view_camera_unsupported_tip", ""), + ("Terminal", ""), + ("Enable terminal", ""), + ("New tab", ""), + ("Keep terminal sessions on disconnect", ""), ].iter().cloned().collect(); } diff --git a/src/lib.rs b/src/lib.rs index 5621d5e2a..433bb5f36 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,8 +3,7 @@ mod keyboard; pub mod platform; #[cfg(not(any(target_os = "android", target_os = "ios")))] pub use platform::{ - clip_cursor, get_cursor, get_cursor_data, get_cursor_pos, get_focused_display, - set_cursor_pos, start_os_service, + get_cursor, get_cursor_data, get_cursor_pos, get_focused_display, start_os_service, }; #[cfg(not(any(target_os = "ios")))] /// cbindgen:ignore @@ -56,9 +55,6 @@ pub mod plugin; #[cfg(not(any(target_os = "android", target_os = "ios")))] mod tray; -#[cfg(not(any(target_os = "android", target_os = "ios")))] -mod whiteboard; - #[cfg(not(any(target_os = "android", target_os = "ios")))] mod updater; diff --git a/src/main.rs b/src/main.rs index 9bc90a8fa..274d7735c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -23,6 +23,9 @@ fn main() { feature = "flutter" )))] fn main() { + if !common::global_init() { + return; + } #[cfg(all(windows, not(feature = "inline")))] unsafe { winapi::um::shellscalingapi::SetProcessDpiAwareness(2); diff --git a/src/platform/gtk_sudo.rs b/src/platform/gtk_sudo.rs index 37b541cbe..fca6403f6 100644 --- a/src/platform/gtk_sudo.rs +++ b/src/platform/gtk_sudo.rs @@ -465,7 +465,7 @@ fn ui_parent( fn child(su_user: Option, args: Vec) -> ResultType<()> { // https://doc.rust-lang.org/std/env/consts/constant.OS.html let os = std::env::consts::OS; - let bsd = os == "freebsd" || os == "dragonfly" || os == "netbsd" || os == "openbsd"; + let bsd = os == "freebsd" || os == "dragonfly" || os == "netbsd" || os == "openbad"; let mut params = vec!["sudo".to_string()]; if su_user.is_some() { params.push("-S".to_string()); diff --git a/src/platform/ios.rs b/src/platform/ios.rs new file mode 100644 index 000000000..0d84accea --- /dev/null +++ b/src/platform/ios.rs @@ -0,0 +1,116 @@ +use hbb_common::ResultType; + +pub fn init() { + // Initialize iOS-specific components + #[cfg(feature = "flutter")] + { + log::info!("Initializing iOS platform"); + } +} + +pub fn get_display_server() -> String { + "iOS".to_string() +} + +pub fn is_installed() -> bool { + // iOS apps are always "installed" via App Store or TestFlight + true +} + +pub fn get_active_display() -> String { + "iOS Display".to_string() +} + +pub fn get_display_names() -> Vec { + vec!["iOS Screen".to_string()] +} + +pub fn is_root() -> bool { + // iOS apps run in sandbox, never root + false +} + +pub fn check_super_user_permission() -> ResultType { + // iOS doesn't have super user concept + Ok(false) +} + +pub fn elevate(cmd: &str) -> ResultType { + // iOS doesn't support elevation + Ok(false) +} + +pub fn run_as_user(arg: Vec<&str>) -> ResultType<()> { + // iOS apps always run as current user + Ok(()) +} + +pub fn get_app_name() -> String { + "RustDesk".to_string() +} + +pub fn is_prelogin() -> bool { + false +} + +pub fn is_can_screen_recording() -> bool { + // Check if screen recording permission is granted + // This would need to be implemented with iOS-specific APIs + true +} + +pub fn is_installed_daemon(prompt: bool) -> bool { + false +} + +pub fn is_login_screen() -> bool { + false +} + +pub fn lock_screen() { + // Cannot lock screen on iOS from app +} + +pub fn is_screen_locked() -> bool { + false +} + +pub fn switch_display(display: &str) { + // iOS only has one display +} + +pub fn is_text_control_key(key: &enigo::Key) -> bool { + matches!( + key, + enigo::Key::Return + | enigo::Key::Space + | enigo::Key::Delete + | enigo::Key::Backspace + | enigo::Key::LeftArrow + | enigo::Key::RightArrow + | enigo::Key::UpArrow + | enigo::Key::DownArrow + | enigo::Key::End + | enigo::Key::Home + ) +} + +#[inline] +pub fn is_x11() -> bool { + false +} + +#[inline] +pub fn is_wayland() -> bool { + false +} + +pub fn is_permission_granted() -> bool { + // This would check ReplayKit permissions + true +} + +pub fn request_permission() -> bool { + // This would request ReplayKit permissions + true +} \ No newline at end of file diff --git a/src/platform/linux.rs b/src/platform/linux.rs index 9a4bb37ec..f17c5b472 100644 --- a/src/platform/linux.rs +++ b/src/platform/linux.rs @@ -1,180 +1,75 @@ use super::{gtk_sudo, CursorData, ResultType}; use desktop::Desktop; +use hbb_common::config::keys::OPTION_ALLOW_LINUX_HEADLESS; pub use hbb_common::platform::linux::*; use hbb_common::{ allow_err, anyhow::anyhow, bail, - config::{keys::OPTION_ALLOW_LINUX_HEADLESS, Config}, - libc::{c_char, c_int, c_long, c_uint, c_ulong, c_void}, + config::Config, + libc::{c_char, c_int, c_long, c_void}, log, message_proto::{DisplayInfo, Resolution}, + platform::linux::{CMD_PS, CMD_SH}, regex::{Captures, Regex}, - users::{get_user_by_name, os::unix::UserExt}, }; -use libxdo_sys::{self, xdo_t, Window}; use std::{ cell::RefCell, - ffi::{OsStr, OsString}, + ffi::OsStr, path::{Path, PathBuf}, process::{Child, Command}, string::String, - sync::atomic::{AtomicBool, Ordering}, - sync::Arc, + sync::{ + atomic::{AtomicBool, Ordering}, + Arc, + }, time::{Duration, Instant}, }; -use terminfo::{capability as cap, Database}; +use users::{get_user_by_name, os::unix::UserExt}; use wallpaper; +type Xdo = *const c_void; + pub const PA_SAMPLE_RATE: u32 = 48000; static mut UNMODIFIED: bool = true; -#[derive(Clone, Debug)] -struct ActiveUserLookupCache { - uid: String, - username: String, -} - -const INVALID_TERM_VALUES: [&str; 3] = ["", "unknown", "dumb"]; -const SHELL_PROCESSES: [&str; 4] = ["bash", "zsh", "fish", "sh"]; - -// Terminal type constants -const TERM_XTERM_256COLOR: &str = "xterm-256color"; -const TERM_SCREEN_256COLOR: &str = "screen-256color"; -const TERM_XTERM: &str = "xterm"; - lazy_static::lazy_static! { pub static ref IS_X11: bool = hbb_common::platform::linux::is_x11_or_headless(); - // Cache for TERM value - once TERM_XTERM_256COLOR is found, reuse it directly - static ref CACHED_TERM: std::sync::Mutex> = std::sync::Mutex::new(None); - static ref DATABASE_XTERM_256COLOR: Option = { - match Database::from_name(TERM_XTERM_256COLOR) { - Ok(database) => Some(database), - Err(err) => { - log::error!("Failed to initialize {} database: {}", TERM_XTERM_256COLOR, err); - None - } - } - }; - static ref ACTIVE_USER_LOOKUP_CACHE: std::sync::Mutex> = - std::sync::Mutex::new(None); - // https://github.com/rustdesk/rustdesk/issues/13705 - // Check if `sudo -E` actually preserves environment. - // - // This flag is only used by `run_as_user()` (root service -> user session). If the current process is not - // running as `root`, this check is meaningless (and `sudo -n` may fail), so we return `false` directly. - // - // On Ubuntu 25.10, `sudo -E` may still succeed but effectively ignores `-E`. Some versions print a warning - // to stderr (wording may vary by locale), so we verify behavior instead: - // - Inject a sentinel environment variable into the `sudo` process - // - Run `sudo -n -E env` and check whether the sentinel is present in stdout - static ref SUDO_E_PRESERVES_ENV: bool = { - if !is_root() { - log::warn!("Not running as root, SUDO_E_PRESERVES_ENV check skipped"); - false - } else { - let key = format!("__RUSTDESK_SUDO_E_TEST_{}", std::process::id()); - let val = "1"; - let expected = format!("{key}={val}"); - Command::new("sudo") - // -n for non-interactive to avoid password prompt - .env(&key, val) - .args(["-n", "-E", "env"]) - .output() - .map(|o| { - o.status.success() - && String::from_utf8_lossy(&o.stdout).contains(expected.as_str()) - }) - .unwrap_or(false) - } - }; -} - -#[inline] -fn update_active_user_lookup_cache(desktop: &Desktop) { - if let Ok(mut cache) = ACTIVE_USER_LOOKUP_CACHE.lock() { - if desktop.uid.is_empty() || desktop.username.is_empty() { - *cache = None; - } else { - *cache = Some(ActiveUserLookupCache { - uid: desktop.uid.clone(), - username: desktop.username.clone(), - }); - } - } -} - -#[inline] -fn get_active_user_id_name_from_cache() -> Option<(String, String)> { - let cache = ACTIVE_USER_LOOKUP_CACHE.lock().ok()?; - let entry = cache.as_ref()?; - Some((entry.uid.clone(), entry.username.clone())) } thread_local! { - // XDO context - created via libxdo-sys (which uses dynamic loading stub). - // If libxdo is not available, xdo will be null and xdo-based functions become no-ops. - static XDO: RefCell<*mut xdo_t> = RefCell::new({ - let xdo = unsafe { libxdo_sys::xdo_new(std::ptr::null()) }; - if xdo.is_null() { - log::warn!("Failed to create xdo context, xdo functions will be disabled"); - } else { - log::info!("xdo context created successfully"); - } - xdo - }); + static XDO: RefCell = RefCell::new(unsafe { xdo_new(std::ptr::null()) }); static DISPLAY: RefCell<*mut c_void> = RefCell::new(unsafe { XOpenDisplay(std::ptr::null())}); } -// X11 error event structure for the custom error handler. -// See: https://www.x.org/releases/current/doc/libX11/libX11/libX11.html#Using-the-Default-Error-Handlers -#[repr(C)] -struct XErrorEvent { - type_: c_int, - display: *mut c_void, // Display* - resourceid: c_ulong, // XID - serial: c_ulong, - error_code: u8, - request_code: u8, - minor_code: u8, -} - -type XErrorHandler = unsafe extern "C" fn(*mut c_void, *mut XErrorEvent) -> c_int; - -const X11_BAD_WINDOW: u8 = 3; -const XDO_SUCCESS: c_int = 0; -const XDO_ERROR: c_int = 1; - -/// Atomic flag set by the custom X error handler when a BadWindow error occurs. -static X_BAD_WINDOW_DETECTED: AtomicBool = AtomicBool::new(false); -static X_UNEXPECTED_ERROR_DETECTED: AtomicBool = AtomicBool::new(false); - -/// Custom X error handler that catches BadWindow errors (error_code == 3) instead of -/// letting the default handler terminate the process. -/// See issue: https://github.com/rustdesk/rustdesk/issues/9003 -unsafe extern "C" fn handle_x_error(_display: *mut c_void, event: *mut XErrorEvent) -> c_int { - if !event.is_null() && (*event).error_code == X11_BAD_WINDOW { - X_BAD_WINDOW_DETECTED.store(true, Ordering::SeqCst); - log::debug!("Caught X11 BadWindow error (suppressed), window was likely destroyed"); - return 0; - } - X_UNEXPECTED_ERROR_DETECTED.store(true, Ordering::SeqCst); - if !event.is_null() { - log::warn!( - "X11 error: error_code={}, request_code={}, minor_code={}", - (*event).error_code, - (*event).request_code, - (*event).minor_code, - ); - } - 0 +extern "C" { + fn xdo_get_mouse_location( + xdo: Xdo, + x: *mut c_int, + y: *mut c_int, + screen_num: *mut c_int, + ) -> c_int; + fn xdo_new(display: *const c_char) -> Xdo; + fn xdo_get_active_window(xdo: Xdo, window: *mut *mut c_void) -> c_int; + fn xdo_get_window_location( + xdo: Xdo, + window: *mut c_void, + x: *mut c_int, + y: *mut c_int, + screen_num: *mut c_int, + ) -> c_int; + fn xdo_get_window_size( + xdo: Xdo, + window: *mut c_void, + width: *mut c_int, + height: *mut c_int, + ) -> c_int; } #[link(name = "X11")] extern "C" { fn XOpenDisplay(display_name: *const c_char) -> *mut c_void; // fn XCloseDisplay(d: *mut c_void) -> c_int; - fn XSetErrorHandler(handler: Option) -> Option; } #[link(name = "Xfixes")] @@ -216,19 +111,14 @@ fn sleep_millis(millis: u64) { pub fn get_cursor_pos() -> Option<(i32, i32)> { let mut res = None; XDO.with(|xdo| { - if let Ok(xdo) = xdo.try_borrow() { + if let Ok(xdo) = xdo.try_borrow_mut() { if xdo.is_null() { return; } let mut x: c_int = 0; let mut y: c_int = 0; unsafe { - libxdo_sys::xdo_get_mouse_location( - *xdo as *const _, - &mut x as _, - &mut y as _, - std::ptr::null_mut(), - ); + xdo_get_mouse_location(*xdo, &mut x as _, &mut y as _, std::ptr::null_mut()); } res = Some((x, y)); } @@ -236,118 +126,40 @@ pub fn get_cursor_pos() -> Option<(i32, i32)> { res } -pub fn set_cursor_pos(x: i32, y: i32) -> bool { - let mut res = false; - XDO.with(|xdo| { - match xdo.try_borrow() { - Ok(xdo) => { - if xdo.is_null() { - log::debug!("set_cursor_pos: xdo is null"); - return; - } - unsafe { - let ret = libxdo_sys::xdo_move_mouse(*xdo as *const _, x, y, 0); - if ret != 0 { - log::debug!( - "set_cursor_pos: xdo_move_mouse failed with code {} for coordinates ({}, {})", - ret, x, y - ); - } - res = ret == 0; - } - } - Err(_) => { - log::debug!("set_cursor_pos: failed to borrow xdo"); - } - } - }); - res -} - -/// Clip cursor - Linux implementation is a no-op. -/// -/// On X11, there's no direct equivalent to Windows ClipCursor. XGrabPointer -/// can confine the pointer but requires a window handle and has side effects. -/// -/// On Wayland, pointer constraints require the zwp_pointer_constraints_v1 -/// protocol which is compositor-dependent. -/// -/// For relative mouse mode on Linux, the Flutter side uses pointer warping -/// (set_cursor_pos) to re-center the cursor after each movement, which achieves -/// a similar effect without requiring cursor clipping. -/// -/// Returns true (always succeeds as no-op). -pub fn clip_cursor(_rect: Option<(i32, i32, i32, i32)>) -> bool { - // Log only once per process to avoid flooding logs when called frequently. - static LOGGED: AtomicBool = AtomicBool::new(false); - if !LOGGED.swap(true, Ordering::Relaxed) { - log::debug!("clip_cursor called (no-op on Linux, this message is logged only once)"); - } - true -} - pub fn reset_input_cache() {} pub fn get_focused_display(displays: Vec) -> Option { let mut res = None; XDO.with(|xdo| { - if let Ok(xdo) = xdo.try_borrow() { + if let Ok(xdo) = xdo.try_borrow_mut() { if xdo.is_null() { return; } let mut x: c_int = 0; let mut y: c_int = 0; - let mut width: c_uint = 0; - let mut height: c_uint = 0; - let mut window: Window = 0; + let mut width: c_int = 0; + let mut height: c_int = 0; + let mut window: *mut c_void = std::ptr::null_mut(); unsafe { - if libxdo_sys::xdo_get_active_window(*xdo as *const _, &mut window) != 0 { + if xdo_get_active_window(*xdo, &mut window) != 0 { return; } - - // XSetErrorHandler is process-global, not scoped to this Display/thread. - // This path is currently called by the single window_focus service thread. - // While installed, this handler can still observe unrelated X11 errors from - // other threads; unexpected errors make this geometry query fail. - X_BAD_WINDOW_DETECTED.store(false, Ordering::SeqCst); - X_UNEXPECTED_ERROR_DETECTED.store(false, Ordering::SeqCst); - let prev_handler = XSetErrorHandler(Some(handle_x_error)); - - let loc_ret = libxdo_sys::xdo_get_window_location( - *xdo as *const _, + if xdo_get_window_location( + *xdo, window, &mut x as _, &mut y as _, std::ptr::null_mut(), - ); - let size_ret = if loc_ret == XDO_SUCCESS { - libxdo_sys::xdo_get_window_size( - *xdo as *const _, - window, - &mut width, - &mut height, - ) - } else { - XDO_ERROR - }; - - // Do not call XSync(DISPLAY) here: DISPLAY is a separate - // XOpenDisplay() connection, while libxdo owns the Display* - // used by these geometry queries. These libxdo calls are - // synchronous XGetWindowAttributes-based queries, so the target - // BadWindow is expected to be delivered before the calls return. - XSetErrorHandler(prev_handler); - if X_BAD_WINDOW_DETECTED.load(Ordering::SeqCst) - || X_UNEXPECTED_ERROR_DETECTED.load(Ordering::SeqCst) - || loc_ret != XDO_SUCCESS - || size_ret != XDO_SUCCESS + ) != 0 { return; } - - let center_x = x + (width / 2) as c_int; - let center_y = y + (height / 2) as c_int; + if xdo_get_window_size(*xdo, window, &mut width as _, &mut height as _) != 0 { + return; + } + let center_x = x + width / 2; + let center_y = y + height / 2; res = displays.iter().position(|d| { center_x >= d.x && center_x < d.x + d.width @@ -444,188 +256,6 @@ fn start_uinput_service() { }); } -/// Suggests the best terminal type based on the environment. -/// -/// The function prioritizes terminal types in the following order: -/// 1. `screen-256color`: Preferred when running inside `tmux` or `screen` sessions, -/// as these multiplexers often support advanced terminal features. -/// 2. `xterm-256color`: Selected if the terminal supports 256 colors, which is -/// suitable for modern terminal applications. -/// 3. `xterm`: Used as a fallback for basic terminal compatibility. -/// -/// Terminals like `linux` and `vt100` are excluded because they lack support for -/// modern features required by many applications. -fn suggest_best_term() -> String { - if is_running_in_tmux() || is_running_in_screen() { - return TERM_SCREEN_256COLOR.to_string(); - } - if term_supports_256_colors(TERM_XTERM_256COLOR) { - return TERM_XTERM_256COLOR.to_string(); - } - TERM_XTERM.to_string() -} - -fn is_running_in_tmux() -> bool { - std::env::var("TMUX").is_ok() -} - -fn is_running_in_screen() -> bool { - std::env::var("STY").is_ok() -} - -fn supports_256_colors(db: &Database) -> bool { - db.get::().map_or(false, |n| n.0 >= 256) -} - -fn term_supports_256_colors(term: &str) -> bool { - match term { - TERM_XTERM_256COLOR => DATABASE_XTERM_256COLOR - .as_ref() - .map_or(false, |db| supports_256_colors(db)), - _ => Database::from_name(term).map_or(false, |db| supports_256_colors(&db)), - } -} - -fn get_cur_term(uid: &str) -> Option { - // Check cache first - if TERM_XTERM_256COLOR was found before, reuse it - if let Ok(cache) = CACHED_TERM.lock() { - if let Some(ref cached) = *cache { - if cached == TERM_XTERM_256COLOR { - return Some(cached.clone()); - } - } - } - - if uid.is_empty() { - return None; - } - - // Check current process environment - if let Ok(term) = std::env::var("TERM") { - if term == TERM_XTERM_256COLOR { - if let Ok(mut cache) = CACHED_TERM.lock() { - *cache = Some(term.clone()); - } - return Some(term); - } - } - - // Collect all TERM values from shell processes, looking for TERM_XTERM_256COLOR - let terms = get_all_term_values(uid); - - // Prefer TERM_XTERM_256COLOR - if terms.iter().any(|t| t == TERM_XTERM_256COLOR) { - if let Ok(mut cache) = CACHED_TERM.lock() { - *cache = Some(TERM_XTERM_256COLOR.to_string()); - } - return Some(TERM_XTERM_256COLOR.to_string()); - } - - // Return first valid TERM if no TERM_XTERM_256COLOR found - let fallback = terms.into_iter().next(); - if let Some(ref term) = fallback { - log::debug!( - "TERM_XTERM_256COLOR not found, using fallback TERM: {}", - term - ); - } - fallback -} - -/// Get all TERM values from shell processes (bash, zsh, fish, sh). -/// Returns a Vec of unique, valid TERM values. -fn get_all_term_values(uid: &str) -> Vec { - let Ok(uid_num) = uid.parse::() else { - return Vec::new(); - }; - - // Build regex pattern to match shell processes using only argv[0] (the executable path) - // Pattern: match process name at start or after '/', followed by space or end - // e.g., "bash", "/bin/bash", "/usr/bin/zsh" - let shell_pattern = SHELL_PROCESSES - .iter() - .map(|p| format!(r"(^|/){p}(\s|$)")) - .collect::>() - .join("|"); - let Ok(re) = Regex::new(&shell_pattern) else { - return Vec::new(); - }; - - let Ok(entries) = std::fs::read_dir("/proc") else { - return Vec::new(); - }; - - let mut terms = Vec::new(); - - for entry in entries.flatten() { - let file_name = entry.file_name(); - let Some(pid_str) = file_name.to_str() else { - continue; - }; - if !pid_str.chars().all(|c| c.is_ascii_digit()) { - continue; - } - - let proc_path = entry.path(); - - // Check if process belongs to the specified uid - if let Ok(meta) = std::fs::metadata(&proc_path) { - use std::os::unix::fs::MetadataExt; - if meta.uid() != uid_num { - continue; - } - } else { - continue; - } - - // Check cmdline matches process pattern - // /proc//cmdline is a sequence of null-terminated strings; the first - // one (argv[0]) is the executable path. Match the regex only against that - // to avoid false positives from arguments (e.g., "python /path/to/bash-script.py"). - let cmdline_path = proc_path.join("cmdline"); - let Ok(cmdline) = std::fs::read(&cmdline_path) else { - continue; - }; - let exe_end = cmdline - .iter() - .position(|&b| b == 0) - .unwrap_or(cmdline.len()); - let exe_str = String::from_utf8_lossy(&cmdline[..exe_end]); - if !re.is_match(&exe_str) { - continue; - } - - // Read environ and extract TERM - let environ_path = proc_path.join("environ"); - let Ok(environ) = std::fs::read(&environ_path) else { - continue; - }; - - for part in environ.split(|&b| b == 0) { - if part.is_empty() { - continue; - } - if let Some(eq) = part.iter().position(|&b| b == b'=') { - let key_bytes = &part[..eq]; - if key_bytes == b"TERM" { - let val_bytes = &part[eq + 1..]; - let term = String::from_utf8_lossy(val_bytes).into_owned(); - if !INVALID_TERM_VALUES.contains(&term.as_str()) && !terms.contains(&term) { - // Early return if we found the preferred term - if term == TERM_XTERM_256COLOR { - return vec![term]; - } - terms.push(term); - } - break; - } - } - } - } - - terms -} - #[inline] fn try_start_server_(desktop: Option<&Desktop>) -> ResultType> { match desktop { @@ -643,13 +273,6 @@ fn try_start_server_(desktop: Option<&Desktop>) -> ResultType> { if !desktop.home.is_empty() { envs.push(("HOME", desktop.home.clone())); } - if !desktop.dbus.is_empty() { - envs.push(("DBUS_SESSION_BUS_ADDRESS", desktop.dbus.clone())); - } - envs.push(( - "TERM", - get_cur_term(&desktop.uid).unwrap_or_else(|| suggest_best_term()), - )); run_as_user( vec!["--server"], Some((desktop.uid.clone(), desktop.username.clone())), @@ -818,7 +441,6 @@ pub fn start_os_service() { let mut last_restart = Instant::now(); while running.load(Ordering::SeqCst) { desktop.refresh(); - update_active_user_lookup_cache(&desktop); // Duplicate logic here with should_start_server // Login wayland will try to start a headless --server. @@ -891,29 +513,13 @@ pub fn start_os_service() { } #[inline] -/// Returns the cached active `(uid, username)` snapshot when available. -/// Callers that require a fresh seat0 lookup should call `get_values_of_seat0` directly. pub fn get_active_user_id_name() -> (String, String) { - if let Some(id_name) = get_active_user_id_name_from_cache() { - return id_name; - } let vec_id_name = get_values_of_seat0(&[1, 2]); (vec_id_name[0].clone(), vec_id_name[1].clone()) } #[inline] -/// Returns the cached active uid when available. -/// Callers that require a fresh seat0 lookup should call `get_values_of_seat0` directly. pub fn get_active_userid() -> String { - if let Some((uid, _)) = get_active_user_id_name_from_cache() { - return uid; - } - get_values_of_seat0(&[1])[0].clone() -} - -#[inline] -/// Returns the active uid from a fresh seat0 lookup, bypassing the service-loop cache. -pub fn get_active_userid_fresh() -> String { get_values_of_seat0(&[1])[0].clone() } @@ -968,12 +574,7 @@ fn _get_display_manager() -> String { } #[inline] -/// Returns the cached active username when available. -/// Callers that require a fresh seat0 lookup should call `get_values_of_seat0` directly. pub fn get_active_username() -> String { - if let Some((_, username)) = get_active_user_id_name_from_cache() { - return username; - } get_values_of_seat0(&[2])[0].clone() } @@ -1089,58 +690,14 @@ where if uid.is_empty() { bail!("No valid uid"); } + let xdg = &format!("XDG_RUNTIME_DIR=/run/user/{}", uid) as &str; + let mut args = vec![xdg, "-u", &username, cmd.to_str().unwrap_or("")]; + args.append(&mut arg.clone()); + // -E is required to preserve env + args.insert(0, "-E"); - let xdg = &format!("XDG_RUNTIME_DIR=/run/user/{uid}"); - if *SUDO_E_PRESERVES_ENV { - // Original logic: use sudo -E to preserve environment - let mut args = vec![xdg, "-u", &username, cmd.to_str().unwrap_or("")]; - args.append(&mut arg.clone()); - // -E is required to preserve env - args.insert(0, "-E"); - let task = Command::new("sudo").envs(envs).args(args).spawn()?; - Ok(Some(task)) - } else { - // Fallback: sudo -u username env VAR=VALUE ... cmd args - // For systems where sudo -E is not supported (e.g., Ubuntu 25.10+) - // - // SECURITY: No shell is involved here (we use execve-style argv). - // Environment is passed via `env` arguments, - // so there is no shell injection vector. - // - // Only accept portable env var names (POSIX portable character set for shells). - // Most legitimate env vars follow [A-Za-z_][A-Za-z0-9_]* convention. - // Variables with dots (e.g., "java.home") are Java system properties, not env vars. - // Being restrictive here is intentional for security in this sudo context. - fn is_valid_env_key(key: &str) -> bool { - let mut it = key.chars(); - match it.next() { - Some(c) if c.is_ascii_alphabetic() || c == '_' => {} - _ => return false, - } - it.all(|c| c.is_ascii_alphanumeric() || c == '_') - } - - let mut sudo = Command::new("sudo"); - sudo.arg("-u").arg(&username).arg("--").arg("env").arg(xdg); - - for (k, v) in envs { - let key = k.as_ref().to_string_lossy(); - if !is_valid_env_key(&key) { - log::warn!("Skipping environment variable with invalid key: '{}'. Only [A-Za-z_][A-Za-z0-9_]* are allowed in sudo context.", key); - continue; - } - // IMPORTANT: do NOT add shell quotes here; `Command` does not invoke a shell. - // Passing KEY=VALUE as a single argv element is safe and preserves spaces. - let mut arg = OsString::from(&*key); - arg.push("="); - arg.push(v.as_ref()); - sudo.arg(arg); - } - - sudo.arg(cmd).args(arg); - let task = sudo.spawn()?; - Ok(Some(task)) - } + let task = Command::new("sudo").envs(envs).args(args).spawn()?; + Ok(Some(task)) } pub fn get_pa_monitor() -> String { @@ -1221,156 +778,6 @@ pub fn is_installed() -> bool { } } -/// Get multiple environment variables from a process matching the given criteria. -/// This version reads /proc directly instead of spawning shell commands. -/// -/// # Arguments -/// * `uid` - User ID to filter processes -/// * `process_pat` - Regex pattern to match process cmdline -/// * `names` - Environment variable names to retrieve. **Must be <= 64 elements** due to -/// the internal bitmask used for tie-breaking. -/// -/// # Panics (debug builds) -/// Panics if `names.len() > 64`. -/// -/// # Implementation notes -/// - Returns values from a *single* best-matching process_pat (for consistency). -/// - Avoids repeated scanning by parsing `environ` once per process. -fn get_envs<'a>( - uid: &str, - process_pat: &str, - names: &[&'a str], -) -> std::collections::HashMap<&'a str, String> { - // The tie-breaking logic uses a u64 bitmask, limiting us to 64 variables. - debug_assert!( - names.len() <= 64, - "get_envs: names.len() must be <= 64, got {}", - names.len() - ); - - let empty: std::collections::HashMap<&'a str, String> = - names.iter().map(|&n| (n, String::new())).collect(); - - let Ok(uid_num) = uid.parse::() else { - return empty; - }; - let Ok(re) = Regex::new(process_pat) else { - return empty; - }; - - // Used for stable tie-breaking when multiple processes match. - // Higher bits correspond to earlier entries in `names`. - let name_indices: std::collections::HashMap<&'a str, usize> = - names.iter().enumerate().map(|(i, &n)| (n, i)).collect(); - - let mut best = empty.clone(); - let mut best_count = 0usize; - let mut best_mask: u64 = 0; - - // Iterate /proc to find matching processes - let Ok(entries) = std::fs::read_dir("/proc") else { - return best; - }; - - for entry in entries.flatten() { - let file_name = entry.file_name(); - let Some(pid_str) = file_name.to_str() else { - continue; - }; - if !pid_str.chars().all(|c| c.is_ascii_digit()) { - continue; - } - - let proc_path = entry.path(); - - // Check if process belongs to the specified uid - if let Ok(meta) = std::fs::metadata(&proc_path) { - use std::os::unix::fs::MetadataExt; - if meta.uid() != uid_num { - continue; - } - } else { - continue; - } - - // Check cmdline matches process pattern - let cmdline_path = proc_path.join("cmdline"); - let Ok(cmdline) = std::fs::read(&cmdline_path) else { - continue; - }; - let cmdline_str = String::from_utf8_lossy(&cmdline).replace('\0', " "); - if !re.is_match(&cmdline_str) { - continue; - } - - // Read environ and extract matching variables - let environ_path = proc_path.join("environ"); - let Ok(environ) = std::fs::read(&environ_path) else { - continue; - }; - - let mut found = empty.clone(); - let mut found_count = 0usize; - let mut found_mask: u64 = 0; - - for part in environ.split(|&b| b == 0) { - if part.is_empty() { - continue; - } - let Some(eq) = part.iter().position(|&b| b == b'=') else { - continue; - }; - let key_bytes = &part[..eq]; - let val_bytes = &part[eq + 1..]; - - let Ok(key) = std::str::from_utf8(key_bytes) else { - continue; - }; - if let Some(slot) = found.get_mut(key) { - if slot.is_empty() { - *slot = String::from_utf8_lossy(val_bytes).into_owned(); - found_count += 1; - - if let Some(&idx) = name_indices.get(key) { - let total = names.len(); - if total <= 64 { - let bit = 1u64 << (total - 1 - idx); - found_mask |= bit; - } - } - - if found_count == names.len() { - return found; - } - } - } - } - - if found_count > best_count || (found_count == best_count && found_mask > best_mask) { - best = found; - best_count = found_count; - best_mask = found_mask; - } - } - - best -} - -/// Deprecated: Use `get_envs` instead. -/// -/// https://github.com/rustdesk/rustdesk/discussions/11959 -/// -/// **Note**: This function is retained for conservative migration. The plan is to gradually -/// transition all callers to `get_envs` after it proves stable and reliable. Once `get_envs` -/// is confirmed to work correctly across all use cases, this function will be removed entirely. -/// -/// # Arguments -/// * `name` - Environment variable name to retrieve -/// * `uid` - User ID to filter processes -/// * `process` - Process name pattern to match -/// -/// # Returns -/// The environment variable value, or empty string if not found #[inline] fn get_env(name: &str, uid: &str, process: &str) -> String { let cmd = format!("ps -u {} -f | grep -E '{}' | grep -v 'grep' | tail -1 | awk '{{print $2}}' | xargs -I__ cat /proc/__/environ 2>/dev/null | tr '\\0' '\\n' | grep '^{}=' | tail -1 | sed 's/{}=//g'", uid, process, name, name); @@ -1610,18 +1017,11 @@ mod desktop { pub const XFCE4_PANEL: &str = "xfce4-panel"; pub const SDDM_GREETER: &str = "sddm-greeter"; - // xdg-desktop-portal runs on all Wayland desktops (GNOME, KDE, wlroots, etc.) - const XDG_DESKTOP_PORTAL: &str = "xdg-desktop-portal"; const XWAYLAND: &str = "Xwayland"; const IBUS_DAEMON: &str = "ibus-daemon"; const PLASMA_KDED: &str = "kded[0-9]+"; const GNOME_GOA_DAEMON: &str = "goa-daemon"; - const ENV_KEY_DISPLAY: &str = "DISPLAY"; - const ENV_KEY_XAUTHORITY: &str = "XAUTHORITY"; - const ENV_KEY_WAYLAND_DISPLAY: &str = "WAYLAND_DISPLAY"; - const ENV_KEY_DBUS_SESSION_BUS_ADDRESS: &str = "DBUS_SESSION_BUS_ADDRESS"; - #[derive(Debug, Clone, Default)] pub struct Desktop { pub sid: String, @@ -1631,7 +1031,6 @@ mod desktop { pub display: String, pub xauth: String, pub home: String, - pub dbus: String, pub is_rustdesk_subprocess: bool, pub wl_display: String, } @@ -1652,42 +1051,10 @@ mod desktop { self.sid.is_empty() || self.is_rustdesk_subprocess } - fn get_display_xauth_wayland(&mut self) { - for _ in 1..=10 { - // Prefer Wayland-related variables first when multiple portal processes match. - let mut envs = get_envs( - &self.uid, - XDG_DESKTOP_PORTAL, - &[ - ENV_KEY_WAYLAND_DISPLAY, - ENV_KEY_DBUS_SESSION_BUS_ADDRESS, - ENV_KEY_DISPLAY, - ENV_KEY_XAUTHORITY, - ], - ); - self.display = envs.remove(ENV_KEY_DISPLAY).unwrap_or_default(); - self.xauth = envs.remove(ENV_KEY_XAUTHORITY).unwrap_or_default(); - self.wl_display = envs.remove(ENV_KEY_WAYLAND_DISPLAY).unwrap_or_default(); - self.dbus = envs - .remove(ENV_KEY_DBUS_SESSION_BUS_ADDRESS) - .unwrap_or_default(); - // For pure Wayland sessions, prefer `WAYLAND_DISPLAY`. - // NOTE: On some systems (e.g. Ubuntu 25.10), `DISPLAY`/`XAUTHORITY` may exist even when XWayland - // is not running, so do NOT treat them as a success condition here. - let has_wayland = !self.wl_display.is_empty(); - let has_dbus = !self.dbus.is_empty(); - if has_wayland && has_dbus { - return; - } - sleep_millis(300); - } - } - fn get_display_xauth_xwayland(&mut self) { let tray = format!("{} +--tray", crate::get_app_name().to_lowercase()); for _ in 1..=10 { let display_proc = vec![ - XDG_DESKTOP_PORTAL, XWAYLAND, IBUS_DAEMON, GNOME_GOA_DAEMON, @@ -1695,10 +1062,9 @@ mod desktop { tray.as_str(), ]; for proc in display_proc { - self.display = get_env(ENV_KEY_DISPLAY, &self.uid, proc); - self.xauth = get_env(ENV_KEY_XAUTHORITY, &self.uid, proc); - self.wl_display = get_env(ENV_KEY_WAYLAND_DISPLAY, &self.uid, proc); - self.dbus = get_env(ENV_KEY_DBUS_SESSION_BUS_ADDRESS, &self.uid, proc); + self.display = get_env("DISPLAY", &self.uid, proc); + self.xauth = get_env("XAUTHORITY", &self.uid, proc); + self.wl_display = get_env("WAYLAND_DISPLAY", &self.uid, proc); if !self.display.is_empty() && !self.xauth.is_empty() { return; } @@ -1718,7 +1084,7 @@ mod desktop { SDDM_GREETER, ]; for proc in display_proc { - self.display = get_env(ENV_KEY_DISPLAY, &self.uid, proc); + self.display = get_env("DISPLAY", &self.uid, proc); if !self.display.is_empty() { break; } @@ -1908,8 +1274,6 @@ mod desktop { if is_xwayland_running() && !self.is_login_wayland() { self.get_display_xauth_xwayland(); self.is_rustdesk_subprocess = false; - } else if self.is_wayland() { - self.get_display_xauth_wayland(); } return; } @@ -1937,7 +1301,8 @@ mod desktop { if is_xwayland_running() { self.get_display_xauth_xwayland(); } else { - self.get_display_xauth_wayland(); + self.display = "".to_owned(); + self.xauth = "".to_owned(); } self.is_rustdesk_subprocess = false; } else { @@ -1999,57 +1364,26 @@ pub fn run_cmds_privileged(cmds: &str) -> bool { crate::platform::gtk_sudo::run(vec![cmds]).is_ok() } -/// Spawn the current executable after a delay. -/// -/// # Security -/// The executable path is safely quoted using `shell_quote()` to prevent -/// command injection vulnerabilities. The `secs` parameter is a u32, so it -/// cannot contain malicious input. -/// -/// # Arguments -/// * `secs` - Number of seconds to wait before spawning pub fn run_me_with(secs: u32) { - let exe = match std::env::current_exe() { - Ok(path) => path, - Err(e) => { - log::error!("Failed to get current exe: {}", e); - return; - } - }; - - // SECURITY: Use shell_quote to safely escape the executable path, - // preventing command injection even if the path contains special characters. - let exe_quoted = shell_quote(&exe.to_string_lossy()); - - // Spawn a background process that sleeps and then executes. - // The child process is automatically orphaned when parent exits, - // and will be adopted by init (PID 1). - Command::new(CMD_SH.as_str()) + let exe = std::env::current_exe() + .unwrap_or("".into()) + .to_string_lossy() + .to_string(); + // We use `CMD_SH` instead of `sh` to suppress some audit messages on some systems. + std::process::Command::new(CMD_SH.as_str()) .arg("-c") - .arg(&format!("sleep {secs}; exec {exe_quoted}")) + .arg(&format!("sleep {secs}; {exe}")) .spawn() .ok(); } fn switch_service(stop: bool) -> String { - // SECURITY: Use trusted home directory lookup via getpwuid instead of $HOME env var - // to prevent confused-deputy attacks where an attacker manipulates environment variables. - let home = get_home_dir_trusted() - .map(|p| p.to_string_lossy().to_string()) - .unwrap_or_default(); + let home = std::env::var("HOME").unwrap_or_default(); Config::set_option("stop-service".into(), if stop { "Y" } else { "" }.into()); - if !home.is_empty() && home != "/root" && !Config::get().is_empty() { - let app_name_lower = crate::get_app_name().to_lowercase(); + if home != "/root" && !Config::get().is_empty() { + let p = format!(".config/{}", crate::get_app_name().to_lowercase()); let app_name0 = crate::get_app_name(); - let config_subdir = format!(".config/{}", app_name_lower); - - // SECURITY: Quote all paths to prevent shell injection from paths containing - // spaces, semicolons, or other special characters. - let src1 = shell_quote(&format!("{}/{}/{}.toml", home, config_subdir, app_name0)); - let src2 = shell_quote(&format!("{}/{}/{}2.toml", home, config_subdir, app_name0)); - let dst = shell_quote(&format!("/root/{}/", config_subdir)); - - format!("cp -f {} {}; cp -f {} {};", src1, dst, src2, dst) + format!("cp -f {home}/{p}/{app_name0}.toml /root/{p}/; cp -f {home}/{p}/{app_name0}2.toml /root/{p}/;") } else { "".to_owned() } @@ -2103,15 +1437,7 @@ fn check_if_stop_service() { } pub fn check_autostart_config() -> ResultType<()> { - // SECURITY: Use trusted home directory lookup via getpwuid instead of $HOME env var - // to prevent confused-deputy attacks where an attacker manipulates environment variables. - let home = match get_home_dir_trusted() { - Some(p) => p.to_string_lossy().to_string(), - None => { - log::warn!("Failed to get trusted home directory for autostart config check"); - return Ok(()); - } - }; + let home = std::env::var("HOME").unwrap_or_default(); let app_name = crate::get_app_name().to_lowercase(); let path = format!("{home}/.config/autostart"); let file = format!("{path}/{app_name}.desktop"); @@ -2206,125 +1532,3 @@ pub fn is_selinux_enforcing() -> bool { }, } } - -/// Get the app ID for shortcuts inhibitor permission. -/// Returns different ID based on whether running in Flatpak or native. -/// The ID must match the installed .desktop filename, as GNOME Shell's -/// inhibitShortcutsDialog uses `Shell.WindowTracker.get_window_app(window).get_id()`. -fn get_shortcuts_inhibitor_app_id() -> String { - if is_flatpak() { - // In Flatpak, FLATPAK_ID is set automatically by the runtime to the app ID - // (e.g., "com.rustdesk.RustDesk"). This is the most reliable source. - // Fall back to constructing from app name if not available. - match std::env::var("FLATPAK_ID") { - Ok(id) if !id.is_empty() => format!("{}.desktop", id), - _ => { - let app_name = crate::get_app_name(); - format!("com.{}.{}.desktop", app_name.to_lowercase(), app_name) - } - } - } else { - format!("{}.desktop", crate::get_app_name().to_lowercase()) - } -} - -const PERMISSION_STORE_DEST: &str = "org.freedesktop.impl.portal.PermissionStore"; -const PERMISSION_STORE_PATH: &str = "/org/freedesktop/impl/portal/PermissionStore"; -const PERMISSION_STORE_IFACE: &str = "org.freedesktop.impl.portal.PermissionStore"; - -/// Clear GNOME shortcuts inhibitor permission via D-Bus. -/// This allows the permission dialog to be shown again. -pub fn clear_gnome_shortcuts_inhibitor_permission() -> ResultType<()> { - let app_id = get_shortcuts_inhibitor_app_id(); - log::info!( - "Clearing shortcuts inhibitor permission for app_id: {}, is_flatpak: {}", - app_id, - is_flatpak() - ); - - let conn = dbus::blocking::Connection::new_session()?; - let proxy = conn.with_proxy( - PERMISSION_STORE_DEST, - PERMISSION_STORE_PATH, - std::time::Duration::from_secs(3), - ); - - // DeletePermission(s table, s id, s app) -> () - let result: Result<(), dbus::Error> = proxy.method_call( - PERMISSION_STORE_IFACE, - "DeletePermission", - ("gnome", "shortcuts-inhibitor", app_id.as_str()), - ); - - match result { - Ok(()) => { - log::info!("Successfully cleared GNOME shortcuts inhibitor permission"); - Ok(()) - } - Err(e) => { - let err_name = e.name().unwrap_or(""); - // If the permission doesn't exist, that's also fine - if err_name == "org.freedesktop.portal.Error.NotFound" - || err_name == "org.freedesktop.DBus.Error.UnknownObject" - || err_name == "org.freedesktop.DBus.Error.ServiceUnknown" - { - log::info!( - "GNOME shortcuts inhibitor permission was not set ({})", - err_name - ); - Ok(()) - } else { - bail!("Failed to clear permission: {}", e) - } - } - } -} - -/// Check if GNOME shortcuts inhibitor permission exists. -pub fn has_gnome_shortcuts_inhibitor_permission() -> bool { - let app_id = get_shortcuts_inhibitor_app_id(); - - let conn = match dbus::blocking::Connection::new_session() { - Ok(c) => c, - Err(e) => { - log::debug!("Failed to connect to session bus: {}", e); - return false; - } - }; - let proxy = conn.with_proxy( - PERMISSION_STORE_DEST, - PERMISSION_STORE_PATH, - std::time::Duration::from_secs(3), - ); - - // Lookup(s table, s id) -> (a{sas} permissions, v data) - // We only need the permissions dict; check if app_id is a key. - let result: Result< - ( - std::collections::HashMap>, - dbus::arg::Variant>, - ), - dbus::Error, - > = proxy.method_call( - PERMISSION_STORE_IFACE, - "Lookup", - ("gnome", "shortcuts-inhibitor"), - ); - - match result { - Ok((permissions, _)) => { - let found = permissions.contains_key(&app_id); - log::debug!( - "Shortcuts inhibitor permission lookup: app_id={}, found={}, keys={:?}", - app_id, - found, - permissions.keys().collect::>() - ); - found - } - Err(e) => { - log::debug!("Failed to query shortcuts inhibitor permission: {}", e); - false - } - } -} diff --git a/src/platform/linux_desktop_manager.rs b/src/platform/linux_desktop_manager.rs index 0a512939b..0acb089f1 100644 --- a/src/platform/linux_desktop_manager.rs +++ b/src/platform/linux_desktop_manager.rs @@ -2,14 +2,9 @@ use super::{linux::*, ResultType}; use crate::client::{ LOGIN_MSG_DESKTOP_NO_DESKTOP, LOGIN_MSG_DESKTOP_SESSION_ANOTHER_USER, LOGIN_MSG_DESKTOP_SESSION_NOT_READY, LOGIN_MSG_DESKTOP_XORG_NOT_FOUND, - LOGIN_MSG_DESKTOP_XSESSION_FAILED, LOGIN_MSG_PASSWORD_WRONG, -}; -use hbb_common::{ - allow_err, bail, log, - rand::prelude::*, - tokio::time, - users::{get_user_by_name, os::unix::UserExt, User}, + LOGIN_MSG_DESKTOP_XSESSION_FAILED, }; +use hbb_common::{allow_err, bail, log, rand::prelude::*, tokio::time}; use pam; use std::{ collections::HashMap, @@ -23,6 +18,7 @@ use std::{ }, time::{Duration, Instant}, }; +use users::{get_user_by_name, os::unix::UserExt, User}; lazy_static::lazy_static! { static ref DESKTOP_RUNNING: Arc = Arc::new(AtomicBool::new(false)); @@ -94,49 +90,6 @@ fn detect_headless() -> Option<&'static str> { None } -#[derive(Copy, Clone, Debug, Eq, PartialEq)] -enum XSessionStartErrorKind { - Auth, - Env, -} - -const XSESSION_AUTH_FAILURE_DETAIL: &str = "authentication failed"; - -#[derive(Debug)] -struct XSessionStartError { - kind: XSessionStartErrorKind, - detail: String, -} - -impl XSessionStartError { - fn auth(detail: String) -> Self { - Self { - kind: XSessionStartErrorKind::Auth, - detail, - } - } - - fn env(detail: String) -> Self { - Self { - kind: XSessionStartErrorKind::Env, - detail, - } - } -} - -impl std::fmt::Display for XSessionStartError { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{}", self.detail) - } -} - -fn map_xsession_start_error_to_login_msg(kind: XSessionStartErrorKind) -> &'static str { - match kind { - XSessionStartErrorKind::Auth => LOGIN_MSG_PASSWORD_WRONG, - XSessionStartErrorKind::Env => LOGIN_MSG_DESKTOP_XSESSION_FAILED, - } -} - pub fn try_start_desktop(_username: &str, _passsword: &str) -> String { debug_assert!(crate::is_server()); if _username.is_empty() { @@ -179,21 +132,14 @@ pub fn try_start_desktop(_username: &str, _passsword: &str) -> String { } } Err(e) => { - match e.kind { - XSessionStartErrorKind::Auth => { - log::warn!("Failed to authenticate xsession user {}", e); - } - XSessionStartErrorKind::Env => { - log::error!("Failed to start xsession {}", e); - } - } - map_xsession_start_error_to_login_msg(e.kind).to_owned() + log::error!("Failed to start xsession {}", e); + LOGIN_MSG_DESKTOP_XSESSION_FAILED.to_owned() } } } } -fn try_start_x_session(username: &str, password: &str) -> Result<(String, bool), XSessionStartError> { +fn try_start_x_session(username: &str, password: &str) -> ResultType<(String, bool)> { let mut desktop_manager = DESKTOP_MANAGER.lock().unwrap(); if let Some(desktop_manager) = &mut (*desktop_manager) { if let Some(seat0_username) = desktop_manager.get_supported_display_seat0_username() { @@ -211,9 +157,7 @@ fn try_start_x_session(username: &str, password: &str) -> Result<(String, bool), desktop_manager.is_running(), )) } else { - Err(XSessionStartError::env( - crate::client::LOGIN_MSG_DESKTOP_NOT_INITED.to_owned(), - )) + bail!(crate::client::LOGIN_MSG_DESKTOP_NOT_INITED); } } @@ -299,15 +243,10 @@ impl DesktopManager { self.is_child_running.load(Ordering::SeqCst) } - fn try_start_x_session( - &mut self, - username: &str, - password: &str, - ) -> Result<(), XSessionStartError> { + fn try_start_x_session(&mut self, username: &str, password: &str) -> ResultType<()> { match get_user_by_name(username) { Some(userinfo) => { - let mut client = pam::Client::with_password(&pam_get_service_name()) - .map_err(|e| XSessionStartError::env(format!("failed to init pam client, {}", e)))?; + let mut client = pam::Client::with_password(&pam_get_service_name())?; client .conversation_mut() .set_credentials(username, password); @@ -324,24 +263,17 @@ impl DesktopManager { Ok(()) } Err(e) => { - Err(XSessionStartError::env(format!( - "failed to start x session, {}", - e - ))) + bail!("failed to start x session, {}", e); } } } - Err(_e) => { - Err(XSessionStartError::auth( - XSESSION_AUTH_FAILURE_DETAIL.to_owned(), - )) + Err(e) => { + bail!("failed to check user pass for {}, {}", username, e); } } } None => { - Err(XSessionStartError::auth( - XSESSION_AUTH_FAILURE_DETAIL.to_owned(), - )) + bail!("failed to get userinfo of {}", username); } } } @@ -389,7 +321,7 @@ impl DesktopManager { ), // ("DISPLAY", self.display.clone()), // ("XAUTHORITY", self.xauth.clone()), - // (ENV_DESKTOP_PROTOCOL, XProtocol::X11.to_string()), + // (ENV_DESKTOP_PROTOCAL, XProtocal::X11.to_string()), ]); self.child_exit.store(false, Ordering::SeqCst); let is_child_running = self.is_child_running.clone(); diff --git a/src/platform/macos.mm b/src/platform/macos.mm index 3303855a6..92ee5170b 100644 --- a/src/platform/macos.mm +++ b/src/platform/macos.mm @@ -4,13 +4,6 @@ #include #include -#include -#include -#include -#include -#include -#include - extern "C" bool CanUseNewApiForScreenCaptureCheck() { #ifdef NO_InputMonitoringAuthStatus return false; @@ -299,611 +292,3 @@ extern "C" bool MacSetMode(CGDirectDisplayID display, uint32_t width, uint32_t h CFRelease(allModes); return ret; } - -static CFMachPortRef g_eventTap = NULL; -static CFRunLoopSourceRef g_runLoopSource = NULL; -static std::mutex g_privacyModeMutex; -static bool g_privacyModeActive = false; - -// Flag to request asynchronous shutdown of privacy mode. -// This is set by DisplayReconfigurationCallback when an error occurs, instead of calling -// TurnOffPrivacyModeInternal() directly from within the callback. This avoids potential -// issues with unregistering a callback from within itself, which is not explicitly -// guaranteed to be safe by Apple documentation. -static bool g_privacyModeShutdownRequested = false; - -// Timestamp of the last display reconfiguration event (in milliseconds). -// Used for debouncing rapid successive changes (e.g., multiple resolution changes). -static uint64_t g_lastReconfigTimestamp = 0; - -// Flag indicating whether a delayed blackout reapplication is already scheduled. -// Prevents multiple concurrent delayed tasks from being created. -static bool g_blackoutReapplicationScheduled = false; - -// Use CFStringRef (UUID) as key instead of CGDirectDisplayID for stability across reconnections -// CGDirectDisplayID can change when displays are reconnected, but UUID remains stable -static std::map> g_originalGammas; - -// The event source user data value used by enigo library for injected events. -// This allows us to distinguish remote input (which should be allowed) from local physical input. -// See: libs/enigo/src/macos/macos_impl.rs - ENIGO_INPUT_EXTRA_VALUE -static const int64_t ENIGO_INPUT_EXTRA_VALUE = 100; - -// Duration in milliseconds to monitor and enforce blackout after display reconfiguration. -// macOS may restore default gamma (via ColorSync) at unpredictable times after display changes, -// so we need to actively monitor and reapply blackout during this period. -static const int64_t DISPLAY_RECONFIG_MONITOR_DURATION_MS = 5000; - -// Interval in milliseconds between gamma checks during the monitoring period. -static const int64_t GAMMA_CHECK_INTERVAL_MS = 200; - -// Helper function to get UUID string from DisplayID -static std::string GetDisplayUUID(CGDirectDisplayID displayId) { - CFUUIDRef uuid = CGDisplayCreateUUIDFromDisplayID(displayId); - if (uuid == NULL) { - return ""; - } - CFStringRef uuidStr = CFUUIDCreateString(kCFAllocatorDefault, uuid); - CFRelease(uuid); - if (uuidStr == NULL) { - return ""; - } - char buffer[128]; - if (CFStringGetCString(uuidStr, buffer, sizeof(buffer), kCFStringEncodingUTF8)) { - CFRelease(uuidStr); - return std::string(buffer); - } - CFRelease(uuidStr); - return ""; -} - -// Helper function to find DisplayID by UUID from current online displays -static CGDirectDisplayID FindDisplayIdByUUID(const std::string& targetUuid) { - uint32_t count = 0; - CGGetOnlineDisplayList(0, NULL, &count); - if (count == 0) return kCGNullDirectDisplay; - - std::vector displays(count); - CGGetOnlineDisplayList(count, displays.data(), &count); - - for (uint32_t i = 0; i < count; i++) { - std::string uuid = GetDisplayUUID(displays[i]); - if (uuid == targetUuid) { - return displays[i]; - } - } - return kCGNullDirectDisplay; -} - -// Helper function to restore gamma values for all displays in g_originalGammas. -// Returns true if all displays were restored successfully, false if any failed. -// Note: This function does NOT clear g_originalGammas - caller should do that if needed. -static bool RestoreAllGammas() { - bool allSuccess = true; - for (auto const& [uuid, gamma] : g_originalGammas) { - CGDirectDisplayID d = FindDisplayIdByUUID(uuid); - if (d == kCGNullDirectDisplay) { - NSLog(@"Display with UUID %s no longer online, skipping gamma restore", uuid.c_str()); - continue; - } - - uint32_t sampleCount = gamma.size() / 3; - if (sampleCount > 0) { - const CGGammaValue* red = gamma.data(); - const CGGammaValue* green = red + sampleCount; - const CGGammaValue* blue = green + sampleCount; - CGError error = CGSetDisplayTransferByTable(d, sampleCount, red, green, blue); - if (error != kCGErrorSuccess) { - NSLog(@"Failed to restore gamma for display (ID: %u, UUID: %s, error: %d)", (unsigned)d, uuid.c_str(), error); - allSuccess = false; - } - } - } - return allSuccess; -} - -// Helper function to apply blackout to a single display -static bool ApplyBlackoutToDisplay(CGDirectDisplayID display) { - uint32_t capacity = CGDisplayGammaTableCapacity(display); - if (capacity > 0) { - std::vector zeros(capacity, 0.0f); - CGError error = CGSetDisplayTransferByTable(display, capacity, zeros.data(), zeros.data(), zeros.data()); - if (error != kCGErrorSuccess) { - NSLog(@"ApplyBlackoutToDisplay: Failed to set gamma for display %u (error %d)", (unsigned)display, error); - return false; - } - return true; - } - NSLog(@"ApplyBlackoutToDisplay: Display %u has zero gamma table capacity, blackout not supported", (unsigned)display); - return false; -} - -// Forward declaration - defined later in the file -// Must be called while holding g_privacyModeMutex -static bool TurnOffPrivacyModeInternal(); - -// Helper function to schedule asynchronous shutdown of privacy mode. -// This is called from DisplayReconfigurationCallback when an error occurs, -// instead of calling TurnOffPrivacyModeInternal() directly. This avoids -// potential issues with unregistering a callback from within itself. -// Note: This function should be called while holding g_privacyModeMutex. -static void ScheduleAsyncPrivacyModeShutdown(const char* reason) { - if (g_privacyModeShutdownRequested) { - // Already requested, no need to schedule again - return; - } - g_privacyModeShutdownRequested = true; - NSLog(@"Privacy mode shutdown requested: %s", reason); - - // Schedule the actual shutdown on the main queue asynchronously - // This ensures we're outside the callback when we unregister it - dispatch_async(dispatch_get_main_queue(), ^{ - std::lock_guard lock(g_privacyModeMutex); - if (g_privacyModeShutdownRequested && g_privacyModeActive) { - NSLog(@"Executing deferred privacy mode shutdown"); - TurnOffPrivacyModeInternal(); - } - g_privacyModeShutdownRequested = false; - }); -} - -// Helper function to apply blackout to all online displays. -// Must be called while holding g_privacyModeMutex. -static void ApplyBlackoutToAllDisplays() { - uint32_t onlineCount = 0; - CGGetOnlineDisplayList(0, NULL, &onlineCount); - std::vector onlineDisplays(onlineCount); - CGGetOnlineDisplayList(onlineCount, onlineDisplays.data(), &onlineCount); - - for (uint32_t i = 0; i < onlineCount; i++) { - ApplyBlackoutToDisplay(onlineDisplays[i]); - } -} - -// Helper function to get current timestamp in milliseconds -static uint64_t GetCurrentTimestampMs() { - return (uint64_t)(CFAbsoluteTimeGetCurrent() * 1000.0); -} - -// Helper function to check if a display's gamma is currently blacked out (all zeros). -// Returns true if gamma appears to be blacked out, false otherwise. -static bool IsDisplayBlackedOut(CGDirectDisplayID display) { - uint32_t capacity = CGDisplayGammaTableCapacity(display); - if (capacity == 0) { - return true; // Can't check, assume it's fine - } - - std::vector red(capacity), green(capacity), blue(capacity); - uint32_t sampleCount = 0; - if (CGGetDisplayTransferByTable(display, capacity, red.data(), green.data(), blue.data(), &sampleCount) != kCGErrorSuccess) { - return true; // Can't read, assume it's fine - } - - // Check if all values are zero (or very close to zero) - for (uint32_t i = 0; i < sampleCount; i++) { - if (red[i] > 0.01f || green[i] > 0.01f || blue[i] > 0.01f) { - return false; // Not blacked out - } - } - return true; -} - -// Internal function that monitors and enforces blackout for a period after display reconfiguration. -// This function checks gamma values periodically and reapplies blackout if needed. -// Must NOT be called while holding g_privacyModeMutex (it acquires the lock internally). -static void RunBlackoutMonitor() { - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(GAMMA_CHECK_INTERVAL_MS * NSEC_PER_MSEC)), dispatch_get_main_queue(), ^{ - std::lock_guard lock(g_privacyModeMutex); - - if (!g_privacyModeActive) { - g_blackoutReapplicationScheduled = false; - return; - } - - uint64_t now = GetCurrentTimestampMs(); - - // Calculate effective end time based on the last reconfig event - uint64_t effectiveEndTime = g_lastReconfigTimestamp + DISPLAY_RECONFIG_MONITOR_DURATION_MS; - - // Check all displays and reapply blackout if any has been restored - uint32_t onlineCount = 0; - CGGetOnlineDisplayList(0, NULL, &onlineCount); - std::vector onlineDisplays(onlineCount); - CGGetOnlineDisplayList(onlineCount, onlineDisplays.data(), &onlineCount); - - bool needsReapply = false; - for (uint32_t i = 0; i < onlineCount; i++) { - if (!IsDisplayBlackedOut(onlineDisplays[i])) { - needsReapply = true; - break; - } - } - - if (needsReapply) { - NSLog(@"Gamma was restored by system, reapplying blackout"); - ApplyBlackoutToAllDisplays(); - } - - // Continue monitoring if we haven't reached the end time - if (now < effectiveEndTime) { - RunBlackoutMonitor(); - } else { - NSLog(@"Blackout monitoring period ended"); - g_blackoutReapplicationScheduled = false; - } - }); -} - -// Helper function to start monitoring and enforcing blackout after display reconfiguration. -// This is used after display reconfiguration events because macOS may restore -// default gamma (via ColorSync) at unpredictable times after display changes. -// Note: This function should be called while holding g_privacyModeMutex. -static void ScheduleDelayedBlackoutReapplication(const char* reason) { - // Update timestamp to current time - g_lastReconfigTimestamp = GetCurrentTimestampMs(); - - NSLog(@"Starting blackout monitor: %s", reason); - - // Only schedule if not already scheduled - if (!g_blackoutReapplicationScheduled) { - g_blackoutReapplicationScheduled = true; - RunBlackoutMonitor(); - } - // If already scheduled, the running monitor will see the updated timestamp - // and extend its monitoring period -} - -// Display reconfiguration callback to handle display connect/disconnect events -// -// IMPORTANT: When errors occur in this callback, we use ScheduleAsyncPrivacyModeShutdown() -// instead of calling TurnOffPrivacyModeInternal() directly. This is because: -// 1. TurnOffPrivacyModeInternal() calls CGDisplayRemoveReconfigurationCallback to unregister -// this callback, and unregistering a callback from within itself is not explicitly -// guaranteed to be safe by Apple documentation. -// 2. Using async dispatch ensures we're completely outside the callback context when -// performing the cleanup, avoiding any potential undefined behavior. -static void DisplayReconfigurationCallback(CGDirectDisplayID display, CGDisplayChangeSummaryFlags flags, void *userInfo) { - (void)userInfo; - - // Note: We need to handle the callback carefully because: - // 1. macOS may call this callback multiple times during display reconfiguration - // 2. The system may restore ColorSync settings after our gamma change - // 3. We should not hold the lock for too long in the callback - - // Skip begin configuration flag - wait for the actual change - if (flags & kCGDisplayBeginConfigurationFlag) { - return; - } - - std::lock_guard lock(g_privacyModeMutex); - - if (!g_privacyModeActive) { - return; - } - - if (flags & kCGDisplayAddFlag) { - // A display was added - apply blackout to it - NSLog(@"Display %u added during privacy mode, applying blackout", (unsigned)display); - std::string uuid = GetDisplayUUID(display); - if (uuid.empty()) { - NSLog(@"Failed to get UUID for newly added display %u, exiting privacy mode", (unsigned)display); - ScheduleAsyncPrivacyModeShutdown("Failed to get UUID for newly added display"); - return; - } - - // Save original gamma if not already saved for this UUID - if (g_originalGammas.find(uuid) == g_originalGammas.end()) { - uint32_t capacity = CGDisplayGammaTableCapacity(display); - if (capacity > 0) { - std::vector red(capacity), green(capacity), blue(capacity); - uint32_t sampleCount = 0; - if (CGGetDisplayTransferByTable(display, capacity, red.data(), green.data(), blue.data(), &sampleCount) == kCGErrorSuccess) { - std::vector all; - all.insert(all.end(), red.begin(), red.begin() + sampleCount); - all.insert(all.end(), green.begin(), green.begin() + sampleCount); - all.insert(all.end(), blue.begin(), blue.begin() + sampleCount); - g_originalGammas[uuid] = all; - } else { - NSLog(@"DisplayReconfigurationCallback: Failed to get gamma table for display %u (UUID: %s), exiting privacy mode", (unsigned)display, uuid.c_str()); - ScheduleAsyncPrivacyModeShutdown("Failed to get gamma table for newly added display"); - return; - } - } else { - NSLog(@"DisplayReconfigurationCallback: Display %u (UUID: %s) has zero gamma table capacity, exiting privacy mode", (unsigned)display, uuid.c_str()); - ScheduleAsyncPrivacyModeShutdown("Newly added display has zero gamma table capacity"); - return; - } - } - - // Apply blackout to the new display immediately - if (!ApplyBlackoutToDisplay(display)) { - NSLog(@"DisplayReconfigurationCallback: Failed to blackout display %u (UUID: %s), exiting privacy mode", (unsigned)display, uuid.c_str()); - ScheduleAsyncPrivacyModeShutdown("Failed to blackout newly added display"); - return; - } - - // Schedule a delayed re-application to handle ColorSync restoration - // macOS may restore default gamma for ALL displays after a new display is added, - // so we need to reapply blackout to all online displays, not just the new one - ScheduleDelayedBlackoutReapplication("after new display added"); - } else if (flags & kCGDisplayRemoveFlag) { - // A display was removed - update our mapping and reapply blackout to remaining displays - NSLog(@"Display %u removed during privacy mode", (unsigned)display); - std::string uuid = GetDisplayUUID(display); - (void)uuid; // UUID retrieved for potential future use or logging - - // When a display is removed, macOS may reconfigure other displays and restore their gamma. - // Schedule a delayed re-application of blackout to all remaining online displays. - ScheduleDelayedBlackoutReapplication("after display removal"); - } else if (flags & kCGDisplaySetModeFlag) { - // Display mode changed (resolution change, ColorSync/Night Shift interference, etc.) - // macOS resets gamma to default when display mode changes, so we need to reapply blackout. - // Schedule a delayed re-application because ColorSync restoration happens asynchronously. - NSLog(@"Display %u mode changed during privacy mode, reapplying blackout", (unsigned)display); - ScheduleDelayedBlackoutReapplication("after display mode change"); - } -} - -CGEventRef MyEventTapCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon) { - (void)proxy; - (void)refcon; - - // Handle EventTap being disabled by system timeout - if (type == kCGEventTapDisabledByTimeout) { - NSLog(@"EventTap was disabled by timeout, re-enabling"); - if (g_eventTap) { - CGEventTapEnable(g_eventTap, true); - } - return event; - } - - // Handle EventTap being disabled by user input - if (type == kCGEventTapDisabledByUserInput) { - NSLog(@"EventTap was disabled by user input, re-enabling"); - if (g_eventTap) { - CGEventTapEnable(g_eventTap, true); - } - return event; - } - - // Allow events explicitly injected by enigo (remote input), identified via custom user data. - int64_t userData = CGEventGetIntegerValueField(event, kCGEventSourceUserData); - if (userData == ENIGO_INPUT_EXTRA_VALUE) { - return event; - } - // Block local physical HID input. - if (CGEventGetIntegerValueField(event, kCGEventSourceStateID) == kCGEventSourceStateHIDSystemState) { - return NULL; - } - return event; -} - -// Helper function to set up EventTap on the main thread -// Returns true if EventTap was successfully created and enabled -static bool SetupEventTapOnMainThread() { - __block bool success = false; - - void (^setupBlock)(void) = ^{ - if (g_eventTap) { - // Already set up - success = true; - return; - } - - // Note: kCGEventTapDisabledByTimeout and kCGEventTapDisabledByUserInput are special - // notification types (0xFFFFFFFE and 0xFFFFFFFF) that are delivered via the callback's - // type parameter, not through the event mask. They should NOT be included in eventMask - // as bit-shifting by these values causes undefined behavior. - CGEventMask eventMask = (1 << kCGEventKeyDown) | (1 << kCGEventKeyUp) | - (1 << kCGEventLeftMouseDown) | (1 << kCGEventLeftMouseUp) | - (1 << kCGEventRightMouseDown) | (1 << kCGEventRightMouseUp) | - (1 << kCGEventOtherMouseDown) | (1 << kCGEventOtherMouseUp) | - (1 << kCGEventLeftMouseDragged) | (1 << kCGEventRightMouseDragged) | - (1 << kCGEventOtherMouseDragged) | - (1 << kCGEventMouseMoved) | (1 << kCGEventScrollWheel); - - g_eventTap = CGEventTapCreate(kCGHIDEventTap, kCGHeadInsertEventTap, kCGEventTapOptionDefault, - eventMask, MyEventTapCallback, NULL); - if (g_eventTap) { - g_runLoopSource = CFMachPortCreateRunLoopSource(kCFAllocatorDefault, g_eventTap, 0); - CFRunLoopAddSource(CFRunLoopGetMain(), g_runLoopSource, kCFRunLoopCommonModes); - CGEventTapEnable(g_eventTap, true); - success = true; - } else { - NSLog(@"MacSetPrivacyMode: Failed to create CGEventTap; input blocking not enabled."); - success = false; - } - }; - - // Execute on main thread to ensure CFRunLoop operations are safe. - // Use dispatch_sync if not on main thread, otherwise execute directly to avoid deadlock. - // - // IMPORTANT: Potential deadlock consideration: - // Using dispatch_sync while holding g_privacyModeMutex could deadlock if the main thread - // tries to acquire g_privacyModeMutex. Currently this is safe because: - // 1. MacSetPrivacyMode (which holds the mutex) is only called from background threads - // 2. The main thread never directly calls MacSetPrivacyMode - // If this assumption changes in the future, consider releasing the mutex before dispatch_sync - // or restructuring the locking strategy. - if ([NSThread isMainThread]) { - setupBlock(); - } else { - dispatch_sync(dispatch_get_main_queue(), setupBlock); - } - - return success; -} - -// Helper function to tear down EventTap on the main thread -static void TeardownEventTapOnMainThread() { - void (^teardownBlock)(void) = ^{ - if (g_eventTap) { - CGEventTapEnable(g_eventTap, false); - CFRunLoopRemoveSource(CFRunLoopGetMain(), g_runLoopSource, kCFRunLoopCommonModes); - CFRelease(g_runLoopSource); - CFRelease(g_eventTap); - g_eventTap = NULL; - g_runLoopSource = NULL; - } - }; - - // Execute on main thread to ensure CFRunLoop operations are safe. - // - // NOTE: We use dispatch_sync here instead of dispatch_async because: - // 1. TurnOffPrivacyModeInternal() expects EventTap to be fully torn down before - // proceeding with gamma restoration - using async would cause race conditions. - // 2. The caller (MacSetPrivacyMode) needs deterministic cleanup order. - // - // IMPORTANT: Potential deadlock consideration (same as SetupEventTapOnMainThread): - // Using dispatch_sync while holding g_privacyModeMutex could deadlock if the main thread - // tries to acquire g_privacyModeMutex. Currently this is safe because: - // 1. MacSetPrivacyMode (which holds the mutex) is only called from background threads - // 2. The main thread never directly calls MacSetPrivacyMode - // If this assumption changes in the future, consider releasing the mutex before dispatch_sync - // or restructuring the locking strategy. - if ([NSThread isMainThread]) { - teardownBlock(); - } else { - dispatch_sync(dispatch_get_main_queue(), teardownBlock); - } -} - -// Internal function to turn off privacy mode without acquiring the mutex -// Must be called while holding g_privacyModeMutex -static bool TurnOffPrivacyModeInternal() { - if (!g_privacyModeActive) { - return true; - } - - // 1. Unregister display reconfiguration callback - CGDisplayRemoveReconfigurationCallback(DisplayReconfigurationCallback, NULL); - - // 2. Input - restore (tear down EventTap on main thread) - TeardownEventTapOnMainThread(); - - // 3. Gamma - restore using UUID to find current DisplayID - bool restoreSuccess = RestoreAllGammas(); - - // 4. Fallback: Always call CGDisplayRestoreColorSyncSettings as a safety net - // This ensures displays return to normal even if our restoration failed or - // if the system (ColorSync/Night Shift) modified gamma during privacy mode - CGDisplayRestoreColorSyncSettings(); - - // Clean up - g_originalGammas.clear(); - g_privacyModeActive = false; - g_privacyModeShutdownRequested = false; - g_lastReconfigTimestamp = 0; - g_blackoutReapplicationScheduled = false; - - return restoreSuccess; -} - -extern "C" bool MacSetPrivacyMode(bool on) { - std::lock_guard lock(g_privacyModeMutex); - if (on) { - // Already in privacy mode - if (g_privacyModeActive) { - return true; - } - - // 1. Input Blocking - set up EventTap on main thread - if (!SetupEventTapOnMainThread()) { - return false; - } - - // 2. Register display reconfiguration callback to handle hot-plug events - CGDisplayRegisterReconfigurationCallback(DisplayReconfigurationCallback, NULL); - - // 3. Gamma Blackout - uint32_t count = 0; - CGGetOnlineDisplayList(0, NULL, &count); - std::vector displays(count); - CGGetOnlineDisplayList(count, displays.data(), &count); - - uint32_t blackoutSuccessCount = 0; - uint32_t blackoutAttemptCount = 0; - - for (uint32_t i = 0; i < count; i++) { - CGDirectDisplayID d = displays[i]; - std::string uuid = GetDisplayUUID(d); - - if (uuid.empty()) { - NSLog(@"MacSetPrivacyMode: Failed to get UUID for display %u, privacy mode requires all displays", (unsigned)d); - // Privacy mode requires ALL connected displays to be successfully blacked out - // to ensure user privacy. If we can't identify a display (no UUID), - // we can't safely manage its state or restore it later. - // Therefore, we must abort the entire operation and clean up any resources - // already allocated (like event taps and reconfiguration callbacks). - CGDisplayRemoveReconfigurationCallback(DisplayReconfigurationCallback, NULL); - TeardownEventTapOnMainThread(); - // Restore gamma for displays that were already blacked out before this failure - if (!RestoreAllGammas()) { - // If any display failed to restore, use system reset as fallback - CGDisplayRestoreColorSyncSettings(); - } - g_originalGammas.clear(); - return false; - } - - // Save original gamma using UUID as key (stable across reconnections) - if (g_originalGammas.find(uuid) == g_originalGammas.end()) { - uint32_t capacity = CGDisplayGammaTableCapacity(d); - if (capacity > 0) { - std::vector red(capacity), green(capacity), blue(capacity); - uint32_t sampleCount = 0; - if (CGGetDisplayTransferByTable(d, capacity, red.data(), green.data(), blue.data(), &sampleCount) == kCGErrorSuccess) { - std::vector all; - all.insert(all.end(), red.begin(), red.begin() + sampleCount); - all.insert(all.end(), green.begin(), green.begin() + sampleCount); - all.insert(all.end(), blue.begin(), blue.begin() + sampleCount); - g_originalGammas[uuid] = all; - } else { - NSLog(@"MacSetPrivacyMode: Failed to get gamma table for display %u (UUID: %s)", (unsigned)d, uuid.c_str()); - } - } else { - NSLog(@"MacSetPrivacyMode: Display %u (UUID: %s) has zero gamma table capacity, not supported", (unsigned)d, uuid.c_str()); - } - } - - // Set to black only if we have saved original gamma for this display - if (g_originalGammas.find(uuid) != g_originalGammas.end()) { - uint32_t capacity = CGDisplayGammaTableCapacity(d); - if (capacity > 0) { - std::vector zeros(capacity, 0.0f); - blackoutAttemptCount++; - CGError error = CGSetDisplayTransferByTable(d, capacity, zeros.data(), zeros.data(), zeros.data()); - if (error != kCGErrorSuccess) { - NSLog(@"MacSetPrivacyMode: Failed to blackout display (ID: %u, UUID: %s, error: %d)", (unsigned)d, uuid.c_str(), error); - } else { - blackoutSuccessCount++; - } - } else { - NSLog(@"MacSetPrivacyMode: Display %u (UUID: %s) has zero gamma table capacity for blackout", (unsigned)d, uuid.c_str()); - } - } - } - - // Return false if any display failed to blackout - privacy mode requires ALL displays to be blacked out - if (blackoutAttemptCount > 0 && blackoutSuccessCount < blackoutAttemptCount) { - NSLog(@"MacSetPrivacyMode: Failed to blackout all displays (%u/%u succeeded)", blackoutSuccessCount, blackoutAttemptCount); - // Clean up: unregister callback and disable event tap since we're failing - CGDisplayRemoveReconfigurationCallback(DisplayReconfigurationCallback, NULL); - TeardownEventTapOnMainThread(); - // Restore gamma for displays that were successfully blacked out - if (!RestoreAllGammas()) { - // If any display failed to restore, use system reset as fallback - NSLog(@"Some displays failed to restore gamma during cleanup, using CGDisplayRestoreColorSyncSettings as fallback"); - CGDisplayRestoreColorSyncSettings(); - } - g_originalGammas.clear(); - return false; - } - - g_privacyModeActive = true; - return true; - - } else { - return TurnOffPrivacyModeInternal(); - } -} diff --git a/src/platform/macos.rs b/src/platform/macos.rs index 2e68cf5d8..ac5e47f67 100644 --- a/src/platform/macos.rs +++ b/src/platform/macos.rs @@ -28,35 +28,16 @@ use objc::rc::autoreleasepool; use objc::{class, msg_send, sel, sel_impl}; use scrap::{libc::c_void, quartz::ffi::*}; use std::{ - collections::HashMap, os::unix::process::CommandExt, path::{Path, PathBuf}, process::{Command, Stdio}, - sync::Mutex, }; -// macOS boolean_t is defined as `int` in -type BooleanT = hbb_common::libc::c_int; - static PRIVILEGES_SCRIPTS_DIR: Dir = include_dir!("$CARGO_MANIFEST_DIR/src/platform/privileges_scripts"); static mut LATEST_SEED: i32 = 0; -#[inline] -fn get_update_temp_dir() -> PathBuf { - let euid = unsafe { hbb_common::libc::geteuid() }; - Path::new("/tmp").join(format!(".rustdeskupdate-{}", euid)) -} - -#[inline] -fn get_update_temp_dir_string() -> String { - get_update_temp_dir().to_string_lossy().into_owned() -} - -/// Global mutex to serialize CoreGraphics cursor operations. -/// This prevents race conditions between cursor visibility (hide depth tracking) -/// and cursor positioning/clipping operations. -static CG_CURSOR_MUTEX: Mutex<()> = Mutex::new(()); +const UPDATE_TEMP_DIR: &str = "/tmp/.rustdeskupdate"; extern "C" { fn CGSCurrentCursorSeed() -> i32; @@ -80,8 +61,6 @@ extern "C" { fn majorVersion() -> u32; fn MacGetMode(display: u32, width: *mut u32, height: *mut u32) -> BOOL; fn MacSetMode(display: u32, width: u32, height: u32, tryHiDPI: bool) -> BOOL; - fn CGWarpMouseCursorPosition(newCursorPosition: CGPoint) -> CGError; - fn CGAssociateMouseAndMouseCursorPosition(connected: BooleanT) -> CGError; } pub fn major_version() -> u32 { @@ -191,7 +170,6 @@ pub fn is_installed_daemon(prompt: bool) -> bool { let agent = format!("{}_server.plist", crate::get_full_name()); let agent_plist_file = format!("/Library/LaunchAgents/{}", agent); if !prompt { - // in macos 13, there is new way to check if they are running or enabled, https://developer.apple.com/documentation/servicemanagement/updating-helper-executables-from-earlier-versions-of-macos#Respond-to-changes-in-System-Settings if !std::path::Path::new(&format!("/Library/LaunchDaemons/{}", daemon)).exists() { return false; } @@ -274,7 +252,7 @@ fn update_daemon_agent(agent_plist_file: String, update_source_dir: String, sync let func = move || { let mut binding = std::process::Command::new("osascript"); - let cmd = binding + let mut cmd = binding .arg("-e") .arg(update_script_body) .arg(daemon_plist_body) @@ -286,12 +264,24 @@ fn update_daemon_agent(agent_plist_file: String, update_source_dir: String, sync Err(e) => { log::error!("run osascript failed: {}", e); } - Ok(status) if !status.success() => { - log::warn!("run osascript failed with status: {}", status); - } _ => { let installed = std::path::Path::new(&agent_plist_file).exists(); log::info!("Agent file {} installed: {}", &agent_plist_file, installed); + if installed { + // Unload first, or load may not work if already loaded. + // We hope that the load operation can immediately trigger a start. + std::process::Command::new("launchctl") + .args(&["unload", "-w", &agent_plist_file]) + .stdin(Stdio::null()) + .stdout(Stdio::null()) + .stderr(Stdio::null()) + .status() + .ok(); + let status = std::process::Command::new("launchctl") + .args(&["load", "-w", &agent_plist_file]) + .status(); + log::info!("launch server, status: {:?}", &status); + } } } }; @@ -303,12 +293,8 @@ fn update_daemon_agent(agent_plist_file: String, update_source_dir: String, sync } fn correct_app_name(s: &str) -> String { - let mut s = s.to_owned(); - if let Some(bundleid) = get_bundle_id() { - s = s.replace("com.carriez.rustdesk", &bundleid); - } - s = s.replace("rustdesk", &crate::get_app_name().to_lowercase()); - s = s.replace("RustDesk", &crate::get_app_name()); + let s = s.replace("rustdesk", &crate::get_app_name().to_lowercase()); + let s = s.replace("RustDesk", &crate::get_app_name()); s } @@ -393,101 +379,6 @@ pub fn get_cursor_pos() -> Option<(i32, i32)> { */ } -/// Warp the mouse cursor to the specified screen position. -/// -/// # Thread Safety -/// This function affects global cursor state and acquires `CG_CURSOR_MUTEX`. -/// Callers must ensure no nested calls occur while the mutex is held. -/// -/// # Arguments -/// * `x` - X coordinate in screen points (macOS uses points, not pixels) -/// * `y` - Y coordinate in screen points -pub fn set_cursor_pos(x: i32, y: i32) -> bool { - // Acquire lock with deadlock detection in debug builds. - // In debug builds, try_lock detects re-entrant calls early; on failure we return immediately. - // In release builds, we use blocking lock() which will wait if contended. - #[cfg(debug_assertions)] - let _guard = match CG_CURSOR_MUTEX.try_lock() { - Ok(guard) => guard, - Err(std::sync::TryLockError::WouldBlock) => { - log::error!( - "[BUG] set_cursor_pos: CG_CURSOR_MUTEX is already held - potential deadlock!" - ); - debug_assert!(false, "Re-entrant call to set_cursor_pos detected"); - return false; - } - Err(std::sync::TryLockError::Poisoned(e)) => e.into_inner(), - }; - #[cfg(not(debug_assertions))] - let _guard = CG_CURSOR_MUTEX.lock().unwrap_or_else(|e| e.into_inner()); - unsafe { - let result = CGWarpMouseCursorPosition(CGPoint { - x: x as f64, - y: y as f64, - }); - if result != CGError::Success { - log::error!( - "CGWarpMouseCursorPosition({}, {}) returned error: {:?}", - x, - y, - result - ); - } - result == CGError::Success - } -} - -/// Toggle pointer lock (dissociate/associate mouse from cursor position). -/// -/// On macOS, cursor clipping is not supported directly like Windows ClipCursor. -/// Instead, we use CGAssociateMouseAndMouseCursorPosition to dissociate mouse -/// movement from cursor position, achieving a "pointer lock" effect. -/// -/// # Thread Safety -/// This function affects global cursor state and acquires `CG_CURSOR_MUTEX`. -/// Callers must ensure only one owner toggles pointer lock at a time; -/// nested Some/None transitions from different call sites may cause unexpected behavior. -/// -/// # Arguments -/// * `rect` - When `Some(_)`, dissociates mouse from cursor (enables pointer lock). -/// When `None`, re-associates mouse with cursor (disables pointer lock). -/// The rect coordinate values are ignored on macOS; only `Some`/`None` matters. -/// The parameter signature matches Windows for API consistency. -pub fn clip_cursor(rect: Option<(i32, i32, i32, i32)>) -> bool { - // Acquire lock with deadlock detection in debug builds. - // In debug builds, try_lock detects re-entrant calls early; on failure we return immediately. - // In release builds, we use blocking lock() which will wait if contended. - #[cfg(debug_assertions)] - let _guard = match CG_CURSOR_MUTEX.try_lock() { - Ok(guard) => guard, - Err(std::sync::TryLockError::WouldBlock) => { - log::error!("[BUG] clip_cursor: CG_CURSOR_MUTEX is already held - potential deadlock!"); - debug_assert!(false, "Re-entrant call to clip_cursor detected"); - return false; - } - Err(std::sync::TryLockError::Poisoned(e)) => e.into_inner(), - }; - #[cfg(not(debug_assertions))] - let _guard = CG_CURSOR_MUTEX.lock().unwrap_or_else(|e| e.into_inner()); - // CGAssociateMouseAndMouseCursorPosition takes a boolean_t: - // 1 (true) = associate mouse with cursor position (normal mode) - // 0 (false) = dissociate mouse from cursor position (pointer lock mode) - // When rect is Some, we want pointer lock (dissociate), so associate = false (0). - // When rect is None, we want normal mode (associate), so associate = true (1). - let associate: BooleanT = if rect.is_some() { 0 } else { 1 }; - unsafe { - let result = CGAssociateMouseAndMouseCursorPosition(associate); - if result != CGError::Success { - log::warn!( - "CGAssociateMouseAndMouseCursorPosition({}) returned error: {:?}", - associate, - result - ); - } - result == CGError::Success - } -} - pub fn get_focused_display(displays: Vec) -> Option { autoreleasepool(|| unsafe_get_focused_display(displays)) } @@ -817,15 +708,6 @@ pub fn quit_gui() { }; } -#[inline] -pub fn try_remove_temp_update_dir(dir: Option<&str>) { - let target_path_buf = dir.map(PathBuf::from).unwrap_or_else(get_update_temp_dir); - let target_path = target_path_buf.as_path(); - if target_path.exists() { - std::fs::remove_dir_all(target_path).ok(); - } -} - pub fn update_me() -> ResultType<()> { let is_installed_daemon = is_installed_daemon(false); let option_stop_service = "stop-service"; @@ -845,38 +727,34 @@ pub fn update_me() -> ResultType<()> { bail!("Unknown app directory of current exe file: {:?}", cmd); }; - let app_name = crate::get_app_name(); if is_installed_daemon && !is_service_stopped { let agent = format!("{}_server.plist", crate::get_full_name()); let agent_plist_file = format!("/Library/LaunchAgents/{}", agent); + std::process::Command::new("launchctl") + .args(&["unload", "-w", &agent_plist_file]) + .stdin(Stdio::null()) + .stdout(Stdio::null()) + .stderr(Stdio::null()) + .status() + .ok(); update_daemon_agent(agent_plist_file, app_dir, true); } else { // `kill -9` may not work without "administrator privileges" - let update_body = r#" -on run {app_name, cur_pid, app_dir, user_name} - set app_bundle to "/Applications/" & app_name & ".app" - set app_bundle_q to quoted form of app_bundle - set app_dir_q to quoted form of app_dir - set user_name_q to quoted form of user_name - - set check_source to "test -d " & app_dir_q & " || exit 1;" - set kill_others to "pids=$(pgrep -x '" & app_name & "' | grep -vx " & cur_pid & " || true); if [ -n \"$pids\" ]; then echo \"$pids\" | xargs kill -9 || true; fi;" - set copy_files to "rm -rf " & app_bundle_q & " && ditto " & app_dir_q & " " & app_bundle_q & " && chown -R " & user_name_q & ":staff " & app_bundle_q & " && (xattr -r -d com.apple.quarantine " & app_bundle_q & " || true);" - set sh to "set -e;" & check_source & kill_others & copy_files - - do shell script sh with prompt app_name & " wants to update itself" with administrator privileges -end run - "#; - let active_user = get_active_username(); - let status = Command::new("osascript") + let update_body = format!( + r#" +do shell script " +pgrep -x 'RustDesk' | grep -v {} | xargs kill -9 && rm -rf /Applications/RustDesk.app && cp -R '{}' /Applications/ && chown -R {}:staff /Applications/RustDesk.app +" with prompt "RustDesk wants to update itself" with administrator privileges + "#, + std::process::id(), + app_dir, + get_active_username() + ); + match Command::new("osascript") .arg("-e") .arg(update_body) - .arg(app_name.to_string()) - .arg(std::process::id().to_string()) - .arg(app_dir) - .arg(active_user) - .status(); - match status { + .status() + { Ok(status) if !status.success() => { log::error!("osascript execution failed with status: {}", status); } @@ -888,7 +766,7 @@ end run } std::process::Command::new("open") .arg("-n") - .arg(&format!("/Applications/{}.app", app_name)) + .arg(&format!("/Applications/{}.app", crate::get_app_name())) .spawn() .ok(); // leave open a little time @@ -896,40 +774,12 @@ end run Ok(()) } -pub fn update_from_dmg(dmg_path: &str) -> ResultType<()> { - let update_temp_dir = get_update_temp_dir_string(); - println!("Starting update from DMG: {}", dmg_path); - extract_dmg(dmg_path, &update_temp_dir)?; - println!("DMG extracted"); - update_extracted(&update_temp_dir)?; - println!("Update process started"); +pub fn update_to(file: &str) -> ResultType<()> { + extract_dmg(file, UPDATE_TEMP_DIR)?; + update_extracted(UPDATE_TEMP_DIR)?; Ok(()) } -pub fn update_to(_file: &str) -> ResultType<()> { - let update_temp_dir = get_update_temp_dir_string(); - update_extracted(&update_temp_dir)?; - Ok(()) -} - -pub fn extract_update_dmg(file: &str) { - let update_temp_dir = get_update_temp_dir_string(); - let mut evt: HashMap<&str, String> = - HashMap::from([("name", "extract-update-dmg".to_string())]); - match extract_dmg(file, &update_temp_dir) { - Ok(_) => { - log::info!("Extracted dmg file to {}", update_temp_dir); - } - Err(e) => { - evt.insert("err", e.to_string()); - log::error!("Failed to extract dmg file {}: {}", file, e); - } - } - let evt = serde_json::ser::to_string(&evt).unwrap_or("".to_owned()); - #[cfg(feature = "flutter")] - crate::flutter::push_global_event(crate::flutter::APP_TYPE_MAIN, evt); -} - fn extract_dmg(dmg_path: &str, target_dir: &str) -> ResultType<()> { let mount_point = "/Volumes/RustDeskUpdate"; let target_path = Path::new(target_dir); @@ -939,14 +789,10 @@ fn extract_dmg(dmg_path: &str, target_dir: &str) -> ResultType<()> { } std::fs::create_dir_all(target_path)?; - let status = Command::new("hdiutil") + Command::new("hdiutil") .args(&["attach", "-nobrowse", "-mountpoint", mount_point, dmg_path]) .status()?; - if !status.success() { - bail!("Failed to attach DMG image at {}: {:?}", dmg_path, status); - } - struct DmgGuard(&'static str); impl Drop for DmgGuard { fn drop(&mut self) { @@ -957,21 +803,16 @@ fn extract_dmg(dmg_path: &str, target_dir: &str) -> ResultType<()> { } let _guard = DmgGuard(mount_point); - let app_name = format!("{}.app", crate::get_app_name()); + let app_name = "RustDesk.app"; let src_path = format!("{}/{}", mount_point, app_name); let dest_path = format!("{}/{}", target_dir, app_name); - let copy_status = Command::new("ditto") - .args(&[&src_path, &dest_path]) + let copy_status = Command::new("cp") + .args(&["-R", &src_path, &dest_path]) .status()?; if !copy_status.success() { - bail!( - "Failed to copy application from {} to {}: {:?}", - src_path, - dest_path, - copy_status - ); + bail!("Failed to copy application {:?}", copy_status); } if !Path::new(&dest_path).exists() { @@ -985,13 +826,9 @@ fn extract_dmg(dmg_path: &str, target_dir: &str) -> ResultType<()> { } fn update_extracted(target_dir: &str) -> ResultType<()> { - let app_name = crate::get_app_name(); - let exe_path = format!( - "{}/{}.app/Contents/MacOS/{}", - target_dir, app_name, app_name - ); + let exe_path = format!("{}/RustDesk.app/Contents/MacOS/RustDesk", target_dir); let _child = unsafe { - if let Err(e) = Command::new(&exe_path) + Command::new(&exe_path) .arg("--update") .stdin(Stdio::null()) .stdout(Stdio::null()) @@ -1000,11 +837,7 @@ fn update_extracted(target_dir: &str) -> ResultType<()> { hbb_common::libc::setsid(); Ok(()) }) - .spawn() - { - try_remove_temp_update_dir(Some(target_dir)); - bail!(e); - } + .spawn()? }; Ok(()) } @@ -1021,7 +854,6 @@ pub fn hide_dock() { } #[inline] -#[allow(dead_code)] fn get_server_start_time_of(p: &Process, path: &Path) -> Option { let cmd = p.cmd(); if cmd.len() <= 1 { @@ -1040,7 +872,6 @@ fn get_server_start_time_of(p: &Process, path: &Path) -> Option { } #[inline] -#[allow(dead_code)] fn get_server_start_time(sys: &mut System, path: &Path) -> Option<(i64, Pid)> { sys.refresh_processes_specifics(ProcessRefreshKind::new()); for (_, p) in sys.processes() { @@ -1204,27 +1035,3 @@ impl WakeLock { .ok_or(anyhow!("no AwakeHandle"))? } } - -fn get_bundle_id() -> Option { - unsafe { - let bundle: id = msg_send![class!(NSBundle), mainBundle]; - if bundle.is_null() { - return None; - } - - let bundle_id: id = msg_send![bundle, bundleIdentifier]; - if bundle_id.is_null() { - return None; - } - - let c_str: *const std::os::raw::c_char = msg_send![bundle_id, UTF8String]; - if c_str.is_null() { - return None; - } - - let bundle_id_str = std::ffi::CStr::from_ptr(c_str) - .to_string_lossy() - .to_string(); - Some(bundle_id_str) - } -} diff --git a/src/platform/mod.rs b/src/platform/mod.rs index c1bc38232..ea14cb997 100644 --- a/src/platform/mod.rs +++ b/src/platform/mod.rs @@ -26,13 +26,12 @@ pub mod linux_desktop_manager; #[cfg(target_os = "linux")] pub mod gtk_sudo; -#[cfg(all( - not(all(target_os = "windows", not(target_pointer_width = "64"))), - not(any(target_os = "android", target_os = "ios")) -))] -use hbb_common::sysinfo::System; #[cfg(not(any(target_os = "android", target_os = "ios")))] -use hbb_common::{message_proto::CursorData, sysinfo::Pid, ResultType}; +use hbb_common::{ + message_proto::CursorData, + sysinfo::{Pid, System}, + ResultType, +}; use std::sync::{Arc, Mutex}; #[cfg(not(any(target_os = "macos", target_os = "android", target_os = "ios")))] pub const SERVICE_INTERVAL: u64 = 300; @@ -120,18 +119,16 @@ pub fn get_wakelock(_display: bool) -> WakeLock { return crate::platform::WakeLock::new(_display, true, false); } -#[cfg(any(target_os = "windows", target_os = "linux"))] pub(crate) struct InstallingService; // please use new -#[cfg(any(target_os = "windows", target_os = "linux"))] impl InstallingService { + #[cfg(any(target_os = "windows", target_os = "linux"))] pub fn new() -> Self { *INSTALLING_SERVICE.lock().unwrap() = true; Self } } -#[cfg(any(target_os = "windows", target_os = "linux"))] impl Drop for InstallingService { fn drop(&mut self) { *INSTALLING_SERVICE.lock().unwrap() = false; @@ -147,7 +144,6 @@ pub fn is_prelogin() -> bool { // Note: This method is inefficient on Windows. It will get all the processes. // It should only be called when performance is not critical. // If we wanted to get the command line ourselves, there would be a lot of new code. -#[allow(dead_code)] #[cfg(not(any(target_os = "android", target_os = "ios")))] fn get_pids_of_process_with_args, S2: AsRef>( name: S1, diff --git a/src/platform/privileges_scripts/agent.plist b/src/platform/privileges_scripts/agent.plist index 28f9c024a..5ff786a49 100644 --- a/src/platform/privileges_scripts/agent.plist +++ b/src/platform/privileges_scripts/agent.plist @@ -4,10 +4,6 @@ Label com.carriez.RustDesk_server - - AssociatedBundleIdentifiers - com.carriez.rustdesk - LimitLoadToSessionType LoginWindow @@ -31,7 +27,5 @@ WorkingDirectory /Applications/RustDesk.app/Contents/MacOS/ - ProcessType - Interactive diff --git a/src/platform/privileges_scripts/daemon.plist b/src/platform/privileges_scripts/daemon.plist index c003ea2be..59f103a31 100644 --- a/src/platform/privileges_scripts/daemon.plist +++ b/src/platform/privileges_scripts/daemon.plist @@ -4,10 +4,6 @@ Label com.carriez.RustDesk_service - - AssociatedBundleIdentifiers - com.carriez.rustdesk - KeepAlive ThrottleInterval diff --git a/src/platform/privileges_scripts/update.scpt b/src/platform/privileges_scripts/update.scpt index 0484c257a..f9faa4aae 100644 --- a/src/platform/privileges_scripts/update.scpt +++ b/src/platform/privileges_scripts/update.scpt @@ -1,26 +1,18 @@ on run {daemon_file, agent_file, user, cur_pid, source_dir} - set agent_plist to "/Library/LaunchAgents/com.carriez.RustDesk_server.plist" - set daemon_plist to "/Library/LaunchDaemons/com.carriez.RustDesk_service.plist" - set app_bundle to "/Applications/RustDesk.app" + set unload_service to "launchctl unload -w /Library/LaunchDaemons/com.carriez.RustDesk_service.plist || true;" - set check_source to "test -d " & quoted form of source_dir & " || exit 1;" - set resolve_uid to "uid=$(id -u " & quoted form of user & " 2>/dev/null || true);" - set unload_agent to "if [ -n \"$uid\" ]; then launchctl bootout gui/$uid " & quoted form of agent_plist & " 2>/dev/null || launchctl bootout user/$uid " & quoted form of agent_plist & " 2>/dev/null || launchctl unload -w " & quoted form of agent_plist & " || true; else launchctl unload -w " & quoted form of agent_plist & " || true; fi;" - set unload_service to "launchctl unload -w " & daemon_plist & " || true;" - set kill_others to "pids=$(pgrep -x 'RustDesk' | grep -vx " & cur_pid & " || true); if [ -n \"$pids\" ]; then echo \"$pids\" | xargs kill -9 || true; fi;" + set kill_others to "pgrep -x 'RustDesk' | grep -v " & cur_pid & " | xargs kill -9;" - set copy_files to "(rm -rf " & quoted form of app_bundle & " && ditto " & quoted form of source_dir & " " & quoted form of app_bundle & " && chown -R " & quoted form of user & ":staff " & quoted form of app_bundle & " && (xattr -r -d com.apple.quarantine " & quoted form of app_bundle & " || true)) || exit 1;" + set copy_files to "rm -rf /Applications/RustDesk.app && cp -r " & source_dir & " /Applications && chown -R " & quoted form of user & ":staff /Applications/RustDesk.app;" - set write_daemon_plist to "echo " & quoted form of daemon_file & " > " & daemon_plist & " && chown root:wheel " & daemon_plist & ";" - set write_agent_plist to "echo " & quoted form of agent_file & " > " & agent_plist & " && chown root:wheel " & agent_plist & ";" - set load_service to "launchctl load -w " & daemon_plist & ";" - set agent_label_cmd to "agent_label=$(basename " & quoted form of agent_plist & " .plist);" - set bootstrap_agent to "if [ -n \"$uid\" ]; then launchctl bootstrap gui/$uid " & quoted form of agent_plist & " 2>/dev/null || launchctl bootstrap user/$uid " & quoted form of agent_plist & " 2>/dev/null || launchctl load -w " & quoted form of agent_plist & " || true; else launchctl load -w " & quoted form of agent_plist & " || true; fi;" - set kickstart_agent to "if [ -n \"$uid\" ]; then launchctl kickstart -k gui/$uid/$agent_label 2>/dev/null || launchctl kickstart -k user/$uid/$agent_label 2>/dev/null || true; fi;" - set load_agent to agent_label_cmd & bootstrap_agent & kickstart_agent + set sh1 to "echo " & quoted form of daemon_file & " > /Library/LaunchDaemons/com.carriez.RustDesk_service.plist && chown root:wheel /Library/LaunchDaemons/com.carriez.RustDesk_service.plist;" - set sh to "set -e;" & check_source & resolve_uid & unload_agent & unload_service & kill_others & copy_files & write_daemon_plist & write_agent_plist & load_service & load_agent + set sh2 to "echo " & quoted form of agent_file & " > /Library/LaunchAgents/com.carriez.RustDesk_server.plist && chown root:wheel /Library/LaunchAgents/com.carriez.RustDesk_server.plist;" + + set sh3 to "launchctl load -w /Library/LaunchDaemons/com.carriez.RustDesk_service.plist;" + + set sh to unload_service & kill_others & copy_files & sh1 & sh2 & sh3 do shell script sh with prompt "RustDesk wants to update itself" with administrator privileges end run diff --git a/src/platform/windows.cc b/src/platform/windows.cc index 9027d9d89..d83a1b0c4 100644 --- a/src/platform/windows.cc +++ b/src/platform/windows.cc @@ -580,30 +580,6 @@ extern "C" return rdp_or_console; } - BOOL is_session_locked(DWORD session_id) - { - if (session_id == 0xFFFFFFFF) { - return FALSE; - } - PWTSINFOEXW pInfo = NULL; - DWORD bytes = 0; - BOOL locked = FALSE; - if (WTSQuerySessionInformationW( - WTS_CURRENT_SERVER_HANDLE, - session_id, - WTSSessionInfoEx, - (LPWSTR *)&pInfo, - &bytes)) { - if (pInfo && pInfo->Level == 1) { - locked = (pInfo->Data.WTSInfoExLevel1.SessionFlags == WTS_SESSIONSTATE_LOCK); - } - if (pInfo) { - WTSFreeMemory(pInfo); - } - } - return locked; - } - uint32_t get_active_user(PWSTR bufin, uint32_t nin, BOOL rdp) { uint32_t nout = 0; diff --git a/src/platform/windows.rs b/src/platform/windows.rs index 1dc4a788a..45c5fc7ab 100644 --- a/src/platform/windows.rs +++ b/src/platform/windows.rs @@ -40,7 +40,7 @@ use winapi::{ shared::{minwindef::*, ntdef::NULL, windef::*, winerror::*}, um::{ errhandlingapi::GetLastError, - handleapi::{CloseHandle, INVALID_HANDLE_VALUE}, + handleapi::CloseHandle, libloaderapi::{ GetProcAddress, LoadLibraryA, LoadLibraryExA, LOAD_LIBRARY_SEARCH_SYSTEM32, }, @@ -49,19 +49,15 @@ use winapi::{ GetCurrentProcess, GetCurrentProcessId, GetExitCodeProcess, OpenProcess, OpenProcessToken, ProcessIdToSessionId, PROCESS_INFORMATION, STARTUPINFOW, }, - securitybaseapi::{ - AllocateAndInitializeSid, DuplicateToken, EqualSid, FreeSid, GetTokenInformation, - }, + securitybaseapi::GetTokenInformation, shellapi::ShellExecuteW, sysinfoapi::{GetNativeSystemInfo, SYSTEM_INFO}, winbase::*, wingdi::*, winnt::{ - SecurityImpersonation, TokenElevation, TokenGroups, TokenImpersonation, TokenType, - DOMAIN_ALIAS_RID_ADMINS, ES_AWAYMODE_REQUIRED, ES_CONTINUOUS, ES_DISPLAY_REQUIRED, + TokenElevation, ES_AWAYMODE_REQUIRED, ES_CONTINUOUS, ES_DISPLAY_REQUIRED, ES_SYSTEM_REQUIRED, HANDLE, PROCESS_ALL_ACCESS, PROCESS_QUERY_LIMITED_INFORMATION, - PSID, SECURITY_BUILTIN_DOMAIN_RID, SECURITY_NT_AUTHORITY, SID_IDENTIFIER_AUTHORITY, - TOKEN_ELEVATION, TOKEN_GROUPS, TOKEN_QUERY, TOKEN_TYPE, + TOKEN_ELEVATION, TOKEN_QUERY, }, winreg::HKEY_CURRENT_USER, winspool::{ @@ -73,19 +69,10 @@ use winapi::{ }; use windows::Win32::{ Foundation::{CloseHandle as WinCloseHandle, HANDLE as WinHANDLE}, - Security::{ - GetTokenInformation as WinGetTokenInformation, IsWellKnownSid, TokenUser, - WinLocalSystemSid, TOKEN_QUERY as WIN_TOKEN_QUERY, TOKEN_USER, - }, System::Diagnostics::ToolHelp::{ CreateToolhelp32Snapshot, Process32FirstW, Process32NextW, PROCESSENTRY32W, TH32CS_SNAPPROCESS, }, - System::Threading::{ - OpenProcess as WinOpenProcess, OpenProcessToken as WinOpenProcessToken, - QueryFullProcessImageNameW as WinQueryFullProcessImageNameW, - PROCESS_QUERY_LIMITED_INFORMATION as WIN_PROCESS_QUERY_LIMITED_INFORMATION, - }, }; use windows_service::{ define_windows_service, @@ -97,14 +84,6 @@ use windows_service::{ }; use winreg::{enums::*, RegKey}; -mod acl; -pub(crate) use acl::current_process_user_sid_string; -pub use acl::{ - set_path_permission, set_path_permission_for_portable_service_shmem_dir, - set_path_permission_for_portable_service_shmem_file, - validate_path_for_portable_service_shmem_dir, -}; - pub const FLUTTER_RUNNER_WIN32_WINDOW_CLASS: &'static str = "FLUTTER_RUNNER_WIN32_WINDOW"; // main window, install window pub const EXPLORER_EXE: &'static str = "explorer.exe"; pub const SET_FOREGROUND_WINDOW: &'static str = "SET_FOREGROUND_WINDOW"; @@ -124,56 +103,21 @@ pub fn get_focused_display(displays: Vec) -> Option { let center_x = rect.left + (rect.right - rect.left) / 2; let center_y = rect.top + (rect.bottom - rect.top) / 2; center_x >= display.x - && center_x < display.x + display.width + && center_x <= display.x + display.width && center_y >= display.y - && center_y < display.y + display.height + && center_y <= display.y + display.height }) } } pub fn get_cursor_pos() -> Option<(i32, i32)> { unsafe { - let mut out = mem::MaybeUninit::::uninit(); - if GetCursorPos(out.as_mut_ptr()) == FALSE { + #[allow(invalid_value)] + let mut out = mem::MaybeUninit::uninit().assume_init(); + if GetCursorPos(&mut out) == FALSE { return None; } - let out = out.assume_init(); - Some((out.x, out.y)) - } -} - -pub fn set_cursor_pos(x: i32, y: i32) -> bool { - unsafe { - if SetCursorPos(x, y) == FALSE { - let err = GetLastError(); - log::warn!("SetCursorPos failed: x={}, y={}, error_code={}", x, y, err); - return false; - } - true - } -} - -/// Clip cursor to a rectangle. Pass None to unclip. -pub fn clip_cursor(rect: Option<(i32, i32, i32, i32)>) -> bool { - unsafe { - let result = match rect { - Some((left, top, right, bottom)) => { - let r = RECT { - left, - top, - right, - bottom, - }; - ClipCursor(&r) - } - None => ClipCursor(std::ptr::null()), - }; - if result == FALSE { - let err = GetLastError(); - log::warn!("ClipCursor failed: rect={:?}, error_code={}", rect, err); - return false; - } - true + return Some((out.x, out.y)); } } @@ -540,7 +484,6 @@ const SERVICE_TYPE: ServiceType = ServiceType::OWN_PROCESS; extern "C" { fn get_current_session(rdp: BOOL) -> DWORD; - fn is_session_locked(session_id: DWORD) -> BOOL; fn LaunchProcessWin( cmd: *const u16, session_id: DWORD, @@ -578,60 +521,6 @@ extern "C" { fn is_service_running_w(svc_name: *const u16) -> bool; } -pub fn get_current_session_id(share_rdp: bool) -> DWORD { - unsafe { get_current_session(if share_rdp { TRUE } else { FALSE }) } -} - -#[inline] -fn resolve_expected_active_session_id_for_service(session_id: u32) -> Option { - let share_rdp_enabled = is_share_rdp(); - if get_available_sessions(false) - .iter() - .any(|e| e.sid == session_id) - { - return Some(session_id); - } - let current_active_session = - unsafe { get_current_session(if share_rdp_enabled { TRUE } else { FALSE }) }; - if current_active_session == u32::MAX { - None - } else { - Some(current_active_session) - } -} - -#[inline] -fn authorize_service_scoped_ipc_connection( - stream: &ipc::Connection, - expected_active_session_id: Option, -) -> bool { - let (authorized, peer_pid, peer_session_id, peer_is_system) = - stream.service_authorization_status_for_session(expected_active_session_id); - if !authorized { - ipc::log_rejected_windows_ipc_connection( - crate::POSTFIX_SERVICE, - peer_pid, - peer_session_id, - expected_active_session_id, - peer_is_system, - None, - ); - return false; - } - if let Err(err) = - ipc::ensure_peer_executable_matches_current_by_pid_opt(peer_pid, crate::POSTFIX_SERVICE) - { - log::warn!( - "Rejected unauthorized connection on protected service-scoped IPC channel due to executable mismatch: postfix={}, peer_pid={:?}, err={}", - crate::POSTFIX_SERVICE, - peer_pid, - err - ); - return false; - } - true -} - extern "system" { fn BlockInput(v: BOOL) -> BOOL; } @@ -698,15 +587,6 @@ async fn run_service(_arguments: Vec) -> ResultType<()> { Ok(res) => match res { Some(Ok(stream)) => { let mut stream = ipc::Connection::new(stream); - // Keep IPC authorization consistent with the session we are currently serving. - // Recompute expected session right before authorization to avoid using a stale - // session_id after awaiting incoming.next(). - let expected_active_session_id = - resolve_expected_active_session_id_for_service(session_id); - if !authorize_service_scoped_ipc_connection(&stream, expected_active_session_id) - { - continue; - } if let Ok(Some(data)) = stream.next_timeout(1000).await { match data { ipc::Data::Close => { @@ -829,37 +709,15 @@ pub fn run_as_user(arg: Vec<&str>) -> ResultType> { run_exe_in_cur_session(std::env::current_exe()?.to_str().unwrap_or(""), arg, false) } -pub fn run_exe_direct( - exe: &str, - arg: Vec<&str>, - show: bool, -) -> ResultType> { - let mut cmd = std::process::Command::new(exe); - for a in arg { - cmd.arg(a); - } - if !show { - cmd.creation_flags(CREATE_NO_WINDOW); - } - match cmd.spawn() { - Ok(child) => Ok(Some(child)), - Err(e) => bail!("Failed to start process: {}", e), - } -} - pub fn run_exe_in_cur_session( exe: &str, arg: Vec<&str>, show: bool, ) -> ResultType> { - if is_root() { - let Some(session_id) = get_current_process_session_id() else { - bail!("Failed to get current process session id"); - }; - run_exe_in_session(exe, arg, session_id, show) - } else { - run_exe_direct(exe, arg, show) - } + let Some(session_id) = get_current_process_session_id() else { + bail!("Failed to get current process session id"); + }; + run_exe_in_session(exe, arg, session_id, show) } pub fn run_exe_in_session( @@ -1217,22 +1075,6 @@ pub fn get_active_user_home() -> Option { None } -#[cfg(not(feature = "flutter"))] -#[inline] -pub fn portable_service_logon_helper_paths() -> Option<(PathBuf, PathBuf)> { - // Keep parity with history for now: derive LocalAppData from user profile path. - // If users report redirected/non-standard LocalAppData issues, switch to: - // `BaseDirs::new()?.data_local_dir()` for Known Folder-based resolution. - let user_dir = hbb_common::directories_next::UserDirs::new()?; - let dir = user_dir - .home_dir() - .join("AppData") - .join("Local") - .join("rustdesk-sciter"); - let dst = dir.join("rustdesk.exe"); - Some((dir, dst)) -} - pub fn is_prelogin() -> bool { let Some(username) = get_current_session_username() else { return false; @@ -1240,22 +1082,17 @@ pub fn is_prelogin() -> bool { username.is_empty() || username == "SYSTEM" } -pub fn is_locked() -> bool { - let Some(session_id) = get_current_process_session_id() else { - return false; - }; - unsafe { is_session_locked(session_id) == TRUE } -} - +// `is_logon_ui()` is regardless of multiple sessions now. +// It only check if "LogonUI.exe" exists. +// +// If there're mulitple sessions (logged in users), +// some are in the login screen, while the others are not. +// Then this function may not work fine if the session we want to handle(connect) is not in the login screen. +// But it's a rare case and cannot be simply handled, so it will not be dealt with for the time being. #[inline] pub fn is_logon_ui() -> ResultType { - let Some(current_sid) = get_current_process_session_id() else { - return Ok(false); - }; let pids = get_pids("LogonUI.exe")?; - Ok(pids - .into_iter() - .any(|pid| get_session_id_of_process(pid) == Some(current_sid))) + Ok(!pids.is_empty()) } pub fn is_root() -> bool { @@ -1442,38 +1279,6 @@ pub fn copy_exe_cmd(src_exe: &str, exe: &str, path: &str) -> ResultType )) } -#[inline] -pub fn rename_exe_cmd(src_exe: &str, path: &str) -> ResultType { - let src_exe_filename = PathBuf::from(src_exe) - .file_name() - .ok_or(anyhow!("Can't get file name of {src_exe}"))? - .to_string_lossy() - .to_string(); - let app_name = crate::get_app_name().to_lowercase(); - if src_exe_filename.to_lowercase() == format!("{app_name}.exe") { - Ok("".to_owned()) - } else { - Ok(format!( - " - move /Y \"{path}\\{src_exe_filename}\" \"{path}\\{app_name}.exe\" - ", - )) - } -} - -#[inline] -pub fn remove_meta_toml_cmd(is_msi: bool, path: &str) -> String { - if is_msi && crate::is_custom_client() { - format!( - " - del /F /Q \"{path}\\meta.toml\" - ", - ) - } else { - "".to_owned() - } -} - fn get_after_install( exe: &str, reg_value_start_menu_shortcuts: Option, @@ -1560,11 +1365,7 @@ pub fn install_me(options: &str, path: String, silent: bool, debug: bool) -> Res } let app_name = crate::get_app_name(); - let current_exe = std::env::current_exe()?; - let tmp_path = std::env::temp_dir().to_string_lossy().to_string(); - let cur_exe = current_exe.to_str().unwrap_or("").to_owned(); - let shortcut_icon_location = get_shortcut_icon_location(&path, &cur_exe); let mk_shortcut = write_cmds( format!( " @@ -1573,7 +1374,6 @@ sLinkFile = \"{tmp_path}\\{app_name}.lnk\" Set oLink = oWS.CreateShortcut(sLinkFile) oLink.TargetPath = \"{exe}\" - {shortcut_icon_location} oLink.Save " ), @@ -1602,7 +1402,7 @@ oLink.Save .to_str() .unwrap_or("") .to_owned(); - let tray_shortcut = get_tray_shortcut(&path, &exe, &cur_exe, &tmp_path)?; + let tray_shortcut = get_tray_shortcut(&exe, &tmp_path)?; let mut reg_value_desktop_shortcuts = "0".to_owned(); let mut reg_value_start_menu_shortcuts = "0".to_owned(); let mut reg_value_printer = "0".to_owned(); @@ -1630,13 +1430,8 @@ copy /Y \"{tmp_path}\\Uninstall {app_name}.lnk\" \"{start_menu}\\\" reg_value_printer = "1".to_owned(); } - let meta = std::fs::symlink_metadata(¤t_exe)?; - let mut size = meta.len() / 1024; - if let Some(parent_dir) = current_exe.parent() { - if let Some(d) = parent_dir.to_str() { - size = get_directory_size_kb(d); - } - } + let meta = std::fs::symlink_metadata(std::env::current_exe()?)?; + let size = meta.len() / 1024; // https://docs.microsoft.com/zh-cn/windows/win32/msi/uninstall-registry-key?redirectedfrom=MSDNa // https://www.windowscentral.com/how-edit-registry-using-command-prompt-windows-10 // https://www.tenforums.com/tutorials/70903-add-remove-allowed-apps-through-windows-firewall-windows-10-a.html @@ -1689,7 +1484,7 @@ chcp 65001 md \"{path}\" {copy_exe} reg add {subkey} /f -reg add {subkey} /f /v DisplayIcon /t REG_SZ /d \"{display_icon}\" +reg add {subkey} /f /v DisplayIcon /t REG_SZ /d \"{exe}\" reg add {subkey} /f /v DisplayName /t REG_SZ /d \"{app_name}\" reg add {subkey} /f /v DisplayVersion /t REG_SZ /d \"{version}\" reg add {subkey} /f /v Version /t REG_SZ /d \"{version}\" @@ -1713,7 +1508,6 @@ copy /Y \"{tmp_path}\\Uninstall {app_name}.lnk\" \"{path}\\\" {install_remote_printer} {sleep} ", - display_icon = get_custom_icon(&path, &cur_exe).unwrap_or(exe.to_string()), version = crate::VERSION.replace("-", "."), build_date = crate::BUILD_DATE, after_install = get_after_install( @@ -1949,163 +1743,6 @@ fn get_reg_of(subkey: &str, name: &str) -> String { "".to_owned() } -fn get_public_base_dir() -> PathBuf { - if let Ok(allusersprofile) = std::env::var("ALLUSERSPROFILE") { - let path = PathBuf::from(&allusersprofile); - if path.exists() { - return path; - } - } - if let Ok(public) = std::env::var("PUBLIC") { - let path = PathBuf::from(public).join("Documents"); - if path.exists() { - return path; - } - } - let program_data_dir = PathBuf::from("C:\\ProgramData"); - if program_data_dir.exists() { - return program_data_dir; - } - std::env::temp_dir() -} - -#[inline] -pub fn get_custom_client_staging_dir() -> PathBuf { - get_public_base_dir() - .join("RustDesk") - .join("RustDeskCustomClientStaging") -} - -/// Removes the custom client staging directory. -/// -/// Current behavior: intentionally a no-op (does not delete). -/// -/// Rationale -/// - The staging directory only contains a small `custom.txt`, leaving it is harmless. -/// - Deleting directories under a public location (e.g., C:\\ProgramData\\RustDesk) is -/// susceptible to TOCTOU attacks if an unprivileged user can replace the path with a -/// symlink/junction between checks and deletion. -/// -/// Future work: -/// - Use the files (if needed) in the installation directory instead of a public location. -/// This directory only contains a small `custom.txt` file. -/// - Pass the custom client name directly via command line -/// or environment variable during update installation. Then no staging directory is needed. -#[inline] -pub fn remove_custom_client_staging_dir(staging_dir: &Path) -> ResultType { - if !staging_dir.exists() { - return Ok(false); - } - - // First explicitly removes `custom.txt` to ensure stale config is never replayed, - // even if the subsequent directory removal fails. - // - // `std::fs::remove_file` on a symlink removes the symlink itself, not the target, - // so this is safe even in a TOCTOU race. - let custom_txt_path = staging_dir.join("custom.txt"); - if custom_txt_path.exists() { - allow_err!(std::fs::remove_file(&custom_txt_path)); - } - - // Intentionally not deleting. See the function docs for rationale. - log::debug!( - "Skip deleting staging directory {:?} (intentional to avoid TOCTOU)", - staging_dir - ); - Ok(false) -} - -// Prepare custom client update by copying staged custom.txt to current directory and loading it. -// Returns: -// 1. Ok(true) if preparation was successful or no staging directory exists. -// 2. Ok(false) if custom.txt file exists but has invalid contents or fails security checks -// (e.g., is a symlink or has invalid contents). -// 3. Err if any unexpected error occurs during file operations. -pub fn prepare_custom_client_update() -> ResultType { - let custom_client_staging_dir = get_custom_client_staging_dir(); - let current_exe = std::env::current_exe()?; - let current_exe_dir = current_exe - .parent() - .ok_or(anyhow!("Cannot get parent directory of current exe"))?; - - let staging_dir = custom_client_staging_dir.clone(); - let clear_staging_on_exit = crate::SimpleCallOnReturn { - b: true, - f: Box::new( - move || match remove_custom_client_staging_dir(&staging_dir) { - Ok(existed) => { - if existed { - log::info!("Custom client staging directory removed successfully."); - } - } - Err(e) => { - log::error!( - "Failed to remove custom client staging directory {:?}: {}", - staging_dir, - e - ); - } - }, - ), - }; - - if custom_client_staging_dir.exists() { - let custom_txt_path = custom_client_staging_dir.join("custom.txt"); - if !custom_txt_path.exists() { - return Ok(true); - } - - let metadata = std::fs::symlink_metadata(&custom_txt_path)?; - if metadata.is_symlink() { - log::error!( - "custom.txt is a symlink. Refusing to load custom client for security reasons." - ); - drop(clear_staging_on_exit); - return Ok(false); - } - if metadata.is_file() { - // Copy custom.txt to current directory - let local_custom_file_path = current_exe_dir.join("custom.txt"); - log::debug!( - "Copying staged custom file from {:?} to {:?}", - custom_txt_path, - local_custom_file_path - ); - - // No need to check symlink before copying. - // `load_custom_client()` will fail if the file is not valid. - fs::copy(&custom_txt_path, &local_custom_file_path)?; - log::info!("Staged custom client file copied to current directory."); - - // Load custom client - let is_custom_file_exists = - local_custom_file_path.exists() && local_custom_file_path.is_file(); - crate::load_custom_client(); - - // Remove the copied custom.txt file - allow_err!(fs::remove_file(&local_custom_file_path)); - - // Check if loaded successfully - if is_custom_file_exists && !crate::common::is_custom_client() { - // The custom.txt file existed, but its contents are invalid. - log::error!("Failed to load custom client from custom.txt."); - drop(clear_staging_on_exit); - // ERROR_INVALID_DATA - return Ok(false); - } - } else { - log::info!("No custom client files found in staging directory."); - } - } else { - log::info!( - "Custom client staging directory {:?} does not exist.", - custom_client_staging_dir - ); - } - - Ok(true) -} - pub fn get_license_from_exe_name() -> ResultType { let mut exe = std::env::current_exe()?.to_str().unwrap_or("").to_owned(); // if defined portable appname entry, replace original executable name with it. @@ -2122,9 +1759,6 @@ pub fn update_install_option(k: &str, v: &str) -> ResultType<()> { if !is_installed() || !crate::is_server() { return Ok(()); } - if ![REG_NAME_INSTALL_PRINTER].contains(&k) || !["0", "1"].contains(&v) { - return Ok(()); - } let app_name = crate::get_app_name(); let ext = app_name.to_lowercase(); let cmds = @@ -2217,67 +1851,18 @@ unsafe fn set_default_dll_directories() -> bool { true } -fn get_custom_icon(install_dir: &str, exe: &str) -> Option { - const RELATIVE_ICON_PATH: &str = "data\\flutter_assets\\assets\\icon.ico"; - if crate::is_custom_client() { - if let Some(p) = PathBuf::from(exe).parent() { - let alter_icon_path = p.join(RELATIVE_ICON_PATH); - if alter_icon_path.exists() { - // During installation, files under `install_dir` may not exist yet. - // So we validate the icon from the current executable directory first. - // But for shortcut/registry icon location, we should point to the final - // installed path so the icon works across different Windows users. - if let Ok(metadata) = std::fs::symlink_metadata(&alter_icon_path) { - if metadata.is_symlink() { - log::warn!( - "Custom icon at {:?} is a symlink, refusing to use it.", - alter_icon_path - ); - return None; - } - if metadata.is_file() { - return if install_dir.is_empty() { - Some(alter_icon_path.to_string_lossy().to_string()) - } else { - Some(format!("{}\\{}", install_dir, RELATIVE_ICON_PATH)) - }; - } - } - } - } - } - None -} - -#[inline] -fn get_shortcut_icon_location(install_dir: &str, exe: &str) -> String { - if exe.is_empty() { - return "".to_owned(); - } - - get_custom_icon(install_dir, exe) - .map(|p| format!("oLink.IconLocation = \"{}\"", p)) - .unwrap_or_default() -} - pub fn create_shortcut(id: &str) -> ResultType<()> { let exe = std::env::current_exe()?.to_str().unwrap_or("").to_owned(); - // https://github.com/rustdesk/rustdesk/issues/13735 - // Replace ':' with '_' for filename since ':' is not allowed in Windows filenames - // https://github.com/rustdesk/hbb_common/blob/8b0e25867375ba9e6bff548acf44fe6d6ffa7c0e/src/config.rs#L1384 - let filename = id.replace(':', "_"); - let shortcut_icon_location = get_shortcut_icon_location("", &exe); let shortcut = write_cmds( format!( " Set oWS = WScript.CreateObject(\"WScript.Shell\") strDesktop = oWS.SpecialFolders(\"Desktop\") Set objFSO = CreateObject(\"Scripting.FileSystemObject\") -sLinkFile = objFSO.BuildPath(strDesktop, \"{filename}.lnk\") +sLinkFile = objFSO.BuildPath(strDesktop, \"{id}.lnk\") Set oLink = oWS.CreateShortcut(sLinkFile) oLink.TargetPath = \"{exe}\" oLink.Arguments = \"--connect {id}\" - {shortcut_icon_location} oLink.Save " ), @@ -2289,7 +1874,6 @@ oLink.Save .to_owned(); std::process::Command::new("cscript") .arg(&shortcut) - .creation_flags(CREATE_NO_WINDOW) .output()?; allow_err!(std::fs::remove_file(shortcut)); Ok(()) @@ -2419,33 +2003,16 @@ pub fn elevate_or_run_as_system(is_setup: bool, is_elevate: bool, is_run_as_syst is_run_as_system, crate::username(), ); - let mut arg_elevate = if is_setup { + let arg_elevate = if is_setup { "--noinstall --elevate" } else { "--elevate" - } - .to_owned(); - let mut arg_run_as_system = if is_setup { + }; + let arg_run_as_system = if is_setup { "--noinstall --run-as-system" } else { "--run-as-system" - } - .to_owned(); - let shmem_name_from_args = crate::portable_service::portable_service_shmem_name_from_args(); - if shmem_name_from_args.is_none() && crate::portable_service::has_portable_service_shmem_arg() { - log::error!("Invalid portable service shared memory argument, aborting elevation flow"); - // This is a malformed bootstrap argument in a privilege-sensitive path. - // Keep fail-closed process termination here to avoid continuing elevation - // with inconsistent shared-memory contract. - std::process::exit(1); - } - if let Some(shmem_name) = shmem_name_from_args { - let shmem_arg = crate::portable_service::portable_service_shmem_arg(&shmem_name); - arg_elevate.push(' '); - arg_elevate.push_str(&shmem_arg); - arg_run_as_system.push(' '); - arg_run_as_system.push_str(&shmem_arg); - } + }; if is_root() { if is_run_as_system { log::info!("run portable service"); @@ -2456,7 +2023,7 @@ pub fn elevate_or_run_as_system(is_setup: bool, is_elevate: bool, is_run_as_syst Ok(elevated) => { if elevated { if !is_run_as_system { - if run_as_system(arg_run_as_system.as_str()).is_ok() { + if run_as_system(arg_run_as_system).is_ok() { std::process::exit(0); } else { log::error!( @@ -2467,7 +2034,7 @@ pub fn elevate_or_run_as_system(is_setup: bool, is_elevate: bool, is_run_as_syst } } else { if !is_elevate { - if let Ok(true) = elevate(arg_elevate.as_str()) { + if let Ok(true) = elevate(arg_elevate) { std::process::exit(0); } else { log::error!("Failed to elevate, error {}", io::Error::last_os_error()); @@ -2525,115 +2092,6 @@ pub fn is_elevated(process_id: Option) -> ResultType { } } -#[inline] -unsafe fn read_token_user_buffer(token: WinHANDLE, subject: &str) -> ResultType> { - let mut token_user_size = 0u32; - let get_info_result = WinGetTokenInformation(token, TokenUser, None, 0, &mut token_user_size); - match get_info_result { - Ok(()) => { - if token_user_size == 0 { - bail!( - "Failed to get {} token user size: unexpected zero buffer size", - subject - ); - } - } - Err(e) => { - // Allow expected size-probe failures if Windows still returns required size. - let is_insufficient_buffer = - e.code() == windows::core::HRESULT::from_win32(ERROR_INSUFFICIENT_BUFFER as u32); - let is_bad_length = - e.code() == windows::core::HRESULT::from_win32(ERROR_BAD_LENGTH as u32); - if (!is_insufficient_buffer && !is_bad_length) || token_user_size == 0 { - bail!("Failed to get {} token user size: {}", subject, e); - } - } - } - - let mut buffer = vec![0u8; token_user_size as usize]; - WinGetTokenInformation( - token, - TokenUser, - Some(buffer.as_mut_ptr() as *mut core::ffi::c_void), - token_user_size, - &mut token_user_size, - ) - .map_err(|e| anyhow!("Failed to get {} token user: {}", subject, e))?; - - let min_size = std::mem::size_of::(); - if buffer.len() < min_size { - bail!( - "Failed to parse {} token user: buffer too small (got {}, need >= {})", - subject, - buffer.len(), - min_size - ); - } - Ok(buffer) -} - -/// Similar to `is_root()` / `is_local_system()` but for an arbitrary process. -/// -/// Returns `true` if the target process is running as LocalSystem (SID: S-1-5-18). -/// -/// TODO: After a few releases of real-world validation, consider replacing -/// the legacy `is_local_system()` with this implementation. -pub fn is_process_running_as_system(process_id: DWORD) -> ResultType { - unsafe { - let process = WinOpenProcess(WIN_PROCESS_QUERY_LIMITED_INFORMATION, false, process_id) - .map_err(|e| anyhow!("Failed to open process {}: {}", process_id, e))?; - - let mut token = WinHANDLE::default(); - let result = (|| -> ResultType { - WinOpenProcessToken(process, WIN_TOKEN_QUERY, &mut token) - .map_err(|e| anyhow!("Failed to open process {} token: {}", process_id, e))?; - - let token_subject = format!("process {}", process_id); - let buffer = read_token_user_buffer(token, token_subject.as_str())?; - let token_user: TOKEN_USER = - std::ptr::read_unaligned(buffer.as_ptr() as *const TOKEN_USER); - Ok(IsWellKnownSid(token_user.User.Sid, WinLocalSystemSid).as_bool()) - })(); - - if !token.is_invalid() { - let _ = WinCloseHandle(token); - } - let _ = WinCloseHandle(process); - result - } -} - -pub fn get_process_executable_path(process_id: DWORD) -> ResultType { - const PROCESS_IMAGE_PATH_BUFFER_LEN: usize = 32 * 1024; - unsafe { - let process = WinOpenProcess(WIN_PROCESS_QUERY_LIMITED_INFORMATION, false, process_id) - .map_err(|e| anyhow!("Failed to open process {}: {}", process_id, e))?; - - let result = (|| -> ResultType { - let mut buffer = vec![0u16; PROCESS_IMAGE_PATH_BUFFER_LEN]; - let mut length = PROCESS_IMAGE_PATH_BUFFER_LEN as u32; - WinQueryFullProcessImageNameW( - process, - windows::Win32::System::Threading::PROCESS_NAME_FORMAT(0), - windows::core::PWSTR(buffer.as_mut_ptr()), - &mut length, - ) - .map_err(|e| anyhow!("Failed to query process {} image path: {}", process_id, e))?; - if length == 0 { - bail!( - "Failed to query process {} image path: empty result", - process_id - ); - } - buffer.truncate(length as usize); - Ok(PathBuf::from(OsString::from_wide(&buffer))) - })(); - - let _ = WinCloseHandle(process); - result - } -} - pub fn is_foreground_window_elevated() -> ResultType { unsafe { let mut process_id: DWORD = 0; @@ -2700,177 +2158,6 @@ pub fn send_message_to_hnwd( return true; } -pub fn get_logon_user_token(user: &str, pwd: &str) -> ResultType { - let user_split = user.split("\\").collect::>(); - let wuser = wide_string(user_split.get(1).unwrap_or(&user)); - let wpc = wide_string(user_split.get(0).unwrap_or(&"")); - let wpwd = wide_string(pwd); - let mut ph_token: HANDLE = std::ptr::null_mut(); - let res = unsafe { - LogonUserW( - wuser.as_ptr(), - wpc.as_ptr(), - wpwd.as_ptr(), - LOGON32_LOGON_INTERACTIVE, - LOGON32_PROVIDER_DEFAULT, - &mut ph_token as _, - ) - }; - if res == FALSE { - bail!( - "Failed to log on user {}: {}", - user, - std::io::Error::last_os_error() - ); - } else { - if ph_token.is_null() { - bail!( - "Failed to log on user {}: {}", - user, - std::io::Error::last_os_error() - ); - } - Ok(ph_token) - } -} - -// Ensure the token returned is a primary token. -// If the provided token is an impersonation token, it duplicates it to a primary token. -// If the provided token is already a primary token, it returns it as is. -// The caller is responsible for closing the returned token handle. -pub fn ensure_primary_token(user_token: HANDLE) -> ResultType { - if user_token.is_null() || user_token == INVALID_HANDLE_VALUE { - bail!("Invalid user token provided"); - } - - unsafe { - let mut token_type: TOKEN_TYPE = 0; - let mut return_length: DWORD = 0; - - if GetTokenInformation( - user_token, - TokenType, - &mut token_type as *mut _ as *mut _, - std::mem::size_of::() as DWORD, - &mut return_length, - ) == FALSE - { - bail!( - "Failed to get token type, error {}", - io::Error::last_os_error() - ); - } - - if token_type == TokenImpersonation { - let mut duplicate_token: HANDLE = std::ptr::null_mut(); - let dup_res = DuplicateToken(user_token, SecurityImpersonation, &mut duplicate_token); - CloseHandle(user_token); - if dup_res == FALSE { - bail!( - "Failed to duplicate token, error {}", - io::Error::last_os_error() - ); - } - Ok(duplicate_token) - } else { - Ok(user_token) - } - } -} - -pub fn is_user_token_admin(user_token: HANDLE) -> ResultType { - if user_token.is_null() || user_token == INVALID_HANDLE_VALUE { - bail!("Invalid user token provided"); - } - - unsafe { - let mut dw_size: DWORD = 0; - GetTokenInformation( - user_token, - TokenGroups, - std::ptr::null_mut(), - 0, - &mut dw_size, - ); - - let last_error = GetLastError(); - if last_error != ERROR_INSUFFICIENT_BUFFER { - bail!( - "Failed to get token groups buffer size, error: {}", - last_error - ); - } - if dw_size == 0 { - bail!("Token groups buffer size is zero"); - } - - let mut buffer = vec![0u8; dw_size as usize]; - if GetTokenInformation( - user_token, - TokenGroups, - buffer.as_mut_ptr() as *mut _, - dw_size, - &mut dw_size, - ) == FALSE - { - bail!( - "Failed to get token groups information, error: {}", - io::Error::last_os_error() - ); - } - - let p_token_groups = buffer.as_ptr() as *const TOKEN_GROUPS; - let group_count = (*p_token_groups).GroupCount; - - if group_count == 0 { - return Ok(false); - } - - let mut nt_authority: SID_IDENTIFIER_AUTHORITY = SID_IDENTIFIER_AUTHORITY { - Value: SECURITY_NT_AUTHORITY, - }; - let mut administrators_group: PSID = std::ptr::null_mut(); - if AllocateAndInitializeSid( - &mut nt_authority, - 2, - SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, - 0, - 0, - 0, - 0, - 0, - &mut administrators_group, - ) == FALSE - { - bail!( - "Failed to allocate administrators group SID, error: {}", - io::Error::last_os_error() - ); - } - if administrators_group.is_null() { - bail!("Failed to create administrators group SID"); - } - - let mut is_admin = false; - let groups = - std::slice::from_raw_parts((*p_token_groups).Groups.as_ptr(), group_count as usize); - for group in groups { - if EqualSid(administrators_group, group.Sid) == TRUE { - is_admin = true; - break; - } - } - - if !administrators_group.is_null() { - FreeSid(administrators_group); - } - - Ok(is_admin) - } -} - pub fn create_process_with_logon(user: &str, pwd: &str, exe: &str, arg: &str) -> ResultType<()> { let last_error_table = HashMap::from([ ( @@ -2926,6 +2213,16 @@ pub fn create_process_with_logon(user: &str, pwd: &str, exe: &str, arg: &str) -> return Ok(()); } +pub fn set_path_permission(dir: &Path, permission: &str) -> ResultType<()> { + std::process::Command::new("icacls") + .arg(dir.as_os_str()) + .arg("/grant") + .arg(format!("*S-1-1-0:(OI)(CI){}", permission)) + .arg("/T") + .spawn()?; + Ok(()) +} + #[inline] fn str_to_device_name(name: &str) -> [u16; 32] { let mut device_name: Vec = wide_string(name); @@ -3022,7 +2319,7 @@ pub fn user_accessible_folder() -> ResultType { } else if dir2.exists() { dir = dir2; } else { - bail!("no valid user accessible folder"); + bail!("no vaild user accessible folder"); } Ok(dir) } @@ -3169,9 +2466,9 @@ pub fn uninstall_service(show_new_window: bool, _: bool) -> bool { pub fn install_service() -> bool { log::info!("Installing service..."); let _installing = crate::platform::InstallingService::new(); - let (_, path, _, exe) = get_install_info(); + let (_, _, _, exe) = get_install_info(); let tmp_path = std::env::temp_dir().to_string_lossy().to_string(); - let tray_shortcut = get_tray_shortcut(&path, &exe, &exe, &tmp_path).unwrap_or_default(); + let tray_shortcut = get_tray_shortcut(&exe, &tmp_path).unwrap_or_default(); let filter = format!(" /FI \"PID ne {}\"", get_current_pid()); Config::set_option("stop-service".into(), "".into()); crate::ipc::EXIT_RECV_CLOSE.store(false, Ordering::Relaxed); @@ -3199,44 +2496,6 @@ if exist \"{tray_shortcut}\" del /f /q \"{tray_shortcut}\" std::process::exit(0); } -/// Calculate the total size of a directory in KB -/// Does not follow symlinks to prevent directory traversal attacks. -fn get_directory_size_kb(path: &str) -> u64 { - let mut total_size = 0u64; - let mut stack = vec![PathBuf::from(path)]; - - while let Some(current_path) = stack.pop() { - let entries = match std::fs::read_dir(¤t_path) { - Ok(entries) => entries, - Err(_) => continue, - }; - - for entry in entries { - let entry = match entry { - Ok(entry) => entry, - Err(_) => continue, - }; - - let metadata = match std::fs::symlink_metadata(entry.path()) { - Ok(metadata) => metadata, - Err(_) => continue, - }; - - if metadata.is_symlink() { - continue; - } - - if metadata.is_dir() { - stack.push(entry.path()); - } else { - total_size = total_size.saturating_add(metadata.len()); - } - } - } - - total_size / 1024 -} - pub fn update_me(debug: bool) -> ResultType<()> { let app_name = crate::get_app_name(); let src_exe = std::env::current_exe()?.to_string_lossy().to_string(); @@ -3277,36 +2536,12 @@ pub fn update_me(debug: bool) -> ResultType<()> { if versions.len() > 2 { version_build = versions[2]; } - let version = crate::VERSION.replace("-", "."); - let size = get_directory_size_kb(&path); - let build_date = crate::BUILD_DATE; - // Use the icon in the previous installation directory if possible. - let display_icon = get_custom_icon("", &exe).unwrap_or(exe.to_string()); + let meta = std::fs::symlink_metadata(std::env::current_exe()?)?; + let size = meta.len() / 1024; - let is_msi = is_msi_installed().ok(); - - fn get_reg_cmd( - subkey: &str, - is_msi: Option, - display_icon: &str, - version: &str, - build_date: &str, - version_major: &str, - version_minor: &str, - version_build: &str, - size: u64, - ) -> String { - let reg_display_icon = if is_msi.unwrap_or(false) { - "".to_string() - } else { - format!( - "reg add {} /f /v DisplayIcon /t REG_SZ /d \"{}\"", - subkey, display_icon - ) - }; - format!( - " -{reg_display_icon} + let reg_cmd = format!( + " +reg add {subkey} /f /v DisplayIcon /t REG_SZ /d \"{exe}\" reg add {subkey} /f /v DisplayVersion /t REG_SZ /d \"{version}\" reg add {subkey} /f /v Version /t REG_SZ /d \"{version}\" reg add {subkey} /f /v BuildDate /t REG_SZ /d \"{build_date}\" @@ -3314,39 +2549,10 @@ reg add {subkey} /f /v VersionMajor /t REG_DWORD /d {version_major} reg add {subkey} /f /v VersionMinor /t REG_DWORD /d {version_minor} reg add {subkey} /f /v VersionBuild /t REG_DWORD /d {version_build} reg add {subkey} /f /v EstimatedSize /t REG_DWORD /d {size} - " - ) - } - - let reg_cmd = { - let reg_cmd_main = get_reg_cmd( - &subkey, - is_msi, - &display_icon, - &version, - &build_date, - &version_major, - &version_minor, - &version_build, - size, - ); - let reg_cmd_msi = if let Some(reg_msi_key) = get_reg_msi_key(&subkey, is_msi) { - get_reg_cmd( - ®_msi_key, - is_msi, - &display_icon, - &version, - &build_date, - &version_major, - &version_minor, - &version_build, - size, - ) - } else { - "".to_owned() - }; - format!("{}{}", reg_cmd_main, reg_cmd_msi) - }; + ", + version = crate::VERSION.replace("-", "."), + build_date = crate::BUILD_DATE, + ); let filter = format!(" /FI \"PID ne {}\"", get_current_pid()); let restore_service_cmd = if is_service_running { @@ -3386,8 +2592,6 @@ sc stop {app_name} taskkill /F /IM {app_name}.exe{filter} {reg_cmd} {copy_exe} -{rename_exe} -{remove_meta_toml} {restore_service_cmd} {uninstall_printer_cmd} {install_printer_cmd} @@ -3395,106 +2599,43 @@ taskkill /F /IM {app_name}.exe{filter} ", app_name = app_name, copy_exe = copy_exe_cmd(&src_exe, &exe, &path)?, - rename_exe = rename_exe_cmd(&src_exe, &path)?, - remove_meta_toml = remove_meta_toml_cmd(is_msi.unwrap_or(true), &path), sleep = if debug { "timeout 300" } else { "" }, ); - let _restore_session_guard = crate::common::SimpleCallOnReturn { - b: true, - f: Box::new(move || { - let is_root = is_root(); - if tray_sessions.is_empty() { - log::info!("No tray process found."); - } else { - log::info!( - "Try to restore the tray process..., sessions: {:?}", - &tray_sessions - ); - // When not running as root, only spawn once since run_exe_direct - // doesn't target specific sessions. - let mut spawned_non_root_tray = false; - for s in tray_sessions.clone().into_iter() { - if s != 0 { - // We need to check if is_root here because if `update_me()` is called from - // the main window running with administrator permission, - // `run_exe_in_session()` will fail with error 1314 ("A required privilege is - // not held by the client"). - // - // This issue primarily affects the MSI-installed version running in Administrator - // session during testing, but we check permissions here to be safe. - if is_root { - allow_err!(run_exe_in_session(&exe, vec!["--tray"], s, true)); - } else if !spawned_non_root_tray { - // Only spawn once for non-root since run_exe_direct doesn't take session parameter - allow_err!(run_exe_direct(&exe, vec!["--tray"], false)); - spawned_non_root_tray = true; - } - } - } - } - if main_window_sessions.is_empty() { - log::info!("No main window process found."); - } else { - log::info!("Try to restore the main window process..."); - std::thread::sleep(std::time::Duration::from_millis(2000)); - // When not running as root, only spawn once since run_exe_direct - // doesn't target specific sessions. - let mut spawned_non_root_main = false; - for s in main_window_sessions.clone().into_iter() { - if s != 0 { - if is_root { - allow_err!(run_exe_in_session(&exe, vec![], s, true)); - } else if !spawned_non_root_main { - // Only spawn once for non-root since run_exe_direct doesn't take session parameter - allow_err!(run_exe_direct(&exe, vec![], false)); - spawned_non_root_main = true; - } - } - } - } - std::thread::sleep(std::time::Duration::from_millis(300)); - }), - }; - run_cmds(cmds, debug, "update")?; std::thread::sleep(std::time::Duration::from_millis(2000)); + if tray_sessions.is_empty() { + log::info!("No tray process found."); + } else { + log::info!("Try to restore the tray process..."); + log::info!( + "Try to restore the tray process..., sessions: {:?}", + &tray_sessions + ); + for s in tray_sessions { + if s != 0 { + allow_err!(run_exe_in_session(&exe, vec!["--tray"], s, true)); + } + } + } + if main_window_sessions.is_empty() { + log::info!("No main window process found."); + } else { + log::info!("Try to restore the main window process..."); + std::thread::sleep(std::time::Duration::from_millis(2000)); + for s in main_window_sessions { + if s != 0 { + allow_err!(run_exe_in_session(&exe, vec![], s, true)); + } + } + } + std::thread::sleep(std::time::Duration::from_millis(300)); log::info!("Update completed."); Ok(()) } -fn get_reg_msi_key(subkey: &str, is_msi: Option) -> Option { - // Only proceed if it's a custom client and MSI is installed. - // `is_msi.unwrap_or(true)` is intentional: subsequent code validates the registry, - // hence no early return is required upon MSI detection failure. - if !(crate::common::is_custom_client() && is_msi.unwrap_or(true)) { - return None; - } - - // Get the uninstall string from registry - let uninstall_string = get_reg_of(subkey, "UninstallString"); - if uninstall_string.is_empty() { - return None; - } - - // Find the product code (GUID) in the uninstall string - // Handle both quoted and unquoted GUIDs: /X {GUID} or /X "{GUID}" - let start = uninstall_string.rfind('{')?; - let end = uninstall_string.rfind('}')?; - if start >= end { - return None; - } - let product_code = &uninstall_string[start..=end]; - - // Build the MSI registry key path - let pos = subkey.rfind('\\')?; - let reg_msi_key = format!("{}{}", &subkey[..=pos], product_code); - - Some(reg_msi_key) -} - // Double confirm the process name fn kill_process_by_pids(name: &str, pids: Vec) -> ResultType<()> { let name = name.to_lowercase(); @@ -3516,109 +2657,6 @@ fn kill_process_by_pids(name: &str, pids: Vec) -> ResultType<()> { Ok(()) } -pub fn handle_custom_client_staging_dir_before_update( - custom_client_staging_dir: &PathBuf, -) -> ResultType<()> { - let Some(current_exe_dir) = std::env::current_exe() - .ok() - .and_then(|p| p.parent().map(|p| p.to_path_buf())) - else { - bail!("Failed to get current exe directory"); - }; - - // Clean up existing staging directory - if custom_client_staging_dir.exists() { - log::debug!( - "Removing existing custom client staging directory: {:?}", - custom_client_staging_dir - ); - if let Err(e) = remove_custom_client_staging_dir(custom_client_staging_dir) { - bail!( - "Failed to remove existing custom client staging directory {:?}: {}", - custom_client_staging_dir, - e - ); - } - } - - let src_path = current_exe_dir.join("custom.txt"); - if src_path.exists() { - // Verify that custom.txt is not a symlink before copying - let metadata = match std::fs::symlink_metadata(&src_path) { - Ok(m) => m, - Err(e) => { - bail!( - "Failed to read metadata for custom.txt at {:?}: {}", - src_path, - e - ); - } - }; - - if metadata.is_symlink() { - allow_err!(remove_custom_client_staging_dir(&custom_client_staging_dir)); - bail!( - "custom.txt at {:?} is a symlink, refusing to stage for security reasons.", - src_path - ); - } - - if metadata.is_file() { - if !custom_client_staging_dir.exists() { - if let Err(e) = std::fs::create_dir_all(custom_client_staging_dir) { - bail!("Failed to create parent directory {:?} when staging custom client files: {}", custom_client_staging_dir, e); - } - } - let dst_path = custom_client_staging_dir.join("custom.txt"); - if let Err(e) = std::fs::copy(&src_path, &dst_path) { - allow_err!(remove_custom_client_staging_dir(&custom_client_staging_dir)); - bail!( - "Failed to copy custom txt from {:?} to {:?}: {}", - src_path, - dst_path, - e - ); - } - } else { - log::warn!( - "custom.txt at {:?} is not a regular file, skipping.", - src_path - ); - } - } else { - log::info!("No custom txt found to stage for update."); - } - - Ok(()) -} - -// Used for auto update and manual update in the main window. -pub fn update_to(file: &str) -> ResultType<()> { - if file.ends_with(".exe") { - let custom_client_staging_dir = get_custom_client_staging_dir(); - if crate::is_custom_client() { - handle_custom_client_staging_dir_before_update(&custom_client_staging_dir)?; - } else { - // Clean up any residual staging directory from previous custom client - allow_err!(remove_custom_client_staging_dir(&custom_client_staging_dir)); - } - if !run_uac(file, "--update")? { - bail!( - "Failed to run the update exe with UAC, error: {:?}", - std::io::Error::last_os_error() - ); - } - } else if file.ends_with(".msi") { - if let Err(e) = update_me_msi(file, false) { - bail!("Failed to run the update msi: {}", e); - } - } else { - // unreachable!() - bail!("Unsupported update file format: {}", file); - } - Ok(()) -} - // Don't launch tray app when running with `\qn`. // 1. Because `/qn` requires administrator permission and the tray app should be launched with user permission. // Or launching the main window from the tray app will cause the main window to be launched with administrator permission. @@ -3638,13 +2676,7 @@ pub fn update_me_msi(msi: &str, quiet: bool) -> ResultType<()> { Ok(()) } -pub fn get_tray_shortcut( - install_dir: &str, - exe: &str, - icon_source_exe: &str, - tmp_path: &str, -) -> ResultType { - let shortcut_icon_location = get_shortcut_icon_location(install_dir, icon_source_exe); +pub fn get_tray_shortcut(exe: &str, tmp_path: &str) -> ResultType { Ok(write_cmds( format!( " @@ -3654,7 +2686,6 @@ sLinkFile = \"{tmp_path}\\{app_name} Tray.lnk\" Set oLink = oWS.CreateShortcut(sLinkFile) oLink.TargetPath = \"{exe}\" oLink.Arguments = \"--tray\" - {shortcut_icon_location} oLink.Save ", app_name = crate::get_app_name(), @@ -3717,44 +2748,6 @@ fn run_after_run_cmds(silent: bool) { std::thread::sleep(std::time::Duration::from_millis(300)); } -#[inline] -pub fn try_remove_temp_update_files() { - let temp_dir = std::env::temp_dir(); - let Ok(entries) = std::fs::read_dir(&temp_dir) else { - log::debug!("Failed to read temp directory: {:?}", temp_dir); - return; - }; - - let one_hour = std::time::Duration::from_secs(60 * 60); - for entry in entries { - if let Ok(entry) = entry { - let path = entry.path(); - if let Some(file_name) = path.file_name().and_then(|n| n.to_str()) { - // Match files like rustdesk-*.msi or rustdesk-*.exe - if file_name.starts_with("rustdesk-") - && (file_name.ends_with(".msi") || file_name.ends_with(".exe")) - { - // Skip files modified within the last hour to avoid deleting files being downloaded - if let Ok(metadata) = std::fs::metadata(&path) { - if let Ok(modified) = metadata.modified() { - if let Ok(elapsed) = modified.elapsed() { - if elapsed < one_hour { - continue; - } - } - } - } - if let Err(e) = std::fs::remove_file(&path) { - log::debug!("Failed to remove temp update file {:?}: {}", path, e); - } else { - log::info!("Removed temp update file: {:?}", path); - } - } - } - } - } -} - #[inline] pub fn try_kill_broker() { allow_err!(std::process::Command::new("cmd") @@ -3930,8 +2923,7 @@ pub fn is_x64() -> bool { pub fn try_kill_rustdesk_main_window_process() -> ResultType<()> { // Kill rustdesk.exe without extra arg, should only be called by --server // We can find the exact process which occupies the ipc, see more from https://github.com/winsiderss/systeminformer - let app_name = crate::get_app_name().to_lowercase(); - log::info!("try kill main window process"); + log::info!("try kill rustdesk main window process"); use hbb_common::sysinfo::System; let mut sys = System::new(); sys.refresh_processes(); @@ -3940,6 +2932,7 @@ pub fn try_kill_rustdesk_main_window_process() -> ResultType<()> { .map(|x| x.user_id()) .unwrap_or_default(); let my_pid = std::process::id(); + let app_name = crate::get_app_name().to_lowercase(); if app_name.is_empty() { bail!("app name is empty"); } @@ -4489,87 +3482,6 @@ pub(super) fn get_pids_with_first_arg_by_wmic, S2: AsRef>( #[cfg(test)] mod tests { use super::*; - - // Test-only reusable Win32 HANDLE RAII helper. - // If a future non-test path needs the same pattern, move it out of this test module. - // - // This struct is similar to `hbb_common::platform::windows::RAIIHandle`, - // but `RAIIHandle` depends on `WinApi` crate, while this `HandleGuard` only depends on `windows` crate. - struct HandleGuard(WinHANDLE); - - impl HandleGuard { - #[inline] - fn new(handle: WinHANDLE) -> Self { - Self(handle) - } - - #[inline] - fn get(&self) -> WinHANDLE { - self.0 - } - } - - impl Drop for HandleGuard { - fn drop(&mut self) { - unsafe { - if !self.0.is_invalid() { - let _ = WinCloseHandle(self.0); - } - } - } - } - - #[test] - fn test_is_process_running_as_system_invalid_pid_errors() { - assert!(is_process_running_as_system(u32::MAX).is_err()); - } - - #[test] - fn test_is_process_running_as_system_matches_current_process_token_user() { - let pid = unsafe { windows::Win32::System::Threading::GetCurrentProcessId() }; - let actual = is_process_running_as_system(pid).unwrap(); - - let expected = unsafe { - // Keep this test consistent: use only the `windows` crate APIs/types. - let process = HandleGuard::new( - WinOpenProcess(WIN_PROCESS_QUERY_LIMITED_INFORMATION, false, pid) - .expect("WinOpenProcess should succeed for current process"), - ); - let mut token = WinHANDLE::default(); - WinOpenProcessToken(process.get(), WIN_TOKEN_QUERY, &mut token) - .expect("WinOpenProcessToken should succeed for current process"); - let token = HandleGuard::new(token); - - let mut token_user_size = 0u32; - let _ = WinGetTokenInformation(token.get(), TokenUser, None, 0, &mut token_user_size); - assert_ne!(token_user_size, 0, "TokenUser size should be non-zero"); - - let mut buffer = vec![0u8; token_user_size as usize]; - WinGetTokenInformation( - token.get(), - TokenUser, - Some(buffer.as_mut_ptr() as *mut core::ffi::c_void), - token_user_size, - &mut token_user_size, - ) - .expect("WinGetTokenInformation(TokenUser) should succeed for current process"); - - let min_size = std::mem::size_of::(); - assert!( - buffer.len() >= min_size, - "TokenUser buffer too small (got {}, need >= {})", - buffer.len(), - min_size - ); - let token_user: TOKEN_USER = - std::ptr::read_unaligned(buffer.as_ptr() as *const TOKEN_USER); - let expected = IsWellKnownSid(token_user.User.Sid, WinLocalSystemSid).as_bool(); - expected - }; - - assert_eq!(actual, expected); - } - #[test] fn test_uninstall_cert() { println!("uninstall driver certs: {:?}", cert::uninstall_cert()); diff --git a/src/platform/windows/acl.rs b/src/platform/windows/acl.rs deleted file mode 100644 index 682e66fed..000000000 --- a/src/platform/windows/acl.rs +++ /dev/null @@ -1,903 +0,0 @@ -// https://learn.microsoft.com/en-us/windows/win32/secgloss/security-glossary - -use super::{read_token_user_buffer, wide_string, ResultType}; -use hbb_common::{anyhow::anyhow, bail}; -use std::{ - fs, io, - os::windows::{ffi::OsStrExt, fs::MetadataExt}, - path::Path, -}; -use windows::{ - core::{PCWSTR, PWSTR}, - Win32::{ - Foundation::{CloseHandle, LocalFree, HANDLE, HLOCAL}, - Security::{ - Authorization::{ - ConvertSidToStringSidW, ConvertStringSidToSidW, GetNamedSecurityInfoW, - SetEntriesInAclW, SetNamedSecurityInfoW, EXPLICIT_ACCESS_W, SET_ACCESS, - SE_FILE_OBJECT, TRUSTEE_IS_GROUP, TRUSTEE_IS_SID, TRUSTEE_IS_USER, TRUSTEE_W, - }, - ACE_FLAGS, ACL, CONTAINER_INHERIT_ACE, DACL_SECURITY_INFORMATION, NO_INHERITANCE, - OBJECT_INHERIT_ACE, PROTECTED_DACL_SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, PSID, - TOKEN_QUERY, TOKEN_USER, - }, - Storage::FileSystem::{FILE_ALL_ACCESS, FILE_GENERIC_WRITE}, - System::Threading::{GetCurrentProcess, OpenProcessToken}, - }, -}; - -const FILE_ATTRIBUTE_REPARSE_POINT_U32: u32 = 0x400; - -#[inline] -fn is_reparse_point(metadata: &fs::Metadata) -> bool { - (metadata.file_attributes() & FILE_ATTRIBUTE_REPARSE_POINT_U32) != 0 -} - -fn apply_grant_sid_allow_ace_to_path( - path: &Path, - sid_ptr: *mut std::ffi::c_void, - access_mask: u32, - is_group: bool, - is_dir: bool, -) -> ResultType<()> { - // Merge mode: read existing DACL and append/replace ACE via SetEntriesInAclW. - // https://learn.microsoft.com/en-us/windows/win32/secauthz/modifying-the-acls-of-an-object-in-c-- - let mut old_dacl: *mut ACL = std::ptr::null_mut(); - let mut security_descriptor = PSECURITY_DESCRIPTOR::default(); - let path_utf16: Vec = path - .as_os_str() - .encode_wide() - .chain(std::iter::once(0)) - .collect(); - let get_named_result = unsafe { - GetNamedSecurityInfoW( - PCWSTR::from_raw(path_utf16.as_ptr()), - SE_FILE_OBJECT, - DACL_SECURITY_INFORMATION, - None, - None, - Some(&mut old_dacl), - None, - &mut security_descriptor, - ) - }; - if get_named_result.0 != 0 { - bail!( - "GetNamedSecurityInfoW failed for '{}': win32_error={}", - path.display(), - get_named_result.0 - ); - } - let _sd_guard = LocalAllocGuard(security_descriptor.0); - - let inherit_flags = if is_dir { - ACE_FLAGS(OBJECT_INHERIT_ACE.0 | CONTAINER_INHERIT_ACE.0) - } else { - NO_INHERITANCE - }; - let explicit_access = [make_sid_trustee_entry( - sid_ptr, - access_mask, - inherit_flags, - is_group, - )]; - let old_acl_option = if old_dacl.is_null() { - None - } else { - Some(old_dacl as *const ACL) - }; - let mut new_acl: *mut ACL = std::ptr::null_mut(); - let set_entries_result = unsafe { - SetEntriesInAclW( - Some(explicit_access.as_slice()), - old_acl_option, - &mut new_acl, - ) - }; - if set_entries_result.0 != 0 { - bail!( - "SetEntriesInAclW failed for '{}': win32_error={}", - path.display(), - set_entries_result.0 - ); - } - if new_acl.is_null() { - bail!( - "SetEntriesInAclW returned null ACL for '{}'", - path.display() - ); - } - let _acl_guard = LocalAllocGuard(new_acl as *mut std::ffi::c_void); - - let set_named_result = unsafe { - SetNamedSecurityInfoW( - PCWSTR::from_raw(path_utf16.as_ptr()), - SE_FILE_OBJECT, - DACL_SECURITY_INFORMATION, - None, - None, - Some(new_acl), - None, - ) - }; - if set_named_result.0 != 0 { - bail!( - "SetNamedSecurityInfoW failed for '{}': win32_error={}", - path.display(), - set_named_result.0 - ); - } - Ok(()) -} - -/// Grants `Everyone` on `dir` recursively for helper/runtime files that must be -/// readable/executable across user contexts. -/// -/// `access_mask` is the Win32 file access mask to grant recursively. -pub fn set_path_permission(dir: &Path, access_mask: u32) -> ResultType<()> { - let metadata = fs::symlink_metadata(dir).map_err(|e| { - anyhow!( - "Failed to inspect ACL target directory '{}': {}", - dir.display(), - e - ) - })?; - if is_reparse_point(&metadata) { - bail!( - "ACL target directory is a reparse point and is rejected: '{}'", - dir.display() - ); - } - if !metadata.file_type().is_dir() { - bail!("ACL target is not a directory: '{}'", dir.display()); - } - - let everyone_sid = sid_string_to_local_alloc_guard("S-1-1-0")?; - let mut stack = vec![dir.to_path_buf()]; - while let Some(path) = stack.pop() { - let metadata = fs::symlink_metadata(&path) - .map_err(|e| anyhow!("Failed to inspect ACL target '{}': {}", path.display(), e))?; - if is_reparse_point(&metadata) { - continue; - } - let is_dir = metadata.file_type().is_dir(); - apply_grant_sid_allow_ace_to_path( - &path, - everyone_sid.as_sid_ptr(), - access_mask, - true, - is_dir, - )?; - if !is_dir { - continue; - } - for entry in fs::read_dir(&path) - .map_err(|e| anyhow!("Failed to list ACL target dir '{}': {}", path.display(), e))? - { - let entry = entry.map_err(|e| { - anyhow!( - "Failed to read ACL target dir entry under '{}': {}", - path.display(), - e - ) - })?; - stack.push(entry.path()); - } - } - Ok(()) -} - -/// Returns the current process user SID as a standard SID string -/// (for example: `S-1-5-18`). -/// -/// Source: -/// - Official SID-to-string API (`ConvertSidToStringSidW`): -/// https://learn.microsoft.com/en-us/windows/win32/api/sddl/nf-sddl-convertsidtostringsidw -pub(crate) fn current_process_user_sid_string() -> ResultType { - let mut token = HANDLE::default(); - let result = (|| -> ResultType { - unsafe { - OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &mut token) - .map_err(|e| anyhow!("Failed to open current process token: {}", e))?; - } - - let buffer = unsafe { read_token_user_buffer(token, "current process")? }; - let token_user: TOKEN_USER = - unsafe { std::ptr::read_unaligned(buffer.as_ptr() as *const TOKEN_USER) }; - if token_user.User.Sid.0.is_null() { - bail!("Token SID is null"); - } - - let mut sid_string_ptr = PWSTR::null(); - unsafe { - ConvertSidToStringSidW(token_user.User.Sid, &mut sid_string_ptr).map_err(|e| { - anyhow!( - "ConvertSidToStringSidW failed for current process token SID: {}", - e - ) - })?; - } - if sid_string_ptr.is_null() { - bail!("ConvertSidToStringSidW returned null SID string pointer"); - } - let _sid_string_guard = LocalAllocGuard(sid_string_ptr.0 as *mut std::ffi::c_void); - unsafe { - sid_string_ptr - .to_string() - .map_err(|e| anyhow!("Failed to decode SID string as UTF-16: {}", e)) - } - })(); - - if !token.is_invalid() { - unsafe { - let _ = CloseHandle(token); - } - } - result -} - -/// Hardens ACLs for portable-service shared-memory path (directory or file). -/// -/// Why: -/// - Shared memory used by portable service carries runtime control/data and must not inherit -/// broad/default ACLs. -/// - We explicitly grant only trusted principals and remove broad groups to reduce local -/// privilege-boundary bypass risk. -/// -/// ACL policy applied via Win32 ACL APIs (`SetEntriesInAclW` + `SetNamedSecurityInfoW`): -/// - common (directory + file): -/// - `S-1-5-18` (LocalSystem): full control -/// - `S-1-5-32-544` (Built-in Administrators): full control -/// - `current_process_user_sid_string()` result: full control -/// - directory (`portable_service_shmem` parent): -/// - keep `Authenticated Users` directory-level write so other local accounts can -/// create their own runtime shmem files after account switching -/// - `FILE_GENERIC_WRITE + NO_INHERITANCE` means write/create on this directory itself; -/// it is intentionally not inherited by children. -/// Reference: -/// - File access rights: -/// https://learn.microsoft.com/en-us/windows/win32/fileio/file-access-rights-constants -/// - ACE inheritance rules: -/// https://learn.microsoft.com/en-us/windows/win32/secauthz/ace-inheritance-rules -/// - remove `Everyone` and `Users` grants -/// - file (`shared_memory*` flink): -/// - remove broad grants: -/// - `S-1-1-0` (Everyone) -/// - `S-1-5-11` (Authenticated Users) -/// - `S-1-5-32-545` (Users) -/// -/// https://learn.microsoft.com/en-us/windows/win32/secauthz/well-known-sids -pub fn set_path_permission_for_portable_service_shmem_dir(path: &Path) -> ResultType<()> { - set_path_permission_for_portable_service_shmem_impl(path, true) -} - -#[inline] -pub fn validate_path_for_portable_service_shmem_dir(path: &Path) -> ResultType<()> { - validate_portable_service_shmem_dir_target(path) -} - -#[inline] -pub fn set_path_permission_for_portable_service_shmem_file(path: &Path) -> ResultType<()> { - set_path_permission_for_portable_service_shmem_impl(path, false) -} - -#[derive(Debug)] -pub(super) struct LocalAllocGuard(*mut std::ffi::c_void); - -impl LocalAllocGuard { - #[inline] - pub(super) fn as_sid_ptr(&self) -> *mut std::ffi::c_void { - self.0 - } -} - -impl Drop for LocalAllocGuard { - fn drop(&mut self) { - if self.0.is_null() { - return; - } - // Buffers returned by ConvertStringSidToSidW / SetEntriesInAclW / - // ConvertSidToStringSidW are LocalAlloc-owned and must be LocalFree'ed. - unsafe { - let _ = LocalFree(Some(HLOCAL(self.0))); - } - } -} - -#[inline] -pub(super) fn sid_string_to_local_alloc_guard(sid: &str) -> ResultType { - let sid_utf16 = wide_string(sid); - let mut sid_ptr = PSID::default(); - unsafe { - ConvertStringSidToSidW(PCWSTR::from_raw(sid_utf16.as_ptr()), &mut sid_ptr) - .map_err(|e| anyhow!("ConvertStringSidToSidW failed for '{}': {}", sid, e))?; - } - if sid_ptr.0.is_null() { - bail!("ConvertStringSidToSidW returned null SID for '{}'", sid); - } - Ok(LocalAllocGuard(sid_ptr.0)) -} - -#[inline] -fn make_sid_trustee_entry( - sid_ptr: *mut std::ffi::c_void, - access_permissions: u32, - inheritance: ACE_FLAGS, - is_group: bool, -) -> EXPLICIT_ACCESS_W { - // `is_group` is explicitly provided by the caller from the concrete SID semantic - // (e.g. Administrators/Authenticated Users => group, LocalSystem/current user => user). - EXPLICIT_ACCESS_W { - grfAccessPermissions: access_permissions, - grfAccessMode: SET_ACCESS, - grfInheritance: inheritance, - Trustee: TRUSTEE_W { - pMultipleTrustee: std::ptr::null_mut(), - MultipleTrusteeOperation: Default::default(), - TrusteeForm: TRUSTEE_IS_SID, - TrusteeType: if is_group { - TRUSTEE_IS_GROUP - } else { - TRUSTEE_IS_USER - }, - // SAFETY: With TrusteeForm=TRUSTEE_IS_SID, ptstrName is interpreted as PSID. - ptstrName: PWSTR::from_raw(sid_ptr as *mut u16), - }, - } -} - -fn validate_portable_service_shmem_dir_target(path: &Path) -> ResultType<()> { - let metadata = fs::symlink_metadata(path).map_err(|e| { - anyhow!( - "Failed to inspect portable service shared-memory ACL directory '{}': {}", - path.display(), - e - ) - })?; - if is_reparse_point(&metadata) { - bail!( - "Portable service shared-memory ACL directory target is a reparse point and is rejected: '{}'", - path.display() - ); - } - if !metadata.file_type().is_dir() { - bail!( - "Portable service shared-memory ACL target is not a directory: '{}'", - path.display() - ); - } - Ok(()) -} - -fn set_path_permission_for_portable_service_shmem_impl( - path: &Path, - expect_dir: bool, -) -> ResultType<()> { - if expect_dir { - validate_portable_service_shmem_dir_target(path)?; - } else { - let metadata_result = fs::symlink_metadata(path); - match metadata_result { - Ok(metadata) => { - if metadata.file_type().is_dir() { - bail!( - "Portable service shared-memory ACL target is a directory, expected file-like path: '{}'", - path.display() - ); - } - if is_reparse_point(&metadata) { - bail!( - "Portable service shared-memory ACL file target is a reparse point and is rejected: '{}'", - path.display() - ); - } - } - Err(e) - if e.kind() == io::ErrorKind::NotFound - || e.kind() == io::ErrorKind::PermissionDenied => - { - // Keep going and let Win32 ACL APIs return the final OS error. - // `Path::exists()/is_file()` and metadata can collapse ACL-denied paths into - // a false "not found" signal under restricted directory ACLs. - } - Err(e) => { - bail!( - "Failed to inspect portable service shared-memory ACL target '{}': {}", - path.display(), - e - ); - } - } - } - - let user_sid = current_process_user_sid_string()?; - let local_system_sid = sid_string_to_local_alloc_guard("S-1-5-18")?; - let administrators_sid = sid_string_to_local_alloc_guard("S-1-5-32-544")?; - let current_user_sid = sid_string_to_local_alloc_guard(&user_sid)?; - let authenticated_users_sid = if expect_dir { - Some(sid_string_to_local_alloc_guard("S-1-5-11")?) - } else { - None - }; - - let inherit_flags = if expect_dir { - ACE_FLAGS(OBJECT_INHERIT_ACE.0 | CONTAINER_INHERIT_ACE.0) - } else { - NO_INHERITANCE - }; - let mut entries = vec![ - make_sid_trustee_entry( - local_system_sid.as_sid_ptr(), - FILE_ALL_ACCESS.0, - inherit_flags, - false, - ), - make_sid_trustee_entry( - administrators_sid.as_sid_ptr(), - FILE_ALL_ACCESS.0, - inherit_flags, - true, - ), - make_sid_trustee_entry( - current_user_sid.as_sid_ptr(), - FILE_ALL_ACCESS.0, - inherit_flags, - false, - ), - ]; - if let Some(auth_sid) = authenticated_users_sid.as_ref() { - // Keep the shared parent directory multi-user writable at directory level. - entries.push(make_sid_trustee_entry( - auth_sid.as_sid_ptr(), - FILE_GENERIC_WRITE.0, - NO_INHERITANCE, - true, - )); - } - - // Rebuild mode: build a fresh DACL (old ACL not merged) and apply as protected. - // This avoids carrying over broad legacy ACEs from inherited/default ACLs. - // Reference: - // - SetEntriesInAclW: - // https://learn.microsoft.com/en-us/windows/win32/api/aclapi/nf-aclapi-setentriesinaclw - // - SetNamedSecurityInfoW (PROTECTED_DACL_SECURITY_INFORMATION): - // https://learn.microsoft.com/en-us/windows/win32/api/aclapi/nf-aclapi-setnamedsecurityinfow - let mut new_acl: *mut ACL = std::ptr::null_mut(); - let set_entries_result = - unsafe { SetEntriesInAclW(Some(entries.as_slice()), None, &mut new_acl) }; - if set_entries_result.0 != 0 { - bail!( - "SetEntriesInAclW failed for '{}': win32_error={}", - path.display(), - set_entries_result.0 - ); - } - if new_acl.is_null() { - bail!( - "SetEntriesInAclW returned null ACL for '{}'", - path.display() - ); - } - let _acl_guard = LocalAllocGuard(new_acl as *mut std::ffi::c_void); - - let path_utf16: Vec = path - .as_os_str() - .encode_wide() - .chain(std::iter::once(0)) - .collect(); - let security_info = DACL_SECURITY_INFORMATION | PROTECTED_DACL_SECURITY_INFORMATION; - let set_named_result = unsafe { - SetNamedSecurityInfoW( - PCWSTR::from_raw(path_utf16.as_ptr()), - SE_FILE_OBJECT, - security_info, - None, - None, - Some(new_acl), - None, - ) - }; - if set_named_result.0 != 0 { - bail!( - "SetNamedSecurityInfoW failed for '{}': win32_error={}", - path.display(), - set_named_result.0 - ); - } - Ok(()) -} - -#[cfg(test)] -mod tests { - use super::{ - current_process_user_sid_string, set_path_permission, - set_path_permission_for_portable_service_shmem_dir, - set_path_permission_for_portable_service_shmem_file, sid_string_to_local_alloc_guard, - LocalAllocGuard, ResultType, - }; - use hbb_common::bail; - use std::{ - fs, - os::windows::{ffi::OsStrExt, fs::symlink_dir, fs::symlink_file}, - path::{Path, PathBuf}, - }; - use windows::{ - core::PCWSTR, - Win32::{ - Security::{ - AclSizeInformation, - Authorization::{GetNamedSecurityInfoW, SE_FILE_OBJECT}, - EqualSid as WinEqualSid, GetAce, GetAclInformation, GetSecurityDescriptorControl, - ACCESS_ALLOWED_ACE, ACE_HEADER, ACL, ACL_SIZE_INFORMATION, - DACL_SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, PSID, SE_DACL_PROTECTED, - }, - Storage::FileSystem::{ - FILE_ALL_ACCESS, FILE_GENERIC_EXECUTE, FILE_GENERIC_READ, FILE_GENERIC_WRITE, - }, - }, - }; - - const ACCESS_ALLOWED_ACE_TYPE_U8: u8 = 0; - - fn unique_acl_test_path(prefix: &str) -> PathBuf { - std::env::temp_dir().join(format!( - "rustdesk_acl_{}_{}_{}", - prefix, - std::process::id(), - hbb_common::rand::random::() - )) - } - - fn try_create_dir_reparse_point(target: &Path, link: &Path, test_name: &str) -> bool { - match symlink_dir(target, link) { - Ok(()) => true, - Err(err) => { - eprintln!( - "skip {}: failed to create directory reparse point (symlink): {}", - test_name, err - ); - false - } - } - } - - fn try_create_file_reparse_point(target: &Path, link: &Path, test_name: &str) -> bool { - match symlink_file(target, link) { - Ok(()) => true, - Err(err) => { - eprintln!( - "skip {}: failed to create file reparse point (symlink): {}", - test_name, err - ); - false - } - } - } - - fn get_file_dacl(path: &Path) -> ResultType<(*mut ACL, LocalAllocGuard)> { - let mut dacl: *mut ACL = std::ptr::null_mut(); - let mut sd = PSECURITY_DESCRIPTOR::default(); - let path_utf16: Vec = path - .as_os_str() - .encode_wide() - .chain(std::iter::once(0)) - .collect(); - let result = unsafe { - GetNamedSecurityInfoW( - PCWSTR::from_raw(path_utf16.as_ptr()), - SE_FILE_OBJECT, - DACL_SECURITY_INFORMATION, - None, - None, - Some(&mut dacl), - None, - &mut sd, - ) - }; - if result.0 != 0 { - bail!( - "GetNamedSecurityInfoW failed for '{}': win32_error={}", - path.display(), - result.0 - ); - } - if dacl.is_null() || sd.0.is_null() { - bail!("DACL/security descriptor missing for '{}'", path.display()); - } - Ok((dacl, LocalAllocGuard(sd.0))) - } - - fn has_allow_ace_with_mask( - dacl: *const ACL, - sid_ptr: *mut std::ffi::c_void, - mask: u32, - ) -> bool { - let mut info = ACL_SIZE_INFORMATION::default(); - if unsafe { - GetAclInformation( - dacl, - &mut info as *mut _ as *mut std::ffi::c_void, - std::mem::size_of::() as u32, - AclSizeInformation, - ) - } - .is_err() - { - return false; - } - for index in 0..info.AceCount { - let mut ace_ptr: *mut std::ffi::c_void = std::ptr::null_mut(); - if unsafe { GetAce(dacl, index, &mut ace_ptr) }.is_err() || ace_ptr.is_null() { - continue; - } - let header = unsafe { &*(ace_ptr as *const ACE_HEADER) }; - if header.AceType != ACCESS_ALLOWED_ACE_TYPE_U8 { - continue; - } - let allowed = unsafe { &*(ace_ptr as *const ACCESS_ALLOWED_ACE) }; - let ace_sid = PSID((&allowed.SidStart as *const u32) as *mut std::ffi::c_void); - if unsafe { WinEqualSid(PSID(sid_ptr), ace_sid) }.is_ok() - && (allowed.Mask & mask) == mask - { - return true; - } - } - false - } - - fn has_any_allow_ace_for_sid(dacl: *const ACL, sid_ptr: *mut std::ffi::c_void) -> bool { - has_allow_ace_with_mask(dacl, sid_ptr, 0) - } - - fn is_dacl_protected(sd: PSECURITY_DESCRIPTOR) -> bool { - let mut control: u16 = 0; - let mut revision: u32 = 0; - if unsafe { GetSecurityDescriptorControl(sd, &mut control, &mut revision) }.is_err() { - return false; - } - (control & SE_DACL_PROTECTED.0) != 0 - } - - #[test] - fn test_portable_service_shmem_dir_acl_policy() { - let dir = unique_acl_test_path("dir"); - fs::create_dir_all(&dir).unwrap(); - set_path_permission_for_portable_service_shmem_dir(&dir).unwrap(); - - let (dacl, sd_guard) = get_file_dacl(&dir).unwrap(); - let current_user_sid = - sid_string_to_local_alloc_guard(¤t_process_user_sid_string().unwrap()).unwrap(); - let system_sid = sid_string_to_local_alloc_guard("S-1-5-18").unwrap(); - let admin_sid = sid_string_to_local_alloc_guard("S-1-5-32-544").unwrap(); - let auth_users_sid = sid_string_to_local_alloc_guard("S-1-5-11").unwrap(); - let everyone_sid = sid_string_to_local_alloc_guard("S-1-1-0").unwrap(); - let users_sid = sid_string_to_local_alloc_guard("S-1-5-32-545").unwrap(); - - assert!(has_allow_ace_with_mask( - dacl, - system_sid.as_sid_ptr(), - FILE_ALL_ACCESS.0 - )); - assert!(has_allow_ace_with_mask( - dacl, - admin_sid.as_sid_ptr(), - FILE_ALL_ACCESS.0 - )); - assert!(has_allow_ace_with_mask( - dacl, - current_user_sid.as_sid_ptr(), - FILE_ALL_ACCESS.0 - )); - assert!(has_allow_ace_with_mask( - dacl, - auth_users_sid.as_sid_ptr(), - FILE_GENERIC_WRITE.0 - )); - assert!(!has_any_allow_ace_for_sid(dacl, everyone_sid.as_sid_ptr())); - assert!(!has_any_allow_ace_for_sid(dacl, users_sid.as_sid_ptr())); - assert!(is_dacl_protected(PSECURITY_DESCRIPTOR( - sd_guard.as_sid_ptr() - ))); - - let _ = fs::remove_dir_all(&dir); - } - - #[test] - fn test_portable_service_shmem_file_acl_policy() { - let dir = unique_acl_test_path("file"); - fs::create_dir_all(&dir).unwrap(); - let file = dir.join("shared_memory_portable_service_test"); - fs::write(&file, b"x").unwrap(); - set_path_permission_for_portable_service_shmem_file(&file).unwrap(); - - let (dacl, sd_guard) = get_file_dacl(&file).unwrap(); - let current_user_sid = - sid_string_to_local_alloc_guard(¤t_process_user_sid_string().unwrap()).unwrap(); - let system_sid = sid_string_to_local_alloc_guard("S-1-5-18").unwrap(); - let admin_sid = sid_string_to_local_alloc_guard("S-1-5-32-544").unwrap(); - let auth_users_sid = sid_string_to_local_alloc_guard("S-1-5-11").unwrap(); - let everyone_sid = sid_string_to_local_alloc_guard("S-1-1-0").unwrap(); - let users_sid = sid_string_to_local_alloc_guard("S-1-5-32-545").unwrap(); - - assert!(has_allow_ace_with_mask( - dacl, - system_sid.as_sid_ptr(), - FILE_ALL_ACCESS.0 - )); - assert!(has_allow_ace_with_mask( - dacl, - admin_sid.as_sid_ptr(), - FILE_ALL_ACCESS.0 - )); - assert!(has_allow_ace_with_mask( - dacl, - current_user_sid.as_sid_ptr(), - FILE_ALL_ACCESS.0 - )); - assert!(!has_any_allow_ace_for_sid( - dacl, - auth_users_sid.as_sid_ptr() - )); - assert!(!has_any_allow_ace_for_sid(dacl, everyone_sid.as_sid_ptr())); - assert!(!has_any_allow_ace_for_sid(dacl, users_sid.as_sid_ptr())); - assert!(is_dacl_protected(PSECURITY_DESCRIPTOR( - sd_guard.as_sid_ptr() - ))); - - let _ = fs::remove_file(&file); - let _ = fs::remove_dir_all(&dir); - } - - #[test] - fn test_set_path_permission_rx_applies_recursively() { - let root = unique_acl_test_path("set_path_permission"); - let child_dir = root.join("child"); - let child_file = child_dir.join("helper.exe"); - fs::create_dir_all(&child_dir).unwrap(); - fs::write(&child_file, b"x").unwrap(); - - if let Err(err) = set_path_permission(&root, FILE_GENERIC_READ.0 | FILE_GENERIC_EXECUTE.0) { - let text = err.to_string(); - let _ = fs::remove_file(&child_file); - let _ = fs::remove_dir_all(&root); - if text.contains("win32_error=5") || text.contains("Access is denied") { - eprintln!( - "skip test_set_path_permission_rx_applies_recursively: insufficient WRITE_DAC in current environment: {}", - text - ); - return; - } - panic!("set_path_permission failed unexpectedly: {}", text); - } - - let everyone_sid = sid_string_to_local_alloc_guard("S-1-1-0").unwrap(); - let rx_mask = FILE_GENERIC_READ.0 | FILE_GENERIC_EXECUTE.0; - for target in [&root, &child_dir, &child_file] { - let (dacl, _sd_guard) = get_file_dacl(target).unwrap(); - assert!( - has_allow_ace_with_mask(dacl, everyone_sid.as_sid_ptr(), rx_mask), - "Everyone RX grant missing on '{}'", - target.display() - ); - } - - let _ = fs::remove_file(&child_file); - let _ = fs::remove_dir_all(&root); - } - - #[test] - fn test_portable_service_shmem_dir_acl_rejects_file_target() { - let dir = unique_acl_test_path("dir_target_file"); - fs::create_dir_all(&dir).unwrap(); - let file = dir.join("target.txt"); - fs::write(&file, b"x").unwrap(); - let result = set_path_permission_for_portable_service_shmem_dir(&file); - assert!(result.is_err()); - let _ = fs::remove_file(&file); - let _ = fs::remove_dir_all(&dir); - } - - #[test] - fn test_portable_service_shmem_file_acl_rejects_dir_target() { - let dir = unique_acl_test_path("file_target_dir"); - fs::create_dir_all(&dir).unwrap(); - let result = set_path_permission_for_portable_service_shmem_file(&dir); - assert!(result.is_err()); - let _ = fs::remove_dir_all(&dir); - } - - #[test] - fn test_portable_service_shmem_file_acl_rejects_missing_target() { - let path = unique_acl_test_path("missing").join("shared_memory_missing"); - let result = set_path_permission_for_portable_service_shmem_file(&path); - assert!(result.is_err()); - } - - #[test] - fn test_set_path_permission_rejects_reparse_entrypoint() { - let root = unique_acl_test_path("reparse_entry"); - let real_dir = root.join("real"); - let link_dir = root.join("link"); - fs::create_dir_all(&real_dir).unwrap(); - if !try_create_dir_reparse_point( - &real_dir, - &link_dir, - "test_set_path_permission_rejects_reparse_entrypoint", - ) { - let _ = fs::remove_dir_all(&real_dir); - let _ = fs::remove_dir_all(&root); - return; - } - - let result = set_path_permission(&link_dir, FILE_GENERIC_READ.0 | FILE_GENERIC_EXECUTE.0); - let text = result.err().map(|e| e.to_string()).unwrap_or_default(); - assert!( - text.contains("reparse point"), - "expected reparse-point rejection, got '{}'", - text - ); - - let _ = fs::remove_dir(&link_dir); - let _ = fs::remove_dir_all(&real_dir); - let _ = fs::remove_dir_all(&root); - } - - #[test] - fn test_portable_service_shmem_dir_acl_rejects_reparse_target() { - let root = unique_acl_test_path("reparse_shmem_dir"); - let real_dir = root.join("real"); - let link_dir = root.join("link"); - fs::create_dir_all(&real_dir).unwrap(); - if !try_create_dir_reparse_point( - &real_dir, - &link_dir, - "test_portable_service_shmem_dir_acl_rejects_reparse_target", - ) { - let _ = fs::remove_dir_all(&real_dir); - let _ = fs::remove_dir_all(&root); - return; - } - - let result = set_path_permission_for_portable_service_shmem_dir(&link_dir); - let text = result.err().map(|e| e.to_string()).unwrap_or_default(); - assert!( - text.contains("reparse point"), - "expected reparse-point rejection, got '{}'", - text - ); - - let _ = fs::remove_dir(&link_dir); - let _ = fs::remove_dir_all(&real_dir); - let _ = fs::remove_dir_all(&root); - } - - #[test] - fn test_portable_service_shmem_file_acl_rejects_reparse_target() { - let root = unique_acl_test_path("reparse_shmem_file"); - let real_file = root.join("real.txt"); - let link_file = root.join("link.txt"); - fs::create_dir_all(&root).unwrap(); - fs::write(&real_file, b"x").unwrap(); - if !try_create_file_reparse_point( - &real_file, - &link_file, - "test_portable_service_shmem_file_acl_rejects_reparse_target", - ) { - let _ = fs::remove_file(&real_file); - let _ = fs::remove_dir_all(&root); - return; - } - - let result = set_path_permission_for_portable_service_shmem_file(&link_file); - let text = result.err().map(|e| e.to_string()).unwrap_or_default(); - assert!( - text.contains("reparse point"), - "expected reparse-point rejection, got '{}'", - text - ); - - let _ = fs::remove_file(&link_file); - let _ = fs::remove_file(&real_file); - let _ = fs::remove_dir_all(&root); - } -} diff --git a/src/port_forward.rs b/src/port_forward.rs index 61d6bfd71..bd4b9fb78 100644 --- a/src/port_forward.rs +++ b/src/port_forward.rs @@ -54,7 +54,7 @@ pub async fn listen( remote_host: String, remote_port: i32, ) -> ResultType<()> { - let listener = tcp::new_listener(format!("127.0.0.1:{}", port), true).await?; + let listener = tcp::new_listener(format!("0.0.0.0:{}", port), true).await?; let addr = listener.local_addr()?; log::info!("listening on port {:?}", addr); let is_rdp = port == 0; @@ -118,7 +118,7 @@ async fn connect_and_login( } else { ConnType::PORT_FORWARD }; - let ((mut stream, direct, _pk, _kcp, _stream_type), (feedback, rendezvous_server)) = + let ((mut stream, direct, _pk, _kcp), (feedback, rendezvous_server)) = Client::start(id, key, token, conn_type, interface.clone()).await?; interface.update_direct(Some(direct)); let mut buffer = Vec::new(); diff --git a/src/privacy_mode.rs b/src/privacy_mode.rs index 234004d15..d96f639fd 100644 --- a/src/privacy_mode.rs +++ b/src/privacy_mode.rs @@ -1,13 +1,17 @@ +#[cfg(windows)] +use crate::platform::is_installed; use crate::ui_interface::get_option; #[cfg(windows)] use crate::{ display_service, ipc::{connect, Data}, - platform::is_installed, }; -#[cfg(windows)] -use hbb_common::tokio; -use hbb_common::{anyhow::anyhow, bail, lazy_static, tokio::sync::oneshot, ResultType}; +use hbb_common::{ + anyhow::anyhow, + bail, lazy_static, + tokio::{self, sync::oneshot}, + ResultType, +}; use serde_derive::{Deserialize, Serialize}; use std::{ collections::HashMap, @@ -23,9 +27,6 @@ pub mod win_mag; #[cfg(windows)] pub mod win_topmost_window; -#[cfg(target_os = "macos")] -pub mod macos; - #[cfg(windows)] mod win_virtual_display; #[cfg(windows)] @@ -38,8 +39,7 @@ pub const TURN_OFF_OTHER_ID: &'static str = pub const NO_PHYSICAL_DISPLAYS: &'static str = "no_need_privacy_mode_no_physical_displays_tip"; pub const PRIVACY_MODE_IMPL_WIN_MAG: &str = "privacy_mode_impl_mag"; -pub const PRIVACY_MODE_IMPL_WIN_EXCLUDE_FROM_CAPTURE: &str = - "privacy_mode_impl_exclude_from_capture"; +pub const PRIVACY_MODE_IMPL_WIN_EXCLUDE_FROM_CAPTURE: &str = "privacy_mode_impl_exclude_from_capture"; pub const PRIVACY_MODE_IMPL_WIN_VIRTUAL_DISPLAY: &str = "privacy_mode_impl_virtual_display"; #[derive(Debug, Serialize, Deserialize, Clone)] @@ -108,14 +108,7 @@ lazy_static::lazy_static! { } #[cfg(not(windows))] { - #[cfg(target_os = "macos")] - { - macos::PRIVACY_MODE_IMPL.to_owned() - } - #[cfg(not(target_os = "macos"))] - { - "".to_owned() - } + "".to_owned() } }; @@ -137,13 +130,7 @@ pub type PrivacyModeCreator = fn(impl_key: &str) -> Box; lazy_static::lazy_static! { static ref PRIVACY_MODE_CREATOR: Arc>> = { #[cfg(not(windows))] - let mut map: HashMap<&'static str, PrivacyModeCreator> = HashMap::new(); - #[cfg(target_os = "macos")] - { - map.insert(macos::PRIVACY_MODE_IMPL, |impl_key: &str| { - Box::new(macos::PrivacyModeImpl::new(impl_key)) - }); - } + let map: HashMap<&'static str, PrivacyModeCreator> = HashMap::new(); #[cfg(windows)] let mut map: HashMap<&'static str, PrivacyModeCreator> = HashMap::new(); #[cfg(windows)] @@ -349,14 +336,7 @@ pub fn get_supported_privacy_mode_impl() -> Vec<(&'static str, &'static str)> { vec_impls } - #[cfg(target_os = "macos")] - { - // No translation is intended for privacy_mode_impl_macos_tip as it is a - // placeholder for macOS specific privacy mode implementation which currently - // doesn't provide multiple modes like Windows does. - vec![(macos::PRIVACY_MODE_IMPL, "privacy_mode_impl_macos_tip")] - } - #[cfg(not(any(target_os = "windows", target_os = "macos")))] + #[cfg(not(target_os = "windows"))] { Vec::new() } diff --git a/src/privacy_mode/macos.rs b/src/privacy_mode/macos.rs deleted file mode 100644 index e6ea11e49..000000000 --- a/src/privacy_mode/macos.rs +++ /dev/null @@ -1,81 +0,0 @@ -use super::{PrivacyMode, PrivacyModeState}; -use hbb_common::{anyhow::anyhow, ResultType}; - -extern "C" { - fn MacSetPrivacyMode(on: bool) -> bool; -} - -pub const PRIVACY_MODE_IMPL: &str = "privacy_mode_impl_macos"; - -pub struct PrivacyModeImpl { - impl_key: String, - conn_id: i32, -} - -impl PrivacyModeImpl { - pub fn new(impl_key: &str) -> Self { - Self { - impl_key: impl_key.to_owned(), - conn_id: 0, - } - } -} - -impl PrivacyMode for PrivacyModeImpl { - fn is_async_privacy_mode(&self) -> bool { - false - } - - fn init(&self) -> ResultType<()> { - Ok(()) - } - - fn clear(&mut self) { - unsafe { - MacSetPrivacyMode(false); - } - self.conn_id = 0; - } - - fn turn_on_privacy(&mut self, conn_id: i32) -> ResultType { - if self.check_on_conn_id(conn_id)? { - return Ok(true); - } - let success = unsafe { MacSetPrivacyMode(true) }; - if !success { - return Err(anyhow!("Failed to turn on privacy mode")); - } - self.conn_id = conn_id; - Ok(true) - } - - fn turn_off_privacy(&mut self, conn_id: i32, _state: Option) -> ResultType<()> { - // Note: The `_state` parameter is intentionally ignored on macOS. - // On Windows, it's used to notify the connection manager about privacy mode state changes - // (see win_topmost_window.rs). macOS currently has a simpler single-mode implementation - // without the need for such cross-component state synchronization. - self.check_off_conn_id(conn_id)?; - let success = unsafe { MacSetPrivacyMode(false) }; - if !success { - return Err(anyhow!("Failed to turn off privacy mode")); - } - self.conn_id = 0; - Ok(()) - } - - fn pre_conn_id(&self) -> i32 { - self.conn_id - } - - fn get_impl_key(&self) -> &str { - &self.impl_key - } -} - -impl Drop for PrivacyModeImpl { - fn drop(&mut self) { - // Use the same cleanup logic as other code paths to keep conn_id consistent - // and ensure all cleanup is centralized in one place. - self.clear(); - } -} diff --git a/src/rendezvous_mediator.rs b/src/rendezvous_mediator.rs index 89d7fa01e..9dd1695f1 100644 --- a/src/rendezvous_mediator.rs +++ b/src/rendezvous_mediator.rs @@ -2,7 +2,7 @@ use std::{ net::SocketAddr, sync::{ atomic::{AtomicBool, Ordering}, - Arc, RwLock, + Arc, }, time::{Duration, Instant}, }; @@ -40,31 +40,6 @@ lazy_static::lazy_static! { } static SHOULD_EXIT: AtomicBool = AtomicBool::new(false); static MANUAL_RESTARTED: AtomicBool = AtomicBool::new(false); -static SENT_REGISTER_PK: AtomicBool = AtomicBool::new(false); -pub(crate) static NEEDS_DEPLOY: AtomicBool = AtomicBool::new(false); -// register_pk retry interval (ms) when device is awaiting deployment -const DEPLOY_RETRY_INTERVAL: i64 = 30_000; -lazy_static::lazy_static! { - static ref LAST_NOT_DEPLOYED_REGISTER: Mutex> = Mutex::new(None); -} - -// Single source of truth for the "awaiting deployment" backoff. The server has -// already told us this device is not in its db; until the operator runs -// `rustdesk --deploy --token ` there is no point re-running the -// register path more often than DEPLOY_RETRY_INTERVAL. Gating in the timer -// loops (rather than only inside register_pk) also avoids the -// last_register_sent / fails / latency / UDP-rebind churn the loop would -// otherwise spin on while no response ever comes back. -async fn deploy_register_throttled() -> bool { - if !NEEDS_DEPLOY.load(Ordering::SeqCst) { - return false; - } - LAST_NOT_DEPLOYED_REGISTER - .lock() - .await - .map(|t| (t.elapsed().as_millis() as i64) < DEPLOY_RETRY_INTERVAL) - .unwrap_or(false) -} #[derive(Clone)] pub struct RendezvousMediator { @@ -90,7 +65,7 @@ impl RendezvousMediator { } crate::hbbs_http::sync::start(); #[cfg(target_os = "windows")] - if crate::platform::is_installed() && crate::is_server() { + if crate::platform::is_installed() && crate::is_server() && !crate::is_custom_client() { crate::updater::start_auto_update(); } check_zombie(); @@ -118,7 +93,6 @@ impl RendezvousMediator { } scrap::codec::test_av1(); loop { - let timeout = Arc::new(RwLock::new(CONNECT_TIMEOUT)); let conn_start_time = Instant::now(); *SOLVING_PK_MISMATCH.lock().await = "".to_owned(); if !config::option2bool("stop-service", &Config::get_option("stop-service")) @@ -130,18 +104,9 @@ impl RendezvousMediator { MANUAL_RESTARTED.store(false, Ordering::SeqCst); for host in servers.clone() { let server = server.clone(); - let timeout = timeout.clone(); futs.push(tokio::spawn(async move { if let Err(err) = Self::start(server, host).await { - let err = format!("rendezvous mediator error: {err}"); - // When user reboot, there might be below error, waiting too long - // (CONNECT_TIMEOUT 18s) will make user think there is bug - if err.contains("10054") || err.contains("11001") { - // No such host is known. (os error 11001) - // An existing connection was forcibly closed by the remote host. (os error 10054): also happens for UDP - *timeout.write().unwrap() = 3000; - } - log::error!("{err}"); + log::error!("rendezvous mediator error: {err}"); } // SHOULD_EXIT here is to ensure once one exits, the others also exit. SHOULD_EXIT.store(true, Ordering::SeqCst); @@ -152,11 +117,10 @@ impl RendezvousMediator { server.write().unwrap().close_connections(); } Config::reset_online(); - let timeout = *timeout.read().unwrap(); if !MANUAL_RESTARTED.load(Ordering::SeqCst) { let elapsed = conn_start_time.elapsed().as_millis() as u64; - if elapsed < timeout { - sleep(((timeout - elapsed) / 1000) as _).await; + if elapsed < CONNECT_TIMEOUT { + sleep(((CONNECT_TIMEOUT - elapsed) / 1000) as _).await; } } else { // https://github.com/rustdesk/rustdesk/issues/12233 @@ -240,7 +204,7 @@ impl RendezvousMediator { log::debug!("Non-protobuf message bytes received: {:?}", bytes); } }, - Some(Err(e)) => bail!("Failed to receive next: {}", e), // maybe socks5 tcp disconnected + Some(Err(e)) => bail!("Failed to receive next {}", e), // maybe socks5 tcp disconnected None => { bail!("Socket receive none. Maybe socks5 server is down."); }, @@ -250,14 +214,6 @@ impl RendezvousMediator { if SHOULD_EXIT.load(Ordering::SeqCst) { break; } - // The server already told us this device is not deployed. Skip - // the whole register / fails / latency / UDP-rebind path until - // DEPLOY_RETRY_INTERVAL elapses, otherwise the loop spins every - // few seconds (log spam + misapplied network-recovery rebind) - // until the operator runs `rustdesk --deploy`. - if deploy_register_throttled().await { - continue; - } let now = Some(Instant::now()); let expired = last_register_resp.map(|x| x.elapsed().as_millis() as i64 >= REG_INTERVAL).unwrap_or(true); let timeout = last_register_sent.map(|x| x.elapsed().as_millis() as i64 >= reg_timeout).unwrap_or(false); @@ -321,22 +277,10 @@ impl RendezvousMediator { Config::set_key_confirmed(true); Config::set_host_key_confirmed(&self.host_prefix, true); *SOLVING_PK_MISMATCH.lock().await = "".to_owned(); - NEEDS_DEPLOY.store(false, Ordering::SeqCst); } Ok(register_pk_response::Result::UUID_MISMATCH) => { self.handle_uuid_mismatch(sink).await?; } - Ok(register_pk_response::Result::NOT_DEPLOYED) => { - if !NEEDS_DEPLOY.load(Ordering::SeqCst) { - log::warn!("Server requires deployment. Run `rustdesk --deploy --token ` on this device."); - } - NEEDS_DEPLOY.store(true, Ordering::SeqCst); - // Clear key_confirmed so the UI reflects the truth: this device is - // not currently registered. Covers the case where an online device - // was deleted by an admin while running. - Config::set_key_confirmed(false); - Config::set_host_key_confirmed(&self.host_prefix, false); - } _ => { log::error!("unknown RegisterPkResponse"); } @@ -472,7 +416,6 @@ impl RendezvousMediator { rr.secure, false, Default::default(), - rr.control_permissions.clone().into_option(), ) .await } @@ -486,7 +429,6 @@ impl RendezvousMediator { secure: bool, initiate: bool, socket_addr_v6: bytes::Bytes, - control_permissions: Option, ) -> ResultType<()> { let peer_addr = AddrMangle::decode(&socket_addr); log::info!( @@ -520,7 +462,6 @@ impl RendezvousMediator { peer_addr, secure, is_ipv4(&self.addr), - control_permissions, ) .await; Ok(()) @@ -539,13 +480,7 @@ impl RendezvousMediator { let relay = use_ws() || Config::is_proxy(); let mut socket_addr_v6 = Default::default(); if peer_addr_v6.port() > 0 && !relay { - socket_addr_v6 = start_ipv6( - peer_addr_v6, - addr, - server.clone(), - fla.control_permissions.clone().into_option(), - ) - .await; + socket_addr_v6 = start_ipv6(peer_addr_v6, addr, server.clone()).await; } if is_ipv4(&self.addr) && !relay && !config::is_disable_tcp_listen() { if let Err(err) = self @@ -571,7 +506,6 @@ impl RendezvousMediator { true, true, socket_addr_v6, - fla.control_permissions.into_option(), ) .await } @@ -602,14 +536,7 @@ impl RendezvousMediator { }); let bytes = msg_out.write_to_bytes()?; socket.send_raw(bytes).await?; - crate::accept_connection( - server.clone(), - socket, - peer_addr, - true, - fla.control_permissions.into_option(), - ) - .await; + crate::accept_connection(server.clone(), socket, peer_addr, true).await; Ok(()) } @@ -624,15 +551,8 @@ impl RendezvousMediator { let peer_addr_v6 = hbb_common::AddrMangle::decode(&ph.socket_addr_v6); let relay = use_ws() || Config::is_proxy() || ph.force_relay; let mut socket_addr_v6 = Default::default(); - let control_permissions = ph.control_permissions.into_option(); if peer_addr_v6.port() > 0 && !relay { - socket_addr_v6 = start_ipv6( - peer_addr_v6, - peer_addr, - server.clone(), - control_permissions.clone(), - ) - .await; + socket_addr_v6 = start_ipv6(peer_addr_v6, peer_addr, server.clone()).await; } let relay_server = self.get_relay_server(ph.relay_server); // for ensure, websocket go relay directly @@ -651,7 +571,6 @@ impl RendezvousMediator { true, true, socket_addr_v6.clone(), - control_permissions, ) .await; } @@ -668,8 +587,7 @@ impl RendezvousMediator { }; if ph.udp_port > 0 { peer_addr.set_port(ph.udp_port as u16); - self.punch_udp_hole(peer_addr, server, msg_punch, control_permissions) - .await?; + self.punch_udp_hole(peer_addr, server, msg_punch).await?; return Ok(()); } log::debug!("Punch tcp hole to {:?}", peer_addr); @@ -685,8 +603,7 @@ impl RendezvousMediator { msg_out.set_punch_hole_sent(msg_punch); let bytes = msg_out.write_to_bytes()?; socket.send_raw(bytes).await?; - crate::accept_connection(server.clone(), socket, peer_addr, true, control_permissions) - .await; + crate::accept_connection(server.clone(), socket, peer_addr, true).await; Ok(()) } @@ -695,7 +612,6 @@ impl RendezvousMediator { peer_addr: SocketAddr, server: ServerPtr, msg_punch: PunchHoleSent, - control_permissions: Option, ) -> ResultType<()> { let mut msg_out = Message::new(); msg_out.set_punch_hole_sent(msg_punch); @@ -710,33 +626,11 @@ impl RendezvousMediator { socket.send_to(&data, addr).await.ok(); } }); - udp_nat_listen( - socket_cloned.clone(), - peer_addr, - peer_addr, - server, - control_permissions, - ) - .await?; + udp_nat_listen(socket_cloned.clone(), peer_addr, peer_addr, server).await?; Ok(()) } async fn register_pk(&mut self, socket: Sink<'_>) -> ResultType<()> { - // Throttle register_pk when the device is awaiting deployment: server - // already told us we're not in its db; sending more often than every - // DEPLOY_RETRY_INTERVAL ms is wasted traffic until the operator runs - // `rustdesk --deploy --token `. - if NEEDS_DEPLOY.load(Ordering::SeqCst) { - let mut last = LAST_NOT_DEPLOYED_REGISTER.lock().await; - if let Some(t) = *last { - if (t.elapsed().as_millis() as i64) < DEPLOY_RETRY_INTERVAL { - return Ok(()); - } - } - *last = Some(Instant::now()); - } else { - *LAST_NOT_DEPLOYED_REGISTER.lock().await = None; - } let mut msg_out = Message::new(); let pk = Config::get_key_pair().1; let uuid = hbb_common::get_uuid(); @@ -749,7 +643,6 @@ impl RendezvousMediator { ..Default::default() }); socket.send(&msg_out).await?; - SENT_REGISTER_PK.store(true, Ordering::SeqCst); Ok(()) } @@ -874,7 +767,6 @@ async fn direct_server(server: ServerPtr) { hbb_common::Stream::from(stream, local_addr), addr, false, - None, // Direct connections don't have control_permissions ) .await ); @@ -906,22 +798,12 @@ async fn start_ipv6( peer_addr_v6: SocketAddr, peer_addr_v4: SocketAddr, server: ServerPtr, - control_permissions: Option, ) -> bytes::Bytes { crate::test_ipv6().await; if let Some((socket, local_addr_v6)) = crate::get_ipv6_socket().await { let server = server.clone(); tokio::spawn(async move { - allow_err!( - udp_nat_listen( - socket.clone(), - peer_addr_v6, - peer_addr_v4, - server, - control_permissions - ) - .await - ); + allow_err!(udp_nat_listen(socket.clone(), peer_addr_v6, peer_addr_v4, server).await); }); return local_addr_v6; } @@ -933,7 +815,6 @@ async fn udp_nat_listen( peer_addr: SocketAddr, peer_addr_v4: SocketAddr, server: ServerPtr, - control_permissions: Option, ) -> ResultType<()> { let tm = Instant::now(); let socket_cloned = socket.clone(); @@ -942,18 +823,11 @@ async fn udp_nat_listen( let res = crate::punch_udp(socket.clone(), true).await?; let stream = crate::kcp_stream::KcpStream::accept( socket, - Duration::from_millis(CONNECT_TIMEOUT as _), + Duration::from_secs(CONNECT_TIMEOUT as _), res, ) .await?; - crate::server::create_tcp_connection( - server, - stream.1, - peer_addr_v4, - true, - control_permissions, - ) - .await?; + crate::server::create_tcp_connection(server, stream.1, peer_addr_v4, true).await?; Ok(()) }; func.await.map_err(|e: anyhow::Error| { @@ -965,28 +839,3 @@ async fn udp_nat_listen( })?; Ok(()) } - -// When config is not yet synced from root, register_pk may have already been sent with a new generated pk. -// After config sync completes, the pk may change. This struct detects pk changes and triggers -// a re-registration by setting key_confirmed to false. -// NOTE: -// This only corrects PK registration for the current ID. If root uses a non-default mac-generated ID, -// this does not resolve the multi-ID issue by itself. -pub struct CheckIfResendPk { - pk: Option>, -} -impl CheckIfResendPk { - pub fn new() -> Self { - Self { - pk: Config::get_cached_pk(), - } - } -} -impl Drop for CheckIfResendPk { - fn drop(&mut self) { - if SENT_REGISTER_PK.load(Ordering::SeqCst) && Config::get_cached_pk() != self.pk { - Config::set_key_confirmed(false); - log::info!("Set key_confirmed to false due to pk changed, will resend register_pk"); - } - } -} diff --git a/src/server.rs b/src/server.rs index 86f7b5396..0dcaf7e41 100644 --- a/src/server.rs +++ b/src/server.rs @@ -33,8 +33,6 @@ use video_service::VideoSource; use crate::ipc::Data; pub mod audio_service; -#[cfg(target_os = "windows")] -pub mod terminal_helper; #[cfg(not(any(target_os = "android", target_os = "ios")))] pub mod terminal_service; cfg_if::cfg_if! { @@ -67,7 +65,6 @@ pub mod input_service { } mod connection; -mod login_failure_check; pub mod display_service; #[cfg(windows)] pub mod portable_service; @@ -83,10 +80,6 @@ type ConnMap = HashMap; #[cfg(any(target_os = "macos", target_os = "linux"))] const CONFIG_SYNC_INTERVAL_SECS: f32 = 0.3; -#[cfg(any(target_os = "macos", target_os = "linux"))] -// 3s is enough for at least one initial sync attempt: -// 0.3s backoff + up to 1s connect timeout + up to 1s response timeout. -const CONFIG_SYNC_INITIAL_WAIT_SECS: u64 = 3; lazy_static::lazy_static! { pub static ref CHILD_PROCESS: Childs = Default::default(); @@ -159,30 +152,18 @@ pub fn new() -> ServerPtr { Arc::new(RwLock::new(server)) } -async fn accept_connection_( - server: ServerPtr, - socket: Stream, - secure: bool, - control_permissions: Option, -) -> ResultType<()> { +async fn accept_connection_(server: ServerPtr, socket: Stream, secure: bool) -> ResultType<()> { let local_addr = socket.local_addr(); drop(socket); // even we drop socket, below still may fail if not use reuse_addr, // there is TIME_WAIT before socket really released, so sometimes we - // see "Only one usage of each socket address is normally permitted" on windows sometimes, + // see “Only one usage of each socket address is normally permitted” on windows sometimes, let listener = new_listener(local_addr, true).await?; log::info!("Server listening on: {}", &listener.local_addr()?); if let Ok((stream, addr)) = timeout(CONNECT_TIMEOUT, listener.accept()).await? { stream.set_nodelay(true).ok(); let stream_addr = stream.local_addr()?; - create_tcp_connection( - server, - Stream::from(stream, stream_addr), - addr, - secure, - control_permissions, - ) - .await?; + create_tcp_connection(server, Stream::from(stream, stream_addr), addr, secure).await?; } Ok(()) } @@ -192,7 +173,6 @@ pub async fn create_tcp_connection( stream: Stream, addr: SocketAddr, secure: bool, - control_permissions: Option, ) -> ResultType<()> { let mut stream = stream; let id = server.write().unwrap().get_new_id(); @@ -251,23 +231,14 @@ pub async fn create_tcp_connection( #[cfg(target_os = "macos")] { use std::process::Command; - if let Ok(task) = Command::new("/usr/bin/caffeinate") + Command::new("/usr/bin/caffeinate") .arg("-u") .arg("-t 5") .spawn() - { - super::CHILD_PROCESS.lock().unwrap().push(task); - } + .ok(); log::info!("wake up macos"); } - Connection::start( - addr, - stream, - id, - Arc::downgrade(&server), - control_permissions, - ) - .await; + Connection::start(addr, stream, id, Arc::downgrade(&server)).await; Ok(()) } @@ -276,9 +247,8 @@ pub async fn accept_connection( socket: Stream, peer_addr: SocketAddr, secure: bool, - control_permissions: Option, ) { - if let Err(err) = accept_connection_(server, socket, secure, control_permissions).await { + if let Err(err) = accept_connection_(server, socket, secure).await { log::warn!("Failed to accept connection from {}: {}", peer_addr, err); } } @@ -290,18 +260,9 @@ pub async fn create_relay_connection( peer_addr: SocketAddr, secure: bool, ipv4: bool, - control_permissions: Option, ) { - if let Err(err) = create_relay_connection_( - server, - relay_server, - uuid.clone(), - peer_addr, - secure, - ipv4, - control_permissions, - ) - .await + if let Err(err) = + create_relay_connection_(server, relay_server, uuid.clone(), peer_addr, secure, ipv4).await { log::error!( "Failed to create relay connection for {} with uuid {}: {}", @@ -319,7 +280,6 @@ async fn create_relay_connection_( peer_addr: SocketAddr, secure: bool, ipv4: bool, - control_permissions: Option, ) -> ResultType<()> { let mut stream = socket_client::connect_tcp( socket_client::ipv4_to_ipv6(crate::check_port(relay_server, RELAY_PORT), ipv4), @@ -334,7 +294,7 @@ async fn create_relay_connection_( ..Default::default() }); stream.send(&msg_out).await?; - create_tcp_connection(server, stream, peer_addr, secure, control_permissions).await?; + create_tcp_connection(server, stream, peer_addr, secure).await?; Ok(()) } @@ -605,7 +565,7 @@ pub async fn start_server(is_server: bool, no_server: bool) { allow_err!(input_service::setup_uinput(0, 1920, 0, 1080).await); } #[cfg(any(target_os = "macos", target_os = "linux"))] - wait_initial_config_sync().await; + tokio::spawn(async { sync_and_watch_config_dir().await }); #[cfg(target_os = "windows")] crate::platform::try_kill_broker(); #[cfg(feature = "hwcodec")] @@ -690,49 +650,19 @@ pub async fn start_ipc_url_server() { } #[cfg(any(target_os = "macos", target_os = "linux"))] -async fn wait_initial_config_sync() { +async fn sync_and_watch_config_dir() { if crate::platform::is_root() { return; } - // Non-server process should not block startup, but still keeps background sync/watch alive. - if !crate::is_server() { - tokio::spawn(async move { - sync_and_watch_config_dir(None).await; - }); - return; - } - - let (sync_done_tx, mut sync_done_rx) = tokio::sync::oneshot::channel::<()>(); - tokio::spawn(async move { - sync_and_watch_config_dir(Some(sync_done_tx)).await; - }); - - // Server process waits up to N seconds for initial root->local sync to reduce stale-start window. - tokio::select! { - _ = &mut sync_done_rx => { - } - _ = tokio::time::sleep(Duration::from_secs(CONFIG_SYNC_INITIAL_WAIT_SECS)) => { - log::warn!( - "timed out waiting {}s for initial config sync, continue startup and keep syncing in background", - CONFIG_SYNC_INITIAL_WAIT_SECS - ); - } - } -} - -#[cfg(any(target_os = "macos", target_os = "linux"))] -async fn sync_and_watch_config_dir(sync_done_tx: Option>) { let mut cfg0 = (Config::get(), Config2::get()); let mut synced = false; - let mut is_root_config_empty = false; - let mut sync_done_tx = sync_done_tx; let tries = if crate::is_server() { 30 } else { 3 }; log::debug!("#tries of ipc service connection: {}", tries); use hbb_common::sleep; for i in 1..=tries { sleep(i as f32 * CONFIG_SYNC_INTERVAL_SECS).await; - match crate::ipc::connect_service(1000).await { + match crate::ipc::connect(1000, "_service").await { Ok(mut conn) => { if !synced { if conn.send(&Data::SyncConfig(None)).await.is_ok() { @@ -741,8 +671,6 @@ async fn sync_and_watch_config_dir(sync_done_tx: Option { let (config, config2) = *configs; let _chk = crate::ipc::CheckIfRestart::new(); - #[cfg(target_os = "macos")] - let _chk_pk = crate::CheckIfResendPk::new(); if !config.is_empty() { if cfg0.0 != config { cfg0.0 = config.clone(); @@ -754,51 +682,28 @@ async fn sync_and_watch_config_dir(sync_done_tx: Option {} }; }; } - if !synced { - log::warn!( - "initial config sync from root failed, reconnecting to ipc_service" - ); - continue; - } } loop { sleep(CONFIG_SYNC_INTERVAL_SECS).await; let cfg = (Config::get(), Config2::get()); - let should_sync = - cfg != cfg0 || (is_root_config_empty && !cfg.0.is_empty()); - if should_sync { - if is_root_config_empty { - log::info!("root config is empty, sync our config to root"); - } else { - log::info!("config updated, sync to root"); - } + if cfg != cfg0 { + log::info!("config updated, sync to root"); match conn.send(&Data::SyncConfig(Some(cfg.clone().into()))).await { Err(e) => { log::error!("sync config to root failed: {}", e); - match crate::ipc::connect_service(1000).await { + match crate::ipc::connect(1000, "_service").await { Ok(mut _conn) => { conn = _conn; log::info!("reconnected to ipc_service"); + break; } _ => {} } @@ -806,7 +711,6 @@ async fn sync_and_watch_config_dir(sync_done_tx: Option { cfg0 = cfg; conn.next_timeout(1000).await.ok(); - is_root_config_empty = false; } } } @@ -817,10 +721,6 @@ async fn sync_and_watch_config_dir(sync_done_tx: Option>> = Default::default(); } -#[cfg(not(any(target_os = "linux", target_os = "android")))] +#[cfg(not(any(target_os = "linux", target_os = "android", target_os = "ios")))] pub fn new() -> GenericService { let svc = EmptyExtraFieldService::new(NAME.to_owned(), true); GenericService::repeat::(&svc.clone(), 33, cpal_impl::run); @@ -40,6 +40,13 @@ pub fn new() -> GenericService { svc.sp } +#[cfg(target_os = "ios")] +pub fn new() -> GenericService { + let svc = EmptyExtraFieldService::new(NAME.to_owned(), true); + GenericService::repeat::(&svc.clone(), 33, ios_impl::run); + svc.sp +} + #[inline] pub fn get_voice_call_input_device() -> Option { VOICE_CALL_INPUT_DEVICE.lock().unwrap().clone() @@ -525,3 +532,140 @@ fn send_f32(data: &[f32], encoder: &mut Encoder, sp: &GenericService) { Err(_) => {} } } + +#[cfg(target_os = "ios")] +mod ios_impl { + use super::*; + use std::sync::mpsc::{channel, Receiver, Sender}; + use std::thread; + + const SAMPLE_RATE: u32 = 48000; + const CHANNELS: u16 = 2; + const FRAMES_PER_BUFFER: usize = 480; // 10ms at 48kHz + + pub struct State { + encoder: Option, + receiver: Option>>, + sender: Option>>, + format: Option, + } + + impl Default for State { + fn default() -> Self { + Self { + encoder: None, + receiver: None, + sender: None, + format: None, + } + } + } + + pub fn run(sp: EmptyExtraFieldService, state: &mut State) -> ResultType<()> { + if RESTARTING.load(Ordering::SeqCst) { + log::info!("Restarting iOS audio service"); + state.encoder = None; + state.receiver = None; + state.sender = None; + state.format = None; + RESTARTING.store(false, Ordering::SeqCst); + return Ok(()); + } + + // Initialize encoder if needed + if state.encoder.is_none() { + match Encoder::new(SAMPLE_RATE, Stereo, LowDelay) { + Ok(encoder) => state.encoder = Some(encoder), + Err(e) => { + log::error!("Failed to create Opus encoder: {}", e); + return Ok(()); + } + } + + // Set up audio format + state.format = Some(AudioFormat { + sample_rate: SAMPLE_RATE, + channels: CHANNELS as _, + ..Default::default() + }); + + // Create channel for audio data + let (tx, rx) = channel(); + state.sender = Some(tx.clone()); + state.receiver = Some(rx); + + // Set up audio callback + let tx_clone = tx.clone(); + std::thread::spawn(move || { + setup_ios_audio_callback(tx_clone); + }); + + log::info!("iOS audio service initialized with {}Hz {} channels", SAMPLE_RATE, CHANNELS); + } + + // Send audio format + if let Some(format) = &state.format { + sp.send_shared(format.clone()); + } + + // Process audio data + if let Some(receiver) = &state.receiver { + // Non-blocking receive to avoid blocking the service + while let Ok(audio_data) = receiver.try_recv() { + if let Some(encoder) = &mut state.encoder { + send_f32(&audio_data, encoder, &sp); + } + } + } + + Ok(()) + } + + lazy_static::lazy_static! { + static ref AUDIO_SENDER: Arc>>>> = Arc::new(Mutex::new(None)); + } + + fn setup_ios_audio_callback(sender: Sender>) { + // Set up the audio callback from iOS + // Check current audio permission setting + let audio_enabled = Config::get_option("enable-audio") != "N"; + unsafe { + scrap::ios::ffi::enable_audio(audio_enabled, false); + + // Set the audio callback + scrap::ios::ffi::set_audio_callback(Some(audio_callback)); + } + + // Store sender in a thread-safe way + *AUDIO_SENDER.lock().unwrap() = Some(sender); + } + + extern "C" fn audio_callback(data: *const u8, size: u32, is_mic: bool) { + // Only process microphone audio when enabled + if !is_mic { + return; + } + + if let Some(ref sender) = *AUDIO_SENDER.lock().unwrap() { + // Convert audio data from bytes to f32 + // Assuming audio comes as 16-bit PCM stereo at 48kHz + let samples = size as usize / 2; // 16-bit = 2 bytes per sample + let mut float_data = Vec::with_capacity(samples); + + unsafe { + let data_slice = std::slice::from_raw_parts(data as *const i16, samples); + for &sample in data_slice { + // Convert i16 to f32 normalized to [-1.0, 1.0] + float_data.push(sample as f32 / 32768.0); + } + } + + // Send in chunks matching our frame size + for chunk in float_data.chunks(FRAMES_PER_BUFFER * CHANNELS as usize) { + if chunk.len() == FRAMES_PER_BUFFER * CHANNELS as usize { + let _ = sender.send(chunk.to_vec()); + } + } + } + } +} diff --git a/src/server/connection.rs b/src/server/connection.rs index 538503d9c..12a3061de 100644 --- a/src/server/connection.rs +++ b/src/server/connection.rs @@ -1,8 +1,3 @@ -#[cfg(target_os = "windows")] -use super::login_failure_check::try_acquire_os_credential_login_gate; -use super::login_failure_check::{ - evaluate_os_credential_policy, record_os_credential_failure, FailureScope, -}; use super::{input_service::*, *}; #[cfg(feature = "unix-file-copy-paste")] use crate::clipboard::try_empty_clipboard_files; @@ -27,10 +22,11 @@ use crate::{ #[cfg(any(target_os = "android", target_os = "ios"))] use crate::{common::DEVICE_NAME, flutter::connection_manager::start_channel}; use cidr_utils::cidr::IpCidr; +#[cfg(target_os = "linux")] +use hbb_common::platform::linux::run_cmds; #[cfg(target_os = "android")] use hbb_common::protobuf::EnumOrUnknown; use hbb_common::{ - config::decode_permanent_password_h1_from_storage, config::{self, keys, Config, TrustedDevice}, fs::{self, can_enable_overwrite_detection, JobType}, futures::{SinkExt, StreamExt}, @@ -54,20 +50,17 @@ use serde_json::{json, value::Value}; #[cfg(not(any(target_os = "android", target_os = "ios")))] use std::sync::atomic::Ordering; use std::{ - collections::HashSet, - net::Ipv6Addr, num::NonZeroI64, path::PathBuf, - str::FromStr, sync::{atomic::AtomicI64, mpsc as std_mpsc}, }; #[cfg(not(any(target_os = "android", target_os = "ios")))] use system_shutdown; -#[cfg(target_os = "windows")] -use windows::Win32::Foundation::{CloseHandle, HANDLE}; #[cfg(windows)] use crate::virtual_display_manager; +#[cfg(not(any(target_os = "ios")))] +use std::collections::HashSet; pub type Sender = mpsc::UnboundedSender<(Instant, Arc)>; lazy_static::lazy_static! { @@ -75,57 +68,8 @@ lazy_static::lazy_static! { static ref SESSIONS: Arc::>> = Default::default(); static ref ALIVE_CONNS: Arc::>> = Default::default(); pub static ref AUTHED_CONNS: Arc::>> = Default::default(); - pub static ref CONTROL_PERMISSIONS_ARRAY: Arc::>> = Default::default(); - static ref WAKELOCK_SENDER: Arc::>> = Arc::new(Mutex::new(start_wakelock_thread())); - static ref WAKELOCK_KEEP_AWAKE_OPTION: Arc::>> = Default::default(); -} - -#[cfg(feature = "flutter")] -#[cfg(not(any(target_os = "android", target_os = "ios")))] -lazy_static::lazy_static! { static ref SWITCH_SIDES_UUID: Arc::>> = Default::default(); - static ref PENDING_SWITCH_SIDES_UUID: Arc::>> = Default::default(); -} - -#[cfg(target_os = "windows")] -const TERMINAL_OS_LOGIN_FAILED_MSG: &str = "Incorrect username or password."; - -fn constant_time_eq(a: &[u8], b: &[u8]) -> bool { - if a.len() != b.len() { - return false; - } - // Avoid data-dependent early exits. - let mut x: u8 = 0; - for i in 0..a.len() { - x |= a[i] ^ b[i]; - } - x == 0 -} - -#[cfg(target_os = "linux")] -fn should_check_linux_headless_os_auth_before_desktop_start( - is_headless_allowed: bool, - username: &str, -) -> bool { - is_headless_allowed - && !username.trim().is_empty() - && linux_desktop_manager::get_username().is_empty() -} - -#[cfg(target_os = "linux")] -fn should_record_linux_headless_os_auth_failure( - is_headless_allowed: bool, - username: &str, - err_msg: &str, -) -> bool { - is_headless_allowed - && !username.trim().is_empty() - && err_msg == crate::client::LOGIN_MSG_PASSWORD_WRONG -} - -#[cfg(not(any(target_os = "android", target_os = "ios")))] -fn should_use_terminal_os_login_scope(is_terminal: bool, os_login_username: &str) -> bool { - cfg!(target_os = "windows") && is_terminal && !os_login_username.trim().is_empty() + static ref WAKELOCK_SENDER: Arc::>> = Arc::new(Mutex::new(start_wakelock_thread())); } #[cfg(any(target_os = "windows", target_os = "linux"))] @@ -180,18 +124,9 @@ pub struct ConnInner { tx_video: Option, } -struct InputMouse { - msg: MouseEvent, - conn_id: i32, - username: String, - argb: u32, - simulate: bool, - show_cursor: bool, -} - enum MessageInput { #[cfg(not(any(target_os = "android", target_os = "ios")))] - Mouse(InputMouse), + Mouse((MouseEvent, i32)), #[cfg(not(any(target_os = "android", target_os = "ios")))] Key((KeyEvent, bool)), #[cfg(not(any(target_os = "android", target_os = "ios")))] @@ -237,24 +172,6 @@ pub enum AuthConnType { Terminal, } -#[cfg(not(any(target_os = "android", target_os = "ios")))] -#[derive(Clone, Debug)] -enum TerminalUserToken { - SelfUser, - #[cfg(target_os = "windows")] - CurrentLogonUser(crate::terminal_service::UserToken), -} - -#[cfg(not(any(target_os = "android", target_os = "ios")))] -impl TerminalUserToken { - fn to_terminal_service_token(&self) -> Option { - match self { - TerminalUserToken::SelfUser => None, - #[cfg(target_os = "windows")] - TerminalUserToken::CurrentLogonUser(token) => Some(*token), - } - } -} pub struct Connection { inner: ConnInner, display_idx: usize, @@ -279,8 +196,6 @@ pub struct Connection { restart: bool, recording: bool, block_input: bool, - privacy_mode: bool, - control_permissions: Option, last_test_delay: Option, network_delay: u32, lock_after_session_end: bool, @@ -290,9 +205,6 @@ pub struct Connection { // by peer disable_keyboard: bool, // by peer - #[cfg(not(any(target_os = "android", target_os = "ios")))] - show_my_cursor: bool, - // by peer disable_clipboard: bool, // by peer disable_audio: bool, @@ -308,7 +220,6 @@ pub struct Connection { server_audit_conn: String, server_audit_file: String, lr: LoginRequest, - peer_argb: u32, session_last_recv_time: Option>>, chat_unanswered: bool, file_transferred: bool, @@ -341,18 +252,8 @@ pub struct Connection { // For post requests that need to be sent sequentially. // eg. post_conn_audit tx_post_seq: mpsc::UnboundedSender<(String, Value)>, - // Tracks read job IDs delegated to CM process. - // When a read job is delegated to CM (via FS::ReadFile), the job id is added here. - // Used to filter stale responses (FileBlockFromCM, FileReadDone, etc.) for - // cancelled or unknown jobs. - cm_read_job_ids: HashSet, terminal_service_id: String, terminal_persistent: bool, - // The user token must be set when terminal is enabled. - // 0 indicates SYSTEM user - // other values indicate current user - #[cfg(not(any(target_os = "android", target_os = "ios")))] - terminal_user_token: Option, terminal_generic_service: Option>, } @@ -404,14 +305,8 @@ impl Connection { stream: super::Stream, id: i32, server: super::ServerPtrWeak, - control_permissions: Option, ) { - // Android is not supported yet, so we always set control_permissions to None. - #[cfg(target_os = "android")] - let control_permissions = None; let _raii_id = raii::ConnectionID::new(id); - let _raii_control_permissions_id = - raii::ControlPermissionsID::new(id, &control_permissions); let hash = Hash { salt: Config::get_salt(), challenge: Config::get_auto_password(6), @@ -462,16 +357,14 @@ impl Connection { port_forward_address: "".to_owned(), tx_to_cm, authorized: false, - keyboard: Self::permission(keys::OPTION_ENABLE_KEYBOARD, &control_permissions), - clipboard: Self::permission(keys::OPTION_ENABLE_CLIPBOARD, &control_permissions), - audio: Self::permission(keys::OPTION_ENABLE_AUDIO, &control_permissions), + keyboard: Connection::permission("enable-keyboard"), + clipboard: Connection::permission("enable-clipboard"), + audio: Connection::permission("enable-audio"), // to-do: make sure is the option correct here - file: Self::permission(keys::OPTION_ENABLE_FILE_TRANSFER, &control_permissions), - restart: Self::permission(keys::OPTION_ENABLE_REMOTE_RESTART, &control_permissions), - recording: Self::permission(keys::OPTION_ENABLE_RECORD_SESSION, &control_permissions), - block_input: Self::permission(keys::OPTION_ENABLE_BLOCK_INPUT, &control_permissions), - privacy_mode: Self::permission(keys::OPTION_ENABLE_PRIVACY_MODE, &control_permissions), - control_permissions, + file: Connection::permission(keys::OPTION_ENABLE_FILE_TRANSFER), + restart: Connection::permission("enable-remote-restart"), + recording: Connection::permission("enable-record-session"), + block_input: Connection::permission("enable-block-input"), last_test_delay: None, network_delay: 0, lock_after_session_end: false, @@ -485,14 +378,11 @@ impl Connection { enable_file_transfer: false, disable_clipboard: false, disable_keyboard: false, - #[cfg(not(any(target_os = "android", target_os = "ios")))] - show_my_cursor: false, tx_input, video_ack_required: false, server_audit_conn: "".to_owned(), server_audit_file: "".to_owned(), lr: Default::default(), - peer_argb: 0u32, session_last_recv_time: None, chat_unanswered: false, file_transferred: false, @@ -526,11 +416,8 @@ impl Connection { tx_from_authed, printer_data: Vec::new(), tx_post_seq, - cm_read_job_ids: HashSet::new(), terminal_service_id: "".to_owned(), terminal_persistent: false, - #[cfg(not(any(target_os = "android", target_os = "ios")))] - terminal_user_token: None, terminal_generic_service: None, }; let addr = hbb_common::try_into_v4(addr); @@ -567,9 +454,6 @@ impl Connection { if !conn.block_input { conn.send_permission(Permission::BlockInput, false).await; } - if !conn.privacy_mode { - conn.send_permission(Permission::PrivacyMode, false).await; - } let mut test_delay_timer = crate::rustdesk_interval(time::interval_at(Instant::now(), TEST_DELAY_TIMEOUT)); let mut last_recv_time = Instant::now(); @@ -616,9 +500,7 @@ impl Connection { match data { ipc::Data::Authorize => { conn.require_2fa.take(); - if !conn.send_logon_response_and_keep_alive().await { - break; - } + conn.send_logon_response().await; if conn.port_forward_socket.is_some() { break; } @@ -717,46 +599,6 @@ impl Connection { } else if &name == "block_input" { conn.block_input = enabled; conn.send_permission(Permission::BlockInput, enabled).await; - } else if &name == "privacy_mode" { - // Keep permission state and runtime state consistent: - // when revoking the permission, try to leave privacy mode first. - // Otherwise we could end up in an inconsistent state where - // permission looks disabled while privacy mode is still active. - if !enabled && privacy_mode::is_in_privacy_mode() { - if let Some(conn_id) = privacy_mode::get_privacy_mode_conn_id() { - if conn_id == conn.inner.id() { - let impl_key = - privacy_mode::get_cur_impl_key().unwrap_or_default(); - let turn_off_res = - privacy_mode::turn_off_privacy(conn_id, None); - match turn_off_res { - Some(Ok(_)) => { - let msg_out = crate::common::make_privacy_mode_msg( - back_notification::PrivacyModeState::PrvOffByPeer, - impl_key.clone(), - ); - conn.send(msg_out).await; - } - _ => { - let msg_out = Self::turn_off_privacy_result_to_msg( - turn_off_res, - impl_key, - ); - conn.send(msg_out).await; - // Turn-off failed, so revert CM's optimistic toggle - // and keep the previous permission value. - conn.send_to_cm(ipc::Data::SwitchPermission { - name: "privacy_mode".to_owned(), - enabled: conn.privacy_mode, - }); - continue; - } - } - } - } - } - conn.privacy_mode = enabled; - conn.send_permission(Permission::PrivacyMode, enabled).await; } } ipc::Data::RawMessage(bytes) => { @@ -764,25 +606,7 @@ impl Connection { } #[cfg(target_os = "windows")] ipc::Data::ClipboardFile(clip) => { - if !conn.is_remote() { - continue; - } - match clip { - clipboard::ClipboardFile::Files { files } => { - let files = files.into_iter().map(|(f, s)| { - (f, s as i64) - }).collect::>(); - conn.post_file_audit( - FileAuditType::RemoteSend, - "", - files, - json!({}), - ); - } - _ => { - allow_err!(conn.stream.send(&clip_2_msg(clip)).await); - } - } + allow_err!(conn.stream.send(&clip_2_msg(clip)).await); } ipc::Data::PrivacyModeState((_, state, impl_key)) => { let msg_out = match state { @@ -813,8 +637,6 @@ impl Connection { log::error!("Failed to start portable service from cm: {:?}", e); } } - #[cfg(feature = "flutter")] - #[cfg(not(any(target_os = "android", target_os = "ios")))] ipc::Data::SwitchSidesBack => { let mut misc = Misc::new(); misc.set_switch_back(SwitchBack::default()); @@ -832,36 +654,6 @@ impl Connection { let msg = new_voice_call_request(false); conn.send(msg).await; } - ipc::Data::ReadJobInitResult { id, file_num, include_hidden, conn_id, result } => { - if conn_id == conn.inner.id() { - conn.handle_read_job_init_result(id, file_num, include_hidden, result).await; - } - } - ipc::Data::FileBlockFromCM { id, file_num, data, compressed, conn_id } => { - if conn_id == conn.inner.id() { - conn.handle_file_block_from_cm(id, file_num, data, compressed).await; - } - } - ipc::Data::FileReadDone { id, file_num, conn_id } => { - if conn_id == conn.inner.id() { - conn.handle_file_read_done(id, file_num).await; - } - } - ipc::Data::FileReadError { id, file_num, err, conn_id } => { - if conn_id == conn.inner.id() { - conn.handle_file_read_error(id, file_num, err).await; - } - } - ipc::Data::FileDigestFromCM { id, file_num, last_modified, file_size, is_resume, conn_id } => { - if conn_id == conn.inner.id() { - conn.handle_file_digest_from_cm(id, file_num, last_modified, file_size, is_resume).await; - } - } - ipc::Data::AllFilesResult { id, conn_id, path, result } => { - if conn_id == conn.inner.id() { - conn.handle_all_files_result(id, path, result).await; - } - } _ => {} } }, @@ -921,9 +713,7 @@ impl Connection { } Some((instant, value)) = rx_video.recv() => { if !conn.video_ack_required { - if let Some(message::Union::VideoFrame(vf)) = &value.union { - video_service::notify_video_frame_fetched(vf.display as usize, id, Some(instant.into())); - } + video_service::notify_video_frame_fetched(id, Some(instant.into())); } if let Err(err) = conn.stream.send(&value as &Message).await { conn.on_close(&err.to_string(), false).await; @@ -995,7 +785,7 @@ impl Connection { match data { #[cfg(all(target_os = "windows", feature = "flutter"))] ipc::Data::PrinterData(data) => { - if Self::permission(keys::OPTION_ENABLE_REMOTE_PRINTER, &conn.control_permissions) { + if config::Config::get_bool_option(config::keys::OPTION_ENABLE_REMOTE_PRINTER) { conn.send_printer_request(data).await; } else { conn.send_remote_printing_disallowed().await; @@ -1007,7 +797,6 @@ impl Connection { _ = second_timer.tick() => { #[cfg(windows)] conn.portable_check(); - raii::AuthedConnID::check_wake_lock_on_setting_changed(); if let Some((instant, minute)) = conn.auto_disconnect_timer.as_ref() { if instant.elapsed().as_secs() > minute * 60 { conn.send_close_reason_no_retry("Connection failed due to inactivity").await; @@ -1063,7 +852,7 @@ impl Connection { if let Some(video_privacy_conn_id) = privacy_mode::get_privacy_mode_conn_id() { if video_privacy_conn_id == id { - let _ = Self::turn_off_privacy_to_msg(id, String::new()); + let _ = Self::turn_off_privacy_to_msg(id); } } #[cfg(all(feature = "flutter", feature = "plugin_framework"))] @@ -1072,7 +861,7 @@ impl Connection { crate::plugin::EVENT_ON_CONN_CLOSE_SERVER.to_owned(), conn.lr.my_id.clone(), ); - video_service::notify_video_frame_fetched_by_conn_id(id, None); + video_service::notify_video_frame_fetched(id, None); if conn.authorized { password::update_temporary_password(); } @@ -1107,15 +896,8 @@ impl Connection { loop { match receiver.recv_timeout(std::time::Duration::from_millis(500)) { Ok(v) => match v { - MessageInput::Mouse(mouse_input) => { - handle_mouse( - &mouse_input.msg, - mouse_input.conn_id, - mouse_input.username, - mouse_input.argb, - mouse_input.simulate, - mouse_input.show_cursor, - ); + MessageInput::Mouse((msg, id)) => { + handle_mouse(&msg, id); } MessageInput::Key((mut msg, press)) => { // Set the press state to false, use `down` only in `handle_key()`. @@ -1438,66 +1220,9 @@ impl Connection { crate::post_request(url, v.to_string(), "").await } - fn normalize_port_forward_target(pf: &mut PortForward) -> (String, bool) { - let mut is_rdp = false; - if pf.host == "RDP" && pf.port == 0 { - pf.host = "localhost".to_owned(); - pf.port = 3389; - is_rdp = true; - } - if pf.host.is_empty() { - pf.host = "localhost".to_owned(); - } - (format!("{}:{}", pf.host, pf.port), is_rdp) - } - - async fn connect_port_forward_if_needed(&mut self) -> bool { - if self.port_forward_socket.is_some() { - return true; - } - let Some(login_request::Union::PortForward(pf)) = self.lr.union.as_ref() else { - return true; - }; - let mut pf = pf.clone(); - let (mut addr, is_rdp) = Self::normalize_port_forward_target(&mut pf); - self.port_forward_address = addr.clone(); - match timeout(3000, TcpStream::connect(&addr)).await { - Ok(Ok(sock)) => { - self.port_forward_socket = Some(Framed::new(sock, BytesCodec::new())); - true - } - Ok(Err(e)) => { - log::warn!("Port forward connect failed for {}: {}", addr, e); - if is_rdp { - addr = "RDP".to_owned(); - } - self.send_login_error(format!( - "Failed to access remote {}. Please make sure it is reachable/open.", - addr - )) - .await; - false - } - Err(e) => { - log::warn!("Port forward connect timed out for {}: {}", addr, e); - if is_rdp { - addr = "RDP".to_owned(); - } - self.send_login_error(format!( - "Failed to access remote {}. Please make sure it is reachable/open.", - addr - )) - .await; - false - } - } - } - - // Returns whether this connection should be kept alive. - // `true` does not necessarily mean authorization succeeded (e.g. REQUIRE_2FA case). - async fn send_logon_response_and_keep_alive(&mut self) -> bool { + async fn send_logon_response(&mut self) { if self.authorized { - return true; + return; } if self.require_2fa.is_some() && !self.is_recent_session(true) && !self.from_switch { self.require_2fa.as_ref().map(|totp| { @@ -1528,14 +1253,7 @@ impl Connection { } }); self.send_login_error(crate::client::REQUIRE_2FA).await; - // Keep the connection alive so the client can continue with 2FA. - return true; - } - if let Some(keep_alive) = self.prepare_terminal_login_for_authorization().await { - return keep_alive; - } - if !self.connect_port_forward_if_needed().await { - return false; + return; } self.authorized = true; let (conn_type, auth_conn_type) = if self.file_transfer.is_some() { @@ -1575,7 +1293,7 @@ impl Connection { #[cfg(not(target_os = "android"))] { - pi.hostname = crate::whoami_hostname(); + pi.hostname = hbb_common::whoami::hostname(); pi.platform = hbb_common::whoami::platform().to_string(); } #[cfg(target_os = "android")] @@ -1584,7 +1302,7 @@ impl Connection { pi.platform = "Android".into(); } #[cfg(all(target_os = "macos", not(feature = "unix-file-copy-paste")))] - let mut platform_additions = serde_json::Map::new(); + let platform_additions = serde_json::Map::new(); #[cfg(any( target_os = "windows", target_os = "linux", @@ -1617,13 +1335,6 @@ impl Connection { json!(privacy_mode::get_supported_privacy_mode_impl()), ); } - #[cfg(target_os = "macos")] - { - platform_additions.insert( - "supported_privacy_mode_impl".into(), - json!(privacy_mode::get_supported_privacy_mode_impl()), - ); - } #[cfg(any(target_os = "windows", feature = "unix-file-copy-paste"))] { @@ -1658,7 +1369,7 @@ impl Connection { res.set_peer_info(pi); msg_out.set_login_response(res); self.send(msg_out).await; - return true; + return; } #[cfg(target_os = "linux")] if self.is_remote() { @@ -1681,7 +1392,7 @@ impl Connection { let mut msg_out = Message::new(); msg_out.set_login_response(res); self.send(msg_out).await; - return true; + return; } } #[allow(unused_mut)] @@ -1704,19 +1415,12 @@ impl Connection { .unwrap() .insert(self.lr.my_id.clone(), self.tx_input.clone()); - // Terminal feature is supported on desktop only - #[allow(unused_mut)] - let mut terminal = cfg!(not(any(target_os = "android", target_os = "ios"))); - #[cfg(target_os = "windows")] - { - terminal = terminal && portable_pty::win::check_support().is_ok(); - } pi.username = username; pi.sas_enabled = sas_enabled; pi.features = Some(Features { privacy_mode: privacy_mode::is_privacy_mode_supported(), #[cfg(not(any(target_os = "android", target_os = "ios")))] - terminal, + terminal: true, // Terminal feature is supported on desktop only ..Default::default() }) .into(); @@ -1725,9 +1429,7 @@ impl Connection { #[allow(unused_mut)] let mut wait_session_id_confirm = false; #[cfg(windows)] - if !self.terminal { - self.handle_windows_specific_session(&mut pi, &mut wait_session_id_confirm); - } + self.handle_windows_specific_session(&mut pi, &mut wait_session_id_confirm); if self.file_transfer.is_some() || self.terminal { res.set_peer_info(pi); } else if self.view_camera { @@ -1835,7 +1537,6 @@ impl Connection { self.try_sub_monitor_services(); } } - true } fn try_sub_camera_displays(&mut self) { @@ -1978,7 +1679,6 @@ impl Connection { port_forward: self.port_forward_address.clone(), peer_id, name, - avatar: self.lr.avatar.clone(), authorized, keyboard: self.keyboard, clipboard: self.clipboard, @@ -1988,7 +1688,6 @@ impl Connection { restart: self.restart, recording: self.recording, block_input: self.block_input, - privacy_mode: self.privacy_mode, from_switch: self.from_switch, }); } @@ -2034,25 +1733,8 @@ impl Connection { #[inline] #[cfg(not(any(target_os = "android", target_os = "ios")))] - fn input_mouse( - &self, - msg: MouseEvent, - conn_id: i32, - username: String, - argb: u32, - simulate: bool, - show_cursor: bool, - ) { - self.tx_input - .send(MessageInput::Mouse(InputMouse { - msg, - conn_id, - username, - argb, - simulate, - show_cursor, - })) - .ok(); + fn input_mouse(&self, msg: MouseEvent, conn_id: i32) { + self.tx_input.send(MessageInput::Mouse((msg, conn_id))).ok(); } #[inline] @@ -2071,135 +1753,34 @@ impl Connection { self.tx_input.send(MessageInput::Key((msg, press))).ok(); } - fn verify_h1(&self, h1: &[u8]) -> bool { - let mut hasher2 = Sha256::new(); - hasher2.update(h1); - hasher2.update(self.hash.challenge.as_bytes()); - // A normal `==` on slices may short-circuit on the first mismatch, which can leak how many leading - // bytes matched via timing. In typical remote scenarios this is difficult to exploit due to network - // jitter, changing challenges, and login attempt throttling, but a constant-time comparison here is - // low-cost defensive programming. - constant_time_eq(&hasher2.finalize()[..], &self.lr.password[..]) - } - - fn validate_password_plain(&self, password: &str) -> bool { - if password.is_empty() { + fn validate_one_password(&self, password: String) -> bool { + if password.len() == 0 { return false; } - let mut hasher = Sha256::new(); - hasher.update(password.as_bytes()); - hasher.update(self.hash.salt.as_bytes()); - let h1_plain = hasher.finalize(); - self.verify_h1(&h1_plain[..]) + hasher.update(password); + hasher.update(&self.hash.salt); + let mut hasher2 = Sha256::new(); + hasher2.update(&hasher.finalize()[..]); + hasher2.update(&self.hash.challenge); + hasher2.finalize()[..] == self.lr.password[..] } - fn validate_password_storage(&self, storage: &str) -> bool { - if storage.is_empty() { - return false; - } - - // Use strict decode success to detect hashed storage. - // If decode fails, treat as legacy plaintext storage for compatibility. - if let Some(h1) = decode_permanent_password_h1_from_storage(storage) { - return self.verify_h1(&h1[..]); - } - - // Legacy plaintext storage path. - self.validate_password_plain(storage) - } - - // This is coarse brute-force protection for the current temporary password value. - // We only care whether the active temporary password itself was presented correctly, - // not whether later authorization steps succeed. A successful temporary-password - // match clears this state immediately, and the counter also resets whenever the - // temporary password changes or is rotated. - fn check_update_temporary_password(&self, temporary_password_success: bool) { - const MAX_CONSECUTIVE_FAILURES: i32 = 10; - #[derive(Default)] - struct State { - password: String, - failures: i32, - } - lazy_static::lazy_static! { - static ref TEMPORARY_PASSWORD_FAILURES: Mutex = - Mutex::new(State::default()); - } - - if !password::temporary_enabled() { - return; - } - - let mut state = TEMPORARY_PASSWORD_FAILURES.lock().unwrap(); - let current_password = password::temporary_password(); - if current_password.is_empty() { - return; - } - if state.password != current_password { - state.password = current_password; - state.failures = 0; - } - - if temporary_password_success { - state.failures = 0; - return; - } - state.failures += 1; - - if state.failures < MAX_CONSECUTIVE_FAILURES { - return; - } - - password::update_temporary_password(); - let new_password = password::temporary_password(); - log::warn!( - "Temporary password rotated after too many consecutive wrong attempts: failures={}, ip={}", - state.failures, - self.ip, - ); - state.password = new_password; - state.failures = 0; - } - - fn validate_password(&mut self, allow_permanent_password: bool) -> bool { + fn validate_password(&mut self) -> bool { if password::temporary_enabled() { let password = password::temporary_password(); - if self.validate_password_plain(&password) { + if self.validate_one_password(password.clone()) { raii::AuthedConnID::update_or_insert_session( self.session_key(), Some(password), Some(false), ); - self.check_update_temporary_password(true); return true; } } - if password::permanent_enabled() || allow_permanent_password { - let print_fallback = || { - if allow_permanent_password && !password::permanent_enabled() { - log::info!("Permanent password accepted via logon-screen fallback"); - } - }; - // Since hashed storage uses a prefix-based encoding, a hard plaintext that - // happens to look like hashed storage could be mis-detected. Validate local storage - // and hard/preset plaintext via separate paths to avoid that ambiguity. - let (local_storage, _) = Config::get_local_permanent_password_storage_and_salt(); - if !local_storage.is_empty() { - if self.validate_password_storage(&local_storage) { - print_fallback(); - return true; - } - } else { - let hard = config::HARD_SETTINGS - .read() - .unwrap() - .get("password") - .cloned() - .unwrap_or_default(); - if !hard.is_empty() && self.validate_password_plain(&hard) { - print_fallback(); - return true; - } + if password::permanent_enabled() { + if self.validate_one_password(Config::get_permanent_password()) { + return true; } } false @@ -2219,7 +1800,7 @@ impl Connection { if let Some(session) = session { if !self.lr.password.is_empty() && (tfa && session.tfa - || !tfa && self.validate_password_plain(&session.random_password)) + || !tfa && self.validate_one_password(session.random_password.clone())) { log::info!("is recent session"); return true; @@ -2228,8 +1809,7 @@ impl Connection { false } - #[inline] - pub fn is_permission_enabled_locally(enable_prefix_option: &str) -> bool { + pub fn permission(enable_prefix_option: &str) -> bool { #[cfg(feature = "flutter")] #[cfg(not(any(target_os = "android", target_os = "ios")))] { @@ -2246,38 +1826,6 @@ impl Connection { ) } - fn permission( - enable_prefix_option: &str, - control_permissions: &Option, - ) -> bool { - use hbb_common::rendezvous_proto::control_permissions::Permission; - if let Some(control_permissions) = control_permissions { - let permission = match enable_prefix_option { - keys::OPTION_ENABLE_KEYBOARD => Some(Permission::keyboard), - keys::OPTION_ENABLE_REMOTE_PRINTER => Some(Permission::remote_printer), - keys::OPTION_ENABLE_CLIPBOARD => Some(Permission::clipboard), - keys::OPTION_ENABLE_FILE_TRANSFER => Some(Permission::file), - keys::OPTION_ENABLE_AUDIO => Some(Permission::audio), - keys::OPTION_ENABLE_CAMERA => Some(Permission::camera), - keys::OPTION_ENABLE_TERMINAL => Some(Permission::terminal), - keys::OPTION_ENABLE_TUNNEL => Some(Permission::tunnel), - keys::OPTION_ENABLE_REMOTE_RESTART => Some(Permission::restart), - keys::OPTION_ENABLE_RECORD_SESSION => Some(Permission::recording), - keys::OPTION_ENABLE_BLOCK_INPUT => Some(Permission::block_input), - keys::OPTION_ENABLE_PRIVACY_MODE => Some(Permission::privacy_mode), - _ => None, - }; - if let Some(permission) = permission { - if let Some(enabled) = - crate::get_control_permission(control_permissions.permissions, permission) - { - return enabled; - } - } - } - Self::is_permission_enabled_locally(enable_prefix_option) - } - fn update_codec_on_login(&self) { use scrap::codec::{Encoder, EncodingUpdate::*}; if let Some(o) = self.lr.clone().option.as_ref() { @@ -2301,7 +1849,6 @@ impl Connection { async fn handle_login_request_without_validation(&mut self, lr: &LoginRequest) { self.lr = lr.clone(); - self.peer_argb = crate::str2color(&format!("{}{}", &lr.my_id, &lr.my_platform), 0xff); if let Some(o) = lr.option.as_ref() { self.options_in_login = Some(o.clone()); } @@ -2356,16 +1903,6 @@ impl Connection { } async fn on_message(&mut self, msg: Message) -> bool { - if let Some(message::Union::Misc(misc)) = &msg.union { - // Move the CloseReason forward, as this message needs to be received when unauthorized, especially for kcp. - if let Some(misc::Union::CloseReason(s)) = &misc.union { - log::info!("receive close reason: {}", s); - self.on_close("Peer close", true).await; - raii::AuthedConnID::check_remove_session(self.inner.id(), self.session_key()); - return false; - } - } - // After handling CloseReason messages, proceed to process other message types if let Some(message::Union::LoginRequest(lr)) = msg.union { self.handle_login_request_without_validation(&lr).await; if self.authorized { @@ -2373,10 +1910,7 @@ impl Connection { } match lr.union { Some(login_request::Union::FileTransfer(ft)) => { - if !Self::permission( - keys::OPTION_ENABLE_FILE_TRANSFER, - &self.control_permissions, - ) { + if !Connection::permission(keys::OPTION_ENABLE_FILE_TRANSFER) { self.send_login_error("No permission of file transfer") .await; sleep(1.).await; @@ -2385,7 +1919,7 @@ impl Connection { self.file_transfer = Some((ft.dir, ft.show_hidden)); } Some(login_request::Union::ViewCamera(_vc)) => { - if !Self::permission(keys::OPTION_ENABLE_CAMERA, &self.control_permissions) { + if !Connection::permission(keys::OPTION_ENABLE_CAMERA) { self.send_login_error("No permission of viewing camera") .await; sleep(1.).await; @@ -2394,19 +1928,11 @@ impl Connection { self.view_camera = true; } Some(login_request::Union::Terminal(terminal)) => { - if !Self::permission(keys::OPTION_ENABLE_TERMINAL, &self.control_permissions) { + if !Connection::permission(keys::OPTION_ENABLE_TERMINAL) { self.send_login_error("No permission of terminal").await; sleep(1.).await; return false; } - #[cfg(target_os = "windows")] - if !lr.os_login.username.is_empty() && !crate::platform::is_installed() { - self.send_login_error("Supported only in the installed version.") - .await; - sleep(1.).await; - return false; - } - self.terminal = true; if let Some(o) = self.options_in_login.as_ref() { self.terminal_persistent = @@ -2415,13 +1941,38 @@ impl Connection { self.terminal_service_id = terminal.service_id; } Some(login_request::Union::PortForward(mut pf)) => { - if !Self::permission(keys::OPTION_ENABLE_TUNNEL, &self.control_permissions) { + if !Connection::permission("enable-tunnel") { self.send_login_error("No permission of IP tunneling").await; sleep(1.).await; return false; } - let (addr, _is_rdp) = Self::normalize_port_forward_target(&mut pf); - self.port_forward_address = addr; + let mut is_rdp = false; + if pf.host == "RDP" && pf.port == 0 { + pf.host = "localhost".to_owned(); + pf.port = 3389; + is_rdp = true; + } + if pf.host.is_empty() { + pf.host = "localhost".to_owned(); + } + let mut addr = format!("{}:{}", pf.host, pf.port); + self.port_forward_address = addr.clone(); + match timeout(3000, TcpStream::connect(&addr)).await { + Ok(Ok(sock)) => { + self.port_forward_socket = Some(Framed::new(sock, BytesCodec::new())); + } + _ => { + if is_rdp { + addr = "RDP".to_owned(); + } + self.send_login_error(format!( + "Failed to access remote {}, please make sure if it is open", + addr + )) + .await; + return false; + } + } } _ => { if !self.check_privacy_mode_on().await { @@ -2430,43 +1981,8 @@ impl Connection { } } - if !hbb_common::is_ip_str(&lr.username) - && !hbb_common::is_domain_port_str(&lr.username) - && lr.username != Config::get_id() - { - self.send_login_error(crate::client::LOGIN_MSG_OFFLINE) - .await; - return false; - } - - #[cfg(target_os = "windows")] - if self.terminal - && lr.os_login.username.trim().is_empty() - && crate::platform::is_prelogin() - { - self.send_login_error( - "No active console user logged on, please connect and logon first.", - ) - .await; - sleep(1.).await; - return false; - } - #[cfg(not(any(target_os = "android", target_os = "ios")))] - if !should_use_terminal_os_login_scope(self.terminal, &lr.os_login.username) { - self.try_start_cm_ipc(); - } - - #[cfg(target_os = "linux")] - if should_check_linux_headless_os_auth_before_desktop_start( - self.linux_headless_handle.is_headless_allowed, - &lr.os_login.username, - ) { - let (_failure, res) = self.check_failure(0).await; - if !res { - return true; - } - } + self.try_start_cm_ipc(); #[cfg(not(target_os = "linux"))] let err_msg = "".to_owned(); @@ -2478,28 +1994,17 @@ impl Connection { // If err is LOGIN_MSG_DESKTOP_SESSION_NOT_READY, just keep this msg and go on checking password. if !err_msg.is_empty() && err_msg != crate::client::LOGIN_MSG_DESKTOP_SESSION_NOT_READY { - #[cfg(target_os = "linux")] - if should_record_linux_headless_os_auth_failure( - self.linux_headless_handle.is_headless_allowed, - &lr.os_login.username, - &err_msg, - ) { - let (failure, res) = self.check_failure(0).await; - if !res { - return true; - } - self.update_failure(failure, false, 0); - } self.send_login_error(err_msg).await; return true; } // https://github.com/rustdesk/rustdesk-server-pro/discussions/646 // `is_logon` is used to check login with `OPTION_ALLOW_LOGON_SCREEN_PASSWORD` == "Y". - // `is_logon_ui()` is a fallback for logon UI detection on Windows. + // `is_logon_ui()` is used on Windows, because there's no good way to detect `is_locked()`. + // Detecting `is_logon_ui()` (if `LogonUI.exe` running) is a workaround. #[cfg(target_os = "windows")] let is_logon = || { - crate::platform::is_prelogin() || crate::platform::is_locked() || { + crate::platform::is_prelogin() || { match crate::platform::is_logon_ui() { Ok(result) => result, Err(e) => { @@ -2514,20 +2019,18 @@ impl Connection { #[cfg(any(target_os = "android", target_os = "ios"))] let is_logon = || crate::platform::is_prelogin(); - let allow_logon_screen_password = - crate::get_builtin_option(keys::OPTION_ALLOW_LOGON_SCREEN_PASSWORD) == "Y" - && is_logon(); - - if (password::approve_mode() == ApproveMode::Click && !allow_logon_screen_password) + if !hbb_common::is_ip_str(&lr.username) + && !hbb_common::is_domain_port_str(&lr.username) + && lr.username != Config::get_id() + { + self.send_login_error(crate::client::LOGIN_MSG_OFFLINE) + .await; + return false; + } else if (password::approve_mode() == ApproveMode::Click + && !(crate::get_builtin_option(keys::OPTION_ALLOW_LOGON_SCREEN_PASSWORD) == "Y" + && is_logon())) || password::approve_mode() == ApproveMode::Both && !password::has_valid_password() { - #[cfg(not(any(target_os = "android", target_os = "ios")))] - if should_use_terminal_os_login_scope(self.terminal, &lr.os_login.username) { - if let Some(keep_alive) = self.prepare_terminal_login_for_authorization().await - { - return keep_alive; - } - } self.try_start_cm(lr.my_id, lr.my_name, false); if hbb_common::get_version_number(&lr.version) >= hbb_common::get_version_number("1.2.0") @@ -2540,23 +2043,13 @@ impl Connection { if err_msg.is_empty() { #[cfg(target_os = "linux")] self.linux_headless_handle.wait_desktop_cm_ready().await; - if !self.send_logon_response_and_keep_alive().await { - return false; - } + self.send_logon_response().await; self.try_start_cm(lr.my_id.clone(), lr.my_name.clone(), self.authorized); } else { self.send_login_error(err_msg).await; } } else if lr.password.is_empty() { if err_msg.is_empty() { - #[cfg(not(any(target_os = "android", target_os = "ios")))] - if should_use_terminal_os_login_scope(self.terminal, &lr.os_login.username) { - if let Some(keep_alive) = - self.prepare_terminal_login_for_authorization().await - { - return keep_alive; - } - } self.try_start_cm(lr.my_id, lr.my_name, false); } else { self.send_login_error( @@ -2569,9 +2062,8 @@ impl Connection { if !res { return true; } - if !self.validate_password(allow_logon_screen_password) { - self.update_failure_with_scope(failure, false, 0, FailureScope::Default); - self.check_update_temporary_password(false); + if !self.validate_password() { + self.update_failure(failure, false, 0); if err_msg.is_empty() { self.send_login_error(crate::client::LOGIN_MSG_PASSWORD_WRONG) .await; @@ -2583,13 +2075,11 @@ impl Connection { .await; } } else { - self.update_failure_with_scope(failure, true, 0, FailureScope::Default); + self.update_failure(failure, true, 0); if err_msg.is_empty() { #[cfg(target_os = "linux")] self.linux_headless_handle.wait_desktop_cm_ready().await; - if !self.send_logon_response_and_keep_alive().await { - return false; - } + self.send_logon_response().await; self.try_start_cm(lr.my_id, lr.my_name, self.authorized); } else { self.send_login_error(err_msg).await; @@ -2607,9 +2097,7 @@ impl Connection { self.update_failure(failure, true, 1); self.require_2fa.take(); raii::AuthedConnID::set_session_2fa(self.session_key()); - if !self.send_logon_response_and_keep_alive().await { - return false; - } + self.send_logon_response().await; self.try_start_cm( self.lr.my_id.to_owned(), self.lr.my_name.to_owned(), @@ -2649,7 +2137,6 @@ impl Connection { } } else if let Some(message::Union::SwitchSidesResponse(_s)) = msg.union { #[cfg(feature = "flutter")] - #[cfg(not(any(target_os = "android", target_os = "ios")))] if let Some(lr) = _s.lr.clone().take() { self.handle_login_request_without_validation(&lr).await; SWITCH_SIDES_UUID @@ -2661,9 +2148,7 @@ impl Connection { if let Some((_instant, uuid_old)) = uuid_old { if uuid == uuid_old { self.from_switch = true; - if !self.send_logon_response_and_keep_alive().await { - return false; - } + self.send_logon_response().await; self.try_start_cm( lr.my_id.clone(), lr.my_name.clone(), @@ -2698,25 +2183,7 @@ impl Connection { } #[cfg(target_os = "macos")] self.retina.on_mouse_event(&mut me, self.display_idx); - self.input_mouse( - me, - self.inner.id(), - self.lr.my_name.clone(), - self.peer_argb, - true, - self.show_my_cursor, - ); - } else if self.show_my_cursor { - #[cfg(target_os = "macos")] - self.retina.on_mouse_event(&mut me, self.display_idx); - self.input_mouse( - me, - self.inner.id(), - self.lr.my_name.clone(), - self.peer_argb, - false, - true, - ); + self.input_mouse(me, self.inner.id()); } self.update_auto_disconnect_timer(); } @@ -2915,25 +2382,14 @@ impl Connection { } #[cfg(any(target_os = "windows", feature = "unix-file-copy-paste"))] Some(message::Union::Cliprdr(clip)) => { - if let Some(cliprdr::Union::Files(files)) = &clip.union { - self.post_file_audit( - FileAuditType::RemoteReceive, - "", - files - .files - .iter() - .map(|f| (f.name.clone(), f.size as i64)) - .collect::>(), - json!({}), - ); - } else if let Some(clip) = msg_2_clip(clip) { + if let Some(clip) = msg_2_clip(clip) { #[cfg(target_os = "windows")] { self.send_to_cm(ipc::Data::ClipboardFile(clip)); } #[cfg(feature = "unix-file-copy-paste")] if crate::is_support_file_copy_paste(&self.lr.version) { - let mut out_msgs = vec![]; + let mut out_msg = None; #[cfg(target_os = "macos")] if clipboard::platform::unix::macos::should_handle_msg(&clip) { @@ -2948,7 +2404,7 @@ impl Connection { }); } } else { - out_msgs = unix_file_clip::serve_clip_messages( + out_msg = unix_file_clip::serve_clip_messages( ClipboardSide::Host, clip, self.inner.id(), @@ -2957,31 +2413,14 @@ impl Connection { #[cfg(not(target_os = "macos"))] { - out_msgs = unix_file_clip::serve_clip_messages( + out_msg = unix_file_clip::serve_clip_messages( ClipboardSide::Host, clip, self.inner.id(), ); } - for msg in out_msgs.into_iter() { - if let Some(message::Union::Cliprdr(cliprdr)) = msg.union.as_ref() { - if let Some(cliprdr::Union::Files(files)) = - cliprdr.union.as_ref() - { - self.post_file_audit( - FileAuditType::RemoteSend, - "", - files - .files - .iter() - .map(|f| (f.name.clone(), f.size as i64)) - .collect::>(), - json!({}), - ); - continue; - } - } + if let Some(msg) = out_msg { self.send(msg).await; } } @@ -3037,74 +2476,28 @@ impl Connection { self.read_dir(&rd.path, rd.include_hidden); } Some(file_action::Union::AllFiles(f)) => { - if crate::common::need_fs_cm_send_files() { - self.send_fs(ipc::FS::ReadAllFiles { - path: f.path, - id: f.id, - include_hidden: f.include_hidden, - conn_id: self.inner.id(), - }); - } else { - match fs::get_recursive_files(&f.path, f.include_hidden) { - Err(err) => { - log::error!( - "Failed to get recursive files for {}: {}", - f.path, - err - ); - self.send(fs::new_error(f.id, err, -1)).await; - } - Ok(files) => { - if let Err(msg) = - crate::ui_cm_interface::check_file_count_limit( - files.len(), - ) - { - self.send(fs::new_error(f.id, msg, -1)).await; - } else { - self.send(fs::new_dir(f.id, f.path, files)).await; - } - } + match fs::get_recursive_files(&f.path, f.include_hidden) { + Err(err) => { + self.send(fs::new_error(f.id, err, -1)).await; + } + Ok(files) => { + self.send(fs::new_dir(f.id, f.path, files)).await; } } } Some(file_action::Union::Send(s)) => { // server to client let id = s.id; + let od = can_enable_overwrite_detection(get_version_number( + &self.lr.version, + )); let path = s.path.clone(); - let job_type = JobType::from_proto(s.file_type); - match job_type { + let r#type = JobType::from_proto(s.file_type); + let data_source; + match r#type { JobType::Generic => { - let od = can_enable_overwrite_detection( - get_version_number(&self.lr.version), - ); - if crate::common::need_fs_cm_send_files() { - // Delegate file reading to CM on Windows - self.cm_read_job_ids.insert(id); - self.send_fs(ipc::FS::ReadFile { - path, - id, - file_num: s.file_num, - include_hidden: s.include_hidden, - conn_id: self.inner.id(), - overwrite_detection: od, - }); - } else { - // Handle file reading in Connection on non-Windows - let data_source = - fs::DataSource::FilePath(PathBuf::from(&path)); - self.create_and_start_read_job( - id, - job_type, - data_source, - s.file_num, - s.include_hidden, - od, - path, - true, // check file count limit - ) - .await; - } + data_source = + fs::DataSource::FilePath(PathBuf::from(&path)); } JobType::Printer => { if let Some((_, _, data)) = self @@ -3113,26 +2506,49 @@ impl Connection { .position(|(_, p, _)| *p == path) .map(|index| self.printer_data.remove(index)) { - let data_source = fs::DataSource::MemoryCursor( + data_source = fs::DataSource::MemoryCursor( std::io::Cursor::new(data), ); - // Printer jobs don't need file count limit check - self.create_and_start_read_job( - id, - job_type, - data_source, - s.file_num, - s.include_hidden, - true, // always enable overwrite detection for printer - path, - false, // no file count limit for printer - ) - .await; } else { // Ignore this message if the printer data is not found return true; } } + }; + match fs::TransferJob::new_read( + id, + r#type, + "".to_string(), + data_source, + s.file_num, + s.include_hidden, + false, + od, + ) { + Err(err) => { + self.send(fs::new_error(id, err, 0)).await; + } + Ok(mut job) => { + self.send(fs::new_dir(id, path, job.files().to_vec())) + .await; + let files = job.files().to_owned(); + job.is_remote = true; + job.conn_id = self.inner.id(); + let job_type = job.r#type; + self.read_jobs.push(job); + self.file_timer = + crate::rustdesk_interval(time::interval(MILLI1)); + self.post_file_audit( + FileAuditType::RemoteSend, + if job_type == fs::JobType::Printer { + "Remote print" + } else { + &s.path + }, + Self::get_files_for_audit(job_type, files), + json!({}), + ); + } } self.file_transferred = true; } @@ -3199,11 +2615,6 @@ impl Connection { } Some(file_action::Union::Cancel(c)) => { self.send_fs(ipc::FS::CancelWrite { id: c.id }); - let _ = self.cm_read_job_ids.remove(&c.id); - self.send_fs(ipc::FS::CancelRead { - id: c.id, - conn_id: self.inner.id(), - }); if let Some(job) = fs::remove_job(c.id, &mut self.read_jobs) { self.send_to_cm(ipc::Data::FileTransferLog(( "transfer".to_string(), @@ -3213,20 +2624,7 @@ impl Connection { } Some(file_action::Union::SendConfirm(r)) => { if let Some(job) = fs::get_job(r.id, &mut self.read_jobs) { - job.confirm(&r).await; - } else if self.cm_read_job_ids.contains(&r.id) { - // Forward to CM for CM-read jobs - self.send_fs(ipc::FS::SendConfirmForRead { - id: r.id, - file_num: r.file_num, - skip: r.skip(), - offset_blk: r.offset_blk(), - conn_id: self.inner.id(), - }); - } else { - if let Ok(sc) = r.write_to_bytes() { - self.send_fs(ipc::FS::SendConfirm(sc)); - } + job.confirm(&r); } } Some(file_action::Union::Rename(r)) => { @@ -3270,7 +2668,6 @@ impl Connection { file_size: d.file_size, last_modified: d.last_modified, is_upload: true, - is_resume: d.is_resume, }), Some(file_response::Union::Error(e)) => { self.send_fs(ipc::FS::WriteError { @@ -3319,11 +2716,20 @@ impl Connection { self.update_auto_disconnect_timer(); } Some(misc::Union::VideoReceived(_)) => { - video_service::notify_video_frame_fetched_by_conn_id( + video_service::notify_video_frame_fetched( self.inner.id, Some(Instant::now().into()), ); } + Some(misc::Union::CloseReason(_)) => { + self.on_close("Peer close", true).await; + raii::AuthedConnID::check_remove_session( + self.inner.id(), + self.session_key(), + ); + return false; + } + Some(misc::Union::RestartRemoteDevice(_)) => { #[cfg(not(any(target_os = "android", target_os = "ios")))] if self.restart { @@ -3365,13 +2771,8 @@ impl Connection { } } #[cfg(feature = "flutter")] - #[cfg(not(any(target_os = "android", target_os = "ios")))] Some(misc::Union::SwitchSidesRequest(s)) => { if let Ok(uuid) = uuid::Uuid::from_slice(&s.uuid.to_vec()[..]) { - crate::server::insert_pending_switch_sides_uuid( - self.lr.my_id.clone(), - uuid.clone(), - ); crate::run_me(vec![ "--connect", &self.lr.my_id, @@ -3492,437 +2893,35 @@ impl Connection { true } - #[cfg(any(target_os = "linux", target_os = "macos"))] - fn fill_terminal_user_token( - &mut self, - _username: &str, - _password: &str, - ) -> Option<&'static str> { - self.terminal_user_token = Some(TerminalUserToken::SelfUser); - None - } - - // Try to fill user token for terminal connection. - // If username is empty, use the user token of the current session. - // If username is not empty, try to logon and check if the user is an administrator. - // If the user is an administrator, use the user token of current process (SYSTEM). - // If the user is not an administrator, return an error message. - // Note: Only local and domain users are supported, Microsoft account (online account) not supported for now. - #[cfg(target_os = "windows")] - fn fill_terminal_user_token(&mut self, username: &str, password: &str) -> Option<&'static str> { - // No need to check if the password is empty. - if !username.is_empty() { - return self.handle_administrator_check(username, password); - } - - if crate::platform::is_prelogin() { - self.terminal_user_token = None; - return Some("No active console user logged on, please connect and logon first."); - } - - if crate::platform::is_installed() { - return self.handle_installed_user(); - } - - self.terminal_user_token = Some(TerminalUserToken::SelfUser); - None - } - - #[cfg(target_os = "windows")] - fn handle_administrator_check( - &mut self, - username: &str, - password: &str, - ) -> Option<&'static str> { - let check_admin_res = - crate::platform::get_logon_user_token(username, password).map(|token| { - let is_token_admin = crate::platform::is_user_token_admin(token); - unsafe { - hbb_common::allow_err!(CloseHandle(HANDLE(token as _))); - }; - is_token_admin - }); - match check_admin_res { - Ok(Ok(b)) => { - if b { - self.terminal_user_token = Some(TerminalUserToken::SelfUser); - None - } else { - Some(TERMINAL_OS_LOGIN_FAILED_MSG) - } - } - Ok(Err(e)) => { - log::error!("Failed to check if the user is an administrator: {}", e); - Some(TERMINAL_OS_LOGIN_FAILED_MSG) - } - Err(e) => { - log::error!("Failed to get logon user token: {}", e); - Some(TERMINAL_OS_LOGIN_FAILED_MSG) - } - } - } - - #[cfg(target_os = "windows")] - fn handle_installed_user(&mut self) -> Option<&'static str> { - let session_id = crate::platform::get_current_session_id(true); - if session_id == 0xFFFFFFFF { - return Some("Failed to get current session id."); - } - let token = crate::platform::get_user_token(session_id, true); - if !token.is_null() { - match crate::platform::ensure_primary_token(token) { - Ok(t) => { - self.terminal_user_token = Some(TerminalUserToken::CurrentLogonUser( - crate::terminal_service::UserToken::new(t as usize), - )); - } - Err(e) => { - log::error!("Failed to ensure primary token: {}", e); - self.terminal_user_token = Some(TerminalUserToken::CurrentLogonUser( - crate::terminal_service::UserToken::new(token as usize), - )); - } - } - None - } else { - log::error!( - "Failed to get user token for terminal action, {}", - std::io::Error::last_os_error() - ); - Some("Failed to get user token.") - } - } - - #[cfg(not(any(target_os = "android", target_os = "ios")))] - async fn prepare_terminal_login_for_authorization(&mut self) -> Option { - if !self.terminal || self.terminal_user_token.is_some() { - return None; - } - - #[derive(Copy, Clone)] - enum TerminalAuthorizationMode { - OsLogin { - failure: ((i32, i32, i32), i32), - scope: FailureScope, - }, - SessionUser, - } - - let normalized_username = self.lr.os_login.username.trim().to_owned(); - let auth_mode = if should_use_terminal_os_login_scope(self.terminal, &normalized_username) { - // Check failure state - let failure_scope = FailureScope::TerminalOsLogin; - let (failure, res) = self.check_failure_with_scope(0, failure_scope).await; - if !res { - log::warn!( - "OS credential login blocked by failure policy: ip={} conn_id={} scope={:?}", - self.ip, - self.inner.id(), - failure_scope - ); - // Terminal OS login is sensitive. Close this connection instead of keeping it - // alive for retries on the same socket after a rate-limit block. - return Some(false); - } - TerminalAuthorizationMode::OsLogin { - failure, - scope: failure_scope, - } - } else { - TerminalAuthorizationMode::SessionUser - }; - - let is_terminal_os_login = matches!(auth_mode, TerminalAuthorizationMode::OsLogin { .. }); - let failure_scope = match auth_mode { - TerminalAuthorizationMode::OsLogin { scope, .. } => scope, - TerminalAuthorizationMode::SessionUser => FailureScope::Default, - }; - - let username = normalized_username; - let password = self.lr.os_login.password.clone(); - let terminal_login_error = { - #[cfg(target_os = "windows")] - { - // Concurrency gate for terminal OS login with credentials, to prevent brute-force attacks. - let _os_login_concurrency_guard = if is_terminal_os_login { - let guard = try_acquire_os_credential_login_gate(); - if guard.is_err() { - log::warn!( - "OS credential login blocked by concurrency gate: ip={} conn_id={} scope={:?}", - self.ip, - self.inner.id(), - failure_scope - ); - self.send_login_error("Please try 1 minute later").await; - sleep(1.).await; - Self::post_alarm_audit( - AlarmAuditType::TerminalOsLoginConcurrency, - json!({ - "ip": self.ip, - "id": self.lr.my_id.clone(), - "name": self.lr.my_name.clone(), - }), - ); - return Some(false); - } - guard.ok() - } else { - None - }; - self.fill_terminal_user_token(&username, &password) - } - #[cfg(not(target_os = "windows"))] - { - self.fill_terminal_user_token(&username, &password) - } - }; - if let Some(msg) = terminal_login_error { - if let TerminalAuthorizationMode::OsLogin { failure, scope } = auth_mode { - self.update_failure_with_scope(failure, false, 0, scope); - } - let auth_context = if is_terminal_os_login { - "OS credential login verification" - } else { - "Terminal session-user authorization" - }; - log::warn!( - "{} failed: ip={} conn_id={} scope={:?} msg='{}'", - auth_context, - self.ip, - self.inner.id(), - failure_scope, - msg - ); - self.send_login_error(msg).await; - sleep(1.).await; - return Some(false); - } - if let TerminalAuthorizationMode::OsLogin { failure, scope } = auth_mode { - self.update_failure_with_scope(failure, true, 0, scope); - } - - if let Some(is_user) = - terminal_service::is_service_specified_user(&self.terminal_service_id) - { - if let Some(user_token) = &self.terminal_user_token { - let has_service_token = user_token.to_terminal_service_token().is_some(); - if is_user != has_service_token { - log::error!( - "Terminal service user mismatch: ip={} conn_id={} service_is_user={} has_service_token={}. The service ID may have been manually changed in the configuration, causing validation to fail.", - self.ip, - self.inner.id(), - is_user, - has_service_token - ); - // No need to translate the following message, because it is in an abnormal case. - self.send_login_error("Terminal service user mismatch detected.") - .await; - sleep(1.).await; - return Some(false); - } - } - } - if is_terminal_os_login { - self.try_start_cm_ipc(); - } - None - } - - #[cfg(any(target_os = "android", target_os = "ios"))] - async fn prepare_terminal_login_for_authorization(&mut self) -> Option { - None - } - - // Try to parse connection IP as IPv6 address, returning /64, /56, and /48 prefixes. - // Parsing an IPv4 address just returns None. - // note: we specifically don't use hbb_common::is_ipv6_str to avoid divergence issues - // between its regex and the system std::net::Ipv6Addr implementation. - fn get_ipv6_prefixes(&self) -> Option<(String, String, String)> { - fn mask_u128(addr: u128, prefix: u8) -> u128 { - let mask = if prefix == 0 || prefix > 128 { - 0 - } else { - (!0u128) << (128 - prefix) - }; - addr & mask - } - // eliminate zone-ids like "fe80::1%eth0" - let ip_only = self.ip.split('%').next().unwrap_or(&self.ip).trim(); - let ip = Ipv6Addr::from_str(ip_only).ok()?; - - let as_u128 = u128::from_be_bytes(ip.octets()); - - let p64 = Ipv6Addr::from(mask_u128(as_u128, 64).to_be_bytes()).to_string() + "/64"; - let p56 = Ipv6Addr::from(mask_u128(as_u128, 56).to_be_bytes()).to_string() + "/56"; - let p48 = Ipv6Addr::from(mask_u128(as_u128, 48).to_be_bytes()).to_string() + "/48"; - - Some((p64, p56, p48)) - } - - fn bump_failure_entry(mut cur: (i32, i32, i32), time: i32) -> (i32, i32, i32) { - if cur.0 == time { - cur.1 += 1; - cur.2 += 1; - } else { - cur.0 = time; - cur.1 = 1; - cur.2 += 1; - } - cur - } - - fn update_failure(&self, failure: ((i32, i32, i32), i32), remove: bool, i: usize) { - self.update_failure_with_scope(failure, remove, i, FailureScope::Default); - } - - fn update_failure_with_scope( - &self, - (failure, time): ((i32, i32, i32), i32), - remove: bool, - i: usize, - scope: FailureScope, - ) { - let os_credential_scope = matches!(scope, FailureScope::TerminalOsLogin); - if os_credential_scope { - if !remove { - record_os_credential_failure(scope); - } - return; - } - - let map_mutex = &LOGIN_FAILURES[i]; + fn update_failure(&self, (mut failure, time): ((i32, i32, i32), i32), remove: bool, i: usize) { if remove { if failure.0 != 0 { - if let Some((p64, p56, p48)) = self.get_ipv6_prefixes() { - let mut m = map_mutex.lock().unwrap(); - m.remove(&p64); - m.remove(&p56); - m.remove(&p48); - m.remove(&self.ip); - } else { - map_mutex.lock().unwrap().remove(&self.ip); - } + LOGIN_FAILURES[i].lock().unwrap().remove(&self.ip); } return; } - // Bump the prefixes, fetching existing values - if let Some((p64, p56, p48)) = self.get_ipv6_prefixes() { - let mut m = map_mutex.lock().unwrap(); - for key in [p64, p56, p48] { - let cur = m.get(&key).copied().unwrap_or((0, 0, 0)); - m.insert(key, Self::bump_failure_entry(cur, time)); - } - let current_ip = m.get(&self.ip).copied().unwrap_or((0, 0, 0)); - m.insert(self.ip.clone(), Self::bump_failure_entry(current_ip, time)); + if failure.0 == time { + failure.1 += 1; + failure.2 += 1; } else { - // Re-read the full IP bucket in case another failed attempt updated it. - let mut m = map_mutex.lock().unwrap(); - let current_ip = m.get(&self.ip).copied().unwrap_or((0, 0, 0)); - m.insert(self.ip.clone(), Self::bump_failure_entry(current_ip, time)); + failure.0 = time; + failure.1 = 1; + failure.2 += 1; } - } - - async fn check_failure_ipv6_prefix( - &mut self, - i: usize, - time: i32, - prefix: &str, - prefix_num: i8, - thresh: i32, - ) -> Option<(((i32, i32, i32), i32), bool)> { - let failure_prefix = LOGIN_FAILURES[i] + LOGIN_FAILURES[i] .lock() .unwrap() - .get(prefix) - .copied() - .unwrap_or((0, 0, 0)); - - if failure_prefix.2 > thresh { - self.send_login_error(format!( - "Too many wrong attempts for IPv6 prefix /{}", - prefix_num - )) - .await; - Self::post_alarm_audit( - AlarmAuditType::ExceedIPv6PrefixAttempts, - json!({ - "ip": self.ip, - "id": self.lr.my_id.clone(), - "name": self.lr.my_name.clone(), - }), - ); - Some(((failure_prefix, time), false)) - } else { - None - } + .insert(self.ip.clone(), failure); } async fn check_failure(&mut self, i: usize) -> (((i32, i32, i32), i32), bool) { - self.check_failure_with_scope(i, FailureScope::Default) - .await - } - - async fn check_failure_with_scope( - &mut self, - i: usize, - scope: FailureScope, - ) -> (((i32, i32, i32), i32), bool) { - let time = (get_time() / 60_000) as i32; - - if matches!(scope, FailureScope::TerminalOsLogin) { - let decision = evaluate_os_credential_policy(scope, get_time()); - let res = if decision.allowed { - true - } else { - log::warn!( - "OS credential login blocked by policy: ip={} conn_id={} i={} msg='{}'", - self.ip, - self.inner.id(), - i, - decision.login_error.as_deref().unwrap_or("") - ); - if let Some(login_error) = decision.login_error { - // Rare branch and currently temporary response copy; translation can be added later if needed. - self.send_login_error(login_error).await; - } - if let Some(audit) = decision.audit { - // For OS blocked/backoff events, we currently emit one alarm report per blocked attempt. - // TODO: Add unified cumulative/aggregation fields across alarm producers. - Self::post_alarm_audit( - audit, - json!({ - "ip": self.ip, - "id": self.lr.my_id.clone(), - "name": self.lr.my_name.clone(), - }), - ); - } - false - }; - return (((0, 0, 0), time), res); - } - - // IPv6 addresses are cheap to make so we check prefix/netblock as well - if let Some((p64, p56, p48)) = self.get_ipv6_prefixes() { - if let Some(res) = self.check_failure_ipv6_prefix(i, time, &p64, 64, 60).await { - return res; - } - if let Some(res) = self.check_failure_ipv6_prefix(i, time, &p56, 56, 80).await { - return res; - } - if let Some(res) = self.check_failure_ipv6_prefix(i, time, &p48, 48, 100).await { - return res; - } - } - - // checks IPv6 and IPv4 direct addresses let failure = LOGIN_FAILURES[i] .lock() .unwrap() .get(&self.ip) - .copied() + .map(|x| x.clone()) .unwrap_or((0, 0, 0)); - + let time = (get_time() / 60_000) as i32; let res = if failure.2 > 30 { self.send_login_error("Too many wrong attempts").await; Self::post_alarm_audit( @@ -4147,7 +3146,6 @@ impl Connection { { return; } - #[allow(unused_mut)] let mut record_changed = true; #[cfg(windows)] if virtual_display_manager::amyuni_idd::is_my_display(&name) { @@ -4423,62 +3421,9 @@ impl Connection { self.update_terminal_persistence(q == BoolOption::Yes).await; } } - #[cfg(not(any(target_os = "android", target_os = "ios")))] - if let Ok(q) = o.show_my_cursor.enum_value() { - if q != BoolOption::NotSet { - use crate::whiteboard; - self.show_my_cursor = q == BoolOption::Yes; - #[cfg(target_os = "windows")] - let is_lower_win10 = !crate::platform::windows::is_win_10_or_greater(); - #[cfg(not(target_os = "windows"))] - let is_lower_win10 = false; - #[cfg(target_os = "linux")] - let is_linux_supported = crate::whiteboard::is_supported(); - #[cfg(not(target_os = "linux"))] - let is_linux_supported = false; - let not_support_msg = if is_lower_win10 { - "Windows 10 or greater is required." - } else if cfg!(target_os = "linux") && !is_linux_supported { - "This feature is not supported on native Wayland, please install XWayland or switch to X11." - } else { - "" - }; - if q == BoolOption::Yes { - if not_support_msg.is_empty() { - whiteboard::register_whiteboard(whiteboard::get_key_cursor(self.inner.id)); - } else { - let mut msg_out = Message::new(); - let res = MessageBox { - msgtype: "nook-nocancel-hasclose".to_owned(), - title: "Show my cursor".to_owned(), - text: not_support_msg.to_owned(), - link: "".to_owned(), - ..Default::default() - }; - msg_out.set_message_box(res); - self.send(msg_out).await; - } - } else { - if not_support_msg.is_empty() { - whiteboard::unregister_whiteboard(whiteboard::get_key_cursor( - self.inner.id, - )); - } - } - } - } } async fn turn_on_privacy(&mut self, impl_key: String) { - if !self.is_authed_remote_conn() || !self.privacy_mode { - let msg_out = crate::common::make_privacy_mode_msg( - back_notification::PrivacyModeState::PrvOnFailedDenied, - impl_key, - ); - self.send(msg_out).await; - return; - } - let msg_out = if !privacy_mode::is_privacy_mode_supported() { crate::common::make_privacy_mode_msg_with_details( back_notification::PrivacyModeState::PrvNotSupported, @@ -4520,7 +3465,7 @@ impl Connection { "Check privacy mode failed: {}, turn off privacy mode.", &err_msg ); - let _ = Self::turn_off_privacy_to_msg(self.inner.id, String::new()); + let _ = Self::turn_off_privacy_to_msg(self.inner.id); crate::common::make_privacy_mode_msg_with_details( back_notification::PrivacyModeState::PrvOnFailed, err_msg, @@ -4539,7 +3484,6 @@ impl Connection { if privacy_mode::is_in_privacy_mode() { let _ = Self::turn_off_privacy_to_msg( privacy_mode::INVALID_PRIVACY_MODE_CONN_ID, - String::new(), ); } crate::common::make_privacy_mode_msg_with_details( @@ -4567,23 +3511,14 @@ impl Connection { impl_key, ) } else { - Self::turn_off_privacy_to_msg(self.inner.id, impl_key) + Self::turn_off_privacy_to_msg(self.inner.id) }; self.send(msg_out).await; } - pub fn turn_off_privacy_to_msg(_conn_id: i32, impl_key: String) -> Message { - Self::turn_off_privacy_result_to_msg( - privacy_mode::turn_off_privacy(_conn_id, None), - impl_key, - ) - } - - fn turn_off_privacy_result_to_msg( - turn_off_res: Option>, - impl_key: String, - ) -> Message { - match turn_off_res { + pub fn turn_off_privacy_to_msg(_conn_id: i32) -> Message { + let impl_key = "".to_owned(); + match privacy_mode::turn_off_privacy(_conn_id, None) { Some(Ok(_)) => crate::common::make_privacy_mode_msg( back_notification::PrivacyModeState::PrvOffSucceeded, impl_key, @@ -4650,219 +3585,6 @@ impl Connection { raii::AuthedConnID::check_remove_session(self.inner.id(), self.session_key()); } - async fn handle_read_job_init_result( - &mut self, - id: i32, - _file_num: i32, - _include_hidden: bool, - result: Result, String>, - ) { - // Check if this response is still expected (not stale/cancelled) - if !self.cm_read_job_ids.contains(&id) { - log::warn!( - "Received ReadJobInitResult for unknown or stale job id={}, ignoring", - id - ); - return; - } - - match result { - Err(error) => { - self.cm_read_job_ids.remove(&id); - self.send(fs::new_error(id, error, 0)).await; - } - Ok(dir_bytes) => { - // Deserialize FileDirectory from protobuf bytes - let dir = match FileDirectory::parse_from_bytes(&dir_bytes) { - Ok(d) => d, - Err(e) => { - log::error!("Failed to parse FileDirectory: {}", e); - self.cm_read_job_ids.remove(&id); - self.send(fs::new_error(id, "internal error".to_string(), 0)) - .await; - return; - } - }; - - let path_str = dir.path.clone(); - let file_entries: Vec = dir.entries.into(); - - // Send file directory to client - self.send(fs::new_dir(id, path_str.clone(), file_entries.clone())) - .await; - - // Post audit for file transfer - self.post_file_audit( - FileAuditType::RemoteSend, - &path_str, - Self::get_files_for_audit(fs::JobType::Generic, file_entries), - json!({}), - ); - - // CM will handle the actual file reading and send blocks via IPC - self.file_transferred = true; - } - } - } - - async fn handle_file_block_from_cm( - &mut self, - id: i32, - file_num: i32, - data: bytes::Bytes, - compressed: bool, - ) { - // Check if the job is still valid (not cancelled) - if !self.cm_read_job_ids.contains(&id) { - log::debug!( - "Dropping file block for cancelled/unknown job id={}, file_num={}", - id, - file_num - ); - return; - } - - // Forward file block to client - let mut block = FileTransferBlock::new(); - block.id = id; - block.file_num = file_num; - block.data = data.to_vec().into(); - block.compressed = compressed; - - let mut msg = Message::new(); - let mut fr = FileResponse::new(); - fr.set_block(block); - msg.set_file_response(fr); - self.send(msg).await; - } - - async fn handle_file_read_done(&mut self, id: i32, file_num: i32) { - // Drop stale completions for cancelled/unknown jobs - if !self.cm_read_job_ids.remove(&id) { - log::debug!( - "Dropping FileReadDone for cancelled/unknown job id={}, file_num={}", - id, - file_num - ); - return; - } - - // Forward done message to client - let mut done = FileTransferDone::new(); - done.id = id; - done.file_num = file_num; - - let mut msg = Message::new(); - let mut fr = FileResponse::new(); - fr.set_done(done); - msg.set_file_response(fr); - self.send(msg).await; - } - - async fn handle_file_read_error(&mut self, id: i32, file_num: i32, err: String) { - // Drop stale errors for cancelled/unknown jobs - if !self.cm_read_job_ids.remove(&id) { - log::debug!( - "Dropping FileReadError for cancelled/unknown job id={}, file_num={}", - id, - file_num - ); - return; - } - - // Forward error to client - self.send(fs::new_error(id, err, file_num)).await; - } - - async fn handle_file_digest_from_cm( - &mut self, - id: i32, - file_num: i32, - last_modified: u64, - file_size: u64, - is_resume: bool, - ) { - // Check if the job is still valid (not cancelled) - if !self.cm_read_job_ids.contains(&id) { - log::debug!( - "Dropping digest for cancelled/unknown job id={}, file_num={}", - id, - file_num - ); - return; - } - - // Forward digest to client for overwrite detection - let mut digest = FileTransferDigest::new(); - digest.id = id; - digest.file_num = file_num; - digest.last_modified = last_modified; - digest.file_size = file_size; - digest.is_upload = false; // Server sending to client - digest.is_resume = is_resume; - - let mut msg = Message::new(); - let mut fr = FileResponse::new(); - fr.set_digest(digest); - msg.set_file_response(fr); - self.send(msg).await; - } - - async fn process_new_read_job(&mut self, mut job: fs::TransferJob, path: String) { - let files = job.files().to_owned(); - let job_type = job.r#type; - self.send(fs::new_dir(job.id, path.clone(), files.clone())) - .await; - job.is_remote = true; - job.conn_id = self.inner.id(); - self.read_jobs.push(job); - self.file_timer = crate::rustdesk_interval(time::interval(MILLI1)); - let audit_path = if job_type == fs::JobType::Printer { - "Remote print".to_owned() - } else { - path - }; - self.post_file_audit( - FileAuditType::RemoteSend, - &audit_path, - Self::get_files_for_audit(job_type, files), - json!({}), - ); - } - - async fn handle_all_files_result( - &mut self, - id: i32, - path: String, - result: Result, String>, - ) { - match result { - Err(err) => { - self.send(fs::new_error(id, err, -1)).await; - } - Ok(bytes) => { - // Deserialize FileDirectory from protobuf bytes and send as FileResponse - match FileDirectory::parse_from_bytes(&bytes) { - Ok(fd) => { - let mut msg = Message::new(); - let mut fr = FileResponse::new(); - fr.set_dir(fd); - msg.set_file_response(fr); - self.send(msg).await; - } - Err(e) => { - self.send(fs::new_error( - id, - format!("deserialize failed for {}: {}", path, e), - -1, - )) - .await; - } - } - } - } - } - fn read_empty_dirs(&mut self, dir: &str, include_hidden: bool) { let dir = dir.to_string(); self.send_fs(ipc::FS::ReadEmptyDirs { @@ -4879,57 +3601,6 @@ impl Connection { }); } - /// Create a new read job and start processing it (Connection-side). - /// - /// This is a generic Connection-side read job creation helper used for: - /// - Generic file transfers on non-Windows platforms - /// - Printer jobs on all platforms (including Windows) - /// - /// On Windows, generic file reads are delegated to CM via `start_read_job()` in - /// `src/ui_cm_interface.rs` for elevated access. Printer jobs bypass this delegation - /// since they read from in-memory data (`MemoryCursor`), not the filesystem. - /// - /// Both Connection-side and CM-side implementations use `TransferJob::new_read()` - /// with similar parameters. When modifying job creation logic, ensure both paths - /// stay in sync. - async fn create_and_start_read_job( - &mut self, - id: i32, - job_type: fs::JobType, - data_source: fs::DataSource, - file_num: i32, - include_hidden: bool, - overwrite_detection: bool, - path: String, - check_file_limit: bool, - ) { - match fs::TransferJob::new_read( - id, - job_type, - "".to_string(), - data_source, - file_num, - include_hidden, - false, - overwrite_detection, - ) { - Err(err) => { - self.send(fs::new_error(id, err, 0)).await; - } - Ok(job) => { - if check_file_limit { - if let Err(msg) = - crate::ui_cm_interface::check_file_count_limit(job.files().len()) - { - self.send(fs::new_error(id, msg, -1)).await; - return; - } - } - self.process_new_read_job(job, path).await; - } - } - } - #[inline] async fn send(&mut self, msg: Message) { allow_err!(self.stream.send(&msg).await); @@ -5096,6 +3767,7 @@ impl Connection { #[cfg(feature = "unix-file-copy-paste")] async fn handle_file_clip(&mut self, clip: clipboard::ClipboardFile) { let is_stopping_allowed = clip.is_stopping_allowed(); + let is_keyboard_enabled = self.peer_keyboard_enabled(); let file_transfer_enabled = self.file_transfer_enabled(); let stop = is_stopping_allowed && !file_transfer_enabled; log::debug!( @@ -5161,19 +3833,12 @@ impl Connection { #[cfg(not(any(target_os = "android", target_os = "ios")))] async fn init_terminal_service(&mut self) { - debug_assert!(self.terminal_user_token.is_some()); - let Some(user_token) = self.terminal_user_token.clone() else { - // unreachable, but keep it for safety - log::error!("Terminal user token is not set."); - return; - }; if self.terminal_service_id.is_empty() { self.terminal_service_id = terminal_service::generate_service_id(); } let s = Box::new(terminal_service::new( self.terminal_service_id.clone(), self.terminal_persistent, - user_token.to_terminal_service_token(), )); s.on_subscribe(self.inner.clone()); self.terminal_generic_service = Some(s); @@ -5181,15 +3846,9 @@ impl Connection { #[cfg(not(any(target_os = "android", target_os = "ios")))] async fn handle_terminal_action(&mut self, action: TerminalAction) -> ResultType<()> { - debug_assert!(self.terminal_user_token.is_some()); - let Some(user_token) = self.terminal_user_token.clone() else { - // unreacheable, but keep it for safety - bail!("Terminal user token is not set."); - }; let mut proxy = terminal_service::TerminalServiceProxy::new( self.terminal_service_id.clone(), Some(self.terminal_persistent), - user_token.to_terminal_service_token(), ); match proxy.handle_action(&action) { @@ -5216,8 +3875,6 @@ impl Connection { } } -#[cfg(feature = "flutter")] -#[cfg(not(any(target_os = "android", target_os = "ios")))] pub fn insert_switch_sides_uuid(id: String, uuid: uuid::Uuid) { SWITCH_SIDES_UUID .lock() @@ -5225,31 +3882,7 @@ pub fn insert_switch_sides_uuid(id: String, uuid: uuid::Uuid) { .insert(id, (tokio::time::Instant::now(), uuid)); } -#[cfg(feature = "flutter")] #[cfg(not(any(target_os = "android", target_os = "ios")))] -pub fn insert_pending_switch_sides_uuid(id: String, uuid: uuid::Uuid) { - let mut uuids = PENDING_SWITCH_SIDES_UUID.lock().unwrap(); - uuids.retain(|_, (instant, _)| instant.elapsed() < Duration::from_secs(10)); - uuids.insert(id, (tokio::time::Instant::now(), uuid)); -} - -#[cfg(feature = "flutter")] -#[cfg(not(any(target_os = "android", target_os = "ios")))] -pub fn remove_pending_switch_sides_uuid(id: &str, uuid: &uuid::Uuid) -> bool { - let mut uuids = PENDING_SWITCH_SIDES_UUID.lock().unwrap(); - uuids.retain(|_, (instant, _)| instant.elapsed() < Duration::from_secs(10)); - if uuids.get(id).map(|(_, stored_uuid)| stored_uuid == uuid) == Some(true) { - uuids.remove(id); - true - } else { - false - } -} - -#[cfg(not(any(target_os = "android", target_os = "ios")))] -// IPC bootstrap summary: -// - Resolve target CM socket (headless/non-headless, optional UID-scoped path on Linux). -// - Start CM when missing, then bridge bidirectional messages between this task and CM IPC. async fn start_ipc( mut rx_to_cm: mpsc::UnboundedReceiver, tx_from_cm: mpsc::UnboundedSender, @@ -5264,19 +3897,10 @@ async fn start_ipc( } sleep(1.).await; } - #[cfg(target_os = "linux")] - let headless_cm = crate::is_server() - && crate::platform::is_headless_allowed() - && linux_desktop_manager::is_headless(); - #[cfg(not(target_os = "linux"))] - let headless_cm = false; let mut stream = None; - if !headless_cm { - if let Ok(s) = crate::ipc::connect(1000, "_cm").await { - stream = Some(s); - } - } - if stream.is_none() { + if let Ok(s) = crate::ipc::connect(1000, "_cm").await { + stream = Some(s); + } else { #[allow(unused_mut)] #[allow(unused_assignments)] let mut args = vec!["--cm"]; @@ -5286,123 +3910,75 @@ async fn start_ipc( // Cm run as user, wait until desktop session is ready. #[cfg(target_os = "linux")] - if headless_cm { + if crate::platform::is_headless_allowed() && linux_desktop_manager::is_headless() { let mut username = linux_desktop_manager::get_username(); loop { if !username.is_empty() { break; } - // `_rx_desktop_ready` is used as a wake-up signal from desktop/session state changes - // (for example wait_desktop_cm_ready paths). It is not itself a proof of CM readiness. - // TODO: - // When `_rx_desktop_ready` is closed, `recv()` returns - // `None` immediately and this loop may spin if `username` remains empty. - // Keep behavior unchanged for now; if field reports appear, handle `Ok(None)` by - // breaking/returning to avoid hot-looping. let _res = timeout(1_000, _rx_desktop_ready.recv()).await; username = linux_desktop_manager::get_username(); } let uid = { - let username_for_cmd = username.clone(); - let mut uid_cmd = hbb_common::tokio::process::Command::new("id"); - // TODO: - // Keep current behavior for now to minimize change risk. - // If usernames starting with '-' are observed in the field, prefer: - // `id -u -- ` to avoid option-parsing ambiguity. - // Already verified that `id -u -- ` works as expected on macOS and Ubuntu 24.04. - uid_cmd.arg("-u").arg(&username_for_cmd).kill_on_drop(true); - let output = timeout(10_000, uid_cmd.output()) - .await - .map_err(|_| anyhow!("Timed out querying uid for {}", username))? - .map_err(|e| anyhow!("Failed to run `id -u {}`: {}", username, e))?; - if !output.status.success() { - bail!("Failed to query uid for {}", username); - } - let output = String::from_utf8_lossy(&output.stdout); + let output = run_cmds(&format!("id -u {}", &username))?; let output = output.trim(); - if output.parse::().is_err() { - bail!("Invalid uid {}", output); + if output.is_empty() || !output.parse::().is_ok() { + bail!("Invalid username {}", &username); } output.to_string() }; user = Some((uid, username)); args = vec!["--cm-no-ui"]; } - #[cfg(target_os = "linux")] - let cm_uid: Option = match &user { - Some((uid, _)) => Some( - uid.parse::() - .map_err(|_| anyhow!("Invalid uid {}", uid))?, - ), - None => None, - }; - #[cfg(target_os = "linux")] - if let Some(uid) = cm_uid { - if let Ok(s) = crate::ipc::connect_for_uid(1000, uid, "_cm").await { + let run_done; + if crate::platform::is_root() { + let mut res = Ok(None); + for _ in 0..10 { + #[cfg(not(any(target_os = "linux")))] + { + log::debug!("Start cm"); + res = crate::platform::run_as_user(args.clone()); + } + #[cfg(target_os = "linux")] + { + log::debug!("Start cm"); + res = crate::platform::run_as_user( + args.clone(), + user.clone(), + None::<(&str, &str)>, + ); + } + if res.is_ok() { + break; + } + log::error!("Failed to run cm: {res:?}"); + sleep(1.).await; + } + if let Some(task) = res? { + super::CHILD_PROCESS.lock().unwrap().push(task); + } + run_done = true; + } else { + run_done = false; + } + if !run_done { + log::debug!("Start cm"); + super::CHILD_PROCESS + .lock() + .unwrap() + .push(crate::run_me(args)?); + } + for _ in 0..20 { + sleep(0.3).await; + if let Ok(s) = crate::ipc::connect(1000, "_cm").await { stream = Some(s); + break; } } if stream.is_none() { - let run_done; - if crate::platform::is_root() { - let mut res = Ok(None); - for _ in 0..10 { - #[cfg(not(any(target_os = "linux")))] - { - log::debug!("Start cm"); - res = crate::platform::run_as_user(args.clone()); - } - #[cfg(target_os = "linux")] - { - log::debug!("Start cm"); - res = crate::platform::run_as_user( - args.clone(), - user.clone(), - None::<(&str, &str)>, - ); - } - if res.is_ok() { - break; - } - log::error!("Failed to run cm: {res:?}"); - sleep(1.).await; - } - if let Some(task) = res? { - super::CHILD_PROCESS.lock().unwrap().push(task); - } - run_done = true; - } else { - run_done = false; - } - if !run_done { - log::debug!("Start cm"); - super::CHILD_PROCESS - .lock() - .unwrap() - .push(crate::run_me(args)?); - } - for _ in 0..20 { - sleep(0.3).await; - #[cfg(target_os = "linux")] - { - if let Some(uid) = cm_uid { - if let Ok(s) = crate::ipc::connect_for_uid(1000, uid, "_cm").await { - stream = Some(s); - break; - } - continue; - } - } - if let Ok(s) = crate::ipc::connect(1000, "_cm").await { - stream = Some(s); - break; - } - } + bail!("Failed to connect to connection manager"); } } - if stream.is_none() { - bail!("Failed to connect to connection manager"); - } let _res = tx_stream_ready.send(()).await; let mut stream = stream.ok_or(anyhow!("none stream"))?; @@ -5420,23 +3996,6 @@ async fn start_ipc( let data = ipc::Data::ClickTime(ct); stream.send(&data).await?; } - // FileBlockFromCM: data is always sent separately via send_raw. - // The data field has #[serde(skip)], so it's empty after deserialization. - // Read the raw data bytes following this message. - // - // Note: Empty data (for empty files) is correctly handled. BytesCodec with - // raw=false adds a length prefix, so next_raw() returns empty BytesMut for - // zero-length frames. This mirrors the WriteBlock pattern below. - ipc::Data::FileBlockFromCM { id, file_num, data: _, compressed, conn_id } => { - let raw_data = stream.next_raw().await?; - tx_from_cm.send(ipc::Data::FileBlockFromCM { - id, - file_num, - data: raw_data.into(), - compressed, - conn_id, - })?; - } _ => { tx_from_cm.send(data)?; } @@ -5481,12 +4040,6 @@ pub enum AlarmAuditType { IpWhitelist = 0, ExceedThirtyAttempts = 1, SixAttemptsWithinOneMinute = 2, - // ExceedThirtyLoginAttempts = 3, - // MultipleLoginsAttemptsWithinOneMinute = 4, - // MultipleLoginsAttemptsWithinOneHour = 5, - ExceedIPv6PrefixAttempts = 6, - TerminalOsLoginBackoff = 7, - TerminalOsLoginConcurrency = 8, } pub enum FileAuditType { @@ -5611,7 +4164,6 @@ impl FileRemoveLogControl { } fn start_wakelock_thread() -> std::sync::mpsc::Sender<(usize, usize)> { - // Check if we should keep awake during incoming sessions use crate::platform::{get_wakelock, WakeLock}; let (tx, rx) = std::sync::mpsc::channel::<(usize, usize)>(); std::thread::spawn(move || { @@ -5620,15 +4172,9 @@ fn start_wakelock_thread() -> std::sync::mpsc::Sender<(usize, usize)> { loop { match rx.recv() { Ok((conn_count, remote_count)) => { - let keep_awake = config::Config::get_bool_option( - keys::OPTION_KEEP_AWAKE_DURING_INCOMING_SESSIONS, - ); - *WAKELOCK_KEEP_AWAKE_OPTION.lock().unwrap() = Some(keep_awake); - if conn_count == 0 || !keep_awake { - if wakelock.is_some() { - wakelock = None; - log::info!("drop wakelock"); - } + if conn_count == 0 { + wakelock = None; + log::info!("drop wakelock"); } else { let mut display = remote_count > 0; if let Some(_w) = wakelock.as_mut() { @@ -5703,15 +4249,6 @@ impl Drop for Connection { if let Some(s) = self.terminal_generic_service.as_ref() { s.join(); } - - #[cfg(target_os = "windows")] - if let Some(TerminalUserToken::CurrentLogonUser(token)) = self.terminal_user_token.take() { - if token.as_raw() != 0 { - unsafe { - hbb_common::allow_err!(CloseHandle(HANDLE(token.as_raw() as _))); - }; - } - } } } @@ -5783,13 +4320,9 @@ impl Retina { #[inline] fn on_mouse_event(&mut self, e: &mut MouseEvent, current: usize) { - let evt_type = e.mask & crate::input::MOUSE_TYPE_MASK; - // Delta-based events do not contain absolute coordinates. - // Avoid applying Retina coordinate scaling to them. - if evt_type == crate::input::MOUSE_TYPE_WHEEL - || evt_type == crate::input::MOUSE_TYPE_TRACKPAD - || evt_type == crate::input::MOUSE_TYPE_MOVE_RELATIVE - { + let evt_type = e.mask & 0x7; + if evt_type == crate::input::MOUSE_TYPE_WHEEL { + // x and y are always 0, +1 or -1 return; } let Some(d) = self.displays.get(current) else { @@ -5825,41 +4358,6 @@ impl Retina { } } -/// Get control permission state from CONTROL_PERMISSIONS_ARRAY. -/// Returns: Some(false) if any disable, Some(true) if any enable (and no disable), None if not set. -pub fn get_control_permission_state( - permission: hbb_common::rendezvous_proto::control_permissions::Permission, - disable_if_has_disabled: bool, -) -> Option { - let control_permissions = CONTROL_PERMISSIONS_ARRAY.lock().unwrap(); - let mut has_enable = false; - let mut has_disable = false; - for (_, cp) in control_permissions.iter() { - match crate::get_control_permission(cp.permissions, permission) { - Some(false) => has_disable = true, - Some(true) => has_enable = true, - None => {} - } - } - if disable_if_has_disabled { - if has_disable { - Some(false) - } else if has_enable { - Some(true) - } else { - None - } - } else { - if has_enable { - Some(true) - } else if has_disable { - Some(false) - } else { - None - } - } -} - pub struct AuthedConn { pub conn_id: i32, pub conn_type: AuthConnType, @@ -5871,7 +4369,6 @@ pub struct AuthedConn { mod raii { // ALIVE_CONNS: all connections, including unauthorized connections // AUTHED_CONNS: all authorized connections - // CONTROL_PERMISSIONS_ARRAY: all non-None control permissions use super::*; pub struct ConnectionID(i32); @@ -5939,16 +4436,6 @@ mod raii { .send((conn_count, remote_count))); } - pub fn check_wake_lock_on_setting_changed() { - let current = - config::Config::get_bool_option(keys::OPTION_KEEP_AWAKE_DURING_INCOMING_SESSIONS); - let cached = *WAKELOCK_KEEP_AWAKE_OPTION.lock().unwrap(); - if cached != Some(current) { - Self::check_wake_lock(); - } - } - - #[cfg(windows)] pub fn non_port_forward_conn_count() -> usize { AUTHED_CONNS .lock() @@ -6044,9 +4531,6 @@ mod raii { .unwrap() .on_connection_close(self.0); } - // Clear per-connection state to avoid stale behavior if conn ids are reused. - #[cfg(not(any(target_os = "android", target_os = "ios")))] - clear_relative_mouse_active(self.0); AUTHED_CONNS.lock().unwrap().retain(|c| c.conn_id != self.0); let remote_count = AUTHED_CONNS .lock() @@ -6067,39 +4551,6 @@ mod raii { scrap::wayland::pipewire::try_close_session(); } Self::check_wake_lock(); - #[cfg(not(any(target_os = "android", target_os = "ios")))] - { - use crate::whiteboard; - whiteboard::unregister_whiteboard(whiteboard::get_key_cursor(self.0)); - } - } - } - - pub struct ControlPermissionsID { - id: i32, - control_permissions: Option, - } - - impl Drop for ControlPermissionsID { - fn drop(&mut self) { - if self.control_permissions.is_some() { - let mut lock = CONTROL_PERMISSIONS_ARRAY.lock().unwrap(); - lock.retain(|(conn_id, _)| *conn_id != self.id); - } - } - } - impl ControlPermissionsID { - pub fn new(id: i32, control_permissions: &Option) -> Self { - if let Some(s) = control_permissions { - CONTROL_PERMISSIONS_ARRAY - .lock() - .unwrap() - .push((id, s.clone())); - } - Self { - id, - control_permissions: control_permissions.clone(), - } } } } @@ -6139,11 +4590,4 @@ mod test { assert_eq!(pos.x, 510); assert_eq!(pos.y, 510); } - - #[test] - fn ipv6() { - assert!(Ipv6Addr::from_str("::1").is_ok()); - assert!(Ipv6Addr::from_str("127.0.0.1").is_err()); - assert!(Ipv6Addr::from_str("0").is_err()); - } } diff --git a/src/server/display_service.rs b/src/server/display_service.rs index fe3621f26..6a52cbbea 100644 --- a/src/server/display_service.rs +++ b/src/server/display_service.rs @@ -304,12 +304,6 @@ pub(super) fn get_display_info(idx: usize) -> Option { // Display to DisplayInfo // The DisplayInfo is be sent to the peer. pub(super) fn check_update_displays(all: &Vec) { - // For compatibility: if only one display, scale remains 1.0 and we use the physical size for `uinput`. - // If there are multiple displays, we use the logical size for `uinput` by setting scale to d.scale(). - #[cfg(target_os = "linux")] - let use_logical_scale = !is_x11() - && crate::is_server() - && scrap::wayland::display::get_displays().displays.len() > 1; let displays = all .iter() .map(|d| { @@ -321,12 +315,6 @@ pub(super) fn check_update_displays(all: &Vec) { { scale = d.scale(); } - #[cfg(target_os = "linux")] - { - if use_logical_scale { - scale = d.scale(); - } - } let original_resolution = get_original_resolution( &display_name, ((d.width() as f64) / scale).round() as usize, diff --git a/src/server/input_service.rs b/src/server/input_service.rs index 97dc78755..1b0a248d4 100644 --- a/src/server/input_service.rs +++ b/src/server/input_service.rs @@ -1,9 +1,9 @@ #[cfg(target_os = "linux")] use super::rdp_input::client::{RdpInputKeyboard, RdpInputMouse}; use super::*; +#[cfg(target_os = "macos")] +use crate::common::is_server; use crate::input::*; -#[cfg(not(any(target_os = "android", target_os = "ios")))] -use crate::whiteboard; #[cfg(target_os = "macos")] use dispatch::Queue; use enigo::{Enigo, Key, KeyboardControllable, MouseButton, MouseControllable}; @@ -17,16 +17,13 @@ use rdev::{self, EventType, Key as RdevKey, KeyCode, RawKey}; use rdev::{CGEventSourceStateID, CGEventTapLocation, VirtualInput}; #[cfg(target_os = "linux")] use scrap::wayland::pipewire::RDP_SESSION_INFO; -#[cfg(target_os = "linux")] -use std::sync::mpsc; use std::{ convert::TryFrom, - ops::{Deref, DerefMut}, + ops::{Deref, DerefMut, Sub}, sync::atomic::{AtomicBool, Ordering}, thread, time::{self, Duration, Instant}, }; - #[cfg(windows)] use winapi::um::winuser::WHEEL_DELTA; @@ -111,10 +108,6 @@ struct Input { const KEY_CHAR_START: u64 = 9999; -// XKB keycode for Insert key (evdev KEY_INSERT code 110 + 8 for XKB offset) -#[cfg(target_os = "linux")] -const XKB_KEY_INSERT: u16 = evdev::Key::KEY_INSERT.code() + 8; - #[derive(Clone, Default)] pub struct MouseCursorSub { inner: ConnInner, @@ -211,7 +204,6 @@ impl LockModesHandler { } let mut num_lock_changed = false; - #[allow(unused)] let mut event_num_enabled = false; if is_numpad_key { let local_num_enabled = en.get_key_state(enigo::Key::NumLock); @@ -452,36 +444,7 @@ lazy_static::lazy_static! { static ref KEYS_DOWN: Arc>> = Default::default(); static ref LATEST_PEER_INPUT_CURSOR: Arc> = Default::default(); static ref LATEST_SYS_CURSOR_POS: Arc, (i32, i32))>> = Arc::new(Mutex::new((None, (INVALID_CURSOR_POS, INVALID_CURSOR_POS)))); - // Track connections that are currently using relative mouse movement. - // Used to disable whiteboard/cursor display for all events while in relative mode. - static ref RELATIVE_MOUSE_CONNS: Arc>> = Default::default(); } - -#[inline] -fn set_relative_mouse_active(conn: i32, active: bool) { - let mut lock = RELATIVE_MOUSE_CONNS.lock().unwrap(); - if active { - lock.insert(conn); - } else { - lock.remove(&conn); - } -} - -#[inline] -fn is_relative_mouse_active(conn: i32) -> bool { - RELATIVE_MOUSE_CONNS.lock().unwrap().contains(&conn) -} - -/// Clears the relative mouse mode state for a connection. -/// -/// This must be called when an authenticated connection is dropped (during connection teardown) -/// to avoid leaking the connection id in `RELATIVE_MOUSE_CONNS` (a `Mutex>`). -/// Callers are responsible for invoking this on disconnect. -#[inline] -pub(crate) fn clear_relative_mouse_active(conn: i32) { - set_relative_mouse_active(conn, false); -} - static EXITING: AtomicBool = AtomicBool::new(false); const MOUSE_MOVE_PROTECTION_TIMEOUT: Duration = Duration::from_millis(1_000); @@ -678,8 +641,8 @@ async fn set_uinput_resolution(minx: i32, maxx: i32, miny: i32, maxy: i32) -> Re pub fn is_left_up(evt: &MouseEvent) -> bool { let buttons = evt.mask >> 3; - let evt_type = evt.mask & MOUSE_TYPE_MASK; - buttons == MOUSE_BUTTON_LEFT && evt_type == MOUSE_TYPE_UP + let evt_type = evt.mask & 0x7; + return buttons == 1 && evt_type == 2; } #[cfg(windows)] @@ -736,30 +699,21 @@ fn get_modifier_state(key: Key, en: &mut Enigo) -> bool { } } -#[allow(unreachable_code)] -pub fn handle_mouse( - evt: &MouseEvent, - conn: i32, - username: String, - argb: u32, - simulate: bool, - show_cursor: bool, -) { +pub fn handle_mouse(evt: &MouseEvent, conn: i32) { #[cfg(target_os = "macos")] { // having GUI (--server has tray, it is GUI too), run main GUI thread, otherwise crash let evt = evt.clone(); - QUEUE.exec_async(move || handle_mouse_(&evt, conn, username, argb, simulate, show_cursor)); + QUEUE.exec_async(move || handle_mouse_(&evt, conn)); return; } #[cfg(windows)] - crate::portable_service::client::handle_mouse(evt, conn, username, argb, simulate, show_cursor); + crate::portable_service::client::handle_mouse(evt, conn); #[cfg(not(windows))] - handle_mouse_(evt, conn, username, argb, simulate, show_cursor); + handle_mouse_(evt, conn); } // to-do: merge handle_mouse and handle_pointer -#[allow(unreachable_code)] pub fn handle_pointer(evt: &PointerDeviceEvent, conn: i32) { #[cfg(target_os = "macos")] { @@ -809,7 +763,7 @@ fn record_key_is_control_key(record_key: u64) -> bool { #[inline] fn record_key_is_chr(record_key: u64) -> bool { - record_key >= KEY_CHAR_START + record_key < KEY_CHAR_START } #[inline] @@ -940,7 +894,7 @@ fn get_last_input_cursor_pos() -> (i32, i32) { } // check if mouse is moved by the controlled side user to make controlled side has higher mouse priority than remote. -fn active_mouse_(_conn: i32) -> bool { +fn active_mouse_(conn: i32) -> bool { true /* this method is buggy (not working on macOS, making fast moving mouse event discarded here) and added latency (this is blocking way, must do in async way), so we disable it for now // out of time protection @@ -1025,32 +979,7 @@ pub fn handle_pointer_(evt: &PointerDeviceEvent, conn: i32) { } } -pub fn handle_mouse_( - evt: &MouseEvent, - conn: i32, - _username: String, - _argb: u32, - simulate: bool, - _show_cursor: bool, -) { - if simulate { - handle_mouse_simulation_(evt, conn); - } - #[cfg(not(any(target_os = "android", target_os = "ios")))] - { - let evt_type = evt.mask & MOUSE_TYPE_MASK; - // Relative (delta) mouse events do not include absolute coordinates, so - // whiteboard/cursor rendering must be disabled during relative mode to prevent - // incorrect cursor/whiteboard updates. We check both is_relative_mouse_active(conn) - // (connection already in relative mode from prior events) and evt_type (current - // event is relative) to guard against the first relative event before the flag is set. - if _show_cursor && !is_relative_mouse_active(conn) && evt_type != MOUSE_TYPE_MOVE_RELATIVE { - handle_mouse_show_cursor_(evt, conn, _username, _argb); - } - } -} - -pub fn handle_mouse_simulation_(evt: &MouseEvent, conn: i32) { +pub fn handle_mouse_(evt: &MouseEvent, conn: i32) { if !active_mouse_(conn) { return; } @@ -1062,7 +991,7 @@ pub fn handle_mouse_simulation_(evt: &MouseEvent, conn: i32) { #[cfg(windows)] crate::platform::windows::try_change_desktop(); let buttons = evt.mask >> 3; - let evt_type = evt.mask & MOUSE_TYPE_MASK; + let evt_type = evt.mask & 0x7; let mut en = ENIGO.lock().unwrap(); #[cfg(target_os = "macos")] en.set_ignore_flags(enigo_ignore_flags()); @@ -1090,8 +1019,6 @@ pub fn handle_mouse_simulation_(evt: &MouseEvent, conn: i32) { } match evt_type { MOUSE_TYPE_MOVE => { - // Switching back to absolute movement implicitly disables relative mouse mode. - set_relative_mouse_active(conn, false); en.mouse_move_to(evt.x, evt.y); *LATEST_PEER_INPUT_CURSOR.lock().unwrap() = Input { conn, @@ -1100,32 +1027,6 @@ pub fn handle_mouse_simulation_(evt: &MouseEvent, conn: i32) { y: evt.y, }; } - // MOUSE_TYPE_MOVE_RELATIVE: Relative mouse movement for gaming/3D applications. - // Each client independently decides whether to use relative mode. - // Multiple clients can mix absolute and relative movements without conflict, - // as the server simply applies the delta to the current cursor position. - MOUSE_TYPE_MOVE_RELATIVE => { - set_relative_mouse_active(conn, true); - // Clamp delta to prevent extreme/malicious values from reaching OS APIs. - // This matches the Flutter client's kMaxRelativeMouseDelta constant. - const MAX_RELATIVE_MOUSE_DELTA: i32 = 10000; - let dx = evt - .x - .clamp(-MAX_RELATIVE_MOUSE_DELTA, MAX_RELATIVE_MOUSE_DELTA); - let dy = evt - .y - .clamp(-MAX_RELATIVE_MOUSE_DELTA, MAX_RELATIVE_MOUSE_DELTA); - en.mouse_move_relative(dx, dy); - // Get actual cursor position after relative movement for tracking - if let Some((x, y)) = crate::get_cursor_pos() { - *LATEST_PEER_INPUT_CURSOR.lock().unwrap() = Input { - conn, - time: get_time(), - x, - y, - }; - } - } MOUSE_TYPE_DOWN => match buttons { MOUSE_BUTTON_LEFT => { allow_err!(en.mouse_down(MouseButton::Left)); @@ -1221,52 +1122,6 @@ pub fn handle_mouse_simulation_(evt: &MouseEvent, conn: i32) { } } -#[cfg(not(any(target_os = "android", target_os = "ios")))] -pub fn handle_mouse_show_cursor_(evt: &MouseEvent, conn: i32, username: String, argb: u32) { - let buttons = evt.mask >> 3; - let evt_type = evt.mask & MOUSE_TYPE_MASK; - match evt_type { - MOUSE_TYPE_MOVE => { - whiteboard::update_whiteboard( - whiteboard::get_key_cursor(conn), - whiteboard::CustomEvent::Cursor(whiteboard::Cursor { - x: evt.x as _, - y: evt.y as _, - argb, - btns: 0, - text: username, - }), - ); - } - MOUSE_TYPE_UP => { - if buttons == MOUSE_BUTTON_LEFT { - // Some clients intentionally send button events without coordinates. - // Fall back to the last known cursor position to avoid jumping to (0, 0). - // TODO(protocol): (0, 0) is a valid screen coordinate. Consider using a dedicated - // sentinel value (e.g. INVALID_CURSOR_POS) or a protocol-level flag to distinguish - // "coordinates not provided" from "coordinates are (0, 0)". Impact is minor since - // this only affects whiteboard rendering and clicking exactly at (0, 0) is rare. - let (x, y) = if evt.x == 0 && evt.y == 0 { - get_last_input_cursor_pos() - } else { - (evt.x, evt.y) - }; - whiteboard::update_whiteboard( - whiteboard::get_key_cursor(conn), - whiteboard::CustomEvent::Cursor(whiteboard::Cursor { - x: x as _, - y: y as _, - argb, - btns: buttons, - text: username, - }), - ); - } - } - _ => {} - } -} - #[cfg(target_os = "windows")] fn handle_scale(scale: i32) { let mut en = ENIGO.lock().unwrap(); @@ -1409,7 +1264,7 @@ fn sim_rdev_rawkey_virtual(code: u32, keydown: bool) { fn simulate_(event_type: &EventType) { unsafe { let _lock = VIRTUAL_INPUT_MTX.lock(); - if let Some(input) = VIRTUAL_INPUT_STATE.as_ref() { + if let Some(input) = &VIRTUAL_INPUT_STATE { let _ = input.simulate(&event_type); } } @@ -1421,7 +1276,7 @@ fn press_capslock() { let caps_key = RdevKey::RawKey(rdev::RawKey::MacVirtualKeycode(rdev::kVK_CapsLock)); unsafe { let _lock = VIRTUAL_INPUT_MTX.lock(); - if let Some(input) = VIRTUAL_INPUT_STATE.as_mut() { + if let Some(input) = &mut VIRTUAL_INPUT_STATE { if input.simulate(&EventType::KeyPress(caps_key)).is_ok() { input.capslock_down = true; key_sleep(); @@ -1436,7 +1291,7 @@ fn release_capslock() { let caps_key = RdevKey::RawKey(rdev::RawKey::MacVirtualKeycode(rdev::kVK_CapsLock)); unsafe { let _lock = VIRTUAL_INPUT_MTX.lock(); - if let Some(input) = VIRTUAL_INPUT_STATE.as_mut() { + if let Some(input) = &mut VIRTUAL_INPUT_STATE { if input.simulate(&EventType::KeyRelease(caps_key)).is_ok() { input.capslock_down = false; key_sleep(); @@ -1473,26 +1328,20 @@ fn map_keyboard_mode(evt: &KeyEvent) { // Wayland #[cfg(target_os = "linux")] if !crate::platform::linux::is_x11() { - wayland_send_raw_key(evt.chr() as u16, evt.down); + let mut en = ENIGO.lock().unwrap(); + let code = evt.chr() as u16; + + if evt.down { + en.key_down(enigo::Key::Raw(code)).ok(); + } else { + en.key_up(enigo::Key::Raw(code)); + } return; } sim_rdev_rawkey_position(evt.chr() as _, evt.down); } -/// Send raw keycode on Wayland via the active backend (uinput or RemoteDesktop portal). -/// The keycode is expected to be a Linux keycode (evdev code + 8 for X11 compatibility). -#[cfg(target_os = "linux")] -#[inline] -fn wayland_send_raw_key(code: u16, down: bool) { - let mut en = ENIGO.lock().unwrap(); - if down { - en.key_down(enigo::Key::Raw(code)).ok(); - } else { - en.key_up(enigo::Key::Raw(code)); - } -} - #[cfg(target_os = "macos")] fn add_flags_to_enigo(en: &mut Enigo, key_event: &KeyEvent) { // When long-pressed the command key, then press and release @@ -1513,27 +1362,6 @@ fn get_control_key_value(key_event: &KeyEvent) -> i32 { } } -#[inline] -fn has_hotkey_modifiers(key_event: &KeyEvent) -> bool { - key_event.modifiers.iter().any(|ck| { - let v = ck.value(); - v == ControlKey::Control.value() - || v == ControlKey::RControl.value() - || v == ControlKey::Meta.value() - || v == ControlKey::RWin.value() - || { - #[cfg(any(target_os = "windows", target_os = "linux"))] - { - v == ControlKey::Alt.value() || v == ControlKey::RAlt.value() - } - #[cfg(target_os = "macos")] - { - false - } - } - }) -} - fn release_unpressed_modifiers(en: &mut Enigo, key_event: &KeyEvent) { let ck_value = get_control_key_value(key_event); fix_modifiers(&key_event.modifiers[..], en, ck_value); @@ -1593,31 +1421,7 @@ fn need_to_uppercase(en: &mut Enigo) -> bool { get_modifier_state(Key::Shift, en) || get_modifier_state(Key::CapsLock, en) } -fn process_chr(en: &mut Enigo, chr: u32, down: bool, _hotkey: bool) { - // On Wayland with uinput mode, use clipboard for character input - #[cfg(target_os = "linux")] - if !crate::platform::linux::is_x11() && wayland_use_uinput() { - // Skip clipboard for hotkeys (Ctrl/Alt/Meta pressed) - if !is_hotkey_modifier_pressed(en) { - if down { - if let Ok(c) = char::try_from(chr) { - input_char_via_clipboard_server(en, c); - } - } - return; - } - } - - #[cfg(any(target_os = "macos", target_os = "windows"))] - if !_hotkey { - if down { - if let Ok(chr) = char::try_from(chr) { - en.key_sequence(&chr.to_string()); - } - } - return; - } - +fn process_chr(en: &mut Enigo, chr: u32, down: bool) { let key = char_value_to_key(chr); if down { @@ -1637,136 +1441,15 @@ fn process_chr(en: &mut Enigo, chr: u32, down: bool, _hotkey: bool) { } fn process_unicode(en: &mut Enigo, chr: u32) { - // On Wayland with uinput mode, use clipboard for character input - #[cfg(target_os = "linux")] - if !crate::platform::linux::is_x11() && wayland_use_uinput() { - if let Ok(c) = char::try_from(chr) { - input_char_via_clipboard_server(en, c); - } - return; - } - if let Ok(chr) = char::try_from(chr) { en.key_sequence(&chr.to_string()); } } fn process_seq(en: &mut Enigo, sequence: &str) { - // On Wayland with uinput mode, use clipboard for text input - #[cfg(target_os = "linux")] - if !crate::platform::linux::is_x11() && wayland_use_uinput() { - input_text_via_clipboard_server(en, sequence); - return; - } - en.key_sequence(&sequence); } -/// Delay in milliseconds to wait for clipboard to sync on Wayland. -/// This is an empirical value — Wayland provides no callback or event to confirm -/// clipboard content has been received by the compositor. Under heavy system load, -/// this delay may be insufficient, but there is no reliable alternative mechanism. -#[cfg(target_os = "linux")] -const CLIPBOARD_SYNC_DELAY_MS: u64 = 50; - -/// Internal: Set clipboard content without delay. -/// Returns true if clipboard was set successfully. -#[cfg(target_os = "linux")] -fn set_clipboard_content(text: &str) -> bool { - use arboard::{Clipboard, LinuxClipboardKind, SetExtLinux}; - - let mut clipboard = match Clipboard::new() { - Ok(cb) => cb, - Err(e) => { - log::error!("set_clipboard_content: failed to create clipboard: {:?}", e); - return false; - } - }; - - // Set both CLIPBOARD and PRIMARY selections - // Terminal uses PRIMARY for Shift+Insert, GUI apps use CLIPBOARD - if let Err(e) = clipboard - .set() - .clipboard(LinuxClipboardKind::Clipboard) - .text(text.to_owned()) - { - log::error!("set_clipboard_content: failed to set CLIPBOARD: {:?}", e); - return false; - } - if let Err(e) = clipboard - .set() - .clipboard(LinuxClipboardKind::Primary) - .text(text.to_owned()) - { - log::warn!("set_clipboard_content: failed to set PRIMARY: {:?}", e); - // Continue anyway, CLIPBOARD might work - } - - true -} - -/// Set clipboard content for paste operation (sync version for use in blocking contexts). -/// -/// Note: The original clipboard content is intentionally NOT restored after paste. -/// Restoring clipboard could cause race conditions where subsequent keystrokes -/// might accidentally paste the old clipboard content instead of the intended input. -/// This trade-off prioritizes input reliability over preserving clipboard state. -#[cfg(target_os = "linux")] -#[inline] -pub(super) fn set_clipboard_for_paste_sync(text: &str) -> bool { - if !set_clipboard_content(text) { - return false; - } - std::thread::sleep(std::time::Duration::from_millis(CLIPBOARD_SYNC_DELAY_MS)); - true -} - -/// Check if a character is ASCII printable (0x20-0x7E). -#[cfg(target_os = "linux")] -#[inline] -pub(super) fn is_ascii_printable(c: char) -> bool { - c as u32 >= 0x20 && c as u32 <= 0x7E -} - -/// Input a single character via clipboard + Shift+Insert in server process. -#[cfg(target_os = "linux")] -#[inline] -fn input_char_via_clipboard_server(en: &mut Enigo, chr: char) { - input_text_via_clipboard_server(en, &chr.to_string()); -} - -/// Input text via clipboard + Shift+Insert in server process. -/// Shift+Insert is more universal than Ctrl+V, works in both GUI apps and terminals. -/// -/// Note: Clipboard content is NOT restored after paste - see `set_clipboard_for_paste_sync` for rationale. -#[cfg(target_os = "linux")] -fn input_text_via_clipboard_server(en: &mut Enigo, text: &str) { - if text.is_empty() { - return; - } - if !set_clipboard_for_paste_sync(text) { - return; - } - - // Use ENIGO's custom_keyboard directly to avoid creating new IPC connections - // which would cause excessive logging and keyboard device creation/destruction - if en.key_down(Key::Shift).is_err() { - log::error!("input_text_via_clipboard_server: failed to press Shift, skipping paste"); - return; - } - if en.key_down(Key::Raw(XKB_KEY_INSERT)).is_err() { - log::error!("input_text_via_clipboard_server: failed to press Insert, releasing Shift"); - en.key_up(Key::Shift); - return; - } - en.key_up(Key::Raw(XKB_KEY_INSERT)); - en.key_up(Key::Shift); - - // Brief delay to allow the target application to process the paste event. - // Empirical value — no reliable synchronization mechanism exists on Wayland. - std::thread::sleep(std::time::Duration::from_millis(20)); -} - #[cfg(not(target_os = "macos"))] fn release_keys(en: &mut Enigo, to_release: &Vec) { for key in to_release { @@ -1801,64 +1484,6 @@ fn is_function_key(ck: &EnumOrUnknown) -> bool { return res; } -/// Check if any hotkey modifier (Ctrl/Alt/Meta) is currently pressed. -/// Used to detect hotkey combinations like Ctrl+C, Alt+Tab, etc. -/// -/// Note: Shift is intentionally NOT checked here. Shift+character produces a different -/// character (e.g., Shift+a → 'A'), which is normal text input, not a hotkey. -/// Shift is only relevant as a hotkey modifier when combined with Ctrl/Alt/Meta -/// (e.g., Ctrl+Shift+Z), in which case this function already returns true via Ctrl. -#[cfg(target_os = "linux")] -#[inline] -fn is_hotkey_modifier_pressed(en: &mut Enigo) -> bool { - get_modifier_state(Key::Control, en) - || get_modifier_state(Key::RightControl, en) - || get_modifier_state(Key::Alt, en) - || get_modifier_state(Key::RightAlt, en) - || get_modifier_state(Key::Meta, en) - || get_modifier_state(Key::RWin, en) -} - -/// Release Shift keys before character input in Legacy/Translate mode. -/// In these modes, the character has already been converted by the client, -/// so we should input it directly without Shift modifier affecting the result. -/// -/// Note: Does NOT release Shift if hotkey modifiers (Ctrl/Alt/Meta) are pressed, -/// to preserve combinations like Ctrl+Shift+Z. -#[cfg(target_os = "linux")] -fn release_shift_for_char_input(en: &mut Enigo) { - // Don't release Shift if hotkey modifiers (Ctrl/Alt/Meta) are pressed. - // This preserves combinations like Ctrl+Shift+Z. - if is_hotkey_modifier_pressed(en) { - return; - } - - // In translate mode, the client has already converted the keystroke to a character - // (e.g., Shift+a → 'A'). We release Shift here so the server inputs the character - // directly without Shift affecting the result. - // - // Shift is intentionally NOT restored after input — the client will send an explicit - // Shift key_up event when the user physically releases Shift. Restoring it here would - // cause a brief Shift re-press that could interfere with the next input event. - - let is_x11 = crate::platform::linux::is_x11(); - - if get_modifier_state(Key::Shift, en) { - if !is_x11 { - en.key_up(Key::Shift); - } else { - simulate_(&EventType::KeyRelease(RdevKey::ShiftLeft)); - } - } - if get_modifier_state(Key::RightShift, en) { - if !is_x11 { - en.key_up(Key::RightShift); - } else { - simulate_(&EventType::KeyRelease(RdevKey::ShiftRight)); - } - } -} - fn legacy_keyboard_mode(evt: &KeyEvent) { #[cfg(windows)] crate::platform::windows::try_change_desktop(); @@ -1878,24 +1503,11 @@ fn legacy_keyboard_mode(evt: &KeyEvent) { process_control_key(&mut en, &ck, down) } Some(key_event::Union::Chr(chr)) => { - // For character input in Legacy mode, we need to release Shift first. - // The character has already been converted by the client, so we should - // input it directly without Shift modifier affecting the result. - // Only Ctrl/Alt/Meta should be kept for hotkeys like Ctrl+C. - #[cfg(target_os = "linux")] - release_shift_for_char_input(&mut en); - let record_key = chr as u64 + KEY_CHAR_START; record_pressed_key(KeysDown::EnigoKey(record_key), down); - process_chr(&mut en, chr, down, has_hotkey_modifiers(evt)) - } - Some(key_event::Union::Unicode(chr)) => { - // Same as Chr: release Shift for Unicode input - #[cfg(target_os = "linux")] - release_shift_for_char_input(&mut en); - - process_unicode(&mut en, chr) + process_chr(&mut en, chr, down) } + Some(key_event::Union::Unicode(chr)) => process_unicode(&mut en, chr), Some(key_event::Union::Seq(ref seq)) => process_seq(&mut en, seq), _ => {} } @@ -1916,51 +1528,6 @@ fn translate_process_code(code: u32, down: bool) { fn translate_keyboard_mode(evt: &KeyEvent) { match &evt.union { Some(key_event::Union::Seq(seq)) => { - // On Wayland, handle character input directly in this (--server) process using clipboard. - // This function runs in the --server process (logged-in user session), which has - // WAYLAND_DISPLAY and XDG_RUNTIME_DIR — so clipboard operations work here. - // - // Why not let it go through uinput IPC: - // 1. For uinput mode: the uinput service thread runs in the --service (root) process, - // which typically lacks user session environment. Clipboard operations there are - // unreliable. Handling clipboard here avoids that issue. - // 2. For RDP input mode: Portal's notify_keyboard_keysym API interprets keysyms - // based on its internal modifier state, which may not match our released state. - // Using clipboard bypasses this issue entirely. - #[cfg(target_os = "linux")] - if !crate::platform::linux::is_x11() { - let mut en = ENIGO.lock().unwrap(); - - // Check if this is a hotkey (Ctrl/Alt/Meta pressed) - // For hotkeys, we send character-based key events via Enigo instead of - // using the clipboard. This relies on the local keyboard layout for - // mapping characters to physical keys. - // This assumes client and server use the same keyboard layout (common case). - // Note: For non-Latin keyboards (e.g., Arabic), hotkeys may not work - // correctly if the character cannot be mapped to a key via KEY_MAP_LAYOUT. - // This is a known limitation - most common hotkeys (Ctrl+A/C/V/Z) use Latin - // characters which are mappable on most keyboard layouts. - if is_hotkey_modifier_pressed(&mut en) { - // For hotkeys, send character-based key events via Enigo. - // This relies on the local keyboard layout mapping (KEY_MAP_LAYOUT). - for chr in seq.chars() { - if !is_ascii_printable(chr) { - log::warn!( - "Hotkey with non-ASCII character may not work correctly on non-Latin keyboard layouts" - ); - } - en.key_click(Key::Layout(chr)); - } - return; - } - - // Normal text input: release Shift and use clipboard - release_shift_for_char_input(&mut en); - - input_text_via_clipboard_server(&mut en, seq); - return; - } - // Fr -> US // client: Shift + & => 1(send to remote) // remote: Shift + 1 => ! @@ -1978,16 +1545,11 @@ fn translate_keyboard_mode(evt: &KeyEvent) { #[cfg(target_os = "linux")] let simulate_win_hot_key = false; if !simulate_win_hot_key { - #[cfg(target_os = "linux")] - release_shift_for_char_input(&mut en); - #[cfg(target_os = "windows")] - { - if get_modifier_state(Key::Shift, &mut en) { - simulate_(&EventType::KeyRelease(RdevKey::ShiftLeft)); - } - if get_modifier_state(Key::RightShift, &mut en) { - simulate_(&EventType::KeyRelease(RdevKey::ShiftRight)); - } + if get_modifier_state(Key::Shift, &mut en) { + simulate_(&EventType::KeyRelease(RdevKey::ShiftLeft)); + } + if get_modifier_state(Key::RightShift, &mut en) { + simulate_(&EventType::KeyRelease(RdevKey::ShiftRight)); } } for chr in seq.chars() { @@ -2007,16 +1569,7 @@ fn translate_keyboard_mode(evt: &KeyEvent) { Some(key_event::Union::Chr(..)) => { #[cfg(target_os = "windows")] translate_process_code(evt.chr(), evt.down); - #[cfg(target_os = "linux")] - { - if !crate::platform::linux::is_x11() { - // Wayland: use uinput to send raw keycode - wayland_send_raw_key(evt.chr() as u16, evt.down); - } else { - sim_rdev_rawkey_position(evt.chr() as _, evt.down); - } - } - #[cfg(target_os = "macos")] + #[cfg(not(target_os = "windows"))] sim_rdev_rawkey_position(evt.chr() as _, evt.down); } Some(key_event::Union::Unicode(..)) => { @@ -2027,11 +1580,7 @@ fn translate_keyboard_mode(evt: &KeyEvent) { simulate_win2win_hotkey(*code, evt.down); } _ => { - log::debug!( - "Unreachable. Unexpected key event (mode={:?}, down={:?})", - &evt.mode, - &evt.down - ); + log::debug!("Unreachable. Unexpected key event {:?}", &evt); } } } @@ -2223,51 +1772,6 @@ pub fn wayland_use_rdp_input() -> bool { !crate::platform::is_x11() && !crate::is_server() } -#[cfg(target_os = "linux")] -pub struct TemporaryMouseMoveHandle { - thread_handle: Option>, - tx: Option>, -} - -#[cfg(target_os = "linux")] -impl TemporaryMouseMoveHandle { - pub fn new() -> Self { - let (tx, rx) = mpsc::channel::<(i32, i32)>(); - let thread_handle = std::thread::spawn(move || { - log::debug!("TemporaryMouseMoveHandle thread started"); - for (x, y) in rx { - ENIGO.lock().unwrap().mouse_move_to(x, y); - } - log::debug!("TemporaryMouseMoveHandle thread exiting"); - }); - TemporaryMouseMoveHandle { - thread_handle: Some(thread_handle), - tx: Some(tx), - } - } - - pub fn move_mouse_to(&self, x: i32, y: i32) { - if let Some(tx) = &self.tx { - let _ = tx.send((x, y)); - } - } -} - -#[cfg(target_os = "linux")] -impl Drop for TemporaryMouseMoveHandle { - fn drop(&mut self) { - log::debug!("Dropping TemporaryMouseMoveHandle"); - // Close the channel to signal the thread to exit. - self.tx.take(); - // Wait for the thread to finish. - if let Some(thread_handle) = self.thread_handle.take() { - if let Err(e) = thread_handle.join() { - log::error!("Error joining TemporaryMouseMoveHandle thread: {:?}", e); - } - } - } -} - lazy_static::lazy_static! { static ref MODIFIER_MAP: HashMap = [ (ControlKey::Alt, Key::Alt), diff --git a/src/server/login_failure_check.rs b/src/server/login_failure_check.rs deleted file mode 100644 index 4394213ec..000000000 --- a/src/server/login_failure_check.rs +++ /dev/null @@ -1,231 +0,0 @@ -use crate::AlarmAuditType; -use hbb_common::get_time; -#[cfg(target_os = "windows")] -use hbb_common::tokio::sync::{Mutex as TokioMutex, OwnedMutexGuard}; -use std::sync::Mutex; -#[cfg(target_os = "windows")] -use std::sync::Arc; - -const OS_CREDENTIAL_LOGIN_TOTAL_IDLE_RESET_MS: i64 = 120 * 60 * 1_000; -const OS_CREDENTIAL_LOGIN_BACKOFF_BASE_SECONDS: i64 = 15; -const OS_CREDENTIAL_LOGIN_BACKOFF_MAX_SECONDS: i64 = 30 * 60; - -#[derive(Copy, Clone, Debug, Eq, PartialEq)] -pub(crate) enum FailureScope { - Default, - TerminalOsLogin, -} - -pub(crate) struct OsCredentialPolicyDecision { - pub allowed: bool, - pub login_error: Option, - pub audit: Option, -} - -#[derive(Copy, Clone, Debug, Default)] -struct OsCredentialFailureState { - total_failures: i32, - backoff_until_ms: Option, - last_failure_ms: Option, -} - -lazy_static::lazy_static! { - static ref OS_CREDENTIAL_LOGIN_FAILURE_STATE: Mutex = - Mutex::new(OsCredentialFailureState::default()); -} - -#[cfg(target_os = "windows")] -lazy_static::lazy_static! { - static ref OS_CREDENTIAL_LOGIN_MUTEX: Arc> = Arc::new(TokioMutex::new(())); -} - -fn is_os_credential_scope(scope: FailureScope) -> bool { - matches!(scope, FailureScope::TerminalOsLogin) -} - -fn state_for_os_credential_scope( - scope: FailureScope, -) -> Option<&'static Mutex> { - if is_os_credential_scope(scope) { - Some(&OS_CREDENTIAL_LOGIN_FAILURE_STATE) - } else { - None - } -} - -fn backoff_audit_type_for_scope(scope: FailureScope) -> Option { - match scope { - FailureScope::TerminalOsLogin => Some(AlarmAuditType::TerminalOsLoginBackoff), - FailureScope::Default => None, - } -} - -fn os_credential_login_backoff_seconds(total_failures: i32) -> i64 { - if total_failures <= 2 { - return 0; - } - let exp = (total_failures - 3).min(7); - let seconds = OS_CREDENTIAL_LOGIN_BACKOFF_BASE_SECONDS * (1_i64 << exp); - seconds.min(OS_CREDENTIAL_LOGIN_BACKOFF_MAX_SECONDS) -} - -fn normalize_backoff(state: &mut OsCredentialFailureState, now_ms: i64) { - if let Some(until_ms) = state.backoff_until_ms { - if until_ms <= now_ms { - state.backoff_until_ms = None; - } - } -} - -fn reset_totals_on_idle(state: &mut OsCredentialFailureState, now_ms: i64) { - if let Some(last_ms) = state.last_failure_ms { - if now_ms.saturating_sub(last_ms) >= OS_CREDENTIAL_LOGIN_TOTAL_IDLE_RESET_MS { - state.total_failures = 0; - state.backoff_until_ms = None; - state.last_failure_ms = None; - } - } -} - -fn allow_decision() -> OsCredentialPolicyDecision { - OsCredentialPolicyDecision { - allowed: true, - login_error: None, - audit: None, - } -} - -fn block_decision( - login_error: String, - alarm_type: Option, -) -> OsCredentialPolicyDecision { - OsCredentialPolicyDecision { - allowed: false, - login_error: Some(login_error), - audit: alarm_type, - } -} - -pub(crate) fn evaluate_os_credential_policy( - scope: FailureScope, - now_ms: i64, -) -> OsCredentialPolicyDecision { - if !is_os_credential_scope(scope) { - return allow_decision(); - } - let Some(state_mutex) = state_for_os_credential_scope(scope) else { - return allow_decision(); - }; - let mut state = state_mutex.lock().unwrap(); - reset_totals_on_idle(&mut state, now_ms); - normalize_backoff(&mut state, now_ms); - - if let Some(until_ms) = state.backoff_until_ms { - let remaining_ms = (until_ms - now_ms).max(0); - let remaining_seconds = ((remaining_ms + 999) / 1_000).max(1); - let seconds_label = if remaining_seconds == 1 { - "second" - } else { - "seconds" - }; - block_decision( - format!( - "Please try again in {} {}.", - remaining_seconds, seconds_label - ), - backoff_audit_type_for_scope(scope), - ) - } else { - allow_decision() - } -} - -pub(crate) fn record_os_credential_failure(scope: FailureScope) { - if !is_os_credential_scope(scope) { - return; - } - let Some(state_mutex) = state_for_os_credential_scope(scope) else { - return; - }; - let mut state = state_mutex.lock().unwrap(); - let now_ms = get_time(); - reset_totals_on_idle(&mut state, now_ms); - normalize_backoff(&mut state, now_ms); - state.total_failures = state.total_failures.saturating_add(1); - state.last_failure_ms = Some(now_ms); - let backoff_seconds = os_credential_login_backoff_seconds(state.total_failures); - if backoff_seconds > 0 { - state.backoff_until_ms = Some(now_ms + backoff_seconds * 1_000); - } -} - -#[cfg(target_os = "windows")] -pub(crate) fn try_acquire_os_credential_login_gate() -> Result, ()> { - OS_CREDENTIAL_LOGIN_MUTEX - .clone() - .try_lock_owned() - .map_err(|_| ()) -} - -#[cfg(test)] -mod tests { - use super::*; - - static TEST_MUTEX: Mutex<()> = Mutex::new(()); - - fn clear_os_credential_failure_state(scope: FailureScope) { - if let Some(state_mutex) = state_for_os_credential_scope(scope) { - *state_mutex.lock().unwrap() = OsCredentialFailureState::default(); - } - } - - #[test] - fn os_credential_policy_prioritizes_backoff() { - let _guard = TEST_MUTEX.lock().unwrap(); - clear_os_credential_failure_state(FailureScope::TerminalOsLogin); - let now_ms = get_time(); - for _ in 0..3 { - record_os_credential_failure(FailureScope::TerminalOsLogin); - } - let decision = evaluate_os_credential_policy(FailureScope::TerminalOsLogin, now_ms); - assert!(!decision.allowed); - assert!(decision.login_error.is_some()); - clear_os_credential_failure_state(FailureScope::TerminalOsLogin); - } - - #[test] - fn os_credential_policy_idle_window_resets_total_counter() { - let _guard = TEST_MUTEX.lock().unwrap(); - clear_os_credential_failure_state(FailureScope::TerminalOsLogin); - for _ in 0..13 { - record_os_credential_failure(FailureScope::TerminalOsLogin); - } - let blocked = evaluate_os_credential_policy(FailureScope::TerminalOsLogin, get_time()); - assert!(!blocked.allowed); - - let after_failures_ms = get_time(); - let after_idle_ms = after_failures_ms + OS_CREDENTIAL_LOGIN_TOTAL_IDLE_RESET_MS + 1_000; - let allowed = evaluate_os_credential_policy(FailureScope::TerminalOsLogin, after_idle_ms); - assert!(allowed.allowed); - clear_os_credential_failure_state(FailureScope::TerminalOsLogin); - } - - #[test] - fn os_credential_policy_audits_every_backoff_block() { - let _guard = TEST_MUTEX.lock().unwrap(); - clear_os_credential_failure_state(FailureScope::TerminalOsLogin); - - for _ in 0..3 { - record_os_credential_failure(FailureScope::TerminalOsLogin); - } - let now_ms = get_time(); - let first = evaluate_os_credential_policy(FailureScope::TerminalOsLogin, now_ms); - let second = evaluate_os_credential_policy(FailureScope::TerminalOsLogin, now_ms + 1_000); - assert!(!first.allowed); - assert!(!second.allowed); - assert!(first.audit.is_some()); - assert!(second.audit.is_some()); - - clear_os_credential_failure_state(FailureScope::TerminalOsLogin); - } -} diff --git a/src/server/portable_service.rs b/src/server/portable_service.rs index 23b69a70c..4a4eaaad1 100644 --- a/src/server/portable_service.rs +++ b/src/server/portable_service.rs @@ -1,11 +1,3 @@ -use crate::{ - ipc::{self, new_listener, Connection, Data, DataPortableService, IPC_TOKEN_LEN}, - platform::{ - set_path_permission, set_path_permission_for_portable_service_shmem_dir, - set_path_permission_for_portable_service_shmem_file, - validate_path_for_portable_service_shmem_dir, - }, -}; use core::slice; use hbb_common::{ allow_err, @@ -23,26 +15,26 @@ use shared_memory::*; use std::{ mem::size_of, ops::{Deref, DerefMut}, - path::{Path, PathBuf}, - sync::{ - atomic::{AtomicBool, AtomicU64, Ordering}, - Arc, Mutex, - }, + path::Path, + sync::{Arc, Mutex}, time::Duration, }; use winapi::{ shared::minwindef::{BOOL, FALSE, TRUE}, um::winuser::{self, CURSORINFO, PCURSORINFO}, }; -use windows::Win32::Storage::FileSystem::{FILE_GENERIC_EXECUTE, FILE_GENERIC_READ}; + +use crate::{ + ipc::{self, new_listener, Connection, Data, DataPortableService}, + platform::set_path_permission, +}; use super::video_qos; const SIZE_COUNTER: usize = size_of::() * 2; const FRAME_ALIGN: usize = 64; -const ADDR_IPC_TOKEN: usize = 0; -const ADDR_CURSOR_PARA: usize = ADDR_IPC_TOKEN + IPC_TOKEN_LEN; +const ADDR_CURSOR_PARA: usize = 0; const ADDR_CURSOR_COUNTER: usize = ADDR_CURSOR_PARA + size_of::(); const ADDR_CAPTURER_PARA: usize = ADDR_CURSOR_COUNTER + SIZE_COUNTER; @@ -52,186 +44,12 @@ const ADDR_CAPTURE_FRAME_COUNTER: usize = ADDR_CAPTURE_WOULDBLOCK + size_of:: bool { - !name.is_empty() - && name.len() <= SHMEM_NAME_MAX_LEN - && name - .bytes() - .all(|byte| byte.is_ascii_alphanumeric() || byte == b'_' || byte == b'-') -} - -#[inline] -pub fn portable_service_shmem_arg(name: &str) -> String { - format!("{SHMEM_ARG_PREFIX}{name}") -} - -#[inline] -fn is_valid_portable_service_ipc_token(token: &str) -> bool { - token.len() == IPC_TOKEN_LEN - && token - .bytes() - .all(|byte| byte.is_ascii_hexdigit() && !byte.is_ascii_uppercase()) -} - -#[inline] -fn read_ipc_token_from_shmem(shmem: &SharedMemory) -> Option { - if shmem.len() < ADDR_IPC_TOKEN + IPC_TOKEN_LEN { - log::error!( - "Portable service shared memory too small: len={}, need>={}", - shmem.len(), - ADDR_IPC_TOKEN + IPC_TOKEN_LEN - ); - return None; - } - unsafe { - let ptr = shmem.as_ptr().add(ADDR_IPC_TOKEN); - let bytes = slice::from_raw_parts(ptr, IPC_TOKEN_LEN); - let end = bytes - .iter() - .position(|byte| *byte == 0) - .unwrap_or(IPC_TOKEN_LEN); - if end == 0 { - return None; - } - let token = std::str::from_utf8(&bytes[..end]).ok()?.to_owned(); - if is_valid_portable_service_ipc_token(&token) { - Some(token) - } else { - None - } - } -} - -#[inline] -fn validate_runtime_shmem_layout(shmem: &SharedMemory) -> ResultType<()> { - if shmem.len() < MIN_RUNTIME_SHMEM_LEN { - bail!( - "Portable service shared memory too small for runtime layout: len={}, need>={}", - shmem.len(), - MIN_RUNTIME_SHMEM_LEN - ); - } - Ok(()) -} - -#[inline] -fn is_valid_capture_frame_length(shmem_len: usize, frame_len: usize) -> bool { - let frame_capacity = shmem_len.saturating_sub(ADDR_CAPTURE_FRAME); - frame_len > 0 && frame_len <= frame_capacity -} - -#[inline] -fn shared_memory_flink_path_by_name(name: &str) -> ResultType { - let mut dir = crate::platform::user_accessible_folder()?; - dir = dir.join(hbb_common::config::APP_NAME.read().unwrap().clone()); - dir = dir.join(SHMEM_PARENT_DIR); - Ok(dir.join(format!("shared_memory{}", name))) -} - -#[inline] -fn remove_shared_memory_flink_once(name: &str, log_on_error: bool, log_context: &str) -> bool { - let flink = match shared_memory_flink_path_by_name(name) { - Ok(path) => path, - Err(err) => { - if log_on_error { - log::warn!( - "{} failed to resolve portable service shared-memory flink path for '{}': {}", - log_context, - name, - err - ); - } - return false; - } - }; - match std::fs::remove_file(&flink) { - Ok(()) => { - log::info!( - "{} removed portable service shared-memory flink artifact: {:?}", - log_context, - flink - ); - true - } - Err(err) if err.kind() == std::io::ErrorKind::NotFound => true, - Err(err) => { - if log_on_error { - log::warn!( - "{} failed to remove portable service shared-memory flink artifact {:?}: {}", - log_context, - flink, - err - ); - } - false - } - } -} - -#[inline] -fn write_ipc_token_to_shmem(shmem: &SharedMemory, token: &str) -> ResultType<()> { - if !is_valid_portable_service_ipc_token(token) { - bail!("Invalid portable service ipc token"); - } - shmem.write(ADDR_IPC_TOKEN, token.as_bytes()); - Ok(()) -} - -#[inline] -fn clear_ipc_token_in_shmem(shmem: &SharedMemory) { - shmem.write(ADDR_IPC_TOKEN, &[0u8; IPC_TOKEN_LEN]); -} - -#[inline] -fn portable_service_arg_value_candidate_from_arg<'a>( - arg: &'a str, - prefix: &str, -) -> Option<&'a str> { - let mut value = arg.strip_prefix(prefix)?; - value = value.trim_start(); - value = value - .strip_prefix('"') - .or_else(|| value.strip_prefix('\'')) - .unwrap_or(value); - value = value.split_whitespace().next().unwrap_or_default(); - value = value.trim_matches(|c| c == '"' || c == '\''); - Some(value) -} - -#[inline] -pub fn portable_service_shmem_name_from_args() -> Option { - for arg in std::env::args() { - if let Some(value) = portable_service_arg_value_candidate_from_arg(&arg, SHMEM_ARG_PREFIX) { - if is_valid_portable_service_shmem_name(value) { - return Some(value.to_owned()); - } - log::error!( - "Invalid portable service shared memory name argument: '{}'", - value - ); - return None; - } - } - None -} - -#[inline] -pub fn has_portable_service_shmem_arg() -> bool { - std::env::args().any(|arg| arg.starts_with(SHMEM_ARG_PREFIX)) -} - pub struct SharedMemory { inner: Shmem, } @@ -274,27 +92,7 @@ impl SharedMemory { } }; log::info!("Create shared memory, size: {}, flink: {}", size, flink); - if let Err(err) = set_path_permission_for_portable_service_shmem_file(Path::new(&flink)) { - // Release shmem handle first so best-effort flink cleanup has a chance to succeed. - drop(shmem); - match std::fs::remove_file(&flink) { - Ok(()) => { - log::info!( - "Create cleanup removed portable service shared-memory flink artifact: {}", - flink - ); - } - Err(remove_err) if remove_err.kind() == std::io::ErrorKind::NotFound => {} - Err(remove_err) => { - log::warn!( - "Create cleanup failed to remove portable service shared-memory flink artifact {}: {}", - flink, - remove_err - ); - } - } - return Err(err); - } + set_path_permission(Path::new(&flink), "F").ok(); Ok(SharedMemory { inner: shmem }) } @@ -322,18 +120,9 @@ impl SharedMemory { fn flink(name: String) -> ResultType { let mut dir = crate::platform::user_accessible_folder()?; dir = dir.join(hbb_common::config::APP_NAME.read().unwrap().clone()); - dir = dir.join(SHMEM_PARENT_DIR); - let parent_created = !dir.exists(); - if parent_created { - std::fs::create_dir_all(&dir)?; - } - if parent_created || crate::platform::is_root() { - // Harden parent ACL on first provisioning and periodically on SYSTEM path. - set_path_permission_for_portable_service_shmem_dir(&dir)?; - } else { - // Existing parents still need type/reparse validation. Non-SYSTEM callers may lack - // WRITE_DAC on a valid parent, so avoid rebuilding the ACL here. - validate_path_for_portable_service_shmem_dir(&dir)?; + if !dir.exists() { + std::fs::create_dir(&dir)?; + set_path_permission(&dir, "F").ok(); } Ok(dir .join(format!("shared_memory{}", name)) @@ -443,45 +232,16 @@ pub mod server { lazy_static::lazy_static! { static ref EXIT: Arc> = Default::default(); - static ref FORCE_EXIT_ARMED: AtomicBool = AtomicBool::new(false); } pub fn run_portable_service() { - let shmem_name = match portable_service_shmem_name_from_args() { - Some(name) => name, - None => { - if has_portable_service_shmem_arg() { - log::error!( - "Invalid portable service shared memory argument, aborting startup" - ); - } else { - log::error!( - "Missing portable service shared memory argument, aborting startup" - ); - } - return; - } - }; - let shmem = match SharedMemory::open_existing(&shmem_name) { + let shmem = match SharedMemory::open_existing(SHMEM_NAME) { Ok(shmem) => Arc::new(shmem), Err(e) => { log::error!("Failed to open existing shared memory: {:?}", e); return; } }; - if let Err(e) = validate_runtime_shmem_layout(shmem.as_ref()) { - log::error!("{}", e); - return; - } - let ipc_token = match read_ipc_token_from_shmem(shmem.as_ref()) { - Some(token) => token, - None => { - log::error!( - "Missing portable service ipc token in shared memory, aborting startup" - ); - return; - } - }; let shmem1 = shmem.clone(); let shmem2 = shmem.clone(); let mut threads = vec![]; @@ -491,24 +251,17 @@ pub mod server { threads.push(std::thread::spawn(|| { run_capture(shmem2); })); - threads.push(std::thread::spawn(move || { - run_ipc_client(ipc_token); + threads.push(std::thread::spawn(|| { + run_ipc_client(); })); - // Detached shutdown watchdog: - // - gives graceful shutdown/cleanup a short window - // - force-exits the process if workers are still stuck - std::thread::spawn(|| { + threads.push(std::thread::spawn(|| { run_exit_check(); - }); + })); let record_pos_handle = crate::input_service::try_start_record_cursor_pos(); - // Arm forced-exit watchdog only for worker join phase. - // Once join phase completes, cleanup should not be interrupted by forced exit. - FORCE_EXIT_ARMED.store(true, Ordering::SeqCst); for th in threads.drain(..) { th.join().ok(); log::info!("thread joined"); } - FORCE_EXIT_ARMED.store(false, Ordering::SeqCst); crate::input_service::try_stop_record_cursor_pos(); if let Some(handle) = record_pos_handle { @@ -517,47 +270,16 @@ pub mod server { Err(e) => log::error!("record_pos_handle join error {:?}", &e), } } - drop(shmem); - remove_shared_memory_flink_with_retry(&shmem_name); } fn run_exit_check() { - const FORCED_EXIT_DELAY: Duration = Duration::from_secs(3); loop { if EXIT.lock().unwrap().clone() { - break; + std::thread::sleep(Duration::from_millis(50)); + std::process::exit(0); } std::thread::sleep(Duration::from_millis(50)); } - // Fallback only: normal shutdown path should complete and process should exit naturally. - // This forced exit is a last resort when worker threads are stuck and graceful teardown - // does not finish in time. - std::thread::sleep(FORCED_EXIT_DELAY); - if FORCE_EXIT_ARMED.load(Ordering::SeqCst) { - log::warn!( - "Portable service shutdown watchdog fallback triggered: forcing process exit after {:?}", - FORCED_EXIT_DELAY - ); - std::process::exit(0); - } - } - - fn remove_shared_memory_flink_with_retry(name: &str) { - const MAX_RETRY: usize = 20; - const RETRY_INTERVAL: Duration = Duration::from_millis(200); - for attempt in 0..MAX_RETRY { - let is_last_attempt = attempt + 1 == MAX_RETRY; - if remove_shared_memory_flink_once(name, is_last_attempt, "SYSTEM cleanup") { - return; - } - if !is_last_attempt { - std::thread::sleep(RETRY_INTERVAL); - } - } - log::warn!( - "SYSTEM cleanup failed to remove portable service shared-memory flink artifact '{}' after retry", - name - ); } fn run_get_cursor_info(shmem: Arc) { @@ -664,17 +386,6 @@ pub mod server { match c.as_mut().map(|f| f.frame(spf)) { Some(Ok(f)) => match f { Frame::PixelBuffer(f) => { - let frame_capacity = shmem.len().saturating_sub(ADDR_CAPTURE_FRAME); - if f.data().len() > frame_capacity { - log::error!( - "Portable service capture frame exceeds shared memory capacity: frame_len={}, capacity={}, shmem_len={}", - f.data().len(), - frame_capacity, - shmem.len() - ); - *EXIT.lock().unwrap() = true; - return; - } utils::set_frame_info( &shmem, FrameInfo { @@ -725,33 +436,17 @@ pub mod server { } #[tokio::main(flavor = "current_thread")] - async fn run_ipc_client(ipc_token: String) { + async fn run_ipc_client() { use DataPortableService::*; let postfix = IPC_SUFFIX; match ipc::connect(1000, postfix).await { Ok(mut stream) => { - if let Err(err) = - ipc::portable_service_ipc_handshake_as_client(&mut stream, &ipc_token).await - { - log::error!("portable service ipc handshake failed: {}", err); - *EXIT.lock().unwrap() = true; - return; - } let mut timer = crate::rustdesk_interval(tokio::time::interval(Duration::from_secs(1))); let mut nack = 0; loop { - if *EXIT.lock().unwrap() { - log::info!("Portable service EXIT signaled, closing ipc client loop"); - stream - .send(&Data::DataPortableService(WillClose)) - .await - .ok(); - break; - } - tokio::select! { res = stream.next() => { match res { @@ -781,9 +476,9 @@ pub mod server { break; } } - Mouse((v, conn, username, argb, simulate, show_cursor)) => { + Mouse((v, conn)) => { if let Ok(evt) = MouseEvent::parse_from_bytes(&v) { - crate::input_service::handle_mouse_(&evt, conn, username, argb, simulate, show_cursor); + crate::input_service::handle_mouse_(&evt, conn); } } Pointer((v, conn)) => { @@ -831,11 +526,7 @@ pub mod client { lazy_static::lazy_static! { static ref RUNNING: Arc> = Default::default(); - static ref STARTING: Arc> = Default::default(); - static ref STARTING_TOKEN: AtomicU64 = AtomicU64::new(0); static ref SHMEM: Arc>> = Default::default(); - static ref SHMEM_RUNTIME_NAME: Arc>> = Default::default(); - static ref IPC_RUNTIME_TOKEN: Arc>> = Default::default(); static ref SENDER : Mutex> = Mutex::new(client::start_ipc_server()); static ref QUICK_SUPPORT: Arc> = Default::default(); } @@ -845,176 +536,12 @@ pub mod client { Logon(String, String), } - fn has_running_portable_service_process() -> bool { - let app_exe = format!("{}.exe", crate::get_app_name().to_lowercase()); - !crate::platform::get_pids_of_process_with_first_arg(&app_exe, "--portable-service") - .is_empty() - } - - #[inline] - fn next_portable_service_shmem_name() -> String { - format!( - "{}_{}_{:08x}", - crate::portable_service::SHMEM_NAME, - std::process::id(), - hbb_common::rand::random::() - ) - } - - #[inline] - fn set_runtime_ipc_token(token: String) { - *IPC_RUNTIME_TOKEN.lock().unwrap() = Some(token); - } - - #[inline] - fn schedule_remove_runtime_shmem_flink_retry(name: String) { - std::thread::spawn(move || { - const MAX_RETRY: usize = 20; - const RETRY_INTERVAL: Duration = Duration::from_millis(200); - for _ in 0..MAX_RETRY { - std::thread::sleep(RETRY_INTERVAL); - if remove_shared_memory_flink_once(&name, false, "Client cleanup") { - return; - } - } - log::warn!( - "Failed to remove portable service shared-memory flink artifact '{}' after retry", - name - ); - }); - } - - #[inline] - fn clear_runtime_shmem_state() { - let mut runtime_token = IPC_RUNTIME_TOKEN.lock().unwrap(); - let mut shmem_lock = SHMEM.lock().unwrap(); - if let Some(shmem) = shmem_lock.as_mut() { - clear_ipc_token_in_shmem(shmem); - } - *shmem_lock = None; - let runtime_name = SHMEM_RUNTIME_NAME.lock().unwrap().take(); - *runtime_token = None; - drop(runtime_token); - drop(shmem_lock); - if let Some(name) = runtime_name.as_deref() { - if !remove_shared_memory_flink_once(name, true, "Client cleanup") { - schedule_remove_runtime_shmem_flink_retry(name.to_owned()); - } - } - } - - #[inline] - fn consume_runtime_ipc_token_if_match(candidate: &str) -> (bool, Option) { - let mut token = IPC_RUNTIME_TOKEN.lock().unwrap(); - if !token - .as_deref() - .is_some_and(|expected| ipc::constant_time_ipc_token_eq(expected, candidate)) - { - return (false, None); - } - let mut shmem_lock = SHMEM.lock().unwrap(); - let matched_shmem_name = SHMEM_RUNTIME_NAME.lock().unwrap().clone(); - *token = None; - if let Some(shmem) = shmem_lock.as_mut() { - clear_ipc_token_in_shmem(shmem); - } - (true, matched_shmem_name) - } - - #[inline] - fn restore_runtime_ipc_token_after_failed_handshake( - token: &str, - expected_shmem_name: Option<&str>, - ) { - let mut runtime_token = IPC_RUNTIME_TOKEN.lock().unwrap(); - if let Some(current) = runtime_token.as_deref() { - if current != token { - log::debug!( - "Skip restoring portable service ipc token after handshake failure: runtime token has changed to a newer value" - ); - return; - } - } - let mut shmem_lock = SHMEM.lock().unwrap(); - let current_shmem_name = SHMEM_RUNTIME_NAME.lock().unwrap().clone(); - if current_shmem_name.as_deref() != expected_shmem_name { - if runtime_token.as_deref() == Some(token) { - *runtime_token = None; - } - log::debug!( - "Skip restoring portable service ipc token after handshake failure: shared-memory instance has changed" - ); - return; - } - let shmem_write_error = if let Some(shmem) = shmem_lock.as_mut() { - write_ipc_token_to_shmem(shmem, token) - .err() - .map(|err| err.to_string()) - } else { - Some("shared memory unavailable".to_owned()) - }; - if let Some(err) = shmem_write_error { - if runtime_token.as_deref() == Some(token) { - *runtime_token = None; - } - log::warn!( - "Failed to restore portable service ipc token after handshake failure: {}", - err - ); - return; - } - *runtime_token = Some(token.to_owned()); - } - - #[inline] - fn schedule_starting_timeout_reset(launch_token: u64) { - std::thread::spawn(move || { - std::thread::sleep(PORTABLE_SERVICE_STARTUP_TIMEOUT); - let should_reset = { - // Guard against stale watchdogs from previous launches: - // only the watchdog that matches the latest STARTING_TOKEN may reset STARTING. - let current_token = STARTING_TOKEN.load(Ordering::SeqCst); - // Keep lock guards in explicit short scopes to make it obvious - // there is no nested lock ordering (and to avoid Copilot false positives). - let starting = { *STARTING.lock().unwrap() }; - let running = { *RUNNING.lock().unwrap() }; - current_token == launch_token && starting && !running - }; - if should_reset { - log::warn!( - "Portable service startup timeout before IPC ready, reset STARTING state" - ); - *STARTING.lock().unwrap() = false; - } - }); - } - - // Launch flow summary: - // 1) Prepare/reset runtime shared memory + IPC token. - // 2) Start helper process (direct or logon) with shmem argument. - // 3) Keep STARTING=true until IPC ping/pong marks RUNNING, or timeout watchdog resets it. pub(crate) fn start_portable_service(para: StartPara) -> ResultType<()> { log::info!("start portable service"); - let launch_token = { - // Keep lock guards in explicit short scopes to make it obvious - // there is no nested lock ordering (and to avoid Copilot false positives). - let running = { *RUNNING.lock().unwrap() }; - let mut starting = STARTING.lock().unwrap(); - if *starting && !running && !has_running_portable_service_process() { - log::warn!( - "Detected stale portable service STARTING state without running process, reset it" - ); - *starting = false; - } - if *starting || running { - bail!("already running"); - } - *starting = true; - STARTING_TOKEN.fetch_add(1, Ordering::SeqCst) + 1 - }; - let start_result = (|| -> ResultType<()> { - clear_runtime_shmem_state(); - let mut shmem_lock = SHMEM.lock().unwrap(); + if RUNNING.lock().unwrap().clone() { + bail!("already running"); + } + if SHMEM.lock().unwrap().is_none() { let displays = scrap::Display::all()?; if displays.is_empty() { bail!("no display available!"); @@ -1031,153 +558,84 @@ pub mod client { } } } - let shmem_size = - utils::align(ADDR_CAPTURE_FRAME + max_pixel * 4, align).max(MIN_RUNTIME_SHMEM_LEN); - let shmem_name = next_portable_service_shmem_name(); - if !is_valid_portable_service_shmem_name(&shmem_name) { - bail!("Generated invalid portable service shared memory name"); - } - let ipc_token = ipc::generate_one_time_ipc_token()?; + let shmem_size = utils::align(ADDR_CAPTURE_FRAME + max_pixel * 4, align); // os error 112, no enough space - *shmem_lock = Some(crate::portable_service::SharedMemory::create( - &shmem_name, + *SHMEM.lock().unwrap() = Some(crate::portable_service::SharedMemory::create( + crate::portable_service::SHMEM_NAME, shmem_size, )?); - *SHMEM_RUNTIME_NAME.lock().unwrap() = Some(shmem_name); shutdown_hooks::add_shutdown_hook(drop_portable_service_shared_memory); - let shmem_name = SHMEM_RUNTIME_NAME - .lock() - .unwrap() - .clone() - .ok_or_else(|| anyhow!("portable service shared memory name is unavailable"))?; - let init_token_result = if let Some(shmem) = shmem_lock.as_mut() { - unsafe { - libc::memset(shmem.as_ptr() as _, 0, shmem.len() as _); - } - write_ipc_token_to_shmem(shmem, &ipc_token) - } else { - Ok(()) - }; - if let Err(e) = init_token_result { - drop(shmem_lock); - clear_runtime_shmem_state(); - bail!( - "Failed to initialize portable service ipc token in shared memory: {}", - e - ); - }; - drop(shmem_lock); - set_runtime_ipc_token(ipc_token.clone()); - let portable_service_arg = format!( - "--portable-service {}", - crate::portable_service::portable_service_shmem_arg(&shmem_name) - ); - { - let _sender = SENDER.lock().unwrap(); - } - match para { - StartPara::Direct => { - match crate::platform::run_background( - &std::env::current_exe()?.to_string_lossy().to_string(), - &portable_service_arg, - ) { - Ok(true) => {} - Ok(false) => { - clear_runtime_shmem_state(); - bail!("Failed to run portable service process"); - } - Err(e) => { - clear_runtime_shmem_state(); - bail!("Failed to run portable service process: {}", e); - } - } - } - StartPara::Logon(username, password) => { - #[allow(unused_mut)] - let mut exe = std::env::current_exe()?.to_string_lossy().to_string(); - #[cfg(feature = "flutter")] - { - if let Some(dir) = Path::new(&exe).parent() { - if let Err(err) = set_path_permission( - Path::new(dir), - FILE_GENERIC_READ.0 | FILE_GENERIC_EXECUTE.0, - ) { - clear_runtime_shmem_state(); - bail!("Failed to set permission of {:?}: {}", dir, err); - } - } - } - #[cfg(not(feature = "flutter"))] - if let Some((dir, dst)) = - crate::platform::windows::portable_service_logon_helper_paths() - { - let cleanup_helper_artifacts = || { - if Path::new(&exe) != dst { - std::fs::remove_file(&dst).ok(); - } - std::fs::remove_dir(&dir).ok(); - }; - let mut use_logon_helper_exe = false; - if let Err(err) = std::fs::create_dir_all(&dir) { - log::warn!( - "Failed to create portable service logon helper dir {:?}: {}", - dir, - err - ); - } else if let Err(err) = std::fs::copy(&exe, &dst) { - log::warn!( - "Failed to copy portable service logon helper binary from '{}' to {:?}: {}", - exe, - dst, - err - ); - cleanup_helper_artifacts(); - } else if !dst.exists() { - log::warn!( - "Portable service logon helper binary missing after copy: {:?}", - dst - ); - cleanup_helper_artifacts(); - } else if let Err(err) = - set_path_permission(&dir, FILE_GENERIC_READ.0 | FILE_GENERIC_EXECUTE.0) - { - log::warn!( - "Failed to set portable service logon helper path permission for {:?}: {}", - dir, - err - ); - cleanup_helper_artifacts(); - } else { - use_logon_helper_exe = true; - } - if use_logon_helper_exe { - exe = dst.to_string_lossy().to_string(); - } - } - if let Err(e) = crate::platform::windows::create_process_with_logon( - username.as_str(), - password.as_str(), - &exe, - &portable_service_arg, - ) { - clear_runtime_shmem_state(); - bail!("Failed to run portable service process: {}", e); - } - } - } - schedule_starting_timeout_reset(launch_token); - Ok(()) - })(); - if start_result.is_err() { - *STARTING.lock().unwrap() = false; } - start_result + if let Some(shmem) = SHMEM.lock().unwrap().as_mut() { + unsafe { + libc::memset(shmem.as_ptr() as _, 0, shmem.len() as _); + } + } + match para { + StartPara::Direct => { + if let Err(e) = crate::platform::run_background( + &std::env::current_exe()?.to_string_lossy().to_string(), + "--portable-service", + ) { + *SHMEM.lock().unwrap() = None; + bail!("Failed to run portable service process: {}", e); + } + } + StartPara::Logon(username, password) => { + #[allow(unused_mut)] + let mut exe = std::env::current_exe()?.to_string_lossy().to_string(); + #[cfg(feature = "flutter")] + { + if let Some(dir) = Path::new(&exe).parent() { + if set_path_permission(Path::new(dir), "RX").is_err() { + *SHMEM.lock().unwrap() = None; + bail!("Failed to set permission of {:?}", dir); + } + } + } + #[cfg(not(feature = "flutter"))] + match hbb_common::directories_next::UserDirs::new() { + Some(user_dir) => { + let dir = user_dir + .home_dir() + .join("AppData") + .join("Local") + .join("rustdesk-sciter"); + if std::fs::create_dir_all(&dir).is_ok() { + let dst = dir.join("rustdesk.exe"); + if std::fs::copy(&exe, &dst).is_ok() { + if dst.exists() { + if set_path_permission(&dir, "RX").is_ok() { + exe = dst.to_string_lossy().to_string(); + } + } + } + } + } + None => {} + } + if let Err(e) = crate::platform::windows::create_process_with_logon( + username.as_str(), + password.as_str(), + &exe, + "--portable-service", + ) { + *SHMEM.lock().unwrap() = None; + bail!("Failed to run portable service process: {}", e); + } + } + } + let _sender = SENDER.lock().unwrap(); + Ok(()) } pub extern "C" fn drop_portable_service_shared_memory() { // https://stackoverflow.com/questions/35980148/why-does-an-atexit-handler-panic-when-it-accesses-stdout // Please make sure there is no print in the call stack - clear_runtime_shmem_state(); + let mut lock = SHMEM.lock().unwrap(); + if lock.is_some() { + *lock = None; + } } pub fn set_quick_support(v: bool) { @@ -1197,11 +655,7 @@ pub mod client { let mut option = SHMEM.lock().unwrap(); if let Some(shmem) = option.as_mut() { unsafe { - libc::memset( - shmem.as_ptr().add(ADDR_CURSOR_PARA) as _, - 0, - shmem.len().saturating_sub(ADDR_CURSOR_PARA) as _, - ); + libc::memset(shmem.as_ptr() as _, 0, shmem.len() as _); } utils::set_para( shmem, @@ -1248,19 +702,6 @@ pub mod client { if utils::counter_ready(base.add(ADDR_CAPTURE_FRAME_COUNTER)) { let frame_info_ptr = shmem.as_ptr().add(ADDR_CAPTURE_FRAME_INFO); let frame_info = frame_info_ptr as *const FrameInfo; - let frame_len = (*frame_info).length; - if !is_valid_capture_frame_length(shmem.len(), frame_len) { - log::error!( - "Portable service frame length exceeds shared memory capacity: frame_len={}, shmem_len={}, frame_addr={}", - frame_len, - shmem.len(), - ADDR_CAPTURE_FRAME - ); - return Err(std::io::Error::new( - std::io::ErrorKind::InvalidData, - "invalid portable service frame length".to_string(), - )); - } if (*frame_info).width != self.width || (*frame_info).height != self.height { log::info!( "skip frame, ({},{}) != ({},{})", @@ -1275,7 +716,7 @@ pub mod client { )); } let frame_ptr = base.add(ADDR_CAPTURE_FRAME); - let data = slice::from_raw_parts(frame_ptr, frame_len); + let data = slice::from_raw_parts(frame_ptr, (*frame_info).length); Ok(Frame::PixelBuffer(PixelBuffer::with_BGRA( data, self.width, @@ -1337,49 +778,10 @@ pub mod client { Some(result) = incoming.next() => { match result { Ok(stream) => { - let mut stream = Connection::new(stream); - if !ipc::authorize_windows_portable_service_ipc_connection( - &stream, postfix, - ) { - continue; - } - let mut consumed_token: Option = None; - let mut consumed_token_shmem_name: Option = None; - let handshake_result = - ipc::portable_service_ipc_handshake_as_server( - &mut stream, - |token| { - let (matched, matched_shmem_name) = - consume_runtime_ipc_token_if_match(token); - if matched { - consumed_token = Some(token.to_owned()); - consumed_token_shmem_name = matched_shmem_name; - true - } else { - false - } - }, - ) - .await; - if let Err(err) = handshake_result { - if let Some(token) = consumed_token.as_deref() { - restore_runtime_ipc_token_after_failed_handshake( - token, - consumed_token_shmem_name.as_deref(), - ); - *STARTING.lock().unwrap() = false; - } - log::warn!( - "Rejected portable service ipc connection due to token handshake failure: postfix={}, err={}", - postfix, - err - ); - continue; - } log::info!("Got portable service ipc connection"); let rx_clone = rx.clone(); tokio::spawn(async move { - let mut stream = stream; + let mut stream = Connection::new(stream); let postfix = postfix.to_owned(); let mut timer = crate::rustdesk_interval(tokio::time::interval(Duration::from_secs(1))); let mut nack = 0; @@ -1403,7 +805,6 @@ pub mod client { Pong => { nack = 0; *RUNNING.lock().unwrap() = true; - *STARTING.lock().unwrap() = false; }, ConnCount(None) => { if !quick_support { @@ -1440,7 +841,6 @@ pub mod client { } } *RUNNING.lock().unwrap() = false; - *STARTING.lock().unwrap() = false; }); } Err(err) => { @@ -1475,23 +875,11 @@ pub mod client { } } - fn handle_mouse_( - evt: &MouseEvent, - conn: i32, - username: String, - argb: u32, - simulate: bool, - show_cursor: bool, - ) -> ResultType<()> { + fn handle_mouse_(evt: &MouseEvent, conn: i32) -> ResultType<()> { let mut v = vec![]; evt.write_to_vec(&mut v)?; ipc_send(Data::DataPortableService(DataPortableService::Mouse(( - v, - conn, - username, - argb, - simulate, - show_cursor, + v, conn, )))) } @@ -1539,19 +927,12 @@ pub mod client { } } - pub fn handle_mouse( - evt: &MouseEvent, - conn: i32, - username: String, - argb: u32, - simulate: bool, - show_cursor: bool, - ) { + pub fn handle_mouse(evt: &MouseEvent, conn: i32) { if RUNNING.lock().unwrap().clone() { crate::input_service::update_latest_input_cursor_time(conn); - handle_mouse_(evt, conn, username, argb, simulate, show_cursor).ok(); + handle_mouse_(evt, conn).ok(); } else { - crate::input_service::handle_mouse_(evt, conn, username, argb, simulate, show_cursor); + crate::input_service::handle_mouse_(evt, conn); } } @@ -1590,23 +971,3 @@ pub struct FrameInfo { width: usize, height: usize, } - -#[cfg(test)] -mod tests { - use super::{is_valid_capture_frame_length, ADDR_CAPTURE_FRAME}; - - #[test] - fn test_is_valid_capture_frame_length_rejects_zero_length() { - assert!(!is_valid_capture_frame_length(ADDR_CAPTURE_FRAME + 1024, 0)); - } - - #[test] - fn test_is_valid_capture_frame_length_rejects_out_of_bounds_length() { - assert!(!is_valid_capture_frame_length(ADDR_CAPTURE_FRAME + 16, 17)); - } - - #[test] - fn test_is_valid_capture_frame_length_accepts_in_bounds_length() { - assert!(is_valid_capture_frame_length(ADDR_CAPTURE_FRAME + 16, 16)); - } -} diff --git a/src/server/rdp_input.rs b/src/server/rdp_input.rs index 5348f2f24..910a19276 100644 --- a/src/server/rdp_input.rs +++ b/src/server/rdp_input.rs @@ -1,8 +1,7 @@ -use super::input_service::set_clipboard_for_paste_sync; -use crate::uinput::service::{can_input_via_keysym, char_to_keysym, map_key}; +use crate::uinput::service::map_key; use dbus::{blocking::SyncConnection, Path}; use enigo::{Key, KeyboardControllable, MouseButton, MouseControllable}; -use hbb_common::{log, ResultType}; +use hbb_common::ResultType; use scrap::wayland::pipewire::{get_portal, PwStreamInfo}; use scrap::wayland::remote_desktop_portal::OrgFreedesktopPortalRemoteDesktop as remote_desktop_portal; use std::collections::HashMap; @@ -20,74 +19,14 @@ pub mod client { const PRESSED_DOWN_STATE: u32 = 1; const PRESSED_UP_STATE: u32 = 0; - /// Modifier key state tracking for RDP input. - /// Portal API doesn't provide a way to query key state, so we track it ourselves. - #[derive(Default)] - struct ModifierState { - shift_left: bool, - shift_right: bool, - ctrl_left: bool, - ctrl_right: bool, - alt_left: bool, - alt_right: bool, - meta_left: bool, - meta_right: bool, - } - - impl ModifierState { - fn update(&mut self, key: &Key, down: bool) { - match key { - Key::Shift => self.shift_left = down, - Key::RightShift => self.shift_right = down, - Key::Control => self.ctrl_left = down, - Key::RightControl => self.ctrl_right = down, - Key::Alt => self.alt_left = down, - Key::RightAlt => self.alt_right = down, - Key::Meta | Key::Super | Key::Windows | Key::Command => self.meta_left = down, - Key::RWin => self.meta_right = down, - // Handle raw keycodes for modifier keys (Linux evdev codes + 8) - // In translate mode, modifier keys may be sent as Chr events with raw keycodes. - // The +8 offset converts evdev codes to X11/XKB keycodes. - Key::Raw(code) => { - const EVDEV_OFFSET: u16 = 8; - const KEY_LEFTSHIFT: u16 = evdev::Key::KEY_LEFTSHIFT.code() + EVDEV_OFFSET; - const KEY_RIGHTSHIFT: u16 = evdev::Key::KEY_RIGHTSHIFT.code() + EVDEV_OFFSET; - const KEY_LEFTCTRL: u16 = evdev::Key::KEY_LEFTCTRL.code() + EVDEV_OFFSET; - const KEY_RIGHTCTRL: u16 = evdev::Key::KEY_RIGHTCTRL.code() + EVDEV_OFFSET; - const KEY_LEFTALT: u16 = evdev::Key::KEY_LEFTALT.code() + EVDEV_OFFSET; - const KEY_RIGHTALT: u16 = evdev::Key::KEY_RIGHTALT.code() + EVDEV_OFFSET; - const KEY_LEFTMETA: u16 = evdev::Key::KEY_LEFTMETA.code() + EVDEV_OFFSET; - const KEY_RIGHTMETA: u16 = evdev::Key::KEY_RIGHTMETA.code() + EVDEV_OFFSET; - match *code { - KEY_LEFTSHIFT => self.shift_left = down, - KEY_RIGHTSHIFT => self.shift_right = down, - KEY_LEFTCTRL => self.ctrl_left = down, - KEY_RIGHTCTRL => self.ctrl_right = down, - KEY_LEFTALT => self.alt_left = down, - KEY_RIGHTALT => self.alt_right = down, - KEY_LEFTMETA => self.meta_left = down, - KEY_RIGHTMETA => self.meta_right = down, - _ => {} - } - } - _ => {} - } - } - } - pub struct RdpInputKeyboard { conn: Arc, session: Path<'static>, - modifier_state: ModifierState, } impl RdpInputKeyboard { pub fn new(conn: Arc, session: Path<'static>) -> ResultType { - Ok(Self { - conn, - session, - modifier_state: ModifierState::default(), - }) + Ok(Self { conn, session }) } } @@ -100,192 +39,29 @@ pub mod client { self } - fn get_key_state(&mut self, key: Key) -> bool { - // Use tracked modifier state for supported keys - match key { - Key::Shift => self.modifier_state.shift_left, - Key::RightShift => self.modifier_state.shift_right, - Key::Control => self.modifier_state.ctrl_left, - Key::RightControl => self.modifier_state.ctrl_right, - Key::Alt => self.modifier_state.alt_left, - Key::RightAlt => self.modifier_state.alt_right, - Key::Meta | Key::Super | Key::Windows | Key::Command => { - self.modifier_state.meta_left - } - Key::RWin => self.modifier_state.meta_right, - _ => false, - } + fn get_key_state(&mut self, _: Key) -> bool { + // no api for this + false } fn key_sequence(&mut self, s: &str) { for c in s.chars() { - let keysym = char_to_keysym(c); - // ASCII characters: use keysym - if can_input_via_keysym(c, keysym) { - if let Err(e) = send_keysym(keysym, true, self.conn.clone(), &self.session) { - log::error!("Failed to send keysym down: {:?}", e); - } - if let Err(e) = send_keysym(keysym, false, self.conn.clone(), &self.session) { - log::error!("Failed to send keysym up: {:?}", e); - } - } else { - // Non-ASCII: use clipboard - input_text_via_clipboard(&c.to_string(), self.conn.clone(), &self.session); - } + let key = Key::Layout(c); + let _ = handle_key(true, key, self.conn.clone(), &self.session); + let _ = handle_key(false, key, self.conn.clone(), &self.session); } } fn key_down(&mut self, key: Key) -> enigo::ResultType { - if let Key::Layout(chr) = key { - let keysym = char_to_keysym(chr); - // ASCII characters: use keysym - if can_input_via_keysym(chr, keysym) { - send_keysym(keysym, true, self.conn.clone(), &self.session)?; - } else { - // Non-ASCII: use clipboard (complete key press in key_down) - input_text_via_clipboard(&chr.to_string(), self.conn.clone(), &self.session); - } - } else { - handle_key(true, key.clone(), self.conn.clone(), &self.session)?; - // Update modifier state only after successful send — - // if handle_key fails, we don't want stale "pressed" state - // affecting subsequent key event decisions. - self.modifier_state.update(&key, true); - } + handle_key(true, key, self.conn.clone(), &self.session)?; Ok(()) } - fn key_up(&mut self, key: Key) { - // Intentionally asymmetric with key_down: update state BEFORE sending. - // On release, we always mark as released even if the send fails below, - // to avoid permanently stuck-modifier state in our tracker. The trade-off - // (tracker says "released" while OS may still have it pressed) is acceptable - // because such failures are rare and subsequent events will resynchronize. - self.modifier_state.update(&key, false); - - if let Key::Layout(chr) = key { - // ASCII characters: send keysym up if we also sent it on key_down - let keysym = char_to_keysym(chr); - if can_input_via_keysym(chr, keysym) { - if let Err(e) = send_keysym(keysym, false, self.conn.clone(), &self.session) - { - log::error!("Failed to send keysym up: {:?}", e); - } - } - // Non-ASCII: already handled completely in key_down via clipboard paste, - // no corresponding release needed (clipboard paste is an atomic operation) - } else { - if let Err(e) = handle_key(false, key, self.conn.clone(), &self.session) { - log::error!("Failed to handle key up: {:?}", e); - } - } + let _ = handle_key(false, key, self.conn.clone(), &self.session); } - fn key_click(&mut self, key: Key) { - if let Key::Layout(chr) = key { - let keysym = char_to_keysym(chr); - // ASCII characters: use keysym - if can_input_via_keysym(chr, keysym) { - if let Err(e) = send_keysym(keysym, true, self.conn.clone(), &self.session) { - log::error!("Failed to send keysym down: {:?}", e); - } - if let Err(e) = send_keysym(keysym, false, self.conn.clone(), &self.session) { - log::error!("Failed to send keysym up: {:?}", e); - } - } else { - // Non-ASCII: use clipboard - input_text_via_clipboard(&chr.to_string(), self.conn.clone(), &self.session); - } - } else { - if let Err(e) = handle_key(true, key.clone(), self.conn.clone(), &self.session) { - log::error!("Failed to handle key down: {:?}", e); - } else { - // Only mark modifier as pressed if key-down was actually delivered - self.modifier_state.update(&key, true); - } - // Always mark as released to avoid stuck-modifier state - self.modifier_state.update(&key, false); - if let Err(e) = handle_key(false, key, self.conn.clone(), &self.session) { - log::error!("Failed to handle key up: {:?}", e); - } - } - } - } - - /// Input text via clipboard + Shift+Insert. - /// Shift+Insert is more universal than Ctrl+V, works in both GUI apps and terminals. - /// - /// Note: Clipboard content is NOT restored after paste - see `set_clipboard_for_paste_sync` for rationale. - fn input_text_via_clipboard(text: &str, conn: Arc, session: &Path<'static>) { - if text.is_empty() { - return; - } - if !set_clipboard_for_paste_sync(text) { - return; - } - - let portal = get_portal(&conn); - let shift_keycode = evdev::Key::KEY_LEFTSHIFT.code() as i32; - let insert_keycode = evdev::Key::KEY_INSERT.code() as i32; - - // Send Shift+Insert (universal paste shortcut) - if let Err(e) = remote_desktop_portal::notify_keyboard_keycode( - &portal, - session, - HashMap::new(), - shift_keycode, - PRESSED_DOWN_STATE, - ) { - log::error!("input_text_via_clipboard: failed to press Shift: {:?}", e); - return; - } - - // Press Insert - if let Err(e) = remote_desktop_portal::notify_keyboard_keycode( - &portal, - session, - HashMap::new(), - insert_keycode, - PRESSED_DOWN_STATE, - ) { - log::error!("input_text_via_clipboard: failed to press Insert: {:?}", e); - // Still try to release Shift. - // Note: clipboard has already been set by set_clipboard_for_paste_sync but paste - // never happened. We don't attempt to restore the previous clipboard contents - // because reading the clipboard on Wayland requires focus/permission. - let _ = remote_desktop_portal::notify_keyboard_keycode( - &portal, - session, - HashMap::new(), - shift_keycode, - PRESSED_UP_STATE, - ); - return; - } - - // Release Insert - if let Err(e) = remote_desktop_portal::notify_keyboard_keycode( - &portal, - session, - HashMap::new(), - insert_keycode, - PRESSED_UP_STATE, - ) { - log::error!( - "input_text_via_clipboard: failed to release Insert: {:?}", - e - ); - } - - // Release Shift - if let Err(e) = remote_desktop_portal::notify_keyboard_keycode( - &portal, - session, - HashMap::new(), - shift_keycode, - PRESSED_UP_STATE, - ) { - log::error!("input_text_via_clipboard: failed to release Shift: {:?}", e); + let _ = handle_key(true, key, self.conn.clone(), &self.session); + let _ = handle_key(false, key, self.conn.clone(), &self.session); } } @@ -295,7 +71,6 @@ pub mod client { stream: PwStreamInfo, resolution: (usize, usize), scale: Option, - position: (f64, f64), } impl RdpInputMouse { @@ -308,7 +83,7 @@ pub mod client { // https://github.com/rustdesk/rustdesk/pull/9019#issuecomment-2295252388 // There may be a bug in Rdp input on Gnome util Ubuntu 24.04 (Gnome 46) // - // eg. Resolution 800x600, Fractional scale: 200% (logic size: 400x300) + // eg. Resultion 800x600, Fractional scale: 200% (logic size: 400x300) // https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.impl.portal.RemoteDesktop.html#:~:text=new%20pointer%20position-,in%20the%20streams%20logical%20coordinate%20space,-. // Then (x,y) in `mouse_move_to()` and `mouse_move_relative()` should be scaled to the logic size(stream.get_size()), which is from (0,0) to (400,300). // For Ubuntu 24.04(Gnome 46), (x,y) is restricted from (0,0) to (400,300), but the actual range in screen is: @@ -323,14 +98,12 @@ pub mod client { } else { None }; - let pos = stream.get_position(); Ok(Self { conn, session, stream, resolution, scale, - position: (pos.0 as f64, pos.1 as f64), }) } } @@ -355,8 +128,6 @@ pub mod client { } else { y as f64 }; - let x = x - self.position.0; - let y = y - self.position.1; let portal = get_portal(&self.conn); let _ = remote_desktop_portal::notify_pointer_motion_absolute( &portal, @@ -420,39 +191,6 @@ pub mod client { } } - /// Send a keysym via RemoteDesktop portal. - fn send_keysym( - keysym: i32, - down: bool, - conn: Arc, - session: &Path<'static>, - ) -> ResultType<()> { - let state: u32 = if down { - PRESSED_DOWN_STATE - } else { - PRESSED_UP_STATE - }; - let portal = get_portal(&conn); - log::trace!( - "send_keysym: calling notify_keyboard_keysym, keysym={:#x}, state={}", - keysym, - state - ); - match remote_desktop_portal::notify_keyboard_keysym( - &portal, - session, - HashMap::new(), - keysym, - state, - ) { - Ok(_) => { - log::trace!("send_keysym: notify_keyboard_keysym succeeded"); - Ok(()) - } - Err(e) => Err(e.into()), - } - } - fn get_raw_evdev_keycode(key: u16) -> i32 { // 8 is the offset between xkb and evdev let mut key = key as i32 - 8; @@ -488,86 +226,22 @@ pub mod client { } _ => { if let Ok((key, is_shift)) = map_key(&key) { - let shift_keycode = evdev::Key::KEY_LEFTSHIFT.code() as i32; - if down { - // Press: Shift down first, then key down - if is_shift { - if let Err(e) = remote_desktop_portal::notify_keyboard_keycode( - &portal, - &session, - HashMap::new(), - shift_keycode, - state, - ) { - log::error!("handle_key: failed to press Shift: {:?}", e); - return Err(e.into()); - } - } - if let Err(e) = remote_desktop_portal::notify_keyboard_keycode( + if is_shift { + remote_desktop_portal::notify_keyboard_keycode( &portal, &session, HashMap::new(), - key.code() as i32, + evdev::Key::KEY_LEFTSHIFT.code() as i32, state, - ) { - log::error!("handle_key: failed to press key: {:?}", e); - // Best-effort: release Shift if it was pressed - if is_shift { - if let Err(e) = remote_desktop_portal::notify_keyboard_keycode( - &portal, - &session, - HashMap::new(), - shift_keycode, - PRESSED_UP_STATE, - ) { - log::warn!( - "handle_key: best-effort Shift release also failed: {:?}", - e - ); - } - } - return Err(e.into()); - } - } else { - // Release: key up first, then Shift up - if let Err(e) = remote_desktop_portal::notify_keyboard_keycode( - &portal, - &session, - HashMap::new(), - key.code() as i32, - PRESSED_UP_STATE, - ) { - log::error!("handle_key: failed to release key: {:?}", e); - // Best-effort: still try to release Shift - if is_shift { - if let Err(e) = remote_desktop_portal::notify_keyboard_keycode( - &portal, - &session, - HashMap::new(), - shift_keycode, - PRESSED_UP_STATE, - ) { - log::warn!( - "handle_key: best-effort Shift release also failed: {:?}", - e - ); - } - } - return Err(e.into()); - } - if is_shift { - if let Err(e) = remote_desktop_portal::notify_keyboard_keycode( - &portal, - &session, - HashMap::new(), - shift_keycode, - PRESSED_UP_STATE, - ) { - log::error!("handle_key: failed to release Shift: {:?}", e); - return Err(e.into()); - } - } + )?; } + remote_desktop_portal::notify_keyboard_keycode( + &portal, + &session, + HashMap::new(), + key.code() as i32, + state, + )?; } } } diff --git a/src/server/terminal_helper.rs b/src/server/terminal_helper.rs deleted file mode 100644 index fd85d2a4c..000000000 --- a/src/server/terminal_helper.rs +++ /dev/null @@ -1,1092 +0,0 @@ -//! Terminal Helper Process -//! -//! This module implements a helper process that runs as the logged-in user and creates -//! the ConPTY + Shell. This is necessary because ConPTY has compatibility issues with -//! CreateProcessAsUserW when the ConPTY is created by a different user (SYSTEM service). -//! -//! Architecture: -//! ``` -//! SYSTEM Service (terminal_service.rs) -//! | -//! +-- CreateProcessAsUserW --> Terminal Helper (this module, runs as user) -//! | | -//! | +-- CreateProcessW + ConPTY --> Shell -//! | | -//! +-- Named Pipes <----------------+ -//! ``` -//! -//! This module also contains Windows-specific utility functions used by terminal_service.rs: -//! - Named pipe creation and connection -//! - User token and SID handling -//! - Helper process launching - -use hbb_common::{ - anyhow::{anyhow, Context, Result}, - log, -}; -use portable_pty::{CommandBuilder, MasterPty, PtySize}; -use std::{ - ffi::{c_void, OsStr}, - fs::File, - io::{Read, Write}, - os::windows::{ffi::OsStrExt, io::FromRawHandle, raw::HANDLE as RawHandle}, - ptr, - sync::{ - atomic::{AtomicBool, Ordering}, - Arc, Mutex, - }, - thread, - time::Duration, -}; - -use windows::{ - core::{PCWSTR, PWSTR}, - Win32::{ - Foundation::{ - CloseHandle, LocalFree, ERROR_IO_PENDING, ERROR_PIPE_CONNECTED, HANDLE, HLOCAL, - INVALID_HANDLE_VALUE, WAIT_OBJECT_0, - }, - Security::{ - Authorization::{ - SetEntriesInAclW, EXPLICIT_ACCESS_W, SET_ACCESS, TRUSTEE_IS_SID, TRUSTEE_IS_USER, - TRUSTEE_W, - }, - CreateWellKnownSid, GetLengthSid, GetTokenInformation, InitializeSecurityDescriptor, - SetSecurityDescriptorDacl, TokenUser, WinLocalSystemSid, ACE_FLAGS, ACL, - PSECURITY_DESCRIPTOR, PSID, SECURITY_ATTRIBUTES, TOKEN_USER, - }, - Storage::FileSystem::{ - CreateFileW, FILE_ALL_ACCESS, FILE_FLAGS_AND_ATTRIBUTES, FILE_FLAG_OVERLAPPED, - FILE_GENERIC_READ, FILE_GENERIC_WRITE, FILE_SHARE_READ, FILE_SHARE_WRITE, - OPEN_EXISTING, - }, - System::{ - Environment::{CreateEnvironmentBlock, DestroyEnvironmentBlock}, - Pipes::{ - ConnectNamedPipe, CreateNamedPipeW, PIPE_READMODE_BYTE, PIPE_TYPE_BYTE, PIPE_WAIT, - }, - Threading::{ - CreateEventW, CreateProcessAsUserW, WaitForSingleObject, CREATE_NO_WINDOW, - CREATE_UNICODE_ENVIRONMENT, PROCESS_CREATION_FLAGS, PROCESS_INFORMATION, - STARTUPINFOW, - }, - IO::{GetOverlappedResult, OVERLAPPED}, - }, - }, -}; - -// Re-export types needed by terminal_service.rs -pub use windows::Win32::{ - Foundation::{ - CloseHandle as WinCloseHandle, HANDLE as WinHANDLE, WAIT_OBJECT_0 as WIN_WAIT_OBJECT_0, - }, - System::Threading::{ - GetExitCodeProcess as WinGetExitCodeProcess, TerminateProcess as WinTerminateProcess, - WaitForSingleObject as WinWaitForSingleObject, - }, -}; - -/// User token wrapper for cross-module use. -/// -/// Using newtype pattern for type safety. The inner value is `usize` to match -/// platform pointer size (32-bit on x86, 64-bit on x64). -/// Windows HANDLE is defined as `*mut c_void`, which has the same size as `usize`. -/// -/// # Design Note -/// This type is defined here (terminal_helper.rs) for Windows and in -/// terminal_service.rs for non-Windows platforms. This avoids circular -/// dependencies while keeping the API consistent across platforms. -/// Both definitions MUST have identical public API (new, as_raw methods). -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub struct UserToken(pub usize); - -impl UserToken { - /// Create a new UserToken from a raw handle value. - pub fn new(handle: usize) -> Self { - Self(handle) - } - - /// Get the raw handle value. - pub fn as_raw(&self) -> usize { - self.0 - } -} - -// Windows pipe access mode constants (not exported by windows crate) -const PIPE_ACCESS_INBOUND: u32 = 0x00000001; -const PIPE_ACCESS_OUTBOUND: u32 = 0x00000002; - -// Named pipe configuration constants -const PIPE_BUFFER_SIZE: u32 = 65536; // 64KB for better throughput with large terminal output -const PIPE_DEFAULT_TIMEOUT_MS: u32 = 5000; -/// Timeout for waiting for helper process to connect to pipes -pub const PIPE_CONNECTION_TIMEOUT_MS: u32 = 10000; - -/// Message type constants for helper protocol. -/// Used to distinguish between terminal data and control commands. -/// Note: Using non-zero values to make debugging easier (0x00 could indicate uninitialized memory). -pub const MSG_TYPE_DATA: u8 = 0x01; -pub const MSG_TYPE_RESIZE: u8 = 0x02; - -/// Message header size: 1 byte type + 4 bytes length -pub const MSG_HEADER_SIZE: usize = 5; - -/// Maximum payload size to prevent denial of service from malicious messages. -/// 16MB should be more than enough for any legitimate terminal data. -const MAX_PAYLOAD_SIZE: usize = 16 * 1024 * 1024; - -/// Timeout in milliseconds to wait for helper process to exit gracefully before force termination. -/// Using 500ms to allow helper process enough time to clean up, especially under high system load. -pub const HELPER_GRACEFUL_EXIT_TIMEOUT_MS: u64 = 500; - -/// Information about a launched helper process. -/// Contains both the process handle and PID for tracking and status checks. -#[derive(Debug)] -pub struct HelperProcessInfo { - /// Process handle for termination and waiting - pub handle: HANDLE, - /// Process ID for logging and status display - pub pid: u32, -} - -/// Wrapper for Windows HANDLE that implements Send. -/// This is safe because Windows HANDLEs are valid across threads. -/// Note: We only implement Send, not Sync. The handle is protected by -/// Mutex in TerminalSession, so concurrent access is controlled there. -/// -/// # Ownership and Cleanup -/// This type intentionally does NOT implement Drop. The handle is owned by -/// `TerminalSession` and explicitly closed in `TerminalSession::close_internal()` -/// after graceful shutdown logic (waiting for helper to exit, force termination if needed). -/// Implementing Drop here would interfere with that cleanup sequence. -#[derive(Debug)] -pub struct SendableHandle(HANDLE); - -impl SendableHandle { - /// Create a new SendableHandle from a raw HANDLE. - pub fn new(handle: HANDLE) -> Self { - Self(handle) - } - - /// Get the raw HANDLE value. - pub fn as_raw(&self) -> HANDLE { - self.0 - } -} - -unsafe impl Send for SendableHandle {} - -/// RAII wrapper for Windows HANDLE that automatically closes the handle on drop. -/// This ensures proper resource cleanup even when errors occur or code paths diverge. -pub struct OwnedHandle(HANDLE); - -impl OwnedHandle { - /// Create a new OwnedHandle from a raw HANDLE. - /// The handle will be closed when this OwnedHandle is dropped. - pub fn new(handle: HANDLE) -> Self { - Self(handle) - } - - /// Consume the OwnedHandle and return the raw HANDLE without closing it. - /// Use this when transferring ownership to another resource (e.g., File). - pub fn into_raw(self) -> HANDLE { - let handle = self.0; - std::mem::forget(self); // Prevent Drop from closing the handle - handle - } - - /// Get the raw HANDLE value. - pub fn as_raw(&self) -> HANDLE { - self.0 - } -} - -impl Drop for OwnedHandle { - fn drop(&mut self) { - if self.0 != INVALID_HANDLE_VALUE && !self.0.is_invalid() { - unsafe { - let _ = CloseHandle(self.0); - } - } - } -} - -/// RAII guard for helper process that terminates the process on drop. -/// This prevents helper process leaks when pipe connection fails or other errors occur. -/// -/// Unlike OwnedHandle (which only closes the handle), this guard: -/// 1. Terminates the process using TerminateProcess -/// 2. Then closes the handle -/// -/// Use `disarm()` to prevent termination when the helper is successfully handed off -/// to the terminal session for proper lifecycle management. -pub struct HelperProcessGuard { - handle: HANDLE, - pid: u32, - armed: bool, -} - -impl HelperProcessGuard { - /// Create a new guard for a helper process. - pub fn new(handle: HANDLE, pid: u32) -> Self { - Self { - handle, - pid, - armed: true, - } - } - - /// Get the raw process HANDLE. - pub fn as_raw(&self) -> HANDLE { - self.handle - } - - /// Get the process ID. - pub fn pid(&self) -> u32 { - self.pid - } - - /// Disarm the guard and return the raw HANDLE. - /// After calling this, the guard will NOT terminate the process on drop. - /// Use this when successfully handing off the helper to session management. - pub fn disarm(self) -> HANDLE { - let handle = self.handle; - std::mem::forget(self); // Prevent Drop from running - handle - } -} - -impl Drop for HelperProcessGuard { - fn drop(&mut self) { - if self.armed && self.handle != INVALID_HANDLE_VALUE && !self.handle.is_invalid() { - log::warn!( - "HelperProcessGuard: terminating leaked helper process (PID {})", - self.pid - ); - unsafe { - // Terminate the process first - let _ = WinTerminateProcess(self.handle, 1); - // Then close the handle - let _ = CloseHandle(self.handle); - } - } - } -} - -/// Encode a message for the helper protocol. -/// Format: [type: u8][length: u32 LE][payload: bytes] -pub fn encode_helper_message(msg_type: u8, payload: &[u8]) -> Vec { - let mut msg = Vec::with_capacity(MSG_HEADER_SIZE + payload.len()); - msg.push(msg_type); - msg.extend_from_slice(&(payload.len() as u32).to_le_bytes()); - msg.extend_from_slice(payload); - msg -} - -/// Encode a resize message for the helper protocol. -/// Payload: rows (u16 LE) + cols (u16 LE) -pub fn encode_resize_message(rows: u16, cols: u16) -> Vec { - let mut payload = Vec::with_capacity(4); - payload.extend_from_slice(&rows.to_le_bytes()); - payload.extend_from_slice(&cols.to_le_bytes()); - encode_helper_message(MSG_TYPE_RESIZE, &payload) -} - -/// Get the default shell for Windows. -pub fn get_default_shell() -> String { - // Try PowerShell Core first (absolute paths only) - let pwsh_paths = [ - "pwsh.exe", - r"C:\Program Files\PowerShell\7\pwsh.exe", - r"C:\Program Files\PowerShell\6\pwsh.exe", - ]; - - for path in &pwsh_paths { - if std::path::Path::new(path).exists() { - log::debug!("Found PowerShell Core: {}", path); - return path.to_string(); - } - } - - // Try Windows PowerShell - let powershell_path = r"C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe"; - if std::path::Path::new(powershell_path).exists() { - return powershell_path.to_string(); - } - - // Fallback to cmd.exe - std::env::var("COMSPEC").unwrap_or_else(|_| "cmd.exe".to_string()) -} - -fn utf8_shell_args(shell: &str) -> Vec { - let name = std::path::Path::new(shell) - .file_name() - .and_then(|name| name.to_str()) - .unwrap_or(shell) - .to_ascii_lowercase(); - - if name == "cmd.exe" || name == "cmd" { - return vec!["/K".to_string(), "chcp 65001 >NUL".to_string()]; - } - - if name == "pwsh.exe" || name == "pwsh" || name == "powershell.exe" { - return vec![ - "-NoLogo".to_string(), - "-NoExit".to_string(), - "-Command".to_string(), - "chcp.com 65001 > $null; [Console]::InputEncoding = [System.Text.Encoding]::UTF8; [Console]::OutputEncoding = [System.Text.Encoding]::UTF8".to_string(), - ]; - } - - Vec::new() -} - -pub fn configure_utf8_shell_command(shell: &str, cmd: &mut CommandBuilder) { - for arg in utf8_shell_args(shell) { - cmd.arg(arg); - } -} - -/// Get the SID of the user from a token. -/// Returns a Vec containing the SID bytes. -pub fn get_user_sid_from_token(user_token: UserToken) -> Result> { - let token_handle = HANDLE(user_token.as_raw() as _); - - // First call to get required buffer size - let mut return_length = 0u32; - let _ = unsafe { GetTokenInformation(token_handle, TokenUser, None, 0, &mut return_length) }; - - if return_length == 0 { - return Err(anyhow!( - "Failed to get token information size: {}", - std::io::Error::last_os_error() - )); - } - - // Allocate buffer and get token information - let mut buffer = vec![0u8; return_length as usize]; - unsafe { - GetTokenInformation( - token_handle, - TokenUser, - Some(buffer.as_mut_ptr() as *mut c_void), - return_length, - &mut return_length, - ) - .map_err(|e| anyhow!("Failed to get token information: {}", e))?; - } - - // Extract SID from TOKEN_USER structure - let token_user = unsafe { &*(buffer.as_ptr() as *const TOKEN_USER) }; - let sid_ptr = token_user.User.Sid; - - // Get SID length and copy to owned buffer - let sid_length = unsafe { GetLengthSid(sid_ptr) }; - - if sid_length == 0 { - return Err(anyhow!("Invalid SID length")); - } - - let mut sid_buffer = vec![0u8; sid_length as usize]; - unsafe { - ptr::copy_nonoverlapping( - sid_ptr.0 as *const u8, - sid_buffer.as_mut_ptr(), - sid_length as usize, - ); - } - - Ok(sid_buffer) -} - -/// Create a restricted DACL that only allows SYSTEM and a specific user. -/// Returns a pointer to the ACL that must be freed with LocalFree. -/// -/// # Safety -/// -/// This function is safe to call, but contains internal unsafe code that relies on -/// pointer lifetime guarantees: -/// -/// - The `user_sid` slice must contain valid SID binary data. -/// - Internally, raw pointers to `system_sid_buffer` (stack-allocated) and `user_sid` -/// are stored in `TRUSTEE_W.ptstrName` fields. These pointers are only used during -/// the `SetEntriesInAclW` call, which occurs before either buffer goes out of scope. -/// - The returned ACL pointer is allocated by Windows and must be freed with `LocalFree`. -pub fn create_restricted_dacl(user_sid: &[u8]) -> Result<*mut c_void> { - // Create SYSTEM SID (well-known SID: S-1-5-18) - // SAFETY: This buffer must outlive the TRUSTEE_W structures that reference it - let mut system_sid_buffer = vec![0u8; 64]; // Max SID size - let mut system_sid_size = system_sid_buffer.len() as u32; - unsafe { - CreateWellKnownSid( - WinLocalSystemSid, - None, // No domain SID - Some(PSID(system_sid_buffer.as_mut_ptr() as *mut c_void)), - &mut system_sid_size, - ) - .map_err(|e| anyhow!("Failed to create SYSTEM SID: {}", e))?; - } - - // Build EXPLICIT_ACCESS entries for SYSTEM and user - // SAFETY: The ptstrName pointers below reference system_sid_buffer and user_sid. - // These buffers must remain valid until SetEntriesInAclW returns. - let mut explicit_access: [EXPLICIT_ACCESS_W; 2] = unsafe { std::mem::zeroed() }; - - // Entry 0: SYSTEM - full access - explicit_access[0].grfAccessPermissions = FILE_ALL_ACCESS.0; - explicit_access[0].grfAccessMode = SET_ACCESS; - explicit_access[0].grfInheritance = ACE_FLAGS(0); // No inheritance for pipes - explicit_access[0].Trustee = TRUSTEE_W { - pMultipleTrustee: ptr::null_mut(), - MultipleTrusteeOperation: Default::default(), - TrusteeForm: TRUSTEE_IS_SID, - TrusteeType: TRUSTEE_IS_USER, - ptstrName: PWSTR::from_raw(system_sid_buffer.as_ptr() as *mut u16), - }; - - // Entry 1: User - full access - explicit_access[1].grfAccessPermissions = FILE_ALL_ACCESS.0; - explicit_access[1].grfAccessMode = SET_ACCESS; - explicit_access[1].grfInheritance = ACE_FLAGS(0); // No inheritance for pipes - // SAFETY: When TrusteeForm is TRUSTEE_IS_SID, ptstrName is interpreted as a PSID - // pointer, not a string pointer. The Windows API reuses this field for different - // purposes based on TrusteeForm. The SID binary data in user_sid is valid for - // the duration of this function call (until SetEntriesInAclW returns). - explicit_access[1].Trustee = TRUSTEE_W { - pMultipleTrustee: ptr::null_mut(), - MultipleTrusteeOperation: Default::default(), - TrusteeForm: TRUSTEE_IS_SID, - TrusteeType: TRUSTEE_IS_USER, - ptstrName: PWSTR::from_raw(user_sid.as_ptr() as *mut u16), - }; - - // Create ACL from explicit access entries - // After this call returns, system_sid_buffer and user_sid are no longer needed - let mut new_acl: *mut ACL = ptr::null_mut(); - let result = unsafe { - SetEntriesInAclW( - Some(&explicit_access), - None, // No existing ACL - &mut new_acl, - ) - }; - - if result.0 != 0 { - return Err(anyhow!( - "SetEntriesInAclW failed with error code: {}", - result.0 - )); - } - - if new_acl.is_null() { - return Err(anyhow!("SetEntriesInAclW returned null ACL")); - } - - Ok(new_acl as *mut c_void) -} - -/// Create a named pipe with a restricted DACL. -/// Only SYSTEM and the specified user can access the pipe. -/// -/// # Arguments -/// * `pipe_name` - The name of the pipe to create -/// * `for_input` - True if service writes to this pipe (helper reads), false otherwise -/// * `user_token` - Required user token for creating restricted DACL -/// -/// # Security -/// -/// The restricted DACL limits pipe access to: -/// - SYSTEM account (the service) -/// - The specific user whose token was provided (the helper process) -/// -/// This function requires a valid user_token and will fail if DACL creation fails, -/// rather than falling back to a less secure NULL DACL. -pub fn create_named_pipe_server( - pipe_name: &str, - for_input: bool, - user_token: UserToken, -) -> Result { - // SECURITY_DESCRIPTOR minimum length is 40 bytes on x64. - const SD_BUFFER_SIZE: usize = 64; - const _: () = assert!( - SD_BUFFER_SIZE >= 40, - "SD_BUFFER_SIZE must be at least 40 bytes for SECURITY_DESCRIPTOR" - ); - - let mut sd_buffer = [0u8; SD_BUFFER_SIZE]; - let sd_ptr = PSECURITY_DESCRIPTOR(sd_buffer.as_mut_ptr() as *mut c_void); - - // Initialize security descriptor - unsafe { - InitializeSecurityDescriptor(sd_ptr, 1) - .map_err(|e| anyhow!("Failed to initialize security descriptor: {}", e))?; - } - - // Create restricted DACL - fail if this doesn't work (no NULL DACL fallback) - let user_sid = get_user_sid_from_token(user_token) - .context("Failed to get user SID from token for pipe DACL")?; - let acl_ptr = - create_restricted_dacl(&user_sid).context("Failed to create restricted DACL for pipe")?; - - log::debug!("Created restricted DACL for pipe: {}", pipe_name); - - // Set DACL on security descriptor - unsafe { - SetSecurityDescriptorDacl(sd_ptr, true, Some(acl_ptr as *const _ as *const _), false) - .map_err(|e| { - // Clean up ACL on error (ignore result - cleanup is best-effort, original error takes precedence) - let _ = LocalFree(Some(HLOCAL(acl_ptr))); - anyhow!("Failed to set restricted DACL: {}", e) - })?; - } - - let sa = SECURITY_ATTRIBUTES { - nLength: std::mem::size_of::() as u32, - lpSecurityDescriptor: sd_buffer.as_mut_ptr() as *mut c_void, - bInheritHandle: false.into(), - }; - - let wide_name: Vec = OsStr::new(pipe_name) - .encode_wide() - .chain(std::iter::once(0)) - .collect(); - - let access_mode = if for_input { - FILE_FLAGS_AND_ATTRIBUTES(PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED.0) - } else { - FILE_FLAGS_AND_ATTRIBUTES(PIPE_ACCESS_OUTBOUND | FILE_FLAG_OVERLAPPED.0) - }; - - log::debug!( - "Creating named pipe: {} (for_input={}, restricted_dacl=true)", - pipe_name, - for_input - ); - - let handle = unsafe { - CreateNamedPipeW( - PCWSTR::from_raw(wide_name.as_ptr()), - access_mode, - PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | PIPE_WAIT, - 1, // max instances - PIPE_BUFFER_SIZE, - PIPE_BUFFER_SIZE, - PIPE_DEFAULT_TIMEOUT_MS, - Some(&sa), - ) - }; - - // Clean up ACL after pipe creation (security descriptor has been applied) - // Ignore result: LocalFree failure is non-critical since the pipe is already created - unsafe { - let _ = LocalFree(Some(HLOCAL(acl_ptr))); - } - - if handle == INVALID_HANDLE_VALUE { - return Err(anyhow!( - "Failed to create named pipe {}: {}", - pipe_name, - std::io::Error::last_os_error() - )); - } - - log::debug!("Named pipe created: {}", pipe_name); - Ok(handle) -} - -/// Wait for client to connect to named pipe with timeout. -/// -/// # Ownership -/// This function **takes ownership** of the `pipe_handle` via OwnedHandle: -/// - On success: the handle is extracted and wrapped in a `File`. -/// - On failure: the handle is automatically closed when OwnedHandle drops. -pub fn wait_for_pipe_connection( - pipe_handle: OwnedHandle, - pipe_name: &str, - timeout_ms: u32, -) -> Result { - log::debug!("Waiting for pipe connection: {}", pipe_name); - - // Create an event for overlapped I/O (also wrapped in OwnedHandle for RAII) - let event = unsafe { CreateEventW(None, true, false, PCWSTR::null()) } - .map_err(|e| anyhow!("Failed to create event for pipe connection: {}", e))?; - let event_handle = OwnedHandle::new(event); - - let mut overlapped: OVERLAPPED = unsafe { std::mem::zeroed() }; - overlapped.hEvent = event_handle.as_raw(); - - let result = unsafe { ConnectNamedPipe(pipe_handle.as_raw(), Some(&mut overlapped)) }; - if result.is_err() { - let err = std::io::Error::last_os_error(); - let err_code = err.raw_os_error().unwrap_or(0); - - // ERROR_PIPE_CONNECTED means client already connected, which is OK - if err_code == ERROR_PIPE_CONNECTED.0 as i32 { - log::debug!("Pipe already connected: {}", pipe_name); - return Ok(unsafe { File::from_raw_handle(pipe_handle.into_raw().0 as RawHandle) }); - } - - // ERROR_IO_PENDING means we need to wait - if err_code == ERROR_IO_PENDING.0 as i32 { - log::debug!("Pipe connection pending, waiting with timeout..."); - let wait_result = unsafe { WaitForSingleObject(event_handle.as_raw(), timeout_ms) }; - - if wait_result != WAIT_OBJECT_0 { - log::error!("Timeout waiting for pipe connection: {}", pipe_name); - return Err(anyhow!( - "Timeout waiting for pipe connection: {}", - pipe_name - )); - } - - // Check if connection was successful - let mut bytes_transferred = 0u32; - let overlapped_result = unsafe { - GetOverlappedResult( - pipe_handle.as_raw(), - &overlapped, - &mut bytes_transferred, - false, - ) - }; - if overlapped_result.is_err() { - let err = std::io::Error::last_os_error(); - log::error!("Failed to complete pipe connection {}: {}", pipe_name, err); - return Err(anyhow!( - "Failed to complete pipe connection {}: {}", - pipe_name, - err - )); - } - - log::debug!("Pipe connected: {}", pipe_name); - } else { - log::error!("Failed to connect named pipe {}: {}", pipe_name, err); - return Err(anyhow!( - "Failed to connect named pipe {}: {}", - pipe_name, - err - )); - } - } else { - log::debug!("Pipe connected immediately: {}", pipe_name); - } - - // Success: transfer pipe ownership to File, event_handle drops - Ok(unsafe { File::from_raw_handle(pipe_handle.into_raw().0 as RawHandle) }) -} - -/// Launch terminal helper process as the logged-in user using the provided token. -/// The helper process creates ConPTY and shell, communicating via named pipes. -/// This uses CreateProcessAsUserW directly with the user token, which works because -/// the helper process itself doesn't need ConPTY - it creates ConPTY internally. -/// -/// Returns HelperProcessInfo containing the process handle and PID. - -/// RAII guard for environment block cleanup. -/// Ensures DestroyEnvironmentBlock is called even if an error occurs. -struct EnvironmentBlockGuard { - ptr: *mut c_void, -} - -impl Drop for EnvironmentBlockGuard { - fn drop(&mut self) { - if !self.ptr.is_null() { - unsafe { - // Ignore result: DestroyEnvironmentBlock failure is non-critical during cleanup - let _ = DestroyEnvironmentBlock(self.ptr); - } - } - } -} - -pub fn launch_terminal_helper_with_token( - user_token: UserToken, - input_pipe_name: &str, - output_pipe_name: &str, - terminal_id: i32, - rows: u16, - cols: u16, -) -> Result { - let exe_path = - std::env::current_exe().map_err(|e| anyhow!("Failed to get current exe path: {}", e))?; - - // Build command line arguments (without exe path to avoid escaping issues) - // lpApplicationName will contain the exe path separately - let cmd_args = format!( - "--terminal-helper {} {} {} {} {}", - input_pipe_name, output_pipe_name, rows, cols, terminal_id - ); - - log::debug!("Launching terminal helper for terminal {}", terminal_id); - - // Convert exe path to wide string for lpApplicationName - let exe_path_wide: Vec = OsStr::new(exe_path.as_os_str()) - .encode_wide() - .chain(std::iter::once(0)) - .collect(); - - // Command line must include exe name as first argument per Windows convention - let cmd_line = format!("\"{}\" {}", exe_path.display(), cmd_args); - let mut cmd_wide: Vec = OsStr::new(&cmd_line) - .encode_wide() - .chain(std::iter::once(0)) - .collect(); - - let mut si: STARTUPINFOW = unsafe { std::mem::zeroed() }; - si.cb = std::mem::size_of::() as u32; - - let mut pi: PROCESS_INFORMATION = unsafe { std::mem::zeroed() }; - - // Create environment block for the user with RAII cleanup - let mut environment: *mut c_void = ptr::null_mut(); - let env_ok = unsafe { - CreateEnvironmentBlock( - &mut environment, - Some(HANDLE(user_token.as_raw() as _)), - true, - ) - } - .is_ok(); - - // Use RAII guard to ensure cleanup even on error paths - let _env_guard = if env_ok && !environment.is_null() { - Some(EnvironmentBlockGuard { ptr: environment }) - } else { - if !env_ok { - log::warn!("Failed to create environment block, using default"); - } - None - }; - - let creation_flags = CREATE_NO_WINDOW - | if env_ok { - CREATE_UNICODE_ENVIRONMENT - } else { - PROCESS_CREATION_FLAGS(0) - }; - - // Use lpApplicationName to pass exe path separately from command line - // This avoids potential issues with special characters in the exe path - let result = unsafe { - CreateProcessAsUserW( - Some(HANDLE(user_token.as_raw() as _)), - PCWSTR::from_raw(exe_path_wide.as_ptr()), // lpApplicationName: exe path - Some(PWSTR::from_raw(cmd_wide.as_mut_ptr())), // lpCommandLine: full command - None, - None, - false, // Don't inherit handles - creation_flags, - if env_ok { Some(environment) } else { None }, - PCWSTR::null(), // Use default current directory - &si, - &mut pi, - ) - }; - - // Environment block cleanup is handled by _env_guard's Drop - - if let Err(e) = result { - log::error!("CreateProcessAsUserW failed: {}", e); - return Err(anyhow!("Failed to launch terminal helper: {}", e)); - } - - // Close thread handle - we only need the process handle for tracking - // Ignore result: CloseHandle failure here is non-critical since process is already launched - unsafe { - let _ = CloseHandle(pi.hThread); - } - - log::info!("Terminal helper launched with PID {}", pi.dwProcessId); - // Return process info for tracking - Ok(HelperProcessInfo { - handle: pi.hProcess, - pid: pi.dwProcessId, - }) -} - -/// Check if a helper process is still running. -/// Returns true if the process is running, false if it has exited. -pub fn is_helper_process_running(handle: HANDLE) -> bool { - let wait_result = unsafe { WaitForSingleObject(handle, 0) }; - // WAIT_TIMEOUT (258) means process is still running - // WAIT_OBJECT_0 (0) means process has exited - wait_result != WAIT_OBJECT_0 -} - -/// Run terminal helper process -/// Args: --terminal-helper -pub fn run_terminal_helper(args: &[String]) -> Result<()> { - if args.len() < 5 { - return Err(anyhow!( - "Usage: --terminal-helper " - )); - } - - let input_pipe_name = &args[0]; - let output_pipe_name = &args[1]; - let rows: u16 = args[2] - .parse() - .map_err(|e| anyhow!("Failed to parse rows '{}': {}", args[2], e))?; - let cols: u16 = args[3] - .parse() - .map_err(|e| anyhow!("Failed to parse cols '{}': {}", args[3], e))?; - let terminal_id: i32 = args[4] - .parse() - .map_err(|e| anyhow!("Failed to parse terminal_id '{}': {}", args[4], e))?; - - log::debug!( - "Terminal helper starting: terminal_id={}, size={}x{}", - terminal_id, - cols, - rows - ); - - // Open named pipes (created by the service) - let mut input_pipe = open_pipe(input_pipe_name, true)?; - let mut output_pipe = open_pipe(output_pipe_name, false)?; - - // Create ConPTY and shell - let pty_size = PtySize { - rows, - cols, - pixel_width: 0, - pixel_height: 0, - }; - - let pty_system = portable_pty::native_pty_system(); - let pty_pair = pty_system.openpty(pty_size).context("Failed to open PTY")?; - - let shell = get_default_shell(); - log::debug!("Using shell: {}", shell); - - let mut cmd = CommandBuilder::new(&shell); - configure_utf8_shell_command(&shell, &mut cmd); - let mut child = pty_pair - .slave - .spawn_command(cmd) - .context("Failed to spawn shell")?; - - // Explicitly drop slave after spawning to release resources - drop(pty_pair.slave); - - let pid = child.process_id().unwrap_or(0); - log::debug!("Shell started with PID: {}", pid); - - let mut pty_writer = pty_pair - .master - .take_writer() - .context("Failed to get PTY writer")?; - - let mut pty_reader = pty_pair - .master - .try_clone_reader() - .context("Failed to get PTY reader")?; - - // Wrap pty_pair.master in Arc for sharing with input thread (for resize). - let pty_master: Arc>> = Arc::new(Mutex::new(pty_pair.master)); - - let exiting = Arc::new(AtomicBool::new(false)); - - // Thread: Read from input pipe, parse messages, write data to PTY or handle control commands - let exiting_clone = exiting.clone(); - let pty_master_clone = pty_master.clone(); - let input_thread = thread::spawn(move || { - let mut input_pipe = input_pipe; - let mut header_buf = [0u8; MSG_HEADER_SIZE]; - let mut payload_buf = vec![0u8; 4096]; - - loop { - if exiting_clone.load(Ordering::SeqCst) { - break; - } - - // Read message header - match read_exact_or_eof(&mut input_pipe, &mut header_buf) { - Ok(false) => { - log::debug!("Input pipe EOF"); - break; - } - Ok(true) => {} - Err(e) => { - log::error!("Input pipe header read error: {}", e); - break; - } - } - - let msg_type = header_buf[0]; - let payload_len = - u32::from_le_bytes([header_buf[1], header_buf[2], header_buf[3], header_buf[4]]) - as usize; - - // Validate payload length to prevent denial of service - if payload_len > MAX_PAYLOAD_SIZE { - log::error!( - "Payload too large: {} bytes (max {})", - payload_len, - MAX_PAYLOAD_SIZE - ); - break; - } - - // Ensure payload buffer is large enough - if payload_buf.len() < payload_len { - payload_buf.resize(payload_len, 0); - } - - // Read payload - if payload_len > 0 { - match read_exact_or_eof(&mut input_pipe, &mut payload_buf[..payload_len]) { - Ok(false) => { - log::debug!("Input pipe EOF during payload read"); - break; - } - Ok(true) => {} - Err(e) => { - log::error!("Input pipe payload read error: {}", e); - break; - } - } - } - - match msg_type { - MSG_TYPE_DATA => { - // Write terminal data to PTY - if let Err(e) = pty_writer.write_all(&payload_buf[..payload_len]) { - log::error!("PTY write error: {}", e); - break; - } - if let Err(e) = pty_writer.flush() { - log::error!("PTY flush error: {}", e); - break; - } - } - MSG_TYPE_RESIZE => { - if payload_len >= 4 { - let rows = u16::from_le_bytes([payload_buf[0], payload_buf[1]]); - let cols = u16::from_le_bytes([payload_buf[2], payload_buf[3]]); - log::debug!("Resize: {}x{}", cols, rows); - if let Ok(master) = pty_master_clone.lock() { - let _ = master.resize(PtySize { - rows, - cols, - pixel_width: 0, - pixel_height: 0, - }); - } - } - } - _ => { - // Unknown type may indicate data corruption - stop to avoid parse errors - log::error!("Unknown message type: {}, terminating", msg_type); - break; - } - } - } - log::debug!("Input thread exiting"); - }); - - // Thread: Read from PTY, write to output pipe - let exiting_clone = exiting.clone(); - let output_thread = thread::spawn(move || { - let mut output_pipe = output_pipe; - let mut buf = vec![0u8; 4096]; - loop { - if exiting_clone.load(Ordering::SeqCst) { - break; - } - match pty_reader.read(&mut buf) { - Ok(0) => { - log::debug!("PTY EOF"); - break; - } - Ok(n) => { - if let Err(e) = output_pipe.write_all(&buf[..n]) { - log::error!("Output pipe write error: {}", e); - break; - } - if let Err(e) = output_pipe.flush() { - log::error!("Output pipe flush error: {}", e); - break; - } - } - Err(e) => { - if e.kind() != std::io::ErrorKind::WouldBlock { - log::error!("PTY read error: {}", e); - break; - } - thread::sleep(Duration::from_millis(10)); - } - } - } - log::debug!("Output thread exiting"); - }); - - // Wait for child process to exit - let exit_status = child.wait(); - log::info!("Shell exited: {:?}", exit_status); - - exiting.store(true, Ordering::SeqCst); - - // Wait for threads - let _ = input_thread.join(); - let _ = output_thread.join(); - - // pty_master will be dropped here, releasing PTY resources - drop(pty_master); - - log::info!("Terminal helper exiting"); - Ok(()) -} - -/// Read exactly `buf.len()` bytes from reader. -/// Returns Ok(true) if successful, Ok(false) on EOF, Err on error. -fn read_exact_or_eof(reader: &mut R, buf: &mut [u8]) -> std::io::Result { - let mut pos = 0; - while pos < buf.len() { - match reader.read(&mut buf[pos..]) { - Ok(0) => return Ok(false), // EOF - Ok(n) => pos += n, - Err(e) if e.kind() == std::io::ErrorKind::Interrupted => continue, - Err(e) => return Err(e), - } - } - Ok(true) -} - -/// Open a named pipe as a client. -/// `for_read`: true for reading (input pipe), false for writing (output pipe). -fn open_pipe(pipe_name: &str, for_read: bool) -> Result { - let wide_name: Vec = OsStr::new(pipe_name) - .encode_wide() - .chain(std::iter::once(0)) - .collect(); - - let access = if for_read { - FILE_GENERIC_READ.0 - } else { - FILE_GENERIC_WRITE.0 - }; - - let handle = unsafe { - CreateFileW( - PCWSTR::from_raw(wide_name.as_ptr()), - access, - FILE_SHARE_READ | FILE_SHARE_WRITE, - None, - OPEN_EXISTING, - FILE_FLAGS_AND_ATTRIBUTES(0), - None, - ) - }; - - match handle { - Ok(h) => Ok(unsafe { File::from_raw_handle(h.0 as _) }), - Err(e) => Err(anyhow!( - "Failed to open {} pipe '{}': {}", - if for_read { "input" } else { "output" }, - pipe_name, - e - )), - } -} diff --git a/src/server/terminal_service.rs b/src/server/terminal_service.rs index 52a296b74..d709454c9 100644 --- a/src/server/terminal_service.rs +++ b/src/server/terminal_service.rs @@ -7,7 +7,6 @@ use portable_pty::{Child, CommandBuilder, PtySize}; use std::{ collections::{HashMap, VecDeque}, io::{Read, Write}, - ops::{Deref, DerefMut}, sync::{ atomic::{AtomicBool, Ordering}, mpsc::{self, Receiver, SyncSender}, @@ -17,68 +16,12 @@ use std::{ time::{Duration, Instant}, }; -// Windows-specific imports from terminal_helper module -#[cfg(target_os = "windows")] -use super::terminal_helper::{ - configure_utf8_shell_command, create_named_pipe_server, encode_helper_message, - encode_resize_message, is_helper_process_running, launch_terminal_helper_with_token, - wait_for_pipe_connection, HelperProcessGuard, OwnedHandle, SendableHandle, WinCloseHandle, - WinTerminateProcess, WinWaitForSingleObject, MSG_TYPE_DATA, PIPE_CONNECTION_TIMEOUT_MS, - WIN_WAIT_OBJECT_0, -}; - const MAX_OUTPUT_BUFFER_SIZE: usize = 1024 * 1024; // 1MB per terminal const MAX_BUFFER_LINES: usize = 10000; const MAX_SERVICES: usize = 100; // Maximum number of persistent terminal services const SERVICE_IDLE_TIMEOUT: Duration = Duration::from_secs(3600); // 1 hour idle timeout -const CHANNEL_BUFFER_SIZE: usize = 500; // Channel buffer size. Max per-message size ~4KB (reader buffer), so worst case ~500*4KB ≈ 2MB/terminal. Increased from 100 to reduce data loss during disconnects. +const CHANNEL_BUFFER_SIZE: usize = 100; // Number of messages to buffer in channel const COMPRESS_THRESHOLD: usize = 512; // Compress terminal data larger than this - // Default max bytes for reconnection buffer replay. -const DEFAULT_RECONNECT_BUFFER_BYTES: usize = 8 * 1024; -const MAX_SIGWINCH_PHASE_ATTEMPTS: u8 = 3; // Max attempts per SIGWINCH phase before giving up - -/// Two-phase SIGWINCH trigger for TUI app redraw on reconnection. -/// -/// Why two phases? A single resize-then-restore done back-to-back is too fast: -/// by the time the TUI app handles the asynchronous SIGWINCH signal and calls -/// `ioctl(TIOCGWINSZ)`, the PTY size has already been restored to the original. -/// ncurses sees no size change and skips the full redraw. -/// -/// Splitting across two `read_outputs()` calls (~30ms apart) ensures the app -/// sees a real size change on each SIGWINCH, forcing a complete redraw. -#[derive(Debug, Clone)] -enum SigwinchPhase { - /// No SIGWINCH needed. - Idle, - /// Phase 1: Resize PTY to temp dimensions (rows±1). The app handles SIGWINCH - /// and redraws at the temporary size. - TempResize { retries: u8 }, - /// Phase 2: Restore PTY to correct dimensions. The app handles SIGWINCH, - /// detects the size change, and performs a full redraw at the correct size. - Restore { retries: u8 }, -} - -/// Which resize to perform in the two-phase SIGWINCH sequence. -enum SigwinchAction { - /// Phase 1: resize to temp dimensions (rows±1) to trigger SIGWINCH with a visible size change. - TempResize, - /// Phase 2: restore to correct dimensions to trigger SIGWINCH and force full redraw. - Restore, -} - -/// Session state machine for terminal streaming. -#[derive(Debug)] -enum SessionState { - /// Session is closed, not streaming data to client. - Closed, - /// Session is active, streaming data to client. - /// pending_buffer: historical buffer to send before real-time data (set on reconnection). - /// sigwinch: two-phase SIGWINCH trigger state for TUI app redraw. - Active { - pending_buffer: Option>, - sigwinch: SigwinchPhase, - }, -} lazy_static::lazy_static! { // Global registry of persistent terminal services indexed by service_id @@ -109,8 +52,28 @@ pub fn generate_service_id() -> String { fn get_default_shell() -> String { #[cfg(target_os = "windows")] { - // Use shared implementation from terminal_helper - super::terminal_helper::get_default_shell() + // Try PowerShell Core first (cross-platform version) + // Common installation paths for PowerShell Core + let pwsh_paths = [ + "pwsh.exe", + r"C:\Program Files\PowerShell\7\pwsh.exe", + r"C:\Program Files\PowerShell\6\pwsh.exe", + ]; + + for path in &pwsh_paths { + if std::path::Path::new(path).exists() { + return path.to_string(); + } + } + + // Try Windows PowerShell (should be available on all Windows systems) + let powershell_path = r"C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe"; + if std::path::Path::new(powershell_path).exists() { + return powershell_path.to_string(); + } + + // Final fallback to cmd.exe + std::env::var("COMSPEC").unwrap_or_else(|_| "cmd.exe".to_string()) } #[cfg(not(target_os = "windows"))] { @@ -134,35 +97,10 @@ fn get_default_shell() -> String { } } -#[cfg(target_os = "macos")] -fn locale_value_is_utf8(value: &str) -> bool { - let value = value.to_ascii_uppercase(); - value.contains("UTF-8") || value.contains("UTF8") -} - -#[cfg(target_os = "macos")] -fn should_force_process_utf8_ctype() -> bool { - if let Ok(value) = std::env::var("LC_ALL") { - return !locale_value_is_utf8(&value); - } - if let Ok(value) = std::env::var("LC_CTYPE") { - return !locale_value_is_utf8(&value); - } - if let Ok(value) = std::env::var("LANG") { - return !locale_value_is_utf8(&value); - } - true -} - -pub fn is_service_specified_user(service_id: &str) -> Option { - get_service(service_id).map(|s| s.lock().unwrap().is_specified_user) -} - /// Get or create a persistent terminal service fn get_or_create_service( service_id: String, is_persistent: bool, - is_specified_user: bool, ) -> Result>> { let mut services = TERMINAL_SERVICES.lock().unwrap(); @@ -185,7 +123,6 @@ fn get_or_create_service( Arc::new(Mutex::new(PersistentTerminalService::new( service_id.clone(), is_persistent, - is_specified_user, ))) }) .clone(); @@ -193,8 +130,6 @@ fn get_or_create_service( // Ensure cleanup task is running ensure_cleanup_task(); - service.lock().unwrap().reset_status(is_persistent); - Ok(service) } @@ -336,78 +271,17 @@ pub fn get_terminal_session_count(include_zombie_tasks: bool) -> usize { c } -/// User token wrapper for cross-module use. -/// -/// # Design Note -/// On Windows, this type is defined in terminal_helper.rs and re-exported here. -/// On non-Windows platforms, it's defined here directly. -/// This design avoids circular dependencies while keeping the API consistent. -/// Both definitions MUST have identical public API (new, as_raw methods). -#[cfg(not(target_os = "windows"))] -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub struct UserToken(pub usize); - -#[cfg(not(target_os = "windows"))] -impl UserToken { - pub fn new(handle: usize) -> Self { - Self(handle) - } - - pub fn as_raw(&self) -> usize { - self.0 - } -} - -#[cfg(target_os = "windows")] -pub use super::terminal_helper::UserToken; - -#[derive(Clone)] -pub struct TerminalService { - sp: GenericService, - user_token: Option, -} - -impl Deref for TerminalService { - type Target = ServiceTmpl; - - fn deref(&self) -> &Self::Target { - &self.sp - } -} - -impl DerefMut for TerminalService { - fn deref_mut(&mut self) -> &mut Self::Target { - &mut self.sp - } -} - -pub fn get_service_name(source: VideoSource, idx: usize) -> String { - format!("{}{}", source.service_name_prefix(), idx) -} - -pub fn new( - service_id: String, - is_persistent: bool, - user_token: Option, -) -> GenericService { +pub fn new(service_id: String, is_persistent: bool) -> GenericService { // Create the service with initial persistence setting - allow_err!(get_or_create_service( - service_id.clone(), - is_persistent, - user_token.is_some() - )); - let svc = TerminalService { - sp: GenericService::new(service_id.clone(), false), - user_token, - }; + allow_err!(get_or_create_service(service_id.clone(), is_persistent)); + let svc = EmptyExtraFieldService::new(service_id.clone(), false); GenericService::run(&svc.clone(), move |sp| run(sp, service_id.clone())); svc.sp } -fn run(sp: TerminalService, service_id: String) -> ResultType<()> { +fn run(sp: EmptyExtraFieldService, service_id: String) -> ResultType<()> { while sp.ok() { - let responses = TerminalServiceProxy::new(service_id.clone(), None, sp.user_token.clone()) - .read_outputs(); + let responses = TerminalServiceProxy::new(service_id.clone(), None).read_outputs(); for response in responses { let mut msg_out = Message::new(); msg_out.set_terminal_response(response); @@ -456,7 +330,6 @@ impl OutputBuffer { // Find first newline in new data if let Some(newline_pos) = data.iter().position(|&b| b == b'\n') { last_line.extend_from_slice(&data[..=newline_pos]); - self.total_size += newline_pos + 1; start = newline_pos + 1; self.last_line_incomplete = false; } else { @@ -495,225 +368,28 @@ impl OutputBuffer { // Trim old data if buffer is too large while self.total_size > MAX_OUTPUT_BUFFER_SIZE || self.lines.len() > MAX_BUFFER_LINES { if let Some(removed) = self.lines.pop_front() { - if removed.len() > self.total_size { - log::error!( - "OutputBuffer total_size underflow avoided: total_size={}, removed_len={}, lines_len={}", - self.total_size, - removed.len(), - self.lines.len() - ); - self.total_size = self.lines.iter().map(|line| line.len()).sum(); - } else { - self.total_size -= removed.len(); - } - if self.lines.is_empty() { - self.last_line_incomplete = false; - } - } else { - log::error!( - "OutputBuffer trim invariant broken: total_size={}, lines_len=0", - self.total_size - ); - self.total_size = 0; - self.last_line_incomplete = false; - break; + self.total_size -= removed.len(); } } } fn get_recent(&self, max_bytes: usize) -> Vec { - if max_bytes == 0 { - return Vec::new(); - } - let mut chunks: Vec<&[u8]> = Vec::new(); + let mut result = Vec::new(); let mut size = 0; - // Collect whole chunks from newest to oldest, preserving chronological continuity. - // If the newest chunk alone exceeds max_bytes, take its tail (truncation may split - // an ANSI escape, but the terminal will self-correct on subsequent output). + // Get recent lines up to max_bytes for line in self.lines.iter().rev() { if size + line.len() > max_bytes { - if size == 0 && line.len() > max_bytes { - // Single oversized chunk: take the tail to preserve the most recent content. - // Align offset forward to a UTF-8 char boundary so that downstream - // clients (e.g. Dart) that decode the payload as UTF-8 text don't - // encounter split code points. The protobuf bytes field itself allows - // arbitrary bytes; this is a best-effort mitigation for client-side decoding. - let mut offset = line.len() - max_bytes; - // Skip at most 3 continuation bytes (UTF-8 max 4-byte sequence). - // Prevents runaway skipping on non-UTF-8 binary data. - let mut skipped = 0u8; - while skipped < 3 - && offset < line.len() - && (line[offset] & 0b1100_0000) == 0b1000_0000 - { - offset += 1; - skipped += 1; - } - // If we skipped past all remaining bytes (degenerate data), drop the - // chunk entirely rather than emitting a slice that decodes poorly on the client. - if offset < line.len() { - chunks.push(&line[offset..]); - size = line.len() - offset; - } - } break; } size += line.len(); - chunks.push(line); - } - - // Reverse to restore chronological order and concatenate - chunks.reverse(); - let mut result = Vec::with_capacity(size); - for chunk in chunks { - result.extend_from_slice(chunk); + result.splice(0..0, line.iter().cloned()); } result } } -/// Find the largest prefix of `buf` that does not end in the middle of a UTF-8 -/// code point. Invalid bytes are treated as complete so they can continue -/// downstream and be rendered with replacement characters if needed. -fn find_utf8_split_point(buf: &[u8]) -> usize { - if buf.is_empty() { - return 0; - } - - let start = buf.len().saturating_sub(3); - for i in (start..buf.len()).rev() { - let b = buf[i]; - if b & 0x80 == 0 { - return buf.len(); - } - if b & 0xC0 == 0x80 { - continue; - } - - let seq_len = if b & 0xE0 == 0xC0 { - 2 - } else if b & 0xF0 == 0xE0 { - 3 - } else if b & 0xF8 == 0xF0 { - 4 - } else { - return buf.len(); - }; - - return if buf.len() - i >= seq_len { - buf.len() - } else { - i - }; - } - - buf.len() -} - -// Terminal output currently follows a UTF-8 text model end to end: the service -// keeps replay buffers on UTF-8 boundaries, and Flutter decodes payload bytes as -// UTF-8 before writing to xterm. This accumulator only prevents splitting a -// trailing UTF-8 code point across PTY reads. Supporting non-UTF-8 terminals -// would need a separate design covering remote encoding detection, Flutter -// decoding, replay truncation, and input transcoding. -#[derive(Default)] -struct Utf8ChunkAccumulator { - remainder: Vec, -} - -impl Utf8ChunkAccumulator { - fn push_chunk(&mut self, mut data: Vec) -> Option> { - if data.is_empty() { - return None; - } - - let had_remainder = !self.remainder.is_empty(); - if had_remainder { - let mut combined = std::mem::take(&mut self.remainder); - combined.extend_from_slice(&data); - data = combined; - } - - let split = find_utf8_split_point(&data); - if split == data.len() { - return Some(data); - } - - // Only hold back a candidate incomplete suffix when we have evidence that - // the bytes before it are already UTF-8 text. If split is 0, the whole - // read may be the start of a UTF-8 character, so keep it for the next read. - if !had_remainder && split > 0 && std::str::from_utf8(&data[..split]).is_err() { - return Some(data); - } - - self.remainder = data.split_off(split); - if data.is_empty() { - None - } else { - Some(data) - } - } - - fn finish(&mut self) -> Option> { - if self.remainder.is_empty() { - None - } else { - Some(std::mem::take(&mut self.remainder)) - } - } -} - -/// Try to send data through the output channel with rate-limited drop logging. -/// Returns `true` if the caller should break out of the read loop (channel disconnected). -fn try_send_output( - output_tx: &mpsc::SyncSender>, - data: Vec, - terminal_id: i32, - label: &str, - drop_count: &mut u64, - last_drop_warn: &mut Instant, -) -> bool { - match output_tx.try_send(data) { - Ok(_) => { - if *drop_count > 0 { - log::trace!( - "Terminal {}{} output channel recovered, dropped {} chunks since last report", - terminal_id, - label, - *drop_count - ); - *drop_count = 0; - } - false - } - Err(mpsc::TrySendError::Full(_)) => { - *drop_count += 1; - if last_drop_warn.elapsed() >= Duration::from_secs(5) { - log::trace!( - "Terminal {}{} output channel full, dropped {} chunks in last {:?}", - terminal_id, - label, - *drop_count, - last_drop_warn.elapsed() - ); - *drop_count = 0; - *last_drop_warn = Instant::now(); - } - false - } - Err(mpsc::TrySendError::Disconnected(_)) => { - log::debug!( - "Terminal {}{} output channel disconnected", - terminal_id, - label - ); - true - } - } -} - pub struct TerminalSession { pub created_at: Instant, last_activity: Instant, @@ -734,14 +410,6 @@ pub struct TerminalSession { cols: u16, // Track if we've already sent the closed message closed_message_sent: bool, - // Session state machine for reconnection handling - state: SessionState, - // Helper mode: PTY is managed by helper process, communication via message protocol - #[cfg(target_os = "windows")] - is_helper_mode: bool, - // Handle to helper process for termination when session closes - #[cfg(target_os = "windows")] - helper_process_handle: Option, } impl TerminalSession { @@ -762,11 +430,6 @@ impl TerminalSession { rows, cols, closed_message_sent: false, - state: SessionState::Closed, - #[cfg(target_os = "windows")] - is_helper_mode: false, - #[cfg(target_os = "windows")] - helper_process_handle: None, } } @@ -777,80 +440,17 @@ impl TerminalSession { // This helper function is to ensure that the threads are joined before the child process is dropped. // Though this is not strictly necessary on macOS. fn stop(&mut self) { - self.state = SessionState::Closed; self.exiting.store(true, Ordering::SeqCst); // Drop the input channel to signal writer thread to exit if let Some(input_tx) = self.input_tx.take() { // Send a final newline to ensure the reader can read some data, and then exit. // This is required on Windows and Linux. - // Although `self.pty_pair = None;` is called below, we can still send a final newline here. - #[cfg(target_os = "windows")] - let final_msg = if self.is_helper_mode { - encode_helper_message(MSG_TYPE_DATA, b"\r\n") - } else { - b"\r\n".to_vec() - }; - #[cfg(not(target_os = "windows"))] - let final_msg = b"\r\n".to_vec(); - - if let Err(e) = input_tx.send(final_msg) { + if let Err(e) = input_tx.send(b"\r\n".to_vec()) { log::warn!("Failed to send final newline to the terminal: {}", e); } drop(input_tx); } - self.output_rx = None; - - // CRITICAL: In helper mode, we must terminate the helper process BEFORE joining threads! - // The reader thread is blocking on output_pipe.read(), which only returns EOF when - // the helper process exits. If we try to join the reader thread first, we deadlock. - // - // Sequence for helper mode: - // 1. Signal exiting and close input channel (done above) - // 2. Terminate helper process (causes output pipe EOF) - // 3. Join reader thread (now unblocked due to EOF) - // 4. Join writer thread - #[cfg(target_os = "windows")] - if self.is_helper_mode { - if let Some(helper_handle) = self.helper_process_handle.take() { - let handle = helper_handle.as_raw(); - log::debug!("Helper mode: terminating helper process before joining threads..."); - - // Give helper a very short time to exit gracefully (it should detect pipe close) - // But don't wait too long - we need to unblock the reader thread - let wait_result = unsafe { WinWaitForSingleObject(handle, 100) }; - - if wait_result == WIN_WAIT_OBJECT_0 { - log::debug!("Helper process exited gracefully"); - } else { - // Force terminate to unblock reader thread - log::debug!("Force terminating helper process to unblock reader thread"); - unsafe { - let _ = WinTerminateProcess(handle, 0); - } - } - - unsafe { - let _ = WinCloseHandle(handle); - } - } - } - - // 1. Windows (non-helper mode) - // `pty_pair` uses pipe. https://github.com/rustdesk-org/wezterm/blob/80174f8009f41565f0fa8c66dab90d4f9211ae16/pty/src/win/conpty.rs#L16 - // `read()` may stuck at https://github.com/rustdesk-org/wezterm/blob/80174f8009f41565f0fa8c66dab90d4f9211ae16/filedescriptor/src/windows.rs#L345 - // We can close the pipe to signal the reader thread to exit. - // After https://github.com/rustdesk-org/wezterm/blob/80174f8009f41565f0fa8c66dab90d4f9211ae16/pty/src/win/psuedocon.rs#L86, the reader reads `[27, 91, 63, 57, 48, 48, 49, 108, 27, 91, 63, 49, 48, 48, 52, 108]` in my tests. - // 2. Linux - // `pty_pair` uses `libc::openpty`. https://github.com/rustdesk-org/wezterm/blob/80174f8009f41565f0fa8c66dab90d4f9211ae16/pty/src/unix.rs#L32 - // We can also call the drop method first. https://github.com/rustdesk-org/wezterm/blob/80174f8009f41565f0fa8c66dab90d4f9211ae16/pty/src/unix.rs#L352 - // The reader will get [13, 10] after dropping the `pty_pair`. - // 3. macOS - // No stuck cases have been found so far, more testing is needed. - #[cfg(any(target_os = "windows", target_os = "linux"))] - { - self.pty_pair = None; - } // Wait for threads to finish // The reader thread should join before the writer thread on Windows. @@ -887,20 +487,16 @@ pub struct PersistentTerminalService { pub created_at: Instant, last_activity: Instant, pub is_persistent: bool, - needs_session_sync: bool, - is_specified_user: bool, } impl PersistentTerminalService { - pub fn new(service_id: String, is_persistent: bool, is_specified_user: bool) -> Self { + pub fn new(service_id: String, is_persistent: bool) -> Self { Self { service_id, sessions: HashMap::new(), created_at: Instant::now(), last_activity: Instant::now(), is_persistent, - needs_session_sync: false, - is_specified_user, } } @@ -934,9 +530,7 @@ impl PersistentTerminalService { ( session.rows, session.cols, - session - .output_buffer - .get_recent(DEFAULT_RECONNECT_BUFFER_BYTES), + session.output_buffer.get_recent(4096), ) }) } @@ -945,22 +539,11 @@ impl PersistentTerminalService { pub fn has_active_terminals(&self) -> bool { !self.sessions.is_empty() } - - fn reset_status(&mut self, is_persistent: bool) { - self.is_persistent = is_persistent; - self.needs_session_sync = true; - for session in self.sessions.values() { - let mut session = session.lock().unwrap(); - session.state = SessionState::Closed; - } - } } pub struct TerminalServiceProxy { service_id: String, is_persistent: bool, - #[cfg(target_os = "windows")] - user_token: Option, } pub fn set_persistent(service_id: &str, is_persistent: bool) -> Result<()> { @@ -973,11 +556,7 @@ pub fn set_persistent(service_id: &str, is_persistent: bool) -> Result<()> { } impl TerminalServiceProxy { - pub fn new( - service_id: String, - is_persistent: Option, - _user_token: Option, - ) -> Self { + pub fn new(service_id: String, is_persistent: Option) -> Self { // Get persistence from the service if it exists let is_persistent = is_persistent.unwrap_or(if let Some(service) = get_service(&service_id) { @@ -988,8 +567,6 @@ impl TerminalServiceProxy { TerminalServiceProxy { service_id, is_persistent, - #[cfg(target_os = "windows")] - user_token: _user_token, } } @@ -1045,116 +622,34 @@ impl TerminalServiceProxy { ) -> Result> { let mut response = TerminalResponse::new(); - // When the client requests a terminal_id that doesn't exist but there are - // surviving persistent sessions, remap the lowest-ID session to the requested - // terminal_id. This handles the case where _nextTerminalId resets to 1 on - // reconnect but the server-side sessions have non-contiguous IDs (e.g. {2: htop}). - // - // The client's requested terminal_id may not match any surviving session ID - // (e.g. _nextTerminalId incremented beyond the surviving IDs). This remap is a - // one-time handle reassignment — only the first reconnect triggers it because - // needs_session_sync is cleared afterward. Remaining sessions are communicated - // back via `persistent_sessions` with their original server-side IDs. - if !service.sessions.contains_key(&open.terminal_id) - && service.needs_session_sync - && !service.sessions.is_empty() - { - if let Some(&lowest_id) = service.sessions.keys().min() { - log::info!( - "Remapping persistent session {} -> {} for reconnection", - lowest_id, - open.terminal_id - ); - if let Some(session_arc) = service.sessions.remove(&lowest_id) { - service.sessions.insert(open.terminal_id, session_arc); - } - } - } - // Check if terminal already exists if let Some(session_arc) = service.sessions.get(&open.terminal_id) { // Reconnect to existing terminal - let mut session = session_arc.lock().unwrap(); - // Directly enter Active state with pending replay for immediate streaming. - // The replay combines output_buffer history and the channel backlog that was - // already pending at reconnect time so the client can suppress stale xterm - // query answers without requiring a protobuf schema change. - // During disconnect, read_outputs() is not called; channel data can still be lost - // if output_rx fills before reconnect drains it. - let mut buffer = session - .output_buffer - .get_recent(DEFAULT_RECONNECT_BUFFER_BYTES); - let mut reconnect_backlog = Vec::new(); - if let Some(output_rx) = &session.output_rx { - // Cap reconnect-time drain so a chatty PTY cannot keep OpenTerminal - // inside this loop indefinitely. Remaining output is drained by read_outputs(). - for _ in 0..CHANNEL_BUFFER_SIZE { - let Ok(data) = output_rx.try_recv() else { - break; - }; - reconnect_backlog.push(data); - } - } - let has_reconnect_backlog = !reconnect_backlog.is_empty(); - for data in reconnect_backlog { - session.output_buffer.append(&data); - } - if has_reconnect_backlog { - buffer = session - .output_buffer - .get_recent(DEFAULT_RECONNECT_BUFFER_BYTES); - } - let has_pending = !buffer.is_empty(); - session.state = SessionState::Active { - pending_buffer: if has_pending { Some(buffer) } else { None }, - // Always trigger two-phase SIGWINCH on reconnect to force TUI app redraw, - // regardless of whether there's pending buffer data. This avoids edge cases - // where buffer is empty but a TUI app (top/htop) still needs a full redraw. - sigwinch: SigwinchPhase::TempResize { - retries: MAX_SIGWINCH_PHASE_ATTEMPTS, - }, - }; + let session = session_arc.lock().unwrap(); let mut opened = TerminalOpened::new(); opened.terminal_id = open.terminal_id; opened.success = true; - opened.message = if has_pending { - "Reconnected to existing terminal with pending output".to_string() - } else { - "Reconnected to existing terminal".to_string() - }; + opened.message = "Reconnected to existing terminal".to_string(); opened.pid = session.pid; - opened.service_id = self.service_id.clone(); - opened.replay_terminal_output = has_pending; - if service.needs_session_sync { - if service.sessions.len() > 1 { - // No need to include the current terminal in the list. - // Because the `persistent_sessions` is used to restore the other sessions. - opened.persistent_sessions = service - .sessions - .keys() - .filter(|&id| *id != open.terminal_id) - .cloned() - .collect(); - } - service.needs_session_sync = false; + // Return service_id for persistent sessions + if self.is_persistent { + opened.service_id = self.service_id.clone(); } response.set_opened(opened); + // Send buffered output + let buffer = session.output_buffer.get_recent(4096); + if !buffer.is_empty() { + // We'll need to send this separately or extend the protocol + // For now, just acknowledge the reconnection + } + return Ok(Some(response)); } - // Windows with user_token: use helper process to run shell as the logged-in user - // This solves the ConPTY + CreateProcessAsUserW incompatibility issue where - // vim, Claude Code, and other TUI applications hang when ConPTY is created - // by SYSTEM service but shell runs as user via CreateProcessAsUserW. - #[cfg(target_os = "windows")] - if self.user_token.is_some() { - return self.handle_open_with_helper(service, open); - } - // Create new terminal session log::info!( - "Creating new terminal {} for service {}", + "Creating new terminal {} for service: {}", open.terminal_id, service.service_id ); @@ -1175,44 +670,7 @@ impl TerminalServiceProxy { // Use default shell for the platform let shell = get_default_shell(); log::debug!("Using shell: {}", shell); - - #[allow(unused_mut)] - let mut cmd = CommandBuilder::new(&shell); - - #[cfg(target_os = "windows")] - configure_utf8_shell_command(&shell, &mut cmd); - - // macOS-specific terminal configuration - // 1. Use login shell (-l) to load user's shell profile (~/.zprofile, ~/.bash_profile) - // This ensures PATH includes Homebrew paths (/opt/homebrew/bin, /usr/local/bin) - // 2. Set TERM environment variable for proper terminal behavior - // This fixes issues with control sequences (e.g., Delete/Backspace keys) - // macOS terminfo uses hex naming: '78' = 'x' for xterm entries - // Note: For Linux, `TERM` is set in src/platform/linux.rs try_start_server_() - #[cfg(target_os = "macos")] - { - // Start as login shell to load user environment (PATH, etc.) - cmd.arg("-l"); - log::debug!("Added -l flag for macOS login shell"); - - let term = if std::path::Path::new("/usr/share/terminfo/78/xterm-256color").exists() { - "xterm-256color" - } else { - "xterm" - }; - cmd.env("TERM", term); - log::debug!("Set TERM={} for macOS PTY", term); - - if should_force_process_utf8_ctype() { - cmd.env_remove("LC_ALL"); - cmd.env("LC_CTYPE", "en_US.UTF-8"); - log::debug!("Set LC_CTYPE=en_US.UTF-8 for macOS PTY"); - } - } - - // Note: On Windows with user_token, we use helper mode (handle_open_with_helper) - // which is dispatched earlier in this function. This code path is only reached - // when user_token is None (e.g., running directly as user, not as SYSTEM service). + let cmd = CommandBuilder::new(&shell); log::debug!("Spawning shell process..."); let child = pty_pair @@ -1240,6 +698,17 @@ impl TerminalServiceProxy { let terminal_id = open.terminal_id; let writer_thread = thread::spawn(move || { let mut writer = writer; + // Write initial carriage return: + // 1. Windows requires at least one carriage return for `drop()` to work properly. + // Without this, the reader may fail to read the buffer after `input_tx.send(b"\r\n".to_vec()).ok();`. + // 2. This also refreshes the terminal interface on the controlling side (workaround for blank content on connect). + if let Err(e) = writer.write_all(b"\r") { + log::error!("Terminal {} initial write error: {}", terminal_id, e); + } else { + if let Err(e) = writer.flush() { + log::error!("Terminal {} initial flush error: {}", terminal_id, e); + } + } while let Ok(data) = input_rx.recv() { if let Err(e) = writer.write_all(&data) { log::error!("Terminal {} write error: {}", terminal_id, e); @@ -1258,51 +727,32 @@ impl TerminalServiceProxy { let reader_thread = thread::spawn(move || { let mut reader = reader; let mut buf = vec![0u8; 4096]; - let mut utf8_chunks = Utf8ChunkAccumulator::default(); - let mut drop_count: u64 = 0; - // Initialize to > 5s ago so the first drop triggers a warning immediately. - let mut last_drop_warn = Instant::now() - Duration::from_secs(6); loop { match reader.read(&mut buf) { Ok(0) => { // EOF // This branch can be reached when the child process exits on macOS. // But not on Linux and Windows in my tests. - if let Some(data) = utf8_chunks.finish() { - let _ = try_send_output( - &output_tx, - data, - terminal_id, - "", - &mut drop_count, - &mut last_drop_warn, - ); - } break; } Ok(n) => { if exiting.load(Ordering::SeqCst) { break; } - let Some(data) = utf8_chunks.push_chunk(buf[..n].to_vec()) else { - continue; - }; - // Use try_send to avoid blocking the reader thread when channel is full. - // During disconnect, the run loop (sp.ok()) stops and read_outputs() is - // no longer called, so the channel won't be drained. Blocking send would - // deadlock the reader thread in that case. - // Note: data produced during disconnect may be lost if channel fills up, - // since output_buffer is only updated in read_outputs(). The buffer will - // contain history from before the disconnect, not data produced after it. - if try_send_output( - &output_tx, - data, - terminal_id, - "", - &mut drop_count, - &mut last_drop_warn, - ) { - break; + let data = buf[..n].to_vec(); + // Try to send, if channel is full, drop the data + match output_tx.try_send(data) { + Ok(_) => {} + Err(mpsc::TrySendError::Full(_)) => { + log::debug!( + "Terminal {} output channel full, dropping data", + terminal_id + ); + } + Err(mpsc::TrySendError::Disconnected(_)) => { + log::debug!("Terminal {} output channel disconnected", terminal_id); + break; + } } } Err(e) if e.kind() == std::io::ErrorKind::WouldBlock => { @@ -1328,22 +778,15 @@ impl TerminalServiceProxy { session.output_rx = Some(output_rx); session.reader_thread = Some(reader_thread); session.writer_thread = Some(writer_thread); - session.state = SessionState::Active { - pending_buffer: None, - sigwinch: SigwinchPhase::Idle, - }; let mut opened = TerminalOpened::new(); opened.terminal_id = open.terminal_id; opened.success = true; opened.message = "Terminal opened".to_string(); opened.pid = session.pid; - opened.service_id = service.service_id.clone(); - if service.needs_session_sync { - if !service.sessions.is_empty() { - opened.persistent_sessions = service.sessions.keys().cloned().collect(); - } - service.needs_session_sync = false; + // Return service_id for persistent sessions + if self.is_persistent { + opened.service_id = service.service_id.clone(); } response.set_opened(opened); @@ -1361,239 +804,6 @@ impl TerminalServiceProxy { Ok(Some(response)) } - /// Windows-only: Open terminal using helper process pattern - /// This solves the ConPTY + CreateProcessAsUserW incompatibility issue. - /// The helper process runs as the logged-in user and creates ConPTY + shell, - /// communicating with this service via named pipes. - #[cfg(target_os = "windows")] - fn handle_open_with_helper( - &self, - service: &mut PersistentTerminalService, - open: &OpenTerminal, - ) -> Result> { - let mut response = TerminalResponse::new(); - - log::info!( - "Creating new terminal {} using helper process for service: {}", - open.terminal_id, - service.service_id - ); - - let mut session = - TerminalSession::new(open.terminal_id, open.rows as u16, open.cols as u16); - - // Generate unique pipe names for this terminal - let pipe_id = uuid::Uuid::new_v4(); - let input_pipe_name = format!(r"\\.\pipe\rustdesk_term_in_{}", pipe_id); - let output_pipe_name = format!(r"\\.\pipe\rustdesk_term_out_{}", pipe_id); - - log::debug!( - "Creating pipes: input={}, output={}", - input_pipe_name, - output_pipe_name - ); - - // Get user_token early - needed for both DACL creation and helper launch - let user_token = self - .user_token - .ok_or_else(|| anyhow!("user_token is required for helper mode"))?; - - // Create pipes (server side, don't wait for connection yet) - // input_pipe: service WRITES to this, helper READS from this - // output_pipe: service READS from this, helper WRITES to this - // Using OwnedHandle for RAII - handles are automatically closed on error - // Pass user_token to create restricted DACL (only SYSTEM + user can access) - let input_pipe_handle = OwnedHandle::new(create_named_pipe_server( - &input_pipe_name, - false, - user_token, - )?); - let output_pipe_handle = OwnedHandle::new(create_named_pipe_server( - &output_pipe_name, - true, - user_token, - )?); - - let helper_process_info = launch_terminal_helper_with_token( - user_token, - &input_pipe_name, - &output_pipe_name, - open.terminal_id, - open.rows as u16, - open.cols as u16, - )?; - - // Use HelperProcessGuard for RAII cleanup - terminates process on error - // Unlike OwnedHandle which only closes the handle, this guard ensures - // the helper process is terminated if pipe connection fails or other errors occur. - let helper_process_guard = - HelperProcessGuard::new(helper_process_info.handle, helper_process_info.pid); - let helper_pid = helper_process_guard.pid(); - - // Wait for helper to connect to pipes - // If this fails, HelperProcessGuard will terminate the helper process - let mut input_pipe = wait_for_pipe_connection( - input_pipe_handle, - &input_pipe_name, - PIPE_CONNECTION_TIMEOUT_MS, - )?; - let mut output_pipe = wait_for_pipe_connection( - output_pipe_handle, - &output_pipe_name, - PIPE_CONNECTION_TIMEOUT_MS, - )?; - - // Check if helper process is still running after pipe connection - // This provides early detection if helper crashed during startup - if !is_helper_process_running(helper_process_guard.as_raw()) { - return Err(anyhow!( - "Helper process (PID {}) exited unexpectedly after pipe connection", - helper_pid - )); - } - - // Disarm the guard and transfer ownership to session - // From this point, the session is responsible for terminating the helper - let helper_raw_handle = helper_process_guard.disarm(); - - // Use helper process PID for session tracking - // Note: This is the helper process PID, not the actual shell PID. - // The real shell runs inside the helper process but its PID is not exposed here. - // For process management (termination, status), the helper PID is what we need. - session.pid = helper_pid; - - // Create channels for input/output (same as direct PTY mode) - let (input_tx, input_rx) = mpsc::sync_channel::>(CHANNEL_BUFFER_SIZE); - let (output_tx, output_rx) = mpsc::sync_channel::>(CHANNEL_BUFFER_SIZE); - - // Spawn writer thread: reads from channel, writes to input pipe - let terminal_id = open.terminal_id; - let writer_thread = thread::spawn(move || { - while let Ok(data) = input_rx.recv() { - if let Err(e) = input_pipe.write_all(&data) { - log::error!("Terminal {} pipe write error: {}", terminal_id, e); - break; - } - if let Err(e) = input_pipe.flush() { - log::error!("Terminal {} pipe flush error: {}", terminal_id, e); - } - } - log::debug!( - "Terminal {} writer thread (helper mode) exiting", - terminal_id - ); - }); - - // Spawn reader thread: reads from output pipe, sends to channel - // Note: The output pipe was created with FILE_FLAG_OVERLAPPED for timeout support - // during ConnectNamedPipe. However, once converted to a File handle, reads are - // performed synchronously. The WouldBlock handling below is defensive but may - // not be triggered in practice since File::read() blocks until data is available. - let exiting = session.exiting.clone(); - let terminal_id = open.terminal_id; - let reader_thread = thread::spawn(move || { - let mut buf = vec![0u8; 4096]; - let mut utf8_chunks = Utf8ChunkAccumulator::default(); - let mut drop_count: u64 = 0; - // Initialize to > 5s ago so the first drop triggers a warning immediately. - let mut last_drop_warn = Instant::now() - Duration::from_secs(6); - loop { - match output_pipe.read(&mut buf) { - Ok(0) => { - if let Some(data) = utf8_chunks.finish() { - let _ = try_send_output( - &output_tx, - data, - terminal_id, - " (helper)", - &mut drop_count, - &mut last_drop_warn, - ); - } - // EOF - helper process exited - log::debug!("Terminal {} helper output EOF", terminal_id); - break; - } - Ok(n) => { - if exiting.load(Ordering::SeqCst) { - break; - } - let Some(data) = utf8_chunks.push_chunk(buf[..n].to_vec()) else { - continue; - }; - // Use try_send to avoid blocking the reader thread (same as direct PTY mode) - if try_send_output( - &output_tx, - data, - terminal_id, - " (helper)", - &mut drop_count, - &mut last_drop_warn, - ) { - break; - } - } - Err(e) if e.kind() == std::io::ErrorKind::WouldBlock => { - // Defensive: WouldBlock is unlikely with synchronous File::read(), - // but handle it gracefully just in case. - if exiting.load(Ordering::SeqCst) { - break; - } - thread::sleep(Duration::from_millis(10)); - } - Err(e) => { - log::error!("Terminal {} pipe read error: {}", terminal_id, e); - break; - } - } - } - log::debug!( - "Terminal {} reader thread (helper mode) exiting", - terminal_id - ); - }); - - // In helper mode, we don't have pty_pair or child - helper manages those - session.pty_pair = None; - session.child = None; - session.input_tx = Some(input_tx); - session.output_rx = Some(output_rx); - session.reader_thread = Some(reader_thread); - session.writer_thread = Some(writer_thread); - session.state = SessionState::Active { - pending_buffer: None, - sigwinch: SigwinchPhase::Idle, - }; - session.is_helper_mode = true; - session.helper_process_handle = Some(SendableHandle::new(helper_raw_handle)); - - let mut opened = TerminalOpened::new(); - opened.terminal_id = open.terminal_id; - opened.success = true; - opened.message = "Terminal opened (helper mode)".to_string(); - opened.pid = session.pid; - opened.service_id = service.service_id.clone(); - if service.needs_session_sync { - if !service.sessions.is_empty() { - opened.persistent_sessions = service.sessions.keys().cloned().collect(); - } - service.needs_session_sync = false; - } - response.set_opened(opened); - - log::info!( - "Terminal {} opened successfully using helper process (PID {})", - open.terminal_id, - session.pid - ); - - service - .sessions - .insert(open.terminal_id, Arc::new(Mutex::new(session))); - - Ok(Some(response)) - } - fn handle_resize( &self, session: Option>>, @@ -1605,84 +815,29 @@ impl TerminalServiceProxy { session.rows = resize.rows as u16; session.cols = resize.cols as u16; - // Note: we do NOT clear the sigwinch phase here. The server-side two-phase - // SIGWINCH mechanism in read_outputs() is self-contained (temp resize → restore - // across two polling cycles), so client resize is purely a dimension sync and - // doesn't affect it. - - // Windows: handle helper mode vs direct PTY mode - #[cfg(target_os = "windows")] - { - if session.is_helper_mode { - // Helper mode: send resize command via message protocol - if let Some(input_tx) = &session.input_tx { - let msg = encode_resize_message(resize.rows as u16, resize.cols as u16); - if let Err(e) = input_tx.send(msg) { - log::error!("Failed to send resize to helper: {}", e); - } - } else { - log::warn!( - "Terminal {} is in helper mode but input_tx is None, cannot send resize", - resize.terminal_id - ); - } - } else { - // Direct PTY mode - Self::resize_pty(&session, resize)?; - } - } - - // Non-Windows: always direct PTY mode - #[cfg(not(target_os = "windows"))] - { - Self::resize_pty(&session, resize)?; + if let Some(pty_pair) = &session.pty_pair { + pty_pair.master.resize(PtySize { + rows: resize.rows as u16, + cols: resize.cols as u16, + pixel_width: 0, + pixel_height: 0, + })?; } } Ok(None) } - /// Resize PTY directly (used for non-helper mode) - fn resize_pty(session: &TerminalSession, resize: &ResizeTerminal) -> Result<()> { - if let Some(pty_pair) = &session.pty_pair { - pty_pair.master.resize(PtySize { - rows: resize.rows as u16, - cols: resize.cols as u16, - pixel_width: 0, - pixel_height: 0, - })?; - } - Ok(()) - } - fn handle_data( &self, session: Option>>, data: &TerminalData, ) -> Result> { if let Some(session_arc) = session { - let input = { - let mut session = session_arc.lock().unwrap(); - session.update_activity(); - if let Some(input_tx) = session.input_tx.clone() { - // Encode data for helper mode or send raw for direct PTY mode - #[cfg(target_os = "windows")] - let msg = if session.is_helper_mode { - encode_helper_message(MSG_TYPE_DATA, &data.data) - } else { - data.data.to_vec() - }; - #[cfg(not(target_os = "windows"))] - let msg = data.data.to_vec(); - - Some((input_tx, msg)) - } else { - None - } - }; - - if let Some((input_tx, msg)) = input { - // Send outside the session lock; SyncSender::send can block when full. - if let Err(e) = input_tx.send(msg) { + let mut session = session_arc.lock().unwrap(); + session.update_activity(); + if let Some(input_tx) = &session.input_tx { + // Send data to writer thread + if let Err(e) = input_tx.send(data.data.to_vec()) { log::error!( "Failed to send data to terminal {}: {}", data.terminal_id, @@ -1723,116 +878,6 @@ impl TerminalServiceProxy { } } - /// Perform a single PTY resize as part of the two-phase SIGWINCH sequence. - /// Returns true if the resize succeeded. - /// - /// Takes individual field references to avoid borrowing the entire TerminalSession, - /// which would conflict with the mutable borrow of session.state in read_outputs(). - fn do_sigwinch_resize( - terminal_id: i32, - rows: u16, - cols: u16, - pty_pair: &Option, - input_tx: &Option>>, - _is_helper_mode: bool, - action: &SigwinchAction, - ) -> bool { - // Skip if dimensions are not initialized (shouldn't happen on reconnect, - // but guard against it to avoid resizing to nonsensical values). - if rows == 0 || cols == 0 { - return false; - } - - let target_rows = match action { - SigwinchAction::TempResize => { - // For very small terminals (≤2 rows), subtracting 1 would result in an unusable - // size (0 or 1 row), so we add 1 instead. Either direction triggers SIGWINCH. - if rows > 2 { - rows.saturating_sub(1) - } else { - rows.saturating_add(1) - } - } - SigwinchAction::Restore => rows, - }; - - let phase_name = match action { - SigwinchAction::TempResize => "temp resize", - SigwinchAction::Restore => "restore", - }; - - #[cfg(target_os = "windows")] - let use_helper = _is_helper_mode; - #[cfg(not(target_os = "windows"))] - let use_helper = false; - - if use_helper { - #[cfg(target_os = "windows")] - { - let input_tx = match input_tx { - Some(tx) => tx, - None => return false, - }; - let msg = encode_resize_message(target_rows, cols); - if let Err(e) = input_tx.try_send(msg) { - log::warn!( - "Terminal {} SIGWINCH {} via helper failed: {}", - terminal_id, - phase_name, - e - ); - return false; - } - true - } - #[cfg(not(target_os = "windows"))] - { - let _ = (input_tx, phase_name); - false - } - } else if let Some(pty_pair) = pty_pair { - if let Err(e) = pty_pair.master.resize(PtySize { - rows: target_rows, - cols, - pixel_width: 0, - pixel_height: 0, - }) { - log::warn!( - "Terminal {} SIGWINCH {} failed: {}", - terminal_id, - phase_name, - e - ); - return false; - } - true - } else { - false - } - } - - /// Helper to create a TerminalResponse with optional compression. - fn create_terminal_data_response(terminal_id: i32, data: Vec) -> TerminalResponse { - let mut response = TerminalResponse::new(); - let mut terminal_data = TerminalData::new(); - terminal_data.terminal_id = terminal_id; - - if data.len() > COMPRESS_THRESHOLD { - let compressed = compress::compress(&data); - if compressed.len() < data.len() { - terminal_data.data = bytes::Bytes::from(compressed); - terminal_data.compressed = true; - } else { - terminal_data.data = bytes::Bytes::from(data); - } - } else { - terminal_data.data = bytes::Bytes::from(data); - } - - response.set_data(terminal_data); - response - } - pub fn read_outputs(&self) -> Vec { let service = match get_service(&self.service_id) { Some(s) => s, @@ -1867,18 +912,8 @@ impl TerminalServiceProxy { } } } - // It's Ok to put the closed message here. - // Because the `reader_thread` is joined in `stop()`, - // and `stop()` is called before the session is dropped. - if should_send_closed { - closed_terminals.push(terminal_id); - } - // Always drain the output channel regardless of session state. - // When Active: data is sent to client. When Closed (within the same - // connection): data is buffered in output_buffer for reconnection replay. - // Note: during actual disconnect, the run loop exits and read_outputs() - // is not called, so channel data produced after disconnect may be lost. + // Read from output channel let mut has_activity = false; let mut received_data = Vec::new(); if let Some(output_rx) = &session.output_rx { @@ -1889,111 +924,41 @@ impl TerminalServiceProxy { } } - // Update buffer (always buffer for reconnection support) + // Update buffer after reading for data in &received_data { session.output_buffer.append(data); } - // Skip sending responses if session is not Active. - // Data is already buffered above and will be sent on next reconnection. - // Use a scoped block to limit the mutable borrow of session.state, - // so we can immutably borrow other session fields afterwards. - let (replay_buffer, sigwinch_action) = { - let (pending_buffer, sigwinch) = match &mut session.state { - SessionState::Active { - pending_buffer, - sigwinch, - } => (pending_buffer, sigwinch), - _ => continue, - }; + // Process received data for responses + for data in received_data { + let mut response = TerminalResponse::new(); + let mut terminal_data = TerminalData::new(); + terminal_data.terminal_id = terminal_id; - let replay_buffer = pending_buffer.take(); - - // Two-phase SIGWINCH: see SigwinchPhase doc comments for rationale. - // Each phase is a single PTY resize, spaced ~30ms apart by the polling - // interval, ensuring the TUI app sees a real size change on each signal. - let sigwinch_action = match sigwinch { - SigwinchPhase::TempResize { retries } => { - if *retries == 0 { - log::warn!( - "Terminal {} SIGWINCH phase 1 (temp resize) failed after {} attempts, giving up", - terminal_id, MAX_SIGWINCH_PHASE_ATTEMPTS - ); - *sigwinch = SigwinchPhase::Idle; - None - } else { - *retries -= 1; - Some(SigwinchAction::TempResize) - } + // Compress data if it exceeds threshold + if data.len() > COMPRESS_THRESHOLD { + let compressed = compress::compress(&data); + if compressed.len() < data.len() { + terminal_data.data = bytes::Bytes::from(compressed); + terminal_data.compressed = true; + } else { + // Compression didn't help, send uncompressed + terminal_data.data = bytes::Bytes::from(data); } - SigwinchPhase::Restore { retries } => { - if *retries == 0 { - log::warn!( - "Terminal {} SIGWINCH phase 2 (restore) failed after {} attempts, giving up", - terminal_id, MAX_SIGWINCH_PHASE_ATTEMPTS - ); - *sigwinch = SigwinchPhase::Idle; - None - } else { - *retries -= 1; - Some(SigwinchAction::Restore) - } - } - SigwinchPhase::Idle => None, - }; - (replay_buffer, sigwinch_action) - }; - - if let Some(buffer) = replay_buffer { - if !buffer.is_empty() { - responses.push(Self::create_terminal_data_response(terminal_id, buffer)); + } else { + terminal_data.data = bytes::Bytes::from(data); } + + response.set_data(terminal_data); + responses.push(response); } if has_activity { session.update_activity(); } - // Execute SIGWINCH resize outside the mutable borrow scope of session.state. - if let Some(action) = sigwinch_action { - #[cfg(target_os = "windows")] - let is_helper = session.is_helper_mode; - #[cfg(not(target_os = "windows"))] - let is_helper = false; - let resize_ok = Self::do_sigwinch_resize( - terminal_id, - session.rows, - session.cols, - &session.pty_pair, - &session.input_tx, - is_helper, - &action, - ); - if let SessionState::Active { sigwinch, .. } = &mut session.state { - match action { - SigwinchAction::TempResize => { - if resize_ok { - // Phase 1 succeeded — advance to phase 2 (restore). - *sigwinch = SigwinchPhase::Restore { - retries: MAX_SIGWINCH_PHASE_ATTEMPTS, - }; - } - // If failed, retries already decremented; will retry phase 1. - } - SigwinchAction::Restore => { - if resize_ok { - // Phase 2 succeeded — SIGWINCH sequence complete. - *sigwinch = SigwinchPhase::Idle; - } - // If failed, retries already decremented; will retry phase 2. - } - } - } - } - - // Send real-time data after historical buffer - for data in received_data { - responses.push(Self::create_terminal_data_response(terminal_id, data)); + if should_send_closed { + closed_terminals.push(terminal_id); } } } @@ -2051,116 +1016,3 @@ impl TerminalServiceProxy { } } } - -#[cfg(test)] -mod tests { - use super::{find_utf8_split_point, OutputBuffer, Utf8ChunkAccumulator, MAX_BUFFER_LINES}; - - #[test] - fn utf8_split_point_returns_full_len_for_complete_input() { - assert_eq!(find_utf8_split_point(b"hello"), 5); - assert_eq!(find_utf8_split_point("中文".as_bytes()), "中文".len()); - assert_eq!(find_utf8_split_point("😀".as_bytes()), "😀".len()); - } - - #[test] - fn utf8_split_point_detects_incomplete_trailing_sequence() { - let data = [b'a', 0xE4, 0xB8]; - assert_eq!(find_utf8_split_point(&data), 1); - } - - #[test] - fn utf8_split_point_keeps_malformed_prefix_but_buffers_trailing_lead_byte() { - let data = [0xFF, 0xE4]; - assert_eq!(find_utf8_split_point(&data), 1); - } - - #[test] - fn utf8_split_point_treats_orphan_continuations_as_complete() { - let data = [0x80, 0x81, 0x82]; - assert_eq!(find_utf8_split_point(&data), data.len()); - } - - #[test] - fn utf8_chunk_accumulator_reassembles_split_multibyte_output() { - let full = "你好世界".as_bytes(); - let mut chunker = Utf8ChunkAccumulator::default(); - let mut output = Vec::new(); - - for chunk in full.chunks(5) { - if let Some(data) = chunker.push_chunk(chunk.to_vec()) { - output.extend_from_slice(&data); - } - } - - if let Some(data) = chunker.finish() { - output.extend_from_slice(&data); - } - - assert_eq!(output, full); - } - - #[test] - fn utf8_chunk_accumulator_buffers_leading_split_multibyte_output() { - let mut chunker = Utf8ChunkAccumulator::default(); - - assert!(chunker.push_chunk(vec![0xE4]).is_none()); - assert!(chunker.push_chunk(vec![0xB8]).is_none()); - assert_eq!( - chunker.push_chunk(vec![0xAD]), - Some("中".as_bytes().to_vec()) - ); - assert!(chunker.finish().is_none()); - } - - #[test] - fn utf8_chunk_accumulator_flushes_incomplete_tail_on_finish() { - let mut chunker = Utf8ChunkAccumulator::default(); - assert_eq!(chunker.push_chunk(vec![b'a', 0xE4]), Some(vec![b'a'])); - assert_eq!(chunker.finish(), Some(vec![0xE4])); - assert!(chunker.finish().is_none()); - } - - #[test] - fn utf8_chunk_accumulator_does_not_stall_on_malformed_bytes() { - let mut chunker = Utf8ChunkAccumulator::default(); - assert_eq!(chunker.push_chunk(vec![0xFF]), Some(vec![0xFF])); - assert!(chunker.finish().is_none()); - } - - #[test] - fn utf8_chunk_accumulator_buffers_lone_utf8_lead_bytes() { - let mut chunker = Utf8ChunkAccumulator::default(); - assert!(chunker.push_chunk(vec![0xE4]).is_none()); - assert_eq!(chunker.finish(), Some(vec![0xE4])); - } - - #[test] - fn utf8_chunk_accumulator_does_not_hold_back_non_utf8_prefixes() { - let mut chunker = Utf8ChunkAccumulator::default(); - assert_eq!(chunker.push_chunk(vec![0xFF, 0xE4]), Some(vec![0xFF, 0xE4])); - assert!(chunker.finish().is_none()); - } - - #[test] - fn output_buffer_trim_after_incomplete_merge_does_not_underflow() { - let mut buffer = OutputBuffer::new(); - - // Create an incomplete line first. - buffer.append(b"hello"); - - // Merge a large chunk that contains the first newline at the tail. - // This exercises the "append to last incomplete line" branch. - let mut large = vec![b'a'; 30_000]; - large.push(b'\n'); - buffer.append(&large); - - // Exceed MAX_BUFFER_LINES so trim pops the first large merged line. - for _ in 0..=MAX_BUFFER_LINES { - buffer.append(b"x\n"); - } - - let actual_size: usize = buffer.lines.iter().map(|line| line.len()).sum(); - assert_eq!(buffer.total_size, actual_size); - } -} diff --git a/src/server/uinput.rs b/src/server/uinput.rs index a1947d79f..894ce82f9 100644 --- a/src/server/uinput.rs +++ b/src/server/uinput.rs @@ -90,13 +90,6 @@ pub mod client { } fn key_sequence(&mut self, sequence: &str) { - // Sequence events are normally handled in the --server process before reaching here. - // Forward via IPC as a fallback — input_text_wayland can still handle ASCII chars - // via keysym/uinput, though non-ASCII will be skipped (no clipboard in --service). - log::debug!( - "UInputKeyboard::key_sequence called (len={})", - sequence.len() - ); allow_err!(self.send(Data::Keyboard(DataKeyboard::Sequence(sequence.to_string())))); } @@ -185,13 +178,6 @@ pub mod client { pub mod service { use super::*; use hbb_common::lazy_static; - #[cfg(target_os = "linux")] - use parity_tokio_ipc::Connection as RawIpcConnection; - use scrap::wayland::{ - pipewire::RDP_SESSION_INFO, remote_desktop_portal::OrgFreedesktopPortalRemoteDesktop, - }; - #[cfg(target_os = "linux")] - use std::os::unix::io::AsRawFd; use std::{collections::HashMap, sync::Mutex}; lazy_static::lazy_static! { @@ -323,9 +309,6 @@ pub mod service { ('/', (evdev::Key::KEY_SLASH, false)), (';', (evdev::Key::KEY_SEMICOLON, false)), ('\'', (evdev::Key::KEY_APOSTROPHE, false)), - // Space is intentionally in both KEY_MAP_LAYOUT (char-to-evdev for text input) - // and KEY_MAP (Key::Space for key events). Both maps serve different lookup paths. - (' ', (evdev::Key::KEY_SPACE, false)), // Shift + key ('A', (evdev::Key::KEY_A, true)), @@ -381,155 +364,6 @@ pub mod service { static ref RESOLUTION: Mutex<((i32, i32), (i32, i32))> = Mutex::new(((0, 0), (0, 0))); } - /// Input text on Wayland using layout-independent methods. - /// ASCII chars (0x20-0x7E): Portal keysym or uinput fallback - /// Non-ASCII chars: skipped — this runs in the --service (root) process where clipboard - /// operations are unreliable (typically no user session environment). - /// Non-ASCII input is normally handled by the --server process via input_text_via_clipboard_server. - fn input_text_wayland(text: &str, keyboard: &mut VirtualDevice) { - let portal_info = { - let session_info = RDP_SESSION_INFO.lock().unwrap(); - session_info - .as_ref() - .map(|info| (info.conn.clone(), info.session.clone())) - }; - - for c in text.chars() { - let keysym = char_to_keysym(c); - if can_input_via_keysym(c, keysym) { - // Try Portal first — down+up on the same channel - if let Some((ref conn, ref session)) = portal_info { - let portal = scrap::wayland::pipewire::get_portal(conn); - if portal - .notify_keyboard_keysym(session, HashMap::new(), keysym, 1) - .is_ok() - { - if let Err(e) = - portal.notify_keyboard_keysym(session, HashMap::new(), keysym, 0) - { - log::warn!( - "input_text_wayland: portal key-up failed for keysym {:#x}: {:?}", - keysym, - e - ); - } - continue; - } - } - // Portal unavailable or failed, fallback to uinput (down+up together) - let key = enigo::Key::Layout(c); - if let Ok((evdev_key, is_shift)) = map_key(&key) { - let mut shift_pressed = false; - if is_shift { - let shift_down = - InputEvent::new(EventType::KEY, evdev::Key::KEY_LEFTSHIFT.code(), 1); - if keyboard.emit(&[shift_down]).is_ok() { - shift_pressed = true; - } else { - log::warn!("input_text_wayland: failed to press Shift for '{}'", c); - } - } - let key_down = InputEvent::new(EventType::KEY, evdev_key.code(), 1); - let key_up = InputEvent::new(EventType::KEY, evdev_key.code(), 0); - allow_err!(keyboard.emit(&[key_down, key_up])); - if shift_pressed { - let shift_up = - InputEvent::new(EventType::KEY, evdev::Key::KEY_LEFTSHIFT.code(), 0); - allow_err!(keyboard.emit(&[shift_up])); - } - } - } else { - log::debug!("Skipping non-ASCII character in uinput service (no clipboard access)"); - } - } - } - - /// Send a single key down or up event for a Layout character. - /// Used by KeyDown/KeyUp to maintain correct press/release semantics. - /// `down`: true for key press, false for key release. - fn input_char_wayland_key_event(chr: char, down: bool, keyboard: &mut VirtualDevice) { - let keysym = char_to_keysym(chr); - let portal_state: u32 = if down { 1 } else { 0 }; - - if can_input_via_keysym(chr, keysym) { - let portal_info = { - let session_info = RDP_SESSION_INFO.lock().unwrap(); - session_info - .as_ref() - .map(|info| (info.conn.clone(), info.session.clone())) - }; - if let Some((ref conn, ref session)) = portal_info { - let portal = scrap::wayland::pipewire::get_portal(conn); - if portal - .notify_keyboard_keysym(session, HashMap::new(), keysym, portal_state) - .is_ok() - { - return; - } - } - // Portal unavailable or failed, fallback to uinput - let key = enigo::Key::Layout(chr); - if let Ok((evdev_key, is_shift)) = map_key(&key) { - if down { - // Press: Shift↓ (if needed) → Key↓ - if is_shift { - let shift_down = - InputEvent::new(EventType::KEY, evdev::Key::KEY_LEFTSHIFT.code(), 1); - if let Err(e) = keyboard.emit(&[shift_down]) { - log::warn!("input_char_wayland_key_event: failed to press Shift for '{}': {:?}", chr, e); - } - } - let key_down = InputEvent::new(EventType::KEY, evdev_key.code(), 1); - allow_err!(keyboard.emit(&[key_down])); - } else { - // Release: Key↑ → Shift↑ (if needed) - let key_up = InputEvent::new(EventType::KEY, evdev_key.code(), 0); - allow_err!(keyboard.emit(&[key_up])); - if is_shift { - let shift_up = - InputEvent::new(EventType::KEY, evdev::Key::KEY_LEFTSHIFT.code(), 0); - if let Err(e) = keyboard.emit(&[shift_up]) { - log::warn!("input_char_wayland_key_event: failed to release Shift for '{}': {:?}", chr, e); - } - } - } - } - } else { - // Non-ASCII: no reliable down/up semantics available. - // Clipboard paste is atomic and handled elsewhere. - log::debug!( - "Skipping non-ASCII character key {} in uinput service", - if down { "down" } else { "up" } - ); - } - } - - /// Check if character can be input via keysym (ASCII printable with valid keysym). - #[inline] - pub(crate) fn can_input_via_keysym(c: char, keysym: i32) -> bool { - // ASCII printable: 0x20 (space) to 0x7E (tilde) - (c as u32 >= 0x20 && c as u32 <= 0x7E) && keysym != 0 - } - - /// Convert a Unicode character to X11 keysym. - pub(crate) fn char_to_keysym(c: char) -> i32 { - let codepoint = c as u32; - if codepoint == 0 { - // Null character has no keysym - 0 - } else if (0x20..=0x7E).contains(&codepoint) { - // ASCII printable (0x20-0x7E): keysym == Unicode codepoint - codepoint as i32 - } else if (0xA0..=0xFF).contains(&codepoint) { - // Latin-1 supplement (0xA0-0xFF): keysym == Unicode codepoint (per X11 keysym spec) - codepoint as i32 - } else { - // Everything else (control chars 0x01-0x1F, DEL 0x7F, and all other non-ASCII Unicode): - // keysym = 0x01000000 | codepoint (X11 Unicode keysym encoding) - (0x0100_0000 | codepoint) as i32 - } - } - fn create_uinput_keyboard() -> ResultType { // TODO: ensure keys here let mut keys = AttributeSet::::new(); @@ -556,13 +390,13 @@ pub mod service { pub fn map_key(key: &enigo::Key) -> ResultType<(evdev::Key, bool)> { if let Some(k) = KEY_MAP.get(&key) { - log::trace!("mapkey matched in KEY_MAP, evdev={:?}", &k); + log::trace!("mapkey {:?}, get {:?}", &key, &k); return Ok((k.clone(), false)); } else { match key { enigo::Key::Layout(c) => { if let Some((k, is_shift)) = KEY_MAP_LAYOUT.get(&c) { - log::trace!("mapkey Layout matched, evdev={:?}", k); + log::trace!("mapkey {:?}, get {:?}", &key, k); return Ok((k.clone(), is_shift.clone())); } } @@ -587,74 +421,41 @@ pub mod service { keyboard: &mut VirtualDevice, data: &DataKeyboard, ) { - let data_desc = match data { - DataKeyboard::Sequence(seq) => format!("Sequence(len={})", seq.len()), - DataKeyboard::KeyDown(Key::Layout(_)) - | DataKeyboard::KeyUp(Key::Layout(_)) - | DataKeyboard::KeyClick(Key::Layout(_)) => "Layout()".to_string(), - _ => format!("{:?}", data), - }; - log::trace!("handle_keyboard received: {}", data_desc); + log::trace!("handle_keyboard {:?}", &data); match data { - DataKeyboard::Sequence(seq) => { - // Normally handled by --server process (input_text_via_clipboard_server). - // Fallback: input_text_wayland handles ASCII via keysym/uinput; - // non-ASCII will be skipped (no clipboard access in --service process). - if !seq.is_empty() { - input_text_wayland(seq, keyboard); - } + DataKeyboard::Sequence(_seq) => { + // ignore } DataKeyboard::KeyDown(enigo::Key::Raw(code)) => { - if *code < 8 { - log::error!( - "Invalid Raw keycode {} (must be >= 8 due to XKB offset), skipping", - code - ); - } else { - let down_event = InputEvent::new(EventType::KEY, *code - 8, 1); + let down_event = InputEvent::new(EventType::KEY, *code - 8, 1); + allow_err!(keyboard.emit(&[down_event])); + } + DataKeyboard::KeyUp(enigo::Key::Raw(code)) => { + let up_event = InputEvent::new(EventType::KEY, *code - 8, 0); + allow_err!(keyboard.emit(&[up_event])); + } + DataKeyboard::KeyDown(key) => { + if let Ok((k, is_shift)) = map_key(key) { + if is_shift { + let down_event = + InputEvent::new(EventType::KEY, evdev::Key::KEY_LEFTSHIFT.code(), 1); + allow_err!(keyboard.emit(&[down_event])); + } + let down_event = InputEvent::new(EventType::KEY, k.code(), 1); allow_err!(keyboard.emit(&[down_event])); } } - DataKeyboard::KeyUp(enigo::Key::Raw(code)) => { - if *code < 8 { - log::error!( - "Invalid Raw keycode {} (must be >= 8 due to XKB offset), skipping", - code - ); - } else { - let up_event = InputEvent::new(EventType::KEY, *code - 8, 0); + DataKeyboard::KeyUp(key) => { + if let Ok((k, _)) = map_key(key) { + let up_event = InputEvent::new(EventType::KEY, k.code(), 0); allow_err!(keyboard.emit(&[up_event])); } } - DataKeyboard::KeyDown(key) => { - if let Key::Layout(chr) = key { - input_char_wayland_key_event(*chr, true, keyboard); - } else { - if let Ok((k, _is_shift)) = map_key(key) { - let down_event = InputEvent::new(EventType::KEY, k.code(), 1); - allow_err!(keyboard.emit(&[down_event])); - } - } - } - DataKeyboard::KeyUp(key) => { - if let Key::Layout(chr) = key { - input_char_wayland_key_event(*chr, false, keyboard); - } else { - if let Ok((k, _)) = map_key(key) { - let up_event = InputEvent::new(EventType::KEY, k.code(), 0); - allow_err!(keyboard.emit(&[up_event])); - } - } - } DataKeyboard::KeyClick(key) => { - if let Key::Layout(chr) = key { - input_text_wayland(&chr.to_string(), keyboard); - } else { - if let Ok((k, _is_shift)) = map_key(key) { - let down_event = InputEvent::new(EventType::KEY, k.code(), 1); - let up_event = InputEvent::new(EventType::KEY, k.code(), 0); - allow_err!(keyboard.emit(&[down_event, up_event])); - } + if let Ok((k, _)) = map_key(key) { + let down_event = InputEvent::new(EventType::KEY, k.code(), 1); + let up_event = InputEvent::new(EventType::KEY, k.code(), 0); + allow_err!(keyboard.emit(&[down_event, up_event])); } } DataKeyboard::GetKeyState(key) => { @@ -779,13 +580,9 @@ pub mod service { } fn spawn_keyboard_handler(mut stream: Connection) { - log::debug!("spawn_keyboard_handler: new keyboard handler connection"); tokio::spawn(async move { let mut keyboard = match create_uinput_keyboard() { - Ok(keyboard) => { - log::debug!("UInput keyboard device created successfully"); - keyboard - } + Ok(keyboard) => keyboard, Err(e) => { log::error!("Failed to create keyboard {}", e); return; @@ -805,7 +602,6 @@ pub mod service { handle_keyboard(&mut stream, &mut keyboard, &data).await; } _ => { - log::warn!("Unexpected data type in keyboard handler"); } } } @@ -919,35 +715,6 @@ pub mod service { }); } - #[cfg(target_os = "linux")] - fn authorize_uinput_peer(postfix: &str, stream: &RawIpcConnection) -> bool { - if !hbb_common::config::is_service_ipc_postfix(postfix) { - return true; - } - let peer_uid = ipc::peer_uid_from_fd(stream.as_raw_fd()); - let active_uid = crate::platform::linux::get_active_userid_fresh() - .trim() - .parse::() - .ok(); - let authorized = - peer_uid.is_some_and(|uid| ipc::is_allowed_service_peer_uid(uid, active_uid)); - if !authorized { - crate::ipc::log_rejected_uinput_connection(postfix, peer_uid, active_uid); - return false; - } - if let Err(err) = - ipc::ensure_peer_executable_matches_current_by_fd(stream.as_raw_fd(), postfix) - { - log::warn!( - "Rejected connection on protected uinput ipc channel due to executable mismatch: postfix={}, err={}", - postfix, - err - ); - return false; - } - true - } - /// Start uinput service. async fn start_service(postfix: &str, handler: F) { match new_listener(postfix).await { @@ -955,10 +722,6 @@ pub mod service { while let Some(result) = incoming.next().await { match result { Ok(stream) => { - #[cfg(target_os = "linux")] - if !authorize_uinput_peer(postfix, &stream) { - continue; - } log::debug!("Got new connection of uinput ipc {}", postfix); handler(Connection::new(stream)); } diff --git a/src/server/video_qos.rs b/src/server/video_qos.rs index b02f6adf3..344fc8548 100644 --- a/src/server/video_qos.rs +++ b/src/server/video_qos.rs @@ -19,7 +19,7 @@ b. 3 seconds timeout => update ratio according to network delay When network delay < DELAY_THRESHOLD_150MS, increase ratio, max 150kbps; When network delay >= DELAY_THRESHOLD_150MS, decrease ratio; -adjust between FPS and ratio: +adjust betwen FPS and ratio: When network delay < DELAY_THRESHOLD_150MS, fps is always higher than the minimum fps, and ratio is increasing; When network delay >= DELAY_THRESHOLD_150MS, fps is always lower than the minimum fps, and ratio is decreasing; diff --git a/src/server/video_service.rs b/src/server/video_service.rs index 13a781c28..a9474db74 100644 --- a/src/server/video_service.rs +++ b/src/server/video_service.rs @@ -62,18 +62,11 @@ use std::{ pub const OPTION_REFRESH: &'static str = "refresh"; -type FrameFetchedNotifierSender = UnboundedSender<(i32, Option)>; -type FrameFetchedNotifierReceiver = Arc)>>>; - lazy_static::lazy_static! { - static ref FRAME_FETCHED_NOTIFIERS: Mutex> = Mutex::new(HashMap::default()); - - // display_idx -> set of conn id. - // Used to record which connections need to be notified when - // 1. A new frame is received from a web client. - // Because web client does not send the display index in message `VideoReceived`. - // 2. The client is closing. - static ref DISPLAY_CONN_IDS: Arc>>> = Default::default(); + static ref FRAME_FETCHED_NOTIFIER: (UnboundedSender<(i32, Option)>, Arc)>>>) = { + let (tx, rx) = unbounded_channel(); + (tx, Arc::new(TokioMutex::new(rx))) + }; pub static ref VIDEO_QOS: Arc> = Default::default(); pub static ref IS_UAC_RUNNING: Arc> = Default::default(); pub static ref IS_FOREGROUND_WINDOW_ELEVATED: Arc> = Default::default(); @@ -87,45 +80,18 @@ struct Screenshot { } #[inline] -pub fn notify_video_frame_fetched(display_idx: usize, conn_id: i32, frame_tm: Option) { - if let Some(notifier) = FRAME_FETCHED_NOTIFIERS.lock().unwrap().get(&display_idx) { - notifier.0.send((conn_id, frame_tm)).ok(); - } -} - -#[inline] -pub fn notify_video_frame_fetched_by_conn_id(conn_id: i32, frame_tm: Option) { - let vec_display_idx: Vec = { - let display_conn_ids = DISPLAY_CONN_IDS.lock().unwrap(); - display_conn_ids - .iter() - .filter_map(|(display_idx, conn_ids)| { - if conn_ids.contains(&conn_id) { - Some(*display_idx) - } else { - None - } - }) - .collect() - }; - let notifiers = FRAME_FETCHED_NOTIFIERS.lock().unwrap(); - for display_idx in vec_display_idx { - if let Some(notifier) = notifiers.get(&display_idx) { - notifier.0.send((conn_id, frame_tm)).ok(); - } - } +pub fn notify_video_frame_fetched(conn_id: i32, frame_tm: Option) { + FRAME_FETCHED_NOTIFIER.0.send((conn_id, frame_tm)).ok(); } struct VideoFrameController { - display_idx: usize, cur: Instant, send_conn_ids: HashSet, } impl VideoFrameController { - fn new(display_idx: usize) -> Self { + fn new() -> Self { Self { - display_idx, cur: Instant::now(), send_conn_ids: HashSet::new(), } @@ -139,10 +105,6 @@ impl VideoFrameController { if !conn_ids.is_empty() { self.cur = tm; self.send_conn_ids = conn_ids; - DISPLAY_CONN_IDS - .lock() - .unwrap() - .insert(self.display_idx, self.send_conn_ids.clone()); } } @@ -153,20 +115,8 @@ impl VideoFrameController { } let timeout_dur = Duration::from_millis(timeout_millis as u64); - let receiver = { - match FRAME_FETCHED_NOTIFIERS - .lock() - .unwrap() - .get(&self.display_idx) - { - Some(notifier) => notifier.1.clone(), - None => { - return; - } - } - }; - let mut receiver_guard = receiver.lock().await; - match tokio::time::timeout(timeout_dur, receiver_guard.recv()).await { + match tokio::time::timeout(timeout_dur, FRAME_FETCHED_NOTIFIER.1.lock().await.recv()).await + { Err(_) => { // break if timeout // log::error!("blocking wait frame receiving timeout {}", timeout_millis); @@ -181,14 +131,6 @@ impl VideoFrameController { // this branch would never be reached } } - while !receiver_guard.is_empty() { - if let Some((id, instant)) = receiver_guard.recv().await { - if let Some(tm) = instant { - log::trace!("Channel recv latency: {}", tm.elapsed().as_secs_f32()); - } - fetched_conn_ids.insert(id); - } - } } } @@ -241,14 +183,6 @@ pub fn get_service_name(source: VideoSource, idx: usize) -> String { } pub fn new(source: VideoSource, idx: usize) -> GenericService { - let _ = FRAME_FETCHED_NOTIFIERS - .lock() - .unwrap() - .entry(idx) - .or_insert_with(|| { - let (tx, rx) = unbounded_channel(); - (tx, Arc::new(TokioMutex::new(rx))) - }); let vs = VideoService { sp: GenericService::new(get_service_name(source, idx), true), idx, @@ -391,7 +325,7 @@ fn get_capturer_monitor( #[cfg(target_os = "linux")] { if !is_x11() { - return super::wayland::get_capturer_for_display(current); + return super::wayland::get_capturer(); } } @@ -530,7 +464,7 @@ fn get_capturer( } fn run(vs: VideoService) -> ResultType<()> { - let mut _raii = Raii::new(vs.idx, vs.sp.name()); + let mut _raii = Raii::new(vs.sp.name()); // Wayland only support one video capturer for now. It is ok to call ensure_inited() here. // // ensure_inited() is needed because clear() may be called. @@ -539,20 +473,11 @@ fn run(vs: VideoService) -> ResultType<()> { #[cfg(target_os = "linux")] super::wayland::ensure_inited()?; #[cfg(target_os = "linux")] - let _wayland_call_on_ret = { - // Increment active display count when starting - let _display_count = super::wayland::increment_active_display_count(); - - SimpleCallOnReturn { - b: true, - f: Box::new(|| { - // Decrement active display count and only clear if this was the last display - let remaining_count = super::wayland::decrement_active_display_count(); - if remaining_count == 0 { - super::wayland::clear(); - } - }), - } + let _wayland_call_on_ret = SimpleCallOnReturn { + b: true, + f: Box::new(|| { + super::wayland::clear(); + }), }; #[cfg(windows)] @@ -629,7 +554,7 @@ fn run(vs: VideoService) -> ResultType<()> { sp.set_option_bool(OPTION_REFRESH, false); } - let mut frame_controller = VideoFrameController::new(display_idx); + let mut frame_controller = VideoFrameController::new(); let start = time::Instant::now(); let mut last_check_displays = time::Instant::now(); @@ -877,7 +802,6 @@ fn run(vs: VideoService) -> ResultType<()> { break; } } - DISPLAY_CONN_IDS.lock().unwrap().remove(&display_idx); let elapsed = now.elapsed(); // may need to enable frame(timeout) @@ -891,17 +815,15 @@ fn run(vs: VideoService) -> ResultType<()> { } struct Raii { - display_idx: usize, name: String, try_vram: bool, } impl Raii { - fn new(display_idx: usize, name: String) -> Self { + fn new(name: String) -> Self { log::info!("new video service: {}", name); VIDEO_QOS.lock().unwrap().new_display(name.clone()); Raii { - display_idx, name, try_vram: true, } @@ -918,7 +840,6 @@ impl Drop for Raii { #[cfg(feature = "vram")] Encoder::update(scrap::codec::EncodingUpdate::Check); VIDEO_QOS.lock().unwrap().remove_display(&self.name); - DISPLAY_CONN_IDS.lock().unwrap().remove(&self.display_idx); } } diff --git a/src/server/wayland.rs b/src/server/wayland.rs index 1e0efc0f4..42c613277 100644 --- a/src/server/wayland.rs +++ b/src/server/wayland.rs @@ -1,46 +1,28 @@ use super::*; -use hbb_common::{allow_err, anyhow, platform::linux::DISTRO}; -use scrap::{ - is_cursor_embedded, set_map_err, - wayland::pipewire::{fill_displays, try_fix_logical_size}, - Capturer, Display, Frame, TraitCapturer, +use hbb_common::{ + allow_err, + platform::linux::{CMD_SH, DISTRO}, }; -use std::collections::HashMap; +use scrap::{is_cursor_embedded, set_map_err, Capturer, Display, Frame, TraitCapturer}; use std::io; +use std::process::{Command, Output}; use crate::{ client::{ - SCRAP_OTHER_VERSION_OR_X11_REQUIRED, SCRAP_UBUNTU_HIGHER_REQUIRED, - SCRAP_X11_REQUIRED, SCRAP_XDP_PORTAL_UNAVAILABLE, + SCRAP_OTHER_VERSION_OR_X11_REQUIRED, SCRAP_UBUNTU_HIGHER_REQUIRED, SCRAP_X11_REQUIRED, }, platform::linux::is_x11, }; lazy_static::lazy_static! { - static ref CAP_DISPLAY_INFO: RwLock> = RwLock::new(HashMap::new()); - static ref PIPEWIRE_INITIALIZED: RwLock = RwLock::new(false); + static ref CAP_DISPLAY_INFO: RwLock = RwLock::new(0); static ref LOG_SCRAP_COUNT: Mutex = Mutex::new(0); - static ref ACTIVE_DISPLAY_COUNT: RwLock = RwLock::new(0); } pub fn init() { set_map_err(map_err_scrap); } -pub(super) fn increment_active_display_count() -> usize { - let mut count = ACTIVE_DISPLAY_COUNT.write().unwrap(); - *count += 1; - *count -} - -pub(super) fn decrement_active_display_count() -> usize { - let mut count = ACTIVE_DISPLAY_COUNT.write().unwrap(); - if *count > 0 { - *count -= 1; - } - *count -} - fn map_err_scrap(err: String) -> io::Error { // to-do: Handle error better, do not restart server if err.starts_with("Did not receive a reply") { @@ -57,15 +39,10 @@ fn map_err_scrap(err: String) -> io::Error { } } else { try_log(&err); - let err_lower = err.to_ascii_lowercase(); - if err_lower.contains("org.freedesktop.portal") - || err_lower.contains("dbus") - || err_lower.contains("d-bus") + if err.contains("org.freedesktop.portal") + || err.contains("pipewire") + || err.contains("dbus") { - // The portal D-Bus interface is unreachable. This typically means - // xdg-desktop-portal has crashed... for more info, see: Issue #12897 - io::Error::new(io::ErrorKind::Other, SCRAP_XDP_PORTAL_UNAVAILABLE) - } else if err_lower.contains("pipewire") { io::Error::new(io::ErrorKind::Other, SCRAP_OTHER_VERSION_OR_X11_REQUIRED) } else { io::Error::new(io::ErrorKind::Other, SCRAP_X11_REQUIRED) @@ -93,7 +70,7 @@ impl Clone for CapturerPtr { } impl TraitCapturer for CapturerPtr { - fn frame<'a>(&'a mut self, timeout: std::time::Duration) -> std::io::Result> { + fn frame<'a>(&'a mut self, timeout: Duration) -> io::Result> { unsafe { (*self.0).frame(timeout) } } } @@ -116,7 +93,7 @@ pub(super) fn is_inited() -> Option { if is_x11() { None } else { - if CAP_DISPLAY_INFO.read().unwrap().is_empty() { + if *CAP_DISPLAY_INFO.read().unwrap() == 0 { let mut msg_out = Message::new(); let res = MessageBox { msgtype: "nook-nocancel-hasclose".to_owned(), @@ -133,48 +110,37 @@ pub(super) fn is_inited() -> Option { } } +fn get_max_desktop_resolution() -> Option { + // works with Xwayland + let output: Output = Command::new(CMD_SH.as_str()) + .arg("-c") + .arg("xrandr | awk '/current/ { print $8,$9,$10 }'") + .output() + .ok()?; + + if output.status.success() { + let result = String::from_utf8_lossy(&output.stdout); + Some(result.trim().to_string()) + } else { + None + } +} + pub(super) async fn check_init() -> ResultType<()> { if !is_x11() { - if CAP_DISPLAY_INFO.read().unwrap().is_empty() { - if crate::input_service::wayland_use_uinput() { - if let Some((minx, maxx, miny, maxy)) = - scrap::wayland::display::get_desktop_rect_for_uinput() - { - log::info!( - "update mouse resolution: ({}, {}), ({}, {})", - minx, - maxx, - miny, - maxy - ); - allow_err!( - input_service::update_mouse_resolution(minx, maxx, miny, maxy).await - ); - } else { - log::warn!("Failed to get desktop rect for uinput"); - } - } + let mut minx = 0; + let mut maxx = 0; + let mut miny = 0; + let mut maxy = 0; + let use_uinput = crate::input_service::wayland_use_uinput(); + if *CAP_DISPLAY_INFO.read().unwrap() == 0 { let mut lock = CAP_DISPLAY_INFO.write().unwrap(); - if lock.is_empty() { - // Check if PipeWire is already initialized to prevent duplicate recorder creation - if *PIPEWIRE_INITIALIZED.read().unwrap() { - log::warn!("wayland_diag: Preventing duplicate PipeWire initialization"); - return Ok(()); - } - + if *lock == 0 { let mut all = Display::all()?; - log::debug!("Initializing displays with fill_displays()"); - { - let temp_mouse_move_handle = input_service::TemporaryMouseMoveHandle::new(); - let move_mouse_to = |x, y| temp_mouse_move_handle.move_mouse_to(x, y); - fill_displays(move_mouse_to, crate::get_cursor_pos, &mut all)?; - } - log::debug!("Attempting to fix logical size with try_fix_logical_size()"); - try_fix_logical_size(&mut all); - *PIPEWIRE_INITIALIZED.write().unwrap() = true; let num = all.len(); let primary = super::display_service::get_primary_2(&all); + let current = primary; super::display_service::check_update_displays(&all); let mut displays = super::display_service::get_sync_displays(); for display in displays.iter_mut() { @@ -186,34 +152,69 @@ pub(super) async fn check_init() -> ResultType<()> { rects.push((d.origin(), d.width(), d.height())); } + let display = all.remove(current); + let (origin, width, height) = (display.origin(), display.width(), display.height()); log::debug!( - "#displays={}, primary={}, rects: {:?}, cpus={}/{}", + "#displays={}, current={}, origin: {:?}, width={}, height={}, cpus={}/{}", num, - primary, - rects, + current, + &origin, + width, + height, num_cpus::get_physical(), - num_cpus::get() + num_cpus::get(), ); - // Create individual CapDisplayInfo for each display with its own capturer - for (idx, display) in all.into_iter().enumerate() { - let capturer = - Box::into_raw(Box::new(Capturer::new(display).with_context(|| { - format!("Failed to create capturer for display {}", idx) - })?)); - let capturer = CapturerPtr(capturer); + if use_uinput { + let (max_width, max_height) = match get_max_desktop_resolution() { + Some(result) if !result.is_empty() => { + let resolution: Vec<&str> = result.split(" ").collect(); + let w: i32 = resolution[0].parse().unwrap_or(origin.0 + width as i32); + let h: i32 = resolution[2] + .trim_end_matches(",") + .parse() + .unwrap_or(origin.1 + height as i32); + if w < origin.0 + width as i32 || h < origin.1 + height as i32 { + (origin.0 + width as i32, origin.1 + height as i32) + } else { + (w, h) + } + } + _ => (origin.0 + width as i32, origin.1 + height as i32), + }; - let cap_display_info = Box::into_raw(Box::new(CapDisplayInfo { - rects: rects.clone(), - displays: displays.clone(), - num, - primary, - current: idx, - capturer, - })); - - lock.insert(idx, cap_display_info as u64); + minx = 0; + maxx = max_width; + miny = 0; + maxy = max_height; } + + let capturer = Box::into_raw(Box::new( + Capturer::new(display).with_context(|| "Failed to create capturer")?, + )); + let capturer = CapturerPtr(capturer); + let cap_display_info = Box::into_raw(Box::new(CapDisplayInfo { + rects, + displays, + num, + primary, + current, + capturer, + })); + *lock = cap_display_info as _; + } + } + + if use_uinput { + if minx != maxx && miny != maxy { + log::info!( + "update mouse resolution: ({}, {}), ({}, {})", + minx, + maxx, + miny, + maxy + ); + allow_err!(input_service::update_mouse_resolution(minx, maxx, miny, maxy).await); } } } @@ -222,9 +223,9 @@ pub(super) async fn check_init() -> ResultType<()> { pub(super) async fn get_displays() -> ResultType> { check_init().await?; - let cap_map = CAP_DISPLAY_INFO.read().unwrap(); - if let Some(addr) = cap_map.values().next() { - let cap_display_info: *const CapDisplayInfo = *addr as _; + let addr = *CAP_DISPLAY_INFO.read().unwrap(); + if addr != 0 { + let cap_display_info: *const CapDisplayInfo = addr as _; unsafe { let cap_display_info = &*cap_display_info; Ok(cap_display_info.displays.clone()) @@ -235,9 +236,9 @@ pub(super) async fn get_displays() -> ResultType> { } pub(super) fn get_primary() -> ResultType { - let cap_map = CAP_DISPLAY_INFO.read().unwrap(); - if let Some(addr) = cap_map.values().next() { - let cap_display_info: *const CapDisplayInfo = *addr as _; + let addr = *CAP_DISPLAY_INFO.read().unwrap(); + if addr != 0 { + let cap_display_info: *const CapDisplayInfo = addr as _; unsafe { let cap_display_info = &*cap_display_info; Ok(cap_display_info.primary) @@ -252,28 +253,23 @@ pub fn clear() { return; } let mut write_lock = CAP_DISPLAY_INFO.write().unwrap(); - for (_, addr) in write_lock.iter() { - let cap_display_info: *mut CapDisplayInfo = *addr as _; + if *write_lock != 0 { + let cap_display_info: *mut CapDisplayInfo = *write_lock as _; unsafe { let _box_capturer = Box::from_raw((*cap_display_info).capturer.0); let _box_cap_display_info = Box::from_raw(cap_display_info); + *write_lock = 0; } } - write_lock.clear(); - - // Reset PipeWire initialization flag to allow recreation on next init - *PIPEWIRE_INITIALIZED.write().unwrap() = false; } -pub(super) fn get_capturer_for_display( - display_idx: usize, -) -> ResultType { +pub(super) fn get_capturer() -> ResultType { if is_x11() { bail!("Do not call this function if not wayland"); } - let cap_map = CAP_DISPLAY_INFO.read().unwrap(); - if let Some(addr) = cap_map.get(&display_idx) { - let cap_display_info: *const CapDisplayInfo = *addr as _; + let addr = *CAP_DISPLAY_INFO.read().unwrap(); + if addr != 0 { + let cap_display_info: *const CapDisplayInfo = addr as _; unsafe { let cap_display_info = &*cap_display_info; let rect = cap_display_info.rects[cap_display_info.current]; @@ -289,10 +285,7 @@ pub(super) fn get_capturer_for_display( }) } } else { - bail!( - "Failed to get capturer display info for display {}", - display_idx - ); + bail!("Failed to get capturer display info"); } } diff --git a/src/tray.rs b/src/tray.rs index e8db0efc0..f36da2cec 100644 --- a/src/tray.rs +++ b/src/tray.rs @@ -10,6 +10,12 @@ use std::time::Duration; pub fn start_tray() { if crate::ui_interface::get_builtin_option(hbb_common::config::keys::OPTION_HIDE_TRAY) == "Y" { + #[cfg(target_os = "macos")] + { + loop { + std::thread::sleep(std::time::Duration::from_secs(1)); + } + } #[cfg(not(target_os = "macos"))] { return; @@ -54,22 +60,9 @@ fn make_tray() -> hbb_common::ResultType<()> { let mut event_loop = EventLoopBuilder::new().build(); let tray_menu = Menu::new(); - let hide_stop_service = crate::ui_interface::get_builtin_option( - hbb_common::config::keys::OPTION_HIDE_STOP_SERVICE, - ) == "Y"; - // The tray icon is only shown when the service is running, so we don't need to check - // the `stop-service` option here. - let quit_i = if !hide_stop_service { - Some(MenuItem::new(translate("Stop service".to_owned()), true, None)) - } else { - None - }; + let quit_i = MenuItem::new(translate("Stop service".to_owned()), true, None); let open_i = MenuItem::new(translate("Open".to_owned()), true, None); - if let Some(quit_i) = &quit_i { - tray_menu.append_items(&[&open_i, quit_i]).ok(); - } else { - tray_menu.append_items(&[&open_i]).ok(); - } + tray_menu.append_items(&[&open_i, &quit_i]).ok(); let tooltip = |count: usize| { if count == 0 { format!( @@ -136,11 +129,6 @@ fn make_tray() -> hbb_common::ResultType<()> { ); if let tao::event::Event::NewEvents(tao::event::StartCause::Init) = event { - // for fixing https://github.com/rustdesk/rustdesk/discussions/10210#discussioncomment-14600745 - // so we start tray, but not to show it - if crate::ui_interface::get_builtin_option(hbb_common::config::keys::OPTION_HIDE_TRAY) == "Y" { - return; - } // We create the icon once the event loop is actually running // to prevent issues like https://github.com/tauri-apps/tray-icon/issues/90 let tray = TrayIconBuilder::new() @@ -168,19 +156,15 @@ fn make_tray() -> hbb_common::ResultType<()> { } if let Ok(event) = menu_channel.try_recv() { - if let Some(quit_i) = &quit_i { - if event.id == quit_i.id() { - /* failed in windows, seems no permission to check system process - if !crate::check_process("--server", false) { - *control_flow = ControlFlow::Exit; - return; - } - */ - if !crate::platform::uninstall_service(false, false) { - *control_flow = ControlFlow::Exit; - } - } else if event.id == open_i.id() { - open_func(); + if event.id == quit_i.id() { + /* failed in windows, seems no permission to check system process + if !crate::check_process("--server", false) { + *control_flow = ControlFlow::Exit; + return; + } + */ + if !crate::platform::uninstall_service(false, false) { + *control_flow = ControlFlow::Exit; } } else if event.id == open_i.id() { open_func(); diff --git a/src/ui.rs b/src/ui.rs index 6d0d0927a..6bef48ba2 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -118,11 +118,6 @@ pub fn start(args: &mut [String]) { Box::new(cm::SciterConnectionManager::new()) }); page = "cm.html"; - *cm::HIDE_CM.lock().unwrap() = crate::ipc::get_config("hide_cm") - .ok() - .flatten() - .unwrap_or_default() - == "true"; } else if (args[0] == "--connect" || args[0] == "--file-transfer" || args[0] == "--port-forward" @@ -183,13 +178,6 @@ pub fn start(args: &mut [String]) { .unwrap_or("".to_owned()), page )); - let hide_cm = *cm::HIDE_CM.lock().unwrap(); - if !args.is_empty() && args[0] == "--cm" && hide_cm { - // run_app calls expand(show) + run_loop, we use collapse(hide) + run_loop instead to create a hidden window - frame.collapse(true); - frame.run_loop(); - return; - } frame.run_app(); } @@ -212,16 +200,12 @@ impl UI { update_temporary_password() } + fn permanent_password(&self) -> String { + permanent_password() + } + fn set_permanent_password(&self, password: String) { - let _ = set_permanent_password_with_result(password); - } - - fn is_local_permanent_password_set(&self) -> bool { - is_local_permanent_password_set() - } - - fn is_permanent_password_set(&self) -> bool { - is_permanent_password_set() + set_permanent_password(password); } fn get_remote_id(&mut self) -> String { @@ -288,34 +272,6 @@ impl UI { crate::using_public_server() } - fn is_incoming_only(&self) -> bool { - hbb_common::config::is_incoming_only() - } - - pub fn is_outgoing_only(&self) -> bool { - hbb_common::config::is_outgoing_only() - } - - pub fn is_custom_client(&self) -> bool { - crate::common::is_custom_client() - } - - pub fn is_disable_settings(&self) -> bool { - hbb_common::config::is_disable_settings() - } - - pub fn is_disable_account(&self) -> bool { - hbb_common::config::is_disable_account() - } - - pub fn is_disable_installation(&self) -> bool { - hbb_common::config::is_disable_installation() - } - - pub fn is_disable_ab(&self) -> bool { - hbb_common::config::is_disable_ab() - } - fn get_options(&self) -> Value { let hashmap: HashMap = serde_json::from_str(&get_options()).unwrap_or_default(); @@ -372,11 +328,6 @@ impl UI { is_installed() } - fn get_supported_privacy_mode_impls(&self) -> String { - serde_json::to_string(&crate::privacy_mode::get_supported_privacy_mode_impl()) - .unwrap_or_default() - } - fn is_root(&self) -> bool { is_root() } @@ -682,9 +633,9 @@ impl UI { pub fn verify2fa(&self, code: String) -> bool { verify2fa(code) } - + fn verify_login(&self, raw: String, id: String) -> bool { - crate::verify_login(&raw, &id) + crate::verify_login(&raw, &id) } fn generate_2fa_img_src(&self, data: String) -> String { @@ -700,23 +651,6 @@ impl UI { pub fn check_hwcodec(&self) { check_hwcodec() } - - fn is_option_fixed(&self, key: String) -> bool { - crate::ui_interface::is_option_fixed(&key) - } - - fn get_builtin_option(&self, key: String) -> String { - crate::ui_interface::get_builtin_option(&key) - } - - fn is_remote_modify_enabled_by_control_permissions(&self) -> String { - match crate::ui_interface::is_remote_modify_enabled_by_control_permissions() { - Some(true) => "true", - Some(false) => "false", - None => "", - } - .to_string() - } } impl sciter::EventHandler for UI { @@ -725,19 +659,11 @@ impl sciter::EventHandler for UI { fn get_api_server(); fn is_xfce(); fn using_public_server(); - fn is_custom_client(); - fn is_outgoing_only(); - fn is_incoming_only(); - fn is_disable_settings(); - fn is_disable_account(); - fn is_disable_installation(); - fn is_disable_ab(); fn get_id(); fn temporary_password(); fn update_temporary_password(); + fn permanent_password(); fn set_permanent_password(String); - fn is_local_permanent_password_set(); - fn is_permanent_password_set(); fn get_remote_id(); fn set_remote_id(String); fn closing(i32, i32, i32, i32); @@ -757,7 +683,6 @@ impl sciter::EventHandler for UI { fn get_icon(); fn install_me(String, String); fn is_installed(); - fn get_supported_privacy_mode_impls(); fn is_root(); fn is_release(); fn set_socks(String, String, String); @@ -819,9 +744,6 @@ impl sciter::EventHandler for UI { fn verify2fa(String); fn check_hwcodec(); fn verify_login(String, String); - fn is_option_fixed(String); - fn get_builtin_option(String); - fn is_remote_modify_enabled_by_control_permissions(); } } diff --git a/src/ui/ab.tis b/src/ui/ab.tis index d0c2e9edf..2c8724750 100644 --- a/src/ui/ab.tis +++ b/src/ui/ab.tis @@ -543,15 +543,15 @@ class MultipleSessions: Reactor.Component { {translate('Recent sessions')} {translate('Favorites')} {handler.is_installed() && {translate('Discovered')}} - {!disable_account && !disable_ab && {translate('Address book')}} + {translate('Address book')} - {!this.hidden && !(disable_account && type == "ab") && } - {!this.hidden && !(disable_account && type == "ab") && } + {!this.hidden && } + {!this.hidden && } {!this.hidden && ((type == "fav" && ) || (type == "lan" && handler.is_installed() && ) || - (type == "ab" && !disable_account && !disable_ab && ) || + (type == "ab" && ) || )} ; } diff --git a/src/ui/chatbox.html b/src/ui/chatbox.html index 87d616289..10d85a567 100644 --- a/src/ui/chatbox.html +++ b/src/ui/chatbox.html @@ -12,11 +12,7 @@ include "common.tis"; var p = view.parameters; view.refresh = function() { - var draft_input = $(input); - var draft = draft_input ? (draft_input.value || "") : ""; $(body).content(); - var next_input = $(input); - if (next_input) next_input.value = draft; view.focus = $(input); } function self.closing() { diff --git a/src/ui/cm.css b/src/ui/cm.css index 3ac6c7be3..baa774309 100644 --- a/src/ui/cm.css +++ b/src/ui/cm.css @@ -57,11 +57,6 @@ div.icon { font-weight: bold; } -img.icon { - size: 96px; - border-radius: 8px; -} - div.id { @ELLIPSIS; color: color(green-blue); @@ -93,13 +88,6 @@ div.permissions > div:active { opacity: 0.5; } -div.permissions.locked, -div.permissions.locked *, -div.permissions.locked > div:active { - cursor: default !important; - opacity: 1; -} - icon.keyboard { background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAgVBMVEUAAAD///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////9d3yJTAAAAKnRSTlMA0Gd/0y8ILZgbJffDPUwV2nvzt+TMqZxyU7CMb1pYQyzsvKunkXE4AwJnNC24AAAA+0lEQVQ4y83O2U7DMBCF4ZMxk9rZk26kpQs7nPd/QJy4EiLbLf01N5Y/2YP/qxDFQvGB5NPC/ZpVnfJx4b5xyGfF95rkHvNCWH1u+N6J6T0sC7gqRy8uGPfBLEbozPXUjlkQKwGaFPNizwQbwkx0TDvhCii34ExZCSQVBdzIOEOyeclSHgBGXkpeygXSQgStACtWx4Z8rr8COHOvfEP/IbbsQAToFUAAV1M408IIjIGYAPoCSNRP7DQutfQTqxuAiH7UUg1FaJR2AGrrx52sK2ye28LZ0wBAEyR6y8X+NADhm1B4fgiiHXbRrTrxpwEY9RdM9wsepnvFHfUDwYEeiwAJr/gAAAAASUVORK5CYII='); } @@ -128,10 +116,6 @@ icon.block_input { background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAjdJREFUWEe1V8tNAzEQfXOHAx2QG0UgQSqBFIIgHdABoQqOhBq4cCMlcMh90FvZq/HEXtvJxlKUZNceP783no+gY6jqNYBHAHcA+JufXTDBb37eRWTbalZqE82mz7W55v0ABMBGRCLA7PJJAKr6AiC3sT11NHyf2SEyQjvtAMKp3wBYo9VTGbYegjxxU65d5tg4YEBVbwF8ALgw2lLX4in80QqyZUEkAMLCb7P5n4hcdWifTA32Pg0bByA8AE4+oL3n9A1s7ERkEeeNAJzD/QC4OVaCAgjrU7wdK86zAHREJSKqyvvORRxVb67JFOT4NfYGpxwAqCo34oYcKxHZhOdzg7D2BhYigHj6RJ+5QbjrPezlqR61sZTOKYfztSUBWPoXpdA5FwjnC2sCGK+eiNRC8yw+oap0RiayLQHEPwf65zx7DibMoXcEEB0wq/85QJQAbEVkWbvP8f0pTFi/65ZgjtuRyJ7QYWL0OZnwTmiLDobH5nLqGDlUlcmON49jQwnsg/Wxma/VJ1zcGQIR7+OYJGyqbJWhhwlDPxh3JpNRL4Ba7nAsJckoYaFUv7UCyslBvQ3TNDWEfVsPJGH2FCkKTPAxD8ox+poFwJfZqqX15H6eYyK+TgJeriidLCJ7wAQHZ4Udy7u9iFxaG7mynEx4EF1leZDANzV7AE8i8joJICz2cvBxbExIYTZYTTQmxTxTzP+VnvC8rZlLOLEj7m5OW6JqtTs2US6247Hvy7XnX0OV05FP/gHde5fLZaGS8AAAAABJRU5ErkJggg=='); } -icon.privacy_mode { - background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAB7UlEQVR4AdyTrVYDMRCFuyjqiiuuOJA46sCVR6jDgQTXN+CgQIJCgkOCA0cduOLAgaOOuuW7czYhyWY5FcXQc28n85O5m9nsUuuPf/9IoCzLLnxd9MTCET3SvNckQnwL7lfcpnYueIGiKNbY8QYjERo+wZK4HuAcK94rVvGSWCO8gCqKjAixTXLPsAl7ldBxriASqAo6lfUnqUTaWAP5FajTYjxGCNXeYSRAwSflToBlKxSZKSCiMoUa6Uh+QNW/B37LC9D8lkTYHNegTf7JqNP8b5RB5AT7AkPoNqqXxUyATT28AUzhRuFFaLpDUYc9V1ihr7+EA/JdxUyAxQTWQDM3CuVSEWugGiUztJ5OIJPPhlKRbFEVXJZ1Anph8iNyTCsieA0dvIgCQY3ckBtyTIBjfuDcwRR2TPJDElkRcrpd6XcyJm7X2ATY3CKwi1UxxkNPeyiP/BAa8LVZObtdBMOPcYbvX7wXYJNE2lidBuNxyhgm0I1LCdcgFXmguXqoxhgJKELBKvYMhljH+ULEwDr8mEIRXWHSP6gJKIXIESxYh3PHzWJK1IuwjpAVcBWIhHPX0x2QE/vkHGofIzUevwr4KhZ003wvsOKYkAcxXfPoxbvk3AJuQ5MNRNwFsNKFCaibRGB0CxcqIJGU3wAAAP//8GtoDAAAAAZJREFUAwCJJuAxFVNbWwAAAABJRU5ErkJggg=='); -} - div.outer_buttons { flow:vertical; border-spacing:8; diff --git a/src/ui/cm.rs b/src/ui/cm.rs index 4a68a571d..57e6b37dd 100644 --- a/src/ui/cm.rs +++ b/src/ui/cm.rs @@ -7,10 +7,6 @@ use sciter::{make_args, Element, Value, HELEMENT}; use std::sync::Mutex; use std::{ops::Deref, sync::Arc}; -lazy_static::lazy_static! { - pub static ref HIDE_CM: Arc> = Arc::new(Mutex::new(false)); -} - #[derive(Clone, Default)] pub struct SciterHandler { pub element: Arc>>, @@ -28,7 +24,6 @@ impl InvokeUiCM for SciterHandler { client.port_forward.clone(), client.peer_id.clone(), client.name.clone(), - client.avatar.clone(), client.authorized, client.keyboard, client.clipboard, @@ -36,8 +31,7 @@ impl InvokeUiCM for SciterHandler { client.file, client.restart, client.recording, - client.block_input, - client.privacy_mode + client.block_input ), ); } @@ -53,12 +47,12 @@ impl InvokeUiCM for SciterHandler { self.call("newMessage", &make_args!(id, text)); } - fn change_theme(&self, dark: String) { - self.call("changeTheme", &make_args!(dark)); + fn change_theme(&self, _dark: String) { + // TODO } fn change_language(&self) { - self.call("changeLanguage", &make_args!()); + // TODO } fn show_elevation(&self, show: bool) { @@ -157,19 +151,6 @@ impl SciterConnectionManager { fn get_option(&self, key: String) -> String { crate::ui_interface::get_option(key) } - - fn get_builtin_option(&self, key: String) -> String { - crate::ui_interface::get_builtin_option(&key) - } - - fn hide_cm(&self) -> bool { - *crate::ui::cm::HIDE_CM.lock().unwrap() - } - - fn get_supported_privacy_mode_impls(&self) -> String { - serde_json::to_string(&crate::privacy_mode::get_supported_privacy_mode_impl()) - .unwrap_or_default() - } } impl sciter::EventHandler for SciterConnectionManager { @@ -191,8 +172,5 @@ impl sciter::EventHandler for SciterConnectionManager { fn can_elevate(); fn elevate_portable(i32); fn get_option(String); - fn get_builtin_option(String); - fn hide_cm(); - fn get_supported_privacy_mode_impls(); } } diff --git a/src/ui/cm.tis b/src/ui/cm.tis index f306e9032..479e26f92 100644 --- a/src/ui/cm.tis +++ b/src/ui/cm.tis @@ -4,18 +4,8 @@ var body; var connections = []; var show_chat = false; var show_elevation = true; -var is_privacy_mode_supported = handler.get_supported_privacy_mode_impls() != '[]'; -var allow_perm_change_in_accept_window = - handler.get_builtin_option('enable-perm-change-in-accept-window') != 'N'; var svg_elevate = ; -var hide_cm = undefined; -function setWindowState(state) { - if (hide_cm == undefined) hide_cm = handler.hide_cm(); - if (hide_cm) return; - view.windowState = state; -} - class Body: Reactor.Component { this var cur = 0; @@ -38,7 +28,6 @@ class Body: Reactor.Component me.sendMsg(msg); }; var right_style = show_chat ? "" : "display: none"; - var permissions_locked = !allow_perm_change_in_accept_window; var disconnected = c.disconnected; var show_elevation_btn = handler.can_elevate() && show_elevation && !c.is_file_transfer && !c.is_view_camera && !c.is_terminal && c.port_forward.length == 0; var show_accept_btn = handler.get_option('approve-mode') != 'password'; @@ -46,11 +35,9 @@ class Body: Reactor.Component return

    - {c.avatar ? - :
    {c.name[0].toUpperCase()} -
    } +
    {c.name}
    ({c.peer_id})
    @@ -62,16 +49,15 @@ class Body: Reactor.Component
    {c.is_file_transfer || c.is_terminal || c.port_forward || disconnected ? "" :
    {translate('Permissions')}
    } - {c.is_file_transfer || c.is_terminal || c.port_forward || disconnected ? "" :
    + {c.is_file_transfer || c.is_terminal || c.port_forward || disconnected ? "" :
    -
    +
    -
    } {c.is_file_transfer ?
    {translate('Transfer file')}
    : ""} @@ -108,7 +94,6 @@ class Body: Reactor.Component } event click $(icon.keyboard) (e) { - if (!allow_perm_change_in_accept_window) return; var { cid, connection } = this; checkClickTime(function() { connection.keyboard = !connection.keyboard; @@ -118,7 +103,6 @@ class Body: Reactor.Component } event click $(icon.clipboard) { - if (!allow_perm_change_in_accept_window) return; var { cid, connection } = this; checkClickTime(function() { connection.clipboard = !connection.clipboard; @@ -128,7 +112,6 @@ class Body: Reactor.Component } event click $(icon.audio) { - if (!allow_perm_change_in_accept_window) return; var { cid, connection } = this; checkClickTime(function() { connection.audio = !connection.audio; @@ -138,7 +121,6 @@ class Body: Reactor.Component } event click $(icon.file) { - if (!allow_perm_change_in_accept_window) return; var { cid, connection } = this; checkClickTime(function() { connection.file = !connection.file; @@ -148,7 +130,6 @@ class Body: Reactor.Component } event click $(icon.restart) { - if (!allow_perm_change_in_accept_window) return; var { cid, connection } = this; checkClickTime(function() { connection.restart = !connection.restart; @@ -158,7 +139,6 @@ class Body: Reactor.Component } event click $(icon.recording) { - if (!allow_perm_change_in_accept_window) return; var { cid, connection } = this; checkClickTime(function() { connection.recording = !connection.recording; @@ -168,7 +148,6 @@ class Body: Reactor.Component } event click $(icon.block_input) { - if (!allow_perm_change_in_accept_window) return; var { cid, connection } = this; checkClickTime(function() { connection.block_input = !connection.block_input; @@ -177,16 +156,6 @@ class Body: Reactor.Component }); } - event click $(icon.privacy_mode) { - if (!allow_perm_change_in_accept_window) return; - var { cid, connection } = this; - checkClickTime(function() { - connection.privacy_mode = !connection.privacy_mode; - body.update(); - handler.switch_permission(cid, "privacy_mode", connection.privacy_mode); - }); - } - event click $(button#accept) { var { cid, connection } = this; checkClickTime(function() { @@ -194,7 +163,7 @@ class Body: Reactor.Component body.update(); handler.authorize(cid); self.timer(30ms, function() { - setWindowState(View.WINDOW_MINIMIZED); + view.windowState = View.WINDOW_MINIMIZED; }); }); } @@ -208,7 +177,7 @@ class Body: Reactor.Component handler.elevate_portable(cid); handler.authorize(cid); self.timer(30ms, function() { - setWindowState(View.WINDOW_MINIMIZED); + view.windowState = View.WINDOW_MINIMIZED; }); }); } @@ -220,7 +189,7 @@ class Body: Reactor.Component body.update(); handler.elevate_portable(cid); self.timer(30ms, function() { - setWindowState(View.WINDOW_MINIMIZED); + view.windowState = View.WINDOW_MINIMIZED; }); }); } @@ -381,7 +350,7 @@ function bring_to_top(idx=-1) { if (is_linux) { view.focus = self; } else { - setWindowState(View.WINDOW_SHOWN); + view.windowState = View.WINDOW_SHOWN; } if (idx >= 0) body.cur = idx; } else { @@ -390,7 +359,7 @@ function bring_to_top(idx=-1) { } } -handler.addConnection = function(id, is_file_transfer, is_view_camera, is_terminal, port_forward, peer_id, name, avatar, authorized, keyboard, clipboard, audio, file, restart, recording, block_input, privacy_mode) { +handler.addConnection = function(id, is_file_transfer, is_view_camera, is_terminal, port_forward, peer_id, name, authorized, keyboard, clipboard, audio, file, restart, recording, block_input) { stdout.println("new connection #" + id + ": " + peer_id); var conn; connections.map(function(c) { @@ -398,7 +367,6 @@ handler.addConnection = function(id, is_file_transfer, is_view_camera, is_termin }); if (conn) { conn.authorized = authorized; - conn.privacy_mode = privacy_mode; update(); return; } @@ -410,11 +378,10 @@ handler.addConnection = function(id, is_file_transfer, is_view_camera, is_termin conn = { id: id, is_file_transfer: is_file_transfer, is_view_camera: is_view_camera, is_terminal: is_terminal, peer_id: peer_id, port_forward: port_forward, - avatar: avatar, name: name, authorized: authorized, time: new Date(), now: new Date(), keyboard: keyboard, clipboard: clipboard, msgs: [], unreaded: 0, audio: audio, file: file, restart: restart, recording: recording, - block_input:block_input, privacy_mode:privacy_mode, + block_input:block_input, disconnected: false }; if (idx < 0) { @@ -429,7 +396,7 @@ handler.addConnection = function(id, is_file_transfer, is_view_camera, is_termin self.timer(1ms, adjustHeader); if (authorized) { self.timer(3s, function() { - setWindowState(View.WINDOW_MINIMIZED); + view.windowState = View.WINDOW_MINIMIZED; }); } } @@ -503,21 +470,15 @@ function getElapsed(time, now) { return out; } -var ui_status_cache = ["", ""]; +var ui_status_cache = [""]; function check_update_ui() { self.timer(1s, function() { var approve_mode = handler.get_option('approve-mode'); - var allow_perm_change = handler.get_builtin_option('enable-perm-change-in-accept-window'); var changed = false; if (ui_status_cache[0] != approve_mode) { ui_status_cache[0] = approve_mode; changed = true; } - if (ui_status_cache[1] != allow_perm_change) { - ui_status_cache[1] = allow_perm_change; - allow_perm_change_in_accept_window = allow_perm_change != 'N'; - changed = true; - } if (changed) update(); check_update_ui(); }); @@ -548,7 +509,7 @@ var tm0 = getTime(); function self.closing() { if (connections.length == 0 && getTime() - tm0 > 30000) return true; - setWindowState(View.WINDOW_HIDDEN); + view.windowState = View.WINDOW_HIDDEN; return false; } diff --git a/src/ui/common.css b/src/ui/common.css index 16dd6ca9f..ff2f83883 100644 --- a/src/ui/common.css +++ b/src/ui/common.css @@ -72,11 +72,6 @@ button.button:hover, button.outline:hover { border-color: color(hover-border); } -button:disabled, -button:disabled:hover { - opacity: 0.3; -} - button.link { background: none !important; border: none; @@ -463,15 +458,6 @@ div#msgbox div.set-password input { font-size: 1em; } -.wrap-text { - width: *; - word-wrap: break-word; - overflow-wrap: break-word; - white-space: normal; - height: auto; - overflow: hidden; -} - div#msgbox #error { color: red; } @@ -489,4 +475,4 @@ div.user-session select { background: color(bg); color: color(text); padding-left: 0.5em; -} +} \ No newline at end of file diff --git a/src/ui/common.tis b/src/ui/common.tis index 240799059..b6d2b8ee2 100644 --- a/src/ui/common.tis +++ b/src/ui/common.tis @@ -18,8 +18,7 @@ function isEnterKey(evt) { function getScaleFactor() { if (!is_win) return 1; - var s = self.toPixels(10000dip) / 10000.; - return s < 0.000001 ? 1 : s; + return self.toPixels(10000dip) / 10000.; } var scaleFactor = getScaleFactor(); view << event resolutionchange { diff --git a/src/ui/file_transfer.tis b/src/ui/file_transfer.tis index 1090c018d..0b60cf748 100644 --- a/src/ui/file_transfer.tis +++ b/src/ui/file_transfer.tis @@ -137,7 +137,7 @@ class JobTable: Reactor.Component { self.timer(30ms, function() { self.update(); }); } - function addJob(id, path, to, file_num, show_hidden, is_remote, auto_start) { + function addJob(id, path, to, file_num, show_hidden, is_remote) { var job = { type: "transfer", id: id, path: path, to: to, include_hidden: show_hidden, @@ -146,10 +146,6 @@ class JobTable: Reactor.Component { this.job_map[id] = this.jobs[this.jobs.length - 1]; handler.update_next_job_id(id + 1); handler.add_job(id, 0, path, to, file_num, show_hidden, is_remote); - if (auto_start) { - this.continueJob(id); - this.update(); - } stdout.println(JSON.stringify(job)); } @@ -283,8 +279,7 @@ class JobTable: Reactor.Component { if (!err) { handler.remove_dir(job.id, job.path, job.is_remote); refreshDir(job.is_remote); - // Use the job's is_remote; local variable `is_remote` is undefined in this scope. - if (job.is_remote) file_transfer.remote_folder_view.table.resetCurrent(); + if (is_remote) file_transfer.remote_folder_view.table.resetCurrent(); else file_transfer.local_folder_view.table.resetCurrent(); } } else if (!job.no_confirm) { @@ -702,9 +697,9 @@ handler.clearAllJobs = function() { file_transfer.job_table.clearAllJobs(); } -handler.addJob = function (id, path, to, file_num, show_hidden, is_remote, auto_start) { // load last job +handler.addJob = function (id, path, to, file_num, show_hidden, is_remote) { // load last job // stdout.println("restore job: " + is_remote); - file_transfer.job_table.addJob(id,path,to,file_num,show_hidden,is_remote,auto_start); + file_transfer.job_table.addJob(id,path,to,file_num,show_hidden,is_remote); } handler.updateTransferList = function () { diff --git a/src/ui/header.tis b/src/ui/header.tis index 40ccbcbf2..305248b45 100644 --- a/src/ui/header.tis +++ b/src/ui/header.tis @@ -117,13 +117,6 @@ class Header: Reactor.Component { icon_conn = svg_insecure_relay; title_conn = translate("Relayed and unencrypted connection"); } - var stream_type = this.stream_type; - if (stream_type == "Relay") { - stream_type = "TCP"; - } - if (stream_type) { - title_conn += " (" + stream_type + ")"; - } var title = get_id(); if (pi.hostname) title += "(" + pi.username + "@" + pi.hostname + ")"; if ((pi.displays || []).length == 0) { @@ -218,7 +211,7 @@ class Header: Reactor.Component { {is_file_copy_paste_supported && file_enabled ?
  • {svg_checkmark}{translate('Enable file copy and paste')}
    • : ""} {keyboard_enabled && clipboard_enabled ?
  • {svg_checkmark}{translate('Disable clipboard')}
    • : ""} {keyboard_enabled ?
  • {svg_checkmark}{translate('Lock after session end')}
    • : ""} - {(pi.platform == "Windows" || pi.platform == "Mac OS") && (handler.get_toggle_option("privacy-mode") || (keyboard_enabled && privacy_mode_enabled)) ?
  • {svg_checkmark}{translate('Privacy mode')}
    • : ""} + {keyboard_enabled && pi.platform == "Windows" ?
  • {svg_checkmark}{translate('Privacy mode')}
    • : ""} {keyboard_enabled && ((is_osx && pi.platform != "Mac OS") || (!is_osx && pi.platform == "Mac OS")) ?
  • {svg_checkmark}{translate('Swap control-command key')}
    • : ""} {handler.version_cmp(pi.version, '1.2.4') >= 0 ?
  • {svg_checkmark}{translate('True color (4:4:4)')}
    • : ""} @@ -602,13 +595,7 @@ function togglePrivacyMode(privacy_id) { if (!supported) { msgbox("nocancel", translate("Privacy mode"), translate("Unsupported"), "", function() { }); } else { - var privacy_mode_impls = pi.platform_additions?.supported_privacy_mode_impl; - if (privacy_mode_impls == null || privacy_mode_impls == undefined) { - handler.toggle_option(privacy_id); - return; - } - var is_on = handler.get_toggle_option("privacy-mode"); - handler.toggle_privacy_mode("", !is_on); + handler.toggle_option(privacy_id); } } @@ -708,15 +695,14 @@ function startChat() { chatbox = view.window(params); } -handler.setConnectionType = function(secured, direct, stream_type) { +handler.setConnectionType = function(secured, direct) { header.update({ secure_connection: secured, direct_connection: direct, - stream_type: stream_type, }); } handler.updateRecordStatus = function(status) { recording = status; header.update(); -} +} \ No newline at end of file diff --git a/src/ui/index.css b/src/ui/index.css index d23e4f038..2fb2f958d 100644 --- a/src/ui/index.css +++ b/src/ui/index.css @@ -31,7 +31,6 @@ body { height: *; background: color(bg); border-right: color(border) 1px solid; - position: relative; } #ab .left-pane { @@ -50,14 +49,6 @@ body { .left-pane > div:nth-child(1) { border-spacing: 1em; padding: 20px; - padding-bottom: 60px; /* reserve space for bottom connect-status */ -} - -.left-pane > div.connect-status { - position: absolute; - bottom: 0; - left: 0; - right: 0; } .left-pane div { @@ -422,16 +413,6 @@ svg#refresh-password:hover { li:disabled, li:disabled:hover { color: color(lighter-text); background: color(menu); - opacity: 0.8; -} - -.grey-text { - color: #888 !important; -} - -input.grey-text, -textarea.grey-text { - color: #888 !important; } @media platform == "OSX" { diff --git a/src/ui/index.tis b/src/ui/index.tis index a099b95f9..bee8bba8c 100644 --- a/src/ui/index.tis +++ b/src/ui/index.tis @@ -2,49 +2,18 @@ if (is_osx) view.windowBlurbehind = #light; stdout.println("current platform:", OS); stdout.println("is_xfce: ", is_xfce); -// See default height in common.tis `msgbox()`. -const msgbox_default_height = 180; -const incoming_only_width = 180; - -const outgoing_only = handler.is_outgoing_only(); -const incoming_only = handler.is_incoming_only(); -const disable_installation = handler.is_disable_installation(); -const disable_account = handler.is_disable_account(); -const disable_settings = handler.is_disable_settings(); -const is_custom_client = handler.is_custom_client(); -const disable_ab = handler.is_disable_ab(); -const hide_server_settings = handler.get_builtin_option("hide-server-settings") == "Y"; -const hide_proxy_settings = handler.get_builtin_option("hide-proxy-settings") == "Y"; -const hide_websocket_settings = handler.get_builtin_option("hide-websocket-settings") == "Y"; -const hide_stop_service = handler.get_builtin_option("hide-stop-service") == "Y"; -const disable_change_permanent_password = handler.get_builtin_option("disable-change-permanent-password") == "Y"; -const disable_change_id = handler.get_builtin_option("disable-change-id") == "Y"; - // html min-width, min-height not working on mac, below works for all -if (incoming_only) { - view.windowMinSize = (scaleIt(incoming_only_width), scaleIt((handler.is_installed() || disable_installation) ? 300 : 390)); -} else { - view.windowMinSize = (scaleIt(560), scaleIt(300)); -} +view.windowMinSize = (scaleIt(560), scaleIt(300)); var app; var tmp = handler.get_connect_status(); var connect_status = tmp[0]; var service_stopped = handler.get_option("stop-service") == "Y"; -var disable_udp = handler.get_option("disable-udp") == "Y"; var using_public_server = handler.using_public_server(); var software_update_url = ""; var key_confirmed = tmp[1]; var system_error = ""; -const default_option_lang = is_custom_client ? 'default' : ''; -const default_option_yes = is_custom_client ? 'Y' : ''; -const default_option_no = is_custom_client ? 'N' : ''; -const default_option_whitelist = is_custom_client ? ',' : ''; -const default_option_approve_mode = is_custom_client ? 'password-click' : ''; - -const grey_text_style = "color:#888;"; - var svg_menu = @@ -58,14 +27,6 @@ function get_id() { return my_id; } -function get_msgbox_width(width=500) { - if (incoming_only) { - var maxw = scaleIt(incoming_only_width); - if (width > maxw) width = maxw; - } - return width; -} - class ConnectStatus: Reactor.Component { function render() { return @@ -143,7 +104,7 @@ class DirectServer: Reactor.Component { is_edit_rdp_port = false; return; } - handler.set_option("direct-server", handler.get_option("direct-server") == "Y" ? default_option_no : "Y"); + handler.set_option("direct-server", handler.get_option("direct-server") == "Y" ? "" : "Y"); this.update(); } } @@ -186,10 +147,6 @@ class AudioInputs: Reactor.Component { var el = this.$(li#enable-audio); var enabled = handler.get_option(el.id) != "N"; el.attributes.toggleClass("selected", !enabled); - var is_opt_fixed = handler.is_option_fixed("enable-audio"); - if (disable_settings || is_opt_fixed) { - el.state.disabled = true; - } var v = this.get_value(); for (var el in this.$$(menu#audio-input>li)) { if (el.id == 'enable-audio') continue; @@ -199,10 +156,9 @@ class AudioInputs: Reactor.Component { } event click $(menu#audio-input>li) (_, me) { - if (me.state.disabled) return; var v = me.id; if (v == 'enable-audio') { - handler.set_option(v, handler.get_option(v) != 'N' ? 'N' : default_option_yes); + handler.set_option(v, handler.get_option(v) != 'N' ? 'N' : ''); } else { if (v == this.get_value()) return; if (v == this.get_default()) v = ""; @@ -231,20 +187,15 @@ class Languages: Reactor.Component { function toggleMenuState() { var cur = handler.get_local_option("lang") || "default"; - var is_opt_fixed = handler.is_option_fixed("lang"); for (var el in this.$$(menu#languages>li)) { var selected = cur == el.id; el.attributes.toggleClass("selected", selected); - if (is_opt_fixed) { - el.state.disabled = true; - } } } event click $(menu#languages>li) (_, me) { - if (me.state.disabled) return; var v = me.id; - if (v == "default") v = default_option_lang; + if (v == "default") v = ""; handler.set_local_option("lang", v); app.update(); this.toggleMenuState(); @@ -269,7 +220,6 @@ class Enhancements: Reactor.Component {
  • {svg_checkmark}{translate("Adaptive bitrate")} (beta)
  • {translate("Recording")}
    • {support_remove_wallpaper ?
  • {svg_checkmark}{translate("Remove wallpaper during incoming sessions")}
    • : ""} -
  • {svg_checkmark}{translate("keep-awake-during-incoming-sessions-label")}
    • ; } @@ -279,74 +229,49 @@ class Enhancements: Reactor.Component { if (el.id && el.id.indexOf("enable-") == 0) { var enabled = handler.get_option(el.id) != "N"; el.attributes.toggleClass("selected", enabled); - var is_opt_fixed = handler.is_option_fixed(el.id); - if (is_opt_fixed) { - el.state.disabled = true; - } } else if (el.id && el.id.indexOf("allow-") == 0) { var enabled = handler.get_option(el.id) == "Y"; el.attributes.toggleClass("selected", enabled); - var is_opt_fixed = handler.is_option_fixed(el.id); - if (is_opt_fixed) { - el.state.disabled = true; - } - } else if (el.id == "keep-awake-during-incoming-sessions") { - var enabled = handler.get_option(el.id) != "N"; - el.attributes.toggleClass("selected", enabled); - var is_opt_fixed = handler.is_option_fixed(el.id); - if (is_opt_fixed) { - el.state.disabled = true; - } } } } event click $(menu#enhancements-menu>li) (_, me) { - if (me.state.disabled) return; var v = me.id; if (v.indexOf("enable-") == 0) { - var set_value = handler.get_option(v) != 'N' ? 'N' : default_option_yes; + var set_value = handler.get_option(v) != 'N' ? 'N' : ''; handler.set_option(v, set_value); - if (v == "enable-hwcodec" && set_value != 'N') { + if (v == "enable-hwcodec" && set_value == '') { handler.check_hwcodec(); } } else if (v.indexOf("allow-") == 0) { - handler.set_option(v, handler.get_option(v) == 'Y' ? default_option_no : 'Y'); - } else if (v == 'keep-awake-during-incoming-sessions') { - handler.set_option(v, handler.get_option(v) != 'N' ? 'N' : default_option_yes); + handler.set_option(v, handler.get_option(v) == 'Y' ? '' : 'Y'); } else if (v == 'screen-recording') { var show_root_dir = is_win && handler.is_installed(); var user_dir = handler.video_save_directory(false); var root_dir = show_root_dir ? handler.video_save_directory(true) : ""; - var ts0 = handler.get_option("enable-record-session") != 'N' ? { checked: true } : {}; + var ts0 = handler.get_option("enable-record-session") == '' ? { checked: true } : {}; var ts1 = handler.get_option("allow-auto-record-incoming") == 'Y' ? { checked: true } : {}; var ts2 = handler.get_local_option("allow-auto-record-outgoing") == 'Y' ? { checked: true } : {}; - var is_opt_fixed_enable_record = handler.is_option_fixed("enable-record-session"); - var is_opt_fixed_auto_incoming = handler.is_option_fixed("allow-auto-record-incoming"); - var is_opt_fixed_auto_outgoing = handler.is_option_fixed("allow-auto-record-outgoing"); - var is_opt_fixed_video_dir = handler.is_option_fixed("video-save-directory"); - if (is_opt_fixed_enable_record) { ts0.disabled = true; ts0.style = grey_text_style; } - if (is_opt_fixed_auto_incoming) { ts1.disabled = true; ts1.style = grey_text_style; } - if (is_opt_fixed_auto_outgoing) { ts2.disabled = true; ts2.style = grey_text_style; } msgbox("custom-recording", translate('Recording'),
    -
    {translate('Enable recording session')}
    -
    {translate('Automatically record incoming sessions')}
    -
    {translate('Automatically record outgoing sessions')}
    -
    +
    {translate('Enable recording session')}
    +
    {translate('Automatically record incoming sessions')}
    +
    {translate('Automatically record outgoing sessions')}
    +
    {show_root_dir ?
    {translate("Incoming")}:  {root_dir}
    : ""}
    {translate(show_root_dir ? "Outgoing" : "Directory")}:  {user_dir}
    - {is_opt_fixed_video_dir ? "" :
    } +
    , "", function(res=null) { if (!res) return; - if (!is_opt_fixed_enable_record) handler.set_option("enable-record-session", res.enable_record_session ? default_option_yes : 'N'); - if (!is_opt_fixed_auto_incoming) handler.set_option("allow-auto-record-incoming", res.auto_record_incoming ? 'Y' : default_option_no); - if (!is_opt_fixed_auto_outgoing) handler.set_local_option("allow-auto-record-outgoing", res.auto_record_outgoing ? 'Y' : default_option_no); - if (!is_opt_fixed_video_dir) handler.set_local_option("video-save-directory", $(#folderPath).text); - }, msgbox_default_height, get_msgbox_width()); + handler.set_option("enable-record-session", res.enable_record_session ? '' : 'N'); + handler.set_option("allow-auto-record-incoming", res.auto_record_incoming ? 'Y' : ''); + handler.set_local_option("allow-auto-record-outgoing", res.auto_record_outgoing ? 'Y' : ''); + handler.set_local_option("video-save-directory", $(#folderPath).text); + }); } this.toggleMenuState(); } @@ -359,133 +284,6 @@ function getUserName() { return ''; } -function getAccountLabelWithHandle() { - try { - var user = JSON.parse(handler.get_local_option("user_info")); - var username = (user.name || '').trim(); - if (!username) { - return ''; - } - var displayName = (user.display_name || '').trim(); - if (!displayName || displayName == username) { - return username; - } - return displayName + " (@" + username + ")"; - } catch(e) {} - return ''; -} - -// Shared dialog functions -function open_custom_server_dialog() { - var configOptions = handler.get_options(); - var old_relay = configOptions["relay-server"] || ""; - var old_api = configOptions["api-server"] || ""; - var old_id = configOptions["custom-rendezvous-server"] || ""; - var old_key = configOptions["key"] || ""; - msgbox("custom-server", "ID/Relay Server", "
    \ -
    " + translate("ID Server") + ":
    \ -
    " + translate("Relay Server") + ":
    \ -
    " + translate("API Server") + ":
    \ -
    " + translate("Key") + ":
    \ -
    \ - ", "", function(res=null, show_progress) { - if (!res) return; - if (typeof show_progress === 'function') show_progress(); - var id = (res.id || "").trim(); - var relay = (res.relay || "").trim(); - var api = (res.api || "").trim().toLowerCase(); - var key = (res.key || "").trim(); - if (id == old_id && relay == old_relay && key == old_key && api == old_api) return; - if (id) { - var err = handler.test_if_valid_server(id, true); - if (err) { if (typeof show_progress === 'function') show_progress(false, translate("ID Server") + ": " + err); return; } - } - if (relay) { - var err = handler.test_if_valid_server(relay, true); - if (err) { if (typeof show_progress === 'function') show_progress(false, translate("Relay Server") + ": " + err); return; } - } - if (api) { - if (0 != api.indexOf("https://") && 0 != api.indexOf("http://")) { - if (typeof show_progress === 'function') show_progress(false, translate("API Server") + ": " + translate("invalid_http")); - return; - } - } - configOptions["custom-rendezvous-server"] = id; - configOptions["relay-server"] = relay; - configOptions["api-server"] = api; - configOptions["key"] = key; - handler.set_options(configOptions); - if (typeof show_progress === 'function') show_progress(-1); - }, 260, get_msgbox_width()); -} - -function open_whitelist_dialog() { - var is_opt_fixed = handler.is_option_fixed("whitelist"); - var v = handler.get_option("whitelist"); - var old_value = v == default_option_whitelist ? '' : v.split(",").join("\n"); - var type_str = is_opt_fixed ? "custom-whitelist-nook" : "custom-whitelist"; - var readonly_attr = is_opt_fixed ? " readonly=\"readonly\"" : ""; - var grey_class = is_opt_fixed ? " class=\"grey-text\"" : ""; - msgbox(type_str, translate("IP Whitelisting"), "
    \ - " + translate("whitelist_sep") + "
    \ - \ -
    \ - ", "", function(res=null, show_progress) { - if (!res) return; - if (typeof show_progress === 'function') show_progress(); - var value = (res.text || "").trim(); - if (value) { - var values = value.split(/[\s,;\n]+/g); - for (var ip in values) { - if (!ip.match(/^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]?|0)\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]?|0)\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]?|0)\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]?|0)(\/([1-9]|[1-2][0-9]|3[0-2])){0,1}$/) - && !ip.match(/^(((?:[0-9A-Fa-f]{1,4}))*((?::[0-9A-Fa-f]{1,4}))*::((?:[0-9A-Fa-f]{1,4}))*((?::[0-9A-Fa-f]{1,4}))*|((?:[0-9A-Fa-f]{1,4}))((?::[0-9A-Fa-f]{1,4})){7})(\/([1-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8])){0,1}$/)) { - if (typeof show_progress === 'function') show_progress(false, translate("Invalid IP") + ": " + ip); - return; - } - } - value = values.join("\n"); - } - if (value == old_value) return; - if (!value) value = default_option_whitelist; - handler.set_option("whitelist", value.replace("\n", ",")); - if (typeof show_progress === 'function') show_progress(-1); - }, 300, get_msgbox_width()); -} - -function open_proxy_dialog() { - var is_opt_fixed = handler.is_option_fixed("proxy-url"); - var socks5 = handler.get_socks() || {}; - var old_proxy = socks5[0] || ""; - var old_username = socks5[1] || ""; - var old_password = socks5[2] || ""; - var type_str = is_opt_fixed ? "custom-server-nook" : "custom-server"; - var greyStyle = is_opt_fixed ? grey_text_style : ""; - msgbox(type_str, "Socks5/Http(s) Proxy",
    -
    {translate("Server")}:
    -
    {translate("Username")}:
    -
    {translate("Password")}:{ is_opt_fixed ? : }
    -
    - , "", function(res=null, show_progress) { - if (!res) return; - if (typeof show_progress === 'function') show_progress(); - var proxy = (res.proxy || "").trim(); - var username = (res.username || "").trim(); - var password = (res.password || "").trim(); - if (proxy == old_proxy && username == old_username && password == old_password) return; - if (proxy) { - var domain_port = proxy; - var protocol_index = domain_port.indexOf('://'); - if (protocol_index !== -1) { - domain_port = domain_port.substring(protocol_index + 3); - } - var err = handler.test_if_valid_server(domain_port, false); - if (err) { if (typeof show_progress === 'function') show_progress(false, translate("Server") + ": " + err); return; } - } - handler.set_socks(proxy, username, password); - if (typeof show_progress === 'function') show_progress(-1); - }, 240, get_msgbox_width()); -} - function updateTheme() { var root_element = self; if (handler.get_option("allow-darktheme") == "Y") { @@ -510,43 +308,40 @@ class MyIdMenu: Reactor.Component { } function renderPop() { - var accountLabel = handler.get_local_option("access_token") ? getAccountLabelWithHandle() : ''; + var username = handler.get_local_option("access_token") ? getUserName() : ''; return - {!disable_settings &&
  • {svg_checkmark}{translate('Enable keyboard/mouse')}
    • } - {!disable_settings &&
  • {svg_checkmark}{translate('Enable clipboard')}
    • } - {!disable_settings &&
  • {svg_checkmark}{translate('Enable file transfer')}
    • } - {!disable_settings &&
  • {svg_checkmark}{translate('Enable camera')}
    • } - {!disable_settings &&
  • {svg_checkmark}{translate('Enable terminal')}
    • } - {!disable_settings &&
  • {svg_checkmark}{translate('Enable remote restart')}
    • } - {!disable_settings &&
  • {svg_checkmark}{translate('Enable TCP tunneling')}
    • } - {!disable_settings && is_win ?
  • {svg_checkmark}{translate('Enable blocking user input')}
    • : ""} - {!disable_settings && (handler.get_supported_privacy_mode_impls() != '[]') &&
  • {svg_checkmark}{translate('Enable privacy mode')}
    • } - {!disable_settings &&
  • {svg_checkmark}{translate('Enable LAN discovery')}
    • } +
  • {svg_checkmark}{translate('Enable keyboard/mouse')}
    • +
  • {svg_checkmark}{translate('Enable clipboard')}
    • +
  • {svg_checkmark}{translate('Enable file transfer')}
    • +
  • {svg_checkmark}{translate('Enable camera')}
    • +
  • {svg_checkmark}{translate('Enable terminal')}
    • +
  • {svg_checkmark}{translate('Enable remote restart')}
    • +
  • {svg_checkmark}{translate('Enable TCP tunneling')}
    • + {is_win ?
  • {svg_checkmark}{translate('Enable blocking user input')}
    • : ""} +
  • {svg_checkmark}{translate('Enable LAN discovery')}
    • - {!disable_settings &&
  • {svg_checkmark}{translate('Enable remote configuration modification')}
    • } - {!disable_settings &&
    } - {!disable_settings && !hide_server_settings &&
  • {translate('ID/Relay Server')}
    • } - {!disable_settings &&
  • {translate('IP Whitelisting')}
    • } - {!disable_settings && !hide_proxy_settings &&
  • {translate('Socks5/Http(s) Proxy')}
    • } - {!disable_settings && !hide_websocket_settings &&
  • {svg_checkmark}{translate('Use WebSocket')}
    • } - {!disable_settings && !using_public_server && !outgoing_only &&
  • {svg_checkmark}{translate('Disable UDP')}
    • } - {!disable_settings && !using_public_server &&
  • {svg_checkmark}{translate('Allow insecure TLS fallback')}
    • } +
  • {svg_checkmark}{translate('Enable remote configuration modification')}
    • - {(!hide_stop_service || service_stopped) &&
  • {svg_checkmark}{translate("Enable service")}
    • } - {!disable_settings && is_win && handler.is_installed() ? : ""} - {!disable_settings && } - {!disable_settings && false && handler.using_public_server() &&
  • {svg_checkmark}{translate('Always connect via relay')}
    • } - {!disable_change_id && handler.is_ok_change_id() ?
    : ""} - {!disable_account && (accountLabel ? -
  • {translate('Logout')} ({accountLabel})
    • : -
  • {translate('Login')}
    • )} - {!disable_change_id && !disable_settings && handler.is_ok_change_id() && key_confirmed && connect_status > 0 ?
  • {translate('Change ID')}
    • : ""} +
  • {translate('ID/Relay Server')}
    • +
  • {translate('IP Whitelisting')}
    • +
  • {translate('Socks5 Proxy')}
    • + { false &&
  • {svg_checkmark}{translate('Use WebSocket')}
    • } +
    +
  • {svg_checkmark}{translate("Enable service")}
    • + {is_win && handler.is_installed() ? : ""} + + {false && handler.using_public_server() &&
  • {svg_checkmark}{translate('Always connect via relay')}
    • } + {handler.is_ok_change_id() ?
    : ""} + {username ? +
  • {translate('Logout')} ({username})
    • : +
  • {translate('Login')}
    • } + {handler.is_ok_change_id() && key_confirmed && connect_status > 0 ?
  • {translate('Change ID')}
    • : ""}
  • {svg_checkmark}{translate('Dark Theme')}
    • - {disable_installation ? "" :
  • {svg_checkmark}{translate('Auto update')}
    • } +
  • {svg_checkmark}{translate('Auto update')}
  • {translate('About')} {" "}{handler.get_app_name()}
    • ; @@ -574,24 +369,15 @@ class MyIdMenu: Reactor.Component { function toggleMenuState() { for (var el in $$(menu#config-options>li)) { - var id = el.id; - if (!id) continue; - var is_opt_fixed = handler.is_option_fixed(id); - if (id.indexOf("enable-") == 0) { - var enabled = handler.get_option(id) != "N"; + if (el.id && el.id.indexOf("enable-") == 0) { + var enabled = handler.get_option(el.id) != "N"; el.attributes.toggleClass("selected", enabled); el.attributes.toggleClass("line-through", !enabled); - } else if (id.indexOf("allow-") == 0) { - var enabled = handler.get_option(id) == "Y"; - el.attributes.toggleClass("selected", enabled); - el.attributes.toggleClass("line-through", !enabled); - } else if (id == "whitelist") { - // whitelist should be clickable even when fixed (to view the content) - // The dialog will show readonly textarea and no OK button when fixed - continue; } - if (is_opt_fixed) { - el.state.disabled = true; + if (el.id && el.id.indexOf("allow-") == 0) { + var enabled = handler.get_option(el.id) == "Y"; + el.attributes.toggleClass("selected", enabled); + el.attributes.toggleClass("line-through", !enabled); } } } @@ -611,33 +397,105 @@ class MyIdMenu: Reactor.Component { if (el && el.attributes) { handler.open_url(el.attributes['url']); }; - }, 400, get_msgbox_width()); + }, 400); } event click $(menu#config-options>li) (_, me) { - if (me.state.disabled) return; if (me.id && me.id.indexOf("enable-") == 0) { - handler.set_option(me.id, handler.get_option(me.id) == "N" ? default_option_yes : "N"); + handler.set_option(me.id, handler.get_option(me.id) == "N" ? "" : "N"); } if (me.id && me.id.indexOf("allow-") == 0) { - handler.set_option(me.id, handler.get_option(me.id) == "Y" ? default_option_no : "Y"); + handler.set_option(me.id, handler.get_option(me.id) == "Y" ? "" : "Y"); } if (me.id == "whitelist") { - open_whitelist_dialog(); + var old_value = handler.get_option("whitelist").split(",").join("\n"); + msgbox("custom-whitelist", translate("IP Whitelisting"), "
    \ +
    " + translate("whitelist_sep") + "
    \ + \ +
    \ + ", "", function(res=null) { + if (!res) return; + var value = (res.text || "").trim(); + if (value) { + var values = value.split(/[\s,;\n]+/g); + for (var ip in values) { + if (!ip.match(/^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]?|0)\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]?|0)\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]?|0)\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]?|0)(\/([1-9]|[1-2][0-9]|3[0-2])){0,1}$/) + && !ip.match(/^(((?:[0-9A-Fa-f]{1,4}))*((?::[0-9A-Fa-f]{1,4}))*::((?:[0-9A-Fa-f]{1,4}))*((?::[0-9A-Fa-f]{1,4}))*|((?:[0-9A-Fa-f]{1,4}))((?::[0-9A-Fa-f]{1,4})){7})(\/([1-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8])){0,1}$/)) { + return translate("Invalid IP") + ": " + ip; + } + } + value = values.join("\n"); + } + if (value == old_value) return; + stdout.println("whitelist updated"); + handler.set_option("whitelist", value.replace("\n", ",")); + }, 300); } else if (me.id == "custom-server") { - open_custom_server_dialog(); + var configOptions = handler.get_options(); + var old_relay = configOptions["relay-server"] || ""; + var old_api = configOptions["api-server"] || ""; + var old_id = configOptions["custom-rendezvous-server"] || ""; + var old_key = configOptions["key"] || ""; + msgbox("custom-server", "ID/Relay Server", "
    \ +
    " + translate("ID Server") + ":
    \ +
    " + translate("Relay Server") + ":
    \ +
    " + translate("API Server") + ":
    \ +
    " + translate("Key") + ":
    \ +
    \ + ", "", function(res=null) { + if (!res) return; + var id = (res.id || "").trim(); + var relay = (res.relay || "").trim(); + var api = (res.api || "").trim().toLowerCase(); + var key = (res.key || "").trim(); + if (id == old_id && relay == old_relay && key == old_key && api == old_api) return; + if (id) { + var err = handler.test_if_valid_server(id, true); + if (err) return translate("ID Server") + ": " + err; + } + if (relay) { + var err = handler.test_if_valid_server(relay, true); + if (err) return translate("Relay Server") + ": " + err; + } + if (api) { + if (0 != api.indexOf("https://") && 0 != api.indexOf("http://")) { + return translate("API Server") + ": " + translate("invalid_http"); + } + } + configOptions["custom-rendezvous-server"] = id; + configOptions["relay-server"] = relay; + configOptions["api-server"] = api; + configOptions["key"] = key; + handler.set_options(configOptions); + }, 260); } else if (me.id == "socks5-server") { - open_proxy_dialog(); - } else if (me.id == "disable-udp") { - handler.set_option("disable-udp", handler.get_option("disable-udp") == "Y" ? "N" : "Y"); + var socks5 = handler.get_socks() || {}; + var old_proxy = socks5[0] || ""; + var old_username = socks5[1] || ""; + var old_password = socks5[2] || ""; + msgbox("custom-server", "Socks5 Proxy",
    +
    {translate("Server")}:
    +
    {translate("Username")}:
    +
    {translate("Password")}:
    +
    + , "", function(res=null) { + if (!res) return; + var proxy = (res.proxy || "").trim(); + var username = (res.username || "").trim(); + var password = (res.password || "").trim(); + if (proxy == old_proxy && username == old_username && password == old_password) return; + if (proxy) { + var err = handler.test_if_valid_server(proxy, false); + if (err) return translate("Server") + ": " + err; + } + handler.set_socks(proxy, username, password); + }, 240); } else if (me.id == "stop-service") { - handler.set_option("stop-service", service_stopped ? default_option_no : "Y"); + handler.set_option("stop-service", service_stopped ? "" : "Y"); } else if (me.id == "change-id") { - var id_label_width = incoming_only ? "50px" : "100px"; - var input_width = incoming_only ? (incoming_only_width - 20) + "px" : "250px"; msgbox("custom-id", translate("Change ID"), "
    \
    " + translate('id_change_tip') + "
    \ -
    ID:
    \ +
    ID:
    \
    \ ", "", function(res=null, show_progress) { if (!res) return; @@ -656,7 +514,7 @@ class MyIdMenu: Reactor.Component { } check_status(); return " "; - }, msgbox_default_height, get_msgbox_width()); + }); } else if (me.id == "allow-darktheme") { updateTheme(); } else if (me.id == "about") { @@ -680,14 +538,11 @@ class EditDirectAccessPort: Reactor.Component { } function editDirectAccessPort() { - var is_opt_fixed = handler.is_option_fixed("direct-access-port"); var p0 = handler.get_option('direct-access-port'); - var greyStyle = is_opt_fixed ? grey_text_style : ""; - var port = p0 ? : - ; - var type_str = is_opt_fixed ? "custom-direct-access-port-nook" : "custom-direct-access-port"; - msgbox(type_str, translate('Direct IP Access Settings'),
    -
    {translate('Port')}:{port}
    + var port = p0 ? : + ; + msgbox("custom-direct-access-port", translate('Direct IP Access Settings'),
    +
    {translate('Port')}:{port}
    , "", function(res=null) { if (!res) return; var p = (res.port || '').trim(); @@ -699,7 +554,7 @@ function editDirectAccessPort() { p = p + ''; } if (p != p0) handler.set_option('direct-access-port', p); - }, msgbox_default_height, get_msgbox_width()); + }); } class App: Reactor.Component @@ -712,33 +567,27 @@ class App: Reactor.Component var is_can_screen_recording = handler.is_can_screen_recording(false); return
    -
    +
    - {is_custom_client && handler.get_builtin_option("hide-powered-by-me") != "Y" ?
    {translate('powered_by_me')}
    : ""} -
    - {translate('Your Desktop')} - {outgoing_only ? {svg_menu} : ""} -
    -
    {outgoing_only ? translate('outgoing_only_desk_tip') : translate('desk_tip')}
    - {outgoing_only ?
    : ""} - {!outgoing_only &&
    +
    {translate('Your Desktop')}
    +
    {translate('desk_tip')}
    +
    {key_confirmed ? : translate("Generating ...")} -
    } - {!outgoing_only && } +
    +
    - {(!is_win || handler.is_installed() || disable_installation) ? "" : } - {software_update_url && !disable_installation ? : ""} - {is_win && handler.is_installed() && !software_update_url && handler.is_installed_lower_version() && !disable_installation ? : ""} + {!is_win || handler.is_installed() ? "": } + {software_update_url ? : ""} + {is_win && handler.is_installed() && !software_update_url && handler.is_installed_lower_version() ? : ""} {is_can_screen_recording ? "": } {is_can_screen_recording && !handler.is_process_trusted(false) ? : ""} {!service_stopped && is_can_screen_recording && handler.is_process_trusted(false) && handler.is_installed() && !handler.is_installed_daemon(false) ? : ""} {system_error ? : ""} {!system_error && handler.is_login_wayland() && !handler.current_is_wayland() ? : ""} {!system_error && handler.current_is_wayland() ? : ""} - {incoming_only ? : ""}
    - {!incoming_only &&
    +
    {translate('Control Remote Desktop')}
    @@ -750,10 +599,10 @@ class App: Reactor.Component
    - {!outgoing_only ? : ""} -
    } + +
    -
    ; +
    ; } event click $(button#connect) { @@ -826,9 +675,7 @@ class UpdateMe: Reactor.Component { return
    {translate('Status')}
    There is a newer version of {handler.get_app_name()} ({handler.get_new_version()}) available.
    - {is_custom_client - ?
    {translate('Enable \"Auto update\" or contact your administrator for the latest version.')}
    - :
    {translate('Click to ' + update_or_download)}
    } +
    {translate('Click to ' + update_or_download)}
    ; } @@ -1014,7 +861,7 @@ class TemporaryPasswordLengthMenu: Reactor.Component { var me = this; var method = handler.get_option('verification-method'); self.timer(1ms, function() { me.toggleMenuState() }); - return
  • {translate("One-time password length")} + return
  • {translate("One-time password length")}
  • {svg_checkmark}6
  • {svg_checkmark}8
    • @@ -1024,20 +871,15 @@ class TemporaryPasswordLengthMenu: Reactor.Component { } function toggleMenuState() { - var is_opt_fixed = handler.is_option_fixed('temporary-password-length'); var length = handler.get_option("temporary-password-length"); var index = ['6', '8', '10'].indexOf(length); if (index < 0) index = 0; for (var (i, el) in this.$$(menu#temporary-password-length>li)) { el.attributes.toggleClass("selected", i == index); - if (is_opt_fixed) { - el.state.disabled = true; - } } } event click $(menu#temporary-password-length>li) (_, me) { - if (me.state.disabled) return; var length = me.id.substring('temporary-password-length-'.length); var old_length = handler.get_option('temporary-password-length'); if (length != old_length) { @@ -1064,7 +906,7 @@ class PasswordArea: Reactor.Component {
    {this.renderPop()} - {!disable_settings && svg_edit} + {svg_edit}
    • ; } @@ -1073,7 +915,6 @@ class PasswordArea: Reactor.Component { var method = handler.get_option('verification-method'); var approve_mode= handler.get_option('approve-mode'); var show_password = approve_mode != 'click'; - var has_local_password = handler.is_local_permanent_password_set(); return
  • {svg_checkmark}{translate('Accept sessions via password')}
  • {svg_checkmark}{translate('Accept sessions via click')}
    • @@ -1083,8 +924,7 @@ class PasswordArea: Reactor.Component { { !show_password ? '' :
  • {svg_checkmark}{translate('Use permanent password')}
    • } { !show_password ? '' :
  • {svg_checkmark}{translate('Use both passwords')}
    • } { !show_password ? '' :
    } - { !show_password || disable_change_permanent_password ? '' :
  • {translate('Set permanent password')}
    • } - { !show_password || disable_change_permanent_password ? '' :
  • {translate('Clear permanent password')}
    • } + { !show_password ? '' :
  • {translate('Set permanent password')}
    • } { !show_password ? '' : }
  • {svg_checkmark}{translate('enable-2fa-title')}
    • @@ -1105,22 +945,10 @@ class PasswordArea: Reactor.Component { pwd_id = 'use-both-passwords'; var has_valid_2fa = handler.has_valid_2fa(); for (var el in this.$$(menu#edit-password-context>li)) { - if (el.id.indexOf("approve-mode-") == 0) { + if (el.id.indexOf("approve-mode-") == 0) el.attributes.toggleClass("selected", el.id == mode_id); - if (handler.is_option_fixed('approve-mode')) { - el.state.disabled = true; - } - } - if (el.id.indexOf("use-") == 0) { + if (el.id.indexOf("use-") == 0) el.attributes.toggleClass("selected", el.id == pwd_id); - if (handler.is_option_fixed('verification-method')) { - el.state.disabled = true; - } - } - if (el.id == "clear-password") { - var has_local_password = handler.is_local_permanent_password_set(); - el.state.disabled = !has_local_password; - } if (el.id == "tfa") el.attributes.toggleClass("selected", has_valid_2fa); } @@ -1136,28 +964,16 @@ class PasswordArea: Reactor.Component { event click $(li#set-password) { var me = this; - var has_local_password = handler.is_local_permanent_password_set(); - var permanent_password_set = handler.is_permanent_password_set(); - var password_hidden_tip = translate('password-hidden-tip'); - var preset_password_tip = translate('preset-password-in-use-tip'); - var password_tip = ""; - if (has_local_password) { - password_tip = "
    [!] " + password_hidden_tip + "
    "; - } else if (permanent_password_set) { - password_tip = "
    [!] " + preset_password_tip + "
    "; - } + var password = handler.permanent_password(); + var value_field = password.length == 0 ? "" : "value=" + password; msgbox("custom-password", translate("Set Password"), "
    \ -
    " + translate('Password') + ":
    \ -
    " + translate('Confirmation') + ":
    \ - " + password_tip + " \ +
    " + translate('Password') + ":
    \ +
    " + translate('Confirmation') + ":
    \
    \ ", "", function(res=null) { if (!res) return; var p0 = (res.password || "").trim(); var p1 = (res.confirmation || "").trim(); - if (p0.length == 0 && p1.length == 0) { - return " "; - } if (p0.length < 6 && p0.length != 0) { return translate("Too short, at least 6 characters."); } @@ -1166,20 +982,10 @@ class PasswordArea: Reactor.Component { } handler.set_permanent_password(p0); me.update(); - }, msgbox_default_height, get_msgbox_width()); - self.timer(30ms, function() { - updateSetPasswordSubmitState(); }); } - event click $(li#clear-password) { - if (this.$(li#clear-password).state.disabled) return; - handler.set_permanent_password(""); - this.update(); - } - event click $(menu#edit-password-context>li) (_, me) { - if (me.state.disabled) return; if (me.id.indexOf('use-') == 0) { handler.set_option('verification-method', me.id); this.toggleMenuState(); @@ -1191,7 +997,7 @@ class PasswordArea: Reactor.Component { else if (me.id == 'approve-mode-click') approve_mode = 'click'; else - approve_mode = default_option_approve_mode; + approve_mode = ''; handler.set_option('approve-mode', approve_mode); this.toggleMenuState(); passwordArea.update(); @@ -1220,7 +1026,7 @@ class PasswordArea: Reactor.Component { return translate('wrong-2fa-code'); } me.update(); - }, 400, get_msgbox_width()); + }, 400); } } } @@ -1249,23 +1055,11 @@ function updatePasswordArea() { password_cache[3] = approve_mode; update = true; } - if (update && passwordArea) passwordArea.update(); + if (update) passwordArea.update(); updatePasswordArea(); }); } -if (!outgoing_only) updatePasswordArea(); - -function updateSetPasswordSubmitState() { - var dialog = $(#msgbox); - if (!dialog) return; - var password = dialog.$(input[name='password']); - var confirmation = dialog.$(input[name='confirmation']); - var submit = dialog.$(button#submit); - if (!password || !confirmation || !submit) return; - var can_submit = (password.value || "").trim().length > 0 || - (confirmation.value || "").trim().length > 0; - submit.state.disabled = !can_submit; -} +updatePasswordArea(); class ID: Reactor.Component { function render() { @@ -1324,53 +1118,8 @@ event keydown (evt) { } } -event keyup $(#msgbox input[name='password']) { - updateSetPasswordSubmitState(); -} - -event keyup $(#msgbox input[name='confirmation']) { - updateSetPasswordSubmitState(); -} - -event change $(#msgbox input[name='password']) { - updateSetPasswordSubmitState(); -} - -event change $(#msgbox input[name='confirmation']) { - updateSetPasswordSubmitState(); -} - $(body).content(
    ); -event click $(#powered-by) { - handler.open_url("https://rustdesk.com"); -} - -event click $(#open-settings) (_, me) { - showSettings(); -} - -// Event handlers for outgoing_only mode (when menu items are in main UI, not in MyIdMenu) -event click $(li#custom-server) (_, me) { - if (!outgoing_only) return; - open_custom_server_dialog(); -} - -event click $(li#whitelist) (_, me) { - if (!outgoing_only) return; - open_whitelist_dialog(); -} - -event click $(li#socks5-server) (_, me) { - if (!outgoing_only) return; - open_proxy_dialog(); -} - -event click $(li#login) (_, me) { - if (!outgoing_only) return; - login(); -} - function self.closing() { var (x, y, w, h) = view.box(#rectw, #border, #screen); handler.closing(x, y, w, h); @@ -1384,10 +1133,10 @@ function self.ready() { if (r[2] >= sw && r[3] >= sh) { self.timer(1ms, function() { view.windowState = View.WINDOW_MAXIMIZED; }); } else { - view.move(r[0], r[1], incoming_only ? scaleIt(incoming_only_width) : r[2], r[3]); + view.move(r[0], r[1], r[2], r[3]); } } else { - centerize(scaleIt(incoming_only ? incoming_only_width : 800), scaleIt(incoming_only ? 390 : 600)); + centerize(scaleIt(800), scaleIt(600)); } if (!handler.get_remote_id()) { view.focus = $(#remote_id); @@ -1402,16 +1151,7 @@ function showAbout() { function showSettings() { if ($(#overlay).style#display == 'block') return; - var menu = myIdMenu.$(menu#config-options); - var anchor = $(#open-settings); - if (!anchor) anchor = myIdMenu.$(svg#menu); - // show immediately at button, then update menu state asynchronously - anchor.popup(menu); - self.timer(1ms, function() { - audioInputMenu.update({ show: true }); - myIdMenu.toggleMenuState(); - if (direct_server) direct_server.update(); - }); + myIdMenu.showSettingMenu(); } function checkConnectStatus() { @@ -1456,11 +1196,6 @@ function checkConnectStatus() { updateAbPeer(); app.update(); } - tmp = handler.get_option("disable-udp") == "Y"; - if (tmp != disable_udp) { - disable_udp = tmp; - app.update(); - } check_if_overlay(); checkConnectStatus(); }); @@ -1481,16 +1216,7 @@ function self.onMouse(evt) { } function check_if_overlay() { - var enabled; - var is_enabled_by_control_permissions = handler.is_remote_modify_enabled_by_control_permissions(); - if (is_enabled_by_control_permissions == "true") { - enabled = true; - } else if (is_enabled_by_control_permissions == "false") { - enabled = false; - } else { - enabled = handler.get_option('allow-remote-config-modification') == 'Y'; - } - if (!enabled) { + if (handler.get_option('allow-remote-config-modification') != 'Y') { var time0 = getTime(); handler.check_mouse_time(); self.timer(120ms, function() { @@ -1505,12 +1231,6 @@ checkConnectStatus(); function set_local_user_info(user) { var user_info = {name: user.name}; - if (user.display_name) { - user_info.display_name = user.display_name; - } - if (user.avatar) { - user_info.avatar = user.avatar; - } if (user.status) { user_info.status = user.status; } @@ -1563,7 +1283,7 @@ function login() { show_progress(false, err); }); return " "; - }, msgbox_default_height, get_msgbox_width()); + }); } function on_2fa_check(last_msg) { @@ -1617,9 +1337,7 @@ function on_2fa_check(last_msg) { } ); return " "; - }, - msgbox_default_height, - get_msgbox_width() + } ); } diff --git a/src/ui/msgbox.tis b/src/ui/msgbox.tis index 6e6b6a62f..542691f5f 100644 --- a/src/ui/msgbox.tis +++ b/src/ui/msgbox.tis @@ -193,10 +193,8 @@ class MsgboxComponent: Reactor.Component { } function submit() { - var submit_btn = this.$(button#submit); - if (submit_btn) { - if (submit_btn.state.disabled) return; - submit_btn.sendEvent("click"); + if (this.$(button#submit)) { + this.$(button#submit).sendEvent("click"); } } diff --git a/src/ui/remote.rs b/src/ui/remote.rs index 8b6f01ae0..f99e2de6e 100644 --- a/src/ui/remote.rs +++ b/src/ui/remote.rs @@ -1,7 +1,7 @@ use std::{ collections::HashMap, ops::{Deref, DerefMut}, - sync::{atomic::AtomicUsize, Arc, Mutex, RwLock}, + sync::{Arc, Mutex, RwLock}, }; use sciter::{ @@ -85,22 +85,6 @@ impl SciterHandler { serde_json::Value::Bool(b) => { value.set_item(k, b); } - serde_json::Value::Array(arr) if k == "supported_privacy_mode_impl" => { - let mut impls = Value::array(0); - for item in arr { - if let serde_json::Value::Array(entry) = item { - let impl_key = entry.get(0).and_then(|v| v.as_str()); - let impl_name = entry.get(1).and_then(|v| v.as_str()); - if let (Some(impl_key), Some(impl_name)) = (impl_key, impl_name) { - let mut impl_item = Value::array(0); - impl_item.push(impl_key); - impl_item.push(impl_name); - impls.push(impl_item); - } - } - } - value.set_item(k, impls); - } _ => { // ignore for now } @@ -141,9 +125,8 @@ impl InvokeUiSession for SciterHandler { } } - fn set_display(&self, x: i32, y: i32, w: i32, h: i32, cursor_embedded: bool, scale: f64) { - let scale = if scale <= 0.0 { 1.0 } else { scale }; - self.call("setDisplay", &make_args!(x, y, w, h, cursor_embedded, scale)); + fn set_display(&self, x: i32, y: i32, w: i32, h: i32, cursor_embedded: bool) { + self.call("setDisplay", &make_args!(x, y, w, h, cursor_embedded)); // https://sciter.com/forums/topic/color_spaceiyuv-crash // Nothing spectacular in decoder – done on CPU side. // So if you can do BGRA translation on your side – the better. @@ -195,11 +178,8 @@ impl InvokeUiSession for SciterHandler { self.call("setCursorPosition", &make_args!(cp.x, cp.y)); } - fn set_connection_type(&self, is_secured: bool, direct: bool, stream_type: &str) { - self.call( - "setConnectionType", - &make_args!(is_secured, direct, stream_type.to_string()), - ); + fn set_connection_type(&self, is_secured: bool, direct: bool) { + self.call("setConnectionType", &make_args!(is_secured, direct)); } fn set_fingerprint(&self, _fingerprint: String) {} @@ -216,7 +196,7 @@ impl InvokeUiSession for SciterHandler { self.call("clearAllJobs", &make_args!()); } - fn load_last_job(&self, cnt: i32, job_json: &str, auto_start: bool) { + fn load_last_job(&self, cnt: i32, job_json: &str) { let job: Result = serde_json::from_str(job_json); if let Ok(job) = job { let path; @@ -230,15 +210,7 @@ impl InvokeUiSession for SciterHandler { } self.call( "addJob", - &make_args!( - cnt, - path, - to, - job.file_num, - job.show_hidden, - job.is_remote, - auto_start - ), + &make_args!(cnt, path, to, job.file_num, job.show_hidden, job.is_remote), ); } } @@ -566,7 +538,6 @@ impl sciter::EventHandler for SciterSession { fn get_toggle_option(String); fn is_privacy_mode_supported(); fn toggle_option(String); - fn toggle_privacy_mode(String, bool); fn get_remember(); fn peer_platform(); fn set_write_override(i32, i32, bool, bool, bool); @@ -596,7 +567,6 @@ impl SciterSession { server_keyboard_enabled: Arc::new(RwLock::new(true)), server_file_transfer_enabled: Arc::new(RwLock::new(true)), server_clipboard_enabled: Arc::new(RwLock::new(true)), - reconnect_count: Arc::new(AtomicUsize::new(0)), ..Default::default() }; diff --git a/src/ui/remote.tis b/src/ui/remote.tis index 28fbc3763..00dceac5b 100644 --- a/src/ui/remote.tis +++ b/src/ui/remote.tis @@ -4,30 +4,24 @@ var is_port_forward = handler.is_port_forward(); var input_blocked = false; var display_width = 0; var display_height = 0; -var display_remote_scale = 1; var display_origin_x = 0; var display_origin_y = 0; var display_cursor_embedded = false; var display_scale = 1; -// the scale factor is different from `display_scale` if peer platform is Linux (Wayland). -var cursor_scale = 1; var keyboard_enabled = true; // server side var clipboard_enabled = true; // server side var audio_enabled = true; // server side var file_enabled = true; // server side var restart_enabled = true; // server side var recording_enabled = true; // server side -var privacy_mode_enabled = true; // server side var scroll_body = $(body); -var peer_platform = ""; -handler.setDisplay = function(x, y, w, h, cursor_embedded, scale) { +handler.setDisplay = function(x, y, w, h, cursor_embedded) { display_width = w; display_height = h; display_origin_x = x; display_origin_y = y; display_cursor_embedded = cursor_embedded; - display_remote_scale = scale; adaptDisplay(); if (recording) handler.record_screen(true, 0, w, h); } @@ -35,24 +29,12 @@ handler.setDisplay = function(x, y, w, h, cursor_embedded, scale) { // in case toolbar not shown correctly view.windowMinSize = (scaleIt(500), scaleIt(300)); -function get_peer_platform() { - if (peer_platform == "") { - peer_platform = handler.peer_platform(); - } - return peer_platform; -} - -function isRemoteLinux() { - return get_peer_platform() == "Linux"; -} - function adaptDisplay() { var w = display_width; var h = display_height; if (!w || !h) return; var style = handler.get_view_style(); display_scale = 1.; - cursor_scale = 1.; var (sx, sy, sw, sh) = view.screenBox(view.windowState == View.WINDOW_FULL_SCREEN ? #frame : #workarea, #rectw); if (sw >= w && sh > h) { var hh = $(header).box(#height, #border); @@ -89,12 +71,6 @@ function adaptDisplay() { } } } - if (isRemoteLinux()) { - cursor_scale = display_scale * display_remote_scale; - } else { - cursor_scale = display_scale; - } - if (cursor_scale <= 0.0001) cursor_scale = 1.; refreshCursor(); handler.style.set { width: w / scaleFactor + "px", @@ -143,14 +119,6 @@ function resetWheel() { } var INERTIA_ACCELERATION = 30; -var WHEEL_ACCEL_VELOCITY_THRESHOLD = 5000; -var WHEEL_ACCEL_DT_FAST = 0.04; -var WHEEL_ACCEL_DT_MEDIUM = 0.08; -var WHEEL_ACCEL_VALUE_FAST = 3; -var WHEEL_ACCEL_VALUE_MEDIUM = 2; -// Wheel burst acceleration (empirical tuning). -// Applies only on fast, non-smooth wheel bursts to keep single-step scroll unchanged. -// Sciter uses seconds for dt, so velocity is in delta/sec. // not good, precision not enough to simulate acceleration effect, // seems have to use pixel based rather line based delta @@ -246,28 +214,12 @@ function handler.onMouse(evt) // mouseWheelDistance = 8 * [currentUserDefs floatForKey:@"com.apple.scrollwheel.scaling"]; mask = 3; { - var now = getTime(); - var dt = last_wheel_time > 0 ? (now - last_wheel_time) / 1000 : 0; - var (raw_dx, raw_dy) = evt.wheelDeltas; - var dx = 0; - var dy = 0; - var abs_dx = Math.abs(raw_dx); - var abs_dy = Math.abs(raw_dy); - var dominant = abs_dx > abs_dy ? abs_dx : abs_dy; - var is_smooth = dominant < 1; - var accel = 1; - if (!is_smooth && dt > 0 && (is_win || is_linux) && get_peer_platform() == "Mac OS") { - var velocity = dominant / dt; - if (velocity >= WHEEL_ACCEL_VELOCITY_THRESHOLD) { - if (dt < WHEEL_ACCEL_DT_FAST) accel = WHEEL_ACCEL_VALUE_FAST; - else if (dt < WHEEL_ACCEL_DT_MEDIUM) accel = WHEEL_ACCEL_VALUE_MEDIUM; - } - } - if (raw_dx > 0) dx = accel; - else if (raw_dx < 0) dx = -accel; - if (raw_dy > 0) dy = accel; - else if (raw_dy < 0) dy = -accel; - if (abs_dx > abs_dy) { + var (dx, dy) = evt.wheelDeltas; + if (dx > 0) dx = 1; + else if (dx < 0) dx = -1; + if (dy > 0) dy = 1; + else if (dy < 0) dy = -1; + if (Math.abs(dx) > Math.abs(dy)) { dy = 0; } else { dx = 0; @@ -278,6 +230,8 @@ function handler.onMouse(evt) wheel_delta_y = acc_wheel_delta_y.toInteger(); acc_wheel_delta_x -= wheel_delta_x; acc_wheel_delta_y -= wheel_delta_y; + var now = getTime(); + var dt = last_wheel_time > 0 ? (now - last_wheel_time) / 1000 : 0; if (dt > 0) { var vx = dx / dt; var vy = dy / dt; @@ -320,14 +274,12 @@ function handler.onMouse(evt) entered = true; stdout.println("enter"); handler.enter(handler.get_keyboard_mode()); - last_wheel_time = 0; return keyboard_enabled; case Event.MOUSE_LEAVE: entered = false; stdout.println("leave"); handler.leave(handler.get_keyboard_mode()); - last_wheel_time = 0; - if (is_left_down && get_peer_platform() == "Android") { + if (is_left_down && handler.peer_platform() == "Android") { is_left_down = false; handler.send_mouse((1 << 3) | 2, 0, 0, evt.altKey, evt.ctrlKey, evt.shiftKey, evt.commandKey); @@ -351,8 +303,8 @@ function handler.onMouse(evt) resetWheel(); } if (!keyboard_enabled) return false; - x = (x / cursor_scale).toInteger(); - y = (y / cursor_scale).toInteger(); + x = (x / display_scale).toInteger(); + y = (y / display_scale).toInteger(); // insert down between two up, osx has this behavior for triple click if (last_mouse_mask == 2 && mask == 2) { handler.send_mouse((evt.buttons << 3) | 1, 0, 0, evt.altKey, @@ -387,18 +339,14 @@ var cursors = {}; var image_binded; function scaleCursorImage(img) { - var factor = cursor_scale; - if (cursor_img.style#display != 'none') { - factor /= scaleFactor; - } - var w = (img.width * factor).toInteger(); - var h = (img.height * factor).toInteger(); + var w = (img.width * display_scale).toInteger(); + var h = (img.height * display_scale).toInteger(); cursor_img.style.set { width: w + "px", height: h + "px", }; self.bindImage("in-memory:cursor", img); - if (factor == 1) return img; + if (display_scale == 1) return img; function paint(gfx) { gfx.drawImage(img, 0, 0, w, h); } @@ -412,7 +360,7 @@ function updateCursor(system=false) { if (system) { handler.style#cursor = undefined; } else if (cur_img) { - handler.style.cursor(cur_img, (cur_hotx * cursor_scale).toInteger(), (cur_hoty * cursor_scale).toInteger()); + handler.style.cursor(cur_img, (cur_hotx * display_scale).toInteger(), (cur_hoty * display_scale).toInteger()); } } @@ -465,15 +413,14 @@ handler.setCursorPosition = function(x, y) { cur_y = y - display_origin_y; var x = cur_x - cur_hotx; var y = cur_y - cur_hoty; - x *= cursor_scale / scaleFactor; - y *= cursor_scale / scaleFactor; + x *= display_scale / scaleFactor; + y *= display_scale / scaleFactor; cursor_img.style.set { left: x + "px", top: y + "px", }; if (cursor_img.style#display == 'none') { cursor_img.style#display = "block"; - refreshCursor(); } } @@ -589,7 +536,6 @@ handler.setPermission = function(name, enabled) { if (name == "clipboard") clipboard_enabled = enabled; if (name == "restart") restart_enabled = enabled; if (name == "recording") recording_enabled = enabled; - if (name == "privacy_mode") privacy_mode_enabled = enabled; input_blocked = false; header.update(); }); diff --git a/src/ui_cm_interface.rs b/src/ui_cm_interface.rs index cab0d7f1c..880f0ca61 100644 --- a/src/ui_cm_interface.rs +++ b/src/ui_cm_interface.rs @@ -1,22 +1,21 @@ +#[cfg(target_os = "windows")] +use crate::ipc::ClipboardNonFile; #[cfg(not(any(target_os = "android", target_os = "ios")))] use crate::ipc::Connection; #[cfg(not(any(target_os = "ios")))] -use crate::ipc::{self, Data}; -#[cfg(target_os = "windows")] -use crate::{clipboard::ClipboardSide, ipc::ClipboardNonFile}; +use crate::{ + clipboard::ClipboardSide, + ipc::{self, Data}, +}; #[cfg(target_os = "windows")] use clipboard::ContextSend; -#[cfg(not(any(target_os = "ios")))] -use hbb_common::fs::serialize_transfer_job; #[cfg(not(any(target_os = "android", target_os = "ios")))] use hbb_common::tokio::sync::mpsc::unbounded_channel; use hbb_common::{ - allow_err, bail, - config::{ - keys::{OPTION_ENABLE_PERM_CHANGE_IN_ACCEPT_WINDOW, OPTION_FILE_TRANSFER_MAX_FILES}, - option2bool, Config, - }, - fs::{self, get_string, is_write_need_confirmation, new_send_confirm, DigestCheckResult}, + allow_err, + config::{keys::*, option2bool, Config}, + fs::is_write_need_confirmation, + fs::{self, get_string, new_send_confirm, DigestCheckResult}, log, message_proto::*, protobuf::Message as _, @@ -25,16 +24,13 @@ use hbb_common::{ sync::mpsc::{self, UnboundedSender}, task::spawn_blocking, }, - ResultType, }; -#[cfg(target_os = "windows")] -use hbb_common::{config::keys::*, tokio::sync::Mutex as TokioMutex}; +#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))] +use hbb_common::{tokio::sync::Mutex as TokioMutex, ResultType}; use serde_derive::Serialize; #[cfg(any(target_os = "android", target_os = "ios", feature = "flutter"))] use std::iter::FromIterator; -#[cfg(not(any(target_os = "ios")))] -use std::path::PathBuf; -#[cfg(target_os = "windows")] +#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))] use std::sync::Arc; use std::{ collections::HashMap, @@ -45,85 +41,6 @@ use std::{ }, }; -/// Default maximum number of files allowed per transfer request. -/// Unit: number of files (not bytes). -#[cfg(not(any(target_os = "ios")))] -const DEFAULT_MAX_VALIDATED_FILES: usize = 10_000; - -/// Maximum number of files allowed in a single file transfer request. -/// -/// This limit prevents excessive I/O and memory usage when dealing with -/// large directories. It applies to: -/// - CM-side read jobs (server to client file transfers on Windows) -/// - `AllFiles` recursive directory listing operations -/// - Connection-side read jobs (non-Windows platforms) -/// -/// Unit: number of files (not bytes). -/// Default: 10,000 files. -/// Configured via: `OPTION_FILE_TRANSFER_MAX_FILES` ("file-transfer-max-files") -#[cfg(not(any(target_os = "ios")))] -static MAX_VALIDATED_FILES: std::sync::OnceLock = std::sync::OnceLock::new(); - -/// Get the maximum number of files allowed per transfer request. -/// -/// Initializes the value from configuration (`OPTION_FILE_TRANSFER_MAX_FILES`) -/// on first call. Semantics: -/// - If the option is set to `0`, `DEFAULT_MAX_VALIDATED_FILES` (10,000) is used as a safe upper bound. -/// - If the option is unset, negative, or non-integer, -/// `usize::MAX` is used to represent "no limit" for backward compatibility with older versions -/// that did not enforce any file‑count restriction. -/// (Note: negative values are not valid for `usize` and will cause parsing to fail.) -/// -/// Unit: number of files. -#[cfg(not(any(target_os = "ios")))] -#[inline] -pub fn get_max_validated_files() -> usize { - // If `OPTION_FILE_TRANSFER_MAX_FILES` unset, negative, or non-integer, use - // `usize::MAX` to represent "no limit", maintaining backward compatibility - // with versions that had no file transfer restrictions. - const NO_LIMIT_FILE_COUNT: usize = usize::MAX; - *MAX_VALIDATED_FILES.get_or_init(|| { - let c = crate::get_builtin_option(OPTION_FILE_TRANSFER_MAX_FILES) - .trim() - .parse::() - .unwrap_or(NO_LIMIT_FILE_COUNT); - if c == 0 { - DEFAULT_MAX_VALIDATED_FILES - } else { - c - } - }) -} - -/// Check if file count exceeds the maximum allowed limit. -/// -/// This check is enforced in: -/// - `start_read_job()` for CM-side read jobs -/// - `read_all_files()` for recursive directory listings -/// - `Connection::on_message()` for connection-side read jobs -/// -/// # Arguments -/// * `file_count` - Number of files in the transfer request -/// -/// # Returns -/// * `Ok(())` if within limit -/// * `Err(String)` with error message if limit exceeded -#[cfg(not(any(target_os = "ios")))] -pub fn check_file_count_limit(file_count: usize) -> Result<(), String> { - let max_files = get_max_validated_files(); - if file_count > max_files { - let msg = format!( - "file transfer rejected: too many files ({} files exceeds limit of {}). \ - Adjust '{}' option to increase limit.", - file_count, max_files, OPTION_FILE_TRANSFER_MAX_FILES - ); - log::warn!("{}", msg); - Err(msg) - } else { - Ok(()) - } -} - #[derive(Serialize, Clone)] pub struct Client { pub id: i32, @@ -134,7 +51,6 @@ pub struct Client { pub is_terminal: bool, pub port_forward: String, pub name: String, - pub avatar: String, pub peer_id: String, pub keyboard: bool, pub clipboard: bool, @@ -143,7 +59,6 @@ pub struct Client { pub restart: bool, pub recording: bool, pub block_input: bool, - pub privacy_mode: bool, pub from_switch: bool, pub in_voice_call: bool, pub incoming_voice_call: bool, @@ -165,8 +80,6 @@ struct IpcTaskRunner { file_transfer_enabled: bool, #[cfg(target_os = "windows")] file_transfer_enabled_peer: bool, - /// Read jobs for CM-side file reading (server to client transfers) - read_jobs: Vec, } lazy_static::lazy_static! { @@ -222,7 +135,6 @@ impl ConnectionManager { port_forward: String, peer_id: String, name: String, - avatar: String, authorized: bool, keyboard: bool, clipboard: bool, @@ -231,7 +143,6 @@ impl ConnectionManager { restart: bool, recording: bool, block_input: bool, - privacy_mode: bool, from_switch: bool, #[cfg(not(any(target_os = "ios")))] tx: mpsc::UnboundedSender, ) { @@ -244,7 +155,6 @@ impl ConnectionManager { is_terminal, port_forward, name: name.clone(), - avatar, peer_id: peer_id.clone(), keyboard, clipboard, @@ -253,7 +163,6 @@ impl ConnectionManager { restart, recording, block_input, - privacy_mode, from_switch, #[cfg(not(any(target_os = "ios")))] tx, @@ -395,23 +304,6 @@ pub fn send_chat(id: i32, text: String) { #[inline] #[cfg(not(any(target_os = "ios")))] pub fn switch_permission(id: i32, name: String, enabled: bool) { - #[cfg(target_os = "android")] - let is_keyboard_permission = name == "keyboard"; - #[cfg(not(target_os = "android"))] - let is_keyboard_permission = false; - if !option2bool( - OPTION_ENABLE_PERM_CHANGE_IN_ACCEPT_WINDOW, - &crate::get_builtin_option(OPTION_ENABLE_PERM_CHANGE_IN_ACCEPT_WINDOW), - ) && !is_keyboard_permission - { - log::info!( - "blocked cm switch_permission by policy, conn_id={}, permission={}, enabled={}", - id, - name, - enabled - ); - return; - } if let Some(client) = CLIENTS.read().unwrap().get(&id) { allow_err!(client.tx.send(Data::SwitchPermission { name, enabled })); }; @@ -420,19 +312,6 @@ pub fn switch_permission(id: i32, name: String, enabled: bool) { #[inline] #[cfg(target_os = "android")] pub fn switch_permission_all(name: String, enabled: bool) { - if name != "keyboard" - && !option2bool( - OPTION_ENABLE_PERM_CHANGE_IN_ACCEPT_WINDOW, - &crate::get_builtin_option(OPTION_ENABLE_PERM_CHANGE_IN_ACCEPT_WINDOW), - ) - { - log::info!( - "blocked cm switch_permission_all by policy, permission={}, enabled={}", - name, - enabled - ); - return; - } for (_, client) in CLIENTS.read().unwrap().iter() { allow_err!(client.tx.send(Data::SwitchPermission { name: name.clone(), @@ -455,16 +334,9 @@ pub fn get_clients_length() -> usize { clients.len() } -#[inline] -#[cfg(target_os = "android")] -pub fn has_active_clients() -> bool { - let clients = CLIENTS.read().unwrap(); - clients.values().any(|c| !c.disconnected) -} - #[inline] #[cfg(feature = "flutter")] -#[cfg(not(any(target_os = "android", target_os = "ios")))] +#[cfg(not(any(target_os = "ios")))] pub fn switch_back(id: i32) { if let Some(client) = CLIENTS.read().unwrap().get(&id) { allow_err!(client.tx.send(Data::SwitchSidesBack)); @@ -475,16 +347,9 @@ pub fn switch_back(id: i32) { impl IpcTaskRunner { async fn run(&mut self) { use hbb_common::config::LocalConfig; - use hbb_common::tokio::time::{self, Duration, Instant}; - - const MILLI5: Duration = Duration::from_millis(5); - const SEC30: Duration = Duration::from_secs(30); // for tmp use, without real conn id let mut write_jobs: Vec = Vec::new(); - // File timer for processing read_jobs - let mut file_timer = - crate::rustdesk_interval(time::interval_at(Instant::now() + SEC30, SEC30)); #[cfg(target_os = "windows")] let is_authorized = self.cm.is_authorized(self.conn_id); @@ -543,9 +408,9 @@ impl IpcTaskRunner { } Ok(Some(data)) => { match data { - Data::Login{id, is_file_transfer, is_view_camera, is_terminal, port_forward, peer_id, name, avatar, authorized, keyboard, clipboard, audio, file, file_transfer_enabled: _file_transfer_enabled, restart, recording, block_input, privacy_mode, from_switch} => { + Data::Login{id, is_file_transfer, is_view_camera, is_terminal, port_forward, peer_id, name, authorized, keyboard, clipboard, audio, file, file_transfer_enabled: _file_transfer_enabled, restart, recording, block_input, from_switch} => { log::debug!("conn_id: {}", id); - self.cm.add_connection(id, is_file_transfer, is_view_camera, is_terminal, port_forward, peer_id, name, avatar, authorized, keyboard, clipboard, audio, file, restart, recording, block_input, privacy_mode, from_switch, self.tx.clone()); + self.cm.add_connection(id, is_file_transfer, is_view_camera, is_terminal, port_forward, peer_id, name, authorized, keyboard, clipboard, audio, file, restart, recording, block_input, from_switch, self.tx.clone()); self.conn_id = id; #[cfg(target_os = "windows")] { @@ -573,40 +438,14 @@ impl IpcTaskRunner { Data::ChatMessage { text } => { self.cm.new_message(self.conn_id, text); } - Data::SwitchPermission { name, enabled } => { - // Keep this branch scoped to privacy mode rollback. - // Other CM permission toggles are updated optimistically by the UI itself. - // The backend currently sends SwitchPermission back to CM only when - // privacy-mode turn-off fails and the UI state must be restored. - if name == "privacy_mode" { - let client = { - let mut clients = CLIENTS.write().unwrap(); - clients.get_mut(&self.conn_id).map(|c| { - c.privacy_mode = enabled; - c.clone() - }) - }; - if let Some(client) = client { - // This reuses add_connection(), and cm.tis only selectively updates - // existing rows (authorized/privacy_mode) for this fallback path. - self.cm.ui_handler.add_connection(&client); - } - } - } Data::FS(mut fs) => { if let ipc::FS::WriteBlock { id, file_num, data: _, compressed } = fs { if let Ok(bytes) = self.stream.next_raw().await { fs = ipc::FS::WriteBlock{id, file_num, data:bytes.into(), compressed}; - handle_fs(fs, &mut write_jobs, &mut self.read_jobs, &self.tx, Some(&tx_log), self.conn_id).await; + handle_fs(fs, &mut write_jobs, &self.tx, Some(&tx_log)).await; } } else { - handle_fs(fs, &mut write_jobs, &mut self.read_jobs, &self.tx, Some(&tx_log), self.conn_id).await; - } - // Activate fast timer immediately when read jobs exist. - // This ensures new jobs start processing without waiting for the slow 30s timer. - // Deactivation (back to 30s) happens in tick handler when jobs are exhausted. - if !self.read_jobs.is_empty() { - file_timer = crate::rustdesk_interval(time::interval(MILLI5)); + handle_fs(fs, &mut write_jobs, &self.tx, Some(&tx_log)).await; } let log = fs::serialize_transfer_jobs(&write_jobs); self.cm.ui_handler.file_transfer_log("transfer", &log); @@ -710,31 +549,6 @@ impl IpcTaskRunner { } } Some(data) = self.rx.recv() => { - // For FileBlockFromCM, data is sent separately via send_raw (data field has #[serde(skip)]). - // This avoids JSON encoding overhead for large binary data. - // This mirrors the WriteBlock pattern in start_ipc (see rx_to_cm handler). - // - // Note: Empty data (for empty files) is correctly handled. BytesCodec with raw=false - // (the default for IPC connections) adds a length prefix, so send_raw(Bytes::new()) - // sends a 1-byte frame that next_raw() can correctly receive as empty data. - if let Data::FileBlockFromCM { id, file_num, ref data, compressed, conn_id } = data { - // Send metadata first (data field is skipped by serde), then raw data bytes - if let Err(e) = self.stream.send(&Data::FileBlockFromCM { - id, - file_num, - data: bytes::Bytes::new(), // placeholder, skipped by serde - compressed, - conn_id, - }).await { - log::error!("error sending FileBlockFromCM metadata: {}", e); - break; - } - if let Err(e) = self.stream.send_raw(data.clone()).await { - log::error!("error sending FileBlockFromCM data: {}", e); - break; - } - continue; - } if let Err(e) = self.stream.send(&data).await { log::error!("error encountered in IPC task, quitting: {}", e); break; @@ -785,18 +599,6 @@ impl IpcTaskRunner { Some(job_log) = rx_log.recv() => { self.cm.ui_handler.file_transfer_log("transfer", &job_log); } - _ = file_timer.tick() => { - if !self.read_jobs.is_empty() { - let conn_id = self.conn_id; - if let Err(e) = handle_read_jobs_tick(&mut self.read_jobs, &self.tx, conn_id).await { - log::error!("Error processing read jobs: {}", e); - } - let log = fs::serialize_transfer_jobs(&self.read_jobs); - self.cm.ui_handler.file_transfer_log("transfer", &log); - } else { - file_timer = crate::rustdesk_interval(time::interval_at(Instant::now() + SEC30, SEC30)); - } - } } } } @@ -816,7 +618,6 @@ impl IpcTaskRunner { file_transfer_enabled: false, #[cfg(target_os = "windows")] file_transfer_enabled_peer: false, - read_jobs: Vec::new(), }; while task_runner.running { @@ -835,14 +636,10 @@ impl IpcTaskRunner { #[tokio::main(flavor = "current_thread")] pub async fn start_ipc(cm: ConnectionManager) { #[cfg(target_os = "windows")] - { - let enabled = crate::Connection::is_permission_enabled_locally(OPTION_ENABLE_FILE_TRANSFER); - let mut lock = crate::ui_interface::IS_FILE_TRANSFER_ENABLED - .lock() - .unwrap(); - ContextSend::enable(enabled); - *lock = Some(enabled); - } + ContextSend::enable(option2bool( + OPTION_ENABLE_FILE_TRANSFER, + &Config::get_option(OPTION_ENABLE_FILE_TRANSFER), + )); match ipc::new_listener("_cm").await { Ok(mut incoming) => { while let Some(result) = incoming.next().await { @@ -886,7 +683,6 @@ pub async fn start_listen( port_forward, peer_id, name, - avatar, authorized, keyboard, clipboard, @@ -895,7 +691,6 @@ pub async fn start_listen( restart, recording, block_input, - privacy_mode, from_switch, .. }) => { @@ -908,7 +703,6 @@ pub async fn start_listen( port_forward, peer_id, name, - avatar, authorized, keyboard, clipboard, @@ -917,7 +711,6 @@ pub async fn start_listen( restart, recording, block_input, - privacy_mode, from_switch, tx.clone(), ); @@ -926,17 +719,7 @@ pub async fn start_listen( cm.new_message(current_id, text); } Some(Data::FS(fs)) => { - // Android doesn't need CM-side file reading (no need_validate_file_read_access) - let mut read_jobs_placeholder: Vec = Vec::new(); - handle_fs( - fs, - &mut write_jobs, - &mut read_jobs_placeholder, - &tx, - None, - current_id, - ) - .await; + handle_fs(fs, &mut write_jobs, &tx, None).await; } Some(Data::Close) => { break; @@ -963,11 +746,13 @@ pub async fn start_listen( async fn handle_fs( fs: ipc::FS, write_jobs: &mut Vec, - read_jobs: &mut Vec, tx: &UnboundedSender, tx_log: Option<&UnboundedSender>, - _conn_id: i32, ) { + use std::path::PathBuf; + + use hbb_common::fs::serialize_transfer_job; + match fs { ipc::FS::ReadEmptyDirs { dir, @@ -1003,16 +788,6 @@ async fn handle_fs( total_size, conn_id, } => { - // Convert files to FileEntry - let file_entries: Vec = files - .drain(..) - .map(|f| FileEntry { - name: f.0, - modified_time: f.1, - ..Default::default() - }) - .collect(); - // cm has no show_hidden context // dummy remote, show_hidden, is_remote let mut job = fs::TransferJob::new_write( @@ -1023,13 +798,16 @@ async fn handle_fs( file_num, false, false, + files + .drain(..) + .map(|f| FileEntry { + name: f.0, + modified_time: f.1, + ..Default::default() + }) + .collect(), overwrite_detection, ); - if let Err(e) = job.set_files(file_entries) { - log::warn!("Reject unsafe transfer file list for {}: {}", path, e); - send_raw(fs::new_error(id, e, file_num), tx); - return; - } job.total_size = total_size; job.conn_id = conn_id; write_jobs.push(job); @@ -1037,11 +815,9 @@ async fn handle_fs( ipc::FS::CancelWrite { id } => { if let Some(job) = fs::remove_job(id, write_jobs) { job.remove_download_file(); - if let Some(tx) = tx_log { - if let Err(e) = tx.send(serialize_transfer_job(&job, false, true, "")) { - log::error!("error sending transfer job log via IPC: {}", e); - } - } + tx_log.map(|tx: &UnboundedSender| { + tx.send(serialize_transfer_job(&job, false, true, "")) + }); } } ipc::FS::WriteDone { id, file_num } => { @@ -1084,7 +860,6 @@ async fn handle_fs( file_size, last_modified, is_upload, - is_resume, } => { if let Some(job) = fs::get_job(id, write_jobs) { let mut req = FileTransferSendConfirmRequest { @@ -1103,9 +878,8 @@ async fn handle_fs( if let Some(file) = job.files().get(file_num as usize) { if let fs::DataSource::FilePath(p) = &job.data_source { let path = get_string(&fs::TransferJob::join(p, &file.name)); - match is_write_need_confirmation(is_resume, &path, &digest) { + match is_write_need_confirmation(&path, &digest) { Ok(digest_result) => { - job.set_digest(file_size, last_modified); match digest_result { DigestCheckResult::IsSame => { req.set_skip(true); @@ -1135,379 +909,13 @@ async fn handle_fs( } } } - ipc::FS::SendConfirm(bytes) => { - if let Ok(r) = FileTransferSendConfirmRequest::parse_from_bytes(&bytes) { - if let Some(job) = fs::get_job(r.id, write_jobs) { - job.confirm(&r).await; - } - } - } ipc::FS::Rename { id, path, new_name } => { rename_file(path, new_name, id, tx).await; } - ipc::FS::ReadFile { - path, - id, - file_num, - include_hidden, - conn_id, - overwrite_detection, - } => { - start_read_job( - path, - file_num, - include_hidden, - id, - conn_id, - overwrite_detection, - read_jobs, - tx, - ) - .await; - } - // Cancel an ongoing read job (file transfer from server to client). - // Note: This only cancels jobs in `read_jobs`. It does NOT cancel `ReadAllFiles` - // operations, which are one-shot directory scans that complete quickly and don't - // have persistent job tracking. - ipc::FS::CancelRead { id, conn_id: _ } => { - if let Some(job) = fs::remove_job(id, read_jobs) { - if let Some(tx) = tx_log { - if let Err(e) = tx.send(serialize_transfer_job(&job, false, true, "")) { - log::error!("error sending transfer job log via IPC: {}", e); - } - } - } - } - ipc::FS::SendConfirmForRead { - id, - file_num: _, - skip, - offset_blk, - conn_id: _, - } => { - if let Some(job) = fs::get_job(id, read_jobs) { - let req = FileTransferSendConfirmRequest { - id, - file_num: job.file_num(), - union: if skip { - Some(file_transfer_send_confirm_request::Union::Skip(true)) - } else { - Some(file_transfer_send_confirm_request::Union::OffsetBlk( - offset_blk, - )) - }, - ..Default::default() - }; - job.confirm(&req).await; - } - } - // Recursively list all files in a directory. - // This is a one-shot operation that cannot be cancelled via CancelRead. - // The operation typically completes quickly as it only reads directory metadata, - // not file contents. File count is limited by `check_file_count_limit()`. - ipc::FS::ReadAllFiles { - path, - id, - include_hidden, - conn_id, - } => { - read_all_files(path, include_hidden, id, conn_id, tx).await; - } _ => {} } } -/// Start a read job in CM for file transfer from server to client (Windows only). -/// -/// This creates a `TransferJob` using `new_read()`, validates it, and sends the -/// initial file list back to Connection via IPC. -/// -/// NOTE: This is the CM-side equivalent of `create_and_start_read_job()` in -/// `src/server/connection.rs`. On non-Windows platforms, Connection handles -/// read jobs directly. Both use `TransferJob::new_read()` with similar logic. -/// When modifying job creation or validation, ensure both paths stay in sync. -#[cfg(not(any(target_os = "ios")))] -async fn start_read_job( - path: String, - file_num: i32, - include_hidden: bool, - id: i32, - conn_id: i32, - overwrite_detection: bool, - read_jobs: &mut Vec, - tx: &UnboundedSender, -) { - let path_clone = path.clone(); - let result = spawn_blocking(move || -> ResultType { - let data_source = fs::DataSource::FilePath(PathBuf::from(&path)); - fs::TransferJob::new_read( - id, - fs::JobType::Generic, - "".to_string(), - data_source, - file_num, - include_hidden, - true, - overwrite_detection, - ) - }) - .await; - - match result { - Ok(Ok(mut job)) => { - // Optional: enforce file count limit for CM-side jobs to avoid - // excessive I/O. This is applied on the job's file list produced - // by `new_read`, similar to how AllFiles uses the same helper. - if let Err(msg) = check_file_count_limit(job.files().len()) { - if let Err(e) = tx.send(Data::ReadJobInitResult { - id, - file_num, - include_hidden, - conn_id, - result: Err(msg), - }) { - log::error!("error sending ReadJobInitResult via IPC: {}", e); - } - return; - } - - // Build FileDirectory from the job's file list and serialize - let files = job.files().to_owned(); - let mut dir = FileDirectory::new(); - dir.id = id; - dir.path = path_clone.clone(); - dir.entries = files.clone().into(); - - let dir_bytes = match dir.write_to_bytes() { - Ok(bytes) => bytes, - Err(e) => { - if let Err(e) = tx.send(Data::ReadJobInitResult { - id, - file_num, - include_hidden, - conn_id, - result: Err(format!("serialize failed: {}", e)), - }) { - log::error!("error sending ReadJobInitResult via IPC: {}", e); - } - return; - } - }; - - if let Err(e) = tx.send(Data::ReadJobInitResult { - id, - file_num, - include_hidden, - conn_id, - result: Ok(dir_bytes), - }) { - log::error!("error sending ReadJobInitResult via IPC: {}", e); - } - - // Attach connection id so CM can route read blocks back correctly - job.conn_id = conn_id; - read_jobs.push(job); - } - Ok(Err(e)) => { - if let Err(e) = tx.send(Data::ReadJobInitResult { - id, - file_num, - include_hidden, - conn_id, - result: Err(format!("validation failed: {}", e)), - }) { - log::error!("error sending ReadJobInitResult via IPC: {}", e); - } - } - Err(e) => { - if let Err(e) = tx.send(Data::ReadJobInitResult { - id, - file_num, - include_hidden, - conn_id, - result: Err(format!("validation task failed: {}", e)), - }) { - log::error!("error sending ReadJobInitResult via IPC: {}", e); - } - } - } -} - -/// Process read jobs periodically, reading file blocks and sending them via IPC. -/// -/// NOTE: This is the CM-side equivalent of `handle_read_jobs()` in -/// `libs/hbb_common/src/fs.rs`. The logic mirrors that implementation -/// but communicates via IPC instead of direct network stream. -/// When modifying job processing logic, ensure both implementations stay in sync. -#[cfg(not(any(target_os = "ios")))] -async fn handle_read_jobs_tick( - jobs: &mut Vec, - tx: &UnboundedSender, - conn_id: i32, -) -> ResultType<()> { - let mut finished = Vec::new(); - - for job in jobs.iter_mut() { - if job.is_last_job { - continue; - } - - // Initialize data stream if needed (opens file, sends digest for overwrite detection) - if let Err(err) = init_read_job_for_cm(job, tx, conn_id).await { - if let Err(e) = tx.send(Data::FileReadError { - id: job.id, - file_num: job.file_num(), - err: format!("{}", err), - conn_id, - }) { - log::error!("error sending FileReadError via IPC: {}", e); - } - finished.push(job.id); - continue; - } - - // Read a block from the file - match job.read().await { - Err(err) => { - if let Err(e) = tx.send(Data::FileReadError { - id: job.id, - file_num: job.file_num(), - err: format!("{}", err), - conn_id, - }) { - log::error!("error sending FileReadError via IPC: {}", e); - } - // Mark job as finished to prevent infinite retries. - // Connection side will have already removed cm_read_job_ids - // after receiving FileReadError, so continuing would be pointless. - finished.push(job.id); - } - Ok(Some(block)) => { - if let Err(e) = tx.send(Data::FileBlockFromCM { - id: block.id, - file_num: block.file_num, - data: block.data, - compressed: block.compressed, - conn_id, - }) { - log::error!("error sending FileBlockFromCM via IPC: {}", e); - } - } - Ok(None) => { - if job.job_completed() { - finished.push(job.id); - match job.job_error() { - Some(err) => { - if let Err(e) = tx.send(Data::FileReadError { - id: job.id, - file_num: job.file_num(), - err, - conn_id, - }) { - log::error!("error sending FileReadError via IPC: {}", e); - } - } - None => { - if let Err(e) = tx.send(Data::FileReadDone { - id: job.id, - file_num: job.file_num(), - conn_id, - }) { - log::error!("error sending FileReadDone via IPC: {}", e); - } - } - } - } - // else: waiting for confirmation from peer - } - } - // Break to handle jobs one by one. - break; - } - - for id in finished { - let _ = fs::remove_job(id, jobs); - } - - Ok(()) -} - -/// Initialize a read job's data stream and handle digest sending for overwrite detection. -/// -/// NOTE: This is the CM-side equivalent of `TransferJob::init_data_stream()` in -/// `libs/hbb_common/src/fs.rs`. It calls `init_data_stream_for_cm()` and sends -/// digest via IPC instead of direct network stream. -/// When modifying initialization or digest logic, ensure both paths stay in sync. -#[cfg(not(any(target_os = "ios")))] -async fn init_read_job_for_cm( - job: &mut fs::TransferJob, - tx: &UnboundedSender, - conn_id: i32, -) -> ResultType<()> { - // Initialize data stream and get digest info if overwrite detection is needed - match job.init_data_stream_for_cm().await? { - Some((last_modified, file_size)) => { - // Send digest via IPC for overwrite detection - if let Err(e) = tx.send(Data::FileDigestFromCM { - id: job.id, - file_num: job.file_num(), - last_modified, - file_size, - is_resume: job.is_resume, - conn_id, - }) { - log::error!("error sending FileDigestFromCM via IPC: {}", e); - } - } - None => { - // Job done or already initialized, nothing to do - } - } - Ok(()) -} - -#[cfg(not(any(target_os = "ios")))] -async fn read_all_files( - path: String, - include_hidden: bool, - id: i32, - conn_id: i32, - tx: &UnboundedSender, -) { - let path_clone = path.clone(); - let result = spawn_blocking(move || fs::get_recursive_files(&path, include_hidden)).await; - - let result = match result { - Ok(Ok(files)) => { - // Check file count limit to prevent excessive I/O and resource usage - if let Err(msg) = check_file_count_limit(files.len()) { - Err(msg) - } else { - // Serialize FileDirectory to protobuf bytes - let mut fd = FileDirectory::new(); - fd.id = id; - fd.path = path_clone.clone(); - fd.entries = files.into(); - match fd.write_to_bytes() { - Ok(bytes) => Ok(bytes), - Err(e) => Err(format!("serialize failed: {}", e)), - } - } - } - Ok(Err(e)) => Err(format!("{}", e)), - Err(e) => Err(format!("task failed: {}", e)), - }; - - if let Err(e) = tx.send(Data::AllFilesResult { - id, - conn_id, - path: path_clone, - result, - }) { - log::error!("error sending AllFilesResult via IPC: {}", e); - } -} - #[cfg(not(any(target_os = "ios")))] async fn read_empty_dirs(dir: &str, include_hidden: bool, tx: &UnboundedSender) { let path = dir.to_owned(); @@ -1688,111 +1096,3 @@ pub fn quit_cm() { CLIENTS.write().unwrap().clear(); crate::platform::quit_gui(); } - -#[cfg(test)] -mod tests { - use super::*; - - use crate::ipc::Data; - use hbb_common::{ - message_proto::{FileDirectory, Message}, - tokio::{runtime::Runtime, sync::mpsc::unbounded_channel}, - }; - use std::fs; - - #[test] - #[cfg(not(any(target_os = "ios")))] - fn read_all_files_success() { - let rt = Runtime::new().unwrap(); - rt.block_on(async { - let (tx, mut rx) = unbounded_channel(); - let dir = std::env::temp_dir().join("rustdesk_read_all_test"); - let _ = fs::remove_dir_all(&dir); - fs::create_dir_all(&dir).unwrap(); - fs::write(dir.join("test.txt"), b"hello").unwrap(); - - let path_str = dir.to_string_lossy().to_string(); - super::read_all_files(path_str.clone(), false, 1, 2, &tx).await; - - match rx.recv().await.unwrap() { - Data::AllFilesResult { result, .. } => { - let bytes = result.unwrap(); - let fd = FileDirectory::parse_from_bytes(&bytes).unwrap(); - assert!(!fd.entries.is_empty()); - } - _ => panic!("unexpected data"), - } - let _ = fs::remove_dir_all(&dir); - }); - } - - #[test] - #[cfg(not(any(target_os = "ios")))] - fn read_dir_success() { - let rt = Runtime::new().unwrap(); - rt.block_on(async { - let (tx, mut rx) = unbounded_channel(); - let dir = std::env::temp_dir().join("rustdesk_read_dir_test"); - let _ = fs::remove_dir_all(&dir); - fs::create_dir_all(&dir).unwrap(); - - super::read_dir(&dir.to_string_lossy(), false, &tx).await; - - match rx.recv().await.unwrap() { - Data::RawMessage(bytes) => { - let mut msg = Message::new(); - msg.merge_from_bytes(&bytes).unwrap(); - assert!(msg - .file_response() - .dir() - .path - .contains("rustdesk_read_dir_test")); - } - _ => panic!("unexpected data"), - } - let _ = fs::remove_dir_all(&dir); - }); - } - - /// Tests that symlink creation works on this platform. - /// This is a helper to verify the test environment supports symlinks. - #[test] - #[cfg(not(any(target_os = "ios")))] - fn test_symlink_creation_works() { - let base_dir = std::env::temp_dir().join("rustdesk_symlink_test"); - let _ = fs::remove_dir_all(&base_dir); - fs::create_dir_all(&base_dir).unwrap(); - - // Create target file in a subdirectory - let target_dir = base_dir.join("target_dir"); - fs::create_dir_all(&target_dir).unwrap(); - let target_file = target_dir.join("target.txt"); - fs::write(&target_file, b"content").unwrap(); - - // Create symlink in a different directory - let link_dir = base_dir.join("link_dir"); - fs::create_dir_all(&link_dir).unwrap(); - let link_path = link_dir.join("link.txt"); - - #[cfg(unix)] - { - use std::os::unix::fs::symlink; - if symlink(&target_file, &link_path).is_err() { - let _ = fs::remove_dir_all(&base_dir); - return; - } - } - - #[cfg(windows)] - { - use std::os::windows::fs::symlink_file; - if symlink_file(&target_file, &link_path).is_err() { - // Skip if no permission (needs admin or dev mode on Windows) - let _ = fs::remove_dir_all(&base_dir); - return; - } - } - - let _ = fs::remove_dir_all(&base_dir); - } -} diff --git a/src/ui_interface.rs b/src/ui_interface.rs index 1645b242d..e17e82fce 100644 --- a/src/ui_interface.rs +++ b/src/ui_interface.rs @@ -69,7 +69,6 @@ lazy_static::lazy_static! { static ref ASYNC_JOB_STATUS : Arc> = Default::default(); static ref ASYNC_HTTP_STATUS : Arc>> = Arc::new(Mutex::new(HashMap::new())); static ref TEMPORARY_PASSWD : Arc> = Arc::new(Mutex::new("".to_owned())); - static ref IS_REMOTE_MODIFY_ENABLED_BY_CONTROL_PERMISSIONS : Arc>> = Arc::new(Mutex::new(None)); } #[cfg(not(any(target_os = "android", target_os = "ios")))] @@ -80,11 +79,6 @@ lazy_static::lazy_static! { static ref CHILDREN : Children = Default::default(); } -#[cfg(target_os = "windows")] -lazy_static::lazy_static! { - pub static ref IS_FILE_TRANSFER_ENABLED: Arc>> = Arc::new(Mutex::new(None)); -} - const INIT_ASYNC_JOB_STATUS: &str = " "; #[cfg(any(target_os = "android", target_os = "ios", feature = "flutter"))] @@ -209,19 +203,6 @@ pub fn use_texture_render() -> bool { } } -#[inline] -pub fn is_option_fixed(key: &str) -> bool { - config::OVERWRITE_DISPLAY_SETTINGS - .read() - .unwrap() - .contains_key(key) - || config::OVERWRITE_LOCAL_SETTINGS - .read() - .unwrap() - .contains_key(key) - || config::OVERWRITE_SETTINGS.read().unwrap().contains_key(key) -} - #[inline] pub fn get_local_option(key: String) -> String { crate::get_local_option(&key) @@ -245,20 +226,7 @@ pub fn get_builtin_option(key: &str) -> String { #[inline] pub fn set_local_option(key: String, value: String) { - LocalConfig::set_option(key.clone(), value); -} - -/// Resolve relative avatar path (e.g. "/avatar/xxx") to absolute URL -/// by prepending the API server address. -pub fn resolve_avatar_url(avatar: String) -> String { - let avatar = avatar.trim().to_owned(); - if avatar.starts_with('/') { - let api_server = get_api_server(); - if !api_server.is_empty() { - return format!("{}{}", api_server.trim_end_matches('/'), avatar); - } - } - avatar + LocalConfig::set_option(key.clone(), value.clone()); } #[cfg(any(target_os = "android", target_os = "ios", feature = "flutter"))] @@ -484,8 +452,10 @@ pub fn install_options() -> String { pub fn get_socks() -> Vec { #[cfg(not(any(target_os = "android", target_os = "ios")))] let s = ipc::get_socks(); - #[cfg(any(target_os = "android", target_os = "ios"))] + #[cfg(target_os = "android")] let s = Config::get_socks(); + #[cfg(target_os = "ios")] + let s: Option = None; match s { None => Vec::new(), Some(s) => { @@ -507,7 +477,7 @@ pub fn set_socks(proxy: String, username: String, password: String) { }; #[cfg(not(any(target_os = "android", target_os = "ios")))] ipc::set_socks(socks).ok(); - #[cfg(any(target_os = "android", target_os = "ios"))] + #[cfg(target_os = "android")] { let _nat = crate::CheckTestNatType::new(); if socks.proxy.is_empty() { @@ -515,11 +485,8 @@ pub fn set_socks(proxy: String, username: String, password: String) { } else { Config::set_socks(Some(socks)); } - log::info!("socks updated"); - } - #[cfg(target_os = "android")] - { crate::RendezvousMediator::restart(); + log::info!("socks updated"); } } @@ -609,57 +576,19 @@ pub fn update_temporary_password() { } #[inline] -pub fn is_permanent_password_set() -> bool { +pub fn permanent_password() -> String { #[cfg(any(target_os = "android", target_os = "ios"))] - return Config::has_permanent_password(); + return Config::get_permanent_password(); #[cfg(not(any(target_os = "android", target_os = "ios")))] - { - let daemon_is_set = ipc::is_permanent_password_set(); - // `daemon_is_set` is authoritative for the return value. Local storage is only used to - // decide whether we should attempt a sync to clear stale user-side state. - let local_storage_is_empty = if daemon_is_set { - true - } else { - let (storage, _) = Config::get_local_permanent_password_storage_and_salt(); - storage.is_empty() - }; - if daemon_is_set || !local_storage_is_empty { - allow_err!(ipc::sync_permanent_password_storage_from_daemon()); - } - daemon_is_set - } + return ipc::get_permanent_password(); } #[inline] -pub fn is_local_permanent_password_set() -> bool { +pub fn set_permanent_password(password: String) { #[cfg(any(target_os = "android", target_os = "ios"))] - return Config::has_local_permanent_password(); + Config::set_permanent_password(&password); #[cfg(not(any(target_os = "android", target_os = "ios")))] - { - allow_err!(ipc::sync_permanent_password_storage_from_daemon()); - Config::has_local_permanent_password() - } -} - -pub fn set_permanent_password_with_result(password: String) -> bool { - if config::Config::is_disable_change_permanent_password() { - return false; - } - #[cfg(any(target_os = "android", target_os = "ios"))] - { - config::Config::set_permanent_password(&password); - return true; - } - #[cfg(not(any(target_os = "android", target_os = "ios")))] - { - match crate::ipc::set_permanent_password_with_ack(password) { - Ok(ok) => ok, - Err(err) => { - log::warn!("Failed to set permanent password via IPC: {err}"); - false - } - } - } + allow_err!(ipc::set_permanent_password(password)); } #[inline] @@ -884,7 +813,6 @@ pub fn get_async_http_status(url: String) -> Option { } #[inline] -#[cfg(not(feature = "flutter"))] pub fn post_request(url: String, body: String, header: String) { *ASYNC_JOB_STATUS.lock().unwrap() = " ".to_owned(); std::thread::spawn(move || { @@ -1223,6 +1151,8 @@ async fn check_connect_status_(reconnect: bool, rx: mpsc::UnboundedReceiver { *OPTIONS.lock().unwrap() = v; *OPTION_SYNCED.lock().unwrap() = true; + + #[cfg(target_os = "windows")] + { + let b = OPTIONS.lock().unwrap().get(OPTION_ENABLE_FILE_TRANSFER).map(|x| x.to_string()).unwrap_or_default(); + if b != enable_file_transfer { + clipboard::ContextSend::enable(config::option2bool(OPTION_ENABLE_FILE_TRANSFER, &b)); + enable_file_transfer = b; + } + } } Ok(Some(ipc::Data::Config((name, Some(value))))) => { if name == "id" { @@ -1282,19 +1221,6 @@ async fn check_connect_status_(reconnect: bool, rx: mpsc::UnboundedReceiver { - *IS_REMOTE_MODIFY_ENABLED_BY_CONTROL_PERMISSIONS.lock().unwrap() = v; - } - #[cfg(target_os = "windows")] - Ok(Some(ipc::Data::FileTransferEnabledState(v))) => { - if let Some(enabled) = v { - let mut lock = IS_FILE_TRANSFER_ENABLED.lock().unwrap(); - if *lock != v { - clipboard::ContextSend::enable(enabled); - *lock = v; - } - } - } _ => {} } } @@ -1308,9 +1234,6 @@ async fn check_connect_status_(reconnect: bool, rx: mpsc::UnboundedReceiver usize { hbb_common::config::ENCRYPT_MAX_LEN } - -pub fn is_remote_modify_enabled_by_control_permissions() -> Option { - *IS_REMOTE_MODIFY_ENABLED_BY_CONTROL_PERMISSIONS - .lock() - .unwrap() -} diff --git a/src/ui_session_interface.rs b/src/ui_session_interface.rs index e6c8ac6a2..93dde3909 100644 --- a/src/ui_session_interface.rs +++ b/src/ui_session_interface.rs @@ -1,20 +1,26 @@ use crate::{ common::{get_supported_keyboard_modes, is_keyboard_mode_supported}, - input::{ - MOUSE_BUTTON_LEFT, MOUSE_BUTTON_RIGHT, MOUSE_TYPE_DOWN, MOUSE_TYPE_MASK, - MOUSE_TYPE_TRACKPAD, MOUSE_TYPE_UP, MOUSE_TYPE_WHEEL, - }, + input::{MOUSE_BUTTON_LEFT, MOUSE_TYPE_DOWN, MOUSE_TYPE_UP, MOUSE_TYPE_WHEEL}, ui_interface::use_texture_render, }; use async_trait::async_trait; use bytes::Bytes; -#[cfg(all(target_os = "windows", not(feature = "flutter")))] -use hbb_common::config::keys; +use rdev::{Event, EventType::*, KeyCode}; +use std::{ + collections::HashMap, + ffi::c_void, + ops::{Deref, DerefMut}, + str::FromStr, + sync::{Arc, Mutex, RwLock}, + time::SystemTime, +}; +use uuid::Uuid; + #[cfg(not(feature = "flutter"))] use hbb_common::fs; use hbb_common::{ allow_err, - config::{Config, LocalConfig, PeerConfig}, + config::{keys, Config, LocalConfig, PeerConfig}, get_version_number, log, message_proto::*, rendezvous_proto::ConnType, @@ -25,20 +31,6 @@ use hbb_common::{ }, whoami, Stream, }; -use rdev::{Event, EventType::*, KeyCode}; -#[cfg(all(feature = "vram", feature = "flutter"))] -use std::ffi::c_void; -use std::{ - collections::HashMap, - ops::{Deref, DerefMut}, - str::FromStr, - sync::{ - atomic::{AtomicUsize, Ordering}, - Arc, Mutex, RwLock, - }, - time::SystemTime, -}; -use uuid::Uuid; use crate::client::io_loop::Remote; use crate::client::{ @@ -67,11 +59,6 @@ pub struct Session { pub last_change_display: Arc>, pub connection_round_state: Arc>, pub printer_names: Arc>>, - // Indicate whether the session is reconnected. - // Used to auto start file transfer after reconnection. - pub reconnect_count: Arc, - pub last_audit_note: Arc>, - pub audit_guid: Arc>, } #[derive(Clone)] @@ -205,11 +192,7 @@ impl Session { } pub fn is_default(&self) -> bool { - self.lc - .read() - .unwrap() - .conn_type - .eq(&ConnType::DEFAULT_CONN) + self.lc.read().unwrap().conn_type.eq(&ConnType::DEFAULT_CONN) } pub fn is_view_camera(&self) -> bool { @@ -243,10 +226,6 @@ impl Session { self.lc.read().unwrap().scroll_style.clone() } - pub fn get_edge_scroll_edge_thickness(&self) -> i32 { - self.lc.read().unwrap().edge_scroll_edge_thickness - } - pub fn get_image_quality(&self) -> String { self.lc.read().unwrap().image_quality.clone() } @@ -359,13 +338,6 @@ impl Session { self.lc.write().unwrap().save_scroll_style(value); } - pub fn save_edge_scroll_edge_thickness(&self, value: i32) { - self.lc - .write() - .unwrap() - .save_edge_scroll_edge_thickness(value); - } - pub fn save_flutter_option(&self, k: String, v: String) { self.lc.write().unwrap().save_ui_flutter(k, v); } @@ -584,7 +556,6 @@ impl Session { let url = self.get_audit_server("conn".to_string()); let id = self.get_id(); let session_id = self.lc.read().unwrap().session_id; - *self.last_audit_note.lock().unwrap() = note.clone(); std::thread::spawn(move || { send_note(url, id, session_id, note); }); @@ -833,6 +804,7 @@ impl Session { self.send(Data::Message(msg_out)); } + pub fn capture_displays(&self, add: Vec, sub: Vec, set: Vec) { let mut misc = Misc::new(); misc.set_capture_displays(CaptureDisplays { @@ -870,14 +842,12 @@ impl Session { #[cfg(not(any(target_os = "android", target_os = "ios")))] pub fn enter(&self, keyboard_mode: String) { - let session_id = self.lc.read().unwrap().session_id as u128; - keyboard::client::change_grab_status(GrabState::Run, &keyboard_mode, session_id); + keyboard::client::change_grab_status(GrabState::Run, &keyboard_mode); } #[cfg(not(any(target_os = "android", target_os = "ios")))] pub fn leave(&self, keyboard_mode: String) { - let session_id = self.lc.read().unwrap().session_id as u128; - keyboard::client::change_grab_status(GrabState::Wait, &keyboard_mode, session_id); + keyboard::client::change_grab_status(GrabState::Wait, &keyboard_mode); } // flutter only TODO new input @@ -1227,9 +1197,7 @@ impl Session { } } - // Compute event type once using MOUSE_TYPE_MASK for reuse - let event_type = mask & MOUSE_TYPE_MASK; - let (x, y) = if event_type == MOUSE_TYPE_WHEEL || event_type == MOUSE_TYPE_TRACKPAD { + let (x, y) = if mask == MOUSE_TYPE_WHEEL || mask == MOUSE_TYPE_TRACKPAD { self.get_scroll_xy((x, y)) } else { (x, y) @@ -1238,6 +1206,8 @@ impl Session { // #[cfg(not(any(target_os = "android", target_os = "ios")))] let (alt, ctrl, shift, command) = keyboard::client::get_modifiers_state(alt, ctrl, shift, command); + + use crate::input::*; let is_left = (mask & (MOUSE_BUTTON_LEFT << 3)) > 0; let is_right = (mask & (MOUSE_BUTTON_RIGHT << 3)) > 0; if is_left ^ is_right { @@ -1257,8 +1227,9 @@ impl Session { // to-do: how about ctrl + left from win to macos if cfg!(target_os = "macos") { let buttons = mask >> 3; + let evt_type = mask & 0x7; if buttons == MOUSE_BUTTON_LEFT - && event_type == MOUSE_TYPE_DOWN + && evt_type == MOUSE_TYPE_DOWN && ctrl && self.peer_platform() != "Mac OS" { @@ -1291,13 +1262,11 @@ impl Session { drop(connection_round_state_lock); let cloned = self.clone(); - // override only if true if true == force_relay { self.lc.write().unwrap().force_relay = true; } self.lc.write().unwrap().peer_info = None; - self.reconnect_count.fetch_add(1, Ordering::SeqCst); let mut lock = self.thread.lock().unwrap(); // No need to join the previous thread, because it will exit automatically. // And the previous thread will not change important states. @@ -1398,24 +1367,6 @@ impl Session { self.send(Data::Close); } - fn try_auto_start_job_str(is_reconnected: bool, job_str: &str) -> Option { - if is_reconnected { - let job_str = job_str.trim(); - if let Some(stripped) = job_str.strip_suffix('}') { - format!(r#"{},"auto_start": true}}"#, stripped).into() - } else { - // unreachable in normal cases - log::warn!( - "The last character is not '}}': {}, auto start is ignored on flutter", - job_str - ); - Some(job_str.to_owned()) - } - } else { - None - } - } - pub fn load_last_jobs(&self) { self.clear_all_jobs(); let pc = self.load_config(); @@ -1423,32 +1374,18 @@ impl Session { // no last jobs return; } - let reconnect_count_thr = if cfg!(feature = "flutter") { 0 } else { 1 }; - let is_reconnected = self.reconnect_count.load(Ordering::SeqCst) > reconnect_count_thr; // TODO: can add a confirm dialog let mut cnt = 1; for job_str in pc.transfer.read_jobs.iter() { if !job_str.is_empty() { - self.load_last_job( - cnt, - Self::try_auto_start_job_str(is_reconnected, job_str) - .as_deref() - .unwrap_or(job_str), - is_reconnected, - ); + self.load_last_job(cnt, job_str); cnt += 1; log::info!("restore read_job: {:?}", job_str); } } for job_str in pc.transfer.write_jobs.iter() { if !job_str.is_empty() { - self.load_last_job( - cnt, - Self::try_auto_start_job_str(is_reconnected, job_str) - .as_deref() - .unwrap_or(job_str), - is_reconnected, - ); + self.load_last_job(cnt, job_str); cnt += 1; log::info!("restore write_job: {:?}", job_str); } @@ -1464,11 +1401,10 @@ impl Session { self.send(Data::ElevateWithLogon(username, password)); } - #[cfg(any(target_os = "android", target_os = "ios", not(feature = "flutter")))] + #[cfg(any(target_os = "ios"))] pub fn switch_sides(&self) {} - #[cfg(feature = "flutter")] - #[cfg(not(any(target_os = "android", target_os = "ios")))] + #[cfg(not(any(target_os = "ios")))] #[tokio::main(flavor = "current_thread")] pub async fn switch_sides(&self) { match crate::ipc::connect(1000, "").await { @@ -1665,7 +1601,7 @@ pub trait InvokeUiSession: Send + Sync + Clone + 'static + Sized + Default { fn set_cursor_data(&self, cd: CursorData); fn set_cursor_id(&self, id: String); fn set_cursor_position(&self, cp: CursorPosition); - fn set_display(&self, x: i32, y: i32, w: i32, h: i32, cursor_embedded: bool, scale: f64); + fn set_display(&self, x: i32, y: i32, w: i32, h: i32, cursor_embedded: bool); fn switch_display(&self, display: &SwitchDisplay); fn set_peer_info(&self, peer_info: &PeerInfo); // flutter fn set_displays(&self, displays: &Vec); @@ -1675,14 +1611,14 @@ pub trait InvokeUiSession: Send + Sync + Clone + 'static + Sized + Default { fn set_permission(&self, name: &str, value: bool); fn close_success(&self); fn update_quality_status(&self, qs: QualityStatus); - fn set_connection_type(&self, is_secured: bool, direct: bool, stream_type: &str); + fn set_connection_type(&self, is_secured: bool, direct: bool); fn set_fingerprint(&self, fingerprint: String); fn job_error(&self, id: i32, err: String, file_num: i32); fn job_done(&self, id: i32, file_num: i32); fn clear_all_jobs(&self); fn new_message(&self, msg: String); fn update_transfer_list(&self); - fn load_last_job(&self, cnt: i32, job_json: &str, auto_start: bool); + fn load_last_job(&self, cnt: i32, job_json: &str); fn update_folder_files( &self, id: i32, @@ -1811,13 +1747,9 @@ impl Interface for Session { current.width, current.height, current.cursor_embedded, - current.scale, ); } self.update_privacy_mode(); - // Clear audit_guid when connection is established successfully - *self.audit_guid.lock().unwrap() = String::new(); - *self.last_audit_note.lock().unwrap() = String::new(); // Save recent peers, then push event to flutter. So flutter can refresh peer page. self.lc.write().unwrap().handle_peer_info(&pi); self.set_peer_info(&pi); @@ -2019,7 +1951,7 @@ pub async fn io_loop(handler: Session, round: u32) { } let mut remote = Remote::new(handler, receiver, sender); remote.io_loop(&key, &token, round).await; - let _ = remote.sync_jobs_status_to_local().await; + remote.sync_jobs_status_to_local().await; } #[cfg(not(any(target_os = "android", target_os = "ios")))] diff --git a/src/updater.rs b/src/updater.rs index 357f111a7..3570130a8 100644 --- a/src/updater.rs +++ b/src/updater.rs @@ -1,7 +1,7 @@ -use crate::{common::do_check_software_update, hbbs_http::create_http_client_with_url}; +use crate::{common::do_check_software_update, hbbs_http::create_http_client}; use hbb_common::{bail, config, log, ResultType}; use std::{ - io::Write, + io::{self, Write}, path::PathBuf, sync::{ atomic::{AtomicUsize, Ordering}, @@ -28,7 +28,6 @@ pub fn update_controlling_session_count(count: usize) { CONTROLLING_SESSION_COUNT.store(count, Ordering::SeqCst); } -#[allow(dead_code)] pub fn start_auto_update() { let _sender = TX_MSG.lock().unwrap(); } @@ -119,11 +118,11 @@ fn start_auto_update_check_(rx_msg: Receiver) { fn check_update(manually: bool) -> ResultType<()> { #[cfg(target_os = "windows")] - let update_msi = crate::platform::is_msi_installed()? && !crate::is_custom_client(); + let is_msi = crate::platform::is_msi_installed()?; if !(manually || config::Config::get_bool_option(config::keys::OPTION_ALLOW_AUTO_UPDATE)) { return Ok(()); } - if do_check_software_update().is_err() { + if !do_check_software_update().is_ok() { // ignore return Ok(()); } @@ -140,13 +139,13 @@ fn check_update(manually: bool) -> ResultType<()> { "{}/rustdesk-{}-x86_64.{}", download_url, version, - if update_msi { "msi" } else { "exe" } + if is_msi { "msi" } else { "exe" } ) } else { format!("{}/rustdesk-{}-x86-sciter.exe", download_url, version) }; log::debug!("New version available: {}", &version); - let client = create_http_client_with_url(&download_url); + let client = create_http_client(); let Some(file_path) = get_download_file_from_url(&download_url) else { bail!("Failed to get the file path from the URL: {}", download_url); }; @@ -185,26 +184,23 @@ fn check_update(manually: bool) -> ResultType<()> { let mut file = std::fs::File::create(&file_path)?; file.write_all(&file_data)?; } - // We have checked if the `conns` is empty before, but we need to check again. + // We have checked if the `conns`` is empty before, but we need to check again. // No need to care about the downloaded file here, because it's rare case that the `conns` are empty // before the download, but not empty after the download. if has_no_active_conns() { #[cfg(target_os = "windows")] - update_new_version(update_msi, &version, &file_path); + update_new_version(is_msi, &version, &file_path); } } Ok(()) } #[cfg(target_os = "windows")] -fn update_new_version(update_msi: bool, version: &str, file_path: &PathBuf) { - log::debug!( - "New version is downloaded, update begin, update msi: {update_msi}, version: {version}, file: {:?}", - file_path.to_str() - ); +fn update_new_version(is_msi: bool, version: &str, file_path: &PathBuf) { + log::debug!("New version is downloaded, update begin, is msi: {is_msi}, version: {version}, file: {:?}", file_path.to_str()); if let Some(p) = file_path.to_str() { if let Some(session_id) = crate::platform::get_current_process_session_id() { - if update_msi { + if is_msi { match crate::platform::update_me_msi(p, true) { Ok(_) => { log::debug!("New version \"{}\" updated.", version); @@ -215,65 +211,28 @@ fn update_new_version(update_msi: bool, version: &str, file_path: &PathBuf) { version, e ); - std::fs::remove_file(&file_path).ok(); } } } else { - let custom_client_staging_dir = if crate::is_custom_client() { - let custom_client_staging_dir = - crate::platform::get_custom_client_staging_dir(); - if let Err(e) = crate::platform::handle_custom_client_staging_dir_before_update( - &custom_client_staging_dir, - ) { - log::error!( - "Failed to handle custom client staging dir before update: {}", - e - ); - std::fs::remove_file(&file_path).ok(); - return; - } - Some(custom_client_staging_dir) - } else { - // Clean up any residual staging directory from previous custom client - let staging_dir = crate::platform::get_custom_client_staging_dir(); - hbb_common::allow_err!(crate::platform::remove_custom_client_staging_dir( - &staging_dir - )); - None - }; - let update_launched = match crate::platform::launch_privileged_process( + match crate::platform::launch_privileged_process( session_id, &format!("{} --update", p), ) { Ok(h) => { if h.is_null() { log::error!("Failed to update to the new version: {}", version); - false - } else { - log::debug!("New version \"{}\" is launched.", version); - true } } Err(e) => { log::error!("Failed to run the new version: {}", e); - false } - }; - if !update_launched { - if let Some(dir) = custom_client_staging_dir { - hbb_common::allow_err!(crate::platform::remove_custom_client_staging_dir( - &dir - )); - } - std::fs::remove_file(&file_path).ok(); } } } else { log::error!( "Failed to get the current process session id, Error {}", - std::io::Error::last_os_error() + io::Error::last_os_error() ); - std::fs::remove_file(&file_path).ok(); } } else { // unreachable!() diff --git a/src/virtual_display_manager.rs b/src/virtual_display_manager.rs index f0645e4bf..b2791767e 100644 --- a/src/virtual_display_manager.rs +++ b/src/virtual_display_manager.rs @@ -446,8 +446,6 @@ pub mod amyuni_idd { if crate::platform::windows::is_x64() { log::info!("Uninstalling driver by deviceinstaller64.exe"); install_if_x86_on_x64(&work_dir, "remove usbmmidd")?; - // Sleep some time to wait for the driver to be uninstalled. - std::thread::sleep(Duration::from_secs(2)); return Ok(()); } } @@ -669,8 +667,8 @@ pub mod amyuni_idd { // we still forcibly plug out all virtual displays. // // 1. RustDesk plug in 2 virtual displays. (RustDesk) - // 2. Other process plug out all virtual displays. (User manually) - // 3. Other process plug in 1 virtual display. (User manually) + // 2. Other process plug out all virtual displays. (User mannually) + // 3. Other process plug in 1 virtual display. (User mannually) // 4. RustDesk plug out all virtual displays in this call. (RustDesk disconnect) // // This is not a normal scenario, RustDesk will plug out virtual display unexpectedly. diff --git a/src/whiteboard/client.rs b/src/whiteboard/client.rs deleted file mode 100644 index 0d816ba27..000000000 --- a/src/whiteboard/client.rs +++ /dev/null @@ -1,258 +0,0 @@ -use super::{Cursor, CustomEvent}; -use crate::{ - ipc::{self, Data}, - CHILD_PROCESS, -}; -use hbb_common::{ - allow_err, - anyhow::anyhow, - bail, log, sleep, - tokio::{ - self, - sync::mpsc::{unbounded_channel, UnboundedSender}, - time::interval_at, - }, - ResultType, -}; -use lazy_static::lazy_static; -use std::{collections::HashMap, sync::RwLock, time::Instant}; - -lazy_static! { - static ref TX_WHITEBOARD: RwLock>> = - RwLock::new(None); - static ref CONNS: RwLock> = Default::default(); -} - -struct Conn { - last_cursor_pos: (f32, f32), // For click ripple - last_cursor_evt: LastCursorEvent, -} - -struct LastCursorEvent { - evt: Option, - tm: Instant, - c: usize, -} - -#[inline] -pub fn get_key_cursor(conn_id: i32) -> String { - format!("{}-cursor", conn_id) -} - -pub fn register_whiteboard(k: String) { - std::thread::spawn(|| { - allow_err!(start_whiteboard_()); - }); - let mut conns = CONNS.write().unwrap(); - if !conns.contains_key(&k) { - conns.insert( - k, - Conn { - last_cursor_pos: (0.0, 0.0), - last_cursor_evt: LastCursorEvent { - evt: None, - tm: Instant::now(), - c: 0, - }, - }, - ); - } -} - -pub fn unregister_whiteboard(k: String) { - let mut conns = CONNS.write().unwrap(); - conns.remove(&k); - let is_conns_empty = conns.is_empty(); - drop(conns); - - TX_WHITEBOARD.read().unwrap().as_ref().map(|tx| { - allow_err!(tx.send((k, CustomEvent::Clear))); - }); - if is_conns_empty { - std::thread::spawn(|| { - let mut whiteboard = TX_WHITEBOARD.write().unwrap(); - whiteboard.as_ref().map(|tx| { - allow_err!(tx.send(("".to_string(), CustomEvent::Exit))); - // Simple sleep to wait the whiteboard process exiting. - std::thread::sleep(std::time::Duration::from_millis(3_00)); - }); - whiteboard.take(); - }); - } -} - -pub fn update_whiteboard(k: String, e: CustomEvent) { - let mut conns = CONNS.write().unwrap(); - let Some(conn) = conns.get_mut(&k) else { - return; - }; - match &e { - CustomEvent::Cursor(cursor) => { - conn.last_cursor_evt.c += 1; - conn.last_cursor_evt.tm = Instant::now(); - if cursor.btns == 0 { - // Send one movement event every 4. - if conn.last_cursor_evt.c > 3 { - conn.last_cursor_evt.c = 0; - conn.last_cursor_evt.evt = None; - tx_send_event(conn, k, e); - } else { - conn.last_cursor_evt.evt = Some(e); - } - } else { - if let Some(evt) = conn.last_cursor_evt.evt.take() { - tx_send_event(conn, k.clone(), evt); - conn.last_cursor_evt.c = 0; - } - let click_evt = CustomEvent::Cursor(Cursor { - x: conn.last_cursor_pos.0, - y: conn.last_cursor_pos.1, - argb: cursor.argb, - btns: cursor.btns, - text: cursor.text.clone(), - }); - tx_send_event(conn, k, click_evt); - } - } - _ => { - tx_send_event(conn, k, e); - } - } -} - -#[inline] -fn tx_send_event(conn: &mut Conn, k: String, event: CustomEvent) { - if let CustomEvent::Cursor(cursor) = &event { - if cursor.btns == 0 { - conn.last_cursor_pos = (cursor.x, cursor.y); - } - } - - TX_WHITEBOARD.read().unwrap().as_ref().map(|tx| { - allow_err!(tx.send((k, event))); - }); -} - -#[tokio::main(flavor = "current_thread")] -async fn start_whiteboard_() -> ResultType<()> { - let mut tx_whiteboard = TX_WHITEBOARD.write().unwrap(); - if tx_whiteboard.is_some() { - log::warn!("Whiteboard already started"); - return Ok(()); - } - - loop { - if !crate::platform::is_prelogin() { - break; - } - sleep(1.).await; - } - let mut stream = None; - if let Ok(s) = ipc::connect(1000, "_whiteboard").await { - stream = Some(s); - } else { - #[allow(unused_mut)] - #[allow(unused_assignments)] - let mut args = vec!["--whiteboard"]; - #[allow(unused_mut)] - #[cfg(target_os = "linux")] - let mut user = None; - - let run_done; - if crate::platform::is_root() { - let mut res = Ok(None); - for _ in 0..10 { - #[cfg(not(any(target_os = "linux")))] - { - log::debug!("Start whiteboard"); - res = crate::platform::run_as_user(args.clone()); - } - #[cfg(target_os = "linux")] - { - log::debug!("Start whiteboard"); - res = crate::platform::run_as_user( - args.clone(), - user.clone(), - None::<(&str, &str)>, - ); - } - if res.is_ok() { - break; - } - log::error!("Failed to run whiteboard: {res:?}"); - sleep(1.).await; - } - if let Some(task) = res? { - CHILD_PROCESS.lock().unwrap().push(task); - } - run_done = true; - } else { - run_done = false; - } - if !run_done { - log::debug!("Start whiteboard"); - CHILD_PROCESS.lock().unwrap().push(crate::run_me(args)?); - } - for _ in 0..20 { - sleep(0.3).await; - if let Ok(s) = ipc::connect(1000, "_whiteboard").await { - stream = Some(s); - break; - } - } - if stream.is_none() { - bail!("Failed to connect to connection manager"); - } - } - - let mut stream = stream.ok_or(anyhow!("none stream"))?; - let (tx, mut rx) = unbounded_channel(); - tx_whiteboard.replace(tx); - drop(tx_whiteboard); - let _call_on_ret = crate::common::SimpleCallOnReturn { - b: true, - f: Box::new(move || { - let _ = TX_WHITEBOARD.write().unwrap().take(); - }), - }; - - let dur = tokio::time::Duration::from_millis(300); - let mut timer = interval_at(tokio::time::Instant::now() + dur, dur); - timer.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip); - loop { - tokio::select! { - res = rx.recv() => { - match res { - Some(data) => { - if matches!(data.1, CustomEvent::Exit) { - break; - } else { - allow_err!(stream.send(&Data::Whiteboard(data)).await); - timer.reset(); - } - } - None => { - bail!("expected"); - } - } - }, - _ = timer.tick() => { - let mut conns = CONNS.write().unwrap(); - for (k, conn) in conns.iter_mut() { - if conn.last_cursor_evt.tm.elapsed().as_millis() > 300 { - if let Some(evt) = conn.last_cursor_evt.evt.take() { - allow_err!(stream.send(&Data::Whiteboard((k.clone(), evt))).await); - conn.last_cursor_evt.c = 0; - } - } - } - } - } - } - allow_err!( - stream - .send(&Data::Whiteboard(("".to_string(), CustomEvent::Exit))) - .await - ); - Ok(()) -} diff --git a/src/whiteboard/linux.rs b/src/whiteboard/linux.rs deleted file mode 100644 index 686a0d0b1..000000000 --- a/src/whiteboard/linux.rs +++ /dev/null @@ -1,463 +0,0 @@ -use super::{ - server::{Ripple, EVENT_PROXY}, - win_linux::{create_font_face, draw_text}, - Cursor, CustomEvent, -}; -use hbb_common::{bail, log, tokio::sync::mpsc::unbounded_channel, ResultType}; -use softbuffer::{Context, Surface}; -use std::{ - collections::HashMap, - ffi::{c_int, c_short, c_ulong, c_ushort}, - num::NonZeroU32, - sync::Arc, - time::Instant, -}; -use tiny_skia::{Color, FillRule, Paint, PathBuilder, PixmapMut, Stroke, Transform}; -use ttf_parser::Face; -use winit::raw_window_handle::{ - DisplayHandle, HasDisplayHandle, HasWindowHandle, RawDisplayHandle, RawWindowHandle, -}; -use winit::{ - application::ApplicationHandler, - dpi::{PhysicalPosition, PhysicalSize}, - event::WindowEvent, - event_loop::{ActiveEventLoop, EventLoop}, - platform::x11::{WindowAttributesExtX11, WindowType}, - window::{Window, WindowId, WindowLevel}, -}; - -enum _XDisplay {} -type Display = _XDisplay; - -type XID = c_ulong; -type XserverRegion = XID; - -#[derive(Debug, Clone, Copy, PartialEq)] -#[repr(C)] -pub struct XRectangle { - pub x: c_short, - pub y: c_short, - pub width: c_ushort, - pub height: c_ushort, -} - -#[link(name = "Xfixes")] -extern "C" { - fn XFixesCreateRegion( - dpy: *mut Display, - rectangles: *mut XRectangle, - nrectangles: c_int, - ) -> XserverRegion; - fn XFixesDestroyRegion(dpy: *mut Display, region: XserverRegion) -> (); - fn XFixesSetWindowShapeRegion( - dpy: *mut Display, - win: XID, - shape_kind: c_int, - x_off: c_int, - y_off: c_int, - region: XserverRegion, - ) -> (); -} - -const SHAPE_INPUT: std::ffi::c_int = 2; - -fn get_display_from_xwayland() -> Option { - if let Ok(output) = crate::platform::run_cmds("pgrep -a Xwayland") { - // 1410 /usr/bin/Xwayland :1 -auth /run/user/1000/xauth_RoDZey -listenfd 8 -listenfd 9 -displayfd 76 -wm 78 -rootless -enable-ei-portal - if output.contains("Xwayland") { - if let Some(display) = output.split_whitespace().nth(2) { - if display.starts_with(':') { - return Some(display.to_string()); - } - } - } - } - None -} - -fn preset_env() -> bool { - if crate::platform::is_x11() { - return true; - } - if let Some(display) = get_display_from_xwayland() { - // https://github.com/rust-windowing/winit/blob/f6893a4390dfe6118ce4b33458d458fd3efd3025/src/event_loop.rs#L99 - // It is acceptable to modify global environment variables here because this process is an isolated, - // dedicated "whiteboard" process. - std::env::set_var("DISPLAY", display); - std::env::remove_var("WAYLAND_DISPLAY"); - return true; - } - false -} - -pub fn is_supported() -> bool { - crate::platform::is_x11() || get_display_from_xwayland().is_some() -} - -pub fn run() { - if !preset_env() { - return; - } - - let event_loop = match EventLoop::<(String, CustomEvent)>::with_user_event().build() { - Ok(el) => el, - Err(e) => { - log::error!("Failed to create event loop: {}", e); - return; - } - }; - - let event_loop_proxy = event_loop.create_proxy(); - EVENT_PROXY.write().unwrap().replace(event_loop_proxy); - - let (tx_exit, rx_exit) = unbounded_channel(); - std::thread::spawn(move || { - super::server::start_ipc(rx_exit); - }); - - let mut app = match WhiteboardApplication::new(&event_loop) { - Ok(app) => app, - Err(e) => { - log::error!("Failed to create whiteboard application: {}", e); - tx_exit.send(()).ok(); - return; - } - }; - - if let Err(e) = event_loop.run_app(&mut app) { - log::error!("Failed to run app: {}", e); - tx_exit.send(()).ok(); - return; - } -} - -struct WindowState { - window: Arc, - // NOTE: This surface must be dropped before the `Window`. - surface: Surface, Arc>, - ripples: Vec, - last_cursors: HashMap, -} - -struct WhiteboardApplication { - windows: Vec, - // Drawing context. - // - // With OpenGL it could be EGLDisplay. - context: Option>>, - face: Option>, - close_requested: bool, -} - -impl WhiteboardApplication { - fn new(event_loop: &EventLoop) -> ResultType { - // https://github.com/rust-windowing/winit/blob/f6893a4390dfe6118ce4b33458d458fd3efd3025/examples/window.rs#L91 - // SAFETY: we drop the context right before the event loop is stopped, thus making it safe. - let context = match Context::new(unsafe { - std::mem::transmute::, DisplayHandle<'static>>( - event_loop.display_handle()?, - ) - }) { - Ok(ctx) => Some(ctx), - Err(e) => { - bail!("Failed to create context: {}", e); - } - }; - let face = match create_font_face() { - Ok(face) => Some(face), - Err(err) => { - log::error!("Failed to create font face: {}", err); - None - } - }; - Ok(Self { - windows: Vec::new(), - context, - face, - close_requested: false, - }) - } -} - -impl ApplicationHandler<(String, CustomEvent)> for WhiteboardApplication { - fn user_event(&mut self, _event_loop: &ActiveEventLoop, (k, evt): (String, CustomEvent)) { - match evt { - CustomEvent::Cursor(cursor) => { - if let Some(state) = self.windows.first_mut() { - if cursor.btns != 0 { - state.ripples.push(Ripple { - x: cursor.x, - y: cursor.y, - start_time: Instant::now(), - }); - } - state.last_cursors.insert(k, cursor); - state.window.request_redraw(); - } - } - CustomEvent::Exit => { - self.close_requested = true; - } - _ => {} - } - } - - fn resumed(&mut self, event_loop: &ActiveEventLoop) { - let (x, y, w, h) = match super::server::get_displays_rect() { - Ok(r) => r, - Err(err) => { - log::error!("Failed to get displays rect: {}", err); - self.close_requested = true; - return; - } - }; - - let window_attributes = Window::default_attributes() - .with_title("RustDesk whiteboard") - .with_inner_size(PhysicalSize::new(w, h)) - .with_position(PhysicalPosition::new(x, y)) - .with_decorations(false) - .with_transparent(true) - .with_window_level(WindowLevel::AlwaysOnTop) - .with_x11_window_type(vec![WindowType::Dock]) - .with_override_redirect(true); - - let window = match event_loop.create_window(window_attributes) { - Ok(window) => Arc::new(window), - Err(e) => { - log::error!("Failed to create window: {}", e); - self.close_requested = true; - return; - } - }; - - let display = match window.display_handle() { - Ok(d) => d, - Err(e) => { - log::error!("Failed to get display handle: {}", e); - self.close_requested = true; - return; - } - }; - let rwh = match window.window_handle() { - Ok(w) => w, - Err(e) => { - log::error!("Failed to get window handle: {}", e); - self.close_requested = true; - return; - } - }; - - // Both the following block and `window.set_cursor_hittest(false)` in `draw()` are necessary to ensure cursor events are properly passed through the window. - // These issues may be related to winit X11 handling. - // https://github.com/rust-windowing/winit/issues/3509 - // https://github.com/rust-windowing/winit/issues/4120 - // If either block is removed, cursor events may not be passed through as expected. - // If you update winit, please revisit this workaround. - match (rwh.as_raw(), display.as_raw()) { - (RawWindowHandle::Xlib(xlib_window), RawDisplayHandle::Xlib(xlib_display)) => { - unsafe { - let xwindow = xlib_window.window; - if let Some(display_ptr) = xlib_display.display { - let xdisplay = display_ptr.as_ptr() as *mut Display; - // Mouse event passthrough - let empty_region = XFixesCreateRegion(xdisplay, std::ptr::null_mut(), 0); - if empty_region == 0 { - log::error!("XFixesCreateRegion failed: returned null region"); - } else { - XFixesSetWindowShapeRegion( - xdisplay, - xwindow, - SHAPE_INPUT, - 0, - 0, - empty_region, - ); - XFixesDestroyRegion(xdisplay, empty_region); - } - } - } - } - _ => { - log::error!("Unsupported windowing system for shape extension"); - self.close_requested = true; - return; - } - } - - let Some(ctx) = self.context.as_ref() else { - // unreachable - self.close_requested = true; - return; - }; - - let surface = match Surface::new(ctx, window.clone()) { - Ok(s) => s, - Err(e) => { - log::error!("Failed to create surface: {}", e); - self.close_requested = true; - return; - } - }; - - let state = WindowState { - window, - surface, - ripples: Vec::new(), - last_cursors: HashMap::new(), - }; - - self.windows.push(state); - } - - fn window_event( - &mut self, - _event_loop: &ActiveEventLoop, - window_id: WindowId, - event: WindowEvent, - ) { - match event { - WindowEvent::CloseRequested => { - self.close_requested = true; - } - WindowEvent::RedrawRequested => { - let Some(state) = self.windows.iter_mut().find(|w| w.window.id() == window_id) - else { - log::error!("No window found for id: {:?}", window_id); - return; - }; - if let Err(err) = state.draw(&self.face) { - log::error!("Failed to draw window: {}", err); - } - } - _ => (), - } - } - - fn about_to_wait(&mut self, event_loop: &ActiveEventLoop) { - if !self.close_requested { - for state in self.windows.iter() { - state.window.request_redraw(); - } - } else { - event_loop.exit(); - } - } - - fn exiting(&mut self, _event_loop: &ActiveEventLoop) { - // We must drop the context here. - self.context = None; - } -} - -impl WindowState { - fn draw(&mut self, face: &Option>) -> ResultType<()> { - let (width, height) = { - let size = self.window.inner_size(); - (size.width, size.height) - }; - - let (Some(width), Some(height)) = (NonZeroU32::new(width), NonZeroU32::new(height)) else { - bail!("Invalid window size, {width}x{height}") - }; - if let Err(e) = self.surface.resize(width, height) { - bail!("Failed to resize surface: {}", e); - } - - let mut buffer = match self.surface.buffer_mut() { - Ok(buf) => buf, - Err(e) => { - bail!("Failed to get buffer: {}", e); - } - }; - - let Some(mut pixmap) = PixmapMut::from_bytes( - bytemuck::cast_slice_mut(&mut buffer), - width.get(), - height.get(), - ) else { - bail!("Failed to create pixmap from buffer"); - }; - pixmap.fill(Color::TRANSPARENT); - - Ripple::retain_active(&mut self.ripples); - for ripple in &self.ripples { - let (radius, alpha) = ripple.get_radius_alpha(); - - let mut ripple_paint = Paint::default(); - // Note: The real color is bgra here. - ripple_paint.set_color_rgba8(64, 64, 255, (alpha * 128.0) as u8); - ripple_paint.anti_alias = true; - - let mut ripple_pb = PathBuilder::new(); - ripple_pb.push_circle(ripple.x, ripple.y, radius); - if let Some(path) = ripple_pb.finish() { - pixmap.fill_path( - &path, - &ripple_paint, - FillRule::Winding, - Transform::identity(), - None, - ); - } - } - - for cursor in self.last_cursors.values() { - let (x, y) = (cursor.x, cursor.y); - let size = 1.5f32; - - let mut pb = PathBuilder::new(); - pb.move_to(x, y); - pb.line_to(x, y + 16.0 * size); - pb.line_to(x + 4.0 * size, y + 13.0 * size); - pb.line_to(x + 7.0 * size, y + 20.0 * size); - pb.line_to(x + 9.0 * size, y + 19.0 * size); - pb.line_to(x + 6.0 * size, y + 12.0 * size); - pb.line_to(x + 11.0 * size, y + 12.0 * size); - pb.close(); - - if let Some(path) = pb.finish() { - let mut arrow_paint = Paint::default(); - let rgba = super::argb_to_rgba(cursor.argb); - arrow_paint.set_color_rgba8(rgba.2, rgba.1, rgba.0, rgba.3); - arrow_paint.anti_alias = true; - pixmap.fill_path( - &path, - &arrow_paint, - FillRule::Winding, - Transform::identity(), - None, - ); - - let mut black_paint = Paint::default(); - black_paint.set_color_rgba8(0, 0, 0, 255); - black_paint.anti_alias = true; - let mut stroke = Stroke::default(); - stroke.width = 1.0f32; - pixmap.stroke_path(&path, &black_paint, &stroke, Transform::identity(), None); - - face.as_ref().map(|face| { - draw_text( - &mut pixmap, - face, - &cursor.text, - x + 24.0 * size, - y + 24.0 * size, - &arrow_paint, - 14.0f32, - ); - }); - } - } - - self.window.pre_present_notify(); - - if let Err(e) = buffer.present() { - log::error!("Failed to present buffer: {}", e); - } - - self.window.set_cursor_hittest(false).ok(); - - Ok(()) - } -} diff --git a/src/whiteboard/macos.rs b/src/whiteboard/macos.rs deleted file mode 100644 index d1c28b57c..000000000 --- a/src/whiteboard/macos.rs +++ /dev/null @@ -1,323 +0,0 @@ -use super::{server::EVENT_PROXY, Cursor, CustomEvent, Ripple}; -use core_graphics::context::CGContextRef; -use foreign_types::ForeignTypeRef; -use hbb_common::{bail, log, ResultType}; -use objc::{class, msg_send, runtime::Object, sel, sel_impl}; -use piet::{ - kurbo::{BezPath, Point}, - FontFamily, RenderContext, Text, TextLayout, TextLayoutBuilder, -}; -use piet_coregraphics::{CoreGraphicsContext, CoreGraphicsTextLayout}; -use std::{collections::HashMap, sync::Arc, time::Instant}; -use tao::{ - dpi::{LogicalSize, PhysicalPosition}, - event::{Event, StartCause, WindowEvent}, - event_loop::{ControlFlow, EventLoop, EventLoopBuilder}, - platform::macos::MonitorHandleExtMacOS, - rwh_06::{HasWindowHandle, RawWindowHandle}, - window::{Window, WindowBuilder, WindowId}, -}; - -const MAXIMUM_WINDOW_LEVEL: i64 = 2147483647; -const CURSOR_TEXT_FONT_SIZE: f64 = 14.0; -const CURSOR_TEXT_OFFSET: f64 = 20.0; - -struct WindowState { - window: Arc, - logical_size: LogicalSize, - outer_position: PhysicalPosition, - // A simple workaround to the (logical) cursor position. - display_origin: (f64, f64), -} - -struct CursorInfo { - window_id: WindowId, - text_key: (String, u32), - cursor: Cursor, -} - -fn set_window_properties(window: &Arc) -> ResultType<()> { - let handle = window.window_handle()?; - if let RawWindowHandle::AppKit(appkit_handle) = handle.as_raw() { - unsafe { - let ns_view = appkit_handle.ns_view.as_ptr() as *mut Object; - if ns_view.is_null() { - bail!("Ns view of the window handle is null."); - } - let ns_window: *mut Object = msg_send![ns_view, window]; - if ns_window.is_null() { - bail!("Ns window of the ns view is null."); - } - let _: () = msg_send![ns_window, setOpaque: false]; - let _: () = msg_send![ns_window, setLevel: MAXIMUM_WINDOW_LEVEL]; - // NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorIgnoresCycle - let _: () = msg_send![ns_window, setCollectionBehavior: 5]; - let current_style_mask: u64 = msg_send![ns_window, styleMask]; - // NSWindowStyleMaskNonactivatingPanel - let new_style_mask = current_style_mask | (1 << 7); - let _: () = msg_send![ns_window, setStyleMask: new_style_mask]; - let _: () = msg_send![ns_window, setIgnoresMouseEvents: true]; - } - } - Ok(()) -} - -fn create_windows(event_loop: &EventLoop<(String, CustomEvent)>) -> ResultType> { - let mut windows = Vec::new(); - let map_display_origins: HashMap<_, _> = crate::server::display_service::try_get_displays()? - .into_iter() - .map(|display| (display.name(), display.origin())) - .collect(); - // We can't use `crate::server::display_service::try_get_displays()` here. - // Because the `display` returned by `crate::server::display_service::try_get_displays()`: - // 1. `display.origin()` is the logic position. - // 2. `display.width()` and `display.height()` are the physical size. - for monitor in event_loop.available_monitors() { - let Some(origin) = map_display_origins.get(&monitor.native_id().to_string()) else { - // unreachable! - bail!( - "Failed to find display origin for monitor: {}", - monitor.native_id() - ); - }; - - let window_builder = WindowBuilder::new() - .with_title("RustDesk whiteboard") - .with_transparent(true) - .with_decorations(false) - .with_position(monitor.position()) - .with_inner_size(monitor.size()); - - let window = Arc::new(window_builder.build::<(String, CustomEvent)>(event_loop)?); - set_window_properties(&window)?; - - let mut scale_factor = window.scale_factor(); - if scale_factor == 0.0 { - scale_factor = 1.0; - } - let physical_size = window.inner_size(); - let logical_size = physical_size.to_logical::(scale_factor); - let inner_position = window.inner_position()?; - let outer_position = inner_position; - windows.push(WindowState { - window, - logical_size, - outer_position, - display_origin: (origin.0 as f64, origin.1 as f64), - }); - } - Ok(windows) -} - -fn draw_cursors( - windows: &Vec, - window_id: WindowId, - window_ripples: &mut HashMap>, - last_cursors: &HashMap, - map_cursor_text: &mut HashMap<(String, u32), CoreGraphicsTextLayout>, -) { - for window in windows.iter() { - if window.window.id() != window_id { - continue; - } - - if let Ok(handle) = window.window.window_handle() { - if let RawWindowHandle::AppKit(appkit_handle) = handle.as_raw() { - unsafe { - let ns_view = appkit_handle.ns_view.as_ptr() as *mut Object; - let current_context: *mut Object = - msg_send![class!(NSGraphicsContext), currentContext]; - if !current_context.is_null() { - let cg_context_ptr: *mut std::ffi::c_void = - msg_send![current_context, CGContext]; - if !cg_context_ptr.is_null() { - let cg_context_ref = - CGContextRef::from_ptr_mut(cg_context_ptr as *mut _); - let mut context = CoreGraphicsContext::new_y_up( - cg_context_ref, - window.logical_size.height, - None, - ); - context.clear(None, piet::Color::TRANSPARENT); - - if let Some(ripples) = window_ripples.get_mut(&window_id) { - Ripple::retain_active(ripples); - for ripple in ripples.iter() { - let (radius, alpha) = ripple.get_radius_alpha(); - let color = piet::Color::rgba(1.0, 0.25, 0.25, alpha * 0.5); - let circle = - piet::kurbo::Circle::new((ripple.x, ripple.y), radius); - context.stroke(circle, &color, 2.0); - } - } - - for info in last_cursors.values() { - if info.window_id != window.window.id() { - continue; - } - let cursor = &info.cursor; - - let (x, y) = (cursor.x as f64, cursor.y as f64); - let size = 1.0; - - let mut pb = BezPath::new(); - pb.move_to((x, y)); - pb.line_to((x, y + 16.0 * size)); - pb.line_to((x + 4.0 * size, y + 13.0 * size)); - pb.line_to((x + 7.0 * size, y + 20.0 * size)); - pb.line_to((x + 9.0 * size, y + 19.0 * size)); - pb.line_to((x + 6.0 * size, y + 12.0 * size)); - pb.line_to((x + 11.0 * size, y + 12.0 * size)); - - let rgba = super::argb_to_rgba(cursor.argb); - let color = piet::Color::rgba8(rgba.0, rgba.1, rgba.2, rgba.3); - context.fill(pb, &color); - - let pos = - (x + CURSOR_TEXT_OFFSET * size, y + CURSOR_TEXT_OFFSET * size); - let get_rounded_rect = |layout: &CoreGraphicsTextLayout| { - let text_pos = Point::new(pos.0, pos.1); - let padded_bounds = (layout.image_bounds() - + text_pos.to_vec2()) - .inflate(3.0, 3.0); - padded_bounds.to_rounded_rect(5.0) - }; - - if let Some(layout) = map_cursor_text.get(&info.text_key) { - context.fill(get_rounded_rect(layout), &piet::Color::WHITE); - context.draw_text(layout, pos); - } else { - let text = context.text(); - let color = piet::Color::rgba8(0, 0, 0, 255); - if let Ok(layout) = text - .new_text_layout(cursor.text.clone()) - .font(FontFamily::SYSTEM_UI, CURSOR_TEXT_FONT_SIZE) - .text_color(color) - .build() - { - context - .fill(get_rounded_rect(&layout), &piet::Color::WHITE); - context.draw_text(&layout, pos); - map_cursor_text.insert(info.text_key.clone(), layout); - } - } - } - if let Err(e) = context.finish() { - log::error!("Failed to draw cursor: {}", e); - } - } else { - log::warn!("CGContext is null"); - } - } - let _: () = msg_send![ns_view, setNeedsDisplay:true]; - } - } - } - } -} - -pub(super) fn create_event_loop() -> ResultType<()> { - crate::platform::hide_dock(); - let event_loop = EventLoopBuilder::<(String, CustomEvent)>::with_user_event().build(); - - let windows = create_windows(&event_loop)?; - - let proxy = event_loop.create_proxy(); - EVENT_PROXY.write().unwrap().replace(proxy); - let _call_on_ret = crate::common::SimpleCallOnReturn { - b: true, - f: Box::new(move || { - let _ = EVENT_PROXY.write().unwrap().take(); - }), - }; - - let mut window_ripples: HashMap> = HashMap::new(); - let mut last_cursors: HashMap = HashMap::new(); - let mut map_cursor_text: HashMap<(String, u32), CoreGraphicsTextLayout> = HashMap::new(); - - event_loop.run(move |event, _, control_flow| { - *control_flow = ControlFlow::Poll; - - match event { - Event::NewEvents(StartCause::Init) => { - for window in windows.iter() { - window.window.set_outer_position(window.outer_position); - window.window.request_redraw(); - } - crate::platform::hide_dock(); - } - Event::WindowEvent { event, .. } => match event { - WindowEvent::CloseRequested => { - *control_flow = ControlFlow::Exit; - } - _ => {} - }, - Event::RedrawRequested(window_id) => { - draw_cursors( - &windows, - window_id, - &mut window_ripples, - &last_cursors, - &mut map_cursor_text, - ); - } - Event::MainEventsCleared => { - for window in windows.iter() { - window.window.request_redraw(); - } - } - Event::UserEvent((k, evt)) => match evt { - CustomEvent::Cursor(cursor) => { - for window in windows.iter() { - let (l, t, r, b) = ( - window.display_origin.0, - window.display_origin.1, - window.display_origin.0 + window.logical_size.width, - window.display_origin.1 + window.logical_size.height, - ); - if (cursor.x as f64) < l - || (cursor.x as f64) > r - || (cursor.y as f64) < t - || (cursor.y as f64) > b - { - continue; - } - - if cursor.btns != 0 { - let window_id = window.window.id(); - let ripple = Ripple { - x: (cursor.x as f64 - window.display_origin.0), - y: (cursor.y as f64 - window.display_origin.1), - start_time: Instant::now(), - }; - if let Some(ripples) = window_ripples.get_mut(&window_id) { - ripples.push(ripple); - } else { - window_ripples.insert(window_id, vec![ripple]); - } - } - last_cursors.insert( - k, - CursorInfo { - window_id: window.window.id(), - text_key: (cursor.text.clone(), cursor.argb), - cursor: Cursor { - x: (cursor.x - window.display_origin.0 as f32), - y: (cursor.y - window.display_origin.1 as f32), - ..cursor - }, - }, - ); - window.window.request_redraw(); - break; - } - } - CustomEvent::Exit => { - *control_flow = ControlFlow::Exit; - } - _ => {} - }, - _ => (), - } - }); -} diff --git a/src/whiteboard/mod.rs b/src/whiteboard/mod.rs deleted file mode 100644 index 42befe84f..000000000 --- a/src/whiteboard/mod.rs +++ /dev/null @@ -1,41 +0,0 @@ -use serde_derive::{Deserialize, Serialize}; - -mod client; -mod server; - -#[cfg(target_os = "windows")] -mod windows; -#[cfg(target_os = "linux")] -mod linux; -#[cfg(target_os = "macos")] -mod macos; -#[cfg(any(target_os = "windows", target_os = "linux"))] -mod win_linux; - -#[cfg(target_os = "windows")] -use windows::create_event_loop; -#[cfg(target_os = "macos")] -use macos::create_event_loop; -#[cfg(target_os = "linux")] -pub use linux::is_supported; - -pub use client::*; -pub use server::*; - -#[derive(Debug, Serialize, Deserialize, Clone)] -#[serde(tag = "t", content = "c")] -pub enum CustomEvent { - Cursor(Cursor), - Clear, - Exit, -} - -#[derive(Debug, Serialize, Deserialize, Clone)] -#[serde(tag = "t")] -pub struct Cursor { - pub x: f32, - pub y: f32, - pub argb: u32, - pub btns: i32, - pub text: String, -} diff --git a/src/whiteboard/server.rs b/src/whiteboard/server.rs deleted file mode 100644 index 040110598..000000000 --- a/src/whiteboard/server.rs +++ /dev/null @@ -1,171 +0,0 @@ -use super::CustomEvent; -use crate::ipc::{new_listener, Connection, Data}; -#[cfg(any(target_os = "windows", target_os = "macos"))] -use hbb_common::tokio::sync::mpsc::unbounded_channel; -#[cfg(any(target_os = "windows", target_os = "linux"))] -use hbb_common::ResultType; -use hbb_common::{ - allow_err, log, - tokio::{self, sync::mpsc::UnboundedReceiver}, -}; -use lazy_static::lazy_static; -use std::sync::RwLock; -use std::time::{Duration, Instant}; - -#[cfg(any(target_os = "windows", target_os = "macos"))] -use tao::event_loop::EventLoopProxy; -#[cfg(target_os = "linux")] -use winit::event_loop::EventLoopProxy; - -lazy_static! { - pub(super) static ref EVENT_PROXY: RwLock>> = - RwLock::new(None); -} - -const RIPPLE_DURATION: Duration = Duration::from_millis(500); -#[cfg(target_os = "macos")] -type RippleFloat = f64; -#[cfg(any(target_os = "windows", target_os = "linux"))] -type RippleFloat = f32; - -#[cfg(target_os = "linux")] -pub use super::linux::run; - -#[cfg(any(target_os = "windows", target_os = "macos"))] -pub fn run() { - let (tx_exit, rx_exit) = unbounded_channel(); - std::thread::spawn(move || { - start_ipc(rx_exit); - }); - if let Err(e) = super::create_event_loop() { - log::error!("Failed to create event loop: {}", e); - tx_exit.send(()).ok(); - return; - } -} - -#[tokio::main(flavor = "current_thread")] -pub(super) async fn start_ipc(mut rx_exit: UnboundedReceiver<()>) { - match new_listener("_whiteboard").await { - Ok(mut incoming) => loop { - tokio::select! { - _ = rx_exit.recv() => { - log::info!("Exiting IPC"); - break; - } - res = incoming.next() => match res { - Some(result) => match result { - Ok(stream) => { - log::debug!("Got new connection"); - tokio::spawn(handle_new_stream(Connection::new(stream))); - } - Err(err) => { - log::error!("Couldn't get whiteboard client: {:?}", err); - } - }, - None => { - log::error!("Failed to get whiteboard client"); - } - } - } - }, - Err(err) => { - log::error!("Failed to start whiteboard ipc server: {}", err); - } - } -} - -async fn handle_new_stream(mut conn: Connection) { - loop { - tokio::select! { - res = conn.next() => { - match res { - Err(err) => { - log::info!("whiteboard ipc connection closed: {}", err); - break; - } - Ok(Some(data)) => { - match data { - Data::Whiteboard((k, evt)) => { - if matches!(evt, CustomEvent::Exit) { - log::info!("whiteboard ipc connection closed"); - break; - } else { - EVENT_PROXY.read().unwrap().as_ref().map(|ep| { - allow_err!(ep.send_event((k, evt))); - }); - } - } - _ => {} - } - } - Ok(None) => { - log::info!("whiteboard ipc connection closed"); - break; - } - } - } - } - } - EVENT_PROXY.read().unwrap().as_ref().map(|ep| { - allow_err!(ep.send_event(("".to_string(), CustomEvent::Exit))); - }); -} - -#[cfg(any(target_os = "windows", target_os = "linux"))] -pub(super) fn get_displays_rect() -> ResultType<(i32, i32, u32, u32)> { - let displays = crate::server::display_service::try_get_displays()?; - let mut min_x = i32::MAX; - let mut min_y = i32::MAX; - let mut max_x = i32::MIN; - let mut max_y = i32::MIN; - - for display in displays { - let (x, y) = (display.origin().0 as i32, display.origin().1 as i32); - let (w, h) = (display.width() as i32, display.height() as i32); - min_x = min_x.min(x); - min_y = min_y.min(y); - max_x = max_x.max(x + w); - max_y = max_y.max(y + h); - } - let (x, y) = (min_x, min_y); - let (w, h) = ((max_x - min_x) as u32, (max_y - min_y) as u32); - Ok((x, y, w, h)) -} - -#[inline] -pub(super) fn argb_to_rgba(argb: u32) -> (u8, u8, u8, u8) { - ( - (argb >> 16 & 0xFF) as u8, - (argb >> 8 & 0xFF) as u8, - (argb & 0xFF) as u8, - (argb >> 24 & 0xFF) as u8, - ) -} - -pub(super) struct Ripple { - pub x: RippleFloat, - pub y: RippleFloat, - pub start_time: Instant, -} - -impl Ripple { - #[inline] - pub fn retain_active(ripples: &mut Vec) { - ripples.retain(|r| r.start_time.elapsed() < RIPPLE_DURATION); - } - - pub fn get_radius_alpha(&self) -> (RippleFloat, RippleFloat) { - let elapsed = self.start_time.elapsed(); - #[cfg(target_os = "macos")] - let progress = (elapsed.as_secs_f64() / RIPPLE_DURATION.as_secs_f64()).min(1.0); - #[cfg(any(target_os = "windows", target_os = "linux"))] - let progress = (elapsed.as_secs_f32() / RIPPLE_DURATION.as_secs_f32()).min(1.0); - #[cfg(target_os = "macos")] - let radius = 25.0 * progress; - #[cfg(any(target_os = "windows", target_os = "linux"))] - let radius = 45.0 * progress; - let alpha = 1.0 - progress; - (radius, alpha) - } -} diff --git a/src/whiteboard/win_linux.rs b/src/whiteboard/win_linux.rs deleted file mode 100644 index 9e4722fff..000000000 --- a/src/whiteboard/win_linux.rs +++ /dev/null @@ -1,180 +0,0 @@ -use hbb_common::{bail, ResultType}; -use tiny_skia::{FillRule, Paint, PathBuilder, PixmapMut, Point, Rect, Transform}; -use ttf_parser::Face; -// A helper struct to bridge `ttf-parser` and `tiny-skia`. -struct PathBuilderWrapper<'a> { - path_builder: &'a mut PathBuilder, - transform: Transform, -} - -impl ttf_parser::OutlineBuilder for PathBuilderWrapper<'_> { - fn move_to(&mut self, x: f32, y: f32) { - let mut pt = Point::from_xy(x, y); - self.transform.map_point(&mut pt); - self.path_builder.move_to(pt.x, pt.y); - } - - fn line_to(&mut self, x: f32, y: f32) { - let mut pt = Point::from_xy(x, y); - self.transform.map_point(&mut pt); - self.path_builder.line_to(pt.x, pt.y); - } - - fn quad_to(&mut self, x1: f32, y1: f32, x: f32, y: f32) { - let mut pt1 = Point::from_xy(x1, y1); - self.transform.map_point(&mut pt1); - let mut pt = Point::from_xy(x, y); - self.transform.map_point(&mut pt); - self.path_builder.quad_to(pt1.x, pt1.y, pt.x, pt.y); - } - - fn curve_to(&mut self, x1: f32, y1: f32, x2: f32, y2: f32, x: f32, y: f32) { - let mut pt1 = Point::from_xy(x1, y1); - self.transform.map_point(&mut pt1); - let mut pt2 = Point::from_xy(x2, y2); - self.transform.map_point(&mut pt2); - let mut pt = Point::from_xy(x, y); - self.transform.map_point(&mut pt); - self.path_builder - .cubic_to(pt1.x, pt1.y, pt2.x, pt2.y, pt.x, pt.y); - } - - fn close(&mut self) { - self.path_builder.close(); - } -} - -// Draws a string of text with the white background rectangle onto the pixmap. -pub(super) fn draw_text( - pixmap: &mut PixmapMut, - face: &Face, - text: &str, - x: f32, - y: f32, - paint: &Paint, - font_size: f32, -) { - let units_per_em = face.units_per_em() as f32; - let scale = font_size / units_per_em; - - // --- 1. Calculate text dimensions for the background --- - let mut total_width = 0.0; - for ch in text.chars() { - let glyph_id = face.glyph_index(ch).unwrap_or_default(); - if let Some(h_advance) = face.glyph_hor_advance(glyph_id) { - total_width += h_advance as f32 * scale; - } - } - - // Use font metrics for a consistent background height. - let font_height = (face.ascender() - face.descender()) as f32 * scale; - let ascent = face.ascender() as f32 * scale; - // Add some padding around the text - let padding = 3.0; - - let mut bg_filled = false; - // --- 2. Draw the white background rectangle --- - if let Some(bg_rect) = Rect::from_xywh( - x - padding, - y - ascent - padding, - total_width + 2.0 * padding, - font_height + 2.0 * padding, - ) { - // Corner radius - let radius = 5.0; - let path = { - let mut pb = PathBuilder::new(); - let r_x = bg_rect.x(); - let r_y = bg_rect.y(); - let r_w = bg_rect.width(); - let r_h = bg_rect.height(); - pb.move_to(r_x + radius, r_y); - pb.line_to(r_x + r_w - radius, r_y); - pb.quad_to(r_x + r_w, r_y, r_x + r_w, r_y + radius); - pb.line_to(r_x + r_w, r_y + r_h - radius); - pb.quad_to(r_x + r_w, r_y + r_h, r_x + r_w - radius, r_y + r_h); - pb.line_to(r_x + radius, r_y + r_h); - pb.quad_to(r_x, r_y + r_h, r_x, r_y + r_h - radius); - pb.line_to(r_x, r_y + radius); - pb.quad_to(r_x, r_y, r_x + radius, r_y); - pb.close(); - pb.finish() - }; - - if let Some(path) = path { - let mut bg_paint = Paint::default(); - bg_paint.set_color_rgba8(255, 255, 255, 255); - bg_paint.anti_alias = true; - pixmap.fill_path( - &path, - &bg_paint, - FillRule::Winding, - Transform::identity(), - None, - ); - bg_filled = true; - } - } - - // --- 3. Draw the text --- - let transform = Transform::from_translate(x, y).pre_scale(scale, -scale); - let mut path_builder = PathBuilder::new(); - let mut current_x = 0.0; - - for ch in text.chars() { - let glyph_id = face.glyph_index(ch).unwrap_or_default(); - - let mut builder = PathBuilderWrapper { - path_builder: &mut path_builder, - transform: transform.post_translate(current_x, 0.0), - }; - - face.outline_glyph(glyph_id, &mut builder); - - if let Some(h_advance) = face.glyph_hor_advance(glyph_id) { - current_x += h_advance as f32 * scale; - } - } - - if let Some(path) = path_builder.finish() { - if bg_filled { - let mut text_paint = Paint::default(); - text_paint.set_color_rgba8(0, 0, 0, 255); - text_paint.anti_alias = true; - pixmap.fill_path( - &path, - &text_paint, - FillRule::Winding, - Transform::identity(), - None, - ); - } else { - pixmap.fill_path(&path, paint, FillRule::Winding, Transform::identity(), None); - } - } -} - -pub(super) fn create_font_face() -> ResultType> { - let mut font_db = fontdb::Database::new(); - font_db.load_system_fonts(); - let query = fontdb::Query { - families: &[fontdb::Family::Monospace, fontdb::Family::SansSerif], - ..fontdb::Query::default() - }; - let Some(font_id) = font_db.query(&query) else { - bail!("No monospace or sans-serif font found!"); - }; - let Some((font_source, face_index)) = font_db.face_source(font_id) else { - bail!("No face found for font!"); - }; - // Load the font data into a static slice to satisfy `ttf-parser`'s lifetime requirements. - // We use `Box::leak` to leak the memory, which is acceptable here since the font data - // is needed for the entire lifetime of the application. - let font_data: &'static [u8] = Box::leak(match font_source { - fontdb::Source::File(path) => std::fs::read(path)?.into_boxed_slice(), - fontdb::Source::Binary(data) => data.as_ref().as_ref().to_vec().into_boxed_slice(), - fontdb::Source::SharedFile(path, _) => std::fs::read(path)?.into_boxed_slice(), - }); - let face = Face::parse(font_data, face_index)?; - Ok(face) -} diff --git a/src/whiteboard/windows.rs b/src/whiteboard/windows.rs deleted file mode 100644 index dc6a8c30e..000000000 --- a/src/whiteboard/windows.rs +++ /dev/null @@ -1,230 +0,0 @@ -use super::{ - server::{Ripple, EVENT_PROXY}, - win_linux::{create_font_face, draw_text}, - Cursor, CustomEvent, -}; -use hbb_common::{anyhow::anyhow, log, ResultType}; -use softbuffer::{Context, Surface}; -use std::{collections::HashMap, num::NonZeroU32, sync::Arc, time::Instant}; -use tao::{ - dpi::{PhysicalPosition, PhysicalSize}, - event::{Event, WindowEvent}, - event_loop::{ControlFlow, EventLoopBuilder}, - platform::windows::WindowBuilderExtWindows, - window::WindowBuilder, -}; -use tiny_skia::{Color, FillRule, Paint, PathBuilder, PixmapMut, Stroke, Transform}; - -pub(super) fn create_event_loop() -> ResultType<()> { - let face = match create_font_face() { - Ok(face) => Some(face), - Err(err) => { - log::error!("Failed to create font face: {}", err); - None - } - }; - - let event_loop = EventLoopBuilder::<(String, CustomEvent)>::with_user_event().build(); - let mut window_builder = WindowBuilder::new() - .with_title("RustDesk whiteboard") - .with_transparent(true) - .with_always_on_top(true) - .with_skip_taskbar(true) - .with_decorations(false); - - let mut final_size = None; - if let Ok((x, y, w, h)) = super::server::get_displays_rect() { - if w > 0 && h > 0 { - final_size = Some(PhysicalSize::new(w, h)); - window_builder = window_builder - .with_position(PhysicalPosition::new(x, y)) - .with_inner_size(PhysicalSize::new(1, 1)); - } else { - window_builder = - window_builder.with_fullscreen(Some(tao::window::Fullscreen::Borderless(None))); - } - } else { - window_builder = - window_builder.with_fullscreen(Some(tao::window::Fullscreen::Borderless(None))); - } - - let window = Arc::new(window_builder.build::<(String, CustomEvent)>(&event_loop)?); - window.set_ignore_cursor_events(true)?; - - let context = Context::new(window.clone()).map_err(|e| { - log::error!("Failed to create context: {}", e); - anyhow!(e.to_string()) - })?; - let mut surface = Surface::new(&context, window.clone()).map_err(|e| { - log::error!("Failed to create surface: {}", e); - anyhow!(e.to_string()) - })?; - - let proxy = event_loop.create_proxy(); - EVENT_PROXY.write().unwrap().replace(proxy); - let _call_on_ret = crate::common::SimpleCallOnReturn { - b: true, - f: Box::new(move || { - let _ = EVENT_PROXY.write().unwrap().take(); - }), - }; - - let mut ripples: Vec = Vec::new(); - let mut last_cursors: HashMap = HashMap::new(); - let mut resized = final_size.is_none(); - - event_loop.run(move |event, _, control_flow| { - *control_flow = ControlFlow::Poll; - - match event { - Event::WindowEvent { event, .. } => match event { - WindowEvent::CloseRequested => { - *control_flow = ControlFlow::Exit; - } - _ => {} - }, - Event::RedrawRequested(_) => { - if !resized { - if let Some(size) = final_size.take() { - window.set_inner_size(size); - } - resized = true; - return; - } - - let (width, height) = { - let size = window.inner_size(); - (size.width, size.height) - }; - - let (Some(width), Some(height)) = (NonZeroU32::new(width), NonZeroU32::new(height)) - else { - return; - }; - if let Err(e) = surface.resize(width, height) { - log::error!("Failed to resize surface: {}", e); - return; - } - - let mut buffer = match surface.buffer_mut() { - Ok(buf) => buf, - Err(e) => { - log::error!("Failed to get buffer: {}", e); - return; - } - }; - let Some(mut pixmap) = PixmapMut::from_bytes( - bytemuck::cast_slice_mut(&mut buffer), - width.get(), - height.get(), - ) else { - log::error!("Failed to create pixmap from buffer"); - return; - }; - pixmap.fill(Color::TRANSPARENT); - - Ripple::retain_active(&mut ripples); - for ripple in &ripples { - let (radius, alpha) = ripple.get_radius_alpha(); - - let mut ripple_paint = Paint::default(); - // Note: The real color is bgra here. - ripple_paint.set_color_rgba8(64, 64, 255, (alpha * 128.0) as u8); - ripple_paint.anti_alias = true; - - let mut ripple_pb = PathBuilder::new(); - ripple_pb.push_circle(ripple.x, ripple.y, radius); - if let Some(path) = ripple_pb.finish() { - pixmap.fill_path( - &path, - &ripple_paint, - FillRule::Winding, - Transform::identity(), - None, - ); - } - } - - for cursor in last_cursors.values() { - let (x, y) = (cursor.x, cursor.y); - let size = 1.5f32; - - let mut pb = PathBuilder::new(); - pb.move_to(x, y); - pb.line_to(x, y + 16.0 * size); - pb.line_to(x + 4.0 * size, y + 13.0 * size); - pb.line_to(x + 7.0 * size, y + 20.0 * size); - pb.line_to(x + 9.0 * size, y + 19.0 * size); - pb.line_to(x + 6.0 * size, y + 12.0 * size); - pb.line_to(x + 11.0 * size, y + 12.0 * size); - pb.close(); - - if let Some(path) = pb.finish() { - let rgba = super::argb_to_rgba(cursor.argb); - let mut arrow_paint = Paint::default(); - // Note: The real color is bgra here. - arrow_paint.set_color_rgba8(rgba.2, rgba.1, rgba.0, rgba.3); - arrow_paint.anti_alias = true; - pixmap.fill_path( - &path, - &arrow_paint, - FillRule::Winding, - Transform::identity(), - None, - ); - - let mut black_paint = Paint::default(); - black_paint.set_color_rgba8(0, 0, 0, 255); - black_paint.anti_alias = true; - let mut stroke = Stroke::default(); - stroke.width = 1.0f32; - pixmap.stroke_path( - &path, - &black_paint, - &stroke, - Transform::identity(), - None, - ); - - face.as_ref().map(|face| { - draw_text( - &mut pixmap, - face, - &cursor.text, - x + 24.0 * size, - y + 24.0 * size, - &arrow_paint, - 14.0f32, - ); - }); - } - } - - if let Err(e) = buffer.present() { - log::error!("Failed to present surface: {}", e); - return; - } - } - Event::MainEventsCleared => { - window.request_redraw(); - } - Event::UserEvent((k, evt)) => match evt { - CustomEvent::Cursor(cursor) => { - if cursor.btns != 0 { - ripples.push(Ripple { - x: cursor.x, - y: cursor.y, - start_time: Instant::now(), - }); - } - last_cursors.insert(k, cursor); - } - CustomEvent::Exit => { - *control_flow = ControlFlow::Exit; - } - _ => {} - }, - _ => (), - } - }); -} diff --git a/terminal.md b/terminal.md new file mode 100644 index 000000000..92a0973cb --- /dev/null +++ b/terminal.md @@ -0,0 +1,521 @@ +# RustDesk Terminal Service Implementation + +## Overview + +The RustDesk terminal service provides remote terminal/shell access with support for multiple concurrent terminal sessions per connection. It features persistence support, allowing terminal sessions to survive connection drops and be resumed later. + +## Architecture + +### Client-Side (Flutter) + +#### Terminal Connection Management +- **TerminalConnectionManager** (`flutter/lib/desktop/pages/terminal_connection_manager.dart`) + - Manages one FFI instance per peer (shared across all terminal tabs) + - Tracks persistence settings per peer + - Handles connection reference counting + +#### Terminal Models +- **TerminalModel** (`flutter/lib/models/terminal_model.dart`) + - One instance per terminal tab + - Handles terminal I/O and display using xterm package + - Manages terminal state (opened, size, buffer) + +#### UI Components +- **TerminalTabPage** (`flutter/lib/desktop/pages/terminal_tab_page.dart`) + - Manages multiple terminal tabs + - Right-click menu for persistence toggle + - Keyboard shortcuts (Cmd/Ctrl+Shift+T for new terminal) + +### Server-Side (Rust) + +#### Terminal Service Structure +```rust +TerminalService { + conn_id: i32, + service_id: String, // "tmp_{uuid}" or "persist_{uuid}" + persist: bool, +} + +PersistentTerminalService { + service_id: String, + sessions: HashMap, // terminal_id -> session + next_terminal_id: i32, + created_at: Instant, + last_activity: Instant, +} + +TerminalSession { + terminal_id: i32, + pty_pair: PtyPair, + child: Box, + writer: Box, + reader: Box, + output_buffer: OutputBuffer, // For reconnection + rows: u16, + cols: u16, +} +``` + +## Message Protocol + +### Client → Server Messages + +1. **Open Terminal** +```protobuf +TerminalAction { + open: OpenTerminal { + terminal_id: i32, + rows: u32, + cols: u32, + } +} +``` + +2. **Send Input** +```protobuf +TerminalAction { + data: TerminalData { + terminal_id: i32, + data: bytes, + } +} +``` + +3. **Resize Terminal** +```protobuf +TerminalAction { + resize: ResizeTerminal { + terminal_id: i32, + rows: u32, + cols: u32, + } +} +``` + +4. **Close Terminal** +```protobuf +TerminalAction { + close: CloseTerminal { + terminal_id: i32, + force: bool, + } +} +``` + +### Server → Client Messages + +1. **Terminal Opened** +```protobuf +TerminalResponse { + opened: TerminalOpened { + terminal_id: i32, + success: bool, + message: string, + pid: u32, + } +} +``` + +2. **Terminal Output** +```protobuf +TerminalResponse { + data: TerminalData { + terminal_id: i32, + data: bytes, // Base64 encoded in Flutter + } +} +``` + +3. **Terminal Closed** +```protobuf +TerminalResponse { + closed: TerminalClosed { + terminal_id: i32, + exit_code: i32, + } +} +``` + +## Persistence Design + +### Service ID Convention +- **Temporary**: `"tmp_{uuid}"` - Cleaned up after idle timeout +- **Persistent**: `"persist_{uuid}"` - Survives disconnections + +### Persistence Flow +1. User right-clicks terminal tab → "Enable terminal persistence" +2. Client stores persistence preference in `TerminalConnectionManager` +3. New terminals created with appropriate service ID prefix +4. Service ID saved for future reconnection (TODO: implement storage) + +### Cleanup Rules +- **Temporary services (`tmp_`)**: + - Removed after 1 hour idle time + - Immediately removed when service loop exits + +- **Persistent services**: + - Removed after 2 hours idle time IF empty + - Survive connection drops + - Can be reconnected using saved service ID + +### Cleanup Implementation + +#### 1. **Automatic Background Cleanup** +```rust +// Runs every 5 minutes +fn ensure_cleanup_task() { + tokio::spawn(async { + let mut interval = tokio::time::interval(Duration::from_secs(300)); + loop { + interval.tick().await; + cleanup_inactive_services(); + } + }); +} +``` + +#### 2. **Cleanup Logic** +```rust +fn cleanup_inactive_services() { + let now = Instant::now(); + + for (service_id, service) in services.iter() { + // Temporary services: clean up after 1 hour idle + if service_id.starts_with("tmp_") && + now.duration_since(svc.last_activity) > SERVICE_IDLE_TIMEOUT { + to_remove.push(service_id); + } + // Persistent services: clean up after 2 hours IF empty + else if !service_id.starts_with("tmp_") && + svc.sessions.is_empty() && + now.duration_since(svc.last_activity) > SERVICE_IDLE_TIMEOUT * 2 { + to_remove.push(service_id); + } + } +} +``` + +#### 3. **Service Loop Exit Cleanup** +```rust +fn run(sp: EmptyExtraFieldService, _conn_id: i32, service_id: String) { + // Service loop + while sp.ok() { + // Read and send terminal outputs... + } + + // Clean up temporary services immediately on exit + if service_id.starts_with("tmp_") { + remove_service(&service_id); + } +} +``` + +#### 4. **Session Cleanup Within Service** +When a terminal is closed: +- PTY process is terminated +- Terminal session removed from service's HashMap +- Resources (file descriptors, buffers) are freed +- Service continues running for other terminals + +#### 5. **Connection Drop Behavior** +```rust +impl Drop for Connection { + fn drop(&mut self) { + if self.terminal { + // Unsubscribe from terminal service + server.subscribe(&service_name, self.inner.clone(), false); + } + } +} +``` +- Connection unsubscribes from service +- Service loop continues if other subscribers exist +- If no subscribers remain, `sp.ok()` returns false → service loop exits + +#### 6. **Activity Tracking** +`last_activity` is updated when: +- New terminal opened +- Input sent to terminal +- Terminal resized +- Output read from terminal +- Any terminal operation occurs + +#### 7. **Two-Phase Cleanup Process** +```rust +// Collect services to remove (while holding lock) +let mut to_remove = Vec::new(); +for (id, service) in services.iter() { + if should_remove(service) { + to_remove.push(id); + } +} + +// Remove services (after releasing lock) +drop(services); +for id in to_remove { + remove_service(&id); +} +``` +This prevents deadlock when removing services. + +## Key Features + +### Multiple Terminals per Connection +- Single FFI connection shared by all terminal tabs +- Each terminal has unique ID within the service +- Independent PTY sessions per terminal + +### Output Buffering +- Last 1MB of output buffered per terminal +- Allows showing recent history on reconnection +- Ring buffer with line-based storage + +### Cross-Platform Support +- **Unix/Linux/macOS**: Uses default shell from `$SHELL` or `/bin/bash` +- **Windows**: Uses `%COMSPEC%` or `cmd.exe` +- PTY implementation via `portable_pty` crate + +### Non-Blocking I/O +- PTY readers set to non-blocking mode (Unix) +- Output polled at ~33fps for responsive display +- Prevents blocking when no data available + +## Current Limitations + +1. **Service ID Storage**: Client doesn't persist service IDs yet +2. **Reconnection UI**: No UI to recover previous sessions +3. **Authentication**: No per-service authentication for reconnection +4. **Resource Limits**: No configurable limits on terminals per service + +## Future Enhancements + +1. **Proper Reconnection Flow**: + - Store service IDs in peer config + - UI to list and recover previous sessions + - Show buffered output on reconnection + +2. **Security**: + - Authentication token for service recovery + - Encryption of buffered output + - Access control per terminal + +3. **Advanced Features**: + - Terminal sharing between users + - Session recording/playback + - File transfer via terminal + - Custom shell/command configuration + +## Code Locations + +- **Server Implementation**: `src/server/terminal_service.rs` +- **Connection Handler**: `src/server/connection.rs` (handle_terminal_action) +- **Client Interface**: `src/ui_session_interface.rs` (terminal methods) +- **Flutter FFI**: `src/flutter_ffi.rs` (session_open_terminal, etc.) +- **Flutter Models**: `flutter/lib/models/terminal_model.dart` +- **Flutter UI**: `flutter/lib/desktop/pages/terminal_*.dart` + +## Usage + +1. **Start Terminal Session**: + - Click terminal icon or use Ctrl/Cmd+Shift+T + - Terminal opens with default shell + +2. **Enable Persistence**: + - Right-click any terminal tab + - Select "Enable terminal persistence" + - All terminals for that peer become persistent + +3. **Multiple Terminals**: + - Click "+" button or Ctrl/Cmd+Shift+T + - Each terminal is independent + +4. **Reconnection** (TODO): + - Connect to same peer + - Previous terminals automatically restored + - Recent output displayed + +## Implementation Issues & TODOs + +### Critical Missing Features + +1. **Service ID Storage & Recovery** + - Need to store service_id in peer config when persistence enabled + - Pass service_id in LoginRequest for reconnection + - Handle service_id in server login flow + - Return terminal list in LoginResponse + +2. **Protocol Extensions Needed** + ```protobuf + // In LoginRequest + message Terminal { + string service_id = 1; // For reconnection + bool persistent = 2; // Request persistence + } + + // In LoginResponse + message TerminalServiceInfo { + string service_id = 1; + repeated TerminalSessionInfo sessions = 2; + } + ``` + +3. **Terminal Recovery Flow** + - Add RecoverTerminal action to restore specific terminal + - Send buffered output on reconnection + - Handle terminal size on recovery + - UI to show available terminals + +### Current Design Issues + +1. **Service Pattern Mismatch** + - Terminal service forced into broadcast service pattern + - Should be direct connection resource, not shared service + - Complex routing through service registry unnecessary + +2. **Global State Management** + - TERMINAL_SERVICES static HashMap may cause issues + - No proper service discovery mechanism + - Cleanup task is global, not per-connection + +3. **Resource Limits Missing** + - No limit on terminals per service + - No limit on buffer size per terminal + - No limit on total services + - Could lead to resource exhaustion + +4. **Security Concerns** + - No authentication for service recovery + - Service IDs are predictable (just UUID) + - No encryption of buffered terminal output + - No access control between users + +### Performance Optimizations Needed + +1. **Output Reading** + - Currently polls at 33fps regardless of activity + - Should use event-driven I/O (epoll/kqueue) + - Batch small outputs to reduce messages + +2. **Buffer Management** + - Ring buffer could be more efficient + - Consider compression for stored output + - Implement smart truncation (keep last N complete lines) + +3. **Message Overhead** + - Each output chunk creates new protobuf message + - Could batch multiple terminal outputs + - Consider streaming protocol for continuous output + +### Platform-Specific Issues + +1. **Windows** + - ConPTY support needs testing + - Non-blocking I/O handled differently + - Shell detection could be improved + +2. **Mobile (Android/iOS)** + - Terminal feature disabled by conditional compilation + - Need to evaluate mobile terminal support + - Touch keyboard integration needed + +### Testing Requirements + +1. **Unit Tests Needed** + - Terminal service lifecycle + - Cleanup logic edge cases + - Buffer management + - Message serialization + +2. **Integration Tests** + - Multi-terminal scenarios + - Reconnection flows + - Cleanup timing + - Resource limits + +3. **Stress Tests** + - Many terminals per connection + - Large output volumes + - Rapid connect/disconnect + - Long-running sessions + +### Alternative Designs to Consider + +1. **Direct Terminal Management** + ```rust + // In Connection struct + terminals: HashMap, + + // No service pattern, direct management + async fn handle_terminal_action(&mut self, action) { + match action { + Open => self.open_terminal(), + Data => self.terminal_input(), + // etc + } + } + ``` + +2. **Actor-Based Design** + - Each terminal as an actor + - Message passing for I/O + - Better isolation and error handling + +3. **Session Manager Service** + - One global terminal manager + - Connections request terminals from manager + - Cleaner separation of concerns + +### Documentation Gaps + +1. **API Documentation** + - Document all public methods + - Add examples for common operations + - Document error conditions + +2. **Configuration** + - Document all timeouts and limits + - How to configure shell/terminal + - Platform-specific settings + +3. **Troubleshooting Guide** + - Common issues and solutions + - Debug logging interpretation + - Performance tuning + +### Future Feature Ideas + +1. **Advanced Terminal Features** + - Terminal sharing (multiple users, one terminal) + - Session recording and playback + - File transfer through terminal (zmodem) + - Custom color schemes + - Font configuration + +2. **Integration Features** + - SSH key forwarding + - Environment variable injection + - Working directory synchronization + - Shell integration (prompt markers, etc) + +3. **Management Features** + - Terminal session monitoring + - Usage statistics + - Audit logging + - Rate limiting + +### Refactoring Suggestions + +1. **Separate Concerns** + - Split terminal_service.rs into multiple files + - Separate PTY management from service logic + - Extract buffer management to own module + +2. **Improve Error Handling** + - Use proper error types, not strings + - Add error recovery mechanisms + - Better error reporting to client + +3. **Configuration Management** + - Make timeouts configurable + - Add feature flags for experimental features + - Environment-based configuration \ No newline at end of file diff --git a/vcpkg.json b/vcpkg.json index d41b91c22..394b94614 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -86,7 +86,7 @@ "vcpkg-configuration": { "default-registry": { "kind": "builtin", - "baseline": "120deac3062162151622ca4860575a33844ba10b" + "baseline": "6f29f12e82a8293156836ad81cc9bf5af41fe836" }, "overlay-ports": [ "./res/vcpkg"