macOS: Try getting the layout again

enigo-rs · Apr 18, 2024 · c717b81 · c717b81
1 parent c60f3b6
commit c717b81
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/macos/macos_impl.rs b/src/macos/macos_impl.rs
@@ -87,6 +87,7 @@ const kCFStringEncodingUTF8: u32 = 0x0800_0100;
 extern "C" {
     fn TISCopyCurrentKeyboardInputSource() -> TISInputSourceRef;
     fn TISCopyCurrentKeyboardLayoutInputSource() -> TISInputSourceRef;
+    fn TISCopyCurrentASCIICapableKeyboardLayoutInputSource()-> TISInputSourceRef;
 
     #[allow(non_upper_case_globals)]
     static kTISPropertyUnicodeKeyLayoutData: CFStringRef;
@@ -848,6 +849,14 @@ fn create_string_for_key(keycode: u16, modifier: u32) -> CFStringRef {
         };
         debug_assert!(!layout_data.is_null());
     }
+    if layout_data.is_null() {
+        debug!("TISGetInputSourceProperty(current_keyboard, kTISPropertyUnicodeKeyLayoutData) returned NULL again");
+        current_keyboard = unsafe { TISCopyCurrentASCIICapableKeyboardLayoutInputSource() };
+        layout_data = unsafe {
+            TISGetInputSourceProperty(current_keyboard, kTISPropertyUnicodeKeyLayoutData)
+        };
+        debug_assert!(!layout_data.is_null());
+    }
     let keyboard_layout = unsafe { CFDataGetBytePtr(layout_data) };
 
     let mut keys_down: UInt32 = 0;