diff options
| -rw-r--r-- | examples/window.rs | 2 | ||||
| -rw-r--r-- | src/lib.rs | 9 | ||||
| -rw-r--r-- | src/win32/mod.rs | 10 | ||||
| -rw-r--r-- | src/x11/mod.rs | 10 |
4 files changed, 19 insertions, 12 deletions
diff --git a/examples/window.rs b/examples/window.rs index 4d54035..4066fed 100644 --- a/examples/window.rs +++ b/examples/window.rs @@ -20,7 +20,7 @@ fn main() { gl::ClearColor(0.0, 1.0, 0.0, 1.0); - while !window.should_close() { + while !window.is_closed() { println!("{}", window.wait_events()); gl::Clear(gl::COLOR_BUFFER_BIT); @@ -41,8 +41,15 @@ impl Window { /// Returns true if the window has been closed by the user. #[inline] + pub fn is_closed(&self) -> bool { + self.window.is_closed() + } + + /// Returns true if the window has been closed by the user. + #[inline] + #[deprecated = "Use is_closed instead"] pub fn should_close(&self) -> bool { - self.window.should_close() + self.is_closed() } /// Modifies the title of the window. diff --git a/src/win32/mod.rs b/src/win32/mod.rs index bc268fc..cfa0992 100644 --- a/src/win32/mod.rs +++ b/src/win32/mod.rs @@ -13,7 +13,7 @@ pub struct Window { context: ffi::HGLRC, gl_library: ffi::HMODULE, events_receiver: Receiver<Event>, - should_close: AtomicBool, + is_closed: AtomicBool, nosend: NoSend, } @@ -187,14 +187,14 @@ impl Window { context: context, gl_library: gl_library, events_receiver: events_receiver, - should_close: AtomicBool::new(false), + is_closed: AtomicBool::new(false), nosend: NoSend, }) } - pub fn should_close(&self) -> bool { + pub fn is_closed(&self) -> bool { use std::sync::atomics::Relaxed; - self.should_close.load(Relaxed) + self.is_closed.load(Relaxed) } /// Calls SetWindowText on the HWND. @@ -292,7 +292,7 @@ impl Window { if events.iter().find(|e| match e { &&::Closed => true, _ => false }).is_some() { use std::sync::atomics::Relaxed; - self.should_close.store(true, Relaxed); + self.is_closed.store(true, Relaxed); } events diff --git a/src/x11/mod.rs b/src/x11/mod.rs index b099ef5..4c4d400 100644 --- a/src/x11/mod.rs +++ b/src/x11/mod.rs @@ -10,7 +10,7 @@ pub struct Window { display: *mut ffi::Display, window: ffi::Window, context: ffi::GLXContext, - should_close: AtomicBool, + is_closed: AtomicBool, wm_delete_window: ffi::Atom, } @@ -103,14 +103,14 @@ impl Window { display: display, window: window, context: context, - should_close: AtomicBool::new(false), + is_closed: AtomicBool::new(false), wm_delete_window: wm_delete_window, }) } - pub fn should_close(&self) -> bool { + pub fn is_closed(&self) -> bool { use std::sync::atomics::Relaxed; - self.should_close.load(Relaxed) + self.is_closed.load(Relaxed) } pub fn set_title(&self, title: &str) { @@ -167,7 +167,7 @@ impl Window { let client_msg: &ffi::XClientMessageEvent = unsafe { mem::transmute(&xev) }; if client_msg.l[0] == self.wm_delete_window as libc::c_long { - self.should_close.store(true, Relaxed); + self.is_closed.store(true, Relaxed); events.push(Closed); } }, |