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

Don't change focus on click of layer with KeyboardInteractivity::None

Browse source 
Previously, a click on a client like squeekboard would give keyboard
focus to the window behind it, if any.

If we are in the input region of the layer surface, we shouldn't give
keyboard focus to the surface behind it on click. And should just leave
the focus unchanged. Returning `None` here seems to be correct.
This commit is contained in:
Ian Douglas Scott 2025-05-21 09:30:42 -07:00 • committed by Jeremy Soller
parent 194d5c8967
commit 7ee48e5444
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/input/mod.rs
View file

@ -2032,19 +2032,21 @@ impl State {
}
}
Stage::LayerSurface { layer, location } => {
if layer.can_receive_keyboard_focus() {
if under_from_surface_tree(
layer.wl_surface(),
global_pos.as_logical(),
location.as_logical(),
WindowSurfaceType::TOPLEVEL | WindowSurfaceType::SUBSURFACE,
)
.is_some()
{
return ControlFlow::Break(Ok(Some(
KeyboardFocusTarget::LayerSurface(layer),
)));
}
if under_from_surface_tree(
layer.wl_surface(),
global_pos.as_logical(),
location.as_logical(),
WindowSurfaceType::TOPLEVEL | WindowSurfaceType::SUBSURFACE,
)
.is_some()
{
return ControlFlow::Break(Ok(if layer.can_receive_keyboard_focus() {
Some(KeyboardFocusTarget::LayerSurface(layer))
} else {
// Don't change keyboard focus if in input region of layer shell
// surface, but surface doesn't have keyboard interactivity.
None
}));
}
}
Stage::OverrideRedirect { .. } => {