alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-10-17 23:41:33 +11:00
Code Issues Packages Projects Releases Wiki Activity

Add ModifiersChanged event for macOS (#1268)

Browse source 
* Add ModifiersChanged event for macOS

This implements the macOS portion of #1124.

* Fix ModifiersChanged event import

* Fix event passing window instead of device id
This commit is contained in:
Christian Duerr 2019-12-12 22:48:32 +01:00 committed by Bogaevsky
parent 1f81e5c872
commit c1b93fc3d0
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/platform_impl/macos/view.rs
View file

@ -18,8 +18,8 @@ use objc::{
use crate::{ use crate::{
event::{ event::{
DeviceEvent, ElementState, Event, KeyboardInput, MouseButton, MouseScrollDelta, TouchPhase, DeviceEvent, ElementState, Event, KeyboardInput, ModifiersState, MouseButton,
VirtualKeyCode, WindowEvent, MouseScrollDelta, TouchPhase, VirtualKeyCode, WindowEvent,
}, },
platform_impl::platform::{ platform_impl::platform::{
app_state::AppState, app_state::AppState,
@ -35,21 +35,13 @@ use crate::{
window::WindowId, window::WindowId,
}; };
#[derive(Default)]
struct Modifiers {
shift_pressed: bool,
ctrl_pressed: bool,
win_pressed: bool,
alt_pressed: bool,
}
struct ViewState { struct ViewState {
ns_window: id, ns_window: id,
pub cursor: Arc<Mutex<util::Cursor>>, pub cursor: Arc<Mutex<util::Cursor>>,
ime_spot: Option<(f64, f64)>, ime_spot: Option<(f64, f64)>,
raw_characters: Option<String>, raw_characters: Option<String>,
is_key_down: bool, is_key_down: bool,
modifiers: Modifiers, modifiers: ModifiersState,
} }
pub fn new_view(ns_window: id) -> (IdRef, Weak<Mutex<util::Cursor>>) { pub fn new_view(ns_window: id) -> (IdRef, Weak<Mutex<util::Cursor>>) {
@ -654,36 +646,36 @@ extern "C" fn flags_changed(this: &Object, _sel: Sel, event: id) {
if let Some(window_event) = modifier_event( if let Some(window_event) = modifier_event(
event, event,
NSEventModifierFlags::NSShiftKeyMask, NSEventModifierFlags::NSShiftKeyMask,
state.modifiers.shift_pressed, state.modifiers.shift,
) { ) {
state.modifiers.shift_pressed = !state.modifiers.shift_pressed; state.modifiers.shift = !state.modifiers.shift;
events.push_back(window_event); events.push_back(window_event);
} }
if let Some(window_event) = modifier_event( if let Some(window_event) = modifier_event(
event, event,
NSEventModifierFlags::NSControlKeyMask, NSEventModifierFlags::NSControlKeyMask,
state.modifiers.ctrl_pressed, state.modifiers.ctrl,
) { ) {
state.modifiers.ctrl_pressed = !state.modifiers.ctrl_pressed; state.modifiers.ctrl = !state.modifiers.ctrl;
events.push_back(window_event); events.push_back(window_event);
} }
if let Some(window_event) = modifier_event( if let Some(window_event) = modifier_event(
event, event,
NSEventModifierFlags::NSCommandKeyMask, NSEventModifierFlags::NSCommandKeyMask,
state.modifiers.win_pressed, state.modifiers.logo,
) { ) {
state.modifiers.win_pressed = !state.modifiers.win_pressed; state.modifiers.logo = !state.modifiers.logo;
events.push_back(window_event); events.push_back(window_event);
} }
if let Some(window_event) = modifier_event( if let Some(window_event) = modifier_event(
event, event,
NSEventModifierFlags::NSAlternateKeyMask, NSEventModifierFlags::NSAlternateKeyMask,
state.modifiers.alt_pressed, state.modifiers.alt,
) { ) {
state.modifiers.alt_pressed = !state.modifiers.alt_pressed; state.modifiers.alt = !state.modifiers.alt;
events.push_back(window_event); events.push_back(window_event);
} }
@ -693,6 +685,13 @@ extern "C" fn flags_changed(this: &Object, _sel: Sel, event: id) {
event, event,
}); });
} }
AppState::queue_event(Event::DeviceEvent {
device_id: DEVICE_ID,
event: DeviceEvent::ModifiersChanged {
modifiers: state.modifiers,
},
});
} }
trace!("Completed `flagsChanged`"); trace!("Completed `flagsChanged`");
} }