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

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

@ -435,6 +435,14 @@ impl Common {
.cloned()
.collect::<Vec<_>>();
for seat in &seats {
let mut xwayland_grab = seat
.user_data()
.get_or_insert(XWaylandGrabSeatData::default)
.grab
.lock()
.unwrap();
xwayland_grab.take_if(|(surface, g)| !g.grab().is_alive() || !surface.alive());
{
let shell = state.common.shell.read();
let focused_output = seat.focused_output();
@ -559,18 +567,6 @@ 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) {
@ -632,7 +628,6 @@ fn focus_target_is_valid(
}
KeyboardFocusTarget::Popup(_) => true,
KeyboardFocusTarget::LockSurface(_) => false,
KeyboardFocusTarget::XWaylandGrab(_) => false,
}
}
@ -641,21 +636,12 @@ 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()

5
src/shell/focus/target.rs
View file

@ -74,7 +74,6 @@ pub enum KeyboardFocusTarget {
LayerSurface(LayerSurface),
Popup(PopupKind),
LockSurface(LockSurface),
XWaylandGrab(WlSurface),
}
// TODO: This should be TryFrom, but PopupGrab needs to be able to convert. Fix this in smithay
@ -199,7 +198,6 @@ impl KeyboardFocusTarget {
KeyboardFocusTarget::LayerSurface(l) => Some(l.wl_surface()),
KeyboardFocusTarget::Popup(p) => Some(p.wl_surface()),
KeyboardFocusTarget::LockSurface(l) => Some(l.wl_surface()),
KeyboardFocusTarget::XWaylandGrab(g) => Some(g),
}
}
@ -276,7 +274,6 @@ impl IsAlive for KeyboardFocusTarget {
KeyboardFocusTarget::LayerSurface(l) => l.alive(),
KeyboardFocusTarget::Popup(p) => p.alive(),
KeyboardFocusTarget::LockSurface(l) => l.alive(),
KeyboardFocusTarget::XWaylandGrab(g) => g.alive(),
}
}
}
@ -526,7 +523,6 @@ impl WaylandFocus for KeyboardFocusTarget {
KeyboardFocusTarget::LayerSurface(l) => Some(Cow::Borrowed(l.wl_surface())),
KeyboardFocusTarget::Popup(p) => Some(Cow::Borrowed(p.wl_surface())),
KeyboardFocusTarget::LockSurface(l) => Some(Cow::Borrowed(l.wl_surface())),
KeyboardFocusTarget::XWaylandGrab(g) => Some(Cow::Borrowed(g)),
}
}
fn same_client_as(&self, object_id: &ObjectId) -> bool {
@ -537,7 +533,6 @@ impl WaylandFocus for KeyboardFocusTarget {
KeyboardFocusTarget::LayerSurface(l) => l.wl_surface().id().same_client_as(object_id),
KeyboardFocusTarget::Popup(p) => p.wl_surface().id().same_client_as(object_id),
KeyboardFocusTarget::LockSurface(l) => l.wl_surface().id().same_client_as(object_id),
KeyboardFocusTarget::XWaylandGrab(g) => g.id().same_client_as(object_id),
}
}
}