Remove the is_closed function

This commit is contained in:
Pierre Krieger 2015-06-16 13:48:08 +02:00
parent eb73c2514e
commit 39128dd7e1
17 changed files with 72 additions and 176 deletions

View file

@ -129,10 +129,6 @@ impl Window {
})
}
pub fn is_closed(&self) -> bool {
false
}
pub fn set_title(&self, title: &str) {
}

View file

@ -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));

View file

@ -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) {
}

View file

@ -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);

View file

@ -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,
})
}

View file

@ -47,9 +47,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>>,
}
@ -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<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()
}
}
@ -388,17 +369,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()
}
}

View file

@ -263,9 +263,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);
}
@ -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);