bhrebec/xwayland-satellite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unfocus window on X11 side when keyboard focus is lost

Browse source 
Closes #69 (nice)
This commit is contained in:
Shawn Wallace 2024-10-29 23:24:44 -04:00
parent a713cf46cb
commit b0ee6db9fa
4 changed files with 95 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/server/event.rs
View file

@ -525,6 +525,24 @@ impl HandleEvent for Keyboard {
self.server.enter(serial, &data.server, keys);
}
}
client::wl_keyboard::Event::Leave { serial, surface } => {
if !surface.is_alive() {
return;
}
let key: ObjectKey = surface.data().copied().unwrap();
if let Some(data) = state
.objects
.get(key)
.map(|o| <_ as AsRef<SurfaceData>>::as_ref(o))
{
if state.to_focus == Some(data.window.unwrap()) {
state.to_focus.take();
} else {
state.unfocus = true;
}
self.server.leave(serial, &data.server);
}
}
_ => simple_event_shunt! {
self.server, event: client::wl_keyboard::Event => [
Keymap {
@ -532,18 +550,6 @@ impl HandleEvent for Keyboard {
|fd| fd.as_fd(),
size
},
Leave {
serial,
|surface| {
if !surface.is_alive() {
return;
}
let Some(surface_data) = state.get_server_surface_from_client(surface) else {
return;
};
surface_data
}
},
Key {
serial,
time,

7
src/server/mod.rs
View file

@ -479,6 +479,7 @@ pub struct ServerState<C: XConnection> {
qh: ClientQueueHandle,
client: Option<Client>,
to_focus: Option<x::Window>,
unfocus: bool,
last_focused_toplevel: Option<x::Window>,
last_hovered: Option<x::Window>,
connection: Option<C>,
@ -527,6 +528,7 @@ impl<C: XConnection> ServerState<C> {
qh,
dh,
to_focus: None,
unfocus: false,
last_focused_toplevel: None,
last_hovered: None,
connection: None,
@ -832,7 +834,12 @@ impl<C: XConnection> ServerState<C> {
debug!("focusing window {win:?}");
conn.focus_window(win, data);
self.last_focused_toplevel = Some(win);
} else if self.unfocus {
let data = C::ExtraData::create(self);
let conn = self.connection.as_mut().unwrap();
conn.focus_window(x::WINDOW_NONE, data);
}
self.unfocus = false;
}
self.handle_clipboard_events();