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

Fix race condition with XOpenIM

Browse source
This commit is contained in:
Pierre Krieger 2015-01-23 11:04:40 +01:00
parent 1d6b863cd4
commit 56c6afd03c
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/x11/window/mod.rs
View file

@ -8,6 +8,7 @@ use std::sync::atomic::AtomicBool;
use std::collections::RingBuf; use std::collections::RingBuf;
use super::ffi; use super::ffi;
use std::sync::{Arc, Once, ONCE_INIT}; use std::sync::{Arc, Once, ONCE_INIT};
use std::sync::{StaticMutex, MUTEX_INIT};
pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor}; pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor};
@ -262,6 +263,10 @@ impl Window {
// creating IM // creating IM
let im = unsafe { let im = unsafe {
// XOpenIM doesn't seem to be thread-safe
static GLOBAL_XOPENIM_LOCK: StaticMutex = MUTEX_INIT;
let _lock = GLOBAL_XOPENIM_LOCK.lock().unwrap();
let im = ffi::XOpenIM(display, ptr::null(), ptr::null_mut(), ptr::null_mut()); let im = ffi::XOpenIM(display, ptr::null(), ptr::null_mut(), ptr::null_mut());
if im.is_null() { if im.is_null() {
return Err(OsError(format!("XOpenIM failed"))); return Err(OsError(format!("XOpenIM failed")));