alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-25 14:51:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix misbehaving fullscreen window

Browse source
This commit is contained in:
Adam Badawy 2015-10-26 03:40:37 -04:00
parent ed8dfa9a52
commit 47df0e9eaa
1 changed files with 51 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/api/x11/window.rs
View file

@ -436,14 +436,14 @@ impl Window {
} }
// switching to fullscreen // switching to fullscreen
if let Some(mut mode_to_switch_to) = mode_to_switch_to { // if let Some(mut mode_to_switch_to) = mode_to_switch_to {
window_attributes |= ffi::CWOverrideRedirect; // window_attributes |= ffi::CWOverrideRedirect;
unsafe { // unsafe {
(display.xf86vmode.XF86VidModeSwitchToMode)(display.display, screen_id, &mut mode_to_switch_to); // (display.xf86vmode.XF86VidModeSwitchToMode)(display.display, screen_id, &mut mode_to_switch_to);
(display.xf86vmode.XF86VidModeSetViewPort)(display.display, screen_id, 0, 0); // (display.xf86vmode.XF86VidModeSetViewPort)(display.display, screen_id, 0, 0);
set_win_attr.override_redirect = 1; // set_win_attr.override_redirect = 1;
} // }
} // }
// finally creating the window // finally creating the window
let window = unsafe { let window = unsafe {
@ -527,6 +527,49 @@ impl Window {
let is_fullscreen = window_attrs.monitor.is_some(); let is_fullscreen = window_attrs.monitor.is_some();
if is_fullscreen {
let state_atom = unsafe {
with_c_str("_NET_WM_STATE", |state|
(display.xlib.XInternAtom)(display.display, state, 0)
)
};
let fs_atom = unsafe {
with_c_str("_NET_WM_STATE_FULLSCREEN", |state_fullscreen|
(display.xlib.XInternAtom)(display.display, state_fullscreen, 0)
)
};
let client_message_event = ffi::XClientMessageEvent {
type_: ffi::ClientMessage,
serial: 0,
send_event: 1,
display: display.display,
window: window,
message_type: state_atom,
format: 32,
data: {
let mut data = unsafe {
mem::transmute::<[libc::c_long; 5], ffi::ClientMessageData>([0; 5])
};
data.set_long(0, 1);
data.set_long(1, fs_atom as i64);
data.set_long(2, 0);
data
}
};
let mut x_event = ffi::XEvent::from(client_message_event);
unsafe {
(display.xlib.XSendEvent)(
display.display,
root,
0,
ffi::SubstructureRedirectMask | ffi::SubstructureNotifyMask,
&mut x_event as *mut _
);
}
}
// finish creating the OpenGL context // finish creating the OpenGL context
let context = match context { let context = match context {
Prototype::Glx(ctxt) => { Prototype::Glx(ctxt) => {