mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-11-27 14:59:02 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix: move some crates to rustdesk-org (#8772)

Browse Source 
Signed-off-by: fufesou <linlong1266@gmail.com>
Co-authored-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
dignow 2024-07-20 23:49:40 +08:00 committed by GitHub
parent cf8ef2533a
commit d3454f07d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock generated
View File

@ -1940,7 +1940,7 @@ checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
[[package]] [[package]]
name = "evdev" name = "evdev"
version = "0.11.5" version = "0.11.5"
source = "git+https://github.com/fufesou/evdev#cec616e37790293d2cd2aa54a96601ed6b1b35a9" source = "git+https://github.com/rustdesk-org/evdev#cec616e37790293d2cd2aa54a96601ed6b1b35a9"
dependencies = [ dependencies = [
"bitvec", "bitvec",
"libc", "libc",
@ -3850,7 +3850,7 @@ dependencies = [
[[package]] [[package]]
name = "mouce" name = "mouce"
version = "0.2.1" version = "0.2.1"
source = "git+https://github.com/fufesou/mouce.git#ed83800d532b95d70e39915314f6052aa433e9b9" source = "git+https://github.com/rustdesk-org/mouce.git#ed83800d532b95d70e39915314f6052aa433e9b9"
dependencies = [ dependencies = [
"glob", "glob",
] ]
@ -4551,7 +4551,7 @@ dependencies = [
[[package]] [[package]]
name = "pam" name = "pam"
version = "0.7.0" version = "0.7.0"
source = "git+https://github.com/fufesou/pam#3a2aaa6e07b176d8e2d66a5eec38d2ddb45f009f" source = "git+https://github.com/rustdesk-org/pam#7bfd25510202cd269292cbdd7c71f3977a6fd762"
dependencies = [ dependencies = [
"libc", "libc",
"pam-macros", "pam-macros",
@ -4573,7 +4573,7 @@ dependencies = [
[[package]] [[package]]
name = "pam-sys" name = "pam-sys"
version = "1.0.0-alpha4" version = "1.0.0-alpha4"
source = "git+https://github.com/fufesou/pam-sys?branch=fix/v1.0.0-alpha4_gnuc_va_list#3337c9bb9a9c68d7497ec8c93cad2368c26091b7" source = "git+https://github.com/rustdesk-org/pam-sys?branch=fix/v1.0.0-alpha4_gnuc_va_list#3337c9bb9a9c68d7497ec8c93cad2368c26091b7"
dependencies = [ dependencies = [
"bindgen 0.59.2", "bindgen 0.59.2",
"libc", "libc",
@ -5260,7 +5260,7 @@ dependencies = [
[[package]] [[package]]
name = "rdev" name = "rdev"
version = "0.5.0-2" version = "0.5.0-2"
source = "git+https://github.com/fufesou/rdev#b3434caee84c92412b45a2f655a15ac5dad33488" source = "git+https://github.com/rustdesk-org/rdev#b3434caee84c92412b45a2f655a15ac5dad33488"
dependencies = [ dependencies = [
"cocoa 0.24.1", "cocoa 0.24.1",
"core-foundation 0.9.4", "core-foundation 0.9.4",
@ -6594,7 +6594,7 @@ dependencies = [
[[package]] [[package]]
name = "tfc" name = "tfc"
version = "0.6.1" version = "0.6.1"
source = "git+https://github.com/fufesou/The-Fat-Controller#9dd86151525fd010dc93f6bc9b6aedd1a75cc342" source = "git+https://github.com/rustdesk-org/The-Fat-Controller#9dd86151525fd010dc93f6bc9b6aedd1a75cc342"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"core-graphics 0.22.3", "core-graphics 0.22.3",

8
Cargo.toml
View File

@ -66,7 +66,7 @@ default-net = "0.14"
wol-rs = "1.0" wol-rs = "1.0"
flutter_rust_bridge = { version = "=1.80", features = ["uuid"], optional = true} flutter_rust_bridge = { version = "=1.80", features = ["uuid"], optional = true}
errno = "0.3" errno = "0.3"
rdev = { git = "https://github.com/fufesou/rdev" } rdev = { git = "https://github.com/rustdesk-org/rdev" }
url = { version = "2.3", features = ["serde"] } url = { version = "2.3", features = ["serde"] }
crossbeam-queue = "0.3" crossbeam-queue = "0.3"
hex = "0.4" hex = "0.4"
@ -152,11 +152,11 @@ psimple = { package = "libpulse-simple-binding", version = "2.27" }
pulse = { package = "libpulse-binding", version = "2.27" } pulse = { package = "libpulse-binding", version = "2.27" }
rust-pulsectl = { git = "https://github.com/open-trade/pulsectl" } rust-pulsectl = { git = "https://github.com/open-trade/pulsectl" }
async-process = "1.7" async-process = "1.7"
mouce = { git="https://github.com/fufesou/mouce.git" } mouce = { git="https://github.com/rustdesk-org/mouce.git" }
evdev = { git="https://github.com/fufesou/evdev" } evdev = { git="https://github.com/rustdesk-org/evdev" }
dbus = "0.9" dbus = "0.9"
dbus-crossroads = "0.5" dbus-crossroads = "0.5"
pam = { git="https://github.com/fufesou/pam" } pam = { git="https://github.com/rustdesk-org/pam" }
users = { version = "0.11" } users = { version = "0.11" }
x11-clipboard = {git="https://github.com/clslaid/x11-clipboard", branch = "feat/store-batch", optional = true} x11-clipboard = {git="https://github.com/clslaid/x11-clipboard", branch = "feat/store-batch", optional = true}
x11rb = {version = "0.12", features = ["all-extensions"], optional = true} x11rb = {version = "0.12", features = ["all-extensions"], optional = true}

13
build.py
View File

@ -48,15 +48,7 @@ def get_version():
def parse_rc_features(feature): def parse_rc_features(feature):
available_features = { available_features = {}
'PrivacyMode': {
'platform': ['windows'],
'zip_url': 'https://github.com/fufesou/RustDeskTempTopMostWindow/releases/download/v0.3'
'/TempTopMostWindow_x64.zip',
'checksum_url': 'https://github.com/fufesou/RustDeskTempTopMostWindow/releases/download/v0.3/checksum_md5',
'include': ['WindowInjection.dll'],
}
}
apply_features = {} apply_features = {}
if not feature: if not feature:
feature = [] feature = []
@ -81,7 +73,6 @@ def parse_rc_features(feature):
elif isinstance(feature, list): elif isinstance(feature, list):
if windows: if windows:
# download third party is deprecated, we use github ci instead. # download third party is deprecated, we use github ci instead.
# force add PrivacyMode
# feature.append('PrivacyMode') # feature.append('PrivacyMode')
pass pass
for feat in feature: for feat in feature:
@ -108,7 +99,7 @@ def make_parser():
nargs='+', nargs='+',
default='', default='',
help='Integrate features, windows only.' help='Integrate features, windows only.'
'Available: PrivacyMode. Special value is "ALL" and empty "". Default is empty.') 'Available: [Not used for now]. Special value is "ALL" and empty "". Default is empty.')
parser.add_argument('--flutter', action='store_true', parser.add_argument('--flutter', action='store_true',
help='Build flutter package', default=False) help='Build flutter package', default=False)
parser.add_argument( parser.add_argument(

2
flutter/lib/common.dart
View File

@ -1062,7 +1062,7 @@ void msgBox(SessionID sessionId, String type, String title, String text,
bool hasOk = false; bool hasOk = false;
submit() { submit() {
dialogManager.dismissAll(); dialogManager.dismissAll();
// https://github.com/fufesou/rustdesk/blob/5e9a31340b899822090a3731769ae79c6bf5f3e5/src/ui/common.tis#L263 // https://github.com/rustdesk/rustdesk/blob/5e9a31340b899822090a3731769ae79c6bf5f3e5/src/ui/common.tis#L263
if (!type.contains("custom") && desktopType != DesktopType.portForward) { if (!type.contains("custom") && desktopType != DesktopType.portForward) {
closeConnection(); closeConnection();
} }

4
libs/enigo/Cargo.toml
View File

@ -22,8 +22,8 @@ appveyor = { repository = "pythoneer/enigo-85xiy" }
serde = { version = "1.0", optional = true } serde = { version = "1.0", optional = true }
serde_derive = { version = "1.0", optional = true } serde_derive = { version = "1.0", optional = true }
log = "0.4" log = "0.4"
rdev = { git = "https://github.com/fufesou/rdev" } rdev = { git = "https://github.com/rustdesk-org/rdev" }
tfc = { git = "https://github.com/fufesou/The-Fat-Controller" } tfc = { git = "https://github.com/rustdesk-org/The-Fat-Controller" }
hbb_common = { path = "../hbb_common" } hbb_common = { path = "../hbb_common" }
[features] [features]

2
libs/virtual_display/dylib/README.md
View File

@ -10,7 +10,7 @@ Virtual display may be used on computers that do not have a monitor.
Win10 provides [Indirect Display Driver Model](https://msdn.microsoft.com/en-us/library/windows/hardware/mt761968(v=vs.85).aspx). Win10 provides [Indirect Display Driver Model](https://msdn.microsoft.com/en-us/library/windows/hardware/mt761968(v=vs.85).aspx).
This lib uses [this project](https://github.com/fufesou/RustDeskIddDriver) as the driver. This lib uses [this project](https://github.com/rustdesk-org/RustDeskIddDriver) as the driver.
**NOTE**: Versions before Win10 1607. Try follow [this method](https://github.com/fanxiushu/xdisp_virt/tree/master/indirect_display). **NOTE**: Versions before Win10 1607. Try follow [this method](https://github.com/fanxiushu/xdisp_virt/tree/master/indirect_display).

2
res/msi/preprocess.py
View File

@ -33,7 +33,7 @@ g_arpsystemcomponent = {
}, },
"ReadMe": { "ReadMe": {
"msi": "ARPREADME", "msi": "ARPREADME",
"v": "https://github.com/fufesou/rustdesk", "v": "https://github.com/rustdesk/rustdesk",
}, },
} }

2
src/keyboard.rs
View File

@ -1046,7 +1046,7 @@ fn is_press(event: &Event) -> bool {
matches!(event.event_type, EventType::KeyPress(_)) matches!(event.event_type, EventType::KeyPress(_))
} }
// https://github.com/fufesou/rustdesk/wiki/Keyboard-mode----Translate-Mode // https://github.com/rustdesk/rustdesk/wiki/FAQ#keyboard-translation-modes
pub fn translate_keyboard_mode(peer: &str, event: &Event, key_event: KeyEvent) -> Vec<KeyEvent> { pub fn translate_keyboard_mode(peer: &str, event: &Event, key_event: KeyEvent) -> Vec<KeyEvent> {
let mut events: Vec<KeyEvent> = Vec::new(); let mut events: Vec<KeyEvent> = Vec::new();

2
src/platform/windows.rs
View File

@ -2028,7 +2028,7 @@ pub fn get_unicode_from_vk(vk: u32) -> Option<u16> {
let current_window_thread_id = GetWindowThreadProcessId(GetForegroundWindow(), null_mut()); let current_window_thread_id = GetWindowThreadProcessId(GetForegroundWindow(), null_mut());
let layout = GetKeyboardLayout(current_window_thread_id); let layout = GetKeyboardLayout(current_window_thread_id);
// refs: https://github.com/fufesou/rdev/blob/25a99ce71ab42843ad253dd51e6a35e83e87a8a4/src/windows/keyboard.rs#L115 // refs: https://github.com/rustdesk-org/rdev/blob/25a99ce71ab42843ad253dd51e6a35e83e87a8a4/src/windows/keyboard.rs#L115
let press_state = 129; let press_state = 129;
let mut state: [BYTE; 256] = [0; 256]; let mut state: [BYTE; 256] = [0; 256];
let shift_left = rdev::get_modifier(rdev::Key::ShiftLeft); let shift_left = rdev::get_modifier(rdev::Key::ShiftLeft);

11
src/plugin/manager.rs
View File

@ -57,11 +57,12 @@ static PLUGIN_SOURCE_LOCAL: &str = "local";
fn get_plugin_source_list() -> Vec<PluginSource> { fn get_plugin_source_list() -> Vec<PluginSource> {
// Only one source for now. // Only one source for now.
vec![PluginSource { // vec![PluginSource {
name: "rustdesk".to_string(), // name: "rustdesk".to_string(),
url: "https://raw.githubusercontent.com/fufesou/rustdesk-plugins/main".to_string(), // url: "https://raw.githubusercontent.com/fufesou/rustdesk-plugins/main".to_string(),
description: "".to_string(), // description: "".to_string(),
}] // }]
vec![]
} }
fn get_source_plugins() -> HashMap<String, PluginInfo> { fn get_source_plugins() -> HashMap<String, PluginInfo> {

2
src/privacy_mode/win_virtual_display.rs
View File

@ -85,7 +85,7 @@ impl PrivacyModeImpl {
} }
} }
// mainly from https://github.com/fufesou/rustdesk/blob/44c3a52ca8502cf53b58b59db130611778d34dbe/libs/scrap/src/dxgi/mod.rs#L365 // mainly from https://github.com/rustdesk-org/rustdesk/blob/44c3a52ca8502cf53b58b59db130611778d34dbe/libs/scrap/src/dxgi/mod.rs#L365
fn set_displays(&mut self) { fn set_displays(&mut self) {
self.displays.clear(); self.displays.clear();
self.virtual_displays.clear(); self.virtual_displays.clear();

2
src/virtual_display_manager.rs
View File

@ -2,7 +2,7 @@ use hbb_common::{bail, platform::windows::is_windows_version_or_greater, ResultT
use std::sync::atomic; use std::sync::atomic;
// This string is defined here. // This string is defined here.
// https://github.com/fufesou/RustDeskIddDriver/blob/b370aad3f50028b039aad211df60c8051c4a64d6/RustDeskIddDriver/RustDeskIddDriver.inf#LL73C1-L73C40 // https://github.com/rustdesk/RustDeskIddDriver/blob/b370aad3f50028b039aad211df60c8051c4a64d6/RustDeskIddDriver/RustDeskIddDriver.inf#LL73C1-L73C40
pub const RUSTDESK_IDD_DEVICE_STRING: &'static str = "RustDeskIddDriver Device\0"; pub const RUSTDESK_IDD_DEVICE_STRING: &'static str = "RustDeskIddDriver Device\0";
pub const AMYUNI_IDD_DEVICE_STRING: &'static str = "USB Mobile Monitor Virtual Display\0"; pub const AMYUNI_IDD_DEVICE_STRING: &'static str = "USB Mobile Monitor Virtual Display\0";