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

input: Fix toplevel focus

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-05-12 14:15:33 +02:00
parent b07ac107b1
commit 219e21d573
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/input/mod.rs
View file

@ -527,8 +527,13 @@ impl State {
let button = event.button_code(); let button = event.button_code();
let state = match event.state() { let state = match event.state() {
ButtonState::Pressed => { ButtonState::Pressed => {
// change the keyboard focus unless the pointer is grabbed // change the keyboard focus unless the pointer or keyboard is grabbed
if !seat.get_pointer().unwrap().is_grabbed() { // We test for any matching surface type here but always use the root
// (in case of a window the toplevel) surface for the focus.
// see: https://gitlab.freedesktop.org/wayland/wayland/-/issues/294
if !seat.get_pointer().unwrap().is_grabbed()
&& !seat.get_keyboard().map(|k| k.is_grabbed()).unwrap_or(true)
{
let output = active_output(seat, &self.common); let output = active_output(seat, &self.common);
let pos = seat.get_pointer().unwrap().current_location(); let pos = seat.get_pointer().unwrap().current_location();
let output_geo = self.common.shell.output_geometry(&output); let output_geo = self.common.shell.output_geometry(&output);
@ -551,17 +556,17 @@ impl State {
.surface_under( .surface_under(
pos - output_geo.loc.to_f64() pos - output_geo.loc.to_f64()
- layer_loc.to_f64(), - layer_loc.to_f64(),
WindowSurfaceType::TOPLEVEL, WindowSurfaceType::ALL,
) )
.map(|(s, _)| s); .and_then(|(_, _)| layer.get_surface().cloned());
} }
} else { } else {
under = window under = window
.surface_under( .surface_under(
pos - output_geo.loc.to_f64(), pos - output_geo.loc.to_f64(),
WindowSurfaceType::TOPLEVEL, WindowSurfaceType::ALL,
) )
.map(|(s, _)| s); .and_then(|(_, _)| window.toplevel().get_surface().cloned());
} }
} else { } else {
if let Some(layer) = layers if let Some(layer) = layers
@ -577,14 +582,14 @@ impl State {
.surface_under( .surface_under(
pos - output_geo.loc.to_f64() pos - output_geo.loc.to_f64()
- layer_loc.to_f64(), - layer_loc.to_f64(),
WindowSurfaceType::TOPLEVEL, WindowSurfaceType::ALL,
) )
.map(|(s, _)| s); .and_then(|(_, _)| layer.get_surface().cloned());
} }
} else if let Some((_, surface, _)) = } else if let Some((_, surface, _)) =
workspace.space.surface_under( workspace.space.surface_under(
relative_pos, relative_pos,
WindowSurfaceType::TOPLEVEL, WindowSurfaceType::ALL,
) )
{ {
under = Some(surface); under = Some(surface);
@ -600,9 +605,9 @@ impl State {
.surface_under( .surface_under(
pos - output_geo.loc.to_f64() pos - output_geo.loc.to_f64()
- layer_loc.to_f64(), - layer_loc.to_f64(),
WindowSurfaceType::TOPLEVEL, WindowSurfaceType::ALL,
) )
.map(|(s, _)| s); .and_then(|(_, _)| layer.get_surface().cloned());
} }
}; };
} }