Merge pull request #157 from Integration-Automation/dev

Dev

Author: JE-Chen

.idea/workspace.xml

@@ -1,12 +1,12 @@
-# Rename to build stable version
-# This is stable version
+# Rename to build dev version
+# This is dev version
 [build-system]
-requires = ["setuptools>=61.0"]
+requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "je_auto_control"
-version = "0.0.171"
+name = "je_auto_control_dev"
+version = "0.0.122"
 authors = [
     { name = "JE-Chen", email = "[email protected]" },
 ]
@@ -43,4 +43,4 @@ content-type = "text/markdown"
 find = { namespaces = false }
 
 [project.optional-dependencies]
-gui = ["PySide6==6.9.1", "qt-material"]
+gui = ["PySide6==6.9.2", "qt-material"]

stable.toml renamed to dev.toml

@@ -87,6 +87,7 @@
 from je_auto_control.wrapper.auto_control_keyboard import release_keyboard_key
 from je_auto_control.wrapper.auto_control_keyboard import type_keyboard
 from je_auto_control.wrapper.auto_control_keyboard import write
+from je_auto_control.wrapper.auto_control_keyboard import send_key_event_to_window
 # import mouse
 from je_auto_control.wrapper.auto_control_mouse import click_mouse
 from je_auto_control.wrapper.auto_control_mouse import get_mouse_position
@@ -96,6 +97,7 @@
 from je_auto_control.wrapper.auto_control_mouse import release_mouse
 from je_auto_control.wrapper.auto_control_mouse import set_mouse_position
 from je_auto_control.wrapper.auto_control_mouse import special_mouse_keys_table
+from je_auto_control.wrapper.auto_control_mouse import send_mouse_event_to_window
 # test_record
 from je_auto_control.wrapper.auto_control_record import record
 from je_auto_control.wrapper.auto_control_record import stop_record
@@ -104,6 +106,8 @@
 from je_auto_control.wrapper.auto_control_screen import screenshot
 # Recording
 from je_auto_control.utils.cv2_utils.video_recording import RecordingThread
+# Windows
+from je_auto_control.windows.window import windows_window_manage
 
 __all__ = [
     "click_mouse", "mouse_keys_table", "get_mouse_position", "press_mouse", "release_mouse",
@@ -120,5 +124,5 @@
     "generate_html", "generate_html_report", "generate_json", "generate_json_report", "generate_xml",
     "generate_xml_report", "get_dir_files_as_list", "create_project_dir", "start_autocontrol_socket_server",
     "callback_executor", "package_manager", "get_special_table", "ShellManager", "default_shell_manager",
-    "RecordingThread"
+    "RecordingThread", "send_key_event_to_window", "send_mouse_event_to_window", "windows_window_manage"
 ]

je_auto_control/__init__.py

@@ -9,7 +9,7 @@
 
 from je_auto_control.linux_with_x11.core.utils.x11_linux_display import display
 from Xlib.ext.xtest import fake_input
-from Xlib import X
+from Xlib import X, protocol
 
 
 def press_key(keycode: int) -> None:
@@ -28,3 +28,20 @@ def release_key(keycode: int) -> None:
     time.sleep(0.01)
     fake_input(display, X.KeyRelease, keycode)
     display.sync()
+
+def send_key_event_to_window(window_id, keycode: int):
+    window = display.create_resource_object('window', window_id)
+    event = protocol.event.KeyPress(
+        time=X.CurrentTime,
+        root=display.screen().root,
+        window=window,
+        same_screen=1,
+        child=X.NONE,
+        root_x=0, root_y=0, event_x=0, event_y=0,
+        state=0,
+        detail=keycode
+    )
+    window.send_event(event, propagate=True)
+    event.type = X.KeyRelease
+    window.send_event(event, propagate=True)
+    display.flush()

je_auto_control/linux_with_x11/keyboard/x11_linux_keyboard_control.py

@@ -8,7 +8,7 @@
 if sys.platform not in ["linux", "linux2"]:
     raise AutoControlException(linux_import_error)
 
-from Xlib import X
+from Xlib import X, protocol
 from Xlib.ext.xtest import fake_input
 
 from je_auto_control.linux_with_x11.core.utils.x11_linux_display import display
@@ -83,3 +83,23 @@ def scroll(scroll_value: int, scroll_direction: int) -> None:
     for i in range(scroll_value):
         click_mouse(scroll_direction)
         total = total + i
+
+def send_mouse_event_to_window(window_id, mouse_keycode: int, x: int = None, y: int = None):
+    window = display.create_resource_object('window', window_id)
+    for ev_type in (X.ButtonPress, X.ButtonRelease):
+        ev = protocol.event.ButtonPress(
+            time=X.CurrentTime,
+            root=display.screen().root,
+            window=window,
+            same_screen=1,
+            child=X.NONE,
+            root_x=x, root_y=y, event_x=x, event_y=y,
+            state=0,
+            detail=mouse_keycode
+        )
+        ev.type = ev_type
+        window.send_event(ev, propagate=True)
+    display.flush()
+
+
+

je_auto_control/linux_with_x11/mouse/x11_linux_mouse_control.py

@@ -0,0 +1,38 @@
+import objc
+from Quartz import CGEventCreateKeyboardEvent, kCGEventKeyDown, kCGEventKeyUp
+from ApplicationServices import ProcessSerialNumber, GetProcessForPID
+from ctypes import cdll, c_void_p
+import subprocess
+
+carbon = cdll.LoadLibrary('/System/Library/Frameworks/Carbon.framework/Carbon')
+
+
+def send_key_to_pid(pid, keycode):
+    psn = ProcessSerialNumber()
+    GetProcessForPID(pid, objc.byref(psn))
+    event_down = CGEventCreateKeyboardEvent(None, keycode, True)
+    event_up = CGEventCreateKeyboardEvent(None, keycode, False)
+    carbon.CGEventPostToPSN(c_void_p(id(psn)), event_down)
+    carbon.CGEventPostToPSN(c_void_p(id(psn)), event_up)
+
+def get_pid_by_window_title(title: str):
+    script = f'''
+    set targetWindowName to "{title}"
+    tell application "System Events"
+        repeat with proc in processes
+            repeat with win in windows of proc
+                if name of win contains targetWindowName then
+                    return unix id of proc
+                end if
+            end repeat
+        end repeat
+    end tell
+    '''
+    try:
+        pid_str = subprocess.check_output(
+            ["osascript", "-e", script],
+            stderr=subprocess.DEVNULL
+        ).decode().strip()
+        return int(pid_str) if pid_str else None
+    except subprocess.CalledProcessError:
+        return None

je_auto_control/osx/pid/__init__.py

@@ -3,6 +3,7 @@
 import subprocess
 import sys
 from threading import Thread
+from typing import Union
 
 from je_auto_control.utils.logging.loggin_instance import autocontrol_logger
 
@@ -21,13 +22,13 @@ def __init__(
         self.read_program_error_output_from_thread = None
         self.read_program_output_from_thread = None
         self.still_run_shell: bool = True
-        self.process = None
-        self.run_output_queue: queue = queue.Queue()
-        self.run_error_queue: queue = queue.Queue()
+        self.process: Union[subprocess.Popen, None] = None
+        self.run_output_queue: queue.Queue = queue.Queue()
+        self.run_error_queue: queue.Queue = queue.Queue()
         self.program_encoding: str = shell_encoding
         self.program_buffer: int = program_buffer
 
-    def exec_shell(self, shell_command: [str, list]) -> None:
+    def exec_shell(self, shell_command: Union[str, list]) -> None:
         """
         :param shell_command: shell command will run
         :return: if error return result and True else return result and False
@@ -115,16 +116,16 @@ def print_and_clear_queue(self) -> None:
 
     def read_program_output_from_process(self) -> None:
         while self.still_run_shell:
-            program_output_data = self.process.stdout.raw.read(
+            program_output_data = self.process.stdout.readline(
                 self.program_buffer) \
-                .decode(self.program_encoding)
+                .decode(self.program_encoding, "replace")
             self.run_output_queue.put_nowait(program_output_data)
 
     def read_program_error_output_from_process(self) -> None:
         while self.still_run_shell:
-            program_error_output_data = self.process.stderr.raw.read(
+            program_error_output_data = self.process.stderr.readline(
                 self.program_buffer) \
-                .decode(self.program_encoding)
+                .decode(self.program_encoding, "replace")
             self.run_error_queue.put_nowait(program_error_output_data)
 
 

je_auto_control/osx/pid/pid_control.py

@@ -1,4 +1,5 @@
 import sys
+from typing import Union
 
 from je_auto_control.utils.exception.exception_tags import windows_import_error
 from je_auto_control.utils.exception.exceptions import AutoControlException
@@ -9,11 +10,11 @@
 import ctypes
 
 
-def check_key_is_press(keycode: [int, str]) -> bool:
+def check_key_is_press(keycode: Union[int, str]) -> bool:
     if isinstance(keycode, int):
         temp: int = ctypes.windll.user32.GetAsyncKeyState(keycode)
     else:
         temp = ctypes.windll.user32.GetAsyncKeyState(ord(keycode))
-    if temp > 1:
+    if temp != 0:
         return True
     return False

je_auto_control/utils/shell_process/shell_exec.py

@@ -6,7 +6,7 @@
 if sys.platform not in ["win32", "cygwin", "msys"]:
     raise AutoControlException(windows_import_error)
 
-from je_auto_control.windows.core.utils.win32_ctype_input import Input
+from je_auto_control.windows.core.utils.win32_ctype_input import Input, user32
 from je_auto_control.windows.core.utils.win32_ctype_input import Keyboard
 from je_auto_control.windows.core.utils.win32_ctype_input import KeyboardInput
 from je_auto_control.windows.core.utils.win32_ctype_input import SendInput
@@ -28,3 +28,10 @@ def release_key(keycode: int) -> None:
     """
     keyboard = Input(type=Keyboard, ki=KeyboardInput(wVk=keycode, dwFlags=win32_EventF_KEYUP))
     SendInput(1, ctypes.byref(keyboard), ctypes.sizeof(keyboard))
+
+def send_key_event_to_window(window: str, keycode: int):
+    WM_KEYDOWN = 0x0100
+    WM_KEYUP = 0x0101
+    window = user32.FindWindowW(None, window)
+    user32.PostMessageW(window, WM_KEYDOWN, keycode, 0)
+    user32.PostMessageW(window, WM_KEYUP, keycode, 0)