more build

.cargo/config.toml

@@ -1,4 +1,8 @@
+[target.x86_64-pc-windows-msvc]
+rustflags = ["-Ctarget-feature=+crt-static"]
+[target.i686-pc-windows-msvc]
+rustflags = ["-Ctarget-feature=+crt-static"]
 [target.'cfg(target_os="macos")']
 rustflags = [
     "-C", "link-args=-sectcreate __CGPreLoginApp __cgpreloginapp /dev/null",
-]
+]

.gitignore

@@ -7,5 +7,15 @@ extractor
 __pycache__
 src/version.rs
 *dmg
+*exe
+*tgz
+*lib
+cert.pfx
+flutter_hbb
+*.bak
+*png
+*svg
+*jpg
+web_hbb
 sciter.dll
 **pdb

Cargo.lock

@@ -4007,7 +4007,6 @@ dependencies = [
  "tray-item",
  "trayicon",
  "uuid",
- "virtual_display",
  "whoami",
  "winapi 0.3.9",
  "windows-service",

Cargo.toml

@@ -30,10 +30,6 @@ default = ["use_dasp"]
 whoami = "1.2"
 scrap = { path = "libs/scrap" }
 hbb_common = { path = "libs/hbb_common" }
-enigo = { path = "libs/enigo" }
-clipboard = { path = "libs/clipboard" }
-virtual_display = { path = "libs/virtual_display" }
-sys-locale = "0.2"
 serde_derive = "1.0"
 serde = "1.0"
 serde_json = "1.0"

DEBIAN/postinst

@@ -10,7 +10,11 @@ if [ "$1" = configure ]; then
 		if [ -e /etc/systemd/system/rustdesk.service ]; then
 			rm /etc/systemd/system/rustdesk.service
 		fi
-    sudo -H pip3 install pynput
+		version=$(python3 -V 2>&1 | grep -Po '(?<=Python )(.+)')
+		parsedVersion=$(echo "${version//./}")
+		if [[ "$parsedVersion" -gt "360" ]]; then
+			sudo -H pip3 install pynput
+		fi
 		cp /usr/share/rustdesk/files/systemd/rustdesk.service /etc/systemd/system/rustdesk.service
 		systemctl daemon-reload
 		systemctl enable rustdesk

lang.py

@@ -0,0 +1,46 @@
+#!/usr/bin/env python3
+
+# Based on 'cn.rs', generate entries that are not completed in other languages
+
+import os    
+import glob    
+    
+def get_lang(lang):    
+  out = {}    
+  for ln in open('./src/lang/%s.rs'%lang):    
+    ln = ln.strip()
+    if ln.startswith('("'):
+      k,v = line_split(ln)
+      out[k] = v    
+  return out 
+
+def line_split(line):
+    toks = line.split('", "')    
+    assert(len(toks) == 2)    
+    k = toks[0][2:]    
+    v = toks[1][:-3]
+    return k,v
+
+
+def main():     
+  for fn in glob.glob('./src/lang/*'): 
+    lang = os.path.basename(fn)[:-3] 
+    if lang in ['en','cn']: continue  
+    fw = open("%s.rs.gen"%lang, "wb+")
+    dict = get_lang(lang)
+    for line in open('./src/lang/cn.rs'):
+      line_strip = line.strip()
+      if line_strip.startswith('("'):
+        k,v = line_split(line_strip)
+        if k in dict:
+            line = line.replace(v, dict[k])
+        else:
+            line = line.replace(v, "")
+        fw.write(line.encode())
+      else:
+        fw.write(line.encode())
+    fw.close()
+    os.remove("./src/lang/%s.rs"%lang)
+    os.rename(fw.name, "./src/lang/%s.rs"%lang)
+    
+main()

manifest.xml

@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <asmv3:windowsSettings
+         xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
+    </asmv3:windowsSettings>
+  </asmv3:application>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> 
+        <application> 
+            <!-- Windows 10 --> 
+            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+            <!-- Windows 8.1 -->
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+            <!-- Windows Vista -->
+            <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> 
+            <!-- Windows 7 -->
+            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+            <!-- Windows 8 -->
+            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+        </application> 
+  </compatibility>
+  <dependency>
+      <dependentAssembly>
+          <assemblyIdentity
+              type="win32"
+              name="Microsoft.Windows.Common-Controls"
+              version="6.0.0.0"
+              processorArchitecture="*"
+              publicKeyToken="6595b64144ccf1df"
+              language="*"
+          />
+      </dependentAssembly>
+  </dependency>
+</assembly>