Try XOpenIM with different locale modifiers

Implements the solution suggested in rust-windowing#277 (comment).
francesca64 · Mar 29, 2018 · f508dab · f508dab
1 parent 02e287a
commit f508dab
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/src/platform/linux/x11/mod.rs b/src/platform/linux/x11/mod.rs
@@ -1020,10 +1020,28 @@ impl Window {
         let im = unsafe {
             let _lock = GLOBAL_XOPENIM_LOCK.lock().unwrap();
 
-            let im = (x_events_loop.display.xlib.XOpenIM)(x_events_loop.display.display, ptr::null_mut(), ptr::null_mut(), ptr::null_mut());
+            let open_im = || (x_events_loop.display.xlib.XOpenIM)(
+                x_events_loop.display.display,
+                ptr::null_mut(),
+                ptr::null_mut(),
+                ptr::null_mut(),
+            );
+
+            let mut im = open_im();
+
+            for modifiers in &["@im=local", "@im="] {
+                if !im.is_null() {
+                    break;
+                }
+
+                (x_events_loop.display.xlib.XSetLocaleModifiers)(modifiers.as_ptr() as *const i8);
+                im = open_im();
+            }
+
             if im.is_null() {
                 panic!("XOpenIM failed");
             }
+
             im
         };