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 the modifiers key as input

Browse source
This commit is contained in:
David Partouche 2014-10-23 17:18:47 +02:00
parent 271b688910
commit 6f46c0c2dd
1 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/osx/mod.rs
View file

@ -8,6 +8,7 @@ use WindowBuilder;
use HeadlessRendererBuilder; use HeadlessRendererBuilder;
use cocoa::base::{id, NSUInteger, nil}; use cocoa::base::{id, NSUInteger, nil};
use cocoa::appkit;
use cocoa::appkit::*; use cocoa::appkit::*;
use core_foundation::base::TCFType; use core_foundation::base::TCFType;
@ -16,10 +17,16 @@ use core_foundation::bundle::{CFBundleGetBundleWithIdentifier, CFBundleGetFuncti
use std::c_str::CString; use std::c_str::CString;
use {MouseInput, Pressed, Released, LeftMouseButton, RightMouseButton, MouseMoved, ReceivedCharacter, use {MouseInput, Pressed, Released, LeftMouseButton, RightMouseButton, MouseMoved, ReceivedCharacter,
KeyboardInput}; KeyboardInput, KeyModifiers};
use events;
mod event; mod event;
static mut shift_pressed: bool = false;
static mut ctrl_pressed: bool = false;
static mut win_pressed: bool = false;
pub struct Window { pub struct Window {
view: id, view: id,
context: id, context: id,
@ -250,8 +257,21 @@ impl Window {
events.push(KeyboardInput(Released, event.keycode() as u8, vkey, modifiers)); events.push(KeyboardInput(Released, event.keycode() as u8, vkey, modifiers));
}, },
NSFlagsChanged => { NSFlagsChanged => {
println!("Modifiers: {}", event.modifierFlags()); let shift_modifier = Window::modifier_event(event, appkit::NSShiftKeyMask as u64, events::LShift, shift_pressed);
// Need to keep an array of the modified flags 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::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::LWin, win_pressed);
if win_modifier.is_some() {
win_pressed = !win_pressed;
events.push(win_modifier.unwrap());
}
}, },
NSScrollWheel => { }, NSScrollWheel => { },
NSOtherMouseDown => { }, NSOtherMouseDown => { },
@ -264,6 +284,21 @@ impl Window {
events 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), KeyModifiers::empty()));
}
else if key_pressed && !Window::modifier_key_pressed(event, keymask) {
return Some(KeyboardInput(Released, event.keycode() as u8, Some(key), KeyModifiers::empty()));
}
return None;
}
unsafe fn modifier_key_pressed(event: id, modifier: u64) -> bool {
event.modifierFlags() & modifier != 0
}
pub fn wait_events(&self) -> Vec<Event> { pub fn wait_events(&self) -> Vec<Event> {
unsafe { unsafe {
let event = NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_( let event = NSApp().nextEventMatchingMask_untilDate_inMode_dequeue_(