Merge pull request #488 from tomaka/rem-is-closed

Remove the is_closed function

9 files changed, 4 insertions, 73 deletions

diff --git a/src/api/caca/mod.rs b/src/api/caca/mod.rs
index 4c54434..3b4018e 100644
--- a/src/api/caca/mod.rs
+++ b/src/api/caca/mod.rs
@@ -130,10 +130,6 @@ impl Window {
         })
     }
 
-    pub fn is_closed(&self) -> bool {
-        false
-    }
-
     pub fn set_title(&self, title: &str) {
     }
 
diff --git a/src/api/cocoa/mod.rs b/src/api/cocoa/mod.rs
index 5cb7edb..772b906 100644
--- a/src/api/cocoa/mod.rs
+++ b/src/api/cocoa/mod.rs
@@ -60,7 +60,6 @@ static mut win_pressed: bool = false;
 static mut alt_pressed: bool = false;
 
 struct DelegateState {
-    is_closed: bool,
     context: IdRef,
     view: IdRef,
     window: IdRef,
@@ -84,8 +83,6 @@ impl WindowDelegate {
             unsafe {
                 let state: *mut libc::c_void = *this.get_ivar("glutinState");
                 let state = state as *mut DelegateState;
-                (*state).is_closed = true;
-
                 (*state).pending_events.lock().unwrap().push_back(Closed);
             }
             YES
@@ -382,7 +379,6 @@ impl Window {
         }
 
         let ds = DelegateState {
-            is_closed: false,
             context: context.clone(),
             view: view.clone(),
             window: window.clone(),
@@ -604,10 +600,6 @@ impl Window {
         }
     }
 
-    pub fn is_closed(&self) -> bool {
-        self.delegate.state.is_closed
-    }
-
     pub fn set_title(&self, title: &str) {
         unsafe {
             let title = IdRef::new(NSString::alloc(nil).init_str(title));
diff --git a/src/api/emscripten/mod.rs b/src/api/emscripten/mod.rs
index 04746b1..79dda6b 100644
--- a/src/api/emscripten/mod.rs
+++ b/src/api/emscripten/mod.rs
@@ -109,11 +109,6 @@ impl Window {
         })
     }
 
-    pub fn is_closed(&self) -> bool {
-        use std::ptr;
-        unsafe { ffi::emscripten_is_webgl_context_lost(ptr::null()) != 0 }
-    }
-
     pub fn set_title(&self, _title: &str) {
     }
 
diff --git a/src/api/wayland/mod.rs b/src/api/wayland/mod.rs
index d711110..852172b 100644
--- a/src/api/wayland/mod.rs
+++ b/src/api/wayland/mod.rs
@@ -185,11 +185,6 @@ impl Window {
         })
     }
 
-    pub fn is_closed(&self) -> bool {
-        // TODO
-        false
-    }
-
     pub fn set_title(&self, title: &str) {
         let ctitle = CString::new(title).unwrap();
         self.shell_surface.set_title(&ctitle);
diff --git a/src/api/win32/init.rs b/src/api/win32/init.rs
index f46c395..7cb5433 100644
--- a/src/api/win32/init.rs
+++ b/src/api/win32/init.rs
@@ -257,7 +257,6 @@ unsafe fn init(title: Vec<u16>, builder: BuilderAttribs<'static>,
         window: real_window,
         context: context,
         events_receiver: events_receiver,
-        is_closed: AtomicBool::new(false),
         cursor_state: cursor_state,
     })
 }
diff --git a/src/api/win32/mod.rs b/src/api/win32/mod.rs
index 9efdc93..d21f16d 100644
--- a/src/api/win32/mod.rs
+++ b/src/api/win32/mod.rs
@@ -48,9 +48,6 @@ pub struct Window {
     /// Receiver for the events dispatched by the window callback.
     events_receiver: Receiver<Event>,
 
-    /// True if a `Closed` event has been received.
-    is_closed: AtomicBool,
-
     /// The current cursor state.
     cursor_state: Arc<Mutex<CursorState>>,
 }
@@ -99,12 +96,6 @@ impl Window {
     }
 
     /// See the docs in the crate root file.
-    pub fn is_closed(&self) -> bool {
-        use std::sync::atomic::Ordering::Relaxed;
-        self.is_closed.load(Relaxed)
-    }
-
-    /// See the docs in the crate root file.
     ///
     /// Calls SetWindowText on the HWND.
     pub fn set_title(&self, text: &str) {
@@ -367,17 +358,7 @@ impl<'a> Iterator for PollEventsIterator<'a> {
     type Item = Event;
 
     fn next(&mut self) -> Option<Event> {
-        use events::Event::Closed;
-
-        match self.window.events_receiver.try_recv() {
-            Ok(Closed) => {
-                use std::sync::atomic::Ordering::Relaxed;
-                self.window.is_closed.store(true, Relaxed);
-                Some(Closed)
-            },
-            Ok(ev) => Some(ev),
-            Err(_) => None
-        }
+        self.window.events_receiver.try_recv().ok()
     }
 }
 
@@ -389,17 +370,7 @@ impl<'a> Iterator for WaitEventsIterator<'a> {
     type Item = Event;
 
     fn next(&mut self) -> Option<Event> {
-        use events::Event::Closed;
-
-        match self.window.events_receiver.recv() {
-            Ok(Closed) => {
-                use std::sync::atomic::Ordering::Relaxed;
-                self.window.is_closed.store(true, Relaxed);
-                Some(Closed)
-            },
-            Ok(ev) => Some(ev),
-            Err(_) => None
-        }
+        self.window.events_receiver.recv().ok()
     }
 }
 
diff --git a/src/api/x11/window.rs b/src/api/x11/window.rs
index c0c5917..dc24e38 100644
--- a/src/api/x11/window.rs
+++ b/src/api/x11/window.rs
@@ -264,9 +264,10 @@ impl<'a> Iterator for WaitEventsIterator<'a> {
     type Item = Event;
 
     fn next(&mut self) -> Option<Event> {
+        use std::sync::atomic::Ordering::Relaxed;
         use std::mem;
 
-        while !self.window.is_closed() {
+        while !self.window.is_closed.load(Relaxed) {
             if let Some(ev) = self.window.pending_events.lock().unwrap().pop_front() {
                 return Some(ev);
             }
@@ -597,11 +598,6 @@ impl Window {
         Ok(window)
     }
 
-    pub fn is_closed(&self) -> bool {
-        use std::sync::atomic::Ordering::Relaxed;
-        self.is_closed.load(Relaxed)
-    }
-
     pub fn set_title(&self, title: &str) {
         with_c_str(title, |title| unsafe {
             (self.x.display.xlib.XStoreName)(self.x.display.display, self.x.window, title);
diff --git a/src/platform/linux/api_dispatch.rs b/src/platform/linux/api_dispatch.rs
index d21cac3..b2cd741 100644
--- a/src/platform/linux/api_dispatch.rs
+++ b/src/platform/linux/api_dispatch.rs
@@ -155,13 +155,6 @@ impl Window {
         }
     }
 
-    pub fn is_closed(&self) -> bool {
-        match self {
-            &Window::X(ref w) => w.is_closed(),
-            &Window::Wayland(ref w) => w.is_closed()
-        }
-    }
-
     pub fn set_title(&self, title: &str) {
         match self {
             &Window::X(ref w) => w.set_title(title),
diff --git a/src/window.rs b/src/window.rs
index 9f8ed48..485ba58 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -225,12 +225,6 @@ impl Window {
         builder.build()
     }
 
-    /// Returns true if the window has previously been closed by the user.
-    #[inline]
-    pub fn is_closed(&self) -> bool {
-        self.window.is_closed()
-    }
-
     /// Modifies the title of the window.
     ///
     /// This is a no-op if the window has already been closed.