Wayland: implement focus events (#8170)
Implements keyboard focus in/out events. This also enables vim mode to work on wayland, which is only activated when an editor gains focus.
This commit is contained in:
parent
40bbd0031d
commit
bd94a0e921
2 changed files with 28 additions and 6 deletions
|
@ -421,12 +421,29 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for WaylandClientState {
|
|||
state.keymap_state = Some(xkb::State::new(&keymap));
|
||||
}
|
||||
wl_keyboard::Event::Enter { surface, .. } => {
|
||||
for window in &state.windows {
|
||||
if window.1.surface.id() == surface.id() {
|
||||
state.keyboard_focused_window = Some(Rc::clone(&window.1));
|
||||
}
|
||||
state.keyboard_focused_window = state
|
||||
.windows
|
||||
.iter()
|
||||
.find(|&w| w.1.surface.id() == surface.id())
|
||||
.map(|w| w.1.clone());
|
||||
|
||||
if let Some(window) = &state.keyboard_focused_window {
|
||||
window.set_focused(true);
|
||||
}
|
||||
}
|
||||
wl_keyboard::Event::Leave { surface, .. } => {
|
||||
let keyboard_focused_window = state
|
||||
.windows
|
||||
.iter()
|
||||
.find(|&w| w.1.surface.id() == surface.id())
|
||||
.map(|w| w.1.clone());
|
||||
|
||||
if let Some(window) = keyboard_focused_window {
|
||||
window.set_focused(false);
|
||||
}
|
||||
|
||||
state.keyboard_focused_window = None;
|
||||
}
|
||||
wl_keyboard::Event::Modifiers {
|
||||
mods_depressed,
|
||||
mods_latched,
|
||||
|
@ -479,7 +496,6 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for WaylandClientState {
|
|||
}
|
||||
}
|
||||
}
|
||||
wl_keyboard::Event::Leave { .. } => {}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue