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

Remove unnecessary locking

Browse source 
For X11 interrupt, we can just use the root window which doesn't require
taking a lock to find.
This commit is contained in:
Joe Wilm 2017-05-09 21:30:31 -07:00
parent 6c5bc52a5f
commit 46057d7122
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/platform/linux/x11/mod.rs
View file

@ -105,22 +105,9 @@ impl EventsLoop {
self.interrupted.store(true, ::std::sync::atomic::Ordering::Relaxed); self.interrupted.store(true, ::std::sync::atomic::Ordering::Relaxed);
// Push an event on the X event queue so that methods like run_forever will advance. // Push an event on the X event queue so that methods like run_forever will advance.
// Get a window for the event.
//
// It should not matter which window is used since the purpose is merely
// to advance the event loop.
let window = {
let windows = self.windows.lock().unwrap();
match windows.keys().nth(0) {
Some(window_id) => window_id.0,
None => return
}
};
let mut xev = ffi::XClientMessageEvent { let mut xev = ffi::XClientMessageEvent {
type_: ffi::ClientMessage, type_: ffi::ClientMessage,
window: window, window: self.root,
format: 32, format: 32,
message_type: 0, message_type: 0,
serial: 0, serial: 0,
@ -130,7 +117,7 @@ impl EventsLoop {
}; };
unsafe { unsafe {
(self.display.xlib.XSendEvent)(self.display.display, window, 0, 0, mem::transmute(&mut xev)); (self.display.xlib.XSendEvent)(self.display.display, self.root, 0, 0, mem::transmute(&mut xev));
(self.display.xlib.XFlush)(self.display.display); (self.display.xlib.XFlush)(self.display.display);
self.display.check_errors().expect("Failed to call XSendEvent after wakeup"); self.display.check_errors().expect("Failed to call XSendEvent after wakeup");
} }