diff options
| -rw-r--r-- | fixosxcontextversion.patch | 218 | ||||
| -rw-r--r-- | src/osx/mod.rs | 11 | ||||
| -rw-r--r-- | src/osx/mod.rs.BACKUP.6164.rs | 524 | ||||
| -rw-r--r-- | src/osx/mod.rs.BASE.6164.rs | 485 | ||||
| -rw-r--r-- | src/osx/mod.rs.LOCAL.6164.rs | 498 | ||||
| -rw-r--r-- | src/osx/mod.rs.REMOTE.6164.rs | 492 |
6 files changed, 5 insertions, 2223 deletions
diff --git a/fixosxcontextversion.patch b/fixosxcontextversion.patch deleted file mode 100644 index 14a2301..0000000 --- a/fixosxcontextversion.patch +++ /dev/null @@ -1,218 +0,0 @@ -From 86af6b6387918ea93fe5ce4cae2764a1d196061e Mon Sep 17 00:00:00 2001 -From: Patrick Horlebein <patrick@ilovepatrick.de> -Date: Mon, 29 Dec 2014 13:26:44 +0100 -Subject: [PATCH 1/5] Started adding support for selection OpenGL versions on - OS X. Needs issue #176 to be fixed. - ---- - src/osx/mod.rs | 27 +++++++++++++++++++++++---- - 1 file changed, 23 insertions(+), 4 deletions(-) - -diff --git a/src/osx/mod.rs b/src/osx/mod.rs -index 7df6603..59b6577 100644 ---- a/src/osx/mod.rs -+++ b/src/osx/mod.rs -@@ -44,6 +44,15 @@ static mut alt_pressed: bool = false; - static DELEGATE_NAME: &'static [u8] = b"glutin_window_delegate\0"; - static DELEGATE_STATE_IVAR: &'static [u8] = b"glutin_state"; - -+// TODO: Should be added to cocoa bindings -+#[allow(non_camel_case_types)] -+#[deriving(Show)] -+enum NSOpenGLPFAOpenGLProfiles { -+ NSOpenGLProfileVersionLegacy = 0x1000, -+ NSOpenGLProfileVersion3_2Core = 0x3200, -+ NSOpenGLProfileVersion4_1Core = 0x4100 -+} -+ - struct DelegateState<'a> { - is_closed: bool, - context: id, -@@ -68,7 +77,7 @@ impl Window { - unimplemented!() - } - -- Window::new_impl(builder.dimensions, builder.title.as_slice(), builder.monitor, builder.vsync, builder.visible) -+ Window::new_impl(builder.dimensions, builder.title.as_slice(), builder.monitor, builder.vsync, builder.visible, builder.gl_version) - } - } - -@@ -130,7 +139,7 @@ extern fn window_did_resize(this: id, _: id) -> id { - - impl Window { - fn new_impl(dimensions: Option<(uint, uint)>, title: &str, monitor: Option<MonitorID>, -- vsync: bool, visible: bool) -> Result<Window, CreationError> { -+ vsync: bool, visible: bool, gl_version: Option<(uint, uint)>) -> Result<Window, CreationError> { - let app = match Window::create_app() { - Some(app) => app, - None => { return Err(OsError(format!("Couldn't create NSApplication"))); }, -@@ -144,7 +153,7 @@ impl Window { - None => { return Err(OsError(format!("Couldn't create NSView"))); }, - }; - -- let context = match Window::create_context(view, vsync) { -+ let context = match Window::create_context(view, vsync, gl_version) { - Some(context) => context, - None => { return Err(OsError(format!("Couldn't create OpenGL context"))); }, - }; -@@ -260,7 +269,16 @@ impl Window { - } - } - -- fn create_context(view: id, vsync: bool) -> Option<id> { -+ fn create_context(view: id, vsync: bool, gl_version: Option<(uint, uint)>) -> Option<id> { -+ let profile = { -+ match gl_version { -+ None => NSOpenGLPFAOpenGLProfiles::NSOpenGLProfileVersionLegacy as uint, -+ Some((0...2, _)) => NSOpenGLPFAOpenGLProfiles::NSOpenGLProfileVersionLegacy as uint, -+ Some((3, 0)) => NSOpenGLPFAOpenGLProfiles::NSOpenGLProfileVersionLegacy as uint, -+ Some((3, 1...2)) => NSOpenGLPFAOpenGLProfiles::NSOpenGLProfileVersion3_2Core as uint, -+ Some((_, _)) => NSOpenGLPFAOpenGLProfiles::NSOpenGLProfileVersion4_1Core as uint, -+ } -+ }; - unsafe { - let attributes = [ - NSOpenGLPFADoubleBuffer as uint, -@@ -269,6 +287,7 @@ impl Window { - NSOpenGLPFAAlphaSize as uint, 8, - NSOpenGLPFADepthSize as uint, 24, - NSOpenGLPFAStencilSize as uint, 8, -+ NSOpenGLPFAOpenGLProfile as uint, profile, - 0 - ]; - --- -1.9.3 (Apple Git-50) - - -From 1b0064f9f780ab8a53e7b5a7a33f2fd8c53aab08 Mon Sep 17 00:00:00 2001 -From: Patrick Horlebein <patrick@ilovepatrick.de> -Date: Mon, 29 Dec 2014 13:27:24 +0100 -Subject: [PATCH 2/5] Fixed deprecation warnings - ---- - src/osx/mod.rs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/osx/mod.rs b/src/osx/mod.rs -index 59b6577..e2b9bc2 100644 ---- a/src/osx/mod.rs -+++ b/src/osx/mod.rs -@@ -475,8 +475,8 @@ impl Window { - } - - pub fn get_proc_address(&self, _addr: &str) -> *const () { -- let symbol_name: CFString = from_str(_addr).unwrap(); -- let framework_name: CFString = from_str("com.apple.opengl").unwrap(); -+ let symbol_name = _addr.parse::<CFString>().unwrap(); -+ let framework_name = "com.apple.opengl".parse::<CFString>().unwrap(); - let framework = unsafe { - CFBundleGetBundleWithIdentifier(framework_name.as_concrete_TypeRef()) - }; --- -1.9.3 (Apple Git-50) - - -From 09cf026a9de2e1aef43307d64d41a0251159c113 Mon Sep 17 00:00:00 2001 -From: Patrick Horlebein <patrick@ilovepatrick.de> -Date: Mon, 29 Dec 2014 13:46:44 +0100 -Subject: [PATCH 3/5] Minor match clause cleanup - ---- - src/osx/mod.rs | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/osx/mod.rs b/src/osx/mod.rs -index e2b9bc2..ce02779 100644 ---- a/src/osx/mod.rs -+++ b/src/osx/mod.rs -@@ -272,9 +272,7 @@ impl Window { - fn create_context(view: id, vsync: bool, gl_version: Option<(uint, uint)>) -> Option<id> { - let profile = { - match gl_version { -- None => NSOpenGLPFAOpenGLProfiles::NSOpenGLProfileVersionLegacy as uint, -- Some((0...2, _)) => NSOpenGLPFAOpenGLProfiles::NSOpenGLProfileVersionLegacy as uint, -- Some((3, 0)) => NSOpenGLPFAOpenGLProfiles::NSOpenGLProfileVersionLegacy as uint, -+ None | Some((0...2, _)) | Some((3, 0)) => NSOpenGLPFAOpenGLProfiles::NSOpenGLProfileVersionLegacy as uint, - Some((3, 1...2)) => NSOpenGLPFAOpenGLProfiles::NSOpenGLProfileVersion3_2Core as uint, - Some((_, _)) => NSOpenGLPFAOpenGLProfiles::NSOpenGLProfileVersion4_1Core as uint, - } --- -1.9.3 (Apple Git-50) - - -From b0dddb2d3f10c90128ab250838b314acca131061 Mon Sep 17 00:00:00 2001 -From: Patrick Horlebein <patrick@ilovepatrick.de> -Date: Tue, 30 Dec 2014 17:01:37 +0100 -Subject: [PATCH 4/5] Fixed missing std::ascii::AsciiExt import - ---- - src/osx/mod.rs | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/osx/mod.rs b/src/osx/mod.rs -index ce02779..739aa77 100644 ---- a/src/osx/mod.rs -+++ b/src/osx/mod.rs -@@ -4,6 +4,7 @@ pub use self::headless::HeadlessContext; - use {CreationError, Event}; - use CreationError::OsError; - use libc; -+use std::ascii::AsciiExt; - - #[cfg(feature = "window")] - use WindowBuilder; --- -1.9.3 (Apple Git-50) - - -From 0e64651db8f19378d7c183b21c0e7d692380e570 Mon Sep 17 00:00:00 2001 -From: Patrick Horlebein <patrick@ilovepatrick.de> -Date: Tue, 30 Dec 2014 17:02:49 +0100 -Subject: [PATCH 5/5] Removed NSOpenGLPFAOpenGLProfiles enum in favor of the - one defined in the AppKit bindings - ---- - src/osx/mod.rs | 19 ++++--------------- - 1 file changed, 4 insertions(+), 15 deletions(-) - -diff --git a/src/osx/mod.rs b/src/osx/mod.rs -index 739aa77..83c51a3 100644 ---- a/src/osx/mod.rs -+++ b/src/osx/mod.rs -@@ -45,15 +45,6 @@ static mut alt_pressed: bool = false; - static DELEGATE_NAME: &'static [u8] = b"glutin_window_delegate\0"; - static DELEGATE_STATE_IVAR: &'static [u8] = b"glutin_state"; - --// TODO: Should be added to cocoa bindings --#[allow(non_camel_case_types)] --#[deriving(Show)] --enum NSOpenGLPFAOpenGLProfiles { -- NSOpenGLProfileVersionLegacy = 0x1000, -- NSOpenGLProfileVersion3_2Core = 0x3200, -- NSOpenGLProfileVersion4_1Core = 0x4100 --} -- - struct DelegateState<'a> { - is_closed: bool, - context: id, -@@ -271,12 +262,10 @@ impl Window { - } - - fn create_context(view: id, vsync: bool, gl_version: Option<(uint, uint)>) -> Option<id> { -- let profile = { -- match gl_version { -- None | Some((0...2, _)) | Some((3, 0)) => NSOpenGLPFAOpenGLProfiles::NSOpenGLProfileVersionLegacy as uint, -- Some((3, 1...2)) => NSOpenGLPFAOpenGLProfiles::NSOpenGLProfileVersion3_2Core as uint, -- Some((_, _)) => NSOpenGLPFAOpenGLProfiles::NSOpenGLProfileVersion4_1Core as uint, -- } -+ let profile = match gl_version { -+ None | Some((0...2, _)) | Some((3, 0)) => NSOpenGLProfileVersionLegacy as uint, -+ Some((3, 1...2)) => NSOpenGLProfileVersion3_2Core as uint, -+ Some((_, _)) => NSOpenGLProfileVersion4_1Core as uint, - }; - unsafe { - let attributes = [ --- -1.9.3 (Apple Git-50) - diff --git a/src/osx/mod.rs b/src/osx/mod.rs index 4b111bf..86a891c 100644 --- a/src/osx/mod.rs +++ b/src/osx/mod.rs @@ -4,7 +4,6 @@ pub use self::headless::HeadlessContext; use {CreationError, Event, MouseCursor}; use CreationError::OsError; use libc; -use std::ascii::AsciiExt; use BuilderAttribs; @@ -139,7 +138,7 @@ extern fn window_did_resize(this: id, _: id) -> id { impl Window { fn new_impl(dimensions: Option<(u32, u32)>, title: &str, monitor: Option<MonitorID>, - vsync: bool, visible: bool, gl_version: Option<(uint, uint)>) -> Result<Window, CreationError> { + vsync: bool, visible: bool, gl_version: Option<(u32, u32)>) -> Result<Window, CreationError> { let app = match Window::create_app() { Some(app) => app, None => { return Err(OsError(format!("Couldn't create NSApplication"))); }, @@ -269,11 +268,11 @@ impl Window { } } - fn create_context(view: id, vsync: bool, gl_version: Option<(uint, uint)>) -> Option<id> { + fn create_context(view: id, vsync: bool, gl_version: Option<(u32, u32)>) -> Option<id> { let profile = match gl_version { - None | Some((0...2, _)) | Some((3, 0)) => NSOpenGLProfileVersionLegacy as uint, - Some((3, 1...2)) => NSOpenGLProfileVersion3_2Core as uint, - Some((_, _)) => NSOpenGLProfileVersion4_1Core as uint, + None | Some((0...2, _)) | Some((3, 0)) => NSOpenGLProfileVersionLegacy as u32, + Some((3, 1...2)) => NSOpenGLProfileVersion3_2Core as u32, + Some((_, _)) => NSOpenGLProfileVersion4_1Core as u32, }; unsafe { let attributes = [ diff --git a/src/osx/mod.rs.BACKUP.6164.rs b/src/osx/mod.rs.BACKUP.6164.rs deleted file mode 100644 index 7521b5d..0000000 --- a/src/osx/mod.rs.BACKUP.6164.rs +++ /dev/null @@ -1,524 +0,0 @@ -#[cfg(feature = "headless")] -pub use self::headless::HeadlessContext; - -use {CreationError, Event, MouseCursor}; -use CreationError::OsError; -use libc; -use std::ascii::AsciiExt; - -use BuilderAttribs; - -use cocoa::base::{id, NSUInteger, nil, objc_allocateClassPair, class, objc_registerClassPair}; -use cocoa::base::{selector, msg_send, class_addMethod, class_addIvar}; -use cocoa::base::{object_setInstanceVariable, object_getInstanceVariable}; -use cocoa::appkit; -use cocoa::appkit::*; - -use core_foundation::base::TCFType; -use core_foundation::string::CFString; -use core_foundation::bundle::{CFBundleGetBundleWithIdentifier, CFBundleGetFunctionPointerForName}; - -use std::cell::Cell; -use std::ffi::{CString, c_str_to_bytes}; -use std::mem; -use std::ptr; -use std::collections::RingBuf; -use std::str::FromStr; -use std::str::from_utf8; -use std::ascii::AsciiExt; - -use events::Event::{MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel}; -use events::ElementState::{Pressed, Released}; -use events::MouseButton::{LeftMouseButton, RightMouseButton}; -use events; - -pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor}; - -mod monitor; -mod event; - -#[cfg(feature = "headless")] -mod headless; - -static mut shift_pressed: bool = false; -static mut ctrl_pressed: bool = false; -static mut win_pressed: bool = false; -static mut alt_pressed: bool = false; - -static DELEGATE_NAME: &'static [u8] = b"glutin_window_delegate\0"; -static DELEGATE_STATE_IVAR: &'static [u8] = b"glutin_state"; - -struct DelegateState<'a> { - is_closed: bool, - context: id, - view: id, - handler: Option<fn(u32, u32)>, -} - -pub struct Window { - view: id, - window: id, - context: id, - delegate: id, - resize: Option<fn(u32, u32)>, - - is_closed: Cell<bool>, -} - -#[cfg(feature = "window")] -impl Window { - pub fn new(builder: BuilderAttribs) -> Result<Window, CreationError> { - if builder.sharing.is_some() { - unimplemented!() - } - - Window::new_impl(builder.dimensions, builder.title.as_slice(), builder.monitor, builder.vsync, builder.visible, builder.gl_version) - } -} - -#[cfg(feature = "window")] -unsafe impl Send for Window {} -#[cfg(feature = "window")] -unsafe impl Sync for Window {} - -#[cfg(feature = "window")] -#[derive(Clone)] -pub struct WindowProxy; - -impl WindowProxy { - pub fn wakeup_event_loop(&self) { - unsafe { - let pool = NSAutoreleasePool::new(nil); - let event = - NSEvent::otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2( - nil, - NSApplicationDefined, - NSPoint::new(0.0, 0.0), - 0, - 0.0, - 0, - ptr::null_mut(), - 0, - 0, - 0); - NSApp().postEvent_atStart_(event, true); - pool.drain(); - } - } -} - -extern fn window_should_close(this: id, _: id) -> id { - unsafe { - let mut stored_value = ptr::null_mut(); - object_getInstanceVariable(this, DELEGATE_STATE_IVAR.as_ptr() as *const i8, &mut stored_value); - let state = stored_value as *mut DelegateState; - - (*state).is_closed = true; - } - 0 -} - -extern fn window_did_resize(this: id, _: id) -> id { - unsafe { - let mut stored_value = ptr::null_mut(); - object_getInstanceVariable(this, DELEGATE_STATE_IVAR.as_ptr() as *const i8, &mut stored_value); - let state = &mut *(stored_value as *mut DelegateState); - - let _: id = msg_send()(state.context, selector("update")); - - match state.handler { - Some(handler) => { - let rect = NSView::frame(state.view); - (handler)(rect.size.width as u32, rect.size.height as u32); - } - None => {} - } - } - 0 -} - -impl Window { -<<<<<<< HEAD - fn new_impl(dimensions: Option<(u32, u32)>, title: &str, monitor: Option<MonitorID>, - vsync: bool, visible: bool) -> Result<Window, CreationError> { -======= - fn new_impl(dimensions: Option<(uint, uint)>, title: &str, monitor: Option<MonitorID>, - vsync: bool, visible: bool, gl_version: Option<(uint, uint)>) -> Result<Window, CreationError> { ->>>>>>> pixelpirate/master - let app = match Window::create_app() { - Some(app) => app, - None => { return Err(OsError(format!("Couldn't create NSApplication"))); }, - }; - let window = match Window::create_window(dimensions.unwrap_or((800, 600)), title, monitor) { - Some(window) => window, - None => { return Err(OsError(format!("Couldn't create NSWindow"))); }, - }; - let view = match Window::create_view(window) { - Some(view) => view, - None => { return Err(OsError(format!("Couldn't create NSView"))); }, - }; - - let context = match Window::create_context(view, vsync, gl_version) { - Some(context) => context, - None => { return Err(OsError(format!("Couldn't create OpenGL context"))); }, - }; - - unsafe { - app.activateIgnoringOtherApps_(true); - if visible { - window.makeKeyAndOrderFront_(nil); - } else { - window.makeKeyWindow(); - } - } - - // Set up the window delegate to receive events - let ptr_size = mem::size_of::<libc::intptr_t>() as u64; - let ns_object = class("NSObject"); - - let delegate = unsafe { - // Create a delegate class, add callback methods and store InternalState as user data. - let delegate = objc_allocateClassPair(ns_object, DELEGATE_NAME.as_ptr() as *const i8, 0); - class_addMethod(delegate, selector("windowShouldClose:"), window_should_close, CString::from_slice("B@:@".as_bytes()).as_ptr()); - class_addMethod(delegate, selector("windowDidResize:"), window_did_resize, CString::from_slice("V@:@".as_bytes()).as_ptr()); - class_addIvar(delegate, DELEGATE_STATE_IVAR.as_ptr() as *const i8, ptr_size, 3, CString::from_slice("?".as_bytes()).as_ptr()); - objc_registerClassPair(delegate); - - let del_obj = msg_send()(delegate, selector("alloc")); - let del_obj: id = msg_send()(del_obj, selector("init")); - let _: id = msg_send()(window, selector("setDelegate:"), del_obj); - del_obj - }; - - let window = Window { - view: view, - window: window, - context: context, - delegate: delegate, - resize: None, - - is_closed: Cell::new(false), - }; - - Ok(window) - } - - fn create_app() -> Option<id> { - unsafe { - let app = NSApp(); - if app == nil { - None - } else { - app.setActivationPolicy_(NSApplicationActivationPolicyRegular); - app.finishLaunching(); - Some(app) - } - } - } - - fn create_window(dimensions: (u32, u32), title: &str, monitor: Option<MonitorID>) -> Option<id> { - unsafe { - let scr_frame = match monitor { - 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)) - } - }; - - let masks = match monitor { - Some(_) => NSBorderlessWindowMask as NSUInteger, - None => NSTitledWindowMask as NSUInteger | - NSClosableWindowMask as NSUInteger | - NSMiniaturizableWindowMask as NSUInteger | - NSResizableWindowMask as NSUInteger, - }; - - let window = NSWindow::alloc(nil).initWithContentRect_styleMask_backing_defer_( - scr_frame, - masks, - NSBackingStoreBuffered, - false, - ); - - if window == nil { - None - } else { - let title = NSString::alloc(nil).init_str(title); - window.setTitle_(title); - window.setAcceptsMouseMovedEvents_(true); - if monitor.is_some() { - window.setLevel_(NSMainMenuWindowLevel as i64 + 1); - } - else { - window.center(); - } - Some(window) - } - } - } - - fn create_view(window: id) -> Option<id> { - unsafe { - let view = NSView::alloc(nil).init(); - if view == nil { - None - } else { - view.setWantsBestResolutionOpenGLSurface_(true); - window.setContentView_(view); - Some(view) - } - } - } - - fn create_context(view: id, vsync: bool, gl_version: Option<(uint, uint)>) -> Option<id> { - let profile = match gl_version { - None | Some((0...2, _)) | Some((3, 0)) => NSOpenGLProfileVersionLegacy as uint, - Some((3, 1...2)) => NSOpenGLProfileVersion3_2Core as uint, - Some((_, _)) => NSOpenGLProfileVersion4_1Core as uint, - }; - unsafe { - let attributes = [ -<<<<<<< HEAD - NSOpenGLPFADoubleBuffer as u32, - NSOpenGLPFAClosestPolicy as u32, - NSOpenGLPFAColorSize as u32, 24, - NSOpenGLPFAAlphaSize as u32, 8, - NSOpenGLPFADepthSize as u32, 24, - NSOpenGLPFAStencilSize as u32, 8, -======= - NSOpenGLPFADoubleBuffer as uint, - NSOpenGLPFAClosestPolicy as uint, - NSOpenGLPFAColorSize as uint, 24, - NSOpenGLPFAAlphaSize as uint, 8, - NSOpenGLPFADepthSize as uint, 24, - NSOpenGLPFAStencilSize as uint, 8, - NSOpenGLPFAOpenGLProfile as uint, profile, ->>>>>>> pixelpirate/master - 0 - ]; - - let pixelformat = NSOpenGLPixelFormat::alloc(nil).initWithAttributes_(&attributes); - if pixelformat == nil { - return None; - } - - let context = NSOpenGLContext::alloc(nil).initWithFormat_shareContext_(pixelformat, nil); - if context == nil { - None - } else { - context.setView_(view); - if vsync { - let value = 1; - context.setValues_forParameter_(&value, NSOpenGLContextParameter::NSOpenGLCPSwapInterval); - } - Some(context) - } - } - } - - pub fn is_closed(&self) -> bool { - self.is_closed.get() - } - - pub fn set_title(&self, title: &str) { - unsafe { - let title = NSString::alloc(nil).init_str(title); - self.window.setTitle_(title); - } - } - - pub fn show(&self) { - } - - pub fn hide(&self) { - } - - pub fn get_position(&self) -> Option<(i32, i32)> { - unimplemented!() - } - - pub fn set_position(&self, _x: i32, _y: i32) { - unimplemented!() - } - - pub fn get_inner_size(&self) -> Option<(u32, u32)> { - let rect = unsafe { NSView::frame(self.view) }; - Some((rect.size.width as u32, rect.size.height as u32)) - } - - pub fn get_outer_size(&self) -> Option<(u32, u32)> { - unimplemented!() - } - - pub fn set_inner_size(&self, _x: u32, _y: u32) { - unimplemented!() - } - - pub fn create_window_proxy(&self) -> WindowProxy { - WindowProxy - } - - pub fn poll_events(&self) -> RingBuf<Event> { - let mut events = RingBuf::new(); - - loop { - unsafe { - let event = NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_( - NSAnyEventMask as u64, - NSDate::distantPast(nil), - NSDefaultRunLoopMode, - true); - if event == nil { break; } - { - // Create a temporary structure with state that delegates called internally - // by sendEvent can read and modify. When that returns, update window state. - // This allows the synchronous resize loop to continue issuing callbacks - // to the user application, by passing handler through to the delegate state. - let mut ds = DelegateState { - is_closed: self.is_closed.get(), - context: self.context, - view: self.view, - handler: self.resize, - }; - object_setInstanceVariable(self.delegate, - DELEGATE_STATE_IVAR.as_ptr() as *const i8, - &mut ds as *mut DelegateState as *mut libc::c_void); - NSApp().sendEvent_(event); - object_setInstanceVariable(self.delegate, - DELEGATE_STATE_IVAR.as_ptr() as *const i8, - ptr::null_mut()); - self.is_closed.set(ds.is_closed); -} - - match event.get_type() { - NSLeftMouseDown => { events.push_back(MouseInput(Pressed, LeftMouseButton)); }, - NSLeftMouseUp => { events.push_back(MouseInput(Released, LeftMouseButton)); }, - NSRightMouseDown => { events.push_back(MouseInput(Pressed, RightMouseButton)); }, - NSRightMouseUp => { events.push_back(MouseInput(Released, RightMouseButton)); }, - NSMouseMoved => { - let window_point = event.locationInWindow(); - let view_point = self.view.convertPoint_fromView_(window_point, nil); - events.push_back(MouseMoved((view_point.x as i32, view_point.y as i32))); - }, - NSKeyDown => { - let received_c_str = event.characters().UTF8String(); - let received_str = CString::from_slice(c_str_to_bytes(&received_c_str)); - for received_char in from_utf8(received_str.as_bytes()).unwrap().chars() { - if received_char.is_ascii() { - events.push_back(ReceivedCharacter(received_char)); - } - } - - let vkey = event::vkeycode_to_element(event.keycode()); - events.push_back(KeyboardInput(Pressed, event.keycode() as u8, vkey)); - }, - NSKeyUp => { - let vkey = event::vkeycode_to_element(event.keycode()); - events.push_back(KeyboardInput(Released, event.keycode() as u8, vkey)); - }, - NSFlagsChanged => { - let shift_modifier = Window::modifier_event(event, appkit::NSShiftKeyMask as u64, events::VirtualKeyCode::LShift, shift_pressed); - if shift_modifier.is_some() { - shift_pressed = !shift_pressed; - events.push_back(shift_modifier.unwrap()); - } - let ctrl_modifier = Window::modifier_event(event, appkit::NSControlKeyMask as u64, events::VirtualKeyCode::LControl, ctrl_pressed); - if ctrl_modifier.is_some() { - ctrl_pressed = !ctrl_pressed; - events.push_back(ctrl_modifier.unwrap()); - } - let win_modifier = Window::modifier_event(event, appkit::NSCommandKeyMask as u64, events::VirtualKeyCode::LWin, win_pressed); - if win_modifier.is_some() { - win_pressed = !win_pressed; - events.push_back(win_modifier.unwrap()); - } - let alt_modifier = Window::modifier_event(event, appkit::NSAlternateKeyMask as u64, events::VirtualKeyCode::LAlt, alt_pressed); - if alt_modifier.is_some() { - alt_pressed = !alt_pressed; - events.push_back(alt_modifier.unwrap()); - } - }, - NSScrollWheel => { events.push_back(MouseWheel(-event.scrollingDeltaY() as i32)); }, - NSOtherMouseDown => { }, - NSOtherMouseUp => { }, - NSOtherMouseDragged => { }, - _ => { }, - } - } - } - events - } - - unsafe fn modifier_event(event: id, keymask: u64, key: events::VirtualKeyCode, key_pressed: bool) -> Option<Event> { - if !key_pressed && Window::modifier_key_pressed(event, keymask) { - return Some(KeyboardInput(Pressed, event.keycode() as u8, Some(key))); - } - else if key_pressed && !Window::modifier_key_pressed(event, keymask) { - return Some(KeyboardInput(Released, event.keycode() as u8, Some(key))); - } - - return None; - } - - unsafe fn modifier_key_pressed(event: id, modifier: u64) -> bool { - event.modifierFlags() & modifier != 0 - } - - pub fn wait_events(&self) -> RingBuf<Event> { - unsafe { - let event = NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_( - NSAnyEventMask as u64, - NSDate::distantFuture(nil), - NSDefaultRunLoopMode, - false); - NSApp().sendEvent_(event); - - self.poll_events() - } - } - - pub unsafe fn make_current(&self) { - self.context.makeCurrentContext(); - } - - pub fn get_proc_address(&self, _addr: &str) -> *const () { -<<<<<<< HEAD - let symbol_name: CFString = FromStr::from_str(_addr).unwrap(); - let framework_name: CFString = FromStr::from_str("com.apple.opengl").unwrap(); -======= - let symbol_name = _addr.parse::<CFString>().unwrap(); - let framework_name = "com.apple.opengl".parse::<CFString>().unwrap(); ->>>>>>> pixelpirate/master - let framework = unsafe { - CFBundleGetBundleWithIdentifier(framework_name.as_concrete_TypeRef()) - }; - let symbol = unsafe { - CFBundleGetFunctionPointerForName(framework, symbol_name.as_concrete_TypeRef()) - }; - symbol as *const () - } - - pub fn swap_buffers(&self) { - unsafe { self.context.flushBuffer(); } - } - - pub fn platform_display(&self) -> *mut libc::c_void { - unimplemented!() - } - - pub fn get_api(&self) -> ::Api { - ::Api::OpenGl - } - - pub fn set_window_resize_callback(&mut self, callback: Option<fn(u32, u32)>) { - self.resize = callback; - } - - pub fn set_cursor(&self, cursor: MouseCursor) { - unimplemented!() - } -} diff --git a/src/osx/mod.rs.BASE.6164.rs b/src/osx/mod.rs.BASE.6164.rs deleted file mode 100644 index 7df6603..0000000 --- a/src/osx/mod.rs.BASE.6164.rs +++ /dev/null @@ -1,485 +0,0 @@ -#[cfg(feature = "headless")] -pub use self::headless::HeadlessContext; - -use {CreationError, Event}; -use CreationError::OsError; -use libc; - -#[cfg(feature = "window")] -use WindowBuilder; - -use cocoa::base::{id, NSUInteger, nil, objc_allocateClassPair, class, objc_registerClassPair}; -use cocoa::base::{selector, msg_send, class_addMethod, class_addIvar}; -use cocoa::base::{object_setInstanceVariable, object_getInstanceVariable}; -use cocoa::appkit; -use cocoa::appkit::*; - -use core_foundation::base::TCFType; -use core_foundation::string::CFString; -use core_foundation::bundle::{CFBundleGetBundleWithIdentifier, CFBundleGetFunctionPointerForName}; - -use std::cell::Cell; -use std::c_str::CString; -use std::mem; -use std::ptr; - -use events::Event::{MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel}; -use events::ElementState::{Pressed, Released}; -use events::MouseButton::{LeftMouseButton, RightMouseButton}; -use events; - -pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor}; - -mod monitor; -mod event; - -#[cfg(feature = "headless")] -mod headless; - -static mut shift_pressed: bool = false; -static mut ctrl_pressed: bool = false; -static mut win_pressed: bool = false; -static mut alt_pressed: bool = false; - -static DELEGATE_NAME: &'static [u8] = b"glutin_window_delegate\0"; -static DELEGATE_STATE_IVAR: &'static [u8] = b"glutin_state"; - -struct DelegateState<'a> { - is_closed: bool, - context: id, - view: id, - handler: Option<fn(uint, uint)>, -} - -pub struct Window { - view: id, - window: id, - context: id, - delegate: id, - resize: Option<fn(uint, uint)>, - - is_closed: Cell<bool>, -} - -#[cfg(feature = "window")] -impl Window { - pub fn new(builder: WindowBuilder) -> Result<Window, CreationError> { - if builder.sharing.is_some() { - unimplemented!() - } - - Window::new_impl(builder.dimensions, builder.title.as_slice(), builder.monitor, builder.vsync, builder.visible) - } -} - -#[cfg(feature = "window")] -#[deriving(Clone)] -pub struct WindowProxy; - -impl WindowProxy { - pub fn wakeup_event_loop(&self) { - unsafe { - let pool = NSAutoreleasePool::new(nil); - let event = - NSEvent::otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2( - nil, - NSApplicationDefined, - NSPoint::new(0.0, 0.0), - 0, - 0.0, - 0, - ptr::null_mut(), - 0, - 0, - 0); - NSApp().postEvent_atStart_(event, true); - pool.drain(); - } - } -} - -extern fn window_should_close(this: id, _: id) -> id { - unsafe { - let mut stored_value = ptr::null_mut(); - object_getInstanceVariable(this, DELEGATE_STATE_IVAR.as_ptr() as *const i8, &mut stored_value); - let state = stored_value as *mut DelegateState; - - (*state).is_closed = true; - } - 0 -} - -extern fn window_did_resize(this: id, _: id) -> id { - unsafe { - let mut stored_value = ptr::null_mut(); - object_getInstanceVariable(this, DELEGATE_STATE_IVAR.as_ptr() as *const i8, &mut stored_value); - let state = &mut *(stored_value as *mut DelegateState); - - let _: id = msg_send()(state.context, selector("update")); - - match state.handler { - Some(handler) => { - let rect = NSView::frame(state.view); - (handler)(rect.size.width as uint, rect.size.height as uint); - } - None => {} - } - } - 0 -} - -impl Window { - fn new_impl(dimensions: Option<(uint, uint)>, title: &str, monitor: Option<MonitorID>, - vsync: bool, visible: bool) -> Result<Window, CreationError> { - let app = match Window::create_app() { - Some(app) => app, - None => { return Err(OsError(format!("Couldn't create NSApplication"))); }, - }; - let window = match Window::create_window(dimensions.unwrap_or((800, 600)), title, monitor) { - Some(window) => window, - None => { return Err(OsError(format!("Couldn't create NSWindow"))); }, - }; - let view = match Window::create_view(window) { - Some(view) => view, - None => { return Err(OsError(format!("Couldn't create NSView"))); }, - }; - - let context = match Window::create_context(view, vsync) { - Some(context) => context, - None => { return Err(OsError(format!("Couldn't create OpenGL context"))); }, - }; - - unsafe { - app.activateIgnoringOtherApps_(true); - if visible { - window.makeKeyAndOrderFront_(nil); - } else { - window.makeKeyWindow(); - } - } - - // Set up the window delegate to receive events - let ptr_size = mem::size_of::<libc::intptr_t>() as u64; - let ns_object = class("NSObject"); - - let delegate = unsafe { - // Create a delegate class, add callback methods and store InternalState as user data. - let delegate = objc_allocateClassPair(ns_object, DELEGATE_NAME.as_ptr() as *const i8, 0); - class_addMethod(delegate, selector("windowShouldClose:"), window_should_close, "B@:@".to_c_str().as_ptr()); - class_addMethod(delegate, selector("windowDidResize:"), window_did_resize, "V@:@".to_c_str().as_ptr()); - class_addIvar(delegate, DELEGATE_STATE_IVAR.as_ptr() as *const i8, ptr_size, 3, "?".to_c_str().as_ptr()); - objc_registerClassPair(delegate); - - let del_obj = msg_send()(delegate, selector("alloc")); - let del_obj: id = msg_send()(del_obj, selector("init")); - let _: id = msg_send()(window, selector("setDelegate:"), del_obj); - del_obj - }; - - let window = Window { - view: view, - window: window, - context: context, - delegate: delegate, - resize: None, - - is_closed: Cell::new(false), - }; - - Ok(window) - } - - fn create_app() -> Option<id> { - unsafe { - let app = NSApp(); - if app == nil { - None - } else { - app.setActivationPolicy_(NSApplicationActivationPolicyRegular); - app.finishLaunching(); - Some(app) - } - } - } - - fn create_window(dimensions: (uint, uint), title: &str, monitor: Option<MonitorID>) -> Option<id> { - unsafe { - let scr_frame = match monitor { - 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)) - } - }; - - let masks = match monitor { - Some(_) => NSBorderlessWindowMask as NSUInteger, - None => NSTitledWindowMask as NSUInteger | - NSClosableWindowMask as NSUInteger | - NSMiniaturizableWindowMask as NSUInteger | - NSResizableWindowMask as NSUInteger, - }; - - let window = NSWindow::alloc(nil).initWithContentRect_styleMask_backing_defer_( - scr_frame, - masks, - NSBackingStoreBuffered, - false, - ); - - if window == nil { - None - } else { - let title = NSString::alloc(nil).init_str(title); - window.setTitle_(title); - window.setAcceptsMouseMovedEvents_(true); - if monitor.is_some() { - window.setLevel_(NSMainMenuWindowLevel as i64 + 1); - } - else { - window.center(); - } - Some(window) - } - } - } - - fn create_view(window: id) -> Option<id> { - unsafe { - let view = NSView::alloc(nil).init(); - if view == nil { - None - } else { - view.setWantsBestResolutionOpenGLSurface_(true); - window.setContentView_(view); - Some(view) - } - } - } - - fn create_context(view: id, vsync: bool) -> Option<id> { - unsafe { - let attributes = [ - NSOpenGLPFADoubleBuffer as uint, - NSOpenGLPFAClosestPolicy as uint, - NSOpenGLPFAColorSize as uint, 24, - NSOpenGLPFAAlphaSize as uint, 8, - NSOpenGLPFADepthSize as uint, 24, - NSOpenGLPFAStencilSize as uint, 8, - 0 - ]; - - let pixelformat = NSOpenGLPixelFormat::alloc(nil).initWithAttributes_(&attributes); - if pixelformat == nil { - return None; - } - - let context = NSOpenGLContext::alloc(nil).initWithFormat_shareContext_(pixelformat, nil); - if context == nil { - None - } else { - context.setView_(view); - if vsync { - let value = 1; - context.setValues_forParameter_(&value, NSOpenGLContextParameter::NSOpenGLCPSwapInterval); - } - Some(context) - } - } - } - - pub fn is_closed(&self) -> bool { - self.is_closed.get() - } - - pub fn set_title(&self, title: &str) { - unsafe { - let title = NSString::alloc(nil).init_str(title); - self.window.setTitle_(title); - } - } - - pub fn show(&self) { - } - - pub fn hide(&self) { - } - - pub fn get_position(&self) -> Option<(int, int)> { - unimplemented!() - } - - pub fn set_position(&self, _x: int, _y: int) { - unimplemented!() - } - - pub fn get_inner_size(&self) -> Option<(uint, uint)> { - let rect = unsafe { NSView::frame(self.view) }; - Some((rect.size.width as uint, rect.size.height as uint)) - } - - pub fn get_outer_size(&self) -> Option<(uint, uint)> { - unimplemented!() - } - - pub fn set_inner_size(&self, _x: uint, _y: uint) { - unimplemented!() - } - - pub fn create_window_proxy(&self) -> WindowProxy { - WindowProxy - } - - pub fn poll_events(&self) -> Vec<Event> { - let mut events = Vec::new(); - - loop { - unsafe { - let event = NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_( - NSAnyEventMask as u64, - NSDate::distantPast(nil), - NSDefaultRunLoopMode, - true); - if event == nil { break; } - { - // Create a temporary structure with state that delegates called internally - // by sendEvent can read and modify. When that returns, update window state. - // This allows the synchronous resize loop to continue issuing callbacks - // to the user application, by passing handler through to the delegate state. - let mut ds = DelegateState { - is_closed: self.is_closed.get(), - context: self.context, - view: self.view, - handler: self.resize, - }; - object_setInstanceVariable(self.delegate, - DELEGATE_STATE_IVAR.as_ptr() as *const i8, - &mut ds as *mut DelegateState as *mut libc::c_void); - NSApp().sendEvent_(event); - object_setInstanceVariable(self.delegate, - DELEGATE_STATE_IVAR.as_ptr() as *const i8, - ptr::null_mut()); - self.is_closed.set(ds.is_closed); -} - - match event.get_type() { - NSLeftMouseDown => { events.push(MouseInput(Pressed, LeftMouseButton)); }, - NSLeftMouseUp => { events.push(MouseInput(Released, LeftMouseButton)); }, - NSRightMouseDown => { events.push(MouseInput(Pressed, RightMouseButton)); }, - NSRightMouseUp => { events.push(MouseInput(Released, RightMouseButton)); }, - NSMouseMoved => { - let window_point = event.locationInWindow(); - let view_point = self.view.convertPoint_fromView_(window_point, nil); - events.push(MouseMoved((view_point.x as int, view_point.y as int))); - }, - NSKeyDown => { - let received_str = CString::new(event.characters().UTF8String(), false); - for received_char in received_str.as_str().unwrap().chars() { - if received_char.is_ascii() { - events.push(ReceivedCharacter(received_char)); - } - } - - let vkey = event::vkeycode_to_element(event.keycode()); - events.push(KeyboardInput(Pressed, event.keycode() as u8, vkey)); - }, - NSKeyUp => { - let vkey = event::vkeycode_to_element(event.keycode()); - events.push(KeyboardInput(Released, event.keycode() as u8, vkey)); - }, - NSFlagsChanged => { - let shift_modifier = Window::modifier_event(event, appkit::NSShiftKeyMask as u64, events::VirtualKeyCode::LShift, shift_pressed); - if shift_modifier.is_some() { - shift_pressed = !shift_pressed; - events.push(shift_modifier.unwrap()); - } - let ctrl_modifier = Window::modifier_event(event, appkit::NSControlKeyMask as u64, events::VirtualKeyCode::LControl, ctrl_pressed); - if ctrl_modifier.is_some() { - ctrl_pressed = !ctrl_pressed; - events.push(ctrl_modifier.unwrap()); - } - let win_modifier = Window::modifier_event(event, appkit::NSCommandKeyMask as u64, events::VirtualKeyCode::LWin, win_pressed); - if win_modifier.is_some() { - win_pressed = !win_pressed; - events.push(win_modifier.unwrap()); - } - let alt_modifier = Window::modifier_event(event, appkit::NSAlternateKeyMask as u64, events::VirtualKeyCode::LAlt, alt_pressed); - if alt_modifier.is_some() { - alt_pressed = !alt_pressed; - events.push(alt_modifier.unwrap()); - } - }, - NSScrollWheel => { events.push(MouseWheel(-event.scrollingDeltaY() as i32)); }, - NSOtherMouseDown => { }, - NSOtherMouseUp => { }, - NSOtherMouseDragged => { }, - _ => { }, - } - } - } - events - } - - unsafe fn modifier_event(event: id, keymask: u64, key: events::VirtualKeyCode, key_pressed: bool) -> Option<Event> { - if !key_pressed && Window::modifier_key_pressed(event, keymask) { - return Some(KeyboardInput(Pressed, event.keycode() as u8, Some(key))); - } - else if key_pressed && !Window::modifier_key_pressed(event, keymask) { - return Some(KeyboardInput(Released, event.keycode() as u8, Some(key))); - } - - return None; - } - - unsafe fn modifier_key_pressed(event: id, modifier: u64) -> bool { - event.modifierFlags() & modifier != 0 - } - - pub fn wait_events(&self) -> Vec<Event> { - unsafe { - let event = NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_( - NSAnyEventMask as u64, - NSDate::distantFuture(nil), - NSDefaultRunLoopMode, - false); - NSApp().sendEvent_(event); - - self.poll_events() - } - } - - pub unsafe fn make_current(&self) { - self.context.makeCurrentContext(); - } - - pub fn get_proc_address(&self, _addr: &str) -> *const () { - let symbol_name: CFString = from_str(_addr).unwrap(); - let framework_name: CFString = from_str("com.apple.opengl").unwrap(); - let framework = unsafe { - CFBundleGetBundleWithIdentifier(framework_name.as_concrete_TypeRef()) - }; - let symbol = unsafe { - CFBundleGetFunctionPointerForName(framework, symbol_name.as_concrete_TypeRef()) - }; - symbol as *const () - } - - pub fn swap_buffers(&self) { - unsafe { self.context.flushBuffer(); } - } - - pub fn platform_display(&self) -> *mut libc::c_void { - unimplemented!() - } - - pub fn get_api(&self) -> ::Api { - ::Api::OpenGl - } - - pub fn set_window_resize_callback(&mut self, callback: Option<fn(uint, uint)>) { - self.resize = callback; - } -} diff --git a/src/osx/mod.rs.LOCAL.6164.rs b/src/osx/mod.rs.LOCAL.6164.rs deleted file mode 100644 index 59d979a..0000000 --- a/src/osx/mod.rs.LOCAL.6164.rs +++ /dev/null @@ -1,498 +0,0 @@ -#[cfg(feature = "headless")] -pub use self::headless::HeadlessContext; - -use {CreationError, Event, MouseCursor}; -use CreationError::OsError; -use libc; - -use BuilderAttribs; - -use cocoa::base::{id, NSUInteger, nil, objc_allocateClassPair, class, objc_registerClassPair}; -use cocoa::base::{selector, msg_send, class_addMethod, class_addIvar}; -use cocoa::base::{object_setInstanceVariable, object_getInstanceVariable}; -use cocoa::appkit; -use cocoa::appkit::*; - -use core_foundation::base::TCFType; -use core_foundation::string::CFString; -use core_foundation::bundle::{CFBundleGetBundleWithIdentifier, CFBundleGetFunctionPointerForName}; - -use std::cell::Cell; -use std::ffi::{CString, c_str_to_bytes}; -use std::mem; -use std::ptr; -use std::collections::RingBuf; -use std::str::FromStr; -use std::str::from_utf8; -use std::ascii::AsciiExt; - -use events::Event::{MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel}; -use events::ElementState::{Pressed, Released}; -use events::MouseButton::{LeftMouseButton, RightMouseButton}; -use events; - -pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor}; - -mod monitor; -mod event; - -#[cfg(feature = "headless")] -mod headless; - -static mut shift_pressed: bool = false; -static mut ctrl_pressed: bool = false; -static mut win_pressed: bool = false; -static mut alt_pressed: bool = false; - -static DELEGATE_NAME: &'static [u8] = b"glutin_window_delegate\0"; -static DELEGATE_STATE_IVAR: &'static [u8] = b"glutin_state"; - -struct DelegateState<'a> { - is_closed: bool, - context: id, - view: id, - handler: Option<fn(u32, u32)>, -} - -pub struct Window { - view: id, - window: id, - context: id, - delegate: id, - resize: Option<fn(u32, u32)>, - - is_closed: Cell<bool>, -} - -#[cfg(feature = "window")] -impl Window { - pub fn new(builder: BuilderAttribs) -> Result<Window, CreationError> { - if builder.sharing.is_some() { - unimplemented!() - } - - Window::new_impl(builder.dimensions, builder.title.as_slice(), builder.monitor, builder.vsync, builder.visible) - } -} - -#[cfg(feature = "window")] -unsafe impl Send for Window {} -#[cfg(feature = "window")] -unsafe impl Sync for Window {} - -#[cfg(feature = "window")] -#[derive(Clone)] -pub struct WindowProxy; - -impl WindowProxy { - pub fn wakeup_event_loop(&self) { - unsafe { - let pool = NSAutoreleasePool::new(nil); - let event = - NSEvent::otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2( - nil, - NSApplicationDefined, - NSPoint::new(0.0, 0.0), - 0, - 0.0, - 0, - ptr::null_mut(), - 0, - 0, - 0); - NSApp().postEvent_atStart_(event, true); - pool.drain(); - } - } -} - -extern fn window_should_close(this: id, _: id) -> id { - unsafe { - let mut stored_value = ptr::null_mut(); - object_getInstanceVariable(this, DELEGATE_STATE_IVAR.as_ptr() as *const i8, &mut stored_value); - let state = stored_value as *mut DelegateState; - - (*state).is_closed = true; - } - 0 -} - -extern fn window_did_resize(this: id, _: id) -> id { - unsafe { - let mut stored_value = ptr::null_mut(); - object_getInstanceVariable(this, DELEGATE_STATE_IVAR.as_ptr() as *const i8, &mut stored_value); - let state = &mut *(stored_value as *mut DelegateState); - - let _: id = msg_send()(state.context, selector("update")); - - match state.handler { - Some(handler) => { - let rect = NSView::frame(state.view); - (handler)(rect.size.width as u32, rect.size.height as u32); - } - None => {} - } - } - 0 -} - -impl Window { - fn new_impl(dimensions: Option<(u32, u32)>, title: &str, monitor: Option<MonitorID>, - vsync: bool, visible: bool) -> Result<Window, CreationError> { - let app = match Window::create_app() { - Some(app) => app, - None => { return Err(OsError(format!("Couldn't create NSApplication"))); }, - }; - let window = match Window::create_window(dimensions.unwrap_or((800, 600)), title, monitor) { - Some(window) => window, - None => { return Err(OsError(format!("Couldn't create NSWindow"))); }, - }; - let view = match Window::create_view(window) { - Some(view) => view, - None => { return Err(OsError(format!("Couldn't create NSView"))); }, - }; - - let context = match Window::create_context(view, vsync) { - Some(context) => context, - None => { return Err(OsError(format!("Couldn't create OpenGL context"))); }, - }; - - unsafe { - app.activateIgnoringOtherApps_(true); - if visible { - window.makeKeyAndOrderFront_(nil); - } else { - window.makeKeyWindow(); - } - } - - // Set up the window delegate to receive events - let ptr_size = mem::size_of::<libc::intptr_t>() as u64; - let ns_object = class("NSObject"); - - let delegate = unsafe { - // Create a delegate class, add callback methods and store InternalState as user data. - let delegate = objc_allocateClassPair(ns_object, DELEGATE_NAME.as_ptr() as *const i8, 0); - class_addMethod(delegate, selector("windowShouldClose:"), window_should_close, CString::from_slice("B@:@".as_bytes()).as_ptr()); - class_addMethod(delegate, selector("windowDidResize:"), window_did_resize, CString::from_slice("V@:@".as_bytes()).as_ptr()); - class_addIvar(delegate, DELEGATE_STATE_IVAR.as_ptr() as *const i8, ptr_size, 3, CString::from_slice("?".as_bytes()).as_ptr()); - objc_registerClassPair(delegate); - - let del_obj = msg_send()(delegate, selector("alloc")); - let del_obj: id = msg_send()(del_obj, selector("init")); - let _: id = msg_send()(window, selector("setDelegate:"), del_obj); - del_obj - }; - - let window = Window { - view: view, - window: window, - context: context, - delegate: delegate, - resize: None, - - is_closed: Cell::new(false), - }; - - Ok(window) - } - - fn create_app() -> Option<id> { - unsafe { - let app = NSApp(); - if app == nil { - None - } else { - app.setActivationPolicy_(NSApplicationActivationPolicyRegular); - app.finishLaunching(); - Some(app) - } - } - } - - fn create_window(dimensions: (u32, u32), title: &str, monitor: Option<MonitorID>) -> Option<id> { - unsafe { - let scr_frame = match monitor { - 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)) - } - }; - - let masks = match monitor { - Some(_) => NSBorderlessWindowMask as NSUInteger, - None => NSTitledWindowMask as NSUInteger | - NSClosableWindowMask as NSUInteger | - NSMiniaturizableWindowMask as NSUInteger | - NSResizableWindowMask as NSUInteger, - }; - - let window = NSWindow::alloc(nil).initWithContentRect_styleMask_backing_defer_( - scr_frame, - masks, - NSBackingStoreBuffered, - false, - ); - - if window == nil { - None - } else { - let title = NSString::alloc(nil).init_str(title); - window.setTitle_(title); - window.setAcceptsMouseMovedEvents_(true); - if monitor.is_some() { - window.setLevel_(NSMainMenuWindowLevel as i64 + 1); - } - else { - window.center(); - } - Some(window) - } - } - } - - fn create_view(window: id) -> Option<id> { - unsafe { - let view = NSView::alloc(nil).init(); - if view == nil { - None - } else { - view.setWantsBestResolutionOpenGLSurface_(true); - window.setContentView_(view); - Some(view) - } - } - } - - fn create_context(view: id, vsync: bool) -> Option<id> { - unsafe { - let attributes = [ - NSOpenGLPFADoubleBuffer as u32, - NSOpenGLPFAClosestPolicy as u32, - NSOpenGLPFAColorSize as u32, 24, - NSOpenGLPFAAlphaSize as u32, 8, - NSOpenGLPFADepthSize as u32, 24, - NSOpenGLPFAStencilSize as u32, 8, - 0 - ]; - - let pixelformat = NSOpenGLPixelFormat::alloc(nil).initWithAttributes_(&attributes); - if pixelformat == nil { - return None; - } - - let context = NSOpenGLContext::alloc(nil).initWithFormat_shareContext_(pixelformat, nil); - if context == nil { - None - } else { - context.setView_(view); - if vsync { - let value = 1; - context.setValues_forParameter_(&value, NSOpenGLContextParameter::NSOpenGLCPSwapInterval); - } - Some(context) - } - } - } - - pub fn is_closed(&self) -> bool { - self.is_closed.get() - } - - pub fn set_title(&self, title: &str) { - unsafe { - let title = NSString::alloc(nil).init_str(title); - self.window.setTitle_(title); - } - } - - pub fn show(&self) { - } - - pub fn hide(&self) { - } - - pub fn get_position(&self) -> Option<(i32, i32)> { - unimplemented!() - } - - pub fn set_position(&self, _x: i32, _y: i32) { - unimplemented!() - } - - pub fn get_inner_size(&self) -> Option<(u32, u32)> { - let rect = unsafe { NSView::frame(self.view) }; - Some((rect.size.width as u32, rect.size.height as u32)) - } - - pub fn get_outer_size(&self) -> Option<(u32, u32)> { - unimplemented!() - } - - pub fn set_inner_size(&self, _x: u32, _y: u32) { - unimplemented!() - } - - pub fn create_window_proxy(&self) -> WindowProxy { - WindowProxy - } - - pub fn poll_events(&self) -> RingBuf<Event> { - let mut events = RingBuf::new(); - - loop { - unsafe { - let event = NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_( - NSAnyEventMask as u64, - NSDate::distantPast(nil), - NSDefaultRunLoopMode, - true); - if event == nil { break; } - { - // Create a temporary structure with state that delegates called internally - // by sendEvent can read and modify. When that returns, update window state. - // This allows the synchronous resize loop to continue issuing callbacks - // to the user application, by passing handler through to the delegate state. - let mut ds = DelegateState { - is_closed: self.is_closed.get(), - context: self.context, - view: self.view, - handler: self.resize, - }; - object_setInstanceVariable(self.delegate, - DELEGATE_STATE_IVAR.as_ptr() as *const i8, - &mut ds as *mut DelegateState as *mut libc::c_void); - NSApp().sendEvent_(event); - object_setInstanceVariable(self.delegate, - DELEGATE_STATE_IVAR.as_ptr() as *const i8, - ptr::null_mut()); - self.is_closed.set(ds.is_closed); -} - - match event.get_type() { - NSLeftMouseDown => { events.push_back(MouseInput(Pressed, LeftMouseButton)); }, - NSLeftMouseUp => { events.push_back(MouseInput(Released, LeftMouseButton)); }, - NSRightMouseDown => { events.push_back(MouseInput(Pressed, RightMouseButton)); }, - NSRightMouseUp => { events.push_back(MouseInput(Released, RightMouseButton)); }, - NSMouseMoved => { - let window_point = event.locationInWindow(); - let view_point = self.view.convertPoint_fromView_(window_point, nil); - events.push_back(MouseMoved((view_point.x as i32, view_point.y as i32))); - }, - NSKeyDown => { - let received_c_str = event.characters().UTF8String(); - let received_str = CString::from_slice(c_str_to_bytes(&received_c_str)); - for received_char in from_utf8(received_str.as_bytes()).unwrap().chars() { - if received_char.is_ascii() { - events.push_back(ReceivedCharacter(received_char)); - } - } - - let vkey = event::vkeycode_to_element(event.keycode()); - events.push_back(KeyboardInput(Pressed, event.keycode() as u8, vkey)); - }, - NSKeyUp => { - let vkey = event::vkeycode_to_element(event.keycode()); - events.push_back(KeyboardInput(Released, event.keycode() as u8, vkey)); - }, - NSFlagsChanged => { - let shift_modifier = Window::modifier_event(event, appkit::NSShiftKeyMask as u64, events::VirtualKeyCode::LShift, shift_pressed); - if shift_modifier.is_some() { - shift_pressed = !shift_pressed; - events.push_back(shift_modifier.unwrap()); - } - let ctrl_modifier = Window::modifier_event(event, appkit::NSControlKeyMask as u64, events::VirtualKeyCode::LControl, ctrl_pressed); - if ctrl_modifier.is_some() { - ctrl_pressed = !ctrl_pressed; - events.push_back(ctrl_modifier.unwrap()); - } - let win_modifier = Window::modifier_event(event, appkit::NSCommandKeyMask as u64, events::VirtualKeyCode::LWin, win_pressed); - if win_modifier.is_some() { - win_pressed = !win_pressed; - events.push_back(win_modifier.unwrap()); - } - let alt_modifier = Window::modifier_event(event, appkit::NSAlternateKeyMask as u64, events::VirtualKeyCode::LAlt, alt_pressed); - if alt_modifier.is_some() { - alt_pressed = !alt_pressed; - events.push_back(alt_modifier.unwrap()); - } - }, - NSScrollWheel => { events.push_back(MouseWheel(-event.scrollingDeltaY() as i32)); }, - NSOtherMouseDown => { }, - NSOtherMouseUp => { }, - NSOtherMouseDragged => { }, - _ => { }, - } - } - } - events - } - - unsafe fn modifier_event(event: id, keymask: u64, key: events::VirtualKeyCode, key_pressed: bool) -> Option<Event> { - if !key_pressed && Window::modifier_key_pressed(event, keymask) { - return Some(KeyboardInput(Pressed, event.keycode() as u8, Some(key))); - } - else if key_pressed && !Window::modifier_key_pressed(event, keymask) { - return Some(KeyboardInput(Released, event.keycode() as u8, Some(key))); - } - - return None; - } - - unsafe fn modifier_key_pressed(event: id, modifier: u64) -> bool { - event.modifierFlags() & modifier != 0 - } - - pub fn wait_events(&self) -> RingBuf<Event> { - unsafe { - let event = NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_( - NSAnyEventMask as u64, - NSDate::distantFuture(nil), - NSDefaultRunLoopMode, - false); - NSApp().sendEvent_(event); - - self.poll_events() - } - } - - pub unsafe fn make_current(&self) { - self.context.makeCurrentContext(); - } - - pub fn get_proc_address(&self, _addr: &str) -> *const () { - let symbol_name: CFString = FromStr::from_str(_addr).unwrap(); - let framework_name: CFString = FromStr::from_str("com.apple.opengl").unwrap(); - let framework = unsafe { - CFBundleGetBundleWithIdentifier(framework_name.as_concrete_TypeRef()) - }; - let symbol = unsafe { - CFBundleGetFunctionPointerForName(framework, symbol_name.as_concrete_TypeRef()) - }; - symbol as *const () - } - - pub fn swap_buffers(&self) { - unsafe { self.context.flushBuffer(); } - } - - pub fn platform_display(&self) -> *mut libc::c_void { - unimplemented!() - } - - pub fn get_api(&self) -> ::Api { - ::Api::OpenGl - } - - pub fn set_window_resize_callback(&mut self, callback: Option<fn(u32, u32)>) { - self.resize = callback; - } - - pub fn set_cursor(&self, cursor: MouseCursor) { - unimplemented!() - } -} diff --git a/src/osx/mod.rs.REMOTE.6164.rs b/src/osx/mod.rs.REMOTE.6164.rs deleted file mode 100644 index 83c51a3..0000000 --- a/src/osx/mod.rs.REMOTE.6164.rs +++ /dev/null @@ -1,492 +0,0 @@ -#[cfg(feature = "headless")] -pub use self::headless::HeadlessContext; - -use {CreationError, Event}; -use CreationError::OsError; -use libc; -use std::ascii::AsciiExt; - -#[cfg(feature = "window")] -use WindowBuilder; - -use cocoa::base::{id, NSUInteger, nil, objc_allocateClassPair, class, objc_registerClassPair}; -use cocoa::base::{selector, msg_send, class_addMethod, class_addIvar}; -use cocoa::base::{object_setInstanceVariable, object_getInstanceVariable}; -use cocoa::appkit; -use cocoa::appkit::*; - -use core_foundation::base::TCFType; -use core_foundation::string::CFString; -use core_foundation::bundle::{CFBundleGetBundleWithIdentifier, CFBundleGetFunctionPointerForName}; - -use std::cell::Cell; -use std::c_str::CString; -use std::mem; -use std::ptr; - -use events::Event::{MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel}; -use events::ElementState::{Pressed, Released}; -use events::MouseButton::{LeftMouseButton, RightMouseButton}; -use events; - -pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor}; - -mod monitor; -mod event; - -#[cfg(feature = "headless")] -mod headless; - -static mut shift_pressed: bool = false; -static mut ctrl_pressed: bool = false; -static mut win_pressed: bool = false; -static mut alt_pressed: bool = false; - -static DELEGATE_NAME: &'static [u8] = b"glutin_window_delegate\0"; -static DELEGATE_STATE_IVAR: &'static [u8] = b"glutin_state"; - -struct DelegateState<'a> { - is_closed: bool, - context: id, - view: id, - handler: Option<fn(uint, uint)>, -} - -pub struct Window { - view: id, - window: id, - context: id, - delegate: id, - resize: Option<fn(uint, uint)>, - - is_closed: Cell<bool>, -} - -#[cfg(feature = "window")] -impl Window { - pub fn new(builder: WindowBuilder) -> Result<Window, CreationError> { - if builder.sharing.is_some() { - unimplemented!() - } - - Window::new_impl(builder.dimensions, builder.title.as_slice(), builder.monitor, builder.vsync, builder.visible, builder.gl_version) - } -} - -#[cfg(feature = "window")] -#[deriving(Clone)] -pub struct WindowProxy; - -impl WindowProxy { - pub fn wakeup_event_loop(&self) { - unsafe { - let pool = NSAutoreleasePool::new(nil); - let event = - NSEvent::otherEventWithType_location_modifierFlags_timestamp_windowNumber_context_subtype_data1_data2( - nil, - NSApplicationDefined, - NSPoint::new(0.0, 0.0), - 0, - 0.0, - 0, - ptr::null_mut(), - 0, - 0, - 0); - NSApp().postEvent_atStart_(event, true); - pool.drain(); - } - } -} - -extern fn window_should_close(this: id, _: id) -> id { - unsafe { - let mut stored_value = ptr::null_mut(); - object_getInstanceVariable(this, DELEGATE_STATE_IVAR.as_ptr() as *const i8, &mut stored_value); - let state = stored_value as *mut DelegateState; - - (*state).is_closed = true; - } - 0 -} - -extern fn window_did_resize(this: id, _: id) -> id { - unsafe { - let mut stored_value = ptr::null_mut(); - object_getInstanceVariable(this, DELEGATE_STATE_IVAR.as_ptr() as *const i8, &mut stored_value); - let state = &mut *(stored_value as *mut DelegateState); - - let _: id = msg_send()(state.context, selector("update")); - - match state.handler { - Some(handler) => { - let rect = NSView::frame(state.view); - (handler)(rect.size.width as uint, rect.size.height as uint); - } - None => {} - } - } - 0 -} - -impl Window { - fn new_impl(dimensions: Option<(uint, uint)>, title: &str, monitor: Option<MonitorID>, - vsync: bool, visible: bool, gl_version: Option<(uint, uint)>) -> Result<Window, CreationError> { - let app = match Window::create_app() { - Some(app) => app, - None => { return Err(OsError(format!("Couldn't create NSApplication"))); }, - }; - let window = match Window::create_window(dimensions.unwrap_or((800, 600)), title, monitor) { - Some(window) => window, - None => { return Err(OsError(format!("Couldn't create NSWindow"))); }, - }; - let view = match Window::create_view(window) { - Some(view) => view, - None => { return Err(OsError(format!("Couldn't create NSView"))); }, - }; - - let context = match Window::create_context(view, vsync, gl_version) { - Some(context) => context, - None => { return Err(OsError(format!("Couldn't create OpenGL context"))); }, - }; - - unsafe { - app.activateIgnoringOtherApps_(true); - if visible { - window.makeKeyAndOrderFront_(nil); - } else { - window.makeKeyWindow(); - } - } - - // Set up the window delegate to receive events - let ptr_size = mem::size_of::<libc::intptr_t>() as u64; - let ns_object = class("NSObject"); - - let delegate = unsafe { - // Create a delegate class, add callback methods and store InternalState as user data. - let delegate = objc_allocateClassPair(ns_object, DELEGATE_NAME.as_ptr() as *const i8, 0); - class_addMethod(delegate, selector("windowShouldClose:"), window_should_close, "B@:@".to_c_str().as_ptr()); - class_addMethod(delegate, selector("windowDidResize:"), window_did_resize, "V@:@".to_c_str().as_ptr()); - class_addIvar(delegate, DELEGATE_STATE_IVAR.as_ptr() as *const i8, ptr_size, 3, "?".to_c_str().as_ptr()); - objc_registerClassPair(delegate); - - let del_obj = msg_send()(delegate, selector("alloc")); - let del_obj: id = msg_send()(del_obj, selector("init")); - let _: id = msg_send()(window, selector("setDelegate:"), del_obj); - del_obj - }; - - let window = Window { - view: view, - window: window, - context: context, - delegate: delegate, - resize: None, - - is_closed: Cell::new(false), - }; - - Ok(window) - } - - fn create_app() -> Option<id> { - unsafe { - let app = NSApp(); - if app == nil { - None - } else { - app.setActivationPolicy_(NSApplicationActivationPolicyRegular); - app.finishLaunching(); - Some(app) - } - } - } - - fn create_window(dimensions: (uint, uint), title: &str, monitor: Option<MonitorID>) -> Option<id> { - unsafe { - let scr_frame = match monitor { - 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)) - } - }; - - let masks = match monitor { - Some(_) => NSBorderlessWindowMask as NSUInteger, - None => NSTitledWindowMask as NSUInteger | - NSClosableWindowMask as NSUInteger | - NSMiniaturizableWindowMask as NSUInteger | - NSResizableWindowMask as NSUInteger, - }; - - let window = NSWindow::alloc(nil).initWithContentRect_styleMask_backing_defer_( - scr_frame, - masks, - NSBackingStoreBuffered, - false, - ); - - if window == nil { - None - } else { - let title = NSString::alloc(nil).init_str(title); - window.setTitle_(title); - window.setAcceptsMouseMovedEvents_(true); - if monitor.is_some() { - window.setLevel_(NSMainMenuWindowLevel as i64 + 1); - } - else { - window.center(); - } - Some(window) - } - } - } - - fn create_view(window: id) -> Option<id> { - unsafe { - let view = NSView::alloc(nil).init(); - if view == nil { - None - } else { - view.setWantsBestResolutionOpenGLSurface_(true); - window.setContentView_(view); - Some(view) - } - } - } - - fn create_context(view: id, vsync: bool, gl_version: Option<(uint, uint)>) -> Option<id> { - let profile = match gl_version { - None | Some((0...2, _)) | Some((3, 0)) => NSOpenGLProfileVersionLegacy as uint, - Some((3, 1...2)) => NSOpenGLProfileVersion3_2Core as uint, - Some((_, _)) => NSOpenGLProfileVersion4_1Core as uint, - }; - unsafe { - let attributes = [ - NSOpenGLPFADoubleBuffer as uint, - NSOpenGLPFAClosestPolicy as uint, - NSOpenGLPFAColorSize as uint, 24, - NSOpenGLPFAAlphaSize as uint, 8, - NSOpenGLPFADepthSize as uint, 24, - NSOpenGLPFAStencilSize as uint, 8, - NSOpenGLPFAOpenGLProfile as uint, profile, - 0 - ]; - - let pixelformat = NSOpenGLPixelFormat::alloc(nil).initWithAttributes_(&attributes); - if pixelformat == nil { - return None; - } - - let context = NSOpenGLContext::alloc(nil).initWithFormat_shareContext_(pixelformat, nil); - if context == nil { - None - } else { - context.setView_(view); - if vsync { - let value = 1; - context.setValues_forParameter_(&value, NSOpenGLContextParameter::NSOpenGLCPSwapInterval); - } - Some(context) - } - } - } - - pub fn is_closed(&self) -> bool { - self.is_closed.get() - } - - pub fn set_title(&self, title: &str) { - unsafe { - let title = NSString::alloc(nil).init_str(title); - self.window.setTitle_(title); - } - } - - pub fn show(&self) { - } - - pub fn hide(&self) { - } - - pub fn get_position(&self) -> Option<(int, int)> { - unimplemented!() - } - - pub fn set_position(&self, _x: int, _y: int) { - unimplemented!() - } - - pub fn get_inner_size(&self) -> Option<(uint, uint)> { - let rect = unsafe { NSView::frame(self.view) }; - Some((rect.size.width as uint, rect.size.height as uint)) - } - - pub fn get_outer_size(&self) -> Option<(uint, uint)> { - unimplemented!() - } - - pub fn set_inner_size(&self, _x: uint, _y: uint) { - unimplemented!() - } - - pub fn create_window_proxy(&self) -> WindowProxy { - WindowProxy - } - - pub fn poll_events(&self) -> Vec<Event> { - let mut events = Vec::new(); - - loop { - unsafe { - let event = NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_( - NSAnyEventMask as u64, - NSDate::distantPast(nil), - NSDefaultRunLoopMode, - true); - if event == nil { break; } - { - // Create a temporary structure with state that delegates called internally - // by sendEvent can read and modify. When that returns, update window state. - // This allows the synchronous resize loop to continue issuing callbacks - // to the user application, by passing handler through to the delegate state. - let mut ds = DelegateState { - is_closed: self.is_closed.get(), - context: self.context, - view: self.view, - handler: self.resize, - }; - object_setInstanceVariable(self.delegate, - DELEGATE_STATE_IVAR.as_ptr() as *const i8, - &mut ds as *mut DelegateState as *mut libc::c_void); - NSApp().sendEvent_(event); - object_setInstanceVariable(self.delegate, - DELEGATE_STATE_IVAR.as_ptr() as *const i8, - ptr::null_mut()); - self.is_closed.set(ds.is_closed); -} - - match event.get_type() { - NSLeftMouseDown => { events.push(MouseInput(Pressed, LeftMouseButton)); }, - NSLeftMouseUp => { events.push(MouseInput(Released, LeftMouseButton)); }, - NSRightMouseDown => { events.push(MouseInput(Pressed, RightMouseButton)); }, - NSRightMouseUp => { events.push(MouseInput(Released, RightMouseButton)); }, - NSMouseMoved => { - let window_point = event.locationInWindow(); - let view_point = self.view.convertPoint_fromView_(window_point, nil); - events.push(MouseMoved((view_point.x as int, view_point.y as int))); - }, - NSKeyDown => { - let received_str = CString::new(event.characters().UTF8String(), false); - for received_char in received_str.as_str().unwrap().chars() { - if received_char.is_ascii() { - events.push(ReceivedCharacter(received_char)); - } - } - - let vkey = event::vkeycode_to_element(event.keycode()); - events.push(KeyboardInput(Pressed, event.keycode() as u8, vkey)); - }, - NSKeyUp => { - let vkey = event::vkeycode_to_element(event.keycode()); - events.push(KeyboardInput(Released, event.keycode() as u8, vkey)); - }, - NSFlagsChanged => { - let shift_modifier = Window::modifier_event(event, appkit::NSShiftKeyMask as u64, events::VirtualKeyCode::LShift, shift_pressed); - if shift_modifier.is_some() { - shift_pressed = !shift_pressed; - events.push(shift_modifier.unwrap()); - } - let ctrl_modifier = Window::modifier_event(event, appkit::NSControlKeyMask as u64, events::VirtualKeyCode::LControl, ctrl_pressed); - if ctrl_modifier.is_some() { - ctrl_pressed = !ctrl_pressed; - events.push(ctrl_modifier.unwrap()); - } - let win_modifier = Window::modifier_event(event, appkit::NSCommandKeyMask as u64, events::VirtualKeyCode::LWin, win_pressed); - if win_modifier.is_some() { - win_pressed = !win_pressed; - events.push(win_modifier.unwrap()); - } - let alt_modifier = Window::modifier_event(event, appkit::NSAlternateKeyMask as u64, events::VirtualKeyCode::LAlt, alt_pressed); - if alt_modifier.is_some() { - alt_pressed = !alt_pressed; - events.push(alt_modifier.unwrap()); - } - }, - NSScrollWheel => { events.push(MouseWheel(-event.scrollingDeltaY() as i32)); }, - NSOtherMouseDown => { }, - NSOtherMouseUp => { }, - NSOtherMouseDragged => { }, - _ => { }, - } - } - } - events - } - - unsafe fn modifier_event(event: id, keymask: u64, key: events::VirtualKeyCode, key_pressed: bool) -> Option<Event> { - if !key_pressed && Window::modifier_key_pressed(event, keymask) { - return Some(KeyboardInput(Pressed, event.keycode() as u8, Some(key))); - } - else if key_pressed && !Window::modifier_key_pressed(event, keymask) { - return Some(KeyboardInput(Released, event.keycode() as u8, Some(key))); - } - - return None; - } - - unsafe fn modifier_key_pressed(event: id, modifier: u64) -> bool { - event.modifierFlags() & modifier != 0 - } - - pub fn wait_events(&self) -> Vec<Event> { - unsafe { - let event = NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_( - NSAnyEventMask as u64, - NSDate::distantFuture(nil), - NSDefaultRunLoopMode, - false); - NSApp().sendEvent_(event); - - self.poll_events() - } - } - - pub unsafe fn make_current(&self) { - self.context.makeCurrentContext(); - } - - pub fn get_proc_address(&self, _addr: &str) -> *const () { - let symbol_name = _addr.parse::<CFString>().unwrap(); - let framework_name = "com.apple.opengl".parse::<CFString>().unwrap(); - let framework = unsafe { - CFBundleGetBundleWithIdentifier(framework_name.as_concrete_TypeRef()) - }; - let symbol = unsafe { - CFBundleGetFunctionPointerForName(framework, symbol_name.as_concrete_TypeRef()) - }; - symbol as *const () - } - - pub fn swap_buffers(&self) { - unsafe { self.context.flushBuffer(); } - } - - pub fn platform_display(&self) -> *mut libc::c_void { - unimplemented!() - } - - pub fn get_api(&self) -> ::Api { - ::Api::OpenGl - } - - pub fn set_window_resize_callback(&mut self, callback: Option<fn(uint, uint)>) { - self.resize = callback; - } -} |