From b41a73f08d8872df085813432f75f9c275f1545a Mon Sep 17 00:00:00 2001 From: Sahil Yeole Date: Wed, 22 Nov 2023 23:53:43 +0530 Subject: [PATCH 1/6] fix cursor mismatch on fractional scaling single screen Signed-off-by: Sahil Yeole --- src/server/wayland.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/server/wayland.rs b/src/server/wayland.rs index eeed118dc..7a266b1df 100644 --- a/src/server/wayland.rs +++ b/src/server/wayland.rs @@ -175,7 +175,12 @@ pub(super) async fn check_init() -> ResultType<()> { .trim_end_matches(",") .parse() .unwrap_or(origin.1 + height as i32); - (w, h) + if w < origin.0 + width as i32 || h < origin.1 + height as i32 { + (origin.0 + width as i32, origin.1 + height as i32) + } + else{ + (w, h) + } } _ => (origin.0 + width as i32, origin.1 + height as i32), }; From 7bf555ce4c058fc7d102117172b4a462cf402371 Mon Sep 17 00:00:00 2001 From: Ibnul Mutaki Date: Thu, 23 Nov 2023 07:54:42 +0700 Subject: [PATCH 2/6] add idd trans --- src/lang/id.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/id.rs b/src/lang/id.rs index 9bc40994f..780b24bbd 100644 --- a/src/lang/id.rs +++ b/src/lang/id.rs @@ -572,6 +572,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("privacy_mode_impl_virtual_display_tip", "Mode 2"), ("Enter privacy mode", "Masuk mode privasi"), ("Exit privacy mode", "Keluar mode privasi"), - ("idd_not_support_under_win10_2004_tip", ""), + ("idd_not_support_under_win10_2004_tip", "Driver grafis yang Anda gunakan tidak kompatibel dengan versi Windows Anda dan memerlukan Windows 10 versi 2004 atau yang lebih baru"), ].iter().cloned().collect(); } From 414ac950e07de4b74e5f1ec519b5cd7c52869034 Mon Sep 17 00:00:00 2001 From: 21pages Date: Thu, 23 Nov 2023 19:17:19 +0800 Subject: [PATCH 3/6] don't show os password when don't have keyboard permission Signed-off-by: 21pages --- flutter/lib/common/widgets/toolbar.dart | 50 +++++++++++++------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/flutter/lib/common/widgets/toolbar.dart b/flutter/lib/common/widgets/toolbar.dart index 2789bc6b8..2ff3419ab 100644 --- a/flutter/lib/common/widgets/toolbar.dart +++ b/flutter/lib/common/widgets/toolbar.dart @@ -88,32 +88,34 @@ List toolbarControls(BuildContext context, String id, FFI ffi) { ); } // osAccount / osPassword - v.add( - TTextMenu( - child: Row(children: [ - Text(translate(pi.isHeadless ? 'OS Account' : 'OS Password')), - ]), - trailingIcon: Transform.scale( - scale: isDesktop ? 0.8 : 1, - child: IconButton( - onPressed: () { - if (isMobile && Navigator.canPop(context)) { - Navigator.pop(context); - } - if (pi.isHeadless) { - showSetOSAccount(sessionId, ffi.dialogManager); - } else { - handleOsPasswordEditIcon(sessionId, ffi.dialogManager); - } - }, - icon: Icon(Icons.edit, color: isMobile ? MyTheme.accent : null), + if (perms['keyboard'] != false) { + v.add( + TTextMenu( + child: Row(children: [ + Text(translate(pi.isHeadless ? 'OS Account' : 'OS Password')), + ]), + trailingIcon: Transform.scale( + scale: isDesktop ? 0.8 : 1, + child: IconButton( + onPressed: () { + if (isMobile && Navigator.canPop(context)) { + Navigator.pop(context); + } + if (pi.isHeadless) { + showSetOSAccount(sessionId, ffi.dialogManager); + } else { + handleOsPasswordEditIcon(sessionId, ffi.dialogManager); + } + }, + icon: Icon(Icons.edit, color: isMobile ? MyTheme.accent : null), + ), ), + onPressed: () => pi.isHeadless + ? showSetOSAccount(sessionId, ffi.dialogManager) + : handleOsPasswordAction(sessionId, ffi.dialogManager), ), - onPressed: () => pi.isHeadless - ? showSetOSAccount(sessionId, ffi.dialogManager) - : handleOsPasswordAction(sessionId, ffi.dialogManager), - ), - ); + ); + } // paste if (isMobile && perms['keyboard'] != false && perms['clipboard'] != false) { v.add(TTextMenu( From b6e403a3fb68fc5659029f7fedee335703b84b32 Mon Sep 17 00:00:00 2001 From: rustdesk Date: Thu, 23 Nov 2023 19:35:42 +0800 Subject: [PATCH 4/6] zstd 0.13 --- Cargo.lock | 13 ++++++------- libs/hbb_common/Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 934af3701..0c2d9c3fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2868,7 +2868,7 @@ dependencies = [ "toml 0.7.8", "uuid", "winapi 0.3.9", - "zstd 0.12.4", + "zstd 0.13.0", ] [[package]] @@ -7530,11 +7530,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ - "zstd-safe 6.0.6", + "zstd-safe 7.0.0", ] [[package]] @@ -7549,11 +7549,10 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "6.0.6" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ - "libc", "zstd-sys", ] diff --git a/libs/hbb_common/Cargo.toml b/libs/hbb_common/Cargo.toml index 2af73383f..fb5969c17 100644 --- a/libs/hbb_common/Cargo.toml +++ b/libs/hbb_common/Cargo.toml @@ -16,7 +16,7 @@ bytes = { version = "1.4", features = ["serde"] } log = "0.4" env_logger = "0.10" socket2 = { version = "0.3", features = ["reuseport"] } -zstd = "0.12" +zstd = "0.13" quinn = {version = "0.9", optional = true } anyhow = "1.0" futures-util = "0.3" From fa8e0ed27b674b1501667b9700b14ba880661a6f Mon Sep 17 00:00:00 2001 From: rustdesk Date: Thu, 23 Nov 2023 19:52:53 +0800 Subject: [PATCH 5/6] brotli 3.4 --- libs/portable/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/portable/Cargo.toml b/libs/portable/Cargo.toml index f51197cdb..6762ce893 100644 --- a/libs/portable/Cargo.toml +++ b/libs/portable/Cargo.toml @@ -11,7 +11,7 @@ build = "build.rs" embed-resource = "2.1" [dependencies] -brotli = "3.3" +brotli = "3.4" dirs = "5.0" md5 = "0.7" winapi = { version = "0.3", features = ["winbase"] } From 84a21d72b9bda27e070ecd6daede80699475c53a Mon Sep 17 00:00:00 2001 From: rustdesk Date: Thu, 23 Nov 2023 21:56:36 +0800 Subject: [PATCH 6/6] link /usr/bin/rustdesk even for init system --- res/DEBIAN/postinst | 2 +- res/DEBIAN/prerm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/res/DEBIAN/postinst b/res/DEBIAN/postinst index 5b37e2f51..6513d6eb0 100755 --- a/res/DEBIAN/postinst +++ b/res/DEBIAN/postinst @@ -5,9 +5,9 @@ set -e if [ "$1" = configure ]; then INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') + ln -s /usr/lib/rustdesk/rustdesk /usr/bin/rustdesk if [ "systemd" == "$INITSYS" ]; then - ln -s /usr/lib/rustdesk/rustdesk /usr/bin/rustdesk 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 diff --git a/res/DEBIAN/prerm b/res/DEBIAN/prerm index c7177e250..f68be3c7e 100755 --- a/res/DEBIAN/prerm +++ b/res/DEBIAN/prerm @@ -5,9 +5,9 @@ set -e case $1 in remove|upgrade) INITSYS=$(ls -al /proc/1/exe | awk -F' ' '{print $NF}' | awk -F'/' '{print $NF}') + rm /usr/bin/rustdesk if [ "systemd" == "${INITSYS}" ]; then - rm /usr/bin/rustdesk systemctl stop rustdesk || true systemctl disable rustdesk || true