Merge pull request #680 from tomaka/xsync

Call XSync before XSetInputFocus

1 files changed, 14 insertions, 8 deletions

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