fix(terminal): comments utf-8 chunk accumulator

Signed-off-by: fufesou <linlong1266@gmail.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

@@ -1,18 +1,47 @@
-# RustDesk Guide
+# RustDesk Guide 
 
-## Project Layout
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Development Commands
+
+### Build Commands
+- `cargo run` - Build and run the desktop application (requires libsciter library)
+- `python3 build.py --flutter` - Build Flutter version (desktop)
+- `python3 build.py --flutter --release` - Build Flutter version in release mode
+- `python3 build.py --hwcodec` - Build with hardware codec support
+- `python3 build.py --vram` - Build with VRAM feature (Windows only)
+- `cargo build --release` - Build Rust binary in release mode
+- `cargo build --features hwcodec` - Build with specific features
+
+### Flutter Mobile Commands
+- `cd flutter && flutter build android` - Build Android APK
+- `cd flutter && flutter build ios` - Build iOS app
+- `cd flutter && flutter run` - Run Flutter app in development mode
+- `cd flutter && flutter test` - Run Flutter tests
+
+### Testing
+- `cargo test` - Run Rust tests
+- `cd flutter && flutter test` - Run Flutter tests
+
+### Platform-Specific Build Scripts
+- `flutter/build_android.sh` - Android build script
+- `flutter/build_ios.sh` - iOS build script
+- `flutter/build_fdroid.sh` - F-Droid build script
+
+## Project Architecture
 
 ### Directory Structure
-* `src/` Rust app
-* `src/server/` audio / clipboard / input / video / network
-* `src/platform/` platform-specific code
-* `src/ui/` legacy Sciter UI (deprecated)
-* `flutter/` current UI
-* `libs/hbb_common/` config / proto / shared utils
-* `libs/scrap/` screen capture
-* `libs/enigo/` input control
-* `libs/clipboard/` clipboard
-* `libs/hbb_common/src/config.rs` all options
+- **`src/`** - Main Rust application code
+  - `src/ui/` - Legacy Sciter UI (deprecated, use Flutter instead)
+  - `src/server/` - Audio/clipboard/input/video services and network connections
+  - `src/client.rs` - Peer connection handling
+  - `src/platform/` - Platform-specific code
+- **`flutter/`** - Flutter UI code for desktop and mobile
+- **`libs/`** - Core libraries
+  - `libs/hbb_common/` - Video codec, config, network wrapper, protobuf, file transfer utilities
+  - `libs/scrap/` - Screen capture functionality
+  - `libs/enigo/` - Platform-specific keyboard/mouse control
+  - `libs/clipboard/` - Cross-platform clipboard implementation
 
 ### Key Components
 - **Remote Desktop Protocol**: Custom protocol implemented in `src/rendezvous_mediator.rs` for communicating with rustdesk-server
@@ -28,59 +57,50 @@
   - Mobile: `flutter/lib/mobile/`
   - Shared: `flutter/lib/common/` and `flutter/lib/models/`
 
+## Important Build Notes
+
+### Dependencies
+- Requires vcpkg for C++ dependencies: `libvpx`, `libyuv`, `opus`, `aom`
+- Set `VCPKG_ROOT` environment variable
+- Download appropriate Sciter library for legacy UI support
+
+### Ignore Patterns
+When working with files, ignore these directories:
+- `target/` - Rust build artifacts
+- `flutter/build/` - Flutter build output
+- `flutter/.dart_tool/` - Flutter tooling files
+
+### Cross-Platform Considerations
+- Windows builds require additional DLLs and virtual display drivers
+- macOS builds need proper signing and notarization for distribution
+- Linux builds support multiple package formats (deb, rpm, AppImage)
+- Mobile builds require platform-specific toolchains (Android SDK, Xcode)
+
+### Feature Flags
+- `hwcodec` - Hardware video encoding/decoding
+- `vram` - VRAM optimization (Windows only)
+- `flutter` - Enable Flutter UI
+- `unix-file-copy-paste` - Unix file clipboard support
+- `screencapturekit` - macOS ScreenCaptureKit (macOS only)
+
+### Config
+All configurations or options are under `libs/hbb_common/src/config.rs` file, 4 types:
+- Settings
+- Local
+- Display
+- Built-in
+
 ## Rust Rules
 
-* Avoid `unwrap()` / `expect()` in production code.
-* Exceptions:
-
-  * tests;
-  * lock acquisition where failure means poisoning, not normal control flow.
-* Otherwise prefer `Result` + `?` or explicit handling.
-* Do not ignore errors silently.
-* Avoid unnecessary `.clone()`.
-* Prefer borrowing when practical.
-* Do not add dependencies unless needed.
-* Keep code simple and idiomatic.
-
-## Tokio Rules
-
-* Assume a Tokio runtime already exists.
-* Never create nested runtimes.
-* Never call `Runtime::block_on()` inside Tokio / async code.
-* Do not hide runtime creation inside helpers or libraries.
-* Do not hold locks across `.await`.
-* Prefer `.await`, `tokio::spawn`, channels.
-* 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.
+- In Rust code, do not introduce `unwrap()` or `expect()`.
+- Allowed exceptions:
+- Tests may use `unwrap()` or `expect()` when it keeps the test focused and readable.
+- Lock acquisition may use `unwrap()` only when the locking API makes that the practical option and the failure mode is poison handling rather than normal control flow.
+- Outside those exceptions, propagate errors, handle them explicitly, or use safer fallbacks instead of `unwrap()` and `expect()`.
 
 ## Editing Hygiene
 
-* Change only what is required.
-* Prefer the smallest valid diff.
-* Do not refactor unrelated code.
-* Do not make formatting-only changes.
-* Keep naming/style consistent with nearby code.
+- Do not introduce formatting-only changes.
+- Do not run repository-wide formatters or reflow unrelated code unless the
+  user explicitly asks for formatting.
+- Keep diffs limited to semantic changes required for the task.

build.py

@@ -512,7 +512,7 @@ def main():
         system2('pip3 install -r requirements.txt')
         system2(
             f'python3 ./generate.py -f ../../{res_dir} -o . -e ../../{res_dir}/rustdesk-{version}-win7-install.exe')
-        system2(f'mv ../../{res_dir}/rustdesk-{version}-win7-install.exe ../..')
+        system2('mv ../../{res_dir}/rustdesk-{version}-win7-install.exe ../..')
     elif os.path.isfile('/usr/bin/pacman'):
         # pacman -S -needed base-devel
         system2("sed -i 's/pkgver=.*/pkgver=%s/g' res/PKGBUILD" % version)

docs/CODE_OF_CONDUCT-FR.md

@@ -1,143 +0,0 @@
-
-# Code de conduite des contributeurs
-
-## Notre engagement
-
-En tant que membres, contributeurs et responsables, nous nous engageons à faire
-de la participation à notre communauté une expérience exempte de harcèlement pour
-tous, indépendamment de l'âge, de la taille corporelle, du handicap visible ou
-invisible, de l'origine ethnique, des caractéristiques sexuelles, de l'identité
-et de l'expression de genre, du niveau d'expérience, de l'éducation, du statut
-socio-économique, de la nationalité, de l'apparence personnelle, de la race, de
-la religion ou de l'identité et de l'orientation sexuelle.
-
-Nous nous engageons à agir et à interagir de manière à contribuer à une
-communauté ouverte, accueillante, diversifiée, inclusive et saine.
-
-## Nos standards
-
-Exemples de comportements qui contribuent à un environnement positif pour notre
-communauté :
-
-* Faire preuve d'empathie et de bienveillance envers les autres
-* Respecter les opinions, les points de vue et les expériences différents
-* Donner et accepter gracieusement les retours constructifs
-* Assumer ses responsabilités, s'excuser auprès des personnes affectées par nos
-  erreurs et apprendre de l'expérience
-* Se concentrer sur ce qui est le mieux non seulement pour nous en tant
-  qu'individus, mais pour l'ensemble de la communauté
-
-Exemples de comportements inacceptables :
-
-* L'utilisation de langage ou d'images à caractère sexuel, et les attentions ou
-  avances sexuelles de quelque nature que ce soit
-* Le trolling, les commentaires insultants ou désobligeants, et les attaques
-  personnelles ou politiques
-* Le harcèlement public ou privé
-* La publication d'informations privées d'autrui, telles qu'une adresse physique
-  ou électronique, sans autorisation explicite
-* Tout autre comportement qui pourrait raisonnablement être considéré comme
-  inapproprié dans un cadre professionnel
-
-## Responsabilités en matière d'application
-
-Les responsables de la communauté sont chargés de clarifier et d'appliquer nos
-standards de comportement acceptable et prendront des mesures correctives
-appropriées et équitables en réponse à tout comportement qu'ils jugent
-inapproprié, menaçant, offensant ou nuisible.
-
-Les responsables de la communauté ont le droit et la responsabilité de
-supprimer, modifier ou rejeter les commentaires, commits, code, modifications
-du wiki, issues et autres contributions qui ne sont pas conformes à ce Code de
-conduite, et communiqueront les raisons de leurs décisions de modération le cas
-échéant.
-
-## Portée
-
-Ce Code de conduite s'applique dans tous les espaces communautaires, et
-s'applique également lorsqu'une personne représente officiellement la communauté
-dans les espaces publics. Les exemples de représentation de notre communauté
-incluent l'utilisation d'une adresse e-mail officielle, la publication via un
-compte de réseau social officiel, ou le fait d'agir en tant que représentant
-désigné lors d'un événement en ligne ou hors ligne.
-
-## Application
-
-Les cas de comportements abusifs, harcelants ou autrement inacceptables peuvent
-être signalés aux responsables de la communauté chargés de l'application à
-[info@rustdesk.com](mailto:info@rustdesk.com).
-Toutes les plaintes seront examinées et feront l'objet d'une enquête rapide et
-équitable.
-
-Tous les responsables de la communauté sont tenus de respecter la vie privée et
-la sécurité de la personne ayant signalé un incident.
-
-## Directives d'application
-
-Les responsables de la communauté suivront ces Directives d'impact communautaire
-pour déterminer les conséquences de toute action qu'ils jugent en violation de ce
-Code de conduite :
-
-### 1. Correction
-
-**Impact communautaire** : Utilisation d'un langage inapproprié ou autre
-comportement jugé non professionnel ou indésirable dans la communauté.
-
-**Conséquence** : Un avertissement écrit et privé de la part des responsables de
-la communauté, expliquant la nature de la violation et pourquoi le comportement
-était inapproprié. Des excuses publiques peuvent être demandées.
-
-### 2. Avertissement
-
-**Impact communautaire** : Une violation par un incident isolé ou une série
-d'actions.
-
-**Conséquence** : Un avertissement avec des conséquences en cas de comportement
-répété. Aucune interaction avec les personnes impliquées, y compris les
-interactions non sollicitées avec les personnes chargées d'appliquer le Code de
-conduite, pendant une période déterminée. Cela inclut d'éviter les interactions
-dans les espaces communautaires ainsi que dans les canaux externes comme les
-réseaux sociaux. Le non-respect de ces conditions peut entraîner une exclusion
-temporaire ou permanente.
-
-### 3. Exclusion temporaire
-
-**Impact communautaire** : Une violation grave des standards communautaires, y
-compris un comportement inapproprié persistant.
-
-**Conséquence** : Une exclusion temporaire de toute interaction ou communication
-publique avec la communauté pendant une période déterminée. Aucune interaction
-publique ou privée avec les personnes impliquées, y compris les interactions non
-sollicitées avec les personnes chargées d'appliquer le Code de conduite, n'est
-autorisée pendant cette période. Le non-respect de ces conditions peut entraîner
-une exclusion permanente.
-
-### 4. Exclusion permanente
-
-**Impact communautaire** : Démontrer un schéma de violation des standards
-communautaires, y compris un comportement inapproprié persistant, le harcèlement
-d'une personne, ou une agression envers des catégories de personnes ou leur
-dénigrement.
-
-**Conséquence** : Une exclusion permanente de toute interaction publique au sein
-de la communauté.
-
-## Attribution
-
-Ce Code de conduite est adapté du [Contributor Covenant][homepage], version 2.0,
-disponible à l'adresse
-[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
-
-Les Directives d'impact communautaire ont été inspirées par
-[l'échelle d'application du code de conduite de Mozilla][Mozilla CoC].
-
-Pour des réponses aux questions fréquentes sur ce code de conduite, consultez la
-FAQ à l'adresse [https://www.contributor-covenant.org/faq][FAQ]. Des traductions
-sont disponibles à l'adresse
-[https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations

docs/CONTRIBUTING-FR.md

@@ -1,55 +0,0 @@
-
-# Contribuer à RustDesk
-
-RustDesk accueille les contributions de tous. Voici les directives si vous
-envisagez de nous aider :
-
-## Contributions
-
-Les contributions à RustDesk ou à ses dépendances doivent être soumises sous
-forme de pull requests GitHub. Chaque pull request sera examinée par un
-contributeur principal (une personne ayant la permission d'intégrer des
-correctifs) et sera soit intégrée dans la branche principale, soit accompagnée
-de retours sur les modifications requises. Toutes les contributions doivent
-suivre ce format, même celles des contributeurs principaux.
-
-Si vous souhaitez travailler sur une issue, veuillez d'abord la revendiquer en
-commentant sur l'issue GitHub indiquant que vous souhaitez la traiter. Cela
-permet d'éviter les efforts en double de la part des contributeurs sur la même
-issue.
-
-## Liste de vérification pour les pull requests
-
-- Partez de la branche master et, si nécessaire, effectuez un rebase sur la
-  branche master actuelle avant de soumettre votre pull request. Si elle ne
-  fusionne pas proprement avec master, il vous sera peut-être demandé de
-  rebaser vos modifications.
-
-- Les commits doivent être aussi petits que possible, tout en s'assurant que
-  chaque commit est correct de manière indépendante (c.-à-d. que chaque commit
-  doit compiler et passer les tests).
-
-- Les commits doivent être accompagnés d'une signature Developer Certificate of
-  Origin (http://developercertificate.org), indiquant que vous (et votre
-  employeur le cas échéant) acceptez d'être liés par les termes de la
-  [licence du projet](../LICENCE). Dans git, il s'agit de l'option `-s` de
-  `git commit`.
-
-- Si votre correctif n'est pas examiné ou si vous avez besoin qu'une personne
-  spécifique l'examine, vous pouvez @-mentionner un relecteur pour demander une
-  revue dans la pull request ou un commentaire, ou vous pouvez demander une
-  revue par [e-mail](mailto:info@rustdesk.com).
-
-- Ajoutez des tests relatifs au bug corrigé ou à la nouvelle fonctionnalité.
-
-Pour des instructions git spécifiques, consultez le
-[GitHub workflow 101](https://github.com/servo/servo/wiki/GitHub-workflow).
-
-## Conduite
-
-https://github.com/rustdesk/rustdesk/blob/master/docs/CODE_OF_CONDUCT.md
-
-## Communication
-
-Les contributeurs de RustDesk se retrouvent fréquemment sur
-[Discord](https://discord.gg/nDceKgxnkV).

docs/README-FR.md

@@ -34,9 +34,9 @@ Les versions de bureau utilisent [sciter](https://sciter.com/) pour l'interface
 - Installez [vcpkg](https://github.com/microsoft/vcpkg), et définissez correctement la variable d'environnement `VCPKG_ROOT`.
 
   - Windows : vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static
-  - Linux/macOS : vcpkg install libvpx libyuv opus aom
+  - Linux/Osx : vcpkg install libvpx libyuv opus aom
 
-- Exécutez `cargo run`
+- Exécuter `cargo run`
 
 ## Comment compiler/build sous Linux
 
@@ -93,7 +93,7 @@ cd rustdesk
 mkdir -p target/debug
 wget https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so
 mv libsciter-gtk.so target/debug
-cargo run
+Exécution du cargo
 ```
 
 ## Comment construire avec Docker

docs/SECURITY-FR.md

@@ -1,16 +0,0 @@
-
-# Politique de sécurité
-
-## Signaler une vulnérabilité
-
-Nous accordons une très grande importance à la sécurité du projet. Nous
-encourageons tous les utilisateurs à nous signaler toute vulnérabilité qu'ils
-découvrent.
-
-Si vous trouvez une vulnérabilité de sécurité dans le projet RustDesk, veuillez
-la signaler de manière responsable en envoyant un e-mail à info@rustdesk.com.
-
-À ce stade, nous n'avons pas de programme de bug bounty. Nous sommes une petite
-équipe qui s'attaque à un grand défi. Nous vous encourageons vivement à signaler
-toute vulnérabilité de manière responsable afin que nous puissions continuer à
-développer une application sécurisée pour l'ensemble de la communauté.

flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/AudioRecordHandle.kt

@@ -62,13 +62,7 @@ class AudioRecordHandle(private var context: Context, private var isVideoStart:
                 return false
             }
         }
-        val recorder = try {
-            builder.build()
-        } catch (e: Exception) {
-            Log.e(logTag, "createAudioRecorder failed", e)
-            return false
-        }
-        audioRecorder = recorder
+        audioRecorder = builder.build()
         Log.d(logTag, "createAudioRecorder done,minBufferSize:$minBufferSize")
         return true
     }

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,65 +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';
-
-/// Read the bindings JSON and produce a human-readable shortcut string for
-/// `actionId`, formatted for the current OS. Returns null if unbound.
-class ShortcutDisplay {
-  static String? formatFor(String actionId) {
-    final raw = bind.mainGetLocalOption(key: kShortcutLocalConfigKey);
-    if (raw.isEmpty) return null;
-    final Map<String, dynamic> parsed;
-    try {
-      parsed = jsonDecode(raw) as Map<String, dynamic>;
-    } catch (_) {
-      return null;
-    }
-    if (parsed['enabled'] != true) return null;
-    final list = (parsed['bindings'] as List? ?? []).cast<Map<String, dynamic>>();
-    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>[];
-    final parts = <String>[];
-    for (final m in ['primary', 'alt', 'shift']) {
-      if (!mods.contains(m)) continue;
-      switch (m) {
-        case 'primary': parts.add(isMac ? '⌘' : 'Ctrl'); break;
-        case 'alt':     parts.add(isMac ? '⌥' : 'Alt'); break;
-        case 'shift':   parts.add(isMac ? '⇧' : 'Shift'); break;
-      }
-    }
-    parts.add(_keyDisplay(keyValue, isMac));
-    return isMac ? parts.join('') : parts.join('+');
-  }
-
-  static String _keyDisplay(String key, bool isMac) {
-    switch (key) {
-      case 'delete':     return isMac ? '⌫' : 'Del';
-      case 'enter':      return isMac ? '⏎' : 'Enter';
-      case 'arrow_left': return '←';
-      case 'arrow_right':return '→';
-      case 'arrow_up':   return '↑';
-      case 'arrow_down': return '↓';
-    }
-    if (key.startsWith('digit')) return key.substring(5);
-    return key.toUpperCase();
-  }
-}

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

@@ -1,490 +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 'recording_dialog.dart';
-
-/// One configurable action — id + i18n key for its label.
-class KeyboardShortcutActionEntry {
-  final String id;
-  final String labelKey;
-  const KeyboardShortcutActionEntry(this.id, this.labelKey);
-}
-
-/// A named group of actions (e.g. "Session Control").
-class KeyboardShortcutActionGroup {
-  final String titleKey;
-  final List<KeyboardShortcutActionEntry> actions;
-  const KeyboardShortcutActionGroup(this.titleKey, this.actions);
-}
-
-/// Canonical action group definitions used by both the desktop and mobile
-/// configuration pages. The order of groups and entries here is the order
-/// the user sees in the UI. (Not `const` because the per-tab ids come from
-/// the `kShortcutActionSwitchTab(n)` helper in `consts.dart`.)
-final List<KeyboardShortcutActionGroup> kKeyboardShortcutActionGroups = [
-  KeyboardShortcutActionGroup('Session Control', [
-    KeyboardShortcutActionEntry(
-        kShortcutActionSendCtrlAltDel, 'Insert Ctrl + Alt + Del'),
-    KeyboardShortcutActionEntry(kShortcutActionInsertLock, 'Insert Lock'),
-    KeyboardShortcutActionEntry(kShortcutActionRefresh, 'Refresh'),
-    KeyboardShortcutActionEntry(kShortcutActionSwitchSides, 'Switch Sides'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleRecording, 'Toggle Recording'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleBlockInput, 'Toggle Block User Input'),
-  ]),
-  KeyboardShortcutActionGroup('Display', [
-    KeyboardShortcutActionEntry(
-        kShortcutActionToggleFullscreen, 'Toggle Fullscreen'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionSwitchDisplayNext, 'Switch to next display'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionSwitchDisplayPrev, 'Switch to previous display'),
-    KeyboardShortcutActionEntry(kShortcutActionViewMode1to1, 'View Mode 1:1'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionViewModeShrink, 'View Mode Shrink'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionViewModeStretch, 'View Mode Stretch'),
-  ]),
-  KeyboardShortcutActionGroup('Other', [
-    KeyboardShortcutActionEntry(kShortcutActionScreenshot, 'Take Screenshot'),
-    KeyboardShortcutActionEntry(kShortcutActionToggleAudio, 'Toggle Audio'),
-    KeyboardShortcutActionEntry(
-        kShortcutActionTogglePrivacyMode, 'Toggle Privacy Mode'),
-    for (var n = 1; n <= 9; n++)
-      KeyboardShortcutActionEntry(
-          kShortcutActionSwitchTab(n), 'Switch Tab $n'),
-  ]),
-];
-
-/// 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;
-
-  const KeyboardShortcutsPageBody({
-    Key? key,
-    this.compact = true,
-    this.editButtonHint,
-    this.headerBanner,
-  }) : 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 = ((json['bindings'] as List?) ?? <dynamic>[])
-        .cast<Map<String, dynamic>>()
-        .toList();
-    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 {
-    final json = _readJson();
-    json['enabled'] = v;
-    // First-time enable: seed defaults if the user has never bound anything.
-    final list = (json['bindings'] as List?) ?? const [];
-    if (v && list.isEmpty) {
-      json['bindings'] = jsonDecode(bind.mainGetDefaultKeyboardShortcuts());
-    }
-    await _writeJson(json);
-  }
-
-  Future<void> _resetToDefaults() async {
-    final json = _readJson();
-    json['bindings'] = jsonDecode(bind.mainGetDefaultKeyboardShortcuts());
-    await _writeJson(json);
-  }
-
-  String _labelFor(String actionId) {
-    for (final g in kKeyboardShortcutActionGroups) {
-      for (final a in g.actions) {
-        if (a.id == actionId) return translate(a.labelKey);
-      }
-    }
-    return actionId;
-  }
-
-  // ----- UI handlers -----
-
-  Future<void> _onEdit(KeyboardShortcutActionEntry entry) async {
-    final json = _readJson();
-    final bindings = ((json['bindings'] as List?) ?? <dynamic>[])
-        .cast<Map<String, dynamic>>();
-    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),
-        ],
-        // Top toggle — mirrors the General-tab _OptionCheckBox semantics.
-        Row(
-          children: [
-            Checkbox(
-              value: enabled,
-              onChanged: (v) async {
-                if (v == null) return;
-                await _setEnabled(v);
-              },
-            ),
-            const SizedBox(width: 4),
-            Expanded(
-              child: GestureDetector(
-                behavior: HitTestBehavior.opaque,
-                onTap: () => _setEnabled(!enabled),
-                child: Text(
-                  translate('Enable keyboard shortcuts in remote session'),
-                ),
-              ),
-            ),
-          ],
-        ),
-        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),
-        // Disabled visual state when toggle is off — but still scrollable.
-        Opacity(
-          opacity: enabled ? 1.0 : 0.5,
-          child: AbsorbPointer(
-            absorbing: !enabled,
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                for (final group in kKeyboardShortcutActionGroups)
-                  _buildGroup(context, group),
-              ],
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildGroup(BuildContext context, KeyboardShortcutActionGroup group) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        const SizedBox(height: 12),
-        Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 8),
-          child: Row(
-            children: [
-              Text(
-                translate(group.titleKey),
-                style: TextStyle(
-                  fontWeight: FontWeight.w600,
-                  color: Theme.of(context).colorScheme.primary,
-                ),
-              ),
-              const SizedBox(width: 8),
-              const Expanded(
-                child: Divider(thickness: 1),
-              ),
-            ],
-          ),
-        ),
-        const SizedBox(height: 4),
-        for (final action in group.actions)
-          widget.compact
-              ? _buildCompactRow(context, action)
-              : _buildTouchRow(context, action),
-      ],
-    );
-  }
-
-  /// Desktop dense row: label | shortcut | edit | clear, all in one Row.
-  Widget _buildCompactRow(
-      BuildContext context, KeyboardShortcutActionEntry entry) {
-    final shortcut = ShortcutDisplayForActionId.format(entry.id);
-    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 = ShortcutDisplayForActionId.format(entry.id);
-    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),
-        ],
-      ),
-    );
-  }
-}
-
-/// Thin wrapper around [ShortcutDisplay.formatFor] that ignores the
-/// `enabled` flag so the configuration page can always show the user what
-/// they have bound, even when the feature is currently disabled.
-class ShortcutDisplayForActionId {
-  static String? format(String actionId) {
-    final raw = bind.mainGetLocalOption(key: kShortcutLocalConfigKey);
-    if (raw.isEmpty) return null;
-    final Map<String, dynamic> parsed;
-    try {
-      parsed = jsonDecode(raw) as Map<String, dynamic>;
-    } catch (_) {
-      return null;
-    }
-    final list = (parsed['bindings'] as List? ?? const [])
-        .cast<Map<String, dynamic>>();
-    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 — render the row as unbound instead of crashing the
-    // settings page.
-    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>[];
-    final parts = <String>[];
-    for (final m in ['primary', 'alt', 'shift']) {
-      if (!mods.contains(m)) continue;
-      switch (m) {
-        case 'primary':
-          parts.add(isMac ? '⌘' : 'Ctrl');
-          break;
-        case 'alt':
-          parts.add(isMac ? '⌥' : 'Alt');
-          break;
-        case 'shift':
-          parts.add(isMac ? '⇧' : 'Shift');
-          break;
-      }
-    }
-    parts.add(_keyDisplay(keyValue, isMac));
-    return isMac ? parts.join('') : parts.join('+');
-  }
-
-  static String _keyDisplay(String key, bool isMac) {
-    switch (key) {
-      case 'delete':
-        return isMac ? '⌫' : 'Del';
-      case 'enter':
-        return isMac ? '⏎' : 'Enter';
-      case 'arrow_left':
-        return '←';
-      case 'arrow_right':
-        return '→';
-      case 'arrow_up':
-        return '↑';
-      case 'arrow_down':
-        return '↓';
-    }
-    if (key.startsWith('digit')) return key.substring(5);
-    return key.toUpperCase();
-  }
-}

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

@@ -1,371 +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 against the
-// "must include Ctrl+Alt+Shift (Cmd+Option+Shift on macOS)" rule, 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';
-
-/// 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;
-
-  @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 the required Ctrl+Alt+Shift
-  /// (Cmd+Option+Shift on macOS) prefix and a non-modifier key.
-  bool get _hasRequiredPrefix =>
-      _mods.contains('primary') &&
-      _mods.contains('alt') &&
-      _mods.contains('shift');
-
-  /// 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 =
-          ((b['mods'] as List?) ?? const []).cast<String>().toSet();
-      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 = _logicalToKeyName(logical);
-
-    final mods = <String>{};
-    if (HardwareKeyboard.instance.isAltPressed) mods.add('alt');
-    if (HardwareKeyboard.instance.isShiftPressed) mods.add('shift');
-    final primary = _isMac
-        ? HardwareKeyboard.instance.isMetaPressed
-        : HardwareKeyboard.instance.isControlPressed;
-    if (primary) 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;
-      }
-    });
-    return KeyEventResult.handled;
-  }
-
-  void _onSave() {
-    if (_key == null || !_hasRequiredPrefix) return;
-    // Sort mods to match the canonical order used by Rust default_bindings:
-    // primary, alt, shift.
-    final ordered = <String>[
-      if (_mods.contains('primary')) 'primary',
-      if (_mods.contains('alt')) 'alt',
-      if (_mods.contains('shift')) 'shift',
-    ];
-    final binding = <String, dynamic>{
-      'action': widget.actionId,
-      'mods': ordered,
-      'key': _key!,
-    };
-    Navigator.of(context).pop(RecordingResult(binding, _conflictActionId));
-  }
-
-  String _formatPrefix() {
-    if (_isMac) return 'Cmd+Option+Shift';
-    return 'Ctrl+Alt+Shift';
-  }
-
-  String _formatCombo() {
-    final parts = <String>[];
-    for (final m in ['primary', 'alt', 'shift']) {
-      if (!_mods.contains(m)) continue;
-      switch (m) {
-        case 'primary':
-          parts.add(_isMac ? '⌘' : 'Ctrl');
-          break;
-        case 'alt':
-          parts.add(_isMac ? '⌥' : 'Alt');
-          break;
-        case 'shift':
-          parts.add(_isMac ? '⇧' : 'Shift');
-          break;
-      }
-    }
-    if (_key != null) {
-      parts.add(_keyDisplay(_key!));
-    }
-    if (parts.isEmpty) return translate('shortcut-recording-press-keys-tip');
-    return _isMac ? parts.join('') : parts.join('+');
-  }
-
-  String _keyDisplay(String key) {
-    switch (key) {
-      case 'delete':
-        return _isMac ? '⌫' : 'Del';
-      case 'enter':
-        return _isMac ? '⏎' : 'Enter';
-      case 'arrow_left':
-        return '←';
-      case 'arrow_right':
-        return '→';
-      case 'arrow_up':
-        return '↑';
-      case 'arrow_down':
-        return '↓';
-    }
-    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;
-    final canSave = hasKey && _hasRequiredPrefix;
-
-    Widget statusLine;
-    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-prefix')} ${_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),
-      ],
-    );
-  }
-
-  /// 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. Returns null for modifier-only or unsupported keys.
-  static String? _logicalToKeyName(LogicalKeyboardKey k) {
-    if (k == LogicalKeyboardKey.delete) return 'delete';
-    if (k == LogicalKeyboardKey.enter ||
-        k == LogicalKeyboardKey.numpadEnter) return 'enter';
-    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';
-
-    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',
-    };
-    if (letters.containsKey(k)) return letters[k];
-
-    final digits = <LogicalKeyboardKey, String>{
-      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',
-    };
-    if (digits.containsKey(k)) return digits[k];
-
-    return null;
-  }
-}

flutter/lib/common/widgets/remote_input.dart

@@ -532,9 +532,7 @@ class _RawTouchGestureDetectorRegionState
       // Official
       TapGestureRecognizer:
           GestureRecognizerFactoryWithHandlers<TapGestureRecognizer>(
-              () => TapGestureRecognizer(
-                    supportedDevices: kTouchBasedDeviceKinds,
-                  ), (instance) {
+              () => TapGestureRecognizer(), (instance) {
         instance
           ..onTapDown = onTapDown
           ..onTapUp = onTapUp
@@ -542,18 +540,14 @@ class _RawTouchGestureDetectorRegionState
       }),
       DoubleTapGestureRecognizer:
           GestureRecognizerFactoryWithHandlers<DoubleTapGestureRecognizer>(
-              () => DoubleTapGestureRecognizer(
-                    supportedDevices: kTouchBasedDeviceKinds,
-                  ), (instance) {
+              () => DoubleTapGestureRecognizer(), (instance) {
         instance
           ..onDoubleTapDown = onDoubleTapDown
           ..onDoubleTap = onDoubleTap;
       }),
       LongPressGestureRecognizer:
           GestureRecognizerFactoryWithHandlers<LongPressGestureRecognizer>(
-              () => LongPressGestureRecognizer(
-                    supportedDevices: kTouchBasedDeviceKinds,
-                  ), (instance) {
+              () => LongPressGestureRecognizer(), (instance) {
         instance
           ..onLongPressDown = onLongPressDown
           ..onLongPressUp = onLongPressUp
@@ -563,9 +557,7 @@ class _RawTouchGestureDetectorRegionState
       // Customized
       HoldTapMoveGestureRecognizer:
           GestureRecognizerFactoryWithHandlers<HoldTapMoveGestureRecognizer>(
-              () => HoldTapMoveGestureRecognizer(
-                    supportedDevices: kTouchBasedDeviceKinds,
-                  ),
+              () => HoldTapMoveGestureRecognizer(),
               (instance) => instance
                 ..onHoldDragStart = onHoldDragStart
                 ..onHoldDragUpdate = onHoldDragUpdate
@@ -573,18 +565,14 @@ class _RawTouchGestureDetectorRegionState
                 ..onHoldDragEnd = onHoldDragEnd),
       DoubleFinerTapGestureRecognizer:
           GestureRecognizerFactoryWithHandlers<DoubleFinerTapGestureRecognizer>(
-              () => DoubleFinerTapGestureRecognizer(
-                    supportedDevices: kTouchBasedDeviceKinds,
-                  ), (instance) {
+              () => DoubleFinerTapGestureRecognizer(), (instance) {
         instance
           ..onDoubleFinerTap = onDoubleFinerTap
           ..onDoubleFinerTapDown = onDoubleFinerTapDown;
       }),
       CustomTouchGestureRecognizer:
           GestureRecognizerFactoryWithHandlers<CustomTouchGestureRecognizer>(
-              () => CustomTouchGestureRecognizer(
-                    supportedDevices: kTouchBasedDeviceKinds,
-                  ), (instance) {
+              () => CustomTouchGestureRecognizer(), (instance) {
         instance.onOneFingerPanStart =
             (DragStartDetails d) => onOneFingerPanStart(context, d);
         instance

flutter/lib/common/widgets/toolbar.dart

@@ -21,13 +21,11 @@ class TTextMenu {
   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) {
@@ -231,8 +229,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
@@ -253,8 +250,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
@@ -272,8 +268,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 &&
@@ -285,15 +280,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
@@ -315,8 +308,7 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
             )
           ],
         ),
-        onPressed: () => ffi.recordingModel.toggle(),
-        actionId: kShortcutActionToggleRecording));
+        onPressed: () => ffi.recordingModel.toggle()));
   }
 
   // to-do:
@@ -350,7 +342,6 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
                   });
                 }
               },
-        actionId: kShortcutActionScreenshot,
       ));
     }
   }
@@ -361,13 +352,6 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
       onPressed: () => onCopyFingerprint(FingerprintState.find(id).value),
     ));
   }
-  // Register tagged callbacks with the shortcut model so global keyboard
-  // shortcuts can dispatch the same actions as the toolbar menu items.
-  for (final menu in v) {
-    if (menu.actionId != null && menu.onPressed != null) {
-      ffi.shortcutModel.register(menu.actionId!, menu.onPressed!);
-    }
-  }
   return v;
 }
 

flutter/lib/consts.dart

@@ -686,24 +686,3 @@ extension WindowsTargetExt on int {
 }
 
 const kCheckSoftwareUpdateFinish = 'check_software_update_finish';
-
-// 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 kShortcutActionScreenshot = 'screenshot';
-const kShortcutActionInsertLock = 'insert_lock';
-const kShortcutActionRefresh = 'refresh';
-const kShortcutActionToggleAudio = 'toggle_audio';
-const kShortcutActionToggleBlockInput = 'toggle_block_input';
-const kShortcutActionToggleRecording = 'toggle_recording';
-const kShortcutActionTogglePrivacyMode = 'toggle_privacy_mode';
-const kShortcutActionViewMode1to1 = 'view_mode_1_to_1';
-const kShortcutActionViewModeShrink = 'view_mode_shrink';
-const kShortcutActionViewModeStretch = 'view_mode_stretch';
-const kShortcutActionSwitchSides = 'switch_sides';
-String kShortcutActionSwitchTab(int n) => 'switch_tab_$n';
-
-const kShortcutLocalConfigKey = 'keyboard-shortcuts';
-const kShortcutEventName = 'shortcut_triggered';

flutter/lib/desktop/pages/desktop_keyboard_shortcuts_page.dart

@@ -1,58 +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) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(translate('Keyboard Shortcuts')),
-        actions: [
-          TextButton.icon(
-            onPressed: () =>
-                _bodyKey.currentState?.resetToDefaultsWithConfirm(),
-            icon: const Icon(Icons.restore),
-            label: Text(translate('Reset to defaults')),
-          ).marginOnly(right: 12),
-        ],
-      ),
-      body: KeyboardShortcutsPageBody(
-        key: _bodyKey,
-        compact: true,
-      ),
-    );
-  }
-}

flutter/lib/desktop/pages/desktop_setting_page.dart

@@ -10,14 +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/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';
@@ -423,57 +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`) is the single
-    // source of truth — it embeds an `enabled` boolean alongside the bindings
-    // list. We mutate the JSON in place via _OptionCheckBox's optGetter /
-    // optSetter hooks rather than introducing a parallel boolean key, so the
-    // Rust matcher and the Web matcher both read the same flag without drift.
-    return _Card(title: 'Keyboard Shortcuts', children: [
-      _OptionCheckBox(
-        context,
-        'Enable keyboard shortcuts in remote session',
-        kShortcutLocalConfigKey,
-        isServer: false,
-        optGetter: ShortcutModel.isEnabled,
-        optSetter: (k, v) async {
-          final raw = bind.mainGetLocalOption(key: k);
-          Map<String, dynamic> parsed = {};
-          if (raw.isNotEmpty) {
-            try {
-              parsed = jsonDecode(raw) as Map<String, dynamic>;
-            } catch (_) {
-              parsed = {};
-            }
-          }
-          parsed['enabled'] = v;
-          parsed['bindings'] ??= <dynamic>[];
-          // Seed defaults the first time the user enables shortcuts so the
-          // common combos (Ctrl+Alt+Shift+Enter for fullscreen, etc.) work
-          // out of the box. Mirrors the same logic on the dedicated config
-          // page.
-          final list = (parsed['bindings'] as List?) ?? const [];
-          if (v && list.isEmpty) {
-            parsed['bindings'] =
-                jsonDecode(bind.mainGetDefaultKeyboardShortcuts());
-          }
-          await bind.mainSetLocalOption(key: k, value: jsonEncode(parsed));
-          // Refresh the matcher cache so the new flag / bindings 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();
-        },
-      ),
-      _ShortcutsConfigureRow(),
-    ]);
-  }
-
   Widget theme() {
     final current = MyTheme.getThemeModePreference().toShortString();
     onChanged(String value) async {
@@ -2994,37 +2946,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,19 +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);
-        // Register the default-bound actions that `toolbarControls` doesn't
-        // own (fullscreen, switch display, switch tab). Done in addition,
-        // not instead of, the toolbar registration above.
-        registerSessionShortcutActions(_ffi,
-            tabController: widget.tabController);
-      }
     });
     _ffi.canvasModel.initializeEdgeScrollFallback(this);
     _ffi.start(

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';
@@ -764,31 +763,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),
-                          Padding(
-                            padding: const EdgeInsets.only(left: 16),
-                            child: Text(
-                              hint,
-                              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);

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});

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
-        // remain unregistered (they will simply log a no-handler debug
-        // line if a mobile user binds one — they have no tabs to switch).
-        registerSessionShortcutActions(gFFI);
-      }
     });
     WidgetsBinding.instance.addObserver(this);
   }
@@ -439,10 +426,12 @@ class _RemotePageState extends State<RemotePage> with WidgetsBindingObserver {
                               }
                               return Container(
                                 color: MyTheme.canvasColor,
-                                child: RawTouchGestureDetectorRegion(
-                                  child: getBodyForMobile(),
-                                  ffi: gFFI,
-                                ),
+                                child: inputModel.isPhysicalMouse.value
+                                    ? getBodyForMobile()
+                                    : RawTouchGestureDetectorRegion(
+                                        child: getBodyForMobile(),
+                                        ffi: gFFI,
+                                      ),
                               );
                             }),
                           ),

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,22 +819,6 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
               showThemeSettings(gFFI.dialogManager);
             },
           ),
-          SettingsTile.navigation(
-            leading: Icon(Icons.keyboard_outlined),
-            title: Text(translate('Keyboard Shortcuts')),
-            description: Text(ShortcutModel.isEnabled()
-                ? translate('On')
-                : translate('Off')),
-            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')),
@@ -1370,4 +1352,3 @@ SettingsTile _getPopupDialogRadioEntry({
     ),
   );
 }
-

flutter/lib/mobile/pages/view_camera_page.dart

@@ -259,11 +259,13 @@ class _ViewCameraPageState extends State<ViewCameraPage>
                         }
                         return Container(
                           color: MyTheme.canvasColor,
-                          child: RawTouchGestureDetectorRegion(
-                            child: getBodyForMobile(),
-                            ffi: gFFI,
-                            isCamera: true,
-                          ),
+                          child: inputModel.isPhysicalMouse.value
+                              ? getBodyForMobile()
+                              : RawTouchGestureDetectorRegion(
+                                  child: getBodyForMobile(),
+                                  ffi: gFFI,
+                                  isCamera: true,
+                                ),
                         );
                       }),
                     ),

flutter/lib/models/input_model.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
-import 'package:flutter/foundation.dart';
 import 'dart:ui' as ui;
 
 import 'package:desktop_multi_window/desktop_multi_window.dart';
@@ -16,13 +15,12 @@ import 'package:get/get.dart';
 import '../../models/model.dart';
 import '../../models/platform_model.dart';
 import '../../models/state_model.dart';
-import 'input_modifier_utils.dart';
 import 'relative_mouse_model.dart';
 import '../common.dart';
 import '../consts.dart';
 
 /// Mouse button enum.
-enum MouseButtons { left, right, wheel, back, forward }
+enum MouseButtons { left, right, wheel, back }
 
 const _kMouseEventDown = 'mousedown';
 const _kMouseEventUp = 'mouseup';
@@ -159,8 +157,6 @@ extension ToString on MouseButtons {
         return 'wheel';
       case MouseButtons.back:
         return 'back';
-      case MouseButtons.forward:
-        return 'forward';
     }
   }
 }
@@ -331,80 +327,6 @@ class ToReleaseKeys {
 }
 
 class InputModel {
-  // Side mouse button support for Linux.
-  // Flutter's Linux embedder drops X11 button 8/9 events, so we capture them
-  // natively via GDK and forward through the platform channel.
-  static InputModel? _activeSideButtonModel;
-  // Tracks per-button which model received a side button down event, so the
-  // matching up event is routed there even if the pointer has left the view
-  // or a different button was pressed in between.
-  static final Map<MouseButtons, InputModel> _sideButtonDownModels = {};
-  static bool _sideButtonChannelInitialized = false;
-
-  /// Each Flutter engine (main window + sub-windows from desktop_multi_window)
-  /// runs its own Dart isolate with its own statics. Called from initEnv()
-  /// which runs per-engine, so each isolate registers its own handler tied
-  /// to its own set of InputModels.
-  static void initSideButtonChannel() {
-    if (!Platform.isLinux) return;
-    if (_sideButtonChannelInitialized) return;
-    _sideButtonChannelInitialized = true;
-
-    const channel = MethodChannel('org.rustdesk.rustdesk/side_buttons');
-    channel.setMethodCallHandler((call) async {
-      if (call.method == 'onSideMouseButton') {
-        final args = call.arguments as Map<dynamic, dynamic>;
-        final button = args['button'] as String;
-        final type = args['type'] as String;
-        final mb = button == 'back' ? MouseButtons.back : MouseButtons.forward;
-
-        if (type == 'down') {
-          final model = _activeSideButtonModel;
-          if (model != null &&
-              !(model.isViewOnly && !model.showMyCursor) &&
-              model.keyboardPerm &&
-              !model.isViewCamera) {
-            _sideButtonDownModels[mb] = model;
-            // Fire-and-forget to avoid blocking the platform channel handler.
-            unawaited(model._sendMouseUnchecked(type, mb).catchError((Object e) {
-              debugPrint('[InputModel] failed to send side button $type for $mb: $e');
-            }));
-          }
-        } else {
-          // Only route 'up' when we recorded the matching 'down';
-          // dropping avoids sending unpaired 'up' to an unrelated session.
-          // Use _sendMouseUnchecked to bypass permission checks so the
-          // release always goes through even if permissions changed.
-          final model = _sideButtonDownModels.remove(mb);
-          if (model != null) {
-            unawaited(model._sendMouseUnchecked(type, mb).catchError((Object e) {
-              debugPrint('[InputModel] failed to send side button $type for $mb: $e');
-            }));
-          }
-        }
-      }
-      return null;
-    });
-  }
-
-  /// Clear any static references to this model (prevents stale routing).
-  /// Releases any held side buttons on the peer so closing a session
-  /// mid-press does not leave a stuck button.
-  void disposeSideButtonTracking() {
-    if (_activeSideButtonModel == this) _activeSideButtonModel = null;
-    final held = _sideButtonDownModels.entries
-        .where((e) => e.value == this)
-        .map((e) => e.key)
-        .toList();
-    for (final mb in held) {
-      _sideButtonDownModels.remove(mb);
-      // Best-effort release; session may already be tearing down.
-      unawaited(_sendMouseUnchecked('up', mb).catchError((Object e) {
-        debugPrint('[InputModel] failed to release side button $mb: $e');
-      }));
-    }
-  }
-
   final WeakReference<FFI> parent;
   String keyboardMode = '';
 
@@ -490,7 +412,6 @@ class InputModel {
   bool get isRelativeMouseModeSupported => _relativeMouse.isSupported;
 
   InputModel(this.parent) {
-    initSideButtonChannel();
     sessionId = parent.target!.sessionId;
     _relativeMouse = RelativeMouseModel(
       sessionId: sessionId,
@@ -699,39 +620,6 @@ class InputModel {
     }
   }
 
-<<<<<<< HEAD
-  // Safe: this only re-dispatches synthesized Shift key-up events.
-  // The key-up path clears the tracked Shift state so this does not loop.
-  void _releaseTrackedShiftKeyEventIfNeeded() {
-    final leftShift = toReleaseKeys.lastLShiftKeyEvent;
-    final rightShift = toReleaseKeys.lastRShiftKeyEvent;
-    if (leftShift != null) {
-      handleKeyEvent(leftShift);
-    }
-    if (rightShift != null) {
-      handleKeyEvent(rightShift);
-    }
-  }
-
-  // Safe: this only re-dispatches synthesized Shift key-up events.
-  // The raw key-up path clears the tracked Shift state so this does not loop.
-  void _releaseTrackedRawShiftKeyEventIfNeeded() {
-    final leftShift = toReleaseRawKeys.lastLShiftKeyEvent;
-    final rightShift = toReleaseRawKeys.lastRShiftKeyEvent;
-    if (leftShift != null) {
-      handleRawKeyEvent(RawKeyUpEvent(
-        data: leftShift.data,
-        character: leftShift.character,
-      ));
-    }
-    if (rightShift != null) {
-      handleRawKeyEvent(RawKeyUpEvent(
-        data: rightShift.data,
-        character: rightShift.character,
-      ));
-    }
-  }
-
   KeyEventResult handleRawKeyEvent(RawKeyEvent e) {
     if (isViewOnly) return KeyEventResult.handled;
     if (isViewCamera) return KeyEventResult.handled;
@@ -786,27 +674,6 @@ class InputModel {
       toReleaseRawKeys.updateKeyUp(key, e);
     }
 
-    // On some mobile soft-keyboard paths, Flutter may leave cached Shift state
-    // set even though the current raw key event is not shifted anymore.
-    if (e is RawKeyDownEvent &&
-        shouldReleaseStaleMobileShift(
-          isMobile: isMobile,
-          cachedShiftPressed: shift,
-          actualShiftPressed: e.isShiftPressed,
-          logicalKey: e.logicalKey,
-          hasTrackedShiftKeyDown: toReleaseRawKeys.lastLShiftKeyEvent != null ||
-              toReleaseRawKeys.lastRShiftKeyEvent != null,
-        )) {
-      if (kDebugMode) {
-        debugPrint(
-          'input: releasing stale mobile Shift before replaying tracked raw '
-          'key-up (logicalKey=${e.logicalKey.keyLabel}, '
-          'actualShiftPressed=${e.isShiftPressed}, cachedShiftPressed=$shift)',
-        );
-      }
-      _releaseTrackedRawShiftKeyEventIfNeeded();
-    }
-
     // * Currently mobile does not enable map mode
     if ((isDesktop || isWebDesktop) && keyboardMode == kKeyMapMode) {
       mapKeyboardModeRaw(e, iosCapsLock);
@@ -827,7 +694,6 @@ class InputModel {
         return KeyEventResult.ignored;
       }
     }
-
     if (isWindows || isLinux) {
       // Ignore meta keys. Because flutter window will loose focus if meta key is pressed.
       if (e.physicalKey == PhysicalKeyboardKey.metaLeft ||
@@ -851,8 +717,6 @@ class InputModel {
       iosCapsLock = _getIosCapsFromCharacter(e);
     }
 
-    // Update cached modifier state before sending the event. The stale mobile
-    // Shift release check below relies on this cached state.
     if (e is KeyUpEvent) {
       handleKeyUpEventModifiers(e);
     } else if (e is KeyDownEvent) {
@@ -890,21 +754,6 @@ class InputModel {
         }
       }
     }
-
-    // On some mobile soft-keyboard paths, Flutter may leave cached Shift state
-    // set even though the current key event is not shifted anymore.
-    if (e is KeyDownEvent &&
-        shouldReleaseStaleMobileShift(
-          isMobile: isMobile,
-          cachedShiftPressed: shift,
-          actualShiftPressed: HardwareKeyboard.instance.isShiftPressed,
-          logicalKey: e.logicalKey,
-          hasTrackedShiftKeyDown: toReleaseKeys.lastLShiftKeyEvent != null ||
-              toReleaseKeys.lastRShiftKeyEvent != null,
-        )) {
-      _releaseTrackedShiftKeyEventIfNeeded();
-    }
-
     final isDesktopAndMapMode =
         isDesktop || (isWebDesktop && keyboardMode == kKeyMapMode);
     if (isMobileAndMapMode || isDesktopAndMapMode) {
@@ -1117,20 +966,13 @@ class InputModel {
     return evt;
   }
 
-  /// Send mouse event unconditionally (no permission checks).
-  /// Used for side button releases that must go through even if permissions
-  /// changed after the matching down was sent.
-  Future<void> _sendMouseUnchecked(String type, MouseButtons button) async {
-    await bind.sessionSendMouse(
-        sessionId: sessionId,
-        msg: json.encode(modify({'type': type, 'buttons': button.value})));
-  }
-
   /// Send mouse press event.
   Future<void> sendMouse(String type, MouseButtons button) async {
     if (!keyboardPerm) return;
     if (isViewCamera) return;
-    await _sendMouseUnchecked(type, button);
+    await bind.sessionSendMouse(
+        sessionId: sessionId,
+        msg: json.encode(modify({'type': type, 'buttons': button.value})));
   }
 
   void enterOrLeave(bool enter) {
@@ -1140,13 +982,6 @@ class InputModel {
     _pointerInsideImage = enter;
     _lastWheelTsUs = 0;
 
-    // Track active model for side button events (Linux).
-    if (enter) {
-      _activeSideButtonModel = this;
-    } else if (_activeSideButtonModel == this) {
-      _activeSideButtonModel = null;
-    }
-
     // Fix status
     if (!enter) {
       resetModifiers();
@@ -1497,16 +1332,6 @@ class InputModel {
     return false;
   }
 
-  /// iOS may emit a synthesized touch event after a real mouse click.
-  /// This helper ignores touch-down events that arrive shortly after a mouse down,
-  /// even when the position is far (e.g., near the top edge).
-  bool _shouldIgnoreTouchAfterMouse(int nowMs) {
-    if (!isIOS) return false;
-    const int kTouchAfterMouseWindowMs = 700;
-    final dt = nowMs - _lastMouseDownTimeMs;
-    return dt >= 0 && dt < kTouchAfterMouseWindowMs;
-  }
-
   void onPointDownImage(PointerDownEvent e) {
     debugPrint("onPointDownImage ${e.kind}");
     _stopFling = true;
@@ -1519,9 +1344,6 @@ class InputModel {
     // Track mouse down events for duplicate detection on iOS.
     final nowMs = DateTime.now().millisecondsSinceEpoch;
     if (e.kind == ui.PointerDeviceKind.mouse) {
-      if (!isPhysicalMouse.value) {
-        isPhysicalMouse.value = true;
-      }
       _lastMouseDownTimeMs = nowMs;
       _lastMouseDownPos = e.position;
     }
@@ -1531,10 +1353,6 @@ class InputModel {
     }
 
     if (e.kind != ui.PointerDeviceKind.mouse) {
-      // Ignore duplicate touch events that follow a recent mouse click (iOS Magic Mouse issue).
-      if (isPhysicalMouse.value && _shouldIgnoreTouchAfterMouse(nowMs)) {
-        return;
-      }
       if (isPhysicalMouse.value) {
         isPhysicalMouse.value = false;
       }

flutter/lib/models/input_modifier_utils.dart

@@ -1,38 +0,0 @@
-import 'package:flutter/services.dart';
-
-/// Returns true when a stale mobile one-shot Shift state should be released
-/// by replaying a tracked Shift key-down as a synthesized key-up.
-///
-/// This is only valid on mobile when Flutter's cached Shift state is still on
-/// (`cachedShiftPressed == true`) but the current hardware/raw event reports
-/// Shift as off (`actualShiftPressed == false`).
-///
-/// A tracked Shift key-down is required so the caller can safely synthesize the
-/// matching key-up. Both `shiftLeft` and `shiftRight` are excluded because the
-/// Shift key event itself must be processed first; otherwise we could release
-/// the tracked key while still handling the original Shift press/release.
-/// Callers should evaluate this only after their cached modifier state has been
-/// updated for the current event.
-///
-/// When this returns true, the caller logs a line like:
-/// `input: releasing stale mobile Shift before replaying tracked raw key-up`
-/// immediately before calling `_releaseTrackedRawShiftKeyEventIfNeeded()`.
-bool shouldReleaseStaleMobileShift({
-  required bool isMobile,
-  required bool cachedShiftPressed,
-  required bool actualShiftPressed,
-  required LogicalKeyboardKey logicalKey,
-  required bool hasTrackedShiftKeyDown,
-}) {
-  if (!isMobile || !cachedShiftPressed || actualShiftPressed) {
-    return false;
-  }
-  if (!hasTrackedShiftKeyDown) {
-    return false;
-  }
-  if (logicalKey == LogicalKeyboardKey.shiftLeft ||
-      logicalKey == LogicalKeyboardKey.shiftRight) {
-    return false;
-  }
-  return true;
-}

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,
@@ -3940,7 +3932,6 @@ class FFI {
     inputModel.resetModifiers();
     // Dispose relative mouse mode resources to ensure cursor is restored
     inputModel.disposeRelativeMouseMode();
-    inputModel.disposeSideButtonTracking();
     if (closeSession) {
       await bind.sessionClose(sessionId: sessionId);
     }

flutter/lib/models/shortcut_model.dart

@@ -1,141 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/foundation.dart';
-
-import '../common.dart';
-import '../consts.dart';
-import '../desktop/widgets/tabbar_widget.dart' show DesktopTabController;
-import '../models/model.dart';
-import '../models/platform_model.dart';
-import '../models/state_model.dart';
-
-/// 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 {
-  final WeakReference<FFI> parent;
-  final Map<String, VoidCallback> _callbacks = {};
-
-  ShortcutModel(this.parent);
-
-  /// Called by toolbar / menu builders to register what to do when the
-  /// matched shortcut fires.
-  void register(String actionId, VoidCallback callback) {
-    _callbacks[actionId] = callback;
-  }
-
-  void unregister(String actionId) {
-    _callbacks.remove(actionId);
-  }
-
-  /// 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) {
-      cb();
-    } 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>;
-      final list = (parsed['bindings'] as List?) ?? [];
-      return list.cast<Map<String, dynamic>>();
-    } 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;
-    }
-  }
-}
-
-/// 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.
-///
-/// [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,
-}) {
-  final sessionId = ffi.sessionId;
-
-  // Toggle Fullscreen — desktop & web-desktop only. `stateGlobal.setFullscreen`
-  // handles native window vs. browser fullscreen; on mobile fullscreen is the
-  // permanent default, so we leave the action unregistered (becomes a logged
-  // no-op if a mobile user binds it).
-  if (isDesktop || isWebDesktop) {
-    ffi.shortcutModel.register(kShortcutActionToggleFullscreen, () {
-      stateGlobal.setFullscreen(!stateGlobal.fullscreen.value);
-    });
-  }
-
-  // Switch Display Next / Prev — requires the peer to have at least 2
-  // displays. No-op when only one display is available or when the user has
-  // selected the "All displays" pseudo-display.
-  void switchDisplayBy(int delta) {
-    final pi = ffi.ffiModel.pi;
-    final count = pi.displays.length;
-    if (count <= 1) return;
-    final current = pi.currentDisplay;
-    if (current == kAllDisplayValue) return;
-    final 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 Tab 1..9 — 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. No-op on mobile /
-  // web (no controller passed) and when the requested tab index is out of
-  // range.
-  if (tabController != null) {
-    for (var n = 1; n <= 9; n++) {
-      final idx = n - 1;
-      ffi.shortcutModel.register(kShortcutActionSwitchTab(n), () {
-        if (tabController.state.value.tabs.length > idx) {
-          tabController.jumpTo(idx);
-        }
-      });
-    }
-  }
-}

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/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/common.dart' as common;
 
 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,30 +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', []);
-  }
-
-  // Mirror of `default_bindings()` in `src/keyboard/shortcuts.rs`. Keep these
-  // two lists in sync — if you add or change a default binding on the Rust
-  // side, update the literal below to match.
-  String mainGetDefaultKeyboardShortcuts({dynamic hint}) {
-    const prefix = ['primary', 'alt', 'shift'];
-    final list = <Map<String, dynamic>>[
-      {'action': 'send_ctrl_alt_del', 'mods': prefix, 'key': 'delete'},
-      {'action': 'toggle_fullscreen', 'mods': prefix, 'key': 'enter'},
-      {'action': 'switch_display_next', 'mods': prefix, 'key': 'arrow_right'},
-      {'action': 'switch_display_prev', 'mods': prefix, 'key': 'arrow_left'},
-      {'action': 'screenshot', 'mods': prefix, 'key': 'p'},
-      for (var n = 1; n <= 9; n++)
-        {'action': 'switch_tab_$n', 'mods': prefix, 'key': 'digit$n'},
-    ];
-    return jsonEncode(list);
-  }
-
   String mainGetInputSource({dynamic hint}) {
     final inputSource =
         js.context.callMethod('getByName', ['option:local', 'input-source']);
@@ -1201,15 +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 is single-window so `gFFI` is always the active session.
-    js.context['onShortcutTriggered'] = (dynamic action) {
-      if (action is String) {
-        common.gFFI.shortcutModel.onTriggered(action);
-      }
-    };
     return Future.value();
   }
 

flutter/linux/my_application.cc

@@ -29,80 +29,6 @@ void try_set_transparent(GtkWindow* window, GdkScreen* screen, FlView* view);
 
 extern bool gIsConnectionManager;
 
-// --- Side mouse button support (back/forward) ---
-// Flutter's Linux embedder doesn't deliver X11 button 8/9 events to Dart.
-// We intercept them via GDK and forward through a dedicated platform channel.
-
-static const char* kSideButtonChannelName = "org.rustdesk.rustdesk/side_buttons";
-
-static gboolean on_side_button_event(GtkWidget* widget, GdkEventButton* event, gpointer user_data) {
-  if (event->button != 8 && event->button != 9) {
-    return FALSE;
-  }
-  // Ignore GDK_2BUTTON_PRESS / GDK_3BUTTON_PRESS (double/triple-click synthetic
-  // events) - only handle real press and release.
-  if (event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) {
-    return FALSE;
-  }
-
-  FlMethodChannel* channel = FL_METHOD_CHANNEL(user_data);
-  if (channel == NULL) return FALSE;
-
-  g_autoptr(FlValue) args = fl_value_new_map();
-  fl_value_set_string_take(args, "button",
-    fl_value_new_string(event->button == 8 ? "back" : "forward"));
-  fl_value_set_string_take(args, "type",
-    fl_value_new_string(event->type == GDK_BUTTON_PRESS ? "down" : "up"));
-
-  fl_method_channel_invoke_method(channel, "onSideMouseButton", args,
-    NULL, NULL, NULL);
-
-  return TRUE;
-}
-
-static FlMethodChannel* side_buttons_create_channel(FlEngine* engine) {
-  g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
-  return fl_method_channel_new(
-    fl_engine_get_binary_messenger(engine),
-    kSideButtonChannelName,
-    FL_METHOD_CODEC(codec));
-}
-
-static void side_buttons_channel_destroy(gpointer data) {
-  g_object_unref(data);
-}
-
-static void side_buttons_init_for_window(GtkWindow* window, FlMethodChannel* channel) {
-  // Guard against double-initialization (would leave dangling signal user_data).
-  if (g_object_get_data(G_OBJECT(window), "side-buttons-channel") != NULL) return;
-
-  gtk_widget_add_events(GTK_WIDGET(window),
-    GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
-  // Store channel on the window so it stays alive and is freed with the window.
-  g_object_set_data_full(G_OBJECT(window), "side-buttons-channel",
-    g_object_ref(channel), side_buttons_channel_destroy);
-  g_signal_connect(window, "button-press-event",
-    G_CALLBACK(on_side_button_event), channel);
-  g_signal_connect(window, "button-release-event",
-    G_CALLBACK(on_side_button_event), channel);
-}
-
-static void on_subwindow_created(FlPluginRegistry* registry) {
-#if defined(GDK_WINDOWING_WAYLAND) && defined(HAS_KEYBOARD_SHORTCUTS_INHIBIT)
-  wayland_shortcuts_inhibit_init_for_subwindow(registry);
-#endif
-  // Set up side button forwarding for sub-windows.
-  if (registry == NULL || !FL_IS_VIEW(registry)) return;
-  FlView* view = FL_VIEW(registry);
-  GtkWidget* toplevel = gtk_widget_get_toplevel(GTK_WIDGET(view));
-  if (toplevel != NULL && GTK_IS_WINDOW(toplevel)) {
-    FlMethodChannel* channel = side_buttons_create_channel(fl_view_get_engine(view));
-    if (channel == NULL) return;
-    side_buttons_init_for_window(GTK_WINDOW(toplevel), channel);
-    g_object_unref(channel);  // window now owns a ref via g_object_set_data_full
-  }
-}
-
 GtkWidget *find_gl_area(GtkWidget *widget);
 
 // Implements GApplication::activate.
@@ -170,12 +96,12 @@ static void my_application_activate(GApplication* application) {
   gtk_widget_show(GTK_WIDGET(window));
   gtk_widget_show(GTK_WIDGET(view));
 
-  // Register callback for sub-windows created by desktop_multi_window plugin.
-  // Handles both Wayland shortcuts inhibition (guarded inside) and side button
-  // forwarding. Safe to call on X11-only builds - the plugin just stores the
-  // callback pointer regardless of windowing system.
+#if defined(GDK_WINDOWING_WAYLAND) && defined(HAS_KEYBOARD_SHORTCUTS_INHIBIT)
+  // Register callback for sub-windows created by desktop_multi_window plugin
+  // Only sub-windows (remote windows) need keyboard shortcuts inhibition
   desktop_multi_window_plugin_set_window_created_callback(
-      (WindowCreatedCallback)on_subwindow_created);
+      (WindowCreatedCallback)wayland_shortcuts_inhibit_init_for_subwindow);
+#endif
 
   fl_register_plugins(FL_PLUGIN_REGISTRY(view));
 
@@ -190,11 +116,6 @@ static void my_application_activate(GApplication* application) {
     self,
     nullptr);
 
-  // Forward side mouse button events (back/forward) to Dart on the main window.
-  FlMethodChannel* side_channel = side_buttons_create_channel(fl_view_get_engine(view));
-  side_buttons_init_for_window(window, side_channel);
-  g_object_unref(side_channel);
-
   gtk_widget_grab_focus(GTK_WIDGET(view));
 }
 

flutter/pubspec.yaml

@@ -113,8 +113,8 @@ dependencies:
 
 dev_dependencies:
   icons_launcher: ^2.0.4
-  flutter_test:
-    sdk: flutter
+  #flutter_test:
+  #sdk: flutter
   build_runner: ^2.4.6
   freezed: ^2.4.2
   flutter_lints: ^2.0.2

flutter/test/input_modifier_utils_test.dart

@@ -1,125 +0,0 @@
-import 'package:flutter/services.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:flutter_hbb/models/input_modifier_utils.dart';
-
-void main() {
-  group('shouldReleaseStaleMobileShift', () {
-    test('does not release when cached shift is already false', () {
-      expect(
-        shouldReleaseStaleMobileShift(
-          isMobile: true,
-          cachedShiftPressed: false,
-          actualShiftPressed: false,
-          logicalKey: LogicalKeyboardKey.keyD,
-          hasTrackedShiftKeyDown: true,
-        ),
-        isFalse,
-      );
-    });
-
-    test('releases one-shot mobile shift after a text key', () {
-      expect(
-        shouldReleaseStaleMobileShift(
-          isMobile: true,
-          cachedShiftPressed: true,
-          actualShiftPressed: false,
-          logicalKey: LogicalKeyboardKey.keyD,
-          hasTrackedShiftKeyDown: true,
-        ),
-        isTrue,
-      );
-    });
-
-    test('does not release manually toggled shift without tracked key down',
-        () {
-      expect(
-        shouldReleaseStaleMobileShift(
-          isMobile: true,
-          cachedShiftPressed: true,
-          actualShiftPressed: false,
-          logicalKey: LogicalKeyboardKey.keyD,
-          hasTrackedShiftKeyDown: false,
-        ),
-        isFalse,
-      );
-    });
-
-    test('does not release when shift is still physically pressed', () {
-      expect(
-        shouldReleaseStaleMobileShift(
-          isMobile: true,
-          cachedShiftPressed: true,
-          actualShiftPressed: true,
-          logicalKey: LogicalKeyboardKey.keyD,
-          hasTrackedShiftKeyDown: true,
-        ),
-        isFalse,
-      );
-    });
-
-    test('does not release on non-mobile platforms', () {
-      expect(
-        shouldReleaseStaleMobileShift(
-          isMobile: false,
-          cachedShiftPressed: true,
-          actualShiftPressed: false,
-          logicalKey: LogicalKeyboardKey.keyD,
-          hasTrackedShiftKeyDown: true,
-        ),
-        isFalse,
-      );
-    });
-
-    test('releases on enter key', () {
-      expect(
-        shouldReleaseStaleMobileShift(
-          isMobile: true,
-          cachedShiftPressed: true,
-          actualShiftPressed: false,
-          logicalKey: LogicalKeyboardKey.enter,
-          hasTrackedShiftKeyDown: true,
-        ),
-        isTrue,
-      );
-    });
-
-    test('releases on arrow key', () {
-      expect(
-        shouldReleaseStaleMobileShift(
-          isMobile: true,
-          cachedShiftPressed: true,
-          actualShiftPressed: false,
-          logicalKey: LogicalKeyboardKey.arrowLeft,
-          hasTrackedShiftKeyDown: true,
-        ),
-        isTrue,
-      );
-    });
-
-    test('does not release on modifier events', () {
-      expect(
-        shouldReleaseStaleMobileShift(
-          isMobile: true,
-          cachedShiftPressed: true,
-          actualShiftPressed: false,
-          logicalKey: LogicalKeyboardKey.shiftLeft,
-          hasTrackedShiftKeyDown: true,
-        ),
-        isFalse,
-      );
-    });
-
-    test('does not release on shiftRight modifier events', () {
-      expect(
-        shouldReleaseStaleMobileShift(
-          isMobile: true,
-          cachedShiftPressed: true,
-          actualShiftPressed: false,
-          logicalKey: LogicalKeyboardKey.shiftRight,
-          hasTrackedShiftKeyDown: true,
-        ),
-        isFalse,
-      );
-    });
-  });
-}

libs/enigo/src/linux/xdo.rs

@@ -8,7 +8,6 @@
 use crate::{Key, KeyboardControllable, MouseButton, MouseControllable};
 
 use hbb_common::libc::c_int;
-use hbb_common::x11::xlib::{Display, XCloseDisplay, XGetPointerMapping, XOpenDisplay};
 use libxdo_sys::{self, xdo_t, CURRENTWINDOW};
 use std::{borrow::Cow, ffi::CString};
 
@@ -33,51 +32,6 @@ fn mousebutton(button: MouseButton) -> c_int {
     }
 }
 
-/// Minimum number of buttons the X11 core pointer must support.
-/// Buttons 8 (Back) and 9 (Forward) are needed for mouse side buttons.
-const MIN_POINTER_BUTTONS: usize = 9;
-
-/// Check that the X11 core pointer's button map includes at least 9 buttons
-/// so that `XTestFakeButtonEvent` can simulate Back (8) and Forward (9).
-///
-/// RustDesk's uinput "Mouse passthrough" device normally provides enough
-/// buttons, but we log a warning if the map is too small so the issue is
-/// diagnosable. `XSetPointerMapping` cannot extend the button count (its
-/// length must match `XGetPointerMapping`), so we only diagnose here.
-fn check_x11_button_map() {
-    // Skip on non-X11 sessions to avoid noisy "XOpenDisplay failed" warnings
-    // on pure Wayland or headless environments without $DISPLAY.
-    if std::env::var_os("DISPLAY").is_none() {
-        return;
-    }
-
-    let display: *mut Display = unsafe { XOpenDisplay(std::ptr::null()) };
-    if display.is_null() {
-        log::warn!("XOpenDisplay failed, cannot check button map");
-        return;
-    }
-
-    let mut current_map = [0u8; 32];
-    let nbuttons =
-        unsafe { XGetPointerMapping(display, current_map.as_mut_ptr(), current_map.len() as i32) };
-    unsafe { XCloseDisplay(display) };
-
-    if nbuttons < 0 {
-        log::warn!("XGetPointerMapping failed (returned {nbuttons})");
-        return;
-    }
-
-    let nbuttons = nbuttons as usize;
-    if nbuttons >= MIN_POINTER_BUTTONS {
-        log::info!("X11 pointer has {nbuttons} buttons, side buttons supported");
-    } else {
-        log::warn!(
-            "X11 pointer has only {nbuttons} buttons (need {MIN_POINTER_BUTTONS}); \
-             back/forward side buttons may not work until a device with more buttons is added"
-        );
-    }
-}
-
 /// The main struct for handling the event emitting
 pub(super) struct EnigoXdo {
     xdo: *mut xdo_t,
@@ -98,7 +52,6 @@ impl Default for EnigoXdo {
             log::warn!("Failed to create xdo context, xdo functions will be disabled");
         } else {
             log::info!("xdo context created successfully");
-            check_x11_button_map();
         }
         Self {
             xdo,

src/cli.rs

@@ -25,13 +25,7 @@ impl Session {
     pub fn new(id: &str, sender: mpsc::UnboundedSender<Data>) -> Self {
         let mut password = "".to_owned();
         if PeerConfig::load(id).password.is_empty() {
-            match rpassword::prompt_password("Enter password: ") {
-                Ok(p) => password = p,
-                Err(e) => {
-                    log::error!("Failed to read password: {:?}", e);
-                    password = "".to_owned();
-                }
-            }
+            password = rpassword::prompt_password("Enter password: ").unwrap();
         }
         let session = Self {
             id: id.to_owned(),

src/client/io_loop.rs

@@ -1448,23 +1448,6 @@ impl<T: InvokeUiSession> Remote<T> {
                     if !self.handler.lc.read().unwrap().disable_clipboard.v {
                         #[cfg(not(any(target_os = "android", target_os = "ios")))]
                         update_clipboard(_mcb.clipboards, ClipboardSide::Client);
-                        #[cfg(target_os = "ios")]
-                        {
-                            if let Some(cb) = _mcb
-                                .clipboards
-                                .iter()
-                                .find(|c| c.format.enum_value() == Ok(ClipboardFormat::Text))
-                            {
-                                let content = if cb.compress {
-                                    hbb_common::compress::decompress(&cb.content)
-                                } else {
-                                    cb.content.to_vec()
-                                };
-                                if let Ok(content) = String::from_utf8(content) {
-                                    self.handler.clipboard(content);
-                                }
-                            }
-                        }
                         #[cfg(target_os = "android")]
                         crate::clipboard::handle_msg_multi_clipboards(_mcb);
                     }

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,
@@ -607,30 +605,21 @@ pub fn session_handle_flutter_raw_key_event(
     }
 }
 
+// SyncReturn<()> is used to make sure enter() and leave() are executed in the sequence this function is called.
+//
 // If the cursor jumps between remote page of two connections, leave view and enter view will be called.
 // session_enter_or_leave() will be called then.
-// As Rust is multi-threaded, enter() can be called before leave().
-// The Rust-side grab ownership state filters stale transitions.
+// As rust is multi-thread, it is possible that enter() is called before leave().
+// This will cause the keyboard input to take no effect.
 pub fn session_enter_or_leave(_session_id: SessionID, _enter: bool) -> SyncReturn<()> {
     #[cfg(not(any(target_os = "android", target_os = "ios")))]
     if let Some(session) = sessions::get_session_by_session_id(&_session_id) {
         let keyboard_mode = session.get_keyboard_mode();
-        // Use the full per-window UUID (not lc.session_id which is per-connection)
-        // so that two windows viewing the same peer get distinct grab owners.
-        let window_id = _session_id.as_u128();
         if _enter {
             set_cur_session_id_(_session_id, &keyboard_mode);
-            crate::keyboard::client::change_grab_status(
-                crate::common::GrabState::Run,
-                &keyboard_mode,
-                window_id,
-            );
+            session.enter(keyboard_mode);
         } else {
-            crate::keyboard::client::change_grab_status(
-                crate::common::GrabState::Wait,
-                &keyboard_mode,
-                window_id,
-            );
+            session.leave(keyboard_mode);
         }
     }
     SyncReturn(())
@@ -1730,7 +1719,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) {
@@ -2250,17 +2238,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/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,72 +79,11 @@ lazy_static::lazy_static! {
     };
 }
 
-pub mod shortcuts;
-
 pub mod client {
     use super::*;
 
-    /// Tracks grab ownership and serializes transitions across threads.
-    ///
-    /// Multiple Flutter isolates (one per session window) call
-    /// `change_grab_status(Run/Wait)` concurrently. Without serialization a
-    /// stale `Wait` from session A can clobber session B's freshly acquired
-    /// grab on any desktop OS.
-    ///
-    /// Windows and macOS are less susceptible in practice because the Flutter
-    /// side triggers `enterView` only after a mouse click inside the window,
-    /// but we cannot rely on that. On Linux/X11, `XGrabKeyboard` can also
-    /// cause a focus-change feedback loop (~10 Hz), so `last_grab` debounces
-    /// spurious `Wait` events that arrive shortly after a `Run`.
-    #[derive(Default)]
-    struct GrabOwnerState {
-        owner: Option<u128>,
-        last_grab: Option<std::time::Instant>,
-        /// True while a deferred-release thread is in flight. Prevents
-        /// spawning redundant threads during the X11 feedback loop.
-        deferred_pending: bool,
-    }
-
-    /// How long after a grab acquisition we suppress Wait from the same session.
-    /// Must exceed one full X11 feedback cycle (~100 ms: 50 ms enable + 50 ms disable).
-    #[cfg(target_os = "linux")]
-    const GRAB_DEBOUNCE_MS: u128 = 300;
-
     lazy_static::lazy_static! {
         static ref IS_GRAB_STARTED: Arc<Mutex<bool>> = Arc::new(Mutex::new(false));
-        static ref GRAB_STATE: Arc<Mutex<GrabOwnerState>> = Arc::new(Mutex::new(GrabOwnerState::default()));
-    }
-
-    #[cfg(target_os = "linux")]
-    lazy_static::lazy_static! {
-        static ref GRAB_OP_LOCK: Mutex<()> = Mutex::new(());
-    }
-
-    #[cfg(target_os = "linux")]
-    fn apply_run_grab_if_owner(session_id: u128, disable_first: bool) {
-        let _lock = GRAB_OP_LOCK.lock().unwrap();
-        let gs = GRAB_STATE.lock().unwrap();
-        if gs.owner != Some(session_id) {
-            return;
-        }
-        drop(gs);
-        if disable_first {
-            log::debug!("[grab] handoff: disable_grab before re-grab");
-            rdev::disable_grab();
-        }
-        rdev::enable_grab();
-    }
-
-    #[cfg(target_os = "linux")]
-    fn disable_grab_if_released() {
-        let _lock = GRAB_OP_LOCK.lock().unwrap();
-        let should_disable = {
-            let gs = GRAB_STATE.lock().unwrap();
-            gs.owner.is_none() && gs.last_grab.is_none()
-        };
-        if should_disable {
-            rdev::disable_grab();
-        }
     }
 
     pub fn start_grab_loop() {
@@ -158,197 +96,39 @@ pub mod client {
     }
 
     #[cfg(not(any(target_os = "android", target_os = "ios")))]
-    pub fn change_grab_status(state: GrabState, keyboard_mode: &str, session_id: u128) {
+    pub fn change_grab_status(state: GrabState, keyboard_mode: &str) {
         #[cfg(feature = "flutter")]
         if !IS_RDEV_ENABLED.load(Ordering::SeqCst) {
             return;
         }
-        // Serialize transitions so a stale `Wait` from a previous owner cannot
-        // clobber a fresh `Run` from a different session window.
-        let mut release_after_unlock = None;
-        #[cfg(target_os = "linux")]
-        let mut run_grab_after_unlock = None;
-        #[cfg(target_os = "linux")]
-        let mut disable_after_unlock = false;
-        let mut gs = GRAB_STATE.lock().unwrap();
         match state {
             GrabState::Ready => {}
             GrabState::Run => {
                 #[cfg(windows)]
                 update_grab_get_key_name(keyboard_mode);
-
-                // Idempotent: if this session already owns the grab, just
-                // refresh the debounce timer (proves the session is still
-                // actively focused) and skip the actual grab call.
-                if gs.owner == Some(session_id) {
-                    gs.last_grab = Some(std::time::Instant::now());
-                    // Reset so the next Wait can spawn a fresh deferred-release
-                    // timer with an up-to-date snapshot of last_grab.
-                    gs.deferred_pending = false;
-                    log::debug!(
-                        "[grab] Run(0x{:x}): already owner, refresh debounce",
-                        session_id
-                    );
-                    return;
-                }
-
-                log::debug!(
-                    "[grab] Run(0x{:x}): prev_owner={}, mode={}",
-                    session_id,
-                    gs.owner
-                        .map_or("none".to_string(), |id| format!("0x{:x}", id)),
-                    keyboard_mode,
-                );
-
                 #[cfg(any(target_os = "windows", target_os = "macos", target_os = "linux"))]
-                KEYBOARD_HOOKED.store(true, Ordering::SeqCst);
+                KEYBOARD_HOOKED.swap(true, Ordering::SeqCst);
 
                 #[cfg(target_os = "linux")]
-                let had_owner = gs.owner.is_some();
-                gs.owner = Some(session_id);
-                gs.last_grab = Some(std::time::Instant::now());
-                // Invalidate any in-flight deferred release from the previous
-                // owner so it cannot suppress a fresh timer for the new owner.
-                gs.deferred_pending = false;
-                #[cfg(target_os = "linux")]
-                {
-                    run_grab_after_unlock = Some(had_owner);
-                }
+                rdev::enable_grab();
             }
             GrabState::Wait => {
-                // Drop stale `Wait` events that do not correspond to the
-                // current grab owner. This prevents a late PointerExit from
-                // session A from releasing session B's freshly acquired grab.
-                if gs.owner != Some(session_id) {
-                    log::debug!(
-                        "[grab] Wait(0x{:x}): ignored, owner={}",
-                        session_id,
-                        gs.owner
-                            .map_or("none".to_string(), |id| format!("0x{:x}", id)),
-                    );
-                    return;
-                }
-
-                // Debounce: on Linux/X11, XGrabKeyboard causes a focus-change
-                // feedback loop (grab -> PointerExit -> ungrab -> PointerEnter ->
-                // grab -> ...). Suppress Wait if the grab was acquired recently
-                // by this same session -- it is X11 feedback, not a real leave.
-                // A deferred release is scheduled so that a genuine leave within
-                // the debounce window is not permanently lost.
-                #[cfg(target_os = "linux")]
-                if let Some(t) = gs.last_grab {
-                    let elapsed = t.elapsed().as_millis();
-                    if elapsed < GRAB_DEBOUNCE_MS {
-                        if !gs.deferred_pending {
-                            log::debug!(
-                                "[grab] Wait(0x{:x}): debounced ({}ms < {}ms), scheduling deferred release",
-                                session_id, elapsed, GRAB_DEBOUNCE_MS,
-                            );
-                            gs.deferred_pending = true;
-                            let remaining = (GRAB_DEBOUNCE_MS - elapsed) as u64 + 50;
-                            let snapshot = gs.last_grab;
-                            let mode = keyboard_mode.to_string();
-                            std::thread::spawn(move || {
-                                std::thread::sleep(std::time::Duration::from_millis(remaining));
-                                let release_keys = {
-                                    let mut gs = GRAB_STATE.lock().unwrap();
-                                    // Release only if no new Run has refreshed the grab since.
-                                    if gs.owner == Some(session_id) && gs.last_grab == snapshot {
-                                        let to_release = take_remote_keys();
-                                        gs.deferred_pending = false;
-                                        log::debug!(
-                                            "[grab] Wait(0x{:x}): deferred release",
-                                            session_id
-                                        );
-                                        KEYBOARD_HOOKED.store(false, Ordering::SeqCst);
-                                        gs.owner = None;
-                                        gs.last_grab = None;
-                                        Some(to_release)
-                                    } else {
-                                        log::debug!(
-                                            "[grab] Wait(0x{:x}): deferred release cancelled (grab refreshed)",
-                                            session_id,
-                                        );
-                                        None
-                                    }
-                                };
-                                if let Some(to_release) = release_keys {
-                                    disable_grab_if_released();
-                                    release_remote_keys_for_events(&mode, to_release);
-                                }
-                            });
-                        } else {
-                            log::debug!(
-                                "[grab] Wait(0x{:x}): debounced, deferred release already pending",
-                                session_id,
-                            );
-                        }
-                        return;
-                    }
-                }
-
-                log::debug!("[grab] Wait(0x{:x}): releasing grab", session_id);
-
                 #[cfg(windows)]
                 rdev::set_get_key_unicode(false);
 
-                #[cfg(any(target_os = "windows", target_os = "macos", target_os = "linux"))]
-                KEYBOARD_HOOKED.store(false, Ordering::SeqCst);
+                release_remote_keys(keyboard_mode);
+
+                #[cfg(any(target_os = "windows", target_os = "macos", target_os = "linux"))]
+                KEYBOARD_HOOKED.swap(false, Ordering::SeqCst);
 
-                gs.owner = None;
-                gs.last_grab = None;
-                gs.deferred_pending = false;
-                release_after_unlock = Some(take_remote_keys());
                 #[cfg(target_os = "linux")]
-                {
-                    disable_after_unlock = true;
-                }
+                rdev::disable_grab();
             }
             GrabState::Exit => {}
         }
-        drop(gs);
-        #[cfg(target_os = "linux")]
-        {
-            if disable_after_unlock {
-                disable_grab_if_released();
-            }
-            if let Some(disable_first) = run_grab_after_unlock {
-                apply_run_grab_if_owner(session_id, disable_first);
-            }
-        }
-        if let Some(to_release) = release_after_unlock {
-            release_remote_keys_for_events(keyboard_mode, to_release);
-        }
     }
 
     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.
-        if let Some(action_id) = crate::keyboard::shortcuts::match_event(event) {
-            #[cfg(feature = "flutter")]
-            {
-                // The rdev grab loop is genuinely process-wide: it does not know which
-                // Flutter SessionID the keystroke was meant for, so we route to the
-                // globally-current session via flutter::get_cur_session_id() (maintained
-                // by session_enter_or_leave). This is the only behavior available on the
-                // rdev path; the Flutter path threads the explicit per-call SessionID
-                // through process_event_with_session instead.
-                let session_id = crate::flutter::get_cur_session_id();
-                crate::flutter::push_session_event(
-                    &session_id,
-                    "shortcut_triggered",
-                    vec![("action", &action_id)],
-                );
-            }
-            #[cfg(not(feature = "flutter"))]
-            {
-                let _ = action_id;
-            }
-            return;
-        }
-
         let keyboard_mode = get_keyboard_mode_enum(keyboard_mode);
         if is_long_press(&event) {
             return;
@@ -364,33 +144,7 @@ pub mod client {
         event: &Event,
         lock_modes: Option<i32>,
         session: &Session<T>,
-        session_id: SessionID,
     ) {
-        // 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.
-        if let Some(action_id) = crate::keyboard::shortcuts::match_event(event) {
-            #[cfg(feature = "flutter")]
-            {
-                // The Flutter path threads the explicit SessionID from the FFI entry
-                // (session_handle_flutter_*key_event) through this call, so the dispatch
-                // targets the exact tab the keystroke originated from — no dependency on
-                // the global focus tracker and no multi-window race.
-                crate::flutter::push_session_event(
-                    &session_id,
-                    "shortcut_triggered",
-                    vec![("action", &action_id)],
-                );
-            }
-            #[cfg(not(feature = "flutter"))]
-            {
-                let _ = action_id;
-                let _ = session_id;
-            }
-            return;
-        }
-
         let keyboard_mode = get_keyboard_mode_enum(keyboard_mode);
         if is_long_press(&event) {
             return;
@@ -587,6 +341,7 @@ fn notify_exit_relative_mouse_mode() {
     flutter::push_session_event(&session_id, "exit_relative_mouse_mode", vec![]);
 }
 
+
 /// Handle relative mouse mode shortcuts in the rdev grab loop.
 /// Returns true if the event should be blocked from being sent to the peer.
 #[cfg(feature = "flutter")]
@@ -785,12 +540,10 @@ pub fn is_long_press(event: &Event) -> bool {
     return false;
 }
 
-fn take_remote_keys() -> HashMap<Key, Event> {
-    let mut to_release = TO_RELEASE.lock().unwrap();
-    std::mem::take(&mut *to_release)
-}
-
-fn release_remote_keys_for_events(keyboard_mode: &str, to_release: HashMap<Key, Event>) {
+pub fn release_remote_keys(keyboard_mode: &str) {
+    // todo!: client quit suddenly, how to release keys?
+    let to_release = TO_RELEASE.lock().unwrap().clone();
+    TO_RELEASE.lock().unwrap().clear();
     for (key, mut event) in to_release.into_iter() {
         event.event_type = EventType::KeyRelease(key);
         client::process_event(keyboard_mode, &event, None);
@@ -805,12 +558,6 @@ fn release_remote_keys_for_events(keyboard_mode: &str, to_release: HashMap<Key,
     }
 }
 
-#[allow(dead_code)]
-pub fn release_remote_keys(keyboard_mode: &str) {
-    // todo!: client quit suddenly, how to release keys?
-    release_remote_keys_for_events(keyboard_mode, take_remote_keys());
-}
-
 pub fn get_keyboard_mode_enum(keyboard_mode: &str) -> KeyboardMode {
     match keyboard_mode {
         "map" => KeyboardMode::Map,
@@ -1001,6 +748,7 @@ pub fn event_to_key_events(
 ) -> Vec<KeyEvent> {
     peer.retain(|c| !c.is_whitespace());
 
+    let mut key_event = KeyEvent::new();
     update_modifiers_state(event);
 
     match event.event_type {
@@ -1013,7 +761,6 @@ pub fn event_to_key_events(
         _ => {}
     }
 
-    let mut key_event = KeyEvent::new();
     key_event.mode = keyboard_mode.into();
 
     let mut key_events = match keyboard_mode {

src/keyboard/shortcuts.rs

@@ -1,370 +0,0 @@
-//! Keyboard shortcuts for triggering session actions locally.
-
-use std::sync::{Arc, RwLock};
-
-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 SCREENSHOT: &str           = "screenshot";
-    pub const INSERT_LOCK: &str          = "insert_lock";
-    pub const REFRESH: &str              = "refresh";
-    pub const TOGGLE_AUDIO: &str         = "toggle_audio";
-    pub const TOGGLE_BLOCK_INPUT: &str   = "toggle_block_input";
-    pub const TOGGLE_RECORDING: &str     = "toggle_recording";
-    pub const TOGGLE_PRIVACY_MODE: &str  = "toggle_privacy_mode";
-    pub const VIEW_MODE_1_TO_1: &str     = "view_mode_1_to_1";
-    pub const VIEW_MODE_SHRINK: &str     = "view_mode_shrink";
-    pub const VIEW_MODE_STRETCH: &str    = "view_mode_stretch";
-    pub const SWITCH_SIDES: &str         = "switch_sides";
-    // switch_tab_1 .. switch_tab_9 are generated below.
-}
-
-pub fn switch_tab_action_id(n: u8) -> Option<&'static str> {
-    match n {
-        1 => Some("switch_tab_1"),
-        2 => Some("switch_tab_2"),
-        3 => Some("switch_tab_3"),
-        4 => Some("switch_tab_4"),
-        5 => Some("switch_tab_5"),
-        6 => Some("switch_tab_6"),
-        7 => Some("switch_tab_7"),
-        8 => Some("switch_tab_8"),
-        9 => Some("switch_tab_9"),
-        _ => None,
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum Modifier {
-    Primary,
-    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,
-    #[serde(default)]
-    pub bindings: Vec<Binding>,
-}
-
-pub fn default_bindings() -> Vec<Binding> {
-    let prefix = || vec![Modifier::Primary, Modifier::Alt, Modifier::Shift];
-    let mut v = 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() },
-    ];
-    for n in 1..=9u8 {
-        if let Some(action) = switch_tab_action_id(n) {
-            v.push(Binding {
-                action: action.into(),
-                mods: prefix(),
-                key: format!("digit{n}"),
-            });
-        }
-    }
-    v
-}
-
-/// Match a normalized (key, modifiers) pair against the given bindings.
-/// Returns the matched action ID, or None.
-pub fn match_normalized<'a>(key: &str, mods: &[Modifier], b: &'a Bindings) -> Option<&'a str> {
-    if !b.enabled {
-        return None;
-    }
-    for binding in &b.bindings {
-        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> {
-    let mut v = Vec::new();
-    let primary = if cfg!(target_os = "macos") { command } else { ctrl };
-    if primary { 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::Return => "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::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(),
-        _ => 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 {
-        serde_json::from_str(&raw).unwrap_or_default()
-    };
-    if let Ok(mut w) = CACHE.write() {
-        *w = Arc::new(parsed);
-    }
-}
-
-/// Snapshot of the currently cached bindings. Cheap (one atomic increment) —
-/// safe to call on every keystroke.
-pub fn current() -> Arc<Bindings> {
-    CACHE
-        .read()
-        .map(|b| Arc::clone(&b))
-        .unwrap_or_else(|_| Arc::new(Bindings::default()))
-}
-
-/// 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.
-pub fn match_event(event: &rdev::Event) -> Option<String> {
-    let bindings = current();
-    if !bindings.enabled {
-        return None;
-    }
-    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)
-}
-
-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,
-        };
-    }
-    bits
-}
-
-fn mods_equal(a: &[Modifier], b: &[Modifier]) -> bool {
-    mods_bits(a) == mods_bits(b)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[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(&"switch_tab_1"));
-        assert!(actions.contains(&"switch_tab_9"));
-        // 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_disabled() {
-        let bindings = Bindings { enabled: 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, 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, 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, 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,
-            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!(target_os = "macos") {
-            // On macOS Ctrl is NOT primary
-            assert!(!mods.contains(&Modifier::Primary));
-        } else {
-            assert!(mods.contains(&Modifier::Primary));
-        }
-        assert!(mods.contains(&Modifier::Alt));
-        assert!(mods.contains(&Modifier::Shift));
-    }
-
-    #[test]
-    fn modifier_normalization_command_is_primary_on_mac() {
-        let mods = normalize_modifiers(true, false, true, /*command=*/true);
-        if cfg!(target_os = "macos") {
-            assert!(mods.contains(&Modifier::Primary));
-        } else {
-            // On Win/Linux Command/Meta is NOT primary
-            assert!(!mods.contains(&Modifier::Primary));
-        }
-    }
-
-    #[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/cn.rs

@@ -743,44 +743,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", "启用后，列出的组合键将在本地触发会话操作，而不会发送到远程端。所有快捷键必须包含 Ctrl+Alt+Shift（macOS 上为 Cmd+Option+Shift），以避免与正常输入冲突。"),
-        ("Reset to defaults", "恢复默认设置"),
-        ("shortcut-reset-confirm-tip", "这将以默认快捷键替换所有当前绑定。是否继续？"),
-        ("Session Control", "会话控制"),
-        ("Toggle Fullscreen", "切换全屏"),
-        ("Switch to next display", "切换到下一个显示器"),
-        ("Switch to previous display", "切换到上一个显示器"),
-        ("View Mode 1:1", "原始大小"),
-        ("View Mode Shrink", "缩小"),
-        ("View Mode Stretch", "拉伸"),
-        ("Take Screenshot", "截图"),
-        ("Toggle Audio", "切换音频"),
-        ("Toggle Privacy Mode", "切换隐私模式"),
-        ("Toggle Recording", "切换录制"),
-        ("Toggle Block User Input", "切换屏蔽用户输入"),
-        ("Switch Tab 1", "切换到第 1 个标签"),
-        ("Switch Tab 2", "切换到第 2 个标签"),
-        ("Switch Tab 3", "切换到第 3 个标签"),
-        ("Switch Tab 4", "切换到第 4 个标签"),
-        ("Switch Tab 5", "切换到第 5 个标签"),
-        ("Switch Tab 6", "切换到第 6 个标签"),
-        ("Switch Tab 7", "切换到第 7 个标签"),
-        ("Switch Tab 8", "切换到第 8 个标签"),
-        ("Switch Tab 9", "切换到第 9 个标签"),
-        ("Edit", "编辑"),
-        ("Save", "保存"),
-        ("Set Shortcut", "设置快捷键"),
-        ("shortcut-recording-instruction", "请按下您想使用的组合键。"),
-        ("shortcut-recording-press-keys-tip", "请按下组合键..."),
-        ("shortcut-must-include-prefix", "必须包含"),
-        ("shortcut-already-bound-to", "已绑定到"),
-        ("Replace", "替换"),
-        ("Valid", "有效"),
-        ("shortcut-mobile-physical-keyboard-tip", "录制需要使用物理键盘，不支持软键盘。"),
-        ("On", "开"),
-        ("Off", "关"),
     ].iter().cloned().collect();
 }

src/lang/en.rs

@@ -274,47 +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."),
-        ("Keyboard Shortcuts", ""),
-        ("Configure shortcuts...", ""),
-        ("Enable keyboard shortcuts in remote session", ""),
-        ("shortcut-page-description", "When enabled, listed key combinations trigger session actions locally instead of being sent to the remote. All bindings must include Ctrl+Alt+Shift (Cmd+Option+Shift on macOS) to avoid conflicts with normal typing."),
-        ("Reset to defaults", ""),
-        ("shortcut-reset-confirm-tip", "This will replace all current bindings with the default set. Continue?"),
-        ("Session Control", ""),
-        ("Display", ""),
-        ("Other", ""),
-        ("Toggle Fullscreen", ""),
-        ("Switch to next display", ""),
-        ("Switch to previous display", ""),
-        ("View Mode 1:1", ""),
-        ("View Mode Shrink", ""),
-        ("View Mode Stretch", ""),
-        ("Take Screenshot", ""),
-        ("Toggle Audio", ""),
-        ("Toggle Privacy Mode", ""),
-        ("Toggle Recording", ""),
-        ("Toggle Block User Input", ""),
-        ("Switch Tab 1", ""),
-        ("Switch Tab 2", ""),
-        ("Switch Tab 3", ""),
-        ("Switch Tab 4", ""),
-        ("Switch Tab 5", ""),
-        ("Switch Tab 6", ""),
-        ("Switch Tab 7", ""),
-        ("Switch Tab 8", ""),
-        ("Switch Tab 9", ""),
-        ("Edit", ""),
-        ("Save", ""),
-        ("Set Shortcut", ""),
-        ("shortcut-recording-instruction", "Press the key combination you want to use."),
-        ("shortcut-recording-press-keys-tip", "Press a key combination..."),
-        ("shortcut-must-include-prefix", "Must include"),
-        ("shortcut-already-bound-to", "Already bound to"),
-        ("Replace", ""),
-        ("Valid", ""),
-        ("shortcut-mobile-physical-keyboard-tip", "Recording requires a physical keyboard. Soft keyboards are not supported."),
-        ("Clear", ""),
-        ("On", ""),
-        ("Off", ""),
     ].iter().cloned().collect();
 }

src/lang/fr.rs

@@ -741,7 +741,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("keep-awake-during-incoming-sessions-label", "Maintenir l’écran allumé lors des sessions entrantes"),
         ("Continue with {}", "Continuer avec {}"),
         ("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é."),
+        ("password-hidden-tip", ""),
+        ("preset-password-in-use-tip", ""),
     ].iter().cloned().collect();
 }

src/platform/linux.rs

@@ -6,7 +6,7 @@ use hbb_common::{
     anyhow::anyhow,
     bail,
     config::{keys::OPTION_ALLOW_LINUX_HEADLESS, Config},
-    libc::{c_char, c_int, c_long, c_uint, c_ulong, c_void},
+    libc::{c_char, c_int, c_long, c_uint, c_void},
     log,
     message_proto::{DisplayInfo, Resolution},
     regex::{Captures, Regex},
@@ -97,55 +97,10 @@ thread_local! {
     static DISPLAY: RefCell<*mut c_void> = RefCell::new(unsafe { XOpenDisplay(std::ptr::null())});
 }
 
-// X11 error event structure for the custom error handler.
-// See: https://www.x.org/releases/current/doc/libX11/libX11/libX11.html#Using-the-Default-Error-Handlers
-#[repr(C)]
-struct XErrorEvent {
-    type_: c_int,
-    display: *mut c_void, // Display*
-    resourceid: c_ulong,  // XID
-    serial: c_ulong,
-    error_code: u8,
-    request_code: u8,
-    minor_code: u8,
-}
-
-type XErrorHandler = unsafe extern "C" fn(*mut c_void, *mut XErrorEvent) -> c_int;
-
-const X11_BAD_WINDOW: u8 = 3;
-const XDO_SUCCESS: c_int = 0;
-const XDO_ERROR: c_int = 1;
-
-/// Atomic flag set by the custom X error handler when a BadWindow error occurs.
-static X_BAD_WINDOW_DETECTED: AtomicBool = AtomicBool::new(false);
-static X_UNEXPECTED_ERROR_DETECTED: AtomicBool = AtomicBool::new(false);
-
-/// Custom X error handler that catches BadWindow errors (error_code == 3) instead of
-/// letting the default handler terminate the process.
-/// See issue: https://github.com/rustdesk/rustdesk/issues/9003
-unsafe extern "C" fn handle_x_error(_display: *mut c_void, event: *mut XErrorEvent) -> c_int {
-    if !event.is_null() && (*event).error_code == X11_BAD_WINDOW {
-        X_BAD_WINDOW_DETECTED.store(true, Ordering::SeqCst);
-        log::debug!("Caught X11 BadWindow error (suppressed), window was likely destroyed");
-        return 0;
-    }
-    X_UNEXPECTED_ERROR_DETECTED.store(true, Ordering::SeqCst);
-    if !event.is_null() {
-        log::warn!(
-            "X11 error: error_code={}, request_code={}, minor_code={}",
-            (*event).error_code,
-            (*event).request_code,
-            (*event).minor_code,
-        );
-    }
-    0
-}
-
 #[link(name = "X11")]
 extern "C" {
     fn XOpenDisplay(display_name: *const c_char) -> *mut c_void;
     // fn XCloseDisplay(d: *mut c_void) -> c_int;
-    fn XSetErrorHandler(handler: Option<XErrorHandler>) -> Option<XErrorHandler>;
 }
 
 #[link(name = "Xfixes")]
@@ -276,47 +231,25 @@ pub fn get_focused_display(displays: Vec<DisplayInfo>) -> Option<usize> {
                 if libxdo_sys::xdo_get_active_window(*xdo as *const _, &mut window) != 0 {
                     return;
                 }
-
-                // XSetErrorHandler is process-global, not scoped to this Display/thread.
-                // This path is currently called by the single window_focus service thread.
-                // While installed, this handler can still observe unrelated X11 errors from
-                // other threads; unexpected errors make this geometry query fail.
-                X_BAD_WINDOW_DETECTED.store(false, Ordering::SeqCst);
-                X_UNEXPECTED_ERROR_DETECTED.store(false, Ordering::SeqCst);
-                let prev_handler = XSetErrorHandler(Some(handle_x_error));
-
-                let loc_ret = libxdo_sys::xdo_get_window_location(
+                if libxdo_sys::xdo_get_window_location(
                     *xdo as *const _,
                     window,
                     &mut x as _,
                     &mut y as _,
                     std::ptr::null_mut(),
-                );
-                let size_ret = if loc_ret == XDO_SUCCESS {
-                    libxdo_sys::xdo_get_window_size(
-                        *xdo as *const _,
-                        window,
-                        &mut width,
-                        &mut height,
-                    )
-                } else {
-                    XDO_ERROR
-                };
-
-                // Do not call XSync(DISPLAY) here: DISPLAY is a separate
-                // XOpenDisplay() connection, while libxdo owns the Display*
-                // used by these geometry queries. These libxdo calls are
-                // synchronous XGetWindowAttributes-based queries, so the target
-                // BadWindow is expected to be delivered before the calls return.
-                XSetErrorHandler(prev_handler);
-                if X_BAD_WINDOW_DETECTED.load(Ordering::SeqCst)
-                    || X_UNEXPECTED_ERROR_DETECTED.load(Ordering::SeqCst)
-                    || loc_ret != XDO_SUCCESS
-                    || size_ret != XDO_SUCCESS
+                ) != 0
+                {
+                    return;
+                }
+                if libxdo_sys::xdo_get_window_size(
+                    *xdo as *const _,
+                    window,
+                    &mut width,
+                    &mut height,
+                ) != 0
                 {
                     return;
                 }
-
                 let center_x = x + (width / 2) as c_int;
                 let center_y = y + (height / 2) as c_int;
                 res = displays.iter().position(|d| {
@@ -2217,10 +2150,7 @@ pub fn clear_gnome_shortcuts_inhibitor_permission() -> ResultType<()> {
                 || err_name == "org.freedesktop.DBus.Error.UnknownObject"
                 || err_name == "org.freedesktop.DBus.Error.ServiceUnknown"
             {
-                log::info!(
-                    "GNOME shortcuts inhibitor permission was not set ({})",
-                    err_name
-                );
+                log::info!("GNOME shortcuts inhibitor permission was not set ({})", err_name);
                 Ok(())
             } else {
                 bail!("Failed to clear permission: {}", e)

src/server/terminal_helper.rs

@@ -318,6 +318,35 @@ pub fn get_default_shell() -> String {
     std::env::var("COMSPEC").unwrap_or_else(|_| "cmd.exe".to_string())
 }
 
+fn utf8_shell_args(shell: &str) -> Vec<String> {
+    let name = std::path::Path::new(shell)
+        .file_name()
+        .and_then(|name| name.to_str())
+        .unwrap_or(shell)
+        .to_ascii_lowercase();
+
+    if name == "cmd.exe" || name == "cmd" {
+        return vec!["/K".to_string(), "chcp 65001 >NUL".to_string()];
+    }
+
+    if name == "pwsh.exe" || name == "pwsh" || name == "powershell.exe" {
+        return vec![
+            "-NoLogo".to_string(),
+            "-NoExit".to_string(),
+            "-Command".to_string(),
+            "chcp.com 65001 > $null; [Console]::InputEncoding = [System.Text.Encoding]::UTF8; [Console]::OutputEncoding = [System.Text.Encoding]::UTF8".to_string(),
+        ];
+    }
+
+    Vec::new()
+}
+
+pub fn configure_utf8_shell_command(shell: &str, cmd: &mut CommandBuilder) {
+    for arg in utf8_shell_args(shell) {
+        cmd.arg(arg);
+    }
+}
+
 /// Get the SID of the user from a token.
 /// Returns a Vec<u8> containing the SID bytes.
 pub fn get_user_sid_from_token(user_token: UserToken) -> Result<Vec<u8>> {
@@ -831,7 +860,8 @@ pub fn run_terminal_helper(args: &[String]) -> Result<()> {
     let shell = get_default_shell();
     log::debug!("Using shell: {}", shell);
 
-    let cmd = CommandBuilder::new(&shell);
+    let mut cmd = CommandBuilder::new(&shell);
+    configure_utf8_shell_command(&shell, &mut cmd);
     let mut child = pty_pair
         .slave
         .spawn_command(cmd)

src/server/terminal_service.rs

@@ -20,10 +20,11 @@ use std::{
 // Windows-specific imports from terminal_helper module
 #[cfg(target_os = "windows")]
 use super::terminal_helper::{
-    create_named_pipe_server, encode_helper_message, encode_resize_message,
-    is_helper_process_running, launch_terminal_helper_with_token, wait_for_pipe_connection,
-    HelperProcessGuard, OwnedHandle, SendableHandle, WinCloseHandle, WinTerminateProcess,
-    WinWaitForSingleObject, MSG_TYPE_DATA, PIPE_CONNECTION_TIMEOUT_MS, WIN_WAIT_OBJECT_0,
+    configure_utf8_shell_command, create_named_pipe_server, encode_helper_message,
+    encode_resize_message, is_helper_process_running, launch_terminal_helper_with_token,
+    wait_for_pipe_connection, HelperProcessGuard, OwnedHandle, SendableHandle, WinCloseHandle,
+    WinTerminateProcess, WinWaitForSingleObject, MSG_TYPE_DATA, PIPE_CONNECTION_TIMEOUT_MS,
+    WIN_WAIT_OBJECT_0,
 };
 
 const MAX_OUTPUT_BUFFER_SIZE: usize = 1024 * 1024; // 1MB per terminal
@@ -133,6 +134,26 @@ fn get_default_shell() -> String {
     }
 }
 
+#[cfg(target_os = "macos")]
+fn locale_value_is_utf8(value: &str) -> bool {
+    let value = value.to_ascii_uppercase();
+    value.contains("UTF-8") || value.contains("UTF8")
+}
+
+#[cfg(target_os = "macos")]
+fn should_force_process_utf8_ctype() -> bool {
+    if let Ok(value) = std::env::var("LC_ALL") {
+        return !locale_value_is_utf8(&value);
+    }
+    if let Ok(value) = std::env::var("LC_CTYPE") {
+        return !locale_value_is_utf8(&value);
+    }
+    if let Ok(value) = std::env::var("LANG") {
+        return !locale_value_is_utf8(&value);
+    }
+    true
+}
+
 pub fn is_service_specified_user(service_id: &str) -> Option<bool> {
     get_service(service_id).map(|s| s.lock().unwrap().is_specified_user)
 }
@@ -435,6 +456,7 @@ impl OutputBuffer {
                 // Find first newline in new data
                 if let Some(newline_pos) = data.iter().position(|&b| b == b'\n') {
                     last_line.extend_from_slice(&data[..=newline_pos]);
+                    self.total_size += newline_pos + 1;
                     start = newline_pos + 1;
                     self.last_line_incomplete = false;
                 } else {
@@ -473,7 +495,28 @@ impl OutputBuffer {
         // Trim old data if buffer is too large
         while self.total_size > MAX_OUTPUT_BUFFER_SIZE || self.lines.len() > MAX_BUFFER_LINES {
             if let Some(removed) = self.lines.pop_front() {
-                self.total_size -= removed.len();
+                if removed.len() > self.total_size {
+                    log::error!(
+                        "OutputBuffer total_size underflow avoided: total_size={}, removed_len={}, lines_len={}",
+                        self.total_size,
+                        removed.len(),
+                        self.lines.len()
+                    );
+                    self.total_size = self.lines.iter().map(|line| line.len()).sum();
+                } else {
+                    self.total_size -= removed.len();
+                }
+                if self.lines.is_empty() {
+                    self.last_line_incomplete = false;
+                }
+            } else {
+                log::error!(
+                    "OutputBuffer trim invariant broken: total_size={}, lines_len=0",
+                    self.total_size
+                );
+                self.total_size = 0;
+                self.last_line_incomplete = false;
+                break;
             }
         }
     }
@@ -531,6 +574,97 @@ impl OutputBuffer {
     }
 }
 
+/// Find the largest prefix of `buf` that does not end in the middle of a UTF-8
+/// code point. Invalid bytes are treated as complete so they can continue
+/// downstream and be rendered with replacement characters if needed.
+fn find_utf8_split_point(buf: &[u8]) -> usize {
+    if buf.is_empty() {
+        return 0;
+    }
+
+    let start = buf.len().saturating_sub(3);
+    for i in (start..buf.len()).rev() {
+        let b = buf[i];
+        if b & 0x80 == 0 {
+            return buf.len();
+        }
+        if b & 0xC0 == 0x80 {
+            continue;
+        }
+
+        let seq_len = if b & 0xE0 == 0xC0 {
+            2
+        } else if b & 0xF0 == 0xE0 {
+            3
+        } else if b & 0xF8 == 0xF0 {
+            4
+        } else {
+            return buf.len();
+        };
+
+        return if buf.len() - i >= seq_len {
+            buf.len()
+        } else {
+            i
+        };
+    }
+
+    buf.len()
+}
+
+// Terminal output currently follows a UTF-8 text model end to end: the service
+// keeps replay buffers on UTF-8 boundaries, and Flutter decodes payload bytes as
+// UTF-8 before writing to xterm. This accumulator only prevents splitting a
+// trailing UTF-8 code point across PTY reads. Supporting non-UTF-8 terminals
+// would need a separate design covering remote encoding detection, Flutter
+// decoding, replay truncation, and input transcoding.
+#[derive(Default)]
+struct Utf8ChunkAccumulator {
+    remainder: Vec<u8>,
+}
+
+impl Utf8ChunkAccumulator {
+    fn push_chunk(&mut self, mut data: Vec<u8>) -> Option<Vec<u8>> {
+        if data.is_empty() {
+            return None;
+        }
+
+        let had_remainder = !self.remainder.is_empty();
+        if had_remainder {
+            let mut combined = std::mem::take(&mut self.remainder);
+            combined.extend_from_slice(&data);
+            data = combined;
+        }
+
+        let split = find_utf8_split_point(&data);
+        if split == data.len() {
+            return Some(data);
+        }
+
+        // Only hold back a candidate incomplete suffix when we have evidence that
+        // the bytes before it are already UTF-8 text. If split is 0, the whole
+        // read may be the start of a UTF-8 character, so keep it for the next read.
+        if !had_remainder && split > 0 && std::str::from_utf8(&data[..split]).is_err() {
+            return Some(data);
+        }
+
+        self.remainder = data.split_off(split);
+        if data.is_empty() {
+            None
+        } else {
+            Some(data)
+        }
+    }
+
+    fn finish(&mut self) -> Option<Vec<u8>> {
+        if self.remainder.is_empty() {
+            None
+        } else {
+            Some(std::mem::take(&mut self.remainder))
+        }
+    }
+}
+
 /// Try to send data through the output channel with rate-limited drop logging.
 /// Returns `true` if the caller should break out of the read loop (channel disconnected).
 fn try_send_output(
@@ -570,7 +704,11 @@ fn try_send_output(
             false
         }
         Err(mpsc::TrySendError::Disconnected(_)) => {
-            log::debug!("Terminal {}{} output channel disconnected", terminal_id, label);
+            log::debug!(
+                "Terminal {}{} output channel disconnected",
+                terminal_id,
+                label
+            );
             true
         }
     }
@@ -937,15 +1075,35 @@ impl TerminalServiceProxy {
         if let Some(session_arc) = service.sessions.get(&open.terminal_id) {
             // Reconnect to existing terminal
             let mut session = session_arc.lock().unwrap();
-            // Directly enter Active state with pending buffer for immediate streaming.
-            // Historical buffer is sent first by read_outputs(), then real-time data follows.
-            // No overlap: pending_buffer comes from output_buffer (pre-disconnect history),
-            // while received_data in read_outputs() comes from the channel (post-reconnect).
-            // During disconnect, the run loop (sp.ok()) exits so read_outputs() stops being
-            // called; output_buffer is not updated, and channel data may be lost if it fills up.
-            let buffer = session
+            // Directly enter Active state with pending replay for immediate streaming.
+            // The replay combines output_buffer history and the channel backlog that was
+            // already pending at reconnect time so the client can suppress stale xterm
+            // query answers without requiring a protobuf schema change.
+            // During disconnect, read_outputs() is not called; channel data can still be lost
+            // if output_rx fills before reconnect drains it.
+            let mut buffer = session
                 .output_buffer
                 .get_recent(DEFAULT_RECONNECT_BUFFER_BYTES);
+            let mut reconnect_backlog = Vec::new();
+            if let Some(output_rx) = &session.output_rx {
+                // Cap reconnect-time drain so a chatty PTY cannot keep OpenTerminal
+                // inside this loop indefinitely. Remaining output is drained by read_outputs().
+                for _ in 0..CHANNEL_BUFFER_SIZE {
+                    let Ok(data) = output_rx.try_recv() else {
+                        break;
+                    };
+                    reconnect_backlog.push(data);
+                }
+            }
+            let has_reconnect_backlog = !reconnect_backlog.is_empty();
+            for data in reconnect_backlog {
+                session.output_buffer.append(&data);
+            }
+            if has_reconnect_backlog {
+                buffer = session
+                    .output_buffer
+                    .get_recent(DEFAULT_RECONNECT_BUFFER_BYTES);
+            }
             let has_pending = !buffer.is_empty();
             session.state = SessionState::Active {
                 pending_buffer: if has_pending { Some(buffer) } else { None },
@@ -959,9 +1117,14 @@ impl TerminalServiceProxy {
             let mut opened = TerminalOpened::new();
             opened.terminal_id = open.terminal_id;
             opened.success = true;
-            opened.message = "Reconnected to existing terminal".to_string();
+            opened.message = if has_pending {
+                "Reconnected to existing terminal with pending output".to_string()
+            } else {
+                "Reconnected to existing terminal".to_string()
+            };
             opened.pid = session.pid;
             opened.service_id = self.service_id.clone();
+            opened.replay_terminal_output = has_pending;
             if service.needs_session_sync {
                 if service.sessions.len() > 1 {
                     // No need to include the current terminal in the list.
@@ -1016,6 +1179,9 @@ impl TerminalServiceProxy {
         #[allow(unused_mut)]
         let mut cmd = CommandBuilder::new(&shell);
 
+        #[cfg(target_os = "windows")]
+        configure_utf8_shell_command(&shell, &mut cmd);
+
         // macOS-specific terminal configuration
         // 1. Use login shell (-l) to load user's shell profile (~/.zprofile, ~/.bash_profile)
         //    This ensures PATH includes Homebrew paths (/opt/homebrew/bin, /usr/local/bin)
@@ -1036,6 +1202,12 @@ impl TerminalServiceProxy {
             };
             cmd.env("TERM", term);
             log::debug!("Set TERM={} for macOS PTY", term);
+
+            if should_force_process_utf8_ctype() {
+                cmd.env_remove("LC_ALL");
+                cmd.env("LC_CTYPE", "en_US.UTF-8");
+                log::debug!("Set LC_CTYPE=en_US.UTF-8 for macOS PTY");
+            }
         }
 
         // Note: On Windows with user_token, we use helper mode (handle_open_with_helper)
@@ -1086,6 +1258,7 @@ impl TerminalServiceProxy {
         let reader_thread = thread::spawn(move || {
             let mut reader = reader;
             let mut buf = vec![0u8; 4096];
+            let mut utf8_chunks = Utf8ChunkAccumulator::default();
             let mut drop_count: u64 = 0;
             // Initialize to > 5s ago so the first drop triggers a warning immediately.
             let mut last_drop_warn = Instant::now() - Duration::from_secs(6);
@@ -1095,13 +1268,25 @@ impl TerminalServiceProxy {
                         // EOF
                         // This branch can be reached when the child process exits on macOS.
                         // But not on Linux and Windows in my tests.
+                        if let Some(data) = utf8_chunks.finish() {
+                            let _ = try_send_output(
+                                &output_tx,
+                                data,
+                                terminal_id,
+                                "",
+                                &mut drop_count,
+                                &mut last_drop_warn,
+                            );
+                        }
                         break;
                     }
                     Ok(n) => {
                         if exiting.load(Ordering::SeqCst) {
                             break;
                         }
-                        let data = buf[..n].to_vec();
+                        let Some(data) = utf8_chunks.push_chunk(buf[..n].to_vec()) else {
+                            continue;
+                        };
                         // Use try_send to avoid blocking the reader thread when channel is full.
                         // During disconnect, the run loop (sp.ok()) stops and read_outputs() is
                         // no longer called, so the channel won't be drained. Blocking send would
@@ -1308,12 +1493,23 @@ impl TerminalServiceProxy {
         let terminal_id = open.terminal_id;
         let reader_thread = thread::spawn(move || {
             let mut buf = vec![0u8; 4096];
+            let mut utf8_chunks = Utf8ChunkAccumulator::default();
             let mut drop_count: u64 = 0;
             // Initialize to > 5s ago so the first drop triggers a warning immediately.
             let mut last_drop_warn = Instant::now() - Duration::from_secs(6);
             loop {
                 match output_pipe.read(&mut buf) {
                     Ok(0) => {
+                        if let Some(data) = utf8_chunks.finish() {
+                            let _ = try_send_output(
+                                &output_tx,
+                                data,
+                                terminal_id,
+                                " (helper)",
+                                &mut drop_count,
+                                &mut last_drop_warn,
+                            );
+                        }
                         // EOF - helper process exited
                         log::debug!("Terminal {} helper output EOF", terminal_id);
                         break;
@@ -1322,7 +1518,9 @@ impl TerminalServiceProxy {
                         if exiting.load(Ordering::SeqCst) {
                             break;
                         }
-                        let data = buf[..n].to_vec();
+                        let Some(data) = utf8_chunks.push_chunk(buf[..n].to_vec()) else {
+                            continue;
+                        };
                         // Use try_send to avoid blocking the reader thread (same as direct PTY mode)
                         if try_send_output(
                             &output_tx,
@@ -1462,20 +1660,28 @@ impl TerminalServiceProxy {
         data: &TerminalData,
     ) -> Result<Option<TerminalResponse>> {
         if let Some(session_arc) = session {
-            let mut session = session_arc.lock().unwrap();
-            session.update_activity();
-            if let Some(input_tx) = &session.input_tx {
-                // Encode data for helper mode or send raw for direct PTY mode
-                #[cfg(target_os = "windows")]
-                let msg = if session.is_helper_mode {
-                    encode_helper_message(MSG_TYPE_DATA, &data.data)
-                } else {
-                    data.data.to_vec()
-                };
-                #[cfg(not(target_os = "windows"))]
-                let msg = data.data.to_vec();
+            let input = {
+                let mut session = session_arc.lock().unwrap();
+                session.update_activity();
+                if let Some(input_tx) = session.input_tx.clone() {
+                    // Encode data for helper mode or send raw for direct PTY mode
+                    #[cfg(target_os = "windows")]
+                    let msg = if session.is_helper_mode {
+                        encode_helper_message(MSG_TYPE_DATA, &data.data)
+                    } else {
+                        data.data.to_vec()
+                    };
+                    #[cfg(not(target_os = "windows"))]
+                    let msg = data.data.to_vec();
 
-                // Send data to writer thread
+                    Some((input_tx, msg))
+                } else {
+                    None
+                }
+            };
+
+            if let Some((input_tx, msg)) = input {
+                // Send outside the session lock; SyncSender::send can block when full.
                 if let Err(e) = input_tx.send(msg) {
                     log::error!(
                         "Failed to send data to terminal {}: {}",
@@ -1683,10 +1889,6 @@ impl TerminalServiceProxy {
                     }
                 }
 
-                if has_activity {
-                    session.update_activity();
-                }
-
                 // Update buffer (always buffer for reconnection support)
                 for data in &received_data {
                     session.output_buffer.append(data);
@@ -1696,7 +1898,7 @@ impl TerminalServiceProxy {
                 // Data is already buffered above and will be sent on next reconnection.
                 // Use a scoped block to limit the mutable borrow of session.state,
                 // so we can immutably borrow other session fields afterwards.
-                let sigwinch_action = {
+                let (replay_buffer, sigwinch_action) = {
                     let (pending_buffer, sigwinch) = match &mut session.state {
                         SessionState::Active {
                             pending_buffer,
@@ -1705,19 +1907,12 @@ impl TerminalServiceProxy {
                         _ => continue,
                     };
 
-                    // Send pending buffer response first (set on reconnection in handle_open).
-                    // This ensures historical buffer is sent before any real-time data.
-                    if let Some(buffer) = pending_buffer.take() {
-                        if !buffer.is_empty() {
-                            responses
-                                .push(Self::create_terminal_data_response(terminal_id, buffer));
-                        }
-                    }
+                    let replay_buffer = pending_buffer.take();
 
                     // Two-phase SIGWINCH: see SigwinchPhase doc comments for rationale.
                     // Each phase is a single PTY resize, spaced ~30ms apart by the polling
                     // interval, ensuring the TUI app sees a real size change on each signal.
-                    match sigwinch {
+                    let sigwinch_action = match sigwinch {
                         SigwinchPhase::TempResize { retries } => {
                             if *retries == 0 {
                                 log::warn!(
@@ -1745,9 +1940,20 @@ impl TerminalServiceProxy {
                             }
                         }
                         SigwinchPhase::Idle => None,
-                    }
+                    };
+                    (replay_buffer, sigwinch_action)
                 };
 
+                if let Some(buffer) = replay_buffer {
+                    if !buffer.is_empty() {
+                        responses.push(Self::create_terminal_data_response(terminal_id, buffer));
+                    }
+                }
+
+                if has_activity {
+                    session.update_activity();
+                }
+
                 // Execute SIGWINCH resize outside the mutable borrow scope of session.state.
                 if let Some(action) = sigwinch_action {
                     #[cfg(target_os = "windows")]
@@ -1845,3 +2051,116 @@ impl TerminalServiceProxy {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::{find_utf8_split_point, OutputBuffer, Utf8ChunkAccumulator, MAX_BUFFER_LINES};
+
+    #[test]
+    fn utf8_split_point_returns_full_len_for_complete_input() {
+        assert_eq!(find_utf8_split_point(b"hello"), 5);
+        assert_eq!(find_utf8_split_point("中文".as_bytes()), "中文".len());
+        assert_eq!(find_utf8_split_point("😀".as_bytes()), "😀".len());
+    }
+
+    #[test]
+    fn utf8_split_point_detects_incomplete_trailing_sequence() {
+        let data = [b'a', 0xE4, 0xB8];
+        assert_eq!(find_utf8_split_point(&data), 1);
+    }
+
+    #[test]
+    fn utf8_split_point_keeps_malformed_prefix_but_buffers_trailing_lead_byte() {
+        let data = [0xFF, 0xE4];
+        assert_eq!(find_utf8_split_point(&data), 1);
+    }
+
+    #[test]
+    fn utf8_split_point_treats_orphan_continuations_as_complete() {
+        let data = [0x80, 0x81, 0x82];
+        assert_eq!(find_utf8_split_point(&data), data.len());
+    }
+
+    #[test]
+    fn utf8_chunk_accumulator_reassembles_split_multibyte_output() {
+        let full = "你好世界".as_bytes();
+        let mut chunker = Utf8ChunkAccumulator::default();
+        let mut output = Vec::new();
+
+        for chunk in full.chunks(5) {
+            if let Some(data) = chunker.push_chunk(chunk.to_vec()) {
+                output.extend_from_slice(&data);
+            }
+        }
+
+        if let Some(data) = chunker.finish() {
+            output.extend_from_slice(&data);
+        }
+
+        assert_eq!(output, full);
+    }
+
+    #[test]
+    fn utf8_chunk_accumulator_buffers_leading_split_multibyte_output() {
+        let mut chunker = Utf8ChunkAccumulator::default();
+
+        assert!(chunker.push_chunk(vec![0xE4]).is_none());
+        assert!(chunker.push_chunk(vec![0xB8]).is_none());
+        assert_eq!(
+            chunker.push_chunk(vec![0xAD]),
+            Some("中".as_bytes().to_vec())
+        );
+        assert!(chunker.finish().is_none());
+    }
+
+    #[test]
+    fn utf8_chunk_accumulator_flushes_incomplete_tail_on_finish() {
+        let mut chunker = Utf8ChunkAccumulator::default();
+        assert_eq!(chunker.push_chunk(vec![b'a', 0xE4]), Some(vec![b'a']));
+        assert_eq!(chunker.finish(), Some(vec![0xE4]));
+        assert!(chunker.finish().is_none());
+    }
+
+    #[test]
+    fn utf8_chunk_accumulator_does_not_stall_on_malformed_bytes() {
+        let mut chunker = Utf8ChunkAccumulator::default();
+        assert_eq!(chunker.push_chunk(vec![0xFF]), Some(vec![0xFF]));
+        assert!(chunker.finish().is_none());
+    }
+
+    #[test]
+    fn utf8_chunk_accumulator_buffers_lone_utf8_lead_bytes() {
+        let mut chunker = Utf8ChunkAccumulator::default();
+        assert!(chunker.push_chunk(vec![0xE4]).is_none());
+        assert_eq!(chunker.finish(), Some(vec![0xE4]));
+    }
+
+    #[test]
+    fn utf8_chunk_accumulator_does_not_hold_back_non_utf8_prefixes() {
+        let mut chunker = Utf8ChunkAccumulator::default();
+        assert_eq!(chunker.push_chunk(vec![0xFF, 0xE4]), Some(vec![0xFF, 0xE4]));
+        assert!(chunker.finish().is_none());
+    }
+
+    #[test]
+    fn output_buffer_trim_after_incomplete_merge_does_not_underflow() {
+        let mut buffer = OutputBuffer::new();
+
+        // Create an incomplete line first.
+        buffer.append(b"hello");
+
+        // Merge a large chunk that contains the first newline at the tail.
+        // This exercises the "append to last incomplete line" branch.
+        let mut large = vec![b'a'; 30_000];
+        large.push(b'\n');
+        buffer.append(&large);
+
+        // Exceed MAX_BUFFER_LINES so trim pops the first large merged line.
+        for _ in 0..=MAX_BUFFER_LINES {
+            buffer.append(b"x\n");
+        }
+
+        let actual_size: usize = buffer.lines.iter().map(|line| line.len()).sum();
+        assert_eq!(buffer.total_size, actual_size);
+    }
+}

src/ui_session_interface.rs

@@ -23,7 +23,7 @@ use hbb_common::{
         sync::mpsc,
         time::{Duration as TokioDuration, Instant},
     },
-    whoami, SessionID, Stream,
+    whoami, Stream,
 };
 use rdev::{Event, EventType::*, KeyCode};
 #[cfg(all(feature = "vram", feature = "flutter"))]
@@ -870,14 +870,12 @@ impl<T: InvokeUiSession> Session<T> {
 
     #[cfg(not(any(target_os = "android", target_os = "ios")))]
     pub fn enter(&self, keyboard_mode: String) {
-        let session_id = self.lc.read().unwrap().session_id as u128;
-        keyboard::client::change_grab_status(GrabState::Run, &keyboard_mode, session_id);
+        keyboard::client::change_grab_status(GrabState::Run, &keyboard_mode);
     }
 
     #[cfg(not(any(target_os = "android", target_os = "ios")))]
     pub fn leave(&self, keyboard_mode: String) {
-        let session_id = self.lc.read().unwrap().session_id as u128;
-        keyboard::client::change_grab_status(GrabState::Wait, &keyboard_mode, session_id);
+        keyboard::client::change_grab_status(GrabState::Wait, &keyboard_mode);
     }
 
     // flutter only TODO new input
@@ -913,7 +911,6 @@ impl<T: InvokeUiSession> Session<T> {
     #[cfg(any(target_os = "ios"))]
     pub fn handle_flutter_raw_key_event(
         &self,
-        _session_id: SessionID,
         _keyboard_mode: &str,
         _name: &str,
         _platform_code: i32,
@@ -926,7 +923,6 @@ impl<T: InvokeUiSession> Session<T> {
     #[cfg(not(any(target_os = "ios")))]
     pub fn handle_flutter_raw_key_event(
         &self,
-        session_id: SessionID,
         keyboard_mode: &str,
         name: &str,
         platform_code: i32,
@@ -938,7 +934,6 @@ impl<T: InvokeUiSession> Session<T> {
             self._handle_key_flutter_simulation(keyboard_mode, platform_code, down_or_up);
         } else {
             self._handle_raw_key_non_flutter_simulation(
-                session_id,
                 keyboard_mode,
                 platform_code,
                 position_code,
@@ -951,7 +946,6 @@ impl<T: InvokeUiSession> Session<T> {
     #[cfg(not(any(target_os = "ios")))]
     fn _handle_raw_key_non_flutter_simulation(
         &self,
-        session_id: SessionID,
         keyboard_mode: &str,
         platform_code: i32,
         position_code: i32,
@@ -985,18 +979,11 @@ impl<T: InvokeUiSession> Session<T> {
             #[cfg(any(target_os = "windows", target_os = "macos"))]
             extra_data: 0,
         };
-        keyboard::client::process_event_with_session(
-            keyboard_mode,
-            &event,
-            Some(lock_modes),
-            self,
-            session_id,
-        );
+        keyboard::client::process_event_with_session(keyboard_mode, &event, Some(lock_modes), self);
     }
 
     pub fn handle_flutter_key_event(
         &self,
-        session_id: SessionID,
         keyboard_mode: &str,
         character: &str,
         usb_hid: i32,
@@ -1007,7 +994,6 @@ impl<T: InvokeUiSession> Session<T> {
             self._handle_key_flutter_simulation(keyboard_mode, usb_hid, down_or_up);
         } else {
             self._handle_key_non_flutter_simulation(
-                session_id,
                 keyboard_mode,
                 character,
                 usb_hid,
@@ -1043,7 +1029,6 @@ impl<T: InvokeUiSession> Session<T> {
 
     fn _handle_key_non_flutter_simulation(
         &self,
-        session_id: SessionID,
         keyboard_mode: &str,
         character: &str,
         usb_hid: i32,
@@ -1105,13 +1090,7 @@ impl<T: InvokeUiSession> Session<T> {
             #[cfg(any(target_os = "windows", target_os = "macos"))]
             extra_data: 0,
         };
-        keyboard::client::process_event_with_session(
-            keyboard_mode,
-            &event,
-            Some(lock_modes),
-            self,
-            session_id,
-        );
+        keyboard::client::process_event_with_session(keyboard_mode, &event, Some(lock_modes), self);
     }
 
     // flutter only TODO new input