From 360d2bf45259970965190a0993db317a67ed729a Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 24 Dec 2015 11:55:39 +0100 Subject: Call XSync before XSetInputFocus --- src/api/x11/window.rs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/api/x11') diff --git a/src/api/x11/window.rs b/src/api/x11/window.rs index 297a4f3..1ad5888 100644 --- a/src/api/x11/window.rs +++ b/src/api/x11/window.rs @@ -617,6 +617,10 @@ impl Window { 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, -- cgit v1.2.3 From 033d92aae528d0d7d7590361c231aaf89afca103 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Thu, 24 Dec 2015 11:58:50 +0100 Subject: Only call XSetInputFocus if the window is visible --- src/api/x11/window.rs | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'src/api/x11') diff --git a/src/api/x11/window.rs b/src/api/x11/window.rs index 1ad5888..223c2ba 100644 --- a/src/api/x11/window.rs +++ b/src/api/x11/window.rs @@ -615,18 +615,20 @@ impl Window { input_handler: Mutex::new(XInputEventHandler::new(display, window, ic, window_attrs)) }; - 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 - ); + 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 -- cgit v1.2.3