zhmiscellany 5.7.0__py3-none-any.whl → 5.7.2__py3-none-any.whl

zhmiscellany/macro.py

@@ -16,7 +16,9 @@ import time
 get_mouse_xy = get_mouse_xy
 
 
-def click_pixel(x=None, y=None, click_duration=None, right_click=False, middle_click=False, shift=False, ctrl=False, act_start=True, act_end=True, click_end_duration=None, double_click=False, animation_time=None, animation_fps=60, animation_easing=True, relative=False, ensure_movement=True, pre_click_duration=None, pre_click_wiggle=False):
+def click_pixel(x=None, y=None, click_duration=None, right_click=False, middle_click=False, shift=False, ctrl=False, act_start=True, act_end=True, click_end_duration=None, double_click=False, animation_time=None, animation_fps=60, animation_easing=True, relative=False, ensure_movement=True, pre_click_duration=None, pre_click_wiggle=False, click=True):
+    if not click:
+        act_start=False;act_end=False
     if relative:
         ensure_movement = False
     if right_click and middle_click:
@@ -43,7 +45,10 @@ def click_pixel(x=None, y=None, click_duration=None, right_click=False, middle_c
     if animation_time:
         mxy = get_mouse_xy()
         start = mxy
-        end = (x, y)
+        if not relative:
+            end = (x, y)
+        else:
+            end = tuple(a + b for a, b in zip(start, (x,y)))
         num_points = animation_fps*animation_time  # 60 fps animation
         num_points += 2  # don't need start and end points
         num_points = math.ceil(num_points)
@@ -64,8 +69,10 @@ def click_pixel(x=None, y=None, click_duration=None, right_click=False, middle_c
                 temp.append(relative_point)
             animation_points = temp
 
-        animation_points.pop()  # remove start and end
+        # remove start and end
         animation_points.pop(0)
+        if not relative:
+            animation_points.pop()
         for point in animation_points:
             click_pixel((round(point[0]), round(point[1])), act_start=False, act_end=False, click_end_duration=1/animation_fps, relative=relative)
 
@@ -93,7 +100,8 @@ def click_pixel(x=None, y=None, click_duration=None, right_click=False, middle_c
                 else:
                     break
         else:
-            move_mouse(cx, cy, relative=relative)
+            if not (animation_time and relative):
+                move_mouse(cx, cy, relative=relative)
 
     if pre_click_duration:
         if pre_click_wiggle:

{zhmiscellany-5.7.0.dist-info → zhmiscellany-5.7.2.dist-info}/METADATA

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

{zhmiscellany-5.7.0.dist-info → zhmiscellany-5.7.2.dist-info}/RECORD

@@ -12,7 +12,7 @@ zhmiscellany/fileio.py,sha256=KmRnWWZJWBc5Or3_mKcRY2ehE_Fuk870iS-imtyERyg,18169
 zhmiscellany/gui.py,sha256=VgT5j5UIr-wWyL2P1qCHSNL7RrvZWDlm0TX00JGWmKo,7404
 zhmiscellany/image.py,sha256=qUjxiYpc2VVZp2vwr1vN36O2PVQ7YlMKzhegQ1u4c0M,8198
 zhmiscellany/list.py,sha256=S8Z85bLJEP9lk2JkGpzUcG6kpRB7a-NWDIHMPiF5bKo,1473
-zhmiscellany/macro.py,sha256=A5_1WbChuLAQeqNCcM6-Y9NMuuo8kIUZDiTbW77xk0U,15247
+zhmiscellany/macro.py,sha256=7oMnrIUfFNOxRKafv3mY5IKHVziZdsRT_cSmLmBjRPY,15517
 zhmiscellany/math.py,sha256=btOQTe_GvqP0A7Zz84tmN_c8j1NGe_mKnhmAt40lhLU,2482
 zhmiscellany/misc.py,sha256=BsTbRWlXI5LZBG7Bl2MgLzHESyCMJnr_KNZAf2wY_H4,29689
 zhmiscellany/netio.py,sha256=GTamo5cJn4P6u8V_kgZ9kL8qeMUE7OQAmYkmj9Sp_GA,2236
@@ -21,7 +21,7 @@ zhmiscellany/pipes.py,sha256=PxO4aykFzC60xbTQuc66KzZYIxiW0KPebXZbncD2HcU,3795
 zhmiscellany/processing.py,sha256=srwlV8FZ--svF5e6rZZxhIs_6ZjOAwq2OcQEf6T2Le8,10410
 zhmiscellany/rust.py,sha256=znN6DYNoa_p-braTuDZKvUnXX8reWLFu_dG4fv2vLR0,442
 zhmiscellany/string.py,sha256=xyqE6V5YF2nieZDcg5ZrXTIrH2D9oDRbZ5vQGz8rPys,4787
-zhmiscellany-5.7.0.dist-info/METADATA,sha256=va_LTi9QxX9dgp21q1iOEn48cuJ7AJebImdPnWO6u3Y,42153
-zhmiscellany-5.7.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-zhmiscellany-5.7.0.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
-zhmiscellany-5.7.0.dist-info/RECORD,,
+zhmiscellany-5.7.2.dist-info/METADATA,sha256=yXU8bT4A34FXS8P5wqm1XDmIKgQ1IJLvnCPYLOXcFUg,42153
+zhmiscellany-5.7.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+zhmiscellany-5.7.2.dist-info/top_level.txt,sha256=ioDtsrevCI52rTxZntMPljRIBsZs73tD0hI00HektiE,13
+zhmiscellany-5.7.2.dist-info/RECORD,,