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

Merge pull request #680 from tomaka/xsync

Browse source 
Call XSync before XSetInputFocus
This commit is contained in:
tomaka 2015-12-29 21:21:15 +01:00
parent 92ae05d6ce 033d92aae5
commit 0a598d7980
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -615,14 +615,20 @@ impl Window {
input_handler: Mutex::new(XInputEventHandler::new(display, window, ic, window_attrs)) input_handler: Mutex::new(XInputEventHandler::new(display, window, ic, window_attrs))
}; };
unsafe { if window_attrs.visible {
let ref x_window: &XWindow = window.x.borrow(); unsafe {
(display.xlib.XSetInputFocus)( let ref x_window: &XWindow = window.x.borrow();
display.display,
x_window.window, // XSetInputFocus generates an error if the window is not visible,
ffi::RevertToParent, // therefore we call XSync before to make sure it's the case
ffi::CurrentTime (display.xlib.XSync)(display.display, 0);
); (display.xlib.XSetInputFocus)(
display.display,
x_window.window,
ffi::RevertToParent,
ffi::CurrentTime
);
}
} }
// returning // returning