zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 17:21:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Wayland: implement focus events (#8170)

Browse Source 
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:
Rom Grk 2024-02-22 12:51:09 -05:00 committed by GitHub
parent 40bbd0031d
commit bd94a0e921
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crates/gpui/src/platform/linux/wayland/client.rs
View File

@ -421,12 +421,29 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for WaylandClientState {
state.keymap_state = Some(xkb::State::new(&keymap)); state.keymap_state = Some(xkb::State::new(&keymap));
} }
wl_keyboard::Event::Enter { surface, .. } => { wl_keyboard::Event::Enter { surface, .. } => {
for window in &state.windows { state.keyboard_focused_window = state
if window.1.surface.id() == surface.id() { .windows
state.keyboard_focused_window = Some(Rc::clone(&window.1)); .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 { wl_keyboard::Event::Modifiers {
mods_depressed, mods_depressed,
mods_latched, mods_latched,
@ -479,7 +496,6 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for WaylandClientState {
} }
} }
} }
wl_keyboard::Event::Leave { .. } => {}
_ => {} _ => {}
} }
} }

8
crates/gpui/src/platform/linux/wayland/window.rs
View File

@ -228,6 +228,12 @@ impl WaylandWindowState {
} }
} }
} }
pub fn set_focused(&self, focus: bool) {
if let Some(ref mut fun) = self.callbacks.lock().active_status_change {
fun(focus);
}
}
} }
#[derive(Clone)] #[derive(Clone)]
@ -349,7 +355,7 @@ impl PlatformWindow for WaylandWindow {
} }
fn on_active_status_change(&self, callback: Box<dyn FnMut(bool)>) { fn on_active_status_change(&self, callback: Box<dyn FnMut(bool)>) {
//todo!(linux) self.0.callbacks.lock().active_status_change = Some(callback);
} }
fn on_resize(&self, callback: Box<dyn FnMut(Size<Pixels>, f32)>) { fn on_resize(&self, callback: Box<dyn FnMut(Size<Pixels>, f32)>) {