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

Merge pull request #596 from fkaa/cocoa-focus

Browse source 
Add focus and defocus events on cocoa. Fixes #595
This commit is contained in:
tomaka 2015-09-10 19:50:29 +02:00
parent 8092fd6409 b029233e54
commit 567d29fcc5
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,7 @@ use std::sync::Mutex;
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
use std::ops::Deref; use std::ops::Deref;
use events::Event::{Awakened, MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel, Closed}; use events::Event::{Awakened, MouseInput, MouseMoved, ReceivedCharacter, KeyboardInput, MouseWheel, Closed, Focused};
use events::ElementState::{Pressed, Released}; use events::ElementState::{Pressed, Released};
use events::MouseButton; use events::MouseButton;
use events; use events;
@ -105,6 +105,25 @@ impl WindowDelegate {
} }
} }
extern fn window_did_become_key(this: &Object, _: Sel, _: id) {
unsafe {
// TODO: center the cursor if the window had mouse grab when it
// lost focus
let state: *mut libc::c_void = *this.get_ivar("glutinState");
let state = state as *mut DelegateState;
(*state).pending_events.lock().unwrap().push_back(Focused(true));
}
}
extern fn window_did_resign_key(this: &Object, _: Sel, _: id) {
unsafe {
let state: *mut libc::c_void = *this.get_ivar("glutinState");
let state = state as *mut DelegateState;
(*state).pending_events.lock().unwrap().push_back(Focused(false));
}
}
static mut delegate_class: *const Class = 0 as *const Class; static mut delegate_class: *const Class = 0 as *const Class;
static INIT: Once = ONCE_INIT; static INIT: Once = ONCE_INIT;
@ -119,6 +138,11 @@ impl WindowDelegate {
decl.add_method(sel!(windowDidResize:), decl.add_method(sel!(windowDidResize:),
window_did_resize as extern fn(&Object, Sel, id)); window_did_resize as extern fn(&Object, Sel, id));
decl.add_method(sel!(windowDidBecomeKey:),
window_did_become_key as extern fn(&Object, Sel, id));
decl.add_method(sel!(windowDidResignKey:),
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 libc::c_void>("glutinState");