After rebase.

Author: Narsil

src/macos/common.rs

@@ -143,44 +143,44 @@ pub unsafe fn convert(
             let key = key_from_code(code);
 
             // Determine if this is a press or release based on flag changes
-            let global_flags = LAST_FLAGS.lock().unwrap();
+            let mut global_flags = LAST_FLAGS.lock().unwrap();
             if flags.contains(CGEventFlags::CGEventFlagShift)
                 && !global_flags.contains(CGEventFlags::CGEventFlagShift)
             {
                 *global_flags = flags;
                 Some(EventType::KeyPress(key))
             } else if !flags.contains(CGEventFlags::CGEventFlagShift)
-                && *global_flags.contains(CGEventFlags::CGEventFlagShift)
+                && global_flags.contains(CGEventFlags::CGEventFlagShift)
             {
                 *global_flags = flags;
                 Some(EventType::KeyRelease(key))
             } else if flags.contains(CGEventFlags::CGEventFlagControl)
-                && !*global_flags.contains(CGEventFlags::CGEventFlagControl)
+                && !global_flags.contains(CGEventFlags::CGEventFlagControl)
             {
                 *global_flags = flags;
                 Some(EventType::KeyPress(key))
             } else if !flags.contains(CGEventFlags::CGEventFlagControl)
-                && *global_flags.contains(CGEventFlags::CGEventFlagControl)
+                && global_flags.contains(CGEventFlags::CGEventFlagControl)
             {
                 *global_flags = flags;
                 Some(EventType::KeyRelease(key))
             } else if flags.contains(CGEventFlags::CGEventFlagAlternate)
-                && !*global_flags.contains(CGEventFlags::CGEventFlagAlternate)
+                && !global_flags.contains(CGEventFlags::CGEventFlagAlternate)
             {
                 *global_flags = flags;
                 Some(EventType::KeyPress(key))
             } else if !flags.contains(CGEventFlags::CGEventFlagAlternate)
-                && *global_flags.contains(CGEventFlags::CGEventFlagAlternate)
+                && global_flags.contains(CGEventFlags::CGEventFlagAlternate)
             {
                 *global_flags = flags;
                 Some(EventType::KeyRelease(key))
             } else if flags.contains(CGEventFlags::CGEventFlagCommand)
-                && !*global_flags.contains(CGEventFlags::CGEventFlagCommand)
+                && !global_flags.contains(CGEventFlags::CGEventFlagCommand)
             {
                 *global_flags = flags;
                 Some(EventType::KeyPress(key))
             } else if !flags.contains(CGEventFlags::CGEventFlagCommand)
-                && *global_flags.contains(CGEventFlags::CGEventFlagCommand)
+                && global_flags.contains(CGEventFlags::CGEventFlagCommand)
             {
                 *global_flags = flags;
                 Some(EventType::KeyRelease(key))

src/macos/simulate.rs

@@ -25,7 +25,7 @@ unsafe fn convert_native_with_source(
                 event.set_integer_value_field(EventField::KEYBOARD_EVENT_KEYCODE, code as i64);
 
                 // Get current flags and update them
-                let mut new_flags = LAST_FLAGS;
+                let mut new_flags = LAST_FLAGS.lock().unwrap();
                 match key {
                     Key::ShiftLeft | Key::ShiftRight => {
                         new_flags.insert(CGEventFlags::CGEventFlagShift);
@@ -41,12 +41,12 @@ unsafe fn convert_native_with_source(
                     }
                     _ => {}
                 }
-                event.set_flags(new_flags);
+                event.set_flags(*new_flags);
                 Some(event)
             } else {
                 // For non-modifier keys, use regular key events
                 let event = CGEvent::new_keyboard_event(source, code, true).ok()?;
-                event.set_flags(LAST_FLAGS);
+                event.set_flags(*LAST_FLAGS.lock().unwrap());
                 Some(event)
             }
         }
@@ -59,7 +59,7 @@ unsafe fn convert_native_with_source(
                 event.set_integer_value_field(EventField::KEYBOARD_EVENT_KEYCODE, code as i64);
 
                 // Get current flags and update them
-                let mut new_flags = LAST_FLAGS;
+                let mut new_flags = LAST_FLAGS.lock().unwrap();
                 match key {
                     Key::ShiftLeft | Key::ShiftRight => {
                         new_flags.remove(CGEventFlags::CGEventFlagShift);
@@ -75,12 +75,12 @@ unsafe fn convert_native_with_source(
                     }
                     _ => {}
                 }
-                event.set_flags(new_flags);
+                event.set_flags(*new_flags);
                 Some(event)
             } else {
                 // For non-modifier keys, use regular key events
                 let event = CGEvent::new_keyboard_event(source, code, false).ok()?;
-                event.set_flags(LAST_FLAGS);
+                event.set_flags(*LAST_FLAGS.lock().unwrap());
                 Some(event)
             }
         }