bhrebec/xwayland-satellite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server: activate toplevels after mapping

Browse source 
This behavior was removed a while back, because we were also trying to activate
popups and this was causing issues on some compositors. However, I think
activating toplevels after they're mapped is the behavior that X11 apps tend to
expect - in Steam Big Picture for example, when launching a game in Niri while
fullscreened, the focus doesn't automatically switch to the game. This may need
to be reevaluated and refined in the future though.
This commit is contained in:
Shawn Wallace 2025-10-25 11:50:46 -04:00
parent 04816e2a36
commit 52cc06e6c6
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/server/dispatch.rs
View file

@ -1471,8 +1471,10 @@ impl<S: X11Selection> Dispatch<XwaylandSurfaceV1, Entity> for InnerServerState<S
let win = data.get::<&x::Window>().as_deref().copied().unwrap();
state.windows.insert(win, *entity);
debug!("associate {surface_id} with {win:?} (serial {serial:?})");
if data.get::<&WindowData>().unwrap().mapped {
state.create_role_window(win, *entity);
if data.get::<&WindowData>().unwrap().mapped
&& state.create_role_window(win, *entity)
{
state.activate_window(win);
}
} else {
state.world.insert(*entity, (serial,)).unwrap();

13
src/server/mod.rs
View file

@ -1207,7 +1207,8 @@ impl<S: X11Selection + 'static> InnerServerState<S> {
}
}
fn create_role_window(&mut self, window: x::Window, entity: Entity) {
/// Returns true if the created window is a toplevel.
fn create_role_window(&mut self, window: x::Window, entity: Entity) -> bool {
let xdg_surface;
let mut popup_for = None;
let mut fullscreen = false;
@ -1235,12 +1236,12 @@ impl<S: X11Selection + 'static> InnerServerState<S> {
}
}
let role = if let Some(parent) = popup_for {
let (role, is_toplevel) = if let Some(parent) = popup_for {
let data = self.create_popup(entity, xdg_surface, parent);
SurfaceRole::Popup(Some(data))
(SurfaceRole::Popup(Some(data)), false)
} else {
let data = self.create_toplevel(entity, xdg_surface, fullscreen);
SurfaceRole::Toplevel(Some(data))
(SurfaceRole::Toplevel(Some(data)), true)
};
let (surface_role, client) = self
@ -1259,6 +1260,8 @@ impl<S: X11Selection + 'static> InnerServerState<S> {
client.commit();
self.world.insert(entity, (role,)).unwrap();
is_toplevel
}
fn create_toplevel(
@ -1269,7 +1272,7 @@ impl<S: X11Selection + 'static> InnerServerState<S> {
) -> ToplevelData {
let window = self.world.get::<&WindowData>(entity).unwrap();
debug!(
"creating toplevel for {:?}",
"creating toplevel for {:?} fullscreen: {fullscreen:?}",
*self.world.get::<&x::Window>(entity).unwrap()
);