alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2025-01-11 13:31:29 +11:00
Code Issues Packages Projects Releases Wiki Activity

Added ReceivedCharacter event for cocoa

Browse source
This commit is contained in:
David Partouche 2014-10-12 20:16:42 +02:00
parent ba8f55547f
commit dad539114d
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/osx/mod.rs
View file

@ -14,6 +14,8 @@ use core_foundation::base::TCFType;
use core_foundation::string::CFString; use core_foundation::string::CFString;
use core_foundation::bundle::{CFBundleGetBundleWithIdentifier, CFBundleGetFunctionPointerForName}; use core_foundation::bundle::{CFBundleGetBundleWithIdentifier, CFBundleGetFunctionPointerForName};
use std::c_str::CString;
pub struct Window { pub struct Window {
window: id, window: id,
view: id, view: id,
@ -210,7 +212,7 @@ impl Window {
loop { loop {
unsafe { unsafe {
use {MouseInput, Pressed, Released, LeftMouseButton, RightMouseButton, MouseMoved}; use {MouseInput, Pressed, Released, LeftMouseButton, RightMouseButton, MouseMoved, ReceivedCharacter};
let event = NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_( let event = NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_(
NSAnyEventMask as u64, NSAnyEventMask as u64,
NSDate::distantPast(nil), NSDate::distantPast(nil),
@ -229,7 +231,13 @@ impl Window {
let view_point = self.view.convertPoint_fromView_(window_point, nil); let view_point = self.view.convertPoint_fromView_(window_point, nil);
events.push(MouseMoved((view_point.x as int, view_point.y as int))); events.push(MouseMoved((view_point.x as int, view_point.y as int)));
}, },
NSKeyDown => { }, NSKeyDown => {
let received_cstr = CString::new(event.characters().UTF8String(), false);
match received_cstr.as_str() {
Some(received_str) => { events.push(ReceivedCharacter(received_str.char_at(0))); },
None => { },
};
},
NSKeyUp => { }, NSKeyUp => { },
NSFlagsChanged => { }, NSFlagsChanged => { },
NSScrollWheel => { }, NSScrollWheel => { },