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

Fix X11 on 32bit architectures (#311)

Browse source 
* Add an i386 target to travis

* Fix X11 on 32bit architectures

One would hope 32bit X11 was dead by now but apparently not :). Fix
the window hint setting code to not assume window IDs are 64bit as
apparently they are not in 32bit arches.
This commit is contained in:
Pedro Côrte-Real 2017-10-07 20:20:37 +01:00 • committed by tomaka
parent 5af88d97e8
commit 1db92063d9
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -251,7 +251,7 @@ impl Window2 {
Ok(window)
}
fn set_netwm(display: &Arc<XConnection>, window: u64, root: u64, property: &str, val: bool) {
fn set_netwm(display: &Arc<XConnection>, window: ffi::Window, root: ffi::Window, property: &str, val: bool) {
let state_atom = unsafe {
with_c_str("_NET_WM_STATE", |state|
(display.xlib.XInternAtom)(display.display, state, 0)
@ -276,7 +276,7 @@ impl Window2 {
data: {
let mut data = ffi::ClientMessageData::new();
// This first `long` is the action; `1` means add/set following property.
data.set_long(0, val as i64);
data.set_long(0, val as c_long);
// This second `long` is the property to set (fullscreen)
data.set_long(1, atom as c_long);
data