Merge branch 'develop'

api/enums.py

@@ -130,6 +130,7 @@ class SummarizeProvider(Enum):
 class KeyboardRecordingType(Enum):
     SINGLE = "single"
     MACRO = "macro"
+    MACRO_ADVANCED = "macro_advanced"
 
 
 class WingmanProRegion(Enum):

api/interface.py

@@ -333,9 +333,17 @@ class CommandKeyboardConfig(BaseModel):
     hotkey_codes: Optional[list[int]] = None
     """The hotkey codes. Can be a single key like 65 or a combination like 162+160+65. Optional."""
 
+    hotkey_extended: Optional[bool] = None
+    """Whether the hotkey is an extended key. Optional."""
+
     hold: Optional[float] = None
     """The duration the key will be pressed in seconds. Optional."""
 
+    press: Optional[bool] = None
+    """Whether to press the key. Optional."""
+
+    release: Optional[bool] = None
+    """Whether to release the key. Optional."""
 
 class CommandMouseConfig(BaseModel):
     button: Optional[str] = None

keyboard/keyboard/__init__.py

@@ -506,6 +506,12 @@ def send(hotkey, do_press=True, do_release=True):
 
     _listener.is_replaying = False
 
+def direct_event(scancode, event_type):
+    """
+    Sends a key event directly to the OS, without any processing.
+    """
+    _os_keyboard.direct_event(scancode, event_type)
+
 # Alias.
 press_and_release = send
 

keyboard/keyboard/_darwinkeyboard.py

@@ -472,6 +472,13 @@ def handler(self, proxy, e_type, event, refcon):
 def init():
     key_controller = KeyController()
 
+def direct_event(scan_code, event_type):
+    """ Sends a key event directly, without any processing """
+    if event_type == 0 or event_type == 1:
+        key_controller.press(scan_code)
+    elif event_type == 2 or event_type == 3:
+        key_controller.release(scan_code)
+
 def press(scan_code):
     """ Sends a 'down' event for the specified scan code """
     key_controller.press(scan_code)

keyboard/keyboard/_keyboard_event.py

@@ -20,20 +20,22 @@ class KeyboardEvent(object):
     device = None
     modifiers = None
     is_keypad = None
+    is_extended = None
 
-    def __init__(self, event_type, scan_code, name=None, time=None, device=None, modifiers=None, is_keypad=None):
+    def __init__(self, event_type, scan_code, name=None, time=None, device=None, modifiers=None, is_keypad=None, is_extended=None):
         self.event_type = event_type
         self.scan_code = scan_code
         self.time = now() if time is None else time
         self.device = device
         self.is_keypad = is_keypad
         self.modifiers = modifiers
+        self.is_extended = is_extended
         if name:
             self.name = normalize_name(name)
 
     def to_json(self, ensure_ascii=False):
         attrs = dict(
-            (attr, getattr(self, attr)) for attr in ['event_type', 'scan_code', 'name', 'time', 'device', 'is_keypad', 'modifiers']
+            (attr, getattr(self, attr)) for attr in ['event_type', 'scan_code', 'name', 'time', 'device', 'is_keypad', 'modifiers', 'is_extended']
             if not attr.startswith('_')
         )
         return json.dumps(attrs, ensure_ascii=ensure_ascii)

keyboard/keyboard/_nixkeyboard.py

@@ -152,6 +152,9 @@ def listen(callback):
         is_keypad = scan_code in keypad_scan_codes
         callback(KeyboardEvent(event_type=event_type, scan_code=scan_code, name=name, time=time, device=device_id, is_keypad=is_keypad, modifiers=pressed_modifiers_tuple))
 
+def direct_event(scan_code, event_type):
+    write_event(scan_code, event_type == 0 or event_type == 1)
+
 def write_event(scan_code, is_down):
     build_device()
     device.write_event(EV_KEY, scan_code, int(is_down))