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

Prioritize xdg_output for updating window positions

Browse source 
Fixes #46
This commit is contained in:
Shawn Wallace 2024-08-08 01:32:18 -04:00
parent 8892570093
commit cf439000a5
6 changed files with 284 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/server/dispatch.rs
View file

@ -815,9 +815,9 @@ impl<C: XConnection> Dispatch<XdgOutputServer, ObjectKey> for ServerState<C> {
unreachable!();
};
let output: &XdgOutput = state.objects[*key].as_ref();
output.client.destroy();
state.objects.remove(*key);
let output: &mut Output = state.objects[*key].as_mut();
let xdg_output = output.xdg.take().unwrap();
xdg_output.client.destroy();
}
}
@ -836,14 +836,10 @@ impl<C: XConnection> Dispatch<OutputManServer, ClientGlobalWrapper<OutputManClie
match request {
s_output_man::Request::GetXdgOutput { id, output } => {
let output_key: ObjectKey = output.data().copied().unwrap();
state
.objects
.insert_from_other_objects([output_key], |[output_obj], key| {
let output: &Output = output_obj.try_into().unwrap();
let client = client.get_xdg_output(&output.client, &state.qh, key);
let server = data_init.init(id, key);
XdgOutput { server, client }.into()
});
let output: &mut Output = state.objects[output_key].as_mut();
let client = client.get_xdg_output(&output.client, &state.qh, output_key);
let server = data_init.init(id, output_key);
output.xdg = Some(XdgOutput { client, server });
}
s_output_man::Request::Destroy => {}
_ => unreachable!(),