[feat] update update-notification icon

src/common/window_util_mac.h

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

src/common/window_util_mac.mm

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

src/gui/assets/localization/localization.h

@@ -197,6 +197,12 @@ static std::vector<std::string> completed = {
     reinterpret_cast<const char*>(u8"已完成"), "Completed"};
 static std::vector<std::string> failed = {
     reinterpret_cast<const char*>(u8"失败"), "Failed"};
+static std::vector<std::string> controller = {
+    reinterpret_cast<const char*>(u8"控制端:"), "Controller:"};
+static std::vector<std::string> file_transfer = {
+    reinterpret_cast<const char*>(u8"文件传输:"), "File Transfer:"};
+static std::vector<std::string> connection_status = {
+    reinterpret_cast<const char*>(u8"连接状态:"), "Connection Status:"};
 
 #if _WIN32
 static std::vector<std::string> minimize_to_tray = {

src/gui/panels/remote_peer_panel.cpp

@@ -207,6 +207,7 @@ int Render::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->control_data_label_.c_str(), true);
         AddDataStream(props->peer_, props->file_label_.c_str(), true);
         AddDataStream(props->peer_, props->file_feedback_label_.c_str(), true);
         AddDataStream(props->peer_, props->clipboard_label_.c_str(), true);

src/gui/render.cpp

@@ -2,6 +2,12 @@
 
 #include <libyuv.h>
 
+#if defined(__linux__) && !defined(__APPLE__)
+#include <X11/Xatom.h>
+#include <X11/Xlib.h>
+#endif
+
+#include <cstring>
 #include <filesystem>
 #include <fstream>
 #include <iostream>
@@ -21,10 +27,123 @@
 #include "screen_capturer_factory.h"
 #include "version_checker.h"
 
+#if defined(__APPLE__)
+#include "window_util_mac.h"
+#endif
+
 #define NV12_BUFFER_SIZE 1280 * 720 * 3 / 2
 
 namespace crossdesk {
 
+namespace {
+#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
+
 std::vector<char> Render::SerializeRemoteAction(const RemoteAction& action) {
   std::vector<char> buffer;
   buffer.push_back(static_cast<char>(action.type));
@@ -131,6 +250,20 @@ SDL_HitTestResult Render::HitTestCallback(SDL_Window* window,
     return SDL_HITTEST_NORMAL;
   }
 
+  // Server window: OS-level dragging for the title bar, but keep the left-side
+  // collapse/expand button clickable.
+  if (render->server_window_ && window == render->server_window_) {
+    const float title_h = render->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);
 
@@ -696,7 +829,7 @@ int Render::CreateConnectionPeer() {
 
   params_.on_signal_status = OnSignalStatusCb;
   params_.on_connection_status = OnConnectionStatusCb;
-  params_.net_status_report = NetStatusReport;
+  params_.on_net_status_report = OnNetStatusReport;
 
   params_.user_data = this;
 
@@ -716,6 +849,7 @@ int Render::CreateConnectionPeer() {
 
     AddAudioStream(peer_, audio_label_.c_str());
     AddDataStream(peer_, data_label_.c_str(), false);
+    AddDataStream(peer_, control_data_label_.c_str(), true);
     AddDataStream(peer_, file_label_.c_str(), true);
     AddDataStream(peer_, file_feedback_label_.c_str(), true);
     AddDataStream(peer_, clipboard_label_.c_str(), true);
@@ -810,10 +944,16 @@ int Render::CreateMainWindow() {
   if (std::abs(dpi_scale_ - dpi_scale) > 0.01f) {
     dpi_scale_ = dpi_scale;
 
-    main_window_width_ = (int)(main_window_width_ * dpi_scale_);
-    main_window_height_ = (int)(main_window_height_ * dpi_scale_);
-    stream_window_width_ = (int)(stream_window_width_ * dpi_scale_);
-    stream_window_height_ = (int)(stream_window_height_ * 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_);
 
     SDL_SetWindowSize(main_window_, (int)main_window_width_,
                       (int)main_window_height_);
@@ -824,7 +964,7 @@ int Render::CreateMainWindow() {
   // for window region action
   SDL_SetWindowHitTest(main_window_, HitTestCallback, this);
 
-  SetupFontAndStyle(true);
+  SetupFontAndStyle(&main_windows_system_chinese_font_);
 
   ImGuiStyle& style = ImGui::GetStyle();
   style.ScaleAllSizes(dpi_scale_);
@@ -868,6 +1008,9 @@ int Render::CreateStreamWindow() {
     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");
@@ -893,7 +1036,7 @@ int Render::CreateStreamWindow() {
   // for window region action
   SDL_SetWindowHitTest(stream_window_, HitTestCallback, this);
 
-  SetupFontAndStyle(false);
+  SetupFontAndStyle(&stream_windows_system_chinese_font_);
 
   ImGuiStyle& style = ImGui::GetStyle();
   style.ScaleAllSizes(dpi_scale_);
@@ -938,7 +1081,115 @@ int Render::DestroyStreamWindow() {
   return 0;
 }
 
-int Render::SetupFontAndStyle(bool main_window) {
+int Render::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("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 Render::DestroyServerWindow() {
+  if (server_ctx_) {
+    ImGui::SetCurrentContext(server_ctx_);
+  }
+
+  if (server_renderer_) {
+    SDL_DestroyRenderer(server_renderer_);
+  }
+
+  if (server_window_) {
+    SDL_DestroyWindow(server_window_);
+  }
+
+  server_window_created_ = false;
+
+  return 0;
+}
+
+int Render::SetupFontAndStyle(ImFont** system_chinese_font_out) {
   float font_size = 32.0f;
 
   // Setup Dear ImGui style
@@ -960,10 +1211,8 @@ int Render::SetupFontAndStyle(bool main_window) {
   // Load system Chinese font as fallback
   config.MergeMode = false;
   config.FontDataOwnedByAtlas = false;
-  if (main_window) {
-    main_windows_system_chinese_font_ = nullptr;
-  } else {
-    stream_windows_system_chinese_font_ = nullptr;
+  if (system_chinese_font_out) {
+    *system_chinese_font_out = nullptr;
   }
 
 #if defined(_WIN32)
@@ -990,37 +1239,36 @@ int Render::SetupFontAndStyle(bool main_window) {
     std::ifstream font_file(font_paths[i], std::ios::binary);
     if (font_file.good()) {
       font_file.close();
-      if (main_window) {
-        main_windows_system_chinese_font_ =
-            io.Fonts->AddFontFromFileTTF(font_paths[i], font_size, &config,
-                                         io.Fonts->GetGlyphRangesChineseFull());
-        if (main_windows_system_chinese_font_ != nullptr) {
-          LOG_INFO("Loaded system Chinese font: {}", font_paths[i]);
-          break;
-        }
-      } else {
-        stream_windows_system_chinese_font_ =
-            io.Fonts->AddFontFromFileTTF(font_paths[i], font_size, &config,
-                                         io.Fonts->GetGlyphRangesChineseFull());
-        if (stream_windows_system_chinese_font_ != nullptr) {
-          LOG_INFO("Loaded system Chinese font: {}", font_paths[i]);
-          break;
-        }
+      if (!system_chinese_font_out) {
+        break;
+      }
+
+      *system_chinese_font_out =
+          io.Fonts->AddFontFromFileTTF(font_paths[i], font_size, &config,
+                                       io.Fonts->GetGlyphRangesChineseFull());
+      if (*system_chinese_font_out != nullptr) {
+        // Merge FontAwesome icons into the Chinese font
+        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, &config, icon_ranges);
+        config.MergeMode = false;
+        LOG_INFO("Loaded system Chinese font with icons: {}", font_paths[i]);
+        break;
       }
     }
   }
 
   // If no system font found, use default font
-  if (main_window) {
-    if (main_windows_system_chinese_font_ == nullptr) {
-      main_windows_system_chinese_font_ = io.Fonts->AddFontDefault(&config);
-      LOG_WARN("System Chinese font not found, using default font");
-    }
-  } else {
-    if (stream_windows_system_chinese_font_ == nullptr) {
-      stream_windows_system_chinese_font_ = io.Fonts->AddFontDefault(&config);
-      LOG_WARN("System Chinese font not found, using default font");
-    }
+  if (system_chinese_font_out && *system_chinese_font_out == nullptr) {
+    *system_chinese_font_out = io.Fonts->AddFontDefault(&config);
+    // Merge FontAwesome icons into the default font
+    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, &config, icon_ranges);
+    config.MergeMode = false;
+    LOG_WARN("System Chinese font not found, using default font with icons");
   }
 
   ImGui::StyleColorsLight();
@@ -1158,6 +1406,35 @@ int Render::DrawStreamWindow() {
   return 0;
 }
 
+int Render::DrawServerWindow() {
+  if (!server_ctx_) {
+    LOG_ERROR("Server context is null");
+    return -1;
+  }
+
+  if (server_window_) {
+    int w = 0;
+    int h = 0;
+    SDL_GetWindowSize(server_window_, &w, &h);
+    if (w > 0 && h > 0) {
+      server_window_width_ = (float)w;
+      server_window_height_ = (float)h;
+    }
+  }
+
+  ImGui::SetCurrentContext(server_ctx_);
+  ImGui_ImplSDLRenderer3_NewFrame();
+  ImGui_ImplSDL3_NewFrame();
+  ImGui::NewFrame();
+  ServerWindow();
+  ImGui::Render();
+  SDL_SetRenderDrawColor(server_renderer_, 255, 255, 255, 255);
+  SDL_RenderClear(server_renderer_);
+  ImGui_ImplSDLRenderer3_RenderDrawData(ImGui::GetDrawData(), server_renderer_);
+  SDL_RenderPresent(server_renderer_);
+  return 0;
+}
+
 int Render::Run() {
   latest_version_info_ = CheckUpdate();
   if (!latest_version_info_.empty() &&
@@ -1332,56 +1609,18 @@ void Render::MainLoop() {
     UpdateLabels();
     HandleRecentConnections();
     HandleStreamWindow();
+    HandleServerWindow();
 
     DrawMainWindow();
     if (stream_window_inited_) {
       DrawStreamWindow();
     }
 
-    UpdateInteractions();
-
-    if (need_to_send_host_info_) {
-      RemoteAction remote_action;
-      remote_action.i.display_num = display_info_list_.size();
-      remote_action.i.display_list =
-          (char**)malloc(remote_action.i.display_num * sizeof(char*));
-      remote_action.i.left =
-          (int*)malloc(remote_action.i.display_num * sizeof(int));
-      remote_action.i.top =
-          (int*)malloc(remote_action.i.display_num * sizeof(int));
-      remote_action.i.right =
-          (int*)malloc(remote_action.i.display_num * sizeof(int));
-      remote_action.i.bottom =
-          (int*)malloc(remote_action.i.display_num * sizeof(int));
-      for (int i = 0; i < remote_action.i.display_num; i++) {
-        LOG_INFO("Local display [{}:{}]", i + 1, display_info_list_[i].name);
-        remote_action.i.display_list[i] =
-            (char*)malloc(display_info_list_[i].name.length() + 1);
-        strncpy(remote_action.i.display_list[i],
-                display_info_list_[i].name.c_str(),
-                display_info_list_[i].name.length());
-        remote_action.i.display_list[i][display_info_list_[i].name.length()] =
-            '\0';
-        remote_action.i.left[i] = display_info_list_[i].left;
-        remote_action.i.top[i] = display_info_list_[i].top;
-        remote_action.i.right[i] = display_info_list_[i].right;
-        remote_action.i.bottom[i] = display_info_list_[i].bottom;
-      }
-
-      std::string host_name = GetHostName();
-      remote_action.type = ControlType::host_infomation;
-      memcpy(&remote_action.i.host_name, host_name.data(), host_name.size());
-      remote_action.i.host_name[host_name.size()] = '\0';
-      remote_action.i.host_name_size = host_name.size();
-
-      std::string msg = remote_action.to_json();
-      int ret =
-          SendDataFrame(peer_, msg.data(), msg.size(), data_label_.c_str());
-      FreeRemoteAction(remote_action);
-      if (0 == ret) {
-        need_to_send_host_info_ = false;
-      }
+    if (is_server_mode_) {
+      DrawServerWindow();
     }
+
+    UpdateInteractions();
   }
 }
 
@@ -1429,6 +1668,18 @@ void Render::HandleStreamWindow() {
   }
 }
 
+void Render::HandleServerWindow() {
+  if (need_to_create_server_window_) {
+    CreateServerWindow();
+    need_to_create_server_window_ = false;
+  }
+
+  if (need_to_destroy_server_window_) {
+    DestroyServerWindow();
+    need_to_destroy_server_window_ = false;
+  }
+}
+
 void Render::Cleanup() {
   Clipboard::StopMonitoring();
 
@@ -1579,16 +1830,35 @@ void Render::CleanSubStreamWindowProperties(
   }
 }
 
+std::shared_ptr<Render::SubStreamWindowProperties>
+Render::GetSubStreamWindowPropertiesByRemoteId(const std::string& remote_id) {
+  if (remote_id.empty()) {
+    return nullptr;
+  }
+
+  std::shared_lock lock(client_properties_mutex_);
+  auto it = client_properties_.find(remote_id);
+  if (it == client_properties_.end()) {
+    return nullptr;
+  }
+  return it->second;
+}
+
 void Render::StartFileTransfer(std::shared_ptr<SubStreamWindowProperties> props,
                                const std::filesystem::path& file_path,
-                               const std::string& file_label) {
-  if (!props || !props->peer_) {
-    LOG_ERROR("StartFileTransfer: invalid props or peer");
+                               const std::string& file_label,
+                               const std::string& remote_id) {
+  const bool is_global = (props == nullptr);
+  PeerPtr* peer = is_global ? peer_ : props->peer_;
+  if (!peer) {
+    LOG_ERROR("StartFileTransfer: invalid peer");
     return;
   }
 
   bool expected = false;
-  if (!props->file_sending_.compare_exchange_strong(expected, true)) {
+  if (!(is_global ? file_transfer_.file_sending_
+                  : props->file_transfer_.file_sending_)
+           .compare_exchange_strong(expected, true)) {
     // Already sending, this should not happen if called correctly
     LOG_WARN(
         "StartFileTransfer called but file_sending_ is already true, "
@@ -1597,13 +1867,19 @@ void Render::StartFileTransfer(std::shared_ptr<SubStreamWindowProperties> props,
     return;
   }
 
-  auto peer = props->peer_;
   auto props_weak = std::weak_ptr<SubStreamWindowProperties>(props);
   Render* render_ptr = this;
 
-  std::thread([peer, file_path, file_label, props_weak, render_ptr]() {
+  std::thread([peer, file_path, file_label, props_weak, render_ptr, remote_id,
+               is_global]() {
     auto props_locked = props_weak.lock();
-    if (!props_locked) {
+
+    FileTransferState* state = nullptr;
+    if (props_locked) {
+      state = &props_locked->file_transfer_;
+    } else if (is_global) {
+      state = &render_ptr->file_transfer_;
+    } else {
       return;
     }
 
@@ -1611,49 +1887,50 @@ void Render::StartFileTransfer(std::shared_ptr<SubStreamWindowProperties> props,
     uint64_t total_size = std::filesystem::file_size(file_path, ec);
     if (ec) {
       LOG_ERROR("Failed to get file size: {}", ec.message().c_str());
-      props_locked->file_sending_ = false;
+      state->file_sending_ = false;
       return;
     }
 
-    props_locked->file_sent_bytes_ = 0;
-    props_locked->file_total_bytes_ = total_size;
-    props_locked->file_send_rate_bps_ = 0;
-    props_locked->file_transfer_window_visible_ = true;
+    state->file_sent_bytes_ = 0;
+    state->file_total_bytes_ = total_size;
+    state->file_send_rate_bps_ = 0;
+    state->file_transfer_window_visible_ = true;
     {
-      std::lock_guard<std::mutex> lock(props_locked->file_transfer_mutex_);
-      props_locked->file_send_start_time_ = std::chrono::steady_clock::now();
-      props_locked->file_send_last_update_time_ =
-          props_locked->file_send_start_time_;
-      props_locked->file_send_last_bytes_ = 0;
+      std::lock_guard<std::mutex> lock(state->file_transfer_mutex_);
+      state->file_send_start_time_ = std::chrono::steady_clock::now();
+      state->file_send_last_update_time_ = state->file_send_start_time_;
+      state->file_send_last_bytes_ = 0;
     }
 
     LOG_INFO(
         "File transfer started: {} ({} bytes), file_sending_={}, "
         "total_bytes_={}",
-        file_path.filename().string(), total_size,
-        props_locked->file_sending_.load(),
-        props_locked->file_total_bytes_.load());
+        file_path.filename().string(), total_size, state->file_sending_.load(),
+        state->file_total_bytes_.load());
 
     FileSender sender;
     uint32_t file_id = FileSender::NextFileId();
 
-    {
+    if (props_locked) {
       std::lock_guard<std::shared_mutex> lock(
           render_ptr->file_id_to_props_mutex_);
       render_ptr->file_id_to_props_[file_id] = props_weak;
+    } else {
+      std::lock_guard<std::shared_mutex> lock(
+          render_ptr->file_id_to_transfer_state_mutex_);
+      render_ptr->file_id_to_transfer_state_[file_id] = state;
     }
 
-    props_locked->current_file_id_ = file_id;
+    state->current_file_id_ = file_id;
 
     // Update file transfer list: mark as sending
     // Find the queued file that matches the exact file path
     {
-      std::lock_guard<std::mutex> lock(props_locked->file_transfer_list_mutex_);
-      for (auto& info : props_locked->file_transfer_list_) {
+      std::lock_guard<std::mutex> lock(state->file_transfer_list_mutex_);
+      for (auto& info : state->file_transfer_list_) {
         if (info.file_path == file_path &&
-            info.status ==
-                SubStreamWindowProperties::FileTransferStatus::Queued) {
-          info.status = SubStreamWindowProperties::FileTransferStatus::Sending;
+            info.status == FileTransferState::FileTransferStatus::Queued) {
+          info.status = FileTransferState::FileTransferStatus::Sending;
           info.file_id = file_id;
           info.file_size = total_size;
           info.sent_bytes = 0;
@@ -1662,81 +1939,88 @@ void Render::StartFileTransfer(std::shared_ptr<SubStreamWindowProperties> props,
       }
     }
 
-    props_locked->file_transfer_window_visible_ = true;
+    state->file_transfer_window_visible_ = true;
 
     // Progress will be updated via ACK from receiver
     int ret = sender.SendFile(
         file_path, file_path.filename().string(),
-        [peer, file_label](const char* buf, size_t sz) -> int {
-          return SendReliableDataFrame(peer, buf, sz, file_label.c_str());
+        [peer, file_label, remote_id](const char* buf, size_t sz) -> int {
+          if (remote_id.empty()) {
+            return SendReliableDataFrame(peer, buf, sz, file_label.c_str());
+          } else {
+            return SendReliableDataFrameToPeer(
+                peer, buf, sz, file_label.c_str(), remote_id.c_str(),
+                remote_id.size());
+          }
         },
         64 * 1024, file_id);
 
     // file_sending_ should remain true until we receive the final ACK from
     // receiver
-    auto props_locked_final = props_weak.lock();
-    if (props_locked_final) {
-      // On error, set file_sending_ to false immediately to allow next file
-      if (ret != 0) {
-        props_locked_final->file_sending_ = false;
-        props_locked_final->file_transfer_window_visible_ = false;
-        props_locked_final->file_sent_bytes_ = 0;
-        props_locked_final->file_total_bytes_ = 0;
-        props_locked_final->file_send_rate_bps_ = 0;
-        props_locked_final->current_file_id_ = 0;
+    // On error, set file_sending_ to false immediately to allow next file
+    if (ret != 0) {
+      state->file_sending_ = false;
+      state->file_transfer_window_visible_ = false;
+      state->file_sent_bytes_ = 0;
+      state->file_total_bytes_ = 0;
+      state->file_send_rate_bps_ = 0;
+      state->current_file_id_ = 0;
 
-        // Unregister file_id mapping on error
-        {
-          std::lock_guard<std::shared_mutex> lock(
-              render_ptr->file_id_to_props_mutex_);
-          render_ptr->file_id_to_props_.erase(file_id);
-        }
+      // Unregister file_id mapping on error
+      if (props_locked) {
+        std::lock_guard<std::shared_mutex> lock(
+            render_ptr->file_id_to_props_mutex_);
+        render_ptr->file_id_to_props_.erase(file_id);
+      } else {
+        std::lock_guard<std::shared_mutex> lock(
+            render_ptr->file_id_to_transfer_state_mutex_);
+        render_ptr->file_id_to_transfer_state_.erase(file_id);
+      }
 
-        // Update file transfer list: mark as failed
-        {
-          std::lock_guard<std::mutex> lock(
-              props_locked_final->file_transfer_list_mutex_);
-          for (auto& info : props_locked_final->file_transfer_list_) {
-            if (info.file_id == file_id) {
-              info.status =
-                  SubStreamWindowProperties::FileTransferStatus::Failed;
-              break;
-            }
+      // Update file transfer list: mark as failed
+      {
+        std::lock_guard<std::mutex> lock(state->file_transfer_list_mutex_);
+        for (auto& info : state->file_transfer_list_) {
+          if (info.file_id == file_id) {
+            info.status = FileTransferState::FileTransferStatus::Failed;
+            break;
           }
         }
-
-        LOG_ERROR("FileSender::SendFile failed for [{}], ret={}",
-                  file_path.string().c_str(), ret);
-
-        render_ptr->ProcessFileQueue(props_locked_final);
       }
+
+      LOG_ERROR("FileSender::SendFile failed for [{}], ret={}",
+                file_path.string().c_str(), ret);
+
+      render_ptr->ProcessFileQueue(props_locked);
     }
   }).detach();
 }
 
 void Render::ProcessFileQueue(
     std::shared_ptr<SubStreamWindowProperties> props) {
-  if (!props) {
+  FileTransferState* state = props ? &props->file_transfer_ : &file_transfer_;
+  if (!state) {
     return;
   }
 
-  if (props->file_sending_.load()) {
+  if (state->file_sending_.load()) {
     return;
   }
 
-  SubStreamWindowProperties::QueuedFile queued_file;
+  FileTransferState::QueuedFile queued_file;
   {
-    std::lock_guard<std::mutex> lock(props->file_queue_mutex_);
-    if (props->file_send_queue_.empty()) {
+    std::lock_guard<std::mutex> lock(state->file_queue_mutex_);
+    if (state->file_send_queue_.empty()) {
       return;
     }
-    queued_file = props->file_send_queue_.front();
-    props->file_send_queue_.pop();
+    queued_file = state->file_send_queue_.front();
+    state->file_send_queue_.pop();
   }
 
   LOG_INFO("Processing next file in queue: {}",
            queued_file.file_path.string().c_str());
-  StartFileTransfer(props, queued_file.file_path, queued_file.file_label);
+  StartFileTransfer(props, queued_file.file_path, queued_file.file_label,
+                    queued_file.remote_id);
 }
 
 void Render::UpdateRenderRect() {
@@ -1807,6 +2091,16 @@ void Render::ProcessSdlEvent(const SDL_Event& event) {
     }
   }
 
+  if (server_window_inited_) {
+    if (server_ctx_) {
+      ImGui::SetCurrentContext(server_ctx_);
+      ImGui_ImplSDL3_ProcessEvent(&event);
+    } else {
+      LOG_ERROR("Server context is null");
+      return;
+    }
+  }
+
   switch (event.type) {
     case SDL_EVENT_QUIT:
       if (stream_window_inited_) {
@@ -1896,6 +2190,9 @@ void Render::ProcessSdlEvent(const SDL_Event& event) {
         foucs_on_main_window_ = false;
       }
       break;
+    case SDL_EVENT_DROP_FILE:
+      ProcessFileDropEvent(event);
+      break;
 
     case SDL_EVENT_MOUSE_MOTION:
     case SDL_EVENT_MOUSE_BUTTON_DOWN:
@@ -1976,4 +2273,112 @@ void Render::ProcessSdlEvent(const SDL_Event& event) {
       break;
   }
 }
+
+void Render::ProcessFileDropEvent(const SDL_Event& event) {
+  if (!((stream_window_ &&
+         SDL_GetWindowID(stream_window_) == event.window.windowID) ||
+        (server_window_ &&
+         SDL_GetWindowID(server_window_) == event.window.windowID))) {
+    return;
+  }
+
+  if (event.type != SDL_EVENT_DROP_FILE) {
+    return;
+  }
+
+  if (SDL_GetWindowID(stream_window_) == event.window.windowID) {
+    if (!stream_window_inited_) {
+      return;
+    }
+
+    std::shared_lock lock(client_properties_mutex_);
+    for (auto& [_, props] : client_properties_) {
+      if (props->tab_selected_) {
+        if (event.drop.data == nullptr) {
+          LOG_ERROR("ProcessFileDropEvent: drop event data is null");
+          break;
+        }
+
+        if (!props || !props->peer_) {
+          LOG_ERROR("ProcessFileDropEvent: invalid props or peer");
+          break;
+        }
+
+        std::string utf8_path = static_cast<const char*>(event.drop.data);
+        std::filesystem::path file_path = std::filesystem::u8path(utf8_path);
+
+        // Check if file exists
+        std::error_code ec;
+        if (!std::filesystem::exists(file_path, ec)) {
+          LOG_ERROR("ProcessFileDropEvent: file does not exist: {}",
+                    file_path.string().c_str());
+          break;
+        }
+
+        // Check if it's a regular file
+        if (!std::filesystem::is_regular_file(file_path, ec)) {
+          LOG_ERROR("ProcessFileDropEvent: path is not a regular file: {}",
+                    file_path.string().c_str());
+          break;
+        }
+
+        // Get file size
+        uint64_t file_size = std::filesystem::file_size(file_path, ec);
+        if (ec) {
+          LOG_ERROR("ProcessFileDropEvent: failed to get file size: {}",
+                    ec.message().c_str());
+          break;
+        }
+
+        LOG_INFO("Drop file [{}] to send (size: {} bytes)", event.drop.data,
+                 file_size);
+
+        // Use ProcessSelectedFile to handle the file processing
+        ProcessSelectedFile(utf8_path, props, props->file_label_);
+
+        break;
+      }
+    }
+  } else if (SDL_GetWindowID(server_window_) == event.window.windowID) {
+    if (!server_window_inited_) {
+      return;
+    }
+
+    if (event.drop.data == nullptr) {
+      LOG_ERROR("ProcessFileDropEvent: drop event data is null");
+      return;
+    }
+
+    std::string utf8_path = static_cast<const char*>(event.drop.data);
+    std::filesystem::path file_path = std::filesystem::u8path(utf8_path);
+
+    // Check if file exists
+    std::error_code ec;
+    if (!std::filesystem::exists(file_path, ec)) {
+      LOG_ERROR("ProcessFileDropEvent: file does not exist: {}",
+                file_path.string().c_str());
+      return;
+    }
+
+    // Check if it's a regular file
+    if (!std::filesystem::is_regular_file(file_path, ec)) {
+      LOG_ERROR("ProcessFileDropEvent: path is not a regular file: {}",
+                file_path.string().c_str());
+      return;
+    }
+
+    // Get file size
+    uint64_t file_size = std::filesystem::file_size(file_path, ec);
+    if (ec) {
+      LOG_ERROR("ProcessFileDropEvent: failed to get file size: {}",
+                ec.message().c_str());
+      return;
+    }
+
+    LOG_INFO("Drop file [{}] on server window (size: {} bytes)",
+             event.drop.data, file_size);
+
+    // Handle the dropped file on server window as needed
+  }
+}
 }  // namespace crossdesk

src/gui/render.h

@@ -42,12 +42,48 @@
 namespace crossdesk {
 class Render {
  public:
+  struct FileTransferState {
+    std::atomic<bool> file_sending_ = false;
+    std::atomic<uint64_t> file_sent_bytes_ = 0;
+    std::atomic<uint64_t> file_total_bytes_ = 0;
+    std::atomic<uint32_t> file_send_rate_bps_ = 0;
+    std::mutex file_transfer_mutex_;
+    std::chrono::steady_clock::time_point file_send_start_time_;
+    std::chrono::steady_clock::time_point file_send_last_update_time_;
+    uint64_t file_send_last_bytes_ = 0;
+    bool file_transfer_window_visible_ = false;
+    std::atomic<uint32_t> current_file_id_{0};
+
+    struct QueuedFile {
+      std::filesystem::path file_path;
+      std::string file_label;
+      std::string remote_id;
+    };
+    std::queue<QueuedFile> file_send_queue_;
+    std::mutex file_queue_mutex_;
+
+    enum class FileTransferStatus { Queued, Sending, Completed, Failed };
+
+    struct FileTransferInfo {
+      std::string file_name;
+      std::filesystem::path file_path;
+      uint64_t file_size = 0;
+      FileTransferStatus status = FileTransferStatus::Queued;
+      uint64_t sent_bytes = 0;
+      uint32_t file_id = 0;
+      uint32_t rate_bps = 0;
+    };
+    std::vector<FileTransferInfo> file_transfer_list_;
+    std::mutex file_transfer_list_mutex_;
+  };
+
   struct SubStreamWindowProperties {
     Params params_;
     PeerPtr* peer_ = nullptr;
     std::string audio_label_ = "control_audio";
-    std::string data_label_ = "control_data";
+    std::string data_label_ = "data";
     std::string file_label_ = "file";
+    std::string control_data_label_ = "control_data";
     std::string file_feedback_label_ = "file_feedback";
     std::string clipboard_label_ = "clipboard";
     std::string local_id_ = "";
@@ -128,38 +164,10 @@ class Render {
     std::chrono::steady_clock::time_point last_time_;
     XNetTrafficStats net_traffic_stats_;
 
-    // File transfer progress
-    std::atomic<bool> file_sending_ = false;
-    std::atomic<uint64_t> file_sent_bytes_ = 0;
-    std::atomic<uint64_t> file_total_bytes_ = 0;
-    std::atomic<uint32_t> file_send_rate_bps_ = 0;
-    std::mutex file_transfer_mutex_;
-    std::chrono::steady_clock::time_point file_send_start_time_;
-    std::chrono::steady_clock::time_point file_send_last_update_time_;
-    uint64_t file_send_last_bytes_ = 0;
-    bool file_transfer_window_visible_ = false;
-    std::atomic<uint32_t> current_file_id_{0};
-
-    struct QueuedFile {
-      std::filesystem::path file_path;
-      std::string file_label;
-    };
-    std::queue<QueuedFile> file_send_queue_;
-    std::mutex file_queue_mutex_;
-
-    enum class FileTransferStatus { Queued, Sending, Completed, Failed };
-
-    struct FileTransferInfo {
-      std::string file_name;
-      std::filesystem::path file_path;
-      uint64_t file_size = 0;
-      FileTransferStatus status = FileTransferStatus::Queued;
-      uint64_t sent_bytes = 0;
-      uint32_t file_id = 0;
-      uint32_t rate_bps = 0;
-    };
-    std::vector<FileTransferInfo> file_transfer_list_;
-    std::mutex file_transfer_list_mutex_;
+    using QueuedFile = FileTransferState::QueuedFile;
+    using FileTransferStatus = FileTransferState::FileTransferStatus;
+    using FileTransferInfo = FileTransferState::FileTransferInfo;
+    FileTransferState file_transfer_;
   };
 
  public:
@@ -180,6 +188,7 @@ class Render {
   void UpdateInteractions();
   void HandleRecentConnections();
   void HandleStreamWindow();
+  void HandleServerWindow();
   void Cleanup();
   void CleanupFactories();
   void CleanupPeer(std::shared_ptr<SubStreamWindowProperties> props);
@@ -189,12 +198,24 @@ class Render {
   void UpdateRenderRect();
   void ProcessSdlEvent(const SDL_Event& event);
 
+  void ProcessFileDropEvent(const SDL_Event& event);
+
+  void ProcessSelectedFile(
+      const std::string& path,
+      const std::shared_ptr<SubStreamWindowProperties>& props,
+      const std::string& file_label, const std::string& remote_id = "");
+
+  std::shared_ptr<SubStreamWindowProperties>
+  GetSubStreamWindowPropertiesByRemoteId(const std::string& remote_id);
+
  private:
   int CreateStreamRenderWindow();
   int TitleBar(bool main_window);
   int MainWindow();
   int UpdateNotificationWindow();
   int StreamWindow();
+  int ServerWindow();
+  int RemoteClientInfoWindow();
   int LocalWindow();
   int RemoteWindow();
   int RecentConnectionsWindow();
@@ -211,6 +232,7 @@ class Render {
   void Hyperlink(const std::string& label, const std::string& url,
                  const float window_width);
   int FileTransferWindow(std::shared_ptr<SubStreamWindowProperties>& props);
+  std::string OpenFileDialog(std::string title);
 
  private:
   int ConnectTo(const std::string& remote_id, const char* password,
@@ -219,11 +241,15 @@ class Render {
   int DestroyMainWindow();
   int CreateStreamWindow();
   int DestroyStreamWindow();
-  int SetupFontAndStyle(bool main_window);
+  int CreateServerWindow();
+  int DestroyServerWindow();
+  int SetupFontAndStyle(ImFont** system_chinese_font_out);
   int DestroyMainWindowContext();
   int DestroyStreamWindowContext();
+  int DestroyServerWindowContext();
   int DrawMainWindow();
   int DrawStreamWindow();
+  int DrawServerWindow();
   int ConfirmDeleteConnection();
   int NetTrafficStats(std::shared_ptr<SubStreamWindowProperties>& props);
   void DrawConnectionStatusText(
@@ -259,11 +285,11 @@ class Render {
   static void OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
                                    size_t user_id_size, void* user_data);
 
-  static void NetStatusReport(const char* client_id, size_t client_id_size,
-                              TraversalMode mode,
-                              const XNetTrafficStats* net_traffic_stats,
-                              const char* user_id, const size_t user_id_size,
-                              void* user_data);
+  static void OnNetStatusReport(const char* client_id, size_t client_id_size,
+                                TraversalMode mode,
+                                const XNetTrafficStats* net_traffic_stats,
+                                const char* user_id, const size_t user_id_size,
+                                void* user_data);
 
   static SDL_HitTestResult HitTestCallback(SDL_Window* window,
                                            const SDL_Point* area, void* data);
@@ -304,7 +330,8 @@ class Render {
   // File transfer helper functions
   void StartFileTransfer(std::shared_ptr<SubStreamWindowProperties> props,
                          const std::filesystem::path& file_path,
-                         const std::string& file_label);
+                         const std::string& file_label,
+                         const std::string& remote_id = "");
   void ProcessFileQueue(std::shared_ptr<SubStreamWindowProperties> props);
 
   int AudioDeviceInit();
@@ -382,6 +409,7 @@ class Render {
   ImGuiContext* main_ctx_ = nullptr;
   ImFont* main_windows_system_chinese_font_ = nullptr;
   ImFont* stream_windows_system_chinese_font_ = nullptr;
+  ImFont* server_windows_system_chinese_font_ = nullptr;
   bool exit_ = false;
   const int sdl_refresh_ms_ = 16;  // ~60 FPS
 #if _WIN32
@@ -404,6 +432,9 @@ class Render {
   bool keyboard_capturer_is_started_ = false;
   bool foucs_on_main_window_ = false;
   bool foucs_on_stream_window_ = false;
+  bool main_window_minimized_ = false;
+  uint32_t last_main_minimize_request_tick_ = 0;
+  uint32_t last_stream_minimize_request_tick_ = 0;
   bool audio_capture_ = false;
   int main_window_width_real_ = 720;
   int main_window_height_real_ = 540;
@@ -453,7 +484,7 @@ class Render {
   bool just_created_ = false;
   std::string controlled_remote_id_ = "";
   std::string focused_remote_id_ = "";
-  bool need_to_send_host_info_ = false;
+  std::string remote_client_id_ = "";
   SDL_Event last_mouse_event;
   SDL_AudioStream* output_stream_;
   uint32_t STREAM_REFRESH_EVENT = 0;
@@ -480,6 +511,42 @@ class Render {
   float stream_window_dpi_scaling_w_ = 1.0f;
   float stream_window_dpi_scaling_h_ = 1.0f;
 
+  // server window render
+  SDL_Window* server_window_ = nullptr;
+  SDL_Renderer* server_renderer_ = nullptr;
+  ImGuiContext* server_ctx_ = nullptr;
+
+  // server window properties
+  bool need_to_create_server_window_ = false;
+  bool need_to_destroy_server_window_ = false;
+  bool server_window_created_ = false;
+  bool server_window_inited_ = false;
+  int server_window_width_default_ = 250;
+  int server_window_height_default_ = 150;
+  float server_window_width_ = 250;
+  float server_window_height_ = 150;
+  float server_window_title_bar_height_ = 30.0f;
+  SDL_PixelFormat server_pixformat_ = SDL_PIXELFORMAT_NV12;
+  int server_window_normal_width_ = 250;
+  int server_window_normal_height_ = 150;
+  float server_window_dpi_scaling_w_ = 1.0f;
+  float server_window_dpi_scaling_h_ = 1.0f;
+
+  // server window collapsed mode
+  bool server_window_collapsed_ = false;
+  bool server_window_collapsed_dragging_ = false;
+  float server_window_collapsed_drag_start_mouse_x_ = 0.0f;
+  float server_window_collapsed_drag_start_mouse_y_ = 0.0f;
+  int server_window_collapsed_drag_start_win_x_ = 0;
+  int server_window_collapsed_drag_start_win_y_ = 0;
+
+  // server window drag normal mode
+  bool server_window_dragging_ = false;
+  float server_window_drag_start_mouse_x_ = 0.0f;
+  float server_window_drag_start_mouse_y_ = 0.0f;
+  int server_window_drag_start_win_x_ = 0;
+  int server_window_drag_start_win_y_ = 0;
+
   bool label_inited_ = false;
   bool connect_button_pressed_ = false;
   bool password_validating_ = false;
@@ -496,6 +563,7 @@ class Render {
   bool fullscreen_button_pressed_ = false;
   bool focus_on_input_widget_ = true;
   bool is_client_mode_ = false;
+  bool is_server_mode_ = false;
   bool reload_recent_connections_ = true;
   bool show_confirm_delete_connection_ = false;
   bool delete_connection_ = false;
@@ -522,6 +590,10 @@ class Render {
   std::unordered_map<uint32_t, std::weak_ptr<SubStreamWindowProperties>>
       file_id_to_props_;
   std::shared_mutex file_id_to_props_mutex_;
+
+  // Map file_id to FileTransferState for global file transfer (props == null)
+  std::unordered_map<uint32_t, FileTransferState*> file_id_to_transfer_state_;
+  std::shared_mutex file_id_to_transfer_state_mutex_;
   SDL_AudioDeviceID input_dev_;
   SDL_AudioDeviceID output_dev_;
   ScreenCapturerFactory* screen_capturer_factory_ = nullptr;
@@ -535,8 +607,8 @@ class Render {
   uint64_t last_frame_time_;
   bool show_new_version_icon_ = false;
   bool show_new_version_icon_in_menu_ = true;
-  uint64_t new_version_icon_last_trigger_time_ = 0;
-  uint64_t new_version_icon_render_start_time_ = 0;
+  double new_version_icon_last_trigger_time_ = 0.0;
+  double new_version_icon_render_start_time_ = 0.0;
 #ifdef __APPLE__
   bool show_request_permission_window_ = true;
 #endif
@@ -596,6 +668,10 @@ class Render {
 
   /* ------ server mode ------ */
   std::unordered_map<std::string, ConnectionStatus> connection_status_;
+  std::unordered_map<std::string, std::string> connection_host_names_;
+  std::string selected_server_remote_id_ = "";
+  std::string selected_server_remote_hostname_ = "";
+  FileTransferState file_transfer_;
 };
 }  // namespace crossdesk
 #endif

src/gui/render_callback.cpp

@@ -4,6 +4,7 @@
 #include <cstring>
 #include <filesystem>
 #include <fstream>
+#include <limits>
 #include <unordered_map>
 
 #include "clipboard.h"
@@ -320,7 +321,20 @@ void Render::OnReceiveDataBufferCb(const char* data, size_t size,
     std::string remote_user_id = std::string(user_id, user_id_size);
 
     static FileReceiver receiver;
-    receiver.SetOnSendAck([render](const FileTransferAck& ack) -> int {
+    receiver.SetOnSendAck([render,
+                           remote_user_id](const FileTransferAck& ack) -> int {
+      bool is_server_sending = remote_user_id.rfind("C-", 0) != 0;
+      if (is_server_sending) {
+        auto props =
+            render->GetSubStreamWindowPropertiesByRemoteId(remote_user_id);
+        if (props) {
+          PeerPtr* peer = props->peer_;
+          return SendReliableDataFrame(
+              peer, reinterpret_cast<const char*>(&ack),
+              sizeof(FileTransferAck), render->file_feedback_label_.c_str());
+        }
+      }
+
       return SendReliableDataFrame(
           render->peer_, reinterpret_cast<const char*>(&ack),
           sizeof(FileTransferAck), render->file_feedback_label_.c_str());
@@ -361,42 +375,100 @@ void Render::OnReceiveDataBufferCb(const char* data, size_t size,
       }
     }
 
+    Render::FileTransferState* state = nullptr;
     if (!props) {
-      LOG_WARN("FileTransferAck: no props found for file_id={}", ack.file_id);
-      return;
+      {
+        std::shared_lock lock(render->file_id_to_transfer_state_mutex_);
+        auto it = render->file_id_to_transfer_state_.find(ack.file_id);
+        if (it != render->file_id_to_transfer_state_.end()) {
+          state = it->second;
+        }
+      }
+
+      if (!state) {
+        LOG_WARN("FileTransferAck: no props/state found for file_id={}",
+                 ack.file_id);
+        return;
+      }
+    } else {
+      state = &props->file_transfer_;
     }
 
     // Update progress based on ACK
-    props->file_sent_bytes_ = ack.acked_offset;
-    props->file_total_bytes_ = ack.total_size;
+    state->file_sent_bytes_ = ack.acked_offset;
+    state->file_total_bytes_ = ack.total_size;
 
     uint32_t rate_bps = 0;
     {
-      uint32_t data_channel_bitrate =
-          props->net_traffic_stats_.data_outbound_stats.bitrate;
+      if (props) {
+        uint32_t data_channel_bitrate =
+            props->net_traffic_stats_.data_outbound_stats.bitrate;
 
-      if (data_channel_bitrate > 0 && props->file_sending_.load()) {
-        rate_bps = static_cast<uint32_t>(data_channel_bitrate * 0.99f);
+        if (data_channel_bitrate > 0 && state->file_sending_.load()) {
+          rate_bps = static_cast<uint32_t>(data_channel_bitrate * 0.99f);
 
-        uint32_t current_rate = props->file_send_rate_bps_.load();
-        if (current_rate > 0) {
-          // 70% old + 30% new for smoother display
-          rate_bps = static_cast<uint32_t>(current_rate * 0.7 + rate_bps * 0.3);
+          uint32_t current_rate = state->file_send_rate_bps_.load();
+          if (current_rate > 0) {
+            // 70% old + 30% new for smoother display
+            rate_bps =
+                static_cast<uint32_t>(current_rate * 0.7 + rate_bps * 0.3);
+          }
+        } else {
+          rate_bps = state->file_send_rate_bps_.load();
         }
       } else {
-        rate_bps = props->file_send_rate_bps_.load();
+        // Global transfer: no per-connection bitrate available.
+        // Estimate send rate from ACKed bytes delta over time.
+        const uint32_t current_rate = state->file_send_rate_bps_.load();
+        uint32_t estimated_rate_bps = 0;
+        const auto now = std::chrono::steady_clock::now();
+
+        uint64_t last_bytes = 0;
+        std::chrono::steady_clock::time_point last_time;
+        {
+          std::lock_guard<std::mutex> lock(state->file_transfer_mutex_);
+          last_bytes = state->file_send_last_bytes_;
+          last_time = state->file_send_last_update_time_;
+        }
+
+        if (state->file_sending_.load() && ack.acked_offset >= last_bytes) {
+          const uint64_t delta_bytes = ack.acked_offset - last_bytes;
+          const double delta_seconds =
+              std::chrono::duration<double>(now - last_time).count();
+
+          if (delta_seconds > 0.0 && delta_bytes > 0) {
+            const double bps =
+                (static_cast<double>(delta_bytes) * 8.0) / delta_seconds;
+            if (bps > 0.0) {
+              const double capped =
+                  (std::min)(bps, static_cast<double>(
+                                      (std::numeric_limits<uint32_t>::max)()));
+              estimated_rate_bps = static_cast<uint32_t>(capped);
+            }
+          }
+        }
+
+        if (estimated_rate_bps > 0 && current_rate > 0) {
+          // 70% old + 30% new for smoother display
+          rate_bps = static_cast<uint32_t>(current_rate * 0.7 +
+                                           estimated_rate_bps * 0.3);
+        } else if (estimated_rate_bps > 0) {
+          rate_bps = estimated_rate_bps;
+        } else {
+          rate_bps = current_rate;
+        }
       }
 
-      props->file_send_rate_bps_ = rate_bps;
-      props->file_send_last_bytes_ = ack.acked_offset;
+      state->file_send_rate_bps_ = rate_bps;
+      state->file_send_last_bytes_ = ack.acked_offset;
       auto now = std::chrono::steady_clock::now();
-      props->file_send_last_update_time_ = now;
+      state->file_send_last_update_time_ = now;
     }
 
     // Update file transfer list: update progress and rate
     {
-      std::lock_guard<std::mutex> lock(props->file_transfer_list_mutex_);
-      for (auto& info : props->file_transfer_list_) {
+      std::lock_guard<std::mutex> lock(state->file_transfer_list_mutex_);
+      for (auto& info : state->file_transfer_list_) {
         if (info.file_id == ack.file_id) {
           info.sent_bytes = ack.acked_offset;
           info.file_size = ack.total_size;
@@ -410,8 +482,8 @@ void Render::OnReceiveDataBufferCb(const char* data, size_t size,
     if ((ack.flags & 0x01) != 0) {
       // Transfer completed - receiver has finished receiving the file
       // Reopen window if it was closed by user
-      props->file_transfer_window_visible_ = true;
-      props->file_sending_ = false;  // Mark sending as finished
+      state->file_transfer_window_visible_ = true;
+      state->file_sending_ = false;  // Mark sending as finished
       LOG_INFO(
           "File transfer completed via ACK, file_id={}, total_size={}, "
           "acked_offset={}",
@@ -419,11 +491,11 @@ void Render::OnReceiveDataBufferCb(const char* data, size_t size,
 
       // Update file transfer list: mark as completed
       {
-        std::lock_guard<std::mutex> lock(props->file_transfer_list_mutex_);
-        for (auto& info : props->file_transfer_list_) {
+        std::lock_guard<std::mutex> lock(state->file_transfer_list_mutex_);
+        for (auto& info : state->file_transfer_list_) {
           if (info.file_id == ack.file_id) {
             info.status =
-                SubStreamWindowProperties::FileTransferStatus::Completed;
+                Render::FileTransferState::FileTransferStatus::Completed;
             info.sent_bytes = ack.total_size;
             break;
           }
@@ -432,9 +504,15 @@ void Render::OnReceiveDataBufferCb(const char* data, size_t size,
 
       // Unregister file_id mapping after completion
       {
-        std::lock_guard<std::shared_mutex> lock(
-            render->file_id_to_props_mutex_);
-        render->file_id_to_props_.erase(ack.file_id);
+        if (props) {
+          std::lock_guard<std::shared_mutex> lock(
+              render->file_id_to_props_mutex_);
+          render->file_id_to_props_.erase(ack.file_id);
+        } else {
+          std::lock_guard<std::shared_mutex> lock(
+              render->file_id_to_transfer_state_mutex_);
+          render->file_id_to_transfer_state_.erase(ack.file_id);
+        }
       }
 
       // Process next file in queue
@@ -456,24 +534,39 @@ void Render::OnReceiveDataBufferCb(const char* data, size_t size,
 
   std::string remote_id(user_id, user_id_size);
   // std::shared_lock lock(render->client_properties_mutex_);
-  if (render->client_properties_.find(remote_id) !=
-      render->client_properties_.end()) {
-    // local
-    auto props = render->client_properties_.find(remote_id)->second;
-    if (remote_action.type == ControlType::host_infomation &&
-        props->remote_host_name_.empty()) {
-      props->remote_host_name_ = std::string(remote_action.i.host_name,
-                                             remote_action.i.host_name_size);
-      LOG_INFO("Remote hostname: [{}]", props->remote_host_name_);
+  if (remote_action.type == ControlType::host_infomation) {
+    if (render->client_properties_.find(remote_id) !=
+        render->client_properties_.end()) {
+      // client mode
+      auto props = render->client_properties_.find(remote_id)->second;
+      if (props && props->remote_host_name_.empty()) {
+        props->remote_host_name_ = std::string(remote_action.i.host_name,
+                                               remote_action.i.host_name_size);
+        LOG_INFO("Remote hostname: [{}]", props->remote_host_name_);
+
+        for (int i = 0; i < remote_action.i.display_num; i++) {
+          props->display_info_list_.push_back(
+              DisplayInfo(remote_action.i.display_list[i],
+                          remote_action.i.left[i], remote_action.i.top[i],
+                          remote_action.i.right[i], remote_action.i.bottom[i]));
+        }
+      }
+      FreeRemoteAction(remote_action);
+    } else {
+      // server mode
+      render->connection_host_names_[remote_id] = std::string(
+          remote_action.i.host_name, remote_action.i.host_name_size);
+      LOG_INFO("Remote hostname: [{}]",
+               render->connection_host_names_[remote_id]);
 
       for (int i = 0; i < remote_action.i.display_num; i++) {
-        props->display_info_list_.push_back(
+        render->display_info_list_.push_back(
             DisplayInfo(remote_action.i.display_list[i],
                         remote_action.i.left[i], remote_action.i.top[i],
                         remote_action.i.right[i], remote_action.i.bottom[i]));
       }
+      FreeRemoteAction(remote_action);
     }
-    FreeRemoteAction(remote_action);
   } else {
     // remote
     if (remote_action.type == ControlType::mouse && render->mouse_controller_) {
@@ -568,6 +661,49 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
 
     switch (status) {
       case ConnectionStatus::Connected: {
+        {
+          RemoteAction remote_action;
+          remote_action.i.display_num = render->display_info_list_.size();
+          remote_action.i.display_list =
+              (char**)malloc(remote_action.i.display_num * sizeof(char*));
+          remote_action.i.left =
+              (int*)malloc(remote_action.i.display_num * sizeof(int));
+          remote_action.i.top =
+              (int*)malloc(remote_action.i.display_num * sizeof(int));
+          remote_action.i.right =
+              (int*)malloc(remote_action.i.display_num * sizeof(int));
+          remote_action.i.bottom =
+              (int*)malloc(remote_action.i.display_num * sizeof(int));
+          for (int i = 0; i < remote_action.i.display_num; i++) {
+            LOG_INFO("Local display [{}:{}]", i + 1,
+                     render->display_info_list_[i].name);
+            remote_action.i.display_list[i] =
+                (char*)malloc(render->display_info_list_[i].name.length() + 1);
+            strncpy(remote_action.i.display_list[i],
+                    render->display_info_list_[i].name.c_str(),
+                    render->display_info_list_[i].name.length());
+            remote_action.i
+                .display_list[i][render->display_info_list_[i].name.length()] =
+                '\0';
+            remote_action.i.left[i] = render->display_info_list_[i].left;
+            remote_action.i.top[i] = render->display_info_list_[i].top;
+            remote_action.i.right[i] = render->display_info_list_[i].right;
+            remote_action.i.bottom[i] = render->display_info_list_[i].bottom;
+          }
+
+          std::string host_name = GetHostName();
+          remote_action.type = ControlType::host_infomation;
+          memcpy(&remote_action.i.host_name, host_name.data(),
+                 host_name.size());
+          remote_action.i.host_name[host_name.size()] = '\0';
+          remote_action.i.host_name_size = host_name.size();
+
+          std::string msg = remote_action.to_json();
+          int ret = SendReliableDataFrame(props->peer_, msg.data(), msg.size(),
+                                          render->control_data_label_.c_str());
+          FreeRemoteAction(remote_action);
+        }
+
         if (!render->need_to_create_stream_window_ &&
             !render->client_properties_.empty()) {
           render->need_to_create_stream_window_ = true;
@@ -622,9 +758,54 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
 
     switch (status) {
       case ConnectionStatus::Connected: {
-        render->need_to_send_host_info_ = true;
+        {
+          RemoteAction remote_action;
+          remote_action.i.display_num = render->display_info_list_.size();
+          remote_action.i.display_list =
+              (char**)malloc(remote_action.i.display_num * sizeof(char*));
+          remote_action.i.left =
+              (int*)malloc(remote_action.i.display_num * sizeof(int));
+          remote_action.i.top =
+              (int*)malloc(remote_action.i.display_num * sizeof(int));
+          remote_action.i.right =
+              (int*)malloc(remote_action.i.display_num * sizeof(int));
+          remote_action.i.bottom =
+              (int*)malloc(remote_action.i.display_num * sizeof(int));
+          for (int i = 0; i < remote_action.i.display_num; i++) {
+            LOG_INFO("Local display [{}:{}]", i + 1,
+                     render->display_info_list_[i].name);
+            remote_action.i.display_list[i] =
+                (char*)malloc(render->display_info_list_[i].name.length() + 1);
+            strncpy(remote_action.i.display_list[i],
+                    render->display_info_list_[i].name.c_str(),
+                    render->display_info_list_[i].name.length());
+            remote_action.i
+                .display_list[i][render->display_info_list_[i].name.length()] =
+                '\0';
+            remote_action.i.left[i] = render->display_info_list_[i].left;
+            remote_action.i.top[i] = render->display_info_list_[i].top;
+            remote_action.i.right[i] = render->display_info_list_[i].right;
+            remote_action.i.bottom[i] = render->display_info_list_[i].bottom;
+          }
+
+          std::string host_name = GetHostName();
+          remote_action.type = ControlType::host_infomation;
+          memcpy(&remote_action.i.host_name, host_name.data(),
+                 host_name.size());
+          remote_action.i.host_name[host_name.size()] = '\0';
+          remote_action.i.host_name_size = host_name.size();
+
+          std::string msg = remote_action.to_json();
+          int ret = SendReliableDataFrame(render->peer_, msg.data(), msg.size(),
+                                          render->control_data_label_.c_str());
+          FreeRemoteAction(remote_action);
+        }
+
+        render->need_to_create_server_window_ = true;
+        render->is_server_mode_ = true;
         render->start_screen_capturer_ = true;
         render->start_speaker_capturer_ = true;
+        render->remote_client_id_ = remote_id;
 #ifdef CROSSDESK_DEBUG
         render->start_mouse_controller_ = false;
         render->start_keyboard_capturer_ = false;
@@ -647,11 +828,13 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
                                  kv.second == ConnectionStatus::Failed ||
                                  kv.second == ConnectionStatus::Disconnected;
                         })) {
+          render->need_to_destroy_server_window_ = true;
+          render->is_server_mode_ = false;
           render->start_screen_capturer_ = false;
           render->start_speaker_capturer_ = false;
           render->start_mouse_controller_ = false;
           render->start_keyboard_capturer_ = false;
-          render->need_to_send_host_info_ = false;
+          render->remote_client_id_ = "";
           if (props) props->connection_established_ = false;
           if (render->audio_capture_) {
             render->StopSpeakerCapturer();
@@ -676,11 +859,11 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
   }
 }
 
-void Render::NetStatusReport(const char* client_id, size_t client_id_size,
-                             TraversalMode mode,
-                             const XNetTrafficStats* net_traffic_stats,
-                             const char* user_id, const size_t user_id_size,
-                             void* user_data) {
+void Render::OnNetStatusReport(const char* client_id, size_t client_id_size,
+                               TraversalMode mode,
+                               const XNetTrafficStats* net_traffic_stats,
+                               const char* user_id, const size_t user_id_size,
+                               void* user_data) {
   Render* render = (Render*)user_data;
   if (!render) {
     return;

src/gui/toolbars/control_bar.cpp

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

src/gui/toolbars/title_bar.cpp

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

src/gui/windows/file_transfer_window.cpp

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

src/gui/windows/server_window.cpp

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

xmake.lua

@@ -70,6 +70,9 @@ target("common")
     set_kind("object")
     add_deps("rd_log")
     add_files("src/common/*.cpp")
+    if is_os("macosx") then
+        add_files("src/common/*.mm")
+    end
     add_includedirs("src/common", {public = true})
 
 target("path_manager")