wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-23 15:04:36 +03:00
Code Issues Projects Releases Wiki Activity

window: implement dead key status events for x11/wayland

Browse Source 
refs: #688
This commit is contained in:
Wez Furlong 2022-01-02 17:20:29 -07:00
parent 8d9ae31ff0
commit 306133af7a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
window/src/os/x11/keyboard.rs
View File

@ -1,7 +1,7 @@
use crate::os::xkeysyms::keysym_to_keycode;
use crate::{
Handled, KeyCode, KeyEvent, Modifiers, RawKeyEvent, WindowEvent, WindowEventSender,
WindowKeyEvent,
DeadKeyStatus, Handled, KeyCode, KeyEvent, Modifiers, RawKeyEvent, WindowEvent,
WindowEventSender, WindowKeyEvent,
};
use anyhow::{anyhow, ensure};
use libc;
@ -211,6 +211,7 @@ impl Keyboard {
match cstate {
ComposeStatus::Composing => {
// eat
events.dispatch(WindowEvent::AdviseDeadKeyStatus(DeadKeyStatus::Holding));
return None;
}
ComposeStatus::Composed => {
@ -220,6 +221,7 @@ impl Keyboard {
kc.replace(crate::KeyCode::composed(&utf8));
}
compose_state.reset();
events.dispatch(WindowEvent::AdviseDeadKeyStatus(DeadKeyStatus::None));
res.unwrap_or(xsym)
}
ComposeStatus::Nothing => {
@ -231,6 +233,7 @@ impl Keyboard {
}
ComposeStatus::Cancelled => {
self.compose_state.borrow_mut().reset();
events.dispatch(WindowEvent::AdviseDeadKeyStatus(DeadKeyStatus::None));
return None;
}
}