leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix(x11): Use the right atom type in focus_window()

Browse source 
Closes #3248 by removing an Xlibism I forgot about

Signed-off-by: John Nunley <dev@notgull.net>
This commit is contained in:
John Nunley 2023-11-28 16:20:36 -08:00 • committed by GitHub
parent e9784127df
commit da947992ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 60 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/platform_impl/linux/x11/ffi.rs
View file

@ -1,6 +1 @@
use x11_dl::xmd::CARD32;
pub use x11_dl::{error::OpenError, xcursor::*, xinput2::*, xlib::*, xlib_xcb::*};
// Isn't defined by x11_dl
#[allow(non_upper_case_globals)]
pub const IconicState: CARD32 = 3;

1
src/platform_impl/linux/x11/mod.rs
View file

@ -81,6 +81,7 @@ use crate::{
// Xinput constants not defined in x11rb
const ALL_DEVICES: u16 = 0;
const ALL_MASTER_DEVICES: u16 = 1;
const ICONIC_STATE: u32 = 3;
type X11Source = Generic<BorrowedFd<'static>>;

4
src/platform_impl/linux/x11/window.rs
View file

@ -1785,9 +1785,9 @@ impl UnownedWindow {
let state_type_atom = atoms[CARD32];
let is_minimized = if let Ok(state) =
self.xconn
.get_property(self.xwindow, state_atom, state_type_atom)
.get_property::<u32>(self.xwindow, state_atom, state_type_atom)
{
state.contains(&(ffi::IconicState as c_ulong))
state.contains(&super::ICONIC_STATE)
} else {
false
};