Fix macOS build: Remove @available check causing linker error

The @available check in GetDisplayName was causing the linker to look for
__isPlatformVersionAtLeast symbol which is not available when targeting
macOS 10.14. Since this function is only used for logging, we simplify it
to return "Unknown" for all displays, avoiding the runtime availability check.

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

flutter/lib/common.dart

@@ -501,10 +501,10 @@ class MyTheme {
           )
         : null,
     textTheme: const TextTheme(
-      titleLarge: TextStyle(fontSize: 19, color: Colors.white70),
-      titleSmall: TextStyle(fontSize: 14, color: Colors.white70),
-      bodySmall: TextStyle(fontSize: 12, color: Colors.white70, height: 1.25),
-      bodyMedium: TextStyle(fontSize: 14, color: Colors.white70, height: 1.25),
+      titleLarge: TextStyle(fontSize: 19),
+      titleSmall: TextStyle(fontSize: 14),
+      bodySmall: TextStyle(fontSize: 12, height: 1.25),
+      bodyMedium: TextStyle(fontSize: 14, height: 1.25),
       labelLarge: TextStyle(
         fontSize: 16.0,
         fontWeight: FontWeight.bold,
@@ -1124,23 +1124,18 @@ class CustomAlertDialog extends StatelessWidget {
 
 Widget createDialogContent(String text) {
   final RegExp linkRegExp = RegExp(r'(https?://[^\s]+)');
-  bool hasLink = linkRegExp.hasMatch(text);
-
-  // Early return: no link, use default theme color
-  if (!hasLink) {
-    return SelectableText(text, style: const TextStyle(fontSize: 15));
-  }
-
   final List<TextSpan> spans = [];
   int start = 0;
+  bool hasLink = false;
 
   linkRegExp.allMatches(text).forEach((match) {
+    hasLink = true;
     if (match.start > start) {
       spans.add(TextSpan(text: text.substring(start, match.start)));
     }
     spans.add(TextSpan(
       text: match.group(0) ?? '',
-      style: const TextStyle(
+      style: TextStyle(
         color: Colors.blue,
         decoration: TextDecoration.underline,
       ),
@@ -1158,9 +1153,13 @@ Widget createDialogContent(String text) {
     spans.add(TextSpan(text: text.substring(start)));
   }
 
+  if (!hasLink) {
+    return SelectableText(text, style: const TextStyle(fontSize: 15));
+  }
+
   return SelectableText.rich(
     TextSpan(
-      style: const TextStyle(fontSize: 15),
+      style: TextStyle(color: Colors.black, fontSize: 15),
       children: spans,
     ),
   );

flutter/lib/common/widgets/remote_input.dart

@@ -107,8 +107,6 @@ class _RawTouchGestureDetectorRegionState
   // For mouse mode, we need to block the events when the cursor is in a blocked area.
   // So we need to cache the last tap down position.
   Offset? _lastTapDownPositionForMouseMode;
-  // Cache global position for onTap (which lacks position info).
-  Offset? _lastTapDownGlobalPosition;
 
   FFI get ffi => widget.ffi;
   FfiModel get ffiModel => widget.ffiModel;
@@ -138,7 +136,6 @@ class _RawTouchGestureDetectorRegionState
 
   onTapDown(TapDownDetails d) async {
     lastDeviceKind = d.kind;
-    _lastTapDownGlobalPosition = d.globalPosition;
     if (isNotTouchBasedDevice()) {
       return;
     }
@@ -157,10 +154,6 @@ class _RawTouchGestureDetectorRegionState
     if (isNotTouchBasedDevice()) {
       return;
     }
-    // Filter duplicate touch tap events on iOS (Magic Mouse issue).
-    if (inputModel.shouldIgnoreTouchTap(d.globalPosition)) {
-      return;
-    }
     if (handleTouch) {
       final isMoved =
           await ffi.cursorModel.move(d.localPosition.dx, d.localPosition.dy);
@@ -178,11 +171,6 @@ class _RawTouchGestureDetectorRegionState
     if (isNotTouchBasedDevice()) {
       return;
     }
-    // Filter duplicate touch tap events on iOS (Magic Mouse issue).
-    final lastPos = _lastTapDownGlobalPosition;
-    if (lastPos != null && inputModel.shouldIgnoreTouchTap(lastPos)) {
-      return;
-    }
     if (!handleTouch) {
       // Cannot use `_lastTapDownDetails` because Flutter calls `onTapUp` before `onTap`, clearing the cached details.
       // Using `_lastTapDownPositionForMouseMode` instead.

flutter/lib/mobile/pages/terminal_page.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:math';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hbb/common.dart';
@@ -42,9 +41,6 @@ class _TerminalPageState extends State<TerminalPage>
   final GlobalKey _keyboardKey = GlobalKey();
   double _keyboardHeight = 0;
   late bool _showTerminalExtraKeys;
-  // For iOS edge swipe gesture
-  double _swipeStartX = 0;
-  double _swipeCurrentX = 0;
 
   // For web only.
   // 'monospace' does not work on web, use Google Fonts, `??` is only for null safety.
@@ -151,7 +147,7 @@ class _TerminalPageState extends State<TerminalPage>
   }
 
   Widget buildBody() {
-    final scaffold = Scaffold(
+    return Scaffold(
       resizeToAvoidBottomInset: false, // Disable automatic layout adjustment; manually control UI updates to prevent flickering when the keyboard shows/hides
       backgroundColor: Theme.of(context).scaffoldBackgroundColor,
       body: Stack(
@@ -196,108 +192,9 @@ class _TerminalPageState extends State<TerminalPage>
             ),
           ),
           if (_showTerminalExtraKeys) _buildFloatingKeyboard(),
-          // iOS-style circular close button in top-right corner
-          if (isIOS) _buildCloseButton(),
         ],
       ),
     );
-
-    // Add iOS edge swipe gesture to exit (similar to Android back button)
-    if (isIOS) {
-      return LayoutBuilder(
-        builder: (context, constraints) {
-          final screenWidth = constraints.maxWidth;
-          // Base thresholds on screen width but clamp to reasonable logical pixel ranges
-          // Edge detection region: ~10% of width, clamped between 20 and 80 logical pixels
-          final edgeThreshold = (screenWidth * 0.1).clamp(20.0, 80.0);
-          // Required horizontal movement: ~25% of width, clamped between 80 and 300 logical pixels
-          final swipeThreshold = (screenWidth * 0.25).clamp(80.0, 300.0);
-
-          return RawGestureDetector(
-            behavior: HitTestBehavior.translucent,
-            gestures: <Type, GestureRecognizerFactory>{
-              HorizontalDragGestureRecognizer: GestureRecognizerFactoryWithHandlers<HorizontalDragGestureRecognizer>(
-                () => HorizontalDragGestureRecognizer(
-                  debugOwner: this,
-                  // Only respond to touch input, exclude mouse/trackpad
-                  supportedDevices: kTouchBasedDeviceKinds,
-                ),
-                (HorizontalDragGestureRecognizer instance) {
-                  instance
-                    // Capture initial touch-down position (before touch slop)
-                    ..onDown = (details) {
-                      _swipeStartX = details.localPosition.dx;
-                      _swipeCurrentX = details.localPosition.dx;
-                    }
-                    ..onUpdate = (details) {
-                      _swipeCurrentX = details.localPosition.dx;
-                    }
-                    ..onEnd = (details) {
-                      // Check if swipe started from left edge and moved right
-                      if (_swipeStartX < edgeThreshold && (_swipeCurrentX - _swipeStartX) > swipeThreshold) {
-                        clientClose(sessionId, _ffi);
-                      }
-                      _swipeStartX = 0;
-                      _swipeCurrentX = 0;
-                    }
-                    ..onCancel = () {
-                      _swipeStartX = 0;
-                      _swipeCurrentX = 0;
-                    };
-                },
-              ),
-            },
-            child: scaffold,
-          );
-        },
-      );
-    }
-
-    return scaffold;
-  }
-
-  Widget _buildCloseButton() {
-    return Positioned(
-      top: 0,
-      right: 0,
-      child: SafeArea(
-        minimum: const EdgeInsets.only(
-          top: 16, // iOS standard margin
-          right: 16, // iOS standard margin
-        ),
-        child: Semantics(
-          button: true,
-          label: translate('Close'),
-          child: Container(
-            width: 44, // iOS standard tap target size
-            height: 44,
-            decoration: BoxDecoration(
-              color: Colors.black.withOpacity(0.5), // Half transparency
-              shape: BoxShape.circle,
-            ),
-            child: Material(
-              color: Colors.transparent,
-              shape: const CircleBorder(),
-              clipBehavior: Clip.antiAlias,
-              child: InkWell(
-                customBorder: const CircleBorder(),
-                onTap: () {
-                  clientClose(sessionId, _ffi);
-                },
-                child: Tooltip(
-                  message: translate('Close'),
-                  child: const Icon(
-                    Icons.chevron_left, // iOS-style back arrow
-                    color: Colors.white,
-                    size: 28,
-                  ),
-                ),
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
   }
 
   Widget _buildFloatingKeyboard() {

flutter/lib/models/input_model.dart

@@ -59,8 +59,7 @@ class CanvasCoords {
     model.scale = json['scale'];
     model.scrollX = json['scrollX'];
     model.scrollY = json['scrollY'];
-    model.scrollStyle =
-        ScrollStyle.fromJson(json['scrollStyle'], ScrollStyle.scrollauto);
+    model.scrollStyle = ScrollStyle.fromJson(json['scrollStyle'], ScrollStyle.scrollauto);
     model.size = Size(json['size']['w'], json['size']['h']);
     return model;
   }
@@ -419,74 +418,6 @@ class InputModel {
     });
   }
 
-  // https://github.com/flutter/flutter/issues/157241
-  // Infer CapsLock state from the character output.
-  // This is needed because Flutter's HardwareKeyboard.lockModesEnabled may report
-  // incorrect CapsLock state on iOS.
-  bool _getIosCapsFromCharacter(KeyEvent e) {
-    if (!isIOS) return false;
-    final ch = e.character;
-    return _getIosCapsFromCharacterImpl(
-        ch, HardwareKeyboard.instance.isShiftPressed);
-  }
-
-  // RawKeyEvent version of _getIosCapsFromCharacter.
-  bool _getIosCapsFromRawCharacter(RawKeyEvent e) {
-    if (!isIOS) return false;
-    final ch = e.character;
-    return _getIosCapsFromCharacterImpl(ch, e.isShiftPressed);
-  }
-
-  // Shared implementation for inferring CapsLock state from character.
-  // Uses Unicode-aware case detection to support non-ASCII letters (e.g., ü/Ü, é/É).
-  //
-  // Limitations:
-  // 1. This inference assumes the client and server use the same keyboard layout.
-  //    If layouts differ (e.g., client uses EN, server uses DE), the character output
-  //    may not match expectations. For example, ';' on EN layout maps to 'ö' on DE
-  //    layout, making it impossible to correctly infer CapsLock state from the
-  //    character alone.
-  // 2. On iOS, CapsLock+Shift produces uppercase letters (unlike desktop where it
-  //    produces lowercase). This method cannot handle that case correctly.
-  bool _getIosCapsFromCharacterImpl(String? ch, bool shiftPressed) {
-    if (ch == null || ch.length != 1) return false;
-    // Use Dart's built-in Unicode-aware case detection
-    final upper = ch.toUpperCase();
-    final lower = ch.toLowerCase();
-    final isUpper = upper == ch && lower != ch;
-    final isLower = lower == ch && upper != ch;
-    // Skip non-letter characters (e.g., numbers, symbols, CJK characters without case)
-    if (!isUpper && !isLower) return false;
-    return isUpper != shiftPressed;
-  }
-
-  int _buildLockModes(bool iosCapsLock) {
-    const capslock = 1;
-    const numlock = 2;
-    const scrolllock = 3;
-    int lockModes = 0;
-    if (isIOS) {
-      if (iosCapsLock) {
-        lockModes |= (1 << capslock);
-      }
-      // Ignore "NumLock/ScrollLock" on iOS for now.
-    } else {
-      if (HardwareKeyboard.instance.lockModesEnabled
-          .contains(KeyboardLockMode.capsLock)) {
-        lockModes |= (1 << capslock);
-      }
-      if (HardwareKeyboard.instance.lockModesEnabled
-          .contains(KeyboardLockMode.numLock)) {
-        lockModes |= (1 << numlock);
-      }
-      if (HardwareKeyboard.instance.lockModesEnabled
-          .contains(KeyboardLockMode.scrollLock)) {
-        lockModes |= (1 << scrolllock);
-      }
-    }
-    return lockModes;
-  }
-
   // This function must be called after the peer info is received.
   // Because `sessionGetKeyboardMode` relies on the peer version.
   updateKeyboardMode() async {
@@ -619,11 +550,6 @@ class InputModel {
       return KeyEventResult.handled;
     }
 
-    bool iosCapsLock = false;
-    if (isIOS && e is RawKeyDownEvent) {
-      iosCapsLock = _getIosCapsFromRawCharacter(e);
-    }
-
     final key = e.logicalKey;
     if (e is RawKeyDownEvent) {
       if (!e.repeat) {
@@ -660,7 +586,7 @@ class InputModel {
 
     // * Currently mobile does not enable map mode
     if ((isDesktop || isWebDesktop) && keyboardMode == kKeyMapMode) {
-      mapKeyboardModeRaw(e, iosCapsLock);
+      mapKeyboardModeRaw(e);
     } else {
       legacyKeyboardModeRaw(e);
     }
@@ -696,11 +622,6 @@ class InputModel {
       return KeyEventResult.handled;
     }
 
-    bool iosCapsLock = false;
-    if (isIOS && (e is KeyDownEvent || e is KeyRepeatEvent)) {
-      iosCapsLock = _getIosCapsFromCharacter(e);
-    }
-
     if (e is KeyUpEvent) {
       handleKeyUpEventModifiers(e);
     } else if (e is KeyDownEvent) {
@@ -746,8 +667,7 @@ class InputModel {
           e.character ?? '',
           e.physicalKey.usbHidUsage & 0xFFFF,
           // Show repeat event be converted to "release+press" events?
-          e is KeyDownEvent || e is KeyRepeatEvent,
-          iosCapsLock);
+          e is KeyDownEvent || e is KeyRepeatEvent);
     } else {
       legacyKeyboardMode(e);
     }
@@ -756,9 +676,23 @@ class InputModel {
   }
 
   /// Send Key Event
-  void newKeyboardMode(
-      String character, int usbHid, bool down, bool iosCapsLock) {
-    final lockModes = _buildLockModes(iosCapsLock);
+  void newKeyboardMode(String character, int usbHid, bool down) {
+    const capslock = 1;
+    const numlock = 2;
+    const scrolllock = 3;
+    int lockModes = 0;
+    if (HardwareKeyboard.instance.lockModesEnabled
+        .contains(KeyboardLockMode.capsLock)) {
+      lockModes |= (1 << capslock);
+    }
+    if (HardwareKeyboard.instance.lockModesEnabled
+        .contains(KeyboardLockMode.numLock)) {
+      lockModes |= (1 << numlock);
+    }
+    if (HardwareKeyboard.instance.lockModesEnabled
+        .contains(KeyboardLockMode.scrollLock)) {
+      lockModes |= (1 << scrolllock);
+    }
     bind.sessionHandleFlutterKeyEvent(
         sessionId: sessionId,
         character: character,
@@ -767,7 +701,7 @@ class InputModel {
         downOrUp: down);
   }
 
-  void mapKeyboardModeRaw(RawKeyEvent e, bool iosCapsLock) {
+  void mapKeyboardModeRaw(RawKeyEvent e) {
     int positionCode = -1;
     int platformCode = -1;
     bool down;
@@ -798,14 +732,27 @@ class InputModel {
     } else {
       down = false;
     }
-    inputRawKey(
-        e.character ?? '', platformCode, positionCode, down, iosCapsLock);
+    inputRawKey(e.character ?? '', platformCode, positionCode, down);
   }
 
   /// Send raw Key Event
-  void inputRawKey(String name, int platformCode, int positionCode, bool down,
-      bool iosCapsLock) {
-    final lockModes = _buildLockModes(iosCapsLock);
+  void inputRawKey(String name, int platformCode, int positionCode, bool down) {
+    const capslock = 1;
+    const numlock = 2;
+    const scrolllock = 3;
+    int lockModes = 0;
+    if (HardwareKeyboard.instance.lockModesEnabled
+        .contains(KeyboardLockMode.capsLock)) {
+      lockModes |= (1 << capslock);
+    }
+    if (HardwareKeyboard.instance.lockModesEnabled
+        .contains(KeyboardLockMode.numLock)) {
+      lockModes |= (1 << numlock);
+    }
+    if (HardwareKeyboard.instance.lockModesEnabled
+        .contains(KeyboardLockMode.scrollLock)) {
+      lockModes |= (1 << scrolllock);
+    }
     bind.sessionHandleFlutterRawKeyEvent(
         sessionId: sessionId,
         name: name,
@@ -879,9 +826,6 @@ class InputModel {
   Map<String, dynamic> _getMouseEvent(PointerEvent evt, String type) {
     final Map<String, dynamic> out = {};
 
-    bool hasStaleButtonsOnMouseUp =
-        type == _kMouseEventUp && evt.buttons == _lastButtons;
-
     // Check update event type and set buttons to be sent.
     int buttons = _lastButtons;
     if (type == _kMouseEventMove) {
@@ -906,7 +850,7 @@ class InputModel {
         buttons = evt.buttons;
       }
     }
-    _lastButtons = hasStaleButtonsOnMouseUp ? 0 : evt.buttons;
+    _lastButtons = evt.buttons;
 
     out['buttons'] = buttons;
     out['type'] = type;
@@ -1274,28 +1218,6 @@ class InputModel {
     _trackpadLastDelta = Offset.zero;
   }
 
-  // iOS Magic Mouse duplicate event detection.
-  // When using Magic Mouse on iPad, iOS may emit both mouse and touch events
-  // for the same click in certain areas (like top-left corner).
-  int _lastMouseDownTimeMs = 0;
-  ui.Offset _lastMouseDownPos = ui.Offset.zero;
-
-  /// Check if a touch tap event should be ignored because it's a duplicate
-  /// of a recent mouse event (iOS Magic Mouse issue).
-  bool shouldIgnoreTouchTap(ui.Offset pos) {
-    if (!isIOS) return false;
-    final nowMs = DateTime.now().millisecondsSinceEpoch;
-    final dt = nowMs - _lastMouseDownTimeMs;
-    final distance = (_lastMouseDownPos - pos).distance;
-    // If touch tap is within 2000ms and 80px of the last mouse down,
-    // it's likely a duplicate event from the same Magic Mouse click.
-    if (dt >= 0 && dt < 2000 && distance < 80.0) {
-      debugPrint("shouldIgnoreTouchTap: IGNORED (dt=$dt, dist=$distance)");
-      return true;
-    }
-    return false;
-  }
-
   void onPointDownImage(PointerDownEvent e) {
     debugPrint("onPointDownImage ${e.kind}");
     _stopFling = true;
@@ -1305,13 +1227,6 @@ class InputModel {
     if (isViewOnly && !showMyCursor) return;
     if (isViewCamera) return;
 
-    // Track mouse down events for duplicate detection on iOS.
-    final nowMs = DateTime.now().millisecondsSinceEpoch;
-    if (e.kind == ui.PointerDeviceKind.mouse) {
-      _lastMouseDownTimeMs = nowMs;
-      _lastMouseDownPos = e.position;
-    }
-
     if (_relativeMouse.enabled.value) {
       _relativeMouse.updatePointerRegionTopLeftGlobal(e);
     }
@@ -1853,9 +1768,9 @@ class InputModel {
   // Simulate a key press event.
   // `usbHidUsage` is the USB HID usage code of the key.
   Future<void> tapHidKey(int usbHidUsage) async {
-    newKeyboardMode(kKeyFlutterKey, usbHidUsage, true, false);
+    newKeyboardMode(kKeyFlutterKey, usbHidUsage, true);
     await Future.delayed(Duration(milliseconds: 100));
-    newKeyboardMode(kKeyFlutterKey, usbHidUsage, false, false);
+    newKeyboardMode(kKeyFlutterKey, usbHidUsage, false);
   }
 
   Future<void> onMobileVolumeUp() async =>

src/lang/tw.rs

@@ -729,15 +729,15 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("server-oss-not-support-tip", "注意：RustDesk 開源伺服器 (OSS server) 不包含此功能。"),
         ("input note here", "輸入備註"),
         ("note-at-conn-end-tip", "在連接結束時請求備註"),
-        ("Show terminal extra keys", "顯示終端機額外按鍵"),
-        ("Relative mouse mode", "相對滑鼠模式"),
-        ("rel-mouse-not-supported-peer-tip", "被控端不支援相對滑鼠模式"),
-        ("rel-mouse-not-ready-tip", "相對滑鼠模式尚未就緒，請稍候再試"),
-        ("rel-mouse-lock-failed-tip", "無法鎖定游標，相對滑鼠模式已停用"),
-        ("rel-mouse-exit-{}-tip", "按下 {} 退出"),
-        ("rel-mouse-permission-lost-tip", "鍵盤權限被撤銷，相對滑鼠模式已被停用"),
-        ("Changelog", "更新日誌"),
-        ("keep-awake-during-outgoing-sessions-label", "在連出工作階段期間保持螢幕喚醒"),
-        ("keep-awake-during-incoming-sessions-label", "在連入工作階段期間保持螢幕喚醒"),
+        ("Show terminal extra keys", ""),
+        ("Relative mouse mode", ""),
+        ("rel-mouse-not-supported-peer-tip", ""),
+        ("rel-mouse-not-ready-tip", ""),
+        ("rel-mouse-lock-failed-tip", ""),
+        ("rel-mouse-exit-{}-tip", ""),
+        ("rel-mouse-permission-lost-tip", ""),
+        ("Changelog", ""),
+        ("keep-awake-during-outgoing-sessions-label", ""),
+        ("keep-awake-during-incoming-sessions-label", ""),
     ].iter().cloned().collect();
 }

src/platform/macos.mm

@@ -357,6 +357,16 @@ static std::string GetDisplayUUID(CGDirectDisplayID displayId) {
     return "";
 }
 
+// Helper function to get display name from DisplayID
+static std::string GetDisplayName(CGDirectDisplayID displayId) {
+    // Note: NSScreen.localizedName is only available on macOS 10.15+
+    // Since we target 10.14, we avoid using @available checks that would
+    // require __isPlatformVersionAtLeast runtime function.
+    // For now, we just return "Unknown" for all displays.
+    // This is only used for logging purposes, so it doesn't affect functionality.
+    return "Unknown";
+}
+
 // Helper function to find DisplayID by UUID from current online displays
 static CGDirectDisplayID FindDisplayIdByUUID(const std::string& targetUuid) {
     uint32_t count = 0;
@@ -394,7 +404,9 @@ static bool RestoreAllGammas() {
             const CGGammaValue* blue = green + sampleCount;
             CGError error = CGSetDisplayTransferByTable(d, sampleCount, red, green, blue);
             if (error != kCGErrorSuccess) {
-                NSLog(@"Failed to restore gamma for display (ID: %u, UUID: %s, error: %d)", (unsigned)d, uuid.c_str(), error);
+                std::string displayName = GetDisplayName(d);
+                NSLog(@"Failed to restore gamma for display (Name: %s, ID: %u, UUID: %s, error: %d)", 
+                      displayName.c_str(), (unsigned)d, uuid.c_str(), error);
                 allSuccess = false;
             }
         }
@@ -874,7 +886,8 @@ extern "C" bool MacSetPrivacyMode(bool on) {
                     blackoutAttemptCount++;
                     CGError error = CGSetDisplayTransferByTable(d, capacity, zeros.data(), zeros.data(), zeros.data());
                     if (error != kCGErrorSuccess) {
-                        NSLog(@"MacSetPrivacyMode: Failed to blackout display (ID: %u, UUID: %s, error: %d)", (unsigned)d, uuid.c_str(), error);
+                        std::string displayName = GetDisplayName(d);
+                        NSLog(@"MacSetPrivacyMode: Failed to blackout display (Name: %s, ID: %u, UUID: %s, error: %d)", displayName.c_str(), (unsigned)d, uuid.c_str(), error);
                     } else {
                         blackoutSuccessCount++;
                     }