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

focus: Don't consider XWaylandGrab exclusive

Browse source
This commit is contained in:
Victoria Brekenfeld 2025-08-15 13:14:13 +02:00 • committed by Victoria Brekenfeld
parent 4209e61c48
commit b28f92a6e1
6 changed files with 36 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/shell/mod.rs
View file

@ -1665,30 +1665,6 @@ impl Shell {
}?;
focus_target = KeyboardFocusTarget::Element(new_target);
} else if let KeyboardFocusTarget::XWaylandGrab(surface) = &focus_target {
if let Some(new_target) = self.element_for_surface(surface) {
focus_target = KeyboardFocusTarget::Element(new_target.clone());
} else if let Some(new_target) = self
.workspaces
.spaces()
.find_map(|w| w.get_fullscreen().filter(|s| *s == surface))
{
focus_target = KeyboardFocusTarget::Fullscreen(new_target.clone());
} else if let Some(or) = self
.override_redirect_windows
.iter()
.find(|w| w.wl_surface().as_ref() == Some(surface))
{
// Find output the override redirect window overlaps the most with
let or_geo = or.geometry().as_global();
let (output, _) = self
.outputs()
.filter_map(|o| Some((o, o.geometry().intersection(or_geo)?)))
.max_by_key(|(_, intersection)| intersection.size.w * intersection.size.h)?;
return Some(output.clone());
} else {
return None;
}
}
match focus_target {
@ -1754,7 +1730,6 @@ impl Shell {
.iter()
.find_map(|(output, s)| (s == &surface).then_some(output))
.cloned(),
KeyboardFocusTarget::XWaylandGrab(_) => unreachable!(),
KeyboardFocusTarget::Popup(_) => unreachable!(),
}
}