[feat] optimize hyperlink opening by replacing system start with CreateProcessW-based URL launch on Winodws

.github/workflows/build.yml

@@ -58,12 +58,6 @@ jobs:
           xmake f --CROSSDESK_VERSION=${LEGAL_VERSION} --USE_CUDA=true --root -y
           xmake b -vy --root crossdesk
 
-      - name: Decode and save certificate
-        shell: bash
-        run: |
-          mkdir -p certs
-          echo "${{ secrets.CROSSDESK_CERT_BASE64 }}" | base64 --decode > certs/crossdesk.cn_root.crt
-
       - name: Package
         run: |
           chmod +x ./scripts/linux/pkg_amd64.sh
@@ -123,12 +117,6 @@ jobs:
           xmake f --CROSSDESK_VERSION=${LEGAL_VERSION} --USE_CUDA=true --root -y
           xmake b -vy --root crossdesk
 
-      - name: Decode and save certificate
-        shell: bash
-        run: |
-          mkdir -p certs
-          echo "${{ secrets.CROSSDESK_CERT_BASE64 }}" | base64 --decode > certs/crossdesk.cn_root.crt
-
       - name: Package
         run: |
           chmod +x ${{ matrix.package_script }}
@@ -192,12 +180,6 @@ jobs:
           xmake f --CROSSDESK_VERSION=${VERSION_NUM} --USE_CUDA=true -y
           xmake b -vy crossdesk
 
-      - name: Decode and save certificate
-        shell: bash
-        run: |
-          mkdir -p certs
-          echo "${{ secrets.CROSSDESK_CERT_BASE64 }}" | base64 --decode > certs/crossdesk.cn_root.crt
-
       - name: Package CrossDesk app
         run: |
           chmod +x ${{ matrix.package_script }}
@@ -301,24 +283,32 @@ jobs:
           xmake f --CROSSDESK_VERSION=${{ env.VERSION_NUM }} --USE_CUDA=true -y
           xmake b -vy crossdesk
 
-      - name: Decode and save certificate
-        shell: powershell
-        run: |
-          New-Item -ItemType Directory -Force -Path certs
-          [System.IO.File]::WriteAllBytes('certs\crossdesk.cn_root.crt', [Convert]::FromBase64String('${{ secrets.CROSSDESK_CERT_BASE64 }}'))
-
       - name: Package
         shell: pwsh
         run: |
           cd "${{ github.workspace }}\scripts\windows"
           makensis /DVERSION=$env:VERSION_NUM nsis_script.nsi
 
+      - name: Package Portable
+        shell: pwsh
+        run: |
+          $portableDir = "${{ github.workspace }}\portable"
+          New-Item -ItemType Directory -Force -Path $portableDir
+          Copy-Item "${{ github.workspace }}\build\windows\x64\release\crossdesk.exe" $portableDir
+          Compress-Archive -Path "$portableDir\*" -DestinationPath "${{ github.workspace }}\crossdesk-win-x64-portable-${{ env.VERSION_NUM }}.zip"
+
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: crossdesk-win-x64-${{ env.VERSION_NUM }}
           path: ${{ github.workspace }}/scripts/windows/crossdesk-win-x64-${{ env.VERSION_NUM }}.exe
 
+      - name: Upload portable artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: crossdesk-win-x64-portable-${{ env.VERSION_NUM }}
+          path: ${{ github.workspace }}/crossdesk-win-x64-portable-${{ env.VERSION_NUM }}.zip
+
   release:
     name: Publish Release
     if: startsWith(github.ref, 'refs/tags/v')
@@ -359,6 +349,7 @@ jobs:
           cp artifacts/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_WITH_V }}.deb
           cp artifacts/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.deb
           cp artifacts/crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}.exe
+          cp artifacts/crossdesk-win-x64-portable-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-win-x64-portable-${{ steps.version.outputs.VERSION_WITH_V }}.zip
 
       - name: List release files
         run: ls -lh release/
@@ -416,6 +407,10 @@ jobs:
                 "url": "https://downloads.crossdesk.cn/crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}.exe",
                 "filename": "crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}.exe"
               },
+              "windows-x64-portable": {
+                "url": "https://downloads.crossdesk.cn/crossdesk-win-x64-portable-${{ steps.version.outputs.VERSION_WITH_V }}.zip",
+                "filename": "crossdesk-win-x64-portable-${{ steps.version.outputs.VERSION_WITH_V }}.zip"
+              },
               "macos-x64": {
                 "url": "https://downloads.crossdesk.cn/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg",
                 "filename": "crossdesk-macos-x64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg"

.github/workflows/update-version-json.yml

@@ -11,7 +11,7 @@ jobs:
   update-version-json:
     name: Update version.json with release information
     runs-on: ubuntu-latest
-    
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -25,7 +25,7 @@ jobs:
           VERSION_ONLY="${TAG_NAME#v}"
           echo "TAG_NAME=${TAG_NAME}" >> $GITHUB_OUTPUT
           echo "VERSION_ONLY=${VERSION_ONLY}" >> $GITHUB_OUTPUT
-          
+
           # Extract date from tag if available (format: v1.2.3-20251113-abc)
           if [[ "${TAG_NAME}" =~ -([0-9]{8})- ]]; then
             DATE_STR="${BASH_REMATCH[1]}"
@@ -45,7 +45,7 @@ jobs:
           # Use jq to properly escape JSON
           RELEASE_BODY="${{ github.event.release.body }}"
           RELEASE_NAME="${{ github.event.release.name }}"
-          
+
           # Handle empty values
           if [ -z "$RELEASE_BODY" ]; then
             RELEASE_BODY=""
@@ -53,15 +53,15 @@ jobs:
           if [ -z "$RELEASE_NAME" ]; then
             RELEASE_NAME=""
           fi
-          
+
           # Save to temporary files for proper handling
           echo -n "$RELEASE_BODY" > /tmp/release_body.txt
           echo -n "$RELEASE_NAME" > /tmp/release_name.txt
-          
+
           # Use jq to escape JSON strings
           RELEASE_BODY_JSON=$(jq -Rs . < /tmp/release_body.txt)
           RELEASE_NAME_JSON=$(jq -Rs . < /tmp/release_name.txt)
-          
+
           echo "RELEASE_BODY=${RELEASE_BODY_JSON}" >> $GITHUB_OUTPUT
           echo "RELEASE_NAME=${RELEASE_NAME_JSON}" >> $GITHUB_OUTPUT
 
@@ -85,7 +85,7 @@ jobs:
           else
             DOWNLOADS_JSON=""
           fi
-          
+
           # If downloads is empty, use default structure
           if [ -z "$DOWNLOADS_JSON" ]; then
             DOWNLOADS_JSON=$(cat << DOWNLOADS_EOF
@@ -94,6 +94,10 @@ jobs:
                 "url": "https://downloads.crossdesk.cn/crossdesk-win-x64-${{ steps.version.outputs.TAG_NAME }}.exe",
                 "filename": "crossdesk-win-x64-${{ steps.version.outputs.TAG_NAME }}.exe"
               },
+              "windows-x64-portable": {
+                "url": "https://downloads.crossdesk.cn/crossdesk-win-x64-portable-${{ steps.version.outputs.TAG_NAME }}.zip",
+                "filename": "crossdesk-win-x64-portable-${{ steps.version.outputs.TAG_NAME }}.zip"
+              },
               "macos-x64": {
                 "url": "https://downloads.crossdesk.cn/crossdesk-macos-x64-${{ steps.version.outputs.TAG_NAME }}.pkg",
                 "filename": "crossdesk-macos-x64-${{ steps.version.outputs.TAG_NAME }}.pkg"
@@ -114,7 +118,7 @@ jobs:
           DOWNLOADS_EOF
                       )
                     fi
-          
+
           # Generate version.json using cat and heredoc
           cat > version.json << EOF
           {
@@ -126,7 +130,7 @@ jobs:
             "downloads": ${DOWNLOADS_JSON}
           }
           EOF
-          
+
           cat version.json
 
       - name: Upload version.json to server
@@ -137,4 +141,4 @@ jobs:
           remote_path: /var/www/html/version/
           remote_host: ${{ secrets.SERVER_HOST }}
           remote_user: ${{ secrets.SERVER_USER }}
-          remote_key: ${{ secrets.SERVER_KEY }}
+          remote_key: ${{ secrets.SERVER_KEY }}

.gitignore

@@ -1,7 +1,6 @@
 # Xmake cache
 .xmake/
 build/
-certs/
 
 # MacOS Cache
 .DS_Store

README.md

@@ -214,7 +214,7 @@ sudo docker run -d \
 **注意**：
 - **服务器需开放端口：COTURN_PORT/udp，COTURN_PORT/tcp，MIN_PORT-MAX_PORT/udp，CROSSDESK_SERVER_PORT/tcp。**
 - 如果不挂载 volume，容器删除后数据会丢失
-- 证书文件会在首次启动时自动生成并持久化到宿主机的 `/var/lib/crossdesk/certs` 路径下
+- 证书文件会在首次启动时自动生成并持久化到宿主机的 `/var/lib/crossdesk/certs` 路径下。由于默认使用的是自签证书，无法保障安全性，建议在云服务商申请正式证书放到该目录下并重启服务。
 - 数据库文件会自动创建并持久化到宿主机的 `/var/lib/crossdesk/db/crossdesk-server.db` 路径下
 - 日志文件会自动创建并持久化到宿主机的 `/var/log/crossdesk/` 路径下
 
@@ -232,16 +232,30 @@ sudo chown -R $(id -u):$(id -g) /var/lib/crossdesk /var/log/crossdesk
 
 ### 客户端
 1. 点击右上角设置进入设置页面。<br><br>
-<img width="600" height="210" alt="image" src="https://github.com/user-attachments/assets/6431131d-b32a-4726-8783-6788f47baa3b" /><br><br>
+<img width="600" height="210" alt="image" src="https://github.com/user-attachments/assets/6431131d-b32a-4726-8783-6788f47baa3b" /><br>
 
-2. 点击点击`自托管服务器配置`按钮。<br><br>
-<img width="600" height="140" alt="image" src="https://github.com/user-attachments/assets/24c761a3-1985-4d7e-84be-787383c2afb8" /><br><br>
+2. 点击`自托管服务器配置`按钮。<br><br>
+<img width="600" height="160" alt="image" src="https://github.com/user-attachments/assets/24c761a3-1985-4d7e-84be-787383c2afb8" /><br>
 
-3. 输入`服务器地址`(**EXTERNAL_IP**)、`信令服务端口`(**CROSSDESK_SERVER_PORT**)、`中继服务端口`(**COTURN_PORT**)。<br><br>
-<img width="600" height="200" alt="image" src="https://github.com/user-attachments/assets/9a32ddd5-37f8-4bee-9a51-eae295820f9a" /><br><br>
+3. 输入`服务器地址`(**EXTERNAL_IP**)、`信令服务端口`(**CROSSDESK_SERVER_PORT**)、`中继服务端口`(**COTURN_PORT**)，点击确认按钮。
+   
+4. 勾选`自托管服务器配置`选项，点击确认按钮保存设置。如果服务端使用的是正式证书，则到此步骤为止，客户端即可显示已连接服务器。
 
-4. 后续如果自托管服务器被重置或因其他原因导致证书更换，可以点击`重置证书指纹`按钮重置客户端保存的证书指纹。<br><br>
-<img width="600" height="200" alt="image" src="https://github.com/user-attachments/assets/d9e423ab-0c2b-4fab-b132-4dc27462d704" /><br><br>
+5. 如果使用默认证书（正式证书忽略此步骤），则需要将服务端`/var/lib/crossdesk/certs/`目录下的`api.crossdesk.cn_root.crt`自签根证书下载到运行客户端的机器，并执行下述命令安装证书：
+
+Windows 平台使用**管理员权限**打开 PowerShell 执行
+```
+certutil -addstore "Root" "C:\path\to\api.crossdesk.cn_root.crt"
+```
+Linux
+```
+sudo cp /path/to/api.crossdesk.cn_root.crt /usr/local/share/ca-certificates/api.crossdesk.cn_root.crt
+sudo update-ca-certificates
+```
+macOS
+```
+sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain path/to/api.crossdesk.cn_root.crt
+```
 
 ### Web 客户端
 详情见项目 [CrossDesk Web Client](https://github.com/kunkundi/crossdesk-web-client)。

README_EN.md

@@ -222,7 +222,7 @@ sudo docker run -d \
 **Notes**
 - **The server must open the following ports: COTURN_PORT/udp, COTURN_PORT/tcp, MIN_PORT–MAX_PORT/udp, and CROSSDESK_SERVER_PORT/tcp.**
 - If you don’t mount volumes, all data will be lost when the container is removed.
-- Certificate files will be automatically generated on first startup and persisted to the host at `/var/lib/crossdesk/certs`.
+- Certificate files will be automatically generated on first startup and persisted to the host at `/var/lib/crossdesk/certs`.As the default certificates are self-signed and cannot guarantee security, it is strongly recommended to apply for a trusted certificate from a cloud provider, deploy it to this directory, and restart the service.
 - The database file will be automatically created and stored at `/var/lib/crossdesk/db/crossdesk-server.db`.
 - Log files will be created and stored at `/var/log/crossdesk/`.
 
@@ -243,16 +243,31 @@ Place **crossdesk.cn.key** and **crossdesk.cn_bundle.crt** into the **/path/to/y
 
 ### Client Side
 1. Click the settings icon in the top-right corner to enter the settings page.<br><br>
-<img width="600" height="210" alt="image" src="https://github.com/user-attachments/assets/6431131d-b32a-4726-8783-6788f47baa3b" /><br><br>
+<img width="600" height="210" alt="image" src="https://github.com/user-attachments/assets/6431131d-b32a-4726-8783-6788f47baa3b" /><br>
 
 2. Click `Self-Hosted Server Configuration` button.<br><br>
-<img width="600" height="160" alt="image" src="https://github.com/user-attachments/assets/24c761a3-1985-4d7e-84be-787383c2afb8" /><br><br>
+<img width="600" height="160" alt="image" src="https://github.com/user-attachments/assets/24c761a3-1985-4d7e-84be-787383c2afb8" /><br>
 
-3. Enter the `Server Address` (**EXTERNAL_IP**), `Signaling Service Port` (**CROSSDESK_SERVER_PORT**), and `Relay Service Port` (**COTURN_PORT**).<br><br>
-<img width="600" height="200" alt="image" src="https://github.com/user-attachments/assets/9a32ddd5-37f8-4bee-9a51-eae295820f9a" /><br><br>
+3. Enter the `Server Address` (**EXTERNAL_IP**), `Signaling Service Port` (**CROSSDESK_SERVER_PORT**), and `Relay Service Port` (**COTURN_PORT**) and click OK button.
+
+4. Check the `Self-hosted server configuration` option and click the OK button to save the settings. If the server is using a valid (official) certificate, the process ends here and the client will show that it is connected to the server.
+
+5. If the default certificate is used (skip this step if an official certificate is used), download the self-signed root certificate `api.crossdesk.cn_root.crt` from the server directory /var/lib/crossdesk/certs/ to the machine running the client, and install the certificate by executing the following command:
+
+On Windows, open PowerShell with **administrator privileges** and execute:
+```
+certutil -addstore "Root" "C:\path\to\api.crossdesk.cn_root.crt"
+```
+Linux
+```
+sudo cp /path/to/api.crossdesk.cn_root.crt /usr/local/share/ca-certificates/api.crossdesk.cn_root.crt
+sudo update-ca-certificates
+```
+macOS
+```
+sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain path/to/api.crossdesk.cn_root.crt
+```
 
-4. If the self-hosted server is later reset or the certificate is replaced for any reason, you can click the `Reset Certificate Fingerprint` button to clear the certificate fingerprint saved on the client.<br><br>
-<img width="600" height="200" alt="image" src="https://github.com/user-attachments/assets/d9e423ab-0c2b-4fab-b132-4dc27462d704" /><br><br>
 
 ### Web Client
 See [CrossDesk Web Client](https://github.com/kunkundi/crossdesk-web-client)。

scripts/linux/pkg_amd64.sh

@@ -15,21 +15,18 @@ DEB_VERSION="${APP_VERSION#v}"
 DEB_DIR="${PKG_NAME}-${DEB_VERSION}"
 DEBIAN_DIR="$DEB_DIR/DEBIAN"
 BIN_DIR="$DEB_DIR/usr/bin"
-CERT_SRC_DIR="$DEB_DIR/opt/$PKG_NAME/certs"
 ICON_BASE_DIR="$DEB_DIR/usr/share/icons/hicolor"
 DESKTOP_DIR="$DEB_DIR/usr/share/applications"
 
 rm -rf "$DEB_DIR"
 
-mkdir -p "$DEBIAN_DIR" "$BIN_DIR" "$CERT_SRC_DIR" "$DESKTOP_DIR"
+mkdir -p "$DEBIAN_DIR" "$BIN_DIR" "$DESKTOP_DIR"
 
 cp build/linux/x86_64/release/crossdesk "$BIN_DIR/$PKG_NAME"
 chmod +x "$BIN_DIR/$PKG_NAME"
 
 ln -s "$PKG_NAME" "$BIN_DIR/$APP_NAME"
 
-cp certs/crossdesk.cn_root.crt "$CERT_SRC_DIR/crossdesk.cn_root.crt"
-
 for size in 16 24 32 48 64 96 128 256; do
     mkdir -p "$ICON_BASE_DIR/${size}x${size}/apps"
     cp "icons/linux/crossdesk_${size}x${size}.png" \
@@ -71,7 +68,6 @@ if [ "\$1" = "remove" ] || [ "\$1" = "purge" ]; then
     rm -f /usr/bin/$PKG_NAME || true
     rm -f /usr/bin/$APP_NAME || true
     rm -f /usr/share/applications/$PKG_NAME.desktop || true
-    rm -rf /opt/$PKG_NAME/certs || true
     for size in 16 24 32 48 64 96 128 256; do
         rm -f /usr/share/icons/hicolor/\${size}x\${size}/apps/$PKG_NAME.png || true
     done
@@ -85,32 +81,9 @@ cat > "$DEBIAN_DIR/postinst" << 'EOF'
 #!/bin/bash
 set -e
 
-CERT_SRC="/opt/crossdesk/certs"
-CERT_FILE="crossdesk.cn_root.crt"
-
-for user_home in /home/*; do
-    [ -d "$user_home" ] || continue
-    username=$(basename "$user_home")
-    config_dir="$user_home/.config/CrossDesk/certs"
-    target="$config_dir/$CERT_FILE"
-
-    if [ ! -f "$target" ]; then
-        mkdir -p "$config_dir" || true
-        cp "$CERT_SRC/$CERT_FILE" "$target" || true
-        chown -R "$username:$username" "$user_home/.config/CrossDesk" || true
-        echo "✔ Installed cert for $username at $target"
-    fi
-done
-
-if [ -d "/root" ]; then
-    config_dir="/root/.config/CrossDesk/certs"
-    mkdir -p "$config_dir" || true
-    cp "$CERT_SRC/$CERT_FILE" "$config_dir/$CERT_FILE" || true
-    chown -R root:root /root/.config/CrossDesk || true
-fi
-
 exit 0
 EOF
+
 chmod +x "$DEBIAN_DIR/postinst"
 
 dpkg-deb --build "$DEB_DIR"

scripts/linux/pkg_arm64.sh

@@ -15,21 +15,18 @@ DEB_VERSION="${APP_VERSION#v}"
 DEB_DIR="${PKG_NAME}-${DEB_VERSION}"
 DEBIAN_DIR="$DEB_DIR/DEBIAN"
 BIN_DIR="$DEB_DIR/usr/bin"
-CERT_SRC_DIR="$DEB_DIR/opt/$PKG_NAME/certs"
 ICON_BASE_DIR="$DEB_DIR/usr/share/icons/hicolor"
 DESKTOP_DIR="$DEB_DIR/usr/share/applications"
 
 rm -rf "$DEB_DIR"
 
-mkdir -p "$DEBIAN_DIR" "$BIN_DIR" "$CERT_SRC_DIR" "$DESKTOP_DIR"
+mkdir -p "$DEBIAN_DIR" "$BIN_DIR" "$DESKTOP_DIR"
 
 cp build/linux/arm64/release/crossdesk "$BIN_DIR"
 chmod +x "$BIN_DIR/$PKG_NAME"
 
 ln -s "$PKG_NAME" "$BIN_DIR/$APP_NAME"
 
-cp certs/crossdesk.cn_root.crt "$CERT_SRC_DIR/crossdesk.cn_root.crt"
-
 for size in 16 24 32 48 64 96 128 256; do
     mkdir -p "$ICON_BASE_DIR/${size}x${size}/apps"
     cp "icons/linux/crossdesk_${size}x${size}.png" \
@@ -70,7 +67,6 @@ if [ "\$1" = "remove" ] || [ "\$1" = "purge" ]; then
     rm -f /usr/bin/$PKG_NAME || true
     rm -f /usr/bin/$APP_NAME || true
     rm -f /usr/share/applications/$PKG_NAME.desktop || true
-    rm -rf /opt/$PKG_NAME/certs || true
     for size in 16 24 32 48 64 96 128 256; do
         rm -f /usr/share/icons/hicolor/\${size}x\${size}/apps/$PKG_NAME.png || true
     done
@@ -84,30 +80,6 @@ cat > "$DEBIAN_DIR/postinst" << 'EOF'
 #!/bin/bash
 set -e
 
-CERT_SRC="/opt/crossdesk/certs"
-CERT_FILE="crossdesk.cn_root.crt"
-
-for user_home in /home/*; do
-    [ -d "$user_home" ] || continue
-    username=$(basename "$user_home")
-    config_dir="$user_home/.config/CrossDesk/certs"
-    target="$config_dir/$CERT_FILE"
-
-    if [ ! -f "$target" ]; then
-        mkdir -p "$config_dir" || true
-        cp "$CERT_SRC/$CERT_FILE" "$target" || true
-        chown -R "$username:$username" "$user_home/.config/CrossDesk" || true
-        echo "✔ Installed cert for $username at $target"
-    fi
-done
-
-if [ -d "/root" ]; then
-    config_dir="/root/.config/CrossDesk/certs"
-    mkdir -p "$config_dir" || true
-    cp "$CERT_SRC/$CERT_FILE" "$config_dir/$CERT_FILE" || true
-    chown -R root:root /root/.config/CrossDesk || true
-fi
-
 exit 0
 EOF
 

scripts/macosx/pkg_arm64.sh

@@ -11,9 +11,6 @@ IDENTIFIER="cn.crossdesk.app"
 ICON_PATH="icons/macos/crossdesk.icns"
 MACOS_MIN_VERSION="10.12"
 
-CERTS_SOURCE="certs"
-CERT_NAME="crossdesk.cn_root.crt"
-
 APP_BUNDLE="${APP_NAME_UPPER}.app"
 CONTENTS_DIR="${APP_BUNDLE}/Contents"
 MACOS_DIR="${CONTENTS_DIR}/MacOS"
@@ -98,11 +95,6 @@ IDENTIFIER="cn.crossdesk.app"
 USER_HOME=$( /usr/bin/stat -f "%Su" /dev/console )
 HOME_DIR=$( /usr/bin/dscl . -read /Users/$USER_HOME NFSHomeDirectory | awk '{print $2}' )
 
-# 复制证书文件
-DEST="$HOME_DIR/Library/Application Support/CrossDesk/certs"
-mkdir -p "$DEST"
-cp -R "/Library/Application Support/CrossDesk/certs/"* "$DEST/"
-
 # 清除应用的权限授权，以便重新授权
 # 使用 tccutil 重置录屏权限和辅助功能权限
 if command -v tccutil >/dev/null 2>&1; then
@@ -140,17 +132,8 @@ EOF
 
 chmod +x build_pkg_scripts/postinstall
 
-pkgbuild \
-  --root "${CERTS_SOURCE}" \
-  --identifier "${IDENTIFIER}.certs" \
-  --version "${APP_VERSION}" \
-  --install-location "/Library/Application Support/CrossDesk/certs" \
-  --scripts build_pkg_scripts \
-  build_pkg_temp/${APP_NAME}-certs.pkg
-
 productbuild \
   --package build_pkg_temp/${APP_NAME}-component.pkg \
-  --package build_pkg_temp/${APP_NAME}-certs.pkg \
   "${PKG_NAME}"
 
 echo "PKG package created: ${PKG_NAME}"

scripts/macosx/pkg_x64.sh

@@ -11,9 +11,6 @@ IDENTIFIER="cn.crossdesk.app"
 ICON_PATH="icons/macos/crossdesk.icns"
 MACOS_MIN_VERSION="10.12"
 
-CERTS_SOURCE="certs"
-CERT_NAME="crossdesk.cn_root.crt"
-
 APP_BUNDLE="${APP_NAME_UPPER}.app"
 CONTENTS_DIR="${APP_BUNDLE}/Contents"
 MACOS_DIR="${CONTENTS_DIR}/MacOS"
@@ -98,11 +95,6 @@ IDENTIFIER="cn.crossdesk.app"
 USER_HOME=$( /usr/bin/stat -f "%Su" /dev/console )
 HOME_DIR=$( /usr/bin/dscl . -read /Users/$USER_HOME NFSHomeDirectory | awk '{print $2}' )
 
-# 复制证书文件
-DEST="$HOME_DIR/Library/Application Support/CrossDesk/certs"
-mkdir -p "$DEST"
-cp -R "/Library/Application Support/CrossDesk/certs/"* "$DEST/"
-
 # 清除应用的权限授权，以便重新授权
 # 使用 tccutil 重置录屏权限和辅助功能权限
 if command -v tccutil >/dev/null 2>&1; then
@@ -140,17 +132,8 @@ EOF
 
 chmod +x build_pkg_scripts/postinstall
 
-pkgbuild \
-  --root "${CERTS_SOURCE}" \
-  --identifier "${IDENTIFIER}.certs" \
-  --version "${APP_VERSION}" \
-  --install-location "/Library/Application Support/CrossDesk/certs" \
-  --scripts build_pkg_scripts \
-  build_pkg_temp/${APP_NAME}-certs.pkg
-
 productbuild \
   --package build_pkg_temp/${APP_NAME}-component.pkg \
-  --package build_pkg_temp/${APP_NAME}-certs.pkg \
   "${PKG_NAME}"
 
 echo "PKG package created: ${PKG_NAME}"

scripts/windows/crossdesk.rc

@@ -0,0 +1,2 @@
+// Application icon (IDI_ICON1 = 1, which is the default app icon resource ID)
+IDI_ICON1 ICON "..\\..\\icons\\windows\\crossdesk.ico"

scripts/windows/nsis_script.nsi

@@ -12,9 +12,6 @@
 ; Installer icon path
 !define MUI_ICON "${__FILEDIR__}\..\..\icons\windows\crossdesk.ico"
 
-; Certificate path
-!define CERT_FILE "${__FILEDIR__}\..\..\certs\crossdesk.cn_root.crt"
-
 ; Compression settings
 SetCompressor /FINAL lzma
 
@@ -76,9 +73,6 @@ installApp:
 
     ; Main application executable path
     File /oname=crossdesk.exe "..\..\build\windows\x64\release\crossdesk.exe"
-    
-    ; Copy icon file to installation directory
-    File "${MUI_ICON}"
 
     ; Write uninstall information
     WriteUninstaller "$INSTDIR\uninstall.exe"
@@ -88,28 +82,18 @@ installApp:
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALL_REG_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALL_REG_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALL_REG_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALL_REG_KEY}" "DisplayIcon" "$INSTDIR\crossdesk.ico"
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALL_REG_KEY}" "DisplayIcon" "$INSTDIR\crossdesk.exe"
     WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALL_REG_KEY}" "NoModify" 1
     WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UNINSTALL_REG_KEY}" "NoRepair" 1
     WriteRegStr HKCU "Software\${PRODUCT_NAME}" "InstallDir" "$INSTDIR"
 SectionEnd
 
-; After installation
-Section -Post
-    ExecWait '"C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x86\mt.exe" -manifest "$INSTDIR\crossdesk.manifest" -outputresource:"$INSTDIR\crossdesk.exe";1'
-SectionEnd
-
-Section "Cert"
-    SetOutPath "$APPDATA\CrossDesk\certs"
-    File /r "${CERT_FILE}"
-SectionEnd
-
 Section -AdditionalIcons
     ; Desktop shortcut
-    CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\crossdesk.exe" "" "$INSTDIR\crossdesk.ico"
+    CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\crossdesk.exe" "" "$INSTDIR\crossdesk.exe"
 
     ; Start menu shortcut
-    CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}.lnk" "$INSTDIR\crossdesk.exe" "" "$INSTDIR\crossdesk.ico"
+    CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}.lnk" "$INSTDIR\crossdesk.exe" "" "$INSTDIR\crossdesk.exe"
 SectionEnd
 
 Section "Uninstall"

src/app/main.cpp

@@ -35,11 +35,8 @@ int main(int argc, char* argv[]) {
   bool enable_daemon = false;
   auto path_manager = std::make_unique<crossdesk::PathManager>("CrossDesk");
   if (path_manager) {
-    std::string cert_path =
-        (path_manager->GetCertPath() / "crossdesk.cn_root.crt").string();
     std::string cache_path = path_manager->GetCachePath().string();
-    crossdesk::ConfigCenter config_center(cache_path + "/config.ini",
-                                          cert_path);
+    crossdesk::ConfigCenter config_center(cache_path + "/config.ini");
     enable_daemon = config_center.IsEnableDaemon();
   }
 

src/common/window_util_mac.h

@@ -0,0 +1,25 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-01-20
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _WINDOW_UTIL_MAC_H_
+#define _WINDOW_UTIL_MAC_H_
+
+struct SDL_Window;
+
+namespace crossdesk {
+
+// Best-effort: keep an SDL window above normal windows on macOS.
+// No-op on non-macOS builds.
+void MacSetWindowAlwaysOnTop(::SDL_Window* window, bool always_on_top);
+
+// Best-effort: exclude an SDL window from the Window menu and window cycling.
+// Note: Cmd-Tab switches apps (not individual windows), so this primarily
+// affects the Window menu and Cmd-` window cycling.
+void MacSetWindowExcludedFromWindowMenu(::SDL_Window* window, bool excluded);
+
+}  // namespace crossdesk
+
+#endif

src/common/window_util_mac.mm

@@ -0,0 +1,64 @@
+#include "window_util_mac.h"
+
+#if defined(__APPLE__)
+
+#include <SDL3/SDL.h>
+
+#import <Cocoa/Cocoa.h>
+
+namespace crossdesk {
+
+static NSWindow* GetNSWindowFromSDL(::SDL_Window* window) {
+  if (!window) {
+    return nil;
+  }
+
+#if !defined(SDL_PROP_WINDOW_COCOA_WINDOW_POINTER)
+  return nil;
+#else
+  SDL_PropertiesID props = SDL_GetWindowProperties(window);
+  void* cocoa_window_ptr =
+      SDL_GetPointerProperty(props, SDL_PROP_WINDOW_COCOA_WINDOW_POINTER, NULL);
+  if (!cocoa_window_ptr) {
+    return nil;
+  }
+  return (__bridge NSWindow*)cocoa_window_ptr;
+#endif
+}
+
+void MacSetWindowAlwaysOnTop(::SDL_Window* window, bool always_on_top) {
+  NSWindow* ns_window = GetNSWindowFromSDL(window);
+  if (!ns_window) {
+    (void)always_on_top;
+    return;
+  }
+
+  // Keep above normal windows.
+  const NSInteger level = always_on_top ? NSFloatingWindowLevel : NSNormalWindowLevel;
+  [ns_window setLevel:level];
+
+  // Optional: keep visible across Spaces/fullscreen. Safe as best-effort.
+  NSWindowCollectionBehavior behavior = [ns_window collectionBehavior];
+  behavior |= NSWindowCollectionBehaviorCanJoinAllSpaces;
+  behavior |= NSWindowCollectionBehaviorFullScreenAuxiliary;
+  [ns_window setCollectionBehavior:behavior];
+}
+
+void MacSetWindowExcludedFromWindowMenu(::SDL_Window* window, bool excluded) {
+  NSWindow* ns_window = GetNSWindowFromSDL(window);
+  if (!ns_window) {
+    (void)excluded;
+    return;
+  }
+
+  [ns_window setExcludedFromWindowsMenu:excluded];
+
+  NSWindowCollectionBehavior behavior = [ns_window collectionBehavior];
+  behavior |= NSWindowCollectionBehaviorIgnoresCycle;
+  behavior |= NSWindowCollectionBehaviorTransient;
+  [ns_window setCollectionBehavior:behavior];
+}
+
+}  // namespace crossdesk
+
+#endif  // __APPLE__

src/config_center/config_center.cpp

@@ -5,11 +5,8 @@
 
 namespace crossdesk {
 
-ConfigCenter::ConfigCenter(const std::string& config_path,
-                           const std::string& cert_file_path)
-    : config_path_(config_path),
-      cert_file_path_(cert_file_path),
-      cert_file_path_default_(cert_file_path) {
+ConfigCenter::ConfigCenter(const std::string& config_path)
+    : config_path_(config_path) {
   ini_.SetUnicode(true);
   Load();
 }
@@ -70,71 +67,6 @@ int ConfigCenter::Load() {
   } else {
     coturn_server_port_ = 0;
   }
-  const char* cert_file_path_value =
-      ini_.GetValue(section_, "cert_file_path", nullptr);
-  if (cert_file_path_value != nullptr && strlen(cert_file_path_value) > 0) {
-    cert_file_path_ = cert_file_path_value;
-  } else {
-    cert_file_path_ = "";
-  }
-  const char* cert_fingerprint_value =
-      ini_.GetValue(section_, "cert_fingerprint", nullptr);
-  if (cert_fingerprint_value != nullptr && strlen(cert_fingerprint_value) > 0) {
-    cert_fingerprint_ = cert_fingerprint_value;
-  } else {
-    cert_fingerprint_ = "";
-  }
-  const char* cert_fingerprint_server_host_value =
-      ini_.GetValue(section_, "cert_fingerprint_server_host", nullptr);
-  if (cert_fingerprint_server_host_value != nullptr &&
-      strlen(cert_fingerprint_server_host_value) > 0) {
-    cert_fingerprint_server_host_ = cert_fingerprint_server_host_value;
-  } else {
-    cert_fingerprint_server_host_ = "";
-  }
-
-  const char* default_cert_fingerprint_value =
-      ini_.GetValue(section_, "default_cert_fingerprint", nullptr);
-  if (default_cert_fingerprint_value != nullptr &&
-      strlen(default_cert_fingerprint_value) > 0) {
-    default_cert_fingerprint_ = default_cert_fingerprint_value;
-  } else {
-    default_cert_fingerprint_ = "";
-  }
-  const char* default_cert_fingerprint_server_host_value =
-      ini_.GetValue(section_, "default_cert_fingerprint_server_host", nullptr);
-  if (default_cert_fingerprint_server_host_value != nullptr &&
-      strlen(default_cert_fingerprint_server_host_value) > 0) {
-    default_cert_fingerprint_server_host_ =
-        default_cert_fingerprint_server_host_value;
-  } else {
-    default_cert_fingerprint_server_host_ = "";
-  }
-
-  if (enable_self_hosted_ && !cert_fingerprint_.empty() &&
-      !cert_fingerprint_server_host_.empty() &&
-      signal_server_host_ != cert_fingerprint_server_host_) {
-    LOG_INFO("Server IP changed from {} to {}, clearing old fingerprint",
-             cert_fingerprint_server_host_, signal_server_host_);
-    cert_fingerprint_.clear();
-    cert_fingerprint_server_host_.clear();
-    ini_.Delete(section_, "cert_fingerprint", false);
-    ini_.Delete(section_, "cert_fingerprint_server_host", false);
-    ini_.SaveFile(config_path_.c_str());
-  }
-
-  if (!enable_self_hosted_ && !default_cert_fingerprint_.empty() &&
-      !default_cert_fingerprint_server_host_.empty() &&
-      signal_server_host_default_ != default_cert_fingerprint_server_host_) {
-    LOG_INFO(
-        "Default server IP changed from {} to {}, clearing old fingerprint",
-        default_cert_fingerprint_server_host_, signal_server_host_default_);
-    default_cert_fingerprint_.clear();
-    default_cert_fingerprint_server_host_.clear();
-    ini_.Delete(section_, "default_cert_fingerprint", false);
-    ini_.Delete(section_, "default_cert_fingerprint_server_host", false);
-    ini_.SaveFile(config_path_.c_str());
-  }
 
   enable_autostart_ =
       ini_.GetBoolValue(section_, "enable_autostart", enable_autostart_);
@@ -142,6 +74,15 @@ int ConfigCenter::Load() {
   enable_minimize_to_tray_ = ini_.GetBoolValue(
       section_, "enable_minimize_to_tray", enable_minimize_to_tray_);
 
+  const char* file_transfer_save_path_value =
+      ini_.GetValue(section_, "file_transfer_save_path", nullptr);
+  if (file_transfer_save_path_value != nullptr &&
+      strlen(file_transfer_save_path_value) > 0) {
+    file_transfer_save_path_ = file_transfer_save_path_value;
+  } else {
+    file_transfer_save_path_ = "";
+  }
+
   return 0;
 }
 
@@ -165,19 +106,6 @@ int ConfigCenter::Save() {
                       static_cast<long>(signal_server_port_));
     ini_.SetLongValue(section_, "coturn_server_port",
                       static_cast<long>(coturn_server_port_));
-    ini_.SetValue(section_, "cert_file_path", cert_file_path_.c_str());
-    if (!cert_fingerprint_.empty()) {
-      ini_.SetValue(section_, "cert_fingerprint", cert_fingerprint_.c_str());
-      ini_.SetValue(section_, "cert_fingerprint_server_host",
-                    cert_fingerprint_server_host_.c_str());
-    }
-  }
-
-  if (!default_cert_fingerprint_.empty()) {
-    ini_.SetValue(section_, "default_cert_fingerprint",
-                  default_cert_fingerprint_.c_str());
-    ini_.SetValue(section_, "default_cert_fingerprint_server_host",
-                  default_cert_fingerprint_server_host_.c_str());
   }
 
   ini_.SetBoolValue(section_, "enable_autostart", enable_autostart_);
@@ -185,6 +113,9 @@ int ConfigCenter::Save() {
   ini_.SetBoolValue(section_, "enable_minimize_to_tray",
                     enable_minimize_to_tray_);
 
+  ini_.SetValue(section_, "file_transfer_save_path",
+                file_transfer_save_path_.c_str());
+
   SI_Error rc = ini_.SaveFile(config_path_.c_str());
   if (rc < 0) {
     return -1;
@@ -270,15 +201,6 @@ int ConfigCenter::SetSrtp(bool enable_srtp) {
 }
 
 int ConfigCenter::SetServerHost(const std::string& signal_server_host) {
-  if (enable_self_hosted_ && !cert_fingerprint_.empty() &&
-      signal_server_host != signal_server_host_) {
-    LOG_INFO("Server IP changed from {} to {}, clearing old fingerprint",
-             signal_server_host_, signal_server_host);
-    cert_fingerprint_.clear();
-    cert_fingerprint_server_host_.clear();
-    ini_.Delete(section_, "cert_fingerprint", false);
-    ini_.Delete(section_, "cert_fingerprint_server_host", false);
-  }
   signal_server_host_ = signal_server_host;
   ini_.SetValue(section_, "signal_server_host", signal_server_host_.c_str());
   SI_Error rc = ini_.SaveFile(config_path_.c_str());
@@ -310,67 +232,6 @@ int ConfigCenter::SetCoturnServerPort(int coturn_server_port) {
   return 0;
 }
 
-int ConfigCenter::SetCertFilePath(const std::string& cert_file_path) {
-  cert_file_path_ = cert_file_path;
-  ini_.SetValue(section_, "cert_file_path", cert_file_path_.c_str());
-  SI_Error rc = ini_.SaveFile(config_path_.c_str());
-  if (rc < 0) {
-    return -1;
-  }
-  return 0;
-}
-
-int ConfigCenter::SetCertFingerprint(const std::string& fingerprint) {
-  cert_fingerprint_ = fingerprint;
-  cert_fingerprint_server_host_ = signal_server_host_;
-  ini_.SetValue(section_, "cert_fingerprint", cert_fingerprint_.c_str());
-  ini_.SetValue(section_, "cert_fingerprint_server_host",
-                cert_fingerprint_server_host_.c_str());
-  SI_Error rc = ini_.SaveFile(config_path_.c_str());
-  if (rc < 0) {
-    return -1;
-  }
-  return 0;
-}
-
-int ConfigCenter::SetDefaultCertFingerprint(const std::string& fingerprint) {
-  default_cert_fingerprint_ = fingerprint;
-  default_cert_fingerprint_server_host_ = signal_server_host_default_;
-  ini_.SetValue(section_, "default_cert_fingerprint",
-                default_cert_fingerprint_.c_str());
-  ini_.SetValue(section_, "default_cert_fingerprint_server_host",
-                default_cert_fingerprint_server_host_.c_str());
-  SI_Error rc = ini_.SaveFile(config_path_.c_str());
-  if (rc < 0) {
-    return -1;
-  }
-  return 0;
-}
-
-int ConfigCenter::ClearCertFingerprint() {
-  cert_fingerprint_.clear();
-  cert_fingerprint_server_host_.clear();
-  ini_.Delete(section_, "cert_fingerprint", false);
-  ini_.Delete(section_, "cert_fingerprint_server_host", false);
-  SI_Error rc = ini_.SaveFile(config_path_.c_str());
-  if (rc < 0) {
-    return -1;
-  }
-  return 0;
-}
-
-int ConfigCenter::ClearDefaultCertFingerprint() {
-  default_cert_fingerprint_.clear();
-  default_cert_fingerprint_server_host_.clear();
-  ini_.Delete(section_, "default_cert_fingerprint", false);
-  ini_.Delete(section_, "default_cert_fingerprint_server_host", false);
-  SI_Error rc = ini_.SaveFile(config_path_.c_str());
-  if (rc < 0) {
-    return -1;
-  }
-  return 0;
-}
-
 int ConfigCenter::SetSelfHosted(bool enable_self_hosted) {
   enable_self_hosted_ = enable_self_hosted;
   ini_.SetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);
@@ -397,45 +258,12 @@ int ConfigCenter::SetSelfHosted(bool enable_self_hosted) {
       coturn_server_port_ = static_cast<int>(
           ini_.GetLongValue(section_, "coturn_server_port", 0));
     }
-    const char* cert_file_path_value =
-        ini_.GetValue(section_, "cert_file_path", nullptr);
-    if (cert_file_path_value != nullptr && strlen(cert_file_path_value) > 0) {
-      cert_file_path_ = cert_file_path_value;
-    }
-    const char* cert_fingerprint_value =
-        ini_.GetValue(section_, "cert_fingerprint", nullptr);
-    if (cert_fingerprint_value != nullptr &&
-        strlen(cert_fingerprint_value) > 0) {
-      cert_fingerprint_ = cert_fingerprint_value;
-    }
-    const char* cert_fingerprint_server_host_value =
-        ini_.GetValue(section_, "cert_fingerprint_server_host", nullptr);
-    if (cert_fingerprint_server_host_value != nullptr &&
-        strlen(cert_fingerprint_server_host_value) > 0) {
-      cert_fingerprint_server_host_ = cert_fingerprint_server_host_value;
-    }
-
-    if (!cert_fingerprint_.empty() && !cert_fingerprint_server_host_.empty() &&
-        signal_server_host_ != cert_fingerprint_server_host_) {
-      LOG_INFO("Server IP changed from {} to {}, clearing old fingerprint",
-               cert_fingerprint_server_host_, signal_server_host_);
-      cert_fingerprint_.clear();
-      cert_fingerprint_server_host_.clear();
-      ini_.Delete(section_, "cert_fingerprint", false);
-      ini_.Delete(section_, "cert_fingerprint_server_host", false);
-    }
 
     ini_.SetValue(section_, "signal_server_host", signal_server_host_.c_str());
     ini_.SetLongValue(section_, "signal_server_port",
                       static_cast<long>(signal_server_port_));
     ini_.SetLongValue(section_, "coturn_server_port",
                       static_cast<long>(coturn_server_port_));
-    ini_.SetValue(section_, "cert_file_path", cert_file_path_.c_str());
-    if (!cert_fingerprint_.empty()) {
-      ini_.SetValue(section_, "cert_fingerprint", cert_fingerprint_.c_str());
-      ini_.SetValue(section_, "cert_fingerprint_server_host",
-                    cert_fingerprint_server_host_.c_str());
-    }
   }
 
   SI_Error rc = ini_.SaveFile(config_path_.c_str());
@@ -523,16 +351,6 @@ int ConfigCenter::GetSignalServerPort() const { return signal_server_port_; }
 
 int ConfigCenter::GetCoturnServerPort() const { return coturn_server_port_; }
 
-std::string ConfigCenter::GetCertFilePath() const { return cert_file_path_; }
-
-std::string ConfigCenter::GetCertFingerprint() const {
-  return cert_fingerprint_;
-}
-
-std::string ConfigCenter::GetDefaultCertFingerprint() const {
-  return default_cert_fingerprint_;
-}
-
 std::string ConfigCenter::GetDefaultServerHost() const {
   return signal_server_host_default_;
 }
@@ -545,10 +363,6 @@ int ConfigCenter::GetDefaultCoturnServerPort() const {
   return coturn_server_port_default_;
 }
 
-std::string ConfigCenter::GetDefaultCertFilePath() const {
-  return cert_file_path_default_;
-}
-
 bool ConfigCenter::IsSelfHosted() const { return enable_self_hosted_; }
 
 bool ConfigCenter::IsMinimizeToTray() const { return enable_minimize_to_tray_; }
@@ -556,4 +370,19 @@ bool ConfigCenter::IsMinimizeToTray() const { return enable_minimize_to_tray_; }
 bool ConfigCenter::IsEnableAutostart() const { return enable_autostart_; }
 
 bool ConfigCenter::IsEnableDaemon() const { return enable_daemon_; }
+
+int ConfigCenter::SetFileTransferSavePath(const std::string& path) {
+  file_transfer_save_path_ = path;
+  ini_.SetValue(section_, "file_transfer_save_path",
+                file_transfer_save_path_.c_str());
+  SI_Error rc = ini_.SaveFile(config_path_.c_str());
+  if (rc < 0) {
+    return -1;
+  }
+  return 0;
+}
+
+std::string ConfigCenter::GetFileTransferSavePath() const {
+  return file_transfer_save_path_;
+}
 }  // namespace crossdesk

src/config_center/config_center.h

@@ -21,9 +21,7 @@ class ConfigCenter {
   enum class VIDEO_ENCODE_FORMAT { H264 = 0, AV1 = 1 };
 
  public:
-  explicit ConfigCenter(
-      const std::string& config_path = "config.ini",
-      const std::string& cert_file_path = "crossdesk.cn_root.crt");
+  explicit ConfigCenter(const std::string& config_path = "config.ini");
   ~ConfigCenter();
 
   // write config
@@ -37,15 +35,11 @@ class ConfigCenter {
   int SetServerHost(const std::string& signal_server_host);
   int SetServerPort(int signal_server_port);
   int SetCoturnServerPort(int coturn_server_port);
-  int SetCertFilePath(const std::string& cert_file_path);
-  int SetCertFingerprint(const std::string& fingerprint);
-  int SetDefaultCertFingerprint(const std::string& fingerprint);
-  int ClearCertFingerprint();
-  int ClearDefaultCertFingerprint();
   int SetSelfHosted(bool enable_self_hosted);
   int SetMinimizeToTray(bool enable_minimize_to_tray);
   int SetAutostart(bool enable_autostart);
   int SetDaemon(bool enable_daemon);
+  int SetFileTransferSavePath(const std::string& path);
 
   // read config
 
@@ -59,17 +53,14 @@ class ConfigCenter {
   std::string GetSignalServerHost() const;
   int GetSignalServerPort() const;
   int GetCoturnServerPort() const;
-  std::string GetCertFilePath() const;
-  std::string GetCertFingerprint() const;
-  std::string GetDefaultCertFingerprint() const;
   std::string GetDefaultServerHost() const;
   int GetDefaultSignalServerPort() const;
   int GetDefaultCoturnServerPort() const;
-  std::string GetDefaultCertFilePath() const;
   bool IsSelfHosted() const;
   bool IsMinimizeToTray() const;
   bool IsEnableAutostart() const;
   bool IsEnableDaemon() const;
+  std::string GetFileTransferSavePath() const;
 
   int Load();
   int Save();
@@ -92,16 +83,11 @@ class ConfigCenter {
   int server_port_default_ = 9099;
   int coturn_server_port_ = 0;
   int coturn_server_port_default_ = 3478;
-  std::string cert_file_path_ = "";
-  std::string cert_file_path_default_ = "";
-  std::string cert_fingerprint_ = "";
-  std::string cert_fingerprint_server_host_ = "";
-  std::string default_cert_fingerprint_ = "";
-  std::string default_cert_fingerprint_server_host_ = "";
   bool enable_self_hosted_ = false;
   bool enable_minimize_to_tray_ = false;
   bool enable_autostart_ = false;
   bool enable_daemon_ = false;
+  std::string file_transfer_save_path_ = "";
 };
 }  // namespace crossdesk
 #endif

src/gui/assets/localization/localization.h

@@ -112,13 +112,8 @@ static std::vector<std::string> self_hosted_server_port = {
     reinterpret_cast<const char*>(u8"信令服务端口:"), "Signal Service Port:"};
 static std::vector<std::string> self_hosted_server_coturn_server_port = {
     reinterpret_cast<const char*>(u8"中继服务端口:"), "Relay Service Port:"};
-static std::vector<std::string> self_hosted_server_certificate_path = {
-    reinterpret_cast<const char*>(u8"证书文件路径:"), "Certificate File Path:"};
 static std::vector<std::string> select_a_file = {
     reinterpret_cast<const char*>(u8"请选择文件"), "Please select a file"};
-static std::vector<std::string> reset_cert_fingerprint = {
-    reinterpret_cast<const char*>(u8"重置证书指纹"),
-    "Reset Certificate Fingerprint"};
 static std::vector<std::string> ok = {reinterpret_cast<const char*>(u8"确认"),
                                       "OK"};
 static std::vector<std::string> cancel = {
@@ -197,6 +192,19 @@ static std::vector<std::string> completed = {
     reinterpret_cast<const char*>(u8"已完成"), "Completed"};
 static std::vector<std::string> failed = {
     reinterpret_cast<const char*>(u8"失败"), "Failed"};
+static std::vector<std::string> controller = {
+    reinterpret_cast<const char*>(u8"控制端:"), "Controller:"};
+static std::vector<std::string> file_transfer = {
+    reinterpret_cast<const char*>(u8"文件传输:"), "File Transfer:"};
+static std::vector<std::string> connection_status = {
+    reinterpret_cast<const char*>(u8"连接状态:"), "Connection Status:"};
+static std::vector<std::string> file_transfer_save_path = {
+    reinterpret_cast<const char*>(u8"文件接收保存路径:"),
+    "File Transfer Save Path:"};
+static std::vector<std::string> browse = {
+    reinterpret_cast<const char*>(u8"浏览"), "Browse"};
+static std::vector<std::string> default_desktop = {
+    reinterpret_cast<const char*>(u8"桌面"), "Desktop"};
 
 #if _WIN32
 static std::vector<std::string> minimize_to_tray = {

src/gui/render.h

@@ -42,11 +42,46 @@
 namespace crossdesk {
 class Render {
  public:
+  struct FileTransferState {
+    std::atomic<bool> file_sending_ = false;
+    std::atomic<uint64_t> file_sent_bytes_ = 0;
+    std::atomic<uint64_t> file_total_bytes_ = 0;
+    std::atomic<uint32_t> file_send_rate_bps_ = 0;
+    std::mutex file_transfer_mutex_;
+    std::chrono::steady_clock::time_point file_send_start_time_;
+    std::chrono::steady_clock::time_point file_send_last_update_time_;
+    uint64_t file_send_last_bytes_ = 0;
+    bool file_transfer_window_visible_ = false;
+    std::atomic<uint32_t> current_file_id_{0};
+
+    struct QueuedFile {
+      std::filesystem::path file_path;
+      std::string file_label;
+      std::string remote_id;
+    };
+    std::queue<QueuedFile> file_send_queue_;
+    std::mutex file_queue_mutex_;
+
+    enum class FileTransferStatus { Queued, Sending, Completed, Failed };
+
+    struct FileTransferInfo {
+      std::string file_name;
+      std::filesystem::path file_path;
+      uint64_t file_size = 0;
+      FileTransferStatus status = FileTransferStatus::Queued;
+      uint64_t sent_bytes = 0;
+      uint32_t file_id = 0;
+      uint32_t rate_bps = 0;
+    };
+    std::vector<FileTransferInfo> file_transfer_list_;
+    std::mutex file_transfer_list_mutex_;
+  };
+
   struct SubStreamWindowProperties {
     Params params_;
     PeerPtr* peer_ = nullptr;
     std::string audio_label_ = "control_audio";
-    std::string data_label_ = "control_data";
+    std::string data_label_ = "data";
     std::string file_label_ = "file";
     std::string control_data_label_ = "control_data";
     std::string file_feedback_label_ = "file_feedback";
@@ -88,8 +123,13 @@ class Render {
     float mouse_diff_control_bar_pos_y_ = 0;
     double control_bar_button_pressed_time_ = 0;
     double net_traffic_stats_button_pressed_time_ = 0;
-    unsigned char* dst_buffer_ = nullptr;
-    size_t dst_buffer_capacity_ = 0;
+    // Double-buffered NV12 frame storage. Written by decode callback thread,
+    // consumed by SDL main thread.
+    std::mutex video_frame_mutex_;
+    std::shared_ptr<std::vector<unsigned char>> front_frame_;
+    std::shared_ptr<std::vector<unsigned char>> back_frame_;
+    bool render_rect_dirty_ = false;
+    bool stream_cleanup_pending_ = false;
     float mouse_pos_x_ = 0;
     float mouse_pos_y_ = 0;
     float mouse_pos_x_last_ = 0;
@@ -129,38 +169,10 @@ class Render {
     std::chrono::steady_clock::time_point last_time_;
     XNetTrafficStats net_traffic_stats_;
 
-    // File transfer progress
-    std::atomic<bool> file_sending_ = false;
-    std::atomic<uint64_t> file_sent_bytes_ = 0;
-    std::atomic<uint64_t> file_total_bytes_ = 0;
-    std::atomic<uint32_t> file_send_rate_bps_ = 0;
-    std::mutex file_transfer_mutex_;
-    std::chrono::steady_clock::time_point file_send_start_time_;
-    std::chrono::steady_clock::time_point file_send_last_update_time_;
-    uint64_t file_send_last_bytes_ = 0;
-    bool file_transfer_window_visible_ = false;
-    std::atomic<uint32_t> current_file_id_{0};
-
-    struct QueuedFile {
-      std::filesystem::path file_path;
-      std::string file_label;
-    };
-    std::queue<QueuedFile> file_send_queue_;
-    std::mutex file_queue_mutex_;
-
-    enum class FileTransferStatus { Queued, Sending, Completed, Failed };
-
-    struct FileTransferInfo {
-      std::string file_name;
-      std::filesystem::path file_path;
-      uint64_t file_size = 0;
-      FileTransferStatus status = FileTransferStatus::Queued;
-      uint64_t sent_bytes = 0;
-      uint32_t file_id = 0;
-      uint32_t rate_bps = 0;
-    };
-    std::vector<FileTransferInfo> file_transfer_list_;
-    std::mutex file_transfer_list_mutex_;
+    using QueuedFile = FileTransferState::QueuedFile;
+    using FileTransferStatus = FileTransferState::FileTransferStatus;
+    using FileTransferInfo = FileTransferState::FileTransferInfo;
+    FileTransferState file_transfer_;
   };
 
  public:
@@ -181,6 +193,7 @@ class Render {
   void UpdateInteractions();
   void HandleRecentConnections();
   void HandleStreamWindow();
+  void HandleServerWindow();
   void Cleanup();
   void CleanupFactories();
   void CleanupPeer(std::shared_ptr<SubStreamWindowProperties> props);
@@ -190,18 +203,29 @@ class Render {
   void UpdateRenderRect();
   void ProcessSdlEvent(const SDL_Event& event);
 
+  void ProcessFileDropEvent(const SDL_Event& event);
+
+  void ProcessSelectedFile(
+      const std::string& path,
+      const std::shared_ptr<SubStreamWindowProperties>& props,
+      const std::string& file_label, const std::string& remote_id = "");
+
+  std::shared_ptr<SubStreamWindowProperties>
+  GetSubStreamWindowPropertiesByRemoteId(const std::string& remote_id);
+
  private:
   int CreateStreamRenderWindow();
   int TitleBar(bool main_window);
   int MainWindow();
   int UpdateNotificationWindow();
   int StreamWindow();
+  int ServerWindow();
+  int RemoteClientInfoWindow();
   int LocalWindow();
   int RemoteWindow();
   int RecentConnectionsWindow();
   int SettingWindow();
   int SelfHostedServerWindow();
-  int ShowSimpleFileBrowser();
   int ControlWindow(std::shared_ptr<SubStreamWindowProperties>& props);
   int ControlBar(std::shared_ptr<SubStreamWindowProperties>& props);
   int AboutWindow();
@@ -212,6 +236,7 @@ class Render {
   void Hyperlink(const std::string& label, const std::string& url,
                  const float window_width);
   int FileTransferWindow(std::shared_ptr<SubStreamWindowProperties>& props);
+  std::string OpenFileDialog(std::string title);
 
  private:
   int ConnectTo(const std::string& remote_id, const char* password,
@@ -220,11 +245,15 @@ class Render {
   int DestroyMainWindow();
   int CreateStreamWindow();
   int DestroyStreamWindow();
-  int SetupFontAndStyle(bool main_window);
+  int CreateServerWindow();
+  int DestroyServerWindow();
+  int SetupFontAndStyle(ImFont** system_chinese_font_out);
   int DestroyMainWindowContext();
   int DestroyStreamWindowContext();
+  int DestroyServerWindowContext();
   int DrawMainWindow();
   int DrawStreamWindow();
+  int DrawServerWindow();
   int ConfirmDeleteConnection();
   int NetTrafficStats(std::shared_ptr<SubStreamWindowProperties>& props);
   void DrawConnectionStatusText(
@@ -260,11 +289,11 @@ class Render {
   static void OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
                                    size_t user_id_size, void* user_data);
 
-  static void NetStatusReport(const char* client_id, size_t client_id_size,
-                              TraversalMode mode,
-                              const XNetTrafficStats* net_traffic_stats,
-                              const char* user_id, const size_t user_id_size,
-                              void* user_data);
+  static void OnNetStatusReport(const char* client_id, size_t client_id_size,
+                                TraversalMode mode,
+                                const XNetTrafficStats* net_traffic_stats,
+                                const char* user_id, const size_t user_id_size,
+                                void* user_data);
 
   static SDL_HitTestResult HitTestCallback(SDL_Window* window,
                                            const SDL_Point* area, void* data);
@@ -305,7 +334,8 @@ class Render {
   // File transfer helper functions
   void StartFileTransfer(std::shared_ptr<SubStreamWindowProperties> props,
                          const std::filesystem::path& file_path,
-                         const std::string& file_label);
+                         const std::string& file_label,
+                         const std::string& remote_id = "");
   void ProcessFileQueue(std::shared_ptr<SubStreamWindowProperties> props);
 
   int AudioDeviceInit();
@@ -350,7 +380,6 @@ class Render {
   ConfigCenter::LANGUAGE localization_language_ =
       ConfigCenter::LANGUAGE::CHINESE;
   std::unique_ptr<PathManager> path_manager_;
-  std::string cert_path_;
   std::string exec_log_path_;
   std::string dll_log_path_;
   std::string cache_path_;
@@ -383,6 +412,7 @@ class Render {
   ImGuiContext* main_ctx_ = nullptr;
   ImFont* main_windows_system_chinese_font_ = nullptr;
   ImFont* stream_windows_system_chinese_font_ = nullptr;
+  ImFont* server_windows_system_chinese_font_ = nullptr;
   bool exit_ = false;
   const int sdl_refresh_ms_ = 16;  // ~60 FPS
 #if _WIN32
@@ -405,6 +435,9 @@ class Render {
   bool keyboard_capturer_is_started_ = false;
   bool foucs_on_main_window_ = false;
   bool foucs_on_stream_window_ = false;
+  bool main_window_minimized_ = false;
+  uint32_t last_main_minimize_request_tick_ = 0;
+  uint32_t last_stream_minimize_request_tick_ = 0;
   bool audio_capture_ = false;
   int main_window_width_real_ = 720;
   int main_window_height_real_ = 540;
@@ -454,7 +487,7 @@ class Render {
   bool just_created_ = false;
   std::string controlled_remote_id_ = "";
   std::string focused_remote_id_ = "";
-  bool need_to_send_host_info_ = false;
+  std::string remote_client_id_ = "";
   SDL_Event last_mouse_event;
   SDL_AudioStream* output_stream_;
   uint32_t STREAM_REFRESH_EVENT = 0;
@@ -481,6 +514,42 @@ class Render {
   float stream_window_dpi_scaling_w_ = 1.0f;
   float stream_window_dpi_scaling_h_ = 1.0f;
 
+  // server window render
+  SDL_Window* server_window_ = nullptr;
+  SDL_Renderer* server_renderer_ = nullptr;
+  ImGuiContext* server_ctx_ = nullptr;
+
+  // server window properties
+  bool need_to_create_server_window_ = false;
+  bool need_to_destroy_server_window_ = false;
+  bool server_window_created_ = false;
+  bool server_window_inited_ = false;
+  int server_window_width_default_ = 250;
+  int server_window_height_default_ = 150;
+  float server_window_width_ = 250;
+  float server_window_height_ = 150;
+  float server_window_title_bar_height_ = 30.0f;
+  SDL_PixelFormat server_pixformat_ = SDL_PIXELFORMAT_NV12;
+  int server_window_normal_width_ = 250;
+  int server_window_normal_height_ = 150;
+  float server_window_dpi_scaling_w_ = 1.0f;
+  float server_window_dpi_scaling_h_ = 1.0f;
+
+  // server window collapsed mode
+  bool server_window_collapsed_ = false;
+  bool server_window_collapsed_dragging_ = false;
+  float server_window_collapsed_drag_start_mouse_x_ = 0.0f;
+  float server_window_collapsed_drag_start_mouse_y_ = 0.0f;
+  int server_window_collapsed_drag_start_win_x_ = 0;
+  int server_window_collapsed_drag_start_win_y_ = 0;
+
+  // server window drag normal mode
+  bool server_window_dragging_ = false;
+  float server_window_drag_start_mouse_x_ = 0.0f;
+  float server_window_drag_start_mouse_y_ = 0.0f;
+  int server_window_drag_start_win_x_ = 0;
+  int server_window_drag_start_win_y_ = 0;
+
   bool label_inited_ = false;
   bool connect_button_pressed_ = false;
   bool password_validating_ = false;
@@ -497,6 +566,7 @@ class Render {
   bool fullscreen_button_pressed_ = false;
   bool focus_on_input_widget_ = true;
   bool is_client_mode_ = false;
+  bool is_server_mode_ = false;
   bool reload_recent_connections_ = true;
   bool show_confirm_delete_connection_ = false;
   bool delete_connection_ = false;
@@ -523,6 +593,10 @@ class Render {
   std::unordered_map<uint32_t, std::weak_ptr<SubStreamWindowProperties>>
       file_id_to_props_;
   std::shared_mutex file_id_to_props_mutex_;
+
+  // Map file_id to FileTransferState for global file transfer (props == null)
+  std::unordered_map<uint32_t, FileTransferState*> file_id_to_transfer_state_;
+  std::shared_mutex file_id_to_transfer_state_mutex_;
   SDL_AudioDeviceID input_dev_;
   SDL_AudioDeviceID output_dev_;
   ScreenCapturerFactory* screen_capturer_factory_ = nullptr;
@@ -536,8 +610,8 @@ class Render {
   uint64_t last_frame_time_;
   bool show_new_version_icon_ = false;
   bool show_new_version_icon_in_menu_ = true;
-  uint64_t new_version_icon_last_trigger_time_ = 0;
-  uint64_t new_version_icon_render_start_time_ = 0;
+  double new_version_icon_last_trigger_time_ = 0.0;
+  double new_version_icon_render_start_time_ = 0.0;
 #ifdef __APPLE__
   bool show_request_permission_window_ = true;
 #endif
@@ -557,7 +631,6 @@ class Render {
   char signal_server_ip_[256] = "api.crossdesk.cn";
   char signal_server_port_[6] = "9099";
   char coturn_server_port_[6] = "3478";
-  char cert_file_path_[256] = "";
   bool enable_self_hosted_ = false;
   int language_button_value_last_ = 0;
   int video_quality_button_value_last_ = 0;
@@ -573,10 +646,11 @@ class Render {
   bool enable_daemon_last_ = false;
   bool enable_minimize_to_tray_ = false;
   bool enable_minimize_to_tray_last_ = false;
+  char file_transfer_save_path_buf_[512] = "";
+  std::string file_transfer_save_path_last_ = "";
   char signal_server_ip_self_[256] = "";
   char signal_server_port_self_[6] = "";
   char coturn_server_port_self_[6] = "";
-  std::string tls_cert_path_self_ = "";
   bool settings_window_pos_reset_ = true;
   bool self_hosted_server_config_window_pos_reset_ = true;
   std::string selected_current_file_path_ = "";
@@ -597,6 +671,10 @@ class Render {
 
   /* ------ server mode ------ */
   std::unordered_map<std::string, ConnectionStatus> connection_status_;
+  std::unordered_map<std::string, std::string> connection_host_names_;
+  std::string selected_server_remote_id_ = "";
+  std::string selected_server_remote_hostname_ = "";
+  FileTransferState file_transfer_;
 };
 }  // namespace crossdesk
 #endif

src/gui/render_callback.cpp

@@ -4,6 +4,7 @@
 #include <cstring>
 #include <filesystem>
 #include <fstream>
+#include <limits>
 #include <unordered_map>
 
 #include "clipboard.h"
@@ -237,31 +238,31 @@ void Render::OnReceiveVideoBufferCb(const XVideoFrame* video_frame,
       render->client_properties_.find(remote_id)->second.get();
 
   if (props->connection_established_) {
-    if (!props->dst_buffer_) {
-      props->dst_buffer_capacity_ = video_frame->size;
-      props->dst_buffer_ = new unsigned char[video_frame->size];
-    }
+    {
+      std::lock_guard<std::mutex> lock(props->video_frame_mutex_);
 
-    if (props->dst_buffer_capacity_ < video_frame->size) {
-      delete props->dst_buffer_;
-      props->dst_buffer_capacity_ = video_frame->size;
-      props->dst_buffer_ = new unsigned char[video_frame->size];
-    }
+      if (!props->back_frame_) {
+        props->back_frame_ =
+            std::make_shared<std::vector<unsigned char>>(video_frame->size);
+      }
+      if (props->back_frame_->size() != video_frame->size) {
+        props->back_frame_->resize(video_frame->size);
+      }
 
-    memcpy(props->dst_buffer_, video_frame->data, video_frame->size);
-    bool need_to_update_render_rect = false;
-    if (props->video_width_ != props->video_width_last_ ||
-        props->video_height_ != props->video_height_last_) {
-      need_to_update_render_rect = true;
-      props->video_width_last_ = props->video_width_;
-      props->video_height_last_ = props->video_height_;
-    }
-    props->video_width_ = video_frame->width;
-    props->video_height_ = video_frame->height;
-    props->video_size_ = video_frame->size;
+      std::memcpy(props->back_frame_->data(), video_frame->data,
+                  video_frame->size);
 
-    if (need_to_update_render_rect) {
-      render->UpdateRenderRect();
+      const bool size_changed = (props->video_width_ != video_frame->width) ||
+                                (props->video_height_ != video_frame->height);
+      if (size_changed) {
+        props->render_rect_dirty_ = true;
+      }
+
+      props->video_width_ = video_frame->width;
+      props->video_height_ = video_frame->height;
+      props->video_size_ = video_frame->size;
+
+      props->front_frame_.swap(props->back_frame_);
     }
 
     SDL_Event event;
@@ -320,7 +321,28 @@ void Render::OnReceiveDataBufferCb(const char* data, size_t size,
     std::string remote_user_id = std::string(user_id, user_id_size);
 
     static FileReceiver receiver;
-    receiver.SetOnSendAck([render](const FileTransferAck& ack) -> int {
+    // Update output directory from config
+    std::string configured_path =
+        render->config_center_->GetFileTransferSavePath();
+    if (!configured_path.empty()) {
+      receiver.SetOutputDir(std::filesystem::u8path(configured_path));
+    } else if (receiver.OutputDir().empty()) {
+      receiver = FileReceiver();  // re-init with default desktop path
+    }
+    receiver.SetOnSendAck([render,
+                           remote_user_id](const FileTransferAck& ack) -> int {
+      bool is_server_sending = remote_user_id.rfind("C-", 0) != 0;
+      if (is_server_sending) {
+        auto props =
+            render->GetSubStreamWindowPropertiesByRemoteId(remote_user_id);
+        if (props) {
+          PeerPtr* peer = props->peer_;
+          return SendReliableDataFrame(
+              peer, reinterpret_cast<const char*>(&ack),
+              sizeof(FileTransferAck), render->file_feedback_label_.c_str());
+        }
+      }
+
       return SendReliableDataFrame(
           render->peer_, reinterpret_cast<const char*>(&ack),
           sizeof(FileTransferAck), render->file_feedback_label_.c_str());
@@ -361,42 +383,100 @@ void Render::OnReceiveDataBufferCb(const char* data, size_t size,
       }
     }
 
+    Render::FileTransferState* state = nullptr;
     if (!props) {
-      LOG_WARN("FileTransferAck: no props found for file_id={}", ack.file_id);
-      return;
+      {
+        std::shared_lock lock(render->file_id_to_transfer_state_mutex_);
+        auto it = render->file_id_to_transfer_state_.find(ack.file_id);
+        if (it != render->file_id_to_transfer_state_.end()) {
+          state = it->second;
+        }
+      }
+
+      if (!state) {
+        LOG_WARN("FileTransferAck: no props/state found for file_id={}",
+                 ack.file_id);
+        return;
+      }
+    } else {
+      state = &props->file_transfer_;
     }
 
     // Update progress based on ACK
-    props->file_sent_bytes_ = ack.acked_offset;
-    props->file_total_bytes_ = ack.total_size;
+    state->file_sent_bytes_ = ack.acked_offset;
+    state->file_total_bytes_ = ack.total_size;
 
     uint32_t rate_bps = 0;
     {
-      uint32_t data_channel_bitrate =
-          props->net_traffic_stats_.data_outbound_stats.bitrate;
+      if (props) {
+        uint32_t data_channel_bitrate =
+            props->net_traffic_stats_.data_outbound_stats.bitrate;
 
-      if (data_channel_bitrate > 0 && props->file_sending_.load()) {
-        rate_bps = static_cast<uint32_t>(data_channel_bitrate * 0.99f);
+        if (data_channel_bitrate > 0 && state->file_sending_.load()) {
+          rate_bps = static_cast<uint32_t>(data_channel_bitrate * 0.99f);
 
-        uint32_t current_rate = props->file_send_rate_bps_.load();
-        if (current_rate > 0) {
-          // 70% old + 30% new for smoother display
-          rate_bps = static_cast<uint32_t>(current_rate * 0.7 + rate_bps * 0.3);
+          uint32_t current_rate = state->file_send_rate_bps_.load();
+          if (current_rate > 0) {
+            // 70% old + 30% new for smoother display
+            rate_bps =
+                static_cast<uint32_t>(current_rate * 0.7 + rate_bps * 0.3);
+          }
+        } else {
+          rate_bps = state->file_send_rate_bps_.load();
         }
       } else {
-        rate_bps = props->file_send_rate_bps_.load();
+        // Global transfer: no per-connection bitrate available.
+        // Estimate send rate from ACKed bytes delta over time.
+        const uint32_t current_rate = state->file_send_rate_bps_.load();
+        uint32_t estimated_rate_bps = 0;
+        const auto now = std::chrono::steady_clock::now();
+
+        uint64_t last_bytes = 0;
+        std::chrono::steady_clock::time_point last_time;
+        {
+          std::lock_guard<std::mutex> lock(state->file_transfer_mutex_);
+          last_bytes = state->file_send_last_bytes_;
+          last_time = state->file_send_last_update_time_;
+        }
+
+        if (state->file_sending_.load() && ack.acked_offset >= last_bytes) {
+          const uint64_t delta_bytes = ack.acked_offset - last_bytes;
+          const double delta_seconds =
+              std::chrono::duration<double>(now - last_time).count();
+
+          if (delta_seconds > 0.0 && delta_bytes > 0) {
+            const double bps =
+                (static_cast<double>(delta_bytes) * 8.0) / delta_seconds;
+            if (bps > 0.0) {
+              const double capped = (std::min)(
+                  bps,
+                  static_cast<double>((std::numeric_limits<uint32_t>::max)()));
+              estimated_rate_bps = static_cast<uint32_t>(capped);
+            }
+          }
+        }
+
+        if (estimated_rate_bps > 0 && current_rate > 0) {
+          // 70% old + 30% new for smoother display
+          rate_bps = static_cast<uint32_t>(current_rate * 0.7 +
+                                           estimated_rate_bps * 0.3);
+        } else if (estimated_rate_bps > 0) {
+          rate_bps = estimated_rate_bps;
+        } else {
+          rate_bps = current_rate;
+        }
       }
 
-      props->file_send_rate_bps_ = rate_bps;
-      props->file_send_last_bytes_ = ack.acked_offset;
+      state->file_send_rate_bps_ = rate_bps;
+      state->file_send_last_bytes_ = ack.acked_offset;
       auto now = std::chrono::steady_clock::now();
-      props->file_send_last_update_time_ = now;
+      state->file_send_last_update_time_ = now;
     }
 
     // Update file transfer list: update progress and rate
     {
-      std::lock_guard<std::mutex> lock(props->file_transfer_list_mutex_);
-      for (auto& info : props->file_transfer_list_) {
+      std::lock_guard<std::mutex> lock(state->file_transfer_list_mutex_);
+      for (auto& info : state->file_transfer_list_) {
         if (info.file_id == ack.file_id) {
           info.sent_bytes = ack.acked_offset;
           info.file_size = ack.total_size;
@@ -410,8 +490,8 @@ void Render::OnReceiveDataBufferCb(const char* data, size_t size,
     if ((ack.flags & 0x01) != 0) {
       // Transfer completed - receiver has finished receiving the file
       // Reopen window if it was closed by user
-      props->file_transfer_window_visible_ = true;
-      props->file_sending_ = false;  // Mark sending as finished
+      state->file_transfer_window_visible_ = true;
+      state->file_sending_ = false;  // Mark sending as finished
       LOG_INFO(
           "File transfer completed via ACK, file_id={}, total_size={}, "
           "acked_offset={}",
@@ -419,11 +499,11 @@ void Render::OnReceiveDataBufferCb(const char* data, size_t size,
 
       // Update file transfer list: mark as completed
       {
-        std::lock_guard<std::mutex> lock(props->file_transfer_list_mutex_);
-        for (auto& info : props->file_transfer_list_) {
+        std::lock_guard<std::mutex> lock(state->file_transfer_list_mutex_);
+        for (auto& info : state->file_transfer_list_) {
           if (info.file_id == ack.file_id) {
             info.status =
-                SubStreamWindowProperties::FileTransferStatus::Completed;
+                Render::FileTransferState::FileTransferStatus::Completed;
             info.sent_bytes = ack.total_size;
             break;
           }
@@ -432,9 +512,15 @@ void Render::OnReceiveDataBufferCb(const char* data, size_t size,
 
       // Unregister file_id mapping after completion
       {
-        std::lock_guard<std::shared_mutex> lock(
-            render->file_id_to_props_mutex_);
-        render->file_id_to_props_.erase(ack.file_id);
+        if (props) {
+          std::lock_guard<std::shared_mutex> lock(
+              render->file_id_to_props_mutex_);
+          render->file_id_to_props_.erase(ack.file_id);
+        } else {
+          std::lock_guard<std::shared_mutex> lock(
+              render->file_id_to_transfer_state_mutex_);
+          render->file_id_to_transfer_state_.erase(ack.file_id);
+        }
       }
 
       // Process next file in queue
@@ -456,24 +542,39 @@ void Render::OnReceiveDataBufferCb(const char* data, size_t size,
 
   std::string remote_id(user_id, user_id_size);
   // std::shared_lock lock(render->client_properties_mutex_);
-  if (render->client_properties_.find(remote_id) !=
-      render->client_properties_.end()) {
-    // local
-    auto props = render->client_properties_.find(remote_id)->second;
-    if (remote_action.type == ControlType::host_infomation &&
-        props->remote_host_name_.empty()) {
-      props->remote_host_name_ = std::string(remote_action.i.host_name,
-                                             remote_action.i.host_name_size);
-      LOG_INFO("Remote hostname: [{}]", props->remote_host_name_);
+  if (remote_action.type == ControlType::host_infomation) {
+    if (render->client_properties_.find(remote_id) !=
+        render->client_properties_.end()) {
+      // client mode
+      auto props = render->client_properties_.find(remote_id)->second;
+      if (props && props->remote_host_name_.empty()) {
+        props->remote_host_name_ = std::string(remote_action.i.host_name,
+                                               remote_action.i.host_name_size);
+        LOG_INFO("Remote hostname: [{}]", props->remote_host_name_);
+
+        for (int i = 0; i < remote_action.i.display_num; i++) {
+          props->display_info_list_.push_back(
+              DisplayInfo(remote_action.i.display_list[i],
+                          remote_action.i.left[i], remote_action.i.top[i],
+                          remote_action.i.right[i], remote_action.i.bottom[i]));
+        }
+      }
+      FreeRemoteAction(remote_action);
+    } else {
+      // server mode
+      render->connection_host_names_[remote_id] = std::string(
+          remote_action.i.host_name, remote_action.i.host_name_size);
+      LOG_INFO("Remote hostname: [{}]",
+               render->connection_host_names_[remote_id]);
 
       for (int i = 0; i < remote_action.i.display_num; i++) {
-        props->display_info_list_.push_back(
+        render->display_info_list_.push_back(
             DisplayInfo(remote_action.i.display_list[i],
                         remote_action.i.left[i], remote_action.i.top[i],
                         remote_action.i.right[i], remote_action.i.bottom[i]));
       }
+      FreeRemoteAction(remote_action);
     }
-    FreeRemoteAction(remote_action);
   } else {
     // remote
     if (remote_action.type == ControlType::mouse && render->mouse_controller_) {
@@ -568,6 +669,49 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
 
     switch (status) {
       case ConnectionStatus::Connected: {
+        {
+          RemoteAction remote_action;
+          remote_action.i.display_num = render->display_info_list_.size();
+          remote_action.i.display_list =
+              (char**)malloc(remote_action.i.display_num * sizeof(char*));
+          remote_action.i.left =
+              (int*)malloc(remote_action.i.display_num * sizeof(int));
+          remote_action.i.top =
+              (int*)malloc(remote_action.i.display_num * sizeof(int));
+          remote_action.i.right =
+              (int*)malloc(remote_action.i.display_num * sizeof(int));
+          remote_action.i.bottom =
+              (int*)malloc(remote_action.i.display_num * sizeof(int));
+          for (int i = 0; i < remote_action.i.display_num; i++) {
+            LOG_INFO("Local display [{}:{}]", i + 1,
+                     render->display_info_list_[i].name);
+            remote_action.i.display_list[i] =
+                (char*)malloc(render->display_info_list_[i].name.length() + 1);
+            strncpy(remote_action.i.display_list[i],
+                    render->display_info_list_[i].name.c_str(),
+                    render->display_info_list_[i].name.length());
+            remote_action.i
+                .display_list[i][render->display_info_list_[i].name.length()] =
+                '\0';
+            remote_action.i.left[i] = render->display_info_list_[i].left;
+            remote_action.i.top[i] = render->display_info_list_[i].top;
+            remote_action.i.right[i] = render->display_info_list_[i].right;
+            remote_action.i.bottom[i] = render->display_info_list_[i].bottom;
+          }
+
+          std::string host_name = GetHostName();
+          remote_action.type = ControlType::host_infomation;
+          memcpy(&remote_action.i.host_name, host_name.data(),
+                 host_name.size());
+          remote_action.i.host_name[host_name.size()] = '\0';
+          remote_action.i.host_name_size = host_name.size();
+
+          std::string msg = remote_action.to_json();
+          int ret = SendReliableDataFrame(props->peer_, msg.data(), msg.size(),
+                                          render->control_data_label_.c_str());
+          FreeRemoteAction(remote_action);
+        }
+
         if (!render->need_to_create_stream_window_ &&
             !render->client_properties_.empty()) {
           render->need_to_create_stream_window_ = true;
@@ -584,12 +728,22 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
       case ConnectionStatus::Closed: {
         props->connection_established_ = false;
         props->mouse_control_button_pressed_ = false;
-        if (props->dst_buffer_ && props->stream_texture_) {
-          memset(props->dst_buffer_, 0, props->dst_buffer_capacity_);
-          SDL_UpdateTexture(props->stream_texture_, NULL, props->dst_buffer_,
-                            props->texture_width_);
+
+        {
+          std::lock_guard<std::mutex> lock(props->video_frame_mutex_);
+          props->front_frame_.reset();
+          props->back_frame_.reset();
+          props->video_width_ = 0;
+          props->video_height_ = 0;
+          props->video_size_ = 0;
+          props->render_rect_dirty_ = true;
+          props->stream_cleanup_pending_ = true;
         }
-        render->CleanSubStreamWindowProperties(props);
+
+        SDL_Event event;
+        event.type = render->STREAM_REFRESH_EVENT;
+        event.user.data1 = props.get();
+        SDL_PushEvent(&event);
 
         break;
       }
@@ -622,9 +776,54 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
 
     switch (status) {
       case ConnectionStatus::Connected: {
-        render->need_to_send_host_info_ = true;
+        {
+          RemoteAction remote_action;
+          remote_action.i.display_num = render->display_info_list_.size();
+          remote_action.i.display_list =
+              (char**)malloc(remote_action.i.display_num * sizeof(char*));
+          remote_action.i.left =
+              (int*)malloc(remote_action.i.display_num * sizeof(int));
+          remote_action.i.top =
+              (int*)malloc(remote_action.i.display_num * sizeof(int));
+          remote_action.i.right =
+              (int*)malloc(remote_action.i.display_num * sizeof(int));
+          remote_action.i.bottom =
+              (int*)malloc(remote_action.i.display_num * sizeof(int));
+          for (int i = 0; i < remote_action.i.display_num; i++) {
+            LOG_INFO("Local display [{}:{}]", i + 1,
+                     render->display_info_list_[i].name);
+            remote_action.i.display_list[i] =
+                (char*)malloc(render->display_info_list_[i].name.length() + 1);
+            strncpy(remote_action.i.display_list[i],
+                    render->display_info_list_[i].name.c_str(),
+                    render->display_info_list_[i].name.length());
+            remote_action.i
+                .display_list[i][render->display_info_list_[i].name.length()] =
+                '\0';
+            remote_action.i.left[i] = render->display_info_list_[i].left;
+            remote_action.i.top[i] = render->display_info_list_[i].top;
+            remote_action.i.right[i] = render->display_info_list_[i].right;
+            remote_action.i.bottom[i] = render->display_info_list_[i].bottom;
+          }
+
+          std::string host_name = GetHostName();
+          remote_action.type = ControlType::host_infomation;
+          memcpy(&remote_action.i.host_name, host_name.data(),
+                 host_name.size());
+          remote_action.i.host_name[host_name.size()] = '\0';
+          remote_action.i.host_name_size = host_name.size();
+
+          std::string msg = remote_action.to_json();
+          int ret = SendReliableDataFrame(render->peer_, msg.data(), msg.size(),
+                                          render->control_data_label_.c_str());
+          FreeRemoteAction(remote_action);
+        }
+
+        render->need_to_create_server_window_ = true;
+        render->is_server_mode_ = true;
         render->start_screen_capturer_ = true;
         render->start_speaker_capturer_ = true;
+        render->remote_client_id_ = remote_id;
 #ifdef CROSSDESK_DEBUG
         render->start_mouse_controller_ = false;
         render->start_keyboard_capturer_ = false;
@@ -647,11 +846,13 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
                                  kv.second == ConnectionStatus::Failed ||
                                  kv.second == ConnectionStatus::Disconnected;
                         })) {
+          render->need_to_destroy_server_window_ = true;
+          render->is_server_mode_ = false;
           render->start_screen_capturer_ = false;
           render->start_speaker_capturer_ = false;
           render->start_mouse_controller_ = false;
           render->start_keyboard_capturer_ = false;
-          render->need_to_send_host_info_ = false;
+          render->remote_client_id_ = "";
           if (props) props->connection_established_ = false;
           if (render->audio_capture_) {
             render->StopSpeakerCapturer();
@@ -676,11 +877,11 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
   }
 }
 
-void Render::NetStatusReport(const char* client_id, size_t client_id_size,
-                             TraversalMode mode,
-                             const XNetTrafficStats* net_traffic_stats,
-                             const char* user_id, const size_t user_id_size,
-                             void* user_data) {
+void Render::OnNetStatusReport(const char* client_id, size_t client_id_size,
+                               TraversalMode mode,
+                               const XNetTrafficStats* net_traffic_stats,
+                               const char* user_id, const size_t user_id_size,
+                               void* user_data) {
   Render* render = (Render*)user_data;
   if (!render) {
     return;

src/gui/toolbars/control_bar.cpp

@@ -15,18 +15,6 @@
 
 namespace crossdesk {
 
-std::string OpenFileDialog(std::string title) {
-  const char* path = tinyfd_openFileDialog(title.c_str(),
-                                           "",       // default path
-                                           0,        // number of filters
-                                           nullptr,  // filters
-                                           nullptr,  // filter description
-                                           0         // no multiple selection
-  );
-
-  return path ? path : "";
-}
-
 int CountDigits(int number) {
   if (number == 0) return 1;
   return (int)std::floor(std::log10(std::abs(number))) + 1;
@@ -53,6 +41,97 @@ int LossRateDisplay(float loss_rate) {
   return 0;
 }
 
+std::string Render::OpenFileDialog(std::string title) {
+  const char* path = tinyfd_openFileDialog(title.c_str(),
+                                           "",       // default path
+                                           0,        // number of filters
+                                           nullptr,  // filters
+                                           nullptr,  // filter description
+                                           0         // no multiple selection
+  );
+
+  return path ? path : "";
+}
+
+void Render::ProcessSelectedFile(
+    const std::string& path,
+    const std::shared_ptr<SubStreamWindowProperties>& props,
+    const std::string& file_label, const std::string& remote_id) {
+  if (path.empty()) {
+    return;
+  }
+
+  FileTransferState* file_transfer_state =
+      props ? &props->file_transfer_ : &file_transfer_;
+
+  LOG_INFO("Selected file: {}", path.c_str());
+
+  std::filesystem::path file_path = std::filesystem::u8path(path);
+
+  // Get file size
+  std::error_code ec;
+  uint64_t file_size = std::filesystem::file_size(file_path, ec);
+  if (ec) {
+    LOG_ERROR("Failed to get file size: {}", ec.message().c_str());
+    file_size = 0;
+  }
+
+  // Add file to transfer list
+  {
+    std::lock_guard<std::mutex> lock(
+        file_transfer_state->file_transfer_list_mutex_);
+    FileTransferState::FileTransferInfo info;
+    info.file_name = file_path.filename().u8string();
+    info.file_path = file_path;  // Store full path for precise matching
+    info.file_size = file_size;
+    info.status = FileTransferState::FileTransferStatus::Queued;
+    info.sent_bytes = 0;
+    info.file_id = 0;
+    info.rate_bps = 0;
+    file_transfer_state->file_transfer_list_.push_back(info);
+  }
+  file_transfer_state->file_transfer_window_visible_ = true;
+
+  if (file_transfer_state->file_sending_.load()) {
+    // Add to queue
+    size_t queue_size = 0;
+    {
+      std::lock_guard<std::mutex> lock(file_transfer_state->file_queue_mutex_);
+      FileTransferState::QueuedFile queued_file;
+      queued_file.file_path = file_path;
+      queued_file.file_label = file_label;
+      queued_file.remote_id = remote_id;
+      file_transfer_state->file_send_queue_.push(queued_file);
+      queue_size = file_transfer_state->file_send_queue_.size();
+    }
+    LOG_INFO("File added to queue: {} ({} files in queue)",
+             file_path.filename().string().c_str(), queue_size);
+  } else {
+    StartFileTransfer(props, file_path, file_label, remote_id);
+
+    if (file_transfer_state->file_sending_.load()) {
+    } else {
+      // Failed to start (race condition: another file started between
+      // check and call) Add to queue
+      size_t queue_size = 0;
+      {
+        std::lock_guard<std::mutex> lock(
+            file_transfer_state->file_queue_mutex_);
+        FileTransferState::QueuedFile queued_file;
+        queued_file.file_path = file_path;
+        queued_file.file_label = file_label;
+        queued_file.remote_id = remote_id;
+        file_transfer_state->file_send_queue_.push(queued_file);
+        queue_size = file_transfer_state->file_send_queue_.size();
+      }
+      LOG_INFO(
+          "File added to queue after race condition: {} ({} files in "
+          "queue)",
+          file_path.filename().string().c_str(), queue_size);
+    }
+  }
+}
+
 int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
   float button_width = title_bar_height_ * 0.8f;
   float button_height = title_bar_height_ * 0.8f;
@@ -95,8 +174,8 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
           remote_action.d = i;
           if (props->connection_status_ == ConnectionStatus::Connected) {
             std::string msg = remote_action.to_json();
-            SendDataFrame(props->peer_, msg.c_str(), msg.size(),
-                          props->control_data_label_.c_str());
+            SendReliableDataFrame(props->peer_, msg.c_str(), msg.size(),
+                                  props->control_data_label_.c_str());
           }
         }
         props->display_selectable_hovered_ = ImGui::IsWindowHovered();
@@ -176,8 +255,8 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
         remote_action.type = ControlType::audio_capture;
         remote_action.a = props->audio_capture_button_pressed_;
         std::string msg = remote_action.to_json();
-        SendDataFrame(props->peer_, msg.c_str(), msg.size(),
-                      props->control_data_label_.c_str());
+        SendReliableDataFrame(props->peer_, msg.c_str(), msg.size(),
+                              props->control_data_label_.c_str());
       }
     }
 
@@ -204,71 +283,7 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
       std::string title =
           localization::select_file[localization_language_index_];
       std::string path = OpenFileDialog(title);
-      if (!path.empty()) {
-        LOG_INFO("Selected file: {}", path.c_str());
-
-        std::filesystem::path file_path = std::filesystem::path(path);
-        std::string file_label = file_label_;
-
-        // Get file size
-        std::error_code ec;
-        uint64_t file_size = std::filesystem::file_size(file_path, ec);
-        if (ec) {
-          LOG_ERROR("Failed to get file size: {}", ec.message().c_str());
-          file_size = 0;
-        }
-
-        // Add file to transfer list
-        {
-          std::lock_guard<std::mutex> lock(props->file_transfer_list_mutex_);
-          SubStreamWindowProperties::FileTransferInfo info;
-          info.file_name = file_path.filename().string();
-          info.file_path = file_path;  // Store full path for precise matching
-          info.file_size = file_size;
-          info.status = SubStreamWindowProperties::FileTransferStatus::Queued;
-          info.sent_bytes = 0;
-          info.file_id = 0;
-          info.rate_bps = 0;
-          props->file_transfer_list_.push_back(info);
-        }
-        props->file_transfer_window_visible_ = true;
-
-        if (props->file_sending_.load()) {
-          // Add to queue
-          size_t queue_size = 0;
-          {
-            std::lock_guard<std::mutex> lock(props->file_queue_mutex_);
-            SubStreamWindowProperties::QueuedFile queued_file;
-            queued_file.file_path = file_path;
-            queued_file.file_label = file_label;
-            props->file_send_queue_.push(queued_file);
-            queue_size = props->file_send_queue_.size();
-          }
-          LOG_INFO("File added to queue: {} ({} files in queue)",
-                   file_path.filename().string().c_str(), queue_size);
-        } else {
-          StartFileTransfer(props, file_path, file_label);
-
-          if (props->file_sending_.load()) {
-          } else {
-            // Failed to start (race condition: another file started between
-            // check and call) Add to queue
-            size_t queue_size = 0;
-            {
-              std::lock_guard<std::mutex> lock(props->file_queue_mutex_);
-              SubStreamWindowProperties::QueuedFile queued_file;
-              queued_file.file_path = file_path;
-              queued_file.file_label = file_label;
-              props->file_send_queue_.push(queued_file);
-              queue_size = props->file_send_queue_.size();
-            }
-            LOG_INFO(
-                "File added to queue after race condition: {} ({} files in "
-                "queue)",
-                file_path.filename().string().c_str(), queue_size);
-          }
-        }
-      }
+      ProcessSelectedFile(path, props, file_label_);
     }
 
     ImGui::SameLine();

src/gui/toolbars/title_bar.cpp

@@ -3,7 +3,8 @@
 #include "rd_log.h"
 #include "render.h"
 
-#define NEW_VERSION_ICON_RENDER_TIME_INTERVAL 2000
+constexpr double kNewVersionIconBlinkIntervalSec = 2.0;
+constexpr double kNewVersionIconBlinkOnTimeSec = 1.0;
 
 namespace crossdesk {
 
@@ -15,14 +16,28 @@ int Render::TitleBar(bool main_window) {
   float title_bar_button_width = title_bar_button_width_;
   float title_bar_button_height = title_bar_button_height_;
   if (main_window) {
-    title_bar_width = io.DisplaySize.x;
-    title_bar_height = io.DisplaySize.y * TITLE_BAR_HEIGHT;
-    title_bar_height_padding = io.DisplaySize.y * (TITLE_BAR_HEIGHT + 0.01f);
-    title_bar_button_width = io.DisplaySize.x * TITLE_BAR_BUTTON_WIDTH;
-    title_bar_button_height = io.DisplaySize.y * TITLE_BAR_BUTTON_HEIGHT;
-    title_bar_height_ = title_bar_height;
-    title_bar_button_width_ = title_bar_button_width;
-    title_bar_button_height_ = title_bar_button_height;
+    // When the main window is minimized, Dear ImGui may report DisplaySize as
+    // (0, 0). Do not overwrite shared title-bar metrics with zeros, otherwise
+    // stream/server windows (which reuse these metrics) will lose their title
+    // bars and appear collapsed.
+    if (io.DisplaySize.x > 0.0f && io.DisplaySize.y > 0.0f) {
+      title_bar_width = io.DisplaySize.x;
+      title_bar_height = io.DisplaySize.y * TITLE_BAR_HEIGHT;
+      title_bar_height_padding = io.DisplaySize.y * (TITLE_BAR_HEIGHT + 0.01f);
+      title_bar_button_width = io.DisplaySize.x * TITLE_BAR_BUTTON_WIDTH;
+      title_bar_button_height = io.DisplaySize.y * TITLE_BAR_BUTTON_HEIGHT;
+
+      title_bar_height_ = title_bar_height;
+      title_bar_button_width_ = title_bar_button_width;
+      title_bar_button_height_ = title_bar_button_height;
+    } else {
+      // Keep using last known good values.
+      title_bar_width = title_bar_width_;
+      title_bar_height = title_bar_height_;
+      title_bar_height_padding = title_bar_height_;
+      title_bar_button_width = title_bar_button_width_;
+      title_bar_button_height = title_bar_button_height_;
+    }
   } else {
     title_bar_width = io.DisplaySize.x;
     title_bar_height = title_bar_button_height_;
@@ -92,13 +107,11 @@ int Render::TitleBar(bool main_window) {
 
       std::string about_str = localization::about[localization_language_index_];
       if (update_available_) {
-        auto now_time = std::chrono::duration_cast<std::chrono::milliseconds>(
-                            std::chrono::steady_clock::now().time_since_epoch())
-                            .count();
+        const double now_time = ImGui::GetTime();
 
         // every 2 seconds
         if (now_time - new_version_icon_last_trigger_time_ >=
-            NEW_VERSION_ICON_RENDER_TIME_INTERVAL) {
+            kNewVersionIconBlinkIntervalSec) {
           show_new_version_icon_ = true;
           new_version_icon_render_start_time_ = now_time;
           new_version_icon_last_trigger_time_ = now_time;
@@ -106,9 +119,9 @@ int Render::TitleBar(bool main_window) {
 
         // render for 1 second
         if (show_new_version_icon_) {
-          about_str = about_str + " " + ICON_FA_TRIANGLE_EXCLAMATION;
+          about_str = about_str + " " + ICON_FA_CIRCLE_ARROW_UP;
           if (now_time - new_version_icon_render_start_time_ >=
-              NEW_VERSION_ICON_RENDER_TIME_INTERVAL / 2) {
+              kNewVersionIconBlinkOnTimeSec) {
             show_new_version_icon_ = false;
           }
         } else {
@@ -137,13 +150,11 @@ int Render::TitleBar(bool main_window) {
     }
 
     if (update_available_ && show_new_version_icon_in_menu_) {
-      auto now_time = std::chrono::duration_cast<std::chrono::milliseconds>(
-                          std::chrono::steady_clock::now().time_since_epoch())
-                          .count();
+      const double now_time = ImGui::GetTime();
 
       // every 2 seconds
       if (now_time - new_version_icon_last_trigger_time_ >=
-          NEW_VERSION_ICON_RENDER_TIME_INTERVAL) {
+          kNewVersionIconBlinkIntervalSec) {
         show_new_version_icon_ = true;
         new_version_icon_render_start_time_ = now_time;
         new_version_icon_last_trigger_time_ = now_time;
@@ -152,14 +163,13 @@ int Render::TitleBar(bool main_window) {
       // render for 1 second
       if (show_new_version_icon_) {
         ImGui::SetWindowFontScale(0.6f);
-        ImGui::SetCursorPos(
-            ImVec2(bar_pos_x + title_bar_button_width * 0.15f,
-                   bar_pos_y - title_bar_button_width * 0.325f));
-        ImGui::Text(ICON_FA_TRIANGLE_EXCLAMATION);
+        ImGui::SetCursorPos(ImVec2(bar_pos_x + title_bar_button_width * 0.21f,
+                                   bar_pos_y - title_bar_button_width * 0.24f));
+        ImGui::Text(ICON_FA_CIRCLE_ARROW_UP);
         ImGui::SetWindowFontScale(1.0f);
 
         if (now_time - new_version_icon_render_start_time_ >=
-            NEW_VERSION_ICON_RENDER_TIME_INTERVAL / 2) {
+            kNewVersionIconBlinkOnTimeSec) {
           show_new_version_icon_ = false;
         }
       }
@@ -187,6 +197,11 @@ int Render::TitleBar(bool main_window) {
   std::string window_minimize_button = "##minimize";  // ICON_FA_MINUS;
   if (ImGui::Button(window_minimize_button.c_str(),
                     ImVec2(title_bar_button_width, title_bar_button_height))) {
+    if (main_window) {
+      last_main_minimize_request_tick_ = SDL_GetTicks();
+    } else {
+      last_stream_minimize_request_tick_ = SDL_GetTicks();
+    }
     SDL_MinimizeWindow(main_window ? main_window_ : stream_window_);
   }
   draw_list->AddLine(

src/gui/windows/about_window.cpp

@@ -1,6 +1,10 @@
 #include <cstdlib>
 #include <string>
 
+#if defined(_WIN32)
+#include <windows.h>
+#endif
+
 #include "layout.h"
 #include "localization.h"
 #include "rd_log.h"
@@ -24,13 +28,34 @@ void Render::Hyperlink(const std::string& label, const std::string& url,
     ImGui::EndTooltip();
     if (ImGui::IsMouseClicked(ImGuiMouseButton_Left)) {
 #if defined(_WIN32)
-      std::string cmd = "start " + url;
+      int wide_len =
+          MultiByteToWideChar(CP_UTF8, 0, url.c_str(), -1, nullptr, 0);
+      if (wide_len > 0) {
+        std::wstring wide_url(static_cast<size_t>(wide_len), L'\0');
+        MultiByteToWideChar(CP_UTF8, 0, url.c_str(), -1, &wide_url[0],
+                            wide_len);
+        if (!wide_url.empty() && wide_url.back() == L'\0') {
+          wide_url.pop_back();
+        }
+
+        std::wstring cmd = L"cmd.exe /c start \"\" \"" + wide_url + L"\"";
+        STARTUPINFOW startup_info = {sizeof(startup_info)};
+        PROCESS_INFORMATION process_info = {};
+        if (CreateProcessW(nullptr, &cmd[0], nullptr, nullptr, FALSE,
+                           CREATE_NO_WINDOW, nullptr, nullptr, &startup_info,
+                           &process_info)) {
+          CloseHandle(process_info.hThread);
+          CloseHandle(process_info.hProcess);
+        }
+      }
 #elif defined(__APPLE__)
       std::string cmd = "open " + url;
 #else
       std::string cmd = "xdg-open " + url;
 #endif
+#if !defined(_WIN32)
       system(cmd.c_str());  // open browser
+#endif
     }
   }
 }

src/gui/windows/file_transfer_window.cpp

@@ -30,12 +30,14 @@ int BitrateDisplay(int bitrate) {
 
 int Render::FileTransferWindow(
     std::shared_ptr<SubStreamWindowProperties>& props) {
+  FileTransferState* state = props ? &props->file_transfer_ : &file_transfer_;
+
   // Only show window if there are files in transfer list or currently
   // transferring
   std::vector<SubStreamWindowProperties::FileTransferInfo> file_list;
   {
-    std::lock_guard<std::mutex> lock(props->file_transfer_list_mutex_);
-    file_list = props->file_transfer_list_;
+    std::lock_guard<std::mutex> lock(state->file_transfer_list_mutex_);
+    file_list = state->file_transfer_list_;
   }
 
   // Sort file list: Sending first, then Completed, then Queued, then Failed
@@ -66,7 +68,7 @@ int Render::FileTransferWindow(
   // It will be reopened automatically when:
   // 1. A file transfer completes (in render_callback.cpp)
   // 2. A new file starts sending from queue (in render.cpp)
-  if (!props->file_transfer_window_visible_) {
+  if (!state->file_transfer_window_visible_) {
     return 0;
   }
 
@@ -87,10 +89,15 @@ int Render::FileTransferWindow(
       ImVec2(file_transfer_window_width, file_transfer_window_height),
       ImGuiCond_Always);
 
+  // Set Chinese font for proper display
+  if (stream_windows_system_chinese_font_) {
+    ImGui::PushFont(stream_windows_system_chinese_font_);
+  }
+
   ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 3.0f);
   ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
   ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 0.9f));
-  ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
+  ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.0f, 0.0f, 0.0f, 0.3f));
   ImGui::PushStyleColor(ImGuiCol_TitleBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
   ImGui::PushStyleColor(ImGuiCol_TitleBgActive, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
 
@@ -110,7 +117,7 @@ int Render::FileTransferWindow(
 
     // Close button handling
     if (!window_opened) {
-      props->file_transfer_window_visible_ = false;
+      state->file_transfer_window_visible_ = false;
       ImGui::End();
       return 0;
     }
@@ -121,9 +128,9 @@ int Render::FileTransferWindow(
     } else {
       // Use a scrollable child window for the file list
       ImGui::SetWindowFontScale(0.5f);
-      ImGui::BeginChild("FileList",
-                        ImVec2(0, file_transfer_window_height * 0.75f),
-                        ImGuiChildFlags_Border);
+      ImGui::BeginChild(
+          "FileList", ImVec2(0, file_transfer_window_height * 0.75f),
+          ImGuiChildFlags_Border, ImGuiWindowFlags_HorizontalScrollbar);
       ImGui::SetWindowFontScale(1.0f);
       ImGui::SetWindowFontScale(0.5f);
 
@@ -220,6 +227,11 @@ int Render::FileTransferWindow(
     ImGui::SetWindowFontScale(0.5f);
     ImGui::End();
     ImGui::SetWindowFontScale(1.0f);
+
+    // Pop Chinese font if it was pushed
+    if (stream_windows_system_chinese_font_) {
+      ImGui::PopFont();
+    }
   } else {
     ImGui::PopStyleColor(4);
     ImGui::PopStyleVar(2);

src/gui/windows/main_settings_window.cpp

@@ -2,6 +2,7 @@
 #include "localization.h"
 #include "rd_log.h"
 #include "render.h"
+#include "tinyfiledialogs.h"
 
 namespace crossdesk {
 
@@ -15,28 +16,28 @@ int Render::SettingWindow() {
       !defined(__arm__) && USE_CUDA) ||                                   \
      defined(__APPLE__))
         ImGui::SetNextWindowPos(
-            ImVec2(io.DisplaySize.x * 0.343f, io.DisplaySize.y * 0.07f));
+            ImVec2(io.DisplaySize.x * 0.343f, io.DisplaySize.y * 0.05f));
         ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.315f, io.DisplaySize.y * 0.85f));
+            ImVec2(io.DisplaySize.x * 0.315f, io.DisplaySize.y * 0.9f));
 #else
         ImGui::SetNextWindowPos(
-            ImVec2(io.DisplaySize.x * 0.343f, io.DisplaySize.y * 0.1f));
+            ImVec2(io.DisplaySize.x * 0.343f, io.DisplaySize.y * 0.08f));
         ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.315f, io.DisplaySize.y * 0.8f));
+            ImVec2(io.DisplaySize.x * 0.315f, io.DisplaySize.y * 0.85f));
 #endif
       } else {
 #if (((defined(_WIN32) || defined(__linux__)) && !defined(__aarch64__) && \
       !defined(__arm__) && USE_CUDA) ||                                   \
      defined(__APPLE__))
         ImGui::SetNextWindowPos(
-            ImVec2(io.DisplaySize.x * 0.297f, io.DisplaySize.y * 0.07f));
+            ImVec2(io.DisplaySize.x * 0.297f, io.DisplaySize.y * 0.05f));
         ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.407f, io.DisplaySize.y * 0.85f));
+            ImVec2(io.DisplaySize.x * 0.407f, io.DisplaySize.y * 0.9f));
 #else
         ImGui::SetNextWindowPos(
-            ImVec2(io.DisplaySize.x * 0.297f, io.DisplaySize.y * 0.1f));
+            ImVec2(io.DisplaySize.x * 0.297f, io.DisplaySize.y * 0.08f));
         ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.407f, io.DisplaySize.y * 0.8f));
+            ImVec2(io.DisplaySize.x * 0.407f, io.DisplaySize.y * 0.85f));
 #endif
       }
 
@@ -351,6 +352,62 @@ int Render::SettingWindow() {
                         &enable_minimize_to_tray_);
       }
 #endif
+
+      ImGui::Separator();
+
+      {
+        settings_items_offset += settings_items_padding;
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::AlignTextToFramePadding();
+        ImGui::Text(
+            "%s",
+            localization::file_transfer_save_path[localization_language_index_]
+                .c_str());
+        ImGui::SameLine();
+        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
+          ImGui::SetCursorPosX(title_bar_button_width_ * 2.8f);
+        } else {
+          ImGui::SetCursorPosX(title_bar_button_width_ * 4.3f);
+        }
+
+        std::string display_path =
+            strlen(file_transfer_save_path_buf_) > 0
+                ? file_transfer_save_path_buf_
+                : localization::default_desktop[localization_language_index_];
+        ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
+        ImGui::PushStyleColor(ImGuiCol_ButtonHovered,
+                              ImVec4(0.95f, 0.95f, 0.95f, 1.0f));
+        ImGui::PushStyleColor(ImGuiCol_ButtonActive,
+                              ImVec4(0.9f, 0.9f, 0.9f, 1.0f));
+        ImGui::PushFont(main_windows_system_chinese_font_);
+        if (ImGui::Button(display_path.c_str(),
+                          ImVec2(title_bar_button_width_ * 2.0f, 0))) {
+          const char* folder =
+              tinyfd_selectFolderDialog(localization::file_transfer_save_path
+                                            [localization_language_index_]
+                                                .c_str(),
+                                        strlen(file_transfer_save_path_buf_) > 0
+                                            ? file_transfer_save_path_buf_
+                                            : nullptr);
+          if (folder) {
+            strncpy(file_transfer_save_path_buf_, folder,
+                    sizeof(file_transfer_save_path_buf_) - 1);
+            file_transfer_save_path_buf_[sizeof(file_transfer_save_path_buf_) -
+                                         1] = '\0';
+          }
+        }
+        if (ImGui::IsItemHovered() &&
+            strlen(file_transfer_save_path_buf_) > 0) {
+          ImGui::BeginTooltip();
+          ImGui::SetWindowFontScale(0.5f);
+          ImGui::Text("%s", file_transfer_save_path_buf_);
+          ImGui::SetWindowFontScale(1.0f);
+          ImGui::EndTooltip();
+        }
+        ImGui::PopFont();
+        ImGui::PopStyleColor(3);
+      }
+
       if (stream_window_inited_) {
         ImGui::EndDisabled();
       }
@@ -469,6 +526,10 @@ int Render::SettingWindow() {
         enable_minimize_to_tray_last_ = enable_minimize_to_tray_;
 #endif
 
+        // File transfer save path
+        config_center_->SetFileTransferSavePath(file_transfer_save_path_buf_);
+        file_transfer_save_path_last_ = file_transfer_save_path_buf_;
+
         settings_window_pos_reset_ = true;
 
         // Recreate peer instance
@@ -516,6 +577,13 @@ int Render::SettingWindow() {
           enable_turn_ = enable_turn_last_;
         }
 
+        // Restore file transfer save path
+        strncpy(file_transfer_save_path_buf_,
+                file_transfer_save_path_last_.c_str(),
+                sizeof(file_transfer_save_path_buf_) - 1);
+        file_transfer_save_path_buf_[sizeof(file_transfer_save_path_buf_) - 1] =
+            '\0';
+
         settings_window_pos_reset_ = true;
       }
       ImGui::SetWindowFontScale(0.5f);

src/gui/windows/server_settings_window.cpp

@@ -28,98 +28,6 @@ std::vector<std::string> GetRootEntries() {
   return roots;
 }
 
-int Render::ShowSimpleFileBrowser() {
-  std::string display_text;
-
-  if (selected_current_file_path_.empty()) {
-    selected_current_file_path_ = std::filesystem::current_path().string();
-  }
-
-  if (!tls_cert_path_self_.empty()) {
-    display_text =
-        std::filesystem::path(tls_cert_path_self_).filename().string();
-  } else if (selected_current_file_path_ != "Root") {
-    display_text =
-        std::filesystem::path(selected_current_file_path_).filename().string();
-    if (display_text.empty()) {
-      display_text = selected_current_file_path_;
-    }
-  }
-
-  if (display_text.empty()) {
-    display_text =
-        localization::select_a_file[localization_language_index_].c_str();
-  }
-
-  if (show_file_browser_) {
-    ImGui::PushItemFlag(ImGuiItemFlags_AutoClosePopups, false);
-
-    float fixed_width = title_bar_button_width_ * 3.8f;
-    ImGui::SetNextItemWidth(fixed_width);
-    ImGui::SetNextWindowSizeConstraints(ImVec2(fixed_width, 0),
-                                        ImVec2(fixed_width, 100.0f));
-
-    if (ImGui::BeginCombo("##select_a_file", display_text.c_str(), 0)) {
-      ImGui::SetWindowFontScale(0.5f);
-      bool file_selected = false;
-
-      auto roots = GetRootEntries();
-      if (selected_current_file_path_ == "Root" ||
-          !std::filesystem::exists(selected_current_file_path_) ||
-          !std::filesystem::is_directory(selected_current_file_path_)) {
-        for (const auto& root : roots) {
-          if (ImGui::Selectable(root.c_str())) {
-            selected_current_file_path_ = root;
-            tls_cert_path_self_.clear();
-          }
-        }
-      } else {
-        std::filesystem::path p(selected_current_file_path_);
-
-        if (ImGui::Selectable("..")) {
-          if (std::find(roots.begin(), roots.end(),
-                        selected_current_file_path_) != roots.end()) {
-            selected_current_file_path_ = "Root";
-          } else if (p.has_parent_path()) {
-            selected_current_file_path_ = p.parent_path().string();
-          } else {
-            selected_current_file_path_ = "Root";
-          }
-          tls_cert_path_self_.clear();
-        }
-
-        try {
-          for (const auto& entry : std::filesystem::directory_iterator(
-                   selected_current_file_path_)) {
-            std::string name = entry.path().filename().string();
-            if (entry.is_directory()) {
-              if (ImGui::Selectable(name.c_str())) {
-                selected_current_file_path_ = entry.path().string();
-                tls_cert_path_self_.clear();
-              }
-            } else {
-              if (ImGui::Selectable(name.c_str())) {
-                tls_cert_path_self_ = entry.path().string();
-                file_selected = true;
-                show_file_browser_ = false;
-              }
-            }
-          }
-        } catch (const std::exception& e) {
-          ImGui::TextColored(ImVec4(1, 0, 0, 1), "Error: %s", e.what());
-        }
-      }
-
-      ImGui::EndCombo();
-    }
-    ImGui::PopItemFlag();
-  } else {
-    show_file_browser_ = true;
-  }
-
-  return 0;
-}
-
 int Render::SelfHostedServerWindow() {
   ImGuiIO& io = ImGui::GetIO();
   if (show_self_hosted_server_config_window_) {
@@ -128,12 +36,12 @@ int Render::SelfHostedServerWindow() {
         ImGui::SetNextWindowPos(
             ImVec2(io.DisplaySize.x * 0.298f, io.DisplaySize.y * 0.25f));
         ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.407f, io.DisplaySize.y * 0.41f));
+            ImVec2(io.DisplaySize.x * 0.407f, io.DisplaySize.y * 0.35f));
       } else {
         ImGui::SetNextWindowPos(
             ImVec2(io.DisplaySize.x * 0.27f, io.DisplaySize.y * 0.3f));
         ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.465f, io.DisplaySize.y * 0.41f));
+            ImVec2(io.DisplaySize.x * 0.465f, io.DisplaySize.y * 0.35f));
       }
 
       self_hosted_server_config_window_pos_reset_ = false;
@@ -212,35 +120,6 @@ int Render::SelfHostedServerWindow() {
                          IM_ARRAYSIZE(coturn_server_port_self_));
       }
 
-      ImGui::Separator();
-
-      // {
-      //   ImGui::AlignTextToFramePadding();
-      //   ImGui::Text(
-      //       "%s",
-      //       localization::reset_cert_fingerprint[localization_language_index_]
-      //           .c_str());
-      //   ImGui::SameLine();
-      //   if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-      //     ImGui::SetCursorPosX(title_bar_button_width_ * 2.5f);
-      //   } else {
-      //     ImGui::SetCursorPosX(title_bar_button_width_ * 3.43f);
-      //   }
-      //   ImGui::SetNextItemWidth(title_bar_button_width_ * 3.8f);
-
-      //   ShowSimpleFileBrowser();
-      // }
-
-      {
-        ImGui::AlignTextToFramePadding();
-        if (ImGui::Button(localization::reset_cert_fingerprint
-                              [localization_language_index_]
-                                  .c_str())) {
-          config_center_->ClearCertFingerprint();
-          LOG_INFO("Certificate fingerprint cleared by user");
-        }
-      }
-
       if (stream_window_inited_) {
         ImGui::EndDisabled();
       }
@@ -263,7 +142,6 @@ int Render::SelfHostedServerWindow() {
         config_center_->SetServerHost(signal_server_ip_self_);
         config_center_->SetServerPort(atoi(signal_server_port_self_));
         config_center_->SetCoturnServerPort(atoi(coturn_server_port_self_));
-        config_center_->SetCertFilePath(tls_cert_path_self_);
         strncpy(signal_server_ip_, signal_server_ip_self_,
                 sizeof(signal_server_ip_) - 1);
         signal_server_ip_[sizeof(signal_server_ip_) - 1] = '\0';
@@ -273,9 +151,6 @@ int Render::SelfHostedServerWindow() {
         strncpy(coturn_server_port_, coturn_server_port_self_,
                 sizeof(coturn_server_port_) - 1);
         coturn_server_port_[sizeof(coturn_server_port_) - 1] = '\0';
-        strncpy(cert_file_path_, tls_cert_path_self_.c_str(),
-                sizeof(cert_file_path_) - 1);
-        cert_file_path_[sizeof(cert_file_path_) - 1] = '\0';
 
         self_hosted_server_config_window_pos_reset_ = true;
       }
@@ -306,7 +181,6 @@ int Render::SelfHostedServerWindow() {
         } else {
           coturn_server_port_self_[0] = '\0';
         }
-        tls_cert_path_self_ = config_center_->GetCertFilePath();
       }
 
       ImGui::SetWindowFontScale(1.0f);

src/gui/windows/server_window.cpp

@@ -0,0 +1,368 @@
+#include <algorithm>
+#include <cmath>
+#include <cstdio>
+#include <string>
+#include <vector>
+
+#include "layout_relative.h"
+#include "localization.h"
+#include "rd_log.h"
+#include "render.h"
+
+namespace crossdesk {
+
+namespace {
+int CountDigits(int number) {
+  if (number == 0) return 1;
+  return (int)std::floor(std::log10(std::abs(number))) + 1;
+}
+
+void BitrateDisplay(uint32_t bitrate) {
+  const int num_of_digits = CountDigits(static_cast<int>(bitrate));
+  if (num_of_digits <= 3) {
+    ImGui::Text("%u bps", bitrate);
+  } else if (num_of_digits > 3 && num_of_digits <= 6) {
+    ImGui::Text("%u kbps", bitrate / 1000);
+  } else {
+    ImGui::Text("%.1f mbps", bitrate / 1000000.0f);
+  }
+}
+
+std::string FormatBytes(uint64_t bytes) {
+  char buf[64];
+  if (bytes < 1024ULL) {
+    std::snprintf(buf, sizeof(buf), "%llu B", (unsigned long long)bytes);
+  } else if (bytes < 1024ULL * 1024ULL) {
+    std::snprintf(buf, sizeof(buf), "%.2f KB", bytes / 1024.0);
+  } else if (bytes < 1024ULL * 1024ULL * 1024ULL) {
+    std::snprintf(buf, sizeof(buf), "%.2f MB", bytes / (1024.0 * 1024.0));
+  } else {
+    std::snprintf(buf, sizeof(buf), "%.2f GB",
+                  bytes / (1024.0 * 1024.0 * 1024.0));
+  }
+  return std::string(buf);
+}
+}  // namespace
+
+int Render::ServerWindow() {
+  ImGui::SetNextWindowSize(ImVec2(server_window_width_, server_window_height_),
+                           ImGuiCond_Always);
+  ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always);
+
+  ImGui::Begin("##server_window", nullptr,
+               ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize |
+                   ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoCollapse |
+                   ImGuiWindowFlags_NoScrollbar |
+                   ImGuiWindowFlags_NoScrollWithMouse);
+
+  server_window_title_bar_height_ = title_bar_height_;
+
+  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
+  ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
+  ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always);
+  ImGui::BeginChild(
+      "ServerTitleBar",
+      ImVec2(server_window_width_, server_window_title_bar_height_),
+      ImGuiChildFlags_Border,
+      ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
+          ImGuiWindowFlags_NoBringToFrontOnFocus);
+
+  float server_title_bar_button_width = server_window_title_bar_height_;
+  float server_title_bar_button_height = server_window_title_bar_height_;
+
+  // Collapse/expand toggle button (FontAwesome icon).
+  {
+    ImGui::SetCursorPos(ImVec2(0.0f, 0.0f));
+
+    ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
+    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0, 0, 0, 0.1f));
+    ImGui::PushStyleColor(ImGuiCol_ButtonActive,
+                          ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
+
+    ImGui::SetWindowFontScale(0.5f);
+    const char* icon =
+        server_window_collapsed_ ? ICON_FA_ANGLE_DOWN : ICON_FA_ANGLE_UP;
+    std::string toggle_label = std::string(icon) + "##server_toggle";
+    if (ImGui::Button(toggle_label.c_str(),
+                      ImVec2(server_title_bar_button_width,
+                             server_title_bar_button_height))) {
+      if (server_window_) {
+        int w = 0;
+        int h = 0;
+        int x = 0;
+        int y = 0;
+        SDL_GetWindowSize(server_window_, &w, &h);
+        SDL_GetWindowPosition(server_window_, &x, &y);
+
+        if (server_window_collapsed_) {
+          const int normal_h = server_window_normal_height_;
+          SDL_SetWindowSize(server_window_, w, normal_h);
+          SDL_SetWindowPosition(server_window_, x, y);
+          server_window_collapsed_ = false;
+        } else {
+          const int collapsed_h = (int)server_window_title_bar_height_;
+          // Collapse upward: keep top edge stable.
+          SDL_SetWindowSize(server_window_, w, collapsed_h);
+          SDL_SetWindowPosition(server_window_, x, y);
+          server_window_collapsed_ = true;
+        }
+      }
+    }
+    ImGui::SetWindowFontScale(1.0f);
+
+    ImGui::PopStyleColor(3);
+  }
+
+  ImGui::EndChild();
+  ImGui::PopStyleVar();
+  ImGui::PopStyleColor();
+
+  RemoteClientInfoWindow();
+
+  ImGui::End();
+  return 0;
+}
+
+int Render::RemoteClientInfoWindow() {
+  float remote_client_info_window_width = server_window_width_ * 0.8f;
+  float remote_client_info_window_height =
+      (server_window_height_ - server_window_title_bar_height_) * 0.9f;
+
+  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
+  ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 5.0f);
+  ImGui::BeginChild(
+      "RemoteClientInfoWindow",
+      ImVec2(remote_client_info_window_width, remote_client_info_window_height),
+      ImGuiChildFlags_Border,
+      ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
+          ImGuiWindowFlags_NoBringToFrontOnFocus);
+  ImGui::PopStyleVar();
+  ImGui::PopStyleColor();
+
+  float font_scale = localization_language_index_ == 0 ? 0.5f : 0.45f;
+
+  std::vector<std::string> remote_hostnames;
+  remote_hostnames.reserve(connection_host_names_.size());
+  for (const auto& kv : connection_host_names_) {
+    remote_hostnames.push_back(kv.second);
+  }
+
+  auto find_remote_id_by_hostname =
+      [this](const std::string& hostname) -> std::string {
+    for (const auto& kv : connection_host_names_) {
+      if (kv.second == hostname) {
+        return kv.first;
+      }
+    }
+    return {};
+  };
+
+  if (!selected_server_remote_hostname_.empty()) {
+    if (std::find(remote_hostnames.begin(), remote_hostnames.end(),
+                  selected_server_remote_hostname_) == remote_hostnames.end()) {
+      selected_server_remote_hostname_.clear();
+      selected_server_remote_id_.clear();
+    }
+  }
+  if (selected_server_remote_hostname_.empty() && !remote_hostnames.empty()) {
+    selected_server_remote_hostname_ = remote_hostnames.front();
+    selected_server_remote_id_ =
+        find_remote_id_by_hostname(selected_server_remote_hostname_);
+  }
+
+  ImGui::SetWindowFontScale(font_scale);
+  ImGui::AlignTextToFramePadding();
+  ImGui::Text("%s",
+              localization::controller[localization_language_index_].c_str());
+  ImGui::SameLine();
+
+  const char* selected_preview = "-";
+  if (!selected_server_remote_hostname_.empty()) {
+    selected_preview = selected_server_remote_hostname_.c_str();
+  } else if (!remote_client_id_.empty()) {
+    selected_preview = remote_client_id_.c_str();
+  }
+
+  ImGui::SetNextItemWidth(remote_client_info_window_width *
+                          (localization_language_index_ == 0 ? 0.68f : 0.62f));
+  ImGui::SetWindowFontScale(localization_language_index_ == 0 ? 0.45f : 0.4f);
+  ImGui::AlignTextToFramePadding();
+  if (ImGui::BeginCombo("##server_remote_id", selected_preview)) {
+    ImGui::SetWindowFontScale(localization_language_index_ == 0 ? 0.45f : 0.4f);
+    for (int i = 0; i < static_cast<int>(remote_hostnames.size()); i++) {
+      const bool selected =
+          (remote_hostnames[i] == selected_server_remote_hostname_);
+      if (ImGui::Selectable(remote_hostnames[i].c_str(), selected)) {
+        selected_server_remote_hostname_ = remote_hostnames[i];
+        selected_server_remote_id_ =
+            find_remote_id_by_hostname(selected_server_remote_hostname_);
+      }
+      if (selected) {
+        ImGui::SetItemDefaultFocus();
+      }
+    }
+    ImGui::EndCombo();
+  }
+
+  ImGui::Separator();
+
+  ImGui::SetWindowFontScale(font_scale);
+
+  if (!selected_server_remote_id_.empty()) {
+    auto it = connection_status_.find(selected_server_remote_id_);
+    const ConnectionStatus status = (it == connection_status_.end())
+                                        ? ConnectionStatus::Closed
+                                        : it->second;
+
+    ImGui::Text(
+        "%s",
+        localization::connection_status[localization_language_index_].c_str());
+    ImGui::SameLine();
+
+    switch (status) {
+      case ConnectionStatus::Connected:
+        ImGui::Text(
+            "%s",
+            localization::p2p_connected[localization_language_index_].c_str());
+        break;
+      case ConnectionStatus::Connecting:
+        ImGui::Text(
+            "%s",
+            localization::p2p_connecting[localization_language_index_].c_str());
+        break;
+      case ConnectionStatus::Disconnected:
+        ImGui::Text("%s",
+                    localization::p2p_disconnected[localization_language_index_]
+                        .c_str());
+        break;
+      case ConnectionStatus::Failed:
+        ImGui::Text(
+            "%s",
+            localization::p2p_failed[localization_language_index_].c_str());
+        break;
+      case ConnectionStatus::Closed:
+        ImGui::Text(
+            "%s",
+            localization::p2p_closed[localization_language_index_].c_str());
+        break;
+      default:
+        ImGui::Text(
+            "%s",
+            localization::p2p_failed[localization_language_index_].c_str());
+        break;
+    }
+  }
+
+  ImGui::Separator();
+
+  ImGui::AlignTextToFramePadding();
+  ImGui::Text(
+      "%s", localization::file_transfer[localization_language_index_].c_str());
+
+  ImGui::SameLine();
+
+  if (ImGui::Button(
+          localization::select_file[localization_language_index_].c_str())) {
+    std::string title = localization::select_file[localization_language_index_];
+    std::string path = OpenFileDialog(title);
+    LOG_INFO("Selected file path: {}", path.c_str());
+
+    ProcessSelectedFile(path, nullptr, file_label_, selected_server_remote_id_);
+  }
+
+  if (file_transfer_.file_transfer_window_visible_) {
+    ImGui::SameLine();
+    const bool is_sending = file_transfer_.file_sending_.load();
+
+    if (is_sending) {
+      // Simple animation: cycle icon every 0.5s while sending.
+      static const char* kFileTransferIcons[] = {ICON_FA_ANGLE_UP,
+                                                 ICON_FA_ANGLES_UP};
+      const int icon_index = static_cast<int>(ImGui::GetTime() / 0.5) %
+                             (static_cast<int>(sizeof(kFileTransferIcons) /
+                                               sizeof(kFileTransferIcons[0])));
+      ImGui::Text("%s", kFileTransferIcons[icon_index]);
+    } else {
+      // Completed.
+      ImGui::Text("%s", ICON_FA_CHECK);
+    }
+
+    if (ImGui::IsItemHovered()) {
+      const uint64_t sent_bytes = file_transfer_.file_sent_bytes_.load();
+      const uint64_t total_bytes = file_transfer_.file_total_bytes_.load();
+      const uint32_t rate_bps = file_transfer_.file_send_rate_bps_.load();
+
+      float progress = 0.0f;
+      if (total_bytes > 0) {
+        progress =
+            static_cast<float>(sent_bytes) / static_cast<float>(total_bytes);
+        progress = (std::max)(0.0f, (std::min)(1.0f, progress));
+      }
+
+      std::string current_file_name;
+      const uint32_t current_file_id = file_transfer_.current_file_id_.load();
+      if (current_file_id != 0) {
+        std::lock_guard<std::mutex> lock(
+            file_transfer_.file_transfer_list_mutex_);
+        for (const auto& info : file_transfer_.file_transfer_list_) {
+          if (info.file_id == current_file_id) {
+            current_file_name = info.file_name;
+            break;
+          }
+        }
+      }
+
+      ImGui::BeginTooltip();
+      if (server_windows_system_chinese_font_) {
+        ImGui::PushFont(server_windows_system_chinese_font_);
+      }
+      ImGui::SetWindowFontScale(0.5f);
+      if (!current_file_name.empty()) {
+        ImGui::Text("%s", current_file_name.c_str());
+      }
+      if (total_bytes > 0) {
+        const std::string sent_str = FormatBytes(sent_bytes);
+        const std::string total_str = FormatBytes(total_bytes);
+        ImGui::Text("%s / %s", sent_str.c_str(), total_str.c_str());
+      }
+
+      const float text_height = ImGui::GetTextLineHeight();
+      char overlay[32];
+      std::snprintf(overlay, sizeof(overlay), "%.1f%%", progress * 100.0f);
+      ImGui::ProgressBar(progress, ImVec2(180.0f, text_height), overlay);
+      BitrateDisplay(rate_bps);
+      ImGui::SetWindowFontScale(1.0f);
+      if (server_windows_system_chinese_font_) {
+        ImGui::PopFont();
+      }
+      ImGui::EndTooltip();
+    }
+  }
+
+  ImGui::SetWindowFontScale(1.0f);
+
+  ImGui::EndChild();
+
+  ImGui::SameLine();
+
+  float close_connection_button_width = server_window_width_ * 0.1f;
+  float close_connection_button_height = remote_client_info_window_height;
+
+  ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(1.0f, 0.0f, 0.0f, 1.0f));
+  ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(1.0f, 0.3f, 0.3f, 1.0f));
+  ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(1.0f, 0.5f, 0.5f, 1.0f));
+  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 5.0f);
+  ImGui::SetWindowFontScale(font_scale);
+  if (ImGui::Button(ICON_FA_XMARK, ImVec2(close_connection_button_width,
+                                          close_connection_button_height))) {
+    if (peer_ && !selected_server_remote_id_.empty()) {
+      LeaveConnection(peer_, selected_server_remote_id_.c_str());
+    }
+  }
+  ImGui::SetWindowFontScale(1.0f);
+  ImGui::PopStyleColor(3);
+  ImGui::PopStyleVar();
+
+  return 0;
+}
+}  // namespace crossdesk

src/path_manager/path_manager.cpp

@@ -40,20 +40,6 @@ std::filesystem::path PathManager::GetLogPath() {
 #endif
 }
 
-std::filesystem::path PathManager::GetCertPath() {
-#ifdef _WIN32
-  // %APPDATA%\AppName\Certs
-  return GetKnownFolder(FOLDERID_RoamingAppData) / app_name_ / "certs";
-#elif __APPLE__
-  // $HOME/Library/Application Support/AppName/certs
-  return GetHome() + "/Library/Application Support/" + app_name_ + "/certs";
-#else
-  // $XDG_CONFIG_HOME/AppName/certs
-  return GetEnvOrDefault("XDG_CONFIG_HOME", GetHome() + "/.config") /
-         app_name_ / "certs";
-#endif
-}
-
 bool PathManager::CreateDirectories(const std::filesystem::path& p) {
   std::error_code ec;
   bool created = std::filesystem::create_directories(p, ec);

src/path_manager/path_manager.h

@@ -26,8 +26,6 @@ class PathManager {
 
   std::filesystem::path GetLogPath();
 
-  std::filesystem::path GetCertPath();
-
   bool CreateDirectories(const std::filesystem::path& p);
 
  private:

src/tools/file_transfer.h

@@ -97,6 +97,14 @@ class FileReceiver {
 
   const std::filesystem::path& OutputDir() const { return output_dir_; }
 
+  void SetOutputDir(const std::filesystem::path& dir) {
+    output_dir_ = dir;
+    if (!output_dir_.empty()) {
+      std::error_code ec;
+      std::filesystem::create_directories(output_dir_, ec);
+    }
+  }
+
  private:
   static std::filesystem::path GetDefaultDesktopPath();
 

xmake.lua

@@ -70,6 +70,9 @@ target("common")
     set_kind("object")
     add_deps("rd_log")
     add_files("src/common/*.cpp")
+    if is_os("macosx") then
+        add_files("src/common/*.mm")
+    end
     add_includedirs("src/common", {public = true})
 
 target("path_manager")
@@ -200,4 +203,7 @@ target("crossdesk")
     set_kind("binary")
     add_deps("rd_log", "common", "gui")
     add_files("src/app/*.cpp")
-    add_includedirs("src/app", {public = true})
+    add_includedirs("src/app", {public = true})
+    if is_os("windows") then
+        add_files("scripts/windows/crossdesk.rc")
+    end