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

server: check if connected to x server when output offset updates

Browse source 
Caused by the compositor reporting negative output coordinates to start.

Fixes #187
This commit is contained in:
Shawn Wallace 2025-06-24 23:18:32 -04:00
parent 117af56a83
commit 2e7c318ac2
3 changed files with 94 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/server/mod.rs
View file

@ -138,7 +138,7 @@ impl WindowData {
&mut self,
window: x::Window,
offset: WindowOutputOffset,
connection: &mut C,
connection: &mut Option<C>,
) {
log::trace!("offset: {offset:?}");
if offset == self.output_offset {
@ -150,15 +150,17 @@ impl WindowData {
dims.y += (offset.y - self.output_offset.y) as i16;
self.output_offset = offset;
connection.set_window_dims(
window,
PendingSurfaceState {
x: dims.x as i32,
y: dims.y as i32,
width: self.attrs.dims.width as _,
height: self.attrs.dims.height as _,
},
);
if let Some(connection) = connection.as_mut() {
connection.set_window_dims(
window,
PendingSurfaceState {
x: dims.x as i32,
y: dims.y as i32,
width: self.attrs.dims.width as _,
height: self.attrs.dims.height as _,
},
);
}
debug!("set {:?} offset to {:?}", window, self.output_offset);
}
@ -989,7 +991,7 @@ impl<C: XConnection> ServerState<C> {
e,
&self.global_output_offset,
&self.world,
self.connection.as_mut().unwrap(),
&mut self.connection,
);
}
self.global_offset_updated = false;