Merge branch 'master' into modern-dialog

vdi/host/.devcontainer/devcontainer.json

@@ -4,8 +4,8 @@
         "dockerfile": "./Dockerfile",
         "context": "."
     },
-    "workspaceMount": "source=${localWorkspaceFolder},target=/home/vscode/rustdesk,type=bind,consistency=cache",
-    "workspaceFolder": "/home/vscode/rustdesk",
+    "workspaceMount": "source=${localWorkspaceFolder}/../..,target=/home/vscode/rustdesk,type=bind,consistency=cache",
+    "workspaceFolder": "/home/vscode/rustdesk/vdi/host",
     "customizations": {
         "vscode": {
             "extensions": [
@@ -15,6 +15,7 @@
                 "tamasfe.even-better-toml",
                 "serayuzgur.crates",
                 "mhutchie.git-graph",
+                "formulahendry.terminal",
                 "eamodio.gitlens"
             ],
             "settings": {

vdi/host/Cargo.toml

@@ -4,6 +4,6 @@ version = "0.1.0"
 authors = ["rustdesk <info@rustdesk.com>"]
 edition = "2021"
 
-
 [dependencies]
-qemu-display = { git = "https://gitlab.com/marcandre.lureau/qemu-display" }
+qemu-display = { git = "https://gitlab.com/marcandre.lureau/qemu-display" }
+hbb_common = { path = "../../libs/hbb_common" }