fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-10-01 11:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix keyboard input on mac

Browse Source
This commit is contained in:
Timon Schelling
2025-11-12 15:56:09 +01:00
parent cbdfe13f1e
commit 10dbc3da34
1 changed files with 52 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/src/cef/input.rs
+52 -31
View File
@@ -64,46 +64,39 @@ pub(crate) fn handle_window_event(browser: &Browser, input_state: &mut InputStat
input_state.modifiers_changed(&modifiers.state()); input_state.modifiers_changed(&modifiers.state());
} }
WindowEvent::KeyboardInput { device_id: _, event, is_synthetic: _ } => { WindowEvent::KeyboardInput { device_id: _, event, is_synthetic: _ } => {
let (named_key, character) = match &event.logical_key { let (named_key, character) = match &event.key_without_modifiers {
winit::keyboard::Key::Named(named_key) => ( winit::keyboard::Key::Named(named_key) => (Some(named_key), std::char::from_u32(named_key.to_vk_bits() as u32)),
Some(named_key), winit::keyboard::Key::Character(_) if event.text.is_some() => {
match named_key { let char = event.text.as_ref().unwrap().chars().next().unwrap_or('\0');
winit::keyboard::NamedKey::Enter => Some('\u{000d}'),
_ => None,
},
),
winit::keyboard::Key::Character(str) => {
let char = str.chars().next().unwrap_or('\0');
(None, Some(char)) (None, Some(char))
} }
_ => return, _ => return,
}; };
let modifiers = input_state.cef_modifiers(&event.location, event.repeat).raw();
let vk_bits = if let Some(named_key) = named_key {
named_key.to_vk_bits()
} else if let Some(char) = character {
char.to_vk_bits()
} else {
0
};
let native_key_code = event.physical_key.to_native_keycode(); let native_key_code = event.physical_key.to_native_keycode();
let modifiers = input_state.cef_modifiers(&event.location, event.repeat).raw(); let Some(host) = browser.host() else { return };
let mut key_event = KeyEvent { let mut key_event = KeyEvent {
size: size_of::<KeyEvent>(), size: size_of::<KeyEvent>(),
modifiers, modifiers,
..Default::default() ..Default::default()
}; };
if let Some(named_key) = named_key {
key_event.windows_key_code = named_key.to_vk_bits();
} else if let Some(char) = character {
key_event.windows_key_code = char.to_vk_bits();
}
key_event.native_key_code = native_key_code; key_event.native_key_code = native_key_code;
key_event.windows_key_code = vk_bits;
let Some(host) = browser.host() else { return };
match event.state { match event.state {
ElementState::Pressed => { ElementState::Pressed => {
key_event.type_ = KeyEventType::from(cef_key_event_type_t::KEYEVENT_RAWKEYDOWN);
host.send_key_event(Some(&key_event));
if let Some(char) = character { if let Some(char) = character {
let mut char_key_event = KeyEvent { let mut char_key_event = KeyEvent {
size: size_of::<KeyEvent>(), size: size_of::<KeyEvent>(),
@@ -111,19 +104,43 @@ pub(crate) fn handle_window_event(browser: &Browser, input_state: &mut InputStat
is_system_key: 0, is_system_key: 0,
..Default::default() ..Default::default()
}; };
let mut buf = [0; 2]; let mut buf = [0; 2];
char.encode_utf16(&mut buf); char.encode_utf16(&mut buf);
char_key_event.windows_key_code = buf[0] as i32;
char_key_event.character = buf[0]; key_event.character = buf[0];
char_key_event.native_key_code = native_key_code; key_event.unmodified_character = buf[0];
let mut buf = [0; 2]; key_event.type_ = KeyEventType::from(cef_key_event_type_t::KEYEVENT_RAWKEYDOWN);
char.to_lowercase().next().unwrap().encode_utf16(&mut buf);
char_key_event.unmodified_character = buf[0]; if input_state.is_unmodified() && named_key.is_none() {
char_key_event.type_ = KeyEventType::from(cef_key_event_type_t::KEYEVENT_CHAR); #[cfg(not(target_os = "macos"))] // TODO: Understand why this is needed to avoid double keydown events on mac
host.send_key_event(Some(&char_key_event)); host.send_key_event(Some(&key_event));
char_key_event.native_key_code = native_key_code;
char_key_event.windows_key_code = buf[0] as i32;
char_key_event.character = buf[0];
char_key_event.unmodified_character = buf[0];
char_key_event.type_ = KeyEventType::from(cef_key_event_type_t::KEYEVENT_CHAR);
host.send_key_event(Some(&char_key_event));
} else {
host.send_key_event(Some(&key_event));
}
} else {
key_event.type_ = KeyEventType::from(cef_key_event_type_t::KEYEVENT_RAWKEYDOWN);
host.send_key_event(Some(&key_event));
} }
} }
ElementState::Released => { ElementState::Released => {
if let Some(char) = character
&& input_state.is_unmodified()
{
let mut buf = [0; 2];
char.encode_utf16(&mut buf);
key_event.character = buf[0];
key_event.unmodified_character = buf[0];
}
key_event.type_ = KeyEventType::from(cef_key_event_type_t::KEYEVENT_KEYUP); key_event.type_ = KeyEventType::from(cef_key_event_type_t::KEYEVENT_KEYUP);
host.send_key_event(Some(&key_event)); host.send_key_event(Some(&key_event));
} }
@@ -175,6 +192,10 @@ impl InputState {
fn cef_modifiers_mouse_event(&self) -> CefModifiers { fn cef_modifiers_mouse_event(&self) -> CefModifiers {
self.cef_modifiers(&winit::keyboard::KeyLocation::Standard, false) self.cef_modifiers(&winit::keyboard::KeyLocation::Standard, false)
} }
fn is_unmodified(&self) -> bool {
!self.modifiers.control_key() && !self.modifiers.alt_key() && !self.modifiers.meta_key()
}
} }
impl From<InputState> for CefModifiers { impl From<InputState> for CefModifiers {