From 39128dd7e11ffa05eb06933cb6e3ce0e750e8806 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Tue, 16 Jun 2015 13:48:08 +0200 Subject: Remove the is_closed function --- src/api/caca/mod.rs | 4 ---- src/api/cocoa/mod.rs | 8 -------- src/api/emscripten/mod.rs | 5 ----- src/api/wayland/mod.rs | 5 ----- src/api/win32/init.rs | 1 - src/api/win32/mod.rs | 33 ++------------------------------- src/api/x11/window.rs | 8 ++------ 7 files changed, 4 insertions(+), 60 deletions(-) (limited to 'src/api') diff --git a/src/api/caca/mod.rs b/src/api/caca/mod.rs index 06a6931..953ce7d 100644 --- a/src/api/caca/mod.rs +++ b/src/api/caca/mod.rs @@ -129,10 +129,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 ba5710d..de24c2b 100644 --- a/src/api/cocoa/mod.rs +++ b/src/api/cocoa/mod.rs @@ -59,7 +59,6 @@ static mut win_pressed: bool = false; static mut alt_pressed: bool = false; struct DelegateState { - is_closed: bool, context: IdRef, view: IdRef, window: IdRef, @@ -83,8 +82,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 @@ -366,7 +363,6 @@ impl Window { } let ds = DelegateState { - is_closed: false, context: context.clone(), view: view.clone(), window: window.clone(), @@ -588,10 +584,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 48b31a9..9d4bb56 100644 --- a/src/api/emscripten/mod.rs +++ b/src/api/emscripten/mod.rs @@ -108,11 +108,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 b9bfa18..95996ca 100644 --- a/src/api/wayland/mod.rs +++ b/src/api/wayland/mod.rs @@ -184,11 +184,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, 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 af339c5..5b0339a 100644 --- a/src/api/win32/mod.rs +++ b/src/api/win32/mod.rs @@ -47,9 +47,6 @@ pub struct Window { /// Receiver for the events dispatched by the window callback. events_receiver: Receiver, - /// True if a `Closed` event has been received. - is_closed: AtomicBool, - /// The current cursor state. cursor_state: Arc>, } @@ -97,12 +94,6 @@ impl Window { init::new_window(builder, sharing) } - /// 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. @@ -366,17 +357,7 @@ impl<'a> Iterator for PollEventsIterator<'a> { type Item = Event; fn next(&mut self) -> Option { - 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() } } @@ -388,17 +369,7 @@ impl<'a> Iterator for WaitEventsIterator<'a> { type Item = Event; fn next(&mut self) -> Option { - 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 ba0fe52..41b74f5 100644 --- a/src/api/x11/window.rs +++ b/src/api/x11/window.rs @@ -263,9 +263,10 @@ impl<'a> Iterator for WaitEventsIterator<'a> { type Item = Event; fn next(&mut self) -> Option { + 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); } @@ -596,11 +597,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); -- cgit v1.2.3