From 2b9026526e7094ccaebf0c571336b58034eb1304 Mon Sep 17 00:00:00 2001 From: fufesou Date: Wed, 7 Jun 2023 20:42:07 +0800 Subject: [PATCH 1/5] fix build Signed-off-by: fufesou --- src/server.rs | 4 ++-- src/server/input_service.rs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server.rs b/src/server.rs index de8fd2e7f..e9bb890d1 100644 --- a/src/server.rs +++ b/src/server.rs @@ -8,6 +8,8 @@ use std::{ use bytes::Bytes; pub use connection::*; +#[cfg(not(any(target_os = "android", target_os = "ios")))] +use hbb_common::config::Config2; use hbb_common::tcp::{self, new_listener}; use hbb_common::{ allow_err, @@ -23,8 +25,6 @@ use hbb_common::{ timeout, tokio, ResultType, Stream, }; #[cfg(not(any(target_os = "android", target_os = "ios")))] -use hbb_common::{anyhow::anyhow, config::Config2}; -#[cfg(not(any(target_os = "android", target_os = "ios")))] use service::ServiceTmpl; use service::{GenericService, Service, Subscriber}; diff --git a/src/server/input_service.rs b/src/server/input_service.rs index 2c6cf1726..9a8d0bd75 100644 --- a/src/server/input_service.rs +++ b/src/server/input_service.rs @@ -17,6 +17,7 @@ use std::{ thread, time::{self, Duration, Instant}, }; +#[cfg(windows)] use winapi::um::winuser::WHEEL_DELTA; const INVALID_CURSOR_POS: i32 = i32::MIN; From 6a9c1c6065a7251f9033ea30af8aef4e1f1049d7 Mon Sep 17 00:00:00 2001 From: fufesou Date: Wed, 7 Jun 2023 20:49:50 +0800 Subject: [PATCH 2/5] fix build Signed-off-by: fufesou --- src/server/audio_service.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/server/audio_service.rs b/src/server/audio_service.rs index b30328479..5a2184fe4 100644 --- a/src/server/audio_service.rs +++ b/src/server/audio_service.rs @@ -15,6 +15,8 @@ use super::*; use magnum_opus::{Application::*, Channels::*, Encoder}; use std::sync::atomic::{AtomicBool, Ordering}; +#[cfg(not(any(target_os = "linux", target_os = "android")))] +use hbb_common::anyhow::anyhow; pub const NAME: &'static str = "audio"; pub const AUDIO_DATA_SIZE_U8: usize = 960 * 4; // 10ms in 48000 stereo From 626e630c9b159a3fa2d3a3b67484e14ba379a161 Mon Sep 17 00:00:00 2001 From: fufesou Date: Wed, 7 Jun 2023 20:57:01 +0800 Subject: [PATCH 3/5] remove unused function Signed-off-by: fufesou --- src/server/video_service.rs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/server/video_service.rs b/src/server/video_service.rs index f0e2d4b0a..90c262cc9 100644 --- a/src/server/video_service.rs +++ b/src/server/video_service.rs @@ -1002,12 +1002,6 @@ fn no_displays(displays: &Vec) -> bool { } } -#[inline] -#[cfg(not(windows))] -fn no_displays(displays: &Vec) -> bool { - displays.is_empty() -} - #[cfg(all(windows, feature = "virtual_display_driver"))] fn try_get_displays() -> ResultType> { let mut displays = Display::all()?; From 75aeb616e42a00d8527f5fc6a95a3f351001a95c Mon Sep 17 00:00:00 2001 From: fufesou Date: Wed, 7 Jun 2023 21:17:13 +0800 Subject: [PATCH 4/5] fix build example mouse.rs Signed-off-by: fufesou --- libs/enigo/examples/mouse.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libs/enigo/examples/mouse.rs b/libs/enigo/examples/mouse.rs index 42234f662..4e73df1c0 100644 --- a/libs/enigo/examples/mouse.rs +++ b/libs/enigo/examples/mouse.rs @@ -1,4 +1,5 @@ use enigo::{Enigo, MouseButton, MouseControllable}; +#[cfg(windows)] use winapi::um::winuser::WHEEL_DELTA; use std::thread; use std::time::Duration; @@ -26,16 +27,28 @@ fn main() { #[cfg(not(target_os = "macos"))] { + #[cfg(windows)] enigo.mouse_scroll_x(2 * WHEEL_DELTA as i32); + #[cfg(not(windows))] + enigo.mouse_scroll_x(2); thread::sleep(wait_time); + #[cfg(windows)] enigo.mouse_scroll_x(-2 * WHEEL_DELTA as i32); + #[cfg(not(windows))] + enigo.mouse_scroll_x(-2); thread::sleep(wait_time); + #[cfg(windows)] enigo.mouse_scroll_y(2 * WHEEL_DELTA as i32); + #[cfg(not(windows))] + enigo.mouse_scroll_y(2); thread::sleep(wait_time); + #[cfg(windows)] enigo.mouse_scroll_y(-2 * WHEEL_DELTA as i32); + #[cfg(not(windows))] + enigo.mouse_scroll_y(-2); thread::sleep(wait_time); } } From ab1e7109bbee2ae68ffdbcdcfdcc7daa210644f8 Mon Sep 17 00:00:00 2001 From: fufesou Date: Wed, 7 Jun 2023 22:35:02 +0800 Subject: [PATCH 5/5] fix build Signed-off-by: fufesou --- src/flutter_ffi.rs | 2 +- src/server.rs | 12 ++++++++++++ src/server/input_service.rs | 12 ------------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/flutter_ffi.rs b/src/flutter_ffi.rs index 2455a4673..e698cc9ee 100644 --- a/src/flutter_ffi.rs +++ b/src/flutter_ffi.rs @@ -6,7 +6,7 @@ use crate::{ common::make_fd_to_json, flutter::{self, SESSIONS}, flutter::{session_add, session_start_}, - server::input_service::{ + server::{ MOUSE_BUTTON_BACK, MOUSE_BUTTON_FORWARD, MOUSE_BUTTON_LEFT, MOUSE_BUTTON_RIGHT, MOUSE_BUTTON_WHEEL, MOUSE_TYPE_DOWN, MOUSE_TYPE_TRACKPAD, MOUSE_TYPE_UP, MOUSE_TYPE_WHEEL, }, diff --git a/src/server.rs b/src/server.rs index e9bb890d1..e98f48e2c 100644 --- a/src/server.rs +++ b/src/server.rs @@ -74,6 +74,18 @@ lazy_static::lazy_static! { pub static ref CLIENT_SERVER: ServerPtr = new(); } +pub const MOUSE_TYPE_MOVE: i32 = 0; +pub const MOUSE_TYPE_DOWN: i32 = 1; +pub const MOUSE_TYPE_UP: i32 = 2; +pub const MOUSE_TYPE_WHEEL: i32 = 3; +pub const MOUSE_TYPE_TRACKPAD: i32 = 4; + +pub const MOUSE_BUTTON_LEFT: i32 = 0x01; +pub const MOUSE_BUTTON_RIGHT: i32 = 0x02; +pub const MOUSE_BUTTON_WHEEL: i32 = 0x04; +pub const MOUSE_BUTTON_BACK: i32 = 0x08; +pub const MOUSE_BUTTON_FORWARD: i32 = 0x10; + pub struct Server { connections: ConnMap, services: HashMap<&'static str, Box>, diff --git a/src/server/input_service.rs b/src/server/input_service.rs index 9a8d0bd75..4dd2d9c1f 100644 --- a/src/server/input_service.rs +++ b/src/server/input_service.rs @@ -22,18 +22,6 @@ use winapi::um::winuser::WHEEL_DELTA; const INVALID_CURSOR_POS: i32 = i32::MIN; -pub const MOUSE_TYPE_MOVE: i32 = 0; -pub const MOUSE_TYPE_DOWN: i32 = 1; -pub const MOUSE_TYPE_UP: i32 = 2; -pub const MOUSE_TYPE_WHEEL: i32 = 3; -pub const MOUSE_TYPE_TRACKPAD: i32 = 4; - -pub const MOUSE_BUTTON_LEFT: i32 = 0x01; -pub const MOUSE_BUTTON_RIGHT: i32 = 0x02; -pub const MOUSE_BUTTON_WHEEL: i32 = 0x04; -pub const MOUSE_BUTTON_BACK: i32 = 0x08; -pub const MOUSE_BUTTON_FORWARD: i32 = 0x10; - #[derive(Default)] struct StateCursor { hcursor: u64,