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

Merge pull request #706 from ecoal95/xinputfocus-error

Browse source 
x11: Poll the window until it is really visible
This commit is contained in:
tomaka 2016-01-16 19:49:32 +01:00
parent 9ba16e31a9 4d729164c7
commit 3e0f6adec4
1 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,8 @@ use std::sync::atomic::AtomicBool;
use std::collections::VecDeque; use std::collections::VecDeque;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use std::os::raw::c_long; use std::os::raw::c_long;
use std::thread;
use std::time::Duration;
use Api; use Api;
use ContextError; use ContextError;
@ -642,8 +644,13 @@ impl Window {
let ref x_window: &XWindow = window.x.borrow(); let ref x_window: &XWindow = window.x.borrow();
// XSetInputFocus generates an error if the window is not visible, // XSetInputFocus generates an error if the window is not visible,
// therefore we call XSync before to make sure it's the case // therefore we wait until it's the case.
(display.xlib.XSync)(display.display, 0); loop {
let mut window_attributes = mem::uninitialized();
(display.xlib.XGetWindowAttributes)(display.display, x_window.window, &mut window_attributes);
display.check_errors().expect("Failed to call XGetWindowAttributes");
if window_attributes.map_state == ffi::IsViewable {
(display.xlib.XSetInputFocus)( (display.xlib.XSetInputFocus)(
display.display, display.display,
x_window.window, x_window.window,
@ -651,6 +658,12 @@ impl Window {
ffi::CurrentTime ffi::CurrentTime
); );
display.check_errors().expect("Failed to call XSetInputFocus"); display.check_errors().expect("Failed to call XSetInputFocus");
break;
}
// Wait about a frame to avoid too-busy waiting
thread::sleep(Duration::from_millis(16));
}
} }
} }