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

Handle ControlFlow::Exit

Browse source
This commit is contained in:
Ryan Goldstein 2019-03-18 22:13:30 -04:00
parent 85446d81f3
commit b09629f1d4
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/platform_impl/stdweb/event_loop.rs
View file

@ -67,6 +67,7 @@ pub struct ELRShared<T> {
struct EventLoopRunner<T> { struct EventLoopRunner<T> {
control: ControlFlow, control: ControlFlow,
handling: bool,
event_handler: Box<dyn FnMut(Event<T>, &mut ControlFlow)>, event_handler: Box<dyn FnMut(Event<T>, &mut ControlFlow)>,
} }
@ -89,13 +90,9 @@ impl<T> EventLoop<T> {
} }
pub fn run<F>(self, mut event_handler: F) -> ! pub fn run<F>(self, mut event_handler: F) -> !
where F: 'static + FnMut(Event<T>, &RootELW<T>, &mut ControlFlow) where F: 'static + FnMut(Event<T>, &RootELW<T>, &mut ControlFlow) {
{
// TODO: how to handle request redraw?
// TODO: onclose (stdweb PR)
// TODO: file dropping, PathBuf isn't useful for web
let runner = self.elw.p.runner; let runner = self.elw.p.runner;
let relw = RootELW { let relw = RootELW {
p: EventLoopWindowTarget::new(), p: EventLoopWindowTarget::new(),
_marker: PhantomData _marker: PhantomData
@ -130,7 +127,6 @@ impl<T> EventLoop<T> {
elrs.send_event(Event::WindowEvent { elrs.send_event(Event::WindowEvent {
window_id: RootWI(WindowId), window_id: RootWI(WindowId),
event: WindowEvent::KeyboardInput { event: WindowEvent::KeyboardInput {
// TODO: is there a way to get keyboard device?
device_id: RootDI(unsafe { DeviceId::dummy() }), device_id: RootDI(unsafe { DeviceId::dummy() }),
input: KeyboardInput { input: KeyboardInput {
scancode: scancode(&event), scancode: scancode(&event),
@ -145,7 +141,6 @@ impl<T> EventLoop<T> {
elrs.send_event(Event::WindowEvent { elrs.send_event(Event::WindowEvent {
window_id: RootWI(WindowId), window_id: RootWI(WindowId),
event: WindowEvent::KeyboardInput { event: WindowEvent::KeyboardInput {
// TODO: is there a way to get keyboard device?
device_id: RootDI(unsafe { DeviceId::dummy() }), device_id: RootDI(unsafe { DeviceId::dummy() }),
input: KeyboardInput { input: KeyboardInput {
scancode: scancode(&event), scancode: scancode(&event),
@ -248,6 +243,7 @@ impl<T> ELRShared<T> {
fn set_listener(&self, event_handler: Box<dyn FnMut(Event<T>, &mut ControlFlow)>) { fn set_listener(&self, event_handler: Box<dyn FnMut(Event<T>, &mut ControlFlow)>) {
*self.runner.borrow_mut() = Some(EventLoopRunner { *self.runner.borrow_mut() = Some(EventLoopRunner {
control: ControlFlow::Poll, control: ControlFlow::Poll,
handling: false
event_handler event_handler
}); });
} }
@ -256,11 +252,17 @@ impl<T> ELRShared<T> {
// TODO: handle event buffer // TODO: handle event buffer
pub fn send_event(&self, event: Event<T>) { pub fn send_event(&self, event: Event<T>) {
match *self.runner.borrow_mut() { match *self.runner.borrow_mut() {
Some(ref mut runner) => { Some(ref mut runner) if !runner.handling => {
runner.handling = true;
let closed = runner.control == ControlFlow::Exit;
// TODO: bracket this in control flow events? // TODO: bracket this in control flow events?
(runner.event_handler)(event, &mut runner.control); (runner.event_handler)(event, &mut runner.control);
if closed {
runner.control = ControlFlow::Exit;
}
runner.handling = false;
} }
None => () _ => self.events.borrow_mut().push_back(event)
} }
} }