aboutsummaryrefslogtreecommitdiffstats
path: root/src/cocoa
diff options
context:
space:
mode:
Diffstat (limited to 'src/cocoa')
-rw-r--r--src/cocoa/mod.rs4
-rw-r--r--src/cocoa/monitor.rs2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/cocoa/mod.rs b/src/cocoa/mod.rs
index 62eedc6..1da5ce1 100644
--- a/src/cocoa/mod.rs
+++ b/src/cocoa/mod.rs
@@ -32,7 +32,7 @@ use std::sync::Mutex;
use std::ascii::AsciiExt;
use std::ops::Deref;
-use events::Event::{MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel};
+use events::Event::{Awakened, MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel};
use events::ElementState::{Pressed, Released};
use events::MouseButton;
use events;
@@ -335,6 +335,8 @@ impl<'a> Iterator for WaitEventsIterator<'a> {
// calling poll_events()
if let Some(ev) = self.window.poll_events().next() {
return Some(ev);
+ } else {
+ return Some(Awakened);
}
}
}
diff --git a/src/cocoa/monitor.rs b/src/cocoa/monitor.rs
index bf15665..40c7896 100644
--- a/src/cocoa/monitor.rs
+++ b/src/cocoa/monitor.rs
@@ -13,7 +13,7 @@ pub fn get_available_monitors() -> VecDeque<MonitorID> {
display::CGGetActiveDisplayList(max_displays,
&mut active_displays[0],
&mut display_count);
- for i in range(0, display_count as usize) {
+ for i in 0..display_count as usize {
monitors.push_back(MonitorID(active_displays[i]));
}
}