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

x11: Send window maximization hints correctly (#363)

Browse source 
Previously, the maximization hints were being sent as two separate client messages: one for
horizontal, and one for vertical. That resulted in the window only being maximized
horizontally (at least with my WM). The corrected client message sets both of these hints at
once.

In the process of implementing that, the relevant components were refactored to use the util
module, as we gradually move towards a hopeful future of a more readable X11 backend.
This commit is contained in:
Francesca Sunshine 2017-12-15 14:37:09 -05:00 • committed by GitHub
parent 9698d0a8d8
commit 8f18dab061
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 105 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/platform/linux/x11/util.rs
View file

@ -6,16 +6,24 @@ use libc::{c_char, c_int, c_long, c_short, c_uchar, c_ulong};
use super::{ffi, XConnection, XError};
pub unsafe fn get_atom(xconn: &Arc<XConnection>, name: &[u8]) -> Result<ffi::Atom, XError> {
let atom_name: *const c_char = name.as_ptr() as _;
let atom = (xconn.xlib.XInternAtom)(xconn.display, atom_name, ffi::False);
xconn.check_errors().map(|_| atom)
}
pub unsafe fn send_client_msg(
xconn: &Arc<XConnection>,
target_window: c_ulong,
window: c_ulong, // the window this is "about"; not necessarily this window
target_window: c_ulong, // the window we're sending to
message_type: ffi::Atom,
event_mask: Option<c_long>,
data: (c_long, c_long, c_long, c_long, c_long),
) {
) -> Result<(), XError> {
let mut event: ffi::XClientMessageEvent = mem::uninitialized();
event.type_ = ffi::ClientMessage;
event.display = xconn.display;
event.window = target_window;
event.window = window;
event.message_type = message_type;
event.format = 32;
event.data = ffi::ClientMessageData::new();
@ -25,13 +33,17 @@ pub unsafe fn send_client_msg(
event.data.set_long(3, data.3);
event.data.set_long(4, data.4);
let event_mask = event_mask.unwrap_or(ffi::NoEventMask);
(xconn.xlib.XSendEvent)(
xconn.display,
target_window,
ffi::False,
ffi::NoEventMask,
event_mask,
&mut event.into(),
);
xconn.check_errors().map(|_| ())
}
#[derive(Debug)]