diff options
| -rw-r--r-- | ports/glutin/lib.rs | 2 | ||||
| -rw-r--r-- | ports/glutin/window.rs | 42 |
2 files changed, 42 insertions, 2 deletions
diff --git a/ports/glutin/lib.rs b/ports/glutin/lib.rs index 654d47a0ecc..f2911891bdb 100644 --- a/ports/glutin/lib.rs +++ b/ports/glutin/lib.rs @@ -6,6 +6,8 @@ #![feature(int_uint)] #![feature(box_syntax)] +#![feature(old_io)] +#![feature(std_misc)] #[macro_use] extern crate bitflags; #[cfg(target_os="macos")] diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs index 1732833e246..98243c48f1c 100644 --- a/ports/glutin/window.rs +++ b/ports/glutin/window.rs @@ -255,6 +255,45 @@ impl Window { self.event_queue.borrow_mut().push(WindowEvent::MouseWindowEventClass(event)); } + #[cfg(not(target_os="linux"))] + fn handle_next_event(&self) -> bool { + let event = self.window.wait_events().next().unwrap(); + self.handle_window_event(event) + } + + #[cfg(target_os="linux")] + fn handle_next_event(&self) -> bool { + use std::old_io::timer::sleep; + use std::time::duration::Duration; + + // TODO(gw): This is an awful hack to work around the + // broken way we currently call X11 from multiple threads. + // + // On some (most?) X11 implementations, blocking here + // with XPeekEvent results in the paint task getting stuck + // in XGetGeometry randomly. When this happens the result + // is that until you trigger the XPeekEvent to return + // (by moving the mouse over the window) the paint task + // never completes and you don't see the most recent + // results. + // + // For now, poll events and sleep for ~1 frame if there + // are no events. This means we don't spin the CPU at + // 100% usage, but is far from ideal! + // + // See https://github.com/servo/servo/issues/5780 + // + match self.window.poll_events().next() { + Some(event) => { + self.handle_window_event(event) + } + None => { + sleep(Duration::milliseconds(16)); + false + } + } + } + pub fn wait_events(&self) -> WindowEvent { { let mut event_queue = self.event_queue.borrow_mut(); @@ -276,8 +315,7 @@ impl Window { } } } else { - let event = self.window.wait_events().next().unwrap(); - close_event = self.handle_window_event(event); + close_event = self.handle_next_event(); } if close_event || self.window.is_closed() { |