[release] prepare v1.5.2 release notes

[fix] recover headless capture and use WGC for usbmmidd displays
[feat] add force relay connection option to settings
2026-10-15 00:09:39 +08:00 · 2026-09-24 11:15:58 +08:00 · 2026-09-23 14:40:58 +08:00 · 2026-09-22 11:03:51 +08:00 · 2026-09-22 10:47:42 +08:00 · 2026-09-22 10:39:27 +08:00
208 changed files with 12690 additions and 20541 deletions
@@ -271,7 +271,7 @@ jobs:

      - name: Build CrossDesk
        run: |
-          xmake f --target_minver=${MACOSX_DEPLOYMENT_TARGET} --CROSSDESK_VERSION=${VERSION_NUM} --USE_CUDA=false -y
+          xmake f --target_minver=${MACOSX_DEPLOYMENT_TARGET} --CROSSDESK_VERSION=${VERSION_NUM} --USE_CUDA=false -vyD
          xmake b -vy crossdesk

      - name: Package CrossDesk app
@@ -682,7 +682,9 @@ jobs:
          $portableFiles = @(
            @("crossdesk.exe", "CrossDesk.exe"),
            @("crossdesk_service.exe", "crossdesk_service.exe"),
-            @("crossdesk_session_helper.exe", "crossdesk_session_helper.exe")
+            @("crossdesk_session_helper.exe", "crossdesk_session_helper.exe"),
+            @("crossdesk_privacy_cursor_helper.exe", "crossdesk_privacy_cursor_helper.exe"),
+            @("crossdesk_privacy_window.dll", "crossdesk_privacy_window.dll")
          )

          foreach ($file in $portableFiles) {
@@ -696,6 +698,13 @@ jobs:

          Copy-Item (Join-Path $buildDir "*.dll") $portableDir -Force

+          # Bundled Amyuni usbmmidd_v2 virtual display driver (headless hosts)
+          $driverDir = Join-Path $buildDir "usbmmidd_v2"
+          if (!(Test-Path (Join-Path $driverDir "deviceinstaller64.exe"))) {
+            throw "Missing bundled usbmmidd_v2 driver package: $driverDir"
+          }
+          Copy-Item $driverDir (Join-Path $portableDir "usbmmidd_v2") -Recurse -Force
+
          foreach ($file in $portableFiles) {
            $packagedFile = Join-Path $portableDir $file[1]
            if (!(Test-Path $packagedFile)) {
@@ -205,6 +205,8 @@ sudo apt install "./crossdesk-linux-amd64-<version>.deb"

 CrossDesk 使用 [GPL-3.0](LICENSE) 许可。隐私说明见 [隐私政策](PRIVACY.md#中文)。

+Windows 安装包内置 [Amyuni Technologies](https://www.amyuni.com/) 的 USB Mobile Monitor 虚拟显示器驱动（usbmmidd_v2），用于无显示器主机；驱动未作任何修改，其许可见安装目录 `usbmmidd_v2\License.txt`。
+
 ### Code signing policy

 CrossDesk 使用 SignPath.io 为本仓库构建的官方 Windows 发布包提供代码签名。
@@ -205,6 +205,8 @@ Thanks to [HelloGitHub](https://hellogithub.com/), [Ruanyf Weekly](https://githu

 CrossDesk is licensed under [GPL-3.0](LICENSE). See the [Privacy Policy](PRIVACY.md#english).

+The Windows packages bundle the unmodified USB Mobile Monitor virtual display driver (usbmmidd_v2) by [Amyuni Technologies](https://www.amyuni.com/) for hosts without a monitor; its license is in `usbmmidd_v2\License.txt` in the install directory.
+
 ### Code signing policy

 CrossDesk uses SignPath.io to sign official Windows releases built from this repository.
@@ -0,0 +1,13 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-11
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+IDI_CROSSDESK_LOGO ICON "crossdesk.ico"
+
+#define CROSSDESK_FILE_DESCRIPTION "CrossDesk Privacy Window"
+#define CROSSDESK_ORIGINAL_FILENAME "crossdesk_privacy_window.dll"
+#define CROSSDESK_FILE_TYPE VFT_DLL
+
+#include "version_info.rcinc"
@@ -0,0 +1,12 @@
+Copyright 2014-2021 Amyuni Technologies Inc.
+https://www.amyuni.com
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+By using this software, you accept to be prompted with an advertisement page which is not always under the control of the author. A fully commercial version is available for users who do not wisth to see those advertisements.
+
+Permission is granted to anyone to use this software for any purpose subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software.
+   If you use this software in a product, an acknowledgment in the product documentation would be required.
+2. Altered versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any distribution.
@@ -0,0 +1,50 @@
+Procedure to add a virtual monitor to your system (Windows 10 Only!)
+
+- Download our virtual display driver from https://www.amyuni.com/downloads/usbmmidd_v2.zip
+- Unpack the zip file to an empty folder, e.g. c:\temp\usbmmidd
+- Make sure you read the License.txt file as with any other software product
+- Open a command prompt window as Administrator (you cannot add a device to your system unless you "Run As Administrator")
+- Run the following commands:
+	- cd c:\temp\usbmmid (or whatever destination folder you chose)
+	- deviceinstaller64 install usbmmidd.inf usbmmidd (If you are on a 32-bit system, replace "deviceinstaller64" by "deviceinstaller")
+	- Make sure you see the message that the drivers are signed by Amyuni Technologies Inc. This is a confirmation that the drivers went through Microsoft driver signing procedure and are virus free
+	
+- Starting with version 2, the virtual monitor supports the following display resolutions by default:
+
+1024 x 768 pixels
+1360 x 768 pixels
+1440 x 900 pixels
+1600 x 900 pixels
+1600 x 1200 pixels
+1920 x 1080 pixels [Default Resolution]
+1920 x 1200 pixels
+2560 x 1440 pixels
+3840 x 2160 pixels
+
+After the first step above is executed, you can modify the list of supported resolutions by changing the following registry key:
+HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\WUDF\Services\usbmmIdd\Parameters\Monitors
+
+Up to 10 resolutions can be defined through this registry key. The keys should be named from "0" to "9". The (Default) registry value defines the default monitor resolution.
+
+Note that the list of resolutions can also be found in the usbmmidd.inf file that accompanies the printer driver. The inf file should not be modified in any way, otherwise the virtual display driver digital signature is invalidated.
+
+Once you are satisfied with the list of resolutions, you can activate the virtual monitor by running: 
+- deviceinstaller64 enableidd 1
+
+With version 2, rou can run this command multiple times to add up to 4 virtual monitors to your system.
+
+The included batch file usbmmidd.bat runs these commands automatically and selects between the 32- or 64-bit version of deviceinstaller.
+If you are not comfortable opening a command prompt and entering these commands, right-click on usbmmidd.bat and "Run As Administrator."
+
+That's it. You now have a high definition monitor in your Display Settings. You can change the display resolution, position the monitor, extend the desktop or do whatever you do with a real monitor.
+
+To deactivate the virtual monitor, run the command:
+deviceinstaller64 enableidd 0
+If ou have added more than one monitor, you should run this command multiple times to remove all monitors.
+
+to reactivate a virtual monitor:
+deviceinstaller64 enableidd 1
+
+To completely remove the drivers from your system, you can either go through the Device Manager and uninstall "USB Mobile Monitor Virtual Display", or run the commands:
+deviceinstaller64 stop usbmmidd
+deviceinstaller64 remove usbmmid
@@ -0,0 +1,16 @@
+@cd /d "%~dp0"
+
+@goto %PROCESSOR_ARCHITECTURE%
+@exit
+
+:AMD64
+@cmd /c deviceinstaller64.exe install usbmmidd.inf usbmmidd
+@cmd /c deviceinstaller64.exe enableidd 1
+@goto end
+
+:x86
+@cmd /c deviceinstaller.exe install usbmmidd.inf usbmmidd
+@cmd /c deviceinstaller.exe enableidd 1
+
+:end
+@pause
@@ -87,7 +87,7 @@ if [[ ! -x "$BUILD_BINARY" ]]; then
    exit 1
 fi

-for command_name in readelf ldd dpkg-deb; do
+for command_name in readelf ldd dpkg-deb strip; do
    if ! command -v "$command_name" >/dev/null 2>&1; then
        echo "Required packaging command is missing: $command_name" >&2
        exit 1
@@ -128,6 +128,9 @@ if [[ -n "$SLINT_NEEDED" ]]; then
        exit 1
    fi
    install -m 0755 "$SLINT_LIBRARY" "$PRIVATE_DIR/$SLINT_NEEDED"
+    # Keep dynamic exports/relocations while removing unneeded symbols from the
+    # staged copy. Never strip Xmake's cached runtime in place.
+    strip --strip-unneeded "$PRIVATE_DIR/$SLINT_NEEDED"
 fi

 cat > "$BIN_DIR/$PKG_NAME" <<'EOF'
@@ -161,7 +164,7 @@ Architecture: $DEBIAN_ARCH
 Maintainer: $MAINTAINER
 Description: $DESCRIPTION
 Depends: libc6 (>= 2.31), libstdc++6 (>= 10), libx11-6, libxext6,
- libxrender1, libxft2, libxrandr2, libxfixes3, libxcursor1, libxcb1, libxcb-randr0,
+ libxrender1, libxft2, libxrandr2, libxfixes3, libxcursor1, libxi6, libxcb1, libxcb-randr0,
 libxcb-xtest0, libxcb-xinerama0, libxcb-shape0, libxcb-xkb1,
 libxcb-xfixes0, libxv1, libxtst6, $ALSA_RUNTIME_DEP, libsndio7.0,
 libxcb-shm0, libpulse0, libdrm2, libdbus-1-3, libgl1
@@ -11,7 +11,7 @@ EXPECTED_ARCH="$2"
 APP_EXECUTABLE="$APP_BUNDLE/Contents/MacOS/CrossDesk"
 FRAMEWORKS_DIR="$APP_BUNDLE/Contents/Frameworks"

-for command_name in codesign install_name_tool lipo otool; do
+for command_name in codesign install_name_tool lipo otool strip; do
    if ! command -v "$command_name" >/dev/null 2>&1; then
        echo "Required bundling command is missing: $command_name" >&2
        exit 1
@@ -123,7 +123,11 @@ if ! otool -l "$APP_EXECUTABLE" | awk '
    install_name_tool -add_rpath "@executable_path/../Frameworks" "$APP_EXECUTABLE"
 fi

-# install_name_tool invalidates the linker's ad-hoc signature. Sign nested code
+# Strip only the staged runtime, retaining exported symbols for Slint's C ABI.
+# The package cache remains intact for debugging and other consumers.
+strip -S -x "$FRAMEWORKS_DIR/$SLINT_NAME"
+
+# install_name_tool and strip invalidate the linker's ad-hoc signature. Sign nested code
 # first, then seal the complete app bundle so local packages remain launchable.
 codesign --force --sign - "$FRAMEWORKS_DIR/$SLINT_NAME"
 codesign --force --deep --sign - "$APP_BUNDLE"
@@ -88,8 +88,14 @@ installApp:
    ; Bundle service-side binaries required by the Windows service flow
    File "..\..\..\..\build\windows\x64\release\crossdesk_service.exe"
    File "..\..\..\..\build\windows\x64\release\crossdesk_session_helper.exe"
+    File "..\..\..\..\build\windows\x64\release\crossdesk_privacy_cursor_helper.exe"
+    File "..\..\..\..\build\windows\x64\release\crossdesk_privacy_window.dll"
    ; Bundle runtime DLLs from the release output directory
-    File "..\..\..\..\build\windows\x64\release\*.dll"
+    File /x crossdesk_privacy_window.dll "..\..\..\..\build\windows\x64\release\*.dll"
+    ; Amyuni usbmmidd_v2 virtual display driver for headless hosts. xmake
+    ; copies apps\desktop\resources\windows\usbmmidd_v2 into the release
+    ; output directory after building crossdesk; its License.txt ships with it.
+    File /r "..\..\..\..\build\windows\x64\release\usbmmidd_v2"

    Call RegisterInstalledService

@@ -140,13 +146,19 @@ cancelUninstall:

 uninstallApp:
    Call un.UnregisterInstalledService
+    Call un.RemoveUsbmmiddDriver

    ; Delete main executable and uninstaller
    Delete "$INSTDIR\CrossDesk.exe"
    Delete "$INSTDIR\crossdesk_service.exe"
    Delete "$INSTDIR\crossdesk_session_helper.exe"
+    Delete "$INSTDIR\crossdesk_privacy_cursor_helper.exe"
+    Delete "$INSTDIR\crossdesk_privacy_window.dll"
    Delete "$INSTDIR\uninstall.exe"

+    ; Leave the install directory before removing it
+    SetOutPath "$TEMP"
+
    ; Recursively delete installation directory
    RMDir /r "$INSTDIR"

@@ -244,3 +256,50 @@ unregister_with_sc:
        Abort
    ${EndIf}
 FunctionEnd
+
+; The session helper (or an elevated CrossDesk) installs the bundled usbmmidd
+; driver on first headless use and records HKLM\SOFTWARE\CrossDesk\
+; UsbmmiddDriverInstalled in the 64-bit registry view. Only a driver CrossDesk
+; installed is removed here; one set up by the user for other software stays.
+; deviceinstaller64.exe resolves usbmmIdd.dll relative to the working
+; directory, so run it from the driver folder. Failures are logged, not fatal:
+; the driver can still be removed from Device Manager.
+Function un.RemoveUsbmmiddDriver
+    IfFileExists "$INSTDIR\usbmmidd_v2\deviceinstaller64.exe" 0 done
+
+    SetRegView 64
+    ClearErrors
+    ReadRegDWORD $0 HKLM "Software\${PRODUCT_NAME}" "UsbmmiddDriverInstalled"
+    ${If} ${Errors}
+    ${OrIf} $0 != 1
+        SetRegView lastused
+        Return
+    ${EndIf}
+
+    DetailPrint "Removing the usbmmidd virtual display driver installed by CrossDesk"
+    SetOutPath "$INSTDIR\usbmmidd_v2"
+    ; Unplug every virtual monitor first (the driver allows up to four).
+    StrCpy $1 0
+unplug_loop:
+    nsExec::ExecToLog '"$INSTDIR\usbmmidd_v2\deviceinstaller64.exe" enableidd 0'
+    Pop $2
+    IntOp $1 $1 + 1
+    ${If} $2 = 0
+    ${AndIf} $1 < 4
+        Goto unplug_loop
+    ${EndIf}
+    nsExec::ExecToLog '"$INSTDIR\usbmmidd_v2\deviceinstaller64.exe" stop usbmmidd'
+    Pop $2
+    nsExec::ExecToLog '"$INSTDIR\usbmmidd_v2\deviceinstaller64.exe" remove usbmmidd'
+    Pop $2
+    ${If} $2 != 0
+        DetailPrint "usbmmidd driver removal returned $2; remove 'USB Mobile Monitor Virtual Display' from Device Manager if it remains"
+    ${EndIf}
+    SetOutPath "$TEMP"
+
+    DeleteRegValue HKLM "Software\${PRODUCT_NAME}" "UsbmmiddDriverInstalled"
+    DeleteRegKey /ifempty HKLM "Software\${PRODUCT_NAME}"
+    SetRegView lastused
+
+done:
+FunctionEnd
@@ -22,8 +22,13 @@
 #include "config_center.h"
 #include "daemon.h"
 #include "path_manager.h"
+#include "rd_log.h"
 #include "render.h"

+#ifdef __linux__
+#include "platform/linux/privacy/privacy_guard.h"
+#endif
+
 #ifdef _WIN32
 namespace {

@@ -175,11 +180,27 @@ int HandleServiceCliCommand(const std::string& command) {
 #endif

 int main(int argc, char* argv[]) {
+#ifdef __linux__
+  // Run before GUI, configuration, logging or daemon initialization. The
+  // guard owns native privacy resources and restores them if this app exits.
+  if (argc == 2 &&
+      std::strcmp(argv[1], crossdesk::kLinuxPrivacyGuardArgument) == 0) {
+    return crossdesk::RunLinuxPrivacyGuard();
+  }
+#endif
 #ifdef _WIN32
  if (argc == 2 &&
      std::strcmp(argv[1], crossdesk::kSlintRendererProbeArgument) == 0) {
    return crossdesk::RunSlintRendererProbe();
  }
+#endif
+
+  // Service operations and config migration can log before the GUI starts.
+  // Configure the directory first, including CLI and daemon child paths.
+  auto path_manager = std::make_unique<crossdesk::PathManager>("CrossDesk");
+  crossdesk::InitLogger(path_manager->GetLogPath().string());
+
+#ifdef _WIN32
  if (argc > 1 && IsServiceCliCommand(argv[1])) {
    return HandleServiceCliCommand(argv[1]);
  }
@@ -206,7 +227,6 @@ int main(int argc, char* argv[]) {
 #endif

  bool enable_daemon = false;
-  auto path_manager = std::make_unique<crossdesk::PathManager>("CrossDesk");
  if (path_manager) {
    std::string cache_path = path_manager->GetCachePath().string();
    crossdesk::ConfigCenter config_center(cache_path + "/config.ini");
@@ -233,4 +253,4 @@ int main(int argc, char* argv[]) {
  crossdesk::Render render;
  render.Run();
  return 0;
-}
+}
@@ -1,63 +0,0 @@
-#include "rounded_corner_button.h"
-
-namespace crossdesk {
-bool RoundedCornerButton(const char* label, const ImVec2& size, float rounding,
-                         ImDrawFlags round_flags, bool enabled,
-                         ImU32 normal_col, ImU32 hover_col, ImU32 active_col,
-                         ImU32 border_col) {
-  ImGuiWindow* current_window = ImGui::GetCurrentWindow();
-  if (current_window->SkipItems) return false;
-
-  const ImGuiStyle& style = ImGui::GetStyle();
-
-  ImGuiID button_id = current_window->GetID(label);
-  ImVec2 cursor_pos = current_window->DC.CursorPos;
-  ImVec2 button_size = ImGui::CalcItemSize(size, 0.0f, 0.0f);
-  ImRect button_rect(cursor_pos, ImVec2(cursor_pos.x + button_size.x,
-                                        cursor_pos.y + button_size.y));
-  ImGui::ItemSize(button_rect);
-  if (!ImGui::ItemAdd(button_rect, button_id)) return false;
-
-  bool is_hovered = false, is_held = false;
-  bool is_pressed = false;
-  if (enabled) {
-    is_pressed =
-        ImGui::ButtonBehavior(button_rect, button_id, &is_hovered, &is_held);
-  }
-
-  if (normal_col == 0) normal_col = ImGui::GetColorU32(ImGuiCol_Button);
-  if (hover_col == 0) hover_col = ImGui::GetColorU32(ImGuiCol_ButtonHovered);
-  if (active_col == 0) active_col = ImGui::GetColorU32(ImGuiCol_ButtonActive);
-  if (border_col == 0) border_col = ImGui::GetColorU32(ImGuiCol_Border);
-
-  ImU32 fill_color = normal_col;
-  if (is_held && is_hovered)
-    fill_color = active_col;
-  else if (is_hovered)
-    fill_color = hover_col;
-
-  if (!enabled) fill_color = IM_COL32(120, 120, 120, 180);
-
-  ImDrawList* window_draw_list = ImGui::GetWindowDrawList();
-
-  window_draw_list->AddRectFilled(button_rect.Min, button_rect.Max, fill_color,
-                                  rounding, round_flags);
-
-  if (style.FrameBorderSize > 0.0f) {
-    window_draw_list->AddRect(button_rect.Min, button_rect.Max, border_col,
-                              rounding, round_flags, style.FrameBorderSize);
-  }
-
-  ImU32 text_color =
-      ImGui::GetColorU32(enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled);
-
-  const char* label_end = ImGui::FindRenderedTextEnd(label);
-  ImGui::PushStyleColor(ImGuiCol_Text,
-                        ImGui::ColorConvertU32ToFloat4(text_color));
-  ImGui::RenderTextClipped(button_rect.Min, button_rect.Max, label, label_end,
-                           nullptr, ImVec2(0.5f, 0.5f), &button_rect);
-  ImGui::PopStyleColor();
-
-  return is_pressed;
-}
-}  // namespace crossdesk
@@ -1,20 +0,0 @@
-/*
- * @Author: DI JUNKUN
- * @Date: 2026-02-26
- * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
- */
-
-#ifndef _ROUNDED_CORNER_BUTTON_H_
-#define _ROUNDED_CORNER_BUTTON_H_
-
-#include "imgui.h"
-#include "imgui_internal.h"
-
-namespace crossdesk {
-bool RoundedCornerButton(const char* label, const ImVec2& size, float rounding,
-                         ImDrawFlags round_flags, bool enabled = true,
-                         ImU32 normal_col = 0, ImU32 hover_col = 0,
-                         ImU32 active_col = 0, ImU32 border_col = 0);
-}  // namespace crossdesk
-
-#endif
@@ -58,6 +58,14 @@ int ConfigCenter::Load() {
  video_frame_rate_ = static_cast<VIDEO_FRAME_RATE>(ini_.GetLongValue(
      section_, "video_frame_rate", static_cast<long>(video_frame_rate_)));

+  const long screen_capture_method_value = ini_.GetLongValue(
+      section_, "screen_capture_method",
+      static_cast<long>(ScreenCaptureMethod::Auto));
+  screen_capture_method_ = IsValidScreenCaptureMethod(screen_capture_method_value)
+                               ? static_cast<ScreenCaptureMethod>(
+                                     screen_capture_method_value)
+                               : ScreenCaptureMethod::Auto;
+
  const long video_adaptation_policy_value = ini_.GetLongValue(
      section_, "video_adaptation_policy",
      static_cast<long>(video_adaptation_policy_));
@@ -95,7 +103,12 @@ int ConfigCenter::Load() {
    ini_.SetLongValue(section_, "turn_mode", static_cast<long>(turn_mode_));
    persist_config_migration = true;
  }
-  enable_srtp_ = ini_.GetBoolValue(section_, "enable_srtp", enable_srtp_);
+  // Migrate the former user switch. Keep true in the file for older builds,
+  // while the current application always requests encrypted native media.
+  if (!ini_.GetBoolValue(section_, "enable_srtp", false)) {
+    ini_.SetBoolValue(section_, "enable_srtp", true);
+    persist_config_migration = true;
+  }
  enable_self_hosted_ =
      ini_.GetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);

@@ -116,19 +129,11 @@ int ConfigCenter::Load() {
  } else {
    signal_server_port_ = 0;
  }
-  const char* coturn_server_port_value =
-      ini_.GetValue(section_, "coturn_server_port", nullptr);
-  if (coturn_server_port_value != nullptr &&
-      strlen(coturn_server_port_value) > 0) {
-    coturn_server_port_ =
-        static_cast<int>(ini_.GetLongValue(section_, "coturn_server_port", 0));
-  } else {
-    coturn_server_port_ = 0;
-  }
-
  enable_autostart_ =
      ini_.GetBoolValue(section_, "enable_autostart", enable_autostart_);
  enable_daemon_ = ini_.GetBoolValue(section_, "enable_daemon", enable_daemon_);
+  enable_privacy_screen_.store(
+      ini_.GetBoolValue(section_, "enable_privacy_screen", true));
  portable_service_prompt_suppressed_ =
      ini_.GetBoolValue(section_, "portable_service_prompt_suppressed",
                        portable_service_prompt_suppressed_);
@@ -155,6 +160,8 @@ int ConfigCenter::Save() {
                    static_cast<long>(video_quality_));
  ini_.SetLongValue(section_, "video_frame_rate",
                    static_cast<long>(video_frame_rate_));
+  ini_.SetLongValue(section_, "screen_capture_method",
+                    static_cast<long>(screen_capture_method_));
  ini_.SetLongValue(section_, "video_adaptation_policy",
                    static_cast<long>(video_adaptation_policy_));
  ini_.SetLongValue(section_, "video_encode_format",
@@ -163,7 +170,7 @@ int ConfigCenter::Save() {
  ini_.SetLongValue(section_, "turn_mode", static_cast<long>(turn_mode_));
  ini_.SetBoolValue(section_, "enable_turn",
                    turn_mode_ != TURN_MODE::DISABLED);
-  ini_.SetBoolValue(section_, "enable_srtp", enable_srtp_);
+  ini_.SetBoolValue(section_, "enable_srtp", true);
  ini_.SetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);

  // only save when self hosted
@@ -171,12 +178,12 @@ int ConfigCenter::Save() {
    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_.SetBoolValue(section_, "enable_autostart", enable_autostart_);
  ini_.SetBoolValue(section_, "enable_daemon", enable_daemon_);
+  ini_.SetBoolValue(section_, "enable_privacy_screen",
+                    enable_privacy_screen_.load());
  ini_.SetBoolValue(section_, "portable_service_prompt_suppressed",
                    portable_service_prompt_suppressed_);

@@ -225,6 +232,20 @@ int ConfigCenter::SetVideoFrameRate(VIDEO_FRAME_RATE video_frame_rate) {
  return 0;
 }

+int ConfigCenter::SetScreenCaptureMethod(ScreenCaptureMethod method) {
+  if (!IsValidScreenCaptureMethod(static_cast<long>(method))) {
+    return -1;
+  }
+  ini_.SetLongValue(section_, "screen_capture_method", static_cast<long>(method));
+  if (ini_.SaveFile(config_path_.c_str()) < 0) {
+    ini_.SetLongValue(section_, "screen_capture_method",
+                      static_cast<long>(screen_capture_method_));
+    return -1;
+  }
+  screen_capture_method_ = method;
+  return 0;
+}
+
 int ConfigCenter::SetVideoAdaptationPolicy(
    VIDEO_ADAPTATION_POLICY policy) {
  video_adaptation_policy_ = policy;
@@ -275,24 +296,16 @@ int ConfigCenter::SetTurnMode(TURN_MODE turn_mode) {
  return 0;
 }

-int ConfigCenter::SetTurn(bool enable_turn) {
+int ConfigCenter::SetTurn(bool enable_turn, bool force_relay) {
  if (!enable_turn) {
    return SetTurnMode(TURN_MODE::DISABLED);
  }
-  if (turn_mode_ == TURN_MODE::DISABLED) {
+  if (!force_relay) {
    return SetTurnMode(TURN_MODE::AUTO_UDP_TCP);
  }
-  return SetTurnMode(turn_mode_);
-}
-
-int ConfigCenter::SetSrtp(bool enable_srtp) {
-  enable_srtp_ = enable_srtp;
-  ini_.SetBoolValue(section_, "enable_srtp", enable_srtp_);
-  SI_Error rc = ini_.SaveFile(config_path_.c_str());
-  if (rc < 0) {
-    return -1;
-  }
-  return 0;
+  // Use TURN/UDP by default, preserving an explicitly configured TCP relay.
+  return SetTurnMode(turn_mode_ == TURN_MODE::FORCE_TCP ? TURN_MODE::FORCE_TCP
+                                                     : TURN_MODE::FORCE_UDP);
 }

 int ConfigCenter::SetServerHost(const std::string& signal_server_host) {
@@ -316,17 +329,6 @@ int ConfigCenter::SetServerPort(int signal_server_port) {
  return 0;
 }

-int ConfigCenter::SetCoturnServerPort(int coturn_server_port) {
-  coturn_server_port_ = coturn_server_port;
-  ini_.SetLongValue(section_, "coturn_server_port",
-                    static_cast<long>(coturn_server_port_));
-  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_);
@@ -346,19 +348,9 @@ int ConfigCenter::SetSelfHosted(bool enable_self_hosted) {
      signal_server_port_ = static_cast<int>(
          ini_.GetLongValue(section_, "signal_server_port", 0));
    }
-    const char* coturn_server_port_value =
-        ini_.GetValue(section_, "coturn_server_port", nullptr);
-    if (coturn_server_port_value != nullptr &&
-        strlen(coturn_server_port_value) > 0) {
-      coturn_server_port_ = static_cast<int>(
-          ini_.GetLongValue(section_, "coturn_server_port", 0));
-    }
-
    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_));
  }

  SI_Error rc = ini_.SaveFile(config_path_.c_str());
@@ -403,6 +395,21 @@ int ConfigCenter::SetDaemon(bool enable_daemon) {
  return 0;
 }

+int ConfigCenter::SetPrivacyScreen(bool enable_privacy_screen) {
+  const bool previous = enable_privacy_screen_.load();
+  if (previous == enable_privacy_screen) return 0;
+  ini_.SetBoolValue(section_, "enable_privacy_screen", enable_privacy_screen);
+  if (ini_.SaveFile(config_path_.c_str()) < 0) {
+    ini_.SetBoolValue(section_, "enable_privacy_screen", previous);
+    LOG_ERROR("Failed to save automatic privacy screen preference");
+    return -1;
+  }
+  // RTC callbacks read only the value committed by the settings thread.
+  enable_privacy_screen_.store(enable_privacy_screen);
+  LOG_INFO("Privacy screen on incoming connection: {}", enable_privacy_screen);
+  return 0;
+}
+
 int ConfigCenter::SetPortableServicePromptSuppressed(bool suppressed) {
  portable_service_prompt_suppressed_ = suppressed;
  ini_.SetBoolValue(section_, "portable_service_prompt_suppressed",
@@ -427,6 +434,10 @@ ConfigCenter::VIDEO_FRAME_RATE ConfigCenter::GetVideoFrameRate() const {
  return video_frame_rate_;
 }

+ScreenCaptureMethod ConfigCenter::GetScreenCaptureMethod() const {
+  return screen_capture_method_;
+}
+
 ConfigCenter::VIDEO_ADAPTATION_POLICY
 ConfigCenter::GetVideoAdaptationPolicy() const {
  return video_adaptation_policy_;
@@ -436,8 +447,18 @@ ConfigCenter::VIDEO_ENCODE_FORMAT ConfigCenter::GetVideoEncodeFormat() const {
  return video_encode_format_;
 }

+bool ConfigCenter::IsHardwareVideoCodecAvailable() {
+#if (((defined(_WIN32) || defined(__linux__)) && !defined(__aarch64__) && \
+      !defined(__arm__) && USE_CUDA) ||                                   \
+     defined(__APPLE__))
+  return true;
+#else
+  return false;
+#endif
+}
+
 bool ConfigCenter::IsHardwareVideoCodec() const {
-  return hardware_video_codec_;
+  return IsHardwareVideoCodecAvailable() && hardware_video_codec_;
 }

 ConfigCenter::TURN_MODE ConfigCenter::GetTurnMode() const {
@@ -448,7 +469,11 @@ bool ConfigCenter::IsEnableTurn() const {
  return turn_mode_ != TURN_MODE::DISABLED;
 }

-bool ConfigCenter::IsEnableSrtp() const { return enable_srtp_; }
+bool ConfigCenter::IsForceRelay() const {
+  return turn_mode_ == TURN_MODE::FORCE_UDP || turn_mode_ == TURN_MODE::FORCE_TCP;
+}
+
+bool ConfigCenter::IsEnableSrtp() const { return true; }

 std::string ConfigCenter::GetSignalServerHost() const {
  return signal_server_host_;
@@ -456,8 +481,6 @@ std::string ConfigCenter::GetSignalServerHost() const {

 int ConfigCenter::GetSignalServerPort() const { return signal_server_port_; }

-int ConfigCenter::GetCoturnServerPort() const { return coturn_server_port_; }
-
 std::string ConfigCenter::GetDefaultServerHost() const {
  return signal_server_host_default_;
 }
@@ -466,16 +489,16 @@ int ConfigCenter::GetDefaultSignalServerPort() const {
  return server_port_default_;
 }

-int ConfigCenter::GetDefaultCoturnServerPort() const {
-  return coturn_server_port_default_;
-}
-
 bool ConfigCenter::IsSelfHosted() const { return enable_self_hosted_; }

 bool ConfigCenter::IsEnableAutostart() const { return enable_autostart_; }

 bool ConfigCenter::IsEnableDaemon() const { return enable_daemon_; }

+bool ConfigCenter::IsEnablePrivacyScreen() const {
+  return enable_privacy_screen_.load();
+}
+
 bool ConfigCenter::IsPortableServicePromptSuppressed() const {
  return portable_service_prompt_suppressed_;
 }
@@ -7,9 +7,11 @@
 #ifndef _CONFIG_CENTER_H_
 #define _CONFIG_CENTER_H_

+#include <atomic>
 #include <string>

 #include "SimpleIni.h"
+#include "screen_capturer/screen_capture_method.h"

 namespace crossdesk {

@@ -39,18 +41,18 @@ class ConfigCenter {
  int SetLanguage(LANGUAGE language);
  int SetVideoQuality(VIDEO_QUALITY video_quality);
  int SetVideoFrameRate(VIDEO_FRAME_RATE video_frame_rate);
+  int SetScreenCaptureMethod(ScreenCaptureMethod method);
  int SetVideoAdaptationPolicy(VIDEO_ADAPTATION_POLICY policy);
  int SetVideoEncodeFormat(VIDEO_ENCODE_FORMAT video_encode_format);
  int SetHardwareVideoCodec(bool hardware_video_codec);
  int SetTurnMode(TURN_MODE turn_mode);
-  int SetTurn(bool enable_turn);
-  int SetSrtp(bool enable_srtp);
+  int SetTurn(bool enable_turn, bool force_relay);
  int SetServerHost(const std::string& signal_server_host);
  int SetServerPort(int signal_server_port);
-  int SetCoturnServerPort(int coturn_server_port);
  int SetSelfHosted(bool enable_self_hosted);
  int SetAutostart(bool enable_autostart);
  int SetDaemon(bool enable_daemon);
+  int SetPrivacyScreen(bool enable_privacy_screen);
  int SetPortableServicePromptSuppressed(bool suppressed);
  int SetFileTransferSavePath(const std::string& path);

@@ -59,21 +61,24 @@ class ConfigCenter {
  LANGUAGE GetLanguage() const;
  VIDEO_QUALITY GetVideoQuality() const;
  VIDEO_FRAME_RATE GetVideoFrameRate() const;
+  ScreenCaptureMethod GetScreenCaptureMethod() const;
  VIDEO_ADAPTATION_POLICY GetVideoAdaptationPolicy() const;
  VIDEO_ENCODE_FORMAT GetVideoEncodeFormat() const;
+  // Whether this build includes a hardware video codec backend.
+  static bool IsHardwareVideoCodecAvailable();
  bool IsHardwareVideoCodec() const;
  TURN_MODE GetTurnMode() const;
  bool IsEnableTurn() const;
+  bool IsForceRelay() const;
  bool IsEnableSrtp() const;
  std::string GetSignalServerHost() const;
  int GetSignalServerPort() const;
-  int GetCoturnServerPort() const;
  std::string GetDefaultServerHost() const;
  int GetDefaultSignalServerPort() const;
-  int GetDefaultCoturnServerPort() const;
  bool IsSelfHosted() const;
  bool IsEnableAutostart() const;
  bool IsEnableDaemon() const;
+  bool IsEnablePrivacyScreen() const;
  bool IsPortableServicePromptSuppressed() const;
  std::string GetFileTransferSavePath() const;

@@ -88,21 +93,20 @@ class ConfigCenter {
  LANGUAGE language_ = LANGUAGE::CHINESE;
  VIDEO_QUALITY video_quality_ = VIDEO_QUALITY::HIGH;
  VIDEO_FRAME_RATE video_frame_rate_ = VIDEO_FRAME_RATE::FPS_60;
+  ScreenCaptureMethod screen_capture_method_ = ScreenCaptureMethod::Auto;
  VIDEO_ADAPTATION_POLICY video_adaptation_policy_ =
      VIDEO_ADAPTATION_POLICY::QUALITY_PRIORITY;
  VIDEO_ENCODE_FORMAT video_encode_format_ = VIDEO_ENCODE_FORMAT::H264;
  bool hardware_video_codec_ = false;
  TURN_MODE turn_mode_ = TURN_MODE::AUTO_UDP_TCP;
-  bool enable_srtp_ = false;
  std::string signal_server_host_ = "";
  std::string signal_server_host_default_ = "api.crossdesk.cn";
  int signal_server_port_ = 0;
  int server_port_default_ = 9099;
-  int coturn_server_port_ = 0;
-  int coturn_server_port_default_ = 3478;
  bool enable_self_hosted_ = false;
  bool enable_autostart_ = false;
  bool enable_daemon_ = false;
+  std::atomic<bool> enable_privacy_screen_{true};
  bool portable_service_prompt_suppressed_ = false;
  std::string file_transfer_save_path_ = "";
 };
@@ -42,6 +42,9 @@ class KeyboardCapturer : public DeviceController {

  virtual int Hook(OnKeyAction on_key_action, void* user_ptr) = 0;
  virtual int Unhook() = 0;
+  // Backends with an asynchronous capture loop override this so the UI can
+  // fall back to window events if that loop stops unexpectedly.
+  virtual bool IsHookActive() const { return true; }
  virtual int SendKeyboardCommand(int key_code, bool is_down,
                                  uint32_t scan_code = 0,
                                  bool extended = false) = 0;
@@ -10,79 +10,30 @@
 #include <atomic>
 #include <chrono>
 #include <cstdint>
-#include <memory>
 #include <nlohmann/json.hpp>
 #include <string>

 namespace crossdesk::gui_detail {

 struct MainWindowState {
-  float title_bar_width_ = 640;
-  float title_bar_height_ = 30;
-  float title_bar_button_width_ = 30;
-  float title_bar_button_height_ = 30;
-
  bool exit_ = false;
-  const int sdl_refresh_ms_ = 16;
-
-  bool main_window_minimized_ = false;
-  int main_window_width_real_ = 720;
-  int main_window_height_real_ = 540;
-  float main_window_dpi_scaling_w_ = 1.0f;
-  float main_window_dpi_scaling_h_ = 1.0f;
-  float dpi_scale_ = 1.0f;
-  float main_window_width_default_ = 640;
-  float main_window_height_default_ = 480;
-  float main_window_width_ = 640;
-  float main_window_height_ = 480;
-  float main_window_width_last_ = 640;
-  float main_window_height_last_ = 480;
-  float local_window_width_ = 320;
-  float local_window_height_ = 235;
-  float remote_window_width_ = 320;
-  float remote_window_height_ = 235;
-  float local_child_window_width_ = 266;
-  float local_child_window_height_ = 180;
-  float remote_child_window_width_ = 266;
-  float remote_child_window_height_ = 180;
-  float main_window_text_y_padding_ = 10;
-  float main_child_window_x_padding_ = 27;
-  float main_child_window_y_padding_ = 45;
-  float status_bar_height_ = 22;
-  float connection_status_window_width_ = 200;
-  float connection_status_window_height_ = 150;
-  float notification_window_width_ = 200;
-  float notification_window_height_ = 80;
-  float about_window_width_ = 300;
-  float about_window_height_ = 170;
-  float update_notification_window_width_ = 400;
-  float update_notification_window_height_ = 320;
 };

-// Application-global interaction flags that coordinate SDL events with media
+// Application-global interaction flags that coordinate UI events with media
 // and remote-control devices.
 struct InteractionState {
  bool start_mouse_controller_ = false;
  bool mouse_controller_is_started_ = false;
  bool start_screen_capturer_ = false;
  bool screen_capturer_is_started_ = false;
-  bool start_speaker_capturer_ = false;
-  bool speaker_capturer_is_started_ = false;
  bool start_keyboard_capturer_ = false;
-  bool show_cursor_ = false;
  bool keyboard_capturer_is_started_ = false;
  bool keyboard_capturer_uses_window_events_ = false;
-  bool foucs_on_main_window_ = false;
  bool focus_on_stream_window_ = false;
  bool audio_capture_ = false;
  int screen_width_ = 1280;
  int screen_height_ = 720;
  int selected_display_ = 0;
-  std::string connect_button_label_ = "Connect";
-  char input_password_tmp_[7] = "";
-  char input_password_[7] = "";
-  std::string random_password_;
-  char new_password_[7] = "";
  char remote_id_display_[12] = "";
  unsigned char audio_buffer_[720]{};
  int audio_len_ = 0;
@@ -90,7 +41,6 @@ struct InteractionState {
  bool need_to_rejoin_ = false;
  std::chrono::steady_clock::time_point last_rejoin_check_time_ =
      std::chrono::steady_clock::now();
-  bool just_created_ = false;
  std::string controlled_remote_id_;
  std::string focused_remote_id_;
  std::string remote_client_id_;
@@ -103,26 +53,13 @@ struct UpdateState {
  std::string release_name_;
  std::string release_notes_;
  std::string release_date_;
-  bool show_new_version_icon_ = false;
-  bool show_new_version_icon_in_menu_ = true;
-  double new_version_icon_last_trigger_time_ = 0.0;
-  double new_version_icon_render_start_time_ = 0.0;
 };

 struct StreamWindowState {
  bool need_to_create_stream_window_ = false;
  bool stream_window_created_ = false;
  bool stream_window_inited_ = false;
-  bool window_maximized_ = false;
  bool control_mouse_ = false;
-  int stream_window_width_default_ = 1280;
-  int stream_window_height_default_ = 720;
-  float stream_window_width_ = 1280;
-  float stream_window_height_ = 720;
-  int stream_window_width_real_ = 1280;
-  int stream_window_height_real_ = 720;
-  float stream_window_dpi_scaling_w_ = 1.0f;
-  float stream_window_dpi_scaling_h_ = 1.0f;
 };

 struct ServerWindowState {
@@ -133,60 +70,22 @@ struct ServerWindowState {
  std::atomic<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;
-  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;
-  float window_rounding_ = 6.0f;
-  float window_rounding_default_ = 6.0f;
  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;
-  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;
 };

 struct UiState {
-  bool label_inited_ = false;
-  bool connect_button_pressed_ = false;
  bool password_validating_ = false;
  uint32_t password_validating_time_ = 0;
-  bool show_settings_window_ = false;
-  bool show_self_hosted_server_config_window_ = false;
  bool rejoin_ = false;
-  bool local_id_copied_ = false;
  bool show_password_ = true;
-  bool show_about_window_ = false;
  bool show_connection_status_window_ = false;
-  bool show_reset_password_window_ = false;
-  bool show_update_notification_window_ = false;
  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 show_edit_connection_alias_window_ = false;
  bool show_offline_warning_window_ = false;
-  bool delete_connection_ = false;
-  bool is_tab_bar_hovered_ = false;
-  std::string delete_connection_name_;
-  std::string edit_connection_alias_remote_id_;
-  char edit_connection_alias_[128] = "";
  std::string offline_warning_text_;
  bool re_enter_remote_id_ = false;
-  double copy_start_time_ = 0;
 };

 struct ApplicationState : MainWindowState,
@@ -198,4 +97,4 @@ struct ApplicationState : MainWindowState,

 }  // namespace crossdesk::gui_detail

-#endif
+#endif
@@ -3,6 +3,7 @@
 #include <remote_action.h>

 #include <SDL3/SDL.h>
+#include <openssl/rand.h>
 #include <slint.h>
 #include <tinyfiledialogs.h>

@@ -34,11 +35,14 @@
 #include "platform.h"
 #include "platform/video_renderer.h"
 #include "rendering/slint_video_presenter.h"
+#include "rendering/video_geometry.h"
+#include "runtime/privacy_control_state.h"
 #if _WIN32
 #include <windows.h>

 #include "platform/windows/gui/slint_backend.h"
 #include "platform/windows/gui/tray/win_tray.h"
+#include "platform/windows/gui/window_icons.h"
 #elif defined(__APPLE__)
 #include "platform/macos/gui/tray/mac_tray.h"
 #include "platform/window_drag.h"
@@ -62,6 +66,28 @@ namespace {

 using namespace std::chrono_literals;

+std::optional<std::string> GenerateRandomPassword(std::string_view current) {
+  constexpr std::string_view alphabet =
+      "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+  constexpr auto unbiased_limit = 256 - 256 % alphabet.size();
+  std::string password;
+  do {
+    password.clear();
+    while (password.size() < 6) {
+      unsigned char value;
+      if (RAND_bytes(&value, sizeof(value)) != 1) {
+        return std::nullopt;
+      }
+      // Reject the incomplete bucket so every character is equally likely.
+      if (value < unbiased_limit) {
+        password.push_back(alphabet[value % alphabet.size()]);
+      }
+    }
+  } while (password == current ||
+           password.find_first_not_of("0123456789") == std::string::npos);
+  return password;
+}
+
 std::string CreatePasswordChangeRequestId(uint64_t sequence) {
  const auto timestamp = std::chrono::system_clock::now()
                             .time_since_epoch()
@@ -949,10 +975,10 @@ int GuiApplication::Run() {
  }
  exec_log_path_ = path_manager_->GetLogPath().string();
  dll_log_path_ = exec_log_path_;
+  InitializeLogger();
  cache_path_ = path_manager_->GetCachePath().string();
  config_center_ = std::make_unique<ConfigCenter>(cache_path_ + "/config.ini");

-  InitializeLogger();
  LOG_INFO("CrossDesk version: {} (Slint UI)", CROSSDESK_VERSION);

  strncpy(signal_server_ip_self_, config_center_->GetSignalServerHost().c_str(),
@@ -1012,6 +1038,9 @@ int GuiApplication::Run() {
  // when deciding whether the last hidden window should stop the event loop.
  // Keep the loop alive until the tray's explicit Exit action requests quit.
  ui_->main->show();
+#if _WIN32
+  ConfigureWindowsWindowIcons(ui_->main->window().win32_hwnd());
+#endif
  slint::run_event_loop(slint::EventLoopMode::RunUntilQuit);
  Cleanup();
  return 0;
@@ -1027,6 +1056,8 @@ void GuiApplication::InitializeSettings() {
  language_button_value_ = localization_language_index_;
  localization_language_ =
      static_cast<ConfigCenter::LANGUAGE>(localization_language_index_);
+  privacy_.SetText({
+      localization::privacy_screen_unlock_hint[localization_language_index_]});
 }

 bool GuiApplication::InitializeSDL() {
@@ -1152,6 +1183,9 @@ void GuiApplication::InitializeSystemTray() {
      return;
    }
    ui_->main->show();
+#if _WIN32
+    ConfigureWindowsWindowIcons(ui_->main->window().win32_hwnd());
+#endif
    ui_->main->window().set_minimized(false);
 #if defined(__APPLE__)
    MacActivateWindow(ui_->main->window().appkit_view());
@@ -1221,16 +1255,31 @@ void GuiApplication::ResetSettingsUi() {
  ui_->main->set_adaptation_policy_index(
      video_adaptation_policy_button_value_);
  ui_->main->set_codec_index(video_encode_format_button_value_);
-  ui_->main->set_hardware_codec_enabled(enable_hardware_video_codec_);
+  const bool hardware_codec_available =
+      ConfigCenter::IsHardwareVideoCodecAvailable();
+  ui_->main->set_hardware_codec_available(hardware_codec_available);
+  ui_->main->set_hardware_codec_enabled(hardware_codec_available &&
+                                       enable_hardware_video_codec_);
  ui_->main->set_turn_enabled(enable_turn_);
-  ui_->main->set_srtp_enabled(enable_srtp_);
+  ui_->main->set_force_relay_enabled(config_center_->IsForceRelay());
  ui_->main->set_self_hosted_enabled(enable_self_hosted_);
  ui_->main->set_autostart_enabled(enable_autostart_);
  ui_->main->set_daemon_enabled(enable_daemon_);
+  ui_->main->set_privacy_on_connect_enabled(
+      config_center_->IsEnablePrivacyScreen());
+#ifdef _WIN32
+  ui_->main->set_capture_method_visible(true);
+  ui_->main->set_capture_method_index(
+      static_cast<int>(config_center_->GetScreenCaptureMethod()));
+#endif
+#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
+  ui_->main->set_privacy_setting_available(true);
+#else
+  ui_->main->set_privacy_setting_available(false);
+#endif
  ui_->main->set_file_save_path(file_transfer_save_path_buf_);
  ui_->main->set_server_host(signal_server_ip_self_);
  ui_->main->set_server_port(signal_server_port_self_);
-  ui_->main->set_coturn_port(coturn_server_port_self_);
 }

 void GuiApplication::BindMainCallbacks() {
@@ -1269,78 +1318,17 @@ void GuiApplication::BindMainCallbacks() {
    ui_->main->set_password_visible(show_password_);
  });
  main->on_reset_password([this](slint::SharedString value) {
-    const std::string password(value);
-    if (password.size() != 6) {
-      return false;
-    }
-
-    if (!peer_ || !signal_connected_) {
-      offline_warning_text_ =
-          localization::signal_disconnected[localization_language_index_];
-      show_offline_warning_window_ = true;
-      return true;
-    }
-
-    std::string request_id;
-    {
-      std::lock_guard<std::mutex> lock(password_change_mutex_);
-      if (password_change_pending_) {
-        return true;
-      }
-      request_id =
-          CreatePasswordChangeRequestId(++next_password_change_request_id_);
-      password_change_pending_ = true;
-      password_change_result_ready_ = false;
-      password_change_succeeded_ = false;
-      password_change_result_uncertain_ = false;
-      password_change_requested_at_ = std::chrono::steady_clock::now();
-      pending_password_change_request_id_ = request_id;
-      pending_local_password_ = password;
-      password_change_error_.clear();
-    }
-
-    const bool self_hosted = config_center_->IsSelfHosted();
-    const std::string server_host =
-        self_hosted ? config_center_->GetSignalServerHost()
-                    : config_center_->GetDefaultServerHost();
-    const int server_port =
-        self_hosted ? config_center_->GetSignalServerPort()
-                    : config_center_->GetDefaultSignalServerPort();
-    const std::string pending_identity =
-        std::string(client_id_) + "@" + password;
-    if (!settings_.StagePendingPasswordChange(
-            pending_identity, self_hosted, server_host, server_port,
-            request_id)) {
-      std::lock_guard<std::mutex> lock(password_change_mutex_);
-      password_change_pending_ = false;
-      pending_password_change_request_id_.clear();
-      pending_local_password_.clear();
-      password_change_error_.clear();
+    return RequestPasswordChange(std::string(value));
+  });
+  main->on_refresh_password([this] {
+    const auto password = GenerateRandomPassword(password_saved_);
+    if (!password) {
+      LOG_ERROR("Could not generate a random password");
      offline_warning_text_ = localization::failed[localization_language_index_];
      show_offline_warning_window_ = true;
-      LOG_ERROR("Could not durably stage password change");
-      return true;
+      return;
    }
-
-    const nlohmann::json request = {{"type", "change_password"},
-                                    {"request_id", request_id},
-                                    {"new_password", password}};
-    const std::string message = request.dump();
-    if (SendSignalMessage(peer_, message.data(), message.size()) != 0) {
-      {
-        std::lock_guard<std::mutex> lock(password_change_mutex_);
-        password_change_pending_ = false;
-        pending_password_change_request_id_.clear();
-        pending_local_password_.clear();
-        offline_warning_text_ =
-            localization::signal_disconnected[localization_language_index_];
-        show_offline_warning_window_ = true;
-      }
-      if (!settings_.ClearPendingPasswordChange()) {
-        LOG_WARN("Could not clear unsent pending password change");
-      }
-    }
-    return true;
+    RequestPasswordChange(*password);
  });
  main->on_connect_requested(
      [this](slint::SharedString id) { ConnectFromUi(std::string(id)); });
@@ -1388,7 +1376,6 @@ void GuiApplication::BindMainCallbacks() {
  main->on_save_self_hosted_settings([this] {
    const std::string host(ui_->main->get_server_host());
    const auto signal_port = ParsePort(ui_->main->get_server_port());
-    const auto coturn_port = ParsePort(ui_->main->get_coturn_port());
    if (!host.empty()) {
      config_center_->SetServerHost(host);
      std::memset(signal_server_ip_self_, 0, sizeof(signal_server_ip_self_));
@@ -1405,25 +1392,14 @@ void GuiApplication::BindMainCallbacks() {
      std::snprintf(signal_server_port_, sizeof(signal_server_port_), "%d",
                    *signal_port);
    }
-    if (coturn_port) {
-      config_center_->SetCoturnServerPort(*coturn_port);
-      std::snprintf(coturn_server_port_self_, sizeof(coturn_server_port_self_),
-                    "%d", *coturn_port);
-      std::snprintf(coturn_server_port_, sizeof(coturn_server_port_), "%d",
-                    *coturn_port);
-    }
  });
  main->on_cancel_self_hosted_settings([this] {
    const std::string host = config_center_->GetSignalServerHost();
    ui_->main->set_server_host(UiText(host));
    const int signal_port = config_center_->GetSignalServerPort();
-    const int coturn_port = config_center_->GetCoturnServerPort();
    ui_->main->set_server_port(signal_port > 0
                                   ? UiText(std::to_string(signal_port))
                                   : slint::SharedString{});
-    ui_->main->set_coturn_port(coturn_port > 0
-                                   ? UiText(std::to_string(coturn_port))
-                                   : slint::SharedString{});
  });
  main->on_open_download([this] { OpenUrl("https://crossdesk.cn"); });
  main->on_connection_cancel([this] {
@@ -1579,6 +1555,10 @@ void GuiApplication::BindStreamCallbacks() {
      return;
    }
    props->selected_display_ = index;
+    {
+      std::lock_guard lock(props->remote_cursor_state_mutex_);
+      props->cursor_presentation_ = {};
+    }
    RemoteAction action{};
    action.type = ControlType::display_id;
    action.d = index;
@@ -1600,6 +1580,36 @@ void GuiApplication::BindStreamCallbacks() {
    SendReliableDataFrame(props->peer_, message.c_str(), message.size(),
                          props->control_data_label_.c_str());
  });
+  stream->on_toggle_privacy([this] {
+    auto props = SelectedSession();
+    if (!props || !props->peer_ || !props->control_mouse_ ||
+        props->connection_status_.load() != ConnectionStatus::Connected) return;
+    RemoteAction action{};
+    action.type = ControlType::privacy_command;
+    {
+      std::lock_guard lock(props->privacy_status_mutex_);
+      const auto& status = props->privacy_status_;
+      const uint64_t now = SDL_GetTicks();
+      const auto controls = GetPrivacyControlState(
+          status, props->privacy_status_received_, props->privacy_command_pending_,
+          now - props->privacy_status_tick_, now - props->privacy_command_tick_);
+      if (!controls.can_toggle) return;
+      action.pc.flag = controls.active ? PrivacyCommandFlag::disable
+                                      : PrivacyCommandFlag::enable;
+      action.pc.block_local_input = true;
+      props->privacy_command_pending_ = true;
+      props->privacy_command_tick_ = now;
+      props->privacy_request_revision_ = status.revision;
+    }
+    const auto message = action.to_json();
+    if (SendReliableDataFrame(props->peer_, message.data(), message.size(),
+                              props->control_data_label_.c_str()) != 0) {
+      std::lock_guard lock(props->privacy_status_mutex_);
+      props->privacy_command_pending_ = false;
+      props->privacy_status_received_ = false;
+      LOG_WARN("Privacy command send failed, remote_id={}", props->remote_id_);
+    }
+  });
  stream->on_toggle_mouse_control([this] {
    auto props = SelectedSession();
    if (!props || !props->connection_established_) {
@@ -1609,6 +1619,7 @@ void GuiApplication::BindStreamCallbacks() {
    props->enable_mouse_control_ = props->control_mouse_;
    start_keyboard_capturer_ = props->control_mouse_;
    if (!props->control_mouse_) {
+      devices_.StopKeyboardCapturer();
      keyboard_.ForceReleasePressedKeys();
    }
  });
@@ -1798,7 +1809,6 @@ void GuiApplication::Tick() {
    }
  }

-  UpdateLabels();
  const bool was_reloading_recent_connections = reload_recent_connections_;
  HandleRecentConnections();
  if (was_reloading_recent_connections && !reload_recent_connections_) {
@@ -1807,6 +1817,7 @@ void GuiApplication::Tick() {
  HandleConnectionStatusChange();
  HandlePendingPresenceProbe();
  HandlePresenceProbeTimeout();
+  HandlePrivacy();
  HandleWindowsServiceIntegration();
 #if defined(__linux__) && !defined(__APPLE__)
  SyncXWaylandWindowActivation();
@@ -1846,9 +1857,20 @@ void GuiApplication::ShareLocalCursorState() {
  }

  CursorState sampled{};
-  if (!cursor_state_provider_.Sample(devices_.display_info_list(),
-                                     selected_display_, &sampled)) {
-    return;
+  const bool sample_ok = cursor_state_provider_.Sample(
+      devices_.display_info_list(), selected_display_, &sampled);
+  if (!sample_ok) {
+    sampled.render_mode = CursorRenderMode::unknown;
+    if (sampled.hidden_reason == CursorHiddenReason::unspecified) {
+      sampled.hidden_reason = CursorHiddenReason::sampling_failed;
+    }
+  } else if (sampled.render_mode == CursorRenderMode::legacy) {
+    // Providers without platform-specific presentation metadata only need to
+    // sample visible/shape; normalize that common case once for every peer.
+    sampled.render_mode = sampled.visible ? CursorRenderMode::separate
+                                          : CursorRenderMode::hidden;
+    sampled.hidden_reason = sampled.visible ? CursorHiddenReason::unspecified
+                                            : CursorHiddenReason::system_hidden;
  }

  const auto now = std::chrono::steady_clock::now();
@@ -1887,21 +1909,23 @@ void GuiApplication::ShareLocalCursorState() {

    const CursorState& previous = delivery.last_sent;
    const bool shape_changed =
-        !delivery.has_sent || sampled.visible != previous.visible ||
-        sampled.shape != previous.shape ||
-        std::abs(sampled.visual_offset_x - previous.visual_offset_x) >
-            kCursorPositionEpsilon ||
-        std::abs(sampled.visual_offset_y - previous.visual_offset_y) >
-            kCursorPositionEpsilon;
+        !delivery.has_sent || sampled.render_mode != previous.render_mode ||
+        sampled.hidden_reason != previous.hidden_reason ||
+        (sample_ok &&
+         (sampled.visible != previous.visible || sampled.shape != previous.shape ||
+          std::abs(sampled.visual_offset_x - previous.visual_offset_x) >
+              kCursorPositionEpsilon ||
+          std::abs(sampled.visual_offset_y - previous.visual_offset_y) >
+              kCursorPositionEpsilon));
    // Preserve sub-point cursor motion. At 10x client zoom, the old roughly
    // one-logical-pixel threshold became several visible phone points.
    const bool position_changed =
-        !delivery.has_sent ||
-        sampled.position_valid != previous.position_valid ||
-        sampled.display_id != previous.display_id ||
-        (sampled.position_valid && previous.position_valid &&
-         (std::abs(sampled.x - previous.x) > kCursorPositionEpsilon ||
-          std::abs(sampled.y - previous.y) > kCursorPositionEpsilon));
+        sample_ok &&
+        (!delivery.has_sent || sampled.position_valid != previous.position_valid ||
+         sampled.display_id != previous.display_id ||
+         (sampled.position_valid && previous.position_valid &&
+          (std::abs(sampled.x - previous.x) > kCursorPositionEpsilon ||
+           std::abs(sampled.y - previous.y) > kCursorPositionEpsilon)));
    const bool position_update_due =
        position_changed &&
        (delivery.last_sent_time.time_since_epoch().count() == 0 ||
@@ -1909,16 +1933,12 @@ void GuiApplication::ShareLocalCursorState() {
    const bool heartbeat_due =
        delivery.last_sent_time.time_since_epoch().count() == 0 ||
        now - delivery.last_sent_time >= kCursorStateHeartbeatInterval;
-    if (suppress_position) {
-      // Cursor appearance is independent of cursor position. Continue sending
-      // shape changes to every controller while withholding only the sampled
-      // position from the connection that originated recent input.
-      if (shape_changed || heartbeat_due) {
-        recipients.push_back({remote_id, false});
-      }
-    } else if (delivery.feedback_pending || shape_changed ||
-               position_update_due || heartbeat_due) {
-      recipients.push_back({remote_id, true});
+    // Position feedback waits for a good sample and the echo-suppression
+    // interval. Appearance changes and heartbeats are independent of both.
+    const bool include_position = sample_ok && !suppress_position;
+    if (shape_changed || heartbeat_due ||
+        (include_position && (delivery.feedback_pending || position_update_due))) {
+      recipients.push_back({remote_id, include_position});
    }
  }
  if (recipients.empty()) return;
@@ -1927,6 +1947,18 @@ void GuiApplication::ShareLocalCursorState() {
  for (const auto& recipient : recipients) {
    auto& delivery = cursor_delivery_states_[recipient.remote_id];
    CursorState outgoing = sampled;
+    if (!sample_ok) {
+      // Explicitly report unknown to new receivers, but retain the last
+      // presentation for peers that only understand visible/shape.
+      outgoing = delivery.has_sent ? delivery.last_sent : CursorState{};
+      if (!delivery.has_sent) {
+        outgoing.visible = true;
+        outgoing.shape = RemoteCursorShape::default_cursor;
+      }
+      outgoing.seq = sampled.seq;
+      outgoing.render_mode = sampled.render_mode;
+      outgoing.hidden_reason = sampled.hidden_reason;
+    }
    outgoing.position_update = recipient.include_position;
    if (!recipient.include_position) {
      // Keep legacy receivers at their last acknowledged position as well.
@@ -1945,7 +1977,7 @@ void GuiApplication::ShareLocalCursorState() {
    action.type = ControlType::cursor_state;
    action.cs = outgoing;
    const std::string message = action.to_json();
-    const int result = SendDataFrameToPeer(
+    const int result = SendReliableDataFrameToPeer(
        peer_, message.c_str(), message.size(), mouse_label_.c_str(),
        recipient.remote_id.c_str(), recipient.remote_id.size());
    if (result != 0) {
@@ -1954,6 +1986,13 @@ void GuiApplication::ShareLocalCursorState() {
      continue;
    }

+    if (!delivery.has_sent ||
+        delivery.last_sent.render_mode != outgoing.render_mode ||
+        delivery.last_sent.hidden_reason != outgoing.hidden_reason) {
+      LOG_INFO("Send cursor presentation to [{}]: mode={}, reason={}",
+               recipient.remote_id, static_cast<int>(outgoing.render_mode),
+               static_cast<int>(outgoing.hidden_reason));
+    }
    delivery.last_sent = outgoing;
    delivery.has_sent = true;
    if (recipient.include_position) {
@@ -1963,6 +2002,78 @@ void GuiApplication::ShareLocalCursorState() {
  }
 }

+bool GuiApplication::RequestPasswordChange(const std::string &password) {
+  if (password.size() != 6) {
+    return false;
+  }
+
+  if (!peer_ || !signal_connected_) {
+    offline_warning_text_ =
+        localization::signal_disconnected[localization_language_index_];
+    show_offline_warning_window_ = true;
+    return true;
+  }
+
+  std::string request_id;
+  {
+    std::lock_guard<std::mutex> lock(password_change_mutex_);
+    if (password_change_pending_) {
+      return true;
+    }
+    request_id =
+        CreatePasswordChangeRequestId(++next_password_change_request_id_);
+    password_change_pending_ = true;
+    password_change_result_ready_ = false;
+    password_change_succeeded_ = false;
+    password_change_result_uncertain_ = false;
+    password_change_requested_at_ = std::chrono::steady_clock::now();
+    pending_password_change_request_id_ = request_id;
+    pending_local_password_ = password;
+    password_change_error_.clear();
+  }
+
+  const bool self_hosted = config_center_->IsSelfHosted();
+  const std::string server_host =
+      self_hosted ? config_center_->GetSignalServerHost()
+                  : config_center_->GetDefaultServerHost();
+  const int server_port =
+      self_hosted ? config_center_->GetSignalServerPort()
+                  : config_center_->GetDefaultSignalServerPort();
+  const std::string pending_identity = std::string(client_id_) + "@" + password;
+  if (!settings_.StagePendingPasswordChange(
+          pending_identity, self_hosted, server_host, server_port, request_id)) {
+    std::lock_guard<std::mutex> lock(password_change_mutex_);
+    password_change_pending_ = false;
+    pending_password_change_request_id_.clear();
+    pending_local_password_.clear();
+    password_change_error_.clear();
+    offline_warning_text_ = localization::failed[localization_language_index_];
+    show_offline_warning_window_ = true;
+    LOG_ERROR("Could not durably stage password change");
+    return true;
+  }
+
+  const nlohmann::json request = {{"type", "change_password"},
+                                {"request_id", request_id},
+                                {"new_password", password}};
+  const std::string message = request.dump();
+  if (SendSignalMessage(peer_, message.data(), message.size()) != 0) {
+    {
+      std::lock_guard<std::mutex> lock(password_change_mutex_);
+      password_change_pending_ = false;
+      pending_password_change_request_id_.clear();
+      pending_local_password_.clear();
+      offline_warning_text_ =
+          localization::signal_disconnected[localization_language_index_];
+      show_offline_warning_window_ = true;
+    }
+    if (!settings_.ClearPendingPasswordChange()) {
+      LOG_WARN("Could not clear unsent pending password change");
+    }
+  }
+  return true;
+}
+
 void GuiApplication::HandlePasswordChangeResult() {
  bool succeeded = false;
  bool uncertain = false;
@@ -2093,6 +2204,9 @@ void GuiApplication::SyncMainWindow() {
  if (!ui_) {
    return;
  }
+#if _WIN32
+  ConfigureWindowsWindowIcons(ui_->main->window().win32_hwnd());
+#endif
 #if defined(__APPLE__)
  if (ui_->main_native_titlebar_attempts > 0) {
    if (HideDisabledMainWindowZoomButton()) {
@@ -2109,6 +2223,10 @@ void GuiApplication::SyncMainWindow() {
  ui_->main->set_local_id(UiText(FormatPeerId(client_id_)));
  ui_->main->set_local_password(password_saved_);
  ui_->main->set_password_visible(show_password_);
+  {
+    std::lock_guard<std::mutex> lock(password_change_mutex_);
+    ui_->main->set_password_change_pending(password_change_pending_);
+  }
  ui_->main->set_signal_connected(signal_connected_);
  ui_->main->set_signal_tls_error(signal_status_ ==
                                  SignalStatus::SignalTlsCertError);
@@ -2117,15 +2235,7 @@ void GuiApplication::SyncMainWindow() {
  ui_->main->set_latest_version(UiText(latest_version_));
  ui_->main->set_release_name(UiText(release_name_));
  ui_->main->set_release_date(UiText(release_date_));
-  ui_->main->set_settings_session_active(stream_window_inited_);
-#if (((defined(_WIN32) || defined(__linux__)) && !defined(__aarch64__) && \
-      !defined(__arm__) && USE_CUDA) ||                                   \
-     defined(__APPLE__))
-  ui_->main->set_hardware_codec_available(true);
-#else
-  ui_->main->set_hardware_codec_available(false);
-#endif
-
+  ui_->main->set_settings_session_active(HasActiveSession());
  if (show_offline_warning_window_) {
    ui_->main->set_offline_warning(UiText(offline_warning_text_));
    show_offline_warning_window_ = false;
@@ -2335,6 +2445,7 @@ void GuiApplication::SetStreamKeyboardFocus(bool focused) {

  focus_on_stream_window_ = focused;
  if (!focused) {
+    devices_.StopKeyboardCapturer();
    keyboard_.ForceReleasePressedKeys();
  }
 }
@@ -2389,8 +2500,10 @@ void GuiApplication::SyncStreamWindow() {
  if (!ui_->stream) {
    return;
  }
+#if _WIN32
+  ConfigureWindowsWindowIcons((*ui_->stream)->window().win32_hwnd());
+#endif
  (*ui_->stream)->set_window_maximized((*ui_->stream)->window().is_maximized());
-  (*ui_->stream)->set_srtp_enabled(enable_srtp_);
 #if defined(__APPLE__)
  if (ui_->stream_live_resize_configuration_attempts > 0) {
    if (ConfigureStreamWindowLiveResize(
@@ -2520,6 +2633,29 @@ void GuiApplication::SyncStreamWindow() {
              ? localization::receiving_screen[localization_language_index_]
              : std::string{}));
  (*ui_->stream)->set_mouse_control_enabled(props->control_mouse_);
+  {
+    std::lock_guard lock(props->privacy_status_mutex_);
+    const auto& status = props->privacy_status_;
+    const uint64_t now = SDL_GetTicks();
+    const auto controls = GetPrivacyControlState(
+        status, props->privacy_status_received_, props->privacy_command_pending_,
+        now - props->privacy_status_tick_, now - props->privacy_command_tick_);
+    const bool connected =
+        props->connection_status_.load() == ConnectionStatus::Connected;
+    (*ui_->stream)->set_privacy_active(controls.active);
+    (*ui_->stream)->set_privacy_off(connected && controls.off);
+    (*ui_->stream)->set_privacy_unsupported(controls.unsupported);
+    (*ui_->stream)->set_privacy_can_toggle(
+        props->control_mouse_ && connected && controls.can_toggle);
+    const int language = localization_language_index_;
+    std::string text = !connected || !props->privacy_status_received_
+        ? localization::privacy_screen[language]
+        : controls.unsupported ? localization::privacy_unsupported[language]
+        : controls.enabled ? localization::privacy_on[language]
+        : controls.off ? localization::privacy_off[language]
+        : localization::privacy_screen[language];
+    (*ui_->stream)->set_privacy_status_text(UiText(text));
+  }
  int remote_cursor_shape =
      static_cast<int>(RemoteCursorShape::default_cursor);
  bool remote_cursor_active = false;
@@ -2530,9 +2666,7 @@ void GuiApplication::SyncStreamWindow() {
        props->remote_cursor_state_received_;
    if (remote_cursor_active) {
      remote_cursor_shape = static_cast<int>(
-          props->remote_cursor_state_.visible
-              ? props->remote_cursor_state_.shape
-              : RemoteCursorShape::none);
+          props->cursor_presentation_.Resolve(SDL_GetTicks()));
    }
  }
  (*ui_->stream)->set_remote_cursor_active(remote_cursor_active);
@@ -2557,6 +2691,8 @@ void GuiApplication::SyncStreamWindow() {
  (*ui_->stream)->set_selected_display(props->selected_display_);

  const auto& net = props->net_traffic_stats_;
+  (*ui_->stream)->set_stats_encryption_enabled(
+      status == ConnectionStatus::Connected && net.srtp_active);
  std::vector<ui::NetworkStatsRow> stats_rows;
  stats_rows.reserve(4);
  const auto append_stats_row = [&](const std::string& label,
@@ -2703,9 +2839,6 @@ void GuiApplication::ConfigureStreamVideoRenderer() {
        SlintVideoPresenter::SurfaceState state;
        state.selected_stream = focused_remote_id_;
        state.fullscreen = fullscreen_button_pressed_;
-        if (ui_) {
-          state.tab_count = ui_->tab_ids.size();
-        }
        return state;
      },
      [this] { video_frame_dirty_.store(true, std::memory_order_release); });
@@ -2763,7 +2896,19 @@ void GuiApplication::SyncServerWindow() {
                    });
  }

-  if (has_connected_controller && !ui_->server) {
+  // Privacy protects local display output while preserving capture.
+  // Keep the panel alive throughout privacy transitions so remote
+  // controllers can still see and operate it without resetting its UI state.
+  bool show_controller_window = has_connected_controller;
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__linux__)
+  // Preserve the existing panel behavior on other platforms.
+  const auto privacy_status = privacy_.Snapshot();
+  const bool privacy_covering = privacy_status.overlay_active ||
+      privacy_status.state == PrivacyState::starting ||
+      privacy_status.state == PrivacyState::stopping;
+  show_controller_window = show_controller_window && !privacy_covering;
+#endif
+  if (show_controller_window && !ui_->server) {
    ui_->server.emplace(ui::ServerWindow::create());
    RegisterFontAwesome((*ui_->server)->window());
    (*ui_->server)->set_controllers(ui_->controller_model);
@@ -2787,7 +2932,7 @@ void GuiApplication::SyncServerWindow() {
    server_window_created_ = true;
    server_window_inited_ = true;
  }
-  if (!has_connected_controller && ui_->server) {
+  if (!show_controller_window && ui_->server) {
    (*ui_->server)->hide();
    ui_->server.reset();
    server_window_created_ = false;
@@ -2801,6 +2946,10 @@ void GuiApplication::SyncServerWindow() {
    return;
  }

+#if _WIN32
+  ConfigureWindowsWindowIcons((*ui_->server)->window().win32_hwnd());
+#endif
+
  std::vector<ui::ControllerEntry> controllers;
  std::vector<slint::SharedString> names;
  ui_->controller_ids.clear();
@@ -2920,9 +3069,9 @@ void GuiApplication::SaveSettingsFromUi() {
  video_adaptation_policy_button_value_ =
      std::clamp(main->get_adaptation_policy_index(), 0, 2);
  video_encode_format_button_value_ = std::clamp(main->get_codec_index(), 0, 1);
-  enable_hardware_video_codec_ = main->get_hardware_codec_enabled();
+  enable_hardware_video_codec_ = ConfigCenter::IsHardwareVideoCodecAvailable() &&
+                                  main->get_hardware_codec_enabled();
  enable_turn_ = main->get_turn_enabled();
-  enable_srtp_ = main->get_srtp_enabled();
  enable_self_hosted_ = main->get_self_hosted_enabled();
  enable_autostart_ = main->get_autostart_enabled();
  enable_daemon_ = main->get_daemon_enabled();
@@ -2931,6 +3080,8 @@ void GuiApplication::SaveSettingsFromUi() {
      static_cast<ConfigCenter::LANGUAGE>(language_button_value_);
  localization_language_index_ = language_button_value_;
  config_center_->SetLanguage(localization_language_);
+  privacy_.SetText({
+      localization::privacy_screen_unlock_hint[localization_language_index_]});
  config_center_->SetVideoQuality(
      static_cast<ConfigCenter::VIDEO_QUALITY>(video_quality_button_value_));
  config_center_->SetVideoFrameRate(static_cast<ConfigCenter::VIDEO_FRAME_RATE>(
@@ -2942,11 +3093,29 @@ void GuiApplication::SaveSettingsFromUi() {
      static_cast<ConfigCenter::VIDEO_ENCODE_FORMAT>(
          video_encode_format_button_value_));
  config_center_->SetHardwareVideoCodec(enable_hardware_video_codec_);
-  config_center_->SetTurn(enable_turn_);
-  config_center_->SetSrtp(enable_srtp_);
+  config_center_->SetTurn(enable_turn_, main->get_force_relay_enabled());
+  main->set_force_relay_enabled(config_center_->IsForceRelay());
  config_center_->SetSelfHosted(enable_self_hosted_);
  config_center_->SetAutostart(enable_autostart_);
  config_center_->SetDaemon(enable_daemon_);
+#ifdef _WIN32
+  if (!HasActiveSession()) {
+    const auto capture_method = static_cast<ScreenCaptureMethod>(
+        std::clamp(main->get_capture_method_index(), 0, 3));
+    if (config_center_->SetScreenCaptureMethod(capture_method) != 0) {
+      LOG_ERROR("Failed to save screen capture method");
+    }
+  }
+  main->set_capture_method_index(
+      static_cast<int>(config_center_->GetScreenCaptureMethod()));
+#endif
+#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
+  if (config_center_->SetPrivacyScreen(main->get_privacy_on_connect_enabled()) !=
+      0) {
+    main->set_privacy_on_connect_enabled(
+        config_center_->IsEnablePrivacyScreen());
+  }
+#endif

  const std::string path(main->get_file_save_path());
  std::memset(file_transfer_save_path_buf_, 0,
@@ -2962,9 +3131,6 @@ void GuiApplication::SaveSettingsFromUi() {
  if (const auto port = ParsePort(main->get_server_port())) {
    config_center_->SetServerPort(*port);
  }
-  if (const auto port = ParsePort(main->get_coturn_port())) {
-    config_center_->SetCoturnServerPort(*port);
-  }

  language_button_value_last_ = language_button_value_;
  video_quality_button_value_last_ = video_quality_button_value_;
@@ -2974,14 +3140,13 @@ void GuiApplication::SaveSettingsFromUi() {
  video_encode_format_button_value_last_ = video_encode_format_button_value_;
  enable_hardware_video_codec_last_ = enable_hardware_video_codec_;
  enable_turn_last_ = enable_turn_;
-  enable_srtp_last_ = enable_srtp_;
  enable_self_hosted_last_ = enable_self_hosted_;
  enable_autostart_last_ = enable_autostart_;
  enable_daemon_last_ = enable_daemon_;
  file_transfer_save_path_last_ = path;
  ui_->localized_language = -1;

-  if (!stream_window_inited_) {
+  if (!HasActiveSession()) {
    CloseAllRemoteSessions();
    CreateConnectionPeer();
  }
@@ -3018,6 +3183,7 @@ void GuiApplication::SelectStreamTab(int index) {
  bool renderer_selection_changed = false;
  if (!controlled_remote_id_.empty() &&
      controlled_remote_id_ != selected_remote_id) {
+    devices_.StopKeyboardCapturer();
    keyboard_.ForceReleasePressedKeys();
  }
  focused_remote_id_ = selected_remote_id;
@@ -3122,43 +3288,21 @@ void GuiApplication::SendPointerInput(int button, int kind, float x, float y) {
    return;
  }

-  const auto size = (*ui_->stream)->window().size();
-  const float scale = (*ui_->stream)->window().scale_factor();
-  const float available_width = size.width / scale;
-  const float titlebar_height =
-      !fullscreen_button_pressed_ && (*ui_->stream)->get_custom_titlebar()
-          ? kWaylandTitlebarLogicalHeight
-          : 0.0f;
-  const float available_height =
-      size.height / scale - titlebar_height -
-      (fullscreen_button_pressed_ ? 0.0f
-                                  : (ui_->tab_ids.size() > 1 ? 30.0f : 0.0f));
-  float render_width = available_width;
-  float render_height = available_height;
-  float offset_x = 0;
-  float offset_y = 0;
-  if (props->video_width_ > 0 && props->video_height_ > 0 &&
-      available_width > 0 && available_height > 0) {
-    const float video_aspect =
-        static_cast<float>(props->video_width_) / props->video_height_;
-    const float area_aspect = available_width / available_height;
-    if (video_aspect > area_aspect) {
-      render_height = available_width / video_aspect;
-      offset_y = (available_height - render_height) * 0.5f;
-    } else {
-      render_width = available_height * video_aspect;
-      offset_x = (available_width - render_width) * 0.5f;
-    }
+  std::optional<VideoPoint> point;
+  {
+    std::lock_guard lock(props->video_frame_mutex_);
+    point = MapVideoPoint(x, y, (*ui_->stream)->get_video_area_width(),
+                          (*ui_->stream)->get_video_area_height(),
+                          props->video_width_, props->video_height_);
  }
-  if (x < offset_x || x > offset_x + render_width || y < offset_y ||
-      y > offset_y + render_height) {
+  if (!point) {
    return;
  }

  RemoteAction action{};
  action.type = ControlType::mouse;
-  action.m.x = std::clamp((x - offset_x) / render_width, 0.0f, 1.0f);
-  action.m.y = std::clamp((y - offset_y) / render_height, 0.0f, 1.0f);
+  action.m.x = point->x;
+  action.m.y = point->y;
  // Slint enum order: Cancel=0, Down=1, Up=2, Move=3 and
  // Other=0, Left=1, Right=2, Middle=3.
  if (kind == 3) {
@@ -3187,8 +3331,12 @@ void GuiApplication::SendPointerInput(int button, int kind, float x, float y) {

  controlled_remote_id_ = props->remote_id_;
  const std::string message = action.to_json();
-  SendDataFrame(props->peer_, message.c_str(), message.size(),
-                props->mouse_label_.c_str());
+  {
+    std::lock_guard lock(props->remote_cursor_state_mutex_);
+    props->cursor_presentation_.NoteInput(SDL_GetTicks());
+  }
+  SendReliableDataFrame(props->peer_, message.c_str(), message.size(),
+                        props->mouse_label_.c_str());
 }

 void GuiApplication::SendScrollInput(float delta_x, float delta_y, float x,
@@ -3197,24 +3345,20 @@ void GuiApplication::SendScrollInput(float delta_x, float delta_y, float x,
  if (!props || !props->peer_ || !props->control_mouse_ || !ui_->stream) {
    return;
  }
-  const auto size = (*ui_->stream)->window().size();
-  const float scale = (*ui_->stream)->window().scale_factor();
-  const float width = size.width / scale;
-  const float titlebar_height =
-      !fullscreen_button_pressed_ && (*ui_->stream)->get_custom_titlebar()
-          ? kWaylandTitlebarLogicalHeight
-          : 0.0f;
-  const float height =
-      size.height / scale - titlebar_height -
-      (fullscreen_button_pressed_ ? 0.0f
-                                  : (ui_->tab_ids.size() > 1 ? 30.0f : 0.0f));
-  if (width <= 0 || height <= 0) {
+  std::optional<VideoPoint> point;
+  {
+    std::lock_guard lock(props->video_frame_mutex_);
+    point = MapVideoPoint(x, y, (*ui_->stream)->get_video_area_width(),
+                          (*ui_->stream)->get_video_area_height(),
+                          props->video_width_, props->video_height_);
+  }
+  if (!point) {
    return;
  }
  RemoteAction action{};
  action.type = ControlType::mouse;
-  action.m.x = std::clamp(x / width, 0.0f, 1.0f);
-  action.m.y = std::clamp(y / height, 0.0f, 1.0f);
+  action.m.x = point->x;
+  action.m.y = point->y;
  if (std::abs(delta_y) >= std::abs(delta_x)) {
    action.m.flag = MouseFlag::wheel_vertical;
    action.m.s = delta_y > 0 ? 1 : delta_y < 0 ? -1 : 0;
@@ -3225,10 +3369,14 @@ void GuiApplication::SendScrollInput(float delta_x, float delta_y, float x,
  if (action.m.s == 0) {
    return;
  }
+  {
+    std::lock_guard lock(props->remote_cursor_state_mutex_);
+    props->cursor_presentation_.NoteInput(SDL_GetTicks());
+  }
  controlled_remote_id_ = props->remote_id_;
  const std::string message = action.to_json();
-  SendDataFrame(props->peer_, message.c_str(), message.size(),
-                props->mouse_label_.c_str());
+  SendReliableDataFrame(props->peer_, message.c_str(), message.size(),
+                        props->mouse_label_.c_str());
 }

 void GuiApplication::SendKeyInput(const std::string& text, bool pressed,
@@ -3283,9 +3431,12 @@ void GuiApplication::Cleanup() {
 #if _WIN32 && CROSSDESK_PORTABLE
  JoinPortableWindowsServiceInstallThread();
 #endif
+  privacy_.Disable();
  clipboard_.Shutdown();
  keyboard_.ForceReleasePressedKeys();
+  keyboard_.ReleaseAllRemotePressedKeys("application_exit");
  devices_.DestroyDevices();
+  privacy_.Shutdown();
  devices_.DestroyFactories();
  CloseAllRemoteSessions();
  WaitForSessionCleanup();
@@ -49,6 +49,7 @@ private:
  void BindServerCallbacks();
  void Tick();
  void ShareLocalCursorState();
+  bool RequestPasswordChange(const std::string &password);
  void HandlePasswordChangeResult();
  void HandleCredentialRecovery();
  void SyncMainWindow();
@@ -100,4 +101,4 @@ private:

 } // namespace crossdesk

-#endif
+#endif
@@ -1,323 +0,0 @@
-#include "application/gui_application.h"
-
-#include <cstring>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <vector>
-
-#include "rd_log.h"
-
-namespace crossdesk {
-
-void GuiApplication::ProcessSdlEvent(const SDL_Event &event) {
-  if (main_ctx_) {
-    ImGui::SetCurrentContext(main_ctx_);
-    ImGui_ImplSDL3_ProcessEvent(&event);
-  } else {
-    LOG_ERROR("Main context is null");
-    return;
-  }
-
-  if (stream_window_inited_) {
-    if (stream_ctx_) {
-      ImGui::SetCurrentContext(stream_ctx_);
-      ImGui_ImplSDL3_ProcessEvent(&event);
-    } else {
-      LOG_ERROR("Stream context is null");
-      return;
-    }
-  }
-
-  if (server_window_inited_) {
-    if (server_ctx_) {
-      ImGui::SetCurrentContext(server_ctx_);
-      ImGui_ImplSDL3_ProcessEvent(&event);
-    } else {
-      LOG_ERROR("Server context is null");
-      return;
-    }
-  }
-
-  if (APP_EXIT_EVENT != 0 && event.type == APP_EXIT_EVENT) {
-    LOG_INFO("Quit program from system tray");
-    if (stream_window_) {
-      SDL_SetWindowMouseGrab(stream_window_, false);
-    }
-#if defined(__linux__) && !defined(__APPLE__)
-    if (tray_) {
-      tray_->RemoveTrayIcon();
-    }
-#endif
-    exit_ = true;
-    return;
-  }
-
-  if (clipboard_.event_type() != 0 && event.type == clipboard_.event_type()) {
-    clipboard_.ApplyPendingRemoteText();
-    return;
-  }
-
-  switch (event.type) {
-  case SDL_EVENT_QUIT:
-    if (stream_window_inited_) {
-      LOG_INFO("Destroy stream window");
-      SDL_SetWindowMouseGrab(stream_window_, false);
-      DestroyStreamWindow();
-      DestroyStreamWindowContext();
-
-      {
-        // std::shared_lock lock(remote_sessions_mutex_);
-        for (auto &[host_name, props] : remote_sessions_) {
-          std::shared_ptr<std::vector<unsigned char>> frame_snapshot;
-          int video_width = 0;
-          int video_height = 0;
-          {
-            std::lock_guard<std::mutex> lock(props->video_frame_mutex_);
-            frame_snapshot = props->front_frame_;
-            video_width = props->video_width_;
-            video_height = props->video_height_;
-          }
-          if (frame_snapshot && !frame_snapshot->empty() && video_width > 0 &&
-              video_height > 0) {
-            thumbnail_->SaveToThumbnail(
-                (char *)frame_snapshot->data(), video_width, video_height,
-                host_name, props->remote_host_name_,
-                props->remember_password_ ? props->remote_password_ : "");
-          }
-
-          if (props->peer_) {
-            std::string client_id = (host_name == client_id_)
-                                        ? "C-" + std::string(client_id_)
-                                        : client_id_;
-            LOG_INFO("[{}] Leave connection [{}]", client_id, host_name);
-            LeaveConnection(props->peer_, host_name.c_str());
-            LOG_INFO("Destroy peer [{}]", client_id);
-            DestroyPeer(&props->peer_);
-          }
-
-          props->streaming_ = false;
-          props->remember_password_ = false;
-          props->connection_established_ = false;
-          props->audio_capture_button_pressed_ = false;
-
-          memset(&props->net_traffic_stats_, 0,
-                 sizeof(props->net_traffic_stats_));
-          SDL_SetWindowFullscreen(main_window_, false);
-          SDL_FlushEvents(STREAM_REFRESH_EVENT, STREAM_REFRESH_EVENT);
-          memset(audio_buffer_, 0, 720);
-        }
-      }
-
-      {
-        // std::unique_lock lock(remote_sessions_mutex_);
-        remote_sessions_.clear();
-      }
-
-      rejoin_ = false;
-      is_client_mode_ = false;
-      reload_recent_connections_ = true;
-      fullscreen_button_pressed_ = false;
-      start_keyboard_capturer_ = false;
-      just_created_ = false;
-      recent_connection_image_save_time_ = SDL_GetTicks();
-    } else {
-      LOG_INFO("Quit program");
-      exit_ = true;
-    }
-    break;
-
-  case SDL_EVENT_WINDOW_CLOSE_REQUESTED:
-    if (stream_window_ &&
-        event.window.windowID == SDL_GetWindowID(stream_window_)) {
-      break;
-    }
-
-    if (main_window_ &&
-        event.window.windowID == SDL_GetWindowID(main_window_)) {
-      if (!MinimizeMainWindowToTray()) {
-        SDL_HideWindow(main_window_);
-      }
-      break;
-    }
-
-    exit_ = true;
-    break;
-
-  case SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED:
-    if (stream_window_created_ &&
-        event.window.windowID == SDL_GetWindowID(stream_window_)) {
-      UpdateRenderRect();
-    }
-    break;
-
-  case SDL_EVENT_WINDOW_FOCUS_GAINED:
-    if (stream_window_ &&
-        SDL_GetWindowID(stream_window_) == event.window.windowID) {
-      focus_on_stream_window_ = true;
-    } else if (main_window_ &&
-               SDL_GetWindowID(main_window_) == event.window.windowID) {
-      foucs_on_main_window_ = true;
-    }
-    break;
-
-  case SDL_EVENT_WINDOW_FOCUS_LOST:
-    if (stream_window_ &&
-        SDL_GetWindowID(stream_window_) == event.window.windowID) {
-      keyboard_.ForceReleasePressedKeys();
-      focus_on_stream_window_ = false;
-    } else if (main_window_ &&
-               SDL_GetWindowID(main_window_) == event.window.windowID) {
-      foucs_on_main_window_ = false;
-    }
-    break;
-  case SDL_EVENT_DROP_FILE:
-    transfers_.HandleDropEvent(event);
-    break;
-
-  case SDL_EVENT_CLIPBOARD_UPDATE:
-    clipboard_.HandleLocalUpdate();
-    break;
-
-  case SDL_EVENT_MOUSE_MOTION:
-  case SDL_EVENT_MOUSE_BUTTON_DOWN:
-  case SDL_EVENT_MOUSE_BUTTON_UP:
-  case SDL_EVENT_MOUSE_WHEEL: {
-    Uint32 mouse_window_id = 0;
-    if (event.type == SDL_EVENT_MOUSE_MOTION) {
-      mouse_window_id = event.motion.windowID;
-    } else if (event.type == SDL_EVENT_MOUSE_BUTTON_DOWN ||
-               event.type == SDL_EVENT_MOUSE_BUTTON_UP) {
-      mouse_window_id = event.button.windowID;
-    } else if (event.type == SDL_EVENT_MOUSE_WHEEL) {
-      mouse_window_id = event.wheel.windowID;
-    }
-
-    if (focus_on_stream_window_ && stream_window_ &&
-        SDL_GetWindowID(stream_window_) == mouse_window_id) {
-      ProcessMouseEvent(event);
-    }
-    break;
-  }
-
-  case SDL_EVENT_KEY_DOWN:
-  case SDL_EVENT_KEY_UP:
-    if (keyboard_capturer_is_started_ &&
-        keyboard_capturer_uses_window_events_ &&
-        focus_on_stream_window_ && stream_window_ &&
-        SDL_GetWindowID(stream_window_) == event.key.windowID) {
-      ProcessKeyboardEvent(event);
-    }
-    break;
-
-  default:
-    if (event.type == STREAM_REFRESH_EVENT) {
-      auto *props = static_cast<RemoteSession *>(event.user.data1);
-      if (!props) {
-        break;
-      }
-      std::shared_ptr<std::vector<unsigned char>> frame_snapshot;
-      int video_width = 0;
-      int video_height = 0;
-      bool render_rect_dirty = false;
-      bool cleanup_pending = false;
-      {
-        std::lock_guard<std::mutex> lock(props->video_frame_mutex_);
-        cleanup_pending = props->stream_cleanup_pending_;
-        if (!cleanup_pending) {
-          frame_snapshot = props->front_frame_;
-          video_width = props->video_width_;
-          video_height = props->video_height_;
-        }
-        render_rect_dirty = props->render_rect_dirty_;
-      }
-
-      if (cleanup_pending) {
-        if (props->stream_texture_) {
-          SDL_DestroyTexture(props->stream_texture_);
-          props->stream_texture_ = nullptr;
-        }
-        {
-          std::lock_guard<std::mutex> lock(props->video_frame_mutex_);
-          props->stream_cleanup_pending_ = false;
-        }
-
-        if (render_rect_dirty) {
-          UpdateRenderRect();
-          std::lock_guard<std::mutex> lock(props->video_frame_mutex_);
-          props->render_rect_dirty_ = false;
-        }
-        break;
-      }
-
-      if (video_width <= 0 || video_height <= 0) {
-        break;
-      }
-      if (!frame_snapshot || frame_snapshot->empty()) {
-        break;
-      }
-
-      if (props->stream_texture_) {
-        if (video_width != props->texture_width_ ||
-            video_height != props->texture_height_) {
-          props->texture_width_ = video_width;
-          props->texture_height_ = video_height;
-
-          SDL_DestroyTexture(props->stream_texture_);
-          // props->stream_texture_ = SDL_CreateTexture(
-          //     stream_renderer_, stream_pixformat_,
-          //     SDL_TEXTUREACCESS_STREAMING, props->texture_width_,
-          //     props->texture_height_);
-
-          SDL_PropertiesID nvProps = SDL_CreateProperties();
-          SDL_SetNumberProperty(nvProps, SDL_PROP_TEXTURE_CREATE_WIDTH_NUMBER,
-                                props->texture_width_);
-          SDL_SetNumberProperty(nvProps, SDL_PROP_TEXTURE_CREATE_HEIGHT_NUMBER,
-                                props->texture_height_);
-          SDL_SetNumberProperty(nvProps, SDL_PROP_TEXTURE_CREATE_FORMAT_NUMBER,
-                                SDL_PIXELFORMAT_NV12);
-          SDL_SetNumberProperty(nvProps,
-                                SDL_PROP_TEXTURE_CREATE_COLORSPACE_NUMBER,
-                                SDL_COLORSPACE_BT601_LIMITED);
-          props->stream_texture_ =
-              SDL_CreateTextureWithProperties(stream_renderer_, nvProps);
-          SDL_DestroyProperties(nvProps);
-        }
-      } else {
-        props->texture_width_ = video_width;
-        props->texture_height_ = video_height;
-        // props->stream_texture_ = SDL_CreateTexture(
-        //     stream_renderer_, stream_pixformat_,
-        //     SDL_TEXTUREACCESS_STREAMING, props->texture_width_,
-        //     props->texture_height_);
-
-        SDL_PropertiesID nvProps = SDL_CreateProperties();
-        SDL_SetNumberProperty(nvProps, SDL_PROP_TEXTURE_CREATE_WIDTH_NUMBER,
-                              props->texture_width_);
-        SDL_SetNumberProperty(nvProps, SDL_PROP_TEXTURE_CREATE_HEIGHT_NUMBER,
-                              props->texture_height_);
-        SDL_SetNumberProperty(nvProps, SDL_PROP_TEXTURE_CREATE_FORMAT_NUMBER,
-                              SDL_PIXELFORMAT_NV12);
-        SDL_SetNumberProperty(nvProps,
-                              SDL_PROP_TEXTURE_CREATE_COLORSPACE_NUMBER,
-                              SDL_COLORSPACE_BT601_LIMITED);
-        props->stream_texture_ =
-            SDL_CreateTextureWithProperties(stream_renderer_, nvProps);
-        SDL_DestroyProperties(nvProps);
-      }
-
-      SDL_UpdateTexture(props->stream_texture_, NULL, frame_snapshot->data(),
-                        props->texture_width_);
-
-      if (render_rect_dirty) {
-        UpdateRenderRect();
-        std::lock_guard<std::mutex> lock(props->video_frame_mutex_);
-        props->render_rect_dirty_ = false;
-      }
-    }
-    break;
-  }
-}
-
-
-} // namespace crossdesk
@@ -1,424 +0,0 @@
-#include "application/gui_application.h"
-
-#include <remote_action.h>
-
-#include <algorithm>
-#include <cmath>
-#include <string>
-
-#include "device_controller.h"
-#include "rd_log.h"
-
-namespace crossdesk {
-namespace {
-int TranslateSdlKeypadScancodeToVk(const SDL_KeyboardEvent &event) {
-  const bool numlock_enabled = (event.mod & SDL_KMOD_NUM) != 0;
-
-  switch (event.scancode) {
-  case SDL_SCANCODE_NUMLOCKCLEAR:
-    return 0x90;
-  case SDL_SCANCODE_KP_ENTER:
-    return 0x0D;
-  case SDL_SCANCODE_KP_0:
-    if (!numlock_enabled) {
-      return 0x2D;
-    }
-    return 0x60;
-  case SDL_SCANCODE_KP_1:
-    if (!numlock_enabled) {
-      return 0x23;
-    }
-    return 0x61;
-  case SDL_SCANCODE_KP_2:
-    if (!numlock_enabled) {
-      return 0x28;
-    }
-    return 0x62;
-  case SDL_SCANCODE_KP_3:
-    if (!numlock_enabled) {
-      return 0x22;
-    }
-    return 0x63;
-  case SDL_SCANCODE_KP_4:
-    if (!numlock_enabled) {
-      return 0x25;
-    }
-    return 0x64;
-  case SDL_SCANCODE_KP_5:
-    return 0x65;
-  case SDL_SCANCODE_KP_6:
-    if (!numlock_enabled) {
-      return 0x27;
-    }
-    return 0x66;
-  case SDL_SCANCODE_KP_7:
-    if (!numlock_enabled) {
-      return 0x24;
-    }
-    return 0x67;
-  case SDL_SCANCODE_KP_8:
-    if (!numlock_enabled) {
-      return 0x26;
-    }
-    return 0x68;
-  case SDL_SCANCODE_KP_9:
-    if (!numlock_enabled) {
-      return 0x21;
-    }
-    return 0x69;
-  case SDL_SCANCODE_KP_PERIOD:
-  case SDL_SCANCODE_KP_COMMA:
-    if (!numlock_enabled) {
-      return 0x2E;
-    }
-    return 0x6E;
-  case SDL_SCANCODE_KP_DIVIDE:
-    return 0x6F;
-  case SDL_SCANCODE_KP_MULTIPLY:
-    return 0x6A;
-  case SDL_SCANCODE_KP_MINUS:
-    return 0x6D;
-  case SDL_SCANCODE_KP_PLUS:
-    return 0x6B;
-  case SDL_SCANCODE_KP_EQUALS:
-    return 0xBB;
-  default:
-    return -1;
-  }
-}
-
-int TranslateSdlKeyboardEventToVk(const SDL_KeyboardEvent &event) {
-  const int keypad_key_code = TranslateSdlKeypadScancodeToVk(event);
-  if (keypad_key_code >= 0) {
-    return keypad_key_code;
-  }
-
-  const int key = static_cast<int>(event.key);
-  if (key >= 'a' && key <= 'z') {
-    return key - 'a' + 0x41;
-  }
-  if (key >= 'A' && key <= 'Z') {
-    return key;
-  }
-  if (key >= '0' && key <= '9') {
-    return key;
-  }
-
-  switch (key) {
-  case ';':
-    return 0xBA;
-  case '\'':
-    return 0xDE;
-  case '`':
-    return 0xC0;
-  case ',':
-    return 0xBC;
-  case '.':
-    return 0xBE;
-  case '/':
-    return 0xBF;
-  case '\\':
-    return 0xDC;
-  case '[':
-    return 0xDB;
-  case ']':
-    return 0xDD;
-  case '-':
-    return 0xBD;
-  case '=':
-    return 0xBB;
-  default:
-    break;
-  }
-
-  switch (event.scancode) {
-  case SDL_SCANCODE_ESCAPE:
-    return 0x1B;
-  case SDL_SCANCODE_RETURN:
-    return 0x0D;
-  case SDL_SCANCODE_SPACE:
-    return 0x20;
-  case SDL_SCANCODE_BACKSPACE:
-    return 0x08;
-  case SDL_SCANCODE_TAB:
-    return 0x09;
-  case SDL_SCANCODE_PRINTSCREEN:
-    return 0x2C;
-  case SDL_SCANCODE_SCROLLLOCK:
-    return 0x91;
-  case SDL_SCANCODE_PAUSE:
-    return 0x13;
-  case SDL_SCANCODE_INSERT:
-    return 0x2D;
-  case SDL_SCANCODE_DELETE:
-    return 0x2E;
-  case SDL_SCANCODE_HOME:
-    return 0x24;
-  case SDL_SCANCODE_END:
-    return 0x23;
-  case SDL_SCANCODE_PAGEUP:
-    return 0x21;
-  case SDL_SCANCODE_PAGEDOWN:
-    return 0x22;
-  case SDL_SCANCODE_LEFT:
-    return 0x25;
-  case SDL_SCANCODE_RIGHT:
-    return 0x27;
-  case SDL_SCANCODE_UP:
-    return 0x26;
-  case SDL_SCANCODE_DOWN:
-    return 0x28;
-  case SDL_SCANCODE_F1:
-    return 0x70;
-  case SDL_SCANCODE_F2:
-    return 0x71;
-  case SDL_SCANCODE_F3:
-    return 0x72;
-  case SDL_SCANCODE_F4:
-    return 0x73;
-  case SDL_SCANCODE_F5:
-    return 0x74;
-  case SDL_SCANCODE_F6:
-    return 0x75;
-  case SDL_SCANCODE_F7:
-    return 0x76;
-  case SDL_SCANCODE_F8:
-    return 0x77;
-  case SDL_SCANCODE_F9:
-    return 0x78;
-  case SDL_SCANCODE_F10:
-    return 0x79;
-  case SDL_SCANCODE_F11:
-    return 0x7A;
-  case SDL_SCANCODE_F12:
-    return 0x7B;
-  case SDL_SCANCODE_CAPSLOCK:
-    return 0x14;
-  case SDL_SCANCODE_LSHIFT:
-    return 0xA0;
-  case SDL_SCANCODE_RSHIFT:
-    return 0xA1;
-  case SDL_SCANCODE_LCTRL:
-    return 0xA2;
-  case SDL_SCANCODE_RCTRL:
-    return 0xA3;
-  case SDL_SCANCODE_LALT:
-    return 0xA4;
-  case SDL_SCANCODE_RALT:
-    return 0xA5;
-  case SDL_SCANCODE_LGUI:
-    return 0x5B;
-  case SDL_SCANCODE_RGUI:
-    return 0x5C;
-  default:
-    return -1;
-  }
-}
-
-} // namespace
-
-int GuiApplication::ProcessKeyboardEvent(const SDL_Event &event) {
-  if (event.type != SDL_EVENT_KEY_DOWN && event.type != SDL_EVENT_KEY_UP) {
-    return -1;
-  }
-
-  // SDL represents key auto-repeat as additional key-down events. Forward
-  // them so the fallback path has the same long-press behavior as native hooks.
-  const int key_code = TranslateSdlKeyboardEventToVk(event.key);
-  if (key_code < 0) {
-    return 0;
-  }
-
-  return keyboard_.SendKeyCommand(key_code, event.type == SDL_EVENT_KEY_DOWN);
-}
-
-int GuiApplication::ProcessMouseEvent(const SDL_Event &event) {
-  controlled_remote_id_ = "";
-  RemoteAction remote_action{};
-
-  if ((event.type == SDL_EVENT_MOUSE_BUTTON_DOWN ||
-       event.type == SDL_EVENT_MOUSE_BUTTON_UP) &&
-      event.button.button != SDL_BUTTON_LEFT &&
-      event.button.button != SDL_BUTTON_RIGHT &&
-      event.button.button != SDL_BUTTON_MIDDLE) {
-    return 0;
-  }
-
-  float cursor_x = last_mouse_event.motion.x;
-  float cursor_y = last_mouse_event.motion.y;
-
-  auto normalize_cursor_to_window_space = [&](float *x, float *y) {
-    if (!x || !y || !stream_window_) {
-      return;
-    }
-
-    int window_width = 0;
-    int window_height = 0;
-    int pixel_width = 0;
-    int pixel_height = 0;
-    SDL_GetWindowSize(stream_window_, &window_width, &window_height);
-    SDL_GetWindowSizeInPixels(stream_window_, &pixel_width, &pixel_height);
-
-    if (window_width <= 0 || window_height <= 0 || pixel_width <= 0 ||
-        pixel_height <= 0) {
-      return;
-    }
-
-    if ((window_width != pixel_width || window_height != pixel_height) &&
-        (*x > static_cast<float>(window_width) + 1.0f ||
-         *y > static_cast<float>(window_height) + 1.0f)) {
-      const float scale_x =
-          static_cast<float>(window_width) / static_cast<float>(pixel_width);
-      const float scale_y =
-          static_cast<float>(window_height) / static_cast<float>(pixel_height);
-      *x *= scale_x;
-      *y *= scale_y;
-
-      static bool logged_pixel_to_window_conversion = false;
-      if (!logged_pixel_to_window_conversion) {
-        LOG_INFO(
-            "Mouse coordinate space converted from pixels to window units: "
-            "window={}x{}, pixels={}x{}, scale=({:.4f},{:.4f})",
-            window_width, window_height, pixel_width, pixel_height, scale_x,
-            scale_y);
-        logged_pixel_to_window_conversion = true;
-      }
-    }
-  };
-
-  if (event.type == SDL_EVENT_MOUSE_MOTION) {
-    cursor_x = event.motion.x;
-    cursor_y = event.motion.y;
-    normalize_cursor_to_window_space(&cursor_x, &cursor_y);
-  } else if (event.type == SDL_EVENT_MOUSE_BUTTON_DOWN ||
-             event.type == SDL_EVENT_MOUSE_BUTTON_UP) {
-    cursor_x = event.button.x;
-    cursor_y = event.button.y;
-    normalize_cursor_to_window_space(&cursor_x, &cursor_y);
-  } else if (event.type == SDL_EVENT_MOUSE_WHEEL) {
-    cursor_x = last_mouse_event.motion.x;
-    cursor_y = last_mouse_event.motion.y;
-  }
-
-  const bool is_pointer_position_event =
-      (event.type == SDL_EVENT_MOUSE_MOTION ||
-       event.type == SDL_EVENT_MOUSE_BUTTON_DOWN ||
-       event.type == SDL_EVENT_MOUSE_BUTTON_UP);
-
-  // std::shared_lock lock(remote_sessions_mutex_);
-  for (auto &it : remote_sessions_) {
-    auto props = it.second;
-    if (!props->control_mouse_) {
-      continue;
-    }
-
-    const bool file_transfer_window_hovered =
-        props->file_transfer_.file_transfer_window_hovered_;
-    const bool overlay_hovered =
-        props->control_bar_hovered_ || props->display_selectable_hovered_ ||
-        props->shortcut_selectable_hovered_ || file_transfer_window_hovered;
-
-    const SDL_FRect render_rect = props->stream_render_rect_f_;
-    if (render_rect.w <= 1.0f || render_rect.h <= 1.0f) {
-      continue;
-    }
-
-    if (is_pointer_position_event && cursor_x >= render_rect.x &&
-        cursor_x <= render_rect.x + render_rect.w &&
-        cursor_y >= render_rect.y &&
-        cursor_y <= render_rect.y + render_rect.h) {
-      controlled_remote_id_ = it.first;
-      last_mouse_event.motion.x = cursor_x;
-      last_mouse_event.motion.y = cursor_y;
-      last_mouse_event.button.x = cursor_x;
-      last_mouse_event.button.y = cursor_y;
-
-      remote_action.m.x = (cursor_x - render_rect.x) / render_rect.w;
-      remote_action.m.y = (cursor_y - render_rect.y) / render_rect.h;
-      remote_action.m.x = std::clamp(remote_action.m.x, 0.0f, 1.0f);
-      remote_action.m.y = std::clamp(remote_action.m.y, 0.0f, 1.0f);
-
-      if (SDL_EVENT_MOUSE_BUTTON_DOWN == event.type) {
-        remote_action.type = ControlType::mouse;
-        if (SDL_BUTTON_LEFT == event.button.button) {
-          remote_action.m.flag = MouseFlag::left_down;
-        } else if (SDL_BUTTON_RIGHT == event.button.button) {
-          remote_action.m.flag = MouseFlag::right_down;
-        } else if (SDL_BUTTON_MIDDLE == event.button.button) {
-          remote_action.m.flag = MouseFlag::middle_down;
-        }
-      } else if (SDL_EVENT_MOUSE_BUTTON_UP == event.type) {
-        remote_action.type = ControlType::mouse;
-        if (SDL_BUTTON_LEFT == event.button.button) {
-          remote_action.m.flag = MouseFlag::left_up;
-        } else if (SDL_BUTTON_RIGHT == event.button.button) {
-          remote_action.m.flag = MouseFlag::right_up;
-        } else if (SDL_BUTTON_MIDDLE == event.button.button) {
-          remote_action.m.flag = MouseFlag::middle_up;
-        }
-      } else if (SDL_EVENT_MOUSE_MOTION == event.type) {
-        remote_action.type = ControlType::mouse;
-        remote_action.m.flag = MouseFlag::move;
-      }
-
-      if (overlay_hovered) {
-        break;
-      }
-      if (props->peer_) {
-        std::string msg = remote_action.to_json();
-        SendDataFrame(props->peer_, msg.c_str(), msg.size(),
-                      props->mouse_label_.c_str());
-      }
-    } else if (SDL_EVENT_MOUSE_WHEEL == event.type &&
-               last_mouse_event.button.x >= render_rect.x &&
-               last_mouse_event.button.x <= render_rect.x + render_rect.w &&
-               last_mouse_event.button.y >= render_rect.y &&
-               last_mouse_event.button.y <= render_rect.y + render_rect.h) {
-      float scroll_x = event.wheel.x;
-      float scroll_y = event.wheel.y;
-      if (event.wheel.direction == SDL_MOUSEWHEEL_FLIPPED) {
-        scroll_x = -scroll_x;
-        scroll_y = -scroll_y;
-      }
-
-      remote_action.type = ControlType::mouse;
-
-      auto roundUp = [](float value) -> int {
-        if (value > 0) {
-          return static_cast<int>(std::ceil(value));
-        } else if (value < 0) {
-          return static_cast<int>(std::floor(value));
-        }
-        return 0;
-      };
-
-      if (std::abs(scroll_y) >= std::abs(scroll_x)) {
-        remote_action.m.flag = MouseFlag::wheel_vertical;
-        remote_action.m.s = roundUp(scroll_y);
-      } else {
-        remote_action.m.flag = MouseFlag::wheel_horizontal;
-        remote_action.m.s = roundUp(scroll_x);
-      }
-
-      remote_action.m.x = (last_mouse_event.button.x - render_rect.x) /
-                          (std::max)(render_rect.w, 1.0f);
-      remote_action.m.y = (last_mouse_event.button.y - render_rect.y) /
-                          (std::max)(render_rect.h, 1.0f);
-      remote_action.m.x = std::clamp(remote_action.m.x, 0.0f, 1.0f);
-      remote_action.m.y = std::clamp(remote_action.m.y, 0.0f, 1.0f);
-
-      if (overlay_hovered) {
-        continue;
-      }
-      if (props->peer_) {
-        std::string msg = remote_action.to_json();
-        SendDataFrame(props->peer_, msg.c_str(), msg.size(),
-                      props->mouse_label_.c_str());
-      }
-    }
-  }
-
-  return 0;
-}
-
-} // namespace crossdesk
@@ -1,687 +0,0 @@
-#include "application/gui_application.h"
-
-#include <libyuv.h>
-
-#if defined(__linux__) && !defined(__APPLE__)
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#endif
-
-#include <cmath>
-#include <cstdlib>
-#include <cstring>
-#include <fstream>
-#include <iostream>
-#include <memory>
-#include <mutex>
-#include <shared_mutex>
-#include <string>
-#include <thread>
-
-#include "fa_regular_400.h"
-#include "fa_solid_900.h"
-#include "layout_relative.h"
-#include "localization.h"
-#include "rd_log.h"
-#include "version_checker.h"
-
-#if defined(__APPLE__)
-#include "window_util_mac.h"
-#endif
-
-namespace crossdesk {
-
-namespace {
-const ImWchar *GetMultilingualGlyphRanges() {
-  static std::vector<ImWchar> glyph_ranges;
-  if (glyph_ranges.empty()) {
-    ImGuiIO &io = ImGui::GetIO();
-    ImFontGlyphRangesBuilder builder;
-    builder.AddRanges(io.Fonts->GetGlyphRangesDefault());
-    builder.AddRanges(io.Fonts->GetGlyphRangesChineseFull());
-    builder.AddRanges(io.Fonts->GetGlyphRangesCyrillic());
-
-    ImVector<ImWchar> built_ranges;
-    builder.BuildRanges(&built_ranges);
-    glyph_ranges.assign(built_ranges.Data,
-                        built_ranges.Data + built_ranges.Size);
-  }
-  return glyph_ranges.empty() ? nullptr : glyph_ranges.data();
-}
-
-bool CanReadFontFile(const char *font_path) {
-  if (!font_path) {
-    return false;
-  }
-
-  std::ifstream font_file(font_path, std::ios::binary);
-  return font_file.good();
-}
-
-#if _WIN32
-HICON LoadTrayIcon() {
-  HMODULE module = GetModuleHandleW(nullptr);
-  HICON icon = reinterpret_cast<HICON>(
-      LoadImageW(module, L"IDI_ICON1", IMAGE_ICON, 0, 0, LR_DEFAULTSIZE));
-  if (icon) {
-    return icon;
-  }
-
-  return LoadIconW(nullptr, IDI_APPLICATION);
-}
-
-#endif
-
-#if defined(__linux__) && !defined(__APPLE__)
-inline bool X11GetDisplayAndWindow(SDL_Window *window, Display **display_out,
-                                   ::Window *x11_window_out) {
-  if (!window || !display_out || !x11_window_out) {
-    return false;
-  }
-
-#if !defined(SDL_PROP_WINDOW_X11_DISPLAY_POINTER) ||                           \
-    !defined(SDL_PROP_WINDOW_X11_WINDOW_NUMBER)
-  // SDL build does not expose X11 window properties.
-  return false;
-#else
-  SDL_PropertiesID props = SDL_GetWindowProperties(window);
-  Display *display = (Display *)SDL_GetPointerProperty(
-      props, SDL_PROP_WINDOW_X11_DISPLAY_POINTER, NULL);
-  const Sint64 x11_window_num =
-      SDL_GetNumberProperty(props, SDL_PROP_WINDOW_X11_WINDOW_NUMBER, 0);
-  const ::Window x11_window = (::Window)x11_window_num;
-
-  if (!display || !x11_window) {
-    return false;
-  }
-
-  *display_out = display;
-  *x11_window_out = x11_window;
-  return true;
-#endif
-}
-
-inline void X11SendNetWmState(Display *display, ::Window x11_window,
-                              long action, Atom state1, Atom state2 = 0) {
-  if (!display || !x11_window) {
-    return;
-  }
-
-  const Atom wm_state = XInternAtom(display, "_NET_WM_STATE", False);
-
-  XEvent event;
-  memset(&event, 0, sizeof(event));
-  event.xclient.type = ClientMessage;
-  event.xclient.serial = 0;
-  event.xclient.send_event = True;
-  event.xclient.message_type = wm_state;
-  event.xclient.window = x11_window;
-  event.xclient.format = 32;
-  event.xclient.data.l[0] = action;
-  event.xclient.data.l[1] = (long)state1;
-  event.xclient.data.l[2] = (long)state2;
-  event.xclient.data.l[3] = 1; // normal source indication
-  event.xclient.data.l[4] = 0;
-
-  XSendEvent(display, DefaultRootWindow(display), False,
-             SubstructureRedirectMask | SubstructureNotifyMask, &event);
-}
-
-inline void X11SetWindowTypeUtility(Display *display, ::Window x11_window) {
-  if (!display || !x11_window) {
-    return;
-  }
-
-  const Atom wm_window_type =
-      XInternAtom(display, "_NET_WM_WINDOW_TYPE", False);
-  const Atom wm_window_type_utility =
-      XInternAtom(display, "_NET_WM_WINDOW_TYPE_UTILITY", False);
-
-  XChangeProperty(display, x11_window, wm_window_type, XA_ATOM, 32,
-                  PropModeReplace, (unsigned char *)&wm_window_type_utility, 1);
-}
-
-inline void X11SetWindowAlwaysOnTop(SDL_Window *window) {
-  Display *display = nullptr;
-  ::Window x11_window = 0;
-  if (!X11GetDisplayAndWindow(window, &display, &x11_window)) {
-    return;
-  }
-
-  const Atom state_above = XInternAtom(display, "_NET_WM_STATE_ABOVE", False);
-  const Atom state_stays_on_top =
-      XInternAtom(display, "_NET_WM_STATE_STAYS_ON_TOP", False);
-
-  // Request _NET_WM_STATE_ADD for ABOVE + STAYS_ON_TOP.
-  X11SendNetWmState(display, x11_window, 1, state_above, state_stays_on_top);
-  XFlush(display);
-}
-
-inline void X11SetWindowSkipTaskbar(SDL_Window *window) {
-  Display *display = nullptr;
-  ::Window x11_window = 0;
-  if (!X11GetDisplayAndWindow(window, &display, &x11_window)) {
-    return;
-  }
-
-  const Atom skip_taskbar =
-      XInternAtom(display, "_NET_WM_STATE_SKIP_TASKBAR", False);
-  const Atom skip_pager =
-      XInternAtom(display, "_NET_WM_STATE_SKIP_PAGER", False);
-
-  // Request _NET_WM_STATE_ADD for SKIP_TASKBAR + SKIP_PAGER.
-  X11SendNetWmState(display, x11_window, 1, skip_taskbar, skip_pager);
-
-  // Hint the WM that this is an auxiliary/utility window.
-  X11SetWindowTypeUtility(display, x11_window);
-
-  XFlush(display);
-}
-#endif
-} // namespace
-
-SDL_HitTestResult GuiApplication::HitTestCallback(SDL_Window *window,
-                                                  const SDL_Point *area,
-                                                  void *data) {
-  GuiApplication *application = (GuiApplication *)data;
-  if (!application) {
-    return SDL_HITTEST_NORMAL;
-  }
-
-  if (application->fullscreen_button_pressed_) {
-    return SDL_HITTEST_NORMAL;
-  }
-
-  // Server window: OS-level dragging for the title bar, but keep the left-side
-  // collapse/expand button clickable.
-  if (application->server_window_ && window == application->server_window_) {
-    const float title_h = application->server_window_title_bar_height_;
-    const float button_w = title_h;
-    if (area->y >= 0 && area->y < title_h) {
-      if (area->x >= 0 && area->x < button_w) {
-        return SDL_HITTEST_NORMAL;
-      }
-      return SDL_HITTEST_DRAGGABLE;
-    }
-    return SDL_HITTEST_NORMAL;
-  }
-
-  int window_width, window_height;
-  SDL_GetWindowSize(window, &window_width, &window_height);
-
-  // check if curosor is in tab bar
-  if (application->stream_window_inited_ && application->stream_window_created_ &&
-      !application->fullscreen_button_pressed_ && application->stream_ctx_) {
-    ImGuiContext *prev_ctx = ImGui::GetCurrentContext();
-    ImGui::SetCurrentContext(application->stream_ctx_);
-
-    ImGuiWindow *tab_bar_window = ImGui::FindWindowByName("TabBar");
-    if (tab_bar_window && tab_bar_window->Active) {
-      ImGuiIO &io = ImGui::GetIO();
-      float scale_x = io.DisplayFramebufferScale.x;
-      float scale_y = io.DisplayFramebufferScale.y;
-
-      float tab_bar_x = tab_bar_window->Pos.x * scale_x;
-      float tab_bar_y = tab_bar_window->Pos.y * scale_y;
-      float tab_bar_width = tab_bar_window->Size.x * scale_x;
-      float tab_bar_height = tab_bar_window->Size.y * scale_y;
-
-      ImGui::SetCurrentContext(prev_ctx);
-
-      if (area->x >= tab_bar_x && area->x <= tab_bar_x + tab_bar_width &&
-          area->y >= tab_bar_y && area->y <= tab_bar_y + tab_bar_height) {
-        return SDL_HITTEST_NORMAL;
-      }
-    } else {
-      ImGui::SetCurrentContext(prev_ctx);
-    }
-  }
-
-  float mouse_grab_padding = application->title_bar_button_width_ * 0.16f;
-  if (area->y < application->title_bar_button_width_ &&
-      area->y > mouse_grab_padding &&
-      area->x < window_width - application->title_bar_button_width_ * 3.0f &&
-      area->x > mouse_grab_padding) {
-    return SDL_HITTEST_DRAGGABLE;
-  }
-
-  // if (!application->streaming_) {
-  //   return SDL_HITTEST_NORMAL;
-  // }
-
-  if (area->y < mouse_grab_padding) {
-    if (area->x < mouse_grab_padding) {
-      return SDL_HITTEST_RESIZE_TOPLEFT;
-    } else if (area->x > window_width - mouse_grab_padding) {
-      return SDL_HITTEST_RESIZE_TOPRIGHT;
-    } else {
-      return SDL_HITTEST_RESIZE_TOP;
-    }
-  } else if (area->y > window_height - mouse_grab_padding) {
-    if (area->x < mouse_grab_padding) {
-      return SDL_HITTEST_RESIZE_BOTTOMLEFT;
-    } else if (area->x > window_width - mouse_grab_padding) {
-      return SDL_HITTEST_RESIZE_BOTTOMRIGHT;
-    } else {
-      return SDL_HITTEST_RESIZE_BOTTOM;
-    }
-  } else if (area->x < mouse_grab_padding) {
-    return SDL_HITTEST_RESIZE_LEFT;
-  } else if (area->x > window_width - mouse_grab_padding) {
-    return SDL_HITTEST_RESIZE_RIGHT;
-  }
-
-  return SDL_HITTEST_NORMAL;
-}
-
-int GuiApplication::CreateMainWindow() {
-  main_ctx_ = ImGui::CreateContext();
-  if (!main_ctx_) {
-    LOG_ERROR("Main context is null");
-    return -1;
-  }
-
-  ImGui::SetCurrentContext(main_ctx_);
-
-  if (!SDL_CreateWindowAndRenderer(
-          "CrossDesk Main Window", (int)main_window_width_,
-          (int)main_window_height_,
-          SDL_WINDOW_HIGH_PIXEL_DENSITY | SDL_WINDOW_BORDERLESS |
-              SDL_WINDOW_HIDDEN | SDL_WINDOW_TRANSPARENT,
-          &main_window_, &main_renderer_)) {
-    LOG_ERROR("Error creating MainWindow and MainRenderer: {}", SDL_GetError());
-    return -1;
-  }
-
-  float dpi_scale = SDL_GetDisplayContentScale(SDL_GetPrimaryDisplay());
-  if (std::abs(dpi_scale_ - dpi_scale) > 0.01f) {
-    dpi_scale_ = dpi_scale;
-
-    main_window_width_ = (int)(main_window_width_default_ * dpi_scale_);
-    main_window_height_ = (int)(main_window_height_default_ * dpi_scale_);
-    stream_window_width_ = (int)(stream_window_width_default_ * dpi_scale_);
-    stream_window_height_ = (int)(stream_window_height_default_ * dpi_scale_);
-    server_window_width_ = (int)(server_window_width_default_ * dpi_scale_);
-    server_window_height_ = (int)(server_window_height_default_ * dpi_scale_);
-    server_window_normal_width_ =
-        (int)(server_window_width_default_ * dpi_scale_);
-    server_window_normal_height_ =
-        (int)(server_window_height_default_ * dpi_scale_);
-    window_rounding_ = window_rounding_default_ * dpi_scale_;
-
-    SDL_SetWindowSize(main_window_, (int)main_window_width_,
-                      (int)main_window_height_);
-  }
-
-  SDL_SetWindowResizable(main_window_, false);
-
-  // for window region action
-  SDL_SetWindowHitTest(main_window_, HitTestCallback, this);
-
-  SDL_SetRenderDrawBlendMode(main_renderer_, SDL_BLENDMODE_BLEND);
-
-  SetupFontAndStyle(&main_windows_system_chinese_font_);
-
-  ImGuiStyle &style = ImGui::GetStyle();
-  style.ScaleAllSizes(dpi_scale_);
-  style.FontScaleDpi = dpi_scale_;
-
-#if _WIN32
-  SDL_PropertiesID props = SDL_GetWindowProperties(main_window_);
-  HWND main_hwnd = (HWND)SDL_GetPointerProperty(
-      props, SDL_PROP_WINDOW_WIN32_HWND_POINTER, NULL);
-
-  HICON tray_icon = LoadTrayIcon();
-  tray_ = std::make_unique<WinTray>(main_hwnd, tray_icon, L"CrossDesk",
-                                    localization_language_index_);
-#elif defined(__APPLE__)
-  tray_ = std::make_unique<MacTray>(main_window_, "CrossDesk",
-                                    localization_language_index_);
-#elif defined(__linux__) && !defined(__APPLE__)
-  tray_ = std::make_unique<LinuxTray>(
-      main_window_, "CrossDesk", localization_language_index_, APP_EXIT_EVENT);
-#endif
-
-  ImGui_ImplSDL3_InitForSDLRenderer(main_window_, main_renderer_);
-  ImGui_ImplSDLRenderer3_Init(main_renderer_);
-
-  return 0;
-}
-
-int GuiApplication::DestroyMainWindow() {
-  if (main_ctx_) {
-    ImGui::SetCurrentContext(main_ctx_);
-  }
-
-  if (main_renderer_) {
-    SDL_DestroyRenderer(main_renderer_);
-  }
-
-  if (main_window_) {
-    SDL_DestroyWindow(main_window_);
-  }
-
-  return 0;
-}
-
-int GuiApplication::CreateStreamWindow() {
-  if (stream_window_created_) {
-    return 0;
-  }
-
-  stream_window_width_ = (int)(stream_window_width_default_ * dpi_scale_);
-  stream_window_height_ = (int)(stream_window_height_default_ * dpi_scale_);
-
-  stream_ctx_ = ImGui::CreateContext();
-  if (!stream_ctx_) {
-    LOG_ERROR("Stream context is null");
-    return -1;
-  }
-
-  ImGui::SetCurrentContext(stream_ctx_);
-
-  if (!SDL_CreateWindowAndRenderer(
-          "CrossDesk Stream Window", (int)stream_window_width_,
-          (int)stream_window_height_,
-          SDL_WINDOW_HIGH_PIXEL_DENSITY | SDL_WINDOW_BORDERLESS |
-              SDL_WINDOW_TRANSPARENT,
-          &stream_window_, &stream_renderer_)) {
-    LOG_ERROR("Error creating stream_window_ and stream_renderer_: {}",
-              SDL_GetError());
-    return -1;
-  }
-
-  stream_pixformat_ = SDL_PIXELFORMAT_NV12;
-
-  SDL_SetWindowResizable(stream_window_, true);
-
-  // for window region action
-  SDL_SetWindowHitTest(stream_window_, HitTestCallback, this);
-
-  SDL_SetRenderDrawBlendMode(stream_renderer_, SDL_BLENDMODE_BLEND);
-
-  SetupFontAndStyle(&stream_windows_system_chinese_font_);
-
-  ImGuiStyle &style = ImGui::GetStyle();
-  style.ScaleAllSizes(dpi_scale_);
-  style.FontScaleDpi = dpi_scale_;
-
-  ImGui_ImplSDL3_InitForSDLRenderer(stream_window_, stream_renderer_);
-  ImGui_ImplSDLRenderer3_Init(stream_renderer_);
-
-  // change props->stream_render_rect_
-  SDL_Event event;
-  event.type = SDL_EVENT_WINDOW_PIXEL_SIZE_CHANGED;
-  event.window.windowID = SDL_GetWindowID(stream_window_);
-  SDL_PushEvent(&event);
-
-  stream_window_created_ = true;
-  just_created_ = true;
-
-  stream_window_inited_ = true;
-  LOG_INFO("Stream window inited");
-
-  return 0;
-}
-
-int GuiApplication::DestroyStreamWindow() {
-  stream_window_width_ = (float)stream_window_width_default_;
-  stream_window_height_ = (float)stream_window_height_default_;
-
-  if (stream_ctx_) {
-    ImGui::SetCurrentContext(stream_ctx_);
-  }
-
-  if (stream_renderer_) {
-    SDL_DestroyRenderer(stream_renderer_);
-    stream_renderer_ = nullptr;
-  }
-
-  if (stream_window_) {
-    SDL_DestroyWindow(stream_window_);
-    stream_window_ = nullptr;
-  }
-
-  stream_window_created_ = false;
-  focus_on_stream_window_ = false;
-  stream_window_grabbed_ = false;
-  control_mouse_ = false;
-
-  return 0;
-}
-
-int GuiApplication::CreateServerWindow() {
-  if (server_window_created_) {
-    return 0;
-  }
-  server_ctx_ = ImGui::CreateContext();
-  if (!server_ctx_) {
-    LOG_ERROR("Server context is null");
-    return -1;
-  }
-  ImGui::SetCurrentContext(server_ctx_);
-  if (!SDL_CreateWindowAndRenderer(
-          "CrossDesk Server Window", (int)server_window_width_,
-          (int)server_window_height_,
-          SDL_WINDOW_HIGH_PIXEL_DENSITY | SDL_WINDOW_BORDERLESS |
-              SDL_WINDOW_TRANSPARENT,
-          &server_window_, &server_renderer_)) {
-    LOG_ERROR("Error creating server_window_ and server_renderer_: {}",
-              SDL_GetError());
-    return -1;
-  }
-
-#if _WIN32
-  // Hide server window from the taskbar by making it a tool window.
-  {
-    SDL_PropertiesID server_props = SDL_GetWindowProperties(server_window_);
-    HWND server_hwnd = (HWND)SDL_GetPointerProperty(
-        server_props, SDL_PROP_WINDOW_WIN32_HWND_POINTER, NULL);
-
-    if (server_hwnd) {
-      LONG_PTR ex_style = GetWindowLongPtr(server_hwnd, GWL_EXSTYLE);
-      ex_style |= WS_EX_TOOLWINDOW;
-      ex_style &= ~WS_EX_APPWINDOW;
-      SetWindowLongPtr(server_hwnd, GWL_EXSTYLE, ex_style);
-
-      // Keep the server window above normal windows.
-      SetWindowPos(server_hwnd, HWND_TOPMOST, 0, 0, 0, 0,
-                   SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED | SWP_NOACTIVATE);
-    }
-  }
-#endif
-
-#if defined(__linux__) && !defined(__APPLE__)
-  // Best-effort keep above other windows on X11.
-  X11SetWindowAlwaysOnTop(server_window_);
-  // Best-effort hide from taskbar on X11.
-  X11SetWindowSkipTaskbar(server_window_);
-#endif
-
-#if defined(__APPLE__)
-  // Best-effort keep above other windows on macOS.
-  MacSetWindowAlwaysOnTop(server_window_, true);
-  // Best-effort exclude from Window menu / window cycling.
-  MacSetWindowExcludedFromWindowMenu(server_window_, true);
-#endif
-
-  // Set window position to bottom-right corner
-  SDL_Rect display_bounds;
-  if (SDL_GetDisplayUsableBounds(SDL_GetDisplayForWindow(server_window_),
-                                 &display_bounds)) {
-    int window_x =
-        display_bounds.x + display_bounds.w - (int)server_window_width_;
-    int window_y =
-        display_bounds.y + display_bounds.h - (int)server_window_height_;
-    SDL_SetWindowPosition(server_window_, window_x, window_y);
-  }
-
-  SDL_SetWindowResizable(server_window_, false);
-
-  SDL_SetRenderDrawBlendMode(server_renderer_, SDL_BLENDMODE_BLEND);
-
-  // for window region action
-  SDL_SetWindowHitTest(server_window_, HitTestCallback, this);
-
-  SetupFontAndStyle(&server_windows_system_chinese_font_);
-
-  ImGuiStyle &style = ImGui::GetStyle();
-  style.ScaleAllSizes(dpi_scale_);
-  style.FontScaleDpi = dpi_scale_;
-
-  ImGui_ImplSDL3_InitForSDLRenderer(server_window_, server_renderer_);
-  ImGui_ImplSDLRenderer3_Init(server_renderer_);
-
-  server_window_created_ = true;
-  server_window_inited_ = true;
-
-  LOG_INFO("Server window inited");
-
-  return 0;
-}
-
-int GuiApplication::DestroyServerWindow() {
-  if (server_ctx_) {
-    ImGui::SetCurrentContext(server_ctx_);
-  }
-
-  if (server_renderer_) {
-    SDL_DestroyRenderer(server_renderer_);
-    server_renderer_ = nullptr;
-  }
-
-  if (server_window_) {
-    SDL_DestroyWindow(server_window_);
-    server_window_ = nullptr;
-  }
-
-  server_window_created_ = false;
-  server_window_inited_ = false;
-
-  return 0;
-}
-
-int GuiApplication::SetupFontAndStyle(ImFont **system_chinese_font_out) {
-  float font_size = 32.0f;
-
-  // Setup Dear ImGui style
-  ImGuiIO &io = ImGui::GetIO();
-
-  io.IniFilename = NULL; // disable imgui.ini
-
-  // Build one merged atlas: UI font + icon font + multilingual fallback fonts.
-  ImFontConfig config;
-  config.FontDataOwnedByAtlas = false;
-  config.MergeMode = false;
-
-  if (system_chinese_font_out) {
-    *system_chinese_font_out = nullptr;
-  }
-
-  ImFont *ui_font = nullptr;
-  const ImWchar *multilingual_ranges = GetMultilingualGlyphRanges();
-
-#if defined(_WIN32)
-  const char *base_font_paths[] = {
-      "C:/Windows/Fonts/msyh.ttc",    "C:/Windows/Fonts/msyhbd.ttc",
-      "C:/Windows/Fonts/segoeui.ttf", "C:/Windows/Fonts/arial.ttf",
-      "C:/Windows/Fonts/simsun.ttc",  nullptr};
-#elif defined(__APPLE__)
-  const char *base_font_paths[] = {
-      "/System/Library/Fonts/PingFang.ttc",
-      "/System/Library/Fonts/Supplemental/Arial Unicode.ttf",
-      "/System/Library/Fonts/Supplemental/Arial.ttf",
-      "/System/Library/Fonts/SFNS.ttf", nullptr};
-#else
-  const char *base_font_paths[] = {
-      "/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc",
-      "/usr/share/fonts/opentype/noto/NotoSans-Regular.ttf",
-      "/usr/share/fonts/truetype/wqy/wqy-microhei.ttc",
-      "/usr/share/fonts/truetype/wqy/wqy-zenhei.ttc",
-      "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
-      nullptr};
-#endif
-
-  for (int i = 0; base_font_paths[i] != nullptr && ui_font == nullptr; ++i) {
-    if (!CanReadFontFile(base_font_paths[i])) {
-      continue;
-    }
-    ui_font = io.Fonts->AddFontFromFileTTF(base_font_paths[i], font_size,
-                                           &config, multilingual_ranges);
-    if (ui_font != nullptr) {
-      LOG_INFO("Loaded base UI font: {}", base_font_paths[i]);
-    }
-  }
-  if (!ui_font) {
-    ui_font = io.Fonts->AddFontDefault(&config);
-  }
-
-  if (!ui_font) {
-    LOG_WARN("Failed to initialize base UI font");
-    ImGui::StyleColorsLight();
-    return 0;
-  }
-
-  ImFontConfig icon_config = config;
-  icon_config.MergeMode = true;
-  static const ImWchar icon_ranges[] = {ICON_MIN_FA, ICON_MAX_FA, 0};
-  io.Fonts->AddFontFromMemoryTTF(fa_solid_900_ttf, fa_solid_900_ttf_len,
-                                 font_size, &icon_config, icon_ranges);
-
-  io.FontDefault = ui_font;
-  if (system_chinese_font_out) {
-    *system_chinese_font_out = ui_font;
-  }
-
-  ImGui::StyleColorsLight();
-
-  return 0;
-}
-
-int GuiApplication::DestroyMainWindowContext() {
-  if (!main_ctx_) {
-    return 0;
-  }
-
-  ImGui::SetCurrentContext(main_ctx_);
-  ImGui_ImplSDLRenderer3_Shutdown();
-  ImGui_ImplSDL3_Shutdown();
-  ImGui::DestroyContext(main_ctx_);
-  main_ctx_ = nullptr;
-
-  return 0;
-}
-
-int GuiApplication::DestroyStreamWindowContext() {
-  if (!stream_ctx_) {
-    stream_window_inited_ = false;
-    return 0;
-  }
-
-  stream_window_inited_ = false;
-  ImGui::SetCurrentContext(stream_ctx_);
-  ImGui_ImplSDLRenderer3_Shutdown();
-  ImGui_ImplSDL3_Shutdown();
-  ImGui::DestroyContext(stream_ctx_);
-  stream_ctx_ = nullptr;
-
-  return 0;
-}
-
-int GuiApplication::DestroyServerWindowContext() {
-  if (!server_ctx_) {
-    server_window_inited_ = false;
-    return 0;
-  }
-
-  server_window_inited_ = false;
-  ImGui::SetCurrentContext(server_ctx_);
-  ImGui_ImplSDLRenderer3_Shutdown();
-  ImGui_ImplSDL3_Shutdown();
-  ImGui::DestroyContext(server_ctx_);
-  server_ctx_ = nullptr;
-
-  return 0;
-}
-
-} // namespace crossdesk
@@ -1,236 +0,0 @@
-#include "application/gui_application.h"
-
-#include <cmath>
-
-#include "rd_log.h"
-
-namespace crossdesk {
-
-int GuiApplication::DrawMainWindow() {
-  if (!main_ctx_) {
-    LOG_ERROR("Main context is null");
-    return -1;
-  }
-
-  ImGui::SetCurrentContext(main_ctx_);
-  ImGui_ImplSDLRenderer3_NewFrame();
-  ImGui_ImplSDL3_NewFrame();
-  ImGui::NewFrame();
-
-  ImGuiIO &io = ImGui::GetIO();
-  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_);
-
-  ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always);
-  ImGui::SetNextWindowSize(ImVec2(io.DisplaySize.x, io.DisplaySize.y),
-                           ImGuiCond_Always);
-  ImGui::Begin("MainRender", nullptr,
-               ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration |
-                   ImGuiWindowFlags_NoBringToFrontOnFocus |
-                   ImGuiWindowFlags_NoDocking);
-  ImGui::PopStyleColor();
-  ImGui::PopStyleVar();
-
-  TitleBar(true);
-
-  MainWindow();
-
-  UpdateNotificationWindow();
-
-#if _WIN32 && CROSSDESK_PORTABLE
-  PortableServiceInstallWindow();
-#endif
-
-#ifdef __APPLE__
-  if (show_request_permission_window_) {
-    RequestPermissionWindow();
-  }
-#endif
-
-  ImGui::End();
-
-  // Rendering
-  (void)io;
-  ImGui::Render();
-  SDL_SetRenderScale(main_renderer_, io.DisplayFramebufferScale.x,
-                     io.DisplayFramebufferScale.y);
-  SDL_SetRenderDrawColor(main_renderer_, 0, 0, 0, 0);
-  SDL_RenderClear(main_renderer_);
-  ImGui_ImplSDLRenderer3_RenderDrawData(ImGui::GetDrawData(), main_renderer_);
-  SDL_RenderPresent(main_renderer_);
-
-  return 0;
-}
-
-int GuiApplication::DrawStreamWindow() {
-  if (!stream_ctx_) {
-    LOG_ERROR("Stream context is null");
-    return -1;
-  }
-
-  ImGui::SetCurrentContext(stream_ctx_);
-  ImGui_ImplSDLRenderer3_NewFrame();
-  ImGui_ImplSDL3_NewFrame();
-  ImGui::NewFrame();
-
-  StreamWindow();
-
-  ImGuiIO &io = ImGui::GetIO();
-  float stream_title_window_height =
-      fullscreen_button_pressed_ ? 0 : title_bar_height_;
-
-  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-  // Set minimum window size to 0 to allow exact height control
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowMinSize, ImVec2(0, 0));
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
-  ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always);
-  ImGui::SetNextWindowSize(ImVec2(io.DisplaySize.x, stream_title_window_height),
-                           ImGuiCond_Always);
-  ImGui::Begin("StreamTitleWindow", nullptr,
-               ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration |
-                   ImGuiWindowFlags_NoBringToFrontOnFocus |
-                   ImGuiWindowFlags_NoDocking);
-  ImGui::PopStyleVar(2);
-  ImGui::PopStyleColor();
-
-  if (!fullscreen_button_pressed_) {
-    TitleBar(false);
-  }
-
-  ImGui::End();
-
-  // Rendering
-  (void)io;
-  ImGui::Render();
-  SDL_SetRenderScale(stream_renderer_, io.DisplayFramebufferScale.x,
-                     io.DisplayFramebufferScale.y);
-  SDL_SetRenderDrawColor(stream_renderer_, 0, 0, 0, 255);
-  SDL_RenderClear(stream_renderer_);
-
-  // std::shared_lock lock(remote_sessions_mutex_);
-  for (auto &it : remote_sessions_) {
-    auto props = it.second;
-    if (props->tab_selected_) {
-      SDL_FRect render_rect_f = {
-          props->stream_render_rect_f_.x, props->stream_render_rect_f_.y,
-          props->stream_render_rect_f_.w, props->stream_render_rect_f_.h};
-      SDL_RenderTexture(stream_renderer_, props->stream_texture_, NULL,
-                        &render_rect_f);
-    }
-  }
-  ImGui_ImplSDLRenderer3_RenderDrawData(ImGui::GetDrawData(), stream_renderer_);
-  SDL_RenderPresent(stream_renderer_);
-
-  return 0;
-}
-
-int GuiApplication::DrawServerWindow() {
-  if (!server_ctx_) {
-    LOG_ERROR("Server context is null");
-    return -1;
-  }
-  ImGui::SetCurrentContext(server_ctx_);
-  ImGui_ImplSDLRenderer3_NewFrame();
-  ImGui_ImplSDL3_NewFrame();
-  ImGui::NewFrame();
-
-  ImGuiIO &io = ImGui::GetIO();
-  server_window_width_ = io.DisplaySize.x;
-  server_window_height_ = io.DisplaySize.y;
-
-  ServerWindow();
-  ImGui::Render();
-  SDL_SetRenderScale(server_renderer_, io.DisplayFramebufferScale.x,
-                     io.DisplayFramebufferScale.y);
-  SDL_SetRenderDrawColor(server_renderer_, 0, 0, 0, 0);
-  SDL_RenderClear(server_renderer_);
-  ImGui_ImplSDLRenderer3_RenderDrawData(ImGui::GetDrawData(), server_renderer_);
-  SDL_RenderPresent(server_renderer_);
-  return 0;
-}
-
-bool GuiApplication::MinimizeMainWindowToTray() {
-  if (!main_window_) {
-    return false;
-  }
-
-#if defined(_WIN32) || defined(__APPLE__)
-  if (!tray_) {
-    return false;
-  }
-
-  tray_->MinimizeToTray();
-  return true;
-#elif defined(__linux__) && !defined(__APPLE__)
-  if (!tray_) {
-    return false;
-  }
-
-  return tray_->MinimizeToTray();
-#else
-  return false;
-#endif
-}
-
-void GuiApplication::UpdateRenderRect() {
-  // std::shared_lock lock(remote_sessions_mutex_);
-  for (auto &[_, props] : remote_sessions_) {
-    if (!props->reset_control_bar_pos_) {
-      props->mouse_diff_control_bar_pos_x_ = 0;
-      props->mouse_diff_control_bar_pos_y_ = 0;
-    }
-
-    if (!just_created_) {
-      props->reset_control_bar_pos_ = true;
-    }
-
-    int stream_window_width, stream_window_height;
-    SDL_GetWindowSize(stream_window_, &stream_window_width,
-                      &stream_window_height);
-    stream_window_width_ = (float)stream_window_width;
-    stream_window_height_ = (float)stream_window_height;
-
-    float video_ratio =
-        (float)props->video_width_ / (float)props->video_height_;
-    float video_ratio_reverse =
-        (float)props->video_height_ / (float)props->video_width_;
-
-    float render_area_width = props->render_window_width_;
-    float render_area_height = props->render_window_height_;
-
-    props->stream_render_rect_last_ = props->stream_render_rect_;
-
-    SDL_FRect rect_f{props->render_window_x_, props->render_window_y_,
-                     render_area_width, render_area_height};
-    if (render_area_width < render_area_height * video_ratio) {
-      rect_f.x = props->render_window_x_;
-      rect_f.y = std::abs(render_area_height -
-                          render_area_width * video_ratio_reverse) /
-                     2.0f +
-                 props->render_window_y_;
-      rect_f.w = render_area_width;
-      rect_f.h = render_area_width * video_ratio_reverse;
-    } else if (render_area_width > render_area_height * video_ratio) {
-      rect_f.x =
-          std::abs(render_area_width - render_area_height * video_ratio) /
-              2.0f +
-          props->render_window_x_;
-      rect_f.y = props->render_window_y_;
-      rect_f.w = render_area_height * video_ratio;
-      rect_f.h = render_area_height;
-    } else {
-      rect_f.x = props->render_window_x_;
-      rect_f.y = props->render_window_y_;
-      rect_f.w = render_area_width;
-      rect_f.h = render_area_height;
-    }
-
-    props->stream_render_rect_f_ = rect_f;
-    props->stream_render_rect_ = {static_cast<int>(std::lround(rect_f.x)),
-                                  static_cast<int>(std::lround(rect_f.y)),
-                                  static_cast<int>(std::lround(rect_f.w)),
-                                  static_cast<int>(std::lround(rect_f.h))};
-  }
-}
-
-} // namespace crossdesk
@@ -1,85 +0,0 @@
-/*
- * @Author: DI JUNKUN
- * @Date: 2024-06-14
- * Copyright (c) 2024 by DI JUNKUN, All Rights Reserved.
- */
-
-#ifndef _LAYOUT_STYLE_H_
-#define _LAYOUT_STYLE_H_
-
-#define MENU_WINDOW_WIDTH_CN 300 * dpi_scale_
-#define MENU_WINDOW_HEIGHT_CN 280 * dpi_scale_
-#define LOCAL_WINDOW_WIDTH_CN 300 * dpi_scale_
-#define LOCAL_WINDOW_HEIGHT_CN 280 * dpi_scale_
-#define REMOTE_WINDOW_WIDTH_CN 300 * dpi_scale_
-#define REMOTE_WINDOW_HEIGHT_CN 280 * dpi_scale_
-#define MENU_WINDOW_WIDTH_EN 190 * dpi_scale_
-#define MENU_WINDOW_HEIGHT_EN 245 * dpi_scale_
-#define IPUT_WINDOW_WIDTH 160 * dpi_scale_
-#define INPUT_WINDOW_PADDING_CN 66 * dpi_scale_
-#define INPUT_WINDOW_PADDING_EN 96 * dpi_scale_
-#define SETTINGS_WINDOW_WIDTH_CN 202 * dpi_scale_
-#define SETTINGS_WINDOW_WIDTH_EN 248 * dpi_scale_
-#if USE_CUDA
-#if _WIN32
-#define SETTINGS_WINDOW_HEIGHT_CN 405 * dpi_scale_
-#define SETTINGS_WINDOW_HEIGHT_EN 405 * dpi_scale_
-#else
-#define SETTINGS_WINDOW_HEIGHT_CN 375 * dpi_scale_
-#define SETTINGS_WINDOW_HEIGHT_EN 375 * dpi_scale_
-#endif
-#else
-#if _WIN32
-#define SETTINGS_WINDOW_HEIGHT_CN 375 * dpi_scale_
-#define SETTINGS_WINDOW_HEIGHT_EN 375 * dpi_scale_
-#else
-#define SETTINGS_WINDOW_HEIGHT_CN 345 * dpi_scale_
-#define SETTINGS_WINDOW_HEIGHT_EN 345 * dpi_scale_
-#endif
-#endif
-#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_CN 228 * dpi_scale_
-#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_EN 275 * dpi_scale_
-#define SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_CN 195 * dpi_scale_
-#define SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_EN 195 * dpi_scale_
-#define LANGUAGE_SELECT_WINDOW_PADDING_CN 120 * dpi_scale_
-#define LANGUAGE_SELECT_WINDOW_PADDING_EN 167 * dpi_scale_
-#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 120 * dpi_scale_
-#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 167 * dpi_scale_
-#define VIDEO_FRAME_RATE_SELECT_WINDOW_PADDING_CN 120 * dpi_scale_
-#define VIDEO_FRAME_RATE_SELECT_WINDOW_PADDING_EN 167 * dpi_scale_
-#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_CN 120 * dpi_scale_
-#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_EN 167 * dpi_scale_
-#define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_CN 171 * dpi_scale_
-#define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_EN 218 * dpi_scale_
-#define ENABLE_TURN_CHECKBOX_PADDING_CN 171 * dpi_scale_
-#define ENABLE_TURN_CHECKBOX_PADDING_EN 218 * dpi_scale_
-#define ENABLE_SRTP_CHECKBOX_PADDING_CN 171 * dpi_scale_
-#define ENABLE_SRTP_CHECKBOX_PADDING_EN 218 * dpi_scale_
-#define ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_CN 171 * dpi_scale_
-#define ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_EN 218 * dpi_scale_
-#define ENABLE_AUTOSTART_PADDING_CN 171 * dpi_scale_
-#define ENABLE_AUTOSTART_PADDING_EN 218 * dpi_scale_
-#define ENABLE_DAEMON_PADDING_CN 171 * dpi_scale_
-#define ENABLE_DAEMON_PADDING_EN 218 * dpi_scale_
-#define ENABLE_MINIZE_TO_TRAY_PADDING_CN 171 * dpi_scale_
-#define ENABLE_MINIZE_TO_TRAY_PADDING_EN 218 * dpi_scale_
-#define SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_CN 90 * dpi_scale_
-#define SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_EN 137 * dpi_scale_
-#define SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_CN 90 * dpi_scale_
-#define SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_EN 137 * dpi_scale_
-#define SETTINGS_SELECT_WINDOW_WIDTH 73 * dpi_scale_
-#define SELF_HOSTED_SERVER_INPUT_WINDOW_WIDTH 130 * dpi_scale_
-#define SETTINGS_OK_BUTTON_PADDING_CN 65 * dpi_scale_
-#define SETTINGS_OK_BUTTON_PADDING_EN 83 * dpi_scale_
-#define SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_CN 78 * dpi_scale_
-#define SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_EN 91 * dpi_scale_
-#define UPDATE_NOTIFICATION_OK_BUTTON_PADDING_CN 162 * dpi_scale_
-#define UPDATE_NOTIFICATION_OK_BUTTON_PADDING_EN 146 * dpi_scale_
-#define UPDATE_NOTIFICATION_RESERVED_HEIGHT 120 * dpi_scale_
-#define REQUEST_PERMISSION_WINDOW_WIDTH_CN 130 * dpi_scale_
-#define REQUEST_PERMISSION_WINDOW_HEIGHT_CN 125 * dpi_scale_
-#define REQUEST_PERMISSION_WINDOW_WIDTH_EN 260 * dpi_scale_
-#define REQUEST_PERMISSION_WINDOW_HEIGHT_EN 125 * dpi_scale_
-#define REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_CN 90 * dpi_scale_
-#define REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_EN 210 * dpi_scale_
-#endif
@@ -1,89 +0,0 @@
-/*
- * @Author: DI JUNKUN
- * @Date: 2024-06-14
- * Copyright (c) 2024 by DI JUNKUN, All Rights Reserved.
- */
-
-#ifndef _LAYOUT_STYLE_H_
-#define _LAYOUT_STYLE_H_
-
-#define TITLE_BAR_HEIGHT 0.0625f
-#define TITLE_BAR_BUTTON_WIDTH 0.0625f
-#define TITLE_BAR_BUTTON_HEIGHT 0.0625f
-#define STATUS_BAR_HEIGHT 0.05f
-#define MENU_WINDOW_WIDTH_CN 300
-#define MENU_WINDOW_HEIGHT_CN 280
-#define LOCAL_WINDOW_WIDTH_CN 300
-#define LOCAL_WINDOW_HEIGHT_CN 280
-#define REMOTE_WINDOW_WIDTH_CN 300
-#define REMOTE_WINDOW_HEIGHT_CN 280
-#define MENU_WINDOW_WIDTH_EN 190
-#define MENU_WINDOW_HEIGHT_EN 245
-#define IPUT_WINDOW_WIDTH 160
-#define INPUT_WINDOW_PADDING_CN 66
-#define INPUT_WINDOW_PADDING_EN 96
-#define SETTINGS_WINDOW_WIDTH_CN 202
-#define SETTINGS_WINDOW_WIDTH_EN 248
-#if USE_CUDA
-#if _WIN32
-#define SETTINGS_WINDOW_HEIGHT_CN 405
-#define SETTINGS_WINDOW_HEIGHT_EN 405
-#else
-#define SETTINGS_WINDOW_HEIGHT_CN 375
-#define SETTINGS_WINDOW_HEIGHT_EN 375
-#endif
-#else
-#if _WIN32
-#define SETTINGS_WINDOW_HEIGHT_CN 375
-#define SETTINGS_WINDOW_HEIGHT_EN 375
-#else
-#define SETTINGS_WINDOW_HEIGHT_CN 345
-#define SETTINGS_WINDOW_HEIGHT_EN 345
-#endif
-#endif
-#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_CN 228
-#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_EN 275
-#define SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_CN 195
-#define SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_EN 195
-#define LANGUAGE_SELECT_WINDOW_PADDING_CN 120
-#define LANGUAGE_SELECT_WINDOW_PADDING_EN 167
-#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 120
-#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 167
-#define VIDEO_FRAME_RATE_SELECT_WINDOW_PADDING_CN 120
-#define VIDEO_FRAME_RATE_SELECT_WINDOW_PADDING_EN 167
-#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_CN 120
-#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_EN 167
-#define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_CN 171
-#define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_EN 218
-#define ENABLE_TURN_CHECKBOX_PADDING_CN 171
-#define ENABLE_TURN_CHECKBOX_PADDING_EN 218
-#define ENABLE_SRTP_CHECKBOX_PADDING_CN 171
-#define ENABLE_SRTP_CHECKBOX_PADDING_EN 218
-#define ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_CN 171
-#define ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_EN 218
-#define ENABLE_AUTOSTART_PADDING_CN 171
-#define ENABLE_AUTOSTART_PADDING_EN 218
-#define ENABLE_DAEMON_PADDING_CN 171
-#define ENABLE_DAEMON_PADDING_EN 218
-#define ENABLE_MINIZE_TO_TRAY_PADDING_CN 171
-#define ENABLE_MINIZE_TO_TRAY_PADDING_EN 218
-#define SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_CN 90
-#define SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_EN 137
-#define SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_CN 90
-#define SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_EN 137
-#define SETTINGS_SELECT_WINDOW_WIDTH 73
-#define SELF_HOSTED_SERVER_INPUT_WINDOW_WIDTH 130
-#define SETTINGS_OK_BUTTON_PADDING_CN 65
-#define SETTINGS_OK_BUTTON_PADDING_EN 83
-#define SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_CN 78
-#define SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_EN 91
-#define UPDATE_NOTIFICATION_OK_BUTTON_PADDING_CN 162
-#define UPDATE_NOTIFICATION_OK_BUTTON_PADDING_EN 146
-#define UPDATE_NOTIFICATION_RESERVED_HEIGHT 120
-#define REQUEST_PERMISSION_WINDOW_WIDTH_CN 130
-#define REQUEST_PERMISSION_WINDOW_HEIGHT_CN 125
-#define REQUEST_PERMISSION_WINDOW_WIDTH_EN 260
-#define REQUEST_PERMISSION_WINDOW_HEIGHT_EN 125
-#define REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_CN 90
-#define REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_EN 210
-#endif
@@ -20,11 +20,19 @@ struct TranslationRow {

 // Single source of truth for all UI strings.
 #define CROSSDESK_LOCALIZATION_ALL(X)                                          \
+  X(privacy_screen, u8"隐私屏", "Privacy screen", u8"Приватный экран") \
+  X(privacy_enable, u8"开启隐私屏", "Enable privacy screen", u8"Включить приватный экран") \
+  X(privacy_disable, u8"关闭隐私屏", "Disable privacy screen", u8"Выключить приватный экран") \
+  X(privacy_on, u8"隐私屏：已开启", "Privacy screen: on", u8"Приватный экран: включён") \
+  X(privacy_off, u8"隐私屏：已关闭", "Privacy screen: off", u8"Приватный экран: выключен") \
+  X(privacy_unsupported, u8"隐私屏：不可用", "Privacy screen: unavailable", u8"Приватный экран: недоступен") \
  X(local_desktop, u8"本桌面", "Local Desktop", u8"Локальный рабочий стол")    \
  X(local_id, u8"本机ID", "Local ID", u8"Локальный ID")                        \
  X(local_id_copied_to_clipboard, u8"已复制到剪贴板", "Copied to clipboard",   \
    u8"Скопировано в буфер обмена")                                            \
  X(password, u8"密码", "Password", u8"Пароль")                                \
+  X(refresh_password, u8"刷新随机密码", "Refresh random password",            \
+    u8"Обновить случайный пароль")                                           \
  X(max_password_len, u8"最大6个字符", "Max 6 chars", u8"Макс. 6 символов")    \
  X(remote_desktop, u8"远程桌面", "Remote Desktop",                            \
    u8"Удаленный рабочий стол")                                                \
@@ -120,6 +128,9 @@ struct TranslationRow {
    u8"стола")                                                                 \
  X(settings, u8"设置", "Settings", u8"Настройки")                             \
  X(language, u8"语言:", "Language:", u8"Язык:")                               \
+  X(screen_capture_method, u8"采集方式:", "Capture Method:",                  \
+    u8"Способ захвата:")                                                      \
+  X(screen_capture_method_auto, u8"自动", "Auto", u8"Авто")                 \
  X(video_quality, u8"画面质量:", "Video Quality:", u8"Качество видео:")       \
  X(video_frame_rate, u8"画面采集帧率:",                                       \
    "Video Capture Frame Rate:", u8"Частота захвата видео:")                   \
@@ -140,7 +151,7 @@ struct TranslationRow {
    "Enable Hardware Video Codec:", u8"Использовать аппаратный кодек:")        \
  X(enable_turn, u8"启用中继服务:",                                            \
    "Enable TURN Service:", u8"Включить TURN-сервис:")                         \
-  X(enable_srtp, u8"启用SRTP:", "Enable SRTP:", u8"Включить SRTP:")            \
+  X(force_relay, u8"强制中继连接:", "Force Relay:", u8"Только через реле:")   \
  X(self_hosted_server_config, u8"自托管配置", "Self-Hosted Config",           \
    u8"Конфигурация self-hosted")                                              \
  X(self_hosted_server_settings, u8"自托管设置", "Self-Hosted Settings",       \
@@ -149,8 +160,6 @@ struct TranslationRow {
    "Server Address:", u8"Адрес сервера:")                                     \
  X(self_hosted_server_port, u8"信令服务端口:",                                \
    "Signal Service Port:", u8"Порт сигнального сервиса:")                     \
-  X(self_hosted_server_coturn_server_port, u8"中继服务端口:",                  \
-    "Relay Service Port:", u8"Порт реле-сервиса:")                             \
  X(ok, u8"确认", "OK", u8"ОК")                                                \
  X(cancel, u8"取消", "Cancel", u8"Отмена")                                    \
  X(new_password, u8"请输入六位密码:",                                         \
@@ -204,6 +213,8 @@ struct TranslationRow {
    "Confirm to delete this connection", u8"Удалить это подключение?")         \
  X(enable_autostart, u8"开机自启:", "Auto Start:", u8"Автозапуск:")           \
  X(enable_daemon, u8"启用守护进程:", "Enable Daemon:", u8"Включить демон:")   \
+  X(privacy_on_connect, u8"被连接时开启隐私屏:", "Privacy screen on connect:", \
+    u8"Приватность при подключении:")                                       \
  X(takes_effect_after_restart, u8"重启后生效", "Takes effect after restart",  \
    u8"Вступит в силу после перезапуска")                                      \
  X(select_file, u8"选择文件发送", "Select File to Send",                      \
@@ -225,6 +236,9 @@ struct TranslationRow {
  X(connection_mode, u8"连接模式", "Mode", u8"Режим")                          \
  X(connection_mode_direct, u8"直连", "Direct", u8"Прямой")                    \
  X(connection_mode_relay, u8"中继", "Relay", u8"Релейный")                    \
+  X(transport_encryption, u8"加密传输", "Encryption", u8"Шифрование")         \
+  X(transport_encryption_enabled, u8"已开启", "Enabled", u8"Включено")         \
+  X(transport_encryption_disabled, u8"未开启", "Disabled", u8"Выключено")       \
  X(online, u8"在线", "Online", u8"Онлайн")                                    \
  X(offline, u8"离线", "Offline", u8"Офлайн")                                  \
  X(device_offline, u8"设备离线", "Device Offline", u8"Устройство офлайн")     \
@@ -239,6 +253,9 @@ struct TranslationRow {
    u8"Для работы приложения требуются следующие разрешения:")                 \
  X(show_main_window, u8"显示主界面", "Show Main Window",                    \
    u8"Показать главное окно")                                                \
+  X(privacy_screen_unlock_hint, u8"按下快捷键，解除隐私屏",                    \
+    "To turn off the privacy screen, press",                                 \
+    u8"Чтобы отключить приватный экран, нажмите")                             \
  X(exit_program, u8"退出", "Exit", u8"Выход")

 inline constexpr TranslationRow kTranslationRows[] = {
@@ -1,14 +1,21 @@
 #include "features/devices/session_device_manager.h"

+#include <display_stream_id.h>
 #include <remote_action.h>

+#include <algorithm>
 #include <chrono>
 #include <cstdlib>
+#include <utility>

-#include <display_stream_id.h>
 #include "platform.h"
 #include "rd_log.h"
 #include "runtime/gui_runtime.h"
+#include "speaker_capturer_factory.h"
+#ifdef _WIN32
+#include "platform/windows/screen_capturer/screen_capturer_win.h"
+#include "platform/windows/input/mouse/mouse_controller.h"
+#endif

 namespace crossdesk {
 namespace {
@@ -19,7 +26,23 @@ constexpr auto kFrameDeadlineTolerance = std::chrono::milliseconds(1);

 } // namespace

-SessionDeviceManager::SessionDeviceManager(GuiRuntime &owner) : owner_(owner) {}
+SessionDeviceManager::SessionDeviceManager(GuiRuntime &owner)
+    : owner_(owner),
+      speaker_capture_(
+          [] {
+            return std::unique_ptr<SpeakerCapturer>(
+                SpeakerCapturerFactory().Create());
+          },
+          [this](unsigned char *data, size_t size, const char *) {
+            if (!owner_.peer_) return;
+            MiniRtcAudioFrame frame{};
+            frame.data = reinterpret_cast<const char *>(data);
+            frame.size = size;
+            frame.captured_timestamp = GetSystemTimeMicros(owner_.peer_);
+            SendAudioFrame(owner_.peer_, &frame, owner_.audio_label_.c_str());
+          }) {}
+
+SessionDeviceManager::~SessionDeviceManager() { speaker_capture_.Shutdown(); }

 bool SessionDeviceManager::ShouldSendCapturedFrame(
    std::chrono::steady_clock::time_point now, int fps) {
@@ -38,10 +61,56 @@ bool SessionDeviceManager::ShouldSendCapturedFrame(
  return true;
 }

+void SessionDeviceManager::RecordCaptureCadence(
+    std::chrono::steady_clock::time_point now, int fps,
+    bool from_secure_desktop) {
+  std::lock_guard<std::mutex> lock(capture_metrics_mutex_);
+  if (capture_metrics_started_ == std::chrono::steady_clock::time_point{})
+    capture_metrics_started_ = now;
+  const auto elapsed_us = std::chrono::duration_cast<std::chrono::microseconds>(
+                              now - capture_metrics_started_)
+                              .count();
+  if (elapsed_us >= 2000000) {
+    if (capture_forwarded_) {
+      const char* source = capture_secure_callbacks_ == 0 ? "normal_desktop"
+                           : capture_secure_callbacks_ == capture_callbacks_
+                               ? "secure_desktop"
+                               : "mixed";
+      LOG_INFO(
+          "Capture delivery: source={} normal_callbacks={} secure_callbacks={} "
+          "target_fps={} input_fps={:.2f} "
+          "forwarded_fps={:.2f} callbacks={} rate_dropped={} "
+          "forwarded={} send_errors={} max_callback_gap_us={} "
+          "send_avg_us={} send_max_us={} window_ms={}",
+          source, capture_callbacks_ - capture_secure_callbacks_,
+          capture_secure_callbacks_, fps,
+          capture_callbacks_ * 1000000.0 / elapsed_us,
+          capture_forwarded_ * 1000000.0 / elapsed_us, capture_callbacks_,
+          capture_rate_drops_, capture_forwarded_, capture_send_errors_,
+          capture_max_gap_us_, capture_send_us_ / capture_forwarded_,
+          capture_max_send_us_, elapsed_us / 1000);
+    }
+    capture_metrics_started_ = now;
+    capture_callbacks_ = capture_rate_drops_ = capture_forwarded_ = 0;
+    capture_secure_callbacks_ = 0;
+    capture_send_errors_ = 0;
+    capture_max_gap_us_ = capture_send_us_ = capture_max_send_us_ = 0;
+  }
+  if (last_capture_callback_ != std::chrono::steady_clock::time_point{}) {
+    capture_max_gap_us_ =
+        std::max<int64_t>(capture_max_gap_us_,
+                          std::chrono::duration_cast<std::chrono::microseconds>(
+                              now - last_capture_callback_)
+                              .count());
+  }
+  last_capture_callback_ = std::max(last_capture_callback_, now);
+  ++capture_callbacks_;
+  if (from_secure_desktop) ++capture_secure_callbacks_;
+}
+
 void SessionDeviceManager::Initialize() {
  InitializeAudioOutput();
  screen_capturer_factory_ = new ScreenCapturerFactory();
-  speaker_capturer_factory_ = new SpeakerCapturerFactory();
  device_controller_factory_ = new DeviceControllerFactory();
  keyboard_capturer_ =
      static_cast<KeyboardCapturer *>(device_controller_factory_->Create(
@@ -59,15 +128,26 @@ int SessionDeviceManager::InitializeScreenCapturer() {
    screen_capturer_ =
        static_cast<ScreenCapturer *>(screen_capturer_factory_->Create());
  }
+  screen_capturer_->SetPrivacyController(&owner_.privacy_);
+#ifdef _WIN32
+  if (auto windows = dynamic_cast<ScreenCapturerWin*>(screen_capturer_)) {
+    windows->SetCaptureMethod(owner_.config_center_->GetScreenCaptureMethod());
+  }
+#endif

  last_frame_time_ = {};
  next_frame_deadline_ = {};
+  capture_metrics_started_ = last_capture_callback_ = {};
+  capture_callbacks_ = capture_rate_drops_ = capture_forwarded_ = 0;
+  capture_secure_callbacks_ = 0;
+  capture_send_errors_ = 0;
+  capture_max_gap_us_ = capture_send_us_ = capture_max_send_us_ = 0;
  const int fps = owner_.config_center_->GetVideoFrameRate() ==
                          ConfigCenter::VIDEO_FRAME_RATE::FPS_30
                      ? 30
                      : 60;
  LOG_INFO("Init screen capturer with {} fps", fps);
-  display_info_list_.clear();
+  SetDisplayInfoList({});
  registered_display_stream_count_ = 0;
  last_video_frame_stream_id_.clear();
  invalid_video_stream_id_logged_ = false;
@@ -77,7 +157,15 @@ int SessionDeviceManager::InitializeScreenCapturer() {
                       const char *display_name,
                       const MiniRtcNativeVideoFrame *native_frame) {
        const auto now_time = std::chrono::steady_clock::now();
+        bool from_secure_desktop = false;
+#ifdef _WIN32
+        from_secure_desktop =
+            ScreenCapturerWin::CurrentFrameIsFromSecureDesktop();
+#endif
+        RecordCaptureCadence(now_time, fps, from_secure_desktop);
        if (!ShouldSendCapturedFrame(now_time, fps)) {
+          std::lock_guard<std::mutex> lock(capture_metrics_mutex_);
+          ++capture_rate_drops_;
          return;
        }

@@ -144,9 +232,24 @@ int SessionDeviceManager::InitializeScreenCapturer() {
        frame.height = height;
        frame.captured_timestamp = GetSystemTimeMicros(owner_.peer_);
        frame.native_frame = native_frame;
+        const auto send_started = std::chrono::steady_clock::now();
+        uint64_t send_errors = 0;
        for (const std::string &remote_id : connected_remote_ids) {
-          SendVideoFrameToPeer(owner_.peer_, &frame, stream_id.c_str(),
-                               remote_id.data(), remote_id.size());
+          if (SendVideoFrameToPeer(owner_.peer_, &frame, stream_id.c_str(),
+                                   remote_id.data(), remote_id.size()) != 0)
+            ++send_errors;
+        }
+        const auto send_us =
+            std::chrono::duration_cast<std::chrono::microseconds>(
+                std::chrono::steady_clock::now() - send_started)
+                .count();
+        {
+          std::lock_guard<std::mutex> lock(capture_metrics_mutex_);
+          ++capture_forwarded_;
+          capture_send_errors_ += send_errors;
+          capture_send_us_ += send_us;
+          capture_max_send_us_ =
+              std::max<int64_t>(capture_max_send_us_, send_us);
        }
        last_video_frame_stream_id_ = stream_id;
        last_frame_time_ = now_time;
@@ -154,11 +257,11 @@ int SessionDeviceManager::InitializeScreenCapturer() {

  if (init_ret == 0) {
    LOG_INFO("Init screen capturer success");
-    const auto latest_display_info = screen_capturer_->GetDisplayInfoList();
+    auto latest_display_info = screen_capturer_->GetDisplayInfoList();
+    registered_display_stream_count_ = latest_display_info.size();
    if (!latest_display_info.empty()) {
-      display_info_list_ = latest_display_info;
+      SetDisplayInfoList(std::move(latest_display_info));
    }
-    registered_display_stream_count_ = display_info_list_.size();
    return 0;
  }

@@ -169,6 +272,15 @@ int SessionDeviceManager::InitializeScreenCapturer() {
  return -1;
 }

+bool SessionDeviceManager::ShouldCaptureCursor() const {
+  std::shared_lock lock(owner_.connection_status_mutex_);
+  return std::any_of(owner_.connection_status_.begin(),
+                     owner_.connection_status_.end(), [](const auto& entry) {
+    return entry.second == ConnectionStatus::Connected &&
+           entry.first.find("web") != std::string::npos;
+  });
+}
+
 int SessionDeviceManager::StartScreenCapturer() {
 #ifdef __APPLE__
  if (!owner_.EnsureMacScreenRecordingPermission()) {
@@ -184,8 +296,11 @@ int SessionDeviceManager::StartScreenCapturer() {
    }
  }

-  LOG_INFO("Start screen capturer, show cursor: {}", owner_.show_cursor_);
-  const int ret = screen_capturer_->Start(owner_.show_cursor_);
+  // Clear before sampling, so a change arriving after the sample remains pending.
+  cursor_capture_dirty_.store(false, std::memory_order_relaxed);
+  const bool show_cursor = ShouldCaptureCursor();
+  LOG_INFO("Start screen capturer, show cursor: {}", show_cursor);
+  const int ret = screen_capturer_->Start(show_cursor);
  if (ret != 0) {
    LOG_ERROR("Start screen capturer failed: {}", ret);
  }
@@ -200,45 +315,46 @@ int SessionDeviceManager::StopScreenCapturer() {
  return 0;
 }

-int SessionDeviceManager::StartSpeakerCapturer() {
-  if (!speaker_capturer_) {
-    speaker_capturer_ =
-        static_cast<SpeakerCapturer *>(speaker_capturer_factory_->Create());
-    const int init_ret = speaker_capturer_->Init(
-        [this](unsigned char *data, size_t size, const char *audio_name) {
-          MiniRtcAudioFrame frame{};
-          frame.data = reinterpret_cast<const char *>(data);
-          frame.size = size;
-          frame.captured_timestamp = GetSystemTimeMicros(owner_.peer_);
-          SendAudioFrame(owner_.peer_, &frame, owner_.audio_label_.c_str());
-        });
+#ifdef _WIN32
+void SessionDeviceManager::ReleaseRemoteMouseButtons() {
+  if (auto mouse = dynamic_cast<PlatformMouseController*>(mouse_controller_))
+    mouse->ReleasePressedButtons();
+}
+#endif

-    if (init_ret != 0) {
-      speaker_capturer_->Destroy();
-      delete speaker_capturer_;
-      speaker_capturer_ = nullptr;
-    }
-  }
-
-  if (!speaker_capturer_) {
-    return -1;
-  }
-
-  const int ret = speaker_capturer_->Start();
-  if (ret != 0) {
-    LOG_ERROR("Start speaker capturer failed: {}", ret);
-    return ret;
-  }
-  owner_.start_speaker_capturer_ = true;
-  return 0;
+void SessionDeviceManager::StartSpeakerCapturer() {
+  speaker_capture_.SetEnabled(true);
 }

-int SessionDeviceManager::StopSpeakerCapturer() {
-  if (speaker_capturer_) {
-    speaker_capturer_->Stop();
-    owner_.start_speaker_capturer_ = false;
+void SessionDeviceManager::StopSpeakerCapturer() {
+  speaker_capture_.SetEnabled(false);
+}
+
+bool SessionDeviceManager::SyncDisplayInfo() {
+  if (!screen_capturer_) return false;
+  auto displays = screen_capturer_->GetDisplayInfoList();
+  if (displays.empty()) return false;
+  // Called every UI tick; replace the shared list only when geometry actually
+  // changed so readers on other threads rarely contend for the lock.
+  bool changed = false;
+  {
+    std::lock_guard<std::mutex> lock(display_info_mutex_);
+    changed = !std::equal(
+        displays.begin(), displays.end(), display_info_list_.begin(),
+        display_info_list_.end(), [](const auto &a, const auto &b) {
+          return a.handle == b.handle && a.name == b.name &&
+                 a.is_primary == b.is_primary && a.left == b.left &&
+                 a.top == b.top && a.width == b.width && a.height == b.height;
+        });
+    if (changed) display_info_list_ = displays;
  }
-  return 0;
+  if (changed && mouse_controller_) mouse_controller_->UpdateDisplayInfoList(displays);
+  return true;
+}
+
+void SessionDeviceManager::SetDisplayInfoList(std::vector<DisplayInfo> displays) {
+  std::lock_guard<std::mutex> lock(display_info_mutex_);
+  display_info_list_ = std::move(displays);
 }

 int SessionDeviceManager::StartMouseController() {
@@ -265,14 +381,9 @@ int SessionDeviceManager::StartMouseController() {
    }
  }

-  if (screen_capturer_) {
-    const auto latest_display_info = screen_capturer_->GetDisplayInfoList();
-    if (!latest_display_info.empty()) {
-      display_info_list_ = latest_display_info;
-    }
-  }
 #endif

+  SyncDisplayInfo();
  mouse_controller_ =
      static_cast<MouseController *>(device_controller_factory_->Create(
          DeviceControllerFactory::Device::Mouse));
@@ -281,7 +392,7 @@ int SessionDeviceManager::StartMouseController() {
    return -1;
  }

-  const int init_ret = mouse_controller_->Init(display_info_list_);
+  const int init_ret = mouse_controller_->Init(display_info_list());
  if (init_ret != 0) {
    LOG_INFO("Destroy mouse controller");
    mouse_controller_->Destroy();
@@ -301,6 +412,7 @@ int SessionDeviceManager::StopMouseController() {
 }

 int SessionDeviceManager::StartKeyboardCapturer() {
+  ClearCapturedKeyboardInput();
  owner_.keyboard_capturer_uses_window_events_ = false;

 #ifdef __APPLE__
@@ -336,6 +448,7 @@ int SessionDeviceManager::StartKeyboardCapturer() {
      },
      this);
  if (hook_ret != 0) {
+    keyboard_capturer_->Unhook();
    owner_.keyboard_capturer_uses_window_events_ = true;
    LOG_WARN(
        "Start keyboard capturer failed, falling back to Slint keyboard events");
@@ -346,6 +459,9 @@ int SessionDeviceManager::StartKeyboardCapturer() {
 }

 int SessionDeviceManager::StopKeyboardCapturer() {
+  owner_.keyboard_capturer_is_started_ = false;
+  if (keyboard_capturer_) keyboard_capturer_->Unhook();
+  ClearCapturedKeyboardInput();
  if (owner_.keyboard_capturer_uses_window_events_) {
    owner_.keyboard_capturer_uses_window_events_ = false;
    LOG_INFO("Stop keyboard capturer with Slint keyboard backend");
@@ -353,8 +469,6 @@ int SessionDeviceManager::StopKeyboardCapturer() {
  }

  if (keyboard_capturer_) {
-    keyboard_capturer_->Unhook();
-    ClearCapturedKeyboardInput();
    LOG_INFO("Stop keyboard capturer");
  }
  return 0;
@@ -424,6 +538,15 @@ void SessionDeviceManager::PushAudio(const char *data, size_t size) {
 }

 void SessionDeviceManager::UpdateInteractions() {
+#ifdef _WIN32
+  if (owner_.screen_capturer_is_started_ &&
+      cursor_capture_dirty_.load(std::memory_order_relaxed)) {
+    if (auto* windows = dynamic_cast<ScreenCapturerWin*>(screen_capturer_)) {
+      cursor_capture_dirty_.store(false, std::memory_order_relaxed);
+      windows->SetCursorCapture(ShouldCaptureCursor());
+    }
+  }
+#endif
 #if defined(__linux__) && !defined(__APPLE__)
  const bool is_wayland_session = IsWaylandSession();
  const bool stop_wayland_mouse_before_screen =
@@ -448,16 +571,6 @@ void SessionDeviceManager::UpdateInteractions() {
    owner_.screen_capturer_is_started_ = false;
  }

-  if (owner_.start_speaker_capturer_ && !owner_.speaker_capturer_is_started_) {
-    if (StartSpeakerCapturer() == 0) {
-      owner_.speaker_capturer_is_started_ = true;
-    }
-  } else if (!owner_.start_speaker_capturer_ &&
-             owner_.speaker_capturer_is_started_) {
-    StopSpeakerCapturer();
-    owner_.speaker_capturer_is_started_ = false;
-  }
-
  if (owner_.start_mouse_controller_ && !owner_.mouse_controller_is_started_) {
    if (StartMouseController() == 0) {
      owner_.mouse_controller_is_started_ = true;
@@ -468,22 +581,33 @@ void SessionDeviceManager::UpdateInteractions() {
    owner_.mouse_controller_is_started_ = false;
  }

-#if defined(__linux__) || defined(__APPLE__)
-  if (owner_.screen_capturer_is_started_ && screen_capturer_ &&
-      mouse_controller_) {
-    const auto latest_display_info = screen_capturer_->GetDisplayInfoList();
-    if (!latest_display_info.empty()) {
-      display_info_list_ = latest_display_info;
-      mouse_controller_->UpdateDisplayInfoList(display_info_list_);
+  if (owner_.screen_capturer_is_started_ && mouse_controller_ && SyncDisplayInfo()) {
+#ifdef _WIN32
+    const int active_display = screen_capturer_->GetCurrentMonitorIndex();
+    const auto displays = display_info_list();
+    if (active_display >= 0 &&
+        active_display < static_cast<int>(displays.size())) {
+      owner_.selected_display_ = active_display;
+      if (displays[active_display].width <= 0 ||
+          displays[active_display].height <= 0)
+        ReleaseRemoteMouseButtons();
    }
-  }
 #endif
+  }

  if (owner_.start_keyboard_capturer_ && owner_.focus_on_stream_window_) {
    if (!owner_.keyboard_capturer_is_started_ && StartKeyboardCapturer() == 0) {
      owner_.keyboard_capturer_is_started_ = true;
    }
    if (owner_.keyboard_capturer_is_started_) {
+      if (!owner_.keyboard_capturer_uses_window_events_ &&
+          (!keyboard_capturer_ || !keyboard_capturer_->IsHookActive())) {
+        StopKeyboardCapturer();
+        owner_.keyboard_.ForceReleasePressedKeys();
+        owner_.keyboard_capturer_uses_window_events_ = true;
+        owner_.keyboard_capturer_is_started_ = true;
+        LOG_WARN("Native keyboard capture stopped; using Slint keyboard events");
+      }
      DrainCapturedKeyboardInput();
      owner_.keyboard_.SendHeartbeat(false);
    }
@@ -515,6 +639,7 @@ void SessionDeviceManager::DrainCapturedKeyboardInput() {
    std::lock_guard<std::mutex> lock(captured_keyboard_inputs_mutex_);
    inputs.swap(captured_keyboard_inputs_);
  }
+  if (owner_.privacy_.Snapshot().input_blocked) return;
  for (const CapturedKeyboardInput &input : inputs) {
    owner_.keyboard_.SendKeyCommand(input.key_code, input.is_down,
                                    input.scan_code, input.extended);
@@ -541,21 +666,45 @@ void SessionDeviceManager::SendMouseCommand(const RemoteAction &action,
 }

 int SessionDeviceManager::SwitchDisplay(int display_id) {
-  return screen_capturer_ ? screen_capturer_->SwitchTo(display_id) : -1;
+  if (!screen_capturer_) return -1;
+  const int ret = screen_capturer_->SwitchTo(display_id);
+  if (ret == 0) SyncDisplayInfo();
+  return ret;
 }

 void SessionDeviceManager::ResetToInitialDisplay() {
-  if (screen_capturer_) {
-    screen_capturer_->ResetToInitialMonitor();
+  if (!screen_capturer_) {
+    return;
  }
+  const int ret = screen_capturer_->ResetToInitialMonitor();
+  if (ret != 0) {
+    LOG_WARN("Reset to initial display failed, ret={}", ret);
+    return;
+  }
+  // Capture backends start at display 0. Reset the input mapping as well so
+  // the next connection cannot show that display while controlling another.
+  owner_.selected_display_ = 0;
+  SyncDisplayInfo();
 }

-const std::vector<DisplayInfo> &
-SessionDeviceManager::display_info_list() const {
+std::vector<DisplayInfo> SessionDeviceManager::display_info_list() const {
+  std::lock_guard<std::mutex> lock(display_info_mutex_);
  return display_info_list_;
 }

+std::vector<HostDisplay> SessionDeviceManager::host_display_list() const {
+  std::lock_guard<std::mutex> lock(display_info_mutex_);
+  std::vector<HostDisplay> displays;
+  displays.reserve(display_info_list_.size());
+  for (const auto &display : display_info_list_) {
+    displays.push_back({display.name, display.left, display.top, display.right,
+                        display.bottom});
+  }
+  return displays;
+}
+
 void SessionDeviceManager::DestroyDevices() {
+  speaker_capture_.Shutdown();
  if (mouse_controller_) {
    mouse_controller_->Destroy();
    delete mouse_controller_;
@@ -566,11 +715,6 @@ void SessionDeviceManager::DestroyDevices() {
    delete screen_capturer_;
    screen_capturer_ = nullptr;
  }
-  if (speaker_capturer_) {
-    speaker_capturer_->Destroy();
-    delete speaker_capturer_;
-    speaker_capturer_ = nullptr;
-  }
  if (keyboard_capturer_) {
    delete keyboard_capturer_;
    keyboard_capturer_ = nullptr;
@@ -580,8 +724,6 @@ void SessionDeviceManager::DestroyDevices() {
 void SessionDeviceManager::DestroyFactories() {
  delete screen_capturer_factory_;
  screen_capturer_factory_ = nullptr;
-  delete speaker_capturer_factory_;
-  speaker_capturer_factory_ = nullptr;
  delete device_controller_factory_;
  device_controller_factory_ = nullptr;
 }
@@ -1,8 +1,16 @@
-#ifndef CROSSDESK_GUI_SESSION_DEVICE_MANAGER_H_
-#define CROSSDESK_GUI_SESSION_DEVICE_MANAGER_H_
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-09
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _SESSION_DEVICE_MANAGER_H_
+#define _SESSION_DEVICE_MANAGER_H_
+

 #include <SDL3/SDL.h>

+#include <atomic>
 #include <chrono>
 #include <cstddef>
 #include <cstdint>
@@ -17,7 +25,7 @@
 #include "device_controller_factory.h"
 #include "display_info.h"
 #include "screen_capturer_factory.h"
-#include "speaker_capturer_factory.h"
+#include "speaker_capture_controller.h"

 namespace crossdesk {

@@ -29,17 +37,28 @@ class GuiRuntime;
 class SessionDeviceManager {
 public:
  explicit SessionDeviceManager(GuiRuntime &owner);
+  ~SessionDeviceManager();

  void Initialize();
  void UpdateInteractions();
+  // Call after changing the controller map. UpdateInteractions consumes this
+  // notification on the UI thread before reading the map under its mutex.
+  void OnControllerConnectionsChanged() {
+    cursor_capture_dirty_.store(true, std::memory_order_relaxed);
+  }
  void DestroyDevices();
  void DestroyFactories();

  int InitializeScreenCapturer();
  int StartScreenCapturer();
  int StopScreenCapturer();
-  int StartSpeakerCapturer();
-  int StopSpeakerCapturer();
+#ifdef _WIN32
+  void ReleaseRemoteMouseButtons();
+#endif
+  // Requests are asynchronous; Stop drains/revokes audio delivery before
+  // returning so the connection peer can be destroyed safely.
+  void StartSpeakerCapturer();
+  void StopSpeakerCapturer();
  int StartMouseController();
  int StopMouseController();
  int StartKeyboardCapturer();
@@ -55,7 +74,12 @@ public:
  int SwitchDisplay(int display_id);
  void ResetToInitialDisplay();

-  const std::vector<DisplayInfo> &display_info_list() const;
+  // Snapshot of the capture displays. The UI thread refreshes the list every
+  // tick while transport threads build host information and map mouse input
+  // from it, so callers get a copy taken under the lock.
+  std::vector<DisplayInfo> display_info_list() const;
+  // The same snapshot in the wire's host information form.
+  std::vector<HostDisplay> host_display_list() const;

 private:
  struct CapturedKeyboardInput {
@@ -71,26 +95,41 @@ private:
  void ClearCapturedKeyboardInput();
  bool ShouldSendCapturedFrame(std::chrono::steady_clock::time_point now,
                               int fps);
+  bool ShouldCaptureCursor() const;
+  bool SyncDisplayInfo();
+  void SetDisplayInfoList(std::vector<DisplayInfo> displays);
+  void RecordCaptureCadence(std::chrono::steady_clock::time_point now, int fps,
+                            bool from_secure_desktop);

  GuiRuntime &owner_;
  SDL_AudioStream *output_stream_ = nullptr;
  ScreenCapturerFactory *screen_capturer_factory_ = nullptr;
  ScreenCapturer *screen_capturer_ = nullptr;
-  SpeakerCapturerFactory *speaker_capturer_factory_ = nullptr;
-  SpeakerCapturer *speaker_capturer_ = nullptr;
+  std::atomic<bool> cursor_capture_dirty_{true};
+  SpeakerCaptureController speaker_capture_;
  DeviceControllerFactory *device_controller_factory_ = nullptr;
  MouseController *mouse_controller_ = nullptr;
  KeyboardCapturer *keyboard_capturer_ = nullptr;
+  // Guards display_info_list_ (UI thread writes, transport threads read).
+  mutable std::mutex display_info_mutex_;
  std::vector<DisplayInfo> display_info_list_;
  size_t registered_display_stream_count_ = 0;
  std::deque<CapturedKeyboardInput> captured_keyboard_inputs_;
  std::mutex captured_keyboard_inputs_mutex_;
  std::chrono::steady_clock::time_point last_frame_time_{};
  std::chrono::steady_clock::time_point next_frame_deadline_{};
+  std::mutex capture_metrics_mutex_;
+  std::chrono::steady_clock::time_point capture_metrics_started_{};
+  std::chrono::steady_clock::time_point last_capture_callback_{};
+  uint64_t capture_callbacks_ = 0, capture_rate_drops_ = 0;
+  uint64_t capture_secure_callbacks_ = 0;
+  uint64_t capture_forwarded_ = 0, capture_send_errors_ = 0;
+  int64_t capture_max_gap_us_ = 0;
+  int64_t capture_send_us_ = 0, capture_max_send_us_ = 0;
  std::string last_video_frame_stream_id_;
  bool invalid_video_stream_id_logged_ = false;
 };

 } // namespace crossdesk

-#endif // CROSSDESK_GUI_SESSION_DEVICE_MANAGER_H_
+#endif
@@ -52,6 +52,9 @@ void PopulateWindowsKeyMetadataFromVk(int key_code, uint32_t* scan_code_out,
  if (!scan_code_out || !extended_out) {
    return;
  }
+  if (LookupWindowsKeyMetadataFromVk(key_code, scan_code_out, extended_out)) {
+    return;
+  }
 #if _WIN32
  const UINT scan_code =
      MapVirtualKeyW(static_cast<UINT>(key_code), MAPVK_VK_TO_VSC_EX);
@@ -61,7 +64,6 @@ void PopulateWindowsKeyMetadataFromVk(int key_code, uint32_t* scan_code_out,
    return;
  }
 #endif
-  LookupWindowsKeyMetadataFromVk(key_code, scan_code_out, extended_out);
 }

 #if _WIN32
@@ -213,6 +215,9 @@ int KeyboardController::SendKeyCommand(int key_code, bool is_down,
 bool KeyboardController::InjectRemoteKey(int key_code, bool is_down,
                                         uint32_t scan_code, bool extended) {
 #if _WIN32
+  if (owner_.privacy_.Engaged() && !IsWindowsPrivacyDesktopAvailable()) {
+    owner_.privacy_.Fail("Secure desktop or locked session; privacy screen will turn off");
+  }
  if (owner_.local_service_status_received_ &&
      IsSecureDesktopInteractionRequired(owner_.local_interactive_stage_)) {
    const std::string response = SendCrossDeskSecureDesktopKeyInput(
@@ -246,6 +251,7 @@ bool KeyboardController::InjectRemoteKey(int key_code, bool is_down,
    return true;
  }
 #endif
+  // Recheck after the desktop query; key-up cleanup remains allowed while paused.
  return owner_.devices_.SendKeyboardCommand(key_code, is_down, scan_code,
                                             extended);
 }
@@ -342,11 +348,50 @@ void KeyboardController::ReleaseRemotePressedKeys(const std::string& remote_id,
             keys_to_release.size(), remote_id, reason ? reason : "unknown");
  }
  for (const PressedKey& key : keys_to_release) {
-    InjectRemoteKey(key.key_code, false, key.scan_code, key.extended);
+    if (!InjectRemoteKey(key.key_code, false, key.scan_code, key.extended)) {
+#ifdef _WIN32
+      if (owner_.privacy_.Engaged()) {
+        std::lock_guard lock(remote_states_mutex_);
+        pending_privacy_releases_[key.key_code] = key;
+      }
+#endif
+    }
  }
 }

+void KeyboardController::ReleaseAllRemotePressedKeys(const char* reason) {
+  std::vector<std::string> remotes;
+  {
+    std::lock_guard lock(remote_states_mutex_);
+    for (const auto& [id, state] : remote_states_) remotes.push_back(id);
+  }
+  for (const auto& id : remotes) ReleaseRemotePressedKeys(id, reason);
+  CheckRemoteTimeouts();
+}
+
 void KeyboardController::CheckRemoteTimeouts() {
+#ifdef _WIN32
+  bool pending = false;
+  {
+    std::lock_guard lock(remote_states_mutex_);
+    pending = !pending_privacy_releases_.empty();
+  }
+  // A key-up rejected on the secure desktop is retained until the ordinary
+  // desktop returns. Never route cleanup through the security UI helper.
+  if (pending && IsWindowsPrivacyDesktopAvailable()) {
+    std::unordered_map<int, PressedKey> releases;
+    {
+      std::lock_guard lock(remote_states_mutex_);
+      releases.swap(pending_privacy_releases_);
+    }
+    for (const auto& [code, key] : releases) {
+      if (!owner_.devices_.SendKeyboardCommand(code, false, key.scan_code, key.extended)) {
+        std::lock_guard lock(remote_states_mutex_);
+        pending_privacy_releases_[code] = key;
+      }
+    }
+  }
+#endif
  const uint32_t now = static_cast<uint32_t>(SDL_GetTicks());
  std::vector<std::string> timed_out_remotes;
  {
@@ -30,6 +30,7 @@ public:
                        const RemoteAction &remote_action);
  void ReleaseRemotePressedKeys(const std::string &remote_id,
                                const char *reason);
+  void ReleaseAllRemotePressedKeys(const char* reason);
  void CheckRemoteTimeouts();

 private:
@@ -58,6 +59,9 @@ private:
  uint32_t last_heartbeat_tick_ = 0;
  std::unordered_map<std::string, RemoteState> remote_states_;
  std::mutex remote_states_mutex_;
+#ifdef _WIN32
+  std::unordered_map<int, PressedKey> pending_privacy_releases_;
+#endif
 };

 } // namespace crossdesk
@@ -308,7 +308,6 @@ int SettingsManager::Load() {
  owner_.enable_hardware_video_codec_ =
      owner_.config_center_->IsHardwareVideoCodec();
  owner_.enable_turn_ = owner_.config_center_->IsEnableTurn();
-  owner_.enable_srtp_ = owner_.config_center_->IsEnableSrtp();
  owner_.enable_self_hosted_ = owner_.config_center_->IsSelfHosted();
  owner_.enable_autostart_ = owner_.config_center_->IsEnableAutostart();
  owner_.enable_daemon_ = owner_.config_center_->IsEnableDaemon();
@@ -335,7 +334,6 @@ int SettingsManager::Load() {
  owner_.enable_hardware_video_codec_last_ =
      owner_.enable_hardware_video_codec_;
  owner_.enable_turn_last_ = owner_.enable_turn_;
-  owner_.enable_srtp_last_ = owner_.enable_srtp_;
  owner_.enable_self_hosted_last_ = owner_.enable_self_hosted_;
  owner_.enable_autostart_last_ = owner_.enable_autostart_;

@@ -598,22 +596,6 @@ std::string SettingsManager::RecentConnectionDisplayName(
  return connection.remote_id;
 }

-void SettingsManager::BeginEditRecentConnectionAlias(
-    const Thumbnail::RecentConnection &connection) {
-  owner_.edit_connection_alias_remote_id_ = connection.remote_id;
-  std::memset(owner_.edit_connection_alias_, 0,
-              sizeof(owner_.edit_connection_alias_));
-
-  const auto alias_it = recent_connection_aliases_.find(connection.remote_id);
-  const std::string alias = alias_it != recent_connection_aliases_.end()
-                                ? alias_it->second
-                                : RecentConnectionDisplayName(connection);
-  CopyString(owner_.edit_connection_alias_, alias.c_str());
-
-  owner_.focus_on_input_widget_ = true;
-  owner_.show_edit_connection_alias_window_ = true;
-}
-
 void SettingsManager::SetRecentConnectionAlias(const std::string &remote_id,
                                               const std::string &alias) {
  if (!remote_id.empty()) {
@@ -25,8 +25,6 @@ public:
  int SaveRecentConnectionAliases() const;
  std::string RecentConnectionDisplayName(
      const Thumbnail::RecentConnection &connection) const;
-  void
-  BeginEditRecentConnectionAlias(const Thumbnail::RecentConnection &connection);
  void SetRecentConnectionAlias(const std::string &remote_id,
                                const std::string &alias);
  void EraseRecentConnectionAlias(const std::string &remote_id);
@@ -13,7 +13,7 @@ namespace crossdesk {

 class GuiApplication;

-// Stable application-facing facade. The SDL application and feature
+// Stable application-facing facade. The Slint application and feature
 // controllers remain private implementation details.
 class Render {
 public:
@@ -31,4 +31,4 @@ private:

 } // namespace crossdesk

-#endif
+#endif
@@ -154,10 +154,8 @@ struct SlintVideoPresenter::Impl {
            const auto window_size = (*stream)->window().size();
            const float scale_factor =
                std::max(1.0f, (*stream)->window().scale_factor());
-            const int top_inset =
-                !surface.fullscreen && surface.tab_count > 1
-                    ? static_cast<int>(std::lround(30.0f * scale_factor))
-                    : 0;
+            const int top_inset = static_cast<int>(std::lround(
+                (*stream)->get_video_area_top() * scale_factor));
            const bool rounded_window = (*stream)->get_custom_titlebar() &&
                                        !surface.fullscreen &&
                                        !(*stream)->window().is_maximized();
@@ -335,8 +333,7 @@ SlintVideoPresenter::PresentResult SlintVideoPresenter::Present(
      dynamic_cast<MacMetalVideoRenderer*>(&impl_->renderer);
  if (metal_renderer && metal_renderer->IsActive()) {
    const SurfaceState surface = impl_->CurrentState();
-    const double top_inset =
-        !surface.fullscreen && surface.tab_count > 1 ? 30.0 : 0.0;
+    const double top_inset = (*impl_->stream)->get_video_area_top();
    const auto outcome = metal_renderer->RenderLatest(
        frame.remote_id, top_inset, !surface.fullscreen);
    if (outcome.result == VideoRenderer::RenderResult::rendered) {
@@ -28,7 +28,6 @@ public:
  struct SurfaceState {
    std::string selected_stream;
    bool fullscreen = false;
-    size_t tab_count = 0;
  };

  struct Frame {
@@ -78,4 +77,4 @@ private:

 }  // namespace crossdesk

-#endif
+#endif
@@ -0,0 +1,51 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-22
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _VIDEO_GEOMETRY_H_
+#define _VIDEO_GEOMETRY_H_
+
+#include <algorithm>
+#include <cmath>
+#include <optional>
+
+namespace crossdesk {
+
+struct VideoPoint {
+  float x;
+  float y;
+};
+
+// Area dimensions and pointer positions must use the same coordinate space.
+// Slint supplies both in logical pixels; remote input is resolution
+// independent.
+inline std::optional<VideoPoint> MapVideoPoint(float x, float y,
+                                               float area_width,
+                                               float area_height,
+                                               int video_width,
+                                               int video_height) {
+  if (!std::isfinite(x) || !std::isfinite(y) || !std::isfinite(area_width) ||
+      !std::isfinite(area_height) || area_width <= 0 || area_height <= 0 ||
+      video_width <= 0 || video_height <= 0) {
+    return std::nullopt;
+  }
+
+  const double scale =
+      std::min(static_cast<double>(area_width) / video_width,
+               static_cast<double>(area_height) / video_height);
+  const double width = video_width * scale;
+  const double height = video_height * scale;
+  const double left = (area_width - width) * 0.5;
+  const double top = (area_height - height) * 0.5;
+  if (x < left || x > left + width || y < top || y > top + height) {
+    return std::nullopt;
+  }
+  return VideoPoint{static_cast<float>((x - left) / width),
+                    static_cast<float>((y - top) / height)};
+}
+
+}  // namespace crossdesk
+
+#endif
@@ -25,6 +25,16 @@ constexpr auto kPresenceRefreshInterval = std::chrono::seconds(30);
 constexpr auto kPresenceRetryInterval = std::chrono::seconds(1);
 }  // namespace

+bool GuiRuntime::HasActiveSession() {
+  if (stream_window_inited_) return true;
+  std::shared_lock lock(connection_status_mutex_);
+  return std::any_of(connection_status_.begin(), connection_status_.end(),
+                     [](const auto& entry) {
+                       return entry.second == ConnectionStatus::Connecting ||
+                              entry.second == ConnectionStatus::Connected;
+                     });
+}
+
 void GuiRuntime::HandleConnectionStatusChange() {
  if (!signal_connected_ || !peer_) {
    return;
@@ -121,36 +131,41 @@ void GuiRuntime::HandlePresenceProbeTimeout() {
 void GuiRuntime::HandleServerControllerDisconnected(
    const std::string& remote_id, const char* reason) {
  keyboard_.ReleaseRemotePressedKeys(remote_id, reason);
+#ifdef _WIN32
+  devices_.ReleaseRemoteMouseButtons();
+#endif
  {
    std::lock_guard lock(remote_pointer_input_mutex_);
    last_remote_pointer_input_time_.erase(remote_id);
  }

  bool has_connected_controller = false;
-  bool has_web_controller = false;
  std::string remaining_controller_id;
  {
    std::unique_lock lock(connection_status_mutex_);
    connection_status_.erase(remote_id);
+    devices_.OnControllerConnectionsChanged();
    connection_host_names_.erase(remote_id);
+    privacy_sessions_.Disconnected(remote_id);
    for (const auto& [id, status] : connection_status_) {
      if (status != ConnectionStatus::Connected) {
        continue;
      }
      has_connected_controller = true;
-      has_web_controller =
-          has_web_controller || id.find("web") != std::string::npos;
      if (remaining_controller_id.empty()) {
        remaining_controller_id = id;
      }
    }
  }
-  show_cursor_ = has_web_controller;
  if (has_connected_controller) {
    remote_client_id_ = remaining_controller_id;
    return;
  }

+  LOG_INFO("Last remote controller disconnected; recovering privacy, reason={}",
+           reason ? reason : "unknown");
+  privacy_.Disconnected();
+
  need_to_create_server_window_.store(false, std::memory_order_release);
  need_to_destroy_server_window_.store(true, std::memory_order_release);
  is_server_mode_ = false;
@@ -168,14 +183,11 @@ void GuiRuntime::HandleServerControllerDisconnected(
 #else
  start_screen_capturer_ = false;
 #endif
-  start_speaker_capturer_ = false;
+  devices_.StopSpeakerCapturer();
  start_mouse_controller_ = false;
  start_keyboard_capturer_ = false;
  remote_client_id_.clear();
-  if (audio_capture_) {
-    devices_.StopSpeakerCapturer();
-    audio_capture_ = false;
-  }
+  audio_capture_ = false;
  devices_.ResetToInitialDisplay();
 }

@@ -423,6 +435,7 @@ void GuiRuntime::ResetRemoteSessionResources(
    std::lock_guard<std::mutex> lock(props->remote_cursor_state_mutex_);
    props->remote_cursor_state_ = {};
    props->remote_cursor_state_received_ = false;
+    props->cursor_presentation_ = {};
  }
 }

@@ -464,7 +477,42 @@ int GuiRuntime::ConnectTo(const std::string& remote_id, const char* password,
  LOG_INFO("Connect to [{}]", remote_id);
  focused_remote_id_ = remote_id;

-  bool exists = FindRemoteSession(remote_id) != nullptr;
+  auto stale = FindRemoteSession(remote_id);
+  bool exists = stale != nullptr;
+  if (stale) {
+    // A failed CreatePeer or a completed close can leave a session record
+    // without a reusable peer. Recreate it instead of leaving the UI in
+    // Connecting forever while JoinConnection has nothing to call.
+    if (stale->peer_ == nullptr) {
+      std::unique_lock lock(remote_sessions_mutex_);
+      auto it = remote_sessions_.find(remote_id);
+      if (it != remote_sessions_.end() && it->second == stale) {
+        remote_sessions_.erase(it);
+        exists = false;
+        LOG_INFO("[{}] Recreating stale remote session before connect",
+                 remote_id);
+      }
+    }
+    if (exists && !stale->closing_.load() &&
+        !stale->connection_established_) {
+      const auto status = stale->connection_status_.load();
+      if (status == ConnectionStatus::Disconnected ||
+          status == ConnectionStatus::Failed ||
+          status == ConnectionStatus::Closed) {
+        // The recreated session starts with an empty password; callers that
+        // pass none expect the one stored by the previous attempt to be reused.
+        const bool keep_stored_password = !password || !*password;
+        pending_reconnects_[remote_id] = {
+            keep_stored_password ? std::string(stale->remote_password_)
+                                 : std::string(password),
+            remember_password};
+        CloseRemoteSession(stale);
+        LOG_INFO("[{}] Reconnecting after terminal peer status {}", remote_id,
+                 static_cast<int>(status));
+        return 0;
+      }
+    }
+  }

  if (!exists) {
    PeerPtr* peer_to_init = nullptr;
@@ -483,13 +531,6 @@ int GuiRuntime::ConnectTo(const std::string& remote_id, const char* password,
        props->params_.user_data = props->peer_events_.get();
        props->peer_ = CreatePeer(&props->params_);

-        props->control_window_width_ = title_bar_height_ * 10.0f;
-        props->control_window_height_ = title_bar_height_ * 1.3f;
-        props->control_window_min_width_ = title_bar_height_ * 0.65f;
-        props->control_window_min_height_ = title_bar_height_ * 1.3f;
-        props->control_window_max_width_ = title_bar_height_ * 10.0f;
-        props->control_window_max_height_ = title_bar_height_ * 7.0f;
-
        props->connection_status_.store(ConnectionStatus::Connecting);
        show_connection_status_window_ = true;

@@ -505,7 +546,7 @@ int GuiRuntime::ConnectTo(const std::string& remote_id, const char* password,
        }
        AddAudioStream(props->peer_, props->audio_label_.c_str());
        AddDataStream(props->peer_, props->data_label_.c_str(), false);
-        AddDataStream(props->peer_, props->mouse_label_.c_str(), false);
+        AddDataStream(props->peer_, props->mouse_label_.c_str(), true);
        AddDataStream(props->peer_, props->keyboard_label_.c_str(), true);
        AddDataStream(props->peer_, props->control_data_label_.c_str(), true);
        AddDataStream(props->peer_, props->file_label_.c_str(), true);
@@ -0,0 +1,77 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-16
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _CURSOR_PRESENTATION_H_
+#define _CURSOR_PRESENTATION_H_
+
+#include <remote_action.h>
+
+#include <cstdint>
+#include <optional>
+
+namespace crossdesk {
+
+// All times use one monotonic millisecond clock. The owning session's cursor
+// mutex protects this policy from the transport and UI threads.
+class CursorPresentation {
+ public:
+  static constexpr uint64_t kStateTimeoutMs = 1500;  // Three 500ms heartbeats.
+  static constexpr uint64_t kInputActivityMs = 1500;
+
+  void Observe(const CursorState& state, uint64_t now) {
+    if (state.render_mode == CursorRenderMode::unknown) {
+      // Repeated unavailable samples must not extend the recovery deadline.
+      if (!sample_unavailable_) stale_at_ = now + kStateTimeoutMs;
+      sample_unavailable_ = true;
+      return;
+    }
+    sample_unavailable_ = false;
+    stale_at_ = now + kStateTimeoutMs;
+    const bool separate =
+        state.render_mode == CursorRenderMode::separate ||
+        (state.render_mode == CursorRenderMode::legacy && state.visible);
+    // Old senders cannot distinguish embedded from hidden. Only explicit
+    // metadata from a new sender can establish the no-device compatibility
+    // case.
+    no_device_ = state.render_mode == CursorRenderMode::hidden &&
+                 state.hidden_reason == CursorHiddenReason::no_pointing_device;
+    held_shape_ = separate ? state.shape : RemoteCursorShape::none;
+    if (held_shape_ != RemoteCursorShape::none) {
+      last_visible_shape_ = held_shape_;
+    }
+    if (!no_device_) fallback_engaged_ = false;
+  }
+
+  void NoteInput(uint64_t now) { last_input_ = now; }
+
+  RemoteCursorShape Resolve(uint64_t now) {
+    if (!stale_at_) return RemoteCursorShape::default_cursor;
+
+    const bool recent_input =
+        last_input_ && now - *last_input_ < kInputActivityMs;
+    const bool can_recover =
+        now >= *stale_at_ || (!sample_unavailable_ && no_device_);
+    if (can_recover && recent_input) {
+      fallback_engaged_ = true;
+    }
+    // Once needed, retain the locator while idle until a good non-compatibility
+    // sample arrives. Otherwise it would blink off whenever input pauses.
+    return fallback_engaged_ ? last_visible_shape_ : held_shape_;
+  }
+
+ private:
+  bool sample_unavailable_ = false;
+  bool no_device_ = false;
+  bool fallback_engaged_ = false;
+  std::optional<uint64_t> stale_at_;
+  std::optional<uint64_t> last_input_;
+  RemoteCursorShape held_shape_ = RemoteCursorShape::default_cursor;
+  RemoteCursorShape last_visible_shape_ = RemoteCursorShape::default_cursor;
+};
+
+}  // namespace crossdesk
+
+#endif
@@ -6,39 +6,17 @@

 #include <windows.h>

+#include "platform/windows/input/windows_cursor_state.h"
+#include "platform/windows/screen_capturer/captured_cursor_state.h"
+#include "platform/windows/screen_capturer/dxgi_cursor_state.h"
+#include "platform/windows/screen_capturer/secure_desktop_cursor_state.h"
 #include "runtime/cursor_position.h"

 namespace crossdesk {
-namespace {

-bool IsSystemCursor(HCURSOR cursor, LPCWSTR resource) {
-  return cursor != nullptr && cursor == LoadCursorW(nullptr, resource);
-}
-
-RemoteCursorShape ShapeFromWindowsCursor(HCURSOR cursor) {
-  if (IsSystemCursor(cursor, IDC_HELP)) return RemoteCursorShape::help;
-  if (IsSystemCursor(cursor, IDC_HAND)) return RemoteCursorShape::pointer;
-  if (IsSystemCursor(cursor, IDC_APPSTARTING))
-    return RemoteCursorShape::progress;
-  if (IsSystemCursor(cursor, IDC_WAIT)) return RemoteCursorShape::wait;
-  if (IsSystemCursor(cursor, IDC_CROSS)) return RemoteCursorShape::crosshair;
-  if (IsSystemCursor(cursor, IDC_IBEAM)) return RemoteCursorShape::text;
-  if (IsSystemCursor(cursor, IDC_NO))
-    return RemoteCursorShape::not_allowed;
-  if (IsSystemCursor(cursor, IDC_SIZEALL)) return RemoteCursorShape::move;
-  if (IsSystemCursor(cursor, IDC_SIZEWE)) return RemoteCursorShape::ew_resize;
-  if (IsSystemCursor(cursor, IDC_SIZENS)) return RemoteCursorShape::ns_resize;
-  if (IsSystemCursor(cursor, IDC_SIZENESW))
-    return RemoteCursorShape::nesw_resize;
-  if (IsSystemCursor(cursor, IDC_SIZENWSE))
-    return RemoteCursorShape::nwse_resize;
-  if (IsSystemCursor(cursor, IDC_UPARROW)) return RemoteCursorShape::n_resize;
-  return RemoteCursorShape::default_cursor;
-}
-
-}  // namespace
-
-struct CursorStateProvider::Impl {};
+struct CursorStateProvider::Impl {
+  WindowsCursorState cursor;
+};

 CursorStateProvider::CursorStateProvider() : impl_(std::make_unique<Impl>()) {}
 CursorStateProvider::~CursorStateProvider() = default;
@@ -47,16 +25,39 @@ bool CursorStateProvider::Sample(const std::vector<DisplayInfo>& displays,
                                 int preferred_display, CursorState* state) {
  if (!state) return false;

+  SecureDesktopCursorSnapshot secure_cursor{};
+  if (SharedSecureDesktopCursorState().Get(&secure_cursor)) {
+    if (!secure_cursor.valid) {
+      state->hidden_reason = CursorHiddenReason::secure_desktop_pending;
+      return false;
+    }
+    state->seq = 0;
+    NormalizeCursorPosition(secure_cursor.x, secure_cursor.y, displays,
+                            preferred_display, state);
+    state->visible = secure_cursor.visible != 0;
+    state->render_mode = static_cast<CursorRenderMode>(secure_cursor.render_mode);
+    state->hidden_reason =
+        static_cast<CursorHiddenReason>(secure_cursor.hidden_reason);
+    state->shape = state->visible
+                       ? static_cast<RemoteCursorShape>(secure_cursor.shape)
+                       : RemoteCursorShape::none;
+    return true;
+  }
+
  CURSORINFO info{};
  info.cbSize = sizeof(info);
  if (!GetCursorInfo(&info)) return false;

  state->seq = 0;
-  state->visible = (info.flags & CURSOR_SHOWING) != 0;
-  state->shape = state->visible ? ShapeFromWindowsCursor(info.hCursor)
-                                : RemoteCursorShape::none;
  NormalizeCursorPosition(info.ptScreenPos.x, info.ptScreenPos.y, displays,
                          preferred_display, state);
+  void* cursor_monitor = state->position_valid
+                             ? displays[state->display_id].handle
+                             : nullptr;
+  const bool embedded = SharedCapturedCursorState().IsEmbedded(cursor_monitor) ||
+      ((info.flags & CURSOR_SHOWING) != 0 &&
+       !SharedDxgiCursorState().ShouldDrawCursor(true, cursor_monitor));
+  impl_->cursor.Sample(info, embedded, state);
  return true;
 }

@@ -34,12 +34,10 @@ int GuiRuntime::CreateConnectionPeer() {

  std::string signal_server_ip;
  int signal_server_port;
-  int coturn_server_port;

  if (config_center_->IsSelfHosted()) {
    signal_server_ip = config_center_->GetSignalServerHost();
    signal_server_port = config_center_->GetSignalServerPort();
-    coturn_server_port = config_center_->GetCoturnServerPort();

    std::string current_self_hosted_ip = config_center_->GetSignalServerHost();
    const bool use_cached_id = settings_.LoadCachedSelfHostedIdentity();
@@ -64,7 +62,6 @@ int GuiRuntime::CreateConnectionPeer() {
  } else {
    signal_server_ip = config_center_->GetDefaultServerHost();
    signal_server_port = config_center_->GetDefaultSignalServerPort();
-    coturn_server_port = config_center_->GetDefaultCoturnServerPort();
    settings_.ActivateCachedPublicIdentity();
    params_.user_id = client_id_with_password_;
  }
@@ -115,34 +112,11 @@ int GuiRuntime::CreateConnectionPeer() {
  } else {
    signal_server_port_self_[0] = '\0';
  }
-  int coturn_port = config_center_->GetCoturnServerPort();
-  if (coturn_port > 0) {
-    strncpy(coturn_server_port_self_, std::to_string(coturn_port).c_str(),
-            sizeof(coturn_server_port_self_) - 1);
-    coturn_server_port_self_[sizeof(coturn_server_port_self_) - 1] = '\0';
-  } else {
-    coturn_server_port_self_[0] = '\0';
-  }
-
  // peer config
  strncpy((char *)params_.signal_server_ip, signal_server_ip.c_str(),
          sizeof(params_.signal_server_ip) - 1);
  params_.signal_server_ip[sizeof(params_.signal_server_ip) - 1] = '\0';
  params_.signal_server_port = signal_server_port;
-  strncpy((char *)params_.stun_server_ip, signal_server_ip.c_str(),
-          sizeof(params_.stun_server_ip) - 1);
-  params_.stun_server_ip[sizeof(params_.stun_server_ip) - 1] = '\0';
-  params_.stun_server_port = coturn_server_port;
-  strncpy((char *)params_.turn_server_ip, signal_server_ip.c_str(),
-          sizeof(params_.turn_server_ip) - 1);
-  params_.turn_server_ip[sizeof(params_.turn_server_ip) - 1] = '\0';
-  params_.turn_server_port = coturn_server_port;
-  // TURN credentials are issued by the signaling server after login. Keep the
-  // initial values empty so a reusable static password is never embedded in
-  // the client binary.
-  params_.turn_server_username[0] = '\0';
-  params_.turn_server_password[0] = '\0';
-
  strncpy(params_.log_path, dll_log_path_.c_str(),
          sizeof(params_.log_path) - 1);
  params_.log_path[sizeof(params_.log_path) - 1] = '\0';
@@ -225,7 +199,7 @@ int GuiRuntime::CreateConnectionPeer() {

    AddAudioStream(peer_, audio_label_.c_str());
    AddDataStream(peer_, data_label_.c_str(), false);
-    AddDataStream(peer_, mouse_label_.c_str(), false);
+    AddDataStream(peer_, mouse_label_.c_str(), true);
    AddDataStream(peer_, keyboard_label_.c_str(), true);
    AddDataStream(peer_, control_data_label_.c_str(), true);
    AddDataStream(peer_, file_label_.c_str(), true);
@@ -237,19 +211,6 @@ int GuiRuntime::CreateConnectionPeer() {
  }
 }

-void GuiRuntime::UpdateLabels() {
-  if (!label_inited_ ||
-      localization_language_index_last_ != localization_language_index_) {
-    connect_button_label_ =
-        connect_button_pressed_
-            ? localization::disconnect[localization_language_index_]
-            : localization::connect[localization_language_index_];
-    label_inited_ = true;
-    localization_language_index_last_ = localization_language_index_;
-  }
-}
-
-
 void GuiRuntime::HandleRecentConnections() {
  if (session_cleanup_tasks_.empty() && reload_recent_connections_ && thumbnail_) {
    uint32_t now_time = SDL_GetTicks();
@@ -8,6 +8,7 @@
 #define _GUI_RUNTIME_H_

 #include <atomic>
+#include <deque>
 #include <memory>
 #include <string>

@@ -16,15 +17,17 @@
 #include "features/file_transfer/file_transfer_manager.h"
 #include "features/input/keyboard_controller.h"
 #include "features/settings/settings_manager.h"
+#include "privacy_controller.h"
 #include "runtime/gui_state.h"
 #include "runtime/peer_event_handler.h"
+#include "runtime/privacy_session_policy.h"

 namespace crossdesk {

 class VideoRenderer;

 // Shared GUI runtime. It owns subsystem controllers and cross-cutting session
-// state, but no window lifecycle, ImGui view, or transport callback methods.
+// state, but no window lifecycle, UI view, or transport callback methods.
 class GuiRuntime : protected gui_detail::GuiState {
 protected:
  using FileTransferState = gui_detail::FileTransferState;
@@ -50,14 +53,21 @@ class GuiRuntime : protected gui_detail::GuiState {
  int RequestSingleDevicePresence(const std::string& remote_id,
                                  const char* password, bool remember_password);

-  void UpdateLabels();
  void HandleRecentConnections();
  void HandleConnectionStatusChange();
  void HandlePendingPresenceProbe();
  void HandlePresenceProbeTimeout();
+  bool HasActiveSession();
  void HandleServerControllerDisconnected(const std::string& remote_id,
                                          const char* reason);
  void HandleWindowsServiceIntegration();
+  void HandlePrivacy();
+  bool IsAuthorizedController(const std::string& remote_id);
+  void SetControllerPrivacySupport(const std::string& remote_id, bool supported);
+  // Caller holds connection_status_mutex_ exclusively. Turns privacy off when
+  // any connected controller lacks support, or on for the first automatic one.
+  void ApplyPrivacyAdmission(bool automatic_enable);
+  void QueuePrivacyCommand(const std::string& remote_id, const PrivacyCommand& command);

  void CloseRemoteSession(std::shared_ptr<RemoteSession> props);
  void CloseAllRemoteSessions();
@@ -87,6 +97,12 @@ class GuiRuntime : protected gui_detail::GuiState {
  bool EnsureMacAccessibilityPermission();
 #endif

+  PrivacyController privacy_;
+  PrivacySessionPolicy privacy_sessions_;
+  std::mutex privacy_commands_mutex_;
+  std::deque<std::pair<std::string, PrivacyCommand>> privacy_commands_;
+  uint32_t last_privacy_revision_ = 0;
+  uint64_t last_privacy_status_tick_ = 0;
  ClipboardController clipboard_;
  SessionDeviceManager devices_;
  FileTransferManager transfers_;
@@ -20,7 +20,6 @@
 #include "platform.h"
 #include "rd_log.h"
 #include "runtime/gui_runtime.h"
-#include "runtime/remote_action_codec.h"

 #if _WIN32
 #include "interactive_state.h"
@@ -147,6 +146,46 @@ void PeerEventHandler::OnReceiveDataBuffer(
  }

  std::string remote_id(user_id, user_id_size);
+  if (remote_action.type == ControlType::privacy_status) {
+    if (auto props = runtime->FindRemoteSession(remote_id)) {
+      if (source_id != props->control_data_label_) return;
+      std::lock_guard lock(props->privacy_status_mutex_);
+      if (!props->privacy_status_received_ ||
+          static_cast<int32_t>(remote_action.ps.revision - props->privacy_status_.revision) >= 0) {
+        props->privacy_status_ = remote_action.ps;
+        props->privacy_status_received_ = true;
+        props->privacy_status_tick_ = SDL_GetTicks();
+        if (static_cast<int32_t>(remote_action.ps.revision - props->privacy_request_revision_) > 0 &&
+            remote_action.ps.state != PrivacyState::starting &&
+            remote_action.ps.state != PrivacyState::stopping)
+          props->privacy_command_pending_ = false;
+      }
+    }
+    return;
+  }
+  if (remote_action.type == ControlType::privacy_command) {
+    if (source_id == runtime->control_data_label_)
+      runtime->QueuePrivacyCommand(remote_id, remote_action.pc);
+    return;
+  }
+  const bool operates_host = remote_action.type == ControlType::mouse ||
+      remote_action.type == ControlType::keyboard || remote_action.type == ControlType::keyboard_state ||
+      remote_action.type == ControlType::service_command || remote_action.type == ControlType::display_id ||
+      remote_action.type == ControlType::audio_capture;
+  if (operates_host) {
+    if (!runtime->IsAuthorizedController(remote_id)) return;
+#ifdef _WIN32
+    // KeyboardController checks the desktop immediately before each native
+    // key injection, including state reconciliation and cleanup. Avoid a
+    // second synchronous session query for every received keyboard packet.
+    const bool keyboard_input = remote_action.type == ControlType::keyboard ||
+                                remote_action.type == ControlType::keyboard_state;
+    if (!keyboard_input && runtime->privacy_.Engaged() &&
+        !IsWindowsPrivacyDesktopAvailable()) {
+      runtime->privacy_.Fail("Secure desktop or lock screen; privacy screen will turn off");
+    }
+#endif
+  }
  if (remote_action.type == ControlType::service_status) {
    if (auto props = runtime->FindRemoteSession(remote_id)) {
      runtime->ApplyRemoteServiceStatus(*props, remote_action.ss);
@@ -155,6 +194,9 @@ void PeerEventHandler::OnReceiveDataBuffer(
  }

  if (remote_action.type == ControlType::service_command) {
+    if (runtime->privacy_.Engaged()) {
+      runtime->privacy_.Fail("Security shortcut requested; privacy screen will turn off");
+    }
 #if _WIN32
    if (remote_action.c.flag == ServiceCommandFlag::send_sas) {
      runtime->pending_windows_service_sas_.store(true,
@@ -191,7 +233,11 @@ void PeerEventHandler::OnReceiveDataBuffer(
      const bool changed =
          !props->remote_cursor_state_received_ ||
          props->remote_cursor_state_.visible != remote_action.cs.visible ||
-          props->remote_cursor_state_.shape != remote_action.cs.shape;
+          props->remote_cursor_state_.shape != remote_action.cs.shape ||
+          props->remote_cursor_state_.render_mode !=
+              remote_action.cs.render_mode ||
+          props->remote_cursor_state_.hidden_reason !=
+              remote_action.cs.hidden_reason;
      CursorState merged = remote_action.cs;
      if (!remote_action.cs.position_update &&
          props->remote_cursor_state_received_) {
@@ -202,10 +248,14 @@ void PeerEventHandler::OnReceiveDataBuffer(
      }
      props->remote_cursor_state_ = merged;
      props->remote_cursor_state_received_ = true;
+      props->cursor_presentation_.Observe(merged, SDL_GetTicks());
      if (changed) {
-        LOG_INFO("Received cursor state: seq={}, visible={}, shape={}",
+        LOG_INFO("Received cursor state: seq={}, visible={}, shape={}, "
+                 "mode={}, reason={}",
                 remote_action.cs.seq, remote_action.cs.visible,
-                 static_cast<int>(remote_action.cs.shape));
+                 static_cast<int>(remote_action.cs.shape),
+                 static_cast<int>(remote_action.cs.render_mode),
+                 static_cast<int>(remote_action.cs.hidden_reason));
      }
    }
    return;
@@ -237,7 +287,7 @@ void PeerEventHandler::OnReceiveDataBuffer(
                          remote_action.i.right[i], remote_action.i.bottom[i]));
        }
      }
-      remote_action_codec::Free(remote_action);
+      FreeRemoteAction(remote_action);
    } else {
      // server mode
      std::string host_name(remote_action.i.host_name,
@@ -247,7 +297,11 @@ void PeerEventHandler::OnReceiveDataBuffer(
        runtime->connection_host_names_[remote_id] = host_name;
      }
      LOG_INFO("Remote hostname: [{}]", host_name);
-      remote_action_codec::Free(remote_action);
+      if (source_id == runtime->control_data_label_) {
+        runtime->SetControllerPrivacySupport(
+            remote_id, remote_action.i.supports_privacy_screen);
+      }
+      FreeRemoteAction(remote_action);
    }
  } else {
    // remote
@@ -298,9 +352,9 @@ void PeerEventHandler::OnReceiveDataBuffer(
      runtime->devices_.SendMouseCommand(remote_action,
                                        runtime->selected_display_);
    } else if (remote_action.type == ControlType::audio_capture) {
-      if (remote_action.a && !runtime->start_speaker_capturer_)
+      if (remote_action.a)
        runtime->devices_.StartSpeakerCapturer();
-      else if (!remote_action.a && runtime->start_speaker_capturer_)
+      else
        runtime->devices_.StopSpeakerCapturer();
    } else if (remote_action.type == ControlType::keyboard) {
      runtime->keyboard_.ApplyRemoteEvent(remote_id, remote_action);
@@ -21,7 +21,6 @@
 #include "platform/video_renderer.h"
 #include "rd_log.h"
 #include "runtime/gui_runtime.h"
-#include "runtime/remote_action_codec.h"

 #if _WIN32
 #include "interactive_state.h"
@@ -262,53 +261,25 @@ void PeerEventHandler::OnConnectionStatus(ConnectionStatus status,
          std::lock_guard lock(props->remote_cursor_state_mutex_);
          props->remote_cursor_state_ = {};
          props->remote_cursor_state_received_ = false;
+          props->cursor_presentation_ = {};
        }
        {
-          RemoteAction remote_action;
-          remote_action.i.display_num =
-              runtime->devices_.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++) {
+          RemoteAction remote_action = MakeHostInformation(
+              GetHostName(), runtime->devices_.host_display_list(),
+              /*supports_privacy_screen=*/true);
+          for (std::size_t i = 0; i < remote_action.i.display_num; i++) {
            LOG_INFO("Local display [{}:{}]", i + 1,
-                     runtime->devices_.display_info_list()[i].name);
-            remote_action.i.display_list[i] = (char*)malloc(
-                runtime->devices_.display_info_list()[i].name.length() + 1);
-            strncpy(remote_action.i.display_list[i],
-                    runtime->devices_.display_info_list()[i].name.c_str(),
-                    runtime->devices_.display_info_list()[i].name.length());
-            remote_action.i
-                .display_list[i][runtime->devices_.display_info_list()[i]
-                                     .name.length()] = '\0';
-            remote_action.i.left[i] =
-                runtime->devices_.display_info_list()[i].left;
-            remote_action.i.top[i] =
-                runtime->devices_.display_info_list()[i].top;
-            remote_action.i.right[i] =
-                runtime->devices_.display_info_list()[i].right;
-            remote_action.i.bottom[i] =
-                runtime->devices_.display_info_list()[i].bottom;
+                     remote_action.i.display_list[i]);
          }
-
-          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(),
-                                          runtime->control_data_label_.c_str());
-          remote_action_codec::Free(remote_action);
+          const int ret =
+              SendReliableDataFrame(props->peer_, msg.data(), msg.size(),
+                                    runtime->control_data_label_.c_str());
+          if (ret != 0) {
+            LOG_WARN("[{}] host information send failed, ret={}", remote_id,
+                     ret);
+          }
+          FreeRemoteAction(remote_action);
        }

        if (!runtime->need_to_create_stream_window_) {
@@ -330,6 +301,7 @@ void PeerEventHandler::OnConnectionStatus(ConnectionStatus status,
          std::lock_guard lock(props->remote_cursor_state_mutex_);
          props->remote_cursor_state_ = {};
          props->remote_cursor_state_received_ = false;
+          props->cursor_presentation_ = {};
        }

        std::shared_ptr<std::vector<unsigned char>> native_snapshot;
@@ -380,21 +352,6 @@ void PeerEventHandler::OnConnectionStatus(ConnectionStatus status,
      case ConnectionStatus::IncorrectPassword: {
        runtime->password_validating_ = false;
        runtime->password_validating_time_++;
-        if (runtime->connect_button_pressed_) {
-          runtime->connect_button_pressed_ = false;
-          props->connection_established_ = false;
-          runtime->connect_button_label_ =
-              localization::connect[runtime->localization_language_index_];
-        }
-        break;
-      }
-      case ConnectionStatus::NoSuchTransmissionId:
-      case ConnectionStatus::RemoteUnavailable: {
-        if (runtime->connect_button_pressed_) {
-          props->connection_established_ = false;
-          runtime->connect_button_label_ =
-              localization::connect[runtime->localization_language_index_];
-        }
        break;
      }
      default:
@@ -405,7 +362,15 @@ void PeerEventHandler::OnConnectionStatus(ConnectionStatus status,
    runtime->show_connection_status_window_ = true;
    {
      std::unique_lock lock(runtime->connection_status_mutex_);
+      if (status == ConnectionStatus::Connected) {
+        // Local privacy requires explicit desktop capability. Host info may
+        // arrive before Connected; consume that saved capability here.
+        const bool automatic_enable = runtime->privacy_sessions_.Connected(
+            remote_id, runtime->config_center_->IsEnablePrivacyScreen());
+        runtime->ApplyPrivacyAdmission(automatic_enable);
+      }
      runtime->connection_status_[remote_id] = status;
+      runtime->devices_.OnControllerConnectionsChanged();
    }

    switch (status) {
@@ -414,52 +379,22 @@ void PeerEventHandler::OnConnectionStatus(ConnectionStatus status,
        runtime->last_windows_service_status_tick_ = 0;
 #endif
        {
-          RemoteAction remote_action;
-          remote_action.i.display_num =
-              runtime->devices_.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++) {
+          RemoteAction remote_action = MakeHostInformation(
+              GetHostName(), runtime->devices_.host_display_list(),
+              /*supports_privacy_screen=*/true);
+          for (std::size_t i = 0; i < remote_action.i.display_num; i++) {
            LOG_INFO("Local display [{}:{}]", i + 1,
-                     runtime->devices_.display_info_list()[i].name);
-            remote_action.i.display_list[i] = (char*)malloc(
-                runtime->devices_.display_info_list()[i].name.length() + 1);
-            strncpy(remote_action.i.display_list[i],
-                    runtime->devices_.display_info_list()[i].name.c_str(),
-                    runtime->devices_.display_info_list()[i].name.length());
-            remote_action.i
-                .display_list[i][runtime->devices_.display_info_list()[i]
-                                     .name.length()] = '\0';
-            remote_action.i.left[i] =
-                runtime->devices_.display_info_list()[i].left;
-            remote_action.i.top[i] =
-                runtime->devices_.display_info_list()[i].top;
-            remote_action.i.right[i] =
-                runtime->devices_.display_info_list()[i].right;
-            remote_action.i.bottom[i] =
-                runtime->devices_.display_info_list()[i].bottom;
+                     remote_action.i.display_list[i]);
          }
-
-          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 =
+          const int ret =
              SendReliableDataFrame(runtime->peer_, msg.data(), msg.size(),
                                    runtime->control_data_label_.c_str());
-          remote_action_codec::Free(remote_action);
+          if (ret != 0) {
+            LOG_WARN("[{}] host information send failed, ret={}", remote_id,
+                     ret);
+          }
+          FreeRemoteAction(remote_action);
        }

        runtime->need_to_destroy_server_window_.store(
@@ -468,19 +403,9 @@ void PeerEventHandler::OnConnectionStatus(ConnectionStatus status,
                                                     std::memory_order_release);
        runtime->is_server_mode_ = true;
        runtime->start_screen_capturer_ = true;
-        runtime->start_speaker_capturer_ = true;
+        runtime->devices_.StartSpeakerCapturer();
        runtime->remote_client_id_ = remote_id;
        runtime->start_mouse_controller_ = true;
-        {
-          std::shared_lock lock(runtime->connection_status_mutex_);
-          if (std::all_of(runtime->connection_status_.begin(),
-                          runtime->connection_status_.end(),
-                          [](const auto& kv) {
-                            return kv.first.find("web") != std::string::npos;
-                          })) {
-            runtime->show_cursor_ = true;
-          }
-        }

        break;
      }
@@ -50,9 +50,28 @@ void PeerEventHandler::OnReceiveVideoBuffer(
    if (native_renderer && native_renderer->IsActive()) {
      VideoRenderer::SubmitResult submit_result =
          VideoRenderer::SubmitResult::failed;
-      if (GetNativeVideoFrame(video_frame)) {
-        submit_result = native_renderer->SubmitNativeFrame(
-            remote_id, *video_frame->native_frame);
+      if (const auto* native = GetNativeVideoFrame(video_frame)) {
+        submit_result = native_renderer->SubmitNativeFrame(remote_id, *native);
+        // A CPU NV12 native frame is valid MiniRTC input, but the macOS Metal
+        // fast path only accepts CVPixelBuffer. Materialize it when that path
+        // rejects a software decoder's descriptor. This also supports peers
+        // using CPU decoding when their platform hardware decoder is unavailable.
+        if (submit_result == VideoRenderer::SubmitResult::failed &&
+            native->type == MiniRtcNativeVideoFrameCpuNv12) {
+          const size_t frame_size =
+              static_cast<size_t>(native->width) * native->height * 3U / 2U;
+          // One decode callback thread per session; keep the buffer across
+          // frames instead of a full-frame allocation per rejected frame.
+          auto& fallback = props->native_cpu_fallback_;
+          if (fallback.size() != frame_size) fallback.resize(frame_size);
+          if (native->copy_to_nv12(native->owner, fallback.data(),
+                                   fallback.size()) == 0) {
+            submit_result = native_renderer->SubmitNv12(
+                remote_id, fallback.data(), fallback.size(),
+                static_cast<int>(native->width),
+                static_cast<int>(native->height));
+          }
+        }
      } else
      {
        submit_result = native_renderer->SubmitNv12(
@@ -0,0 +1,53 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-12
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _PRIVACY_CONTROL_STATE_H_
+#define _PRIVACY_CONTROL_STATE_H_
+
+#include <cstdint>
+
+#include "remote_action.h"
+
+namespace crossdesk {
+
+struct PrivacyControlState {
+  bool active = false;
+  bool enabled = false;
+  bool off = false;
+  bool unsupported = false;
+  bool can_toggle = false;
+};
+
+// Use the same host-confirmed state for presentation and command admission.
+// Missing confirmation or a failure makes only this toolbar control unavailable.
+inline PrivacyControlState GetPrivacyControlState(
+    const PrivacyStatus& status, bool received, bool command_pending,
+    uint64_t status_age_ms, uint64_t command_age_ms) {
+  PrivacyControlState result;
+  const bool timeout = command_pending && command_age_ms > 15000;
+  result.unsupported = timeout ||
+      (received && (status_age_ms > 5000 || !status.supported ||
+                    status.state == PrivacyState::failed));
+  if (result.unsupported) return result;
+
+  result.active = status.overlay_active || status.remote_paused ||
+                  status.state == PrivacyState::on ||
+                  status.state == PrivacyState::starting ||
+                  status.state == PrivacyState::stopping ||
+                  status.state == PrivacyState::failed;
+  // A command in flight only gates repeated clicks; it adds no display state.
+  result.enabled = received &&
+                   status.state == PrivacyState::on && status.overlay_active &&
+                   !status.remote_paused;
+  result.off = received &&
+               status.state == PrivacyState::off && !result.active;
+  result.can_toggle = !command_pending && (result.active || received);
+  return result;
+}
+
+}  // namespace crossdesk
+
+#endif
@@ -0,0 +1,131 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-11
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#include <cstring>
+#include <shared_mutex>
+
+#include "rd_log.h"
+#include "runtime/gui_runtime.h"
+
+namespace crossdesk {
+
+bool GuiRuntime::IsAuthorizedController(const std::string& remote_id) {
+  // Connections appear here only after the existing password/signalling/RTC
+  // admission path. Outgoing/viewer sessions live in remote_sessions_ instead.
+  std::shared_lock lock(connection_status_mutex_);
+  const auto found = connection_status_.find(remote_id);
+  return found != connection_status_.end() &&
+         found->second == ConnectionStatus::Connected;
+}
+
+void GuiRuntime::SetControllerPrivacySupport(const std::string& remote_id,
+                                           bool supported) {
+  std::unique_lock lock(connection_status_mutex_);
+  const auto found = connection_status_.find(remote_id);
+  if (found == connection_status_.end()) return;
+  if (found->second != ConnectionStatus::Connected) {
+    if (found->second == ConnectionStatus::Connecting ||
+        found->second == ConnectionStatus::Gathering) {
+      privacy_sessions_.RememberSupport(remote_id, supported);
+      LOG_INFO("Privacy: retained early controller capability, peer={}, supported={}",
+               remote_id, supported);
+    }
+    return;
+  }
+
+  const bool automatic_enable =
+      privacy_sessions_.SetSupported(remote_id, supported);
+  ApplyPrivacyAdmission(automatic_enable &&
+                        config_center_->IsEnablePrivacyScreen());
+}
+
+void GuiRuntime::ApplyPrivacyAdmission(bool automatic_enable) {
+  if (!privacy_sessions_.CanEnable()) {
+    if (privacy_.Engaged()) privacy_.Disable();
+  } else if (automatic_enable) {
+    privacy_.EnableOnConnection();
+  }
+}
+
+void GuiRuntime::QueuePrivacyCommand(const std::string& remote_id,
+                                     const PrivacyCommand& command) {
+  std::shared_lock session_lock(connection_status_mutex_);
+  const auto found = connection_status_.find(remote_id);
+  if (found == connection_status_.end() ||
+      found->second != ConnectionStatus::Connected ||
+      !privacy_sessions_.Supports(remote_id)) return;
+  std::lock_guard lock(privacy_commands_mutex_);
+  if (privacy_commands_.size() >= 32) return;
+  LOG_INFO("Privacy: queued controller command, peer={}, flag={}", remote_id,
+           static_cast<int>(command.flag));
+  privacy_commands_.emplace_back(remote_id, command);
+}
+
+void GuiRuntime::HandlePrivacy() {
+  std::deque<std::pair<std::string, PrivacyCommand>> commands;
+  {
+    std::lock_guard lock(privacy_commands_mutex_);
+    commands.swap(privacy_commands_);
+  }
+  for (const auto& [remote_id, command] : commands) {
+    // Keep admission and activation under the connection lock so an unknown
+    // controller cannot join between the capability check and enabling.
+    std::shared_lock lock(connection_status_mutex_);
+    const auto found = connection_status_.find(remote_id);
+    if (found == connection_status_.end() ||
+        found->second != ConnectionStatus::Connected ||
+        !privacy_sessions_.Supports(remote_id)) continue;
+    if (command.flag == PrivacyCommandFlag::enable) {
+      if (privacy_sessions_.CanEnable())
+        privacy_.Enable(command.block_local_input);
+    } else if (command.flag == PrivacyCommandFlag::disable) {
+      privacy_.Disable();
+    }
+    last_privacy_status_tick_ = 0;
+  }
+  PrivacyStatus status{};
+  const uint64_t now = SDL_GetTicks();
+  std::vector<std::string> controllers;
+  {
+    std::shared_lock lock(connection_status_mutex_);
+    status = privacy_.Snapshot();
+    for (const auto& [id, state] : connection_status_)
+      if (state == ConnectionStatus::Connected &&
+          privacy_sessions_.Supports(id))
+        controllers.push_back(id);
+    if (!privacy_sessions_.CanEnable()) {
+      status.state = PrivacyState::unsupported;
+      status.supported = false;
+      status.input_block_supported = false;
+      std::strcpy(status.reason,
+                  "A connected controller does not support privacy screen");
+    }
+  }
+  if (!peer_ || (last_privacy_status_tick_ != 0 &&
+                 status.revision == last_privacy_revision_ &&
+                 now - last_privacy_status_tick_ < 1000))
+    return;
+  RemoteAction action{};
+  action.type = ControlType::privacy_status;
+  action.ps = status;
+  const auto message = action.to_json();
+  bool sent = true;
+  for (const auto& id : controllers) {
+    const int result = SendReliableDataFrameToPeer(
+        peer_, message.data(), message.size(), control_data_label_.c_str(),
+        id.data(), id.size());
+    if (result != 0) {
+      sent = false;
+      LOG_WARN("Privacy status send failed, peer={}, ret={}", id, result);
+    }
+  }
+  if (sent) {
+    last_privacy_revision_ = status.revision;
+    last_privacy_status_tick_ = now;
+  }
+}
+
+}  // namespace crossdesk
@@ -0,0 +1,80 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-15
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _PRIVACY_SESSION_POLICY_H_
+#define _PRIVACY_SESSION_POLICY_H_
+
+#include <algorithm>
+#include <string>
+#include <unordered_map>
+
+namespace crossdesk {
+
+// Guarded by GuiRuntime's connection_status_mutex_. Privacy covers the local
+// displays, so every connected controller must explicitly support its controls.
+class PrivacySessionPolicy {
+ public:
+  // Web controllers render through the browser and expose no privacy UI.
+  static bool IsWebController(const std::string& remote_id) {
+    return remote_id.find("web") != std::string::npos;
+  }
+
+  bool Connected(const std::string& remote_id, bool automatic_privacy) {
+    const auto [entry, inserted] = controllers_.try_emplace(remote_id, false);
+    if (inserted && controllers_.size() == 1 && automatic_privacy &&
+        !IsWebController(remote_id)) {
+      automatic_controller_ = remote_id;
+    }
+    const auto early = early_support_.find(remote_id);
+    if (early == early_support_.end()) return false;
+    const bool supported = early->second;
+    early_support_.erase(early);
+    return SetSupported(remote_id, supported);
+  }
+
+  // Only transport-authenticated metadata from a connecting session is cached
+  // by the caller. It grants no control until Connected admits that session.
+  void RememberSupport(const std::string& remote_id, bool supported) {
+    early_support_[remote_id] = supported;
+  }
+
+  void Disconnected(const std::string& remote_id) {
+    controllers_.erase(remote_id);
+    early_support_.erase(remote_id);
+    if (automatic_controller_ == remote_id) automatic_controller_.clear();
+  }
+
+  // Consume automatic activation once, on the first controller's host info.
+  // Repeated metadata or a later join must not undo an explicit privacy exit.
+  bool SetSupported(const std::string& remote_id, bool supported) {
+    const auto entry = controllers_.find(remote_id);
+    if (entry == controllers_.end()) return false;
+    entry->second = supported && !IsWebController(remote_id);
+    if (automatic_controller_ != remote_id) return false;
+    automatic_controller_.clear();
+    return CanEnable();
+  }
+
+  bool Supports(const std::string& remote_id) const {
+    const auto entry = controllers_.find(remote_id);
+    return entry != controllers_.end() && entry->second;
+  }
+
+  bool CanEnable() const {
+    return !controllers_.empty() &&
+           std::all_of(controllers_.begin(), controllers_.end(),
+                       [](const auto& entry) { return entry.second; });
+  }
+
+ private:
+  std::unordered_map<std::string, bool> controllers_;
+  std::unordered_map<std::string, bool> early_support_;
+  std::string automatic_controller_;
+};
+
+}  // namespace crossdesk
+
+#endif
@@ -1,119 +0,0 @@
-#include "runtime/remote_action_codec.h"
-
-#include <remote_action.h>
-
-#include <cstdlib>
-#include <cstring>
-
-namespace crossdesk::remote_action_codec {
-
-std::vector<char> Serialize(const RemoteAction &action) {
-  std::vector<char> buffer;
-  buffer.push_back(static_cast<char>(action.type));
-
-  auto insert_bytes = [&](const void *ptr, size_t len) {
-    buffer.insert(buffer.end(), static_cast<const char *>(ptr),
-                  static_cast<const char *>(ptr) + len);
-  };
-
-  if (action.type == ControlType::host_infomation) {
-    insert_bytes(&action.i.host_name_size, sizeof(size_t));
-    insert_bytes(action.i.host_name, action.i.host_name_size);
-
-    size_t num = action.i.display_num;
-    insert_bytes(&num, sizeof(size_t));
-
-    for (size_t i = 0; i < num; ++i) {
-      const size_t len = std::strlen(action.i.display_list[i]);
-      insert_bytes(&len, sizeof(size_t));
-      insert_bytes(action.i.display_list[i], len);
-    }
-
-    insert_bytes(action.i.left, sizeof(int) * num);
-    insert_bytes(action.i.top, sizeof(int) * num);
-    insert_bytes(action.i.right, sizeof(int) * num);
-    insert_bytes(action.i.bottom, sizeof(int) * num);
-  }
-
-  return buffer;
-}
-
-bool Deserialize(const char *data, size_t size, RemoteAction &out) {
-  size_t offset = 0;
-  auto read = [&](void *dst, size_t len) -> bool {
-    if (offset + len > size) {
-      return false;
-    }
-    std::memcpy(dst, data + offset, len);
-    offset += len;
-    return true;
-  };
-
-  if (size < 1) {
-    return false;
-  }
-  out.type = static_cast<ControlType>(data[offset++]);
-
-  if (out.type == ControlType::host_infomation) {
-    size_t name_len;
-    if (!read(&name_len, sizeof(size_t)) ||
-        name_len >= sizeof(out.i.host_name)) {
-      return false;
-    }
-    if (!read(out.i.host_name, name_len)) {
-      return false;
-    }
-    out.i.host_name[name_len] = '\0';
-    out.i.host_name_size = name_len;
-
-    size_t num;
-    if (!read(&num, sizeof(size_t))) {
-      return false;
-    }
-    out.i.display_num = num;
-
-    out.i.display_list =
-        static_cast<char **>(std::malloc(num * sizeof(char *)));
-    for (size_t i = 0; i < num; ++i) {
-      size_t len;
-      if (!read(&len, sizeof(size_t)) || offset + len > size) {
-        return false;
-      }
-      out.i.display_list[i] = static_cast<char *>(std::malloc(len + 1));
-      std::memcpy(out.i.display_list[i], data + offset, len);
-      out.i.display_list[i][len] = '\0';
-      offset += len;
-    }
-
-    auto alloc_int_array = [&](int *&array) {
-      array = static_cast<int *>(std::malloc(num * sizeof(int)));
-      return read(array, num * sizeof(int));
-    };
-
-    return alloc_int_array(out.i.left) && alloc_int_array(out.i.top) &&
-           alloc_int_array(out.i.right) && alloc_int_array(out.i.bottom);
-  }
-
-  return true;
-}
-
-void Free(RemoteAction &action) {
-  if (action.type != ControlType::host_infomation) {
-    return;
-  }
-
-  for (size_t i = 0; i < action.i.display_num; ++i) {
-    std::free(action.i.display_list[i]);
-  }
-  std::free(action.i.display_list);
-  std::free(action.i.left);
-  std::free(action.i.top);
-  std::free(action.i.right);
-  std::free(action.i.bottom);
-
-  action.i.display_list = nullptr;
-  action.i.left = action.i.top = action.i.right = action.i.bottom = nullptr;
-  action.i.display_num = 0;
-}
-
-} // namespace crossdesk::remote_action_codec
@@ -1,23 +0,0 @@
-/*
- * @Author: DI JUNKUN
- * @Date: 2026-09-04
- * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
- */
-
-#ifndef _REMOTE_ACTION_CODEC_H_
-#define _REMOTE_ACTION_CODEC_H_
-
-#include <cstddef>
-#include <vector>
-
-#include <remote_action.h>
-
-namespace crossdesk::remote_action_codec {
-
-std::vector<char> Serialize(const RemoteAction &action);
-bool Deserialize(const char *data, size_t size, RemoteAction &out);
-void Free(RemoteAction &action);
-
-} // namespace crossdesk::remote_action_codec
-
-#endif
@@ -14,7 +14,6 @@
 #include <filesystem>
 #include <memory>
 #include <mutex>
-#include <optional>
 #include <queue>
 #include <string>
 #include <vector>
@@ -22,6 +21,7 @@
 #include <remote_action.h>
 #include <stream_names.h>
 #include "display_info.h"
+#include "cursor_presentation.h"
 #include "minirtc.h"

 namespace crossdesk { class PeerEventHandler; }
@@ -38,7 +38,6 @@ struct FileTransferState {
  std::chrono::steady_clock::time_point file_send_last_update_time_;
  uint64_t file_send_last_bytes_ = 0;
  bool file_transfer_window_visible_ = false;
-  bool file_transfer_window_hovered_ = false;
  std::atomic<uint32_t> current_file_id_{0};

  struct QueuedFile {
@@ -92,31 +91,12 @@ struct RemoteSession {
  bool audio_capture_button_pressed_ = true;
  bool control_mouse_ = true;
  bool streaming_ = false;
-  bool is_control_bar_in_left_ = true;
-  bool control_bar_hovered_ = false;
-  bool display_selectable_hovered_ = false;
-  bool shortcut_selectable_hovered_ = false;
-  bool control_bar_expand_ = true;
-  bool reset_control_bar_pos_ = false;
-  bool control_window_width_is_changing_ = false;
-  bool control_window_height_is_changing_ = false;
  bool p2p_mode_ = true;
  bool remember_password_ = false;
  char remote_password_[7] = "";
-  float sub_stream_window_width_ = 1280;
-  float sub_stream_window_height_ = 720;
-  float control_window_min_width_ = 20;
-  float control_window_max_width_ = 300;
-  float control_window_min_height_ = 38;
-  float control_window_max_height_ = 180;
-  float control_window_width_ = 300;
-  float control_window_height_ = 38;
-  float control_bar_pos_x_ = 0;
-  float control_bar_pos_y_ = 30;
-  float mouse_diff_control_bar_pos_x_ = 0;
-  float mouse_diff_control_bar_pos_y_ = 0;
-  double control_bar_button_pressed_time_ = 0;
-  double net_traffic_stats_button_pressed_time_ = 0;
+  // Reused across frames by the decode callback thread when a CPU NV12
+  // native frame has to be materialized for a renderer that rejects it.
+  std::vector<unsigned char> native_cpu_fallback_;

  // Written by the decode callback thread and consumed by the UI thread.
  std::mutex video_frame_mutex_;
@@ -130,33 +110,22 @@ struct RemoteSession {
  std::chrono::steady_clock::time_point background_snapshot_time_;
  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;
-  float mouse_pos_y_last_ = 0;
-  int texture_width_ = 1280;
-  int texture_height_ = 720;
  int video_width_ = 0;
  int video_height_ = 0;
-  int video_width_last_ = 0;
-  int video_height_last_ = 0;
  int selected_display_ = 0;
  size_t video_size_ = 0;
  uint64_t video_frame_sequence_ = 0;
  bool tab_selected_ = false;
  bool tab_opened_ = true;
-  std::optional<float> pos_x_before_docked_;
-  std::optional<float> pos_y_before_docked_;
-  float render_window_x_ = 0;
-  float render_window_y_ = 0;
-  float render_window_width_ = 0;
-  float render_window_height_ = 0;
-  std::string fullscreen_button_label_ = "Fullscreen";
-  std::string net_traffic_stats_button_label_ = "Show Net Traffic Stats";
-  std::string mouse_control_button_label_ = "Mouse Control";
-  std::string audio_capture_button_label_ = "Audio Capture";
  std::string remote_host_name_;
  bool remote_service_status_received_ = false;
+  std::mutex privacy_status_mutex_;
+  PrivacyStatus privacy_status_{};
+  bool privacy_status_received_ = false;
+  bool privacy_command_pending_ = false;
+  uint64_t privacy_command_tick_ = 0;
+  uint32_t privacy_request_revision_ = 0;
+  uint64_t privacy_status_tick_ = 0;
  bool remote_service_available_ = false;
  std::string remote_interactive_stage_;
  std::vector<DisplayInfo> display_info_list_;
@@ -166,6 +135,7 @@ struct RemoteSession {
  std::mutex remote_cursor_state_mutex_;
  CursorState remote_cursor_state_{};
  bool remote_cursor_state_received_ = false;
+  CursorPresentation cursor_presentation_;
  // Shared by minirtc callbacks, Slint rendering and SDL audio callbacks.
  std::atomic<ConnectionStatus> connection_status_ = ConnectionStatus::Closed;
  TraversalMode traversal_mode_ = TraversalMode::UnknownMode;
@@ -184,4 +154,4 @@ using RemoteSessionPtr = std::shared_ptr<RemoteSession>;

 }  // namespace crossdesk::gui_detail

-#endif
+#endif
@@ -40,7 +40,6 @@ struct InfrastructureState {
  std::string dll_log_path_;
  std::string cache_path_;
  int localization_language_index_ = -1;
-  int localization_language_index_last_ = -1;
  bool modules_inited_ = false;
  unsigned char aes128_key_[16]{};
  unsigned char aes128_iv_[16]{};
@@ -123,7 +122,6 @@ struct PlatformIntegrationState {

 struct UserSettingsState {
  char client_id_[10] = "";
-  char client_id_display_[12] = "";
  char client_id_with_password_[17] = "";
  char password_saved_[7] = "";
  char self_hosted_id_[17] = "";
@@ -136,10 +134,8 @@ struct UserSettingsState {
  int video_encode_format_button_value_ = 0;
  bool enable_hardware_video_codec_ = true;
  bool enable_turn_ = true;
-  bool enable_srtp_ = false;
  char signal_server_ip_[256] = "api.crossdesk.cn";
  char signal_server_port_[6] = "9099";
-  char coturn_server_port_[6] = "3478";
  bool enable_self_hosted_ = false;
  int language_button_value_last_ = 0;
  int video_quality_button_value_last_ = 0;
@@ -148,7 +144,6 @@ struct UserSettingsState {
  int video_encode_format_button_value_last_ = 0;
  bool enable_hardware_video_codec_last_ = false;
  bool enable_turn_last_ = true;
-  bool enable_srtp_last_ = false;
  bool enable_self_hosted_last_ = false;
  bool enable_autostart_ = false;
  bool enable_autostart_last_ = false;
@@ -158,9 +153,6 @@ struct UserSettingsState {
  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] = "";
-  bool settings_window_pos_reset_ = true;
-  bool self_hosted_server_config_window_pos_reset_ = true;
  std::string selected_current_file_path_;
  bool show_file_browser_ = true;
 };
@@ -208,7 +200,6 @@ struct ConnectionState {
  std::unordered_map<std::string, std::chrono::steady_clock::time_point>
      last_remote_pointer_input_time_;
  std::string selected_server_remote_id_;
-  std::string selected_server_remote_hostname_;
  std::mutex pending_presence_probe_mutex_;
  bool pending_presence_probe_ = false;
  bool pending_presence_result_ready_ = false;
@@ -41,10 +41,12 @@ export global FontAwesomeIcons {
    out property <string> keyboard: "\u{f11c}";
    out property <string> minus: "\u{f068}";
    out property <string> pen: "\u{f304}";
+    out property <string> rotate: "\u{f2f1}";
    out property <string> signal: "\u{f012}";
    out property <string> shield-halved: "\u{f3ed}";
    out property <string> square-full: "\u{f45c}";
    out property <string> trash-can: "\u{f2ed}";
+    out property <string> user-secret: "\u{f21b}";
    out property <string> volume-high: "\u{f028}";
    out property <string> volume-xmark: "\u{f6a9}";
    out property <string> xmark: "\u{f00d}";
@@ -53,6 +55,7 @@ export global FontAwesomeIcons {
 export component IconButton inherits Rectangle {
    in property <string> icon;
    in property <string> tooltip;
+    in property <bool> enabled: true;
    in property <bool> danger: false;
    in property <length> icon-size: 16px;
    in property <color> icon-color: #24272d;
@@ -68,6 +71,7 @@ export component IconButton inherits Rectangle {
                              : touch.has-hover ? (danger ? #f04438 : root.hover-background)
                                                : root.normal-background;
    border-radius: 4px;
+    opacity: root.enabled ? 1 : 0.4;

    Text {
        text: root.icon;
@@ -89,6 +93,7 @@ export component IconButton inherits Rectangle {
    }

    touch := TouchArea {
+        enabled: root.enabled;
        clicked => { root.clicked(); }
    }

@@ -24,6 +24,7 @@ export global UiStrings {
    in-out property <string> online: "Online";
    in-out property <string> offline: "Offline";
    in-out property <string> password: "Password";
+    in-out property <string> refresh-password: "Refresh random password";
    in-out property <string> copied: "Local ID copied to clipboard";
    in-out property <string> connect: "Connect";
    in-out property <string> settings: "Settings";
@@ -39,6 +40,8 @@ export global UiStrings {
    in-out property <string> language: "Language";
    in-out property <string> video-quality: "Video quality";
    in-out property <string> frame-rate: "Frame rate";
+    in-out property <string> capture-method: "Capture method";
+    in-out property <string> capture-method-auto: "Auto";
    in-out property <string> adaptation-policy: "Video preference";
    in-out property <string> priority-frame-rate: "Frame rate";
    in-out property <string> priority-quality: "Quality";
@@ -46,15 +49,15 @@ export global UiStrings {
    in-out property <string> codec: "Video codec";
    in-out property <string> hardware-codec: "Hardware video codec";
    in-out property <string> turn-relay: "TURN relay";
-    in-out property <string> srtp: "SRTP encryption";
+    in-out property <string> force-relay: "Force relay";
    in-out property <string> self-hosted: "Self-hosted server";
    in-out property <string> autostart: "Start with system";
    in-out property <string> daemon: "Run in background";
+    in-out property <string> privacy-on-connect: "Privacy screen on connect";
    in-out property <string> file-save-path: "File save path";
    in-out property <string> default-desktop: "Desktop";
    in-out property <string> server-host: "Server host";
    in-out property <string> server-port: "Signal port";
-    in-out property <string> coturn-port: "TURN port";
    in-out property <string> version: "Version";
    in-out property <string> copyright: "© 2026 by JUNKUN DI. All right reserved.";
    in-out property <string> license: "Licensed under GNU GPL v3.";
@@ -184,6 +187,57 @@ component ConnectionDialogButton inherits Rectangle {
    button-touch := TouchArea { clicked => { root.clicked(); } }
 }

+// Use the same compact, plain-text field for connection and password changes.
+component PasswordInput inherits Rectangle {
+    in-out property <string> text;
+    in property <int> max-length: 0;
+    private property <string> previous-text;
+    callback accepted;
+
+    width: 70px;
+    height: 23px;
+    background: white;
+    border-width: 1px;
+    border-color: ImGuiLineStyle.border;
+    border-radius: 3px;
+    forward-focus: editor;
+
+    init => { root.previous-text = root.text; }
+
+    editor := TextInput {
+        x: 5px; y: 1px; width: parent.width - 10px; height: parent.height - 2px;
+        text <=> root.text;
+        input-type: InputType.text;
+        single-line: true;
+        color: #202124;
+        font-size: ImGuiFontStyle.base;
+        vertical-alignment: center;
+        selection-foreground-color: white;
+        selection-background-color: #2463c7;
+        edited => {
+            // Validate the resulting text so typing, paste, and replacement
+            // all obey the limit while deletion and selection still work.
+            if (root.max-length > 0 && self.text.character-count > root.max-length) {
+                self.text = root.previous-text;
+            } else {
+                root.previous-text = self.text;
+            }
+        }
+        accepted => { root.accepted(); }
+    }
+    Timer {
+        interval: 1ms;
+        running: true;
+        triggered => {
+            self.running = false;
+            editor.focus();
+            // Place the caret after any restored password, including UTF-8.
+            editor.select-all();
+            editor.clear-selection();
+        }
+    }
+}
+
 export component MainWindow inherits Window {
    title: "CrossDesk";
    icon: @image-url("../../../resources/linux/crossdesk_256x256.png");
@@ -207,6 +261,7 @@ export component MainWindow inherits Window {
    in property <string> local-password: "";
    in-out property <string> remote-id-input: "";
    in property <bool> password-visible: true;
+    in property <bool> password-change-pending: false;
    in property <bool> signal-connected: false;
    in property <bool> signal-tls-error: false;
    in property <[RecentConnection]> recent-connections;
@@ -239,18 +294,25 @@ export component MainWindow inherits Window {
    in-out property <int> language-index: 0;
    in-out property <int> video-quality-index: 2;
    in-out property <int> frame-rate-index: 1;
+    in property <bool> capture-method-visible: false;
+    in-out property <int> capture-method-index: 0;
    in-out property <int> adaptation-policy-index: 1;
    in-out property <int> codec-index: 0;
    in-out property <bool> hardware-codec-enabled: true;
    in-out property <bool> turn-enabled: true;
-    in-out property <bool> srtp-enabled: false;
+    in-out property <bool> force-relay-enabled: false;
+    changed turn-enabled => {
+        if !root.turn-enabled { root.force-relay-enabled = false; }
+    }
    in-out property <bool> self-hosted-enabled: false;
    in-out property <bool> autostart-enabled: false;
    in-out property <bool> daemon-enabled: false;
+    // Show the preference on every platform; only adapted hosts can change it.
+    in property <bool> privacy-setting-available: false;
+    in-out property <bool> privacy-on-connect-enabled: true;
    in-out property <string> file-save-path: "";
    in-out property <string> server-host: "";
    in-out property <string> server-port: "";
-    in-out property <string> coturn-port: "";
    in property <bool> settings-session-active: false;
    // Keep the setting visible on every platform. Unsupported builds expose it
    // as disabled so the fixed settings layout never turns into a blank row.
@@ -258,6 +320,7 @@ export component MainWindow inherits Window {

    callback copy-local-id;
    callback toggle-password-visibility;
+    callback refresh-password;
    callback reset-password(string) -> bool;
    callback format-remote-id(string) -> string;
    callback connect-requested(string);
@@ -672,19 +735,31 @@ export component MainWindow inherits Window {
                    IconButton {
                                x: 174px;
                                y: 133px;
-                                width: 29px;
+                                width: 24px;
                                height: 30px;
                                icon: root.password-visible ? FontAwesomeIcons.eye : FontAwesomeIcons.eye-slash;
                                icon-size: 17px;
                                clicked => { root.toggle-password-visibility(); }
                    }
                    IconButton {
-                                x: 214px;
+                                x: 198px;
                                y: 133px;
-                                width: 29px;
+                                width: 24px;
+                                height: 30px;
+                                icon: FontAwesomeIcons.rotate;
+                                icon-size: 15px;
+                                tooltip: UiStrings.refresh-password;
+                                enabled: !root.password-change-pending;
+                                clicked => { root.refresh-password(); }
+                    }
+                    IconButton {
+                                x: 222px;
+                                y: 133px;
+                                width: 24px;
                                height: 30px;
                                icon: FontAwesomeIcons.pen;
                                icon-size: 15px;
+                                enabled: !root.password-change-pending;
                                clicked => { root.reset-password-open = true; }
                    }
            }
@@ -1140,25 +1215,11 @@ export component MainWindow inherits Window {
                padding: 20px;
                spacing: 12px;
                DialogPromptText { prompt: UiStrings.new-password; }
-                Rectangle {
-                    height: 28px;
-                    background: white;
-                    border-width: 1px;
-                    border-color: ImGuiLineStyle.border;
-                    border-radius: 4px;
-
-                    LineEdit {
-                        x: 1px;
-                        y: 1.5px;
-                        width: parent.width - 2px;
-                        height: parent.height - 2px;
+                HorizontalLayout {
+                    alignment: center;
+                    PasswordInput {
                        text <=> root.new-password-input;
-                        input-type: InputType.password;
-                    }
-                    LineEditFocusUnderlineMask {
-                        x: 5px;
-                        y: parent.height - 3px;
-                        width: parent.width - 10px;
+                        max-length: 6;
                    }
                }
                Text { height: root.reset-password-invalid ? 18px : 0px; visible: root.reset-password-invalid; text: UiStrings.invalid-password; color: #d92d20; font-size: ImGuiFontStyle.small; horizontal-alignment: center; }
@@ -1284,30 +1345,10 @@ export component MainWindow inherits Window {
                    vertical-alignment: center;
                }

-                if !root.connection-validating: Rectangle {
-                    x: 71px; y: 63px; width: 70px; height: 23px;
-                    background: white;
-                    border-width: 1px;
-                    border-color: ImGuiLineStyle.border;
-                    border-radius: 3px;
-                    connection-password-editor := TextInput {
-                        x: 5px; y: 1px; width: parent.width - 10px; height: parent.height - 2px;
-                        text <=> root.connection-password;
-                        // The legacy ImGui field uses CharsNoBlank without the
-                        // Password flag, so entered text remains visible.
-                        input-type: InputType.text;
-                        color: #202124;
-                        font-size: ImGuiFontStyle.base;
-                        vertical-alignment: center;
-                        selection-foreground-color: white;
-                        selection-background-color: #2463c7;
-                        accepted => { root.connection-submit-password(root.connection-password, root.connection-remember-password); }
-                    }
-                    Timer {
-                        interval: 1ms;
-                        running: true;
-                        triggered => { connection-password-editor.focus(); }
-                    }
+                if !root.connection-validating: PasswordInput {
+                    x: 71px; y: 63px;
+                    text <=> root.connection-password;
+                    accepted => { root.connection-submit-password(root.connection-password, root.connection-remember-password); }
                }

                if !root.connection-validating: Rectangle {
@@ -1447,6 +1488,11 @@ export component MainWindow inherits Window {
                        Text { x: 8px; y: 3px; width: root.compact-language ? 94px : 162px; height: 24px; text: UiStrings.language; font-size: ImGuiFontStyle.body; overflow: elide; vertical-alignment: center; }
                        CompactComboBox { x: root.compact-language ? 106px : 174px; y: 2px; model: ["中文", "English", "Русский"]; current-index <=> root.language-index; }
                    }
+                    if root.capture-method-visible: Rectangle {
+                        height: 30px;
+                        Text { x: 8px; y: 3px; width: root.compact-language ? 94px : 162px; height: 24px; text: UiStrings.capture-method; font-size: ImGuiFontStyle.body; overflow: elide; vertical-alignment: center; }
+                        CompactComboBox { x: root.compact-language ? 106px : 174px; y: 2px; enabled: !root.settings-session-active; model: [UiStrings.capture-method-auto, "DXGI", "WGC", "GDI"]; current-index <=> root.capture-method-index; }
+                    }
                    Rectangle {
                        height: 30px;
                        Text { x: 8px; y: 3px; width: root.compact-language ? 94px : 162px; height: 24px; text: UiStrings.video-quality; font-size: ImGuiFontStyle.body; overflow: elide; vertical-alignment: center; }
@@ -1479,8 +1525,13 @@ export component MainWindow inherits Window {
                    }
                    Rectangle {
                        height: 30px;
-                        Text { x: 8px; y: 3px; width: root.compact-language ? 145px : 212px; height: 24px; text: UiStrings.srtp; font-size: ImGuiFontStyle.body; overflow: elide; vertical-alignment: center; }
-                        ImGuiCheckBox { x: root.compact-language ? 157px : 224px; y: 3px; checked <=> root.srtp-enabled; enabled: !root.settings-session-active; }
+                        Text { x: 8px; y: 3px; width: root.compact-language ? 145px : 212px; height: 24px; text: UiStrings.force-relay; color: root.turn-enabled ? #202124 : #8b8f95; font-size: ImGuiFontStyle.body; overflow: elide; vertical-alignment: center; }
+                        ImGuiCheckBox { x: root.compact-language ? 157px : 224px; y: 3px; checked <=> root.force-relay-enabled; enabled: root.turn-enabled && !root.settings-session-active; }
+                    }
+                    Rectangle {
+                        height: 30px;
+                        Text { x: 8px; y: 3px; width: root.compact-language ? 145px : 212px; height: 24px; text: UiStrings.privacy-on-connect; color: root.privacy-setting-available ? #202124 : #8b8f95; font-size: ImGuiFontStyle.body; overflow: elide; vertical-alignment: center; }
+                        ImGuiCheckBox { x: root.compact-language ? 157px : 224px; y: 3px; checked <=> root.privacy-on-connect-enabled; enabled: root.privacy-setting-available; }
                    }
                    Rectangle {
                        height: 30px;
@@ -1519,7 +1570,7 @@ export component MainWindow inherits Window {
            x: root.compact-language ? 190px : 140px;
            y: 105px;
            width: root.compact-language ? 260px : 360px;
-            height: 168px;
+            height: 138px;
            border-radius: 7px;

            Rectangle {
@@ -1559,21 +1610,8 @@ export component MainWindow inherits Window {
                LineEdit { x: 1px; y: 1.5px; width: parent.width - 2px; height: parent.height - 2px; text <=> root.server-port; input-type: InputType.number; font-size: ImGuiFontStyle.body; }
                LineEditFocusUnderlineMask { x: 5px; y: parent.height - 3px; width: parent.width - 10px; }
            }
-            Text { x: 8px; y: 91px; width: root.compact-language ? 88px : 165px; height: 24px; text: UiStrings.coturn-port; font-size: ImGuiFontStyle.body; overflow: elide; vertical-alignment: center; }
-            Rectangle {
-                x: root.compact-language ? 100px : 173px;
-                y: 90px;
-                width: root.compact-language ? 152px : 179px;
-                height: 24px;
-                background: white;
-                border-width: 1px;
-                border-color: ImGuiLineStyle.border;
-                border-radius: 4px;
-                LineEdit { x: 1px; y: 1.5px; width: parent.width - 2px; height: parent.height - 2px; text <=> root.coturn-port; input-type: InputType.number; font-size: ImGuiFontStyle.body; }
-                LineEditFocusUnderlineMask { x: 5px; y: parent.height - 3px; width: parent.width - 10px; }
-            }
-            CompactButton { x: root.compact-language ? 93px : 135px; y: 130px; primary: true; text: UiStrings.ok; clicked => { root.save-self-hosted-settings(); root.self-host-settings-open = false; } }
-            CompactButton { x: root.compact-language ? 134px : 176px; y: 130px; width: root.compact-language ? 34px : 56px; text: UiStrings.cancel; clicked => { root.cancel-self-hosted-settings(); root.self-host-settings-open = false; } }
+            CompactButton { x: root.compact-language ? 93px : 135px; y: 100px; primary: true; text: UiStrings.ok; clicked => { root.save-self-hosted-settings(); root.self-host-settings-open = false; } }
+            CompactButton { x: root.compact-language ? 134px : 176px; y: 100px; width: root.compact-language ? 34px : 56px; text: UiStrings.cancel; clicked => { root.cancel-self-hosted-settings(); root.self-host-settings-open = false; } }
        }
    }

@@ -25,6 +25,8 @@ export struct NetworkStatsRow {
 export global StreamStrings {
    in-out property <string> select-display: "Select Display";
    in-out property <string> send-shortcut: "Send Shortcut";
+    in-out property <string> privacy-enable: "Enable privacy screen";
+    in-out property <string> privacy-disable: "Turn privacy off / recover";
    in-out property <string> control-mouse: "Control Mouse";
    in-out property <string> release-mouse: "Release Mouse";
    in-out property <string> audio: "Audio Capture";
@@ -43,6 +45,14 @@ export global StreamStrings {
    in-out property <string> stats-loss-rate: "Loss Rate";
    in-out property <string> stats-resolution: "Res";
    in-out property <string> stats-connection-mode: "Mode";
+    in-out property <string> stats-encryption: "Encryption";
+    in-out property <string> stats-encryption-enabled: "Enabled";
+    in-out property <string> stats-encryption-disabled: "Disabled";
+}
+
+struct ControlBarTooltip {
+    text: string,
+    anchor-x: length,
 }

 // The legacy ImGui control bar uses 24px buttons with Font Awesome rendered
@@ -54,19 +64,27 @@ component ControlBarButton inherits Rectangle {
    in property <string> tooltip: "";
    in property <bool> selected: false;
    in property <bool> slashed: false;
+    in property <bool> action-enabled: true;
+    // Capability and temporary command availability have different visuals.
+    in property <bool> muted: false;
    in property <length> icon-size: 16px;
+    out property <bool> has-hover: touch.has-hover;
+    out property <ControlBarTooltip> tooltip-info: {
+        text: root.visible && touch.has-hover && !touch.pressed ? root.tooltip : "",
+        anchor-x: root.x + root.width / 2,
+    };
    callback clicked;

    width: 24px;
    height: 24px;
-    background: touch.pressed ? #0f87fa
+    background: root.muted ? #eef0f3 : touch.pressed && root.action-enabled ? #0f87fa
                              : touch.has-hover ? #4296fa
                                                : root.selected ? #4296fa : #4296fa66;
    border-radius: 3px;

    Text {
        text: root.icon;
-        color: #24272d;
+        color: root.muted ? #8a8f96 : #24272d;
        font-family: "Font Awesome 6 Free";
        font-weight: 900;
        font-size: root.icon-size;
@@ -105,7 +123,8 @@ component ControlBarButton inherits Rectangle {
    }

    touch := TouchArea {
-        clicked => { root.clicked(); }
+        // Keep disabled controls hit-testable so clicks cannot reach the peer.
+        clicked => { if root.action-enabled { root.clicked(); } }
    }
 }

@@ -123,6 +142,11 @@ export component StreamWindow inherits Window {

    in property <bool> custom-titlebar: false;
    in property <bool> native-video-enabled: false;
+    // Export the actual input surface in logical pixels. Native rendering and
+    // input mapping must follow the same layout, including title and tab bars.
+    out property <length> video-area-top: content-layer.y + video.y;
+    out property <length> video-area-width: video.width;
+    out property <length> video-area-height: video.height;
    in property <bool> window-active: true;
    in property <bool> window-maximized: false;
    in property <[StreamTab]> tabs;
@@ -134,17 +158,23 @@ export component StreamWindow inherits Window {
    in property <[string]> displays;
    in-out property <int> selected-display: 0;
    in property <bool> mouse-control-enabled: true;
+    in property <bool> privacy-can-toggle: false;
+    in property <bool> privacy-active: false;
+    in property <bool> privacy-off: false;
+    in property <bool> privacy-unsupported: false;
+    // Privacy feedback stays on its toolbar button and hover tooltip.
+    in property <string> privacy-status-text: "Privacy screen";
    // Numeric values mirror crossdesk::RemoteCursorShape and Slint's MouseCursor.
    in property <bool> remote-cursor-active: false;
    in property <int> remote-cursor-shape: 0;
    in property <bool> audio-enabled: true;
-    in property <bool> srtp-enabled: false;
    in property <bool> fullscreen-enabled: false;
    in property <bool> stats-visible: false;
    in property <[NetworkStatsRow]> stats-rows;
    in property <string> stats-fps: "0";
    in property <string> stats-resolution: "";
    in property <string> stats-connection-mode: "";
+    in property <bool> stats-encryption-enabled: false;
    in property <bool> file-transfer-visible: false;
    in property <[FileTransferEntry]> file-transfers;

@@ -154,6 +184,7 @@ export component StreamWindow inherits Window {
    callback switch-display(int);
    callback send-shortcut(string);
    callback toggle-mouse-control;
+    callback toggle-privacy;
    callback toggle-audio;
    callback select-file;
    callback close-file-transfer;
@@ -172,10 +203,35 @@ export component StreamWindow inherits Window {
    callback keyboard-focus-changed(bool);

    private property <bool> control-expanded: true;
+    private property <length> control-toolbar-height: 38px;
+    private property <length> control-button-step: 32px;
+    private property <length> stats-row-height: 18px;
+    private property <length> stats-header-height: 18px;
+    private property <length> stats-content-height:
+        root.stats-header-height + root.stats-rows.length * root.stats-row-height + 44px;
    private property <bool> display-menu-open: false;
    private property <bool> display-menu-animation-enabled: false;
    private property <float> display-menu-progress: 0.0;
    private property <bool> shortcut-menu-open: false;
+    private property <bool> control-tooltip-visible: false;
+    private property <ControlBarTooltip> hovered-control: {
+        if root.window-active && !root.control-dragging
+            && !root.display-menu-open && !root.shortcut-menu-open {
+            if collapse-button.has-hover { return collapse-button.tooltip-info; }
+            if root.control-expanded {
+                if display-button.has-hover { return display-button.tooltip-info; }
+                if shortcut-button.has-hover { return shortcut-button.tooltip-info; }
+                if mouse-button.has-hover { return mouse-button.tooltip-info; }
+                if privacy-button.has-hover { return privacy-button.tooltip-info; }
+                if audio-button.has-hover { return audio-button.tooltip-info; }
+                if file-button.has-hover { return file-button.tooltip-info; }
+                if stats-button.has-hover { return stats-button.tooltip-info; }
+                if fullscreen-button.has-hover { return fullscreen-button.tooltip-info; }
+                if close-button.has-hover { return close-button.tooltip-info; }
+            }
+        }
+        return { text: "", anchor-x: 0px };
+    }
    // A popup can remove itself from the scene in its clicked callback before
    // the video input layer observes the same pointer release. Remember that
    // the press belonged to local UI so that release cannot reach the peer.
@@ -215,24 +271,38 @@ export component StreamWindow inherits Window {
        }
    }

+    changed hovered-control => {
+        root.control-tooltip-visible = false;
+        control-tooltip-timer.running = root.hovered-control.text != "";
+        if root.hovered-control.text != "" { control-tooltip-timer.restart(); }
+    }
+    control-tooltip-timer := Timer {
+        interval: 450ms;
+        running: false;
+        triggered => {
+            self.running = false;
+            root.control-tooltip-visible = true;
+        }
+    }
+
    is-local-control-area(pointer-x, pointer-y) => {
        let over-control = pointer-x >= control.x
            && pointer-x <= control.x + control.width
            && pointer-y >= control.y
            && pointer-y <= control.y + control.height;
        let display-menu-x = control.x + (root.control-docked-left ? 9px : 42px);
-        let display-menu-y = control.y + control.height - 1px;
+        let display-menu-y = control.y + root.control-toolbar-height - 1px;
        let display-menu-height = min(180px, root.displays.length * 30px + 8px);
        let over-display-menu = root.display-menu-open
            && pointer-x >= display-menu-x
            && pointer-x <= display-menu-x + 180px
            && pointer-y >= display-menu-y
            && pointer-y <= display-menu-y + display-menu-height;
-        let shortcut-menu-x = control.x + (root.control-docked-left ? 41px : 74px);
+        let shortcut-menu-x = control.x + shortcut-button.x;
        let shortcut-menu-y = control.y + 40px;
        let over-shortcut-menu = root.shortcut-menu-open
            && pointer-x >= shortcut-menu-x
-            && pointer-x <= shortcut-menu-x + 150px
+            && pointer-x <= shortcut-menu-x + 180px
            && pointer-y >= shortcut-menu-y
            && pointer-y <= shortcut-menu-y + 68px;
        return over-control || over-display-menu || over-shortcut-menu;
@@ -450,20 +520,8 @@ export component StreamWindow inherits Window {
                        width: parent.width - 27px;
                        height: parent.height;
                        background: transparent;
-                        if root.srtp-enabled: Text {
-                            x: 0px;
-                            width: 12px;
-                            height: parent.height;
-                            text: FontAwesomeIcons.shield-halved;
-                            color: #30343b;
-                            font-family: "Font Awesome 6 Free";
-                            font-weight: 900;
-                            font-size: ImGuiFontStyle.base;
-                            horizontal-alignment: center;
-                            vertical-alignment: center;
-                        }
                        Text {
-                            x: root.srtp-enabled ? 16px : 0px;
+                            x: 0px;
                            width: parent.width - self.x;
                            height: parent.height;
                            text: tab.title;
@@ -639,8 +697,10 @@ export component StreamWindow inherits Window {
            control := Rectangle {
                x: root.control-dragging ? root.control-drag-x : root.control-docked-left ? 0px : parent.width - self.width;
                y: min(max(0px, root.control-pos-y), parent.height - self.height);
-                width: root.control-expanded ? min(300px, parent.width) : 20px;
-                height: root.stats-visible && root.control-expanded ? min(180px, parent.height) : 38px;
+                width: root.control-expanded ? min(76px + 8 * root.control-button-step, parent.width) : 20px;
+                height: root.stats-visible && root.control-expanded
+                    ? min(root.control-toolbar-height + root.stats-content-height + 8px, parent.height)
+                    : root.control-toolbar-height;
                background: white;
                border-width: 1px;
                border-color: ImGuiLineStyle.border;
@@ -657,7 +717,8 @@ export component StreamWindow inherits Window {
                    background: ImGuiLineStyle.control-separator;
                }

-                if root.control-expanded: display-button := ControlBarButton {
+                display-button := ControlBarButton {
+                    visible: root.control-expanded;
                    x: root.control-docked-left ? 9px : 42px; y: 7px;
                    icon: FontAwesomeIcons.display;
                    badge: root.selected-display + 1;
@@ -673,8 +734,9 @@ export component StreamWindow inherits Window {
                        }
                    }
                }
-                if root.control-expanded: shortcut-button := ControlBarButton {
-                    x: root.control-docked-left ? 41px : 74px; y: 7px;
+                shortcut-button := ControlBarButton {
+                    visible: root.control-expanded;
+                    x: (root.control-docked-left ? 9px : 42px) + root.control-button-step; y: 7px;
                    icon: FontAwesomeIcons.keyboard; tooltip: StreamStrings.send-shortcut;
                    clicked => {
                        display-menu-open-timer.running = false;
@@ -684,47 +746,53 @@ export component StreamWindow inherits Window {
                        root.display-menu-open = false;
                    }
                }
-                if root.control-expanded: mouse-button := ControlBarButton {
-                    x: root.control-docked-left ? 73px : 106px; y: 7px;
+                mouse-button := ControlBarButton {
+                    visible: root.control-expanded;
+                    x: (root.control-docked-left ? 9px : 42px) + 2 * root.control-button-step; y: 7px;
                    icon: FontAwesomeIcons.computer-mouse; slashed: !root.mouse-control-enabled;
                    tooltip: root.mouse-control-enabled ? StreamStrings.release-mouse : StreamStrings.control-mouse;
                    clicked => { root.toggle-mouse-control(); }
                }
-                if root.control-expanded: audio-button := ControlBarButton {
-                    x: root.control-docked-left ? 105px : 138px; y: 7px;
+                audio-button := ControlBarButton {
+                    visible: root.control-expanded;
+                    x: (root.control-docked-left ? 9px : 42px) + 4 * root.control-button-step; y: 7px;
                    icon: FontAwesomeIcons.volume-high; slashed: !root.audio-enabled;
                    tooltip: root.audio-enabled ? StreamStrings.mute : StreamStrings.audio;
                    clicked => { root.toggle-audio(); }
                }
-                if root.control-expanded: file-button := ControlBarButton {
-                    x: root.control-docked-left ? 137px : 170px; y: 7px;
+                file-button := ControlBarButton {
+                    visible: root.control-expanded;
+                    x: (root.control-docked-left ? 9px : 42px) + 5 * root.control-button-step; y: 7px;
                    icon: FontAwesomeIcons.folder-open; tooltip: StreamStrings.select-file;
                    clicked => { root.select-file(); }
                }
-                if root.control-expanded: stats-button := ControlBarButton {
-                    x: root.control-docked-left ? 169px : 202px; y: 7px;
+                stats-button := ControlBarButton {
+                    visible: root.control-expanded;
+                    x: (root.control-docked-left ? 9px : 42px) + 6 * root.control-button-step; y: 7px;
                    icon: FontAwesomeIcons.signal; selected: root.stats-visible;
                    tooltip: root.stats-visible ? StreamStrings.hide-stats : StreamStrings.show-stats;
                    clicked => { root.toggle-stats(); }
                }
-                if root.control-expanded: fullscreen-button := ControlBarButton {
-                    x: root.control-docked-left ? 201px : 234px; y: 7px;
+                fullscreen-button := ControlBarButton {
+                    visible: root.control-expanded;
+                    x: (root.control-docked-left ? 9px : 42px) + 7 * root.control-button-step; y: 7px;
                    icon: root.fullscreen-enabled ? FontAwesomeIcons.compress : FontAwesomeIcons.expand;
                    tooltip: root.fullscreen-enabled ? StreamStrings.exit-fullscreen : StreamStrings.fullscreen;
                    clicked => { root.toggle-fullscreen(); }
                }
-                if root.control-expanded: close-button := ControlBarButton {
-                    x: root.control-docked-left ? 233px : 266px; y: 7px;
+                close-button := ControlBarButton {
+                    visible: root.control-expanded;
+                    x: (root.control-docked-left ? 9px : 42px) + 8 * root.control-button-step; y: 7px;
                    icon: FontAwesomeIcons.xmark; tooltip: StreamStrings.disconnect;
                    clicked => { root.disconnect(); }
                }

                if root.control-expanded && root.control-docked-left: Rectangle {
-                    x: 267px; y: 12px; width: 2px; height: 15px;
+                    x: parent.width - 33px; y: 12px; width: 2px; height: 15px;
                    background: ImGuiLineStyle.control-separator;
                }
                collapse-button := ControlBarButton {
-                    x: root.control-expanded ? (root.control-docked-left ? 275px : 10px) : 2px;
+                    x: root.control-expanded ? (root.control-docked-left ? parent.width - 25px : 10px) : 2px;
                    y: 7px;
                    width: 15px;
                    icon: root.control-expanded
@@ -734,76 +802,124 @@ export component StreamWindow inherits Window {
                    clicked => { root.control-expanded = !root.control-expanded; }
                }

+                privacy-button := ControlBarButton {
+                    visible: root.control-expanded;
+                    x: (root.control-docked-left ? 9px : 42px) + 3 * root.control-button-step; y: 7px;
+                    icon: FontAwesomeIcons.user-secret;
+                    slashed: root.privacy-off && !root.privacy-unsupported;
+                    muted: root.privacy-unsupported;
+                    action-enabled: root.privacy-can-toggle;
+                    tooltip: root.privacy-status-text
+                        + (root.privacy-can-toggle ? "\n" + (root.privacy-active
+                            ? StreamStrings.privacy-disable : StreamStrings.privacy-enable) : "");
+                    clicked => { root.toggle-privacy(); }
+                }
+
                if root.stats-visible && root.control-expanded: stats-table := Rectangle {
-                    x: 14px;
-                    y: 38px;
-                    width: parent.width - 28px;
-                    height: 128px;
+                    x: 8px;
+                    y: root.control-toolbar-height + 2px;
+                    width: parent.width - 16px;
+                    height: root.stats-content-height;
                    background: transparent;
-                    private property <length> row-height: 16px;
-                    private property <length> label-column-width: 60px;
-                    private property <length> loss-column-width: 66px;
+                    private property <length> row-height: root.stats-row-height;
+                    private property <length> label-column-width: 50px;
+                    private property <length> loss-column-width:
+                        max((self.width - self.label-column-width) / 3,
+                            stats-loss-label.preferred-width + 8px);
                    private property <length> value-column-width:
                        (self.width - self.label-column-width - self.loss-column-width) / 2;
+                    private property <length> details-right-width:
+                        right-label-width-probe.preferred-width + 6px
+                            + max(resolution-width-probe.preferred-width,
+                                encryption-width-probe.preferred-width
+                                    + (root.stats-encryption-enabled ? 14px : 0px));
+                    private property <length> details-right-x: self.width / 2;

-                    Rectangle {
-                        y: 0px;
-                        height: 1px;
-                        background: ImGuiLineStyle.border;
+                    left-label-width-probe := Text {
+                        visible: false;
+                        text: "FPS\n" + StreamStrings.stats-connection-mode;
+                        font-size: ImGuiFontStyle.small;
+                    }
+                    right-label-width-probe := Text {
+                        visible: false;
+                        text: StreamStrings.stats-resolution + "\n" + StreamStrings.stats-encryption;
+                        font-size: ImGuiFontStyle.small;
+                    }
+                    resolution-width-probe := Text {
+                        visible: false;
+                        text: root.stats-resolution;
+                        font-size: ImGuiFontStyle.body;
+                        font-weight: 600;
+                    }
+                    encryption-width-probe := Text {
+                        visible: false;
+                        text: root.stats-encryption-enabled
+                            ? StreamStrings.stats-encryption-enabled : StreamStrings.stats-encryption-disabled;
+                        font-size: ImGuiFontStyle.body;
+                        font-weight: 600;
                    }

                    Rectangle {
+                        x: 0px;
                        y: 0px;
-                        height: stats-table.row-height;
+                        width: parent.width;
+                        height: root.stats-header-height;
+                        background: #f3f5f8;
+                        border-radius: 4px;
                        Text {
                            x: stats-table.label-column-width + 4px;
                            width: stats-table.value-column-width - 8px;
                            text: StreamStrings.stats-in;
-                            color: #30343b;
+                            color: #667085;
                            font-size: ImGuiFontStyle.small;
+                            horizontal-alignment: right;
                            vertical-alignment: center;
                        }
                        Text {
                            x: stats-table.label-column-width + stats-table.value-column-width + 4px;
                            width: stats-table.value-column-width - 8px;
                            text: StreamStrings.stats-out;
-                            color: #30343b;
+                            color: #667085;
                            font-size: ImGuiFontStyle.small;
+                            horizontal-alignment: right;
                            vertical-alignment: center;
                        }
-                        Text {
+                        stats-loss-label := Text {
                            x: stats-table.label-column-width + stats-table.value-column-width * 2 + 4px;
                            width: stats-table.loss-column-width - 8px;
                            text: StreamStrings.stats-loss-rate;
-                            color: #30343b;
+                            color: #667085;
                            font-size: ImGuiFontStyle.small;
+                            horizontal-alignment: right;
                            vertical-alignment: center;
                            overflow: elide;
                        }
-                        Rectangle {
-                            y: parent.height - 1px;
-                            height: 1px;
-                            background: ImGuiLineStyle.border;
-                        }
                    }

                    for row[index] in root.stats-rows: Rectangle {
-                        y: (index + 1) * stats-table.row-height;
+                        x: 0px;
+                        y: root.stats-header-height + index * stats-table.row-height;
+                        width: parent.width;
                        height: stats-table.row-height;
+                        background: index == root.stats-rows.length - 1 ? #edf3fc : transparent;
+                        border-radius: 4px;
                        Text {
                            x: 4px;
                            width: stats-table.label-column-width - 8px;
                            text: row.label;
-                            color: #30343b;
-                            font-size: ImGuiFontStyle.small;
+                            color: #475467;
+                            font-size: ImGuiFontStyle.body;
+                            font-weight: index == root.stats-rows.length - 1 ? 600 : 400;
                            vertical-alignment: center;
                        }
                        Text {
                            x: stats-table.label-column-width + 4px;
                            width: stats-table.value-column-width - 8px;
                            text: row.inbound;
-                            color: #30343b;
-                            font-size: ImGuiFontStyle.small;
+                            color: #253247;
+                            font-size: ImGuiFontStyle.body;
+                            font-weight: index == root.stats-rows.length - 1 ? 600 : 400;
+                            horizontal-alignment: right;
                            vertical-alignment: center;
                            overflow: elide;
                        }
@@ -811,8 +927,10 @@ export component StreamWindow inherits Window {
                            x: stats-table.label-column-width + stats-table.value-column-width + 4px;
                            width: stats-table.value-column-width - 8px;
                            text: row.outbound;
-                            color: #30343b;
-                            font-size: ImGuiFontStyle.small;
+                            color: #253247;
+                            font-size: ImGuiFontStyle.body;
+                            font-weight: index == root.stats-rows.length - 1 ? 600 : 400;
+                            horizontal-alignment: right;
                            vertical-alignment: center;
                            overflow: elide;
                        }
@@ -820,46 +938,73 @@ export component StreamWindow inherits Window {
                            x: stats-table.label-column-width + stats-table.value-column-width * 2 + 4px;
                            width: stats-table.loss-column-width - 8px;
                            text: row.loss-rate;
-                            color: #30343b;
-                            font-size: ImGuiFontStyle.small;
+                            color: #475467;
+                            font-size: ImGuiFontStyle.body;
+                            font-weight: index == root.stats-rows.length - 1 ? 600 : 400;
+                            horizontal-alignment: right;
                            vertical-alignment: center;
                            overflow: elide;
                        }
-                        Rectangle {
+                        if index < root.stats-rows.length - 2: Rectangle {
+                            x: 4px;
                            y: parent.height - 1px;
+                            width: parent.width - 8px;
                            height: 1px;
-                            background: ImGuiLineStyle.border;
+                            background: #edf0f4;
                        }
                    }

                    for metric[index] in [
-                        { label: "FPS:", value: root.stats-fps },
-                        { label: StreamStrings.stats-resolution + ":", value: root.stats-resolution },
-                        { label: StreamStrings.stats-connection-mode + ":", value: root.stats-connection-mode },
+                        { label: "FPS", value: root.stats-fps },
+                        { label: StreamStrings.stats-resolution, value: root.stats-resolution },
+                        { label: StreamStrings.stats-connection-mode, value: root.stats-connection-mode },
+                        { label: StreamStrings.stats-encryption, value: root.stats-encryption-enabled
+                            ? StreamStrings.stats-encryption-enabled : StreamStrings.stats-encryption-disabled },
                    ]: Rectangle {
-                        y: (index + 5) * stats-table.row-height;
-                        height: stats-table.row-height;
-                        Text {
-                            x: 4px;
-                            width: stats-table.label-column-width - 8px;
+                        private property <length> encryption-icon-width:
+                            index == 3 && root.stats-encryption-enabled ? 14px : 0px;
+                        x: mod(index, 2) == 1 ? stats-table.details-right-x : 6px;
+                        y: root.stats-header-height + root.stats-rows.length * stats-table.row-height
+                            + 2px + floor(index / 2) * 21px;
+                        width: mod(index, 2) == 1 ? stats-table.details-right-width
+                            : stats-table.details-right-x - 14px;
+                        height: 21px;
+                        metric-label := Text {
+                            x: 0px;
+                            y: 0px;
+                            width: mod(index, 2) == 1 ? right-label-width-probe.preferred-width
+                                : left-label-width-probe.preferred-width;
+                            height: parent.height;
                            text: metric.label;
-                            color: #30343b;
+                            color: #667085;
                            font-size: ImGuiFontStyle.small;
                            vertical-alignment: center;
                        }
-                        Text {
-                            x: stats-table.label-column-width + 4px;
-                            width: stats-table.value-column-width - 8px;
+                        metric-value := Text {
+                            x: metric-label.width + 6px;
+                            y: 0px;
+                            height: parent.height;
+                            width: parent.width - self.x - parent.encryption-icon-width;
                            text: metric.value;
-                            color: #30343b;
-                            font-size: ImGuiFontStyle.small;
+                            color: index == 3 && root.stats-encryption-enabled ? #18794e : #253247;
+                            font-size: ImGuiFontStyle.body;
+                            font-weight: 600;
+                            horizontal-alignment: left;
                            vertical-alignment: center;
                            overflow: elide;
                        }
-                        Rectangle {
-                            y: parent.height - 1px;
-                            height: 1px;
-                            background: ImGuiLineStyle.border;
+                        if index == 3 && root.stats-encryption-enabled: Text {
+                            x: metric-value.x + min(metric-value.preferred-width, metric-value.width) + 4px;
+                            y: metric-value.y + (metric-value.height - self.height) / 2;
+                            width: 10px;
+                            height: 12px;
+                            text: FontAwesomeIcons.shield-halved;
+                            font-family: "Font Awesome 6 Free";
+                            font-weight: 900;
+                            font-size: 10px;
+                            color: #238653;
+                            horizontal-alignment: center;
+                            vertical-alignment: center;
                        }
                    }
                }
@@ -872,9 +1017,9 @@ export component StreamWindow inherits Window {
                        && floor((display-touch.mouse-y - 4px) / 30px) < root.displays.length
                    ? floor((display-touch.mouse-y - 4px) / 30px) : -1;
                x: control.x + (root.control-docked-left ? 9px : 42px);
-                // Overlap the control border by one pixel so the menu reads as
-                // an attached panel growing downward from the display button.
-                y: control.y + control.height - 1px;
+                // Anchor to the button row, independent of the expanded stats.
+                // Overlap its bottom edge by one pixel to keep the menu attached.
+                y: control.y + root.control-toolbar-height - 1px;
                width: 180px;
                height: self.expanded-height * root.display-menu-progress;
                opacity: root.display-menu-progress;
@@ -943,7 +1088,7 @@ export component StreamWindow inherits Window {
            }

            if root.shortcut-menu-open: Rectangle {
-                x: control.x + (root.control-docked-left ? 41px : 74px); y: control.y + 40px; width: 150px; height: 68px;
+                x: control.x + shortcut-button.x; y: control.y + 40px; width: 180px; height: 68px;
                background: white; border-width: 1px; border-color: ImGuiLineStyle.border; border-radius: 5px; z: 11;
                VerticalLayout {
                    padding: 4px; spacing: 1px;
@@ -962,6 +1107,30 @@ export component StreamWindow inherits Window {
                }
            }

+            // Measure unwrapped text so short hints stay compact. Render outside
+            // the clipped control bar, capping longer hints before wrapping.
+            control-tooltip-width-probe := Text {
+                visible: false;
+                text: root.hovered-control.text;
+                font-size: ImGuiFontStyle.body;
+            }
+            if root.hovered-control.text != "" && root.control-tooltip-visible: Rectangle {
+                width: min(240px, video.width - 8px,
+                    control-tooltip-width-probe.preferred-width + 16px);
+                x: min(max(4px, control.x + root.hovered-control.anchor-x - self.width / 2),
+                    video.width - self.width - 4px);
+                height: control-tip.preferred-height + 12px;
+                // Anchor to the button row so expanded stats stay beneath the tooltip.
+                y: control.y + root.control-toolbar-height + self.height + 8px <= video.height
+                    ? control.y + root.control-toolbar-height + 4px : max(4px, control.y - self.height - 4px);
+                background: #30343bf5; border-radius: 5px; z: 12;
+                control-tip := Text {
+                    x: 8px; y: 6px; width: parent.width - 16px;
+                    text: root.hovered-control.text;
+                    color: white; font-size: ImGuiFontStyle.body; wrap: word-wrap;
+                }
+            }
+
            // Transfer progress overlay at bottom-left.
            if root.file-transfer-visible: Rectangle {
                x: 18px; y: parent.height - min(210px, parent.height * 0.35); width: min(430px, parent.width * 0.6); height: min(190px, parent.height * 0.32);
@@ -36,6 +36,7 @@ inline int ApplyMainWindowStrings(
  strings.set_online(Text(localization::online[language]));
  strings.set_offline(Text(localization::offline[language]));
  strings.set_password(Text(localization::password[language]));
+  strings.set_refresh_password(Text(localization::refresh_password[language]));
  strings.set_copied(
      Text(localization::local_id_copied_to_clipboard[language]));
  strings.set_connect(Text(localization::connect[language]));
@@ -54,6 +55,9 @@ inline int ApplyMainWindowStrings(
  strings.set_language(Text(localization::language[language]));
  strings.set_video_quality(Text(localization::video_quality[language]));
  strings.set_frame_rate(Text(localization::video_frame_rate[language]));
+  strings.set_capture_method(Text(localization::screen_capture_method[language]));
+  strings.set_capture_method_auto(
+      Text(localization::screen_capture_method_auto[language]));
  strings.set_adaptation_policy(
      Text(localization::video_adaptation_policy[language]));
  strings.set_priority_frame_rate(
@@ -66,11 +70,12 @@ inline int ApplyMainWindowStrings(
  strings.set_hardware_codec(
      Text(localization::enable_hardware_video_codec[language]));
  strings.set_turn_relay(Text(localization::enable_turn[language]));
-  strings.set_srtp(Text(localization::enable_srtp[language]));
+  strings.set_force_relay(Text(localization::force_relay[language]));
  strings.set_self_hosted(
      Text(localization::self_hosted_server_config[language]));
  strings.set_autostart(Text(localization::enable_autostart[language]));
  strings.set_daemon(Text(localization::enable_daemon[language]));
+  strings.set_privacy_on_connect(Text(localization::privacy_on_connect[language]));
  strings.set_file_save_path(
      Text(localization::file_transfer_save_path[language]));
  strings.set_default_desktop(Text(localization::default_desktop[language]));
@@ -78,8 +83,6 @@ inline int ApplyMainWindowStrings(
      Text(localization::self_hosted_server_address[language]));
  strings.set_server_port(
      Text(localization::self_hosted_server_port[language]));
-  strings.set_coturn_port(
-      Text(localization::self_hosted_server_coturn_server_port[language]));
  strings.set_version(Text(localization::version[language]));
  strings.set_signal_connected(Text(localization::signal_connected[language]));
  strings.set_signal_disconnected(
@@ -140,6 +143,8 @@ inline int ApplyStreamWindowStrings(
  auto& strings = window->template global<ui::StreamStrings>();
  strings.set_select_display(Text(localization::select_display[language]));
  strings.set_send_shortcut(Text(localization::send_shortcut[language]));
+  strings.set_privacy_enable(Text(localization::privacy_enable[language]));
+  strings.set_privacy_disable(Text(localization::privacy_disable[language]));
  strings.set_control_mouse(Text(localization::control_mouse[language]));
  strings.set_release_mouse(Text(localization::release_mouse[language]));
  strings.set_audio(Text(localization::audio_capture[language]));
@@ -163,10 +168,16 @@ inline int ApplyStreamWindowStrings(
  strings.set_stats_resolution(Text(localization::resolution[language]));
  strings.set_stats_connection_mode(
      Text(localization::connection_mode[language]));
+  strings.set_stats_encryption(
+      Text(localization::transport_encryption[language]));
+  strings.set_stats_encryption_enabled(
+      Text(localization::transport_encryption_enabled[language]));
+  strings.set_stats_encryption_disabled(
+      Text(localization::transport_encryption_disabled[language]));
  return language;
 }

 }  // namespace crossdesk::ui_localization


-#endif
+#endif
@@ -1,303 +0,0 @@
-#include <random>
-
-#include "application/gui_application.h"
-#include "layout_relative.h"
-#include "localization.h"
-#include "rd_log.h"
-
-namespace crossdesk {
-
-int GuiApplication::LocalWindow() {
-  ImGuiIO &io = ImGui::GetIO();
-  float local_window_width = io.DisplaySize.x * 0.5f;
-  float local_window_height =
-      io.DisplaySize.y * (1 - TITLE_BAR_HEIGHT - STATUS_BAR_HEIGHT);
-  float local_window_button_width = io.DisplaySize.x * 0.046f;
-  float local_window_button_height = io.DisplaySize.y * 0.075f;
-
-  ImGui::SetNextWindowPos(ImVec2(0.0f, io.DisplaySize.y * TITLE_BAR_HEIGHT),
-                          ImGuiCond_Always);
-  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f);
-
-  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(0, 0, 0, 0));
-  ImGui::BeginChild("LocalDesktopWindow",
-                    ImVec2(local_window_width, local_window_height),
-                    ImGuiChildFlags_None,
-                    ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-                        ImGuiWindowFlags_NoBringToFrontOnFocus);
-  ImGui::PopStyleColor();
-
-  ImGui::SetCursorPos(
-      ImVec2(io.DisplaySize.x * 0.045f, io.DisplaySize.y * 0.02f));
-
-  ImGui::SetWindowFontScale(0.9f);
-  ImGui::TextColored(
-      ImVec4(0.0f, 0.0f, 0.0f, 0.5f), "%s",
-      localization::local_desktop[localization_language_index_].c_str());
-
-  ImGui::Spacing();
-  {
-    ImGui::SetNextWindowPos(
-        ImVec2(io.DisplaySize.x * 0.045f, io.DisplaySize.y * 0.15f),
-        ImGuiCond_Always);
-    ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(239.0f / 255, 240.0f / 255,
-                                                   242.0f / 255, 1.0f));
-    ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, window_rounding_ * 1.5f);
-    ImGui::BeginChild(
-        "LocalDesktopPanel",
-        ImVec2(local_window_width * 0.8f, local_window_height * 0.43f),
-        ImGuiChildFlags_Borders,
-        ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-            ImGuiWindowFlags_NoBringToFrontOnFocus);
-    ImGui::PopStyleVar();
-    ImGui::PopStyleColor();
-    {
-      ImGui::SetWindowFontScale(0.8f);
-      ImGui::Text("%s",
-                  localization::local_id[localization_language_index_].c_str());
-
-      ImGui::Spacing();
-
-      ImGui::SetNextItemWidth(io.DisplaySize.x * 0.25f);
-      ImGui::SetWindowFontScale(1.0f);
-      ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-
-      if (strcmp(client_id_display_, client_id_)) {
-        for (int i = 0, j = 0; i < sizeof(client_id_); i++, j++) {
-          client_id_display_[j] = client_id_[i];
-          if (i == 2 || i == 5) {
-            client_id_display_[++j] = ' ';
-          }
-        }
-      }
-
-      ImGui::InputText(
-          "##local_id", client_id_display_, IM_ARRAYSIZE(client_id_display_),
-          ImGuiInputTextFlags_CharsUppercase | ImGuiInputTextFlags_ReadOnly);
-      ImGui::PopStyleVar();
-
-      ImGui::SameLine();
-
-      ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
-      ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0, 0, 0, 0));
-      ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0, 0, 0, 0));
-      ImGui::SetWindowFontScale(0.5f);
-      if (ImGui::Button(ICON_FA_COPY, ImVec2(local_window_button_width,
-                                             local_window_button_height))) {
-        local_id_copied_ = true;
-        ImGui::SetClipboardText(client_id_);
-        copy_start_time_ = ImGui::GetTime();
-      }
-      ImGui::SetWindowFontScale(1.0f);
-      ImGui::PopStyleColor(3);
-
-      double time_duration = ImGui::GetTime() - copy_start_time_;
-      if (local_id_copied_ && time_duration < 1.0f) {
-        ImGui::SetNextWindowPos(
-            ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
-        ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
-        ImGui::PushStyleColor(
-            ImGuiCol_WindowBg,
-            ImVec4(1.0f, 1.0f, 1.0f, 1.0f - (float)time_duration));
-        ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
-        ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_);
-        ImGui::Begin("ConnectionStatusWindow", nullptr,
-                     ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-                         ImGuiWindowFlags_NoSavedSettings);
-        ImGui::PopStyleVar(2);
-        ImGui::PopStyleColor();
-
-        auto window_width = ImGui::GetWindowSize().x;
-        auto window_height = ImGui::GetWindowSize().y;
-        ImGui::SetWindowFontScale(0.8f);
-        std::string text = localization::local_id_copied_to_clipboard
-            [localization_language_index_];
-        auto text_width = ImGui::CalcTextSize(text.c_str()).x;
-        ImGui::SetCursorPosX((window_width - text_width) * 0.5f);
-        ImGui::SetCursorPosY(window_height * 0.4f);
-        ImGui::PushStyleColor(ImGuiCol_Text,
-                              ImVec4(0, 0, 0, 1.0f - (float)time_duration));
-        ImGui::Text("%s", text.c_str());
-        ImGui::PopStyleColor();
-        ImGui::SetWindowFontScale(1.0f);
-
-        ImGui::End();
-      }
-
-      ImGui::Spacing();
-      ImGui::Separator();
-      ImGui::Spacing();
-
-      ImGui::SetWindowFontScale(0.8f);
-      ImGui::Text("%s",
-                  localization::password[localization_language_index_].c_str());
-      ImGui::SetWindowFontScale(1.0f);
-
-      ImGui::SetNextItemWidth(io.DisplaySize.x * 0.25f);
-      ImGui::Spacing();
-
-      ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-      ImGui::InputTextWithHint(
-          "##server_pwd",
-          localization::max_password_len[localization_language_index_].c_str(),
-          password_saved_, IM_ARRAYSIZE(password_saved_),
-          show_password_
-              ? ImGuiInputTextFlags_CharsNoBlank | ImGuiInputTextFlags_ReadOnly
-              : ImGuiInputTextFlags_CharsNoBlank |
-                    ImGuiInputTextFlags_Password |
-                    ImGuiInputTextFlags_ReadOnly);
-      ImGui::PopStyleVar();
-
-      ImGui::SameLine();
-      ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
-      ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0, 0, 0, 0));
-      ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0, 0, 0, 0));
-      ImGui::SetWindowFontScale(0.5f);
-      auto l_x = ImGui::GetCursorScreenPos().x;
-      auto l_y = ImGui::GetCursorScreenPos().y;
-      if (ImGui::Button(
-              show_password_ ? ICON_FA_EYE : ICON_FA_EYE_SLASH,
-              ImVec2(local_window_button_width, local_window_button_height))) {
-        show_password_ = !show_password_;
-      }
-
-      ImGui::SameLine();
-
-      if (ImGui::Button(ICON_FA_PEN, ImVec2(local_window_button_width,
-                                            local_window_button_height))) {
-        show_reset_password_window_ = true;
-      }
-      ImGui::SetWindowFontScale(1.0f);
-      ImGui::PopStyleColor(3);
-
-      if (show_reset_password_window_) {
-        ImGui::SetNextWindowPos(
-            ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
-        ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
-
-        ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding,
-                            window_rounding_ * 0.5f);
-        ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0, 1.0, 1.0, 1.0));
-        ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
-        ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_);
-
-        ImGui::Begin("ResetPasswordWindow", nullptr,
-                     ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-                         ImGuiWindowFlags_NoSavedSettings);
-        ImGui::PopStyleVar(2);
-        ImGui::PopStyleColor();
-
-        auto window_width = ImGui::GetWindowSize().x;
-        auto window_height = ImGui::GetWindowSize().y;
-        std::string text =
-            localization::new_password[localization_language_index_];
-        ImGui::SetWindowFontScale(0.5f);
-        auto text_width = ImGui::CalcTextSize(text.c_str()).x;
-        ImGui::SetCursorPosX((window_width - text_width) * 0.5f);
-        ImGui::SetCursorPosY(window_height * 0.2f);
-        ImGui::Text("%s", text.c_str());
-
-        ImGui::SetCursorPosX(window_width * 0.33f);
-        ImGui::SetCursorPosY(window_height * 0.4f);
-        ImGui::SetNextItemWidth(window_width * 0.33f);
-
-        ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-
-        if (focus_on_input_widget_) {
-          ImGui::SetKeyboardFocusHere();
-          focus_on_input_widget_ = false;
-        }
-
-        bool enter_pressed = ImGui::InputText(
-            "##new_password", new_password_, IM_ARRAYSIZE(new_password_),
-            ImGuiInputTextFlags_CharsNoBlank |
-                ImGuiInputTextFlags_EnterReturnsTrue);
-
-        ImGui::PopStyleVar();
-
-        ImGui::SetCursorPosX(window_width * 0.315f);
-        ImGui::SetCursorPosY(window_height * 0.75f);
-
-        // OK
-        if (ImGui::Button(
-                localization::ok[localization_language_index_].c_str()) ||
-            enter_pressed) {
-          if (6 != strlen(new_password_)) {
-            LOG_ERROR("Invalid password length");
-            show_reset_password_window_ = true;
-            focus_on_input_widget_ = true;
-          } else {
-            show_reset_password_window_ = false;
-            memset(&password_saved_, 0, sizeof(password_saved_));
-            strncpy(password_saved_, new_password_,
-                    sizeof(password_saved_) - 1);
-            password_saved_[sizeof(password_saved_) - 1] = '\0';
-
-            // if self hosted
-            if (config_center_->IsSelfHosted()) {
-              std::string self_hosted_id_str;
-              if (strlen(self_hosted_id_) > 0) {
-                const char *at_pos = strchr(self_hosted_id_, '@');
-                if (at_pos != nullptr) {
-                  self_hosted_id_str =
-                      std::string(self_hosted_id_, at_pos - self_hosted_id_);
-                } else {
-                  self_hosted_id_str = self_hosted_id_;
-                }
-              } else {
-                self_hosted_id_str = client_id_;
-              }
-
-              std::string new_self_hosted_id =
-                  self_hosted_id_str + "@" + password_saved_;
-              memset(&self_hosted_id_, 0, sizeof(self_hosted_id_));
-              strncpy(self_hosted_id_, new_self_hosted_id.c_str(),
-                      sizeof(self_hosted_id_) - 1);
-              self_hosted_id_[sizeof(self_hosted_id_) - 1] = '\0';
-
-            } else {
-              std::string client_id_with_password =
-                  std::string(client_id_) + "@" + password_saved_;
-              strncpy(client_id_with_password_, client_id_with_password.c_str(),
-                      sizeof(client_id_with_password_) - 1);
-              client_id_with_password_[sizeof(client_id_with_password_) - 1] =
-                  '\0';
-            }
-
-            settings_.Save();
-
-            memset(new_password_, 0, sizeof(new_password_));
-
-            LeaveConnection(peer_, client_id_);
-            DestroyPeer(&peer_);
-            focus_on_input_widget_ = true;
-          }
-        }
-
-        ImGui::SameLine();
-
-        if (ImGui::Button(
-                localization::cancel[localization_language_index_].c_str())) {
-          show_reset_password_window_ = false;
-          focus_on_input_widget_ = true;
-          memset(new_password_, 0, sizeof(new_password_));
-        }
-
-        ImGui::SetWindowFontScale(1.0f);
-
-        ImGui::End();
-        ImGui::PopStyleVar();
-      }
-    }
-
-    ImGui::EndChild();
-  }
-
-  ImGui::EndChild();
-  ImGui::PopStyleVar();
-
-  return 0;
-}
-} // namespace crossdesk
@@ -1,656 +0,0 @@
-#include <algorithm>
-#include <cctype>
-
-#include "application/gui_application.h"
-#include "layout_relative.h"
-#include "localization.h"
-#include "rd_log.h"
-
-namespace crossdesk {
-namespace {
-
-std::string TrimConnectionAlias(const char *value) {
-  std::string alias = value ? value : "";
-
-  auto not_space = [](unsigned char ch) { return !std::isspace(ch); };
-  alias.erase(alias.begin(),
-              std::find_if(alias.begin(), alias.end(), not_space));
-  alias.erase(std::find_if(alias.rbegin(), alias.rend(), not_space).base(),
-              alias.end());
-
-  return alias;
-}
-
-void SetDarkTextTooltip(const char *text) {
-  ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.05f, 0.05f, 0.05f, 1.0f));
-  ImGui::BeginTooltip();
-  ImGui::SetWindowFontScale(0.5f);
-  ImGui::Text("%s", text);
-  ImGui::SetWindowFontScale(1.0f);
-  ImGui::EndTooltip();
-  ImGui::PopStyleColor();
-}
-
-} // namespace
-
-int GuiApplication::RecentConnectionsWindow() {
-  ImGuiIO &io = ImGui::GetIO();
-  float recent_connection_window_width = io.DisplaySize.x;
-  float recent_connection_window_height =
-      io.DisplaySize.y * (0.455f - STATUS_BAR_HEIGHT);
-  ImGui::SetNextWindowPos(ImVec2(0, io.DisplaySize.y * 0.55f),
-                          ImGuiCond_Always);
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
-  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-  ImGui::BeginChild(
-      "RecentConnectionsWindow",
-      ImVec2(recent_connection_window_width, recent_connection_window_height),
-      ImGuiChildFlags_Borders,
-      ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-          ImGuiWindowFlags_NoBringToFrontOnFocus);
-  ImGui::PopStyleVar();
-  ImGui::PopStyleColor();
-
-  ImGui::SetCursorPos(
-      ImVec2(io.DisplaySize.x * 0.045f, io.DisplaySize.y * 0.02f));
-
-  ImGui::SetWindowFontScale(0.9f);
-  ImGui::TextColored(
-      ImVec4(0.0f, 0.0f, 0.0f, 0.5f), "%s",
-      localization::recent_connections[localization_language_index_].c_str());
-
-  ShowRecentConnections();
-
-  ImGui::EndChild();
-
-  return 0;
-}
-
-int GuiApplication::ShowRecentConnections() {
-  ImGuiIO &io = ImGui::GetIO();
-  float recent_connection_panel_width = io.DisplaySize.x * 0.912f;
-  float recent_connection_panel_height = io.DisplaySize.y * 0.29f;
-  float recent_connection_image_height = recent_connection_panel_height * 0.6f;
-  float recent_connection_image_width = recent_connection_image_height * 16 / 9;
-  float recent_connection_sub_container_width =
-      recent_connection_image_width * 1.2f;
-  float recent_connection_sub_container_height =
-      recent_connection_image_height * 1.4f;
-  float recent_connection_button_width = recent_connection_image_width * 0.15f;
-  float recent_connection_button_height =
-      recent_connection_image_height * 0.25f;
-  float recent_connection_footer_height =
-      recent_connection_button_height * 1.18f;
-  float recent_connection_name_width = recent_connection_image_width;
-  const float recent_connection_spacing = recent_connection_image_width * 0.16f;
-  const float recent_connections_content_width =
-      recent_connections_.empty()
-          ? 0.0f
-          : recent_connections_.size() * recent_connection_sub_container_width +
-                (recent_connections_.size() - 1) * recent_connection_spacing;
-  const float recent_connections_available_width =
-      recent_connection_panel_width - 2.0f * ImGui::GetStyle().WindowPadding.x;
-  const bool has_horizontal_overflow =
-      recent_connections_content_width > recent_connections_available_width;
-
-  ImGui::SetCursorPos(
-      ImVec2(io.DisplaySize.x * 0.045f, io.DisplaySize.y * 0.1f));
-
-  std::map<std::string, ImVec2> sub_containers_pos;
-  ImGui::PushStyleColor(ImGuiCol_ChildBg,
-                        ImVec4(239.0f / 255, 240.0f / 255, 242.0f / 255, 1.0f));
-  ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 10.0f);
-  const ImGuiWindowFlags container_flags =
-      ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-      ImGuiWindowFlags_NoBringToFrontOnFocus |
-      ImGuiWindowFlags_NoScrollWithMouse |
-      (has_horizontal_overflow ? ImGuiWindowFlags_AlwaysHorizontalScrollbar
-                               : ImGuiWindowFlags_None);
-  ImGui::BeginChild(
-      "RecentConnectionsContainer",
-      ImVec2(recent_connection_panel_width, recent_connection_panel_height),
-      ImGuiChildFlags_Borders, container_flags);
-  ImGui::PopStyleVar();
-  ImGui::PopStyleColor();
-  size_t recent_connections_count = recent_connections_.size();
-  int count = 0;
-  for (auto &it : recent_connections_) {
-    sub_containers_pos[it.first] = ImGui::GetCursorPos();
-    std::string recent_connection_sub_window_name =
-        "RecentConnectionsSubContainer" + it.first;
-    // recent connections sub container
-    ImGui::BeginChild(recent_connection_sub_window_name.c_str(),
-                      ImVec2(recent_connection_sub_container_width,
-                             recent_connection_sub_container_height),
-                      ImGuiChildFlags_None,
-                      ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-                          ImGuiWindowFlags_NoBringToFrontOnFocus);
-    std::string connection_info = it.first;
-
-    // remote id length is 9
-    // password length is 6
-    // connection_info -> remote_id + 'Y' + host_name + '@' + password
-    //                 -> remote_id + 'N' + host_name
-    bool invalid_connection_info = false;
-    if (connection_info.size() > 9 && 'Y' == connection_info[9] &&
-        connection_info.size() >= 16) {
-      size_t pos_y = connection_info.find('Y');
-      size_t pos_at = connection_info.find('@');
-
-      if (pos_y == std::string::npos || pos_at == std::string::npos ||
-          pos_y >= pos_at) {
-        LOG_ERROR("Invalid filename");
-        invalid_connection_info = true;
-      } else {
-        it.second.remote_id = connection_info.substr(0, pos_y);
-        it.second.remote_host_name =
-            connection_info.substr(pos_y + 1, pos_at - pos_y - 1);
-        it.second.password = connection_info.substr(pos_at + 1);
-        it.second.remember_password = true;
-      }
-    } else if (connection_info.size() > 9 && 'N' == connection_info[9] &&
-               connection_info.size() >= 10) {
-      size_t pos_n = connection_info.find('N');
-
-      if (pos_n == std::string::npos) {
-        LOG_ERROR("Invalid filename");
-        invalid_connection_info = true;
-      } else {
-        it.second.remote_id = connection_info.substr(0, pos_n);
-        it.second.remote_host_name = connection_info.substr(pos_n + 1);
-        it.second.password = "";
-        it.second.remember_password = false;
-      }
-    } else {
-      invalid_connection_info = true;
-    }
-
-    if (invalid_connection_info) {
-      it.second.remote_id = connection_info.substr(
-          0, std::min<size_t>(connection_info.size(), 9));
-      it.second.remote_host_name = "unknown";
-      it.second.password = "";
-      it.second.remember_password = false;
-    }
-
-    std::string display_name = settings_.RecentConnectionDisplayName(it.second);
-    bool online = device_presence_cache_.IsOnline(it.second.remote_id);
-
-    ImVec2 image_pos =
-        ImVec2(ImGui::GetCursorPosX() + recent_connection_image_width * 0.05f,
-               ImGui::GetCursorPosY() + recent_connection_image_height * 0.08f);
-
-    ImGui::SetCursorPos(image_pos);
-    ImVec2 image_screen_pos = ImGui::GetCursorScreenPos();
-    ImGui::Image(
-        (ImTextureID)(intptr_t)it.second.texture,
-        ImVec2(recent_connection_image_width, recent_connection_image_height));
-
-    const bool image_item_hovered = ImGui::IsItemHovered();
-
-    ImVec2 card_screen_min = image_screen_pos;
-    ImVec2 card_screen_max =
-        ImVec2(image_screen_pos.x + recent_connection_image_width,
-               image_screen_pos.y + recent_connection_image_height +
-                   recent_connection_footer_height);
-
-    const bool card_hovered =
-        ImGui::IsMouseHoveringRect(card_screen_min, card_screen_max, true);
-
-    const float recent_connection_toolbar_width =
-        3.0f * recent_connection_button_width;
-
-    const float recent_connection_toolbar_padding =
-        recent_connection_image_width * 0.025f;
-
-    const ImVec2 toolbar_pos = ImVec2(
-        image_pos.x + recent_connection_image_width -
-            recent_connection_toolbar_width - recent_connection_toolbar_padding,
-        image_pos.y + recent_connection_image_height +
-            (recent_connection_footer_height -
-             recent_connection_button_height) *
-                0.5f);
-
-    const ImVec2 toolbar_screen_pos = ImVec2(
-        image_screen_pos.x + recent_connection_image_width -
-            recent_connection_toolbar_width - recent_connection_toolbar_padding,
-        image_screen_pos.y + recent_connection_image_height +
-            (recent_connection_footer_height -
-             recent_connection_button_height) *
-                0.5f);
-
-    const ImVec2 toolbar_screen_end =
-        ImVec2(toolbar_screen_pos.x + recent_connection_toolbar_width,
-               toolbar_screen_pos.y + recent_connection_button_height);
-
-    const bool toolbar_hovered =
-        card_hovered && ImGui::IsMouseHoveringRect(toolbar_screen_pos,
-                                                   toolbar_screen_end, true);
-
-    const bool show_image_tooltip = image_item_hovered && !toolbar_hovered;
-
-    if (show_image_tooltip) {
-      const ImVec2 mouse_pos = ImGui::GetMousePos();
-      const bool place_tooltip_on_left = mouse_pos.x > io.DisplaySize.x * 0.7f;
-      ImGui::SetNextWindowPos(
-          ImVec2(mouse_pos.x + (place_tooltip_on_left ? -12.0f : 12.0f),
-                 mouse_pos.y - 8.0f),
-          ImGuiCond_Always, ImVec2(place_tooltip_on_left ? 1.0f : 0.0f, 1.0f));
-      ImGui::BeginTooltip();
-
-      ImGui::SetWindowFontScale(0.4f);
-
-      ImGui::Text(
-          "%s: %s",
-          localization::device_name[localization_language_index_].c_str(),
-          display_name.c_str());
-
-      if (!it.second.remote_host_name.empty() &&
-          it.second.remote_host_name != display_name) {
-        ImGui::Text("%s", it.second.remote_host_name.c_str());
-      }
-
-      ImGui::Text("%s: %s",
-                  localization::remote_id[localization_language_index_].c_str(),
-                  it.second.remote_id.c_str());
-
-      ImGui::Text("%s",
-                  (online ? localization::online[localization_language_index_]
-                          : localization::offline[localization_language_index_])
-                      .c_str());
-
-      ImGui::SetWindowFontScale(1.0f);
-
-      ImGui::EndTooltip();
-    }
-
-    ImDrawList *draw_list = ImGui::GetWindowDrawList();
-
-    // connection name footer
-    {
-      ImVec2 footer_pos =
-          ImVec2(image_pos.x, image_pos.y + recent_connection_image_height);
-
-      ImVec2 footer_screen_pos =
-          ImVec2(image_screen_pos.x,
-                 image_screen_pos.y + recent_connection_image_height);
-
-      ImVec2 footer_screen_end =
-          ImVec2(footer_screen_pos.x + recent_connection_name_width,
-                 footer_screen_pos.y + recent_connection_footer_height);
-
-      float footer_rounding = recent_connection_footer_height * 0.16f;
-
-      draw_list->AddRectFilled(footer_screen_pos, footer_screen_end,
-                               IM_COL32(0, 0, 0, 40), footer_rounding,
-                               ImDrawFlags_RoundCornersBottom);
-
-      const float status_left_margin = recent_connection_footer_height * 0.22f;
-      const float status_gap = recent_connection_footer_height * 0.20f;
-      const float dot_radius = recent_connection_footer_height * 0.18f;
-
-      const ImVec2 dot_center(
-          footer_screen_pos.x + status_left_margin + dot_radius,
-          footer_screen_pos.y + recent_connection_footer_height * 0.5f);
-      const ImU32 dot_color =
-          online ? IM_COL32(34, 197, 94, 255) : IM_COL32(156, 163, 175, 255);
-
-      // Layered halo simulates a radial gradient glow for the online state.
-      if (online) {
-        const float halo_radius = dot_radius * 2.2f;
-        const int halo_layers = 8;
-        for (int i = halo_layers; i > 0; --i) {
-          const float t = static_cast<float>(i) / halo_layers;
-          const float r = dot_radius + (halo_radius - dot_radius) * t;
-          const int alpha = static_cast<int>(14.0f * (1.0f - t) + 4.0f);
-          draw_list->AddCircleFilled(dot_center, r,
-                                     IM_COL32(74, 222, 128, alpha));
-        }
-      }
-      draw_list->AddCircleFilled(dot_center, dot_radius, dot_color);
-
-      const float status_block_end_x = dot_center.x + dot_radius;
-
-      ImVec2 text_min =
-          ImVec2(status_block_end_x + status_gap, footer_screen_pos.y);
-
-      ImVec2 text_max =
-          ImVec2(card_hovered ? toolbar_screen_pos.x - status_gap
-                              : footer_screen_end.x -
-                                    recent_connection_name_width * 0.05f,
-                 footer_screen_end.y);
-
-      ImGui::SetWindowFontScale(0.52f);
-
-      ImGui::RenderTextClipped(text_min, text_max, display_name.c_str(),
-                               nullptr, nullptr, ImVec2(0.0f, 0.5f));
-
-      ImGui::SetWindowFontScale(1.0f);
-    }
-
-    // Toolbar / three buttons, right-aligned in the connection name footer.
-    if (card_hovered) {
-      float toolbar_rounding = recent_connection_button_height * 0.22f;
-
-      draw_list->AddRectFilled(
-          ImVec2(toolbar_screen_pos.x, toolbar_screen_pos.y + 1.0f),
-          ImVec2(toolbar_screen_end.x, toolbar_screen_end.y + 1.0f),
-          IM_COL32(0, 0, 0, 70), toolbar_rounding);
-
-      draw_list->AddRectFilled(toolbar_screen_pos, toolbar_screen_end,
-                               IM_COL32(96, 100, 106, 140), toolbar_rounding);
-
-      draw_list->AddRect(toolbar_screen_pos, toolbar_screen_end,
-                         IM_COL32(255, 255, 255, 48), toolbar_rounding);
-
-      ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, toolbar_rounding);
-      ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.0f);
-      ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(0, 0));
-
-      ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
-      ImGui::PushStyleColor(ImGuiCol_ButtonHovered,
-                            ImVec4(1.0f, 1.0f, 1.0f, 0.18f));
-      ImGui::PushStyleColor(ImGuiCol_ButtonActive,
-                            ImVec4(0.35f, 0.55f, 0.95f, 0.45f));
-      ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 1.0f, 1.0f, 0.95f));
-
-      ImGui::SetWindowFontScale(0.5f);
-
-      // edit alias button
-      {
-        ImGui::SetCursorPos(toolbar_pos);
-
-        std::string edit = ICON_FA_PEN;
-        std::string recent_connection_edit_button_name =
-            edit + "##RecentConnectionAlias" + it.first;
-
-        if (ImGui::Button(recent_connection_edit_button_name.c_str(),
-                          ImVec2(recent_connection_button_width,
-                                 recent_connection_button_height))) {
-          settings_.BeginEditRecentConnectionAlias(it.second);
-        }
-
-        if (ImGui::IsItemHovered()) {
-          SetDarkTextTooltip(
-              localization::connection_alias[localization_language_index_]
-                  .c_str());
-        }
-      }
-
-      // trash button
-      {
-        ImVec2 trash_can_button_pos = ImVec2(
-            toolbar_pos.x + recent_connection_button_width, toolbar_pos.y);
-
-        ImGui::SetCursorPos(trash_can_button_pos);
-
-        std::string trash_can = ICON_FA_TRASH_CAN;
-        std::string recent_connection_delete_button_name =
-            trash_can + "##RecentConnectionDelete" + it.first;
-
-        if (ImGui::Button(recent_connection_delete_button_name.c_str(),
-                          ImVec2(recent_connection_button_width,
-                                 recent_connection_button_height))) {
-          show_confirm_delete_connection_ = true;
-          delete_connection_name_ = it.first;
-        }
-        if (ImGui::IsItemHovered()) {
-          SetDarkTextTooltip(
-              localization::delete_connection[localization_language_index_]
-                  .c_str());
-        }
-      }
-
-      // connect button
-      {
-        ImVec2 connect_button_pos = ImVec2(
-            toolbar_pos.x + 2 * recent_connection_button_width, toolbar_pos.y);
-
-        ImGui::SetCursorPos(connect_button_pos);
-
-        std::string connect = ICON_FA_ARROW_RIGHT_LONG;
-        std::string connect_to_this_connection_button_name =
-            connect + "##ConnectionTo" + it.first;
-
-        if (ImGui::Button(connect_to_this_connection_button_name.c_str(),
-                          ImVec2(recent_connection_button_width,
-                                 recent_connection_button_height))) {
-          ConnectTo(it.second.remote_id, it.second.password.c_str(),
-                    it.second.remember_password);
-        }
-        if (ImGui::IsItemHovered()) {
-          SetDarkTextTooltip(localization::connect_to_this_connection
-                                 [localization_language_index_]
-                                     .c_str());
-        }
-      }
-
-      ImGui::SetWindowFontScale(1.0f);
-
-      ImGui::PopStyleColor(4);
-      ImGui::PopStyleVar(3);
-    }
-
-    if (delete_connection_ && delete_connection_name_ == it.first) {
-      if (!thumbnail_->DeleteThumbnail(it.first)) {
-        settings_.EraseRecentConnectionAlias(it.second.remote_id);
-        settings_.SaveRecentConnectionAliases();
-        reload_recent_connections_ = true;
-        delete_connection_ = false;
-      }
-    }
-
-    ImGui::EndChild();
-
-    if (count != recent_connections_count - 1) {
-      ImVec2 line_start =
-          ImVec2(image_screen_pos.x + recent_connection_image_width * 1.18f,
-                 image_screen_pos.y);
-      ImVec2 line_end =
-          ImVec2(image_screen_pos.x + recent_connection_image_width * 1.18f,
-                 image_screen_pos.y + recent_connection_image_height +
-                     recent_connection_footer_height);
-      ImGui::GetWindowDrawList()->AddLine(line_start, line_end,
-                                          IM_COL32(0, 0, 0, 122), 1.0f);
-    }
-
-    count++;
-    ImGui::SameLine(0, count != recent_connections_count
-                           ? recent_connection_spacing
-                           : 0.0f);
-  }
-
-  ImGui::EndChild();
-
-  if (show_confirm_delete_connection_) {
-    ConfirmDeleteConnection();
-  }
-  if (show_edit_connection_alias_window_) {
-    EditRecentConnectionAliasWindow();
-  }
-  if (show_offline_warning_window_) {
-    OfflineWarningWindow();
-  }
-
-  return 0;
-}
-
-int GuiApplication::ConfirmDeleteConnection() {
-  ImGuiIO &io = ImGui::GetIO();
-  ImGui::SetNextWindowPos(
-      ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
-  ImGui::SetNextWindowSize(
-      ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
-
-  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f);
-  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_);
-
-  ImGui::Begin("ConfirmDeleteConnectionWindow", nullptr,
-               ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-                   ImGuiWindowFlags_NoSavedSettings);
-  ImGui::PopStyleVar(2);
-  ImGui::PopStyleColor();
-
-  auto connection_status_window_width = ImGui::GetWindowSize().x;
-  auto connection_status_window_height = ImGui::GetWindowSize().y;
-
-  std::string text =
-      localization::confirm_delete_connection[localization_language_index_];
-  ImGui::SetCursorPosX(connection_status_window_width * 0.33f);
-  ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
-
-  // ok
-  ImGui::SetWindowFontScale(0.5f);
-  if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
-      ImGui::IsKeyPressed(ImGuiKey_Enter)) {
-    delete_connection_ = true;
-    show_confirm_delete_connection_ = false;
-  }
-
-  ImGui::SameLine();
-  // cancel
-  if (ImGui::Button(
-          localization::cancel[localization_language_index_].c_str()) ||
-      ImGui::IsKeyPressed(ImGuiKey_Escape)) {
-    delete_connection_ = false;
-    show_confirm_delete_connection_ = false;
-  }
-
-  auto text_width = ImGui::CalcTextSize(text.c_str()).x;
-  ImGui::SetCursorPosX((connection_status_window_width - text_width) * 0.5f);
-  ImGui::SetCursorPosY(connection_status_window_height * 0.2f);
-  ImGui::Text("%s", text.c_str());
-  ImGui::SetWindowFontScale(1.0f);
-
-  ImGui::End();
-  ImGui::PopStyleVar();
-  return 0;
-}
-
-int GuiApplication::EditRecentConnectionAliasWindow() {
-  ImGuiIO &io = ImGui::GetIO();
-  ImGui::SetNextWindowPos(
-      ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
-  ImGui::SetNextWindowSize(
-      ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
-
-  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f);
-  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_);
-
-  ImGui::Begin("EditRecentConnectionAliasWindow", nullptr,
-               ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-                   ImGuiWindowFlags_NoSavedSettings);
-  ImGui::PopStyleVar(2);
-  ImGui::PopStyleColor();
-
-  auto window_width = ImGui::GetWindowSize().x;
-  auto window_height = ImGui::GetWindowSize().y;
-  std::string text =
-      localization::input_connection_alias[localization_language_index_];
-
-  ImGui::SetWindowFontScale(0.5f);
-  auto text_width = ImGui::CalcTextSize(text.c_str()).x;
-  ImGui::SetCursorPosX((window_width - text_width) * 0.5f);
-  ImGui::SetCursorPosY(window_height * 0.2f);
-  ImGui::Text("%s", text.c_str());
-
-  ImGui::SetCursorPosX(window_width * 0.2f);
-  ImGui::SetCursorPosY(window_height * 0.4f);
-  ImGui::SetNextItemWidth(window_width * 0.6f);
-  ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-
-  if (focus_on_input_widget_) {
-    ImGui::SetKeyboardFocusHere();
-    focus_on_input_widget_ = false;
-  }
-
-  bool enter_pressed =
-      ImGui::InputText("##recent_connection_alias", edit_connection_alias_,
-                       IM_ARRAYSIZE(edit_connection_alias_),
-                       ImGuiInputTextFlags_EnterReturnsTrue);
-
-  ImGui::PopStyleVar();
-
-  ImGui::SetCursorPosX(window_width * 0.315f);
-  ImGui::SetCursorPosY(window_height * 0.75f);
-
-  if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
-      enter_pressed) {
-    std::string alias = TrimConnectionAlias(edit_connection_alias_);
-    if (alias.empty()) {
-      settings_.EraseRecentConnectionAlias(edit_connection_alias_remote_id_);
-    } else {
-      settings_.SetRecentConnectionAlias(edit_connection_alias_remote_id_,
-                                         alias);
-    }
-
-    settings_.SaveRecentConnectionAliases();
-    show_edit_connection_alias_window_ = false;
-    focus_on_input_widget_ = true;
-    memset(edit_connection_alias_, 0, sizeof(edit_connection_alias_));
-    edit_connection_alias_remote_id_.clear();
-  }
-
-  ImGui::SameLine();
-
-  if (ImGui::Button(
-          localization::cancel[localization_language_index_].c_str()) ||
-      ImGui::IsKeyPressed(ImGuiKey_Escape)) {
-    show_edit_connection_alias_window_ = false;
-    focus_on_input_widget_ = true;
-    memset(edit_connection_alias_, 0, sizeof(edit_connection_alias_));
-    edit_connection_alias_remote_id_.clear();
-  }
-
-  ImGui::SetWindowFontScale(1.0f);
-
-  ImGui::End();
-  ImGui::PopStyleVar();
-  return 0;
-}
-
-int GuiApplication::OfflineWarningWindow() {
-  ImGuiIO &io = ImGui::GetIO();
-  ImGui::SetNextWindowPos(
-      ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
-  ImGui::SetNextWindowSize(
-      ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
-
-  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f);
-  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_);
-
-  ImGui::Begin("OfflineWarningWindow", nullptr,
-               ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-                   ImGuiWindowFlags_NoSavedSettings);
-  ImGui::PopStyleVar(2);
-  ImGui::PopStyleColor();
-
-  auto window_width = ImGui::GetWindowSize().x;
-  auto window_height = ImGui::GetWindowSize().y;
-
-  ImGui::SetCursorPosX(window_width * 0.43f);
-  ImGui::SetCursorPosY(window_height * 0.67f);
-  ImGui::SetWindowFontScale(0.5f);
-  if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
-      ImGui::IsKeyPressed(ImGuiKey_Enter) ||
-      ImGui::IsKeyPressed(ImGuiKey_Escape)) {
-    show_offline_warning_window_ = false;
-  }
-
-  auto text_width = ImGui::CalcTextSize(offline_warning_text_.c_str()).x;
-  ImGui::SetCursorPosX((window_width - text_width) * 0.5f);
-  ImGui::SetCursorPosY(window_height * 0.2f);
-  ImGui::Text("%s", offline_warning_text_.c_str());
-  ImGui::SetWindowFontScale(1.0f);
-
-  ImGui::End();
-  ImGui::PopStyleVar();
-  return 0;
-}
-} // namespace crossdesk
@@ -1,167 +0,0 @@
-#include "application/gui_application.h"
-#include "layout_relative.h"
-#include "localization.h"
-#include "rd_log.h"
-
-namespace crossdesk {
-
-static int InputTextCallback(ImGuiInputTextCallbackData *data);
-
-int GuiApplication::RemoteWindow() {
-  ImGuiIO &io = ImGui::GetIO();
-  float remote_window_width = io.DisplaySize.x * 0.5f;
-  float remote_window_height =
-      io.DisplaySize.y * (1 - TITLE_BAR_HEIGHT - STATUS_BAR_HEIGHT);
-  float remote_window_arrow_button_width = io.DisplaySize.x * 0.1f;
-  float remote_window_arrow_button_height = io.DisplaySize.y * 0.078f;
-
-  ImGui::SetNextWindowPos(
-      ImVec2(io.DisplaySize.x * 0.5f, io.DisplaySize.y * TITLE_BAR_HEIGHT),
-      ImGuiCond_Always);
-  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f);
-
-  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(0, 0, 0, 0));
-  ImGui::BeginChild("RemoteDesktopWindow",
-                    ImVec2(remote_window_width, remote_window_height),
-                    ImGuiChildFlags_None,
-                    ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-                        ImGuiWindowFlags_NoBringToFrontOnFocus);
-  ImGui::PopStyleColor();
-
-  ImGui::SetCursorPos(
-      ImVec2(io.DisplaySize.x * 0.057f, io.DisplaySize.y * 0.02f));
-
-  ImGui::SetWindowFontScale(0.9f);
-  ImGui::TextColored(
-      ImVec4(0.0f, 0.0f, 0.0f, 0.5f), "%s",
-      localization::remote_desktop[localization_language_index_].c_str());
-
-  ImGui::Spacing();
-  {
-    ImGui::SetNextWindowPos(
-        ImVec2(io.DisplaySize.x * 0.557f, io.DisplaySize.y * 0.15f),
-        ImGuiCond_Always);
-    ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(239.0f / 255, 240.0f / 255,
-                                                   242.0f / 255, 1.0f));
-    ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 10.0f);
-
-    ImGui::BeginChild(
-        "RemoteDesktopWindow_1",
-        ImVec2(remote_window_width * 0.8f, remote_window_height * 0.43f),
-        ImGuiChildFlags_Borders,
-        ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-            ImGuiWindowFlags_NoBringToFrontOnFocus);
-    ImGui::PopStyleVar();
-    ImGui::PopStyleColor();
-    {
-      ImGui::SetWindowFontScale(0.8f);
-      ImGui::Text(
-          "%s", localization::remote_id[localization_language_index_].c_str());
-
-      ImGui::Spacing();
-      ImGui::SetNextItemWidth(io.DisplaySize.x * 0.25f);
-      ImGui::SetWindowFontScale(1.0f);
-      ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-      if (re_enter_remote_id_) {
-        ImGui::SetKeyboardFocusHere();
-        re_enter_remote_id_ = false;
-        memset(remote_id_display_, 0, sizeof(remote_id_display_));
-      }
-      bool enter_pressed = ImGui::InputText(
-          "##remote_id_", remote_id_display_, IM_ARRAYSIZE(remote_id_display_),
-          ImGuiInputTextFlags_CharsDecimal |
-              ImGuiInputTextFlags_EnterReturnsTrue |
-              ImGuiInputTextFlags_CallbackEdit,
-          InputTextCallback);
-
-      ImGui::PopStyleVar();
-      ImGui::SameLine();
-
-      std::string remote_id = remote_id_display_;
-      remote_id.erase(remove_if(remote_id.begin(), remote_id.end(),
-                                static_cast<int (*)(int)>(&isspace)),
-                      remote_id.end());
-      if (ImGui::Button(ICON_FA_ARROW_RIGHT_LONG,
-                        ImVec2(remote_window_arrow_button_width,
-                               remote_window_arrow_button_height)) ||
-          enter_pressed) {
-        connect_button_pressed_ = true;
-        bool found = false;
-        std::string target_remote_id;
-        std::string target_password;
-        bool should_connect = false;
-        bool already_connected = false;
-
-        for (auto &[id, props] : recent_connections_) {
-          if (id.find(remote_id) != std::string::npos) {
-            found = true;
-            target_remote_id = props.remote_id;
-            target_password = props.password;
-            {
-              // std::shared_lock lock(remote_sessions_mutex_);
-              if (remote_sessions_.find(remote_id) !=
-                  remote_sessions_.end()) {
-                if (!remote_sessions_[remote_id]->connection_established_) {
-                  should_connect = true;
-                } else {
-                  already_connected = true;
-                }
-              } else {
-                should_connect = true;
-              }
-            }
-
-            if (should_connect) {
-              ConnectTo(target_remote_id, target_password.c_str(), false);
-            } else if (already_connected) {
-              LOG_INFO("Already connected to [{}]", remote_id);
-            }
-            break;
-          }
-        }
-        if (!found) {
-          ConnectTo(remote_id, "", false);
-        }
-      }
-
-      // check every 1 second for rejoin
-      if (need_to_rejoin_) {
-        auto now = std::chrono::steady_clock::now();
-        auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
-                           now - last_rejoin_check_time_)
-                           .count();
-
-        if (elapsed >= 1000) {
-          last_rejoin_check_time_ = now;
-          need_to_rejoin_ = false;
-          // std::shared_lock lock(remote_sessions_mutex_);
-          for (const auto &[_, props] : remote_sessions_) {
-            if (props->rejoin_) {
-              ConnectTo(props->remote_id_, props->remote_password_,
-                        props->remember_password_);
-            }
-          }
-        }
-      }
-    }
-    ImGui::EndChild();
-  }
-  ImGui::EndChild();
-  ImGui::PopStyleVar();
-
-  return 0;
-}
-
-static int InputTextCallback(ImGuiInputTextCallbackData *data) {
-  if (data->BufTextLen > 3 && data->Buf[3] != ' ') {
-    data->InsertChars(3, " ");
-  }
-
-  if (data->BufTextLen > 7 && data->Buf[7] != ' ') {
-    data->InsertChars(7, " ");
-  }
-
-  return 0;
-}
-
-} // namespace crossdesk
@@ -1,514 +0,0 @@
-#include <algorithm>
-
-#include <remote_action.h>
-#include <atomic>
-#include <chrono>
-#include <filesystem>
-#include <fstream>
-#include <thread>
-#include <vector>
-
-#include "application/gui_application.h"
-#include "file_transfer.h"
-#include "layout.h"
-#include "localization.h"
-#include "rd_log.h"
-#include "tinyfiledialogs.h"
-
-namespace crossdesk {
-
-namespace {
-
-void ShowControlBarTooltip(const std::string &text) {
-  if (!ImGui::IsItemHovered() || text.empty()) {
-    return;
-  }
-
-  ImGui::BeginTooltip();
-  ImGui::SetWindowFontScale(0.5f);
-  ImGui::Text("%s", text.c_str());
-  ImGui::SetWindowFontScale(1.0f);
-  ImGui::EndTooltip();
-}
-
-} // namespace
-
-int CountDigits(int number) {
-  if (number == 0)
-    return 1;
-  return (int)std::floor(std::log10(std::abs(number))) + 1;
-}
-
-int BitrateDisplay(int bitrate) {
-  int num_of_digits = CountDigits(bitrate);
-  if (num_of_digits <= 3) {
-    ImGui::Text("%d bps", bitrate);
-  } else if (num_of_digits > 3 && num_of_digits <= 6) {
-    ImGui::Text("%d kbps", bitrate / 1000);
-  } else {
-    ImGui::Text("%.1f mbps", bitrate / 1000000.0f);
-  }
-  return 0;
-}
-
-int LossRateDisplay(float loss_rate) {
-  if (loss_rate < 0.01f) {
-    ImGui::Text("0%%");
-  } else {
-    ImGui::Text("%.0f%%", loss_rate * 100);
-  }
-  return 0;
-}
-
-std::string GuiApplication::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 GuiApplication::ControlBar(
-    std::shared_ptr<RemoteSession> &props) {
-  float button_width = title_bar_height_ * 0.8f;
-  float button_height = title_bar_height_ * 0.8f;
-  float line_padding = title_bar_height_ * 0.12f;
-  float line_thickness = title_bar_height_ * 0.07f;
-
-  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f);
-  if (props->control_bar_expand_) {
-    ImGui::SetCursorPosX(props->is_control_bar_in_left_
-                             ? props->control_window_width_ * 0.03f
-                             : props->control_window_width_ * 0.17f);
-
-    ImDrawList *draw_list = ImGui::GetWindowDrawList();
-    if (!props->is_control_bar_in_left_) {
-      draw_list->AddLine(
-          ImVec2(ImGui::GetCursorScreenPos().x - button_height * 0.5f,
-                 ImGui::GetCursorScreenPos().y + button_height * 0.2f),
-          ImVec2(ImGui::GetCursorScreenPos().x - button_height * 0.5f,
-                 ImGui::GetCursorScreenPos().y + button_height * 0.8f),
-          IM_COL32(178, 178, 178, 255), 2.0f);
-    }
-
-    std::string display = ICON_FA_DISPLAY;
-    ImGui::SetWindowFontScale(0.5f);
-    if (ImGui::Button(display.c_str(), ImVec2(button_width, button_height))) {
-      ImGui::OpenPopup("display");
-    }
-
-    ImVec2 btn_min = ImGui::GetItemRectMin();
-    ImVec2 btn_size_actual = ImGui::GetItemRectSize();
-    ShowControlBarTooltip(
-        localization::select_display[localization_language_index_]);
-
-    props->display_selectable_hovered_ = false;
-    if (ImGui::BeginPopup("display")) {
-      ImGui::SetWindowFontScale(0.5f);
-      for (int i = 0; i < props->display_info_list_.size(); i++) {
-        const std::string display_label = localization::FormatDisplayLabel(
-            static_cast<size_t>(i), props->display_info_list_[i].name,
-            localization_language_index_);
-        if (ImGui::Selectable(display_label.c_str())) {
-          props->selected_display_ = i;
-
-          RemoteAction remote_action;
-          remote_action.type = ControlType::display_id;
-          remote_action.d = i;
-          if (props->connection_status_.load() == ConnectionStatus::Connected) {
-            std::string msg = remote_action.to_json();
-            SendReliableDataFrame(props->peer_, msg.c_str(), msg.size(),
-                                  props->control_data_label_.c_str());
-          }
-        }
-      }
-      props->display_selectable_hovered_ =
-          ImGui::IsWindowHovered(ImGuiHoveredFlags_RootAndChildWindows);
-      ImGui::EndPopup();
-    }
-
-    ImGui::SetWindowFontScale(0.35f);
-    ImVec2 text_size = ImGui::CalcTextSize(
-        std::to_string(props->selected_display_ + 1).c_str());
-    ImVec2 text_pos =
-        ImVec2(btn_min.x + (btn_size_actual.x - text_size.x) * 0.55f,
-               btn_min.y + (btn_size_actual.y - text_size.y) * 0.33f);
-    ImGui::GetWindowDrawList()->AddText(
-        text_pos, IM_COL32(0, 0, 0, 255),
-        std::to_string(props->selected_display_ + 1).c_str());
-
-    auto send_service_command = [&](ServiceCommandFlag flag,
-                                    const char *log_action) {
-      if (props->connection_status_.load() == ConnectionStatus::Connected &&
-          props->peer_) {
-        RemoteAction remote_action;
-        remote_action.type = ControlType::service_command;
-        remote_action.c.flag = flag;
-        std::string msg = remote_action.to_json();
-        int ret = SendReliableDataFrame(props->peer_, msg.c_str(), msg.size(),
-                                        props->control_data_label_.c_str());
-        if (ret != 0) {
-          LOG_WARN("Send {} command failed, remote_id={}, ret={}", log_action,
-                   props->remote_id_, ret);
-        }
-      }
-    };
-
-    ImGui::SameLine();
-    std::string shortcut = ICON_FA_KEYBOARD;
-    ImGui::SetWindowFontScale(0.5f);
-    if (ImGui::Button(shortcut.c_str(), ImVec2(button_width, button_height))) {
-      ImGui::OpenPopup("shortcut");
-    }
-    ShowControlBarTooltip(
-        localization::send_shortcut[localization_language_index_]);
-
-    props->shortcut_selectable_hovered_ = false;
-    if (ImGui::BeginPopup("shortcut")) {
-      ImGui::SetWindowFontScale(0.5f);
-      std::string sas_label = "Ctrl+Alt+Del";
-      std::string lock_label = "Win+L";
-      if (ImGui::Selectable(sas_label.c_str())) {
-        send_service_command(ServiceCommandFlag::send_sas, "SAS");
-      }
-      if (ImGui::Selectable(lock_label.c_str())) {
-        send_service_command(ServiceCommandFlag::lock_workstation,
-                             "remote lock");
-      }
-      props->shortcut_selectable_hovered_ =
-          ImGui::IsWindowHovered(ImGuiHoveredFlags_RootAndChildWindows);
-      ImGui::SetWindowFontScale(1.0f);
-      ImGui::EndPopup();
-    }
-
-    ImGui::SameLine();
-    float mouse_x = ImGui::GetCursorScreenPos().x;
-    float mouse_y = ImGui::GetCursorScreenPos().y;
-    float disable_mouse_x = mouse_x + line_padding;
-    float disable_mouse_y = mouse_y + line_padding;
-    std::string mouse = ICON_FA_COMPUTER_MOUSE;
-    ImGui::SetWindowFontScale(0.5f);
-    if (ImGui::Button(mouse.c_str(), ImVec2(button_width, button_height))) {
-      if (props->connection_established_) {
-        start_keyboard_capturer_ = !start_keyboard_capturer_;
-        props->control_mouse_ = !props->control_mouse_;
-        props->enable_mouse_control_ = !props->enable_mouse_control_;
-        props->mouse_control_button_label_ =
-            props->enable_mouse_control_
-                ? localization::release_mouse[localization_language_index_]
-                : localization::control_mouse[localization_language_index_];
-      }
-    }
-    const bool mouse_button_hovered = ImGui::IsItemHovered();
-    const std::string mouse_tooltip =
-        props->enable_mouse_control_
-            ? localization::release_mouse[localization_language_index_]
-            : localization::control_mouse[localization_language_index_];
-    ShowControlBarTooltip(mouse_tooltip);
-
-    if (!props->enable_mouse_control_) {
-      draw_list->AddLine(ImVec2(disable_mouse_x, disable_mouse_y),
-                         ImVec2(mouse_x + button_width - line_padding,
-                                mouse_y + button_height - line_padding),
-                         IM_COL32(0, 0, 0, 255), line_thickness);
-      draw_list->AddLine(
-          ImVec2(disable_mouse_x - line_thickness * 0.7f,
-                 disable_mouse_y + line_thickness * 0.7f),
-          ImVec2(mouse_x + button_width - line_padding - line_thickness * 0.7f,
-                 mouse_y + button_height - line_padding +
-                     line_thickness * 0.7f),
-          mouse_button_hovered ? IM_COL32(66, 150, 250, 255)
-                               : IM_COL32(179, 213, 253, 255),
-          line_thickness);
-    }
-
-    ImGui::SameLine();
-    // audio capture button
-    float audio_x = ImGui::GetCursorScreenPos().x;
-    float audio_y = ImGui::GetCursorScreenPos().y;
-    float disable_audio_x = audio_x + line_padding;
-    float disable_audio_y = audio_y + line_padding;
-
-    std::string audio = props->audio_capture_button_pressed_
-                            ? ICON_FA_VOLUME_HIGH
-                            : ICON_FA_VOLUME_HIGH;
-    ImGui::SetWindowFontScale(0.5f);
-    if (ImGui::Button(audio.c_str(), ImVec2(button_width, button_height))) {
-      if (props->connection_established_) {
-        props->audio_capture_button_pressed_ =
-            !props->audio_capture_button_pressed_;
-        props->audio_capture_button_label_ =
-            props->audio_capture_button_pressed_
-                ? localization::audio_capture[localization_language_index_]
-                : localization::mute[localization_language_index_];
-
-        RemoteAction remote_action;
-        remote_action.type = ControlType::audio_capture;
-        remote_action.a = props->audio_capture_button_pressed_;
-        std::string msg = remote_action.to_json();
-        SendReliableDataFrame(props->peer_, msg.c_str(), msg.size(),
-                              props->control_data_label_.c_str());
-      }
-    }
-    const bool audio_button_hovered = ImGui::IsItemHovered();
-    const std::string audio_tooltip =
-        props->audio_capture_button_pressed_
-            ? localization::mute[localization_language_index_]
-            : localization::audio_capture[localization_language_index_];
-    ShowControlBarTooltip(audio_tooltip);
-
-    if (!props->audio_capture_button_pressed_) {
-      draw_list->AddLine(ImVec2(disable_audio_x, disable_audio_y),
-                         ImVec2(audio_x + button_width - line_padding,
-                                audio_y + button_height - line_padding),
-                         IM_COL32(0, 0, 0, 255), line_thickness);
-      draw_list->AddLine(
-          ImVec2(disable_audio_x - line_thickness * 0.7f,
-                 disable_audio_y + line_thickness * 0.7f),
-          ImVec2(audio_x + button_width - line_padding - line_thickness * 0.7f,
-                 audio_y + button_height - line_padding +
-                     line_thickness * 0.7f),
-          audio_button_hovered ? IM_COL32(66, 150, 250, 255)
-                               : IM_COL32(179, 213, 253, 255),
-          line_thickness);
-    }
-
-    ImGui::SameLine();
-    std::string open_folder = ICON_FA_FOLDER_OPEN;
-    if (ImGui::Button(open_folder.c_str(),
-                      ImVec2(button_width, button_height))) {
-      std::string title =
-          localization::select_file[localization_language_index_];
-      std::string path = OpenFileDialog(title);
-      transfers_.ProcessSelectedFile(path, props, file_label_);
-    }
-    ShowControlBarTooltip(
-        localization::select_file[localization_language_index_]);
-
-    ImGui::SameLine();
-    // net traffic stats button
-    bool button_color_style_pushed = false;
-    if (props->net_traffic_stats_button_pressed_) {
-      ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(66 / 255.0f, 150 / 255.0f,
-                                                    250 / 255.0f, 1.0f));
-      button_color_style_pushed = true;
-    }
-    std::string net_traffic_stats = ICON_FA_SIGNAL;
-    ImGui::SetWindowFontScale(0.5f);
-    if (ImGui::Button(net_traffic_stats.c_str(),
-                      ImVec2(button_width, button_height))) {
-      props->net_traffic_stats_button_pressed_ =
-          !props->net_traffic_stats_button_pressed_;
-      props->control_window_height_is_changing_ = true;
-      props->net_traffic_stats_button_pressed_time_ = ImGui::GetTime();
-      props->net_traffic_stats_button_label_ =
-          props->net_traffic_stats_button_pressed_
-              ? localization::hide_net_traffic_stats
-                    [localization_language_index_]
-              : localization::show_net_traffic_stats
-                    [localization_language_index_];
-    }
-    const std::string net_traffic_stats_tooltip =
-        props->net_traffic_stats_button_pressed_
-            ? localization::hide_net_traffic_stats[localization_language_index_]
-            : localization::show_net_traffic_stats
-                  [localization_language_index_];
-    ShowControlBarTooltip(net_traffic_stats_tooltip);
-
-    if (button_color_style_pushed) {
-      ImGui::PopStyleColor();
-      button_color_style_pushed = false;
-    }
-
-    ImGui::SameLine();
-    // fullscreen button
-    std::string fullscreen =
-        fullscreen_button_pressed_ ? ICON_FA_COMPRESS : ICON_FA_EXPAND;
-    ImGui::SetWindowFontScale(0.5f);
-    if (ImGui::Button(fullscreen.c_str(),
-                      ImVec2(button_width, button_height))) {
-      fullscreen_button_pressed_ = !fullscreen_button_pressed_;
-      props->fullscreen_button_label_ =
-          fullscreen_button_pressed_
-              ? localization::exit_fullscreen[localization_language_index_]
-              : localization::fullscreen[localization_language_index_];
-
-      if (fullscreen_button_pressed_) {
-        SDL_SetWindowFullscreen(stream_window_, true);
-      } else {
-        SDL_SetWindowFullscreen(stream_window_, false);
-      }
-      props->reset_control_bar_pos_ = true;
-    }
-    const std::string fullscreen_tooltip =
-        fullscreen_button_pressed_
-            ? localization::exit_fullscreen[localization_language_index_]
-            : localization::fullscreen[localization_language_index_];
-    ShowControlBarTooltip(fullscreen_tooltip);
-
-    ImGui::SameLine();
-    // close button
-    std::string close_button = ICON_FA_XMARK;
-    ImGui::SetWindowFontScale(0.5f);
-    if (ImGui::Button(close_button.c_str(),
-                      ImVec2(button_width, button_height))) {
-      CloseRemoteSession(props);
-    }
-    ShowControlBarTooltip(
-        localization::disconnect[localization_language_index_]);
-
-    ImGui::SameLine();
-
-    if (props->is_control_bar_in_left_) {
-      draw_list->AddLine(
-          ImVec2(ImGui::GetCursorScreenPos().x + button_height * 0.13f,
-                 ImGui::GetCursorScreenPos().y + button_height * 0.2f),
-          ImVec2(ImGui::GetCursorScreenPos().x + button_height * 0.13f,
-                 ImGui::GetCursorScreenPos().y + button_height * 0.8f),
-          IM_COL32(178, 178, 178, 255), 2.0f);
-    }
-
-    ImGui::SameLine();
-  }
-
-  float expand_button_pos_x = props->control_bar_expand_
-                                  ? (props->is_control_bar_in_left_
-                                         ? props->control_window_width_ * 0.917f
-                                         : props->control_window_width_ * 0.03f)
-                                  : props->control_window_width_ * 0.11f;
-
-  ImGui::SetCursorPosX(expand_button_pos_x);
-
-  std::string control_bar =
-      props->control_bar_expand_
-          ? (props->is_control_bar_in_left_ ? ICON_FA_ANGLE_LEFT
-                                            : ICON_FA_ANGLE_RIGHT)
-          : (props->is_control_bar_in_left_ ? ICON_FA_ANGLE_RIGHT
-                                            : ICON_FA_ANGLE_LEFT);
-  const std::string control_bar_tooltip =
-      props->control_bar_expand_
-          ? localization::collapse_control_bar[localization_language_index_]
-          : localization::expand_control_bar[localization_language_index_];
-  if (ImGui::Button(control_bar.c_str(),
-                    ImVec2(button_height * 0.6f, button_height))) {
-    props->control_bar_expand_ = !props->control_bar_expand_;
-    props->control_bar_button_pressed_time_ = ImGui::GetTime();
-    props->control_window_width_is_changing_ = true;
-
-    if (!props->control_bar_expand_) {
-      props->control_window_height_ = props->control_window_min_height_;
-      props->net_traffic_stats_button_pressed_ = false;
-    }
-  }
-  ShowControlBarTooltip(control_bar_tooltip);
-
-  if (props->net_traffic_stats_button_pressed_ && props->control_bar_expand_) {
-    NetTrafficStats(props);
-  }
-
-  ImGui::PopStyleVar();
-
-  return 0;
-}
-
-int GuiApplication::NetTrafficStats(
-    std::shared_ptr<RemoteSession> &props) {
-  ImGui::SetCursorPos(ImVec2(props->control_window_width_ * 0.048f,
-                             props->control_window_min_height_));
-  ImGui::SetWindowFontScale(0.5f);
-  if (ImGui::BeginTable("NetTrafficStats", 4, ImGuiTableFlags_BordersH,
-                        ImVec2(props->control_window_max_width_ * 0.9f,
-                               props->control_window_max_height_ - 0.9f))) {
-    ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed);
-    ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
-    ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
-    ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed);
-
-    ImGui::TableNextColumn();
-    ImGui::Text(" ");
-    ImGui::TableNextColumn();
-    ImGui::Text("%s", localization::in[localization_language_index_].c_str());
-    ImGui::TableNextColumn();
-    ImGui::Text("%s", localization::out[localization_language_index_].c_str());
-    ImGui::TableNextColumn();
-    ImGui::Text("%s",
-                localization::loss_rate[localization_language_index_].c_str());
-
-    ImGui::TableNextColumn();
-    ImGui::Text("%s",
-                localization::video[localization_language_index_].c_str());
-    ImGui::TableNextColumn();
-    BitrateDisplay((int)props->net_traffic_stats_.video_inbound_stats.bitrate);
-    ImGui::TableNextColumn();
-    BitrateDisplay((int)props->net_traffic_stats_.video_outbound_stats.bitrate);
-    ImGui::TableNextColumn();
-    LossRateDisplay(props->net_traffic_stats_.video_inbound_stats.loss_rate);
-
-    ImGui::TableNextColumn();
-    ImGui::Text("%s",
-                localization::audio[localization_language_index_].c_str());
-    ImGui::TableNextColumn();
-    BitrateDisplay((int)props->net_traffic_stats_.audio_inbound_stats.bitrate);
-    ImGui::TableNextColumn();
-    BitrateDisplay((int)props->net_traffic_stats_.audio_outbound_stats.bitrate);
-    ImGui::TableNextColumn();
-    LossRateDisplay(props->net_traffic_stats_.audio_inbound_stats.loss_rate);
-
-    ImGui::TableNextColumn();
-    ImGui::Text("%s", localization::data[localization_language_index_].c_str());
-    ImGui::TableNextColumn();
-    BitrateDisplay((int)props->net_traffic_stats_.data_inbound_stats.bitrate);
-    ImGui::TableNextColumn();
-    BitrateDisplay((int)props->net_traffic_stats_.data_outbound_stats.bitrate);
-    ImGui::TableNextColumn();
-    LossRateDisplay(props->net_traffic_stats_.data_inbound_stats.loss_rate);
-
-    ImGui::TableNextColumn();
-    ImGui::Text("%s",
-                localization::total[localization_language_index_].c_str());
-    ImGui::TableNextColumn();
-    BitrateDisplay((int)props->net_traffic_stats_.total_inbound_stats.bitrate);
-    ImGui::TableNextColumn();
-    BitrateDisplay((int)props->net_traffic_stats_.total_outbound_stats.bitrate);
-    ImGui::TableNextColumn();
-    LossRateDisplay(props->net_traffic_stats_.total_inbound_stats.loss_rate);
-
-    ImGui::TableNextColumn();
-    ImGui::Text("FPS:");
-    ImGui::TableNextColumn();
-    ImGui::Text("%d", props->fps_);
-    ImGui::TableNextColumn();
-    ImGui::TableNextColumn();
-
-    ImGui::TableNextColumn();
-    ImGui::Text("%s:",
-                localization::resolution[localization_language_index_].c_str());
-    ImGui::TableNextColumn();
-    ImGui::Text("%dx%d", props->video_width_, props->video_height_);
-    ImGui::TableNextColumn();
-    ImGui::TableNextColumn();
-
-    ImGui::TableNextColumn();
-    ImGui::Text(
-        "%s:",
-        localization::connection_mode[localization_language_index_].c_str());
-    ImGui::TableNextColumn();
-    ImGui::Text(
-        "%s",
-        props->traversal_mode_ == 0
-            ? localization::connection_mode_direct[localization_language_index_]
-                  .c_str()
-            : localization::connection_mode_relay[localization_language_index_]
-                  .c_str());
-
-    ImGui::EndTable();
-  }
-  ImGui::SetWindowFontScale(1.0f);
-
-  return 0;
-}
-} // namespace crossdesk
@@ -1,56 +0,0 @@
-#include "application/gui_application.h"
-#include "layout_relative.h"
-#include "localization.h"
-
-namespace crossdesk {
-
-int GuiApplication::StatusBar() {
-  ImGuiIO &io = ImGui::GetIO();
-  float status_bar_width = io.DisplaySize.x;
-  float status_bar_height = io.DisplaySize.y * STATUS_BAR_HEIGHT;
-
-  static bool a, b, c, d, e;
-  ImGui::SetNextWindowPos(ImVec2(0, io.DisplaySize.y * (1 - STATUS_BAR_HEIGHT)),
-                          ImGuiCond_Always);
-
-  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
-  ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
-  ImGui::BeginChild("StatusBar", ImVec2(status_bar_width, status_bar_height),
-                    ImGuiChildFlags_Borders,
-                    ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-                        ImGuiWindowFlags_NoBringToFrontOnFocus);
-  ImGui::PopStyleColor(2);
-
-  ImVec2 dot_pos = ImVec2(status_bar_width * 0.025f,
-                          io.DisplaySize.y * (1 - STATUS_BAR_HEIGHT * 0.5f));
-  ImDrawList *draw_list = ImGui::GetWindowDrawList();
-  draw_list->AddCircleFilled(dot_pos, status_bar_height * 0.25f,
-                             ImColor(1.0f, 1.0f, 1.0f), 100);
-  bool tls_cert_error = signal_status_ == SignalStatus::SignalTlsCertError;
-  draw_list->AddCircleFilled(
-      dot_pos, status_bar_height * 0.2f,
-      tls_cert_error ? ImColor(1.0f, 0.65f, 0.0f)
-                     : ImColor(signal_connected_ ? 0.0f : 1.0f,
-                               signal_connected_ ? 1.0f : 0.0f, 0.0f),
-      100);
-
-  ImGui::SetWindowFontScale(0.6f);
-  const char *signal_status_text =
-      tls_cert_error
-          ? localization::signal_tls_cert_error[localization_language_index_]
-                .c_str()
-          : (signal_connected_
-                 ? localization::signal_connected[localization_language_index_]
-                       .c_str()
-                 : localization::signal_disconnected
-                       [localization_language_index_]
-                           .c_str());
-  draw_list->AddText(ImVec2(status_bar_width * 0.045f,
-                            io.DisplaySize.y * (1 - STATUS_BAR_HEIGHT * 0.9f)),
-                     ImColor(0.0f, 0.0f, 0.0f), signal_status_text);
-  ImGui::SetWindowFontScale(1.0f);
-
-  ImGui::EndChild();
-  return 0;
-}
-} // namespace crossdesk
@@ -1,329 +0,0 @@
-#include "application/gui_application.h"
-#include "layout_relative.h"
-#include "localization.h"
-#include "rd_log.h"
-#include "rounded_corner_button.h"
-
-constexpr double kNewVersionIconBlinkIntervalSec = 2.0;
-constexpr double kNewVersionIconBlinkOnTimeSec = 1.0;
-
-namespace crossdesk {
-
-int GuiApplication::TitleBar(bool main_window) {
-  ImGuiIO &io = ImGui::GetIO();
-  float title_bar_width = title_bar_width_;
-  float title_bar_height = title_bar_height_;
-  float title_bar_height_padding = title_bar_height_;
-  float title_bar_button_width = title_bar_button_width_;
-  float title_bar_button_height = title_bar_button_height_;
-  if (main_window) {
-    // 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;
-      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_;
-    title_bar_button_width = title_bar_button_width_;
-    title_bar_button_height = title_bar_button_height_;
-  }
-
-  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
-  ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always);
-  ImGui::BeginChild(main_window ? "MainTitleBar" : "StreamTitleBar",
-                    ImVec2(title_bar_width, title_bar_height_padding),
-                    ImGuiChildFlags_Borders,
-                    ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-                        ImGuiWindowFlags_NoBringToFrontOnFocus);
-  ImGui::PopStyleVar();
-  ImGui::PopStyleColor();
-
-  // get draw list
-  ImDrawList *draw_list = ImGui::GetWindowDrawList();
-
-  ImGui::SetCursorPos(
-      ImVec2(title_bar_width - title_bar_button_width * 3, 0.0f));
-  if (main_window) {
-    float bar_pos_x = title_bar_width - title_bar_button_width * 3 +
-                      title_bar_button_width * 0.33f;
-    float bar_pos_y = title_bar_button_height * 0.5f;
-
-    // draw menu icon
-    float menu_bar_line_size = title_bar_button_width * 0.33f;
-    draw_list->AddLine(
-        ImVec2(bar_pos_x, bar_pos_y - title_bar_button_height * 0.15f),
-        ImVec2(bar_pos_x + menu_bar_line_size,
-               bar_pos_y - title_bar_button_height * 0.15f),
-        IM_COL32(0, 0, 0, 255));
-    draw_list->AddLine(ImVec2(bar_pos_x, bar_pos_y),
-                       ImVec2(bar_pos_x + menu_bar_line_size, bar_pos_y),
-                       IM_COL32(0, 0, 0, 255));
-    draw_list->AddLine(
-        ImVec2(bar_pos_x, bar_pos_y + title_bar_button_height * 0.15f),
-        ImVec2(bar_pos_x + menu_bar_line_size,
-               bar_pos_y + title_bar_button_height * 0.15f),
-        IM_COL32(0, 0, 0, 255));
-
-    std::string title_bar_menu_button = "##title_bar_menu"; // ICON_FA_BARS;
-    std::string title_bar_menu = "##title_bar_menu";
-
-    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));
-    if (ImGui::Button(
-            title_bar_menu_button.c_str(),
-            ImVec2(title_bar_button_width, title_bar_button_height))) {
-      ImGui::OpenPopup(title_bar_menu.c_str());
-    }
-    ImGui::PopStyleColor(3);
-
-    if (ImGui::BeginPopup(title_bar_menu.c_str())) {
-      ImGui::SetWindowFontScale(0.6f);
-      if (ImGui::MenuItem(
-              localization::settings[localization_language_index_].c_str())) {
-        show_settings_window_ = true;
-      }
-
-      show_new_version_icon_in_menu_ = false;
-
-      std::string about_str = localization::about[localization_language_index_];
-      if (update_available_) {
-        const double now_time = ImGui::GetTime();
-
-        // every 2 seconds
-        if (now_time - new_version_icon_last_trigger_time_ >=
-            kNewVersionIconBlinkIntervalSec) {
-          show_new_version_icon_ = true;
-          new_version_icon_render_start_time_ = now_time;
-          new_version_icon_last_trigger_time_ = now_time;
-        }
-
-        // render for 1 second
-        if (show_new_version_icon_) {
-          about_str = about_str + " " + ICON_FA_CIRCLE_ARROW_UP;
-          if (now_time - new_version_icon_render_start_time_ >=
-              kNewVersionIconBlinkOnTimeSec) {
-            show_new_version_icon_ = false;
-          }
-        } else {
-          about_str = about_str + "      ";
-        }
-      }
-
-      if (ImGui::MenuItem(about_str.c_str())) {
-        show_about_window_ = true;
-      }
-
-      if (update_available_ && ImGui::IsItemHovered()) {
-        ImGui::BeginTooltip();
-        ImGui::SetWindowFontScale(0.5f);
-        std::string new_version_available_str =
-            localization::new_version_available[localization_language_index_] +
-            ": " + latest_version_;
-        ImGui::Text("%s", new_version_available_str.c_str());
-        ImGui::SetWindowFontScale(1.0f);
-        ImGui::EndTooltip();
-      }
-
-      ImGui::EndPopup();
-    } else {
-      show_new_version_icon_in_menu_ = true;
-    }
-
-    if (update_available_ && show_new_version_icon_in_menu_) {
-      const double now_time = ImGui::GetTime();
-
-      // every 2 seconds
-      if (now_time - new_version_icon_last_trigger_time_ >=
-          kNewVersionIconBlinkIntervalSec) {
-        show_new_version_icon_ = true;
-        new_version_icon_render_start_time_ = now_time;
-        new_version_icon_last_trigger_time_ = now_time;
-      }
-
-      // render for 1 second
-      if (show_new_version_icon_) {
-        ImGui::SetWindowFontScale(0.6f);
-        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_ >=
-            kNewVersionIconBlinkOnTimeSec) {
-          show_new_version_icon_ = false;
-        }
-      }
-    }
-
-    {
-      SettingWindow();
-      SelfHostedServerWindow();
-      AboutWindow();
-    }
-  } else {
-    ImGui::SetWindowFontScale(1.2f);
-  }
-
-  ImGui::SetCursorPos(ImVec2(
-      title_bar_width - title_bar_button_width * (main_window ? 2 : 3), 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));
-
-  float minimize_pos_x = title_bar_width -
-                         title_bar_button_width * (main_window ? 2 : 3) +
-                         title_bar_button_width * 0.33f;
-  float minimize_pos_y = title_bar_button_height * 0.5f;
-  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(
-      ImVec2(minimize_pos_x, minimize_pos_y),
-      ImVec2(minimize_pos_x + title_bar_button_width * 0.33f, minimize_pos_y),
-      IM_COL32(0, 0, 0, 255));
-  ImGui::PopStyleColor(3);
-
-  if (!main_window) {
-    ImGui::SetCursorPos(
-        ImVec2(title_bar_width - title_bar_button_width * 2, 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));
-
-    if (window_maximized_) {
-      float pos_x_top = title_bar_width - title_bar_button_width * 1.65f;
-      float pos_y_top = title_bar_button_height * 0.36f;
-      float pos_x_bottom = title_bar_width - title_bar_button_width * 1.6f;
-      float pos_y_bottom = title_bar_button_height * 0.28f;
-      std::string window_restore_button =
-          "##restore"; // ICON_FA_WINDOW_RESTORE;
-      if (ImGui::Button(
-              window_restore_button.c_str(),
-              ImVec2(title_bar_button_width, title_bar_button_height))) {
-        SDL_RestoreWindow(stream_window_);
-        window_maximized_ = false;
-      }
-      draw_list->AddRect(ImVec2(pos_x_top, pos_y_top),
-                         ImVec2(pos_x_top + title_bar_button_height * 0.33f,
-                                pos_y_top + title_bar_button_height * 0.33f),
-                         IM_COL32(0, 0, 0, 255));
-      draw_list->AddRect(ImVec2(pos_x_bottom, pos_y_bottom),
-                         ImVec2(pos_x_bottom + title_bar_button_height * 0.33f,
-                                pos_y_bottom + title_bar_button_height * 0.33f),
-                         IM_COL32(0, 0, 0, 255));
-      if (ImGui::IsItemHovered()) {
-        draw_list->AddRectFilled(
-            ImVec2(pos_x_top + title_bar_button_height * 0.02f,
-                   pos_y_top + title_bar_button_height * 0.01f),
-            ImVec2(pos_x_top + title_bar_button_height * 0.32f,
-                   pos_y_top + title_bar_button_height * 0.31f),
-            IM_COL32(229, 229, 229, 255));
-      } else {
-        draw_list->AddRectFilled(
-            ImVec2(pos_x_top + title_bar_button_height * 0.02f,
-                   pos_y_top + title_bar_button_height * 0.01f),
-            ImVec2(pos_x_top + title_bar_button_height * 0.32f,
-                   pos_y_top + title_bar_button_height * 0.31f),
-            IM_COL32(255, 255, 255, 255));
-      }
-    } else {
-      float maximize_pos_x = title_bar_width - title_bar_button_width * 1.5f -
-                             title_bar_button_height * 0.165f;
-      float maximize_pos_y = title_bar_button_height * 0.33f;
-      std::string window_maximize_button = "##maximize"; // ICON_FA_SQUARE_FULL;
-      if (ImGui::Button(
-              window_maximize_button.c_str(),
-              ImVec2(title_bar_button_width, title_bar_button_height))) {
-        SDL_MaximizeWindow(stream_window_);
-        window_maximized_ = !window_maximized_;
-      }
-      draw_list->AddRect(
-          ImVec2(maximize_pos_x, maximize_pos_y),
-          ImVec2(maximize_pos_x + title_bar_button_height * 0.33f,
-                 maximize_pos_y + title_bar_button_height * 0.33f),
-          IM_COL32(0, 0, 0, 255));
-    }
-    ImGui::PopStyleColor(3);
-  }
-
-  float xmark_button_pos_x = title_bar_width - title_bar_button_width;
-  ImGui::SetCursorPos(ImVec2(xmark_button_pos_x, 0.0f));
-  ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
-  ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(1.0f, 0, 0, 1.0f));
-  ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(1.0f, 0, 0, 0.5f));
-
-  float xmark_pos_x = xmark_button_pos_x + title_bar_button_width * 0.5f;
-  float xmark_pos_y = title_bar_button_height * 0.5f;
-  float xmark_size = title_bar_button_width * 0.33f;
-  std::string close_button = "##xmark"; // ICON_FA_XMARK;
-  bool close_button_clicked = false;
-  if (main_window) {
-    close_button_clicked = RoundedCornerButton(
-        close_button.c_str(),
-        ImVec2(title_bar_button_width, title_bar_button_height), 8.5f,
-        ImDrawFlags_RoundCornersTopRight, true, IM_COL32(0, 0, 0, 0),
-        IM_COL32(250, 0, 0, 255), IM_COL32(255, 0, 0, 128));
-  } else {
-    close_button_clicked =
-        ImGui::Button(close_button.c_str(),
-                      ImVec2(title_bar_button_width, title_bar_button_height));
-  }
-
-  if (close_button_clicked) {
-    if (main_window) {
-      if (!MinimizeMainWindowToTray()) {
-        SDL_HideWindow(main_window_);
-      }
-    } else {
-      SDL_Event event;
-      event.type = SDL_EVENT_QUIT;
-      SDL_PushEvent(&event);
-    }
-  }
-
-  draw_list->AddLine(ImVec2(xmark_pos_x - xmark_size / 2 - 0.25f,
-                            xmark_pos_y - xmark_size / 2 + 0.75f),
-                     ImVec2(xmark_pos_x + xmark_size / 2 - 1.5f,
-                            xmark_pos_y + xmark_size / 2 - 0.5f),
-                     IM_COL32(0, 0, 0, 255));
-  draw_list->AddLine(
-      ImVec2(xmark_pos_x + xmark_size / 2 - 1.75f,
-             xmark_pos_y - xmark_size / 2 + 0.75f),
-      ImVec2(xmark_pos_x - xmark_size / 2, xmark_pos_y + xmark_size / 2 - 1.0f),
-      IM_COL32(0, 0, 0, 255));
-
-  ImGui::PopStyleColor(3);
-
-  ImGui::EndChild();
-  return 0;
-}
-} // namespace crossdesk
@@ -1,148 +0,0 @@
-#include <cstdlib>
-#include <string>
-
-#if defined(_WIN32)
-#include <windows.h>
-#endif
-
-#include "application/gui_application.h"
-#include "layout.h"
-#include "localization.h"
-#include "rd_log.h"
-
-namespace crossdesk {
-
-bool GuiApplication::OpenUrl(const std::string &url) {
-#if defined(_WIN32)
-  int wide_len = MultiByteToWideChar(CP_UTF8, 0, url.c_str(), -1, nullptr, 0);
-  if (wide_len <= 0) {
-    return false;
-  }
-
-  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)) {
-    return false;
-  }
-
-  CloseHandle(process_info.hThread);
-  CloseHandle(process_info.hProcess);
-  return true;
-#elif defined(__APPLE__)
-  std::string cmd = "open " + url;
-  return system(cmd.c_str()) == 0;
-#else
-  std::string cmd = "xdg-open " + url;
-  return system(cmd.c_str()) == 0;
-#endif
-}
-
-void GuiApplication::Hyperlink(const std::string &label, const std::string &url,
-                               const float window_width) {
-  ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(0, 0, 255, 255));
-  ImGui::TextUnformatted(label.c_str());
-  ImGui::PopStyleColor();
-
-  if (ImGui::IsItemHovered()) {
-    ImGui::SetMouseCursor(ImGuiMouseCursor_Hand);
-    ImGui::BeginTooltip();
-    ImGui::SetWindowFontScale(0.6f);
-    ImGui::TextUnformatted(url.c_str());
-    ImGui::SetWindowFontScale(1.0f);
-    ImGui::EndTooltip();
-    if (ImGui::IsMouseClicked(ImGuiMouseButton_Left)) {
-      OpenUrl(url);
-    }
-  }
-}
-
-int GuiApplication::AboutWindow() {
-  if (show_about_window_) {
-    float about_window_width = title_bar_button_width_ * 7.5f;
-    float about_window_height = latest_version_.empty()
-                                    ? title_bar_button_width_ * 4.0f
-                                    : title_bar_button_width_ * 4.9f;
-
-    const ImGuiViewport *viewport = ImGui::GetMainViewport();
-    ImGui::SetNextWindowPos(ImVec2(
-        (viewport->WorkSize.x - viewport->WorkPos.x - about_window_width) / 2,
-        (viewport->WorkSize.y - viewport->WorkPos.y - about_window_height) /
-            2));
-
-    ImGui::SetNextWindowSize(ImVec2(about_window_width, about_window_height));
-
-    ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_);
-    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f);
-    ImGui::SetWindowFontScale(0.5f);
-    ImGui::Begin(
-        localization::about[localization_language_index_].c_str(), nullptr,
-        ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
-            ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings);
-    ImGui::SetWindowFontScale(1.0f);
-    ImGui::SetWindowFontScale(0.5f);
-
-    std::string version;
-#ifdef CROSSDESK_VERSION
-    version = CROSSDESK_VERSION;
-#else
-    version = "Unknown";
-#endif
-
-    std::string text = localization::version[localization_language_index_] +
-                       ": CrossDesk " + version;
-    ImGui::SetCursorPosX(about_window_width * 0.1f);
-    ImGui::Text("%s", text.c_str());
-
-    if (update_available_ && show_new_version_icon_in_menu_) {
-      std::string new_version_available =
-          localization::new_version_available[localization_language_index_] +
-          ": ";
-      ImGui::SetCursorPosX(about_window_width * 0.1f);
-      ImGui::Text("%s", new_version_available.c_str());
-      std::string access_website =
-          localization::access_website[localization_language_index_];
-      ImGui::SetCursorPosX((about_window_width -
-                            ImGui::CalcTextSize(latest_version_.c_str()).x) /
-                           2.0f);
-      Hyperlink(latest_version_, "https://crossdesk.cn", about_window_width);
-
-      ImGui::Spacing();
-    } else {
-      ImGui::Text("%s", "");
-    }
-
-    std::string copyright_text = "© 2025 by JUNKUN DI. All rights reserved.";
-    std::string license_text = "Licensed under GNU GPL v3.";
-    ImGui::SetCursorPosX(about_window_width * 0.1f);
-    ImGui::Text("%s", copyright_text.c_str());
-    ImGui::SetCursorPosX(about_window_width * 0.1f);
-    ImGui::Text("%s", license_text.c_str());
-
-    ImGui::SetCursorPosX(about_window_width * 0.445f);
-    ImGui::SetCursorPosY(about_window_height * 0.8f);
-    // OK
-    if (ImGui::Button(localization::ok[localization_language_index_].c_str())) {
-      show_about_window_ = false;
-    }
-
-    ImGui::SetWindowFontScale(1.0f);
-    ImGui::SetWindowFontScale(0.5f);
-    ImGui::End();
-    ImGui::SetWindowFontScale(1.0f);
-    ImGui::PopStyleVar(3);
-    ImGui::PopStyleColor();
-  }
-  return 0;
-}
-} // namespace crossdesk
@@ -1,209 +0,0 @@
-#include "application/gui_application.h"
-#include "layout.h"
-#include "localization.h"
-#include "rd_log.h"
-
-namespace crossdesk {
-
-bool GuiApplication::ConnectionStatusWindow(
-    std::shared_ptr<RemoteSession> &props) {
-  ImGuiIO &io = ImGui::GetIO();
-  bool ret_flag = false;
-
-  ImGui::SetNextWindowPos(
-      ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
-  ImGui::SetNextWindowSize(
-      ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
-
-  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f);
-  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_);
-
-  ImGui::Begin("ConnectionStatusWindow", nullptr,
-               ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-                   ImGuiWindowFlags_NoSavedSettings);
-  ImGui::PopStyleVar(2);
-  ImGui::PopStyleColor();
-
-  auto connection_status_window_width = ImGui::GetWindowSize().x;
-  auto connection_status_window_height = ImGui::GetWindowSize().y;
-
-  ImGui::SetWindowFontScale(0.5f);
-  std::string text;
-  const ConnectionStatus status = props->connection_status_.load();
-
-  if (ConnectionStatus::Connecting == status) {
-    text = localization::p2p_connecting[localization_language_index_];
-    ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
-    ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
-    // cancel
-    if (ImGui::Button(
-            localization::cancel[localization_language_index_].c_str()) ||
-        ImGui::IsKeyPressed(ImGuiKey_Escape)) {
-      show_connection_status_window_ = false;
-      re_enter_remote_id_ = true;
-      LOG_INFO("User cancelled connecting to [{}]", props->remote_id_);
-      if (props->peer_) {
-        LeaveConnection(props->peer_, props->remote_id_.c_str());
-      }
-      ret_flag = true;
-    }
-  } else if (ConnectionStatus::Gathering == status) {
-    text = localization::p2p_gathering[localization_language_index_];
-    ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
-    ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
-    // cancel
-    if (ImGui::Button(
-            localization::cancel[localization_language_index_].c_str()) ||
-        ImGui::IsKeyPressed(ImGuiKey_Escape)) {
-      show_connection_status_window_ = false;
-      re_enter_remote_id_ = true;
-      LOG_INFO("User cancelled connecting to [{}]", props->remote_id_);
-      if (props->peer_) {
-        LeaveConnection(props->peer_, props->remote_id_.c_str());
-      }
-      ret_flag = true;
-    }
-  } else if (ConnectionStatus::Connected == status) {
-    text = localization::p2p_connected[localization_language_index_];
-    ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
-    ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
-    // ok
-    if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
-        ImGui::IsKeyPressed(ImGuiKey_Enter) ||
-        ImGui::IsKeyPressed(ImGuiKey_Escape)) {
-      show_connection_status_window_ = false;
-    }
-  } else if (ConnectionStatus::Disconnected == status) {
-    text = localization::p2p_disconnected[localization_language_index_];
-    ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
-    ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
-    // ok
-    if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
-        ImGui::IsKeyPressed(ImGuiKey_Enter) ||
-        ImGui::IsKeyPressed(ImGuiKey_Escape)) {
-      show_connection_status_window_ = false;
-    }
-  } else if (ConnectionStatus::Failed == status) {
-    text = localization::p2p_failed[localization_language_index_];
-    ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
-    ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
-    // ok
-    if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
-        ImGui::IsKeyPressed(ImGuiKey_Enter) ||
-        ImGui::IsKeyPressed(ImGuiKey_Escape)) {
-      show_connection_status_window_ = false;
-    }
-  } else if (ConnectionStatus::Closed == status) {
-    text = localization::p2p_closed[localization_language_index_];
-    ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
-    ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
-    // ok
-    if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
-        ImGui::IsKeyPressed(ImGuiKey_Enter) ||
-        ImGui::IsKeyPressed(ImGuiKey_Escape)) {
-      show_connection_status_window_ = false;
-    }
-  } else if (ConnectionStatus::IncorrectPassword == status) {
-    if (!password_validating_) {
-      if (password_validating_time_ == 1) {
-        text = localization::input_password[localization_language_index_];
-      } else {
-        text = localization::reinput_password[localization_language_index_];
-      }
-
-      ImGui::SetCursorPosX(connection_status_window_width * 0.336f);
-      ImGui::SetCursorPosY(connection_status_window_height * 0.4f);
-      ImGui::SetNextItemWidth(connection_status_window_width * 0.33f);
-
-      ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-
-      if (focus_on_input_widget_) {
-        ImGui::SetKeyboardFocusHere();
-        focus_on_input_widget_ = false;
-      }
-
-      ImGui::InputText("##password", props->remote_password_,
-                       IM_ARRAYSIZE(props->remote_password_),
-                       ImGuiInputTextFlags_CharsNoBlank);
-
-      ImGui::SetWindowFontScale(0.4f);
-
-      ImVec2 text_size = ImGui::CalcTextSize(
-          localization::remember_password[localization_language_index_]
-              .c_str());
-      ImGui::SetCursorPosX((connection_status_window_width - text_size.x) *
-                           0.45f);
-      ImGui::Checkbox(
-          localization::remember_password[localization_language_index_].c_str(),
-          &(props->remember_password_));
-      ImGui::SetWindowFontScale(0.5f);
-      ImGui::PopStyleVar();
-
-      ImGui::SetCursorPosX(connection_status_window_width * 0.325f);
-      ImGui::SetCursorPosY(connection_status_window_height * 0.75f);
-      // ok
-      if (ImGui::Button(
-              localization::ok[localization_language_index_].c_str()) ||
-          ImGui::IsKeyPressed(ImGuiKey_Enter)) {
-        show_connection_status_window_ = true;
-        password_validating_ = true;
-        props->rejoin_ = true;
-        need_to_rejoin_ = true;
-        focus_on_input_widget_ = true;
-      }
-
-      ImGui::SameLine();
-      // cancel
-      if (ImGui::Button(
-              localization::cancel[localization_language_index_].c_str()) ||
-          ImGui::IsKeyPressed(ImGuiKey_Escape)) {
-        memset(props->remote_password_, 0, sizeof(props->remote_password_));
-        show_connection_status_window_ = false;
-        focus_on_input_widget_ = true;
-      }
-    } else if (password_validating_) {
-      text = localization::validate_password[localization_language_index_];
-      ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
-      ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
-    }
-  } else if (ConnectionStatus::NoSuchTransmissionId == status) {
-    text = localization::no_such_id[localization_language_index_];
-    ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
-    ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
-    // ok
-    if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
-        ImGui::IsKeyPressed(ImGuiKey_Enter)) {
-      show_connection_status_window_ = false;
-      re_enter_remote_id_ = true;
-      DestroyPeer(&props->peer_);
-      ret_flag = true;
-    }
-  } else if (ConnectionStatus::RemoteUnavailable == status) {
-    text = localization::device_offline[localization_language_index_];
-    ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
-    ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
-    // ok
-    if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
-        ImGui::IsKeyPressed(ImGuiKey_Enter) ||
-        ImGui::IsKeyPressed(ImGuiKey_Escape)) {
-      show_connection_status_window_ = false;
-      re_enter_remote_id_ = true;
-      DestroyPeer(&props->peer_);
-      ret_flag = true;
-    }
-  }
-
-  auto text_width = ImGui::CalcTextSize(text.c_str()).x;
-  ImGui::SetCursorPosX((connection_status_window_width - text_width) * 0.5f);
-  ImGui::SetCursorPosY(connection_status_window_height * 0.2f);
-  ImGui::Text("%s", text.c_str());
-  ImGui::SetWindowFontScale(1.0f);
-
-  ImGui::End();
-  ImGui::PopStyleVar();
-
-  return ret_flag;
-}
-} // namespace crossdesk
@@ -1,264 +0,0 @@
-#include "application/gui_application.h"
-#include "rd_log.h"
-
-namespace crossdesk {
-
-int GuiApplication::ControlWindow(
-    std::shared_ptr<RemoteSession> &props) {
-  double time_duration =
-      ImGui::GetTime() - props->control_bar_button_pressed_time_;
-  if (props->control_window_width_is_changing_) {
-    if (props->control_bar_expand_) {
-      props->control_window_width_ =
-          (float)(props->control_window_min_width_ +
-                  (props->control_window_max_width_ -
-                   props->control_window_min_width_) *
-                      4 * time_duration);
-    } else {
-      props->control_window_width_ =
-          (float)(props->control_window_max_width_ -
-                  (props->control_window_max_width_ -
-                   props->control_window_min_width_) *
-                      4 * time_duration);
-    }
-  }
-
-  time_duration =
-      ImGui::GetTime() - props->net_traffic_stats_button_pressed_time_;
-  if (props->control_window_height_is_changing_) {
-    if (props->control_bar_expand_ &&
-        props->net_traffic_stats_button_pressed_) {
-      props->control_window_height_ =
-          (float)(props->control_window_min_height_ +
-                  (props->control_window_max_height_ -
-                   props->control_window_min_height_) *
-                      4 * time_duration);
-    } else if (props->control_bar_expand_ &&
-               !props->net_traffic_stats_button_pressed_) {
-      props->control_window_height_ =
-          (float)(props->control_window_max_height_ -
-                  (props->control_window_max_height_ -
-                   props->control_window_min_height_) *
-                      4 * time_duration);
-    }
-  }
-
-  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0));
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_ * 1.5f);
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
-  ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, window_rounding_ * 1.5f);
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
-
-  float y_boundary = fullscreen_button_pressed_ ? 0.0f : title_bar_height_;
-  float container_x = 0.0f;
-  float container_y = y_boundary;
-  float container_w = stream_window_width_;
-  float container_h = stream_window_height_ - y_boundary;
-
-  ImGui::SetNextWindowSize(ImVec2(container_w, container_h), ImGuiCond_Always);
-  ImGui::SetNextWindowPos(ImVec2(container_x, container_y), ImGuiCond_Always);
-
-  float pos_x = 0;
-  float pos_y = 0;
-
-  std::string container_window_title =
-      props->remote_id_ + "ControlContainerWindow";
-  ImGui::Begin(container_window_title.c_str(), nullptr,
-               ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize |
-                   ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoDocking |
-                   ImGuiWindowFlags_NoBackground);
-  ImGui::PopStyleVar();
-
-  ImVec2 container_pos = ImGui::GetWindowPos();
-
-  if (ImGui::IsMouseDown(ImGuiMouseButton_Left) &&
-      props->control_bar_hovered_) {
-    float current_x_rel = props->control_window_pos_.x - container_pos.x;
-    float current_y_rel = props->control_window_pos_.y - container_pos.y;
-    ImVec2 delta = ImGui::GetIO().MouseDelta;
-    pos_x = current_x_rel + delta.x;
-    pos_y = current_y_rel + delta.y;
-    if (pos_x < 0.0f)
-      pos_x = 0.0f;
-    if (pos_y < 0.0f)
-      pos_y = 0.0f;
-    if (pos_x + props->control_window_width_ > container_w)
-      pos_x = container_w - props->control_window_width_;
-    if (pos_y + props->control_window_height_ > container_h)
-      pos_y = container_h - props->control_window_height_;
-  } else if (props->reset_control_bar_pos_) {
-    float new_cursor_pos_x = 0.0f;
-    float new_cursor_pos_y = 0.0f;
-
-    // set control window pos
-    float current_y_rel = props->control_window_pos_.y - container_pos.y;
-    if (current_y_rel + props->control_window_height_ > container_h) {
-      pos_y = container_h - props->control_window_height_;
-    } else if (current_y_rel < 0.0f) {
-      pos_y = 0.0f;
-    } else {
-      pos_y = current_y_rel;
-    }
-
-    if (props->is_control_bar_in_left_) {
-      pos_x = 0.0f;
-    } else {
-      pos_x = container_w - props->control_window_width_;
-    }
-
-    if (0 != props->mouse_diff_control_bar_pos_x_ &&
-        0 != props->mouse_diff_control_bar_pos_y_) {
-      // set cursor pos
-      new_cursor_pos_x =
-          container_pos.x + pos_x + props->mouse_diff_control_bar_pos_x_;
-      new_cursor_pos_y =
-          container_pos.y + pos_y + props->mouse_diff_control_bar_pos_y_;
-
-      SDL_WarpMouseInWindow(stream_window_, (int)new_cursor_pos_x,
-                            (int)new_cursor_pos_y);
-    }
-    props->reset_control_bar_pos_ = false;
-  } else if (!props->reset_control_bar_pos_ &&
-                 ImGui::IsMouseReleased(ImGuiMouseButton_Left) ||
-             props->control_window_width_is_changing_) {
-    float current_x_rel = props->control_window_pos_.x - container_pos.x;
-    float current_y_rel = props->control_window_pos_.y - container_pos.y;
-    if (current_x_rel <= container_w * 0.5f) {
-      pos_x = 0.0f;
-      if (current_y_rel + props->control_window_height_ > container_h) {
-        pos_y = container_h - props->control_window_height_;
-      } else {
-        pos_y = current_y_rel;
-      }
-
-      if (props->control_bar_expand_) {
-        if (props->control_window_width_ >= props->control_window_max_width_) {
-          props->control_window_width_ = props->control_window_max_width_;
-          props->control_window_width_is_changing_ = false;
-        } else {
-          props->control_window_width_is_changing_ = true;
-        }
-      } else {
-        if (props->control_window_width_ <= props->control_window_min_width_) {
-          props->control_window_width_ = props->control_window_min_width_;
-          props->control_window_width_is_changing_ = false;
-        } else {
-          props->control_window_width_is_changing_ = true;
-        }
-      }
-      props->is_control_bar_in_left_ = true;
-    } else if (current_x_rel > container_w * 0.5f) {
-      pos_x = container_w - props->control_window_width_;
-      pos_y = (current_y_rel >= 0.0f &&
-               current_y_rel <= container_h - props->control_window_height_)
-                  ? current_y_rel
-                  : (current_y_rel < 0.0f
-                         ? 0.0f
-                         : (container_h - props->control_window_height_));
-
-      if (props->control_bar_expand_) {
-        if (props->control_window_width_ >= props->control_window_max_width_) {
-          props->control_window_width_ = props->control_window_max_width_;
-          props->control_window_width_is_changing_ = false;
-          pos_x = container_w - props->control_window_max_width_;
-        } else {
-          props->control_window_width_is_changing_ = true;
-          pos_x = container_w - props->control_window_width_;
-        }
-      } else {
-        if (props->control_window_width_ <= props->control_window_min_width_) {
-          props->control_window_width_ = props->control_window_min_width_;
-          props->control_window_width_is_changing_ = false;
-          pos_x = container_w - props->control_window_min_width_;
-        } else {
-          props->control_window_width_is_changing_ = true;
-          pos_x = container_w - props->control_window_width_;
-        }
-      }
-      props->is_control_bar_in_left_ = false;
-    }
-
-    if (current_y_rel + props->control_window_height_ > container_h) {
-      pos_y = container_h - props->control_window_height_;
-    } else if (current_y_rel < 0.0f) {
-      pos_y = 0.0f;
-    }
-  } else {
-    float current_x_rel = props->control_window_pos_.x - container_pos.x;
-    float current_y_rel = props->control_window_pos_.y - container_pos.y;
-    pos_x = current_x_rel;
-    pos_y = current_y_rel;
-    if (pos_x < 0.0f)
-      pos_x = 0.0f;
-    if (pos_y < 0.0f)
-      pos_y = 0.0f;
-    if (pos_x + props->control_window_width_ > container_w)
-      pos_x = container_w - props->control_window_width_;
-    if (pos_y + props->control_window_height_ > container_h)
-      pos_y = container_h - props->control_window_height_;
-  }
-
-  if (props->control_bar_expand_ && props->control_window_height_is_changing_) {
-    if (props->net_traffic_stats_button_pressed_) {
-      if (props->control_window_height_ >= props->control_window_max_height_) {
-        props->control_window_height_ = props->control_window_max_height_;
-        props->control_window_height_is_changing_ = false;
-      } else {
-        props->control_window_height_is_changing_ = true;
-      }
-    } else {
-      if (props->control_window_height_ <= props->control_window_min_height_) {
-        props->control_window_height_ = props->control_window_min_height_;
-        props->control_window_height_is_changing_ = false;
-      } else {
-        props->control_window_height_is_changing_ = true;
-      }
-    }
-  }
-
-  std::string control_window_title = props->remote_id_ + "ControlWindow";
-
-  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-  static bool a, b, c, d, e;
-  float child_cursor_x = pos_x;
-  float child_cursor_y = pos_y;
-  ImGui::SetCursorPos(ImVec2(child_cursor_x, child_cursor_y));
-
-  std::string control_child_window_title =
-      props->remote_id_ + "ControlChildWindow";
-  ImGui::BeginChild(
-      control_child_window_title.c_str(),
-      ImVec2(props->control_window_width_, props->control_window_height_),
-      ImGuiChildFlags_Borders, ImGuiWindowFlags_NoDecoration);
-  ImGui::PopStyleColor();
-
-  props->control_window_pos_ = ImGui::GetWindowPos();
-  SDL_GetMouseState(&props->mouse_pos_x_, &props->mouse_pos_y_);
-  props->mouse_diff_control_bar_pos_x_ =
-      props->mouse_pos_x_ - props->control_window_pos_.x;
-  props->mouse_diff_control_bar_pos_y_ =
-      props->mouse_pos_y_ - props->control_window_pos_.y;
-
-  if (props->control_window_pos_.y < container_pos.y ||
-      props->control_window_pos_.y + props->control_window_height_ >
-          (container_pos.y + container_h) ||
-      props->control_window_pos_.x < container_pos.x ||
-      props->control_window_pos_.x + props->control_window_width_ >
-          (container_pos.x + container_w)) {
-    ImGui::ClearActiveID();
-    props->reset_control_bar_pos_ = true;
-    props->mouse_diff_control_bar_pos_x_ = 0;
-    props->mouse_diff_control_bar_pos_y_ = 0;
-  }
-
-  ControlBar(props);
-  props->control_bar_hovered_ = ImGui::IsWindowHovered();
-
-  ImGui::EndChild();
-  ImGui::End();
-  ImGui::PopStyleVar(3);
-  ImGui::PopStyleColor();
-
-  return 0;
-}
-} // namespace crossdesk
@@ -1,253 +0,0 @@
-#include <algorithm>
-#include <cmath>
-
-#include "IconsFontAwesome6.h"
-#include "application/gui_application.h"
-#include "layout.h"
-#include "localization.h"
-#include "rd_log.h"
-
-namespace crossdesk {
-
-namespace {
-int CountDigits(int number) {
-  if (number == 0)
-    return 1;
-  return (int)std::floor(std::log10(std::abs(number))) + 1;
-}
-
-int BitrateDisplay(int bitrate) {
-  int num_of_digits = CountDigits(bitrate);
-  if (num_of_digits <= 3) {
-    ImGui::Text("%d bps", bitrate);
-  } else if (num_of_digits > 3 && num_of_digits <= 6) {
-    ImGui::Text("%d kbps", bitrate / 1000);
-  } else {
-    ImGui::Text("%.1f mbps", bitrate / 1000000.0f);
-  }
-  return 0;
-}
-} // namespace
-
-int GuiApplication::FileTransferWindow(
-    std::shared_ptr<RemoteSession> &props) {
-  FileTransferState *state = &transfers_.state_for(props);
-  state->file_transfer_window_hovered_ = false;
-
-  // Only show window if there are files in transfer list or currently
-  // transferring
-  std::vector<RemoteSession::FileTransferInfo> file_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
-  std::sort(
-      file_list.begin(), file_list.end(),
-      [](const RemoteSession::FileTransferInfo &a,
-         const RemoteSession::FileTransferInfo &b) {
-        // Priority: Sending > Completed > Queued > Failed
-        auto get_priority =
-            [](RemoteSession::FileTransferStatus status) {
-              switch (status) {
-              case RemoteSession::FileTransferStatus::Sending:
-                return 0;
-              case RemoteSession::FileTransferStatus::Completed:
-                return 1;
-              case RemoteSession::FileTransferStatus::Queued:
-                return 2;
-              case RemoteSession::FileTransferStatus::Failed:
-                return 3;
-              }
-              return 3;
-            };
-        return get_priority(a.status) < get_priority(b.status);
-      });
-
-  // Only show window if file_transfer_window_visible_ is true
-  // Window can be closed by user even during transfer
-  // It will be reopened automatically when:
-  // 1. A file transfer completes (via FileTransferManager)
-  // 2. FileTransferManager starts the next queued file.
-  if (!state->file_transfer_window_visible_) {
-    return 0;
-  }
-
-  // Position window at bottom-left of stream window
-  // Adjust window size based on number of files
-  float file_transfer_window_width = main_window_width_ * 0.6f;
-  float file_transfer_window_height =
-      main_window_height_ * 0.3f; // Dynamic height
-  float pos_x = file_transfer_window_width * 0.05f;
-  float pos_y = stream_window_height_ - file_transfer_window_height -
-                file_transfer_window_width * 0.05;
-
-  const ImVec2 mouse_pos = ImGui::GetMousePos();
-  const bool mouse_in_window_rect =
-      mouse_pos.x >= pos_x &&
-      mouse_pos.x <= pos_x + file_transfer_window_width &&
-      mouse_pos.y >= pos_y &&
-      mouse_pos.y <= pos_y + file_transfer_window_height;
-
-  ImGui::SetNextWindowPos(ImVec2(pos_x, pos_y), ImGuiCond_Always);
-  ImGui::SetNextWindowSize(
-      ImVec2(file_transfer_window_width, file_transfer_window_height),
-      ImGuiCond_Always);
-  if (mouse_in_window_rect) {
-    ImGui::SetNextWindowFocus();
-  }
-
-  // Set Chinese font for proper display
-  const bool has_chinese_font = stream_windows_system_chinese_font_ != nullptr;
-  if (has_chinese_font) {
-    ImGui::PushFont(stream_windows_system_chinese_font_);
-  }
-
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_ * 0.5f);
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
-  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 0.9f));
-  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));
-
-  ImGui::SetWindowFontScale(0.5f);
-  bool window_opened = true;
-  const bool show_contents = ImGui::Begin(
-      localization::file_transfer_progress[localization_language_index_]
-          .c_str(),
-      &window_opened,
-      ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize |
-          ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings |
-          ImGuiWindowFlags_NoScrollbar);
-  ImGui::PopStyleColor(4);
-  ImGui::PopStyleVar(2);
-
-  state->file_transfer_window_hovered_ =
-      mouse_in_window_rect ||
-      ImGui::IsWindowHovered(ImGuiHoveredFlags_RootAndChildWindows);
-
-  if (!window_opened) {
-    state->file_transfer_window_visible_ = false;
-  }
-
-  if (show_contents && window_opened) {
-    ImGui::SetWindowFontScale(1.0f);
-    ImGui::SetWindowFontScale(0.5f);
-
-    // Display file list
-    if (file_list.empty()) {
-      ImGui::Text("No files in transfer queue");
-    } 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_Borders, ImGuiWindowFlags_HorizontalScrollbar);
-      ImGui::SetWindowFontScale(1.0f);
-      ImGui::SetWindowFontScale(0.5f);
-
-      for (size_t i = 0; i < file_list.size(); ++i) {
-        const auto &info = file_list[i];
-        ImGui::PushID(static_cast<int>(i));
-
-        // Status icon and file name
-        const char *status_icon = "";
-        ImVec4 status_color(0.5f, 0.5f, 0.5f, 1.0f);
-        const char *status_text = "";
-
-        switch (info.status) {
-        case RemoteSession::FileTransferStatus::Queued:
-          status_icon = ICON_FA_CLOCK;
-          status_color =
-              ImVec4(0.5f, 0.6f, 0.7f, 1.0f); // Common blue-gray for queued
-          status_text =
-              localization::queued[localization_language_index_].c_str();
-          break;
-        case RemoteSession::FileTransferStatus::Sending:
-          status_icon = ICON_FA_ARROW_UP;
-          status_color = ImVec4(0.2f, 0.6f, 1.0f, 1.0f);
-          status_text =
-              localization::sending[localization_language_index_].c_str();
-          break;
-        case RemoteSession::FileTransferStatus::Completed:
-          status_icon = ICON_FA_CHECK;
-          status_color = ImVec4(0.0f, 0.8f, 0.0f, 1.0f);
-          status_text =
-              localization::completed[localization_language_index_].c_str();
-          break;
-        case RemoteSession::FileTransferStatus::Failed:
-          status_icon = ICON_FA_XMARK;
-          status_color = ImVec4(1.0f, 0.2f, 0.2f, 1.0f);
-          status_text =
-              localization::failed[localization_language_index_].c_str();
-          break;
-        }
-
-        ImGui::TextColored(status_color, "%s", status_icon);
-        ImGui::SameLine();
-        ImGui::Text("%s", info.file_name.c_str());
-        ImGui::SameLine();
-        ImGui::TextColored(status_color, "%s", status_text);
-
-        // Progress bar for sending files
-        if (info.status ==
-                RemoteSession::FileTransferStatus::Sending &&
-            info.file_size > 0) {
-          float progress = static_cast<float>(info.sent_bytes) /
-                           static_cast<float>(info.file_size);
-          progress = (std::max)(0.0f, (std::min)(1.0f, progress));
-
-          float text_height = ImGui::GetTextLineHeight();
-          ImGui::ProgressBar(
-              progress, ImVec2(file_transfer_window_width * 0.5f, text_height),
-              "");
-          ImGui::SameLine();
-
-          ImGui::Text("%.1f%%", progress * 100.0f);
-          ImGui::SameLine();
-
-          float speed_x_pos = file_transfer_window_width * 0.65f;
-          ImGui::SetCursorPosX(speed_x_pos);
-          BitrateDisplay(static_cast<int>(info.rate_bps));
-        } else if (info.status ==
-                   RemoteSession::FileTransferStatus::Completed) {
-          // Show completed size
-          char size_str[64];
-          if (info.file_size < 1024) {
-            snprintf(size_str, sizeof(size_str), "%llu B",
-                     (unsigned long long)info.file_size);
-          } else if (info.file_size < 1024 * 1024) {
-            snprintf(size_str, sizeof(size_str), "%.2f KB",
-                     info.file_size / 1024.0f);
-          } else {
-            snprintf(size_str, sizeof(size_str), "%.2f MB",
-                     info.file_size / (1024.0f * 1024.0f));
-          }
-          ImGui::Text("Size: %s", size_str);
-        }
-
-        ImGui::PopID();
-        ImGui::Spacing();
-      }
-
-      ImGui::SetWindowFontScale(1.0f);
-      ImGui::SetWindowFontScale(0.5f);
-      ImGui::EndChild();
-      ImGui::SetWindowFontScale(1.0f);
-    }
-    ImGui::SetWindowFontScale(1.0f);
-    ImGui::SetWindowFontScale(0.5f);
-  }
-
-  ImGui::End();
-  ImGui::SetWindowFontScale(1.0f);
-
-  if (has_chinese_font) {
-    ImGui::PopFont();
-  }
-
-  return 0;
-}
-
-} // namespace crossdesk
@@ -1,670 +0,0 @@
-#include "application/gui_application.h"
-#include "layout.h"
-#include "localization.h"
-#include "rd_log.h"
-#include "tinyfiledialogs.h"
-
-#if _WIN32 && CROSSDESK_PORTABLE
-#include "service_host.h"
-#endif
-
-namespace crossdesk {
-
-int GuiApplication::SettingWindow() {
-  ImGuiIO &io = ImGui::GetIO();
-  float portable_y_padding = 0.0f;
-#if _WIN32 && CROSSDESK_PORTABLE
-  portable_y_padding = 0.05f;
-#endif
-
-  if (show_settings_window_) {
-    if (settings_window_pos_reset_) {
-      const ImGuiViewport *viewport = ImGui::GetMainViewport();
-      if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-#if (((defined(_WIN32) || defined(__linux__)) && !defined(__aarch64__) &&      \
-      !defined(__arm__) && USE_CUDA) ||                                        \
-     defined(__APPLE__))
-        ImGui::SetNextWindowPos(
-            ImVec2(io.DisplaySize.x * 0.343f, io.DisplaySize.y * 0.05f));
-        ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.315f,
-                   io.DisplaySize.y * (0.9f + portable_y_padding)));
-#else
-        ImGui::SetNextWindowPos(
-            ImVec2(io.DisplaySize.x * 0.343f, io.DisplaySize.y * 0.08f));
-        ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.315f,
-                   io.DisplaySize.y * (0.85f + portable_y_padding)));
-#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.05f));
-        ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.42f,
-                   io.DisplaySize.y * (0.9f + portable_y_padding)));
-#else
-        ImGui::SetNextWindowPos(
-            ImVec2(io.DisplaySize.x * 0.297f, io.DisplaySize.y * 0.08f));
-        ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.42f,
-                   io.DisplaySize.y * (0.85f + portable_y_padding)));
-#endif
-      }
-
-      settings_window_pos_reset_ = false;
-    }
-
-    // Settings
-    {
-      static int settings_items_padding = title_bar_button_width_ * 0.75f;
-      int settings_items_offset = 0;
-
-      ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-      ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_);
-      ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f);
-
-      ImGui::Begin(localization::settings[localization_language_index_].c_str(),
-                   nullptr,
-                   ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
-                       ImGuiWindowFlags_NoSavedSettings);
-      ImGui::SetWindowFontScale(0.5f);
-      ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-      {
-        const auto &supported_languages = localization::GetSupportedLanguages();
-        language_button_value_ =
-            localization::detail::ClampLanguageIndex(language_button_value_);
-
-        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text(
-            "%s", localization::language[localization_language_index_].c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 3.0f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.7f);
-        }
-
-        ImGui::SetNextItemWidth(title_bar_button_width_ * 1.8f);
-        if (ImGui::BeginCombo("##language",
-                              localization::GetSupportedLanguages()
-                                  [localization::detail::ClampLanguageIndex(
-                                       language_button_value_)]
-                                      .display_name.c_str())) {
-          ImGui::SetWindowFontScale(0.5f);
-          for (int i = 0; i < static_cast<int>(supported_languages.size());
-               ++i) {
-            bool selected = (i == language_button_value_);
-            if (ImGui::Selectable(supported_languages[i].display_name.c_str(),
-                                  selected))
-              language_button_value_ = i;
-            if (selected) {
-              ImGui::SetItemDefaultFocus();
-            }
-          }
-
-          ImGui::EndCombo();
-        }
-      }
-
-      ImGui::Separator();
-
-      if (stream_window_inited_) {
-        ImGui::BeginDisabled();
-      }
-
-      {
-        const char *video_quality_items[] = {
-            localization::video_quality_low[localization_language_index_]
-                .c_str(),
-            localization::video_quality_medium[localization_language_index_]
-                .c_str(),
-            localization::video_quality_high[localization_language_index_]
-                .c_str()};
-
-        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text(
-            "%s",
-            localization::video_quality[localization_language_index_].c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 3.0f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.7f);
-        }
-
-        ImGui::SetNextItemWidth(title_bar_button_width_ * 1.8f);
-        if (ImGui::BeginCombo(
-                "##video_quality",
-                video_quality_items[video_quality_button_value_])) {
-          ImGui::SetWindowFontScale(0.5f);
-          for (int i = 0; i < IM_ARRAYSIZE(video_quality_items); i++) {
-            bool selected = (i == video_quality_button_value_);
-            if (ImGui::Selectable(video_quality_items[i], selected))
-              video_quality_button_value_ = i;
-          }
-
-          ImGui::EndCombo();
-        }
-      }
-
-      ImGui::Separator();
-
-      {
-        const char *video_frame_rate_items[] = {"30 fps", "60 fps"};
-
-        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("%s",
-                    localization::video_frame_rate[localization_language_index_]
-                        .c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 3.0f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.7f);
-        }
-
-        ImGui::SetNextItemWidth(title_bar_button_width_ * 1.8f);
-        if (ImGui::BeginCombo(
-                "##video_frame_rate",
-                video_frame_rate_items[video_frame_rate_button_value_])) {
-          ImGui::SetWindowFontScale(0.5f);
-          for (int i = 0; i < IM_ARRAYSIZE(video_frame_rate_items); i++) {
-            bool selected = (i == video_frame_rate_button_value_);
-            if (ImGui::Selectable(video_frame_rate_items[i], selected))
-              video_frame_rate_button_value_ = i;
-          }
-
-          ImGui::EndCombo();
-        }
-      }
-
-      ImGui::Separator();
-
-      {
-        const char *video_encode_format_items[] = {
-            localization::h264[localization_language_index_].c_str(),
-            localization::av1[localization_language_index_].c_str()};
-
-        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text(
-            "%s",
-            localization::video_encode_format[localization_language_index_]
-                .c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 3.0f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.7f);
-        }
-
-        ImGui::SetNextItemWidth(title_bar_button_width_ * 1.8f);
-        if (ImGui::BeginCombo(
-                "##video_encode_format",
-                video_encode_format_items[video_encode_format_button_value_])) {
-          ImGui::SetWindowFontScale(0.5f);
-          for (int i = 0; i < IM_ARRAYSIZE(video_encode_format_items); i++) {
-            bool selected = (i == video_encode_format_button_value_);
-            if (ImGui::Selectable(video_encode_format_items[i], selected))
-              video_encode_format_button_value_ = i;
-          }
-
-          ImGui::EndCombo();
-        }
-      }
-
-#if (((defined(_WIN32) || defined(__linux__)) && !defined(__aarch64__) &&      \
-      !defined(__arm__) && USE_CUDA) ||                                        \
-     defined(__APPLE__))
-      ImGui::Separator();
-
-      {
-        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("%s", localization::enable_hardware_video_codec
-                              [localization_language_index_]
-                                  .c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 5.955f);
-        }
-
-        ImGui::Checkbox("##enable_hardware_video_codec",
-                        &enable_hardware_video_codec_);
-      }
-#endif
-
-      ImGui::Separator();
-
-      {
-        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text(
-            "%s",
-            localization::enable_turn[localization_language_index_].c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 5.955f);
-        }
-
-        ImGui::Checkbox("##enable_turn", &enable_turn_);
-      }
-
-      ImGui::Separator();
-
-      {
-        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text(
-            "%s",
-            localization::enable_srtp[localization_language_index_].c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 5.955f);
-        }
-
-        ImGui::Checkbox("##enable_srtp", &enable_srtp_);
-      }
-
-      ImGui::Separator();
-
-      {
-        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset + 1);
-        ImGui::AlignTextToFramePadding();
-        if (ImGui::Button(localization::self_hosted_server_config
-                              [localization_language_index_]
-                                  .c_str())) {
-          show_self_hosted_server_config_window_ = true;
-        }
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 5.955f);
-        }
-
-        ImGui::Checkbox("##enable_self_hosted", &enable_self_hosted_);
-      }
-
-      ImGui::Separator();
-
-      {
-        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("%s",
-                    localization::enable_autostart[localization_language_index_]
-                        .c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 5.955f);
-        }
-
-        ImGui::Checkbox("##enable_autostart_", &enable_autostart_);
-      }
-
-      ImGui::Separator();
-
-      {
-        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text(
-            "%s",
-            localization::enable_daemon[localization_language_index_].c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 5.955f);
-        }
-
-        ImGui::Checkbox("##enable_daemon_", &enable_daemon_);
-        if (ImGui::IsItemHovered()) {
-          ImGui::BeginTooltip();
-          ImGui::SetWindowFontScale(0.5f);
-          ImGui::Text("%s", localization::takes_effect_after_restart
-                                [localization_language_index_]
-                                    .c_str());
-          ImGui::SetWindowFontScale(1.0f);
-          ImGui::EndTooltip();
-        }
-      }
-
-      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.82f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.5f);
-        }
-
-        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();
-      }
-
-#if _WIN32 && CROSSDESK_PORTABLE
-      ImGui::Separator();
-
-      {
-        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("%s", localization::windows_service_settings_label
-                              [localization_language_index_]
-                                  .c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.0f);
-        } else if (ConfigCenter::LANGUAGE::ENGLISH == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 5.42f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.6f);
-        }
-
-        const PortableServiceInstallState state =
-            portable_service_install_state_.load(std::memory_order_acquire);
-        const bool service_installed =
-            IsCrossDeskServiceInstalled() ||
-            state == PortableServiceInstallState::succeeded;
-        if (service_installed) {
-          if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-            ImGui::SetCursorPosX(title_bar_button_width_ * 3.9f);
-          } else if (ConfigCenter::LANGUAGE::ENGLISH ==
-                     localization_language_) {
-            ImGui::SetCursorPosX(title_bar_button_width_ * 5.32f);
-          } else {
-            ImGui::SetCursorPosX(title_bar_button_width_ * 4.6f);
-          }
-          ImGui::Text("%s", localization::windows_service_installed
-                                [localization_language_index_]
-                                    .c_str());
-        } else {
-          if (state == PortableServiceInstallState::installing) {
-            ImGui::BeginDisabled();
-          }
-          if (ImGui::Button(localization::install_windows_service
-                                [localization_language_index_]
-                                    .c_str())) {
-            StartPortableWindowsServiceInstall();
-          }
-
-          if (state == PortableServiceInstallState::installing) {
-            ImGui::EndDisabled();
-            ImGui::SameLine();
-            ImGui::Text("%s", localization::installing_windows_service
-                                  [localization_language_index_]
-                                      .c_str());
-          } else if (state == PortableServiceInstallState::failed) {
-            ImGui::SameLine();
-            ImGui::Text(
-                "%s",
-                localization::failed[localization_language_index_].c_str());
-            if (ImGui::IsItemHovered()) {
-              ImGui::BeginTooltip();
-              ImGui::SetWindowFontScale(0.5f);
-              ImGui::PushTextWrapPos(title_bar_button_width_ * 10.0f);
-              ImGui::TextWrapped("%s",
-                                 localization::windows_service_install_failed
-                                     [localization_language_index_]
-                                         .c_str());
-              ImGui::PopTextWrapPos();
-              ImGui::SetWindowFontScale(1.0f);
-              ImGui::EndTooltip();
-            }
-          }
-        }
-      }
-#endif
-
-      if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-        ImGui::SetCursorPosX(title_bar_button_width_ * 1.59f);
-      } else {
-        ImGui::SetCursorPosX(title_bar_button_width_ * 2.22f);
-      }
-
-      settings_items_offset +=
-          settings_items_padding + title_bar_button_width_ * 0.15f;
-      ImGui::SetCursorPosY(settings_items_offset);
-
-      ImGui::PopStyleVar();
-
-      // OK
-      if (ImGui::Button(
-              localization::ok[localization_language_index_].c_str())) {
-        show_settings_window_ = false;
-        show_self_hosted_server_config_window_ = false;
-
-        // Language
-        language_button_value_ =
-            localization::detail::ClampLanguageIndex(language_button_value_);
-        if (language_button_value_ == 0) {
-          localization_language_ = ConfigCenter::LANGUAGE::CHINESE;
-        } else if (language_button_value_ == 1) {
-          localization_language_ = ConfigCenter::LANGUAGE::ENGLISH;
-        } else {
-          localization_language_ = ConfigCenter::LANGUAGE::RUSSIAN;
-        }
-        config_center_->SetLanguage(localization_language_);
-        language_button_value_last_ = language_button_value_;
-        localization_language_index_ = language_button_value_;
-        LOG_INFO("Set localization language: {}",
-                 localization::GetSupportedLanguages()
-                     [localization::detail::ClampLanguageIndex(
-                          localization_language_index_)]
-                         .code.c_str());
-
-        // Video quality
-        if (video_quality_button_value_ == 0) {
-          config_center_->SetVideoQuality(ConfigCenter::VIDEO_QUALITY::LOW);
-        } else if (video_quality_button_value_ == 1) {
-          config_center_->SetVideoQuality(ConfigCenter::VIDEO_QUALITY::MEDIUM);
-        } else {
-          config_center_->SetVideoQuality(ConfigCenter::VIDEO_QUALITY::HIGH);
-        }
-        video_quality_button_value_last_ = video_quality_button_value_;
-
-        if (video_frame_rate_button_value_ == 0) {
-          config_center_->SetVideoFrameRate(
-              ConfigCenter::VIDEO_FRAME_RATE::FPS_30);
-        } else if (video_frame_rate_button_value_ == 1) {
-          config_center_->SetVideoFrameRate(
-              ConfigCenter::VIDEO_FRAME_RATE::FPS_60);
-        }
-        video_frame_rate_button_value_last_ = video_frame_rate_button_value_;
-
-        // Video encode format
-        if (video_encode_format_button_value_ == 0) {
-          config_center_->SetVideoEncodeFormat(
-              ConfigCenter::VIDEO_ENCODE_FORMAT::H264);
-        } else if (video_encode_format_button_value_ == 1) {
-          config_center_->SetVideoEncodeFormat(
-              ConfigCenter::VIDEO_ENCODE_FORMAT::AV1);
-        }
-        video_encode_format_button_value_last_ =
-            video_encode_format_button_value_;
-
-        // Hardware video codec
-        if (enable_hardware_video_codec_) {
-          config_center_->SetHardwareVideoCodec(true);
-        } else {
-          config_center_->SetHardwareVideoCodec(false);
-        }
-        enable_hardware_video_codec_last_ = enable_hardware_video_codec_;
-
-        // TURN mode
-        if (enable_turn_) {
-          config_center_->SetTurn(true);
-        } else {
-          config_center_->SetTurn(false);
-        }
-        enable_turn_last_ = enable_turn_;
-
-        // SRTP
-        if (enable_srtp_) {
-          config_center_->SetSrtp(true);
-        } else {
-          config_center_->SetSrtp(false);
-        }
-        enable_srtp_last_ = enable_srtp_;
-
-        if (enable_self_hosted_) {
-          config_center_->SetSelfHosted(true);
-        } else {
-          config_center_->SetSelfHosted(false);
-        }
-        enable_self_hosted_last_ = enable_self_hosted_;
-
-        if (enable_autostart_) {
-          config_center_->SetAutostart(true);
-        } else {
-          config_center_->SetAutostart(false);
-        }
-        enable_autostart_last_ = enable_autostart_;
-
-        if (enable_daemon_) {
-          config_center_->SetDaemon(true);
-        } else {
-          config_center_->SetDaemon(false);
-        }
-        enable_daemon_last_ = enable_daemon_;
-
-        // 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
-        settings_.Load();
-
-        // Recreate peer instance
-        if (!stream_window_inited_) {
-          LOG_INFO("Recreate peer instance");
-          CloseAllRemoteSessions();
-          CreateConnectionPeer();
-        }
-      }
-
-      ImGui::SameLine();
-      // Cancel
-      if (ImGui::Button(
-              localization::cancel[localization_language_index_].c_str())) {
-        show_settings_window_ = false;
-        show_self_hosted_server_config_window_ = false;
-
-        if (language_button_value_ != language_button_value_last_) {
-          language_button_value_ = language_button_value_last_;
-        }
-
-        if (video_quality_button_value_ != video_quality_button_value_last_) {
-          video_quality_button_value_ = video_quality_button_value_last_;
-        }
-
-        if (video_frame_rate_button_value_ !=
-            video_frame_rate_button_value_last_) {
-          video_frame_rate_button_value_ = video_frame_rate_button_value_last_;
-        }
-
-        if (video_encode_format_button_value_ !=
-            video_encode_format_button_value_last_) {
-          video_encode_format_button_value_ =
-              video_encode_format_button_value_last_;
-        }
-
-        if (enable_hardware_video_codec_ != enable_hardware_video_codec_last_) {
-          enable_hardware_video_codec_ = enable_hardware_video_codec_last_;
-        }
-
-        if (enable_turn_ != enable_turn_last_) {
-          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);
-      ImGui::End();
-      ImGui::PopStyleVar(2);
-      ImGui::PopStyleColor();
-    }
-  }
-
-  return 0;
-}
-} // namespace crossdesk
@@ -1,60 +0,0 @@
-#include "application/gui_application.h"
-#include "layout_relative.h"
-#include "localization.h"
-#include "rd_log.h"
-
-namespace crossdesk {
-
-int GuiApplication::MainWindow() {
-  ImGuiIO &io = ImGui::GetIO();
-  float local_remote_window_width = io.DisplaySize.x;
-  float local_remote_window_height =
-      io.DisplaySize.y * (0.56f - TITLE_BAR_HEIGHT);
-
-  ImGui::SetNextWindowPos(ImVec2(0.0f, io.DisplaySize.y * (TITLE_BAR_HEIGHT)),
-                          ImGuiCond_Always);
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
-  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
-  ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
-  ImGui::BeginChild(
-      "DeskWindow",
-      ImVec2(local_remote_window_width, local_remote_window_height),
-      ImGuiChildFlags_Borders,
-      ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-          ImGuiWindowFlags_NoBringToFrontOnFocus);
-  ImGui::PopStyleVar();
-  ImGui::PopStyleColor(2);
-
-  LocalWindow();
-
-  ImDrawList *draw_list = ImGui::GetWindowDrawList();
-  draw_list->AddLine(ImVec2(io.DisplaySize.x * 0.5f, io.DisplaySize.y * 0.1f),
-                     ImVec2(io.DisplaySize.x * 0.5f, io.DisplaySize.y * 0.53f),
-                     IM_COL32(0, 0, 0, 122), 1.0f);
-
-  RemoteWindow();
-  ImGui::EndChild();
-
-  RecentConnectionsWindow();
-  StatusBar();
-
-  if (show_connection_status_window_) {
-    // std::unique_lock lock(remote_sessions_mutex_);
-    for (auto it = remote_sessions_.begin();
-         it != remote_sessions_.end();) {
-      auto &props = it->second;
-      if (focused_remote_id_ == props->remote_id_) {
-        if (ConnectionStatusWindow(props)) {
-          it = remote_sessions_.erase(it);
-        } else {
-          ++it;
-        }
-      } else {
-        ++it;
-      }
-    }
-  }
-
-  return 0;
-}
-} // namespace crossdesk
@@ -1,359 +0,0 @@
-#include "application/gui_application.h"
-
-#if _WIN32 && CROSSDESK_PORTABLE
-
-#include <shellapi.h>
-
-#include <algorithm>
-#include <vector>
-
-#include "localization.h"
-#include "rd_log.h"
-#include "service_host.h"
-
-namespace crossdesk {
-namespace {
-
-std::filesystem::path GetCurrentExecutablePath() {
-  std::vector<wchar_t> buffer(MAX_PATH);
-  while (true) {
-    DWORD length = GetModuleFileNameW(nullptr, buffer.data(),
-                                      static_cast<DWORD>(buffer.size()));
-    if (length == 0) {
-      return {};
-    }
-    if (length < buffer.size()) {
-      return std::filesystem::path(buffer.data(), buffer.data() + length);
-    }
-    if (buffer.size() >= 32768) {
-      return {};
-    }
-    buffer.resize(buffer.size() * 2);
-  }
-}
-
-bool InstallServiceWithElevation() {
-  const std::filesystem::path executable_path = GetCurrentExecutablePath();
-  if (executable_path.empty()) {
-    LOG_ERROR("Portable service install failed: current executable not found");
-    return false;
-  }
-
-  const std::filesystem::path service_path =
-      executable_path.parent_path() / L"crossdesk_service.exe";
-  const std::filesystem::path helper_path =
-      executable_path.parent_path() / L"crossdesk_session_helper.exe";
-  if (!std::filesystem::exists(service_path) ||
-      !std::filesystem::exists(helper_path)) {
-    LOG_ERROR("Portable service install failed: service binaries missing, "
-              "service={}, "
-              "helper={}",
-              service_path.string(), helper_path.string());
-    return false;
-  }
-
-  std::wstring executable = executable_path.wstring();
-  std::wstring working_dir = executable_path.parent_path().wstring();
-  std::wstring parameters = L"--service-install";
-
-  SHELLEXECUTEINFOW execute_info{};
-  execute_info.cbSize = sizeof(execute_info);
-  execute_info.fMask = SEE_MASK_NOCLOSEPROCESS;
-  execute_info.hwnd = nullptr;
-  execute_info.lpVerb = L"runas";
-  execute_info.lpFile = executable.c_str();
-  execute_info.lpParameters = parameters.c_str();
-  execute_info.lpDirectory = working_dir.c_str();
-  execute_info.nShow = SW_HIDE;
-
-  if (!ShellExecuteExW(&execute_info)) {
-    LOG_ERROR("Portable service install failed: ShellExecuteExW error={}",
-              GetLastError());
-    return false;
-  }
-
-  DWORD wait_result = WaitForSingleObject(execute_info.hProcess, INFINITE);
-  DWORD exit_code = 1;
-  if (wait_result == WAIT_OBJECT_0) {
-    GetExitCodeProcess(execute_info.hProcess, &exit_code);
-  } else {
-    LOG_ERROR("Portable service install wait failed, result={}", wait_result);
-  }
-  CloseHandle(execute_info.hProcess);
-
-  if (exit_code != 0) {
-    LOG_ERROR("Portable service install command failed, exit_code={}",
-              exit_code);
-    return false;
-  }
-
-  const bool started = StartCrossDeskService();
-  if (!started) {
-    LOG_WARN("Portable service installed but start failed");
-  }
-  return IsCrossDeskServiceInstalled() && started;
-}
-
-} // namespace
-
-void GuiApplication::CheckPortableWindowsService() {
-  if (portable_service_prompt_checked_) {
-    return;
-  }
-  portable_service_prompt_checked_ = true;
-
-  if (IsCrossDeskServiceInstalled()) {
-    return;
-  }
-
-  if (portable_service_prompt_suppressed_) {
-    return;
-  }
-
-  portable_service_install_state_.store(PortableServiceInstallState::idle,
-                                        std::memory_order_relaxed);
-  show_portable_service_install_window_ = true;
-}
-
-void GuiApplication::StartPortableWindowsServiceInstall() {
-  portable_service_do_not_remind_ = false;
-  PortableServiceInstallState expected = PortableServiceInstallState::idle;
-  if (!portable_service_install_state_.compare_exchange_strong(
-          expected, PortableServiceInstallState::installing,
-          std::memory_order_acq_rel)) {
-    if (expected != PortableServiceInstallState::failed) {
-      return;
-    }
-    portable_service_install_state_.store(
-        PortableServiceInstallState::installing, std::memory_order_release);
-  }
-
-  JoinPortableWindowsServiceInstallThread();
-  portable_service_install_thread_ = std::thread([this]() {
-    const bool installed = InstallServiceWithElevation();
-    portable_service_install_state_.store(
-        installed ? PortableServiceInstallState::succeeded
-                  : PortableServiceInstallState::failed,
-        std::memory_order_release);
-  });
-}
-
-void GuiApplication::JoinPortableWindowsServiceInstallThread() {
-  if (portable_service_install_thread_.joinable()) {
-    portable_service_install_thread_.join();
-  }
-}
-
-int GuiApplication::PortableServiceInstallWindow() {
-  if (!show_portable_service_install_window_ &&
-      !show_portable_service_prompt_suppressed_window_) {
-    return 0;
-  }
-
-  const ImGuiViewport *viewport = ImGui::GetMainViewport();
-  const float window_width =
-      (std::min)(viewport->WorkSize.x * 0.6f, title_bar_button_width_ * 18.0f);
-  const float window_height =
-      (std::min)(viewport->WorkSize.y * 0.5f, title_bar_button_width_ * 8.0f);
-
-  if (show_portable_service_prompt_suppressed_window_) {
-    const float notice_width = window_width;
-    const float notice_height = (std::min)(viewport->WorkSize.y * 0.35f,
-                                           title_bar_button_width_ * 4.6f);
-    ImGui::SetNextWindowPos(
-        ImVec2(viewport->WorkPos.x +
-                   (viewport->WorkSize.x - notice_width) / 2.0f,
-               viewport->WorkPos.y +
-                   (viewport->WorkSize.y - notice_height) / 2.0f),
-        ImGuiCond_Appearing);
-    ImGui::SetNextWindowSize(ImVec2(notice_width, notice_height),
-                             ImGuiCond_Always);
-
-    ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_);
-    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f);
-
-    ImGui::Begin(
-        localization::notification[localization_language_index_].c_str(),
-        nullptr,
-        ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
-            ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings |
-            ImGuiWindowFlags_NoTitleBar);
-
-    ImGui::Spacing();
-    ImGui::SetWindowFontScale(0.55f);
-    ImGui::SetCursorPosX(notice_width * 0.08f);
-    ImGui::Text(
-        "%s", localization::notification[localization_language_index_].c_str());
-
-    ImGui::SetWindowFontScale(0.5f);
-    ImGui::SetCursorPosX(notice_width * 0.06f);
-    ImGui::SetCursorPosY(notice_height * 0.28f);
-    ImGui::PushTextWrapPos(notice_width * 0.88f);
-    ImGui::TextWrapped("%s",
-                       localization::windows_service_prompt_suppressed_message
-                           [localization_language_index_]
-                               .c_str());
-    ImGui::PopTextWrapPos();
-
-    const std::string ok_label = localization::ok[localization_language_index_];
-    const ImGuiStyle &style = ImGui::GetStyle();
-    const float ok_width =
-        ImGui::CalcTextSize(ok_label.c_str()).x + style.FramePadding.x * 2.0f;
-    ImGui::SetCursorPosX((notice_width - ok_width) * 0.5f);
-    ImGui::SetCursorPosY(notice_height * 0.75f);
-    if (ImGui::Button(ok_label.c_str())) {
-      show_portable_service_prompt_suppressed_window_ = false;
-    }
-
-    ImGui::SetWindowFontScale(1.0f);
-    ImGui::End();
-    ImGui::PopStyleVar(3);
-    ImGui::PopStyleColor();
-  }
-
-  if (!show_portable_service_install_window_) {
-    return 0;
-  }
-
-  ImGui::SetNextWindowPos(
-      ImVec2(viewport->WorkPos.x + (viewport->WorkSize.x - window_width) / 2.0f,
-             viewport->WorkPos.y +
-                 (viewport->WorkSize.y - window_height) / 2.0f),
-      ImGuiCond_Appearing);
-  ImGui::SetNextWindowSize(ImVec2(window_width, window_height),
-                           ImGuiCond_Always);
-
-  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_);
-  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f);
-
-  ImGui::Begin(
-      localization::windows_service_setup_title[localization_language_index_]
-          .c_str(),
-      nullptr,
-      ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
-          ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings |
-          ImGuiWindowFlags_NoTitleBar);
-
-  ImGui::Spacing();
-  ImGui::SetWindowFontScale(0.55f);
-  ImGui::SetCursorPosX(window_width * 0.08f);
-  ImGui::Text(
-      "%s",
-      localization::windows_service_setup_title[localization_language_index_]
-          .c_str());
-
-  const PortableServiceInstallState state =
-      portable_service_install_state_.load(std::memory_order_acquire);
-  const char *status_text = nullptr;
-  if (state == PortableServiceInstallState::installing ||
-      state == PortableServiceInstallState::succeeded ||
-      state == PortableServiceInstallState::failed) {
-    status_text =
-        localization::installing_windows_service[localization_language_index_]
-            .c_str();
-    if (state == PortableServiceInstallState::succeeded) {
-      status_text = localization::windows_service_install_success
-                        [localization_language_index_]
-                            .c_str();
-    } else if (state == PortableServiceInstallState::failed) {
-      status_text = localization::windows_service_install_failed
-                        [localization_language_index_]
-                            .c_str();
-    }
-  }
-
-  ImGui::SetWindowFontScale(0.45f);
-  ImGui::SetCursorPosX(window_width * 0.04f);
-  ImGui::SetCursorPosY(window_height * 0.22f);
-  ImGui::BeginChild("PortableServiceInstallContent",
-                    ImVec2(window_width * 0.92f, window_height * 0.45f),
-                    ImGuiChildFlags_Borders, ImGuiWindowFlags_None);
-  ImGui::SetWindowFontScale(0.5f);
-  const float wrap_pos = ImGui::GetContentRegionAvail().x;
-  ImGui::PushTextWrapPos(wrap_pos);
-  ImGui::TextWrapped(
-      "%s",
-      localization::windows_service_setup_message[localization_language_index_]
-          .c_str());
-  if (status_text != nullptr) {
-    ImGui::Spacing();
-    ImGui::TextWrapped("%s", status_text);
-  }
-  ImGui::PopTextWrapPos();
-  ImGui::EndChild();
-
-  ImGui::SetWindowFontScale(0.5f);
-  ImGui::SetCursorPosX(window_width * 0.08f);
-  ImGui::SetCursorPosY(window_height * 0.71f);
-  ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-  ImGui::Checkbox(
-      localization::do_not_remind_again[localization_language_index_].c_str(),
-      &portable_service_do_not_remind_);
-  ImGui::PopStyleVar();
-
-  const float button_y = window_height * 0.84f;
-  const ImGuiStyle &style = ImGui::GetStyle();
-  const auto default_button_width = [&style](const std::string &label) {
-    return ImGui::CalcTextSize(label.c_str()).x + style.FramePadding.x * 2.0f;
-  };
-  const std::string install_label =
-      localization::install_windows_service[localization_language_index_];
-  const std::string cancel_label =
-      localization::cancel[localization_language_index_];
-  const std::string ok_label = localization::ok[localization_language_index_];
-  const float buttons_width = state == PortableServiceInstallState::succeeded
-                                  ? default_button_width(ok_label)
-                                  : default_button_width(install_label) +
-                                        style.ItemSpacing.x +
-                                        default_button_width(cancel_label);
-  ImGui::SetCursorPosX((window_width - buttons_width) * 0.5f);
-  ImGui::SetCursorPosY(button_y);
-
-  if (state == PortableServiceInstallState::succeeded) {
-    if (ImGui::Button(ok_label.c_str())) {
-      show_portable_service_install_window_ = false;
-      JoinPortableWindowsServiceInstallThread();
-    }
-  } else {
-    if (state == PortableServiceInstallState::installing) {
-      ImGui::BeginDisabled();
-    }
-    if (ImGui::Button(install_label.c_str())) {
-      StartPortableWindowsServiceInstall();
-    }
-    if (state == PortableServiceInstallState::installing) {
-      ImGui::EndDisabled();
-    }
-
-    ImGui::SameLine();
-    if (state == PortableServiceInstallState::installing) {
-      ImGui::BeginDisabled();
-    }
-    if (ImGui::Button(cancel_label.c_str())) {
-      if (portable_service_do_not_remind_) {
-        portable_service_prompt_suppressed_ = true;
-        config_center_->SetPortableServicePromptSuppressed(true);
-        show_portable_service_prompt_suppressed_window_ = true;
-      }
-      show_portable_service_install_window_ = false;
-    }
-    if (state == PortableServiceInstallState::installing) {
-      ImGui::EndDisabled();
-    }
-  }
-
-  ImGui::SetWindowFontScale(1.0f);
-  ImGui::End();
-  ImGui::PopStyleVar(3);
-  ImGui::PopStyleColor();
-
-  return 0;
-}
-
-} // namespace crossdesk
-
-#endif
@@ -1,197 +0,0 @@
-#include <filesystem>
-#include <vector>
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#include "application/gui_application.h"
-#include "layout.h"
-#include "localization.h"
-#include "rd_log.h"
-
-namespace crossdesk {
-
-std::vector<std::string> GetRootEntries() {
-  std::vector<std::string> roots;
-#ifdef _WIN32
-  DWORD mask = GetLogicalDrives();
-  for (char letter = 'A'; letter <= 'Z'; ++letter) {
-    if (mask & 1) {
-      roots.push_back(std::string(1, letter) + ":\\");
-    }
-    mask >>= 1;
-  }
-#else
-  roots.push_back("/");
-#endif
-  return roots;
-}
-
-int GuiApplication::SelfHostedServerWindow() {
-  ImGuiIO &io = ImGui::GetIO();
-  if (show_self_hosted_server_config_window_) {
-    if (self_hosted_server_config_window_pos_reset_) {
-      if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-        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.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.35f));
-      }
-
-      self_hosted_server_config_window_pos_reset_ = false;
-    }
-
-    // Settings
-    {
-      ImGui::SetWindowFontScale(0.5f);
-      ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-      ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_);
-      ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f);
-
-      ImGui::Begin(localization::self_hosted_server_settings
-                       [localization_language_index_]
-                           .c_str(),
-                   nullptr,
-                   ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
-                       ImGuiWindowFlags_NoSavedSettings);
-      ImGui::SetWindowFontScale(1.0f);
-      ImGui::SetWindowFontScale(0.5f);
-      ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
-      {
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("%s", localization::self_hosted_server_address
-                              [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);
-
-        ImGui::InputText("##signal_server_ip_self_", signal_server_ip_self_,
-                         IM_ARRAYSIZE(signal_server_ip_self_),
-                         ImGuiInputTextFlags_AlwaysOverwrite);
-      }
-
-      ImGui::Separator();
-
-      {
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text(
-            "%s",
-            localization::self_hosted_server_port[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);
-
-        ImGui::InputText("##signal_server_port_self_", signal_server_port_self_,
-                         IM_ARRAYSIZE(signal_server_port_self_));
-      }
-
-      ImGui::Separator();
-
-      {
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("%s", localization::self_hosted_server_coturn_server_port
-                              [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);
-
-        ImGui::InputText("##coturn_server_port_self_", coturn_server_port_self_,
-                         IM_ARRAYSIZE(coturn_server_port_self_));
-      }
-
-      if (stream_window_inited_) {
-        ImGui::EndDisabled();
-      }
-
-      ImGui::Dummy(ImVec2(0.0f, title_bar_button_width_ * 0.25f));
-
-      if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-        ImGui::SetCursorPosX(title_bar_button_width_ * 2.32f);
-      } else {
-        ImGui::SetCursorPosX(title_bar_button_width_ * 2.7f);
-      }
-
-      ImGui::PopStyleVar();
-
-      // OK
-      if (ImGui::Button(
-              localization::ok[localization_language_index_].c_str())) {
-        show_self_hosted_server_config_window_ = false;
-
-        config_center_->SetServerHost(signal_server_ip_self_);
-        config_center_->SetServerPort(atoi(signal_server_port_self_));
-        config_center_->SetCoturnServerPort(atoi(coturn_server_port_self_));
-        strncpy(signal_server_ip_, signal_server_ip_self_,
-                sizeof(signal_server_ip_) - 1);
-        signal_server_ip_[sizeof(signal_server_ip_) - 1] = '\0';
-        strncpy(signal_server_port_, signal_server_port_self_,
-                sizeof(signal_server_port_) - 1);
-        signal_server_port_[sizeof(signal_server_port_) - 1] = '\0';
-        strncpy(coturn_server_port_, coturn_server_port_self_,
-                sizeof(coturn_server_port_) - 1);
-        coturn_server_port_[sizeof(coturn_server_port_) - 1] = '\0';
-
-        self_hosted_server_config_window_pos_reset_ = true;
-      }
-
-      ImGui::SameLine();
-      // Cancel
-      if (ImGui::Button(
-              localization::cancel[localization_language_index_].c_str())) {
-        show_self_hosted_server_config_window_ = false;
-        self_hosted_server_config_window_pos_reset_ = true;
-        strncpy(signal_server_ip_self_,
-                config_center_->GetSignalServerHost().c_str(),
-                sizeof(signal_server_ip_self_) - 1);
-        signal_server_ip_self_[sizeof(signal_server_ip_self_) - 1] = '\0';
-        int signal_port = config_center_->GetSignalServerPort();
-        if (signal_port > 0) {
-          strncpy(signal_server_port_self_, std::to_string(signal_port).c_str(),
-                  sizeof(signal_server_port_self_) - 1);
-          signal_server_port_self_[sizeof(signal_server_port_self_) - 1] = '\0';
-        } else {
-          signal_server_port_self_[0] = '\0';
-        }
-        int coturn_port = config_center_->GetCoturnServerPort();
-        if (coturn_port > 0) {
-          strncpy(coturn_server_port_self_, std::to_string(coturn_port).c_str(),
-                  sizeof(coturn_server_port_self_) - 1);
-          coturn_server_port_self_[sizeof(coturn_server_port_self_) - 1] = '\0';
-        } else {
-          coturn_server_port_self_[0] = '\0';
-        }
-      }
-
-      ImGui::SetWindowFontScale(1.0f);
-      ImGui::SetWindowFontScale(0.5f);
-      ImGui::End();
-      ImGui::PopStyleVar(2);
-      ImGui::PopStyleColor();
-      ImGui::SetWindowFontScale(1.0f);
-    }
-  }
-
-  return 0;
-}
-} // namespace crossdesk
@@ -1,388 +0,0 @@
-#include <algorithm>
-#include <cmath>
-#include <cstdio>
-#include <memory>
-#include <shared_mutex>
-#include <string>
-#include <vector>
-
-#include "application/gui_application.h"
-#include "layout_relative.h"
-#include "localization.h"
-#include "rd_log.h"
-#include "rounded_corner_button.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 GuiApplication::ServerWindow() {
-  ImGui::SetNextWindowSize(ImVec2(server_window_width_, server_window_height_),
-                           ImGuiCond_Always);
-  ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always);
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_);
-  ImGui::Begin("##server_window", nullptr,
-               ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize |
-                   ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoCollapse |
-                   ImGuiWindowFlags_NoScrollbar |
-                   ImGuiWindowFlags_NoScrollWithMouse);
-  ImGui::PopStyleVar();
-
-  server_window_title_bar_height_ = title_bar_height_;
-
-  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_);
-  ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always);
-  ImGui::BeginChild(
-      "ServerTitleBar",
-      ImVec2(server_window_width_, server_window_title_bar_height_),
-      ImGuiChildFlags_Borders,
-      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";
-
-    bool toggle_clicked = RoundedCornerButton(
-        toggle_label.c_str(),
-        ImVec2(server_title_bar_button_width, server_title_bar_button_height),
-        8.5f, ImDrawFlags_RoundCornersTopLeft, true, IM_COL32(0, 0, 0, 0),
-        IM_COL32(0, 0, 0, 25), IM_COL32(255, 255, 255, 255));
-    if (toggle_clicked) {
-      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(2);
-  ImGui::PopStyleColor();
-
-  RemoteClientInfoWindow();
-
-  ImGui::End();
-  return 0;
-}
-
-int GuiApplication::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_Borders,
-      ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-          ImGuiWindowFlags_NoBringToFrontOnFocus);
-  ImGui::PopStyleVar();
-  ImGui::PopStyleColor();
-
-  float font_scale = localization_language_index_ == 0 ? 0.5f : 0.45f;
-
-  std::vector<std::pair<std::string, std::string>> remote_entries;
-  {
-    std::shared_lock lock(connection_status_mutex_);
-    remote_entries.reserve(connection_status_.size());
-    for (const auto &kv : connection_status_) {
-      const auto host_it = connection_host_names_.find(kv.first);
-      const std::string display_name =
-          (host_it != connection_host_names_.end() && !host_it->second.empty())
-              ? host_it->second
-              : kv.first;
-      remote_entries.emplace_back(kv.first, display_name);
-    }
-  }
-
-  auto find_display_name_by_remote_id =
-      [&remote_entries](const std::string &remote_id) -> std::string {
-    for (const auto &entry : remote_entries) {
-      if (entry.first == remote_id) {
-        return entry.second;
-      }
-    }
-    return {};
-  };
-
-  if (!selected_server_remote_id_.empty() &&
-      find_display_name_by_remote_id(selected_server_remote_id_).empty()) {
-    selected_server_remote_id_.clear();
-    selected_server_remote_hostname_.clear();
-  }
-  if (selected_server_remote_id_.empty() && !remote_entries.empty()) {
-    selected_server_remote_id_ = remote_entries.front().first;
-  }
-  if (!selected_server_remote_id_.empty()) {
-    selected_server_remote_hostname_ =
-        find_display_name_by_remote_id(selected_server_remote_id_);
-  }
-
-  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_entries.size()); i++) {
-      const bool selected =
-          (remote_entries[i].first == selected_server_remote_id_);
-      if (ImGui::Selectable(remote_entries[i].second.c_str(), selected)) {
-        selected_server_remote_id_ = remote_entries[i].first;
-        selected_server_remote_hostname_ = remote_entries[i].second;
-      }
-      if (selected) {
-        ImGui::SetItemDefaultFocus();
-      }
-    }
-    ImGui::EndCombo();
-  }
-
-  ImGui::Separator();
-
-  ImGui::SetWindowFontScale(font_scale);
-
-  if (!selected_server_remote_id_.empty()) {
-    ConnectionStatus status = ConnectionStatus::Closed;
-    {
-      std::shared_lock lock(connection_status_mutex_);
-      auto it = connection_status_.find(selected_server_remote_id_);
-      if (it != connection_status_.end()) {
-        status = 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());
-
-    transfers_.ProcessSelectedFile(path, nullptr, file_label_,
-                                   selected_server_remote_id_);
-  }
-
-  auto &file_transfer = transfers_.global_state();
-  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, window_rounding_);
-  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
@@ -1,311 +0,0 @@
-#include "application/gui_application.h"
-#include "localization.h"
-#include "rd_log.h"
-
-namespace crossdesk {
-
-void GuiApplication::DrawConnectionStatusText(
-    std::shared_ptr<RemoteSession> &props) {
-  std::string text;
-  switch (props->connection_status_.load()) {
-  case ConnectionStatus::Disconnected:
-    text = localization::p2p_disconnected[localization_language_index_];
-    break;
-  case ConnectionStatus::Failed:
-    text = localization::p2p_failed[localization_language_index_];
-    break;
-  case ConnectionStatus::Closed:
-    text = localization::p2p_closed[localization_language_index_];
-    break;
-  default:
-    break;
-  }
-
-  if (!text.empty()) {
-    ImVec2 size = ImGui::GetWindowSize();
-    ImVec2 text_size = ImGui::CalcTextSize(text.c_str());
-    ImGui::SetCursorPos(
-        ImVec2((size.x - text_size.x) * 0.5f,
-               (size.y - text_size.y - title_bar_height_) * 0.5f));
-    ImGui::TextColored(ImVec4(1.0f, 1.0f, 1.0f, 1.0f), "%s", text.c_str());
-  }
-}
-
-void GuiApplication::DrawReceivingScreenText(
-    std::shared_ptr<RemoteSession> &props) {
-  if (!props->connection_established_ ||
-      props->connection_status_.load() != ConnectionStatus::Connected) {
-    return;
-  }
-
-  bool has_valid_frame = false;
-  {
-    std::lock_guard<std::mutex> lock(props->video_frame_mutex_);
-    has_valid_frame = props->stream_texture_ != nullptr &&
-                      props->video_width_ > 0 && props->video_height_ > 0 &&
-                      props->front_frame_ && !props->front_frame_->empty();
-  }
-
-  if (has_valid_frame) {
-    return;
-  }
-
-  const std::string &text =
-      localization::receiving_screen[localization_language_index_];
-  ImVec2 size = ImGui::GetWindowSize();
-  ImVec2 text_size = ImGui::CalcTextSize(text.c_str());
-  ImGui::SetCursorPos(
-      ImVec2((size.x - text_size.x) * 0.5f, (size.y - text_size.y) * 0.5f));
-  ImGui::TextColored(ImVec4(1.0f, 1.0f, 1.0f, 0.92f), "%s", text.c_str());
-}
-
-void GuiApplication::CloseTab(decltype(remote_sessions_)::iterator &it) {
-  // std::unique_lock lock(remote_sessions_mutex_);
-  if (it != remote_sessions_.end()) {
-    CloseRemoteSession(it->second);
-    it = remote_sessions_.erase(it);
-    if (remote_sessions_.empty()) {
-      SDL_Event event;
-      event.type = SDL_EVENT_QUIT;
-      SDL_PushEvent(&event);
-    }
-  }
-}
-
-int GuiApplication::StreamWindow() {
-  ImGui::SetNextWindowPos(
-      ImVec2(0, fullscreen_button_pressed_ ? 0 : title_bar_height_),
-      ImGuiCond_Always);
-  ImGui::SetNextWindowSize(ImVec2(stream_window_width_, stream_window_height_),
-                           ImGuiCond_Always);
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
-  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0));
-  ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0, 0, 0, 0));
-  bool video_bg_opened = ImGui::Begin(
-      "VideoBg", nullptr,
-      ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration |
-          ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoDocking);
-  ImGui::PopStyleColor(2);
-  ImGui::PopStyleVar();
-
-  if (!video_bg_opened) {
-    return 0;
-  }
-
-  ImGuiWindowFlags stream_window_flag =
-      ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoDecoration |
-      ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoMove;
-
-  if (!fullscreen_button_pressed_) {
-    ImGui::SetNextWindowPos(
-        ImVec2(title_bar_button_width_ * 0.8f, title_bar_button_width_ * 0.1f),
-        ImGuiCond_Always);
-    ImGui::SetNextWindowSize(ImVec2(0, title_bar_button_width_ * 0.8f),
-                             ImGuiCond_Always);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
-    ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0.0f));
-    ImGui::Begin("TabBar", nullptr,
-                 ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration |
-                     ImGuiWindowFlags_NoBringToFrontOnFocus |
-                     ImGuiWindowFlags_NoDocking);
-    ImGui::PopStyleColor();
-    ImGui::PopStyleVar(2);
-
-    if (ImGui::BeginTabBar("StreamTabBar",
-                           ImGuiTabBarFlags_Reorderable |
-                               ImGuiTabBarFlags_AutoSelectNewTabs)) {
-      is_tab_bar_hovered_ = ImGui::IsWindowHovered();
-
-      // std::shared_lock lock(remote_sessions_mutex_);
-      for (auto it = remote_sessions_.begin();
-           it != remote_sessions_.end();) {
-        auto &props = it->second;
-        if (!props->tab_opened_) {
-          std::string remote_id_to_close = props->remote_id_;
-          // lock.unlock();
-          {
-            // std::unique_lock unique_lock(remote_sessions_mutex_);
-            auto close_it = remote_sessions_.find(remote_id_to_close);
-            if (close_it != remote_sessions_.end()) {
-              CloseTab(close_it);
-            }
-          }
-          // lock.lock();
-          it = remote_sessions_.begin();
-          continue;
-        }
-
-        std::string tab_label =
-            enable_srtp_
-                ? std::string(ICON_FA_SHIELD_HALVED) + " " + props->remote_id_
-                : props->remote_id_;
-        if (ImGui::BeginTabItem(tab_label.c_str(), &props->tab_opened_)) {
-          props->tab_selected_ = true;
-          ImGui::SetWindowFontScale(0.6f);
-
-          ImGui::SetNextWindowSize(
-              ImVec2(stream_window_width_,
-                     stream_window_height_ -
-                         (fullscreen_button_pressed_ ? 0 : title_bar_height_)),
-              ImGuiCond_Always);
-          ImGui::SetNextWindowPos(
-              ImVec2(0, fullscreen_button_pressed_ ? 0 : title_bar_height_),
-              ImGuiCond_Always);
-          ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
-          ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
-          ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0.0f));
-          ImGui::Begin(props->remote_id_.c_str(), nullptr, stream_window_flag);
-          ImGui::PopStyleColor();
-          ImGui::PopStyleVar(2);
-
-          ImVec2 pos = ImGui::GetWindowPos();
-          ImVec2 size = ImGui::GetWindowSize();
-          props->render_window_x_ = pos.x;
-          props->render_window_y_ = pos.y;
-          props->render_window_width_ = size.x;
-          props->render_window_height_ = size.y;
-          UpdateRenderRect();
-
-          ControlWindow(props);
-
-          // Show file transfer window if needed
-          FileTransferWindow(props);
-
-          DrawReceivingScreenText(props);
-
-          focused_remote_id_ = props->remote_id_;
-
-          if (!props->peer_) {
-            std::string remote_id_to_erase = props->remote_id_;
-            // lock.unlock();
-            {
-              // std::unique_lock unique_lock(remote_sessions_mutex_);
-              auto erase_it = remote_sessions_.find(remote_id_to_erase);
-              if (erase_it != remote_sessions_.end()) {
-                // Ensure we flush pending STREAM_REFRESH_EVENT events and
-                // clean up peer resources before erasing the entry, otherwise
-                // SDL events may still hold raw pointers to freed
-                // RemoteSession (including video_frame_mutex_),
-                // leading to std::system_error when locking.
-                CloseTab(erase_it);
-              }
-            }
-            // lock.lock();
-            ImGui::End();
-            ImGui::EndTabItem();
-            it = remote_sessions_.begin();
-            continue;
-          } else {
-            DrawConnectionStatusText(props);
-            ++it;
-          }
-
-          ImGui::End();
-          ImGui::EndTabItem();
-        } else {
-          props->tab_selected_ = false;
-          if (!props->tab_opened_) {
-            std::string remote_id_to_close = props->remote_id_;
-            // lock.unlock();
-            {
-              // std::unique_lock unique_lock(remote_sessions_mutex_);
-              auto close_it = remote_sessions_.find(remote_id_to_close);
-              if (close_it != remote_sessions_.end()) {
-                CloseTab(close_it);
-              }
-            }
-            // lock.lock();
-            it = remote_sessions_.begin();
-            continue;
-          }
-          ++it;
-        }
-      }
-
-      ImGui::EndTabBar();
-    }
-
-    ImGui::End(); // End TabBar
-  } else {
-    // std::shared_lock lock(remote_sessions_mutex_);
-    for (auto it = remote_sessions_.begin();
-         it != remote_sessions_.end();) {
-      auto &props = it->second;
-      if (!props->tab_opened_) {
-        std::string remote_id_to_close = props->remote_id_;
-        // lock.unlock();
-        {
-          // std::unique_lock unique_lock(remote_sessions_mutex_);
-          auto close_it = remote_sessions_.find(remote_id_to_close);
-          if (close_it != remote_sessions_.end()) {
-            CloseTab(close_it);
-          }
-        }
-        // lock.lock();
-        it = remote_sessions_.begin();
-        continue;
-      }
-
-      if (props->tab_selected_) {
-        ImGui::SetNextWindowSize(
-            ImVec2(stream_window_width_,
-                   stream_window_height_ -
-                       (fullscreen_button_pressed_ ? 0 : title_bar_height_)),
-            ImGuiCond_Always);
-        ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always);
-        ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
-        ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
-        ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0.0f));
-        ImGui::Begin(props->remote_id_.c_str(), nullptr, stream_window_flag);
-        ImGui::PopStyleColor();
-        ImGui::PopStyleVar(2);
-
-        ImVec2 pos = ImGui::GetWindowPos();
-        ImVec2 size = ImGui::GetWindowSize();
-        props->render_window_x_ = pos.x;
-        props->render_window_y_ = pos.y;
-        props->render_window_width_ = size.x;
-        props->render_window_height_ = size.y;
-        UpdateRenderRect();
-
-        ControlWindow(props);
-
-        // Show file transfer window if needed
-        FileTransferWindow(props);
-
-        DrawReceivingScreenText(props);
-
-        ImGui::End();
-
-        if (!props->peer_) {
-          fullscreen_button_pressed_ = false;
-          SDL_SetWindowFullscreen(stream_window_, false);
-          std::string remote_id_to_erase = props->remote_id_;
-          // lock.unlock();
-          {
-            // std::unique_lock unique_lock(remote_sessions_mutex_);
-            auto erase_it = remote_sessions_.find(remote_id_to_erase);
-            if (erase_it != remote_sessions_.end()) {
-              CloseTab(erase_it);
-            }
-          }
-          // lock.lock();
-          it = remote_sessions_.begin();
-          continue;
-        } else {
-          DrawConnectionStatusText(props);
-          ++it;
-        }
-      } else {
-        ++it;
-      }
-    }
-  }
-
-  // UpdateRenderRect();
-  ImGui::End(); // End VideoBg
-
-  return 0;
-}
-} // namespace crossdesk
@@ -1,163 +0,0 @@
-#include <string>
-
-#include "application/gui_application.h"
-#include "layout.h"
-#include "localization.h"
-#include "rd_log.h"
-
-namespace crossdesk {
-
-int GuiApplication::UpdateNotificationWindow() {
-  if (show_update_notification_window_ && update_available_) {
-    const ImGuiViewport* viewport = ImGui::GetMainViewport();
-
-    float update_notification_window_width = title_bar_button_width_ * 10.0f;
-    float update_notification_window_height = title_bar_button_width_ * 8.0f;
-
-    // #ifdef __APPLE__
-    //     float font_scale = 0.3f;
-    // #else
-    //     float font_scale = 0.5f;
-    // #endif
-
-    ImGui::SetNextWindowPos(ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
-                                    update_notification_window_width) /
-                                       2,
-                                   (viewport->WorkSize.y - viewport->WorkPos.y -
-                                    update_notification_window_height) /
-                                       2),
-                            ImGuiCond_FirstUseEver);
-
-    ImGui::SetNextWindowSize(ImVec2(update_notification_window_width,
-                                    update_notification_window_height));
-
-    ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_);
-    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f);
-    ImGui::Begin(
-        localization::notification[localization_language_index_].c_str(),
-        nullptr,
-        ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
-            ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoTitleBar);
-
-    ImGui::SetCursorPosY(ImGui::GetCursorPosY() +
-                         update_notification_window_height * 0.05f);
-
-    // title: new version available
-    ImGui::SetCursorPosX(update_notification_window_width * 0.1f);
-    ImGui::SetWindowFontScale(0.55f);
-    std::string title =
-        localization::new_version_available[localization_language_index_] +
-        ": " + latest_version_;
-    ImGui::Text("%s", title.c_str());
-    ImGui::SetWindowFontScale(0.1f);
-
-    ImGui::Spacing();
-
-    // website link
-    std::string download_text =
-        localization::access_website[localization_language_index_] +
-        "https://crossdesk.cn";
-    ImGui::SetWindowFontScale(0.5f);
-    ImGui::SetCursorPosX(update_notification_window_width * 0.1f);
-    Hyperlink(download_text, "https://crossdesk.cn",
-              update_notification_window_width);
-    ImGui::SetWindowFontScale(1.0f);
-
-    ImGui::Spacing();
-
-    float scrollable_height =
-        update_notification_window_height - UPDATE_NOTIFICATION_RESERVED_HEIGHT;
-
-    if (main_windows_system_chinese_font_ != nullptr) {
-      ImGui::PushFont(main_windows_system_chinese_font_);
-    }
-    // scrollable content area
-    ImGui::SetCursorPosX(update_notification_window_width * 0.05f);
-    ImGui::BeginChild(
-        "ScrollableContent",
-        ImVec2(update_notification_window_width * 0.9f, scrollable_height),
-        ImGuiChildFlags_Borders, ImGuiWindowFlags_None);
-    ImGui::SetWindowFontScale(0.5f);
-    // set text wrap position to current available width (accounts for
-    // scrollbar)
-    float wrap_pos = ImGui::GetContentRegionAvail().x;
-    ImGui::PushTextWrapPos(wrap_pos);
-
-    // release name
-    if (latest_version_info_.contains("releaseName") &&
-        latest_version_info_["releaseName"].is_string() &&
-        !latest_version_info_["releaseName"].empty()) {
-      ImGui::SetCursorPosX(update_notification_window_width * 0.05f);
-      std::string release_name =
-          latest_version_info_["releaseName"].get<std::string>();
-      ImGui::TextWrapped("%s", release_name.c_str());
-      ImGui::Spacing();
-    }
-
-    // release notes
-    if (!release_notes_.empty()) {
-      ImGui::SetCursorPosX(update_notification_window_width * 0.05f);
-      ImGui::TextWrapped("%s", release_notes_.c_str());
-      ImGui::Spacing();
-    }
-
-    // release date
-    if (latest_version_info_.contains("releaseDate") &&
-        latest_version_info_["releaseDate"].is_string() &&
-        !latest_version_info_["releaseDate"].empty()) {
-      ImGui::SetCursorPosX(update_notification_window_width * 0.05f);
-      std::string date_label =
-          localization::release_date[localization_language_index_];
-      std::string release_date = latest_version_info_["releaseDate"];
-      std::string date_text = date_label + release_date;
-      ImGui::Text("%s", date_text.c_str());
-      ImGui::Spacing();
-    }
-
-    // pop text wrap position
-    ImGui::PopTextWrapPos();
-
-    ImGui::EndChild();
-
-    // pop system font
-    if (main_windows_system_chinese_font_ != nullptr) {
-      ImGui::PopFont();
-    }
-
-    ImGui::Spacing();
-
-    if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-      ImGui::SetCursorPosX(update_notification_window_width * 0.407f);
-    } else {
-      ImGui::SetCursorPosX(update_notification_window_width * 0.367f);
-    }
-
-    ImGui::SetWindowFontScale(0.5f);
-    // update button
-    if (ImGui::Button(
-            localization::update[localization_language_index_].c_str())) {
-      // open download page
-      std::string url = "https://crossdesk.cn";
-      OpenUrl(url);
-      show_update_notification_window_ = false;
-    }
-
-    ImGui::SameLine();
-
-    if (ImGui::Button(
-            localization::cancel[localization_language_index_].c_str())) {
-      show_update_notification_window_ = false;
-    }
-
-    ImGui::SetWindowFontScale(1.0f);
-
-    ImGui::End();
-    ImGui::PopStyleVar(3);
-    ImGui::PopStyleColor();
-  }
-  return 0;
-}
-
-}  // namespace crossdesk
@@ -1,6 +1,5 @@
 #include "rd_log.h"

-#include <atomic>
 #include <filesystem>

 namespace crossdesk {
@@ -9,26 +8,38 @@ namespace {

 std::string g_log_dir = "logs";
 std::once_flag g_logger_once_flag;
+std::mutex g_logger_mutex;
 std::shared_ptr<spdlog::logger> g_logger;
-std::atomic<bool> g_logger_created{false};
+
+std::string NormalizeLogDirectory(const std::string& log_dir) {
+  const std::filesystem::path path = log_dir.empty() ? "logs" : log_dir;
+  std::error_code ec;
+  const auto absolute = std::filesystem::absolute(path, ec);
+  return (ec ? path : absolute).lexically_normal().string();
+}

 }  // namespace

 void InitLogger(const std::string& log_dir) {
-  if (g_logger_created.load()) {
-    LOG_WARN(
-        "InitLogger called after logger initialized. Ignoring log_dir: {}, "
-        "using previous log_dir: {}",
-        log_dir, g_log_dir);
+  const auto directory = NormalizeLogDirectory(log_dir);
+  std::lock_guard<std::mutex> lock(g_logger_mutex);
+  if (g_logger) {
+    if (directory != g_log_dir) {
+      g_logger->warn(
+          "InitLogger called after logger initialized. Ignoring log_dir: {}, "
+          "using previous log_dir: {}",
+          directory, g_log_dir);
+    }
    return;
  }

-  g_log_dir = log_dir;
+  g_log_dir = directory;
 }

 std::shared_ptr<spdlog::logger> get_logger() {
  std::call_once(g_logger_once_flag, []() {
-    g_logger_created.store(true);
+    std::lock_guard<std::mutex> lock(g_logger_mutex);
+    g_log_dir = NormalizeLogDirectory(g_log_dir);

    std::error_code ec;
    std::filesystem::create_directories(g_log_dir, ec);
@@ -54,10 +65,12 @@ std::shared_ptr<spdlog::logger> get_logger() {
    sinks.push_back(std::make_shared<spdlog::sinks::rotating_file_sink_mt>(
        filename, 5 * 1024 * 1024, 3));

-    g_logger = std::make_shared<spdlog::logger>(LOGGER_NAME, sinks.begin(),
-                                                sinks.end());
-    g_logger->flush_on(spdlog::level::info);
-    spdlog::register_logger(g_logger);
+    auto logger = std::make_shared<spdlog::logger>(LOGGER_NAME, sinks.begin(),
+                                                   sinks.end());
+    logger->flush_on(spdlog::level::info);
+    spdlog::register_logger(logger);
+    logger->info("Logger initialized: path={}", filename);
+    g_logger = std::move(logger);
  });

  return g_logger;
@@ -122,6 +122,11 @@ struct OpenGlFunctions {
  PFNGLUNIFORM4FPROC uniform_4f = nullptr;
  PFNGLUSEPROGRAMPROC use_program = nullptr;
  PFNGLVERTEXATTRIBPOINTERPROC vertex_attrib_pointer = nullptr;
+  PFNGLGENFRAMEBUFFERSPROC gen_framebuffers = nullptr;
+  PFNGLDELETEFRAMEBUFFERSPROC delete_framebuffers = nullptr;
+  PFNGLBINDFRAMEBUFFERPROC bind_framebuffer = nullptr;
+  PFNGLFRAMEBUFFERTEXTURE2DPROC framebuffer_texture_2d = nullptr;
+  PFNGLCHECKFRAMEBUFFERSTATUSPROC check_framebuffer_status = nullptr;
 #if CROSSDESK_OPENGL_CUDA_INTEROP
  PFNGLFENCESYNCPROC fence_sync = nullptr;
  PFNGLCLIENTWAITSYNCPROC client_wait_sync = nullptr;
@@ -163,6 +168,15 @@ struct OpenGlFunctions {
           LoadOpenGlFunction(&vertex_attrib_pointer, "glVertexAttribPointer");
  }

+  bool LoadFramebufferFunctions() {
+    return LoadOpenGlFunction(&gen_framebuffers, "glGenFramebuffers") &&
+           LoadOpenGlFunction(&delete_framebuffers, "glDeleteFramebuffers") &&
+           LoadOpenGlFunction(&bind_framebuffer, "glBindFramebuffer") &&
+           LoadOpenGlFunction(&framebuffer_texture_2d, "glFramebufferTexture2D") &&
+           LoadOpenGlFunction(&check_framebuffer_status,
+                              "glCheckFramebufferStatus");
+  }
+
 #if CROSSDESK_OPENGL_CUDA_INTEROP
  bool LoadSyncFunctions() {
    return LoadOpenGlFunction(&fence_sync, "glFenceSync") &&
@@ -287,6 +301,17 @@ struct OpenGlVideoRenderer::Impl {
  GLint video_rect_location = -1;
  GLint corner_radius_location = -1;
  GLint video_enabled_location = -1;
+  GLint source_size_location = -1;
+  GLint filter_direction_location = -1;
+  GLint packed_video_location = -1;
+  GLuint scale_framebuffer = 0;
+  std::array<GLuint, 2> scale_textures{};
+  std::array<std::pair<int, int>, 2> scale_sizes{};
+  uint64_t scaled_sequence = 0;
+  bool scaling_available = false;
+  GLenum framebuffer_target = GL_FRAMEBUFFER;
+  GLenum framebuffer_binding = GL_FRAMEBUFFER_BINDING;
+  std::array<int, 4> logged_render_size{};
  int texture_width = 0;
  int texture_height = 0;
  int cpu_texture_width = 0;
@@ -504,6 +529,116 @@ struct OpenGlVideoRenderer::Impl {
  }
 #endif

+  // The vertex buffer and program are shared with the final underlay draw.
+  void DrawVideo(GLuint y, GLuint uv, int source_width, int source_height,
+                 int target_width, int target_height, int video_x, int video_y,
+                 int video_width, int video_height, int corner_radius,
+                 bool enabled, bool packed, float filter_x = 0.0f,
+                 float filter_y = 0.0f) {
+    gl.active_texture(GL_TEXTURE0);
+    glBindTexture(GL_TEXTURE_2D, y);
+    gl.active_texture(GL_TEXTURE1);
+    glBindTexture(GL_TEXTURE_2D, uv);
+    gl.uniform_2f(source_size_location, static_cast<GLfloat>(source_width),
+                  static_cast<GLfloat>(source_height));
+    gl.uniform_2f(target_size_location, static_cast<GLfloat>(target_width),
+                  static_cast<GLfloat>(target_height));
+    gl.uniform_4f(video_rect_location, static_cast<GLfloat>(video_x),
+                  static_cast<GLfloat>(video_y), static_cast<GLfloat>(video_width),
+                  static_cast<GLfloat>(video_height));
+    gl.uniform_1f(corner_radius_location, static_cast<GLfloat>(corner_radius));
+    gl.uniform_1f(video_enabled_location, enabled ? 1.0f : 0.0f);
+    gl.uniform_1f(packed_video_location, packed ? 1.0f : 0.0f);
+    gl.uniform_2f(filter_direction_location, filter_x, filter_y);
+    glViewport(0, 0, target_width, target_height);
+    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+  }
+
+  bool PrepareScaleTarget(size_t index, int width, int height) {
+    gl.active_texture(GL_TEXTURE0);
+    glBindTexture(GL_TEXTURE_2D, scale_textures[index]);
+    if (scale_sizes[index] != std::pair{width, height}) {
+      glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA,
+                   GL_UNSIGNED_BYTE, nullptr);
+      scale_sizes[index] = {width, height};
+    }
+    gl.framebuffer_texture_2d(framebuffer_target, GL_COLOR_ATTACHMENT0,
+                              GL_TEXTURE_2D, scale_textures[index], 0);
+    return gl.check_framebuffer_status(framebuffer_target) ==
+               GL_FRAMEBUFFER_COMPLETE &&
+           glGetError() == GL_NO_ERROR;
+  }
+
+  bool ScaleVideo(GLuint y, GLuint uv, int width, int height, int output_width,
+                  int output_height) {
+    if (!scaling_available) {
+      return false;
+    }
+    if (scaled_sequence == uploaded_sequence &&
+        scale_sizes[1] == std::pair{output_width, output_height}) {
+      return true;
+    }
+
+    GLint previous_framebuffer = 0;
+    glGetIntegerv(framebuffer_binding, &previous_framebuffer);
+    if (scale_framebuffer == 0) {
+      gl.gen_framebuffers(1, &scale_framebuffer);
+      glGenTextures(static_cast<GLsizei>(scale_textures.size()),
+                      scale_textures.data());
+      gl.active_texture(GL_TEXTURE0);
+      for (const GLuint texture : scale_textures) {
+        glBindTexture(GL_TEXTURE_2D, texture);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+      }
+    }
+    // A CUDA upload may have left its PBO bound: nullptr below allocates empty
+    // render targets and must never be interpreted as a PBO byte offset.
+    if (pixel_unpack_buffer_available) {
+      gl.bind_buffer(GL_PIXEL_UNPACK_BUFFER, 0);
+    }
+    gl.bind_framebuffer(framebuffer_target, scale_framebuffer);
+    bool success = scale_framebuffer != 0 && scale_textures[0] != 0 &&
+                   scale_textures[1] != 0;
+    bool packed = false;
+    while (success && (width != output_width || height != output_height)) {
+      // Bound shader work without truncating the filter for very small windows.
+      const int next_width = std::max(output_width, (width + 3) / 4);
+      const int next_height = std::max(output_height, (height + 3) / 4);
+      if (!PrepareScaleTarget(0, next_width, height)) {
+        success = false;
+        break;
+      }
+      DrawVideo(y, uv, width, height, next_width, height, 0, 0, next_width,
+                height, 0, true, packed, 1.0f, 0.0f);
+      if (!PrepareScaleTarget(1, next_width, next_height)) {
+        success = false;
+        break;
+      }
+      DrawVideo(scale_textures[0], uv, next_width, height, next_width,
+                next_height, 0, 0, next_width, next_height, 0, true, true,
+                0.0f, 1.0f);
+      success = glGetError() == GL_NO_ERROR;
+      y = scale_textures[1];
+      width = next_width;
+      height = next_height;
+      packed = true;
+    }
+    gl.bind_framebuffer(framebuffer_target,
+                         static_cast<GLuint>(previous_framebuffer));
+    if (!success) {
+      scaling_available = false;
+      while (glGetError() != GL_NO_ERROR) {
+      }
+      LOG_WARN("OpenGL video downsampling unavailable; using linear sampling");
+      return false;
+    }
+    scaled_sequence = uploaded_sequence;
+    return true;
+  }
+
  void ResetGlHandles() {
    program = 0;
    vertex_buffer = 0;
@@ -517,6 +652,15 @@ struct OpenGlVideoRenderer::Impl {
    video_rect_location = -1;
    corner_radius_location = -1;
    video_enabled_location = -1;
+    source_size_location = -1;
+    filter_direction_location = -1;
+    packed_video_location = -1;
+    scale_framebuffer = 0;
+    scale_textures = {};
+    scale_sizes = {};
+    scaled_sequence = 0;
+    scaling_available = false;
+    logged_render_size = {};
    texture_width = 0;
    texture_height = 0;
    cpu_texture_width = 0;
@@ -559,6 +703,10 @@ bool OpenGlVideoRenderer::Setup() {
                    HasOpenGlExtension(extensions, "GL_ARB_pixel_buffer_object")));
  impl_->unpack_subimage_available = !is_gles || major >= 3 ||
      HasOpenGlExtension(extensions, "GL_EXT_unpack_subimage");
+  impl_->scaling_available = impl_->gl.LoadFramebufferFunctions();
+  impl_->framebuffer_target = major >= 3 ? GL_DRAW_FRAMEBUFFER : GL_FRAMEBUFFER;
+  impl_->framebuffer_binding =
+      major >= 3 ? GL_DRAW_FRAMEBUFFER_BINDING : GL_FRAMEBUFFER_BINDING;
 #if CROSSDESK_OPENGL_CUDA_INTEROP
  // GLX may return entry points even if the current GLES 2 context cannot
  // use them. Gate CUDA interop on context capabilities as well as symbols.
@@ -577,8 +725,8 @@ bool OpenGlVideoRenderer::Setup() {
  }
 #endif

-  static constexpr char kGlesVertexShader[] = R"glsl(
-#version 100
+  const std::string vertex_source =
+      std::string(is_gles ? "#version 100\n" : "#version 110\n") + R"glsl(
 attribute vec2 position;
 attribute vec2 texcoord;
 varying vec2 video_texcoord;
@@ -587,20 +735,56 @@ void main() {
  gl_Position = vec4(position, 0.0, 1.0);
 }
 )glsl";
-  static constexpr char kGlesFragmentShader[] = R"glsl(
-#version 100
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
+  const std::string fragment_source =
+      std::string(is_gles ? "#version 100\n"
+                           "#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
+                           "precision highp float;\n"
+                           "#else\nprecision mediump float;\n#endif\n"
+                         : "#version 110\n") + R"glsl(
 uniform sampler2D y_texture;
 uniform sampler2D uv_texture;
 uniform vec2 target_size;
+uniform vec2 source_size;
+uniform vec2 filter_direction;
+uniform float packed_video;
 uniform vec4 video_rect;
 uniform float corner_radius;
 uniform float video_enabled;
 varying vec2 video_texcoord;
+// A separable Lanczos-2 low-pass filter. Each pass reduces by at most 4x,
+// so 16 taps cover its complete support even for non-integer scale ratios.
+float lanczos2(float x) {
+  x = abs(x);
+  if (x < 0.0001) return 1.0;
+  if (x >= 2.0) return 0.0;
+  float p = 3.14159265359 * x;
+  return sin(p) * sin(p * 0.5) / (p * p * 0.5);
+}
+vec4 sample_plane(sampler2D plane, vec2 size, vec2 coord) {
+  // FBO textures have the opposite vertical origin to the decoded NV12 planes.
+  if (packed_video > 0.5) coord.y = 1.0 - coord.y;
+  if (filter_direction.x + filter_direction.y < 0.5)
+    return texture2D(plane, coord);
+  float scale = max(1.0, dot(size / video_rect.zw, filter_direction));
+  float center = dot(coord * size - vec2(0.5), filter_direction);
+  float first = floor(center - 2.0 * scale) + 1.0;
+  vec4 sum = vec4(0.0);
+  float weight_sum = 0.0;
+  for (int tap = 0; tap < 16; ++tap) {
+    float offset = first + float(tap) - center;
+    if (offset >= 2.0 * scale) break;
+    float weight = lanczos2(offset / scale);
+    sum += weight * texture2D(plane, coord + filter_direction * offset / size);
+    weight_sum += weight;
+  }
+  return sum / weight_sum;
+}
+vec3 sample_video(vec2 coord) {
+  vec4 y_sample = sample_plane(y_texture, source_size, coord);
+  if (packed_video > 0.5) return y_sample.rgb;
+  return vec3(y_sample.r,
+              sample_plane(uv_texture, source_size * 0.5, coord).ra);
+}
 void main() {
  vec2 surface_point = video_texcoord * target_size;
  vec3 rgb = vec3(0.0);
@@ -611,10 +795,14 @@ void main() {
      surface_point.y <= video_rect.y + video_rect.w) {
    vec2 frame_texcoord =
        (surface_point - video_rect.xy) / video_rect.zw;
-    float y = 1.16438356 *
-              (texture2D(y_texture, frame_texcoord).r - 16.0 / 255.0);
-    vec2 uv =
-        texture2D(uv_texture, frame_texcoord).ra - vec2(0.5, 0.5);
+    vec3 yuv = sample_video(frame_texcoord);
+    if (filter_direction.x + filter_direction.y > 0.5) {
+      // Intermediate RGBA textures carry Y/U/V until the final conversion.
+      gl_FragColor = vec4(yuv, 1.0);
+      return;
+    }
+    float y = 1.16438356 * (yuv.x - 16.0 / 255.0);
+    vec2 uv = yuv.yz - vec2(0.5);
    rgb = clamp(vec3(y + 1.59602678 * uv.y,
                     y - 0.39176229 * uv.x - 0.81296764 * uv.y,
                     y + 2.01723214 * uv.x),
@@ -633,67 +821,11 @@ void main() {
  gl_FragColor = vec4(rgb * coverage, coverage);
 }
 )glsl";
-  static constexpr char kDesktopVertexShader[] = R"glsl(
-#version 110
-attribute vec2 position;
-attribute vec2 texcoord;
-varying vec2 video_texcoord;
-void main() {
-  video_texcoord = texcoord;
-  gl_Position = vec4(position, 0.0, 1.0);
-}
-)glsl";
-  static constexpr char kDesktopFragmentShader[] = R"glsl(
-#version 110
-uniform sampler2D y_texture;
-uniform sampler2D uv_texture;
-uniform vec2 target_size;
-uniform vec4 video_rect;
-uniform float corner_radius;
-uniform float video_enabled;
-varying vec2 video_texcoord;
-void main() {
-  vec2 surface_point = video_texcoord * target_size;
-  vec3 rgb = vec3(0.0);
-  if (video_enabled > 0.5 &&
-      surface_point.x >= video_rect.x &&
-      surface_point.x <= video_rect.x + video_rect.z &&
-      surface_point.y >= video_rect.y &&
-      surface_point.y <= video_rect.y + video_rect.w) {
-    vec2 frame_texcoord =
-        (surface_point - video_rect.xy) / video_rect.zw;
-    float y = 1.16438356 *
-              (texture2D(y_texture, frame_texcoord).r - 16.0 / 255.0);
-    vec2 uv =
-        texture2D(uv_texture, frame_texcoord).ra - vec2(0.5, 0.5);
-    rgb = clamp(vec3(y + 1.59602678 * uv.y,
-                     y - 0.39176229 * uv.x - 0.81296764 * uv.y,
-                     y + 2.01723214 * uv.x),
-                0.0, 1.0);
-  }
-  float coverage = 1.0;
-  if (corner_radius > 0.0) {
-    vec2 half_size = target_size * 0.5;
-    vec2 corner = abs(surface_point - half_size) -
-                  (half_size - vec2(corner_radius));
-    float distance_to_edge =
-        length(max(corner, vec2(0.0))) +
-        min(max(corner.x, corner.y), 0.0) - corner_radius;
-    coverage = clamp(0.5 - distance_to_edge, 0.0, 1.0);
-  }
-  gl_FragColor = vec4(rgb * coverage, coverage);
-}
-)glsl";
-
-  const char *vertex_source =
-      is_gles ? kGlesVertexShader : kDesktopVertexShader;
-  const char *fragment_source =
-      is_gles ? kGlesFragmentShader : kDesktopFragmentShader;

  const GLuint vertex_shader =
-      CompileShader(impl_->gl, GL_VERTEX_SHADER, vertex_source);
+      CompileShader(impl_->gl, GL_VERTEX_SHADER, vertex_source.c_str());
  const GLuint fragment_shader =
-      CompileShader(impl_->gl, GL_FRAGMENT_SHADER, fragment_source);
+      CompileShader(impl_->gl, GL_FRAGMENT_SHADER, fragment_source.c_str());
  if (vertex_shader == 0 || fragment_shader == 0) {
    if (vertex_shader != 0)
      impl_->gl.delete_shader(vertex_shader);
@@ -743,11 +875,18 @@ void main() {
      impl_->gl.get_uniform_location(impl_->program, "corner_radius");
  impl_->video_enabled_location =
      impl_->gl.get_uniform_location(impl_->program, "video_enabled");
+  impl_->source_size_location =
+      impl_->gl.get_uniform_location(impl_->program, "source_size");
+  impl_->filter_direction_location =
+      impl_->gl.get_uniform_location(impl_->program, "filter_direction");
+  impl_->packed_video_location =
+      impl_->gl.get_uniform_location(impl_->program, "packed_video");
  if (impl_->position_location < 0 || impl_->texcoord_location < 0 ||
      impl_->y_texture_location < 0 || impl_->uv_texture_location < 0 ||
      impl_->target_size_location < 0 || impl_->video_rect_location < 0 ||
      impl_->corner_radius_location < 0 ||
-      impl_->video_enabled_location < 0) {
+      impl_->video_enabled_location < 0 || impl_->source_size_location < 0 ||
+      impl_->filter_direction_location < 0 || impl_->packed_video_location < 0) {
    LOG_ERROR("OpenGL NV12 program is missing required shader bindings");
    impl_->gl.delete_program(impl_->program);
    impl_->ResetGlHandles();
@@ -817,6 +956,11 @@ void main() {

 void OpenGlVideoRenderer::Teardown() {
  impl_->ready.store(false, std::memory_order_release);
+  if (impl_->scale_framebuffer != 0) {
+    impl_->gl.delete_framebuffers(1, &impl_->scale_framebuffer);
+  }
+  glDeleteTextures(static_cast<GLsizei>(impl_->scale_textures.size()),
+                    impl_->scale_textures.data());
 #if CROSSDESK_OPENGL_CUDA_INTEROP
  impl_->ReleaseCudaInterop();
 #endif
@@ -1356,24 +1500,8 @@ OpenGlVideoRenderer::RenderLatest(std::string_view remote_id,
  }
 #endif
  impl_->gl.use_program(impl_->program);
-  impl_->gl.active_texture(GL_TEXTURE0);
-  glBindTexture(GL_TEXTURE_2D, displayed_y_texture);
  impl_->gl.uniform_1i(impl_->y_texture_location, 0);
-  impl_->gl.active_texture(GL_TEXTURE1);
-  glBindTexture(GL_TEXTURE_2D, displayed_uv_texture);
  impl_->gl.uniform_1i(impl_->uv_texture_location, 1);
-  impl_->gl.uniform_2f(impl_->target_size_location,
-                       static_cast<GLfloat>(target_width),
-                       static_cast<GLfloat>(target_height));
-  impl_->gl.uniform_4f(
-      impl_->video_rect_location, static_cast<GLfloat>(video_x),
-      static_cast<GLfloat>(video_y), static_cast<GLfloat>(video_width),
-      static_cast<GLfloat>(video_height));
-  impl_->gl.uniform_1f(
-      impl_->corner_radius_location,
-      static_cast<GLfloat>(std::clamp(
-          corner_radius_pixels, 0, std::min(target_width, target_height) / 2)));
-  impl_->gl.uniform_1f(impl_->video_enabled_location, has_video ? 1.0f : 0.0f);
  impl_->gl.bind_buffer(GL_ARRAY_BUFFER, impl_->vertex_buffer);
  impl_->gl.vertex_attrib_pointer(
      static_cast<GLuint>(impl_->position_location), 2, GL_FLOAT, GL_FALSE,
@@ -1386,7 +1514,25 @@ OpenGlVideoRenderer::RenderLatest(std::string_view remote_id,
      static_cast<GLuint>(impl_->position_location));
  impl_->gl.enable_vertex_attrib_array(
      static_cast<GLuint>(impl_->texcoord_location));
-  glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+  const bool downscaled = has_video &&
+      (source_width > video_width || source_height > video_height) &&
+      impl_->ScaleVideo(displayed_y_texture, displayed_uv_texture, source_width,
+                        source_height, video_width, video_height);
+  impl_->DrawVideo(
+      downscaled ? impl_->scale_textures[1] : displayed_y_texture,
+      displayed_uv_texture, downscaled ? video_width : source_width,
+      downscaled ? video_height : source_height, target_width, target_height,
+      video_x, video_y, video_width, video_height,
+      std::clamp(corner_radius_pixels, 0, std::min(target_width, target_height) / 2),
+      has_video, downscaled);
+  const std::array<int, 4> render_size{
+      source_width, source_height, video_width, video_height};
+  if (has_video && impl_->logged_render_size != render_size) {
+    LOG_INFO("OpenGL video presentation: source={}x{}, display={}x{} physical "
+             "pixels, filter={}", source_width, source_height, video_width,
+             video_height, downscaled ? "Lanczos2" : "linear");
+    impl_->logged_render_size = render_size;
+  }
 #if CROSSDESK_OPENGL_CUDA_INTEROP
  if (impl_->displayed_cuda_upload_slot < impl_->cuda_upload_slots.size()) {
    auto &cuda_slot =
@@ -3,6 +3,13 @@
 namespace crossdesk {

 void GuiRuntime::ResetRemoteServiceStatus(RemoteSession& props) {
+  {
+    std::lock_guard lock(props.privacy_status_mutex_);
+    props.privacy_status_ = {};
+    props.privacy_status_received_ = false;
+    props.privacy_command_pending_ = false;
+    props.privacy_status_tick_ = 0;
+  }
  props.remote_service_status_received_ = false;
  props.remote_service_available_ = false;
  props.remote_interactive_stage_.clear();
@@ -1,9 +1,15 @@
 #include "keyboard_capturer.h"

+#include <X11/XKBlib.h>
+#include <X11/Xatom.h>
 #include <X11/Xlib.h>
+#include <X11/extensions/XInput2.h>
 #include <X11/extensions/XTest.h>
 #include <X11/keysym.h>

+#include <array>
+#include <exception>
+
 #include <errno.h>
 #include <poll.h>

@@ -15,9 +21,6 @@

 namespace crossdesk {

-static OnKeyAction g_on_key_action = nullptr;
-static void* g_user_ptr = nullptr;
-
 static KeyCode ResolveX11Keycode(Display* display, int key_code,
                                 uint32_t scan_code, bool extended) {
  if (!display) {
@@ -59,36 +62,8 @@ static KeySym NormalizeKeySym(KeySym key_sym) {
  return key_sym;
 }

-static int KeyboardEventHandler(Display* display, XEvent* event) {
-  (void)display;
-  if (event->xkey.type == KeyPress || event->xkey.type == KeyRelease) {
-    KeySym key_sym = NormalizeKeySym(XLookupKeysym(&event->xkey, 0));
-    auto key_it = x11KeySymToVkCode.find(static_cast<int>(key_sym));
-    if (key_it == x11KeySymToVkCode.end()) {
-      key_sym = NormalizeKeySym(XLookupKeysym(&event->xkey, 1));
-      key_it = x11KeySymToVkCode.find(static_cast<int>(key_sym));
-    }
-
-    if (key_it == x11KeySymToVkCode.end()) {
-      return 0;
-    }
-
-    int key_code = key_it->second;
-    bool is_key_down = (event->xkey.type == KeyPress);
-    uint32_t scan_code = 0;
-    bool extended = false;
-    LookupWindowsKeyMetadataFromVk(key_code, &scan_code, &extended);
-
-    if (g_on_key_action) {
-      g_on_key_action(key_code, is_key_down, scan_code, extended, g_user_ptr);
-    }
-  }
-  return 0;
-}
-
 PlatformKeyboardCapturer::PlatformKeyboardCapturer()
    : display_(nullptr),
-      root_(0),
      running_(false),
      use_wayland_portal_(false),
      wayland_init_attempted_(false),
@@ -121,82 +96,253 @@ PlatformKeyboardCapturer::~PlatformKeyboardCapturer() {
  }
 }

+bool PlatformKeyboardCapturer::RefreshXTestDevices() {
+  // XTEST identifies injected input. Do not filter by names such as "virtual":
+  // an xrdp keyboard is a legitimate controller input device.
+  const Atom property = XInternAtom(capture_display_, "XTEST Device", True);
+  if (property == None) return false;
+  int count = 0;
+  XIDeviceInfo* devices = XIQueryDevice(capture_display_, XIAllDevices, &count);
+  if (!devices) return false;
+  xtest_devices_.clear();
+  for (int i = 0; i < count; ++i) {
+    if (devices[i].use != XISlaveKeyboard) continue;
+    Atom type = None;
+    int format = 0;
+    unsigned long items = 0, remaining = 0;
+    unsigned char* value = nullptr;
+    const int result = XIGetProperty(
+        capture_display_, devices[i].deviceid, property, 0, 1, False,
+        XA_INTEGER, &type, &format, &items, &remaining, &value);
+    if (result == Success && type == XA_INTEGER && format == 8 &&
+        items == 1 && value && value[0] == 1) {
+      xtest_devices_.insert(devices[i].deviceid);
+    }
+    if (value) XFree(value);
+  }
+  XIFreeDeviceInfo(devices);
+  return true;
+}
+
+void PlatformKeyboardCapturer::CaptureKey(int source_id, int x11_keycode,
+                                          bool is_down) {
+  if (!capture_has_focus_ || xtest_devices_.count(source_id) ||
+      x11_keycode < 8 || x11_keycode > 255)
+    return;
+
+  // The GUI stops capture on focus loss, but its event loop may lag behind
+  // the native input thread. Never forward keys typed into another window.
+  Window focus = None;
+  int revert = 0;
+  XGetInputFocus(capture_display_, &focus, &revert);
+  if (focus != capture_focus_) return;
+
+  const uint64_t identity = (static_cast<uint64_t>(source_id) << 32) |
+                            static_cast<uint32_t>(x11_keycode);
+  auto found = captured_keys_.find(identity);
+  if (found == captured_keys_.end()) {
+    // A press can have reached the Slint fallback just before native capture
+    // started. Forward its release too, so that handoff cannot leave a key down.
+    CapturedKey key;
+    // Use unshifted key identity, independently of the local input method.
+    // Preserve it until release, even if the keyboard mapping changes.
+    for (int level = 0; level < 2 && key.key_code == 0; ++level) {
+      const KeySym symbol = NormalizeKeySym(XkbKeycodeToKeysym(
+          capture_display_, static_cast<KeyCode>(x11_keycode), 0, level));
+      if (symbol == XK_KP_Enter) {
+        key = {0x0D, 0x1C, true};
+      } else if (symbol == XK_ISO_Level3_Shift) {
+        key.key_code = 0xA5;
+      } else if (symbol == XK_grave) {
+        key.key_code = 0xC0;
+      } else if (const auto vk = x11KeySymToVkCode.find(symbol);
+                 vk != x11KeySymToVkCode.end()) {
+        key.key_code = vk->second;
+      }
+    }
+    if (!key.key_code) return;
+    if (!key.scan_code) {
+      LookupWindowsKeyMetadataFromVk(key.key_code, &key.scan_code, &key.extended);
+      if (!key.scan_code) {
+        const int evdev = LinuxEvdevKeycodeFromWindowsVk(key.key_code);
+        for (uint32_t scan = 1; scan <= 0x58; ++scan) {
+          if (evdev >= 0 &&
+              LinuxEvdevKeycodeFromWindowsScanCode(scan, false) == evdev) {
+            key.scan_code = scan;
+            break;
+          }
+        }
+      }
+    }
+    found = captured_keys_.emplace(identity, key).first;
+  }
+  const CapturedKey key = found->second;
+  if (!is_down) captured_keys_.erase(found);
+  if (on_key_action_) {
+    on_key_action_(key.key_code, is_down, key.scan_code, key.extended, user_ptr_);
+  }
+}
+
+void PlatformKeyboardCapturer::RunCapture() {
+  const int fd = ConnectionNumber(capture_display_);
+  while (running_) {
+    while (running_ && XPending(capture_display_) > 0) {
+      XEvent event{};
+      XNextEvent(capture_display_, &event);
+      if (event.type == xkb_event_base_) {
+        auto* xkb = reinterpret_cast<XkbEvent*>(&event);
+        if (xkb->any.xkb_type == XkbMapNotify)
+          XkbRefreshKeyboardMapping(&xkb->map);
+      } else if (event.type == MappingNotify) {
+        XRefreshKeyboardMapping(&event.xmapping);
+      } else if (event.type == FocusOut) {
+        // Keep focus changes in event order too: a fast switch away and back
+        // may finish before either the GUI or XGetInputFocus observes it.
+        capture_has_focus_ = false;
+        for (const auto& [identity, key] : captured_keys_) {
+          if (on_key_action_)
+            on_key_action_(key.key_code, false, key.scan_code, key.extended,
+                           user_ptr_);
+        }
+        captured_keys_.clear();
+        raw_presses_.fill({});
+      } else if (event.type == FocusIn) {
+        capture_has_focus_ = true;
+      } else if (event.type == KeyPress && !event.xkey.send_event &&
+                 event.xkey.keycode < raw_presses_.size() &&
+                 event.xkey.time != raw_presses_[event.xkey.keycode].time) {
+        // Server-generated repeats have no matching raw press. Subscribe to
+        // core events on the focused window so Slint's core/XIM delivery is
+        // preserved (selecting XI_KeyPress here would take precedence over it).
+        const int source = raw_presses_[event.xkey.keycode].source_id;
+        const uint64_t identity = (static_cast<uint64_t>(source) << 32) |
+                                  event.xkey.keycode;
+        if (captured_keys_.count(identity))
+          CaptureKey(source, event.xkey.keycode, true);
+      } else if (event.type == GenericEvent &&
+                 event.xcookie.extension == xi_opcode_ &&
+                 XGetEventData(capture_display_, &event.xcookie)) {
+        if (event.xcookie.evtype == XI_RawKeyPress ||
+            event.xcookie.evtype == XI_RawKeyRelease) {
+          const auto* key = static_cast<XIRawEvent*>(event.xcookie.data);
+          const bool is_down = event.xcookie.evtype == XI_RawKeyPress;
+          if (is_down && key->detail >= 0 &&
+              static_cast<size_t>(key->detail) < raw_presses_.size()) {
+            // Include filtered XTEST presses, so their core events cannot be
+            // mistaken for repeats of a physically held key.
+            raw_presses_[key->detail] = {key->time, key->sourceid};
+          }
+          CaptureKey(key->sourceid, key->detail, is_down);
+        } else if (event.xcookie.evtype == XI_HierarchyChanged &&
+                   !RefreshXTestDevices()) {
+          LOG_ERROR("Failed to refresh XInput2 keyboard devices");
+          running_ = false;
+        }
+        XFreeEventData(capture_display_, &event.xcookie);
+      }
+    }
+    if (!running_) break;
+    struct pollfd pfd = {fd, POLLIN, 0};
+    const int result = poll(&pfd, 1, 50);
+    if ((result < 0 && errno != EINTR) ||
+        (result > 0 && (pfd.revents & (POLLERR | POLLHUP | POLLNVAL)))) {
+      LOG_ERROR("XInput2 keyboard capture event connection failed");
+      break;
+    }
+  }
+  running_ = false;
+}
+
 int PlatformKeyboardCapturer::Hook(OnKeyAction on_key_action, void* user_ptr) {
-  if (!display_) {
-    LOG_ERROR("Display not initialized.");
+  if (running_) return 0;
+  Unhook();
+  capture_display_ = XOpenDisplay(nullptr);
+  if (!capture_display_ || !on_key_action) {
+    LOG_ERROR("Cannot open X11 keyboard capture display or callback is empty");
+    Unhook();
    return -1;
  }

-  g_on_key_action = on_key_action;
-  g_user_ptr = user_ptr;
-
-  if (running_) {
-    return 0;
+  int event = 0, error = 0;
+  // XI 2.1 supplies raw-event source IDs, needed to exclude XTEST devices.
+  int major = 2, minor = 1;
+  if (!XQueryExtension(capture_display_, "XInputExtension", &xi_opcode_,
+                       &event, &error) ||
+      XIQueryVersion(capture_display_, &major, &minor) != Success || major < 2 ||
+      (major == 2 && minor < 1)) {
+    LOG_WARN("XInput2 keyboard capture is unavailable");
+    Unhook();
+    return -1;
+  }
+  major = XkbMajorVersion;
+  minor = XkbMinorVersion;
+  int xkb_opcode = 0;
+  if (!XkbQueryExtension(capture_display_, &xkb_opcode, &xkb_event_base_,
+                         &error, &major, &minor) || !RefreshXTestDevices()) {
+    LOG_WARN("Cannot initialize XKB or enumerate XInput2 keyboard devices");
+    Unhook();
+    return -1;
  }

-  root_ = DefaultRootWindow(display_);
-  XSelectInput(display_, root_, KeyPressMask | KeyReleaseMask);
-  XFlush(display_);
+  int revert = 0;
+  XGetInputFocus(capture_display_, &capture_focus_, &revert);
+  if (capture_focus_ == None || capture_focus_ == PointerRoot) {
+    LOG_WARN("XInput2 keyboard capture requires a focused application window");
+    Unhook();
+    return -1;
+  }
+  capture_has_focus_ = true;

-  running_ = true;
-  const int x11_fd = ConnectionNumber(display_);
-  event_thread_ = std::thread([this, x11_fd]() {
-    while (running_) {
-      while (running_ && XPending(display_) > 0) {
-        XEvent event;
-        XNextEvent(display_, &event);
-        KeyboardEventHandler(display_, &event);
-      }
-
-      if (!running_) {
-        break;
-      }
-
-      struct pollfd pfd = {x11_fd, POLLIN, 0};
-      int poll_ret = poll(&pfd, 1, 50);
-      if (poll_ret < 0) {
-        if (errno == EINTR) {
-          continue;
-        }
-        LOG_ERROR("poll for X11 events failed.");
-        running_ = false;
-        break;
-      }
-
-      if (poll_ret == 0) {
-        continue;
-      }
-
-      if ((pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) != 0) {
-        LOG_ERROR("poll got invalid X11 event fd state.");
-        running_ = false;
-        break;
-      }
-
-      if ((pfd.revents & POLLIN) == 0) {
-        continue;
-      }
+  std::array<unsigned char, XIMaskLen(XI_LASTEVENT)> raw{};
+  std::array<unsigned char, XIMaskLen(XI_LASTEVENT)> hierarchy{};
+  XISetMask(raw.data(), XI_RawKeyPress);
+  XISetMask(raw.data(), XI_RawKeyRelease);
+  XISetMask(hierarchy.data(), XI_HierarchyChanged);
+  XIEventMask masks[] = {
+      {XIAllMasterDevices, static_cast<int>(raw.size()), raw.data()},
+      {XIAllDevices, static_cast<int>(hierarchy.size()), hierarchy.data()}};
+  for (int screen = 0; screen < ScreenCount(capture_display_); ++screen) {
+    if (XISelectEvents(capture_display_, RootWindow(capture_display_, screen),
+                       masks, 2) != Success) {
+      LOG_WARN("Cannot subscribe to XInput2 keyboard events");
+      Unhook();
+      return -1;
    }
-  });
-
+  }
+  XSelectInput(capture_display_, capture_focus_, KeyPressMask | FocusChangeMask);
+  XkbSelectEvents(capture_display_, XkbUseCoreKbd, XkbMapNotifyMask,
+                   XkbMapNotifyMask);
+  XSync(capture_display_, False);
+  on_key_action_ = on_key_action;
+  user_ptr_ = user_ptr;
+  running_ = true;
+  try {
+    event_thread_ = std::thread([this] { RunCapture(); });
+  } catch (const std::exception& error) {
+    LOG_ERROR("Cannot start XInput2 keyboard capture thread: {}", error.what());
+    Unhook();
+    return -1;
+  }
+  LOG_INFO("XInput2 keyboard capture started");
  return 0;
 }

 int PlatformKeyboardCapturer::Unhook() {
  running_ = false;
-
-  if (event_thread_.joinable()) {
-    event_thread_.join();
+  if (event_thread_.joinable()) event_thread_.join();
+  // Closing the private connection removes every subscription and queued
+  // event, so restarting capture cannot forward keys from the previous focus.
+  if (capture_display_) {
+    XCloseDisplay(capture_display_);
+    capture_display_ = nullptr;
  }
-
-  g_on_key_action = nullptr;
-  g_user_ptr = nullptr;
-
-  if (display_ && root_ != 0) {
-    XSelectInput(display_, root_, 0);
-    XFlush(display_);
-  }
-
+  on_key_action_ = nullptr;
+  user_ptr_ = nullptr;
+  captured_keys_.clear();
+  raw_presses_.fill({});
+  xtest_devices_.clear();
+  capture_focus_ = None;
+  capture_has_focus_ = false;
  return 0;
 }

@@ -7,12 +7,15 @@
 #ifndef _KEYBOARD_CAPTURER_H_
 #define _KEYBOARD_CAPTURER_H_

+#include <array>
 #include <atomic>
 #include <cstdint>
 #include <functional>
 #include <mutex>
 #include <string>
 #include <thread>
+#include <unordered_map>
+#include <unordered_set>

 #include "device_controller.h"

@@ -30,11 +33,25 @@ class PlatformKeyboardCapturer final : public KeyboardCapturer {
 public:
  virtual int Hook(OnKeyAction on_key_action, void* user_ptr);
  virtual int Unhook();
+  bool IsHookActive() const override { return running_.load(); }
  virtual int SendKeyboardCommand(int key_code, bool is_down,
                                  uint32_t scan_code = 0,
                                  bool extended = false);

 private:
+  struct CapturedKey {
+    int key_code = 0;
+    uint32_t scan_code = 0;
+    bool extended = false;
+  };
+  struct RawKeyPress {
+    unsigned long time = 0;
+    int source_id = 0;
+  };
+  bool RefreshXTestDevices();
+  void CaptureKey(int source_id, int x11_keycode, bool is_down);
+  void RunCapture();
+
  bool InitWaylandPortal();
  void CleanupWaylandPortal();
  int SendWaylandKeyboardCommand(int key_code, bool is_down, uint32_t scan_code,
@@ -47,7 +64,17 @@ class PlatformKeyboardCapturer final : public KeyboardCapturer {

 private:
  _XDisplay* display_;
-  unsigned long root_;
+  // Capture owns a separate connection, including its XKB event queue.
+  _XDisplay* capture_display_ = nullptr;
+  unsigned long capture_focus_ = 0;
+  bool capture_has_focus_ = false;
+  int xi_opcode_ = 0;
+  int xkb_event_base_ = 0;
+  OnKeyAction on_key_action_ = nullptr;
+  void* user_ptr_ = nullptr;
+  std::unordered_set<int> xtest_devices_;
+  std::unordered_map<uint64_t, CapturedKey> captured_keys_;
+  std::array<RawKeyPress, 256> raw_presses_{};
  std::atomic<bool> running_;
  std::thread event_thread_;
  std::mutex x11_injection_mutex_;
@@ -0,0 +1,244 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-13
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _PRIVACY_BACKEND_LINUX_H_
+#define _PRIVACY_BACKEND_LINUX_H_
+
+#include <poll.h>
+#include <spawn.h>
+#include <sys/eventfd.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+#include <algorithm>
+#include <cerrno>
+#include <chrono>
+#include <cstring>
+#include <thread>
+
+#include "privacy_backend.h"
+#include "privacy_guard.h"
+
+extern char** environ;
+
+namespace crossdesk {
+namespace {
+using Clock = std::chrono::steady_clock;
+
+class LinuxPrivacyBackend final : public PrivacyBackend {
+ public:
+  LinuxPrivacyBackend() : wake_(eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK)) {}
+  ~LinuxPrivacyBackend() override {
+    // EOF also recovers after a crash, SIGKILL, or a normal shutdown. Never
+    // terminate the guard: it must finish restoring the saved display ramps.
+    if (socket_ >= 0) close(socket_);
+    if (wake_ >= 0) close(wake_);
+    if (child_ > 0) {
+      const pid_t child = child_;
+      std::thread([child] {
+        while (waitpid(child, nullptr, 0) < 0 && errno == EINTR) {
+        }
+      }).detach();
+    }
+  }
+
+  PrivacyCapabilities Query() override {
+    if (wake_ < 0)
+      return {false, false, "Cannot create Linux privacy wake event"};
+    if (!StartGuard()) return {false, false, failure_};
+    if (!Send(LinuxPrivacyCommand::query)) return {false, false, failure_};
+    // The first query also serves automatic privacy on the first connection.
+    // Bound process startup so an unavailable helper cannot stall the GUI.
+    if (!discovered_) {
+      pollfd fd{socket_, POLLIN, 0};
+      poll(&fd, 1, 1000);
+    }
+    ReadReplies();
+    return {reply_.supported, reply_.input_supported,
+            reply_.capability_reason[0] ? reply_.capability_reason
+                                        : "Checking Linux privacy support"};
+  }
+
+  bool Enable(bool block_input, const PrivacyScreenText&,
+              std::string& error) override {
+    failure_.clear();
+    emergency_ = false;
+    if (!Send(block_input ? LinuxPrivacyCommand::enable_blocking
+                          : LinuxPrivacyCommand::enable)) {
+      error = failure_;
+      return false;
+    }
+    engaged_ = true;
+    ++generation_;
+    last_reply_ = Clock::now();
+    recovered_ = false;
+    reply_.active = false;
+    return true;
+  }
+
+  void Recover() override {
+    ReadReplies();
+    if (recovered_) {
+      failure_.clear();
+      return;
+    }
+    if (recovering_) return;
+    if (Send(LinuxPrivacyCommand::recover)) recovering_ = true;
+  }
+  bool IsRecovered() const override { return recovered_; }
+  bool RecoveryPending() const override { return recovering_; }
+
+  PrivacyHealth Poll() override {
+    ReadReplies();
+    if (engaged_ && Clock::now() - last_reply_ > std::chrono::seconds(1))
+      failure_ = "Linux privacy guard stopped responding";
+    if (engaged_ &&
+        Clock::now() - last_heartbeat_ >= std::chrono::milliseconds(100)) {
+      Send(LinuxPrivacyCommand::heartbeat);
+      last_heartbeat_ = Clock::now();
+    }
+    const bool emergency = emergency_;
+    emergency_ = false;
+    return {failure_, emergency, reply_.active};
+  }
+
+  void WaitForEvents(unsigned timeout_ms) override {
+    pollfd fds[] = {{wake_, POLLIN, 0}, {socket_, POLLIN, 0}};
+    poll(fds, 2, static_cast<int>(timeout_ms));
+    uint64_t value;
+    if (fds[0].revents & POLLIN) {
+      while (read(wake_, &value, sizeof(value)) == sizeof(value)) {
+      }
+    }
+  }
+  void Wake() override {
+    const uint64_t value = 1;
+    if (wake_ >= 0) {
+      const auto ignored = write(wake_, &value, sizeof(value));
+      (void)ignored;
+    }
+  }
+
+ private:
+  bool StartGuard() {
+    if (socket_ >= 0) return true;
+    if (child_ > 0) {
+      const auto result = waitpid(child_, nullptr, WNOHANG);
+      if (result == 0) return false;
+      child_ = -1;
+    }
+    int sockets[2];
+    if (socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC | SOCK_NONBLOCK, 0,
+                   sockets) != 0) {
+      failure_ = "Cannot create Linux privacy guard socket";
+      return false;
+    }
+    posix_spawn_file_actions_t actions;
+    int result = posix_spawn_file_actions_init(&actions);
+    if (result == 0) {
+      // Close the parent end first: it may occupy the guard's destination fd.
+      result = posix_spawn_file_actions_addclose(&actions, sockets[0]);
+      if (result == 0)
+        result = posix_spawn_file_actions_adddup2(&actions, sockets[1],
+                                                  kLinuxPrivacyGuardSocket);
+      if (result == 0 && sockets[1] != kLinuxPrivacyGuardSocket)
+        result = posix_spawn_file_actions_addclose(&actions, sockets[1]);
+      if (result == 0) {
+        char executable[] = "/proc/self/exe";
+        char* args[] = {executable,
+                        const_cast<char*>(kLinuxPrivacyGuardArgument), nullptr};
+        result =
+            posix_spawn(&child_, executable, &actions, nullptr, args, environ);
+      }
+      posix_spawn_file_actions_destroy(&actions);
+    }
+    close(sockets[1]);
+    if (result != 0) {
+      close(sockets[0]);
+      child_ = -1;
+      failure_ = std::string("Cannot start Linux privacy guard: ") +
+                 std::strerror(result);
+      return false;
+    }
+    socket_ = sockets[0];
+    reply_ = {};
+    discovered_ = false;
+    generation_ = 0;
+    failure_.clear();
+    return true;
+  }
+
+  void LostGuard() {
+    if (socket_ >= 0) close(socket_);
+    socket_ = -1;
+    reply_ = {};
+    recovering_ = false;
+    failure_ =
+        "Linux privacy guard disconnected; local protection is unavailable";
+    // Do not claim successful recovery after an unexpected guard failure.
+    // A normal guard reports restoration before closing its socket.
+  }
+  bool Send(LinuxPrivacyCommand command) {
+    if (socket_ < 0) return false;
+    if (send(socket_, &command, sizeof(command), MSG_NOSIGNAL) ==
+        sizeof(command))
+      return true;
+    if (errno != EAGAIN && errno != EWOULDBLOCK && errno != EINTR) LostGuard();
+    return false;
+  }
+  void ReadReplies() {
+    if (socket_ < 0) return;
+    for (;;) {
+      LinuxPrivacyReply next;
+      const auto bytes = recv(socket_, &next, sizeof(next), 0);
+      if (bytes < 0 &&
+          (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR))
+        return;
+      if (bytes != sizeof(next)) {
+        LostGuard();
+        return;
+      }
+      next.capability_reason[sizeof(next.capability_reason) - 1] = '\0';
+      next.failure[sizeof(next.failure) - 1] = '\0';
+      discovered_ = true;
+      // Ignore queued capability/heartbeat replies from before this enable.
+      // A matching generation can also acknowledge watchdog-driven recovery.
+      if (next.generation != generation_) continue;
+      reply_ = next;
+      last_reply_ = Clock::now();
+      emergency_ = emergency_ || next.emergency;
+      if (next.failure[0]) failure_ = next.failure;
+      recovered_ = next.recovered;
+      if (next.recovered) {
+        recovering_ = false;
+        engaged_ = false;
+      }
+    }
+  }
+
+  int wake_ = -1;
+  int socket_ = -1;
+  pid_t child_ = -1;
+  LinuxPrivacyReply reply_;
+  uint64_t generation_ = 0;
+  bool engaged_ = false;
+  bool discovered_ = false;
+  bool recovering_ = false;
+  bool recovered_ = true;
+  bool emergency_ = false;
+  std::string failure_;
+  Clock::time_point last_heartbeat_{};
+  Clock::time_point last_reply_{};
+};
+}  // namespace
+
+std::unique_ptr<PrivacyBackend> CreateLinuxPrivacyBackend() {
+  return std::make_unique<LinuxPrivacyBackend>();
+}
+}  // namespace crossdesk
+
+#endif
@@ -0,0 +1,721 @@
+/* Copyright (c) 2026 by DI JUNKUN, All Rights Reserved. */
+#include "privacy_guard.h"
+
+#include <X11/XKBlib.h>
+#include <X11/Xatom.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/XInput2.h>
+#include <X11/extensions/XTest.h>
+#include <X11/extensions/Xfixes.h>
+#include <X11/extensions/Xrandr.h>
+#include <X11/keysym.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <sys/socket.h>
+#include <unistd.h>
+
+#include <algorithm>
+#include <array>
+#include <cerrno>
+#include <chrono>
+#include <csignal>
+#include <cstdlib>
+#include <cstring>
+#include <map>
+#include <memory>
+#include <string>
+#include <tuple>
+#include <vector>
+
+namespace crossdesk {
+namespace {
+using Clock = std::chrono::steady_clock;
+using Gamma = std::unique_ptr<XRRCrtcGamma, decltype(&XRRFreeGamma)>;
+using Resources =
+    std::unique_ptr<XRRScreenResources, decltype(&XRRFreeScreenResources)>;
+using CrtcInfo = std::unique_ptr<XRRCrtcInfo, decltype(&XRRFreeCrtcInfo)>;
+volatile std::sig_atomic_t stopping = 0;
+int x_error = 0;
+
+void StopGuard(int) { stopping = 1; }
+int OnXError(Display*, XErrorEvent* event) {
+  x_error = event->error_code;
+  return 0;
+}
+
+template <size_t N>
+void SetText(char (&dest)[N], const std::string& text) {
+  std::strncpy(dest, text.c_str(), N - 1);
+  dest[N - 1] = '\0';
+}
+
+struct Output {
+  Window root = 0;
+  RRCrtc crtc = 0;
+  RRMode mode = 0;
+  int x = 0, y = 0;
+  unsigned width = 0, height = 0;
+  Rotation rotation = 0;
+  std::vector<RROutput> connectors;
+  Gamma saved{nullptr, XRRFreeGamma};
+
+  bool SameLayout(const Output& other) const {
+    return std::tie(root, crtc, mode, x, y, width, height, rotation,
+                    connectors) == std::tie(other.root, other.crtc, other.mode,
+                                            other.x, other.y, other.width,
+                                            other.height, other.rotation,
+                                            other.connectors);
+  }
+};
+
+struct Device {
+  int id = 0, use = 0, attachment = 0;
+  bool keyboard = false, touch = false;
+  std::string name;
+
+  bool operator==(const Device& other) const {
+    return std::tie(id, use, attachment, keyboard, touch, name) ==
+           std::tie(other.id, other.use, other.attachment, other.keyboard,
+                    other.touch, other.name);
+  }
+};
+
+bool IsBlack(const XRRCrtcGamma* gamma) {
+  if (!gamma || gamma->size <= 0) return false;
+  for (int i = 0; i < gamma->size; ++i)
+    if (gamma->red[i] || gamma->green[i] || gamma->blue[i]) return false;
+  return true;
+}
+
+// This class lives only in the exec'd guard process. Its Xlib error handler is
+// isolated from the GUI and capture threads' process-global error handlers.
+class NativePrivacy {
+ public:
+  ~NativePrivacy() {
+    Recover();
+    if (display_) XCloseDisplay(display_);
+  }
+
+  void Query() {
+    reply_.supported = reply_.input_supported = false;
+    std::string error;
+    if (!Initialize(error)) {
+      SetText(reply_.capability_reason, error);
+      return;
+    }
+    std::vector<Output> outputs;
+    std::vector<Device> devices;
+    if (!ReadOutputs(outputs, true, error) || !ReadDevices(devices, error)) {
+      SetText(reply_.capability_reason, error);
+      return;
+    }
+    const bool keyboard = std::any_of(devices.begin(), devices.end(),
+                                      [](const auto& d) { return d.keyboard; });
+    if (!keyboard) {
+      SetText(reply_.capability_reason,
+              "No local keyboard available for privacy recovery");
+      return;
+    }
+    reply_.supported = true;
+    // XIGrabDevice does not suppress XI 2.2 touch delivery. Do not advertise
+    // input protection for touchscreens without a separate touch grab.
+    reply_.input_supported = std::none_of(
+        devices.begin(), devices.end(), [](const auto& d) { return d.touch; });
+    SetText(reply_.capability_reason,
+            reply_.input_supported
+                ? "X11 privacy black screen available; local recovery: "
+                  "Ctrl+Alt+Shift+F12"
+                : "X11 privacy black screen available; touchscreen input "
+                  "blocking is unavailable");
+  }
+
+  void Enable(bool block_input) {
+    ++reply_.generation;
+    reply_.failure[0] = '\0';
+    reply_.emergency = false;
+    if (!reply_.recovered) {
+      Fail("Linux privacy resources are still in use");
+      return;
+    }
+    Query();
+    if (!reply_.supported || (block_input && !reply_.input_supported)) {
+      Fail(reply_.capability_reason);
+      return;
+    }
+    std::string error;
+    keys_.clear();
+    if (!Acquire(error) || !ReadOutputs(outputs_, true, error) ||
+        !ReadDevices(devices_, error) || !ProtectInput(block_input, error)) {
+      Fail(error);
+      return;
+    }
+    // No display ramp is changed until every original ramp has been saved.
+    // Gamma is applied at scanout, after XGetImage/DRM framebuffer capture.
+    // There is deliberately no cover window to contaminate remote frames.
+    x_error = 0;
+    for (const auto& output : outputs_) {
+      Gamma black(XRRAllocGamma(output.saved->size), XRRFreeGamma);
+      if (!black) {
+        Fail("Cannot allocate Linux privacy display ramp");
+        return;
+      }
+      std::fill_n(black->red, black->size, 0);
+      std::fill_n(black->green, black->size, 0);
+      std::fill_n(black->blue, black->size, 0);
+      XRRSetCrtcGamma(display_, output.crtc, black.get());
+    }
+    for (int i = 0; i < ScreenCount(display_); ++i) {
+      XFixesHideCursor(display_, RootWindow(display_, i));
+      hidden_roots_.push_back(RootWindow(display_, i));
+    }
+    XSync(display_, False);
+    if (x_error) {
+      Fail("Cannot blank Linux displays or hide the local cursor");
+      return;
+    }
+    // Active slave grabs temporarily detach devices. Snapshot after grabbing,
+    // and monitor subsequent hardware/hierarchy changes during protection.
+    if (!ReadDevices(devices_, error)) {
+      Fail(error);
+      return;
+    }
+    reply_.active = true;
+    Check();
+  }
+
+  void Recover() {
+    reply_.active = false;
+    if (!display_) {
+      reply_.recovered = true;
+      return;
+    }
+    for (int id : grabbed_) XIUngrabDevice(display_, id, CurrentTime);
+    grabbed_.clear();
+    for (Window root : hidden_roots_) XFixesShowCursor(display_, root);
+    hidden_roots_.clear();
+    // Keep failed restorations for retry. Removed CRTCs no longer own a local
+    // output; all still-present CRTCs must acknowledge the original ramp.
+    for (auto it = outputs_.begin(); it != outputs_.end();) {
+      x_error = 0;
+      Resources resources(XRRGetScreenResourcesCurrent(display_, it->root),
+                          XRRFreeScreenResources);
+      if (!resources) {
+        ++it;
+        continue;
+      }
+      const bool exists =
+          std::find(resources->crtcs, resources->crtcs + resources->ncrtc,
+                    it->crtc) != resources->crtcs + resources->ncrtc;
+      if (exists && it->saved) {
+        XRRSetCrtcGamma(display_, it->crtc, it->saved.get());
+        XSync(display_, False);
+        if (x_error) {
+          ++it;
+          continue;
+        }
+      }
+      it = outputs_.erase(it);
+    }
+    keys_.clear();
+    if (outputs_.empty() && owner_) {
+      XDestroyWindow(display_, owner_);
+      owner_ = 0;
+    }
+    XSync(display_, False);
+    reply_.recovered = outputs_.empty() && !owner_;
+  }
+
+  void Fail(const std::string& reason) {
+    SetText(reply_.failure, reason);
+    Recover();
+  }
+
+  void Poll() {
+    if (!display_) return;
+    while (XPending(display_)) {
+      XEvent event{};
+      XNextEvent(display_, &event);
+      if (event.type != GenericEvent || event.xcookie.extension != xi_opcode_ ||
+          !XGetEventData(display_, &event.xcookie))
+        continue;
+      if (reply_.active) {
+        const int type = event.xcookie.evtype;
+        if (type == XI_KeyPress || type == XI_KeyRelease) {
+          const auto* key = static_cast<XIDeviceEvent*>(event.xcookie.data);
+          Key(key->sourceid, key->detail, type == XI_KeyPress);
+        } else if (!blocking_ &&
+                   (type == XI_RawKeyPress || type == XI_RawKeyRelease)) {
+          const auto* key = static_cast<XIRawEvent*>(event.xcookie.data);
+          Key(key->sourceid, key->detail, type == XI_RawKeyPress);
+        }
+      }
+      XFreeEventData(display_, &event.xcookie);
+    }
+    if (reply_.active &&
+        Clock::now() - checked_ >= std::chrono::milliseconds(100))
+      Check();
+    if (!reply_.active && !reply_.recovered) Recover();
+  }
+
+  const LinuxPrivacyReply& Reply() const { return reply_; }
+  int Connection() const { return display_ ? ConnectionNumber(display_) : -1; }
+  void AcknowledgeEmergency() { reply_.emergency = false; }
+
+ private:
+  bool Initialize(std::string& error) {
+    if (initialized_) return true;
+    const char* session = std::getenv("XDG_SESSION_TYPE");
+    const char* wayland = std::getenv("WAYLAND_DISPLAY");
+    if ((session && std::strcmp(session, "wayland") == 0) ||
+        (wayland && *wayland)) {
+      error =
+          "Linux privacy screen requires an X11 session; Wayland is "
+          "unsupported";
+      return false;
+    }
+    const char* address = std::getenv("DISPLAY");
+    if (!address ||
+        (*address != ':' && std::strncmp(address, "unix:", 5) != 0)) {
+      error = "Linux privacy screen requires a local X11 display";
+      return false;
+    }
+    if (!display_) display_ = XOpenDisplay(nullptr);
+    if (!display_) {
+      error = "Cannot open the local X11 display";
+      return false;
+    }
+    int event = 0, code = 0, opcode = 0;
+    int major = 1, minor = 3;
+    if (XQueryExtension(display_, "XWAYLAND", &opcode, &event, &code)) {
+      error = "XWayland cannot protect native Wayland displays";
+      return false;
+    }
+    if (!XRRQueryExtension(display_, &event, &code) ||
+        !XRRQueryVersion(display_, &major, &minor) || major < 1 ||
+        (major == 1 && minor < 3)) {
+      error = "Linux privacy screen requires RandR 1.3 display gamma control";
+      return false;
+    }
+    major = 4;
+    minor = 0;
+    if (!XFixesQueryExtension(display_, &event, &code) ||
+        !XFixesQueryVersion(display_, &major, &minor) || major < 4) {
+      error = "Linux privacy screen requires XFixes 4 cursor hiding";
+      return false;
+    }
+    major = 2;
+    minor = 2;
+    if (!XQueryExtension(display_, "XInputExtension", &xi_opcode_, &event,
+                         &code) ||
+        XIQueryVersion(display_, &major, &minor) != Success || major < 2) {
+      error = "Linux privacy screen requires XInput 2 local input monitoring";
+      return false;
+    }
+    xtest_property_ = XInternAtom(display_, "XTEST Device", True);
+    if (!xtest_property_ ||
+        !XTestQueryExtension(display_, &event, &code, &major, &minor)) {
+      error = "Cannot identify X11 remote input devices";
+      return false;
+    }
+    selection_ = XInternAtom(display_, "_CROSSDESK_PRIVACY_GUARD", False);
+    std::array<unsigned char, XIMaskLen(XI_LASTEVENT)> bits{};
+    XISetMask(bits.data(), XI_RawKeyPress);
+    XISetMask(bits.data(), XI_RawKeyRelease);
+    XIEventMask mask{XIAllDevices, static_cast<int>(bits.size()), bits.data()};
+    x_error = 0;
+    for (int i = 0; i < ScreenCount(display_); ++i)
+      XISelectEvents(display_, RootWindow(display_, i), &mask, 1);
+    XSync(display_, False);
+    if (x_error) {
+      error = "Cannot monitor the local privacy recovery shortcut";
+      return false;
+    }
+    initialized_ = true;
+    return true;
+  }
+
+  bool ReadOutputs(std::vector<Output>& outputs, bool save,
+                   std::string& error) {
+    outputs.clear();
+    x_error = 0;
+    for (int screen = 0; screen < ScreenCount(display_); ++screen) {
+      const Window root = RootWindow(display_, screen);
+      Resources resources(XRRGetScreenResourcesCurrent(display_, root),
+                          XRRFreeScreenResources);
+      if (!resources) {
+        error = "Cannot enumerate Linux display outputs";
+        return false;
+      }
+      for (int i = 0; i < resources->ncrtc; ++i) {
+        CrtcInfo info(
+            XRRGetCrtcInfo(display_, resources.get(), resources->crtcs[i]),
+            XRRFreeCrtcInfo);
+        if (!info) {
+          error = "Cannot inspect Linux display controller";
+          return false;
+        }
+        if (!info->mode || !info->noutput) continue;
+        Output output;
+        output.root = root;
+        output.crtc = resources->crtcs[i];
+        output.mode = info->mode;
+        output.x = info->x;
+        output.y = info->y;
+        output.width = info->width;
+        output.height = info->height;
+        output.rotation = info->rotation;
+        output.connectors.assign(info->outputs, info->outputs + info->noutput);
+        std::sort(output.connectors.begin(), output.connectors.end());
+        if (save) {
+          output.saved.reset(XRRGetCrtcGamma(display_, output.crtc));
+          if (!output.saved || output.saved->size <= 0 ||
+              IsBlack(output.saved.get())) {
+            error =
+                "Display gamma control is unavailable or the display is "
+                "already blank";
+            return false;
+          }
+        }
+        outputs.push_back(std::move(output));
+      }
+    }
+    XSync(display_, False);
+    if (x_error || outputs.empty()) {
+      error = "No controllable Linux display outputs";
+      return false;
+    }
+    return true;
+  }
+
+  bool ReadDevices(std::vector<Device>& devices, std::string& error) {
+    devices.clear();
+    x_error = 0;
+    int count = 0;
+    XIDeviceInfo* info = XIQueryDevice(display_, XIAllDevices, &count);
+    if (!info) {
+      error = "Cannot enumerate local X11 input devices";
+      return false;
+    }
+    for (int i = 0; i < count; ++i) {
+      const auto& d = info[i];
+      if (!d.enabled || d.use == XIMasterPointer || d.use == XIMasterKeyboard)
+        continue;
+      Atom type = None;
+      int format = 0;
+      unsigned long items = 0, remaining = 0;
+      unsigned char* value = nullptr;
+      const int result =
+          XIGetProperty(display_, d.deviceid, xtest_property_, 0, 1, False,
+                        XA_INTEGER, &type, &format, &items, &remaining, &value);
+      const bool injected = result == Success && type == XA_INTEGER &&
+                            format == 8 && items == 1 && value && value[0] == 1;
+      if (value) XFree(value);
+      if (injected) continue;
+      Device device;
+      device.id = d.deviceid;
+      device.use = d.use;
+      device.attachment = d.attachment;
+      device.name = d.name ? d.name : "";
+      for (int c = 0; c < d.num_classes; ++c) {
+        device.keyboard |= d.classes[c]->type == XIKeyClass;
+        device.touch |= d.classes[c]->type == XITouchClass;
+      }
+      devices.push_back(std::move(device));
+    }
+    XIFreeDeviceInfo(info);
+    XSync(display_, False);
+    if (x_error) {
+      error = "Cannot verify local X11 input devices";
+      return false;
+    }
+    return true;
+  }
+
+  bool Acquire(std::string& error) {
+    // A second instance must not save the first instance's black ramps as its
+    // originals. Selection ownership and creation are atomic on this server.
+    XGrabServer(display_);
+    if (XGetSelectionOwner(display_, selection_) == None) {
+      owner_ = XCreateSimpleWindow(display_, DefaultRootWindow(display_), 0, 0,
+                                   1, 1, 0, 0, 0);
+      XSetSelectionOwner(display_, selection_, owner_, CurrentTime);
+    }
+    XUngrabServer(display_);
+    XSync(display_, False);
+    if (!owner_ || XGetSelectionOwner(display_, selection_) != owner_) {
+      error = "Another CrossDesk instance owns Linux privacy protection";
+      return false;
+    }
+    reply_.recovered = false;
+    return true;
+  }
+
+  bool ProtectInput(bool block_input, std::string& error) {
+    blocking_ = block_input;
+    if (!block_input) return true;
+    for (const auto& device : devices_) {
+      if (device.touch) {
+        error = "Touchscreen privacy input blocking is unavailable";
+        return false;
+      }
+      if (device.keyboard) {
+        // Preserve held local modifiers for the emergency chord independently
+        // of the releases sent to the master keyboard below.
+        XDevice* keyboard = XOpenDevice(display_, device.id);
+        XDeviceState* state =
+            keyboard ? XQueryDeviceState(display_, keyboard) : nullptr;
+        if (!state) {
+          if (keyboard) XCloseDevice(display_, keyboard);
+          error = "Cannot inspect held local keyboard input";
+          return false;
+        }
+        XInputClass* input = state->data;
+        for (int i = 0; i < state->num_classes; ++i) {
+          if (input->c_class == KeyClass) {
+            const auto* keys = reinterpret_cast<XKeyState*>(input);
+            for (int key = 0; key < 256; ++key)
+              keys_[device.id][key] = keys->keys[key / 8] & (1 << (key % 8));
+          }
+          input = reinterpret_cast<XInputClass*>(
+              reinterpret_cast<char*>(input) + input->length);
+        }
+        XFreeDeviceState(state);
+        XCloseDevice(display_, keyboard);
+      }
+      std::array<unsigned char, XIMaskLen(XI_LASTEVENT)> bits{};
+      for (int type : {XI_KeyPress, XI_KeyRelease, XI_ButtonPress,
+                       XI_ButtonRelease, XI_Motion})
+        XISetMask(bits.data(), type);
+      XIEventMask mask{device.id, static_cast<int>(bits.size()), bits.data()};
+      const int result = XIGrabDevice(
+          display_, device.id, DefaultRootWindow(display_), CurrentTime, None,
+          GrabModeAsync, GrabModeAsync, False, &mask);
+      if (result != GrabSuccess) {
+        error = "Cannot grab every local X11 input device";
+        return false;
+      }
+      grabbed_.push_back(device.id);
+    }
+    return ReleaseHeldInput(error);
+  }
+
+  bool ReleaseHeldInput(std::string& error) {
+    // Slave grabs float physical devices, but their previous presses can
+    // remain on the master. Release them after all grabs are installed so a
+    // held local Ctrl/button cannot alter the remote controller's next input.
+    int original_pointer = 0, count = 0;
+    XIGetClientPointer(display_, None, &original_pointer);
+    XIDeviceInfo* masters = XIQueryDevice(display_, XIAllMasterDevices, &count);
+    if (!masters) {
+      error = "Cannot inspect held X11 input";
+      return false;
+    }
+    x_error = 0;
+    bool ok = true;
+    for (int i = 0; i < count; ++i) {
+      if (masters[i].use != XIMasterPointer || !masters[i].enabled) continue;
+      XISetClientPointer(display_, None, masters[i].deviceid);
+      char keys[32]{};
+      XQueryKeymap(display_, keys);
+      for (int key = 8; key < 256; ++key)
+        if (keys[key / 8] & (1 << (key % 8)))
+          ok &= XTestFakeKeyEvent(display_, key, False, CurrentTime) != 0;
+      Window root = None, child = None;
+      double root_x = 0, root_y = 0, win_x = 0, win_y = 0;
+      XIButtonState buttons{};
+      XIModifierState modifiers{};
+      XIGroupState group{};
+      XIQueryPointer(display_, masters[i].deviceid, DefaultRootWindow(display_),
+                     &root, &child, &root_x, &root_y, &win_x, &win_y, &buttons,
+                     &modifiers, &group);
+      for (int button = 1; button < buttons.mask_len * 8; ++button)
+        if (XIMaskIsSet(buttons.mask, button))
+          ok &= XTestFakeButtonEvent(display_, button, False, CurrentTime) != 0;
+      if (buttons.mask) XFree(buttons.mask);
+      XSync(display_, False);
+      XQueryKeymap(display_, keys);
+      for (char pressed : keys) ok &= pressed == 0;
+      buttons = {};
+      XIQueryPointer(display_, masters[i].deviceid, DefaultRootWindow(display_),
+                     &root, &child, &root_x, &root_y, &win_x, &win_y, &buttons,
+                     &modifiers, &group);
+      for (int byte = 0; byte < buttons.mask_len; ++byte)
+        ok &= buttons.mask[byte] == 0;
+      if (buttons.mask) XFree(buttons.mask);
+    }
+    XIFreeDeviceInfo(masters);
+    if (original_pointer) XISetClientPointer(display_, None, original_pointer);
+    XSync(display_, False);
+    if (!ok || x_error) {
+      error = "Cannot release held X11 input for privacy";
+      return false;
+    }
+    return true;
+  }
+
+  void Key(int source, int keycode, bool down) {
+    if (keycode < 0 || keycode >= 256 ||
+        std::none_of(devices_.begin(), devices_.end(), [source](const auto& d) {
+          return d.id == source && d.keyboard;
+        }))
+      return;
+    keys_[source][keycode] = down;
+    bool ctrl = false, alt = false, shift = false;
+    for (const auto& [id, keys] : keys_) {
+      for (int code = 0; code < 256; ++code) {
+        if (!keys[code]) continue;
+        const KeySym symbol = XkbKeycodeToKeysym(display_, code, 0, 0);
+        ctrl |= symbol == XK_Control_L || symbol == XK_Control_R;
+        alt |= symbol == XK_Alt_L || symbol == XK_Alt_R;
+        shift |= symbol == XK_Shift_L || symbol == XK_Shift_R;
+      }
+    }
+    if (down && ctrl && alt && shift &&
+        XkbKeycodeToKeysym(display_, keycode, 0, 0) == XK_F12) {
+      reply_.emergency = true;
+      Recover();
+    }
+  }
+
+  void Check() {
+    checked_ = Clock::now();
+    std::string error;
+    std::vector<Output> current;
+    std::vector<Device> devices;
+    if (!ReadOutputs(current, false, error) || !ReadDevices(devices, error)) {
+      Fail(error);
+      return;
+    }
+    if (current.size() != outputs_.size() ||
+        !std::equal(
+            current.begin(), current.end(), outputs_.begin(),
+            [](const auto& a, const auto& b) { return a.SameLayout(b); })) {
+      Fail("Display topology changed; Linux privacy has been turned off");
+      return;
+    }
+    if (devices != devices_) {
+      Fail("Local input devices changed; Linux privacy has been turned off");
+      return;
+    }
+    x_error = 0;
+    for (const auto& output : outputs_) {
+      Gamma ramp(XRRGetCrtcGamma(display_, output.crtc), XRRFreeGamma);
+      if (!IsBlack(ramp.get())) {
+        Fail(
+            "Display gamma protection was changed; Linux privacy is "
+            "unavailable");
+        return;
+      }
+    }
+    XSync(display_, False);
+    if (x_error || XGetSelectionOwner(display_, selection_) != owner_)
+      Fail("Cannot verify Linux privacy protection");
+  }
+
+  Display* display_ = nullptr;
+  bool initialized_ = false;
+  bool blocking_ = false;
+  int xi_opcode_ = 0;
+  Atom xtest_property_ = None, selection_ = None;
+  Window owner_ = 0;
+  std::vector<Output> outputs_;
+  std::vector<Device> devices_;
+  std::vector<int> grabbed_;
+  std::vector<Window> hidden_roots_;
+  std::map<int, std::array<bool, 256>> keys_;
+  LinuxPrivacyReply reply_;
+  Clock::time_point checked_{};
+};
+}  // namespace
+
+int RunLinuxPrivacyGuard() {
+  const int socket = kLinuxPrivacyGuardSocket;
+  int type = 0;
+  socklen_t length = sizeof(type);
+  if (getsockopt(socket, SOL_SOCKET, SO_TYPE, &type, &length) != 0 ||
+      type != SOCK_SEQPACKET)
+    return 1;
+  fcntl(socket, F_SETFD, FD_CLOEXEC);
+  fcntl(socket, F_SETFL, O_NONBLOCK);
+  struct sigaction action {};
+  action.sa_handler = StopGuard;
+  sigemptyset(&action.sa_mask);
+  sigaction(SIGTERM, &action, nullptr);
+  sigaction(SIGINT, &action, nullptr);
+  sigaction(SIGHUP, &action, nullptr);
+  XSetErrorHandler(OnXError);
+  NativePrivacy privacy;
+  auto heartbeat = Clock::now();
+  bool connected = true;
+  bool dirty = false;
+  while (connected && !stopping) {
+    pollfd fds[] = {{socket, POLLIN, 0}, {privacy.Connection(), POLLIN, 0}};
+    poll(fds, 2, privacy.Reply().active ? 25 : 250);
+    if (fds[0].revents & (POLLERR | POLLHUP | POLLNVAL)) break;
+    for (int i = 0; i < 64; ++i) {
+      LinuxPrivacyCommand command;
+      const auto bytes = recv(socket, &command, sizeof(command), 0);
+      if (bytes < 0 &&
+          (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR))
+        break;
+      if (bytes != sizeof(command)) {
+        connected = false;
+        break;
+      }
+      heartbeat = Clock::now();
+      switch (command) {
+        case LinuxPrivacyCommand::query:
+          if (!privacy.Reply().active) privacy.Query();
+          break;
+        case LinuxPrivacyCommand::enable:
+          privacy.Enable(false);
+          break;
+        case LinuxPrivacyCommand::enable_blocking:
+          privacy.Enable(true);
+          break;
+        case LinuxPrivacyCommand::recover:
+          privacy.Recover();
+          break;
+        case LinuxPrivacyCommand::heartbeat:
+          break;
+        default:
+          connected = false;
+          break;
+      }
+      dirty = true;
+    }
+    if (!connected || stopping) break;
+    const auto before = privacy.Reply();
+    privacy.Poll();
+    if (privacy.Reply().active &&
+        Clock::now() - heartbeat > std::chrono::seconds(3))
+      privacy.Fail(
+          "Privacy controller stopped responding; local desktop and input "
+          "restored");
+    const auto& after = privacy.Reply();
+    dirty |= before.active != after.active ||
+             before.recovered != after.recovered ||
+             before.emergency != after.emergency ||
+             std::strcmp(before.failure, after.failure) != 0;
+    if (dirty) {
+      const auto& reply = privacy.Reply();
+      if (send(socket, &reply, sizeof(reply), MSG_NOSIGNAL) == sizeof(reply)) {
+        dirty = false;
+        privacy.AcknowledgeEmergency();
+      } else if (errno != EAGAIN && errno != EWOULDBLOCK && errno != EINTR)
+        break;
+    }
+  }
+  // Keep trying if the X server temporarily rejected restoration, even after
+  // the parent exited. Disconnecting releases XI grabs and cursor hiding too.
+  do {
+    privacy.Recover();
+    if (!privacy.Reply().recovered) poll(nullptr, 0, 250);
+  } while (!privacy.Reply().recovered);
+  const auto& reply = privacy.Reply();
+  const auto ignored = send(socket, &reply, sizeof(reply), MSG_NOSIGNAL);
+  (void)ignored;
+  close(socket);
+  return 0;
+}
+}  // namespace crossdesk
@@ -0,0 +1,42 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-13
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _PRIVACY_GUARD_H_
+#define _PRIVACY_GUARD_H_
+
+#include <cstdint>
+
+namespace crossdesk {
+
+inline constexpr char kLinuxPrivacyGuardArgument[] = "--linux-privacy-guard";
+inline constexpr int kLinuxPrivacyGuardSocket = 3;
+
+// Private protocol over an inherited SOCK_SEQPACKET socket. No listening
+// socket, shell, elevated privileges or separately installed helper is needed.
+enum class LinuxPrivacyCommand : uint8_t {
+  query,
+  enable,
+  enable_blocking,
+  recover,
+  heartbeat,
+};
+
+struct LinuxPrivacyReply {
+  uint64_t generation = 0;
+  bool supported = false;
+  bool input_supported = false;
+  bool active = false;
+  bool recovered = true;
+  bool emergency = false;
+  char capability_reason[256]{};
+  char failure[256]{};
+};
+
+int RunLinuxPrivacyGuard();
+
+}  // namespace crossdesk
+
+#endif
@@ -8,6 +8,7 @@

 #include <display_stream_id.h>
 #include "platform.h"
+#include "privacy_controller.h"
 #include "rd_log.h"
 #if defined(CROSSDESK_HAS_DRM) && CROSSDESK_HAS_DRM
 #include "screen_capturer_drm.h"
@@ -64,6 +65,13 @@ int ScreenCapturerLinux::Init(const int fps, cb_desktop_data cb) {
      return;
    }
    invalid_stream_id_logged_.store(false, std::memory_order_relaxed);
+    {
+      std::lock_guard lock(privacy_mutex_);
+      if (privacy_ && !capture_paused_ && !capture_announced_) {
+        capture_announced_ = true;
+        privacy_->CaptureChanged(true);
+      }
+    }
    if (callback_orig_) {
      callback_orig_(data, size, width, height, mapped_stream_id.c_str(),
                     native_frame);
@@ -145,6 +153,7 @@ int ScreenCapturerLinux::Init(const int fps, cb_desktop_data cb) {
 }

 int ScreenCapturerLinux::Destroy() {
+  Stop();
  if (impl_) {
    impl_->Destroy();
    impl_.reset();
@@ -169,6 +178,11 @@ int ScreenCapturerLinux::Start(bool show_cursor) {
    return -1;
  }

+  {
+    std::lock_guard lock(privacy_mutex_);
+    capture_paused_ = false;
+  }
+
  // X11 output names, DRM connectors and Wayland stream handles may all change
  // after an HDMI hotplug, so rebuild the current backend before each session.
  const int refresh_ret = RefreshCurrentBackend();
@@ -226,6 +240,11 @@ int ScreenCapturerLinux::Stop() {
    return 0;
  }
  const int ret = impl_->Stop();
+  {
+    std::lock_guard lock(privacy_mutex_);
+    capture_announced_ = false;
+    if (privacy_) privacy_->CaptureChanged(false);
+  }
  UpdateAliasesFromBackend(impl_.get());
  return ret;
 }
@@ -234,13 +253,25 @@ int ScreenCapturerLinux::Pause(int monitor_index) {
  if (!impl_) {
    return -1;
  }
-  return impl_->Pause(monitor_index);
+  const int ret = impl_->Pause(monitor_index);
+  {
+    // An in-flight frame must not announce running again after a pause.
+    std::lock_guard lock(privacy_mutex_);
+    capture_paused_ = true;
+    capture_announced_ = false;
+    if (privacy_) privacy_->CaptureChanged(false);
+  }
+  return ret;
 }

 int ScreenCapturerLinux::Resume(int monitor_index) {
  if (!impl_) {
    return -1;
  }
+  {
+    std::lock_guard lock(privacy_mutex_);
+    capture_paused_ = false;
+  }
  return impl_->Resume(monitor_index);
 }

@@ -25,6 +25,7 @@ class ScreenCapturerLinux : public ScreenCapturer {

 public:
  int Init(const int fps, cb_desktop_data cb) override;
+  void SetPrivacyController(PrivacyController* privacy) override { privacy_ = privacy; }
  int Destroy() override;
  int Start(bool show_cursor) override;
  int Stop() override;
@@ -53,6 +54,10 @@ class ScreenCapturerLinux : public ScreenCapturer {

 private:
  std::unique_ptr<ScreenCapturer> impl_;
+  PrivacyController* privacy_ = nullptr;
+  std::mutex privacy_mutex_;
+  bool capture_announced_ = false;
+  bool capture_paused_ = false;
  BackendType backend_ = BackendType::kNone;
  int fps_ = 60;
  cb_desktop_data callback_;
@@ -3,269 +3,240 @@
 #include <pulse/error.h>
 #include <pulse/introspect.h>

-#include <condition_variable>
-#include <iostream>
-#include <thread>
+#include <string>
+#include <utility>

 #include "rd_log.h"

 namespace crossdesk {
-
-constexpr int kSampleRate = 48000;
-constexpr pa_sample_format_t kFormat = PA_SAMPLE_S16LE;
-constexpr int kChannels = 1;
+namespace {
 constexpr size_t kFrameSizeBytes = 480 * sizeof(int16_t);
+constexpr auto kStartupTimeout = std::chrono::seconds(2);
+constexpr auto kPollInterval = std::chrono::milliseconds(5);

-SpeakerCapturerLinux::SpeakerCapturerLinux()
-    : inited_(false), paused_(false), stop_flag_(false) {}
-SpeakerCapturerLinux::~SpeakerCapturerLinux() {
-  Stop();
-  Destroy();
+void ReleaseOperation(pa_operation* operation) {
+  if (!operation) return;
+  if (pa_operation_get_state(operation) == PA_OPERATION_RUNNING)
+    pa_operation_cancel(operation);
+  pa_operation_unref(operation);
 }
+}  // namespace
+
+SpeakerCapturerLinux::~SpeakerCapturerLinux() { Destroy(); }

 int SpeakerCapturerLinux::Init(speaker_data_cb cb) {
  if (inited_) return 0;
-  cb_ = cb;
+  cb_ = std::move(cb);
  inited_ = true;
  return 0;
 }

-int SpeakerCapturerLinux::Destroy() {
-  inited_ = false;
-  return 0;
+// Use nonblocking iterations instead of pa_threaded_mainloop_wait(): a server
+// that never replies, disappears, or never reaches STREAM_READY must not leave
+// startup/Stop waiting for a signal that will never be delivered.
+bool SpeakerCapturerLinux::PumpUntil(
+    const std::function<bool()>& ready,
+    std::chrono::steady_clock::time_point deadline) {
+  while (!stop_flag_) {
+    if (ready()) return true;
+    if (std::chrono::steady_clock::now() >= deadline ||
+        !PA_CONTEXT_IS_GOOD(pa_context_get_state(context_)))
+      return false;
+    if (pa_mainloop_iterate(mainloop_, 0, nullptr) < 0) return false;
+    std::this_thread::sleep_for(kPollInterval);
+  }
+  return false;
 }

-std::string SpeakerCapturerLinux::GetDefaultMonitorSourceName() {
-  std::string monitor_name;
-  std::mutex mtx;
-  std::condition_variable cv;
-  bool ready = false;
+bool SpeakerCapturerLinux::Prepare() {
+  const auto deadline = std::chrono::steady_clock::now() + kStartupTimeout;
+  mainloop_ = pa_mainloop_new();
+  if (!mainloop_) return false;
+  context_ =
+      pa_context_new(pa_mainloop_get_api(mainloop_), "CrossDesk system audio");
+  if (!context_ ||
+      pa_context_connect(context_, nullptr, PA_CONTEXT_NOFLAGS, nullptr) < 0)
+    return false;
+  if (!PumpUntil(
+          [&] { return pa_context_get_state(context_) == PA_CONTEXT_READY; },
+          deadline))
+    return false;

-  pa_mainloop* mainloop = pa_mainloop_new();
-  pa_mainloop_api* api = pa_mainloop_get_api(mainloop);
-  pa_context* context = pa_context_new(api, "GetMonitor");
-
-  struct CallbackState {
-    std::string* name;
-    std::mutex* mtx;
-    std::condition_variable* cv;
-    bool* ready;
-  } state{&monitor_name, &mtx, &cv, &ready};
-
-  pa_context_set_state_callback(
-      context,
-      [](pa_context* c, void* userdata) {
-        auto* state = static_cast<CallbackState*>(userdata);
-        if (pa_context_get_state(c) == PA_CONTEXT_READY) {
-          pa_operation* operation = pa_context_get_server_info(
-              c,
-              [](pa_context*, const pa_server_info* info, void* userdata) {
-                auto* state = static_cast<CallbackState*>(userdata);
-                if (info && info->default_sink_name) {
-                  *(state->name) =
-                      std::string(info->default_sink_name) + ".monitor";
-                }
-                {
-                  std::lock_guard<std::mutex> lock(*(state->mtx));
-                  *(state->ready) = true;
-                }
-                state->cv->notify_one();
-              },
-              userdata);
-          if (operation) {
-            pa_operation_unref(operation);
-          }
-        }
+  struct ServerResult {
+    bool done = false;
+    std::string sink;
+  } server;
+  pa_operation* operation = pa_context_get_server_info(
+      context_,
+      [](pa_context*, const pa_server_info* info, void* data) {
+        auto& result = *static_cast<ServerResult*>(data);
+        if (info && info->default_sink_name)
+          result.sink = info->default_sink_name;
+        result.done = true;
      },
-      &state);
+      &server);
+  const bool got_server =
+      operation && PumpUntil([&] { return server.done; }, deadline);
+  ReleaseOperation(operation);
+  if (!got_server || server.sink.empty()) return false;

-  pa_context_connect(context, nullptr, PA_CONTEXT_NOFLAGS, nullptr);
+  // Query the actual monitor name; a changed/default device need not follow
+  // the "<sink>.monitor" naming convention.
+  struct SinkResult {
+    bool done = false;
+    std::string monitor;
+  } sink;
+  operation = pa_context_get_sink_info_by_name(
+      context_, server.sink.c_str(),
+      [](pa_context*, const pa_sink_info* info, int eol, void* data) {
+        auto& result = *static_cast<SinkResult*>(data);
+        if (info && info->monitor_source_name)
+          result.monitor = info->monitor_source_name;
+        if (eol != 0) result.done = true;
+      },
+      &sink);
+  const bool got_sink =
+      operation && PumpUntil([&] { return sink.done; }, deadline);
+  ReleaseOperation(operation);
+  if (!got_sink || sink.monitor.empty()) return false;

-  std::thread loop_thread([&]() {
-    int ret = 0;
-    pa_mainloop_run(mainloop, &ret);
-  });
+  const pa_sample_spec spec{PA_SAMPLE_S16LE, 48000, 1};
+  stream_ = pa_stream_new(context_, "System audio", &spec, nullptr);
+  if (!stream_) return false;
+  pa_stream_set_read_callback(
+      stream_,
+      [](pa_stream* stream, size_t, void* data) {
+        static_cast<SpeakerCapturerLinux*>(data)->ReadAudio(stream);
+      },
+      this);
+  pa_buffer_attr attr{};
+  attr.maxlength = static_cast<uint32_t>(-1);
+  attr.fragsize = static_cast<uint32_t>(kFrameSizeBytes);
+  if (pa_stream_connect_record(stream_, sink.monitor.c_str(), &attr,
+                               PA_STREAM_ADJUST_LATENCY) < 0)
+    return false;
+  if (!PumpUntil(
+          [&] {
+            const auto state = pa_stream_get_state(stream_);
+            return state == PA_STREAM_READY || !PA_STREAM_IS_GOOD(state);
+          },
+          deadline) ||
+      pa_stream_get_state(stream_) != PA_STREAM_READY)
+    return false;
+  LOG_INFO("System audio monitor ready: {}", sink.monitor);
+  return true;
+}

+void SpeakerCapturerLinux::Run() {
+  const bool ready = Prepare();
+  running_ = ready && !stop_flag_;
  {
-    std::unique_lock<std::mutex> lock(mtx);
-    cv.wait_for(lock, std::chrono::seconds(2), [&] { return ready; });
+    std::lock_guard<std::mutex> lock(state_mtx_);
+    startup_success_ = running_;
+    startup_done_ = true;
  }
-
-  pa_context_disconnect(context);
-  pa_context_unref(context);
-  pa_mainloop_quit(mainloop, 0);
-  loop_thread.join();
-  pa_mainloop_free(mainloop);
-
-  return monitor_name;
+  startup_wake_.notify_one();
+  if (!ready && !stop_flag_) {
+    LOG_ERROR(
+        "PulseAudio capture startup failed or timed out: {}",
+        context_ ? pa_strerror(pa_context_errno(context_)) : "no context");
+  }
+  while (running_ && !stop_flag_) {
+    if (pa_mainloop_iterate(mainloop_, 0, nullptr) < 0 ||
+        pa_context_get_state(context_) != PA_CONTEXT_READY ||
+        pa_stream_get_state(stream_) != PA_STREAM_READY)
+      break;
+    std::this_thread::sleep_for(kPollInterval);
+  }
+  running_ = false;
+  Cleanup();
 }

 int SpeakerCapturerLinux::Start() {
-  if (!inited_ || mainloop_thread_.joinable()) return -1;
+  if (!inited_) return -1;
+  if (IsRunning()) return 0;
+  Stop();
  stop_flag_ = false;
-
-  mainloop_thread_ = std::thread([this]() {
-    std::string monitor_name = GetDefaultMonitorSourceName();
-    if (monitor_name.empty()) {
-      LOG_ERROR("Failed to get monitor source");
-      return;
-    }
-
-    mainloop_ = pa_threaded_mainloop_new();
-    pa_mainloop_api* api = pa_threaded_mainloop_get_api(mainloop_);
-    context_ = pa_context_new(api, "SpeakerCapturer");
-
-    pa_context_set_state_callback(
-        context_,
-        [](pa_context* c, void* userdata) {
-          auto self = static_cast<SpeakerCapturerLinux*>(userdata);
-          pa_context_state_t state = pa_context_get_state(c);
-          if (state == PA_CONTEXT_READY || state == PA_CONTEXT_FAILED ||
-              state == PA_CONTEXT_TERMINATED) {
-            pa_threaded_mainloop_signal(self->mainloop_, 0);
-          }
-        },
-        this);
-
-    if (pa_threaded_mainloop_start(mainloop_) < 0) {
-      LOG_ERROR("Failed to start mainloop");
-      Cleanup();
-      return;
-    }
-
-    pa_threaded_mainloop_lock(mainloop_);
-
-    if (pa_context_connect(context_, nullptr, PA_CONTEXT_NOFLAGS, nullptr) <
-        0) {
-      LOG_ERROR("Failed to connect context");
-      pa_threaded_mainloop_unlock(mainloop_);
-      Cleanup();
-      return;
-    }
-
-    while (true) {
-      pa_context_state_t state = pa_context_get_state(context_);
-      if (state == PA_CONTEXT_READY) break;
-      if (!PA_CONTEXT_IS_GOOD(state) || stop_flag_) {
-        pa_threaded_mainloop_unlock(mainloop_);
-        Cleanup();
-        return;
-      }
-      pa_threaded_mainloop_wait(mainloop_);
-    }
-
-    pa_sample_spec ss = {kFormat, kSampleRate, kChannels};
-    stream_ = pa_stream_new(context_, "Capture", &ss, nullptr);
-
-    pa_stream_set_read_callback(
-        stream_,
-        [](pa_stream* s, size_t len, void* u) {
-          auto self = static_cast<SpeakerCapturerLinux*>(u);
-          if (self->paused_ || self->stop_flag_) return;
-
-          const void* data = nullptr;
-          if (pa_stream_peek(s, &data, &len) < 0 || !data) return;
-
-          const uint8_t* p = static_cast<const uint8_t*>(data);
-          self->frame_cache_.insert(self->frame_cache_.end(), p, p + len);
-
-          while (self->frame_cache_.size() >= kFrameSizeBytes) {
-            std::vector<uint8_t> temp_frame(
-                self->frame_cache_.begin(),
-                self->frame_cache_.begin() + kFrameSizeBytes);
-            self->cb_(temp_frame.data(), kFrameSizeBytes, "audio");
-            self->frame_cache_.erase(
-                self->frame_cache_.begin(),
-                self->frame_cache_.begin() + kFrameSizeBytes);
-          }
-
-          pa_stream_drop(s);
-        },
-        this);
-
-    pa_buffer_attr attr = {.maxlength = (uint32_t)-1,
-                           .tlength = 0,
-                           .prebuf = 0,
-                           .minreq = 0,
-                           .fragsize = (uint32_t)kFrameSizeBytes};
-
-    if (pa_stream_connect_record(stream_, monitor_name.c_str(), &attr,
-                                 PA_STREAM_ADJUST_LATENCY) < 0) {
-      LOG_ERROR("Failed to connect stream");
-      pa_threaded_mainloop_unlock(mainloop_);
-      Cleanup();
-      return;
-    }
-
-    while (true) {
-      pa_stream_state_t s = pa_stream_get_state(stream_);
-      if (s == PA_STREAM_READY) break;
-      if (!PA_STREAM_IS_GOOD(s) || stop_flag_) {
-        pa_threaded_mainloop_unlock(mainloop_);
-        Cleanup();
-        return;
-      }
-      pa_threaded_mainloop_wait(mainloop_);
-    }
-
-    pa_threaded_mainloop_unlock(mainloop_);
-
-    while (!stop_flag_)
-      std::this_thread::sleep_for(std::chrono::milliseconds(100));
-  });
-
+  paused_ = false;
+  {
+    std::lock_guard<std::mutex> lock(state_mtx_);
+    startup_done_ = false;
+    startup_success_ = false;
+  }
+  mainloop_thread_ = std::thread([this] { Run(); });
+  std::unique_lock<std::mutex> lock(state_mtx_);
+  const bool started =
+      startup_wake_.wait_for(lock, kStartupTimeout + std::chrono::seconds(1),
+                             [&] { return startup_done_; }) &&
+      startup_success_;
+  lock.unlock();
+  if (!started) {
+    Stop();
+    return -1;
+  }
  return 0;
 }

 int SpeakerCapturerLinux::Stop() {
  stop_flag_ = true;
-
-  if (mainloop_) {
-    pa_threaded_mainloop_lock(mainloop_);
-    pa_threaded_mainloop_signal(mainloop_, 0);
-    pa_threaded_mainloop_unlock(mainloop_);
-  }
-
-  if (mainloop_thread_.joinable()) {
-    mainloop_thread_.join();
-  }
-
-  Cleanup();
+  if (mainloop_thread_.joinable()) mainloop_thread_.join();
+  running_ = false;
  return 0;
 }

+int SpeakerCapturerLinux::Destroy() {
+  Stop();
+  cb_ = nullptr;
+  inited_ = false;
+  return 0;
+}
+
+void SpeakerCapturerLinux::ReadAudio(pa_stream* stream) {
+  const void* data = nullptr;
+  size_t size = 0;
+  if (pa_stream_peek(stream, &data, &size) < 0 || size == 0) return;
+  if (data && !paused_ && !stop_flag_ && cb_) {
+    const auto* bytes = static_cast<const uint8_t*>(data);
+    frame_cache_.insert(frame_cache_.end(), bytes, bytes + size);
+    size_t consumed = 0;
+    while (!stop_flag_ && frame_cache_.size() - consumed >= kFrameSizeBytes) {
+      cb_(frame_cache_.data() + consumed, kFrameSizeBytes, "audio");
+      consumed += kFrameSizeBytes;
+    }
+    frame_cache_.erase(frame_cache_.begin(), frame_cache_.begin() + consumed);
+  } else {
+    frame_cache_.clear();
+  }
+  // Drop holes and paused data too, otherwise the read queue cannot advance.
+  pa_stream_drop(stream);
+}
+
 void SpeakerCapturerLinux::Cleanup() {
+  if (stream_) {
+    pa_stream_set_read_callback(stream_, nullptr, nullptr);
+    pa_stream_disconnect(stream_);
+    pa_stream_unref(stream_);
+    stream_ = nullptr;
+  }
+  if (context_) {
+    pa_context_disconnect(context_);
+    pa_context_unref(context_);
+    context_ = nullptr;
+  }
  if (mainloop_) {
-    pa_threaded_mainloop_stop(mainloop_);
-    pa_threaded_mainloop_lock(mainloop_);
-
-    if (stream_) {
-      pa_stream_disconnect(stream_);
-      pa_stream_unref(stream_);
-      stream_ = nullptr;
-    }
-
-    if (context_) {
-      pa_context_disconnect(context_);
-      pa_context_unref(context_);
-      context_ = nullptr;
-    }
-
-    pa_threaded_mainloop_unlock(mainloop_);
-    pa_threaded_mainloop_free(mainloop_);
+    pa_mainloop_free(mainloop_);
    mainloop_ = nullptr;
  }
-
  frame_cache_.clear();
 }

+bool SpeakerCapturerLinux::IsRunning() const { return running_; }
 int SpeakerCapturerLinux::Pause() {
  paused_ = true;
  return 0;
 }
-
 int SpeakerCapturerLinux::Resume() {
  paused_ = false;
  return 0;
 }
-}  // namespace crossdesk
+}  // namespace crossdesk
@@ -4,53 +4,59 @@
 * Copyright (c) 2025 by DI JUNKUN, All Rights Reserved.
 */

-#ifndef _SPEAKER_CAPTURER_LINUX_H_
-#define _SPEAKER_CAPTURER_LINUX_H_
+#ifndef CROSSDESK_SPEAKER_CAPTURER_LINUX_H_
+#define CROSSDESK_SPEAKER_CAPTURER_LINUX_H_

 #include <pulse/pulseaudio.h>

 #include <atomic>
+#include <chrono>
+#include <condition_variable>
 #include <functional>
 #include <mutex>
-#include <string>
 #include <thread>
 #include <vector>

 #include "speaker_capturer.h"

 namespace crossdesk {
-
 class SpeakerCapturerLinux : public SpeakerCapturer {
 public:
-  SpeakerCapturerLinux();
-  ~SpeakerCapturerLinux();
-
+  SpeakerCapturerLinux() = default;
+  ~SpeakerCapturerLinux() override;
  int Init(speaker_data_cb cb) override;
  int Destroy() override;
  int Start() override;
  int Stop() override;
-
+  bool IsRunning() const override;
  int Pause();
  int Resume();

 private:
-  std::string GetDefaultMonitorSourceName();
+  void Run();
+  bool Prepare();
+  bool PumpUntil(const std::function<bool()>& ready,
+                 std::chrono::steady_clock::time_point deadline);
  void Cleanup();
+  void ReadAudio(pa_stream* stream);

- private:
-  speaker_data_cb cb_ = nullptr;
-
-  std::atomic<bool> inited_;
-  std::atomic<bool> paused_;
-  std::atomic<bool> stop_flag_;
-
+  speaker_data_cb cb_;
+  bool inited_ = false;
+  std::atomic<bool> paused_{false};
+  std::atomic<bool> stop_flag_{false};
+  std::atomic<bool> running_{false};
  std::thread mainloop_thread_;
-  pa_threaded_mainloop* mainloop_ = nullptr;
+  std::mutex state_mtx_;
+  std::condition_variable startup_wake_;
+  bool startup_done_ = false;
+  bool startup_success_ = false;
+
+  // These objects are created, driven and freed exclusively by Run(). Stop
+  // only changes an atomic flag and joins, never races PulseAudio callbacks.
+  pa_mainloop* mainloop_ = nullptr;
  pa_context* context_ = nullptr;
  pa_stream* stream_ = nullptr;
-
-  std::mutex state_mtx_;
  std::vector<uint8_t> frame_cache_;
 };
 }  // namespace crossdesk
-#endif
+#endif
@@ -11,6 +11,7 @@
 #include <vector>

 #include "runtime/cursor_position.h"
+#include "../../privacy/privacy_cursor_mac.h"

 namespace crossdesk {
 namespace {
@@ -94,7 +95,7 @@ void AddKnownCursor(std::vector<KnownCursor>* cursors, NSCursor* cursor,

 std::vector<KnownCursor> BuildKnownCursors() {
  std::vector<KnownCursor> cursors;
-  cursors.reserve(16);
+  cursors.reserve(40);

 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
@@ -128,6 +129,55 @@ std::vector<KnownCursor> BuildKnownCursors() {
                 RemoteCursorShape::w_resize);
 #pragma clang diagnostic pop

+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 150000
+  if (@available(macOS 15.0, *)) {
+    // Window-frame resize artwork differs from the legacy divider cursors
+    // above. Include every edge/corner and both one-way variants. Inward
+    // arrows point toward the frame's center; outward arrows point away.
+    struct FrameResizeCursorMapping {
+      NSCursorFrameResizePosition position;
+      RemoteCursorShape bidirectional;
+      RemoteCursorShape inward;
+      RemoteCursorShape outward;
+    };
+    constexpr FrameResizeCursorMapping mappings[] = {
+        {NSCursorFrameResizePositionTop, RemoteCursorShape::ns_resize,
+         RemoteCursorShape::s_resize, RemoteCursorShape::n_resize},
+        {NSCursorFrameResizePositionLeft, RemoteCursorShape::ew_resize,
+         RemoteCursorShape::e_resize, RemoteCursorShape::w_resize},
+        {NSCursorFrameResizePositionBottom, RemoteCursorShape::ns_resize,
+         RemoteCursorShape::n_resize, RemoteCursorShape::s_resize},
+        {NSCursorFrameResizePositionRight, RemoteCursorShape::ew_resize,
+         RemoteCursorShape::w_resize, RemoteCursorShape::e_resize},
+        {NSCursorFrameResizePositionTopLeft, RemoteCursorShape::nwse_resize,
+         RemoteCursorShape::se_resize, RemoteCursorShape::nw_resize},
+        {NSCursorFrameResizePositionTopRight, RemoteCursorShape::nesw_resize,
+         RemoteCursorShape::sw_resize, RemoteCursorShape::ne_resize},
+        {NSCursorFrameResizePositionBottomLeft, RemoteCursorShape::nesw_resize,
+         RemoteCursorShape::ne_resize, RemoteCursorShape::sw_resize},
+        {NSCursorFrameResizePositionBottomRight, RemoteCursorShape::nwse_resize,
+         RemoteCursorShape::nw_resize, RemoteCursorShape::se_resize},
+    };
+    for (const FrameResizeCursorMapping& mapping : mappings) {
+      AddKnownCursor(
+          &cursors,
+          [NSCursor frameResizeCursorFromPosition:mapping.position
+                                    inDirections:NSCursorFrameResizeDirectionsAll],
+          mapping.bidirectional);
+      AddKnownCursor(
+          &cursors,
+          [NSCursor frameResizeCursorFromPosition:mapping.position
+                                    inDirections:NSCursorFrameResizeDirectionsInward],
+          mapping.inward);
+      AddKnownCursor(
+          &cursors,
+          [NSCursor frameResizeCursorFromPosition:mapping.position
+                                    inDirections:NSCursorFrameResizeDirectionsOutward],
+          mapping.outward);
+    }
+  }
+#endif
+
  return cursors;
 }

@@ -161,7 +211,9 @@ bool CursorStateProvider::Sample(const std::vector<DisplayInfo>& displays,
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
  NSCursor* cursor = NSCursor.currentSystemCursor;
-  const bool visible = CGCursorIsVisible();
+  const bool privacy_hidden = IsMacPrivacyCursorHidden();
+  const bool visible = CGCursorIsVisible() || privacy_hidden;
+  if (!cursor && privacy_hidden) cursor = NSCursor.arrowCursor;
 #pragma clang diagnostic pop

  state->seq = 0;
@@ -1,187 +0,0 @@
-#include "application/gui_application.h"
-#include "layout.h"
-#include "localization.h"
-
-namespace crossdesk {
-
-bool GuiApplication::DrawToggleSwitch(const char *id, bool active,
-                                      bool enabled) {
-  const float TRACK_HEIGHT = ImGui::GetFrameHeight();
-  const float TRACK_WIDTH = TRACK_HEIGHT * 1.8f;
-  const float TRACK_RADIUS = TRACK_HEIGHT * 0.5f;
-  const float KNOB_PADDING = 2.0f;
-  const float KNOB_HEIGHT = TRACK_HEIGHT - 4.0f;
-  const float KNOB_WIDTH = KNOB_HEIGHT * 1.2f;
-  const float KNOB_RADIUS = KNOB_HEIGHT * 0.5f;
-  const float DISABLED_ALPHA = 0.6f;
-  const float KNOB_ALPHA_DISABLED = 0.9f;
-
-  const ImVec4 COLOR_ACTIVE = ImVec4(0.0f, 0.0f, 1.0f, 1.0f);
-  const ImVec4 COLOR_ACTIVE_HOVER = ImVec4(0.26f, 0.59f, 0.98f, 1.0f);
-  const ImVec4 COLOR_INACTIVE = ImVec4(0.60f, 0.60f, 0.60f, 1.0f);
-  const ImVec4 COLOR_INACTIVE_HOVER = ImVec4(0.70f, 0.70f, 0.70f, 1.0f);
-  const ImVec4 COLOR_KNOB = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
-
-  ImDrawList *draw_list = ImGui::GetWindowDrawList();
-  ImVec2 track_pos = ImGui::GetCursorScreenPos();
-
-  ImGui::InvisibleButton(id, ImVec2(TRACK_WIDTH, TRACK_HEIGHT));
-  bool hovered = ImGui::IsItemHovered();
-  bool clicked = ImGui::IsItemClicked() && enabled;
-
-  ImVec4 track_color =
-      active ? (hovered && enabled ? COLOR_ACTIVE_HOVER : COLOR_ACTIVE)
-             : (hovered && enabled ? COLOR_INACTIVE_HOVER : COLOR_INACTIVE);
-
-  if (!enabled) {
-    track_color.w *= DISABLED_ALPHA;
-  }
-
-  ImVec2 track_min = ImVec2(track_pos.x, track_pos.y + 0.5f);
-  ImVec2 track_max =
-      ImVec2(track_pos.x + TRACK_WIDTH, track_pos.y + TRACK_HEIGHT - 0.5f);
-  draw_list->AddRectFilled(track_min, track_max,
-                           ImGui::GetColorU32(track_color), TRACK_RADIUS);
-
-  float knob_position = active ? 1.0f : 0.0f;
-  float knob_min_x = track_pos.x + KNOB_PADDING;
-  float knob_max_x = track_pos.x + TRACK_WIDTH - KNOB_WIDTH - KNOB_PADDING;
-  float knob_x = knob_min_x + knob_position * (knob_max_x - knob_min_x);
-  float knob_y = track_pos.y + (TRACK_HEIGHT - KNOB_HEIGHT) * 0.5f;
-
-  ImVec4 knob_color = COLOR_KNOB;
-  if (!enabled) {
-    knob_color.w = KNOB_ALPHA_DISABLED;
-  }
-
-  ImVec2 knob_min = ImVec2(knob_x, knob_y);
-  ImVec2 knob_max = ImVec2(knob_x + KNOB_WIDTH, knob_y + KNOB_HEIGHT);
-  draw_list->AddRectFilled(knob_min, knob_max, ImGui::GetColorU32(knob_color),
-                           KNOB_RADIUS);
-
-  return clicked;
-}
-
-int GuiApplication::RequestPermissionWindow() {
-  RefreshMacPermissionStatus(false);
-
-  const bool screen_recording_granted =
-      mac_screen_recording_permission_granted_;
-  const bool accessibility_granted = mac_accessibility_permission_granted_;
-
-  show_request_permission_window_ =
-      !screen_recording_granted || !accessibility_granted;
-
-  if (!show_request_permission_window_) {
-    return 0;
-  }
-
-  const ImGuiViewport *viewport = ImGui::GetMainViewport();
-  float window_width = localization_language_index_ == 0
-                           ? REQUEST_PERMISSION_WINDOW_WIDTH_CN
-                           : REQUEST_PERMISSION_WINDOW_WIDTH_EN;
-  float window_height = localization_language_index_ == 0
-                            ? REQUEST_PERMISSION_WINDOW_HEIGHT_CN
-                            : REQUEST_PERMISSION_WINDOW_HEIGHT_EN;
-
-  float checkbox_padding = localization_language_index_ == 0
-                               ? REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_CN
-                               : REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_EN;
-
-  ImVec2 center_pos = ImVec2(
-      (viewport->WorkSize.x - window_width) * 0.5f + viewport->WorkPos.x,
-      (viewport->WorkSize.y - window_height) * 0.5f + viewport->WorkPos.y);
-  ImGui::SetNextWindowPos(center_pos, ImGuiCond_Once);
-
-  ImGui::SetNextWindowSize(ImVec2(window_width, window_height),
-                           ImGuiCond_Always);
-
-  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, window_rounding_);
-  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, window_rounding_ * 0.5f);
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
-
-  ImGui::Begin(
-      localization::request_permissions[localization_language_index_].c_str(),
-      nullptr,
-      ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
-          ImGuiWindowFlags_NoSavedSettings);
-
-  ImGui::SetWindowFontScale(0.3f);
-
-  // use system font
-  if (main_windows_system_chinese_font_ != nullptr) {
-    ImGui::PushFont(main_windows_system_chinese_font_);
-  }
-
-  ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetTextLineHeight() +
-                       5.0f);
-  ImGui::SetCursorPosX(10.0f);
-  ImGui::TextWrapped(
-      "%s",
-      localization::permission_required_message[localization_language_index_]
-          .c_str());
-
-  ImGui::Spacing();
-  ImGui::Spacing();
-  ImGui::Spacing();
-
-  // accessibility permission
-  ImGui::SetCursorPosX(10.0f);
-  ImGui::AlignTextToFramePadding();
-  ImGui::Text(
-      "1. %s:",
-      localization::accessibility_permission[localization_language_index_]
-          .c_str());
-  ImGui::SameLine();
-  ImGui::AlignTextToFramePadding();
-  ImGui::SetCursorPosX(checkbox_padding);
-  if (accessibility_granted) {
-    DrawToggleSwitch("accessibility_toggle_on", true, false);
-  } else {
-    if (DrawToggleSwitch("accessibility_toggle", false, true)) {
-      OpenAccessibilityPreferences();
-      mac_accessibility_permission_requested_ = true;
-      RefreshMacPermissionStatus(true);
-    }
-  }
-
-  ImGui::Spacing();
-
-  // screen recording permission
-  ImGui::SetCursorPosX(10.0f);
-  ImGui::AlignTextToFramePadding();
-  ImGui::Text(
-      "2. %s:",
-      localization::screen_recording_permission[localization_language_index_]
-          .c_str());
-  ImGui::SameLine();
-  ImGui::AlignTextToFramePadding();
-  ImGui::SetCursorPosX(checkbox_padding);
-  if (screen_recording_granted) {
-    DrawToggleSwitch("screen_recording_toggle_on", true, false);
-  } else {
-    if (DrawToggleSwitch("screen_recording_toggle", false, true)) {
-      OpenScreenRecordingPreferences();
-      mac_screen_recording_permission_requested_ = true;
-      RefreshMacPermissionStatus(true);
-    }
-  }
-
-  ImGui::SetWindowFontScale(1.0f);
-  ImGui::SetWindowFontScale(0.45f);
-
-  // pop system font
-  if (main_windows_system_chinese_font_ != nullptr) {
-    ImGui::PopFont();
-  }
-
-  ImGui::End();
-  ImGui::SetWindowFontScale(1.0f);
-  ImGui::PopStyleVar(4);
-  ImGui::PopStyleColor();
-
-  return 0;
-}
-} // namespace crossdesk
@@ -1,25 +0,0 @@
-/*
- * @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
@@ -1,64 +0,0 @@
-#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__
@@ -4,6 +4,7 @@
 #include <unordered_map>

 #include "keyboard_converter.h"
+#include "../mac_injected_event.h"
 #include "rd_log.h"

 namespace crossdesk {
@@ -11,7 +12,6 @@ namespace crossdesk {
 static OnKeyAction g_on_key_action = nullptr;
 static void* g_user_ptr = nullptr;
 static std::unordered_map<int, int> g_unmapped_keycode_to_vk;
-constexpr int64_t kCrossDeskInjectedKeyboardEvent = 0x43524f5353444553;

 static int VkCodeFromUnicode(UniChar ch) {
  if (ch >= 'a' && ch <= 'z') {
@@ -106,7 +106,7 @@ CGEventRef eventCallback(CGEventTapProxy proxy, CGEventType type,
                         CGEventRef event, void* userInfo) {
  (void)proxy;
  if (CGEventGetIntegerValueField(event, kCGEventSourceUserData) ==
-      kCrossDeskInjectedKeyboardEvent) {
+      kCrossDeskInjectedEvent) {
    return event;
  }
  if (!g_on_key_action) {
@@ -309,7 +309,7 @@ int PlatformKeyboardCapturer::SendKeyboardCommand(int key_code, bool is_down,

    CGEventSetFlags(event, ToCGEventFlags(injected_flags));
    CGEventSetIntegerValueField(event, kCGEventSourceUserData,
-                               kCrossDeskInjectedKeyboardEvent);
+                               kCrossDeskInjectedEvent);
    CGEventPost(kCGHIDEventTap, event);
    CFRelease(event);

@@ -323,7 +323,7 @@ int PlatformKeyboardCapturer::SendKeyboardCommand(int key_code, bool is_down,
        return -1;
      }
      CGEventSetIntegerValueField(fn_release_event, kCGEventSourceUserData,
-                                 kCrossDeskInjectedKeyboardEvent);
+                                 kCrossDeskInjectedEvent);
      CGEventPost(kCGHIDEventTap, fn_release_event);
      CFRelease(fn_release_event);
    }
@@ -0,0 +1,17 @@
+/*
+ * @Author: DI JUNKUN
+ * @Date: 2026-09-13
+ * Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
+ */
+
+#ifndef _MAC_INJECTED_EVENT_H_
+#define _MAC_INJECTED_EVENT_H_
+
+#include <cstdint>
+
+namespace crossdesk {
+// Shared by the keyboard/mouse injectors and the privacy input tap.
+inline constexpr int64_t kCrossDeskInjectedEvent = 0x43524f5353444553;
+}
+
+#endif
@@ -1,4 +1,5 @@
 #include "mouse_controller.h"
+#include "../mac_injected_event.h"

 #include <remote_action.h>

@@ -210,6 +211,8 @@ int PlatformMouseController::SendMouseCommand(RemoteAction remote_action,
  }

  if (mouse_event) {
+    CGEventSetIntegerValueField(mouse_event, kCGEventSourceUserData,
+                                kCrossDeskInjectedEvent);
    CGEventPost(kCGHIDEventTap, mouse_event);
    CFRelease(mouse_event);
  }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dijunkun	88da1081ef	[release] prepare v1.5.2 release notes	2026-09-24 11:15:58 +08:00
dijunkun	b9efb5944c	[fix] recover headless capture and use WGC for usbmmidd displays	2026-09-23 14:40:58 +08:00
dijunkun	5f26a0e239	[feat] add force relay connection option to settings	2026-09-22 11:03:51 +08:00
dijunkun	938ce01513	[fix] align password reset input style and limit it to six characters	2026-09-22 10:47:42 +08:00
dijunkun	2235d5cb62	[fix] place the cursor at the end of the password on retry	2026-09-22 10:39:27 +08:00
dijunkun	7e3e050edf	[feat] add random password refresh to the main window	2026-09-22 10:33:28 +08:00
dijunkun	b610a0ec7e	[fix] anchor display menu to the toolbar when network stats are expanded	2026-09-22 10:19:16 +08:00
dijunkun	120368e4f7	[fix] align remote mouse coordinates with the displayed video area	2026-09-22 10:06:41 +08:00
dijunkun	b34755c5ee	[chore] bundle the usbmmidd_v2 virtual display driver with Windows packages	2026-09-21 01:10:31 +08:00
dijunkun	6387f2e555	[feat] add headless compatibility capture and usbmmidd virtual display plugging	2026-09-21 01:10:30 +08:00
dijunkun	fb556a763d	[fix] keep Windows privacy screen across display changes and validate covers	2026-09-21 01:10:30 +08:00
dijunkun	276385b816	[fix] keep Windows display slots and input mapping stable across hotplug	2026-09-21 01:09:12 +08:00
dijunkun	1a59a6ac2e	[refactor] build host information in the wire library	2026-09-21 00:56:16 +08:00
dijunkun	485e347337	[fix] render CPU NV12 native frames rejected by the native renderer	2026-09-21 00:51:50 +08:00
dijunkun	89b39803e8	[fix] reuse stale sessions and stored passwords when reconnecting	2026-09-21 00:51:50 +08:00
dijunkun	4797af9260	[fix] correct Windows remote control session routing and key mapping	2026-09-19 03:59:35 +08:00
dijunkun	000b2e44e3	[fix] restore Windows cursor capture and web input control	2026-09-18 23:26:06 +08:00
dijunkun	26217f9d18	[fix] reset mouse input display when restoring initial capture display	2026-09-18 22:40:51 +08:00
dijunkun	c2ea90c740	[chore] remove unused ImGui code and old release notes	2026-09-18 19:54:47 +08:00
dijunkun	0eadcf2855	[fix] diagnose and serialize Linux image dependency installation	2026-09-17 12:42:44 +08:00
dijunkun	e263aab10d	[fix] keep Windows privacy screen active when running as administrator	2026-09-17 09:55:34 +08:00
dijunkun	9abdfbf684	[release] prepare v1.5.1 release notes	2026-09-17 02:56:49 +08:00
dijunkun	31a0b86cee	[fix] refine network stats layout and alignment	2026-09-17 02:45:35 +08:00
dijunkun	fb34f42744	[fix] show encryption status and simplify network stats labels	2026-09-17 02:01:55 +08:00
dijunkun	4302ab291c	[fix] overlay control bar tooltips on expanded network stats	2026-09-17 01:39:09 +08:00
dijunkun	4bf92c9e2c	[fix] use reliable transport for mouse input and cursor state	2026-09-17 01:31:54 +08:00
dijunkun	28de4cf938	[fix] improve Windows taskbar icon clarity at small sizes	2026-09-16 23:19:12 +08:00
dijunkun	ce7a3c178e	[fix] correct WGC and GDI cursor capture and positioning	2026-09-16 23:03:36 +08:00
dijunkun	d9116200fe	[fix] restore remote cursors on Windows without a physical mouse	2026-09-16 22:20:36 +08:00
dijunkun	1d9242515a	[fix] restore remote cursor visibility during Windows privacy screen	2026-09-16 20:27:59 +08:00
dijunkun	ad62e60b9a	[fix] restore shared capture on Windows secure desktop	2026-09-16 15:31:27 +08:00
dijunkun	c4aca303c8	[fix] restore cursor visibility on Windows lock screen	2026-09-16 14:48:39 +08:00
dijunkun	57bb91dba3	[fix] prevent duplicate cursors during Windows window dragging	2026-09-16 13:51:35 +08:00
dijunkun	57cab3979e	[fix] initialize logging before startup operations and update MiniRTC	2026-09-16 12:54:07 +08:00
dijunkun	d8ccdbaa38	[fix] add capture delivery diagnostics	2026-09-16 12:54:06 +08:00
dijunkun	f3e67d7d6e	[fix] recognize macOS window resize cursors	2026-09-15 16:44:19 +08:00
dijunkun	d648585891	[fix] restore Linux X11 remote keyboard capture	2026-09-15 16:23:42 +08:00
dijunkun	e40c7fca98	[fix] disable privacy screen for legacy and web clients	2026-09-15 13:04:53 +08:00
dijunkun	f6324416ec	[fix] update MiniRTC legacy DTLS-SRTP compatibility	2026-09-15 12:20:00 +08:00
dijunkun	0977bd4195	[fix] update MiniRTC SRTP replay handling and bandwidth accounting	2026-09-15 03:38:29 +08:00
dijunkun	f4e094cb35	[fix] update MiniRTC packet validation and SRTP buffering	2026-09-15 03:16:18 +08:00
dijunkun	1fe706c5fc	[fix] update MiniRTC SRTP initialization	2026-09-15 03:03:47 +08:00
dijunkun	5fd928ddba	[fix] update MiniRTC DTLS-SRTP key layout and profiles	2026-09-15 02:53:25 +08:00
dijunkun	977899b240	[feat] enable iOS punching and preserve connection errors	2026-09-15 02:37:30 +08:00
dijunkun	7fc1344756	[feat] enable enhanced UDP punching on desktop	2026-09-15 02:37:30 +08:00
dijunkun	73e3bf709d	[perf] exclude optional libaom from default builds	2026-09-13 06:43:29 +08:00
dijunkun	6d90c28513	[perf] strip packaged Slint runtime symbols	2026-09-13 06:39:26 +08:00
dijunkun	c944db6519	[perf] scope desktop build variant and version defines	2026-09-13 06:39:23 +08:00
dijunkun	fc921c9ca1	[perf] avoid redundant iOS native archive rebuilds	2026-09-13 06:36:05 +08:00
dijunkun	ba2afc982b	[fix] repair macOS Intel OpenH264 CI build	2026-09-13 06:04:23 +08:00
dijunkun	c6635fbdc8	[feat] add Linux X11 privacy screen and automatic recovery	2026-09-13 03:49:17 +08:00
dijunkun	3c403f6162	[fix] update minirtc for SIMD and frame rate fixes	2026-09-13 02:40:44 +08:00
dijunkun	b54d32ef41	[fix] disable and uncheck hardware codec setting in unsupported builds	2026-09-13 01:40:44 +08:00
dijunkun	28e9626e0d	[fix] preserve Windows privacy startup and server window	2026-09-13 01:23:30 +08:00
kunkundi	a6e325f190	[feat] add macOS privacy screen and keep remote sessions running	2026-09-13 00:38:40 +08:00
dijunkun	23bf2ff8b8	[feat] add compact tooltips for all control bar buttons	2026-09-12 22:39:44 +08:00
dijunkun	56ebfdf8e7	[feat] add dedicated privacy screen controls	2026-09-12 22:24:09 +08:00
kunkundi	99ae0fc811	[fix] avoid false Windows privacy screen obstruction failures	2026-09-11 17:43:04 +08:00
dijunkun	9af7417c46	[feat] add Windows screen capture method setting	2026-09-11 16:41:16 +08:00
dijunkun	ceb0a1654a	[feat] add Windows privacy screen and prefer DXGI capture	2026-09-11 16:11:50 +08:00
dijunkun	4f200095f4	[fix] improve OpenGL video clarity when downscaling	2026-09-09 17:28:48 +08:00
dijunkun	bd0a7aa2f6	[fix] prevent system audio capture hangs across desktop platforms	2026-09-09 11:34:47 +08:00
dijunkun	b87ab025be	[feat] use server-issued ICE configuration across clients	2026-09-08 17:07:16 +08:00