[feat] attempt to rejoin once per second

.gitignore

@@ -1,10 +1,10 @@
 # Xmake cache
 .xmake/
 build/
+certs/
 
 # MacOS Cache
 .DS_Store
 
 # VSCode cache
 .vscode
-continuous-desk.code-workspace

scripts/macosx/pkg_arm64.sh

@@ -78,14 +78,6 @@ EOF
 
 echo ".app created successfully."
 
-SIGN_IDENTITY="${CROSSDESK_SIGN_IDENTITY:--}"
-
-if command -v codesign &> /dev/null; then
-    codesign --force --deep --sign "$SIGN_IDENTITY" "${APP_BUNDLE}" 2>/dev/null || {
-        echo "Warning: Code signing failed. The app may not work properly."
-    }
-fi
-
 echo "building pkg..."
 pkgbuild \
   --identifier "${IDENTIFIER}" \
@@ -94,54 +86,29 @@ pkgbuild \
   --component "${APP_BUNDLE}" \
   build_pkg_temp/${APP_NAME}-component.pkg
 
-mkdir -p scripts
+mkdir -p build_pkg_scripts
 
-cat > scripts/postinstall <<'EOF'
+cat > build_pkg_scripts/postinstall <<'EOF'
 #!/bin/bash
-
-IDENTIFIER="cn.crossdesk.app"
-APP_NAME="CrossDesk"
-APP_PATH="/Applications/${APP_NAME}.app"
-
 USER_HOME=$( /usr/bin/stat -f "%Su" /dev/console )
 HOME_DIR=$( /usr/bin/dscl . -read /Users/$USER_HOME NFSHomeDirectory | awk '{print $2}' )
 
 DEST="$HOME_DIR/Library/Application Support/CrossDesk/certs"
+
 mkdir -p "$DEST"
-if [ -d "/Library/Application Support/CrossDesk/certs" ]; then
+cp -R "/Library/Application Support/CrossDesk/certs/"* "$DEST/"
-    cp -R "/Library/Application Support/CrossDesk/certs/"* "$DEST/" 2>/dev/null || true
-fi
-
-if [ -d "$APP_PATH" ]; then
-    touch "$APP_PATH"
-    /System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister -f "$APP_PATH" 2>/dev/null || true
-    
-    USER_ID=$(dscl . -read /Users/$USER_HOME UniqueID 2>/dev/null | awk '{print $2}')
-    
-    if [ -n "$USER_ID" ]; then
-        sleep 1
-        launchctl asuser $USER_ID open "$APP_PATH" 2>/dev/null &
-        APP_PID=$!
-        sleep 3
-        kill "$APP_PID" 2>/dev/null || pkill -f "${APP_NAME}" 2>/dev/null || true
-    fi
-    
-    open "x-apple.systempreferences:com.apple.preference.security?Privacy_ScreenCapture" 2>/dev/null &
-    sleep 1
-    open "x-apple.systempreferences:com.apple.preference.security?Privacy_Accessibility" 2>/dev/null &
-fi
 
 exit 0
 EOF
 
-chmod +x scripts/postinstall
+chmod +x build_pkg_scripts/postinstall
 
 pkgbuild \
   --root "${CERTS_SOURCE}" \
   --identifier "${IDENTIFIER}.certs" \
   --version "${APP_VERSION}" \
   --install-location "/Library/Application Support/CrossDesk/certs" \
-  --scripts scripts \
+  --scripts build_pkg_scripts \
   build_pkg_temp/${APP_NAME}-certs.pkg
 
 productbuild \
@@ -151,7 +118,7 @@ productbuild \
 
 echo "PKG package created: ${PKG_NAME}"
 
-rm -rf build_pkg_temp scripts ${APP_BUNDLE}
+rm -rf build_pkg_temp build_pkg_scripts ${APP_BUNDLE}
 
 echo "PKG package created successfully."
 echo "package ${APP_BUNDLE}"

scripts/macosx/pkg_x64.sh

@@ -78,14 +78,6 @@ EOF
 
 echo ".app created successfully."
 
-SIGN_IDENTITY="${CROSSDESK_SIGN_IDENTITY:--}"
-
-if command -v codesign &> /dev/null; then
-    codesign --force --deep --sign "$SIGN_IDENTITY" "${APP_BUNDLE}" 2>/dev/null || {
-        echo "Warning: Code signing failed. The app may not work properly."
-    }
-fi
-
 echo "building pkg..."
 pkgbuild \
   --identifier "${IDENTIFIER}" \
@@ -94,54 +86,29 @@ pkgbuild \
   --component "${APP_BUNDLE}" \
   build_pkg_temp/${APP_NAME}-component.pkg
 
-mkdir -p scripts
+mkdir -p build_pkg_scripts
 
-cat > scripts/postinstall <<'EOF'
+cat > build_pkg_scripts/postinstall <<'EOF'
 #!/bin/bash
-
-IDENTIFIER="cn.crossdesk.app"
-APP_NAME="CrossDesk"
-APP_PATH="/Applications/${APP_NAME}.app"
-
 USER_HOME=$( /usr/bin/stat -f "%Su" /dev/console )
 HOME_DIR=$( /usr/bin/dscl . -read /Users/$USER_HOME NFSHomeDirectory | awk '{print $2}' )
 
 DEST="$HOME_DIR/Library/Application Support/CrossDesk/certs"
+
 mkdir -p "$DEST"
-if [ -d "/Library/Application Support/CrossDesk/certs" ]; then
+cp -R "/Library/Application Support/CrossDesk/certs/"* "$DEST/"
-    cp -R "/Library/Application Support/CrossDesk/certs/"* "$DEST/" 2>/dev/null || true
-fi
-
-if [ -d "$APP_PATH" ]; then
-    touch "$APP_PATH"
-    /System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister -f "$APP_PATH" 2>/dev/null || true
-    
-    USER_ID=$(dscl . -read /Users/$USER_HOME UniqueID 2>/dev/null | awk '{print $2}')
-    
-    if [ -n "$USER_ID" ]; then
-        sleep 1
-        launchctl asuser $USER_ID open "$APP_PATH" 2>/dev/null &
-        APP_PID=$!
-        sleep 3
-        kill "$APP_PID" 2>/dev/null || pkill -f "${APP_NAME}" 2>/dev/null || true
-    fi
-    
-    open "x-apple.systempreferences:com.apple.preference.security?Privacy_ScreenCapture" 2>/dev/null &
-    sleep 1
-    open "x-apple.systempreferences:com.apple.preference.security?Privacy_Accessibility" 2>/dev/null &
-fi
 
 exit 0
 EOF
 
-chmod +x scripts/postinstall
+chmod +x build_pkg_scripts/postinstall
 
 pkgbuild \
   --root "${CERTS_SOURCE}" \
   --identifier "${IDENTIFIER}.certs" \
   --version "${APP_VERSION}" \
   --install-location "/Library/Application Support/CrossDesk/certs" \
-  --scripts scripts \
+  --scripts build_pkg_scripts \
   build_pkg_temp/${APP_NAME}-certs.pkg
 
 productbuild \
@@ -151,7 +118,7 @@ productbuild \
 
 echo "PKG package created: ${PKG_NAME}"
 
-rm -rf build_pkg_temp scripts ${APP_BUNDLE}
+rm -rf build_pkg_temp build_pkg_scripts ${APP_BUNDLE}
 
 echo "PKG package created successfully."
 echo "package ${APP_BUNDLE}"

scripts/macosx/sign_app.sh

@@ -1,56 +0,0 @@
-#!/bin/bash
-# Helper script to sign macOS app with different certificate options
-# Usage: ./sign_app.sh <app_path> [certificate_name]
-
-APP_PATH="$1"
-CERT_NAME="$2"
-
-if [ -z "$APP_PATH" ]; then
-    echo "Usage: $0 <app_path> [certificate_name]"
-    echo ""
-    echo "Examples:"
-    echo "  $0 CrossDesk.app                    # Ad-hoc signing"
-    echo "  $0 CrossDesk.app \"CrossDesk Dev\"   # Sign with certificate name"
-    echo "  $0 CrossDesk.app \"-\"               # Explicit ad-hoc signing"
-    exit 1
-fi
-
-if [ ! -d "$APP_PATH" ]; then
-    echo "Error: App bundle not found: $APP_PATH"
-    exit 1
-fi
-
-if [ -z "$CERT_NAME" ]; then
-    # Default to ad-hoc signing
-    CERT_NAME="-"
-    echo "Using ad-hoc signing (no certificate specified)"
-else
-    echo "Using certificate: $CERT_NAME"
-fi
-
-# Check if codesign is available
-if ! command -v codesign &> /dev/null; then
-    echo "Error: codesign not found. Please install Xcode Command Line Tools."
-    exit 1
-fi
-
-# Sign the app
-echo "Signing $APP_PATH..."
-codesign --force --deep --sign "$CERT_NAME" "$APP_PATH"
-
-if [ $? -eq 0 ]; then
-    echo "Signing successful!"
-    
-    # Verify signature
-    echo ""
-    echo "Verifying signature..."
-    codesign -dv --verbose=4 "$APP_PATH" 2>&1 | head -20
-    
-    echo ""
-    echo "Checking entitlements..."
-    codesign -d --entitlements - "$APP_PATH" 2>&1 || echo "No entitlements found"
-else
-    echo "Error: Signing failed"
-    exit 1
-fi
-

scripts/macosx/uninstall.sh

@@ -1,60 +0,0 @@
-#!/bin/bash
-# macOS uninstall script for CrossDesk
-# This script removes the application and cleans up permissions
-
-APP_NAME="CrossDesk"
-IDENTIFIER="cn.crossdesk.app"
-
-echo "Uninstalling ${APP_NAME}..."
-
-# Remove application
-if [ -d "/Applications/${APP_NAME}.app" ]; then
-    echo "Removing application..."
-    rm -rf "/Applications/${APP_NAME}.app"
-fi
-
-# Remove user data
-USER_HOME=$(/usr/bin/stat -f "%Su" /dev/console 2>/dev/null)
-if [ -n "$USER_HOME" ]; then
-    HOME_DIR=$(/usr/bin/dscl . -read "/Users/$USER_HOME" NFSHomeDirectory 2>/dev/null | awk '{print $2}')
-    if [ -n "$HOME_DIR" ]; then
-        echo "Removing user data..."
-        rm -rf "$HOME_DIR/Library/Application Support/${APP_NAME}"
-        rm -rf "$HOME_DIR/Library/Logs/${APP_NAME}"
-        rm -rf "$HOME_DIR/Library/Caches/${APP_NAME}"
-        rm -rf "$HOME_DIR/Library/Preferences/${IDENTIFIER}.plist"
-        rm -rf "$HOME_DIR/Library/LaunchAgents/${APP_NAME}.plist"
-    fi
-fi
-
-# Remove system-wide certificates
-if [ -d "/Library/Application Support/${APP_NAME}/certs" ]; then
-    echo "Removing system certificates..."
-    rm -rf "/Library/Application Support/${APP_NAME}"
-fi
-
-# Clean up permissions using tccutil (macOS 10.14+)
-# Note: This requires user interaction and may not work in all cases
-if command -v tccutil &> /dev/null; then
-    echo "Cleaning up permissions..."
-    # Reset screen recording permission
-    tccutil reset ScreenCapture "$IDENTIFIER" 2>/dev/null || true
-    # Reset accessibility permission
-    tccutil reset Accessibility "$IDENTIFIER" 2>/dev/null || true
-    # Reset camera permission
-    tccutil reset Camera "$IDENTIFIER" 2>/dev/null || true
-    # Reset microphone permission
-    tccutil reset Microphone "$IDENTIFIER" 2>/dev/null || true
-    echo "Permissions cleaned up. You may need to manually remove them from System Settings > Privacy & Security if they still appear."
-else
-    echo "tccutil not available. Please manually remove permissions from System Settings > Privacy & Security"
-fi
-
-echo "Uninstallation complete."
-echo ""
-echo "Note: If permissions still appear in System Settings, please remove them manually:"
-echo "  1. Open System Settings > Privacy & Security"
-echo "  2. Remove ${APP_NAME} from Screen Recording and Accessibility"
-
-exit 0
-

src/gui/assets/layouts/layout.h

@@ -75,5 +75,17 @@
 #define SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_EN 91
 #define UPDATE_NOTIFICATION_OK_BUTTON_PADDING_CN 162
 #define UPDATE_NOTIFICATION_OK_BUTTON_PADDING_EN 146
-
+#ifdef _WIN32
+#define UPDATE_NOTIFICATION_RESERVED_HEIGHT 130
+#elif __APPLE__
+#define UPDATE_NOTIFICATION_RESERVED_HEIGHT 100
+#else
+#define UPDATE_NOTIFICATION_RESERVED_HEIGHT 100
+#endif
+#define REQUEST_PERMISSION_WINDOW_WIDTH_CN 130
+#define REQUEST_PERMISSION_WINDOW_HEIGHT_CN 125
+#define REQUEST_PERMISSION_WINDOW_WIDTH_EN 260
+#define REQUEST_PERMISSION_WINDOW_HEIGHT_EN 125
+#define REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_CN 90
+#define REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_EN 210
 #endif

src/gui/assets/localization/localization.h

@@ -188,6 +188,19 @@ static std::vector<std::string> minimize_to_tray = {
     "Minimize to system tray when exit:"};
 static std::vector<LPCWSTR> exit_program = {L"退出", L"Exit"};
 #endif
+#ifdef __APPLE__
+static std::vector<std::string> request_permissions = {
+    reinterpret_cast<const char*>(u8"权限请求"), "Request Permissions"};
+static std::vector<std::string> screen_recording_permission = {
+    reinterpret_cast<const char*>(u8"屏幕录制权限"),
+    "Screen Recording Permission"};
+static std::vector<std::string> accessibility_permission = {
+    reinterpret_cast<const char*>(u8"辅助功能权限"),
+    "Accessibility Permission"};
+static std::vector<std::string> permission_required_message = {
+    reinterpret_cast<const char*>(u8"该应用需要授权以下权限:"),
+    "The application requires the following permissions:"};
+#endif
 }  // namespace localization
 }  // namespace crossdesk
 #endif

src/gui/panels/remote_peer_panel.cpp

@@ -101,7 +101,15 @@ int Render::RemoteWindow() {
         }
       }
 
+      // check every 1 second for rejoin
       if (need_to_rejoin_) {
+        auto now = std::chrono::steady_clock::now();
+        auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
+                           now - last_rejoin_check_time_)
+                           .count();
+
+        if (elapsed >= 1000) {
+          last_rejoin_check_time_ = now;
           need_to_rejoin_ = false;
           for (const auto& [_, props] : client_properties_) {
             if (props->rejoin_) {
@@ -111,6 +119,7 @@ int Render::RemoteWindow() {
           }
         }
       }
+    }
     ImGui::EndChild();
   }
   ImGui::EndChild();

src/gui/render.cpp

@@ -168,7 +168,7 @@ SDL_HitTestResult Render::HitTestCallback(SDL_Window* window,
   return SDL_HITTEST_NORMAL;
 }
 
-Render::Render() {}
+Render::Render() : last_rejoin_check_time_(std::chrono::steady_clock::now()) {}
 
 Render::~Render() {}
 
@@ -895,6 +895,12 @@ int Render::DrawMainWindow() {
 
   UpdateNotificationWindow();
 
+#ifdef __APPLE__
+  if (show_request_permission_window_) {
+    RequestPermissionWindow();
+  }
+#endif
+
   ImGui::End();
 
   // Rendering
@@ -960,6 +966,7 @@ int Render::DrawStreamWindow() {
 }
 
 int Render::Run() {
+  LOG_INFO("CrossDesk version: {}", CROSSDESK_VERSION);
   latest_version_info_ = CheckUpdate();
   if (!latest_version_info_.empty() &&
       latest_version_info_.contains("version") &&

src/gui/render.h

@@ -188,6 +188,14 @@ class Render {
   int NetTrafficStats(std::shared_ptr<SubStreamWindowProperties>& props);
   void DrawConnectionStatusText(
       std::shared_ptr<SubStreamWindowProperties>& props);
+#ifdef __APPLE__
+  int RequestPermissionWindow();
+  bool CheckScreenRecordingPermission();
+  bool CheckAccessibilityPermission();
+  void OpenScreenRecordingPreferences();
+  void OpenAccessibilityPreferences();
+  bool DrawToggleSwitch(const char* id, bool active, bool enabled);
+#endif
 
  public:
   static void OnReceiveVideoBufferCb(const XVideoFrame* video_frame,
@@ -371,6 +379,7 @@ class Render {
   int audio_len_ = 0;
   bool audio_buffer_fresh_ = false;
   bool need_to_rejoin_ = false;
+  std::chrono::steady_clock::time_point last_rejoin_check_time_;
   bool just_created_ = false;
   std::string controlled_remote_id_ = "";
   std::string focused_remote_id_ = "";
@@ -449,6 +458,9 @@ class Render {
   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;
+#ifdef __APPLE__
+  bool show_request_permission_window_ = true;
+#endif
   char client_id_[10] = "";
   char client_id_display_[12] = "";
   char client_id_with_password_[17] = "";

src/gui/windows/request_permission_window.mm

@@ -0,0 +1,205 @@
+#include "layout.h"
+#include "localization.h"
+#include "rd_log.h"
+#include "render.h"
+
+#include <ApplicationServices/ApplicationServices.h>
+#include <CoreGraphics/CoreGraphics.h>
+#import <Foundation/Foundation.h>
+#include <unistd.h>
+#include <cstdlib>
+
+namespace crossdesk {
+
+bool Render::DrawToggleSwitch(const char* id, bool active, bool enabled) {
+  const float TRACK_HEIGHT = ImGui::GetFrameHeight();
+  const float TRACK_WIDTH = TRACK_HEIGHT * 1.8f;
+  const float TRACK_RADIUS = TRACK_HEIGHT * 0.5f;
+  const float KNOB_PADDING = 2.0f;
+  const float KNOB_HEIGHT = TRACK_HEIGHT - 4.0f;
+  const float KNOB_WIDTH = KNOB_HEIGHT * 1.2f;
+  const float KNOB_RADIUS = KNOB_HEIGHT * 0.5f;
+  const float DISABLED_ALPHA = 0.6f;
+  const float KNOB_ALPHA_DISABLED = 0.9f;
+
+  const ImVec4 COLOR_ACTIVE = ImVec4(0.0f, 0.0f, 1.0f, 1.0f);
+  const ImVec4 COLOR_ACTIVE_HOVER = ImVec4(0.26f, 0.59f, 0.98f, 1.0f);
+  const ImVec4 COLOR_INACTIVE = ImVec4(0.60f, 0.60f, 0.60f, 1.0f);
+  const ImVec4 COLOR_INACTIVE_HOVER = ImVec4(0.70f, 0.70f, 0.70f, 1.0f);
+  const ImVec4 COLOR_KNOB = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
+
+  ImDrawList* draw_list = ImGui::GetWindowDrawList();
+  ImVec2 track_pos = ImGui::GetCursorScreenPos();
+
+  ImGui::InvisibleButton(id, ImVec2(TRACK_WIDTH, TRACK_HEIGHT));
+  bool hovered = ImGui::IsItemHovered();
+  bool clicked = ImGui::IsItemClicked() && enabled;
+
+  ImVec4 track_color = active ? (hovered && enabled ? COLOR_ACTIVE_HOVER : COLOR_ACTIVE)
+                              : (hovered && enabled ? COLOR_INACTIVE_HOVER : COLOR_INACTIVE);
+
+  if (!enabled) {
+    track_color.w *= DISABLED_ALPHA;
+  }
+
+  ImVec2 track_min = ImVec2(track_pos.x, track_pos.y + 0.5f);
+  ImVec2 track_max = ImVec2(track_pos.x + TRACK_WIDTH, track_pos.y + TRACK_HEIGHT - 0.5f);
+  draw_list->AddRectFilled(track_min, track_max, ImGui::GetColorU32(track_color), TRACK_RADIUS);
+
+  float knob_position = active ? 1.0f : 0.0f;
+  float knob_min_x = track_pos.x + KNOB_PADDING;
+  float knob_max_x = track_pos.x + TRACK_WIDTH - KNOB_WIDTH - KNOB_PADDING;
+  float knob_x = knob_min_x + knob_position * (knob_max_x - knob_min_x);
+  float knob_y = track_pos.y + (TRACK_HEIGHT - KNOB_HEIGHT) * 0.5f;
+
+  ImVec4 knob_color = COLOR_KNOB;
+  if (!enabled) {
+    knob_color.w = KNOB_ALPHA_DISABLED;
+  }
+
+  ImVec2 knob_min = ImVec2(knob_x, knob_y);
+  ImVec2 knob_max = ImVec2(knob_x + KNOB_WIDTH, knob_y + KNOB_HEIGHT);
+  draw_list->AddRectFilled(knob_min, knob_max, ImGui::GetColorU32(knob_color), KNOB_RADIUS);
+
+  return clicked;
+}
+
+bool Render::CheckScreenRecordingPermission() {
+  // CGPreflightScreenCaptureAccess is available on macOS 10.15+
+  if (@available(macOS 10.15, *)) {
+    bool granted = CGPreflightScreenCaptureAccess();
+    return granted;
+  }
+  // for older macOS versions, assume permission is granted
+  return true;
+}
+
+bool Render::CheckAccessibilityPermission() {
+  NSDictionary* options = @{(__bridge id)kAXTrustedCheckOptionPrompt : @NO};
+  bool trusted = AXIsProcessTrustedWithOptions((__bridge CFDictionaryRef)options);
+  return trusted;
+}
+
+void Render::OpenAccessibilityPreferences() {
+  NSDictionary* options = @{(__bridge id)kAXTrustedCheckOptionPrompt : @YES};
+  AXIsProcessTrustedWithOptions((__bridge CFDictionaryRef)options);
+
+  system("open "
+         "\"x-apple.systempreferences:com.apple.preference.security?Privacy_"
+         "Accessibility\"");
+}
+
+void Render::OpenScreenRecordingPreferences() {
+  if (@available(macOS 10.15, *)) {
+    CGRequestScreenCaptureAccess();
+  }
+
+  system("open "
+         "\"x-apple.systempreferences:com.apple.preference.security?Privacy_"
+         "ScreenCapture\"");
+}
+
+int Render::RequestPermissionWindow() {
+  bool screen_recording_granted = CheckScreenRecordingPermission();
+  bool accessibility_granted = CheckAccessibilityPermission();
+
+  show_request_permission_window_ = !screen_recording_granted || !accessibility_granted;
+
+  if (!show_request_permission_window_) {
+    return 0;
+  }
+
+  const ImGuiViewport* viewport = ImGui::GetMainViewport();
+  float window_width = localization_language_index_ == 0 ? REQUEST_PERMISSION_WINDOW_WIDTH_CN
+                                                         : REQUEST_PERMISSION_WINDOW_WIDTH_EN;
+  float window_height = localization_language_index_ == 0 ? REQUEST_PERMISSION_WINDOW_HEIGHT_CN
+                                                          : REQUEST_PERMISSION_WINDOW_HEIGHT_EN;
+
+  float checkbox_padding = localization_language_index_ == 0
+                               ? REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_CN
+                               : REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_EN;
+
+  ImVec2 center_pos = ImVec2((viewport->WorkSize.x - window_width) * 0.5f + viewport->WorkPos.x,
+                             (viewport->WorkSize.y - window_height) * 0.5f + viewport->WorkPos.y);
+  ImGui::SetNextWindowPos(center_pos, ImGuiCond_Once);
+
+  ImGui::SetNextWindowSize(ImVec2(window_width, window_height), ImGuiCond_Always);
+
+  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
+  ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
+  ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 5.0f);
+  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
+  ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
+
+  ImGui::Begin(
+      localization::request_permissions[localization_language_index_].c_str(), nullptr,
+      ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoSavedSettings);
+
+  ImGui::SetWindowFontScale(0.3f);
+
+  // use system font
+  if (system_chinese_font_ != nullptr) {
+    ImGui::PushFont(system_chinese_font_);
+  }
+
+  ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetTextLineHeight() + 5.0f);
+  ImGui::SetCursorPosX(10.0f);
+  ImGui::TextWrapped(
+      "%s", localization::permission_required_message[localization_language_index_].c_str());
+
+  ImGui::Spacing();
+  ImGui::Spacing();
+  ImGui::Spacing();
+
+  // accessibility permission
+  ImGui::SetCursorPosX(10.0f);
+  ImGui::AlignTextToFramePadding();
+  ImGui::Text("1. %s:",
+              localization::accessibility_permission[localization_language_index_].c_str());
+  ImGui::SameLine();
+  ImGui::AlignTextToFramePadding();
+  ImGui::SetCursorPosX(checkbox_padding);
+  if (accessibility_granted) {
+    DrawToggleSwitch("accessibility_toggle_on", true, false);
+  } else {
+    if (DrawToggleSwitch("accessibility_toggle", accessibility_granted, !accessibility_granted)) {
+      OpenAccessibilityPreferences();
+    }
+  }
+
+  ImGui::Spacing();
+
+  // screen recording permission
+  ImGui::SetCursorPosX(10.0f);
+  ImGui::AlignTextToFramePadding();
+  ImGui::Text("2. %s:",
+              localization::screen_recording_permission[localization_language_index_].c_str());
+  ImGui::SameLine();
+  ImGui::AlignTextToFramePadding();
+  ImGui::SetCursorPosX(checkbox_padding);
+  if (screen_recording_granted) {
+    ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 10.0f);
+    DrawToggleSwitch("screen_recording_toggle_on", true, false);
+  } else {
+    if (DrawToggleSwitch("screen_recording_toggle", screen_recording_granted,
+                         !screen_recording_granted)) {
+      OpenScreenRecordingPreferences();
+    }
+  }
+
+  ImGui::SetWindowFontScale(1.0f);
+  ImGui::SetWindowFontScale(0.45f);
+
+  // pop system font
+  if (system_chinese_font_ != nullptr) {
+    ImGui::PopFont();
+  }
+
+  ImGui::End();
+  ImGui::SetWindowFontScale(1.0f);
+  ImGui::PopStyleVar(4);
+  ImGui::PopStyleColor();
+
+  return 0;
+}
+}  // namespace crossdesk

src/gui/windows/update_notification_window.cpp

@@ -58,6 +58,12 @@ int Render::UpdateNotificationWindow() {
     float window_width = update_notification_window_width_;
     float window_height = update_notification_window_height_;
 
+#ifdef __APPLE__
+    float font_scale = 0.3f;
+#else
+    float font_scale = 0.5f;
+#endif
+
     ImGui::SetNextWindowPos(
         ImVec2(
             (viewport->WorkSize.x - viewport->WorkPos.x - window_width) / 2,
@@ -70,29 +76,27 @@ int Render::UpdateNotificationWindow() {
     ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
     ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 5.0f);
     ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
-    ImGui::SetWindowFontScale(0.5f);
     ImGui::Begin(
         localization::notification[localization_language_index_].c_str(),
         nullptr,
         ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
-            ImGuiWindowFlags_NoSavedSettings);
+            ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoTitleBar);
 
-    ImGui::SetWindowFontScale(1.0f);
-    ImGui::SetWindowFontScale(0.5f);
-
-    // use system Chinese font
     if (system_chinese_font_ != nullptr) {
       ImGui::PushFont(system_chinese_font_);
     }
 
+    ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetTextLineHeight() +
+                         5.0f);
+
     // title: new version available
     ImGui::SetCursorPosX(window_width * 0.1f);
-    ImGui::SetWindowFontScale(0.7f);
+    ImGui::SetWindowFontScale(font_scale + 0.2f);
     std::string title =
         localization::new_version_available[localization_language_index_] +
         ": v" + latest_version_;
     ImGui::Text("%s", title.c_str());
-    ImGui::SetWindowFontScale(0.5f);
+    ImGui::SetWindowFontScale(font_scale);
 
     ImGui::Spacing();
 
@@ -104,8 +108,8 @@ int Render::UpdateNotificationWindow() {
 
     ImGui::Spacing();
 
-    float reserved_height = 140.0f;
+    float scrollable_height =
-    float scrollable_height = window_height - reserved_height;
+        window_height - UPDATE_NOTIFICATION_RESERVED_HEIGHT;
 
     // scrollable content area
     ImGui::SetCursorPosX(window_width * 0.05f);
@@ -187,7 +191,7 @@ int Render::UpdateNotificationWindow() {
     }
 
     ImGui::SetWindowFontScale(1.0f);
-    ImGui::SetWindowFontScale(0.5f);
+    ImGui::SetWindowFontScale(font_scale);
 
     // pop system font
     if (system_chinese_font_ != nullptr) {

src/screen_capturer/macosx/screen_capturer_sck_impl.mm

@@ -196,6 +196,15 @@ ScreenCapturerSckImpl::~ScreenCapturerSckImpl() {
 
 int ScreenCapturerSckImpl::Init(const int fps, cb_desktop_data cb) {
   _on_data = cb;
+  fps_ = fps;
+
+  if (@available(macOS 10.15, *)) {
+    bool has_permission = CGPreflightScreenCaptureAccess();
+    if (!has_permission) {
+      LOG_ERROR("Screen recording permission not granted");
+      return -1;
+    }
+  }
 
   dispatch_semaphore_t sema = dispatch_semaphore_create(0);
   __block SCShareableContent *content = nil;
@@ -205,7 +214,8 @@ int ScreenCapturerSckImpl::Init(const int fps, cb_desktop_data cb) {
       getShareableContentWithCompletionHandler:^(SCShareableContent *result, NSError *error) {
         if (error) {
           capture_error = error;
-          NSLog(@"Failed to get shareable content: %@", error);
+          LOG_ERROR("Failed to get shareable content: {}",
+                    std::string([error.localizedDescription UTF8String]));
         } else {
           content = result;
         }
@@ -213,16 +223,10 @@ int ScreenCapturerSckImpl::Init(const int fps, cb_desktop_data cb) {
       }];
   dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
 
-  if (capture_error) {
+  if (capture_error || !content || content.displays.count == 0) {
-    NSString *error_desc = capture_error.localizedDescription ?: @"Unknown error";
+    LOG_ERROR("Failed to get display info, error: {}",
-    LOG_ERROR("Failed to get shareable content: {}", 
+              std::string([capture_error.localizedDescription UTF8String]));
-              std::string([error_desc UTF8String]));
+    return -1;
-    return 0;
-  }
-
-  if (!content || content.displays.count == 0) {
-    LOG_ERROR("Failed to get display info: content is nil or no displays available");
-    return 0;
   }
 
   CGDirectDisplayID displays[10];
@@ -261,6 +265,16 @@ int ScreenCapturerSckImpl::Init(const int fps, cb_desktop_data cb) {
 }
 
 int ScreenCapturerSckImpl::Start(bool show_cursor) {
+  if (permanent_error_) {
+    LOG_ERROR("Cannot start capturer: permanent error occurred");
+    return -1;
+  }
+
+  if (display_info_list_.empty()) {
+    LOG_ERROR("Cannot start capturer: display info not initialized");
+    return -1;
+  }
+
   show_cursor_ = show_cursor;
   StartOrReconfigureCapturer();
   return 0;
@@ -316,17 +330,17 @@ void ScreenCapturerSckImpl::OnShareableContentCreated(SCShareableContent *conten
     return;
   }
 
-  if (!content.displays.count) {
+  if (!content.displays || content.displays.count == 0) {
     LOG_ERROR("getShareableContent returned no displays");
     permanent_error_ = true;
     return;
   }
 
-  SCDisplay *captured_display;
+  SCDisplay *captured_display = nil;
   {
     std::lock_guard<std::mutex> lock(lock_);
     for (SCDisplay *display in content.displays) {
-      if (current_display_ == display.displayID) {
+      if (current_display_ != 0 && current_display_ == display.displayID) {
         LOG_WARN("current display: {}, name: {}", current_display_,
                  display_id_name_map_[current_display_]);
         captured_display = display;
@@ -335,13 +349,33 @@ void ScreenCapturerSckImpl::OnShareableContentCreated(SCShareableContent *conten
     }
     if (!captured_display) {
       captured_display = content.displays.firstObject;
+      if (captured_display) {
         current_display_ = captured_display.displayID;
       }
     }
+  }
+
+  if (!captured_display) {
+    LOG_ERROR("Failed to find valid display");
+    permanent_error_ = true;
+    return;
+  }
 
   SCContentFilter *filter = [[SCContentFilter alloc] initWithDisplay:captured_display
                                                     excludingWindows:@[]];
+  if (!filter) {
+    LOG_ERROR("Failed to create SCContentFilter");
+    permanent_error_ = true;
+    return;
+  }
+
   SCStreamConfiguration *config = [[SCStreamConfiguration alloc] init];
+  if (!config) {
+    LOG_ERROR("Failed to create SCStreamConfiguration");
+    permanent_error_ = true;
+    return;
+  }
+
   config.pixelFormat = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
   config.showsCursor = show_cursor_;
   config.width = filter.contentRect.size.width * filter.pointPixelScale;
@@ -432,11 +466,28 @@ void ScreenCapturerSckImpl::OnNewCVPixelBuffer(CVPixelBufferRef pixelBuffer,
 }
 
 void ScreenCapturerSckImpl::StartOrReconfigureCapturer() {
-  // The copy is needed to avoid capturing `this` in the Objective-C block. Accessing `helper_`
+  if (permanent_error_) {
-  // inside the block is equivalent to `this->helper_` and would crash (UAF) if `this` is
+    LOG_ERROR("Cannot reconfigure capturer: permanent error occurred");
-  // deleted before the block is executed.
+    return;
+  }
+
+  if (@available(macOS 10.15, *)) {
+    bool has_permission = CGPreflightScreenCaptureAccess();
+    if (!has_permission) {
+      LOG_ERROR("Screen recording permission not granted");
+      permanent_error_ = true;
+      return;
+    }
+  }
+
   SckHelper *local_helper = helper_;
   auto handler = ^(SCShareableContent *content, NSError *error) {
+    if (error) {
+      LOG_ERROR("getShareableContent failed: {}",
+                std::string([error.localizedDescription UTF8String]));
+      [local_helper onShareableContentCreated:nil];
+      return;
+    }
     [local_helper onShareableContentCreated:content];
   };
   [SCShareableContent getShareableContentWithCompletionHandler:handler];

xmake.lua

@@ -182,6 +182,8 @@ target("gui")
     if is_os("windows") then
         add_files("src/gui/tray/*.cpp")
         add_includedirs("src/gui/tray", {public = true})
+    elseif is_os("macosx") then
+        add_files("src/gui/windows/*.mm")
     end
 
 target("crossdesk")