Skip to content

Exclude Linux backend on OHOS #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FrankHan052176 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Exclude Linux backend on OHOS #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ core-foundation-sys = {version = "0.8.3"}
core-graphics = {version = "0.22.3", features = ["highsierra"]}
dispatch = "0.2"

[target.'cfg(target_os = "linux")'.dependencies]
[target.'cfg(all(target_os = "linux", not(target_env = "ohos")))'.dependencies]
epoll = {version = "4.1.0"}
# evdev-rs = {version = "0.6.0"}
inotify = {version = "0.10.0", default-features = false}
Expand Down
16 changes: 8 additions & 8 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ pub use crate::rdev::{
};

mod keycodes;
#[cfg(target_os = "linux")]
#[cfg(all(target_os = "linux", not(target_env = "ohos")))]
mod linux;
#[cfg(target_os = "macos")]
mod macos;
Expand Down Expand Up @@ -267,9 +267,9 @@ pub use core_graphics::{event::CGEventTapLocation, event_source::CGEventSourceSt

#[cfg(any(target_os = "android", target_os = "linux"))]
pub use crate::keycodes::linux::{code_from_key, key_from_code};
#[cfg(target_os = "linux")]
#[cfg(all(target_os = "linux", not(target_env = "ohos")))]
use crate::linux::{display_size as _display_size, listen as _listen, simulate as _simulate};
#[cfg(target_os = "linux")]
#[cfg(all(target_os = "linux", not(target_env = "ohos")))]
pub use crate::linux::{simulate_char, simulate_unicode, Keyboard};

#[cfg(target_os = "windows")]
Expand Down Expand Up @@ -304,7 +304,7 @@ pub use crate::rdev::UnicodeInfo;
/// }
/// }
/// ```
#[cfg(not(any(target_os = "android", target_os = "ios")))]
#[cfg(not(any(target_os = "android", target_os = "ios", target_env = "ohos")))]
pub fn listen<T>(callback: T) -> Result<(), ListenError>
where
T: FnMut(Event) + 'static,
Expand Down Expand Up @@ -344,7 +344,7 @@ where
/// });
/// }
/// ```
#[cfg(not(any(target_os = "android", target_os = "ios")))]
#[cfg(not(any(target_os = "android", target_os = "ios", target_env = "ohos")))]
pub fn simulate(event_type: &EventType) -> Result<(), SimulateError> {
_simulate(event_type)
}
Expand All @@ -358,12 +358,12 @@ pub fn simulate(event_type: &EventType) -> Result<(), SimulateError> {
/// let (w, h) = display_size().unwrap();
/// println!("My screen size : {:?}x{:?}", w, h);
/// ```
#[cfg(not(any(target_os = "android", target_os = "ios")))]
#[cfg(not(any(target_os = "android", target_os = "ios", target_env = "ohos")))]
pub fn display_size() -> Result<(u64, u64), DisplayError> {
_display_size()
}

#[cfg(target_os = "linux")]
#[cfg(all(target_os = "linux", not(target_env = "ohos")))]
pub use crate::linux::{
disable_grab, enable_grab, exit_grab_listen, is_grabbed, start_grab_listen,
};
Expand Down Expand Up @@ -415,7 +415,7 @@ where
_grab(callback)
}

#[cfg(not(any(target_os = "android", target_os = "ios")))]
#[cfg(not(any(target_os = "android", target_os = "ios", target_env = "ohos")))]
pub(crate) fn keyboard_only() -> bool {
!std::env::var("KEYBOARD_ONLY")
.unwrap_or_default()
Expand Down