Merge branch 'rustdesk:master' into rustdesk-rustdesk

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",
 ]
 

flutter/lib/common/widgets/toolbar.dart

@@ -88,32 +88,34 @@ List<TTextMenu> toolbarControls(BuildContext context, String id, FFI ffi) {
     );
   }
   // osAccount / osPassword
-  v.add(
+  if (perms['keyboard'] != false) {
-    TTextMenu(
+    v.add(
-      child: Row(children: [
+      TTextMenu(
-        Text(translate(pi.isHeadless ? 'OS Account' : 'OS Password')),
+        child: Row(children: [
-      ]),
+          Text(translate(pi.isHeadless ? 'OS Account' : 'OS Password')),
-      trailingIcon: Transform.scale(
+        ]),
-        scale: isDesktop ? 0.8 : 1,
+        trailingIcon: Transform.scale(
-        child: IconButton(
+          scale: isDesktop ? 0.8 : 1,
-          onPressed: () {
+          child: IconButton(
-            if (isMobile && Navigator.canPop(context)) {
+            onPressed: () {
-              Navigator.pop(context);
+              if (isMobile && Navigator.canPop(context)) {
-            }
+                Navigator.pop(context);
-            if (pi.isHeadless) {
+              }
-              showSetOSAccount(sessionId, ffi.dialogManager);
+              if (pi.isHeadless) {
-            } else {
+                showSetOSAccount(sessionId, ffi.dialogManager);
-              handleOsPasswordEditIcon(sessionId, ffi.dialogManager);
+              } else {
-            }
+                handleOsPasswordEditIcon(sessionId, ffi.dialogManager);
-          },
+              }
-          icon: Icon(Icons.edit, color: isMobile ? MyTheme.accent : null),
+            },
+            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(

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"

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"] }

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

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

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

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