diff options
| -rw-r--r-- | Cargo.toml | 10 | ||||
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | appveyor.yml | 8 | ||||
| m--------- | deps/apk-builder | 0 | ||||
| -rw-r--r-- | examples/window.rs | 1 | ||||
| -rw-r--r-- | src/osx/event.rs | 2 | ||||
| -rw-r--r-- | src/osx/mod.rs | 14 |
7 files changed, 25 insertions, 11 deletions
@@ -1,8 +1,13 @@ [package] name = "glutin" -version = "0.0.1" +version = "0.0.2" authors = ["tomaka <pierre.krieger1708@gmail.com>"] +description = "Cross-plaform OpenGL context provider." +keywords = ["windowing", "opengl"] +license = "Apache-2.0" +readme = "README.md" +repository = "https://github.com/tomaka/glutin" [features] default = ["window"] @@ -15,6 +20,9 @@ git = "https://github.com/huonw/compile_msg" [dependencies.gl_generator] git = "https://github.com/bjz/gl-rs" +[dependencies.gl_common] +git = "https://github.com/bjz/gl-rs" + [target.arm-linux-androideabi.dependencies.android_glue] git = "https://github.com/tomaka/android-rs-glue" @@ -62,7 +62,6 @@ fn main() { - You must call `glFlush` before `swap_buffers`, or else on Windows 8 nothing will be visible on the window - Pixel formats are not implemented - If you don't have MinGW installed, you will need to provide `libgdi32.a` and `libopengl32.a` ; you can put them in `C:\Users\you\.rust` - - If you don't have `make` in your PATH, you can pass `--no-default-features --features "window"` when compiling ([see also](http://crates.io/manifest.html#the-[features]-section)) ### X11 diff --git a/appveyor.yml b/appveyor.yml index 1b69dfb..b2d832a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,11 +1,11 @@ install: - ps: Start-FileDownload 'https://static.rust-lang.org/dist/rust-nightly-i686-pc-windows-gnu.exe' - ps: Start-FileDownload 'https://static.rust-lang.org/cargo-dist/cargo-nightly-i686-pc-windows-gnu.tar.gz' - - rust-nightly-i686-w64-mingw32.exe /VERYSILENT /NORESTART - - 7z e cargo-nightly-i686-w64-mingw32.tar.gz - - 7z x cargo-nightly-i686-w64-mingw32.tar + - rust-nightly-i686-pc-windows-gnu.exe /VERYSILENT /NORESTART + - 7z e cargo-nightly-i686-pc-windows-gnu.tar.gz + - 7z x cargo-nightly-i686-pc-windows-gnu.tar - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin - - SET PATH=%PATH%;%CD%\cargo-nightly-i686-w64-mingw32\bin + - SET PATH=%PATH%;%CD%\cargo-nightly-i686-pc-windows-gnu\bin - mkdir %HOMEDRIVE%%HOMEPATH%\.rust - cp etc/32bits/* %HOMEDRIVE%%HOMEPATH%\.rust - rustc -v diff --git a/deps/apk-builder b/deps/apk-builder -Subproject a728f2b064e5e54b3a6719104a26e0b7c692a58 +Subproject fe9acb5bd465da1df4561e2bd4ebcc6d305134a diff --git a/examples/window.rs b/examples/window.rs index 769712a..c6051d3 100644 --- a/examples/window.rs +++ b/examples/window.rs @@ -18,6 +18,7 @@ fn main() { println!("This example requires glutin to be compiled with the `wind #[cfg(feature = "window")] fn main() { let window = glutin::Window::new().unwrap(); + window.set_title("A fantastic window!"); unsafe { window.make_current() }; diff --git a/src/osx/event.rs b/src/osx/event.rs index b5853bc..8b985b5 100644 --- a/src/osx/event.rs +++ b/src/osx/event.rs @@ -1,6 +1,4 @@ use events; -use cocoa::base::NSUInteger; -use cocoa::appkit; pub fn vkeycode_to_element(code: u16) -> Option<events::VirtualKeyCode> { Some(match code { diff --git a/src/osx/mod.rs b/src/osx/mod.rs index ea79f04..80a4226 100644 --- a/src/osx/mod.rs +++ b/src/osx/mod.rs @@ -34,6 +34,7 @@ static mut alt_pressed: bool = false; pub struct Window { view: id, + window: id, context: id, is_closed: AtomicBool, } @@ -88,6 +89,7 @@ impl Window { let window = Window { view: view, + window: window, context: context, is_closed: AtomicBool::new(false), }; @@ -111,7 +113,10 @@ impl Window { fn create_window(dimensions: (uint, uint), title: &str, monitor: Option<MonitorID>) -> Option<id> { unsafe { let scr_frame = match monitor { - Some(_) => NSScreen::mainScreen(nil).frame(), + Some(_) => { + let screen = NSScreen::mainScreen(nil); + NSScreen::frame(screen) + } None => { let (width, height) = dimensions; NSRect::new(NSPoint::new(0., 0.), NSSize::new(width as f64, height as f64)) @@ -190,8 +195,11 @@ impl Window { self.is_closed.load(Relaxed) } - pub fn set_title(&self, _title: &str) { - unimplemented!() + pub fn set_title(&self, title: &str) { + unsafe { + let title = NSString::alloc(nil).init_str(title); + self.window.setTitle_(title); + } } pub fn show(&self) { |