TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-05-07 22:58:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix ios enter: https://github.com/rustdesk/rustdesk/issues/14907

Browse Source
This commit is contained in:
rustdesk
2026-04-26 09:08:11 +08:00
parent 0112167029
commit 4f5c7db70a
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
flutter/lib/models/terminal_model.dart
View File

@@ -32,20 +32,21 @@ class TerminalModel with ChangeNotifier {
// View ready state: true when terminal has valid dimensions, safe to write // View ready state: true when terminal has valid dimensions, safe to write
bool _terminalViewReady = false; bool _terminalViewReady = false;
bool get isPeerWindows => parent.ffiModel.pi.platform == kPeerPlatformWindows;
void Function(int w, int h, int pw, int ph)? onResizeExternal; void Function(int w, int h, int pw, int ph)? onResizeExternal;
Future<void> _handleInput(String data) async { Future<void> _handleInput(String data) async {
// If we press the `Enter` button on Android, // Soft keyboards (notably iOS) emit '\n' when Enter is pressed, while a
// `data` can be '\r' or '\n' when using different keyboards. // real keyboard's Enter sends '\r'. Some Android keyboards also emit '\n'.
// Android -> Windows. '\r' works, but '\n' does not. '\n' is just a newline. // - Peer Windows: '\r' works, '\n' is just a newline (https://github.com/rustdesk/rustdesk/pull/14736).
// Android -> Linux. Both '\r' and '\n' work as expected (execute a command). // - Peer Linux: canonical-mode shells accept both, but raw-mode apps
// So when we receive '\n', we may need to convert it to '\r' to ensure compatibility. // (readline, prompt_toolkit, vim, TUI frameworks) expect '\r'.
// Desktop -> Desktop works fine. // - Peer macOS: same as Linux, raw-mode apps expect '\r'
// Check if we are on mobile or web(mobile), and convert '\n' to '\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)); final isMobileOrWebMobile = (isMobile || (isWeb && !isWebDesktop));
if (isMobileOrWebMobile && isPeerWindows && data == '\n') { if (isMobileOrWebMobile && data == '\n') {
data = '\r'; data = '\r';
} }
if (_terminalOpened) { if (_terminalOpened) {