leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved handling of XWayland grabs

Browse source 
A solution for https://github.com/Smithay/smithay/issues/1714.

With this, the lock screen is able to get keyboard focus normally, but
focus then reverts to the XWayland grab surface. This can be tested with
the example client from the issue.

Adding a new variant of `KeyboardFocusTarget` is annoying. Maybe it
could map to a different variant of the enum. But it presumably needs to
handle any `wl_surface` XWayland uses. (Override redirect surfaces?
Subsurfaces?) This seems as good as anything for now.
This commit is contained in:
Ian Douglas Scott 2025-05-05 19:40:56 -07:00 • committed by Victoria Brekenfeld
parent 791bcac2fd
commit 30d68af051
5 changed files with 78 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/shell/focus/mod.rs
View file

@ -2,7 +2,7 @@ use crate::{
shell::{element::CosmicMapped, Shell},
state::Common,
utils::prelude::*,
wayland::handlers::xdg_shell::PopupGrabData,
wayland::handlers::{xdg_shell::PopupGrabData, xwayland_keyboard_grab::XWaylandGrabSeatData},
};
use indexmap::IndexSet;
use smithay::{
@ -464,6 +464,18 @@ fn focus_target_is_valid(
return matches!(target, KeyboardFocusTarget::LockSurface(_));
}
let xwayland_grab = seat
.user_data()
.get_or_insert(XWaylandGrabSeatData::default)
.grab
.lock()
.unwrap();
if let Some((surface, grab)) = &*xwayland_grab {
if grab.grab().is_alive() {
return target == KeyboardFocusTarget::XWaylandGrab(surface.clone());
}
}
// If an exclusive layer shell surface exists (on any output), only exclusive
// shell surfaces can have focus, on the highest layer with exclusive surfaces.
if let Some(layer) = exclusive_layer_surface_layer(shell) {
@ -533,6 +545,7 @@ fn focus_target_is_valid(
}
KeyboardFocusTarget::Popup(_) => true,
KeyboardFocusTarget::LockSurface(_) => false,
KeyboardFocusTarget::XWaylandGrab(_) => false,
}
}
@ -541,12 +554,21 @@ fn update_focus_target(
seat: &Seat<State>,
output: &Output,
) -> Option<KeyboardFocusTarget> {
let mut xwayland_grab = seat
.user_data()
.get_or_insert(XWaylandGrabSeatData::default)
.grab
.lock()
.unwrap();
xwayland_grab.take_if(|(_, g)| !g.grab().is_alive());
if let Some(session_lock) = &shell.session_lock {
session_lock
.surfaces
.get(output)
.cloned()
.map(KeyboardFocusTarget::from)
} else if let Some((surface, _)) = &*xwayland_grab {
Some(KeyboardFocusTarget::XWaylandGrab(surface.clone()))
} else if let Some(layer) = exclusive_layer_surface_layer(shell) {
layer_map_for_output(output)
.layers()