zhmiscellany 6.0.8__py3-none-any.whl → 6.1.0__py3-none-any.whl

zhmiscellany/_misc_supportfuncs.py

@@ -92,41 +92,54 @@ def patch_cpp():
 if WIN32_AVAILABLE:
     patch_cpp()
 
+# Linux specific imports
+if not WIN32_AVAILABLE:
+    try:
+        import pyautogui
+
+        # Optimize PyAutoGUI for speed to match ctypes performance
+        pyautogui.FAILSAFE = False
+        pyautogui.PAUSE = 0
+        pyautogui.MINIMUM_DURATION = 0
+    except ImportError:
+        raise ImportError("Linux support requires pyautogui. Install it via: pip install pyautogui")
+
+# Windows specific imports and Structs
+if WIN32_AVAILABLE:
+    class POINT(Structure):
+        _fields_ = [("x", c_long),
+                    ("y", c_long)]
 
-class POINT(Structure):
-    _fields_ = [("x", c_long),
-                ("y", c_long)]
 
+    class MOUSEINPUT(Structure):
+        _fields_ = [("dx", c_long),
+                    ("dy", c_long),
+                    ("mouseData", c_uint),
+                    ("dwFlags", c_uint),
+                    ("time", c_uint),
+                    ("dwExtraInfo", POINTER(c_uint))]
 
-class MOUSEINPUT(Structure):
-    _fields_ = [("dx", c_long),
-                ("dy", c_long),
-                ("mouseData", c_uint),
-                ("dwFlags", c_uint),
-                ("time", c_uint),
-                ("dwExtraInfo", POINTER(c_uint))]
 
+    class INPUT_UNION(ctypes.Union):
+        _fields_ = [("mi", MOUSEINPUT)]
 
-class INPUT_UNION(ctypes.Union):
-    _fields_ = [("mi", MOUSEINPUT)]
 
+    class INPUT(Structure):
+        _fields_ = [("type", c_int),
+                    ("union", INPUT_UNION)]
 
-class INPUT(Structure):
-    _fields_ = [("type", c_int),
-                ("union", INPUT_UNION)]
 
+    # Constants
+    MOUSEEVENTF_ABSOLUTE = 0x8000
+    MOUSEEVENTF_MOVE = 0x0001
+    MOUSEEVENTF_LEFTDOWN = 0x0002
+    MOUSEEVENTF_LEFTUP = 0x0004
+    MOUSEEVENTF_RIGHTDOWN = 0x0008
+    MOUSEEVENTF_RIGHTUP = 0x0010
+    MOUSEEVENTF_MIDDLEDOWN = 0x0020
+    MOUSEEVENTF_MIDDLEUP = 0x0040
 
-# Constants
-MOUSEEVENTF_ABSOLUTE = 0x8000
-MOUSEEVENTF_MOVE = 0x0001
-MOUSEEVENTF_LEFTDOWN = 0x0002
-MOUSEEVENTF_LEFTUP = 0x0004
-MOUSEEVENTF_RIGHTDOWN = 0x0008
-MOUSEEVENTF_RIGHTUP = 0x0010
-MOUSEEVENTF_MIDDLEDOWN = 0x0020
-MOUSEEVENTF_MIDDLEUP = 0x0040
 
-# Screen metrics
 def get_actual_screen_resolution():
     if WIN32_AVAILABLE:
         hdc = windll.user32.GetDC(0)
@@ -135,19 +148,33 @@ def get_actual_screen_resolution():
         windll.user32.ReleaseDC(0, hdc)
         return width, height
     else:
-        print("get_actual_screen_resolution() only supports Windows! Returning (1920, 1080)")
-        return 1920, 1080
+        # Linux implementation using pyautogui
+        try:
+            return pyautogui.size()
+        except Exception:
+            print("Could not determine screen resolution on Linux, defaulting to 1920x1080")
+            return 1920, 1080
 
-SCREEN_WIDTH, SCREEN_HEIGHT = (1920, 1080) if not WIN32_AVAILABLE else get_actual_screen_resolution()
 
+# Initialize Globals
+SCREEN_WIDTH, SCREEN_HEIGHT = get_actual_screen_resolution()
 calibrated = False
 calipass = False
+calibration_multiplier_x = 1.0
+calibration_multiplier_y = 1.0
+
 
 def move_mouse(x: int, y: int, relative=False):
+    # --- LINUX IMPLEMENTATION ---
     if not WIN32_AVAILABLE:
-        print("move_mouse() only supports Windows! Functionality disabled")
+        # PyAutoGUI handles relative/absolute logic natively
+        if relative:
+            pyautogui.move(x, y)
+        else:
+            pyautogui.moveTo(x, y)
         return
-    
+
+    # --- WINDOWS IMPLEMENTATION ---
     if not relative:
         # Convert coordinates to normalized coordinates (0-65535)
         normalized_x = int(x * (65535 / SCREEN_WIDTH))
@@ -182,53 +209,70 @@ def move_mouse(x: int, y: int, relative=False):
 
     windll.user32.SendInput(1, ctypes.byref(input_struct), sizeof(INPUT))
 
+
 def get_mouse_xy():
-    if WIN32_AVAILABLE:
-        x, y = win32api.GetCursorPos()
-        return x, y
-    else:
-        print("get_mouse_xy() only supports Windows! Returning (0, 0)")
-        return 0, 0
+    # --- LINUX IMPLEMENTATION ---
+    if not WIN32_AVAILABLE:
+        return pyautogui.position()
+
+    # --- WINDOWS IMPLEMENTATION ---
+    x, y = win32api.GetCursorPos()
+    return x, y
+
 
 def calibrate():
+    """
+    Windows-specific calibration for relative movement scaling.
+    On Linux, libraries handle this abstraction automatically, so we skip it.
+    """
     if not WIN32_AVAILABLE:
-        print("calibrate() only supports Windows! Functionality disabled")
         return
-    
+
     global calibration_multiplier_x, calibration_multiplier_y, calibrated, calipass
     if calibrated:
         return
     if calipass:
         return
     calipass = True
+
     # calibrate relative movement, required because windows is weird
     original_mouse_point = get_mouse_xy()
     calibration_distance = 128
     moved_pos = (0, 0)
     lim = 64
     i = 0
+
+    # Note: logic below calls move_mouse, which calls calibrate,
+    # but calipass=True prevents recursion loop
     while ((not moved_pos[0]) or (not moved_pos[1])) and i < lim:
         i += 1
-        move_mouse(0,0)
+        move_mouse(0, 0)  # Reset to 0,0
         move_mouse(calibration_distance, calibration_distance, relative=True)
         moved_pos = get_mouse_xy()
+
     if not i < lim:
-        raise Exception('Relative mouse movement could not be calibrated, maybe you were tabbed into an application that was controlling your mouse?')
-    calibration_multiplier_x = calibration_distance/moved_pos[0]
-    calibration_multiplier_y = calibration_distance/moved_pos[1]
+        raise Exception('Relative mouse movement could not be calibrated.')
+
+    calibration_multiplier_x = calibration_distance / moved_pos[0]
+    calibration_multiplier_y = calibration_distance / moved_pos[1]
     calibrated = True
-    move_mouse(original_mouse_point[0]+1, original_mouse_point[1]+1)
+
+    # Return mouse to original position
+    move_mouse(original_mouse_point[0], original_mouse_point[1])
 
 
 def mouse_down(button: int):
     """Press mouse button down. button: 1=left, 2=right, 3=middle"""
-    if not WIN32_AVAILABLE:
-        print("mouse_down() only supports Windows! Functionality disabled")
-        return
-    
     if button not in [1, 2, 3]:
         raise ValueError("Button must be 1 (left), 2 (right), or 3 (middle)")
 
+    # --- LINUX IMPLEMENTATION ---
+    if not WIN32_AVAILABLE:
+        btn_map = {1: 'left', 2: 'right', 3: 'middle'}
+        pyautogui.mouseDown(button=btn_map[button])
+        return
+
+    # --- WINDOWS IMPLEMENTATION ---
     flags = {
         1: MOUSEEVENTF_LEFTDOWN,
         2: MOUSEEVENTF_RIGHTDOWN,
@@ -254,13 +298,16 @@ def mouse_down(button: int):
 
 def mouse_up(button: int):
     """Release mouse button. button: 1=left, 2=right, 3=middle"""
-    if not WIN32_AVAILABLE:
-        print("mouse_up() only supports Windows! Functionality disabled")
-        return
-    
     if button not in [1, 2, 3]:
         raise ValueError("Button must be 1 (left), 2 (right), or 3 (middle)")
 
+    # --- LINUX IMPLEMENTATION ---
+    if not WIN32_AVAILABLE:
+        btn_map = {1: 'left', 2: 'right', 3: 'middle'}
+        pyautogui.mouseUp(button=btn_map[button])
+        return
+
+    # --- WINDOWS IMPLEMENTATION ---
     flags = {
         1: MOUSEEVENTF_LEFTUP,
         2: MOUSEEVENTF_RIGHTUP,
@@ -281,4 +328,4 @@ def mouse_up(button: int):
         )
     )
 
-    windll.user32.SendInput(1, ctypes.byref(input_struct), sizeof(INPUT))
+    windll.user32.SendInput(1, ctypes.byref(input_struct), sizeof(INPUT))

zhmiscellany/_processing_supportfuncs.py

@@ -14,10 +14,8 @@ if sys.platform == "win32":
         RAY_AVAILABLE = True
     except ImportError:
         RAY_AVAILABLE = False
-        print("Warning: Ray not available - multiprocessing functionality disabled")
 else:
     RAY_AVAILABLE = False
-    print("Ray is only supported on Windows - multiprocessing functionality disabled")
 
 
 def clear_logs():

{zhmiscellany-6.0.8.dist-info → zhmiscellany-6.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zhmiscellany
-Version: 6.0.8
+Version: 6.1.0
 Summary: A collection of useful/interesting python libraries made by zh.
 Home-page: https://discord.gg/ThBBAuueVJ
 Author: zh

{zhmiscellany-6.0.8.dist-info → zhmiscellany-6.1.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 zhmiscellany/__init__.py,sha256=Oh3gAJRWq2aUEgkolmQyiZOQ3iey5OC4NA2XaTHuVv4,1139
 zhmiscellany/_discord_supportfuncs.py,sha256=RotSpurqFtL5q6v_ST1e2Y_1qJMaHp1CDsF5i-gR4ec,6524
 zhmiscellany/_fileio_supportfuncs.py,sha256=soibLv9nOR79sHQ2MGQH2O6MhnqdXqI7ybxHSN2Tfac,434
-zhmiscellany/_misc_supportfuncs.py,sha256=3JaEUx2Kq4xfSL91JALAHP2SRjHmmEXnwyzHIhXz_gE,8531
-zhmiscellany/_processing_supportfuncs.py,sha256=2xUe5R6xc38LLCWLj9XxGEHMyYvvli_BOppdR9wkJmo,11245
+zhmiscellany/_misc_supportfuncs.py,sha256=pMd7Y4hzstn5BFFlBQbkZYQetvy5WCx8hFb-hL3FO0s,9799
+zhmiscellany/_processing_supportfuncs.py,sha256=u5dzW-2OtyViC74r5fhqd5_2uQ92ZhieRJRTJMevqbg,11071
 zhmiscellany/_py_resources.py,sha256=HqJs5aRLymLZ2J5Io8g6bY58pGWhN9b8vCktC2DW4KQ,229009
 zhmiscellany/_resource_files_lookup.py,sha256=hsgPW0dngokgqWrAVAv5rUo-eobzJPjvWHt4xrOG5l0,856
 zhmiscellany/cpp.py,sha256=XEUEoIKCDCdY5VgwNWE5oXrGjtsmGdz_MnaVwQmi2dk,179
@@ -21,7 +21,7 @@ zhmiscellany/pipes.py,sha256=zETvWP4PF-PuSzYwR1UCodY4ftNAgmCChb9DUMofXok,4657
 zhmiscellany/processing.py,sha256=sDKIbzG9TNFyT6yJ4TJL59taG-59_v3CBLekVSLrwgE,10899
 zhmiscellany/rust.py,sha256=znN6DYNoa_p-braTuDZKvUnXX8reWLFu_dG4fv2vLR0,442
 zhmiscellany/string.py,sha256=xyqE6V5YF2nieZDcg5ZrXTIrH2D9oDRbZ5vQGz8rPys,4787
-zhmiscellany-6.0.8.dist-info/METADATA,sha256=oWEEHwOweowIAemVEJZ228WQdIs61E-yt2cdK39YtMk,43560
-zhmiscellany-6.0.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-zhmiscellany-6.0.8.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
-zhmiscellany-6.0.8.dist-info/RECORD,,
+zhmiscellany-6.1.0.dist-info/METADATA,sha256=IzKNJvKrOuFNwLX6d3-3alPiedJn7KmupqYwQhZgQZI,43560
+zhmiscellany-6.1.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+zhmiscellany-6.1.0.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
+zhmiscellany-6.1.0.dist-info/RECORD,,