New terms added (#15036)

* Update es.rs

New terms added

* Update es.rs

New terms added

* Update Spanish translations for various strings

* Fix typo in Spanish translation for TLS fallback

* Add Spanish translations for various UI elements

* Update es.rs

---------

Co-authored-by: RustDesk <71636191+rustdesk@users.noreply.github.com>

.gitignore

@@ -55,6 +55,4 @@ examples/**/target/
 vcpkg_installed
 flutter/lib/generated_plugin_registrant.dart
 libsciter.dylib
-flutter/web/
-# Local git worktrees
-.worktrees/
+flutter/web/

AGENTS.md

@@ -53,30 +53,6 @@
 * Use `spawn_blocking` or dedicated threads for blocking work.
 * Do not use `std::thread::sleep()` in async code.
 
-## Flutter Rust Bridge
-
-* Do **not** run `flutter_rust_bridge_codegen` — it requires a specific pinned version that is not easy to set up locally.
-* When adding new FFI functions in `src/flutter_ffi.rs`, hand-write the corresponding Dart wrappers instead of regenerating.
-* Web bridge (committed): edit `flutter/lib/web/bridge.dart` directly. Follow the existing patterns there for `SyncReturn<T>` / `Future<T>` and the `dart:js` glue.
-* Native bridge (`flutter/lib/generated_bridge.dart`, `src/bridge_generated.rs`, `src/bridge_generated.io.rs`): these are gitignored and regenerated by the project's CI codegen. Manually editing them locally is fine for development testing, but those edits do not persist into commits.
-
-## Web (Flutter Web) Architecture
-
-Flutter Web in this repo is **not** "Dart compiled to JS via Flutter alone". The runtime is split:
-
-* **Native targets (Win/Mac/Linux/Android/iOS)**: Rust drives sessions via `flutter_rust_bridge`; Dart only renders UI.
-* **Web target**: Rust does **not** run. There is a separate hand-written TypeScript / JavaScript client at `flutter/web/js/` (gitignored — not present in this repo, lives in the maintainer's local tree). It owns connection, codec, keyboard, clipboard, etc. — basically a JS port of the Rust client. The Dart UI talks to it through `flutter/lib/web/bridge.dart`, which uses `dart:js` to call JS-side functions and to register Dart-side callbacks on `window.*`.
-
-Implications when adding any session-runtime feature (keyboard, clipboard, audio, …):
-
-* The Rust implementation in `src/` is for **native only**. Don't try to compile it to wasm.
-* The matching Web-side logic must be written in TS/JS under `flutter/web/js/src/`. It's a translation of the Rust logic, usually simpler — Web is single-window, so any per-session-id plumbing in Rust collapses to a single global on Web.
-* `flutter/lib/web/bridge.dart` is the only place where Dart sees JS. Other Dart code stays platform-agnostic and goes through `bind`. Don't sprinkle `if (isWeb)` runtime branches in shared Dart files to call Web-specific logic — put the platform divergence in the bridge.
-* For JS → Dart events (e.g., a Web matcher firing), the convention is: Dart sets `js.context['onFooBar'] = (...) {...}` once at startup (typically in `mainInit`); the JS side calls `window.onFooBar(...)`. See `onLoadAbFinished`, `onLoadGroupFinished` for reference.
-* The maintainer cannot easily run `flutter_rust_bridge_codegen`, so when a new FFI function lands in `src/flutter_ffi.rs`:
-  1. add the Web counterpart to `flutter/lib/web/bridge.dart` by hand;
-  2. note that on the Web target it may need to be a no-op or a JS bridge call rather than a real Rust invocation.
-
 ## Editing Hygiene
 
 * Change only what is required.

Cargo.lock

@@ -5996,8 +5996,8 @@ dependencies = [
 
 [[package]]
 name = "parity-tokio-ipc"
-version = "0.7.3-5"
-source = "git+https://github.com/rustdesk-org/parity-tokio-ipc#c8c8bbcbabf9be1201c53afb0269b92b9b02d291"
+version = "0.7.3-6"
+source = "git+https://github.com/rustdesk-org/parity-tokio-ipc#d0ae39bffe5d5a3e8d82a1b6bcb1ca5a9b2f1c01"
 dependencies = [
  "futures",
  "libc",

flutter/lib/common.dart

@@ -716,6 +716,17 @@ closeConnection({String? id}) {
       stateGlobal.isInMainPage = true;
     } else {
       final controller = Get.find<DesktopTabController>();
+      if (controller.tabType == DesktopTabType.terminal &&
+          controller.onCloseWindow != null) {
+        // Terminal windows are scoped to one peer. The optional id passed to
+        // closeConnection() is that peer id, not a terminal tab key
+        // (${peerId}_${terminalId}). Closing from terminal dialogs should close
+        // the peer's whole terminal window, including all terminal tabs.
+        unawaited(controller.onCloseWindow!().catchError((e, _) {
+          debugPrint('[closeConnection] Failed to close terminal window: $e');
+        }));
+        return;
+      }
       controller.closeBy(id);
     }
   }
@@ -4179,8 +4190,7 @@ Widget? buildAvatarWidget({
       width: size,
       height: size,
       fit: BoxFit.cover,
-      errorBuilder: (_, __, ___) =>
-          fallback ?? SizedBox.shrink(),
+      errorBuilder: (_, __, ___) => fallback ?? SizedBox.shrink(),
     ),
   );
 }

flutter/lib/common/widgets/keyboard_shortcuts/display.dart

@@ -1,111 +0,0 @@
-// flutter/lib/common/widgets/keyboard_shortcuts/display.dart
-import 'dart:convert';
-import 'package:flutter/foundation.dart';
-import '../../../consts.dart';
-import '../../../models/platform_model.dart';
-import 'shortcut_utils.dart';
-
-/// Read the bindings JSON and produce a human-readable shortcut string for
-/// `actionId`, formatted for the current OS. Returns null if unbound, or —
-/// when [requireEnabled] is true (the default) — when the master toggle is
-/// off. The configuration page passes `requireEnabled: false` so users still
-/// see what they have bound while the feature is disabled.
-class ShortcutDisplay {
-  // Cache parsed JSON keyed by the raw string — called per visible action on
-  // every menu rebuild, so the jsonDecode is the real cost. Invalidation is
-  // automatic: a write changes the raw and we re-parse.
-  static String? _cachedRaw;
-  static Map<String, dynamic>? _cachedParsed;
-
-  @visibleForTesting
-  static void resetCache() {
-    _cachedRaw = null;
-    _cachedParsed = null;
-  }
-
-  static String? formatFor(String actionId, {bool requireEnabled = true}) {
-    final raw = bind.mainGetLocalOption(key: kShortcutLocalConfigKey);
-    if (raw.isEmpty) return null;
-    Map<String, dynamic>? parsed;
-    if (raw == _cachedRaw) {
-      parsed = _cachedParsed;
-    } else {
-      try {
-        parsed = jsonDecode(raw) as Map<String, dynamic>;
-      } catch (_) {
-        parsed = null;
-      }
-      _cachedRaw = raw;
-      _cachedParsed = parsed;
-    }
-    if (parsed == null) return null;
-    if (requireEnabled && parsed['enabled'] != true) return null;
-    // When pass-through is on, the matcher returns early on every keystroke.
-    // Showing the bound combo next to a menu item would lie to the user — they
-    // would press it expecting the local action and instead the keys would go
-    // to the remote. Treat as unbound for display purposes.
-    if (requireEnabled && parsed['pass_through'] == true) return null;
-    final list = shortcutBindingMapsFrom(parsed['bindings']);
-    final found = list.firstWhere(
-      (b) => b['action'] == actionId,
-      orElse: () => {},
-    );
-    if (found.isEmpty) return null;
-
-    // Guard against a hand-edited / corrupt config where `key` is missing or
-    // not a string — silently treat the binding as unbound rather than
-    // crashing the toolbar render.
-    final keyValue = found['key'];
-    if (keyValue is! String) return null;
-
-    final isMac = defaultTargetPlatform == TargetPlatform.macOS ||
-                  defaultTargetPlatform == TargetPlatform.iOS;
-    // `mods` similarly may be malformed; treat a non-list as no modifiers.
-    final modsRaw = found['mods'];
-    final mods = modsRaw is List
-        ? modsRaw.whereType<String>().toList()
-        : const <String>[];
-    // Plain-text labels (Cmd / Ctrl / Alt / Shift) instead of Unicode glyphs
-    // (⌘ ⌃ ⌥ ⇧). Flutter Web's CanvasKit bundled fonts don't always carry the
-    // macOS modifier symbols, which renders as garbled boxes on Mac browsers;
-    // text is portable and readable on every platform.
-    //
-    // Order matches the canonical macOS order (Cmd, Control, Option, Shift)
-    // so the rendered hint reads naturally. `ctrl` only ever appears in
-    // saved bindings on macOS — Win/Linux collapses Ctrl into `primary`.
-    final parts = <String>[];
-    for (final m in ['primary', 'ctrl', 'alt', 'shift']) {
-      if (!mods.contains(m)) continue;
-      switch (m) {
-        case 'primary': parts.add(isMac ? 'Cmd' : 'Ctrl'); break;
-        case 'ctrl':    parts.add(isMac ? 'Control' : 'Ctrl'); break;
-        case 'alt':     parts.add(isMac ? 'Option' : 'Alt'); break;
-        case 'shift':   parts.add('Shift'); break;
-      }
-    }
-    parts.add(_keyDisplay(keyValue));
-    return parts.join('+');
-  }
-
-  static String _keyDisplay(String key) {
-    switch (key) {
-      case 'delete':     return 'Del';
-      case 'backspace':  return 'Backspace';
-      case 'enter':      return 'Enter';
-      case 'tab':        return 'Tab';
-      case 'space':      return 'Space';
-      case 'arrow_left': return 'Left';
-      case 'arrow_right':return 'Right';
-      case 'arrow_up':   return 'Up';
-      case 'arrow_down': return 'Down';
-      case 'home':       return 'Home';
-      case 'end':        return 'End';
-      case 'page_up':    return 'PgUp';
-      case 'page_down':  return 'PgDn';
-      case 'insert':     return 'Ins';
-    }
-    if (key.startsWith('digit')) return key.substring(5);
-    // F-keys ("f1".."f12") and single letters fall through to uppercase.
-    return key.toUpperCase();
-  }
-}

flutter/lib/common/widgets/keyboard_shortcuts/page_body.dart

@@ -1,481 +0,0 @@
-// flutter/lib/common/widgets/keyboard_shortcuts/page_body.dart
-//
-// Shared body widget for the Keyboard Shortcuts configuration page. Both the
-// desktop (`desktop/pages/desktop_keyboard_shortcuts_page.dart`) and mobile
-// (`mobile/pages/mobile_keyboard_shortcuts_page.dart`) pages render this
-// widget inside their own platform-styled Scaffold + AppBar shell.
-//
-// The body owns:
-//   * the top-level enable/disable toggle (mirrors the General-tab toggle —
-//     same JSON key, same semantics);
-//   * a grouped list of actions, each with its current binding plus
-//     edit / clear icons;
-//   * the JSON read/write helpers under [kShortcutLocalConfigKey] in the
-//     canonical {enabled, bindings:[{action,mods,key}]} shape;
-//   * the recording-dialog round-trip and conflict-replace bookkeeping;
-//   * "Reset to defaults" (called from the platform AppBar).
-//
-// Platform shells supply only:
-//   * the AppBar (with a "Reset to defaults" action that calls
-//     [KeyboardShortcutsPageBodyState.resetToDefaultsWithConfirm]);
-//   * surrounding padding / list-tile vs. dense-row visuals via the
-//     [compact] flag.
-
-import 'dart:convert';
-
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-
-import '../../../common.dart';
-import '../../../consts.dart';
-import '../../../models/platform_model.dart';
-import '../../../models/shortcut_model.dart';
-import 'display.dart';
-import 'recording_dialog.dart';
-import 'shortcut_actions.dart';
-import 'shortcut_utils.dart';
-
-/// The shared body widget. Render this inside a platform-styled Scaffold.
-///
-/// [compact] toggles the desktop dense-row layout (`true`) versus the mobile
-/// touch-friendly ListTile layout (`false`).
-///
-/// [editButtonHint] is shown as the tooltip on the Edit icon. Mobile shells
-/// use this to clarify that recording requires a physical keyboard.
-///
-/// [headerBanner] is an optional widget rendered above the toggle. Mobile
-/// uses this to show the "Recording requires a physical keyboard" hint.
-class KeyboardShortcutsPageBody extends StatefulWidget {
-  final bool compact;
-  final String? editButtonHint;
-  final Widget? headerBanner;
-
-  /// Whether to render the master Enable + Pass-through toggles inside the
-  /// body. Desktop shells set this to false because the General settings tab
-  /// already exposes both checkboxes (and is the only entry point to this
-  /// page on desktop). Mobile defaults to true: its entry point is a plain
-  /// nav tile in Settings, so this page is the only place the user can
-  /// flip the master switches.
-  final bool showMasterToggles;
-
-  const KeyboardShortcutsPageBody({
-    Key? key,
-    this.compact = true,
-    this.editButtonHint,
-    this.headerBanner,
-    this.showMasterToggles = true,
-  }) : super(key: key);
-
-  @override
-  State<KeyboardShortcutsPageBody> createState() =>
-      KeyboardShortcutsPageBodyState();
-}
-
-/// Public state so platform shells can call [resetToDefaultsWithConfirm] from
-/// their AppBar action.
-class KeyboardShortcutsPageBodyState extends State<KeyboardShortcutsPageBody> {
-  // ----- Persistence helpers -----
-
-  Map<String, dynamic> _readJson() {
-    final raw = bind.mainGetLocalOption(key: kShortcutLocalConfigKey);
-    if (raw.isEmpty) return {'enabled': false, 'bindings': <dynamic>[]};
-    try {
-      final parsed = jsonDecode(raw) as Map<String, dynamic>;
-      parsed['bindings'] ??= <dynamic>[];
-      parsed['enabled'] ??= false;
-      return parsed;
-    } catch (_) {
-      return {'enabled': false, 'bindings': <dynamic>[]};
-    }
-  }
-
-  Future<void> _writeJson(Map<String, dynamic> json) async {
-    await bind.mainSetLocalOption(
-        key: kShortcutLocalConfigKey, value: jsonEncode(json));
-    // Refresh the matcher cache so writes take effect immediately. On native
-    // this hits the Rust matcher; on Web the bridge forwards to the JS-side
-    // matcher in flutter/web/js/.
-    bind.mainReloadKeyboardShortcuts();
-    if (mounted) setState(() {});
-  }
-
-  /// Replace the bindings entry for [actionId] with [binding]. If [binding]
-  /// is null, removes the existing entry. If the user is replacing a
-  /// conflicting binding, [clearActionId] points at the action whose
-  /// (now-stale) binding should be removed in the same write.
-  Future<void> _setBinding(
-    String actionId, {
-    Map<String, dynamic>? binding,
-    String? clearActionId,
-  }) async {
-    final json = _readJson();
-    final list = shortcutBindingMapsFrom(json['bindings']);
-    list.removeWhere((b) {
-      final a = b['action'];
-      return a == actionId || (clearActionId != null && a == clearActionId);
-    });
-    if (binding != null) {
-      list.add(binding);
-    }
-    json['bindings'] = list;
-    await _writeJson(json);
-  }
-
-  Future<void> _setEnabled(bool v) async {
-    await ShortcutModel.setEnabled(v);
-    if (mounted) setState(() {});
-  }
-
-  Future<void> _setPassThrough(bool v) async {
-    await ShortcutModel.setPassThrough(v);
-    if (mounted) setState(() {});
-  }
-
-  Future<void> _resetToDefaults() async {
-    final json = _readJson();
-    // Single source of truth lives in `ShortcutModel.currentPlatformCapabilities`
-    // — the same helper feeds the first-enable seed pass, this Reset action,
-    // and the action-list filter below, so the three can never disagree on
-    // which actions belong on this platform.
-    json['bindings'] = filterDefaultBindingsForPlatform(
-      jsonDecode(bind.mainGetDefaultKeyboardShortcuts()) as List,
-      ShortcutModel.currentPlatformCapabilities(),
-    );
-    await _writeJson(json);
-  }
-
-  String _labelFor(String actionId) {
-    // Intentionally walks the unfiltered list (via the recursive helper, so
-    // both direct entries and subgroup entries are covered) — a stale
-    // cross-platform binding (e.g. Toggle Toolbar carried over from
-    // desktop) should still resolve to its human-readable label in conflict
-    // warnings.
-    for (final entry in allActionEntries(kKeyboardShortcutActionGroups)) {
-      if (entry.id == actionId) return translate(entry.labelKey);
-    }
-    return actionId;
-  }
-
-  /// Action groups visible on the current platform. Reads the same
-  /// capability set as the seed-defaults / reset-to-defaults paths from
-  /// `ShortcutModel.currentPlatformCapabilities`, so the UI lists exactly
-  /// the actions whose handlers the matcher can dispatch here.
-  List<KeyboardShortcutActionGroup> _groupsForCurrentPlatform() {
-    return filterKeyboardShortcutActionGroupsForPlatform(
-      ShortcutModel.currentPlatformCapabilities(),
-    );
-  }
-
-  // ----- UI handlers -----
-
-  Future<void> _onEdit(KeyboardShortcutActionEntry entry) async {
-    final json = _readJson();
-    final bindings = shortcutBindingMapsFrom(json['bindings']);
-    final result = await showRecordingDialog(
-      context: context,
-      actionId: entry.id,
-      actionLabel: translate(entry.labelKey),
-      existingBindings: bindings,
-      actionLabelLookup: _labelFor,
-    );
-    if (result == null) return;
-    await _setBinding(
-      entry.id,
-      binding: result.binding,
-      clearActionId: result.clearActionId,
-    );
-  }
-
-  Future<void> _onClear(KeyboardShortcutActionEntry entry) async {
-    await _setBinding(entry.id, binding: null);
-  }
-
-  /// Public — invoked from the platform AppBar action.
-  Future<void> resetToDefaultsWithConfirm() async {
-    final confirmed = await showDialog<bool>(
-      context: context,
-      builder: (ctx) => AlertDialog(
-        title: Text(translate('Reset to defaults')),
-        content: Text(translate('shortcut-reset-confirm-tip')),
-        actions: [
-          dialogButton('Cancel',
-              onPressed: () => Navigator.of(ctx).pop(false), isOutline: true),
-          dialogButton('OK', onPressed: () => Navigator.of(ctx).pop(true)),
-        ],
-      ),
-    );
-    if (confirmed == true) {
-      await _resetToDefaults();
-    }
-  }
-
-  // ----- Build -----
-
-  @override
-  Widget build(BuildContext context) {
-    final enabled = ShortcutModel.isEnabled();
-    final theme = Theme.of(context);
-
-    return ListView(
-      padding: const EdgeInsets.all(16),
-      children: [
-        if (widget.headerBanner != null) ...[
-          widget.headerBanner!,
-          const SizedBox(height: 12),
-        ],
-        if (widget.showMasterToggles) ...[
-          _toggleRow(
-            enabled,
-            'Enable keyboard shortcuts in remote session',
-            (v) => _setEnabled(v),
-          ),
-          if (enabled)
-            _toggleRow(
-              ShortcutModel.isPassThrough(),
-              'Pass-through to remote',
-              (v) => _setPassThrough(v),
-            ),
-        ],
-        const SizedBox(height: 8),
-        Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 8),
-          child: Text(
-            translate('shortcut-page-description'),
-            style: TextStyle(color: theme.hintColor),
-          ),
-        ),
-        const SizedBox(height: 16),
-        // Bindings list and configuration entry only show when shortcuts are
-        // enabled — there is nothing to configure while the matcher is off.
-        if (enabled)
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              for (final group in _groupsForCurrentPlatform())
-                _buildGroup(context, group),
-            ],
-          ),
-      ],
-    );
-  }
-
-  Widget _toggleRow(
-      bool value, String labelKey, Future<void> Function(bool) onChanged,
-      {String? tooltipKey}) {
-    return Row(
-      children: [
-        Checkbox(
-          value: value,
-          onChanged: (v) async {
-            if (v == null) return;
-            await onChanged(v);
-          },
-        ),
-        const SizedBox(width: 4),
-        Expanded(
-          child: GestureDetector(
-            behavior: HitTestBehavior.opaque,
-            onTap: () => onChanged(!value),
-            child: Text(translate(labelKey)),
-          ),
-        ),
-        if (tooltipKey != null) InfoTooltipIcon(tipKey: tooltipKey),
-      ],
-    );
-  }
-
-  // One indent unit per nesting level. Both "top item under top heading"
-  // and "subgroup heading under top group" are *one* level deeper than the
-  // top heading, so they share this indent — meaning a top-level direct
-  // item and a sibling subgroup heading line up at exactly the same x.
-  // Subgroup items are *two* levels deeper.
-  static const double _kIndentStep = 16.0;
-
-  /// Top-level group: heading at zero indent, then walk `children` in
-  /// declaration order. Direct entries get [_kIndentStep] of indent so
-  /// they read as "items under this heading"; subgroup headings sit at
-  /// the same indent (a subgroup is a sibling of the direct items, just
-  /// with its own nested entries below).
-  Widget _buildGroup(BuildContext context, KeyboardShortcutActionGroup group) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        const SizedBox(height: 12),
-        _buildHeading(context, group.titleKey, isSub: false),
-        const SizedBox(height: 4),
-        for (final child in group.children)
-          switch (child) {
-            KeyboardShortcutActionEntry() => Padding(
-                padding: const EdgeInsets.only(left: _kIndentStep),
-                child: _buildEntryRow(context, child),
-              ),
-            KeyboardShortcutActionSubgroup() =>
-              _buildSubgroup(context, child),
-          },
-      ],
-    );
-  }
-
-  Widget _buildSubgroup(
-      BuildContext context, KeyboardShortcutActionSubgroup subgroup) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        const SizedBox(height: 8),
-        _buildHeading(context, subgroup.titleKey, isSub: true),
-        const SizedBox(height: 4),
-        for (final entry in subgroup.entries)
-          Padding(
-            // Two indent steps: one for "subgroup heading is nested under
-            // top heading" (matches the heading's own indent) and one for
-            // "this entry is under the subgroup heading".
-            padding: const EdgeInsets.only(left: _kIndentStep * 2),
-            child: _buildEntryRow(context, entry),
-          ),
-      ],
-    );
-  }
-
-  Widget _buildHeading(BuildContext context, String titleKey,
-      {required bool isSub}) {
-    // Subgroup heading nests one step under the top heading — same indent
-    // as a top-level direct item, so the two line up at the same x.
-    final indent = isSub ? _kIndentStep : 0.0;
-    return Padding(
-      padding: EdgeInsets.only(left: 8 + indent, right: 8),
-      child: Row(
-        children: [
-          Text(
-            translate(titleKey),
-            style: TextStyle(
-              fontWeight: isSub ? FontWeight.w500 : FontWeight.w600,
-              color: isSub
-                  ? Theme.of(context).hintColor
-                  : Theme.of(context).colorScheme.primary,
-            ),
-          ),
-          const SizedBox(width: 8),
-          Expanded(child: Divider(thickness: isSub ? 0.5 : 1)),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildEntryRow(
-      BuildContext context, KeyboardShortcutActionEntry entry) {
-    return widget.compact
-        ? _buildCompactRow(context, entry)
-        : _buildTouchRow(context, entry);
-  }
-
-  /// Desktop dense row: label | shortcut | edit | clear, all in one Row.
-  Widget _buildCompactRow(
-      BuildContext context, KeyboardShortcutActionEntry entry) {
-    final shortcut = ShortcutDisplay.formatFor(entry.id, requireEnabled: false);
-    final hasBinding = shortcut != null;
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),
-      child: Row(
-        children: [
-          Expanded(
-            flex: 5,
-            child: Text(translate(entry.labelKey)),
-          ),
-          Expanded(
-            flex: 4,
-            child: Text(
-              shortcut ?? '—',
-              style: TextStyle(
-                fontFamily: defaultTargetPlatform == TargetPlatform.windows
-                    ? 'Consolas'
-                    : 'monospace',
-                color: hasBinding ? null : Theme.of(context).hintColor,
-              ),
-            ),
-          ),
-          IconButton(
-            tooltip: widget.editButtonHint ?? translate('Edit'),
-            onPressed: () => _onEdit(entry),
-            icon: const Icon(Icons.edit_outlined, size: 18),
-          ),
-          SizedBox(
-            width: 40,
-            child: hasBinding
-                ? IconButton(
-                    tooltip: translate('Clear'),
-                    onPressed: () => _onClear(entry),
-                    icon: const Icon(Icons.close, size: 18),
-                  )
-                : const SizedBox.shrink(),
-          ),
-        ],
-      ),
-    );
-  }
-
-  /// Mobile touch row: ListTile with title + subtitle + trailing icons.
-  Widget _buildTouchRow(
-      BuildContext context, KeyboardShortcutActionEntry entry) {
-    final shortcut = ShortcutDisplay.formatFor(entry.id, requireEnabled: false);
-    final hasBinding = shortcut != null;
-    return ListTile(
-      dense: false,
-      contentPadding: const EdgeInsets.symmetric(horizontal: 8),
-      title: Text(translate(entry.labelKey)),
-      subtitle: Text(
-        shortcut ?? '—',
-        style: TextStyle(
-          fontFamily: defaultTargetPlatform == TargetPlatform.windows
-              ? 'Consolas'
-              : 'monospace',
-          color: hasBinding ? null : Theme.of(context).hintColor,
-        ),
-      ),
-      trailing: Row(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          IconButton(
-            tooltip: widget.editButtonHint ?? translate('Edit'),
-            onPressed: () => _onEdit(entry),
-            icon: const Icon(Icons.edit_outlined),
-          ),
-          if (hasBinding)
-            IconButton(
-              tooltip: translate('Clear'),
-              onPressed: () => _onClear(entry),
-              icon: const Icon(Icons.close),
-            )
-          else
-            const SizedBox(width: 48),
-        ],
-      ),
-    );
-  }
-}
-
-/// Small help-icon tooltip used for inline explanations next to a checkbox /
-/// row. Triggers on hover (desktop) and tap (mobile). Public so the desktop
-/// General settings tab can reuse it.
-class InfoTooltipIcon extends StatelessWidget {
-  final String tipKey;
-  const InfoTooltipIcon({Key? key, required this.tipKey}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Tooltip(
-      message: translate(tipKey),
-      triggerMode: TooltipTriggerMode.tap,
-      preferBelow: false,
-      waitDuration: const Duration(milliseconds: 250),
-      showDuration: const Duration(seconds: 6),
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 6),
-        child: Icon(
-          Icons.help_outline,
-          size: 16,
-          color: Theme.of(context).hintColor,
-        ),
-      ),
-    );
-  }
-}

flutter/lib/common/widgets/keyboard_shortcuts/recording_dialog.dart

@@ -1,399 +0,0 @@
-// flutter/lib/common/widgets/keyboard_shortcuts/recording_dialog.dart
-//
-// Modal dialog used by the Keyboard Shortcuts settings page to capture a new
-// key combination for a given action. The dialog listens for KeyDown events,
-// extracts the modifier set + non-modifier key, validates that at least one
-// modifier is present, and reports any conflict with another already-bound
-// action.
-//
-// On Save, returns the new binding map ({action, mods, key}) plus the
-// optional id of the action whose binding should be cleared (the conflict
-// "Replace" path). On Cancel, returns null.
-
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
-import '../../../common.dart';
-import 'shortcut_utils.dart';
-
-/// Result of the recording dialog.
-class RecordingResult {
-  /// The new binding map to write: {action, mods, key}.
-  final Map<String, dynamic> binding;
-
-  /// If the chosen combo conflicted with another action, the user chose
-  /// "Replace" — the caller must clear this action's binding before writing
-  /// the new one.
-  final String? clearActionId;
-
-  RecordingResult(this.binding, this.clearActionId);
-}
-
-/// Show the recording dialog.
-///
-/// [actionId] is the action being edited (used for the title and to detect
-/// "binding to itself" — that's not a conflict).
-/// [actionLabel] is the translated, user-facing action name.
-/// [existingBindings] is the current bindings list (used for conflict detection).
-/// [actionLabelLookup] resolves an actionId to its translated label, used in
-/// the conflict warning.
-Future<RecordingResult?> showRecordingDialog({
-  required BuildContext context,
-  required String actionId,
-  required String actionLabel,
-  required List<Map<String, dynamic>> existingBindings,
-  required String Function(String) actionLabelLookup,
-}) {
-  return showDialog<RecordingResult>(
-    context: context,
-    barrierDismissible: false,
-    builder: (ctx) => _RecordingDialog(
-      actionId: actionId,
-      actionLabel: actionLabel,
-      existingBindings: existingBindings,
-      actionLabelLookup: actionLabelLookup,
-    ),
-  );
-}
-
-class _RecordingDialog extends StatefulWidget {
-  final String actionId;
-  final String actionLabel;
-  final List<Map<String, dynamic>> existingBindings;
-  final String Function(String) actionLabelLookup;
-
-  const _RecordingDialog({
-    required this.actionId,
-    required this.actionLabel,
-    required this.existingBindings,
-    required this.actionLabelLookup,
-  });
-
-  @override
-  State<_RecordingDialog> createState() => _RecordingDialogState();
-}
-
-class _RecordingDialogState extends State<_RecordingDialog> {
-  final FocusNode _focusNode = FocusNode();
-
-  // Captured combo. null until the user presses something with a non-modifier.
-  Set<String> _mods = {};
-  String? _key;
-
-  // Human-readable label for the most recent press that we couldn't bind to
-  // (e.g. F13, media keys). null when the last press was either supported or
-  // a modifier-only press. Cleared whenever a supported key arrives, so a
-  // user who hits an unsupported key after a valid capture sees the warning
-  // until they press something else. Distinct from `_key == null` so the
-  // status line can tell the user *why* their press was ignored instead of
-  // silently doing nothing.
-  String? _unsupportedKey;
-
-  // Modifier LogicalKeyboardKeys we should *not* treat as "unsupported" when
-  // they fail to map to a key name. A modifier-only press is normal during
-  // combo capture (the user is building up their combo) — only non-modifier
-  // unmapped keys deserve the warning.
-  static final _modifierKeys = <LogicalKeyboardKey>{
-    LogicalKeyboardKey.shift,
-    LogicalKeyboardKey.shiftLeft,
-    LogicalKeyboardKey.shiftRight,
-    LogicalKeyboardKey.control,
-    LogicalKeyboardKey.controlLeft,
-    LogicalKeyboardKey.controlRight,
-    LogicalKeyboardKey.alt,
-    LogicalKeyboardKey.altLeft,
-    LogicalKeyboardKey.altRight,
-    LogicalKeyboardKey.meta,
-    LogicalKeyboardKey.metaLeft,
-    LogicalKeyboardKey.metaRight,
-    LogicalKeyboardKey.capsLock,
-    LogicalKeyboardKey.numLock,
-    LogicalKeyboardKey.scrollLock,
-    LogicalKeyboardKey.fn,
-    LogicalKeyboardKey.fnLock,
-  };
-
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      _focusNode.requestFocus();
-    });
-  }
-
-  @override
-  void dispose() {
-    _focusNode.dispose();
-    super.dispose();
-  }
-
-  bool get _isMac =>
-      defaultTargetPlatform == TargetPlatform.macOS ||
-      defaultTargetPlatform == TargetPlatform.iOS;
-
-  /// True when the captured combo includes at least one modifier. Lower bound
-  /// for any sensible binding — pure single-key bindings would swallow normal
-  /// typing the moment shortcuts are enabled. Beyond one mod the user is on
-  /// their own; the in-session pass-through toggle is the escape hatch when
-  /// a chosen combo collides with something needed on the remote.
-  bool get _hasRequiredPrefix => _mods.isNotEmpty;
-
-  /// Return the actionId that this combo currently conflicts with, or null.
-  /// The action being edited is not a conflict with itself.
-  String? get _conflictActionId {
-    if (_key == null || !_hasRequiredPrefix) return null;
-    for (final b in widget.existingBindings) {
-      final otherAction = b['action'] as String?;
-      if (otherAction == null || otherAction == widget.actionId) continue;
-      final otherKey = b['key'] as String?;
-      final otherMods = shortcutModSetFrom(b['mods']);
-      if (otherKey == _key &&
-          otherMods.length == _mods.length &&
-          otherMods.containsAll(_mods)) {
-        return otherAction;
-      }
-    }
-    return null;
-  }
-
-  KeyEventResult _onKeyEvent(FocusNode node, KeyEvent event) {
-    if (event is KeyDownEvent &&
-        event.logicalKey == LogicalKeyboardKey.escape) {
-      Navigator.of(context).pop();
-      return KeyEventResult.handled;
-    }
-    if (event is! KeyDownEvent) return KeyEventResult.handled;
-
-    // Ignore modifier-only KeyDowns: don't lock in a partial combo.
-    final logical = event.logicalKey;
-    final keyName = logicalKeyName(logical);
-
-    // Mirror of `normalize_modifiers` in src/keyboard/shortcuts.rs:
-    //   * macOS: Cmd → primary, Ctrl → ctrl (distinct).
-    //   * Win/Linux: Ctrl → primary, no separate Ctrl modifier.
-    // The two halves must agree on labels, otherwise saved bindings will not
-    // match the events the matcher sees at runtime.
-    final mods = <String>{};
-    if (HardwareKeyboard.instance.isAltPressed) mods.add('alt');
-    if (HardwareKeyboard.instance.isShiftPressed) mods.add('shift');
-    if (_isMac) {
-      if (HardwareKeyboard.instance.isMetaPressed) mods.add('primary');
-      if (HardwareKeyboard.instance.isControlPressed) mods.add('ctrl');
-    } else {
-      if (HardwareKeyboard.instance.isControlPressed) mods.add('primary');
-    }
-
-    setState(() {
-      _mods = mods;
-      // Only lock in the key when it's a non-modifier we recognize.
-      // Modifier-only KeyDowns (Shift, Ctrl, etc.) leave the captured key
-      // untouched, so the user can adjust modifiers after the fact.
-      if (keyName != null) {
-        _key = keyName;
-        _unsupportedKey = null;
-      } else if (!_modifierKeys.contains(logical)) {
-        // Non-modifier key we don't recognize (e.g. F13, media keys, IME
-        // compose keys). Surface a warning instead of silently dropping the
-        // press — the dialog otherwise looks unresponsive.
-        final label = logical.keyLabel.isNotEmpty
-            ? logical.keyLabel
-            : (logical.debugName ?? 'this key');
-        _unsupportedKey = label;
-      }
-    });
-    return KeyEventResult.handled;
-  }
-
-  void _onSave() {
-    if (_key == null || !_hasRequiredPrefix) return;
-    final ordered = canonicalShortcutModsForSave(_mods);
-    final binding = <String, dynamic>{
-      'action': widget.actionId,
-      'mods': ordered,
-      'key': _key!,
-    };
-    Navigator.of(context).pop(RecordingResult(binding, _conflictActionId));
-  }
-
-  String _formatPrefix() {
-    // Used in the "must include..." validation row; lists the modifier set
-    // a binding can pick from. Localised modifier glyphs aren't used here so
-    // the names stay greppable for users searching for "Option" / "Cmd".
-    if (_isMac) return 'Cmd / Control / Option / Shift';
-    return 'Ctrl / Alt / Shift';
-  }
-
-  String _formatCombo() {
-    // Plain-text labels (see same rationale in display.dart::_keyDisplay).
-    final parts = <String>[];
-    for (final m in ['primary', 'ctrl', 'alt', 'shift']) {
-      if (!_mods.contains(m)) continue;
-      switch (m) {
-        case 'primary':
-          parts.add(_isMac ? 'Cmd' : 'Ctrl');
-          break;
-        case 'ctrl':
-          parts.add(_isMac ? 'Control' : 'Ctrl');
-          break;
-        case 'alt':
-          parts.add(_isMac ? 'Option' : 'Alt');
-          break;
-        case 'shift':
-          parts.add('Shift');
-          break;
-      }
-    }
-    if (_key != null) {
-      parts.add(_keyDisplay(_key!));
-    }
-    if (parts.isEmpty) return translate('shortcut-recording-press-keys-tip');
-    return parts.join('+');
-  }
-
-  String _keyDisplay(String key) {
-    switch (key) {
-      case 'delete':     return 'Del';
-      case 'backspace':  return 'Backspace';
-      case 'enter':      return 'Enter';
-      case 'tab':        return 'Tab';
-      case 'space':      return 'Space';
-      case 'arrow_left': return 'Left';
-      case 'arrow_right':return 'Right';
-      case 'arrow_up':   return 'Up';
-      case 'arrow_down': return 'Down';
-      case 'home':       return 'Home';
-      case 'end':        return 'End';
-      case 'page_up':    return 'PgUp';
-      case 'page_down':  return 'PgDn';
-      case 'insert':     return 'Ins';
-    }
-    if (key.startsWith('digit')) return key.substring(5);
-    return key.toUpperCase();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final hasKey = _key != null;
-    final conflictId = _conflictActionId;
-    final hasConflict = conflictId != null;
-    // The Save button still fires for the previously-captured combo even if
-    // the user just hit an unsupported key — the captured state is what gets
-    // saved, the warning is just feedback that the latest press was rejected.
-    final canSave = hasKey && _hasRequiredPrefix;
-
-    Widget statusLine;
-    if (_unsupportedKey != null) {
-      // Most recent press was unsupported. Take precedence over the
-      // captured-combo states so the user gets explicit feedback that their
-      // last keystroke was ignored, regardless of whether a previous combo
-      // is still captured.
-      statusLine = Row(
-        children: [
-          const Icon(Icons.close, size: 16, color: Colors.red),
-          const SizedBox(width: 6),
-          Flexible(
-            child: Text(
-              translate('shortcut-key-not-supported')
-                  .replaceAll('{}', _unsupportedKey!),
-              style: const TextStyle(color: Colors.red),
-            ),
-          ),
-        ],
-      );
-    } else if (!hasKey) {
-      statusLine = Text(
-        translate('shortcut-recording-press-keys-tip'),
-        style: TextStyle(color: Theme.of(context).hintColor),
-      );
-    } else if (!_hasRequiredPrefix) {
-      statusLine = Row(
-        children: [
-          Icon(Icons.close, size: 16, color: Colors.red),
-          const SizedBox(width: 6),
-          Flexible(
-            child: Text(
-              translate('shortcut-must-include-modifiers')
-                  .replaceAll('{}', _formatPrefix()),
-              style: const TextStyle(color: Colors.red),
-            ),
-          ),
-        ],
-      );
-    } else if (hasConflict) {
-      final otherLabel = widget.actionLabelLookup(conflictId);
-      statusLine = Row(
-        children: [
-          Icon(Icons.warning_amber_outlined,
-              size: 16, color: Colors.orange.shade700),
-          const SizedBox(width: 6),
-          Flexible(
-            child: Text(
-              '${translate('shortcut-already-bound-to')} "$otherLabel"',
-              style: TextStyle(color: Colors.orange.shade700),
-            ),
-          ),
-        ],
-      );
-    } else {
-      statusLine = Row(
-        children: [
-          const Icon(Icons.check, size: 16, color: Colors.green),
-          const SizedBox(width: 6),
-          Text(translate('Valid'), style: const TextStyle(color: Colors.green)),
-        ],
-      );
-    }
-
-    final saveLabel = hasConflict ? 'Replace' : 'Save';
-
-    return AlertDialog(
-      title: Text(
-        '${translate('Set Shortcut')}: ${widget.actionLabel}',
-      ),
-      content: Focus(
-        focusNode: _focusNode,
-        autofocus: true,
-        onKeyEvent: _onKeyEvent,
-        child: ConstrainedBox(
-          constraints: const BoxConstraints(minWidth: 380),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Text(translate('shortcut-recording-instruction')),
-              const SizedBox(height: 12),
-              Container(
-                width: double.infinity,
-                padding:
-                    const EdgeInsets.symmetric(vertical: 18, horizontal: 12),
-                decoration: BoxDecoration(
-                  border: Border.all(color: Theme.of(context).dividerColor),
-                  borderRadius: BorderRadius.circular(4),
-                ),
-                child: Text(
-                  _formatCombo(),
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                    fontSize: 18,
-                    fontWeight: FontWeight.w600,
-                    color: hasKey
-                        ? Theme.of(context).textTheme.titleLarge?.color
-                        : Theme.of(context).hintColor,
-                  ),
-                ),
-              ),
-              const SizedBox(height: 12),
-              statusLine,
-            ],
-          ),
-        ),
-      ),
-      actions: [
-        dialogButton('Cancel',
-            onPressed: () => Navigator.of(context).pop(), isOutline: true),
-        dialogButton(saveLabel, onPressed: canSave ? _onSave : null),
-      ],
-    );
-  }
-}

flutter/lib/common/widgets/keyboard_shortcuts/shortcut_actions.dart

@@ -1,292 +0,0 @@
-import 'shortcut_constants.dart';
-import 'shortcut_utils.dart';
-
-/// Marker for the union of [KeyboardShortcutActionEntry] /
-/// [KeyboardShortcutActionSubgroup] — anything a top-level
-/// [KeyboardShortcutActionGroup] can directly contain. Sealed so renderers
-/// and filters can `switch` on it without a default branch.
-sealed class KeyboardShortcutActionGroupChild {
-  const KeyboardShortcutActionGroupChild();
-}
-
-/// One configurable action — id + i18n key for its label.
-class KeyboardShortcutActionEntry extends KeyboardShortcutActionGroupChild {
-  final String id;
-  final String labelKey;
-  const KeyboardShortcutActionEntry(this.id, this.labelKey);
-}
-
-/// A nested subgroup (e.g. "View Mode" under "Display"). Renders with extra
-/// indent so its items are visually distinguished from the parent group's
-/// direct items.
-class KeyboardShortcutActionSubgroup extends KeyboardShortcutActionGroupChild {
-  final String titleKey;
-  final List<KeyboardShortcutActionEntry> entries;
-  const KeyboardShortcutActionSubgroup(this.titleKey, this.entries);
-}
-
-/// A top-level group ("Display", "Keyboard", "Chat", …). `children` is an
-/// *ordered* mix of direct entries and subgroups, so layouts like
-/// "subgroups first → direct items → trailing subgroup" — exactly the
-/// shape `_DisplayMenu` uses (Privacy mode lives after the cursor / display
-/// toggles direct items) — are first-class instead of needing a wrapper
-/// "Display Settings" subgroup just to insert the items.
-class KeyboardShortcutActionGroup {
-  final String titleKey;
-  final List<KeyboardShortcutActionGroupChild> children;
-  const KeyboardShortcutActionGroup(this.titleKey, this.children);
-}
-
-/// Canonical action group definitions used by both the desktop and mobile
-/// configuration pages. The order of groups, subgroups, and entries here
-/// is the order the user sees in the UI, and mirrors the corresponding
-/// toolbar submenu (`_DisplayMenu` / `_KeyboardMenu` in
-/// `desktop/widgets/remote_toolbar.dart`) child order — modulo entries
-/// without shortcut counterparts (e.g. `_screenAdjustor.adjustWindow`,
-/// `scrollStyle`, `_ResolutionsMenu`, `localKeyboardType`).
-final List<KeyboardShortcutActionGroup> kKeyboardShortcutActionGroups = [
-  KeyboardShortcutActionGroup('Monitor', [
-    KeyboardShortcutActionEntry(
-        kShortcutActionSwitchDisplayNext, 'Switch to next display'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionSwitchDisplayPrev, 'Switch to previous display'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionSwitchDisplayAll, 'All monitors'),
-  ]),
-  KeyboardShortcutActionGroup('Control Actions', [
-    KeyboardShortcutActionEntry(
-        kShortcutActionSendClipboardKeystrokes, 'Send clipboard keystrokes'),
-    KeyboardShortcutActionEntry(kShortcutActionResetCanvas, 'Reset canvas'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionSendCtrlAltDel, 'Insert Ctrl + Alt + Del'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionRestartRemote, 'Restart remote device'),
-    KeyboardShortcutActionEntry(kShortcutActionInsertLock, 'Insert Lock'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleBlockInput, 'Block user input'),
-    KeyboardShortcutActionEntry(kShortcutActionSwitchSides, 'Switch Sides'),
-    KeyboardShortcutActionEntry(kShortcutActionRefresh, 'Refresh'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleRecording, 'Toggle session recording'),
-    KeyboardShortcutActionEntry(kShortcutActionScreenshot, 'Take screenshot'),
-  ]),
-  // Display: subgroups (View Mode → Image Quality → Codec → Virtual display)
-  // first, then the direct items (cursor toggles + display toggles), then
-  // Privacy mode subgroup last — matching `_DisplayMenu.menuChildrenGetter`
-  // exactly. Rebalancing this order should also rebalance the toolbar.
-  KeyboardShortcutActionGroup('Display', [
-    KeyboardShortcutActionSubgroup('View Mode', [
-      KeyboardShortcutActionEntry(
-          kShortcutActionViewModeOriginal, 'Scale original'),
-      KeyboardShortcutActionEntry(
-          kShortcutActionViewModeAdaptive, 'Scale adaptive'),
-      KeyboardShortcutActionEntry(
-          kShortcutActionViewModeCustom, 'Scale custom'),
-    ]),
-    KeyboardShortcutActionSubgroup('Image Quality', [
-      KeyboardShortcutActionEntry(
-          kShortcutActionImageQualityBest, 'Good image quality'),
-      KeyboardShortcutActionEntry(
-          kShortcutActionImageQualityBalanced, 'Balanced'),
-      KeyboardShortcutActionEntry(
-          kShortcutActionImageQualityLow, 'Optimize reaction time'),
-    ]),
-    KeyboardShortcutActionSubgroup('Codec', [
-      KeyboardShortcutActionEntry(kShortcutActionCodecAuto, 'Auto'),
-      KeyboardShortcutActionEntry(kShortcutActionCodecVp8, 'VP8'),
-      KeyboardShortcutActionEntry(kShortcutActionCodecVp9, 'VP9'),
-      KeyboardShortcutActionEntry(kShortcutActionCodecAv1, 'AV1'),
-      KeyboardShortcutActionEntry(kShortcutActionCodecH264, 'H264'),
-      KeyboardShortcutActionEntry(kShortcutActionCodecH265, 'H265'),
-    ]),
-    KeyboardShortcutActionSubgroup('Virtual display', [
-      KeyboardShortcutActionEntry(
-          kShortcutActionPlugOutAllVirtualDisplays, 'Plug out all'),
-    ]),
-    // Direct items: cursorToggles + display toggles, in toolbar order.
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleShowRemoteCursor, 'Show remote cursor'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleFollowRemoteCursor, 'Follow remote cursor'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleFollowRemoteWindow, 'Follow remote window focus'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleZoomCursor, 'Zoom cursor'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleQualityMonitor, 'Show quality monitor'),
-    KeyboardShortcutActionEntry(kShortcutActionToggleMute, 'Mute'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleEnableFileCopyPaste, 'Enable file copy and paste'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleDisableClipboard, 'Disable clipboard'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleLockAfterSessionEnd, 'Lock after session end'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleTrueColor, 'True color (4:4:4)'),
-    // Privacy mode at the bottom — mirrors `_DisplayMenu` where it's the
-    // last submenu added (line ~1023 of remote_toolbar.dart, after toggles).
-    KeyboardShortcutActionSubgroup('Privacy mode', [
-      // Reuse toolbar's existing impl-name i18n keys. The handler at
-      // runtime matches `privacy_mode_impl_mag_tip` /
-      // `privacy_mode_impl_virtual_display_tip` against the peer's
-      // advertised impls — same logic the toolbar's `toolbarPrivacyMode`
-      // submenu uses.
-      KeyboardShortcutActionEntry(
-          kShortcutActionPrivacyMode1, 'privacy_mode_impl_mag_tip'),
-      KeyboardShortcutActionEntry(
-          kShortcutActionPrivacyMode2, 'privacy_mode_impl_virtual_display_tip'),
-    ]),
-  ]),
-  // Keyboard: Keyboard mode subgroup first, then direct items
-  // (inputSource → viewMode → showMyCursor → toolbarKeyboardToggles),
-  // matching `_KeyboardMenu.menuChildrenGetter`.
-  KeyboardShortcutActionGroup('Keyboard', [
-    KeyboardShortcutActionSubgroup('Keyboard mode', [
-      KeyboardShortcutActionEntry(
-          kShortcutActionKeyboardModeLegacy, 'Legacy mode'),
-      KeyboardShortcutActionEntry(kShortcutActionKeyboardModeMap, 'Map mode'),
-      KeyboardShortcutActionEntry(
-          kShortcutActionKeyboardModeTranslate, 'Translate mode'),
-    ]),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleInputSource, 'Toggle input source'),
-    KeyboardShortcutActionEntry(kShortcutActionToggleViewOnly, 'View Mode'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleShowMyCursor, 'Show my cursor'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleSwapCtrlCmd, 'Swap control-command key'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleRelativeMouseMode, 'Relative mouse mode'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleReverseMouseWheel, 'Reverse mouse wheel'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleSwapLeftRightMouse, 'swap-left-right-mouse'),
-  ]),
-  KeyboardShortcutActionGroup('Chat', [
-    KeyboardShortcutActionEntry(kShortcutActionToggleChat, 'Text chat'),
-    KeyboardShortcutActionEntry(kShortcutActionToggleVoiceCall, 'Voice call'),
-  ]),
-  // "Other" collects single-icon toolbar buttons that have no dropdown
-  // (Pin, Close), plus actions with no toolbar entry at all (Fullscreen —
-  // driven by callback, not menu; Toggle Toolbar / tab navigation — tab
-  // right-click menu, not toolbar). Combined into one group rather than
-  // several 1-item groups for cleaner visual hierarchy.
-  KeyboardShortcutActionGroup('Other', [
-    KeyboardShortcutActionEntry(kShortcutActionPinToolbar, 'Pin Toolbar'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleFullscreen, 'Toggle fullscreen'),
-    KeyboardShortcutActionEntry(kShortcutActionToggleToolbar, 'Toggle toolbar'),
-    KeyboardShortcutActionEntry(kShortcutActionCloseTab, 'Close tab'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionSwitchTabNext, 'Switch to next tab'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionSwitchTabPrev, 'Switch to previous tab'),
-  ]),
-];
-
-/// Walk the (filtered or unfiltered) group tree and yield every
-/// [KeyboardShortcutActionEntry], regardless of whether it sits as a direct
-/// child of a top-level group or inside a subgroup. Useful for label
-/// lookups, ghost-action tests, and any consumer that just wants the flat
-/// list of action ids.
-Iterable<KeyboardShortcutActionEntry> allActionEntries(
-  Iterable<KeyboardShortcutActionGroup> groups,
-) sync* {
-  for (final group in groups) {
-    for (final child in group.children) {
-      switch (child) {
-        case KeyboardShortcutActionEntry():
-          yield child;
-        case KeyboardShortcutActionSubgroup():
-          yield* child.entries;
-      }
-    }
-  }
-}
-
-/// Return [kKeyboardShortcutActionGroups] with actions that aren't supported
-/// on the current platform stripped out. Subgroups whose every entry was
-/// filtered are dropped; top-level groups whose every child (direct entry
-/// or subgroup) was dropped are themselves dropped.
-///
-/// Mirrors the capability flags used by [filterDefaultBindingsForPlatform]
-/// so the configuration UI shows only what the matcher can actually
-/// dispatch on this platform.
-///
-/// Note: callers should still walk the unfiltered
-/// [kKeyboardShortcutActionGroups] for label lookups (e.g. conflict
-/// warnings about a stale cross-platform binding), so an action bound on
-/// desktop and carried over to mobile still has a human-readable name in
-/// dialogs.
-List<KeyboardShortcutActionGroup> filterKeyboardShortcutActionGroupsForPlatform(
-  ShortcutPlatformCapabilities cap,
-) {
-  bool allowed(String id) {
-    if (!cap.includeFullscreenShortcut &&
-        id == kShortcutActionToggleFullscreen) {
-      return false;
-    }
-    if (!cap.includeScreenshotShortcut && id == kShortcutActionScreenshot) {
-      return false;
-    }
-    if (!cap.includeScreenshotShortcut &&
-        id == kShortcutActionToggleRelativeMouseMode) {
-      return false;
-    }
-    if (!cap.includeTabShortcuts && isSwitchTabShortcutAction(id)) return false;
-    if (!cap.includeToolbarShortcut && id == kShortcutActionToggleToolbar) {
-      return false;
-    }
-    if (!cap.includeCloseTabShortcut && id == kShortcutActionCloseTab) {
-      return false;
-    }
-    if (!cap.includeSwitchSidesShortcut && id == kShortcutActionSwitchSides) {
-      return false;
-    }
-    if (!cap.includeRecordingShortcut && id == kShortcutActionToggleRecording) {
-      return false;
-    }
-    if (!cap.includeResetCanvasShortcut && id == kShortcutActionResetCanvas) {
-      return false;
-    }
-    if (!cap.includePinToolbarShortcut && id == kShortcutActionPinToolbar) {
-      return false;
-    }
-    if (!cap.includeViewModeShortcut &&
-        (id == kShortcutActionViewModeOriginal ||
-            id == kShortcutActionViewModeAdaptive ||
-            id == kShortcutActionViewModeCustom)) {
-      return false;
-    }
-    if (!cap.includeInputSourceShortcut &&
-        id == kShortcutActionToggleInputSource) {
-      return false;
-    }
-    if (!cap.includeVoiceCallShortcut && id == kShortcutActionToggleVoiceCall) {
-      return false;
-    }
-    return true;
-  }
-
-  final out = <KeyboardShortcutActionGroup>[];
-  for (final group in kKeyboardShortcutActionGroups) {
-    final filteredChildren = <KeyboardShortcutActionGroupChild>[];
-    for (final child in group.children) {
-      switch (child) {
-        case KeyboardShortcutActionEntry():
-          if (allowed(child.id)) filteredChildren.add(child);
-        case KeyboardShortcutActionSubgroup():
-          final entries =
-              child.entries.where((e) => allowed(e.id)).toList();
-          if (entries.isNotEmpty) {
-            filteredChildren.add(
-                KeyboardShortcutActionSubgroup(child.titleKey, entries));
-          }
-      }
-    }
-    if (filteredChildren.isNotEmpty) {
-      out.add(KeyboardShortcutActionGroup(group.titleKey, filteredChildren));
-    }
-  }
-  return out;
-}

flutter/lib/common/widgets/keyboard_shortcuts/shortcut_constants.dart

@@ -1,104 +0,0 @@
-/// Keyboard shortcut action IDs - must match
-/// src/keyboard/shortcuts.rs::action_id.
-const kShortcutActionSendCtrlAltDel = 'send_ctrl_alt_del';
-const kShortcutActionToggleFullscreen = 'toggle_fullscreen';
-const kShortcutActionSwitchDisplayNext = 'switch_display_next';
-const kShortcutActionSwitchDisplayPrev = 'switch_display_prev';
-const kShortcutActionSwitchDisplayAll = 'switch_display_all';
-const kShortcutActionScreenshot = 'screenshot';
-const kShortcutActionInsertLock = 'insert_lock';
-const kShortcutActionRefresh = 'refresh';
-const kShortcutActionToggleBlockInput = 'toggle_block_input';
-const kShortcutActionToggleRecording = 'toggle_recording';
-const kShortcutActionSwitchSides = 'switch_sides';
-const kShortcutActionCloseTab = 'close_tab';
-const kShortcutActionToggleToolbar = 'toggle_toolbar';
-const kShortcutActionRestartRemote = 'restart_remote';
-const kShortcutActionResetCanvas = 'reset_canvas';
-const kShortcutActionSwitchTabNext = 'switch_tab_next';
-const kShortcutActionSwitchTabPrev = 'switch_tab_prev';
-const kShortcutActionToggleMute = 'toggle_mute';
-const kShortcutActionPinToolbar = 'pin_toolbar';
-const kShortcutActionViewModeOriginal = 'view_mode_original';
-const kShortcutActionViewModeAdaptive = 'view_mode_adaptive';
-const kShortcutActionToggleChat = 'toggle_chat';
-const kShortcutActionToggleQualityMonitor = 'toggle_quality_monitor';
-const kShortcutActionToggleShowRemoteCursor = 'toggle_show_remote_cursor';
-const kShortcutActionToggleShowMyCursor = 'toggle_show_my_cursor';
-const kShortcutActionToggleDisableClipboard = 'toggle_disable_clipboard';
-const kShortcutActionPrivacyMode1 = 'privacy_mode_1';
-const kShortcutActionPrivacyMode2 = 'privacy_mode_2';
-// Keyboard mode (Map / Translate / Legacy).
-const kShortcutActionKeyboardModeMap = 'keyboard_mode_map';
-const kShortcutActionKeyboardModeTranslate = 'keyboard_mode_translate';
-const kShortcutActionKeyboardModeLegacy = 'keyboard_mode_legacy';
-// Codec preference (Auto + the four optional codecs the toolbar surfaces).
-const kShortcutActionCodecAuto = 'codec_auto';
-const kShortcutActionCodecVp8 = 'codec_vp8';
-const kShortcutActionCodecVp9 = 'codec_vp9';
-const kShortcutActionCodecAv1 = 'codec_av1';
-const kShortcutActionCodecH264 = 'codec_h264';
-const kShortcutActionCodecH265 = 'codec_h265';
-// Plug out every virtual display in one shot — toolbar exposes this in
-// both IDD modes (RustDesk and Amyuni). Per-index virtual-display toggles
-// (RustDesk IDD's 4 checkboxes) and the +/- count buttons (Amyuni-only)
-// are NOT exposed as shortcuts: per-index is too granular, and +/- has
-// no toolbar counterpart on RustDesk IDD peers.
-const kShortcutActionPlugOutAllVirtualDisplays =
-    'plug_out_all_virtual_displays';
-const kShortcutActionToggleRelativeMouseMode = 'toggle_relative_mouse_mode';
-const kShortcutActionToggleFollowRemoteCursor = 'toggle_follow_remote_cursor';
-const kShortcutActionToggleFollowRemoteWindow = 'toggle_follow_remote_window';
-const kShortcutActionToggleZoomCursor = 'toggle_zoom_cursor';
-const kShortcutActionToggleReverseMouseWheel = 'toggle_reverse_mouse_wheel';
-const kShortcutActionToggleSwapLeftRightMouse = 'toggle_swap_left_right_mouse';
-const kShortcutActionToggleLockAfterSessionEnd = 'toggle_lock_after_session_end';
-const kShortcutActionToggleTrueColor = 'toggle_true_color';
-const kShortcutActionToggleSwapCtrlCmd = 'toggle_swap_ctrl_cmd';
-const kShortcutActionToggleEnableFileCopyPaste = 'toggle_enable_file_copy_paste';
-const kShortcutActionViewModeCustom = 'view_mode_custom';
-const kShortcutActionImageQualityBest = 'image_quality_best';
-const kShortcutActionImageQualityBalanced = 'image_quality_balanced';
-const kShortcutActionImageQualityLow = 'image_quality_low';
-const kShortcutActionSendClipboardKeystrokes = 'send_clipboard_keystrokes';
-const kShortcutActionToggleInputSource = 'toggle_input_source';
-const kShortcutActionToggleVoiceCall = 'toggle_voice_call';
-const kShortcutActionToggleViewOnly = 'toggle_view_only';
-
-const kShortcutLocalConfigKey = 'keyboard-shortcuts';
-const kShortcutEventName = 'shortcut_triggered';
-
-/// Canonical default keyboard-shortcut bindings, mirroring Rust's
-/// `default_bindings()` in `src/keyboard/shortcuts.rs`. Used by:
-///   * the Web bridge (`flutter/lib/web/bridge.dart::mainGetDefaultKeyboardShortcuts`)
-///     — Web has no Rust at runtime, so the seed list is read from this Dart
-///     constant instead of going through FFI.
-///   * the configuration page when seeding defaults on first enable, after
-///     [filterDefaultBindingsForPlatform] has trimmed platform-specific
-///     entries.
-///
-/// Parity with Rust is unit-tested on both sides against
-/// `flutter/test/fixtures/default_keyboard_shortcuts.json` — see the
-/// `kDefaultShortcutBindings matches fixture` test in
-/// `flutter/test/keyboard_shortcuts_test.dart` and
-/// `default_bindings_match_fixture_json` in `src/keyboard/shortcuts.rs`.
-/// Any change here MUST also update the fixture and the Rust source, or CI
-/// will fail in the side that drifted.
-final List<Map<String, Object>> kDefaultShortcutBindings = [
-  for (final entry in <List<Object>>[
-    [kShortcutActionSendCtrlAltDel,         'delete'],
-    [kShortcutActionToggleFullscreen,       'enter'],
-    [kShortcutActionSwitchDisplayNext,      'arrow_right'],
-    [kShortcutActionSwitchDisplayPrev,      'arrow_left'],
-    [kShortcutActionScreenshot,             'p'],
-    [kShortcutActionToggleShowRemoteCursor, 'm'],
-    [kShortcutActionToggleMute,             's'],
-    [kShortcutActionToggleBlockInput,       'i'],
-    [kShortcutActionToggleChat,             'c'],
-  ])
-    {
-      'action': entry[0],
-      'mods': const ['primary', 'alt', 'shift'],
-      'key': entry[1],
-    },
-];

flutter/lib/common/widgets/keyboard_shortcuts/shortcut_utils.dart

@@ -1,226 +0,0 @@
-import 'package:flutter/services.dart';
-
-import 'shortcut_constants.dart';
-
-List<String> canonicalShortcutModsForSave(Set<String> mods) {
-  return <String>[
-    if (mods.contains('primary')) 'primary',
-    if (mods.contains('ctrl')) 'ctrl',
-    if (mods.contains('alt')) 'alt',
-    if (mods.contains('shift')) 'shift',
-  ];
-}
-
-List<Map<String, dynamic>> shortcutBindingMapsFrom(dynamic rawBindings) {
-  if (rawBindings is! Iterable) return <Map<String, dynamic>>[];
-  final bindings = <Map<String, dynamic>>[];
-  for (final raw in rawBindings) {
-    if (raw is! Map) continue;
-    final binding = <String, dynamic>{};
-    for (final entry in raw.entries) {
-      final key = entry.key;
-      if (key is String) {
-        binding[key] = entry.value;
-      }
-    }
-    if (binding.isNotEmpty) {
-      bindings.add(binding);
-    }
-  }
-  return bindings;
-}
-
-Set<String> shortcutModSetFrom(dynamic rawMods) {
-  if (rawMods is! Iterable) return <String>{};
-  return rawMods.whereType<String>().toSet();
-}
-
-bool isSwitchTabShortcutAction(String? actionId) {
-  return actionId == kShortcutActionSwitchTabNext ||
-      actionId == kShortcutActionSwitchTabPrev;
-}
-
-/// Map a [LogicalKeyboardKey] to the canonical key name used in saved
-/// bindings, or `null` for keys we don't accept as shortcuts.
-///
-/// Mirror of `event_to_key_name` in `src/keyboard/shortcuts.rs` and
-/// `logicalToKeyName` in `flutter/web/js/src/shortcut_matcher.ts` — keep
-/// the three in lockstep. Cross-language parity is enforced by:
-///   * `flutter/test/fixtures/supported_shortcut_keys.json` — the
-///     authoritative list of names this function must produce.
-///   * Dart `supported keys` test in `keyboard_shortcuts_test.dart` —
-///     asserts the (LogicalKeyboardKey → name) mapping covers the fixture.
-///   * Rust `supported_keys_match_fixture` test in `shortcuts.rs` — the
-///     Rust-side mirror against the same fixture.
-/// A drift in any of the three breaks one of the two tests.
-String? logicalKeyName(LogicalKeyboardKey k) {
-  // Singletons that map 1:1.
-  if (k == LogicalKeyboardKey.delete) return 'delete';
-  if (k == LogicalKeyboardKey.backspace) return 'backspace';
-  // Numpad Enter shares the "enter" name with the main Return key — matches
-  // the Rust matcher (`Return | KpReturn` → "enter") and matches user
-  // expectation that the two physical Enters are interchangeable.
-  if (k == LogicalKeyboardKey.enter || k == LogicalKeyboardKey.numpadEnter) {
-    return 'enter';
-  }
-  if (k == LogicalKeyboardKey.tab) return 'tab';
-  if (k == LogicalKeyboardKey.space) return 'space';
-  if (k == LogicalKeyboardKey.arrowLeft) return 'arrow_left';
-  if (k == LogicalKeyboardKey.arrowRight) return 'arrow_right';
-  if (k == LogicalKeyboardKey.arrowUp) return 'arrow_up';
-  if (k == LogicalKeyboardKey.arrowDown) return 'arrow_down';
-  if (k == LogicalKeyboardKey.home) return 'home';
-  if (k == LogicalKeyboardKey.end) return 'end';
-  if (k == LogicalKeyboardKey.pageUp) return 'page_up';
-  if (k == LogicalKeyboardKey.pageDown) return 'page_down';
-  if (k == LogicalKeyboardKey.insert) return 'insert';
-
-  // Letter / digit / F-key tables. `LogicalKeyboardKey` constants are
-  // `static final` (not `const`), so the maps can't be `const` — but they
-  // initialize once per process and the lookup is O(1).
-  final letters = <LogicalKeyboardKey, String>{
-    LogicalKeyboardKey.keyA: 'a', LogicalKeyboardKey.keyB: 'b',
-    LogicalKeyboardKey.keyC: 'c', LogicalKeyboardKey.keyD: 'd',
-    LogicalKeyboardKey.keyE: 'e', LogicalKeyboardKey.keyF: 'f',
-    LogicalKeyboardKey.keyG: 'g', LogicalKeyboardKey.keyH: 'h',
-    LogicalKeyboardKey.keyI: 'i', LogicalKeyboardKey.keyJ: 'j',
-    LogicalKeyboardKey.keyK: 'k', LogicalKeyboardKey.keyL: 'l',
-    LogicalKeyboardKey.keyM: 'm', LogicalKeyboardKey.keyN: 'n',
-    LogicalKeyboardKey.keyO: 'o', LogicalKeyboardKey.keyP: 'p',
-    LogicalKeyboardKey.keyQ: 'q', LogicalKeyboardKey.keyR: 'r',
-    LogicalKeyboardKey.keyS: 's', LogicalKeyboardKey.keyT: 't',
-    LogicalKeyboardKey.keyU: 'u', LogicalKeyboardKey.keyV: 'v',
-    LogicalKeyboardKey.keyW: 'w', LogicalKeyboardKey.keyX: 'x',
-    LogicalKeyboardKey.keyY: 'y', LogicalKeyboardKey.keyZ: 'z',
-  };
-  final letter = letters[k];
-  if (letter != null) return letter;
-
-  final digits = <LogicalKeyboardKey, String>{
-    LogicalKeyboardKey.digit0: 'digit0',
-    LogicalKeyboardKey.digit1: 'digit1',
-    LogicalKeyboardKey.digit2: 'digit2',
-    LogicalKeyboardKey.digit3: 'digit3',
-    LogicalKeyboardKey.digit4: 'digit4',
-    LogicalKeyboardKey.digit5: 'digit5',
-    LogicalKeyboardKey.digit6: 'digit6',
-    LogicalKeyboardKey.digit7: 'digit7',
-    LogicalKeyboardKey.digit8: 'digit8',
-    LogicalKeyboardKey.digit9: 'digit9',
-  };
-  final digit = digits[k];
-  if (digit != null) return digit;
-
-  final fkeys = <LogicalKeyboardKey, String>{
-    LogicalKeyboardKey.f1: 'f1', LogicalKeyboardKey.f2: 'f2',
-    LogicalKeyboardKey.f3: 'f3', LogicalKeyboardKey.f4: 'f4',
-    LogicalKeyboardKey.f5: 'f5', LogicalKeyboardKey.f6: 'f6',
-    LogicalKeyboardKey.f7: 'f7', LogicalKeyboardKey.f8: 'f8',
-    LogicalKeyboardKey.f9: 'f9', LogicalKeyboardKey.f10: 'f10',
-    LogicalKeyboardKey.f11: 'f11', LogicalKeyboardKey.f12: 'f12',
-  };
-  return fkeys[k];
-}
-
-/// Bundle of "is this shortcut available on the current platform" flags.
-///
-/// Production code reaches a single source of truth via
-/// [ShortcutModel.currentPlatformCapabilities] (which encodes the per-runtime
-/// rules in one place); tests construct one directly with whichever flags
-/// they want to exercise. Two filter functions consume this:
-/// [filterDefaultBindingsForPlatform] (for trimming default-binding JSON
-/// before it hits LocalConfig) and [filterKeyboardShortcutActionGroupsForPlatform]
-/// (for trimming the configuration UI's action list). Both must agree on the
-/// same capability set, otherwise a default binding could be seeded for an
-/// action the user has no UI to manage.
-class ShortcutPlatformCapabilities {
-  final bool includeFullscreenShortcut;
-  final bool includeScreenshotShortcut;
-  final bool includeTabShortcuts;
-  final bool includeToolbarShortcut;
-  final bool includeCloseTabShortcut;
-  final bool includeSwitchSidesShortcut;
-  final bool includeRecordingShortcut;
-  final bool includeResetCanvasShortcut;
-  final bool includePinToolbarShortcut;
-  final bool includeViewModeShortcut;
-  final bool includeInputSourceShortcut;
-  final bool includeVoiceCallShortcut;
-
-  const ShortcutPlatformCapabilities({
-    required this.includeFullscreenShortcut,
-    required this.includeScreenshotShortcut,
-    required this.includeTabShortcuts,
-    required this.includeToolbarShortcut,
-    required this.includeCloseTabShortcut,
-    required this.includeSwitchSidesShortcut,
-    required this.includeRecordingShortcut,
-    required this.includeResetCanvasShortcut,
-    required this.includePinToolbarShortcut,
-    required this.includeViewModeShortcut,
-    required this.includeInputSourceShortcut,
-    required this.includeVoiceCallShortcut,
-  });
-}
-
-List<Map<String, dynamic>> filterDefaultBindingsForPlatform(
-  Iterable<dynamic> bindings,
-  ShortcutPlatformCapabilities cap,
-) {
-  final filtered = <Map<String, dynamic>>[];
-  for (final binding in shortcutBindingMapsFrom(bindings)) {
-    final action = binding['action'] as String?;
-    if (!cap.includeFullscreenShortcut &&
-        action == kShortcutActionToggleFullscreen) {
-      continue;
-    }
-    if (!cap.includeScreenshotShortcut && action == kShortcutActionScreenshot) {
-      continue;
-    }
-    if (!cap.includeScreenshotShortcut &&
-        action == kShortcutActionToggleRelativeMouseMode) {
-      continue;
-    }
-    if (!cap.includeTabShortcuts && isSwitchTabShortcutAction(action)) {
-      continue;
-    }
-    if (!cap.includeToolbarShortcut &&
-        action == kShortcutActionToggleToolbar) {
-      continue;
-    }
-    if (!cap.includeCloseTabShortcut && action == kShortcutActionCloseTab) {
-      continue;
-    }
-    if (!cap.includeSwitchSidesShortcut &&
-        action == kShortcutActionSwitchSides) {
-      continue;
-    }
-    if (!cap.includeRecordingShortcut &&
-        action == kShortcutActionToggleRecording) {
-      continue;
-    }
-    if (!cap.includeResetCanvasShortcut &&
-        action == kShortcutActionResetCanvas) {
-      continue;
-    }
-    if (!cap.includePinToolbarShortcut && action == kShortcutActionPinToolbar) {
-      continue;
-    }
-    if (!cap.includeViewModeShortcut &&
-        (action == kShortcutActionViewModeOriginal ||
-            action == kShortcutActionViewModeAdaptive ||
-            action == kShortcutActionViewModeCustom)) {
-      continue;
-    }
-    if (!cap.includeInputSourceShortcut &&
-        action == kShortcutActionToggleInputSource) {
-      continue;
-    }
-    if (!cap.includeVoiceCallShortcut &&
-        action == kShortcutActionToggleVoiceCall) {
-      continue;
-    }
-    filtered.add(binding);
-  }
-  return filtered;
-}

flutter/lib/common/widgets/toolbar.dart

@@ -11,83 +11,27 @@ import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/widgets/remote_toolbar.dart';
 import 'package:flutter_hbb/models/model.dart';
 import 'package:flutter_hbb/models/platform_model.dart';
-import 'package:flutter_hbb/models/shortcut_model.dart';
 import 'package:flutter_hbb/utils/multi_window_manager.dart';
 import 'package:get/get.dart';
 
 bool isEditOsPassword = false;
 
-/// Action IDs that `toolbarControls` is the sole registrar for. Wiped on
-/// every call so stale closures don't outlive the menu entry that owned
-/// them. Actions registered by `registerSessionShortcutActions` MUST NOT
-/// appear here. `kShortcutActionToggleRecording` is platform-conditional
-/// and handled separately in the unregister pass below.
-const _kToolbarOwnedActionIds = <String>[
-  kShortcutActionSendCtrlAltDel,
-  kShortcutActionRestartRemote,
-  kShortcutActionInsertLock,
-  kShortcutActionToggleBlockInput,
-  kShortcutActionSwitchSides,
-  kShortcutActionRefresh,
-  kShortcutActionScreenshot,
-  kShortcutActionResetCanvas,
-  kShortcutActionSendClipboardKeystrokes,
-];
-
-const _kToolbarViewStyleActionIds = <String>[
-  kShortcutActionViewModeOriginal,
-  kShortcutActionViewModeAdaptive,
-  kShortcutActionViewModeCustom,
-];
-
-const _kToolbarImageQualityActionIds = <String>[
-  kShortcutActionImageQualityBest,
-  kShortcutActionImageQualityBalanced,
-  kShortcutActionImageQualityLow,
-];
-
-const _kToolbarCodecActionIds = <String>[
-  kShortcutActionCodecAuto,
-  kShortcutActionCodecVp8,
-  kShortcutActionCodecVp9,
-  kShortcutActionCodecAv1,
-  kShortcutActionCodecH264,
-  kShortcutActionCodecH265,
-];
-
-const _kToolbarCursorActionIds = <String>[
-  kShortcutActionToggleShowRemoteCursor,
-  kShortcutActionToggleFollowRemoteCursor,
-  kShortcutActionToggleFollowRemoteWindow,
-  kShortcutActionToggleZoomCursor,
-];
-
-const _kToolbarDisplayToggleActionIds = <String>[
-  kShortcutActionToggleQualityMonitor,
-  kShortcutActionToggleMute,
-  kShortcutActionToggleEnableFileCopyPaste,
-  kShortcutActionToggleDisableClipboard,
-  kShortcutActionToggleLockAfterSessionEnd,
-  kShortcutActionToggleTrueColor,
-];
-
-const _kToolbarKeyboardToggleActionIds = <String>[
-  kShortcutActionToggleSwapCtrlCmd,
-  kShortcutActionToggleSwapLeftRightMouse,
-];
+// macOS privacy mode blacks out all online displays, so switching the remote
+// display does not weaken the local privacy protection.
+bool allowDisplaySwitchInPrivacyMode(PeerInfo pi) {
+  return pi.platform == kPeerPlatformMacOS;
+}
 
 class TTextMenu {
   final Widget child;
   final VoidCallback? onPressed;
   Widget? trailingIcon;
   bool divider;
-  final String? actionId;
   TTextMenu(
       {required this.child,
       required this.onPressed,
       this.trailingIcon,
-      this.divider = false,
-      this.actionId});
+      this.divider = false});
 
   Widget getChild() {
     if (trailingIcon != null) {
@@ -109,73 +53,20 @@ class TRadioMenu<T> {
   final T value;
   final T groupValue;
   final ValueChanged<T?>? onChanged;
-  final String? actionId;
 
   TRadioMenu(
       {required this.child,
       required this.value,
       required this.groupValue,
-      required this.onChanged,
-      this.actionId});
+      required this.onChanged});
 }
 
 class TToggleMenu {
   final Widget child;
   final bool value;
   final ValueChanged<bool?>? onChanged;
-  final String? actionId;
   TToggleMenu(
-      {required this.child,
-      required this.value,
-      required this.onChanged,
-      this.actionId});
-}
-
-/// Register each tagged entry's `onChanged` with the session [ShortcutModel].
-/// Passthrough — returns [menus] so a caller can wrap `return [...]` directly.
-List<TToggleMenu> _registerToggleMenuShortcuts(
-  FFI ffi,
-  List<TToggleMenu> menus, {
-  List<String> ownedActionIds = const [],
-}) {
-  for (final actionId in ownedActionIds) {
-    ffi.shortcutModel.unregister(actionId);
-  }
-  for (final menu in menus) {
-    final actionId = menu.actionId;
-    if (actionId == null) continue;
-    final onChanged = menu.onChanged;
-    if (onChanged == null) {
-      ffi.shortcutModel.unregister(actionId);
-    } else {
-      final value = menu.value;
-      ffi.shortcutModel.register(actionId, () => onChanged(!value));
-    }
-  }
-  return menus;
-}
-
-/// Radio variant of [_registerToggleMenuShortcuts].
-List<TRadioMenu<T>> _registerRadioMenuShortcuts<T>(
-  FFI ffi,
-  List<TRadioMenu<T>> menus, {
-  List<String> ownedActionIds = const [],
-}) {
-  for (final actionId in ownedActionIds) {
-    ffi.shortcutModel.unregister(actionId);
-  }
-  for (final menu in menus) {
-    final actionId = menu.actionId;
-    if (actionId == null) continue;
-    final onChanged = menu.onChanged;
-    if (onChanged == null) {
-      ffi.shortcutModel.unregister(actionId);
-    } else {
-      final value = menu.value;
-      ffi.shortcutModel.register(actionId, () => onChanged(value));
-    }
-  }
-  return menus;
+      {required this.child, required this.value, required this.onChanged});
 }
 
 handleOsPasswordEditIcon(
@@ -209,17 +100,6 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
   final sessionId = ffi.sessionId;
   final isDefaultConn = ffi.connType == ConnType.defaultConn;
 
-  // Wipe stale registrations from previous menu builds before re-registering
-  // below; runs unconditionally so mid-session enable works without reconnect.
-  for (final actionId in _kToolbarOwnedActionIds) {
-    ffi.shortcutModel.unregister(actionId);
-  }
-  // toggle_recording is mobile-only here; desktop's registration is owned by
-  // `registerSessionShortcutActions` and must not be touched.
-  if (!(isDesktop || isWeb)) {
-    ffi.shortcutModel.unregister(kShortcutActionToggleRecording);
-  }
-
   List<TTextMenu> v = [];
   // elevation
   if (isDefaultConn &&
@@ -273,15 +153,13 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
             bind.sessionInputString(
                 sessionId: sessionId, value: data.text ?? "");
           }
-        },
-        actionId: kShortcutActionSendClipboardKeystrokes));
+        }));
   }
   // reset canvas
   if (isDefaultConn && isMobile) {
     v.add(TTextMenu(
         child: Text(translate('Reset canvas')),
-        onPressed: () => ffi.cursorModel.reset(),
-        actionId: kShortcutActionResetCanvas));
+        onPressed: () => ffi.cursorModel.reset()));
   }
 
   // https://github.com/rustdesk/rustdesk/pull/9731
@@ -357,8 +235,7 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
     v.add(
       TTextMenu(
           child: Text('${translate("Insert Ctrl + Alt + Del")}'),
-          onPressed: () => bind.sessionCtrlAltDel(sessionId: sessionId),
-          actionId: kShortcutActionSendCtrlAltDel),
+          onPressed: () => bind.sessionCtrlAltDel(sessionId: sessionId)),
     );
   }
   // restart
@@ -371,8 +248,7 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
       TTextMenu(
           child: Text(translate('Restart remote device')),
           onPressed: () =>
-              showRestartRemoteDevice(pi, id, sessionId, ffi.dialogManager),
-          actionId: kShortcutActionRestartRemote),
+              showRestartRemoteDevice(pi, id, sessionId, ffi.dialogManager)),
     );
   }
   // insertLock
@@ -380,8 +256,7 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
     v.add(
       TTextMenu(
           child: Text(translate('Insert Lock')),
-          onPressed: () => bind.sessionLockScreen(sessionId: sessionId),
-          actionId: kShortcutActionInsertLock),
+          onPressed: () => bind.sessionLockScreen(sessionId: sessionId)),
     );
   }
   // blockUserInput
@@ -399,8 +274,7 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
               sessionId: sessionId,
               value: '${blockInput.value ? 'un' : ''}block-input');
           blockInput.value = !blockInput.value;
-        },
-        actionId: kShortcutActionToggleBlockInput));
+        }));
   }
   // switchSides
   if (isDefaultConn &&
@@ -412,15 +286,13 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
     v.add(TTextMenu(
         child: Text(translate('Switch Sides')),
         onPressed: () =>
-            showConfirmSwitchSidesDialog(sessionId, id, ffi.dialogManager),
-        actionId: kShortcutActionSwitchSides));
+            showConfirmSwitchSidesDialog(sessionId, id, ffi.dialogManager)));
   }
   // refresh
   if (pi.version.isNotEmpty) {
     v.add(TTextMenu(
       child: Text(translate('Refresh')),
       onPressed: () => sessionRefreshVideo(sessionId, pi),
-      actionId: kShortcutActionRefresh,
     ));
   }
   // record
@@ -442,8 +314,7 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
             )
           ],
         ),
-        onPressed: () => ffi.recordingModel.toggle(),
-        actionId: kShortcutActionToggleRecording));
+        onPressed: () => ffi.recordingModel.toggle()));
   }
 
   // to-do:
@@ -460,14 +331,6 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
         onPressed: ffi.ffiModel.timerScreenshot != null
             ? null
             : () {
-                // Live cooldown check: the menu rebuilds onPressed=null
-                // whenever toolbarControls runs and finds timerScreenshot
-                // != null, but the keyboard-shortcut callback holds onto
-                // the originally-enabled closure across cooldown periods
-                // (toolbarControls only re-runs on menu open). Without
-                // this guard the second shortcut press during the 30s
-                // cooldown still fires sessionTakeScreenshot.
-                if (ffi.ffiModel.timerScreenshot != null) return;
                 if (pi.currentDisplay == kAllDisplayValue) {
                   msgBox(
                       sessionId,
@@ -485,7 +348,6 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
                   });
                 }
               },
-        actionId: kShortcutActionScreenshot,
       ));
     }
   }
@@ -496,17 +358,6 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
       onPressed: () => onCopyFingerprint(FingerprintState.find(id).value),
     ));
   }
-  // Register tagged TTextMenu callbacks. The else-unregister is defense in
-  // depth for actionIds tagged but missing from `_kToolbarOwnedActionIds`.
-  for (final menu in v) {
-    final actionId = menu.actionId;
-    if (actionId == null) continue;
-    if (menu.onPressed != null) {
-      ffi.shortcutModel.register(actionId, menu.onPressed!);
-    } else {
-      ffi.shortcutModel.unregister(actionId);
-    }
-  }
   return v;
 }
 
@@ -521,26 +372,23 @@ Future<List<TRadioMenu<String>>> toolbarViewStyle(
         .then((_) => ffi.canvasModel.updateViewStyle());
   }
 
-  return _registerRadioMenuShortcuts(ffi, [
+  return [
     TRadioMenu<String>(
         child: Text(translate('Scale original')),
         value: kRemoteViewStyleOriginal,
         groupValue: groupValue,
-        onChanged: onChanged,
-        actionId: kShortcutActionViewModeOriginal),
+        onChanged: onChanged),
     TRadioMenu<String>(
         child: Text(translate('Scale adaptive')),
         value: kRemoteViewStyleAdaptive,
         groupValue: groupValue,
-        onChanged: onChanged,
-        actionId: kShortcutActionViewModeAdaptive),
+        onChanged: onChanged),
     TRadioMenu<String>(
         child: Text(translate('Scale custom')),
         value: kRemoteViewStyleCustom,
         groupValue: groupValue,
-        onChanged: onChanged,
-        actionId: kShortcutActionViewModeCustom)
-  ], ownedActionIds: _kToolbarViewStyleActionIds);
+        onChanged: onChanged)
+  ];
 }
 
 Future<List<TRadioMenu<String>>> toolbarImageQuality(
@@ -552,25 +400,22 @@ Future<List<TRadioMenu<String>>> toolbarImageQuality(
     await bind.sessionSetImageQuality(sessionId: ffi.sessionId, value: value);
   }
 
-  return _registerRadioMenuShortcuts(ffi, [
+  return [
     TRadioMenu<String>(
         child: Text(translate('Good image quality')),
         value: kRemoteImageQualityBest,
         groupValue: groupValue,
-        onChanged: onChanged,
-        actionId: kShortcutActionImageQualityBest),
+        onChanged: onChanged),
     TRadioMenu<String>(
         child: Text(translate('Balanced')),
         value: kRemoteImageQualityBalanced,
         groupValue: groupValue,
-        onChanged: onChanged,
-        actionId: kShortcutActionImageQualityBalanced),
+        onChanged: onChanged),
     TRadioMenu<String>(
         child: Text(translate('Optimize reaction time')),
         value: kRemoteImageQualityLow,
         groupValue: groupValue,
-        onChanged: onChanged,
-        actionId: kShortcutActionImageQualityLow),
+        onChanged: onChanged),
     TRadioMenu<String>(
       child: Text(translate('Custom')),
       value: kRemoteImageQualityCustom,
@@ -580,7 +425,7 @@ Future<List<TRadioMenu<String>>> toolbarImageQuality(
         customImageQualityDialog(ffi.sessionId, id, ffi);
       },
     ),
-  ], ownedActionIds: _kToolbarImageQualityActionIds);
+  ];
 }
 
 Future<List<TRadioMenu<String>>> toolbarCodec(
@@ -607,10 +452,7 @@ Future<List<TRadioMenu<String>>> toolbarCodec(
   }
   final visible =
       codecs.length == 4 && (codecs[0] || codecs[1] || codecs[2] || codecs[3]);
-  if (!visible) {
-    return _registerRadioMenuShortcuts<String>(ffi, [],
-        ownedActionIds: _kToolbarCodecActionIds);
-  }
+  if (!visible) return [];
   onChanged(String? value) async {
     if (value == null) return;
     await bind.sessionPeerOption(
@@ -618,14 +460,12 @@ Future<List<TRadioMenu<String>>> toolbarCodec(
     bind.sessionChangePreferCodec(sessionId: sessionId);
   }
 
-  TRadioMenu<String> radio(
-      String label, String value, bool enabled, String actionId) {
+  TRadioMenu<String> radio(String label, String value, bool enabled) {
     return TRadioMenu<String>(
         child: Text(label),
         value: value,
         groupValue: groupValue,
-        onChanged: enabled ? onChanged : null,
-        actionId: actionId);
+        onChanged: enabled ? onChanged : null);
   }
 
   var autoLabel = translate('Auto');
@@ -633,14 +473,14 @@ Future<List<TRadioMenu<String>>> toolbarCodec(
       ffi.qualityMonitorModel.data.codecFormat != null) {
     autoLabel = '$autoLabel (${ffi.qualityMonitorModel.data.codecFormat})';
   }
-  return _registerRadioMenuShortcuts(ffi, [
-    radio(autoLabel, 'auto', true, kShortcutActionCodecAuto),
-    if (codecs[0]) radio('VP8', 'vp8', codecs[0], kShortcutActionCodecVp8),
-    radio('VP9', 'vp9', true, kShortcutActionCodecVp9),
-    if (codecs[1]) radio('AV1', 'av1', codecs[1], kShortcutActionCodecAv1),
-    if (codecs[2]) radio('H264', 'h264', codecs[2], kShortcutActionCodecH264),
-    if (codecs[3]) radio('H265', 'h265', codecs[3], kShortcutActionCodecH265),
-  ], ownedActionIds: _kToolbarCodecActionIds);
+  return [
+    radio(autoLabel, 'auto', true),
+    if (codecs[0]) radio('VP8', 'vp8', codecs[0]),
+    radio('VP9', 'vp9', true),
+    if (codecs[1]) radio('AV1', 'av1', codecs[1]),
+    if (codecs[2]) radio('H264', 'h264', codecs[2]),
+    if (codecs[3]) radio('H265', 'h265', codecs[3]),
+  ];
 }
 
 Future<List<TToggleMenu>> toolbarCursor(
@@ -665,7 +505,6 @@ Future<List<TToggleMenu>> toolbarCursor(
     v.add(TToggleMenu(
         child: Text(translate('Show remote cursor')),
         value: state.value,
-        actionId: kShortcutActionToggleShowRemoteCursor,
         onChanged: enabled && !lockState.value
             ? (value) async {
                 if (value == null) return;
@@ -702,7 +541,6 @@ Future<List<TToggleMenu>> toolbarCursor(
     v.add(TToggleMenu(
         child: Text(translate('Follow remote cursor')),
         value: value,
-        actionId: kShortcutActionToggleFollowRemoteCursor,
         onChanged: (value) async {
           if (value == null) return;
           await bind.sessionToggleOption(sessionId: sessionId, value: option);
@@ -731,7 +569,6 @@ Future<List<TToggleMenu>> toolbarCursor(
     v.add(TToggleMenu(
         child: Text(translate('Follow remote window focus')),
         value: value,
-        actionId: kShortcutActionToggleFollowRemoteWindow,
         onChanged: (value) async {
           if (value == null) return;
           await bind.sessionToggleOption(sessionId: sessionId, value: option);
@@ -749,7 +586,6 @@ Future<List<TToggleMenu>> toolbarCursor(
     v.add(TToggleMenu(
       child: Text(translate('Zoom cursor')),
       value: peerState.value,
-      actionId: kShortcutActionToggleZoomCursor,
       onChanged: (value) async {
         if (value == null) return;
         await bind.sessionToggleOption(sessionId: sessionId, value: option);
@@ -758,8 +594,7 @@ Future<List<TToggleMenu>> toolbarCursor(
       },
     ));
   }
-  return _registerToggleMenuShortcuts(ffi, v,
-      ownedActionIds: _kToolbarCursorActionIds);
+  return v;
 }
 
 Future<List<TToggleMenu>> toolbarDisplayToggle(
@@ -775,7 +610,6 @@ Future<List<TToggleMenu>> toolbarDisplayToggle(
   final option = 'show-quality-monitor';
   v.add(TToggleMenu(
       value: bind.sessionGetToggleOptionSync(sessionId: sessionId, arg: option),
-      actionId: kShortcutActionToggleQualityMonitor,
       onChanged: (value) async {
         if (value == null) return;
         await bind.sessionToggleOption(sessionId: sessionId, value: option);
@@ -789,7 +623,6 @@ Future<List<TToggleMenu>> toolbarDisplayToggle(
         bind.sessionGetToggleOptionSync(sessionId: sessionId, arg: option);
     v.add(TToggleMenu(
         value: value,
-        actionId: kShortcutActionToggleMute,
         onChanged: (value) {
           if (value == null) return;
           bind.sessionToggleOption(sessionId: sessionId, value: option);
@@ -814,7 +647,6 @@ Future<List<TToggleMenu>> toolbarDisplayToggle(
         sessionId: sessionId, arg: kOptionEnableFileCopyPaste);
     v.add(TToggleMenu(
         value: value,
-        actionId: kShortcutActionToggleEnableFileCopyPaste,
         onChanged: enabled
             ? (value) {
                 if (value == null) return;
@@ -833,7 +665,6 @@ Future<List<TToggleMenu>> toolbarDisplayToggle(
     if (ffiModel.viewOnly) value = true;
     v.add(TToggleMenu(
         value: value,
-        actionId: kShortcutActionToggleDisableClipboard,
         onChanged: enabled
             ? (value) {
                 if (value == null) return;
@@ -850,7 +681,6 @@ Future<List<TToggleMenu>> toolbarDisplayToggle(
         bind.sessionGetToggleOptionSync(sessionId: sessionId, arg: option);
     v.add(TToggleMenu(
         value: value,
-        actionId: kShortcutActionToggleLockAfterSessionEnd,
         onChanged: enabled
             ? (value) {
                 if (value == null) return;
@@ -860,8 +690,9 @@ Future<List<TToggleMenu>> toolbarDisplayToggle(
         child: Text(translate('Lock after session end'))));
   }
 
+  final privacyModeState = PrivacyModeState.find(id);
   if (pi.isSupportMultiDisplay &&
-      PrivacyModeState.find(id).isEmpty &&
+      (privacyModeState.isEmpty || allowDisplaySwitchInPrivacyMode(pi)) &&
       pi.displaysCount.value > 1 &&
       bind.mainGetUserDefaultOption(key: kKeyShowMonitorsToolbar) == 'Y') {
     final value =
@@ -901,7 +732,6 @@ Future<List<TToggleMenu>> toolbarDisplayToggle(
         bind.sessionGetToggleOptionSync(sessionId: sessionId, arg: option);
     v.add(TToggleMenu(
         value: value,
-        actionId: kShortcutActionToggleTrueColor,
         onChanged: (value) async {
           if (value == null) return;
           await bind.sessionToggleOption(sessionId: sessionId, value: option);
@@ -926,8 +756,7 @@ Future<List<TToggleMenu>> toolbarDisplayToggle(
         },
         child: Text(translate('View Mode'))));
   }
-  return _registerToggleMenuShortcuts(ffi, v,
-      ownedActionIds: _kToolbarDisplayToggleActionIds);
+  return v;
 }
 
 var togglePrivacyModeTime = DateTime.now().subtract(const Duration(hours: 1));
@@ -937,15 +766,25 @@ List<TToggleMenu> toolbarPrivacyMode(
   final ffiModel = ffi.ffiModel;
   final pi = ffiModel.pi;
   final sessionId = ffi.sessionId;
+  final hasPrivacyModePermission = ffiModel.permissions['privacy_mode'] != false;
+
+  // Backend revocation already attempts to turn privacy mode off.
+  // Still keep this menu when privacy mode is active, so users can turn it off
+  // if there is a sync delay, version mismatch, or off attempt failure.
+  if (!hasPrivacyModePermission && privacyModeState.isEmpty) {
+    return []; // No permission and not active, hide options.
+  }
 
   getDefaultMenu(Future<void> Function(SessionID sid, String opt) toggleFunc) {
-    final enabled = !ffi.ffiModel.viewOnly;
+    final enabled =
+        !ffiModel.viewOnly && (hasPrivacyModePermission || privacyModeState.isNotEmpty);
     return TToggleMenu(
         value: privacyModeState.isNotEmpty,
         onChanged: enabled
             ? (value) {
                 if (value == null) return;
-                if (ffiModel.pi.currentDisplay != 0 &&
+                if (!allowDisplaySwitchInPrivacyMode(pi) &&
+                    ffiModel.pi.currentDisplay != 0 &&
                     ffiModel.pi.currentDisplay != kAllDisplayValue) {
                   msgBox(
                       sessionId,
@@ -988,18 +827,29 @@ List<TToggleMenu> toolbarPrivacyMode(
       })
     ];
   } else {
-    return privacyModeImpls.map((e) {
+    final visibleImpls = hasPrivacyModePermission
+        ? privacyModeImpls
+        : privacyModeImpls.where((e) {
+            final implKey = (e as List<dynamic>)[0] as String;
+            return privacyModeState.value == implKey;
+          }).toList();
+    return visibleImpls.map((e) {
       final implKey = (e as List<dynamic>)[0] as String;
       final implName = (e)[1] as String;
+      final enabled = !ffiModel.viewOnly &&
+          (hasPrivacyModePermission || privacyModeState.value == implKey);
       return TToggleMenu(
           child: Text(translate(implName)),
           value: privacyModeState.value == implKey,
-          onChanged: (value) {
-            if (value == null) return;
-            togglePrivacyModeTime = DateTime.now();
-            bind.sessionTogglePrivacyMode(
-                sessionId: sessionId, implKey: implKey, on: value);
-          });
+          onChanged: enabled
+              ? (value) {
+                  if (value == null) return;
+                  if (value && !hasPrivacyModePermission) return;
+                  togglePrivacyModeTime = DateTime.now();
+                  bind.sessionTogglePrivacyMode(
+                      sessionId: sessionId, implKey: implKey, on: value);
+                }
+              : null);
     }).toList();
   }
 }
@@ -1026,7 +876,6 @@ List<TToggleMenu> toolbarKeyboardToggles(FFI ffi) {
     final enabled = !ffi.ffiModel.viewOnly;
     v.add(TToggleMenu(
         value: value,
-        actionId: kShortcutActionToggleSwapCtrlCmd,
         onChanged: enabled ? onChanged : null,
         child: Text(translate('Swap control-command key'))));
   }
@@ -1092,27 +941,10 @@ List<TToggleMenu> toolbarKeyboardToggles(FFI ffi) {
     final enabled = !ffi.ffiModel.viewOnly;
     v.add(TToggleMenu(
         value: value,
-        actionId: kShortcutActionToggleSwapLeftRightMouse,
         onChanged: enabled ? onChanged : null,
         child: Text(translate('swap-left-right-mouse'))));
   }
-  return _registerToggleMenuShortcuts(ffi, v,
-      ownedActionIds: _kToolbarKeyboardToggleActionIds);
-}
-
-/// Drive each toolbar helper for its registration side effect, so a shortcut
-/// fires from the first keystroke without needing the user to open the
-/// matching submenu. Mobile gets `toolbarKeyboardToggles` via
-/// `toolbarDisplayToggle`'s `isMobile` branch — calling it explicitly there
-/// would double-register.
-void registerToolbarShortcuts(BuildContext context, String id, FFI ffi) {
-  if (isDesktop) toolbarKeyboardToggles(ffi);
-  unawaited(toolbarCursor(context, id, ffi));
-  unawaited(toolbarDisplayToggle(context, id, ffi));
-  unawaited(toolbarViewStyle(context, id, ffi));
-  unawaited(toolbarImageQuality(context, id, ffi));
-  unawaited(toolbarCodec(context, id, ffi));
-  toolbarPrivacyMode(PrivacyModeState.find(id), context, id, ffi);
+  return v;
 }
 
 bool showVirtualDisplayMenu(FFI ffi) {

flutter/lib/consts.dart

@@ -4,8 +4,6 @@ import 'package:flutter_hbb/common.dart';
 import 'package:flutter_hbb/models/state_model.dart';
 import 'package:get/get.dart';
 
-export 'common/widgets/keyboard_shortcuts/shortcut_constants.dart';
-
 const int kMaxVirtualDisplayCount = 4;
 const int kAllVirtualDisplay = -1;
 
@@ -116,6 +114,9 @@ const String kOptionTerminalPersistent = "terminal-persistent";
 const String kOptionEnableTunnel = "enable-tunnel";
 const String kOptionEnableRemoteRestart = "enable-remote-restart";
 const String kOptionEnableBlockInput = "enable-block-input";
+const String kOptionEnablePrivacyMode = "enable-privacy-mode";
+const String kOptionEnablePermChangeInAcceptWindow =
+    "enable-perm-change-in-accept-window";
 const String kOptionAllowRemoteConfigModification =
     "allow-remote-config-modification";
 const String kOptionVerificationMethod = "verification-method";

flutter/lib/desktop/pages/desktop_keyboard_shortcuts_page.dart

@@ -1,66 +0,0 @@
-// flutter/lib/desktop/pages/desktop_keyboard_shortcuts_page.dart
-//
-// Desktop shell for the Keyboard Shortcuts configuration page. Users land
-// here from the General settings tab. The page exposes:
-//   * A top-level enable/disable toggle (mirrors the General-tab toggle —
-//     same JSON key, same semantics).
-//   * A grouped, scrollable list of actions, each with a current binding and
-//     edit / clear icons.
-//   * An AppBar "Reset to defaults" action with a confirmation dialog.
-//
-// All edits write back to LocalConfig under [kShortcutLocalConfigKey] in the
-// canonical {enabled, bindings:[{action,mods,key}]} shape that the Rust and
-// Web matchers consume.
-//
-// The body — group definitions, JSON I/O, conflict-replace flow,
-// recording-dialog round-trip — lives in
-// `common/widgets/keyboard_shortcuts/page_body.dart` and is shared with the
-// mobile shell at `mobile/pages/mobile_keyboard_shortcuts_page.dart`.
-
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-
-import '../../common.dart';
-import '../../common/widgets/keyboard_shortcuts/page_body.dart';
-
-class DesktopKeyboardShortcutsPage extends StatefulWidget {
-  const DesktopKeyboardShortcutsPage({Key? key}) : super(key: key);
-
-  @override
-  State<DesktopKeyboardShortcutsPage> createState() =>
-      _DesktopKeyboardShortcutsPageState();
-}
-
-class _DesktopKeyboardShortcutsPageState
-    extends State<DesktopKeyboardShortcutsPage> {
-  final GlobalKey<KeyboardShortcutsPageBodyState> _bodyKey = GlobalKey();
-
-  @override
-  Widget build(BuildContext context) {
-    final foregroundColor =
-        AppBarTheme.of(context).titleTextStyle?.color ?? Colors.white;
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(translate('Keyboard Shortcuts')),
-        actions: [
-          TextButton.icon(
-            style: TextButton.styleFrom(foregroundColor: foregroundColor),
-            onPressed: () =>
-                _bodyKey.currentState?.resetToDefaultsWithConfirm(),
-            icon: const Icon(Icons.restore),
-            label: Text(translate('Reset to defaults')),
-          ).marginOnly(right: 12),
-        ],
-      ),
-      body: KeyboardShortcutsPageBody(
-        key: _bodyKey,
-        compact: true,
-        // Desktop's General settings tab already exposes the Enable +
-        // Pass-through checkboxes (it's the only entry point to this page),
-        // so we hide the duplicates here. Mobile shells keep the default
-        // (true) because their entry tile doesn't carry the toggles.
-        showMasterToggles: false,
-      ),
-    );
-  }
-}

flutter/lib/desktop/pages/desktop_setting_page.dart

@@ -10,15 +10,12 @@ import 'package:flutter_hbb/common/widgets/audio_input.dart';
 import 'package:flutter_hbb/common/widgets/setting_widgets.dart';
 import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/pages/desktop_home_page.dart';
-import 'package:flutter_hbb/common/widgets/keyboard_shortcuts/page_body.dart';
-import 'package:flutter_hbb/desktop/pages/desktop_keyboard_shortcuts_page.dart';
 import 'package:flutter_hbb/desktop/pages/desktop_tab_page.dart';
 import 'package:flutter_hbb/desktop/widgets/remote_toolbar.dart';
 import 'package:flutter_hbb/mobile/widgets/dialog.dart';
 import 'package:flutter_hbb/models/platform_model.dart';
 import 'package:flutter_hbb/models/printer_model.dart';
 import 'package:flutter_hbb/models/server_model.dart';
-import 'package:flutter_hbb/models/shortcut_model.dart';
 import 'package:flutter_hbb/models/state_model.dart';
 import 'package:flutter_hbb/plugin/manager.dart';
 import 'package:flutter_hbb/plugin/widgets/desktop_settings.dart';
@@ -424,50 +421,11 @@ class _GeneralState extends State<_General> {
         if (!isWeb) audio(context),
         if (!isWeb) record(context),
         if (!isWeb) WaylandCard(),
-        other(),
-        if (!bind.isIncomingOnly()) keyboardShortcuts(),
+        other()
       ],
     ).marginOnly(bottom: _kListViewBottomMargin);
   }
 
-  Widget keyboardShortcuts() {
-    // The bindings JSON (LocalConfig key `keyboard-shortcuts`) holds three
-    // flags + the bindings list: {enabled, pass_through, bindings}. When the
-    // master is off, the pass-through toggle and the Configure entry are
-    // hidden — both are meaningless without an active matcher.
-    return StatefulBuilder(builder: (context, setLocalState) {
-      final enabled = ShortcutModel.isEnabled();
-      return _Card(title: 'Keyboard Shortcuts', children: [
-        _OptionCheckBox(
-          context,
-          'Enable keyboard shortcuts in remote session',
-          kShortcutLocalConfigKey,
-          isServer: false,
-          optGetter: ShortcutModel.isEnabled,
-          optSetter: (_, v) async {
-            await ShortcutModel.setEnabled(v);
-            setLocalState(() {});
-          },
-        ),
-        if (enabled) ...[
-          _OptionCheckBox(
-            context,
-            'Pass-through to remote',
-            kShortcutLocalConfigKey,
-            isServer: false,
-            optGetter: ShortcutModel.isPassThrough,
-            optSetter: (_, v) async {
-              await ShortcutModel.setPassThrough(v);
-              setLocalState(() {});
-            },
-            trailing: const InfoTooltipIcon(tipKey: 'shortcut-passthrough-tip'),
-          ),
-          _ShortcutsConfigureRow(),
-        ],
-      ]);
-    });
-  }
-
   Widget theme() {
     final current = MyTheme.getThemeModePreference().toShortString();
     onChanged(String value) async {
@@ -1104,6 +1062,10 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
               _OptionCheckBox(context, 'Enable blocking user input',
                   kOptionEnableBlockInput,
                   enabled: enabled, fakeValue: fakeValue),
+            if (bind.mainSupportedPrivacyModeImpls() != '[]')
+              _OptionCheckBox(
+                  context, 'Enable privacy mode', kOptionEnablePrivacyMode,
+                  enabled: enabled, fakeValue: fakeValue),
             _OptionCheckBox(context, 'Enable remote configuration modification',
                 kOptionAllowRemoteConfigModification,
                 enabled: enabled, fakeValue: fakeValue),
@@ -2534,8 +2496,6 @@ Widget _OptionCheckBox(
   bool isServer = true,
   bool Function()? optGetter,
   Future<void> Function(String, bool)? optSetter,
-  // Optional widget rendered between the label and the trailing space.
-  Widget? trailing,
 }) {
   getOpt() => optGetter != null
       ? optGetter()
@@ -2579,23 +2539,11 @@ Widget _OptionCheckBox(
             offstage: !ref.value || checkedIcon == null,
             child: checkedIcon?.marginOnly(right: 5),
           ),
-          // Without `trailing`, keep the original Expanded(Text) layout.
-          if (trailing == null)
-            Expanded(
-                child: Text(
-              translate(label),
-              style: TextStyle(color: disabledTextColor(context, enabled)),
-            ))
-          else ...[
-            Flexible(
+          Expanded(
               child: Text(
-                translate(label),
-                style: TextStyle(color: disabledTextColor(context, enabled)),
-              ),
-            ),
-            trailing,
-            const Spacer(),
-          ],
+            translate(label),
+            style: TextStyle(color: disabledTextColor(context, enabled)),
+          ))
         ],
       ),
     ).marginOnly(left: _kCheckBoxLeftMargin),
@@ -3002,37 +2950,6 @@ class _CountDownButtonState extends State<_CountDownButton> {
   }
 }
 
-// Tappable row that pushes the shortcut configuration page.
-class _ShortcutsConfigureRow extends StatelessWidget {
-  // ignore: unused_element
-  const _ShortcutsConfigureRow({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return InkWell(
-      onTap: () {
-        Navigator.of(context).push(MaterialPageRoute(
-          builder: (_) => const DesktopKeyboardShortcutsPage(),
-        ));
-      },
-      child: Row(
-        children: [
-          Expanded(
-            child: Text(translate('Configure shortcuts...')),
-          ),
-          Icon(Icons.arrow_forward_ios,
-                  size: 16, color: disabledTextColor(context, true))
-              .marginOnly(right: 4),
-        ],
-      ).marginOnly(
-        left: _kCheckBoxLeftMargin,
-        top: 6,
-        bottom: 6,
-      ),
-    );
-  }
-}
-
 //#endregion
 
 //#region dialogs

flutter/lib/desktop/pages/remote_page.dart

@@ -17,7 +17,6 @@ import '../../common/widgets/toolbar.dart';
 import '../../models/model.dart';
 import '../../models/input_model.dart';
 import '../../models/platform_model.dart';
-import '../../models/shortcut_model.dart';
 import '../../common/shared_state.dart';
 import '../../utils/image.dart';
 import '../widgets/remote_toolbar.dart';
@@ -127,18 +126,6 @@ class _RemotePageState extends State<RemotePage>
           _ffi.ffiModel.pi.platform, _ffi.dialogManager);
       _ffi.recordingModel
           .updateStatus(bind.sessionGetIsRecording(sessionId: _ffi.sessionId));
-      // Seed shortcut action callbacks once the session is ready, so that
-      // global keyboard shortcuts work even if the user never opens the
-      // toolbar menu. The returned list is intentionally discarded — the
-      // side effect of registering callbacks (inside toolbarControls) is
-      // what we want here.
-      if (mounted) {
-        toolbarControls(context, widget.id, _ffi);
-        registerSessionShortcutActions(_ffi,
-            tabController: widget.tabController,
-            toolbarState: widget.toolbarState);
-        registerToolbarShortcuts(context, widget.id, _ffi);
-      }
     });
     _ffi.canvasModel.initializeEdgeScrollFallback(this);
     _ffi.start(

flutter/lib/desktop/pages/server_page.dart

@@ -610,19 +610,24 @@ class _PrivilegeBoard extends StatefulWidget {
 class _PrivilegeBoardState extends State<_PrivilegeBoard> {
   late final client = widget.client;
   Widget buildPermissionIcon(bool enabled, IconData iconData,
-      Function(bool)? onTap, String tooltipText) {
+      Function(bool)? onTap, String tooltipText,
+      {required bool canModify}) {
     return Tooltip(
       message: "$tooltipText: ${enabled ? "ON" : "OFF"}",
       waitDuration: Duration.zero,
       child: Container(
         decoration: BoxDecoration(
-          color: enabled ? MyTheme.accent : Colors.grey[700],
+          color: enabled
+              ? (canModify ? MyTheme.accent : MyTheme.accent.withOpacity(0.6))
+              : Colors.grey[700],
           borderRadius: BorderRadius.circular(10.0),
         ),
         padding: EdgeInsets.all(8.0),
         child: InkWell(
-          onTap: () =>
-              checkClickTime(widget.client.id, () => onTap?.call(!enabled)),
+          onTap: canModify
+              ? () =>
+                  checkClickTime(widget.client.id, () => onTap?.call(!enabled))
+              : null,
           child: Column(
             mainAxisAlignment: MainAxisAlignment.spaceAround,
             children: [
@@ -643,6 +648,9 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
   Widget build(BuildContext context) {
     final crossAxisCount = 4;
     final spacing = 10.0;
+    final canModifyPermission =
+        bind.mainGetBuildinOption(key: kOptionEnablePermChangeInAcceptWindow) !=
+            'N';
     return Container(
       width: double.infinity,
       height: 160.0,
@@ -689,6 +697,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                           });
                         },
                         translate('Enable audio'),
+                        canModify: canModifyPermission,
                       ),
                       buildPermissionIcon(
                         client.recording,
@@ -703,6 +712,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                           });
                         },
                         translate('Enable recording session'),
+                        canModify: canModifyPermission,
                       ),
                     ]
                   : [
@@ -719,6 +729,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                           });
                         },
                         translate('Enable keyboard/mouse'),
+                        canModify: canModifyPermission,
                       ),
                       buildPermissionIcon(
                         client.clipboard,
@@ -733,6 +744,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                           });
                         },
                         translate('Enable clipboard'),
+                        canModify: canModifyPermission,
                       ),
                       buildPermissionIcon(
                         client.audio,
@@ -747,6 +759,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                           });
                         },
                         translate('Enable audio'),
+                        canModify: canModifyPermission,
                       ),
                       buildPermissionIcon(
                         client.file,
@@ -761,6 +774,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                           });
                         },
                         translate('Enable file copy and paste'),
+                        canModify: canModifyPermission,
                       ),
                       buildPermissionIcon(
                         client.restart,
@@ -775,6 +789,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                           });
                         },
                         translate('Enable remote restart'),
+                        canModify: canModifyPermission,
                       ),
                       buildPermissionIcon(
                         client.recording,
@@ -789,6 +804,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                           });
                         },
                         translate('Enable recording session'),
+                        canModify: canModifyPermission,
                       ),
                       // only windows support block input
                       if (isWindows)
@@ -805,6 +821,23 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
                             });
                           },
                           translate('Enable blocking user input'),
+                          canModify: canModifyPermission,
+                        ),
+                      if (bind.mainSupportedPrivacyModeImpls() != '[]')
+                        buildPermissionIcon(
+                          client.privacyMode,
+                          Icons.visibility_off,
+                          (enabled) {
+                            bind.cmSwitchPermission(
+                                connId: client.id,
+                                name: "privacy_mode",
+                                enabled: enabled);
+                            setState(() {
+                              client.privacyMode = enabled;
+                            });
+                          },
+                          translate('Enable privacy mode'),
+                          canModify: canModifyPermission,
                         )
                     ],
             ),

flutter/lib/desktop/pages/terminal_page.dart

@@ -27,6 +27,7 @@ class TerminalPage extends StatefulWidget {
   final bool? isSharedPassword;
   final String? connToken;
   final int terminalId;
+
   /// Tab key for focus management, passed from parent to avoid duplicate construction
   final String tabKey;
   final SimpleWrapper<State<TerminalPage>?> _lastState = SimpleWrapper(null);
@@ -43,6 +44,9 @@ class TerminalPage extends StatefulWidget {
 
 class _TerminalPageState extends State<TerminalPage>
     with AutomaticKeepAliveClientMixin {
+  static const EdgeInsets _defaultTerminalPadding =
+      EdgeInsets.symmetric(horizontal: 5.0, vertical: 2.0);
+
   late FFI _ffi;
   late TerminalModel _terminalModel;
   double? _cellHeight;
@@ -155,13 +159,27 @@ class _TerminalPageState extends State<TerminalPage>
   // extra space left after dividing the available height by the height of a single
   // terminal row (`_cellHeight`) and distributing it evenly as top and bottom padding.
   EdgeInsets _calculatePadding(double heightPx) {
-    if (_cellHeight == null) {
-      return const EdgeInsets.symmetric(horizontal: 5.0, vertical: 2.0);
+    final cellHeight = _cellHeight;
+    if (!heightPx.isFinite ||
+        heightPx <= 0 ||
+        cellHeight == null ||
+        !cellHeight.isFinite ||
+        cellHeight <= 0) {
+      return _defaultTerminalPadding;
+    }
+    final rows = (heightPx / cellHeight).floor();
+    if (rows <= 0) {
+      return _defaultTerminalPadding;
+    }
+    final extraSpace = heightPx - rows * cellHeight;
+    if (!extraSpace.isFinite || extraSpace < 0) {
+      return _defaultTerminalPadding;
     }
-    final rows = (heightPx / _cellHeight!).floor();
-    final extraSpace = heightPx - rows * _cellHeight!;
     final topBottom = extraSpace / 2.0;
-    return EdgeInsets.symmetric(horizontal: 5.0, vertical: topBottom);
+    return EdgeInsets.symmetric(
+      horizontal: _defaultTerminalPadding.horizontal / 2,
+      vertical: topBottom,
+    );
   }
 
   @override

flutter/lib/desktop/pages/terminal_tab_page.dart

@@ -46,6 +46,7 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
           .setTitle(getWindowNameWithId(id));
     };
     tabController.onRemoved = (_, id) => onRemoveId(id);
+    tabController.onCloseWindow = _closeWindowFromConnection;
     final terminalId = params['terminalId'] ?? _nextTerminalId++;
     tabController.add(_createTerminalTab(
       peerId: params['id'],
@@ -144,6 +145,8 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
     _windowClosing = true;
     final tabKeys = tabController.state.value.tabs.map((t) => t.key).toList();
     // Remove all UI tabs immediately (same instant behavior as the old tabController.clear())
+    // Keep the cleanup target lookup below synchronous before its first await:
+    // it relies on the current frame still retaining each TerminalPage's FFI/model.
     tabController.clear();
     // Run session cleanup in parallel with bounded timeout (closeTerminal() has internal 3s timeout).
     // Skip tabs already being closed by a concurrent _closeTab() to avoid duplicate FFI calls.
@@ -368,8 +371,34 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
     final persistentSessions =
         args['persistent_sessions'] as List<dynamic>? ?? [];
     final sortedSessions = persistentSessions.whereType<int>().toList()..sort();
+    var peerId = args['peer_id'] as String? ?? '';
+    if (peerId.isEmpty) {
+      if (tabController.state.value.tabs.isEmpty ||
+          tabController.state.value.selected >=
+              tabController.state.value.tabs.length) {
+        debugPrint('[TerminalTabPage] Skip restore: no selected tab');
+        return;
+      }
+      final currentTab = tabController.state.value.selectedTabInfo;
+      final parsed = _parseTabKey(currentTab.key);
+      if (parsed == null) return;
+      peerId = parsed.$1;
+    }
+    final existingTerminalIds = tabController.state.value.tabs
+        .map((tab) => _parseTabKey(tab.key))
+        .where((parsed) => parsed != null && parsed.$1 == peerId)
+        .map((parsed) => parsed!.$2)
+        .toSet();
+    if (existingTerminalIds.isEmpty) {
+      debugPrint(
+          '[TerminalTabPage] Skip restore: no seed tab for peer $peerId');
+      return;
+    }
     for (final terminalId in sortedSessions) {
-      _addNewTerminalForCurrentPeer(terminalId: terminalId);
+      if (!existingTerminalIds.add(terminalId)) {
+        continue;
+      }
+      _addNewTerminal(peerId, terminalId: terminalId);
       // A delay is required to ensure the UI has sufficient time to update
       // before adding the next terminal. Without this delay, `_TerminalPageState::dispose()`
       // may be called prematurely while the tab widget is still in the tab controller.
@@ -546,6 +575,11 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
     }
   }
 
+  Future<void> _closeWindowFromConnection() async {
+    await _closeAllTabs();
+    await WindowController.fromWindowId(windowId()).close();
+  }
+
   int windowId() {
     return widget.params["windowId"];
   }

flutter/lib/desktop/widgets/remote_toolbar.dart

@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hbb/common/widgets/audio_input.dart';
 import 'package:flutter_hbb/common/widgets/dialog.dart';
-import 'package:flutter_hbb/common/widgets/keyboard_shortcuts/display.dart';
 import 'package:flutter_hbb/common/widgets/toolbar.dart';
 import 'package:flutter_hbb/models/chat_model.dart';
 import 'package:flutter_hbb/models/state_model.dart';
@@ -377,7 +376,8 @@ class _RemoteToolbarState extends State<RemoteToolbar> {
     }
 
     toolbarItems.add(Obx(() {
-      if (PrivacyModeState.find(widget.id).isEmpty &&
+      if ((PrivacyModeState.find(widget.id).isEmpty ||
+              allowDisplaySwitchInPrivacyMode(pi)) &&
           pi.displaysCount.value > 1) {
         return _MonitorMenu(
             id: widget.id,
@@ -611,9 +611,8 @@ class _MonitorMenu extends StatelessWidget {
             tooltip: isMulti
                 ? ''
                 : isAllMonitors
-                    ? translate('All monitors')
-                    : translate('Monitor #{}')
-                        .replaceAll('{}', '${i + 1}'),
+                    ? 'all monitors'
+                    : '#${i + 1} monitor',
             hMargin: isMulti ? null : 6,
             vMargin: isMulti ? null : 12,
             topLevel: false,
@@ -765,35 +764,8 @@ class _ControlMenu extends StatelessWidget {
               if (e.divider) {
                 return Divider();
               } else {
-                final hint = e.actionId == null
-                    ? null
-                    : ShortcutDisplay.formatFor(e.actionId!);
-                final child = hint == null
-                    ? e.child
-                    : Row(
-                        mainAxisSize: MainAxisSize.min,
-                        children: [
-                          Flexible(child: e.child),
-                          Flexible(
-                            child: Padding(
-                              padding: const EdgeInsets.only(left: 16),
-                              child: Text(
-                                hint,
-                                maxLines: 1,
-                                overflow: TextOverflow.ellipsis,
-                                style: Theme.of(context)
-                                    .textTheme
-                                    .bodySmall
-                                    ?.copyWith(
-                                      color: Theme.of(context).hintColor,
-                                    ),
-                              ),
-                            ),
-                          ),
-                        ],
-                      );
                 return MenuButton(
-                    child: child,
+                    child: e.child,
                     onPressed: e.onPressed,
                     ffi: ffi,
                     trailingIcon: e.trailingIcon);
@@ -1025,10 +997,10 @@ class _DisplayMenuState extends State<_DisplayMenu> {
         toggles(),
       ];
       // privacy mode
+      final privacyModeState = PrivacyModeState.find(id);
       if (ffi.connType == ConnType.defaultConn &&
-          ffiModel.keyboard &&
-          pi.features.privacyMode) {
-        final privacyModeState = PrivacyModeState.find(id);
+          (pi.features.privacyMode || privacyModeState.isNotEmpty) &&
+          (ffiModel.keyboard || privacyModeState.isNotEmpty)) {
         final privacyModeList =
             toolbarPrivacyMode(privacyModeState, context, id, ffi);
         if (privacyModeList.length == 1) {

flutter/lib/desktop/widgets/tabbar_widget.dart

@@ -99,6 +99,7 @@ class DesktopTabController {
   /// index, key
   Function(int, String)? onRemoved;
   Function(String)? onSelected;
+  Future<void> Function()? onCloseWindow;
 
   DesktopTabController(
       {required this.tabType, this.onRemoved, this.onSelected});
@@ -592,13 +593,13 @@ class _DesktopTabState extends State<DesktopTab>
   }
 
   Widget _buildBar() {
+    final isIncomingHomePage = bind.isIncomingOnly() && isInHomePage();
     return Row(
       children: [
         Expanded(
             child: GestureDetector(
                 // custom double tap handler
-                onTap: !(bind.isIncomingOnly() && isInHomePage()) &&
-                        showMaximize
+                onTap: !isIncomingHomePage && showMaximize
                     ? () {
                         final current = DateTime.now().millisecondsSinceEpoch;
                         final elapsed = current - _lastClickTime;
@@ -609,7 +610,7 @@ class _DesktopTabState extends State<DesktopTab>
                               .then((value) => stateGlobal.setMaximized(value));
                         }
                       }
-                    : null,
+                    : (isIncomingHomePage ? () {} : null), // Keep tap recognizer for Windows touch.
                 onPanStart: (_) => startDragging(isMainWindow),
                 onPanCancel: () {
                   // We want to disable dragging of the tab area in the tab bar.

flutter/lib/mobile/pages/mobile_keyboard_shortcuts_page.dart

@@ -1,95 +0,0 @@
-// flutter/lib/mobile/pages/mobile_keyboard_shortcuts_page.dart
-//
-// Mobile shell for the Keyboard Shortcuts configuration page. Mirrors
-// `desktop/pages/desktop_keyboard_shortcuts_page.dart` but with a touch-
-// friendly layout (ListTile rows instead of dense rows) and a hint banner
-// that explains the recording flow only works with a physical keyboard.
-//
-// All actual logic — group definitions, JSON I/O, conflict-replace flow,
-// recording-dialog round-trip, "Reset to defaults" — lives in the shared
-// `common/widgets/keyboard_shortcuts/page_body.dart`. This file only
-// supplies the AppBar, the AppBar action, and the platform hint banner.
-//
-// Mobile keyboard detection limitation: Flutter has no reliable
-// "is a physical keyboard attached?" API on iOS or Android. Soft keyboards
-// don't generate the `KeyDownEvent`s the recording dialog listens for, so
-// in practice the dialog only does anything useful when the user actually
-// has a hardware keyboard plugged in (USB / Bluetooth / Smart Connector).
-// For V1 we don't try to detect attachment — we just surface the
-// requirement as an in-page hint instead of disabling the Edit button.
-
-import 'package:flutter/material.dart';
-
-import '../../common.dart';
-import '../../common/widgets/keyboard_shortcuts/page_body.dart';
-
-class MobileKeyboardShortcutsPage extends StatefulWidget {
-  const MobileKeyboardShortcutsPage({Key? key}) : super(key: key);
-
-  @override
-  State<MobileKeyboardShortcutsPage> createState() =>
-      _MobileKeyboardShortcutsPageState();
-}
-
-class _MobileKeyboardShortcutsPageState
-    extends State<MobileKeyboardShortcutsPage> {
-  final GlobalKey<KeyboardShortcutsPageBodyState> _bodyKey = GlobalKey();
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(translate('Keyboard Shortcuts')),
-        actions: [
-          IconButton(
-            tooltip: translate('Reset to defaults'),
-            onPressed: () =>
-                _bodyKey.currentState?.resetToDefaultsWithConfirm(),
-            icon: const Icon(Icons.restore),
-          ),
-        ],
-      ),
-      body: KeyboardShortcutsPageBody(
-        key: _bodyKey,
-        compact: false,
-        editButtonHint: translate('shortcut-mobile-physical-keyboard-tip'),
-        headerBanner: _PhysicalKeyboardHintBanner(theme: theme),
-      ),
-    );
-  }
-}
-
-/// A muted info banner shown above the master toggle on mobile. We can't
-/// reliably detect whether a physical keyboard is attached, so instead of
-/// disabling the Edit button we surface the requirement up front.
-class _PhysicalKeyboardHintBanner extends StatelessWidget {
-  final ThemeData theme;
-  const _PhysicalKeyboardHintBanner({required this.theme});
-
-  @override
-  Widget build(BuildContext context) {
-    final color = theme.colorScheme.primary.withOpacity(0.08);
-    return Container(
-      padding: const EdgeInsets.all(12),
-      decoration: BoxDecoration(
-        color: color,
-        borderRadius: BorderRadius.circular(8),
-      ),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Icon(Icons.info_outline,
-              size: 18, color: theme.colorScheme.primary),
-          const SizedBox(width: 8),
-          Expanded(
-            child: Text(
-              translate('shortcut-mobile-physical-keyboard-tip'),
-              style: TextStyle(color: theme.colorScheme.onSurface),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

flutter/lib/mobile/pages/remote_page.dart

@@ -21,7 +21,6 @@ import '../../common/widgets/remote_input.dart';
 import '../../models/input_model.dart';
 import '../../models/model.dart';
 import '../../models/platform_model.dart';
-import '../../models/shortcut_model.dart';
 import '../../utils/image.dart';
 import '../widgets/dialog.dart';
 import '../widgets/custom_scale_widget.dart';
@@ -120,18 +119,6 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
       }
       _disableAndroidSoftKeyboard(
           isKeyboardVisible: keyboardVisibilityController.isVisible);
-      // Seed shortcut action callbacks once the session is ready, so that
-      // global keyboard shortcuts work even if the user never opens the
-      // toolbar menu. The returned list is intentionally discarded — the
-      // side effect of registering callbacks (inside toolbarControls) is
-      // what we want here.
-      if (mounted) {
-        toolbarControls(context, widget.id, gFFI);
-        // Mobile has no DesktopTabController, so tab-switch shortcuts will
-        // log a no-handler debug line if a user binds one.
-        registerSessionShortcutActions(gFFI);
-        registerToolbarShortcuts(context, widget.id, gFFI);
-      }
     });
     WidgetsBinding.instance.addObserver(this);
   }
@@ -1196,7 +1183,8 @@ void showOptions(
   List<TToggleMenu> privacyModeList = [];
   // privacy mode
   final privacyModeState = PrivacyModeState.find(id);
-  if (gFFI.ffiModel.keyboard && gFFI.ffiModel.pi.features.privacyMode) {
+  if ((gFFI.ffiModel.pi.features.privacyMode && gFFI.ffiModel.keyboard) ||
+      privacyModeState.isNotEmpty) {
     privacyModeList = toolbarPrivacyMode(privacyModeState, context, id, gFFI);
     if (privacyModeList.length == 1) {
       displayToggles.add(privacyModeList[0]);

flutter/lib/mobile/pages/server_page.dart

@@ -583,9 +583,16 @@ class _PermissionCheckerState extends State<PermissionChecker> {
   Widget build(BuildContext context) {
     final serverModel = Provider.of<ServerModel>(context);
     final hasAudioPermission = androidVersion >= 30;
-    final hideStopService =
-        isAndroid &&
-            bind.mainGetBuildinOption(key: kOptionHideStopService) == 'Y';
+    final hideStopService = isAndroid &&
+        bind.mainGetBuildinOption(key: kOptionHideStopService) == 'Y';
+    final allowPermChangeInAcceptWindow = option2bool(
+        kOptionEnablePermChangeInAcceptWindow,
+        bind.mainGetBuildinOption(
+          key: kOptionEnablePermChangeInAcceptWindow,
+        ));
+    final permissionChangeLocked = isAndroid &&
+        serverModel.clients.any((c) => !c.disconnected) &&
+        !allowPermChangeInAcceptWindow;
     return PaddingCard(
         title: translate("Permissions"),
         child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
@@ -608,13 +615,21 @@ class _PermissionCheckerState extends State<PermissionChecker> {
                         bind.mainGetLocalOption(key: "show-scam-warning") != "N"
                     ? () => showScamWarning(context, serverModel)
                     : serverModel.toggleService),
-          PermissionRow(translate("Input Control"), serverModel.inputOk,
-              serverModel.toggleInput),
-          PermissionRow(translate("Transfer file"), serverModel.fileOk,
-              serverModel.toggleFile),
+          PermissionRow(
+            translate("Input Control"),
+            serverModel.inputOk,
+            serverModel.toggleInput,
+          ),
+          PermissionRow(
+            translate("Transfer file"),
+            serverModel.fileOk,
+            serverModel.toggleFile,
+            enabled: !permissionChangeLocked,
+          ),
           hasAudioPermission
               ? PermissionRow(translate("Audio Capture"), serverModel.audioOk,
-                  serverModel.toggleAudio)
+                  serverModel.toggleAudio,
+                  enabled: !permissionChangeLocked)
               : Row(children: [
                   Icon(Icons.info_outline).marginOnly(right: 15),
                   Expanded(
@@ -623,19 +638,25 @@ class _PermissionCheckerState extends State<PermissionChecker> {
                     style: const TextStyle(color: MyTheme.darkGray),
                   ))
                 ]),
-          PermissionRow(translate("Enable clipboard"), serverModel.clipboardOk,
-              serverModel.toggleClipboard),
+          PermissionRow(
+            translate("Enable clipboard"),
+            serverModel.clipboardOk,
+            serverModel.toggleClipboard,
+            enabled: !permissionChangeLocked,
+          ),
         ]));
   }
 }
 
 class PermissionRow extends StatelessWidget {
-  const PermissionRow(this.name, this.isOk, this.onPressed, {Key? key})
+  const PermissionRow(this.name, this.isOk, this.onPressed,
+      {Key? key, this.enabled = true})
       : super(key: key);
 
   final String name;
   final bool isOk;
   final VoidCallback onPressed;
+  final bool enabled;
 
   @override
   Widget build(BuildContext context) {
@@ -644,9 +665,11 @@ class PermissionRow extends StatelessWidget {
         contentPadding: EdgeInsets.all(0),
         title: Text(name),
         value: isOk,
-        onChanged: (bool value) {
-          onPressed();
-        });
+        onChanged: enabled
+            ? (bool value) {
+                onPressed();
+              }
+            : null);
   }
 }
 

flutter/lib/mobile/pages/settings_page.dart

@@ -17,10 +17,8 @@ import '../../common/widgets/login.dart';
 import '../../consts.dart';
 import '../../models/model.dart';
 import '../../models/platform_model.dart';
-import '../../models/shortcut_model.dart';
 import '../widgets/dialog.dart';
 import 'home_page.dart';
-import 'mobile_keyboard_shortcuts_page.dart';
 import 'scan_page.dart';
 
 class SettingsPage extends StatefulWidget implements PageShape {
@@ -821,24 +819,6 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
               showThemeSettings(gFFI.dialogManager);
             },
           ),
-          if (!disabledSettings)
-            SettingsTile.navigation(
-              leading: Icon(Icons.keyboard_outlined),
-              title: Text(translate('Keyboard Shortcuts')),
-              description: Text(ShortcutModel.isEnabled()
-                  ? translate('On')
-                  : translate('Off')),
-              trailing: Icon(Icons.arrow_forward_ios),
-              onPressed: (context) {
-                Navigator.push(
-                    context,
-                    MaterialPageRoute(
-                      builder: (_) => const MobileKeyboardShortcutsPage(),
-                    )).then((_) {
-                  if (mounted) setState(() {});
-                });
-              },
-            ),
           if (!bind.isDisableAccount())
             SettingsTile.switchTile(
               title: Text(translate('note-at-conn-end-tip')),

flutter/lib/models/file_model.dart

@@ -391,14 +391,30 @@ class FileController {
 
     await Future.delayed(Duration(milliseconds: 100));
 
-    final dir = (await bind.sessionGetPeerOption(
+    final savedDir = (await bind.sessionGetPeerOption(
         sessionId: sessionId, name: isLocal ? "local_dir" : "remote_dir"));
-    openDirectory(dir.isEmpty ? options.value.home : dir);
+    Future<bool> tryOpenReadyDirs() async {
+      final dirs = <String>{
+        if (directory.value.path.isNotEmpty) directory.value.path,
+        if (savedDir.isNotEmpty) savedDir,
+        options.value.home,
+      };
+      for (final dir in dirs) {
+        if (await _openDirectoryPath(dir, isBack: true)) {
+          return true;
+        }
+      }
+      return false;
+    }
+
+    var opened = await tryOpenReadyDirs();
 
     await Future.delayed(Duration(seconds: 1));
 
-    if (directory.value.path.isEmpty) {
-      openDirectory(options.value.home);
+    if (!opened) {
+      // The peer may become ready during the reconnect delay, so retry the
+      // same candidates instead of only retrying the default home directory.
+      await tryOpenReadyDirs();
     }
   }
 
@@ -429,19 +445,23 @@ class FileController {
     });
   }
 
-  Future<void> refresh() async {
-    await openDirectory(directory.value.path);
+  Future<bool> refresh() async {
+    // "." can be both a refresh command and a real remote directory path.
+    // Refresh must bypass openDirectory's command dispatch to avoid recursion.
+    return await _openDirectoryPath(directory.value.path, isBack: true);
   }
 
-  Future<void> openDirectory(String path, {bool isBack = false}) async {
-    if (path == ".") {
-      refresh();
-      return;
+  Future<bool> openDirectory(String path, {bool isBack = false}) async {
+    if (!isBack && path == ".") {
+      return await refresh();
     }
-    if (path == "..") {
-      goToParentDirectory();
-      return;
+    if (!isBack && path == "..") {
+      return await _goToParentDirectory(isBack: isBack);
     }
+    return await _openDirectoryPath(path, isBack: isBack);
+  }
+
+  Future<bool> _openDirectoryPath(String path, {bool isBack = false}) async {
     if (!isBack) {
       pushHistory();
     }
@@ -458,8 +478,10 @@ class FileController {
       final fd = await fileFetcher.fetchDirectory(path, isLocal, showHidden);
       fd.format(isWindows, sort: sortBy.value);
       directory.value = fd;
+      return true;
     } catch (e) {
       debugPrint("Failed to openDirectory $path: $e");
+      return false;
     }
   }
 
@@ -487,19 +509,22 @@ class FileController {
       goBack();
       return;
     }
-    openDirectory(path, isBack: true);
+    unawaited(_openDirectoryPath(path, isBack: true).then<void>((_) {}));
   }
 
   void goToParentDirectory() {
+    unawaited(_goToParentDirectory().then<void>((_) {}));
+  }
+
+  Future<bool> _goToParentDirectory({bool isBack = false}) async {
     final isWindows = options.value.isWindows;
     final dirPath = directory.value.path;
     var parent = PathUtil.dirname(dirPath, isWindows);
     // specially for C:\, D:\, goto '/'
     if (parent == dirPath && isWindows) {
-      openDirectory('/');
-      return;
+      return await _openDirectoryPath('/', isBack: isBack);
     }
-    openDirectory(parent);
+    return await _openDirectoryPath(parent, isBack: isBack);
   }
 
   // TODO deprecated this

flutter/lib/models/input_model.dart

@@ -15,9 +15,7 @@ import 'package:get/get.dart';
 
 import '../../models/model.dart';
 import '../../models/platform_model.dart';
-import '../../models/shortcut_model.dart';
 import '../../models/state_model.dart';
-import '../common/widgets/keyboard_shortcuts/shortcut_utils.dart';
 import 'input_modifier_utils.dart';
 import 'relative_mouse_model.dart';
 import '../common.dart';
@@ -348,7 +346,7 @@ class InputModel {
   /// which runs per-engine, so each isolate registers its own handler tied
   /// to its own set of InputModels.
   static void initSideButtonChannel() {
-    if (!isLinux) return;
+    if (!Platform.isLinux) return;
     if (_sideButtonChannelInitialized) return;
     _sideButtonChannelInitialized = true;
 
@@ -828,9 +826,6 @@ class InputModel {
         return KeyEventResult.ignored;
       }
     }
-    if (_tryDispatchWebFlutterShortcut(e)) {
-      return KeyEventResult.handled;
-    }
     if (isWindows || isLinux) {
       // Ignore meta keys. Because flutter window will loose focus if meta key is pressed.
       if (e.physicalKey == PhysicalKeyboardKey.metaLeft ||
@@ -925,53 +920,6 @@ class InputModel {
     return KeyEventResult.handled;
   }
 
-  bool _tryDispatchWebFlutterShortcut(KeyEvent e) {
-    if (!isWeb || !isInputSourceFlutter) return false;
-    if (e is! KeyDownEvent && e is! KeyRepeatEvent) return false;
-    if (!ShortcutModel.isEnabled() || ShortcutModel.isPassThrough()) {
-      return false;
-    }
-    final keyName = logicalKeyName(e.logicalKey);
-    if (keyName == null) return false;
-    final mods = canonicalShortcutModsForSave(_webFlutterShortcutMods());
-    final action = _matchWebFlutterShortcut(keyName, mods);
-    if (action == null) return false;
-    if (e is KeyDownEvent) {
-      parent.target?.shortcutModel.onTriggered(action);
-    }
-    return true;
-  }
-
-  Set<String> _webFlutterShortcutMods() {
-    final keyboard = HardwareKeyboard.instance;
-    final mods = <String>{};
-    if (isMacOS || isIOS || isWebOnMacOs) {
-      if (keyboard.isMetaPressed) mods.add('primary');
-      if (keyboard.isControlPressed) mods.add('ctrl');
-    } else if (keyboard.isControlPressed) {
-      mods.add('primary');
-    }
-    if (keyboard.isAltPressed) mods.add('alt');
-    if (keyboard.isShiftPressed) mods.add('shift');
-    return mods;
-  }
-
-  String? _matchWebFlutterShortcut(String keyName, List<String> mods) {
-    for (final binding in ShortcutModel.readBindings()) {
-      final action = binding['action'];
-      final key = binding['key'];
-      final bindingMods =
-          canonicalShortcutModsForSave(shortcutModSetFrom(binding['mods']));
-      if (action is String &&
-          key == keyName &&
-          bindingMods.isNotEmpty &&
-          listEquals(bindingMods, mods)) {
-        return action;
-      }
-    }
-    return null;
-  }
-
   /// Send Key Event
   void newKeyboardMode(
       String character, int usbHid, bool down, bool iosCapsLock) {

flutter/lib/models/model.dart

@@ -21,7 +21,6 @@ import 'package:flutter_hbb/models/peer_model.dart';
 import 'package:flutter_hbb/models/peer_tab_model.dart';
 import 'package:flutter_hbb/models/printer_model.dart';
 import 'package:flutter_hbb/models/server_model.dart';
-import 'package:flutter_hbb/models/shortcut_model.dart';
 import 'package:flutter_hbb/models/user_model.dart';
 import 'package:flutter_hbb/models/state_model.dart';
 import 'package:flutter_hbb/models/desktop_render_texture.dart';
@@ -477,11 +476,6 @@ class FfiModel with ChangeNotifier {
       } else if (name == 'exit_relative_mouse_mode') {
         // Handle exit shortcut from rdev grab loop (Ctrl+Alt on Win/Linux, Cmd+G on macOS)
         parent.target?.inputModel.exitRelativeMouseModeWithKeyRelease();
-      } else if (name == kShortcutEventName) {
-        final action = evt['action'];
-        if (action is String) {
-          parent.target?.shortcutModel.onTriggered(action);
-        }
       } else {
         debugPrint('Event is not handled in the fixed branch: $name');
       }
@@ -3629,7 +3623,6 @@ class FFI {
   late final ElevationModel elevationModel; // session
   late final CmFileModel cmFileModel; // cm
   late final TextureModel textureModel; //session
-  late final ShortcutModel shortcutModel; // session
   late final Peers recentPeersModel; // global
   late final Peers favoritePeersModel; // global
   late final Peers lanPeersModel; // global
@@ -3659,7 +3652,6 @@ class FFI {
     elevationModel = ElevationModel(WeakReference(this));
     cmFileModel = CmFileModel(WeakReference(this));
     textureModel = TextureModel(WeakReference(this));
-    shortcutModel = ShortcutModel(WeakReference(this));
     recentPeersModel = Peers(
         name: PeersModelName.recent,
         loadEvent: LoadEvent.recent,
@@ -3933,7 +3925,6 @@ class FFI {
           ffiModel.pi.currentDisplay);
     }
     imageModel.callbacksOnFirstImage.clear();
-    shortcutModel.clear();
     await imageModel.update(null);
     cursorModel.clear();
     ffiModel.clear();

flutter/lib/models/server_model.dart

@@ -298,7 +298,7 @@ class ServerModel with ChangeNotifier {
   }
 
   toggleAudio() async {
-    if (clients.isNotEmpty) {
+    if (clients.any((c) => !c.disconnected)) {
       await showClientsMayNotBeChangedAlert(parent.target);
     }
     if (!_audioOk && !await AndroidPermissionManager.check(kRecordAudio)) {
@@ -316,7 +316,7 @@ class ServerModel with ChangeNotifier {
   }
 
   toggleFile() async {
-    if (clients.isNotEmpty) {
+    if (clients.any((c) => !c.disconnected)) {
       await showClientsMayNotBeChangedAlert(parent.target);
     }
     if (!_fileOk &&
@@ -345,7 +345,7 @@ class ServerModel with ChangeNotifier {
   }
 
   toggleInput() async {
-    if (clients.isNotEmpty) {
+    if (clients.any((c) => !c.disconnected)) {
       await showClientsMayNotBeChangedAlert(parent.target);
     }
     if (_inputOk) {
@@ -549,10 +549,19 @@ class ServerModel with ChangeNotifier {
         if (index < 0) {
           _clients.add(client);
         } else {
+          if (_clients[index].authorized) {
+            _clients[index].privacyMode = client.privacyMode;
+            notifyListeners();
+            return;
+          }
           _clients[index].authorized = true;
+          _clients[index].privacyMode = client.privacyMode;
         }
       } else {
-        if (_clients.any((c) => c.id == client.id)) {
+        final index = _clients.indexWhere((c) => c.id == client.id);
+        if (index >= 0) {
+          _clients[index].privacyMode = client.privacyMode;
+          notifyListeners();
           return;
         }
         _clients.add(client);
@@ -818,6 +827,7 @@ class Client {
   bool restart = false;
   bool recording = false;
   bool blockInput = false;
+  bool privacyMode = false;
   bool disconnected = false;
   bool fromSwitch = false;
   bool inVoiceCall = false;
@@ -846,6 +856,7 @@ class Client {
     restart = json['restart'];
     recording = json['recording'];
     blockInput = json['block_input'];
+    privacyMode = json['privacy_mode'] ?? privacyMode;
     disconnected = json['disconnected'];
     fromSwitch = json['from_switch'];
     inVoiceCall = json['in_voice_call'];
@@ -870,6 +881,7 @@ class Client {
     data['restart'] = restart;
     data['recording'] = recording;
     data['block_input'] = blockInput;
+    data['privacy_mode'] = privacyMode;
     data['disconnected'] = disconnected;
     data['from_switch'] = fromSwitch;
     data['in_voice_call'] = inVoiceCall;

flutter/lib/models/shortcut_model.dart

@@ -1,560 +0,0 @@
-import 'dart:async';
-import 'dart:convert';
-
-import 'package:flutter/foundation.dart';
-
-import '../common.dart';
-import '../common/shared_state.dart' show PrivacyModeState;
-import '../common/widgets/dialog.dart'
-    show desktopTryShowTabAuditDialogCloseCancelled;
-import '../common/widgets/keyboard_shortcuts/shortcut_utils.dart';
-import '../consts.dart';
-import '../desktop/widgets/remote_toolbar.dart' show ToolbarState;
-import 'chat_model.dart' show VoiceCallStatus;
-import '../desktop/widgets/tabbar_widget.dart' show DesktopTabController;
-import '../models/model.dart';
-import '../models/platform_model.dart';
-import '../models/state_model.dart';
-
-typedef ShortcutCallback = FutureOr<void> Function();
-
-/// Per-session shortcut dispatcher. Attached to FFI when a session is created.
-///
-/// The Rust matcher (src/keyboard/shortcuts.rs) emits `shortcut_triggered`
-/// session events containing the matched `action` id. The session event
-/// listener in [FfiModel.startEventListener] forwards those to this model
-/// via [onTriggered], which runs whatever callback the toolbar / menu
-/// builders previously registered for that action id.
-class ShortcutModel {
-  static WeakReference<ShortcutModel>? _activeWebModel;
-
-  final WeakReference<FFI> parent;
-  final Map<String, ShortcutCallback> _callbacks = {};
-
-  ShortcutModel(this.parent);
-
-  /// Called by toolbar / menu builders to register what to do when the
-  /// matched shortcut fires.
-  void register(String actionId, ShortcutCallback callback) {
-    _callbacks[actionId] = callback;
-    _activeWebModel = WeakReference(this);
-  }
-
-  void unregister(String actionId) {
-    _callbacks.remove(actionId);
-  }
-
-  void clear() {
-    _callbacks.clear();
-    if (identical(_activeWebModel?.target, this)) {
-      _activeWebModel = null;
-    }
-  }
-
-  static void onWebTriggered(String actionId) {
-    final model = _activeWebModel?.target;
-    if (model != null) {
-      model.onTriggered(actionId);
-    } else {
-      debugPrint('shortcut_triggered: no active web shortcut model');
-    }
-  }
-
-  /// Called by the session event listener when a `shortcut_triggered` event
-  /// arrives for this session.
-  void onTriggered(String actionId) {
-    final cb = _callbacks[actionId];
-    if (cb != null) {
-      unawaited(Future.sync(cb).catchError((e, st) {
-        debugPrint(
-            'shortcut_triggered: handler failed for $actionId: $e\n$st');
-      }));
-    } else {
-      debugPrint('shortcut_triggered: no handler for $actionId');
-    }
-  }
-
-  /// Read the bindings JSON from LocalConfig.
-  static List<Map<String, dynamic>> readBindings() {
-    final raw = bind.mainGetLocalOption(key: kShortcutLocalConfigKey);
-    if (raw.isEmpty) return [];
-    try {
-      final parsed = jsonDecode(raw) as Map<String, dynamic>;
-      return shortcutBindingMapsFrom(parsed['bindings']);
-    } catch (_) {
-      return [];
-    }
-  }
-
-  static bool isEnabled() {
-    final raw = bind.mainGetLocalOption(key: kShortcutLocalConfigKey);
-    if (raw.isEmpty) return false;
-    try {
-      final parsed = jsonDecode(raw) as Map<String, dynamic>;
-      return parsed['enabled'] == true;
-    } catch (_) {
-      return false;
-    }
-  }
-
-  static bool isPassThrough() {
-    final raw = bind.mainGetLocalOption(key: kShortcutLocalConfigKey);
-    if (raw.isEmpty) return false;
-    try {
-      final parsed = jsonDecode(raw) as Map<String, dynamic>;
-      return parsed['pass_through'] == true;
-    } catch (_) {
-      return false;
-    }
-  }
-
-  /// Persistent companion to [isEnabled]: when on, the matchers return early
-  /// and every keystroke flows through to the remote (i.e. all bindings are
-  /// suspended). Stored in the same JSON blob so a single reload refreshes
-  /// both flags on every active matcher.
-  static Future<void> setPassThrough(bool v) async {
-    final raw = bind.mainGetLocalOption(key: kShortcutLocalConfigKey);
-    Map<String, dynamic> json = {};
-    if (raw.isNotEmpty) {
-      try {
-        json = jsonDecode(raw) as Map<String, dynamic>;
-      } catch (_) {
-        json = {};
-      }
-    }
-    json['pass_through'] = v;
-    await bind.mainSetLocalOption(
-        key: kShortcutLocalConfigKey, value: jsonEncode(json));
-    bind.mainReloadKeyboardShortcuts();
-  }
-
-  /// Flip the master `enabled` flag and persist. On the first enable we seed
-  /// the default bindings so common combos work out of the box; otherwise we
-  /// preserve whatever the user already has. Refreshes the matcher cache so
-  /// the change takes effect immediately (Rust on native, JS via the bridge
-  /// on Web).
-  static Future<void> setEnabled(bool v) async {
-    final raw = bind.mainGetLocalOption(key: kShortcutLocalConfigKey);
-    Map<String, dynamic> json = {};
-    if (raw.isNotEmpty) {
-      try {
-        json = jsonDecode(raw) as Map<String, dynamic>;
-      } catch (_) {
-        json = {};
-      }
-    }
-    json['enabled'] = v;
-    final list = shortcutBindingMapsFrom(json['bindings']);
-    if (v && list.isEmpty) {
-      json['bindings'] = filterDefaultBindingsForPlatform(
-        jsonDecode(bind.mainGetDefaultKeyboardShortcuts()) as List,
-        currentPlatformCapabilities(),
-      );
-    } else {
-      json['bindings'] = list;
-    }
-    await bind.mainSetLocalOption(
-        key: kShortcutLocalConfigKey, value: jsonEncode(json));
-    bind.mainReloadKeyboardShortcuts();
-  }
-
-  /// Single source of truth for the per-platform "is this shortcut applicable"
-  /// decisions. Both [setEnabled]'s default-seeding pass and the configuration
-  /// page's reset / list-rendering paths read from here, so the seed list and
-  /// the visible action list can never disagree on which platform a given
-  /// action belongs to.
-  ///
-  /// Capability rationale:
-  ///   * Fullscreen / Toolbar / Pin / View Mode: rendered wherever the
-  ///     desktop layout applies (native desktop + Web). Native mobile is
-  ///     permanently full-screen and doesn't have a desktop-style toolbar.
-  ///   * Screenshot / Switch Sides: native desktop only. The Web bridge
-  ///     throws UnimplementedError for `sessionTakeScreenshot`; mobile
-  ///     toolbars don't surface either action.
-  ///   * Tab navigation / Close Tab: only native desktop ships
-  ///     `DesktopTabController`; Web's `RemotePage` is invoked without one.
-  ///   * Recording: native desktop has the `_RecordMenu` widget +
-  ///     `registerSessionShortcutActions` registration; native Android has
-  ///     the `toolbarControls` entry; iOS short-circuits inside
-  ///     `recordingModel.toggle()`; Web has no implementation.
-  ///   * Reset Canvas: only the mobile toolbar builds the menu entry
-  ///     (`isDefaultConn && isMobile` in `toolbarControls`).
-  ///   * Input Source: Web only ships a single source so toggling is a
-  ///     no-op; the toolbar menu hides itself when fewer than 2 sources are
-  ///     advertised.
-  ///   * Voice Call: Web bridge throws `UnimplementedError` for both
-  ///     `sessionRequestVoiceCall` and `sessionCloseVoiceCall`.
-  static ShortcutPlatformCapabilities currentPlatformCapabilities() {
-    final desktopLayout = isDesktop || isWeb;
-    return ShortcutPlatformCapabilities(
-      includeFullscreenShortcut: desktopLayout,
-      includeScreenshotShortcut: isDesktop,
-      includeTabShortcuts: isDesktop,
-      includeToolbarShortcut: desktopLayout,
-      includeCloseTabShortcut: isDesktop,
-      includeSwitchSidesShortcut: isDesktop,
-      includeRecordingShortcut: !isWeb && !isIOS,
-      includeResetCanvasShortcut: isMobile,
-      includePinToolbarShortcut: desktopLayout,
-      includeViewModeShortcut: desktopLayout,
-      includeInputSourceShortcut: !isWeb,
-      includeVoiceCallShortcut: !isWeb,
-    );
-  }
-}
-
-/// Register the default-bound shortcut actions that aren't already wired by
-/// `toolbarControls(...)` (which handles things like Ctrl+Alt+Shift+Del and the
-/// screenshot action). Called once per session from the desktop / mobile
-/// remote page, after the toolbar registrations have run.
-///
-/// We register unconditionally — even when shortcuts are master-disabled —
-/// because the matcher (Rust + JS) gates dispatch via the `enabled` flag,
-/// so registered closures are functionally invisible until the user flips
-/// shortcuts on. This keeps the wiring simple (no rebind callbacks across
-/// sessions) and lets the user toggle shortcuts mid-session without
-/// reconnecting.
-///
-/// [tabController] is the desktop window's tab controller; `null` on mobile /
-/// web (where tab-switch shortcuts don't apply).
-///
-/// Each callback below is a no-op when the underlying state required to
-/// service the action isn't available (e.g. only one display, only one tab).
-void registerSessionShortcutActions(
-  FFI ffi, {
-  DesktopTabController? tabController,
-  ToolbarState? toolbarState,
-}) {
-  final sessionId = ffi.sessionId;
-
-  // Note on disposal: every closure registered below captures `ffi` via
-  // closure environment, so the FFI object stays alive for the duration of
-  // the closure's execution — even across awaits, even if the session is
-  // closed mid-execution. We therefore don't add per-closure liveness
-  // guards: a `WeakReference<FFI>` check would never go null while the
-  // closure is on the call stack, and the underlying `bind.session*` /
-  // model setters tolerate stale-session calls (they no-op on torn-down
-  // sessions). ShortcutModel.onTriggered's existing entry guard
-  // (`_callbacks` lookup returning null after disposal) is the actual
-  // liveness gate.
-
-  // Toggle Fullscreen — available wherever the desktop layout renders
-  // (native desktop + every Web browser, since Web uses the desktop
-  // RemotePage). `stateGlobal.setFullscreen` handles native window vs.
-  // browser fullscreen. Native mobile is permanently full-screen, so the
-  // action is intentionally not registered there.
-  if (isDesktop || isWeb) {
-    ffi.shortcutModel.register(kShortcutActionToggleFullscreen, () {
-      stateGlobal.setFullscreen(!stateGlobal.fullscreen.value);
-    });
-  }
-
-  // Toggle Recording — desktop only here. Mobile already wires this through
-  // `toolbarControls` (which adds a recording entry on `!(isDesktop||isWeb)`),
-  // but the desktop toolbar uses a separate `_RecordMenu` widget that has no
-  // `actionId`. Without this explicit registration a desktop user could bind
-  // Toggle Recording in settings and the press would have no handler.
-  // `recordingModel.toggle()` itself short-circuits on iOS and on sessions
-  // without recording permission.
-  if (isDesktop) {
-    ffi.shortcutModel.register(kShortcutActionToggleRecording, () {
-      ffi.recordingModel.toggle();
-    });
-  }
-
-  // Switch Display Next / Prev — requires the peer to have at least 2
-  // displays. From the "All displays" merged view, Next jumps to display 0
-  // and Prev to the last display, so the user can always escape the merged
-  // view via these shortcuts.
-  void switchDisplayBy(int delta) {
-    final pi = ffi.ffiModel.pi;
-    final count = pi.displays.length;
-    if (count <= 1) return;
-    final current = pi.currentDisplay;
-    final int next;
-    if (current == kAllDisplayValue) {
-      next = delta > 0 ? 0 : count - 1;
-    } else {
-      next = ((current + delta) % count + count) % count;
-    }
-    bind.sessionSwitchDisplay(
-      isDesktop: isDesktop,
-      sessionId: sessionId,
-      value: Int32List.fromList([next]),
-    );
-    if (pi.isSupportMultiUiSession) {
-      // On multi-ui-session peers no switch-display message is sent back, so
-      // update the local state directly (mirrors `model.dart` handling).
-      ffi.ffiModel.switchToNewDisplay(next, sessionId, ffi.id);
-    }
-  }
-
-  ffi.shortcutModel.register(kShortcutActionSwitchDisplayNext, () {
-    switchDisplayBy(1);
-  });
-  ffi.shortcutModel.register(kShortcutActionSwitchDisplayPrev, () {
-    switchDisplayBy(-1);
-  });
-
-  // Switch to all-monitors view — mirrors the toolbar Monitor menu's
-  // "all monitors" button (only built when peer has >1 display). Not a
-  // toggle: the toolbar button just sets the merged view; another action
-  // (Switch to next/previous display, or another monitor button) takes
-  // you back to a single display.
-  //
-  // Use `openMonitorInTheSameTab(kAllDisplayValue, ...)` rather than calling
-  // `sessionSwitchDisplay` with `[kAllDisplayValue]` directly — the toolbar
-  // path treats `kAllDisplayValue` as a UI sentinel and expands it to the
-  // real display index list (`[0, 1, ...]`) before sending, then updates
-  // local FfiModel state. Sending `[-1]` raw produces a wire value the
-  // remote can't act on and skips the local state update, so the merged
-  // view never engages.
-  ffi.shortcutModel.register(kShortcutActionSwitchDisplayAll, () {
-    final pi = ffi.ffiModel.pi;
-    if (pi.displays.length <= 1) return;
-    if (pi.currentDisplay == kAllDisplayValue) return;
-    openMonitorInTheSameTab(kAllDisplayValue, ffi, pi);
-  });
-
-  // Switch tab next / prev — desktop only. The remote-screen tabs live in
-  // the window-scoped DesktopTabController, not on the FFI itself, so we
-  // need the controller from the page that owns this session. We
-  // intentionally don't expose positional ("Switch to tab N") shortcuts:
-  // counting tabs in a long list is impractical, and AnyDesk / Chrome
-  // standard practice is to favour next/prev navigation.
-  if (tabController != null) {
-    void switchTabBy(int delta) {
-      final tabs = tabController.state.value.tabs;
-      if (tabs.length <= 1) return;
-      final cur = tabs.indexWhere((t) => t.key == ffi.id);
-      if (cur < 0) return;
-      final next = (cur + delta + tabs.length) % tabs.length;
-      tabController.jumpTo(next);
-    }
-
-    ffi.shortcutModel
-        .register(kShortcutActionSwitchTabNext, () => switchTabBy(1));
-    ffi.shortcutModel
-        .register(kShortcutActionSwitchTabPrev, () => switchTabBy(-1));
-
-    // Close Tab — desktop only. Mirrors the tab right-click "Close" entry,
-    // including the audit-log confirmation dialog so a shortcut close goes
-    // through the same path as a menu close.
-    ffi.shortcutModel.register(kShortcutActionCloseTab, () async {
-      if (await desktopTryShowTabAuditDialogCloseCancelled(
-        id: ffi.id,
-        tabController: tabController,
-      )) {
-        return;
-      }
-      tabController.closeBy(ffi.id);
-    });
-  }
-
-  // Toggle Toolbar — desktop only. ToolbarState is window/session-scoped,
-  // owned by the RemotePage that hosts this session.
-  if (toolbarState != null) {
-    ffi.shortcutModel.register(kShortcutActionToggleToolbar, () {
-      toolbarState.switchHide(sessionId);
-    });
-    ffi.shortcutModel.register(kShortcutActionPinToolbar, () {
-      toolbarState.switchPin();
-    });
-  }
-
-  // Toggle Chat overlay (open/close the chat panel for this session).
-  // _ChatMenu is a standalone toolbar icon — not part of any toolbar
-  // helper that returns a TToggleMenu list — so its handler is wired
-  // here rather than picked up by helper auto-register.
-  ffi.shortcutModel.register(kShortcutActionToggleChat, () {
-    ffi.chatModel.toggleChatOverlay();
-  });
-
-  // Toggle Voice Call — start when idle, hang up when active. Mirrors the
-  // toolbar's `_VoiceCallMenu` state-driven button. Web bridge throws
-  // UnimplementedError on both sessionRequestVoiceCall and
-  // sessionCloseVoiceCall, so we don't register on web.
-  if (!isWeb) {
-    ffi.shortcutModel.register(kShortcutActionToggleVoiceCall, () {
-      final status = ffi.chatModel.voiceCallStatus.value;
-      if (status == VoiceCallStatus.connected ||
-          status == VoiceCallStatus.waitingForResponse) {
-        bind.sessionCloseVoiceCall(sessionId: sessionId);
-      } else {
-        bind.sessionRequestVoiceCall(sessionId: sessionId);
-      }
-    });
-  }
-
-  // ── Inline _KeyboardMenu items + actions with no toolbar TToggleMenu/TRadioMenu ─
-  // The toolbar's TToggleMenu / TRadioMenu helpers (toolbarDisplayToggle,
-  // toolbarCursor, toolbarKeyboardToggles, toolbarCodec, toolbarPrivacyMode,
-  // toolbarViewStyle, toolbarImageQuality) auto-register their tagged entries
-  // from the bottom of each helper. The handlers below cover what those
-  // helpers DON'T own:
-  //   * Show my cursor / Keyboard mode (Map/Translate/Legacy) / View Only
-  //     (desktop) — built as widgets directly in `_KeyboardMenu`, not as
-  //     TToggleMenu lists. (Mobile View Only IS in toolbarDisplayToggle and
-  //     auto-registers; the desktop session-start handler below registers
-  //     first and the helper's auto-register on mobile takes over after its
-  //     unawaited future resolves.)
-  //   * Plug out all virtual displays — built in `getVirtualDisplayMenuChildren`
-  //     as a MenuButton, not a TToggleMenu.
-  //   * Toggle Input Source — cycle action; the toolbar exposes per-source
-  //     radios but no single "cycle to next source" entry.
-
-  // Show my cursor — toolbar (`_KeyboardMenu.showMyCursor`) pushes the new
-  // value into FfiModel.setShowMyCursor and auto-enables view-only when the
-  // toggle goes on, so the user can never control the remote with their own
-  // cursor visible.
-  ffi.shortcutModel.register(kShortcutActionToggleShowMyCursor, () async {
-    await bind.sessionToggleOption(
-        sessionId: sessionId, value: kOptionToggleShowMyCursor);
-    final showMyCursor = await bind.sessionGetToggleOption(
-            sessionId: sessionId, arg: kOptionToggleShowMyCursor) ??
-        false;
-    ffi.ffiModel.setShowMyCursor(showMyCursor);
-    if (showMyCursor && !ffi.ffiModel.viewOnly) {
-      await bind.sessionToggleOption(
-          sessionId: sessionId, value: kOptionToggleViewOnly);
-      final viewOnly = await bind.sessionGetToggleOption(
-              sessionId: sessionId, arg: kOptionToggleViewOnly) ??
-          false;
-      ffi.ffiModel.setViewOnly(ffi.id, viewOnly);
-    }
-  });
-
-  // Keyboard mode (Map / Translate / Legacy). Mirrors the radio buttons in
-  // `_KeyboardMenu.keyboardMode()` (built as RdoMenuButton, not TRadioMenu).
-  void registerKeyboardMode(String actionId, String mode) {
-    ffi.shortcutModel.register(actionId, () async {
-      await bind.sessionSetKeyboardMode(sessionId: sessionId, value: mode);
-      await ffi.inputModel.updateKeyboardMode();
-    });
-  }
-
-  registerKeyboardMode(kShortcutActionKeyboardModeMap, kKeyMapMode);
-  registerKeyboardMode(kShortcutActionKeyboardModeTranslate, kKeyTranslateMode);
-  registerKeyboardMode(kShortcutActionKeyboardModeLegacy, kKeyLegacyMode);
-
-  // Plug out all virtual displays (Windows + IDD only). Mirrors the toolbar's
-  // "Plug out all" button — present in both IDD modes (RustDesk + Amyuni),
-  // built as a MenuButton inside `getVirtualDisplayMenuChildren`.
-  ffi.shortcutModel.register(kShortcutActionPlugOutAllVirtualDisplays, () {
-    bind.sessionToggleVirtualDisplay(
-      sessionId: sessionId,
-      index: kAllVirtualDisplay,
-      on: false,
-    );
-  });
-
-  // Privacy mode 1 / 2 — fallback handlers for the single-impl and null-impls
-  // branches of `toolbarPrivacyMode`. The multi-impl branch tags each entry
-  // with the matching actionId and `_registerToggleMenuShortcuts` overrides
-  // these closures with the toolbar's own onChanged. But when the peer only
-  // advertises a single impl (older Linux peers, certain platform configs)
-  // toolbarPrivacyMode returns a `getDefaultMenu` entry without an actionId,
-  // so the auto-register pass skips it — these fallbacks are what actually
-  // wire the shortcut in that case.
-  String? findPrivacyImpl(String nameKey) {
-    final impls = ffi.ffiModel.pi
-            .platformAdditions[kPlatformAdditionsSupportedPrivacyModeImpl]
-        as List<dynamic>?;
-    if (impls == null) return null;
-    for (final e in impls) {
-      if (e is List && e.length >= 2 && e[1] == nameKey) return e[0] as String;
-    }
-    return null;
-  }
-
-  // Match the multi-impl branch of `toolbarPrivacyMode`: turn this impl on iff
-  // the active impl isn't already this one. Comparing `.value == implKey`
-  // (rather than `.value.isEmpty`) means pressing the mode-1 shortcut while
-  // mode 2 is on correctly turns mode 1 ON, instead of misreading the
-  // "any-mode-active" state as "this-mode-active" and toggling OFF.
-  ffi.shortcutModel.register(kShortcutActionPrivacyMode1, () {
-    final implKey = findPrivacyImpl('privacy_mode_impl_mag_tip');
-    if (implKey == null) return;
-    bind.sessionTogglePrivacyMode(
-      sessionId: sessionId,
-      implKey: implKey,
-      on: PrivacyModeState.find(ffi.id).value != implKey,
-    );
-  });
-  ffi.shortcutModel.register(kShortcutActionPrivacyMode2, () {
-    final implKey = findPrivacyImpl('privacy_mode_impl_virtual_display_tip');
-    if (implKey == null) return;
-    bind.sessionTogglePrivacyMode(
-      sessionId: sessionId,
-      implKey: implKey,
-      on: PrivacyModeState.find(ffi.id).value != implKey,
-    );
-  });
-
-  // View Only — desktop toolbar exposes this inline in `_KeyboardMenu.viewMode`
-  // (mobile is in toolbarDisplayToggle and goes through helper auto-register).
-  // Mirrors the desktop callback: toggle + sync FfiModel.viewOnly +
-  // FfiModel.showMyCursor (the toolbar keeps these in step).
-  ffi.shortcutModel.register(kShortcutActionToggleViewOnly, () async {
-    await bind.sessionToggleOption(
-        sessionId: sessionId, value: kOptionToggleViewOnly);
-    final viewOnly = await bind.sessionGetToggleOption(
-            sessionId: sessionId, arg: kOptionToggleViewOnly) ??
-        false;
-    ffi.ffiModel.setViewOnly(ffi.id, viewOnly);
-    final showMyCursor = await bind.sessionGetToggleOption(
-            sessionId: sessionId, arg: kOptionToggleShowMyCursor) ??
-        false;
-    ffi.ffiModel.setShowMyCursor(showMyCursor);
-  });
-
-  // Toggle Reverse mouse wheel — read current 'Y'/'N' (falling back to user
-  // default), flip, write back.
-  ffi.shortcutModel.register(kShortcutActionToggleReverseMouseWheel, () async {
-    var cur = bind.sessionGetReverseMouseWheelSync(sessionId: sessionId) ?? '';
-    if (cur == '') {
-      cur = bind.mainGetUserDefaultOption(key: kKeyReverseMouseWheel);
-    }
-    final next = cur == 'Y' ? 'N' : 'Y';
-    await bind.sessionSetReverseMouseWheel(sessionId: sessionId, value: next);
-  });
-
-  // Toggle Relative mouse mode (gaming mode). Desktop only.
-  if (isDesktop && !isWeb) {
-    ffi.shortcutModel.register(kShortcutActionToggleRelativeMouseMode, () {
-      ffi.inputModel.toggleRelativeMouseMode();
-    });
-  }
-
-  // Toggle Input Source — flips between the available keyboard-event capture
-  // backends (e.g. JS vs Flutter on desktop). Mirrors the radio menu in
-  // remote_toolbar.dart::inputSource(); when fewer than 2 sources are
-  // available the menu hides itself, so this handler is a no-op too.
-  // Useful for accessibility: screen-reader users sometimes need to swap
-  // sources to regain control of the local keyboard (discussion #1933).
-  // Web only ships a single source, so we don't register on web.
-  if (!isWeb) {
-    ffi.shortcutModel.register(kShortcutActionToggleInputSource, () async {
-      final raw = bind.mainSupportedInputSource();
-      if (raw.isEmpty) return;
-      final List<dynamic> list;
-      try {
-        list = jsonDecode(raw) as List<dynamic>;
-      } catch (_) {
-        return;
-      }
-      if (list.length < 2) return;
-      final ids = list
-          .map((e) => (e is List && e.isNotEmpty) ? e[0] as String : '')
-          .where((s) => s.isNotEmpty)
-          .toList();
-      if (ids.length < 2) return;
-      final current = stateGlobal.getInputSource();
-      final idx = ids.indexOf(current);
-      final next = ids[(idx < 0 ? 0 : idx + 1) % ids.length];
-      await stateGlobal.setInputSource(sessionId, next);
-      await ffi.ffiModel.checkDesktopKeyboardMode();
-      await ffi.inputModel.updateKeyboardMode();
-    });
-  }
-}

flutter/lib/models/terminal_model.dart

@@ -27,25 +27,30 @@ class TerminalModel with ChangeNotifier {
   // Buffer for output data received before terminal view has valid dimensions.
   // This prevents NaN errors when writing to terminal before layout is complete.
   final _pendingOutputChunks = <String>[];
+  final _pendingOutputSuppressFlags = <bool>[];
   int _pendingOutputSize = 0;
   static const int _kMaxOutputBufferChars = 8 * 1024;
   // View ready state: true when terminal has valid dimensions, safe to write
   bool _terminalViewReady = false;
-
-  bool get isPeerWindows => parent.ffiModel.pi.platform == kPeerPlatformWindows;
+  bool _markViewReadyScheduled = false;
+  bool _suppressTerminalOutput = false;
+  bool _suppressNextTerminalDataOutput = false;
 
   void Function(int w, int h, int pw, int ph)? onResizeExternal;
 
   Future<void> _handleInput(String data) async {
-    // If we press the `Enter` button on Android,
-    // `data` can be '\r' or '\n' when using different keyboards.
-    // Android -> Windows. '\r' works, but '\n' does not. '\n' is just a newline.
-    // Android -> Linux. Both '\r' and '\n' work as expected (execute a command).
-    // So when we receive '\n', we may need to convert it to '\r' to ensure compatibility.
-    // Desktop -> Desktop works fine.
-    // Check if we are on mobile or web(mobile), and convert '\n' to '\r'.
+    // Soft keyboards (notably iOS) emit '\n' when Enter is pressed, while a
+    // real keyboard's Enter sends '\r'. Some Android keyboards also emit '\n'.
+    // - Peer Windows: '\r' works, '\n' is just a newline.
+    // - Peer Linux: canonical-mode shells accept both, but raw-mode apps
+    //   (readline, prompt_toolkit, vim, TUI frameworks) expect '\r'.
+    // - Peer macOS: same as Linux, raw-mode apps expect '\r'
+    //   (https://github.com/rustdesk/rustdesk/issues/14907).
+    // So on mobile / web-mobile, always normalize a lone '\n' to '\r'.
+    // We deliberately do not touch multi-character payloads (e.g. pasted text)
+    // so embedded newlines in pasted content are preserved.
     final isMobileOrWebMobile = (isMobile || (isWeb && !isWebDesktop));
-    if (isMobileOrWebMobile && isPeerWindows && data == '\n') {
+    if (isMobileOrWebMobile && data == '\n') {
       data = '\r';
     }
     if (_terminalOpened) {
@@ -70,7 +75,10 @@ class TerminalModel with ChangeNotifier {
     terminalController = TerminalController();
 
     // Setup terminal callbacks
-    terminal.onOutput = _handleInput;
+    terminal.onOutput = (data) {
+      if (_suppressTerminalOutput) return;
+      _handleInput(data);
+    };
 
     terminal.onResize = (w, h, pw, ph) async {
       // Validate all dimensions before using them
@@ -84,7 +92,7 @@ class TerminalModel with ChangeNotifier {
         // Mark terminal view as ready and flush any buffered output on first valid resize.
         // Must be after onResizeExternal so the view layer has valid dimensions before flushing.
         if (!_terminalViewReady) {
-          _markViewReady();
+          _scheduleMarkViewReady();
         }
 
         if (_terminalOpened) {
@@ -110,14 +118,16 @@ class TerminalModel with ChangeNotifier {
   void onReady() {
     parent.dialogManager.dismissAll();
 
-    // Fire and forget - don't block onReady
-    openTerminal().catchError((e) {
+    // Fire and forget - don't block onReady. If the transport reconnects while
+    // this model is still open, re-send OpenTerminal so the remote service marks
+    // the persistent session active again and resumes output streaming.
+    openTerminal(force: _terminalOpened).catchError((e) {
       debugPrint('[TerminalModel] Error opening terminal: $e');
     });
   }
 
-  Future<void> openTerminal() async {
-    if (_terminalOpened) return;
+  Future<void> openTerminal({bool force = false}) async {
+    if (_terminalOpened && !force) return;
     // Request the remote side to open a terminal with default shell
     // The remote side will decide which shell to use based on its OS
 
@@ -275,9 +285,12 @@ class TerminalModel with ChangeNotifier {
     if (success) {
       _terminalOpened = true;
 
-      // On reconnect ("Reconnected to existing terminal"), server may replay recent output.
-      // If this TerminalView instance is reused (not rebuilt), duplicate lines can appear.
-      // We intentionally accept this tradeoff for now to keep logic simple.
+      // On reconnect, the server may replay recent output. That replay can include
+      // terminal queries like DSR/DA; xterm answers them through onOutput as
+      // "^[[1;1R^[[2;2R^[[>0;0;0c", which must not be sent back to the peer.
+      final replayTerminalOutput = evt['replay_terminal_output'];
+      _suppressNextTerminalDataOutput = replayTerminalOutput == true ||
+          message == 'Reconnected to existing terminal with pending output';
 
       // Fallback: if terminal view is not yet ready but already has valid
       // dimensions (e.g. layout completed before open response arrived),
@@ -285,7 +298,7 @@ class TerminalModel with ChangeNotifier {
       if (!_terminalViewReady &&
           terminal.viewWidth > 0 &&
           terminal.viewHeight > 0) {
-        _markViewReady();
+        _scheduleMarkViewReady();
       }
 
       // Process any buffered input
@@ -297,12 +310,16 @@ class TerminalModel with ChangeNotifier {
       });
 
       final persistentSessions =
-          evt['persistent_sessions'] as List<dynamic>? ?? [];
+          (evt['persistent_sessions'] as List<dynamic>? ?? [])
+              .whereType<int>()
+              .where((id) => !parent.terminalModels.containsKey(id))
+              .toList();
       if (kWindowId != null && persistentSessions.isNotEmpty) {
         DesktopMultiWindow.invokeMethod(
             kWindowId!,
             kWindowEventRestoreTerminalSessions,
             jsonEncode({
+              'peer_id': id,
               'persistent_sessions': persistentSessions,
             }));
       }
@@ -332,6 +349,8 @@ class TerminalModel with ChangeNotifier {
     final data = evt['data'];
 
     if (data != null) {
+      final suppressTerminalOutput = _suppressNextTerminalDataOutput;
+      _suppressNextTerminalDataOutput = false;
       try {
         String text = '';
         if (data is String) {
@@ -351,7 +370,7 @@ class TerminalModel with ChangeNotifier {
           return;
         }
 
-        _writeToTerminal(text);
+        _writeToTerminal(text, suppressTerminalOutput: suppressTerminalOutput);
       } catch (e) {
         debugPrint('[TerminalModel] Failed to process terminal data: $e');
       }
@@ -361,7 +380,10 @@ class TerminalModel with ChangeNotifier {
   /// Write text to terminal, buffering if the view is not yet ready.
   /// All terminal output should go through this method to avoid NaN errors
   /// from writing before the terminal view has valid layout dimensions.
-  void _writeToTerminal(String text) {
+  void _writeToTerminal(
+    String text, {
+    bool suppressTerminalOutput = false,
+  }) {
     if (!_terminalViewReady) {
       // If a single chunk exceeds the cap, keep only its tail.
       // Note: truncation may split a multi-byte ANSI escape sequence,
@@ -373,34 +395,73 @@ class TerminalModel with ChangeNotifier {
         _pendingOutputChunks
           ..clear()
           ..add(truncated);
+        _pendingOutputSuppressFlags
+          ..clear()
+          ..add(suppressTerminalOutput);
         _pendingOutputSize = truncated.length;
       } else {
         _pendingOutputChunks.add(text);
+        _pendingOutputSuppressFlags.add(suppressTerminalOutput);
         _pendingOutputSize += text.length;
         // Drop oldest chunks if exceeds limit (whole chunks to preserve ANSI sequences)
         while (_pendingOutputSize > _kMaxOutputBufferChars &&
             _pendingOutputChunks.length > 1) {
           final removed = _pendingOutputChunks.removeAt(0);
+          _pendingOutputSuppressFlags.removeAt(0);
           _pendingOutputSize -= removed.length;
         }
       }
       return;
     }
-    terminal.write(text);
+    _writeTerminalChunk(text, suppressTerminalOutput: suppressTerminalOutput);
   }
 
   void _flushOutputBuffer() {
     if (_pendingOutputChunks.isEmpty) return;
     debugPrint(
         '[TerminalModel] Flushing $_pendingOutputSize buffered chars (${_pendingOutputChunks.length} chunks)');
-    for (final chunk in _pendingOutputChunks) {
-      terminal.write(chunk);
+    for (var i = 0; i < _pendingOutputChunks.length; i++) {
+      _writeTerminalChunk(
+        _pendingOutputChunks[i],
+        suppressTerminalOutput: _pendingOutputSuppressFlags[i],
+      );
     }
     _pendingOutputChunks.clear();
+    _pendingOutputSuppressFlags.clear();
     _pendingOutputSize = 0;
   }
 
+  void _writeTerminalChunk(
+    String text, {
+    required bool suppressTerminalOutput,
+  }) {
+    if (!suppressTerminalOutput) {
+      terminal.write(text);
+      return;
+    }
+    final previous = _suppressTerminalOutput;
+    _suppressTerminalOutput = true;
+    try {
+      terminal.write(text);
+    } finally {
+      _suppressTerminalOutput = previous;
+    }
+  }
+
   /// Mark terminal view as ready and flush buffered output.
+  void _scheduleMarkViewReady() {
+    if (_disposed || _terminalViewReady || _markViewReadyScheduled) return;
+    _markViewReadyScheduled = true;
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _markViewReadyScheduled = false;
+      if (_disposed || _terminalViewReady) return;
+      if (terminal.viewWidth > 0 && terminal.viewHeight > 0) {
+        _markViewReady();
+      }
+    });
+    WidgetsBinding.instance.ensureVisualUpdate();
+  }
+
   void _markViewReady() {
     if (_terminalViewReady) return;
     _terminalViewReady = true;
@@ -426,7 +487,10 @@ class TerminalModel with ChangeNotifier {
     // Clear buffers to free memory
     _inputBuffer.clear();
     _pendingOutputChunks.clear();
+    _pendingOutputSuppressFlags.clear();
     _pendingOutputSize = 0;
+    _markViewReadyScheduled = false;
+    _suppressNextTerminalDataOutput = false;
     // Terminal cleanup is handled server-side when service closes
     super.dispose();
   }

flutter/lib/models/web_model.dart

@@ -126,7 +126,6 @@ class PlatformFFI {
       gFFI.dialogManager.dismissAll();
       closeConnection();
     };
-    await _ffiBind.mainInit(appDir: '');
     context.callMethod('init');
     version = getByName('version');
     window.onContextMenu.listen((event) {

flutter/lib/web/bridge.dart

@@ -7,7 +7,6 @@ import 'package:uuid/uuid.dart';
 import 'dart:html' as html;
 
 import 'package:flutter_hbb/consts.dart';
-import 'package:flutter_hbb/models/shortcut_model.dart';
 
 final _privateConstructorUsedError = UnsupportedError(
     'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
@@ -931,21 +930,6 @@ class RustdeskImpl {
         ]));
   }
 
-  // Tell the JS-side matcher (flutter/web/js/src/shortcut_matcher.ts) to
-  // re-read its bindings from LocalStorage. Mirrors the native call which
-  // refreshes the Rust matcher's in-memory cache.
-  void mainReloadKeyboardShortcuts({dynamic hint}) {
-    js.context.callMethod('reloadShortcuts', []);
-  }
-
-  // Web has no Rust at runtime, so the defaults seed comes from the
-  // [kDefaultShortcutBindings] canonical in shortcut_constants.dart. Parity
-  // with Rust's `default_bindings()` is enforced by tests on both sides
-  // against `flutter/test/fixtures/default_keyboard_shortcuts.json`.
-  String mainGetDefaultKeyboardShortcuts({dynamic hint}) {
-    return jsonEncode(kDefaultShortcutBindings);
-  }
-
   String mainGetInputSource({dynamic hint}) {
     final inputSource =
         js.context.callMethod('getByName', ['option:local', 'input-source']);
@@ -1192,16 +1176,6 @@ class RustdeskImpl {
   }
 
   Future<void> mainInit({required String appDir, dynamic hint}) {
-    // JS -> Dart shortcut bridge. The matcher in flutter/web/js/src/
-    // shortcut_matcher.ts calls `window.onShortcutTriggered(actionId)` when a
-    // binding fires; route it to the active session's ShortcutModel.
-    // Web uses a JS-side connection, so the event does not arrive through the
-    // native session event stream.
-    js.context['onShortcutTriggered'] = (dynamic action) {
-      if (action is String) {
-        ShortcutModel.onWebTriggered(action);
-      }
-    };
     return Future.value();
   }
 
@@ -1755,7 +1729,7 @@ class RustdeskImpl {
   }
 
   String mainSupportedPrivacyModeImpls({dynamic hint}) {
-    throw UnimplementedError("mainSupportedPrivacyModeImpls");
+    return '[]';
   }
 
   String mainSupportedInputSource({dynamic hint}) {

flutter/test/fixtures/default_keyboard_shortcuts.json

@@ -1,11 +0,0 @@
-[
-  {"action": "send_ctrl_alt_del",         "mods": ["primary", "alt", "shift"], "key": "delete"},
-  {"action": "toggle_fullscreen",         "mods": ["primary", "alt", "shift"], "key": "enter"},
-  {"action": "switch_display_next",       "mods": ["primary", "alt", "shift"], "key": "arrow_right"},
-  {"action": "switch_display_prev",       "mods": ["primary", "alt", "shift"], "key": "arrow_left"},
-  {"action": "screenshot",                "mods": ["primary", "alt", "shift"], "key": "p"},
-  {"action": "toggle_show_remote_cursor", "mods": ["primary", "alt", "shift"], "key": "m"},
-  {"action": "toggle_mute",               "mods": ["primary", "alt", "shift"], "key": "s"},
-  {"action": "toggle_block_input",        "mods": ["primary", "alt", "shift"], "key": "i"},
-  {"action": "toggle_chat",               "mods": ["primary", "alt", "shift"], "key": "c"}
-]

flutter/test/fixtures/supported_shortcut_keys.json

@@ -1,11 +0,0 @@
-[
-  "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m",
-  "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z",
-  "digit0", "digit1", "digit2", "digit3", "digit4",
-  "digit5", "digit6", "digit7", "digit8", "digit9",
-  "f1", "f2", "f3", "f4", "f5", "f6",
-  "f7", "f8", "f9", "f10", "f11", "f12",
-  "delete", "backspace", "tab", "space", "enter",
-  "arrow_left", "arrow_right", "arrow_up", "arrow_down",
-  "home", "end", "page_up", "page_down", "insert"
-]

flutter/test/keyboard_shortcuts_test.dart

@@ -1,465 +0,0 @@
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:flutter/services.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:flutter_hbb/common/widgets/keyboard_shortcuts/shortcut_actions.dart';
-import 'package:flutter_hbb/common/widgets/keyboard_shortcuts/shortcut_constants.dart';
-import 'package:flutter_hbb/common/widgets/keyboard_shortcuts/shortcut_utils.dart';
-
-ShortcutPlatformCapabilities capabilities({
-  bool includeFullscreenShortcut = true,
-  bool includeScreenshotShortcut = true,
-  bool includeTabShortcuts = true,
-  bool includeToolbarShortcut = true,
-  bool includeCloseTabShortcut = true,
-  bool includeSwitchSidesShortcut = true,
-  bool includeRecordingShortcut = true,
-  bool includeResetCanvasShortcut = true,
-  bool includePinToolbarShortcut = true,
-  bool includeViewModeShortcut = true,
-  bool includeInputSourceShortcut = true,
-  bool includeVoiceCallShortcut = true,
-}) {
-  return ShortcutPlatformCapabilities(
-    includeFullscreenShortcut: includeFullscreenShortcut,
-    includeScreenshotShortcut: includeScreenshotShortcut,
-    includeTabShortcuts: includeTabShortcuts,
-    includeToolbarShortcut: includeToolbarShortcut,
-    includeCloseTabShortcut: includeCloseTabShortcut,
-    includeSwitchSidesShortcut: includeSwitchSidesShortcut,
-    includeRecordingShortcut: includeRecordingShortcut,
-    includeResetCanvasShortcut: includeResetCanvasShortcut,
-    includePinToolbarShortcut: includePinToolbarShortcut,
-    includeViewModeShortcut: includeViewModeShortcut,
-    includeInputSourceShortcut: includeInputSourceShortcut,
-    includeVoiceCallShortcut: includeVoiceCallShortcut,
-  );
-}
-
-void main() {
-  test('kDefaultShortcutBindings matches fixture', () {
-    // The fixture is the cross-language source of truth for default
-    // bindings. Rust has its own parity test against the same file
-    // (`default_bindings_match_fixture_json` in src/keyboard/shortcuts.rs),
-    // so a drift on either side breaks CI.
-    final fixturePath = 'test/fixtures/default_keyboard_shortcuts.json';
-    final fixture =
-        jsonDecode(File(fixturePath).readAsStringSync()) as List<dynamic>;
-    expect(kDefaultShortcutBindings, equals(fixture),
-        reason: 'kDefaultShortcutBindings drifted from $fixturePath — update '
-            'shortcut_constants.dart, the fixture, and Rust default_bindings() '
-            'together');
-  });
-
-  test('save order preserves macOS control modifier', () {
-    expect(canonicalShortcutModsForSave({'ctrl'}), ['ctrl']);
-    expect(canonicalShortcutModsForSave({'shift', 'ctrl', 'primary', 'alt'}),
-        ['primary', 'ctrl', 'alt', 'shift']);
-  });
-
-  test('shortcutBindingMapsFrom ignores malformed bindings', () {
-    expect(shortcutBindingMapsFrom('not a list'), isEmpty);
-
-    final bindings = shortcutBindingMapsFrom([
-      {
-        'action': kShortcutActionScreenshot,
-        'mods': ['primary'],
-        'key': 'p',
-      },
-      'bad',
-      1,
-      {
-        'action': kShortcutActionToggleMute,
-        'mods': ['alt'],
-        'key': 's',
-      },
-    ]);
-
-    expect(bindings, hasLength(2));
-    expect(bindings.map((binding) => binding['action']), [
-      kShortcutActionScreenshot,
-      kShortcutActionToggleMute,
-    ]);
-  });
-
-  test('shortcutModSetFrom ignores malformed modifiers', () {
-    expect(shortcutModSetFrom('not a list'), isEmpty);
-    expect(shortcutModSetFrom(['primary', 1, 'alt', null, 'primary']), {
-      'primary',
-      'alt',
-    });
-  });
-
-  test('non-desktop defaults exclude desktop-only and tab shortcuts', () {
-    final defaults = [
-      {
-        'action': kShortcutActionSendCtrlAltDel,
-        'mods': ['primary', 'alt', 'shift'],
-        'key': 'delete',
-      },
-      {
-        'action': kShortcutActionToggleFullscreen,
-        'mods': ['primary', 'alt', 'shift'],
-        'key': 'enter',
-      },
-      {
-        'action': kShortcutActionSwitchDisplayNext,
-        'mods': ['primary', 'alt', 'shift'],
-        'key': 'arrow_right',
-      },
-      {
-        'action': kShortcutActionScreenshot,
-        'mods': ['primary', 'alt', 'shift'],
-        'key': 'p',
-      },
-      {
-        'action': kShortcutActionSwitchTabNext,
-        'mods': ['primary', 'alt', 'shift'],
-        'key': 'right_bracket',
-      },
-      {
-        'action': kShortcutActionToggleRelativeMouseMode,
-        'mods': ['primary', 'alt', 'shift'],
-        'key': 'g',
-      },
-    ];
-
-    final filtered = filterDefaultBindingsForPlatform(
-      defaults,
-      capabilities(
-        includeFullscreenShortcut: false,
-        includeScreenshotShortcut: false,
-        includeTabShortcuts: false,
-        includeToolbarShortcut: false,
-        includeCloseTabShortcut: false,
-        includeSwitchSidesShortcut: false,
-        includeRecordingShortcut: false,
-        includeResetCanvasShortcut: false,
-        includePinToolbarShortcut: false,
-        includeViewModeShortcut: false,
-        includeInputSourceShortcut: false,
-        includeVoiceCallShortcut: false,
-      ),
-    );
-
-    expect(filtered.map((binding) => binding['action']), [
-      kShortcutActionSendCtrlAltDel,
-      kShortcutActionSwitchDisplayNext,
-    ]);
-  });
-
-  Set<String> idSet(Iterable<KeyboardShortcutActionGroup> groups) =>
-      {for (final e in allActionEntries(groups)) e.id};
-
-  /// Convenience: extract the children of the named group as a flat list of
-  /// human-readable tokens. Subgroups appear as `'group:<title>'` followed
-  /// by their entries, so call sites can assert on full ordering (subgroups
-  /// interleaved with direct items) in one expectation.
-  List<String> childTokens(
-      List<KeyboardShortcutActionGroup> groups, String titleKey) {
-    final group = groups.firstWhere((g) => g.titleKey == titleKey);
-    final out = <String>[];
-    for (final child in group.children) {
-      switch (child) {
-        case KeyboardShortcutActionEntry():
-          out.add(child.id);
-        case KeyboardShortcutActionSubgroup():
-          out.add('group:${child.titleKey}');
-          for (final entry in child.entries) {
-            out.add('  ${entry.id}');
-          }
-      }
-    }
-    return out;
-  }
-
-  test('filterKeyboardShortcutActionGroupsForPlatform strips desktop-only', () {
-    final groups = filterKeyboardShortcutActionGroupsForPlatform(
-      capabilities(
-        includeFullscreenShortcut: false,
-        includeScreenshotShortcut: false,
-        includeTabShortcuts: false,
-        includeToolbarShortcut: false,
-        includeCloseTabShortcut: false,
-        includeSwitchSidesShortcut: false,
-        // Recording / Reset Canvas are intentionally still included here —
-        // they have non-desktop platforms (mobile Android / mobile both).
-        includeRecordingShortcut: true,
-        includeResetCanvasShortcut: true,
-        includePinToolbarShortcut: false,
-        includeViewModeShortcut: false,
-        includeInputSourceShortcut: false,
-        includeVoiceCallShortcut: false,
-      ),
-    );
-    final ids = idSet(groups);
-    // Desktop-only actions are stripped.
-    expect(ids, isNot(contains(kShortcutActionToggleFullscreen)));
-    expect(ids, isNot(contains(kShortcutActionToggleRelativeMouseMode)));
-    expect(ids, isNot(contains(kShortcutActionScreenshot)));
-    expect(ids, isNot(contains(kShortcutActionToggleToolbar)));
-    expect(ids, isNot(contains(kShortcutActionCloseTab)));
-    expect(ids, isNot(contains(kShortcutActionSwitchSides)));
-    expect(ids, isNot(contains(kShortcutActionPinToolbar)));
-    expect(ids, isNot(contains(kShortcutActionViewModeOriginal)));
-    expect(ids, isNot(contains(kShortcutActionViewModeAdaptive)));
-    expect(ids, isNot(contains(kShortcutActionSwitchTabNext)));
-    expect(ids, isNot(contains(kShortcutActionSwitchTabPrev)));
-    // Cross-platform actions survive.
-    expect(ids, contains(kShortcutActionSendCtrlAltDel));
-    expect(ids, contains(kShortcutActionInsertLock));
-    expect(ids, contains(kShortcutActionRestartRemote));
-    expect(ids, contains(kShortcutActionSwitchDisplayNext));
-    expect(ids, contains(kShortcutActionToggleRecording));
-    expect(ids, contains(kShortcutActionResetCanvas));
-    expect(ids, contains(kShortcutActionToggleMute));
-  });
-
-  test(
-      'filterKeyboardShortcutActionGroupsForPlatform hides Toggle Recording on Web/iOS',
-      () {
-    final groups = filterKeyboardShortcutActionGroupsForPlatform(
-      capabilities(includeRecordingShortcut: false),
-    );
-    final ids = idSet(groups);
-    expect(ids, isNot(contains(kShortcutActionToggleRecording)));
-    // Other Session Control entries unaffected.
-    expect(ids, contains(kShortcutActionSendCtrlAltDel));
-    expect(ids, contains(kShortcutActionInsertLock));
-  });
-
-  test(
-      'filterKeyboardShortcutActionGroupsForPlatform keeps full set on desktop',
-      () {
-    final groups =
-        filterKeyboardShortcutActionGroupsForPlatform(capabilities());
-    expect(idSet(groups), equals(idSet(kKeyboardShortcutActionGroups)));
-  });
-
-  test('shortcut action groups follow toolbar menu order', () {
-    final groups = kKeyboardShortcutActionGroups;
-
-    // Top-level groups in toolbar order.
-    expect(
-      groups.map((g) => g.titleKey).toList(),
-      ['Monitor', 'Control Actions', 'Display', 'Keyboard', 'Chat', 'Other'],
-    );
-
-    // Display: subgroups (View Mode → Image Quality → Codec → Virtual
-    // display) first, then direct items (cursor toggles + display toggles),
-    // then Privacy mode subgroup last — exactly matching `_DisplayMenu`.
-    expect(childTokens(groups, 'Display'), [
-      'group:View Mode',
-      '  $kShortcutActionViewModeOriginal',
-      '  $kShortcutActionViewModeAdaptive',
-      '  $kShortcutActionViewModeCustom',
-      'group:Image Quality',
-      '  $kShortcutActionImageQualityBest',
-      '  $kShortcutActionImageQualityBalanced',
-      '  $kShortcutActionImageQualityLow',
-      'group:Codec',
-      '  $kShortcutActionCodecAuto',
-      '  $kShortcutActionCodecVp8',
-      '  $kShortcutActionCodecVp9',
-      '  $kShortcutActionCodecAv1',
-      '  $kShortcutActionCodecH264',
-      '  $kShortcutActionCodecH265',
-      'group:Virtual display',
-      '  $kShortcutActionPlugOutAllVirtualDisplays',
-      kShortcutActionToggleShowRemoteCursor,
-      kShortcutActionToggleFollowRemoteCursor,
-      kShortcutActionToggleFollowRemoteWindow,
-      kShortcutActionToggleZoomCursor,
-      kShortcutActionToggleQualityMonitor,
-      kShortcutActionToggleMute,
-      kShortcutActionToggleEnableFileCopyPaste,
-      kShortcutActionToggleDisableClipboard,
-      kShortcutActionToggleLockAfterSessionEnd,
-      kShortcutActionToggleTrueColor,
-      'group:Privacy mode',
-      '  $kShortcutActionPrivacyMode1',
-      '  $kShortcutActionPrivacyMode2',
-    ]);
-
-    // Privacy mode is the last child under Display (matching the toolbar's
-    // submenu order — `_DisplayMenu` adds Privacy mode after the toggles).
-    final displayChildren =
-        groups.firstWhere((g) => g.titleKey == 'Display').children;
-    expect(displayChildren.last, isA<KeyboardShortcutActionSubgroup>());
-    expect(
-      (displayChildren.last as KeyboardShortcutActionSubgroup).titleKey,
-      'Privacy mode',
-    );
-
-    // Keyboard: Keyboard mode subgroup first, then direct items —
-    // matching `_KeyboardMenu`.
-    expect(childTokens(groups, 'Keyboard'), [
-      'group:Keyboard mode',
-      '  $kShortcutActionKeyboardModeLegacy',
-      '  $kShortcutActionKeyboardModeMap',
-      '  $kShortcutActionKeyboardModeTranslate',
-      kShortcutActionToggleInputSource,
-      kShortcutActionToggleViewOnly,
-      kShortcutActionToggleShowMyCursor,
-      kShortcutActionToggleSwapCtrlCmd,
-      kShortcutActionToggleRelativeMouseMode,
-      kShortcutActionToggleReverseMouseWheel,
-      kShortcutActionToggleSwapLeftRightMouse,
-    ]);
-  });
-
-  test('filterKeyboardShortcutActionGroupsForPlatform drops empty groups', () {
-    // Sanity: KeyboardShortcutActionGroup ctor still accepts a single direct
-    // entry as a child.
-    final original = [
-      KeyboardShortcutActionGroup('TestGroup', [
-        KeyboardShortcutActionEntry(kShortcutActionCloseTab, 'Close Tab'),
-      ]),
-    ];
-    expect(original.first.children, hasLength(1));
-
-    // With every capability flag off, groups whose items are all behind
-    // those flags get dropped. Display / Keyboard parent groups still carry
-    // cross-platform direct items so they survive even when the gated
-    // subgroups thin out.
-    final groups = filterKeyboardShortcutActionGroupsForPlatform(
-      capabilities(
-        includeFullscreenShortcut: false,
-        includeScreenshotShortcut: false,
-        includeTabShortcuts: false,
-        includeToolbarShortcut: false,
-        includeCloseTabShortcut: false,
-        includeSwitchSidesShortcut: false,
-        includeRecordingShortcut: false,
-        includeResetCanvasShortcut: false,
-        includePinToolbarShortcut: false,
-        includeViewModeShortcut: false,
-        includeInputSourceShortcut: false,
-        includeVoiceCallShortcut: false,
-      ),
-    );
-    final titles = groups.map((g) => g.titleKey).toList();
-    // "Other" has nothing but platform-gated entries → dropped entirely.
-    expect(titles, isNot(contains('Other')));
-    // Parent groups with cross-platform direct items survive.
-    expect(titles, contains('Display'));
-    expect(titles, contains('Keyboard'));
-    // The "View Mode" subgroup under Display is gated by includeViewModeShortcut,
-    // so it must be absent from Display's surviving children.
-    final displayChildren =
-        groups.firstWhere((g) => g.titleKey == 'Display').children;
-    final subgroupTitles = displayChildren
-        .whereType<KeyboardShortcutActionSubgroup>()
-        .map((s) => s.titleKey)
-        .toList();
-    expect(subgroupTitles, isNot(contains('View Mode')));
-    // No surviving group is empty either way.
-    expect(groups.every((g) => g.children.isNotEmpty), isTrue);
-    // No surviving subgroup is empty.
-    for (final group in groups) {
-      for (final child in group.children) {
-        if (child is KeyboardShortcutActionSubgroup) {
-          expect(child.entries, isNotEmpty,
-              reason: 'subgroup "${child.titleKey}" should not be empty');
-        }
-      }
-    }
-  });
-
-  test('logicalKeyName covers the supported-keys fixture', () {
-    // The fixture is the cross-language source of truth for the full set of
-    // shortcut-bindable key names. Rust has a mirror test against the same
-    // file (`supported_keys_match_fixture` in src/keyboard/shortcuts.rs).
-    // Drift on either side breaks one of the two tests.
-    final fixturePath = 'test/fixtures/supported_shortcut_keys.json';
-    final fixture =
-        (jsonDecode(File(fixturePath).readAsStringSync()) as List<dynamic>)
-            .cast<String>()
-            .toSet();
-
-    // Hand-rolled (LogicalKeyboardKey, name) round-trip table. Adding a key
-    // requires updates in three places: the fixture, this table, and Rust's
-    // matching table — that's the price of the parity guarantee.
-    final mappings = <(LogicalKeyboardKey, String)>[
-      for (var c = 0; c < 26; c++)
-        (
-          LogicalKeyboardKey(0x00000000061 + c),
-          String.fromCharCode(0x61 + c),
-        ),
-      for (var d = 0; d < 10; d++)
-        (LogicalKeyboardKey(0x00000000030 + d), 'digit$d'),
-      (LogicalKeyboardKey.f1, 'f1'),
-      (LogicalKeyboardKey.f2, 'f2'),
-      (LogicalKeyboardKey.f3, 'f3'),
-      (LogicalKeyboardKey.f4, 'f4'),
-      (LogicalKeyboardKey.f5, 'f5'),
-      (LogicalKeyboardKey.f6, 'f6'),
-      (LogicalKeyboardKey.f7, 'f7'),
-      (LogicalKeyboardKey.f8, 'f8'),
-      (LogicalKeyboardKey.f9, 'f9'),
-      (LogicalKeyboardKey.f10, 'f10'),
-      (LogicalKeyboardKey.f11, 'f11'),
-      (LogicalKeyboardKey.f12, 'f12'),
-      (LogicalKeyboardKey.delete, 'delete'),
-      (LogicalKeyboardKey.backspace, 'backspace'),
-      (LogicalKeyboardKey.tab, 'tab'),
-      (LogicalKeyboardKey.space, 'space'),
-      (LogicalKeyboardKey.enter, 'enter'),
-      (LogicalKeyboardKey.numpadEnter, 'enter'),
-      (LogicalKeyboardKey.arrowLeft, 'arrow_left'),
-      (LogicalKeyboardKey.arrowRight, 'arrow_right'),
-      (LogicalKeyboardKey.arrowUp, 'arrow_up'),
-      (LogicalKeyboardKey.arrowDown, 'arrow_down'),
-      (LogicalKeyboardKey.home, 'home'),
-      (LogicalKeyboardKey.end, 'end'),
-      (LogicalKeyboardKey.pageUp, 'page_up'),
-      (LogicalKeyboardKey.pageDown, 'page_down'),
-      (LogicalKeyboardKey.insert, 'insert'),
-    ];
-
-    // Round-trip: every (key, name) pair must agree with logicalKeyName.
-    for (final (key, name) in mappings) {
-      expect(logicalKeyName(key), equals(name),
-          reason: 'logicalKeyName($key) should be "$name"');
-    }
-
-    // The set of names produced by the table must equal the fixture.
-    final namesFromTable = mappings.map((e) => e.$2).toSet();
-    expect(namesFromTable, equals(fixture),
-        reason: 'logicalKeyName vocabulary drifted from $fixturePath — update '
-            'shortcut_utils.dart::logicalKeyName, the fixture, and Rust '
-            'event_to_key_name together');
-
-    // Modifier-only / unsupported keys must return null.
-    expect(logicalKeyName(LogicalKeyboardKey.shift), isNull);
-    expect(logicalKeyName(LogicalKeyboardKey.escape), isNull);
-    expect(logicalKeyName(LogicalKeyboardKey.f13), isNull);
-  });
-
-  test('configurable shortcut list does not include known-removed action IDs',
-      () {
-    // These IDs were briefly defined without handlers (a "ghost action"
-    // footgun). If you intend to re-add one of these as a real action,
-    // wire up its handler and add a constant + group entry — do not just
-    // resurrect the literal string below.
-    //
-    // Note: `toggle_privacy_mode` was once on this list but is now a real
-    // implemented action (registered in shortcut_model.dart). The other
-    // legacy IDs (toggle_audio, view_mode_shrink/stretch, view_mode_1_to_1)
-    // were renamed: their replacements are kShortcutActionToggleMute and
-    // kShortcutActionViewModeOriginal/Adaptive/Custom.
-    const knownRemoved = [
-      'toggle_audio',
-      'view_mode_1_to_1',
-      'view_mode_shrink',
-      'view_mode_stretch',
-    ];
-    final actions = idSet(kKeyboardShortcutActionGroups);
-    for (final id in knownRemoved) {
-      expect(actions, isNot(contains(id)),
-          reason:
-              '"$id" was a known ghost action — wire a real handler before re-adding it');
-    }
-  });
-}

res/msi/CustomActions/CustomActions.cpp

@@ -31,17 +31,17 @@ LExit:
     return WcaFinalize(er);
 }
 
-// Helper function to safely delete a file or directory using handle-based deletion.
-// This avoids TOCTOU (Time-Of-Check-Time-Of-Use) race conditions.
+// Helper function to safely delete a file using handle-based deletion.
+// Directories are refused after opening the handle.
 BOOL SafeDeleteItem(LPCWSTR fullPath)
 {
-    // Open the file/directory with DELETE access and FILE_FLAG_OPEN_REPARSE_POINT
+    // Open the file/directory with delete and attribute-read access plus FILE_FLAG_OPEN_REPARSE_POINT
     // to prevent following symlinks.
     // Use shared access to allow deletion even when other processes have the file open.
     DWORD flags = FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT;
     HANDLE hFile = CreateFileW(
         fullPath,
-        DELETE,
+        DELETE | FILE_READ_ATTRIBUTES,
         FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,  // Allow shared access
         NULL,
         OPEN_EXISTING,
@@ -55,6 +55,21 @@ BOOL SafeDeleteItem(LPCWSTR fullPath)
         return FALSE;
     }
 
+    BY_HANDLE_FILE_INFORMATION fileInfo;
+    if (FALSE == GetFileInformationByHandle(hFile, &fileInfo))
+    {
+        WcaLog(LOGMSG_STANDARD, "SafeDeleteItem: Failed to inspect '%ls'. Error: %lu", fullPath, GetLastError());
+        CloseHandle(hFile);
+        return FALSE;
+    }
+
+    if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+    {
+        WcaLog(LOGMSG_STANDARD, "SafeDeleteItem: Refusing to delete directory '%ls'.", fullPath);
+        CloseHandle(hFile);
+        return FALSE;
+    }
+
     // Use SetFileInformationByHandle to mark for deletion.
     // The file will be deleted when the handle is closed.
     FILE_DISPOSITION_INFO dispInfo;
@@ -77,98 +92,74 @@ BOOL SafeDeleteItem(LPCWSTR fullPath)
     return result;
 }
 
-// Helper function to recursively delete a directory's contents with detailed logging.
-void RecursiveDelete(LPCWSTR path)
+BOOL PathEndsWithSlash(LPCWSTR path)
 {
-    // Ensure the path is not empty or null.
-    if (path == NULL || path[0] == L'\0')
+    size_t length = 0;
+    HRESULT hr = StringCchLengthW(path, MAX_PATH, &length);
+    if (FAILED(hr) || length == 0)
+    {
+        return FALSE;
+    }
+
+    WCHAR last = path[length - 1];
+    return last == L'\\' || last == L'/';
+}
+
+void ClearReadOnlyAttribute(LPCWSTR fullPath, DWORD attributes)
+{
+    if (!(attributes & FILE_ATTRIBUTE_READONLY))
     {
         return;
     }
 
-    // Extra safety: never operate directly on a root path.
-    if (PathIsRootW(path))
+    DWORD writableAttributes = attributes & ~FILE_ATTRIBUTE_READONLY;
+    if (writableAttributes == 0)
     {
-        WcaLog(LOGMSG_STANDARD, "RecursiveDelete: refusing to operate on root path '%ls'.", path);
+        writableAttributes = FILE_ATTRIBUTE_NORMAL;
+    }
+
+    if (SetFileAttributesW(fullPath, writableAttributes))
+    {
+        WcaLog(LOGMSG_STANDARD, "Runtime cleanup cleared read-only attribute for '%ls'.", fullPath);
         return;
     }
 
-    // MAX_PATH is enough here since the installer should not be using longer paths.
-    // No need to handle extended-length paths (\\?\) in this context.
-    WCHAR searchPath[MAX_PATH];
-    HRESULT hr = StringCchPrintfW(searchPath, MAX_PATH, L"%s\\*", path);
-    if (FAILED(hr)) {
-        WcaLog(LOGMSG_STANDARD, "RecursiveDelete: Path too long to enumerate: %ls", path);
-        return;
+    WcaLog(LOGMSG_STANDARD, "Runtime cleanup failed to clear read-only attribute for '%ls'. Error: %lu", fullPath, GetLastError());
+}
+
+BOOL DeleteRuntimeGeneratedFile(LPCWSTR installFolder, LPCWSTR fileName)
+{
+    WCHAR fullPath[MAX_PATH];
+    LPCWSTR separator = PathEndsWithSlash(installFolder) ? L"" : L"\\";
+    HRESULT hr = StringCchPrintfW(fullPath, MAX_PATH, L"%s%s%s", installFolder, separator, fileName);
+    if (FAILED(hr))
+    {
+        WcaLog(LOGMSG_STANDARD, "Runtime cleanup path is too long for '%ls'.", fileName);
+        return FALSE;
     }
 
-    WIN32_FIND_DATAW findData;
-    HANDLE hFind = FindFirstFileW(searchPath, &findData);
-
-    if (hFind == INVALID_HANDLE_VALUE)
+    DWORD attributes = GetFileAttributesW(fullPath);
+    if (attributes == INVALID_FILE_ATTRIBUTES)
     {
-        // This can happen if the directory is empty or doesn't exist, which is not an error in our case.
-        WcaLog(LOGMSG_STANDARD, "RecursiveDelete: Failed to enumerate directory '%ls'. It may be missing or inaccessible. Error: %lu", path, GetLastError());
-        return;
+        DWORD error = GetLastError();
+        if (error == ERROR_FILE_NOT_FOUND || error == ERROR_PATH_NOT_FOUND)
+        {
+            return TRUE;
+        }
+
+        WcaLog(LOGMSG_STANDARD, "Runtime cleanup cannot stat '%ls'. Error: %lu", fullPath, error);
+        return FALSE;
     }
 
-    do
+    if (attributes & FILE_ATTRIBUTE_DIRECTORY)
     {
-        // Skip '.' and '..' directories.
-        if (wcscmp(findData.cFileName, L".") == 0 || wcscmp(findData.cFileName, L"..") == 0)
-        {
-            continue;
-        }
-
-        // MAX_PATH is enough here since the installer should not be using longer paths.
-        // No need to handle extended-length paths (\\?\) in this context.
-        WCHAR fullPath[MAX_PATH];
-        hr = StringCchPrintfW(fullPath, MAX_PATH, L"%s\\%s", path, findData.cFileName);
-        if (FAILED(hr)) {
-            WcaLog(LOGMSG_STANDARD, "RecursiveDelete: Path too long for item '%ls' in '%ls', skipping.", findData.cFileName, path);
-            continue;
-        }
-
-        // Before acting, ensure the read-only attribute is not set.
-        if (findData.dwFileAttributes & FILE_ATTRIBUTE_READONLY)
-        {
-            if (FALSE == SetFileAttributesW(fullPath, findData.dwFileAttributes & ~FILE_ATTRIBUTE_READONLY))
-            {
-                WcaLog(LOGMSG_STANDARD, "RecursiveDelete: Failed to remove read-only attribute. Error: %lu", GetLastError());
-            }
-        }
-
-        if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-        {
-            // Check for reparse points (symlinks/junctions) to prevent directory traversal attacks.
-            // Do not follow reparse points, only remove the link itself.
-            if (findData.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)
-            {
-                WcaLog(LOGMSG_STANDARD, "RecursiveDelete: Not recursing into reparse point (symlink/junction), deleting link itself: %ls", fullPath);
-                SafeDeleteItem(fullPath);
-            }
-            else
-            {
-                // Recursively delete directory contents first
-                RecursiveDelete(fullPath);
-                // Then delete the directory itself
-                SafeDeleteItem(fullPath);
-            }
-        }
-        else
-        {
-            // Delete file using safe handle-based deletion
-            SafeDeleteItem(fullPath);
-        }
-    } while (FindNextFileW(hFind, &findData) != 0);
-
-    DWORD lastError = GetLastError();
-    if (lastError != ERROR_NO_MORE_FILES)
-    {
-        WcaLog(LOGMSG_STANDARD, "RecursiveDelete: FindNextFileW failed with error %lu", lastError);
+        WcaLog(LOGMSG_STANDARD, "Runtime cleanup skipped directory '%ls'.", fullPath);
+        return FALSE;
     }
 
-    FindClose(hFind);
+    ClearReadOnlyAttribute(fullPath, attributes);
+    WcaLog(LOGMSG_STANDARD, "Runtime cleanup deleting '%ls'.", fullPath);
+    return SafeDeleteItem(fullPath);
 }
 
 // See `Package.wxs` for the sequence of this custom action.
@@ -178,13 +169,13 @@ void RecursiveDelete(LPCWSTR path)
 //   2. RemoveExistingProducts
 //      ├─ TerminateProcesses
 //      ├─ TryStopDeleteService
-//      ├─ RemoveInstallFolder - <-- Here
+//      ├─ RemoveRuntimeGeneratedFiles - <-- Here
 //      └─ RemoveFiles
 //   3. InstallValidate
 //   4. InstallFiles
 //   5. InstallExecute
 //   6. InstallFinalize
-UINT __stdcall RemoveInstallFolder(
+UINT __stdcall RemoveRuntimeGeneratedFiles(
     __in MSIHANDLE hInstall)
 {
     HRESULT hr = S_OK;
@@ -194,7 +185,7 @@ UINT __stdcall RemoveInstallFolder(
     LPWSTR pwz = NULL;
     LPWSTR pwzData = NULL;
 
-    hr = WcaInitialize(hInstall, "RemoveInstallFolder");
+    hr = WcaInitialize(hInstall, "RemoveRuntimeGeneratedFiles");
     ExitOnFailure(hr, "Failed to initialize");
 
     hr = WcaGetProperty(L"CustomActionData", &pwzData);
@@ -202,24 +193,20 @@ UINT __stdcall RemoveInstallFolder(
 
     pwz = pwzData;
     hr = WcaReadStringFromCaData(&pwz, &installFolder);
-    ExitOnFailure(hr, "failed to read database key from custom action data: %ls", pwz);
+    ExitOnFailure(hr, "failed to read install folder from custom action data: %ls", pwz);
 
     if (installFolder == NULL || installFolder[0] == L'\0') {
-        WcaLog(LOGMSG_STANDARD, "Install folder path is empty, skipping recursive delete.");
+        WcaLog(LOGMSG_STANDARD, "Install folder path is empty, skipping runtime cleanup.");
         goto LExit;
     }
 
     if (PathIsRootW(installFolder)) {
-        WcaLog(LOGMSG_STANDARD, "Refusing to recursively delete root folder '%ls'.", installFolder);
+        WcaLog(LOGMSG_STANDARD, "Refusing runtime cleanup in root folder '%ls'.", installFolder);
         goto LExit;
     }
 
-    WcaLog(LOGMSG_STANDARD, "Attempting to recursively delete contents of install folder: %ls", installFolder);
-
-    RecursiveDelete(installFolder);
-
-    // The standard MSI 'RemoveFolders' action will take care of removing the (now empty) directories.
-    // We don't need to call RemoveDirectoryW on installFolder itself, as it might still be in use by the installer.
+    WcaLog(LOGMSG_STANDARD, "Removing runtime-generated files from install folder: %ls", installFolder);
+    DeleteRuntimeGeneratedFile(installFolder, L"RuntimeBroker_rustdesk.exe");
 
 LExit:
     ReleaseStr(pwzData);

res/msi/CustomActions/CustomActions.def

@@ -2,7 +2,7 @@ LIBRARY "CustomActions"
 
 EXPORTS
     CustomActionHello
-    RemoveInstallFolder
+    RemoveRuntimeGeneratedFiles
     TerminateProcesses
     AddFirewallRules
     SetPropertyIsServiceRunning

res/msi/Package/Components/Folders.wxs

@@ -16,8 +16,15 @@
 		<!-- If a command line value was stored, restore it after the registry search has been performed -->
 		<SetProperty Action="RestoreSavedInstallFolderValue" Id="INSTALLFOLDER" Value="[SavedInstallFolderCmdLineValue]" After="AppSearch" Sequence="first" Condition="SavedInstallFolderCmdLineValue" />
 
-		<!-- If a command line value or registry value was set, update the main properties with the value -->
-		<SetProperty Id="INSTALLFOLDER_INNER" Value="[INSTALLFOLDER]" After="RestoreSavedInstallFolderValue" Sequence="first" Condition="INSTALLFOLDER" />
+		<!-- Normalize INSTALLFOLDER from the command line or registry before assigning INSTALLFOLDER_INNER. -->
+		<!-- Case 1: already ends with \$(var.Product)\, keep it unchanged. -->
+		<SetProperty Action="SetInstallFolderInnerFromProductDir" Id="INSTALLFOLDER_INNER" Value="[INSTALLFOLDER]" After="RestoreSavedInstallFolderValue" Sequence="first" Condition="INSTALLFOLDER AND INSTALLFOLDER ~&gt;&gt; &quot;\$(var.Product)\&quot;" />
+		<!-- Case 2: already ends with \$(var.Product) but has no trailing slash, add the slash. -->
+		<SetProperty Action="SetInstallFolderInnerFromProductDirNoSlash" Id="INSTALLFOLDER_INNER" Value="[INSTALLFOLDER]\" After="RestoreSavedInstallFolderValue" Sequence="first" Condition="INSTALLFOLDER AND INSTALLFOLDER ~&gt;&gt; &quot;\$(var.Product)&quot;" />
+		<!-- Case 3: ends with a slash but not \$(var.Product)\, append $(var.Product)\. -->
+		<SetProperty Action="SetInstallFolderInnerAppendProduct" Id="INSTALLFOLDER_INNER" Value="[INSTALLFOLDER]$(var.Product)\" After="RestoreSavedInstallFolderValue" Sequence="first" Condition="INSTALLFOLDER AND INSTALLFOLDER ~&gt;&gt; &quot;\&quot; AND NOT (INSTALLFOLDER ~&gt;&gt; &quot;\$(var.Product)\&quot; OR INSTALLFOLDER ~&gt;&gt; &quot;\$(var.Product)&quot;)" />
+		<!-- Case 4: has no trailing slash and does not end with \$(var.Product), append \$(var.Product)\. -->
+		<SetProperty Action="SetInstallFolderInnerAppendSlashProduct" Id="INSTALLFOLDER_INNER" Value="[INSTALLFOLDER]\$(var.Product)\" After="RestoreSavedInstallFolderValue" Sequence="first" Condition="INSTALLFOLDER AND NOT INSTALLFOLDER ~&gt;&gt; &quot;\&quot; AND NOT (INSTALLFOLDER ~&gt;&gt; &quot;\$(var.Product)\&quot; OR INSTALLFOLDER ~&gt;&gt; &quot;\$(var.Product)&quot;)" />
 
 		<!-- INSTALLFOLDER_INNER is defined for compatibility with previous versions of the installer. -->
 		<!-- Because we need to use INSTALLFOLDER as the command line argument. -->

res/msi/Package/Components/RustDesk.wxs

@@ -12,7 +12,7 @@
 			</Component>
 		</DirectoryRef>
 
-		<CustomAction Id="RemoveInstallFolder.SetParam" Return="check" Property="RemoveInstallFolder" Value="[INSTALLFOLDER_INNER]" />
+		<CustomAction Id="RemoveRuntimeGeneratedFiles.SetParam" Return="check" Property="RemoveRuntimeGeneratedFiles" Value="[INSTALLFOLDER_INNER]" />
 		<CustomAction Id="AddFirewallRules.SetParam" Return="check" Property="AddFirewallRules" Value="1[INSTALLFOLDER_INNER]$(var.Product).exe" />
 		<CustomAction Id="RemoveFirewallRules.SetParam" Return="check" Property="RemoveFirewallRules" Value="0[INSTALLFOLDER_INNER]$(var.Product).exe" />
 		<CustomAction Id="CreateStartService.SetParam" Return="check" Property="CreateStartService" Value="$(var.Product);&quot;[INSTALLFOLDER_INNER]$(var.Product).exe&quot; --service" />
@@ -77,21 +77,21 @@
 
 			<Custom Action="AddRegSoftwareSASGeneration" Before="InstallFinalize" Condition="NOT (Installed AND REMOVE AND NOT UPGRADINGPRODUCTCODE) AND (NOT CC_CONNECTION_TYPE=&quot;outgoing&quot;)"/>
 
-			<Custom Action="RemoveInstallFolder" Before="RemoveFiles"/>
-			<Custom Action="RemoveInstallFolder.SetParam" Before="RemoveInstallFolder"/>
-			<Custom Action="TryStopDeleteService" Before="RemoveInstallFolder.SetParam" />
+			<Custom Action="RemoveRuntimeGeneratedFiles" Before="RemoveFiles" Condition="Installed AND (REMOVE=&quot;ALL&quot; OR UPGRADINGPRODUCTCODE)"/>
+			<Custom Action="RemoveRuntimeGeneratedFiles.SetParam" Before="RemoveRuntimeGeneratedFiles" Condition="Installed AND (REMOVE=&quot;ALL&quot; OR UPGRADINGPRODUCTCODE)"/>
+			<Custom Action="TryStopDeleteService" Before="RemoveRuntimeGeneratedFiles.SetParam" />
 			<Custom Action="TryStopDeleteService.SetParam" Before="TryStopDeleteService" />
 
 			<Custom Action="RemoveFirewallRules" Before="RemoveFiles"/>
 			<Custom Action="RemoveFirewallRules.SetParam" Before="RemoveFirewallRules"/>
 
-			<Custom Action="UninstallPrinter" Before="RemoveInstallFolder" Condition="VersionNT &gt;= 603" />
+			<Custom Action="UninstallPrinter" Before="RemoveRuntimeGeneratedFiles" Condition="VersionNT &gt;= 603" />
 
-			<Custom Action="TerminateProcesses" Before="RemoveInstallFolder"/>
+			<Custom Action="TerminateProcesses" Before="RemoveRuntimeGeneratedFiles"/>
 			<Custom Action="TerminateProcesses.SetParam" Before="TerminateProcesses"/>
-			<Custom Action="TerminateBrokers" Before="RemoveInstallFolder"/>
+			<Custom Action="TerminateBrokers" Before="RemoveRuntimeGeneratedFiles"/>
 			<Custom Action="TerminateBrokers.SetParam" Before="TerminateBrokers"/>
-			<Custom Action="RemoveAmyuniIdd" Before="RemoveInstallFolder"/>
+			<Custom Action="RemoveAmyuniIdd" Before="RemoveRuntimeGeneratedFiles"/>
 			<Custom Action="RemoveAmyuniIdd.SetParam" Before="RemoveAmyuniIdd"/>
 		</InstallExecuteSequence>
 

res/msi/Package/Fragments/CustomActions.wxs

@@ -5,7 +5,7 @@
 		<Binary Id="Custom_Actions_Dll" SourceFile="$(var.CustomActions.TargetDir)$(var.CustomActions.TargetName).dll" />
 
 		<CustomAction Id="CustomActionHello" DllEntry="CustomActionHello" Impersonate="yes" Execute="immediate" Return="ignore" BinaryRef="Custom_Actions_Dll"/>
-		<CustomAction Id="RemoveInstallFolder" DllEntry="RemoveInstallFolder" Impersonate="no" Execute="deferred" Return="ignore" BinaryRef="Custom_Actions_Dll"/>
+		<CustomAction Id="RemoveRuntimeGeneratedFiles" DllEntry="RemoveRuntimeGeneratedFiles" Impersonate="no" Execute="deferred" Return="ignore" BinaryRef="Custom_Actions_Dll"/>
 		<CustomAction Id="TerminateProcesses" DllEntry="TerminateProcesses" Impersonate="yes" Execute="immediate" Return="ignore" BinaryRef="Custom_Actions_Dll"/>
 		<CustomAction Id="TerminateBrokers" DllEntry="TerminateProcesses" Impersonate="yes" Execute="immediate" Return="ignore" BinaryRef="Custom_Actions_Dll"/>
 		<CustomAction Id="AddFirewallRules" DllEntry="AddFirewallRules" Impersonate="no" Execute="deferred" Return="ignore" BinaryRef="Custom_Actions_Dll"/>

res/msi/Package/UI/MyInstallDlg.wxs

@@ -23,12 +23,13 @@ Patch dialog sequence:
 -->
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+    <?include ../Includes.wxi?>
     <?foreach WIXUIARCH in X86;X64;A64 ?>
     <Fragment>
         <UI Id="UI_MyInstallDialog_$(WIXUIARCH)">
             <Publish Dialog="LicenseAgreementDlg" Control="Print" Event="DoAction" Value="WixUIPrintEula_$(WIXUIARCH)" />
             <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH" />
-            <Publish Dialog="MyInstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="2" Condition="NOT WIXUI_DONTVALIDATEPATH" />
+            <Publish Dialog="MyInstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="5" Condition="NOT WIXUI_DONTVALIDATEPATH" />
         </UI>
 
         <UIRef Id="UI_MyInstallDialog" />
@@ -64,9 +65,16 @@ Patch dialog sequence:
             <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="MyInstallDirDlg" Condition="LicenseAccepted = &quot;1&quot;" />
 
             <Publish Dialog="MyInstallDirDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" />
-            <Publish Dialog="MyInstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1" />
-            <Publish Dialog="MyInstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3" Condition="NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID&lt;&gt;&quot;1&quot;" />
-            <Publish Dialog="MyInstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4" Condition="WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID=&quot;1&quot;" />
+            <!-- Normalize INSTALLFOLDER_INNER before SetTargetPath and WixUIValidatePath run. -->
+            <!-- UI case 1: already ends with \$(var.Product) but has no trailing slash, add the slash. -->
+            <Publish Dialog="MyInstallDirDlg" Control="Next" Property="INSTALLFOLDER_INNER" Value="[INSTALLFOLDER_INNER]\" Order="1" Condition="INSTALLFOLDER_INNER AND INSTALLFOLDER_INNER ~&gt;&gt; &quot;\$(var.Product)&quot;" />
+            <!-- UI case 2: ends with a slash but not \$(var.Product)\, append $(var.Product)\. -->
+            <Publish Dialog="MyInstallDirDlg" Control="Next" Property="INSTALLFOLDER_INNER" Value="[INSTALLFOLDER_INNER]$(var.Product)\" Order="2" Condition="INSTALLFOLDER_INNER AND INSTALLFOLDER_INNER ~&gt;&gt; &quot;\&quot; AND NOT (INSTALLFOLDER_INNER ~&gt;&gt; &quot;\$(var.Product)\&quot; OR INSTALLFOLDER_INNER ~&gt;&gt; &quot;\$(var.Product)&quot;)" />
+            <!-- UI case 3: has no trailing slash and does not end with \$(var.Product), append \$(var.Product)\. -->
+            <Publish Dialog="MyInstallDirDlg" Control="Next" Property="INSTALLFOLDER_INNER" Value="[INSTALLFOLDER_INNER]\$(var.Product)\" Order="3" Condition="INSTALLFOLDER_INNER AND NOT INSTALLFOLDER_INNER ~&gt;&gt; &quot;\&quot; AND NOT (INSTALLFOLDER_INNER ~&gt;&gt; &quot;\$(var.Product)\&quot; OR INSTALLFOLDER_INNER ~&gt;&gt; &quot;\$(var.Product)&quot;)" />
+            <Publish Dialog="MyInstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="4" />
+            <Publish Dialog="MyInstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="6" Condition="NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID&lt;&gt;&quot;1&quot;" />
+            <Publish Dialog="MyInstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="7" Condition="WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID=&quot;1&quot;" />
             <Publish Dialog="MyInstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1" />
             <Publish Dialog="MyInstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2" />
             <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MyInstallDirDlg" Order="1" Condition="NOT Installed" />

src/client.rs

@@ -1745,6 +1745,9 @@ pub struct LoginConfigHandler {
     pub direct: Option<bool>,
     pub received: bool,
     switch_uuid: Option<String>,
+    #[cfg(feature = "flutter")]
+    #[cfg(not(any(target_os = "android", target_os = "ios")))]
+    switch_back_allowed: bool,
     pub save_ab_password_to_recent: bool, // true: connected with ab password
     pub other_server: Option<(String, String, String)>,
     pub custom_fps: Arc<Mutex<Option<usize>>>,
@@ -1861,6 +1864,11 @@ impl LoginConfigHandler {
 
         self.direct = None;
         self.received = false;
+        #[cfg(feature = "flutter")]
+        #[cfg(not(any(target_os = "android", target_os = "ios")))]
+        {
+            self.switch_back_allowed = false;
+        }
         self.switch_uuid = switch_uuid;
         self.adapter_luid = adapter_luid;
         self.selected_windows_session_id = None;
@@ -1874,6 +1882,23 @@ impl LoginConfigHandler {
         self.is_terminal_admin = is_terminal_admin;
     }
 
+    #[cfg(feature = "flutter")]
+    #[cfg(not(any(target_os = "android", target_os = "ios")))]
+    pub fn allow_switch_back_once(&mut self) {
+        self.switch_back_allowed = true;
+    }
+
+    #[cfg(feature = "flutter")]
+    #[cfg(not(any(target_os = "android", target_os = "ios")))]
+    pub fn consume_switch_back_permission(&mut self) -> bool {
+        if self.switch_back_allowed {
+            self.switch_back_allowed = false;
+            true
+        } else {
+            false
+        }
+    }
+
     /// Check if the client should auto login.
     /// Return password if the client should auto login, otherwise return empty string.
     pub fn should_auto_login(&self) -> String {
@@ -3377,6 +3402,36 @@ pub fn handle_login_error(
     }
 }
 
+#[cfg(feature = "flutter")]
+#[cfg(not(any(target_os = "android", target_os = "ios")))]
+async fn consume_local_switch_sides_uuid(id: &str, uuid: &Uuid) -> bool {
+    let Ok(mut conn) = crate::ipc::connect(1000, "").await else {
+        return false;
+    };
+    let uuid = uuid.to_string();
+    if conn
+        .send(&crate::ipc::Data::SwitchSidesUuid(
+            uuid.clone(),
+            id.to_owned(),
+            None,
+        ))
+        .await
+        .is_err()
+    {
+        return false;
+    }
+    match conn.next_timeout(1000).await {
+        Ok(Some(crate::ipc::Data::SwitchSidesUuid(
+            returned_uuid,
+            returned_id,
+            Some(true),
+        ))) => {
+            returned_uuid == uuid && returned_id == id
+        }
+        _ => false,
+    }
+}
+
 /// Handle hash message sent by peer.
 /// Hash will be used for login.
 ///
@@ -3397,12 +3452,22 @@ pub async fn handle_hash(
     // Take care of password application order
 
     // switch_uuid
-    let uuid = lc.write().unwrap().switch_uuid.take();
-    if let Some(uuid) = uuid {
-        if let Ok(uuid) = uuid::Uuid::from_str(&uuid) {
-            send_switch_login_request(lc.clone(), peer, uuid).await;
-            lc.write().unwrap().password_source = Default::default();
-            return;
+    #[cfg(feature = "flutter")]
+    #[cfg(not(any(target_os = "android", target_os = "ios")))]
+    {
+        let uuid = lc.write().unwrap().switch_uuid.take();
+        if let Some(uuid) = uuid {
+            if let Ok(uuid) = uuid::Uuid::from_str(&uuid) {
+                let id = lc.read().unwrap().id.clone();
+                if !consume_local_switch_sides_uuid(&id, &uuid).await {
+                    log::warn!("Ignored untrusted switch_uuid");
+                } else {
+                    lc.write().unwrap().allow_switch_back_once();
+                    send_switch_login_request(lc.clone(), peer, uuid).await;
+                    lc.write().unwrap().password_source = Default::default();
+                    return;
+                }
+            }
         }
     }
     // last password

src/client/io_loop.rs

@@ -1797,6 +1797,9 @@ impl<T: InvokeUiSession> Remote<T> {
                             Ok(Permission::BlockInput) => {
                                 self.handler.set_permission("block_input", p.enabled);
                             }
+                            Ok(Permission::PrivacyMode) => {
+                                self.handler.set_permission("privacy_mode", p.enabled);
+                            }
                             _ => {}
                         }
                     }
@@ -1920,9 +1923,23 @@ impl<T: InvokeUiSession> Remote<T> {
                             );
                         }
                     }
+                    #[cfg(feature = "flutter")]
+                    #[cfg(not(any(target_os = "android", target_os = "ios")))]
                     Some(misc::Union::SwitchBack(_)) => {
-                        #[cfg(feature = "flutter")]
-                        self.handler.switch_back(&self.handler.get_id());
+                        let allow_switch_back = self
+                            .handler
+                            .lc
+                            .write()
+                            .unwrap()
+                            .consume_switch_back_permission();
+                        if allow_switch_back {
+                            self.handler.switch_back(&self.handler.get_id());
+                        } else {
+                            log::warn!(
+                                "Ignored unsolicited SwitchBack from {}",
+                                self.handler.get_id()
+                            );
+                        }
                     }
                     #[cfg(all(feature = "flutter", feature = "plugin_framework"))]
                     #[cfg(not(any(target_os = "android", target_os = "ios")))]

src/core_main.rs

@@ -146,7 +146,13 @@ pub fn core_main() -> Option<Vec<String>> {
         crate::portable_service::client::set_quick_support(_is_quick_support);
     }
     let mut log_name = "".to_owned();
-    if args.len() > 0 && args[0].starts_with("--") {
+    // Keep portable-service logs under a stable directory name.
+    let has_portable_service_shmem_arg = args
+        .iter()
+        .any(|arg| arg.starts_with("--portable-service-shmem-name="));
+    if has_portable_service_shmem_arg {
+        log_name = "portable-service".to_owned();
+    } else if args.len() > 0 && args[0].starts_with("--") {
         let name = args[0].replace("--", "");
         if !name.is_empty() {
             log_name = name;

src/flutter.rs

@@ -1135,6 +1135,10 @@ impl InvokeUiSession for FlutterHandler {
                     ("message", json!(&opened.message)),
                     ("pid", json!(opened.pid)),
                     ("service_id", json!(&opened.service_id)),
+                    (
+                        "replay_terminal_output",
+                        json!(opened.replay_terminal_output),
+                    ),
                 ];
                 if !opened.persistent_sessions.is_empty() {
                     event_data.push(("persistent_sessions", json!(opened.persistent_sessions)));

src/flutter_ffi.rs

@@ -575,7 +575,6 @@ pub fn session_handle_flutter_key_event(
     if let Some(session) = sessions::get_session_by_session_id(&session_id) {
         let keyboard_mode = session.get_keyboard_mode();
         session.handle_flutter_key_event(
-            session_id,
             &keyboard_mode,
             &character,
             usb_hid,
@@ -596,7 +595,6 @@ pub fn session_handle_flutter_raw_key_event(
     if let Some(session) = sessions::get_session_by_session_id(&session_id) {
         let keyboard_mode = session.get_keyboard_mode();
         session.handle_flutter_raw_key_event(
-            session_id,
             &keyboard_mode,
             &name,
             platform_code,
@@ -974,6 +972,27 @@ pub fn main_show_option(_key: String) -> SyncReturn<bool> {
 }
 
 pub fn main_set_option(key: String, value: String) {
+    #[cfg(target_os = "android")]
+    {
+        let is_permission_option = key.eq(config::keys::OPTION_ENABLE_CLIPBOARD)
+            || key.eq(config::keys::OPTION_ENABLE_FILE_TRANSFER)
+            || key.eq(config::keys::OPTION_ENABLE_AUDIO);
+        let allow_perm_change_in_accept_window = config::option2bool(
+            config::keys::OPTION_ENABLE_PERM_CHANGE_IN_ACCEPT_WINDOW,
+            &crate::get_builtin_option(config::keys::OPTION_ENABLE_PERM_CHANGE_IN_ACCEPT_WINDOW),
+        );
+        if is_permission_option
+            && !allow_perm_change_in_accept_window
+            && crate::ui_cm_interface::has_active_clients()
+        {
+            log::info!(
+                "blocked main_set_option by policy, key={}, value={}",
+                key,
+                value
+            );
+            return;
+        }
+    }
     #[cfg(target_os = "android")]
     if key.eq(config::keys::OPTION_ENABLE_KEYBOARD) {
         crate::ui_cm_interface::switch_permission_all(
@@ -1021,7 +1040,29 @@ pub fn main_get_options_sync() -> SyncReturn<String> {
 }
 
 pub fn main_set_options(json: String) {
-    let map: HashMap<String, String> = serde_json::from_str(&json).unwrap_or(HashMap::new());
+    let mut map: HashMap<String, String> = serde_json::from_str(&json).unwrap_or(HashMap::new());
+    #[cfg(target_os = "android")]
+    {
+        let allow_perm_change_in_accept_window = config::option2bool(
+            config::keys::OPTION_ENABLE_PERM_CHANGE_IN_ACCEPT_WINDOW,
+            &crate::get_builtin_option(config::keys::OPTION_ENABLE_PERM_CHANGE_IN_ACCEPT_WINDOW),
+        );
+        if !allow_perm_change_in_accept_window && crate::ui_cm_interface::has_active_clients() {
+            for key in [
+                config::keys::OPTION_ENABLE_CLIPBOARD,
+                config::keys::OPTION_ENABLE_FILE_TRANSFER,
+                config::keys::OPTION_ENABLE_AUDIO,
+            ] {
+                if let Some(value) = map.remove(key) {
+                    log::info!(
+                        "blocked main_set_options item by policy, key={}, value={}",
+                        key,
+                        value
+                    );
+                }
+            }
+        }
+    }
     if !map.is_empty() {
         set_options(map)
     }
@@ -1730,7 +1771,6 @@ pub fn cm_get_clients_length() -> usize {
 
 pub fn main_init(app_dir: String, custom_client_config: String) {
     initialize(&app_dir, &custom_client_config);
-    crate::keyboard::shortcuts::reload_from_config();
 }
 
 pub fn main_device_id(id: String) {
@@ -2173,7 +2213,7 @@ pub fn cm_elevate_portable(conn_id: i32) {
 }
 
 pub fn cm_switch_back(conn_id: i32) {
-    #[cfg(not(any(target_os = "ios")))]
+    #[cfg(not(any(target_os = "android", target_os = "ios")))]
     crate::ui_cm_interface::switch_back(conn_id);
 }
 
@@ -2250,17 +2290,6 @@ pub fn main_init_input_source() -> SyncReturn<()> {
     SyncReturn(())
 }
 
-pub fn main_reload_keyboard_shortcuts() -> SyncReturn<()> {
-    crate::keyboard::shortcuts::reload_from_config();
-    SyncReturn(())
-}
-
-pub fn main_get_default_keyboard_shortcuts() -> SyncReturn<String> {
-    let bindings = crate::keyboard::shortcuts::default_bindings();
-    let json = serde_json::to_string(&bindings).unwrap_or_default();
-    SyncReturn(json)
-}
-
 pub fn main_is_installed_lower_version() -> SyncReturn<bool> {
     SyncReturn(is_installed_lower_version())
 }

src/ipc.rs

@@ -1,33 +1,28 @@
-use crate::{
-    common::CheckTestNatType,
-    privacy_mode::PrivacyModeState,
-    ui_interface::{get_local_option, set_local_option},
-};
-use bytes::Bytes;
-use parity_tokio_ipc::{
-    Connection as Conn, ConnectionClient as ConnClient, Endpoint, Incoming, SecurityAttributes,
-};
-use serde_derive::{Deserialize, Serialize};
-use std::{
-    collections::HashMap,
-    sync::atomic::{AtomicBool, Ordering},
-};
-#[cfg(not(windows))]
-use std::{fs::File, io::prelude::*};
+#[path = "ipc/auth.rs"]
+mod ipc_auth;
+#[cfg(any(target_os = "linux", target_os = "macos"))]
+#[path = "ipc/fs.rs"]
+mod ipc_fs;
 
 #[cfg(all(feature = "flutter", feature = "plugin_framework"))]
 #[cfg(not(any(target_os = "android", target_os = "ios")))]
 use crate::plugin::ipc::Plugin;
+use crate::{
+    common::{is_server, CheckTestNatType},
+    privacy_mode,
+    privacy_mode::PrivacyModeState,
+    rendezvous_mediator::RendezvousMediator,
+    ui_interface::{get_local_option, set_local_option},
+};
+use bytes::Bytes;
 #[cfg(not(any(target_os = "android", target_os = "ios")))]
 pub use clipboard::ClipboardFile;
+#[cfg(target_os = "linux")]
+use hbb_common::anyhow;
 use hbb_common::{
     allow_err, bail, bytes,
     bytes_codec::BytesCodec,
-    config::{
-        self,
-        keys::{self, OPTION_ALLOW_WEBSOCKET},
-        Config, Config2,
-    },
+    config::{self, keys::OPTION_ALLOW_WEBSOCKET, Config, Config2},
     futures::StreamExt as _,
     futures_util::sink::SinkExt,
     log, password_security as password, timeout,
@@ -38,13 +33,55 @@ use hbb_common::{
     tokio_util::codec::Framed,
     ResultType,
 };
-
-use crate::{common::is_server, privacy_mode, rendezvous_mediator::RendezvousMediator};
+#[cfg(any(target_os = "linux", target_os = "macos"))]
+use ipc_auth::authorize_service_scoped_ipc_connection;
+#[cfg(windows)]
+pub(crate) use ipc_auth::authorize_windows_portable_service_ipc_connection;
+#[cfg(windows)]
+pub(crate) use ipc_auth::ensure_peer_executable_matches_current_by_pid_opt;
+#[cfg(windows)]
+pub(crate) use ipc_auth::log_rejected_windows_ipc_connection;
+#[cfg(target_os = "linux")]
+pub(crate) use ipc_auth::{
+    active_uid, ensure_peer_executable_matches_current_by_fd, is_allowed_service_peer_uid,
+    log_rejected_uinput_connection, peer_uid_from_fd,
+};
+#[cfg(windows)]
+use ipc_auth::{
+    authorize_windows_main_ipc_connection, portable_service_listener_security_attributes,
+    should_allow_everyone_create_on_windows,
+};
+#[cfg(target_os = "linux")]
+use ipc_fs::terminal_count_candidate_uids;
+#[cfg(any(target_os = "linux", target_os = "macos"))]
+use ipc_fs::{
+    check_pid, ensure_secure_ipc_parent_dir, scrub_secure_ipc_parent_dir,
+    should_scrub_parent_entries_after_check_pid, write_pid,
+};
+use parity_tokio_ipc::{
+    Connection as Conn, ConnectionClient as ConnClient, Endpoint, Incoming, SecurityAttributes,
+};
+use serde_derive::{Deserialize, Serialize};
+#[cfg(any(target_os = "linux", target_os = "macos"))]
+use std::os::unix::fs::PermissionsExt;
+use std::{
+    collections::HashMap,
+    sync::atomic::{AtomicBool, Ordering},
+};
 
 // IPC actions here.
 pub const IPC_ACTION_CLOSE: &str = "close";
+const PORTABLE_SERVICE_IPC_HANDSHAKE_TIMEOUT_MS: u64 = 3_000;
+pub(crate) const IPC_TOKEN_LEN: usize = 64;
+const IPC_TOKEN_RANDOM_BYTES: usize = IPC_TOKEN_LEN / 2;
+const _: () = assert!(IPC_TOKEN_LEN % 2 == 0);
 pub static EXIT_RECV_CLOSE: AtomicBool = AtomicBool::new(true);
 
+#[inline]
+pub async fn connect_service(ms_timeout: u64) -> ResultType<ConnectionTmpl<ConnClient>> {
+    connect(ms_timeout, crate::POSTFIX_SERVICE).await
+}
+
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[serde(tag = "t", content = "c")]
 pub enum FS {
@@ -207,6 +244,8 @@ pub enum DataControl {
 pub enum DataPortableService {
     Ping,
     Pong,
+    AuthToken(String),
+    AuthResult(bool),
     ConnCount(Option<usize>),
     Mouse((Vec<u8>, i32, String, u32, bool, bool)),
     Pointer((Vec<u8>, i32)),
@@ -237,6 +276,7 @@ pub enum Data {
         restart: bool,
         recording: bool,
         block_input: bool,
+        privacy_mode: bool,
         from_switch: bool,
     },
     ChatMessage {
@@ -284,7 +324,14 @@ pub enum Data {
     Empty,
     Disconnected,
     DataPortableService(DataPortableService),
+    #[cfg(feature = "flutter")]
+    #[cfg(not(any(target_os = "android", target_os = "ios")))]
     SwitchSidesRequest(String),
+    #[cfg(feature = "flutter")]
+    #[cfg(not(any(target_os = "android", target_os = "ios")))]
+    SwitchSidesUuid(String, String, Option<bool>),
+    #[cfg(feature = "flutter")]
+    #[cfg(not(any(target_os = "android", target_os = "ios")))]
     SwitchSidesBack,
     UrlLink(String),
     VoiceCallIncoming,
@@ -403,6 +450,22 @@ pub async fn start(postfix: &str) -> ResultType<()> {
                 Ok(stream) => {
                     let mut stream = Connection::new(stream);
                     let postfix = postfix.to_owned();
+                    #[cfg(any(target_os = "linux", target_os = "macos"))]
+                    if config::is_service_ipc_postfix(&postfix) {
+                        if !authorize_service_scoped_ipc_connection(&stream, &postfix) {
+                            continue;
+                        }
+                    }
+                    #[cfg(windows)]
+                    if postfix.is_empty() {
+                        // Windows main IPC (`postfix == ""`) is authorized here.
+                        // Other security-sensitive channels use dedicated authorization paths:
+                        // - `_portable_service`: portable-service listener + handshake policy
+                        // - service-scoped postfixes: service-specific listener/authorization
+                        if !authorize_windows_main_ipc_connection(&stream, &postfix) {
+                            continue;
+                        }
+                    }
                     tokio::spawn(async move {
                         loop {
                             match stream.next().await {
@@ -411,9 +474,48 @@ pub async fn start(postfix: &str) -> ResultType<()> {
                                     break;
                                 }
                                 Ok(Some(data)) => {
+                                    // On Linux/macOS, the protected `_service` channel is used only for
+                                    // syncing config between root service and the active user process.
+                                    //
+                                    // NOTE: `is_service_ipc_postfix()` also includes `_uinput_*`, but those
+                                    // channels are handled by the dedicated uinput listener/protocol in
+                                    // `src/server/uinput.rs` and therefore do not share this Data enum
+                                    // allowlist. The SyncConfig allowlist here is intentionally scoped to the
+                                    // `_service` channel only.
+                                    //
+                                    // Keep this explicit branch to avoid policy drift between `_service` and
+                                    // uinput IPC paths while still minimizing exposed message surface here.
+                                    #[cfg(any(target_os = "linux", target_os = "macos"))]
+                                    if postfix == crate::POSTFIX_SERVICE {
+                                        if matches!(&data, Data::SyncConfig(_)) {
+                                            handle(data, &mut stream).await;
+                                        } else {
+                                            log::warn!(
+                                                "Rejected non-sync data on protected _service IPC channel: postfix={}, data_kind={:?}, peer_uid={:?}",
+                                                postfix,
+                                                std::mem::discriminant(&data),
+                                                stream.peer_uid()
+                                            );
+                                            // Close the connection to avoid keeping a protected channel
+                                            // alive while repeatedly receiving invalid traffic.
+                                            break;
+                                        }
+                                        continue;
+                                    }
                                     handle(data, &mut stream).await;
                                 }
-                                _ => {}
+                                Ok(None) => {
+                                    // `Ok(None)` means a complete frame arrived but did not
+                                    // deserialize into `Data`. Peer close/reset is returned as
+                                    // `Err` by `ConnectionTmpl::next()`. Keep the historical
+                                    // ignore behavior except on the protected `_service` channel.
+                                    #[cfg(any(target_os = "linux", target_os = "macos"))]
+                                    {
+                                        if postfix == crate::POSTFIX_SERVICE {
+                                            break;
+                                        }
+                                    }
+                                }
                             }
                         }
                     });
@@ -428,20 +530,77 @@ pub async fn start(postfix: &str) -> ResultType<()> {
 
 pub async fn new_listener(postfix: &str) -> ResultType<Incoming> {
     let path = Config::ipc_path(postfix);
-    #[cfg(not(any(windows, target_os = "android", target_os = "ios")))]
-    check_pid(postfix).await;
+    #[cfg(any(target_os = "linux", target_os = "macos"))]
+    let should_scrub_parent_entries = ensure_secure_ipc_parent_dir(&path, postfix)?;
+    #[cfg(any(target_os = "linux", target_os = "macos"))]
+    let existing_listener_alive = check_pid(postfix).await;
+    #[cfg(any(target_os = "linux", target_os = "macos"))]
+    if should_scrub_parent_entries_after_check_pid(
+        should_scrub_parent_entries,
+        existing_listener_alive,
+    ) {
+        scrub_secure_ipc_parent_dir(&path, postfix)?;
+    }
     let mut endpoint = Endpoint::new(path.clone());
-    match SecurityAttributes::allow_everyone_create() {
+    let security_attrs = {
+        #[cfg(windows)]
+        {
+            if postfix == "_portable_service" {
+                portable_service_listener_security_attributes()
+            } else if should_allow_everyone_create_on_windows(postfix) {
+                SecurityAttributes::allow_everyone_create()
+            } else {
+                Ok(SecurityAttributes::empty())
+            }
+        }
+        #[cfg(not(windows))]
+        {
+            SecurityAttributes::allow_everyone_create()
+        }
+    };
+    match security_attrs {
         Ok(attr) => endpoint.set_security_attributes(attr),
-        Err(err) => log::error!("Failed to set ipc{} security: {}", postfix, err),
+        Err(err) => {
+            log::error!("Failed to set ipc{} security: {}", postfix, err);
+            #[cfg(windows)]
+            if postfix == "_portable_service" {
+                // Fail closed for `_portable_service` when SDDL construction fails.
+                // This endpoint is security-critical and must not start with default ACLs.
+                return Err(err.into());
+            }
+        }
     };
     match endpoint.incoming() {
         Ok(incoming) => {
-            log::info!("Started ipc{} server at path: {}", postfix, &path);
-            #[cfg(not(windows))]
+            if postfix == crate::POSTFIX_SERVICE {
+                log::info!("Started protected ipc service server: postfix={}", postfix);
+            } else {
+                log::info!("Started ipc{} server at path: {}", postfix, &path);
+            }
+            #[cfg(any(target_os = "linux", target_os = "macos"))]
             {
-                use std::os::unix::fs::PermissionsExt;
-                std::fs::set_permissions(&path, std::fs::Permissions::from_mode(0o0777)).ok();
+                // NOTE: On Linux/macOS, some IPC sockets are intentionally world-connectable
+                // (0666) so the active (non-root) user process can connect. Authorization is
+                // enforced at accept-time for these channels, and the protected `_service`
+                // channel is further restricted by an explicit message allowlist (SyncConfig
+                // only).
+                let socket_mode = if config::is_service_ipc_postfix(postfix) {
+                    0o0666
+                } else {
+                    0o0600
+                };
+                if let Err(err) =
+                    std::fs::set_permissions(&path, std::fs::Permissions::from_mode(socket_mode))
+                {
+                    log::error!(
+                        "Failed to set permissions on ipc{} socket at path {}: {}",
+                        postfix,
+                        &path,
+                        err
+                    );
+                    std::fs::remove_file(&path).ok();
+                    return Err(err.into());
+                }
                 write_pid(postfix);
             }
             Ok(incoming)
@@ -770,6 +929,8 @@ async fn handle(data: Data, stream: &mut Connection) {
         Data::TestRendezvousServer => {
             crate::test_rendezvous_server();
         }
+        #[cfg(feature = "flutter")]
+        #[cfg(not(any(target_os = "android", target_os = "ios")))]
         Data::SwitchSidesRequest(id) => {
             let uuid = uuid::Uuid::new_v4();
             crate::server::insert_switch_sides_uuid(id, uuid.clone());
@@ -779,6 +940,19 @@ async fn handle(data: Data, stream: &mut Connection) {
                     .await
             );
         }
+        #[cfg(feature = "flutter")]
+        #[cfg(not(any(target_os = "android", target_os = "ios")))]
+        Data::SwitchSidesUuid(uuid, id, None) => {
+            let allowed = uuid
+                .parse::<uuid::Uuid>()
+                .map(|uuid| crate::server::remove_pending_switch_sides_uuid(&id, &uuid))
+                .unwrap_or(false);
+            allow_err!(
+                stream
+                    .send(&Data::SwitchSidesUuid(uuid, id, Some(allowed)))
+                    .await
+            );
+        }
         #[cfg(all(feature = "flutter", feature = "plugin_framework"))]
         #[cfg(not(any(target_os = "android", target_os = "ios")))]
         Data::Plugin(plugin) => crate::plugin::ipc::handle_plugin(plugin, stream).await,
@@ -930,15 +1104,116 @@ async fn handle(data: Data, stream: &mut Connection) {
             );
         }
         _ => {}
-    }
+    };
 }
 
 pub async fn connect(ms_timeout: u64, postfix: &str) -> ResultType<ConnectionTmpl<ConnClient>> {
     let path = Config::ipc_path(postfix);
-    let client = timeout(ms_timeout, Endpoint::connect(&path)).await??;
+    connect_with_path(ms_timeout, &path).await
+}
+
+pub(crate) fn generate_one_time_ipc_token() -> ResultType<String> {
+    use hbb_common::rand::{rngs::OsRng, RngCore as _};
+    use std::fmt::Write as _;
+
+    let mut random_bytes = [0u8; IPC_TOKEN_RANDOM_BYTES];
+    let mut rng = OsRng;
+    rng.try_fill_bytes(&mut random_bytes).map_err(|err| {
+        hbb_common::anyhow::anyhow!(
+            "failed to generate portable service ipc token from OsRng: {}",
+            err
+        )
+    })?;
+
+    let mut token = String::with_capacity(IPC_TOKEN_LEN);
+    for byte in random_bytes {
+        let _ = write!(token, "{:02x}", byte);
+    }
+    Ok(token)
+}
+
+pub(crate) fn constant_time_ipc_token_eq(expected: &str, candidate: &str) -> bool {
+    if expected.len() != IPC_TOKEN_LEN || candidate.len() != IPC_TOKEN_LEN {
+        return false;
+    }
+    expected
+        .as_bytes()
+        .iter()
+        .zip(candidate.as_bytes().iter())
+        .fold(0u8, |diff, (left, right)| diff | (*left ^ *right))
+        == 0
+}
+
+pub(crate) async fn portable_service_ipc_handshake_as_client<T>(
+    stream: &mut ConnectionTmpl<T>,
+    token: &str,
+) -> ResultType<()>
+where
+    T: AsyncRead + AsyncWrite + std::marker::Unpin,
+{
+    stream
+        .send(&Data::DataPortableService(DataPortableService::AuthToken(
+            token.to_owned(),
+        )))
+        .await?;
+    match stream
+        .next_timeout(PORTABLE_SERVICE_IPC_HANDSHAKE_TIMEOUT_MS)
+        .await?
+    {
+        Some(Data::DataPortableService(DataPortableService::AuthResult(true))) => Ok(()),
+        Some(Data::DataPortableService(DataPortableService::AuthResult(false))) => {
+            bail!("portable service ipc handshake was rejected by server")
+        }
+        Some(_) | None => bail!("portable service ipc handshake returned an unexpected response"),
+    }
+}
+
+pub(crate) async fn portable_service_ipc_handshake_as_server<T, F>(
+    stream: &mut ConnectionTmpl<T>,
+    mut validate_token: F,
+) -> ResultType<()>
+where
+    T: AsyncRead + AsyncWrite + std::marker::Unpin,
+    // Token validators must use `constant_time_ipc_token_eq` or an equivalent
+    // fixed-length comparison; this handshake is part of the privilege boundary.
+    F: FnMut(&str) -> bool,
+{
+    let authorized = match stream
+        .next_timeout(PORTABLE_SERVICE_IPC_HANDSHAKE_TIMEOUT_MS)
+        .await?
+    {
+        Some(Data::DataPortableService(DataPortableService::AuthToken(token))) => {
+            validate_token(&token)
+        }
+        Some(_) | None => false,
+    };
+    stream
+        .send(&Data::DataPortableService(DataPortableService::AuthResult(
+            authorized,
+        )))
+        .await?;
+    if !authorized {
+        bail!("portable service ipc handshake failed")
+    }
+    Ok(())
+}
+
+#[inline]
+async fn connect_with_path(ms_timeout: u64, path: &str) -> ResultType<ConnectionTmpl<ConnClient>> {
+    let client = timeout(ms_timeout, Endpoint::connect(path)).await??;
     Ok(ConnectionTmpl::new(client))
 }
 
+#[cfg(target_os = "linux")]
+pub async fn connect_for_uid(
+    ms_timeout: u64,
+    uid: u32,
+    postfix: &str,
+) -> ResultType<ConnectionTmpl<ConnClient>> {
+    let path = Config::ipc_path_for_uid(uid, postfix);
+    connect_with_path(ms_timeout, &path).await
+}
+
 #[cfg(target_os = "linux")]
 #[tokio::main(flavor = "current_thread")]
 pub async fn start_pa() {
@@ -1016,54 +1291,6 @@ pub async fn start_pa() {
     }
 }
 
-#[inline]
-#[cfg(not(windows))]
-fn get_pid_file(postfix: &str) -> String {
-    let path = Config::ipc_path(postfix);
-    format!("{}.pid", path)
-}
-
-#[cfg(not(any(windows, target_os = "android", target_os = "ios")))]
-async fn check_pid(postfix: &str) {
-    let pid_file = get_pid_file(postfix);
-    if let Ok(mut file) = File::open(&pid_file) {
-        let mut content = String::new();
-        file.read_to_string(&mut content).ok();
-        let pid = content.parse::<usize>().unwrap_or(0);
-        if pid > 0 {
-            use hbb_common::sysinfo::System;
-            let mut sys = System::new();
-            sys.refresh_processes();
-            if let Some(p) = sys.process(pid.into()) {
-                if let Some(current) = sys.process((std::process::id() as usize).into()) {
-                    if current.name() == p.name() {
-                        // double check with connect
-                        if connect(1000, postfix).await.is_ok() {
-                            return;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    // if not remove old ipc file, the new ipc creation will fail
-    // if we remove a ipc file, but the old ipc process is still running,
-    // new connection to the ipc will connect to new ipc, old connection to old ipc still keep alive
-    std::fs::remove_file(&Config::ipc_path(postfix)).ok();
-}
-
-#[inline]
-#[cfg(not(windows))]
-fn write_pid(postfix: &str) {
-    let path = get_pid_file(postfix);
-    if let Ok(mut file) = File::create(&path) {
-        use std::os::unix::fs::PermissionsExt;
-        std::fs::set_permissions(&path, std::fs::Permissions::from_mode(0o0777)).ok();
-        file.write_all(&std::process::id().to_string().into_bytes())
-            .ok();
-    }
-}
-
 pub struct ConnectionTmpl<T> {
     inner: Framed<T, BytesCodec>,
 }
@@ -1527,9 +1754,10 @@ pub fn close_all_instances() -> ResultType<bool> {
     }
 }
 
+#[cfg(windows)]
 #[tokio::main(flavor = "current_thread")]
 pub async fn connect_to_user_session(usid: Option<u32>) -> ResultType<()> {
-    let mut stream = crate::ipc::connect(1000, crate::POSTFIX_SERVICE).await?;
+    let mut stream = crate::ipc::connect_service(1000).await?;
     timeout(1000, stream.send(&crate::ipc::Data::UserSid(usid))).await??;
     Ok(())
 }
@@ -1655,13 +1883,76 @@ pub async fn update_controlling_session_count(count: usize) -> ResultType<()> {
 #[cfg(target_os = "linux")]
 #[tokio::main(flavor = "current_thread")]
 pub async fn get_terminal_session_count() -> ResultType<usize> {
-    let ms_timeout = 1_000;
-    let mut c = connect(ms_timeout, "").await?;
-    c.send(&Data::TerminalSessionCount(0)).await?;
-    if let Some(Data::TerminalSessionCount(c)) = c.next_timeout(ms_timeout).await? {
-        return Ok(c);
+    let timeout_ms = 1_000;
+    let effective_uid = unsafe { hbb_common::libc::geteuid() as u32 };
+    let candidate_uids = terminal_count_candidate_uids(effective_uid);
+    let mut last_err: Option<anyhow::Error> = None;
+    for candidate_uid in candidate_uids {
+        let socket_path = Config::ipc_path_for_uid(candidate_uid, "");
+        let connect_result = timeout(timeout_ms, Endpoint::connect(&socket_path))
+            .await
+            .map_err(|err| {
+                anyhow::anyhow!(
+                    "Timeout connecting to terminal ipc at {}: {}",
+                    socket_path,
+                    err
+                )
+            });
+        let connection = match connect_result {
+            Ok(Ok(connection)) => connection,
+            Ok(Err(err)) => {
+                last_err = Some(anyhow::anyhow!(
+                    "Failed to connect to terminal ipc at {}: {}",
+                    socket_path,
+                    err
+                ));
+                continue;
+            }
+            Err(err) => {
+                last_err = Some(err);
+                continue;
+            }
+        };
+        let mut ipc_conn = ConnectionTmpl::new(connection);
+        if let Err(err) = ipc_conn.send(&Data::TerminalSessionCount(0)).await {
+            last_err = Some(anyhow::anyhow!(
+                "Failed to request terminal session count via ipc at {}: {}",
+                socket_path,
+                err
+            ));
+            continue;
+        }
+        match ipc_conn.next_timeout(timeout_ms).await {
+            Ok(Some(Data::TerminalSessionCount(session_count))) => {
+                return Ok(session_count);
+            }
+            Ok(None) => {
+                last_err = Some(anyhow::anyhow!(
+                    "Invalid response when requesting terminal session count via ipc at {}",
+                    socket_path
+                ));
+            }
+            Ok(other) => {
+                last_err = Some(anyhow::anyhow!(
+                    "Unexpected response when requesting terminal session count via ipc at {}: {:?}",
+                    socket_path,
+                    other.map(|v| std::mem::discriminant(&v))
+                ));
+            }
+            Err(err) => {
+                last_err = Some(anyhow::anyhow!(
+                    "Failed to read terminal session count via ipc at {}: {}",
+                    socket_path,
+                    err
+                ));
+            }
+        }
+    }
+    if let Some(err) = last_err {
+        Err(err.into())
+    } else {
+        Ok(0)
     }
-    Ok(0)
 }
 
 async fn handle_wayland_screencast_restore_token(
@@ -1692,9 +1983,30 @@ pub async fn set_install_option(k: String, v: String) -> ResultType<()> {
 #[cfg(test)]
 mod test {
     use super::*;
+
     #[test]
     fn verify_ffi_enum_data_size() {
         println!("{}", std::mem::size_of::<Data>());
         assert!(std::mem::size_of::<Data>() <= 120);
     }
+
+    #[cfg(target_os = "linux")]
+    #[test]
+    fn test_ipc_path_differs_by_uid_for_cm() {
+        let effective_uid = unsafe { hbb_common::libc::geteuid() as u32 };
+        let other_uid = effective_uid.saturating_add(1);
+        let postfix = "_cm";
+
+        // Default connect path targets the current effective uid.
+        assert_eq!(
+            Config::ipc_path(postfix),
+            Config::ipc_path_for_uid(effective_uid, postfix)
+        );
+        // A different uid yields a different socket path - this is the root cause of the
+        // cross-user regression when root spawns a user process but still connects as uid 0.
+        assert_ne!(
+            Config::ipc_path(postfix),
+            Config::ipc_path_for_uid(other_uid, postfix)
+        );
+    }
 }

src/ipc/fs.rs

@@ -0,0 +1,951 @@
+#[cfg(target_os = "linux")]
+use super::ipc_auth::active_uid;
+use crate::ipc::{connect, Data};
+use hbb_common::{config, log, ResultType};
+use std::{
+    ffi::CString,
+    io::{Error, ErrorKind},
+    os::unix::ffi::OsStrExt,
+    path::Path,
+};
+
+struct FdGuard(i32);
+impl Drop for FdGuard {
+    fn drop(&mut self) {
+        unsafe {
+            hbb_common::libc::close(self.0);
+        }
+    }
+}
+
+#[cfg(target_os = "linux")]
+#[inline]
+pub(crate) fn terminal_count_candidate_uids(effective_uid: u32) -> Vec<u32> {
+    if effective_uid != 0 {
+        return vec![effective_uid];
+    }
+    let mut candidates = Vec::with_capacity(2);
+    if let Some(uid) = active_uid().filter(|uid| *uid != 0) {
+        candidates.push(uid);
+    }
+    candidates.push(0);
+    candidates
+}
+
+#[inline]
+fn expected_ipc_parent_mode(postfix: &str) -> u32 {
+    if config::is_service_ipc_postfix(postfix) {
+        0o0711
+    } else {
+        0o0700
+    }
+}
+
+fn open_ipc_parent_dir_fd(parent_c: &CString) -> std::io::Result<i32> {
+    let fd = unsafe {
+        hbb_common::libc::open(
+            parent_c.as_ptr(),
+            hbb_common::libc::O_RDONLY
+                | hbb_common::libc::O_DIRECTORY
+                | hbb_common::libc::O_CLOEXEC
+                | hbb_common::libc::O_NOFOLLOW,
+        )
+    };
+    if fd < 0 {
+        Err(std::io::Error::last_os_error())
+    } else {
+        Ok(fd)
+    }
+}
+
+// Remove one preexisting IPC artifact via an already-opened parent directory FD.
+//
+// Security intent:
+// - Bind cleanup to the exact parent inode that passed O_NOFOLLOW + fstat checks.
+// - Avoid path-based TOCTOU during scrub (e.g., parent path rename/swap race).
+//
+// Flow:
+// 1) fstatat(..., AT_SYMLINK_NOFOLLOW) to inspect the target entry under parent_fd.
+// 2) Decide file vs directory from st_mode.
+// 3) unlinkat relative to parent_fd (AT_REMOVEDIR for directories).
+//
+// Error policy:
+// - NotFound is treated as benign (already removed / raced away).
+// - Other errors are surfaced explicitly.
+fn remove_parent_entry_via_fd(
+    parent_fd: i32,
+    parent_dir: &Path,
+    entry_name: &str,
+) -> ResultType<()> {
+    if entry_name.contains('/') {
+        return Err(Error::new(
+            ErrorKind::InvalidInput,
+            format!(
+                "invalid ipc parent entry name (contains '/'): parent={}, entry={}",
+                parent_dir.display(),
+                entry_name
+            ),
+        )
+        .into());
+    }
+    let entry_c = CString::new(entry_name.as_bytes().to_vec()).map_err(|err| {
+        Error::new(
+            ErrorKind::InvalidInput,
+            format!(
+                "invalid ipc parent entry name: parent={}, entry={}, err={}",
+                parent_dir.display(),
+                entry_name,
+                err
+            ),
+        )
+    })?;
+    let mut stat: hbb_common::libc::stat = unsafe { std::mem::zeroed() };
+    let stat_rc = unsafe {
+        hbb_common::libc::fstatat(
+            parent_fd,
+            entry_c.as_ptr(),
+            &mut stat,
+            hbb_common::libc::AT_SYMLINK_NOFOLLOW,
+        )
+    };
+    if stat_rc != 0 {
+        let err = std::io::Error::last_os_error();
+        if err.kind() == ErrorKind::NotFound {
+            return Ok(());
+        }
+        return Err(Error::new(
+            err.kind(),
+            format!(
+                "failed to stat preexisting ipc parent dir entry by fd: parent={}, entry={}, err={}",
+                parent_dir.display(),
+                entry_name,
+                err
+            ),
+        )
+        .into());
+    }
+
+    let is_dir = (stat.st_mode & (hbb_common::libc::S_IFMT as hbb_common::libc::mode_t))
+        == hbb_common::libc::S_IFDIR;
+    let unlink_flags = if is_dir {
+        hbb_common::libc::AT_REMOVEDIR
+    } else {
+        0
+    };
+    let unlink_rc =
+        unsafe { hbb_common::libc::unlinkat(parent_fd, entry_c.as_ptr(), unlink_flags) };
+    if unlink_rc != 0 {
+        let err = std::io::Error::last_os_error();
+        if err.kind() == ErrorKind::NotFound {
+            return Ok(());
+        }
+        return Err(Error::new(
+            err.kind(),
+            format!(
+                "failed to remove preexisting ipc parent dir entry by fd: parent={}, entry={}, err={}",
+                parent_dir.display(),
+                entry_name,
+                err
+            ),
+        )
+        .into());
+    }
+    Ok(())
+}
+
+fn scrub_preexisting_ipc_parent_entries(
+    parent_fd: i32,
+    parent_dir: &Path,
+    postfix: &str,
+) -> ResultType<()> {
+    let ipc_basename = format!("ipc{}", postfix);
+    remove_parent_entry_via_fd(parent_fd, parent_dir, &ipc_basename)?;
+    remove_parent_entry_via_fd(parent_fd, parent_dir, &format!("{}.pid", ipc_basename))?;
+    Ok(())
+}
+
+fn remove_ipc_socket_via_secure_parent_fd(postfix: &str) -> ResultType<()> {
+    let path = config::Config::ipc_path(postfix);
+    let parent_dir = Path::new(&path)
+        .parent()
+        .ok_or_else(|| Error::new(ErrorKind::InvalidInput, format!("invalid ipc path: {path}")))?;
+    let parent_c = CString::new(parent_dir.as_os_str().as_bytes().to_vec())?;
+    let fd = match open_ipc_parent_dir_fd(&parent_c) {
+        Ok(fd) => fd,
+        Err(open_err) => {
+            if open_err.kind() == ErrorKind::NotFound {
+                return Ok(());
+            }
+            return Err(Error::new(
+                open_err.kind(),
+                format!(
+                    "failed to open ipc parent dir for stale socket cleanup (no-follow): postfix={}, parent={}, err={}",
+                    postfix,
+                    parent_dir.display(),
+                    open_err
+                ),
+            )
+            .into());
+        }
+    };
+    let _fd_guard = FdGuard(fd);
+    remove_parent_entry_via_fd(fd, parent_dir, &format!("ipc{}", postfix))
+}
+
+// Purpose:
+// - Harden the IPC parent directory before creating/listening socket files.
+// - Prevent symlink/path-race abuse and reject unsafe owner/mode.
+//
+// Approach:
+// - Open parent dir with O_NOFOLLOW/O_DIRECTORY and operate on that fd.
+// - Validate inode type/owner/mode via fstat.
+// - For protected service postfix, optionally adopt owner (root only), then scrub stale
+//   rustdesk IPC artifacts when directory trust boundary changed.
+//
+// Main steps:
+// 1) Resolve parent path and open/create directory securely.
+// 2) Verify directory inode type and owner uid.
+// 3) Enforce expected mode via fchmod on opened fd.
+// 4) Scrub stale IPC artifacts when owner/mode was unsafe before hardening.
+//
+// References:
+// - open(2): O_NOFOLLOW/O_DIRECTORY/O_CLOEXEC
+//   https://man7.org/linux/man-pages/man2/open.2.html
+// - fstat(2): verify file type/metadata on opened fd
+//   https://man7.org/linux/man-pages/man2/fstat.2.html
+// - fchown(2): adopt ownership when running as root
+//   https://man7.org/linux/man-pages/man2/chown.2.html
+// - fchmod(2): enforce exact mode on opened fd
+//   https://man7.org/linux/man-pages/man2/fchmod.2.html
+pub(crate) fn ensure_secure_ipc_parent_dir(path: &str, postfix: &str) -> ResultType<bool> {
+    let parent_dir = Path::new(path)
+        .parent()
+        .ok_or_else(|| Error::new(ErrorKind::InvalidInput, format!("invalid ipc path: {path}")))?;
+    // Harden against common TOCTOU by opening the parent directory with O_NOFOLLOW (so the parent
+    // itself cannot be a symlink) and then operating on its FD (fstat/fchown/fchmod). This ensures
+    // we mutate the inode we opened, though it does not protect against symlinks in ancestor path
+    // components.
+    let parent_c = CString::new(parent_dir.as_os_str().as_bytes().to_vec())?;
+    let fd = match open_ipc_parent_dir_fd(&parent_c) {
+        Ok(fd) => fd,
+        Err(open_err) => {
+            // If the directory doesn't exist yet, create it with the expected mode. The parent
+            // dir is intended to be a single-level /tmp path, so mkdir is sufficient here.
+            if open_err.raw_os_error() == Some(hbb_common::libc::ENOENT) {
+                let expected_mode = expected_ipc_parent_mode(postfix);
+                let rc = unsafe {
+                    hbb_common::libc::mkdir(
+                        parent_c.as_ptr(),
+                        expected_mode as hbb_common::libc::mode_t,
+                    )
+                };
+                if rc != 0 {
+                    let mkdir_err = std::io::Error::last_os_error();
+                    // Handle a race where another process created the directory first.
+                    if mkdir_err.raw_os_error() != Some(hbb_common::libc::EEXIST) {
+                        return Err(Error::new(
+                            mkdir_err.kind(),
+                            format!(
+                                "failed to mkdir ipc parent dir: postfix={}, parent={}, err={}",
+                                postfix,
+                                parent_dir.display(),
+                                mkdir_err
+                            ),
+                        )
+                        .into());
+                    }
+                }
+                match open_ipc_parent_dir_fd(&parent_c) {
+                    Ok(fd) => fd,
+                    Err(err) => {
+                        return Err(Error::new(
+                            err.kind(),
+                            format!(
+                                "failed to open ipc parent dir (no-follow): postfix={}, parent={}, err={}",
+                                postfix,
+                                parent_dir.display(),
+                                err
+                            ),
+                        )
+                        .into());
+                    }
+                }
+            } else {
+                return Err(Error::new(
+                    open_err.kind(),
+                    format!(
+                        "failed to open ipc parent dir (no-follow): postfix={}, parent={}, err={}",
+                        postfix,
+                        parent_dir.display(),
+                        open_err
+                    ),
+                )
+                .into());
+            }
+        }
+    };
+    let _fd_guard = FdGuard(fd);
+
+    let mut st: hbb_common::libc::stat = unsafe { std::mem::zeroed() };
+    if unsafe { hbb_common::libc::fstat(fd, &mut st as *mut _) } != 0 {
+        let os_err = std::io::Error::last_os_error();
+        return Err(Error::new(
+            os_err.kind(),
+            format!(
+                "failed to stat ipc parent dir: postfix={}, parent={}, err={}",
+                postfix,
+                parent_dir.display(),
+                os_err
+            ),
+        )
+        .into());
+    }
+    let mode = st.st_mode as u32;
+    let is_dir = (mode & (hbb_common::libc::S_IFMT as u32)) == (hbb_common::libc::S_IFDIR as u32);
+    if !is_dir {
+        return Err(Error::new(
+            ErrorKind::PermissionDenied,
+            format!(
+                "ipc parent is not directory: postfix={}, parent={}",
+                postfix,
+                parent_dir.display()
+            ),
+        )
+        .into());
+    }
+
+    let expected_uid = unsafe { hbb_common::libc::geteuid() as u32 };
+    let mut owner_uid = st.st_uid as u32;
+    let mut adopted_foreign_service_parent = false;
+    // Service-scoped IPC may be created by different privilege contexts historically.
+    // If running as root on protected service postfix, try adopting ownership first.
+    if owner_uid != expected_uid && expected_uid == 0 && config::is_service_ipc_postfix(postfix) {
+        let rc = unsafe {
+            hbb_common::libc::fchown(
+                fd,
+                expected_uid as hbb_common::libc::uid_t,
+                hbb_common::libc::gid_t::MAX,
+            )
+        };
+        if rc == 0 {
+            let mut st2: hbb_common::libc::stat = unsafe { std::mem::zeroed() };
+            if unsafe { hbb_common::libc::fstat(fd, &mut st2 as *mut _) } == 0 {
+                owner_uid = st2.st_uid as u32;
+                st = st2;
+                adopted_foreign_service_parent = true;
+            }
+        } else {
+            // Keep behavior unchanged; capture errno to ease diagnosing why chown failed.
+            let err = std::io::Error::last_os_error();
+            log::warn!(
+                "Failed to chown ipc parent dir, parent={}, postfix={}, expected_uid={}, rc={}, err={:?}",
+                parent_dir.display(),
+                postfix,
+                expected_uid,
+                rc,
+                err
+            );
+        }
+    }
+    if owner_uid != expected_uid {
+        return Err(Error::new(
+            ErrorKind::PermissionDenied,
+            format!(
+                "unsafe ipc parent owner, postfix={}, expected uid {expected_uid}, got {owner_uid}: {}",
+                postfix,
+                parent_dir.display()
+            ),
+        )
+        .into());
+    }
+
+    let expected_mode = expected_ipc_parent_mode(postfix);
+    // Include special bits (setuid/setgid/sticky) to ensure the directory is hardened to the exact
+    // expected mode.
+    let current_mode = (st.st_mode as u32) & 0o7777;
+    let repaired_parent_mode = current_mode != expected_mode;
+    let had_untrusted_parent_mode = (current_mode & 0o022) != 0;
+    if repaired_parent_mode {
+        // Use fchmod on the opened fd to avoid path-race between check and chmod.
+        if unsafe { hbb_common::libc::fchmod(fd, expected_mode as hbb_common::libc::mode_t) } != 0 {
+            let os_err = std::io::Error::last_os_error();
+            return Err(Error::new(
+                os_err.kind(),
+                format!(
+                    "failed to chmod ipc parent dir: postfix={}, parent={}, err={}",
+                    postfix,
+                    parent_dir.display(),
+                    os_err
+                ),
+            )
+            .into());
+        }
+    }
+    let should_scrub =
+        repaired_parent_mode || adopted_foreign_service_parent || had_untrusted_parent_mode;
+    Ok(should_scrub)
+}
+
+pub(crate) fn scrub_secure_ipc_parent_dir(path: &str, postfix: &str) -> ResultType<()> {
+    let parent_dir = Path::new(path)
+        .parent()
+        .ok_or_else(|| Error::new(ErrorKind::InvalidInput, format!("invalid ipc path: {path}")))?;
+    let parent_c = CString::new(parent_dir.as_os_str().as_bytes().to_vec())?;
+    let fd = open_ipc_parent_dir_fd(&parent_c).map_err(|err| {
+        Error::new(
+            err.kind(),
+            format!(
+                "failed to open ipc parent dir for scrub (no-follow): postfix={}, parent={}, err={}",
+                postfix,
+                parent_dir.display(),
+                err
+            ),
+        )
+    })?;
+    let _fd_guard = FdGuard(fd);
+    scrub_preexisting_ipc_parent_entries(fd, parent_dir, postfix)
+}
+
+#[inline]
+pub(crate) fn get_pid_file(postfix: &str) -> String {
+    let path = config::Config::ipc_path(postfix);
+    format!("{}.pid", path)
+}
+
+// Purpose:
+// - Write current process pid to pid file without following attacker-controlled symlinks.
+// - Ensure the pid file is a regular file owned by the opened inode path.
+//
+// Approach:
+// - Use libc open/fstat/write syscalls (FFI) so flags and inode validation are explicit.
+// - Open file with O_NOFOLLOW/O_CLOEXEC and verify S_IFREG with fstat before write.
+// - Keep unsafe scopes minimal and check syscall return values immediately.
+//
+// Main steps:
+// 1) Secure-open pid file (without truncation).
+// 2) Validate opened inode is a regular file owned by current euid.
+// 3) Enforce pid file mode to 0600 and truncate via ftruncate after validation.
+// 4) Write process id bytes through fd.
+//
+// Why not plain std::fs::write?
+// - std::fs helpers cannot enforce this exact open-time hardening sequence
+//   (especially "open with O_NOFOLLOW, then fstat the same opened inode").
+//
+// References:
+// - open(2): O_NOFOLLOW/O_CLOEXEC/O_NONBLOCK
+//   https://man7.org/linux/man-pages/man2/open.2.html
+// - fstat(2): verify file type on opened fd
+//   https://man7.org/linux/man-pages/man2/fstat.2.html
+// - fchmod(2): enforce secure mode on reused pid file
+//   https://man7.org/linux/man-pages/man2/fchmod.2.html
+// - ftruncate(2): truncate after validation
+//   https://man7.org/linux/man-pages/man2/ftruncate.2.html
+// - write(2): write bytes via fd
+//   https://man7.org/linux/man-pages/man2/write.2.html
+fn write_pid_file(path: &Path) -> ResultType<()> {
+    let path_c = CString::new(path.as_os_str().as_bytes().to_vec()).map_err(|err| {
+        Error::new(
+            ErrorKind::InvalidInput,
+            format!("invalid pid file path '{}': {}", path.display(), err),
+        )
+    })?;
+    let flags = hbb_common::libc::O_WRONLY
+        | hbb_common::libc::O_CREAT
+        | hbb_common::libc::O_CLOEXEC
+        | hbb_common::libc::O_NOFOLLOW
+        | hbb_common::libc::O_NONBLOCK;
+    let fd = unsafe { hbb_common::libc::open(path_c.as_ptr(), flags, 0o0600) };
+    if fd < 0 {
+        let os_err = std::io::Error::last_os_error();
+        return Err(Error::new(
+            os_err.kind(),
+            format!(
+                "failed to open pid file with no-follow '{}': {}",
+                path.display(),
+                os_err
+            ),
+        )
+        .into());
+    }
+    let _fd_guard = FdGuard(fd);
+    let mut stat: hbb_common::libc::stat = unsafe { std::mem::zeroed() };
+    if unsafe { hbb_common::libc::fstat(fd, &mut stat) } != 0 {
+        let os_err = std::io::Error::last_os_error();
+        return Err(Error::new(
+            os_err.kind(),
+            format!("failed to stat pid file '{}': {}", path.display(), os_err),
+        )
+        .into());
+    }
+    if (stat.st_mode & (hbb_common::libc::S_IFMT as hbb_common::libc::mode_t))
+        != (hbb_common::libc::S_IFREG as hbb_common::libc::mode_t)
+    {
+        return Err(Error::new(
+            ErrorKind::PermissionDenied,
+            format!("pid file path is not a regular file: '{}'", path.display()),
+        )
+        .into());
+    }
+    let expected_uid = unsafe { hbb_common::libc::geteuid() as u32 };
+    if stat.st_uid as u32 != expected_uid {
+        return Err(Error::new(
+            ErrorKind::PermissionDenied,
+            format!(
+                "pid file owner mismatch: expected uid {}, got {} for '{}'",
+                expected_uid,
+                stat.st_uid,
+                path.display()
+            ),
+        )
+        .into());
+    }
+    if unsafe { hbb_common::libc::fchmod(fd, 0o600) } != 0 {
+        let os_err = std::io::Error::last_os_error();
+        return Err(Error::new(
+            os_err.kind(),
+            format!("failed to chmod pid file '{}': {}", path.display(), os_err),
+        )
+        .into());
+    }
+    if unsafe { hbb_common::libc::ftruncate(fd, 0) } != 0 {
+        let os_err = std::io::Error::last_os_error();
+        return Err(Error::new(
+            os_err.kind(),
+            format!(
+                "failed to truncate pid file '{}': {}",
+                path.display(),
+                os_err
+            ),
+        )
+        .into());
+    }
+
+    let bytes = std::process::id().to_string();
+    let buf = bytes.as_bytes();
+    // `write(2)` is allowed to return a short write even for regular files.
+    // PID content is tiny and usually written in one shot, but we still loop
+    // until all bytes are persisted so this path is semantically correct.
+    let mut written = 0usize;
+    while written < buf.len() {
+        let rc = unsafe {
+            hbb_common::libc::write(
+                fd,
+                buf[written..].as_ptr() as *const hbb_common::libc::c_void,
+                buf.len() - written,
+            )
+        };
+        if rc < 0 {
+            let os_err = std::io::Error::last_os_error();
+            return Err(Error::new(
+                os_err.kind(),
+                format!("failed to write pid file '{}': {}", path.display(), os_err),
+            )
+            .into());
+        }
+        if rc == 0 {
+            return Err(Error::new(
+                ErrorKind::WriteZero,
+                format!(
+                    "failed to write pid file '{}': write returned 0 bytes",
+                    path.display()
+                ),
+            )
+            .into());
+        }
+        written += rc as usize;
+    }
+    Ok(())
+}
+
+#[inline]
+pub(crate) fn write_pid(postfix: &str) {
+    let path = std::path::PathBuf::from(get_pid_file(postfix));
+    if let Err(err) = write_pid_file(&path) {
+        log::warn!(
+            "Failed to write pid file for postfix '{}', path='{}', err={}",
+            postfix,
+            path.display(),
+            err
+        );
+    }
+}
+
+// Purpose:
+// - Read pid file safely and avoid trusting symlink/non-regular files.
+//
+// Approach:
+// - Use libc open/fstat/read syscalls (FFI) to control flags and inode checks.
+// - Open path with O_NOFOLLOW, validate opened fd via fstat, then read and parse.
+// - Keep unsafe scopes minimal and check syscall return values immediately.
+//
+// Main steps:
+// 1) Secure-open pid file read-only.
+// 2) Ensure fd points to regular file.
+// 3) Read bytes and parse usize pid.
+//
+// References:
+// - open(2): O_NOFOLLOW/O_CLOEXEC/O_NONBLOCK
+//   https://man7.org/linux/man-pages/man2/open.2.html
+// - fstat(2): validate S_IFREG on opened fd
+//   https://man7.org/linux/man-pages/man2/fstat.2.html
+// - read(2): read bytes via fd
+//   https://man7.org/linux/man-pages/man2/read.2.html
+#[inline]
+fn read_pid_file_secure(path: &Path) -> Option<usize> {
+    let path_c = CString::new(path.as_os_str().as_bytes().to_vec()).ok()?;
+    let flags = hbb_common::libc::O_RDONLY
+        | hbb_common::libc::O_CLOEXEC
+        | hbb_common::libc::O_NOFOLLOW
+        | hbb_common::libc::O_NONBLOCK;
+    let fd = unsafe { hbb_common::libc::open(path_c.as_ptr(), flags) };
+    if fd < 0 {
+        return None;
+    }
+    let _fd_guard = FdGuard(fd);
+
+    let mut stat: hbb_common::libc::stat = unsafe { std::mem::zeroed() };
+    if unsafe { hbb_common::libc::fstat(fd, &mut stat) } != 0 {
+        return None;
+    }
+    if (stat.st_mode & (hbb_common::libc::S_IFMT as hbb_common::libc::mode_t))
+        != (hbb_common::libc::S_IFREG as hbb_common::libc::mode_t)
+    {
+        return None;
+    }
+
+    let mut buffer = [0u8; 64];
+    let read_len = unsafe {
+        hbb_common::libc::read(
+            fd,
+            buffer.as_mut_ptr() as *mut hbb_common::libc::c_void,
+            buffer.len(),
+        )
+    };
+    if read_len <= 0 {
+        return None;
+    }
+    let content = String::from_utf8_lossy(&buffer[..read_len as usize]).to_string();
+    content.trim().parse::<usize>().ok()
+}
+
+#[inline]
+async fn probe_existing_listener(postfix: &str) -> bool {
+    let Ok(mut stream) = connect(1000, postfix).await else {
+        return false;
+    };
+    if postfix != crate::POSTFIX_SERVICE {
+        return true;
+    }
+    if stream.send(&Data::SyncConfig(None)).await.is_err() {
+        return false;
+    }
+    matches!(
+        stream.next_timeout(1000).await,
+        Ok(Some(Data::SyncConfig(Some(_))))
+    )
+}
+
+pub(crate) async fn check_pid(postfix: &str) -> bool {
+    let pid_file = std::path::PathBuf::from(get_pid_file(postfix));
+    if let Some(pid) = read_pid_file_secure(&pid_file) {
+        if pid > 0 {
+            let mut sys = hbb_common::sysinfo::System::new();
+            sys.refresh_processes();
+            if let Some(p) = sys.process(pid.into()) {
+                if let Some(current) = sys.process((std::process::id() as usize).into()) {
+                    if current.name() == p.name() && probe_existing_listener(postfix).await {
+                        return true;
+                    }
+                }
+            }
+        }
+    }
+    if probe_existing_listener(postfix).await {
+        return true;
+    }
+    // if not remove old ipc file, the new ipc creation will fail
+    // if we remove a ipc file, but the old ipc process is still running,
+    // new connection to the ipc will connect to new ipc, old connection to old ipc still keep alive
+    if let Err(err) = remove_ipc_socket_via_secure_parent_fd(postfix) {
+        log::debug!(
+            "Failed to remove stale ipc socket via secure parent fd: postfix={}, err={}",
+            postfix,
+            err
+        );
+    }
+    false
+}
+
+#[inline]
+pub(crate) fn should_scrub_parent_entries_after_check_pid(
+    should_scrub_parent_entries: bool,
+    existing_listener_alive: bool,
+) -> bool {
+    should_scrub_parent_entries && !existing_listener_alive
+}
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_write_pid_file_rejects_symlink() {
+        use std::os::unix::fs::symlink;
+
+        let unique = format!(
+            "rustdesk-ipc-pid-file-test-{}-{}",
+            std::process::id(),
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap_or_default()
+                .as_nanos()
+        );
+        let base = std::env::temp_dir().join(unique);
+        std::fs::create_dir_all(&base).unwrap();
+
+        let target = base.join("target_pid");
+        std::fs::write(&target, b"origin").unwrap();
+        let link = base.join("pid_link");
+        symlink(&target, &link).unwrap();
+
+        let res = super::write_pid_file(&link);
+        assert!(res.is_err());
+        assert_eq!(std::fs::read_to_string(&target).unwrap(), "origin");
+
+        std::fs::remove_file(&link).ok();
+        std::fs::remove_file(&target).ok();
+        std::fs::remove_dir_all(&base).ok();
+    }
+
+    #[test]
+    fn test_ensure_secure_ipc_parent_dir_rejects_symlink_parent() {
+        use std::os::unix::fs::symlink;
+
+        let unique = format!(
+            "rustdesk-ipc-secure-dir-test-{}-{}",
+            std::process::id(),
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap_or_default()
+                .as_nanos()
+        );
+        let base = std::env::temp_dir().join(unique);
+        let real_dir = base.join("real");
+        let link_dir = base.join("link");
+        std::fs::create_dir_all(&real_dir).unwrap();
+        symlink(&real_dir, &link_dir).unwrap();
+        let ipc_path = link_dir.join("ipc_service");
+        let res =
+            super::ensure_secure_ipc_parent_dir(ipc_path.to_string_lossy().as_ref(), "_service");
+        assert!(res.is_err());
+        std::fs::remove_file(&link_dir).ok();
+        std::fs::remove_dir_all(&real_dir).ok();
+        std::fs::remove_dir_all(&base).ok();
+    }
+
+    #[test]
+    fn test_ensure_secure_ipc_parent_dir_creates_parent_with_expected_mode() {
+        use std::os::unix::fs::PermissionsExt;
+
+        let unique = format!(
+            "rustdesk-ipc-secure-dir-create-test-{}-{}",
+            std::process::id(),
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap_or_default()
+                .as_nanos()
+        );
+        let base = std::env::temp_dir().join(unique);
+        std::fs::create_dir_all(&base).unwrap();
+
+        // Intentionally choose a parent that does not exist to exercise the ENOENT -> mkdir branch.
+        let parent_dir = base.join("parent");
+        assert!(!parent_dir.exists());
+        let ipc_path = parent_dir.join("ipc");
+
+        let res = super::ensure_secure_ipc_parent_dir(ipc_path.to_string_lossy().as_ref(), "");
+        // Restrictive umask can make mkdir create a stricter initial mode. In that case
+        // ensure_secure_ipc_parent_dir repairs it with fchmod and may request a scrub.
+        res.unwrap();
+
+        let md = std::fs::metadata(&parent_dir).unwrap();
+        assert!(md.is_dir());
+        let mode = md.permissions().mode() & 0o777;
+        assert_eq!(mode, 0o0700);
+
+        std::fs::remove_dir_all(&base).ok();
+    }
+
+    #[test]
+    fn test_scrub_preexisting_ipc_parent_entries_only_removes_target_postfix_artifacts() {
+        use std::os::unix::ffi::OsStrExt;
+
+        let unique = format!(
+            "rustdesk-ipc-scrub-test-{}-{}",
+            std::process::id(),
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap_or_default()
+                .as_nanos()
+        );
+        let base = std::env::temp_dir().join(unique);
+        std::fs::create_dir_all(&base).unwrap();
+
+        let ipc_file = base.join("ipc_service");
+        let ipc_pid_file = base.join("ipc_service.pid");
+        let ipc_other_postfix_file = base.join("ipc_uinput_1");
+        let keep_file = base.join("keep.txt");
+        let keep_dir = base.join("keep_dir");
+
+        std::fs::write(&ipc_file, b"socket-placeholder").unwrap();
+        std::fs::write(&ipc_pid_file, b"1234").unwrap();
+        std::fs::write(&ipc_other_postfix_file, b"other-postfix").unwrap();
+        std::fs::write(&keep_file, b"keep").unwrap();
+        std::fs::create_dir_all(&keep_dir).unwrap();
+
+        let base_c = std::ffi::CString::new(base.as_os_str().as_bytes().to_vec()).unwrap();
+        let base_fd = super::open_ipc_parent_dir_fd(&base_c).unwrap();
+        let _base_guard = super::FdGuard(base_fd);
+        super::scrub_preexisting_ipc_parent_entries(base_fd, &base, "_service").unwrap();
+
+        assert!(!ipc_file.exists());
+        assert!(!ipc_pid_file.exists());
+        assert!(ipc_other_postfix_file.exists());
+        assert!(keep_file.exists());
+        assert!(keep_dir.exists());
+
+        std::fs::remove_file(&ipc_other_postfix_file).ok();
+        std::fs::remove_file(&keep_file).ok();
+        std::fs::remove_dir_all(&keep_dir).ok();
+        std::fs::remove_dir_all(&base).ok();
+    }
+
+    #[test]
+    fn test_scrub_preexisting_ipc_parent_entries_should_bind_to_opened_inode_not_path() {
+        use std::os::unix::ffi::OsStrExt;
+
+        let unique = format!(
+            "rustdesk-ipc-scrub-fd-bind-test-{}-{}",
+            std::process::id(),
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap_or_default()
+                .as_nanos()
+        );
+        let base = std::env::temp_dir().join(unique);
+        std::fs::create_dir_all(&base).unwrap();
+
+        let trusted_parent = base.join("trusted_parent");
+        let trusted_parent_moved = base.join("trusted_parent_moved");
+        let attacker_parent = base.join("attacker_parent");
+        std::fs::create_dir_all(&trusted_parent).unwrap();
+        std::fs::create_dir_all(&attacker_parent).unwrap();
+
+        let trusted_ipc_file = trusted_parent.join("ipc_service");
+        let attacker_ipc_file = attacker_parent.join("ipc_service");
+        std::fs::write(&trusted_ipc_file, b"trusted").unwrap();
+        std::fs::write(&attacker_ipc_file, b"attacker").unwrap();
+
+        let trusted_parent_c =
+            std::ffi::CString::new(trusted_parent.as_os_str().as_bytes().to_vec()).unwrap();
+        let trusted_parent_fd = super::open_ipc_parent_dir_fd(&trusted_parent_c).unwrap();
+        let _trusted_parent_guard = super::FdGuard(trusted_parent_fd);
+
+        // Swap the path after the trusted inode has been opened.
+        std::fs::rename(&trusted_parent, &trusted_parent_moved).unwrap();
+        std::fs::rename(&attacker_parent, &trusted_parent).unwrap();
+
+        super::scrub_preexisting_ipc_parent_entries(trusted_parent_fd, &trusted_parent, "_service")
+            .unwrap();
+
+        // Expected secure behavior: scrub should target the inode that was opened before path swap.
+        assert!(
+            !trusted_parent_moved.join("ipc_service").exists(),
+            "trusted inode artifact should be removed even after path swap"
+        );
+        assert!(
+            trusted_parent.join("ipc_service").exists(),
+            "path-swapped attacker directory should not be scrubbed"
+        );
+
+        std::fs::remove_dir_all(&base).ok();
+    }
+
+    #[test]
+    fn test_ensure_secure_ipc_parent_dir_keeps_service_artifacts_before_liveness_probe() {
+        use std::os::unix::fs::PermissionsExt;
+
+        let unique = format!(
+            "rustdesk-ipc-secure-dir-order-test-{}-{}",
+            std::process::id(),
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap_or_default()
+                .as_nanos()
+        );
+        let base = std::env::temp_dir().join(unique);
+        std::fs::create_dir_all(&base).unwrap();
+
+        let parent_dir = base.join("service_parent");
+        std::fs::create_dir_all(&parent_dir).unwrap();
+        // Trigger "had_untrusted_service_parent_mode".
+        std::fs::set_permissions(&parent_dir, std::fs::Permissions::from_mode(0o777)).unwrap();
+
+        let ipc_file = parent_dir.join("ipc_service");
+        let ipc_pid_file = parent_dir.join("ipc_service.pid");
+        std::fs::write(&ipc_file, b"socket-placeholder").unwrap();
+        std::fs::write(&ipc_pid_file, b"1234").unwrap();
+
+        let res =
+            super::ensure_secure_ipc_parent_dir(ipc_file.to_string_lossy().as_ref(), "_service");
+        assert_eq!(res.unwrap(), true);
+
+        // Parent hardening should run first; artifacts should stay until liveness probe completes.
+        assert!(ipc_file.exists(), "ipc socket marker should be preserved");
+        assert!(ipc_pid_file.exists(), "pid marker should be preserved");
+
+        std::fs::remove_dir_all(&base).ok();
+    }
+
+    #[test]
+    fn test_ensure_secure_ipc_parent_dir_marks_non_service_mode_repair_for_scrub() {
+        use std::os::unix::fs::PermissionsExt;
+
+        let unique = format!(
+            "rustdesk-ipc-nonservice-mode-repair-test-{}-{}",
+            std::process::id(),
+            std::time::SystemTime::now()
+                .duration_since(std::time::UNIX_EPOCH)
+                .unwrap_or_default()
+                .as_nanos()
+        );
+        let base = std::env::temp_dir().join(unique);
+        std::fs::create_dir_all(&base).unwrap();
+
+        let parent_dir = base.join("non_service_parent");
+        std::fs::create_dir_all(&parent_dir).unwrap();
+        std::fs::set_permissions(&parent_dir, std::fs::Permissions::from_mode(0o755)).unwrap();
+
+        let ipc_file = parent_dir.join("ipc");
+        std::fs::write(&ipc_file, b"socket-placeholder").unwrap();
+
+        let res = super::ensure_secure_ipc_parent_dir(ipc_file.to_string_lossy().as_ref(), "");
+        assert_eq!(res.unwrap(), true);
+
+        std::fs::remove_dir_all(&base).ok();
+    }
+
+    #[test]
+    fn test_should_scrub_parent_entries_after_check_pid_only_when_requested_and_not_alive() {
+        assert!(!super::should_scrub_parent_entries_after_check_pid(
+            false, false
+        ));
+        assert!(!super::should_scrub_parent_entries_after_check_pid(
+            false, true
+        ));
+        assert!(super::should_scrub_parent_entries_after_check_pid(
+            true, false
+        ));
+        assert!(!super::should_scrub_parent_entries_after_check_pid(
+            true, true
+        ));
+    }
+}

src/keyboard.rs

@@ -10,7 +10,6 @@ use crate::{client::get_key_state, common::GrabState};
 #[cfg(not(any(target_os = "android", target_os = "ios")))]
 use hbb_common::log;
 use hbb_common::message_proto::*;
-use hbb_common::SessionID;
 #[cfg(any(target_os = "windows", target_os = "macos"))]
 use rdev::KeyCode;
 use rdev::{Event, EventType, Key};
@@ -80,8 +79,6 @@ lazy_static::lazy_static! {
     };
 }
 
-pub mod shortcuts;
-
 pub mod client {
     use super::*;
 
@@ -322,32 +319,6 @@ pub mod client {
     }
 
     pub fn process_event(keyboard_mode: &str, event: &Event, lock_modes: Option<i32>) {
-        // Shortcut intercept — must come before any wire encoding.
-        // Only fires on KeyPress (event_to_key_name in shortcuts.rs returns None
-        // for KeyRelease and other non-press events), so flushed releases from
-        // release_remote_keys pass straight through to the encode/forward path.
-        //
-        // NOTE: Shortcut matching intentionally happens BEFORE any key swapping
-        // (swap_modifier_key) so that shortcuts bind to the physical keys pressed,
-        // not the swapped keys. This makes shortcut setup intuitive: users bind
-        // shortcuts to the actual keys they press, regardless of swap settings.
-        // Key swapping only affects what gets sent to the remote.
-        //
-        // Gated on `feature = "flutter"` because the dispatch target
-        // (`flutter::push_session_event`) is Flutter-only. Sciter builds never
-        // call `reload_from_config`, so the cache stays disabled and the
-        // matcher would no-op anyway — but we still skip the call entirely so
-        // a hand-edited config can't silently swallow keys on a UI that has
-        // no way to surface the action.
-        //
-        // `None` for session_id makes the helper resolve through
-        // `flutter::get_cur_session_id()` — the rdev grab loop is process-wide
-        // and has no per-event session context to thread.
-        #[cfg(feature = "flutter")]
-        if crate::keyboard::shortcuts::try_dispatch(None, event, keyboard_mode) {
-            return;
-        }
-
         let keyboard_mode = get_keyboard_mode_enum(keyboard_mode);
         if is_long_press(&event) {
             return;
@@ -363,20 +334,7 @@ pub mod client {
         event: &Event,
         lock_modes: Option<i32>,
         session: &Session<T>,
-        session_id: SessionID,
     ) {
-        // Shortcut intercept — see the long comment in `process_event` above
-        // for the KeyPress-only / feature-gate rationale. The only difference
-        // here is that the Flutter FFI path threads an explicit SessionID
-        // through, so dispatch targets the exact tab the keystroke originated
-        // from — no dependency on the global focus tracker.
-        #[cfg(feature = "flutter")]
-        if crate::keyboard::shortcuts::try_dispatch(Some(&session_id), event, keyboard_mode) {
-            return;
-        }
-        #[cfg(not(feature = "flutter"))]
-        let _ = session_id;
-
         let keyboard_mode = get_keyboard_mode_enum(keyboard_mode);
         if is_long_press(&event) {
             return;

src/keyboard/shortcuts.rs

@@ -1,728 +0,0 @@
-//! Keyboard shortcuts for triggering session actions locally.
-
-use std::sync::{Arc, RwLock};
-
-use hbb_common::log;
-use serde::{Deserialize, Serialize};
-
-const LOCAL_CONFIG_KEY: &str = "keyboard-shortcuts";
-
-lazy_static::lazy_static! {
-    static ref CACHE: RwLock<Arc<Bindings>> = RwLock::new(Arc::new(Bindings::default()));
-}
-
-/// Registry of all valid action ids that may appear in `Binding.action`.
-/// Source-of-truth lives on the Flutter side (`flutter/lib/consts.dart`,
-/// `kShortcutAction*`); these mirror that vocabulary so Rust code can reach
-/// for them without re-stringifying.
-#[allow(dead_code)]
-pub mod action_id {
-    pub const SEND_CTRL_ALT_DEL: &str    = "send_ctrl_alt_del";
-    pub const TOGGLE_FULLSCREEN: &str    = "toggle_fullscreen";
-    pub const SWITCH_DISPLAY_NEXT: &str  = "switch_display_next";
-    pub const SWITCH_DISPLAY_PREV: &str  = "switch_display_prev";
-    pub const SWITCH_DISPLAY_ALL: &str   = "switch_display_all";
-    pub const SCREENSHOT: &str           = "screenshot";
-    pub const INSERT_LOCK: &str          = "insert_lock";
-    pub const REFRESH: &str              = "refresh";
-    pub const TOGGLE_BLOCK_INPUT: &str   = "toggle_block_input";
-    pub const TOGGLE_RECORDING: &str     = "toggle_recording";
-    pub const SWITCH_SIDES: &str         = "switch_sides";
-    pub const CLOSE_TAB: &str            = "close_tab";
-    pub const TOGGLE_TOOLBAR: &str       = "toggle_toolbar";
-    pub const RESTART_REMOTE: &str       = "restart_remote";
-    pub const RESET_CANVAS: &str         = "reset_canvas";
-    pub const TOGGLE_MUTE: &str          = "toggle_mute";
-    pub const PIN_TOOLBAR: &str          = "pin_toolbar";
-    pub const VIEW_MODE_ORIGINAL: &str   = "view_mode_original";
-    pub const VIEW_MODE_ADAPTIVE: &str   = "view_mode_adaptive";
-    pub const TOGGLE_CHAT: &str               = "toggle_chat";
-    pub const TOGGLE_QUALITY_MONITOR: &str    = "toggle_quality_monitor";
-    pub const TOGGLE_SHOW_REMOTE_CURSOR: &str = "toggle_show_remote_cursor";
-    pub const TOGGLE_SHOW_MY_CURSOR: &str     = "toggle_show_my_cursor";
-    pub const TOGGLE_DISABLE_CLIPBOARD: &str  = "toggle_disable_clipboard";
-    pub const PRIVACY_MODE_1: &str            = "privacy_mode_1";
-    pub const PRIVACY_MODE_2: &str            = "privacy_mode_2";
-    pub const KEYBOARD_MODE_MAP: &str         = "keyboard_mode_map";
-    pub const KEYBOARD_MODE_TRANSLATE: &str   = "keyboard_mode_translate";
-    pub const KEYBOARD_MODE_LEGACY: &str      = "keyboard_mode_legacy";
-    pub const CODEC_AUTO: &str                = "codec_auto";
-    pub const CODEC_VP8: &str                 = "codec_vp8";
-    pub const CODEC_VP9: &str                 = "codec_vp9";
-    pub const CODEC_AV1: &str                 = "codec_av1";
-    pub const CODEC_H264: &str                = "codec_h264";
-    pub const CODEC_H265: &str                = "codec_h265";
-    pub const PLUG_OUT_ALL_VIRTUAL_DISPLAYS: &str = "plug_out_all_virtual_displays";
-    pub const TOGGLE_RELATIVE_MOUSE_MODE: &str = "toggle_relative_mouse_mode";
-    pub const TOGGLE_FOLLOW_REMOTE_CURSOR: &str = "toggle_follow_remote_cursor";
-    pub const TOGGLE_FOLLOW_REMOTE_WINDOW: &str = "toggle_follow_remote_window";
-    pub const TOGGLE_ZOOM_CURSOR: &str        = "toggle_zoom_cursor";
-    pub const TOGGLE_REVERSE_MOUSE_WHEEL: &str = "toggle_reverse_mouse_wheel";
-    pub const TOGGLE_SWAP_LEFT_RIGHT_MOUSE: &str = "toggle_swap_left_right_mouse";
-    pub const TOGGLE_LOCK_AFTER_SESSION_END: &str = "toggle_lock_after_session_end";
-    pub const TOGGLE_TRUE_COLOR: &str         = "toggle_true_color";
-    pub const TOGGLE_SWAP_CTRL_CMD: &str      = "toggle_swap_ctrl_cmd";
-    pub const TOGGLE_ENABLE_FILE_COPY_PASTE: &str = "toggle_enable_file_copy_paste";
-    pub const VIEW_MODE_CUSTOM: &str          = "view_mode_custom";
-    pub const IMAGE_QUALITY_BEST: &str        = "image_quality_best";
-    pub const IMAGE_QUALITY_BALANCED: &str    = "image_quality_balanced";
-    pub const IMAGE_QUALITY_LOW: &str         = "image_quality_low";
-    pub const SEND_CLIPBOARD_KEYSTROKES: &str = "send_clipboard_keystrokes";
-    pub const TOGGLE_INPUT_SOURCE: &str       = "toggle_input_source";
-    pub const SWITCH_TAB_NEXT: &str           = "switch_tab_next";
-    pub const SWITCH_TAB_PREV: &str           = "switch_tab_prev";
-    pub const TOGGLE_VOICE_CALL: &str         = "toggle_voice_call";
-    pub const TOGGLE_VIEW_ONLY: &str          = "toggle_view_only";
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum Modifier {
-    Primary,
-    Ctrl,
-    Alt,
-    Shift,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct Binding {
-    pub action: String,
-    pub mods: Vec<Modifier>,
-    pub key: String,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
-pub struct Bindings {
-    #[serde(default)]
-    pub enabled: bool,
-    /// Persistent companion to `enabled`: when true, the matcher returns early
-    /// and every keystroke flows through to the remote (i.e. all bindings are
-    /// suspended). Stored alongside `enabled` and `bindings` so a single
-    /// reload refreshes both flags.
-    #[serde(default)]
-    pub pass_through: bool,
-    #[serde(default)]
-    pub bindings: Vec<Binding>,
-}
-
-pub fn default_bindings() -> Vec<Binding> {
-    let prefix = || vec![Modifier::Primary, Modifier::Alt, Modifier::Shift];
-    // Defaults align with AnyDesk's M/S/I/C/Delete/Arrow/Digit conventions
-    // where applicable; "P" for screenshot also matches AnyDesk.
-    vec![
-        Binding { action: action_id::SEND_CTRL_ALT_DEL.into(),         mods: prefix(), key: "delete".into() },
-        Binding { action: action_id::TOGGLE_FULLSCREEN.into(),         mods: prefix(), key: "enter".into() },
-        Binding { action: action_id::SWITCH_DISPLAY_NEXT.into(),       mods: prefix(), key: "arrow_right".into() },
-        Binding { action: action_id::SWITCH_DISPLAY_PREV.into(),       mods: prefix(), key: "arrow_left".into() },
-        Binding { action: action_id::SCREENSHOT.into(),                mods: prefix(), key: "p".into() },
-        Binding { action: action_id::TOGGLE_SHOW_REMOTE_CURSOR.into(), mods: prefix(), key: "m".into() },
-        Binding { action: action_id::TOGGLE_MUTE.into(),               mods: prefix(), key: "s".into() },
-        Binding { action: action_id::TOGGLE_BLOCK_INPUT.into(),        mods: prefix(), key: "i".into() },
-        Binding { action: action_id::TOGGLE_CHAT.into(),               mods: prefix(), key: "c".into() },
-    ]
-}
-
-/// Match a normalized (key, modifiers) pair against the given bindings.
-/// Returns the matched action ID, or None when the matcher is off
-/// (`enabled == false`), suspended (`pass_through == true`), or no binding
-/// fires for this combo.
-///
-/// Defense-in-depth: bindings with an empty modifier list are skipped here
-/// even though the recording dialog refuses to save them. A hand-edited
-/// config (or a future writer-side bug) that lets an empty-mods binding
-/// through would otherwise turn that key's every press into a swallowed
-/// shortcut, breaking normal typing in the remote session — a much worse
-/// failure than the binding simply not firing.
-pub fn match_normalized<'a>(key: &str, mods: &[Modifier], b: &'a Bindings) -> Option<&'a str> {
-    if !b.enabled || b.pass_through {
-        return None;
-    }
-    for binding in &b.bindings {
-        if binding.mods.is_empty() {
-            continue;
-        }
-        if binding.key == key && mods_equal(&binding.mods, mods) {
-            return Some(binding.action.as_str());
-        }
-    }
-    None
-}
-
-pub fn normalize_modifiers(alt: bool, ctrl: bool, shift: bool, command: bool) -> Vec<Modifier> {
-    // iOS shares Apple's keyboard semantics with macOS — recording dialog
-    // already treats iOS as `_isMac`, so the matcher must too.
-    //
-    // AltGr conflation: `get_modifiers_state` ORs Alt and AltGr, so an
-    // AltGr+key press satisfies `Modifier::Alt`. Theoretical collision only;
-    // fix at `get_modifiers_state` if a real bug surfaces.
-    let mut v = Vec::new();
-    if cfg!(any(target_os = "macos", target_os = "ios")) {
-        if command { v.push(Modifier::Primary); }
-        if ctrl    { v.push(Modifier::Ctrl); }
-    } else {
-        if ctrl    { v.push(Modifier::Primary); }
-    }
-    if alt     { v.push(Modifier::Alt); }
-    if shift   { v.push(Modifier::Shift); }
-    v
-}
-
-/// Map an rdev::Event to a string key name, matching the storage schema.
-/// Returns None for events we don't intercept (modifier-only presses, releases, etc.).
-pub fn event_to_key_name(event: &rdev::Event) -> Option<String> {
-    use rdev::{EventType, Key};
-    let key = match event.event_type {
-        EventType::KeyPress(k) => k,
-        _ => return None,
-    };
-    Some(match key {
-        Key::Delete => "delete".into(),
-        Key::Backspace => "backspace".into(),
-        Key::Tab => "tab".into(),
-        Key::Space => "space".into(),
-        Key::Home => "home".into(),
-        Key::End => "end".into(),
-        Key::PageUp => "page_up".into(),
-        Key::PageDown => "page_down".into(),
-        Key::Insert => "insert".into(),
-        // Numpad Enter (`KpReturn`) shares the "enter" name with the main
-        // Return key — matches the Web matcher (`NumpadEnter` -> "enter") and
-        // matches user expectation that the two physical Enters are
-        // interchangeable for shortcuts.
-        Key::Return | Key::KpReturn => "enter".into(),
-        Key::LeftArrow => "arrow_left".into(),
-        Key::RightArrow => "arrow_right".into(),
-        Key::UpArrow => "arrow_up".into(),
-        Key::DownArrow => "arrow_down".into(),
-        Key::KeyA => "a".into(),
-        Key::KeyB => "b".into(),
-        Key::KeyC => "c".into(),
-        Key::KeyD => "d".into(),
-        Key::KeyE => "e".into(),
-        Key::KeyF => "f".into(),
-        Key::KeyG => "g".into(),
-        Key::KeyH => "h".into(),
-        Key::KeyI => "i".into(),
-        Key::KeyJ => "j".into(),
-        Key::KeyK => "k".into(),
-        Key::KeyL => "l".into(),
-        Key::KeyM => "m".into(),
-        Key::KeyN => "n".into(),
-        Key::KeyO => "o".into(),
-        Key::KeyP => "p".into(),
-        Key::KeyQ => "q".into(),
-        Key::KeyR => "r".into(),
-        Key::KeyS => "s".into(),
-        Key::KeyT => "t".into(),
-        Key::KeyU => "u".into(),
-        Key::KeyV => "v".into(),
-        Key::KeyW => "w".into(),
-        Key::KeyX => "x".into(),
-        Key::KeyY => "y".into(),
-        Key::KeyZ => "z".into(),
-        Key::Num0 => "digit0".into(),
-        Key::Num1 => "digit1".into(),
-        Key::Num2 => "digit2".into(),
-        Key::Num3 => "digit3".into(),
-        Key::Num4 => "digit4".into(),
-        Key::Num5 => "digit5".into(),
-        Key::Num6 => "digit6".into(),
-        Key::Num7 => "digit7".into(),
-        Key::Num8 => "digit8".into(),
-        Key::Num9 => "digit9".into(),
-        Key::F1 => "f1".into(),
-        Key::F2 => "f2".into(),
-        Key::F3 => "f3".into(),
-        Key::F4 => "f4".into(),
-        Key::F5 => "f5".into(),
-        Key::F6 => "f6".into(),
-        Key::F7 => "f7".into(),
-        Key::F8 => "f8".into(),
-        Key::F9 => "f9".into(),
-        Key::F10 => "f10".into(),
-        Key::F11 => "f11".into(),
-        Key::F12 => "f12".into(),
-        _ => return None,
-    })
-}
-
-/// Read keyboard-shortcut bindings from `LocalConfig` and refresh the cache.
-///
-/// Empty or invalid JSON falls back to `Bindings::default()` (disabled, no
-/// bindings). Call this once at startup and again whenever the config is
-/// written.
-pub fn reload_from_config() {
-    let raw = hbb_common::config::LocalConfig::get_option(LOCAL_CONFIG_KEY);
-    let parsed = if raw.is_empty() {
-        Bindings::default()
-    } else {
-        match serde_json::from_str(&raw) {
-            Ok(parsed) => parsed,
-            Err(e) => {
-                log::warn!("Failed to parse keyboard shortcut config: {}", e);
-                Bindings::default()
-            }
-        }
-    };
-    match CACHE.write() {
-        Ok(mut w) => {
-            *w = Arc::new(parsed);
-        }
-        Err(poison) => {
-            log::error!("Keyboard shortcut cache write lock is poisoned");
-            *poison.into_inner() = Arc::new(parsed);
-        }
-    }
-}
-
-/// Snapshot of the currently cached bindings. Cheap (one atomic increment) —
-/// safe to call on every keystroke.
-pub fn current() -> Arc<Bindings> {
-    match CACHE.read() {
-        Ok(b) => Arc::clone(&b),
-        Err(poison) => {
-            log::error!("Keyboard shortcut cache read lock is poisoned");
-            Arc::clone(&poison.into_inner())
-        }
-    }
-}
-
-/// Match an `rdev::Event` against the cached bindings. Returns the matched
-/// action id, or `None` if no binding fires. The Flutter side ignores unknown
-/// action ids (logged as "no handler"), so no whitelist check is needed here.
-///
-/// ── Two known minor warts. DO NOT add global state to "fix" either: ──
-///
-/// 1. Orphan KeyRelease forwarded to peer.
-///    When a shortcut matches we eat the KeyPress, but the matching
-///    KeyRelease (whose `event_type` returns None from `event_to_key_name`)
-///    still flows through to the peer. The remote sees a release for a
-///    press it never received. Every input server we forward to ignores
-///    releases for unpressed keys, so user-visible impact is nil — the
-///    pre-existing hard-coded screenshot-shortcut path had the same shape
-///    for years without a single bug report.
-///
-/// 2. OS auto-repeat re-dispatches a held shortcut.
-///    rdev does not expose an `is_repeat` flag, so a held combo
-///    (Cmd+Alt+Shift+P) would dispatch every ~30-50ms while the keys are
-///    down — toggle actions oscillate, screenshot fires many times. In
-///    practice the OS initial auto-repeat delay is ~250ms and a normal
-///    shortcut press is 50-100ms, so the user has to *deliberately* hold
-///    the combo to hit this. The Web side gets a free fix via the
-///    browser's `KeyboardEvent.repeat`; on native we accept the wart.
-///
-/// The "fix" for either would be a process-global `HashSet<rdev::Key>` (or
-/// equivalent) with paired insert-on-press / remove-on-release logic in
-/// both `process_event*` paths plus a clear-on-leave hook. The cost:
-///
-///   * Lock contention on the hot keystroke path.
-///   * Three input sources (rdev grab, Flutter raw key, Flutter USB HID)
-///     all converge to `rdev::Key`, so correctness depends on
-///     `rdev::key_from_code` / `rdev::usb_hid_key_from_code` /
-///     `rdev::get_win_key` agreeing on the same physical key — the project
-///     already has scattered swap_modifier_key / ControlLeft↔MetaLeft
-///     fixups for places where they historically *didn't* agree. Any new
-///     mismatch silently leaks the set; "shortcut stopped responding"
-///     after a stuck entry is a worse failure mode than "shortcut fired
-///     twice."
-///   * Leak risk on focus loss / disconnect, requiring a clear hook the
-///     callers must remember to invoke.
-///   * Two new code paths to keep in lockstep with two existing keyboard
-///     pipelines.
-///
-/// For two warts whose user-visible impact is nil-to-marginal, that
-/// trade-off goes the wrong way. Leave it. If a real user bug shows up
-/// here, revisit then with concrete repro — not pre-emptively.
-pub fn match_event(event: &rdev::Event) -> Option<String> {
-    let bindings = current();
-    if !bindings.enabled || bindings.pass_through {
-        return None;
-    }
-    // Note: `match_normalized` re-checks both flags below — this short-circuit
-    // is just to avoid the `event_to_key_name` + `get_modifiers_state` work
-    // in the common bypass case.
-    let key_name = event_to_key_name(event)?;
-    let (alt, ctrl, shift, command) =
-        crate::keyboard::client::get_modifiers_state(false, false, false, false);
-    let mods = normalize_modifiers(alt, ctrl, shift, command);
-    match_normalized(&key_name, &mods, &bindings).map(str::to_owned)
-}
-
-/// Match `event` against the cached bindings; if it matched, push a
-/// `shortcut_triggered` Flutter session event and return `true` so the caller
-/// can `return` early. Returns `false` when no shortcut fired (caller should
-/// continue with normal key handling).
-///
-/// `session_id`:
-/// * `Some(&id)` — Flutter FFI path: dispatch to the exact session whose key
-///   event we're processing. No dependence on the global focus tracker.
-/// * `None` — rdev grab loop: the loop is process-wide and has no way to know
-///   which Flutter session id the keystroke was meant for, so route to the
-///   globally-current session via `flutter::get_cur_session_id()`.
-#[cfg(feature = "flutter")]
-pub fn try_dispatch(
-    session_id: Option<&hbb_common::SessionID>,
-    event: &rdev::Event,
-    keyboard_mode: &str,
-) -> bool {
-    let Some(action_id) = match_event(event) else {
-        return false;
-    };
-    let resolved;
-    let sid = match session_id {
-        Some(id) => id,
-        None => {
-            resolved = crate::flutter::get_cur_session_id();
-            &resolved
-        }
-    };
-    crate::keyboard::release_remote_keys(keyboard_mode);
-    crate::flutter::push_session_event(sid, "shortcut_triggered", vec![("action", &action_id)]);
-    true
-}
-
-fn mods_bits(m: &[Modifier]) -> u8 {
-    let mut bits = 0u8;
-    for x in m {
-        bits |= match x {
-            Modifier::Primary => 1,
-            Modifier::Alt     => 2,
-            Modifier::Shift   => 4,
-            // macOS users can bind shortcuts that use Control independently
-            // of Command. On Win/Linux this variant should never appear in a
-            // saved binding (`normalize_modifiers` collapses Ctrl into
-            // Primary), but we still give it a distinct bit so a hand-edited
-            // config can't accidentally collide with another modifier.
-            Modifier::Ctrl    => 8,
-        };
-    }
-    bits
-}
-
-fn mods_equal(a: &[Modifier], b: &[Modifier]) -> bool {
-    mods_bits(a) == mods_bits(b)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn make_press(k: rdev::Key) -> rdev::Event {
-        rdev::Event {
-            time: std::time::SystemTime::now(),
-            unicode: None,
-            platform_code: 0,
-            position_code: 0,
-            event_type: rdev::EventType::KeyPress(k),
-            usb_hid: 0,
-            #[cfg(any(target_os = "windows", target_os = "macos"))]
-            extra_data: 0,
-        }
-    }
-
-    #[test]
-    fn event_to_key_name_handles_f_keys() {
-        use rdev::Key;
-        assert_eq!(event_to_key_name(&make_press(Key::F1)), Some("f1".into()));
-        assert_eq!(event_to_key_name(&make_press(Key::F5)), Some("f5".into()));
-        assert_eq!(event_to_key_name(&make_press(Key::F12)), Some("f12".into()));
-    }
-
-    /// Cross-language parity for default bindings. The fixture file is the
-    /// shared source of truth — Dart has a mirror test against the same file
-    /// (`kDefaultShortcutBindings matches fixture` in
-    /// `flutter/test/keyboard_shortcuts_test.dart`). Any drift on either
-    /// side breaks one of the two tests.
-    #[test]
-    fn default_bindings_match_fixture_json() {
-        let fixture: serde_json::Value = serde_json::from_str(include_str!(
-            "../../flutter/test/fixtures/default_keyboard_shortcuts.json"
-        ))
-        .expect("fixture is valid JSON");
-        let actual: serde_json::Value =
-            serde_json::to_value(default_bindings()).expect("serialize defaults");
-        assert_eq!(
-            fixture, actual,
-            "default_bindings() drifted from \
-             flutter/test/fixtures/default_keyboard_shortcuts.json — update \
-             shortcuts.rs, the fixture, and Dart kDefaultShortcutBindings together"
-        );
-    }
-
-    #[test]
-    fn event_to_key_name_treats_numpad_enter_as_enter() {
-        use rdev::{Event, EventType, Key};
-        let make = |k: Key| Event {
-            time: std::time::SystemTime::now(),
-            unicode: None,
-            platform_code: 0,
-            position_code: 0,
-            event_type: EventType::KeyPress(k),
-            usb_hid: 0,
-            #[cfg(any(target_os = "windows", target_os = "macos"))]
-            extra_data: 0,
-        };
-        assert_eq!(event_to_key_name(&make(Key::Return)), Some("enter".into()));
-        assert_eq!(event_to_key_name(&make(Key::KpReturn)), Some("enter".into()));
-    }
-
-    #[test]
-    fn bindings_round_trip_json() {
-        let json = r#"{
-            "enabled": true,
-            "bindings": [
-                {"action": "send_ctrl_alt_del", "mods": ["primary","alt","shift"], "key": "delete"},
-                {"action": "toggle_fullscreen",  "mods": ["primary","alt","shift"], "key": "enter"}
-            ]
-        }"#;
-        let parsed: Bindings = serde_json::from_str(json).expect("parse");
-        assert!(parsed.enabled);
-        assert_eq!(parsed.bindings.len(), 2);
-        assert_eq!(parsed.bindings[0].action, "send_ctrl_alt_del");
-        assert_eq!(parsed.bindings[0].key, "delete");
-
-        let serialized = serde_json::to_string(&parsed).expect("serialize");
-        let reparsed: Bindings = serde_json::from_str(&serialized).expect("reparse");
-        assert_eq!(parsed, reparsed);
-    }
-
-    #[test]
-    fn defaults_match_design_doc() {
-        let defaults = default_bindings();
-        let actions: Vec<&str> = defaults.iter().map(|b| b.action.as_str()).collect();
-        assert!(actions.contains(&action_id::SEND_CTRL_ALT_DEL));
-        assert!(actions.contains(&action_id::TOGGLE_FULLSCREEN));
-        assert!(actions.contains(&action_id::SWITCH_DISPLAY_NEXT));
-        assert!(actions.contains(&action_id::SWITCH_DISPLAY_PREV));
-        assert!(actions.contains(&action_id::SCREENSHOT));
-        assert!(actions.contains(&action_id::TOGGLE_SHOW_REMOTE_CURSOR));
-        assert!(actions.contains(&action_id::TOGGLE_MUTE));
-        assert!(actions.contains(&action_id::TOGGLE_BLOCK_INPUT));
-        assert!(actions.contains(&action_id::TOGGLE_CHAT));
-        // every default binding includes the three-modifier prefix
-        for b in &defaults {
-            assert!(b.mods.contains(&Modifier::Primary));
-            assert!(b.mods.contains(&Modifier::Alt));
-            assert!(b.mods.contains(&Modifier::Shift));
-        }
-    }
-
-    fn match_for_test<'a>(key: &str, mods: &[Modifier], b: &'a Bindings) -> Option<&'a str> {
-        match_normalized(key, mods, b)
-    }
-
-    #[test]
-    fn match_returns_none_when_pass_through() {
-        let bindings = Bindings {
-            enabled: true,
-            pass_through: true,
-            bindings: default_bindings(),
-        };
-        let result = match_normalized(
-            "p",
-            &[Modifier::Primary, Modifier::Alt, Modifier::Shift],
-            &bindings,
-        );
-        assert_eq!(result, None);
-    }
-
-    #[test]
-    fn match_returns_none_when_disabled() {
-        let bindings = Bindings { enabled: false, pass_through: false, bindings: default_bindings() };
-        let result = match_for_test("p", &[Modifier::Primary, Modifier::Alt, Modifier::Shift], &bindings);
-        assert_eq!(result, None);
-    }
-
-    #[test]
-    fn match_screenshot_when_enabled() {
-        let bindings = Bindings { enabled: true, pass_through: false, bindings: default_bindings() };
-        let result = match_for_test("p", &[Modifier::Primary, Modifier::Alt, Modifier::Shift], &bindings);
-        assert_eq!(result, Some(action_id::SCREENSHOT));
-    }
-
-    #[test]
-    fn match_returns_none_when_modifiers_partial() {
-        let bindings = Bindings { enabled: true, pass_through: false, bindings: default_bindings() };
-        // missing Shift
-        let result = match_for_test("p", &[Modifier::Primary, Modifier::Alt], &bindings);
-        assert_eq!(result, None);
-    }
-
-    #[test]
-    fn match_does_not_fire_on_extra_unbound_keys() {
-        let bindings = Bindings { enabled: true, pass_through: false, bindings: default_bindings() };
-        let result = match_for_test("z", &[Modifier::Primary, Modifier::Alt, Modifier::Shift], &bindings);
-        assert_eq!(result, None);
-    }
-
-    #[test]
-    fn match_handles_duplicate_modifiers_in_input() {
-        // A user-edited config could contain duplicate modifiers; the matcher must
-        // treat the modifier list as a set, not a multiset.
-        let bindings = Bindings {
-            enabled: true,
-            pass_through: false,
-            bindings: vec![Binding {
-                action: "x".into(),
-                mods: vec![Modifier::Primary, Modifier::Alt],
-                key: "a".into(),
-            }],
-        };
-        // Caller passes Primary twice — must not match a binding with Primary+Alt.
-        assert_eq!(
-            match_normalized("a", &[Modifier::Primary, Modifier::Primary], &bindings),
-            None,
-        );
-        // Caller passes Primary+Alt with one duplicate — should still match.
-        assert_eq!(
-            match_normalized("a", &[Modifier::Primary, Modifier::Alt, Modifier::Alt], &bindings),
-            Some("x"),
-        );
-    }
-
-    #[test]
-    fn modifier_normalization_primary_resolves_per_os() {
-        // On Win/Linux: pressing Ctrl satisfies Primary
-        let mods = normalize_modifiers(/*alt=*/true, /*ctrl=*/true, /*shift=*/true, /*command=*/false);
-        if cfg!(any(target_os = "macos", target_os = "ios")) {
-            // On Apple platforms Ctrl is NOT primary
-            assert!(!mods.contains(&Modifier::Primary));
-            assert!(mods.contains(&Modifier::Ctrl));
-        } else {
-            assert!(mods.contains(&Modifier::Primary));
-        }
-        assert!(mods.contains(&Modifier::Alt));
-        assert!(mods.contains(&Modifier::Shift));
-    }
-
-    #[test]
-    fn modifier_normalization_command_is_primary_on_apple() {
-        let mods = normalize_modifiers(true, false, true, /*command=*/true);
-        if cfg!(any(target_os = "macos", target_os = "ios")) {
-            assert!(mods.contains(&Modifier::Primary));
-        } else {
-            // On Win/Linux Command/Meta is NOT primary
-            assert!(!mods.contains(&Modifier::Primary));
-        }
-    }
-
-    #[test]
-    fn match_refuses_zero_modifier_bindings() {
-        // Defense-in-depth: a hand-edited config with empty `mods` must NOT
-        // turn every plain "P" press into a screenshot shortcut, which would
-        // swallow all typing in the remote session. The recording dialog
-        // already refuses to save such bindings, but the matcher must hold
-        // the line independently.
-        let bindings = Bindings {
-            enabled: true,
-            pass_through: false,
-            bindings: vec![Binding {
-                action: "screenshot".into(),
-                mods: vec![],
-                key: "p".into(),
-            }],
-        };
-        assert_eq!(match_normalized("p", &[], &bindings), None);
-        // Even with extra modifiers held by the user, a zero-mod binding
-        // still doesn't match (no shape of held modifiers can equal the
-        // empty saved set after the empty-check skips the entry).
-        assert_eq!(
-            match_normalized("p", &[Modifier::Primary], &bindings),
-            None,
-        );
-    }
-
-    /// Cross-language parity for the full set of shortcut-bindable key
-    /// names (not just the defaults). The fixture lists every name the
-    /// matcher accepts; this test verifies the (rdev::Key → name) round-trip
-    /// covers exactly that set. Dart has a mirror test against the same
-    /// fixture (`logicalKeyName covers the supported-keys fixture` in
-    /// `flutter/test/keyboard_shortcuts_test.dart`).
-    ///
-    /// Adding a key requires updates in three places: the fixture, this
-    /// table, and the Dart `logicalKeyName` — that's the price of the
-    /// parity guarantee. Drift on any side breaks one of the two tests.
-    #[test]
-    fn supported_keys_match_fixture() {
-        use rdev::Key;
-        use std::collections::BTreeSet;
-
-        let table: &[(&str, Key)] = &[
-            ("a", Key::KeyA), ("b", Key::KeyB), ("c", Key::KeyC),
-            ("d", Key::KeyD), ("e", Key::KeyE), ("f", Key::KeyF),
-            ("g", Key::KeyG), ("h", Key::KeyH), ("i", Key::KeyI),
-            ("j", Key::KeyJ), ("k", Key::KeyK), ("l", Key::KeyL),
-            ("m", Key::KeyM), ("n", Key::KeyN), ("o", Key::KeyO),
-            ("p", Key::KeyP), ("q", Key::KeyQ), ("r", Key::KeyR),
-            ("s", Key::KeyS), ("t", Key::KeyT), ("u", Key::KeyU),
-            ("v", Key::KeyV), ("w", Key::KeyW), ("x", Key::KeyX),
-            ("y", Key::KeyY), ("z", Key::KeyZ),
-            ("digit0", Key::Num0), ("digit1", Key::Num1),
-            ("digit2", Key::Num2), ("digit3", Key::Num3),
-            ("digit4", Key::Num4), ("digit5", Key::Num5),
-            ("digit6", Key::Num6), ("digit7", Key::Num7),
-            ("digit8", Key::Num8), ("digit9", Key::Num9),
-            ("f1", Key::F1), ("f2", Key::F2), ("f3", Key::F3),
-            ("f4", Key::F4), ("f5", Key::F5), ("f6", Key::F6),
-            ("f7", Key::F7), ("f8", Key::F8), ("f9", Key::F9),
-            ("f10", Key::F10), ("f11", Key::F11), ("f12", Key::F12),
-            ("delete", Key::Delete),
-            ("backspace", Key::Backspace),
-            ("tab", Key::Tab),
-            ("space", Key::Space),
-            ("enter", Key::Return),
-            ("enter", Key::KpReturn),
-            ("arrow_left", Key::LeftArrow),
-            ("arrow_right", Key::RightArrow),
-            ("arrow_up", Key::UpArrow),
-            ("arrow_down", Key::DownArrow),
-            ("home", Key::Home),
-            ("end", Key::End),
-            ("page_up", Key::PageUp),
-            ("page_down", Key::PageDown),
-            ("insert", Key::Insert),
-        ];
-
-        // Round-trip: every entry in the table must map through
-        // event_to_key_name to its declared name.
-        for (name, key) in table {
-            assert_eq!(
-                event_to_key_name(&make_press(*key)).as_deref(),
-                Some(*name),
-                "rdev::Key::{:?} should map to {:?}",
-                key, name,
-            );
-        }
-
-        // The set of names produced by the table must equal the fixture.
-        let actual: BTreeSet<&str> = table.iter().map(|(n, _)| *n).collect();
-        let fixture_raw: Vec<String> = serde_json::from_str(include_str!(
-            "../../flutter/test/fixtures/supported_shortcut_keys.json"
-        ))
-        .expect("fixture is valid JSON");
-        let expected: BTreeSet<&str> =
-            fixture_raw.iter().map(String::as_str).collect();
-        assert_eq!(
-            actual, expected,
-            "event_to_key_name vocabulary drifted from \
-             flutter/test/fixtures/supported_shortcut_keys.json — update \
-             shortcuts.rs, the fixture, and Dart logicalKeyName together"
-        );
-    }
-
-    #[test]
-    fn reload_handles_missing_and_invalid_json() {
-        // empty (no value set) → defaults
-        hbb_common::config::LocalConfig::set_option(LOCAL_CONFIG_KEY.into(), String::new());
-        reload_from_config();
-        let b = current();
-        assert!(!b.enabled);
-        assert!(b.bindings.is_empty());
-
-        // invalid JSON → defaults (no panic)
-        hbb_common::config::LocalConfig::set_option(LOCAL_CONFIG_KEY.into(), "not json".into());
-        reload_from_config();
-        let b = current();
-        assert!(!b.enabled);
-    }
-}

src/lang/ar.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", "اسم العرض"),
         ("password-hidden-tip", "كلمة المرور مخفية"),
         ("preset-password-in-use-tip", "كلمة المرور المحددة مسبقًا قيد الاستخدام"),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/be.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", "Імя для адлюстравання"),
         ("password-hidden-tip", "Зададзены пастаянны пароль (скрыты)."),
         ("preset-password-in-use-tip", "Пададзены пароль цяпер выкарыстоўваецца"),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/bg.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/ca.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/cn.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", "显示名称"),
         ("password-hidden-tip", "永久密码已设置（已隐藏）"),
         ("preset-password-in-use-tip", "当前使用预设密码"),
-        ("Keyboard Shortcuts", "键盘快捷键"),
-        ("Configure shortcuts...", "配置快捷键..."),
-        ("Enable keyboard shortcuts in remote session", "在远程会话中启用键盘快捷键"),
-        ("shortcut-page-description", "为下列每项会话操作绑定一个组合键。每个绑定至少需要包含一个修饰符。"),
-        ("shortcut-passthrough-tip", "开启后，所有已绑定的组合键都会原样转发到远端。适合在某个组合键与远端需要使用的快捷键冲突时打开。"),
-        ("Pass-through to remote", "穿透到远端"),
-        ("Reset to defaults", "恢复默认设置"),
-        ("shortcut-reset-confirm-tip", "这将以默认快捷键替换所有当前绑定。是否继续？"),
-        ("Monitor", "显示器"),
-        ("Keyboard", "键盘"),
-        ("Toggle fullscreen", "切换全屏"),
-        ("Switch to next display", "切换到下一个显示器"),
-        ("Switch to previous display", "切换到上一个显示器"),
-        ("All monitors", "所有显示器"),
-        ("Monitor #{}", "{} 号显示器"),
-        ("Switch to next tab", "切换到下一个标签"),
-        ("Switch to previous tab", "切换到上一个标签"),
-        ("Toggle session recording", "切换会话录制"),
-        ("Close tab", "关闭标签页"),
-        ("Toggle toolbar", "切换工具栏可见性"),
-        ("Toggle input source", "切换输入源"),
-        ("Edit", "编辑"),
-        ("Save", "保存"),
-        ("Set Shortcut", "设置快捷键"),
-        ("shortcut-recording-instruction", "请按下您想使用的组合键。"),
-        ("shortcut-recording-press-keys-tip", "请按下组合键..."),
-        ("shortcut-must-include-modifiers", "必须至少包含一个修饰符：{}"),
-        ("shortcut-already-bound-to", "已绑定到"),
-        ("Replace", "替换"),
-        ("Valid", "有效"),
-        ("shortcut-mobile-physical-keyboard-tip", "录制需要使用物理键盘，不支持软键盘。"),
-        ("shortcut-key-not-supported", "“{}” 不能用作快捷键。"),
-        ("On", "开"),
-        ("Off", "关"),
+        ("Enable privacy mode", "允许隐私模式"),
     ].iter().cloned().collect();
 }

src/lang/cs.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/da.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/de.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", "Anzeigename"),
         ("password-hidden-tip", "Ein permanentes Passwort wurde festgelegt (ausgeblendet)."),
         ("preset-password-in-use-tip", "Das voreingestellte Passwort wird derzeit verwendet."),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", "Datenschutzmodus aktivieren"),
     ].iter().cloned().collect();
 }

src/lang/el.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", "Εμφανιζόμενο όνομα"),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/en.rs

@@ -274,14 +274,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-incoming-sessions-label", "Keep screen awake during incoming sessions"),
         ("password-hidden-tip", "Permanent password is set (hidden)."),
         ("preset-password-in-use-tip", "Preset password is currently in use."),
-        ("shortcut-page-description", "Bind a key combination to each session action below. Each binding must include at least one modifier."),
-        ("shortcut-passthrough-tip", "When on, every bound combination is forwarded to the remote. Useful when a binding collides with something you need on the remote."),
-        ("shortcut-reset-confirm-tip", "This will replace all current bindings with the default set. Continue?"),
-        ("shortcut-recording-instruction", "Press the key combination you want to use."),
-        ("shortcut-recording-press-keys-tip", "Press a key combination..."),
-        ("shortcut-must-include-modifiers", "Must include at least one modifier: {}"),
-        ("shortcut-already-bound-to", "Already bound to"),
-        ("shortcut-mobile-physical-keyboard-tip", "Recording requires a physical keyboard. Soft keyboards are not supported."),
-        ("shortcut-key-not-supported", "\"{}\" can't be used as a shortcut."),
     ].iter().cloned().collect();
 }

src/lang/eo.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/es.rs

@@ -74,7 +74,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Wrong Password", "Contraseña incorrecta"),
         ("Do you want to enter again?", "¿Quieres volver a entrar?"),
         ("Connection Error", "Error de conexión"),
-        ("Error", ""),
+        ("Error", ),
         ("Reset by the peer", "Restablecido por el par"),
         ("Connecting...", "Conectando..."),
         ("Connection in progress. Please wait.", "Conexión en curso. Espere por favor."),
@@ -90,7 +90,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Receive", "Recibir"),
         ("Send", "Enviar"),
         ("Refresh File", "Actualizar archivo"),
-        ("Local", ""),
+        ("Local", ),
         ("Remote", "Remoto"),
         ("Remote Computer", "Computadora remota"),
         ("Local Computer", "Computadora local"),
@@ -208,7 +208,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Closed manually by the peer", "Cerrado manualmente por el par"),
         ("Enable remote configuration modification", "Habilitar modificación remota de configuración"),
         ("Run without install", "Ejecutar sin instalar"),
-        ("Connect via relay", ""),
+        ("Connect via relay", "Conectar a través de relay"),
         ("Always connect via relay", "Conéctese siempre a través de relay"),
         ("whitelist_tip", "Solo las direcciones IP autorizadas pueden conectarse a este escritorio"),
         ("Login", "Iniciar sesión"),
@@ -228,7 +228,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Username missed", "Olvidó su nombre de usuario"),
         ("Password missed", "Olvidó su contraseña"),
         ("Wrong credentials", "Credenciales incorrectas"),
-        ("The verification code is incorrect or has expired", ""),
+        ("The verification code is incorrect or has expired", "El código de verificación es incorrecto o ha caducado"),
         ("Edit Tag", "Editar tag"),
         ("Forget Password", "Olvidar contraseña"),
         ("Favorites", "Favoritos"),
@@ -302,8 +302,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Keep RustDesk background service", "Dejar RustDesk como Servicio en 2do plano"),
         ("Ignore Battery Optimizations", "Ignorar optimizacioens de bateria"),
         ("android_open_battery_optimizations_tip", "Si deseas deshabilitar esta característica, por favor, ve a la página siguiente de ajustes, busca y entra en  [Batería] y desmarca [Sin restricción]"),
-        ("Start on boot", ""),
-        ("Start the screen sharing service on boot, requires special permissions", ""),
+        ("Start on boot", "Iniciar al arrancar"),
+        ("Start the screen sharing service on boot, requires special permissions", "Iniciar el servicio de pantalla compartida al arrancar, requiere permisos especiales"),
         ("Connection not allowed", "Conexión no disponible"),
         ("Legacy mode", "Modo heredado"),
         ("Map mode", "Modo mapa"),
@@ -326,8 +326,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Ratio", "Relación"),
         ("Image Quality", "Calidad de imagen"),
         ("Scroll Style", "Estilo de desplazamiento"),
-        ("Show Toolbar", ""),
-        ("Hide Toolbar", ""),
+        ("Show Toolbar", "Mostrar herramientas"),
+        ("Hide Toolbar", "Ocultar herramientas"),
         ("Direct Connection", "Conexión directa"),
         ("Relay Connection", "Conexión Relay"),
         ("Secure Connection", "Conexión segura"),
@@ -338,7 +338,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Security", "Seguridad"),
         ("Theme", "Tema"),
         ("Dark Theme", "Tema Oscuro"),
-        ("Light Theme", ""),
+        ("Light Theme", "Tema claro"),
         ("Dark", "Oscuro"),
         ("Light", "Claro"),
         ("Follow System", "Tema del sistema"),
@@ -355,12 +355,12 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Audio Input Device", "Dispositivo de entrada de audio"),
         ("Use IP Whitelisting", "Usar lista de IPs admitidas"),
         ("Network", "Red"),
-        ("Pin Toolbar", ""),
-        ("Unpin Toolbar", ""),
+        ("Pin Toolbar", "Anclar herramientas"),
+        ("Unpin Toolbar", "Desanclar herramientas"),
         ("Recording", "Grabando"),
         ("Directory", "Directorio"),
         ("Automatically record incoming sessions", "Grabación automática de sesiones entrantes"),
-        ("Automatically record outgoing sessions", ""),
+        ("Automatically record outgoing sessions", "Grabación automática de sesiones salientes"),
         ("Change", "Cambiar"),
         ("Start session recording", "Comenzar grabación de sesión"),
         ("Stop session recording", "Detener grabación de sesión"),
@@ -368,7 +368,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Enable LAN discovery", "Habilitar descubrimiento de LAN"),
         ("Deny LAN discovery", "Denegar descubrimiento de LAN"),
         ("Write a message", "Escribir un mensaje"),
-        ("Prompt", ""),
+        ("Prompt", "Solicitud"),
         ("Please wait for confirmation of UAC...", "Por favor, espera confirmación de UAC"),
         ("elevated_foreground_window_tip", "La ventana actual del escritorio remoto necesita privilegios elevados para funcionar, así que no puedes usar ratón y teclado temporalmente. Puedes solicitar al usuario remoto que minimize la ventana actual o hacer clic en el botón de elevación de la ventana de gestión de conexión. Para evitar este problema, se recomienda instalar el programa en el dispositivo remto."),
         ("Disconnected", "Desconectado"),
@@ -616,9 +616,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("During service is on", "Mientras el servicio está activo"),
         ("Capture screen using DirectX", "Capturar pantalla con DirectX"),
         ("Back", "Atrás"),
-        ("Apps", ""),
-        ("Volume up", "Bajar volumen"),
-        ("Volume down", "Subir volumen"),
+        ("Apps", "Aplicaciones"),
+        ("Volume up", "Subir volumen"),
+        ("Volume down", "Bajar volumen"),
         ("Power", "Encendido"),
         ("Telegram bot", "Bot de Telegram"),
         ("enable-bot-tip", "Si activas esta característica puedes recibir código 2FA de tu bot. También puede funcionar como notificación de conexión."),
@@ -651,7 +651,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Update client clipboard", "Actualizar portapapeles del cliente"),
         ("Untagged", "Sin itiquetar"),
         ("new-version-of-{}-tip", "Hay una nueva versión de {} disponible"),
-        ("Accessible devices", ""),
+        ("Accessible devices", "Dispositivos accesibles"),
         ("upgrade_remote_rustdesk_client_to_{}_tip", "Por favor, actualiza el cliente RustDesk a la versión {} o superior en el lado remoto"),
         ("d3d_render_tip", "Al activar el renderizado D3D, la pantalla de control remoto puede verse negra en algunos equipos."),
         ("Use D3D rendering", "Usar renderizado D3D"),
@@ -689,9 +689,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Use WebSocket", "Usar WebSocket"),
         ("Trackpad speed", "Velocidad de trackpad"),
         ("Default trackpad speed", "Velocidad predeterminada de trackpad"),
-        ("Numeric one-time password", ""),
-        ("Enable IPv6 P2P connection", ""),
-        ("Enable UDP hole punching", ""),
+        ("Numeric one-time password", "Contraseña numérica de un solo uso"),
+        ("Enable IPv6 P2P connection", "Habilitar conexión IPv6 P2P"),
+        ("Enable UDP hole punching", "Habilitar perforación de agujero UDP"),
         ("View camera", "Ver cámara"),
         ("Enable camera", "Habilitar cámara"),
         ("No cameras", "No hay cámaras"),
@@ -708,8 +708,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Failed to check if the user is an administrator.", "No se ha podido comprobar si el usuario es un administrador."),
         ("Supported only in the installed version.", "Soportado solo en la versión instalada."),
         ("elevation_username_tip", "Introduzca el nombre de usuario o dominio\\NombreDeUsuario"),
-        ("Preparing for installation ...", ""),
-        ("Show my cursor", ""),
+        ("Preparing for installation ...", "Preparando instlación..."),
+        ("Show my cursor", "Mostrar mi cursor"),
         ("Scale custom", "Escala personalizada"),
         ("Custom scale slider", "Control deslizante de escala personalizada"),
         ("Decrease", "Disminuir"),
@@ -721,61 +721,28 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Show virtual joystick", "Mostrar joystick virtual"),
         ("Edit note", "Editar nota"),
         ("Alias", ""),
-        ("ScrollEdge", ""),
-        ("Allow insecure TLS fallback", ""),
-        ("allow-insecure-tls-fallback-tip", ""),
-        ("Disable UDP", ""),
-        ("disable-udp-tip", ""),
-        ("server-oss-not-support-tip", ""),
-        ("input note here", ""),
-        ("note-at-conn-end-tip", ""),
-        ("Show terminal extra keys", ""),
-        ("Relative mouse mode", ""),
-        ("rel-mouse-not-supported-peer-tip", ""),
-        ("rel-mouse-not-ready-tip", ""),
-        ("rel-mouse-lock-failed-tip", ""),
-        ("rel-mouse-exit-{}-tip", ""),
-        ("rel-mouse-permission-lost-tip", ""),
-        ("Changelog", ""),
-        ("keep-awake-during-outgoing-sessions-label", ""),
-        ("keep-awake-during-incoming-sessions-label", ""),
+        ("ScrollEdge", "Desplazamiento de pantalla"),
+        ("Allow insecure TLS fallback", "Permitir conexión TLS insegura de respaldo"),
+        ("allow-insecure-tls-fallback-tip", "De forma predeterminada, RustDesk verifica el certificado de servidor para protocolos que usen TLS.\nCon esta opción habilitada, Rustdesk volverá al paso de omisión de verificación y procederá en caso de fallo de verificación."),
+        ("Disable UDP", "Inhabilitar UDP"),
+        ("disable-udp-tip", "Controla si se usa TCP solamente.\nCuando esta opción está activa, RustDesk no usará más el puerto UDP 21116, en su lugar se usará el TCP 21116."),
+        ("server-oss-not-support-tip", "NOTA: El servidor RustDesk OSS no incluye esta característica."),
+        ("input note here", "Introducir nota aquí"),
+        ("note-at-conn-end-tip", "Pedir nota al finalizar la conexión"),
+        ("Show terminal extra keys", "Mostrar teclas extra del terminal"),
+        ("Relative mouse mode", "Modo de ratón relativo"),
+        ("rel-mouse-not-supported-peer-tip", "El modo relativo de ratón no está soportado por el par."),
+        ("rel-mouse-not-ready-tip", "El modo relativo de ratón aún no está preparado. Por favor, inténtalo de nuevo."),
+        ("rel-mouse-lock-failed-tip", "Ha fallado el bloqueo del cursor. El modo relativo del ratón ha sido inhabilitado."),
+        ("rel-mouse-exit-{}-tip", "Pulsa {} para salir."),
+        ("rel-mouse-permission-lost-tip", "Permiso de teclado revocado. El modo relativo del ratón ha sido inhabilitado."),
+        ("Changelog", "Registro de cambios"),
+        ("keep-awake-during-outgoing-sessions-label", "Mantener la pantalla activa durante sesiones salientes"),
+        ("keep-awake-during-incoming-sessions-label", "Mantener la pantalla activa durante sesiones entrantes"),
         ("Continue with {}", "Continuar con {}"),
-        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Display Name", "Nombre de pantalla"),
+        ("password-hidden-tip", "La contraseña permanente está ajustada a (oculta)."),
+        ("preset-password-in-use-tip", "Se está usando la contraseña predeterminada."),
+        ("Enable privacy mode", "Habilitar modo privado"),
     ].iter().cloned().collect();
 }

src/lang/et.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/eu.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/fa.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/fi.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/fr.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", "Nom d’affichage"),
         ("password-hidden-tip", "Le mot de passe permanent est défini (masqué)."),
         ("preset-password-in-use-tip", "Le mot de passe prédéfini est actuellement utilisé."),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", "Activer le mode de confidentialité"),
     ].iter().cloned().collect();
 }

src/lang/ge.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/gu.rs

@@ -654,7 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Accessible devices", "એક્સેસિબલ ઉપકરણો"),
         ("upgrade_remote_rustdesk_client_to_{}_tip", "રિમોટ ક્લાયન્ટને {} માં અપગ્રેડ કરો"),
         ("d3d_render_tip", "D3D રેન્ડરિંગ વાપરો"),
-        ("Use D3D rendering", ""),
         ("Printer", "પ્રિન્ટર"),
         ("printer-os-requirement-tip", "પ્રિન્ટિંગ માટે Windows જરૂરી છે."),
         ("printer-requires-installed-{}-client-tip", "આ માટે {} ક્લાયન્ટ ઇન્સ્ટોલ હોવું જોઈએ."),
@@ -743,39 +742,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", "ડિસ્પ્લે નામ"),
         ("password-hidden-tip", "સુરક્ષા માટે પાસવર્ડ છુપાવેલ છે."),
         ("preset-password-in-use-tip", "પ્રીસેટ પાસવર્ડ વપરાશમાં છે."),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/he.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/hi.rs

@@ -654,7 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Accessible devices", "सुलभ डिवाइस"),
         ("upgrade_remote_rustdesk_client_to_{}_tip", "रिमोट RustDesk क्लाइंट को संस्करण {} में अपग्रेड करें"),
         ("d3d_render_tip", "D3D रेंडरिंग का उपयोग करें"),
-        ("Use D3D rendering", ""),
         ("Printer", "प्रिंटर"),
         ("printer-os-requirement-tip", "प्रिंटिंग के लिए Windows आवश्यक है।"),
         ("printer-requires-installed-{}-client-tip", "इसके लिए क्लाइंट साइड पर {} इंस्टॉल होना चाहिए।"),
@@ -743,39 +742,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", "प्रदर्शित नाम"),
         ("password-hidden-tip", "पासवर्ड सुरक्षा के लिए छिपा हुआ है।"),
         ("preset-password-in-use-tip", "पूर्व-निर्धारित पासवर्ड उपयोग में है।"),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
     ].iter().cloned().collect();
 }

src/lang/hr.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/hu.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", "Kijelző név"),
         ("password-hidden-tip", "Állandó jelszó lett beállítva (rejtett)."),
         ("preset-password-in-use-tip", "Jelenleg az alapértelmezett jelszót használja."),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", "Adatvédelmi mód aktiválása"),
     ].iter().cloned().collect();
 }

src/lang/id.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/it.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", "Visualizza nome"),
         ("password-hidden-tip", "È impostata una password permanente (nascosta)."),
         ("preset-password-in-use-tip", "È attualmente in uso la password preimpostata."),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", "Abilita modalità privacy"),
     ].iter().cloned().collect();
 }

src/lang/ja.rs

@@ -739,43 +739,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Changelog", "更新履歴"),
         ("keep-awake-during-outgoing-sessions-label", "送信セッション中は、画面のスリープを無効化する"),
         ("keep-awake-during-incoming-sessions-label", "受信セッション中は、画面のスリープを無効化する"),
-        ("Continue with {}", "{}で続行する"),
+        ("Continue with {}", "{} で続行する"),
         ("Display Name", "表示名"),
         ("password-hidden-tip", "永続的なパスワードが設定されています (非表示)"),
         ("preset-password-in-use-tip", "プリセットパスワードが現在使用されています"),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/ko.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", "표시 이름"),
         ("password-hidden-tip", "영구 비밀번호가 설정되었습니다 (숨김)."),
         ("preset-password-in-use-tip", "현재 사전 설정된 비밀번호가 사용 중입니다."),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", "개인정보 보호 모드 사용함"),
     ].iter().cloned().collect();
 }

src/lang/kz.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/lt.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/lv.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/ml.rs

@@ -654,7 +654,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Accessible devices", "ലഭ്യമായ ഉപകരണങ്ങൾ"),
         ("upgrade_remote_rustdesk_client_to_{}_tip", "റിമോട്ട് പതിപ്പ് {} ലേക്ക് മാറ്റുക"),
         ("d3d_render_tip", "D3D റെൻഡറിംഗ് ഉപയോഗിക്കുക"),
-        ("Use D3D rendering", ""),
         ("Printer", "പ്രിന്റർ"),
         ("printer-os-requirement-tip", "പ്രിന്റിംഗിന് വിൻഡോസ് വേണം."),
         ("printer-requires-installed-{}-client-tip", "ഇതിന് {} ക്ലയന്റ് ഇൻസ്റ്റാൾ ചെയ്യണം."),
@@ -743,39 +742,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", "ഡിസ്‌പ്ലേ പേര്"),
         ("password-hidden-tip", "സുരക്ഷയ്ക്കായി പാസ്‌വേഡ് മറച്ചിരിക്കുന്നു."),
         ("preset-password-in-use-tip", "പ്രീസെറ്റ് പാസ്‌വേഡ് ഉപയോഗത്തിലാണ്."),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
     ].iter().cloned().collect();
 }

src/lang/nb.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/nl.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", "Naam Weergeven"),
         ("password-hidden-tip", "Er is een permanent wachtwoord ingesteld (verborgen)."),
         ("preset-password-in-use-tip", "Het basis wachtwoord is momenteel in gebruik."),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", "Privacymodus inschakelen"),
     ].iter().cloned().collect();
 }

src/lang/pl.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", "Nazwa wyświetlana"),
         ("password-hidden-tip", "Ustawiono (ukryto) stare hasło."),
         ("preset-password-in-use-tip", "Obecnie używane jest hasło domyślne."),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/pt_PT.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/ptbr.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/ro.rs

@@ -540,7 +540,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("auto_disconnect_option_tip", "Deconectează automat sesiunile de la distanță după o perioadă de inactivitate."),
         ("Connection failed due to inactivity", "Conexiunea a eșuat din cauza inactivității"),
         ("Check for software update on startup", "Verifică actualizări la pornire"),
-        ("upgrade_rustdesk_server_pro_to_{}_tip", ""),
+        ("upgrade_rustdesk_server_pro_{}_tip", "Versiunea serverului RustDesk Pro este mai mică decât {}. Te rugăm să o actualizezi."),
         ("pull_group_failed_tip", "Sincronizarea grupului a eșuat. Verifică conexiunea la rețea sau autentifică-te din nou."),
         ("Filter by intersection", "Filtrează prin intersecție"),
         ("Remove wallpaper during incoming sessions", "Elimină imaginea de fundal în timpul sesiunilor primite"),
@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", "Nume afișat"),
         ("password-hidden-tip", "Parola este ascunsă din motive de securitate. Fă clic pe pictograma ochiului pentru a o afișa."),
         ("preset-password-in-use-tip", "Se folosește o parolă prestabilită. Se recomandă setarea unei parole personalizate pentru securitate sporită."),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/ru.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", "Отображаемое имя"),
         ("password-hidden-tip", "Установлен постоянный пароль (скрытый)."),
         ("preset-password-in-use-tip", "Установленный пароль сейчас используется."),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", "Использовать режим конфиденциальности"),
     ].iter().cloned().collect();
 }

src/lang/sc.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/sk.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/sl.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/sq.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/sr.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/sv.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/ta.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/template.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/th.rs

@@ -743,39 +743,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Display Name", ""),
         ("password-hidden-tip", ""),
         ("preset-password-in-use-tip", ""),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("Enable privacy mode", ""),
     ].iter().cloned().collect();
 }

src/lang/tr.rs

@@ -741,41 +741,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-incoming-sessions-label", "Gelen oturumlar süresince ekranı açık tutun"),
         ("Continue with {}", "{} ile devam et"),
         ("Display Name", "Görünen Ad"),
-        ("password-hidden-tip", "Şifre gizli"),
-        ("preset-password-in-use-tip", "Önceden ayarlanmış şifre kullanılıyor"),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", ""),
-        ("shortcut-passthrough-tip", ""),
-        ("Pass-through to remote", ""),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", ""),
-        ("Monitor", ""),
-        ("Keyboard", ""),
-        ("Toggle fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("All monitors", ""),
-        ("Monitor #{}", ""),
-        ("Switch to next tab", ""),
-        ("Switch to previous tab", ""),
-        ("Toggle session recording", ""),
-        ("Close tab", ""),
-        ("Toggle toolbar", ""),
-        ("Toggle input source", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", ""),
-        ("shortcut-recording-press-keys-tip", ""),
-        ("shortcut-must-include-modifiers", ""),
-        ("shortcut-already-bound-to", ""),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", ""),
-        ("shortcut-key-not-supported", ""),
-        ("On", ""),
-        ("Off", ""),
+        ("password-hidden-tip", "Parola gizli"),
+        ("preset-password-in-use-tip", "Önceden ayarlanmış parola kullanılıyor"),
+        ("Enable privacy mode", "Gizlilik modunu etkinleştir"),
     ].iter().cloned().collect();
 }