Skip to content

Add ModifiersChanged event for macOS #1268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 12, 2019
Merged

Add ModifiersChanged event for macOS #1268

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7b4cbf
Add ModifiersChanged event for macOS
chrisduerr Nov 9, 2019
2cfe108
Fix ModifiersChanged event import
chrisduerr Nov 14, 2019
7ecd520
Fix event passing window instead of device id
chrisduerr Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 18 additions & 19 deletions src/platform_impl/macos/view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ use objc::{

use crate::{
event::{
DeviceEvent, ElementState, Event, KeyboardInput, MouseButton, MouseScrollDelta, TouchPhase,
VirtualKeyCode, WindowEvent,
DeviceEvent, ElementState, Event, KeyboardInput, ModifiersState, MouseButton,
MouseScrollDelta, TouchPhase, VirtualKeyCode, WindowEvent,
},
platform_impl::platform::{
app_state::AppState,
Expand All @@ -35,21 +35,13 @@ use crate::{
window::WindowId,
};

#[derive(Default)]
struct Modifiers {
shift_pressed: bool,
ctrl_pressed: bool,
win_pressed: bool,
alt_pressed: bool,
}

struct ViewState {
ns_window: id,
pub cursor: Arc<Mutex<util::Cursor>>,
ime_spot: Option<(f64, f64)>,
raw_characters: Option<String>,
is_key_down: bool,
modifiers: Modifiers,
modifiers: ModifiersState,
}

pub fn new_view(ns_window: id) -> (IdRef, Weak<Mutex<util::Cursor>>) {
Expand Down Expand Up @@ -634,36 +626,36 @@ extern "C" fn flags_changed(this: &Object, _sel: Sel, event: id) {
if let Some(window_event) = modifier_event(
event,
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);
}

if let Some(window_event) = modifier_event(
event,
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);
}

if let Some(window_event) = modifier_event(
event,
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);
}

if let Some(window_event) = modifier_event(
event,
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);
}

Expand All @@ -673,6 +665,13 @@ extern "C" fn flags_changed(this: &Object, _sel: Sel, event: id) {
event,
});
}

AppState::queue_event(Event::DeviceEvent {
device_id: DEVICE_ID,
event: DeviceEvent::ModifiersChanged {
modifiers: state.modifiers,
},
});
}
trace!("Completed `flagsChanged`");
}
Expand Down