Update VK

Update VK
* Using refactor to make sure every VK are renamed

Author: JE-Chen

.github/workflows/jekyll-gh-pages.yml

@@ -8,7 +8,7 @@
 
 import ctypes
 from ctypes import wintypes
-from je_auto_control.windows.core.utils.win32_vk import win32_EventF_UNICODE, win32_VkToVSC
+from je_auto_control.windows.core.utils.win32_vk import WIN32_EventF_UNICODE, WIN32_VkToVSC
 
 user32 = ctypes.WinDLL('user32', use_last_error=True)
 
@@ -37,8 +37,8 @@ class KeyboardInput(ctypes.Structure):
 
     def __init__(self, *args, **kwds):
         super(KeyboardInput, self).__init__(*args, **kwds)
-        if not self.dwFlags & win32_EventF_UNICODE:
-            self.wScan = user32.MapVirtualKeyExW(self.wVk, win32_VkToVSC, 0)
+        if not self.dwFlags & WIN32_EventF_UNICODE:
+            self.wScan = user32.MapVirtualKeyExW(self.wVk, WIN32_VkToVSC, 0)
 
 
 class HardwareInput(ctypes.Structure):

je_auto_control/windows/core/utils/win32_ctype_input.py

@@ -181,4 +181,4 @@
 WIN32_VK_LAUNCH_MAIL: int = 0xB4
 WIN32_VK_LAUNCH_MEDIA_SELECT: int = 0xB5
 WIN32_VK_LAUNCH_APP1: int = 0xB6
-WIN32_VK_LAUNCH_APP2: int = 0xB7
+WIN32_VK_LAUNCH_APP2: int = 0xB7

je_auto_control/windows/core/utils/win32_vk.py

@@ -11,7 +11,7 @@
 from je_auto_control.windows.core.utils.win32_ctype_input import KeyboardInput
 from je_auto_control.windows.core.utils.win32_ctype_input import SendInput
 from je_auto_control.windows.core.utils.win32_ctype_input import ctypes
-from je_auto_control.windows.core.utils.win32_vk import win32_EventF_KEYUP
+from je_auto_control.windows.core.utils.win32_vk import WIN32_EventF_KEYUP
 
 
 def press_key(keycode: int) -> None:
@@ -26,7 +26,7 @@ def release_key(keycode: int) -> None:
     """
     :param keycode which keycode we want to release
     """
-    keyboard = Input(type=Keyboard, ki=KeyboardInput(wVk=keycode, dwFlags=win32_EventF_KEYUP))
+    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):

je_auto_control/windows/keyboard/win32_ctype_keyboard_control.py

@@ -8,30 +8,30 @@
     raise AutoControlException(windows_import_error)
 
 from je_auto_control.windows.core.utils.win32_ctype_input import Input, user32
-from je_auto_control.windows.core.utils.win32_vk import win32_LEFTDOWN
-from je_auto_control.windows.core.utils.win32_vk import win32_LEFTUP
-from je_auto_control.windows.core.utils.win32_vk import win32_MIDDLEDOWN
-from je_auto_control.windows.core.utils.win32_vk import win32_MIDDLEUP
+from je_auto_control.windows.core.utils.win32_vk import WIN32_LEFTDOWN
+from je_auto_control.windows.core.utils.win32_vk import WIN32_LEFTUP
+from je_auto_control.windows.core.utils.win32_vk import WIN32_MIDDLEDOWN
+from je_auto_control.windows.core.utils.win32_vk import WIN32_MIDDLEUP
 from je_auto_control.windows.core.utils.win32_ctype_input import Mouse
 from je_auto_control.windows.core.utils.win32_ctype_input import MouseInput
-from je_auto_control.windows.core.utils.win32_vk import win32_RIGHTDOWN
-from je_auto_control.windows.core.utils.win32_vk import win32_RIGHTUP
+from je_auto_control.windows.core.utils.win32_vk import WIN32_RIGHTDOWN
+from je_auto_control.windows.core.utils.win32_vk import WIN32_RIGHTUP
 from je_auto_control.windows.core.utils.win32_ctype_input import SendInput
-from je_auto_control.windows.core.utils.win32_vk import win32_XBUTTON1
-from je_auto_control.windows.core.utils.win32_vk import win32_XBUTTON2
-from je_auto_control.windows.core.utils.win32_vk import win32_DOWN
-from je_auto_control.windows.core.utils.win32_vk import win32_XUP
+from je_auto_control.windows.core.utils.win32_vk import WIN32_XBUTTON1
+from je_auto_control.windows.core.utils.win32_vk import WIN32_XBUTTON2
+from je_auto_control.windows.core.utils.win32_vk import WIN32_DOWN
+from je_auto_control.windows.core.utils.win32_vk import WIN32_XUP
 from ctypes import windll
 from je_auto_control.windows.core.utils.win32_ctype_input import wintypes
-from je_auto_control.windows.core.utils.win32_vk import win32_WHEEL
+from je_auto_control.windows.core.utils.win32_vk import WIN32_WHEEL
 from je_auto_control.windows.core.utils.win32_ctype_input import ctypes
 from je_auto_control.windows.screen.win32_screen import size
 
-win32_mouse_left: Tuple = (win32_LEFTUP, win32_LEFTDOWN, 0)
-win32_mouse_middle: Tuple = (win32_MIDDLEUP, win32_MIDDLEDOWN, 0)
-win32_mouse_right: Tuple = (win32_RIGHTUP, win32_RIGHTDOWN, 0)
-win32_mouse_x1: Tuple = (win32_XUP, win32_DOWN, win32_XBUTTON1)
-win32_mouse_x2: Tuple = (win32_XUP, win32_DOWN, win32_XBUTTON2)
+win32_mouse_left: Tuple = (WIN32_LEFTUP, WIN32_LEFTDOWN, 0)
+win32_mouse_middle: Tuple = (WIN32_MIDDLEUP, WIN32_MIDDLEDOWN, 0)
+win32_mouse_right: Tuple = (WIN32_RIGHTUP, WIN32_RIGHTDOWN, 0)
+win32_mouse_x1: Tuple = (WIN32_XUP, WIN32_DOWN, WIN32_XBUTTON1)
+win32_mouse_x2: Tuple = (WIN32_XUP, WIN32_DOWN, WIN32_XBUTTON2)
 
 _get_cursor_pos: windll.user32.GetCursorPos = windll.user32.GetCursorPos
 _set_cursor_pos: windll.user32.SetCursorPos = windll.user32.SetCursorPos
@@ -108,7 +108,7 @@ def scroll(scroll_value: int, x: int = None, y: int = None) -> None:
     :param x scroll x
     :param y scroll y
     """
-    mouse_event(win32_WHEEL, x, y, dwData=scroll_value)
+    mouse_event(WIN32_WHEEL, x, y, dwData=scroll_value)
 
 
 def send_mouse_event_to_window(window, mouse_keycode: int, x: int = None, y: int = None):