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

focus: Set focus to exclusive layer surfaces on creation

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-03-29 14:41:41 +02:00
parent b3ff2a7ca3
commit c61e860cb2
1 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/shell/handler.rs
View file

@ -16,7 +16,10 @@ use smithay::{
output::Output,
seat::{PointerGrabStartData, Seat},
shell::{
wlr_layer::{wlr_layer_shell_init, LayerShellRequest, LayerSurfaceAttributes},
wlr_layer::{
wlr_layer_shell_init, KeyboardInteractivity, Layer, LayerShellRequest,
LayerSurfaceAttributes, LayerSurfaceCachedState,
},
xdg::{
xdg_shell_init, Configure, XdgPopupSurfaceRoleAttributes, XdgRequest,
XdgToplevelSurfaceRoleAttributes,
@ -225,9 +228,25 @@ pub fn init_shell(config: &Config, display: &mut Display) -> super::Shell {
.and_then(Output::from_resource)
.unwrap_or_else(|| active_output(seat, &*state));
let focus = surface
.get_surface()
.map(|surface| {
with_states(surface, |states| {
let state = states.cached_state.current::<LayerSurfaceCachedState>();
matches!(state.layer, Layer::Top | Layer::Overlay)
&& state.keyboard_interactivity == KeyboardInteractivity::Exclusive
})
.unwrap()
})
.unwrap_or(false);
let mut map = layer_map_for_output(&output);
map.map_layer(&LayerSurface::new(surface, namespace))
map.map_layer(&LayerSurface::new(surface.clone(), namespace))
.unwrap();
if focus {
state.shell.set_focus(surface.get_surface(), seat);
}
}
_ => {}
},