Homepage: https://rustdesk.com
-Depends: libgtk-3-0, libxcb-randr0, libxdo3, libxfixes3, libxcb-shape0, libxcb-xfixes0, libasound2, libsystemd0, curl, libva2, libva-drm2, libva-x11-2, libgstreamer-plugins-base1.0-0, libpam0g, gstreamer1.0-pipewire%s
+Depends: libgtk-3-0, libxcb-randr0, libxdo3 | libxdo4, libxfixes3, libxcb-shape0, libxcb-xfixes0, libasound2, libsystemd0, curl, libva2, libva-drm2, libva-x11-2, libgstreamer-plugins-base1.0-0, libpam0g, gstreamer1.0-pipewire%s
Recommends: libayatana-appindicator3-1
Description: A remote control software.
@@ -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('mv ../../{res_dir}/rustdesk-{version}-win7-install.exe ../..')
+ system2(f'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)
diff --git a/docs/CODE_OF_CONDUCT-FR.md b/docs/CODE_OF_CONDUCT-FR.md
new file mode 100644
index 000000000..dca61e0aa
--- /dev/null
+++ b/docs/CODE_OF_CONDUCT-FR.md
@@ -0,0 +1,143 @@
+
+# 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
diff --git a/docs/CONTRIBUTING-FR.md b/docs/CONTRIBUTING-FR.md
new file mode 100644
index 000000000..6f800de7d
--- /dev/null
+++ b/docs/CONTRIBUTING-FR.md
@@ -0,0 +1,55 @@
+
+# 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).
diff --git a/docs/README-FR.md b/docs/README-FR.md
index c2e25886d..345e53b58 100644
--- a/docs/README-FR.md
+++ b/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/Osx : vcpkg install libvpx libyuv opus aom
+ - Linux/macOS : vcpkg install libvpx libyuv opus aom
-- Exécuter `cargo run`
+- Exécutez `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
-Exécution du cargo
+cargo run
```
## Comment construire avec Docker
diff --git a/docs/README-RU.md b/docs/README-RU.md
index ad12e9527..928faad07 100644
--- a/docs/README-RU.md
+++ b/docs/README-RU.md
@@ -167,7 +167,7 @@ target/release/rustdesk
- **[src/ui](https://github.com/rustdesk/rustdesk/tree/master/src/ui)**: графический пользовательский интерфейс на Sciter (устаревшее)
- **[src/server](https://github.com/rustdesk/rustdesk/tree/master/src/server)**: сервисы аудио, буфера обмена, ввода, видео и сетевых подключений
- **[src/client.rs](https://github.com/rustdesk/rustdesk/tree/master/src/client.rs)**: одноранговое соединение
-- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: связь с [сервером Rustdesk](https://github.com/rustdesk/rustdesk-server), ожидает удаленного прямого (через TCP hole punching) или ретранслируемого соединения
+- **[src/rendezvous_mediator.rs](https://github.com/rustdesk/rustdesk/tree/master/src/rendezvous_mediator.rs)**: связь с [сервером RustDesk](https://github.com/rustdesk/rustdesk-server), ожидает удаленного прямого (через TCP hole punching) или ретранслируемого соединения
- **[src/platform](https://github.com/rustdesk/rustdesk/tree/master/src/platform)**: специфичный для платформы код
- **[flutter](https://github.com/rustdesk/rustdesk/tree/master/flutter)**: код Flutter для ПК-версии и мобильных устройств
- **[flutter/web/js](https://github.com/rustdesk/rustdesk/tree/master/flutter/web/v1/js)**: JavaScript для Web-клиента Flutter
diff --git a/docs/SECURITY-FR.md b/docs/SECURITY-FR.md
new file mode 100644
index 000000000..1cf2c6167
--- /dev/null
+++ b/docs/SECURITY-FR.md
@@ -0,0 +1,16 @@
+
+# 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é.
diff --git a/flatpak/com.rustdesk.RustDesk.metainfo.xml b/flatpak/com.rustdesk.RustDesk.metainfo.xml
index 0d3b33bb8..90bdafcb5 100644
--- a/flatpak/com.rustdesk.RustDesk.metainfo.xml
+++ b/flatpak/com.rustdesk.RustDesk.metainfo.xml
@@ -18,7 +18,7 @@
Supports VP8 / VP9 / AV1 software codecs, and H264 / H265 hardware codecs.
Own your data, easily set up self-hosting solution on your infrastructure.
P2P connection with end-to-end encryption based on NaCl.
- No administrative privileges or installation needed for Windows, elevate priviledge locally or from remote on demand.
+ No administrative privileges or installation needed for Windows, elevate privilege locally or from remote on demand.
We like to keep things simple and will strive to make simpler where possible.
@@ -56,4 +56,4 @@
pointing
-
\ No newline at end of file
+
diff --git a/flatpak/rustdesk.json b/flatpak/rustdesk.json
index c4935e137..2418ac2a6 100644
--- a/flatpak/rustdesk.json
+++ b/flatpak/rustdesk.json
@@ -55,6 +55,7 @@
],
"finish-args": [
"--share=ipc",
+ "--socket=wayland",
"--socket=x11",
"--share=network",
"--filesystem=home",
diff --git a/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/AudioRecordHandle.kt b/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/AudioRecordHandle.kt
index db222dc84..05742d7fd 100644
--- a/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/AudioRecordHandle.kt
+++ b/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/AudioRecordHandle.kt
@@ -62,7 +62,13 @@ class AudioRecordHandle(private var context: Context, private var isVideoStart:
return false
}
}
- audioRecorder = builder.build()
+ val recorder = try {
+ builder.build()
+ } catch (e: Exception) {
+ Log.e(logTag, "createAudioRecorder failed", e)
+ return false
+ }
+ audioRecorder = recorder
Log.d(logTag, "createAudioRecorder done,minBufferSize:$minBufferSize")
return true
}
diff --git a/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/FloatingWindowService.kt b/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/FloatingWindowService.kt
index 696d536c6..6dd4a2f61 100644
--- a/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/FloatingWindowService.kt
+++ b/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/FloatingWindowService.kt
@@ -311,7 +311,10 @@ class FloatingWindowService : Service(), View.OnTouchListener {
popupMenu.menu.add(0, idSyncClipboard, 0, translate("Update client clipboard"))
}
val idStopService = 2
- popupMenu.menu.add(0, idStopService, 0, translate("Stop service"))
+ val hideStopService = FFI.getBuildinOption("hide-stop-service") == "Y"
+ if (!hideStopService) {
+ popupMenu.menu.add(0, idStopService, 0, translate("Stop service"))
+ }
popupMenu.setOnMenuItemClickListener { menuItem ->
when (menuItem.itemId) {
idShowRustDesk -> {
@@ -389,4 +392,3 @@ class FloatingWindowService : Service(), View.OnTouchListener {
return false
}
}
-
diff --git a/flutter/android/app/src/main/kotlin/ffi.kt b/flutter/android/app/src/main/kotlin/ffi.kt
index 8e9b39968..e3c9d9830 100644
--- a/flutter/android/app/src/main/kotlin/ffi.kt
+++ b/flutter/android/app/src/main/kotlin/ffi.kt
@@ -24,6 +24,7 @@ object FFI {
external fun setFrameRawEnable(name: String, value: Boolean)
external fun setCodecInfo(info: String)
external fun getLocalOption(key: String): String
+ external fun getBuildinOption(key: String): String
external fun onClipboardUpdate(clips: ByteBuffer)
external fun isServiceClipboardEnabled(): Boolean
}
diff --git a/flutter/assets/auth-microsoft.svg b/flutter/assets/auth-microsoft.svg
new file mode 100644
index 000000000..c9ce5f9cf
--- /dev/null
+++ b/flutter/assets/auth-microsoft.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/flutter/build_fdroid.sh b/flutter/build_fdroid.sh
index ecfb444ef..d50a6a6ce 100755
--- a/flutter/build_fdroid.sh
+++ b/flutter/build_fdroid.sh
@@ -7,7 +7,7 @@
# 2024, Vasyl Gello
#
-# The script is invoked by F-Droid builder system ste-by-step.
+# The script is invoked by F-Droid builder system step-by-step.
#
# It accepts the following arguments:
#
@@ -16,7 +16,6 @@
# - Android architecture to build APK for: armeabi-v7a arm64-v8av x86 x86_64
# - The build step to execute:
#
-# + sudo-deps: as root, install needed Debian packages into builder VM
# + prebuild: patch sources and do other stuff before the build
# + build: perform actual build of APK file
#
@@ -184,13 +183,9 @@ prebuild)
fi
# Map NDK version to revision
-
- NDK_VERSION="$(wget \
- -qO- \
- -H "Accept: application/vnd.github+json" \
- -H "X-GitHub-Api-Version: 2022-11-28" \
- 'https://api.github.com/repos/android/ndk/releases' |
- jq -r ".[] | select(.tag_name == \"${NDK_VERSION}\") | .body | match(\"ndkVersion \\\"(.*)\\\"\").captures[0].string")"
+ NDK_VERSION="$(curl https://gitlab.com/fdroid/android-sdk-transparency-log/-/raw/master/signed/checksums.json |
+ jq -r ".\"https://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-linux.zip\"[0].\"source.properties\"" |
+ sed -n -E 's/.*Pkg.Revision = ([0-9.]+).*/\1/p')"
if [ -z "${NDK_VERSION}" ]; then
echo "ERROR: Can not map Android NDK codename to revision!" >&2
@@ -316,6 +311,18 @@ prebuild)
# `FLUTTER_BRIDGE_VERSION` an restore the pubspec later
if [ "${FLUTTER_VERSION}" != "${FLUTTER_BRIDGE_VERSION}" ]; then
+ # Find first libclang.so and set BRIDGE_LLVM_PATH
+
+ BRIDGE_LLVM_PATH="$(find /usr/lib/ -name libclang.so | head -n1)"
+
+ if [ -z "${BRIDGE_LLVM_PATH}" ]; then
+ echo 'ERROR: Can not find libclang.so for bridge generator!' >&2
+ exit 1
+ fi
+
+ BRIDGE_LLVM_PATH="$(dirname "${BRIDGE_LLVM_PATH}")"
+ BRIDGE_LLVM_PATH="$(dirname "${BRIDGE_LLVM_PATH}")"
+
# Install Flutter bridge version
prepare_flutter "${FLUTTER_BRIDGE_VERSION}" "${HOME}/flutter"
@@ -344,7 +351,8 @@ prebuild)
flutter_rust_bridge_codegen \
--rust-input ./src/flutter_ffi.rs \
- --dart-output ./flutter/lib/generated_bridge.dart
+ --dart-output ./flutter/lib/generated_bridge.dart \
+ --llvm-path "${BRIDGE_LLVM_PATH}"
# Add bridge files to save-list
@@ -355,13 +363,15 @@ prebuild)
git checkout '*'
git clean -dffx
git reset
+
+ unset BRIDGE_LLVM_PATH
fi
# Install Flutter version for RustDesk library build
prepare_flutter "${FLUTTER_VERSION}" "${HOME}/flutter"
- # gms is not in thoes files now, but we still keep the following line for future reference(maybe).
+ # gms is not in these files now, but we still keep the following line for future reference(maybe).
sed \
-i \
@@ -414,13 +424,9 @@ build)
.github/workflows/flutter-build.yml)"
# Map NDK version to revision
-
- NDK_VERSION="$(wget \
- -qO- \
- -H "Accept: application/vnd.github+json" \
- -H "X-GitHub-Api-Version: 2022-11-28" \
- 'https://api.github.com/repos/android/ndk/releases' |
- jq -r ".[] | select(.tag_name == \"${NDK_VERSION}\") | .body | match(\"ndkVersion \\\"(.*)\\\"\").captures[0].string")"
+ NDK_VERSION="$(curl https://gitlab.com/fdroid/android-sdk-transparency-log/-/raw/master/signed/checksums.json |
+ jq -r ".\"https://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-linux.zip\"[0].\"source.properties\"" |
+ sed -n -E 's/.*Pkg.Revision = ([0-9.]+).*/\1/p')"
if [ -z "${NDK_VERSION}" ]; then
echo "ERROR: Can not map Android NDK codename to revision!" >&2
diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index 0650b1b5b..366a7b6ba 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -716,6 +716,17 @@ closeConnection({String? id}) {
stateGlobal.isInMainPage = true;
} else {
final controller = Get.find();
+ 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);
}
}
@@ -1124,18 +1135,23 @@ 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 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: TextStyle(
+ style: const TextStyle(
color: Colors.blue,
decoration: TextDecoration.underline,
),
@@ -1153,13 +1169,9 @@ 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: TextStyle(color: Colors.black, fontSize: 15),
+ style: const TextStyle(fontSize: 15),
children: spans,
),
);
@@ -2364,6 +2376,19 @@ List? urlLinkToCmdArgs(Uri uri) {
id = uri.path.substring("/new/".length);
} else if (uri.authority == "config") {
if (isAndroid || isIOS) {
+ final allowDeepLinkServerSettings =
+ bind.mainGetBuildinOption(key: kOptionAllowDeepLinkServerSettings) ==
+ 'Y';
+ if (!allowDeepLinkServerSettings) {
+ debugPrint(
+ "Ignore rustdesk://config because $kOptionAllowDeepLinkServerSettings is not enabled.");
+ // Keep the user-facing error generic; detailed rejection reason is in debug logs.
+ // Delay toast to avoid missing overlay during cold-start deeplink handling.
+ Timer(Duration(seconds: 1), () {
+ showToast(translate('Failed'));
+ });
+ return null;
+ }
final config = uri.path.substring("/".length);
// add a timer to make showToast work
Timer(Duration(seconds: 1), () {
@@ -2373,11 +2398,24 @@ List? urlLinkToCmdArgs(Uri uri) {
return null;
} else if (uri.authority == "password") {
if (isAndroid || isIOS) {
+ final allowDeepLinkPassword =
+ bind.mainGetBuildinOption(key: kOptionAllowDeepLinkPassword) == 'Y';
+ if (!allowDeepLinkPassword) {
+ debugPrint(
+ "Ignore rustdesk://password because $kOptionAllowDeepLinkPassword is not enabled.");
+ // Keep the user-facing error generic; detailed rejection reason is in debug logs.
+ // Delay toast to avoid missing overlay during cold-start deeplink handling.
+ Timer(Duration(seconds: 1), () {
+ showToast(translate('Failed'));
+ });
+ return null;
+ }
final password = uri.path.substring("/".length);
if (password.isNotEmpty) {
Timer(Duration(seconds: 1), () async {
- await bind.mainSetPermanentPassword(password: password);
- showToast(translate('Successful'));
+ final ok =
+ await bind.mainSetPermanentPasswordWithResult(password: password);
+ showToast(translate(ok ? 'Successful' : 'Failed'));
});
}
}
@@ -3062,6 +3100,11 @@ Future start_service(bool is_start) async {
}
Future canBeBlocked() async {
+ if (isWeb) {
+ // Web can only act as a controller, never as a controlled side,
+ // so it should never be blocked by a remote session.
+ return false;
+ }
// First check control permission
final controlPermission = await bind.mainGetCommon(
key: "is-remote-modify-enabled-by-control-permissions");
@@ -4112,3 +4155,42 @@ String mouseButtonsToPeer(int buttons) {
return '';
}
}
+
+/// Build an avatar widget from an avatar URL or data URI string.
+/// Returns [fallback] if avatar is empty or cannot be decoded.
+/// [borderRadius] defaults to [size]/2 (circle).
+Widget? buildAvatarWidget({
+ required String avatar,
+ required double size,
+ double? borderRadius,
+ Widget? fallback,
+}) {
+ final trimmed = avatar.trim();
+ if (trimmed.isEmpty) return fallback;
+
+ ImageProvider? imageProvider;
+ if (trimmed.startsWith('data:image/')) {
+ final comma = trimmed.indexOf(',');
+ if (comma > 0) {
+ try {
+ imageProvider = MemoryImage(base64Decode(trimmed.substring(comma + 1)));
+ } catch (_) {}
+ }
+ } else if (trimmed.startsWith('http://') || trimmed.startsWith('https://')) {
+ imageProvider = NetworkImage(trimmed);
+ }
+
+ if (imageProvider == null) return fallback;
+
+ final radius = borderRadius ?? size / 2;
+ return ClipRRect(
+ borderRadius: BorderRadius.circular(radius),
+ child: Image(
+ image: imageProvider,
+ width: size,
+ height: size,
+ fit: BoxFit.cover,
+ errorBuilder: (_, __, ___) => fallback ?? SizedBox.shrink(),
+ ),
+ );
+}
diff --git a/flutter/lib/common/hbbs/hbbs.dart b/flutter/lib/common/hbbs/hbbs.dart
index aab8ba597..0c729e4df 100644
--- a/flutter/lib/common/hbbs/hbbs.dart
+++ b/flutter/lib/common/hbbs/hbbs.dart
@@ -25,6 +25,8 @@ enum UserStatus { kDisabled, kNormal, kUnverified }
// Is all the fields of the user needed?
class UserPayload {
String name = '';
+ String displayName = '';
+ String avatar = '';
String email = '';
String note = '';
String? verifier;
@@ -33,6 +35,8 @@ class UserPayload {
UserPayload.fromJson(Map json)
: name = json['name'] ?? '',
+ displayName = json['display_name'] ?? '',
+ avatar = json['avatar'] ?? '',
email = json['email'] ?? '',
note = json['note'] ?? '',
verifier = json['verifier'],
@@ -46,6 +50,8 @@ class UserPayload {
Map toJson() {
final Map map = {
'name': name,
+ 'display_name': displayName,
+ 'avatar': avatar,
'status': status == UserStatus.kDisabled
? 0
: status == UserStatus.kUnverified
@@ -58,9 +64,14 @@ class UserPayload {
Map toGroupCacheJson() {
final Map map = {
'name': name,
+ 'display_name': displayName,
};
return map;
}
+
+ String get displayNameOrName {
+ return displayName.trim().isEmpty ? name : displayName;
+ }
}
class PeerPayload {
diff --git a/flutter/lib/common/widgets/address_book.dart b/flutter/lib/common/widgets/address_book.dart
index 1a09d6f53..054a1666c 100644
--- a/flutter/lib/common/widgets/address_book.dart
+++ b/flutter/lib/common/widgets/address_book.dart
@@ -54,9 +54,9 @@ class _AddressBookState extends State {
const LinearProgressIndicator(),
buildErrorBanner(context,
loading: gFFI.abModel.currentAbLoading,
- err: gFFI.abModel.currentAbPullError,
+ err: gFFI.abModel.abPullError,
retry: null,
- close: () => gFFI.abModel.currentAbPullError.value = ''),
+ close: gFFI.abModel.clearPullErrors),
buildErrorBanner(context,
loading: gFFI.abModel.currentAbLoading,
err: gFFI.abModel.currentAbPushError,
diff --git a/flutter/lib/common/widgets/login.dart b/flutter/lib/common/widgets/login.dart
index 5fafc87b9..ee376de68 100644
--- a/flutter/lib/common/widgets/login.dart
+++ b/flutter/lib/common/widgets/login.dart
@@ -20,7 +20,8 @@ const kOpSvgList = [
'okta',
'facebook',
'azure',
- 'auth0'
+ 'auth0',
+ 'microsoft'
];
class _IconOP extends StatelessWidget {
@@ -103,7 +104,7 @@ class ButtonOP extends StatelessWidget {
child: FittedBox(
fit: BoxFit.scaleDown,
child: Center(
- child: Text('${translate("Continue with")} $opLabel')),
+ child: Text(translate("Continue with {$opLabel}"))),
),
),
],
@@ -224,21 +225,59 @@ class _WidgetOPState extends State {
return Offstage(
offstage:
_failedMsg.isEmpty && widget.curOP.value != widget.config.op,
- child: RichText(
- text: TextSpan(
- text: '$_stateMsg ',
- style:
- DefaultTextStyle.of(context).style.copyWith(fontSize: 12),
- children: [
- TextSpan(
- text: _failedMsg,
- style: DefaultTextStyle.of(context).style.copyWith(
- fontSize: 14,
- color: Colors.red,
- ),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ children: [
+ if (_stateMsg.isNotEmpty && _failedMsg.isEmpty)
+ Padding(
+ padding: const EdgeInsets.only(top: 8.0),
+ child: SelectableText(
+ translate(_stateMsg),
+ style: DefaultTextStyle.of(context)
+ .style
+ .copyWith(fontSize: 12),
+ ),
),
- ],
- ),
+ if (_failedMsg.isNotEmpty)
+ Padding(
+ padding: const EdgeInsets.only(top: 8.0),
+ child: Builder(builder: (context) {
+ final errorColor =
+ Theme.of(context).colorScheme.error;
+ final bgColor = Theme.of(context)
+ .colorScheme
+ .errorContainer
+ .withOpacity(0.3);
+ return Container(
+ padding: const EdgeInsets.symmetric(
+ horizontal: 8.0, vertical: 6.0),
+ decoration: BoxDecoration(
+ color: bgColor,
+ borderRadius: BorderRadius.circular(4.0),
+ ),
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Icon(Icons.error_outline,
+ color: errorColor, size: 16),
+ const SizedBox(width: 6),
+ Flexible(
+ child: SelectableText(
+ translate(_failedMsg),
+ style: DefaultTextStyle.of(context)
+ .style
+ .copyWith(
+ fontSize: 13,
+ color: errorColor,
+ ),
+ ),
+ ),
+ ],
+ ),
+ );
+ }),
+ ),
+ ],
),
);
}),
diff --git a/flutter/lib/common/widgets/my_group.dart b/flutter/lib/common/widgets/my_group.dart
index 6207a7363..74ce34e71 100644
--- a/flutter/lib/common/widgets/my_group.dart
+++ b/flutter/lib/common/widgets/my_group.dart
@@ -158,12 +158,18 @@ class _MyGroupState extends State {
return Obx(() {
final userItems = gFFI.groupModel.users.where((p0) {
if (searchAccessibleItemNameText.isNotEmpty) {
- return p0.name
- .toLowerCase()
- .contains(searchAccessibleItemNameText.value.toLowerCase());
+ final search = searchAccessibleItemNameText.value.toLowerCase();
+ return p0.name.toLowerCase().contains(search) ||
+ p0.displayNameOrName.toLowerCase().contains(search);
}
return true;
}).toList();
+ // Count occurrences of each displayNameOrName to detect duplicates
+ final displayNameCount = {};
+ for (final u in userItems) {
+ final dn = u.displayNameOrName;
+ displayNameCount[dn] = (displayNameCount[dn] ?? 0) + 1;
+ }
final deviceGroupItems = gFFI.groupModel.deviceGroups.where((p0) {
if (searchAccessibleItemNameText.isNotEmpty) {
return p0.name
@@ -177,7 +183,8 @@ class _MyGroupState extends State {
itemCount: deviceGroupItems.length + userItems.length,
itemBuilder: (context, index) => index < deviceGroupItems.length
? _buildDeviceGroupItem(deviceGroupItems[index])
- : _buildUserItem(userItems[index - deviceGroupItems.length]));
+ : _buildUserItem(userItems[index - deviceGroupItems.length],
+ displayNameCount));
var maxHeight = max(MediaQuery.of(context).size.height / 6, 100.0);
return Obx(() => stateGlobal.isPortrait.isFalse
? listView(false)
@@ -185,8 +192,14 @@ class _MyGroupState extends State {
});
}
- Widget _buildUserItem(UserPayload user) {
+ Widget _buildUserItem(UserPayload user, Map displayNameCount) {
final username = user.name;
+ final dn = user.displayNameOrName;
+ final isDuplicate = (displayNameCount[dn] ?? 0) > 1;
+ final displayName =
+ isDuplicate && user.displayName.trim().isNotEmpty
+ ? '${user.displayName} (@$username)'
+ : dn;
return InkWell(onTap: () {
isSelectedDeviceGroup.value = false;
if (selectedAccessibleItemName.value != username) {
@@ -222,14 +235,14 @@ class _MyGroupState extends State {
alignment: Alignment.center,
child: Center(
child: Text(
- username.characters.first.toUpperCase(),
+ displayName.characters.first.toUpperCase(),
style: TextStyle(color: Colors.white),
textAlign: TextAlign.center,
),
),
),
).marginOnly(right: 4),
- if (isMe) Flexible(child: Text(username)),
+ if (isMe) Flexible(child: Text(displayName)),
if (isMe)
Flexible(
child: Container(
@@ -246,7 +259,7 @@ class _MyGroupState extends State {
),
),
),
- if (!isMe) Expanded(child: Text(username)),
+ if (!isMe) Expanded(child: Text(displayName)),
],
).paddingSymmetric(vertical: 4),
),
diff --git a/flutter/lib/common/widgets/peers_view.dart b/flutter/lib/common/widgets/peers_view.dart
index d81a095ca..5be5af272 100644
--- a/flutter/lib/common/widgets/peers_view.dart
+++ b/flutter/lib/common/widgets/peers_view.dart
@@ -570,11 +570,14 @@ class MyGroupPeerView extends BasePeersView {
static bool filter(Peer peer) {
final model = gFFI.groupModel;
if (model.searchAccessibleItemNameText.isNotEmpty) {
- final text = model.searchAccessibleItemNameText.value;
- final searchPeersOfUser = peer.loginName.contains(text) &&
- model.users.any((user) => user.name == peer.loginName);
- final searchPeersOfDeviceGroup = peer.device_group_name.contains(text) &&
- model.deviceGroups.any((g) => g.name == peer.device_group_name);
+ final text = model.searchAccessibleItemNameText.value.toLowerCase();
+ final searchPeersOfUser = model.users.any((user) =>
+ user.name == peer.loginName &&
+ (user.name.toLowerCase().contains(text) ||
+ user.displayNameOrName.toLowerCase().contains(text)));
+ final searchPeersOfDeviceGroup =
+ peer.device_group_name.toLowerCase().contains(text) &&
+ model.deviceGroups.any((g) => g.name == peer.device_group_name);
if (!searchPeersOfUser && !searchPeersOfDeviceGroup) {
return false;
}
diff --git a/flutter/lib/common/widgets/remote_input.dart b/flutter/lib/common/widgets/remote_input.dart
index e35da6424..9515ca759 100644
--- a/flutter/lib/common/widgets/remote_input.dart
+++ b/flutter/lib/common/widgets/remote_input.dart
@@ -31,7 +31,7 @@ class RawKeyFocusScope extends StatelessWidget {
// https://github.com/flutter/flutter/issues/154053
final useRawKeyEvents = isLinux && !isWeb;
// FIXME: On Windows, `AltGr` will generate `Alt` and `Control` key events,
- // while `Alt` and `Control` are seperated key events for en-US input method.
+ // while `Alt` and `Control` are separated key events for en-US input method.
return FocusScope(
autofocus: true,
child: Focus(
@@ -532,7 +532,9 @@ class _RawTouchGestureDetectorRegionState
// Official
TapGestureRecognizer:
GestureRecognizerFactoryWithHandlers(
- () => TapGestureRecognizer(), (instance) {
+ () => TapGestureRecognizer(
+ supportedDevices: kTouchBasedDeviceKinds,
+ ), (instance) {
instance
..onTapDown = onTapDown
..onTapUp = onTapUp
@@ -540,14 +542,18 @@ class _RawTouchGestureDetectorRegionState
}),
DoubleTapGestureRecognizer:
GestureRecognizerFactoryWithHandlers(
- () => DoubleTapGestureRecognizer(), (instance) {
+ () => DoubleTapGestureRecognizer(
+ supportedDevices: kTouchBasedDeviceKinds,
+ ), (instance) {
instance
..onDoubleTapDown = onDoubleTapDown
..onDoubleTap = onDoubleTap;
}),
LongPressGestureRecognizer:
GestureRecognizerFactoryWithHandlers(
- () => LongPressGestureRecognizer(), (instance) {
+ () => LongPressGestureRecognizer(
+ supportedDevices: kTouchBasedDeviceKinds,
+ ), (instance) {
instance
..onLongPressDown = onLongPressDown
..onLongPressUp = onLongPressUp
@@ -557,7 +563,9 @@ class _RawTouchGestureDetectorRegionState
// Customized
HoldTapMoveGestureRecognizer:
GestureRecognizerFactoryWithHandlers(
- () => HoldTapMoveGestureRecognizer(),
+ () => HoldTapMoveGestureRecognizer(
+ supportedDevices: kTouchBasedDeviceKinds,
+ ),
(instance) => instance
..onHoldDragStart = onHoldDragStart
..onHoldDragUpdate = onHoldDragUpdate
@@ -565,14 +573,18 @@ class _RawTouchGestureDetectorRegionState
..onHoldDragEnd = onHoldDragEnd),
DoubleFinerTapGestureRecognizer:
GestureRecognizerFactoryWithHandlers(
- () => DoubleFinerTapGestureRecognizer(), (instance) {
+ () => DoubleFinerTapGestureRecognizer(
+ supportedDevices: kTouchBasedDeviceKinds,
+ ), (instance) {
instance
..onDoubleFinerTap = onDoubleFinerTap
..onDoubleFinerTapDown = onDoubleFinerTapDown;
}),
CustomTouchGestureRecognizer:
GestureRecognizerFactoryWithHandlers(
- () => CustomTouchGestureRecognizer(), (instance) {
+ () => CustomTouchGestureRecognizer(
+ supportedDevices: kTouchBasedDeviceKinds,
+ ), (instance) {
instance.onOneFingerPanStart =
(DragStartDetails d) => onOneFingerPanStart(context, d);
instance
diff --git a/flutter/lib/common/widgets/toolbar.dart b/flutter/lib/common/widgets/toolbar.dart
index a46ce54fd..537014246 100644
--- a/flutter/lib/common/widgets/toolbar.dart
+++ b/flutter/lib/common/widgets/toolbar.dart
@@ -16,6 +16,12 @@ import 'package:get/get.dart';
bool isEditOsPassword = false;
+// macOS privacy mode blacks out all online displays, so switching the remote
+// display does not weaken the local privacy protection.
+bool allowDisplaySwitchInPrivacyMode(PeerInfo pi) {
+ return pi.platform == kPeerPlatformMacOS;
+}
+
class TTextMenu {
final Widget child;
final VoidCallback? onPressed;
@@ -275,7 +281,6 @@ List toolbarControls(BuildContext context, String id, FFI ffi) {
isDesktop &&
ffiModel.keyboard &&
pi.platform != kPeerPlatformAndroid &&
- pi.platform != kPeerPlatformMacOS &&
versionCmp(pi.version, '1.2.0') >= 0 &&
bind.peerGetSessionsCount(id: id, connType: ffi.connType.index) == 1) {
v.add(TTextMenu(
@@ -685,8 +690,9 @@ Future> toolbarDisplayToggle(
child: Text(translate('Lock after session end'))));
}
+ final privacyModeState = PrivacyModeState.find(id);
if (pi.isSupportMultiDisplay &&
- PrivacyModeState.find(id).isEmpty &&
+ (privacyModeState.isEmpty || allowDisplaySwitchInPrivacyMode(pi)) &&
pi.displaysCount.value > 1 &&
bind.mainGetUserDefaultOption(key: kKeyShowMonitorsToolbar) == 'Y') {
final value =
@@ -760,15 +766,25 @@ List toolbarPrivacyMode(
final ffiModel = ffi.ffiModel;
final pi = ffiModel.pi;
final sessionId = ffi.sessionId;
+ final hasPrivacyModePermission = ffiModel.permissions['privacy_mode'] != false;
+
+ // Backend revocation already attempts to turn privacy mode off.
+ // Still keep this menu when privacy mode is active, so users can turn it off
+ // if there is a sync delay, version mismatch, or off attempt failure.
+ if (!hasPrivacyModePermission && privacyModeState.isEmpty) {
+ return []; // No permission and not active, hide options.
+ }
getDefaultMenu(Future Function(SessionID sid, String opt) toggleFunc) {
- final enabled = !ffi.ffiModel.viewOnly;
+ final enabled =
+ !ffiModel.viewOnly && (hasPrivacyModePermission || privacyModeState.isNotEmpty);
return TToggleMenu(
value: privacyModeState.isNotEmpty,
onChanged: enabled
? (value) {
if (value == null) return;
- if (ffiModel.pi.currentDisplay != 0 &&
+ if (!allowDisplaySwitchInPrivacyMode(pi) &&
+ ffiModel.pi.currentDisplay != 0 &&
ffiModel.pi.currentDisplay != kAllDisplayValue) {
msgBox(
sessionId,
@@ -811,18 +827,29 @@ List toolbarPrivacyMode(
})
];
} else {
- return privacyModeImpls.map((e) {
+ final visibleImpls = hasPrivacyModePermission
+ ? privacyModeImpls
+ : privacyModeImpls.where((e) {
+ final implKey = (e as List)[0] as String;
+ return privacyModeState.value == implKey;
+ }).toList();
+ return visibleImpls.map((e) {
final implKey = (e as List)[0] as String;
final implName = (e)[1] as String;
+ final enabled = !ffiModel.viewOnly &&
+ (hasPrivacyModePermission || privacyModeState.value == implKey);
return TToggleMenu(
child: Text(translate(implName)),
value: privacyModeState.value == implKey,
- onChanged: (value) {
- if (value == null) return;
- togglePrivacyModeTime = DateTime.now();
- bind.sessionTogglePrivacyMode(
- sessionId: sessionId, implKey: implKey, on: value);
- });
+ onChanged: enabled
+ ? (value) {
+ if (value == null) return;
+ if (value && !hasPrivacyModePermission) return;
+ togglePrivacyModeTime = DateTime.now();
+ bind.sessionTogglePrivacyMode(
+ sessionId: sessionId, implKey: implKey, on: value);
+ }
+ : null);
}).toList();
}
}
diff --git a/flutter/lib/consts.dart b/flutter/lib/consts.dart
index 3b9940c9c..adf7b1d45 100644
--- a/flutter/lib/consts.dart
+++ b/flutter/lib/consts.dart
@@ -114,6 +114,9 @@ const String kOptionTerminalPersistent = "terminal-persistent";
const String kOptionEnableTunnel = "enable-tunnel";
const String kOptionEnableRemoteRestart = "enable-remote-restart";
const String kOptionEnableBlockInput = "enable-block-input";
+const String kOptionEnablePrivacyMode = "enable-privacy-mode";
+const String kOptionEnablePermChangeInAcceptWindow =
+ "enable-perm-change-in-accept-window";
const String kOptionAllowRemoteConfigModification =
"allow-remote-config-modification";
const String kOptionVerificationMethod = "verification-method";
@@ -139,6 +142,10 @@ const String kOptionSwapLeftRightMouse = "swap-left-right-mouse";
const String kOptionCodecPreference = "codec-preference";
const String kOptionRemoteMenubarDragLeft = "remote-menubar-drag-left";
const String kOptionRemoteMenubarDragRight = "remote-menubar-drag-right";
+const String kOptionRemoteMenubarEdge = "remote-menubar-edge";
+const String kOptionRemoteMenubarFraction = "remote-menubar-frac";
+const String kOptionAllowMultiEdgeToolbarDock =
+ "allow-multi-edge-toolbar-dock";
const String kOptionHideAbTagsPanel = "hideAbTagsPanel";
const String kOptionRemoteMenubarState = "remoteMenubarState";
const String kOptionPeerSorting = "peer-sorting";
@@ -175,6 +182,7 @@ const String kOptionEnableFlutterHttpOnRust = "enable-flutter-http-on-rust";
const String kOptionHideServerSetting = "hide-server-settings";
const String kOptionHideProxySetting = "hide-proxy-settings";
const String kOptionHideWebSocketSetting = "hide-websocket-settings";
+const String kOptionHideStopService = "hide-stop-service";
const String kOptionHideRemotePrinterSetting = "hide-remote-printer-settings";
const String kOptionHideSecuritySetting = "hide-security-settings";
const String kOptionHideNetworkSetting = "hide-network-settings";
@@ -186,6 +194,9 @@ const String kOptionDisableChangeId = "disable-change-id";
const String kOptionDisableUnlockPin = "disable-unlock-pin";
const kHideUsernameOnCard = "hide-username-on-card";
const String kOptionHideHelpCards = "hide-help-cards";
+const String kOptionAllowDeepLinkPassword = "allow-deep-link-password";
+const String kOptionAllowDeepLinkServerSettings =
+ "allow-deep-link-server-settings";
const String kOptionToggleViewOnly = "view-only";
const String kOptionToggleShowMyCursor = "show-my-cursor";
diff --git a/flutter/lib/desktop/pages/desktop_home_page.dart b/flutter/lib/desktop/pages/desktop_home_page.dart
index 339ecddb0..42ec10032 100644
--- a/flutter/lib/desktop/pages/desktop_home_page.dart
+++ b/flutter/lib/desktop/pages/desktop_home_page.dart
@@ -908,12 +908,17 @@ class _DesktopHomePageState extends State
}
void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
- final pw = await bind.mainGetPermanentPassword();
- final p0 = TextEditingController(text: pw);
- final p1 = TextEditingController(text: pw);
+ final p0 = TextEditingController(text: "");
+ final p1 = TextEditingController(text: "");
var errMsg0 = "";
var errMsg1 = "";
- final RxString rxPass = pw.trim().obs;
+ final localPasswordSet =
+ (await bind.mainGetCommon(key: "local-permanent-password-set")) == "true";
+ final permanentPasswordSet =
+ (await bind.mainGetCommon(key: "permanent-password-set")) == "true";
+ final presetPassword = permanentPasswordSet && !localPasswordSet;
+ var canSubmit = false;
+ final RxString rxPass = "".obs;
final rules = [
DigitValidationRule(),
UppercaseValidationRule(),
@@ -922,9 +927,21 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
MinCharactersValidationRule(8),
];
final maxLength = bind.mainMaxEncryptLen();
+ final statusTip = localPasswordSet
+ ? translate('password-hidden-tip')
+ : (presetPassword ? translate('preset-password-in-use-tip') : '');
+ final showStatusTipOnMobile =
+ statusTip.isNotEmpty && !isDesktop && !isWebDesktop;
gFFI.dialogManager.show((setState, close, context) {
- submit() {
+ updateCanSubmit() {
+ canSubmit = p0.text.trim().isNotEmpty || p1.text.trim().isNotEmpty;
+ }
+
+ submit() async {
+ if (!canSubmit) {
+ return;
+ }
setState(() {
errMsg0 = "";
errMsg1 = "";
@@ -947,7 +964,13 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
});
return;
}
- bind.mainSetPermanentPassword(password: pass);
+ final ok = await bind.mainSetPermanentPasswordWithResult(password: pass);
+ if (!ok) {
+ setState(() {
+ errMsg0 = '${translate('Prompt')}: ${translate("Failed")}';
+ });
+ return;
+ }
if (pass.isNotEmpty) {
notEmptyCallback?.call();
}
@@ -955,14 +978,20 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
}
return CustomAlertDialog(
- title: Text(translate("Set Password")),
+ title: Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Icon(Icons.key, color: MyTheme.accent),
+ Text(translate("Set Password")).paddingOnly(left: 10),
+ ],
+ ),
content: ConstrainedBox(
constraints: const BoxConstraints(minWidth: 500),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- const SizedBox(
- height: 8.0,
+ SizedBox(
+ height: showStatusTipOnMobile ? 0.0 : 6.0,
),
Row(
children: [
@@ -978,6 +1007,7 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
rxPass.value = value.trim();
setState(() {
errMsg0 = '';
+ updateCanSubmit();
});
},
maxLength: maxLength,
@@ -989,9 +1019,9 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
children: [
Expanded(child: PasswordStrengthIndicator(password: rxPass)),
],
- ).marginSymmetric(vertical: 8),
- const SizedBox(
- height: 8.0,
+ ).marginOnly(top: 2, bottom: showStatusTipOnMobile ? 2 : 8),
+ SizedBox(
+ height: showStatusTipOnMobile ? 0.0 : 8.0,
),
Row(
children: [
@@ -1005,6 +1035,7 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
onChanged: (value) {
setState(() {
errMsg1 = '';
+ updateCanSubmit();
});
},
maxLength: maxLength,
@@ -1012,11 +1043,23 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
),
],
),
- const SizedBox(
- height: 8.0,
+ if (statusTip.isNotEmpty)
+ Row(
+ children: [
+ Icon(Icons.info, color: Colors.amber, size: 18)
+ .marginOnly(right: 6),
+ Expanded(
+ child: Text(
+ statusTip,
+ style: const TextStyle(fontSize: 13, height: 1.1),
+ ))
+ ],
+ ).marginOnly(top: 6, bottom: 2),
+ SizedBox(
+ height: showStatusTipOnMobile ? 0.0 : 8.0,
),
Obx(() => Wrap(
- runSpacing: 8,
+ runSpacing: showStatusTipOnMobile ? 2.0 : 8.0,
spacing: 4,
children: rules.map((e) {
var checked = e.validate(rxPass.value.trim());
@@ -1036,11 +1079,67 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
],
),
),
- actions: [
- dialogButton("Cancel", onPressed: close, isOutline: true),
- dialogButton("OK", onPressed: submit),
- ],
- onSubmit: submit,
+ actions: (() {
+ final cancelButton = dialogButton(
+ "Cancel",
+ icon: Icon(Icons.close_rounded),
+ onPressed: close,
+ isOutline: true,
+ );
+ final removeButton = dialogButton(
+ "Remove",
+ icon: Icon(Icons.delete_outline_rounded),
+ onPressed: () async {
+ setState(() {
+ errMsg0 = "";
+ errMsg1 = "";
+ });
+ final ok =
+ await bind.mainSetPermanentPasswordWithResult(password: "");
+ if (!ok) {
+ setState(() {
+ errMsg0 = '${translate('Prompt')}: ${translate("Failed")}';
+ });
+ return;
+ }
+ close();
+ },
+ buttonStyle: ButtonStyle(
+ backgroundColor: MaterialStatePropertyAll(Colors.red)),
+ );
+ final okButton = dialogButton(
+ "OK",
+ icon: Icon(Icons.done_rounded),
+ onPressed: canSubmit ? submit : null,
+ );
+ if (!isDesktop && !isWebDesktop && localPasswordSet) {
+ return [
+ Align(
+ alignment: Alignment.centerRight,
+ child: FittedBox(
+ fit: BoxFit.scaleDown,
+ alignment: Alignment.centerRight,
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ cancelButton,
+ const SizedBox(width: 4),
+ removeButton,
+ const SizedBox(width: 4),
+ okButton,
+ ],
+ ),
+ ),
+ ),
+ ];
+ }
+ return [
+ cancelButton,
+ if (localPasswordSet) removeButton,
+ okButton,
+ ];
+ })(),
+ onSubmit: canSubmit ? submit : null,
onCancel: close,
);
});
diff --git a/flutter/lib/desktop/pages/desktop_setting_page.dart b/flutter/lib/desktop/pages/desktop_setting_page.dart
index b513bd4d9..d1d620014 100644
--- a/flutter/lib/desktop/pages/desktop_setting_page.dart
+++ b/flutter/lib/desktop/pages/desktop_setting_page.dart
@@ -458,28 +458,46 @@ class _GeneralState extends State<_General> {
return const Offstage();
}
- return _Card(title: 'Service', children: [
- Obx(() => _Button(serviceStop.value ? 'Start' : 'Stop', () {
- () async {
- serviceBtnEnabled.value = false;
- await start_service(serviceStop.value);
- // enable the button after 1 second
- Future.delayed(const Duration(seconds: 1), () {
- serviceBtnEnabled.value = true;
- });
- }();
- }, enabled: serviceBtnEnabled.value))
- ]);
+ final hideStopService =
+ bind.mainGetBuildinOption(key: kOptionHideStopService) == 'Y';
+
+ return Obx(() {
+ if (hideStopService && !serviceStop.value) {
+ return const Offstage();
+ }
+
+ return _Card(title: 'Service', children: [
+ _Button(serviceStop.value ? 'Start' : 'Stop', () {
+ () async {
+ serviceBtnEnabled.value = false;
+ await start_service(serviceStop.value);
+ // enable the button after 1 second
+ Future.delayed(const Duration(seconds: 1), () {
+ serviceBtnEnabled.value = true;
+ });
+ }();
+ }, enabled: serviceBtnEnabled.value)
+ ]);
+ });
}
Widget other() {
- final showAutoUpdate =
- isWindows && bind.mainIsInstalled() && !bind.isCustomClient();
+ final showAutoUpdate = isWindows && bind.mainIsInstalled();
final children = [
if (!isWeb && !bind.isIncomingOnly())
_OptionCheckBox(context, 'Confirm before closing multiple tabs',
kOptionEnableConfirmClosingTabs,
isServer: false),
+ if (!bind.isIncomingOnly())
+ _OptionCheckBox(
+ context,
+ 'allow-remote-toolbar-docking-any-edge',
+ kOptionAllowMultiEdgeToolbarDock,
+ isServer: false,
+ update: (_) {
+ reloadAllWindows();
+ },
+ ),
_OptionCheckBox(context, 'Adaptive bitrate', kOptionEnableAbr),
if (!isWeb) wallpaper(),
if (!isWeb && !bind.isIncomingOnly()) ...[
@@ -1054,6 +1072,10 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
_OptionCheckBox(context, 'Enable blocking user input',
kOptionEnableBlockInput,
enabled: enabled, fakeValue: fakeValue),
+ if (bind.mainSupportedPrivacyModeImpls() != '[]')
+ _OptionCheckBox(
+ context, 'Enable privacy mode', kOptionEnablePrivacyMode,
+ enabled: enabled, fakeValue: fakeValue),
_OptionCheckBox(context, 'Enable remote configuration modification',
kOptionAllowRemoteConfigModification,
enabled: enabled, fakeValue: fakeValue),
@@ -1101,8 +1123,9 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
if (value ==
passwordValues[passwordKeys
.indexOf(kUsePermanentPassword)] &&
- (await bind.mainGetPermanentPassword())
- .isEmpty) {
+ (await bind.mainGetCommon(
+ key: "permanent-password-set")) !=
+ "true") {
if (isChangePermanentPasswordDisabled()) {
await callback();
return;
@@ -2016,7 +2039,9 @@ class _AccountState extends State<_Account> {
Widget accountAction() {
return Obx(() => _Button(
- gFFI.userModel.userName.value.isEmpty ? 'Login' : 'Logout',
+ gFFI.userModel.userName.value.isEmpty
+ ? 'Login'
+ : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})',
() => {
gFFI.userModel.userName.value.isEmpty
? loginDialog()
@@ -2025,24 +2050,65 @@ class _AccountState extends State<_Account> {
}
Widget useInfo() {
- text(String key, String value) {
- return Align(
- alignment: Alignment.centerLeft,
- child: SelectionArea(child: Text('${translate(key)}: $value'))
- .marginSymmetric(vertical: 4),
- );
- }
-
return Obx(() => Offstage(
offstage: gFFI.userModel.userName.value.isEmpty,
- child: Column(
- children: [
- text('Username', gFFI.userModel.userName.value),
- // text('Group', gFFI.groupModel.groupName.value),
- ],
+ child: Container(
+ padding: const EdgeInsets.all(12),
+ decoration: BoxDecoration(
+ color: Theme.of(context).colorScheme.surfaceContainerHighest,
+ borderRadius: BorderRadius.circular(10),
+ ),
+ child: Builder(builder: (context) {
+ final avatarWidget = _buildUserAvatar();
+ return Row(
+ children: [
+ if (avatarWidget != null) avatarWidget,
+ const SizedBox(width: 12),
+ Expanded(
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ gFFI.userModel.displayNameOrUserName,
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ style: const TextStyle(
+ fontSize: 16,
+ fontWeight: FontWeight.w600,
+ ),
+ ),
+ const SizedBox(height: 2),
+ SelectionArea(
+ child: Text(
+ '@${gFFI.userModel.userName.value}',
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ style: TextStyle(
+ fontSize: 13,
+ color:
+ Theme.of(context).textTheme.bodySmall?.color,
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ ],
+ );
+ }),
),
)).marginOnly(left: 18, top: 16);
}
+
+ Widget? _buildUserAvatar() {
+ // Resolve relative avatar path at display time
+ final avatar =
+ bind.mainResolveAvatarUrl(avatar: gFFI.userModel.avatar.value);
+ return buildAvatarWidget(
+ avatar: avatar,
+ size: 44,
+ );
+ }
}
class _Checkbox extends StatefulWidget {
@@ -2130,7 +2196,9 @@ class _PluginState extends State<_Plugin> {
Widget accountAction() {
return Obx(() => _Button(
- gFFI.userModel.userName.value.isEmpty ? 'Login' : 'Logout',
+ gFFI.userModel.userName.value.isEmpty
+ ? 'Login'
+ : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})',
() => {
gFFI.userModel.userName.value.isEmpty
? loginDialog()
@@ -2538,6 +2606,49 @@ class WaylandCard extends StatefulWidget {
class _WaylandCardState extends State {
final restoreTokenKey = 'wayland-restore-token';
+ static const _kClearShortcutsInhibitorEventKey =
+ 'clear-gnome-shortcuts-inhibitor-permission-res';
+ final _clearShortcutsInhibitorFailedMsg = ''.obs;
+ // Don't show the shortcuts permission reset button for now.
+ // Users can change it manually:
+ // "Settings" -> "Apps" -> "RustDesk" -> "Permissions" -> "Inhibit Shortcuts".
+ // For resetting(clearing) the permission from the portal permission store, you can
+ // use (replace with the RustDesk desktop file ID):
+ // busctl --user call org.freedesktop.impl.portal.PermissionStore \
+ // /org/freedesktop/impl/portal/PermissionStore org.freedesktop.impl.portal.PermissionStore \
+ // DeletePermission sss "gnome" "shortcuts-inhibitor" ""
+ // On a native install this is typically "rustdesk.desktop"; on Flatpak it is usually
+ // the exported desktop ID derived from the Flatpak app-id (e.g. "com.rustdesk.RustDesk.desktop").
+ //
+ // We may add it back in the future if needed.
+ final showResetInhibitorPermission = false;
+
+ @override
+ void initState() {
+ super.initState();
+ if (showResetInhibitorPermission) {
+ platformFFI.registerEventHandler(
+ _kClearShortcutsInhibitorEventKey, _kClearShortcutsInhibitorEventKey,
+ (evt) async {
+ if (!mounted) return;
+ if (evt['success'] == true) {
+ setState(() {});
+ } else {
+ _clearShortcutsInhibitorFailedMsg.value =
+ evt['msg'] as String? ?? 'Unknown error';
+ }
+ });
+ }
+ }
+
+ @override
+ void dispose() {
+ if (showResetInhibitorPermission) {
+ platformFFI.unregisterEventHandler(
+ _kClearShortcutsInhibitorEventKey, _kClearShortcutsInhibitorEventKey);
+ }
+ super.dispose();
+ }
@override
Widget build(BuildContext context) {
@@ -2545,9 +2656,16 @@ class _WaylandCardState extends State {
future: bind.mainHandleWaylandScreencastRestoreToken(
key: restoreTokenKey, value: "get"),
hasData: (restoreToken) {
+ final hasShortcutsPermission = showResetInhibitorPermission &&
+ bind.mainGetCommonSync(
+ key: "has-gnome-shortcuts-inhibitor-permission") ==
+ "true";
+
final children = [
if (restoreToken.isNotEmpty)
_buildClearScreenSelection(context, restoreToken),
+ if (hasShortcutsPermission)
+ _buildClearShortcutsInhibitorPermission(context),
];
return Offstage(
offstage: children.isEmpty,
@@ -2592,6 +2710,50 @@ class _WaylandCardState extends State {
),
);
}
+
+ Widget _buildClearShortcutsInhibitorPermission(BuildContext context) {
+ onConfirm() {
+ _clearShortcutsInhibitorFailedMsg.value = '';
+ bind.mainSetCommon(
+ key: "clear-gnome-shortcuts-inhibitor-permission", value: "");
+ gFFI.dialogManager.dismissAll();
+ }
+
+ showConfirmMsgBox() => msgBoxCommon(
+ gFFI.dialogManager,
+ 'Confirmation',
+ Text(
+ translate('confirm-clear-shortcuts-inhibitor-permission-tip'),
+ ),
+ [
+ dialogButton('OK', onPressed: onConfirm),
+ dialogButton('Cancel',
+ onPressed: () => gFFI.dialogManager.dismissAll())
+ ]);
+
+ return Column(children: [
+ Obx(
+ () => _clearShortcutsInhibitorFailedMsg.value.isEmpty
+ ? Offstage()
+ : Align(
+ alignment: Alignment.topLeft,
+ child: Text(_clearShortcutsInhibitorFailedMsg.value,
+ style: DefaultTextStyle.of(context)
+ .style
+ .copyWith(color: Colors.red))
+ .marginOnly(bottom: 10.0)),
+ ),
+ _Button(
+ 'Reset keyboard shortcuts permission',
+ showConfirmMsgBox,
+ tip: 'clear-shortcuts-inhibitor-permission-tip',
+ style: ButtonStyle(
+ backgroundColor: MaterialStateProperty.all(
+ Theme.of(context).colorScheme.error.withOpacity(0.75)),
+ ),
+ ),
+ ]);
+ }
}
// ignore: non_constant_identifier_names
diff --git a/flutter/lib/desktop/pages/server_page.dart b/flutter/lib/desktop/pages/server_page.dart
index 4ee29756f..8bd7df08b 100644
--- a/flutter/lib/desktop/pages/server_page.dart
+++ b/flutter/lib/desktop/pages/server_page.dart
@@ -462,23 +462,7 @@ class _CmHeaderState extends State<_CmHeader>
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- Container(
- width: 70,
- height: 70,
- alignment: Alignment.center,
- decoration: BoxDecoration(
- color: str2color(client.name),
- borderRadius: BorderRadius.circular(15.0),
- ),
- child: Text(
- client.name[0],
- style: TextStyle(
- fontWeight: FontWeight.bold,
- color: Colors.white,
- fontSize: 55,
- ),
- ),
- ).marginOnly(right: 10.0),
+ _buildClientAvatar().marginOnly(right: 10.0),
Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
@@ -582,6 +566,36 @@ class _CmHeaderState extends State<_CmHeader>
@override
bool get wantKeepAlive => true;
+
+ Widget _buildClientAvatar() {
+ return buildAvatarWidget(
+ avatar: client.avatar,
+ size: 70,
+ borderRadius: 15,
+ fallback: _buildInitialAvatar(),
+ ) ??
+ _buildInitialAvatar();
+ }
+
+ Widget _buildInitialAvatar() {
+ return Container(
+ width: 70,
+ height: 70,
+ alignment: Alignment.center,
+ decoration: BoxDecoration(
+ color: str2color(client.name),
+ borderRadius: BorderRadius.circular(15.0),
+ ),
+ child: Text(
+ client.name.isNotEmpty ? client.name[0] : '?',
+ style: TextStyle(
+ fontWeight: FontWeight.bold,
+ color: Colors.white,
+ fontSize: 55,
+ ),
+ ),
+ );
+ }
}
class _PrivilegeBoard extends StatefulWidget {
@@ -596,19 +610,24 @@ class _PrivilegeBoard extends StatefulWidget {
class _PrivilegeBoardState extends State<_PrivilegeBoard> {
late final client = widget.client;
Widget buildPermissionIcon(bool enabled, IconData iconData,
- Function(bool)? onTap, String tooltipText) {
+ Function(bool)? onTap, String tooltipText,
+ {required bool canModify}) {
return Tooltip(
message: "$tooltipText: ${enabled ? "ON" : "OFF"}",
waitDuration: Duration.zero,
child: Container(
decoration: BoxDecoration(
- color: enabled ? MyTheme.accent : Colors.grey[700],
+ color: enabled
+ ? (canModify ? MyTheme.accent : MyTheme.accent.withOpacity(0.6))
+ : Colors.grey[700],
borderRadius: BorderRadius.circular(10.0),
),
padding: EdgeInsets.all(8.0),
child: InkWell(
- onTap: () =>
- checkClickTime(widget.client.id, () => onTap?.call(!enabled)),
+ onTap: canModify
+ ? () =>
+ checkClickTime(widget.client.id, () => onTap?.call(!enabled))
+ : null,
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
@@ -629,6 +648,9 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
Widget build(BuildContext context) {
final crossAxisCount = 4;
final spacing = 10.0;
+ final canModifyPermission =
+ bind.mainGetBuildinOption(key: kOptionEnablePermChangeInAcceptWindow) !=
+ 'N';
return Container(
width: double.infinity,
height: 160.0,
@@ -675,6 +697,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
});
},
translate('Enable audio'),
+ canModify: canModifyPermission,
),
buildPermissionIcon(
client.recording,
@@ -689,6 +712,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
});
},
translate('Enable recording session'),
+ canModify: canModifyPermission,
),
]
: [
@@ -705,6 +729,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
});
},
translate('Enable keyboard/mouse'),
+ canModify: canModifyPermission,
),
buildPermissionIcon(
client.clipboard,
@@ -719,6 +744,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
});
},
translate('Enable clipboard'),
+ canModify: canModifyPermission,
),
buildPermissionIcon(
client.audio,
@@ -733,6 +759,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
});
},
translate('Enable audio'),
+ canModify: canModifyPermission,
),
buildPermissionIcon(
client.file,
@@ -747,6 +774,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
});
},
translate('Enable file copy and paste'),
+ canModify: canModifyPermission,
),
buildPermissionIcon(
client.restart,
@@ -761,6 +789,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
});
},
translate('Enable remote restart'),
+ canModify: canModifyPermission,
),
buildPermissionIcon(
client.recording,
@@ -775,6 +804,7 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
});
},
translate('Enable recording session'),
+ canModify: canModifyPermission,
),
// only windows support block input
if (isWindows)
@@ -791,6 +821,23 @@ class _PrivilegeBoardState extends State<_PrivilegeBoard> {
});
},
translate('Enable blocking user input'),
+ canModify: canModifyPermission,
+ ),
+ if (bind.mainSupportedPrivacyModeImpls() != '[]')
+ buildPermissionIcon(
+ client.privacyMode,
+ Icons.visibility_off,
+ (enabled) {
+ bind.cmSwitchPermission(
+ connId: client.id,
+ name: "privacy_mode",
+ enabled: enabled);
+ setState(() {
+ client.privacyMode = enabled;
+ });
+ },
+ translate('Enable privacy mode'),
+ canModify: canModifyPermission,
)
],
),
diff --git a/flutter/lib/desktop/pages/terminal_page.dart b/flutter/lib/desktop/pages/terminal_page.dart
index 17bd86eef..d38dc4a8b 100644
--- a/flutter/lib/desktop/pages/terminal_page.dart
+++ b/flutter/lib/desktop/pages/terminal_page.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_hbb/common.dart';
@@ -15,6 +16,7 @@ class TerminalPage extends StatefulWidget {
required this.tabController,
required this.isSharedPassword,
required this.terminalId,
+ required this.tabKey,
this.forceRelay,
this.connToken,
}) : super(key: key);
@@ -25,6 +27,9 @@ 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?> _lastState = SimpleWrapper(null);
FFI get ffi => (_lastState.value! as _TerminalPageState)._ffi;
@@ -39,14 +44,22 @@ class TerminalPage extends StatefulWidget {
class _TerminalPageState extends State
with AutomaticKeepAliveClientMixin {
+ static const EdgeInsets _defaultTerminalPadding =
+ EdgeInsets.symmetric(horizontal: 5.0, vertical: 2.0);
+
late FFI _ffi;
late TerminalModel _terminalModel;
double? _cellHeight;
+ final FocusNode _terminalFocusNode = FocusNode(canRequestFocus: false);
+ StreamSubscription? _tabStateSubscription;
@override
void initState() {
super.initState();
+ // Listen for tab selection changes to request focus
+ _tabStateSubscription = widget.tabController.state.listen(_onTabStateChanged);
+
// Use shared FFI instance from connection manager
_ffi = TerminalConnectionManager.getConnection(
peerId: widget.id,
@@ -64,6 +77,13 @@ class _TerminalPageState extends State
_terminalModel.onResizeExternal = (w, h, pw, ph) {
_cellHeight = ph * 1.0;
+ // Enable focus once terminal has valid dimensions (first valid resize)
+ if (!_terminalFocusNode.canRequestFocus && w > 0 && h > 0) {
+ _terminalFocusNode.canRequestFocus = true;
+ // Auto-focus if this tab is currently selected
+ _requestFocusIfSelected();
+ }
+
// Schedule the setState for the next frame
WidgetsBinding.instance.addPostFrameCallback((_) {
if (mounted) {
@@ -99,25 +119,67 @@ class _TerminalPageState extends State
@override
void dispose() {
+ // Cancel tab state subscription to prevent memory leak
+ _tabStateSubscription?.cancel();
// Unregister terminal model from FFI
_ffi.unregisterTerminalModel(widget.terminalId);
_terminalModel.dispose();
+ _terminalFocusNode.dispose();
// Release connection reference instead of closing directly
TerminalConnectionManager.releaseConnection(widget.id);
super.dispose();
}
+ void _onTabStateChanged(DesktopTabState state) {
+ // Check if this tab is now selected and request focus
+ if (state.selected >= 0 && state.selected < state.tabs.length) {
+ final selectedTab = state.tabs[state.selected];
+ if (selectedTab.key == widget.tabKey && mounted) {
+ _requestFocusIfSelected();
+ }
+ }
+ }
+
+ void _requestFocusIfSelected() {
+ if (!mounted || !_terminalFocusNode.canRequestFocus) return;
+ // Use post-frame callback to ensure widget is fully laid out in focus tree
+ WidgetsBinding.instance.addPostFrameCallback((_) {
+ // Re-check conditions after frame: mounted, focusable, still selected, not already focused
+ if (!mounted || !_terminalFocusNode.canRequestFocus || _terminalFocusNode.hasFocus) return;
+ final state = widget.tabController.state.value;
+ if (state.selected >= 0 && state.selected < state.tabs.length) {
+ if (state.tabs[state.selected].key == widget.tabKey) {
+ _terminalFocusNode.requestFocus();
+ }
+ }
+ });
+ }
+
// This method ensures that the number of visible rows is an integer by computing the
// 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
@@ -131,7 +193,9 @@ class _TerminalPageState extends State
return TerminalView(
_terminalModel.terminal,
controller: _terminalModel.terminalController,
- autofocus: true,
+ focusNode: _terminalFocusNode,
+ // Note: autofocus is not used here because focus is managed manually
+ // via _onTabStateChanged() to handle tab switching properly.
backgroundOpacity: 0.7,
padding: _calculatePadding(heightPx),
onSecondaryTapDown: (details, offset) async {
diff --git a/flutter/lib/desktop/pages/terminal_tab_page.dart b/flutter/lib/desktop/pages/terminal_tab_page.dart
index e06dee321..63289e94d 100644
--- a/flutter/lib/desktop/pages/terminal_tab_page.dart
+++ b/flutter/lib/desktop/pages/terminal_tab_page.dart
@@ -34,6 +34,10 @@ class _TerminalTabPageState extends State {
static const IconData selectedIcon = Icons.terminal;
static const IconData unselectedIcon = Icons.terminal_outlined;
int _nextTerminalId = 1;
+ // Lightweight idempotency guard for async close operations
+ final Set _closingTabs = {};
+ // When true, all session cleanup should persist (window-level close in progress)
+ bool _windowClosing = false;
_TerminalTabPageState(Map params) {
Get.put(DesktopTabController(tabType: DesktopTabType.terminal));
@@ -42,6 +46,7 @@ class _TerminalTabPageState extends State {
.setTitle(getWindowNameWithId(id));
};
tabController.onRemoved = (_, id) => onRemoveId(id);
+ tabController.onCloseWindow = _closeWindowFromConnection;
final terminalId = params['terminalId'] ?? _nextTerminalId++;
tabController.add(_createTerminalTab(
peerId: params['id'],
@@ -70,28 +75,12 @@ class _TerminalTabPageState extends State {
label: tabLabel,
selectedIcon: selectedIcon,
unselectedIcon: unselectedIcon,
- onTabCloseButton: () async {
- if (await desktopTryShowTabAuditDialogCloseCancelled(
- id: tabKey,
- tabController: tabController,
- )) {
- return;
- }
- // Close the terminal session first
- final ffi = TerminalConnectionManager.getExistingConnection(peerId);
- if (ffi != null) {
- final terminalModel = ffi.terminalModels[terminalId];
- if (terminalModel != null) {
- await terminalModel.closeTerminal();
- }
- }
- // Then close the tab
- tabController.closeBy(tabKey);
- },
+ onTabCloseButton: () => _closeTab(tabKey),
page: TerminalPage(
key: ValueKey(tabKey),
id: peerId,
terminalId: terminalId,
+ tabKey: tabKey,
password: password,
isSharedPassword: isSharedPassword,
tabController: tabController,
@@ -101,6 +90,161 @@ class _TerminalTabPageState extends State {
);
}
+ /// Unified tab close handler for all close paths (button, shortcut, programmatic).
+ /// Shows audit dialog, cleans up session if not persistent, then removes the UI tab.
+ Future _closeTab(String tabKey) async {
+ // Idempotency guard: skip if already closing this tab
+ if (_closingTabs.contains(tabKey)) return;
+ _closingTabs.add(tabKey);
+
+ try {
+ // Snapshot peerTabCount BEFORE any await to avoid race with concurrent
+ // _closeAllTabs clearing tabController (which would make the live count
+ // drop to 0 and incorrectly trigger session persistence).
+ // Note: the snapshot may become stale if other individual tabs are closed
+ // during the audit dialog, but this is an acceptable trade-off.
+ int? snapshotPeerTabCount;
+ final parsed = _parseTabKey(tabKey);
+ if (parsed != null) {
+ final (peerId, _) = parsed;
+ snapshotPeerTabCount = tabController.state.value.tabs.where((t) {
+ final p = _parseTabKey(t.key);
+ return p != null && p.$1 == peerId;
+ }).length;
+ }
+
+ if (await desktopTryShowTabAuditDialogCloseCancelled(
+ id: tabKey,
+ tabController: tabController,
+ )) {
+ return;
+ }
+
+ // Close terminal session if not in persistent mode.
+ // Wrapped separately so session cleanup failure never blocks UI tab removal.
+ try {
+ await _closeTerminalSessionIfNeeded(tabKey,
+ peerTabCount: snapshotPeerTabCount);
+ } catch (e) {
+ debugPrint('[TerminalTabPage] Session cleanup failed for $tabKey: $e');
+ }
+ // Always close the tab from UI, regardless of session cleanup result
+ tabController.closeBy(tabKey);
+ } catch (e) {
+ debugPrint('[TerminalTabPage] Error closing tab $tabKey: $e');
+ } finally {
+ _closingTabs.remove(tabKey);
+ }
+ }
+
+ /// Close all tabs with session cleanup.
+ /// Used for window-level close operations (onDestroy, handleWindowCloseButton).
+ /// UI tabs are removed immediately; session cleanup runs in parallel with a
+ /// bounded timeout so window close is not blocked indefinitely.
+ Future _closeAllTabs() async {
+ _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.
+ final futures = tabKeys
+ .where((tabKey) => !_closingTabs.contains(tabKey))
+ .map((tabKey) async {
+ try {
+ await _closeTerminalSessionIfNeeded(tabKey, persistAll: true);
+ } catch (e) {
+ debugPrint('[TerminalTabPage] Session cleanup failed for $tabKey: $e');
+ }
+ }).toList();
+ if (futures.isNotEmpty) {
+ await Future.wait(futures).timeout(
+ const Duration(seconds: 4),
+ onTimeout: () {
+ debugPrint(
+ '[TerminalTabPage] Session cleanup timed out for batch close');
+ return [];
+ },
+ );
+ }
+ }
+
+ /// Close the terminal session on server side based on persistent mode.
+ ///
+ /// [persistAll] controls behavior when persistent mode is enabled:
+ /// - `true` (window close): persist all sessions, don't close any.
+ /// - `false` (tab close): only persist the last session for the peer,
+ /// close others so only the most recent disconnected session survives.
+ ///
+ /// Note: if [_windowClosing] is true, persistAll is forced to true so that
+ /// in-flight _closeTab() calls don't accidentally close sessions that the
+ /// window-close flow intends to preserve.
+ Future _closeTerminalSessionIfNeeded(String tabKey,
+ {bool persistAll = false, int? peerTabCount}) async {
+ // If window close is in progress, override to persist all sessions
+ // even if this call originated from an individual tab close.
+ if (_windowClosing) {
+ persistAll = true;
+ }
+ final parsed = _parseTabKey(tabKey);
+ if (parsed == null) return;
+ final (peerId, terminalId) = parsed;
+
+ final ffi = TerminalConnectionManager.getExistingConnection(peerId);
+ if (ffi == null) return;
+
+ final isPersistent = bind.sessionGetToggleOptionSync(
+ sessionId: ffi.sessionId,
+ arg: kOptionTerminalPersistent,
+ );
+
+ if (isPersistent) {
+ if (persistAll) {
+ // Window close: persist all sessions
+ return;
+ }
+ // Tab close: only persist if this is the last tab for this peer.
+ // Use the snapshot value if provided (avoids race with concurrent tab removal).
+ final effectivePeerTabCount = peerTabCount ??
+ tabController.state.value.tabs.where((t) {
+ final p = _parseTabKey(t.key);
+ return p != null && p.$1 == peerId;
+ }).length;
+ if (effectivePeerTabCount <= 1) {
+ // Last tab for this peer — persist the session
+ return;
+ }
+ // Not the last tab — fall through to close the session
+ }
+
+ final terminalModel = ffi.terminalModels[terminalId];
+ if (terminalModel != null) {
+ // closeTerminal() has internal 3s timeout, no need for external timeout
+ await terminalModel.closeTerminal();
+ }
+ }
+
+ /// Parse tabKey (format: "peerId_terminalId") into its components.
+ /// Note: peerId may contain underscores, so we use lastIndexOf('_').
+ /// Returns null if tabKey format is invalid.
+ (String peerId, int terminalId)? _parseTabKey(String tabKey) {
+ final lastUnderscore = tabKey.lastIndexOf('_');
+ if (lastUnderscore <= 0) {
+ debugPrint('[TerminalTabPage] Invalid tabKey format: $tabKey');
+ return null;
+ }
+ final terminalIdStr = tabKey.substring(lastUnderscore + 1);
+ final terminalId = int.tryParse(terminalIdStr);
+ if (terminalId == null) {
+ debugPrint('[TerminalTabPage] Invalid terminalId in tabKey: $tabKey');
+ return null;
+ }
+ final peerId = tabKey.substring(0, lastUnderscore);
+ return (peerId, terminalId);
+ }
+
Widget _tabMenuBuilder(String peerId, CancelFunc cancelFunc) {
final List> menu = [];
const EdgeInsets padding = EdgeInsets.only(left: 8.0, right: 5.0);
@@ -184,7 +328,8 @@ class _TerminalTabPageState extends State {
} else if (call.method == kWindowEventRestoreTerminalSessions) {
_restoreSessions(call.arguments);
} else if (call.method == "onDestroy") {
- tabController.clear();
+ // Clean up sessions before window destruction (bounded wait)
+ await _closeAllTabs();
} else if (call.method == kWindowActionRebuild) {
reloadCurrentWindow();
} else if (call.method == kWindowEventActiveSession) {
@@ -194,7 +339,10 @@ class _TerminalTabPageState extends State {
final currentTab = tabController.state.value.selectedTabInfo;
assert(call.arguments is String,
"Expected String arguments for kWindowEventActiveSession, got ${call.arguments.runtimeType}");
- if (currentTab.key.startsWith(call.arguments)) {
+ // Use lastIndexOf to handle peerIds containing underscores
+ final lastUnderscore = currentTab.key.lastIndexOf('_');
+ if (lastUnderscore > 0 &&
+ currentTab.key.substring(0, lastUnderscore) == call.arguments) {
windowOnTop(windowId());
return true;
}
@@ -223,8 +371,34 @@ class _TerminalTabPageState extends State {
final persistentSessions =
args['persistent_sessions'] as List? ?? [];
final sortedSessions = persistentSessions.whereType().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.
@@ -265,7 +439,7 @@ class _TerminalTabPageState extends State {
// macOS: Cmd+W (standard for close tab)
final currentTab = tabController.state.value.selectedTabInfo;
if (tabController.state.value.tabs.length > 1) {
- tabController.closeBy(currentTab.key);
+ _closeTab(currentTab.key);
return true;
}
} else if (!isMacOS &&
@@ -274,7 +448,7 @@ class _TerminalTabPageState extends State {
// Other platforms: Ctrl+Shift+W (to avoid conflict with Ctrl+W word delete)
final currentTab = tabController.state.value.selectedTabInfo;
if (tabController.state.value.tabs.length > 1) {
- tabController.closeBy(currentTab.key);
+ _closeTab(currentTab.key);
return true;
}
}
@@ -329,7 +503,10 @@ class _TerminalTabPageState extends State {
void _addNewTerminal(String peerId, {int? terminalId}) {
// Find first tab for this peer to get connection parameters
final firstTab = tabController.state.value.tabs.firstWhere(
- (tab) => tab.key.startsWith('$peerId\_'),
+ (tab) {
+ final last = tab.key.lastIndexOf('_');
+ return last > 0 && tab.key.substring(0, last) == peerId;
+ },
);
if (firstTab.page is TerminalPage) {
final page = firstTab.page as TerminalPage;
@@ -350,11 +527,10 @@ class _TerminalTabPageState extends State {
void _addNewTerminalForCurrentPeer({int? terminalId}) {
final currentTab = tabController.state.value.selectedTabInfo;
- final parts = currentTab.key.split('_');
- if (parts.isNotEmpty) {
- final peerId = parts[0];
- _addNewTerminal(peerId, terminalId: terminalId);
- }
+ final parsed = _parseTabKey(currentTab.key);
+ if (parsed == null) return;
+ final (peerId, _) = parsed;
+ _addNewTerminal(peerId, terminalId: terminalId);
}
@override
@@ -368,10 +544,9 @@ class _TerminalTabPageState extends State {
selectedBorderColor: MyTheme.accent,
labelGetter: DesktopTab.tablabelGetter,
tabMenuBuilder: (key) {
- // Extract peerId from tab key (format: "peerId_terminalId")
- final parts = key.split('_');
- if (parts.isEmpty) return Container();
- final peerId = parts[0];
+ final parsed = _parseTabKey(key);
+ if (parsed == null) return Container();
+ final (peerId, _) = parsed;
return _tabMenuBuilder(peerId, () {});
},
));
@@ -400,6 +575,11 @@ class _TerminalTabPageState extends State {
}
}
+ Future _closeWindowFromConnection() async {
+ await _closeAllTabs();
+ await WindowController.fromWindowId(windowId()).close();
+ }
+
int windowId() {
return widget.params["windowId"];
}
@@ -426,7 +606,7 @@ class _TerminalTabPageState extends State {
}
}
if (connLength <= 1) {
- tabController.clear();
+ await _closeAllTabs();
return true;
} else {
final bool res;
@@ -437,7 +617,7 @@ class _TerminalTabPageState extends State {
res = await closeConfirmDialog();
}
if (res) {
- tabController.clear();
+ await _closeAllTabs();
}
return res;
}
diff --git a/flutter/lib/desktop/widgets/remote_toolbar.dart b/flutter/lib/desktop/widgets/remote_toolbar.dart
index 8146e0d6f..44a2dc1c7 100644
--- a/flutter/lib/desktop/widgets/remote_toolbar.dart
+++ b/flutter/lib/desktop/widgets/remote_toolbar.dart
@@ -28,6 +28,220 @@ import './kb_layout_type_chooser.dart';
import 'package:flutter_hbb/utils/scale.dart';
import 'package:flutter_hbb/common/widgets/custom_scale_base.dart';
+enum _ToolbarEdge { top, right, bottom, left }
+
+_ToolbarEdge _parseToolbarEdge(String? s) {
+ switch (s) {
+ case 'right':
+ return _ToolbarEdge.right;
+ case 'bottom':
+ return _ToolbarEdge.bottom;
+ case 'left':
+ return _ToolbarEdge.left;
+ default:
+ return _ToolbarEdge.top;
+ }
+}
+
+String _toolbarEdgeToString(_ToolbarEdge e) {
+ switch (e) {
+ case _ToolbarEdge.top:
+ return 'top';
+ case _ToolbarEdge.right:
+ return 'right';
+ case _ToolbarEdge.bottom:
+ return 'bottom';
+ case _ToolbarEdge.left:
+ return 'left';
+ }
+}
+
+bool _isHorizontalEdge(_ToolbarEdge e) =>
+ e == _ToolbarEdge.top || e == _ToolbarEdge.bottom;
+
+const _legacyRemoteMenubarDragX = 'remote-menubar-drag-x';
+
+double _clampToolbarFraction(double fraction, double left, double right) {
+ if (fraction < left) fraction = left;
+ if (fraction > right) fraction = right;
+ return fraction;
+}
+
+Size _toolbarSizeForEdge(_ToolbarEdge edge, Size? measured) {
+ final isHorizontal = _isHorizontalEdge(edge);
+ final fallback = isHorizontal ? const Size(360, 40) : const Size(40, 360);
+ final size = measured ?? fallback;
+ final long = size.longestSide;
+ final short = size.shortestSide;
+ return Size(isHorizontal ? long : short, isHorizontal ? short : long);
+}
+
+Offset _toolbarOffsetForEdge({
+ required _ToolbarEdge edge,
+ required double fraction,
+ required Size parentSize,
+ required Size toolbarSize,
+}) {
+ final xTravel = parentSize.width - toolbarSize.width;
+ final yTravel = parentSize.height - toolbarSize.height;
+ switch (edge) {
+ case _ToolbarEdge.top:
+ return Offset(xTravel * fraction, 0);
+ case _ToolbarEdge.bottom:
+ return Offset(xTravel * fraction, yTravel);
+ case _ToolbarEdge.left:
+ return Offset(0, yTravel * fraction);
+ case _ToolbarEdge.right:
+ return Offset(xTravel, yTravel * fraction);
+ }
+}
+
+double _fractionForAlignedDrag({
+ required double cursor,
+ required double grabOffset,
+ required double parentExtent,
+ required double toolbarExtent,
+ required double left,
+ required double right,
+}) {
+ final travelExtent = parentExtent - toolbarExtent;
+ if (travelExtent <= 0) {
+ return _clampToolbarFraction(0.5, left, right);
+ }
+ return _clampToolbarFraction(
+ (cursor - grabOffset) / travelExtent, left, right);
+}
+
+({double left, double right}) _fractionBoundsForEdge(
+ _ToolbarEdge edge,
+ double left,
+ double right,
+) {
+ return _isHorizontalEdge(edge)
+ ? (left: left, right: right)
+ : (left: 0, right: 1);
+}
+
+String _toolbarRawFraction({
+ required bool multiEdgeEnabled,
+ required _ToolbarEdge edge,
+ required String? savedFraction,
+ required String? legacyFraction,
+}) {
+ if (!multiEdgeEnabled) {
+ return (legacyFraction != null && legacyFraction.isNotEmpty)
+ ? legacyFraction
+ : '0.5';
+ }
+ if (savedFraction != null && savedFraction.isNotEmpty) {
+ return savedFraction;
+ }
+ if (edge == _ToolbarEdge.top &&
+ legacyFraction != null &&
+ legacyFraction.isNotEmpty) {
+ return legacyFraction;
+ }
+ return '0.5';
+}
+
+// Returns the alignment for the wrapper Align that positions the entire
+// toolbar against the given edge at the given fraction along that edge.
+// Alignment uses [-1, 1] coordinates (0 = center).
+Alignment _alignmentForEdge(_ToolbarEdge edge, double fraction) {
+ final f = fraction * 2 - 1;
+ switch (edge) {
+ case _ToolbarEdge.top:
+ return Alignment(f, -1);
+ case _ToolbarEdge.bottom:
+ return Alignment(f, 1);
+ case _ToolbarEdge.left:
+ return Alignment(-1, f);
+ case _ToolbarEdge.right:
+ return Alignment(1, f);
+ }
+}
+
+// The drag handle hangs off the side of the toolbar facing away from the
+// docked edge, so the icons themselves sit flush against that edge.
+BorderRadius _collapseHandleBorderRadius(_ToolbarEdge edge) {
+ const r = Radius.circular(5);
+ switch (edge) {
+ case _ToolbarEdge.top:
+ return const BorderRadius.vertical(bottom: r);
+ case _ToolbarEdge.bottom:
+ return const BorderRadius.vertical(top: r);
+ case _ToolbarEdge.left:
+ return const BorderRadius.horizontal(right: r);
+ case _ToolbarEdge.right:
+ return const BorderRadius.horizontal(left: r);
+ }
+}
+
+int _monitorMenuQuarterTurns(_ToolbarEdge edge) {
+ switch (edge) {
+ case _ToolbarEdge.left:
+ return 1;
+ case _ToolbarEdge.right:
+ return 3;
+ case _ToolbarEdge.top:
+ case _ToolbarEdge.bottom:
+ return 0;
+ }
+}
+
+IconData _toolbarCollapseIcon(_ToolbarEdge edge, bool isCollapsed) {
+ switch (edge) {
+ case _ToolbarEdge.top:
+ return isCollapsed ? Icons.expand_more : Icons.expand_less;
+ case _ToolbarEdge.bottom:
+ return isCollapsed ? Icons.expand_less : Icons.expand_more;
+ case _ToolbarEdge.left:
+ return isCollapsed ? Icons.chevron_right : Icons.chevron_left;
+ case _ToolbarEdge.right:
+ return isCollapsed ? Icons.chevron_left : Icons.chevron_right;
+ }
+}
+
+class _ToolbarDockingOptions {
+ _ToolbarDockingOptions({
+ required this.edge,
+ required this.fraction,
+ required this.multiEdgeEnabled,
+ });
+
+ _ToolbarEdge edge;
+ double fraction;
+ bool multiEdgeEnabled;
+}
+
+final _toolbarDockingOptionsBySession = {};
+
+String _toolbarDockingCacheKey(SessionID sessionId) => sessionId.toString();
+
+_ToolbarDockingOptions? _cachedToolbarDockingOptions(SessionID sessionId) =>
+ _toolbarDockingOptionsBySession[_toolbarDockingCacheKey(sessionId)];
+
+void _cacheToolbarDockingOptions({
+ required SessionID sessionId,
+ required _ToolbarEdge edge,
+ required double fraction,
+ required bool multiEdgeEnabled,
+}) {
+ final key = _toolbarDockingCacheKey(sessionId);
+ final cached = _toolbarDockingOptionsBySession[key];
+ if (cached == null) {
+ _toolbarDockingOptionsBySession[key] = _ToolbarDockingOptions(
+ edge: edge,
+ fraction: fraction,
+ multiEdgeEnabled: multiEdgeEnabled,
+ );
+ return;
+ }
+ cached.edge = edge;
+ cached.fraction = fraction;
+ cached.multiEdgeEnabled = multiEdgeEnabled;
+}
+
class ToolbarState {
late RxBool _pin;
@@ -250,8 +464,26 @@ class RemoteToolbar extends StatefulWidget {
class _RemoteToolbarState extends State {
late Debouncer _debouncerHide;
bool _isCursorOverImage = false;
- final _fractionX = 0.5.obs;
+ final _fraction = 0.5.obs;
+ final _edge = _ToolbarEdge.top.obs;
final _dragging = false.obs;
+ // Live drag preview: where the toolbar would dock if the user dropped now.
+ final _previewEdge = Rxn<_ToolbarEdge>();
+ final _previewFraction = Rxn();
+ // Measured size of the live toolbar, so the preview ghost matches reality
+ // (collapsed handle vs expanded toolbar). Updated after every layout pass.
+ final _toolbarSize = Rxn();
+ final _toolbarKey = GlobalKey(debugLabel: 'remote_toolbar_root');
+ // When false (default), the toolbar stays on the top edge and the drag
+ // handle just slides it horizontally — preserving long-standing UX while
+ // still fixing the bug where dragging only moved the handle. When true,
+ // the user has opted into multi-edge docking with nearest-edge snap.
+ // Kept in sync after settings-triggered rebuilds.
+ final _multiEdgeEnabled = false.obs;
+ final _dockingOptionsInitialized = false.obs;
+ bool _pendingDockingOptionSync = false;
+ int _dockingOptionSyncSerial = 0;
+ int _dragEpoch = 0;
int get windowId => stateGlobal.windowId;
@@ -273,16 +505,144 @@ class _RemoteToolbarState extends State {
void _minimize() async =>
await WindowController.fromWindowId(windowId).minimize();
+ Future _syncDockingOptions({required bool force}) async {
+ final syncSerial = ++_dockingOptionSyncSerial;
+ if (_dragging.isTrue) {
+ _deferDockingOptionsSync();
+ return;
+ }
+ final dragEpoch = _dragEpoch;
+
+ // Use the canonical helper so the option's documented default semantics
+ // apply (allow-* prefix => default false). Keeping it raw-string would
+ // diverge from how _OptionCheckBox displays the same key.
+ final multiEdgeEnabled =
+ mainGetLocalBoolOptionSync(kOptionAllowMultiEdgeToolbarDock);
+ final cached = _cachedToolbarDockingOptions(widget.ffi.sessionId);
+ if (cached == null && pi.isSet.isFalse) {
+ return;
+ }
+ final hadDockingOptions = cached != null;
+ final wasMultiEdgeEnabled =
+ cached?.multiEdgeEnabled ?? _multiEdgeEnabled.value;
+ if (!force &&
+ hadDockingOptions &&
+ wasMultiEdgeEnabled == multiEdgeEnabled) {
+ _pendingDockingOptionSync = false;
+ return;
+ }
+
+ final savedFraction = await bind.sessionGetOption(
+ sessionId: widget.ffi.sessionId, arg: kOptionRemoteMenubarFraction);
+ // Backward compat: legacy horizontal-only position.
+ final legacyFraction = await bind.sessionGetOption(
+ sessionId: widget.ffi.sessionId, arg: _legacyRemoteMenubarDragX);
+ if (!mounted || syncSerial != _dockingOptionSyncSerial) return;
+
+ var nextEdge = _edge.value;
+ var savedFractionForNextEdge = savedFraction;
+ var keepCurrentPosition = false;
+ if (!multiEdgeEnabled) {
+ nextEdge = _ToolbarEdge.top;
+ } else if (force || wasMultiEdgeEnabled || cached == null) {
+ final edgeStr = await bind.sessionGetOption(
+ sessionId: widget.ffi.sessionId, arg: kOptionRemoteMenubarEdge);
+ if (!mounted || syncSerial != _dockingOptionSyncSerial) return;
+ nextEdge = _parseToolbarEdge(edgeStr);
+ } else {
+ // The setting changed from top-only to multi-edge while this toolbar is
+ // already visible. Keep its current position instead of jumping to the
+ // last saved multi-edge dock.
+ nextEdge = cached.edge;
+ savedFractionForNextEdge = cached.fraction.toString();
+ keepCurrentPosition = true;
+ }
+
+ final rawFraction = _toolbarRawFraction(
+ multiEdgeEnabled: multiEdgeEnabled,
+ edge: nextEdge,
+ savedFraction: savedFractionForNextEdge,
+ legacyFraction: legacyFraction,
+ );
+ // Clamp to the saved drag-bound contract so a corrupted or out-of-range
+ // saved value can't bypass it until the user drags again.
+ final dragLeft = double.tryParse(
+ bind.mainGetLocalOption(key: kOptionRemoteMenubarDragLeft)) ??
+ 0.0;
+ final dragRight = double.tryParse(
+ bind.mainGetLocalOption(key: kOptionRemoteMenubarDragRight)) ??
+ 1.0;
+ final fractionBounds =
+ _fractionBoundsForEdge(nextEdge, dragLeft, dragRight);
+ final nextFraction = (double.tryParse(rawFraction) ?? 0.5)
+ .clamp(fractionBounds.left, fractionBounds.right)
+ .toDouble();
+ if (!mounted || syncSerial != _dockingOptionSyncSerial) return;
+ if (_dragging.isTrue || dragEpoch != _dragEpoch) {
+ _deferDockingOptionsSync();
+ return;
+ }
+ _edge.value = nextEdge;
+ _fraction.value = nextFraction;
+ _multiEdgeEnabled.value = multiEdgeEnabled;
+ _dockingOptionsInitialized.value = true;
+ _cacheToolbarDockingOptions(
+ sessionId: widget.ffi.sessionId,
+ edge: nextEdge,
+ fraction: nextFraction,
+ multiEdgeEnabled: multiEdgeEnabled,
+ );
+ _pendingDockingOptionSync = false;
+ if (!multiEdgeEnabled || keepCurrentPosition) {
+ bind.sessionPeerOption(
+ sessionId: widget.ffi.sessionId,
+ name: kOptionRemoteMenubarEdge,
+ value: _toolbarEdgeToString(nextEdge),
+ );
+ bind.sessionPeerOption(
+ sessionId: widget.ffi.sessionId,
+ name: kOptionRemoteMenubarFraction,
+ value: nextFraction.toString(),
+ );
+ }
+ }
+
+ void _deferDockingOptionsSync() {
+ _pendingDockingOptionSync = true;
+ if (_dragging.isFalse) {
+ _syncDockingOptionsAfterDragIfNeeded();
+ }
+ }
+
+ void _markToolbarDragEpoch() {
+ ++_dragEpoch;
+ }
+
+ void _syncDockingOptionsAfterDragIfNeeded() {
+ if (!_pendingDockingOptionSync) return;
+ WidgetsBinding.instance.addPostFrameCallback((_) async {
+ await _syncDockingOptions(force: false);
+ });
+ }
+
@override
initState() {
super.initState();
+ final cached = _cachedToolbarDockingOptions(widget.ffi.sessionId);
+ final multiEdgeEnabled =
+ mainGetLocalBoolOptionSync(kOptionAllowMultiEdgeToolbarDock);
+ final shouldResetToTop =
+ cached != null && cached.multiEdgeEnabled && !multiEdgeEnabled;
+ if (cached != null && !shouldResetToTop) {
+ _edge.value = cached.edge;
+ _fraction.value = cached.fraction;
+ _multiEdgeEnabled.value = multiEdgeEnabled;
+ _dockingOptionsInitialized.value = true;
+ }
+
WidgetsBinding.instance.addPostFrameCallback((_) async {
- _fractionX.value = double.tryParse(await bind.sessionGetOption(
- sessionId: widget.ffi.sessionId,
- arg: 'remote-menubar-drag-x') ??
- '0.5') ??
- 0.5;
+ await _syncDockingOptions(force: cached == null || shouldResetToTop);
// Initialize toolbar states (collapse, hide) from session options
widget.state.init(widget.ffi.sessionId);
});
@@ -303,6 +663,14 @@ class _RemoteToolbarState extends State {
});
}
+ @override
+ void didUpdateWidget(covariant RemoteToolbar oldWidget) {
+ super.didUpdateWidget(oldWidget);
+ WidgetsBinding.instance.addPostFrameCallback((_) async {
+ await _syncDockingOptions(force: false);
+ });
+ }
+
_debouncerHideProc(int v) {
if (!pin && collapse.isFalse && _isCursorOverImage && _dragging.isFalse) {
collapse.value = true;
@@ -311,64 +679,130 @@ class _RemoteToolbarState extends State {
@override
dispose() {
- super.dispose();
-
+ ++_dockingOptionSyncSerial;
widget.onEnterOrLeaveImageCleaner(identityHashCode(this));
+ super.dispose();
}
@override
Widget build(BuildContext context) {
return Obx(() {
// Wait for initialization to complete to prevent flickering
- if (!widget.state.initialized.value) {
+ if (!widget.state.initialized.value ||
+ !_dockingOptionsInitialized.value) {
return const SizedBox.shrink();
}
// If toolbar is hidden, return empty widget
if (hide.value) {
return const SizedBox.shrink();
}
- return Align(
- alignment: Alignment.topCenter,
- child: collapse.isFalse
- ? _buildToolbar(context)
- : _buildDraggableCollapse(context),
+ final edge = _edge.value;
+ final isHorizontal = _isHorizontalEdge(edge);
+
+ // Measure the live toolbar after every layout so the preview ghost can
+ // match its actual footprint (collapsed handle vs expanded toolbar).
+ WidgetsBinding.instance.addPostFrameCallback((_) {
+ if (_dragging.isTrue) return;
+ final ro = _toolbarKey.currentContext?.findRenderObject();
+ if (ro is RenderBox && ro.hasSize) {
+ final s = ro.size;
+ if (_toolbarSize.value != s) _toolbarSize.value = s;
+ }
+ });
+
+ final toolbar = Align(
+ alignment: _alignmentForEdge(edge, _fraction.value),
+ child: KeyedSubtree(
+ key: _toolbarKey,
+ child: collapse.isFalse
+ ? _buildToolbar(context, edge, isHorizontal)
+ : _buildDraggableCollapse(context, edge, isHorizontal),
+ ),
+ );
+
+ // Always return the Stack — even when not dragging — so the toolbar's
+ // position in the Element tree stays stable. Wrapping/unwrapping it
+ // mid-drag was killing the Draggable's gesture state.
+ return Stack(
+ fit: StackFit.expand,
+ children: [
+ IgnorePointer(
+ child: Obx(() {
+ final pe = _previewEdge.value;
+ final pf = _previewFraction.value;
+ if (!_dragging.isTrue || pe == null || pf == null) {
+ return const SizedBox.shrink();
+ }
+ return _buildDragPreview(context, pe, pf, _toolbarSize.value);
+ }),
+ ),
+ toolbar,
+ ],
);
});
}
- Widget _buildDraggableCollapse(BuildContext context) {
+ Widget _buildDragPreview(BuildContext context, _ToolbarEdge edge,
+ double fraction, Size? measured) {
+ final color = Theme.of(context).colorScheme.primary;
+ // Use the measured live toolbar size so collapsed vs expanded looks
+ // right. The current orientation may differ from the preview orientation
+ // (e.g. dragging a top-docked toolbar toward the left edge), so swap the
+ // long/short axes when previewing a different orientation.
+ final previewSize = _toolbarSizeForEdge(edge, measured);
+ return Align(
+ alignment: _alignmentForEdge(edge, fraction),
+ child: Container(
+ width: previewSize.width,
+ height: previewSize.height,
+ decoration: BoxDecoration(
+ color: color.withOpacity(0.10),
+ borderRadius: BorderRadius.circular(6),
+ border: Border.all(color: color.withOpacity(0.55), width: 1.5),
+ ),
+ ),
+ );
+ }
+
+ Widget _buildDraggableCollapse(
+ BuildContext context, _ToolbarEdge edge, bool isHorizontal) {
return Obx(() {
if (collapse.isFalse && _dragging.isFalse) {
triggerAutoHide();
}
- final borderRadius = BorderRadius.vertical(
- bottom: Radius.circular(5),
- );
- return Align(
- alignment: FractionalOffset(_fractionX.value, 0),
- child: Offstage(
- offstage: _dragging.isTrue,
- child: Material(
- elevation: _ToolbarTheme.elevation,
- shadowColor: MyTheme.color(context).shadow,
+ final borderRadius = _collapseHandleBorderRadius(edge);
+ return Offstage(
+ offstage: _dragging.isTrue,
+ child: Material(
+ elevation: _ToolbarTheme.elevation,
+ shadowColor: MyTheme.color(context).shadow,
+ borderRadius: borderRadius,
+ child: _DraggableShowHide(
+ id: widget.id,
+ sessionId: widget.ffi.sessionId,
+ dragging: _dragging,
+ fraction: _fraction,
+ edge: _edge,
+ previewEdge: _previewEdge,
+ previewFraction: _previewFraction,
+ toolbarSize: _toolbarSize,
+ markDragEpoch: _markToolbarDragEpoch,
+ syncDockingOptionsAfterDragIfNeeded:
+ _syncDockingOptionsAfterDragIfNeeded,
+ isHorizontal: isHorizontal,
+ multiEdgeEnabled: _multiEdgeEnabled.value,
+ toolbarState: widget.state,
+ setFullscreen: _setFullscreen,
+ setMinimize: _minimize,
borderRadius: borderRadius,
- child: _DraggableShowHide(
- id: widget.id,
- sessionId: widget.ffi.sessionId,
- dragging: _dragging,
- fractionX: _fractionX,
- toolbarState: widget.state,
- setFullscreen: _setFullscreen,
- setMinimize: _minimize,
- borderRadius: borderRadius,
- ),
),
),
);
});
}
- Widget _buildToolbar(BuildContext context) {
+ Widget _buildToolbar(
+ BuildContext context, _ToolbarEdge edge, bool isHorizontal) {
final List toolbarItems = [];
toolbarItems.add(_PinMenu(state: widget.state));
if (!isWebDesktop) {
@@ -376,11 +810,13 @@ class _RemoteToolbarState extends State {
}
toolbarItems.add(Obx(() {
- if (PrivacyModeState.find(widget.id).isEmpty &&
+ if ((PrivacyModeState.find(widget.id).isEmpty ||
+ allowDisplaySwitchInPrivacyMode(pi)) &&
pi.displaysCount.value > 1) {
return _MonitorMenu(
id: widget.id,
ffi: widget.ffi,
+ edge: edge,
setRemoteState: widget.setRemoteState);
} else {
return Offstage();
@@ -406,37 +842,53 @@ class _RemoteToolbarState extends State {
if (!isWeb) toolbarItems.add(_RecordMenu());
toolbarItems.add(_CloseMenu(id: widget.id, ffi: widget.ffi));
final toolbarBorderRadius = BorderRadius.all(Radius.circular(4.0));
- return Column(
- mainAxisSize: MainAxisSize.min,
- children: [
- Material(
- elevation: _ToolbarTheme.elevation,
- shadowColor: MyTheme.color(context).shadow,
- borderRadius: toolbarBorderRadius,
- color: Theme.of(context)
- .menuBarTheme
- .style
- ?.backgroundColor
- ?.resolve(MaterialState.values.toSet()),
- child: SingleChildScrollView(
- scrollDirection: Axis.horizontal,
- child: Theme(
- data: themeData(),
- child: _ToolbarTheme.borderWrapper(
- context,
- Row(
- children: [
- SizedBox(width: _ToolbarTheme.buttonHMargin * 2),
- ...toolbarItems,
- SizedBox(width: _ToolbarTheme.buttonHMargin * 2)
- ],
- ),
- toolbarBorderRadius),
- ),
- ),
+ // innerAxis: how the toolbar icons themselves flow.
+ // outerAxis: how the toolbar block and the handle stack against each other
+ // (perpendicular to the dock edge, so the handle hangs off the interior face).
+ final innerAxis = isHorizontal ? Axis.horizontal : Axis.vertical;
+ final outerAxis = isHorizontal ? Axis.vertical : Axis.horizontal;
+ final spacer = isHorizontal
+ ? SizedBox(width: _ToolbarTheme.buttonHMargin * 2)
+ : SizedBox(height: _ToolbarTheme.buttonHMargin * 2);
+ final toolbarMaterial = Material(
+ elevation: _ToolbarTheme.elevation,
+ shadowColor: MyTheme.color(context).shadow,
+ borderRadius: toolbarBorderRadius,
+ color: Theme.of(context)
+ .menuBarTheme
+ .style
+ ?.backgroundColor
+ ?.resolve(MaterialState.values.toSet()),
+ child: SingleChildScrollView(
+ scrollDirection: innerAxis,
+ child: Theme(
+ data: themeData(),
+ child: _ToolbarTheme.borderWrapper(
+ context,
+ Flex(
+ direction: innerAxis,
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ spacer,
+ ...toolbarItems,
+ spacer,
+ ],
+ ),
+ toolbarBorderRadius),
),
- _buildDraggableCollapse(context),
- ],
+ ),
+ );
+ final handle = _buildDraggableCollapse(context, edge, isHorizontal);
+ // The handle hangs off the interior face of the toolbar (away from the
+ // docked edge), centered along that face by the Flex's default cross-axis
+ // alignment, so the icons themselves sit flush against the docked edge.
+ final children = (edge == _ToolbarEdge.top || edge == _ToolbarEdge.left)
+ ? [toolbarMaterial, handle]
+ : [handle, toolbarMaterial];
+ return Flex(
+ direction: outerAxis,
+ mainAxisSize: MainAxisSize.min,
+ children: children,
);
}
@@ -515,11 +967,13 @@ class _MobileActionMenu extends StatelessWidget {
class _MonitorMenu extends StatelessWidget {
final String id;
final FFI ffi;
+ final _ToolbarEdge edge;
final Function(VoidCallback) setRemoteState;
const _MonitorMenu({
Key? key,
required this.id,
required this.ffi,
+ required this.edge,
required this.setRemoteState,
}) : super(key: key);
@@ -530,9 +984,17 @@ class _MonitorMenu extends StatelessWidget {
!isWeb && ffi.ffiModel.pi.isSupportMultiDisplay;
@override
- Widget build(BuildContext context) => showMonitorsToolbar
- ? buildMultiMonitorMenu(context)
- : Obx(() => buildMonitorMenu(context));
+ Widget build(BuildContext context) {
+ final child = showMonitorsToolbar
+ ? buildMultiMonitorMenu(context)
+ : Obx(() => buildMonitorMenu(context));
+ final quarterTurns = _monitorMenuQuarterTurns(edge);
+ if (quarterTurns == 0) return child;
+ return RotatedBox(
+ quarterTurns: quarterTurns,
+ child: child,
+ );
+ }
Widget buildMonitorMenu(BuildContext context) {
final width = SimpleWrapper(0);
@@ -664,7 +1126,8 @@ class _MonitorMenu extends StatelessWidget {
}
final scale = _ToolbarTheme.buttonSize / rect.height * 0.75;
- final startY = (_ToolbarTheme.buttonSize - rect.height * scale) * 0.5;
+ final height = rect.height * scale;
+ final startY = (_ToolbarTheme.buttonSize - height) * 0.5;
final startX = startY;
final children = [];
@@ -707,7 +1170,7 @@ class _MonitorMenu extends StatelessWidget {
width.value = rect.width * scale + startX * 2;
return SizedBox(
width: width.value,
- height: rect.height * scale + startY * 2,
+ height: height + startY * 2,
child: Stack(
children: children,
),
@@ -996,10 +1459,10 @@ class _DisplayMenuState extends State<_DisplayMenu> {
toggles(),
];
// privacy mode
+ final privacyModeState = PrivacyModeState.find(id);
if (ffi.connType == ConnType.defaultConn &&
- ffiModel.keyboard &&
- pi.features.privacyMode) {
- final privacyModeState = PrivacyModeState.find(id);
+ (pi.features.privacyMode || privacyModeState.isNotEmpty) &&
+ (ffiModel.keyboard || privacyModeState.isNotEmpty)) {
final privacyModeList =
toolbarPrivacyMode(privacyModeState, context, id, ffi);
if (privacyModeList.length == 1) {
@@ -1861,8 +2324,18 @@ class _KeyboardMenu extends StatelessWidget {
continue;
}
- if (pi.isWayland && mode.key != kKeyMapMode) {
- continue;
+ if (pi.isWayland) {
+ // Legacy mode is hidden on desktop control side because dead keys
+ // don't work properly on Wayland. When the control side is mobile,
+ // Legacy mode is used automatically (mobile always sends Legacy events).
+ if (mode.key == kKeyLegacyMode) {
+ continue;
+ }
+ // Translate mode requires server >= 1.4.6.
+ if (mode.key == kKeyTranslateMode &&
+ versionCmp(pi.version, '1.4.6') < 0) {
+ continue;
+ }
}
var text = translate(mode.menu);
@@ -2508,7 +2981,18 @@ class RdoMenuButton extends StatelessWidget {
class _DraggableShowHide extends StatefulWidget {
final String id;
final SessionID sessionId;
- final RxDouble fractionX;
+ final RxDouble fraction;
+ final Rx<_ToolbarEdge> edge;
+ final Rxn<_ToolbarEdge> previewEdge;
+ final Rxn previewFraction;
+ final Rxn toolbarSize;
+ final VoidCallback markDragEpoch;
+ final VoidCallback syncDockingOptionsAfterDragIfNeeded;
+ final bool isHorizontal;
+ // Whether multi-edge docking is enabled for this session (toggled in
+ // Settings -> Other). When false, the drag handle slides the toolbar
+ // horizontally on the top edge and never switches edges.
+ final bool multiEdgeEnabled;
final RxBool dragging;
final ToolbarState toolbarState;
final BorderRadius borderRadius;
@@ -2520,7 +3004,15 @@ class _DraggableShowHide extends StatefulWidget {
Key? key,
required this.id,
required this.sessionId,
- required this.fractionX,
+ required this.fraction,
+ required this.edge,
+ required this.previewEdge,
+ required this.previewFraction,
+ required this.toolbarSize,
+ required this.markDragEpoch,
+ required this.syncDockingOptionsAfterDragIfNeeded,
+ required this.isHorizontal,
+ required this.multiEdgeEnabled,
required this.dragging,
required this.toolbarState,
required this.setFullscreen,
@@ -2533,10 +3025,12 @@ class _DraggableShowHide extends StatefulWidget {
}
class _DraggableShowHideState extends State<_DraggableShowHide> {
- Offset position = Offset.zero;
- Size size = Size.zero;
double left = 0.0;
double right = 1.0;
+ Offset? _lastPointerDown;
+ Offset? _dragGrabOffset;
+ double? _dragLongAxisGrabOffset;
+ Size? _dragToolbarSize;
RxBool get collapse => widget.toolbarState.collapse;
@@ -2562,41 +3056,174 @@ class _DraggableShowHideState extends State<_DraggableShowHide> {
}
}
+ // Bias applied to the currently-previewed edge so a drag hovering between
+ // two edges doesn't flicker. Only relevant when multi-edge is enabled.
+ static const double _switchHysteresisPx = 50.0;
+
+ _ToolbarEdge _nearestToolbarEdge(Offset cursor, Size mediaSize) {
+ if (!widget.multiEdgeEnabled) return widget.edge.value;
+
+ double rawDist(_ToolbarEdge e) {
+ switch (e) {
+ case _ToolbarEdge.top:
+ return cursor.dy;
+ case _ToolbarEdge.bottom:
+ return mediaSize.height - cursor.dy;
+ case _ToolbarEdge.left:
+ return cursor.dx;
+ case _ToolbarEdge.right:
+ return mediaSize.width - cursor.dx;
+ }
+ }
+
+ final previewed = widget.previewEdge.value;
+ var winner = widget.edge.value;
+ var best = double.infinity;
+ for (final e in _ToolbarEdge.values) {
+ final biased =
+ e == previewed ? rawDist(e) - _switchHysteresisPx : rawDist(e);
+ if (biased < best) {
+ best = biased;
+ winner = e;
+ }
+ }
+ return winner;
+ }
+
+ void _ensureDragGrabOffset(Offset cursor) {
+ if (_dragGrabOffset != null) return;
+ final mediaSize = MediaQueryData.fromView(View.of(context)).size;
+ final toolbarSize =
+ _toolbarSizeForEdge(widget.edge.value, widget.toolbarSize.value);
+ _dragToolbarSize = toolbarSize;
+ final toolbarOffset = _toolbarOffsetForEdge(
+ edge: widget.edge.value,
+ fraction: widget.fraction.value,
+ parentSize: mediaSize,
+ toolbarSize: toolbarSize,
+ );
+ _dragGrabOffset = cursor - toolbarOffset;
+ _dragLongAxisGrabOffset = _isHorizontalEdge(widget.edge.value)
+ ? _dragGrabOffset?.dx
+ : _dragGrabOffset?.dy;
+ }
+
+ double _dragGrabOffsetForEdge(_ToolbarEdge edge, Size toolbarSize) {
+ final offset = _dragLongAxisGrabOffset ?? 0;
+ final extent =
+ _isHorizontalEdge(edge) ? toolbarSize.width : toolbarSize.height;
+ return _clampToolbarFraction(offset, 0, extent);
+ }
+
+ void _updatePreview(Offset cursor) {
+ _ensureDragGrabOffset(cursor);
+ final mediaSize = MediaQueryData.fromView(View.of(context)).size;
+ final winner = _nearestToolbarEdge(cursor, mediaSize);
+ widget.previewEdge.value = winner;
+
+ final toolbarSize = _toolbarSizeForEdge(winner, _dragToolbarSize);
+ final grabOffset = _dragGrabOffsetForEdge(winner, toolbarSize);
+ final double frac;
+ if (winner == _ToolbarEdge.top || winner == _ToolbarEdge.bottom) {
+ frac = _fractionForAlignedDrag(
+ cursor: cursor.dx,
+ grabOffset: grabOffset,
+ parentExtent: mediaSize.width,
+ toolbarExtent: toolbarSize.width,
+ left: left,
+ right: right,
+ );
+ } else {
+ final fractionBounds = _fractionBoundsForEdge(winner, left, right);
+ frac = _fractionForAlignedDrag(
+ cursor: cursor.dy,
+ grabOffset: grabOffset,
+ parentExtent: mediaSize.height,
+ toolbarExtent: toolbarSize.height,
+ left: fractionBounds.left,
+ right: fractionBounds.right,
+ );
+ }
+ widget.previewFraction.value = frac;
+ }
+
+ void _resetDragTracking() {
+ _lastPointerDown = null;
+ _dragGrabOffset = null;
+ _dragLongAxisGrabOffset = null;
+ _dragToolbarSize = null;
+ }
+
+ void _commitPreview() {
+ final newEdge = widget.previewEdge.value;
+ final frac = widget.previewFraction.value;
+ widget.previewEdge.value = null;
+ widget.previewFraction.value = null;
+ widget.dragging.value = false;
+ widget.markDragEpoch();
+ _resetDragTracking();
+ widget.syncDockingOptionsAfterDragIfNeeded();
+ if (newEdge == null || frac == null) return;
+ widget.edge.value = newEdge;
+ widget.fraction.value = frac;
+ _cacheToolbarDockingOptions(
+ sessionId: widget.sessionId,
+ edge: newEdge,
+ fraction: frac,
+ multiEdgeEnabled: widget.multiEdgeEnabled,
+ );
+ bind.sessionPeerOption(
+ sessionId: widget.sessionId,
+ name: kOptionRemoteMenubarEdge,
+ value: _toolbarEdgeToString(newEdge),
+ );
+ bind.sessionPeerOption(
+ sessionId: widget.sessionId,
+ name: kOptionRemoteMenubarFraction,
+ value: frac.toString(),
+ );
+ if (widget.multiEdgeEnabled) {
+ return;
+ }
+ bind.sessionPeerOption(
+ sessionId: widget.sessionId,
+ name: _legacyRemoteMenubarDragX,
+ value: frac.toString(),
+ );
+ }
+
Widget _buildDraggable(BuildContext context) {
- return Draggable(
- axis: Axis.horizontal,
- child: Icon(
- Icons.drag_indicator,
- size: 20,
- color: MyTheme.color(context).drag_indicator,
+ return Listener(
+ onPointerDown: (event) => _lastPointerDown = event.position,
+ child: Draggable(
+ // When multi-edge docking is off the toolbar stays on the top edge,
+ // so lock the feedback to horizontal motion — otherwise the handle
+ // floats away from the top while dragging and the toolbar looks
+ // unmoored. When multi-edge is on we need 2D drag for snap-to-edge.
+ axis: widget.multiEdgeEnabled ? null : Axis.horizontal,
+ child: Icon(
+ widget.isHorizontal ? Icons.drag_indicator : Icons.drag_handle,
+ size: 20,
+ color: MyTheme.color(context).drag_indicator,
+ ),
+ feedback: widget,
+ onDragStarted: () {
+ widget.markDragEpoch();
+ final pointerDown = _lastPointerDown;
+ if (pointerDown != null) {
+ _ensureDragGrabOffset(pointerDown);
+ }
+ widget.dragging.value = true;
+ // Seed the preview at the current docked edge/fraction so something
+ // shows the instant the drag begins, before the first onDragUpdate.
+ widget.previewEdge.value = widget.edge.value;
+ widget.previewFraction.value = widget.fraction.value;
+ },
+ onDragUpdate: (details) {
+ _updatePreview(details.globalPosition);
+ },
+ onDragEnd: (_) => _commitPreview(),
),
- feedback: widget,
- onDragStarted: (() {
- final RenderObject? renderObj = context.findRenderObject();
- if (renderObj != null) {
- final RenderBox renderBox = renderObj as RenderBox;
- size = renderBox.size;
- position = renderBox.localToGlobal(Offset.zero);
- }
- widget.dragging.value = true;
- }),
- onDragEnd: (details) {
- final mediaSize = MediaQueryData.fromView(View.of(context)).size;
- widget.fractionX.value +=
- (details.offset.dx - position.dx) / (mediaSize.width - size.width);
- if (widget.fractionX.value < left) {
- widget.fractionX.value = left;
- }
- if (widget.fractionX.value > right) {
- widget.fractionX.value = right;
- }
- bind.sessionPeerOption(
- sessionId: widget.sessionId,
- name: 'remote-menubar-drag-x',
- value: widget.fractionX.value.toString(),
- );
- widget.dragging.value = false;
- },
);
}
@@ -2626,7 +3253,9 @@ class _DraggableShowHideState extends State<_DraggableShowHide> {
);
}
- final child = Row(
+ final axis = widget.isHorizontal ? Axis.horizontal : Axis.vertical;
+ final child = Flex(
+ direction: axis,
mainAxisSize: MainAxisSize.min,
children: [
_buildDraggable(context),
@@ -2667,7 +3296,7 @@ class _DraggableShowHideState extends State<_DraggableShowHide> {
message: translate(
collapse.isFalse ? 'Hide Toolbar' : 'Show Toolbar'),
child: Icon(
- collapse.isFalse ? Icons.expand_less : Icons.expand_more,
+ _toolbarCollapseIcon(widget.edge.value, collapse.isTrue),
size: iconSize,
),
))),
@@ -2709,7 +3338,8 @@ class _DraggableShowHideState extends State<_DraggableShowHide> {
borderRadius: widget.borderRadius,
),
child: SizedBox(
- height: 20,
+ height: widget.isHorizontal ? 20 : null,
+ width: widget.isHorizontal ? null : 20,
child: child,
),
),
diff --git a/flutter/lib/desktop/widgets/tabbar_widget.dart b/flutter/lib/desktop/widgets/tabbar_widget.dart
index ac7d80017..9ef7d38d9 100644
--- a/flutter/lib/desktop/widgets/tabbar_widget.dart
+++ b/flutter/lib/desktop/widgets/tabbar_widget.dart
@@ -99,6 +99,7 @@ class DesktopTabController {
/// index, key
Function(int, String)? onRemoved;
Function(String)? onSelected;
+ Future Function()? onCloseWindow;
DesktopTabController(
{required this.tabType, this.onRemoved, this.onSelected});
@@ -592,13 +593,13 @@ class _DesktopTabState extends State
}
Widget _buildBar() {
+ final isIncomingHomePage = bind.isIncomingOnly() && isInHomePage();
return Row(
children: [
Expanded(
child: GestureDetector(
// custom double tap handler
- onTap: !(bind.isIncomingOnly() && isInHomePage()) &&
- showMaximize
+ onTap: !isIncomingHomePage && showMaximize
? () {
final current = DateTime.now().millisecondsSinceEpoch;
final elapsed = current - _lastClickTime;
@@ -609,7 +610,7 @@ class _DesktopTabState extends State
.then((value) => stateGlobal.setMaximized(value));
}
}
- : null,
+ : (isIncomingHomePage ? () {} : null), // Keep tap recognizer for Windows touch.
onPanStart: (_) => startDragging(isMainWindow),
onPanCancel: () {
// We want to disable dragging of the tab area in the tab bar.
diff --git a/flutter/lib/mobile/pages/remote_page.dart b/flutter/lib/mobile/pages/remote_page.dart
index 1850f2093..74a5af45c 100644
--- a/flutter/lib/mobile/pages/remote_page.dart
+++ b/flutter/lib/mobile/pages/remote_page.dart
@@ -1,5 +1,4 @@
import 'dart:async';
-import 'dart:ui' as ui;
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@@ -65,9 +64,8 @@ class _RemotePageState extends State with WidgetsBindingObserver {
bool _showGestureHelp = false;
String _value = '';
Orientation? _currentOrientation;
- double _viewInsetsBottom = 0;
final _uniqueKey = UniqueKey();
- Timer? _timerDidChangeMetrics;
+ Timer? _iosKeyboardWorkaroundTimer;
final _blockableOverlayState = BlockableOverlayState();
@@ -139,7 +137,7 @@ class _RemotePageState extends State with WidgetsBindingObserver {
_physicalFocusNode.dispose();
await gFFI.close();
_timer?.cancel();
- _timerDidChangeMetrics?.cancel();
+ _iosKeyboardWorkaroundTimer?.cancel();
gFFI.dialogManager.dismissAll();
await SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
overlays: SystemUiOverlay.values);
@@ -165,26 +163,6 @@ class _RemotePageState extends State with WidgetsBindingObserver {
gFFI.invokeMethod("try_sync_clipboard");
}
- @override
- void didChangeMetrics() {
- // If the soft keyboard is visible and the canvas has been changed(panned or scaled)
- // Don't try reset the view style and focus the cursor.
- if (gFFI.cursorModel.lastKeyboardIsVisible &&
- gFFI.canvasModel.isMobileCanvasChanged) {
- return;
- }
-
- final newBottom = MediaQueryData.fromView(ui.window).viewInsets.bottom;
- _timerDidChangeMetrics?.cancel();
- _timerDidChangeMetrics = Timer(Duration(milliseconds: 100), () async {
- // We need this comparation because poping up the floating action will also trigger `didChangeMetrics()`.
- if (newBottom != _viewInsetsBottom) {
- gFFI.canvasModel.mobileFocusCanvasCursor();
- _viewInsetsBottom = newBottom;
- }
- });
- }
-
// to-do: It should be better to use transparent color instead of the bgColor.
// But for now, the transparent color will cause the canvas to be white.
// I'm sure that the white color is caused by the Overlay widget in BlockableOverlay.
@@ -206,7 +184,24 @@ class _RemotePageState extends State with WidgetsBindingObserver {
gFFI.ffiModel.pi.version.isNotEmpty) {
gFFI.invokeMethod("enable_soft_keyboard", false);
}
+
+ // Workaround for iOS: physical keyboard input fails after virtual keyboard is hidden
+ // https://github.com/flutter/flutter/issues/39900
+ // https://github.com/rustdesk/rustdesk/discussions/11843#discussioncomment-13499698 - Virtual keyboard issue
+ if (isIOS) {
+ _iosKeyboardWorkaroundTimer?.cancel();
+ _iosKeyboardWorkaroundTimer = Timer(Duration(milliseconds: 100), () {
+ if (!mounted) return;
+ _physicalFocusNode.unfocus();
+ _iosKeyboardWorkaroundTimer = Timer(Duration(milliseconds: 50), () {
+ if (!mounted) return;
+ _physicalFocusNode.requestFocus();
+ });
+ });
+ }
} else {
+ _iosKeyboardWorkaroundTimer?.cancel();
+ _iosKeyboardWorkaroundTimer = null;
_timer?.cancel();
_timer = Timer(kMobileDelaySoftKeyboardFocus, () {
SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
@@ -431,12 +426,10 @@ class _RemotePageState extends State with WidgetsBindingObserver {
}
return Container(
color: MyTheme.canvasColor,
- child: inputModel.isPhysicalMouse.value
- ? getBodyForMobile()
- : RawTouchGestureDetectorRegion(
- child: getBodyForMobile(),
- ffi: gFFI,
- ),
+ child: RawTouchGestureDetectorRegion(
+ child: getBodyForMobile(),
+ ffi: gFFI,
+ ),
);
}),
),
@@ -1190,7 +1183,8 @@ void showOptions(
List privacyModeList = [];
// privacy mode
final privacyModeState = PrivacyModeState.find(id);
- if (gFFI.ffiModel.keyboard && gFFI.ffiModel.pi.features.privacyMode) {
+ if ((gFFI.ffiModel.pi.features.privacyMode && gFFI.ffiModel.keyboard) ||
+ privacyModeState.isNotEmpty) {
privacyModeList = toolbarPrivacyMode(privacyModeState, context, id, gFFI);
if (privacyModeList.length == 1) {
displayToggles.add(privacyModeList[0]);
diff --git a/flutter/lib/mobile/pages/server_page.dart b/flutter/lib/mobile/pages/server_page.dart
index d2a6ed8a8..cd3f97a53 100644
--- a/flutter/lib/mobile/pages/server_page.dart
+++ b/flutter/lib/mobile/pages/server_page.dart
@@ -150,7 +150,8 @@ class _DropDownAction extends StatelessWidget {
}
if (value == kUsePermanentPassword &&
- (await bind.mainGetPermanentPassword()).isEmpty) {
+ (await bind.mainGetCommon(key: "permanent-password-set")) !=
+ "true") {
if (isChangePermanentPasswordDisabled()) {
callback();
return;
@@ -582,10 +583,20 @@ class _PermissionCheckerState extends State {
Widget build(BuildContext context) {
final serverModel = Provider.of(context);
final hasAudioPermission = androidVersion >= 30;
+ final hideStopService = isAndroid &&
+ bind.mainGetBuildinOption(key: kOptionHideStopService) == 'Y';
+ final allowPermChangeInAcceptWindow = option2bool(
+ kOptionEnablePermChangeInAcceptWindow,
+ bind.mainGetBuildinOption(
+ key: kOptionEnablePermChangeInAcceptWindow,
+ ));
+ final permissionChangeLocked = isAndroid &&
+ serverModel.clients.any((c) => !c.disconnected) &&
+ !allowPermChangeInAcceptWindow;
return PaddingCard(
title: translate("Permissions"),
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
- serverModel.mediaOk
+ serverModel.mediaOk && !hideStopService
? ElevatedButton.icon(
style: ButtonStyle(
backgroundColor:
@@ -595,21 +606,30 @@ class _PermissionCheckerState extends State {
label: Text(translate("Stop service")))
.marginOnly(bottom: 8)
: SizedBox.shrink(),
+ if (!hideStopService || !serverModel.mediaOk)
+ PermissionRow(
+ translate("Screen Capture"),
+ serverModel.mediaOk,
+ !serverModel.mediaOk &&
+ gFFI.userModel.userName.value.isEmpty &&
+ bind.mainGetLocalOption(key: "show-scam-warning") != "N"
+ ? () => showScamWarning(context, serverModel)
+ : serverModel.toggleService),
PermissionRow(
- translate("Screen Capture"),
- serverModel.mediaOk,
- !serverModel.mediaOk &&
- gFFI.userModel.userName.value.isEmpty &&
- bind.mainGetLocalOption(key: "show-scam-warning") != "N"
- ? () => showScamWarning(context, serverModel)
- : serverModel.toggleService),
- PermissionRow(translate("Input Control"), serverModel.inputOk,
- serverModel.toggleInput),
- PermissionRow(translate("Transfer file"), serverModel.fileOk,
- serverModel.toggleFile),
+ translate("Input Control"),
+ serverModel.inputOk,
+ serverModel.toggleInput,
+ ),
+ PermissionRow(
+ translate("Transfer file"),
+ serverModel.fileOk,
+ serverModel.toggleFile,
+ enabled: !permissionChangeLocked,
+ ),
hasAudioPermission
? PermissionRow(translate("Audio Capture"), serverModel.audioOk,
- serverModel.toggleAudio)
+ serverModel.toggleAudio,
+ enabled: !permissionChangeLocked)
: Row(children: [
Icon(Icons.info_outline).marginOnly(right: 15),
Expanded(
@@ -618,19 +638,25 @@ class _PermissionCheckerState extends State {
style: const TextStyle(color: MyTheme.darkGray),
))
]),
- PermissionRow(translate("Enable clipboard"), serverModel.clipboardOk,
- serverModel.toggleClipboard),
+ PermissionRow(
+ translate("Enable clipboard"),
+ serverModel.clipboardOk,
+ serverModel.toggleClipboard,
+ enabled: !permissionChangeLocked,
+ ),
]));
}
}
class PermissionRow extends StatelessWidget {
- const PermissionRow(this.name, this.isOk, this.onPressed, {Key? key})
+ const PermissionRow(this.name, this.isOk, this.onPressed,
+ {Key? key, this.enabled = true})
: super(key: key);
final String name;
final bool isOk;
final VoidCallback onPressed;
+ final bool enabled;
@override
Widget build(BuildContext context) {
@@ -639,9 +665,11 @@ class PermissionRow extends StatelessWidget {
contentPadding: EdgeInsets.all(0),
title: Text(name),
value: isOk,
- onChanged: (bool value) {
- onPressed();
- });
+ onChanged: enabled
+ ? (bool value) {
+ onPressed();
+ }
+ : null);
}
}
@@ -841,13 +869,7 @@ class ClientInfo extends StatelessWidget {
flex: -1,
child: Padding(
padding: const EdgeInsets.only(right: 12),
- child: CircleAvatar(
- backgroundColor: str2color(
- client.name,
- Theme.of(context).brightness == Brightness.light
- ? 255
- : 150),
- child: Text(client.name[0])))),
+ child: _buildAvatar(context))),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@@ -860,6 +882,20 @@ class ClientInfo extends StatelessWidget {
),
]));
}
+
+ Widget _buildAvatar(BuildContext context) {
+ final fallback = CircleAvatar(
+ backgroundColor: str2color(client.name,
+ Theme.of(context).brightness == Brightness.light ? 255 : 150),
+ child: Text(client.name.isNotEmpty ? client.name[0] : '?'),
+ );
+ return buildAvatarWidget(
+ avatar: client.avatar,
+ size: 40,
+ fallback: fallback,
+ ) ??
+ fallback;
+ }
}
void androidChannelInit() {
diff --git a/flutter/lib/mobile/pages/settings_page.dart b/flutter/lib/mobile/pages/settings_page.dart
index c2e2ef57d..509260636 100644
--- a/flutter/lib/mobile/pages/settings_page.dart
+++ b/flutter/lib/mobile/pages/settings_page.dart
@@ -617,7 +617,7 @@ class _SettingsState extends State with WidgetsBindingObserver {
onToggle: (bool v) async {
await mainSetLocalBoolOption(kOptionEnableShowTerminalExtraKeys, v);
final newValue =
- mainGetLocalBoolOptionSync(kOptionEnableShowTerminalExtraKeys);
+ mainGetLocalBoolOptionSync(kOptionEnableShowTerminalExtraKeys);
setState(() {
_showTerminalExtraKeys = newValue;
});
@@ -688,8 +688,18 @@ class _SettingsState extends State with WidgetsBindingObserver {
SettingsTile(
title: Obx(() => Text(gFFI.userModel.userName.value.isEmpty
? translate('Login')
- : '${translate('Logout')} (${gFFI.userModel.userName.value})')),
- leading: Icon(Icons.person),
+ : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})')),
+ leading: Obx(() {
+ final avatar = bind.mainResolveAvatarUrl(
+ avatar: gFFI.userModel.avatar.value);
+ return buildAvatarWidget(
+ avatar: avatar,
+ size: 28,
+ borderRadius: null,
+ fallback: Icon(Icons.person),
+ ) ??
+ Icon(Icons.person);
+ }),
onPressed: (context) {
if (gFFI.userModel.userName.value.isEmpty) {
loginDialog();
@@ -829,10 +839,12 @@ class _SettingsState extends State with WidgetsBindingObserver {
),
if (!incomingOnly)
SettingsTile.switchTile(
- title: Text(translate('keep-awake-during-outgoing-sessions-label')),
+ title:
+ Text(translate('keep-awake-during-outgoing-sessions-label')),
initialValue: _preventSleepWhileConnected,
onToggle: (v) async {
- await mainSetLocalBoolOption(kOptionKeepAwakeDuringOutgoingSessions, v);
+ await mainSetLocalBoolOption(
+ kOptionKeepAwakeDuringOutgoingSessions, v);
setState(() {
_preventSleepWhileConnected = v;
});
diff --git a/flutter/lib/mobile/pages/terminal_page.dart b/flutter/lib/mobile/pages/terminal_page.dart
index 67d77782f..aff85b40c 100644
--- a/flutter/lib/mobile/pages/terminal_page.dart
+++ b/flutter/lib/mobile/pages/terminal_page.dart
@@ -1,5 +1,6 @@
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';
@@ -41,6 +42,9 @@ class _TerminalPageState extends State
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.
@@ -79,7 +83,10 @@ class _TerminalPageState extends State
// Register this terminal model with FFI for event routing
_ffi.registerTerminalModel(widget.terminalId, _terminalModel);
- _showTerminalExtraKeys = mainGetLocalBoolOptionSync(kOptionEnableShowTerminalExtraKeys);
+ // Web desktop users have full hardware keyboard access, so the on-screen
+ // terminal extra keys bar is unnecessary and disabled.
+ _showTerminalExtraKeys = !isWebDesktop &&
+ mainGetLocalBoolOptionSync(kOptionEnableShowTerminalExtraKeys);
// Initialize terminal connection
WidgetsBinding.instance.addPostFrameCallback((_) {
_ffi.dialogManager
@@ -147,7 +154,7 @@ class _TerminalPageState extends State
}
Widget buildBody() {
- return Scaffold(
+ final scaffold = 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(
@@ -192,9 +199,108 @@ class _TerminalPageState extends State
),
),
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: {
+ HorizontalDragGestureRecognizer: GestureRecognizerFactoryWithHandlers(
+ () => 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() {
diff --git a/flutter/lib/mobile/pages/view_camera_page.dart b/flutter/lib/mobile/pages/view_camera_page.dart
index 0898125c4..08c8cda1a 100644
--- a/flutter/lib/mobile/pages/view_camera_page.dart
+++ b/flutter/lib/mobile/pages/view_camera_page.dart
@@ -259,13 +259,11 @@ class _ViewCameraPageState extends State
}
return Container(
color: MyTheme.canvasColor,
- child: inputModel.isPhysicalMouse.value
- ? getBodyForMobile()
- : RawTouchGestureDetectorRegion(
- child: getBodyForMobile(),
- ffi: gFFI,
- isCamera: true,
- ),
+ child: RawTouchGestureDetectorRegion(
+ child: getBodyForMobile(),
+ ffi: gFFI,
+ isCamera: true,
+ ),
);
}),
),
diff --git a/flutter/lib/mobile/widgets/dialog.dart b/flutter/lib/mobile/widgets/dialog.dart
index f6900e5dd..8b645bb88 100644
--- a/flutter/lib/mobile/widgets/dialog.dart
+++ b/flutter/lib/mobile/widgets/dialog.dart
@@ -12,100 +12,6 @@ void _showSuccess() {
showToast(translate("Successful"));
}
-void _showError() {
- showToast(translate("Error"));
-}
-
-void setPermanentPasswordDialog(OverlayDialogManager dialogManager) async {
- final pw = await bind.mainGetPermanentPassword();
- final p0 = TextEditingController(text: pw);
- final p1 = TextEditingController(text: pw);
- var validateLength = false;
- var validateSame = false;
- dialogManager.show((setState, close, context) {
- submit() async {
- close();
- dialogManager.showLoading(translate("Waiting"));
- if (await gFFI.serverModel.setPermanentPassword(p0.text)) {
- dialogManager.dismissAll();
- _showSuccess();
- } else {
- dialogManager.dismissAll();
- _showError();
- }
- }
-
- return CustomAlertDialog(
- title: Column(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- Icon(Icons.password_rounded, color: MyTheme.accent),
- Text(translate('Set your own password')).paddingOnly(left: 10),
- ],
- ),
- content: Form(
- autovalidateMode: AutovalidateMode.onUserInteraction,
- child: Column(mainAxisSize: MainAxisSize.min, children: [
- TextFormField(
- autofocus: true,
- obscureText: true,
- keyboardType: TextInputType.visiblePassword,
- decoration: InputDecoration(
- labelText: translate('Password'),
- ),
- controller: p0,
- validator: (v) {
- if (v == null) return null;
- final val = v.trim().length > 5;
- if (validateLength != val) {
- // use delay to make setState success
- Future.delayed(Duration(microseconds: 1),
- () => setState(() => validateLength = val));
- }
- return val
- ? null
- : translate('Too short, at least 6 characters.');
- },
- ).workaroundFreezeLinuxMint(),
- TextFormField(
- obscureText: true,
- keyboardType: TextInputType.visiblePassword,
- decoration: InputDecoration(
- labelText: translate('Confirmation'),
- ),
- controller: p1,
- validator: (v) {
- if (v == null) return null;
- final val = p0.text == v;
- if (validateSame != val) {
- Future.delayed(Duration(microseconds: 1),
- () => setState(() => validateSame = val));
- }
- return val
- ? null
- : translate('The confirmation is not identical.');
- },
- ).workaroundFreezeLinuxMint(),
- ])),
- onCancel: close,
- onSubmit: (validateLength && validateSame) ? submit : null,
- actions: [
- dialogButton(
- 'Cancel',
- icon: Icon(Icons.close_rounded),
- onPressed: close,
- isOutline: true,
- ),
- dialogButton(
- 'OK',
- icon: Icon(Icons.done_rounded),
- onPressed: (validateLength && validateSame) ? submit : null,
- ),
- ],
- );
- });
-}
-
void setTemporaryPasswordLengthDialog(
OverlayDialogManager dialogManager) async {
List lengths = ['6', '8', '10'];
diff --git a/flutter/lib/models/ab_model.dart b/flutter/lib/models/ab_model.dart
index 81c4dc851..001887c0c 100644
--- a/flutter/lib/models/ab_model.dart
+++ b/flutter/lib/models/ab_model.dart
@@ -1,6 +1,5 @@
import 'dart:async';
import 'dart:convert';
-import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_hbb/common/hbbs/hbbs.dart';
@@ -53,7 +52,9 @@ class AbModel {
RxBool get currentAbLoading => current.abLoading;
bool get currentAbEmpty => current.peers.isEmpty && current.tags.isEmpty;
- RxString get currentAbPullError => current.pullError;
+ final _listPullError = ''.obs;
+ RxString get abPullError =>
+ _listPullError.value.isNotEmpty ? _listPullError : current.pullError;
RxString get currentAbPushError => current.pushError;
String? _personalAbGuid;
RxBool legacyMode = false.obs;
@@ -68,6 +69,7 @@ class AbModel {
var _syncFromRecentLock = false;
var _timerCounter = 0;
var _cacheLoadOnceFlag = false;
+ var _pulledOnce = false;
var listInitialized = false;
var _maxPeerOneAb = 0;
@@ -97,10 +99,17 @@ class AbModel {
print("reset ab model");
addressbooks.clear();
_currentName.value = '';
+ _listPullError.value = '';
+ _pulledOnce = false;
await bind.mainClearAb();
listInitialized = false;
}
+ void clearPullErrors() {
+ _listPullError.value = '';
+ current.pullError.value = '';
+ }
+
// #region ab
/// Pulls the address book data from the server.
///
@@ -110,31 +119,41 @@ class AbModel {
var _pulling = false;
Future pullAb(
{required ForcePullAb? force, required bool quiet}) async {
+ if (bind.isDisableAb()) return;
+ if (!gFFI.userModel.isLogin) return;
+ if (gFFI.userModel.networkError.isNotEmpty) return;
if (_pulling) return;
+ if (force == null && _pulledOnce) {
+ return;
+ }
_pulling = true;
+ if (!quiet) {
+ _listPullError.value = '';
+ current.pullError.value = '';
+ }
try {
await _pullAb(force: force, quiet: quiet);
_refreshTab();
} catch (_) {}
_pulling = false;
+ _pulledOnce = true;
}
Future _pullAb(
{required ForcePullAb? force, required bool quiet}) async {
- if (bind.isDisableAb()) return;
- if (!gFFI.userModel.isLogin) return;
- if (gFFI.userModel.networkError.isNotEmpty) return;
if (force == null && listInitialized && current.initialized) return;
debugPrint("pullAb, force: $force, quiet: $quiet");
if (!listInitialized || force == ForcePullAb.listAndCurrent) {
try {
// Read personal guid every time to avoid upgrading the server without closing the main window
_personalAbGuid = null;
- await _getPersonalAbGuid();
- // Determine legacy mode based on whether _personalAbGuid is null
+ // `true`: continue init. `false`: stop, error already recorded.
+ if (!await _getPersonalAbGuid(quiet: quiet)) {
+ return;
+ }
legacyMode.value = _personalAbGuid == null;
if (!legacyMode.value && _maxPeerOneAb == 0) {
- await _getAbSettings();
+ await _getAbSettings(quiet: quiet);
}
if (_personalAbGuid != null) {
debugPrint("pull ab list");
@@ -142,7 +161,7 @@ class AbModel {
abProfiles.add(AbProfile(_personalAbGuid!, _personalAddressBookName,
gFFI.userModel.userName.value, null, ShareRule.read.value, null));
// get all address book name
- await _getSharedAbProfiles(abProfiles);
+ await _getSharedAbProfiles(abProfiles, quiet: quiet);
addressbooks.removeWhere((key, value) =>
abProfiles.firstWhereOrNull((e) => e.name == key) == null);
for (int i = 0; i < abProfiles.length; i++) {
@@ -182,6 +201,7 @@ class AbModel {
}
} catch (e) {
debugPrint("pull ab list error: $e");
+ _setListPullError(e, quiet: quiet);
}
} else if (listInitialized &&
(!current.initialized || force == ForcePullAb.current)) {
@@ -197,14 +217,26 @@ class AbModel {
}
}
- Future _getAbSettings() async {
+ void _setListPullError(Object err, {required bool quiet, int? statusCode}) {
+ if (!quiet) {
+ _listPullError.value =
+ '${translate('pull_ab_failed_tip')}: ${translate(err.toString())}';
+ }
+ if (statusCode == 401) {
+ gFFI.userModel.reset(resetOther: true);
+ }
+ }
+
+ Future _getAbSettings({required bool quiet}) async {
+ int? statusCode;
try {
final api = "${await bind.mainGetApiServer()}/api/ab/settings";
var headers = getHttpHeaders();
headers['Content-Type'] = "application/json";
_setEmptyBody(headers);
final resp = await http.post(Uri.parse(api), headers: headers);
- if (resp.statusCode == 404) {
+ statusCode = resp.statusCode;
+ if (statusCode == 404) {
debugPrint("HTTP 404, api server doesn't support shared address book");
return false;
}
@@ -213,46 +245,57 @@ class AbModel {
if (json.containsKey('error')) {
throw json['error'];
}
- if (resp.statusCode != 200) {
- throw 'HTTP ${resp.statusCode}';
+ if (statusCode != 200) {
+ throw 'HTTP $statusCode';
}
_maxPeerOneAb = json['max_peer_one_ab'] ?? 0;
return true;
} catch (err) {
debugPrint('get ab settings err: ${err.toString()}');
+ _setListPullError(err, quiet: quiet, statusCode: statusCode);
}
return false;
}
- Future _getPersonalAbGuid() async {
+ /// Loads `/api/ab/personal`.
+ /// Returns `true` to continue init, `false` to stop after a real error.
+ Future _getPersonalAbGuid({required bool quiet}) async {
+ int? statusCode;
try {
final api = "${await bind.mainGetApiServer()}/api/ab/personal";
var headers = getHttpHeaders();
headers['Content-Type'] = "application/json";
_setEmptyBody(headers);
final resp = await http.post(Uri.parse(api), headers: headers);
- if (resp.statusCode == 404) {
+ statusCode = resp.statusCode;
+ if (statusCode == 404) {
debugPrint("HTTP 404, current api server is legacy mode");
- return false;
+ // Old server: keep `_personalAbGuid` null and continue in legacy mode.
+ return true;
}
Map json =
_jsonDecodeRespMap(decode_http_response(resp), resp.statusCode);
if (json.containsKey('error')) {
throw json['error'];
}
- if (resp.statusCode != 200) {
- throw 'HTTP ${resp.statusCode}';
+ if (statusCode != 200) {
+ throw 'HTTP $statusCode';
}
_personalAbGuid = json['guid'];
+ // New server: guid is available, continue in non-legacy mode.
return true;
} catch (err) {
debugPrint('get personal ab err: ${err.toString()}');
+ _setListPullError(err, quiet: quiet, statusCode: statusCode);
}
+ // Real error: stop the current pull.
return false;
}
- Future _getSharedAbProfiles(List profiles) async {
+ Future _getSharedAbProfiles(List profiles,
+ {required bool quiet}) async {
final api = "${await bind.mainGetApiServer()}/api/ab/shared/profiles";
+ int? statusCode;
try {
var uri0 = Uri.parse(api);
final pageSize = 100;
@@ -273,13 +316,19 @@ class AbModel {
headers['Content-Type'] = "application/json";
_setEmptyBody(headers);
final resp = await http.post(uri, headers: headers);
+ statusCode = resp.statusCode;
+ if (statusCode == 404) {
+ debugPrint(
+ "HTTP 404, api server doesn't support shared address book");
+ return false;
+ }
Map json =
_jsonDecodeRespMap(decode_http_response(resp), resp.statusCode);
if (json.containsKey('error')) {
throw json['error'];
}
- if (resp.statusCode != 200) {
- throw 'HTTP ${resp.statusCode}';
+ if (statusCode != 200) {
+ throw 'HTTP $statusCode';
}
if (json.containsKey('total')) {
if (total == 0) total = json['total'];
@@ -302,6 +351,7 @@ class AbModel {
return true;
} catch (err) {
debugPrint('_getSharedAbProfiles err: ${err.toString()}');
+ _setListPullError(err, quiet: quiet, statusCode: statusCode);
}
return false;
}
diff --git a/flutter/lib/models/file_model.dart b/flutter/lib/models/file_model.dart
index 35001cbf2..7d91b03b3 100644
--- a/flutter/lib/models/file_model.dart
+++ b/flutter/lib/models/file_model.dart
@@ -391,14 +391,30 @@ class FileController {
await Future.delayed(Duration(milliseconds: 100));
- final dir = (await bind.sessionGetPeerOption(
+ final savedDir = (await bind.sessionGetPeerOption(
sessionId: sessionId, name: isLocal ? "local_dir" : "remote_dir"));
- openDirectory(dir.isEmpty ? options.value.home : dir);
+ Future tryOpenReadyDirs() async {
+ final dirs = {
+ if (directory.value.path.isNotEmpty) directory.value.path,
+ if (savedDir.isNotEmpty) savedDir,
+ options.value.home,
+ };
+ for (final dir in dirs) {
+ if (await _openDirectoryPath(dir, isBack: true)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ var opened = await tryOpenReadyDirs();
await Future.delayed(Duration(seconds: 1));
- if (directory.value.path.isEmpty) {
- openDirectory(options.value.home);
+ if (!opened) {
+ // The peer may become ready during the reconnect delay, so retry the
+ // same candidates instead of only retrying the default home directory.
+ await tryOpenReadyDirs();
}
}
@@ -429,19 +445,23 @@ class FileController {
});
}
- Future refresh() async {
- await openDirectory(directory.value.path);
+ Future refresh() async {
+ // "." can be both a refresh command and a real remote directory path.
+ // Refresh must bypass openDirectory's command dispatch to avoid recursion.
+ return await _openDirectoryPath(directory.value.path, isBack: true);
}
- Future openDirectory(String path, {bool isBack = false}) async {
- if (path == ".") {
- refresh();
- return;
+ Future openDirectory(String path, {bool isBack = false}) async {
+ if (!isBack && path == ".") {
+ return await refresh();
}
- if (path == "..") {
- goToParentDirectory();
- return;
+ if (!isBack && path == "..") {
+ return await _goToParentDirectory(isBack: isBack);
}
+ return await _openDirectoryPath(path, isBack: isBack);
+ }
+
+ Future _openDirectoryPath(String path, {bool isBack = false}) async {
if (!isBack) {
pushHistory();
}
@@ -458,8 +478,10 @@ class FileController {
final fd = await fileFetcher.fetchDirectory(path, isLocal, showHidden);
fd.format(isWindows, sort: sortBy.value);
directory.value = fd;
+ return true;
} catch (e) {
debugPrint("Failed to openDirectory $path: $e");
+ return false;
}
}
@@ -487,19 +509,22 @@ class FileController {
goBack();
return;
}
- openDirectory(path, isBack: true);
+ unawaited(_openDirectoryPath(path, isBack: true).then((_) {}));
}
void goToParentDirectory() {
+ unawaited(_goToParentDirectory().then((_) {}));
+ }
+
+ Future _goToParentDirectory({bool isBack = false}) async {
final isWindows = options.value.isWindows;
final dirPath = directory.value.path;
var parent = PathUtil.dirname(dirPath, isWindows);
// specially for C:\, D:\, goto '/'
if (parent == dirPath && isWindows) {
- openDirectory('/');
- return;
+ return await _openDirectoryPath('/', isBack: isBack);
}
- openDirectory(parent);
+ return await _openDirectoryPath(parent, isBack: isBack);
}
// TODO deprecated this
diff --git a/flutter/lib/models/group_model.dart b/flutter/lib/models/group_model.dart
index c6ba992d2..d55cff453 100644
--- a/flutter/lib/models/group_model.dart
+++ b/flutter/lib/models/group_model.dart
@@ -343,6 +343,7 @@ class GroupModel {
}
reset() async {
+ initialized = false;
groupLoadError.value = '';
deviceGroups.clear();
users.clear();
diff --git a/flutter/lib/models/input_model.dart b/flutter/lib/models/input_model.dart
index 134b21107..984d6a25c 100644
--- a/flutter/lib/models/input_model.dart
+++ b/flutter/lib/models/input_model.dart
@@ -2,6 +2,7 @@ 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';
@@ -15,12 +16,13 @@ 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 }
+enum MouseButtons { left, right, wheel, back, forward }
const _kMouseEventDown = 'mousedown';
const _kMouseEventUp = 'mouseup';
@@ -157,6 +159,8 @@ extension ToString on MouseButtons {
return 'wheel';
case MouseButtons.back:
return 'back';
+ case MouseButtons.forward:
+ return 'forward';
}
}
}
@@ -327,6 +331,80 @@ 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 _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 (!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;
+ 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 parent;
String keyboardMode = '';
@@ -348,6 +426,12 @@ class InputModel {
final _trackpadAdjustPeerLinux = 0.06;
// This is an experience value.
final _trackpadAdjustMacToWin = 2.50;
+ // Ignore directional locking for very small deltas on both axes (including
+ // tiny single-axis movement) to avoid over-filtering near zero.
+ static const double _trackpadAxisNoiseThreshold = 0.2;
+ // Lock to dominant axis only when one axis is clearly stronger.
+ // 1.6 means the dominant axis must be >= 60% larger than the other.
+ static const double _trackpadAxisLockRatio = 1.6;
int _trackpadSpeed = kDefaultTrackpadSpeed;
double _trackpadSpeedInner = kDefaultTrackpadSpeed / 100.0;
var _trackpadScrollUnsent = Offset.zero;
@@ -365,6 +449,16 @@ class InputModel {
final isPhysicalMouse = false.obs;
int _lastButtons = 0;
Offset lastMousePos = Offset.zero;
+ int _lastWheelTsUs = 0;
+
+ // Wheel acceleration thresholds.
+ static const int _wheelAccelFastThresholdUs = 40000; // 40ms
+ static const int _wheelAccelMediumThresholdUs = 80000; // 80ms
+ static const double _wheelBurstVelocityThreshold =
+ 0.002; // delta units per microsecond
+ // Wheel burst acceleration (empirical tuning).
+ // Applies only to fast, non-smooth bursts to preserve single-step scrolling.
+ // Flutter uses microseconds for dt, so velocity is in delta/us.
// Relative mouse mode (for games/3D apps).
final relativeMouseMode = false.obs;
@@ -396,6 +490,7 @@ class InputModel {
bool get isRelativeMouseModeSupported => _relativeMouse.isSupported;
InputModel(this.parent) {
+ initSideButtonChannel();
sessionId = parent.target!.sessionId;
_relativeMouse = RelativeMouseModel(
sessionId: sessionId,
@@ -604,6 +699,38 @@ class InputModel {
}
}
+ // 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;
@@ -658,6 +785,27 @@ 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);
@@ -701,6 +849,8 @@ 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) {
@@ -738,6 +888,21 @@ 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) {
@@ -950,13 +1115,20 @@ 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 _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 sendMouse(String type, MouseButtons button) async {
if (!keyboardPerm) return;
if (isViewCamera) return;
- await bind.sessionSendMouse(
- sessionId: sessionId,
- msg: json.encode(modify({'type': type, 'buttons': button.value})));
+ await _sendMouseUnchecked(type, button);
}
void enterOrLeave(bool enter) {
@@ -964,6 +1136,14 @@ class InputModel {
toReleaseRawKeys.release(handleRawKeyEvent);
_pointerMovedAfterEnter = false;
_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) {
@@ -1161,6 +1341,7 @@ class InputModel {
if (isMacOS && peerPlatform == kPeerPlatformWindows) {
delta *= _trackpadAdjustMacToWin;
}
+ delta = _filterTrackpadDeltaAxis(delta);
_trackpadLastDelta = delta;
var x = delta.dx.toInt();
@@ -1193,6 +1374,24 @@ class InputModel {
}
}
+ Offset _filterTrackpadDeltaAxis(Offset delta) {
+ final absDx = delta.dx.abs();
+ final absDy = delta.dy.abs();
+ // Keep diagonal intent when movement is tiny on both axes.
+ if (absDx < _trackpadAxisNoiseThreshold &&
+ absDy < _trackpadAxisNoiseThreshold) {
+ return delta;
+ }
+ // Dominant-axis lock to reduce accidental cross-axis scrolling noise.
+ if (absDy >= absDx * _trackpadAxisLockRatio) {
+ return Offset(0, delta.dy);
+ }
+ if (absDx >= absDy * _trackpadAxisLockRatio) {
+ return Offset(delta.dx, 0);
+ }
+ return delta;
+ }
+
void _scheduleFling(double x, double y, int delay) {
if (isViewCamera) return;
if ((x == 0 && y == 0) || _stopFling) {
@@ -1296,6 +1495,16 @@ 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;
@@ -1308,6 +1517,9 @@ 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;
}
@@ -1317,6 +1529,10 @@ 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;
}
@@ -1407,17 +1623,44 @@ class InputModel {
if (isViewOnly) return;
if (isViewCamera) return;
if (e is PointerScrollEvent) {
- var dx = e.scrollDelta.dx.toInt();
- var dy = e.scrollDelta.dy.toInt();
+ final rawDx = e.scrollDelta.dx;
+ final rawDy = e.scrollDelta.dy;
+ final dominantDelta = rawDx.abs() > rawDy.abs() ? rawDx.abs() : rawDy.abs();
+ final isSmooth = dominantDelta < 1;
+ final nowUs = DateTime.now().microsecondsSinceEpoch;
+ final dtUs = _lastWheelTsUs == 0 ? 0 : nowUs - _lastWheelTsUs;
+ _lastWheelTsUs = nowUs;
+ int accel = 1;
+ if (!isSmooth &&
+ dtUs > 0 &&
+ dtUs <= _wheelAccelMediumThresholdUs &&
+ (isWindows || isLinux) &&
+ peerPlatform == kPeerPlatformMacOS) {
+ final velocity = dominantDelta / dtUs;
+ if (velocity >= _wheelBurstVelocityThreshold) {
+ if (dtUs < _wheelAccelFastThresholdUs) {
+ accel = 3;
+ } else {
+ accel = 2;
+ }
+ }
+ }
+ var dx = rawDx.toInt();
+ var dy = rawDy.toInt();
+ if (rawDx.abs() > rawDy.abs()) {
+ dy = 0;
+ } else {
+ dx = 0;
+ }
if (dx > 0) {
- dx = -1;
+ dx = -accel;
} else if (dx < 0) {
- dx = 1;
+ dx = accel;
}
if (dy > 0) {
- dy = -1;
+ dy = -accel;
} else if (dy < 0) {
- dy = 1;
+ dy = accel;
}
bind.sessionSendMouse(
sessionId: sessionId,
diff --git a/flutter/lib/models/input_modifier_utils.dart b/flutter/lib/models/input_modifier_utils.dart
new file mode 100644
index 000000000..e65c32790
--- /dev/null
+++ b/flutter/lib/models/input_modifier_utils.dart
@@ -0,0 +1,38 @@
+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;
+}
diff --git a/flutter/lib/models/model.dart b/flutter/lib/models/model.dart
index 7a3f98377..e94834a2b 100644
--- a/flutter/lib/models/model.dart
+++ b/flutter/lib/models/model.dart
@@ -1016,19 +1016,31 @@ class FfiModel with ChangeNotifier {
showMsgBox(SessionID sessionId, String type, String title, String text,
String link, bool hasRetry, OverlayDialogManager dialogManager,
{bool? hasCancel}) async {
- final showNoteEdit = parent.target != null &&
+ final noteAllowed = parent.target != null &&
allowAskForNoteAtEndOfConnection(parent.target, false) &&
- (title == "Connection Error" || type == "restarting") &&
- !hasRetry;
+ (title == "Connection Error" || type == "restarting");
+ final showNoteEdit = noteAllowed && !hasRetry;
if (showNoteEdit) {
await showConnEndAuditDialogCloseCanceled(
ffi: parent.target!, type: type, title: title, text: text);
closeConnection();
} else {
+ VoidCallback? onSubmit;
+ if (noteAllowed && hasRetry) {
+ final ffi = parent.target!;
+ onSubmit = () async {
+ _timer?.cancel();
+ _timer = null;
+ await showConnEndAuditDialogCloseCanceled(
+ ffi: ffi, type: type, title: title, text: text);
+ closeConnection();
+ };
+ }
msgBox(sessionId, type, title, text, link, dialogManager,
hasCancel: hasCancel,
reconnect: hasRetry ? reconnect : null,
- reconnectTimeout: hasRetry ? _reconnects : null);
+ reconnectTimeout: hasRetry ? _reconnects : null,
+ onSubmit: onSubmit);
}
_timer?.cancel();
if (hasRetry) {
@@ -2152,6 +2164,9 @@ class CanvasModel with ChangeNotifier {
ViewStyle _lastViewStyle = ViewStyle.defaultViewStyle();
Timer? _timerMobileFocusCanvasCursor;
+ Timer? _timerMobileRestoreCanvasOffset;
+ Offset? _offsetBeforeMobileSoftKeyboard;
+ double? _scaleBeforeMobileSoftKeyboard;
// `isMobileCanvasChanged` is used to avoid canvas reset when changing the input method
// after showing the soft keyboard.
@@ -2215,10 +2230,32 @@ class CanvasModel with ChangeNotifier {
double w = size.width - leftToEdge - rightToEdge;
double h = size.height - topToEdge - bottomToEdge;
if (isMobile) {
+ // Account for horizontal safe area insets on both orientations.
+ w = w - mediaData.padding.left - mediaData.padding.right;
+ // Vertically, subtract the bottom keyboard inset (viewInsets.bottom) and any
+ // bottom overlay (e.g. key-help tools) so the canvas is not covered.
h = h -
mediaData.viewInsets.bottom -
(parent.target?.cursorModel.keyHelpToolsRectToAdjustCanvas?.bottom ??
0);
+ // Orientation-specific handling:
+ // - Portrait: additionally subtract top padding (e.g. status bar / notch)
+ // - Landscape: does not subtract mediaData.padding.top/bottom (home indicator auto-hides)
+ final isPortrait = size.height > size.width;
+ if (isPortrait) {
+ // In portrait mode, subtract the top safe-area padding (e.g. status bar / notch)
+ // so the remote image is not truncated, while keeping the bottom inset to avoid
+ // introducing unnecessary blank space around the canvas.
+ //
+ // iOS -> Android, portrait, adjust mode:
+ // h = h (no padding subtracted): top and bottom are truncated
+ // https://github.com/user-attachments/assets/30ed4559-c27e-432b-847f-8fec23c9f998
+ // h = h - top - bottom: extra blank spaces appear
+ // https://github.com/user-attachments/assets/12a98817-3b4e-43aa-be0f-4b03cf364b7e
+ // h = h - top (current): works fine
+ // https://github.com/user-attachments/assets/95f047f2-7f47-4a36-8113-5023989a0c81
+ h = h - mediaData.padding.top;
+ }
}
return Size(w < 0 ? 0 : w, h < 0 ? 0 : h);
}
@@ -2617,6 +2654,9 @@ class CanvasModel with ChangeNotifier {
_scale = 1.0;
_lastViewStyle = ViewStyle.defaultViewStyle();
_timerMobileFocusCanvasCursor?.cancel();
+ _timerMobileRestoreCanvasOffset?.cancel();
+ _offsetBeforeMobileSoftKeyboard = null;
+ _scaleBeforeMobileSoftKeyboard = null;
}
updateScrollPercent() {
@@ -2645,6 +2685,31 @@ class CanvasModel with ChangeNotifier {
});
}
+ void saveMobileOffsetBeforeSoftKeyboard() {
+ _timerMobileRestoreCanvasOffset?.cancel();
+ _offsetBeforeMobileSoftKeyboard = Offset(_x, _y);
+ _scaleBeforeMobileSoftKeyboard = _scale;
+ }
+
+ void restoreMobileOffsetAfterSoftKeyboard() {
+ _timerMobileRestoreCanvasOffset?.cancel();
+ _timerMobileFocusCanvasCursor?.cancel();
+ final targetOffset = _offsetBeforeMobileSoftKeyboard;
+ final targetScale = _scaleBeforeMobileSoftKeyboard;
+ if (targetOffset == null || targetScale == null) {
+ return;
+ }
+ _timerMobileRestoreCanvasOffset = Timer(Duration(milliseconds: 100), () {
+ updateSize();
+ _x = targetOffset.dx;
+ _y = targetOffset.dy;
+ _scale = targetScale;
+ _offsetBeforeMobileSoftKeyboard = null;
+ _scaleBeforeMobileSoftKeyboard = null;
+ notifyListeners();
+ });
+ }
+
// mobile only
// Move the canvas to make the cursor visible(center) on the screen.
void _moveToCenterCursor() {
@@ -2897,8 +2962,13 @@ class CursorModel with ChangeNotifier {
_lastIsBlocked = true;
}
if (isMobile && _lastKeyboardIsVisible != keyboardIsVisible) {
- parent.target?.canvasModel.mobileFocusCanvasCursor();
- parent.target?.canvasModel.isMobileCanvasChanged = false;
+ if (keyboardIsVisible) {
+ parent.target?.canvasModel.saveMobileOffsetBeforeSoftKeyboard();
+ parent.target?.canvasModel.mobileFocusCanvasCursor();
+ parent.target?.canvasModel.isMobileCanvasChanged = false;
+ } else {
+ parent.target?.canvasModel.restoreMobileOffsetAfterSoftKeyboard();
+ }
}
_lastKeyboardIsVisible = keyboardIsVisible;
}
@@ -3862,6 +3932,7 @@ 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);
}
diff --git a/flutter/lib/models/server_model.dart b/flutter/lib/models/server_model.dart
index 8ead158ac..40c94fcf5 100644
--- a/flutter/lib/models/server_model.dart
+++ b/flutter/lib/models/server_model.dart
@@ -298,7 +298,7 @@ class ServerModel with ChangeNotifier {
}
toggleAudio() async {
- if (clients.isNotEmpty) {
+ if (clients.any((c) => !c.disconnected)) {
await showClientsMayNotBeChangedAlert(parent.target);
}
if (!_audioOk && !await AndroidPermissionManager.check(kRecordAudio)) {
@@ -316,7 +316,7 @@ class ServerModel with ChangeNotifier {
}
toggleFile() async {
- if (clients.isNotEmpty) {
+ if (clients.any((c) => !c.disconnected)) {
await showClientsMayNotBeChangedAlert(parent.target);
}
if (!_fileOk &&
@@ -345,7 +345,7 @@ class ServerModel with ChangeNotifier {
}
toggleInput() async {
- if (clients.isNotEmpty) {
+ if (clients.any((c) => !c.disconnected)) {
await showClientsMayNotBeChangedAlert(parent.target);
}
if (_inputOk) {
@@ -471,17 +471,6 @@ class ServerModel with ChangeNotifier {
WakelockManager.disable(_wakelockKey);
}
- Future setPermanentPassword(String newPW) async {
- await bind.mainSetPermanentPassword(password: newPW);
- await Future.delayed(Duration(milliseconds: 500));
- final pw = await bind.mainGetPermanentPassword();
- if (newPW == pw) {
- return true;
- } else {
- return false;
- }
- }
-
fetchID() async {
final id = await bind.mainGetMyId();
if (id != _serverId.id) {
@@ -560,10 +549,19 @@ class ServerModel with ChangeNotifier {
if (index < 0) {
_clients.add(client);
} else {
+ if (_clients[index].authorized) {
+ _clients[index].privacyMode = client.privacyMode;
+ notifyListeners();
+ return;
+ }
_clients[index].authorized = true;
+ _clients[index].privacyMode = client.privacyMode;
}
} else {
- if (_clients.any((c) => c.id == client.id)) {
+ final index = _clients.indexWhere((c) => c.id == client.id);
+ if (index >= 0) {
+ _clients[index].privacyMode = client.privacyMode;
+ notifyListeners();
return;
}
_clients.add(client);
@@ -820,6 +818,7 @@ class Client {
bool isTerminal = false;
String portForward = "";
String name = "";
+ String avatar = "";
String peerId = ""; // peer user's id,show at app
bool keyboard = false;
bool clipboard = false;
@@ -828,6 +827,7 @@ class Client {
bool restart = false;
bool recording = false;
bool blockInput = false;
+ bool privacyMode = false;
bool disconnected = false;
bool fromSwitch = false;
bool inVoiceCall = false;
@@ -847,6 +847,7 @@ class Client {
isTerminal = json['is_terminal'] ?? false;
portForward = json['port_forward'];
name = json['name'];
+ avatar = json['avatar'] ?? '';
peerId = json['peer_id'];
keyboard = json['keyboard'];
clipboard = json['clipboard'];
@@ -855,6 +856,7 @@ class Client {
restart = json['restart'];
recording = json['recording'];
blockInput = json['block_input'];
+ privacyMode = json['privacy_mode'] ?? privacyMode;
disconnected = json['disconnected'];
fromSwitch = json['from_switch'];
inVoiceCall = json['in_voice_call'];
@@ -870,6 +872,7 @@ class Client {
data['is_terminal'] = isTerminal;
data['port_forward'] = portForward;
data['name'] = name;
+ data['avatar'] = avatar;
data['peer_id'] = peerId;
data['keyboard'] = keyboard;
data['clipboard'] = clipboard;
@@ -878,6 +881,7 @@ class Client {
data['restart'] = restart;
data['recording'] = recording;
data['block_input'] = blockInput;
+ data['privacy_mode'] = privacyMode;
data['disconnected'] = disconnected;
data['from_switch'] = fromSwitch;
data['in_voice_call'] = inVoiceCall;
diff --git a/flutter/lib/models/terminal_model.dart b/flutter/lib/models/terminal_model.dart
index ca4f2c11d..8961d2dd8 100644
--- a/flutter/lib/models/terminal_model.dart
+++ b/flutter/lib/models/terminal_model.dart
@@ -24,21 +24,33 @@ class TerminalModel with ChangeNotifier {
bool _disposed = false;
final _inputBuffer = [];
-
- bool get isPeerWindows => parent.ffiModel.pi.platform == kPeerPlatformWindows;
+ // 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 = [];
+ final _pendingOutputSuppressFlags = [];
+ 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 _markViewReadyScheduled = false;
+ bool _suppressTerminalOutput = false;
+ bool _suppressNextTerminalDataOutput = false;
void Function(int w, int h, int pw, int ph)? onResizeExternal;
Future _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) {
@@ -63,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
@@ -74,6 +89,12 @@ class TerminalModel with ChangeNotifier {
// This piece of code must be placed before the conditional check in order to initialize properly.
onResizeExternal?.call(w, h, pw, ph);
+ // 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) {
+ _scheduleMarkViewReady();
+ }
+
if (_terminalOpened) {
// Notify remote terminal of resize
try {
@@ -97,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 openTerminal() async {
- if (_terminalOpened) return;
+ Future 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
@@ -141,7 +164,7 @@ class TerminalModel with ChangeNotifier {
debugPrint('[TerminalModel] Error calling sessionOpenTerminal: $e');
// Optionally show error to user
if (e is TimeoutException) {
- terminal.write('Failed to open terminal: Connection timeout\r\n');
+ _writeToTerminal('Failed to open terminal: Connection timeout\r\n');
}
}
}
@@ -253,8 +276,8 @@ class TerminalModel with ChangeNotifier {
void _handleTerminalOpened(Map evt) {
final bool success = getSuccessFromEvt(evt);
- final String message = evt['message'] ?? '';
- final String? serviceId = evt['service_id'];
+ final String message = evt['message']?.toString() ?? '';
+ final String? serviceId = evt['service_id']?.toString();
debugPrint(
'[TerminalModel] Terminal opened response: success=$success, message=$message, service_id=$serviceId');
@@ -262,7 +285,21 @@ class TerminalModel with ChangeNotifier {
if (success) {
_terminalOpened = true;
- // Service ID is now saved on the Rust side in handle_terminal_response
+ // 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),
+ // mark view ready now to avoid output stuck in buffer indefinitely.
+ if (!_terminalViewReady &&
+ terminal.viewWidth > 0 &&
+ terminal.viewHeight > 0) {
+ _scheduleMarkViewReady();
+ }
// Process any buffered input
_processBufferedInputAsync().then((_) {
@@ -273,17 +310,21 @@ class TerminalModel with ChangeNotifier {
});
final persistentSessions =
- evt['persistent_sessions'] as List? ?? [];
+ (evt['persistent_sessions'] as List? ?? [])
+ .whereType()
+ .where((id) => !parent.terminalModels.containsKey(id))
+ .toList();
if (kWindowId != null && persistentSessions.isNotEmpty) {
DesktopMultiWindow.invokeMethod(
kWindowId!,
kWindowEventRestoreTerminalSessions,
jsonEncode({
+ 'peer_id': id,
'persistent_sessions': persistentSessions,
}));
}
} else {
- terminal.write('Failed to open terminal: $message\r\n');
+ _writeToTerminal('Failed to open terminal: $message\r\n');
}
}
@@ -308,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) {
@@ -327,29 +370,127 @@ class TerminalModel with ChangeNotifier {
return;
}
- terminal.write(text);
+ _writeToTerminal(text, suppressTerminalOutput: suppressTerminalOutput);
} catch (e) {
debugPrint('[TerminalModel] Failed to process terminal data: $e');
}
}
}
+ /// 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, {
+ 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,
+ // which can cause a brief visual glitch on flush. This is acceptable
+ // because it only affects the pre-layout buffering window and the
+ // terminal will self-correct on subsequent output.
+ if (text.length >= _kMaxOutputBufferChars) {
+ final truncated = text.substring(text.length - _kMaxOutputBufferChars);
+ _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;
+ }
+ _writeTerminalChunk(text, suppressTerminalOutput: suppressTerminalOutput);
+ }
+
+ void _flushOutputBuffer() {
+ if (_pendingOutputChunks.isEmpty) return;
+ debugPrint(
+ '[TerminalModel] Flushing $_pendingOutputSize buffered chars (${_pendingOutputChunks.length} chunks)');
+ 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;
+ _flushOutputBuffer();
+ }
+
void _handleTerminalClosed(Map evt) {
final int exitCode = evt['exit_code'] ?? 0;
- terminal.write('\r\nTerminal closed with exit code: $exitCode\r\n');
+ _writeToTerminal('\r\nTerminal closed with exit code: $exitCode\r\n');
_terminalOpened = false;
notifyListeners();
}
void _handleTerminalError(Map evt) {
final String message = evt['message'] ?? 'Unknown error';
- terminal.write('\r\nTerminal error: $message\r\n');
+ _writeToTerminal('\r\nTerminal error: $message\r\n');
}
@override
void dispose() {
if (_disposed) return;
_disposed = true;
+ // 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();
}
diff --git a/flutter/lib/models/user_model.dart b/flutter/lib/models/user_model.dart
index 217d74aee..cecb58eaa 100644
--- a/flutter/lib/models/user_model.dart
+++ b/flutter/lib/models/user_model.dart
@@ -16,9 +16,25 @@ bool refreshingUser = false;
class UserModel {
final RxString userName = ''.obs;
+ final RxString displayName = ''.obs;
+ final RxString avatar = ''.obs;
final RxBool isAdmin = false.obs;
final RxString networkError = ''.obs;
bool get isLogin => userName.isNotEmpty;
+ String get displayNameOrUserName =>
+ displayName.value.trim().isEmpty ? userName.value : displayName.value;
+ String get accountLabelWithHandle {
+ final username = userName.value.trim();
+ if (username.isEmpty) {
+ return '';
+ }
+ final preferred = displayName.value.trim();
+ if (preferred.isEmpty || preferred == username) {
+ return username;
+ }
+ return '$preferred (@$username)';
+ }
+
WeakReference parent;
UserModel(this.parent) {
@@ -98,7 +114,9 @@ class UserModel {
_updateLocalUserInfo() {
final userInfo = getLocalUserInfo();
if (userInfo != null) {
- userName.value = userInfo['name'];
+ userName.value = (userInfo['name'] ?? '').toString();
+ displayName.value = (userInfo['display_name'] ?? '').toString();
+ avatar.value = (userInfo['avatar'] ?? '').toString();
}
}
@@ -110,10 +128,14 @@ class UserModel {
await gFFI.groupModel.reset();
}
userName.value = '';
+ displayName.value = '';
+ avatar.value = '';
}
_parseAndUpdateUser(UserPayload user) {
userName.value = user.name;
+ displayName.value = user.displayName;
+ avatar.value = user.avatar;
isAdmin.value = user.isAdmin;
bind.mainSetLocalOption(key: 'user_info', value: jsonEncode(user));
if (isWeb) {
diff --git a/flutter/lib/web/bridge.dart b/flutter/lib/web/bridge.dart
index 4a4e89233..54e6a9a9b 100644
--- a/flutter/lib/web/bridge.dart
+++ b/flutter/lib/web/bridge.dart
@@ -1159,10 +1159,6 @@ class RustdeskImpl {
return Future.value('');
}
- Future mainGetPermanentPassword({dynamic hint}) {
- return Future.value('');
- }
-
Future mainGetFingerprint({dynamic hint}) {
return Future.value('');
}
@@ -1346,9 +1342,9 @@ class RustdeskImpl {
throw UnimplementedError("mainUpdateTemporaryPassword");
}
- Future mainSetPermanentPassword(
+ Future mainSetPermanentPasswordWithResult(
{required String password, dynamic hint}) {
- throw UnimplementedError("mainSetPermanentPassword");
+ throw UnimplementedError("mainSetPermanentPasswordWithResult");
}
Future mainCheckSuperUserPermission({dynamic hint}) {
@@ -1542,7 +1538,10 @@ class RustdeskImpl {
Future mainAccountAuth(
{required String op, required bool rememberMe, dynamic hint}) {
- return Future(() => js.context.callMethod('setByName', [
+ // Safari only allows auth popups while handling the original user gesture.
+ // Use Future.sync so the JS call runs synchronously (pre-opening the OIDC
+ // window) while any interop error still surfaces as a Future error.
+ return Future.sync(() => js.context.callMethod('setByName', [
'account_auth',
jsonEncode({'op': op, 'remember': rememberMe})
]));
@@ -1730,7 +1729,7 @@ class RustdeskImpl {
}
String mainSupportedPrivacyModeImpls({dynamic hint}) {
- throw UnimplementedError("mainSupportedPrivacyModeImpls");
+ return '[]';
}
String mainSupportedInputSource({dynamic hint}) {
@@ -2034,5 +2033,9 @@ class RustdeskImpl {
return false;
}
+ String mainResolveAvatarUrl({required String avatar, dynamic hint}) {
+ return js.context.callMethod('getByName', ['resolve_avatar_url', avatar])?.toString() ?? avatar;
+ }
+
void dispose() {}
}
diff --git a/flutter/linux/CMakeLists.txt b/flutter/linux/CMakeLists.txt
index d320f403c..56a8dbb70 100644
--- a/flutter/linux/CMakeLists.txt
+++ b/flutter/linux/CMakeLists.txt
@@ -1,6 +1,6 @@
# Project-level configuration.
cmake_minimum_required(VERSION 3.10)
-project(runner LANGUAGES CXX)
+project(runner LANGUAGES C CXX)
# The name of the executable created for the application. Change this to change
# the on-disk name of your application.
@@ -54,6 +54,55 @@ add_subdirectory(${FLUTTER_MANAGED_DIR})
find_package(PkgConfig REQUIRED)
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
+# Wayland protocol for keyboard shortcuts inhibit
+pkg_check_modules(WAYLAND_CLIENT IMPORTED_TARGET wayland-client)
+pkg_check_modules(WAYLAND_PROTOCOLS_PKG QUIET wayland-protocols)
+pkg_check_modules(WAYLAND_SCANNER_PKG QUIET wayland-scanner)
+
+if(WAYLAND_PROTOCOLS_PKG_FOUND)
+ pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
+endif()
+if(WAYLAND_SCANNER_PKG_FOUND)
+ pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner)
+endif()
+
+if(WAYLAND_CLIENT_FOUND AND WAYLAND_PROTOCOLS_DIR AND WAYLAND_SCANNER)
+ set(KEYBOARD_SHORTCUTS_INHIBIT_PROTOCOL
+ "${WAYLAND_PROTOCOLS_DIR}/unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml")
+
+ if(EXISTS ${KEYBOARD_SHORTCUTS_INHIBIT_PROTOCOL})
+ set(WAYLAND_GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/wayland-protocols")
+ file(MAKE_DIRECTORY ${WAYLAND_GENERATED_DIR})
+
+ # Generate client header
+ add_custom_command(
+ OUTPUT "${WAYLAND_GENERATED_DIR}/keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h"
+ COMMAND ${WAYLAND_SCANNER} client-header
+ ${KEYBOARD_SHORTCUTS_INHIBIT_PROTOCOL}
+ "${WAYLAND_GENERATED_DIR}/keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h"
+ DEPENDS ${KEYBOARD_SHORTCUTS_INHIBIT_PROTOCOL}
+ VERBATIM
+ )
+
+ # Generate protocol code
+ add_custom_command(
+ OUTPUT "${WAYLAND_GENERATED_DIR}/keyboard-shortcuts-inhibit-unstable-v1-protocol.c"
+ COMMAND ${WAYLAND_SCANNER} private-code
+ ${KEYBOARD_SHORTCUTS_INHIBIT_PROTOCOL}
+ "${WAYLAND_GENERATED_DIR}/keyboard-shortcuts-inhibit-unstable-v1-protocol.c"
+ DEPENDS ${KEYBOARD_SHORTCUTS_INHIBIT_PROTOCOL}
+ VERBATIM
+ )
+
+ set(WAYLAND_PROTOCOL_SOURCES
+ "${WAYLAND_GENERATED_DIR}/keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h"
+ "${WAYLAND_GENERATED_DIR}/keyboard-shortcuts-inhibit-unstable-v1-protocol.c"
+ )
+
+ set(HAS_KEYBOARD_SHORTCUTS_INHIBIT TRUE)
+ endif()
+endif()
+
add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
# Define the application target. To change its name, change BINARY_NAME above,
@@ -63,9 +112,11 @@ add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
add_executable(${BINARY_NAME}
"main.cc"
"my_application.cc"
+ "wayland_shortcuts_inhibit.cc"
"bump_mouse.cc"
"bump_mouse_x11.cc"
"${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
+ ${WAYLAND_PROTOCOL_SOURCES}
)
# Apply the standard set of build settings. This can be removed for applications
@@ -78,6 +129,13 @@ target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
target_link_libraries(${BINARY_NAME} PRIVATE ${CMAKE_DL_LIBS})
# target_link_libraries(${BINARY_NAME} PRIVATE librustdesk)
+# Wayland support for keyboard shortcuts inhibit
+if(HAS_KEYBOARD_SHORTCUTS_INHIBIT)
+ target_compile_definitions(${BINARY_NAME} PRIVATE HAS_KEYBOARD_SHORTCUTS_INHIBIT)
+ target_include_directories(${BINARY_NAME} PRIVATE ${WAYLAND_GENERATED_DIR})
+ target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::WAYLAND_CLIENT)
+endif()
+
# Run the Flutter tool portions of the build. This must not be removed.
add_dependencies(${BINARY_NAME} flutter_assemble)
diff --git a/flutter/linux/my_application.cc b/flutter/linux/my_application.cc
index c84cbddba..210adba96 100644
--- a/flutter/linux/my_application.cc
+++ b/flutter/linux/my_application.cc
@@ -6,6 +6,11 @@
#ifdef GDK_WINDOWING_X11
#include
#endif
+#if defined(GDK_WINDOWING_WAYLAND) && defined(HAS_KEYBOARD_SHORTCUTS_INHIBIT)
+#include "wayland_shortcuts_inhibit.h"
+#endif
+
+#include
#include "flutter/generated_plugin_registrant.h"
@@ -24,6 +29,80 @@ 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.
@@ -91,6 +170,13 @@ 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.
+ desktop_multi_window_plugin_set_window_created_callback(
+ (WindowCreatedCallback)on_subwindow_created);
+
fl_register_plugins(FL_PLUGIN_REGISTRY(view));
g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new();
@@ -104,6 +190,11 @@ 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));
}
diff --git a/flutter/linux/wayland_shortcuts_inhibit.cc b/flutter/linux/wayland_shortcuts_inhibit.cc
new file mode 100644
index 000000000..76c45be4d
--- /dev/null
+++ b/flutter/linux/wayland_shortcuts_inhibit.cc
@@ -0,0 +1,244 @@
+// Wayland keyboard shortcuts inhibit implementation
+// Uses the zwp_keyboard_shortcuts_inhibit_manager_v1 protocol to request
+// the compositor to disable system shortcuts for specific windows.
+
+#include "wayland_shortcuts_inhibit.h"
+
+#if defined(GDK_WINDOWING_WAYLAND) && defined(HAS_KEYBOARD_SHORTCUTS_INHIBIT)
+
+#include
+#include
+#include
+#include "keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h"
+
+// Data structure to hold inhibitor state for each window
+typedef struct {
+ struct zwp_keyboard_shortcuts_inhibit_manager_v1* manager;
+ struct zwp_keyboard_shortcuts_inhibitor_v1* inhibitor;
+} ShortcutsInhibitData;
+
+// Cleanup function for ShortcutsInhibitData
+static void shortcuts_inhibit_data_free(gpointer data) {
+ ShortcutsInhibitData* inhibit_data = static_cast(data);
+ if (inhibit_data->inhibitor != NULL) {
+ zwp_keyboard_shortcuts_inhibitor_v1_destroy(inhibit_data->inhibitor);
+ }
+ if (inhibit_data->manager != NULL) {
+ zwp_keyboard_shortcuts_inhibit_manager_v1_destroy(inhibit_data->manager);
+ }
+ g_free(inhibit_data);
+}
+
+// Wayland registry handler to find the shortcuts inhibit manager
+static void registry_handle_global(void* data, struct wl_registry* registry,
+ uint32_t name, const char* interface,
+ uint32_t /*version*/) {
+ ShortcutsInhibitData* inhibit_data = static_cast(data);
+ if (strcmp(interface,
+ zwp_keyboard_shortcuts_inhibit_manager_v1_interface.name) == 0) {
+ inhibit_data->manager =
+ static_cast(wl_registry_bind(
+ registry, name, &zwp_keyboard_shortcuts_inhibit_manager_v1_interface,
+ 1));
+ }
+}
+
+static void registry_handle_global_remove(void* /*data*/, struct wl_registry* /*registry*/,
+ uint32_t /*name*/) {
+ // Not needed for this use case
+}
+
+static const struct wl_registry_listener registry_listener = {
+ registry_handle_global,
+ registry_handle_global_remove,
+};
+
+// Inhibitor event handlers
+static void inhibitor_active(void* /*data*/,
+ struct zwp_keyboard_shortcuts_inhibitor_v1* /*inhibitor*/) {
+ // Inhibitor is now active, shortcuts are being captured
+}
+
+static void inhibitor_inactive(void* /*data*/,
+ struct zwp_keyboard_shortcuts_inhibitor_v1* /*inhibitor*/) {
+ // Inhibitor is now inactive, shortcuts restored to compositor
+}
+
+static const struct zwp_keyboard_shortcuts_inhibitor_v1_listener inhibitor_listener = {
+ inhibitor_active,
+ inhibitor_inactive,
+};
+
+// Forward declaration
+static void uninhibit_keyboard_shortcuts(GtkWindow* window);
+
+// Inhibit keyboard shortcuts on Wayland for a specific window
+static void inhibit_keyboard_shortcuts(GtkWindow* window) {
+ GdkDisplay* display = gtk_widget_get_display(GTK_WIDGET(window));
+ if (!GDK_IS_WAYLAND_DISPLAY(display)) {
+ return;
+ }
+
+ // Check if already inhibited for this window
+ if (g_object_get_data(G_OBJECT(window), "shortcuts-inhibit-data") != NULL) {
+ return;
+ }
+
+ ShortcutsInhibitData* inhibit_data = g_new0(ShortcutsInhibitData, 1);
+
+ struct wl_display* wl_display = gdk_wayland_display_get_wl_display(display);
+ if (wl_display == NULL) {
+ shortcuts_inhibit_data_free(inhibit_data);
+ return;
+ }
+
+ struct wl_registry* registry = wl_display_get_registry(wl_display);
+ if (registry == NULL) {
+ shortcuts_inhibit_data_free(inhibit_data);
+ return;
+ }
+
+ wl_registry_add_listener(registry, ®istry_listener, inhibit_data);
+ wl_display_roundtrip(wl_display);
+
+ if (inhibit_data->manager == NULL) {
+ wl_registry_destroy(registry);
+ shortcuts_inhibit_data_free(inhibit_data);
+ return;
+ }
+
+ GdkWindow* gdk_window = gtk_widget_get_window(GTK_WIDGET(window));
+ if (gdk_window == NULL) {
+ wl_registry_destroy(registry);
+ shortcuts_inhibit_data_free(inhibit_data);
+ return;
+ }
+
+ struct wl_surface* surface = gdk_wayland_window_get_wl_surface(gdk_window);
+ if (surface == NULL) {
+ wl_registry_destroy(registry);
+ shortcuts_inhibit_data_free(inhibit_data);
+ return;
+ }
+
+ GdkSeat* gdk_seat = gdk_display_get_default_seat(display);
+ if (gdk_seat == NULL) {
+ wl_registry_destroy(registry);
+ shortcuts_inhibit_data_free(inhibit_data);
+ return;
+ }
+
+ struct wl_seat* seat = gdk_wayland_seat_get_wl_seat(gdk_seat);
+ if (seat == NULL) {
+ wl_registry_destroy(registry);
+ shortcuts_inhibit_data_free(inhibit_data);
+ return;
+ }
+
+ inhibit_data->inhibitor =
+ zwp_keyboard_shortcuts_inhibit_manager_v1_inhibit_shortcuts(
+ inhibit_data->manager, surface, seat);
+
+ if (inhibit_data->inhibitor == NULL) {
+ wl_registry_destroy(registry);
+ shortcuts_inhibit_data_free(inhibit_data);
+ return;
+ }
+
+ // Add listener to monitor active/inactive state
+ zwp_keyboard_shortcuts_inhibitor_v1_add_listener(
+ inhibit_data->inhibitor, &inhibitor_listener, window);
+
+ wl_display_roundtrip(wl_display);
+ wl_registry_destroy(registry);
+
+ // Associate the inhibit data with the window for cleanup on destroy
+ g_object_set_data_full(G_OBJECT(window), "shortcuts-inhibit-data",
+ inhibit_data, shortcuts_inhibit_data_free);
+}
+
+// Remove keyboard shortcuts inhibitor from a window
+static void uninhibit_keyboard_shortcuts(GtkWindow* window) {
+ ShortcutsInhibitData* inhibit_data = static_cast(
+ g_object_get_data(G_OBJECT(window), "shortcuts-inhibit-data"));
+
+ if (inhibit_data == NULL) {
+ return;
+ }
+
+ // This will trigger shortcuts_inhibit_data_free via g_object_set_data
+ g_object_set_data(G_OBJECT(window), "shortcuts-inhibit-data", NULL);
+}
+
+// Focus event handlers for dynamic inhibitor management
+static gboolean on_window_focus_in(GtkWidget* widget, GdkEventFocus* /*event*/, gpointer /*user_data*/) {
+ if (GTK_IS_WINDOW(widget)) {
+ inhibit_keyboard_shortcuts(GTK_WINDOW(widget));
+ }
+ return FALSE; // Continue event propagation
+}
+
+static gboolean on_window_focus_out(GtkWidget* widget, GdkEventFocus* /*event*/, gpointer /*user_data*/) {
+ if (GTK_IS_WINDOW(widget)) {
+ uninhibit_keyboard_shortcuts(GTK_WINDOW(widget));
+ }
+ return FALSE; // Continue event propagation
+}
+
+// Key for marking window as having focus handlers connected
+static const char* const kFocusHandlersConnectedKey = "shortcuts-inhibit-focus-handlers-connected";
+// Key for marking window as having a pending realize handler
+static const char* const kRealizeHandlerConnectedKey = "shortcuts-inhibit-realize-handler-connected";
+
+// Callback when window is realized (mapped to screen)
+// Sets up focus-based inhibitor management
+static void on_window_realize(GtkWidget* widget, gpointer /*user_data*/) {
+ if (GTK_IS_WINDOW(widget)) {
+ // Check if focus handlers are already connected to avoid duplicates
+ if (g_object_get_data(G_OBJECT(widget), kFocusHandlersConnectedKey) != NULL) {
+ return;
+ }
+
+ // Connect focus events for dynamic inhibitor management
+ g_signal_connect(widget, "focus-in-event",
+ G_CALLBACK(on_window_focus_in), NULL);
+ g_signal_connect(widget, "focus-out-event",
+ G_CALLBACK(on_window_focus_out), NULL);
+
+ // Mark as connected to prevent duplicate connections
+ g_object_set_data(G_OBJECT(widget), kFocusHandlersConnectedKey, GINT_TO_POINTER(1));
+
+ // If window already has focus, create inhibitor now
+ if (gtk_window_has_toplevel_focus(GTK_WINDOW(widget))) {
+ inhibit_keyboard_shortcuts(GTK_WINDOW(widget));
+ }
+ }
+}
+
+// Public API: Initialize shortcuts inhibit for a sub-window
+void wayland_shortcuts_inhibit_init_for_subwindow(void* view) {
+ GtkWidget* widget = GTK_WIDGET(view);
+ GtkWidget* toplevel = gtk_widget_get_toplevel(widget);
+
+ if (toplevel != NULL && GTK_IS_WINDOW(toplevel)) {
+ // Check if already initialized to avoid duplicate realize handlers
+ if (g_object_get_data(G_OBJECT(toplevel), kFocusHandlersConnectedKey) != NULL ||
+ g_object_get_data(G_OBJECT(toplevel), kRealizeHandlerConnectedKey) != NULL) {
+ return;
+ }
+
+ if (gtk_widget_get_realized(toplevel)) {
+ // Window is already realized, set up focus handlers now
+ on_window_realize(toplevel, NULL);
+ } else {
+ // Mark realize handler as connected to prevent duplicate connections
+ // if called again before window is realized
+ g_object_set_data(G_OBJECT(toplevel), kRealizeHandlerConnectedKey, GINT_TO_POINTER(1));
+ // Wait for window to be realized
+ g_signal_connect(toplevel, "realize",
+ G_CALLBACK(on_window_realize), NULL);
+ }
+ }
+}
+
+#endif // defined(GDK_WINDOWING_WAYLAND) && defined(HAS_KEYBOARD_SHORTCUTS_INHIBIT)
diff --git a/flutter/linux/wayland_shortcuts_inhibit.h b/flutter/linux/wayland_shortcuts_inhibit.h
new file mode 100644
index 000000000..c0996931a
--- /dev/null
+++ b/flutter/linux/wayland_shortcuts_inhibit.h
@@ -0,0 +1,22 @@
+// Wayland keyboard shortcuts inhibit support
+// This module provides functionality to inhibit system keyboard shortcuts
+// on Wayland compositors, allowing remote desktop windows to capture all
+// key events including Super, Alt+Tab, etc.
+
+#ifndef WAYLAND_SHORTCUTS_INHIBIT_H_
+#define WAYLAND_SHORTCUTS_INHIBIT_H_
+
+#include
+
+#if defined(GDK_WINDOWING_WAYLAND) && defined(HAS_KEYBOARD_SHORTCUTS_INHIBIT)
+
+// Initialize shortcuts inhibit for a sub-window created by desktop_multi_window plugin.
+// This sets up focus-based inhibitor management: inhibitor is created when
+// the window gains focus and destroyed when it loses focus.
+//
+// @param view The FlView of the sub-window
+void wayland_shortcuts_inhibit_init_for_subwindow(void* view);
+
+#endif // defined(GDK_WINDOWING_WAYLAND) && defined(HAS_KEYBOARD_SHORTCUTS_INHIBIT)
+
+#endif // WAYLAND_SHORTCUTS_INHIBIT_H_
diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml
index b8360db58..eddf5a19d 100644
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# 1.1.9-1 works for android, but for ios it becomes 1.1.91, need to set it to 1.1.9-a.1 for iOS, will get 1.1.9.1, but iOS store not allow 4 numbers
-version: 1.4.5+63
+version: 1.4.6+64
environment:
sdk: '^3.1.0'
@@ -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
diff --git a/flutter/test/input_modifier_utils_test.dart b/flutter/test/input_modifier_utils_test.dart
new file mode 100644
index 000000000..2e1971753
--- /dev/null
+++ b/flutter/test/input_modifier_utils_test.dart
@@ -0,0 +1,125 @@
+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,
+ );
+ });
+ });
+}
diff --git a/flutter/windows/runner/win32_window.cpp b/flutter/windows/runner/win32_window.cpp
index 2c25f00dd..606ef0aa3 100644
--- a/flutter/windows/runner/win32_window.cpp
+++ b/flutter/windows/runner/win32_window.cpp
@@ -7,6 +7,7 @@
#include // for getenv and _putenv
#include // for strcmp
+#include // for std::wstring
namespace {
@@ -15,6 +16,43 @@ constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW";
// The number of Win32Window objects that currently exist.
static int g_active_window_count = 0;
+// Static variable to hold the custom icon (needs cleanup on exit)
+static HICON g_custom_icon_ = nullptr;
+
+// Try to load icon from data\flutter_assets\assets\icon.ico if it exists.
+// Returns nullptr if the file doesn't exist or can't be loaded.
+HICON LoadCustomIcon() {
+ if (g_custom_icon_ != nullptr) {
+ return g_custom_icon_;
+ }
+ wchar_t exe_path[MAX_PATH];
+ if (!GetModuleFileNameW(nullptr, exe_path, MAX_PATH)) {
+ return nullptr;
+ }
+
+ std::wstring icon_path = exe_path;
+ size_t last_slash = icon_path.find_last_of(L"\\/");
+ if (last_slash == std::wstring::npos) {
+ return nullptr;
+ }
+
+ icon_path = icon_path.substr(0, last_slash + 1);
+ icon_path += L"data\\flutter_assets\\assets\\icon.ico";
+
+ // Check file attributes - reject if missing, directory, or reparse point (symlink/junction)
+ DWORD file_attr = GetFileAttributesW(icon_path.c_str());
+ if (file_attr == INVALID_FILE_ATTRIBUTES ||
+ (file_attr & FILE_ATTRIBUTE_DIRECTORY) ||
+ (file_attr & FILE_ATTRIBUTE_REPARSE_POINT)) {
+ return nullptr;
+ }
+
+ g_custom_icon_ = (HICON)LoadImageW(
+ nullptr, icon_path.c_str(), IMAGE_ICON, 0, 0,
+ LR_LOADFROMFILE | LR_DEFAULTSIZE);
+ return g_custom_icon_;
+}
+
using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd);
// Scale helper to convert logical scaler values to physical using passed in
@@ -81,8 +119,16 @@ const wchar_t* WindowClassRegistrar::GetWindowClass() {
window_class.cbClsExtra = 0;
window_class.cbWndExtra = 0;
window_class.hInstance = GetModuleHandle(nullptr);
- window_class.hIcon =
- LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON));
+
+ // Try to load icon from data\flutter_assets\assets\icon.ico if it exists
+ HICON custom_icon = LoadCustomIcon();
+ if (custom_icon != nullptr) {
+ window_class.hIcon = custom_icon;
+ } else {
+ window_class.hIcon =
+ LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON));
+ }
+
window_class.hbrBackground = 0;
window_class.lpszMenuName = nullptr;
window_class.lpfnWndProc = Win32Window::WndProc;
@@ -95,6 +141,12 @@ const wchar_t* WindowClassRegistrar::GetWindowClass() {
void WindowClassRegistrar::UnregisterWindowClass() {
UnregisterClass(kWindowClassName, nullptr);
class_registered_ = false;
+
+ // Clean up the custom icon if it was loaded
+ if (g_custom_icon_ != nullptr) {
+ DestroyIcon(g_custom_icon_);
+ g_custom_icon_ = nullptr;
+ }
}
Win32Window::Win32Window() {
diff --git a/libs/clipboard/README.md b/libs/clipboard/README.md
index 6333a0644..ec08cbf04 100644
--- a/libs/clipboard/README.md
+++ b/libs/clipboard/README.md
@@ -10,7 +10,7 @@ TODO: Move this lib to a separate project.
## How it works
-Terminalogies:
+Terminologies:
- cliprdr: this module
- local: the endpoint which initiates a file copy events
@@ -50,7 +50,7 @@ sequenceDiagram
r ->> l: Format List Response (notified)
r ->> l: Format Data Request (requests file list)
activate l
- note left of l: Retrive file list from system clipboard
+ note left of l: Retrieve file list from system clipboard
l ->> r: Format Data Response (containing file list)
deactivate l
note over r: Update system clipboard with received file list
@@ -84,10 +84,10 @@ and copy files to remote.
The protocol was originally designed as an extension of the Windows RDP,
so the specific message packages fits windows well.
-When starting cliprdr, a thread is spawn to create a invisible window
+When starting cliprdr, a thread is spawned to create an invisible window
and to subscribe to OLE clipboard events.
The window's callback (see `cliprdr_proc` in `src/windows/wf_cliprdr.c`) was
-set to handle a variaty of events.
+set to handle a variety of events.
Detailed implementation is shown in pictures above.
@@ -108,18 +108,18 @@ after filtering out those pointing to our FUSE directory or duplicated,
send format list directly to remote.
The cliprdr server also uses clipboard client for setting clipboard,
-or retrive paths from system.
+or retrieve paths from system.
#### Local File List
-The local file list is a temperary list of file metadata.
+The local file list is a temporary list of file metadata.
When receiving file contents PDU from peer, the server picks
out the file requested and open it for reading if necessary.
Also when receiving Format Data Request PDU from remote asking for file list,
the local file list should be rebuilt from file list retrieved from Clipboard Client.
-Some caching and preloading could done on it since applications are likely to read
+Some caching and preloading could be done on it since applications are likely to read
on the list sequentially.
#### FUSE server
diff --git a/libs/clipboard/src/platform/unix/fuse/cs.rs b/libs/clipboard/src/platform/unix/fuse/cs.rs
index 0f1cf8739..fa1dea71d 100644
--- a/libs/clipboard/src/platform/unix/fuse/cs.rs
+++ b/libs/clipboard/src/platform/unix/fuse/cs.rs
@@ -12,7 +12,7 @@
//!
//! For now, we transfer all file names with windows separators, UTF-16 encoded.
//! *Need a way to transfer file names with '\' safely*.
-//! Maybe we can use URL encoded file names and '/' seperators as a new standard, while keep the support to old schemes.
+//! Maybe we can use URL encoded file names and '/' separators as a new standard, while keep the support to old schemes.
//!
//! # Note
//! - all files on FS should be read only, and mark the owner to be the current user
diff --git a/libs/clipboard/src/windows/wf_cliprdr.c b/libs/clipboard/src/windows/wf_cliprdr.c
index e1856863e..95d1d1a5c 100644
--- a/libs/clipboard/src/windows/wf_cliprdr.c
+++ b/libs/clipboard/src/windows/wf_cliprdr.c
@@ -624,6 +624,7 @@ void CliprdrStream_Delete(CliprdrStream *instance)
if (instance)
{
free(instance->iStream.lpVtbl);
+ instance->iStream.lpVtbl = NULL;
free(instance);
}
}
@@ -2160,7 +2161,7 @@ static BOOL wf_cliprdr_add_to_file_arrays(wfClipboard *clipboard, WCHAR *full_fi
return FALSE;
/* add to name array */
- clipboard->file_names[clipboard->nFiles] = (LPWSTR)malloc(MAX_PATH * 2);
+ clipboard->file_names[clipboard->nFiles] = (LPWSTR)malloc((size_t)MAX_PATH * sizeof(WCHAR));
if (!clipboard->file_names[clipboard->nFiles])
return FALSE;
diff --git a/libs/enigo/src/linux/nix_impl.rs b/libs/enigo/src/linux/nix_impl.rs
index 902d77948..c16be3469 100644
--- a/libs/enigo/src/linux/nix_impl.rs
+++ b/libs/enigo/src/linux/nix_impl.rs
@@ -261,6 +261,8 @@ impl KeyboardControllable for Enigo {
} else {
if let Some(keyboard) = &mut self.custom_keyboard {
keyboard.key_sequence(sequence)
+ } else {
+ log::warn!("Enigo::key_sequence: no custom_keyboard set for Wayland!");
}
}
}
@@ -277,6 +279,7 @@ impl KeyboardControllable for Enigo {
if let Some(keyboard) = &mut self.custom_keyboard {
keyboard.key_down(key)
} else {
+ log::warn!("Enigo::key_down: no custom_keyboard set for Wayland!");
Ok(())
}
}
@@ -290,13 +293,24 @@ impl KeyboardControllable for Enigo {
} else {
if let Some(keyboard) = &mut self.custom_keyboard {
keyboard.key_up(key)
+ } else {
+ log::warn!("Enigo::key_up: no custom_keyboard set for Wayland!");
}
}
}
fn key_click(&mut self, key: Key) {
- if self.tfc_key_click(key).is_err() {
- self.key_down(key).ok();
- self.key_up(key);
+ if self.is_x11 {
+ // X11: try tfc first, then fallback to key_down/key_up
+ if self.tfc_key_click(key).is_err() {
+ self.key_down(key).ok();
+ self.key_up(key);
+ }
+ } else {
+ if let Some(keyboard) = &mut self.custom_keyboard {
+ keyboard.key_click(key);
+ } else {
+ log::warn!("Enigo::key_click: no custom_keyboard set for Wayland!");
+ }
}
}
}
diff --git a/libs/enigo/src/linux/xdo.rs b/libs/enigo/src/linux/xdo.rs
index 26d090855..7796904f9 100644
--- a/libs/enigo/src/linux/xdo.rs
+++ b/libs/enigo/src/linux/xdo.rs
@@ -8,6 +8,7 @@
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};
@@ -32,6 +33,51 @@ 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,
@@ -52,6 +98,7 @@ 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,
diff --git a/libs/enigo/src/win/win_impl.rs b/libs/enigo/src/win/win_impl.rs
index 882dba126..a6b465ea1 100644
--- a/libs/enigo/src/win/win_impl.rs
+++ b/libs/enigo/src/win/win_impl.rs
@@ -269,7 +269,7 @@ impl KeyboardControllable for Enigo {
for pos in 0..mod_len {
let rpos = mod_len - 1 - pos;
if flag & (0x0001 << rpos) != 0 {
- self.key_up(modifiers[pos]);
+ self.key_up(modifiers[rpos]);
}
}
@@ -298,7 +298,18 @@ impl KeyboardControllable for Enigo {
}
fn key_up(&mut self, key: Key) {
- keybd_event(KEYEVENTF_KEYUP, self.key_to_keycode(key), 0);
+ match key {
+ Key::Layout(c) => {
+ let code = self.get_layoutdependent_keycode(c);
+ if code as u16 != 0xFFFF {
+ let vk = code & 0x00FF;
+ keybd_event(KEYEVENTF_KEYUP, vk, 0);
+ }
+ }
+ _ => {
+ keybd_event(KEYEVENTF_KEYUP, self.key_to_keycode(key), 0);
+ }
+ }
}
fn get_key_state(&mut self, key: Key) -> bool {
diff --git a/libs/hbb_common b/libs/hbb_common
index 900077a2c..9043c15ac 160000
--- a/libs/hbb_common
+++ b/libs/hbb_common
@@ -1 +1 @@
-Subproject commit 900077a2c2651336317f8094ea44074c48acd2a4
+Subproject commit 9043c15acc6d5b42b6c12ad284c16c1ec172f1f0
diff --git a/libs/portable/Cargo.toml b/libs/portable/Cargo.toml
index a4a71e14f..184079be8 100644
--- a/libs/portable/Cargo.toml
+++ b/libs/portable/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "rustdesk-portable-packer"
-version = "1.4.5"
+version = "1.4.6"
edition = "2021"
description = "RustDesk Remote Desktop"
diff --git a/libs/scrap/src/common/mediacodec.rs b/libs/scrap/src/common/mediacodec.rs
index bd3eace7b..8ec5e6b8f 100644
--- a/libs/scrap/src/common/mediacodec.rs
+++ b/libs/scrap/src/common/mediacodec.rs
@@ -151,7 +151,7 @@ fn create_media_codec(name: &str, direction: MediaCodecDirection) -> Option PixelProvider<'a> {
}
pub trait Recorder {
- fn capture(&mut self, timeout_ms: u64) -> Result>;
+ fn capture(&mut self, timeout_ms: u64) -> Result, Box>;
}
pub trait BoxCloneCapturable {
diff --git a/libs/scrap/src/wayland/pipewire.rs b/libs/scrap/src/wayland/pipewire.rs
index d29677c7a..8859d0d3b 100644
--- a/libs/scrap/src/wayland/pipewire.rs
+++ b/libs/scrap/src/wayland/pipewire.rs
@@ -276,12 +276,21 @@ impl PipeWireRecorder {
// see: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/982
src.set_property("always-copy", &true)?;
+ // COSMIC/Wayland fix: insert videoconvert between pipewiresrc and appsink.
+ // xdg-desktop-portal-cosmic's modifier negotiation fails when the downstream
+ // format set is too narrow (appsink only accepts BGRx/RGBx), producing
+ // "no more output formats" / not-negotiated (-4). videoconvert accepts any
+ // system-memory video/x-raw format, widening negotiation so the portal can
+ // settle on a format it can deliver via its SHM path.
+ let convert = gst::ElementFactory::make("videoconvert", None)?;
+
let sink = gst::ElementFactory::make("appsink", None)?;
sink.set_property("drop", &true)?;
sink.set_property("max-buffers", &1u32)?;
- pipeline.add_many(&[&src, &sink])?;
- src.link(&sink)?;
+ pipeline.add_many(&[&src, &convert, &sink])?;
+ src.link(&convert)?;
+ convert.link(&sink)?;
let appsink = sink
.dynamic_cast::()
@@ -346,7 +355,7 @@ impl PipeWireRecorder {
}
impl Recorder for PipeWireRecorder {
- fn capture(&mut self, timeout_ms: u64) -> Result> {
+ fn capture(&mut self, timeout_ms: u64) -> Result, Box> {
if let Some(sample) = self
.appsink
.try_pull_sample(gst::ClockTime::from_mseconds(timeout_ms))
diff --git a/libs/scrap/src/x11/server.rs b/libs/scrap/src/x11/server.rs
index f9983f7cf..7ae145d40 100644
--- a/libs/scrap/src/x11/server.rs
+++ b/libs/scrap/src/x11/server.rs
@@ -98,7 +98,7 @@ unsafe fn check_x11_shm_available(c: *mut xcb_connection_t) -> Result<(), Error>
let mut e: *mut xcb_generic_error_t = std::ptr::null_mut();
let reply = xcb_shm_query_version_reply(c, cookie, &mut e as _);
if reply.is_null() {
- // TODO: Should seperate SHM disabled from SHM not supported?
+ // TODO: Should separate SHM disabled from SHM not supported?
return Err(Error::UnsupportedExtension);
} else {
// https://github.com/FFmpeg/FFmpeg/blob/6229e4ac425b4566446edefb67d5c225eb397b58/libavdevice/xcbgrab.c#L229
diff --git a/libs/virtual_display/dylib/README.md b/libs/virtual_display/dylib/README.md
index 30fa588f1..fb71c3c56 100644
--- a/libs/virtual_display/dylib/README.md
+++ b/libs/virtual_display/dylib/README.md
@@ -29,4 +29,4 @@ TODO
## X11
-## OSX
+## macOS
diff --git a/res/DEBIAN/postinst b/res/DEBIAN/postinst
index dad333ee5..57bb30d61 100755
--- a/res/DEBIAN/postinst
+++ b/res/DEBIAN/postinst
@@ -6,15 +6,13 @@ if [ "$1" = configure ]; then
INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}')
ln -f -s /usr/share/rustdesk/rustdesk /usr/bin/rustdesk
-
+
if [ "systemd" == "$INITSYS" ]; then
if [ -e /etc/systemd/system/rustdesk.service ]; then
rm /etc/systemd/system/rustdesk.service /usr/lib/systemd/system/rustdesk.service /usr/lib/systemd/user/rustdesk.service >/dev/null 2>&1
fi
- version=$(python3 -V 2>&1 | grep -Po '(?<=Python )(.+)')
- parsedVersion=$(echo "${version//./}")
- mkdir -p /usr/lib/systemd/system/
+ mkdir -p /usr/lib/systemd/system/
cp /usr/share/rustdesk/files/systemd/rustdesk.service /usr/lib/systemd/system/rustdesk.service
# try fix error in Ubuntu 18.04
# Failed to reload rustdesk.service: Unit rustdesk.service is not loaded properly: Exec format error.
diff --git a/res/PKGBUILD b/res/PKGBUILD
index 3b4096760..dd266eb2a 100644
--- a/res/PKGBUILD
+++ b/res/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=rustdesk
-pkgver=1.4.5
+pkgver=1.4.6
pkgrel=0
epoch=
pkgdesc=""
diff --git a/res/audits.py b/res/audits.py
old mode 100644
new mode 100755
index d843233da..77b0fd120
--- a/res/audits.py
+++ b/res/audits.py
@@ -43,7 +43,7 @@ def get_connection_type_name(conn_type):
"""Convert connection type number to readable name"""
type_map = {
0: "Remote Desktop",
- 1: "File Transfer",
+ 1: "File Transfer",
2: "Port Transfer",
3: "View Camera",
4: "Terminal"
@@ -55,7 +55,7 @@ def get_console_type_name(console_type):
"""Convert console audit type number to readable name"""
type_map = {
0: "Group Management",
- 1: "User Management",
+ 1: "User Management",
2: "Device Management",
3: "Address Book Management"
}
@@ -67,7 +67,7 @@ def get_console_operation_name(operation_code):
operation_map = {
0: "User Login",
1: "Add Group",
- 2: "Add User",
+ 2: "Add User",
3: "Add Device",
4: "Delete Groups",
5: "Disconnect Device",
@@ -95,7 +95,7 @@ def get_console_operation_name(operation_code):
def get_alarm_type_name(alarm_type):
"""Convert alarm type number to readable name"""
type_map = {
- 0: "Access attempt outside the IP whiltelist",
+ 0: "Access attempt outside the IP whitelist",
1: "Over 30 consecutive access attempts",
2: "Multiple access attempts within one minute",
3: "Over 30 consecutive login attempts",
@@ -109,24 +109,24 @@ def enhance_audit_data(data, audit_type):
"""Enhance audit data with readable formats"""
if not data:
return data
-
+
enhanced_data = []
for item in data:
enhanced_item = item.copy()
-
+
# Convert timestamps - replace original values
if 'created_at' in enhanced_item:
enhanced_item['created_at'] = format_timestamp(enhanced_item['created_at'])
if 'end_time' in enhanced_item:
enhanced_item['end_time'] = format_timestamp(enhanced_item['end_time'])
-
+
# Add type-specific enhancements - replace original values
if audit_type == 'conn':
if 'conn_type' in enhanced_item:
enhanced_item['conn_type'] = get_connection_type_name(enhanced_item['conn_type'])
else:
enhanced_item['conn_type'] = "Not Logged In"
-
+
elif audit_type == 'console':
if 'typ' in enhanced_item:
# Replace typ field with type and convert to readable name
@@ -136,14 +136,14 @@ def enhance_audit_data(data, audit_type):
# Replace iop field with operation and convert to readable name
enhanced_item['operation'] = get_console_operation_name(enhanced_item['iop'])
del enhanced_item['iop']
-
+
elif audit_type == 'alarm' and 'typ' in enhanced_item:
# Replace typ field with type and convert to readable name
enhanced_item['type'] = get_alarm_type_name(enhanced_item['typ'])
del enhanced_item['typ']
-
+
enhanced_data.append(enhanced_item)
-
+
return enhanced_data
@@ -152,7 +152,7 @@ def check_response(response):
if response.status_code != 200:
print(f"Error: HTTP {response.status_code} - {response.text}")
exit(1)
-
+
try:
response_json = response.json()
if "error" in response_json:
@@ -163,28 +163,28 @@ def check_response(response):
return response.text or "Success"
-def view_audits_common(url, token, endpoint, filters=None, page_size=None, current=None,
+def view_audits_common(url, token, endpoint, filters=None, page_size=None, current=None,
created_at=None, days_ago=None, non_wildcard_fields=None):
"""Common function for viewing audits"""
headers = {"Authorization": f"Bearer {token}"}
-
+
# Set default page size and current page
if page_size is None:
page_size = 10
if current is None:
current = 1
-
+
params = {
"pageSize": page_size,
"current": current
}
-
+
# Add filter parameters if provided
if filters:
for key, value in filters.items():
if value is not None:
params[key] = value
-
+
# Handle time filters
if days_ago is not None:
# Calculate datetime from days ago
@@ -205,10 +205,10 @@ def view_audits_common(url, token, endpoint, filters=None, page_size=None, curre
# Apply wildcard patterns for string fields (excluding specific fields)
if non_wildcard_fields is None:
non_wildcard_fields = set()
-
+
# Always exclude these fields from wildcard treatment
non_wildcard_fields.update(["created_at", "pageSize", "current"])
-
+
string_params = {}
for k, v in params.items():
if isinstance(v, str) and k not in non_wildcard_fields:
@@ -221,10 +221,10 @@ def view_audits_common(url, token, endpoint, filters=None, page_size=None, curre
response = requests.get(f"{url}/api/audits/{endpoint}", headers=headers, params=string_params)
response_json = check_response(response)
-
+
# Enhance the data with readable formats
data = enhance_audit_data(response_json.get("data", []), endpoint)
-
+
return {
"data": data,
"total": response_json.get("total", 0),
@@ -233,7 +233,7 @@ def view_audits_common(url, token, endpoint, filters=None, page_size=None, curre
}
-def view_conn_audits(url, token, remote=None, conn_type=None,
+def view_conn_audits(url, token, remote=None, conn_type=None,
page_size=None, current=None, created_at=None, days_ago=None):
"""View connection audits"""
filters = {
@@ -241,7 +241,7 @@ def view_conn_audits(url, token, remote=None, conn_type=None,
"conn_type": conn_type
}
non_wildcard_fields = {"conn_type"}
-
+
return view_audits_common(
url, token, "conn", filters, page_size, current, created_at, days_ago, non_wildcard_fields
)
@@ -254,7 +254,7 @@ def view_file_audits(url, token, remote=None,
"remote": remote
}
non_wildcard_fields = set()
-
+
return view_audits_common(
url, token, "file", filters, page_size, current, created_at, days_ago, non_wildcard_fields
)
@@ -267,7 +267,7 @@ def view_alarm_audits(url, token, device=None,
"device": device
}
non_wildcard_fields = set()
-
+
return view_audits_common(
url, token, "alarm", filters, page_size, current, created_at, days_ago, non_wildcard_fields
)
@@ -280,7 +280,7 @@ def view_console_audits(url, token, operator=None,
"operator": operator
}
non_wildcard_fields = set()
-
+
return view_audits_common(
url, token, "console", filters, page_size, current, created_at, days_ago, non_wildcard_fields
)
@@ -295,15 +295,15 @@ def main():
)
parser.add_argument("--url", required=True, help="URL of the API")
parser.add_argument("--token", required=True, help="Bearer token for authentication")
-
+
# Pagination parameters
parser.add_argument("--page-size", type=int, default=10, help="Number of records per page (default: 10)")
parser.add_argument("--current", type=int, default=1, help="Current page number (default: 1)")
-
+
# Time filtering parameters
parser.add_argument("--created-at", help="Filter by creation time in local time (format: 2025-09-16 14:15:57 or 2025-09-16 14:15:57.000)")
parser.add_argument("--days-ago", type=int, help="Filter by days ago (e.g., 7 for last 7 days)")
-
+
# Audit filters (simplified)
parser.add_argument("--remote", help="Remote peer ID filter (for conn/file audits)")
parser.add_argument("--device", help="Device ID filter (for alarm audits)")
@@ -319,9 +319,9 @@ def main():
if args.command == "view-conn":
# View connection audits
result = view_conn_audits(
- args.url,
- args.token,
- args.remote,
+ args.url,
+ args.token,
+ args.remote,
args.conn_type,
args.page_size,
args.current,
@@ -329,12 +329,12 @@ def main():
args.days_ago
)
print(json.dumps(result, indent=2))
-
+
elif args.command == "view-file":
# View file audits
result = view_file_audits(
- args.url,
- args.token,
+ args.url,
+ args.token,
args.remote,
args.page_size,
args.current,
@@ -342,12 +342,12 @@ def main():
args.days_ago
)
print(json.dumps(result, indent=2))
-
+
elif args.command == "view-alarm":
# View alarm audits
result = view_alarm_audits(
- args.url,
- args.token,
+ args.url,
+ args.token,
args.device,
args.page_size,
args.current,
@@ -355,12 +355,12 @@ def main():
args.days_ago
)
print(json.dumps(result, indent=2))
-
+
elif args.command == "view-console":
# View console audits
result = view_console_audits(
- args.url,
- args.token,
+ args.url,
+ args.token,
args.operator,
args.page_size,
args.current,
diff --git a/res/msi/CustomActions/CustomActions.cpp b/res/msi/CustomActions/CustomActions.cpp
index fafbab6b5..f4780dd87 100644
--- a/res/msi/CustomActions/CustomActions.cpp
+++ b/res/msi/CustomActions/CustomActions.cpp
@@ -31,24 +31,161 @@ LExit:
return WcaFinalize(er);
}
-// CAUTION: We can't simply remove the install folder here, because silent repair/upgrade will fail.
-// `RemoveInstallFolder()` is a deferred custom action, it will be executed after the files are copied.
-// `msiexec /i package.msi /qn`
+// Helper function to safely delete a file using handle-based deletion.
+// Directories are refused after opening the handle.
+BOOL SafeDeleteItem(LPCWSTR fullPath)
+{
+ // Open the file/directory with delete and attribute-read access plus FILE_FLAG_OPEN_REPARSE_POINT
+ // to prevent following symlinks.
+ // Use shared access to allow deletion even when other processes have the file open.
+ DWORD flags = FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OPEN_REPARSE_POINT;
+ HANDLE hFile = CreateFileW(
+ fullPath,
+ DELETE | FILE_READ_ATTRIBUTES,
+ FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, // Allow shared access
+ NULL,
+ OPEN_EXISTING,
+ flags,
+ NULL
+ );
+
+ if (hFile == INVALID_HANDLE_VALUE)
+ {
+ WcaLog(LOGMSG_STANDARD, "SafeDeleteItem: Failed to open '%ls'. Error: %lu", fullPath, GetLastError());
+ return FALSE;
+ }
+
+ BY_HANDLE_FILE_INFORMATION fileInfo;
+ if (FALSE == GetFileInformationByHandle(hFile, &fileInfo))
+ {
+ WcaLog(LOGMSG_STANDARD, "SafeDeleteItem: Failed to inspect '%ls'. Error: %lu", fullPath, GetLastError());
+ CloseHandle(hFile);
+ return FALSE;
+ }
+
+ if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+ {
+ WcaLog(LOGMSG_STANDARD, "SafeDeleteItem: Refusing to delete directory '%ls'.", fullPath);
+ CloseHandle(hFile);
+ return FALSE;
+ }
+
+ // Use SetFileInformationByHandle to mark for deletion.
+ // The file will be deleted when the handle is closed.
+ FILE_DISPOSITION_INFO dispInfo;
+ dispInfo.DeleteFile = TRUE;
+
+ BOOL result = SetFileInformationByHandle(
+ hFile,
+ FileDispositionInfo,
+ &dispInfo,
+ sizeof(dispInfo)
+ );
+
+ if (!result)
+ {
+ DWORD error = GetLastError();
+ WcaLog(LOGMSG_STANDARD, "SafeDeleteItem: Failed to mark '%ls' for deletion. Error: %lu", fullPath, error);
+ }
+
+ CloseHandle(hFile);
+ return result;
+}
+
+BOOL PathEndsWithSlash(LPCWSTR path)
+{
+ size_t length = 0;
+ HRESULT hr = StringCchLengthW(path, MAX_PATH, &length);
+ if (FAILED(hr) || length == 0)
+ {
+ return FALSE;
+ }
+
+ WCHAR last = path[length - 1];
+ return last == L'\\' || last == L'/';
+}
+
+void ClearReadOnlyAttribute(LPCWSTR fullPath, DWORD attributes)
+{
+ if (!(attributes & FILE_ATTRIBUTE_READONLY))
+ {
+ return;
+ }
+
+ DWORD writableAttributes = attributes & ~FILE_ATTRIBUTE_READONLY;
+ if (writableAttributes == 0)
+ {
+ writableAttributes = FILE_ATTRIBUTE_NORMAL;
+ }
+
+ if (SetFileAttributesW(fullPath, writableAttributes))
+ {
+ WcaLog(LOGMSG_STANDARD, "Runtime cleanup cleared read-only attribute for '%ls'.", fullPath);
+ return;
+ }
+
+ WcaLog(LOGMSG_STANDARD, "Runtime cleanup failed to clear read-only attribute for '%ls'. Error: %lu", fullPath, GetLastError());
+}
+
+BOOL DeleteRuntimeGeneratedFile(LPCWSTR installFolder, LPCWSTR fileName)
+{
+ WCHAR fullPath[MAX_PATH];
+ LPCWSTR separator = PathEndsWithSlash(installFolder) ? L"" : L"\\";
+ HRESULT hr = StringCchPrintfW(fullPath, MAX_PATH, L"%s%s%s", installFolder, separator, fileName);
+ if (FAILED(hr))
+ {
+ WcaLog(LOGMSG_STANDARD, "Runtime cleanup path is too long for '%ls'.", fileName);
+ return FALSE;
+ }
+
+ DWORD attributes = GetFileAttributesW(fullPath);
+ if (attributes == INVALID_FILE_ATTRIBUTES)
+ {
+ DWORD error = GetLastError();
+ if (error == ERROR_FILE_NOT_FOUND || error == ERROR_PATH_NOT_FOUND)
+ {
+ return TRUE;
+ }
+
+ WcaLog(LOGMSG_STANDARD, "Runtime cleanup cannot stat '%ls'. Error: %lu", fullPath, error);
+ return FALSE;
+ }
+
+ if (attributes & FILE_ATTRIBUTE_DIRECTORY)
+ {
+ WcaLog(LOGMSG_STANDARD, "Runtime cleanup skipped directory '%ls'.", fullPath);
+ return FALSE;
+ }
+
+ ClearReadOnlyAttribute(fullPath, attributes);
+ WcaLog(LOGMSG_STANDARD, "Runtime cleanup deleting '%ls'.", fullPath);
+ return SafeDeleteItem(fullPath);
+}
+
+// See `Package.wxs` for the sequence of this custom action.
//
-// So we need to delete the files separately in install folder.
-UINT __stdcall RemoveInstallFolder(
+// Upgrade/uninstall sequence:
+// 1. InstallInitialize
+// 2. RemoveExistingProducts
+// ├─ TerminateProcesses
+// ├─ TryStopDeleteService
+// ├─ RemoveRuntimeGeneratedFiles - <-- Here
+// └─ RemoveFiles
+// 3. InstallValidate
+// 4. InstallFiles
+// 5. InstallExecute
+// 6. InstallFinalize
+UINT __stdcall RemoveRuntimeGeneratedFiles(
__in MSIHANDLE hInstall)
{
HRESULT hr = S_OK;
DWORD er = ERROR_SUCCESS;
- int nResult = 0;
LPWSTR installFolder = NULL;
LPWSTR pwz = NULL;
LPWSTR pwzData = NULL;
- WCHAR runtimeBroker[1024] = { 0, };
- hr = WcaInitialize(hInstall, "RemoveInstallFolder");
+ hr = WcaInitialize(hInstall, "RemoveRuntimeGeneratedFiles");
ExitOnFailure(hr, "Failed to initialize");
hr = WcaGetProperty(L"CustomActionData", &pwzData);
@@ -56,26 +193,21 @@ UINT __stdcall RemoveInstallFolder(
pwz = pwzData;
hr = WcaReadStringFromCaData(&pwz, &installFolder);
- ExitOnFailure(hr, "failed to read database key from custom action data: %ls", pwz);
+ ExitOnFailure(hr, "failed to read install folder from custom action data: %ls", pwz);
- StringCchPrintfW(runtimeBroker, sizeof(runtimeBroker) / sizeof(runtimeBroker[0]), L"%ls\\RuntimeBroker_rustdesk.exe", installFolder);
-
- SHFILEOPSTRUCTW fileOp;
- ZeroMemory(&fileOp, sizeof(SHFILEOPSTRUCT));
- fileOp.wFunc = FO_DELETE;
- fileOp.pFrom = runtimeBroker;
- fileOp.fFlags = FOF_NOCONFIRMATION | FOF_SILENT;
-
- nResult = SHFileOperationW(&fileOp);
- if (nResult == 0)
- {
- WcaLog(LOGMSG_STANDARD, "The external file \"%ls\" has been deleted.", runtimeBroker);
+ if (installFolder == NULL || installFolder[0] == L'\0') {
+ WcaLog(LOGMSG_STANDARD, "Install folder path is empty, skipping runtime cleanup.");
+ goto LExit;
}
- else
- {
- WcaLog(LOGMSG_STANDARD, "The external file \"%ls\" has not been deleted, error code: 0x%02X. Please refer to https://learn.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-shfileoperationa for the error codes.", runtimeBroker, nResult);
+
+ if (PathIsRootW(installFolder)) {
+ WcaLog(LOGMSG_STANDARD, "Refusing runtime cleanup in root folder '%ls'.", installFolder);
+ goto LExit;
}
+ WcaLog(LOGMSG_STANDARD, "Removing runtime-generated files from install folder: %ls", installFolder);
+ DeleteRuntimeGeneratedFile(installFolder, L"RuntimeBroker_rustdesk.exe");
+
LExit:
ReleaseStr(pwzData);
@@ -109,9 +241,12 @@ bool TerminateProcessIfNotContainsParam(pfnNtQueryInformationProcess NtQueryInfo
{
if (pebUpp.CommandLine.Length > 0)
{
- WCHAR *commandLine = (WCHAR *)malloc(pebUpp.CommandLine.Length);
+ // Allocate extra space for null terminator
+ WCHAR *commandLine = (WCHAR *)malloc(pebUpp.CommandLine.Length + sizeof(WCHAR));
if (commandLine != NULL)
{
+ // Initialize all bytes to zero for safety
+ memset(commandLine, 0, pebUpp.CommandLine.Length + sizeof(WCHAR));
if (ReadProcessMemory(process, pebUpp.CommandLine.Buffer,
commandLine, pebUpp.CommandLine.Length, &dwBytesRead))
{
@@ -468,10 +603,10 @@ UINT __stdcall TryStopDeleteService(__in MSIHANDLE hInstall)
}
if (IsServiceRunningW(svcName)) {
- WcaLog(LOGMSG_STANDARD, "Service \"%ls\" is not stoped after 1000 ms.", svcName);
+ WcaLog(LOGMSG_STANDARD, "Service \"%ls\" is not stopped after 1000 ms.", svcName);
}
else {
- WcaLog(LOGMSG_STANDARD, "Service \"%ls\" is stoped.", svcName);
+ WcaLog(LOGMSG_STANDARD, "Service \"%ls\" is stopped.", svcName);
}
if (MyDeleteServiceW(svcName)) {
@@ -497,7 +632,7 @@ UINT __stdcall TryStopDeleteService(__in MSIHANDLE hInstall)
}
// It's really strange that we need sleep here.
- // But the upgrading may be stucked at "copying new files" because the file is in using.
+ // But the upgrading may be stuck at "copying new files" because the file is in using.
// Steps to reproduce: Install -> stop service in tray --> start service -> upgrade
// Sleep(300);
@@ -610,7 +745,7 @@ UINT __stdcall AddRegSoftwareSASGeneration(__in MSIHANDLE hInstall)
}
// Why RegSetValueExW always return 998?
- //
+ //
result = RegCreateKeyExW(HKEY_LOCAL_MACHINE, subKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL);
if (result != ERROR_SUCCESS) {
WcaLog(LOGMSG_STANDARD, "Failed to create or open registry key: %d", result);
@@ -726,7 +861,7 @@ void TryCreateStartServiceByShell(LPWSTR svcName, LPWSTR svcBinary, LPWSTR szSvc
i = 0;
j = 0;
// svcBinary is a string with double quotes, we need to escape it for shell arguments.
- // It is orignal used for `CreateServiceW`.
+ // It is original used for `CreateServiceW`.
// eg. "C:\Program Files\MyApp\MyApp.exe" --service -> \"C:\Program Files\MyApp\MyApp.exe\" --service
while (true) {
if (svcBinary[j] == L'"') {
diff --git a/res/msi/CustomActions/CustomActions.def b/res/msi/CustomActions/CustomActions.def
index 01b03490c..d50fbf59b 100644
--- a/res/msi/CustomActions/CustomActions.def
+++ b/res/msi/CustomActions/CustomActions.def
@@ -2,7 +2,7 @@ LIBRARY "CustomActions"
EXPORTS
CustomActionHello
- RemoveInstallFolder
+ RemoveRuntimeGeneratedFiles
TerminateProcesses
AddFirewallRules
SetPropertyIsServiceRunning
diff --git a/res/msi/Package/Components/Folders.wxs b/res/msi/Package/Components/Folders.wxs
index de9edb7f3..6911600e9 100644
--- a/res/msi/Package/Components/Folders.wxs
+++ b/res/msi/Package/Components/Folders.wxs
@@ -16,8 +16,15 @@
-
-
+
+
+
+
+
+
+
+
+
diff --git a/res/msi/Package/Components/RustDesk.wxs b/res/msi/Package/Components/RustDesk.wxs
index 337e84ec3..952172bdc 100644
--- a/res/msi/Package/Components/RustDesk.wxs
+++ b/res/msi/Package/Components/RustDesk.wxs
@@ -12,7 +12,7 @@
-
+
@@ -77,21 +77,21 @@
-
-
-
+
+
+
-
+
-
+
-
+
-
+
diff --git a/res/msi/Package/Fragments/CustomActions.wxs b/res/msi/Package/Fragments/CustomActions.wxs
index 3727c0dd3..3a9811eb8 100644
--- a/res/msi/Package/Fragments/CustomActions.wxs
+++ b/res/msi/Package/Fragments/CustomActions.wxs
@@ -5,7 +5,7 @@
-
+
diff --git a/res/msi/Package/UI/MyInstallDlg.wxs b/res/msi/Package/UI/MyInstallDlg.wxs
index bf59d569c..06c37097c 100644
--- a/res/msi/Package/UI/MyInstallDlg.wxs
+++ b/res/msi/Package/UI/MyInstallDlg.wxs
@@ -23,12 +23,13 @@ Patch dialog sequence:
-->
+
-
+
@@ -64,9 +65,16 @@ Patch dialog sequence:
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/res/msi/preprocess.py b/res/msi/preprocess.py
index cb2140d21..c590549f4 100644
--- a/res/msi/preprocess.py
+++ b/res/msi/preprocess.py
@@ -336,7 +336,9 @@ def gen_custom_ARPSYSTEMCOMPONENT_True(args, dist_dir):
f'{indent}\n'
)
- estimated_size = get_folder_size(dist_dir)
+ # EstimatedSize in uninstall registry must be in KB.
+ estimated_size_bytes = get_folder_size(dist_dir)
+ estimated_size = max(1, (estimated_size_bytes + 1023) // 1024)
lines_new.append(
f'{indent}\n'
)
diff --git a/res/rpm-flutter-suse.spec b/res/rpm-flutter-suse.spec
index 2049b5f4f..bb2b56af6 100644
--- a/res/rpm-flutter-suse.spec
+++ b/res/rpm-flutter-suse.spec
@@ -1,5 +1,5 @@
Name: rustdesk
-Version: 1.4.5
+Version: 1.4.6
Release: 0
Summary: RPM package
License: GPL-3.0
diff --git a/res/rpm-flutter.spec b/res/rpm-flutter.spec
index f8bc7a1a1..1a077ee7e 100644
--- a/res/rpm-flutter.spec
+++ b/res/rpm-flutter.spec
@@ -1,5 +1,5 @@
Name: rustdesk
-Version: 1.4.5
+Version: 1.4.6
Release: 0
Summary: RPM package
License: GPL-3.0
diff --git a/res/rpm.spec b/res/rpm.spec
index 26c497121..6a7377b8b 100644
--- a/res/rpm.spec
+++ b/res/rpm.spec
@@ -1,5 +1,5 @@
Name: rustdesk
-Version: 1.4.5
+Version: 1.4.6
Release: 0
Summary: RPM package
License: GPL-3.0
diff --git a/src/cli.rs b/src/cli.rs
index f61bfe92f..2f3b3550f 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -25,7 +25,13 @@ impl Session {
pub fn new(id: &str, sender: mpsc::UnboundedSender) -> Self {
let mut password = "".to_owned();
if PeerConfig::load(id).password.is_empty() {
- password = rpassword::prompt_password("Enter password: ").unwrap();
+ match rpassword::prompt_password("Enter password: ") {
+ Ok(p) => password = p,
+ Err(e) => {
+ log::error!("Failed to read password: {:?}", e);
+ password = "".to_owned();
+ }
+ }
}
let session = Self {
id: id.to_owned(),
diff --git a/src/client.rs b/src/client.rs
index a7b681ee1..321a49ee6 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -33,7 +33,7 @@ use crate::{
create_symmetric_key_msg, decode_id_pk, get_rs_pk, is_keyboard_mode_supported,
kcp_stream::KcpStream,
secure_tcp,
- ui_interface::{get_builtin_option, use_texture_render},
+ ui_interface::{get_builtin_option, resolve_avatar_url, use_texture_render},
ui_session_interface::{InvokeUiSession, Session},
};
#[cfg(feature = "unix-file-copy-paste")]
@@ -119,10 +119,13 @@ pub const LOGIN_MSG_NO_PASSWORD_ACCESS: &str = "No Password Access";
pub const LOGIN_MSG_OFFLINE: &str = "Offline";
pub const LOGIN_SCREEN_WAYLAND: &str = "Wayland login screen is not supported";
#[cfg(target_os = "linux")]
-pub const SCRAP_UBUNTU_HIGHER_REQUIRED: &str = "Wayland requires Ubuntu 21.04 or higher version.";
+pub const SCRAP_UBUNTU_HIGHER_REQUIRED: &str = "ubuntu-21-04-required";
#[cfg(target_os = "linux")]
pub const SCRAP_OTHER_VERSION_OR_X11_REQUIRED: &str =
- "Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.";
+ "wayland-requires-higher-linux-version";
+#[cfg(target_os = "linux")]
+pub const SCRAP_XDP_PORTAL_UNAVAILABLE: &str =
+ "xdp-portal-unavailable";
pub const SCRAP_X11_REQUIRED: &str = "x11 expected";
pub const SCRAP_X11_REF_URL: &str = "https://rustdesk.com/docs/en/manual/linux/#x11-required";
@@ -1742,6 +1745,9 @@ pub struct LoginConfigHandler {
pub direct: Option,
pub received: bool,
switch_uuid: Option,
+ #[cfg(feature = "flutter")]
+ #[cfg(not(any(target_os = "android", target_os = "ios")))]
+ switch_back_allowed: bool,
pub save_ab_password_to_recent: bool, // true: connected with ab password
pub other_server: Option<(String, String, String)>,
pub custom_fps: Arc>>,
@@ -1858,6 +1864,11 @@ impl LoginConfigHandler {
self.direct = None;
self.received = false;
+ #[cfg(feature = "flutter")]
+ #[cfg(not(any(target_os = "android", target_os = "ios")))]
+ {
+ self.switch_back_allowed = false;
+ }
self.switch_uuid = switch_uuid;
self.adapter_luid = adapter_luid;
self.selected_windows_session_id = None;
@@ -1871,6 +1882,23 @@ impl LoginConfigHandler {
self.is_terminal_admin = is_terminal_admin;
}
+ #[cfg(feature = "flutter")]
+ #[cfg(not(any(target_os = "android", target_os = "ios")))]
+ pub fn allow_switch_back_once(&mut self) {
+ self.switch_back_allowed = true;
+ }
+
+ #[cfg(feature = "flutter")]
+ #[cfg(not(any(target_os = "android", target_os = "ios")))]
+ pub fn consume_switch_back_permission(&mut self) -> bool {
+ if self.switch_back_allowed {
+ self.switch_back_allowed = false;
+ true
+ } else {
+ false
+ }
+ }
+
/// Check if the client should auto login.
/// Return password if the client should auto login, otherwise return empty string.
pub fn should_auto_login(&self) -> String {
@@ -2625,15 +2653,32 @@ impl LoginConfigHandler {
} else {
(my_id, self.id.clone())
};
+ let mut avatar = get_builtin_option(keys::OPTION_AVATAR);
+ if avatar.is_empty() {
+ avatar = serde_json::from_str::(&LocalConfig::get_option(
+ "user_info",
+ ))
+ .ok()
+ .and_then(|x| {
+ x.get("avatar")
+ .and_then(|x| x.as_str())
+ .map(|x| x.trim().to_owned())
+ })
+ .unwrap_or_default();
+ }
+ avatar = resolve_avatar_url(avatar);
let mut display_name = get_builtin_option(keys::OPTION_DISPLAY_NAME);
if display_name.is_empty() {
display_name =
serde_json::from_str::(&LocalConfig::get_option("user_info"))
.map(|x| {
- x.get("name")
- .map(|x| x.as_str().unwrap_or_default())
+ x.get("display_name")
+ .and_then(|x| x.as_str())
+ .map(|x| x.trim())
+ .filter(|x| !x.is_empty())
+ .or_else(|| x.get("name").and_then(|x| x.as_str()))
+ .map(|x| x.to_owned())
.unwrap_or_default()
- .to_owned()
})
.unwrap_or_default();
}
@@ -2681,6 +2726,7 @@ impl LoginConfigHandler {
})
.into(),
hwid,
+ avatar,
..Default::default()
};
match self.conn_type {
@@ -3356,6 +3402,36 @@ pub fn handle_login_error(
}
}
+#[cfg(feature = "flutter")]
+#[cfg(not(any(target_os = "android", target_os = "ios")))]
+async fn consume_local_switch_sides_uuid(id: &str, uuid: &Uuid) -> bool {
+ let Ok(mut conn) = crate::ipc::connect(1000, "").await else {
+ return false;
+ };
+ let uuid = uuid.to_string();
+ if conn
+ .send(&crate::ipc::Data::SwitchSidesUuid(
+ uuid.clone(),
+ id.to_owned(),
+ None,
+ ))
+ .await
+ .is_err()
+ {
+ return false;
+ }
+ match conn.next_timeout(1000).await {
+ Ok(Some(crate::ipc::Data::SwitchSidesUuid(
+ returned_uuid,
+ returned_id,
+ Some(true),
+ ))) => {
+ returned_uuid == uuid && returned_id == id
+ }
+ _ => false,
+ }
+}
+
/// Handle hash message sent by peer.
/// Hash will be used for login.
///
@@ -3376,12 +3452,22 @@ pub async fn handle_hash(
// Take care of password application order
// switch_uuid
- let uuid = lc.write().unwrap().switch_uuid.take();
- if let Some(uuid) = uuid {
- if let Ok(uuid) = uuid::Uuid::from_str(&uuid) {
- send_switch_login_request(lc.clone(), peer, uuid).await;
- lc.write().unwrap().password_source = Default::default();
- return;
+ #[cfg(feature = "flutter")]
+ #[cfg(not(any(target_os = "android", target_os = "ios")))]
+ {
+ let uuid = lc.write().unwrap().switch_uuid.take();
+ if let Some(uuid) = uuid {
+ if let Ok(uuid) = uuid::Uuid::from_str(&uuid) {
+ let id = lc.read().unwrap().id.clone();
+ if !consume_local_switch_sides_uuid(&id, &uuid).await {
+ log::warn!("Ignored untrusted switch_uuid");
+ } else {
+ lc.write().unwrap().allow_switch_back_once();
+ send_switch_login_request(lc.clone(), peer, uuid).await;
+ lc.write().unwrap().password_source = Default::default();
+ return;
+ }
+ }
}
}
// last password
@@ -3849,6 +3935,7 @@ pub fn check_if_retry(msgtype: &str, title: &str, text: &str, retry_for_relay: b
&& !text.to_lowercase().contains("resolve")
&& !text.to_lowercase().contains("mismatch")
&& !text.to_lowercase().contains("manually")
+ && !text.to_lowercase().contains("restricted")
&& !text.to_lowercase().contains("not allowed")))
}
diff --git a/src/client/io_loop.rs b/src/client/io_loop.rs
index e0b3fcd6d..5eb7a273a 100644
--- a/src/client/io_loop.rs
+++ b/src/client/io_loop.rs
@@ -586,7 +586,6 @@ impl Remote {
file_num,
include_hidden,
is_remote,
- Vec::new(),
od,
));
allow_err!(
@@ -659,7 +658,6 @@ impl Remote {
file_num,
include_hidden,
is_remote,
- Vec::new(),
od,
);
job.is_last_job = true;
@@ -845,19 +843,7 @@ impl Remote {
}
}
Data::CancelJob(id) => {
- let mut msg_out = Message::new();
- let mut file_action = FileAction::new();
- file_action.set_cancel(FileTransferCancel {
- id: id,
- ..Default::default()
- });
- msg_out.set_file_action(file_action);
- allow_err!(peer.send(&msg_out).await);
- if let Some(job) = fs::remove_job(id, &mut self.write_jobs) {
- job.remove_download_file();
- }
- let _ = fs::remove_job(id, &mut self.read_jobs);
- self.remove_jobs.remove(&id);
+ self.cancel_transfer_job(id, peer).await;
}
Data::RemoveDir((id, path)) => {
let mut msg_out = Message::new();
@@ -1053,6 +1039,22 @@ impl Remote {
}
}
+ async fn cancel_transfer_job(&mut self, id: i32, peer: &mut Stream) {
+ let mut msg_out = Message::new();
+ let mut file_action = FileAction::new();
+ file_action.set_cancel(FileTransferCancel {
+ id,
+ ..Default::default()
+ });
+ msg_out.set_file_action(file_action);
+ allow_err!(peer.send(&msg_out).await);
+ if let Some(job) = fs::remove_job(id, &mut self.write_jobs) {
+ job.remove_download_file();
+ }
+ let _ = fs::remove_job(id, &mut self.read_jobs);
+ self.remove_jobs.remove(&id);
+ }
+
pub async fn sync_jobs_status_to_local(&mut self) -> bool {
if !self.is_connected {
return false;
@@ -1446,6 +1448,23 @@ impl Remote {
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);
}
@@ -1470,14 +1489,43 @@ impl Remote {
fs::transform_windows_path(&mut entries);
}
}
- self.handler
- .update_folder_files(fd.id, &entries, fd.path, false, false);
+ // We cannot call cancel_transfer_job/handle_job_status while holding
+ // a mutable borrow from fs::get_job(&mut self.write_jobs), so defer
+ // the error handling until after the borrow scope ends.
+ let mut set_files_err = None;
if let Some(job) = fs::get_job(fd.id, &mut self.write_jobs) {
log::info!("job set_files: {:?}", entries);
- job.set_files(entries);
- job.set_finished_size_on_resume();
+ if let Err(err) = job.set_files(entries) {
+ set_files_err = Some(err.to_string());
+ } else {
+ job.set_finished_size_on_resume();
+ self.handler.update_folder_files(
+ fd.id,
+ job.files(),
+ fd.path,
+ false,
+ false,
+ );
+ }
} else if let Some(job) = self.remove_jobs.get_mut(&fd.id) {
+ // Intentionally keep raw entries here:
+ // - remote remove flow executes deletions on peer side;
+ // - local remove flow is populated from local get_recursive_files().
job.files = entries;
+ self.handler
+ .update_folder_files(fd.id, &job.files, fd.path, false, false);
+ } else {
+ self.handler
+ .update_folder_files(fd.id, &entries, fd.path, false, false);
+ }
+ if let Some(err) = set_files_err {
+ log::warn!(
+ "Rejected unsafe file list from remote peer for job {}: {}",
+ fd.id,
+ err
+ );
+ self.cancel_transfer_job(fd.id, peer).await;
+ self.handle_job_status(fd.id, -1, Some(err));
}
}
Some(file_response::Union::Digest(digest)) => {
@@ -1749,6 +1797,9 @@ impl Remote {
Ok(Permission::BlockInput) => {
self.handler.set_permission("block_input", p.enabled);
}
+ Ok(Permission::PrivacyMode) => {
+ self.handler.set_permission("privacy_mode", p.enabled);
+ }
_ => {}
}
}
@@ -1872,9 +1923,23 @@ impl Remote {
);
}
}
+ #[cfg(feature = "flutter")]
+ #[cfg(not(any(target_os = "android", target_os = "ios")))]
Some(misc::Union::SwitchBack(_)) => {
- #[cfg(feature = "flutter")]
- self.handler.switch_back(&self.handler.get_id());
+ let allow_switch_back = self
+ .handler
+ .lc
+ .write()
+ .unwrap()
+ .consume_switch_back_permission();
+ if allow_switch_back {
+ self.handler.switch_back(&self.handler.get_id());
+ } else {
+ log::warn!(
+ "Ignored unsolicited SwitchBack from {}",
+ self.handler.get_id()
+ );
+ }
}
#[cfg(all(feature = "flutter", feature = "plugin_framework"))]
#[cfg(not(any(target_os = "android", target_os = "ios")))]
diff --git a/src/clipboard.rs b/src/clipboard.rs
index 4280cd124..cae7d03ac 100644
--- a/src/clipboard.rs
+++ b/src/clipboard.rs
@@ -197,7 +197,7 @@ pub fn check_clipboard_cm() -> ResultType {
#[cfg(not(target_os = "android"))]
fn update_clipboard_(multi_clipboards: Vec, side: ClipboardSide) {
- let to_update_data = proto::from_multi_clipbards(multi_clipboards);
+ let to_update_data = proto::from_multi_clipboards(multi_clipboards);
if to_update_data.is_empty() {
return;
}
@@ -432,7 +432,7 @@ impl ClipboardContext {
#[cfg(target_os = "macos")]
let is_kde_x11 = false;
let clear_holder_text = if is_kde_x11 {
- "RustDesk placeholder to clear the file clipbard"
+ "RustDesk placeholder to clear the file clipboard"
} else {
""
}
@@ -672,7 +672,7 @@ mod proto {
}
#[cfg(not(target_os = "android"))]
- pub fn from_multi_clipbards(multi_clipboards: Vec) -> Vec {
+ pub fn from_multi_clipboards(multi_clipboards: Vec) -> Vec {
multi_clipboards
.into_iter()
.filter_map(from_clipboard)
@@ -814,7 +814,7 @@ pub mod clipboard_listener {
subscribers: listener_lock.subscribers.clone(),
};
let (tx_start_res, rx_start_res) = channel();
- let h = start_clipbard_master_thread(handler, tx_start_res);
+ let h = start_clipboard_master_thread(handler, tx_start_res);
let shutdown = match rx_start_res.recv() {
Ok((Some(s), _)) => s,
Ok((None, err)) => {
@@ -854,7 +854,7 @@ pub mod clipboard_listener {
log::info!("Clipboard listener unsubscribed: {}", name);
}
- fn start_clipbard_master_thread(
+ fn start_clipboard_master_thread(
handler: impl ClipboardHandler + Send + 'static,
tx_start_res: Sender<(Option, String)>,
) -> JoinHandle<()> {
diff --git a/src/common.rs b/src/common.rs
index 5f8772414..69e3ec304 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -39,7 +39,7 @@ use hbb_common::{
use crate::{
hbbs_http::{create_http_client_async, get_url_for_tls},
- ui_interface::{get_option, set_option},
+ ui_interface::{get_api_server as ui_get_api_server, get_option, is_installed, set_option},
};
#[derive(Debug, Eq, PartialEq)]
@@ -1072,10 +1072,6 @@ fn get_api_server_(api: String, custom: String) -> String {
if !api.is_empty() {
return api.to_owned();
}
- let api = option_env!("API_SERVER").unwrap_or_default();
- if !api.is_empty() {
- return api.into();
- }
let s0 = get_custom_rendezvous_server(custom);
if !s0.is_empty() {
let s = crate::increase_port(&s0, -2);
@@ -1090,6 +1086,7 @@ fn get_api_server_(api: String, custom: String) -> String {
#[inline]
pub fn is_public(url: &str) -> bool {
+ let url = url.to_ascii_lowercase();
url.contains("rustdesk.com/") || url.ends_with("rustdesk.com")
}
@@ -1127,22 +1124,286 @@ pub fn get_audit_server(api: String, custom: String, typ: String) -> String {
format!("{}/api/audit/{}", url, typ)
}
-pub async fn post_request(url: String, body: String, header: &str) -> ResultType {
+/// Check if we should use raw TCP proxy for API calls.
+/// Returns true if USE_RAW_TCP_FOR_API builtin option is "Y", WebSocket is off,
+/// and the target URL belongs to the configured non-public API host.
+#[inline]
+fn should_use_raw_tcp_for_api(url: &str) -> bool {
+ get_builtin_option(keys::OPTION_USE_RAW_TCP_FOR_API) == "Y"
+ && !use_ws()
+ && is_tcp_proxy_api_target(url)
+}
+
+/// Check if we can attempt raw TCP proxy fallback for this target URL.
+#[inline]
+fn can_fallback_to_raw_tcp(url: &str) -> bool {
+ !use_ws() && is_tcp_proxy_api_target(url)
+}
+
+#[inline]
+fn should_use_tcp_proxy_for_api_url(url: &str, api_url: &str) -> bool {
+ if api_url.is_empty() || is_public(api_url) {
+ return false;
+ }
+
+ let target_host = url::Url::parse(url)
+ .ok()
+ .and_then(|parsed| parsed.host_str().map(|host| host.to_ascii_lowercase()));
+ let api_host = url::Url::parse(api_url)
+ .ok()
+ .and_then(|parsed| parsed.host_str().map(|host| host.to_ascii_lowercase()));
+
+ matches!((target_host, api_host), (Some(target), Some(api)) if target == api)
+}
+
+#[inline]
+fn is_tcp_proxy_api_target(url: &str) -> bool {
+ should_use_tcp_proxy_for_api_url(url, &ui_get_api_server())
+}
+
+fn tcp_proxy_log_target(url: &str) -> String {
+ url::Url::parse(url)
+ .ok()
+ .map(|parsed| {
+ let mut redacted = format!("{}://", parsed.scheme());
+ let Some(host) = parsed.host() else {
+ return "".to_owned();
+ };
+ redacted.push_str(&host.to_string());
+ if let Some(port) = parsed.port() {
+ redacted.push(':');
+ redacted.push_str(&port.to_string());
+ }
+ redacted.push_str(parsed.path());
+ redacted
+ })
+ .unwrap_or_else(|| "".to_owned())
+}
+
+#[inline]
+fn get_tcp_proxy_addr() -> String {
+ check_port(Config::get_rendezvous_server(), RENDEZVOUS_PORT)
+}
+
+/// Send an HTTP request via the rendezvous server's TCP proxy using protobuf.
+/// Connects with `connect_tcp` + `secure_tcp`, sends `HttpProxyRequest`,
+/// receives `HttpProxyResponse`.
+///
+/// The entire operation (connect + handshake + send + receive) is wrapped in
+/// an overall timeout of `CONNECT_TIMEOUT + READ_TIMEOUT` so that a stall at
+/// any stage cannot block the caller indefinitely.
+async fn tcp_proxy_request(
+ method: &str,
+ url: &str,
+ body: &[u8],
+ headers: Vec,
+) -> ResultType {
+ let tcp_addr = get_tcp_proxy_addr();
+ if tcp_addr.is_empty() {
+ bail!("No rendezvous server configured for TCP proxy");
+ }
+
+ let parsed = url::Url::parse(url)?;
+ let path = if let Some(query) = parsed.query() {
+ format!("{}?{}", parsed.path(), query)
+ } else {
+ parsed.path().to_string()
+ };
+
+ log::debug!(
+ "Sending {} {} via TCP proxy to {}",
+ method,
+ parsed.path(),
+ tcp_addr
+ );
+
+ let overall_timeout = CONNECT_TIMEOUT + READ_TIMEOUT;
+ timeout(overall_timeout, async {
+ let mut conn = socket_client::connect_tcp(&*tcp_addr, CONNECT_TIMEOUT).await?;
+ let key = crate::get_key(true).await;
+ secure_tcp_silent(&mut conn, &key).await?;
+
+ let mut req = HttpProxyRequest::new();
+ req.method = method.to_uppercase();
+ req.path = path;
+ req.headers = headers.into();
+ req.body = Bytes::from(body.to_vec());
+
+ let mut msg_out = RendezvousMessage::new();
+ msg_out.set_http_proxy_request(req);
+ conn.send(&msg_out).await?;
+
+ match conn.next().await {
+ Some(Ok(bytes)) => {
+ let msg_in = RendezvousMessage::parse_from_bytes(&bytes)?;
+ match msg_in.union {
+ Some(rendezvous_message::Union::HttpProxyResponse(resp)) => Ok(resp),
+ _ => bail!("Unexpected response from TCP proxy"),
+ }
+ }
+ Some(Err(e)) => bail!("TCP proxy read error: {}", e),
+ None => bail!("TCP proxy connection closed without response"),
+ }
+ })
+ .await?
+}
+
+/// Build HeaderEntry list from "Key: Value" style header string (used by post_request).
+/// If the caller supplies a Content-Type header it overrides the default `application/json`.
+fn parse_simple_header(header: &str) -> Vec {
+ let mut entries = Vec::new();
+ let mut has_content_type = false;
+ if !header.is_empty() {
+ let tmp: Vec<&str> = header.splitn(2, ": ").collect();
+ if tmp.len() == 2 {
+ if tmp[0].eq_ignore_ascii_case("Content-Type") {
+ has_content_type = true;
+ }
+ entries.push(HeaderEntry {
+ name: tmp[0].into(),
+ value: tmp[1].into(),
+ ..Default::default()
+ });
+ }
+ }
+ if !has_content_type {
+ entries.insert(
+ 0,
+ HeaderEntry {
+ name: "Content-Type".into(),
+ value: "application/json".into(),
+ ..Default::default()
+ },
+ );
+ }
+ entries
+}
+
+/// POST request via TCP proxy.
+async fn post_request_via_tcp_proxy(url: &str, body: &str, header: &str) -> ResultType {
+ let headers = parse_simple_header(header);
+ let resp = tcp_proxy_request("POST", url, body.as_bytes(), headers).await?;
+ if !resp.error.is_empty() {
+ bail!("TCP proxy error: {}", resp.error);
+ }
+ Ok(String::from_utf8_lossy(&resp.body).to_string())
+}
+
+fn http_proxy_response_to_json(resp: HttpProxyResponse) -> ResultType {
+ if !resp.error.is_empty() {
+ bail!("TCP proxy error: {}", resp.error);
+ }
+
+ let mut response_headers = Map::new();
+ for entry in resp.headers.iter() {
+ response_headers.insert(entry.name.to_lowercase(), json!(entry.value));
+ }
+
+ let mut result = Map::new();
+ result.insert("status_code".to_string(), json!(resp.status));
+ result.insert("headers".to_string(), Value::Object(response_headers));
+ result.insert(
+ "body".to_string(),
+ json!(String::from_utf8_lossy(&resp.body)),
+ );
+
+ serde_json::to_string(&result).map_err(|e| anyhow!("Failed to serialize response: {}", e))
+}
+
+fn parse_json_header_entries(header: &str) -> ResultType> {
+ let v: Value = serde_json::from_str(header)?;
+ if let Value::Object(obj) = v {
+ Ok(obj
+ .iter()
+ .map(|(key, value)| HeaderEntry {
+ name: key.clone(),
+ value: value.as_str().unwrap_or_default().into(),
+ ..Default::default()
+ })
+ .collect())
+ } else {
+ Err(anyhow!("HTTP header information parsing failed!"))
+ }
+}
+
+/// Returns (status_code, body_text). Separating status so the wrapper can decide on fallback.
+async fn post_request_http(url: &str, body: &str, header: &str) -> ResultType<(u16, String)> {
let proxy_conf = Config::get_socks();
- let tls_url = get_url_for_tls(&url, &proxy_conf);
+ let tls_url = get_url_for_tls(url, &proxy_conf);
let tls_type = get_cached_tls_type(tls_url);
let danger_accept_invalid_cert = get_cached_tls_accept_invalid_cert(tls_url);
let response = post_request_(
- &url,
+ url,
tls_url,
- body.clone(),
+ body.to_owned(),
header,
tls_type,
danger_accept_invalid_cert,
danger_accept_invalid_cert,
)
.await?;
- Ok(response.text().await?)
+ let status = response.status().as_u16();
+ let text = response.text().await?;
+ Ok((status, text))
+}
+
+/// Try `http_fn` first; on connection failure or 5xx, fall back to `tcp_fn`
+/// if the URL is eligible. 4xx responses are returned as-is.
+async fn with_tcp_proxy_fallback(
+ url: &str,
+ method: &str,
+ http_fn: HttpFut,
+ tcp_fn: TcpFut,
+) -> ResultType
+where
+ HttpFut: Future