fix build linux
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
parent
626fdefb18
commit
8852d97efc
@ -1,10 +1,9 @@
|
|||||||
use super::{CursorData, ResultType};
|
use super::{CursorData, ResultType};
|
||||||
|
use hbb_common::libc::{c_char, c_int, c_long, c_void};
|
||||||
pub use hbb_common::platform::linux::*;
|
pub use hbb_common::platform::linux::*;
|
||||||
use hbb_common::{allow_err, bail, log};
|
use hbb_common::{allow_err, bail, log};
|
||||||
use hbb_common::libc::{c_char, c_int, c_void};
|
|
||||||
use std::{
|
use std::{
|
||||||
cell::RefCell,
|
cell::RefCell,
|
||||||
collections::HashMap,
|
|
||||||
path::PathBuf,
|
path::PathBuf,
|
||||||
sync::{
|
sync::{
|
||||||
atomic::{AtomicBool, Ordering},
|
atomic::{AtomicBool, Ordering},
|
||||||
@ -54,8 +53,8 @@ pub struct xcb_xfixes_get_cursor_image {
|
|||||||
pub height: u16,
|
pub height: u16,
|
||||||
pub xhot: u16,
|
pub xhot: u16,
|
||||||
pub yhot: u16,
|
pub yhot: u16,
|
||||||
pub cursor_serial: libc::c_long,
|
pub cursor_serial: c_long,
|
||||||
pub pixels: *const libc::c_long,
|
pub pixels: *const c_long,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_cursor_pos() -> Option<(i32, i32)> {
|
pub fn get_cursor_pos() -> Option<(i32, i32)> {
|
||||||
@ -637,7 +636,7 @@ pub fn get_double_click_time() -> u32 {
|
|||||||
settings,
|
settings,
|
||||||
property.as_ptr(),
|
property.as_ptr(),
|
||||||
&mut double_click_time as *mut u32,
|
&mut double_click_time as *mut u32,
|
||||||
0 as *const libc::c_void,
|
0 as *const c_void,
|
||||||
);
|
);
|
||||||
double_click_time
|
double_click_time
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@ use core::slice;
|
|||||||
use hbb_common::{
|
use hbb_common::{
|
||||||
allow_err,
|
allow_err,
|
||||||
anyhow::anyhow,
|
anyhow::anyhow,
|
||||||
bail, log,
|
bail, libc, log,
|
||||||
message_proto::{KeyEvent, MouseEvent},
|
message_proto::{KeyEvent, MouseEvent},
|
||||||
protobuf::Message,
|
protobuf::Message,
|
||||||
tokio::{self, sync::mpsc},
|
tokio::{self, sync::mpsc},
|
||||||
@ -492,7 +492,7 @@ pub mod client {
|
|||||||
let mut option = SHMEM.lock().unwrap();
|
let mut option = SHMEM.lock().unwrap();
|
||||||
let shmem = option.as_mut().unwrap();
|
let shmem = option.as_mut().unwrap();
|
||||||
unsafe {
|
unsafe {
|
||||||
hbb_common::libc::memset(shmem.as_ptr() as _, 0, shmem.len() as _);
|
libc::memset(shmem.as_ptr() as _, 0, shmem.len() as _);
|
||||||
}
|
}
|
||||||
drop(option);
|
drop(option);
|
||||||
match para {
|
match para {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#[cfg(any(target_os = "windows"))]
|
#[cfg(target_os = "windows")]
|
||||||
use super::ui_interface::get_option_opt;
|
use super::ui_interface::get_option_opt;
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{Arc, Mutex};
|
||||||
@ -80,7 +80,7 @@ pub fn start_tray() {
|
|||||||
/// Check if service is stoped.
|
/// Check if service is stoped.
|
||||||
/// Return [`true`] if service is stoped, [`false`] otherwise.
|
/// Return [`true`] if service is stoped, [`false`] otherwise.
|
||||||
#[inline]
|
#[inline]
|
||||||
#[cfg(any(target_os = "windows"))]
|
#[cfg(target_os = "windows")]
|
||||||
fn is_service_stopped() -> bool {
|
fn is_service_stopped() -> bool {
|
||||||
if let Some(v) = get_option_opt("stop-service") {
|
if let Some(v) = get_option_opt("stop-service") {
|
||||||
v == "Y"
|
v == "Y"
|
||||||
|
@ -128,7 +128,7 @@ pub fn get_license() -> String {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
#[cfg(any(target_os = "linux", target_os = "windows"))]
|
#[cfg(target_os = "windows")]
|
||||||
pub fn get_option_opt(key: &str) -> Option<String> {
|
pub fn get_option_opt(key: &str) -> Option<String> {
|
||||||
OPTIONS.lock().unwrap().get(key).map(|x| x.clone())
|
OPTIONS.lock().unwrap().get(key).map(|x| x.clone())
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user