alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-25 14:51:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Update api transition to use ControlFlow

Browse source
This commit is contained in:
mitchmindtree 2017-06-09 22:55:32 +10:00
parent 0237526999
commit 0af3c04900
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/api_transition.rs
View file

@ -9,7 +9,6 @@ macro_rules! gen_api_transition {
() => { () => {
pub struct EventsLoop { pub struct EventsLoop {
windows: ::std::sync::Arc<::std::sync::Mutex<Vec<::std::sync::Arc<Window>>>>, windows: ::std::sync::Arc<::std::sync::Mutex<Vec<::std::sync::Arc<Window>>>>,
interrupted: ::std::sync::atomic::AtomicBool,
awakened: ::std::sync::Arc<::std::sync::atomic::AtomicBool>, awakened: ::std::sync::Arc<::std::sync::atomic::AtomicBool>,
} }
@ -21,16 +20,11 @@ macro_rules! gen_api_transition {
pub fn new() -> EventsLoop { pub fn new() -> EventsLoop {
EventsLoop { EventsLoop {
windows: ::std::sync::Arc::new(::std::sync::Mutex::new(vec![])), windows: ::std::sync::Arc::new(::std::sync::Mutex::new(vec![])),
interrupted: ::std::sync::atomic::AtomicBool::new(false),
awakened: ::std::sync::Arc::new(::std::sync::atomic::AtomicBool::new(false)), awakened: ::std::sync::Arc::new(::std::sync::atomic::AtomicBool::new(false)),
} }
} }
pub fn interrupt(&self) { pub fn poll_events<F>(&mut self, mut callback: F)
self.interrupted.store(true, ::std::sync::atomic::Ordering::Relaxed);
}
pub fn poll_events<F>(&self, mut callback: F)
where F: FnMut(::Event) where F: FnMut(::Event)
{ {
if self.awakened.load(::std::sync::atomic::Ordering::Relaxed) { if self.awakened.load(::std::sync::atomic::Ordering::Relaxed) {
@ -49,19 +43,23 @@ macro_rules! gen_api_transition {
} }
} }
pub fn run_forever<F>(&self, mut callback: F) pub fn run_forever<F>(&mut self, mut callback: F)
where F: FnMut(::Event) where F: FnMut(::Event) -> ControlFlow,
{ {
self.interrupted.store(false, ::std::sync::atomic::Ordering::Relaxed);
self.awakened.store(false, ::std::sync::atomic::Ordering::Relaxed); self.awakened.store(false, ::std::sync::atomic::Ordering::Relaxed);
// Yeah that's a very bad implementation. // Yeah that's a very bad implementation.
loop { loop {
self.poll_events(|e| callback(e)); let mut control_flow = ::ControlFlow::Continue;
::std::thread::sleep_ms(5); self.poll_events(|e| {
if self.interrupted.load(::std::sync::atomic::Ordering::Relaxed) { if let ::ControlFlow::Complete = callback(e) {
control_flow = ::ControlFlow::Complete;
}
});
if let ::ControlFlow::Complete = control_flow {
break; break;
} }
::std::thread::sleep_ms(5);
} }
} }