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

Support WM_CLASS missing instance and null

Browse source 
Done by AvaloniaILSpy, for some reason
This commit is contained in:
Shawn Wallace 2024-05-24 00:09:28 -04:00
parent 2444c2f07b
commit 02bee5aea7
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/xstate.rs
View file

@ -449,11 +449,19 @@ impl XState {
let cookie = self.get_property_cookie(window, x::ATOM_WM_CLASS, x::ATOM_STRING, 256);
let resolver = move |reply: x::GetPropertyReply| {
let data: &[u8] = reply.value();
// wm class is instance + class - ignore instance
let class_start = data.iter().copied().position(|b| b == 0u8).unwrap() + 1;
let data = data[class_start..].to_vec();
trace!("wm class data: {data:?}");
// wm class (normally) is instance + class - ignore instance
let class_start = if let Some(p) = data.iter().copied().position(|b| b == 0u8) {
p + 1
} else {
0
};
let mut data = data[class_start..].to_vec();
if data.last().copied().unwrap() != 0 {
data.push(0);
}
let class = CString::from_vec_with_nul(data).unwrap();
debug!("{:?} class: {class:?}", window);
trace!("{:?} class: {class:?}", window);
class.to_string_lossy().to_string()
};
PropertyCookieWrapper {
@ -506,7 +514,7 @@ impl XState {
let resolver = |reply: x::GetPropertyReply| {
let data: &[u32] = reply.value();
let hints = WmHints::from(data);
debug!("wm hints: {hints:?}");
trace!("wm hints: {hints:?}");
hints
};
PropertyCookieWrapper {