wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-09-21 11:50:42 +03:00
Code Issues Projects Releases Wiki Activity

fix compilation on macos

Browse Source 
refs: https://github.com/wez/wezterm/issues/65
This commit is contained in:
Wez Furlong 2019-11-21 18:31:02 -08:00
parent 6787512d62
commit a5ece82d69
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
window/src/spawn.rs
View File

@ -77,9 +77,11 @@ impl SpawnQueue {
impl SpawnQueue { impl SpawnQueue {
fn new_impl() -> Fallible<Self> { fn new_impl() -> Fallible<Self> {
let spawned_funcs = Mutex::new(VecDeque::new()); let spawned_funcs = Mutex::new(VecDeque::new());
let spawned_funcs_low_pri = Mutex::new(VecDeque::new());
let event_handle = EventHandle::new_manual_reset().expect("EventHandle creation failed"); let event_handle = EventHandle::new_manual_reset().expect("EventHandle creation failed");
Ok(Self { Ok(Self {
spawned_funcs, spawned_funcs,
spawned_funcs_low_pri,
event_handle, event_handle,
}) })
} }
@ -178,6 +180,7 @@ impl Evented for SpawnQueue {
impl SpawnQueue { impl SpawnQueue {
fn new_impl() -> Fallible<Self> { fn new_impl() -> Fallible<Self> {
let spawned_funcs = Mutex::new(VecDeque::new()); let spawned_funcs = Mutex::new(VecDeque::new());
let spawned_funcs_low_pri = Mutex::new(VecDeque::new());
let observer = unsafe { let observer = unsafe {
CFRunLoopObserverCreate( CFRunLoopObserverCreate(
@ -193,7 +196,10 @@ impl SpawnQueue {
CFRunLoopAddObserver(CFRunLoopGetMain(), observer, kCFRunLoopCommonModes); CFRunLoopAddObserver(CFRunLoopGetMain(), observer, kCFRunLoopCommonModes);
} }
Ok(Self { spawned_funcs }) Ok(Self {
spawned_funcs,
spawned_funcs_low_pri,
})
} }
extern "C" fn trigger( extern "C" fn trigger(
@ -202,11 +208,11 @@ impl SpawnQueue {
_: *mut std::ffi::c_void, _: *mut std::ffi::c_void,
) { ) {
if SPAWN_QUEUE.run() { if SPAWN_QUEUE.run() {
self.queue_wakeup(); Self::queue_wakeup();
} }
} }
fn queue_wakeup(&self) { fn queue_wakeup() {
unsafe { unsafe {
CFRunLoopWakeUp(CFRunLoopGetMain()); CFRunLoopWakeUp(CFRunLoopGetMain());
} }
@ -214,7 +220,7 @@ impl SpawnQueue {
fn spawn_impl(&self, f: SpawnFunc, high_pri: bool) { fn spawn_impl(&self, f: SpawnFunc, high_pri: bool) {
self.queue_func(f, high_pri); self.queue_func(f, high_pri);
self.queue_wakeup(); Self::queue_wakeup();
} }
fn run_impl(&self) -> bool { fn run_impl(&self) -> bool {