alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-25 06:41:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #745 from SSheldon/objc2

Browse source 
Update objc dependency to 0.2
This commit is contained in:
tomaka 2016-03-21 10:15:54 +01:00
parent 9643d2625c c5268309c3
commit 9a8ca6ebae
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Cargo.toml
View file

@ -23,24 +23,24 @@ khronos_api = "1.0"
version = "0.1" version = "0.1"
[target.i386-apple-ios.dependencies] [target.i386-apple-ios.dependencies]
objc = "0.1.8" objc = "0.2"
[target.x86_64-apple-ios.dependencies] [target.x86_64-apple-ios.dependencies]
objc = "0.1.8" objc = "0.2"
[target.aarch64-apple-ios.dependencies] [target.aarch64-apple-ios.dependencies]
objc = "0.1.8" objc = "0.2"
[target.armv7s-apple-ios.dependencies] [target.armv7s-apple-ios.dependencies]
objc = "0.1.8" objc = "0.2"
[target.armv7-apple-ios.dependencies] [target.armv7-apple-ios.dependencies]
objc = "0.1.8" objc = "0.2"
[target.x86_64-apple-darwin.dependencies] [target.x86_64-apple-darwin.dependencies]
objc = "0.1.8" objc = "0.2"
cgl = "0.1" cgl = "0.1"
cocoa = "0.2.4" cocoa = "0.3"
core-foundation = "0" core-foundation = "0"
core-graphics = "0.3" core-graphics = "0.3"

19
src/api/cocoa/mod.rs
View file

@ -79,11 +79,12 @@ struct WindowDelegate {
impl WindowDelegate { impl WindowDelegate {
/// Get the delegate class, initiailizing it neccessary /// Get the delegate class, initiailizing it neccessary
fn class() -> *const Class { fn class() -> *const Class {
use std::os::raw::c_void;
use std::sync::{Once, ONCE_INIT}; use std::sync::{Once, ONCE_INIT};
extern fn window_should_close(this: &Object, _: Sel, _: id) -> BOOL { extern fn window_should_close(this: &Object, _: Sel, _: id) -> BOOL {
unsafe { unsafe {
let state: *mut libc::c_void = *this.get_ivar("glutinState"); let state: *mut c_void = *this.get_ivar("glutinState");
let state = state as *mut DelegateState; let state = state as *mut DelegateState;
(*state).pending_events.lock().unwrap().push_back(Closed); (*state).pending_events.lock().unwrap().push_back(Closed);
} }
@ -92,7 +93,7 @@ impl WindowDelegate {
extern fn window_did_resize(this: &Object, _: Sel, _: id) { extern fn window_did_resize(this: &Object, _: Sel, _: id) {
unsafe { unsafe {
let state: *mut libc::c_void = *this.get_ivar("glutinState"); let state: *mut c_void = *this.get_ivar("glutinState");
let state = &mut *(state as *mut DelegateState); let state = &mut *(state as *mut DelegateState);
let _: () = msg_send![*state.context, update]; let _: () = msg_send![*state.context, update];
@ -111,7 +112,7 @@ impl WindowDelegate {
// TODO: center the cursor if the window had mouse grab when it // TODO: center the cursor if the window had mouse grab when it
// lost focus // lost focus
let state: *mut libc::c_void = *this.get_ivar("glutinState"); let state: *mut c_void = *this.get_ivar("glutinState");
let state = state as *mut DelegateState; let state = state as *mut DelegateState;
(*state).pending_events.lock().unwrap().push_back(Focused(true)); (*state).pending_events.lock().unwrap().push_back(Focused(true));
} }
@ -119,7 +120,7 @@ impl WindowDelegate {
extern fn window_did_resign_key(this: &Object, _: Sel, _: id) { extern fn window_did_resign_key(this: &Object, _: Sel, _: id) {
unsafe { unsafe {
let state: *mut libc::c_void = *this.get_ivar("glutinState"); let state: *mut c_void = *this.get_ivar("glutinState");
let state = state as *mut DelegateState; let state = state as *mut DelegateState;
(*state).pending_events.lock().unwrap().push_back(Focused(false)); (*state).pending_events.lock().unwrap().push_back(Focused(false));
} }
@ -131,7 +132,7 @@ impl WindowDelegate {
INIT.call_once(|| unsafe { INIT.call_once(|| unsafe {
// Create new NSWindowDelegate // Create new NSWindowDelegate
let superclass = Class::get("NSObject").unwrap(); let superclass = Class::get("NSObject").unwrap();
let mut decl = ClassDecl::new(superclass, "GlutinWindowDelegate").unwrap(); let mut decl = ClassDecl::new("GlutinWindowDelegate", superclass).unwrap();
// Add callback methods // Add callback methods
decl.add_method(sel!(windowShouldClose:), decl.add_method(sel!(windowShouldClose:),
@ -145,7 +146,7 @@ impl WindowDelegate {
window_did_resign_key as extern fn(&Object, Sel, id)); window_did_resign_key as extern fn(&Object, Sel, id));
// Store internal state as user data // Store internal state as user data
decl.add_ivar::<*mut libc::c_void>("glutinState"); decl.add_ivar::<*mut c_void>("glutinState");
delegate_class = decl.register(); delegate_class = decl.register();
}); });
@ -162,7 +163,7 @@ impl WindowDelegate {
unsafe { unsafe {
let delegate = IdRef::new(msg_send![WindowDelegate::class(), new]); let delegate = IdRef::new(msg_send![WindowDelegate::class(), new]);
(&mut **delegate).set_ivar("glutinState", state_ptr as *mut libc::c_void); (&mut **delegate).set_ivar("glutinState", state_ptr as *mut ::std::os::raw::c_void);
let _: () = msg_send![*state.window, setDelegate:*delegate]; let _: () = msg_send![*state.window, setDelegate:*delegate];
WindowDelegate { state: state, _this: delegate } WindowDelegate { state: state, _this: delegate }
@ -673,8 +674,8 @@ impl Window {
let sel = Sel::register(cursor_name); let sel = Sel::register(cursor_name);
let cls = Class::get("NSCursor").unwrap(); let cls = Class::get("NSCursor").unwrap();
unsafe { unsafe {
use objc::MessageArguments; use objc::Message;
let cursor: id = ().send(cls as *const _ as id, sel); let cursor: id = cls.send_message(sel, ()).unwrap();
let _: () = msg_send![cursor, set]; let _: () = msg_send![cursor, set];
} }
} }