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

20
src/server/event.rs
View file

@ -151,7 +151,7 @@ impl SurfaceEvents {
x: dimensions.x - state.global_output_offset.x.value,
y: dimensions.y - state.global_output_offset.y.value,
},
state.connection.as_mut().unwrap(),
&mut state.connection,
);
if state.last_focused_toplevel == Some(*window) {
let output = get_output_name(Some(&on_output), &state.world);
@ -889,21 +889,19 @@ fn update_output_offset(
);
}
if let Some(connection) = state.connection.as_mut() {
update_window_output_offsets(
output,
&state.global_output_offset,
&state.world,
connection,
);
}
update_window_output_offsets(
output,
&state.global_output_offset,
&state.world,
&mut state.connection,
);
}
fn update_window_output_offsets(
output: Entity,
global_output_offset: &GlobalOutputOffset,
world: &World,
connection: &mut impl XConnection,
connection: &mut Option<impl XConnection>,
) {
let dimensions = world.get::<&OutputDimensions>(output).unwrap();
let mut query = world.query::<(&x::Window, &mut WindowData, &OnOutput)>();
@ -927,7 +925,7 @@ pub(super) fn update_global_output_offset(
output: Entity,
global_output_offset: &GlobalOutputOffset,
world: &World,
connection: &mut impl XConnection,
connection: &mut Option<impl XConnection>,
) {
let entity = world.entity(output).unwrap();
let mut query = entity.query::<(&OutputDimensions, &WlOutput)>();